diff --git a/init.el b/init.el
new file mode 100644
index 0000000..c417f8f
--- /dev/null
+++ b/init.el
@@ -0,0 +1,74 @@
+;;; Archivo de configuraciĆ³n de emacs para jdee, git-emacs y ecb
+;;;
+;;; 2009-2011 juanger
+;;;
+;;;
+
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/git-emacs"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/jdee/lisp"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/common"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/elib"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/semantic"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/speedbar"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/eieio"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/ede"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/site/ecb-2.40"))
+
+(load-file (expand-file-name "~/.emacs.d/site/cedet-1.0pre7/common/cedet.el"))
+
+(require 'git-emacs)
+(require 'jde)
+(require 'ecb)
+
+(defvar mvn-command-history nil
+  "Maven command history variable")
+
+(defun mvn(&optional args)
+  "Runs maven in the current project. Starting at the directory where the file being visited resides, a search is
+   made for pom.xml recsurively. A maven command is made from the first directory where the pom.xml file is found is then displayed
+  in the minibuffer. The command can be edited as needed and then executed. Errors are navigate to as in any other compile mode"
+  (interactive)
+  (let ((fn (buffer-file-name)))
+    (let ((dir (file-name-directory fn)))
+      (while (and (not (file-exists-p (concat dir "/pom.xml")))
+                  (not (equal dir (file-truename (concat dir "/..")))))
+        (setf dir (file-truename (concat dir "/.."))))
+      (if (not (file-exists-p (concat dir "/pom.xml")))
+          (message "No pom.xml found")
+        (compile (read-from-minibuffer "Command: "
+                                       (concat "mvn -f " dir "/pom.xml") nil nil 'mvn-command-history))))))
+
+(defun run-mvn()
+  (interactive)
+  (progn
+    (mvn)
+    (bsh-exit)
+    (jde-load-all-project-files)))
+
+;;;;;;;;;
+;;;;;
+;;;;; Custom variables
+;;;;;
+;;;;;;;;;
+(custom-set-variables
+  ;; custom-set-variables was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ '(before-save-hook (quote (delete-trailing-whitespace)))
+ '(ecb-auto-activate t)
+ '(ecb-options-version "2.40")
+ '(ecb-primary-secondary-mouse-buttons (quote mouse-1--mouse-2))
+ '(ecb-tip-of-the-day nil)
+ '(indent-tabs-mode nil)
+ '(paren-match-face (quote paren-face-match-light))
+ '(paren-sexp-mode t)
+ '(show-paren-mode t)
+ '(transient-mark-mode t))
+(custom-set-faces
+  ;; custom-set-faces was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ )
diff --git a/site/cedet-1.0pre7/INSTALL b/site/cedet-1.0pre7/INSTALL
new file mode 100644
index 0000000..3f2fe0d
--- /dev/null
+++ b/site/cedet-1.0pre7/INSTALL
@@ -0,0 +1,202 @@
+CEDET: Collection of Emacs Development Enviromnent Tools
+
+CEDET is a top-level project containing several individual package for Emacs,
+includeing:
+
+   EIEIO -    CLOS layer for Emacs Lisp
+   Semantic - Parser Infrastructure for Emacs
+   Speedbar - Everything browser
+   EDE -      File manager/ Makefile generator
+   SRecode -  Templte manager/ code generator
+   COGRE -    Connected Graph Editor
+
+REQUIREMENTS:
+
+   The full CEDET suite requires Emacs 22.1 or newer.
+   CEDET works well with either Emacs 21.3 or XEmacs 21.3.
+   Older versions of either will also work with fewer CEDET
+   features being available.
+
+   If you use a binary install of Emacs, you may need the .el
+   files for Emacs available for some aspects of the build.
+
+   CEDET is always developed on a recent CVS build of Emacs, and often
+   takes advantage of such new features.
+
+INSTALL:
+
+You can install all these packagees at once with the CEDET build and
+install scripts:
+
+1) Copy source files somewhere.
+
+2) Byte compile
+
+   There are several ways to get CEDET compiled:
+
+   a) make
+
+   b) make EMACS=<your favorite emacs>
+
+    You might also have trouble with makeinfo.  If you need to upgrade
+    makeinfo, you can do this:
+
+  c) make MAKEINFO=/usr/local/bin/makeinfo
+
+    Note: For speedbar, and older versions of Emacs, you may also need
+          to byte-compile the version of INFO and RMAIL that come with
+          your version of emacs.
+
+  d) make MAKEINFO=echo
+
+    To skip making the doc.
+
+
+  e) cedet-build.el
+
+    If you do not have "make", are on Windows, or otherwise cannot use
+    the Makefiles, you can build CEDET from within Emacs.  See the
+    commentary in cedet-build.el
+
+
+2.1) Build Issues
+
+  If running MAKE fails due to other issues such as bad loaddef
+  files, custom-autoload, incomprehensible run time errors during a byte
+  compilation, try these steps, then go back to step 2.
+
+  a) make clean-autoloads
+  b) make clean-all
+
+2.2) Make Issues
+
+  If the version of Make you are using doesn't work with the CEDET
+  Makefiles, (such as the version on AIX) you will need to download and
+  install GNU Make to use with these Makefiles.  Alternately, 
+  see cedet-build.el
+
+3) Install load hooks into your .emacs file.  For more detail on
+   any topic, see the info file common/cedet.info for more details on
+   installaiton.
+
+-----------
+;; Load CEDET.
+;; See cedet/common/cedet.info for configuration details.
+(load-file "~/cedet-VERSION/common/cedet.el")
+
+
+;; Enable EDE (Project Management) features
+(global-ede-mode 1)
+
+;; Enable EDE for a pre-existing C++ project
+;; (ede-cpp-root-project "NAME" :file "~/myproject/Makefile")
+
+
+;; Enabling Semantic (code-parsing, smart completion) features
+;; Select one of the following:
+
+;; * This enables the database and idle reparse engines
+(semantic-load-enable-minimum-features)
+
+;; * This enables some tools useful for coding, such as summary mode
+;;   imenu support, and the semantic navigator
+(semantic-load-enable-code-helpers)
+
+;; * This enables even more coding tools such as intellisense mode
+;;   decoration mode, and stickyfunc mode (plus regular code helpers)
+;; (semantic-load-enable-gaudy-code-helpers)
+
+;; * This enables the use of Exuberent ctags if you have it installed.
+;;   If you use C++ templates or boost, you should NOT enable it.
+;; (semantic-load-enable-all-exuberent-ctags-support)
+;;   Or, use one of these two types of support.
+;;   Add support for new languges only via ctags.
+;; (semantic-load-enable-primary-exuberent-ctags-support)
+;;   Add support for using ctags as a backup parser.
+;; (semantic-load-enable-secondary-exuberent-ctags-support)
+
+;; Enable SRecode (Template management) minor-mode.
+;; (global-srecode-minor-mode 1)
+
+-----------
+
+  Some items in the contrib directory may need additional study or
+  installation.  Read contrib/INSTALL for specifics on those extra
+  packages.
+
+3.1) CODE COMPLETION
+
+  If you are installing CEDET to get code completion, see the info
+  manual in common/cedet.info for more specifically about code
+  completion.
+
+3.2) INSTALL INFO
+
+   Installing the info files can be done with:
+
+     make install-info
+
+   or, if you need to specify:
+
+     make PREFIX=/prefix/to/install/to install-info
+
+4) CONFIGURE:
+
+   You can configure how the individual packages loaded in the above
+   example by adding settings in the comment section.  Please read
+   individual info manuals for each package for details on configuring
+   them.  See the texinfo manuals for details on more specific
+   configurations.
+
+   To dive right into configuring CEDET for a particular purpose, many
+   common purposes are enumerated in the CEDET installation info file.
+
+   C-u C-h i common/cedet.info
+
+
+5) BUGS/COMMENTS
+
+   To send bug reports, or participate in discussions on these
+   packages, choose a mailing list:
+
+   For Semantic use the mailing list cedet-semantic@sourceforge.net
+   via the URL:
+
+   http://lists.sourceforge.net/lists/listinfo/cedet-semantic
+
+   For EIEIO use the mailing list cedet-eieio@sourceforge.net
+   via the URL:
+
+   http://lists.sourceforge.net/lists/listinfo/cedet-eieio
+
+   For general discussions on development of these tools, and get learn
+   when minor updates are added to CVS, use the mailing list
+   cedet-devel@sourceforge.net via the URL:
+
+   http://lists.sourceforge.net/lists/listinfo/cedet-devel
+
+OTHER REQUIREMENTS:
+
+   You may also need to download some of the following files for more
+   obscure features.
+
+   To use the JavaScript parser:
+   javascript-mode.el : http://www.emacswiki.org/cgi-bin/wiki/JavaScriptMode
+   
+   To use Exuberent CTags to parse files:
+   http://ctags.sourceforge.net/
+
+   To use GNU Global integration:
+   http://www.gnu.org/software/global
+
+   To use ID Utils integration:
+   http://www.gnu.org/software/idutils/
+
+   To use CScope integration:
+   http://cscope.sourceforge.net/
+
+   To use COGRE with Graphviz Dot integration:
+   http://www.graphviz.org/
+
+   And a major mode for dot (not required):
+   http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/Makefile b/site/cedet-1.0pre7/Makefile
new file mode 100644
index 0000000..65ac315
--- /dev/null
+++ b/site/cedet-1.0pre7/Makefile
@@ -0,0 +1,188 @@
+## Makefile --- Definition file for building CEDET
+##
+## Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 by David Ponce
+##
+## Author: David Ponce <david@dponce.com>
+## Maintainer: CEDET developers <http://sf.net/projects/cedet>
+## Created: 12 Sep 2003
+## X-RCS: $Id: Makefile,v 1.25 2009/08/08 21:48:32 zappo Exp $
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+######## You can customize this part of the Makefile ########
+
+## The directory where CEDET is installed
+CEDET_HOME="$(CURDIR)"
+
+## The CEDET's packages installed
+CEDET_ELISP_PACKAGES=\
+common \
+speedbar \
+eieio \
+semantic \
+srecode \
+ede \
+cogre \
+contrib
+
+CEDET_PACKAGES=\
+$(CEDET_ELISP_PACKAGES) \
+tests
+
+## Path to your Emacs
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+
+## Your shell (On Windows/Cygwin I recommend to use bash)
+#SHELL=bash
+
+## Path to your find and rm commands
+FIND=find
+#RM = rm -f
+
+## INSTALL PATHS
+PREFIX=/usr/local
+
+INFO_DIR=$(PREFIX)/share/info
+
+INSTALL_INFO=ginstall-info
+
+############### Internal part of the Makefile ###############
+CEDET_VERSION=$(shell grep "defconst cedet-version" common/cedet.el | cut -d " " -f 3)
+
+CEDET_FILES=Makefile INSTALL cedet-build.el cedet-update-version.el PRERELEASE_CHECKLIST USING_CEDET_FROM_CVS
+DIST_ROOT=cedet-$(CEDET_VERSION)
+DIST_DIR=$(CEDET_HOME)/$(DIST_ROOT)
+DIST_FILE=$(DIST_DIR).tar.gz
+
+__BUILD_AUTOLOADS=$(patsubst %,%-autoloads,$(CEDET_ELISP_PACKAGES))
+__CLEAN_AUTOLOADS=$(patsubst %,clean-%,$(__BUILD_AUTOLOADS))
+__DOMAKE=$(MAKE) $(MFLAGS) EMACS="$(EMACS)" EMACSFLAGS="$(EMACSFLAGS)" SHELL="$(SHELL)"
+
+## Build
+##
+
+all: clean-autoloads packages
+
+bootstrap: clean-all packages
+
+packages: $(CEDET_PACKAGES)
+
+.PHONY: $(CEDET_PACKAGES)
+$(CEDET_PACKAGES):
+	cd $(CEDET_HOME)/$@ && $(__DOMAKE)
+
+.PHONY: ebuild
+ebuild:
+	$(EMACS) -q -batch --no-site-file -l cedet-build.el -f cedet-build
+
+## Update
+##
+
+autoloads: $(__BUILD_AUTOLOADS)
+
+.PHONY: $(__BUILD_AUTOLOADS)
+$(__BUILD_AUTOLOADS):
+	cd $(CEDET_HOME)/$(firstword $(subst -, ,$@)) && \
+	$(__DOMAKE) autoloads
+
+recompile: autoloads
+	cd $(CEDET_HOME) && \
+	"$(EMACS)" $(EMACSFLAGS) -l common/cedet.el \
+	-f batch-byte-recompile-directory $(CEDET_PACKAGES)
+
+## Cleanup
+##
+
+clean-autoloads: $(__CLEAN_AUTOLOADS)
+
+.PHONY: $(__CLEAN_AUTOLOADS)
+$(__CLEAN_AUTOLOADS):
+	$(FIND) $(CEDET_HOME)/$(word 2,$(subst -, ,$@)) -type f \
+	-name "*-loaddefs.el" \
+	-print -exec $(RM) {} \;
+
+.PHONY: clean-grammars
+clean-grammars:
+	$(FIND) $(CEDET_HOME) -type f -name "*-[bw]y.el" \
+	! -name "semantic-grammar-wy.el" \
+	-print -exec $(RM) {} \;
+
+.PHONY: clean-info
+clean-info:
+	$(FIND) $(CEDET_HOME) -type f -name "*.info*" \
+	-print -exec $(RM) {} \;
+
+.PHONY: clean-elc
+clean-elc:
+	$(FIND) $(CEDET_HOME) -type f -name "*.elc" \
+	-print -exec $(RM) {} \;
+
+.PHONY: clean
+clean:
+	$(FIND) $(CEDET_HOME) -type f \( -name "*-script" -o -name "*~" \) \
+	-print -exec $(RM) {} \;
+
+clean-all: clean clean-elc clean-info clean-grammars clean-autoloads
+
+### UNIT TEST Harness
+## Run the master CEDET unit-test suite.
+.PHONY: utest itest
+utest:
+	$(EMACS) $(EMACSFLAGS) -l "common/cedet.el" -f cedet-utest-batch
+
+itest:
+	cd tests; ./cit-test.sh Make
+	cd tests; ./cit-test.sh Automake
+	cd tests; ./cit-test.sh GNUStep
+
+### Install info files
+## Thanks Stefano Sabatini for the info install patch.
+INFO_FILES=$(shell $(FIND) $(CEDET_HOME) -type f -name '*.info')
+
+.PHONY: install-info
+install-info:
+	for file in $(INFO_FILES); do \
+	    cp $$file $(INFO_DIR); \
+	    $(INSTALL_INFO) $$file $(INFO_DIR)/dir ;\
+	done 
+
+## Uninstall info files 
+INSTALLED_INFO_FILES=$(shell find . -name *.info | sed -e 's|.*/\(.*\.info$$\)|$(INFO_DIR)/\1|')
+
+.PHONY: uninstall-info
+uninstall-info:
+	for file in $(INSTALLED_INFO_FILES); do \
+	    $(INSTALL_INFO) --delete $$file $(INFO_DIR)/dir ;\
+	    rm -f $$file;\
+	done
+
+
+## Build a distribution file.
+dist: # $(CEDET_PACKAGES)
+	rm -rf $(DIST_DIR)
+	mkdir $(DIST_DIR)
+	cp $(CEDET_FILES) $(DIST_DIR)
+	for package in ${CEDET_PACKAGES}; do \
+	   make -C $$package $(MFLAGS) DISTDIR=$(DIST_DIR)/$$package dist; \
+	done;
+	tar -cvzf $(DIST_FILE) $(DIST_ROOT)
+	rm -rf $(DIST_DIR)
+
+testvar:
+	@echo "$(TESTVAR)=$($(TESTVAR))"
+
+# Makefile ends here
diff --git a/site/cedet-1.0pre7/PRERELEASE_CHECKLIST b/site/cedet-1.0pre7/PRERELEASE_CHECKLIST
new file mode 100644
index 0000000..b082466
--- /dev/null
+++ b/site/cedet-1.0pre7/PRERELEASE_CHECKLIST
@@ -0,0 +1,276 @@
+Prerelease Checklist:
+--------------------
+
+  This is a list of things to do/try before posting a release to make sure
+  the release will work as well as can be expected:
+
+Before a dist is made:
+---------------------
+
+Update all version numbers
+
+  * M-x load-file RET ~/cedet/cedet-update-version.el
+  * M-x cuv-update
+    - Answer all questions, updating verion numbers as needed.
+
+Add a CVS tag
+
+  * Create a new copy of CVS TRUNK
+    - mkdir <some dir>
+    - cvs -d <username>@cedet.cvs.sourceforge.net:/cvsroot/cedet co cedet
+    - mv cedet cedet-<branchname>  # (such as cedet-1p0beta3)
+    - cd cedet-branchname
+    - touch `find . -name Makefile`
+    - make dist
+    - ./testdist.sh # Test out that basic stuff is working before tagging.
+    - cvs tag -b <branchname>     
+
+  * update new sandbox to branch
+    - cvs update -r <branchname>
+
+  * Apply patches to above while resolving other issues.
+
+  * Build the new area:
+    - touch `find . -name Makefile`
+    - make EMACS=semacs
+
+Update Changelogs
+
+  * Use a fresh emacs
+    - emacs -q
+    - M-x load-file RET common/cedet.el RET
+  * Update the Log from CVS
+    - M-x load-file RET cedet-update-changelog.el RET
+    - M-x cuc-update-all-changelogs RET
+
+Build a DIST file
+
+  * touch `find . -name Makefile`
+  * make
+  * make dist
+
+After a dist is made:
+--------------------
+
+CEDET Unit tests
+  * From a CVS area:
+  * make utest
+
+CEDET integration test
+  * From a CVS area:
+  * make itest
+
+CEDET Full distribution testing
+  * From a CVS area:
+  * make dist
+  * ./testdist.sh EMACS
+    - where EMACS is the version of emacs you want to test with
+
+CEDET & Common area
+
+  * Uncompress/Untar release archive.
+  * Compile with Makefile:
+     make
+     make EMACS=xemacs
+  * Build on multiple platforms
+     - Linux
+     - Windows
+     - Other
+
+  * Check version numbers of different tools.
+
+     - Verify output of:
+       M-x cedet-version RET
+       - Check the declared version numbers.
+       - Make sure that if changes were made to those modules, the version
+         is updated.
+
+  * Start in a clean Emacs:
+    - Start emacs this way:
+
+      emacs -q
+      -or- 
+      xemacs -q
+
+      M-x load-file RET cedet/common/cedet.el RET
+      M-x semantic-load-enable-minimum-features RET
+
+  * All individual CEDET unit test
+
+      M-x cedet-utest RET
+      - Note: Runs all automated unit tests.  These tests are repeated below.
+      - Note: This runs a couple more tests than the MAKE command above.
+
+  * Test ezimage
+
+      M-x ezimage-image-association-dump RET
+      - Verify some common images for Emacs and XEmacs.
+      M-x ezimage-image-dump RET
+      - Verify the default registered images for Emacs and XEmacs.
+
+      NOTE: These are in cedet-utest, but pictures need verification.
+
+  * Test pulse
+      M-x pulse-test RET
+      - Verify pulse does what messages say.
+      - Try in Emacs 22, and older Emacs, or XEmacs.  (different behaviors)
+
+    NOTE: This is in cedet-utest.  Needs additional x-platform care.
+
+EIEIO
+
+  * M-x eieio-browse RET
+
+    This will list the currently loaded class hierarcies.  After using
+    the test harness, and loading semantic, this should be a long list.
+
+  * Running tests for semantic/semanticdb, and EDE both test
+    other basic EIEIO features.
+
+Semantic
+
+  * Make sure the semanticdb inversion check against persistent file loading
+    is updated if the file-format has changed.
+
+  * In a clean Emacs  
+
+    Visit files for different modes.  Include:
+      All files in cedet/semantic/tests.
+      .html file of your choice.
+      .texi files from the doc directory.
+      A lisp file, such as semantic.el.
+      C# file
+      .js javascript file
+      Makefile
+
+    Start with:
+      M-x toggle-debug-on-error RET - Enable debugging within the
+          parser and incremental parser.  (Usually hidden.)
+
+    For each supported mode:
+      M-x bovinate RET - verify tags are accurate.
+      M-x speedbar RET - Open the file and verify tags.
+      - Check the TAGS menu for tags in that file.
+      
+      M-x global-semantic-highlight-edits-mode RET
+      - Edit a file.  See the highlight of newly inserted text.
+      - Customize `semantic-edits-verbose-flag' to be non-nil.
+      - Wait for the idle scheduler, it should clean up the edits.
+        - observe messages from incremental parser.  Do they relate
+	  to the edits?
+      - M-x bovinate RET - verify your changes are reflected.
+
+      Visit the menu Senator->Modes
+      - Enable that mode (if not already enabled) and verify the
+        advertised behavior.
+
+      - Test aspects of the Senator navigation menu.
+
+      M-x semantic-analyze-current-context RET
+       - Do this in different contexts in your language
+         files.   Verify that reasonable results are returned
+         such as identification of assignments, function arguments, etc.
+
+       - Optionally, use `semantic-speedbar-analysis' instead of
+         'semantic-analyze-current-context'.
+
+       - At a location with incomplete syntax (a list of arguments
+         with no close paren for instance: repeat previous step. 
+
+      M-x semanticdb-find-test-translate-path RET
+       - Verify the list matches the include files.
+         You may need to check the value of
+         `semanticdb-find-default-throttle' to determine what should, or
+ 	 should not be on the list.
+
+      - With cursor on different types of declarations:
+      M-x semantic-test-all-format-tag-functions RET
+        - Verify all formats work.
+
+      - Use your favorite semantic-enabled tool.
+
+  * Try semantic-regtest.el (from CVS).
+
+Speedbar
+
+  * In a clean Emacs
+
+    M-x speedbar RET
+
+    - browse through directories, expand tags in some files.
+    - Special support files to try:
+      - texinfo files (speedbar.texi)
+      - html files
+      - rmail files (RMAIL)
+
+    M-x Info-speedbar-browser RET
+
+    - browse through the manuals
+
+EDE
+
+   * In a clean Emacs
+
+     - Examine files in the ede directory, such as:
+       ede.el
+       ede.texi
+       NEWS
+
+     - For files in these project, verify the Project menu
+     - Try builds for these files
+     - Try some other menu items
+
+COGRE
+
+   * In a clean Emacs
+
+     M-x cogre RET mygraph RET
+
+     Create a block diagram.
+
+   * In a clean Emacs
+
+     from cogre.el, put cursor on `cogre-graph-element'
+
+     M-x cogre-uml-quick-class RET RET
+
+     - Verify the grpah.  (on parent, some direct children.)
+     - Move some blocks around (M-f, M-b, M-n, M-p)
+
+SRecode
+
+   * Verify menu working in SRT, C++, and Emacs Lisp.
+     * Make sure srecode-mode is on.
+
+   * Try inserting file:empty in some modes, and then a function
+     to make sure prompts work.
+
+   * Check the maps:
+     M-x srecode-get-maps RET
+
+     Note: In cedet-utest, but make sure the output contains the known
+           templates.
+
+GENERAL
+
+   * Run `checkdoc' against various source files to make sure
+     doc strings are conforming.
+
+DEPENDANT TOOLS
+---------------
+
+   * Test this new release against dependent tools, including:
+     - JDEE
+     - ECB
+
+After patches are applied:
+-------------------------
+
+After patches are applied to the release branch, merge them back into
+TRUNK.
+
+  In a sandbox with TRUNK/HEAD active.
+  * cvs update -j <branchname> filename
+
+    - This merges changes from the branch into the trunk.
+    - Use emacs to check these branch merges in.
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/USING_CEDET_FROM_CVS b/site/cedet-1.0pre7/USING_CEDET_FROM_CVS
new file mode 100644
index 0000000..bc94473
--- /dev/null
+++ b/site/cedet-1.0pre7/USING_CEDET_FROM_CVS
@@ -0,0 +1,77 @@
+Using CEDET from CVS:
+====================
+
+If you have loaded CEDET from CVS, you will find that the basic
+installation is almost the same as for the regular distribution.
+
+All EDE Project files for CEDET are checked into CVS along with the
+corresponding Makefiles.  Since "Project.ede" comes after "Makefile"
+alphabetically, your CVS checkout command will always leave timestamps
+that indicates that the Makefiles are out of date.
+
+Thus, the first compilation step is:
+
+-----
+touch `find . -name Makefile`
+-----
+
+To compile and install the rest of the released versions of CEDET,
+please read the INSTALL file.
+
+
+
+
+Web Site:
+========
+
+The CEDET CVS repository contains the full source to the CEDET web
+page which is usually found on:
+
+http://cedet.sf.net
+
+
+
+Unreleased Software:
+===================
+
+The CEDET CVS repository sometimes contains new software that has not
+been integrated into the CEDET distribution and build system.  This
+section describes any such tools.
+
+cedet/srecode
+-------------
+
+The SRecode tools stands for "Semantic Recoder".
+SRecode is a template library manager for auto-generating code for any
+language.  Complex code generation is managed through Semantic
+compatible tags.
+
+SRecode has a reasonable manual that will assist you in understanding
+what it is for.  To try it out, add this to your .emacs file:
+
+-------
+(add-to-list 'load-path (expand-file-name "~/cedet/srecode"))
+(require 'srecode-load)
+--------
+
+
+
+Obsolete Software:
+=================
+
+The CEDET CVS repository contains some software that has been
+obsoleted with time as newer tools come online.
+
+You can still use some of these tools if you want, but the bit-rot
+will eventually get you.
+
+cedet/quickpeek
+---------------
+
+Quick Peek was an attempt to get eldoc like behavior using only etags
+files.  It worked pretty well, but it required a clever parser to
+provide smart output.  Eventually I started writing Semantic so I
+could have a parser to do this work.  It was later obsoleted by an
+eldoc interface, and then the `semantic-idle-scheduler-mode'.
+
+
diff --git a/site/cedet-1.0pre7/cedet-build.el b/site/cedet-1.0pre7/cedet-build.el
new file mode 100644
index 0000000..6de9f67
--- /dev/null
+++ b/site/cedet-1.0pre7/cedet-build.el
@@ -0,0 +1,231 @@
+;;; cedet-build.el --- Build CEDET within Emacs.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-build.el,v 1.12 2009/12/28 14:16:12 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Build all the CEDET parts interactively through EDE.
+;;
+;; NOTE: This does not support XEmacs, which cannot use
+;;       `batch-update-autoloads' in interactive mode.
+;;
+;;; USAGE:
+;;
+;; Step 1:  Compile CEDET in a fresh Emacs:
+;;
+;;     emacs -Q -l cedet-build.el -f cedet-build
+;;     
+;;       or, if -Q isn't supported
+;;
+;;     emacs -q --no-site-file -l cedet-build.el -f cedet-build
+;;
+;;       or, if you have minimal make available, this is in the Makefile
+;;
+;;     make ebuild
+;;
+;;   or
+;;
+;;     Eval this buffer and then start compilation:
+;;
+;;     M-x eval-buffer
+;;     M-x cedet-build-in-default-emacs
+;;
+;;   or
+;;
+;;     if this is an incremental build, you can do:
+;;
+;;     M-x eval-buffer
+;;     M-x cedet-build-in-this-emacs
+;;
+;;     If EIEIO needs recompile, it will switch to compiling in
+;;     a subprocess with `cedet-build-in-default-emacs'.
+;;
+;; Step 2: Check Output.
+;;
+;;   If Compilation of grammars exceeds Emacs' stack size, exit Emacs,
+;;   and re-run the compilation steps above.  Once most of CEDET is
+;;   compiled, this problem goes away.
+
+
+;;; Code:
+
+(defvar cedet-build-location
+  (let ((dir (file-name-directory
+	      (or load-file-name (buffer-file-name)))))
+    ;; (add-to-list 'load-path dir)
+    dir)
+  "Root of the CEDET tree.")
+
+(defun cedet-build-in-default-emacs()
+  "Build CEDET in a new Emacs instance started with -Q."
+  (interactive)
+  (let ((default-directory cedet-build-location))
+    (call-process (expand-file-name invocation-name invocation-directory)
+		  nil 0 nil
+                  "-Q" "-l" "cedet-build.el" "-f" "cedet-build")
+    (message "Started new Emacs instance to build CEDET ...")))
+
+(defun cedet-build-in-this-emacs ()
+  "Build CEDET in this version of Emacs.
+This only works if EIEIO does not need to be compiled."
+  (interactive)
+  (let ((src "eieio/eieio.el") (dst "eieio/eieio.elc"))
+    (if (file-newer-than-file-p src dst)
+	(when (y-or-n-p "EIEIO needs to be recompiled.  Use subprocess? ")
+	  (cedet-build-in-default-emacs))
+      (cedet-build t))))
+
+(defun cedet-build-msg (fmt &rest args)
+  "Show a build message."
+  (if noninteractive
+      (princ (apply 'format fmt args) t)
+    (switch-to-buffer "*CEDET BYTECOMPILE*" t)
+    (goto-char (point-max))
+    (insert (apply 'format fmt args))
+    (sit-for 0)))
+
+(defun cedet-build (&optional override-check)
+  "Build CEDET via EDE.
+OVERRIDE-CHECK to override cedet short-cicuit."
+  (setq inhibit-splash-screen t)
+
+  ;; Make sure CEDET is not loaded
+  (if (and (not override-check) (featurep 'cedet))
+      (error "To use cedet-build, start Emacs with -q"))
+
+  ;; Setup a logging buffer
+  (switch-to-buffer "*CEDET BYTECOMPILE*")
+  (delete-other-windows)
+  (erase-buffer)
+  (cedet-build-msg "CEDET BYTE COMPILATION STATUS:\n\n")
+  (cedet-build-msg "Step 1: Byte compile EIEIO...")
+
+  ;; Get EIEIO built first.
+  (save-excursion
+    (load-file "common/inversion.el")
+    (load-file "common/cedet-compat.el")
+    (load-file "eieio/eieio-comp.el")
+    (let ((src "eieio/eieio.el") (dst "eieio/eieio.elc"))
+      (if (file-newer-than-file-p src dst)
+	  (progn
+	    (when (featurep 'eieio)
+	      (error "You should not recompile EIEIO after it has been loaded"))
+	    (byte-compile-file src)
+	    (cedet-build-msg "done\n"))
+	(cedet-build-msg "not needed\n")))
+    )
+
+  (load-file "common/cedet-autogen.el")
+
+  ;; Get EDE autoloads built...
+  (cedet-build-msg "Step 2: EDE Autloads...")
+  (save-excursion
+    (let ((default-directory (expand-file-name "ede")))
+      (cedet-update-autoloads "ede-loaddefs.el" ".")))
+  (cedet-build-msg "done.\n")
+
+  ;; Get Semantic autoloads built...
+  (cedet-build-msg "Step 3: Semantic Autloads...")
+  (save-excursion
+    (let ((default-directory (expand-file-name "semantic")))
+      (cedet-update-autoloads "semantic-loaddefs.el" "." "bovine" "wisent")))
+  (cedet-build-msg "done.\n")
+
+  ;; Get SRecode autoloads built...
+  (cedet-build-msg "Step 4: SRecode Autloads...")
+  (save-excursion
+    (let ((default-directory (expand-file-name "srecode")))
+      (cedet-update-autoloads "srecode-loaddefs.el" ".")))
+  (cedet-build-msg "done.\n")
+
+  ;; Fire up CEDET and EDE
+  (cedet-build-msg "Step 5: Load common/cedet.el ...")
+  (save-excursion
+    (load-file (expand-file-name "common/cedet.el" cedet-build-location)))
+
+  (cedet-build-msg "done\nStep 6: Turning on EDE ...")
+  (save-excursion
+    (global-ede-mode 1)
+    (require 'semantic-ede-grammar)
+    (require 'wisent))
+  (cedet-build-msg "done.\n\n")
+
+  ;; Load in the Makefile
+  (let ((buf (get-buffer-create "CEDET MAKE"))
+	(pkgs nil)
+	(subdirs nil)
+	)
+    (cedet-build-msg "Step 7: Scan Makefile for targets...")
+    (save-excursion
+      (set-buffer buf)
+      (insert-file-contents "Makefile" nil)
+      (goto-char (point-min))
+      (re-search-forward "CEDET_ELISP_PACKAGES\\s-*=\\s-*\\\\\n")
+      (while (looking-at "\\(\\w+\\)\\s-*\\\\?\n")
+	(setq subdirs (cons (buffer-substring-no-properties
+			     (match-beginning 1) (match-end 1))
+			    subdirs))
+	(end-of-line)
+	(forward-char 1))
+      (setq subdirs (nreverse subdirs))
+      )
+    (cedet-build-msg "%S\n\n" subdirs)
+
+    (cedet-build-msg "Build Emacs Lisp Targets:\n-------------------\n")
+    (dolist (d subdirs)
+      ;; For each directory, get the project, and then targets
+      ;; and run a build on them.
+      (cedet-build-msg "Building project %s\n" d)
+
+      (let ((Tproj (ede-current-project (file-name-as-directory
+					 (expand-file-name
+					  d cedet-build-location))))
+	    )
+	(dolist (proj (cons Tproj (oref Tproj subproj)))
+	  (cedet-build-msg "  Project: %s\n" (object-name-string proj))
+	  (dolist (targ (oref proj targets))
+	    (when (and (or (ede-proj-target-elisp-p targ)
+			   (ede-proj-target-elisp-autoloads-p targ)
+			   (semantic-ede-proj-target-grammar-p targ))
+		       (condition-case nil
+			   (oref targ :partofall)
+			 (error nil)))
+
+	      (let ((ns (object-name-string targ)))
+		(cedet-build-msg "   Target %s...%s" ns
+				 (make-string (- 20 (length ns)) ? )))
+
+	      ;; If it is an autoload or elisp target, then
+	      ;; do that work here.
+	      (let ((ans (save-excursion
+			   (project-compile-target targ))))
+		(if (and (consp ans)
+			 (numberp (car ans)))
+		    (cedet-build-msg "%d compiled, %d up to date.\n"
+				     (car ans) (cdr ans))
+		  (cedet-build-msg "done.\n"))
+		))
+	    ))))
+    (cedet-build-msg "\n\nDone.\n")))
+
+
+(provide 'cedet-build)
+;;; cedet-build.el ends here
diff --git a/site/cedet-1.0pre7/cedet-update-version.el b/site/cedet-1.0pre7/cedet-update-version.el
new file mode 100644
index 0000000..751048f
--- /dev/null
+++ b/site/cedet-1.0pre7/cedet-update-version.el
@@ -0,0 +1,96 @@
+;;; cedet-update-version --- Update version numberes in all cedet packages.
+
+;;; Copyright (C) 2005, 2006 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: cedet-update-version.el,v 1.4 2006/02/08 04:17:01 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Maintaining all these version numbers is a real pain.
+;; Try to make it a little bit easier on me.
+;;
+;; M-x cuv-update RET
+
+;;; History:
+;; 
+
+;;; Code:
+(if (not (featurep 'cedet))
+    (error "You need to have cedet loaded to manage the update versions"))
+
+(defun cuv-load-package-file (package)
+  "Get the file name for PACKAGE."
+  (setq package (symbol-name package))
+  (find-library package))
+
+(defun cuv-update-package-version (package)
+  "Update the version number for the package PACKAGE."
+  (cuv-load-package-file package)
+  ;; Find the version tag.
+  (let ((tag (car
+	      (semantic-find-tags-by-name
+	       (concat (symbol-name package) "-version")
+	       (current-buffer)))))
+    (goto-char (semantic-tag-start tag))
+    (semantic-momentary-highlight-tag tag))
+  ;; EDE will manage version numbers in files, and also
+  ;; manage updating the Project files.
+  (call-interactively 'ede-update-version)
+  ;; Update Makefiles.
+  (when (y-or-n-p "Update Makefiles from Projects? ")
+    (ede-proj-regenerate)))
+
+(defun cuv-update-all-cedet-packages ()
+  "Update all package version numbers one by one."
+  (cuv-load-package-file 'cedet)
+  (let ((p cedet-packages)
+	(cep (current-buffer))
+	(tag (car
+	      (semantic-find-tags-by-name "cedet-packages"
+					  (current-buffer)))))
+    (while p
+      (cuv-update-package-version (car (car p)))
+      (when (not (eq (car (car p)) 'cedet))
+	;; Update the constant in cedet.el also!
+	(let* ((eo (ede-toplevel))
+	       (v (oref eo :version)))
+	  (switch-to-buffer cep)
+	  (goto-char (semantic-tag-start tag))
+	  (re-search-forward (concat "(" (symbol-name (car (car p))) " +\"")
+			     (semantic-tag-end tag))
+	  (forward-char -1)
+	  (when (y-or-n-p "Update this location also? ")
+	    (kill-sexp 1)
+	    (insert (format "%S" v))
+	    (sit-for 2))
+	  ))
+      (setq p (cdr p)))))
+
+(defun cuv-update ()
+  "Interactively update all CEDET features before a release."
+  (interactive)
+  (cuv-update-all-cedet-packages)
+  (message "Revision Number Updates Complete.")
+  )
+  
+(provide 'cedet-update-version)
+
+;;; cedet-update-version.el ends here
diff --git a/site/cedet-1.0pre7/cogre/ChangeLog b/site/cedet-1.0pre7/cogre/ChangeLog
new file mode 100644
index 0000000..4649c92
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/ChangeLog
@@ -0,0 +1,1201 @@
+2009-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSPRELOAD): New
+	(utests,COGRE,utests): Add preload vars.
+
+	* Project.ede (init,Mode,COGRE,utests):
+	Use the ede-emacs-preload-compiler.
+
+2009-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile, templates/Makefile (VERSION): Update to 1.0pre7
+
+2009-05-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Update version to match CEDET.
+
+	* Project.ede ("COGRE"): Update version to match CEDET.
+
+	* cogre-mode.el (cogre-mode): Add then change-major-mode-hook below.
+	(cogre-switch-to-save-text): New fcn.
+
+	* cogre.el (cogre-version): Update to 1.0pre7.
+	(cogre-augment-element-menu): Remove the rename menu.
+	(cogre-write-save-text): New method.
+
+2009-05-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-set-scoped-node-package):
+	Fix prompt to specify package name.
+
+	* cogre.el (cogre-node::cogre-augment-element-menu): New.
+
+2009-05-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-tool-bar-map): Optional, if APIs available.
+	(cogre-mode): Don't setup toolbar if there isn't one.
+
+2009-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-semantic.el (cogre-srecode): New require.
+	(cogre-export-semantic): New API fcn.
+	(cogre-base-graph::cogre-export-semantic-method): New method.
+	(cogre-export-code): New command.
+
+	* cogre-uml.el (cogre-class::cogre-uml-stoken->uml):
+	Use `with-mode-local-symbol'.
+	(cogre-class::cogre-node-slots): Fix byte-comp warning.
+	(cogre-nodes-linkedto,cogre-nodes-all-in-list): New.
+	(cogre-uml-sort-for-lineage): New API fcn.
+
+2009-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-convert-buffer-contents-on-init):
+	If the cogre save file doesn't work, say so, and put it into
+	fundamental mode so it can be fixed.
+
+	* cogre-semantic.el (cogre-peer-semantic-class::cogre-peer-update-from-source):
+	Fix call to cogre-refresh-tag.
+
+	* cogre-semantic.el (cogre-refresh-tag): New, from below.
+	(cogre-peer-semantic-class::cogre-peer-update-from-source):
+	Use above fcn to refresh a tag.
+	(cogre-uml-quick-class): Fix use of calculated scope.
+
+2009-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-node-base-menu): Renamed from "mode-base".
+	Remove yank.  Changed to a variable/easymenu declaration combo.
+	(cogre-link-base-menu): New variable/easymenu combo.
+	(cogre-change-forms-menu): Use cogre-augment-element-menu fcn instead
+	of slot value.
+	(cogre-convert-buffer-contents-on-init): Fix rename of
+	cogre-base-graph class name.
+	(cogre-set-element-name): Set init to same as default in query.
+	(cogre-set-scoped-node-package): New fcn.
+	(cogre-down-mouse-3): Query for modifications to the node menu.
+	If so, merge and show the modified menu.
+
+	* cogre-uml.el (cogre-augment-element-menu):
+	Add menu entry for changing the package name.
+
+	* cogre.el (cogre-graph-element): Remove menu entry.
+	(cogre-graph-element::cogre-augment-element-menu): Add menu
+	augmentation method.
+
+	* cogre-utest.el (cogre-utest-quick-class):
+	Force tags update in test file.
+
+	* cogre-uml.el (require): Add cogre-semantic
+	(cogre-uml-stoken->uml): Allow cogre-semantic to not be loaded.
+
+	* cogre-semantic.el (cogre-uml-quick-class):
+	Make sure search results always pass through
+	to the next as non-nil.
+	Signal an error if class-tok isn't found.
+
+	* tests/Makefile: Makefile for tests directory.
+
+	* Makefile (utests_LISP): Renamed from tests_LISP
+	(all): Add utests (was tests), add Tests.
+	(utests): Renamed from tests.
+	(Tests): New subproject.
+	(tags, dist): Call down to new subproject.
+
+	* Project.ede ("utests"): Renamed from just "tests"
+
+	* tests/Project.ede: Test project.
+
+	* cogre-utest.el (cogre-utest-quick-class): New.
+
+	* cogre-semantic.el (cogre-peer-project-semantic): New class
+	(cogre-peer-semantic::cogre-peer-source-file): New method.
+	(cogre-peer-semantic-class::cogre-peer-update-from-source):
+	Add new code to refresh the stored tag from sources.
+	(cogre-uml-quick-class): Don't let layout cause an error.
+
+	* cogre-convert.el (cogre-base-graph::cogre-export-dot-method):
+	New method class name.
+
+	* cogre-mode.el (cogre-mode-map): Add "U" binding.
+	(cogre-mode-menu): Use better active fcn for yank.
+	Add "Update" submenu.
+	Lengthen menu names of things to export to.
+	(cogre-mode-create-popup-menu): Move "Node" to top.
+	Add Yank menu item.
+	(cogre-mode-new-link-popup-menu): Add update item.
+	(cogre-mode-update-popup-menu): Add node updates item.
+	Add Delete back in.
+	Use better active fcn for yank.
+	(cogre-insert-class-list): New method class name.
+	(cogre-killring-active, cogre-node-with-peer): New.
+	(cogre-update-node-from-source, cogre-update-graph-from-source): New.
+	(cogre-set-element-name): Update peer from element at end.
+	(cogre-move-node): If off-buffer to top or left, reset to 0, not 1.
+
+	* cogre-uml.el (cogre-package): :subgraph type is cogre-base-graph now.
+	(cogre-class::cogre-uml-stoken->uml): Format strings with
+	the major-mode active from which the tags came, when possible.
+
+	* cogre.el (cogre-base-graph): Renamed from `cogre-graph'
+	(cogre-element-peer::cogre-peer-source-file): New
+	(cogre-base-graph::initialize-instance): Method class name change.
+	Fix :detail slot :custom attribute.
+	Add :major-mode slot.
+	(cogre-graph-element): Doc fix.
+	(cogre): Create cogre-base-graph class.
+	(cogre-base-graph::initialize-instance)
+	(cogre-base-graph::eieio-done-customizing)
+	(cogre-base-graph::cogre-unique-name)
+	(cogre-base-graph::cogre-render-buffer)
+	(cogre-base-graph::cogre-save): Method class name change.
+
+	* cogre-ascii.el (cogre-export-ascii):
+	Set cogre-graph var to be the graph we are exporting.
+
+	* tests/testclasses.hh: A set of classes to test COGRE on.
+
+	* cogre-uml.el (cogre-class::cogre-uml-stoken->uml):
+	If there is a peer, use it to
+	try and find the originating buffer so that the formatting will work
+	more accurately.
+
+2009-04-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-mode-menu, cogre-mode-create-popup-menu):
+	Add calls to below.
+	(cogre-customize-graph): New.
+
+	* cogre-uml.el (cogre-class::cogre-uml-stoken->uml):
+	Visit originating file to format
+	the tag.
+	(cogre-class::cogre-node-slots): Support detail.
+	Lower details strip out duplicate information from the class.
+
+	* cogre.el (cogre-graph): Add a detail slot.
+	(cogre-graph::eieio-done-customizing): New.
+
+	* uml-create.el: Obsolete
+
+2009-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-semantic.el (cogre-uml-quick-class):
+	Use `semanticdb-find-tags-subclasses-of-type' for searching for
+	children instead of obsoleted old function.
+	Rearranged other bits.
+
+	* cogre-semantic.el (cogre-uml-quick-class):
+	Narrow down the list of classes more carefully.
+
+	* cogre-uml.el (cogre-class):
+	Remove 'class' slot.  It is no longer used.
+
+	* cogre-semantic.el (cogre-class-history, cogre-read-class-name):
+	Copied from
+	uml-create.el
+	(cogre-uml-quick-class): New implementation of old function in
+	uml-create.el.
+	Some bits were kept from the previous version, but rebuilt using new
+	peer based class nodes.
+
+	* cogre-convert.el (cogre-export-dot-png, cogre-export-dot-postscript-print):
+	Ask if the current layout should be used.  If not, let dot run
+	and calculate a new layout.
+
+	* cogre-mode.el (cogre-copy-element, cogre-yank-element):
+	Prevent name number advancement from EIEIO `clone' method.
+
+	* Makefile (COGRE_LISP): Remove uml-create.el, add cogre-semantic.el
+
+	* Project.ede (COGRE): Remove uml-create.el, add cogre-semantic.el
+
+	* cogre-semantic.el: Support for Semantic Tag based node peers.
+
+	* cogre-mode.el (cogre-mode-map): Remove `cogre-edit-label'.
+	Add C-k,C-w,M-w,C-y kill/yank node commands.
+	(cogre-mode-menu, cogre-mode-update-popup-menu):
+	 Replace 'delete' with kill/copy/yank submenu.
+	(cogre-kill-element, cogre-copy-element, cogre-yank-element):
+	New.
+
+	* cogre-utest.el (cogre-uml-utest): Deleted.
+
+	* cogre-convert.el (cogre-graph::cogre-export-dot-method):
+	Add autoload cookie.
+
+	* cogre.el (cogre-element-peer): New class
+	(cogre-element-peer::cogre-peer-update-from-source)
+	(cogre-element-peer::cogre-peer-update-from-element): New base methods.
+	(cogre-graph)
+	(cogre-graph-element): Add peers.
+
+2009-04-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-periodic.el: (cogre-periodic-node-name-list)
+	(cogre-periodic): Add a notes node.
+
+	* Makefile (dot_LISP): Add cogre-dot-mode.
+
+	* Project.ede ("dot"): Add cogre-dot-mode.el
+
+	* cogre-layout.el (cogre-layout):
+	Use cogre-dot-mode, not graphviz-dot-mode.
+
+	* cogre-convert.el (cogre-export-dot):
+	Use cogre-dot-mode, and don't try to
+	get graphviz-dot-mode working here.
+	(cogre-graph::cogre-export-dot-method): Set the current buffer
+	to the buffer the graph belongs to.
+	(cogre-export-dot-utest): Don't error out on a missing mode anymore.
+
+	* wisent-dot.el (Commentary): Discuss cogre-dot-mode substitute.
+	(cogre-dot-mode-hook): Support this mode also.
+
+	* cogre-dot-mode.el: A mini mode for graphviz dot files.
+	If graphviz-dot-mode is available, use that, otherwise supply just
+	enough to get Semantic parsing the files.
+
+	* cogre.el (cogre-graph): Do not specify an initarg for buffer slot.
+	(cogre-graph::initialize-instance): Set buffer to the current buffer.
+	(cogre): Switch to the new graph buffer before creating the
+	graph object.
+
+2009-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-convert.el (cogre-class::cogre-export-dot-label):
+	Use below to fill in methods
+	and attributes in the node.
+	(cogre-class::cogre-export-dot-methodlist)
+	(cogre-class::cogre-export-dot-fieldlist): New
+
+	* wisent-dot.el (Commentary): Remove patch
+	(wisent-dot-setup-parser): Adopt patch parts into
+	semantic-lex-syntax-modifications instead.
+
+	* wisent-dot.wy (start attribute-block): Renamed
+	(graphgeneric, attribute-block, opt-link-attributes,opt-link-attributes):
+	 Use above new name.
+	(attribute-block): New name, was name-description.
+
+	* cogre-srecode.el (cogre-srecode-load-tables): New fcn.
+
+	* cogre-convert.el (require): ps-print.
+	(cogre-export-dot): Load and test graphviz in a special way since
+	it does not have a 'provide statement.
+	Force load of srecode tables.
+	(cogre-export-dot-png): Save window excursion when creating the dot
+	file.
+	Add autoload cookie.
+	(cogre-export-dot-postscript-print): Add autoload cookie.
+
+	* wisent-dot.el (graphviz-dot-mode::semantic-tag-components):
+	Use define-mode-local-override instead of old version.
+
+	* cogre.el (cogre-find-node-by-name): New
+	(cogre-graph::cogre-unique-name): Use above instead of inline.
+
+	* cogre-layout.el (cogre-layout): Add autoload cookie
+
+	* cogre-mode.el (cogre-mode-menu): Add menu for PS Print, and layout.
+
+	* Makefile (COGRE_LISP): Add cogre-layout.el
+
+	* Project.ede (COGRE): Add cogre-layout.el
+
+	* cogre-convert.el: (cogre-export-dot-png)
+	(cogre-export-dot-postscript-print)
+	(cogre-dot-node-position-scale): Doc updates.
+
+	* cogre.texi (Top): Add below.
+	(Export): New chapter.
+
+	* cogre-convert.el (cogre-export-dot-postscript-print): New.
+	(cogre-dot-node-position-scale): New custom variable.
+	(cogre-node::cogre-export-dot-pos): Use above to scale in X/Y
+	at different amounts.
+
+	* wisent-dot.wy (graph-contents): Add below.
+	(graphgeneric): New
+	(name): Use identity for symbol return.
+
+	* cogre-srecode.el (graphviz-dot-mode::srecode-calculate-context):
+	New override method.
+
+	* cogre-layout.el: Use dot as a layout engine for COGRE.
+
+2009-04-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el (cogre-inherit):
+	Change horizontal preference ratio to .1.
+
+	* cogre-srecode.el (graphviz-dot-mode::srecode-semantic-apply-tag-to-dict):
+	Attributes are not tags, not a plist.
+
+	* cogre-convert.el (cedet-graphviz): New require.
+	(cogre-export-max-y): New variable.
+	(cogre-export-dot): Setup cogre-export-max-y.
+	(cogre-export-dot-png): Expand output filename..  Add -n argument.
+	(cogre-tag-put-dot-attribute): Convert to update a list of tags.
+	(cogre-node::cogre-export-dot-method): Add a position attribute.
+	Create all attribs as tags, not plist.
+	(cogre-export-dot-pos): New fcn.
+	(cogre-link::cogre-export-dot-method): Attrs are not tags.
+	(cogre-export-dot-utest): Links in dot are backwards, so deal.
+
+	* cogre-mode.el (cogre-mode-menu):
+	Move ASCII and DOT into an export menu, and add .png.
+
+	* cogre-convert.el (cogre-export-dot-png): New.
+
+	* wisent-dot.wy (SHAPE,LABEL,COLOR,STYLE,LEN,FONTNAME,FONTSIZE,WIDTH,HEIGHT,SPLINES,OVERLAP):
+	Deleted keywords.
+	(graph-contents): Remove label and style entries.
+	(label,style): Delete
+	(named-node): Use name instead of symbol.
+	(node-description): Remove SHAPE,LABEL,FONTNAME,FONTSIZE entries.
+	Use name instead of symbol.
+	(name): New.
+
+2009-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Add srecode.
+	(COGRE_LISP): Add cogre-srecode.el cogre-convert.el
+	(icons_MISC): Add cogre-nodes.el
+	(templates): New
+	(dist): Add templates to dist.
+
+	* Project.ede (COGRE): Add cogre-srecode.el cogre-convert.el
+	(icons): Add cogre-node.xpm
+
+	* cogre-convert.el (cogre-export-dot):
+	Require graphviz mode w/ a version number.
+	(require): Require cogre-periodic for tests.
+	(cogre-export-dot-utest): Skip test if graphviz mode isn't available.
+
+	* cogre-srecode.el (cogre-srecode-setup):
+	Don't require graphviz so stringently.
+	require 'srecode-dictionary.
+	(eval-after-load ...):
+	Don't require graphviz-dot-mode.  Key off srecode-map instead.
+
+	* cogre-uml.el (cogre-scoped-node): Add package-delimiter slot.
+	(cogre-node-title): Use above making the title.
+	(cogre-uml-enable-unicode): Change package-delimiter strings
+	to unicode equivalents.
+
+	* cogre-periodic.el (cogre-periodic-node-name-list, cogre-periodic-link-connectivity-list):
+	New.
+
+	* cogre-convert.el:
+	Conversion utilities for transforming graph data into other kinds of
+	data structures.
+
+	* cogre-srecode.el:
+	SRecode support for COGRE related graphs and DOT tags.
+
+	* templates/Makefile:
+	Makefile file for srecode templates related to cogre.
+
+	* templates/Project.ede:
+	Project file for srecode templates related to cogre.
+
+	* templates/cogre-default.srt: Default COGRE graph exporting templates.
+
+	* templates/srecode-dot.srt: Base DOT templates for srecode.
+
+2009-03-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-mode-map): Override mouse-drag events.
+
+	* cogre-mode.el (cogre-down-mouse-1):
+	If click misses all elements, then
+	pan the buffer in the window instead.
+
+	* picture-hack.el (picture-mouse-set-point):
+	Fix to handle current window hscroll.
+
+	* cogre-mode.el (cogre-mode-create-popup-menu): Remove links from menu.
+	(cogre-mode-create-popup-menu): Add note node.
+	(cogre-tool-bar-map): Add note node.
+
+	* cogre-ascii.el (cogre-package::cogre-node-rebuild-ascii):
+	Delete unused line.
+	(cogre-note::cogre-node-rebuild-ascii): New.
+
+	* cogre-uml.el (cogre-note): New node type.
+	(cogre-note::cogre-node-rebuild-default): New method.
+
+	* cogre-note.xpm: Icon for note nodes
+
+2009-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-semantic-uml-graph): Add autoload cookie.
+
+2009-03-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el (cogre-graph-element::eieio-done-customizing):
+	Erase and redraw when done customizing.
+
+	* cogre-uml.el (cogre-scoped-node): Default package is ""
+	(cogre-scoped-node::cogre-node-title): Check for "", not nil for
+	package name.
+
+	* cogre-periodic.el (cogre-periodic):
+	Add package names to one class, and one instance.
+
+	* cogre-uml.el (cogre-scoped-node): New baseclass
+	(cogre-scoped-node::cogre-node-title): New method.
+	(cogre-class, cogre-instance): Inherit from above.
+	(cogre-instance::cogre-node-widest-string): Deleted.
+	(cogre-instance::cogre-node-title): Call next method, then
+	modify the output.
+
+	* cogre.el (cogre-node::cogre-node-rebuild-default):
+	Don't reverse the title list.
+	(cogre-node::cogre-node-widest-string): Track a name list, not just
+	the name.
+
+	* cogre.el (cogre-last-event-element-type): Fix for keyboard use case.
+
+	* cogre.texi (Getting Started): Add notes about file extensions.
+	Fix doc for cogre command.
+	(Creating Nodes and Links): Add notes about mouse usage.
+	(Moving Nodes): Add notes on use of mouse, and need to refresh the
+	graph sometimes.
+
+	* cogre.el (cogre-entered): Remove old implementation.
+
+	* cogre-mode.el (cogre-save-hook):
+	When graph has no filename, but buffer does,
+	set the file into the graph.
+	Throw error if the file slot is unbound.
+
+	* cogre.el (cogre): Change doc string.
+	(cogre-graph::cogre-render-buffer): Clear modification flag after
+	drawing iff the modification flag wasn't set to start with.
+	(cogre-save-graph-as, cogre-save-graph): Deleted.
+	(cogre-load-graph): Deleted.
+	(cogre-save): Return t.
+
+	* cogre-mode.el (cogre-mode-map): Remove save from keymap.
+	(cogre-mode-menu): remove save from keymap.
+	(cogre-popup-map): New keymap.
+	(cogre-mode-create-popup-menu)
+	(cogre-mode-new-link-popup-menu)
+	(cogre-mode-update-popup-menu): Remove from main keymap, add to sub-map.
+	(cogre-mode): Add write-contents-function
+	Call cogre-convert-buffer-contents-on-init on new buffers.
+	Move rendering to the end.
+	(auto-mode-alist): Add .cgr files.
+	(cogre-convert-buffer-contents-on-init): New
+	(cogre-save-hook): New
+
+2009-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-goto-element): New, bits fron next-node.
+	(cogre-next-node): Call above
+	(cogre-render-node-after-erase): New, copied from move.
+	(cogre-set-element-name): Call above, and position.
+	(cogre-move-node): Call above.
+
+	* cogre.el (cogre-arrow): Shring left/right arrow head.
+	(cogre-link::cogre-render): Erase less from the arrow heads.
+
+	* cogre-periodic.el (cogre-periodic-utest): New test.
+
+	* Makefile (COGRE_LISP): Add cogre-ascii.el
+
+	* Project.ede (COGRE): Add cogre-ascii.
+
+	* cogre-mode.el (cogre-mode-menu): Add export-as-ascii
+	(cogre-mode): Force font-lock to be disabled.
+	(cogre-new-node): Accept FIELDS argument to modify created
+	object.
+
+	* cogre-periodic.el (cogre-periodic):
+	One of the classes now has sttributes and methods.
+	(cogre-periodic-make-node-at): Accept FIELDS argument.
+
+	* cogre-uml.el (cogre-package::cogre-node-rebuild-default):
+	Renamed from
+	cogre-node-rebuild.
+	(cogre-class::cogre-uml-stoken->uml): Accept semantic tags or
+	old style slot elements.
+
+	* cogre.el (cogre-node-rebuild-method): New variable.
+	(cogre-map-elements): Accept a graph argument.
+	(cogre-graph::cogre-render-buffer): Pass the graph into map-elements
+	(cogre-node::cogre-node-rebuild): New.  Call below.
+	May call rebuild method if set.
+	(cogre-node::cogre-node-rebuild-default): Was a bove.
+	(cogre-graph::cogre-save): Pass graph into map elements.
+
+	* cogre-ascii.el: Ascii export of a cogre graph.
+
+	* picture-hack.el (cogre-picture-insert-rectangle): Fix paren bug.
+
+	* cogre-mode.el (cogre-mode): Disable insertion of TABS.
+
+	* cogre.el (cogre-node::cogre-render, cogre-link::cogre-render):
+	Convert picture-insert-rectangle to cogre-insert-rectangle.
+
+	* picture-hack.el (cogre-picture-insert-rectangle): Fix typo
+
+	* picture-hack.el (cogre-picture-insert-rectangle):
+	Renamed from picture-insert-rectangle.
+	Removed insertp arg.
+	Replaced old delete-rectangle w/ a delete that happens just before the
+	insert on a per-line basis.
+
+2009-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-mode): Disable undo in cogre buffers.
+
+	* cogre-hasa.xpm: Fill in the diamond.
+
+	* cogre-class.xpm (cogre_class_xpm): Try to improve text.
+
+	* Makefile (COGRE_LISP): Add cogre-periodic
+	(icons_MISC): Add node, instance, arrow, and link icons.
+
+	* Project.ede (COGRE): Add cogre-periodic
+	(icons): Add node, instance, arrow, and link icons.
+
+	* cogre-link.xpm: Simple linke icon.
+
+	* cogre-periodic.el (cogre-periodic): Use new utils below.
+	Add an arrow link.
+	(cogre-periodic-make-*-at): New.
+
+	* cogre-mode.el (cogre-mode-menu): Move refresh.
+	(cogre-mode-new-link-popup-menu): New.
+	(cogre-mode-create-popup-menu): Add instance, node, link, and arrow.
+	(cogre-tool-bar-map): Add node, instance, link, and arrow.
+	(cogre-new-node, cogre-new-link): Just render the new element.
+	(cogre-set-element-name): Just render the new node.
+	(cogre-move-node): Validate input coordinates.
+	Render just this node, and attached links.
+	(cogre-move-node-*): Remove redrawing of the whole buffer.
+	(cogre-down-mouse-1): Don't rerender the whole buffer for
+	each mouse step.  Do a full refresh only at the end.
+	(cogre-down-mouse-2-link-selector, cogre-select-a-link): New.
+	(cogre-down-mouse-2): Popup a menu after drag to select
+	a link style to use.
+
+	* cogre.el (cogre-arrow): Add a new arrow type.
+
+	* cogre-uml.el (cogre-package::cogre-node-slots): Deleted
+	(cogre-package::cogre-node-rebuild): New method.
+	(cogre-inherit): Fix right-arrow.
+	(cogre-instance): New
+	(cogre-instance::cogre-node-widest-string)
+	(cogre-instance::cogre-node-title): New methods.
+	(cogre-uml-enable-unicode): Add an arrow.
+
+	* cogre-arrow.xpm: Arrow icon.
+
+	* cogre-instance.xpm: Instance node icon.
+
+	* cogre-node.xpm: Node icon.
+
+	* cogre-periodic.el: A graph that shows all the current elements.
+
+	* cogre-uml.el (cogre-package): Add some blank lines above/below name.
+	(cogre-package::cogre-node-slots): No slots.
+	(cogre-package::cogre-node-rebuild): New method.
+
+	* cogre.el (cogre-string-merge-faces): New fcn derived from below.
+	(cogre-string-with-face): Delete face merge code, call above instead.
+
+2009-03-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (icons_MISC): New
+	(all): Add icons
+	(icons): New
+	(dist): Dist the icons.
+
+	* Project.ede: Add icons target.
+
+	* cogre-utest.el (cogre-utest): Fix spelling of aggregate.
+
+2009-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-mode-map): Define map within definition.
+	Add mouse events.
+	(cogre-mode-create-popup-menu, cogre-mode-update-popup-menu):
+	New menus.
+	(cogre-move-node): Allow a node to be moved by argument.
+	(cogre-node-position): Add noerror argument.
+	(cogre-down-mouse-1): New function for dragging nodes
+	(cogre-down-mouse-2): New function for creating a link.
+	(cogre-down-mouse-3): New function for dynamic popup menus.
+
+	* cogre.el (cogre-last-event-element-type): New
+	(cogre-default-node): Use above
+	(cogre-default-link): Use above
+
+2009-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-mode.el (cogre-tool-bar-map): New.
+	(cogre-mode): Setup toolbar.
+	(cogre-new-node): Remove stray code.
+
+	* cogre-class.xpm, cogre-hasa.xpm, cogre-isa.xpm, cogre-package.xpm:
+	Icons for COGRE toolbar.
+
+	* cogre.el (cogre-default-node, cogre-default-link):
+	Support selecting a node
+	based on a key symbol.  (ie, toolbar.)
+
+	* cogre-uml.el (cogre-aggregate, cogre-uml-enable-unicode):
+	Fix typo in aggregate name.
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede, cogre.el (cogre-version): Update Version
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* .cvsignore: No info or jpg
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSFLAGS): New variable.
+	(init,dot,Mode,hacks,COGRE,tests): Use above.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("COGRE"): Updated version to 0.7
+
+	* Makefile (VERSION): Updated to 0.7
+
+	* cogre.el (cogre-version): Updated to version 0.7.
+
+2009-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-utest.el (cogre-utest-link-at):
+	Change to use 'push-mark' instead of
+	'push-mark-command'.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el (cogre-uml-enable-unicode):
+	Update doc to describe the code pages.
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Add dicussion on unicode drawing chars.
+
+	* cogre-uml.el (cogre-uml-enable-unicode): Support unicode UML symbols.
+
+	* picture-hack.el (picture-rectangle-ctr, picture-rectangle-cbl, picture-rectangle-cbr):
+	Added in from picture mode.
+	(picture-draw-rectilinear-line): Use correct corners.
+
+	* cogre-utest.el (cogre-utest): Use new cedet logging fcns.
+	Fixup to work in batch mode.
+	(cogre-utest-make-node-at): Render the graph.
+	(cogre-utest-link-at): Pass nomsg to push-mark.
+
+	* cogre-mode.el (cogre-node-position): New fcn.
+	(cogre-move-node-left, cogre-move-node-right, cogre-move-node-up):
+	(cogre-move-node-down): Use cogre-node-position.
+
+	* cogre.el (cogre-noninteractive): New fcn.
+	(cogre-graph-element::cogre-entered): No message in non-interactive mode.
+	(cogre-node::cogre-erase, cogre-node::cogre-render):
+	Convert mapcar to mapc.
+
+	* picture-hack.el (picture-insert-rectangle):
+	Don't use insert-rectangle, but do it
+	directly inline.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* picture-hack.el (picture-rectangle-ctl): XEmacs compat hack.
+	(picture-draw-rectilinear-line):
+
+	* cogre-utest.el (cogre-uml-utest): Force tag loading.
+
+2009-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-utest.el (cogre-uml-utest): New test.
+
+	* cogre-uml.el (cogre-inherit): Reduce the horizontal preference.
+
+	* Makefile (tests_LISP): New var
+	(all): Add tests
+	(dist): Add tests
+	(tests): New target
+
+	* Project.ede ("tests"): New target.
+
+	* cogre-utest.el (picture-hack, cogre-mode): New requires
+
+	* cogre-utest.el: Basic unit tests for cogre.
+
+	* cogre-mode.el (cogre-mode):
+	Disable transient mark mode in cogre buffers.
+	(cogre-new-node): Return the node
+	(cogre-new-link): Return the link
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el (cogre-package, cogre-class, cogre-inherit, cogre-aggrigate):
+	Add autoload cookies.
+
+	* cogre.el (cogre-load): Move require after eieio.
+	(cogre-graph, cogre-graph-element, cogre-node, cogre-link):
+	Add autoload cookies.
+
+2008-05-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.texi (top):
+	Update main header of COGRE, and all node entries to new format.
+	(Creating Nodes and Links)
+	(Moving Nodes, Customizing Nodes): Wrote.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated to 0.6.
+
+	* Project.ede (COGRE): Update version.
+
+	* cogre.el (cogre-version): Update to 0.6.
+
+2008-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Added EDE
+
+	* Project.ede ("COGRE"): Renamed from bogus thing.
+
+2007-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-graph::cogre-save): Deleted from this file.
+	(cogre-semantic-uml-graph::cogre-save): Allow saving.
+	(cogre-semantic-class::initialize-instance): Copy the tag found.
+
+	* uml-create.el (cogre-graph::cogre-save):
+	Add comment about why we can't save.
+
+	* cogre.el (cogre-load-graph): Stop using a temporary graph.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Stripped down version
+	(wy): Spelling fix.
+	(autoloads, init, dot, Mode, hacks, COGRE, dist):
+	Various changes from EDE patches.
+
+2007-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (semanticdb-find): Add require
+	(cogre-semantic-class::initialize-instance)
+	(cogre-read-class-name)
+	(cogre-uml-quick-class)
+	(cogre-uml-create): Convert to new semanticdb search.
+
+	* cogre-mode.el (cogre-mode): Add semantic-match-any-mode feature.
+
+	* cogre.el (cogre-load, picture-hack): Add requires for byte-comp.
+	(cogre): Add to tools group.
+
+2007-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-semantic-class::cogre-uml-stoken->uml):
+	Disable images in semantic formatted strings.
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-dot.wy, wisent-dot.el, uml-create.el, picture-hack.el, cogre-uml.el, cogre-mode.el, cogre-load.el, cogre.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("COGRE"): Update version number.
+
+	* Makefile (VERSION, Makefile): Updated from project file.
+
+	* cogre.el (cogre-version): Update version number.
+
+2004-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (semantic-grammar-batch-build-packages):
+	Use new semantic :type.
+
+2004-05-25  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated to start Emacs with --no-site-file.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Distribute the autoload file
+
+2004-03-28  David Ponce  <david@dponce.com>
+
+	* Makefile: Rebuild.
+
+	* Project.ede (wisent): Rename target to "wy".
+	(COGRE): Remove semantic-el dependency.  Add dependency on
+	inversion and speedbar.
+
+	* cogre-uml.el (cogre-class): Doc fix.
+
+2004-03-25  David Ponce  <david@dponce.com>
+
+	* wisent-dot.el (semantic-wisent): Require instead of wisent-bovine.
+
+2004-02-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Revamped. We are a part of a CEDET install now.
+
+2004-02-02  David Ponce  <david@dponce.com>
+
+	* wisent-dot.el (semantic-tag-components):
+	New override for `graphviz-dot-mode'.
+
+2004-01-23  David Ponce  <david@dponce.com>
+
+	* wisent-dot.wy: Some code cleanup.
+	(<keyword>, <symbol>, <string>, <number>): Declare as type.
+	(<punctuation>, <block>): Use type defaults.
+	(epilogue): Define `wisent-dot-lexer' here.
+
+	* wisent-dot.el (wisent-dot-lexer): Remove.  Defined in grammar.
+
+2004-01-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-dot.el (semantic-lex-dot-blocks): Deleted.
+	(wisent-dot-lexer): Remove old style analyzers. Replace with
+	auto-generated ones.
+
+	* wisent-dot.wy (punctuation, block):
+	Use new %type command to build lexers.
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Now a meta-subproject.
+
+	* Makefile (dist): Remove local creation of tar file.
+
+2003-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede, Makefile, cogre.el: Update version to 0.4beta1.
+
+2003-09-18  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (init): New target.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* cogre-load.el: New file.
+
+	* Makefile: Re-generated.
+
+	* Project.ede (autoloads): Change cogre-defs.el by cogre-loaddefs.el.
+
+2003-09-16  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (target COGRE):
+	Remove non existing file cogre-lay.el from target.
+
+2003-09-14  David Ponce  <david@dponce.com>
+
+	* wisent-dot.el (wisent-dot-setup-parser): Fix use of obsolete names.
+
+2003-09-10  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+2003-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Makefile.
+
+	* Project.ede ("wisent"): New
+	("autoloads"): New
+	("dot"): New
+	("mode"): New.
+
+	* uml-create.el:
+	(initialize-instance, cogre-token->uml-function, cogre-uml-stoken->uml)
+	(cogre-uml-browse-token-highlight-hook-fn, cogre-uml-source-marker)
+	(cogre-read-class-name, cogre-uml-quick-class): New semantic API
+
+	* cogre-mode.el: Coped elements from cogre.el
+
+	* cogre.el (cogre-box-face, cogre-box-first-face, cogre-box-last-face):
+	Removed
+	(cogre-graph-element): made abstract
+	(cogre-node): made abstract
+	(cogre-link): made abstract
+	(cogre-mode-map, cogre-substitute, cogre-insert-class-list)
+	(cogre-insert-forms-menu, cogre-change-forms-menu): Removed
+	(cogre): autoload cookie.
+	(cogre-mode, & many others): Removed
+	(cogre-default-node, cogre-default-link): Use 4th arg to
+	eieio-read-subclass.
+	(cogre-load-graph): autoload
+
+	* wisent-dot.wy: Removed obsolete code.
+
+	* wisent-dot.el (wisent-dot-automaton, other autogen): Deleted
+	(wisent-dot-setup-parser): Removed autogen parts, copied in parts
+	that used to be in the .wy file.
+
+2003-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-dot.wy (languagemode): Set to graphviz-dot-mode
+
+2003-03-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* test.dot: Sample dot file for dot parser.
+
+	* wisent-dot.el:
+	(wisent-dot-automaton, wisent-dot-keywords, wisent-dot-tokens)
+	(wisent-dot-setup-parser): Updated from grammar.
+
+	* wisent-dot.wy (FONTNAME, FONTSIZE): New tokens.
+	(DILINK, LINK): Now of punctuation type.
+	(number): New token class.
+	(graph-contents): Added graph-attributes
+	(graph-attributes): New
+	(links): Optional semicolon and attribute vector.
+
+	* wisent-dot.el:
+	Lexer, Grammar and support for parsing graphviz dot files.
+
+	* wisent-dot.wy: Grammar file for graphviz dot files
+
+2003-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (initialize-instance):
+	Use new function that calculates externally
+	defined children of a type.
+	(cogre-uml-quick-class): typo
+
+2001-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version.
+	New layout code.
+
+	* uml-create.el (cogre-save): New method.
+	(initialize-instance): Enable classes and structures.
+	Add default name for unfound classes in semantic.
+	(cogre-uml-stoken->uml): Get buffer from objectified class.
+	(cogre-uml-quick-class): Get the superclass instead of just the parent.
+
+	* picture-hack.el (picture-insert): Fix for older versions of Emacs.
+
+	* cogre-uml.el (cogre-class): Add :custom specifiers to some slots.
+
+	* cogre.el (cogre-graph): Added extension.
+	(cogre-node):  Remove initargs from fields not to be saved.
+	(cogre-link): Enable STRINGS as node entries for intermediate save state.
+	(cogre-loading-from-file): New variable.
+	(cogre-mode-map): Supress the keymap. Add save command.
+	(cogre-mode-menu): Added Save and Save As entries.
+	(cogre-map-elements, cogre-map-graph-elements): New fcn
+	(initialize-instance): Do not initialize when loading from a file.
+	(cogre-render-buffer): Use new map-lements command.
+	(cogre-element-pre-serialize, cogre-element-post-serialize): New methods.
+	(cogre-save-graph-as, cogre-save-graph, cogre-load-graph): New commands.
+
+2001-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-uml-browse-token-hook): New hook.
+	(cogre-uml-browse-token-highlight-hook-fn): New function for above.
+	(cogre-uml-source-marker): Use hook instead of always highlighting a token.
+
+	* uml-create.el (cogre-token->uml-function): New variable.
+	(cogre-uml-stoken->uml): Use above to generate text.
+	(cogre-uml-source-marker): Momentary highlight tokens.
+
+	* picture-hack.el (picture-insert):
+	Fix move-to-column typo from previous checkin.
+
+	* cogre.el: Update version.
+	(eieio-base): require
+	(cogre-custom-originating-graph-buffer): New local variable.
+	(cogre-activate): Track the originating buffer before customizing.
+	(eieio-done-customizing::cogre-graph-element): Set buffer to the
+	graph before forcing a re-render.
+
+2001-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* picture-hack.el:
+	Use `move-to-column' instead of `move-to-column-force' for backward
+	compatibility.
+
+2001-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Project file for cogre.
+
+	* cogre.texi: Outline of a cogre manual
+
+	* picture-hack.el (picture-insert-rectangle):
+	Added Emacs 21 compatibility comment.
+	(clear-rectangle): New compatibility function.
+
+	* cogre.el: Support latest EIEIO changes.
+	(cogre-new-node): Pass prefix arg to `cogre-default-node'.
+	(cogre-new-link): Pass prefix arg to `cogre-default-link'.
+	(cogre-layout): Remove these methods.
+
+2001-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el: Added comment about ASCII UML.
+
+2001-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el: Use :class instead of class for allocation of slots.
+
+2001-06-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Installation instructions for COGRE.
+
+2001-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* picture-hack.el (Colin Marquardt):
+	Added XEmacs compatibility functions.
+
+2001-06-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-uml-stoken->uml):
+	Call abbreviate token from the originating buffer.
+
+2001-05-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el (cogre-string-with-face):
+	Fixed bug in last fix that colorized everything.
+
+	* uml-create.el: do not use window-list, it is Emacs 21 only.
+
+	* cogre.el:
+	Stopped using `plist-member' which appears to be Emacs 21 only.
+
+2001-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el (cogre-semantic-uml-graph): New class.
+	(cogre-insert-clas-slist:cogre-semantic-uml-graph): New method.
+	(cogre-uml-source-marker:cogre-semantic-class): New method
+	(cogre-uml-source-display): Split into cogre-uml-source-marker for
+	getting the position to jump to.
+	(cogre-activate:cogre-semantic-class): New method.
+	(cogre-uml-quick-class): Make sure all tokens are in buffers.
+	Create the graph from cogre-semantic-uml-graph.
+
+	* cogre.el (cogre-node): Fixed documentation.
+	(cogre-substitute): Doc fix.
+	(cogre-mode-map): Added RETURN binding to edit/view.
+	(cogre-insert-class-list:cogre-graph): New method
+	(cogre-insert-forms-menu): Call graph method for things to insert.
+	(cogre): accept an argument for the class of the graph to create.
+	(cogre-activate-element): New function.
+	(cogre-activate:cogre-graph-element): New method.
+
+2001-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* uml-create.el: Code from `cogre-uml.el' specific to semantic.
+	New code handles graph/source interactions.
+
+	* cogre-uml.el: Moved out semnatic specific UML into `uml-create.el'
+	(cogre-uml-stoken->uml): New function.
+	(cogre-node-slots): Use above.
+
+	* cogre.el (*-face): Under/Over lines match default foreground color.
+	(cogre-link): Types are now the explicit class name (return of eieio feature).
+	(cogre-move-node): Inhibit motion hooks.
+	(cogre-render-buffer): Inhibit motion hooks.
+	(cogre-entered, cogre-left: cogre-graph-element): New methods.
+	(cogre-node-rebuild): Use underlining when possible instead of overlining.
+	(cogre-string-with-face): Propagate properties on passed in strings.
+	Conglomerate new face with old faces.
+
+2001-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el: Converted to use the new eieio-named base class.
+	Added "Delete" to the menu.
+
+	* cogre-uml.el: Converted to use the new eieio-named base class.
+
+2001-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el (cogre-class): Set the alignment to left.
+	(cogre-node-slots): Use the new uml-abbreviate method.
+	(cogre-read-class-name): Fix bugs w/ current class under cursor.
+	(cogre-uml-quick-class): Added recentering code.
+
+	* cogre.el (cogre-horizontal-margins, cogre-vertical-margins):
+	New variables
+	(cogre-graph-element): Added `menu' field.
+	(cogre-node): Added `alignment' field.
+	Added menu to minor mode keymap.
+	(cogre-insert-forms-menu, cogre-change-forms-menu): New fcn.
+	(cogre-new-node,cogre-new-link): Only rerender if interactive.
+	(cogre-move-node): Pulled out guts into a method.
+	(cogre-move, cogre-move-detla): New Node mehtods.
+	(cogre-rebuild:cogre-node): Added alignment when rebuilding the rect.
+	(cogre-string-with-face): Handle an alignment argument.
+	(cogre-current-element): Make the passed in point optional.
+
+2001-05-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el: Messed with some link icons.
+	Added a class slot to the class node.
+	Added cogre-uml-quick-class, and got most of it working.
+
+2001-04-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el: Added new default names to nodes.
+	Initialize a CLASS node by asking for a class, derived from semantic,
+	from which the the details are created.
+	Fixed typo for ratio.
+	Fixed `cogre-read-class-name'.
+
+	* cogre.el:
+	Added a layout direction to links so they can choose a preferred layout.
+	Moved cogre-substitute so it wouldn't throw an error.
+	Always truncate lines in a graph.
+	Fixed bug when choosing the face of the last slot in a box.
+	Updated widest-string method to also take slots into account.
+	Fixed anchor calculation for endpoint down links.
+	Added mock functions for the layout engine.
+
+2001-04-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre-uml.el: *** empty log message ***
+
+2001-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el:
+	Allow links to contain a start/end which is a child of cogre-node.
+	Added support for start/end glyps on lines.
+	Added new fns to handle default node/link insertion.  Thus, you will
+	always insert the same type of node as done previously unless you
+	explicitly call something to set the defualt node, or use c-u prefix.
+
+2001-04-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el: Moved many bits to picture-hack.el where appropriate.
+	Added a preference-ratio and a stop-position to links.
+	Added a DELETE command to delete items.
+	Added more *-at-point-interactive functions.
+	Support links when TABing between items.
+	Added utils for calculating distances and anchors between nodes.
+	Fixed up link render to be simpler with the new utils.
+
+	* picture-hack.el: Hacks to override and augment picture.el
+
+2001-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cogre.el: *** empty log message ***
+
diff --git a/site/cedet-1.0pre7/cogre/INSTALL b/site/cedet-1.0pre7/cogre/INSTALL
new file mode 100644
index 0000000..96960b9
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/INSTALL
@@ -0,0 +1,12 @@
+How to install COGRE
+
+1) Byte compile COGRE (optional, but recommended)
+
+   Follow the INSTALL file in the top level of this distribution.
+
+2) Configure
+
+   You can attempt to enable the use of unicode drawing symbols
+   in COGRE graphs with the following command in your .emacs file.
+
+   (cogre-uml-enable-unicode)
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/cogre/Makefile b/site/cedet-1.0pre7/cogre/Makefile
new file mode 100644
index 0000000..60f1327
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/Makefile
@@ -0,0 +1,167 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+wy_SEMANTIC_GRAMMAR=wisent-dot.wy
+LOADPATH= ../common/
+COGRE_LISP=cogre.el cogre-uml.el cogre-periodic.el cogre-ascii.el cogre-srecode.el cogre-convert.el cogre-layout.el cogre-semantic.el
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../ede/ ../common/ ../semantic/ ../eieio/\
+    ../semantic/wisent/  ../srecode/ ../speedbar/ ../semantic/bovine/
+wy_SEMANTIC_GRAMMAR_EL=wisent-dot-wy.el
+LOADDEFS=cogre-loaddefs.el
+LOADDIRS=.
+init_LISP=cogre-load.el
+ELISPPRELOAD= cedet-compat
+dot_LISP=wisent-dot.el cogre-dot-mode.el
+Mode_LISP=cogre-mode.el
+info_TEXINFOS=cogre.texi
+MAKEINFO=makeinfo
+misc_MISC=INSTALL ChangeLog
+hacks_LISP=picture-hack.el
+utests_LISP=cogre-utest.el
+icons_MISC=cogre-class.xpm cogre-hasa.xpm cogre-isa.xpm cogre-package.xpm cogre-node.xpm cogre-instance.xpm cogre-arrow.xpm cogre-link.xpm cogre-note.xpm
+VERSION=1.0pre7
+DISTDIR=$(top)COGRE-$(VERSION)
+
+
+
+all: wy autoloads init dot Mode cogre.info misc hacks COGRE utests icons Tests templates
+
+.PHONY: wy
+wy: $(wy_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: dot
+dot: $(dot_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: Mode
+Mode: $(Mode_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+cogre.info: $(info_TEXINFOS)
+	$(MAKEINFO) $<
+
+misc: 
+	@
+
+.PHONY: hacks
+hacks: $(hacks_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: COGRE
+COGRE: $(COGRE_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: utests
+utests: $(utests_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+icons: 
+	@
+
+.PHONY:Tests
+Tests:
+	$(MAKE) -C tests
+
+.PHONY:templates
+templates:
+	$(MAKE) -C templates
+
+tags: 
+	$(MAKE) -C tests/ $(MFLAGS) $@
+	$(MAKE) -C templates/ $(MFLAGS) $@
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: $(wy_SEMANTIC_GRAMMAR_EL) autoloads cogre.info
+	mkdir $(DISTDIR)
+	cp $(wy_SEMANTIC_GRAMMAR) $(wy_SEMANTIC_GRAMMAR_EL) cogre-loaddefs.el $(init_LISP) $(dot_LISP) $(Mode_LISP) $(info_TEXINFOS) cogre.info* $(misc_MISC) $(hacks_LISP) $(COGRE_LISP) $(utests_LISP) $(icons_MISC) $(ede_FILES) $(DISTDIR)
+	$(MAKE) -C tests $(MFLAGS) DISTDIR=$(DISTDIR)/tests dist
+	$(MAKE) -C templates $(MFLAGS) DISTDIR=$(DISTDIR)/templates dist
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/cogre/Project.ede b/site/cedet-1.0pre7/cogre/Project.ede
new file mode 100644
index 0000000..8d1b6ce
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/Project.ede
@@ -0,0 +1,78 @@
+;; Object COGRE
+;; EDE project file.
+(ede-proj-project "COGRE"
+  :name "COGRE"
+  :version "1.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (semantic-ede-proj-target-grammar "wy"
+    :name "wy"
+    :path ""
+    :source '("wisent-dot.wy")
+    )
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "cogre-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("cogre-load.el")
+    :compiler 'ede-emacs-preload-compiler
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-elisp "dot"
+    :name "dot"
+    :path ""
+    :source '("wisent-dot.el" "cogre-dot-mode.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("wisent" "mode-local")
+    )
+   (ede-proj-target-elisp "Mode"
+    :name "Mode"
+    :path ""
+    :source '("cogre-mode.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-makefile-info "info"
+    :name "info"
+    :path ""
+    :source '("cogre.texi")
+    )
+   (ede-proj-target-makefile-miscelaneous "misc"
+    :name "misc"
+    :path ""
+    :source '("INSTALL" "ChangeLog")
+    )
+   (ede-proj-target-elisp "hacks"
+    :name "hacks"
+    :path ""
+    :source '("picture-hack.el")
+    )
+   (ede-proj-target-elisp "COGRE"
+    :name "COGRE"
+    :path ""
+    :source '("cogre.el" "cogre-uml.el" "cogre-periodic.el" "cogre-ascii.el" "cogre-srecode.el" "cogre-convert.el" "cogre-layout.el" "cogre-semantic.el")
+    :versionsource '("cogre.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "semantic" "semantic-el" "inversion" "speedbar" "srecode")
+    )
+   (ede-proj-target-elisp "utests"
+    :name "utests"
+    :path ""
+    :source '("cogre-utest.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-makefile-miscelaneous "icons"
+    :name "icons"
+    :path ""
+    :source '("cogre-class.xpm" "cogre-hasa.xpm" "cogre-isa.xpm" "cogre-package.xpm" "cogre-node.xpm" "cogre-instance.xpm" "cogre-arrow.xpm" "cogre-link.xpm" "cogre-note.xpm")
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/cogre.shtml"
+  :web-site-directory "/r@scp:shell.sourceforge.net:cedet/htdocs"
+  :web-site-file "cogre.shtml"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/cogre/cogre-arrow.xpm b/site/cedet-1.0pre7/cogre/cogre-arrow.xpm
new file mode 100644
index 0000000..8f96a88
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-arrow.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_arrow_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+"           ..           ",
+"         .....          ",
+"         . . .          ",
+"        .  .  ..        ",
+"      ..   .   ..       ",
+"      .    .    .       ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-ascii.el b/site/cedet-1.0pre7/cogre/cogre-ascii.el
new file mode 100644
index 0000000..819bdb1
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-ascii.el
@@ -0,0 +1,171 @@
+;;; cogre-ascii.el --- Export a cogre diagram to ASCII.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-ascii.el,v 1.3 2009/04/11 06:09:43 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Export a cogre diagram into all ASCII art.
+
+;;; Code:
+
+;;;###autoload
+(defun cogre-export-ascii ()
+  "Export the current diagram into an ASCII buffer."
+  (interactive)
+  (when (not (eieio-object-p cogre-graph)) (error "No graph to export"))
+
+  (let* ((g cogre-graph)
+	 (name (oref g name))
+	 )
+
+    (switch-to-buffer (get-buffer-create (concat "*ASCII Graph " name "*")))
+    (erase-buffer)
+    (kill-all-local-variables)
+    
+    ;; Reset the drawing routines.
+    (let ((cogre-node-rebuild-method 'cogre-node-rebuild-ascii)
+	  ;; Need this for rendering.
+	  (cogre-graph g)
+	  )
+
+      ;; Force the redraw
+      (cogre-render-buffer g t))
+    ))
+
+(defun cogre-horizontal-box-line (width)
+  "Return a string that can be the top or bottom of a box with a line.
+The line will be WIDTH chars long."
+  (concat "+"
+	  (make-string (- width 2) picture-rectangle-h)
+	  "+"))
+
+(defun cogre-string-with-edges (str width align)
+  "Return a string based on STR that is WIDTH chars wide.
+The string will be justified based on ALIGN.
+The string will have a box chars, such as | on either side."
+  (when (> (length str) (- width 2))
+    ;; If the string is too short, trim it.
+    (setq str (substring 0 (- width 2))))
+  (when (< (length str) (- width 2))
+    ;; String is too short
+    (let ((buff (make-string (- width 2 (length str)) ? )))
+      (cond ((eq align 'right)
+	     (setq str (concat buff str)))
+	    (t
+	     (setq str (concat str buff))))) )
+  (concat (make-string 1 picture-rectangle-v)
+	  str
+	  (make-string 1 picture-rectangle-v)))
+
+(defmethod cogre-node-rebuild-ascii ((node cogre-node))
+  "Create a new value for `:rectangle' in NODE.
+The `:rectangle' slot is inserted with rectangle commands.
+A Rectangle is basically a list of equal length strings.
+Those strings must have the proper face values on them.
+Always make the width 2 greater than the widest string."
+  (let* ((width (+ (cogre-node-widest-string node) 2))
+	 (top-lines (oref node blank-lines-top))
+	 (bottom-lines (oref node blank-lines-bottom))
+	 (title (cogre-node-title node))
+	 (slots (cogre-node-slots node))
+	 (align (oref node alignment))
+	 (first t)
+	 (rect nil))
+
+    (setq rect (cons (cogre-horizontal-box-line width)
+		     rect))
+
+    (while (> top-lines 0)
+      (setq rect (cons (cogre-string-with-edges "" width align)
+		       rect)
+	    top-lines (1- top-lines)))
+
+    (setq title (nreverse title))
+    (while title
+      (setq rect (cons (cogre-string-with-edges (car title) width align)
+		       rect)
+	    title (cdr title)))
+    (while slots
+      (let ((sl (car slots)))
+	(setq rect (cons (cogre-horizontal-box-line width)
+			 rect))
+	
+	(while sl
+	  (setq rect (cons (cogre-string-with-edges (car sl) width align)
+			   rect)
+		sl (cdr sl))))
+      (setq slots (cdr slots)))
+
+    (while (> bottom-lines 0)
+      (setq rect (cons (cogre-string-with-edges "" width align)
+		       rect)
+	    bottom-lines (1- bottom-lines)))
+
+    ;; Bottom of the box.
+    (setq rect (cons (cogre-horizontal-box-line width)
+		     rect))
+
+    ;; Set the string into our graph node.
+    (oset node rectangle (nreverse rect))))
+
+
+(defmethod cogre-node-rebuild-ascii ((node cogre-package))
+  "Create the text rectangle for the COGRE package.
+Calls the base method, and takes the return argument and
+tweaks the faces."
+  (let* ((rect (call-next-method))
+	 (first (car rect))
+	 )
+    ;; Tweak the first and second string if it is long enough.
+    (when (> (length first) 7)
+      (let* ((backlen (- (length first) 4))
+	     (newfirst (concat (cogre-horizontal-box-line 5)
+			       (make-string (- backlen 1) ? )))
+	     (newsecond (concat (make-string 1 picture-rectangle-v)
+				(make-string 3 ? )
+				(cogre-horizontal-box-line backlen))))
+	(setcar rect newfirst)
+	(setcar (cdr rect) newsecond)
+	))
+    ;; Return it.
+    rect))
+    
+(defmethod cogre-node-rebuild-ascii ((node cogre-note))
+  "Create the text rectangle for the COGRE package.
+Calls the base method, and takes the return argument and
+tweaks the faces."
+  (let* ((rect (call-next-method))
+	 (first (car rect))
+	 (second (car (cdr rect))))
+    ;; Tweak the first and second string iff it is long enough.
+    (aset first 0 ? )
+    (aset first 1 ?,)
+    (aset first 2 ?+)
+    (setcar rect first)
+    (aset second 0 ?+)
+    (aset second 1 ?-)
+    (aset second 2 ?+)
+    (setcar (cdr rect) second)
+    ;; Return it.
+    rect))
+
+(provide 'cogre-ascii)
+;;; cogre-ascii.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-class.xpm b/site/cedet-1.0pre7/cogre/cogre-class.xpm
new file mode 100644
index 0000000..4d055ec
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-class.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_class_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+" ...................... ",
+" .                    . ",
+" .  ..                . ",
+" . .  . .  .          . ",
+" ...    . . .  ..  .. . ",
+" ..     .  .. .   .   . ",
+" ...    . . .  ..  .. . ",
+" . .  . . ... ... . . . ",
+" .  ..     .   .   .  . ",
+" .                    . ",
+" .                    . ",
+" ...................... ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" ...................... ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" ...................... ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-convert.el b/site/cedet-1.0pre7/cogre/cogre-convert.el
new file mode 100644
index 0000000..515aaca
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-convert.el
@@ -0,0 +1,387 @@
+;;; cogre-convert.el --- Conversion for cogre charts into other formats
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-convert.el,v 1.12 2009/04/11 06:18:11 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Conversions for COGRE charts.
+;;
+;; A cogre chart is a collection of nodes and lines.  Some charts,
+;; such as UML class diagrams, actually represent other kinds of structure.
+;;
+;; The COGRE-CONVERT utilities is a framework for transforming a graph
+;; into some other LISP structure.  Some conversions, such as to ASCII
+;; override drawing code.  Conversions transform the data instead.
+;;
+;; @TODO - re-write below as things are implemented
+;; Ideas for conversions:
+;;   graph -> semantic tags
+;;   graph -> dot tags
+;;   graph -> xml for dia, or other case tool
+;;
+;; Ideas for reverse conversion?
+;;   semantic tags   -> graph
+;;   xml fir dia     -> graph
+;;   parsed dot file -> graph
+;;
+;;
+;; Implementation strategy
+;;  My thoughts on getting to the above.
+;;  1) Write a straight-up converter to dot.
+;;  2) Guess what an abstract converter looks like based on dot
+;;  3) Promote the generic API, and write semantic-tag converter.
+
+(require 'cogre-srecode)
+(require 'cedet-graphviz)
+(eval-when-compile (require 'ps-print))
+;;; Code:
+(defvar cogre-export-max-y nil
+  "Max y value in the current chart.")
+
+;;;###autoload
+(defun cogre-export-dot ()
+  "Export the current COGRE graph to DOT notation.
+DOT is a part of GraphViz."
+  (interactive)
+  (when (not (eieio-object-p cogre-graph)) (error "No graph to export"))
+
+  (let* ((g cogre-graph)
+	 (name (oref g name))
+	 (fname (concat name ".dot"))
+	 (ede-auto-add-method 'never)
+	 )
+    ;; Load in the file
+    (switch-to-buffer (find-file fname))
+    (erase-buffer)
+
+    ;; Get a parsing mode running here.
+    (cogre-dot-mode)
+    
+    ;; Convert G into this buffer.
+    (let* ((graphtag (cogre-export-dot-method g))
+	   (members (semantic-tag-get-attribute graphtag :members))
+	   (cogre-srecode-current-graph g)
+	   )
+      ;; Load our tables.
+      (cogre-srecode-load-tables)
+
+      ;; Start it out.
+      (srecode-insert "file:cogre")
+
+      ;; Insert all the tags.
+      (srecode-semantic-insert-tag graphtag)
+
+      (dolist (M members)
+	(srecode-semantic-insert-tag M))
+
+      (save-buffer)
+      (message "Converted graph into %d dot nodes."
+	       (length (semantic-tag-get-attribute graphtag :members)))
+      )))
+
+;;;###autoload
+(defun cogre-export-dot-png ()
+  "Export the current COGRE graph to DOT, then convert that to PNG.
+The png file is then displayed in an Emacs buffer.
+DOT is a part of GraphVis."
+  (interactive)
+  ;; Make sure things are installed ok.
+  (cedet-graphviz-dot-version-check)
+  ;; Run dot to create the file.  The graph was already
+  ;; verified.
+  (let* ((def (file-name-nondirectory (concat (oref cogre-graph :name)
+					      ".png")))
+	 (fname (read-file-name "Write to: "
+				default-directory nil nil def))
+	 (keeplayout (y-or-n-p "Keep current Layout? "))
+	 )
+    ;; Convert to dot
+    (save-window-excursion
+      (cogre-export-dot)
+      ;; Convert from dot to png
+      (if keeplayout
+	  (cedet-graphviz-translate-file (current-buffer)
+					 (expand-file-name fname)
+					 "png"
+					 "-n")
+	(cedet-graphviz-translate-file (current-buffer)
+				       (expand-file-name fname)
+				       "png")))
+
+    (let ((ede-auto-add-method 'never))
+      (find-file fname))
+    ))
+
+;;;###autoload
+(defun cogre-export-dot-postscript-print ()
+  "Print the current graph.
+This is done by exporting the current COGRE graph to DOT, then
+convert that to Postscript before printing.
+DOT is a part of GraphVis."
+  (interactive)
+  ;; Make sure things are installed ok.
+  (cedet-graphviz-dot-version-check)
+  ;; Run dot to create the file.  The graph was already
+  ;; verified.
+  (let ((keeplayout (y-or-n-p "Keep current Layout? ")))
+
+    ;; Convert to dot
+    (cogre-export-dot)
+
+    ;; Convert from dot to postscript
+    (save-excursion
+      (set-buffer
+       (if keeplayout
+	   (cedet-graphviz-translate-file (current-buffer)
+					  nil
+					  "ps"
+					  "-n")
+	 (cedet-graphviz-translate-file (current-buffer)
+					nil
+					"ps")))
+
+      (require 'ps-print)
+      (let ((ps-spool-buffer (current-buffer)))
+	(ps-do-despool nil))
+      )))
+
+;;;###autoload
+(defmethod cogre-export-dot-method ((g cogre-base-graph))
+  "Convert G into DOT syntax of semantic tags."
+  (save-excursion
+    (set-buffer (oref g buffer))
+    (let ((cogre-export-max-y (count-lines (point-min) (point-max))))
+      (semantic-tag (oref g :name)
+		    'digraph
+		    :members 
+		    (cogre-map-elements 'cogre-export-dot-method g)
+		    )
+      )))
+
+(defun cogre-tag-put-dot-attribute (tag attribute value)
+  "Get the attributes in TAG, and set ATTRIBUTE to VALUE.
+This works similarly to `semantic-tag-put-attribute'."
+  (let* ((lst (semantic-tag-get-attribute tag :attributes))
+	 (atag (semantic-find-first-tag-by-name attribute lst)))
+    (cond
+     ;; If there is one, just change the value.
+     (atag
+      (semantic-tag-put-attribute atag :value value))
+     ;; No list at all.  Make one.
+     ((null lst)
+      (semantic-tag-put-attribute
+       tag :attributes
+       (list (semantic-tag attribute 'attribute :value value))))
+     ;; Add to the existing list.
+     (t
+      (add-to-list 'lst
+		   (semantic-tag attribute 'attribute :value value)
+		   t)))
+    tag))
+
+;;; NODES
+(defmethod cogre-export-dot-method ((node cogre-node))
+  "Convert NODE into DOT syntax of semantic tags."
+  (semantic-tag
+   (oref node :object-name)
+   'node
+   :attributes
+   (list
+    (semantic-tag "shape" 'attribute :value (cogre-export-dot-shape node))
+    (semantic-tag "label" 'attribute :value (cogre-export-dot-label node))
+    ;; Position in points.
+    (semantic-tag "pos" 'attriute :value (cogre-export-dot-pos node))
+    )
+   )
+  )
+
+(defcustom cogre-dot-node-position-scale (cons 6 12)
+  "The scale to use when converting between COGRE and DOT position values.
+This is of the format ( XSCALE . YSCALE ).
+DOT uses points, where as COGRE uses characters."
+  :group 'cogre
+  :type 'cons)
+
+(defmethod cogre-export-dot-pos ((node cogre-node))
+  "Return a DOT compatible position."
+  (let* ((pos (oref node position))
+	 (scalex (car cogre-dot-node-position-scale))
+	 (scaley (cdr cogre-dot-node-position-scale)))
+    (format "%d,%d" (* scalex (aref pos 0))
+	    ;; Dot does stuff upside-down, so we need to invert Y
+	    (* scaley (- cogre-export-max-y (aref pos 1))))))
+
+(defmethod cogre-export-dot-shape ((node cogre-node))
+  "Convert NODE into DOT syntax of semantic tags."
+  "box")
+
+(defmethod cogre-export-dot-shape ((node cogre-class))
+  "Convert NODE into DOT syntax of semantic tags."
+  "record")
+
+(defmethod cogre-export-dot-shape ((node cogre-package))
+  "Convert NODE into DOT syntax of semantic tags."
+  "tab")
+
+(defmethod cogre-export-dot-shape ((node cogre-note))
+  "Convert NODE into DOT syntax of semantic tags."
+  "note")
+
+(defmethod cogre-export-dot-label ((node cogre-node))
+  "Convert NODE into DOT syntax of semantic tags."
+  (mapconcat 'identity (cogre-node-title node) "\\n"))
+
+(defmethod cogre-export-dot-label ((node cogre-scoped-node))
+  "Convert NODE into DOT syntax of semantic tags."
+  (let ((name (oref node :object-name))
+	(pack (oref node :package-name)))
+    (if (<= (length pack) 0)
+	name
+      (setq pack (concat "\\<\\<" pack "\\>\\>"))
+      (concat pack "\\n" name))))
+
+(defmethod cogre-export-dot-label ((node cogre-class))
+  "Convert NODE into DOT syntax of semantic tags."
+  (concat "{" (call-next-method) "|"
+	  (cogre-export-dot-fieldslist node) "|"
+	  (cogre-export-dot-methodlist node) "}"))
+
+(defmethod cogre-export-dot-methodlist ((node cogre-class))
+  "Get a list of methods on NODE.  Return as \n separated list."
+  (mapconcat (lambda (s) (cogre-uml-stoken->uml node s)) (oref node methods) "\\n"))
+
+(defmethod cogre-export-dot-fieldslist ((node cogre-class))
+  "Get a list of fields on NODE.  Return as \n separated list."
+  (mapconcat (lambda (s) (cogre-uml-stoken->uml node s)) (oref node attributes) "\\n"))
+
+(defmethod cogre-export-dot-label ((node cogre-instance))
+  "Convert NODE into DOT syntax of semantic tags."
+  (let ((title (call-next-method)))
+    (if (string-match "\\\\n" title)
+	(replace-match "n:" t t title)
+      (concat ":" title))))
+
+;;; LINKS		  
+(defmethod cogre-export-dot-method ((link cogre-link))
+  "Convert LINK into DOT syntax of semantic tags."
+  (let ((start (oref link start))
+	(end (oref link end)))
+    (semantic-tag (oref end :object-name)
+		  'link
+		  :to (oref start :object-name)
+		  :attributes
+		  ( list
+		    (semantic-tag "arrowhead" 'attribute :value "none")
+		    (semantic-tag "arrowtail" 'attribute :value "none")
+		    )
+		  )))
+		
+(defmethod cogre-export-dot-method ((link cogre-inherit))
+  "Convert LINK into DOT syntax of semantic tags."
+  (let ((tag (call-next-method))
+	(end (oref link end)))
+    (cogre-tag-put-dot-attribute tag "arrowtail" "empty")
+    (cogre-tag-put-dot-attribute tag "arrowsize" "2")
+    ;(cogre-tag-put-dot-attribute tag :sametail (oref end :object-name))
+    tag))
+		
+(defmethod cogre-export-dot-method ((link cogre-aggregate))
+  "Convert LINK into DOT syntax of semantic tags."
+  (let ((tag (call-next-method)))
+    (cogre-tag-put-dot-attribute tag "arrowhead" "diamond")
+    tag))
+		
+(defmethod cogre-export-dot-method ((link cogre-arrow))
+  "Convert LINK into DOT syntax of semantic tags."
+  (let ((tag (call-next-method)))
+    (cogre-tag-put-dot-attribute tag "arrowhead" "open")
+    tag))
+
+;;; TESTS
+;;
+(eval-when-compile (require 'cogre-periodic))
+
+;;;###autoload
+(defun cogre-export-utest ()
+  "Run all the COGRE structured export/convert test."
+  (interactive)
+  (cogre-export-dot-utest)
+  ;;(cogre-export-typed-lang-utest)
+  )
+
+(defun cogre-export-dot-utest ()
+  "Run the COGRE structured dot output converter test.
+Basic DOT doesn't require much, so we'll use the periodic
+table as an example."
+  (interactive)
+
+  ;; Step one, create the graph.
+  (if (get-buffer "*Graph Periodic*")
+      (switch-to-buffer "*Graph Periodic*")
+    (cogre-periodic))
+  ;; Step 2, convert.
+  (message "Converting graph %s to DOT structure." (oref cogre-graph name))
+  (let* ((graphtag (cogre-export-dot-method cogre-graph))
+	 (members (semantic-tag-get-attribute graphtag :members))
+	 )
+    
+    (when (not graphtag)
+      (error "Conversions failed to make anything"))
+
+    (when (not (string= (semantic-tag-name graphtag) "Periodic"))
+      (error "Converted graph has wrong name: %S" (semantic-tag-name graphtag)))
+    (when (not (semantic-tag-of-class-p graphtag 'digraph))
+      (error "Converted graph is not a digraph"))
+
+    (let ((N cogre-periodic-node-name-list)
+	  (L cogre-periodic-link-connectivity-list)
+	  )
+      (while members
+
+	(let* ((M (car members))
+	       (n (semantic-tag-name M)))
+
+	  (cond ((semantic-tag-of-class-p M 'node)
+		 (if (string= n (car (car N)))
+		     (setq N (cdr N))
+		   (error "Unexpected node %S in conversion" n))
+		 )
+		((semantic-tag-of-class-p M 'link)
+		 ;; Links go backward from COGRE to dot.
+		 (if (string= (semantic-tag-get-attribute M :to)
+			      (car (car L)))
+		     (setq L (cdr L))
+		   (message "Expected link %S to %S"
+			    (car (car L)) (car (cdr (car L))))
+		   (error "Unexpected link from %S to %S in conversion"
+			  n (semantic-tag-get-attribute M :to)))
+		 )
+		(t
+		 (error "Unknown dot tag %S" M)))
+
+	  )
+	(setq members (cdr members)))
+      )
+
+    (message "Graph Conversion to DOT success.")))
+
+(provide 'cogre-convert)
+;;; cogre-convert.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-dot-mode.el b/site/cedet-1.0pre7/cogre/cogre-dot-mode.el
new file mode 100644
index 0000000..f43f3ba
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-dot-mode.el
@@ -0,0 +1,114 @@
+;;; cogre-dot-mode.el --- Mini-mode for Graphviz DOT files.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-dot-mode.el,v 1.1 2009/04/07 00:34:01 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A mini-mode for Graphviz DOT files.
+;;
+;; If graphviz-dot-mode.el by Pieter Pareit is available, use that,
+;; otherwise supply the minimum features needed to parse dot files.
+
+(require 'mode-local)
+;;; Code:
+
+;;; Syntax table
+(defcustom cogre-dot-mode-hook nil
+  "Hook called when cogre-dot mode starts.
+This hook is not called if graphviz-dot-mode is used
+instead."
+  :group 'cogre
+  :type 'hook)
+
+(defvar cogre-dot-mode-syntax-table 
+  (let ((st (make-syntax-table)))
+    (modify-syntax-entry ?/  ". 124b" st)
+    (modify-syntax-entry ?*  ". 23"   st)
+    (modify-syntax-entry ?\n "> b"    st)
+    (modify-syntax-entry ?=  "."      st)
+    (modify-syntax-entry ?_  "_"      st)
+    (modify-syntax-entry ?-  "_"      st)
+    (modify-syntax-entry ?>  "."      st)
+    (modify-syntax-entry ?<  "."      st)
+    (modify-syntax-entry ?[  "("      st)
+    (modify-syntax-entry ?]  ")"      st)
+    (modify-syntax-entry ?\" "\""     st)
+    (setq graphviz-dot-mode-syntax-table st)
+  )
+  "Syntax table for `cogre-dot-mode'.")
+
+(defvar cogre-dot-font-lock-keywords
+  `(("\\(:?di\\|sub\\)?graph \\(\\sw+\\)"
+     (2 font-lock-function-name-face))
+    )
+  "Font lock keywords for the cogre dot mini-mode.")
+
+;;;###autoload
+(defun cogre-dot-mode ()
+  "Major mode for the dot language.
+This is a mini-mode that will first attempt to load and install
+`graphviz-dot-mode' in this buffer.  If that fails, it installs
+the syntax table, and runs a hook needed to get Semantic working
+as a parsing engine."
+  (interactive)
+
+  ;; Force graphviz mode to be loaded.  If it fails, then continue
+  ;; to install the cogre version.
+  (condition-case nil
+      (progn
+	;; Uncomment this to force cogre-dot-mode to go active.
+	;;(error "TEST MINI MODE")
+
+	;; graphviz-dot-mode doesn't have a provide statement
+	(when (not (fboundp 'graphviz-dot-mode))
+	  (load-library "graphviz-dot-mode"))
+	(inversion-test 'graphviz-dot-mode "0.3.2")
+	(graphviz-dot-mode))
+    (error
+     ;; We found an error.  Do the setup needed to produce
+     ;; a mini-mode here.
+
+     (kill-all-local-variables)
+     (setq major-mode 'cogre-dot-mode)
+     (setq mode-name "C-dot")
+     (set-syntax-table cogre-dot-mode-syntax-table)
+     (set (make-local-variable 'comment-start) "//")
+     (set (make-local-variable 'comment-start-skip) "/\\*+ *\\|//+ *")
+     (set (make-local-variable 'font-lock-defaults)
+	  '(cogre-dot-font-lock-keywords))
+     (run-hooks 'cogre-dot-mode-hook)
+     )))
+;;
+;; This major-mode change doesn't conflict with graphviz, since
+;; this major mode will start the graphviz one if it can be found.
+;;
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.dot\\'" . cogre-dot-mode))
+
+;;
+;; This isn't really true, but if we use the mini-mode,
+;; this allows SRecode to find the graphviz templates.
+;;
+(set-mode-local-parent 'cogre-dot-mode 'graphviz-dot-mode)
+
+(provide 'cogre-dot-mode)
+;;; cogre-dot-mode.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-hasa.xpm b/site/cedet-1.0pre7/cogre/cogre-hasa.xpm
new file mode 100644
index 0000000..ebb5f2e
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-hasa.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_hasa_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"           .            ",
+"          ...           ",
+"         .....          ",
+"        .......         ",
+"       .........        ",
+"        ........        ",
+"         ......         ",
+"          ....          ",
+"           ..           ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-instance.xpm b/site/cedet-1.0pre7/cogre/cogre-instance.xpm
new file mode 100644
index 0000000..167bd27
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-instance.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_instance_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+" ...................... ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .    .               . ",
+" .    .               . ",
+" .    .          .    . ",
+" . .. . . .. ......   . ",
+" . .. . .... .   .    . ",
+" .    . .  . ... .    . ",
+" . .. . .  .  .. .    . ",
+" . .. . .  . ... .    . ",
+" .                    . ",
+" . ................   . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" ...................... ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-isa.xpm b/site/cedet-1.0pre7/cogre/cogre-isa.xpm
new file mode 100644
index 0000000..d6c21d1
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-isa.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * inherit_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+"           ..           ",
+"         .. ..          ",
+"         .   .          ",
+"        .     ..        ",
+"      ..       ..       ",
+"      .         .       ",
+"     .           ..     ",
+"    ...............     ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-layout.el b/site/cedet-1.0pre7/cogre/cogre-layout.el
new file mode 100644
index 0000000..e678137
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-layout.el
@@ -0,0 +1,113 @@
+;;; cogre-layout.el --- Execute a layout engine on a cogre graph.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-layout.el,v 1.3 2009/04/07 00:36:44 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Reposition nodes in a graph using a layout engine.
+;;
+;; Calls out to graphviz for node position information.
+
+(require 'cogre-convert)
+
+;;; Code:
+;;;###autoload
+(defun cogre-layout ()
+  "Layout the current graph.
+This function depends on graphviz `dot' program."
+  (interactive)
+  (let ((tags nil)
+	(elts nil)
+	(maxy nil)
+	(scalex (car cogre-dot-node-position-scale))
+	(scaley (cdr cogre-dot-node-position-scale))
+	)
+    (save-window-excursion
+      (save-excursion
+	;; Convert to DOT.
+	(cogre-export-dot)
+	;; Pump it through DOT, extract the output.
+	(set-buffer
+	 (cedet-graphviz-dot-call (list (buffer-file-name))))
+	;; Put the output into dot-mode
+	(cogre-dot-mode)
+	;; For some reason, the above mode change doesn't trigger
+	;; the semantic new buffer function.  Do it here.
+	(semantic-new-buffer-fcn)
+	;; Fetch teh tags.
+	(setq tags (semantic-fetch-tags))
+	;; Now that we have the tags, switch back to our original
+	;; graph, and try to apply the positional information.
+	))
+    ;; Get stuff in the graph.
+    (setq elts (semantic-tag-get-attribute (car tags) :members))
+
+    ;; Get the graph max size so we can invert Y
+    (let* ((graphgeneric (semantic-find-first-tag-by-name "GRAPH" elts))
+	   (graphsize (semantic-find-first-tag-by-name
+		       "bb" (semantic-tag-get-attribute graphgeneric
+							:attributes)))
+	   (size (semantic-tag-get-attribute graphsize :value))
+	   (ss (split-string size "," t)))
+      (setq maxy (string-to-number (nth 3 ss))))
+    
+    ;; Loop over the tags.
+    (dolist (E elts)
+      (when (semantic-tag-of-class-p E 'node)
+	(let* ((name (semantic-tag-name E))
+	       (pos (semantic-find-first-tag-by-name
+		     "pos" (semantic-tag-get-attribute E :attributes)))
+	       (ss (split-string (semantic-tag-get-attribute pos :value)
+				 "," t))
+	       (X (string-to-number (car ss)))
+	       (Y (string-to-number (car (cdr ss))))
+	       (height (semantic-tag-get-attribute
+			(semantic-find-first-tag-by-name
+			 "height" (semantic-tag-get-attribute E :attributes))
+			:value))
+	       (width (semantic-tag-get-attribute
+		       (semantic-find-first-tag-by-name
+			"width" (semantic-tag-get-attribute E :attributes))
+		       :value))
+	       ;; dot reports width/height as inches, and the position
+	       ;; as points, which is 72 points/inch.
+	       (HH (* (/ (string-to-number height) 2) 72))
+	       (HW (* (/ (string-to-number width) 2) 72))
+	       ;; The node we want to modify
+	       (cogrenode (cogre-find-node-by-name name))
+	       )
+	  ;; For this node at this position, move the COGRE graph node.
+	  (if cogrenode
+	      (progn
+		(message "Found new pos %d,%d for matching node %s"
+			 X Y name)
+		(oset cogrenode :position
+		      (vector (max 0 (floor (/ (- X HH) scalex)))
+			      (max 0 (floor (/ (- maxy Y HH) scaley))))))
+	    ;; No match?
+	    (message "Could not find node for element %S" E)
+	    ))))
+    ;; Refresh the graph.
+    (cogre-refresh)
+    ))
+  
+(provide 'cogre-layout)
+;;; cogre-layout.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-link.xpm b/site/cedet-1.0pre7/cogre/cogre-link.xpm
new file mode 100644
index 0000000..3cd1e4e
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-link.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_link_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+"                        ",
+"                        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"               .        ",
+"           .....        ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"           .            ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-load.el b/site/cedet-1.0pre7/cogre/cogre-load.el
new file mode 100644
index 0000000..8f05357
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-load.el
@@ -0,0 +1,36 @@
+;;; cogre-load.el --- Autoload definitions for COGRE
+
+;;; Copyright (C) 2003 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: cogre-load.el,v 1.2 2005/09/30 20:06:52 zappo Exp $
+
+;; COGRE is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize COGRE for all supported conditions.
+
+;;; Code:
+;;
+
+;;; COGRE autoloads
+;;
+(load "cogre-loaddefs" nil t)
+
+(provide 'cogre-load)
+
+;;; cogre-load.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-loaddefs.el b/site/cedet-1.0pre7/cogre/cogre-loaddefs.el
new file mode 100644
index 0000000..62f22c7
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-loaddefs.el
@@ -0,0 +1,282 @@
+;;; cogre-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (cogre) "cogre" "cogre.el" (18977 14170))
+;;; Generated autoloads from cogre.el
+
+(eieio-defclass-autoload 'cogre-base-graph '(eieio-persistent) "cogre" "A Connected Graph.\na connected graph contains a series of nodes and links which are\nrendered in a buffer, or serialized to disk.")
+
+(eieio-defclass-autoload 'cogre-graph-element '(eieio-named) "cogre" "A Graph Element.\nGraph elements are anything that is drawn into a `cogre-base-graph'.\nGraph elements have a method for marking themselves dirty.")
+
+(eieio-defclass-autoload 'cogre-node '(cogre-graph-element) "cogre" "Connected Graph node.\nNodes are regions with a fill color, and some amount of text representing\na status, or values.")
+
+(eieio-defclass-autoload 'cogre-link '(cogre-graph-element) "cogre" "Connected Graph link.\nLinks are lines drawn between two nodes, or possibly loose in space\nas an intermediate step.  Some links have text describing what they\ndo, and most links have special markers on one end or another, such as\narrows or circles.")
+
+(eieio-defclass-autoload 'cogre-arrow '(cogre-link) "cogre" "This type of link is a simple arrow.")
+
+(autoload 'cogre "cogre" "\
+Create a new graph not associated with a buffer.
+The new graph will be given NAME.  See `cogre-mode' for details.
+Optional argument GRAPH-CLASS indicates the type of graph to create.
+
+\(fn NAME &optional GRAPH-CLASS)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-export-ascii) "cogre-ascii" "cogre-ascii.el"
+;;;;;;  (18912 13351))
+;;; Generated autoloads from cogre-ascii.el
+
+(autoload 'cogre-export-ascii "cogre-ascii" "\
+Export the current diagram into an ASCII buffer.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-export-utest cogre-export-dot-method cogre-export-dot-postscript-print
+;;;;;;  cogre-export-dot-png cogre-export-dot) "cogre-convert" "cogre-convert.el"
+;;;;;;  (18912 13859))
+;;; Generated autoloads from cogre-convert.el
+
+(autoload 'cogre-export-dot "cogre-convert" "\
+Export the current COGRE graph to DOT notation.
+DOT is a part of GraphViz.
+
+\(fn)" t nil)
+
+(autoload 'cogre-export-dot-png "cogre-convert" "\
+Export the current COGRE graph to DOT, then convert that to PNG.
+The png file is then displayed in an Emacs buffer.
+DOT is a part of GraphVis.
+
+\(fn)" t nil)
+
+(autoload 'cogre-export-dot-postscript-print "cogre-convert" "\
+Print the current graph.
+This is done by exporting the current COGRE graph to DOT, then
+convert that to Postscript before printing.
+DOT is a part of GraphVis.
+
+\(fn)" t nil)
+
+(autoload 'cogre-export-dot-method "cogre-convert" "\
+Convert G into DOT syntax of semantic tags.
+
+\(fn (G cogre-base-graph))" nil nil)
+
+(autoload 'cogre-export-utest "cogre-convert" "\
+Run all the COGRE structured export/convert test.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-dot-mode) "cogre-dot-mode" "cogre-dot-mode.el"
+;;;;;;  (18906 40825))
+;;; Generated autoloads from cogre-dot-mode.el
+
+(autoload 'cogre-dot-mode "cogre-dot-mode" "\
+Major mode for the dot language.
+This is a mini-mode that will first attempt to load and install
+`graphviz-dot-mode' in this buffer.  If that fails, it installs
+the syntax table, and runs a hook needed to get Semantic working
+as a parsing engine.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.dot\\'" . cogre-dot-mode))
+
+;;;***
+
+;;;### (autoloads (cogre-layout) "cogre-layout" "cogre-layout.el"
+;;;;;;  (18906 40988))
+;;; Generated autoloads from cogre-layout.el
+
+(autoload 'cogre-layout "cogre-layout" "\
+Layout the current graph.
+This function depends on graphviz `dot' program.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-mode) "cogre-mode" "cogre-mode.el" (18977
+;;;;;;  14210))
+;;; Generated autoloads from cogre-mode.el
+
+(autoload 'cogre-mode "cogre-mode" "\
+Connected Graph Editor Mode.
+\\{cogre-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist (cons "\\.cgr\\'" 'cogre-mode))
+
+;;;***
+
+;;;### (autoloads (cogre-periodic-utest cogre-periodic) "cogre-periodic"
+;;;;;;  "cogre-periodic.el" (18906 45093))
+;;; Generated autoloads from cogre-periodic.el
+
+(autoload 'cogre-periodic "cogre-periodic" "\
+Create a periodic table of COGRE objects.
+
+\(fn)" t nil)
+
+(autoload 'cogre-periodic-utest "cogre-periodic" "\
+Run the cogre periodic table for unit testing.
+Also test various output mechanisms from the periodic table.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-uml-quick-class cogre-export-code cogre-semantic-tag-to-node)
+;;;;;;  "cogre-semantic" "cogre-semantic.el" (18927 57417))
+;;; Generated autoloads from cogre-semantic.el
+
+(autoload 'cogre-semantic-tag-to-node "cogre-semantic" "\
+Convert the Semantic tag TAG into a COGRE node.
+Only handles data types nodes.
+To convert function/variables into methods or attributes in
+an existing COGRE node, see @TODO - do that.
+
+\(fn TAG)" nil nil)
+
+(autoload 'cogre-export-code "cogre-semantic" "\
+Export the current graph into source-code in FILE.
+Uses `cogre-export-semantic' to convert into Semantic tags.
+Uses `cogre-srecode-setup' to setup SRecode for code generation.
+
+\(fn FILE)" t nil)
+
+(autoload 'cogre-uml-quick-class "cogre-semantic" "\
+Create a new UML diagram based on CLASS showing only immediate lineage.
+The parent to CLASS, CLASS, and all of CLASSes children will be shown.
+
+\(fn CLASS)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-handle-:dot srecode-semantic-handle-:cogre
+;;;;;;  cogre-srecode-setup) "cogre-srecode" "cogre-srecode.el" (18905
+;;;;;;  26818))
+;;; Generated autoloads from cogre-srecode.el
+
+(autoload 'cogre-srecode-setup "cogre-srecode" "\
+Update various paths to get SRecode to identify COGRE macros.
+
+\(fn)" nil nil)
+
+(autoload 'srecode-semantic-handle-:cogre "cogre-srecode" "\
+Add macros to dictionary DICT based on COGRE data.
+
+\(fn DICT)" nil nil)
+
+(eval-after-load "srecode-map" (cogre-srecode-setup))
+
+(autoload 'srecode-semantic-handle-:dot "cogre-srecode" "\
+Add macros to dictionary DICT based on the current DOT buffer.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (cogre-uml-sort-for-lineage cogre-uml-enable-unicode)
+;;;;;;  "cogre-uml" "cogre-uml.el" (18927 57347))
+;;; Generated autoloads from cogre-uml.el
+
+(eieio-defclass-autoload 'cogre-package '(cogre-node) "cogre-uml" "A Package node.\nPackages represent other class diagrams, and list the major nodes\nwithin them.  They can be linked by dependency links.")
+
+(eieio-defclass-autoload 'cogre-note '(cogre-node) "cogre-uml" "An note node.\nNotes are used to add annotations inside a graph.\nNotes are generally linked to some node, and are supposed to look\nlike a little pieces of paper.")
+
+(eieio-defclass-autoload 'cogre-scoped-node '(cogre-node) "cogre-uml" "A UML node that has a package specifier within which it is scoped.")
+
+(eieio-defclass-autoload 'cogre-class '(cogre-scoped-node) "cogre-uml" "A Class node.\nClass nodes represent a class, and can list the attributes and methods\nwithin them.  Classes can have attribute links, and class hierarchy links.")
+
+(eieio-defclass-autoload 'cogre-instance '(cogre-scoped-node) "cogre-uml" "An instance node.\nInstances are used in instance diagrams.\nInstances are linked together with plain links.")
+
+(eieio-defclass-autoload 'cogre-inherit '(cogre-link) "cogre-uml" "This type of link indicates that the two nodes reference infer inheritance.\nThe `start' node is the child, and the `end' node is the parent.\nThis is supposed to infer that START inherits from END.")
+
+(eieio-defclass-autoload 'cogre-aggregate '(cogre-link) "cogre-uml" "This type of link indicates aggregation.\nThe `start' node is the owner of the aggregation, the `end' node is\nthe item being aggregated.\nThis is supposed to infer that START contains END.")
+
+(autoload 'cogre-uml-enable-unicode "cogre-uml" "\
+Enable use of UNICODE symbols to create COGRE graphs.
+Inheritance uses math triangle on page 25a0.
+Aggregation uses math square on edge 25a0.
+Line-drawing uses line-drawing codes on page 2500.
+See http://unicode.org/charts/symbols.html.
+
+The unicode symbols can be differing widths.  This will make the
+cogre chart a little screwy somteims.  Your mileage may vary.
+
+\(fn)" t nil)
+
+(autoload 'cogre-uml-sort-for-lineage "cogre-uml" "\
+Sort the current graph G for determining inheritance lineage.
+Return it as a list of lists.  Each entry is of the form:
+  ( NODE PARENT1 PARENT2 ... PARENTN)
+
+\(fn G)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-utest-quick-class cogre-utest) "cogre-utest"
+;;;;;;  "cogre-utest.el" (18912 16027))
+;;; Generated autoloads from cogre-utest.el
+
+(autoload 'cogre-utest "cogre-utest" "\
+Unit test Various aspects of COGRE.
+
+\(fn)" t nil)
+
+(autoload 'cogre-utest-quick-class "cogre-utest" "\
+Test the quick-class function.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cogre-picture-insert-rectangle) "picture-hack"
+;;;;;;  "picture-hack.el" (18897 57890))
+;;; Generated autoloads from picture-hack.el
+
+(autoload 'cogre-picture-insert-rectangle "picture-hack" "\
+Overlay RECTANGLE with upper left corner at point.
+Leaves the region surrounding the rectangle.
+
+\(fn RECTANGLE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (wisent-dot-setup-parser) "wisent-dot" "wisent-dot.el"
+;;;;;;  (18906 40873))
+;;; Generated autoloads from wisent-dot.el
+
+(autoload 'wisent-dot-setup-parser "wisent-dot" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+(add-hook 'graphviz-dot-mode-hook 'wisent-dot-setup-parser)
+
+(add-hook 'cogre-dot-mode-hook 'wisent-dot-setup-parser)
+
+;;;***
+
+;;;### (autoloads nil nil ("cogre-load.el" "wisent-dot-wy.el") (19335
+;;;;;;  11025 916782))
+
+;;;***
+
+(provide 'cogre-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; cogre-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-mode.el b/site/cedet-1.0pre7/cogre/cogre-mode.el
new file mode 100644
index 0000000..02bdc77
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-mode.el
@@ -0,0 +1,874 @@
+;;; cogre-mode.el --- Graph editing mode
+
+;;; Copyright (C) 2001, 2002, 2003, 2007, 2009 Eric M. Ludlam
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; COGRE mode is based on a generic editor that can render arbitrary
+;; graphs as specified by the COGRE core classes.
+;; This depends on EIEIO for graph management.  COGRE mode depends on
+;; `picture-mode' for drawing.
+;;
+;; Because COGRE graphs are meant to be edited in some fashion, COGRE
+;; graphs depend on the custom widget library to provide text
+;; controls, or toggle buttons for editing state in a graph.
+
+(require 'picture-hack)
+(require 'eieio)
+(require 'eieio-opt)
+(require 'eieio-base)
+(require 'cogre)
+
+;;; Code:
+(defface cogre-box-face  '((((class color) (background dark))
+			    (:background "gray30" :foreground "white"))
+			   (((class color) (background light))
+			    (:background "gray" :foreground "black")))
+  "Face used for rectangles of boxes displaying data."
+  :group 'cogre)
+
+(defface cogre-box-first-face  '((((class color) (background dark))
+				  (:background "gray30" :foreground "white" :overline "white"))
+				 (((class color) (background light))
+				  (:background "gray" :foreground "black" :overline "black")))
+  "Face used for the first data item in rectangles of boxes displaying data.
+This has the `overline' property set to display borders between sections
+within a box."
+  :group 'cogre)
+
+(defface cogre-box-last-face  '((((class color) (background dark))
+				  (:background "gray30" :foreground "white" :underline "white"))
+				 (((class color) (background light))
+				  (:background "gray" :foreground "black" :underline "black")))
+  "Face used for the first data item in rectangles of boxes displaying data.
+This has the `overline' property set to display borders between sections
+within a box."
+  :group 'cogre)
+
+(defun cogre-substitute (km oldfun newfun)
+  "Substitue in KM, a key binding in ghe `cogre-mode-map'.
+Argument OLDFUN is removed NEWFUN is substituted in."
+  (substitute-key-definition oldfun newfun km global-map))
+
+(defvar cogre-mode-map
+  (let ((km (make-keymap)))
+    (suppress-keymap km)
+    ;; Structure Information
+    (define-key km "\C-m" 'cogre-activate-element)
+    ;; Structure changes
+    (define-key km "R" 'cogre-refresh)
+    (define-key km "N" 'cogre-new-node)
+    (define-key km "L" 'cogre-new-link)
+    (define-key km "D" 'cogre-delete)
+    (define-key km "U" 'cogre-update-node-from-source)
+    ;; Changing and Setting Defaults
+    (define-key km "\C-c\C-n" 'cogre-default-node)
+    (define-key km "\C-c\C-l" 'cogre-default-link)
+    ;; Kill/Yank operations
+    (define-key km "\C-k" 'cogre-kill-element)
+    (define-key km "\C-w" 'cogre-kill-element)
+    (define-key km "\M-w" 'cogre-copy-element)
+    (define-key km "\C-y" 'cogre-yank-element)
+    ;; Modifications
+    (define-key km "n" 'cogre-set-element-name)
+    ;; Move nodes around
+    (define-key km [(meta left)] 'cogre-move-node-left)
+    (define-key km [(meta right)] 'cogre-move-node-right)
+    (define-key km [(meta down)] 'cogre-move-node-down)
+    (define-key km [(meta up)] 'cogre-move-node-up)
+    (define-key km "\M-b" 'cogre-move-node-left)
+    (define-key km "\M-f" 'cogre-move-node-right)
+    (define-key km "\M-n" 'cogre-move-node-down)
+    (define-key km "\M-p" 'cogre-move-node-up)
+    ;; Cursor Movement
+    (define-key km "\C-i" 'cogre-next-node)
+    (define-key km "\M-\C-i" 'cogre-prev-node)
+    (cogre-substitute km 'forward-char  'picture-forward-column)
+    (cogre-substitute km 'backward-char 'picture-backward-column)
+    (cogre-substitute km 'next-line     'picture-move-down)
+    (cogre-substitute km 'previous-line 'picture-move-up)
+    ;; Mouse Manipulations
+    (define-key km [down-mouse-1] 'cogre-down-mouse-1)
+    (define-key km [drag-mouse-1] 'ignore)
+    (define-key km [down-mouse-2] 'cogre-down-mouse-2)
+    (define-key km [drag-mouse-2] 'ignore)
+    (define-key km [down-mouse-3] 'cogre-down-mouse-3)
+    (define-key km [drag-mouse-3] 'ignore)
+    km)
+  "Keymap used for COGRE mode.")
+
+(easy-menu-define
+  cogre-mode-menu cogre-mode-map "Connected Graph Menu"
+  '("Graph"
+    ["Refresh" cogre-refresh t ]
+    ["Layout (dot)" cogre-layout t ]
+    ("Insert" :filter cogre-insert-forms-menu)
+    ("Navigate"
+     ["Next Element" cogre-next-node t ]
+     ["Prev Element" cogre-prev-node t ]
+     ["Move Node Up"    cogre-move-node-up    (cogre-node-child-p (cogre-current-element)) ]
+     ["Move Node Down"  cogre-move-node-down  (cogre-node-child-p (cogre-current-element)) ]
+     ["Move Node Left"  cogre-move-node-left  (cogre-node-child-p (cogre-current-element)) ]
+     ["Move Node right" cogre-move-node-right (cogre-node-child-p (cogre-current-element)) ]
+     )
+    ("Change" :filter cogre-change-forms-menu)
+    "--"
+    ( "Edit..."
+      [ "Kill Node" cogre-kill-element (cogre-current-element) ]
+      [ "Copy Node" cogre-copy-element (cogre-current-element) ]
+      [ "Yank Node or Tag" cogre-yank-element (cogre-killring-active) ]
+      [ "Delete" cogre-delete (cogre-current-element) ])
+    ( "Update..."
+      [ "Update Graph from Peers" cogre-update-graph-from-source t ]
+      [ "Update Element from Peer" cogre-update-node-from-source (cogre-node-with-peer) ])
+    [ "Customize Graph" cogre-customize-graph t]
+    [ "PS Print" cogre-export-dot-postscript-print t ]
+    ("Export to..."
+     [ "ASCII Art" cogre-export-ascii t ]
+     [ "Graphviz DOT" cogre-export-dot t ]
+     [ ".png Image" cogre-export-dot-png t ]
+     )
+    ))
+
+(defvar cogre-popup-map (make-sparse-keymap)
+  "Map for popup menus.")
+
+(easy-menu-define
+  cogre-mode-create-popup-menu cogre-popup-map "Connected Graph Insert Menu"
+  '("Insert"
+    [ "Node" cogre-new-node t]
+    "---"
+    [ "Class" cogre-new-node t]
+    [ "Package" cogre-new-node t]
+    [ "Instance" cogre-new-node t]
+    [ "Note" cogre-new-node t]
+    "---"
+    [ "Yank Node or Tag" cogre-yank-element (not (ring-empty-p senator-tag-ring)) ]
+    [ "Customize Graph" cogre-customize-graph t]
+    ))
+
+(easy-menu-define
+  cogre-mode-new-link-popup-menu cogre-popup-map "New Link Menu"
+  '("New Link Type"
+    [ "Link" cogre-select-a-link t]
+    [ "Update Link from Peer" cogre-update-node-from-source (cogre-node-with-peer) ]
+    "---"
+    [ "Arrow" cogre-select-a-link t]
+    [ "Inherit" cogre-select-a-link t]
+    [ "Aggregate" cogre-select-a-link t]
+    ))
+
+(defvar cogre-node-base-menu
+  '("Update Node"
+    [ "Rename" cogre-set-element-name t ]
+    [ "View/Edit" cogre-activate-element t ]
+    [ "Update Node from Peer" cogre-update-node-from-source (cogre-node-with-peer) ]
+    "---"
+    [ "Kill Node" cogre-kill-element (cogre-current-element) ]
+    [ "Copy Node" cogre-copy-element (cogre-current-element) ]
+    [ "Delete" cogre-delete (cogre-current-element) ]
+    )
+    "List of basic items for a Menu on a Node.")
+
+(easy-menu-define
+  cogre-node-update-popup-menu cogre-popup-map "Connected Graph Update Menu"
+  cogre-node-base-menu)
+
+(defvar cogre-link-base-menu
+  '("Update Link"
+    [ "View/Edit" cogre-activate-element t ]
+    [ "Update Node from Peer" cogre-update-node-from-source (cogre-node-with-peer) ]
+    "---"
+    [ "Delete" cogre-delete (cogre-current-element) ]
+    )
+    "List of basic items for a Menu on a Link.")
+
+(easy-menu-define
+  cogre-link-update-popup-menu cogre-popup-map "Connected Graph Update Menu"
+  cogre-link-base-menu)
+
+(defvar cogre-tool-bar-map
+  (let ((tool-bar-map (make-sparse-keymap)))
+    (when (fboundp 'tool-bar-add-item)
+      (tool-bar-add-item "cogre-node" 'cogre-new-node 'node)
+      (tool-bar-add-item "cogre-class" 'cogre-new-node 'class)
+      (tool-bar-add-item "cogre-package" 'cogre-new-node 'package)
+      (tool-bar-add-item "cogre-instance" 'cogre-new-node 'instance)
+      (tool-bar-add-item "cogre-note" 'cogre-new-node 'note)
+      (tool-bar-add-item "cogre-link" 'cogre-new-link 'link)
+      (tool-bar-add-item "cogre-arrow" 'cogre-new-link 'arrow)
+      (tool-bar-add-item "cogre-isa" 'cogre-new-link 'inherit)
+      (tool-bar-add-item "cogre-hasa" 'cogre-new-link 'aggregate)
+      )
+    tool-bar-map)
+  "The tool-bar used for COGRE mode.")
+
+
+(defmethod cogre-insert-class-list ((graph cogre-base-graph))
+  "Return a list of classes GRAPH will accept."
+  (eieio-build-class-alist 'cogre-graph-element))
+
+(defun cogre-insert-forms-menu (menu-def)
+  "Create a menu for cogre INSERT item.
+Argument MENU-DEF is the easy-menu definition."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Insert Forms"
+    (let ((obj (cogre-current-element))
+	  (elements (cogre-insert-class-list cogre-graph))
+	  (newmenu nil))
+      (while elements
+	;; Added (car elements) to the menu.
+	(setq newmenu (cons
+		       (vector (car (car elements))
+			       `(progn
+				 (cogre-new-node
+				  (point)
+				  (intern ,(car (car elements))))
+				 (cogre-render-buffer cogre-graph)
+				 )
+			       t)
+		       newmenu))
+	(setq elements (cdr elements)))
+      (append  (list [ "New Link" cogre-new-link t ]
+		     [ "New Node" cogre-new-node t ]
+		     )
+	       (nreverse newmenu))
+      ))))
+
+(defun cogre-change-forms-menu (menu-def)
+  "Create a menu for cogre CHANGE item.
+Argument MENU-DEF is the easy-menu definition."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Change Forms"
+    (let* ((obj (cogre-current-element))
+	   (newmenu (cogre-augment-element-menu obj nil)))
+      (append  '( [ "Name" cogre-set-element-name (cogre-current-element) ]
+		  [ "View/Edit" cogre-activate-element (cogre-current-element) ]
+		  )
+	       (nreverse newmenu))
+      ))))
+
+;;; Major Mode
+;;
+;;;###autoload
+(defun cogre-mode ()
+  "Connected Graph Editor Mode.
+\\{cogre-mode-map}"
+  (interactive)
+  (setq major-mode 'cogre-mode
+	mode-name "Cogre")
+  (use-local-map cogre-mode-map)
+  (when cogre-tool-bar-map
+    (set (make-local-variable 'tool-bar-map) cogre-tool-bar-map))
+  (setq truncate-lines t)
+  (setq indent-tabs-mode nil)
+  (buffer-disable-undo)
+  (set (make-local-variable 'transient-mark-mode) nil)
+  (setq write-contents-functions 'cogre-save-hook)
+  ;; Convert contents from save file.
+  (cogre-convert-buffer-contents-on-init)
+  ;; Tail setup.
+  (run-hooks 'cogre-mode-hook)
+  ;; Misc issues
+  (set (make-local-variable 'font-lock-global-modes) nil)
+  (font-lock-mode -1)
+  ;; Force the redraw AFTER disabling font lock
+  (cogre-render-buffer cogre-graph t)
+  ;; If someone changes the major mode, be sure to convert everything
+  ;; back into plain-text save file.
+  (add-hook 'change-major-mode-hook 'cogre-switch-to-save-text t t)
+  )
+(put 'cogre-mode 'semantic-match-any-mode t)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist (cons "\\.cgr\\'" 'cogre-mode))
+
+(defun cogre-convert-buffer-contents-on-init ()
+  "Convert the buffer contents into a graph.
+If it is already drawing a graph, then don't convert."
+  (when (not (eieio-object-p cogre-graph))
+    ;; Convert the contents
+    (if (and (buffer-file-name) (file-exists-p (buffer-file-name)))
+	(let ((cogre-loading-from-file t))
+	  ;; Convert this file into a graph.
+	  (condition-case nil
+	      (setq cogre-graph (eieio-persistent-read (buffer-file-name)))
+	    (error (fundamental-mode)
+		   (error "Not a COGRE graph file")))
+	  (oset cogre-graph file (buffer-file-name))
+	  (cogre-map-elements 'cogre-element-post-serialize)
+	  )
+      ;; Else, just initialize into a graph.
+      (let ((name (file-name-sans-extension (buffer-file-name))))
+	(setq cogre-graph (cogre-base-graph name :name name))
+	(oset cogre-graph file (buffer-file-name)))
+      )
+    (set-buffer-modified-p nil) ))
+
+(defun cogre-save-hook ()
+  "Hook called when writing out a cogre buffer to disk."
+  (when (and (buffer-file-name (current-buffer))
+	     (not (slot-boundp cogre-graph 'file)))
+    (oset cogre-graph file (buffer-file-name (current-buffer))))
+  (when (not (slot-boundp cogre-graph 'file))
+    (error "Cannot save graph.  File not set in graph object.  (programmer error?)"))
+  (cogre-save cogre-graph)
+  (set-buffer-modified-p nil)
+  (clear-visited-file-modtime)
+  t)
+
+(defun cogre-switch-to-save-text ()
+  "Convert the current graph to the text we save."
+  (if (not cogre-graph)
+      (message "No graph to conver to text when switching modes")
+
+    ;; Setup the objects to have a file name.
+    (when (and (buffer-file-name (current-buffer))
+	       (not (slot-boundp cogre-graph 'file)))
+      (oset cogre-graph file (buffer-file-name (current-buffer))))
+    ;; Clear out all the graph text
+    (erase-buffer)
+    ;; Write the text into this buffer.
+    (let ((standard-output (current-buffer)))
+      (cogre-write-save-text cogre-graph)
+      )
+    (goto-char (point-min))
+    ))
+
+;;; Customzize the graph
+;;
+(defun cogre-customize-graph ()
+  "Customize the current graph."
+  (interactive)
+  (let ((b (current-buffer)))
+    (require 'eieio-custom)
+    (customize-object cogre-graph)
+    (setq cogre-custom-originating-graph-buffer b)))
+
+;;; Menu Helper
+;;
+(defun cogre-killring-active ()
+  "Return non-nil if there is a tag in the kill ring."
+  (not (ring-empty-p senator-tag-ring)))
+
+(defun cogre-node-with-peer ()
+  "Return no-nil if there is a node with a peer under the cursor."
+  (let* ((node (cogre-current-element (point))))
+    (and node (oref node peer))))
+
+;;; Interactive utility functions
+;;
+(defun cogre-node-at-point-interactive (&optional pos)
+  "Return the node under POS.
+Throw an error if there is no node."
+  (let ((e (cogre-current-element (or pos (point)))))
+    (if (or (not e) (not (obj-of-class-p e cogre-node)))
+	(error "No graph node under point")
+      e)))
+
+(defun cogre-link-at-point-interactive (&optional pos)
+  "Return the node under POS.
+Throw an error if there is no node."
+  (let ((e (cogre-current-element (or pos (point)))))
+    (if (or (not e) (not (obj-of-class-p e cogre-link)))
+	(error "No graph node under point")
+      e)))
+
+(defun cogre-element-at-point-interactive (&optional pos)
+  "Return the node under POS.
+Throw an error if there is no node."
+  (let ((e (cogre-current-element (or pos (point)))))
+    (if (not e)
+	(error "No graph node under point")
+      e)))
+
+;;; Edit/View elements
+;;
+(defun cogre-activate-element (element)
+  "View/Edit the ELEMENT.
+The default ELEMENT is the one found under the cursor."
+  (interactive (list (cogre-current-element)))
+  (if element
+      (cogre-activate element)
+    (error "The cursor is not on an object")))
+
+;;; Insert/Delete
+;;
+(defun cogre-new-node (point nodetype &rest fields)
+  "Insert a new node at the current point.
+Argument POINT is a position to insert this node to.
+NODETYPE is the eieio class name for the node to insert.
+Optional FIELDS are additional constructor fields to pass
+in to the created node."
+  (interactive (list (point) (cogre-default-node nil current-prefix-arg)))
+  (save-excursion
+    (goto-char point)
+    (let* ((x (current-column))
+	   (y (cogre-current-line))
+	   (n (apply 'make-instance nodetype (oref nodetype name-default)
+		     :position (vector x y)
+		     fields)))
+      (when (interactive-p)
+	(cogre-render n)
+	)
+      ;; Return the node.
+      n)))
+
+(defun cogre-new-link (mark point &optional linktype)
+  "Insert a new link from the node at MARK to POINT of LINKTYPE.
+MARK is the node within which the current mark is set.
+POINT is the node the cursor is in.
+LINKTYPE is the eieio class name for the link to insert."
+  (interactive (list (cogre-node-at-point-interactive (mark))
+		     (cogre-node-at-point-interactive (point))
+		     (cogre-default-link nil current-prefix-arg)))
+  (if (not linktype) (setq linktype cogre-link))
+  (let ((l (make-instance linktype "Link" :start mark :end point)))
+
+    (when (interactive-p)
+      (cogre-render l))
+    l))
+
+(defvar cogre-delete-dont-ask nil
+  "Track if we should ask about deleting an object from the graph.")
+
+(defun cogre-delete (element)
+  "Delete the graph ELEMENT under the cursor."
+  (interactive (list (cogre-element-at-point-interactive (point))))
+  (if (or cogre-delete-dont-ask
+	  (y-or-n-p (format "Really delete %s? " (object-name element))))
+      (let ((cogre-delete-dont-ask t))
+	(if (obj-of-class-p element cogre-node)
+	    (let ((el (oref cogre-graph elements))
+		  (test nil))
+	      (while el
+		(setq test (car el)
+		      el (cdr el))
+		(if (and (obj-of-class-p test cogre-link)
+			 (or (eq element (oref test start))
+			     (eq element (oref test end))))
+		    (cogre-delete test)))))
+	(cogre-erase element)
+	(cogre-delete-element cogre-graph element))
+    ))
+
+;;; Kill/Yank
+;;
+(defun cogre-kill-element (element)
+  "Kill the ELEMENT under point.
+Uses `cogre-copy-element' to push it into the kill ring."
+  (interactive (list (cogre-element-at-point-interactive (point))))
+  ;; Copy the element first.
+  (cogre-copy-element element)
+  ;; Now delete the node.
+  (cogre-delete element)
+  )
+
+(defun cogre-copy-element (element)
+  "Copy the ELEMENT under point.
+Clones the object in question and places the clone in semantic-tag-format
+into `senator-tag-ring'."
+  (interactive (list (cogre-element-at-point-interactive (point))))
+  (let* ((cogre-export-max-y (count-lines (point-min) (point-max)))
+	 (tag (cogre-export-dot-method element))
+	 )
+    ;; While cloning the old element, disable the graph.
+    (semantic--tag-put-property
+     tag :cogre (clone element (oref element :object-name)))
+      
+    (ring-insert senator-tag-ring tag)
+    ))
+
+(defun cogre-yank-element ()
+  "Yank an element into the current graph.
+Uses `senator-tag-ring'.  Will yank semantic tags from code buffers
+and translate into COGRE nodes."
+  (interactive)
+  (or (ring-empty-p senator-tag-ring)
+      (let* ((tag (ring-ref senator-tag-ring 0))
+	     (elt (semantic--tag-get-property tag :cogre))
+	     (x (current-column))
+	     (y (cogre-current-line))
+	     )
+	(if elt
+	    ;; If this was previously a cogre node, then clone it
+	    ;; and move it and insert.
+	    (progn
+	      (setq elt (clone elt (oref elt :object-name)
+			       :position (vector x y)))
+	      ;; We need to make the name unique, and add to the
+	      ;; graph, as clone won't call initialize.
+	      (let ((n (oref elt object-name)))
+		;; make sure our name is unique.
+		(oset elt object-name (cogre-unique-name cogre-graph n)))
+	      (cogre-add-element cogre-graph elt)
+	      )
+	  ;; It is some misc Semantic Tag.  Convert into a node.
+	  (setq elt (cogre-semantic-tag-to-node tag))
+	  (when elt
+	    (oset elt :position (vector x y)))
+	  )
+	(cogre-refresh))))
+
+;;; Navigation
+;;
+(defun cogre-goto-element (elt)
+  "Move the cursor onto the element ELT."
+  (if (obj-of-class-p elt cogre-node)
+      ;; We have a node
+      (let ((p (oref elt position)))
+	(picture-goto-coordinate (aref p 0) (aref p 1)))
+    ;; Else, we have a link
+    (with-slots (stop-position) elt
+      (apply 'picture-goto-coordinate stop-position)
+      )))
+
+(defun cogre-next-node (&optional arg)
+  "Move forward ARG nodes in the hierarchy.
+If ARG is unspecified, assume 1."
+  (interactive "p")
+  (let ((n (cogre-current-element (point)))
+	(e (oref cogre-graph elements))
+	(next nil))
+    (if (not n)
+	;; Not on the node?  Tab around.
+	(setq next (car e))
+      (let* ((l (length e))
+	     (i (- l (length (member n e))))
+	     (ni (+ i arg)))
+	(if (< ni 0) (setq ni (+ l ni))
+	  (if (>= ni l) (setq ni (- ni l))))
+	(setq next (nth ni e))))
+    (cogre-goto-element next)))
+
+(defun cogre-prev-node (&optional arg)
+  "Move backward ARG nodes in the hierarchy.
+If ARG is unspecified, assume 1."
+  (interactive "p")
+  (cogre-next-node (- arg)))
+
+;;; Node Modification
+;;
+(defun cogre-render-node-after-erase (node)
+  "Redraw the node NODE after it was erased.
+It will redraw the links too."
+  (let ((links (cogre-node-links node)))
+    (cogre-render node)
+    (mapc 'cogre-render links)))
+
+(defun cogre-set-element-name (node name)
+  "Set the name of the current NODE to NAME."
+  (interactive (let ((e (cogre-node-at-point-interactive)))
+		 (let ((name (oref e object-name)))
+		 (list e  (read-string "New Name: " name)))))
+  (cogre-erase node)
+  (oset node object-name (cogre-unique-name cogre-graph name))
+  (when (interactive-p)
+    (cogre-render-node-after-erase node)
+    (cogre-goto-element node)
+    ;; If the user changes the name, update the peer.
+    (let ((peer (oref node peer)))
+      (when peer (cogre-peer-update-from-element peer node)))
+    )
+  )
+
+(defun cogre-set-scoped-node-package (node package)
+  "Set the package name of the current NODE to PACKAGE."
+  (interactive (let ((e (cogre-node-at-point-interactive)))
+		 (let ((name (oref e package-name)))
+		 (list e  (read-string "New Package Name: " name)))))
+  (cogre-erase node)
+  (oset node package-name package)
+  (when (interactive-p)
+    (cogre-render-node-after-erase node)
+    (cogre-goto-element node)
+    ;; If the user changes the name, update the peer.
+    (let ((peer (oref node peer)))
+      (when peer (cogre-peer-update-from-element peer node)))
+    )
+  )
+
+(defun cogre-update-node-from-source (node)
+  "Update the current NODE from its source.
+The source is defined by the peer belonging to NODE."
+  (interactive (list (cogre-node-at-point-interactive)))
+  (let ((peer (oref node peer)))
+    (if (not peer)
+	(message "No peer to update from.")
+      (cogre-erase node)
+      (cogre-peer-update-from-source peer node)
+      (cogre-render-node-after-erase node)
+      (cogre-goto-element node)
+      )))
+
+(defun cogre-update-graph-from-source ()
+  "Update the current graph from its sources."
+  (interactive)
+  ;; Do the update.
+  (cogre-update-graph-from-peers cogre-graph)
+  ;; Now refresh the graph.
+  (cogre-refresh))
+
+;;; Node Movement
+;;
+(defun cogre-move-node (x y &optional node)
+  "Set a node to postion X, Y.
+If NODE is not provided, then calculate from current position."
+  (interactive "nX: \nnY: ")
+  (let ((inhibit-point-motion-hooks t)
+	(e (or node (cogre-current-element (point)))))
+    (cogre-erase e)
+    (if (<= x 0) (setq x 0))
+    (if (<= y 0) (setq y 0))
+    (cogre-move e x y)
+    (let ((pos (oref e position)))
+      (picture-goto-coordinate (aref pos 0) (aref pos 1)))
+    ;; Do the service of redrawing the modified pieces.
+    (cogre-render-node-after-erase e)
+    (picture-goto-coordinate x y)))
+
+(defun cogre-node-position (&optional noerror)
+  "Get the position of the node at point.
+Optional NOERROR means don't throw an error if there was no node."
+  (let ((e (cogre-current-element (point)))
+	)
+    (if e (oref e position)
+      (if noerror
+	  nil
+	(error "No node at point %d" (point))))))
+
+(defun cogre-move-node-left (arg)
+  "Move NODE left by ARG columns."
+  (interactive "p")
+  (let* ((p (cogre-node-position)))
+    (cogre-move-node (- (aref p 0) arg) (aref p 1))
+    ))
+
+(defun cogre-move-node-right (arg)
+  "Move NODE right by ARG columns."
+  (interactive "p")
+  (let* ((p (cogre-node-position)))
+    (cogre-move-node (+ (aref p 0) arg) (aref p 1))
+    ))
+
+(defun cogre-move-node-up (arg)
+  "Move NODE up by ARG columns."
+  (interactive "p")
+  (let* ((p (cogre-node-position)))
+    (cogre-move-node (aref p 0) (- (aref p 1) arg))
+    ))
+
+(defun cogre-move-node-down (arg)
+  "Move NODE down by ARG columns."
+  (interactive "p")
+  (let* ((p (cogre-node-position)))
+    (cogre-move-node (aref p 0) (+ (aref p 1) arg))
+    ))
+
+;;; Mouse Handlers
+;;
+;; Cogre is mostly keyboard driven.  The mouse will make dragging
+;; existing things around easier.
+
+(defun cogre-down-mouse-1 (event)
+  "Handle a mouse-down-1 EVENT in `cogre' mode.
+Clicking and dragging on a node will move the node."
+  (interactive "@e")
+  (let* ((echo-keystrokes 10000)	; don't show pressed keys.
+	 (start-pos (posn-col-row (event-end event)))
+	 (x1        (car start-pos))
+	 (y1        (cdr start-pos))
+	 )
+
+    ;; Make sure the text character exists for this point.
+    (picture-mouse-set-point event)
+
+    ;; Did we click on a node?
+    (let* ((node (cogre-current-element (point)))
+	   (auto-hscroll-mode nil))
+
+      (cond
+       ((not node)
+	;; We didn't click on anything.  Drag the whole graph
+	;; around.
+	(track-mouse
+
+	  (while (progn
+		   (setq event (read-event))
+		   (mouse-movement-p event))
+
+	    (let* ((next-pos (posn-col-row (event-end event)))
+		   (x2       (car next-pos))
+		   (y2       (cdr  next-pos))
+		   (dx (- x2 x1))
+		   (dy (- y2 y1))
+		   )
+
+	      (condition-case nil
+		  (scroll-down dy)
+		(error nil))
+	      (condition-case nil
+		  (scroll-right dx)
+		(error nil))
+
+	      (setq x1 x2
+		    y1 y2
+		    start-pos next-pos)
+	    )))
+	nil)
+       ((cogre-node-child-p node)
+	;; We have a node.  Drag it.
+	(track-mouse
+
+	  (while (progn
+		   (setq event (read-event))
+		   (mouse-movement-p event))
+
+	    (let* ((next-pos (posn-col-row (event-end event)))
+		   (x2       (car next-pos))
+		   (y2       (cdr  next-pos))
+		   (dx (- x2 x1))
+		   (dy (- y2 y1))
+		   (p (oref node position))
+		   )
+
+	      ;; We have a node.  Start dragging.
+	      (cogre-move-node (+ (aref p 0) dx) (+ (aref p 1) dy) node)
+
+	      (setq x1 x2
+		    y1 y2
+		    start-pos next-pos)
+	    )))
+	;; Always redraw when we are done.
+	(cogre-render-buffer cogre-graph t)
+	)
+       ((cogre-link-child-p node)
+	;; Implement something good here someday.
+	nil)
+       (t
+	nil)
+
+       ))))
+
+(defvar cogre-down-mouse-2-link-selector nil
+  "The link type to use when using mouse 2.
+Set by menu operations.")
+
+(defun cogre-select-a-link ()
+  "Select a link type from a popup menu."
+  (interactive)
+  (setq cogre-down-mouse-2-link-selector
+	(cogre-default-link)))
+
+(defun cogre-down-mouse-2 (event)
+  "Handle a mouse-down-2 EVENT in `cogre' mode.
+Clicking and dragging on a node will move the node."
+  (interactive "@e")
+  (let* ((echo-keystrokes 10000)	; don't show pressed keys.
+	 (start-pos (posn-col-row (event-end event)))
+	 (x1        (car start-pos))
+	 (y1        (cdr start-pos))
+	 )
+
+    ;; Make sure the text character exists for this point.
+    (picture-mouse-set-point event)
+
+    ;; Did we click on a node?
+    (let* ((node (cogre-current-element (point))))
+
+      (if (and node (cogre-node-child-p node))
+	  (progn
+	    (message "Drag POINT to node to create a link.")
+	    ;; Create a link by dragging from this node to another.
+	    (track-mouse
+
+	      (while (progn
+		       (setq event (read-event))
+		       (mouse-movement-p event))
+		
+		;; We need some way to indicate the drag.
+		(picture-mouse-set-point event)
+
+		(message "Drag POINT to node to create a link.")
+		))
+	    (let ((endnode (cogre-current-element (point)))
+		  (cogre-down-mouse-2-link-selector nil))
+	      (if endnode
+		  (progn
+		    (popup-menu cogre-mode-new-link-popup-menu)
+		    (make-instance (or cogre-down-mouse-2-link-selector
+				       'cogre-link)
+				   :start node :end endnode)
+		    (cogre-render-buffer cogre-graph)
+		    )
+		;; else, a bug
+		(message "You must drop the link onto another node."))
+	      ))
+	(message "Click on a node and drag to create a link.")
+	;; Eat the next event
+	(read-event)
+	;; Repeat the message
+	(message "Click on a node and drag to create a link.")
+	))))
+
+(defun cogre-down-mouse-3 (event)
+  "Handle a popup menu EVENT in `cogre' mode.
+Pops up a context menu of various activities to perform."
+  (interactive "@e")
+  (let* ((startwin (selected-window))
+	 ;; This line has an issue in XEmacs.
+	 (win (semantic-event-window event))
+	 )
+    (select-window win t)
+    (save-excursion
+      (picture-mouse-set-point event)
+      (sit-for 0)
+      (let ((node (cogre-current-element (point))))
+	(cond
+	 ((cogre-node-child-p node)
+	  (let ((extramenu (cogre-augment-element-menu node nil)))
+	    (if (not extramenu)
+		(popup-menu cogre-node-update-popup-menu)
+	      ;; Merge menus, and pop up the new one.
+	      (let ((newmenu nil))
+		(dolist (M (cdr cogre-node-base-menu))
+		  (push M newmenu)
+		  (when (and (stringp M) (string= M "---"))
+		    ;; Add new entries here.
+		    (dolist (NM extramenu)
+		      (push NM newmenu))
+		    (push "---" newmenu)
+		    ))
+		;; No convert the fabricated menu into a temporary popup.
+		(popup-menu
+		 (easy-menu-create-menu (car cogre-node-base-menu) (nreverse newmenu)))
+		))))
+	 ((cogre-link-child-p node)
+	  (popup-menu cogre-link-update-popup-menu))
+	 (t
+	  (popup-menu cogre-mode-create-popup-menu)))
+	))
+    (select-window startwin)))
+
+(provide 'cogre-mode)
+
+;;; cogre-mode.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-node.xpm b/site/cedet-1.0pre7/cogre/cogre-node.xpm
new file mode 100644
index 0000000..c6a000b
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-node.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_node_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+" ...................... ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" . .  .         .     . ",
+" . .  .         .     . ",
+" . .. .  ..   ...  .  . ",
+" . .. . .  . .  . . . . ",
+" . . .. .  . .  . ... . ",
+" . .  . .  . .  . .   . ",
+" . .  .  ..   ...  .. . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" .                    . ",
+" ...................... ",
+"                        "};
diff --git a/site/cedet-1.0pre7/cogre/cogre-note.xpm b/site/cedet-1.0pre7/cogre/cogre-note.xpm
new file mode 100644
index 0000000..6043db7
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-note.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * cogre_note_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"      ..................",
+"     ..                .",
+"    . .                .",
+"   .  .                .",
+"  .   .                .",
+" .    .                .",
+".     .                .",
+".......                .",
+".                      .",
+".                      .",
+".  .   .               .",
+".  ..  .      .        .",
+".  ... .  .. ... ..    .",
+".  . . . .  . . .  .   .",
+".  .  .. .  . . ....   .",
+".  .  .. .  . . .      .",
+".  .   .  ..  .  ...   .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+"........................"};
diff --git a/site/cedet-1.0pre7/cogre/cogre-package.xpm b/site/cedet-1.0pre7/cogre/cogre-package.xpm
new file mode 100644
index 0000000..97df9a7
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-package.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * package_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+" .........              ",
+".        ..             ",
+".         ..            ",
+".          .            ",
+".          .............",
+".                      .",
+".                      .",
+".   ..... .            .",
+".   .   . .            .",
+".   .   . .  . ....    .",
+".   ..... . .  .  .    .",
+".   .     ..  .   .    .",
+".   .     . . .   .    .",
+".   .     .  . . ..    .",
+".         .  .  . .    .",
+".             ..       .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+".                      .",
+"........................"};
diff --git a/site/cedet-1.0pre7/cogre/cogre-periodic.el b/site/cedet-1.0pre7/cogre/cogre-periodic.el
new file mode 100644
index 0000000..a362952
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-periodic.el
@@ -0,0 +1,136 @@
+;;; cogre-periodic.el --- Periodic table of COGRE nodes
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-periodic.el,v 1.7 2009/04/07 01:45:09 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Periodic table of COGRE nodes.
+;;
+;; @TODO - Each time a new node or link is created, add it to the
+;;         periodic table.
+
+;;; Code:
+(require 'cogre-utest)
+(require 'cogre-uml)
+
+(defvar cogre-periodic-node-name-list
+  '( ( "cogre-node" cogre-node )
+     ( "cogre-node (2)" cogre-node )
+     ( "cogre-package" cogre-package )
+     ( "cogre-class" cogre-class )
+     ( "cogre-class (2)" cogre-class )
+     ( "cogre-instance" cogre-instance )
+     ( "cogre-instance (2)" cogre-instance )
+     ( "Notes about COGRE" cogre-note )
+    )
+  "List of node names and classes in the graph.
+Used for testing purposes in conversion routines.")
+
+(defvar cogre-periodic-link-connectivity-list
+  '(
+    ( "cogre-node" "cogre-node2" cogre-link )
+    ( "cogre-package" "cogre-class" 'cogre-aggregate )
+    ( "cogre-class (2)" "cogre-class" cogre-inherit )
+    ( "cogre-instance" "cogre-instance (2)" cogre-arrow)
+    )
+  "List of link connectivity from the periodic table graph.
+Used for testing purpses in conversion routines.")
+
+;;;###autoload
+(defun cogre-periodic ()
+  "Create a periodic table of COGRE objects."
+  (interactive)
+  ;; Setup the graph.
+  (switch-to-buffer (get-buffer-create "*Graph Periodic*"))
+  (erase-buffer)
+  (kill-all-local-variables)
+  (cogre "Periodic")
+  ;; Put out the base items.
+  (let ((n1 (cogre-periodic-make-node-at 2 1 'cogre-node "cogre-node"))
+	(n2 (cogre-periodic-make-node-at 40 1 'cogre-node "cogre-node (2)")))
+    (cogre-periodic-link-at n1 n2 'cogre-link))
+  ;; Put out some UML class diagram elements items.
+  (let ((p1 (cogre-periodic-make-node-at 2 7 'cogre-package "cogre-package"))
+	(c1 (cogre-periodic-make-node-at
+	     25 7 'cogre-class "cogre-class"
+	     :package-name "package"))
+	(c2 (cogre-periodic-make-node-at
+	     23 18 'cogre-class "cogre-class (2)"
+	     :attributes
+	     (list
+	      (semantic-tag-new-variable "fAttr" "int")
+	      (semantic-tag-new-variable "fNice" "int")
+	      )
+	     :methods
+	     (list
+	      (semantic-tag-new-function "getAttr" "int" nil)
+	      (semantic-tag-new-function "setAttr" "void"
+					 (list (semantic-tag-new-variable
+						"attr" "int"))))
+	     )))
+    (cogre-periodic-link-at p1 c1 'cogre-aggregate)
+    (cogre-periodic-link-at c2 c1 'cogre-inherit))
+  ;; Instance Diagram
+  (let ((i1 (cogre-periodic-make-node-at 45 7 'cogre-instance "cogre-instance"))
+	(i2 (cogre-periodic-make-node-at
+	     45 28 'cogre-instance "cogre-instance (2)"
+	     :package-name "mypack"))
+	)
+    (cogre-periodic-link-at i1 i2 'cogre-arrow))
+  
+  ;; Notes?
+  (cogre-periodic-make-node-at 4 27 'cogre-note "Notes about COGRE")
+
+  (cogre-render-buffer cogre-graph)
+  )
+
+(defun cogre-periodic-make-node-at (x y type name &rest
+				      fields)
+  "Create a node at X,Y with TYPE and NAME.
+Optional FIELDS are fields to pass into the constructor."
+  (picture-goto-coordinate x y)
+  (let ((node (apply 'cogre-new-node (point) type fields)))
+    (cogre-set-element-name node name)
+    node))
+
+(defun cogre-periodic-link-at (node1 node2 type)
+  "Create a link between NODE1 and NODE2.
+Link is created with the specified TYPE."
+  (make-instance type :start node1 :end node2)
+  )
+
+;;; TESTS
+;;
+;;;###autoload
+(defun cogre-periodic-utest ()
+  "Run the cogre periodic table for unit testing.
+Also test various output mechanisms from the periodic table."
+  (interactive)
+  ;; Create the table.
+  (cogre-periodic)
+  (sit-for 0)
+  ;; ASCII output
+  (cogre-export-ascii)
+  (sit-for 0)
+  )
+
+(provide 'cogre-periodic)
+;;; cogre-periodic.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-semantic.el b/site/cedet-1.0pre7/cogre/cogre-semantic.el
new file mode 100644
index 0000000..469623b
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-semantic.el
@@ -0,0 +1,373 @@
+;;; cogre-semantic.el --- Convert Semantic TAGS to COGRE nodes.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-semantic.el,v 1.9 2009/04/23 03:28:09 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Define a set of Semantic COGRE element peers based on Semantic objects.
+;;
+;; Convert tags into COGRE nodes, or update existing COGRE nodes
+;; with data from TAGS.
+;;
+;; Used for cut/paste, or updating graphs linked to code from changes
+;; made in the code.
+;;
+;; To convert nodes into tags, see `cogre-convert.el'.
+
+(require 'semantic)
+(require 'cogre-srecode)
+(require 'cogre)
+
+;;; Code:
+
+;;; GRAPH PEERS
+;;
+;; The graph peer for Semantic will contain information needed for
+;; code generation, such as files and what-not.
+(defclass cogre-peer-project-semantic (cogre-element-peer)
+  (
+   )
+  "Peer for graph objects intended for use with Semantic element peers.")
+
+;;; TAG PEERS
+;;
+;; The peers can represent a Semantic tag, and keep it up to date.
+
+(defclass cogre-peer-semantic (cogre-element-peer)
+  ((tag :initarg :tag
+	:initform nil
+	:type (or null semantic-tag)
+	:documentation
+	"The Semantic Tag managed by this peer.")
+   )
+  "A peer containing a Semantic class.")
+
+(defmethod cogre-peer-source-file ((peer cogre-peer-semantic))
+  "Does this peer have a source file?"
+  (with-slots (tag) peer
+    (semantic-tag-file-name tag)))
+
+(defclass cogre-peer-semantic-class (cogre-peer-semantic)
+  (
+   )
+  "A peer containing a Semantic class.")
+
+(defun cogre-refresh-tag (tag)
+  "Refresh TAG from sources.
+Goes to the original location of TAG, and tries to re-find that tag."
+  (save-excursion
+    (semantic-go-to-tag tag)
+    ;; Force a refresh if needed.
+    (semantic-fetch-tags)
+    ;; Make sure we find the original.
+    (let ((newtag (semantic-current-tag))
+	  (replace nil))
+      ;; Are they basically the same?
+      (if (semantic-tag-similar-p tag newtag)
+	  (setq replace t)
+	;; Maybe we missed because the code moved around?
+	(let ((tagsearch (semantic-deep-find-tags-by-name (semantic-tag-name tag))))
+	  (setq tagsearch
+		(semantic--find-tags-by-function
+		 (lambda (T) (semantic-tag-similar-p T tag))
+		 tagsearch))
+	  (setq newtag (car tagsearch)))
+	(when (and newtag (semantic-tag-similar-p tag newtag))
+	  (setq replace t)))
+      ;; Make a copy of this new tag, and return it.
+      (when newtag
+	(semantic-tag-copy newtag nil t)))))
+
+(defmethod cogre-peer-update-from-source ((peer cogre-peer-semantic-class) node)
+  "Update the PEER object, and NODE from environment."
+  (let* ((tag (oref peer tag))
+	 (newtag (cogre-refresh-tag tag))
+	 )
+
+    (when newtag
+      (oset peer :tag (semantic-tag-copy newtag nil t))
+      (setq tag (oref peer :tag)))
+
+    ;; Update node based one what we learned.
+    (let ((slots (semantic-tag-type-members tag))
+	  (extmeth (semantic-tag-external-member-children tag t))
+	  attrib method)
+      ;; Bin them up
+      (while slots
+	(cond
+	 ;; A plain string, a simple language, just do attributes.
+	 ((stringp (car slots))
+	  (setq attrib (cons (list (car slots) 'variable nil)
+			     attrib))
+	  )
+	 ;; Variable decl is an attribute
+	 ((eq (semantic-tag-class (car slots)) 'variable)
+	  (setq attrib (cons (semantic-tag-copy (car slots) nil t) attrib)))
+	 ;; A function decle is a method.
+	 ((eq (semantic-tag-class (car slots)) 'function)
+	  (setq method (cons (semantic-tag-copy (car slots) nil t) method)))
+	 )
+	(setq slots (cdr slots)))
+
+      ;; Add in all those extra methods	
+      (when (semanticdb-find-results-p extmeth)
+	(setq extmeth (semanticdb-strip-find-results extmeth t)))
+      (while extmeth
+	(when (eq (semantic-tag-class (car extmeth)) 'function)
+	  (setq method (cons (semantic-tag-copy (car extmeth) nil t) method)))
+	(setq extmeth (cdr extmeth)))
+
+      ;; Put them into the class.
+      (oset node object-name (semantic-tag-name tag))
+      (oset node attributes (nreverse attrib))
+      (oset node methods (nreverse method))
+      ;; Tada!
+      )))
+
+(defmethod cogre-peer-update-from-element ((peer cogre-peer-semantic-class) element)
+  "Update the PEER object, from the ELEMENT data, changing the environment."
+  (message "Cannot update source from graph yet.")
+   nil)
+
+;;; NEW NODE FROM SOURCE
+;;
+;; Handle conversion from a Semantic Tag (source) to a new node.
+;;
+;;;###autoload
+(defun cogre-semantic-tag-to-node (tag)
+  "Convert the Semantic tag TAG into a COGRE node.
+Only handles data types nodes.
+To convert function/variables into methods or attributes in
+an existing COGRE node, see @TODO - do that."
+  (cond
+   ((and tag (semantic-tag-of-class-p tag 'type)
+	 (or (string= (semantic-tag-type tag) "class")
+	     (string= (semantic-tag-type tag) "struct")))
+    ;; A type from a typed language, make the peer and the class,
+    ;; then perform the update.
+    (let* ((peer (cogre-peer-semantic-class
+		  (semantic-tag-name tag)
+		  :tag (semantic-tag-copy tag nil t)))
+	   (node (cogre-class (semantic-tag-name tag)
+			      :peer peer)))
+      (cogre-peer-update-from-source peer node)
+      node))
+
+   ((semantic-tag-of-class-p tag 'node)
+    ;; A node from a dot file.
+    (error "COGRE can't import dot files yet")
+    )
+   (t
+    (error "COGRE can only convert language datatypes into class nodes"))))
+
+;;; SEMANTIC TAG GENERATOR
+;;
+;; Convert a graph into a set of Semantic Tags.   Different utilties
+;; will be needed to convert these tags into source code.
+(defun cogre-export-semantic (&optional m-mode)
+  "Export the current COGRE graph to a set of Semantic Tags.
+This command will just display the generated tags.
+Use different utilities to convert these tags to into code.
+Optional argument M-MODE specifies the mode to have active
+while creating the tags."
+  (interactive)
+  (when (not (eieio-object-p cogre-graph)) (error "No graph to export"))
+
+  (let* ((g cogre-graph)
+	 (tags nil)
+	 )
+
+    (setq tags
+	  (if m-mode
+	      (with-mode-local-symbol m-mode
+		(cogre-export-semantic-method g))
+	    ;; Else, no mode, use whatever...
+	    (cogre-export-semantic-method g)))
+
+    (if (interactive-p)
+	;; Dump the output.
+	(data-debug-show-stuff tags "CogreSemanticTagExport")
+      tags)))
+
+(defmethod cogre-export-semantic-method ((g cogre-base-graph))
+  "Convert G into Semantic Tag for a typed language."
+  (save-excursion
+    (set-buffer (oref g buffer))
+    ;; Sort the graph into a nested a tree.
+    (let ((tree (cogre-uml-sort-for-lineage g))
+	  (out nil))
+      ;; Each entry in TREE is:
+      ;; ( CLASS SUPER1 SUPER2 ... )
+      (dolist (E tree) 
+	(let* ((node (car E))
+	       (name (oref node :object-name))
+	       (parents (mapcar (lambda (P)
+				  (oref P :object-name))
+				(cdr E)))
+	       (attrib (oref node attributes))
+	       (method (oref node methods))
+	       )
+	  (let ((tag (semantic-tag-new-type
+		      name "class"
+		      (append method attrib)
+		      (list parents))))
+	    (push tag out))
+	  ))
+      (nreverse out))))
+
+;;; CODE GENERATOR
+;;
+;; Generate code from a graph.  Convert into Semantic tags, then
+;; output into a source file.
+;;
+;;;###autoload
+(defun cogre-export-code (file)
+  "Export the current graph into source-code in FILE.
+Uses `cogre-export-semantic' to convert into Semantic tags.
+Uses `cogre-srecode-setup' to setup SRecode for code generation."
+  (interactive "FOutput File: ")
+  (let* ((newfilebuff (find-file-noselect file))
+	 (mode (save-excursion (set-buffer newfilebuff)
+			       major-mode))
+	 (tags (cogre-export-semantic mode))
+	 )
+    ;; Load our tables.
+    (cogre-srecode-load-tables)
+    (srecode-load-tables-for-mode mode)
+
+    ;; Switch to this new buffer.
+    (switch-to-buffer newfilebuff)
+
+    (when (= (point-min) (point-max))
+      ;; Start it out.
+      (srecode-insert "file:empty"))
+
+    ;; Insert all the tags.
+    (dolist (T tags)
+      (let ((me (srecode-semantic-insert-tag T)))
+	(goto-char me))
+      )
+    
+    ))
+
+;;; USER-UTILITY
+;; 
+;; Previous version of cogre-uml-quick-class used a different class
+;; hierarchy.  This implementation uses the new peer back-end to various
+;; nodes to build up the tree.
+;;
+;; Also, use new Semantic analyzer features to identify the
+;; classes we want to build.
+
+(defvar cogre-class-history nil
+  "History for inputting class names.")
+
+(defun cogre-read-class-name ()
+  "Read in a class name to be used by a cogre node."
+  (let ((finddefaultlist (semantic-find-tag-by-overlay))
+	class prompt stream
+	)
+    ;; Assume the top most item is the all encompassing class.
+    (if finddefaultlist
+	(setq class (car finddefaultlist)))
+    ;; Make sure our class is really a class
+    (if (not (and
+	      class
+	      (eq (semantic-tag-class class) 'type)
+	      (string= (semantic-tag-type class) "class")))
+	(setq class nil)
+      (setq class (semantic-tag-name class)))
+    ;; Create a prompt
+    (setq prompt (if class (concat "Class (default " class "): ") "Class: "))
+    ;; Get the stream used for completion.
+    (let ((types (semanticdb-strip-find-results
+		  (semanticdb-brute-find-tags-by-class 'type)
+		  ;; Don't find-file-match.  Just need names.
+		  )))
+      (setq stream (semantic-find-tags-by-type "class" types)))
+    ;; Do the query
+    (completing-read prompt stream
+		     nil nil nil 'cogre-class-history
+		     class)
+    ))
+
+;;;###autoload
+(defun cogre-uml-quick-class (class)
+  "Create a new UML diagram based on CLASS showing only immediate lineage.
+The parent to CLASS, CLASS, and all of CLASSes children will be shown."
+  (interactive (list (cogre-read-class-name)))
+  
+  (message "Building UML diagram for %S" class)
+
+  (let* ((brute (semanticdb-brute-deep-find-tags-by-name class (current-buffer)))
+	 (byclass (when brute (semanticdb-find-tags-by-class 'type brute)))
+	 (stripped (when byclass (semanticdb-strip-find-results byclass t)))
+	 (classes (when stripped (semantic-find-tags-by-type "class" stripped)))
+	 (class-tok (car classes))
+	 (parent (semantic-tag-type-superclasses class-tok))
+	 (ptags nil)
+
+	 (children
+	  (semanticdb-strip-find-results
+	   (semanticdb-find-tags-subclasses-of-type
+	    (semantic-tag-name class-tok) (current-buffer))))
+	 )
+
+    (unless class-tok
+      (error "Could not find class %S" class))
+
+    (save-excursion
+      ;; Go to our token, and then look up the parents.
+      (semantic-go-to-tag class-tok)
+      (let ((scope (semantic-calculate-scope)))
+	(dolist (P parent)
+	  (push (semantic-analyze-find-tag P 'type scope)
+		ptags))
+	))
+
+    ;; Create a graph.
+    (cogre (semantic-tag-name class-tok))
+
+    ;; Create this class
+    (let ((CT (cogre-semantic-tag-to-node class-tok)))
+
+      ;; Create all the parent nodes in the graph, then connect
+      ;; them to C.
+      (dolist (P ptags)
+	(when P
+	  (let ((pn (cogre-semantic-tag-to-node P)))
+	    (make-instance 'cogre-inherit :start CT :end pn))))
+      
+      ;; Create all the children nodes, and align them.
+      (dolist (C children)
+	(let ((cn (cogre-semantic-tag-to-node C)))
+	(make-instance 'cogre-inherit :start cn :end CT))))
+      
+    ;; Run the layout engine.
+    (condition-case nil
+	(cogre-layout)
+      (error
+       (message "Layout engine failed. You need to install Graphviz.")
+       ))
+    ))
+
+(provide 'cogre-semantic)
+;;; cogre-semantic.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-srecode.el b/site/cedet-1.0pre7/cogre/cogre-srecode.el
new file mode 100644
index 0000000..071f114
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-srecode.el
@@ -0,0 +1,153 @@
+;;; cogre-srecode.el --- SRecode macros for COGRE.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-srecode.el,v 1.5 2009/04/06 02:28:18 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Basic SRecode support for COGRE related activities.
+
+(require 'srecode)
+(require 'srecode-dictionary)
+
+;;; Code:
+;;;###autoload
+(defun cogre-srecode-setup ()
+  "Update various paths to get SRecode to identify COGRE macros."
+
+  (let* ((lib (locate-library "cogre.el" t))
+	 (ededir (file-name-directory lib))
+	 (tmpdir (file-name-as-directory
+		  (expand-file-name "templates" ededir))))
+    (when (not tmpdir)
+      (error "Unable to location COGRE Templates directory"))
+
+    ;; Rig up the map.
+    (require 'srecode-map)
+    (add-to-list 'srecode-map-load-path tmpdir)
+    (srecode-map-update-map t)
+    
+    ))
+
+(defun cogre-srecode-load-tables ()
+  "Load tables COGRE needs for SREcode."
+  ;; We don't call this unless we need it.  Load in the templates.
+  (srecode-load-tables-for-mode 'graphviz-dot-mode)
+  )
+
+(defvar cogre-srecode-current-graph nil
+  "The current COGRE graph to add to SRecode.")
+
+;;;###autoload
+(defun srecode-semantic-handle-:cogre (dict)
+  "Add macros to dictionary DICT based on COGRE data."
+  (let ((G (if (eieio-object-p cogre-graph)
+	       cogre-graph
+	     cogre-srecode-current-graph)))
+    (when (not G) (error "Cannot resolve :cogre template argument.  No current graph"))
+
+    (srecode-dictionary-set-value dict "GRAPHNAME" (oref G name))
+
+    ;; @todo - set buffer to graph.  Convert to ascii.
+
+    (srecode-dictionary-set-value dict "GRAPH" "")
+    ))
+
+;;;###autoload
+(eval-after-load "srecode-map" (cogre-srecode-setup))
+
+;;;###autoload
+(defun srecode-semantic-handle-:dot (dict)
+  "Add macros to dictionary DICT based on the current DOT buffer."
+  ;; @todo - Is there anything??
+  
+  )
+
+(defun cogre-srecode-add-attr (label value dict)
+  "Add LABEL with VALUE to DICT."
+  (let ((subdict (srecode-dictionary-add-section-dictionary dict "ATTRIBUTES")))
+    (srecode-dictionary-set-value subdict "LABEL" label)
+    (srecode-dictionary-set-value subdict "VALUE" value)))
+
+(define-mode-local-override srecode-calculate-context
+  graphviz-dot-mode ()
+  "Calculate a context for SRecode.
+This fcn is very sparing of fetching tags."
+  (if (= (point-min) (point-max))
+      (list "file" "empty")
+
+    (let ((ct (semantic-find-tag-by-overlay))
+	  )
+
+      (when (not ct)
+	(semantic-fetch-tags)
+	(setq ct (semantic-find-tag-by-overlay)))
+      
+      (cond ((not ct)
+	     (list "declaration" "graph")
+	     )
+	    ((semantic-tag-of-class-p (car ct) 'digraph)
+	     (list "declaration" "node")
+	     )
+	    ((semantic-tag-of-class-p (car (cdr ct)) 'node)
+	     (list "attribute")
+	     ))
+      )
+    ))
+
+(define-mode-local-override srecode-semantic-apply-tag-to-dict
+  graphviz-dot-mode (tagobj dict)
+  "Insert features of TAGOBJ into dictionary DICT."
+  ;; Semantic Graphviz tags are not like other tags.
+
+  ;; Store the sst into the dictionary.
+  (srecode-dictionary-set-value dict "TAG" tagobj)
+
+  ;; Pull out the tag for the individual pieces.
+  (let ((tag (oref tagobj :prime)))
+
+    (srecode-dictionary-set-value dict "NAME" (semantic-tag-name tag))
+
+    (cond 
+     ((semantic-tag-of-class-p tag 'node)
+      (let ((A (semantic-tag-get-attribute tag :attributes)))
+	(while A
+	  (cogre-srecode-add-attr (semantic-tag-name (car A))
+				  (semantic-tag-get-attribute (car A) :value)
+				  dict)
+	  (setq A (cdr A))))
+      )
+     ((semantic-tag-of-class-p tag 'link)
+      (srecode-dictionary-set-value
+       dict "TAIL" (semantic-tag-get-attribute tag :to))
+      ;(cogre-srecode-add-attr "arrowhead" (semantic-tag-get-attribute tag :arrowhead) dict)
+      ;(cogre-srecode-add-attr "arrowtail" (semantic-tag-get-attribute tag :arrowtail) dict)
+      (let ((A (semantic-tag-get-attribute tag :attributes)))
+	(while A
+	  (cogre-srecode-add-attr (semantic-tag-name (car A))
+				  (semantic-tag-get-attribute (car A) :value)
+				  dict)
+	  (setq A (cdr A))))
+      )
+     )
+    ))
+
+(provide 'cogre-srecode)
+;;; cogre-srecode.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-uml.el b/site/cedet-1.0pre7/cogre/cogre-uml.el
new file mode 100644
index 0000000..e932d90
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-uml.el
@@ -0,0 +1,439 @@
+;;; cogre-uml.el --- UML support for COGRE
+
+;;; Copyright (C) 2001, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: oop, uml
+;; X-RCS: $Id: cogre-uml.el,v 1.30 2009/04/23 03:26:59 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provides UML support for COGRE.
+;;
+;; See http://c2.com/cgi/wiki?UmlAsciiArt for more examples of using
+;; ASCII to draw UML diagrams.
+
+(require 'cogre)
+(eval-when-compile (require 'cogre-semantic))
+
+;;; Code:
+;;;###autoload
+(defclass cogre-package (cogre-node)
+  ((name-default :initform "Package")
+   (blank-lines-top :initform 1)
+   (blank-lines-bottom :initform 1)
+   (alignment :initform left)
+   (subgraph :initarg :subgraph
+	     :initform nil
+	     :type (or null cogre-base-graph)
+	     :documentation
+	     "A graph which represents the classes within this package.
+The subgraph should be scanned to extract all the elements drawn into
+the package node.")
+   )
+  "A Package node.
+Packages represent other class diagrams, and list the major nodes
+within them.  They can be linked by dependency links.")
+
+(defmethod cogre-node-rebuild-default ((node cogre-package))
+  "Create the text rectangle for the COGRE package.
+Calls the base method, and takes the return argument and
+tweaks the faces."
+  (let* ((rect (call-next-method))
+	 (first (car rect))
+	 (second (car (cdr rect))))
+    ;; Tweak the first and second string iff it is long enough.
+    (when (> (length first) 7)
+      (remove-text-properties 5 (length first) '(face) first)
+      (setcar rect first)
+      (cogre-string-merge-faces 5 (length second)
+				'cogre-box-first-face
+				second)
+      (setcar (cdr rect) second)
+      )
+    ;; Return it.
+    rect))
+
+;;;###autoload
+(defclass cogre-note (cogre-node)
+  ((name-default :initform "Note...")
+   (blank-lines-top :initform 1)
+   (blank-lines-bottom :initform 1)
+   (alignment :initform left)
+   )
+  "An note node.
+Notes are used to add annotations inside a graph.
+Notes are generally linked to some node, and are supposed to look
+like a little pieces of paper.")
+
+(defmethod cogre-node-rebuild-default ((node cogre-note))
+  "Create the text rectangle for the COGRE package.
+Calls the base method, and takes the return argument and
+tweaks the faces."
+  (let* ((rect (call-next-method))
+	 (first (car rect)))
+    (remove-text-properties 0 1 '(face) first)
+    (aset first 0 ?/)
+    (setcar rect first)
+    ;; Return it.
+    rect))
+
+;;;###autoload
+(defclass cogre-scoped-node (cogre-node)
+  ((package-name :initform ""
+		 :initarg :package-name
+		 :type string
+		 :custom string
+		 :documentation
+		 "The package name of this node.
+Package names are displayed in italic at the top of the node above the name
+in UML, usuall like this:
+   +---------------+
+   | <<mypackage>> |
+   | NameOfNode    |          
+   | ...           |")
+   (package-delimiters :allocation :class
+		       :initform ( "<<" . ">>" )
+		       :documentation
+		       "Decoration delimiters for left/right side of package name.
+It is a list of the form ( \"LEFTDELIM\" . \"RIGHTDELIM\").")
+   )
+  "A UML node that has a package specifier within which it is scoped."
+  :abstract t)
+
+(defmethod cogre-node-title ((node cogre-scoped-node))
+  "Return the title of a scoped node.
+If there is no package name, it is (\"name\").  If there
+is a package, it is ( \"<package>\" \"name\")."
+  (if (not (string= (oref node package-name) ""))
+      (let* ((p (oref node package-name))
+	     (delim (oref node package-delimiters))
+	     (s (concat (car delim) p (cdr delim))))
+	(cogre-string-merge-faces 1 (+ (length p) 1) 'italic s)
+	(list s (oref node object-name)))
+    (list (oref node object-name))))
+
+(defmethod cogre-augment-element-menu ((node cogre-scoped-node) menu)
+  "For NODE, augment the current element MENU.
+Return the modified element."
+  (append (call-next-method node menu)
+	  '( [ "Repackage" cogre-set-scoped-node-package t ]
+	     )))
+
+;;;###autoload
+(defclass cogre-class (cogre-scoped-node)
+  ((name-default :initform "Class")
+   (blank-lines-top :initform 0)
+   (blank-lines-bottom :initform 0)
+   (alignment :initform left)
+   (attributes :initarg :attributes
+	       :initform nil
+	       :type list
+	       :custom sexp
+	       :documentation
+	       "A list of attributes belonging to this Class representation.
+Each attribute must in the form of a semantic token. ei.
+ (\"object-name\" variable \"type\" ... )
+See `semantic-fetch-tags' for details on possible token forms.
+These items do not need to be REAL semantic tokens, however.
+Only the format is needed to get the name/typing information.")
+   (methods :initarg :methods
+	    :initform nil
+	    :type list
+	    :custom sexp
+	    :documentation
+	    "A list of methods belonging to this Class representation.
+See `attribute' slot for details on the form of each token in this list.")
+   )
+  "A Class node.
+Class nodes represent a class, and can list the attributes and methods
+within them.  Classes can have attribute links, and class hierarchy links.")
+
+(defmethod cogre-uml-stoken->uml ((class cogre-class) stoken &optional text)
+  "For CLASS convert a Semantic style token STOKEN into a uml definition.
+It also adds properties that enable editing, and interaction with
+this node.  Optional argument TEXT is a preformatted string."
+  (if (semantic-tag-p stoken)
+      (let ((peer (oref class peer))
+	    (mm (oref cogre-graph major-mode)))
+	(save-excursion
+	  ;; Visit that tag's home so we get the correct mechanism for
+	  ;; converting to a prototype.
+	  (if (semantic-tag-file-name stoken)
+	      (progn
+		(semantic-go-to-tag stoken)
+		(setq mm major-mode))
+	    (when (and peer (cogre-peer-source-file peer))
+	      (set-buffer (semantic-find-file-noselect
+			   (cogre-peer-source-file peer)))
+	      (setq mm major-mode)
+	      )))
+	;; disable images during the format.  Images will mess up
+	;; the fancy formatting.
+	(with-mode-local-symbol mm
+	  (let ((semantic-format-use-images-flag nil)
+		(parent (and (class-p 'cogre-peer-semantic)
+			     (cogre-peer-semantic-child-p peer)
+			     (oref peer :tag))))
+	    (semantic-format-tag-uml-concise-prototype stoken parent t))))
+    (error "Unknown element cogre-class node attribute or method.")))
+
+(defmethod cogre-node-slots ((class cogre-class))
+  "Return a list of each section, including title, attributes, and methods.
+Argument CLASS is the class whose slots are referenced."
+  (let ((detail (if (eieio-object-p cogre-graph)
+		    (oref cogre-graph :detail)
+		  0)))
+    (cond 
+     ((= detail 0)
+      ;; Show everything.
+      (list
+       (mapcar (lambda (s) (cogre-uml-stoken->uml class s)) (oref class methods))
+       (mapcar (lambda (s) (cogre-uml-stoken->uml class s)) (oref class attributes))
+       ))
+     ((= detail 3)
+      ;; Show nothing.
+      (list nil nil))
+     ((memq detail '(1 2))
+      ;; Strip out redundant entries from the method and attribute lists.
+      (let ((name (oref class :object-name))
+	    (attr (oref class attributes))
+	    (meth (oref class methods)))
+	;; Heuristic 1 - Strip out anything with the same name as the
+	;; class itself.
+	(setq meth (semantic--find-tags-by-function
+		    (lambda (T) (not (string= (semantic-tag-name T) name)))
+		    meth))
+	;; Heuristic 2 - For each attribute, strip out any method that
+	;; is either a "get" or a "set" of that attribute.
+	;;
+	;; But only for "more detail" cases.  In even less detail cases
+	;; these methods need to stay when we strip out all the private
+	;; data.
+	(when (= detail 1)
+	  (let ((case-fold-search t))
+	    (dolist (A attr)
+	      (let* ((tn (semantic-tag-name A))
+		     (c1 (substring tn 0 1))
+		     (str (substring tn 1))
+		     (reg (concat "[gs]et\\(" 
+				  (if (string= c1 "f") str tn)
+				  "\\)")))
+		(setq meth (semantic--find-tags-by-function
+			    (lambda (T) (not (string-match reg (semantic-tag-name T))))
+			    meth))))))
+	;; Heuristic 3 - Strip out anything private or protected!
+	;; But only if less detail is desired.
+;	(when (= detail 2)
+;	  ;; @TODO
+;	  nil
+;	  )
+	;; Heuristic 4 - Get clever.
+	
+	(list
+	 (mapcar (lambda (s) (cogre-uml-stoken->uml class s)) meth)
+	 (mapcar (lambda (s) (cogre-uml-stoken->uml class s)) attr)
+	 )
+	)))))
+
+;;;###autoload
+(defclass cogre-instance (cogre-scoped-node)
+  ((name-default :initform "Instance")
+   (blank-lines-top :initform 1)
+   (blank-lines-bottom :initform 1)
+   (alignment :initform left)
+   )
+  "An instance node.
+Instances are used in instance diagrams.
+Instances are linked together with plain links.")
+
+(defmethod cogre-node-title ((node cogre-instance))
+  "Return a list of strings representing the title of the NODE.
+For example: ( \"Title\" ) or ( \"<Type>\" \"Title\" )"
+  (let* ((prev (call-next-method))
+	 (name (concat ":" (oref node object-name))))
+    (cogre-string-merge-faces 0 (length name) 'underline name)
+    (if (= (length prev) 1)
+	;; It's just us.
+	(list name)
+      ;; Else, we probably have a package name.
+      (setcar (cdr prev) name)
+      prev)))
+
+;;; Links
+;;
+;;;###autoload
+(defclass cogre-inherit (cogre-link)
+  ((end-glyph :initform [ (" ^ " "/_\\")
+			  ("_|_" "\\ /" " V ")
+			  (" /|" "< |" " \\|")
+			  ("|\\ " "| >" "|/ ") ])
+   (horizontal-preference-ratio :initform .1)
+   )
+  "This type of link indicates that the two nodes reference infer inheritance.
+The `start' node is the child, and the `end' node is the parent.
+This is supposed to infer that START inherits from END.")
+
+;;;###autoload
+(defclass cogre-aggregate (cogre-link)
+  ((start-glyph :initform [ ("/\\ " "\\/" )
+			    ("/\\ " "\\/" )
+			    ("<>") ("<>") ])
+   (horizontal-preference-ratio :initform 1)
+   )
+  "This type of link indicates aggregation.
+The `start' node is the owner of the aggregation, the `end' node is
+the item being aggregated.
+This is supposed to infer that START contains END.")
+
+;;; UNICODE SUPPORT
+;;
+
+;;;###autoload
+(defun cogre-uml-enable-unicode ()
+  "Enable use of UNICODE symbols to create COGRE graphs.
+Inheritance uses math triangle on page 25a0.
+Aggregation uses math square on edge 25a0.
+Line-drawing uses line-drawing codes on page 2500.
+See http://unicode.org/charts/symbols.html.
+
+The unicode symbols can be differing widths.  This will make the
+cogre chart a little screwy somteims.  Your mileage may vary."
+  (interactive)
+  (oset-default cogre-inherit end-glyph
+		[ ("\u25b3") ("\u25bd") ("\u25c1") ("\u25b7") ])
+  (oset-default cogre-aggregate start-glyph
+		[ ("\u2b25") ("\u2b25") ("\u25c6") ("\u25c6") ] )
+  ;; Nice idea, but too small.  Oh well.  Maybe someone else
+  ;; can design something better.
+  (oset-default cogre-arrow end-glyph
+  		[ ("\u2191") ("\u2193") ("\u2190") ("\u2192") ] )
+
+  ;; Set the special single-char << and >> thingies.
+  (let ((delim '( "\u226a" . "\u226b" )))
+    (oset-default cogre-scoped-node package-delimiters delim)
+    ;; Note: I should use some sort of eieio looping to do this change.
+    (oset-default cogre-class package-delimiters delim)
+    (oset-default cogre-instance package-delimiters delim))
+
+  ;; "\u25c7" - open box like "\u25c6"
+  (setq picture-rectangle-v ?\u2502)
+  (setq picture-rectangle-h ?\u2500)
+  (setq picture-rectangle-ctl ?\u250C)
+  (setq picture-rectangle-ctr ?\u2510)
+  (setq picture-rectangle-cbl ?\u2514)
+  (setq picture-rectangle-cbr ?\u2518)
+  )
+
+;;; SORTED TREE
+;;
+;; UML diagrams have an order to them.  Producing a sorted tree is the
+;; first step in producing code.
+(defun cogre-nodes-linkedto (node links &optional slot)
+  "Return a list of nodes from linked to from NODE based on LINKS.
+Optional SLOT is the slot to check in each LINK to see if it matches a node.
+If SLOT is not supplied, then SLOT is :start."
+  (when (not slot) (setq slot :start))
+  (let ((out nil)
+	(checkslot (or slot :start))
+	(getslot (cond ((eq slot :start)
+			:end)
+		       (t :start))))
+    (dolist (L links)
+      (when (eq (eieio-oref L checkslot) node)
+	(push (eieio-oref L getslot) out))
+      )
+    out))
+
+(defun cogre-nodes-all-in-list (checknodes refnodes)
+  "Are all nodes in CHECKNODES in the reference list of REFNODES."
+  (let ((ans t))
+    (while (and checknodes ans)
+      (when (not (memq (car checknodes) refnodes))
+	(setq ans nil))
+      (setq checknodes nil))
+    ans))
+
+;;;###autoload
+(defun cogre-uml-sort-for-lineage (g)
+  "Sort the current graph G for determining inheritance lineage.
+Return it as a list of lists.  Each entry is of the form:
+  ( NODE PARENT1 PARENT2 ... PARENTN)"
+  (interactive (list cogre-graph)) ;; Just hack it.
+  ;; For a typed language, we have several jobs to do before
+  ;; going to convert the individual nodes.
+  ;;
+  ;; 0) Collect all the classes and inheritance links.
+  ;; 1) Find all top-level nodes w/ no inherited parents.
+  ;; 2) For each of these nodes, generate the tag, then
+  ;;    generate each node that is a subclass.
+  ;; 3) Generate for each sub-sub-class, and repeat.
+  (let ((nodes nil) (links nil)
+	(toplevelnodes nil)
+	(dumped nil)
+	(out nil)
+	count)
+    ;; 0 - Sort the elements.
+    (cogre-map-graph-elements
+     g (lambda (elt) (cond ((cogre-class-child-p elt)
+			    (push elt nodes))
+			   ((cogre-inherit-child-p elt)
+			    (push elt links))
+			   )))
+    ;; 1 - Find toplevel nodes.
+    (mapc (lambda (node)
+	    (when (not (object-assoc node :start links))
+	      (push node toplevelnodes)))
+	  nodes)
+    ;; 2 - Go over each toplevel node, and generate
+    (dolist (TL toplevelnodes)
+      (push TL dumped)
+      (push (list TL) out)
+      (setq nodes (delq TL nodes))
+      )
+    ;; 3 - Loop over the remaining nodes until there are none left,
+    ;;     and all have been dumped.
+    (setq count (length nodes))
+    (while nodes
+      (mapc (lambda (node)
+	      (let ((parents (cogre-nodes-linkedto node links)))
+		;; If all parents have already been dumped, then we can
+		;; dump NODE.
+		(when (cogre-nodes-all-in-list parents dumped)
+		  (push node dumped)
+		  (push (cons node parents) out)
+		  (setq nodes (delq node nodes)))
+		))
+	    nodes)
+      (when (= count (length nodes))
+	(error "Possible graph inheritance recursion"))
+      (setq count (length nodes))
+      )
+    ;; DONE
+    (setq out (nreverse out))
+    ;; 4) Dump if in interactive mode.
+    (when (interactive-p)
+      ;; Dump the output.
+      (data-debug-show-stuff out "SortedInheritanceNodes"))
+    out))
+
+(provide 'cogre-uml)
+
+;;; cogre-uml.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre-utest.el b/site/cedet-1.0pre7/cogre/cogre-utest.el
new file mode 100644
index 0000000..4c72a22
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre-utest.el
@@ -0,0 +1,142 @@
+;;; cogre-utest.el --- Tests for COGRE
+
+;; Copyright (C) 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cogre-utest.el,v 1.10 2009/04/11 06:54:19 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Unit tests for COGRE.
+;;
+;; These are effectively no-crash and UI tests.  I have not output tests.
+
+(require 'cedet-utests)
+(eval-when-compile
+  (require 'picture-hack))
+(require 'cogre)
+(require 'cogre-mode)
+
+;;; Code:
+
+;;;###autoload
+(defun cogre-utest ()
+  "Unit test Various aspects of COGRE."
+  (interactive)
+
+  ;(cedet-utest-log-start "cogre: graph UI tests")
+  (cedet-utest-log-setup "COGRE")
+
+  ;; MAKE A GRAPH
+  (cogre "TEST GRAPH")
+  
+  (when (not (string= "*Graph TEST GRAPH*" (buffer-name)))
+    (error "Failed to create graph"))
+
+  (cedet-utest-log " * Create graph ... pass")
+
+  ;; MAKE SEVERAL NODES
+  (cogre-utest-make-node-at 2 2 'cogre-class "Obj 1")
+  (cogre-utest-make-node-at 12 12 'cogre-class "Obj 2")
+
+  (cogre-render-buffer cogre-graph)
+
+  (cedet-utest-log " * Create Nodes ... pass")
+  
+  ;; Create a link.
+  (cogre-utest-link-at 2 2 12 12 'cogre-aggregate)
+
+  (cogre-render-buffer cogre-graph)
+  
+  (cedet-utest-log " * Create links ... pass")
+
+  ;; Move Test
+  (picture-goto-coordinate 12 12)
+
+  (let ((six '(1 2 3 4 5 6)))
+    (dolist (I six)
+      (cogre-move-node-right 1)
+      (cogre-render-buffer cogre-graph)
+      (sit-for 0)
+      )
+    (dolist (I six)
+      (cogre-move-node-up 1)
+      (cogre-render-buffer cogre-graph)
+      (sit-for 0)
+      )
+    )
+
+  (cedet-utest-log " * Node Movement ... pass")
+
+  (cedet-utest-log-shutdown
+   "COGRE"
+   nil)
+  )
+
+(defun cogre-utest-make-node-at (x y type name)
+  "Create a node at X,Y with TYPE and NAME."
+  (picture-goto-coordinate x y)
+  (let ((cogre-default-node type))
+    (call-interactively 'cogre-new-node)
+    (cogre-render-buffer cogre-graph)
+    (cogre-set-element-name (cogre-node-at-point-interactive (point)) name)
+    )
+  )
+
+(defun cogre-utest-link-at (x1 y1 x2 y2 type)
+  "Create a link between nodes located at X1/Y1 and X2/Y2.
+Link is created with the specified TYPE."
+  (picture-goto-coordinate x1 y1)
+  (push-mark (point) t)
+  (let ((cogre-default-link type))
+    (picture-goto-coordinate x2 y2)
+    
+    (call-interactively 'cogre-new-link)
+    ))
+
+;;; Test graphs derived from source
+;;
+;;;###autoload
+(defun cogre-utest-quick-class ()
+  "Test the quick-class function."
+  (interactive)
+  (let* ((lib (locate-library "cogre"))
+	 (testfile
+	  (expand-file-name "tests/testclasses.hh"
+			    (file-name-directory lib))))
+    (save-excursion
+      (set-buffer (find-file-noselect testfile))
+      (semantic-fetch-tags)
+      (cogre-uml-quick-class "Subclass")
+      ;; Make sure we are in a graph.
+      (unless (cogre-base-graph-p cogre-graph)
+	(error "Test cogre-uml-quick-class did not createa graph"))
+      ;; Test the elements of the graph.
+      (let ((expectednodes '("Subclass"
+			     "MyBaseclass"
+			     "SpecificClass"
+			     "OtherClass"
+			     "AltClass")))
+	(dolist (C expectednodes)
+	  (unless (cogre-find-node-by-name C)
+	    (error "Could not find expected node %S" C)))
+	))))
+    
+
+(provide 'cogre-utest)
+;;; cogre-utest.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre.el b/site/cedet-1.0pre7/cogre/cogre.el
new file mode 100644
index 0000000..03eb67a
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre.el
@@ -0,0 +1,1119 @@
+;;; cogre.el --- COnnected GRaph Editor for Emacs
+
+;;; Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: graph, oop, extensions, outlines
+;; X-RCS: $Id: cogre.el,v 1.45 2009/05/30 13:40:42 zappo Exp $
+
+(defvar cogre-version "1.0pre7"
+  "Current version of Cogre.")
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Many types of code can be displayed as a series of connected
+;; graphs, such as UML class or sequence diagrams.  COGRE attempts to
+;; allow Emacs to display such graphs with data generated from
+;; source code.
+;;
+
+(require 'eieio)
+(require 'eieio-opt)
+(require 'eieio-base)
+(require 'cogre-load)
+(require 'semantic)
+(eval-when-compile
+  (require 'picture-hack))
+
+;;; Code:
+
+;;; Display Faces
+(defgroup cogre nil
+  "COnnected GRaph Editor."
+  :group 'tools)
+
+(defcustom cogre-horizontal-margins 10
+  "*Horizontal margins between nodes when they are being layed out."
+  :group 'cogre
+  :type 'number)
+
+(defcustom cogre-vertical-margins 7
+  "*Horizontal margins between nodes when they are being layed out."
+  :group 'cogre
+  :type 'number)
+
+;; Export Variables
+(defvar cogre-node-rebuild-method nil
+  "A method used when exporting a graph to some other format.")
+
+;; Compatibility
+(defun cogre-noninteractive ()
+  "Return non-nil if running non-interactively."
+  (if (featurep 'xemacs)
+      (noninteractive)
+    noninteractive))
+
+;;; PEER Classes
+;;
+;; Each cogre element, and the graph is an abstract representation of
+;; something.  The peer would then be an object that handles a
+;; concrete represenatation of something else.  
+;;
+;; For example, a `note' node might be linked to a comment in some
+;; code.  Updating the node should update the file or updating the
+;; file should update the node.
+;;
+;; As the different types of nodes might be linked to different kinds
+;; of things, an abstract handler for peers is needed so COGRE can do
+;; many kinds of jobs.
+
+(defclass cogre-element-peer ()
+  (
+   )
+  "COGRE Elements, such as nodes an links all have a peer.
+While graph elements can have a nil peer, if there is one, it
+must be a subclass of this class.
+
+The peer provides services to the graph that allows that graph
+to be linked to other items in the system defined by the peers.
+Subclasses should define slots to store their data."
+  :abstract t)
+
+(defmethod cogre-peer-update-from-source ((peer cogre-element-peer) element)
+  "Update the PEER object, and ELEMENT from environment."
+  nil)
+
+(defmethod cogre-peer-update-from-element ((peer cogre-element-peer) element)
+  "Update the PEER object, from the ELEMENT data, changing the environment."
+  nil)
+
+(defmethod cogre-peer-source-file ((peer cogre-element-peer))
+  "Does this peer have a source file?"
+  nil)
+
+;;; GRAPH Classes
+;;
+;;;###autoload
+(defclass cogre-base-graph (eieio-persistent)
+  ((extension :initform ".cgr") ;; Override the default
+   (name :initarg :name
+	 :initform "NewGraph"
+	 :type string
+	 :custom string
+	 :documentation
+	 "The name of this graph.
+The save file name is based on this name.")
+   (buffer :initform nil
+	   :type (or null buffer)
+	   :documentation
+	   "When this graph is active, this is the buffer the graph is
+displayed in.")
+   (peer :initarg :peer
+	 :initform nil
+	 :type (or null cogre-element-peer)
+	 :documentation
+	 "The peer for this graph.")
+   (major-mode :initarg :major-mode
+	       :initform fundamental-mode
+	       :type symbol
+	       :custom (choice (const emacs-lisp-mode)
+			       (const c++-mode)
+			       (const c-mode)	
+			       (const java-mode)
+			       ;; Any other useful modes?
+			       (symbol)
+			       )
+	       :documentation
+	       "Mode used for any mode-specific function calls.
+Used when calling some mode-local functions.")
+   (detail :initarg :detail
+	   :initform 0
+	   :type number
+	   :custom (choice (const :tag "Max Detail"      0 )
+			   (const :tag "Less Detail"     1 )
+			   (const :tag "Not Much Detail" 2 )
+			   (const :tag "No Detail"       3 ))
+	   :documentation
+	   "A flag for items being rendered on how much detail to show.
+A 0 means to show everything.
+A 1 means to show a little bit less.
+A 2 means to show less than that.
+A 3 means just the package and name.")
+   (elements :initarg :elements
+	     :initform nil
+	     :type list
+	     :documentation
+	     "The list of elements in this graph.")
+   )
+  "A Connected Graph.
+a connected graph contains a series of nodes and links which are
+rendered in a buffer, or serialized to disk.")
+
+(defmethod initialize-instance ((G cogre-base-graph) fields)
+  "Initialize ELT's name before the main FIELDS are initialized."
+  (call-next-method)
+  (oset G buffer (current-buffer))
+  )
+
+;;;###autoload
+(defclass cogre-graph-element (eieio-named)
+  ((dirty :initform t
+	  :documentation
+	  "Non-nil if this graph element is dirty.
+Elements are made dirty when they are erased from the screen.
+Elements must be erased before any graphical fields are changed.")
+   (name-default :initform "Name"
+		 :type string
+		 :custom string
+		 :allocation :class
+		 :documentation
+     "The object-name of this node.
+Node object-names must be unique within the current graph so that save
+references in links can be restored.")
+   (peer :initarg :peer
+	 :initform nil
+	 :type (or null cogre-element-peer)
+	 :documentation
+	 "The peer for this graph.")
+   )
+  "A Graph Element.
+Graph elements are anything that is drawn into a `cogre-base-graph'.
+Graph elements have a method for marking themselves dirty."
+  :abstract t)
+
+;;;###autoload
+(defclass cogre-node (cogre-graph-element)
+  ((position :initarg :position
+	     :initform [ 0 0 ]
+	     :type vector
+	     :custom (vector integer integer)
+	     :documentation
+	     "The X,Y [COL ROW] position as a vector for this node.
+The Width/Height if this node is determined by RECTANGLE, which is
+a list of strings representing the body of the node."
+	     )
+   (blank-lines-top :allocation :class
+		    :initform 1
+		    :documentation
+		    "Number of blank lines above the object-name.")
+   (blank-lines-bottom :allocation :class
+		       :initform 1
+		       :documentation
+		       "Number of blank lines below the last line of text.")
+   (alignment :initform nil
+	      :type symbol
+	      :allocation :class
+	      :documentation
+	      "Alignment of text when displayed in the box.")
+   (rectangle :initform nil
+	      :type list
+	      :documentation
+	      "A List of strings representing an Emacs rectangle.
+This rectangle is used for inserting and moving the block of
+characters that represent this node in a buffer.
+The rectangle is NOT SAVED.
+Other fields in the node are used to build a new RECTANGLE of strings
+at load time.")
+   )
+  "Connected Graph node.
+Nodes are regions with a fill color, and some amount of text representing
+a status, or values."
+  )
+
+;;;###autoload
+(defclass cogre-link (cogre-graph-element)
+  ((start :initarg :start
+	  :initform nil
+	  :type (or null string cogre-node)
+	  :documentation "The starting node.
+As a string, the object-name of the node we start on.
+As an object, the node we start on.")
+   (end :initarg :end
+	:initform nil
+	:type (or null string cogre-node)
+	:documentation "The ending node.
+As a string, the object-name of the node we end on.
+As an object, the node we end on.")
+   (start-glyph :initform [ nil nil nil nil ]
+		:allocation :class
+		:type vector
+		:documentation "The starting glyph.
+A Glyph can be NULL, meaning nothing, or a vector.
+A Vector must be 4 elements long.  This represents glyphs on
+the [ TOP BOTTOM LEFT RIGHT ] of the attached node.
+Each element of the vector must be a list representing a rectangle.")
+   (end-glyph :initform [ nil nil nil nil ]
+	      :allocation :class
+	      :type vector
+	      :documentation "The ending glyph.
+See slot `start-glyph'")
+   (horizontal-preference-ratio
+    :initform .5
+    :allocation :class
+    :documentation
+    "When choosing a link's direction, a weight applied to horizontal.
+Since characters are not square, this ratio attempts to handle the visible
+space the link spans, not the number of characters in the coordinate
+system being used.
+Also, some links may want to be vertical or horizontal as often as
+possible, thus values of 0 or 10 are also fine to advance a
+preference."  )
+   (stop-position :initform nil
+		  :documentation
+		  "After drawing this link, store a place for a tab stop.")
+   (layout-direction
+    :initform 'any
+    :documentation
+    "When using the layout engine, the preferred direction this link points.
+This can have a value of 'up, 'down, 'left, 'right, 'horizontal,
+'vertical, or 'any.")
+   )
+  "Connected Graph link.
+Links are lines drawn between two nodes, or possibly loose in space
+as an intermediate step.  Some links have text describing what they
+do, and most links have special markers on one end or another, such as
+arrows or circles.")
+
+;;; Links
+;;
+;;;###autoload
+(defclass cogre-arrow (cogre-link)
+  ((end-glyph :initform [ (" ^ " "/|\\")
+			  ("\\|/" " V ")
+			  ("<")
+			  (">") ])
+   )
+  "This type of link is a simple arrow.")
+
+;;; Connecte Graph variables
+;;
+(defvar cogre-loading-from-file nil
+  "Flag indicating that we are loading a graph from a file.")
+
+(defcustom cogre-mode-hooks nil
+  "Hooks run in `cogre-mode'."
+  :group 'cogre
+  :type 'hook)
+
+(defvar cogre-graph nil
+  "The current connected graph.")
+(make-variable-buffer-local 'cogre-graph)
+
+;;; Buffer initialization
+;;
+;;;###autoload
+(defun cogre (name &optional graph-class)
+  "Create a new graph not associated with a buffer.
+The new graph will be given NAME.  See `cogre-mode' for details.
+Optional argument GRAPH-CLASS indicates the type of graph to create."
+  (interactive "sGraph Name: ")
+  (switch-to-buffer (get-buffer-create (concat "*Graph " name "*")))
+  (let ((newgraph (if graph-class
+		      (funcall graph-class name :name name)
+		    (cogre-base-graph name :name name))))
+    (setq cogre-graph newgraph)
+    ;;(toggle-read-only 1)
+    (require 'cogre-mode)
+    (cogre-mode)
+    ))
+
+;;; Default management
+;;
+;; Defaults provide a way of quickly creating a bunch of the same type
+;; of node/link, or whatever.  By using these functions in `interactive'
+;; commands, a set of defaults can be specified which are used
+;; continuously.
+(defun cogre-last-event-element-type (class)
+  "Return a symbol representing the last event or command.
+Return nil if that event is not related to some cogre element
+that is a subclass of CLASS."
+  (let* ((event last-command-event)
+	 (ksym (if (symbolp event)
+		   (downcase (symbol-name event))
+		 "unknown"))
+	 (name (concat "cogre-" ksym))
+	 (sym (intern-soft name)))
+    (if (and sym (child-of-class-p sym class))
+	;; The input key defines the type of node to use this time.
+	sym
+      ;; No match
+      nil)))
+
+(defvar cogre-node-history nil
+  "The history for reading in node class names.")
+
+(defvar cogre-default-node nil
+  "The last node type queried.
+Used as the default node type when a user wants a node, and no request
+to change it has been made.")
+
+(defun cogre-default-node (&optional node prefix)
+  "Return the default node type.
+If run interactively, query for a new node to make the default.
+If called non-interactivly there is no default, query for one.
+If NODE is supplied, use that.
+If there is a PREFIX argument, then force a query for one."
+  (interactive (list
+		
+		;; Check the last key.  Fake keys from toolbar/menu-bar can
+		;; force our hand for some node types.
+		(or (cogre-last-event-element-type cogre-node)
+		    ;; ELSE, read it in.
+		    (eieio-read-subclass "Node Type: "
+					 cogre-node
+					 'cogre-node-history
+					 t))
+		;; The prefix
+		current-prefix-arg))
+
+  (when (and (not (interactive-p)) (not node) (symbolp last-command-event))
+    ;; Check the last key.  Fake keys from toolbar/menu-bar can
+    ;; force our hand for some node types.
+    (let ((sym (cogre-last-event-element-type cogre-node)))
+      ;; The input key defines the type of node to use this time.
+      (when sym (setq node sym))))
+
+  ;; Save whatever is being set.
+  (if node (setq cogre-default-node node))
+  ;; If we are not interactive, then check the prefix.
+  (if (or prefix (not cogre-default-node))
+      (setq cogre-default-node (eieio-read-subclass "Node Type: "
+						    cogre-node
+						    'cogre-node-history
+						    t)))
+  ;; Return the cached node.
+  cogre-default-node
+  )
+
+(defvar cogre-link-history nil
+  "The history for reading in link class names.")
+
+(defvar cogre-default-link nil
+  "The last link type queried.
+Used as the default link type when a user wants a link, and no request
+to change it has been made.")
+
+(defun cogre-default-link (&optional link prefix)
+  "Return the default link type.
+If run interactively, query for a new link to make the default.
+If called non-interactivly there is no default, query for one.
+If LINK is supplied, use that.
+If there is a PREFIX argument, then force a query for one."
+  (interactive (list
+		;; Check the last key.  Fake keys from toolbar/menu-bar can
+		;; force our hand for some link types.
+		(or (cogre-last-event-element-type cogre-link)
+		    ;; Else, read it in.
+		    (eieio-read-subclass "Link Type: "
+					 cogre-link
+					 'cogre-link-history
+					 t))
+		current-prefix-arg))
+
+  (when (and (not (interactive-p)) (not link) (symbolp last-command-event))
+    ;; Check the last key.  Fake keys from toolbar/menu-bar can
+    ;; force our hand for some link types.
+    (let ((sym (cogre-last-event-element-type cogre-link)))
+      (when sym (setq link sym))))
+
+  ;; Save whatever is being set.
+  (if link (setq cogre-default-link link))
+  ;; If we are not interactive, then check the prefix.
+  (if (or prefix (not cogre-default-link))
+      (setq cogre-default-link (eieio-read-subclass "Link Type: "
+				      cogre-link
+				      'cogre-link-history
+				      t)))
+  ;; Return the cached link.
+  cogre-default-link
+  )
+
+;;; Commands for Graph Mode
+;;
+(defun cogre-refresh ()
+  "Refresh the current display completely."
+  (interactive)
+  (cogre-render-buffer cogre-graph t))
+
+;;; Utilities
+;;
+(defun cogre-map-elements (function &optional graph)
+  "Map FUNCTION onto all GRAPH elements.
+If GRAPH is not supplied, use the current graph."
+  (cogre-map-graph-elements (or graph cogre-graph) function))
+
+(defun cogre-map-graph-elements (graph function)
+  "For elements of GRAPH, call FUNCTION.
+Function must take one argument, which is the element.
+This function can also be a method.
+Returns a list of return values from each call of function."
+  (mapcar function (oref graph elements)))
+
+;;; Peer handling
+;;
+(defun cogre-update-graph-from-peers (graph)
+  "Update GRAPH, and all elements from any source peers."
+  ;; First, update the graph...
+  (let ((peer (oref graph peer)))
+    (when peer (cogre-peer-update-from-source peer graph)))
+  ;; Now update all the elements.
+  (cogre-map-graph-elements
+   graph (lambda (E)
+	   (let ((peer (oref E peer)))
+	     (when peer (cogre-peer-update-from-source peer E)))))
+  )
+
+;;; State Management
+;;
+(defvar cogre-custom-originating-graph-buffer nil
+  "The graph from which a custom buffer originated.")
+(make-variable-buffer-local 'cogre-custom-originating-graph-buffer)
+
+(defmethod cogre-activate ((element cogre-graph-element))
+  "Activate ELEMENT.
+This could be as simple as displaying the current state,
+customizing the object, or performing some complex task."
+  (let ((b (current-buffer)))
+    (require 'eieio-custom)
+    (customize-object element)
+    (setq cogre-custom-originating-graph-buffer b))
+  )
+
+(defmethod eieio-done-customizing ((element cogre-graph-element))
+  "Finish customizing a graph element."
+  (cogre-set-dirty element t)
+  (save-excursion
+    (set-buffer cogre-custom-originating-graph-buffer)
+    (cogre-render-buffer cogre-graph t))
+  )
+
+(defmethod eieio-done-customizing ((g cogre-base-graph))
+  "Finish customizing a graph element."
+  (save-excursion
+    (set-buffer cogre-custom-originating-graph-buffer)
+    (cogre-render-buffer g t))
+  )
+
+(defmethod cogre-augment-element-menu ((node cogre-graph-element) menu)
+  "For NODE, augment the current element MENU.
+Return the modified element."
+  nil)
+
+(defmethod cogre-augment-element-menu ((node cogre-node) menu)
+  "For NODE, augment the current element MENU.
+Return the modified element." nil)
+
+(defmethod cogre-add-element ((graph cogre-base-graph) elt)
+  "Add to GRAPH a new element ELT."
+  (object-add-to-list graph 'elements elt t))
+
+(defmethod cogre-delete-element ((graph cogre-base-graph) elt)
+  "Delete from GRAPH the element ELT."
+  (object-remove-from-list graph 'elements elt))
+
+(defun cogre-find-node-by-name (name &optional graph)
+  "Find a cogre node by NAME in GRAPH.
+If GRAPH is nil, use the current graph."
+  (object-assoc name :object-name (oref (or graph cogre-graph) elements)))
+
+(defmethod cogre-unique-name ((graph cogre-base-graph) name)
+  "Within GRAPH, make NAME unique."
+  (let ((newname name)
+	(obj (cogre-find-node-by-name name graph))
+	(inc 1))
+    (while obj
+      (setq newname (concat name (int-to-string inc)))
+      (setq inc (1+ inc))
+      (setq obj (cogre-find-node-by-name newname graph)))
+    newname))
+
+(defmethod cogre-set-dirty ((element cogre-graph-element) dirty-state)
+  "Set the dirty state for ELEMENT to DIRTY-STATE."
+  (oset element dirty dirty-state))
+
+(defmethod cogre-set-dirty ((node cogre-node) dirty-state)
+  "Set the dirty state for NODE to DIRTY-STATE."
+  (if dirty-state (oset node rectangle nil))
+  (call-next-method))
+
+(defmethod initialize-instance ((elt cogre-graph-element) fields)
+  "Initialize ELT's name before the main FIELDS are initialized."
+  (unless cogre-loading-from-file
+    (let ((n (oref elt name-default)))
+      (object-set-name-string elt n)))
+  (call-next-method))
+
+(defmethod initialize-instance :AFTER ((elt cogre-graph-element) fields)
+  "When creating a new element, add it to the current graph.
+Argument ELT is the element being created.
+Argument FIELDS are ignored."
+  (unless cogre-loading-from-file
+    (let ((n (oref elt object-name)))
+      ;; make sure our name is unique.
+      (oset elt object-name (cogre-unique-name cogre-graph n)))
+    (cogre-add-element cogre-graph elt)))
+
+;;; Buffer Rendering
+;;
+(defmethod cogre-render-buffer ((graph cogre-base-graph) &optional erase)
+  "Render the current graph GRAPH.
+If optional argument ERASE is non-nil, then erase the buffer,
+and render everything.  If ERASE is nil, then only redraw items
+with dirty flags set."
+  (let ((inhibit-read-only t)
+	(inhibit-modification-hooks t)
+	(inhibit-point-motion-hooks t)
+	(x (current-column))
+	(y (1- (picture-current-line)))
+	(oldmod (buffer-modified-p (current-buffer)))
+	)
+    (save-excursion
+      (if erase
+	  (progn
+	    (erase-buffer)
+	    (cogre-map-elements (lambda (e) (cogre-set-dirty e t)) graph)))
+      (cogre-map-elements 'cogre-render graph))
+    (unless oldmod (set-buffer-modified-p nil))
+    (picture-goto-coordinate x y)))
+
+(defmethod cogre-render ((element cogre-graph-element))
+  "Render ELEMENT.
+By default, an ELEMENT has nothing to see, but assume we
+are called from `call-next-method', so reset our dirty flag."
+  (cogre-set-dirty element nil))
+
+(defmethod cogre-erase ((element cogre-graph-element))
+  "Erase ELEMENT.
+By default, an ELEMENT has nothing to erase, but assume we
+are called from `call-next-method', so set our dirty flag."
+  (cogre-set-dirty element t))
+
+(defmethod cogre-element-pre-serialize ((elt cogre-graph-element))
+  "Prepare the current node to be serialized.
+Remove all pointers to objects (such as links), and replace
+with something reversable."
+  )
+
+(defmethod cogre-element-post-serialize ((elt cogre-graph-element))
+  "Restore object pointers after being loaded from disk.
+Also called after a graph was saved to restore all objects.
+Reverses `cogre-graph-pre-serialize'."
+  )
+
+(defmethod cogre-entered ((element cogre-graph-element) start end)
+  "Method called when the cursor enters ELEMENT.
+START and END cover the region with the property."
+  nil)
+
+(defmethod cogre-left ((element cogre-graph-element) start end)
+  "Method called when the cursor exits ELEMENT.
+START and END cover the region with the property."
+  nil)
+
+;;; Nodes
+(defmethod cogre-erase ((node cogre-node))
+  "Erase NODE from the screen."
+  (let ((position (oref node position))
+	(rectangle (cogre-node-rectangle node))
+	(links (cogre-node-links node)))
+    (cogre-erase-rectangle (aref position 0) (aref position 1)
+			   (length (car rectangle))
+			   (length rectangle))
+    (mapc 'cogre-erase links))
+  (call-next-method))
+
+(defmethod cogre-node-links ((node cogre-node))
+  "Return a list of links which reference NODE."
+  (with-slots (elements) cogre-graph
+    (let ((links nil))
+      (mapc (lambda (n) (if (and (obj-of-class-p n cogre-link)
+				 (or (eq (oref n start) node)
+				     (eq (oref n end) node)))
+			    (setq links (cons n links))))
+	    elements)
+      links)))
+
+(defmethod cogre-node-rectangle  ((node cogre-node))
+  "Fetch the rectangle representation for NODE."
+  (or (oref node rectangle)
+      (cogre-node-rebuild node)))
+
+(defmethod cogre-render ((node cogre-node))
+  "Render NODE in the current graph."
+  (cogre-node-rectangle node)
+  (with-slots (position rectangle) node
+    (picture-goto-coordinate (aref position 0) (aref position 1))
+    (cogre-picture-insert-rectangle rectangle)
+    )
+  (call-next-method))
+
+(defmethod cogre-node-rebuild ((node cogre-node))
+  "Create a new value for `:rectangle' in NODE.
+The `:rectangle' slot is inserted with rectangle commands.
+A Rectangle is basically a list of equal length strings.
+Those strings must have the proper face values on them.
+Always make the width 2 greater than the widest string.
+
+This function calls `cogre-node-rebuild-default', unless the
+current output device has been changed with by
+setting``cogre-node-rebuild-method'."
+  (if cogre-node-rebuild-method
+      (funcall cogre-node-rebuild-method node)
+    (cogre-node-rebuild-default node)))
+
+(defmethod cogre-node-rebuild-default ((node cogre-node))
+  "Create a new value for `:rectangle' in NODE.
+The `:rectangle' slot is inserted with rectangle commands.
+A Rectangle is basically a list of equal length strings.
+Those strings must have the proper face values on them.
+Always make the width 2 greater than the widest string."
+  (let* ((width (+ (cogre-node-widest-string node) 2))
+	 (top-lines (oref node blank-lines-top))
+	 (bottom-lines (oref node blank-lines-bottom))
+	 (title (cogre-node-title node))
+	 (slots (cogre-node-slots node))
+	 (align (oref node alignment))
+	 (first t)
+	 (rect nil))
+    (while (> top-lines 0)
+      (setq rect (cons (cogre-string-with-face
+			""
+			(if first
+			    (progn (setq first nil)
+				   'cogre-box-first-face)
+			  'cogre-box-face)
+			node width align)
+		       rect)
+	    top-lines (1- top-lines)))
+    (while title
+      (let ((face (cond ((and first (null (cdr title)))
+			 (setq first nil)
+			 '(cogre-box-first-face cogre-box-last-face))
+			(first
+			 (setq first nil)
+			 'cogre-box-first-face)
+			((and (null (cdr title))
+			      (not (and (null slots)
+					(/= bottom-lines 0))))
+			 'cogre-box-last-face)
+			(t 'cogre-box-face))))
+	(setq rect (cons (cogre-string-with-face
+			  (car title) face
+			  node width align)
+			 rect)
+	      title (cdr title))))
+    (while slots
+      (let ((sl (car slots)))
+	;; If a subnode has nil here, make sure we put in a blank
+	;; line placeholder.
+	(if (not sl) (setq sl (list "")))
+	(while sl
+	  (let ((face (cond ((and (= bottom-lines 0)
+				  (null (cdr sl)))
+			     'cogre-box-last-face)
+			    (t 'cogre-box-face))))
+	    (setq rect (cons (cogre-string-with-face
+			      (car sl) face
+			      node width align)
+			     rect)
+		  sl (cdr sl)))))
+      (setq slots (cdr slots)))
+    (while (> bottom-lines 0)
+      (setq rect (cons (cogre-string-with-face
+			""
+			(if (= bottom-lines 1)
+			    'cogre-box-last-face
+			  'cogre-box-face)
+			node width align)
+		       rect)
+	    bottom-lines (1- bottom-lines)))
+    (oset node rectangle (nreverse rect))))
+
+(defmethod cogre-move-delta ((node cogre-node) dx dy)
+  "Move NODE's position by DX, DY."
+  (let ((p (oref node position)))
+    (cogre-move node (+ (aref p 0) dx) (+ (aref p 1) dy))))
+
+(defmethod cogre-move ((node cogre-node) x y)
+  "Move NODE to position X, Y."
+  (if (> 0 x) (setq x 0))
+  (if (> 0 y) (setq y 0))
+  (oset node position (vector x y))
+  )
+
+(defmethod cogre-node-title ((node cogre-node))
+  "Return a list of strings representing the title of the NODE.
+For example: ( \"Title\" ) or ( \"<Type>\" \"Title\" )"
+  (list (oref node object-name)))
+
+(defmethod cogre-node-slots ((node cogre-node))
+  "For NODE, return a list of slot lists.
+Slots are individual lines of text appearing in the body of a node.
+Each list will be prefixed with a line before it."
+  nil)
+
+(defmethod cogre-node-widest-string ((node cogre-node))
+  "Return the widest string in NODE."
+  (let ((names (cogre-node-title node))
+	(slots (cogre-node-slots node))
+	(str nil)
+	(ws 0))
+    (while names
+      (setq str (car names))
+      (when (> (length str) ws)
+	(setq ws (length str)))
+      (setq names (cdr names)))
+    (while slots
+      (setq str (car slots))
+      (while str
+	(if (> (length (car str)) ws)
+	    (setq ws (length (car str))))
+	(setq str (cdr str)))
+      (setq slots (cdr slots)))
+    ws))
+    
+
+(defun cogre-node-horizontal-distance (node1 node2)
+  "Calculate the horizontal distance between NODE1 and NODE2.
+This number is positive or negative, depending on the direction
+of distance."
+  ;; Make sure their rectangle's are up to date.
+  (cogre-node-rebuild node1)
+  (cogre-node-rebuild node2)
+  ;; Get all the details
+  (let* ((p1 (oref node1 position))	;position vector
+	 (p2 (oref node2 position))
+	 (x1 (aref p1 0))		;X,Y for NODE1
+	 (x2 (aref p2 0))		;X,Y for NODE2
+	 )
+    (if (< x1 x2)
+	;; positive distance.
+	(- x2 x1 (length (car (cogre-node-rectangle node1))))
+      (- x1 x2 (length (car (cogre-node-rectangle node2))))
+      )))
+
+(defun cogre-node-vertical-distance (node1 node2)
+  "Calculate the vertical distance between NODE1 and NODE2.
+This number is positive or negative, depending on the direction
+of distance."
+  ;; Make sure their rectangle's are up to date.
+  (cogre-node-rebuild node1)
+  (cogre-node-rebuild node2)
+  ;; Get all the details
+  (let* ((p1 (oref node1 position))	;position vector
+	 (p2 (oref node2 position))
+	 (y1 (aref p1 1))		;X,Y for NODE1
+	 (y2 (aref p2 1))		;X,Y for NODE2
+	 )
+    (if (< y1 y2)
+	;; positive distance.
+	(- y2 y1 (length (cogre-node-rectangle node1)))
+      (- y1 y2 (length (cogre-node-rectangle node2)))
+      )))
+
+(defun cogre-choose-horizontal-link-anchors (node1 node2)
+  "Choose horizontal link anchor points between NODE1 and NODE2.
+The data returned is (X1 Y1 X2 Y2)."
+  (let* ((p1 (oref node1 position))	;position vector
+	 (p2 (oref node2 position))
+	 (x1 (aref p1 0))		;X,Y for START
+	 (y1 (aref p1 1))
+	 (x2 (aref p2 0))		;X,Y for END
+	 (y2 (aref p2 1))
+	 (r1 (cogre-node-rectangle node1)) ;rectangle text
+	 (r2 (cogre-node-rectangle node2))
+	 (h1 (length r1))		;Height
+	 (h2 (length r2))
+	 (w1 (length (car r1)))		;Width
+	 (w2 (length (car r2)))
+	 )
+    (if (< x1 x2)
+	(list (+ x1 w1) (+ y1 (/ h1 2)) (1- x2) (+ y2 (/ h2 2)))
+      (list (1- x1) (+ y1 (/ h1 2)) (+ x2  w2) (+ y2 (/ h2 2))))
+    ))
+
+(defun cogre-choose-vertical-link-anchors (node1 node2)
+  "Choose vertical link anchor points between NODE1 and NODE2.
+The data returned is (X1 Y1 X2 Y2)."
+  (let* ((p1 (oref node1 position))	;position vector
+	 (p2 (oref node2 position))
+	 (x1 (aref p1 0))		;X,Y for START
+	 (y1 (aref p1 1))
+	 (x2 (aref p2 0))		;X,Y for END
+	 (y2 (aref p2 1))
+	 (r1 (cogre-node-rectangle node1)) ;rectangle text
+	 (r2 (cogre-node-rectangle node2))
+	 (h1 (length r1))		;Height
+	 (h2 (length r2))
+	 (w1 (length (car r1)))		;Width
+	 (w2 (length (car r2)))
+	 )
+    (if (< y1 y2)
+	(list (+ x1 (/ w1 2)) (+ y1 h1) (+ x2 (/ w2 2)) (1- y2))
+      (list (+ x1 (/ w1 2)) (1- y1) (+ x2  (/ w2 2)) (+ y2 h2)))
+      ))
+
+;;; Links
+;;
+(defmethod cogre-element-pre-serialize ((link cogre-link))
+  "Prepare the current node to be serialized.
+Remove all pointers to objects (such as links), and replace
+with something reversable."
+  (call-next-method)
+  ;; Remove the node objects from ourselves, and remove ourselves
+  ;; from the nodes we point to.
+  (with-slots (start end) link
+    (setf start (oref start :object-name))
+    (setf end (oref end :object-name))
+    )
+  )
+
+(defmethod cogre-element-post-serialize ((link cogre-link))
+  "Restore object pointers in LINK after being loaded from disk.
+Also called after a graph was saved to restore all objects.
+Reverses `cogre-graph-pre-serialize'."
+  (call-next-method)
+  ;; Convert the textual names back to object references from the
+  ;; current graphs element list.
+  (with-slots (start end) link
+    (setf start
+	  (object-assoc start :object-name (oref cogre-graph elements)))
+    (setf end
+	  (object-assoc end :object-name (oref cogre-graph elements)))
+    )
+  )
+
+(defvar cogre-erase-mode nil
+  "Non nil means we are in erase mode while rendering this link.")
+
+(defmethod cogre-erase ((link cogre-link))
+  "Erase LINK from the screen."
+  (let ((picture-rectangle-ctl ? )
+	(picture-rectangle-ctr ? )
+	(picture-rectangle-cbl ? )
+	(picture-rectangle-cbr ? )
+	(picture-rectangle-v ? )
+	(picture-rectangle-h ? ))
+    ;; Links use picture line drawing teqnique to wander about.
+    ;; By setting the picture line characters to spaces, we can
+    ;; erase the line with the render command.
+    (let ((cogre-erase-mode t))
+      (cogre-render link))
+    (call-next-method)))
+
+(defmethod cogre-render ((link cogre-link))
+  "Render LINK in the current graph."
+  (with-slots (start end start-glyph end-glyph) link
+    (let* ((hd (cogre-node-horizontal-distance start end))
+	   (vd (cogre-node-vertical-distance start end))
+	   linkcoords
+	   dir
+	   )
+      ;; Calculate starting points in relation to our attached nodes.
+      (if (> (* hd (oref link horizontal-preference-ratio)) vd)
+	  ;; In this case, the X delta is larger than the Y delta,
+	  ;; so the line is going mostly left/right.
+	  (setq linkcoords (cogre-choose-horizontal-link-anchors start end)
+		dir 'horizontal)
+	(setq linkcoords (cogre-choose-vertical-link-anchors start end)
+	      dir 'vertical))
+      (oset link stop-position (list (car linkcoords) (car (cdr linkcoords))))
+      ;; Now draw a rectiliniar line
+      (apply 'picture-draw-rectilinear-line
+	     (append linkcoords (list dir 'face nil 'element link)))
+      ;; Handle start/end glyps.
+      (if (and (not start-glyph) (not end-glyph))
+	  ;; We need to do nothing if we have no glyphs.
+	  nil
+	(let* (startrect endrect x1 y1 x2 y2)
+	  ;; Calculate the modificates needed to the end points for
+	  ;; creating the textual glyph.
+	  (setq x1 (nth 0 linkcoords)
+		y1 (nth 1 linkcoords)
+		x2 (nth 2 linkcoords)
+		y2 (nth 3 linkcoords))
+	  (if (eq dir 'horizontal)
+	      (progn
+		(if (< x1 x2)
+		    (setq startrect (aref start-glyph 2)
+			  endrect (aref end-glyph 3)
+			  x2 (- x2 -1 (length (car endrect))))
+		  (setq startrect (aref start-glyph 3)
+			endrect (aref end-glyph 2)
+			x1 (- x1 -1 (length (car startrect)))))
+		(setq y1 (- y1 (/ (length startrect) 2))
+		      y2 (- y2 (/ (length endrect) 2))))
+	    (if (< y1 y2)
+		(setq startrect (aref start-glyph 0)
+		      endrect (aref end-glyph 1)
+		      y2 (- y2 -1 (length endrect)))
+	      (setq startrect (aref start-glyph 1)
+		    endrect (aref end-glyph 0)
+		    y1 (- y1 -1 (length startrect))))
+	    (setq x1 (- x1 (/ (length (car startrect)) 2))
+		  x2 (- x2 (/ (length (car endrect)) 2))))
+	  ;; Ok, splat the glyph
+	  (if cogre-erase-mode
+	      (progn
+		(when startrect
+		  (cogre-erase-rectangle x1 y1
+					 (length (car startrect))
+					 (1- (length startrect))))
+		(when endrect
+		  (cogre-erase-rectangle x2 y2
+					 (length (car endrect))
+					 (1- (length endrect))))
+		)
+	    (picture-goto-coordinate x1 y1)
+	    (cogre-picture-insert-rectangle startrect)
+	    (picture-goto-coordinate x2 y2)
+	    (cogre-picture-insert-rectangle endrect)
+	    )
+	  ))))
+  (call-next-method))
+
+;;; Files
+;;
+;; Save and restore graphs to disk
+
+(defmethod cogre-save ((graph cogre-base-graph))
+  "Save the current graph."
+  (cogre-map-elements 'cogre-element-pre-serialize graph)
+  (unwind-protect
+      (eieio-persistent-save graph)
+    (cogre-map-elements 'cogre-element-post-serialize graph))
+  t)
+
+(defmethod cogre-write-save-text ((graph cogre-base-graph))
+  "Write GRAPH to standard-output as save text."
+  (cogre-map-elements 'cogre-element-pre-serialize graph)
+  (unwind-protect
+      (object-write graph (oref cogre-graph file-header-line))
+    (cogre-map-elements 'cogre-element-post-serialize graph))
+  t)
+
+;;; Low Level Rendering and status
+;;
+(defun cogre-string-merge-faces (start end face string)
+  "Merge in new face with pre-existing faces on the string.
+START and END are positions to apply FACE in STRING."
+  (alter-text-property start end 'face
+		       (lambda (current-face)
+			 (let ((cf
+				(cond ((facep current-face)
+				       (list current-face))
+				      ((listp current-face)
+				       current-face)
+				      (t nil)))
+			       (nf
+				(cond ((facep face)
+				       (list face))
+				      ((listp face)
+				       face)
+				      (t nil))))
+			   (append cf nf)))
+		       string))
+
+(defun cogre-string-with-face (string face element &optional length align)
+  "Using text STRING, apply FACE to that text.
+The string in question belongs to the graph ELEMENT.
+If optional argument LENGTH is supplied, pad STRING on the left and
+right so that it is centered.  If optional argument ALIGN is non-nil,
+the align the string either 'left or 'right.
+Return the new string."
+  (if length
+      (let* ((preprops (copy-sequence (text-properties-at 0 string)))
+	     (ws (- length (length string)))
+	     (sws (cond ((not align)
+			 (make-string (/ ws 2) ? ))
+			((eq align 'right)
+			 (make-string (1- ws) ? ))
+			((eq align 'left)
+			 " ")
+			(t "")
+			))
+	     (ews (cond ((not align)
+			 (make-string (+ (/ ws 2) (% ws 2)) ? ))
+			((eq align 'left)
+			 (make-string (1- ws) ? ))
+			((eq align 'right)
+			 " ")
+			(t "")
+			))
+	     )
+	(let ((pm (plist-get preprops 'face)))
+	  (when pm
+	    ;; We don't want to modify the face on this based
+	    ;; on the first character.
+	    (setq preprops (delq 'face preprops))
+	    (setq preprops (delq pm preprops))))
+	(setq string (concat sws string ews))
+	(add-text-properties 0 (length string) preprops string)
+	))
+  ;; Add our faces on.  Preserve previously applied faces.
+  (when face
+    (cogre-string-merge-faces  0 (length string) face string)
+    )
+  ;; Add on other properties.
+  (add-text-properties 0 (length string)
+		       (list 'rear-nonsticky t
+			     'detachable t ;; xemacs
+			     'element element
+			     ;; 'local-map
+			     ;; 'modification-hooks
+			     'point-entered
+			     (lambda (s e)
+			       (let ((inhibit-point-motion-hooks t))
+				 (when (cogre-current-element)
+				   (cogre-entered (cogre-current-element) s e))))
+			     'point-left
+			     (lambda (s e)
+			       (let* ((inhibit-point-motion-hooks t)
+				      (el
+				       (save-excursion
+					 (goto-char s)
+					 (cogre-current-element))))
+				 (when el (cogre-left el s e)))))
+		       string)
+  string)
+
+(defun cogre-erase-rectangle (x y width height)
+  "Clear out the rectangle at X Y, with dimensions WIDTH HEIGHT."
+  (picture-goto-coordinate x y)
+  (clear-rectangle (point)
+		   (save-excursion
+		     (picture-goto-coordinate (+ x width)
+					      (+ y height))
+		     (point))
+		   t))
+
+(defun cogre-current-element (&optional point)
+  "Return the element under POINT."
+  (get-text-property (or point (point)) 'element))
+
+(defun cogre-current-line ()
+  "Get the current line."
+  (cond ((eq (point-min) (point))
+	 0)
+	(t (1- (count-lines (point-min) (point))))))
+
+(provide 'cogre)
+
+;;; cogre.el ends here
diff --git a/site/cedet-1.0pre7/cogre/cogre.info b/site/cedet-1.0pre7/cogre/cogre.info
new file mode 100644
index 0000000..eea78cd
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre.info
@@ -0,0 +1,263 @@
+This is cogre.info, produced by makeinfo version 4.9 from cogre.texi.
+
+START-INFO-DIR-ENTRY
+* cogre: (cogre).       Graphs & UML for Emacs
+END-INFO-DIR-ENTRY
+
+
+File: cogre.info,  Node: Top,  Next: Getting Started,  Up: (dir)
+
+COGRE: COnnected GRaph Editor
+*****************************
+
+COGRE is a package that enables Emacs to display connected graph
+diagrams in a text buffer.  The main goal is to provide UML class
+diagrams, but any kind of graph can be supported through object
+inheritance via EIEIO *Note (eieio)Top::.
+
+   Warning: Very little in this manual has been written.
+
+* Menu:
+
+* Getting Started::       Graphs, Nodes, and Links
+* Class Diagrams::        Creating Class diagrams
+* Export::                Exporting your graph to different formats.
+* Semantic Support::      Emacs can make diagrams for you
+* Index::
+
+
+File: cogre.info,  Node: Getting Started,  Next: Class Diagrams,  Prev: Top,  Up: Top
+
+1 Getting Started
+*****************
+
+There are three basic parts to any COGRE interface.
+
+  1. Graph The graph consists of a buffer, and all child elements in
+     that graph.  The graph is treated as any other Emacs buffer.  When
+     that buffer is selected, Graph editing commands are available.
+
+  2. Node A Node consists of a square region of screen space, and
+     usually a name.  Nodes can be anything, but common examples are
+     Classes, Packages, or other "object like" things.
+
+  3. Link A Link is a line that connects two nodes.  A link may not
+     exist without a node at both ends.  When a node is deleted, all
+     links connected to it in some way are also deleted.
+
+   The first step to using COGRE is to create a new graph.  Once you
+have a graph, you can create nodes and links.
+
+   You can create a new graph with the `cogre' command, or open a new
+file that ends with the `.cgr' extension.
+
+   Use normal keybindings such as `C-x C-s' to save your graph into a
+file.  Use a `.cgr' extension so Emacs can correctly parse the file
+into a graph again later.
+
+ -- Function: cogre name &optional graph-class
+     Create a new graph not associated with a buffer.  The new graph
+     will be given NAME.  See "cogre-mode" for details.  Optional
+     argument GRAPH-CLASS indicates the type of graph to create.
+
+* Menu:
+
+* Creating Nodes and Links ::   Create new nodes and links
+* Moving Nodes ::               Move nodes around
+* Customizing Nodes ::          Customize details about a node
+
+
+File: cogre.info,  Node: Creating Nodes and Links,  Next: Moving Nodes,  Up: Getting Started
+
+1.1 Creating Nodes and Links
+============================
+
+The easiest way to create a node is with the insert popup menu.  Right
+click anywhere in the graph where there is no pre-existing node or
+link, and a menu will appear allowing you to select the node style you
+want.
+
+   Nodes are created with the command `cogre-new-node', which is also
+bound to `N' in the graph.
+
+ -- Command: cogre-new-node point nodetype
+     Insert a new node at the current point.  Argument POINT is a
+     position to insert this node to.  NODETYPE is the eieio class name
+     for the node to insert.
+
+   The easiest way to create a link is with a `mouse-2' drag operation.
+Click the middle mouse button on a node, and drag the cursor to a
+second node.  A popup menu will appear where the link type can be
+selected.  The new link will be created connecting the two nodes.
+
+   New links can also be created with the command `cogre-new-link'
+which is bound to `L'.
+
+ -- Command: cogre-new-link mark point &optional linktype
+     Insert a new link from the node at MARK to POINT of LINKTYPE.
+     MARK is the node within which the current mark is set.  POINT is
+     the node the cursor is in.  LINKTYPE is the EIEIO class name for
+     the link to insert.
+
+   To configure the default type of node to insert via the keyboard,
+such as a UML class node, use `cogre-default-node'.  Likewise, use
+`cogre-default-link'.  These are bound to `C-c C-n', and `C-c C-l'
+respectively.
+
+ -- Command: cogre-default-node &optional node prefix
+     Return the default node type.  If run interactively, query for a
+     new node to make the default.  If called non-interactivly there is
+     no default, query for one.  If NODE is supplied, use that.  If
+     there is a PREFIX argument, then force a query for one.
+
+ -- Command: cogre-default-link &optional link prefix
+     Return the default link type.  If run interactively, query for a
+     new link to make the default.  If called non-interactivly there is
+     no default, query for one.  If LINK is supplied, use that.  If
+     there is a PREFIX argument, then force a query for one.
+
+
+File: cogre.info,  Node: Moving Nodes,  Next: Customizing Nodes,  Prev: Creating Nodes and Links,  Up: Getting Started
+
+1.2 Moving Nodes
+================
+
+Moving nodes around is also how to move links around.  As a node moves,
+the links will re-route.  Movement is done with the mouse, or with meta
+key bindings.
+
+   To use the mouse, click with the left mouse button (`mouse-1') and
+drag the node to a new location.
+
+`M-b'
+`meta left'
+     Move a node left one character
+
+`M-f'
+`meta right'
+     Move a node right one character
+
+`M-n'
+`meta down'
+     Move a node down one character
+
+`M-p'
+`meta up'
+     Move a node up one character
+
+`TAB'
+     Move point to the next node
+
+`M-TAB'
+     Move point to the previous node
+
+   Sometimes the movement via keyboard of nodes will cause other nodes
+to get their graphic to be partially erased.  Minimal steps are taken to
+refresh the graph to keep things fast in large drawings.  To fix the
+problem, use the `R' keybinding to redraw the entire graph from scratch.
+
+
+File: cogre.info,  Node: Customizing Nodes,  Prev: Moving Nodes,  Up: Getting Started
+
+1.3 Customizing Nodes
+=====================
+
+Nodes and links are EIEIO objects, and can be customized.  Press `RET'
+on a node or link to customize the slots of that object.
+
+
+File: cogre.info,  Node: Class Diagrams,  Next: Export,  Prev: Getting Started,  Up: Top
+
+2 Class Diagrams
+****************
+
+Add text here
+
+
+File: cogre.info,  Node: Export,  Next: Semantic Support,  Prev: Class Diagrams,  Up: Top
+
+3 Export
+********
+
+COGRE can export your graph into different formats.  The simplest
+format is into an all ASCII diagram:
+
+ -- Function: cogre-export-ascii
+     Export the current diagram into an ASCII buffer.
+
+   Other formats are supported through the configuration of Graphviz
+tools.  You will need to install and configure Graphviz to use these
+features.  The CEDET variables controlling how dot and neato are called
+are:
+
+ -- Function: cedet-graphviz-dot-command
+     Command name for the Graphviz DOT executable.
+
+ -- Function: cedet-graphviz-neato-command
+     Command name for the Graphviz NEATO executable.
+
+   Also, when converting to and from DOT formatted files, a scaling
+factor needs to be applied as the DOT coordinates (in points) are
+converted into character sized units for COGRE.
+
+ -- Function: cogre-dot-node-position-scale
+     The scale to use when converting between COGRE and DOT position
+     values.  This is of the format ( XSCALE . YSCALE ).  DOT uses
+     points, where as COGRE uses characters.
+
+   Here are some handy exporting commands.
+
+ -- Function: cogre-export-dot
+     Export the current COGRE graph to DOT notation.  DOT is a part of
+     GraphViz.
+
+ -- Function: cogre-export-dot-png
+     Export the current COGRE graph to DOT, then convert that to PNG.
+     The png file is then displayed in an Emacs buffer.  DOT is a part
+     of GraphVis.
+
+ -- Function: cogre-export-dot-postscript-print
+     Print the current graph.  This is done by exporting the current
+     COGRE graph to DOT, then convert that to Postscript before
+     printing.  DOT is a part of GraphVis.
+
+
+File: cogre.info,  Node: Semantic Support,  Next: Index,  Prev: Export,  Up: Top
+
+4 Semantic Support
+******************
+
+Add text here
+
+
+File: cogre.info,  Node: Index,  Prev: Semantic Support,  Up: Top
+
+5 Index
+*******
+
+
+
+Tag Table:
+Node: Top159
+Node: Getting Started832
+Ref: cogre2048
+Node: Creating Nodes and Links2431
+Ref: cogre-new-node2943
+Ref: cogre-new-link3531
+Ref: cogre-default-node4036
+Ref: cogre-default-link4362
+Node: Moving Nodes4634
+Node: Customizing Nodes5645
+Node: Class Diagrams5908
+Node: Export6050
+Ref: cogre-export-ascii6299
+Ref: cedet-graphviz-dot-command6611
+Ref: cedet-graphviz-neato-command6706
+Ref: cogre-dot-node-position-scale6987
+Ref: cogre-export-dot7244
+Ref: cogre-export-dot-png7366
+Ref: cogre-export-dot-postscript-print7574
+Node: Semantic Support7751
+Node: Index7889
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/cogre/cogre.texi b/site/cedet-1.0pre7/cogre/cogre.texi
new file mode 100644
index 0000000..94faeca
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/cogre.texi
@@ -0,0 +1,269 @@
+\input texinfo   @c -*-texinfo-*-
+@c
+@c $Id: cogre.texi,v 1.4 2009/04/06 02:02:12 zappo Exp $
+@c
+@setfilename cogre.info
+@set TITLE COGRE: COnnected GRaph Editor 
+@set AUTHOR Eric M. Ludlam
+@settitle @value{TITLE}
+
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* cogre: (cogre).       Graphs & UML for Emacs
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
+@titlepage
+@sp 10
+@center @titlefont{cogre}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2001, 2008, 2009 Eric M. Ludlam
+@end titlepage
+
+@macro COGRE{}
+@i{COGRE}
+@end macro
+
+@macro EIEIO{}
+@i{EIEIO}
+@end macro
+
+@node Top
+@top @value{TITLE}
+
+@COGRE{} is a package that enables Emacs to display connected graph
+diagrams in a text buffer.  The main goal is to provide UML class
+diagrams, but any kind of graph can be supported through object
+inheritance via @EIEIO{} @xref{(eieio)Top}.
+
+Warning: Very little in this manual has been written.
+
+@menu
+* Getting Started::       Graphs, Nodes, and Links
+* Class Diagrams::        Creating Class diagrams
+* Export::                Exporting your graph to different formats.
+* Semantic Support::      Emacs can make diagrams for you
+* Index::
+@end menu
+
+@node Getting Started
+@comment  node-name,  next,  previous,  up
+@chapter Getting Started
+
+There are three basic parts to any @COGRE{} interface.
+
+@enumerate
+@item Graph
+The graph consists of a buffer, and all child elements in that graph.
+The graph is treated as any other Emacs buffer.  When that buffer is
+selected, Graph editing commands are available.
+@item Node
+A Node consists of a square region of screen space, and usually a
+name.  Nodes can be anything, but common examples are Classes,
+Packages, or other ``object like'' things.
+@item Link
+A Link is a line that connects two nodes.  A link may not exist
+without a node at both ends.  When a node is deleted, all links
+connected to it in some way are also deleted.
+@end enumerate
+
+The first step to using @COGRE{} is to create a new graph.  Once you
+have a graph, you can create nodes and links.
+
+You can create a new graph with the @code{cogre} command, or open a
+new file that ends with the @file{.cgr} extension.
+
+Use normal keybindings such as @kbd{C-x C-s} to save your graph into a
+file.  Use a @file{.cgr} extension so Emacs can correctly parse the
+file into a graph again later.
+
+@defun cogre name &optional graph-class
+@anchor{cogre}
+Create a new graph not associated with a buffer.
+The new graph will be given @var{NAME}.  See @dfn{cogre-mode} for details.
+Optional argument @var{GRAPH-CLASS} indicates the type of graph to create.
+@end defun
+
+@menu
+* Creating Nodes and Links ::   Create new nodes and links
+* Moving Nodes ::               Move nodes around
+* Customizing Nodes ::          Customize details about a node
+@end menu
+
+@node Creating Nodes and Links
+@section Creating Nodes and Links
+
+The easiest way to create a node is with the insert popup menu.  Right
+click anywhere in the graph where there is no pre-existing node or
+link, and a menu will appear allowing you to select the node style you
+want.
+
+Nodes are created with the command @code{cogre-new-node}, which is
+also bound to @kbd{N} in the graph.
+
+@deffn Command cogre-new-node point nodetype
+@anchor{cogre-new-node}
+Insert a new node at the current point.
+Argument @var{point} is a position to insert this node to.
+@var{nodetype} is the eieio class name for the node to insert.
+@end deffn
+
+The easiest way to create a link is with a @kbd{mouse-2} drag
+operation.  Click the middle mouse button on a node, and drag the
+cursor to a second node.  A popup menu will appear where the link type
+can be selected.  The new link will be created connecting the two
+nodes.
+
+New links can also be created with the command @code{cogre-new-link}
+which is bound to @kbd{L}.
+
+@deffn Command cogre-new-link mark point &optional linktype
+@anchor{cogre-new-link}
+Insert a new link from the node at @var{mark} to @var{point} of @var{linktype}.
+@var{mark} is the node within which the current mark is set.
+@var{point} is the node the cursor is in.
+@var{linktype} is the @EIEIO{} class name for the link to insert.
+@end deffn
+
+To configure the default type of node to insert via the keyboard, such
+as a UML class node, use @code{cogre-default-node}.  Likewise, use
+@code{cogre-default-link}.  These are bound to @kbd{C-c C-n}, and
+@kbd{C-c C-l} respectively.
+
+@deffn Command cogre-default-node &optional node prefix
+@anchor{cogre-default-node}
+Return the default node type.
+If run interactively, query for a new node to make the default.
+If called non-interactivly there is no default, query for one.
+If @var{node} is supplied, use that.
+If there is a @var{prefix} argument, then force a query for one.
+@end deffn
+
+@deffn Command cogre-default-link &optional link prefix
+@anchor{cogre-default-link}
+Return the default link type.
+If run interactively, query for a new link to make the default.
+If called non-interactivly there is no default, query for one.
+If @var{link} is supplied, use that.
+If there is a @var{prefix} argument, then force a query for one.
+@end deffn
+
+@node Moving Nodes
+@section Moving Nodes
+
+Moving nodes around is also how to move links around.  As a node
+moves, the links will re-route.  Movement is done with the mouse, or
+with meta key bindings.
+
+To use the mouse, click with the left mouse button (@kbd{mouse-1}) and
+drag the node to a new location.
+
+@table @kbd
+@item M-b
+@itemx meta left
+Move a node left one character
+@item M-f
+@itemx meta right
+Move a node right one character
+@item M-n
+@itemx meta down
+Move a node down one character
+@item M-p
+@itemx meta up
+Move a node up one character
+@item TAB
+Move point to the next node
+@item M-TAB
+Move point to the previous node
+@end table
+
+Sometimes the movement via keyboard of nodes will cause other nodes to
+get their graphic to be partially erased.  Minimal steps are taken to
+refresh the graph to keep things fast in large drawings.  To fix the
+problem, use the @kbd{R} keybinding to redraw the entire graph from
+scratch.
+
+@node Customizing Nodes
+@section Customizing Nodes
+
+Nodes and links are @EIEIO{} objects, and can be customized.  Press
+@kbd{RET} on a node or link to customize the slots of that object.
+
+@node Class Diagrams
+@chapter Class Diagrams
+
+Add text here
+
+@node Export
+@chapter Export
+
+COGRE can export your graph into different formats.  The simplest
+format is into an all ASCII diagram:
+
+@defun cogre-export-ascii
+@anchor{cogre-export-ascii}
+Export the current diagram into an @var{ASCII} buffer.
+@end defun
+
+Other formats are supported through the configuration of Graphviz
+tools.  You will need to install and configure Graphviz to use these
+features.  The CEDET variables controlling how dot and neato are
+called are:
+
+@defun cedet-graphviz-dot-command
+@anchor{cedet-graphviz-dot-command}
+Command name for the Graphviz @var{DOT} executable.
+@end defun
+
+@defun cedet-graphviz-neato-command
+@anchor{cedet-graphviz-neato-command}
+Command name for the Graphviz @var{NEATO} executable.
+@end defun
+
+Also, when converting to and from DOT formatted files, a scaling
+factor needs to be applied as the DOT coordinates (in points) are
+converted into character sized units for COGRE.
+
+@defun cogre-dot-node-position-scale
+@anchor{cogre-dot-node-position-scale}
+The scale to use when converting between @var{COGRE} and @var{DOT} position values.
+This is of the format ( @var{XSCALE} . @var{YSCALE} ).
+@var{DOT} uses points, where as @var{COGRE} uses characters.
+@end defun
+
+Here are some handy exporting commands.
+
+@defun cogre-export-dot
+@anchor{cogre-export-dot}
+Export the current @var{COGRE} graph to @var{DOT} notation.
+@var{DOT} is a part of GraphViz.
+@end defun
+
+@defun cogre-export-dot-png
+@anchor{cogre-export-dot-png}
+Export the current @var{COGRE} graph to @var{DOT}, then convert that to @var{PNG}.
+The png file is then displayed in an Emacs buffer.
+@var{DOT} is a part of GraphVis.
+@end defun
+
+@defun cogre-export-dot-postscript-print
+@anchor{cogre-export-dot-postscript-print}
+Print the current graph.
+This is done by exporting the current @var{COGRE} graph to @var{DOT}, then
+convert that to Postscript before printing.
+@var{DOT} is a part of GraphVis.
+@end defun
+
+@node Semantic Support
+@chapter Semantic Support
+
+Add text here
+
+@node Index
+@chapter Index
+
+@contents
+
+@bye
diff --git a/site/cedet-1.0pre7/cogre/picture-hack.el b/site/cedet-1.0pre7/cogre/picture-hack.el
new file mode 100644
index 0000000..f014cfa
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/picture-hack.el
@@ -0,0 +1,335 @@
+;;; picture-hack.el --- Updates to picture mode
+
+;;; Copyright (C) 2001, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: picture
+;; X-RCS: $Id: picture-hack.el,v 1.14 2009/03/31 09:28:02 zappo Exp $
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Picture-hack is a series of modifications to functions in picture.el
+;; and rect.el.
+;; It also contains new functions which should live in picture.el
+;;
+;; These are hacks needed by COGRE.  Long term, I would like to see
+;; these features merged back into picture mode.
+
+(require 'picture)
+(require 'rect)
+
+;;; Code:
+
+;;; XEmacs is missing some stuff
+;;
+(unless (fboundp 'picture-current-line)
+  ;; copied from Emacs 20.6:
+  (defun picture-current-line ()
+    "Return the vertical position of point.  Top line is 1."
+    (+ (count-lines (point-min) (point))
+       (if (= (current-column) 0) 1 0))))
+
+(unless (fboundp 'picture-update-desired-column)
+  ;; copied from Emacs 20.6:
+  ;; If the value of picture-desired-column is far from the current
+  ;; column, or if the arg ADJUST-TO-CURRENT is non-nil, set it to the
+  ;; current column.   Return the current column.
+  (defun picture-update-desired-column (adjust-to-current)
+    (let ((current-column (current-column)))
+      (if (or adjust-to-current
+              (< picture-desired-column (1- current-column))
+              (> picture-desired-column (1+ current-column)))
+          (setq picture-desired-column current-column))
+      current-column)))
+
+(unless (fboundp 'char-width)
+  (defun char-width (CH)
+    "XEmacs doesn't have this, always return 1."
+    1))
+
+(unless (boundp 'picture-rectangle-v)
+  (defcustom picture-rectangle-v   ?|
+    "*Character `picture-draw-rectangle' uses for vertical lines."
+    :type 'character
+    :group 'picture))
+
+(unless (boundp 'picture-rectangle-h)
+  (defcustom picture-rectangle-h   ?-
+    "*Character `picture-draw-rectangle' uses for horizontal lines."
+    :type 'character
+    :group 'picture))
+
+(unless (boundp 'picture-rectangle-ctl)
+  (defcustom picture-rectangle-ctl   ?+
+    "*Character `picture-draw-rectangle' uses for top left corners."
+    :type 'character
+    :group 'picture))
+
+(unless (boundp 'picture-rectangle-ctr)
+  (defcustom picture-rectangle-ctr ?+
+    "*Character `picture-draw-rectangle' uses for top right corners."
+    :type 'character
+    :group 'picture)
+  )
+
+(unless (boundp 'picture-rectangle-cbr)
+  (defcustom picture-rectangle-cbr ?+
+    "*Character `picture-draw-rectangle' uses for bottom right corners."
+    :type 'character
+    :group 'picture)
+  )
+
+(unless (boundp 'picture-rectangle-cbl)
+  (defcustom picture-rectangle-cbl ?+
+    "*Character `picture-draw-rectangle' uses for bottom left corners."
+    :type 'character
+    :group 'picture)
+  )
+
+;;;###autoload
+(defun cogre-picture-insert-rectangle (rectangle)
+  "Overlay RECTANGLE with upper left corner at point.
+Leaves the region surrounding the rectangle."
+  (let ((indent-tabs-mode nil))
+
+    ;; The below is pulled from 'insert-rectangle, and removes the
+    ;; setting of the mark.
+    (let ((lines rectangle)
+	  (insertcolumn (current-column))
+	  (first t))
+      (while lines
+	(or first
+	    (progn
+	      (forward-line 1)
+	      (or (bolp) (insert ?\n))
+	      (move-to-column insertcolumn t)))
+	(setq first nil)
+
+	;; Clear the old text.
+	(if (> (- (point-at-eol) (point)) (length (car lines)))
+	    (delete-char (length (car lines)))
+	  (delete-char (- (point-at-eol) (point))))
+
+	(insert (car lines))
+	(setq lines (cdr lines)))) ))
+
+;;; Changes to exsiting functions
+;;
+(if (condition-case nil
+	(and (clear-rectangle 0 0 t)
+	     nil)
+      (error t))
+
+    ;; In emacs 20, FILL is not an argument to clear rectangle as it is
+    ;; in emacs 21.  Add it here.  Fortunatly, `operate-on-rectangle' does
+    ;; take a fill argument.
+    (defun clear-rectangle (start end &optional fill)
+      "Blank out rectangle with corners at point and mark.
+The text previously in the region is overwritten by the blanks.
+When called from a program, requires two args which specify the corners."
+      (interactive "r")
+      (operate-on-rectangle 'clear-rectangle-line start end t))
+)
+
+;; This is a modified version which takes text properties
+(defun picture-insert (ch arg &rest textproperties)
+  "Insert character CH, and move in the current picture motion direction.
+Repeat ARG times.
+Apply TEXTPROPERTIES to the character inserted."
+  (let* ((width (char-width ch))
+	 ;; We must be sure that the succeeding insertion won't delete
+	 ;; the just inserted character.
+	 (picture-horizontal-step
+	  (if (and (= picture-vertical-step 0)
+		   (> width 1)
+		   (< (abs picture-horizontal-step) 2))
+	      (* picture-horizontal-step 2)
+	    picture-horizontal-step)))
+    (while (> arg 0)
+      (setq arg (1- arg))
+      ;; The following is in Emacs 21, but it hoses over earlier Emacsen
+      ;; which do not have `picture-desired-column'
+      ;;
+      ;; (if (/= picture-desired-column (current-column))
+      ;; (move-to-column picture-desired-column t))
+      (let ((col (+ (current-column) width)))
+	(or (eolp)
+	    (let ((pos (point)))
+	      (move-to-column col t)
+	      (delete-region pos (point)))))
+      (insert ch)
+      (forward-char -1)
+      (if textproperties
+	  (add-text-properties (point) (1+ (point))
+			       (append
+				;; These two are special defaults
+				;; useful for pictures.
+				'(rear-nonsticky t detachable t)
+				textproperties))
+	)
+      (picture-move))))
+
+(defun picture-mouse-set-point (event)
+  "Move point to the position clicked on, making whitespace if necessary.
+Location is determined from EVENT.
+Different from the default in that it handles hscrolling."
+  (interactive "e")
+  (let* ((pos (posn-col-row (event-start event)))
+	 (hs (window-hscroll))
+	 (x (+ (car pos) hs))
+	 (y (cdr pos))
+	 (current-row (count-lines (window-start) (line-beginning-position))))
+    (unless (equal x (current-column))
+      (picture-forward-column (- x (current-column))))
+    (unless (equal y current-row)
+      (picture-move-down (- y current-row)))))
+
+;;; New functions
+;;
+(defun picture-goto-coordinate (x y)
+  "Goto coordinate X, Y."
+  (goto-char (point-min))
+  (picture-newline y)
+  (move-to-column x t)
+  )
+
+(defun picture-set-motion (vert horiz)
+  "Set VERTICAL and HORIZONTAL increments for movement in Picture mode.
+The mode line is updated to reflect the current direction."
+  (setq picture-vertical-step vert
+	picture-horizontal-step horiz)
+  (if (eq major-mode 'picture-mode)
+      (progn
+	(setq mode-name
+	      (format "Picture:%s"
+		      (nth (+ 2 (% horiz 3) (* 5 (1+ (% vert 2))))
+			   '(wnw nw up ne ene Left left none right Right
+				 wsw sw down se ese))))
+	(force-mode-line-update)
+	(message ""))))
+
+(defun picture-draw-rectilinear-line (x1 y1 x2 y2 &optional direction
+					 &rest textproperties)
+  "Draw a line from X1, Y1 to X2, Y2.
+If optional argument DIRECTION is specified as 'verticle, or 'horizontal,
+then the line is drawn with the major direction in that orientation.
+If DIRECTION is not specified, the greatest distance between X or Y
+coordinates is used to choose.
+Arguments TEXTPROPERTIES are applied to the characters inserted.
+The line is drawn in a rectilinear fashion."
+  ;; A rectilinear line for us (short term) is a line travelling
+  ;; in the direction of greatest distance, with a jog in the middle.
+  (let (xdir ydir halfway htwiddle
+	)
+    ;; Travelling
+    (if (> x1 x2)
+	(setq xdir -1)
+      (setq xdir 1))
+    (if (> y1 y2)
+	(setq ydir -1)
+      (setq ydir 1))
+    ;; Get there
+    (picture-goto-coordinate x1 y1)
+    (picture-update-desired-column t)
+    ;; Determine primary direction
+    (if (or (and direction (eq direction 'horizontal))
+	    (and (not direction) (> (abs (- x1 x2)) (abs (- y1 y2)))))
+	;; This means that X is primary direction
+	(progn
+	  (setq halfway (/ (abs (- x1 x2)) 2)
+		htwiddle (% (abs (- x1 x2)) 2))
+	  (picture-set-motion 0 xdir)
+	  (apply 'picture-insert picture-rectangle-h (+ halfway htwiddle)
+		 textproperties)
+	  (if (/= y1 y2)
+	      (progn
+		(picture-set-motion ydir 0)
+		(apply 'picture-insert
+		       (if (< x1 x2)
+			   (if (< y1 y2)
+			       picture-rectangle-ctr
+			     picture-rectangle-cbr)
+			 (if (< y1 y2)
+			     picture-rectangle-ctl
+			   picture-rectangle-cbl))
+		       1 textproperties)
+		(apply 'picture-insert picture-rectangle-v (1- (abs (- y1 y2)))
+		       textproperties)
+		(picture-set-motion 0 xdir)
+		(apply 'picture-insert
+		       (if (< x1 x2)
+			   (if (< y1 y2)
+			       picture-rectangle-cbl
+			     picture-rectangle-ctl)
+			 (if (< y1 y2)
+			     picture-rectangle-cbr
+			   picture-rectangle-ctr))
+		       1 textproperties)
+		;;(setq halfway (1- halfway))
+		)
+	    (apply 'picture-insert picture-rectangle-h 1
+		   textproperties)
+	    )
+	  (apply 'picture-insert picture-rectangle-h halfway
+		 textproperties)
+	  )
+      ;; This means that Y is the primary direction
+      (setq halfway (/ (abs (- y1 y2)) 2)
+	    htwiddle (% (abs (- y1 y2)) 2))
+      (picture-set-motion ydir 0)
+      (apply 'picture-insert picture-rectangle-v (+ halfway htwiddle)
+	     textproperties)
+      (if (/= x1 x2)
+	  (progn
+	    (picture-set-motion 0 xdir)
+	    (apply 'picture-insert
+		   (if (< y1 y2)
+		       (if (< x1 x2)
+			   picture-rectangle-cbl
+			 picture-rectangle-cbr
+			 )
+		     (if (< x1 x2)
+			 picture-rectangle-ctl
+		       picture-rectangle-ctr
+		       ))
+		   1 textproperties)
+	    (apply 'picture-insert picture-rectangle-h (1- (abs (- x1 x2)))
+		   textproperties)
+	    (picture-set-motion ydir 0)
+	    (apply 'picture-insert
+		   (if (< y1 y2)
+		       (if (< x1 x2)
+			   picture-rectangle-ctr
+			 picture-rectangle-ctl)
+		     (if (< x1 x2)
+			 picture-rectangle-cbr
+		       picture-rectangle-cbl))
+		   1 textproperties)
+	    ;(setq halfway (1- halfway))
+	    )
+	(apply 'picture-insert picture-rectangle-v 1
+	       textproperties)
+	)
+      (apply 'picture-insert picture-rectangle-v halfway
+	     textproperties)
+      )
+    ))
+
+(provide 'picture-hack)
+
+;;; picture-hack.el ends here
diff --git a/site/cedet-1.0pre7/cogre/templates/Makefile b/site/cedet-1.0pre7/cogre/templates/Makefile
new file mode 100644
index 0000000..d57223f
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/templates/Makefile
@@ -0,0 +1,38 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+templates_MISC=srecode-dot.srt cogre-default.srt
+VERSION=1.0pre7
+DISTDIR=$(top)COGRE-$(VERSION)/templates
+
+
+
+all: templates
+
+templates: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(templates_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/cogre/templates/Project.ede b/site/cedet-1.0pre7/cogre/templates/Project.ede
new file mode 100644
index 0000000..290ef17
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/templates/Project.ede
@@ -0,0 +1,13 @@
+;; Object templates
+;; EDE project file.
+(ede-proj-project "templates"
+  :name "templates"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "templates"
+    :name "templates"
+    :path ""
+    :source '("srecode-dot.srt" "cogre-default.srt")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/cogre/templates/cogre-default.srt b/site/cedet-1.0pre7/cogre/templates/cogre-default.srt
new file mode 100644
index 0000000..c196054
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/templates/cogre-default.srt
@@ -0,0 +1,43 @@
+;; cogre-default.srt --- Default templates for basic COGRE.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "default"
+set escape_start "{{"
+set escape_end "}}"
+
+context file
+
+;; @TODO - Need to test this
+
+
+template cogre-graph-comment :cogre
+----
+{{comment_start}} {{GRAPHNAME}} -- {{^}}
+{{comment_prefix}}
+{{GRAPH:srecode-comment-prefix}}
+{{comment_prefix}}
+{{comment_end}}
+----
+
+
+
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/cogre/templates/srecode-dot.srt b/site/cedet-1.0pre7/cogre/templates/srecode-dot.srt
new file mode 100644
index 0000000..eef92a8
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/templates/srecode-dot.srt
@@ -0,0 +1,77 @@
+;; srecode-dot.srt --- 
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "graphviz-dot-mode"
+set escape_start "{{"
+set escape_end "}}"
+
+set comment_start  "/**"
+set comment_end    " */"
+set comment_prefix " *"
+
+context file
+
+template empty :time :user :file :dot
+----
+{{>:filecomment}}
+digraph structs {
+	{{^}}
+}
+----
+
+template cogre :time :dot :cogre
+----
+{{comment_start}}
+{{comment_prefix}} Graph {{GRAPHNAME}} Generated by Emacs/SRecode on {{TIME}}.
+{{comment_end}}
+----
+
+context declaration
+
+template digraph-tag :blank
+"Insert a digraph structure."
+----
+digraph structs {
+	node [shape=record];
+	{{^}}
+}
+----
+
+template generic-node :blank :tag
+"Basic node declaration for generic attributes."
+----
+	node [shape={{SHAPE}}];
+----
+
+template node :blank :tag
+"Basic node tag to convert from a Semantic parse."
+----
+	"{{NAME}}" [ {{#ATTRIBUTES}} {{LABEL}}="{{VALUE}}"{{/ATTRIBUTES}} ];
+----
+
+template link :blank :tag
+"Basic link tag to convert from a Semantic parse."
+----
+	"{{NAME}}" -> "{{TAIL}}" [ {{#ATTRIBUTES}} {{LABEL}}="{{VALUE}}"{{/ATTRIBUTES}} ];
+----
+
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/cogre/tests/Makefile b/site/cedet-1.0pre7/cogre/tests/Makefile
new file mode 100644
index 0000000..10a86d0
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/tests/Makefile
@@ -0,0 +1,38 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+TestFiles_MISC=testclasses.hh
+VERSION=1.0pre7
+DISTDIR=$(top)COGRE-$(VERSION)/tests
+
+
+
+all: TestFiles
+
+TestFiles: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(TestFiles_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/cogre/tests/Project.ede b/site/cedet-1.0pre7/cogre/tests/Project.ede
new file mode 100644
index 0000000..f40b1fc
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/tests/Project.ede
@@ -0,0 +1,13 @@
+;; Object Tests
+;; EDE project file.
+(ede-proj-project "Tests"
+  :name "Tests"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "TestFiles"
+    :name "TestFiles"
+    :path ""
+    :source '("testclasses.hh")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/cogre/tests/testclasses.hh b/site/cedet-1.0pre7/cogre/tests/testclasses.hh
new file mode 100644
index 0000000..059925a
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/tests/testclasses.hh
@@ -0,0 +1,117 @@
+/** testclasses.hh --- A test file full of classes to make diagrams from.
+ */
+
+class MyBaseclass 
+{     
+
+public:
+  MyBaseclass()
+  {  }
+  ~MyBaseclass()
+  {  }
+
+  /**
+   * fMyPrivateData Accessors
+   * @{
+   */
+  int getMyPrivateData() const {
+    return fMyPrivateData;
+  }
+  void setMyPrivateData(int MyPrivateData) {
+    fMyPrivateData = MyPrivateData;
+  }
+  /**
+   * @}
+   */
+
+private:
+  int fMyPrivateData;
+  char fMyChar;
+};
+
+class Subclass : public MyBaseclass
+{     
+
+public:
+  Subclass()
+  {  }
+  ~Subclass()
+  {  }
+
+  /**
+   * scData Accessors
+   * @{
+   */
+  int getcData() const {
+    return scData;
+  }
+  void setcData(int cData) {
+    scData = cData;
+  }
+  /**
+   * @}
+   */
+
+private:
+  int scData;
+};
+
+class SpecificClass : public Subclass
+{     
+
+public:
+  SpecificClass()
+  {  }
+  ~SpecificClass()
+  {  }
+
+  int addSubData(Subclass *sd) {
+    SubData.push(sd);
+  }
+
+private:
+  int SData;
+  vector<Subclass> *SubData;
+
+};
+
+class OtherClass : public Subclass
+{     
+
+public:
+  OtherClass()
+  {  }
+  ~OtherClass()
+  {  }
+  /**
+   * fOdata Accessors
+   * @{
+   */
+  int getOdata() const {
+    return fOdata;
+  }
+  void setOdata(int Odata) {
+    fOdata = Odata;
+  }
+  /**
+   * @}
+   */
+
+private:
+  int fOdata;
+
+};
+
+class AltClass : public Subclass
+{     
+
+public:
+  AltClass()
+  {  }
+  AltClass()
+  {  }
+private:
+  int fAdata;
+};
+
+// End
diff --git a/site/cedet-1.0pre7/cogre/wisent-dot-wy.el b/site/cedet-1.0pre7/cogre/wisent-dot-wy.el
new file mode 100644
index 0000000..03138c7
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/wisent-dot-wy.el
@@ -0,0 +1,281 @@
+;;; wisent-dot-wy.el --- Generated parser support file
+
+;; Copyright (C) 2003, 2004, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:57-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-dot.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-dot-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("digraph" . DIGRAPH)
+     ("graph" . GRAPH)
+     ("subgraph" . SUBGRAPH)
+     ("node" . NODE))
+   '(("node" summary "node [<attribute>...];")
+     ("subgraph" summary "subgraph <name> { <graph elements> ... }")
+     ("graph" summary "graph <name> { <graph elements> ... }")
+     ("digraph" summary "digraph <name> { <graph elements> ... }")))
+  "Table of language keywords.")
+
+(defconst wisent-dot-wy--token-table
+  (semantic-lex-make-type-table
+   '(("number"
+      (number))
+     ("string"
+      (string))
+     ("symbol"
+      (symbol))
+     ("close-paren"
+      (RPAREN . ")")
+      (RBRACKET . "]")
+      (RBRACE . "}"))
+     ("open-paren"
+      (LPAREN . "(")
+      (LBRACKET . "[")
+      (LBRACE . "{"))
+     ("block"
+      (PAREN_BLOCK . "(LPAREN RPAREN)")
+      (BRACE_BLOCK . "(LBRACE RBRACE)")
+      (BRACKET_BLOCK . "(LBRACKET RBRACKET)"))
+     ("punctuation"
+      (COMMA . ",")
+      (SEMI . ";")
+      (EQUAL . "=")
+      (LINK . "--")
+      (DILINK . "->")))
+   '(("number" :declared t)
+     ("string" :declared t)
+     ("symbol" :declared t)
+     ("block" :declared t)
+     ("punctuation" syntax "\\s.+")
+     ("punctuation" :declared t)
+     ("keyword" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst wisent-dot-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((DIGRAPH GRAPH SUBGRAPH NODE DILINK LINK EQUAL SEMI COMMA BRACKET_BLOCK BRACE_BLOCK PAREN_BLOCK LBRACE RBRACE LBRACKET RBRACKET LPAREN RPAREN symbol string number)
+       nil
+       (dot_file
+	((digraph))
+	((graph)))
+       (digraph
+	((DIGRAPH symbol BRACE_BLOCK)
+	 (wisent-raw-tag
+	  (semantic-tag $2 'digraph :members
+			(semantic-parse-region
+			 (car $region3)
+			 (cdr $region3)
+			 'graph-contents 1)))))
+       (graph
+	((GRAPH symbol BRACE_BLOCK)
+	 (wisent-raw-tag
+	  (semantic-tag $2 'graph :members
+			(semantic-parse-region
+			 (car $region3)
+			 (cdr $region3)
+			 'graph-contents 1)))))
+       (graph-contents
+	((LBRACE)
+	 nil)
+	((RBRACE)
+	 nil)
+	((graph-attributes))
+	((subgraph))
+	((node))
+	((graphgeneric))
+	((named-node))
+	((links)))
+       (subgraph
+	((SUBGRAPH symbol BRACE_BLOCK)
+	 (wisent-raw-tag
+	  (semantic-tag $2 'graph :members
+			(semantic-parse-region
+			 (car $region3)
+			 (cdr $region3)
+			 'graph-contents 1)))))
+       (graphgeneric
+	((GRAPH BRACKET_BLOCK SEMI)
+	 (wisent-raw-tag
+	  (semantic-tag "GRAPH" 'generic-graph :attributes
+			(semantic-parse-region
+			 (car $region2)
+			 (cdr $region2)
+			 'attribute-block 1)))))
+       (node
+	((NODE BRACKET_BLOCK SEMI)
+	 (wisent-raw-tag
+	  (semantic-tag "NODE" 'generic-node :attributes
+			(semantic-parse-region
+			 (car $region2)
+			 (cdr $region2)
+			 'attribute-block 1)))))
+       (graph-attributes
+	((GRAPH BRACKET_BLOCK SEMI)
+	 (wisent-raw-tag
+	  (semantic-tag "GRAPH" 'graph-attributes :attributes
+			(semantic-parse-region
+			 (car $region2)
+			 (cdr $region2)
+			 'attribute-block 1)))))
+       (named-node
+	((name BRACKET_BLOCK SEMI)
+	 (wisent-raw-tag
+	  (semantic-tag $1 'node :attributes
+			(semantic-parse-region
+			 (car $region2)
+			 (cdr $region2)
+			 'attribute-block 1)))))
+       (links
+	((name DILINK name opt-link-attributes opt-semi)
+	 (wisent-raw-tag
+	  (semantic-tag $1 'link :to $3 :attributes $4)))
+	((name LINK name opt-link-attributes opt-semi)
+	 (wisent-raw-tag
+	  (semantic-tag $1 'link :to $3 :attributes $4))))
+       (name
+	((symbol)
+	 (identity $1))
+	((string)
+	 (read $1)))
+       (attribute-block
+	((LBRACKET)
+	 nil)
+	((RBRACKET)
+	 nil)
+	((COMMA)
+	 nil)
+	((symbol EQUAL name)
+	 (wisent-raw-tag
+	  (semantic-tag $1 'attribute :value $3))))
+       (opt-semi
+	((SEMI)
+	 nil)
+	(nil))
+       (opt-link-attributes
+	((BRACKET_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'attribute-block 1))
+	(nil)))
+     '(dot_file graph-contents attribute-block)))
+  "Parser table.")
+
+(defun wisent-dot-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-dot-wy--parse-table
+	semantic-debug-parser-source "wisent-dot.wy"
+	semantic-flex-keywords-obarray wisent-dot-wy--keyword-table
+	semantic-lex-types-obarray wisent-dot-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-keyword-type-analyzer wisent-dot-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-block-type-analyzer wisent-dot-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("[" LBRACKET BRACKET_BLOCK)
+     ("{" LBRACE BRACE_BLOCK)
+     ("(" LPAREN PAREN_BLOCK))
+    ("]" RBRACKET)
+    ("}" RBRACE)
+    (")" RPAREN))
+  )
+
+(define-lex-regex-type-analyzer wisent-dot-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'symbol)
+
+(define-lex-sexp-type-analyzer wisent-dot-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'string)
+
+(define-lex-regex-type-analyzer wisent-dot-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'number)
+
+(define-lex-string-type-analyzer wisent-dot-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\s.+"
+  '((COMMA . ",")
+    (SEMI . ";")
+    (EQUAL . "=")
+    (LINK . "--")
+    (DILINK . "->"))
+  'punctuation)
+
+
+;;; Epilogue
+;;
+(define-lex wisent-dot-lexer
+  "Lexical analyzer that handles DOT buffers.
+It ignores whitespace, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  wisent-dot-wy--<keyword>-keyword-analyzer
+  wisent-dot-wy--<symbol>-regexp-analyzer
+  wisent-dot-wy--<block>-block-analyzer
+  ;; ?? semantic-lex-close-paren
+  wisent-dot-wy--<number>-regexp-analyzer
+  wisent-dot-wy--<string>-sexp-analyzer
+  wisent-dot-wy--<punctuation>-string-analyzer
+  semantic-lex-default-action
+  )
+
+(provide 'wisent-dot-wy)
+
+;;; wisent-dot-wy.el ends here
diff --git a/site/cedet-1.0pre7/cogre/wisent-dot.el b/site/cedet-1.0pre7/cogre/wisent-dot.el
new file mode 100644
index 0000000..6f807bc
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/wisent-dot.el
@@ -0,0 +1,97 @@
+;;; wisent-dot.el --- GraphViz DOT parser
+
+;; Copyright (C) 2003, 2004, 2009 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-dot.el,v 1.12 2009/04/07 00:34:49 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser for GraphViz DOT language.
+;; The language is declaritive and the whole thing is parsed.
+;; The result could be used as a data structure representing a graph.
+
+;; This depends on A dot mode 
+;;
+;; It will work with either cogre-dot-mode, or if available, the much
+;; nicer graphviz-dot-mode by
+;;   Pieter E.J. Pareit <pieter.pareit@planetinternet.be>
+;;   http://users.skynet.be/ppareit/graphviz-dot-mode.el
+;;   
+
+
+;;; Code:
+(require 'semantic-wisent)
+(require 'semantic)
+(require 'wisent-dot-wy)
+
+(define-mode-local-override semantic-tag-components
+  graphviz-dot-mode (tag)
+  "Return the children of tag TAG."
+  (cond
+   ((memq (semantic-tag-class tag)
+         '(generic-node graph-attributes node link))
+    (semantic-tag-get-attribute tag :attributes)
+    )
+   ((memq (semantic-tag-class tag)
+         '(digraph graph))
+    (semantic-tag-get-attribute tag :members)
+    )))
+
+;;;###autoload
+(defun wisent-dot-setup-parser ()
+  "Setup buffer for parse."
+  (wisent-dot-wy--install-parser)
+
+  (setq
+   ;; Lexical Analysis
+   semantic-lex-analyzer 'wisent-dot-lexer
+   semantic-lex-syntax-modifications
+   '(
+     (?- ".")
+     (?= ".")
+     (?, ".")
+     (?> ".")
+     (?< ".")
+     )
+   ;; Parsing
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-name
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-command-separation-character ";"
+   ;; Speedbar
+   semantic-symbol->name-assoc-list
+   '((graph . "Graph")
+     (digraph . "Directed Graph")
+     (node . "Node")
+     )
+   ;; Navigation
+   senator-step-at-tag-classes '(graph digraph)
+   ))
+
+;;;###autoload
+(add-hook 'graphviz-dot-mode-hook 'wisent-dot-setup-parser)
+;;;###autoload
+(add-hook 'cogre-dot-mode-hook 'wisent-dot-setup-parser)
+
+(provide 'wisent-dot)
+
+;;; wisent-dot.el ends here
diff --git a/site/cedet-1.0pre7/cogre/wisent-dot.wy b/site/cedet-1.0pre7/cogre/wisent-dot.wy
new file mode 100644
index 0000000..aa7fcd7
--- /dev/null
+++ b/site/cedet-1.0pre7/cogre/wisent-dot.wy
@@ -0,0 +1,194 @@
+;;; wisent-dot.wy --- GraphViz DOT file parser
+
+;; Copyright (C) 2003, 2004, 2009 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-dot.wy,v 1.10 2009/04/06 02:56:32 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser for GraphViz DOT language.
+;; The language is declaritive and the whole thing is parsed.
+;; The result could be used as a data structure representing a graph.
+
+%languagemode  graphviz-dot-mode
+
+%start dot_file
+;; Needed for EXPANDFULL
+%start graph-contents
+%start attribute-block
+
+;;; KEYWORDS
+%type    <keyword>
+%keyword DIGRAPH  "digraph"
+%put     DIGRAPH  summary "digraph <name> { <graph elements> ... }"
+%keyword GRAPH    "graph"
+%put     GRAPH    summary "graph <name> { <graph elements> ... }"
+%keyword SUBGRAPH "subgraph"
+%put     SUBGRAPH summary "subgraph <name> { <graph elements> ... }"
+%keyword NODE     "node"
+%put     NODE     summary "node [<attribute>...];"
+
+;;; Punctuation Types
+%type  <punctuation> syntax "\\s.+"
+%token <punctuation> DILINK "->"
+%put   DILINK summary "<node> -> <node>;   Directed link"
+%token <punctuation> LINK   "--"
+%put   LINK   summary "<node> -- <node>;   Link"
+%token <punctuation> EQUAL  "="
+%token <punctuation> SEMI   ";"
+%token <punctuation> COMMA  ","
+
+;;; BLOCK types
+%type  <block>
+%token <block>       BRACKET_BLOCK "(LBRACKET RBRACKET)"
+%token <block>       BRACE_BLOCK   "(LBRACE RBRACE)"
+%token <block>       PAREN_BLOCK   "(LPAREN RPAREN)"
+%token <open-paren>  LBRACE        "{"
+%token <close-paren> RBRACE        "}"
+%token <open-paren>  LBRACKET      "["
+%token <close-paren> RBRACKET      "]"
+%token <open-paren>  LPAREN        "("
+%token <close-paren> RPAREN        ")"
+
+
+;;; Bland default types
+%type  <symbol>
+%token <symbol> symbol
+
+%type  <string>
+%token <string> string
+
+%type  <number>
+%token <number> number
+
+%%
+
+dot_file
+  : digraph
+  | graph
+  ;
+
+digraph
+  : DIGRAPH symbol BRACE_BLOCK
+    (TAG $2 'digraph :members (EXPANDFULL $3 graph-contents))
+  ;
+
+graph
+  : GRAPH symbol BRACE_BLOCK
+    (TAG $2 'graph :members (EXPANDFULL $3 graph-contents))
+  ;
+
+graph-contents
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | graph-attributes
+  | subgraph
+  | node
+  | graphgeneric
+  | named-node
+  | links
+  ;
+
+subgraph
+  : SUBGRAPH symbol BRACE_BLOCK
+    (TAG $2 'graph :members (EXPANDFULL $3 graph-contents))
+  ;
+
+graphgeneric
+  : GRAPH BRACKET_BLOCK SEMI
+    (TAG "GRAPH" 'generic-graph :attributes (EXPANDFULL $2 attribute-block))
+  ;
+
+node
+  : NODE BRACKET_BLOCK SEMI
+    (TAG "NODE" 'generic-node :attributes (EXPANDFULL $2 attribute-block))
+  ;
+
+graph-attributes
+  : GRAPH BRACKET_BLOCK SEMI
+    (TAG "GRAPH" 'graph-attributes :attributes (EXPANDFULL $2 attribute-block))
+  ;
+
+named-node
+  : name BRACKET_BLOCK SEMI
+    (TAG $1 'node :attributes (EXPANDFULL $2 attribute-block))
+  ;
+
+links
+  : name DILINK name opt-link-attributes opt-semi
+    (TAG $1 'link :to $3 :attributes $4)
+  | name LINK name opt-link-attributes opt-semi
+    (TAG $1 'link :to $3 :attributes $4)
+  ;
+
+name
+  : symbol
+    ( identity $1 )
+  | string
+    ( read $1 ) ;; This un-strings it.
+  ;
+
+attribute-block
+  : LBRACKET 
+    ()
+  | RBRACKET
+    ()
+  | COMMA
+    ()
+ ;; This is a catch-all in case we miss some keyword.
+  | symbol EQUAL name
+    (TAG $1 'attribute :value $3)
+  ;
+
+opt-semi
+  : SEMI
+    ()
+  | ;; Empty
+  ;
+
+opt-link-attributes
+  : BRACKET_BLOCK
+    (EXPANDFULL $1 attribute-block)
+  | ;; Empty
+  ;
+
+%%
+
+(define-lex wisent-dot-lexer
+  "Lexical analyzer that handles DOT buffers.
+It ignores whitespace, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  wisent-dot-wy--<keyword>-keyword-analyzer
+  wisent-dot-wy--<symbol>-regexp-analyzer
+  wisent-dot-wy--<block>-block-analyzer
+  ;; ?? semantic-lex-close-paren
+  wisent-dot-wy--<number>-regexp-analyzer
+  wisent-dot-wy--<string>-sexp-analyzer
+  wisent-dot-wy--<punctuation>-string-analyzer
+  semantic-lex-default-action
+  )
+
+;;; wisent-dot.wy ends here
diff --git a/site/cedet-1.0pre7/common/ChangeLog b/site/cedet-1.0pre7/common/ChangeLog
new file mode 100644
index 0000000..3bb0306
--- /dev/null
+++ b/site/cedet-1.0pre7/common/ChangeLog
@@ -0,0 +1,1382 @@
+2010-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-compat.el (find-coding-systems-region):
+	XEmacs variant which was attributed to Aidan.
+
+2010-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-compat.el (find-coding-systems-region):
+	New, contrib from Marcus Harnisch
+
+2010-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Add srecode-utest-project
+
+2009-12-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Add wisent-calc-utest.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (C++ Features): Minor tweak.
+
+2009-10-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-decoders):
+	Allow for stray . in alpha/beta variants.
+
+2009-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-compat.el (boolean-p):
+	Moved here from eieio.  Wrapped in test for booleanp.
+
+2009-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (Commentary): Fix old style install doc w/ updated doc.
+
+	* data-debug.el (eieio,semantic-tag): Remove these requires.
+	(data-debug-insert-ring-button): Do not be specific about the ring contents.
+	(data-debug-thing-alist): Remove eieio and semantic specific entries.
+	(data-debug-add-specialized-thing): New function.
+
+	* cedet-edebug.el (edebug,debug): New requires during compile.
+
+	* cedet-compat.el (with-no-warnings): Add compatibility fcn.
+
+	* cedet-files.el: Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* cedet-edebug.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(cedet-edebug-prin1-to-string): Add with-no-warnings.
+
+	* data-debug.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	(ring, eieio, semantic-tag): New requires.
+
+2009-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	(inversion-version, inversion-incompatible-version): Moved.
+
+	* mode-local.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	(get-mode-local-parent): Moved earlier in the file.
+
+	* pulse.el: Patch from Chong Yidong:  Remove trailing whitespace.
+
+2009-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-packages): Update srecode version.
+
+	* cedet.el (cedet-packages): Update cogre version.
+
+	* Makefile (common_LISP): Remove sformat.el
+
+	* Project.ede (common): Remove sformat.
+
+2009-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sformat.el: Remove obsolete package.
+
+2009-07-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sformat.el: Add note about CEDET 1.0.
+
+2009-07-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el: Suggestion from David Engster:
+	(activate-mode-local-bindings): For set-auto-mode test.
+	Have specialized emacs and xemacs queries.
+
+2009-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (semantic-lex-c-nested-namespace-ignore-second): New doc.
+
+2009-07-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (activate-mode-local-bindings):
+	Do not do the activation if we are
+	called while loading in a lisp file.  See Hack comment.
+
+2009-07-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el: From David Engster:
+	(mode-local-map-mode-buffers): Fix bug in predicate to
+	mode-local-map-file-buffers to return the found value.
+
+2009-07-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (find-file-hooks): Revert to previous setting.
+
+	* mode-local.el (mode-local-equivalent-mode-p): New
+	(mode-local-map-mode-buffers): Use above as predicate.
+	(mode-local-post-major-mode-change): Specify *not* local post-command-hook.
+	(mode-local-on-major-mode-change): Have find-file-hooks also use
+	mode-local-on-major-mode-change.
+
+	* mode-local.el (set-mode-local-parent): Patch from David Engster:
+	Fix order of arguments to `mode-local-map-mode-buffers'.
+	(mode-local-setup-edebug-specs): Fix spec for setq-mode-local.
+
+2009-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (mode-local-describe-bindings-1):
+	Use `help-buffer' instead of
+	"*Help*" for identifying the buffer to display help in.
+
+2009-05-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-global.el (cedet-gnu-global-version-check):
+	Protect against GLOBAL not being installed.
+
+	* cedet-cscope.el (cedet-cscope-version-check):
+	Protect against cscope not being installed.
+
+	* cedet-idutils.el: (cedet-idutils-support-for-directory)
+	(cedet-idutils-version-check): Protect against ID Utils not being installed.
+
+2009-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (Commentary): Fix example.
+
+	* data-debug.el (Commentary): Add some help.
+	(data-debug-show-stuff): New utility.
+	(data-debug-edebug-expr, data-debug-eval-expression): Use above.
+
+	* mode-local.el (with-mode-local-symbol):
+	New macro.  Same as below, but mode is not
+	automatically quoted.
+	(with-mode-local): Calls above, but quotes in the first argument.
+
+2009-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Add cogre-utest-quick-class
+
+2009-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-graphviz.el (cedet-graphviz-translate-file):
+	Check for a -n flag, and then swap
+	between dot and neato.
+
+	* cedet-utests.el (cedet-utest-test-alist):
+	Remove UML test as obsolete.
+
+2009-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-graphviz.el (cedet-graphviz-dot-version-check): Fix regexp.
+
+	* cedet-graphviz.el (cedet-graphviz-min-version):
+	Reset to 2.8, it seems to work.
+	(cedet-graphviz-dot-version-check): Handle older version number output.
+
+	* cedet-graphviz.el (cedet-graphviz-neato-command): Doc fix.
+
+	* cedet-graphviz.el (cedet-graphviz-translate-file):
+	If fileout is not specified, then
+	don't specify an output file.
+
+2009-04-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (common_LISP): Add cedet-graphviz.el.
+
+	* Project.ede (common): Add cedet-graphviz.el.
+
+	* cedet-graphviz.el: CEDET support for calling into graphviz.
+
+2009-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist):
+	Add conversion/export tests.
+
+2009-04-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* pulse.el (pulse-momentary-highlight-overlay):
+	Store items onto a list.
+	(pulse-momentary-unhighlight): Remove overlays from a list.
+
+2009-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-mode): Disable undo.
+
+	* cedet-utests.el (cedet-utest-test-alist): Add cogre periodic test.
+
+2009-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (toplevel): If cedet is already loaded, throw an error.
+
+2009-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-lambda-expression): Fix font used.
+	(data-debug-insert-nil): New
+	(data-debug-thing-alist): Add nil.
+
+	* data-debug.el (data-debug-mode): Disable font-lock more vigorously.
+
+2009-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el:
+	(data-debug-insert-stuff-vector, data-debug-insert-stuff-vector-from-point)
+	(data-debug-insert-stuff-vector-button): New
+	(data-debug-thing-alist): Add above for vectors.
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-version): Update version.
+	(cedet-packages): Update other tool revision numbers.
+
+	* Makefile, Project.ede, icons/Makefile (VERSION): Update version
+
+2009-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el:
+	(data-debug-insert-widget-properties,data-debug-insert-widget-from-point)
+	(data-debug-insert-widget): New fcns.
+	(data-debug-insert-lambda-expression): Doc fix.
+	(data-debug-thing-alist): Add widget
+
+2009-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-batch): Disable srecode-map-save-file.
+
+	* cedet-utests.el (cedet-utest-batch):
+	Disable semanticdb file caches during
+	batch unit tests.
+
+	* cedet-utests.el: Patch from David Engster
+	(cedet-utest-show-log-end): More robust way of getting the output log
+	window.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Add missing -C to subdir invocation.
+
+2009-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Remove sleep test.
+
+	* cedet-utests.el (cedet-utest): Fix event cleanup if statement.
+	Fix doc.
+
+	* working.el (working-wait-for-keypress):
+	Fix event cleanup if statement.
+
+	* cedet-utests.el (cedet-running-master-tests): New variable.
+	(cedet-utest): Set above.
+	Try to clear left over input events.
+	(cedet-utest-log-setup): Don't erase buffer if in the middle of the
+	master unit tests list.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Add gcc testing.
+
+2009-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top): Add CScope menu
+	(C++ Features, GNU Global, ID Utils, Maintenance): Convert CEDET to @cedet{}
+	(CScope): New node.
+
+	* Makefile (common_LISP): Add cedet-cscope.el
+
+	* Project.ede (common): Add cedet-cscope.el
+
+	* cedet-cscope.el: CScope support.
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top): Add ID Utils to menu.
+	(ID Utils): New Node
+
+	* icons/Makefile (VERSION): Changed.
+
+	* Makefile (common_LISP): Add cedet-idutils.el
+	(EMACSFLAGS): New variable.
+	(init, setup, common,tests): Use EMACSFLAGS.
+
+	* Project.ede (common): Add cedet-idutils.el
+
+2009-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-idutils.el: Basic support for idutils in CEDET.
+
+2009-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist):
+	Replace the lex-spp test with a single
+	fcn new in that lib.
+
+2009-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el: Patch from Marcus Harnisch
+	(inversion-decoders): Add something compatible w/ XEmacs.
+
+2009-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top): Add below.
+	(Maintenance): New.
+
+2009-02-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (dd-propertize):
+	New alias or implementation depending on platform.
+	(data-debug-insert-hash-table, data-debug-insert-hash-table-button)
+	(data-debug-insert-symbol-from-point, data-debug-insert-symbol-button)
+	(data-debug-insert-string, data-debug-insert-number):
+	Use dd-propertize, not propertize.
+
+	* cedet-utests.el (cedet-utest-test-alist): Comments update.
+	Add srecode-field-utest.
+
+2009-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* pulse.el (pulse-available-p): New
+	(pulse-flag): Use above.  Doc new behavior.
+	(pulse-test, pulse-momentary-highlight-overlay):
+	Check also pulse-available-p in case user set the flag to t
+	but the current terminal/frame doesn't support it.
+
+2009-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-files.el (replace-regexp-in-string): New compatability fcn.
+	Moved from semanticdb-file.el
+
+	* cedet-files.el (cedet-directory-name-to-file-name):
+	Add optional "testmode" argument.
+	(cedet-file-name-to-directory-name): New
+	(cedet-files-utest-list, cedet-files-utest): New tests.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (common): Updated to 1.0pre6.
+
+	* Makefile (VERSION): Updated to 1.0pre6.
+
+	* cedet.el (cedet-version): Updated to new prerelease
+	(cedet-packages): Updated versions.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist): Fix typo.
+
+	* icons/Project.ede ("common/icons"): Fix name.
+
+	* cedet.texi (GNU Global): Spelling fixes.
+	Be more specific bout how Global is used.
+
+2009-01-24  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* data-debug.el (data-debug-insert-buffer-props):
+	get local variables from the stored
+	buffer instead of the current buffer
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el: (data-debug-insert-overlay-from-point)
+	(data-debug-insert-overlay-list-from-point)
+	(data-debug-expand-or-contract-mouse):
+	Eliminate unused variable bindings.
+	(data-debug-insert-string): Convert CRs into \n so text fits on one line.
+
+	* pulse.el (pulse-test): Accept no-error argument.
+	When t, don't throw error if pulse-flag is nil.
+
+	* cedet-utests.el (cedet-utest-test-alist):
+	Make interactive features optional.
+	(cedet-utest): Change use of logging fcns to specify a name.
+	Capture timing information.
+	(cedet-utest-noninteractive, cogre-utest-batch): New.
+	(cedet-utest-log-setup): Accept title arg.
+	(cedet-utest-show-log-shutdown): New
+	(cedet-utest-show-log-shutdown-msg): New
+	(cedet-utest-elapsed-time): New.
+	(cedet-utest-log-timer): New var.
+	(cedet-utest-add-log-item-start)
+	(cedet-utest-add-log-item-done)
+	(cedet-utest-log): Change formatting in noninteractive mode.
+
+2009-01-19  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* data-debug.el (data-debug-insert-symbol-from-point):
+	Expand symbol button
+	(data-debug-insert-symbol-button): Insert expandable button for symbol
+	(data-debug-insert-string): simplified
+	(data-debug-insert-number): simplified
+	(data-debug-insert-symbol): replaced by
+	`data-debug-insert-symbol-button'
+	(data-debug-thing-alist): insert buttons for symbols; improved some
+	comments
+
+	* data-debug.el (data-debug-insert-hash-table):
+	Insert contents of hash-table
+	(data-debug-insert-hash-table-from-point): Expand hash-table button
+	(data-debug-insert-hash-table-button): Insert hash-table button
+	(data-debug-thing-alist): added cell for hash-table
+
+2009-01-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-log-start):
+	Protect against frame/window swapping.
+
+	* cedet.texi (GNU Global): Added URL To gnu global
+
+	* cedet.texi (top): Add below
+	(GNU Global): New.
+
+	* cedet-global.el (cedet-gnu-global-version-check):
+	Add arg to not throw an error.
+	If we use that flag, return nil, no error.
+
+	* cedet.texi: (Overview, Semantic, Installation/Basic Configuration)
+	(JDEE Target, C++ Features): Misc spelling fixes.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el (working-wait-for-keypress):
+	Support Emacsen that don't have `read-event'.
+
+	* cedet-compat.el (inversion): new require
+	(cedet-split-string-1): New compat fcn.
+	(cedet-split-string): Alias for working 3 arg split-string.
+
+	* pulse.el (pulse-test): Add autoload cookie
+
+	* sformat.el (Sformat): Fix unused var bytcomp warning.
+
+	* inversion.el (inversion-locate-package-files-and-split):
+	(inversion-check-version): Fix unused var bytcomp warning.
+	(inversion-upgrade-package): Convert mapcar to mapc.
+
+	* data-debug.el: (data-debug-insert-buffer-from-point)
+	(data-debug-insert-buffer-list-from-point)
+	(data-debug-insert-process-from-point)
+	(data-debug-insert-ring-items-from-point)
+	(data-debug-insert-stuff-list-from-point)
+	(data-debug-expand-or-contract-mouse)
+	(data-debug-edebug-expr): Fix unused var bytcomp warning.
+	(data-debug-eval-expression):
+	New command copied from eval-expression.
+
+	* cedet-utests.el (cedet-utest-test-alist): Add cogre tests.
+
+2009-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (mode-local-use-bindings-p): New fcn.
+
+2008-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-global.el (cedet-gnu-global-expand-filename): New command/fcn.
+
+2008-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-global.el (cedet-gnu-global-show-root): New command.
+	(cedet-gnu-global-version-check): If interactive, show useful message.
+
+2008-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: (working-wait-for-keypress)
+	(working-verify-sleep): Setup so tests work in the CEDET utest suite.
+
+	* pulse.el (pulse-toggle-integration-advice):
+	Remove some dead code.  Fix how the mode is toggled.
+
+	* pulse.el (pulse-test):
+	Make asking questions optional for the cedet test suite.
+
+2008-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-buffer-*): New buffer support.
+	(data-debug-thing-alist): Use eieio-object-p, not object-p.
+	Don't use semantic-* fcns.
+	Add buffer support.
+
+2008-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-global.el (cedet-gnu-global-search): Add more options and doc.
+	(cedet-gnu-global-scan-hits): New fcn.
+
+2008-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-global.el (semantic-symref-tool-global::semantic-symref-perform-search):
+	Fix copy-paste error passing in searchtext to global-call.
+	(cedet-gnu-global-root): New fcn.
+
+	* Makefile (common_LISP): Add cedet-global.el
+
+	* Project.ede (common): Add cedet-global.el
+
+	* cedet-global.el: GNU Global general interface for tools.
+
+2008-12-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-log-start):
+	Reset logging if the buffer has no window.
+
+2008-10-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (COGRE): Discuss being incomplete.
+	(Installation/Basic Configuration): Add url to exuberent ctags.
+
+2008-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-decoders): Added decoder for a single number.
+
+2008-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el (cedet-utest-test-alist):
+	Add eieio tests custom and chart.
+	Add semantic lex/spp test.
+	Add srecode getset test.
+	(cedet-utest-last-log-item): New
+	(cedet-utest-show-log-end): New
+	(cedet-utest-post-command-hook): New fcn
+	(cedet-utest-log-setup): Reset the last log item.
+	(cedet-utest-add-log-item-start): Skip logging the same thing twice.
+	Move to end of buffer.
+	(cedet-utest-add-log-item-done): Reset the last log item.
+	(cedet-utest-log-start, cedet-utest-log): New for external tests.
+
+2008-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-utests.el: One place to run all the unit tests.
+
+2008-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (tests_LISP): New
+	(tests): New
+	(add,dist): Add tests.
+
+	* Project.ede (tests): New target.
+
+2008-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-thing-alist): Support new db/tag combo.
+
+2008-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-lambda-expression): New
+	(data-debug-thing-alist): Add lambda
+
+2008-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el:
+	(working-bar-percent-display, working-percent-bar-display)
+	(working-bubble-percent-display): Simplify.
+	(working-verify-parenthesis-a,b): Setup to show 'done' part for 1 sec.
+
+2008-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: (working-bar-percent-display)
+	(working-percent-bar-display)
+	(working-bubble-percent-display): Suggestion from David Engster.
+	Fix case where 'done' message causes a 2 line message.
+
+2008-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (Main setup code): Simplified status messages.
+
+	* inversion.el (inversion-add-to-load-path): Removed status messages.
+
+2008-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (code): Call info-initialize, but in a condition case.
+
+2008-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (mode-local-setup-edebug-specs):
+	Support new name for define-overload.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-autogen.el (make-autoload):
+	Convert defclass autoload cookies into
+	special eieio autoload forms.
+
+	* cedet.el (cedet-packages): Re-sort.  Put eieio first, and ede later.
+	(default-directory): Force eieio to load.
+
+2008-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-packages): Update eieio version.
+
+	* data-debug.el (data-debug-mode): Remove font-lock.
+
+2008-06-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-autogen.el (make-autoload):
+	Add define-overloadable-function support.
+
+2008-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-process-props):
+	Display more parts of a process.
+	(data-debug-insert-process-button): The process status in the tag-line.
+
+2008-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (featurep): Add overlay-p.
+	(data-debug-insert-overlay-props): Do not use safe-length on a string.
+	(data-debug-insert-process-props, data-debug-insert-process-from-point)
+	(data-debug-insert-process-button): New process support
+	(data-debug-thing-alist): Use new overlay-p alias. Add process.
+
+2008-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-overlay-props): Use safe-length.
+	(data-debug-insert-stuff-list): Use cdr-safe.
+	(data-debug-insert-stuff-list-button): Use safe-length
+	(data-debug-insert-number): New
+	(data-debug-thing-alist): Support numbers.
+
+	* mode-local.el (mode-local-font-lock-keywords):
+	Add `define-overloadable-function'.
+
+2008-05-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top, Bug Reporting): Remove bug reporting section.
+
+2008-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top): Add bug reporting seciont
+	(Bug Reporting): New section
+	(Code Completion): Add todo comment.
+
+	* mode-local.el (define-overloadable-function): New name
+	(define-overload): Old name, now an alias.
+
+2008-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede ("common"): Update version.
+
+	* cedet.el (cedet-version): Update to pre5.
+	(cedet-packages): Update table of expected values.
+
+2008-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (C++ Features):
+	Discuss semantic-c-obey-conditional-section-parsing-flag.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (data-debug-insert-thing): Autoload cookie.
+
+2008-04-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (C++ Features):
+	Update w/ new preprocessor symbol info, and details on
+	using custom.
+
+2008-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* data-debug.el (overlay-properties): Compile time fix.
+	(data-debug-expand-or-contract-mouse):
+	Move point to correct window before expand.
+
+2008-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-edebug.el (edebug-setup-hook, debugger-mode-hook):
+	Use data-debug-edebug-expr
+	bound to A instead of previous fcn.
+
+	* Makefile (common_LISP): Add data-debug.el
+
+	* Project.ede ("common"): Add data-debug.el
+
+	* data-debug.el: Data Debugger, copied initially from semantic-adebug.
+
+2008-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (C++ Features):
+	Add detail on include path etc when referring to ede-cpp-root.
+
+2008-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (C++ Features): fix typo for semantic macro.
+
+2008-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-load.el (cedet-compat): Added require.
+
+2008-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (Installation/Basic Configuration): cedet-build.el
+	(C++ Features): turn on EDE for cpp-root type.
+
+2008-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* pulse.el (pulse-overlay-get): Fix XEmacs alias.
+
+2008-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (ECB Target): Fix italic on ECB.
+	(Code Completion): Link to new debugging section.
+	More on guady code helpers.
+
+2008-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (top): Added C++ features node
+	(Code Completion): Removed a block of code. Moved to ...
+	(C++ Features): New section.  Added bits from Code Completion, plus
+	more about include paths and preprocessor symbol maps.
+
+2008-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-files.el (cedet-directory-name-to-file-name):
+	Use `file-truename' on input file.
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (all):
+	Convert EDE, EIEIO, and other package names to use macros.
+	Add @url to all the URLs.
+	(Project Management): Rewrite this section to exclude some misc
+	semantic stuff, and add in some srecode stuff.
+
+2008-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (default-directory): Add docdir to let.
+
+2008-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-packages): Add srecode.
+
+	* cedet.texi (top): Add Code Generation node.
+	(Overview): Add discussion on srecode.
+	(SRecode): New section
+	(Code Generation): New section
+
+2008-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (mode-local-read-function):
+	User minibuffer prompt for mode-localable functions.
+
+2008-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi (EIEIO): Quick fix
+	(Code Completion): Reword a few things.
+
+2008-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* pulse.el (pulse-toggle-integration-advice):
+	Show message if the advice is on or off.
+
+2007-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.texi:
+	(Semantic, Speedbar, JDEE Target, ECB Target, Project Management)
+	(Code Completion): Fix inforef entries so they end in .
+
+	* cedet.el (cedet-emacs-min-version): New const
+	(cedet-xemacs-min-version): New const
+	(default-directory): Make sure the Emacs that is running supports our
+	minimum version.
+
+	* inversion.el (inversion-decoders):
+	Added 4 number decoder (see emacs-version)
+	Added patch level decoder (see XEmacs variable emacs-version)
+	(inversion-<): Support new decoders
+	(inversion-require): Return the package that was required.
+	(inversion-require-emacs): New function.
+	(inversion-unit-test): Test new version decoders.
+
+	* pulse.el: o(pulse-toggle-integration-advice):
+	(goto-lin, echange-point-and-mark, find-tag, tags-search)
+	(tags-loop-continue, pop-tag-mark): Only pulse if interactive.
+
+	* cedet.el (cedet-packages): Add DOCDIR column
+	(code : setting up paths): Add docdir entries into the Info path.
+
+	* pulse.el (pulse-enable-integration-advice): Added more doc.
+
+	* pulse.el (Compatibility): Added pulse-overlay-live-p, and -get
+	(pulse): Don't reset the pulse face.
+	(pulse-test): Don't test for non-pulsing Emacs.
+	Added test for momentary-highlight-overlay-function.
+	(pulse-momentary-highlight-overlay): New function.
+	(pulse-momentary-highlight-region): Use above.
+	Don't use `pulse-momentary-overaly' variable.
+	(pulse-momentary-unhighlight): Test new properties on the overlay.
+	Clear then, and reset things as best we can.
+
+2007-08-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (common_LISP): Added pulse.el
+
+	* Project.ede: Add pulse.el.
+
+	* cedet.texi: Added pulse.el
+
+	* pulse.el: Pulse decoration utility.
+
+2007-06-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Doc_TEXINFOS): New
+	(all): Add cedet.info
+	(cedet.info): New target
+	(clean): Add info.
+
+	* Project.ede ("Doc"): New target.
+
+	* cedet.texi: First draft.
+
+2007-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("common"): regress to prerelease 4
+
+	* Makefile (VERSION): Regress to prerelease 4
+
+	* cedet.el (cedet-version): Regress back to prerelease 4
+	(cedet-packages): Regress some packages back to prerelease 4
+
+2007-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (common_LISP): Added cedet-files.el.
+
+	* Project.ede ("common"): Add cedet-files.el.
+
+	* cedet-files.el (cedet-dir-sep-char): Replace semanticdb-dir-sep-char.
+	(cedet-directory-name-to-file-name): New.
+	Copied from semanticdb-file.el, semanticdb-file-name-directory.
+
+	* cedet-compat.el (subst-char-in-string):
+	Compat fcn if it doesn't exist.
+
+2007-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-edebug.el (edebug-setup-hook, debugger-mode-hook):
+	Add "A" binding into adebug
+	for displaying the values of some variables.
+
+2007-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: (working-mode-line-update)
+	(working-run-with-timer, working-cancel-timer): Fix byte-comp issues.
+
+	* inversion.el (inversion-decode-version): Use string-to-number.
+	(inversion-find-version): Add autoload cookie.
+
+	* cedet.el (cedet-version): Move.  Try to fix byte-comp warnings.
+
+2006-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-find-version):
+	Don't load in the whole file while
+	scanning for revision numbers.
+	(inversion-add-to-load-path): After adding a load path, make
+	sure the new file has the correct revision number.
+
+2006-02-08  David Ponce  <david@dponce.com>
+
+	* inversion.el (inversion-add-to-load-path):
+	Don't signal an error when shadowing
+	an outdated package.
+
+2006-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/Makefile (VERSION): Updated
+
+	* Project.ede (:version): updated (removed)
+
+	* Makefile (VERSION): updated
+
+	* cedet.el (cedet-version): Updated
+	(cedet-packages): Revised all version numbers.
+	(cedet-version): Improved output table for use w/ PRERELEASE CHECKIST.
+
+	* inversion.el (inversion-version): Update version number
+	(inversion-add-to-load-path): Throw error if revision mismatch.
+
+2006-01-30  David Ponce  <david@dponce.com>
+
+	* mode-local.el (define-mode-local-override):
+	Set the `definition-name' of the
+	symbol generated for the mode local function, so find-func (since
+	Emacs 22) can locate it.
+
+2005-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ezimage.el: Doc Fixes.
+
+2005-10-13  David Ponce  <david@dponce.com>
+
+	* cedet.el (cedet-packages): Update speedbar version requirement.
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el, working.el, pprint.el, mode-local.el, inversion.el, fame.el, ezimage.el, cedet-load.el, cedet-compat.el, cedet-autogen.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+	* inversion.el (inversion-decoders):
+	Make more robust to some spacing issues.
+	(inversion-decode-version): Allow for empty alpha/beta values. (Assume 1)
+	(inversion-unit-test): Apply some whitespace issues to prove robustness.
+
+2005-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (find-func): New require.
+
+2005-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-check-version): doc fix
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (:version): Updated.
+
+	* icons/Makefile, Makefile (VERSION): Updated.
+
+	* cedet.el (cedet-version): Updated
+	(cedet-packages): Updated
+
+	* cedet.el (cedet-version): New command.
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/Makefile (VERSION): Updated version.
+
+	* Project.ede ("common"): Updated version.
+
+	* Makefile (VERSION): Updated
+	(autoloads,init,setup,common): Quotes around EMACS.
+
+	* cedet.el (cedet-version): Update revision
+	(cedet-packages): Update revisions of dependent packages.
+
+2005-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-version): Updated
+	(inversion-unit-test): Added tests for new "prerelease" decoder.
+
+2005-04-19  David Ponce  <david@dponce.com>
+
+	* inversion.el (inversion-decoders):
+	Rename from inversion-decoder-ring.  Define
+	as constant.  Fix prerelease regexp and doc string.
+	(inversion-decode-version)
+	(inversion-release-to-number): Update.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (speedbar-incompatible-version):
+	Support pre-release notation.
+
+	* icons/Makefile, Makefile (VERSION): Updated.
+
+	* Project.ede ("common"): Update Version number
+
+	* cedet.el: Update Version Numbers.
+
+2005-03-24  David Ponce  <david@dponce.com>
+
+	* mode-local.el (activate-mode-local-bindings):
+	Fix call to `local-variable-p' for
+	XEmacs compatibility.
+
+2005-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el (find-function-regexp):
+	Modify it so that `find-function' can find
+	overloaded symbols.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/Makefile (VERSION): Updated version number
+
+	* cedet.el (cedet-version): Update version number.
+
+	* Makefile (VERSION): Update version number
+
+	* Project.ede ("common"): Update versin number.
+
+2005-01-10  David Ponce  <david@dponce.com>
+
+	* mode-local.el (activate-mode-local-bindings):
+	Return previous bindings of
+	buffer-local variables overridden by mode-local bindings.
+	(with-mode-local): Restore buffer-local bindings overridden by
+	mode-local bindings.
+
+2004-12-13  David Ponce  <david@dponce.com>
+
+	* working.el (working-noninteractive): Fixed definition.
+
+2004-11-29  David Ponce  <david@dponce.com>
+
+	* fame.el: (fame-valid-level-values)
+	(fame-display-choice): Accept 'temp-nolog and 'nolog.
+	(fame-level-widget, fame-channel-widget): Format change.
+	(fame-temp-message-internal): New function.
+	(fame-temp-message): Use it.
+	(fame-temp-message-nolog): New function.
+	(fame-send-functions-alist): New internal constant.
+	(fame-send): Use it.
+	(define-fame-channel): Accept a doc string. Fix generated doc
+	string.
+
+2004-11-25  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generate.
+
+	* Project.ede ("common"): Add fame.el to source.
+
+	* working.el (fame): Require.
+	(working-noninteractive): New function.
+	(working-message-echo): Use it and `fame-message-nolog'.
+	(working-message-emacs, working-message-xemacs): Remove.
+	(working-current-message): Alias of `fame-current-message'.
+	(working-temp-message): Alias of `fame-temp-message'.
+	(working-temp-message-timer, working-temp-message-delay)
+	(working-temp-restore-message): Remove.
+
+	* fame.el: New library.
+
+2004-09-08  David Ponce  <david@dponce.com>
+
+	* working.el (working-temp-restore-message):
+	Fix error when saved message text
+	contains percent characters.
+
+2004-07-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* mode-local.el: Updated Commentary.
+
+	* cedet.el: Update required version of semantic.
+
+2004-07-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/Makefile (VERSION): update to beta3
+	(Makefile): Regenerated
+
+	* Makefile (VERSION): Update to beta3
+
+	* Project.ede ("common"): Update version number.
+
+	* cedet.el (cedet-version): Updated to beta3
+
+2004-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (misc_AUX): New
+	(dist): Add misc_AUX
+
+	* Project.ede ("misc"): New target.
+
+2004-06-29  David Ponce  <david@dponce.com>
+
+	* working.el: New feature to display messages temporarily.
+
+	(working-temp-message-delay, working-temp-message-timer)
+	(working-temp-message-saved): New variables.
+	(working-temp-restore-message)
+	(working-temp-message): New functions.
+
+2004-06-24  David Ponce  <david@dponce.com>
+
+	* mode-local.el (mode-local-define-derived-mode-needed-p):
+	New function.
+	(define-derived-mode): Advice if the above returns non-nil.
+
+	(mode-local--init-mode): New variable.
+	(mode-local-initialized-p): New function.
+	(mode-local-post-major-mode-change): Use it.
+	(activate-mode-local-bindings): Register the major mode for which
+	bindings have been activated in current buffer.
+	(deactivate-mode-local-bindings): Unregister it.
+
+	* cedet.el:
+	Run every package setup after the `load-path' has been changed.
+
+2004-05-12  David Ponce  <david@dponce.com>
+
+	* mode-local.el (cl): Require at compile time.
+	(define-derived-mode): Advise to workaround a bug in XEmacs
+	implementation, which don't set the `derived-mode-parent'
+	property.
+
+2004-04-29  David Ponce  <david@dponce.com>
+
+	* icons/Makefile, Makefile: Rebuild.
+
+	* Project.ede ("common"): Add mode-local.el to source.
+
+2004-04-28  David Ponce  <david@dponce.com>
+
+	* mode-local.el: New file.
+
+2004-04-08  David Ponce  <david@dponce.com>
+
+	* pprint.el (pprint-nil): Remove.
+	(pprint-nil-as-list): New function.
+	(pprint-lambda, pprint-defun): Use it.
+	(pprint-let): Likewise.  Improve pretty-printing of let bindings.
+	(pprint-function): Fix error message.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Distribute the autoload file
+
+2004-03-28  David Ponce  <david@dponce.com>
+
+	* cedet.el (let): Revert previous change.
+
+2004-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-packages): Added cedet-contrib
+	(inline code): Allow both package-load and package to be loaded.
+
+2004-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-autogen.el (cedet-batch-update-autoloads):
+	When an error occurs, display both the
+	error message, and the more friendly usage message.
+
+2004-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet.el (cedet-version): Updated.
+
+	* icons/Makefile (VERSION): updated.
+
+	* Makefile (common_LISP): Added cedet-edebug.
+	(VERSION): Updated.
+	(all lisp compilation rules): updated EDE.
+
+	* Project.ede (version): Update to beta 2.
+
+	* Project.ede (common): Added cedet-edebug.el.
+
+	* cedet-edebug.el (eieio,semantic-tag): Removed these dependencies.
+	(cedet-edebug-prin1-extensions): Removed contents.
+	(cedet-edebug-rebuild-prin1): Change name of generated function.
+	(cedet-edebug-prin1-to-string): New fcn.
+	(cedet-edebug-add-print-override): New utility function.
+	(edebug-setup-hook): Add autoload cookie.
+
+2003-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Zajcev Evgeny:
+	(senator-try-expand-semantic): Better check for minibuffer in a window.
+
+2003-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-edebug.el: Extensions to edebug for projects in CEDET.
+
+2003-11-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-autogen.el, ezimage.el: Merged with cedet-1p0beta1 branch.
+
+2003-10-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/Makefile: EDE Makefile for icons.
+
+	* icons/Project.ede: EDE Project file for icons.
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Now a meta-subproject.
+
+	* Makefile (dist): Remove local creation of tar file.
+	(icons): New target
+	(all): add icons.
+
+2003-10-01  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generate.
+
+	* Project.ede (common): Add cedet-compat.el to target sources.
+
+	* cedet-compat.el: New file.
+
+2003-09-24  David Ponce  <david@dponce.com>
+
+	* cedet.el (cedet-packages): Update minimum version requirements.
+
+	* Makefile: Re-generate.
+
+	* Project.ede (common):
+	Add sformat.el and working.el to target sources.
+
+	* sformat.el, working.el: New file, moved from semantic.
+
+2003-09-23  David Ponce  <david@dponce.com>
+
+	* inversion.el (inversion-add-to-load-path):
+	INSTALLDIR actually specifies where
+	PACKAGE is installed.
+
+	* cedet.el (cedet-version): Change to 1.0beta1.
+	(cedet-packages): Add "cedet".
+
+	Handle package installed in a directory with a different name.
+
+	* Makefile, Project.ede, cedet-load.el: New file.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* cedet.el (cedet-packages):
+	No more need an explicit setup file to load.
+	Automatically require the PACKAGE-load feature.
+
+2003-09-08  David Ponce  <david@dponce.com>
+
+	* cedet.el (cl): Require at compile time.
+	(cedet-packages): Update versions.  Add autoloads setup.
+	(main let): Don't setq default-directory.  Use dolist.  load the
+	setup library, don't require it.  Don't stop if failed to load a setup
+	library.  Print an error message and continue.
+
+2003-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-version): Update current version.
+
+	* inversion.el (inversion-require, inversion-upgrade-package):
+	add autoload cookie.
+
+	* cedet-autogen.el (cedet-update-autoloads): Autoload cookie.
+
+2003-09-05  David Ponce  <david@dponce.com>
+
+	* cedet-autogen.el (cedet-update-autoloads):
+	Also accept an explicit list of
+	directories to scan for autoloads.
+
+2003-09-03  David Ponce  <david@dponce.com>
+
+	* cedet-autogen.el: New file.
+
+2003-08-06  David Ponce  <david@dponce.com>
+
+	* ezimage.el (defezimage):
+	Fix typo in definition that uses `make-glyph'.
+
+2003-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-version): set to 1.0
+
+2003-07-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ezimage.el (ezimage-insert-image-button-maybe):
+	Use when instead of if.
+	(ezimage-insert-over-text): Only do logic if images enabled.
+	(ezimage-image-over-string): New fcn.
+
+	* icons/bitsbang.xpm, icons/key.xpm, icons/lock.xpm, icons/unlock.xpm:
+	*** empty log message ***
+
+2003-07-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* icons/bits.xpm, icons/box-minus.xpm, icons/box-plus.xpm, icons/box.xpm, icons/checkmark.xpm, icons/dir-minus.xpm, icons/dir-plus.xpm, icons/dir.xpm, icons/doc-minus.xpm, icons/doc-plus.xpm, icons/doc.xpm, icons/info.xpm, icons/key.xpm, icons/label.xpm, icons/lock.xpm, icons/mail.xpm, icons/page-minus.xpm, icons/page-plus.xpm, icons/page.xpm, icons/tag-gt.xpm, icons/tag-minus.xpm, icons/tag-plus.xpm, icons/tag-type.xpm, icons/tag-v.xpm, icons/tag.xpm, icons/unlock.xpm:
+	*** empty log message ***
+
+	* ezimage.el: Image display code; extracted from speedbar.
+
+2003-03-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-package-version): Fixed output messages.
+
+2003-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-require): Make file argument optional.
+
+2003-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el (inversion-test): Fix typo.
+
+	* inversion.el (inversion-reverse-test): New function.
+
+	* inversion.el (inversion-unit-test):
+	New fcn built from previously inline code.
+
+2003-02-17  David Ponce  <david@dponce.com>
+
+	* pprint.el (pprint-defvar): Fixed.
+	(pprint-to-string): Escape left parenthesis at beginning of line
+	in strings.
+
+2003-01-28  David Ponce  <david@dponce.com>
+
+	* cedet.el: New file.
+
+	* inversion.el (inversion-add-to-load-path):
+	Don't change the `load-path' if the
+	package directory don't exist.
+
+2002-12-19  David Ponce  <david@dponce.com>
+
+	* inversion.el (inversion-find-version):
+	Use `locate-library' to avoid compatibility
+	problems.
+
+2002-12-13  David Ponce  <david@dponce.com>
+
+	* inversion.el (inversion-version): Changed to 1.0beta4.
+	(inversion-decoder-ring): Doc fix.
+	(inversion-recode): Implemented.
+	(inversion-check-version): New function.
+	(inversion-test): Use it.
+	(inversion-add-to-load-path): New function.
+
+2002-12-11  David Ponce  <david@dponce.com>
+
+	* inversion.el: (inversion-incompatible-version)
+	(inversion-test): Doc fix.
+	(inversion-find-data): New constant.
+	(inversion-find-version): New function.
+	(inversion-upgrade-package 'semantic): Commented out.
+
+2002-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el: Updated tesets.
+	(inversion-incompatible-version): Changed for testing
+	(inversion-<): Logic updates
+	(inversion-test): More tests
+	(inversion-require): Added DIRECTORY where new versions to be found.
+	(inversion-locate-package-files, inversion-locate-package-files-and-split)
+	(inversion-download-package-ask, inversion-upgrade-package): New functions.
+
+2002-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el: Update tests.
+
+	* inversion.el (inversion-test): Indentation issues.
+
+	* inversion.el (inversion-test): fixed typo.
+
+	* inversion.el: Added history.
+	Checkdoc fixes.
+
+	* inversion.el: Changed version number.
+
+2002-08-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* inversion.el: Version checking functionality.
+
+2002-03-11  David Ponce  <david@dponce.com>
+
+	* pprint.el (pprint-cond): New function.
+	(pprint-with): New function.
+	(pprint-setup-standard-printers): Use them to pretty print `cond' and
+	`with-...' forms.  Added pretty printing of `dotimes' and
+	`unwind-protect'.
+
+	* pprint.el (pprint-min-width): Moved before used.
+	(pprint-close-list): Ditto.  Deleted code commented out.
+
+2002-03-10  David Ponce  <david@dponce.com>
+
+	* pprint.el (pprint-sexp-try): Renamed from `pprint-sexp-width'.
+	(pprint-list): Use it.  Handle whole list.
+	(pprint-close-list): Commented out code that break line.
+	(pprint-sexp): Simplified.
+
+	* pprint.el (pprint-no-break-p):
+	Check that MOTIONS stay on the same line.
+	(pprint-close-list): Check for a newline instead of counting lines.
+	(pprint-min-width): Replaced `defconst' by `defvar'.
+	(pprint-to-string): Locally bind `inhibit-modification-hooks' to
+	non-nil.
+
+	* pprint.el: A flexible Elisp pretty-printer.  Initial revision.
+
diff --git a/site/cedet-1.0pre7/common/Makefile b/site/cedet-1.0pre7/common/Makefile
new file mode 100644
index 0000000..589562b
--- /dev/null
+++ b/site/cedet-1.0pre7/common/Makefile
@@ -0,0 +1,105 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+Doc_TEXINFOS=cedet.texi
+MAKEINFO=makeinfo
+misc_AUX=ChangeLog
+EMACS=emacs
+LOADPATH= ./
+LOADDEFS=cedet-loaddefs.el
+LOADDIRS=.
+init_LISP=cedet-load.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+setup_LISP=cedet.el
+common_LISP=cedet-autogen.el cedet-compat.el ezimage.el inversion.el pprint.el fame.el working.el cedet-edebug.el mode-local.el cedet-files.el pulse.el data-debug.el cedet-global.el cedet-idutils.el cedet-cscope.el cedet-graphviz.el
+tests_LISP=cedet-utests.el
+VERSION=1.0pre7
+DISTDIR=$(top)common-$(VERSION)
+
+
+
+all: cedet.info autoloads init setup common tests icons
+
+cedet.info: $(Doc_TEXINFOS)
+	$(MAKEINFO) $<
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: setup
+setup: $(setup_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: common
+common: $(common_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: tests
+tests: $(tests_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY:icons
+icons:
+	$(MAKE) -C icons
+
+tags: 
+	$(MAKE) -C icons/ $(MFLAGS) $@
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: cedet.info autoloads
+	mkdir $(DISTDIR)
+	cp $(Doc_TEXINFOS) cedet.info* $(misc_AUX) cedet-loaddefs.el $(init_LISP) $(setup_LISP) $(common_LISP) $(tests_LISP) $(ede_FILES) $(DISTDIR)
+	$(MAKE) -C icons $(MFLAGS) DISTDIR=$(DISTDIR)/icons dist
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/common/Project.ede b/site/cedet-1.0pre7/common/Project.ede
new file mode 100644
index 0000000..dbc66ab
--- /dev/null
+++ b/site/cedet-1.0pre7/common/Project.ede
@@ -0,0 +1,50 @@
+;; Object common
+;; EDE project file.
+(ede-proj-project "common"
+  :name "common"
+  :version "1.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-info "Doc"
+    :name "Doc"
+    :path ""
+    :source '("cedet.texi")
+    )
+   (ede-proj-target-aux "misc"
+    :name "misc"
+    :path ""
+    :source '("ChangeLog")
+    )
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "cedet-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("cedet-load.el")
+    )
+   (ede-proj-target-elisp "setup"
+    :name "setup"
+    :path ""
+    :source '("cedet.el")
+    :versionsource '("cedet.el")
+    )
+   (ede-proj-target-elisp "common"
+    :name "common"
+    :path ""
+    :source '("cedet-autogen.el" "cedet-compat.el" "ezimage.el" "inversion.el" "pprint.el" "fame.el" "working.el" "cedet-edebug.el" "mode-local.el" "cedet-files.el" "pulse.el" "data-debug.el" "cedet-global.el" "cedet-idutils.el" "cedet-cscope.el" "cedet-graphviz.el")
+    )
+   (ede-proj-target-elisp "tests"
+    :name "tests"
+    :path ""
+    :source '("cedet-utests.el")
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/"
+  :web-site-directory "/r@scp:shell.sourceforge.net:cedet/htdocs"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :configuration-variables 'nil
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/common/cedet-autogen.el b/site/cedet-1.0pre7/common/cedet-autogen.el
new file mode 100644
index 0000000..79a7536
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-autogen.el
@@ -0,0 +1,229 @@
+;;; cedet-autogen.el --- Generate autoloads for CEDET libraries
+
+;; Copyright (C) 2003, 2004, 2008 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Created: 22 Aug 2003
+;; Keywords: maint
+;; X-CVS: $Id: cedet-autogen.el,v 1.8 2008/07/03 02:06:19 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Automatically generate autoloads for CEDET libraries.
+;;
+
+;;; History:
+;;
+
+;;; Code:
+;;
+
+(require 'autoload)
+(eval-when-compile (require 'cl))
+
+;;; Compatibility
+(defun cedet-autogen-noninteractive ()
+  "Return non-nil if running non-interactively."
+  (if (featurep 'xemacs)
+      (noninteractive)
+    noninteractive))
+
+(if (fboundp 'keywordp)
+    (defalias 'cedet-autogen-keywordp 'keywordp)
+  (defun cedet-autogen-keywordp (object)
+    "Return t if OBJECT is a keyword.
+This means that it is a symbol with a print name beginning with `:'
+interned in the initial obarray."
+    (and (symbolp object)
+         (char-equal ?: (aref 0 (symbol-name object)))))
+  )
+
+(when (cedet-autogen-noninteractive)
+  ;; If the user is doing this non-interactively, we need to set up
+  ;; these conveniences.
+  (add-to-list 'load-path nil)
+  (setq find-file-hooks nil
+        find-file-suppress-same-file-warnings t)
+  )
+
+(defadvice make-autoload (before cedet-make-autoload activate)
+  "Extend `make-autoload' with support for particular CEDET forms.
+When a such form, like defclass, defmethod, etc., is recognized, it is
+replaced with side effect by an equivalent known form before calling
+the true `make-autoload' function."
+  (if (consp (ad-get-arg 0))
+      (let* ((form (ad-get-arg 0))
+	     (file (ad-get-arg 1))
+             (car (car-safe form))
+             name args doc
+             )
+        (cond
+         ((or (eq car 'define-overload)
+	      (eq car 'define-overloadable-function))
+          (setcar form 'defun)
+          )
+         ((eq car 'defmethod)
+          (setq name (nth 1 form)
+                args (nthcdr 2 form))
+          (if (cedet-autogen-keywordp (car args))
+              (setq args (cdr args)))
+          (setq doc  (nth 1 args)
+                args (car args))
+          (setcar form 'defun)
+          (setcdr form (list name args (if (stringp doc) doc)))
+          )
+         ((eq car 'defclass)
+          (setq name (nth 1 form)
+                args (nth 2 form)
+                doc  (nth 4 form))
+	  ;; @todo - use eieio-defclass-autoload instead.
+          ;(setcar form 'defun)
+          ;(setcdr form (list name args (if (stringp doc) doc)))
+	  (setcar form 'eieio-defclass-autoload)
+	  (setcdr form (list (list 'quote name) (list 'quote args) file doc))
+          ))
+        )))
+
+(defconst cedet-autogen-header
+  "Auto-generated CEDET autoloads"
+  "Header of the auto-generated autoloads file.")
+
+(defconst cedet-autogen-tagfile ".cedet-lisp"
+  "Dummy file that indicates to scan this directory for autoloads.")
+
+(defun cedet-autogen-kill-xemacs-autoloads-feature ()
+  "Remove Xemacs autoloads feature from this buffer."
+  (save-excursion
+    (goto-char (point-min))
+    (while (re-search-forward "(\\(featurep\\|provide\\) '\\sw+-autoloads" nil t)
+      (condition-case nil
+          (while t (up-list -1))
+        (error nil))
+      (kill-region (point) (save-excursion (forward-list) (point)))
+      )))
+
+(defun cedet-autogen-update-header ()
+  "Update header of the auto-generated autoloads file.
+Run as `write-contents-hooks'."
+  (when (string-equal generated-autoload-file (buffer-file-name))
+    (let ((tag (format ";;; %s ---" (file-name-nondirectory
+                                     (buffer-file-name)))))
+      (message "Updating header...")
+      (goto-char (point-min))
+      (cond
+       ;; Replace existing header line
+       ((re-search-forward (concat "^" (regexp-quote tag)) nil t)
+        (beginning-of-line)
+        (kill-line 1)
+        )
+       ;; Insert header before first ^L encountered (XEmacs)
+       ((re-search-forward "^" nil t)
+        (beginning-of-line)
+        ))
+      (insert tag " " cedet-autogen-header)
+      (newline)
+      (when (featurep 'xemacs)
+        (cedet-autogen-kill-xemacs-autoloads-feature))
+      (message "Updating header...done")
+      nil ;; Say not already written.
+      )))
+
+(defun cedet-autogen-subdirs (root-dir)
+  "Return autoload candidate sub directories of ROOT-DIR.
+That is, those where a `cedet-autogen-tagfile' file is found.
+Return a list of directory names, relative to ROOT-DIR."
+  (let (dirs)
+    (dolist (dir (directory-files default-directory))
+      (and (file-directory-p dir) (not (string-match dir "\\`..?\\'"))
+           (let* ((default-directory (expand-file-name dir))
+                  (subdirs (cedet-autogen-subdirs root-dir)))
+             (when (file-exists-p cedet-autogen-tagfile)
+               (push (file-relative-name default-directory root-dir)
+                     subdirs))
+             (setq dirs (nconc dirs subdirs)))))
+    dirs))
+
+(defun cedet-autogen-ensure-default-file (file)
+  "Make sure that the autoload file FILE exists and if not create it."
+  ;; If file don't exist, and is not automatically created...
+  (unless (or (file-exists-p file)
+              (fboundp 'autoload-ensure-default-file))
+    ;; Create a file buffer.
+    (find-file file)
+    ;; Use Unix EOLs, so that the file is portable to all platforms.
+    (setq buffer-file-coding-system 'raw-text-unix)
+    (unless (featurep 'xemacs)
+      ;; Insert a GNU Emacs loaddefs skeleton.
+      (insert ";;; " (file-name-nondirectory file)
+              " --- automatically extracted autoloads\n"
+              ";;\n"
+              ";;; Code:\n\n"
+              "\n;; Local" " Variables:\n"
+              ";; version-control: never\n"
+              ";; no-byte-compile: t\n"
+              ";; no-update-autoloads: t\n"
+              ";; End:\n"
+              ";;; " (file-name-nondirectory file)
+              " ends here\n"))
+    ;; Insert the header so that the buffer is not empty.
+    (cedet-autogen-update-header))
+  file)
+
+;;;###autoload
+(defun cedet-update-autoloads (loaddefs &optional directory &rest directories)
+  "Update autoloads in file LOADDEFS from sources.
+Optional argument DIRECTORY, specifies the directory to scan for
+autoloads.  It defaults to the current directory.
+DIRECTORIES is a list of extra directory to scan.  Those directory
+names are relative to DIRECTORY.  If DIRECTORIES is nil try to scan
+sub directories of DIRECTORY where a `cedet-autogen-tagfile' file
+exists."
+  (interactive "FLoaddefs file: \nDDirectory: ")
+  (let* ((generated-autoload-file (expand-file-name loaddefs))
+         (default-directory
+           (file-name-as-directory
+            (expand-file-name (or directory default-directory))))
+         (extra-dirs (or directories
+                         (cedet-autogen-subdirs default-directory)))
+         (write-contents-hooks '(cedet-autogen-update-header))
+         (command-line-args-left (cons default-directory extra-dirs))
+         )
+    (cedet-autogen-ensure-default-file generated-autoload-file)
+    (batch-update-autoloads)))
+
+(defun cedet-batch-update-autoloads ()
+  "Update autoloads in batch mode.
+Usage: emacs -batch -f cedet-batch-update-autoloads LOADDEFS [DIRECTORY]
+See the command `cedet-update-autoloads' for the meaning of the
+LOADDEFS and DIRECTORY arguments."
+  (unless (cedet-autogen-noninteractive)
+    (error "\
+`cedet-batch-update-autoloads' is to be used only with -batch"))
+  (condition-case err
+      (apply 'cedet-update-autoloads command-line-args-left)
+    (error
+     (error "%S\n\
+Usage: emacs -batch -f cedet-batch-update-autoloads LOADDEFS [DIRECTORY]"
+	    err))
+    ))
+
+(provide 'cedet-autogen)
+
+;;; cedet-autogen.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-compat.el b/site/cedet-1.0pre7/common/cedet-compat.el
new file mode 100644
index 0000000..dce5a95
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-compat.el
@@ -0,0 +1,200 @@
+;;; cedet-compat.el --- Compatibility across (X)Emacs versions
+
+;; Copyright (C) 2009, 2010 Eric M. Ludlam
+;; Copyright (C) 2004, 2008, 2010 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Keywords: compatibility
+;; X-RCS: $Id: cedet-compat.el,v 1.8 2010/02/19 22:43:21 zappo Exp $
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides functions to allow running CEDET packages on
+;; a variety of [X]Emacs versions.
+
+(require 'inversion)
+;;; Code:
+
+(when (not (fboundp 'compare-strings))
+
+;; XEmacs does not have the `compare-strings' function.  Here is an
+;; implementation in Emacs Lisp, derived from the C implementation
+;; found in src/fns.c, in GNU Emacs 21.3.1 sources.
+;;;###autoload
+(defun compare-strings (str1 start1 end1 str2 start2 end2 &optional ignore-case)
+  "Compare the contents of two strings.
+In string STR1, skip the first START1 characters and stop at END1.
+In string STR2, skip the first START2 characters and stop at END2.
+END1 and END2 default to the full lengths of the respective strings.
+
+Case is significant in this comparison if IGNORE-CASE is nil.
+
+The value is t if the strings (or specified portions) match.
+If string STR1 is less, the value is a negative number N;
+  - 1 - N is the number of characters that match at the beginning.
+If string STR1 is greater, the value is a positive number N;
+  N - 1 is the number of characters that match at the beginning."
+  (or start1 (setq start1 0))
+  (or start2 (setq start2 0))
+  (setq end1 (if end1
+                 (min end1 (length str1))
+               (length str1)))
+  (setq end2 (if end2
+                 (min end2 (length str2))
+               (length str2)))
+  (let ((i1 start1)
+        (i2 start2)
+        result c1 c2)
+    (while (and (not result) (< i1 end1) (< i2 end2))
+      (setq c1 (aref str1 i1)
+            c2 (aref str2 i2)
+            i1 (1+ i1)
+            i2 (1+ i2))
+      (if ignore-case
+          (setq c1 (upcase c1)
+                c2 (upcase c2)))
+      (setq result (cond ((< c1 c2) (- i1))
+                         ((> c1 c2) i1))))
+    (or result
+        (cond ((< i1 end1) (1+ (- i1 start1)))
+              ((< i2 end2) (1- (- start1 i1)))
+              (t)))
+    ))
+
+)
+
+(if (not (fboundp 'booleanp))
+
+;; XEmacs does not have booleanp, which is used as a :type specifier for
+;; some slots of some classes in EIEIO.  Define it here.
+;;;###autoload
+(defun boolean-p (bool)
+  "Return non-nil if BOOL is nil or t."
+  (or (null bool) (eq bool t)))
+
+)
+
+;; subst-char-in-string is not found on the XEmacs <= 21.4.  Provide
+;; here for compatibility.
+(if (not (fboundp 'subst-char-in-string))
+
+;;;###autoload    
+(defun subst-char-in-string (fromchar tochar string &optional inplace)
+  ;; From Emacs 21.3/lisp/subr.el
+  "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+  (let ((i (length string))
+	(newstr (if inplace string (copy-sequence string))))
+    (while (> i 0)
+      (setq i (1- i))
+      (if (eq (aref newstr i) fromchar)
+	  (aset newstr i tochar)))
+    newstr))
+
+)
+
+(defun cedet-split-string-1 (string &optional separators omit-nulls)
+  "Like `split-string' in Emacs 22 and later.
+STRING and SEPARATORS as with traditional `split-string' implementations.
+Third argument OMIT-NULLS omits any strings that are zero length.
+
+Copied verbatim from Emacs 23 CVS version subr.el."
+  (let ((keep-nulls (not (if separators omit-nulls t)))
+	(rexp (or separators split-string-default-separators))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< start (length string)))
+      (setq notfirst t)
+      (if (or keep-nulls (< start (match-beginning 0)))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (if (or keep-nulls (< start (length string)))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
+
+(when (not (fboundp 'find-coding-systems-region))
+;; XEmacs does not currently have `find-coding-systems-region'. Here
+;; is an emulation, which seems sufficient for CEDET's purposes.
+  (defun find-coding-systems-region (begin end)
+    "Mimic Emacs' find-coding-system-region for XEmacs.
+Return a coding system between BEGIN and END."
+    (if (stringp begin)
+	(if (equal (charsets-in-string begin) '(ascii))
+	    '(undecided)
+	  (delete-if-not
+	   #'(lambda (coding-system)
+	       ;; Assume strings are always short enough that the
+	       ;; condition-case is not worth it.
+	       (query-coding-string begin coding-system t))
+	 
+	   (remove-duplicates
+	    (append
+	     (get-language-info current-language-environment 'coding-system)
+	     (mapcar #'coding-system-name (coding-system-list)))
+	    :test #'eq :from-end t)))
+      (if (equal (charsets-in-region begin end) '(ascii))
+	  '(undecided)
+	(delete-if-not
+	 #'(lambda (coding-system)
+	     (condition-case nil
+		 (query-coding-region begin end coding-system nil t t)
+	       (text-conversion-error)))
+	 (remove-duplicates
+	  (append
+	   (get-language-info current-language-environment 'coding-system)
+	   (mapcar #'coding-system-name (coding-system-list)))
+	  :test #'eq :from-end t)))))
+  )
+
+
+;;;###autoload
+(if (or (featurep 'xemacs) (inversion-test 'emacs "22.0"))
+    ;; For XEmacs, or older Emacs, we need a new split string.
+    (defalias 'cedet-split-string 'cedet-split-string-1)
+  ;; For newer emacs, then the cedet-split-string is the same
+  ;; as the built-in one.
+  (defalias 'cedet-split-string 'split-string))
+
+
+;;;###autoload
+(when (not (fboundp 'with-no-warnings))
+  (put 'with-no-warnings 'lisp-indent-function 0)
+  (defun with-no-warnings (&rest body)
+    "Copied from `with-no-warnings' in Emacs 23.
+Like `progn', but prevents compiler warnings in the body.
+Note: Doesn't work if this version is being loaded."
+    ;; The implementation for the interpreter is basically trivial.
+    (car (last body))))
+
+
+(provide 'cedet-compat)
+
+;;; cedet-compat.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-cscope.el b/site/cedet-1.0pre7/common/cedet-cscope.el
new file mode 100644
index 0000000..0efd2fb
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-cscope.el
@@ -0,0 +1,160 @@
+;;; cedet-cscope.el --- CScope support for CEDET
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-cscope.el,v 1.2 2009/05/30 13:38:28 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Support using CScope for symbol lookups.
+
+(require 'inversion)
+
+(defvar cedet-cscope-min-version "16.0"
+  "Minimum version of GNU global required.")
+
+;;;###autoload
+(defcustom cedet-cscope-command "cscope"
+  "Command name for the CScope executable."
+  :type 'string
+  :group 'cedet)
+
+;;; Code:
+;;;###autoload
+(defun cedet-cscope-search (searchtext texttype type scope)
+  "Perform a search with CScope, return the created buffer.
+SEARCHTEXT is text to find.
+TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
+'tagregexp, or 'tagcompletions.
+TYPE is the type of search, meaning that SEARCHTEXT is compared to
+filename, tagname (tags table), references (uses of a tag) , or
+symbol (uses of something not in the tag table.)
+SCOPE is the scope of the search, such as 'project or 'subdirs."
+  ;; CScope is an interactive program.  It uses number flags
+  ;; in order to perform command line searches.  Useful for this
+  ;; tool are:
+  ;;
+  ;; -0 = Find C symbol
+  ;; -1 = Find global definition
+  ;; -3 = Find references
+  ;; -6 = Find egrep pattern
+  ;; -7 = Find file
+  (let ((idx (cond ((eq type 'file)
+		    "-7")
+		   ;; Non files are symbols and such
+		   ((eq texttype 'tagname)
+		    "-1")
+		   ((eq texttype 'tagregexp)
+		    "-0")
+		   ((eq texttype 'tagcompletions)
+		    (setq searchtext (concat "^" searchtext ".*"))
+		    "-1")
+		   ((eq texttype 'regexp)
+		    "-5")
+		   (t
+		    "-3")
+		   )
+	     )
+	)
+    (cedet-cscope-call (list "-d" "-L" idx searchtext))))
+
+(defun cedet-cscope-call (flags)
+  "Call CScope with the list of FLAGS."
+  (let ((b (get-buffer-create "*CEDET CScope*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-cscope-command
+	   nil b nil
+	   flags)
+    b))
+
+
+;;;###autoload
+(defun cedet-cscope-expand-filename (filename)
+  "Expand the FILENAME with CScope.
+Return a fully qualified filename."
+  (interactive "sFile: ")
+  (let* ((ans1 (save-excursion
+		 (set-buffer (cedet-cscope-call (list "-d" "-L" "-7" filename)))
+		 (goto-char (point-min))
+		 (if (looking-at "[^ \n]*cscope: ")
+		     (error "CScope not available")
+		   (split-string (buffer-string) "\n" t))))
+	 (ans2 (mapcar (lambda (hit)
+			 (expand-file-name (car (split-string hit " "))))
+		       ans1)))
+    (when (interactive-p)
+      (if ans2
+	  (if (= (length ans2) 1)
+	      (message "%s" (car ans2))
+	    (message "%s + %d others" (car ans2)
+		     (length (cdr ans2))))
+	(error "No file found")))
+    ans2))
+
+(defun cedet-cscope-support-for-directory (&optional dir)
+  "Return non-nil if CScope has a support file for DIR.
+If DIR is not supplied, use the current default directory.
+This works by running cscope on a bogus symbol, and looking for
+the error code."
+  (save-excursion
+    (let ((default-directory (or dir default-directory)))
+      (set-buffer (cedet-cscope-call (list "-d" "-L" "-7" "moose")))
+      (goto-char (point-min))
+      (if (looking-at "[^ \n]*cscope: ")
+	  nil
+	t))))
+
+;;;###autoload
+(defun cedet-cscope-version-check (&optional noerror)
+  "Check the version of the installed CScope command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil."
+  (interactive)
+  (let ((b (condition-case nil
+	       (cedet-cscope-call (list "-V"))
+	     (error nil)))
+	(rev nil))
+    (if (not b)
+	(progn
+	  (when (interactive-p)
+	    (message "CScope not found."))
+	  nil)
+      (save-excursion
+	(set-buffer b)
+	(goto-char (point-min))
+	(re-search-forward "cscope: version \\([0-9.]+\\)" nil t)
+	(setq rev (match-string 1))
+	(if (inversion-check-version rev nil cedet-cscope-min-version)
+	    (if noerror
+		nil
+	      (error "Version of CScope is %s.  Need at least %s"
+		     rev cedet-cscope-min-version))
+	  ;; Else, return TRUE, as in good enough.
+	  (when (interactive-p)
+	    (message "CScope %s  - Good enough for CEDET." rev))
+	  t)))))
+
+(provide 'cedet-cscope)
+;;; cedet-cscope.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-edebug.el b/site/cedet-1.0pre7/common/cedet-edebug.el
new file mode 100644
index 0000000..a6b8ad9
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-edebug.el
@@ -0,0 +1,133 @@
+;;; cedet-edebug.el --- Special EDEBUG augmentation code
+
+;;;
+;; Copyright (C) 2003, 2004, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, you can either send email to this
+;; program's author (see below) or write to:
+;;
+;;              The Free Software Foundation, Inc.
+;;              675 Mass Ave.
+;;              Cambridge, MA 02139, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;; Some aspects of EDEBUG are not extensible.  It is possible to extend
+;; edebug through other means, such as alias or advice, but those don't stack
+;; very well when there are multiple tools trying to do the same sort of thing.
+;;
+;; This package provides a way to extend some aspects of edebug, such as value
+;; printing.
+
+(eval-when-compile
+  (require 'edebug)
+  (require 'debug)
+  )
+
+;;; Code:
+(defvar cedet-edebug-prin1-extensions nil
+  "An alist of of code that can extend PRIN1 for edebug.
+Each entry has the value: (CONDITION . PRIN1COMMAND).")
+
+(defun cedet-edebug-prin1-recurse (object)
+  "Recurse into OBJECT for prin1 on `cedet-edebug-prin1-to-string'."
+  (concat "(" (mapconcat 'cedet-edebug-prin1-to-string object " ") ")"))
+
+(defun cedet-edebug-rebuild-prin1 ()
+  "Rebuild the function `cedet-edebug-prin1-to-string'.
+Use the values of `cedet-edebug-prin1-extensions' as the means of
+constructing the function."
+  (interactive)
+  (let ((c cedet-edebug-prin1-extensions)
+	(code nil))
+    (while c
+      (setq code (append (list (list (car (car c))
+				     (cdr (car c))))
+			 code))
+      (setq c (cdr c)))
+    (fset 'cedet-edebug-prin1-to-string-inner
+	  `(lambda (object &optional noescape)
+	     "Display eieio OBJECT in fancy format.  Overrides the edebug default.
+Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
+	     (cond
+	      ,@(nreverse code)
+	      (t (prin1-to-string object noescape)))))
+    ))
+
+(defun cedet-edebug-prin1-to-string (object &optional noescape)
+  "CEDET version of `edebug-prin1-to-string' that adds specialty
+print methods for very large complex objects."
+  (if (not (fboundp 'cedet-edebug-prin1-to-string-inner))
+      ;; Recreate the official fcn now.
+      (cedet-edebug-rebuild-prin1))
+
+  ;; Call the auto-generated version.
+  ;; This is not going to be available at compile time.
+  (with-no-warnings
+    (cedet-edebug-prin1-to-string-inner object noescape)))
+
+
+(defun cedet-edebug-add-print-override (testfcn printfcn)
+  "Add a new EDEBUG print override.
+TESTFCN is a routine that returns nil if the first argument
+passed to it is not to use PRINTFCN.
+PRINTFCN accepts an object identified by TESTFCN and
+returns a string.
+New tests are always added to the END of the list of tests.
+See `cedet-edebug-prin1-extensions' for the official list."
+  (condition-case nil
+      (add-to-list 'cedet-edebug-prin1-extensions
+		   (cons testfcn printfcn)
+		   t)
+    (error ;; That failed, it must be an older version of Emacs
+     ;; withouth the append argument for `add-to-list'
+     ;; Doesn't handle the don't add twice case, but that's a
+     ;; development thing and developers probably use new emacsen.
+     (setq cedet-edebug-prin1-extensions
+	   (append cedet-edebug-prin1-extensions
+		   (list (cons testfcn printfcn))))))
+  ;; whack the old implementation to force a rebuild.
+  (fmakunbound 'cedet-edebug-prin1-to-string-inner))
+
+;;; NOTE TO SELF.  Make this system used as an extension
+;;; and then autoload the below.
+;;;###autoload
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (require 'cedet-edebug)
+	    ;; I suspect this isn't the best way to do this, but when
+	    ;; cust-print was used on my system all my objects
+	    ;; appeared as "#1 =" which was not useful.  This allows
+	    ;; edebug to print my objects in the nice way they were
+	    ;; meant to with `object-print' and `class-name'
+	    (defalias 'edebug-prin1-to-string 'cedet-edebug-prin1-to-string)
+	    ;; Add a fancy binding into EDEBUG's keymap for ADEBUG.
+	    (define-key edebug-mode-map "A" 'data-debug-edebug-expr)
+	    ))
+
+;;; DEBUG MODE TOO
+;; This seems like as good a place as any to stick this hack.
+;;;###autoload
+(add-hook 'debugger-mode-hook
+	  (lambda ()
+	    (require 'cedet-edebug)
+	    ;; Add a fancy binding into the debug mode map for ADEBUG.
+	    (define-key debugger-mode-map "A" 'data-debug-edebug-expr)
+	    ))
+
+(provide 'cedet-edebug)
+
+;;; cedet-edebug.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-files.el b/site/cedet-1.0pre7/common/cedet-files.el
new file mode 100644
index 0000000..139457a
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-files.el
@@ -0,0 +1,211 @@
+;;; cedet-files.el --- Common routines dealing with file names.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-files.el,v 1.5 2009/09/12 00:01:50 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Various useful routines for dealing with file names in the tools
+;; which are a part of CEDET.
+
+;;; Code:
+(defvar cedet-dir-sep-char (if (boundp 'directory-sep-char)
+			       (symbol-value 'directory-sep-char)
+			     ?/)
+  "Character used for directory separation.
+Obsoleted in some versions of Emacs.  Needed in others.")
+
+
+(defun cedet-directory-name-to-file-name (referencedir &optional testmode)
+  "Convert the REFERENCEDIR (a full path name) into a filename.
+Converts directory seperation characters into ! characters.
+Optional argument TESTMODE is used by tests to avoid conversion
+to the file's truename, and dodging platform tricks."
+  (let ((file referencedir)
+	dir-sep-string)
+    ;; Expand to full file name
+    (when (not testmode)
+      (setq file (file-truename file)))
+    ;; If FILE is a directory, then force it to end in /.
+    (when (file-directory-p file)
+      (setq file (file-name-as-directory file)))
+    ;; Handle Windows Special cases
+    (when (or (memq system-type '(windows-nt ms-dos)) testmode)
+      ;; Replace any invalid file-name characters (for the
+      ;; case of backing up remote files).
+      (when (not testmode)
+	(setq file (expand-file-name (convert-standard-filename file))))
+      (setq dir-sep-string (char-to-string cedet-dir-sep-char))
+      ;; Normalize DOSish file names: convert all slashes to
+      ;; directory-sep-char, downcase the drive letter, if any,
+      ;; and replace the leading "x:" with "/drive_x".
+      (if (eq (aref file 1) ?:)
+	  (setq file (concat dir-sep-string
+			     "drive_"
+			     (char-to-string (downcase (aref file 0)))
+			     (if (eq (aref file 2) cedet-dir-sep-char)
+				 ""
+			       dir-sep-string)
+			     (substring file 2)))))
+    ;; Make the name unique by substituting directory
+    ;; separators.  It may not really be worth bothering about
+    ;; doubling `!'s in the original name...
+    (setq file (subst-char-in-string
+		cedet-dir-sep-char ?!
+		(replace-regexp-in-string "!" "!!" file)))
+    file))
+
+(defun cedet-file-name-to-directory-name (referencefile &optional testmode)
+  "Reverse the process of `cedet-directory-name-to-file-name'.
+Convert REFERENCEFILE to a directory name replacing ! with /.
+Optional TESTMODE is used in tests to avoid doing some platform
+specific conversions during tests."
+  (let ((file referencefile))
+    ;; Replace the ! with /
+    (setq file (subst-char-in-string ?! ?/ file))
+    ;; Occurances of // meant there was once a single !.
+    (setq file (replace-regexp-in-string "//" "!" file))
+
+    ;; Handle Windows special cases
+    (when (or (memq system-type '(windows-nt ms-dos)) testmode)
+
+      ;; Handle drive letters from DOSish file names.
+      (when (string-match "^/drive_\\([a-z]\\)/" file)
+	(let ((driveletter (match-string 1 file))
+	      )
+	  (setq file (concat driveletter ":"
+			     (substring file (match-end 1))))))
+
+      ;; Handle the \\file\name nomenclature on some windows boxes.
+      (when (string-match "^!" file)
+	(setq file (concat "//" (substring file 1))))
+      )
+
+    file))
+
+;;; Tests
+;;
+(defvar cedet-files-utest-list
+  '(
+    ( "/home/me/src/myproj/src/foo.c" . "!home!me!src!myproj!src!foo.c" )
+    ( "c:/work/myproj/foo.el" . "!drive_c!work!myproj!foo.el" )
+    ( "//windows/proj/foo.java" . "!!windows!proj!foo.java" )
+    ( "/home/me/proj!bang/foo.c" . "!home!me!proj!!bang!foo.c" )
+    )
+  "List of different file names to test.
+Each entry is a cons cell of ( FNAME . CONVERTED )
+where FNAME is some file name, and CONVERTED is what it should be
+converted into.")
+
+;;;###autoload
+(defun cedet-files-utest ()
+  "Test out some file name conversions."
+  (interactive)
+
+  (let ((idx 0))
+    (dolist (FT cedet-files-utest-list)
+
+      (setq idx (+ idx 1))
+
+      (let ((dir->file (cedet-directory-name-to-file-name (car FT) t))
+	    (file->dir (cedet-file-name-to-directory-name (cdr FT) t))
+	    )
+
+	(unless (string= (cdr FT) dir->file)
+	  (error "Failed: %d.  Found: %S Wanted: %S"
+		 idx dir->file (cdr FT))
+	  )
+
+	(unless (string= file->dir (car FT))
+	  (error "Failed: %d.  Found: %S Wanted: %S"
+		 idx file->dir (car FT))
+	  )
+
+	))))
+
+
+;;; Compatibility
+;;
+;; replace-regexp-in-string is in subr.el in Emacs 21.  Provide
+;; here for compatibility.
+
+(when (not (fboundp 'replace-regexp-in-string))
+
+(defun replace-regexp-in-string (regexp rep string &optional
+					fixedcase literal subexp start)
+  "Replace all matches for REGEXP with REP in STRING.
+
+Return a new string containing the replacements.
+
+Optional arguments FIXEDCASE, LITERAL and SUBEXP are like the
+arguments with the same names of function `replace-match'.  If START
+is non-nil, start replacements at that index in STRING.
+
+REP is either a string used as the NEWTEXT arg of `replace-match' or a
+function.  If it is a function it is applied to each match to generate
+the replacement passed to `replace-match'; the match-data at this
+point are such that match 0 is the function's argument.
+
+To replace only the first match (if any), make REGEXP match up to \\'
+and replace a sub-expression, e.g.
+  (replace-regexp-in-string \"\\(foo\\).*\\'\" \"bar\" \" foo foo\" nil nil 1)
+    => \" bar foo\""
+
+  ;; To avoid excessive consing from multiple matches in long strings,
+  ;; don't just call `replace-match' continually.  Walk down the
+  ;; string looking for matches of REGEXP and building up a (reversed)
+  ;; list MATCHES.  This comprises segments of STRING which weren't
+  ;; matched interspersed with replacements for segments that were.
+  ;; [For a `large' number of replacements it's more efficient to
+  ;; operate in a temporary buffer; we can't tell from the function's
+  ;; args whether to choose the buffer-based implementation, though it
+  ;; might be reasonable to do so for long enough STRING.]
+  (let ((l (length string))
+	(start (or start 0))
+	matches str mb me)
+    (save-match-data
+      (while (and (< start l) (string-match regexp string start))
+	(setq mb (match-beginning 0)
+	      me (match-end 0))
+	;; If we matched the empty string, make sure we advance by one char
+	(when (= me mb) (setq me (min l (1+ mb))))
+	;; Generate a replacement for the matched substring.
+	;; Operate only on the substring to minimize string consing.
+	;; Set up match data for the substring for replacement;
+	;; presumably this is likely to be faster than munging the
+	;; match data directly in Lisp.
+	(string-match regexp (setq str (substring string mb me)))
+	(setq matches
+	      (cons (replace-match (if (stringp rep)
+				       rep
+				     (funcall rep (match-string 0 str)))
+				   fixedcase literal str subexp)
+		    (cons (substring string start mb) ; unmatched prefix
+			  matches)))
+	(setq start me))
+      ;; Reconstruct a string from the pieces.
+      (setq matches (cons (substring string start l) matches)) ; leftover
+      (apply #'concat (nreverse matches)))))
+
+)
+
+(provide 'cedet-files)
+
+;;; cedet-files.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-global.el b/site/cedet-1.0pre7/common/cedet-global.el
new file mode 100644
index 0000000..12954d6
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-global.el
@@ -0,0 +1,170 @@
+;;; cedet-global.el --- GNU Global support for CEDET.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-global.el,v 1.7 2009/05/30 13:39:15 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Basic support for calling GNU Global, and testing version numbers.
+
+(require 'inversion)
+
+(defvar cedet-global-min-version "5.0"
+  "Minimum version of GNU global required.")
+
+;;;###autoload
+(defcustom cedet-global-command "global"
+  "Command name for the GNU Global executable."
+  :type 'string
+  :group 'cedet)
+
+;;; Code:
+;;;###autoload
+(defun cedet-gnu-global-search (searchtext texttype type scope)
+  "Perform a search with GNU Global, return the created buffer.
+SEARCHTEXT is text to find.
+TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
+'tagregexp, or 'tagcompletions.
+TYPE is the type of search, meaning that SEARCHTEXT is compared to
+filename, tagname (tags table), references (uses of a tag) , or
+symbol (uses of something not in the tag table.)
+SCOPE is the scope of the search, such as 'project or 'subdirs."
+  (let ((flgs (cond ((eq type 'file)
+		     "-a")
+		    (t "-xa")))
+	(scopeflgs (cond
+		    ((eq scope 'project)
+		     ""
+		     )
+		    ((eq scope 'target)
+		     "l")))
+	(stflag (cond ((or (eq texttype 'tagname)
+			   (eq texttype 'tagregexp))
+		       "")
+		      ((eq texttype 'tagcompletions)
+		       "c")
+		      ((eq texttype 'regexp)
+		       "g")
+		      (t "r")))
+	)
+    (cedet-gnu-global-call (list (concat flgs scopeflgs stflag)
+				 searchtext))))
+
+(defun cedet-gnu-global-call (flags)
+  "Call GNU Global with the list of FLAGS."
+  (let ((b (get-buffer-create "*CEDET Global*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-global-command
+	   nil b nil
+	   flags)
+    b))
+
+;;;###autoload
+(defun cedet-gnu-global-expand-filename (filename)
+  "Expand the FILENAME with GNU Global.
+Return a fully qualified filename."
+  (interactive "sFile: ")
+  (let ((ans (save-excursion
+	       (set-buffer (cedet-gnu-global-call (list "-Pa" filename)))
+	       (goto-char (point-min))
+	       (if (looking-at "global: ")
+		   (error "GNU Global not available")
+		 (split-string (buffer-string) "\n" t)))))
+    (when (interactive-p)
+      (if ans
+	  (if (= (length ans) 1)
+	      (message "%s" (car ans))
+	    (message "%s + %d others" (car ans)
+		     (length (cdr ans))))
+	(error "No file found")))
+    ans))
+
+;;;###autoload
+(defun cedet-gnu-global-show-root ()
+  "Show the root of a GNU Global area under the current buffer."
+  (interactive)
+  (message "%s" (cedet-gnu-global-root)))
+
+;;;###autoload
+(defun cedet-gnu-global-root (&optional dir)
+  "Return the root of any GNU Global scanned project.
+If a default starting DIR is not specified, the current buffer's
+`default-directory' is used."
+  (let ((default-directory (or dir default-directory))
+	)
+    (save-excursion
+      (set-buffer (cedet-gnu-global-call (list "-pq")))
+      (goto-char (point-min))
+      (when (not (eobp))
+	(file-name-as-directory
+	 (buffer-substring (point) (point-at-eol)))))))
+
+;;;###autoload
+(defun cedet-gnu-global-version-check (&optional noerror)
+  "Check the version of the installed GNU Global command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil."
+  (interactive)
+  (let ((b (condition-case nil
+	       (cedet-gnu-global-call (list "--version"))
+	     (error nil)))
+	(rev nil))
+    (if (not b)
+	(progn
+	  (when (interactive-p)
+	    (message "GNU Global not found."))
+	  nil)
+      (save-excursion
+	(set-buffer b)
+	(goto-char (point-min))
+	(re-search-forward "GNU GLOBAL \\([0-9.]+\\)" nil t)
+	(setq rev (match-string 1))
+	(if (inversion-check-version rev nil cedet-global-min-version)
+	    (if noerror
+		nil
+	      (error "Version of GNU Global is %s.  Need at least %s"
+		     rev cedet-global-min-version))
+	  ;; Else, return TRUE, as in good enough.
+	  (when (interactive-p)
+	    (message "GNU Global %s  - Good enough for CEDET." rev))
+	  t)))))
+
+(defun cedet-gnu-global-scan-hits (buffer)
+  "Scan all the hits from the GNU Global output BUFFER."
+  (let ((hits nil)
+	(r1 "^\\([^ ]+\\) +\\([0-9]+\\) \\([^ ]+\\) "))
+    (save-excursion
+      (set-buffer buffer)
+      (goto-char (point-min))
+      (while (re-search-forward r1 nil t)
+	(setq hits (cons (cons (string-to-number (match-string 2))
+			       (match-string 3))
+			 hits)))
+      ;; Return the results
+      (nreverse hits))))
+
+(provide 'cedet-global)
+;;; cedet-global.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-graphviz.el b/site/cedet-1.0pre7/common/cedet-graphviz.el
new file mode 100644
index 0000000..80d8b79
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-graphviz.el
@@ -0,0 +1,117 @@
+;;; cedet-graphviz.el --- Support for running graphviz programs for CEDET.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-graphviz.el,v 1.6 2009/04/09 02:10:06 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; COGRE uses graphviz to export to some kinds of image formats.
+;;
+;; This file supports running various graphviz programs, such as dot.
+
+;;; Code:
+
+(require 'inversion)
+
+(defvar cedet-graphviz-min-version "2.8"
+  "Minimum version of Graphviz DOT program required.")
+
+;;;###autoload
+(defcustom cedet-graphviz-dot-command "dot"
+  "Command name for the Graphviz DOT executable."
+  :type 'string
+  :group 'cedet)
+
+;;;###autoload
+(defcustom cedet-graphviz-neato-command "neato"
+  "Command name for the Graphviz NEATO executable."
+  :type 'string
+  :group 'cedet)
+
+(defun cedet-graphviz-dot-call (flags)
+  "Call Graphviz DOT with the list of FLAGS."
+  (let ((b (get-buffer-create "*CEDET graphviz dot*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-graphviz-dot-command
+	   nil b nil flags)
+    b))
+
+(defun cedet-graphviz-neato-call (flags)
+  "Call Graphviz DOT with the list of FLAGS."
+  (let ((b (get-buffer-create "*CEDET graphviz neato*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-graphviz-neato-command
+	   nil b nil flags)
+    b))
+
+(defun cedet-graphviz-translate-file (bufferin fileout &optional outputformat &rest flags)
+  "Translate BUFFERIN to FILEOUT with OUTPUTFORMAT.
+If FILEOUT is nil, then the output of neato is the translation.
+The OUTPUTFORMAT is one of the dot names for an output, such as png.
+The -T is appended in this function.  If OUTPUTFORMAT is not supplied, then
+ps is assumed.
+The rest of the argument FLAGS are more flags to pass to dot."
+  (let* ((T (or outputformat "ps"))
+	 (infile (buffer-file-name bufferin))
+	 (allflags (append flags
+			   (list (concat "-T" T))
+			   (if fileout (list (concat "-o" fileout)))
+			   (list infile))
+		   ))
+    (if (member "-n" flags)
+	(cedet-graphviz-neato-call allflags)
+      (cedet-graphviz-dot-call allflags))))
+
+;;;###autoload
+(defun cedet-graphviz-dot-version-check (&optional noerror)
+  "Check the version of the installed Graphviz dot command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil."
+  (interactive)
+  (let ((b (cedet-graphviz-dot-call (list "-V")))
+	(rev nil))
+    (save-excursion
+      (set-buffer b)
+      (goto-char (point-min))
+      (re-search-forward "dot \\(?:- graphviz \\)?version \\([0-9.]+\\)" nil t)
+      (setq rev (match-string 1))
+      (if (inversion-check-version rev nil cedet-graphviz-min-version)
+	  (if noerror
+	      nil
+	    (error "Version of Graphviz 'dot' is %s.  Need at least %s"
+		   rev cedet-graphviz-min-version))
+	;; Else, return TRUE, as in good enough.
+	(when (interactive-p)
+	  (message "Graphviz Version %s  - Good enough for CEDET." rev))
+	t))))
+
+(provide 'cedet-graphviz)
+;;; cedet-graphviz.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-idutils.el b/site/cedet-1.0pre7/common/cedet-idutils.el
new file mode 100644
index 0000000..2196fb7
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-idutils.el
@@ -0,0 +1,182 @@
+;;; cedet-idutils.el --- ID Utils support for CEDET.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-idutils.el,v 1.2 2009/05/30 13:33:45 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Basic support calling ID Utils functions, and checking version
+;; numbers.
+
+(require 'inversion)
+
+(defvar cedet-idutils-min-version "4.0"
+  "Minimum version of ID Utils required.")
+
+;;;###autoload
+(defcustom cedet-idutils-file-command "fnid"
+  "Command name for the ID Utils executable for searching file names."
+  :type 'string
+  :group 'cedet)
+
+;;;###autoload
+(defcustom cedet-idutils-token-command "lid"
+  "Command name for the ID Utils executable for searching for tokens."
+  :type 'string
+  :group 'cedet)
+
+;;; Code:
+(defun cedet-idutils-search (searchtext texttype type scope)
+  "Perform a search with IDUtils, return the created buffer.
+SEARCHTEXT is text to find.
+TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
+'tagregexp, or 'tagcompletions.
+TYPE is the type of search, meaning that SEARCHTEXT is compared to
+filename, tagname (tags table), references (uses of a tag) , or
+symbol (uses of something not in the tag table.)
+SCOPE is the scope of the search, such as 'project or 'subdirs.
+Note: Scope is not yet supported."
+  (if (eq type 'file)
+      ;; Calls for file stuff is very simple.
+      (cedet-idutils-fnid-call (list searchtext))
+    ;; Calls for text searches is more complex.
+    (let* ((resultflg (if (eq texttype 'tagcompletions)
+			  (list "--key=token")
+			(list "--result=grep")))
+	   (scopeflgs nil) ; (cond ((eq scope 'project) "" ) ((eq scope 'target) "l")))
+	   (stflag (cond ((or (eq texttype 'tagname)
+			      (eq texttype 'tagregexp))
+			  (list "-r" "-w"))
+			 ((eq texttype 'tagcompletions)
+			  ;; Add regex to search text for beginning of char.
+			  (setq searchtext (concat "^" searchtext))
+			  (list "-r" "-s" ))
+			 ((eq texttype 'regexp)
+			  (list "-r"))
+			 ;; t means 'symbol
+			 (t (list "-l" "-w"))))
+	   )
+      (cedet-idutils-lid-call (append resultflg scopeflgs stflag (list searchtext))))
+    ))
+
+(defun cedet-idutils-fnid-call (flags)
+  "Call ID Utils fnid with the list of FLAGS.
+Return the created buffer with with program output."
+  (let ((b (get-buffer-create "*CEDET fnid*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-idutils-file-command
+	   nil b nil
+	   flags)
+    b))
+
+(defun cedet-idutils-lid-call (flags)
+  "Call ID Utils lid with the list of FLAGS.
+Return the created buffer with with program output."
+  (let ((b (get-buffer-create "*CEDET lid*"))
+	(cd default-directory)
+	)
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-idutils-token-command
+	   nil b nil
+	   flags)
+    b))
+
+;;; UTIL CALLS
+;;
+;;;###autoload
+(defun cedet-idutils-expand-filename (filename)
+  "Expand the FILENAME with IDUtils.
+Return a filename relative to the default directory."
+  (interactive "sFile: ")
+  (let ((ans (save-excursion
+	       (set-buffer (cedet-idutils-fnid-call (list filename)))
+	       (goto-char (point-min))
+	       (if (looking-at "[^ \n]*fnid: ")
+		   (error "ID Utils not available")
+		 (split-string (buffer-string) "\n" t)))))
+    (setq ans (mapcar 'expand-file-name ans))
+    (when (interactive-p)
+      (if ans
+	  (if (= (length ans) 1)
+	      (message "%s" (car ans))
+	    (message "%s + %d others" (car ans)
+		     (length (cdr ans))))
+	(error "No file found")))
+    ans))
+
+(defun cedet-idutils-support-for-directory (&optional dir)
+  "Return non-nil if IDUtils has a support file for DIR.
+If DIR is not supplied, use the current default directory.
+This works by running lid on a bogus symbol, and looking for
+the error code."
+  (save-excursion
+    (let ((default-directory (or dir default-directory)))
+      (condition-case nil
+	  (progn
+	    (set-buffer (cedet-idutils-fnid-call '("moose")))
+	    (goto-char (point-min))
+	    (if (looking-at "[^ \n]*fnid: ")
+		nil
+	      t))
+	(error nil)))))
+
+;;;###autoload
+(defun cedet-idutils-version-check (&optional noerror)
+  "Check the version of the installed ID Utils command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil."
+  (interactive)
+  (let ((b (condition-case nil
+	       (cedet-idutils-fnid-call (list "--version"))
+	     (error nil)))
+	(rev nil))
+    (if (not b)
+	(progn
+	  (when (interactive-p)
+	    (message "ID Utils not found."))
+	  nil)
+      (save-excursion
+	(set-buffer b)
+	(goto-char (point-min))
+	(re-search-forward "fnid - \\([0-9.]+\\)" nil t)
+	(setq rev (match-string 1))
+	(if (inversion-check-version rev nil cedet-idutils-min-version)
+	    (if noerror
+		nil
+	      (error "Version of ID Utis is %s.  Need at least %s"
+		     rev cedet-idutils-min-version))
+	  ;; Else, return TRUE, as in good enough.
+	  (when (interactive-p)
+	    (message "ID Utils %s  - Good enough for CEDET." rev))
+	  t)))))
+
+
+(provide 'cedet-idutils)
+;;; cedet-idutils.el ends here
+
diff --git a/site/cedet-1.0pre7/common/cedet-load.el b/site/cedet-1.0pre7/common/cedet-load.el
new file mode 100644
index 0000000..22d4cbb
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-load.el
@@ -0,0 +1,38 @@
+;;; cedet-load.el --- Load definitions for CEDET's common libraries
+
+;;; Copyright (C) 2008 Eric M. Ludlam
+;;; Copyright (C) 2003 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: cedet-load.el,v 1.3 2008/03/14 22:38:15 zappo Exp $
+
+;; CEDET is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize CEDET's common libraries for all supported conditions.
+
+;;; Code:
+;;
+
+;;; Common autoloads
+;;
+(load "cedet-loaddefs" nil t)
+(require 'cedet-compat)
+
+(provide 'cedet-load)
+
+;;; cedet-load.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-loaddefs.el b/site/cedet-1.0pre7/common/cedet-loaddefs.el
new file mode 100644
index 0000000..afd31e1
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-loaddefs.el
@@ -0,0 +1,484 @@
+;;; cedet-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (cedet-update-autoloads) "cedet-autogen" "cedet-autogen.el"
+;;;;;;  (18540 13339))
+;;; Generated autoloads from cedet-autogen.el
+
+(autoload 'cedet-update-autoloads "cedet-autogen" "\
+Update autoloads in file LOADDEFS from sources.
+Optional argument DIRECTORY, specifies the directory to scan for
+autoloads.  It defaults to the current directory.
+DIRECTORIES is a list of extra directory to scan.  Those directory
+names are relative to DIRECTORY.  If DIRECTORIES is nil try to scan
+sub directories of DIRECTORY where a `cedet-autogen-tagfile' file
+exists.
+
+\(fn LOADDEFS &optional DIRECTORY &rest DIRECTORIES)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cedet-compat" "cedet-compat.el" (19328 21693))
+;;; Generated autoloads from cedet-compat.el
+
+(if (or (featurep 'xemacs) (inversion-test 'emacs "22.0")) (defalias 'cedet-split-string 'cedet-split-string-1) (defalias 'cedet-split-string 'split-string))
+
+(when (not (fboundp 'with-no-warnings)) (put 'with-no-warnings 'lisp-indent-function 0) (defun with-no-warnings (&rest body) "Copied from `with-no-warnings' in Emacs 23.\nLike `progn', but prevents compiler warnings in the body.\nNote: Doesn't work if this version is being loaded." (car (last body))))
+
+;;;***
+
+;;;### (autoloads (cedet-cscope-version-check cedet-cscope-expand-filename
+;;;;;;  cedet-cscope-search cedet-cscope-command) "cedet-cscope"
+;;;;;;  "cedet-cscope.el" (18977 14036))
+;;; Generated autoloads from cedet-cscope.el
+
+(defvar cedet-cscope-command "cscope" "\
+Command name for the CScope executable.")
+
+(custom-autoload 'cedet-cscope-command "cedet-cscope" t)
+
+(autoload 'cedet-cscope-search "cedet-cscope" "\
+Perform a search with CScope, return the created buffer.
+SEARCHTEXT is text to find.
+TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
+'tagregexp, or 'tagcompletions.
+TYPE is the type of search, meaning that SEARCHTEXT is compared to
+filename, tagname (tags table), references (uses of a tag) , or
+symbol (uses of something not in the tag table.)
+SCOPE is the scope of the search, such as 'project or 'subdirs.
+
+\(fn SEARCHTEXT TEXTTYPE TYPE SCOPE)" nil nil)
+
+(autoload 'cedet-cscope-expand-filename "cedet-cscope" "\
+Expand the FILENAME with CScope.
+Return a fully qualified filename.
+
+\(fn FILENAME)" t nil)
+
+(autoload 'cedet-cscope-version-check "cedet-cscope" "\
+Check the version of the installed CScope command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cedet-edebug" "cedet-edebug.el" (19122 48399))
+;;; Generated autoloads from cedet-edebug.el
+
+(add-hook 'edebug-setup-hook (lambda nil (require 'cedet-edebug) (defalias 'edebug-prin1-to-string 'cedet-edebug-prin1-to-string) (define-key edebug-mode-map "A" 'data-debug-edebug-expr)))
+
+(add-hook 'debugger-mode-hook (lambda nil (require 'cedet-edebug) (define-key debugger-mode-map "A" 'data-debug-edebug-expr)))
+
+;;;***
+
+;;;### (autoloads (cedet-files-utest) "cedet-files" "cedet-files.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from cedet-files.el
+
+(autoload 'cedet-files-utest "cedet-files" "\
+Test out some file name conversions.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cedet-gnu-global-version-check cedet-gnu-global-root
+;;;;;;  cedet-gnu-global-show-root cedet-gnu-global-expand-filename
+;;;;;;  cedet-gnu-global-search cedet-global-command) "cedet-global"
+;;;;;;  "cedet-global.el" (18977 14083))
+;;; Generated autoloads from cedet-global.el
+
+(defvar cedet-global-command "global" "\
+Command name for the GNU Global executable.")
+
+(custom-autoload 'cedet-global-command "cedet-global" t)
+
+(autoload 'cedet-gnu-global-search "cedet-global" "\
+Perform a search with GNU Global, return the created buffer.
+SEARCHTEXT is text to find.
+TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
+'tagregexp, or 'tagcompletions.
+TYPE is the type of search, meaning that SEARCHTEXT is compared to
+filename, tagname (tags table), references (uses of a tag) , or
+symbol (uses of something not in the tag table.)
+SCOPE is the scope of the search, such as 'project or 'subdirs.
+
+\(fn SEARCHTEXT TEXTTYPE TYPE SCOPE)" nil nil)
+
+(autoload 'cedet-gnu-global-expand-filename "cedet-global" "\
+Expand the FILENAME with GNU Global.
+Return a fully qualified filename.
+
+\(fn FILENAME)" t nil)
+
+(autoload 'cedet-gnu-global-show-root "cedet-global" "\
+Show the root of a GNU Global area under the current buffer.
+
+\(fn)" t nil)
+
+(autoload 'cedet-gnu-global-root "cedet-global" "\
+Return the root of any GNU Global scanned project.
+If a default starting DIR is not specified, the current buffer's
+`default-directory' is used.
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'cedet-gnu-global-version-check "cedet-global" "\
+Check the version of the installed GNU Global command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+
+;;;### (autoloads (cedet-graphviz-dot-version-check cedet-graphviz-neato-command
+;;;;;;  cedet-graphviz-dot-command) "cedet-graphviz" "cedet-graphviz.el"
+;;;;;;  (18909 22782))
+;;; Generated autoloads from cedet-graphviz.el
+
+(defvar cedet-graphviz-dot-command "dot" "\
+Command name for the Graphviz DOT executable.")
+
+(custom-autoload 'cedet-graphviz-dot-command "cedet-graphviz" t)
+
+(defvar cedet-graphviz-neato-command "neato" "\
+Command name for the Graphviz NEATO executable.")
+
+(custom-autoload 'cedet-graphviz-neato-command "cedet-graphviz" t)
+
+(autoload 'cedet-graphviz-dot-version-check "cedet-graphviz" "\
+Check the version of the installed Graphviz dot command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+
+;;;### (autoloads (cedet-idutils-version-check cedet-idutils-expand-filename
+;;;;;;  cedet-idutils-token-command cedet-idutils-file-command) "cedet-idutils"
+;;;;;;  "cedet-idutils.el" (18977 13753))
+;;; Generated autoloads from cedet-idutils.el
+
+(defvar cedet-idutils-file-command "fnid" "\
+Command name for the ID Utils executable for searching file names.")
+
+(custom-autoload 'cedet-idutils-file-command "cedet-idutils" t)
+
+(defvar cedet-idutils-token-command "lid" "\
+Command name for the ID Utils executable for searching for tokens.")
+
+(custom-autoload 'cedet-idutils-token-command "cedet-idutils" t)
+
+(autoload 'cedet-idutils-expand-filename "cedet-idutils" "\
+Expand the FILENAME with IDUtils.
+Return a filename relative to the default directory.
+
+\(fn FILENAME)" t nil)
+
+(autoload 'cedet-idutils-version-check "cedet-idutils" "\
+Check the version of the installed ID Utils command.
+If optional programatic argument NOERROR is non-nil, then
+instead of throwing an error if Global isn't available, then
+return nil.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+
+;;;### (autoloads (cedet-utest-batch cedet-utest) "cedet-utests"
+;;;;;;  "cedet-utests.el" (19326 59186))
+;;; Generated autoloads from cedet-utests.el
+
+(autoload 'cedet-utest "cedet-utests" "\
+Run the CEDET unittests.
+EXIT-ON-ERROR causes the test suite to exit on an error, instead
+of just logging the error.
+
+\(fn &optional EXIT-ON-ERROR)" t nil)
+
+(autoload 'cedet-utest-batch "cedet-utests" "\
+Run the CEDET unit test in BATCH mode.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (data-debug-eval-expression data-debug-edebug-expr
+;;;;;;  data-debug-show-stuff data-debug-new-buffer data-debug-mode
+;;;;;;  data-debug-insert-thing data-debug-insert-stuff-vector data-debug-insert-stuff-list
+;;;;;;  data-debug-insert-widget-properties data-debug-insert-hash-table
+;;;;;;  data-debug-insert-property-list) "data-debug" "data-debug.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from data-debug.el
+
+(autoload 'data-debug-insert-property-list "data-debug" "\
+Insert the property list PROPLIST.
+Each line starts with PREFIX.
+The attributes belong to the tag PARENT.
+
+\(fn PROPLIST PREFIX &optional PARENT)" nil nil)
+
+(autoload 'data-debug-insert-hash-table "data-debug" "\
+Insert the contents of HASH-TABLE inserting PREFIX before each element.
+
+\(fn HASH-TABLE PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-widget-properties "data-debug" "\
+Insert the contents of WIDGET inserting PREFIX before each element.
+
+\(fn WIDGET PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-stuff-list "data-debug" "\
+Insert all the parts of STUFFLIST.
+PREFIX specifies what to insert at the start of each line.
+
+\(fn STUFFLIST PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-stuff-vector "data-debug" "\
+Insert all the parts of STUFFVECTOR.
+PREFIX specifies what to insert at the start of each line.
+
+\(fn STUFFVECTOR PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-thing "data-debug" "\
+Insert THING with PREFIX.
+PREBUTTONTEXT is some text to insert between prefix and the thing
+that is not included in the indentation calculation of any children.
+If PARENT is non-nil, it is somehow related as a parent to thing.
+
+\(fn THING PREFIX PREBUTTONTEXT &optional PARENT)" nil nil)
+
+(autoload 'data-debug-mode "data-debug" "\
+Major-mode for the Analyzer debugger.
+
+\\{data-debug-map}
+
+\(fn)" t nil)
+
+(autoload 'data-debug-new-buffer "data-debug" "\
+Create a new ddebug buffer with NAME.
+
+\(fn NAME)" nil nil)
+
+(autoload 'data-debug-show-stuff "data-debug" "\
+Data debug STUFF in a buffer named *NAME DDebug*.
+
+\(fn STUFF NAME)" nil nil)
+
+(autoload 'data-debug-edebug-expr "data-debug" "\
+Dump out the contets of some expression EXPR in edebug with ddebug.
+
+\(fn EXPR)" t nil)
+
+(autoload 'data-debug-eval-expression "data-debug" "\
+Evaluate EXPR and display the value.
+If the result is something simple, show it in the echo area.
+If the result is a list or vector, then use the data debugger to display it.
+
+\(fn EXPR)" t nil)
+
+;;;***
+
+;;;### (autoloads (define-fame-channel) "fame" "fame.el" (17213 39681))
+;;; Generated autoloads from fame.el
+
+(autoload 'define-fame-channel "fame" "\
+Define the new message channel CHANNEL.
+CHANNEL must be a non-nil symbol.
+The optional argument DEFAULT specifies the default value of message
+levels for this channel.  By default it is the value of
+`fame-default-level-values'.
+DOCSTRING is an optional channel documentation.
+
+This defines the option `CHANNEL-fame-levels' to customize the current
+value of message levels.  And the functions `CHANNEL-send-debug',
+`CHANNEL-send-info', `CHANNEL-send-warning', and `CHANNEL-send-error',
+that respectively send debug, informational, warning, and error
+messages to CHANNEL.
+
+\(fn CHANNEL &optional DEFAULT DOCSTRING)" nil (quote macro))
+
+;;;***
+
+;;;### (autoloads (inversion-upgrade-package inversion-add-to-load-path
+;;;;;;  inversion-find-version inversion-require-emacs inversion-require)
+;;;;;;  "inversion" "inversion.el" (19326 59186))
+;;; Generated autoloads from inversion.el
+
+(autoload 'inversion-require "inversion" "\
+Declare that you need PACKAGE with at least VERSION.
+PACKAGE might be found in FILE.  (See `require'.)
+Throws an error if VERSION is incompatible with what is installed.
+Optional argument DIRECTORY is a location where new versions of
+this tool can be located.  If there is a versioning problem and
+DIRECTORY is provided, inversion will offer to download the file.
+Optional argument RESERVED is saved for later use.
+
+\(fn PACKAGE VERSION &optional FILE DIRECTORY &rest RESERVED)" nil nil)
+
+(autoload 'inversion-require-emacs "inversion" "\
+Declare that you need either EMACS-VER, or XEMACS-VER.
+Only checks one based on which kind of Emacs is being run.
+
+\(fn EMACS-VER XEMACS-VER)" nil nil)
+
+(autoload 'inversion-find-version "inversion" "\
+Search for the version and incompatible version of PACKAGE.
+Does not load PACKAGE nor requires that it has been previously loaded.
+Search in the directories in `load-path' for a PACKAGE.el library.
+Visit the file found and search for the declarations of variables or
+constants `PACKAGE-version' and `PACKAGE-incompatible-version'.  The
+value of these variables must be a version string.
+
+Return a pair (VERSION-STRING . INCOMPATIBLE-VERSION-STRING) where
+INCOMPATIBLE-VERSION-STRING can be nil.
+Return nil when VERSION-STRING was not found.
+
+\(fn PACKAGE)" nil nil)
+
+(autoload 'inversion-add-to-load-path "inversion" "\
+Add the PACKAGE path to `load-path' if necessary.
+MINIMUM is the minimum version requirement of PACKAGE.
+Optional argument INSTALLDIR is the base directory where PACKAGE is
+installed.  It defaults to `default-directory'/PACKAGE.
+SUBDIRS are sub-directories to add to `load-path', following the main
+INSTALLDIR path.
+
+\(fn PACKAGE MINIMUM &optional INSTALLDIR &rest SUBDIRS)" nil nil)
+
+(autoload 'inversion-upgrade-package "inversion" "\
+Try to upgrade PACKAGE in DIRECTORY is available.
+
+\(fn PACKAGE &optional DIRECTORY)" t nil)
+
+;;;***
+
+;;;### (autoloads (mode-local-read-function) "mode-local" "mode-local.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from mode-local.el
+
+(autoload 'mode-local-read-function "mode-local" "\
+Interactively read in the name of a mode-local function.
+PROMPT, INITIAL, HIST, and DEFAULT are the same as for `completing-read'.
+
+\(fn PROMPT &optional INITIAL HIST DEFAULT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (pprint-function pprint pprint-to-string) "pprint"
+;;;;;;  "pprint.el" (17213 39693))
+;;; Generated autoloads from pprint.el
+
+(autoload 'pprint-to-string "pprint" "\
+Return a string containing the pretty-printed representation of OBJECT.
+OBJECT can be any Lisp object.  Quoting characters are used as needed
+to make output that `read' can handle, whenever this is possible.  The
+pretty printer try as much as possible to limit the length of lines to
+given WIDTH.  WIDTH value defaults to `fill-column'.
+
+\(fn OBJECT &optional WIDTH)" nil nil)
+
+(autoload 'pprint "pprint" "\
+Output the pretty-printed representation of OBJECT, any Lisp object.
+Quoting characters are printed as needed to make output that `read'
+can handle, whenever this is possible.  Output stream is STREAM, or
+value of `standard-output' (which see).  The pretty printer try as
+much as possible to limit the length of lines to given WIDTH.  WIDTH
+value defaults to `fill-column'.
+
+\(fn OBJECT &optional STREAM WIDTH)" nil nil)
+
+(autoload 'pprint-function "pprint" "\
+See a pretty-printed representation of FUNCTION-NAME.
+
+\(fn FUNCTION-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads (pulse-line-hook-function pulse-toggle-integration-advice
+;;;;;;  pulse-momentary-highlight-region pulse-momentary-highlight-one-line
+;;;;;;  pulse-momentary-highlight-overlay pulse-test pulse) "pulse"
+;;;;;;  "pulse.el" (19122 48399))
+;;; Generated autoloads from pulse.el
+
+(autoload 'pulse "pulse" "\
+Pulse the colors on our highlight face.
+If optional FACE is provide, reset the face to FACE color,
+instead of `pulse-highlight-start-face'.
+Be sure to call `pulse-reset-face' after calling pulse.
+
+\(fn &optional FACE)" nil nil)
+
+(autoload 'pulse-test "pulse" "\
+Test the lightening function for pulsing a line.
+When optional NO-ERROR Don't throw an error if we can't run tests.
+
+\(fn &optional NO-ERROR)" t nil)
+
+(autoload 'pulse-momentary-highlight-overlay "pulse" "\
+Pulse the overlay O, unhighlighting before next command.
+Optional argument FACE specifies the fact to do the highlighting.
+
+\(fn O &optional FACE)" nil nil)
+
+(autoload 'pulse-momentary-highlight-one-line "pulse" "\
+Highlight the line around POINT, unhighlighting before next command.
+Optional argument FACE specifies the face to do the highlighting.
+
+\(fn POINT &optional FACE)" nil nil)
+
+(autoload 'pulse-momentary-highlight-region "pulse" "\
+Highlight between START and END, unhighlighting before next command.
+Optional argument FACE specifies the fact to do the highlighting.
+
+\(fn START END &optional FACE)" nil nil)
+
+(autoload 'pulse-toggle-integration-advice "pulse" "\
+Toggle activation of advised functions that will now pulse.
+Wint no ARG, toggle the pulse advice.
+With a negative ARG, disable pulse advice.
+With a positive ARG, enable pulse advice.
+Currently advised functions include:
+  `goto-line'
+  `exchange-point-and-mark'
+  `find-tag'
+  `tags-search'
+  `tags-loop-continue'
+  `pop-tag-mark'
+  `imenu-default-goto-function'
+Pulsing via `pulse-line-hook-function' has also been added to
+the following hook:
+  `next-error-hook'
+
+\(fn ARG)" t nil)
+
+(autoload 'pulse-line-hook-function "pulse" "\
+Function used in hooks to pulse the current line.
+Only pulses the line if `pulse-command-advice-flag' is non-nil.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("cedet-load.el" "cedet.el" "ezimage.el"
+;;;;;;  "working.el") (19335 11024 146216))
+
+;;;***
+
+(provide 'cedet-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; cedet-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet-utests.el b/site/cedet-1.0pre7/common/cedet-utests.el
new file mode 100644
index 0000000..2797fcb
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet-utests.el
@@ -0,0 +1,394 @@
+;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cedet-utests.el,v 1.22 2010/02/16 02:08:14 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Remembering to run all the unit tests available in CEDET one at a
+;; time is a bit time consuming.  This links all the tests together
+;; into one command.
+
+(require 'cedet)
+;;; Code:
+(defvar cedet-utest-test-alist
+  '(
+    ;;
+    ;; COMMON
+    ;;
+
+    ;; Test inversion
+    ("inversion" . inversion-unit-test)
+
+    ;; EZ Image dumping.
+    ("ezimage associations" . ezimage-image-association-dump)
+    ("ezimage images" . ezimage-image-dump)
+
+    ;; Workging interactive tests.
+    ("working: wait-for-keypress" .
+     (lambda ()
+       (if (cedet-utest-noninteractive)
+	   (message " ** Skipping test in noninteractive mode.")
+	 (working-wait-for-keypress))))
+    ;("working: sleep" . working-verify-sleep)
+
+    ;; Pulse
+    ("pulse interactive test" . (lambda () (pulse-test t)))
+
+    ;; Files
+    ("cedet file conversion" . cedet-files-utest)
+
+    ;;
+    ;; EIEIO
+    ;;
+    ("eieio" . (lambda () (let ((lib (locate-library "eieio-tests.el"
+						     t)))
+			    (load-file lib))))
+    ("eieio: browser" . eieio-browse)
+    ("eieio: custom" . (lambda ()
+			 (require 'eieio-custom)
+			 (customize-variable 'eieio-widget-test)))
+    ("eieio: chart" . (lambda ()
+			(if (cedet-utest-noninteractive)
+			    (message " ** Skipping test in noninteractive mode.")
+			  (chart-test-it-all))))
+    ;;
+    ;; EDE
+    ;;
+    
+    ;; @todo - Currently handled in the integration tests.  Need
+    ;;         some simpler unit tests here.
+
+    ;;
+    ;; SEMANTIC
+    ;;
+    ("semantic: lex spp table write" . semantic-lex-spp-write-utest)
+    ("semantic: multi-lang parsing" . semantic-utest-main)
+    ("semantic: C preprocessor" . semantic-utest-c)
+    ("semantic: analyzer tests" . semantic-ia-utest)
+    ("semanticdb: data cache" . semantic-test-data-cache)
+    ("semantic: throw-on-input" .
+     (lambda ()
+       (if (cedet-utest-noninteractive)
+	   (message " ** Skipping test in noninteractive mode.")
+	 (semantic-test-throw-on-input))))
+
+    ("semantic: gcc: output parse test" . semantic-gcc-test-output-parser)
+    ("wisent calculator" . wisent-calc-utest)
+    ;;
+    ;; SRECODE
+    ;;
+    ("srecode: fields" . srecode-field-utest)
+    ("srecode: templates" . srecode-utest-template-output)
+    ("srecode: project" . srecode-utest-project)
+    ("srecode: show maps" . srecode-get-maps)
+    ("srecode: getset" . srecode-utest-getset-output)
+
+    ;;
+    ;; COGRE
+    ;;
+    ("cogre: graph" . cogre-utest)
+    ("cogre: periodic & ascii" . cogre-periodic-utest)
+    ("cogre: conversion/export tests" . cogre-export-utest)
+    ("cogre: uml-quick-class" . cogre-utest-quick-class)
+   )
+  "Alist of all the tests in CEDET we should run.")
+
+(defvar cedet-running-master-tests nil
+  "Non-nil when CEDET-utest is running all the tests.")
+
+;;;###autoload
+(defun cedet-utest (&optional exit-on-error)
+  "Run the CEDET unittests.
+EXIT-ON-ERROR causes the test suite to exit on an error, instead
+of just logging the error."
+  (interactive)
+  (if (or (not (featurep 'semanticdb-mode))
+	  (not (semanticdb-minor-mode-p)))
+      (error "CEDET Tests require: M-x semantic-load-enable-minimum-features"))
+  (cedet-utest-log-setup "ALL TESTS")
+  (let ((tl cedet-utest-test-alist)
+	(notes nil)
+	(err nil)
+	(start (current-time))
+	(end nil)
+	(cedet-running-master-tests t)
+	)
+    (dolist (T tl)
+      (cedet-utest-add-log-item-start (car T))
+      (setq notes nil err nil)
+      (condition-case Cerr
+	  (progn
+	    (funcall (cdr T))
+	    )
+	(error
+	 (setq err (format "ERROR: %S" Cerr))
+	 ;;(message "Error caught: %s" Cerr)
+	 ))
+
+      ;; Cleanup stray input and events that are in the way.
+      ;; Not doing this causes sit-for to not refresh the screen.
+      ;; Doing this causes the user to need to press keys more frequently.
+      (when (and (interactive-p) (input-pending-p))
+	(if (fboundp 'read-event)
+	    (read-event)
+	  (read-char)))
+
+      (cedet-utest-add-log-item-done notes err)
+      (when (and exit-on-error err)
+	(message "to debug this test point, execute:")
+	(message "%S" (cdr T))
+	(message "\n ** Exiting Test Suite. ** \n")
+	(throw 'cedet-utest-exit-on-error t)
+	)
+      )
+    (setq end (current-time))
+    (cedet-utest-log-shutdown-msg "ALL TESTS" start end)
+    nil))
+
+(defun cedet-utest-noninteractive ()
+  "Return non-nil if running non-interactively."
+  (if (featurep 'xemacs)
+      (noninteractive)
+    noninteractive))
+
+;;;###autoload
+(defun cedet-utest-batch ()
+  "Run the CEDET unit test in BATCH mode."
+  (unless (cedet-utest-noninteractive)
+    (error "`cedet-utest-batch' is to be used only with -batch"))
+  (condition-case err
+      (when (catch 'cedet-utest-exit-on-error
+	      ;; Get basic semantic features up.
+	      (semantic-load-enable-minimum-features)
+	      ;; Disables all caches related to semantic DB so all
+	      ;; tests run as if we have bootstrapped CEDET for the
+	      ;; first time.
+	      (setq-default semanticdb-new-database-class 'semanticdb-project-database)
+	      (message "Disabling existing Semantic Database Caches.")
+
+	      ;; Disabling the srecoder map, we won't load a pre-existing one
+	      ;; and will be forced to bootstrap a new one.
+	      (setq srecode-map-save-file nil)
+
+	      ;; Run the tests
+	      (cedet-utest t)
+	      )
+	(kill-emacs 1))
+    (error
+     (error "Error in unit test harness:\n  %S" err))
+    )
+  )
+
+;;; Logging utility.
+;;
+(defvar cedet-utest-frame nil
+  "Frame used during cedet unit test logging.")
+(defvar cedet-utest-buffer nil
+  "Frame used during cedet unit test logging.")
+(defvar cedet-utest-frame-parameters
+  '((name . "CEDET-UTEST")
+    (width . 80)
+    (height . 25)
+    (minibuffer . t))
+  "Frame parameters used for the cedet utest log frame.")
+
+(defvar cedet-utest-last-log-item nil
+  "Remember the last item we were logging for.")
+
+(defvar cedet-utest-log-timer nil
+  "During a test, track the start time.")
+
+(defun cedet-utest-log-setup (&optional title)
+  "Setup a frame and buffer for unit testing.
+Optional argument TITLE is the title of this testing session."
+  (setq cedet-utest-log-timer (current-time))
+  (if (cedet-utest-noninteractive)
+      (message "\n>> Setting up %s tests to run @ %s\n"
+	       (or title "")
+	       (current-time-string))
+
+    ;; Interactive mode needs a frame and buffer.
+    (when (or (not cedet-utest-frame) (not (frame-live-p cedet-utest-frame)))
+      (setq cedet-utest-frame (make-frame cedet-utest-frame-parameters)))
+    (when (or (not cedet-utest-buffer) (not (buffer-live-p cedet-utest-buffer)))
+      (setq cedet-utest-buffer (get-buffer-create "*CEDET utest log*")))
+    (save-excursion
+      (set-buffer cedet-utest-buffer)
+      (setq cedet-utest-last-log-item nil)
+      (when (not cedet-running-master-tests)
+	(erase-buffer))
+      (insert "\n\nSetting up "
+	      (or title "")
+	      " tests to run @ " (current-time-string) "\n\n"))
+    (let ((oframe (selected-frame)))
+      (unwind-protect
+	  (progn
+	    (select-frame cedet-utest-frame)
+	    (switch-to-buffer cedet-utest-buffer t))
+	(select-frame oframe)))
+    ))
+
+(defun cedet-utest-elapsed-time (start end)
+  "Copied from elp.el.  Was elp-elapsed-time.
+Argument START and END bound the time being calculated."
+  (+ (* (- (car end) (car start)) 65536.0)
+     (- (car (cdr end)) (car (cdr start)))
+     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+
+(defun cedet-utest-log-shutdown (title &optional errorcondition)
+  "Shut-down a larger test suite.
+TITLE is the section that is done.
+ERRORCONDITION is some error that may have occured durinig testing."
+  (let ((endtime (current-time))
+	)
+    (cedet-utest-log-shutdown-msg title cedet-utest-log-timer endtime)
+    (setq cedet-utest-log-timer nil)
+    ))
+
+(defun cedet-utest-log-shutdown-msg (title startime endtime)
+  "Show a shutdown message with TITLE, STARTIME, and ENDTIME."
+  (if (cedet-utest-noninteractive)
+      (progn
+	(message "\n>> Test Suite %s ended at @ %s"
+		 title
+		 (format-time-string "%c" endtime))
+	(message "     Elapsed Time %.2f Seconds\n"
+		 (cedet-utest-elapsed-time startime endtime)))
+    
+    (save-excursion
+      (set-buffer cedet-utest-buffer)
+      (goto-char (point-max))
+      (insert "\n>> Test Suite " title " ended at @ "
+	      (format-time-string "%c" endtime) "\n"
+	      "     Elapsed Time "
+	      (number-to-string
+	       (cedet-utest-elapsed-time startime endtime))
+	      " Seconds\n * "))
+    ))
+
+(defun cedet-utest-show-log-end ()
+  "Show the end of the current unit test log."
+  (unless (cedet-utest-noninteractive)
+    (let* ((cb (current-buffer))
+	   (cf (selected-frame))
+	   (bw (or (get-buffer-window cedet-utest-buffer t)
+		   (get-buffer-window (switch-to-buffer cedet-utest-buffer) t)))
+	   (lf (window-frame bw))
+	   )
+      (select-frame lf)
+      (select-window bw)
+      (goto-char (point-max))
+      (select-frame cf)
+      (set-buffer cb)
+      )))
+
+(defun cedet-utest-post-command-hook ()
+  "Hook run after the current log command was run."
+    (if (cedet-utest-noninteractive)
+	(message "")
+      (save-excursion
+	(set-buffer cedet-utest-buffer)
+	(goto-char (point-max))
+	(insert "\n\n")))
+    (setq cedet-utest-last-log-item nil)
+    (remove-hook 'post-command-hook 'cedet-utest-post-command-hook)
+    )
+
+(defun cedet-utest-add-log-item-start (item)
+  "Add ITEM into the log as being started."
+  (unless (equal item cedet-utest-last-log-item)
+    (setq cedet-utest-last-log-item item)
+    ;; This next line makes sure we clear out status during logging.
+    (add-hook 'post-command-hook 'cedet-utest-post-command-hook)
+
+    (if (cedet-utest-noninteractive)
+	(message " - Running %s ..." item)
+      (save-excursion
+	(set-buffer cedet-utest-buffer)
+	(goto-char (point-max))
+	(when (not (bolp)) (insert "\n"))
+	(insert "Running " item " ... ")
+	(sit-for 0)
+	))
+    (cedet-utest-show-log-end)
+    ))
+
+(defun cedet-utest-add-log-item-done (&optional notes err precr)
+  "Add into the log that the last item is done.
+Apply NOTES to the doneness of the log.
+Apply ERR if there was an error in previous item.
+Optional argument PRECR indicates to prefix the done msg w/ a newline."
+  (if (cedet-utest-noninteractive)
+      ;; Non-interactive-mode - show a message.
+      (if notes
+	  (message "   * %s {%s}" (or err "done") notes)
+	(message "   * %s" (or err "done")))
+    ;; Interactive-mode - insert into the buffer.
+    (save-excursion
+      (set-buffer cedet-utest-buffer)
+      (goto-char (point-max))
+      (when precr (insert "\n"))
+      (if err
+	  (insert err)
+	(insert "done")
+	(when notes (insert " (" notes ")")))
+      (insert "\n")
+      (setq cedet-utest-last-log-item nil)
+      (sit-for 0)
+      )))
+
+;;; INDIVIDUAL TEST API
+;;
+;; Use these APIs to start and log information.
+;;
+;; The other fcns will be used to log across all the tests at once.
+(defun cedet-utest-log-start (testname)
+  "Setup the log for the test TESTNAME."
+  ;; Make sure we have a log buffer.
+  (save-window-excursion
+    (when (or (not cedet-utest-buffer)
+	      (not (buffer-live-p cedet-utest-buffer))
+	      (not (get-buffer-window cedet-utest-buffer t))
+	      )
+      (cedet-utest-log-setup))
+    ;; Add our startup message.
+    (cedet-utest-add-log-item-start testname)
+    ))
+
+(defun cedet-utest-log(format &rest args)
+  "Log the text string FORMAT.
+The rest of the ARGS are used to fill in FORMAT with `format'."
+  (if (cedet-utest-noninteractive)
+      (apply 'message format args)
+    (save-excursion
+      (set-buffer cedet-utest-buffer)
+      (goto-char (point-max))
+      (when (not (bolp)) (insert "\n"))
+      (insert (apply 'format format args))
+      (insert "\n")
+      (sit-for 0)
+      ))
+  (cedet-utest-show-log-end)
+  )
+
+
+(provide 'cedet-utests)
+;;; cedet-utests.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet.el b/site/cedet-1.0pre7/common/cedet.el
new file mode 100644
index 0000000..c738479
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet.el
@@ -0,0 +1,226 @@
+;;; cedet.el --- Setup CEDET environment
+
+;; Copyright (C) 2007, 2008, 2009 by Eric M. Ludlam
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 by David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: CEDET developers <http://sf.net/projects/cedet>
+;; Created: 09 Dec 2002
+;; Keywords: syntax
+;; X-RCS: $Id: cedet.el,v 1.36 2009/09/12 12:04:55 zappo Exp $
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library automatically setups your [X]Emacs to use CEDET tools.
+;;
+;; First download the latest CEDET distribution, provided in a
+;; cedet-<VERSION>.tar.gz tarball, from the project page at:
+;; <http://sf.net/projects/cedet>.
+;;  
+;; Unpack the tarball in a directory of your choice.  It will install
+;; the following directory tree:
+;;
+;;   cedet
+;;     |
+;;     +- common
+;;     |
+;;     +- cogre
+;;     |
+;;     +- ede
+;;     |
+;;     +- eieio
+;;     |
+;;     +- semantic
+;;     |
+;;     +- speedbar
+;;     |
+;;     +- srecode
+;;     |
+;;     \- contrib
+;;
+;; Then, add the following into your ~/.emacs startup file:
+;;
+;;   (load-file "<INSTALL-PATH>/cedet/common/cedet.el")
+;;
+;; Once loaded, you can enable additional feature.  For example,
+;; this will enable some basic and advance features:
+;;
+;;   (load-file "<INSTALL-PATH>/cedet/common/cedet.el")
+;;   (global-ede-mode t)
+;;   (semantic-load-enable-code-helpers)
+;;   (global-srecode-minor-mode 1)
+;;
+;; See the INSTALL file for more.
+
+;;
+;; That's it!
+;;
+
+;;; Code:
+(when (featurep 'cedet)
+  (error "CEDET Version %s already loaded." cedet-version))
+
+(eval-when-compile
+  (require 'cl)
+  )
+
+(defconst cedet-version "1.0pre7"
+  "Current version of CEDET.")
+
+(defconst cedet-emacs-min-version "21.1"
+  "Minimum version of GNU Emacs supported by CEDET.")
+(defconst cedet-xemacs-min-version "21.4"
+  "Minimum version of XEmacs supported by CEDET.")
+
+(defconst cedet-packages
+  `(
+    ;;PACKAGE   MIN-VERSION      INSTALLDIR DOCDIR
+    (cedet         ,cedet-version "common"  "common" 	   )
+    (eieio         "1.2"           nil      "eieio"        )
+    (semantic      "2.0pre7"       nil      "semantic/doc" )
+    (srecode       "1.0pre7"       nil      "srecode"      ) 
+    (ede           "1.0pre7"       nil      "ede"    	   )    
+    (speedbar      "1.0.3"         nil      "speedbar"     )
+    (cogre         "1.0pre7"       nil      "cogre"  	   )
+    (cedet-contrib "1.0pre7"      "contrib"  nil           )
+    )
+  "Table of CEDET packages to install.")
+
+;; This file must be in "<INSTALL-DIR>/cedet/common"!
+(let ((default-directory
+        (file-name-directory
+         (or load-file-name (buffer-file-name)))))
+  
+  ;; Add "<INSTALL-DIR>/cedet/common" to `load-path'.
+  (add-to-list 'load-path default-directory)
+  ;;(message "%S added to `load-path'" default-directory)
+  ;; Require the inversion library.
+  (require 'inversion)
+  
+  ;; Require specific Emacs versions
+  (inversion-require-emacs cedet-emacs-min-version
+			   cedet-xemacs-min-version)
+
+  ;; Go up to the parent "<INSTALL-DIR>/cedet" directory.
+  (let ((default-directory (expand-file-name ".."))
+        package min-version installdir docdir)
+
+    ;; Add the CEDET packages subdirectories to the `load-path' if
+    ;; necessary.
+    (dolist (package-spec cedet-packages)
+      (setq package     (nth 0 package-spec)
+            min-version (nth 1 package-spec)
+            installdir  (nth 2 package-spec)
+	    docdir      (nth 3 package-spec)
+	    )
+      ;; Add package to load path
+      (when installdir
+        (setq installdir (expand-file-name installdir)))
+      (inversion-add-to-load-path package min-version installdir)
+      ;; Add doc to Info path
+      (when docdir
+	(let ((fulldocpath (expand-file-name docdir default-directory)))
+	  ;; Set up one of the info paths depending on if info is
+	  ;; loaded yet.	  
+	  (if (featurep 'info)
+	      (progn
+		(condition-case nil ; Not all emacs versions have this.
+		    (info-initialize)
+		  (error nil))
+		(add-to-list 'Info-directory-list fulldocpath))
+	    (add-to-list 'Info-default-directory-list fulldocpath))
+	  )))
+
+    ;; Force EIEIO to load so that the autoloads work.
+    (require 'eieio)
+
+    ;; Then run every package setup.
+    (message "Setting up CEDET packages...")
+    (dolist (package-spec cedet-packages)
+      (setq package (nth 0 package-spec))
+      (condition-case err
+	  (progn
+	    (require (intern (format "%s-load" package)))
+	    )
+	(error
+	 (message "%s" (error-message-string err)))))
+    (message "Setting up CEDET packages...done")
+    ))
+
+(eval-when-compile
+  (require 'inversion))
+
+(defun cedet-version ()
+  "Display all active versions of CEDET and Dependant packages.
+
+The PACKAGE column is the name of a given package from CEDET.
+
+REQUESTED VERSION is the version requested by the CEDET load script.
+See `cedet-packages' for details.
+
+FILE VERSION is the version number found in the source file
+for the specificed PACKAGE.
+
+LOADED VERSION is the version of PACKAGE current loaded in Emacs
+memory and (presumably) running in this Emacs instance.  Value is X
+if the package has not been loaded."
+  (interactive)
+  (with-output-to-temp-buffer "*CEDET*"
+    (princ "CEDET Version:\t") (princ cedet-version)
+    (princ "\n  \t\t\tRequested\tFile\t\tLoaded")
+    (princ "\n  Package\t\tVersion\t\tVersion\t\tVersion")
+    (princ "\n  ----------------------------------------------------------")
+    (let ((p cedet-packages))
+      (while p
+	(let ((sym (symbol-name (car (car p)))))
+	  (princ "\n  ")
+	  (princ sym)
+	  (princ ":\t")
+	  (if (< (length sym) 5)
+	      (princ "\t"))
+	  (if (< (length sym) 13)
+	      (princ "\t"))
+	  (let ((reqver (nth 1 (car p)))
+		(filever (car (inversion-find-version sym)))
+		(loadver (when (featurep (car (car p)))
+			   (symbol-value (intern-soft (concat sym "-version"))))))
+	    (princ reqver)
+	    (if (< (length reqver) 8) (princ "\t"))
+	    (princ "\t")
+	    (if (string= filever reqver)
+		;; I tried the words "check" and "match", but that
+		;; just looked lame.
+		(princ "ok\t")
+	      (princ filever)
+	      (if (< (length filever) 8) (princ "\t")))
+	    (princ "\t")
+	    (if loadver
+		(if (string= loadver reqver)
+		    (princ "ok")
+		  (princ loadver))
+	      (princ "Not Loaded"))
+	    ))
+	(setq p (cdr p))))
+    (princ "\n\n\nC-h f cedet-version RET\n  for details on output format.")
+    ))
+
+(provide 'cedet)
+
+;;; cedet.el ends here
diff --git a/site/cedet-1.0pre7/common/cedet.info b/site/cedet-1.0pre7/common/cedet.info
new file mode 100644
index 0000000..39eef80
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet.info
@@ -0,0 +1,1298 @@
+This is cedet.info, produced by makeinfo version 4.9 from cedet.texi.
+
+   This manual documents CEDET, a collection of other tools.
+
+   Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* CEDET: (cedet).	Collection of Emacs Development Environment Tools
+END-INFO-DIR-ENTRY
+
+   This file documents CEDET.  _Collection of Emacs Development
+Environment Tools_
+
+   Copyright (C) 2007 Eric M. Ludlam
+
+
+File: cedet.info,  Node: Top,  Next: Overview,  Up: (dir)
+
+CEDET Manual
+************
+
+CEDET is a Collection of Emacs Development Environment Tools including
+core libraries such as EIEIO, and semantic, and user interface tools
+such as Speedbar, EDE, and COGRE.
+
+   While these tools are independent, and all have their own manuals,
+they are also all co-dependent within CEDET, and are dependent on the
+CEDET common libraries such as inversion and ezimage.
+
+   This manual describes how to configure the tools as a whole to
+accomplish some tasks.
+
+   To send bug reports, or participate in discussions about CEDET, use
+the mailing list cedet-devel.net via the URL:
+`http://lists.sourceforge.net/lists/listinfo/cedet-devel'
+
+* Menu:
+
+* Overview::
+* Installation/Basic Configuration::
+* JDEE Target::
+* ECB Target::
+* Project Management::
+* Code Completion::
+* Code Generation::
+* C++ Features::
+* GNU Global::
+* ID Utils::
+* CScope::
+* Maintenance::	Maintaining your CEDET Data files
+* GNU Free Documentation License::
+* Index::
+
+
+File: cedet.info,  Node: Overview,  Next: Installation/Basic Configuration,  Prev: Top,  Up: Top
+
+1 Overview
+**********
+
+The CEDET collection is made up of several tools.  Each tool has it's
+own manual with details for that tool.
+
+   At the core of the CEDET suite is EIEIO, which is an Implementation
+of Emacs Interpreted Objects.  This provides a CLOS like interface to
+writing object-oriented code in Emacs.  EIEIO forms the base of most of
+the other tools, with the notable exception of Speedbar.
+
+   Several other tools form the next layer of CEDET functionality.  For
+project management, EDE provides a simple way to create projects.  You
+can create an EDE centric project, which uses either Makefiles, or
+AutoMakefiles, or it can wrap an automake based program you've already
+developed.  You can also create simple EDE wrappers on top of any style
+of project.  EDE provides a backgrop for any other CEDET tool that
+needs to know the filesystem scope of a code base, where include
+directories might be.
+
+   semantic provides another mid-level layer.  semantic provides a set
+of tools for developing parsers for different languages, and an API for
+searching and manipulating tags generated from your source code.
+semantic also provides a wide range of core tag centric utilities such
+as enhanced tag decoration, code analysis, and the coveted "Smart
+Completion" feature.
+
+   Another mid-level tool is SRecode or the Semantic Recoder.  SRecode
+is a template management system designed with the goal of providing a
+way to build code-generating applications that are easily modified or
+extended by users.  At it's core is a template authoring and insertion
+system.  A minor mode provides a simple way to insert templates from
+the various template libraries.
+
+   Speedbar is a user interface tool that provides a narrow view into
+your filesystem and tags.  Speedbar is also an API for designing other
+tools and is used for displaying EDE project information, Semantic
+smart completion options, Email, Info, and even GDB stack information.
+
+   Lastly, COGRE is a COnnected GRaph Editor.  The core is an object
+design and library for drawing, saving, and restoring simple connected
+graphs.  Built on this is a UML based tool which interfaces with
+Semantic Tag information to draw simple UML diagrams of your code.  As
+of this writing COGRE is quite simple.  Longer term plans include using
+COGRE as a way of manipulating source code indirectly.
+
+   All these tools depend on a suite of simple library functions, such
+as inversion, ezimage, pretty printing, and mode-local variables.
+
+* Menu:
+
+* EIEIO::       Object system for Emacs.
+* Semantic::    Parser generator and tag management tool.
+* SRecode::	Semantic Recoder Template manager
+* Speedbar::    File and tag explorer, plus more.
+* EDE::         Project Management tool.
+* COGRE::       Diagram editor for object design.
+* Other Library Functions::
+
+
+File: cedet.info,  Node: EIEIO,  Next: Semantic,  Up: Overview
+
+1.1 EIEIO
+=========
+
+EIEIO contains the core object library for CEDET.  You can define
+classes, and methods for those classes using CLOS style syntax.
+Objects can be customized using the Emacs customization tool, which
+allows easy creation of dialog box style UIs.  A series of bases
+classes allows the creation of Emacs centric tools, wrapping up the
+details of persistence, instance tracking, or instance inheritance.
+
+   EIEIO also includes several stray tools, such as `tree.el' for
+drawing tree diagrams, `chart.el' for drawing charts, `linemark.el' for
+managing visible bookmarks programatically, and `lmcompile.el', which
+is a linemark tool that puts out bookmarks for compiler error hits.
+
+   Lastly, EIEIO has baseclasses for writing Speedbar interfaces.  Take
+an existing object hierarchy and inherit from these baseclasses to be
+browsable in Speedbar.
+
+   For more details on EIEIO, read the *note EIEIO Reference Manul:
+(eieio)top.
+
+
+File: cedet.info,  Node: Semantic,  Next: SRecode,  Prev: EIEIO,  Up: Overview
+
+1.2 Semantic
+============
+
+semantic is a parser generator, lexical analyzer, parser development
+environment, parser, tag generation and management system.  Build on
+this is a persistent tag management system database and search utility.
+Code analysis and completion generation is also provided.  semantic
+includes tools such as speedbar interfaces to tags, context analysis,
+and completion options, Popup smart completion, tag decoration, and
+support for a wide range of Emacs tools such as Imenu, wich-func,
+hippie-expand, isearch, and cut/copy/paste.
+
+   For high level overviews, configuration advice, etc, please read
+*note Semantic Manual: (semantic)Top.
+
+   If you are an application developer and need to know the functions
+and concepts, *note the Application Development Manual:
+(semantic-appdev)Top.
+
+   To support a new language, *note the Language Support Developer's
+Guide: (semantic-langdev)Top.
+
+   To use the grammar writing environment, and write in the rule based
+language, *note the Grammar Framework Manual: (grammar-fw)Top.
+
+   For details on the original semantic LL parser, *note the Bovine
+Parser Manual: (bovine)Top.
+
+   For details on the Bison-like LALR parser, *note the Wisent Parser
+Manual: (wisent)Top.
+
+
+File: cedet.info,  Node: SRecode,  Next: Speedbar,  Prev: Semantic,  Up: Overview
+
+1.3 SRecode
+===========
+
+SRecode is a Template manager for writing code from Semantic templates.
+It includes a specialized template authoring language and environment,
+template loader and interpreter.  A minor mode for inserting mode
+specific templates, and some sample applications that also uses
+templates to write code.
+
+   For more details on SRecode, read the *note SRecode Manual:
+(srecode)top;
+
+
+File: cedet.info,  Node: Speedbar,  Next: EDE,  Prev: SRecode,  Up: Overview
+
+1.4 Speedbar
+============
+
+Speedbar is an abbreviated everything browser.  If you can
+conceptualize browsable information into 20 columns, then Speedbar can
+display it for you.
+
+   Speedbar comes with several interfaces, with the primary one being
+for files and tags.  It can also display buffer lists, RMAIL boxes, and
+Info nodes.  Combined with CEDET, it also provides project tracking,
+smart completion lists, Class browsing, Connected graph browsing.
+
+   You can use speedbar to write your own browsers.  Some external tools
+include ERC (Irc client), xslt-process, MH-E (mail reader), and ECB, a
+code browser which embeds Speebar.
+
+   Speedbar has been a part of Emacs for quite a while.  The CEDET
+version of speedbar (as of this writing, Jul 08) is nearly identical to
+the version in Emacs 22.
+
+   For more details, read the *note Speedbar Manual: (speedbar)top.
+
+
+File: cedet.info,  Node: EDE,  Next: COGRE,  Prev: Speedbar,  Up: Overview
+
+1.5 EDE
+=======
+
+EDE is the Emacs Development Environment, which means that it manages
+projects, and can build Makefiles, track distribution and web sites
+associated with your GNU project.
+
+   EDE has several types of projects it can manage with varying degrees
+of development support.  An EDE centric project will generate Makefiles
+or Automake files, and provides menus and keybindings for compiling any
+target, debugging programs by providing the arguments to your debugger,
+and will make sure you don't forget to include some file in your
+targets.  It will help you build distribution files, and post them to
+the web (such as with Source Forge).  EDE will track revision numbers
+and make sure they are updated in multiple places.
+
+   Projects that are merely wrapped with EDE can support a small subset
+of the above.  All project provide an API to other programs that need
+to know the scope of a project, such as which files belong together,
+where include directories might be, how to find documentation, and
+details of that nature.  You can even create project-local variables,
+which are Emacs variables with specific values within the scope of an
+EDE controlled project.
+
+   Read more about it in the *note EDE reference manual: (ede)top.
+
+
+File: cedet.info,  Node: COGRE,  Next: Other Library Functions,  Prev: EDE,  Up: Overview
+
+1.6 COGRE
+=========
+
+COGRE is a COnnected GRaph Editor.  You can use it to create simple
+connected graphs and diagrams.  You can also create more complex UML
+class diagrams in it, or even bind UML diagrams directly to source
+code, navigating your source via the UML diagram.
+
+   While COGRE does have a lot of functionality, it still needs more
+work.  Consider improving COGRE.
+
+   Read more a bout it in *note the COGRE manual: (cogre)top.
+
+
+File: cedet.info,  Node: Other Library Functions,  Prev: COGRE,  Up: Overview
+
+1.7 Other CEDET Library functions
+=================================
+
+CEDET provides several other useful libraries in the `common/'
+directory.  These libraries supply most of their documentation through
+the Commentary section of the Emacs Lisp file.
+
+   Some of the libraries are:
+
+   `' cedet-edebug.el Collection of extensions to support custom CEDET
+     datatypes.
+
+   `' ezimage.el Support for covering text in an Emacs buffer with an
+     image.  This is based on text patterns, and is portable across
+     most versions of Emacs and XEmacs.
+
+     Using ezimage allows you to write a text based UI, and then
+     enhance it with images afterwards, allowing your UI to work well
+     in a text frame, in addition to looking pretty spiff in a
+     graphical frame.
+
+   `' pulse.el Simple way to briefly highlight a region or line.  For
+     Emacs 22, it will pulse the line, with the color drifting from one
+     shade to another.  For older versions Emacs, it will just
+     highlight the line briefly.
+
+   `' fame.el Support for `message' channels, allowing a program to
+     provide a wide range of messages, and allowing a user to configure
+     which set they want to see.
+
+   `' inversion.el Revision management system.  Allows you to use
+     `require' syntax for a specific version of some tool.  If the tool
+     is not compatible with your desired version, a signal is thrown.
+
+   `' mode-local.el Specify functions that have different behaviors
+     based on major-mode, or variables with different local values
+     based on major mode.  Setting a value to a specific mode causes
+     the value to change for all buffers of that mode.
+
+     mode-local is also aware of mode inheritance, such that C++ mode
+     inherits some C configurations.  You can also run code, or access
+     variables from other modes by with a temorary scoped setting.
+
+     mode local is used extensively throughout the semantic package.
+
+   `' pprint.el A pretty printer for Emacs Lisp code.  Use it to dump
+     out large complex datastructures.
+
+   `' sformat.el A Super Format function.  Define lists of associations
+     between letters and values, and then create format strings with %
+     tokens for any letter.
+
+     sformat is used in the semantic document package to construct
+     complex documentation strings.
+
+   `' working.el Display a working message, or a "percentage done"
+     style bar in the mini-buffer.  Tasks that take a long time can use
+     working to provide user feedback explaining a delay.
+
+
+File: cedet.info,  Node: Installation/Basic Configuration,  Next: JDEE Target,  Prev: Overview,  Up: Top
+
+2 Installation and Basic Configuration
+**************************************
+
+A compilation centric version of the CEDET installation is in the
+INSTALL file in the top level CEDET directory.
+
+  1. Compile CEDET
+
+          make
+
+     or
+
+          make EMACS=<your favorite emacs> MAKEINFO=<substitute, or echo>
+
+     If you do not have `make' installed on your system, or if you
+     cannot get the `Makefile's to work, then you can use the all Emacs
+     solution in `cedet-build.el' which is found in the toplevel CEDET
+
+     Read the Commentary section of `cedet-build.el' for details on
+     using this method.
+
+  2. Install .emacs hooks
+
+     Load CEDET in your `.emacs' file.  You do not need to install all
+     of cedet into any magic Emacs controlled directories, or modify
+     your loadpath.  The CEDET bootstrap file will automatically update
+     your load path, and load all the autoload files.  The cedet
+     configuration will load a minimum set of files in.
+
+          ;; Load CEDET
+          (load-file "~/cedet-VERSION/common/cedet.el")
+
+  3. Configuration
+
+     You will likely need to configure CEDET to your application.  Visit
+     the other chapters in this manual for samples to get some ideas on
+     possible configuration scenarios.
+
+  4. Contribute to CEDET
+
+     For general discussions on development of these tools, use the
+     mailing list cedet-devel@sourceforge.net via the URL:
+
+     `http://lists.sourceforge.net/lists/listinfo/cedet-devel'
+
+     For semantic development use the mailing list cedet-semantic.net
+     via the URL:
+
+     `http://lists.sourceforge.net/lists/listinfo/cedet-semantic'
+
+     For EIEIO use the mailing list cedet-eieio@sourceforge.net via the
+     URL:
+
+     `http://lists.sourceforge.net/lists/listinfo/cedet-eieio'
+
+  5. Install Additional Tools
+
+     You may also need to download some of the following files for more
+     obscure features.
+
+     To use the JavaScript parser: javascript-mode.el :
+     `http://www.emacswiki.org/cgi-bin/wiki/JavaScriptMode'
+
+     To use Exuberent ctags to emable Semantic support in more major
+     modes, or as an extra database backend parser, install ctags:
+     `http://ctags.sourceforge.net/'
+
+     To use the UML chart generation from `M-x semantic-dot' graphviz
+     dot programs, including `dotty' `http://www.graphviz.org/'
+
+     To use the graphviz dot parser: `graphviz-dot-mode.el' see the
+     commentary in cogre/wisent-dot.el
+
+
+
+File: cedet.info,  Node: JDEE Target,  Next: ECB Target,  Prev: Installation/Basic Configuration,  Up: Top
+
+3 JDEE Target
+*************
+
+JDEE, or the Java Development Environment, depends on CEDET for both
+EIEIO, the object system, and Semantic, for parsing and providing
+tagging information.
+
+   In addition to the basic CEDET configuration, you will likely want to
+add the following Semantic configuration to your `.emacs' file.
+
+     (semantic-load-enable-minimum-features)
+
+   This provides basic idle-time parsing of files, and persistence to
+support the semantic APIs.
+
+   If you would like to use more of the Semantic tools for your coding
+in Java, you may want to enable this instead:
+
+     (semantic-load-enable-code-helpers)
+
+   or the fancier
+
+     (semantic-load-enable-guady-code-helpers)
+
+   See the *note Semantic Configuration: (semantic)Canned Configuration.
+section of the semantic manual for more details about these features.
+
+
+File: cedet.info,  Node: ECB Target,  Next: Project Management,  Prev: JDEE Target,  Up: Top
+
+4 ECB Target
+************
+
+ECB, or the Emacs Code Browser depends on CEDET for the semantic
+parsing engine, and several other features.  ECB can display a window
+that shows semantic tag information.
+
+   ECB can also be used with JDEE.
+
+   In addition to the basic CEDET configuration, you will likely want to
+add the following Semantic configuration to your `.emacs' file.
+
+     (semantic-load-enable-code-helpers)
+
+   or the fancier
+
+     (semantic-load-enable-guady-code-helpers)
+
+   See the *note Semantic Configuration: (semantic)Canned Configuration.
+section of the semantic manual for more details about these features.
+
+
+File: cedet.info,  Node: Project Management,  Next: Code Completion,  Prev: ECB Target,  Up: Top
+
+5 Project Management
+********************
+
+If you are looking for CEDET to help you manage a project full of
+sourcecode, then you will be using EDE and semantic.
+
+   To enable EDE add this to your `.emacs' file after CEDET is loaded:
+
+     (global-ede-mode 1)
+
+   You can use EDE to define your projects.  If you are starting a new
+project, put a file from your new project into a buffer, and type:
+
+     M-x ede-new RET
+
+   Now select either "Make" or "Automake", which determines the
+underlying build technology to use for compilation.
+
+   Use the menu to add targets.  You can then use either Speedbar or
+dired to populate your targets with files.
+
+   For more details, see the *note EDE reference manual: (ede)Top.
+
+   In addition to EDE and basic CEDET configuration, you will likely
+want to add the following semantic configuration to your `.emacs' file.
+
+     (semantic-load-enable-code-helpers)
+
+   See the *note Semantic Configuration: (semantic)Canned Configuration.
+section of the semantic manual for more details about these features.
+
+   You may also want to enable the SRecode template insertion mode.
+
+     (srecode-minor-mode 1)
+
+   Both semantic and SRecode take advantage of EDE's knowledge of a
+projects structure.
+
+
+File: cedet.info,  Node: Code Completion,  Next: Code Generation,  Prev: Project Management,  Up: Top
+
+6 Code Completion
+*****************
+
+Code Completion, or perhaps "Intellisense" is a difficult problem to
+get working in Emacs.  To use the CEDET suite to do it, you will need
+to start by augmenting the basic CEDET install in your `.emacs' file
+with:
+
+     (semantic-load-enable-code-helpers)
+
+   Basic code helpers enable idle parsing and summary mode.  To get
+idle-completions mode, and some more decorative features, use:
+
+     (semantic-load-enable-guady-code-helpers)
+
+   TODO - add other handy bindings here.
+
+   For more on configuration *note Semantic Configuration:
+(semantic)Canned Configuration.  section of the semantic manual for
+more details about these features.
+
+   The basic idea is that Semantic will need to parse your source code
+and build lookup tables.  The tables are then searched to provide the
+completion you might be looking for.
+
+   To improve the things Semantic can find and complete with, you then
+need to configure a few more things.  This is done mainly by providing
+details on where Semantic can find the source code where your tag
+definitions are.
+
+   For more, *note Semantic search configuration:
+(semantic-user)Semanticdb Search Configuration.
+
+   Once you've optimized semantic's ability to find your sources, there
+are several code completion options.  For more, *note semantic
+analyzer: (semantic-user)Analyzer.
+
+   If code completion doesn't work on your code right away, please read
+the section on *note Smart Completion Debugging: (semantic-user)Smart
+Completion Debugging.
+
+
+File: cedet.info,  Node: Code Generation,  Next: C++ Features,  Prev: Code Completion,  Up: Top
+
+7 Code Generation
+*****************
+
+Code Generation, or the ability to automatically write code from some
+set of static data is done through the SRecode library.  SRecode is a
+template manager that uses the semantic infrastructure to support
+common concepts across multiple languages.
+
+   To effectively create a code-generation library, you need to
+configure semantic.  Read *note Semantic Configuration:
+(semantic)Canned Configuration.  for more.
+
+   Secondly, you will need to configure SRecode.  Read *note SRecode
+Manual: (srecode)Quick Start;
+
+   Once installed, you can jump right in to writing your Lisp and *note
+Template Writing: (screcode)Template Writing.
+
+
+File: cedet.info,  Node: C++ Features,  Next: GNU Global,  Prev: Code Generation,  Up: Top
+
+8 C++ Features
+**************
+
+If you are using CEDET with C or C++, then there are a few C/C++
+specific options you may need to update.
+
+8.1 C Pre-processor
+===================
+
+C and C++ use pre-processor directives, and the semantic parser has
+some basic support for a pre-processor.  As such, you may need to set
+up some macros.  You can do that in two ways.
+
+   The first option is to create your own symbol map in Emacs Lisp.  You
+can customize the preprocessor symbol map.
+
+ -- Variable: semantic-lex-c-preprocessor-symbol-map
+     Table of C Preprocessor keywords used by the Semantic C lexer.
+     Each entry is a cons cell like this:   ( "KEYWORD" . "REPLACEMENT"
+     ) Where KEYWORD is the macro that gets replaced in the lexical
+     phase, and REPLACEMENT is a string that is inserted in it's place.
+     Empty string implies that the lexical analyzer will discard
+     KEYWORD when it is encountered.
+
+     Alternately, it can be of the form:   ( "KEYWORD" ( LEXSYM1 "str"
+     1 1 ) ... ( LEXSYMN "str" 1 1 ) ) where LEXSYM is a symbol that
+     would normally be produced by the lexical analyzer, such as
+     `symbol' or "string".  The string in the second position is the
+     text that makes up the replacement.  This is the way to have
+     multiple lexical symbols in a replacement.  Using the first way to
+     specify text like "foo::bar" would not work, because : is a
+     separate lexical symbol.
+
+     A quick way to see what you would need to insert is to place a
+     definition such as:
+
+     #define MYSYM foo::bar
+
+     into a C file, and do this:   `M-x' semantic-lex-spp-describe
+
+     The output table will describe the symbols needed.
+
+   Alternately, you can use an existing C header file, or write your own
+custom C header file, and use the macros in that to initialize the
+preprocessor list.
+
+ -- Variable: semantic-lex-c-preprocessor-symbol-file
+     List of C/C++ files that contain preprocessor macros for the C
+     lexer.  Each entry is a filename and each file is parsed, and
+     those macros are included in every C/C++ file parsed by semantic.
+     You can use this variable instead of
+     `semantic-lex-c-preprocessor-symbol-map' to store your global
+     macros in a more natural way.
+
+   Some such symbols for `stdio.h' as found on Linux are defined in
+`semantic-lex-c-preprocessor-symbol-map-builtin'.
+
+   Lastly, you could just opt to ignore conditional parsing.
+
+ -- Option: semantic-c-obey-conditional-section-parsing-flag
+     Non-`nil' means to interpret preprocessor #if sections.  This
+     implies that some blocks of code will not be parsed based on the
+     values of the conditions in the #if blocks.
+
+ -- Function: semantic-lex-c-nested-namespace-ignore-second
+     Should _GLIBCXX_BEGIN_NESTED_NAMESPACE ignore the second namespace?
+     It is really there, but if a majority of uses is to squeeze out
+     the second namespace in use, then it should not be included.
+
+     If you are having problems with smart completion and STL templates,
+     it may that this is set incorrectly.  After changing the value of
+     this flag, you will need to delete any semanticdb cache files that
+     may have been incorrectly parsed.
+
+8.2 System Include path
+=======================
+
+If you want the code-completion to work with C++ system header file,
+you will need to update `semantic-dependency-system-include-path' for
+C++ mode.
+
+     M-x customize-variable RET semantic-c-dependency-system-include-path RET
+
+   Customizing this variable will allow you to setup your system
+include path and will update all files when you use custom to do it.
+
+8.3 EDE Setup
+=============
+
+For large C or C++ programs, it is important to setup EDE for it.
+While EDE can be used to create makefiles and such using Automake, EDE
+also provides a way to merely describe a project so that tools like
+semantic can find your sources.
+
+   If your project already uses Automake, or if your project is Emacs or
+the Linux Kernel, there are pre-existing EDE project types that will
+automatically detect these projects.
+
+   If EDE does not automatically detect your type of project, you may
+want to use the very simple `ede-cpp-root-project' type.  To use it,
+add this to your `.emacs' file, or other configuration:
+
+     (global-ede-mode 1) ;; Enable EDE
+     (ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
+
+   where SOMENAME is a name for this project, and the file is a file
+name that exists at the root of your project directory.  There are many
+more options for the optimization of finding your header files.  For
+more on this option, including include path setting, and providing
+macro to the C pre-processor, see *note ede-cpp-root: (ede)the
+ede-cpp-root chapter.
+
+
+File: cedet.info,  Node: GNU Global,  Next: ID Utils,  Prev: C++ Features,  Up: Top
+
+9 GNU Global
+************
+
+Several tools in CEDET can support the use of GNU Global.  If you use
+GNU Global in your project, you should enable the use of it to enhance
+or speed up various tools in CEDET.
+
+   You can download GNU Global from `http://www.gnu.org/software/global'
+
+   To make sure your GNU Global installation is good, use the command
+
+     M-x cedet-gnu-global-version-check RET
+
+   You can wrap any CEDET / GNU Global configurations in your `.emacs'
+file like this:
+
+     (setq cedet-global-command "global") ; Change to path of global as needed
+     (when (cedet-gnu-global-version-check t)  ; Is it ok?
+         ;; Configurations for GNU Global and CEDET
+         )
+
+9.1 EDE and GNU Global
+======================
+
+The EDE project system can use GNU Global to accelerate finding files
+within a project.  The EDE command to `ede-find-file' bound to `C-c .
+f' is one direct application.  semantic also makes heavy use of of the
+feature to find header files.
+
+   To enable it, configure the variable `ede-locate-setup-options'.
+Something like this can work in your `.emacs' file.
+
+     (setq ede-locate-setup-options
+           '(ede-locate-global
+             ede-locate-base))
+
+9.2 semantic Database
+=====================
+
+semantic can use GNU Global as a back end for database searches.  To
+enable it, use:
+
+     (semanticdb-enable-gnu-global-databases 'c++-mode)
+
+   where the first argument is a `major-mode' in which to use it.
+
+   GNU Global will then be used for project-wide searches as a backup
+when pre-existing semantic database searches may not have parsed all
+your files.
+
+9.3 semantic
+============
+
+The semantic symref tool can use GNU Global to local symbol references.
+This tool will automatically detect GNU Global and use it.  You can
+search for references via the commands:
+
+`semantic-symref'
+     Find references to the tag under the cursor.
+
+`semantic-symref-symbol'
+     Find references to an arbitrary symbol.
+
+
+File: cedet.info,  Node: ID Utils,  Next: CScope,  Prev: GNU Global,  Up: Top
+
+10 ID Utils
+***********
+
+Several tools in CEDET can support the use of ID Utils.  If you use ID
+Utils in your project, you should enable the use of it to enhance or
+speed up various tools in CEDET.
+
+   You can download ID Utils from `http://www.gnu.org/software/idutils/'
+
+   To make sure your ID Utils installation is good, use the command
+
+     M-x cedet-idutils-version-check RET
+
+   You can wrap any CEDET / ID Utils configurations in your `.emacs'
+file like this:
+
+     (when (cedet-idutils-version-check t)  ; Is it ok?
+         ;; Configurations for ID Utils and CEDET.
+         )
+
+10.1 EDE and ID Utils
+=====================
+
+The EDE project system can use ID Utils to accelerate finding files
+within a project.  The EDE command to `ede-find-file' bound to `C-c .
+f' is one direct application.  semantic also makes heavy use of of the
+feature to find header files.
+
+   To enable it, configure the variable `ede-locate-setup-options'.
+Something like this can work in your `.emacs' file.
+
+     (setq ede-locate-setup-options
+           '(ede-locate-idutils
+             ede-locate-base))
+
+10.2 semantic
+=============
+
+The semantic symref tool can use ID Utils to local symbol references.
+This tool will automatically detect ID Utils and use it.  You can
+search for references via the commands:
+
+`semantic-symref'
+     Find references to the tag under the cursor.
+
+`semantic-symref-symbol'
+     Find references to an arbitrary symbol.
+
+
+File: cedet.info,  Node: CScope,  Next: Maintenance,  Prev: ID Utils,  Up: Top
+
+11 CScope
+*********
+
+Several tools in CEDET can support the use of CScope.  If you use
+CScope in your project, you can enable the use of it to enhance or
+speed up various tools in CEDET.
+
+   You can download CScope from `http://cscope.sourceforge.net/'
+
+   To make sure your CScope installation is good, use the command
+
+     M-x cedet-cscope-version-check RET
+
+   You can wrap any CEDET / CScope configurations in your `.emacs' file
+like this:
+
+     (when (cedet-cscope-version-check t)  ; Is it ok?
+         ;; Configurations for CScope and CEDET.
+         )
+
+11.1 Detecting CScope
+=====================
+
+CScope is detected by the presense of a `cscope.out' file at the ROOT
+of your current project, as specified by EDE.  CScope the program
+supports multiple `cscope.out' files spread out through your project,
+but this is not detecte by CEDET.  It will also use a `cscope.out' in
+the same directory as your sources if you do not use EDE
+
+   If you use CScope and need this feature, please consider fixing it.
+Contact the cedet-devel mailing list.
+
+11.2 EDE and CScope
+===================
+
+The EDE project system can use CScope to accelerate finding files
+within a project.  The EDE command to `ede-find-file' bound to `C-c .
+f' is one direct application.  semantic also makes heavy use of of the
+feature to find header files for C and C++.
+
+   To enable it, configure the variable `ede-locate-setup-options'.
+Something like this can work in your `.emacs' file.
+
+     (setq ede-locate-setup-options
+           '(ede-locate-cscope
+             ede-locate-base))
+
+11.3 semantic Database
+======================
+
+@TODO
+
+   semantic can could use CScope as a back end for database searches,
+but this has not been implemented yet.
+
+11.4 semantic
+=============
+
+The semantic symref tool can use CScope to local symbol references.
+This tool will automatically detect CScope and use it.  You can search
+for references via the commands:
+
+`semantic-symref'
+     Find references to the tag under the cursor.
+
+`semantic-symref-symbol'
+     Find references to an arbitrary symbol.
+
+
+File: cedet.info,  Node: Maintenance,  Next: GNU Free Documentation License,  Prev: CScope,  Up: Top
+
+12 Maintenance
+**************
+
+Most of the CEDET tools do their best to maintain their data files and
+caches.  It is useful, however, to periodically run:
+
+     M-x semanticdb-cleanup-cache-files RET
+
+   to delete old database cache files that may no longer be associated
+with directories on your system.
+
+
+File: cedet.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Maintenance,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+   If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: cedet.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+
+Tag Table:
+Node: Top901
+Node: Overview1930
+Node: EIEIO4839
+Node: Semantic5850
+Node: SRecode7166
+Node: Speedbar7653
+Node: EDE8603
+Node: COGRE9927
+Node: Other Library Functions10462
+Node: Installation/Basic Configuration13058
+Node: JDEE Target15613
+Node: ECB Target16562
+Node: Project Management17285
+Node: Code Completion18620
+Node: Code Generation20244
+Node: C++ Features21013
+Ref: semantic-lex-c-preprocessor-symbol-map21641
+Ref: semantic-lex-c-preprocessor-symbol-file22994
+Ref: semantic-c-obey-conditional-section-parsing-flag23587
+Ref: semantic-lex-c-nested-namespace-ignore-second23834
+Node: GNU Global25823
+Node: ID Utils27859
+Node: CScope29381
+Node: Maintenance31533
+Node: GNU Free Documentation License31943
+Node: Index51678
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/common/cedet.texi b/site/cedet-1.0pre7/common/cedet.texi
new file mode 100644
index 0000000..95daddf
--- /dev/null
+++ b/site/cedet-1.0pre7/common/cedet.texi
@@ -0,0 +1,1001 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename cedet.info
+@set TITLE  CEDET Manual
+@set AUTHOR Eric M. Ludlam
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+@macro cedet{}
+@i{CEDET}
+@end macro
+
+@copying
+This manual documents @cedet{}, a collection of other tools.
+
+Copyright @copyright{} 2007, 2008, 2009 Eric M. Ludlam
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* CEDET: (cedet).	Collection of Emacs Development Environment Tools
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@ifinfo
+This file documents @cedet{}.
+@emph{Collection of Emacs Development Environment Tools}
+
+Copyright @copyright{} 2007 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2007 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@macro semantic{}
+@i{semantic}
+@end macro
+
+@macro srecode{}
+@i{SRecode}
+@end macro
+
+@macro eieio{}
+@i{EIEIO}
+@end macro
+
+@macro ede{}
+@i{EDE}
+@end macro
+
+@macro cogre{}
+@i{COGRE}
+@end macro
+
+@macro speedbar{}
+@i{Speedbar}
+@end macro
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+@cedet{} is a @i{Collection of Emacs Development Environment Tools}
+including core libraries such as @eieio{}, and @semantic{}, and user
+interface tools such as @speedbar{}, @ede{}, and @cogre{}.
+
+While these tools are independent, and all have their own manuals,
+they are also all co-dependent within @cedet{}, and are dependent on
+the @cedet{} common libraries such as @i{inversion} and @i{ezimage}.
+
+This manual describes how to configure the tools as a whole to
+accomplish some tasks.
+
+To send bug reports, or participate in discussions about @cedet{},
+use the mailing list cedet-devel.net via the URL:
+@url{http://lists.sourceforge.net/lists/listinfo/cedet-devel}
+
+@menu
+* Overview::                    
+* Installation/Basic Configuration::                
+* JDEE Target::
+* ECB Target::
+* Project Management::
+* Code Completion::
+* Code Generation::	
+* C++ Features::	
+* GNU Global::	
+* ID Utils::	
+* CScope::	
+* Maintenance::	Maintaining your @cedet{} Data files
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Overview
+@chapter Overview
+
+The @cedet{} collection is made up of several tools.  Each tool has
+it's own manual with details for that tool.
+
+At the core of the @cedet{} suite is @eieio{}, which is an
+@i{Implementation of Emacs Interpreted Objects}.  This provides a CLOS
+like interface to writing object-oriented code in Emacs.  @eieio{}
+forms the base of most of the other tools, with the notable exception
+of @speedbar{}.
+
+Several other tools form the next layer of @cedet{} functionality.
+For project management, @ede{} provides a simple way to create
+projects.  You can create an @ede{} centric project, which uses
+either Makefiles, or AutoMakefiles, or it can wrap an automake based
+program you've already developed.  You can also create simple @ede{}
+wrappers on top of any style of project.  @ede{} provides a backgrop
+for any other @cedet{} tool that needs to know the filesystem scope of
+a code base, where include directories might be.
+
+@semantic{} provides another mid-level layer.  @semantic{} provides a
+set of tools for developing parsers for different languages, and an
+API for searching and manipulating tags generated from your source
+code.  @semantic{} also provides a wide range of core tag centric
+utilities such as enhanced tag decoration, code analysis, and the
+coveted ``Smart Completion'' feature.
+
+Another mid-level tool is @srecode{} or the @i{Semantic Recoder}.
+@srecode{} is a template management system designed with the goal of
+providing a way to build code-generating applications that are easily
+modified or extended by users.  At it's core is a template authoring
+and insertion system.  A minor mode provides a simple way to insert
+templates from the various template libraries.
+
+@speedbar{} is a user interface tool that provides a narrow view into
+your filesystem and tags.  Speedbar is also an API for designing other
+tools and is used for displaying @ede{} project information, Semantic
+smart completion options, Email, Info, and even GDB stack information.
+
+Lastly, @cogre{} is a @i{COnnected GRaph Editor}.  The core is an
+object design and library for drawing, saving, and restoring simple
+connected graphs.  Built on this is a UML based tool which interfaces
+with Semantic Tag information to draw simple UML diagrams of your
+code.  As of this writing @cogre{} is quite simple.  Longer term
+plans include using @cogre{} as a way of manipulating source code
+indirectly.
+
+All these tools depend on a suite of simple library functions, such as
+@i{inversion}, @i{ezimage}, @i{pretty printing}, and @i{mode-local}
+variables.
+
+@menu
+* EIEIO::       Object system for Emacs.
+* Semantic::    Parser generator and tag management tool.
+* SRecode::	Semantic Recoder Template manager
+* Speedbar::    File and tag explorer, plus more.
+* EDE::         Project Management tool.
+* COGRE::       Diagram editor for object design.
+* Other Library Functions::
+@end menu
+
+@node EIEIO
+@section @eieio{}
+
+@eieio{} contains the core object library for @cedet{}.  You can
+define classes, and methods for those classes using @i{CLOS} style
+syntax.  Objects can be customized using the Emacs customization tool,
+which allows easy creation of dialog box style UIs.  A series of bases
+classes allows the creation of Emacs centric tools, wrapping up the
+details of persistence, instance tracking, or instance inheritance.
+
+@eieio{} also includes several stray tools, such as @file{tree.el}
+for drawing tree diagrams, @file{chart.el} for drawing charts,
+@file{linemark.el} for managing visible bookmarks programatically, and
+@file{lmcompile.el}, which is a linemark tool that puts out bookmarks
+for compiler error hits.
+
+Lastly, @eieio{} has baseclasses for writing @speedbar{} interfaces.
+Take an existing object hierarchy and inherit from these baseclasses
+to be browsable in Speedbar.
+
+For more details on @eieio{}, read the
+@inforef{top, EIEIO Reference Manul, eieio}.
+
+
+@node Semantic
+@section Semantic
+
+@semantic{} is a parser generator, lexical analyzer, parser
+development environment, parser, tag generation and management system.
+Build on this is a persistent tag management system database and
+search utility.  Code analysis and completion generation is also
+provided.  @semantic{} includes tools such as speedbar interfaces to
+tags, context analysis, and completion options, Popup smart
+completion, tag decoration, and support for a wide range of Emacs
+tools such as Imenu, wich-func, hippie-expand, isearch, and
+cut/copy/paste.
+
+For high level overviews, configuration advice, etc, please read
+@inforef{Top, Semantic Manual, semantic}.
+
+If you are an application developer and need to know the functions and
+concepts, 
+@inforef{Top, the Application Development Manual, semantic-appdev}.
+
+To support a new language,
+@inforef{Top, the Language Support Developer's Guide, semantic-langdev}.
+
+To use the grammar writing environment, and write in the rule based
+language, 
+@inforef{Top, the Grammar Framework Manual, grammar-fw}.
+
+For details on the original @semantic{} @acronym{LL} parser,
+@inforef{Top, the Bovine Parser Manual, bovine}.
+ 
+For details on the Bison-like @acronym{LALR} parser,
+@inforef{Top, the Wisent Parser Manual, wisent}.
+
+
+@node SRecode
+@section @srecode{}
+
+@srecode{} is a Template manager for writing code from Semantic
+templates.  It includes a specialized template authoring language and
+environment, template loader and interpreter.  A minor mode for
+inserting mode specific templates, and some sample applications that
+also uses templates to write code.
+
+For more details on @srecode{}, read the
+@inforef{top, SRecode Manual, srecode};
+
+@node Speedbar
+@section Speedbar
+
+@speedbar{} is an abbreviated everything browser.  If you can
+conceptualize browsable information into 20 columns, then Speedbar can
+display it for you.
+
+Speedbar comes with several interfaces, with the primary one being for
+files and tags.  It can also display buffer lists, RMAIL boxes, and
+Info nodes.  Combined with @cedet{}, it also provides project tracking,
+smart completion lists, Class browsing, Connected graph browsing.
+
+You can use speedbar to write your own browsers.  Some external tools
+include ERC (Irc client), xslt-process, MH-E (mail reader), and ECB, a
+code browser which embeds Speebar.
+
+@speedbar{} has been a part of Emacs for quite a while.  The @cedet{}
+version of speedbar (as of this writing, Jul 08) is nearly identical
+to the version in Emacs 22.
+
+For more details, read the 
+@inforef{top, Speedbar Manual, speedbar}.
+
+@node EDE
+@section @ede{}
+
+@ede{} is the @i{Emacs Development Environment}, which means that it
+manages projects, and can build Makefiles, track distribution and web
+sites associated with your GNU project.
+
+@ede{} has several types of projects it can manage with varying
+degrees of development support.  An @ede{} centric project will generate
+Makefiles or Automake files, and provides menus and keybindings for
+compiling any target, debugging programs by providing the arguments to
+your debugger, and will make sure you don't forget to include some
+file in your targets.  It will help you build distribution files, and
+post them to the web (such as with Source Forge).  @ede{} will track
+revision numbers and make sure they are updated in multiple places.
+
+Projects that are merely wrapped with @ede{} can support a small
+subset of the above.  All project provide an API to other programs
+that need to know the scope of a project, such as which files belong
+together, where include directories might be, how to find
+documentation, and details of that nature.  You can even create
+project-local variables, which are Emacs variables with specific
+values within the scope of an @ede{} controlled project.
+
+Read more about it in the
+@inforef{top, EDE reference manual, ede}.
+
+@node COGRE
+@section COGRE
+
+@cogre{} is a @i{COnnected GRaph Editor}.  You can use it to create
+simple connected graphs and diagrams.  You can also create more
+complex UML class diagrams in it, or even bind UML diagrams directly
+to source code, navigating your source via the UML diagram.
+
+While @cogre{} does have a lot of functionality, it still needs more
+work.  Consider improving @cogre{}.
+
+Read more a bout it in
+@inforef{top, the COGRE manual, cogre}.
+
+@node Other Library Functions
+@section Other @cedet{} Library functions
+
+@cedet{} provides several other useful libraries in the
+@file{common/} directory.  These libraries supply most of their
+documentation through the Commentary section of the Emacs Lisp file.
+
+Some of the libraries are:
+
+@itemize @file
+@item cedet-edebug.el
+Collection of extensions to support custom @cedet{} datatypes.
+@item ezimage.el
+Support for covering text in an Emacs buffer with an image.  This is
+based on text patterns, and is portable across most versions of Emacs
+and XEmacs.
+
+Using ezimage allows you to write a text based UI, and then enhance it
+with images afterwards, allowing your UI to work well in a text
+frame, in addition to looking pretty spiff in a graphical frame.
+@item pulse.el
+Simple way to briefly highlight a region or line.  For Emacs 22, it
+will pulse the line, with the color drifting from one shade to
+another.  For older versions Emacs, it will just highlight the line
+briefly.
+@item fame.el
+Support for @code{message} channels, allowing a program to provide a
+wide range of messages, and allowing a user to configure which set
+they want to see.
+@item inversion.el
+Revision management system.  Allows you to use @code{require} syntax
+for a specific version of some tool.  If the tool is not compatible
+with your desired version, a signal is thrown.
+@item mode-local.el
+Specify functions that have different behaviors based on major-mode,
+or variables with different local values based on major mode.  Setting
+a value to a specific mode causes the value to change for all buffers
+of that mode.
+
+mode-local is also aware of mode inheritance, such that C++ mode
+inherits some C configurations.  You can also run code, or access
+variables from other modes by with a temorary scoped setting.
+
+mode local is used extensively throughout the @semantic{} package.
+@item pprint.el
+A pretty printer for Emacs Lisp code.  Use it to dump out large
+complex datastructures.
+@item sformat.el
+A Super Format function.  Define lists of associations between letters
+and values, and then create format strings with % tokens for any
+letter.
+
+sformat is used in the semantic document package to construct complex
+documentation strings.
+@item working.el
+Display a working message, or a ``percentage done'' style bar in the
+mini-buffer.  Tasks that take a long time can use working to provide
+user feedback explaining a delay.
+@end itemize
+
+@node Installation/Basic Configuration
+@chapter Installation and Basic Configuration
+
+A compilation centric version of the @cedet{} installation is in the
+INSTALL file in the top level @cedet{} directory.
+
+@enumerate
+@item Compile @cedet{}
+
+@example
+make
+@end example
+
+or 
+
+@example
+make EMACS=<your favorite emacs> MAKEINFO=<substitute, or echo>
+@end example
+
+If you do not have @code{make} installed on your system, or if you
+cannot get the @file{Makefile}s to work, then you can use the all
+Emacs solution in @file{cedet-build.el} which is found in the
+toplevel @cedet directory.
+
+Read the Commentary section of @file{cedet-build.el} for details on
+using this method.
+
+@item Install .emacs hooks
+
+Load @cedet{} in your @file{.emacs} file.  You do not need to install
+all of cedet into any magic Emacs controlled directories, or modify
+your loadpath.  The @cedet{} bootstrap file will automatically update
+your load path, and load all the autoload files.  The cedet
+configuration will load a minimum set of files in.
+
+@example
+;; Load CEDET
+(load-file "~/cedet-VERSION/common/cedet.el")
+@end example
+
+@item Configuration
+
+You will likely need to configure @cedet{} to your application.  Visit
+the other chapters in this manual for samples to get some ideas on
+possible configuration scenarios.
+
+@item Contribute to @cedet{}
+
+For general discussions on development of these tools, use the mailing
+list cedet-devel@@sourceforge.net via the URL:
+
+@url{http://lists.sourceforge.net/lists/listinfo/cedet-devel}
+
+For @semantic{} development use the mailing list cedet-semantic.net via
+the URL:
+
+@url{http://lists.sourceforge.net/lists/listinfo/cedet-semantic}
+
+For @eieio{} use the mailing list cedet-eieio@@sourceforge.net via the
+URL:
+
+@url{http://lists.sourceforge.net/lists/listinfo/cedet-eieio}
+
+@item Install Additional Tools
+
+You may also need to download some of the following files for more
+obscure features.
+
+To use the JavaScript parser:
+javascript-mode.el : @url{http://www.emacswiki.org/cgi-bin/wiki/JavaScriptMode}
+
+To use Exuberent ctags to emable Semantic support in more major modes,
+or as an extra database backend parser, install ctags:
+@url{http://ctags.sourceforge.net/}
+   
+To use the UML chart generation from @code{M-x semantic-dot}
+graphviz dot programs, including @file{dotty}
+@url{http://www.graphviz.org/}
+
+To use the graphviz dot parser: @file{graphviz-dot-mode.el} see the
+commentary in cogre/wisent-dot.el
+
+@end enumerate
+
+@node JDEE Target
+@chapter @i{JDEE} Target
+
+@i{JDEE}, or the @i{Java Development Environment}, depends on @cedet{}
+for both @eieio{}, the object system, and Semantic, for parsing and
+providing tagging information.
+
+In addition to the basic @cedet{} configuration, you will likely want to
+add the following Semantic configuration to your @file{.emacs} file.
+
+@example
+(semantic-load-enable-minimum-features)
+@end example
+
+This provides basic idle-time parsing of files, and persistence to
+support the semantic APIs.
+
+If you would like to use more of the Semantic tools for your coding in
+Java, you may want to enable this instead:
+
+@example
+(semantic-load-enable-code-helpers)
+@end example
+
+or the fancier
+
+@example
+(semantic-load-enable-guady-code-helpers)
+@end example
+
+See the
+@inforef{Canned Configuration, Semantic Configuration, semantic}.
+section of the semantic manual for more details about these features.
+
+@node ECB Target
+@chapter ECB Target
+
+@i{ECB}, or the @i{Emacs Code Browser} depends on @cedet{} for the @semantic{}
+parsing engine, and several other features.  @i{ECB} can display a
+window that shows semantic tag information.
+
+@i{ECB} can also be used with @i{JDEE}.
+
+In addition to the basic @cedet{} configuration, you will likely want to
+add the following Semantic configuration to your @file{.emacs} file.
+
+@example
+(semantic-load-enable-code-helpers)
+@end example
+
+or the fancier
+
+@example
+(semantic-load-enable-guady-code-helpers)
+@end example
+
+See the
+@inforef{Canned Configuration, Semantic Configuration, semantic}.
+section of the semantic manual for more details about these features.
+
+@node Project Management
+@chapter Project Management
+
+If you are looking for @cedet{} to help you manage a project full of
+sourcecode, then you will be using @ede{} and @semantic{}.
+
+To enable @ede{} add this to your @file{.emacs} file after @cedet{}
+is loaded:
+
+@example
+(global-ede-mode 1)
+@end example
+
+You can use @ede{} to define
+your projects.  If you are starting a new project, put a file from
+your new project into a buffer, and type:
+
+@example
+M-x ede-new RET
+@end example
+
+Now select either ``Make'' or ``Automake'', which determines the
+underlying build technology to use for compilation.
+
+Use the menu to add targets.  You can then use either Speedbar or
+dired to populate your targets with files.
+
+For more details, see the 
+@inforef{Top, EDE reference manual, ede}.
+
+
+In addition to @ede{} and basic @cedet{} configuration, you will likely
+want to add the following @semantic{} configuration to your
+@file{.emacs} file.
+
+@example
+(semantic-load-enable-code-helpers)
+@end example
+
+See the
+@inforef{Canned Configuration, Semantic Configuration, semantic}.
+section of the semantic manual for more details about these features.
+
+You may also want to enable the @srecode{} template insertion mode.
+
+@example
+(srecode-minor-mode 1)
+@end example
+
+Both @semantic{} and @srecode{} take advantage of @ede{}'s knowledge of a
+projects structure.
+
+@node Code Completion
+@chapter Code Completion
+
+Code Completion, or perhaps ``Intellisense'' is a difficult problem to
+get working in Emacs.  To use the @cedet{} suite to do it, you will
+need to start by augmenting the basic @cedet{} install in your
+@file{.emacs} file with:
+
+@example
+(semantic-load-enable-code-helpers)
+@end example
+
+Basic code helpers enable idle parsing and summary mode.  To get
+idle-completions mode, and some more decorative features, use:
+
+@example
+(semantic-load-enable-guady-code-helpers)
+@end example
+
+TODO - add other handy bindings here.
+
+For more on configuration
+@inforef{Canned Configuration, Semantic Configuration, semantic}.
+section of the semantic manual for more details about these features.
+
+The basic idea is that Semantic will need to parse your source code and
+build lookup tables.  The tables are then searched to provide the
+completion you might be looking for.
+
+To improve the things Semantic can find and complete with, you then
+need to configure a few more things.  This is done mainly by providing
+details on where Semantic can find the source code where your tag
+definitions are.
+
+For more, 
+@inforef{Semanticdb Search Configuration, Semantic search configuration, semantic-user}.
+
+Once you've optimized @semantic{}'s ability to find your sources,
+there are several code completion options.  For more,
+@inforef{Analyzer, semantic analyzer, semantic-user}.
+
+If code completion doesn't work on your code right away, please read
+the section on @inforef{Smart Completion Debugging, Smart Completion Debugging, semantic-user}.
+
+@node Code Generation
+@chapter Code Generation
+
+Code Generation, or the ability to automatically write code from some
+set of static data is done through the @srecode{} library.
+@srecode{} is a template manager that uses the @semantic{}
+infrastructure to support common concepts across multiple languages.
+
+To effectively create a code-generation library, you need to configure
+@semantic{}.
+Read @inforef{Canned Configuration, Semantic Configuration, semantic}.
+for more.
+@refill
+
+Secondly, you will need to configure @srecode{}.  Read
+@inforef{Quick Start, SRecode Manual, srecode};
+@refill
+
+Once installed, you can jump right in to writing your Lisp and
+@inforef{Template Writing, Template Writing, screcode}.
+
+
+@node C++ Features
+@chapter C++ Features
+
+If you are using @cedet{} with C or C++, then there are a few C/C++ specific
+options you may need to update.
+
+@section C Pre-processor
+
+C and C++ use pre-processor directives, and the @semantic{} parser has
+some basic support for a pre-processor.  As such, you may need to set
+up some macros.  You can do that in two ways.
+
+The first option is to create your own symbol map in Emacs Lisp.  You
+can customize the preprocessor symbol map.
+
+@defvar semantic-lex-c-preprocessor-symbol-map
+@anchor{semantic-lex-c-preprocessor-symbol-map}
+Table of @var{c} Preprocessor keywords used by the Semantic @var{c} lexer.
+Each entry is a cons cell like this:
+  ( ``@var{keyword}`` . ''REPLACEMENT'' )
+Where @var{keyword} is the macro that gets replaced in the lexical phase,
+and @var{replacement} is a string that is inserted in it's place.  Empty string
+implies that the lexical analyzer will discard @var{keyword} when it is encountered.
+
+Alternately, it can be of the form:
+  ( ``@var{keyword}`` ( @var{lexsym1} ``str'' @var{1} @var{1} ) @dots{} ( @var{lexsymn} ''str'' @var{1} @var{1} ) )
+where @var{lexsym} is a symbol that would normally be produced by the
+lexical analyzer, such as @code{symbol} or @dfn{string}.  The string in the
+second position is the text that makes up the replacement.  This is
+the way to have multiple lexical symbols in a replacement.  Using the
+first way to specify text like ``foo::bar'' would not work, because :
+is a separate lexical symbol.
+
+A quick way to see what you would need to insert is to place a
+definition such as:
+
+#define @var{mysym} foo::bar
+
+into a @var{c} file, and do this:
+  @kbd{M-x} semantic-lex-spp-describe
+
+The output table will describe the symbols needed.
+@end defvar
+
+Alternately, you can use an existing C header file, or write your own
+custom C header file, and use the macros in that to initialize the
+preprocessor list.
+
+@defvar semantic-lex-c-preprocessor-symbol-file
+@anchor{semantic-lex-c-preprocessor-symbol-file}
+List of @var{c}/@var{c}++ files that contain preprocessor macros for the @var{c} lexer.
+Each entry is a filename and each file is parsed, and those macros
+are included in every @var{c}/@var{c}++ file parsed by semantic.
+You can use this variable instead of @code{semantic-lex-c-preprocessor-symbol-map}
+to store your global macros in a more natural way.
+@end defvar
+
+Some such symbols for @file{stdio.h} as found on Linux are defined in
+@code{semantic-lex-c-preprocessor-symbol-map-builtin}.
+
+Lastly, you could just opt to ignore conditional parsing.
+
+@deffn Option semantic-c-obey-conditional-section-parsing-flag
+@anchor{semantic-c-obey-conditional-section-parsing-flag}
+Non-@code{nil} means to interpret preprocessor #if sections.
+This implies that some blocks of code will not be parsed based on the
+values of the conditions in the #if blocks.
+@end deffn
+
+
+@defun semantic-lex-c-nested-namespace-ignore-second
+@anchor{semantic-lex-c-nested-namespace-ignore-second}
+Should _@var{GLIBCXX_BEGIN_NESTED_NAMESPACE} ignore the second namespace?
+It is really there, but if a majority of uses is to squeeze out
+the second namespace in use, then it should not be included.
+
+If you are having problems with smart completion and @var{STL} templates,
+it may that this is set incorrectly.  After changing the value
+of this flag, you will need to delete any semanticdb cache files
+that may have been incorrectly parsed.
+@end defun
+
+@section System Include path
+
+If you want the code-completion to work with C++ system header file,
+you will need to update @code{semantic-dependency-system-include-path} for
+C++ mode.
+
+@example
+M-x customize-variable RET semantic-c-dependency-system-include-path RET
+@end example
+
+
+Customizing this variable will allow you to setup your system include path
+and will update all files when you use custom to do it.
+
+@section EDE Setup
+
+For large C or C++ programs, it is important to setup @ede{} for it. 
+While @ede{} can be used to create makefiles and such using Automake,
+@ede{} also provides a way to merely describe a project so that tools
+like @semantic{} can find your sources.
+
+If your project already uses Automake, or if your project is Emacs or
+the Linux Kernel, there are pre-existing EDE project types that will
+automatically detect these projects.
+
+If EDE does not automatically detect your type of project, you may
+want to use the very simple @code{ede-cpp-root-project} type.  To use
+it, add this to your @file{.emacs} file, or other configuration:
+
+@example
+(global-ede-mode 1) ;; Enable EDE
+(ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
+@end example
+
+where SOMENAME is a name for this project, and the file is a file name
+that exists at the root of your project directory.  There are many
+more options for the optimization of finding your header files.
+For more on this option, including include path setting, and providing
+macro to the C pre-processor, see
+@inforef{the ede-cpp-root chapter, ede-cpp-root, ede}.
+
+
+@node GNU Global
+@chapter GNU Global
+
+Several tools in @cedet{} can support the use of GNU Global.  If you use
+GNU Global in your project, you should enable the use of it to enhance
+or speed up various tools in @cedet{}.
+
+You can download GNU Global from @url{http://www.gnu.org/software/global}
+
+To make sure your GNU Global installation is good, use the command
+
+@example
+M-x cedet-gnu-global-version-check RET
+@end example
+
+You can wrap any @cedet{} / GNU Global configurations in your
+@file{.emacs} file like this:
+
+@example
+(setq cedet-global-command "global") ; Change to path of global as needed
+(when (cedet-gnu-global-version-check t)  ; Is it ok?
+    ;; Configurations for GNU Global and CEDET
+    )
+@end example
+
+@section @ede{} and GNU Global
+
+The @ede{} project system can use GNU Global to accelerate finding
+files within a project.  The EDE command to @code{ede-find-file}
+bound to @kbd{C-c . f} is one direct application.  @semantic{} also
+makes heavy use of of the feature to find header files.
+
+To enable it, configure the variable @code{ede-locate-setup-options}.
+Something like this can work in your @file{.emacs} file.
+
+@example
+(setq ede-locate-setup-options
+      '(ede-locate-global 
+        ede-locate-base))
+@end example
+
+@section @semantic{} Database
+
+@semantic{} can use GNU Global as a back end for database searches.
+To enable it, use:
+
+@example
+(semanticdb-enable-gnu-global-databases 'c++-mode)
+@end example
+
+where the first argument is a @code{major-mode} in which to use it.
+
+GNU Global will then be used for project-wide searches as a backup
+when pre-existing @semantic{} database searches may not have parsed
+all your files.
+
+@section @semantic Symref
+
+The semantic symref tool can use GNU Global to local symbol
+references.  This tool will automatically detect GNU Global and use
+it.  You can search for references via the commands:
+
+@table @code
+@item semantic-symref
+Find references to the tag under the cursor.
+@item semantic-symref-symbol
+Find references to an arbitrary symbol.
+@end table
+
+@node ID Utils
+@chapter ID Utils
+
+Several tools in @cedet{} can support the use of ID Utils.  If you use
+ID Utils in your project, you should enable the use of it to enhance
+or speed up various tools in @cedet{}.
+
+You can download ID Utils from @url{http://www.gnu.org/software/idutils/}
+
+To make sure your ID Utils installation is good, use the command
+
+@example
+M-x cedet-idutils-version-check RET
+@end example
+
+You can wrap any @cedet{} / ID Utils configurations in your
+@file{.emacs} file like this:
+
+@example
+(when (cedet-idutils-version-check t)  ; Is it ok?
+    ;; Configurations for ID Utils and @cedet{}.
+    )
+@end example
+
+@section @ede{} and ID Utils
+
+The @ede{} project system can use ID Utils to accelerate finding
+files within a project.  The EDE command to @code{ede-find-file}
+bound to @kbd{C-c . f} is one direct application.  @semantic{} also
+makes heavy use of of the feature to find header files.
+
+To enable it, configure the variable @code{ede-locate-setup-options}.
+Something like this can work in your @file{.emacs} file.
+
+@example
+(setq ede-locate-setup-options
+      '(ede-locate-idutils
+        ede-locate-base))
+@end example
+
+@section @semantic Symref
+
+The semantic symref tool can use ID Utils to local symbol
+references.  This tool will automatically detect ID Utils and use
+it.  You can search for references via the commands:
+
+@table @code
+@item semantic-symref
+Find references to the tag under the cursor.
+@item semantic-symref-symbol
+Find references to an arbitrary symbol.
+@end table
+
+@node CScope
+@chapter CScope
+
+Several tools in @cedet{} can support the use of CScope.  If you use
+CScope in your project, you can enable the use of it to enhance
+or speed up various tools in @cedet{}.
+
+You can download CScope from @url{http://cscope.sourceforge.net/}
+
+To make sure your CScope installation is good, use the command
+
+@example
+M-x cedet-cscope-version-check RET
+@end example
+
+You can wrap any @cedet{} / CScope configurations in your
+@file{.emacs} file like this:
+
+@example
+(when (cedet-cscope-version-check t)  ; Is it ok?
+    ;; Configurations for CScope and CEDET.
+    )
+@end example
+
+@section Detecting CScope
+
+CScope is detected by the presense of a @file{cscope.out} file at the
+ROOT of your current project, as specified by @ede{}.  CScope the program
+supports multiple @file{cscope.out} files spread out through your
+project, but this is not detecte by @cedet{}.  It will also use a
+@file{cscope.out} in the same directory as your sources if you do not
+use @ede{}
+
+If you use CScope and need this feature, please consider fixing it.
+Contact the cedet-devel mailing list.
+
+@section @ede{} and CScope
+
+The @ede{} project system can use CScope to accelerate finding
+files within a project.  The EDE command to @code{ede-find-file}
+bound to @kbd{C-c . f} is one direct application.  @semantic{} also
+makes heavy use of of the feature to find header files for C and C++.
+
+To enable it, configure the variable @code{ede-locate-setup-options}.
+Something like this can work in your @file{.emacs} file.
+
+@example
+(setq ede-locate-setup-options
+      '(ede-locate-cscope
+        ede-locate-base))
+@end example
+
+@section @semantic{} Database
+
+@@TODO
+
+@semantic{} can could use CScope as a back end for database searches,
+but this has not been implemented yet.  
+
+@ignore
+@example
+(semanticdb-enable-cscope-databases 'c++-mode)
+@end example
+
+where the first argument is a @code{major-mode} in which to use it.
+
+CScope will then be used for project-wide searches as a backup when
+pre-existing @semantic{} database searches may not have parsed all
+your files.
+@end ignore
+
+@section @semantic Symref
+
+The semantic symref tool can use CScope to local symbol references.
+This tool will automatically detect CScope and use it.  You can search
+for references via the commands:
+
+@table @code
+@item semantic-symref
+Find references to the tag under the cursor.
+@item semantic-symref-symbol
+Find references to an arbitrary symbol.
+@end table
+
+@node Maintenance
+@chapter Maintenance
+
+Most of the @cedet{} tools do their best to maintain their data files and
+caches.  It is useful, however, to periodically run:
+
+@example
+M-x semanticdb-cleanup-cache-files RET
+@end example
+
+to delete old database cache files that may no longer be associated
+with directories on your system.
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include ../semantic/doc/fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
diff --git a/site/cedet-1.0pre7/common/data-debug.el b/site/cedet-1.0pre7/common/data-debug.el
new file mode 100644
index 0000000..a70cc03
--- /dev/null
+++ b/site/cedet-1.0pre7/common/data-debug.el
@@ -0,0 +1,1092 @@
+;;; data-debug.el --- Datastructure Debugger
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: data-debug.el,v 1.25 2009/09/12 02:31:14 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide a simple way to investigate particularly large and complex
+;; data structures.
+;;
+;; The best way to get started is to bind M-: to 'data-debug-eval-expression.
+;;
+;; (global-set-key "\M-:" 'data-debug-eval-expression)
+;;
+;; If you write functions with complex output that need debugging, you
+;; can make them interactive with data-debug-show-stuff.  For example:
+;;
+;; (defun my-complex-output-fcn ()
+;;   "Calculate something complicated at point, and return it."
+;;   (interactive) ;; function not normally interactive
+;;   (let ((stuff (do-stuff)))
+;;     (when (interactive-p)
+;;       (data-debug-show-stuff stuff "myStuff"))
+;;     stuff))
+
+(require 'font-lock)
+(require 'ring)
+
+;;; Code:
+
+;;; Compatibility
+;;
+(if (featurep 'xemacs)
+    (eval-and-compile
+      (defalias 'data-debug-overlay-properties 'extent-properties)
+      (defalias 'data-debug-overlay-p 'extentp)
+      (if (not (fboundp 'propertize))
+	  (defun dd-propertize (string &rest properties)
+	    "Mimic 'propertize' in from Emacs 23."
+	    (add-text-properties 0 (length string) properties string)
+	    string
+	    )
+	(defalias 'dd-propertize 'propertize))
+      )
+  ;; Regular Emacs
+  (eval-and-compile
+    (defalias 'data-debug-overlay-properties 'overlay-properties)
+    (defalias 'data-debug-overlay-p 'overlayp)
+    (defalias 'dd-propertize 'propertize)
+    )
+  )
+
+;;; GENERIC STUFF
+;;
+;;;###autoload
+(defun data-debug-insert-property-list (proplist prefix &optional parent)
+  "Insert the property list PROPLIST.
+Each line starts with PREFIX.
+The attributes belong to the tag PARENT."
+  (while proplist
+    (let ((pretext (concat (symbol-name (car proplist)) " : ")))
+      (data-debug-insert-thing (car (cdr proplist))
+			       prefix
+			       pretext
+			       parent))
+    (setq proplist (cdr (cdr proplist)))))
+
+;;; overlays
+;;
+(defun data-debug-insert-overlay-props (overlay prefix)
+  "Insert all the parts of OVERLAY.
+PREFIX specifies what to insert at the start of each line."
+  (let ((attrprefix (concat (make-string (length prefix) ? ) "# "))
+	(proplist (data-debug-overlay-properties overlay)))
+    (data-debug-insert-property-list
+     proplist attrprefix)
+    )
+  )
+
+(defun data-debug-insert-overlay-from-point (point)
+  "Insert the overlay found at the overlay button at POINT."
+  (let ((overlay (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-overlay-props overlay
+				     (concat (make-string indent ? )
+					     "| "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-overlay-button (overlay prefix prebuttontext)
+  "Insert a button representing OVERLAY.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the overlay button."
+  (let ((start (point))
+	(end nil)
+	(str (format "%s" overlay))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-comment-face)
+    (put-text-property start end 'ddebug overlay)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-overlay-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; overlay list
+;;
+(defun data-debug-insert-overlay-list (overlaylist prefix)
+  "Insert all the parts of OVERLAYLIST.
+PREFIX specifies what to insert at the start of each line."
+  (while overlaylist
+    (data-debug-insert-overlay-button (car overlaylist)
+				      prefix
+				      "")
+    (setq overlaylist (cdr overlaylist))))
+
+(defun data-debug-insert-overlay-list-from-point (point)
+  "Insert the overlay found at the overlay list button at POINT."
+  (let ((overlaylist (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-overlay-list overlaylist
+				    (concat (make-string indent ? )
+					    "* "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-overlay-list-button (overlaylist
+					      prefix
+					      prebuttontext)
+  "Insert a button representing OVERLAYLIST.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the overlay list button."
+  (let ((start (point))
+	(end nil)
+	(str (format "#<overlay list: %d entries>" (length overlaylist)))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-comment-face)
+    (put-text-property start end 'ddebug overlaylist)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-overlay-list-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; buffers
+;;
+(defun data-debug-insert-buffer-props (buffer prefix)
+  "Insert all the parts of BUFFER.
+PREFIX specifies what to insert at the start of each line."
+  (let ((attrprefix (concat (make-string (length prefix) ? ) "# "))
+	(proplist
+	 (list :filename (buffer-file-name buffer)
+	       :live (buffer-live-p buffer)
+	       :modified (buffer-modified-p buffer)
+	       :size (buffer-size buffer)
+	       :process (get-buffer-process buffer)
+	       :localvars (buffer-local-variables buffer)
+	       )))
+    (data-debug-insert-property-list
+     proplist attrprefix)
+    )
+  )
+
+(defun data-debug-insert-buffer-from-point (point)
+  "Insert the buffer found at the buffer button at POINT."
+  (let ((buffer (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-buffer-props buffer
+				     (concat (make-string indent ? )
+					     "| "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-buffer-button (buffer prefix prebuttontext)
+  "Insert a button representing BUFFER.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the buffer button."
+  (let ((start (point))
+	(end nil)
+	(str (format "%S" buffer))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-comment-face)
+    (put-text-property start end 'ddebug buffer)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-buffer-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; buffer list
+;;
+(defun data-debug-insert-buffer-list (bufferlist prefix)
+  "Insert all the parts of BUFFERLIST.
+PREFIX specifies what to insert at the start of each line."
+  (while bufferlist
+    (data-debug-insert-buffer-button (car bufferlist)
+				      prefix
+				      "")
+    (setq bufferlist (cdr bufferlist))))
+
+(defun data-debug-insert-buffer-list-from-point (point)
+  "Insert the buffer found at the buffer list button at POINT."
+  (let ((bufferlist (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-buffer-list bufferlist
+				    (concat (make-string indent ? )
+					    "* "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-buffer-list-button (bufferlist
+					      prefix
+					      prebuttontext)
+  "Insert a button representing BUFFERLIST.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the buffer list button."
+  (let ((start (point))
+	(end nil)
+	(str (format "#<buffer list: %d entries>" (length bufferlist)))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-comment-face)
+    (put-text-property start end 'ddebug bufferlist)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-buffer-list-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; processes
+;;
+(defun data-debug-insert-process-props (process prefix)
+  "Insert all the parts of PROCESS.
+PREFIX specifies what to insert at the start of each line."
+  (let ((attrprefix (concat (make-string (length prefix) ? ) "# "))
+	(id (process-id process))
+	(tty (process-tty-name process))
+	(pcontact (process-contact process t))
+	(proplist (process-plist process)))
+    (data-debug-insert-property-list
+     (append
+      (if id (list 'id id))
+      (if tty (list 'tty tty))
+      (if pcontact pcontact)
+      proplist)
+     attrprefix)
+    )
+  )
+
+(defun data-debug-insert-process-from-point (point)
+  "Insert the process found at the process button at POINT."
+  (let ((process (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-process-props process
+				     (concat (make-string indent ? )
+					     "| "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-process-button (process prefix prebuttontext)
+  "Insert a button representing PROCESS.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the process button."
+  (let ((start (point))
+	(end nil)
+	(str (format "%S : %s" process (process-status process)))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-comment-face)
+    (put-text-property start end 'ddebug process)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-process-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; Rings
+;;
+;; A ring (like kill-ring, or whatever.)
+(defun data-debug-insert-ring-contents (ring prefix)
+  "Insert all the parts of RING.
+PREFIX specifies what to insert at the start of each line."
+  (let ((len (ring-length ring))
+	(idx 0)
+	)
+    (while (< idx len)
+      (data-debug-insert-thing (ring-ref ring idx) prefix "")
+      (setq idx (1+ idx))
+      )))
+
+(defun data-debug-insert-ring-items-from-point (point)
+  "Insert the ring found at the ring button at POINT."
+  (let ((ring (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-ring-contents ring
+				     (concat (make-string indent ? )
+					     "} "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-ring-button (ring
+				      prefix
+				      prebuttontext)
+  "Insert a button representing RING.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the stuff list button."
+  (let* ((start (point))
+	 (end nil)
+	 (str (format "#<RING: %d, %d max>"
+		      (ring-length ring)
+		      (ring-size ring)))
+	 (ringthing
+	  (if (= (ring-length ring) 0) nil (ring-ref ring 0)))
+	 (tip (format "Ring max-size %d, length %d."
+		      (ring-size ring)
+		      (ring-length ring)))
+	 )
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-type-face)
+    (put-text-property start end 'ddebug ring)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-ring-items-from-point)
+    (insert "\n")
+    )
+  )
+
+
+;;; Hash-table
+;;
+
+;;;###autoload
+(defun data-debug-insert-hash-table (hash-table prefix)
+  "Insert the contents of HASH-TABLE inserting PREFIX before each element."
+  (maphash
+   (lambda (key value)
+     (data-debug-insert-thing
+      key prefix
+      (dd-propertize "key " 'face font-lock-comment-face))
+     (data-debug-insert-thing
+      value prefix
+      (dd-propertize "val " 'face font-lock-comment-face)))
+   hash-table))
+
+(defun data-debug-insert-hash-table-from-point (point)
+  "Insert the contents of the hash-table button at POINT."
+  (let ((hash-table (get-text-property point 'ddebug))
+	(indent     (get-text-property point 'ddebug-indent))
+	start)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-hash-table
+     hash-table
+     (concat (make-string indent ? ) "> "))
+    (goto-char start))
+  )
+
+(defun data-debug-insert-hash-table-button (hash-table prefix prebuttontext)
+  "Insert HASH-TABLE as expandable button with recursive prefix PREFIX and PREBUTTONTEXT in front of the button text."
+  (let ((string (dd-propertize (format "%s" hash-table)
+			    'face 'font-lock-keyword-face)))
+    (insert (dd-propertize
+	     (concat prefix prebuttontext string)
+	     'ddebug        hash-table
+	     'ddebug-indent (length prefix)
+	     'ddebug-prefix prefix
+	     'help-echo
+	     (format "Hash-table\nTest: %s\nWeakness: %s\nElements: %d (of %d)"
+		     (hash-table-test hash-table)
+		     (if (hash-table-weakness hash-table) "yes" "no")
+		     (hash-table-count hash-table)
+		     (hash-table-size hash-table))
+	     'ddebug-function
+	     'data-debug-insert-hash-table-from-point)
+	    "\n"))
+  )
+
+;;; Widget
+;;
+;; Widgets have a long list of properties
+;;;###autoload
+(defun data-debug-insert-widget-properties (widget prefix)
+  "Insert the contents of WIDGET inserting PREFIX before each element."
+  (let ((type (car widget))
+	(rest (cdr widget)))
+    (while rest
+      (data-debug-insert-thing (car (cdr rest))
+			       prefix
+			       (concat
+				(dd-propertize (format "%s" (car rest))
+					       'face font-lock-comment-face)
+				" : "))
+      (setq rest (cdr (cdr rest))))
+    ))
+
+(defun data-debug-insert-widget-from-point (point)
+  "Insert the contents of the widget button at POINT."
+  (let ((widget (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-widget-properties
+     widget (concat (make-string indent ? ) "# "))
+    (goto-char start))
+  )
+
+(defun data-debug-insert-widget (widget prefix prebuttontext)
+  "Insert one WIDGET.
+A Symbol is a simple thing, but this provides some face and prefix rules.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing."
+  (let ((string (dd-propertize (format "#<WIDGET %s>" (car widget))
+			       'face 'font-lock-keyword-face)))
+    (insert (dd-propertize
+	     (concat prefix prebuttontext string)
+	     'ddebug        widget
+	     'ddebug-indent (length prefix)
+	     'ddebug-prefix prefix
+	     'help-echo
+	     (format "Widget\nType: %s\n# Properties: %d"
+		     (car widget)
+		     (/ (1- (length widget)) 2))
+	     'ddebug-function
+	     'data-debug-insert-widget-from-point)
+	    "\n")))
+
+;;; list of stuff
+;;
+;; just a list.  random stuff inside.
+;;;###autoload
+(defun data-debug-insert-stuff-list (stufflist prefix)
+  "Insert all the parts of STUFFLIST.
+PREFIX specifies what to insert at the start of each line."
+  (while stufflist
+    (data-debug-insert-thing
+     ;; Some lists may put a value in the CDR
+     (if (listp stufflist) (car stufflist) stufflist)
+     prefix
+     "")
+    (setq stufflist
+	  (if (listp stufflist)
+	      (cdr-safe stufflist)
+	    nil))))
+
+(defun data-debug-insert-stuff-list-from-point (point)
+  "Insert the stuff found at the stuff list button at POINT."
+  (let ((stufflist (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-stuff-list stufflist
+				  (concat (make-string indent ? )
+					  "> "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-stuff-list-button (stufflist
+					    prefix
+					    prebuttontext)
+  "Insert a button representing STUFFLIST.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the stuff list button."
+  (let ((start (point))
+	(end nil)
+	(str
+	 (condition-case nil
+	     (format "#<list o' stuff: %d entries>" (safe-length stufflist))
+	   (error "#<list o' stuff>")))
+	(tip (if (or (listp (car stufflist))
+		     (vectorp (car stufflist)))
+		 ""
+	       (format "%s" stufflist))))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-variable-name-face)
+    (put-text-property start end 'ddebug stufflist)
+    (put-text-property start end 'ddebug-indent (length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-stuff-list-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; vector of stuff
+;;
+;; just a vector.  random stuff inside.
+;;;###autoload
+(defun data-debug-insert-stuff-vector (stuffvector prefix)
+  "Insert all the parts of STUFFVECTOR.
+PREFIX specifies what to insert at the start of each line."
+  (let ((idx 0))
+    (while (< idx (length stuffvector))
+      (data-debug-insert-thing
+       ;; Some vectors may put a value in the CDR
+       (aref stuffvector idx)
+       prefix
+       "")
+      (setq idx (1+ idx)))))
+
+(defun data-debug-insert-stuff-vector-from-point (point)
+  "Insert the stuff found at the stuff vector button at POINT."
+  (let ((stuffvector (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-stuff-vector stuffvector
+				  (concat (make-string indent ? )
+					  "[ "))
+    (goto-char start)
+    ))
+
+(defun data-debug-insert-stuff-vector-button (stuffvector
+					    prefix
+					    prebuttontext)
+  "Insert a button representing STUFFVECTOR.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the stuff vector button."
+  (let* ((start (point))
+	 (end nil)
+	 (str (format "#<vector o' stuff: %d entries>" (length stuffvector)))
+	 (tip str))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-variable-name-face)
+    (put-text-property start end 'ddebug stuffvector)
+    (put-text-property start end 'ddebug-indent (length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-stuff-vector-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; Symbol
+;;
+
+(defun data-debug-insert-symbol-from-point (point)
+  "Insert attached properties and possibly the value of symbol at POINT."
+  (let ((symbol (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (when (and (not (fboundp symbol)) (boundp symbol))
+      (data-debug-insert-thing
+       (symbol-value symbol)
+       (concat (make-string indent ? ) "> ")
+       (concat
+	(dd-propertize "value"
+		    'face 'font-lock-comment-face)
+	" ")))
+    (data-debug-insert-property-list
+     (symbol-plist symbol)
+     (concat (make-string indent ? ) "> "))
+    (goto-char start))
+  )
+
+(defun data-debug-insert-symbol-button (symbol prefix prebuttontext)
+  "Insert a button representing SYMBOL.
+ PREFIX is the text that preceeds the button.
+ PREBUTTONTEXT is some text between prefix and the symbol button."
+  (let ((string
+	 (cond ((fboundp symbol)
+		(dd-propertize (concat "#'" (symbol-name symbol))
+			    'face 'font-lock-function-name-face))
+	       ((boundp symbol)
+		(dd-propertize (concat "'" (symbol-name symbol))
+			    'face 'font-lock-variable-name-face))
+	       (t (format "'%s" symbol)))))
+    (insert (dd-propertize
+	     (concat prefix prebuttontext string)
+	     'ddebug          symbol
+	     'ddebug-indent   (length prefix)
+	     'ddebug-prefix   prefix
+	     'help-echo       ""
+	     'ddebug-function
+	     'data-debug-insert-symbol-from-point)
+	    "\n"))
+  )
+
+;;; String
+(defun data-debug-insert-string (thing prefix prebuttontext)
+  "Insert one symbol THING.
+A Symbol is a simple thing, but this provides some face and prefix rules.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing."
+  (let ((newstr thing))
+    (while (string-match "\n" newstr)
+      (setq newstr (replace-match "\\n" t t newstr)))
+    (while (string-match "\t" newstr)
+      (setq newstr (replace-match "\\t" t t newstr)))
+    (insert prefix prebuttontext
+	    (dd-propertize (format "\"%s\"" newstr)
+			'face font-lock-string-face)
+	    "\n" )))
+
+;;; Number
+(defun data-debug-insert-number (thing prefix prebuttontext)
+  "Insert one symbol THING.
+A Symbol is a simple thing, but this provides some face and prefix rules.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing."
+  (insert prefix prebuttontext
+	  (dd-propertize (format "%S" thing)
+			 'face font-lock-string-face)
+	  "\n"))
+
+;;; Lambda Expression
+(defun data-debug-insert-lambda-expression (thing prefix prebuttontext)
+  "Insert one lambda expression THING.
+A Symbol is a simple thing, but this provides some face and prefix rules.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing."
+  (let ((txt (prin1-to-string thing)))
+    (data-debug-insert-simple-thing
+     txt prefix prebuttontext 'font-lock-keyword-face))
+  )
+
+;;; nil thing
+(defun data-debug-insert-nil (thing prefix prebuttontext)
+  "Insert one simple THING with a face.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing.
+FACE is the face to use."
+  (insert prefix prebuttontext)
+  (insert ": ")
+  (let ((start (point))
+	(end nil))
+    (insert "nil")
+    (setq end (point))
+    (insert "\n" )
+    (put-text-property start end 'face 'font-lock-variable-name-face)
+    ))
+
+;;; simple thing
+(defun data-debug-insert-simple-thing (thing prefix prebuttontext face)
+  "Insert one simple THING with a face.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing.
+FACE is the face to use."
+  (insert prefix prebuttontext)
+  (let ((start (point))
+	(end nil))
+    (insert (format "%s" thing))
+    (setq end (point))
+    (insert "\n" )
+    (put-text-property start end 'face face)
+    ))
+
+;;; custom thing
+(defun data-debug-insert-custom (thingstring prefix prebuttontext face)
+  "Insert one simple THINGSTRING with a face.
+Use for simple items that need a custom insert.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the thing.
+FACE is the face to use."
+  (insert prefix prebuttontext)
+  (let ((start (point))
+	(end nil))
+    (insert thingstring)
+    (setq end (point))
+    (insert "\n" )
+    (put-text-property start end 'face face)
+    ))
+
+
+(defvar data-debug-thing-alist
+  '(
+    ;; nil
+    (null . data-debug-insert-nil)
+
+    ;; Overlay
+    (data-debug-overlay-p . data-debug-insert-overlay-button)
+
+    ;; Overlay list
+    ((lambda (thing) (and (consp thing) (data-debug-overlay-p (car thing)))) .
+     data-debug-insert-overlay-list-button)
+
+    ;; Buffer
+    (bufferp . data-debug-insert-buffer-button)
+
+    ;; Buffer list
+    ((lambda (thing) (and (consp thing) (bufferp (car thing)))) .
+     data-debug-insert-buffer-list-button)
+
+    ;; Process
+    (processp . data-debug-insert-process-button)
+
+    ;; String
+    (stringp . data-debug-insert-string)
+
+    ;; Number
+    (numberp . data-debug-insert-number)
+
+    ;; Symbol
+    (symbolp . data-debug-insert-symbol-button)
+
+    ;; Ring
+    (ring-p . data-debug-insert-ring-button)
+
+    ;; Lambda Expression
+    ((lambda (thing) (and (consp thing) (eq (car thing) 'lambda))) .
+     data-debug-insert-lambda-expression)
+
+    ;; Hash-table
+    (hash-table-p . data-debug-insert-hash-table-button)
+
+    ;; Widgets
+    (widgetp . data-debug-insert-widget)
+
+    ;; List of stuff
+    (listp . data-debug-insert-stuff-list-button)
+
+    ;; Vector of stuff
+    (vectorp . data-debug-insert-stuff-vector-button)
+    )
+  "Alist of methods used to insert things into an Ddebug buffer.")
+
+;; An augmentation function for the thing alist.
+(defun data-debug-add-specialized-thing (predicate fcn)
+  "Add a new specialized thing to display with data-debug.
+PREDICATE is a function that returns t if a thing is this new type.
+FCN is a function that will display stuff in the data debug buffer."
+  (let ((entry (cons predicate fcn))
+	;; Specialized entries show up AFTER nil,
+	;; but before listp, vectorp, symbolp, and
+	;; other general things.  Splice it into
+	;; the beginning.
+	(first (nthcdr 0 data-debug-thing-alist))
+	(second (nthcdr 1 data-debug-thing-alist))
+      )
+  (when (not (member entry data-debug-thing-alist))
+    (setcdr first (cons entry second)))))
+
+;; uber insert method
+;;;###autoload
+(defun data-debug-insert-thing (thing prefix prebuttontext &optional parent)
+  "Insert THING with PREFIX.
+PREBUTTONTEXT is some text to insert between prefix and the thing
+that is not included in the indentation calculation of any children.
+If PARENT is non-nil, it is somehow related as a parent to thing."
+  (when (catch 'done
+	  (dolist (test data-debug-thing-alist)
+	    (when (funcall (car test) thing)
+	      (condition-case nil
+		  (funcall (cdr test) thing prefix prebuttontext parent)
+		(error
+		 (funcall (cdr test) thing prefix prebuttontext)))
+	      (throw 'done nil))
+	    )
+	  nil)
+    (data-debug-insert-simple-thing (format "%S" thing)
+				    prefix
+				    prebuttontext
+				    'bold)))
+
+;;; MAJOR MODE
+;;
+;; The Ddebug major mode provides an interactive space to explore
+;; complicated data structures.
+;;
+(defgroup data-debug nil
+  "data-debug group."
+  :group 'langauges)
+
+(defvar data-debug-mode-syntax-table
+  (let ((table (make-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+    (modify-syntax-entry ?\n ">"     table) ;; Comment end
+    (modify-syntax-entry ?\" "\""    table) ;; String
+    (modify-syntax-entry ?\- "_"     table) ;; Symbol
+    (modify-syntax-entry ?\\ "\\"    table) ;; Quote
+    (modify-syntax-entry ?\` "'"     table) ;; Prefix ` (backquote)
+    (modify-syntax-entry ?\' "'"     table) ;; Prefix ' (quote)
+    (modify-syntax-entry ?\, "'"     table) ;; Prefix , (comma)
+
+    table)
+  "Syntax table used in data-debug macro buffers.")
+
+(defvar data-debug-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km [mouse-2] 'data-debug-expand-or-contract-mouse)
+    (define-key km " " 'data-debug-expand-or-contract)
+    (define-key km "\C-m" 'data-debug-expand-or-contract)
+    (define-key km "n" 'data-debug-next)
+    (define-key km "p" 'data-debug-prev)
+    (define-key km "N" 'data-debug-next-expando)
+    (define-key km "P" 'data-debug-prev-expando)
+    km)
+  "Keymap used in data-debug.")
+
+(defcustom data-debug-mode-hook nil
+  "*Hook run when data-debug starts."
+  :group 'data-debug
+  :type 'hook)
+
+;;;###autoload
+(defun data-debug-mode ()
+  "Major-mode for the Analyzer debugger.
+
+\\{data-debug-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'data-debug-mode
+        mode-name "DATA-DEBUG"
+	comment-start ";;"
+	comment-end "")
+  (set (make-local-variable 'comment-start-skip)
+       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
+  (set-syntax-table data-debug-mode-syntax-table)
+  (use-local-map data-debug-map)
+  (run-hooks 'data-debug-hook)
+  (buffer-disable-undo)
+  (set (make-local-variable 'font-lock-global-modes) nil)
+  (font-lock-mode -1)
+  )
+
+;;;###autoload
+(defun data-debug-new-buffer (name)
+  "Create a new ddebug buffer with NAME."
+  (let ((b (get-buffer-create name)))
+    (pop-to-buffer b)
+    (set-buffer b)
+    (erase-buffer)
+    (data-debug-mode)
+    b))
+
+;;; Ddebug mode commands
+;;
+(defun data-debug-next ()
+  "Go to the next line in the Ddebug buffer."
+  (interactive)
+  (forward-line 1)
+  (beginning-of-line)
+  (skip-chars-forward " *-><[]" (point-at-eol)))
+
+(defun data-debug-prev ()
+  "Go to the next line in the Ddebug buffer."
+  (interactive)
+  (forward-line -1)
+  (beginning-of-line)
+  (skip-chars-forward " *-><[]" (point-at-eol)))
+
+(defun data-debug-next-expando ()
+  "Go to the next line in the Ddebug buffer.
+Contract the current line (if open) and expand the line
+we move to."
+  (interactive)
+  (data-debug-contract-current-line)
+  (data-debug-next)
+  (data-debug-expand-current-line)
+  )
+
+(defun data-debug-prev-expando ()
+  "Go to the previous line in the Ddebug buffer.
+Contract the current line (if open) and expand the line
+we move to."
+  (interactive)
+  (data-debug-contract-current-line)
+  (data-debug-prev)
+  (data-debug-expand-current-line)
+  )
+
+(defun data-debug-current-line-expanded-p ()
+  "Return non-nil if the current line is expanded."
+  (let ((ti (current-indentation))
+	(ni (condition-case nil
+		(save-excursion
+		  (end-of-line)
+		  (forward-char 1)
+		  (current-indentation))
+	      (error 0))))
+    (> ni ti)))
+
+(defun data-debug-line-expandable-p ()
+  "Return non-nil if the current line is expandable.
+Lines that are not expandable are assumed to not be contractable."
+  (not (get-text-property (point) 'ddebug-noexpand)))
+
+(defun data-debug-expand-current-line ()
+  "Expand the current line (if possible).
+Do nothing if already expanded."
+  (when (or (not (data-debug-line-expandable-p))
+	    (not (data-debug-current-line-expanded-p)))
+    ;; If the next line is the same or less indentation, expand.
+    (let ((fcn (get-text-property (point) 'ddebug-function)))
+      (when fcn
+	(funcall fcn (point))
+	(beginning-of-line)
+	))))
+
+(defun data-debug-contract-current-line ()
+  "Contract the current line (if possible).
+Do nothing if already expanded."
+  (when (and (data-debug-current-line-expanded-p)
+	     ;; Don't contract if the current line is not expandable.
+	     (get-text-property (point) 'ddebug-function))
+    (let ((ti (current-indentation))
+	  )
+      ;; If next indentation is larger, collapse.
+      (end-of-line)
+      (forward-char 1)
+      (let ((start (point))
+	    (end nil))
+	(condition-case nil
+	    (progn
+	      ;; Keep checking indentation
+	      (while (or (> (current-indentation) ti)
+			 (looking-at "^\\s-*$"))
+		(end-of-line)
+		(forward-char 1))
+	      (setq end (point))
+	      )
+	  (error (setq end (point-max))))
+	(delete-region start end)
+	(forward-char -1)
+	(beginning-of-line)))))
+
+(defun data-debug-expand-or-contract ()
+  "Expand or contract anything at the current point."
+  (interactive)
+  (if (and (data-debug-line-expandable-p)
+	   (data-debug-current-line-expanded-p))
+      (data-debug-contract-current-line)
+    (data-debug-expand-current-line))
+  (skip-chars-forward " *-><[]" (point-at-eol)))
+
+(defun data-debug-expand-or-contract-mouse (event)
+  "Expand or contract anything at event EVENT."
+  (interactive "e")
+  (let* ((win (car (car (cdr event))))
+	 )
+    (select-window win t)
+    (save-excursion
+      ;(goto-char (window-start win))
+      (mouse-set-point event)
+      (data-debug-expand-or-contract))
+    ))
+
+;;; GENERIC STRUCTURE DUMP
+;;
+;;;###autoload
+(defun data-debug-show-stuff (stuff name)
+  "Data debug STUFF in a buffer named *NAME DDebug*."
+  (data-debug-new-buffer (concat "*" name " DDebug*"))
+  (data-debug-insert-thing stuff "?" "")
+  (goto-char (point-min))
+  (when (data-debug-line-expandable-p)
+    (data-debug-expand-current-line)))
+
+;;; DEBUG COMMANDS
+;;
+;; Various commands for displaying complex data structures.
+
+;;;###autoload
+(defun data-debug-edebug-expr (expr)
+  "Dump out the contets of some expression EXPR in edebug with ddebug."
+  (interactive
+   (list (let ((minibuffer-completing-symbol t))
+	   (read-from-minibuffer "Eval: "
+				 nil read-expression-map t
+				 'read-expression-history))
+	 ))
+  (let ((v (eval expr)))
+    (if (not v)
+	(message "Expression %s is nil." expr)
+      (data-debug-show-stuff v "expression"))))
+
+;;;###autoload
+(defun data-debug-eval-expression (expr)
+  "Evaluate EXPR and display the value.
+If the result is something simple, show it in the echo area.
+If the result is a list or vector, then use the data debugger to display it."
+  (interactive
+   (list (let ((minibuffer-completing-symbol t))
+	   (read-from-minibuffer "Eval: "
+				 nil read-expression-map t
+				 'read-expression-history))
+	 ))
+
+  (if (null eval-expression-debug-on-error)
+      (setq values (cons (eval expr) values))
+    (let ((old-value (make-symbol "t")) new-value)
+      ;; Bind debug-on-error to something unique so that we can
+      ;; detect when evaled code changes it.
+      (let ((debug-on-error old-value))
+	(setq values (cons (eval expr) values))
+	(setq new-value debug-on-error))
+      ;; If evaled code has changed the value of debug-on-error,
+      ;; propagate that change to the global binding.
+      (unless (eq old-value new-value)
+	(setq debug-on-error new-value))))
+
+  (if (or (consp (car values)) (vectorp (car values)))
+      (let ((v (car values)))
+	(data-debug-show-stuff v "Expression"))
+    ;; Old style
+    (prog1
+	(prin1 (car values) t)
+      (let ((str (eval-expression-print-format (car values))))
+	(if str (princ str t))))))
+
+
+(provide 'data-debug)
+
+;;; data-debug.el ends here
diff --git a/site/cedet-1.0pre7/common/ezimage.el b/site/cedet-1.0pre7/common/ezimage.el
new file mode 100644
index 0000000..a858d9b
--- /dev/null
+++ b/site/cedet-1.0pre7/common/ezimage.el
@@ -0,0 +1,367 @@
+;;; ezimage --- Generalized Image management
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: ezimage.el,v 1.6 2005/12/07 16:51:22 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A few routines for placing an image over text that will work for any
+;; Emacs implementation without error.  When images are not supported, then
+;; they are just not displayed.
+;;
+;; The idea is that gui buffers (trees, buttons, etc) will have text
+;; representations of the GUI elements.  These routines will replace the text
+;; with an image when images are available.
+;;
+;; This file requires the `image' package if it is available.
+
+(condition-case nil
+    (require 'image)
+  (error nil))
+
+;;; Code:
+(defcustom ezimage-use-images
+  (and (or (fboundp 'defimage) ; emacs 21
+	   (fboundp 'make-image-specifier)) ; xemacs
+       (if (fboundp 'display-graphic-p) ; emacs 21
+	   (display-graphic-p)
+	 window-system) ; old emacs & xemacs
+       (or (not (fboundp 'image-type-available-p)) ; xemacs?
+	   (image-type-available-p 'xpm))) ; emacs 21
+  "*Non-nil if ezimage should display icons."
+  :group 'ezimage
+  :version "21.1"
+  :type 'boolean)
+
+;;; Create our own version of defimage
+(eval-and-compile
+
+(if (fboundp 'defimage)
+
+    (progn
+
+(defmacro defezimage (variable imagespec docstring)
+  "Define VARIABLE as an image if `defimage' is not available.
+IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
+  `(progn
+     (defimage ,variable ,imagespec ,docstring)
+     (put (quote ,variable) 'ezimage t)))
+
+;    (defalias 'defezimage 'defimage)
+
+;; This hack is for the ezimage install which has an icons direcory for
+;; the default icons to be used.
+(add-to-list 'load-path
+	     (concat (file-name-directory
+		      (locate-library "ezimage.el"))
+		     "icons"))
+
+       )
+  (if (not (fboundp 'make-glyph))
+      
+(defmacro defezimage (variable imagespec docstring)
+  "Don't bother loading up an image...
+Argument VARIABLE is the variable to define.
+Argument IMAGESPEC is the list defining the image to create.
+Argument DOCSTRING is the documentation for VARIABLE."
+  `(defvar ,variable nil ,docstring))
+
+;; ELSE
+(defun ezimage-find-image-on-load-path (image)
+  "Find the image file IMAGE on the load path."
+  (let ((l (cons
+	    ;; In XEmacs, try the data directory first (for an
+	    ;; install in XEmacs proper.)   Search the load
+	    ;; path next (for user installs)
+	    (locate-data-directory "ezimage")
+	    load-path))
+	(r nil))
+    (while (and l (not r))
+      (if (file-exists-p (concat (car l) "/" image))
+	  (setq r (concat (car l) "/" image))
+	(if (file-exists-p (concat (car l) "/icons/" image))
+	    (setq r (concat (car l) "/icons/" image))
+	  ))
+      (setq l (cdr l)))
+    r))
+
+(defun ezimage-convert-emacs21-imagespec-to-xemacs (spec)
+  "Convert the Emacs21 image SPEC into an XEmacs image spec.
+The Emacs 21 spec is what I first learned, and is easy to convert."
+  (let* ((sl (car spec))
+	 (itype (nth 1 sl))
+	 (ifile (nth 3 sl)))
+    (vector itype ':file (ezimage-find-image-on-load-path ifile))))
+
+(defmacro defezimage (variable imagespec docstring)
+  "Define VARIABLE as an image if `defimage' is not available.
+IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
+  `(progn
+     (defvar ,variable
+       ;; The Emacs21 version of defimage looks just like the XEmacs image
+       ;; specifier, except that it needs a :type keyword.  If we line
+       ;; stuff up right, we can use this cheat to support XEmacs specifiers.
+       (condition-case nil
+	   (make-glyph
+	    (make-image-specifier
+	     (ezimage-convert-emacs21-imagespec-to-xemacs (quote ,imagespec)))
+	    'buffer)
+	 (error nil))
+       ,docstring)
+     (put ',variable 'ezimage t)))
+
+)))
+
+(defezimage ezimage-directory
+  ((:type xpm :file "dir.xpm" :ascent center))
+  "Image used for empty directories.")
+
+(defezimage ezimage-directory-plus
+  ((:type xpm :file "dir-plus.xpm" :ascent center))
+  "Image used for closed directories with stuff in them.")
+
+(defezimage ezimage-directory-minus
+  ((:type xpm :file "dir-minus.xpm" :ascent center))
+  "Image used for open directories with stuff in them.")
+
+(defezimage ezimage-page-plus
+  ((:type xpm :file "page-plus.xpm" :ascent center))
+  "Image used for closed files with stuff in them.")
+
+(defezimage ezimage-page-minus
+  ((:type xpm :file "page-minus.xpm" :ascent center))
+  "Image used for open files with stuff in them.")
+
+(defezimage ezimage-page
+  ((:type xpm :file "page.xpm" :ascent center))
+  "Image used for files with nothing interesting in it.")
+
+(defezimage ezimage-tag
+  ((:type xpm :file "tag.xpm" :ascent center))
+  "Image used for tags.")
+
+(defezimage ezimage-tag-plus
+  ((:type xpm :file "tag-plus.xpm" :ascent center))
+  "Image used for closed tag groups.")
+
+(defezimage ezimage-tag-minus
+  ((:type xpm :file "tag-minus.xpm" :ascent center))
+  "Image used for open tags.")
+
+(defezimage ezimage-tag-gt
+  ((:type xpm :file "tag-gt.xpm" :ascent center))
+  "Image used for closed tags (with twist arrow).")
+
+(defezimage ezimage-tag-v
+  ((:type xpm :file "tag-v.xpm" :ascent center))
+  "Image used for open tags (with twist arrow).")
+
+(defezimage ezimage-tag-type
+  ((:type xpm :file "tag-type.xpm" :ascent center))
+  "Image used for tags that represent a data type.")
+
+(defezimage ezimage-box-plus
+  ((:type xpm :file "box-plus.xpm" :ascent center))
+  "Image of a closed box.")
+
+(defezimage ezimage-box-minus
+  ((:type xpm :file "box-minus.xpm" :ascent center))
+  "Image of an open box.")
+
+(defezimage ezimage-mail
+  ((:type xpm :file "mail.xpm" :ascent center))
+  "Image if an envelope.")
+
+(defezimage ezimage-checkout
+  ((:type xpm :file "checkmark.xpm" :ascent center))
+  "Image representing a checkmark.  For files checked out of a VC.")
+
+(defezimage ezimage-object
+  ((:type xpm :file "bits.xpm" :ascent center))
+  "Image representing bits (an object file.)")
+
+(defezimage ezimage-object-out-of-date
+  ((:type xpm :file "bitsbang.xpm" :ascent center))
+  "Image representing bits with a ! in it.  (an out of data object file.)")
+
+(defezimage ezimage-label
+  ((:type xpm :file "label.xpm" :ascent center))
+  "Image used for label prefix.")
+
+(defezimage ezimage-lock
+  ((:type xpm :file "lock.xpm" :ascent center))
+  "Image of a lock.  Used for Read Only, or private.")
+
+(defezimage ezimage-unlock
+  ((:type xpm :file "unlock.xpm" :ascent center))
+  "Image of an unlocked lock.")
+
+(defezimage ezimage-key
+  ((:type xpm :file "key.xpm" :ascent center))
+  "Image of a key.")
+
+(defezimage ezimage-document-tag
+  ((:type xpm :file "doc.xpm" :ascent center))
+  "Image used to indicate documentation available.")
+
+(defezimage ezimage-document-plus
+  ((:type xpm :file "doc-plus.xpm" :ascent center))
+  "Image used to indicate closed documentation.")
+
+(defezimage ezimage-document-minus
+  ((:type xpm :file "doc-minus.xpm" :ascent center))
+  "Image used to indicate open documentation.")
+
+(defezimage ezimage-info-tag
+  ((:type xpm :file "info.xpm" :ascent center))
+  "Image used to indicate more information available.")
+
+(defvar ezimage-expand-image-button-alist
+  '(
+    ;; here are some standard representations
+    ("<+>" . ezimage-directory-plus)
+    ("<->" . ezimage-directory-minus)
+    ("< >" . ezimage-directory)
+    ("[+]" . ezimage-page-plus)
+    ("[-]" . ezimage-page-minus)
+    ("[?]" . ezimage-page)
+    ("[ ]" . ezimage-page)
+    ("{+}" . ezimage-box-plus)
+    ("{-}" . ezimage-box-minus)
+    ;; Some vaguely representitive entries
+    ("*" . ezimage-checkout)
+    ("#" . ezimage-object)
+    ("!" . ezimage-object-out-of-date)
+    ("%" . ezimage-lock)
+    )
+  "List of text and image associations.")
+
+(defun ezimage-insert-image-button-maybe (start length &optional string)
+  "Insert an image button based on text starting at START for LENGTH chars.
+If buttontext is unknown, just insert that text.
+If we have an image associated with it, use that image.
+Optional argument STRING is a string upon which to add text properties."
+  (when ezimage-use-images
+    (let* ((bt (buffer-substring start (+ length start)))
+	   (a (assoc bt ezimage-expand-image-button-alist)))
+      ;; Regular images (created with `insert-image' are intangible
+      ;; which (I suppose) make them more compatible with XEmacs 21.
+      ;; Unfortunatly, there is a giant pile o code dependent on the
+      ;; underlying text.  This means if we leave it tangible, then I
+      ;; don't have to change said giant piles o code.
+      (if (and a (symbol-value (cdr a)))
+	  (ezimage-insert-over-text (symbol-value (cdr a))
+				    start
+				    (+ start (length bt))))))
+  string)
+
+(defun ezimage-image-over-string (string &optional alist)
+  "Insert over the text in STRING an image found in ALIST.
+Return STRING with properties applied."
+  (if ezimage-use-images
+      (let ((a (assoc string alist)))
+	(if (and a (symbol-value (cdr a)))
+	    (ezimage-insert-over-text (symbol-value (cdr a))
+				      0 (length string)
+				      string)
+	  string))
+    string))
+
+(defun ezimage-insert-over-text (image start end &optional string)
+  "Place IMAGE over the text between START and END.
+Assumes the image is part of a gui and can be clicked on.
+Optional argument STRING is a string upon which to add text properties."
+  (when ezimage-use-images
+    (if (featurep 'xemacs)
+	(add-text-properties start end
+			     (list 'end-glyph image
+				   'rear-nonsticky (list 'display)
+				   'invisible t
+				   'detachable t)
+			     string)
+      (add-text-properties start end
+			   (list 'display image
+				 'rear-nonsticky (list 'display))
+			   string)))
+  string)
+
+(defun ezimage-image-association-dump ()
+  "Dump out the current state of the Ezimage image alist.
+See `ezimage-expand-image-button-alist' for details."
+  (interactive)
+  (with-output-to-temp-buffer "*Ezimage Images*"
+    (save-excursion
+      (set-buffer "*Ezimage Images*")
+      (goto-char (point-max))
+      (insert "Ezimage image cache.\n\n")
+      (let ((start (point)) (end nil))
+	(insert "Image\tText\tImage Name")
+	(setq end (point))
+	(insert "\n")
+	(put-text-property start end 'face 'underline))
+      (let ((ia ezimage-expand-image-button-alist))
+	(while ia
+	  (let ((start (point)))
+	    (insert (car (car ia)))
+	    (insert "\t")
+	    (ezimage-insert-image-button-maybe start
+						(length (car (car ia))))
+	    (insert (car (car ia)) "\t" (format "%s" (cdr (car ia))) "\n"))
+	  (setq ia (cdr ia)))))))
+
+(defun ezimage-image-dump ()
+  "Dump out the current state of the Ezimage image alist.
+See `ezimage-expand-image-button-alist' for details."
+  (interactive)
+  (with-output-to-temp-buffer "*Ezimage Images*"
+    (save-excursion
+      (set-buffer "*Ezimage Images*")
+      (goto-char (point-max))
+      (insert "Ezimage image cache.\n\n")
+      (let ((start (point)) (end nil))
+	(insert "Image\tImage Name")
+	(setq end (point))
+	(insert "\n")
+	(put-text-property start end 'face 'underline))
+      (let ((ia (ezimage-all-images)))
+	(while ia
+	  (let ((start (point)))
+	    (insert "cm")
+	    (ezimage-insert-over-text (symbol-value (car ia)) start (point))
+	    (insert "\t" (format "%s" (car ia)) "\n"))
+	  (setq ia (cdr ia)))))))
+
+(defun ezimage-all-images ()
+  "Return a list of all variables containing ez images."
+  (let ((ans nil))
+    (mapatoms (lambda (sym)
+		(if (get sym 'ezimage) (setq ans (cons sym ans))))
+	      )
+    (setq ans (sort ans (lambda (a b)
+			  (string< (symbol-name a) (symbol-name b)))))
+    ans)
+  )
+
+(provide 'ezimage)
+
+;;; sb-image.el ends here
diff --git a/site/cedet-1.0pre7/common/fame.el b/site/cedet-1.0pre7/common/fame.el
new file mode 100644
index 0000000..66efb4a
--- /dev/null
+++ b/site/cedet-1.0pre7/common/fame.el
@@ -0,0 +1,421 @@
+;;; fame.el --- Framework for Applications' MEssages
+;;
+;; Copyright (C) 2004 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 28 Oct 2004
+;; Keywords: status
+;; X-RCS: $Id: fame.el,v 1.3 2005/09/30 20:07:29 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides a convenient framework for applications to
+;; send messages distinguished by their level of importance, allowing
+;; to customize how they will be actually rendered.
+;;
+;; The principle is to define a `channel' where to send messages at
+;; particular levels, depending on their importance.  A channel is
+;; identified by a non-nil symbol.  For example this library could
+;; send its messages to the `fame' channel.  Four levels of importance
+;; are recognized, for debug, informational, warning and error
+;; messages.
+;;
+;; Messages at any particular level can be either discarded,
+;; temporarily displayed, recorded in the message log buffer without
+;; showing them in the echo area, or shown the usual way like through
+;; the `message' function.  Messages shown in the echo area can be
+;; recorded or not in the message log buffer.
+;;
+;; The `define-fame-channel' macro permits to easily define a new
+;; channel, that is an option to customize how to display the message
+;; levels for this channel, and the level specific functions to use to
+;; send messages to this channel.
+;;
+;; Here is a small example:
+;;
+;;     (require 'fame)
+;;     ...
+;;     (define-fame-channel feature)
+;;     ...
+;;     (feature-send-debug "Some useful debug message")
+;;     ...
+;;     (condition-case err
+;;         ...
+;;       (error
+;;        (feature-send-error "%s" (error-message-string err))))
+;;     ...
+;;     (feature-send-info "Some useful informational message")
+;;     ...
+;;     (provide 'feature)
+
+;;; History:
+;;
+
+;;; Code:
+
+;;; Constants and options
+;;
+(defconst fame-valid-levels
+  '(:error :warning :info :debug)
+  "Valid message levels.")
+
+(defconst fame-valid-level-values
+  '(t nolog temp temp-nolog log none)
+  "Valid message level values.")
+
+(defconst fame-default-level-values
+  '(:debug log :info temp :warning t :error t)
+  "Default display value of message levels.")
+
+(define-widget 'fame-display-choice 'radio-button-choice
+  "Widget to choose the display value of a level."
+  :format "%v\n"
+  :entry-format " %v%b"
+  :args '((const :format "%v" :value t)
+          (const :format "%v" :value nolog)
+          (const :format "%v" :value temp)
+          (const :format "%v" :value temp-nolog)
+          (const :format "%v" :value log)
+          (const :format "%v" :value none)))
+
+(define-widget 'fame-level-widget 'const
+  "Widget to display a level symbol."
+  :format "   %t")
+
+(define-widget 'fame-channel-widget 'list
+  "Widget to customize the messages levels of a channel."
+  :tag "Display value of message levels"
+  :format "%{%t%}:\n%v\n"
+  :args '((fame-level-widget :tag ":debug  " :value :debug)
+          (fame-display-choice)
+          (fame-level-widget :tag ":info   " :value :info)
+          (fame-display-choice)
+          (fame-level-widget :tag ":warning" :value :warning)
+          (fame-display-choice)
+          (fame-level-widget :tag ":error  " :value :error)
+          (fame-display-choice)))
+
+(defgroup fame nil
+  "Framework for Applications' MEssages."
+  :prefix "fame"
+  :group 'lisp)
+
+(defcustom fame-temp-message-delay 1
+  "*Lifetime of a temporary message, in seconds."
+  :group 'fame
+  :type 'number)
+
+;;; Core message functions
+;;
+(eval-and-compile
+
+;;;; Read the message currently displayed in the echo area.
+  (defalias 'fame-current-message
+    (if (fboundp 'current-message)
+        'current-message
+      'ignore))
+
+;;;; Show a message in the echo area without logging it.
+  (if (fboundp 'lmessage)
+      ;; XEmacs
+      (defun fame-message-nolog (&rest args)
+        "Display but don't log a message on the echo area.
+ARGS are like those of the function `message'."
+        (and args (apply 'lmessage 'no-log args)))
+    ;; Emacs
+    (defun fame-message-nolog (&rest args)
+      "Display but don't log a message on the echo area.
+ARGS will be passed to the function `message'."
+      (and args
+           (let ((message-log-max nil)) ;; No logging
+             (apply 'message args))))
+    )
+
+;;;; Log a message without showing it in the echo area.
+  (if (fboundp 'log-message)
+      ;; XEmacs
+      (defun fame-log-message (&rest args)
+        "Log but don't display a message.
+ARGS are like those of the function `message'."
+        (and args (log-message 'message (apply 'format args))))
+    ;; Emacs
+    (defun fame-log-message (&rest args)
+      "Log but don't display a message.
+ARGS will be passed to the function `message'."
+      (and args
+           (let ((executing-kbd-macro t)) ;; Inhibit display!
+             (apply 'message args))))
+    )
+  ;; If the above definition fails, here is a portable implementation
+  ;; of a `log-message' function.
+  '(defun fame-log-message (&rest args)
+     "Log but don't display a message.
+ARGS are like those of the function `message'."
+     (when args
+       (let ((text (apply 'format args)))
+         (with-current-buffer
+             (get-buffer-create (if (featurep 'xemacs)
+                                    " *Message-Log*"
+                                  "*Messages*"))
+           (goto-char (point-max))
+           (or (bobp) (bolp) (insert "\n"))
+           (forward-line -1)
+           (if (search-forward text nil t)
+               (if (looking-at " \\[\\([0-9]+\\) times\\]")
+                   (replace-match
+                    (number-to-string
+                     (1+ (string-to-number (match-string 1))))
+                    nil nil nil 1)
+                 (end-of-line)
+                 (insert " [2 times]"))
+             (forward-line 1)
+             (insert text))))))
+
+;;;; Log and temporarily show a message in the echo area.
+  (condition-case nil
+      (require 'timer)
+    (error nil))
+  ;; We need timers to display messages temporarily.
+  (if (not (fboundp 'run-with-timer))
+
+      (defun fame-temp-message-internal (fun &rest args)
+        "Display a message temporarily through the function FUN.
+ARGS are like those of the function `message'."
+        ;; Without timers just call FUN.
+        (and args (apply fun args)))
+
+    (defvar fame-temp-message-timer nil)
+    (defvar fame-temp-message-saved nil)
+
+    (defun fame-temp-restore-message ()
+      "Restore a message previously displayed in the echo area."
+      (when (timerp fame-temp-message-timer)
+        (cancel-timer fame-temp-message-timer)
+        (setq fame-temp-message-timer nil))
+      (when fame-temp-message-saved
+        (prog1 (fame-message-nolog "%s" fame-temp-message-saved)
+          (setq fame-temp-message-saved nil))))
+
+    (defun fame-temp-message-internal (fun &rest args)
+      "Display a message temporarily through the function FUN.
+ARGS are like those of the function `message'."
+      (when args
+        (condition-case nil
+            (progn
+              (fame-temp-restore-message)
+              (setq fame-temp-message-saved (fame-current-message))
+              (prog1 (apply fun args)
+                (setq fame-temp-message-timer
+                      (run-with-timer fame-temp-message-delay nil
+                                      'fame-temp-restore-message))))
+          (error
+           (fame-temp-restore-message)))))
+    )
+  )
+
+(defsubst fame-temp-message (&rest args)
+  "Display a message temporarily and log it.
+ARGS are like those of the function `message'.
+The original message is restored to the echo area after
+`fame-temp-message-delay' seconds."
+  (apply 'fame-temp-message-internal 'message args))
+
+(defsubst fame-temp-message-nolog (&rest args)
+  "Display a message temporarily without logging it.
+ARGS are like those of the function `message'.
+The original message is restored to the echo area after
+`fame-temp-message-delay' seconds."
+  (apply 'fame-temp-message-internal 'fame-message-nolog args))
+
+;;; Handling of message levels
+;;
+(defun fame-check-level (level)
+  "Check that LEVEL is a valid message level.
+If valid, return LEVEL.  Signal an error otherwise."
+  (if (memq level fame-valid-levels)
+      level
+    (signal 'wrong-type-argument
+            (list fame-valid-levels level))))
+
+(defun fame-check-level-value (value)
+  "Check that VALUE is a valid message level value.
+If valid, return VALUE.  Signal an error otherwise."
+  (if (memq value fame-valid-level-values)
+      value
+    (signal 'wrong-type-argument
+            (list fame-valid-level-values value))))
+
+(defun fame-check-channel (channel)
+  "Check that CHANNEL is a non-nil symbol.
+If valid, return CHANNEL.  Signal an error otherwise."
+  (if (and channel (symbolp channel))
+      channel
+    (signal 'wrong-type-argument
+            (list 'symbolp channel))))
+
+(defun fame-check-channel-levels (levels)
+  "Check that LEVELS is a valid specification of channel levels.
+If valid, return a normalized form of the specification.
+Signal an error otherwise."
+  (let (spec)
+    (dolist (level fame-valid-levels)
+      (push (fame-check-level-value
+             ;; A nil level value means to use the default value.
+             (or (plist-get levels level)
+                 (plist-get fame-default-level-values level))) spec)
+      (push level spec))
+    spec))
+
+(defsubst fame-channel-symbol (channel)
+  "Return the symbol whose value is CHANNEL's levels."
+  (intern (format "%s-fame-levels" (fame-check-channel channel))))
+
+(defun fame-channel-levels (channel)
+  "Return the message levels display values of CHANNEL.
+If CHANNEL doesn't exist return the default value in constant
+`fame-default-level-values'."
+  (let ((symbol (fame-channel-symbol channel)))
+    (if (boundp symbol)
+        (symbol-value symbol)
+      fame-default-level-values)))
+
+(defsubst fame-level-display (channel level)
+  "For CHANNEL, return the display value of LEVEL.
+See also the option `fame-channels'."
+  (plist-get (fame-channel-levels channel)
+             (fame-check-level level)))
+
+;;; Sending messages to channels
+;;
+(defconst fame-send-functions-alist
+  '((none       . nil)
+    (log        . fame-log-message)
+    (temp       . fame-temp-message)
+    (temp-nolog . fame-temp-message-nolog)
+    (nolog      . fame-message-nolog)
+    (t          . message)
+    ))
+
+(defun fame-send (channel level &rest args)
+  "Send a message to CHANNEL at level LEVEL.
+ARGS are like those of the function `message'.
+The message will be displayed according to what is specified for
+CHANNEL in the `fame-channels' option."
+  (let ((sender (cdr (assq (fame-level-display channel level)
+                           fame-send-functions-alist))))
+    (and sender (apply sender args))))
+
+(defsubst fame-send-debug (channel &rest args)
+  "Send a debug message to CHANNEL.
+CHANNEL must be a non-nil symbol.
+ARGS will be passed to the function `fame-send'."
+  (apply 'fame-send channel :debug args))
+
+(defsubst fame-send-info (channel &rest args)
+  "Send an informational message to CHANNEL.
+CHANNEL must be a non-nil symbol.
+ARGS will be passed to the function `fame-send'."
+  (apply 'fame-send channel :info args))
+
+(defsubst fame-send-warning (channel &rest args)
+  "Send a warning message to CHANNEL.
+CHANNEL must be a non-nil symbol.
+ARGS will be passed to the function `fame-send'."
+  (apply 'fame-send channel :warning args))
+
+(defsubst fame-send-error (channel &rest args)
+  "Send an error message to CHANNEL.
+CHANNEL must be a non-nil symbol.
+ARGS will be passed to the function `fame-send'."
+  (apply 'fame-send channel :error args))
+
+;;; Defining new channels
+;;
+;;;###autoload
+(defmacro define-fame-channel (channel &optional default docstring)
+  "Define the new message channel CHANNEL.
+CHANNEL must be a non-nil symbol.
+The optional argument DEFAULT specifies the default value of message
+levels for this channel.  By default it is the value of
+`fame-default-level-values'.
+DOCSTRING is an optional channel documentation.
+
+This defines the option `CHANNEL-fame-levels' to customize the current
+value of message levels.  And the functions `CHANNEL-send-debug',
+`CHANNEL-send-info', `CHANNEL-send-warning', and `CHANNEL-send-error',
+that respectively send debug, informational, warning, and error
+messages to CHANNEL."
+  (let ((c-opt (fame-channel-symbol channel)))
+    `(eval-when-compile
+       (defcustom ,c-opt ',(fame-check-channel-levels default)
+         ,(format "*Display value of message levels in the %s channel.
+%s
+This is a plist where a message level is a property whose value
+defines how messages at this level will be displayed.
+
+The possible levels are :debug, :info, :warning, and :error.
+Level values can be:
+ - t           to show and log messages the standard way.
+ - nolog       to show messages without logging them.
+ - temp        to show messages temporarily and log them.
+ - temp-nolog  to show messages temporarily without logging them.
+ - log         to log but not show messages.
+ - none        to discard messages.
+
+The default behavior is specified in `fame-default-level-values'."
+                  channel
+                  (if docstring (format "%s\n" docstring) ""))
+         :group 'fame
+         :type 'fame-channel-widget)
+       (defsubst ,(intern (format "%s-send-debug" channel))
+         (&rest args)
+         ,(format "Send a debug message to the `%s' channel.
+ARGS will be passed to the function `fame-send'.
+To customize how such messages will be displayed, see the option
+`%s'." channel c-opt)
+         (apply 'fame-send ',channel :debug args))
+       (defsubst ,(intern (format "%s-send-info" channel))
+         (&rest args)
+         ,(format "Send an informational message to the `%s' channel.
+ARGS will be passed to the function `fame-send'.
+To customize how such messages will be displayed, see the option
+`%s'." channel c-opt)
+         (apply 'fame-send ',channel :info args))
+       (defsubst ,(intern (format "%s-send-warn" channel))
+         (&rest args)
+         ,(format "Send a warning message to the `%s' channel.
+ARGS will be passed to the function `fame-send'.
+To customize how such messages will be displayed, see the option
+`%s'." channel c-opt)
+         (apply 'fame-send ',channel :warning args))
+       (defsubst ,(intern (format "%s-send-error" channel))
+         (&rest args)
+         ,(format "Send an error message to the `%s' channel.
+ARGS will be passed to the function `fame-send'.
+To customize how such messages will be displayed, see the option
+`%s'." channel c-opt)
+         (apply 'fame-send ',channel :error args))
+       ;; Return the CHANNEL symbol
+       ',c-opt)))
+
+(provide 'fame)
+
+;;; fame.el ends here
diff --git a/site/cedet-1.0pre7/common/icons/Makefile b/site/cedet-1.0pre7/common/icons/Makefile
new file mode 100644
index 0000000..a12acff
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/Makefile
@@ -0,0 +1,38 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+icons_MISC=bitsbang.xpm bits.xpm box-minus.xpm box-plus.xpm box.xpm checkmark.xpm dir-minus.xpm dir-plus.xpm dir.xpm doc-minus.xpm doc-plus.xpm doc.xpm info.xpm key.xpm label.xpm lock.xpm mail.xpm page-minus.xpm page-plus.xpm page.xpm tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm tag.xpm unlock.xpm
+VERSION=1.0pre7
+DISTDIR=$(top)common-$(VERSION)/icons
+
+
+
+all: icons
+
+icons: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(icons_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/common/icons/Project.ede b/site/cedet-1.0pre7/common/icons/Project.ede
new file mode 100644
index 0000000..43da3d7
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/Project.ede
@@ -0,0 +1,13 @@
+;; Object ede-proj-project
+;; EDE project file.
+(ede-proj-project "common/icons"
+  :name "icons"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "icons"
+    :name "icons"
+    :path ""
+    :source '("bitsbang.xpm" "bits.xpm" "box-minus.xpm" "box-plus.xpm" "box.xpm" "checkmark.xpm" "dir-minus.xpm" "dir-plus.xpm" "dir.xpm" "doc-minus.xpm" "doc-plus.xpm" "doc.xpm" "info.xpm" "key.xpm" "label.xpm" "lock.xpm" "mail.xpm" "page-minus.xpm" "page-plus.xpm" "page.xpm" "tag-gt.xpm" "tag-minus.xpm" "tag-plus.xpm" "tag-type.xpm" "tag-v.xpm" "tag.xpm" "unlock.xpm")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/common/icons/bits.xpm b/site/cedet-1.0pre7/common/icons/bits.xpm
new file mode 100644
index 0000000..b291fcf
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/bits.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * sb_obj_xpm[] = {
+"15 15 2 1",
+" 	c None",
+".	c #000CFF",
+" ..  .  ..  .  ",
+".  . . .  . .  ",
+".  . . .  . .  ",
+".  . . .  . .  ",
+" ..  .  ..  .  ",
+"               ",
+".  ..  .  ..   ",
+". .  . . .  .  ",
+". .  . . .  .  ",
+". .  . . .  .  ",
+".  ..  .  ..   ",
+"               ",
+" ..  .  ..  .  ",
+".  . . .  . .  ",
+".  . . .  . .  "};
diff --git a/site/cedet-1.0pre7/common/icons/bitsbang.xpm b/site/cedet-1.0pre7/common/icons/bitsbang.xpm
new file mode 100644
index 0000000..cd49e83
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/bitsbang.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * sb_objod_xpm[] = {
+"15 15 3 1",
+" 	c None",
+".	c #000CFF",
+"+	c #FFFA00",
+" ..  .  ..  .  ",
+".  .++ .  . .  ",
+".  .++ .  . .  ",
+".  . ++.  . .  ",
+" ..  ++ ..  .  ",
+"     ++        ",
+".  ..++.  ..   ",
+". .  .++ .  .  ",
+". .  .++ .  .  ",
+". .  .++ .  .  ",
+".  ..  .  ..   ",
+"       ++      ",
+" ..  . ++.  .  ",
+".  . . .  . .  ",
+".  . . .  . .  "};
diff --git a/site/cedet-1.0pre7/common/icons/box-minus.xpm b/site/cedet-1.0pre7/common/icons/box-minus.xpm
new file mode 100644
index 0000000..a24583c
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/box-minus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_minus_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #000000",
+"+	c #828282",
+"@	c #D19200",
+"...+           +..+ ",
+".@@.+          +.@.+",
+"+.@@.+        +.@@@.",
+"+.@@@.+++++++++.@@..",
+" +..@............@.+",
+" +.@..@@@@@@@@@@@..+",
+" +.@@..............+",
+" +.@@.@@@@@@@@@@@@.+",
+" +.@@.@@@@@@@@@@@@.+",
+" +.@@.@@@......@@@.+",
+" +.@@.@@@......@@@.+",
+"  +.@.@@@@@@@@@@@@.+",
+"   +..@@@@@@@@@@@@.+",
+"    +..............+",
+"     ++++++++++++++ "};
diff --git a/site/cedet-1.0pre7/common/icons/box-plus.xpm b/site/cedet-1.0pre7/common/icons/box-plus.xpm
new file mode 100644
index 0000000..5f70fef
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/box-plus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_plus_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #D19200",
+"                    ",
+"  ..............    ",
+" .++++++++++++++.   ",
+" .++@@@@@@+@@@@@+.  ",
+" .+@+@@@@@@+@@@@@+. ",
+" .+@@++++++++++++++.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@++@@@@@+.",
+" .+@@+@@@@@++@@@@@+.",
+" .+@@+@@@++++++@@@+.",
+" .+@@+@@@++++++@@@+.",
+"  .+@+@@@@@++@@@@@+.",
+"   .++@@@@@++@@@@@+.",
+"    .++++++++++++++.",
+"     .............. "};
diff --git a/site/cedet-1.0pre7/common/icons/box.xpm b/site/cedet-1.0pre7/common/icons/box.xpm
new file mode 100644
index 0000000..f569715
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/box.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+" ...............    ",
+" .++++++++++++++.   ",
+" .++@@@@@@+@@@@@+.  ",
+" .+@+@@@@@@+@@@@@+. ",
+" .+@@++++++++++++++.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+"  .+@+@@@@@@@@@@@@+.",
+".  .++@@@@@@@@@@@@+.",
+"    .++++++++++++++.",
+"     .............. "};
diff --git a/site/cedet-1.0pre7/common/icons/checkmark.xpm b/site/cedet-1.0pre7/common/icons/checkmark.xpm
new file mode 100644
index 0000000..ad4078b
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/checkmark.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * sb_chk_xpm[] = {
+"15 15 2 1",
+" 	c None",
+".	c #FF0000",
+"               ",
+" . .  ..       ",
+" . . .         ",
+" . . .       . ",
+"  .   ..    .  ",
+"           ..  ",
+"          ..   ",
+" ...     ..    ",
+" ...    ..     ",
+" ....  ..      ",
+"  ... ..       ",
+"   ....        ",
+"    ...        ",
+"     .         ",
+"               "};
diff --git a/site/cedet-1.0pre7/common/icons/dir-minus.xpm b/site/cedet-1.0pre7/common/icons/dir-minus.xpm
new file mode 100644
index 0000000..2edd33e
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/dir-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_minus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.........  ",
+".+@@@@@@@++++++++.  ",
+".+@@@@@@@@@@@@@@+...",
+".+@@++++++++++++++++",
+".+@@+##############+",
+".+@+##############+.",
+".+@+####++++++####+.",
+".+@+####++++++####+.",
+".+@+##############+.",
+".++##############+..",
+".++##############+. ",
+".+++++++++++++++++. ",
+" .................  "};
diff --git a/site/cedet-1.0pre7/common/icons/dir-plus.xpm b/site/cedet-1.0pre7/common/icons/dir-plus.xpm
new file mode 100644
index 0000000..93154af
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/dir-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_plus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.......... ",
+".+@@@@@@@++++++++++.",
+".+@@@@@@@@@@@@@@@@+.",
+".+#######++#####@@+.",
+".+#######++######@+.",
+".+#####++++++####@+.",
+".+#####++++++####@+.",
+".+#######++######@+.",
+".+#######++######@+.",
+".+###############@+.",
+".+###############@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/dir.xpm b/site/cedet-1.0pre7/common/icons/dir.xpm
new file mode 100644
index 0000000..de1d3fd
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/dir.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.......... ",
+".+@@@@@@@++++++++++.",
+".+@@@@@@@@@@@@@@@@+.",
+".+##############@@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/doc-minus.xpm b/site/cedet-1.0pre7/common/icons/doc-minus.xpm
new file mode 100644
index 0000000..2480e4b
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/doc-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_minus_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@@@@@+#. ",
+"   .+@@@@@@+#+.",
+"  .+@####@+##+.",
+" .+@@@@@@@+#+. ",
+" .+@@@@@@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".++#######+.   ",
+" ..++++##+.    ",
+"   ....+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/common/icons/doc-plus.xpm b/site/cedet-1.0pre7/common/icons/doc-plus.xpm
new file mode 100644
index 0000000..eb7ebe1
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/doc-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_plus_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@#@@@+#. ",
+"   .+@@#@@@+#+.",
+"  .+@#####+##+.",
+" .+@@@@#@@+#+. ",
+" .+@@@@#@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".++#######+.   ",
+" ..++++##+.    ",
+"   ....+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/common/icons/doc.xpm b/site/cedet-1.0pre7/common/icons/doc.xpm
new file mode 100644
index 0000000..3ed8eee
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/doc.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@@@@@+#. ",
+"   .+@@@@@@+#+.",
+"  .+@@@@@@+##+.",
+" .+@@@@@@@+#+. ",
+" .+@@@@@@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".+########+.   ",
+".++++++##+.    ",
+" ......+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/common/icons/info.xpm b/site/cedet-1.0pre7/common/icons/info.xpm
new file mode 100644
index 0000000..0027252
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/info.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_info_xpm[] = {
+"10 15 4 1",
+" 	c None",
+".	c #BEBEBE",
+"+	c #0000FF",
+"@	c #FFFFFF",
+"    ..    ",
+"  ..+++.  ",
+" .+++@++. ",
+" .+++++++ ",
+" .+++++++ ",
+".++@@@++++",
+".++++@++++",
+".++++@++++",
+".++++@++++",
+" .+++@++++",
+" .+++@+++ ",
+" .+@@@@@+ ",
+" .+++++++ ",
+"  .+++++  ",
+"    ++    "};
diff --git a/site/cedet-1.0pre7/common/icons/key.xpm b/site/cedet-1.0pre7/common/icons/key.xpm
new file mode 100644
index 0000000..4b9c7b8
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/key.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * key_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"    ........    ",
+"   ..++++++..   ",
+"   .+@@@@@@+.   ",
+"   .+@@++@@+.   ",
+"   .+@@@@@@+.   ",
+"   .+@@@@@@+.   ",
+"   .+@@@@@@+.   ",
+"    .+@@@@+.    ",
+"     .+@@+.     ",
+"     .+@@@+.    ",
+"     .+@@+.     ",
+"     .+@@+.     ",
+"     .+@@@+.    ",
+"     .+@@+.     ",
+"      .++.      ",
+"       ..       "};
diff --git a/site/cedet-1.0pre7/common/icons/label.xpm b/site/cedet-1.0pre7/common/icons/label.xpm
new file mode 100644
index 0000000..715cc2c
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/label.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_label_xpm[] = {
+"10 16 3 1",
+" 	c None",
+".	c gray",
+"+	c blue",
+"     .....",
+"   ..+++++",
+"  .+++++++",
+" .++++++++",
+" .++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++"};
diff --git a/site/cedet-1.0pre7/common/icons/lock.xpm b/site/cedet-1.0pre7/common/icons/lock.xpm
new file mode 100644
index 0000000..f51ee97
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/lock.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * lock_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"     ........   ",
+"    ..++++++..  ",
+"    .++....++.  ",
+"    .+......+.  ",
+"   ..+......+.. ",
+"  ..++++++++++..",
+"  .++@@@@@@@@++.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@++++@@@+.",
+"  .+@@@@++@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@@++@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .++++++++++++.",
+"  .............."};
diff --git a/site/cedet-1.0pre7/common/icons/mail.xpm b/site/cedet-1.0pre7/common/icons/mail.xpm
new file mode 100644
index 0000000..5716eeb
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/mail.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_mail_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"................... ",
+".++++++++++++++++++.",
+".++@@@@@@@@@@@@@@++.",
+".+@++@@@@@@@@@@++@+.",
+".+@@@++@@@@@@++@@@+.",
+".+@@@@@++@@++@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@+@@@@@@+@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@+@@@@@@@@@@+@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++@@@@@@@@@@@@@@++.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/page-minus.xpm b/site/cedet-1.0pre7/common/icons/page-minus.xpm
new file mode 100644
index 0000000..2e54243
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/page-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_minus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@@@@@@@@+.",
+" .+####+@@@@@@@@@@+.",
+".+++++++@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/page-plus.xpm b/site/cedet-1.0pre7/common/icons/page-plus.xpm
new file mode 100644
index 0000000..aa5d38f
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/page-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_plus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@++@@@@@+.",
+" .+####+@@@++@@@@@+.",
+".+++++++@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/page.xpm b/site/cedet-1.0pre7/common/icons/page.xpm
new file mode 100644
index 0000000..75c6a6e
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/page.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@@@@@@@@+.",
+" .+####+@@@@@@@@@@+.",
+".+++++++@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/common/icons/tag-gt.xpm b/site/cedet-1.0pre7/common/icons/tag-gt.xpm
new file mode 100644
index 0000000..49b8b72
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag-gt.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_gt_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@++@@@@@@@+.",
+" .+@@@@@@+++@@@@@@+.",
+".+@@@@@@@++++@@@@@+.",
+".+@++@@@@+++++@@@@+.",
+".+@++@@@@+++++.@@@+.",
+".+@@@@@@@++++.@@@@+.",
+" .+@@@@@@+++.@@@@@+.",
+"  .+@@@@@++.@@@@@@+.",
+".  .++++++.++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/tag-minus.xpm b/site/cedet-1.0pre7/common/icons/tag-minus.xpm
new file mode 100644
index 0000000..f006c4e
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag-minus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag__xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/tag-plus.xpm b/site/cedet-1.0pre7/common/icons/tag-plus.xpm
new file mode 100644
index 0000000..cf32fef
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag-plus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag+_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@++@@@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+" .+@@@@@@++@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/tag-type.xpm b/site/cedet-1.0pre7/common/icons/tag-type.xpm
new file mode 100644
index 0000000..6588698
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag-type.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_type_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@++@@@@@@++@@@@@+.",
+".+@++@@@@@@++@@@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+" .+@@@@@@@@++@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/tag-v.xpm b/site/cedet-1.0pre7/common/icons/tag-v.xpm
new file mode 100644
index 0000000..7431e4c
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag-v.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_v_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@++++++++++.@+.",
+".+@@@@@++++++++.@@+.",
+".+@++@@@++++++.@@@+.",
+".+@++@@@@++++.@@@@+.",
+".+@@@@@@@@++.@@@@@+.",
+" .+@@@@@@@@.@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/tag.xpm b/site/cedet-1.0pre7/common/icons/tag.xpm
new file mode 100644
index 0000000..4c6f1c5
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/tag.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@++@@@@@@@@@@@@@+.",
+".+@++@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/common/icons/unlock.xpm b/site/cedet-1.0pre7/common/icons/unlock.xpm
new file mode 100644
index 0000000..5841163
--- /dev/null
+++ b/site/cedet-1.0pre7/common/icons/unlock.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * unlock_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+" .......        ",
+"..+++++..       ",
+".++...++.       ",
+".+.....+.       ",
+".+.....+........",
+"....++++++++++..",
+"  .++@@@@@@@@++.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@++++@@@+.",
+"  .+@@@@++@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .+@@@@++@@@@+.",
+"  .+@@@@@@@@@@+.",
+"  .++++++++++++.",
+"  .............."};
diff --git a/site/cedet-1.0pre7/common/inversion.el b/site/cedet-1.0pre7/common/inversion.el
new file mode 100644
index 0000000..6d67748
--- /dev/null
+++ b/site/cedet-1.0pre7/common/inversion.el
@@ -0,0 +1,604 @@
+;;; inversion.el --- When you need something in version XX.XX
+
+;;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: inversion.el,v 1.37 2009/10/13 03:22:14 zappo Exp $
+
+;; InVersion is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Keeping track of rapidly developing software is a tough thing to
+;; do, especially if you want to have co-dependent packages which all
+;; move at different rates.
+;;
+;; This library provides a framework for specifying version numbers
+;; and (as side effect) have a flexible way of getting a desired feature set.
+;;
+;; If you would like to use this package to satisfy dependency replace this:
+;;
+;; (require 'spiffy)
+;;
+;; with this:
+;;
+;; (require 'inversion)
+;; (inversion-require 'spiffy "1.0")
+;;
+;; If you feel the need to not throw errors, you can do this instead:
+;;
+;; (let ((err (inversion-test 'spiffy "1.0")))
+;;    (if err (your-stuff-here)))
+;;
+;; If you new package (2.0) needs to make sure a load file from your
+;; package is compatible, use this test:
+;;
+;; (if (not (inversion-reverse-test 'spiffy version-from-file))
+;;       ;; Everything ok
+;;       (do stuff)
+;;    ;; Out of date
+;;    (import-old-code))
+;;
+;; If you would like to make inversion optional, do this:
+;;
+;; (or (require 'inversion nil t)
+;;     (defun inversion-test (p v)
+;;       (string= v (symbol-value
+;; 		  (intern-soft (concat (symbol-string p) "-version"))))))
+;;
+;; Or modify to specify `inversion-require' instead.
+;;
+;; TODO:
+;;  Offer to download newer versions of a package.
+
+;;; History:
+;;
+;; Sept 3, 2002:  First general publication.
+
+;;; Code:
+
+(defvar inversion-version "1.3"
+  "Current version of InVersion.")
+(defvar inversion-incompatible-version "0.1alpha1"
+  "An earlier release which is incompatible with this release.")
+
+(defconst inversion-decoders
+  '(
+    (alpha  "^\\([0-9]+\\)\\.\\([0-9]+\\)\\s-*\\.?alpha\\([0-9]+\\)?$" 3)
+    (beta   "^\\([0-9]+\\)\\.\\([0-9]+\\)\\s-*\\.?beta\\([0-9]+\\)?$" 3)
+    (beta   "^\\([0-9]+\\)\\.\\([0-9]+\\)\\s-*(beta\\([0-9]+\\)?)" 3)
+    (prerelease "^\\([0-9]+\\)\\.\\([0-9]+\\)\\s-*\\.?pre\\([0-9]+\\)?$" 3)
+    (full   "^\\([0-9]+\\)\\.\\([0-9]+\\)$" 2)
+    (fullsingle "^\\([0-9]+\\)$" 1)
+    (patch  "^\\([0-9]+\\)\\.\\([0-9]+\\) (patch \\([0-9]+\\))" 3)
+    (point  "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" 3)
+    (build  "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\).\\([0-9]+\\)$" 4)
+    )
+  "List of decoders for version strings.
+Each decoder is of the form:
+
+  ( RELEASE-TYPE REGEXP MAX )
+
+RELEASE-TYPE is a symbol specifying something like `beta' or `alpha'.
+REGEXP is the regular expression to match a version string.
+MAX is the maximum number of match-numbers in the release number.
+Decoders must be ordered to decode least stable versions before the
+more stable ones.")
+
+;;; Version Checking
+;;
+(defun inversion-decode-version (version-string)
+  "Decode VERSION-STRING into an encoded list.
+Return value is of the form:
+  (RELEASE MAJOR MINOR ...)
+where RELEASE is a symbol such as `full', or `beta'."
+  (let ((decoders inversion-decoders)
+	(result nil))
+    (while (and decoders (not result))
+      (if (string-match (nth 1 (car decoders)) version-string)
+	  (let ((ver nil)
+		(num-left (nth 2 (car decoders)))
+		(count 1))
+	    (while (<= count num-left)
+	      (setq ver (cons
+			 (if (match-beginning count)
+			     (string-to-number
+			      (substring version-string
+					 (match-beginning count)
+					 (match-end count)))
+			   1)
+			 ver)
+		    count (1+ count)))
+	    (setq result (cons (caar decoders) (nreverse ver))))
+        (setq decoders (cdr decoders))))
+    result))
+
+(defun inversion-package-version (package)
+  "Return the decoded version for PACKAGE."
+  (let ((ver (symbol-value
+	      (intern-soft
+	       (concat (symbol-name package)
+		       "-version"))))
+	(code nil))
+    (unless ver
+      (error "Package %S does not define %S-version" package package))
+    ;; Decode the code
+    (setq code (inversion-decode-version ver))
+    (unless code
+      (error "%S-version value cannot be decoded" package))
+    code))
+
+(defun inversion-package-incompatibility-version (package)
+  "Return the decoded incompatibility version for PACKAGE.
+The incompatibility version is specified by the programmer of
+a package when a package is not backward compatible.  It is
+not an indication of new features or bug fixes."
+  (let ((ver (symbol-value
+	      (intern-soft
+	       (concat (symbol-name package)
+		       "-incompatible-version")))))
+    (if (not ver)
+	nil
+      ;; Decode the code
+      (inversion-decode-version ver))))
+
+(defun inversion-recode (code)
+  "Convert CODE into a string."
+  (let ((r (nth 0 code))		; release-type
+	(n (nth 1 code))		; main number
+	(i (nth 2 code))		; first increment
+	(p (nth 3 code)))		; second increment
+    (cond
+     ((eq r 'full)
+      (setq r "" p ""))
+     ((eq r 'point)
+      (setq r ".")))
+    (format "%s.%s%s%s" n i r p)))
+
+(defun inversion-release-to-number (release-symbol)
+  "Convert RELEASE-SYMBOL into a number."
+  (let* ((ra (assoc release-symbol inversion-decoders))
+	 (rn (- (length inversion-decoders)
+		(length (member ra inversion-decoders)))))
+    rn))
+
+(defun inversion-= (ver1 ver2)
+  "Return non-nil if VER1 is equal to VER2."
+  (equal ver1 ver2))
+
+(defun inversion-< (ver1 ver2)
+  "Return non-nil if VER1 is less than VER2."
+  (let ((v1-0 (inversion-release-to-number (nth 0 ver1)))
+	(v1-1 (nth 1 ver1))
+	(v1-2 (nth 2 ver1))
+	(v1-3 (nth 3 ver1))
+	(v1-4 (nth 4 ver1))
+	;; v2
+	(v2-0 (inversion-release-to-number (nth 0 ver2)))
+	(v2-1 (nth 1 ver2))
+	(v2-2 (nth 2 ver2))
+	(v2-3 (nth 3 ver2))
+	(v2-4 (nth 4 ver2))
+	)
+    (or (and (= v1-0 v2-0)
+	     (= v1-1 v2-1)
+	     (= v1-2 v2-2)
+	     (= v1-3 v2-3)
+	     v1-4 v2-4		; all or nothin if elt - is =
+	     (< v1-4 v2-4))
+	(and (= v1-0 v2-0)
+	     (= v1-1 v2-1)
+	     (= v1-2 v2-2)
+	     v1-3 v2-3		; all or nothin if elt - is =
+	     (< v1-3 v2-3))
+	(and (= v1-1 v2-1)
+	     (< v1-2 v2-2))
+	(and (< v1-1 v2-1))
+	(and (< v1-0 v2-0)
+	     (= v1-1 v2-1)
+	     (= v1-2 v2-2)
+	     )
+	)))
+
+(defun inversion-check-version (version incompatible-version
+					minimum &rest reserved)
+  "Check that a given version meets the minimum requirement.
+VERSION, INCOMPATIBLE-VERSION and MINIMUM are of similar format to
+return entries of `inversion-decode-version', or a classic version
+string.	 INCOMPATIBLE-VERSION can be nil.
+RESERVED arguments are kept for a later use.
+Return:
+- nil if everything is ok
+- 'outdated if VERSION is less than MINIMUM.
+- 'incompatible if VERSION is not backward compatible with MINIMUM.
+- t if the check failed."
+  (let ((code (if (stringp version)
+		  (inversion-decode-version version)
+		version))
+	(req (if (stringp minimum)
+		 (inversion-decode-version minimum)
+	       minimum))
+	)
+    ;; Perform a test.
+    (cond
+     ((inversion-= code req)
+      ;; Same version.. Yay!
+      nil)
+     ((inversion-< code req)
+      ;; Version is too old!
+      'outdated)
+     ((inversion-< req code)
+      ;; Newer is installed.  What to do?
+      (let ((incompatible
+	     (if (stringp incompatible-version)
+		 (inversion-decode-version incompatible-version)
+	       incompatible-version)))
+	(cond
+	 ((not incompatible) nil)
+	 ((or (inversion-= req incompatible)
+	      (inversion-< req incompatible))
+	  ;; The requested version is = or < than what the package
+	  ;; maintainer says is incompatible.
+	  'incompatible)
+	 ;; Things are ok.
+	 (t nil))))
+     ;; Check failed
+     (t t))))
+
+(defun inversion-test (package minimum &rest reserved)
+  "Test that PACKAGE meets the MINIMUM version requirement.
+PACKAGE is a symbol, similar to what is passed to `require'.
+MINIMUM is of similar format to return entries of
+`inversion-decode-version', or a classic version string.
+RESERVED arguments are kept for a later user.
+This depends on the symbols `PACKAGE-version' and optionally
+`PACKAGE-incompatible-version' being defined in PACKAGE.
+Return nil if everything is ok.	 Return an error string otherwise."
+  (let ((check (inversion-check-version
+		(inversion-package-version package)
+		(inversion-package-incompatibility-version package)
+		minimum reserved)))
+    (cond
+     ((null check)
+      ;; Same version.. Yay!
+      nil)
+     ((eq check 'outdated)
+      ;; Version is too old!
+      (format "You need to upgrade package %s to %s" package minimum))
+     ((eq check 'incompatible)
+      ;; Newer is installed but the requested version is = or < than
+      ;; what the package maintainer says is incompatible, then throw
+      ;; that error.
+      (format "Package %s version is not backward compatible with %s"
+	      package minimum))
+     ;; Check failed
+     (t "Inversion version check failed."))))
+
+(defun inversion-reverse-test (package oldversion &rest reserved)
+  "Test that PACKAGE at OLDVERSION is still compatible.
+If something like a save file is loaded at OLDVERSION, this
+test will identify if OLDVERSION is compatible with the current version
+of PACKAGE.
+PACKAGE is a symbol, similar to what is passed to `require'.
+OLDVERSION is of similar format to return entries of
+`inversion-decode-version', or a classic version string.
+RESERVED arguments are kept for a later user.
+This depends on the symbols `PACKAGE-version' and optionally
+`PACKAGE-incompatible-version' being defined in PACKAGE.
+Return nil if everything is ok.	 Return an error string otherwise."
+  (let ((check (inversion-check-version
+		(inversion-package-version package)
+		(inversion-package-incompatibility-version package)
+		oldversion reserved)))
+    (cond
+     ((null check)
+      ;; Same version.. Yay!
+      nil)
+     ((eq check 'outdated)
+      ;; Version is too old!
+      (format "Package %s version %s is not compatible with current version"
+	      package oldversion))
+     ((eq check 'incompatible)
+      ;; Newer is installed but the requested version is = or < than
+      ;; what the package maintainer says is incompatible, then throw
+      ;; that error.
+      (format "Package %s version is not backward compatible with %s"
+	      package oldversion))
+     ;; Check failed
+     (t "Inversion version check failed."))))
+
+;;;###autoload
+(defun inversion-require (package version &optional file directory
+				  &rest reserved)
+  "Declare that you need PACKAGE with at least VERSION.
+PACKAGE might be found in FILE.  (See `require'.)
+Throws an error if VERSION is incompatible with what is installed.
+Optional argument DIRECTORY is a location where new versions of
+this tool can be located.  If there is a versioning problem and
+DIRECTORY is provided, inversion will offer to download the file.
+Optional argument RESERVED is saved for later use."
+  (require package file)
+  (let ((err (inversion-test package version)))
+    (when err
+      (if directory
+	  (inversion-download-package-ask err package directory version)
+	(error err)))
+    ;; Return the package symbol that was required.
+    package))
+
+;;;###autoload
+(defun inversion-require-emacs (emacs-ver xemacs-ver)
+  "Declare that you need either EMACS-VER, or XEMACS-VER.
+Only checks one based on which kind of Emacs is being run."
+  (let ((err (inversion-test 'emacs
+			     (if (featurep 'xemacs)
+				 xemacs-ver
+			       emacs-ver))))
+    (if err (error err)
+      ;; Something nice...
+      t)))
+
+(defconst inversion-find-data
+  '("(def\\(var\\|const\\)\\s-+%s-%s\\s-+\"\\([^\"]+\\)" 2)
+  "Regexp template and match data index of a version string.")
+
+;;;###autoload
+(defun inversion-find-version (package)
+  "Search for the version and incompatible version of PACKAGE.
+Does not load PACKAGE nor requires that it has been previously loaded.
+Search in the directories in `load-path' for a PACKAGE.el library.
+Visit the file found and search for the declarations of variables or
+constants `PACKAGE-version' and `PACKAGE-incompatible-version'.  The
+value of these variables must be a version string.
+
+Return a pair (VERSION-STRING . INCOMPATIBLE-VERSION-STRING) where
+INCOMPATIBLE-VERSION-STRING can be nil.
+Return nil when VERSION-STRING was not found."
+  (let* ((file (locate-library (format "%s.el" package) t))
+	 (tag (car inversion-find-data))
+	 (idx (nth 1 inversion-find-data))
+	 version)
+    (when file
+      (with-temp-buffer
+	;; The 3000 is a bit arbitrary, but should cut down on
+	;; fileio as version info usually is at the very top
+	;; of a file.  AFter a long commentary could be bad.
+	(insert-file-contents-literally file nil 0 3000)
+	(goto-char (point-min))
+	(when (re-search-forward (format tag package 'version) nil t)
+	  (setq version (list (match-string idx)))
+	  (goto-char (point-min))
+	  (when (re-search-forward
+		 (format tag package 'incompatible-version) nil t)
+	    (setcdr version (match-string idx))))))
+    version))
+
+;;;###autoload
+(defun inversion-add-to-load-path (package minimum
+					   &optional installdir
+					   &rest subdirs)
+  "Add the PACKAGE path to `load-path' if necessary.
+MINIMUM is the minimum version requirement of PACKAGE.
+Optional argument INSTALLDIR is the base directory where PACKAGE is
+installed.  It defaults to `default-directory'/PACKAGE.
+SUBDIRS are sub-directories to add to `load-path', following the main
+INSTALLDIR path."
+  (let ((ver (inversion-find-version package)))
+    ;; If PACKAGE not found or a bad version already in `load-path',
+    ;; prepend the new PACKAGE path, so it will be loaded first.
+    (when (or (not ver)
+              (and
+               (inversion-check-version (car ver) (cdr ver) minimum)
+               (message "Outdated %s %s shadowed to meet minimum version %s"
+                        package (car ver) minimum)
+               t))
+      (let* ((default-directory
+               (or installdir
+                   (expand-file-name (format "./%s" package))))
+             subdir)
+        (when (file-directory-p default-directory)
+          ;; Add SUBDIRS
+          (while subdirs
+            (setq subdir  (expand-file-name (car subdirs))
+                  subdirs (cdr subdirs))
+            (when (file-directory-p subdir)
+              ;;(message "%S added to `load-path'" subdir)
+              (add-to-list 'load-path subdir)))
+          ;; Add the main path
+          ;;(message "%S added to `load-path'" default-directory)
+          (add-to-list 'load-path default-directory))
+	;; We get to this point iff we do not accept or there is no
+	;; system file.  Lets check the version of what we just
+	;; installed... just to be safe.
+	(let ((newver (inversion-find-version package)))
+	  (if (not newver)
+	      (error "Failed to find version for newly installed %s"
+		     package))
+	  (if (inversion-check-version (car newver) (cdr newver) minimum)
+	      (error "Outdated %s %s just installed" package (car newver)))
+	  )))))
+
+;;; Inversion tests
+;;
+(defun inversion-unit-test ()
+  "Test inversion to make sure it can identify different version strings."
+  (interactive)
+  (let ((c1 (inversion-package-version 'inversion))
+	(c1i (inversion-package-incompatibility-version 'inversion))
+	(c2 (inversion-decode-version  "1.3alpha2"))
+	(c3 (inversion-decode-version  "1.3beta4"))
+	(c4 (inversion-decode-version  "1.3 beta5"))
+	(c5 (inversion-decode-version  "1.3.4"))
+	(c6 (inversion-decode-version  "2.3alpha"))
+	(c7 (inversion-decode-version  "1.3"))
+	(c8 (inversion-decode-version  "1.3pre1"))
+	(c9 (inversion-decode-version  "2.4 (patch 2)"))
+	(c10 (inversion-decode-version "2.4 (patch 3)"))
+	(c11 (inversion-decode-version "2.4.2.1"))
+	(c12 (inversion-decode-version "2.4.2.2"))
+	)
+    (if (not (and
+	      (inversion-= c1 c1)
+	      (inversion-< c1i c1)
+	      (inversion-< c2 c3)
+	      (inversion-< c3 c4)
+	      (inversion-< c4 c5)
+	      (inversion-< c5 c6)
+	      (inversion-< c2 c4)
+	      (inversion-< c2 c5)
+	      (inversion-< c2 c6)
+	      (inversion-< c3 c5)
+	      (inversion-< c3 c6)
+	      (inversion-< c7 c6)
+	      (inversion-< c4 c7)
+	      (inversion-< c2 c7)
+	      (inversion-< c8 c6)
+	      (inversion-< c8 c7)
+	      (inversion-< c4 c8)
+	      (inversion-< c2 c8)
+	      (inversion-< c9 c10)
+	      (inversion-< c10 c11)
+	      (inversion-< c11 c12)
+	      ;; Negatives
+	      (not (inversion-< c3 c2))
+	      (not (inversion-< c4 c3))
+	      (not (inversion-< c5 c4))
+	      (not (inversion-< c6 c5))
+	      (not (inversion-< c7 c2))
+	      (not (inversion-< c7 c8))
+	      (not (inversion-< c12 c11))
+	      ;; Test the tester on inversion
+	      (not (inversion-test 'inversion inversion-version))
+	      ;; Test that we throw an error
+	      (inversion-test 'inversion "0.0.0")
+	      (inversion-test 'inversion "1000.0")
+	      ))
+	(error "Inversion tests failed")
+      (message "Inversion tests passed."))))
+
+;;; URL and downloading code
+;;
+(defun inversion-locate-package-files (package directory &optional version)
+  "Get a list of distributions of PACKAGE from DIRECTORY.
+DIRECTORY can be an ange-ftp compatible filename, such as:
+ \"/ftp@ftp1.sourceforge.net/pub/sourceforge/PACKAGE\"
+If it is a URL, wget will be used for download.
+Optional argument VERSION will restrict the list of available versions
+to the file matching VERSION exactly, or nil."
+;;DIRECTORY should also allow a URL:
+;; \"http://ftp1.sourceforge.net/PACKAGE\"
+;; but then I can get file listings easily.
+  (if (symbolp package) (setq package (symbol-name package)))
+  (directory-files directory t
+		   (if version
+		       (concat "^" package "-" version "\\>")
+		     package)))
+
+(defvar inversion-package-common-tails '( ".tar.gz"
+					 ".tar"
+					 ".zip"
+					 ".gz"
+					 )
+  "Common distribution mechanisms for Emacs Lisp packages.")
+
+(defun inversion-locate-package-files-and-split (package directory &optional version)
+  "Use `inversion-locate-package-files' to get a list of PACKAGE files.
+DIRECTORY is the location where distributions of PACKAGE are.
+VERSION is an optional argument specifying a version to restrict to.
+The return list is an alist with the version string in the CAR,
+and the full path name in the CDR."
+  (if (symbolp package) (setq package (symbol-name package)))
+  (let ((f (inversion-locate-package-files package directory version))
+	(out nil))
+    (while f
+      (let* ((file (car f))
+	     (dist (file-name-nondirectory file))
+	     (tails inversion-package-common-tails)
+	     (verstring nil))
+	(while (and tails (not verstring))
+	  (when (string-match (concat (car tails) "$") dist)
+	    (setq verstring
+		  (substring dist (1+ (length package)) (match-beginning 0))))
+	  (setq tails (cdr tails)))
+	(if (not verstring)
+	    (error "Cannot decode version for %s" dist))
+	(setq out
+	      (cons
+	       (cons verstring file)
+	       out))
+	(setq f (cdr f))))
+    out))
+
+(defun inversion-download-package-ask (err package directory version)
+  "Due to ERR, offer to download PACKAGE from DIRECTORY.
+The package should have VERSION available for download."
+  (if (symbolp package) (setq package (symbol-name package)))
+  (let ((files (inversion-locate-package-files-and-split
+		package directory version)))
+    (if (not files)
+	(error err)
+      (if (not (y-or-n-p (concat err ": Download update? ")))
+	  (error err)
+	(let ((dest (read-directory-name (format "Download %s to: "
+						 package)
+					 t)))
+	  (if (> (length files) 1)
+	      (setq files
+		    (list
+		     "foo" ;; ignored
+		     (read-file-name "Version to download: "
+				     directory
+				     files
+				     t
+				     (concat
+				      (file-name-as-directory directory)
+				      package)
+				     nil))))
+
+	  (copy-file (cdr (car files)) dest))))))
+
+;;;###autoload
+(defun inversion-upgrade-package (package &optional directory)
+  "Try to upgrade PACKAGE in DIRECTORY is available."
+  (interactive "sPackage to upgrade: ")
+  (if (stringp package) (setq package (intern package)))
+  (if (not directory)
+      ;; Hope that the package maintainer specified.
+      (setq directory (symbol-value (or (intern-soft
+					 (concat (symbol-name package)
+						 "-url"))
+					(intern-soft
+					 (concat (symbol-name package)
+						 "-directory"))))))
+  (let ((files (inversion-locate-package-files-and-split
+		package directory))
+	(cver (inversion-package-version package))
+	(newer nil))
+    (mapc (lambda (f)
+	    (if (inversion-< cver (inversion-decode-version (car f)))
+		(setq newer (cons f newer))))
+	    files)
+    newer
+    ))
+
+;; (inversion-upgrade-package
+;;  'semantic
+;;  "/ftp@ftp1.sourceforge.net:/pub/sourceforge/cedet")
+
+;; "/ftp@ftp1.sourceforge.net:/pub/sourceforge/cedet"
+(provide 'inversion)
+
+;;; inversion.el ends here
diff --git a/site/cedet-1.0pre7/common/mode-local.el b/site/cedet-1.0pre7/common/mode-local.el
new file mode 100644
index 0000000..e613c90
--- /dev/null
+++ b/site/cedet-1.0pre7/common/mode-local.el
@@ -0,0 +1,895 @@
+;;; mode-local.el --- Support for mode local facilities
+;;
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+;; Copyright (C) 2004, 2005 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 27 Apr 2004
+;; Keywords: syntax
+;; X-RCS: $Id: mode-local.el,v 1.24 2009/09/11 23:44:53 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Each major mode will want to support a specific set of behaviors.
+;; Usually generic behaviors that need just a little bit of local
+;; specifics.
+;;
+;; This library permits the setting of override functions for tasks of
+;; that nature, and also provides reasonable defaults.
+;;
+;; There are buffer local variables, and frame local variables.
+;; This library give the illusion of mode specific variables.
+;;
+;; You should use a mode-local variable or override to allow extension
+;; only if you expect a mode author to provide that extension.  If a
+;; user might wish to customize a give variable or function then
+;; the existing customization mechanism should be used.
+
+;; To Do:
+;; Allow customization of a variable for a specific mode?
+;;
+;; Add mecro for defining the '-default' functionality.
+
+;;; History:
+;;
+
+;;; Code:
+(eval-when-compile (require 'cl))
+
+;;; Compatibility
+;;
+(defun mode-local-define-derived-mode-needed-p ()
+  "Return non-nil if mode local has to fix `define-derived-mode'.
+That is, if `define-derived-mode' does not set `derived-mode-parent'."
+  (let ((body (cdr (macroexpand '(define-derived-mode c p ""))))
+        (bad t))
+    (while (and body bad)
+      (if (equal (car body) '(put 'c 'derived-mode-parent 'p))
+          (setq bad nil)
+        (setq body (cdr body))))
+    bad))
+
+(when (mode-local-define-derived-mode-needed-p)
+  ;; Workaround a bug in some (XEmacs) versions of
+  ;; `define-derived-mode' that don't set the `derived-mode-parent'
+  ;; property, and break mode-local.
+  (defadvice define-derived-mode
+    (after mode-local-define-derived-mode activate)
+    "Fix missing `derived-mode-parent' property on child."
+    (unless (eq 'fundamental-mode (ad-get-arg 1))
+      (let ((form (cdr ad-return-value)))
+        (setq ad-return-value nil)
+        (while form
+          (and (eq 'defun (car-safe (car form)))
+               (eq (ad-get-arg 0) (car (cdr-safe (car form))))
+               (push `(or (get ',(ad-get-arg 0) 'derived-mode-parent)
+                          (put ',(ad-get-arg 0) 'derived-mode-parent
+                               ',(ad-get-arg 1)))
+                     ad-return-value))
+          (push (car form) ad-return-value)
+          (setq form (cdr form)))
+        (setq ad-return-value `(progn ,@(nreverse ad-return-value)))
+        )))
+  )
+
+;;; Misc utilities
+;;
+(defun mode-local-map-file-buffers (function &optional predicate buffers)
+  "Run FUNCTION on every file buffer found.
+FUNCTION does not have arguments; when it is entered `current-buffer'
+is the currently selected file buffer.
+If optional argument PREDICATE is non nil, only select file buffers
+for which the function PREDICATE return non-nil.
+If optional argument BUFFERS is non-nil, it is a list of buffers to
+walk through.  It defaults to `buffer-list'."
+  (dolist (b (or buffers (buffer-list)))
+    (and (buffer-live-p b) (buffer-file-name b)
+         (with-current-buffer b
+           (when (or (not predicate) (funcall predicate))
+             (funcall function))))))
+
+(defsubst get-mode-local-parent (mode)
+  "Return the mode parent of the major mode MODE.
+Return nil if MODE has no parent."
+  (or (get mode 'mode-local-parent)
+      (get mode 'derived-mode-parent)))
+
+(defun mode-local-equivalent-mode-p (mode)
+  "Is the major-mode in the current buffer equivalent to a mode in MODES."
+  (let ((modes nil))
+    (while mode
+      (setq modes (cons mode modes)
+	    mode  (get-mode-local-parent mode)))
+    modes))
+
+(defun mode-local-map-mode-buffers (function modes)
+  "Run FUNCTION on every file buffer with major mode in MODES.
+MODES can be a symbol or a list of symbols.
+FUNCTION does not have arguments."
+  (or (listp modes) (setq modes (list modes)))
+  (mode-local-map-file-buffers
+   function #'(lambda ()
+		(let ((mm (mode-local-equivalent-mode-p major-mode))
+		      (ans nil))
+		  (while (and (not ans) mm)
+		    (setq ans (memq (car mm) modes)
+			  mm (cdr mm)) )
+		  ans))))
+
+;;; Hook machinery
+;;
+(defvar mode-local-init-hook nil
+  "Hook run after a new file buffer is created.
+The current buffer is the newly created file buffer.")
+
+(defvar mode-local-changed-mode-buffers nil
+  "List of buffers whose `major-mode' has changed recently.")
+
+(defvar mode-local--init-mode nil)
+
+(defsubst mode-local-initialized-p ()
+  "Return non-nil if mode local is initialized in current buffer.
+That is, if the current `major-mode' is equal to the major mode for
+which mode local bindings have been activated."
+  (eq mode-local--init-mode major-mode))
+
+(defun mode-local-post-major-mode-change ()
+  "`post-command-hook' run when there is a `major-mode' change.
+This makes sure mode local init type stuff can occur."
+  (remove-hook 'post-command-hook 'mode-local-post-major-mode-change nil)
+  (let ((buffers mode-local-changed-mode-buffers))
+    (setq mode-local-changed-mode-buffers nil)
+    (mode-local-map-file-buffers
+     #'(lambda ()
+         ;; Make sure variables are set up for this mode.
+         (activate-mode-local-bindings)
+         (run-hooks 'mode-local-init-hook))
+     #'(lambda ()
+         (not (mode-local-initialized-p)))
+     buffers)))
+
+(defun mode-local-on-major-mode-change ()
+  "Function called in `change-major-mode-hook'."
+  (add-to-list 'mode-local-changed-mode-buffers (current-buffer))
+  (add-hook 'post-command-hook 'mode-local-post-major-mode-change t nil))
+
+(add-hook 'find-file-hooks 'mode-local-post-major-mode-change)
+(add-hook 'change-major-mode-hook 'mode-local-on-major-mode-change)
+
+;;; Mode lineage
+;;
+(defsubst set-mode-local-parent (mode parent)
+  "Set parent of major mode MODE to PARENT mode.
+To work properly, this function should be called after PARENT mode
+local variables have been defined."
+  (put mode 'mode-local-parent parent)
+  ;; Refresh mode bindings to get mode local variables inherited from
+  ;; PARENT. To work properly, the following should be called after
+  ;; PARENT mode local variables have been defined.
+  (mode-local-map-mode-buffers #'activate-mode-local-bindings mode))
+
+(defmacro define-child-mode (mode parent &optional docstring)
+  "Make major mode MODE inherits behavior from PARENT mode.
+DOCSTRING is optional and not used.
+To work properly, this should be put after PARENT mode local variables
+definition."
+  `(set-mode-local-parent ',mode ',parent))
+
+(defun mode-local-use-bindings-p (this-mode desired-mode)
+  "Return non-nil if THIS-MODE can use bindings of DESIRED-MODE."
+  (let ((ans nil))
+    (while (and (not ans) this-mode)
+      (setq ans (eq this-mode desired-mode))
+      (setq this-mode (get-mode-local-parent this-mode)))
+    ans))
+
+
+;;; Core bindings API
+;;
+(defvar mode-local-symbol-table nil
+  "Buffer local mode bindings.
+These symbols provide a hook for a `major-mode' to specify specific
+behaviors.  Use the function `mode-local-bind' to define new bindings.")
+(make-variable-buffer-local 'mode-local-symbol-table)
+
+(defvar mode-local-active-mode nil
+  "Major mode in which bindings are active.")
+
+(defsubst new-mode-local-bindings ()
+  "Return a new empty mode bindings symbol table."
+  (make-vector 13 0))
+
+(defun mode-local-bind (bindings &optional plist mode)
+  "Define BINDINGS in the specified environment.
+BINDINGS is a list of (VARIABLE . VALUE).
+Optional argument PLIST is a property list each VARIABLE symbol will
+be set to.  The following properties have special meaning:
+
+- `constant-flag' if non-nil, prevent to rebind variables.
+- `mode-variable-flag' if non-nil, define mode variables.
+- `override-flag' if non-nil, define override functions.
+
+The `override-flag' and `mode-variable-flag' properties are mutually
+exclusive.
+
+If optional argument MODE is non-nil, it must be a major mode symbol.
+BINDINGS will be defined globally for this major mode.  If MODE is
+nil, BINDINGS will be defined locally in the current buffer, in
+variable `mode-local-symbol-table'.  The later should be done in MODE
+hook."
+  ;; Check plist consistency
+  (and (plist-get plist 'mode-variable-flag)
+       (plist-get plist 'override-flag)
+       (error "Bindings can't be both overrides and mode variables"))
+  (let (table variable varname value binding)
+    (if mode
+        (progn
+          ;; Install in given MODE symbol table.  Create a new one if
+          ;; needed.
+          (setq table (or (get mode 'mode-local-symbol-table)
+                          (new-mode-local-bindings)))
+          (put mode 'mode-local-symbol-table table))
+      ;; Fail if trying to bind mode variables in local context!
+      (if (plist-get plist 'mode-variable-flag)
+          (error "Mode required to bind mode variables"))
+      ;; Install in buffer local symbol table.  Create a new one if
+      ;; needed.
+      (setq table (or mode-local-symbol-table
+                      (setq mode-local-symbol-table
+                            (new-mode-local-bindings)))))
+    (while bindings
+      (setq binding  (car bindings)
+            bindings (cdr bindings)
+            varname  (symbol-name (car binding))
+            value    (cdr binding))
+      (if (setq variable (intern-soft varname table))
+          ;; Binding already exists
+          ;; Check rebind consistency
+          (cond
+           ((equal (symbol-value variable) value)
+            ;; Just ignore rebind with the same value.
+            )
+           ((get variable 'constant-flag)
+            (error "Can't change the value of constant `%s'"
+                   variable))
+           ((and (get variable 'mode-variable-flag)
+                 (plist-get plist 'override-flag))
+            (error "Can't rebind override `%s' as a mode variable"
+                   variable))
+           ((and (get variable 'override-flag)
+                 (plist-get plist 'mode-variable-flag))
+            (error "Can't rebind mode variable `%s' as an override"
+                   variable))
+           (t
+            ;; Merge plist and assign new value
+            (setplist variable (append plist (symbol-plist variable)))
+            (set variable value)))
+        ;; New binding
+        (setq variable (intern varname table))
+        ;; Set new plist and assign initial value
+        (setplist variable plist)
+        (set variable value)))
+    ;; Return the symbol table used
+    table))
+
+(defsubst mode-local-symbol (symbol &optional mode)
+  "Return the mode local symbol bound with SYMBOL's name.
+Return nil if the  mode local symbol doesn't exist.
+If optional argument MODE is nil, lookup first into locally bound
+symbols, then in those bound in current `major-mode' and its parents.
+If MODE is non-nil, lookup into symbols bound in that major mode and
+its parents."
+  (let ((name (symbol-name symbol)) bind)
+    (or mode
+        (setq mode mode-local-active-mode)
+        (setq mode major-mode
+              bind (and mode-local-symbol-table
+                        (intern-soft name mode-local-symbol-table))))
+    (while (and mode (not bind))
+      (or (and (get mode 'mode-local-symbol-table)
+               (setq bind (intern-soft
+                           name (get mode 'mode-local-symbol-table))))
+          (setq mode (get-mode-local-parent mode))))
+    bind))
+
+(defsubst mode-local-symbol-value (symbol &optional mode property)
+  "Return the value of the mode local symbol bound with SYMBOL's name.
+If optional argument MODE is non-nil, restrict lookup to that mode and
+its parents (see the function `mode-local-symbol' for more details).
+If optional argument PROPERTY is non-nil the mode local symbol must
+have that property set.  Return nil if the symbol doesn't exist, or
+doesn't have PROPERTY set."
+  (and (setq symbol (mode-local-symbol symbol mode))
+       (or (not property) (get symbol property))
+       (symbol-value symbol)))
+
+;;; Mode local variables
+;;
+(defun activate-mode-local-bindings (&optional mode)
+  "Activate variables defined locally in MODE and its parents.
+That is, copy mode local bindings into corresponding buffer local
+variables.
+If MODE is not specified it defaults to current `major-mode'.
+Return the alist of buffer-local variables that have been changed.
+Elements are (SYMBOL . PREVIOUS-VALUE), describing one variable."
+  ;; Hack -
+  ;; do not do this if we are inside set-auto-mode as we may be in
+  ;; an initialization race condition.
+  (if (or  (and (featurep 'emacs) (boundp 'keep-mode-if-same))
+	   (and (featurep 'xemacs) (boundp 'just-from-file-name)))
+      ;; We are inside set-auto-mode, as this is an argument that is
+      ;; vaguely unique.
+
+      ;; This will make sure that when everything is over, this will get
+      ;; called and we won't be under set-auto-mode anymore.
+      (mode-local-on-major-mode-change)
+
+    ;; Do the normal thing.
+    (let (modes table old-locals)
+      (unless mode
+	(set (make-local-variable 'mode-local--init-mode) major-mode)
+	(setq mode major-mode))
+      ;; Get MODE's parents & MODE in the right order.
+      (while mode
+	(setq modes (cons mode modes)
+	      mode  (get-mode-local-parent mode)))
+      ;; Activate mode bindings following parent modes order.
+      (dolist (mode modes)
+	(when (setq table (get mode 'mode-local-symbol-table))
+	  (mapatoms
+	   #'(lambda (var)
+	       (when (get var 'mode-variable-flag)
+		 (let ((v (intern (symbol-name var))))
+		   ;; Save the current buffer-local value of the
+		   ;; mode-local variable.
+		   (and (local-variable-p v (current-buffer))
+			(push (cons v (symbol-value v)) old-locals))
+		   (set (make-local-variable v) (symbol-value var)))))
+	   table)))
+      old-locals)))
+
+(defun deactivate-mode-local-bindings (&optional mode)
+  "Deactivate variables defined locally in MODE and its parents.
+That is, kill buffer local variables set from the corresponding mode
+local bindings.
+If MODE is not specified it defaults to current `major-mode'."
+  (unless mode
+    (kill-local-variable 'mode-local--init-mode)
+    (setq mode major-mode))
+  (let (table)
+    (while mode
+      (when (setq table (get mode 'mode-local-symbol-table))
+        (mapatoms
+         #'(lambda (var)
+             (when (get var 'mode-variable-flag)
+               (kill-local-variable (intern (symbol-name var)))))
+         table))
+      (setq mode (get-mode-local-parent mode)))))
+
+(defmacro with-mode-local-symbol (mode &rest body)
+   "With the local bindings of MODE symbol, evaluate BODY.
+The current mode bindings are saved, BODY is evaluated, and the saved
+bindings are restored, even in case of an abnormal exit.
+Value is what BODY returns.
+This is like `with-mode-local', except that MODE's value is used.
+To use the symbol MODE (quoted), use `with-mode-local'."
+   (let ((old-mode  (make-symbol "mode"))
+         (old-locals (make-symbol "old-locals"))
+	 (new-mode (make-symbol "new-mode"))
+         (local (make-symbol "local")))
+     `(let ((,old-mode mode-local-active-mode)
+            (,old-locals nil)
+	    (,new-mode ,mode)
+	    )
+        (unwind-protect
+            (progn
+              (deactivate-mode-local-bindings ,old-mode)
+              (setq mode-local-active-mode ,new-mode)
+              ;; Save the previous value of buffer-local variables
+              ;; changed by `activate-mode-local-bindings'.
+              (setq ,old-locals (activate-mode-local-bindings ,new-mode))
+              ,@body)
+          (deactivate-mode-local-bindings ,new-mode)
+          ;; Restore the previous value of buffer-local variables.
+          (dolist (,local ,old-locals)
+            (set (car ,local) (cdr ,local)))
+          ;; Restore the mode local variables.
+          (setq mode-local-active-mode ,old-mode)
+          (activate-mode-local-bindings ,old-mode)))))
+(put 'with-mode-local-symbol 'lisp-indent-function 1)
+
+(defmacro with-mode-local (mode &rest body)
+   "With the local bindings of MODE, evaluate BODY.
+The current mode bindings are saved, BODY is evaluated, and the saved
+bindings are restored, even in case of an abnormal exit.
+Value is what BODY returns.
+This lis like `with-mode-local-symbol', except that MODE is quoted
+and is note evaluated."
+   `(with-mode-local-symbol ',mode ,@body))
+(put 'with-mode-local 'lisp-indent-function 1)
+
+
+(defsubst mode-local-value (mode sym)
+  "Return the value of the MODE local variable SYM."
+  (or mode (error "Missing major mode symbol"))
+  (mode-local-symbol-value sym mode 'mode-variable-flag))
+
+(defmacro setq-mode-local (mode &rest args)
+  "Assign new values to variables local in MODE.
+MODE must be a major mode symbol.
+ARGS is a list (SYM VAL SYM VAL ...).
+The symbols SYM are variables; they are literal (not evaluated).
+The values VAL are expressions; they are evaluated.
+Set each SYM to the value of its VAL, locally in buffers already in
+MODE, or in buffers switched to that mode.
+Return the value of the last VAL."
+  (when args
+    (let (i ll bl sl tmp sym val)
+      (setq i 0)
+      (while args
+        (setq tmp  (make-symbol (format "tmp%d" i))
+              i    (1+ i)
+              sym  (car args)
+              val  (cadr args)
+              ll   (cons (list tmp val) ll)
+              bl   (cons `(cons ',sym ,tmp) bl)
+              sl   (cons `(set (make-local-variable ',sym) ,tmp) sl)
+              args (cddr args)))
+      `(let* ,(nreverse ll)
+         ;; Save mode bindings
+         (mode-local-bind (list ,@bl) '(mode-variable-flag t) ',mode)
+         ;; Assign to local variables in all existing buffers in MODE
+         (mode-local-map-mode-buffers #'(lambda () ,@sl) ',mode)
+         ;; Return the last value
+         ,tmp)
+      )))
+
+(defmacro defvar-mode-local (mode sym val &optional docstring)
+  "Define MODE local variable SYM with value VAL.
+DOCSTRING is optional."
+  `(progn
+     (setq-mode-local ,mode ,sym ,val)
+     (put (mode-local-symbol ',sym ',mode)
+          'variable-documentation ,docstring)
+     ',sym))
+(put 'defvar-mode-local 'lisp-indent-function 'defun)
+
+(defmacro defconst-mode-local (mode sym val &optional docstring)
+  "Define MODE local constant SYM with value VAL.
+DOCSTRING is optional."
+  (let ((tmp (make-symbol "tmp")))
+    `(let (,tmp)
+       (setq-mode-local ,mode ,sym ,val)
+       (setq ,tmp (mode-local-symbol ',sym ',mode))
+       (put ,tmp 'constant-flag t)
+       (put ,tmp 'variable-documentation ,docstring)
+       ',sym)))
+(put 'defconst-mode-local 'lisp-indent-function 'defun)
+
+;;; Function overloading
+;;
+(defun make-obsolete-overload (old new)
+  "Mark OLD overload as obsoleted by NEW overload."
+  (put old 'overload-obsoleted-by new)
+  (put old 'mode-local-overload t)
+  (put new 'overload-obsolete old))
+
+(defsubst overload-obsoleted-by (overload)
+  "Get the overload symbol obsoleted by OVERLOAD.
+Return the obsolete symbol or nil if not found."
+  (get overload 'overload-obsolete))
+
+(defsubst overload-that-obsolete (overload)
+  "Return the overload symbol that obsoletes OVERLOAD.
+Return the symbol found or nil if OVERLOAD is not obsolete."
+  (get overload 'overload-obsoleted-by))
+
+(defsubst fetch-overload (overload)
+  "Return the current OVERLOAD function, or nil if not found.
+First, lookup for OVERLOAD into locally bound mode local symbols, then
+in those bound in current `major-mode' and its parents."
+  (or (mode-local-symbol-value overload nil 'override-flag)
+      ;; If an obsolete overload symbol exists, try it.
+      (and (overload-obsoleted-by overload)
+           (mode-local-symbol-value
+            (overload-obsoleted-by overload) nil 'override-flag))))
+
+(defun mode-local--override (name args body)
+  "Return the form that handles overloading of function NAME.
+ARGS are the arguments to the function.
+BODY is code that would be run when there is no override defined.  The
+default is to call the function `NAME-default' with the appropriate
+arguments.
+See also the function `define-overload'."
+  (let* ((default (intern (format "%s-default" name)))
+         (overargs (delq '&rest (delq '&optional (copy-sequence args))))
+         (override (make-symbol "override")))
+    `(let ((,override (fetch-overload ',name)))
+       (if ,override
+           (funcall ,override ,@overargs)
+         ,@(or body `((,default ,@overargs)))))
+    ))
+
+(defun mode-local--expand-overrides (name args body)
+  "Expand override forms that overload function NAME.
+ARGS are the arguments to the function NAME.
+BODY is code where override forms are searched for expansion.
+Return result of expansion, or BODY if no expansion occurred.
+See also the function `define-overload'."
+  (let ((forms body)
+        (ditto t)
+        form xbody)
+    (while forms
+      (setq form (car forms))
+      (cond
+       ((atom form))
+       ((eq (car form) :override)
+        (setq form (mode-local--override name args (cdr form))))
+       ((eq (car form) :override-with-args)
+        (setq form (mode-local--override name (cadr form) (cddr form))))
+       ((setq form (mode-local--expand-overrides name args form))))
+      (setq ditto (and ditto (eq (car forms) form))
+            xbody (cons form xbody)
+            forms (cdr forms)))
+    (if ditto body (nreverse xbody))))
+
+(defun mode-local--overload-body (name args body)
+  "Return the code that implements overloading of function NAME.
+ARGS are the arguments to the function NAME.
+BODY specifies the overload code.
+See also the function `define-overload'."
+  (let ((result (mode-local--expand-overrides name args body)))
+    (if (eq body result)
+        (list (mode-local--override name args body))
+      result)))
+
+(defmacro define-overloadable-function (name args docstring &rest body)
+  "Define a new function, as with `defun' which can be overloaded.
+NAME is the name of the function to create.
+ARGS are the arguments to the function.
+DOCSTRING is a documentation string to describe the function.  The
+docstring will automatically had details about its overload symbol
+appended to the end.
+BODY is code that would be run when there is no override defined.  The
+default is to call the function `NAME-default' with the appropriate
+arguments.
+
+BODY can also include an override form that specifies which part of
+BODY is specifically overridden.  This permits to specify common code
+run for both default and overridden implementations.
+An override form is one of:
+
+  1. (:override [OVERBODY])
+  2. (:override-with-args OVERARGS [OVERBODY])
+
+OVERBODY is the code that would be run when there is no override
+defined.  The default is to call the function `NAME-default' with the
+appropriate arguments deduced from ARGS.
+OVERARGS is a list of arguments passed to the override and
+`NAME-default' function, in place of those deduced from ARGS."
+  `(eval-and-compile
+     (defun ,name ,args
+       ,docstring
+       ,@(mode-local--overload-body name args body))
+     (put ',name 'mode-local-overload t)))
+(put :override-with-args 'lisp-indent-function 1)
+
+(defalias 'define-overload 'define-overloadable-function)
+
+(defsubst function-overload-p (symbol)
+  "Return non-nil if SYMBOL is a function which can be overloaded."
+  (and symbol (symbolp symbol) (get symbol 'mode-local-overload)))
+
+(defmacro define-mode-local-override
+  (name mode args docstring &rest body)
+  "Define a mode specific override of the function overload NAME.
+Has meaning only if NAME has been created with `define-overload'.
+MODE is the major mode this override is being defined for.
+ARGS are the function arguments, which should match those of the same
+named function created with `define-overload'.
+DOCSTRING is the documentation string.
+BODY is the implementation of this function."
+  (let ((newname (intern (format "%s-%s" name mode))))
+    `(progn
+       (eval-and-compile
+	 (defun ,newname ,args
+	   ,(format "%s\n\nOverride %s in `%s' buffers."
+		    docstring name mode)
+	   ;; The body for this implementation
+	   ,@body)
+         ;; For find-func to locate the definition of NEWNAME.
+         (put ',newname 'definition-name ',name))
+       (mode-local-bind '((,name . ,newname))
+                        '(override-flag t)
+                        ',mode))
+    ))
+
+;;; Read/Query Support
+;;
+;;;###autoload
+(defun mode-local-read-function (prompt &optional initial hist default)
+  "Interactively read in the name of a mode-local function.
+PROMPT, INITIAL, HIST, and DEFAULT are the same as for `completing-read'."
+  (completing-read prompt obarray 'function-overload-p t initial hist default))
+
+;;; Help support
+;;
+(defun overload-docstring-extension (overload)
+  "Return the doc string that augments the description of OVERLOAD."
+  (let ((doc "\n\This function can be overloaded\
+ (see `define-mode-local-override' for details).")
+        (sym (overload-obsoleted-by overload)))
+    (when sym
+      (setq doc (format "%s\nIt makes the overload `%s' obsolete."
+                        doc sym)))
+    (setq sym (overload-that-obsolete overload))
+    (when sym
+      (setq doc (format "%s\nThis overload is obsoletes;\nUse `%s' instead."
+                        doc sym)))
+    doc))
+
+(defun mode-local-augment-function-help (symbol)
+  "Augment the *Help* buffer for SYMBOL.
+SYMBOL is a function that can be overridden."
+  (with-current-buffer "*Help*"
+    (pop-to-buffer (current-buffer))
+    (unwind-protect
+	(progn
+	  (toggle-read-only -1)
+          (goto-char (point-min))
+          (unless (re-search-forward "^$" nil t)
+            (goto-char (point-max))
+            (beginning-of-line)
+            (forward-line -1))
+          (insert (overload-docstring-extension symbol) "\n")
+	  ;; NOTE TO SELF:
+	  ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE
+	  )
+      (toggle-read-only 1))))
+
+;; Help for Overload functions.  Need to advise help.
+(defadvice describe-function (around mode-local-help activate)
+  "Display the full documentation of FUNCTION (a symbol).
+Returns the documentation as a string, also."
+  (prog1
+      ad-do-it
+    (if (function-overload-p (ad-get-arg 0))
+	(mode-local-augment-function-help (ad-get-arg 0)))))
+
+;; Help for mode-local bindings.
+(defun mode-local-print-binding (symbol)
+  "Print the SYMBOL binding."
+  (let ((value (symbol-value symbol)))
+    (princ (format "\n     `%s' value is\n       " symbol))
+    (if (and value (symbolp value))
+        (princ (format "`%s'" value))
+      (let ((pt (point)))
+        (pp value)
+        (save-excursion
+          (goto-char pt)
+          (indent-sexp))))
+    (or (bolp) (princ "\n"))))
+
+(defun mode-local-print-bindings (table)
+  "Print bindings in TABLE."
+  (let (us ;; List of unpecified symbols
+        mc ;; List of mode local constants
+        mv ;; List of mode local variables
+        ov ;; List of overloaded functions
+        fo ;; List of final overloaded functions
+        )
+    ;; Order symbols by type
+    (mapatoms
+     #'(lambda (s)
+         (add-to-list (cond
+                       ((get s 'mode-variable-flag)
+                        (if (get s 'constant-flag) 'mc 'mv))
+                       ((get s 'override-flag)
+                        (if (get s 'constant-flag) 'fo 'ov))
+                       ('us))
+                      s))
+     table)
+    ;; Print symbols by type
+    (when us
+      (princ "\n  !! Unpecified symbols\n")
+      (mapc 'mode-local-print-binding us))
+    (when mc
+      (princ "\n  ** Mode local constants\n")
+      (mapc 'mode-local-print-binding mc))
+    (when mv
+      (princ "\n  ** Mode local variables\n")
+      (mapc 'mode-local-print-binding mv))
+    (when fo
+      (princ "\n  ** Final overloaded functions\n")
+      (mapc 'mode-local-print-binding fo))
+    (when ov
+      (princ "\n  ** Overloaded functions\n")
+      (mapc 'mode-local-print-binding ov))
+    ))
+
+(defun mode-local-describe-bindings-2 (buffer-or-mode)
+  "Display mode local bindings active in BUFFER-OR-MODE."
+  (let (table mode)
+    (princ "Mode local bindings active in ")
+    (cond
+     ((bufferp buffer-or-mode)
+      (with-current-buffer buffer-or-mode
+        (setq table mode-local-symbol-table
+              mode major-mode))
+      (princ (format "%S\n" buffer-or-mode))
+      )
+     ((symbolp buffer-or-mode)
+      (setq mode buffer-or-mode)
+      (princ (format "`%s'\n" buffer-or-mode))
+      )
+     ((signal 'wrong-type-argument
+              (list 'buffer-or-mode buffer-or-mode))))
+    (when table
+      (princ "\n- Buffer local\n")
+      (mode-local-print-bindings table))
+    (while mode
+      (setq table (get mode 'mode-local-symbol-table))
+      (when table
+        (princ (format "\n- From `%s'\n" mode))
+        (mode-local-print-bindings table))
+      (setq mode (get-mode-local-parent mode)))))
+
+(defun mode-local-describe-bindings-1 (buffer-or-mode &optional interactive-p)
+  "Display mode local bindings active in BUFFER-OR-MODE.
+Optional argument INTERACTIVE-P is non-nil if the calling command was
+invoked interactively."
+  (if (fboundp 'with-displaying-help-buffer)
+      ;; XEmacs
+      (with-displaying-help-buffer
+       #'(lambda ()
+           (with-current-buffer standard-output
+             (mode-local-describe-bindings-2 buffer-or-mode)
+             (when (fboundp 'frob-help-extents)
+               (goto-char (point-min))
+               (frob-help-extents standard-output)))))
+    ;; GNU Emacs
+    (when (fboundp 'help-setup-xref)
+      (help-setup-xref
+       (list 'mode-local-describe-bindings-1 buffer-or-mode)
+       interactive-p))
+    (with-output-to-temp-buffer (help-buffer) ; "*Help*"
+      (with-current-buffer standard-output
+        (mode-local-describe-bindings-2 buffer-or-mode)))))
+
+(defun describe-mode-local-bindings (buffer)
+  "Display mode local bindings active in BUFFER."
+  (interactive "b")
+  (when (setq buffer (get-buffer buffer))
+    (mode-local-describe-bindings-1 buffer (interactive-p))))
+
+(defun describe-mode-local-bindings-in-mode (mode)
+  "Display mode local bindings active in MODE hierarchy."
+  (interactive
+   (list (completing-read
+          "Mode: " obarray
+          #'(lambda (s) (get s 'mode-local-symbol-table))
+          t (symbol-name major-mode))))
+  (when (setq mode (intern-soft mode))
+    (mode-local-describe-bindings-1 mode (interactive-p))))
+
+;;; Font-lock support
+;;
+(defconst mode-local-font-lock-keywords
+  (eval-when-compile
+    (let* (
+           ;; Variable declarations
+           (kv (regexp-opt
+                '(
+                  "defconst-mode-local"
+                  "defvar-mode-local"
+                  ) t))
+           ;; Function declarations
+           (kf (regexp-opt
+                '(
+                  "define-mode-local-override"
+                  "define-child-mode"
+                  "define-overload"
+                  "define-overloadable-function"
+                  ;;"make-obsolete-overload"
+                  "with-mode-local"
+                  ) t))
+           ;; Regexp depths
+           (kv-depth (regexp-opt-depth kv))
+           (kf-depth (regexp-opt-depth kf))
+           )
+      `((,(concat
+           ;; Declarative things
+           "(\\(" kv "\\|" kf "\\)"
+           ;; Whitespaces & names
+           "\\>[ \t]*\\(\\sw+\\)?[ \t]*\\(\\sw+\\)?"
+           )
+         (1 font-lock-keyword-face)
+         (,(+ 1 kv-depth kf-depth 1)
+          (cond ((match-beginning 2)
+                 font-lock-type-face)
+                ((match-beginning ,(+ 1 kv-depth 1))
+                 font-lock-function-name-face)
+                )
+          nil t)
+         (,(+ 1 kv-depth kf-depth 1 1)
+          (cond ((match-beginning 2)
+                 font-lock-variable-name-face)
+                )
+          nil t)))
+      ))
+  "Highlighted keywords.")
+
+
+;;; find-func support (Emacs 21.4, or perhaps 22.1)
+;;
+(condition-case nil
+    ;; Try to get find-func so we can modify it.
+    (require 'find-func)
+  (error nil))
+
+(when (boundp 'find-function-regexp)
+  (unless (string-match "ine-overload" find-function-regexp)
+    (if (string-match "(def\\\\(" find-function-regexp)
+	(let ((end (match-end 0))
+	      )
+	  (setq find-function-regexp
+		(concat (substring find-function-regexp 0 end)
+			"ine-overload\\|ine-mode-local-override\\|"
+			"ine-child-mode\\|"
+			(substring find-function-regexp end)))))
+    )
+  ;; The regexp for variables is a little more kind.
+  )
+
+;; TODO: Add XEmacs support
+(when (fboundp 'font-lock-add-keywords)
+  (font-lock-add-keywords 'emacs-lisp-mode
+                          mode-local-font-lock-keywords))
+
+;;; edebug support
+;;
+(defun mode-local-setup-edebug-specs ()
+  "Define edebug specification for mode local macros."
+  (def-edebug-spec setq-mode-local
+    (symbolp &rest symbolp form)
+    )
+  (def-edebug-spec defvar-mode-local
+    (&define symbolp name def-form [ &optional stringp ] )
+    )
+  (def-edebug-spec defconst-mode-local
+    defvar-mode-local
+    )
+  (def-edebug-spec define-overload
+    (&define name lambda-list stringp def-body)
+    )
+  (def-edebug-spec define-overloadable-function
+    (&define name lambda-list stringp def-body)
+    )
+  (def-edebug-spec define-mode-local-override
+    (&define name symbolp lambda-list stringp def-body)
+    )
+  )
+
+(add-hook 'edebug-setup-hook 'mode-local-setup-edebug-specs)
+
+(provide 'mode-local)
+
+;;; mode-local.el ends here
diff --git a/site/cedet-1.0pre7/common/pprint.el b/site/cedet-1.0pre7/common/pprint.el
new file mode 100644
index 0000000..860d27f
--- /dev/null
+++ b/site/cedet-1.0pre7/common/pprint.el
@@ -0,0 +1,468 @@
+;;; pprint.el --- A flexible Elisp pretty-printer
+
+;; Copyright (C) 2002, 2003, 2004 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 06 Mar 2002
+;; Keywords: lisp
+;; X-RCS: $Id: pprint.el,v 1.8 2005/09/30 20:07:41 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; pprint library provides a simple and flexible pretty-printer for
+;; Elisp code.
+;;
+;; The core function `pprint-to-string' uses `prin1' to write into a
+;; temporary buffer a "flat" representation of a given expression.
+;; Then it walks over that linear form and inserts line breaks and
+;; indentations to produce a pretty-printed representation of the
+;; expression.
+;;
+;; The implementation uses a lot of inline functions to improve
+;; performance.  And, when byte-compiled, pprint is reasonably fast.
+;;
+;; pprint can handle specific expressions using adapted "printers".  A
+;; "printer" is a function that will be called to process a form that
+;; match a regular expression.  A number of "standard printers" are
+;; predefined to pretty print common Elisp statements like `defun',
+;; `defvar', `lambda', `let', `progn', `cond', `if', etc..
+;;
+;; More "printers" should be provided in future versions ;-)
+;;
+
+;;; History:
+;;
+
+;;; Code:
+
+;;;;
+;;;; Printers management
+;;;;
+
+(defvar pprint-standard-printers nil
+  "The standard printers.")
+
+(defvar pprint-printers nil
+  "The current printers.
+This is an alist which maps printers (functions) to
+matchers (regexps).")
+
+(defsubst pprint-clear-printers ()
+  "Clear the current defined printers."
+  (setq pprint-printers nil))
+
+(defun pprint-push-printer (printer matcher)
+  "Push a new PRINTER on top of defined printers.
+MATCHER is a regexp matching expressions passed to PRINTER."
+  (add-to-list 'pprint-printers (cons printer matcher)))
+(put 'pprint-push-printer 'lisp-indent-function 1)
+
+(defmacro pprint-with-printers (table &rest body)
+  "Set up a copy of the TABLE of printers and evaluate BODY.
+The current table of printers is saved, BODY is evaluated, and the
+saved table is restored, even in case of an abnormal exit.  Value is
+what BODY returns."
+  (let ((old-table (make-symbol "old-table")))
+    `(let ((,old-table pprint-printers))
+       (unwind-protect
+           (progn
+             (setq pprint-printers (copy-sequence ,table))
+             ,@body)
+         (setq pprint-printers ,old-table)))))
+(put 'pprint-with-printers 'lisp-indent-function 1)
+
+;;;;
+;;;; Core functions
+;;;;
+
+(defvar pprint-min-width 20
+  "Minimum width required to prettify an expression.
+If current width is greater than this value, the pretty printer does
+nothing.")
+
+(defvar pprint-width)
+(defvar pprint-no-break)
+
+(defmacro pprint-no-break-p (&rest motions)
+  "Return non-nil if executing MOTIONS don't break line."
+  `(save-excursion
+     (let ((p (point)))
+       ,@motions
+       (and (<= (current-column) pprint-width)
+            (= (progn (beginning-of-line) (point))
+               (progn (goto-char p) (beginning-of-line) (point)))))))
+
+(defsubst pprint-maybe-newline-and-indent ()
+  "Insert a newline, then indent.
+Does nothing if point is before a close parenthesis character or
+already at the beginning of a line."
+  (or (looking-at "\\s)")
+      (save-excursion (skip-syntax-backward "-") (bolp))
+      (newline-and-indent)))
+
+(defsubst pprint-search-printer (table)
+  "Search in TABLE for a printer to process expression at point.
+Return the first one that match expression at point or nil if not
+found."
+  (while (and table (not (looking-at (cdar table))))
+    (setq table (cdr table)))
+  (caar table))
+  
+(defsubst pprint-dispatch-printer ()
+  "Dispatch a printer to print current expression.
+Return non-nil if a printer was found."
+  (let ((printer (pprint-search-printer pprint-printers)))
+    (when printer
+      (funcall printer)
+      t)))
+
+(defsubst pprint-sexp-try (room)
+  "Try to pretty print current expression.
+Return nil if the width needed to pretty print current expression goes
+beyond specified ROOM."
+  (save-restriction
+    (narrow-to-region (point) (progn (forward-sexp) (point)))
+    (let* ((old-sexp (buffer-string))
+           (pprint-width room)
+           (nobreak t))
+      (goto-char (point-min))
+      (pprint-sexp)
+      (goto-char (point-min))
+      (end-of-line)
+      (while (and (setq nobreak (<= (current-column) room))
+                  (not (eobp)))
+        (end-of-line 2))
+      (delete-region (point-min) (point-max))
+      (insert old-sexp)
+      nobreak)))
+
+(defsubst pprint-close-list ()
+  "Built-in printer to process close parenthesis characters."
+  (up-list 1))
+
+(defsubst pprint-nil-as-list ()
+  "If next s-expression is the nil symbol print it as ().
+Return non-nil if nil has been found and printed."
+  (skip-syntax-forward "-'")
+  (when (looking-at "\\<nil\\>")
+    (delete-region (point) (save-excursion (forward-sexp) (point)))
+    (insert "()")
+    t))
+
+(defsubst pprint-list ()
+  "Built-in list printer."
+  (down-list 1)
+  (pprint-sexp t) ;; never break after an open paren
+  (let* ((room (- pprint-width (current-column)))
+         (nobreak (>= room pprint-min-width)))
+    (save-excursion
+      (while (and nobreak (not (looking-at "\\s)")))
+        (setq nobreak (pprint-sexp-try room))))
+    (or nobreak (pprint-maybe-newline-and-indent))
+    (while (not (looking-at "\\s)"))
+      (pprint-sexp nobreak)
+      (setq nobreak nil)))
+  (pprint-close-list))
+
+(defsubst pprint-sequence ()
+  "Built-in printer of a sequence of expressions.
+Insert a line break before each expression."
+  (while (not (looking-at "\\s)"))
+    (pprint-maybe-newline-and-indent)
+    (pprint-sexp)))
+
+(defun pprint-sexp (&optional pprint-no-break)
+  "Pretty print S-expression at point.
+If optional argument PPRINT-NO-BREAK is non-nil the pretty-printed
+representation will not start on a new line."
+  (if (or (> pprint-min-width pprint-width)
+          (pprint-no-break-p (forward-sexp)))
+      (forward-sexp)
+    (or pprint-no-break (pprint-maybe-newline-and-indent))
+    (let ((old-mark (copy-marker (mark-marker))))
+      (set-marker
+       (mark-marker) (save-excursion (forward-sexp) (point)))
+      (while (< (point) (marker-position (mark-marker)))
+        (skip-syntax-forward "-'")
+        (cond
+         ((pprint-no-break-p (forward-sexp))
+          (forward-sexp))
+         ((pprint-dispatch-printer))
+         ((looking-at "\\s(")
+          (pprint-list))
+         ((looking-at "\\s)")
+          (pprint-close-list))
+         (t
+          (forward-sexp)))
+        )
+      (set-marker (mark-marker) (marker-position old-mark))
+      (set-marker old-mark nil))))
+
+;;;;
+;;;; Standard printers
+;;;;
+
+(defun pprint-lambda ()
+  "Standard printer for `lambda' like forms."
+  (down-list 1)
+  (forward-sexp)
+  ;; Print empty args as () instead of nil
+  (or (pprint-nil-as-list)
+      (pprint-sexp t))
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-defun ()
+  "Standard printer for `defun' like forms."
+  (pprint-maybe-newline-and-indent)
+  (down-list 1)
+  (forward-sexp)
+  (forward-sexp)
+  ;; Print empty args as () instead of nil
+  (or (pprint-nil-as-list)
+      (pprint-sexp t))
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-defvar ()
+  "Standard printer for `defvar' like forms."
+  (pprint-maybe-newline-and-indent)
+  (down-list 1)
+  (forward-sexp)
+  (unless (looking-at "\\s)")
+    (pprint-sexp)
+    (unless (looking-at "\\s)")
+      (pprint-sexp)
+      (pprint-sequence)))
+  (pprint-close-list))
+
+(defun pprint-let ()
+  "Standard printer for `let' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (skip-syntax-forward "-'")
+  (if (looking-at "\\s(")
+      (progn
+        (down-list 1)
+        (skip-syntax-forward "-'")
+        (unless (looking-at "\\s)")
+          (pprint-sexp t)
+          (pprint-sequence))
+        (pprint-close-list))
+    ;; Print empty let binding as () instead of nil
+    (or (pprint-nil-as-list)
+        (pprint-sexp t)))
+  (pprint-maybe-newline-and-indent)
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-if ()
+  "Standard printer for `if' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (pprint-sexp t)
+  (pprint-maybe-newline-and-indent)
+  (pprint-sexp)
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-while ()
+  "Standard printer for `while' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (pprint-sexp t)
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-progn ()
+  "Standard printer for `progn' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (pprint-sequence)
+  (pprint-close-list))
+
+(defun pprint-setq ()
+  "Standard printer for `setq' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (forward-sexp) ;; 1rst VAR
+  (pprint-sexp t) ;; 1rst VAL
+  (while (not (looking-at "\\s)"))
+    (pprint-maybe-newline-and-indent)
+    (forward-sexp) ;; VAR
+    (pprint-sexp t)) ;; VAL
+  (pprint-close-list))
+
+(defun pprint-cond ()
+  "Standard printer for `cond' like forms."
+  (down-list 1)
+  (forward-sexp)
+  (while (not (looking-at "\\s)"))
+    (pprint-maybe-newline-and-indent)
+    (down-list 1)
+    (pprint-sexp t)
+    (pprint-sequence)
+    (pprint-close-list))
+  (pprint-close-list))
+
+(defun pprint-with ()
+  "Standard printer for `with-' like forms."
+  (let* ((withfun (intern-soft (match-string 1)))
+         (nobreak (or (get withfun 'lisp-indent-function) 0)))
+    (down-list 1)
+    (forward-sexp)
+    (while (> nobreak 0)
+      (pprint-sexp t)
+      (setq nobreak (1- nobreak)))
+    (pprint-sequence)
+    (pprint-close-list)))
+
+(defun pprint-setup-standard-printers ()
+  "Setup standard printers."
+  (pprint-clear-printers)
+  ;; Printers are searched in sequence from last to first pushed one.
+  ;; So it could be important to push the most generic printers first!
+  (pprint-push-printer 'pprint-with
+    (format "(%s\\>" "\\(with[-]\\(\\sw\\|\\s_\\)+\\)"
+            ))
+  (pprint-push-printer 'pprint-defun
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "defun" "defmacro" "defsubst"
+               ) t)))
+  (pprint-push-printer 'pprint-lambda
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "lambda"
+               ) t)))
+  (pprint-push-printer 'pprint-defvar
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "defvar" "defconst"
+               ) t)))
+  (pprint-push-printer 'pprint-let
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "let" "let*"
+               ) t)))
+  (pprint-push-printer 'pprint-if
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "if"
+               ) t)))
+  (pprint-push-printer 'pprint-while
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "while" "when" "unless"
+               "condition-case" "catch"
+               "dotimes"
+               ) t)))
+  (pprint-push-printer 'pprint-cond
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "cond"
+               ) t)))
+  (pprint-push-printer 'pprint-progn
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "prog1" "progn"
+               "save-excursion" "save-restriction"
+               "unwind-protect"
+               ) t)))
+  (pprint-push-printer 'pprint-setq
+    (format "(%s\\>"
+            (regexp-opt
+             '(
+               "setq"
+               ) t)))
+  (setq pprint-standard-printers pprint-printers))
+
+(pprint-setup-standard-printers)
+
+;;;;
+;;;; User's functions & commands
+;;;;
+
+;;;###autoload
+(defun pprint-to-string (object &optional width)
+  "Return a string containing the pretty-printed representation of OBJECT.
+OBJECT can be any Lisp object.  Quoting characters are used as needed
+to make output that `read' can handle, whenever this is possible.  The
+pretty printer try as much as possible to limit the length of lines to
+given WIDTH.  WIDTH value defaults to `fill-column'."
+  (with-temp-buffer
+    (lisp-mode-variables nil)
+    (set-syntax-table emacs-lisp-mode-syntax-table)
+    (let ((print-escape-newlines nil)
+          (print-quoted t))
+      (prin1 object (current-buffer)))
+    (goto-char (point-min))
+    ;; Escape "(" at beginning of line.  Can only occur in strings.
+    (when (looking-at "\\s(")
+      (down-list 1)
+      (while (re-search-forward "^\\s(" nil t)
+        (goto-char (match-beginning 0))
+        (insert "\\")))
+    (goto-char (point-min))
+    (let* ((pprint-width (or width fill-column))
+           (zmacs-regions nil) ;; XEmacs
+           (inhibit-modification-hooks t)) ;; Emacs
+      (pprint-sexp))
+    (buffer-string)))
+
+;;;###autoload
+(defun pprint (object &optional stream width)
+  "Output the pretty-printed representation of OBJECT, any Lisp object.
+Quoting characters are printed as needed to make output that `read'
+can handle, whenever this is possible.  Output stream is STREAM, or
+value of `standard-output' (which see).  The pretty printer try as
+much as possible to limit the length of lines to given WIDTH.  WIDTH
+value defaults to `fill-column'."
+  (princ (pprint-to-string object width)
+         (or stream standard-output)))
+
+;;;###autoload
+(defun pprint-function (function-name)
+  "See a pretty-printed representation of FUNCTION-NAME."
+  (interactive "aPretty print function: ")
+  (let ((code (symbol-function function-name)))
+    (if (byte-code-function-p code)
+        (error "Can't pretty-print a byte compiled function"))
+    (with-current-buffer
+        (get-buffer-create (format "*pprint-function %s*"
+                                   function-name))
+      (erase-buffer)
+      (emacs-lisp-mode)
+      (pprint code (current-buffer))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+(provide 'pprint)
+
+;;; pprint.el ends here
diff --git a/site/cedet-1.0pre7/common/pulse.el b/site/cedet-1.0pre7/common/pulse.el
new file mode 100644
index 0000000..dd37524
--- /dev/null
+++ b/site/cedet-1.0pre7/common/pulse.el
@@ -0,0 +1,409 @@
+;;; pulse.el --- Pulsing Overlays
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: pulse.el,v 1.13 2009/09/11 23:44:25 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Manage temporary pulsing of faces and overlays.
+;;
+;; This is a temporal decoration technique where something is to be
+;; highlighted briefly.  This adds a gentle pulsing style to the text
+;; decorated this way.
+;;
+;; Useful user functions:
+;;
+;; `pulse-enable-integration-advice' - Turn on advice to make various
+;;      Emacs commands pulse, such as `goto-line', or `find-tag'.
+;;
+;; The following are useful entry points:
+;;
+;; `pulse' - Cause `pulse-highlight-face' to shift toward background color.
+;;      Assumes you are using a version of Emacs that supports pulsing.
+;;
+;;
+;; `pulse-momentary-highlight-one-line' - Pulse a single line at POINT.
+;; `pulse-momentary-highlight-region' - Pulse a region.
+;; `pulse-momentary-highlight-overlay' - Pulse an overlay
+;;      These three functions will just blink the specified area if
+;;      the version of Emacs you are using doesn't support pulsing.
+;;
+;; `pulse-line-hook-function' - A simple function that can be used in a
+;;      hook that will pulse whatever line the cursor is on.
+;;
+;;; History:
+;;
+;; The original pulse code was written for semantic tag highlighting.
+;; It has been extracted, and adapted for general purpose pulsing.
+;;
+;; Pulse is a part of CEDET.  http://cedet.sf.net
+
+
+(defun  pulse-available-p ()
+  "Return non-nil if pulsing is available on the current frame."
+  (condition-case nil
+      (let ((v (color-values (face-background 'default))))
+	(numberp (car-safe v)))
+    (error nil)))
+
+(defcustom pulse-flag (pulse-available-p)
+  "*Non-nil means to pulse the overlay face for momentary highlighting.
+Pulsing involves a bright highlight that slowly shifts to the background
+color.  Non-nil just means to highlight with an unchanging color for a short
+time.
+
+If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then
+this flag is ignored."
+  :group 'pulse
+  :type 'boolean)
+
+(defface pulse-highlight-start-face
+  '((((class color) (background dark))
+     (:background "#AAAA33"))
+    (((class color) (background light))
+     (:background "#FFFFAA")))
+  "*Face used at beginning of a highight."
+  :group 'pulse)
+
+(defface pulse-highlight-face
+  '((((class color) (background dark))
+     (:background "#AAAA33"))
+    (((class color) (background light))
+     (:background "#FFFFAA")))
+  "*Face used during a pulse for display.  *DO NOT CUSTOMIZE*
+Face used for temporary highlighting of tags for effect."
+  :group 'pulse)
+
+;;; Compatibility
+;;
+(if (featurep 'xemacs)
+    (progn
+      (defalias 'pulse-overlay-live-p
+        (lambda (o)
+          (and (extent-live-p o)
+               (not (extent-detached-p o))
+               (bufferp (extent-buffer o)))))
+      (defalias 'pulse-overlay-put 'set-extent-property)
+      (defalias 'pulse-overlay-get 'extent-property)
+      (defalias 'pulse-overlay-delete 'delete-extent)
+      (defalias 'pulse-make-overlay 'make-extent)
+      )
+  ;; Regular Emacs
+  (defalias 'pulse-overlay-live-p 'overlay-buffer)
+  (defalias 'pulse-overlay-put 'overlay-put)
+  (defalias 'pulse-overlay-get 'overlay-get)
+  (defalias 'pulse-overlay-delete 'delete-overlay)
+  (defalias 'pulse-make-overlay 'make-overlay)
+  )
+
+;;; Code:
+;;
+(defun pulse-int-to-hex (int &optional nb-digits)
+  "Convert integer argument INT to a #XXXXXXXXXXXX format hex string.
+Each X in the output string is a hexadecimal digit.
+NB-DIGITS is the number of hex digits.  If INT is too large to be
+represented with NB-DIGITS, then the result is truncated from the
+left.  So, for example, INT=256 and NB-DIGITS=2 returns \"00\", since
+the hex equivalent of 256 decimal is 100, which is more than 2 digits.
+
+This function was blindly copied from hexrgb.el by Drew Adams.
+http://www.emacswiki.org/cgi-bin/wiki/hexrgb.el"
+  (setq nb-digits (or nb-digits 4))
+  (substring (format (concat "%0" (int-to-string nb-digits) "X") int) (- nb-digits)))
+
+(defun pulse-color-values-to-hex (values)
+  "Convert list of rgb color VALUES to a hex string, #XXXXXXXXXXXX.
+Each X in the string is a hexadecimal digit.
+Input VALUES is as for the output of `x-color-values'.
+
+This function was blindly copied from hexrgb.el by Drew Adams.
+http://www.emacswiki.org/cgi-bin/wiki/hexrgb.el"
+  (concat "#"
+          (pulse-int-to-hex (nth 0 values) 4) ; red
+          (pulse-int-to-hex (nth 1 values) 4) ; green
+          (pulse-int-to-hex (nth 2 values) 4))) ; blue
+
+(defcustom pulse-iterations 10
+  "Number of iterations in a pulse operation."
+  :group 'pulse
+  :type 'number)
+(defcustom pulse-delay .03
+  "Delay between face lightening iterations, as used by `sit-for'."
+  :group 'pulse
+  :type 'number)
+
+(defun pulse-lighten-highlight ()
+  "Lighten the face by 1/`pulse-iterations' toward the background color.
+Return t if there is more drift to do, nil if completed."
+  (if (>= (get 'pulse-highlight-face :iteration) pulse-iterations)
+      nil
+    (let* ((frame (color-values (face-background 'default)))
+	   (start (color-values (face-background
+				 (get 'pulse-highlight-face
+				      :startface))))
+	   (frac  (list (/ (- (nth 0 frame) (nth 0 start)) pulse-iterations)
+			(/ (- (nth 1 frame) (nth 1 start)) pulse-iterations)
+			(/ (- (nth 2 frame) (nth 2 start)) pulse-iterations)))
+	   (it (get 'pulse-highlight-face :iteration))
+	   )
+      (set-face-background 'pulse-highlight-face
+			   (pulse-color-values-to-hex
+			    (list
+			     (+ (nth 0 start) (* (nth 0 frac) it))
+			     (+ (nth 1 start) (* (nth 1 frac) it))
+			     (+ (nth 2 start) (* (nth 2 frac) it)))))
+      (put 'pulse-highlight-face :iteration (1+ it))
+      (if (>= (1+ it) pulse-iterations)
+	  nil
+	t))))
+
+(defun pulse-reset-face (&optional face)
+  "Reset the pulse highlighting FACE."
+  (set-face-background 'pulse-highlight-face
+		       (if face
+			   (face-background face)
+			 (face-background 'pulse-highlight-start-face)
+			 ))
+  (put 'pulse-highlight-face :startface (or face
+					    'pulse-highlight-start-face))
+  (put 'pulse-highlight-face :iteration 0))
+
+;;;###autoload
+(defun pulse (&optional face)
+  "Pulse the colors on our highlight face.
+If optional FACE is provide, reset the face to FACE color,
+instead of `pulse-highlight-start-face'.
+Be sure to call `pulse-reset-face' after calling pulse."
+  (unwind-protect
+      (progn
+	(pulse-reset-face face)
+	(while (and (pulse-lighten-highlight)
+		    (sit-for pulse-delay))
+	  nil))
+    ))
+
+;;;###autoload
+(defun pulse-test (&optional no-error)
+  "Test the lightening function for pulsing a line.
+When optional NO-ERROR Don't throw an error if we can't run tests."
+  (interactive)
+  (if (or (not pulse-flag) (not (pulse-available-p)))
+      (if no-error
+	  nil
+	(error (concat "Pulse test only works on versions of Emacs"
+		       " that support pulsing")))
+    ;; Run the tests
+    (when (interactive-p)
+      (message "<Press a key> Pulse one line.")
+      (read-char))
+    (pulse-momentary-highlight-one-line (point))
+    (when (interactive-p)
+      (message "<Press a key> Pulse a region.")
+      (read-char))
+    (pulse-momentary-highlight-region (point)
+				      (save-excursion
+					(condition-case nil
+					    (forward-char 30)
+					  (error nil))
+					(point)))
+    (when (interactive-p)
+      (message "<Press a key> Pulse line a specific color.")
+      (read-char))
+    (pulse-momentary-highlight-one-line (point) 'modeline)
+    (when (interactive-p)
+      (message "<Press a key> Pulse a pre-existing overlay.")
+      (read-char))
+    (let* ((start (point-at-bol))
+	   (end (save-excursion
+		  (end-of-line)
+		  (when (not (eobp))
+		    (forward-char 1))
+		  (point)))
+	   (o (pulse-make-overlay start end))
+	   )
+      (pulse-momentary-highlight-overlay o)
+      (if (pulse-overlay-live-p o)
+	  (pulse-overlay-delete o)
+	(error "Non-temporary overlay was deleted!"))
+      )
+    (when (interactive-p)
+      (message "Done!"))))
+
+
+;;; Convenience Functions
+;;
+(defvar pulse-momentary-overlay nil
+  "The current pulsing overlay.")
+
+;;;###autoload
+(defun pulse-momentary-highlight-overlay (o &optional face)
+  "Pulse the overlay O, unhighlighting before next command.
+Optional argument FACE specifies the fact to do the highlighting."
+  (pulse-overlay-put o 'original-face (pulse-overlay-get o 'face))
+  (add-to-list 'pulse-momentary-overlay o)
+  (if (or (not pulse-flag) (not (pulse-available-p)))
+      ;; Provide a face... clear on next command
+      (progn
+	(pulse-overlay-put o 'face (or face 'pulse-highlight-start-face))
+	(add-hook 'pre-command-hook
+		  'pulse-momentary-unhighlight)
+	)
+    ;; pulse it.
+    (unwind-protect
+	(progn
+	  (pulse-overlay-put o 'face 'pulse-highlight-face)
+	  ;; The pulse function puts FACE onto 'pulse-highlight-face.
+	  ;; Thus above we put our face on the overlay, but pulse
+	  ;; with a reference face needed for the color.
+	  (pulse face))
+      (pulse-momentary-unhighlight))
+    )
+  )
+
+(defun pulse-momentary-unhighlight ()
+  "Unhighlight a line recently highlighted."
+  ;; If someone passes in an overlay, then pulse-momentary-overlay
+  ;; will still be nil, and won't need modifying.
+  (when pulse-momentary-overlay
+    ;; clear the starting face
+    (mapc
+     (lambda (ol)
+       (pulse-overlay-put ol 'face (pulse-overlay-get ol 'original-face))
+       (pulse-overlay-put ol 'original-face nil)
+       ;; Clear the overlay if it needs deleting.
+       (when (pulse-overlay-get ol 'pulse-delete) (pulse-overlay-delete ol)))
+     pulse-momentary-overlay)
+
+    ;; Clear the variable.
+    (setq pulse-momentary-overlay nil))
+
+  ;; Reset the pulsing face.
+  (pulse-reset-face)
+
+  ;; Remove this hook.
+  (remove-hook 'pre-command-hook 'pulse-momentary-unhighlight)
+  )
+
+;;;###autoload
+(defun pulse-momentary-highlight-one-line (point &optional face)
+  "Highlight the line around POINT, unhighlighting before next command.
+Optional argument FACE specifies the face to do the highlighting."
+  (let ((start (point-at-bol))
+	(end (save-excursion
+	       (end-of-line)
+	       (when (not (eobp))
+		 (forward-char 1))
+	       (point))))
+    (pulse-momentary-highlight-region start end face)
+    ))
+
+;;;###autoload
+(defun pulse-momentary-highlight-region (start end &optional face)
+  "Highlight between START and END, unhighlighting before next command.
+Optional argument FACE specifies the fact to do the highlighting."
+  (let ((o (pulse-make-overlay start end)))
+    ;; Mark it for deletion
+    (pulse-overlay-put o 'pulse-delete t)
+    (pulse-momentary-highlight-overlay o face)))
+
+;;; Random integration with other tools
+;;
+(defvar pulse-command-advice-flag nil
+  "Non-nil means pulse advice is active.
+To active pulse advice, use `pulse-enable-integration-advice'.")
+
+;;;###autoload
+(defun pulse-toggle-integration-advice (arg)
+  "Toggle activation of advised functions that will now pulse.
+Wint no ARG, toggle the pulse advice.
+With a negative ARG, disable pulse advice.
+With a positive ARG, enable pulse advice.
+Currently advised functions include:
+  `goto-line'
+  `exchange-point-and-mark'
+  `find-tag'
+  `tags-search'
+  `tags-loop-continue'
+  `pop-tag-mark'
+  `imenu-default-goto-function'
+Pulsing via `pulse-line-hook-function' has also been added to
+the following hook:
+  `next-error-hook'"
+  (interactive "P")
+  (if (null arg)
+      (setq pulse-command-advice-flag (not pulse-command-advice-flag))
+    (if (< (prefix-numeric-value arg) 0)
+	(setq pulse-command-advice-flag nil)
+      (setq pulse-command-advice-flag t)
+      )
+    )
+  (if pulse-command-advice-flag
+      (message "Pulse advice enabled")
+    (message "Pulse advice disabled"))
+  )
+
+(defadvice goto-line (after pulse-advice activate)
+  "Cause the line that is `goto'd to pulse when the cursor gets there."
+  (when (and pulse-command-advice-flag (interactive-p))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice exchange-point-and-mark (after pulse-advice activate)
+  "Cause the line that is `goto'd to pulse when the cursor gets there."
+  (when (and pulse-command-advice-flag (interactive-p)
+	     (> (abs (- (point) (mark))) 400))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice find-tag (after pulse-advice activate)
+  "After going to a tag, pulse the line the cursor lands on."
+  (when (and pulse-command-advice-flag (interactive-p))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice tags-search (after pulse-advice activate)
+  "After going to a hit, pulse the line the cursor lands on."
+  (when (and pulse-command-advice-flag (interactive-p))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice tags-loop-continue (after pulse-advice activate)
+  "After going to a hit, pulse the line the cursor lands on."
+  (when (and pulse-command-advice-flag (interactive-p))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice pop-tag-mark (after pulse-advice activate)
+  "After going to a hit, pulse the line the cursor lands on."
+  (when (and pulse-command-advice-flag (interactive-p))
+    (pulse-momentary-highlight-one-line (point))))
+
+(defadvice imenu-default-goto-function (after pulse-advice activate)
+  "After going to a tag, pulse the line the cursor lands on."
+  (when pulse-command-advice-flag
+    (pulse-momentary-highlight-one-line (point))))
+
+;;;###autoload
+(defun pulse-line-hook-function ()
+  "Function used in hooks to pulse the current line.
+Only pulses the line if `pulse-command-advice-flag' is non-nil."
+  (when pulse-command-advice-flag
+    (pulse-momentary-highlight-one-line (point))))
+
+(add-hook 'next-error-hook 'pulse-line-hook-function)
+
+(provide 'pulse)
+
+;;; pulse.el ends here
diff --git a/site/cedet-1.0pre7/common/working.el b/site/cedet-1.0pre7/common/working.el
new file mode 100644
index 0000000..2eaecbd
--- /dev/null
+++ b/site/cedet-1.0pre7/common/working.el
@@ -0,0 +1,639 @@
+;;; working --- Display a "working" message in the minibuffer.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+;;               2004, 2007, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 1.5
+;; Keywords: status
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Working lets Emacs Lisp programmers easily display working messages.
+;; These messages typically come in the form of a percentile, or generic
+;; doodles if a maximum is unknown.
+;;
+;; The working entry points are quite simple.  If you have a loop that needs
+;; to display a status as it goes along, it would look like this:
+;;
+;;  (working-status-forms "Doing stuff" "done"
+;;    (while condition
+;;  	(working-status (calc-percentile))
+;;  	(my-work))
+;;    (working-status t))
+;;
+;; If you cannot calculate a percentile, use the function
+;; `working-dynamic-status' instead, and pass in what you know.  For
+;; both status printing functions, the first argument is optional,
+;; and you may pass in additional arguments as `format' elements
+;; to the first argument of `working-status-forms'.
+;;
+;; See the examples at the end of the buffer.
+
+;;; Backwards Compatibility:
+;;
+;; If you want to use working in your program, but don't want to force people
+;; to install working, use could add this at the beginning of your program for
+;; compatibility.
+;;
+;; (eval-and-compile
+;;   (condition-case nil
+;; 	 (require 'working)
+;;     (error
+;; 	(progn
+;; 	  (defmacro working-status-forms (message donestr &rest forms)
+;; 	    "Contain a block of code during which a working status is shown."
+;; 	    (list 'let (list (list 'msg message) (list 'dstr donestr)
+;; 			     '(ref1 0))
+;; 		  (cons 'progn forms)))
+;;   
+;; 	  (defun working-status (&optional percent &rest args)
+;; 	    "Called within the macro `working-status-forms', show the status."
+;; 	    (message "%s%s" (apply 'format msg args)
+;; 		     (if (eq percent t) (concat "... " dstr)
+;; 		       (format "... %3d%%"
+;; 			       (or percent
+;; 				   (floor (* 100.0 (/ (float (point))
+;; 						      (point-max)))))))))
+;;   
+;; 	  (defun working-dynamic-status (&optional number &rest args)
+;; 	    "Called within the macro `working-status-forms', show the status."
+;; 	    (message "%s%s" (apply 'format msg args)
+;; 		     (format "... %c" (aref [ ?- ?/ ?| ?\\ ] (% ref1 4))))
+;; 	    (setq ref1 (1+ ref1)))
+;;   
+;; 	  (put 'working-status-forms 'lisp-indent-function 2)))))
+;;
+;; Depending on what features you use, it is, of course, easy to
+;; reduce the total size of the above by omitting those features you
+;; do not use.
+
+;;; History:
+;; 
+;; 1.0 First Version
+;;
+;; 1.1 Working messages are no longer logged.
+;;     Added a generic animation display funciton:
+;;        Convert celeron to animator
+;;        Added a bounce display
+;;     Made working robust under a multi-frame environment (speedbar)
+;;
+;; 1.2 Fix up documentation.
+;;     Updated dotgrowth function for exceptionally large numbers of dots.
+;;     Added the percentage bubble displays.
+;;
+;; 1.3 Added `working-status-timeout' and `working-status-call-process'.
+;;     Added test fns `working-wait-for-keypress' and `working-verify-sleep'.
+;;
+;; 1.4 ???
+;;
+;; 1.5 Use features from the fame library.
+;;
+
+(require 'custom)
+(require 'fame)
+
+;;; Code:
+(defgroup working nil
+  "Working messages display."
+  :prefix "working"
+  :group 'lisp
+  )
+
+;;; User configurable variables
+;;
+(defcustom working-status-percentage-type 'working-bar-percent-display
+  "*Function used to display the percent status.
+Functions provided in `working' are:
+  `working-percent-display'
+  `working-bar-display'
+  `working-bar-percent-display'
+  `working-percent-bar-display'
+  `working-bubble-display'
+  `working-bubble-precent-display'
+  `working-celeron-percent-display'"
+  :group 'working
+  :type '(choice (const working-percent-display)
+		 (const working-bar-display)
+		 (const working-bar-percent-display)
+		 (const working-percent-bar-display)
+		 (const working-bubble-display)
+		 (const working-bubble-percent-display)
+		 (const working-celeron-percent-display)
+		 (const nil)))
+
+(defcustom working-status-dynamic-type 'working-celeron-display
+  "*Function used to display an animation indicating progress being made.
+Dynamic working types occur when the program does not know how long
+it will take ahead of time.  Functions provided in `working' are:
+  `working-number-display'
+  `working-text-display'
+  `working-spinner-display'
+  `working-dotgrowth-display'
+  `working-celeron-display'
+  `working-bounce-display'"
+  :group 'working
+  :type '(choice (const working-number-display)
+                 (const working-text-display)
+		 (const working-spinner-display)
+		 (const working-dotgrowth-display)
+		 (const working-celeron-display)
+		 (const working-bounce-display)
+		 (const nil)))
+
+(defcustom working-percentage-step 2
+  "*Percentage display step.
+A number representing how large a step must be taken when working a
+percentage display.  A number such as `2' means `2%'."
+  :group 'working'
+  :type 'number)
+
+;;; Mode line hacks
+;;
+;; When the user doesn't want messages in the minibuffer, hack the mode
+;; line of the current buffer.
+(if (featurep 'xemacs)
+    (eval-and-compile (defalias 'working-mode-line-update 'redraw-modeline))
+  (eval-and-compile (defalias 'working-mode-line-update 'force-mode-line-update)))
+
+(defvar working-mode-line-message nil
+  "Message used by working when showing status in the mode line.")
+
+(if (boundp 'global-mode-string)
+    (progn
+      ;; If this variable exists, use it to push the working message into
+      ;; an interesting part of the mode line.
+      (if (null global-mode-string)
+	  (setq global-mode-string (list "")))
+      (setq global-mode-string
+	    (append global-mode-string '(working-mode-line-message))))
+  ;; Else, use minor mode trickery to get a reliable way of doing the
+  ;; same thing across many versions of Emacs.
+  (setq minor-mode-alist (cons
+			  '(working-mode-line-message working-mode-line-message)
+			  minor-mode-alist))
+  )
+
+(defvar working-use-echo-area-p t
+  "*Non-nil use the echo area to display working messages.")
+
+;;; Variables used in stages
+;;
+(defvar working-message nil
+  "Message stored when in a status loop.")
+(defvar working-donestring nil
+  "Done string stored when in a status loop.")
+(defvar working-ref1 nil
+  "A reference number used in a status loop.")
+(defvar working-last-percent 0
+  "A reference number used in a status loop.")
+
+;;; Programmer functions
+;;
+(eval-when-compile
+  (cond
+   ((fboundp 'noninteractive)
+    ;; Silence the XEmacs byte compiler
+    (defvar noninteractive))
+   ((boundp 'noninteractive)
+    ;; Silence the Emacs byte compiler
+    (defun noninteractive nil))
+   ))
+
+(defsubst working-noninteractive ()
+  "Return non-nil if running without interactive terminal."
+  (if (boundp 'noninteractive)
+      noninteractive
+    (noninteractive)))
+
+(defun working-message-echo (&rest args)
+  "Print but don't log a one-line message at the bottom of the screen.
+See the function `message' for details on ARGS."
+  (or (working-noninteractive)
+      (apply 'fame-message-nolog args)))
+
+(defalias 'working-current-message 'fame-current-message)
+(defalias 'working-temp-message 'fame-temp-message)
+
+(defun working-message (&rest args)
+  "Display a message using `working-message-echo' or in mode line.
+See the function `message' for details on ARGS."
+  (if working-use-echo-area-p
+      (apply 'working-message-echo args)
+    (when (not working-mode-line-message)
+      ;; If we start out nil, put stuff in to show we are up to
+      (setq working-mode-line-message "Working...")
+      (working-mode-line-update)
+      (sit-for 0)
+      )))
+
+;;; Compatibility
+(cond ((fboundp 'run-with-timer)
+       (eval-and-compile (defalias 'working-run-with-timer 'run-with-timer))
+       (eval-and-compile (defalias 'working-cancel-timer 'cancel-timer))
+       )
+      ;;Add compatibility here
+      (t 
+       ;; This gets the message out but has no timers.
+       (defun working-run-with-timer (&rest foo)
+         (working-message working-message))
+       (defun working-cancel-timer (&rest foo)
+         (working-message "%s%s"
+                          working-message
+                          working-donestring)))
+      )
+
+(defmacro working-status-forms (message donestr &rest forms)
+  "Contain a block of code during which a working status is shown.
+MESSAGE is the message string to use and DONESTR is the completed text
+to use when the functions `working-status' is called from FORMS."
+  (let ((current-message (make-symbol "working-current-message")))
+    `(let ((,current-message (working-current-message))
+           (working-message ,message)
+           (working-donestring ,donestr)
+           (working-ref1 0)
+           (working-last-percent 0))
+       (unwind-protect
+           (progn ,@forms)
+         (setq working-mode-line-message nil)
+         (if working-use-echo-area-p
+             (message ,current-message)
+           (working-mode-line-update)
+           (sit-for 0))))
+    ))
+(put 'working-status-forms 'lisp-indent-function 2)
+
+(defmacro working-status-timeout (timeout message donestr &rest forms)
+  "Contain a block of code during which working status is shown.
+The code may call `sit-for' or `accept-process-output', so a timer
+is needed to update the message.
+TIMEOUT is the length of time to wait between message updates.
+MESSAGE is the message string to use and DONESTR is the completed text
+to use when the functions `working-status' is called from FORMS."
+  (let ((current-message (make-symbol "working-current-message")))
+    `(let* ((,current-message (working-current-message))
+            (working-message ,message)
+            (working-donestring ,donestr)
+            (working-ref1 0)
+            (time ,timeout)
+            (working-timer
+             (working-run-with-timer time time 'working-dynamic-status)))
+       (unwind-protect
+           (progn ,@forms)
+         (working-cancel-timer working-timer)
+         (working-dynamic-status t)
+         (setq working-mode-line-message nil)
+         (if working-use-echo-area-p
+             (message ,current-message)
+           (working-mode-line-update)
+           (sit-for 0))))
+    ))
+(put 'working-status-timeout 'lisp-indent-function 3)
+
+(defun working-status-call-process
+  (timeout message donestr program &optional infile buffer display &rest args)
+  "Display working messages while running a process.
+TIMEOUT is how fast to display the messages.
+MESSAGE is the message to show, and DONESTR is the string to add when done.
+CALLPROCESSARGS are the same style of args as passed to `call-process'.
+The are: PROGRAM, INFILE, BUFFER, DISPLAY, and ARGS.
+Since it actually calls `start-process', not all features will work."
+  (working-status-timeout timeout message donestr
+    (let ((proc (apply 'start-process "working"
+		              (if (listp buffer) (car buffer) buffer)
+			             program args)))
+      (set-process-sentinel proc 'list)
+      (while (eq (process-status proc) 'run)
+	(accept-process-output proc)
+	;; accept-process-output caused my solaris Emacs 20.3 to crash.
+	;; If this is unreliable for you, use the below which will work
+	;; in that situation.
+	;; (if (not (sit-for timeout)) (read-event))
+	))))
+
+(defun working-status (&optional percent &rest args)
+  "Called within the macro `working-status-forms', show the status.
+If PERCENT is nil, then calculate PERCENT from the value of `point' in
+the current buffer.  If it is a number or float, use it as the raw
+percentile.
+Additional ARGS are passed to fill on % elements of MESSAGE from the
+macro `working-status-forms'."
+  (when (and working-message working-status-percentage-type)
+    (let ((p (or percent
+		 (floor (* 100.0 (/ (float (point)) (point-max)))))))
+      (if (or (eq p t)
+	      (> (- p working-last-percent) working-percentage-step))
+	  (let* ((m1 (apply 'format working-message args))
+		 (m2 (funcall working-status-percentage-type (length m1) p)))
+	    (working-message "%s%s" m1 m2)
+	    (setq working-last-percent p))))))
+  
+(defun working-dynamic-status (&optional number &rest args)
+  "Called within the macro `working-status-forms', show the status.
+If NUMBER is nil, then increment a local NUMBER from 0 with each call.
+If it is a number or float, use it as the raw percentile.
+Additional ARGS are passed to fill on % elements of MESSAGE from the
+macro `working-status-forms'."
+  (when (and working-message working-status-dynamic-type)
+    (let* ((n (or number working-ref1))
+	   (m1 (apply 'format working-message args))
+	   (m2 (funcall working-status-dynamic-type (length m1) n)))
+      (working-message "%s%s" m1 m2)
+      (setq working-ref1 (1+ working-ref1)))))
+
+;;; Utilities
+;;
+(defun working-message-frame-width ()
+  "Return the width of the frame the working message will be in."
+  (let* ((mbw (cond ((fboundp 'frame-parameter)
+		     (frame-parameter (selected-frame) 'minibuffer))
+		    ((fboundp 'frame-property)
+		     (frame-property (selected-frame) 'minibuffer))))
+	 (fr (if (windowp mbw)
+		 (window-frame mbw)
+	       default-minibuffer-frame)))
+    (frame-width fr)))
+
+;;; Percentage display types.
+;;
+(defun working-percent-display (length percent)
+  "Return the percentage of the buffer that is done in a string.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (cond ((eq percent t) (concat "... " working-donestring))
+	;; All the % signs because it then gets passed to message.
+	(t (format "... %3d%%" percent))))
+
+(defun working-bar-display (length percent)
+  "Return a string with a bar-graph showing percent.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (let ((bs (- (working-message-frame-width) length 5)))
+    (cond ((eq percent t)
+	   (concat ": [" (make-string bs ?#) "] " working-donestring))
+	  ((< bs 0) "")
+	  (t (let ((bsl (floor (* (/ percent 100.0) bs))))
+	       (concat ": ["
+		       (make-string bsl ?#)
+		       (make-string (- bs bsl) ?.)
+		       "]"))))))
+
+(defun working-bar-percent-display (length percent)
+  "Return a string with a bar-graph and percentile showing percentage.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (let* ((ps (if (eq percent t)
+		 (concat "... " working-donestring)
+	       (working-percent-display length percent)))
+	 (psl (+ 2 length (length ps))))
+    (cond ((eq percent t)
+	   (concat (working-bar-display psl 100) " " ps))
+	  (t
+	   (setq working-ref1 (length ps))
+	   (concat (working-bar-display psl percent) " " ps)))))
+
+(defun working-percent-bar-display (length percent)
+  "Return a string with a percentile and bar-graph showing percentage.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (let* ((ps (if (eq percent t)
+		 (concat "... " working-donestring)
+	       (working-percent-display length percent)))
+	 (psl (+ 1 length (length ps))))
+    (cond ((eq percent t)
+	   (concat ps " " (working-bar-display psl 100)))
+	  (t
+	   (setq working-ref1 (length ps))
+	   (concat ps " " (working-bar-display psl percent))))))
+
+(defun working-bubble-display (length percent)
+  "Return a string with a bubble graph indicating the precent completed.
+LENGTH is the amount of the display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (if (eq percent t)
+      (concat " [@@@@@@@@@@@@@@@@@@@@] " working-donestring)
+    (let ((bs " [")
+	  (bubbles [ ?. ?- ?o ?O ?@ ]))
+      (if (> percent 5)
+	  (setq bs (concat bs (make-string (/ (floor percent) 5) ?@))))
+      (setq bs (concat bs
+		       (char-to-string (aref bubbles (% (floor percent) 5)))))
+      (if (< (/ (floor percent) 5) 20)
+	  (setq bs (concat bs (make-string (- 19 (/ (floor percent) 5)) ? ))))
+      (concat bs "]"))))
+
+(defun working-bubble-percent-display (length percent)
+  "Return a string with a percentile and bubble graph showing percentage.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (let* ((ps (if (eq percent t)
+		 (concat " ... " working-donestring)
+	       (working-percent-display length percent)))
+	 (psl (+ 1 length (length ps))))
+    (cond ((eq percent t)
+	   (concat (working-bubble-display psl t)))
+	  (t
+	   (setq working-ref1 (length ps))
+	   (concat (working-bubble-display psl percent) ps)))))
+
+(defun working-celeron-percent-display (length percent)
+  "Return a string with a celeron and string showing percent.
+LENGTH is the amount of display that has been used.  PERCENT
+is t to display the done string, or the percentage to display."
+  (prog1
+      (cond ((eq percent t) (working-celeron-display length t))
+	    ;; All the % signs because it then gets passed to message.
+	    (t (format "%s %3d%%"
+		       (working-celeron-display length 0)
+		       percent)))
+    (setq working-ref1 (1+ working-ref1))))
+
+;;; Dynamic display types.
+;;
+(defun working-number-display (length number)
+  "Return a string displaying the number of things that happened.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display."
+  (cond ((eq number t) (concat "... " working-donestring))
+	;; All the % signs because it then gets passed to message.
+	(t (format "... %d" number))))
+
+(defun working-text-display (length text)
+    "Return a string displaying the name of things that happened.
+LENGTH is the amount of display that has been used.  TEXT
+is t to display the done string, or the text to display."
+    (if (eq text t)
+        (concat "... " working-donestring)
+      (format "... %s" text)))
+
+(defun working-spinner-display (length number)
+  "Return a string displaying a spinner based on a number.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display."
+  (cond ((eq number t) (concat "... " working-donestring))
+	;; All the % signs because it then gets passed to message.
+	(t (format "... %c" (aref [ ?- ?/ ?| ?\\ ] (% working-ref1 4))))))
+
+(defun working-dotgrowth-display (length number)
+  "Return a string displaying growing dots due to activity.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display.
+This display happens to ignore NUMBER."
+  (let* ((width (- (working-message-frame-width) 4 length))
+	 (num-wrap (/ working-ref1 width))
+	 (num-. (% working-ref1 width))
+	 (dots [ ?. ?, ?o ?* ?O ?@ ?# ]))
+    (concat " (" (make-string num-. (aref dots (% num-wrap (length dots)))) ")"
+	    (if (eq number t) (concat " " working-donestring) ""))))
+
+(defun working-frame-animation-display (length number frames)
+  "Manage a simple frame-based animation for working functions.
+LENGTH is the number of characters left.  NUMBER is a passed in
+number (which happens to be ignored.).  While coders pass t into
+NUMBER, functions using this should convert NUMBER into a vector
+describing how to render the done message.
+Argument FRAMES are the frames used in the animation."
+  (cond ((vectorp number)
+	 (let ((zone (- (length (aref frames 0)) (length (aref number 0))
+			(length (aref number 1)))))
+	   (if (< (length working-donestring) zone)
+	       (concat " " (aref number 0)
+		       (make-string
+			(ceiling (/ (- (float zone)
+				       (length working-donestring)) 2)) ? )
+		       working-donestring
+		       (make-string
+			(floor (/ (- (float zone)
+				     (length working-donestring)) 2)) ? )
+		       (aref number 1))
+	     (concat " " (aref frames (% working-ref1 (length frames)))
+		     " " working-donestring))))
+	(t (concat " " (aref frames (% working-ref1 (length frames)))))))
+
+(defvar working-celeron-strings
+  [ "[O     ]" "[oO    ]" "[-oO   ]" "[ -oO  ]" "[  -oO ]" "[   -oO]"
+    "[    -O]" "[     O]" "[    Oo]" "[   Oo-]"  "[  Oo- ]" "[ Oo-  ]"
+    "[Oo-   ]" "[O-    ]"]
+  "Strings representing a silly celeron.")
+
+(defun working-celeron-display (length number)
+  "Return a string displaying a celeron as things happen.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display."
+  (cond ((eq number t)
+	 (working-frame-animation-display length [ "[" "]" ]
+					  working-celeron-strings))
+	;; All the % signs because it then gets passed to message.
+	(t (working-frame-animation-display length number
+					    working-celeron-strings))))
+
+(defvar working-bounce-strings
+  [
+   "[_         ]"
+   "[ -        ]"
+   "[  ~       ]"
+   "[   -      ]"
+   "[    _     ]"
+   "[     -    ]"
+   "[      ~   ]"
+   "[       -  ]"
+   "[        _ ]"
+   "[         -]"
+
+   ]
+  "Strings for the bounce animation.")
+ 
+(defun working-bounce-display (length number)
+  "Return a string displaying a celeron as things happen.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display."
+  (cond ((eq number t)
+	 (working-frame-animation-display length [ "[" "]" ]
+					  working-bounce-strings))
+	;; All the % signs because it then gets passed to message.
+	(t (working-frame-animation-display length number
+					    working-bounce-strings))))
+
+;;; Some edebug hooks
+;;
+(add-hook
+ 'edebug-setup-hook
+ (lambda ()
+   (def-edebug-spec working-status-forms (form form def-body))
+   (def-edebug-spec working-status-timeout (form form form def-body))))
+
+;;; Example function using `working'
+;;
+(defun working-verify-parenthesis-a ()
+  "Verify all the parenthesis in an elisp program buffer."
+  (interactive)
+  (working-status-forms "Scanning" "done"
+    (save-excursion
+      (goto-char (point-min))
+      (while (not (eobp))
+	;; Use default buffer position.
+	(working-status)
+	(forward-sexp 1)
+	(sleep-for 0.05)
+	)
+      (working-status t))
+    (sit-for 1)))
+ 
+(defun working-verify-parenthesis-b ()
+  "Verify all the parenthesis in an elisp program buffer."
+  (interactive)
+  (working-status-forms "Scanning" "done"
+    (save-excursion
+      (goto-char (point-min))
+      (while (not (eobp))
+	;; Use default buffer position.
+	(working-dynamic-status nil)
+	(forward-sexp 1)
+	(sleep-for 0.05)
+	)
+      (working-dynamic-status t))
+    (sit-for 0)))
+
+(defun working-wait-for-keypress ()
+  "Display funny graphics while waiting for a keypress."
+  (interactive)
+  (working-status-timeout .1 "Working Test: Press a key" "done"
+    (while (sit-for 10)))
+  (when (input-pending-p)
+    (if (fboundp 'read-event)
+	(read-event)
+      (read-char)))
+  )
+
+(defun working-verify-sleep ()
+  "Display funny graphics while waiting for sleep to sleep."
+  (interactive)
+  (working-status-call-process .1 "Zzzzz" "Snort" "sleep" nil nil nil "2"))
+
+(defun working-verify-mode-line ()
+  "Display graphics in the mode-line for timeout."
+  (interactive)
+  (let ((working-use-echo-area-p nil))
+    (message "Pres a Key")
+    (working-status-timeout .1 "" ""
+      (while (sit-for 10)))
+    ))
+
+(provide 'working)
+
+;;; working.el ends here
diff --git a/site/cedet-1.0pre7/contrib/ChangeLog b/site/cedet-1.0pre7/contrib/ChangeLog
new file mode 100644
index 0000000..fe953b7
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/ChangeLog
@@ -0,0 +1,520 @@
+2010-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eassist.el: Patch from Kiwon Um
+	(eassist-switch-h-cpp): If destination file is in a different frame,
+	then switch frames.
+
+2010-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eassist.el: Patch from Kiwon Um:
+	(eassist-switch-h-cpp): If switching to a file that is already in a
+	window, just switch to that window.
+
+2010-01-09  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el:
+	* ede-step-target:makefile attribute unitialized, to set it during
+	  (ede-step-project::project-rescan).
+	* inserted commented subsitution for `makefile-macro-file-list', but
+	  don't work. Let it commented and still using
+	  `makefile-macro-file-list'.
+	* Try to use `ede-object-project' variable, but don't work. Still
+	  to use absolute :path in targets to get parent project.
+
+2009-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Fix generation issue.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (ELISPPRELOAD): New
+	(init,lisp): Use above.
+
+	* Project.ede (init,lisp): Use preload compiler, and preloads.
+
+2009-10-08  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el: Added several function for parsing using
+	`semantic--find-tag-by-function'.
+	Removed :makefile from `ede-step-project'.
+
+2009-09-22  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el: A lot of restyling.
+	Return to use only one class.
+	Introduce a :project-mode for scanner or writer.
+	Provide 3 variants autoload, via :load-type or :initializers.
+	heavily changed: project-rescan and loading funcs.
+
+2009-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-gnustep.el (ede-step-project):
+	Remove stray . in project-mode which broke compilation.
+
+	* semantic-tag-folding.el (cl): Change how it is required.
+
+	* Makefile (lisp_LISP): ectag scala support.
+
+	* Project.ede ("lisp"): ectag scala support.
+
+2009-08-05  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el:  * Begin a restyling.
+	   A new approch for scanning GNUmakefile to write ProjStep.ede or
+	   scanning ProjStep.ede to write GNUmakefile, based on :project-mode
+	   attribute of project.
+	 * TODO FIX many Bugs.
+
+2009-07-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ectag-scala.el: Scala support contributed by Raymond Racine
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede, cedet-contrib.el (cedet-contrib-version):
+	Update version.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSFLAGS): New variable
+	(init,setup,lisp): Use above.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (contrib): Updated to 1.0pre6.
+
+	* Makefile (VERSION): Updated to 1.0pre6.
+
+	* cedet-contrib.el (cedet-contrib-version): Updated to 1.0pre6.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-php.el (wisent-php-default-setup):
+	Remove traces of old 'document' tool.
+
+2009-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-gnustep.el (ede-step-project): Fix doc
+
+2008-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-gnustep.el (ede-step-load): Save the directory on load.
+
+2008-10-21  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el: Added header files support.
+
+2008-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (wy_SEMANTIC_GRAMMAR, wy_SEMANTIC_GRAMMAR_EL, lisp_LISP):
+	Remove
+	javascript support.
+
+	* Project.ede ("wy", "lisp"): Remove javascript support.
+
+	* semanticdb-javascript.el: Move to semantic.
+
+	* wisent-javascript-jv.wy, wisent-javascript.el:
+	Moving to semantic/wisent directory.
+
+2008-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el: Moving to a different project.
+
+2008-08-28  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el:
+	removed (require 'ede-pmake) from `ede-proj-setup-buidenvironment'
+
+2008-08-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (lisp_LISP): Add ede-gnustep.el
+
+	* Project.ede ("lisp"): Add ede-gnustep.el
+
+	* ede-gnustep.el (require ede):
+	Unquote.  Move require of ede-proj here.
+
+2008-08-04  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* ede-gnustep.el: Initial import.
+	create a basic GNUmakefile to work with GNUstep-Make.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-php.el (copyright): Fix FSF name.
+
+2008-06-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-php.wy:
+	Replaced all occurances of php-tag to just php in comments.
+	(wisent-php-lexer): Renamed.
+
+2008-06-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (wy_SEMANTIC_GRAMMAR): Add wisent-php.wy
+	(wy_SEMANTIC_GRAMMAR_EL): Add wisent-php-wy.el
+	(lisp_LISP): Add wisent-php.el
+
+	* Project.ede ("wy"): Add wisent-php.wy
+	("lisp"): Add wisent-php.el
+
+	* wisent-php.el, wisent-php.wy: PHP parser support.
+
+2008-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el: Replace contents with notify.
+
+2008-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el (semantic-matlab-match-function-re):
+	Update to handle a non-bracketed
+	output variable.
+
+2008-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el (semantic-matlab-match-function-re): Fix.
+	(semantic-matlab-function-tags): Wrap error prone fcns in condition-case
+	Add omit-nulls arg to split-string.
+	(semantic-matlab-parse-region): Make sure the parse functions
+	doesn't throw an error.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Added ede to load path.
+	(VERSION): Udated to 1.0pre5
+
+	* Project.ede ("Contrib"): Updated to 1.0pre5
+
+	* cedet-contrib.el (cedet-contrib-version): Updated to 1.0pre5
+
+2008-02-23  Anton V. Belyaev <kpoxman@users.sourceforge.net>
+
+	* eassist.el:
+
+	EAssist: set line to current function initially
+
+2008-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el (semantic-matlab-match-function-re):
+	Fix expression to handle space
+	between fcn name and optional arg list.
+
+2007-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-ruby.el (semantic-lex-ruby-hashes): Fix space finding regexps.
+	(semantic-lex-ruby-assigned-vars): New var to fix byte-compiler
+	(wisent-ruby-expand-tags): Fix quote-in of .
+
+2007-08-29  Anton V. Belyaev <kpoxman@users.sourceforge.net>
+
+	* eassist.el: Header-body switch improvement
+
+	* INSTALL, eassist.el: Some fixes in EAssist documentation
+
+2007-08-26  Dan Debertin <airboss@users.sourceforge.net>
+
+	* Makefile: Added wisent-ruby.el/wy.
+
+	* Project.ede: Added wisent-ruby.el/wy
+
+	* wisent-ruby.wy, wisent-ruby.el: Initial import.
+
+2007-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (lisp_LISP): Added eassist.
+
+	* Project.ede ("Contrib"): Add eassist.
+
+	* eassist.el: Fixed spelling in commentary.
+	(eassist-buffer, eassist-names-column, eassist-methods, eassist-actual-methods)
+	(eassist-search-string, eassist-overlays): Added to silence warnings.
+
+	* eassist.el:
+	EAssist, as emailed to me by Anton Belyaev on June 23, 2007.
+
+	* INSTALL: Add eassist install instructions.
+
+2007-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Regress version to prerelease 4.
+
+	* Project.ede ("Contrib"): Regress version to prerelease 4.
+
+	* cedet-contrib.el (cedet-contrib-version):
+	Regress back to prerelease 4
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Stripped out dups
+	(wy_SEMANTIC_GRAMMAR_EL, dist): Spelling fix
+
+2007-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (lisp_LISP): Add semanticdb-javascript.el
+
+	* Project.ede ("lisp"): Add semanticdb-javascript.el
+
+	* wisent-csharp.el (semantic-format): Fix byte-comp warnings
+
+2007-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-javascript.el: Added better commentary.
+
+	* semantidb-javascript.el: File name typo.
+
+	* semanticdb-javascript.el, semantidb-javascript.el:
+	Semanticdb Javascript support.
+
+2006-07-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-csharp.el (wisent-csharp-lex-ignore-region,wisent-csharp-lex-ignore-endregion):
+	Analyze begin/end region
+	(wisent-csharp-lexer): Use new lexers
+
+2006-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (:version): updated (removed means 1.0)
+
+	* Makefile (VERSION): updated
+
+	* cedet-contrib.el (cedet-contrib-version): Updated
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent-javascript-jv.wy, wisent-javascript.el, wisent-csharp.wy, wisent-csharp.el, semantic-tag-folding.el, semantic-matlab.el, cedet-contrib-load.el, cedet-contrib.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-contrib.el (cedet-contrib-version): Updated.
+
+	* Project.ede (:version): Updated.
+
+	* Makefile (VERSION): Updated.
+
+	* semantic-tag-folding.el:
+	toplevel: Ran checkdoc, cleaned out errant white space.
+	(semantic-tag-folding-get-fold-state): Doc fix.
+
+2005-05-11  Suraj Acharya <sacharya@gmail.com>
+
+	* semantic-tag-folding.el (semantic-tag-folding-mode-setup):
+	set line-move-ignore-invisible to t
+	in xemacs so that the cursor does not go into hidden text. This is the
+	default in Gnu Emacs.
+	(semantic-tag-folding-get-fold-state)
+	(semantic-tag-folding-set-fold-state)
+	(semantic-tag-folding-get-attribute-overlay,
+	(semantic-tag-folding-get-folding-attribute): new functions to get and
+	set the fold state along with some helper functions. The fold state
+	now goes into an overlay at the start of the tag so that full reparse
+	does not lose the fold state.
+	(semantic-tag-folding-create-folding-overlays)
+	(semantic-tag-folding-set-overlay-visibility): use the new fold state
+	get/set functions instead of having the code inline. Also some better
+	comments.
+
+2005-05-08  Suraj Acharya <sacharya@gmail.com>
+
+	* semantic-tag-folding.el:
+	(semantic-tag-folding-create-folding-overlays,semantic-tag-folding-get-overlay)
+	(semantic-tag-folding-highlight-overlay): use the compatability layer
+	in semantic-fw instead of calling the Gnu Emacs overlay-* functions.
+	(semantic-tag-folding-mode-setup,semantic-tag-folding-highlight-default):
+	removed errors when these functions are run under Xemacs.
+	(semantic-tag-folding-highlight-default): check if we reach the
+	beginning of the buffer while moving backwards over comments to
+	determine the extent of comment blocks. Gnu Emacs doesn't require this
+	check because (forward-comment -1) returns nil when point is at the
+	beginning of the buffer.
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("Contrib"): Updated version number.
+
+	* Makefile (VERSION): Update version
+	(autoloads, init, setup, lisp): Quotes around EMACS.
+
+	* INSTALL: Remove matlab, it doesn't work yet.
+
+	* cedet-contrib.el (cedet-contrib-version): Update version.
+
+2005-05-05  Suraj Acharya <sacharya@gmail.com>
+
+	* semantic-tag-folding.el (global-semantic-tag-folding-mode):
+	throw an error if
+	define-fringe-bitmap is not present
+	(semantic-tag-folding-mode-setup): throw different errors for the
+	cases when the current buffer is not parsable by semantic and when
+	define-fringe-bitmap is not present.
+
+	* semantic-tag-folding.el (semantic-tag-folding-set-fringe-image-style):
+	XEmacs doesn't
+	recognize #B..... as a binary number, so I changed it to #b.... which
+	both Gnu Emacs and XEmacs can read.
+
+2005-04-29  Suraj Acharya <sacharya@gmail.com>
+
+	* semantic-tag-folding.el:
+	Use functionp instead of symbolp to distinguish between the cases
+	where semantic-tag-folding-function is a t or nil rather than a function
+	name. The values t and nil are used in semantic-tag-fold-all and
+	semantic-tag-show-all respectively.
+	Minor edit in function semantic-tag-folding-fold-or-show-tags to put
+	the when and lexical-let  on separate lines.
+
+	* semantic-tag-folding.el:
+	The default value of semantic-tag-folding-allow-folding-of says that
+	everything is to be considered for folding and but nothing is folded
+	by default.
+	Allow `block tags to folded.
+	Fixed a fold state determining bug in
+	semantic-tag-folding-create-folding-overlays where
+	semantic-tag-folding-allow-folding-of was mostly ignored.
+	Wrap a (when (semantic-tag-buffer tag) ...) around the body of
+	semantic-tag-folding-highlight-default. This was throwing an error
+	when the revert-file command was run.
+	Removed the compilation warning in function
+	semantic-tag-folding-set-fringe-image-style by not refering directly
+	to variable semantic-tag-folding-fringe-image-style.
+
+2005-04-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (lisp_LISP): Removed semantic-matlab.el
+
+	* Project.ede: Removed semantic-matlab.el - it is too buggy.
+
+2005-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-contrib.el (cedet-contrib-version): Update Version.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (lisp_LISP): Added semantic-tag-folding.el
+	(VERSION): Updated.
+
+	* Project.ede ("Contrib"): Update Name and version number.
+
+	* INSTALL:
+	Provides specific install instructions for all files in contrib.
+
+2005-04-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el (semantic-matlab-match-function-re): Simplified
+	(semantic-matlab-function-tags): Tidy up to use above.
+
+	* semantic-tag-folding.el (semantic-tag-folding-fringe-image-style):
+	Moved (again).
+	(semantic-tag-folding-allow-folding-of)
+	(semantic-tag-folding-set-fringe-image-style)
+	(semantic-tag-folding-function-default)
+	(semantic-tag-folding-p-default)
+	(semantic-tag-folding-highlight-default)
+	(semantic-tag-folding-create-folding-overlays): Reindented some lines.
+
+	* semantic-tag-folding.el (global-semantic-tag-folding-mode):
+	Add autoload cookie.
+
+	* semantic-tag-folding.el (global-semantic-tag-folding-mode):
+	Swapped location of var/fcn.
+	(semantic-tag-folding-decoration-mode-hook-enabled): Moved
+	(semantic-decoration-mode-hook): Moved
+	(semantic-tag-folding-fringe-image-style): Moved
+
+	* Project.ede: Added semantic-tag-folding.el
+
+	* semantic-tag-folding.el: New minor mode by Suraj Acharya.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-contrib.el (cedet-contrib-version): Updated version number
+
+	* Makefile (VERSION): Updated version number
+
+	* Project.ede (Contrib): Update version number.
+
+2005-01-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-matlab.el (matlab): Make matlab.el optional.
+
+	* Makefile: Updated from project file (v 1.7)
+
+	* Project.ede: Added semantic-matlab.el, and javascript support.
+
+	* wisent-javascript-jv.wy:
+	Javascript parsing.  Large portions translated by Joakim Verona.
+
+	* wisent-javascript.el:
+	Support parsing of Javascript with wisent-javascript-jv.wy
+
+	* semantic-matlab.el:
+	Simple parser for handling MATLAB M code files with new nested functions.
+
+2004-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (misc_AUX): New
+	(dist): Add misc_AUX
+
+	* Project.ede ("misc"): New target.
+
+2004-05-25  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated to start Emacs with --no-site-file.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Distribute the autoload file
+
+2004-03-30  David Ponce  <david@dponce.com>
+
+	* Makefile: Rebuild.
+
+	* Project.ede ("Contrib"): Set :metasubproject to true.
+
+2004-03-28  David Ponce  <david@dponce.com>
+
+	* Makefile: Rebuild.
+
+	* Project.ede (ede-proj-project): Add :version.
+	(init, setup): New targets.
+	(lisp): Move cedet-contrib.el to setup target.  Add dependency on
+	inversion and speedbar.
+	(Wisent_Languages): Rename target to "wy".
+
+	* wisent-csharp.el (wisent-csharp-default-setup): Add autoload cookie.
+
+	* cedet-contrib.el (cedet-contrib-version): New variable.
+	(load): Move into cedet-contrib-load.el.
+
+	* cedet-contrib-load.el: New file.
+
+2004-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-contrib.el: Bootstrapping for the contrib directory.
+
+	* Makefile: Regenerated from project file.
+
+	* Project.ede: Add needed bits to make this compile.
+
+2004-03-25  David Ponce  <david@dponce.com>
+
+	* wisent-csharp.el (semantic-wisent): Require instead of wisent-bovine.
+
+2003-12-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Contrib directory Makefile
+
+	* Project.ede: Removed space from a target name.
+
+	* Project.ede: Project for contributed files.
+
+	* wisent-csharp.el: CSharp Wisent support code.
+
+	* wisent-csharp.wy: CSharp Wisent definition.
+
diff --git a/site/cedet-1.0pre7/contrib/Makefile b/site/cedet-1.0pre7/contrib/Makefile
new file mode 100644
index 0000000..322069e
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/Makefile
@@ -0,0 +1,103 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+misc_AUX=ChangeLog
+wy_SEMANTIC_GRAMMAR=wisent-csharp.wy wisent-ruby.wy wisent-php.wy
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../common/  ../ede/ ../semantic/ ../eieio/\
+    ../semantic/bovine/ ../speedbar/ ../semantic/wisent/
+LOADDEFS=contrib-loaddefs.el
+LOADDIRS=.
+init_LISP=cedet-contrib-load.el
+ELISPPRELOAD= cedet-compat
+setup_LISP=cedet-contrib.el
+wy_SEMANTIC_GRAMMAR_EL=wisent-csharp-wy.el wisent-ruby-wy.el wisent-php-wy.el
+lisp_LISP=wisent-csharp.el semantic-tag-folding.el eassist.el wisent-ruby.el wisent-php.el ede-gnustep.el semantic-ectag-scala.el
+VERSION=1.0pre7
+DISTDIR=$(top)Contrib-$(VERSION)
+
+
+
+all: autoloads init setup wy lisp
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: setup
+setup: $(setup_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: wy
+wy: $(wy_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: lisp
+lisp: $(lisp_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist: autoloads $(wy_SEMANTIC_GRAMMAR_EL)
+	mkdir $(DISTDIR)
+	cp $(misc_AUX) contrib-loaddefs.el $(init_LISP) $(setup_LISP) $(wy_SEMANTIC_GRAMMAR) $(wy_SEMANTIC_GRAMMAR_EL) $(lisp_LISP) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/contrib/Project.ede b/site/cedet-1.0pre7/contrib/Project.ede
new file mode 100644
index 0000000..d37d3df
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/Project.ede
@@ -0,0 +1,45 @@
+;; Object Contrib
+;; EDE project file.
+(ede-proj-project "Contrib"
+  :name "Contrib"
+  :version "1.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-aux "misc"
+    :name "misc"
+    :path ""
+    :source '("ChangeLog")
+    )
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "contrib-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("cedet-contrib-load.el")
+    :compiler 'ede-emacs-preload-compiler
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-elisp "setup"
+    :name "setup"
+    :path ""
+    :source '("cedet-contrib.el")
+    :versionsource '("cedet-contrib.el")
+    )
+   (semantic-ede-proj-target-grammar "wy"
+    :name "wy"
+    :path ""
+    :source '("wisent-csharp.wy" "wisent-ruby.wy" "wisent-php.wy")
+    )
+   (ede-proj-target-elisp "lisp"
+    :name "lisp"
+    :path ""
+    :source '("wisent-csharp.el" "semantic-tag-folding.el" "eassist.el" "wisent-ruby.el" "wisent-php.el" "ede-gnustep.el" "semantic-ectag-scala.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("semantic-grammar" "wisent" "inversion" "speedbar" "semantic-el")
+    )
+   )
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/contrib/cedet-contrib-load.el b/site/cedet-1.0pre7/contrib/cedet-contrib-load.el
new file mode 100644
index 0000000..473957d
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/cedet-contrib-load.el
@@ -0,0 +1,37 @@
+;;; cedet-contrib-load.el --- Autoload definitions for cedet contrib
+
+;;; Copyright (C) 2004 Eric Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: cedet-contrib-load.el,v 1.2 2005/09/30 20:15:51 zappo Exp $
+
+;; CEDET is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize CEDET's contributed libraries for all supported
+;; conditions.
+
+;;; Code:
+;;
+
+;;; Contrib autoloads
+;;
+(load "contrib-loaddefs" nil t)
+
+(provide 'cedet-contrib-load)
+
+;;; cedet-contrib-load.el ends here
diff --git a/site/cedet-1.0pre7/contrib/cedet-contrib.el b/site/cedet-1.0pre7/contrib/cedet-contrib.el
new file mode 100644
index 0000000..2ce9ca0
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/cedet-contrib.el
@@ -0,0 +1,35 @@
+;;; cedet-contrib.el --- Setup CEDET's contrib environment
+
+;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Eric Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: cedet-contrib.el,v 1.12 2009/03/19 00:42:59 zappo Exp $
+
+(defvar cedet-contrib-version "1.0pre7"
+  "Current version of contributed libraries.")
+
+;; CEDET is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Setup environment of CEDET's contributed libraries.
+
+;;; Code:
+;;
+
+(provide 'cedet-contrib)
+
+;;; cedet-contrib.el ends here
diff --git a/site/cedet-1.0pre7/contrib/contrib-loaddefs.el b/site/cedet-1.0pre7/contrib/contrib-loaddefs.el
new file mode 100644
index 0000000..46bb211
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/contrib-loaddefs.el
@@ -0,0 +1,116 @@
+;;; contrib-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (eassist-list-methods eassist-switch-h-cpp) "eassist"
+;;;;;;  "eassist.el" (19326 59186))
+;;; Generated autoloads from eassist.el
+
+(defvar eassist-header-switches '(("h" "cpp" "cc" "c") ("hpp" "cpp" "cc") ("cpp" "h" "hpp") ("c" "h") ("C" "H") ("H" "C" "CPP" "CC") ("cc" "h" "hpp")) "\
+This variable defines possible switches for `eassist-switch-h-cpp' function.
+Its format is list of (from . (to1 to2 to3...)) elements.  From and toN are
+strings which are extentions of the files.")
+
+(autoload 'eassist-switch-h-cpp "eassist" "\
+Switch header and body file according to `eassist-header-switches' var.
+The current buffer's file name extention is searched in
+`eassist-header-switches' variable to find out extention for file's counterpart,
+for example *.hpp <--> *.cpp.
+
+\(fn)" t nil)
+
+(autoload 'eassist-list-methods "eassist" "\
+Show method/function list of current buffer in a newly created buffer.
+This function is recommended to be bound to some convinient hotkey.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "ede-gnustep" "ede-gnustep.el" (19326 59186))
+;;; Generated autoloads from ede-gnustep.el
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "edegnustep" :name "GNUstep-Make" :file 'ede-gnustep :proj-file "ProjStep.ede" :load-type 'ede-step-load :class-sym 'ede-step-project) t)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "gnustep-root" :name "GNUstep-make Top Most" :file 'ede-gnustep :proj-file "RootProjStep.ede" :initializers '(:project-mode scanner) :load-type 'ede-gnustep-load :class-sym 'ede-step-project) t)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "gnustep" :name "GNUstep-Make in scanner mode" :file 'ede-gnustep :proj-file "ProjStep.ede" :initializers '(:project-mode scanner) :load-type 'ede-gnustep-load :class-sym 'ede-step-project) t)
+
+(add-to-list 'auto-mode-alist '("\\(Root\\)?ProjStep\\.ede" . emacs-lisp-mode))
+
+;;;***
+
+;;;### (autoloads (semantic-tag-folding-mode global-semantic-tag-folding-mode
+;;;;;;  global-semantic-tag-folding-mode) "semantic-tag-folding"
+;;;;;;  "semantic-tag-folding.el" (19070 8986))
+;;; Generated autoloads from semantic-tag-folding.el
+
+(defvar global-semantic-tag-folding-mode nil "\
+*If non-nil enable global use of variable `semantic-tag-folding-mode'.
+With this mode enabled, a new folding decoration mode is added.
+Clicking on a + or - in the fringe will fold that tag.")
+
+(custom-autoload 'global-semantic-tag-folding-mode "semantic-tag-folding" nil)
+
+(autoload 'global-semantic-tag-folding-mode "semantic-tag-folding" "\
+Toggle global use of option `semantic-tag-folding-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'semantic-tag-folding-mode "semantic-tag-folding" "\
+Minor mode mark semantic tags for folding.
+This mode will display +/- icons in the fringe.  Clicking on them
+will fold the current tag.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (wisent-csharp-default-setup) "wisent-csharp" "wisent-csharp.el"
+;;;;;;  (17880 37474))
+;;; Generated autoloads from wisent-csharp.el
+
+(autoload 'wisent-csharp-default-setup "wisent-csharp" "\
+Not documented
+
+\(fn)" nil nil)
+
+(add-hook 'csharp-mode-hook #'wisent-csharp-default-setup)
+
+;;;***
+
+;;;### (autoloads (wisent-php-default-setup) "wisent-php" "wisent-php.el"
+;;;;;;  (18810 37948))
+;;; Generated autoloads from wisent-php.el
+
+(autoload 'wisent-php-default-setup "wisent-php" "\
+Hook run to setup Semantic in `php-mode'.
+Use the alternate LALR(1) parser.
+
+\(fn)" nil nil)
+
+(add-hook 'php-mode-hook #'wisent-php-default-setup)
+
+;;;***
+
+;;;### (autoloads nil nil ("cedet-contrib-load.el" "cedet-contrib.el"
+;;;;;;  "semantic-ectag-scala.el" "wisent-csharp-wy.el" "wisent-php-wy.el"
+;;;;;;  "wisent-ruby-wy.el" "wisent-ruby.el") (19335 11026 97488))
+
+;;;***
+
+(provide 'contrib-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; contrib-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/contrib/eassist.el b/site/cedet-1.0pre7/contrib/eassist.el
new file mode 100644
index 0000000..6132f77
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/eassist.el
@@ -0,0 +1,388 @@
+;;; eassist.el --- EmacsAssist, C/C++/Java/Python/ELisp method/function navigator.
+
+;; Copyright (C) 2006, 2007, 2010 Anton V. Belyaev
+;; Author: Anton V. Belyaev <anton.belyaev at the gmail.com>
+
+;; This file is *NOT* part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+;; MA 02111-1307 USA
+
+;; Version: 0.9
+;; CEDET CVS Version: $Id: eassist.el,v 1.7 2010/02/08 23:29:59 zappo Exp $
+
+;; Compatibility: Emacs 22 or 23, CEDET 1.0pre4
+
+;;; Commentary:
+
+;; Contains some useful functions features for C/C++ developers similar to
+;; those from VisualAssist.  Remember that convenient M-o, M-g and M-m?
+
+;; 1) Method navigation.
+;;    When eassist-list-methods called when c/c++ body file buffer is active
+;;    a new buffer is shown, containing list of methods and functions in the
+;;    format: return type, class, method name.  You can select the method
+;;    moving to its line and press ENTER to jump to the method.  You also can
+;;    type a string in the buffer and method list will be reduced to those
+;;    which contain the string as a substring.  Nice highlight is implemented.
+;;    This function is recommended to be bound to M-m in c-mode.
+
+;; 2) Header <-> Body file switch.
+;;    You can easily switch between body (c, cpp, cc...) and its corresponding
+;;    header file (h, hpp...) using eassist-switch-h-cpp.  The counterpart file
+;;    is first searched in opened buffers and if there is no match the file is
+;;    searched in the same directory.  You can adjust body to header correspondence
+;;    customizing eassist-header-switches variable.
+;;    This function is recommended to be bound to M-o in c-mode.
+
+;; EmacsAssist uses Semantic (http://cedet.sourceforge.net/semantic.shtml)
+;; EmacsAssist is a part of CEDET project (current CVS version of CEDET contains
+;; EmacsAssist)
+;; EmacsAssist works with current (22) and development (23) versions of Emacs and
+;; does not work with version 21.
+;; EmacsAssist works with CEDET 1.0pre4 and subsequent CVS versions of CEDET.
+
+;; EmacsAssist has a page at Emacs Wiki, where you can always find the latest
+;; version: http://www.emacswiki.org/cgi-bin/wiki/EAssist
+
+;; Usage:
+
+;; 1) Install CEDET package for Emacs (if you don't have CEDET already).
+;; 2) Add convenient keymaps for fast EmacsAssist calls in c-mode and (or) python-mode
+;;    and for lisp:
+;;
+;;    (defun my-c-mode-common-hook ()
+;;      (define-key c-mode-base-map (kbd "M-o") 'eassist-switch-h-cpp)
+;;      (define-key c-mode-base-map (kbd "M-m") 'eassist-list-methods))
+;;    (add-hook 'c-mode-common-hook 'my-c-mode-common-hook)
+;;
+;;    (defun my-python-mode-hook ()
+;;      (define-key python-mode-map (kbd "M-m") 'eassist-list-methods))
+;;    (add-hook 'python-mode-hook 'my-python-mode-hook)
+;;
+;;    (define-key lisp-mode-shared-map (kbd "M-m") 'eassist-list-methods)
+;;
+;; 3) Open any C++ file with class definition, press M-m.  Try to type
+;;    any method name.
+;; 4) Open any .cpp file.  Press M-o.  If there is .h or .hpp file in the
+;;    same folder, it will be opened.
+
+;;; Changelog:
+
+;; 27 mar 2006 -- v0.1 Initial version created.
+;; 29 mar 2006 -- v0.2 Code is more readable now.
+;;                     Thanks to Thien-Thi Nguyen for code review!
+;; 17 apr 2006 -- v0.3 Added Java and Python support. Coloring based on faces.
+;;                     Multiple string matching.
+;; 12 sep 2006 -- v0.4 Fixed ELisp code handling. Reduced string matching to function name only.
+;; 23 feb 2007 -- v0.5 Added (require 'semantic) to fix possible issues.
+;;                     Thanks to Damien Deville for the patch.
+;; 13 mar 2007 -- v0.6 Added documentation to functions.
+;;                     Thanks to Eric Ludlam for CHECKDOC tool suggestion.
+;; 23 jun 2007 -- v0.7 EAssist is now a part of CEDET project.
+;;                     Added autoload cookies for some vars and funs.
+;; 29 aug 2007 -- v0.8 "M-o" function now tries first to use already opened buffers
+;;                     and if there are no counterparts, tries to search them in the
+;;                     current directory.
+;;                     Thanks to Alekseenko Dimitry for great feature suggestion.
+;; 23 feb 2008 -- v0.9 "M-m" buffer comes up with current function highlighted.
+;;                     Thanks to Christoph Conrad for great suggestions and patches.
+
+;;; Code:
+
+(require 'semantic)
+
+;; ================================== My STRING utils ========================
+(defun eassist-string-without-last (string n)
+  "This function truncates from the STRING last N characters."
+  (substring string 0 (max 0(- (length string) n))))
+
+(defun eassist-string-ends-with (string end)
+  "Check whether STRING ends with END substring."
+  (string= end (substring string (- (length end)))))
+;; ================================== My STRING utils end ====================
+
+;; ================================== CPP-H switch ===========================
+;;;###autoload
+(defvar eassist-header-switches '(("h" . ("cpp" "cc" "c"))
+				  ("hpp" . ("cpp" "cc"))
+				  ("cpp" . ("h" "hpp"))
+				  ("c" . ("h"))
+				  ("C" . ("H"))
+				  ("H" . ("C" "CPP" "CC"))
+				  ("cc" . ("h" "hpp")))
+  "This variable defines possible switches for `eassist-switch-h-cpp' function.
+Its format is list of (from . (to1 to2 to3...)) elements.  From and toN are
+strings which are extentions of the files.")
+
+;;;###autoload
+(defun eassist-switch-h-cpp ()
+  "Switch header and body file according to `eassist-header-switches' var.
+The current buffer's file name extention is searched in
+`eassist-header-switches' variable to find out extention for file's counterpart,
+for example *.hpp <--> *.cpp."
+  (interactive)
+  (let* ((ext (file-name-extension (buffer-file-name)))
+         (base-name (eassist-string-without-last (buffer-name) (length ext)))
+         (base-path (eassist-string-without-last (buffer-file-name) (length ext)))
+         (count-ext (cdr (find-if (lambda (i) (string= (car i) ext)) eassist-header-switches))))
+    (cond
+     (count-ext
+      (unless
+          (or
+           (loop for b in (mapcar (lambda (i) (concat base-name i)) count-ext)
+		 when (bufferp (get-buffer b)) return
+ 		 (if (get-buffer-window b)
+ 		     (switch-to-buffer-other-window b)
+ 		   (if (get-buffer-window b t)
+ 		       (switch-to-buffer-other-frame b)
+ 		     (switch-to-buffer b))))
+           (loop for c in (mapcar (lambda (count-ext) (concat base-path count-ext)) count-ext)
+                 when (file-exists-p c) return (find-file c)))
+        (message "There is no corresponding pair (header or body) file.")))
+     (t
+      (message "It is not a header or body file! See eassist-header-switches variable.")))))
+;; ================================== CPP-H switch end =========================
+
+;; ================================== Method navigator =========================
+(defvar eassist-current-tag nil
+  "Current Semantic tag in source buffer.")
+(defvar eassist-buffer nil
+  "Buffer used to selecting tags in EAssist.")
+(defvar eassist-names-column nil
+  "Column used when selecting tags in EAssist.")
+(defvar eassist-methods nil
+  "Collection of methods used when searching for current selection.")
+(defvar eassist-actual-methods nil
+  "Collection of actual methods used when searching for current selection.")
+(defvar eassist-search-string nil
+  "The current search string during a search.")
+(defvar eassist-overlays nil
+  "List of active overlays.")
+
+(defun eassist-function-tags ()
+  "Return all function tags from the current buffer using Semantic API.
+The function first gets all toplevel function tags from the current buffer.
+Then it searches for all toplevel type tags and gets all function tags that
+are children to toplevel type tags.  Secondlevel function (member) tags are
+annotated (without side effect) with :parent attribute to have the same
+structure as toplevel function tags."
+  (nconc
+   ;; for C++/C
+   (semantic-find-tags-by-class 'function (semantic-something-to-tag-table eassist-buffer))
+   ;; for Java and Python: getting classes and then methods for each class.
+   ;; Adding parent property for each method, beacause semantic does not provide parents for
+   ;; methods which are inside body of the class. This is true for Java class methods,
+   ;; for C++ header definitions and for Python class methods.
+   (mapcan
+    (lambda (type)
+      (mapcar
+       (lambda (tag) (semantic-tag-put-attribute-no-side-effect tag :parent (semantic-tag-name type)))
+       (semantic-find-tags-by-class 'function (semantic-tag-type-members type))))
+    (semantic-find-tags-by-class 'type (semantic-something-to-tag-table eassist-buffer)))))
+
+(defun eassist-car-if-list (thing)
+  "Return car of THING if it is a list or THING itself, if not."
+  (cond ((listp thing) (car thing))
+	(t thing)))
+
+(defun eassist-function-string-triplet (f)
+  "Return a list of three strings, representing type, parent and name of tag F."
+  (list
+   (eassist-car-if-list (semantic-tag-type f))
+   (semantic-tag-function-parent f)
+   (semantic-tag-name f)))
+
+(defun eassist-format-triplets (f)
+  "Return a list of formatted (whitespaces, faces, delimeters) methods/function.
+F - list of triplets of tag type, parent and name."
+  (let ((return-width (reduce 'max (mapcar 'length (mapcar 'car f)) :initial-value 0))
+        (class-width (reduce 'max (mapcar 'length (mapcar 'cadr f)) :initial-value 0))
+        (name-width (reduce 'max (mapcar 'length (mapcar 'caddr f)) :initial-value 0)))
+    (setq eassist-names-column (+ return-width class-width 4))
+    (mapcar
+     (lambda (tri)
+       (let ((retrn (car tri))
+             (class (cadr tri))
+             (name (caddr tri)))
+         (setq retrn (if retrn (propertize retrn 'face 'font-lock-type-face) ""))
+         (if class
+             (setq class (propertize class 'face 'font-lock-type-face)))
+         (setq name (propertize name 'face 'font-lock-function-name-face))
+         (cond
+          (class (format (format "%%%ds  %%%ds :: %%s\n" return-width class-width) retrn class name))
+          (t     (format (format "%%%ds  %%%ds    %%s\n" return-width class-width) retrn ""    name)))))
+     f)))
+
+;;;###autoload
+(defun eassist-list-methods ()
+  "Show method/function list of current buffer in a newly created buffer.
+This function is recommended to be bound to some convinient hotkey."
+  (interactive)
+  (setq eassist-buffer (current-buffer))
+  (setq eassist-current-tag (semantic-current-tag))
+  (switch-to-buffer (get-buffer-create (concat (buffer-name (current-buffer)) " method list")) t)
+  (eassist-mode))
+
+(defun eassist-jump-to-method ()
+  "Jump to a method/function, corresponding the current line in method buffer.
+When called standing on a line of method/function list, it closes the list
+buffer and sets the point to a method/function, corresponding the line."
+  (interactive)
+  (let ((method-record (nth (1- (line-number-at-pos)) eassist-actual-methods)))
+    (cond
+     (method-record
+      (kill-buffer (current-buffer))
+      (switch-to-buffer eassist-buffer t)
+      (goto-char (eassist-method-position method-record))
+      (recenter))
+     (t (message "The line does not contain method description!")))))
+
+(defun eassist-matches-all (string substrings)
+  "Return non-nil if STRING contain each of SUBSTRINGS as a substring."
+  (reduce (lambda (prev part) (and prev (string-match part string))) substrings :initial-value t))
+
+(defun eassist-search-string-updated ()
+  "Update method/function list according to search string."
+  (message eassist-search-string)
+  (setq eassist-actual-methods
+	(remove-if-not
+	 (lambda (elt) (eassist-matches-all (eassist-method-name elt) (split-string eassist-search-string)))
+	 eassist-methods))
+  (erase-buffer)
+  (dolist (i eassist-overlays)
+    (delete-overlay i))
+  (setq eassist-overlays nil)
+  (loop for i in (mapcar 'eassist-method-full-line eassist-actual-methods)
+        with pos = 1
+        with strings = (split-string eassist-search-string)
+        do
+        (insert i)
+        (dolist (j strings)
+          (let ((p (string-match j i eassist-names-column)))
+             (when p
+               (push (make-overlay (+ pos p) (+ pos p (length j))) eassist-overlays)
+               (overlay-put (car eassist-overlays) 'face '(background-color . "yellow")))))
+        (setq pos (+ pos (length i))))
+  (goto-line (/ (count-lines (point-min) (point-max)) 2)))
+
+(defun eassist-key-pressed (key)
+  "Called when KEY is pressed."
+  (setq eassist-search-string (concat eassist-search-string (char-to-string key)))
+  (eassist-search-string-updated))
+
+(defun eassist-backspace-pressed ()
+  "Called when Backspace is pressed."
+  (interactive)
+  (setq eassist-search-string (eassist-string-without-last eassist-search-string 1))
+  (eassist-search-string-updated))
+
+(defun eassist-make-key-function (key)
+  "Return a function for KEY."
+   `(lambda () (interactive) (eassist-key-pressed ,key)))
+
+(defun eassist-key-itself (map key)
+  "Maps in the MAP KEY to its function."
+  (define-key map (char-to-string key) (eassist-make-key-function key)))
+
+(defun eassist-escape ()
+  "Kill method list buffer."
+  (interactive)
+  (kill-buffer (current-buffer))
+  (switch-to-buffer eassist-buffer))
+
+(defvar eassist-mode-map
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (do ((k (string-to-char "a") (+ 1 k))) ((> k (string-to-char "z")))
+      (define-key
+    	map
+    	(read-kbd-macro (char-to-string k))
+    	(eassist-make-key-function k)))
+    (do ((k (string-to-char "A") (+ 1 k))) ((> k (string-to-char "Z")))
+      (define-key
+    	map
+    	(read-kbd-macro (char-to-string k))
+    	(eassist-make-key-function k)))
+    (do ((k (string-to-char "0") (+ 1 k))) ((> k (string-to-char "9")))
+      (define-key
+    	map
+    	(read-kbd-macro (char-to-string k))
+    	(eassist-make-key-function k)))
+    (dolist (k (string-to-list "=><&!"))
+      (define-key
+    	map
+    	(read-kbd-macro (char-to-string k))
+    	(eassist-make-key-function k)))
+
+    (eassist-key-itself map (string-to-char " "))
+    (eassist-key-itself map (string-to-char "_"))
+
+    (define-key map (kbd "<RET>") 'eassist-jump-to-method)
+    (define-key map (kbd "<backspace>") 'eassist-backspace-pressed)
+    (define-key map (kbd "<ESC>") 'eassist-escape)
+    map)
+  "Keymap for `eassist-mode'.")
+
+(defstruct eassist-method
+  (full-line)
+  (name)
+  (position)
+  (tag))
+
+(defun eassist-mode-init ()
+  "Initialize method/function list mode."
+  (make-local-variable 'eassist-search-string)   ;; current method search string
+  (make-local-variable 'eassist-methods)         ;; list of eassist-method structures
+  (make-local-variable 'eassist-actual-methods)  ;; subset of eassist-methods that contain eassist-search string in the name string
+  (make-local-variable 'eassist-names-column)    ;; this is the column where method name fields starts
+  (make-local-variable 'eassist-overlays)        ;; overlays used to highligh search string matches in method names
+  (setq eassist-overlays nil)
+  (setq eassist-search-string "")
+
+  (setq eassist-methods
+        (let* ((method-tags (eassist-function-tags))
+               (method-triplets (mapcar 'eassist-function-string-triplet method-tags)))
+          (mapcar* '(lambda (full-line name position tag)
+                      (make-eassist-method :full-line full-line :name name :position position :tag tag))
+                   (eassist-format-triplets method-triplets)
+                   (mapcar 'caddr method-triplets)
+                   (mapcar 'semantic-tag-start method-tags)
+                   method-tags)))
+  (eassist-search-string-updated)
+
+  ;; Set current line corresponding to the current function/method if any
+  (let ((line (position-if 
+               (lambda (item) (eq eassist-current-tag (eassist-method-tag item)))
+               eassist-methods)))
+    (when line
+      (goto-line (1+ line))))
+
+  ;;(setq b1 (current-buffer))
+  ;;(setq ov1 (make-overlay 1 30 b1))
+  ;;(overlay-put ov1 'face '(background-color . "yellow"))
+  (hl-line-mode))
+
+(define-derived-mode eassist-mode nil "Eassist methods"
+  "EmacsAssist method selection mode.
+   \\{eassist-mode-map}
+   Turning on Text mode runs the normal hook `eassist-mode-hook'."
+  (eassist-mode-init))
+
+;; ================================== Method navigator end ======================
+
+(provide 'eassist)
+
+;;; eassist.el ends here
diff --git a/site/cedet-1.0pre7/contrib/ede-gnustep.el b/site/cedet-1.0pre7/contrib/ede-gnustep.el
new file mode 100644
index 0000000..f7e80fe
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/ede-gnustep.el
@@ -0,0 +1,1298 @@
+;;; ede-gnustep.el --- EDE GNUstep Project file driver
+
+;;;  Copyright (C) 2008,2009  Marco Bardelli
+
+;; Author: Marco (Bj) Bardelli <bardelli.marco@gmail.com>
+;; Keywords: project, make, gnustep, gnustep-make
+;; RCS: $Id: ede-gnustep.el,v 1.11 2010/01/09 23:05:05 safanaj Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; GNUstep-Make is a system (a set of makefiles) to compile various object.
+;; To write a functional GNUmakefile, we haven't to write any rule,
+;; but only set some variables.
+
+;; #A tipical GNUmakefile to work with GNUstep-Make:
+
+;; ifeq ($(GNUSTEP_MAKEFILES),)
+;;   GNUSTEP_MAKEFILES := $(shell gnustep-config \
+;;                        --variable=GNUSTEP_MAKEFILES 2> /dev/null)
+;; endif
+;; INSTALLATION_DOMAIN = LOCAL
+;; include $(GNUSTEP_MAKEFILES)/common.make
+;; TOOL_NAME = xxx
+;; APP_NAME = aaa
+;; LIBRARY_NAME = lll
+
+;; xxx_C_FILES = xxx.c
+;; aaa_OBJC_FILES = aaa.m
+;; lll_C_FILES = lll.c
+;; lll_OBJC_FILES = lll.m
+
+;; ...
+
+;; -include GNUmakefile.preamble
+;; include $(GNUSTEP_MAKEFILES)/tool.make
+;; include $(GNUSTEP_MAKEFILES)/application.make
+;; include $(GNUSTEP_MAKEFILES)/library.make
+;; -include GNUmakefile.postamble
+
+;; # end of Makefile
+;; in this example we define three targets (xxx,aaa,lll) of several types.
+;; various variables and rules should be added in preamble and postamble
+;; respectively, for convention.
+;;
+;; I focused on the method `ede-proj-makefile-create' to write a working
+;; GNUmakefile.
+
+;; Provide a class `ede-step-project' child of ede-project, it has a 
+;; :project-mode attribute for 'scanner or 'writer mode.
+;; difference is in direction of generation
+;;     scanner: parse *makefile* to write *project file*
+;;     writer : parse *project file* to write *makefile*
+
+;; To show what's TODO
+;; M-x occur <RET> XXX\|todo\|TODO\|fix\|FIX <RET>
+
+
+(eval-and-compile 
+  (require 'ede)
+  (require 'ede-proj)
+  (require 'makefile-edit)
+  ;; to easy parsing of GNUmakefiles
+  (require 'semantic)
+  (require 'semantic-find)
+  (require 'semantic-tag-file)
+  )
+
+(unless (fboundp 'string-file-contents)
+  (defun string-file-contents (file)
+    "Get the plain contents of FILE."
+    (with-temp-buffer 
+      (insert-file-contents file)
+      (buffer-substring-no-properties (point-min)(point-max))))
+  )
+
+
+
+;;; Class Definitions:
+;; Source
+
+(defvar ede-source-gnustep-objc
+  (ede-sourcecode "ede-gnustep-source-objc"
+		  :name "GNUsetp ObjC"
+		  :sourcepattern "\\.m$"
+		  :auxsourcepattern "\\.h$"
+		  :garbagepattern '("*.o" "obj/*"))
+  "Objective-C source code definition (for using with GNUstep-make).")
+
+(defvar ede-source-header-gnustep-objc
+  (ede-sourcecode "ede-gnustep-source-header-objc"
+		  :name "GNUsetp Header ObjC"
+		  :sourcepattern "\\.h$"
+;;		  :auxsourcepattern "\\.h$"
+		  :garbagepattern nil)
+  "Objective-C source code definition (for using with GNUstep-make).")
+
+(defvar ede-source-gnustep-c
+  (ede-sourcecode "ede-gnustep-source-c"
+		  :name "GNUsetp C"
+		  :sourcepattern "\\.c$"
+		  :auxsourcepattern "\\.h$"
+		  :garbagepattern '("*.o" "obj/*"))
+  "C source code definition (for using with GNUstep-make).")
+
+(defvar ede-source-header-gnustep-c
+  (ede-sourcecode "ede-gnustep-source-header-c"
+		  :name "GNUsetp Header C"
+		  :sourcepattern "\\.h$"
+;;		  :auxsourcepattern "\\.h$"
+		  :garbagepattern nil)
+  "C source code definition (for using with GNUstep-make).")
+
+;; XXX @todo sources for C++ and Objective-C++
+
+(defvar ede-source-gnustep-texi
+  (ede-sourcecode "ede-gnustep-source-texi"
+		  :name "GNUsetp Texinfo"
+		  :sourcepattern "\\.texi$"
+;		  :auxsourcepattern "\\.h$"
+		  :garbagepattern '("*.pdf" "*.info" "*.html"))
+  "Texinfo source definition (for using with GNUstep-make).")
+
+
+;; Target
+;(defclass ede-step-target (ede-proj-target) ;; may be don't need
+(defclass ede-step-target (ede-target)
+  ((makefile :initarg :makefile ;;:initform "GNUmakefile"
+	     :type string
+	     :custom string
+	     :label "Parent Makefile"
+	     :group make
+	     :documentation "File name of generated Makefile.")
+   (type :initarg :type
+	 :initform ctool
+	 :type symbol
+	 :custom (choice (const ctool)(const tool)
+			 (const library)(const clibrary)
+			 (const application)(const documentation)
+			 (const framework)(const bundle)
+			 (const subproject))
+	 :label "Target Type"
+	 :group make
+	 :documentation "Type of GNUstep-Make target.")
+   (include-dirs :initarg :include-dirs
+		 :initform nil
+		 :type list
+		 :custom (choice (const :tag "None" nil)
+				 (repeat
+				  (string :tag "Include dirs cpp flags")))
+		 :label "Include Dirs -I flags"
+		 :group make
+		 :documentation "Include directories like cpp flags -I.
+Include some dir via the -I preprocessor flag, for this target.")
+   (auxsource :initarg :auxsource
+	      :initform nil
+	      :type list
+	      :custom (repeat (string :tag "File"))
+	      :label "Auxiliary Source Files"
+	      :group (default source)
+	      :documentation "Auxilliary source files included in this target.
+Each of these is considered equivalent to a source file, but it is not
+distributed, and each should have a corresponding rule to build it.")
+   (dirty :initform nil
+	  :type boolean
+	  :documentation "Non-nil when generated files needs updating.")
+   )
+"Abstract class for ede-step targets.")
+
+(defclass ede-step-target-ctool (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-c
+			  ede-source-header-gnustep-c))
+   (type :initform 'ctool)
+   (cflags :initarg :cflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Compiler Flags")))
+   (ldflags :initarg :ldflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Linker Flags"))))
+  "Class for CTool targets.")
+
+(defclass ede-step-target-tool (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-objc
+			  ede-source-gnustep-c
+			  ede-source-header-gnustep-c
+			  ede-source-header-gnustep-objc))
+   (type :initform 'tool)
+   (cflags :initarg :cflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Compiler Flags")))
+   (ldflags :initarg :ldflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Linker Flags"))))
+  "Class for Tool targets.")
+
+;; FIX XXX :  _LIBS_DEPEND
+(defclass ede-step-target-clibrary (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-c
+			  ede-source-header-gnustep-c))
+   (type :initform 'clibrary)
+;;;    (header-install-dir :initarg :header-install-dir
+;;; 		       :initform ""
+;;; 		       :type string
+;;; 		       :group make
+;;; 		       :custom string
+;;; 		       :label "Header Installation Directory")
+   (cflags :initarg :cflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Compiler Flags")))
+   (ldflags :initarg :ldflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Linker Flags"))))
+  "Class for CLib targets.")
+
+(defclass ede-step-target-library (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-objc
+			  ede-source-gnustep-c
+			  ede-source-header-gnustep-objc
+			  ede-source-header-gnustep-c))
+   (type :initform 'library)
+;;;    (header-install-dir :initarg :header-install-dir
+;;; 		       :initform ""
+;;; 		       :type string
+;;; 		       :group make
+;;; 		       :custom string
+;;; 		       :label "Header Installation Directory")
+   (cflags :initarg :cflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Compiler Flags")))
+   (ldflags :initarg :ldflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Linker Flags"))))
+  "Class for Lib targets.")
+
+(defclass ede-step-target-application (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-objc
+			  ede-source-gnustep-c
+			  ede-source-header-gnustep-objc
+			  ede-source-header-gnustep-c))
+   (type :initform 'application)
+   (cflags :initarg :cflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Compiler Flags")))
+   (ldflags :initarg :ldflags
+	   :initform nil
+	   :type list
+	   :group make
+	   :custom (repeat (string :tag "Linker Flags"))))
+  "Class for App targets.")
+
+(defclass ede-step-target-documentation (ede-step-target)
+  ((sourcetype :initform (ede-source-gnustep-texi))
+   (type :initform 'documentation))
+  "Class for Doc targets.")
+
+;; ;; (defclass ede-step-target-subproject (ede-step-target)
+;; ;;   ()
+;; ;;   "Class for Subproject targets.")
+;; (defclass ede-step-target-aggregate (ede-target)
+;;   () ;; this allow the parent to track subprojects in targets.
+;;   "Dummy class for aggregate target, really a subprojet.")
+;; (defmethod project-rescan ((this ede-step-target-aggregate) &optional unused)
+;;   "A dummy method. Do nothing." nil)
+
+;;; XXX FIX: add files.make for inclusion (aka tool.make)
+(defvar ede-step-target-alist
+  '(("ctool" ede-step-target-ctool "CTOOL_NAME")
+    ("objc" ede-step-target-tool "OBJC_PROGRAM_NAME")
+    ("tool" ede-step-target-tool "TOOL_NAME")
+    ("test-tool" ede-step-target-tool "TEST_TOOL_NAME")
+    ("app" ede-step-target-application "APP_NAME")
+    ("test-app" ede-step-target-application "TEST_APP_NAME")
+    ("doc" ede-step-target-documentation "DOCUMENT_NAME")
+    ("clib" ede-step-target-clibrary "CLIBRARY_NAME")
+    ("lib" ede-step-target-library "LIBRARY_NAME")
+    ("framework" ede-step-target-library "FRAMEWORK_NAME")
+    ("subproject" ede-step-project "SUBPROJECTS")
+    )
+  "Alist of names to class target-types available by GNUstep-Make.")
+
+(defun ede-step-register-target (name class &optional macro)
+  "Register a new target class with NAME and class symbol CLASS.
+This enables the creation of your target type."
+  (let ((a (assoc name ede-step-target-alist)))
+    (if a
+	(setcdr a (list class macro))
+      (setq ede-step-target-alist
+	    (cons (cons name class) ede-step-target-alist)))))
+
+;(defcustom ede-gnustep-project-mode-default 'scanner)
+
+(defclass ede-step-project (ede-project)
+;(defclass ede-step-project (ede-proj-project) ;; to mix several project types, but don't solve ...
+  ((project-mode :initarg :project-mode :initform writer
+		 :type symbol
+		 :custom (choice (const :tag "Scanner Mode" scanner)
+				 (const :tag "Writer Mode" writer))
+		 :group (settings)
+		 :documentation "In scanner mode, `ede-proj-makefile-create'
+is useless, the project-rescan methods change their behavoir to scan
+GNUmakefiles, and possibly a ProjStep.ede could be created. In writer mode,
+the behavoir is the same that in any ede-proj-project, scan ProjStep.ede to
+write Makefiles")
+
+   (init-variables
+    :initarg :init-variables
+    :initform nil
+    :type list
+    :custom (repeat (cons (string :tag "Name X")
+			  (string :tag "Value")))
+    :group (make settings)
+    :documentation "Variables to set in this Makefile, at top of file.")
+
+   (additional-variables
+    :initarg :additional-variables
+    :initform nil
+    :type (or null list)
+    :custom (repeat
+	     (cons (choice (const :tag "None" nil)
+			   (string :tag "GNU Makefile preamble"))
+		   (repeat (cons (string :tag "Name")
+				 (string :tag "Value")))))
+    :label "Additional variables"
+    :group make
+    :documentation
+    "Arbitrary variables needed from this project.
+It is safe to leave this blank.")
+   (additional-rules
+    :initarg :additional-rules
+    :initform nil
+    :type (or null list)
+    :custom (repeat
+	     (cons (choice (const :tag "None" nil)
+			   (string :tag "GNU Makefile postamble"))
+		   (repeat (object :objecttype ede-makefile-rule))))
+    :label "Additional Rules"
+    :group make
+    :documentation
+    "Arbitrary rules and dependencies needed to make this target.
+It is safe to leave this blank.")
+
+   (menu :initform
+	 (
+	  [ "Regenerate Makefiles" ede-proj-regenerate t ]
+	  [ "Upload Distribution" ede-upload-distribution t ]
+	  )
+	 )
+
+   (installation-domain :initarg :installation-domain
+		       :initform user
+		       :type symbol
+		       :custom (choice (const user)
+				       (const local)
+				       ;(const network)
+				       (const system))
+		       :group (default make settings)
+		       :documentation "Installation domain specification.
+The variable GNUSTEP_INSTALLATION_DOMAIN is set at this value.")
+   (preamble :initarg :preamble
+	     :initform '("GNUmakefile.preamble")
+	     :type (or null list)
+	     :custom (repeat (string :tag "Makefile"))
+	     :group make
+	     :documentation "The auxilliary makefile for additional variables.
+Included just before the specific target files.")
+   (included-makefiles :initarg :included-makefiles
+		       :type (or null list)
+		       :custom (repeat (string :tag "Makefile"))
+		       :group make
+		       :documentation "The auxilliary makefile for targets rules.
+Included common and specific target files.")
+   (postamble :initarg :postamble
+	     :initform '("GNUmakefile.postamble")
+	     :type (or null list)
+	     :custom (repeat (string :tag "Makefile"))
+	     :group make
+	     :documentation "The auxilliary makefile for additional rules.
+Included just after the specific target files.")
+
+   (metasubproject
+    :initarg :metasubproject
+    :initform nil
+    :type boolean
+    :custom boolean
+    :group (default settings)
+    :documentation
+    "Non-nil if this is a metasubproject.
+Usually, a subproject is determined by a parent project.  If multiple top level
+projects are grouped into a large project not maintained by EDE, then you need
+to set this to non-nil.  The only effect is that the `dist' rule will then avoid
+making a tar file.")
+   )
+  "The EDE-STEP project definition class.")
+
+;;; Code:
+(defun ede-gnustep-load (proj &optional rootproj)
+  "Load project from the topmost GNUmakefile in PROJ directory."
+  (let* ((mf (ede-gnustep-get-valid-makefile
+	      (expand-file-name proj rootproj)))
+	 (dir (directory-file-name
+	       (or (file-name-directory (or mf "")) "")))
+	 pkgname pkgversion proj-obj prj-file)
+
+    ;; check for the file project root.
+    ;; this allow to touch a RootProjStep.ede and `M-x ede'
+    ;; to load a root gnustep package.
+    (if (file-exists-p (expand-file-name "RootProjStep.ede" dir))
+	(setq prj-file "RootProjStep.ede")
+      (setq prj-file "ProjStep.ede"))
+    (and mf
+	 ;; To FIX, maybe VCS_MODULE ???
+	 (setq pkgname
+	       (or
+		(with-temp-buffer
+		  (insert-file-contents mf)
+		  (goto-char (point-min))
+		  (car (makefile-macro-file-list "PACKAGE_NAME"))
+		  ;; (ede-gnustep-semantic-value-for-tag
+		  ;;  (car (semantic-find-tags-by-name
+		  ;; 	 "PACKAGE_NAME"
+		  ;; 	 (semantic-find-tags-by-class
+		  ;; 	  'variable (current-buffer)))))
+		  )
+		(file-name-nondirectory
+		 (directory-file-name dir))))
+	 (setq pkgversion
+	       (or
+		(with-temp-buffer
+		  (insert-file-contents mf)
+		  (goto-char (point-min))
+		  (or
+		   (car (makefile-macro-file-list "PACKAGE_VERSION"))
+		   ;; (ede-gnustep-semantic-value-for-tag
+		   ;;  (car (semantic-find-tags-by-name
+		   ;; 	  "PACKAGE_VERSION"
+		   ;; 	  (semantic-find-tags-by-class
+		   ;; 	   'variable (current-buffer)))))
+		   (car (makefile-macro-file-list "VERSION"))))
+		   ;; (ede-gnustep-semantic-value-for-tag
+		   ;;  (car (semantic-find-tags-by-name
+		   ;; 	  "VERSION"
+		   ;; 	  (semantic-find-tags-by-class
+		   ;; 	   'variable (current-buffer)))))))
+		"1.0"))
+	 
+	 ;; use dirinode to check for existence
+	 (unless (setq proj-obj
+		       (object-assoc (ede--inode-for-dir dir)
+				     'dirinode ede-projects))
+	   (setq proj-obj
+		 (ede-step-project pkgname :name pkgname
+				   :version pkgversion
+				   :project-mode 'scanner
+				   :directory (file-name-as-directory dir)
+				   :file (expand-file-name prj-file dir)
+;				   :makefile (file-name-nondirectory mf)
+				   ;; bind :targets
+				   :targets nil))
+	   (oset proj-obj :project-mode 'scanner)))
+    (when (ede-step-project-p proj-obj)
+      (project-rescan proj-obj)
+      (ede-step-save proj-obj))
+    proj-obj))
+  
+;(defalias 'ede-proj-load 'ede-step-load)
+(defun ede-step-load (project &optional rootproj)
+  "Load a project file from PROJECT directory.
+If optional ROOTPROJ is provided then ROOTPROJ is the root project
+for the tree being read in.  If ROOTPROJ is nil, then assume that
+the PROJECT being read in is the root project."
+  (save-excursion
+    (let ((ret nil)
+	  (prj-file (car (directory-files project nil "\\(Root\\)?ProjStep.ede" nil)))
+	  (subdirs (directory-files project nil "[^.].*" nil)))
+      (set-buffer (get-buffer-create " *tmp proj read*"))
+      (unwind-protect
+	  (progn
+	    (insert-file-contents (expand-file-name prj-file project)
+				  nil nil nil t)
+	    (goto-char (point-min))
+	    (setq ret (read (current-buffer)))
+	    (if (not (eq (car ret) 'ede-step-project))
+		(error "Corrupt project file"))
+	    (setq ret (eval ret))
+	    (oset ret file (concat project "ProjStep.ede"))
+	    (oset ret directory project)
+	    (oset ret rootproject rootproj)
+	    )
+	(kill-buffer " *tmp proj read*"))
+      (while subdirs
+	(let ((sd (file-name-as-directory
+		   (expand-file-name (car subdirs) project))))
+	  (if (and (file-directory-p sd)
+		   (ede-directory-project-p sd))
+	      (oset ret subproj
+		    (cons (ede-step-load sd (or rootproj ret))
+			  (oref ret subproj))))
+	  (setq subdirs (cdr subdirs))))
+      (if (eq 'scanner (oref ret :project-mode)) (project-rescan ret))
+      ret)))
+
+(defun ede-step-save (&optional project)
+  "Write out object PROJECT into its file."
+  (save-excursion
+    (if (not project) (setq project (ede-current-project)))
+    (let ((b (set-buffer (get-buffer-create " *tmp proj write*")))
+	  (cfn (oref project file)))
+      (unwind-protect
+	  (save-excursion
+	    (erase-buffer)
+	    (let ((standard-output (current-buffer)))
+	      (oset project file (file-name-nondirectory cfn))
+	      (object-write project ";; EDE project file."))
+	    (write-file cfn nil)
+	    )
+	;; Restore the :file on exit.
+	(oset project file cfn)
+	(kill-buffer b)))))
+
+(defmethod ede-commit-local-variables ((proj ede-step-project))
+  "Commit change to local variables in PROJ."
+  (ede-step-save proj))
+
+(defmethod eieio-done-customizing ((proj ede-step-project))
+  "Call this when a user finishes customizing this object.
+Argument PROJ is the project to save."
+  (call-next-method)
+  (ede-step-save proj))
+
+(defmethod eieio-done-customizing ((target ede-step-target))
+  "Call this when a user finishes customizing this object.
+Argument TARGET is the project we are completing customization on."
+  (call-next-method)
+  (ede-step-save (ede-current-project)))
+
+(defmethod ede-commit-project ((proj ede-step-project))
+  "Commit any change to PROJ to its file."
+  (ede-step-save proj))
+
+(defmethod ede-buffer-mine ((this ede-step-project) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (let ((f (ede-convert-path this (buffer-file-name buffer))))
+    (or (string= (file-name-nondirectory (oref this file)) f)
+	(string= (ede-proj-dist-makefile this) f)
+	(string-match "GNUmakefile\\(\\.in\\|\\.preamble\\|\\.postamble\\)?" f)
+	(string-match "Makefile\\(\\.\\(preamble\\|postamble\\)\\)?" f)
+	)))
+
+(defmethod ede-buffer-mine ((this ede-step-target) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (or (call-next-method)
+      (ede-target-buffer-in-sourcelist this buffer (oref this auxsource))))
+
+
+;;; Makefile Creation
+;; XXX @TODO to use better gnustep-make, using standard variables an standard rule {before,internal,after}-*::
+(defmethod ede-proj-makefile-create ((this ede-step-project) mfilename)
+  "Create a GNUmakefile for all Makefile targets in THIS.
+MFILENAME is the makefile to generate."
+  (when (eq 'writer (oref this :project-mode))
+    (let ((mt nil) tmp
+	  (isdist (string= mfilename (ede-proj-dist-makefile this)))
+	  (depth 0)
+	  )
+      ;;     ;; Find out how deep this project is.
+      ;;     (let ((tmp this))
+      ;;       (while (setq tmp (ede-parent-project tmp))
+      ;; 	(setq depth (1+ depth))))
+      ;;     ;; Collect the targets that belong in a makefile.
+      ;;     (mapcar
+      ;;      (lambda (obj)
+      ;;        (if (and (obj-of-class-p obj 'ede-step-target)
+      ;; 		(string= (oref obj makefile) mfilename))
+      ;; 	   (setq mt (cons obj mt))))
+      ;;      (oref this targets))
+      ;;     ;; Fix the order so things compile in the right direction.
+      ;;     (setq mt (nreverse mt))
+      ;; Add in the header part of the Makefile*
+      (save-excursion
+	(set-buffer (find-file-noselect mfilename))
+	(goto-char (point-min))
+	(if (and
+	     (not (eobp))
+	     (not (looking-at "# Automatically Generated \\w+ by EDE.")))
+	    (if (not (y-or-n-p (format "Really replace %s?" mfilename)))
+		(error "Not replacing Makefile."))
+	  (message "Replace EDE Makefile"))
+	(erase-buffer)
+	;; Insert a giant pile of stuff that is common between
+	;; one of our Makefiles, and a Makefile.in
+	(insert
+	 "# Automatically Generated " (file-name-nondirectory mfilename)
+	 " by EDE.\n"
+	 "# For use with: gnustep-make"
+	 "\n#\n"
+	 "# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.\n"
+	 "# EDE is the Emacs Development Environment.\n"
+	 "# http://cedet.sourceforge.net/ede.shtml\n"
+	 "# \n")
+	(insert "\nede_FILES=" (file-name-nondirectory (oref this file)) " "
+		(file-name-nondirectory (ede-proj-dist-makefile this)) "\n")
+	(insert "\n\n")
+	;; Standard prologe in a GNUmakefile
+	(insert ;; init-variables of project
+	 "ifeq ($(GNUSTEP_MAKEFILES),)\n"
+	 " GNUSTEP_MAKEFILES := $(shell gnustep-config"
+	 "--variable=GNUSTEP_MAKEFILES 2>/dev/null)\n"
+	 "endif\n\n"
+	 "include $(GNUSTEP_MAKEFILES)/common.make\n\n# Stuff\n")
+	
+	;; FIX XXX package,vcs repository ... variables
+	;; ...
+	;; Just this project's targets variables
+	(ede-map-targets this
+			 (lambda (tx)
+			   (cond ((or (eq (oref tx type) 'ctool)(eq (oref tx type) 'tool))
+				  (ede-pmake-insert-variable-shared "TOOL_NAME"
+				    (insert (ede-name tx))))
+		((eq (oref tx type) 'library)
+		 (ede-pmake-insert-variable-shared "LIBRARY_NAME"
+		   (insert (ede-name tx))))
+		((eq (oref tx type) 'application)
+		 (ede-pmake-insert-variable-shared "APP_NAME"
+		   (insert (ede-name tx))))
+		((eq (oref tx type) 'subproject)
+		 (ede-pmake-insert-variable-shared "SUBPROJECTS"
+		   (insert (ede-name tx)))))))
+
+      ;; Just this target's variables, sources and flags
+      (insert "\n\n")
+      (ede-map-targets this
+       (lambda (tx)
+	 (progn
+	   (let ((file (oref tx source)))
+	     (while file
+	       (cond ((or
+		       (ede-want-file-source-p ede-source-header-gnustep-c (car file))
+		       (ede-want-file-source-p ede-source-header-gnustep-objc (car file)))
+		      (ede-pmake-insert-variable-shared
+			  (concat (oref tx name) "_HEADER_FILES")
+			(insert (car file))))
+		     ((ede-want-file-source-p ede-source-gnustep-c (car file))
+		      (ede-pmake-insert-variable-shared
+			  (concat (oref tx name) "_C_FILES")
+			(insert (car file))))
+		     ((ede-want-file-source-p ede-source-gnustep-objc (car file))
+		      (ede-pmake-insert-variable-shared
+			  (concat (oref tx name) "_OBJC_FILES")
+			(insert (car file)))))
+	       (setq file (cdr file))))
+	   ;; Just target's CFLAGS, LDFLAGS and INCLUDE_DIRS
+	   (let ((cflags (oref tx cflags))
+		 (ldflags (oref tx ldflags))
+		 (incldirs (oref tx include-dirs))
+		 (single t))
+	     (while (and (sequencep cflags) cflags)
+	       (if single
+		   (or (setq single nil)
+		       (insert
+			(concat (oref tx name) "_CFLAGS = " (car cflags) "\n")))
+		 (insert
+		  (concat (oref tx name) "_CFLAGS += " (car cflags) "\n")))
+	       (setq cflags (cdr cflags)))
+	     (setq single t)
+	     (while (and (sequencep ldflags) ldflags)
+	       (if single
+		   (or (setq single nil)
+		       (insert
+			(concat (oref tx name) "_LDFLAGS = " (car ldflags) "\n")))
+		 (insert
+		  (concat (oref tx name) "_LDFLAGS += " (car ldflags) "\n")))
+	       (setq ldflags (cdr ldflags)))
+	     (setq single t)
+	     (while (and (sequencep incldirs) incldirs)
+	       (if single
+		   (or (setq single nil)
+		       (insert
+			(concat (oref tx name)
+				"_INCLUDE_DIRS = " (car ldflags) "\n")))
+		 (insert
+		  (concat (oref tx name)
+			  "_INCLUDE_DIRS += " (car ldflags) "\n")))
+	       (setq incldirs (cdr incldirs))))
+	   (insert "\n")
+;;;XXXX
+;;; 	   (if (or
+;;; 		(eq (oref tx type) 'clibrary)
+;;; 		(eq (oref tx type) 'library))
+;;; 	       (if (oref tx header-install-dir)
+;;; 		   (insert
+;;; 		    (concat
+;;; 		     (oref tx name)
+;;; 		     "_HEADER_INSTALLATION_DIR = "
+;;; 		     (oref tx header-install-dir)))))
+	   ))) ;; end of `ede-targets'
+
+      ;; Yet Other project's variables
+      ;; Just Additional Variables ...
+      (insert "\n")
+      ;; XXX @TODO put additional variables in the preamble if specified.
+      (let ((addvars (oref this additional-variables)) vars mkf)
+	(while addvars
+	  (if (car addvars) ;; useless ??
+	      (setq mkf (caar addvars)
+		    vars (cdar addvars)))
+	  (while vars
+	    (if mkf
+		(save-excursion
+		  (set-buffer (find-file-noselect mkf))
+;		  (ede-pmake-insert-variable-shared (caar vars)(cdar vars))
+		  (insert (caar vars) " += " (cdar vars) "\n")
+		  (save-buffer))
+;	      (ede-pmake-insert-variable-shared (caar vars)(cdar vars)))
+	      (insert (caar vars) " += " (cdar vars) "\n"))
+	    (setq vars (cdr vars)))
+	  (setq addvars (cdr addvars))))
+
+      ;; Include Preambles
+      (insert "\n\n")
+      (let ((preambles (oref this preamble)))
+	(while preambles
+	  (insert "-include " (car preambles) "\n")
+	  (setq preambles (cdr preambles))))
+      ;; Include target type specific Makefile
+      (insert "\n")
+      (let (types)
+	(ede-map-targets this (lambda (x) (add-to-list 'types (oref x type))))
+	(while types
+	  (if (eq (car types) 'subproject)
+	      (insert "include $(GNUSTEP_MAKEFILES)/aggregate.make\n")
+	    (insert "include $(GNUSTEP_MAKEFILES)/" (symbol-name (car types)) ".make\n"))
+	  (setq types (cdr types))))
+      ;; Include Postambles
+      (insert "\n")
+      (let ((postambles (oref this postamble)))
+	(while postambles
+	  (insert "-include " (car postambles) "\n")
+	  (setq postambles (cdr postambles))))
+
+      ;; Just Additional Rules ...
+      ;; XXX @TODO put additional rules in the postamble if specified.
+
+      ;; END
+      (save-buffer)
+      (goto-char (point-min))))))
+
+;;; EDE command functions
+;;
+(defvar ede-step-target-history nil
+  "History when querying for a target type.")
+
+(defmethod project-new-target ((this ede-step-project)
+			       &optional name type autoadd)
+  "Create a new target in THIS based on the current buffer."
+  (if (eq (oref this :project-mode) 'scanner)
+      (warn "This ProjStep is in Scanner Mode, are u sure what are u doing?"))
+  (let* ((name (or name (read-string "Name: " "")))
+	 (type (or type
+		   (completing-read "Type: " ede-step-target-alist
+				    nil t nil '(ede-step-target-history . 1))))
+	 (ot nil)
+	 (src (if (and (buffer-file-name)
+		       (if (and autoadd (stringp autoadd))
+			   (string= autoadd "y")
+			 (y-or-n-p (format "Add %s to %s? " (buffer-name) name))))
+		  (buffer-file-name))))
+    (setq ot (funcall (nth 1 (assoc type ede-step-target-alist)) name :name name
+		      :path (ede-convert-path this default-directory)
+		      :makefile "GNUmakefile"
+		      :source (if src
+				  (list (file-name-nondirectory src))
+				nil)))
+    ;; If we added it, set the local buffer's object.
+    (if src (progn
+	      (setq ede-object ot)
+	      (ede-apply-object-keymap)))
+    ;; Add it to the project object
+    ;;(oset this targets (cons ot (oref this targets)))
+    ;; New form: Add to the end using fancy eieio function.
+    ;; @todone - Some targets probably want to be in the front.
+    ;;           How to do that?
+    ;; @ans - See elisp autoloads for answer
+    (object-add-to-list this 'targets ot t)
+    ;; And save
+    (ede-step-save this)))
+
+(defmethod project-new-target-custom ((this ede-step-project))
+  "Create a new target in THIS for custom."
+  (if (eq (oref this :project-mode) 'scanner)
+      (warn "This ProjStep is in Scanner Mode, are u sure what are u doing?"))
+  (let* ((name (read-string "Name: " ""))
+	 (type (completing-read "Type: " ede-step-target-alist
+				nil t nil '(ede-step-target-history . 1))))
+    (funcall (nth 1 (assoc type ede-step-target-alist)) name :name name
+	     :path (ede-convert-path this default-directory)
+	     :source nil)))
+
+(defmethod project-delete-target ((this ede-step-target))
+  "Delete the current target THIS from it's parent project."
+  (if (eq (oref (ede-current-project (oref this :path)) :project-mode) 'scanner)
+      (warn "This ProjStep is in Scanner Mode, are u sure what are u doing?"))
+  (let ((p (ede-current-project))
+	(ts (oref this source)))
+    ;; Loop across all sources.  If it exists in a buffer,
+    ;; clear it's object.
+    (while ts
+      (let* ((default-directory (oref this path))
+	     (b (get-file-buffer (car ts))))
+	(if b
+	    (save-excursion
+	      (set-buffer b)
+	      (if (eq ede-object this)
+		  (progn
+		    (setq ede-object nil)
+		    (ede-apply-object-keymap))))))
+      (setq ts (cdr ts)))
+    ;; Remove THIS from it's parent.
+    ;; The two vectors should be pointer equivalent.
+    (oset p targets (delq this (oref p targets)))
+    (ede-step-save (ede-current-project))))
+
+(defmethod project-add-file ((this ede-step-target) file)
+  "Add to target THIS the current buffer represented as FILE."
+  (if (eq (oref (ede-current-project (oref this :path)) :project-mode) 'scanner)
+      (warn "This ProjStep is in Scanner Mode, are u sure what are u doing?"))
+  (let ((file (ede-convert-path this file))
+	(src (ede-target-sourcecode this))
+	(aux nil))
+    (while (and src (not (ede-want-file-p (car src) file)))
+      (setq src (cdr src)))
+    (when src
+      (setq src (car src))
+      (cond ((ede-want-file-source-p this file)
+	     (object-add-to-list this 'source file t))
+	    ((ede-want-file-auxiliary-p this file)
+	     (object-add-to-list this 'auxsource file t))
+	    (t (error "`project-add-file(ede-target)' source mismatch error")))
+      (ede-step-save))))
+
+(defmethod project-remove-file ((target ede-step-target) file)
+  "For TARGET, remove FILE.
+FILE must be massaged by `ede-convert-path'."
+  (if (eq (oref (ede-current-project (oref this :path)) :project-mode) 'scanner)
+      (warn "This ProjStep is in Scanner Mode, are u sure what are u doing?"))
+  ;; Speedy delete should be safe.
+  (object-remove-from-list target 'source (ede-convert-path target file))
+  (object-remove-from-list target 'auxsource (ede-convert-path target file))
+  (ede-step-save))
+
+(defmethod project-update-version ((this ede-step-project))
+  "The :version of project THIS has changed."
+  (ede-step-save))
+
+(defmethod project-make-dist ((this ede-step-project))
+  "Build a distribution for the project based on THIS target."
+  ;; I'm a lazy bum, so I'll make a makefile for doing this sort
+  ;; of thing, and rely only on that small section of code.
+  (let ((pm (ede-proj-dist-makefile this))
+	(df (project-dist-files this)))
+    (if (and (file-exists-p (car df))
+	     (not (y-or-n-p "Dist file already exists.  Rebuild? ")))
+	(error "Try `ede-update-version' before making a distribution"))
+    (ede-proj-setup-buildenvironment this)
+    (if (string= pm "Makefile.am") (setq pm "Makefile"))
+    (compile (concat "make -f " pm " dist"))
+    ))
+
+(defmethod project-dist-files ((this ede-step-project))
+  "Return a list of files that constitutes a distribution of THIS project."
+  (list
+   ;; Note to self, keep this first for the above fn to check against.
+   (concat (oref this name) "-" (oref this version) ".tar.gz")
+   ))
+
+(defmethod project-compile-project ((proj ede-step-project) &optional command)
+  "Compile the entire current project PROJ.
+Argument COMMAND is the command to use when compiling."
+  (let ((pm (ede-proj-dist-makefile proj))
+	(default-directory (file-name-directory (oref proj file))))
+    (ede-proj-setup-buildenvironment proj)
+;    (if (string= pm "Makefile.am") (setq pm "Makefile"))
+    (compile (concat "make -f " pm " all"))))
+
+;;; Target type specific compilations/debug
+;;
+(defmethod project-compile-target ((obj ede-step-target) &optional command)
+  "Compile the current target OBJ.
+Argument COMMAND is the command to use for compiling the target."
+  (ede-proj-setup-buildenvironment (ede-current-project))
+  (compile (concat "make -f " (oref obj makefile) " "
+		   (ede-proj-makefile-target-name obj))))
+
+(defmethod project-debug-target ((obj ede-step-target))
+  "Run the current project target OBJ in a debugger."
+  (error "Debug-target not supported by %s" (object-name obj)))
+
+(defmethod ede-proj-makefile-target-name ((this ede-step-target))
+  "Return the name of the main target for THIS target."
+  (ede-name this))
+
+;;; Compiler and source code generators
+;;
+(defmethod ede-want-file-auxiliary-p ((this ede-target) file)
+  "Return non-nil if THIS target wants FILE."
+  ;; By default, all targets reference the source object, and let it decide.
+  (let ((src (ede-target-sourcecode this)))
+    (while (and src (not (ede-want-file-auxiliary-p (car src) file)))
+      (setq src (cdr src)))
+    src))
+
+
+;;; Target type specific autogenerating gobbldegook.
+;; I would implement the ede-proj interface.
+(eval-when-compile
+  (require 'ede-pmake "ede-pmake.el")
+  (require 'ede-pconf "ede-pconf.el"))
+
+(defmethod ede-proj-dist-makefile ((this ede-step-project))
+  "Return the name of the Makefile with the DIST target in it for THIS."
+  (or (ede-gnustep-get-topmost-makefile (oref this directory))
+      (concat (file-name-directory (oref this file)) "GNUmakefile")))
+
+;; This Func is implemented elsewhere, probably in ede.el
+;; (defun ede-proj-regenerate ()
+;;   "Regenerate Makefiles for and edeproject project."
+;;   (interactive)
+;;   (and (eq 'writer (oref (ede-current-project) :project-mode))
+;;        (ede-proj-setup-buildenvironment (ede-current-project) t)))
+
+(defmethod ede-proj-makefile-create-maybe ((this ede-step-project) mfilename)
+  "Create a Makefile for all Makefile targets in THIS if needed.
+MFILENAME is the makefile to generate."
+  ;; For now, pass through until dirty is implemented.
+  (require 'ede-pmake)
+  (if (or (not (file-exists-p mfilename))
+	  (file-newer-than-file-p (oref this file) mfilename))
+      (ede-proj-makefile-create this mfilename)))
+
+(defmethod ede-proj-setup-buildenvironment ((this ede-step-project)
+					    &optional force)
+  "Setup the build environment for project THIS.
+Handles the Makefile, or a Makefile.am configure.in combination.
+Optional argument FORCE will force items to be regenerated."
+  (if (not force)
+      (ede-proj-makefile-create-maybe this (ede-proj-dist-makefile this))
+;    (require 'ede-pmake)
+    (ede-proj-makefile-create this (ede-proj-dist-makefile this)))
+  ;; Rebuild all subprojects
+  (ede-map-subprojects
+   this (lambda (sproj) (ede-proj-setup-buildenvironment sproj force)))
+  )
+
+
+;;; Lower level overloads
+;;
+;; utils using semantic for parsing.
+(defsubst ede-gnustep-semantic-tags-named ()
+  (semantic--find-tags-by-function
+   '(lambda (tag)(string-match "_NAME$" (car tag)))
+   (semantic-find-tags-by-class 'variable (current-buffer))))
+
+(defsubst ede-gnustep-semantic-tags-subprojects ()
+  (semantic--find-tags-by-function
+   '(lambda (tag)(string-match "^SUBPROJECTS$" (car tag)))
+   (semantic-find-tags-by-class 'variable (current-buffer))))
+
+(defsubst ede-gnustep-semantic-tags-included-files ()
+  (semantic-find-tags-by-class 'include (current-buffer)))
+
+(defsubst ede-gnustep-semantic-tags-all-variables ()
+  (semantic-find-tags-by-class 'variable (current-buffer)))
+
+(defsubst ede-gnustep-semantic-value-for-tag (tag)
+  (cadr (caddr tag)))
+
+(defun ede-gnustep-semantic-tag-for-value (name)
+  (let ((tags (semantic-fetch-tags))(found nil))
+    (while (and tags (not found))
+      (and (member name (ede-gnustep-semantic-value-for-tag (car tags)))
+	   (setq found (car tags)))
+      (setq tags (cdr tags)))
+    found))
+
+;; maybe require some makefile utils
+(defmethod project-rescan ((this ede-step-project))
+  "Rescan the EDE proj project THIS."
+  (cond ((eq 'writer (oref this :project-mode))
+	 (ede-with-projectfile this
+	   (goto-char (point-min))
+	   (let ((l (read (current-buffer)))
+		 (fields (object-slots this))
+		 (targets (oref this targets)))
+	     (setq l (cdr (cdr l))) ;; objtype and name skip
+	     (while fields ;  reset to defaults those that dont appear.
+	       (if (and (not (assoc (car fields) l))
+			(not (eq (car fields) 'file)))
+		   (let ((eieio-skip-typecheck t))
+		     ;; This is a hazardous thing, for some elements
+		     ;; might not be bound.  Skip typechecking and duplicate
+		     ;; unbound slots along the way.
+		     (eieio-oset this (car fields)
+				 (eieio-oref-default this (car fields)))))
+	       (setq fields (cdr fields)))
+	     (while l
+	       (let ((field (car l)) (val (car (cdr l))))
+		 (cond ((eq field targets)
+			(let ((targets (oref this targets))
+			      (newtarg nil))
+			  (setq val (cdr val)) ;; skip the `list'
+			  (while val
+			    (let ((o (object-assoc (car (cdr (car val))) ; name
+						   'name targets)))
+			      (if o
+				  (project-rescan o (car val))
+				(setq o (eval (car val))))
+			      (setq newtarg (cons o newtarg)))
+			    (setq val (cdr val)))
+			  (oset this targets newtarg)))
+		       (t
+			(eieio-oset this field val))))
+	       (setq l (cdr (cdr l))))))) ;; field/value
+
+	;; Scanner-mode
+	((eq 'scanner (oref this :project-mode))
+	 (let ((mf (ede-gnustep-get-valid-makefile (oref this :directory)))
+	       (otargets (oref this targets))
+	       (osubproj (oref this subproj))
+	       (pn (oref this :name)) (ntargets nil) (nsubproj nil))
+	   (when mf
+;	     (oset this :makefile (file-name-nondirectory mf))
+	     (with-temp-buffer
+	       (insert-file-contents mf)
+	       (goto-char (point-min))
+	       (let (;; XXX : Why these don't work ???
+		     (named (ede-gnustep-semantic-tags-named))
+		     (subprojs (ede-gnustep-semantic-tags-subprojects))
+		     (included (ede-gnustep-semantic-tags-included-files))
+		     (allvariables (ede-gnustep-semantic-tags-all-variables))
+		     inst-domain)
+		 (oset this included-makefiles included)
+		 (setq inst-domain 
+		       (ede-gnustep-semantic-value-for-tag
+			(assoc "GNUSTEP_INSTALLATION_DOMAIN" allvariables)))
+		 (cond ((string= "USER" inst-domain)(oset this installation-domain 'user))
+		       ((string= "SYSTEM" inst-domain)(oset this installation-domain 'system))
+		       ((string= "NETWORK" inst-domain)(oset this installation-domain 'network))
+		       (t (oset this installation-domain 'local)))
+		 (mapc
+		  ;; Map all the different types
+		  (lambda (typecar)
+		    (let ((macro (nth 2 typecar))
+			  (class (nth 1 typecar))
+			  )
+		      (let ((tmp nil)(targets
+				      (makefile-macro-file-list macro)
+				      ;; (ede-gnustep-semantic-value-for-tag
+				      ;;  (car (semantic-find-tags-by-name
+				      ;; 	     macro
+				      ;; 	     (semantic-find-tags-by-class
+				      ;; 	      'variable (current-buffer)))))
+				      ))
+			(setq targets (remove-duplicates targets :test 'equal))
+			(while targets
+			  (setq tmp (object-assoc (car targets) 'name otargets))
+			  (when (not tmp)
+			    (if (eq class 'ede-step-project)
+				;; I found a sub project.
+				(let ((spdir
+				       (file-name-as-directory
+					(expand-file-name (car targets)(oref this :directory)))) mf)
+				  (when (and
+					 (file-directory-p spdir)
+					 (ede-gnustep-get-valid-makefile spdir))
+				    ;; For each project id found, see if we need to recycle,
+				    ;; and if we do not, then make a new one.  Check the deep
+				    ;; rescan value for behavior patterns.
+				    (setq tmp (object-assoc spdir 'directory osubproj))
+				    (unless tmp
+				      (setq tmp
+					    (condition-case nil
+						;; In case of problem, ignore it.
+						(ede-step-project
+						 (car targets) :name (car targets)
+						 :project-mode 'scanner
+						 :directory spdir
+						 :file (expand-file-name "ProjStep.ede" spdir)
+						 :targets nil)
+					      (error nil)))
+				      ;; new subproject
+				      (and (ede-step-project-child-p tmp)
+					   (setq nsubproj (cons tmp nsubproj))))
+				    (when tmp
+				      ;; force to be a subproject and in scanner mode
+				      ;;(oset tmp rootproj (or (oref this rootproj) this))
+				      (oset tmp :project-mode 'scanner)
+				      ;; rescan subproj after, in tail
+				      ;; (if ede-deep-rescan (project-rescan tmp))
+				      )))
+			      
+			      ;; I found a non-subproject target.
+			      (setq tmp (apply class (car targets) :name (car targets)
+					       ;; XXX check for possible relative path
+					       ;; in names, like Library/SubLibTarget
+					       ;;:path ""
+					       ;; FIX: we need an absolute path
+					       ;; because ede-object-progect var don't work,
+					       ;; we can't use it in `project-rescan'(target)
+					       :path (file-name-directory mf)
+					       :makefile (file-name-nondirectory mf)
+					       nil))
+			      ;; force :makefile, i don't know why !!!
+			      (oset tmp :makefile (file-name-nondirectory mf))
+			      (setq ntargets (cons tmp ntargets))
+			      ))
+			  ;; If we have tmp, then rescan it only if deep mode.
+			  (if (and ede-deep-rescan (ede-step-target-child-p tmp))
+			      (project-rescan tmp))
+			  (setq targets (cdr targets))))))
+		  ede-step-target-alist)
+		 ) ;; close temp buffer, we don't need makefile-macro-file-list
+	       (oset this :targets (append ntargets otargets))
+	       (oset this subproj (append nsubproj osubproj))
+	       (ede-step-save this)
+	       (if ede-deep-rescan
+		   (dolist (SP (oref this subproj))
+		     (project-rescan SP)))
+	       ))))))
+
+(defmethod project-rescan ((this ede-step-target) &optional readstream)
+  "Rescan target THIS from the read list READSTREAM."
+  ;; use the root project to distinguish between scanner/writer mode.
+  ;; FIX is better something like `ede-target-parent' ??? non force topmost.
+  (let ((this-step-root-project
+  	 (ede-current-project
+  	  (file-name-directory
+  	   (or (ede-gnustep-get-topmost-makefile (oref this :path)) (oref this :makefile) "")))))
+    ;;(when (ede-step-project-child-p ede-object-project)
+    (when (ede-step-project-child-p this-step-root-project)
+      (cond ((eq 'writer (oref this-step-root-project :project-mode))
+	     (progn
+	       (setq readstream (cdr (cdr readstream))) ;; constructor/name
+	       (while readstream
+		 (let ((tag (car readstream))
+		       (val (car (cdr readstream))))
+		   (eieio-oset this tag val))
+		 (setq readstream (cdr (cdr readstream))))))
+	    ;;((eq 'scanner (oref ede-object-project :project-mode))
+	    ((eq 'scanner (oref this-step-root-project :project-mode))
+	     ;;(let ((mf (ede-gnustep-get-valid-makefile (oref ede-object-project :directory)))
+	     (let ((mf ;;(ede-gnustep-get-valid-makefile (oref this-step-root-project :directory)))
+		    (oref this :makefile))
+		   (allsource nil))
+	       (with-temp-buffer
+		 (insert-file-contents mf)
+		 (goto-char (point-min))
+		 ;; FIX add all available _MACROS_FOR_TARGETS by gnustep-make, 
+		 ;; or find a way to do it.
+		 (let ((c-src
+			(makefile-macro-file-list (concat (oref this :name) "_C_FILES"))
+			;; (ede-gnustep-semantic-value-for-tag ;;was makefile-macro-file-list
+			;;  (car (semantic-find-tags-by-name
+			;;        (concat (oref this :name) "_C_FILES")
+			;;        (semantic-find-tags-by-class
+			;; 	'variable (current-buffer)))))
+		      )
+		     (objc-src
+		      (makefile-macro-file-list (concat (oref this :name) "_OBJC_FILES"))
+		      ;; (ede-gnustep-semantic-value-for-tag ;;was makefile-macro-file-list
+		      ;;  (car (semantic-find-tags-by-name
+		      ;; 		      (concat (oref this :name) "_OBJC_FILES")
+		      ;; 		      (semantic-find-tags-by-class
+		      ;; 		       'variable (current-buffer)))))
+		      )
+		     (h-src
+		      (makefile-macro-file-list (concat (oref this :name) "_HEADER_FILES"))
+		      ;; (ede-gnustep-semantic-value-for-tag ;;was makefile-macro-file-list
+		      ;; 	     (car (semantic-find-tags-by-name
+		      ;; 		   (concat (oref this :name) "_HEADER_FILES")
+		      ;; 		   (semantic-find-tags-by-class
+		      ;; 		    'variable (current-buffer)))))
+		      )
+		     )
+		   (if c-src (setq allsource (append c-src allsource)))
+		   (if objc-src (setq allsource (append objc-src allsource)))
+		   (if h-src (setq allsource (append h-src allsource)))))
+	       (oset this :source allsource)))))
+    ))
+
+;; XXX regexp to validate a makefile may be customizable list. &&'d, OR'd ???
+;; if we use a list of regexp, thier have to match "every or any" element ???
+(defun ede-gnustep-get-valid-makefile (dir)
+  "Return the absolute path of a valid GNUmakefile in DIR.
+Check match of a line for validity."
+  (let ((rexp-ok "^include \\$(GNUSTEP_MAKEFILES)/common\\.make")
+	(mfs (directory-files dir t "^\\(GNU\\)?[mM]akefile.*")) (found nil))
+    (while (and (not found) mfs)
+      (if (string-match rexp-ok (string-file-contents (car mfs)))
+	  (setq found (car mfs)))
+      (setq mfs (cdr mfs)))
+    found))
+    
+(defun ede-gnustep-get-topmost-makefile (&optional dir)
+  "Find the top most valid (for gnustep) GNUmakefile."
+  (let* ((newdir (expand-file-name (or dir default-directory)))
+	 (valid (ede-gnustep-get-valid-makefile newdir))
+	 (found nil) olddir)
+    (while (and (not found) (not (equal olddir newdir)))
+      (setq olddir newdir) ;; to prevent loop at /
+      ;; check for RootProjStep.ede file presence, 
+      ;; for a valid ede-step-project root, would be the topmost. 
+      (if (file-readable-p (expand-file-name "RootProjStep.ede" newdir))
+	  (setq found valid))
+      (unless (or found (ede-gnustep-get-valid-makefile
+			 (file-name-directory
+			  (directory-file-name newdir))))
+	(setq found valid))
+      ;; up to ..
+      (setq newdir (file-name-directory (directory-file-name newdir)))
+      (setq valid (ede-gnustep-get-valid-makefile newdir)))
+    found))
+
+
+;;;###autoload
+;; @todo - below is not compatible w/ Emacs 20!
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "edegnustep"
+	      :name "GNUstep-Make" :file 'ede-gnustep
+	      :proj-file "ProjStep.ede"
+	      :load-type 'ede-step-load
+	      :class-sym 'ede-step-project)
+	     t)
+
+;;;###autoload
+;; ;; @todo - below is not compatible w/ Emacs 20! ede-project-class-files
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "gnustep-root"
+	      :name "GNUstep-make Top Most" :file 'ede-gnustep
+	      :proj-file "RootProjStep.ede"
+	      :initializers '(:project-mode scanner)
+	      :load-type 'ede-gnustep-load
+	      :class-sym 'ede-step-project)
+	     t)
+
+;;;###autoload
+;; @todo - below is not compatible w/ Emacs 20!
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "gnustep"
+	      :name "GNUstep-Make in scanner mode" :file 'ede-gnustep
+	      :proj-file "ProjStep.ede"
+	      :initializers '(:project-mode scanner)
+	      :load-type 'ede-gnustep-load
+	      :class-sym 'ede-step-project)
+	     t)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\(Root\\)?ProjStep\\.ede" . emacs-lisp-mode))
+
+;; (assoc "gnustep" (object-assoc-list 'name ede-project-class-files))
+
+
+(provide 'ede-gnustep)
+
+;;; ede-proj.el ends here
+
+
+
diff --git a/site/cedet-1.0pre7/contrib/semantic-ectag-scala.el b/site/cedet-1.0pre7/contrib/semantic-ectag-scala.el
new file mode 100644
index 0000000..15d8e39
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/semantic-ectag-scala.el
@@ -0,0 +1,82 @@
+;;; semantic-ectag-scala.el --- Scala support for ctags
+;;
+;; Copyright (C) 2009 Raymond Paul Racine
+;
+;;This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; The file contains Exuberent CTags support for the Scala language.
+
+;;; Code:
+
+;;; Scala Mode
+;;
+
+(defvar-mode-local scala-mode semantic-ectag-lang "scala"
+  "Language name for Exuberent CTags.")
+
+(defvar-mode-local scala-mode semantic-ectag-lang-kind
+  "cotmnafVvTip"
+  "Kinds of Exuberent CTags available.")
+
+;; FIXME - Need to skip commented code.
+;; i.e., --regex-Scala=/^[^\*\/]*class[ \t]*([a-zA-Z0-9_]+)/\1/c,classes/
+(defvar-mode-local scala-mode semantic-ectag-lang-extra-flags
+  '("--langdef=scala"
+    "--langmap=scala:.scala"
+    "--regex-Scala=/^[ \t]*class[ \t]*([a-zA-Z0-9_]+)/\\1/c,class/"
+    "--regex-Scala=/^[ \t]*object[ \t]*([a-zA-Z0-9_]+)/\\1/o,class/"
+    "--regex-Scala=/^[ \t]*class[ \t]*([a-zA-Z0-9_]+)/\\1/c,class/"
+    "--regex-Scala=/^[ \t]*object[ \t]*([a-zA-Z0-9_]+)/\\1/o,class/"
+    "--regex-scala=/^[ \t]*trait[ \t]*([a-zA-Z0-9_]+)/\\1/t,class/"
+    "--regex-Scala=/^[ \t]*case[ \t]*class[ \t]*([a-zA-Z0-9_]+)/\\1/m,class/"
+    "--regex-Scala=/^[ \t]*case[ \t]*object[ \t]*([a-zA-Z0-9_]+)/\\1/n,class/"
+    "--regex-Scala=/^[ \t]*abstract[ \t]*class[ \t]*([a-zA-Z0-9_]+)/\\1/a,class/"
+    "--regex-Scala=/^[ \t]*def[ \t]*([a-zA-Z0-9_]+)[ \t]*.*[:=]/\\1/f,function/"
+    "--regex-Scala=/[ \t]*val[ \t]*([a-zA-Z0-9_]+)[ \t]*[:=]/\\1/V,value/"
+    "--regex-Scala=/[ \t]*var[ \t]*([a-zA-Z0-9_]+)[ \t]*[:=]/\\1/v,variable/"
+    "--regex-Scala=/^[ \t]*type[ \t]*([a-zA-Z0-9_]+)[ \t]*[\[<>=]/\\1/T,classs/"
+    "--regex-Scala=/^[ \t]*import[ \t]*([a-zA-Z0-9_{}., \t=>]+$)/\\1/i,include/"
+    "--regex-Scala=/^[ \t]*package[ \t]*([a-zA-Z0-9_.]+$)/\\1/p,package/")
+  "Regex for Scala symbols from syntax.")
+
+(defvar-mode-local scala-mode semantic-symbol->name-assoc-list
+  '((type . "Types")
+    (variable . "Variables")
+    (value . "Values")
+    (function . "Functions")
+    (include . "Dependencies")
+    (package . "Providers"))
+  "List of tag classes and describing strings.")
+
+;; CEDET has lots of ways of getting you to various levels of semantic parsing support.
+;; The following incantation works.
+(defun semantic-scala-cedet-support ()
+  "Enable CEDET for Scala based upon exuberant ctags support as the primary parser."
+  (interactive)
+  (semantic-load-enable-code-helpers)
+  (global-srecode-minor-mode 1)
+  (semantic-load-enable-primary-exuberent-ctags-support)
+  (add-hook 'scala-mode-hook 'semantic-ectag-simple-setup))
+
+(semantic-scala-cedet-support)
+
+;;(add-hook 'scala-mode-hook 'semantic-scala-cedet-support)
+
+(provide 'semantic-ectag-scala)
+
+;;; semantic-ectag-scala.el ends here
diff --git a/site/cedet-1.0pre7/contrib/semantic-tag-folding.el b/site/cedet-1.0pre7/contrib/semantic-tag-folding.el
new file mode 100644
index 0000000..4cfbcf0
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/semantic-tag-folding.el
@@ -0,0 +1,760 @@
+;;; semantic-tag-folding.el --- semantic decoration style to enable folding of semantic tags
+;; Time-stamp: <2005-04-28 17:03:44 sacharya>
+
+;;; Copyright (C) 2005, 2009 Suraj Acharya
+
+;; Author: Suraj Acharya <sacharya@cs.indiana.edu>
+
+;; This file is not part of GNU Emacs.
+
+;; semantic-tag-folding.el is free software; you can redistribute it
+;; and/or modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 2, or
+;; (at your option) any later version.:
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;;
+;;; Defines a `semantic-decoration-mode' style which allows semantic
+;;; tags to be expanded or collapsed in the style of folding mode and
+;;; hideshow mode.  In addition to regular semantic tag, comments
+;;; preceeding tags can also be folded, and consecutive 'include tags
+;;; are folded as a single unit.  A semantic minor mode
+;;; `semantic-tag-folding-mode' is also created.  So M-x
+;;; semantic-tag-folding-mode can be used to turn this mode on and
+;;; off, it will also turn on `semantic-deocration-mode' if required.
+;;;
+;;; To use feature, add this file to your load path and put the
+;;; following line in your .emacs: (require 'semantic-tag-folding)
+;;; 
+;;; Customize `semantic-tag-folding-allow-folding-of' to choose which
+;;; tags you want to be able to fold.  You can also choose which tags
+;;; types are folded by default when semantic-decoration-mode is
+;;; enabled.
+;;;
+;;; M-x semantic-tag-folding-mode to enable tag folding in a buffer,
+;;; M-x global-semantic-tag-folding-mode turns on folding in all
+;;; semantic enabled buffers.
+;;;
+;; Features:
+;; 1. Indicators in the fringe to show which tags which can be
+;;    expanded or hidden, clicking on the fringe symbols toggles the
+;;    associated block's state
+;; 2. `semantic-tag-folding-allow-folding-of' lets you customize which
+;;    tags can be folded, and which of those tags are folded by
+;;    default when this mode is first activated.
+;; 3. semantic-tag-folding-mode which toggles this mode, without
+;;    having to turn on semantic-decoration-mode
+;; 4. hs-mode style commands to fold and show all tags, all child tags
+;;    or only the current tag.
+;;    
+;; TODO:
+;; * semantic-tag-folding-tag and semantic-tag-folding-comment attributes should be ignored
+;; when calling fold-all or show-all (or the yet to be implemented show-children functions)
+;; * make tooltips behave well (turn them off when the region is
+;; expanded, consistent location, no truncation, update tooltips when
+;; the text changes)
+;; * make the ellipsis clickable
+;; * investigate occasional windows cvs Emacs crashes
+
+
+
+(require 'semantic-decorate-mode)
+(eval-when-compile (require 'cl))
+
+;;; Code:
+
+;; xemacs compatibility
+;; http://www.opensource.apple.com/darwinsource/10.3/emacs-56/emacs/lisp/progmodes/hideshow.el
+(when (or (not (fboundp 'add-to-invisibility-spec))
+          (not (fboundp 'remove-from-invisibility-spec)))
+  ;; `buffer-invisibility-spec' mutators snarfed from Emacs 20.3 lisp/subr.el
+  (defun add-to-invisibility-spec (arg)
+    (cond
+     ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
+      (setq buffer-invisibility-spec (list arg)))
+     (t
+      (setq buffer-invisibility-spec
+            (cons arg buffer-invisibility-spec)))))
+  (defun remove-from-invisibility-spec (arg)
+    (when buffer-invisibility-spec
+      (setq buffer-invisibility-spec
+            (delete arg buffer-invisibility-spec)))))
+
+;; http://list-archive.xemacs.org/xemacs-patches/200206/msg00144.html
+;; `propertize' is a builtin in GNU Emacs 21.
+(when (not (fboundp 'propertize))
+  (defun propertize (string &rest properties)
+    "Return a copy of STRING with text properties added.
+First argument is the string to copy.
+Remaining arguments form a sequence of PROPERTY VALUE pairs for text
+properties to add to the result."
+    (let ((str (copy-sequence string)))
+      (add-text-properties 0 (length str)
+                           properties
+                           str)
+      str)))
+
+;;;###autoload
+(defcustom global-semantic-tag-folding-mode nil
+  "*If non-nil enable global use of variable `semantic-tag-folding-mode'.
+With this mode enabled, a new folding decoration mode is added.
+Clicking on a + or - in the fringe will fold that tag."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-tag-folding-mode (if val 1 -1))))
+
+;;;###autoload
+(defun global-semantic-tag-folding-mode (&optional arg)
+  "Toggle global use of option `semantic-tag-folding-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-tag-folding-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-tag-folding-mode arg)))
+
+(defcustom semantic-tag-folding-mode-hook nil
+  "*Hook run at the end of function `semantic-tag-folding-mode'."
+  :group 'semantic
+  :type 'hook)
+  
+(defvar semantic-tag-folding-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km [left-fringe mouse-1] 'semantic-tag-folding-click)
+    km)
+  "Keymap for folding minor mode.")
+
+(defvar semantic-tag-folding-mode nil
+  "Non-nil if folding minor mode is enabled.
+Use the command `semantic-tag-folding-mode' to change this variable.")
+
+(make-variable-buffer-local 'semantic-tag-folding-mode)
+
+(defvar semantic-tag-folding-decoration-mode-hook-enabled t
+  "Used to disable `semantic-tag-folding-decoration-mode-hook'.
+This is done when semantic-tag-folding mode turns on semantic-decoration mode.")
+
+
+(defvar semantic-tag-folding-saved-decoration-styles nil
+"The saved value of `semantic-decoration-styles'.")
+(make-variable-buffer-local 'semantic-tag-folding-saved-decoration-styles)
+
+(defvar semantic-tag-folding-decoration-style
+  '(("semantic-tag-folding" . t))
+  "Only turn on semantic-tag-folding decorations.
+A value for variable `semantic-decoration-styles'.")
+
+(defun semantic-tag-folding-mode-setup ()
+  "Setup option `semantic-tag-folding-mode'.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  In addition,
+`semantic-tag-folding-mode' is only available when fringe images are available
+in Emacs 20.4."
+  (if semantic-tag-folding-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)
+                    ))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-tag-folding-mode nil)
+            (error "Buffer %s cannot be folded by semantic"
+                   (buffer-name)))
+        ;; Enable decoration mode
+        (add-to-invisibility-spec '(semantic-tag-fold . t))
+        (if (featurep 'xemacs)
+            (set (make-local-variable 'line-move-ignore-invisible) t))
+        (setq semantic-tag-folding-saved-decoration-styles semantic-decoration-styles)
+        (if semantic-decoration-mode
+            ;; if decoration mode is already on, ensure that semantic-tag-folding is enabled
+            (let ((style (assoc "semantic-tag-folding" semantic-decoration-styles)))
+              (when (not (cdr style))
+                (setcdr style t)
+                (semantic-decoration-mode-setup)))
+          ;; else, turn on decoration mode with only semantic-tag-folding on
+          (setq semantic-tag-folding-saved-decoration-styles semantic-decoration-styles)
+          (setq semantic-decoration-styles semantic-tag-folding-decoration-style)
+          (let ((semantic-tag-folding-decoration-mode-hook-enabled nil))
+            (semantic-decoration-mode 1))))
+    ;; Remove hooks
+    ;; Disable the decoration.
+    (when semantic-decoration-mode
+      (if (eq semantic-decoration-styles semantic-tag-folding-decoration-style)
+          ;; if no calls were made to
+          (progn     (semantic-decoration-mode -1)
+                     (setq  semantic-decoration-styles semantic-tag-folding-saved-decoration-styles))
+        ;; else
+        (setq  semantic-decoration-styles semantic-tag-folding-saved-decoration-styles)
+        (semantic-decoration-mode 1))))
+  semantic-tag-folding-mode)
+
+(add-hook 'semantic-decoration-mode-hook 'semantic-tag-folding-decoration-mode-hook)
+
+(defun semantic-tag-folding-decoration-mode-hook ()
+  "Hook function used to manage folding icons in decoration-mode."
+  (when semantic-tag-folding-decoration-mode-hook-enabled
+    (cond
+     ((and semantic-decoration-mode semantic-tag-folding-mode)
+      ;; when turning on decoration-mode with tag folding already on,
+      ;; use the saved value of `semantic-decoration-styles' and ensure
+      ;; that tag folding decorations are turned on
+      (setq semantic-decoration-styles semantic-tag-folding-saved-decoration-styles)
+      (let ((style (assoc "semantic-tag-folding" semantic-decoration-styles)))
+        (when (not (cdr style))
+          (setcdr style t)
+          (semantic-decoration-mode-setup)
+          )))
+     ((and semantic-decoration-mode (not semantic-tag-folding-mode))
+      ;; when turning on decorations with out tag folding, ensure that
+      ;; tag-folding decorations are not enabled
+      (let ((style (assoc "semantic-tag-folding" semantic-decoration-styles)))
+        (when (cdr style)
+          (setcdr style nil)
+          (semantic-decoration-mode-setup)
+          )))
+     ((and (not semantic-decoration-mode) semantic-tag-folding-mode)
+      ;; if turning off decoration mode with semantic tag folding on,
+      ;; turn off semantic tag foldng mode
+      (if (eq semantic-decoration-styles semantic-tag-folding-decoration-style)
+          ;; M-x tag-folding -> M-x decoration , turn on all the deocration mode styles
+          (semantic-decoration-mode 1)
+        ;; M-x tag-folding -> M-x decoration M-x decoration, only keep
+        ;; the semantic-tag-folding-decoration-style active
+       (semantic-tag-folding-mode 1))))))
+
+;;;###autoload
+(defun semantic-tag-folding-mode (&optional arg)
+  "Minor mode mark semantic tags for folding.
+This mode will display +/- icons in the fringe.  Clicking on them
+will fold the current tag.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-tag-folding-mode 0 1))))
+  (setq semantic-tag-folding-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-tag-folding-mode)))
+  (semantic-tag-folding-mode-setup)
+  (run-hooks 'semantic-tag-folding-mode-hook)
+  (if (interactive-p)
+      (message "folding minor mode %sabled"
+               (if semantic-tag-folding-mode "en" "dis")))
+  semantic-tag-folding-mode)
+
+(semantic-add-minor-mode 'semantic-tag-folding-mode "" semantic-tag-folding-mode-map)
+
+
+(define-semantic-decoration-style semantic-tag-folding "Enables folding of tags.")
+
+;; this  needs  to  go  after  defining the  decoration  style,  until
+;; define-semantic-decoration-style   uses  setq-default   instead  of
+;; add-to-list when setting the value of semantic-decoration-styles
+(make-variable-buffer-local 'semantic-decoration-styles)
+
+
+(defcustom semantic-tag-folding-allow-folding-of
+  '((type . nil) (function . nil) (variable . nil) (include . nil)
+    (comment . nil) (package . nil))
+  "A set of semantic classes.  Tags of these classes will be allowed to be folded and unfolded by this mode."
+  :group 'semantic
+  :type ;;    '(alist    :key-type  symbol   :value-type boolean :options (type function variable include package code))
+  '(set (cons :format "%v" (const :tag "Types" type)
+	      (choice :tag "Fold by default"
+		      (const :tag "Outer type(s) as well as inner types" all)
+		      (const :tag "Only inner types" inner)
+		      (const :tag "Neither" )))
+        (cons :format "%v"
+	      (const :tag "Function/method declarations" function)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Varible declarations" variable)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Blocks of consecutive include/import statements" include)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Comment blocks preceeding tags" comment)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Package declarations" package)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Code regions" code)
+	      (boolean :tag "Fold by default"))
+        (cons :format "%v"
+	      (const :tag "Code regions" block)
+	      (boolean :tag "Fold by default"))
+        (repeat :tag "Other Semantic classes"
+		(cons :format "%v" (symbol :tag "Semantic class" code)
+		      (boolean :tag "Fold by default")))
+	))
+(make-variable-buffer-local 'semantic-tag-folding-allow-folding-of)
+
+(defcustom semantic-tag-folding-tag-higlight-time 1
+  "The time in seconds for which a fringe highlight appears.
+This higlight shows extent of the tag body when a tag is
+expanded.  Set this to nil for no extent indication."
+  :group 'semantic :type 'number)
+
+(defcustom semantic-tag-folding-highlight-tags-shown-by-reveal-mode nil
+  "If non-nil the extent tags unfolded by reveal mode is not highlighted."
+  :group 'semantic
+  :type 'boolean)
+
+(defcustom semantic-tag-folding-show-tooltips nil
+  "Display tooltips for folded tag bodies..
+If set to t, the body of a hidden tag is shown as a tooltip
+  when the mouse hovers over the first line of the tag.  This is
+  not very pretty because the tooltip sometimes appears above the
+  cursor and not below where the tag body is, and the tootltip
+  text is truncated at some limit so large tag bodies are often
+  cut short."
+  :group 'semantic :type 'boolean)
+
+(defvar semantic-tag-folding-function 'semantic-tag-folding-function-default
+  "Default folding of tags.
+Function which determines whether a tag should be folded by
+default when `semantic-tag-folding' is activated."  )
+
+(defun semantic-tag-folding-set-fringe-image-style  (&optional symbol value)
+  "Set the bitmaps for this folding \"fringe style\".
+This function is called when customizing
+`semantic-tag-folding-fringe-image-style'. SYMBOL is
+`semantic-tag-folding-fringe-image-style' and VALUE is the fringe
+style selected.
+Five bitmaps are needed for each style:
+* semantic-tag-folding-folded - the image in the fringe which
+indicates that there is a folded tag on this line
+* semantic-tag-folding-unfolded - this image indicates that the
+tag starting on this line can be folded
+* semantic-tag-folding-highlight-{top,middle,bottom} - when
+`semantic-tag-folding-tag-higlight-time' is non-nil these three
+bitmaps are used to indicate the extent of a tag when it is
+unfolded."
+  (if symbol (set-default symbol value))
+  (cond
+   ((not (functionp 'define-fringe-bitmap)) nil)
+   ((eq value 'plusminus)
+
+    (define-fringe-bitmap  'semantic-tag-folding-folded
+      ;; a plus sign
+      [#b00011000
+       #b00011000
+       #b00011000
+       #b11111111
+       #b11111111
+       #b00011000
+       #b00011000
+       #b00011000])
+    
+    (define-fringe-bitmap  'semantic-tag-folding-unfolded
+      ;; a minus sign
+      [#b11111111
+       #b11111111])
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-top
+      ;; a minus sign
+      [#b11111111
+       #b11111111])
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-middle
+      ;; a vertical bar
+      [#b00011000] nil nil '(center t))
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-bottom
+      ;; a minus sign
+      [#b11111111
+       #b11111111]))
+
+   ((eq value 'triangles)
+
+    (define-fringe-bitmap  'semantic-tag-folding-unfolded
+      ;; a triangle pointing downwards
+      [#b11111110
+       #b01000100
+       #b00101000
+       #b00010000])
+
+    (define-fringe-bitmap  'semantic-tag-folding-folded
+      ;; a filled triangle pointing to the right
+      [#b100000
+       #b110000
+       #b111000
+       #b111100
+       #b111100
+       #b111000
+       #b110000
+       #b100000])
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-top
+      ;; a triangle pointing downwards
+      [#b11111110
+       #b01000100
+       #b00101000
+       #b00010000])
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-middle
+      ;; a vertical bar
+      [#b00010000] nil nil '(center t))
+
+    (define-fringe-bitmap  'semantic-tag-folding-highlight-bottom
+      ;; a triangle pointing upwards
+      [#b00010000
+       #b00101000
+       #b01000100
+       #b11111110])
+    )
+   ))
+
+(defcustom semantic-tag-folding-fringe-image-style 'triangles
+  "Fringe image style.
+This variable determines the bitmaps drawn in the fringe to
+  indicate folded or unfolded (expanded) tags."
+  :group 'semantic
+  :type '(choice (const triangles)
+                 (const plusminus))
+  :set 'semantic-tag-folding-set-fringe-image-style)
+
+(defun semantic-tag-folding-allow-folding-of (class)
+  "Is folding of tags of semantic class CLASS allowed?"
+  (or
+   (assq class semantic-tag-folding-allow-folding-of)
+   (assq class (car (last semantic-tag-folding-allow-folding-of)))
+   ))
+
+(defun semantic-tag-folding-hidden-by-default (class)
+"Are tags of semantic class CLASS to be hidden by default?"
+  (cdr (semantic-tag-folding-allow-folding-of class)))
+
+(defun semantic-tag-folding-function-default (tag comment)
+  "The default `semantic-tag-folding-function'.
+Returns non-nil if the body of TAG is to be hidden when the mode
+is started.  COMMENT is non-nil to indicate that the comment above
+TAG is what is being hidden, not the body of TAG."
+  (if comment
+      (semantic-tag-folding-hidden-by-default 'comment)
+    (let* ((c (semantic-tag-class tag))
+          (default (semantic-tag-folding-hidden-by-default c)))
+      ;; `default' is the value to be returned, unless TAG is a type
+      ;; and only inner types are to  be hidden
+      (if (and default (eq c 'type) (eq default 'inner))
+          ;; the outermost type has no parent
+          (semantic-find-tag-parent-by-overlay tag)
+        default))))
+
+(defun semantic-tag-folding-p-default (tag)
+  "Return non-nil if TAG is to be considered for folding.
+TAG has to have valid start and end locations in the
+buffer.  Customize variable `semantic-tag-folding-allow-folding-of' to
+influence the output of this function."
+  (let ((c (semantic-tag-class tag)))
+    (and
+     (semantic-tag-with-position-p tag)
+     (or (semantic-tag-folding-allow-folding-of 'comment)
+	 (semantic-tag-folding-allow-folding-of c))
+     ;; we only want the first include from a block of includes
+     (or (not (eq c 'include))
+         (not (semantic-find-tag-by-overlay-prev (semantic-tag-start tag)))
+         (not (eq (semantic-tag-class
+		   (semantic-find-tag-by-overlay-prev (semantic-tag-start tag))) 'include)))
+     )))
+
+(defun semantic-tag-folding-highlight-default (tag)
+  "Create decoration overlays for TAG.
+Also put a marker in the fringe for each thing that can be
+collapsed."
+  (when (semantic-tag-buffer tag)
+    (with-current-buffer (semantic-tag-buffer tag)
+      (let ((point (point))
+            (tag-start (semantic-tag-start tag))
+            (tag-end (semantic-tag-end tag)))
+        ;; fold the comment preceding this tag
+        (if (semantic-tag-folding-allow-folding-of 'comment)
+            (let ((start (progn
+                           (goto-char tag-start)
+                           (when (forward-comment -1)
+                             (do ((ret (point-at-eol) (point-at-eol)))
+                                 ( ;; until we see an empty line, or there are
+                                  ;; no more comments, or we reach the
+                                  ;; beginning of the buffer
+                                  (or (re-search-backward "\n\n" (- (point) 2) t)
+                                      (not (forward-comment -1))
+                                      (bobp))
+                                  ;; return
+                                  ret)))))
+                  (end (progn
+                         (goto-char tag-start)
+                         (- (point-at-bol) 1))))
+              (semantic-tag-folding-create-folding-overlays tag start end point t)))
+        ;; Fold the body of this tag.
+        ;; If folding comments is enabled all tags are passed into this
+        ;; function, so we need to check if folding is enabled for this
+        ;; tag type
+        (if (or (not (semantic-tag-folding-allow-folding-of 'comment)) (semantic-tag-folding-allow-folding-of (semantic-tag-class tag)))
+            (let ((start (progn
+                           (goto-char tag-start)
+                           (point-at-eol)))
+                  (end (if (eq (semantic-tag-class tag) 'include)
+                           (progn
+                             (let ((tag-cursor tag) (last-tag-cursor tag))
+                               (while (eq (semantic-tag-class tag-cursor) 'include)
+                                 (setq last-tag-cursor tag-cursor)
+                                 (setq tag-cursor (semantic-find-tag-by-overlay-next (semantic-tag-end tag-cursor))))
+                               (semantic-tag-end last-tag-cursor)))
+                         tag-end)))
+              (semantic-tag-folding-create-folding-overlays tag start end point nil)))
+        (goto-char point)))))
+
+
+(defun semantic-tag-folding-get-attribute-overlay (tag create-if-null)
+  "Get the overlay used to store the fold state for TAG.
+Create the overlay if CREATE-IF-NULL is non-nil."
+  (let* ((pos (semantic-tag-start tag))
+        (ov (car (remove-if-not
+                 (lambda (ov)
+                   (semantic-overlay-get ov 'semantic-tag-folding-attributes))
+                 (semantic-overlays-at pos)))))
+    (when (and create-if-null (null ov))
+      (setq ov (semantic-make-overlay (- pos 1) (+ 1 pos)))
+      (semantic-overlay-put ov 'semantic-tag-folding-attributes t))
+    ov))
+
+(defun semantic-tag-folding-get-folding-attribute (comment)
+  "Return the symbol used to store the fold state.
+The symbol returned is for a tag (COMMENT is nil) or the comment
+preceeding a tag (COMMENT is non-nil)"
+  (if comment
+      'semantic-tag-folding-comment
+    'semantic-tag-folding-tag))
+
+(defun semantic-tag-folding-get-fold-state (tag comment)
+  "Return the fold state for TAG.
+If COMMENT is non-nil return the fold state for the comment preceeding TAG."
+  (let* ((attr (semantic-tag-folding-get-folding-attribute comment))
+         (ov (semantic-tag-folding-get-attribute-overlay tag nil)))
+    (and ov (semantic-overlay-get ov attr))))
+
+(defun semantic-tag-folding-set-fold-state (tag comment state)
+  "Set the fold state for TAG to STATE.
+If COMMENT is non-nil set the fold state for the comment preceeding TAG."
+  (let* ((attr (semantic-tag-folding-get-folding-attribute comment))
+         (ov (semantic-tag-folding-get-attribute-overlay tag t)))
+    (semantic-overlay-put ov attr state)))
+
+
+(defun semantic-tag-folding-create-folding-overlays (tag start end point comment)
+"Create an overlay for `semantic-tag-overlay'.
+Create an overlay associated TAG.  START and END are buffer
+positions, usually inside TAG, but can be outside for comment and
+include block overlays.  POINT is the saved location of point,
+this is used to unfold any TAGS around point by default.  COMMENT
+is non-nil if the fold region is a comment."
+  (let ((fold (if (functionp semantic-tag-folding-function)
+                  (apply semantic-tag-folding-function (list tag comment))
+                semantic-tag-folding-function)))
+    (when (and start end (< start end) (> (count-lines start end) 1))
+      (let* ((ov (semantic-decorate-tag tag start end))
+             (start2 (if comment
+                         (save-excursion
+                           (goto-char start)
+                           (backward-char)
+                           (point-at-bol))
+                       (semantic-tag-start tag)))
+             (ov2 (semantic-decorate-tag tag start2 (+ start2 1)))
+             (marker-string "+"))
+        (semantic-overlay-put ov 'semantic-tag-folding t)
+        (semantic-overlay-put ov 'isearch-open-invisible
+		     'semantic-tag-folding-show-block)
+
+        ;; check for fold state attributes
+        (if (functionp semantic-tag-folding-function)
+            (let ((state (semantic-tag-folding-get-fold-state tag comment)))
+              (if state
+                  (setq fold (eq state 'fold)))))
+
+        ;; don't fold this region if point is inside it
+        (if (and (> end point) (< start point))
+            (setq fold nil))
+
+        (if (not fold)
+            ;; just display the unfolded bitmap in the fringe
+            (setq marker-string (propertize
+				 marker-string 'display
+				 '((left-fringe semantic-tag-folding-unfolded)
+				   "-")))
+          ;; fold the body and display a + in the fringe
+          (semantic-overlay-put ov 'invisible 'semantic-tag-fold)
+          (setq marker-string (propertize
+			       marker-string
+			       'display
+			       '((left-fringe semantic-tag-folding-folded)
+				 "+" ))))
+        
+        ;; store the marker string and tag as a property of the
+        ;; overlay so we use it to change the displayed fold state
+        ;; later (in semantic-tag-folding-set-overlay-visibility)
+        (semantic-overlay-put ov 'semantic-tag-folding-marker-string marker-string)
+        (semantic-overlay-put ov 'semantic-tag-folding-tag tag)
+        (semantic-overlay-put ov 'semantic-tag-folding-comment-overlay comment)
+
+        (semantic-overlay-put ov2 'before-string marker-string)
+        
+        ;; store fold state as a function of the tag (unless the default state is being set)
+        (unless (functionp semantic-tag-folding-function)
+          (semantic-tag-folding-set-fold-state tag comment fold))
+
+        ;; tooltips
+        (when semantic-tag-folding-show-tooltips
+          (semantic-overlay-put ov2 'mouse-face 'highlight)
+          (semantic-overlay-put ov2 'help-echo (buffer-substring (+ 1 start) end)))))))
+
+(defun semantic-tag-folding-fold-block ()
+  "Fold the smallest enclosing tag at point."
+  (interactive)
+ (semantic-tag-folding-set-overlay-visibility
+  (semantic-tag-folding-get-overlay) t))
+
+(defun semantic-tag-folding-show-block (&optional ov)
+  "Unfold overlay OV, or the smallest enclosing tag at point."
+  (interactive)
+  (semantic-tag-folding-set-overlay-visibility
+   (or ov (semantic-tag-folding-get-overlay)) nil))
+
+(defun semantic-tag-folding-show-all ()
+  "Unfold all the tags in this buffer."
+  (interactive)
+    (semantic-tag-folding-fold-or-show-tags
+     (semantic-fetch-available-tags) nil))
+
+(defun semantic-tag-folding-fold-all ()
+  "Fold all the tags in this buffer."
+  (interactive)
+    (semantic-tag-folding-fold-or-show-tags
+     (semantic-fetch-available-tags) t))
+
+(defun semantic-tag-folding-show-children ()
+  "Unfold all the tags in this buffer."
+  (interactive)
+  (semantic-tag-folding-fold-or-show-tags
+   (cons (semantic-current-tag)
+	 (semantic-tag-components (semantic-current-tag)))
+   nil))
+
+(defun semantic-tag-folding-fold-children ()
+  "Unfold all the tags in this buffer."
+  (interactive)
+  (semantic-tag-folding-fold-or-show-tags
+   (cons (semantic-current-tag)
+	 (semantic-tag-components (semantic-current-tag)))
+   t))
+
+(defun semantic-tag-folding-fold-or-show-tags (tags fold)
+"Change the fold state of TAGS to FOLD."
+  (lexical-let ((fold fold))
+    (when semantic-decoration-mode
+      (semantic-decorate-clear-decorations tags)
+      (let ((semantic-tag-folding-function fold))
+        (semantic-decorate-add-decorations tags)))))
+
+(defun semantic-tag-folding-get-overlay ()
+  "Return the innermost semantic-tag-folding-folding overlay at point."
+  (labels ((semantic-overlay-size (ov)
+             (- (semantic-overlay-end ov) (semantic-overlay-start ov))))
+    (car
+     (sort
+      (remove-if-not (lambda (ov) (semantic-overlay-get ov 'semantic-tag-folding))
+                     (semantic-overlays-at (point-at-eol)))
+      (lambda (x y)
+        (< (semantic-overlay-size x) (semantic-overlay-size y)))))))
+
+(defun semantic-tag-folding-set-overlay-visibility (ov fold &optional called-by-reveal-mode)
+  "Change the visibility of overlay OV.
+If FOLD is non-nil OV is hidden.  Also changes the fringe bitmap
+to indcate the new state.  CALLED-BY-REVEAL-MODE is t when this
+overlay is folded or expanded by reveal mode."
+  (when (and (semantic-overlay-p ov)
+             ;; if reveal mode is hiding an overlay, it should've been folded by reveal mode
+             (or (not called-by-reveal-mode) (not fold) (semantic-overlay-get ov 'semantic-tag-reveal-mode)))
+    (semantic-overlay-put ov 'invisible (if fold 'semantic-tag-fold))
+    (let ((tag (semantic-overlay-get ov 'semantic-tag-folding-tag)))
+      
+      (when tag
+        (semantic-tag-folding-set-fold-state tag (semantic-overlay-get ov 'semantic-tag-folding-comment-overlay) (if fold 'fold 'show))
+        (if fold
+            (put-text-property 0 1 'display '((left-fringe semantic-tag-folding-folded) "+")
+                               (semantic-overlay-get ov 'semantic-tag-folding-marker-string))
+          ;; show
+          (put-text-property 0 1 'display '((left-fringe semantic-tag-folding-unfolded) "-")
+                             (semantic-overlay-get ov 'semantic-tag-folding-marker-string))
+          (semantic-overlay-put ov 'semantic-tag-reveal-mode called-by-reveal-mode)
+          (semantic-tag-folding-highlight-overlay ov))))))
+
+;; set the function to be called when regions are revealed and hidden by reveal-mode.
+(put  'semantic-tag-fold 'reveal-toggle-invisible 'semantic-tag-folding-set-overlay-visibility-for-reveal-mode)
+
+(defun semantic-tag-folding-set-overlay-visibility-for-reveal-mode (ov fold)
+"Fold/unfold function called from reveal mode.
+OV is the overlay whose state must change, FOLD is non-nil to fold the overlay."
+  (let ((semantic-tag-folding-tag-higlight-time
+         (if semantic-tag-folding-highlight-tags-shown-by-reveal-mode
+             semantic-tag-folding-tag-higlight-time
+           nil)))
+    (semantic-tag-folding-set-overlay-visibility ov fold t)))
+
+(defun semantic-tag-folding-highlight-overlay (ov)
+  "Temporarily draw attention to the overlay OV.
+This is done by drawing a vertical bar in the fringe for the
+lines that OV extends over for
+`semantic-tag-folding-tag-higlight-time' seconds."
+  (when semantic-tag-folding-tag-higlight-time
+    (let ((overlays nil))
+      (labels ((make-fringe (fringe string)
+                 (setq overlays (cons (semantic-make-overlay (point-at-bol) (+ 1(point-at-bol))) overlays) )
+                 (semantic-overlay-put (car overlays) 'before-string
+                              (propertize string 'display `(left-fringe ,fringe)))))
+        (save-excursion
+          (goto-char (semantic-overlay-start ov))
+          (make-fringe 'semantic-tag-folding-highlight-top "+")
+          (forward-line)
+          (while (< (point-at-eol) (semantic-overlay-end ov))
+            (make-fringe 'semantic-tag-folding-highlight-middle "|")
+            (forward-line))
+          (make-fringe 'semantic-tag-folding-highlight-bottom "+"))
+        (sit-for semantic-tag-folding-tag-higlight-time)
+        (mapc 'semantic-overlay-delete overlays)))))
+
+(defun semantic-tag-folding-click (event)
+  "Handle fringe click EVENT by folding/unfolding blocks."
+    (interactive "e")
+    (when (event-start event)
+      (let* ((start (event-start event))
+            (point (posn-point start))
+            (window (posn-window start)))
+        (select-window window)
+        (goto-char point)
+        (let ((bitmaps (fringe-bitmaps-at-pos point)))
+          (if (member 'semantic-tag-folding-folded bitmaps)
+              (semantic-tag-folding-set-overlay-visibility (semantic-tag-folding-get-overlay) nil))
+          (if (member 'semantic-tag-folding-unfolded bitmaps)
+              (semantic-tag-folding-set-overlay-visibility (semantic-tag-folding-get-overlay) t))))))
+
+(provide 'semantic-tag-folding)
+;;; semantic-tag-folding.el ends here
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/contrib/wisent-csharp-wy.el b/site/cedet-1.0pre7/contrib/wisent-csharp-wy.el
new file mode 100644
index 0000000..57b9449
Binary files /dev/null and b/site/cedet-1.0pre7/contrib/wisent-csharp-wy.el differ
diff --git a/site/cedet-1.0pre7/contrib/wisent-csharp.el b/site/cedet-1.0pre7/contrib/wisent-csharp.el
new file mode 100644
index 0000000..b46f654
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-csharp.el
@@ -0,0 +1,374 @@
+;;; wisent-csharp.el --- LALR grammar for C#
+;;
+;; Copyright (C) 2003, 2007 David Shilvock
+;; Some Changes Copyright (C) 2006 Eric M. Ludlam
+
+;; Time-stamp: <2003-12-08 19:11:48 dave>
+;;
+;; Author: David Shilvock <davels@telus.net>
+;; Maintainer: David Shilvock <davels@telus.net>
+;; Created: November 2003
+;; Keywords: syntax
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file contains the csharp parser created from the grammar
+;; specified in wisent-csharp.wy file.  It also has some support code.
+;; A bunch of this is ripped from wisent-java-tags.el (David Ponce)
+;;
+;;; Code:
+
+(require 'semantic-wisent)
+(require 'semantic-format)
+(require 'semantic-ctxt)
+(require 'wisent-csharp-wy)
+
+
+;;;----------------------------------------------------------------------
+;;; * Lexer/Parser Support Code
+;;;----------------------------------------------------------------------
+
+(defconst wysent-csharp-number-re
+  (eval-when-compile
+    (concat "\\("
+            "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][fFdD]\\>"
+            "\\|"
+            "\\<[0-9]+[.]"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+            "\\|"
+            "\\<[0-9]+[lLfFdD]?\\>"
+            "\\)"
+            ))
+  "Lexer regexp to match Java number terminals.
+Following is the specification of Java number literals.
+
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;")
+
+(defconst wisent-csharp-string-re "@?['\"]"
+  "Regexp matching beginning of a csharp string.")
+  
+(defun wisent-csharp-expand-tag (tag)
+  "Expand TAG into a list of equivalent tags, or nil.
+Expand multiple variable declarations in the same statement, that is
+tags of class `variable' whose name is equal to a list of elements of
+the form (NAME DEFAULT START . END).  NAME is a variable name.  DEFAULT is the
+variable default value.  START and END are the bounds in the declaration,
+related to this variable NAME."
+  (let (elts elt clone def start end xpand)
+    (when (and (eq 'variable (semantic-tag-class tag))
+               (consp (setq elts (semantic-tag-name tag))))
+      ;; There are multiple names in the same variable declaration.
+      (while elts
+        ;; For each name element, clone the initial tag and give it
+        ;; the name of the element.
+        (setq elt   (car elts)
+              elts  (cdr elts)
+              clone (semantic-tag-clone tag (car elt))
+              def   (if elt  (nth 1 elt)  nil)
+              start (if elts  (car (nth 2 elt)) (semantic-tag-start tag))
+              end   (if xpand (cdr (nth 2 elt)) (semantic-tag-end   tag))
+              xpand (cons clone xpand))
+        ;; Set the bounds of the cloned tag with those of the name
+        ;; element.
+        (semantic-tag-set-bounds clone start end)
+        ;; i don't think this is doing the right thing
+        (if def
+            (semantic-tag-put-attribute clone :default-value def))
+        )
+      xpand)))
+
+;;;----------------------------------------------------------------------
+;;; * Semantic Support Code
+;;;----------------------------------------------------------------------
+
+;; types - special formatting for ref/out parameters
+(define-mode-overload-implementation semantic-format-tag-type
+  csharp-mode (tag color)
+  ""
+  (let ((text (semantic-format-tag-type-default tag color))
+        (mods (semantic-tag-get-attribute tag 'typemodifiers)))
+    (concat text (or (and (member "ref" mods) "&")
+                     (and (member "out" mods) "*")))))
+
+;; special formatting for certain csharp tags
+(define-mode-overload-implementation semantic-format-tag-uml-prototype
+  csharp-mode (tag &optional parent color)
+  ""
+  (let ((property-p (semantic-tag-get-attribute tag 'property))
+        (accessors (semantic-tag-get-attribute tag 'accessors)))
+    (cond
+     ;; properties: protection propname {get,set}: type
+     ((and property-p accessors)
+      (let ((name (semantic-format-tag-name tag parent color))
+            (type (semantic--format-tag-uml-type tag color))
+            (prot (semantic-format-tag-uml-protection tag parent color))
+            (accesstext nil)
+            (text nil))
+        (setq accesstext
+              (concat " {"
+                      (mapconcat
+                       #'(lambda (tag)
+                           (semantic--format-colorize-text
+                            (semantic-tag-name tag) 'function))
+                       accessors ",")
+                      "}"))
+        (setq text (concat prot name accesstext type))
+        (if color
+            (setq text (semantic--format-uml-post-colorize text tag parent)))
+        text))
+     ;; rest - default format
+     (t
+      (semantic-format-tag-uml-prototype-default tag parent color)))))
+
+;; symbols modifiers that equate to abstract
+(define-mode-overload-implementation semantic-tag-abstract
+  csharp-mode (tag &optional parent)
+  "Return non nil if TAG is abstract."
+  (let ((mods (semantic-tag-modifiers tag))
+        (abs nil))
+    (while (and (not abs) mods)
+      (if (stringp (car mods))
+          (setq abs (or (string= (car mods) "abstract")
+                        (string= (car mods) "virtual")
+                        (string= (car mods) "override"))))
+      (setq mods (cdr mods)))
+    abs))
+
+(defvar wisent-csharp-internal-is-protected-p t
+  "Says whether to show tags with internal protection as protected.
+If non-nil any tags marked internal will be displayed as if they were
+protected.")
+
+;; map tag protection string to symbol
+(define-mode-overload-implementation semantic-tag-protection
+  csharp-mode (tag &optional parent)
+  ""
+  (let ((mods (semantic-tag-modifiers tag))
+        (prot nil))
+    (while (and (not prot) mods)
+      (if (stringp (car mods))
+          (let ((s (car mods)))
+            (setq prot
+                  ;; A few silly defaults to get things started.
+                  (cond ((string= s "public")
+                         'public)
+                        ((string= s "private")
+                         'private)
+                        ((string= s "protected")
+                         'protected)
+                        ((string= s "internal")
+                         (if wisent-csharp-internal-is-protected-p
+                             'protected 'internal))))))
+      (setq mods (cdr mods)))
+    prot))
+
+
+;; override semantic-format-uml-protection-to-string to return "%" for 'internal
+
+;; add to semantic-format-tag-protection-image-alist for 'internal
+
+
+;; Local context
+(define-mode-overload-implementation semantic-get-local-variables
+  csharp-mode ()
+  "Get local values from a specific context.
+Parse the current context for `local_variable_declaration' nonterminals to
+collect tags, such as local variables or prototypes.
+This function overrides `get-local-variables'."
+  (let ((vars nil)
+        ;; We want nothing to do with funny syntaxing while doing this.
+        (semantic-unmatched-syntax-hook nil)
+        (origp (point))
+        start end)
+    (save-excursion
+      (while (not (semantic-up-context (point) 'function))
+        (save-excursion
+          (forward-char 1)
+          (setq start (point)
+                end (min (progn (semantic-end-of-context) (point)) origp))
+          (setq vars
+                (append (semantic-parse-region
+                         start end
+                         ;;'field_declaration
+                         'local_variable_declaration
+                         0 t)
+                        vars))))
+    vars)))
+
+
+;;;----------------------------------------------------------------------
+;;; * Lexer
+;;;----------------------------------------------------------------------
+
+(define-lex-regex-analyzer wisent-csharp-lex-ignore-region
+  "Ignore # type macros for C sharp."
+  "^\\s-*#region\\>"
+  (goto-char (match-end 0))
+  (forward-word 1)
+  (setq semantic-lex-end-point (point))
+  nil)
+
+(define-lex-regex-analyzer wisent-csharp-lex-ignore-endregion
+  "Ignore # type macros for C sharp."
+  "^\\s-*#endregion\\>"
+  (setq semantic-lex-end-point (match-end 0))
+  nil)
+
+(define-lex-analyzer wisent-csharp-lex-string
+  "Detect and create a string token for csharp strings."
+  (looking-at wisent-csharp-string-re)
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'STRING_LITERAL (point)
+    (save-excursion
+      (semantic-lex-unterminated-syntax-protection 'STRING_LITERAL
+        ;; skip over "@" character if any
+        (goto-char (1- (match-end 0)))
+        (forward-sexp 1)
+        (point))))))
+
+(define-lex-simple-regex-analyzer wisent-csharp-lex-number
+  "Detect and create number tokens."
+  semantic-lex-number-expression 'NUMBER_LITERAL)
+
+(define-lex-regex-analyzer wisent-csharp-lex-symbol
+  "Detect and create identifier or keyword tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  (semantic-lex-push-token
+   (semantic-lex-token
+    (or (semantic-lex-keyword-p (match-string 0))
+        'IDENTIFIER)
+    (match-beginning 0)
+    (match-end 0))))
+
+(define-lex-block-analyzer wisent-csharp-lex-blocks
+  "Detect and create a open, close or block token."
+  (PAREN_BLOCK ("(" LPAREN) (")" RPAREN))
+  (BRACE_BLOCK ("{" LBRACE) ("}" RBRACE))
+  (BRACK_BLOCK ("[" LBRACK) ("]" RBRACK))
+  )
+
+(define-lex wisent-csharp-lexer
+  "Lexical analyzer for csharp code.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  wisent-csharp-lex-ignore-region
+  wisent-csharp-lex-ignore-endregion
+  wisent-csharp-lex-number
+  wisent-csharp-lex-string
+  wisent-csharp-lex-symbol
+  semantic-lex-punctuation-type
+  wisent-csharp-lex-blocks
+  semantic-lex-default-action)
+
+  
+;;;----------------------------------------------------------------------
+;;; * Parser
+;;;----------------------------------------------------------------------
+
+;;;###autoload   
+(defun wisent-csharp-default-setup ()
+  (wisent-csharp-wy--install-parser)
+  (setq
+   ;; Lexical analysis
+   semantic-lex-number-expression wysent-csharp-number-re
+   semantic-lex-analyzer #'wisent-csharp-lexer
+   ;; Parsing
+   semantic-tag-expand-function 'wisent-csharp-expand-tag
+   ;; Environment
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ";"
+   ;; Imenu setup
+   semantic-imenu-summary-function 'semantic-format-tag-uml-prototype
+   imenu-create-index-function 'semantic-create-imenu-index
+   ;; speedbar and imenu bucket names
+   ;; .. in type parts
+   semantic-symbol->name-assoc-list-for-type-parts
+   '((type     . "Types")
+     (variable . "Variables")
+     (function . "Methods"))
+   ;; .. everywhere
+   semantic-symbol->name-assoc-list
+   (append semantic-symbol->name-assoc-list-for-type-parts
+           '((include  . "Using")))
+   ;; navigation inside 'type children
+   senator-step-at-tag-classes '(function variable)
+   ))
+
+;;;###autoload   
+(add-hook 'csharp-mode-hook #'wisent-csharp-default-setup)
+
+
+;;;----------------------------------------------------------------------
+;;; * Test
+;;;----------------------------------------------------------------------
+
+(defun wisent-csharp-lex-buffer (&optional arg)
+  "Run `wisent-csharp-lexer' on current buffer."
+  (interactive "P")
+  (semantic-lex-init)
+  (setq semantic-lex-analyzer 'wisent-csharp-lexer)
+  (let ((token-stream
+         (semantic-lex (point-min) (point-max)
+                       (if arg (prefix-numeric-value arg)))))
+    (with-current-buffer
+        (get-buffer-create "*wisent-csharp-lexer*")
+      (erase-buffer)
+      (pp token-stream (current-buffer))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+
+(provide 'wisent-csharp)
+
+;;; wisent-csharp.el ends here
diff --git a/site/cedet-1.0pre7/contrib/wisent-csharp.wy b/site/cedet-1.0pre7/contrib/wisent-csharp.wy
new file mode 100644
index 0000000..c9c8bfc
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-csharp.wy
@@ -0,0 +1,1257 @@
+;;; wisent-csharp.wy -- LALR grammar for C#
+;;
+;; Copyright (C) 2003 David Shilvock
+;; Time-stamp: <2003-12-08 19:11:48 dave>
+;;
+;; Author: David Shilvock <davels@telus.net>
+;; Maintainer: David Shilvock <davels@telus.net>
+;; Created: November 2003
+;; Keywords: syntax
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a LALR parser for the C# language.  It tries to follow the C#
+;; language definition as closely as possible, but in some cases allows syntax
+;; that the compiler would reject.
+;; A bunch of this is ripped from wisent-java-tags.wy (David Ponce)
+
+;;-----------
+;; * Settings
+;;-----------
+
+;;%package wisent-csharp-wy
+
+%languagemode  csharp-mode
+
+;; The default start symbol
+%start compilation_unit
+;; Alternate entry points -  for partial re-parse
+%start using_directive
+%start namespace_declaration
+%start class_declaration
+%start const_declaration
+%start field_declaration
+%start constructor_declaration
+%start method_declaration
+%start property_declaration
+%start indexer_declaration
+%start event_declaration
+%start fixed_parameter
+%start interface_declaration
+%start delegate_declaration
+;; - Needed by EXPANDFULL clauses
+%start namespace_member_declaration
+%start class_member_declaration
+%start struct_member_declaration
+%start interface_member_declaration
+%start accessor_declaration
+%start event_accessor_declaration
+%start formal_parameters
+%start indexer_parameters
+%start enum_members
+;; - Need for semantic-get-local-variables
+%start local_variable_declaration
+%start local_foreach_declaration
+
+;;------------------------
+;; * Parenthesis terminals
+;;------------------------
+%token <open-paren>  LPAREN           "("
+%token <close-paren> RPAREN           ")"
+%token <open-paren>  LBRACE           "{"
+%token <close-paren> RBRACE           "}"
+%token <open-paren>  LBRACK           "["
+%token <close-paren> RBRACK           "]"
+
+;;------------------
+;; * Block terminals
+;;------------------
+%token <semantic-list> PAREN_BLOCK     "^("
+%token <semantic-list> BRACE_BLOCK     "^{"
+%token <semantic-list> BRACK_BLOCK     "^\\["
+
+;;---------------------
+;; * Operator terminals
+;;---------------------
+%token <punctuation> NOT              "!"
+%token <punctuation> NOTEQ            "!="
+%token <punctuation> MOD              "%"
+%token <punctuation> MODEQ            "%="
+%token <punctuation> AND              "&"
+%token <punctuation> ANDAND           "&&"
+%token <punctuation> ANDEQ            "&="
+%token <punctuation> MULT             "*"
+%token <punctuation> MULTEQ           "*="
+%token <punctuation> PLUS             "+"
+%token <punctuation> PLUSPLUS         "++"
+%token <punctuation> PLUSEQ           "+="
+%token <punctuation> COMMA            ","
+%token <punctuation> MINUS            "-"
+%token <punctuation> MINUSMINUS       "--"
+%token <punctuation> MINUSEQ          "-="
+%token <punctuation> DOT              "."
+%token <punctuation> DIV              "/"
+%token <punctuation> DIVEQ            "/="
+%token <punctuation> COLON            ":"
+%token <punctuation> SEMICOLON        ";"
+%token <punctuation> DEREF            "->"
+%token <punctuation> LT               "<"
+%token <punctuation> LSHIFT           "<<"
+%token <punctuation> LSHIFTEQ         "<<="
+%token <punctuation> LTEQ             "<="
+%token <punctuation> EQ               "="
+%token <punctuation> EQEQ             "=="
+%token <punctuation> GT               ">"
+%token <punctuation> GTEQ             ">="
+%token <punctuation> RSHIFT           ">>"
+%token <punctuation> RSHIFTEQ         ">>="
+%token <punctuation> QUESTION         "?"
+%token <punctuation> XOR              "^"
+%token <punctuation> XOREQ            "^="
+%token <punctuation> OR               "|"
+%token <punctuation> OREQ             "|="
+%token <punctuation> OROR             "||"
+%token <punctuation> COMP             "~"
+
+;;--------------------
+;; * Literal terminals
+;;--------------------
+%token <symbol>      NULL_LITERAL     "null"
+%token <symbol>      BOOLEAN_LITERAL  "false"
+%token <symbol>      BOOLEAN_LITERAL  "true"
+%token <symbol>      IDENTIFIER
+%token <string>      STRING_LITERAL
+%token <number>      NUMBER_LITERAL
+
+;;--------------------
+;; * Keyword terminals
+;;--------------------
+%token ABSTRACT     "abstract"
+%put ABSTRACT summary
+"Class|Method declaration modifier: abstract {class|<type>} <name> ..."
+
+%token ADD          "add"
+%put ADD summary
+""
+
+%token AS           "as"
+%put AS summary
+""
+
+%token BASE         "base"
+%put BASE summary
+""
+
+%token BOOL         "bool"
+%put BOOL summary
+"Primitive logical quantity type (true or false)"
+
+%token BREAK        "break"
+%put BREAK summary
+"break [<label>] ;"
+
+%token BYTE         "byte"
+%put BYTE summary
+"Integral primitive type (-128 to 127)"
+
+%token CASE         "case"
+%put CASE summary
+"switch(<expr>) {case <const-expr>: <stmts> ... }"
+
+%token CATCH        "catch"
+%put CATCH summary
+"try {<stmts>} catch(<parm>) {<stmts>} ... "
+
+%token CHAR         "char"
+%put CHAR summary
+"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+
+%token CHECKED      "checked"
+%put CHECKED summary
+""
+
+%token CLASS        "class"
+%put CLASS summary
+"Class declaration: class <name>"
+
+%token CONST        "const"
+%put CONST summary
+"Unused reserved word"
+
+%token CONTINUE     "continue"
+%put CONTINUE summary
+"continue [<label>] ;"
+
+%token DECIMAL      "decimal"
+%put DECIMAL summary
+""
+
+%token DEFAULT      "default"
+%put DEFAULT summary
+"switch(<expr>) { ... default: <stmts>}"
+
+%token DELEGATE     "delegate"
+%put DELEGATE summary
+""
+
+%token DO           "do"
+%put DO summary
+"do <stmt> while (<expr>);"
+
+%token DOUBLE       "double"
+%put DOUBLE summary
+"Primitive floating-point type (double-precision 64-bit IEEE 754)"
+
+%token ELSE         "else"
+%put ELSE summary
+"if (<expr>) <stmt> else <stmt>"
+
+%token ENUM         "enum"
+%put ENUM summary
+""
+
+%token EVENT        "event"
+%put EVENT summary
+""
+
+%token EXPLICIT     "explicit"
+%put EXPLICIT summary
+""
+
+%token EXTERN       "extern"
+%put EXTERN summary
+""
+
+%token FINALLY      "finally"
+%put FINALLY summary
+"try {<stmts>} ... finally {<stmts>}"
+
+%token FIXED        "fixed"
+%put FIXED summary
+""
+
+%token FLOAT        "float"
+%put FLOAT summary
+"Primitive floating-point type (single-precision 32-bit IEEE 754)"
+
+%token FOR          "for"
+%put FOR summary
+"for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>"
+
+%token FOREACH      "foreach"
+%put FOREACH summary
+""
+
+%token GET          "get"
+%put GET summary
+""
+
+%token GOTO         "goto"
+%put GOTO summary
+"Unused reserved word"
+
+%token IF           "if"
+%put IF summary
+"if (<expr>) <stmt> [else <stmt>]"
+
+%token IMPLICIT     "implicit"
+%put IMPLICIT summary
+""
+
+%token IN           "in"
+%put IN summary
+""
+
+%token INT          "int"
+%put INT summary
+"Integral primitive type (-2147483648 to 2147483647)"
+
+%token INTERFACE    "interface"
+%put INTERFACE summary
+"Interface declaration: interface <name>"
+
+%token INTERNAL     "internal"
+%put INTERNAL summary
+""
+
+%token IS           "is"
+%put IS summary
+""
+
+%token LOCK         "lock"
+%put LOCK summary
+""
+
+%token LONG         "long"
+%put LONG summary
+"Integral primitive type (-9223372036854775808 to 9223372036854775807)"
+
+%token NAMESPACE    "namespace"
+%put NAMESPACE summary
+""
+
+%token NEW          "new"
+
+%token OBJECT       "object"
+%put OBJECT summary
+""
+
+%token OPERATOR     "operator"
+%put OPERATOR summary
+""
+
+%token OUT          "out"
+%put OUT summary
+""
+
+%token OVERRIDE     "override"
+%put OVERRIDE summary
+""
+
+%token PARAMS       "params"
+%put PARAMS summary
+""
+
+%token PRIVATE      "private"
+%put PRIVATE summary
+"Access level modifier: private {class|interface|<type>} <name> ..."
+
+%token PROTECTED    "protected"
+%put PROTECTED summary
+"Access level modifier: protected {class|interface|<type>} <name> ..."
+
+%token PUBLIC       "public"
+%put PUBLIC summary
+"Access level modifier: public {class|interface|<type>} <name> ..."
+
+%token READONLY     "readonly"
+%put READONLY summary
+""
+
+%token REF          "ref"
+%put REF summary
+""
+
+%token REMOVE       "remove"
+%put REMOVE summary
+""
+
+%token RETURN       "return"
+%put RETURN summary
+"return [<expr>] ;"
+
+%token SBYTE        "sbyte"
+%put SBYTE summary
+""
+
+%token SEALED       "sealed"
+%put SEALED summary
+""
+
+%token SET          "set"
+%put SET summary
+""
+
+%token SHORT        "short"
+%put SHORT summary
+"Integral primitive type (-32768 to 32767)"
+
+%token SIZEOF       "sizeof"
+%put SIZEOF summary
+""
+
+%token STACKALLOC   "stackalloc"
+%put STACKALLOC summary
+""
+
+%token STATIC       "static"
+%put STATIC summary
+"Declaration modifier: static {class|interface|<type>} <name> ..."
+
+%token STRING       "string"
+%put STRING summary
+""
+
+%token STRUCT       "struct"
+%put STRUCT summary
+""
+
+%token SWITCH       "switch"
+%put SWITCH summary
+"switch(<expr>) {[case <const-expr>: <stmts> ...] [default: <stmts>]}"
+
+%token THIS         "this"
+
+%token THROW        "throw"
+%put THROW summary
+"throw <expr> ;"
+
+%token TRY          "try"
+%put TRY summary
+"try {<stmts>} [catch(<parm>) {<stmts>} ...] [finally {<stmts>}]"
+
+%token TYPEOF       "typeof"
+%put TYPEOF summary
+""
+
+%token UINT         "unit"
+%put UINT summary
+""
+
+%token ULONG        "ulong"
+%put ULONG summary
+""
+
+%token UNCHECKED    "unchecked"
+%put UNCHECKED summary
+""
+
+%token UNSAFE       "unsafe"
+%put UNSAFE summary
+""
+
+%token USHORT       "ushort"
+%put USHORT summary
+""
+
+%token USING        "using"
+%put USING summary
+"Namespace import: using <name> | using <identifier> = <name>;"
+
+%token VIRTUAL      "virtual"
+%put VIRTUAL summary
+""
+
+%token VOID         "void"
+%put VOID summary
+"Method return type: void <name> ..."
+
+%token VOLATILE     "volatile"
+%put VOLATILE summary
+"Field declaration modifier: volatile <type> <name> ..."
+
+%token WHILE        "while"
+%put WHILE summary
+"while (<expr>) <stmt> | do <stmt> while (<expr>);"
+
+%%
+
+;;---------------
+;; * LALR Grammar
+;;---------------
+
+;;--------------------------------------------------
+;; ** Types and Names
+;;--------------------------------------------------
+
+literal
+  : NULL_LITERAL
+  | BOOLEAN_LITERAL
+  | STRING_LITERAL
+  | NUMBER_LITERAL
+  ;
+
+integral_type
+  : SBYTE
+  | BYTE
+  | SHORT
+  | USHORT
+  | INT
+  | UINT
+  | LONG
+  | ULONG
+  | CHAR 
+  ;
+
+predefined_type
+  : BOOL 
+  | BYTE 
+  | CHAR
+  | DECIMAL
+  | DOUBLE
+  | FLOAT
+  | INT
+  | LONG
+  | OBJECT
+  | SBYTE
+  | SHORT
+  | STRING
+  | UINT
+  | ULONG
+  | USHORT
+  ;
+
+type
+  : qualified_name rank_specifiers_opt
+    (concat $1 $2)
+  | predefined_type rank_specifiers_opt
+    (concat $1 $2)
+  ;
+
+array_type
+  : qualified_name rank_specifiers
+    (concat $1 $2)
+  | predefined_type rank_specifiers
+    (concat $1 $2)
+  ;
+
+rank_specifiers_opt
+  : ;; EMPTY
+    (identity "")
+  | rank_specifiers
+  ;
+
+rank_specifiers
+  : rank_specifiers BRACK_BLOCK
+    (concat $1 "[]")
+  | BRACK_BLOCK
+    (identity "[]")
+  ;
+
+qualified_name
+  : qualified_name DOT IDENTIFIER
+    (concat $1 "." $3)
+  | IDENTIFIER
+  ;
+
+qualified_name_list
+  : qualified_name_list COMMA qualified_name
+    (cons $3 $1)
+  | qualified_name
+    (list $1)
+  ;
+
+;;--------------------------------------------------
+;; ** Expressions
+;;--------------------------------------------------
+
+argument_list_opt
+  : ;; EMPTY
+  | argument_list
+  ;
+
+argument_list
+  : argument_list COMMA argument
+  | argument
+  ;
+
+argument
+  : REF expression
+  | OUT expression
+  | expression
+  ;
+
+;; just eat expressions
+expression
+  : expression term
+  | term
+  ;
+
+constant_expression
+  : expression
+  ;
+
+term
+  : literal
+  | operator
+  | predefined_type
+  | IDENTIFIER
+  | BRACK_BLOCK
+  | PAREN_BLOCK
+  | BRACE_BLOCK
+  | NEW
+  | CLASS
+  | THIS
+  | BASE
+  ;
+
+operator
+  : NOT
+  | PLUS
+  | PLUSPLUS
+  | MINUS
+  | MINUSMINUS
+  | NOTEQ
+  | MOD
+  | MODEQ
+  | AND
+  | ANDAND
+  | ANDEQ
+  | MULT
+  | MULTEQ
+  | PLUSEQ
+  | MINUSEQ
+  | DOT
+  | DIV
+  | DIVEQ
+  | COLON
+  | LT
+  | LSHIFT
+  | LSHIFTEQ
+  | LTEQ
+  | EQ
+  | EQEQ
+  | GT
+  | GTEQ
+  | RSHIFT
+  | RSHIFTEQ
+  | QUESTION
+  | XOR
+  | XOREQ
+  | OR
+  | OREQ
+  | OROR
+  | COMP
+  | IS
+  | AS
+  ;
+
+;;--------------------------------------------------
+;; ** top level rules
+;;--------------------------------------------------
+
+compilation_unit
+  : using_directive
+  | namespace_declaration
+  | type_declaration
+  ;
+
+;; alias or namespace using directive
+using_directive
+  : USING IDENTIFIER EQ qualified_name SEMICOLON
+    (INCLUDE-TAG $4 nil 'alias $2)
+  | USING qualified_name SEMICOLON
+    (INCLUDE-TAG $2 nil)
+  ;
+
+namespace_declaration
+  : NAMESPACE qualified_name namespace_body
+    (TYPE-TAG $2 $1 $3 nil)
+  ;
+
+namespace_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 namespace_member_declaration)
+  ;
+
+namespace_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | using_directive
+  | namespace_declaration
+  | type_declaration
+  ;
+
+type_declaration
+  : SEMICOLON
+    ()
+  | class_declaration
+  | struct_declaration
+  | interface_declaration
+  | enum_declaration
+  | delegate_declaration
+  ;
+
+;;--------------------------------------------------
+;; ** Classes
+;;--------------------------------------------------
+
+modifiers_opt
+  : ;; EMPTY
+  | modifiers
+    (nreverse $1)
+  ;
+
+modifiers
+  : modifiers modifier
+    (cons $2 $1)
+  | modifier
+    (list $1)
+  ;
+
+modifier
+  : NEW
+  | PUBLIC
+  | PROTECTED
+  | INTERNAL
+  | PRIVATE
+  | ABSTRACT
+  | SEALED
+  | STATIC
+  | READONLY
+  | VOLATILE
+  | VIRTUAL
+  | OVERRIDE
+  | EXTERN
+  | IMPLICIT
+  | EXPLICIT
+  ;
+
+class_bases_opt
+  : ;; EMPTY
+  | COLON qualified_name
+    (cons $2 nil)
+  | COLON qualified_name COMMA qualified_name_list
+    (cons $2 (nreverse $4))
+  ;
+
+interfaces_opt
+  : ;; EMPTY
+  | COLON qualified_name_list
+    (nreverse $2)
+  ;
+
+class_declaration
+  : attrs_opt modifiers_opt CLASS IDENTIFIER class_bases_opt class_body
+    (TYPE-TAG $4 $3 $6 $5 'typemodifiers $2)
+  ;
+
+class_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 class_member_declaration)
+  ;
+
+class_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | const_declaration
+  | field_declaration
+  | method_declaration
+  | property_declaration
+  | event_declaration
+  | indexer_declaration
+  | operator_declaration
+  | constructor_declaration
+ ;;x | destructor_declaration
+  | static_constructor_declaration
+  | type_declaration
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Const
+;;--------------------------------------------------
+
+const_declaration
+  : attrs_opt modifiers_opt CONST type const_declarators SEMICOLON
+    (VARIABLE-TAG $5 $4 nil 'const t 'typemodifiers $2)
+  ;
+
+const_declarators
+  : const_declarators COMMA const_declarator
+    (cons $3 $1)
+  | const_declarator
+    (list $1)
+  ;
+
+const_declarator
+  : IDENTIFIER EQ constant_expression
+    (list $1 $3 $region)
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Field
+;;--------------------------------------------------
+
+field_declaration
+  : attrs_opt modifiers_opt type variable_declarators SEMICOLON
+    (VARIABLE-TAG $4 $3 nil 'typemodifiers $2)
+  ;
+
+variable_declarators
+  : variable_declarators COMMA variable_declarator
+    (cons $3 $1)
+  | variable_declarator
+    (list $1)
+  ;
+
+variable_declarator
+  : IDENTIFIER EQ variable_initializer
+    (list $1 nil $region)
+  | IDENTIFIER
+    (list $1 nil $region)
+  ;
+
+variable_initializer
+  : expression
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Method
+;;--------------------------------------------------
+
+method_declaration
+  : attrs_opt modifiers_opt VOID method_declarator method_body
+    (FUNCTION-TAG (car $4) $3 (cdr $4) 'typemodifiers $2)
+  | attrs_opt modifiers_opt type method_declarator method_body
+    (FUNCTION-TAG (car $4) $3 (cdr $4) 'typemodifiers $2)
+  ;
+
+method_declarator
+  : qualified_name formal_parameter_list
+    (cons $1 $2)
+  ;
+
+method_body
+  : SEMICOLON
+  | block
+  ;
+
+formal_parameter_list
+  : PAREN_BLOCK
+    (EXPANDFULL $1 formal_parameters)
+  ;
+
+formal_parameters
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | fixed_parameter COMMA
+  | fixed_parameter RPAREN
+  | parameter_array RPAREN
+  ;
+
+parameter_modifier_opt
+  : ;; EMPTY
+  | REF
+  | OUT
+  ;
+
+fixed_parameter
+  : attrs_opt parameter_modifier_opt type IDENTIFIER
+    (VARIABLE-TAG $4 $3 nil 'typemodifiers (if $2 (list $2)))
+  ;
+
+parameter_array
+  : attrs_opt PARAMS array_type IDENTIFIER
+    (VARIABLE-TAG $4 $3 nil 'typemodifiers (if $2 (list $2)))
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Property
+;;--------------------------------------------------
+
+property_declaration
+  : attrs_opt modifiers_opt type qualified_name accessor_list
+    (VARIABLE-TAG $4 $3 nil 'typemodifiers $2 'property t 'accessors $5)
+  ;
+
+accessor_list
+  : BRACE_BLOCK
+    (EXPANDFULL $1 accessor_declaration)
+  ;
+
+accessor_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | get_accessor_declaration
+  | set_accessor_declaration
+  ;
+
+get_accessor_declaration
+  : attrs_opt GET block
+    (FUNCTION-TAG $2 nil nil)
+  | attrs_opt GET SEMICOLON
+    (FUNCTION-TAG $2 nil nil 'typemodifiers (list "abstract"))
+  ;
+
+set_accessor_declaration
+  : attrs_opt SET block
+    (FUNCTION-TAG $2 nil nil)
+  | attrs_opt SET SEMICOLON
+    (FUNCTION-TAG $2 nil nil 'typemodifiers (list "abstract"))
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Event
+;;--------------------------------------------------
+
+event_declaration
+  : attrs_opt modifiers_opt EVENT type variable_declarators SEMICOLON
+    (VARIABLE-TAG $5 $4 nil 'typemodifiers (cons "event" $2))
+  | attrs_opt modifiers_opt EVENT type qualified_name event_accessor_list
+    (FUNCTION-TAG $5 $4 nil 'typemodifiers (cons "event" $2)) 
+  ;
+
+event_accessor_list
+  : BRACE_BLOCK
+    (EXPANDFULL $1 event_accessor_declaration)
+  ;
+
+event_accessor_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | add_accessor_declaration
+  | remove_accessor_declaration
+  ;
+
+add_accessor_declaration
+  : attrs_opt ADD block
+    (identity $2)
+  | attrs_opt ADD SEMICOLON
+    (identity $2)
+  ;
+
+remove_accessor_declaration
+  : attrs_opt REMOVE block
+    (identity $2)
+  | attrs_opt REMOVE SEMICOLON
+    (identity $2)
+  ;
+    
+;;--------------------------------------------------
+;; *** Class body declarations: Indexer
+;;--------------------------------------------------
+
+indexer_declaration
+  : attrs_opt modifiers_opt type indexer_declarator accessor_list
+    (FUNCTION-TAG (car $4) $3 (cdr $4) 'typemodifiers $2 'accessors $5)
+  ;
+
+indexer_declarator
+  : THIS indexer_parameter_list
+    (cons "this[]" $2)
+  | qualified_name DOT THIS indexer_parameter_list
+    (cons (concat $1 ".this[]") $4)
+  ;
+
+indexer_parameter_list
+  : BRACK_BLOCK
+    (EXPANDFULL $1 indexer_parameters)
+  ;
+
+indexer_parameters
+  : LBRACK
+    ()
+  | RBRACK
+    ()
+  | fixed_parameter COMMA
+  | fixed_parameter RBRACK
+  | parameter_array RBRACK
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Operator
+;;--------------------------------------------------
+
+overloadable_operator
+  : PLUS
+  | MINUS
+  | COMP
+  | PLUSPLUS
+  | MINUSMINUS
+  | BOOLEAN_LITERAL
+  | MULT
+  | DIV
+  | MOD
+  | AND
+  | OR
+  | XOR
+  | LSHIFT
+  | RSHIFT
+  | EQEQ
+  | NOTEQ
+  | GT
+  | LT
+  | GTEQ
+  | LTEQ
+  ;
+
+operator_declaration
+  : attrs_opt modifiers_opt operator_declarator block
+    (FUNCTION-TAG (concat "op" (nth 0 $3)) (nth 1 $3) (nth 2 $3) 'typemodifiers $2)
+  ;
+
+operator_declarator ;; (name type arglist)
+ ;; operator overload
+  : type OPERATOR overloadable_operator formal_parameter_list
+    (list $3 $1 $4) 
+ ;; conversion operators
+  | OPERATOR type formal_parameter_list
+    (list (concat "(" $2 ")") $2 $3)
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Constructor
+;;--------------------------------------------------
+
+constructor_declaration
+  : attrs_opt modifiers_opt constructor_declarator block
+    (FUNCTION-TAG (car $3) nil (cdr $3) 'typemodifiers $2)
+  ;
+
+constructor_declarator
+  : IDENTIFIER formal_parameter_list constructor_initializer_opt
+    (cons $1 $2)
+  ;
+
+constructor_initializer_opt
+  : ;; EMTPY
+  | COLON BASE LPAREN argument_list_opt RPAREN
+  | COLON THIS LPAREN argument_list_opt RPAREN
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Static Constructor
+;;--------------------------------------------------
+
+static_constructor_declaration
+  : attrs_opt modifiers_opt IDENTIFIER LPAREN RPAREN block
+    (FUNCTION-TAG $3 nil nil 'typemodifiers $2)
+  ;
+
+;;--------------------------------------------------
+;; *** Class body declarations: Destructor
+;;--------------------------------------------------
+
+extern_opt
+  : ;; EMPTY
+  | EXTERN
+  ;
+
+destructor_declaration
+  : attrs_opt extern_opt COMP IDENTIFIER LPAREN RPAREN block
+    (FUNCTION-TAG (concat $3 $4) nil nil 'typemodifiers $2)
+  ;
+
+;;--------------------------------------------------
+;; ** Structs
+;;--------------------------------------------------
+
+struct_declaration
+  : attrs_opt modifiers_opt STRUCT IDENTIFIER interfaces_opt struct_body
+    (TYPE-TAG $4 $3 $6 (if $5 (cons nil $5)) 'typemodifiers $2)
+  ;
+
+struct_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 struct_member_declaration)
+  ;
+
+struct_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | const_declaration
+  | field_declaration
+  | method_declaration
+  | property_declaration
+  | event_declaration
+  | indexer_declaration
+  | operator_declaration
+  | constructor_declaration
+  | static_constructor_declaration
+  | type_declaration
+  ;
+
+;;--------------------------------------------------
+;; ** Interfaces
+;;--------------------------------------------------
+
+interface_declaration
+  : attrs_opt modifiers_opt INTERFACE IDENTIFIER interfaces_opt interface_body
+    (TYPE-TAG $4 $3 $6 (if $5 (cons nil $5)) 'typemodifiers $2)
+  ;
+
+interface_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 interface_member_declaration)
+  ;
+
+interface_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | interface_method_declaration
+  | interface_property_declaration
+  | interface_event_declaration
+  | interface_indexer_declaration
+  ;
+
+new_opt
+  : ;; EMPTY
+  | NEW
+  ;
+
+interface_method_declaration
+  : attrs_opt new_opt type IDENTIFIER formal_parameter_list SEMICOLON
+    (FUNCTION-TAG $4 $3 $5 'typemodifiers $2)
+  | attrs_opt new_opt VOID IDENTIFIER formal_parameter_list SEMICOLON
+    (FUNCTION-TAG $4 $3 $5 'typemodifiers $2)
+  ;
+
+interface_property_declaration
+  : attrs_opt new_opt type IDENTIFIER accessor_list
+    (VARIABLE-TAG $4 $3 nil 'typemodifiers (if $2 (list $2)) 'property t 'accessors $5)
+  ;
+
+interface_event_declaration
+  : attrs_opt new_opt EVENT type IDENTIFIER SEMICOLON
+    (FUNCTION-TAG $5 $4 nil 'typemodifiers (if $2 (list $2 $3) (list $3)))
+  ;
+
+interface_indexer_declaration
+  : attrs_opt new_opt type THIS indexer_parameter_list accessor_list
+    (FUNCTION-TAG "this[]" $3 $5 'typemodifiers $2 'accessors $6)
+  ;
+
+;;--------------------------------------------------
+;; ** Enums
+;;--------------------------------------------------
+
+enum_declaration
+  : attrs_opt modifiers_opt ENUM IDENTIFIER COLON integral_type enum_body
+    (TYPE-TAG $4 $3 $7 (cons $6 nil) 'typemodifiers $2)
+  | attrs_opt modifiers_opt ENUM IDENTIFIER enum_body
+    (TYPE-TAG $4 $3 $5 nil 'typemodifiers $2)
+  ;
+
+enum_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 enum_members)
+  ;
+
+enum_members
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | enum_member_declaration COMMA
+  | enum_member_declaration RBRACE
+  ;
+
+enum_member_declaration
+  : attrs_opt IDENTIFIER
+    (VARIABLE-TAG $2 nil nil 'const t)
+  | attrs_opt IDENTIFIER EQ constant_expression
+    (VARIABLE-TAG $2 nil $4 'const t)
+  ;
+
+;;--------------------------------------------------
+;; ** Delegates
+;;--------------------------------------------------
+
+;; XXX need a way to set type+formal_parameter_list as the sole type member
+delegate_declaration
+  : attrs_opt modifiers_opt DELEGATE type IDENTIFIER formal_parameter_list SEMICOLON
+    (TYPE-TAG $5 $3 nil nil 'typemodifiers $2)
+  | attrs_opt modifiers_opt DELEGATE VOID IDENTIFIER formal_parameter_list SEMICOLON
+    (TYPE-TAG $5 $3 nil nil 'typemodifiers $2)
+  ;
+
+;;--------------------------------------------------
+;; ** Attributes
+;;--------------------------------------------------
+
+attrs_opt
+  : ;; EMPTY
+  | attr_sections
+    (apply 'nconc (nreverse $1))
+  ;
+
+attr_sections
+  : attr_sections attr_section
+    (cons $2 $1)
+  | attr_section
+    (list $1)
+  ;
+
+;; just eat them for now
+attr_section
+  : BRACK_BLOCK
+    ()
+  ;
+
+;; attr_target_specifier_opt
+;;   : ;; EMPTY
+;;   | IDENTIFIER COLON
+;;   ;
+
+;; attr_list
+;;   : COMMA
+;;     ()
+;;   | attr_list COMMA attr
+;;     (cons $3 $1)
+;;   | attr
+;;     (list $1)
+;;   ;
+
+;; attr
+;;   : qualified_name attr_arguments_opt
+;;     (identity $1)
+;;   ;
+
+;; attr_arguments_opt
+;;   : ;; EMPTY
+;;   | LPAREN error
+;;  ;; we won't bother parsing the attribute arguments
+;;     (wisent-skip-block)
+;;   ;
+
+;;--------------------------------------------------
+;; * Others
+;;--------------------------------------------------
+
+;; this exists only for use by semantic-get-local-variables
+;; (still not sure about this)
+local_variable_declaration
+  : type variable_declarators SEMICOLON
+    (VARIABLE-TAG $2 $1 nil)
+  | CONST type const_declarators SEMICOLON
+    (VARIABLE-TAG $3 $2 nil 'const t)
+ ;; this could include out of scope variables,
+ ;; but it's used to much that I think it's worth it
+  | FOREACH PAREN_BLOCK
+    (EXPANDFULL $2 local_foreach_declaration) 
+  ;
+
+local_foreach_declaration
+  : LPAREN type IDENTIFIER IN expression RPAREN
+    (VARIABLE-TAG $3 $2 nil)
+  ;
+
+;; just eat {...} blocks
+block
+  : BRACE_BLOCK
+  ;
+
+
+;;; wisent-csharp.wy ends here
+
diff --git a/site/cedet-1.0pre7/contrib/wisent-php-wy.el b/site/cedet-1.0pre7/contrib/wisent-php-wy.el
new file mode 100644
index 0000000..4aab63d
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-php-wy.el
@@ -0,0 +1,841 @@
+;;; wisent-php-wy.el --- Generated parser support file
+
+;; Copyright (C) 2008 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:51:01-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-php.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-php-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("exit" . T_EXIT)
+     ("die" . T_EXIT)
+     ("function" . T_FUNCTION)
+     ("const" . T_CONST)
+     ("return" . T_RETURN)
+     ("try" . T_TRY)
+     ("catch" . T_CATCH)
+     ("throw" . T_THROW)
+     ("if" . T_IF)
+     ("elseif" . T_ELSEIF)
+     ("endif" . T_ENDIF)
+     ("else" . T_ELSE)
+     ("while" . T_WHILE)
+     ("endwhile" . T_ENDWHILE)
+     ("do" . T_DO)
+     ("for" . T_FOR)
+     ("endfor" . T_ENDFOR)
+     ("foreach" . T_FOREACH)
+     ("endforeach" . T_ENDFOREACH)
+     ("declare" . T_DECLARE)
+     ("enddeclare" . T_ENDDECLARE)
+     ("instanceof" . T_INSTANCEOF)
+     ("int" . INT)
+     ("as" . T_AS)
+     ("switch" . T_SWITCH)
+     ("endswitch" . T_ENDSWITCH)
+     ("case" . T_CASE)
+     ("default" . T_DEFAULT)
+     ("break" . T_BREAK)
+     ("continue" . T_CONTINUE)
+     ("echo" . T_ECHO)
+     ("print" . T_PRINT)
+     ("class" . T_CLASS)
+     ("interface" . T_INTERFACE)
+     ("extends" . T_EXTENDS)
+     ("implements" . T_IMPLEMENTS)
+     ("new" . T_NEW)
+     ("package" . PACKAGE)
+     ("clone" . T_CLONE)
+     ("var" . T_VAR)
+     ("eval" . T_EVAL)
+     ("include" . T_INCLUDE)
+     ("include_once" . T_INCLUDE_ONCE)
+     ("require" . T_REQUIRE)
+     ("require_once" . T_REQUIRE_ONCE)
+     ("use" . T_USE)
+     ("global" . T_GLOBAL)
+     ("isset" . T_ISSET)
+     ("empty" . T_EMPTY)
+     ("__halt_compiler" . T_HALT_COMPILER)
+     ("static" . T_STATIC)
+     ("abstract" . T_ABSTRACT)
+     ("final" . T_FINAL)
+     ("private" . T_PRIVATE)
+     ("protected" . T_PROTECTED)
+     ("public" . T_PUBLIC)
+     ("unset" . T_UNSET)
+     ("list" . T_LIST)
+     ("array" . T_ARRAY)
+     ("or" . T_LOGICAL_OR)
+     ("and" . T_LOGICAL_AND)
+     ("xor" . T_LOGICAL_XOR)
+     ("__CLASS__" . T_CLASS_C)
+     ("__FUNCTION__" . T_FUNC_C)
+     ("__METHOD__" . T_METHOD_C)
+     ("__LINE__" . T_LINE)
+     ("__FILE__" . T_FILE)
+     ("@author" . _AUTHOR)
+     ("@version" . _VERSION)
+     ("@param" . _PARAM)
+     ("@return" . _RETURN)
+     ("@exception" . _EXCEPTION)
+     ("@throws" . _THROWS)
+     ("@see" . _SEE)
+     ("@since" . _SINCE)
+     ("@serial" . _SERIAL)
+     ("@serialData" . _SERIALDATA)
+     ("@serialField" . _SERIALFIELD)
+     ("@deprecated" . _DEPRECATED))
+   '(("@deprecated" phpdoc
+      (seq 12 usage
+	   (type function variable)
+	   opt t))
+     ("@serialField" phpdoc
+      (seq 11 usage
+	   (variable)
+	   opt t))
+     ("@serialData" phpdoc
+      (seq 10 usage
+	   (function)
+	   opt t))
+     ("@serial" phpdoc
+      (seq 9 usage
+	   (variable)
+	   opt t))
+     ("@since" phpdoc
+      (seq 8 usage
+	   (type function variable)
+	   opt t))
+     ("@see" phpdoc
+      (seq 7 usage
+	   (type function variable)
+	   opt t with-ref t))
+     ("@throws" phpdoc
+      (seq 6 usage
+	   (function)
+	   with-name t))
+     ("@exception" phpdoc
+      (seq 5 usage
+	   (function)
+	   with-name t))
+     ("@return" phpdoc
+      (seq 4 usage
+	   (function)))
+     ("@param" phpdoc
+      (seq 3 usage
+	   (function)
+	   with-name t))
+     ("@version" phpdoc
+      (seq 2 usage
+	   (type)))
+     ("@author" phpdoc
+      (seq 1 usage
+	   (type)))
+     ("public" summary "Access level modifier: public {class|interface|<type>} <name> ...")
+     ("protected" summary "Access level modifier: protected {class|interface|<type>} <name> ...")
+     ("private" summary "Access level modifier: private {class|interface|<type>} <name> ...")
+     ("final" summary "Class|Member declaration modifier: final {class|<type>} <name> ...")
+     ("abstract" summary "Class|Method declaration modifier: abstract {class|<type>} <name> ...")
+     ("static" summary "Declaration modifier: static {class|interface|<type>} <name> ...")
+     ("implements" summary "Class SuperInterfaces declaration: implements <name> [, ...]")
+     ("extends" summary "SuperClass|SuperInterfaces declaration: extends <name> [, ...]")
+     ("interface" summary "Interface declaration: interface <name>")
+     ("class" summary "Class declaration: class <name>")
+     ("continue" summary "continue [<label>] ;")
+     ("break" summary "break [<label>] ;")
+     ("default" summary "switch(<expr>) { ... default: <stmts>}")
+     ("case" summary "switch(<expr>) {case <const-expr>: <stmts> ... }")
+     ("for" summary "for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>")
+     ("do" summary "do <stmt> while (<expr>);")
+     ("while" summary "while (<expr>) <stmt> | do <stmt> while (<expr>);")
+     ("else" summary "if (<expr>) <stmt> else <stmt>")
+     ("if" summary "if (<expr>) <stmt> [else <stmt>]")
+     ("catch" summary "try {<stmts>} catch(<parm>) {<stmts>} ... ")
+     ("try" summary "try {<stmts>} [catch(<parm>) {<stmts>} ...] [finally {<stmts>}]")
+     ("return" summary "return [<expr>] ;")
+     ("const" summary "Unused reserved word")))
+  "Table of language keywords.")
+
+(defconst wisent-php-wy--token-table
+  (semantic-lex-make-type-table
+   '(("<no-type>"
+      (T_IF)
+      (T_EXIT))
+     ("code"
+      (EPILOGUE)
+      (PROLOGUE))
+     ("number"
+      (NUMBER_LITERAL))
+     ("string"
+      (STRING_LITERAL))
+     ("symbol"
+      (IDENTIFIER))
+     ("punctuation"
+      (T_DOLLER . "$")
+      (T_ASTERISK . "@")
+      (T_COMP . "~")
+      (T_OR . "|")
+      (T_XOR . "^")
+      (T_QUESTION . "?")
+      (T_URSHIFTEQ . ">>>=")
+      (T_URSHIFT . ">>>")
+      (T_GT . ">")
+      (T_EQ . "=")
+      (T_LT . "<")
+      (T_SEMI . ";")
+      (T_COLON . ":")
+      (T_DIV . "/")
+      (T_DOT . ".")
+      (T_MINUS . "-")
+      (T_COMMA . ",")
+      (T_PLUS . "+")
+      (T_MULT . "*")
+      (T_AND . "&")
+      (T_MOD . "%")
+      (T_NOT . "!")
+      (T_HEREDOC . "<<<")
+      (T_DOUBLE_ARROW . "=>")
+      (T_SR . ">>")
+      (T_SL . "<<")
+      (T_BOOLEAN_AND . "&&")
+      (T_BOOLEAN_OR . "||")
+      (T_XOR_EQUAL . "^=")
+      (T_OR_EQUAL . "|=")
+      (T_AND_EQUAL . "&=")
+      (T_SR_EQUAL . ">>=")
+      (T_SL_EQUAL . "<<=")
+      (T_MOD_EQUAL . "%=")
+      (T_CONCAT_EQUAL . ".=")
+      (T_DIV_EQUAL . "/=")
+      (T_MUL_EQUAL . "*=")
+      (T_MINUS_EQUAL . "-=")
+      (T_PLUS_EQUAL . "+=")
+      (T_IS_GREATER_OR_EQUAL . ">=")
+      (T_IS_SMALLER_OR_EQUAL . "<=")
+      (T_IS_NOT_EQUAL . "<>")
+      (T_IS_NOT_EQUAL . "!=")
+      (T_IS_EQUAL . "==")
+      (T_IS_NOT_IDENTICAL . "!==")
+      (T_IS_IDENTICAL . "===")
+      (T_DEC . "--")
+      (T_INC . "++")
+      (T_PAAMAYIM_NEKUDOTAYIM . "::")
+      (T_DEREF . "->"))
+     ("close-paren"
+      (RBRACK . "]")
+      (RBRACE . "}")
+      (RPAREN . ")"))
+     ("open-paren"
+      (LBRACK . "[")
+      (LBRACE . "{")
+      (LPAREN . "("))
+     ("block"
+      (BRACK_BLOCK . "(LBRACK RBRACK)")
+      (BRACE_BLOCK . "(LBRACE RBRACE)")
+      (PAREN_BLOCK . "(LPAREN RPAREN)")))
+   '(("keyword" :declared t)
+     ("code" :declared t)
+     ("number" :declared t)
+     ("string" :declared t)
+     ("symbol" :declared t)
+     ("punctuation" :declared t)
+     ("block" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst wisent-php-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((PAREN_BLOCK BRACE_BLOCK BRACK_BLOCK LPAREN RPAREN LBRACE RBRACE LBRACK RBRACK T_DEREF T_PAAMAYIM_NEKUDOTAYIM T_INC T_DEC T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_IS_EQUAL T_IS_NOT_EQUAL T_IS_SMALLER_OR_EQUAL T_IS_GREATER_OR_EQUAL T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_SL_EQUAL T_SR_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_BOOLEAN_OR T_BOOLEAN_AND T_SL T_SR T_DOUBLE_ARROW T_HEREDOC T_NOT T_MOD T_AND T_MULT T_PLUS T_COMMA T_MINUS T_DOT T_DIV T_COLON T_SEMI T_LT T_EQ T_GT T_URSHIFT T_URSHIFTEQ T_QUESTION T_XOR T_OR T_COMP T_ASTERISK T_DOLLER IDENTIFIER STRING_LITERAL NUMBER_LITERAL PROLOGUE EPILOGUE T_EXIT T_FUNCTION T_CONST T_RETURN T_TRY T_CATCH T_THROW T_IF T_ELSEIF T_ENDIF T_ELSE T_WHILE T_ENDWHILE T_DO T_FOR T_ENDFOR T_FOREACH T_ENDFOREACH T_DECLARE T_ENDDECLARE T_INSTANCEOF INT T_AS T_SWITCH T_ENDSWITCH T_CASE T_DEFAULT T_BREAK T_CONTINUE T_ECHO T_PRINT T_CLASS T_INTERFACE T_EXTENDS T_IMPLEMENTS T_NEW PACKAGE T_CLONE T_VAR T_EVAL T_INCLUDE T_INCLUDE_ONCE T_REQUIRE T_REQUIRE_ONCE T_USE T_GLOBAL T_ISSET T_EMPTY T_HALT_COMPILER T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC T_UNSET T_LIST T_ARRAY T_LOGICAL_OR T_LOGICAL_AND T_LOGICAL_XOR T_CLASS_C T_FUNC_C T_METHOD_C T_LINE T_FILE _AUTHOR _VERSION _PARAM _RETURN _EXCEPTION _THROWS _SEE _SINCE _SERIAL _SERIALDATA _SERIALFIELD _DEPRECATED)
+       ((left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE)
+	(left T_COMMA)
+	(left T_LOGICAL_OR)
+	(left T_LOGICAL_XOR)
+	(left T_LOGICAL_AND)
+	(right T_PRINT)
+	(left T_EQ T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL)
+	(left T_QUESTION T_COLON)
+	(left T_BOOLEAN_OR)
+	(left T_BOOLEAN_AND)
+	(left T_OR)
+	(left T_XOR)
+	(left T_AND)
+	(nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL)
+	(nonassoc T_LT T_IS_SMALLER_OR_EQUAL 62 T_IS_GREATER_OR_EQUAL)
+	(left T_SL T_SR)
+	(left T_PLUS T_MINUS T_DOT)
+	(left T_MULT T_DIV T_MOD)
+	(right T_NOT)
+	(nonassoc T_INSTANCEOF)
+	(right T_COMP T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST T_ASTERISK)
+	(right LBRACK)
+	(nonassoc T_NEW T_CLONE)
+	(left T_ELSEIF)
+	(left T_ELSE)
+	(left T_ENDIF))
+       (start
+	((PROLOGUE compilation_units EPILOGUE)
+	 (identity $2))
+	((PROLOGUE compilation_units)
+	 (identity $2)))
+       (compilation_units
+	(nil)
+	((compilation_unit compilation_units)
+	 (if $2
+	     (append $2
+		     (wisent-cook-tag $1))
+	   (wisent-cook-tag $1))))
+       (compilation_unit
+	((include_declaration))
+	((type_declaration)))
+       (include_declaration
+	((T_USE require_expr T_SEMI)
+	 (identity $2))
+	((T_REQUIRE require_expr T_SEMI)
+	 (identity $2))
+	((T_REQUIRE_ONCE require_expr T_SEMI)
+	 (identity $2))
+	((T_INCLUDE require_expr T_SEMI)
+	 (identity $2))
+	((T_INCLUDE_ONCE require_expr T_SEMI)
+	 (identity $2)))
+       (require_expr
+	((STRING_LITERAL)
+	 (wisent-raw-tag
+	  (semantic-tag-new-include $1 nil)))
+	((PAREN_BLOCK)
+	 (wisent-raw-tag
+	  (semantic-tag-new-include $1 nil))))
+       (type_declaration
+	((function_declaration))
+	((class_declaration))
+	((interface_declaration)))
+       (class_declaration
+	((class_modifiers_opt T_CLASS IDENTIFIER superc_opt interfaces_opt class_body)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $3 $2 $6
+				 (if
+				     (or $4 $5)
+				     (cons $4 $5))
+				 :typemodifiers $1))))
+       (superc_opt
+	(nil)
+	((T_EXTENDS IDENTIFIER)
+	 (identity $2)))
+       (interfaces_opt
+	(nil)
+	((T_IMPLEMENTS identifier_list)
+	 (nreverse $2)))
+       (class_body
+	((BRACE_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'class_member_declaration 1)))
+       (class_member_declaration
+	((LBRACE)
+	 nil)
+	((RBRACE)
+	 nil)
+	((block)
+	 nil)
+	((interface_declaration))
+	((class_declaration))
+	((method_declaration))
+	((field_declaration)))
+       (interface_declaration
+	((class_modifiers_opt T_INTERFACE IDENTIFIER extends_interfaces_opt interface_body)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $3 $2 $5
+				 (if $4
+				     (cons nil $4))
+				 :typemodifiers $1))))
+       (extends_interfaces_opt
+	(nil)
+	((T_EXTENDS identifier_list)
+	 (identity $2)))
+       (interface_body
+	((BRACE_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'interface_member_declaration 1)))
+       (interface_member_declaration
+	((LBRACE)
+	 nil)
+	((RBRACE)
+	 nil)
+	((interface_declaration))
+	((class_declaration))
+	((method_declaration))
+	((field_declaration)))
+       (function_declaration
+	((method_declarator method_body)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function
+	   (car $1)
+	   nil
+	   (cdr $1)))))
+       (method_declaration
+	((method_modifiers_opt method_declarator method_body)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function
+	   (car $2)
+	   nil
+	   (cdr $2)
+	   :typemodifiers $1))))
+       (method_declarator
+	((T_FUNCTION reference_opt IDENTIFIER formal_parameter_list)
+	 (cons $3 $4)))
+       (identifier_list
+	((identifier_list T_COMMA IDENTIFIER)
+	 (cons $3 $1))
+	((IDENTIFIER)
+	 (list $1)))
+       (method_body
+	((T_SEMI))
+	((block)))
+       (block
+	   ((BRACE_BLOCK)))
+       (formal_parameter_list
+	((PAREN_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'formal_parameters 1)))
+       (formal_parameters
+	((LPAREN)
+	 nil)
+	((RPAREN)
+	 nil)
+	((formal_parameter T_COMMA))
+	((formal_parameter RPAREN)))
+       (formal_parameter
+	((variable_declarator_id T_EQ expression)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil $region3)))
+	((variable_declarator_id)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil))))
+       (field_declaration
+	((field_modifiers_opt variable_declarators T_SEMI)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil nil :typemodifiers $1))))
+       (variable_declarators
+	((variable_declarators T_COMMA variable_declarator)
+	 (cons $3 $1))
+	((variable_declarator)
+	 (list $1)))
+       (variable_declarator
+	((variable_declarator_id T_EQ variable_initializer)
+	 (list $1 nil nil $3))
+	((variable_declarator_id)
+	 (list $1)))
+       (variable_declarator_id
+	((reference_opt IDENTIFIER dims_opt)
+	 (concat $2 $3)))
+       (reference_opt
+	(nil)
+	((T_AND)))
+       (variable_initializer
+	((expression)))
+       (expression
+	((expression term))
+	((term)))
+       (term
+	((literal))
+	((operator))
+	((IDENTIFIER))
+	((BRACK_BLOCK))
+	((PAREN_BLOCK))
+	((BRACE_BLOCK))
+	((T_NEW))
+	((T_CLONE))
+	((T_ARRAY)))
+       (literal
+	((STRING_LITERAL))
+	((NUMBER_LITERAL)))
+       (operator
+	((T_DEREF))
+	((T_PAAMAYIM_NEKUDOTAYIM))
+	((T_INC))
+	((T_DEC))
+	((T_IS_IDENTICAL))
+	((T_IS_NOT_IDENTICAL))
+	((T_IS_EQUAL))
+	((T_IS_NOT_EQUAL))
+	((T_IS_NOT_EQUAL))
+	((T_IS_SMALLER_OR_EQUAL))
+	((T_IS_GREATER_OR_EQUAL))
+	((T_PLUS_EQUAL))
+	((T_MINUS_EQUAL))
+	((T_MUL_EQUAL))
+	((T_DIV_EQUAL))
+	((T_CONCAT_EQUAL))
+	((T_MOD_EQUAL))
+	((T_SL_EQUAL))
+	((T_SR_EQUAL))
+	((T_AND_EQUAL))
+	((T_OR_EQUAL))
+	((T_XOR_EQUAL))
+	((T_BOOLEAN_OR))
+	((T_BOOLEAN_AND))
+	((T_SL))
+	((T_SR))
+	((T_DOUBLE_ARROW))
+	((T_HEREDOC))
+	((T_NOT))
+	((T_MOD))
+	((T_AND))
+	((T_MULT))
+	((T_PLUS))
+	((T_COMMA))
+	((T_MINUS))
+	((T_DOT))
+	((T_DIV))
+	((T_COLON))
+	((T_LT))
+	((T_EQ))
+	((T_GT))
+	((T_URSHIFT))
+	((T_URSHIFTEQ))
+	((T_QUESTION))
+	((T_XOR))
+	((T_OR))
+	((T_COMP))
+	((T_ASTERISK))
+	((T_LIST))
+	((T_ARRAY))
+	((T_LOGICAL_OR))
+	((T_LOGICAL_AND))
+	((T_LOGICAL_XOR)))
+       (class_modifiers_opt
+	(nil)
+	((class_modifiers)
+	 (nreverse $1)))
+       (class_modifiers
+	((class_modifiers class_modifier)
+	 (cons $2 $1))
+	((class_modifier)
+	 (list $1)))
+       (class_modifier
+	((T_FINAL))
+	((T_ABSTRACT)))
+       (method_modifiers_opt
+	(nil)
+	((method_modifiers)
+	 (nreverse $1)))
+       (method_modifiers
+	((method_modifiers method_modifier)
+	 (cons $2 $1))
+	((method_modifier)
+	 (list $1)))
+       (method_modifier
+	((T_FINAL))
+	((T_ABSTRACT))
+	((T_STATIC))
+	((T_PRIVATE))
+	((T_PROTECTED))
+	((T_PUBLIC)))
+       (field_modifiers_opt
+	(nil)
+	((field_modifiers)
+	 (nreverse $1)))
+       (field_modifiers
+	((field_modifiers field_modifier)
+	 (cons $2 $1))
+	((field_modifier)
+	 (list $1)))
+       (field_modifier
+	((method_modifier))
+	((T_VAR)))
+       (dims_opt
+	(nil
+	 (identity ""))
+	((dims)))
+       (dims
+	((dims BRACK_BLOCK)
+	 (concat $1 "[]"))
+	((BRACK_BLOCK)
+	 (identity "[]"))))
+     '(start compilation_units compilation_unit include_declaration require_expr type_declaration class_declaration class_body class_member_declaration interface_declaration interface_body interface_member_declaration method_declaration method_declarator identifier_list method_body block formal_parameter_list formal_parameters formal_parameter field_declaration variable_declarators variable_declarator variable_declarator_id variable_initializer class_modifiers class_modifier method_modifiers method_modifier field_modifiers field_modifier)))
+  "Parser table.")
+
+(defun wisent-php-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-php-wy--parse-table
+	semantic-debug-parser-source "wisent-php.wy"
+	semantic-flex-keywords-obarray wisent-php-wy--keyword-table
+	semantic-lex-types-obarray wisent-php-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-keyword-type-analyzer wisent-php-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-block-type-analyzer wisent-php-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" LPAREN PAREN_BLOCK)
+     ("{" LBRACE BRACE_BLOCK)
+     ("[" LBRACK BRACK_BLOCK))
+    (")" RPAREN)
+    ("}" RBRACE)
+    ("]" RBRACK))
+  )
+
+(define-lex-regex-type-analyzer wisent-php-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'IDENTIFIER)
+
+(define-lex-sexp-type-analyzer wisent-php-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING_LITERAL)
+
+(define-lex-regex-type-analyzer wisent-php-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-string-type-analyzer wisent-php-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)+"
+  '((T_DOLLER . "$")
+    (T_ASTERISK . "@")
+    (T_COMP . "~")
+    (T_OR . "|")
+    (T_XOR . "^")
+    (T_QUESTION . "?")
+    (T_URSHIFTEQ . ">>>=")
+    (T_URSHIFT . ">>>")
+    (T_GT . ">")
+    (T_EQ . "=")
+    (T_LT . "<")
+    (T_SEMI . ";")
+    (T_COLON . ":")
+    (T_DIV . "/")
+    (T_DOT . ".")
+    (T_MINUS . "-")
+    (T_COMMA . ",")
+    (T_PLUS . "+")
+    (T_MULT . "*")
+    (T_AND . "&")
+    (T_MOD . "%")
+    (T_NOT . "!")
+    (T_HEREDOC . "<<<")
+    (T_DOUBLE_ARROW . "=>")
+    (T_SR . ">>")
+    (T_SL . "<<")
+    (T_BOOLEAN_AND . "&&")
+    (T_BOOLEAN_OR . "||")
+    (T_XOR_EQUAL . "^=")
+    (T_OR_EQUAL . "|=")
+    (T_AND_EQUAL . "&=")
+    (T_SR_EQUAL . ">>=")
+    (T_SL_EQUAL . "<<=")
+    (T_MOD_EQUAL . "%=")
+    (T_CONCAT_EQUAL . ".=")
+    (T_DIV_EQUAL . "/=")
+    (T_MUL_EQUAL . "*=")
+    (T_MINUS_EQUAL . "-=")
+    (T_PLUS_EQUAL . "+=")
+    (T_IS_GREATER_OR_EQUAL . ">=")
+    (T_IS_SMALLER_OR_EQUAL . "<=")
+    (T_IS_NOT_EQUAL . "<>")
+    (T_IS_NOT_EQUAL . "!=")
+    (T_IS_EQUAL . "==")
+    (T_IS_NOT_IDENTICAL . "!==")
+    (T_IS_IDENTICAL . "===")
+    (T_DEC . "--")
+    (T_INC . "++")
+    (T_PAAMAYIM_NEKUDOTAYIM . "::")
+    (T_DEREF . "->"))
+  'punctuation)
+
+
+;;; Epilogue
+;;
+(defconst semantic-php-number-regexp
+  (eval-when-compile
+    (concat "\\("
+            "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][fFdD]\\>"
+            "\\|"
+            "\\<[0-9]+[.]"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+            "\\|"
+            "\\<[0-9]+[lLfFdD]?\\>"
+            "\\)"
+            ))
+  "Lexer regexp to match Java number terminals.
+Following is the specification of Java number literals.
+
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;")
+
+(defconst wisent-php-label-regex
+  "[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*")
+
+(defvar wisent-in-php nil
+  "State variable tracking parsing in/out of PHP code.")
+
+(defun wisent-php--move-to-php-beginning ()
+  (if (re-search-forward "<[%?]" nil t)
+      (cond
+       ((or (looking-at "\\(php\\)?$")
+	    (looking-at "\\(php\\)?[[:space:]])"))
+	(goto-char (match-end 0))
+	'T_NONPHP)
+       ((or (looking-at "=$")
+	    (looking-at "=[[:space:]]"))
+	'T_ECHO_BLOCK)
+       (t
+	(wisent-php--move-to-php-beginning)))
+    (goto-char (point-max))
+    nil))
+
+(define-lex-regex-analyzer wisent-php-lex-prologue
+  "Detect and create a prologue token."
+  "<[?%]\\(php\\)?\\([[:space:]]+\\|$\\)"
+  ;; Zing to the end of this brace block.
+  (let ((start (match-beginning 0))
+        (end   (match-end 0)))
+    (semantic-lex-push-token
+     (semantic-lex-token 'PROLOGUE start end))))
+
+(define-lex-regex-analyzer wisent-php-lex-epilogue
+  "Detect and create an epilogue or percent-percent token."
+  "[%?]>"
+  (let ((start (match-beginning 0))
+        (end   (match-end 0)))
+    (semantic-lex-push-token
+     (semantic-lex-token 'EPILOGUE start end))))
+
+  
+(define-lex-regex-analyzer wisent-php-lex-heredoc
+  "Detect and create an epilogue or percent-percent token."
+  (concat "<<<[[:blank:]]*\\(" wisent-php-label-regex "\\)$")
+  (let ((start (match-beginning 0))
+        (end   (progn
+		 (re-search-forward (concat "^" (match-string 1) ";") nil t)
+		 (match-end 0))))
+    (semantic-lex-push-token
+     (semantic-lex-token 'STRING_LITERAL start end))
+    (setq semantic-lex-end-point end)))
+
+(define-lex-analyzer wisent-php-lex-out-of-php
+  "Detect and create python indentation tokens at beginning of line."
+  (progn
+    (and wisent-in-php
+	 (looking-at "[[:space:]\n]*[%?]>")
+	 (setq wisent-in-php nil))
+    (when (not wisent-in-php)
+      (let ((last-pos (point))
+	    (token (wisent-php--move-to-php-beginning)))
+	(setq semantic-lex-end-point (point))
+	(when token
+	  (setq wisent-in-php t)))
+;;	  (semantic-lex-push-token
+;;	   (semantic-lex-token token last-pos (point)))))
+      t)))
+
+;; Define the lexer for this grammar
+(define-lex wisent-php-lexer
+  "Lexical analyzer that handles php buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  wisent-php-lex-prologue
+  wisent-php-lex-epilogue
+  wisent-php-lex-heredoc
+  ;;;; Auto-generated analyzers.
+  wisent-php-wy--<number>-regexp-analyzer
+  wisent-php-wy--<string>-sexp-analyzer
+  ;; Must detect keywords before other symbols
+  wisent-php-wy--<keyword>-keyword-analyzer
+  wisent-php-wy--<symbol>-regexp-analyzer
+  wisent-php-wy--<punctuation>-string-analyzer
+  wisent-php-wy--<block>-block-analyzer
+  ;;;;
+  semantic-lex-default-action)
+
+(provide 'wisent-php-wy)
+
+;;; wisent-php-wy.el ends here
diff --git a/site/cedet-1.0pre7/contrib/wisent-php.el b/site/cedet-1.0pre7/contrib/wisent-php.el
new file mode 100644
index 0000000..8916b35
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-php.el
@@ -0,0 +1,147 @@
+;;; wisent-php.el --- Php LALR parser for Emacs
+
+;; Copyright (C) 2008, 2009 Free Software Foundation
+
+;; Author: Original code for Java by David Ponce <david@dponce.com>
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-php.el,v 1.3 2009/01/24 04:08:28 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'semantic-wisent)
+(require 'wisent-php-wy)
+(eval-when-compile
+  (require 'semantic-util)
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+;;;;
+;;;; Simple parser error reporting function
+;;;;
+
+(defun wisent-php-parse-error (msg)
+  "Error reporting function called when a parse error occurs.
+MSG is the message string to report."
+;;   (let ((error-start (nth 2 wisent-input)))
+;;     (if (number-or-marker-p error-start)
+;;         (goto-char error-start)))
+  (message msg)
+  ;;(debug)
+  )
+
+;;;;
+;;;; Local context
+;;;;
+
+(define-mode-local-override semantic-get-local-variables
+  php-mode ()
+  "Get local values from a specific context.
+Parse the current context for `field_declaration' nonterminals to
+collect tags, such as local variables or prototypes.
+This function override `get-local-variables'."
+  (let ((vars nil)
+        ;; We want nothing to do with funny syntaxing while doing this.
+        (semantic-unmatched-syntax-hook nil))
+    (while (not (semantic-up-context (point) 'function))
+      (save-excursion
+        (forward-char 1)
+        (setq vars
+              (append (semantic-parse-region
+                       (point)
+                       (save-excursion (semantic-end-of-context) (point))
+                       'field_declaration
+                       0 t)
+                      vars))))
+    vars))
+
+;;;;
+;;;; Semantic integration of the Php LALR parser
+;;;;
+
+;;;###autoload
+(defun wisent-php-default-setup ()
+  "Hook run to setup Semantic in `php-mode'.
+Use the alternate LALR(1) parser."
+  (set (make-local-variable 'wisent-in-php) nil)
+  (wisent-php-wy--install-parser)
+  (setq
+   ;; Lexical analysis
+   semantic-lex-number-expression semantic-php-number-regexp
+   semantic-lex-analyzer 'wisent-php-lexer
+   ;; Parsing
+   semantic-tag-expand-function 'wisent-php-expand-tag
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-prototype
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ";"
+   semantic-lex-comment-regex "\\(/\\*\\|//\\|#\\)"
+   ;; speedbar and imenu buckets name
+   semantic-symbol->name-assoc-list-for-type-parts
+   ;; in type parts
+   '((type     . "Classes")
+     (variable . "Variables")
+     (function . "Methods"))
+   semantic-symbol->name-assoc-list
+   ;; everywhere
+   (append semantic-symbol->name-assoc-list-for-type-parts
+           '((include  . "Includes")
+             (package  . "Package")))
+   ;; navigation inside 'type children
+   senator-step-at-tag-classes '(function variable)
+   ))
+  ;; Setup phpdoc stuff
+  ;;(semantic-php-doc-setup))
+
+	
+(defun wisent-php-expand-tag (tag)
+  "Expand TAG into a list of equivalent tags, or nil.
+Expand multiple variable declarations in the same statement, that is
+tags of class `variable' whose name is equal to a list of elements of
+the form (NAME START . END).  NAME is a variable name.  START and END
+are the bounds in the declaration, related to this variable NAME."
+  (let (elts elt clone start end xpand)
+    (when (and (eq 'variable (semantic-tag-class tag))
+               (consp (setq elts (semantic-tag-name tag))))
+      ;; There are multiple names in the same variable declaration.
+      (while elts
+        ;; For each name element, clone the initial tag and give it
+        ;; the name of the element.
+        (setq elt   (car elts)
+              elts  (cdr elts)
+              clone (semantic-tag-clone tag (car elt))
+              start (if elts  (cadr elt) (semantic-tag-start tag))
+              end   (if xpand (cddr elt) (semantic-tag-end   tag))
+              xpand (cons clone xpand))
+        ;; Set the bounds of the cloned tag with those of the name
+        ;; element.
+        (semantic-tag-set-bounds clone start end))
+      xpand)))
+
+;;;###autoload
+(add-hook 'php-mode-hook #'wisent-php-default-setup)
+
+(provide 'wisent-php)
+
+;;; wisent-php.el ends here
diff --git a/site/cedet-1.0pre7/contrib/wisent-php.wy b/site/cedet-1.0pre7/contrib/wisent-php.wy
new file mode 100644
index 0000000..df748d8
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-php.wy
@@ -0,0 +1,851 @@
+;;; wisent-php.wy -- Semantic LALR grammar for Php
+;;
+;; Copyright (C) 2008 Free Software Foundation
+;;
+;; Author: Original code for Java by David Ponce <david@dponce.com>
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-php.wy,v 1.2 2008/06/28 14:21:41 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;%package wisent-php-wy
+
+%languagemode  php-mode
+
+%start start
+%start compilation_units
+%start compilation_unit
+%start include_declaration
+%start require_expr
+%start type_declaration
+%start class_declaration
+%start class_body
+%start class_member_declaration
+%start interface_declaration
+%start interface_body
+%start interface_member_declaration
+%start method_declaration
+%start method_declarator
+%start identifier_list
+%start method_body
+%start block
+%start formal_parameter_list
+%start formal_parameters
+%start formal_parameter
+%start field_declaration
+%start variable_declarators
+%start variable_declarator
+%start variable_declarator_id
+%start variable_initializer
+%start class_modifiers
+%start class_modifier
+%start method_modifiers
+%start method_modifier
+%start field_modifiers
+%start field_modifier
+
+;; -----------------------------
+;; Block & Parenthesis terminals
+;; -----------------------------
+%type  <block>       ;;syntax "\\s(\\|\\s)" matchdatatype block
+
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <block>       BRACK_BLOCK "(LBRACK RBRACK)"
+
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+%token <open-paren>  LBRACK      "["
+%token <close-paren> RBRACK      "]"
+
+;; ------------------
+;; Operator terminals
+;; ------------------
+%type  <punctuation> ;;syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+
+%token <punctuation> T_DEREF                "->"
+%token <punctuation> T_PAAMAYIM_NEKUDOTAYIM "::"
+%token <punctuation> T_INC                  "++"
+%token <punctuation> T_DEC                  "--"
+%token <punctuation> T_IS_IDENTICAL         "==="
+%token <punctuation> T_IS_NOT_IDENTICAL     "!=="
+%token <punctuation> T_IS_EQUAL             "=="
+%token <punctuation> T_IS_NOT_EQUAL         "!="
+%token <punctuation> T_IS_NOT_EQUAL         "<>"
+%token <punctuation> T_IS_SMALLER_OR_EQUAL  "<="
+%token <punctuation> T_IS_GREATER_OR_EQUAL  ">="
+%token <punctuation> T_PLUS_EQUAL           "+="
+%token <punctuation> T_MINUS_EQUAL          "-="
+%token <punctuation> T_MUL_EQUAL            "*="
+%token <punctuation> T_DIV_EQUAL            "/="
+%token <punctuation> T_CONCAT_EQUAL         ".="
+%token <punctuation> T_MOD_EQUAL            "%="
+%token <punctuation> T_SL_EQUAL             "<<="
+%token <punctuation> T_SR_EQUAL             ">>="
+%token <punctuation> T_AND_EQUAL            "&="
+%token <punctuation> T_OR_EQUAL             "|="
+%token <punctuation> T_XOR_EQUAL            "^="
+%token <punctuation> T_BOOLEAN_OR           "||"
+%token <punctuation> T_BOOLEAN_AND          "&&"
+%token <punctuation> T_SL                   "<<"
+%token <punctuation> T_SR                   ">>"
+%token <punctuation> T_DOUBLE_ARROW         "=>"
+%token <punctuation> T_HEREDOC              "<<<"
+%token <punctuation> T_NOT         	    "!"
+%token <punctuation> T_MOD         	    "%"
+%token <punctuation> T_AND         	    "&"
+%token <punctuation> T_MULT        	    "*"
+%token <punctuation> T_PLUS        	    "+"
+%token <punctuation> T_COMMA       	    ","
+%token <punctuation> T_MINUS       	    "-"
+%token <punctuation> T_DOT         	    "."
+%token <punctuation> T_DIV         	    "/"
+%token <punctuation> T_COLON       	    ":"
+%token <punctuation> T_SEMI	   	    ";"
+%token <punctuation> T_LT          	    "<"
+%token <punctuation> T_EQ          	    "="
+%token <punctuation> T_GT          	    ">"
+%token <punctuation> T_URSHIFT     	    ">>>"
+%token <punctuation> T_URSHIFTEQ   	    ">>>="
+%token <punctuation> T_QUESTION    	    "?"
+%token <punctuation> T_XOR         	    "^"
+%token <punctuation> T_OR          	    "|"
+%token <punctuation> T_COMP        	    "~"
+%token <punctuation> T_ASTERISK        	    "@"
+%token <punctuation> T_DOLLER               "$"
+
+;; -----------------
+;; Literal terminals
+;; -----------------
+%type  <symbol>      ;;syntax "\\(\\sw\\|\\s_\\)+"
+%token <symbol>      IDENTIFIER
+
+%type  <string>      ;;syntax "\\s\"" matchdatatype sexp
+%token <string>      STRING_LITERAL
+
+%type  <number>      ;;syntax semantic-lex-number-expression
+%token <number>      NUMBER_LITERAL
+
+%type  <code>
+%token <code>        PROLOGUE
+%token <code>        EPILOGUE
+
+;; -----------------
+;; Keyword terminals
+;; -----------------
+
+;; Generate a keyword analyzer
+%type  <keyword> ;;syntax "\\(\\sw\\|\\s_\\)+" matchdatatype keyword
+
+%keyword T_EXIT            "exit"
+%keyword T_EXIT            "die"
+%keyword T_FUNCTION        "function"
+%keyword T_CONST           "const"
+%put     T_CONST summary
+"Unused reserved word"
+%keyword T_RETURN          "return"
+%put     T_RETURN summary
+"return [<expr>] ;"
+%keyword T_TRY             "try"
+%put     T_TRY summary
+"try {<stmts>} [catch(<parm>) {<stmts>} ...] [finally {<stmts>}]"
+%keyword T_CATCH           "catch"
+%put     T_CATCH summary
+"try {<stmts>} catch(<parm>) {<stmts>} ... "
+%keyword T_THROW           "throw"
+%keyword T_IF              "if"
+%put     T_IF summary
+"if (<expr>) <stmt> [else <stmt>]"
+%keyword T_ELSEIF          "elseif"
+%keyword T_ENDIF           "endif"
+%keyword T_ELSE            "else"
+%put     T_ELSE summary
+"if (<expr>) <stmt> else <stmt>"
+%keyword T_WHILE           "while"
+%put     T_WHILE summary
+"while (<expr>) <stmt> | do <stmt> while (<expr>);"
+%keyword T_ENDWHILE        "endwhile"
+%keyword T_DO              "do"
+%put     T_DO summary
+"do <stmt> while (<expr>);"
+%keyword T_FOR             "for"
+%put     T_FOR summary
+"for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>"
+%keyword T_ENDFOR          "endfor"
+%keyword T_FOREACH         "foreach"
+%keyword T_ENDFOREACH      "endforeach"
+%keyword T_DECLARE         "declare"
+%keyword T_ENDDECLARE      "enddeclare"
+%keyword T_INSTANCEOF      "instanceof"
+%keyword INT          "int"
+%put     T_INT summary
+%keyword T_AS              "as"
+%keyword T_SWITCH          "switch"
+%keyword T_ENDSWITCH       "endswitch"
+%keyword T_CASE            "case"
+%put     T_CASE summary
+"switch(<expr>) {case <const-expr>: <stmts> ... }"
+%keyword T_DEFAULT         "default"
+%put     T_DEFAULT summary
+"switch(<expr>) { ... default: <stmts>}"
+%keyword T_BREAK           "break"
+%put     T_BREAK summary
+"break [<label>] ;"
+%keyword T_CONTINUE        "continue"
+%put     T_CONTINUE summary
+"continue [<label>] ;"
+%keyword T_ECHO            "echo"
+%keyword T_PRINT           "print"
+%keyword T_CLASS           "class"
+%put     T_CLASS summary
+"Class declaration: class <name>"
+%keyword T_INTERFACE       "interface"
+%put     T_INTERFACE summary
+"Interface declaration: interface <name>"
+%keyword T_EXTENDS         "extends"
+%put     T_EXTENDS summary
+"SuperClass|SuperInterfaces declaration: extends <name> [, ...]"
+%keyword T_IMPLEMENTS      "implements"
+%put     T_IMPLEMENTS summary
+"Class SuperInterfaces declaration: implements <name> [, ...]"
+%keyword T_NEW             "new"
+%keyword PACKAGE      "package"
+%put     T_PACKAGE summary
+%keyword T_CLONE           "clone"
+%keyword T_VAR             "var"
+%keyword T_EVAL            "eval"
+%keyword T_INCLUDE         "include"
+%keyword T_INCLUDE_ONCE    "include_once"
+%keyword T_REQUIRE         "require"
+%keyword T_REQUIRE_ONCE    "require_once"
+%keyword T_USE             "use"
+%keyword T_GLOBAL          "global"
+%keyword T_ISSET           "isset"
+%keyword T_EMPTY           "empty"
+%keyword T_HALT_COMPILER   "__halt_compiler"
+%keyword T_STATIC          "static"
+%put     T_STATIC summary
+"Declaration modifier: static {class|interface|<type>} <name> ..."
+%keyword T_ABSTRACT        "abstract"
+%put     T_ABSTRACT summary
+"Class|Method declaration modifier: abstract {class|<type>} <name> ..."
+%keyword T_FINAL           "final"
+%put     T_FINAL summary
+"Class|Member declaration modifier: final {class|<type>} <name> ..."
+%keyword T_PRIVATE         "private"
+%put     T_PRIVATE summary
+"Access level modifier: private {class|interface|<type>} <name> ..."
+%keyword T_PROTECTED       "protected"
+%put     T_PROTECTED summary
+"Access level modifier: protected {class|interface|<type>} <name> ..."
+%keyword T_PUBLIC          "public"
+%put     T_PUBLIC summary
+"Access level modifier: public {class|interface|<type>} <name> ..."
+%keyword T_UNSET           "unset"
+%keyword T_LIST            "list"
+%keyword T_ARRAY           "array"
+%keyword T_LOGICAL_OR      "or"
+%keyword T_LOGICAL_AND     "and"
+%keyword T_LOGICAL_XOR     "xor"
+%keyword T_CLASS_C         "__CLASS__"
+%keyword T_FUNC_C          "__FUNCTION__"
+%keyword T_METHOD_C        "__METHOD__"
+%keyword T_LINE            "__LINE__"
+%keyword T_FILE            "__FILE__"
+
+;; --------------------------
+;; Official phpdoc line tags
+;; --------------------------
+
+;; Phpdoc tags are identified by a 'phpdoc' keyword property.  The
+;; value of this property must be itself a property list where the
+;; following properties are recognized:
+;;
+;; - `seq' (mandatory) is the tag sequence number used to check if tags
+;;   are correctly ordered in a phpdoc comment block.
+;;
+;; - `usage' (mandatory) is the list of token categories for which this
+;;   documentation tag is allowed.
+;;
+;; - `opt' (optional) if non-nil indicates this is an optional tag.
+;;   By default tags are mandatory.
+;;
+;; - `with-name' (optional) if non-nil indicates that this tag is
+;;   followed by an identifier like in "@param <var-name> description"
+;;   or "@exception <class-name> description".
+;;
+;; - `with-ref' (optional) if non-nil indicates that the tag is
+;;   followed by a reference like in "@see <reference>".
+
+%keyword _AUTHOR      "@author"
+%put     _AUTHOR      phpdoc (seq 1 usage (type))
+%keyword _VERSION     "@version"
+%put     _VERSION     phpdoc (seq 2 usage (type)) 
+%keyword _PARAM       "@param"
+%put     _PARAM       phpdoc (seq 3 usage (function) with-name t) 
+%keyword _RETURN      "@return"
+%put     _RETURN      phpdoc (seq 4 usage (function)) 
+%keyword _EXCEPTION   "@exception"
+%put     _EXCEPTION   phpdoc (seq 5 usage (function) with-name t) 
+%keyword _THROWS      "@throws"
+%put     _THROWS      phpdoc (seq 6 usage (function) with-name t) 
+%keyword _SEE         "@see"
+%put     _SEE         phpdoc (seq 7 usage (type function variable) opt t with-ref t) 
+%keyword _SINCE       "@since"
+%put     _SINCE       phpdoc (seq 8 usage (type function variable) opt t) 
+%keyword _SERIAL      "@serial"
+%put     _SERIAL      phpdoc (seq 9 usage (variable) opt t) 
+%keyword _SERIALDATA  "@serialData"
+%put     _SERIALDATA  phpdoc (seq 10 usage (function) opt t) 
+%keyword _SERIALFIELD "@serialField"
+%put     _SERIALFIELD phpdoc (seq 11 usage (variable) opt t) 
+%keyword _DEPRECATED  "@deprecated"
+%put     _DEPRECATED  phpdoc (seq 12 usage (type function variable) opt t) 
+
+%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
+%left T_COMMA
+%left T_LOGICAL_OR
+%left T_LOGICAL_XOR
+%left T_LOGICAL_AND
+%right T_PRINT
+%left T_EQ T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL
+%left T_QUESTION T_COLON
+%left T_BOOLEAN_OR
+%left T_BOOLEAN_AND
+%left T_OR
+%left T_XOR
+%left T_AND
+%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL
+%nonassoc T_LT T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
+%left T_SL T_SR
+%left T_PLUS T_MINUS T_DOT
+%left T_MULT T_DIV T_MOD
+%right T_NOT
+%nonassoc T_INSTANCEOF
+%right T_COMP T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST T_ASTERISK
+%right LBRACK
+%nonassoc T_NEW T_CLONE
+%token T_EXIT
+%token T_IF
+%left T_ELSEIF
+%left T_ELSE
+%left T_ENDIF
+
+%%
+
+;; ------------
+;; LALR Grammar
+;; ------------
+
+;; This grammar is not designed to fully parse correct php syntax.  It
+;; is optimized to work in an interactive environment to extract tokens
+;; (tags) needed by Semantic.  In some cases a syntax not allowed by
+;; the php Language Specification will be accepted by this grammar.
+
+start
+  : PROLOGUE compilation_units EPILOGUE
+    (identity $2)
+  | PROLOGUE compilation_units
+    (identity $2)
+  ;
+
+compilation_units
+  : ;;EMPTY
+  | compilation_unit compilation_units 
+    (if $2 (append $2 (EXPANDTAG $1)) (EXPANDTAG $1))
+  ;
+
+compilation_unit
+  : include_declaration
+  | type_declaration
+  ;
+
+include_declaration
+  : T_USE require_expr T_SEMI
+    (identity $2)
+  | T_REQUIRE require_expr T_SEMI
+    (identity $2)
+  | T_REQUIRE_ONCE require_expr T_SEMI
+    (identity $2)
+  | T_INCLUDE require_expr T_SEMI
+    (identity $2)
+  | T_INCLUDE_ONCE require_expr T_SEMI
+    (identity $2)
+  ;
+
+require_expr
+  : STRING_LITERAL
+    (INCLUDE-TAG $1 nil)
+  | PAREN_BLOCK
+    (INCLUDE-TAG $1 nil)
+  ;
+
+type_declaration
+  : function_declaration
+  | class_declaration
+  | interface_declaration
+  ;
+
+;;; Type Declaration token
+;; ("NAME" type "TYPE" ( PART-LIST ) ( PARENTS ) EXTRA-SPEC "DOCSTRING")
+class_declaration
+  : class_modifiers_opt T_CLASS IDENTIFIER superc_opt interfaces_opt class_body
+    (TYPE-TAG $3 $2 $6 (if (or $4 $5) (cons $4 $5)) :typemodifiers $1)
+  ;
+
+superc_opt
+  : ;;EMPTY
+  | T_EXTENDS IDENTIFIER
+    (identity $2)
+  ;
+
+interfaces_opt
+  : ;;EMPTY
+  | T_IMPLEMENTS identifier_list
+    (nreverse $2)
+  ;
+
+class_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 class_member_declaration)
+  ;
+
+class_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | interface_declaration
+  | class_declaration
+  | method_declaration
+  | field_declaration
+  ;
+
+;;; Type Declaration token
+;; ("NAME" type "TYPE" ( PART-LIST ) ( PARENTS ) EXTRA-SPEC "DOCSTRING")
+interface_declaration
+  : class_modifiers_opt T_INTERFACE IDENTIFIER extends_interfaces_opt interface_body
+    (TYPE-TAG $3 $2 $5 (if $4 (cons nil $4)) :typemodifiers $1)
+  ;
+
+extends_interfaces_opt
+  : ;;EMPTY
+  | T_EXTENDS identifier_list
+    (identity $2)
+  ;
+
+interface_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 interface_member_declaration)
+  ;
+
+interface_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | interface_declaration
+  | class_declaration
+  | method_declaration
+  | field_declaration
+  ;
+
+function_declaration
+  :  method_declarator method_body
+    (FUNCTION-TAG (car $1) nil (cdr $1))
+  ;
+
+;;; Function token
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+method_declaration
+  : method_modifiers_opt method_declarator method_body
+    (FUNCTION-TAG (car $2) nil (cdr $2) :typemodifiers $1)
+  ;
+
+method_declarator
+  : T_FUNCTION reference_opt IDENTIFIER formal_parameter_list
+    (cons $3 $4)
+  ;
+
+identifier_list
+  : identifier_list T_COMMA IDENTIFIER
+    (cons $3 $1)
+  | IDENTIFIER
+    (list $1)
+  ;
+
+method_body
+  : T_SEMI
+  | block
+  ;
+
+;; Just eat {...} block!
+block
+  : BRACE_BLOCK
+  ;
+
+formal_parameter_list
+  : PAREN_BLOCK
+    (EXPANDFULL $1 formal_parameters)
+  ;
+
+formal_parameters
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | formal_parameter T_COMMA
+  | formal_parameter RPAREN
+  ;
+
+;;; Variable token
+;; ("NAME" variable "TYPE" DEFAULT-VALUE EXTRA-SPEC "DOCSTRING")
+formal_parameter
+  : variable_declarator_id T_EQ expression
+    (VARIABLE-TAG $1 nil $region3)
+  | variable_declarator_id
+    (VARIABLE-TAG $1 nil nil)
+  ;
+
+;;; Variable token
+;; ("NAME" variable "TYPE" DEFAULT-VALUE EXTRA-SPEC "DOCSTRING")
+field_declaration
+  : field_modifiers_opt variable_declarators T_SEMI
+    (VARIABLE-TAG $2 nil nil :typemodifiers $1)
+  ;
+
+variable_declarators
+  : variable_declarators T_COMMA variable_declarator
+    (cons $3 $1)
+  | variable_declarator
+    (list $1)
+  ;
+
+variable_declarator
+  : variable_declarator_id T_EQ variable_initializer
+    (list $1 nil nil $3)
+  | variable_declarator_id
+    (list $1)
+  ;
+
+variable_declarator_id
+  : reference_opt IDENTIFIER dims_opt
+    (concat $2 $3)
+  ;
+
+reference_opt
+  : ;;EMPTY
+  | T_AND
+  ;
+
+variable_initializer
+  : expression
+  ;
+
+;; Just eat expression!
+expression
+  : expression term
+  | term
+  ;
+
+term
+  : literal
+  | operator
+  | IDENTIFIER
+  | BRACK_BLOCK
+  | PAREN_BLOCK
+  | BRACE_BLOCK
+  | T_NEW
+  | T_CLONE
+  | T_ARRAY
+  ;
+
+literal
+;;   : NULL_LITERAL
+;;   | BOOLEAN_LITERAL
+  : STRING_LITERAL
+  | NUMBER_LITERAL
+  ;
+
+operator
+  : T_DEREF
+  | T_PAAMAYIM_NEKUDOTAYIM
+  | T_INC
+  | T_DEC
+  | T_IS_IDENTICAL
+  | T_IS_NOT_IDENTICAL
+  | T_IS_EQUAL
+  | T_IS_NOT_EQUAL
+  | T_IS_NOT_EQUAL
+  | T_IS_SMALLER_OR_EQUAL
+  | T_IS_GREATER_OR_EQUAL
+  | T_PLUS_EQUAL
+  | T_MINUS_EQUAL
+  | T_MUL_EQUAL
+  | T_DIV_EQUAL
+  | T_CONCAT_EQUAL
+  | T_MOD_EQUAL
+  | T_SL_EQUAL
+  | T_SR_EQUAL
+  | T_AND_EQUAL
+  | T_OR_EQUAL
+  | T_XOR_EQUAL
+  | T_BOOLEAN_OR
+  | T_BOOLEAN_AND
+  | T_SL
+  | T_SR
+  | T_DOUBLE_ARROW
+  | T_HEREDOC
+  | T_NOT
+  | T_MOD
+  | T_AND
+  | T_MULT
+  | T_PLUS
+  | T_COMMA
+  | T_MINUS
+  | T_DOT
+  | T_DIV
+  | T_COLON
+  | T_LT
+  | T_EQ
+  | T_GT
+  | T_URSHIFT
+  | T_URSHIFTEQ
+  | T_QUESTION
+  | T_XOR
+  | T_OR
+  | T_COMP
+  | T_ASTERISK
+  | T_LIST
+  | T_ARRAY
+  | T_LOGICAL_OR
+  | T_LOGICAL_AND
+  | T_LOGICAL_XOR
+  ;
+
+class_modifiers_opt
+  : ;;EMPTY
+  | class_modifiers
+    (nreverse $1)
+  ;
+
+class_modifiers
+  : class_modifiers class_modifier
+    (cons $2 $1)
+  | class_modifier
+    (list $1)
+  ;
+
+class_modifier
+  : T_FINAL
+  | T_ABSTRACT
+  ;
+
+method_modifiers_opt
+  : ;;EMPTY
+  | method_modifiers
+    (nreverse $1)
+  ;
+
+method_modifiers
+  : method_modifiers method_modifier
+    (cons $2 $1)
+  | method_modifier
+    (list $1)
+  ;
+
+method_modifier
+  : T_FINAL
+  | T_ABSTRACT
+  | T_STATIC
+  | T_PRIVATE
+  | T_PROTECTED
+  | T_PUBLIC
+  ;
+
+field_modifiers_opt
+  : ;;EMPTY
+  | field_modifiers
+    (nreverse $1)
+  ;
+
+field_modifiers
+  : field_modifiers field_modifier
+    (cons $2 $1)
+  | field_modifier
+    (list $1)
+  ;
+
+field_modifier
+  : method_modifier
+  | T_VAR
+  ;
+
+dims_opt
+  : ;;EMPTY
+    (identity "")
+  | dims
+  ;
+
+dims
+  : dims BRACK_BLOCK
+    (concat $1 "[]")
+  | BRACK_BLOCK
+    (identity "[]")
+  ;
+
+%%
+(defconst semantic-php-number-regexp
+  (eval-when-compile
+    (concat "\\("
+            "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][fFdD]\\>"
+            "\\|"
+            "\\<[0-9]+[.]"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+            "\\|"
+            "\\<[0-9]+[lLfFdD]?\\>"
+            "\\)"
+            ))
+  "Lexer regexp to match Java number terminals.
+Following is the specification of Java number literals.
+
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;")
+
+(defconst wisent-php-label-regex
+  "[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*")
+
+(defvar wisent-in-php nil
+  "State variable tracking parsing in/out of PHP code.")
+
+(defun wisent-php--move-to-php-beginning ()
+  (if (re-search-forward "<[%?]" nil t)
+      (cond
+       ((or (looking-at "\\(php\\)?$")
+	    (looking-at "\\(php\\)?[[:space:]])"))
+	(goto-char (match-end 0))
+	'T_NONPHP)
+       ((or (looking-at "=$")
+	    (looking-at "=[[:space:]]"))
+	'T_ECHO_BLOCK)
+       (t
+	(wisent-php--move-to-php-beginning)))
+    (goto-char (point-max))
+    nil))
+
+(define-lex-regex-analyzer wisent-php-lex-prologue
+  "Detect and create a prologue token."
+  "<[?%]\\(php\\)?\\([[:space:]]+\\|$\\)"
+  ;; Zing to the end of this brace block.
+  (let ((start (match-beginning 0))
+        (end   (match-end 0)))
+    (semantic-lex-push-token
+     (semantic-lex-token 'PROLOGUE start end))))
+
+(define-lex-regex-analyzer wisent-php-lex-epilogue
+  "Detect and create an epilogue or percent-percent token."
+  "[%?]>"
+  (let ((start (match-beginning 0))
+        (end   (match-end 0)))
+    (semantic-lex-push-token
+     (semantic-lex-token 'EPILOGUE start end))))
+
+  
+(define-lex-regex-analyzer wisent-php-lex-heredoc
+  "Detect and create an epilogue or percent-percent token."
+  (concat "<<<[[:blank:]]*\\(" wisent-php-label-regex "\\)$")
+  (let ((start (match-beginning 0))
+        (end   (progn
+		 (re-search-forward (concat "^" (match-string 1) ";") nil t)
+		 (match-end 0))))
+    (semantic-lex-push-token
+     (semantic-lex-token 'STRING_LITERAL start end))
+    (setq semantic-lex-end-point end)))
+
+(define-lex-analyzer wisent-php-lex-out-of-php
+  "Detect and create python indentation tokens at beginning of line."
+  (progn
+    (and wisent-in-php
+	 (looking-at "[[:space:]\n]*[%?]>")
+	 (setq wisent-in-php nil))
+    (when (not wisent-in-php)
+      (let ((last-pos (point))
+	    (token (wisent-php--move-to-php-beginning)))
+	(setq semantic-lex-end-point (point))
+	(when token
+	  (setq wisent-in-php t)))
+;;	  (semantic-lex-push-token
+;;	   (semantic-lex-token token last-pos (point)))))
+      t)))
+
+;; Define the lexer for this grammar
+(define-lex wisent-php-lexer
+  "Lexical analyzer that handles php buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  wisent-php-lex-prologue
+  wisent-php-lex-epilogue
+  wisent-php-lex-heredoc
+  ;;;; Auto-generated analyzers.
+  wisent-php-wy--<number>-regexp-analyzer
+  wisent-php-wy--<string>-sexp-analyzer
+  ;; Must detect keywords before other symbols
+  wisent-php-wy--<keyword>-keyword-analyzer
+  wisent-php-wy--<symbol>-regexp-analyzer
+  wisent-php-wy--<punctuation>-string-analyzer
+  wisent-php-wy--<block>-block-analyzer
+  ;;;;
+  semantic-lex-default-action)
+
+;;; wisent-php.wy ends here
diff --git a/site/cedet-1.0pre7/contrib/wisent-ruby-wy.el b/site/cedet-1.0pre7/contrib/wisent-ruby-wy.el
new file mode 100644
index 0000000..659342e
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-ruby-wy.el
@@ -0,0 +1,612 @@
+;;; wisent-ruby-wy.el --- Generated parser support file
+
+;;; Copyright (C) 2007 Daniel Debertin (debertin@gmail.com)
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:51:01-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-ruby.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-ruby-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("__FILE__" . FILE)
+     ("__LINE__" . LINE)
+     ("BEGIN" . BEGIN_BLOCK)
+     ("END" . END_BLOCK)
+     ("alias" . ALIAS)
+     ("and" . AND)
+     ("begin" . BEGIN)
+     ("break" . BREAK)
+     ("case" . CASE)
+     ("class" . CLASS)
+     ("def" . DEF)
+     ("defined?" . DEFINED_P)
+     ("do" . DO)
+     ("else" . ELSE)
+     ("elsif" . ELSIF)
+     ("end" . END)
+     ("ensure" . ENSURE)
+     ("false" . FALSE)
+     ("for" . FOR)
+     ("if" . IF)
+     ("in" . IN)
+     ("module" . MODULE)
+     ("next" . NEXT)
+     ("nil" . NIL)
+     ("not" . NOT)
+     ("or" . OR)
+     ("redo" . REDO)
+     ("rescue" . RESCUE)
+     ("retry" . RETRY)
+     ("return" . RETURN)
+     ("self" . SELF)
+     ("super" . SUPER)
+     ("then" . THEN)
+     ("true" . TRUE)
+     ("undef" . UNDEF)
+     ("unless" . UNLESS)
+     ("until" . UNTIL)
+     ("when" . WHEN)
+     ("while" . WHILE)
+     ("yield" . YIELD)
+     ("require" . REQUIRE)
+     ("attr_reader" . ATTR_READER)
+     ("attr_writer" . ATTR_WRITER)
+     ("attr_accessor" . ATTR_ACCESSOR)
+     ("include" . INCLUDE)
+     ("extend" . EXTEND)
+     ("public" . PROT_PUBLIC)
+     ("protected" . PROT_PROTECTED)
+     ("private" . PROT_PRIVATE)
+     ("loop" . LOOP)
+     ("raise" . RAISE)
+     ("catch" . CATCH)
+     ("throw" . THROW)
+     ("proc" . PROC)
+     ("lambda" . LAMBDA))
+   '(("lambda" summary "lambda { [<|args|>] ... }")
+     ("proc" summary "proc { [<|args|>] ... }")
+     ("throw" summary "THROW <anchor>[, <retval>]")
+     ("catch" summary "CATCH <tag> do ...[throw <tag>] ... end")
+     ("raise" summary "RAISE [<exception_type>] [<message>]")
+     ("loop" summary "loop .... end")
+     ("private" summary "private: instance-level protection")
+     ("protected" summary "protected: class-level protection")
+     ("public" summary "public: public protection")
+     ("extend" summary "EXTEND <module_name>")
+     ("include" summary "INCLUDE <module_name>")
+     ("attr_accessor" summary "attr_accessor <symbol_list>")
+     ("attr_writer" summary "attr_writer <symbol_list>")
+     ("attr_reader" summary "attr_reader <symbol_list>")
+     ("require" summary "require <file>")
+     ("yield" summary "yield: return control to the caller until called again")
+     ("while" summary "WHILE(<expression>) ... end")
+     ("when" summary "case <lhs> WHEN <rhs> ... end")
+     ("until" summary "UNTIL(<expression>) ... end")
+     ("unless" summary "UNLESS(<expression>) ... end")
+     ("undef" summary "I have no idea what this does")
+     ("true" summary "true: true value")
+     ("then" summary "if(<expression>) THEN ... end")
+     ("super" summary "super: the superclass method")
+     ("self" summary "self: the current instance")
+     ("return" summary "return: return control to the caller permanently")
+     ("retry" summary "begin ... rescue [exception] ... RETRY ... end")
+     ("rescue" summary "begin ... RESCUE [exception_name] <body> end")
+     ("redo" summary "redo: try current iteration again")
+     ("or" summary "or: logical OR")
+     ("not" summary "not: logical NOT")
+     ("nil" summary "nil: no value")
+     ("next" summary "next: continue to next block iteration")
+     ("module" summary "MODULE <module_name> <module_body> end")
+     ("in" summary "for x IN y ... end")
+     ("if" summary "IF(<expression>) ... end")
+     ("for" summary "FOR x in y ... end")
+     ("false" summary "false: false value")
+     ("ensure" summary "begin ... ENSURE ... end")
+     ("end" summary "end: block end")
+     ("elsif" summary "if(<expression>) ... ELSIF(<expression>) ... end")
+     ("else" summary "if(<expression>) ... ELSE ... end")
+     ("do" summary "DO <body> end")
+     ("defined?" summary "defined?(<value>)")
+     ("def" summary "DEF <method_name> ([method_args]) <method_body> end")
+     ("class" summary "CLASS <classname> [< parentclass] ... end")
+     ("case" summary "CASE <lhs> when <rhs> ... when <rhs> ... end")
+     ("break" summary "break: terminate current block")
+     ("begin" summary "BEGIN ... [rescue,ensure] ... end")
+     ("and" summary "and: logical AND")
+     ("alias" summary "ALIAS method1 method2")
+     ("END" summary "END { ... }")
+     ("BEGIN" summary "BEGIN { ... }")
+     ("__LINE__" summary "__LINE__: The current line")
+     ("__FILE__" summary "__FILE__: The current file")))
+  "Table of language keywords.")
+
+(defconst wisent-ruby-wy--token-table
+  (semantic-lex-make-type-table
+   '(("punctuation"
+      (HASH_REF . "=>")
+      (OBJ_EQ . "===")
+      (NAMESPACE_DEREF . "::")
+      (LOGOR_EQ . "||=")
+      (LOGAND_EQ . "&&=")
+      (LOG_OR . "||")
+      (LOG_AND . "&&")
+      (SEMICOLON . ";")
+      (DIV_EQ . "/=")
+      (DIV . "/")
+      (BACKQUOTE . "`")
+      (HEREDOC . "<<-")
+      (GTGT_EQ . ">>=")
+      (LTLT_EQ . "<<=")
+      (GTGT . ">>")
+      (LTLT . "<<")
+      (GTEQ . ">=")
+      (LTEQ . "<=")
+      (GT . ">")
+      (LT . "<")
+      (TERNARY_COND . "?")
+      (COLON . ":")
+      (REGEX_EQ . "=~")
+      (COMPLEMENT . "~")
+      (MINUS_EQ . "-=")
+      (MINUS . "-")
+      (EXP_EQ . "**=")
+      (EXP . "**")
+      (MULT_EQ . "*=")
+      (MULT . "*")
+      (BITAND_EQ . "&=")
+      (BITAND . "&")
+      (BITOR_EQ . "|=")
+      (BITOR . "|")
+      (BITXOR_EQ . "^=")
+      (BITXOR . "^")
+      (MOD_EQ . "%=")
+      (MODULUS . "%")
+      (BANG . "!")
+      (COMMA . ",")
+      (PLUS_EQ . "+=")
+      (PLUS . "+")
+      (NEQUAL . "!=")
+      (EQUAL . "==")
+      (PERIOD . ".")
+      (EQUALS . "="))
+     ("close-paren"
+      (RPAREN . ")")
+      (RBRACK . "]"))
+     ("open-paren"
+      (RBRACE . "}")
+      (LBRACE . "{")
+      (LPAREN . "(")
+      (LBRACK . "["))
+     ("newline"
+      (NEWLINE))
+     ("rubyblock"
+      (RUBY_BLOCK))
+     ("braceblock"
+      (BRACE_BLOCK))
+     ("parenblock"
+      (PAREN_BLOCK))
+     ("rubylvar"
+      (VAR_LOCAL))
+     ("rubyconst"
+      (CONSTANT))
+     ("rubygvar"
+      (VAR_GLOBAL))
+     ("rubycvar"
+      (VAR_CLASS))
+     ("rubyivar"
+      (VAR_INSTANCE))
+     ("rubysymbol"
+      (SYMBOL_LITERAL))
+     ("rubyhash"
+      (HASH_LITERAL))
+     ("rubyrange"
+      (RANGE_LITERAL))
+     ("rubynumber"
+      (INTEGER_LITERAL))
+     ("rubycmd"
+      (SHELL_COMMAND_LITERAL))
+     ("rubyregexp"
+      (REGEXP_LITERAL))
+     ("rubyarray"
+      (ARRAY_LITERAL))
+     ("rubystring"
+      (STRING_LITERAL))
+     ("identifier"
+      (IDENTIFIER)))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst wisent-ruby-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((IDENTIFIER STRING_LITERAL ARRAY_LITERAL REGEXP_LITERAL SHELL_COMMAND_LITERAL INTEGER_LITERAL RANGE_LITERAL HASH_LITERAL SYMBOL_LITERAL VAR_INSTANCE VAR_CLASS VAR_GLOBAL CONSTANT VAR_LOCAL PAREN_BLOCK BRACE_BLOCK RUBY_BLOCK NEWLINE FILE LINE BEGIN_BLOCK END_BLOCK ALIAS AND BEGIN BREAK CASE CLASS DEF DEFINED_P DO ELSE ELSIF END ENSURE FALSE FOR IF IN MODULE NEXT NIL NOT OR REDO RESCUE RETRY RETURN SELF SUPER THEN TRUE UNDEF UNLESS UNTIL WHEN WHILE YIELD REQUIRE ATTR_READER ATTR_WRITER ATTR_ACCESSOR INCLUDE EXTEND PROT_PUBLIC PROT_PROTECTED PROT_PRIVATE LOOP RAISE CATCH THROW PROC LAMBDA LBRACK RBRACK LPAREN RPAREN LBRACE RBRACE EQUALS PERIOD EQUAL NEQUAL PLUS PLUS_EQ COMMA BANG MODULUS MOD_EQ BITXOR BITXOR_EQ BITOR BITOR_EQ BITAND BITAND_EQ MULT MULT_EQ EXP EXP_EQ MINUS MINUS_EQ COMPLEMENT REGEX_EQ COLON TERNARY_COND LT GT LTEQ GTEQ LTLT GTGT LTLT_EQ GTGT_EQ HEREDOC BACKQUOTE DIV DIV_EQ SEMICOLON LOG_AND LOG_OR LOGAND_EQ LOGOR_EQ NAMESPACE_DEREF OBJ_EQ HASH_REF)
+       nil
+       (stmts
+	(nil)
+	((stmt))
+	((stmt separators stmts)))
+       (stmt
+	((expression))
+	((definition))
+	((simple_stmt)))
+       (opt_cond
+	(nil)
+	((conditional_exp)))
+       (separator
+	((NEWLINE))
+	((SEMICOLON)))
+       (separators
+	((separator))
+	((separator separators)))
+       (definition
+	 ((method_def))
+	 ((class_def))
+	 ((module_def)))
+       (simple_stmt
+	((require))
+	((super))
+	((alias))
+	((attr_decl))
+	((mixin))
+	((access_decl))
+	((loop_control))
+	((return))
+	((exception)))
+       (require
+	((REQUIRE STRING_LITERAL)
+	 (wisent-raw-tag
+	  (semantic-tag-new-include $2 nil))))
+       (super
+	((SUPER opt_args)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "super" nil))))
+       (opt_args
+	(nil)
+	((PAREN_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'parameters 1)))
+       (parameters
+	(nil)
+	((LPAREN))
+	((RPAREN))
+	((parameter COMMA)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil)))
+	((parameter RPAREN)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil))))
+       (parameter
+	((expression_term))
+	((expression_term EQUALS literal)))
+       (alias
+	((ALIAS IDENTIFIER IDENTIFIER)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function $2 "alias" nil nil))))
+       (attr_decl
+	((ATTR_READER symbol_list)
+	 (wisent-raw-tag
+	  (semantic-tag "reader" 'attribute :symbols $2)))
+	((ATTR_WRITER symbol_list)
+	 (wisent-raw-tag
+	  (semantic-tag "writer" 'attribute :symbols $2)))
+	((ATTR_ACCESSOR symbol_list)
+	 (wisent-raw-tag
+	  (semantic-tag "accessor" 'attribute :symbols $2))))
+       (symbol_list
+	((SYMBOL_LITERAL)
+	 (list $1))
+	((SYMBOL_LITERAL COMMA symbol_list)
+	 (append
+	  (list $1)
+	  $3)))
+       (mixin
+	((INCLUDE CONSTANT)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "mixin" nil)))
+	((EXTEND CONSTANT)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "mixin" nil))))
+       (protection
+	((PROT_PUBLIC))
+	((PROT_PROTECTED))
+	((PROT_PRIVATE)))
+       (access_decl
+	((protection)
+	 (set-current-protection-context $1))
+	((protection symbol_list)
+	 (dolist
+	     (sym $2)
+	   (set-tag-protection sym $1))))
+       (loop_control
+	((BREAK opt_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "loop_control" 'break :value $2)))
+	((NEXT opt_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "loop_control" 'next :value $2)))
+	((REDO)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "loop_control" 'redo)))
+	((RETRY)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "loop_control" 'retry)))
+	((THROW SYMBOL_LITERAL opt_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "throw" $2 :value $3))))
+       (opt_exp
+	(nil)
+	((expression)))
+       (return
+	((RETURN opt_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "return" nil))))
+       (expression_term
+	((literal))
+	((varref))
+	((methodcall)))
+       (literal
+	((STRING_LITERAL))
+	((ARRAY_LITERAL))
+	((REGEXP_LITERAL))
+	((SHELL_COMMAND_LITERAL))
+	((INTEGER_LITERAL))
+	((HASH_LITERAL))
+	((SYMBOL_LITERAL))
+	((boolean_literal))
+	((NIL)))
+       (boolean_literal
+	((TRUE))
+	((FALSE)))
+       (varref
+	((VAR_INSTANCE))
+	((VAR_CLASS))
+	((VAR_GLOBAL))
+	((CONSTANT))
+	((VAR_LOCAL)))
+       (method_head
+	((receiver IDENTIFIER))
+	((IDENTIFIER)))
+       (methodcall
+	((method_head))
+	((method_head PAREN_BLOCK))
+	((method_head code_block))
+	((method_head PAREN_BLOCK code_block)))
+       (receiver
+	((CONSTANT PERIOD))
+	((IDENTIFIER PERIOD))
+	((literal PERIOD)))
+       (code_block
+	((BRACE_BLOCK))
+	((DO RUBY_BLOCK)))
+       (expression
+	((operator_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "expression" nil)))
+	((assignment_exp)
+	 (progn
+	   (process-assignment-variables $1)
+	   (wisent-raw-tag
+	    (semantic-tag-new-code "assignment" nil))))
+	((block_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "block_expression" nil)))
+	((conditional_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "cond_exp" nil)))
+	((case_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "case" nil)))
+	((iteration_exp)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code "iteration" nil)))
+	((expression_term)
+	 (if
+	     (member $1 semantic-lex-ruby-assigned-vars)
+	     (wisent-raw-tag
+	      (semantic-tag-new-code "expression_term" nil))
+	   (wisent-raw-tag
+	    (semantic-tag-new-code "methodcall" nil)))))
+       (expressions
+	((expression))
+	((expression bool_op expressions)))
+       (operator_exp
+	((expression_term cmp_op expression_term))
+	((expression_term cmp_op operator_exp)))
+       (assignment_exp
+	((expression_term assn_op expression_term)
+	 (list $1))
+	((expression_term assn_op assignment_exp)
+	 (append
+	  (list $1)
+	  $3)))
+       (block_exp
+	((BEGIN inner_block END)))
+       (inner_block
+	((RUBY_BLOCK))
+	((RUBY_BLOCK rescues))
+	((RUBY_BLOCK ENSURE RUBY_BLOCK))
+	((RUBY_BLOCK rescues ENSURE RUBY_BLOCK)))
+       (rescues
+	((RESCUE RUBY_BLOCK))
+	((RESCUE exception_catch RUBY_BLOCK))
+	((RESCUE exception_catch RUBY_BLOCK rescues)))
+       (exception_catch
+	((CONSTANT))
+	((CONSTANT HASH_REF IDENTIFIER)))
+       (conditional_exp_arg
+	((expression))
+	((PAREN_BLOCK)))
+       (aux_cond
+	((ELSIF conditional_exp_arg opt_then RUBY_BLOCK))
+	((ELSIF conditional_exp_arg opt_then RUBY_BLOCK aux_cond))
+	((ELSE RUBY_BLOCK END)))
+       (conditional_exp
+	((cond_kw conditional_exp_arg opt_then RUBY_BLOCK END))
+	((cond_kw conditional_exp_arg opt_then RUBY_BLOCK aux_cond END)))
+       (cond_kw
+	((IF))
+	((UNLESS)))
+       (opt_then
+	(nil)
+	((THEN)))
+       (ternary_exp
+	((expression TERNARY_COND expression_term COLON expression_term)))
+       (case_exp
+	((CASE IDENTIFIER when_blocks END)))
+       (when_blocks
+	((WHEN IDENTIFIER RUBY_BLOCK))
+	((WHEN IDENTIFIER RUBY_BLOCK when_blocks))
+	((ELSE RUBY_BLOCK)))
+       (iteration_exp
+	((cond_iter_kw conditional_exp_arg RUBY_BLOCK END))
+	((FOR RUBY_BLOCK END))
+	((LOOP DO RUBY_BLOCK END))
+	((LOOP BRACE_BLOCK)))
+       (cond_iter_kw
+	((WHILE))
+	((UNTIL)))
+       (method_def
+	((DEF IDENTIFIER opt_args RUBY_BLOCK END)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function $2 "method"
+				     (if $3
+					 (semantic-parse-region
+					  (car $region3)
+					  (cdr $region3)
+					  'parameters 1)
+				       nil)))))
+       (class_def
+	((CLASS CONSTANT RUBY_BLOCK END)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $2 $1
+				 (semantic-parse-region
+				  (car $region3)
+				  (cdr $region3)
+				  'stmts 1)
+				 nil)))
+	((CLASS CONSTANT LT CONSTANT RUBY_BLOCK END)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $2 $1
+				 (semantic-parse-region
+				  (car $region5)
+				  (cdr $region5)
+				  'stmts 1)
+				 (cons $4 nil)))))
+       (module_def
+	((MODULE CONSTANT RUBY_BLOCK END)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $2 "module"
+				 (semantic-parse-region
+				  (car $region3)
+				  (cdr $region3)
+				  'stmts 1)
+				 nil))))
+       (exception
+	((RAISE))
+	((RAISE CONSTANT))
+	((RAISE CONSTANT STRING_LITERAL))
+	((RAISE STRING_LITERAL)))
+       (cmp_op
+	((EQUAL))
+	((NEQUAL))
+	((PLUS))
+	((MODULUS))
+	((BITXOR))
+	((BITOR))
+	((BITAND))
+	((MULT))
+	((EXP))
+	((MINUS))
+	((COMPLEMENT))
+	((REGEX_EQ))
+	((LT))
+	((GT))
+	((LTEQ))
+	((GTEQ))
+	((LTLT))
+	((GTGT))
+	((DIV))
+	((OBJ_EQ)))
+       (bool_op
+	((AND))
+	((OR))
+	((LOG_AND))
+	((LOG_OR)))
+       (assn_op
+	((EQUALS))
+	((PLUS_EQ))
+	((MOD_EQ))
+	((BITXOR_EQ))
+	((BITOR_EQ))
+	((BITAND_EQ))
+	((MULT_EQ))
+	((EXP_EQ))
+	((MINUS_EQ))
+	((LTLT_EQ))
+	((GTGT_EQ))
+	((DIV_EQ))
+	((LOGAND_EQ))
+	((LOGOR_EQ))))
+     '(stmts parameters)))
+  "Parser table.")
+
+(defun wisent-ruby-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-ruby-wy--parse-table
+	semantic-debug-parser-source "wisent-ruby.wy"
+	semantic-flex-keywords-obarray wisent-ruby-wy--keyword-table
+	semantic-lex-types-obarray wisent-ruby-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+(provide 'wisent-ruby-wy)
+
+;;; wisent-ruby-wy.el ends here
diff --git a/site/cedet-1.0pre7/contrib/wisent-ruby.el b/site/cedet-1.0pre7/contrib/wisent-ruby.el
new file mode 100644
index 0000000..6e33a15
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-ruby.el
@@ -0,0 +1,323 @@
+;;; wisent-ruby.el: Lexer and parser support for wisent
+;;; ruby grammar. 
+
+;;; Copyright (C) 2007 Daniel Debertin (debertin@gmail.com)
+
+;; This is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Depends on ruby-mode.el (not part of Emacs). You can find ruby-mode
+;; in the misc/ directory of the Ruby source code (www.ruby-lang.org).
+
+;; This is support in semantic for a minimal Ruby grammar. It allows
+;; extraction of constant, variable, and class and method extraction,
+;; but is as yet unable to do more subtle things like context
+;; derivation and "intellisense mode". Work on these items is
+;; ongoing, but feel free to contact the author if you would like
+;; to contribute to wisent-ruby's development.
+;; 
+
+(require 'semantic)
+(condition-case nil
+    (require 'ruby-mode)
+  (error (message "Can't find ruby-mode.el")))
+
+(require 'wisent-ruby-wy)
+
+;; Lexers for handling values expressed as literals
+(define-lex-regex-analyzer semantic-lex-ruby-delimited-input
+  "Handle literals expressed as delimited productions"
+  "%\\([qQwWrx]?\\)\\(?:{[^\}]*}\\|\\[[^\]]*\\]\\|\([^\)]*\)\\|<[^>]*>\\|\\(.\\)[^\\2]*\\2\\)\\([imox]*\\)"
+  (let ((marker (match-string 1))
+	(options (match-string 3)))
+    (cond ((or (string-match "[qQ]" marker)
+	       (not marker))
+	   (lex-token-at-pt 'STRING_LITERAL 'ruby-forward-sexp 1))
+	  ((string-match "[wW]" marker)
+	   (lex-token-at-pt 'ARRAY_LITERAL 'ruby-forward-sexp 1))
+	  ((string-equal marker "r")
+	   (lex-token-at-pt 'REGEXP_LITERAL 'ruby-forward-sexp (if options 2 1)))
+	  ((string-equal marker "x")
+	   (lex-token-at-pt 'SHELL_COMMAND_LITERAL 'ruby-forward-sexp 1)))
+    (setq semantic-lex-end-point (point))))
+
+;; TODO -- floats!
+(define-lex-regex-analyzer semantic-lex-ruby-numbers
+  "Handle number literals in various bases and formats"
+  "-?\\(0b[01]+\\|0[0-7]+\\|0x[[:digit:]A-Fa-f]+\\|\\(?:0d\\)?[1-9][[:digit:]_]*\\)"
+  (lex-token-at-pt 'INTEGER_LITERAL 'goto-char (match-end 0)))
+
+(define-lex-regex-analyzer semantic-lex-ruby-strings
+  "Handle string literals"
+  "\\(\"[^\"]*\"\\|\'[^\']*\'\\|\`[^\`]*\`\\)"
+  (if (string-equal (substring (match-string 1) 0 1) "`")
+      (lex-token-at-pt 'SHELL_COMMAND_LITERAL 'ruby-forward-sexp 1)
+    (lex-token-at-pt 'STRING_LITERAL 'ruby-forward-sexp 1)))
+
+(define-lex-regex-analyzer semantic-lex-ruby-ranges
+  "Handle range literals"
+  "\\.\\.\\.?"
+  (lex-token-at-pt 'RANGE_LITERAL 'goto-char (match-end 0)))
+
+(define-lex-regex-analyzer semantic-lex-ruby-arrays
+  "Handle literal arrays"
+  "\\[\\([^,]*, *\\)*[^,]*\\]"
+  (lex-token-at-pt 'ARRAY_LITERAL 'ruby-forward-sexp 1))
+
+(define-lex-regex-analyzer semantic-lex-ruby-hashes
+  "Handle literal hashes"
+  "{\\(\\s*[^[:space:]]+\\s*=>\\s*[^[:space:]]+,\\)*\\s*[^[:space:]]+\\s*=>\\s*[^[:space:]]+\\s*}"
+  (lex-token-at-pt 'HASH_LITERAL 'ruby-forward-sexp 1))
+
+(define-lex-regex-analyzer semantic-lex-ruby-symbols
+  "Handle literal symbols"
+  ":[^[:space:]]+"
+  (lex-token-at-pt 'SYMBOL_LITERAL 'ruby-forward-sexp 1))
+
+(define-lex-regex-analyzer semantic-lex-ruby-regexps
+  "Handle literal REs"
+  "/[^/]+/\\([imox]*\\)"
+  (lex-token-at-pt 'REGEXP_LITERAL 'ruby-forward-sexp (if (match-string 1) 2 1)))
+
+
+;; Other non-literal lexers
+(define-lex-regex-analyzer semantic-lex-ruby-variables
+  "Lex variables of various types"
+  "\\(@@\\|@\\|\\$\\|[A-Z]\\|[a-z_]\\)[A-Za-z0-9_]*"
+  (let ((marker (match-string 1)))
+    (cond ((string-equal marker "@")
+	   (lex-token-at-pt 'VAR_INSTANCE 'ruby-forward-sexp 1))
+	  ((string-equal marker "@@")
+	   (lex-token-at-pt 'VAR_CLASS 'ruby-forward-sexp 1))
+	  ((string-equal marker "$")
+	   (lex-token-at-pt 'VAR_GLOBAL 'ruby-forward-sexp 1))
+	  ((string-match "[A-Z]" (or marker ""))
+	   (lex-token-at-pt 'CONSTANT 'ruby-forward-sexp 1))
+	  (t
+	   (lex-token-at-pt 'VAR_LOCAL 'ruby-forward-sexp 1)))))
+
+(define-lex-regex-analyzer semantic-lex-ruby-keywords
+  "ID or keyword tokens"
+  "[a-z0-9_][A-Za-z0-9_]*"
+  (lex-token-at-pt (or (semantic-lex-keyword-p (match-string 0))
+		       'IDENTIFIER) 'ruby-forward-sexp 1))
+
+;; Put this AFTER semantic-lex-ruby-hashes
+(define-lex-block-analyzer semantic-lex-ruby-punctuated-blocks
+  "Lex delimited blocks"
+  (PAREN_BLOCK ("(" LPAREN) (")" RPAREN))
+  (BRACE_BLOCK ("{" LBRACE) ("}" RBRACE)))
+
+;; This gargantuan function is used to parse stmts that encompass a
+;; RUBY_BLOCK -- a block of code delimited by (something) ... END.  A
+;; lot of constructions do this, but never in a way that could be
+;; generalized. So we have to "hand-lex" each one individually. It's
+;; messy, but necessary.
+(define-lex-regex-analyzer semantic-lex-ruby-blocks
+  "Lex blocks"
+  ruby-block-beg-re
+  (incf semantic-lex-current-depth)
+  (if (>= semantic-lex-current-depth semantic-lex-maximum-depth)
+      (let ((matched-token (match-string 0))
+	    (block-start (point))
+	    (block-end (save-excursion
+			 (ruby-end-of-block)
+			 (forward-word 1)
+			 (point))))
+	(save-excursion
+	  (cond ((string-match "\\(class\\|module\\)" matched-token)
+		 (progn
+		   (lex-token-at-pt (word-at-point) 'forward-word 1)
+		   (incf semantic-lex-current-depth)
+		   (forward-char 1)
+		   (if (string-match "[A-Z][A-Za-z0-9_]*" (word-at-point))
+		       (lex-token-at-pt 'CONSTANT 'ruby-forward-sexp 1))
+		   (if (and (string-equal matched-token "class")
+			    (looking-at " *<"))
+		       (progn
+			 (lex-token-at-pt 'LT '(lambda () (forward-sexp 1) (backward-sexp 1)))
+			 (if (looking-at "[A-Z][A-Za-z0-9_]*")
+			     (lex-token-at-pt 'CONSTANT 'ruby-forward-sexp 1))))
+		   (lex-token-at-pt 'RUBY_BLOCK '(lambda () (goto-char block-start) (ruby-end-of-block)))))
+		((string-equal "def" matched-token)
+		 (progn
+		   (lex-token-at-pt (word-at-point) 'forward-word 1)
+		   (forward-char 1)
+		   (lex-token-at-pt 'IDENTIFIER 'ruby-forward-sexp 1)
+		   (if (looking-at " *(")
+		       (lex-token-at-pt 'PAREN_BLOCK 'forward-sexp 1))
+		   (lex-token-at-pt 'RUBY_BLOCK 'ruby-end-of-block)))
+		((string-equal "begin" matched-token)
+		 (progn
+		   (incf semantic-lex-current-depth)
+		   (lex-token-at-pt 'BEGIN 'forward-sexp 1)
+		   (let ((start (point)))
+		     (save-restriction
+		       (narrow-to-region (point) block-end)
+		       (while (re-search-forward "\\(rescue\\|ensure\\|end\\)" nil t)
+			 (backward-word 1)
+			 (semantic-lex-push-token
+			  (semantic-lex-token 'RUBY_BLOCK start (point)))
+			 (lex-token-at-pt (word-at-point) 'forward-word 1)
+			 (if (looking-at " *[A-Z][A-Za-z0-9_]*")
+			     (lex-token-at-pt 'CONSTANT 'forward-word 1))
+			 (if (looking-at " *=> *")
+			     (progn
+			       (lex-token-at-pt 'HASH_REF '(lambda () (forward-sexp 1) (backward-sexp 1)))
+			       (lex-token-at-pt 'IDENTIFIER 'forward-sexp 1)))
+			 (setq start (point)))
+		       (ruby-end-of-block)))))
+		 ((string-match "\\(if\\|unless\\|while\\|until\\)" matched-token)
+		 (progn
+		   (semantic-lex-unterminated-syntax-protection 'RUBY_BLOCK
+		   (lex-token-at-pt (word-at-point) 'forward-sexp 1)
+		   (if (looking-at " *(")
+		       (lex-token-at-pt 'PAREN_BLOCK 'forward-sexp 1))
+		     (lex-token-at-pt 'RUBY_BLOCK 'ruby-end-of-block))))
+		((string-equal "for" matched-token)  ; who uses 'for', anyway?
+		 (progn
+		   (lex-token-at-pt (word-at-point) 'forward-sexp 1)
+		   (lex-token-at-pt 'RUBY_BLOCK 'ruby-end-of-block)))
+		((string-equal "case" matched-token)
+		 (let ((initial t)
+		       (start (point)))
+		   (lex-token-at-pt (word-at-point) 'forward-word 1) ;; case
+		   (forward-char 1)
+		   (lex-token-at-pt 'IDENTIFIER 'forward-word 1) ;; thingy after case
+		   (while (re-search-forward "\\(when\\|else\\|end\\)" nil t)
+		     (backward-word 1)
+		     (if (not initial)
+			 (semantic-lex-push-token
+			  (semantic-lex-token 'RUBY_BLOCK start (1- (point)))) ;; preceding block
+		       (setq initial nil))
+		     (lex-token-at-pt (word-at-point) 'forward-word 1) ;; when
+		     (if (not (string-equal (word-at-point) "end"))
+			 (progn
+			   (forward-char 1)
+			   (if (string-equal (match-string-no-properties 0) "when")
+			       (lex-token-at-pt 'IDENTIFIER 'forward-word 1)))) ;; thingy after when
+		     (setq start (point)))))
+		((string-equal "do" matched-token)
+		 (progn
+		   (lex-token-at-pt (word-at-point) 'forward-sexp 1)
+		   (lex-token-at-pt 'RUBY_BLOCK 'ruby-end-of-block))))
+	  (setq semantic-lex-end-point (point))))
+    (lex-token-at-pt (word-at-point) 'forward-sexp 1)
+    (setq semantic-lex-end-point (point))))
+    
+(define-lex-regex-analyzer semantic-lex-ruby-newline
+  "Detect newlines"
+  "\\s-*\n+\\s-*"
+  (goto-char (match-end 0))
+  (semantic-lex-push-token
+   (semantic-lex-token 'NEWLINE (1- (point)) (point))))
+		 
+;; Lexer support functions
+(defun lex-token-at-pt (type forwardfn &rest fw-args)
+  "Eat and lex the token at point, leave point at the end of the token"
+  (let ((start (point))
+	(kw (or (and (symbolp type) type) (semantic-lex-keyword-p type))))
+    (apply forwardfn fw-args)
+    (semantic-lex-push-token
+     (semantic-lex-token kw start (point)))))
+
+(define-lex wisent-ruby-lexer
+  "Lexical analyzer for Ruby"
+  semantic-lex-ignore-comments
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-whitespace
+  semantic-lex-ruby-delimited-input
+  semantic-lex-ruby-numbers
+  semantic-lex-ruby-blocks
+  semantic-lex-ruby-keywords
+  semantic-lex-ruby-variables
+  semantic-lex-ruby-strings
+  semantic-lex-ruby-ranges
+  semantic-lex-ruby-arrays
+  semantic-lex-ruby-hashes
+  semantic-lex-ruby-punctuated-blocks
+  semantic-lex-ruby-symbols
+  semantic-lex-ruby-regexps
+  semantic-lex-punctuation-type
+  semantic-lex-default-action)
+
+(defvar semantic-lex-ruby-assigned-vars nil
+  "List of variables assigned by ruby.")
+(make-variable-buffer-local 'semantic-lex-ruby-assigned-vars)
+
+(defun wisent-ruby-default-setup ()
+  (wisent-ruby-wy--install-parser)
+  (setq case-fold-search nil
+	semantic-lex-analyzer 'wisent-ruby-lexer
+	semantic-lex-ruby-assigned-vars ()
+	semantic-tag-expand-function 'wisent-ruby-expand-tags))
+;;	semantic-dependency-include-path wisent-ruby-include-path
+;;	wisent-ruby-current-protection 'public))
+
+(defun process-assignment-variables (vars)
+  (dolist (v vars)
+    (if (string-match "^[a-z_]" v)
+	(pushnew v semantic-lex-ruby-assigned-vars :test 'string-equal))))
+
+(defun wisent-ruby-expand-tags (tag)
+  "Expand or otherwise post-process incoming tags from the parser"
+  (cond ((semantic-tag-of-class-p tag 'include)
+	 (let* ((tag-name (semantic-tag-name tag))
+		(dep-file (substring tag-name 1 (1- (length tag-name))))
+		(dep-file-with-ext (if (not (string-match ".*\\.rb$" dep-file))
+				       (concat dep-file ".rb")
+				     dep-file)))
+	   (list (semantic-tag-new-include dep-file-with-ext nil))))
+	((semantic-tag-of-class-p tag 'attribute)
+	 (let ((read-symbols (mapcar '(lambda (s) (substring s 1))
+				     (semantic-tag-get-attribute tag :symbols)))
+	       (write-symbols (mapcar '(lambda (s) (concat (substring s 1) "="))
+				      (semantic-tag-get-attribute tag :symbols)))
+	       (functions))
+	   (if (or (string-equal (semantic-tag-name tag) "reader")
+		   (string-equal (semantic-tag-name tag) "accessor"))
+	       (dolist (fun read-symbols)
+		 (push (semantic-tag-new-function fun "method" (list nil)) functions)))
+	   (if (or (string-equal (semantic-tag-name tag) "writer")
+		   (string-equal (semantic-tag-name tag) "accessor"))
+	       (dolist (fun write-symbols)
+		 (push (semantic-tag-new-function fun "method" (list "newvalue")) functions)))
+	   (dolist (fun functions)
+	     (semantic-tag-set-bounds fun (semantic-tag-start tag) (semantic-tag-end tag)))
+	   functions))))
+
+;; These two funcs are boilerplate until the type-tag system is nailed down.
+(defun set-current-protection-context (level)
+  nil)
+
+(defun set-tag-protection (sym level)
+  nil)
+	   
+(defun variable-type (var)
+  "Do the same thing as semantic-lex-ruby-variables, but as a function, not a lexer"
+  (cond ((string-match "^@@" var)
+	 'class)
+	((string-match "^@" var)
+	 'instance)
+	((string-match "^\\$" var)
+	 'global)
+	((string-match "^[A-Z]" var)
+	 'constant)
+	(t
+	 'local)))
+
+;;; wisent-ruby.el ends here
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/contrib/wisent-ruby.wy b/site/cedet-1.0pre7/contrib/wisent-ruby.wy
new file mode 100644
index 0000000..37eea45
--- /dev/null
+++ b/site/cedet-1.0pre7/contrib/wisent-ruby.wy
@@ -0,0 +1,579 @@
+;;; wisent-ruby.wy: Lexer and parser support for wisent
+;;; ruby grammar. 
+
+;;; Copyright (C) 2007 Daniel Debertin (debertin@gmail.com)
+
+;; This is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This is not a complete ruby grammar. It parses out "infrastructure"
+;; (i.e. classes, methods, and so on) declarations and makes them
+;; available to the semantic framework, which is enough for
+;; some tools, but a full Ruby grammar is under way that will
+;; parse ALL ruby constructs.
+
+;;; History:
+;;
+;;; Code:
+;;
+
+
+%package wisent-ruby-wy
+%languagemode ruby-mode
+%start stmts
+%start parameters
+;;%start expression
+
+;; Local symbols
+%token <identifier> IDENTIFIER
+%token <rubystring> STRING_LITERAL
+%token <rubyarray> ARRAY_LITERAL
+%token <rubyregexp> REGEXP_LITERAL
+%token <rubycmd> SHELL_COMMAND_LITERAL
+%token <rubynumber> INTEGER_LITERAL
+%token <rubyrange> RANGE_LITERAL
+%token <rubyhash> HASH_LITERAL
+%token <rubysymbol> SYMBOL_LITERAL
+%token <rubyivar> VAR_INSTANCE
+%token <rubycvar> VAR_CLASS
+%token <rubygvar> VAR_GLOBAL
+%token <rubyconst> CONSTANT
+%token <rubylvar> VAR_LOCAL
+%token <parenblock> PAREN_BLOCK
+%token <braceblock> BRACE_BLOCK
+%token <rubyblock> RUBY_BLOCK
+%token <newline> NEWLINE
+
+;; Language keyword tokens
+;; This is the base list of reserved words. 
+;; More will be added later.
+%token FILE "__FILE__"
+%put FILE summary "__FILE__: The current file"
+%token LINE "__LINE__"
+%put LINE summary "__LINE__: The current line"
+%token BEGIN_BLOCK "BEGIN"
+%put BEGIN_BLOCK summary "BEGIN { ... }"
+%token END_BLOCK "END"
+%put END_BLOCK summary "END { ... }"
+%token ALIAS "alias"
+%put ALIAS summary "ALIAS method1 method2"
+%token AND "and"
+%put AND summary "and: logical AND"
+%token BEGIN "begin"
+%put BEGIN summary "BEGIN ... [rescue,ensure] ... end"
+%token BREAK "break"
+%put BREAK summary "break: terminate current block"
+%token CASE "case"
+%put CASE summary "CASE <lhs> when <rhs> ... when <rhs> ... end"
+%token CLASS "class"
+%put CLASS summary "CLASS <classname> [< parentclass] ... end"
+%token DEF "def"
+%put DEF summary "DEF <method_name> ([method_args]) <method_body> end"
+%token DEFINED_P "defined?"
+%put DEFINED_P summary "defined?(<value>)"
+%token DO "do"
+%put DO summary "DO <body> end"
+%token ELSE "else"
+%put ELSE summary "if(<expression>) ... ELSE ... end"
+%token ELSIF "elsif"
+%put ELSIF summary "if(<expression>) ... ELSIF(<expression>) ... end"
+%token END "end"
+%put END summary "end: block end"
+%token ENSURE "ensure"
+%put ENSURE summary "begin ... ENSURE ... end"
+%token FALSE "false"
+%put FALSE summary "false: false value"
+%token FOR "for"
+%put FOR summary "FOR x in y ... end"
+%token IF "if"
+%put IF summary "IF(<expression>) ... end"
+%token IN "in"
+%put IN summary "for x IN y ... end"
+%token MODULE "module"
+%put MODULE summary "MODULE <module_name> <module_body> end"
+%token NEXT "next"
+%put NEXT summary "next: continue to next block iteration"
+%token NIL "nil"
+%put NIL summary "nil: no value"
+%token NOT "not"
+%put NOT summary "not: logical NOT"
+%token OR "or"
+%put OR summary "or: logical OR"
+%token REDO "redo"
+%put REDO summary "redo: try current iteration again"
+%token RESCUE "rescue"
+%put RESCUE summary "begin ... RESCUE [exception_name] <body> end"
+%token RETRY "retry"
+%put RETRY summary "begin ... rescue [exception] ... RETRY ... end"
+%token RETURN "return"
+%put RETURN summary "return: return control to the caller permanently"
+%token SELF "self"
+%put SELF summary "self: the current instance"
+%token SUPER "super"
+%put SUPER summary "super: the superclass method"
+%token THEN "then"
+%put THEN summary "if(<expression>) THEN ... end"
+%token TRUE "true"
+%put TRUE summary "true: true value"
+%token UNDEF "undef"
+%put UNDEF summary "I have no idea what this does"
+%token UNLESS "unless"
+%put UNLESS summary "UNLESS(<expression>) ... end"
+%token UNTIL "until"
+%put UNTIL summary "UNTIL(<expression>) ... end"
+%token WHEN "when"
+%put WHEN summary "case <lhs> WHEN <rhs> ... end"
+%token WHILE "while"
+%put WHILE summary "WHILE(<expression>) ... end"
+%token YIELD "yield"
+%put YIELD summary "yield: return control to the caller until called again"
+
+;; Non-reserved words that are mixed into Object by Kernel
+%token REQUIRE "require"
+%put REQUIRE summary "require <file>"
+%token ATTR_READER "attr_reader"
+%put ATTR_READER summary "attr_reader <symbol_list>"
+%token ATTR_WRITER "attr_writer"
+%put ATTR_WRITER summary "attr_writer <symbol_list>"
+%token ATTR_ACCESSOR "attr_accessor"
+%put ATTR_ACCESSOR summary "attr_accessor <symbol_list>"
+%token INCLUDE "include"
+%put INCLUDE summary "INCLUDE <module_name>"
+%token EXTEND "extend"
+%put EXTEND summary "EXTEND <module_name>"
+%token PROT_PUBLIC "public"
+%put PROT_PUBLIC summary "public: public protection"
+%token PROT_PROTECTED "protected"
+%put PROT_PROTECTED summary "protected: class-level protection"
+%token PROT_PRIVATE "private"
+%put PROT_PRIVATE summary "private: instance-level protection"
+%token LOOP "loop"
+%put LOOP summary "loop .... end"
+%token RAISE "raise"
+%put RAISE summary "RAISE [<exception_type>] [<message>]"
+%token CATCH "catch"
+%put CATCH summary "CATCH <tag> do ...[throw <tag>] ... end"
+%token THROW "throw"
+%put THROW summary "THROW <anchor>[, <retval>]"
+%token PROC "proc"
+%put PROC summary "proc { [<|args|>] ... }"
+%token LAMBDA "lambda"
+%put LAMBDA summary "lambda { [<|args|>] ... }"
+
+;; Block delimiters. Ruby blocks (do .. end, etc.) are specially
+;; treated by the lexer and do not appear here.
+%token <open-paren> LBRACK "["
+%token <close-paren> RBRACK "]"
+%token <open-paren> LPAREN "("
+%token <close-paren> RPAREN ")"
+%token <open-paren> LBRACE "{"
+%token <open-paren> RBRACE "}"
+
+;; Operators and other punctuation
+%token <punctuation> EQUALS "="
+%token <punctuation> PERIOD "."
+%token <punctuation> EQUAL "=="
+%token <punctuation> NEQUAL "!="
+%token <punctuation> PLUS "+"
+%token <punctuation> PLUS_EQ "+="
+%token <punctuation> COMMA ","
+%token <punctuation> BANG "!"
+%token <punctuation> MODULUS "%"
+%token <punctuation> MOD_EQ "%="
+%token <punctuation> BITXOR "^"
+%token <punctuation> BITXOR_EQ "^="
+%token <punctuation> BITOR "|"
+%token <punctuation> BITOR_EQ "|="
+%token <punctuation> BITAND "&"
+%token <punctuation> BITAND_EQ "&="
+%token <punctuation> MULT "*"
+%token <punctuation> MULT_EQ "*="
+%token <punctuation> EXP "**"
+%token <punctuation> EXP_EQ "**="
+%token <punctuation> MINUS "-"
+%token <punctuation> MINUS_EQ "-="
+%token <punctuation> COMPLEMENT "~"
+%token <punctuation> REGEX_EQ "=~"
+%token <punctuation> COLON ":"
+%token <punctuation> TERNARY_COND "?"
+%token <punctuation> LT "<"
+%token <punctuation> GT ">"
+%token <punctuation> LTEQ "<="
+%token <punctuation> GTEQ ">="
+%token <punctuation> LTLT "<<"
+%token <punctuation> GTGT ">>"
+%token <punctuation> LTLT_EQ "<<="
+%token <punctuation> GTGT_EQ ">>="
+%token <punctuation> HEREDOC "<<-"
+%token <punctuation> BACKQUOTE "`"
+%token <punctuation> DIV "/"
+%token <punctuation> DIV_EQ "/="
+%token <punctuation> SEMICOLON ";"
+%token <punctuation> LOG_AND "&&"
+%token <punctuation> LOG_OR "||"
+%token <punctuation> LOGAND_EQ "&&="
+%token <punctuation> LOGOR_EQ "||="
+%token <punctuation> NAMESPACE_DEREF "::"
+%token <punctuation> OBJ_EQ "==="
+%token <punctuation> HASH_REF "=>"
+
+%%
+
+stmts: ;; Empty program!
+     | stmt
+     | stmt separators stmts
+     ;
+
+;;stmt: expression opt_cond
+;;    | definition opt_cond
+;;    | simple_stmt opt_cond
+;;    ;
+
+stmt: expression
+    | definition
+    | simple_stmt
+    ;
+
+;; Like in Perl, every stmt can have a conditional attached to the end.
+opt_cond: ;; Empty
+	| conditional_exp
+	;
+
+separator: NEWLINE
+	 | SEMICOLON
+	 ;
+
+separators: separator
+	  | separator separators
+	  ;
+
+definition: method_def
+	  | class_def
+	  | module_def
+	  ;
+
+simple_stmt: require 
+	   | super 
+	   | alias 
+	   | attr_decl 
+	   | mixin 
+	   | access_decl 
+	   | loop_control 
+	   | return 
+	   | exception 
+	   ;
+
+require: REQUIRE STRING_LITERAL
+	 (INCLUDE-TAG $2 nil)
+       ;
+
+super: SUPER opt_args
+       (CODE-TAG "super" nil)
+     ;
+
+opt_args: ;; Empty
+	| PAREN_BLOCK
+	  (EXPANDFULL $1 parameters)
+	;
+
+parameters: ;; Empty
+	  | LPAREN
+	  | RPAREN
+	  | parameter COMMA
+	    (VARIABLE-TAG $1 nil nil)
+	  | parameter RPAREN
+	    (VARIABLE-TAG $1 nil nil)
+	  ;
+
+parameter: expression_term
+	 | expression_term EQUALS literal
+	 ;
+
+alias: ALIAS IDENTIFIER IDENTIFIER
+       (FUNCTION-TAG $2 "alias" nil nil)
+     ;
+
+attr_decl: ATTR_READER symbol_list
+	   (TAG "reader" 'attribute :symbols $2)
+	 | ATTR_WRITER symbol_list
+	   (TAG "writer" 'attribute :symbols $2)
+	 | ATTR_ACCESSOR symbol_list
+	   (TAG "accessor" 'attribute :symbols $2)
+	 ;
+
+symbol_list: SYMBOL_LITERAL
+	     (list $1)
+	   | SYMBOL_LITERAL COMMA symbol_list
+	     (append (list $1) $3)
+	   ;
+
+;; TODO: This should find the appropriate enclosing class
+;; and update its list of interface-parents.
+mixin: INCLUDE CONSTANT
+       (CODE-TAG "mixin" nil)
+     | EXTEND CONSTANT
+       (CODE-TAG "mixin" nil)
+     ;
+
+protection: PROT_PUBLIC
+	  | PROT_PROTECTED
+	  | PROT_PRIVATE
+	  ;
+
+;; TODO: This should actually do something useful.
+access_decl: protection
+	     (set-current-protection-context $1)
+	   | protection symbol_list
+	     (dolist (sym $2)
+	       (set-tag-protection sym $1))
+	   ;
+
+loop_control: BREAK opt_exp
+	      (CODE-TAG "loop_control" 'break :value $2)
+	    | NEXT opt_exp
+	      (CODE-TAG "loop_control" 'next :value $2)
+	    | REDO
+	      (CODE-TAG "loop_control" 'redo)
+	    | RETRY
+	      (CODE-TAG "loop_control" 'retry)
+	    | THROW SYMBOL_LITERAL opt_exp
+	      (CODE-TAG "throw" $2 :value $3)
+	    ;
+
+opt_exp: ;; Empty
+       | expression
+       ;
+
+return: RETURN opt_exp
+	(CODE-TAG "return" nil)
+      ;
+
+expression_term: literal
+	       | varref
+	       | methodcall
+	       ;
+
+literal: STRING_LITERAL
+       | ARRAY_LITERAL
+       | REGEXP_LITERAL
+       | SHELL_COMMAND_LITERAL
+       | INTEGER_LITERAL
+       | HASH_LITERAL
+       | SYMBOL_LITERAL
+       | boolean_literal
+       | NIL
+       ;
+
+boolean_literal: TRUE
+	       | FALSE
+	       ;
+
+varref: VAR_INSTANCE
+      | VAR_CLASS
+      | VAR_GLOBAL
+      | CONSTANT
+      | VAR_LOCAL
+      ;
+
+method_head: receiver IDENTIFIER
+	   | IDENTIFIER
+	   ;
+
+methodcall: method_head
+	  | method_head PAREN_BLOCK
+	  | method_head code_block
+	  | method_head PAREN_BLOCK code_block
+	  ;
+
+
+receiver: CONSTANT PERIOD
+	| IDENTIFIER PERIOD
+	| literal PERIOD
+	; 
+
+code_block: BRACE_BLOCK
+	  | DO RUBY_BLOCK
+	  ;
+
+expression: operator_exp
+	    (CODE-TAG "expression" nil)
+	  | assignment_exp
+	    (progn
+	      (process-assignment-variables $1)
+	      (CODE-TAG "assignment" nil))    ;; TODO: This should also emit a VARIABLE-TAG.
+	  | block_exp
+	    (CODE-TAG "block_expression" nil)
+	  | conditional_exp
+	    (CODE-TAG "cond_exp" nil)
+	 ;;	  | ternary_exp               ;; TODO: These don't work yet.
+;;	    (CODE-TAG "ternary_exp" nil)
+	  | case_exp
+	    (CODE-TAG "case" nil)
+	  | iteration_exp
+	    (CODE-TAG "iteration" nil)
+	  | expression_term
+	    (if (member $1 semantic-lex-ruby-assigned-vars)
+		(CODE-TAG "expression_term" nil)
+	      (CODE-TAG "methodcall" nil))
+	  ;
+
+expressions: expression
+	   | expression bool_op expressions
+	   ;
+
+operator_exp: expression_term cmp_op expression_term
+	    | expression_term cmp_op operator_exp
+	    ;
+
+assignment_exp: expression_term assn_op expression_term
+		(list $1)
+	      | expression_term assn_op assignment_exp
+		(append (list $1) $3)
+	      ;
+
+block_exp: BEGIN inner_block END
+	 ;
+
+inner_block: RUBY_BLOCK
+           | RUBY_BLOCK rescues
+	   | RUBY_BLOCK ENSURE RUBY_BLOCK
+	   | RUBY_BLOCK rescues ENSURE RUBY_BLOCK
+	   ;
+
+rescues: RESCUE RUBY_BLOCK
+       | RESCUE exception_catch RUBY_BLOCK
+       | RESCUE exception_catch RUBY_BLOCK rescues
+       ;
+
+exception_catch: CONSTANT
+	       | CONSTANT HASH_REF IDENTIFIER
+	       ;
+
+conditional_exp_arg: expression
+		   | PAREN_BLOCK
+		   ;
+
+aux_cond: ELSIF conditional_exp_arg opt_then RUBY_BLOCK
+	| ELSIF conditional_exp_arg opt_then RUBY_BLOCK aux_cond
+	| ELSE RUBY_BLOCK END
+	;
+
+conditional_exp: cond_kw conditional_exp_arg opt_then RUBY_BLOCK END
+	       | cond_kw conditional_exp_arg opt_then RUBY_BLOCK aux_cond END
+	       ;
+
+cond_kw: IF
+       | UNLESS
+       ;
+
+opt_then: ;; Empty
+	| THEN
+	;
+
+ternary_exp: expression TERNARY_COND expression_term COLON expression_term
+	   ;
+
+case_exp: CASE IDENTIFIER when_blocks END
+	;
+
+when_blocks: WHEN IDENTIFIER RUBY_BLOCK
+	   | WHEN IDENTIFIER RUBY_BLOCK when_blocks
+	   | ELSE RUBY_BLOCK
+	   ;
+
+iteration_exp: cond_iter_kw conditional_exp_arg RUBY_BLOCK END
+	     | FOR RUBY_BLOCK END
+	     | LOOP DO RUBY_BLOCK END
+	     | LOOP BRACE_BLOCK
+	     ;
+
+cond_iter_kw: WHILE
+	    | UNTIL
+	    ;
+
+method_def: DEF IDENTIFIER opt_args RUBY_BLOCK END
+	    (FUNCTION-TAG $2 "method" (if $3 (EXPANDFULL $3 parameters) nil))
+	  ;
+
+class_def: CLASS CONSTANT RUBY_BLOCK END
+	   (TYPE-TAG $2 $1 (EXPANDFULL $3 stmts) nil)
+	 | CLASS CONSTANT LT CONSTANT RUBY_BLOCK END
+	   (TYPE-TAG $2 $1 (EXPANDFULL $5 stmts) (cons $4 nil))
+	 ;
+
+module_def: MODULE CONSTANT RUBY_BLOCK END
+	    (TYPE-TAG $2 "module" (EXPANDFULL $3 stmts) nil)
+	  ;
+
+exception: RAISE 
+	 | RAISE CONSTANT
+	 | RAISE CONSTANT STRING_LITERAL
+	 | RAISE STRING_LITERAL
+	 ;
+
+
+
+
+
+
+;; Infrastructure productions
+
+cmp_op: EQUAL
+      | NEQUAL
+      | PLUS
+      | MODULUS
+      | BITXOR
+      | BITOR
+      | BITAND
+      | MULT
+      | EXP
+      | MINUS
+      | COMPLEMENT
+      | REGEX_EQ
+      | LT
+      | GT
+      | LTEQ
+      | GTEQ
+      | LTLT
+      | GTGT
+      | DIV
+      | OBJ_EQ
+      ;
+
+bool_op: AND
+       | OR
+       | LOG_AND
+       | LOG_OR
+       ;
+
+assn_op: EQUALS
+       | PLUS_EQ
+       | MOD_EQ
+       | BITXOR_EQ
+       | BITOR_EQ
+       | BITAND_EQ
+       | MULT_EQ
+       | EXP_EQ
+       | MINUS_EQ
+       | LTLT_EQ
+       | GTGT_EQ
+       | DIV_EQ
+       | LOGAND_EQ
+       | LOGOR_EQ
+       ;
+
+;;; wisent-ruby.wy ends here
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/ede/ChangeLog b/site/cedet-1.0pre7/ede/ChangeLog
new file mode 100644
index 0000000..a52e06d
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ChangeLog
@@ -0,0 +1,3276 @@
+2010-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-shell.el (ede-shell-buffer): Add missing * to end of buffer name.
+
+2010-02-21  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* autoconf-edit.el: Parse multiline parameters of macros.
+	Optionally ignore case and at bol for macro.
+
+2010-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-buffer-object):
+	Refine so if no target is found, we use the
+	most local project found.
+
+	* ede.texi (Creating a project):
+	Add note that you may not need to create a project.
+	(Extending EDE): Rewrite intro.  Add guide to what to read.
+	(Development Overview): New
+	(Detecting a Project): New
+	(EDE proj-project): New
+
+2010-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (autoconf-edit): New require.
+	(project-am-load): Simplify, removing ancient implementation
+	and replacing with code that lets EDE core do the work.
+
+	* ede-base.el (eieio, data-debug): New requires.
+
+	* ede.el (ede-minor-mode): Remove ede-directory-project-p test.
+	(ede-initialize-state-current-buffer):
+	If there is a matching open project, then do not do the
+	ede-directory-project-p test.
+
+	* ede-auto.el (ede-project-class-files):
+	Change proj file for automake back to just
+	"Makefile.am"
+
+	* Makefile (ede_LISP): Add ede-auto.el, ede-base.el, and ede-custom.el.
+
+	* Project.ede (ede): Add ede-auto.el, ede-base.el, and ede-custom.el.
+
+	* ede.el (ede-project-autoload): Moved to ede-auto.el.
+	(ede-target, ede-project-autoload, ede-project): Moved to ede-base.el
+	(ede-auto, ede-base): New require.
+	(ede-project-placeholder-cache-file)
+	(ede-project-cache-files, ede-project-cache-files)
+	(ede-save-cache, ede-load-cache): Moved to ede-base.el
+	(ede-minor-mode): Copy project finding to...
+	(ede-initialize-state-current-buffer): New from above.
+	(ede-reset-all-buffers): Use above.
+	(ede-subproject-relative-path, ede-subproject-p): Move to ede-base.el
+	(ede-custom*, customize-*): Move to ede-custom.el
+	(ede-project-force-load): Deleted
+	(project-interactive-select-target)
+	(project-add-file): don't use ede-project-force-load.
+	(ede-name) through (ede-html-documentation): copied to ede-base.el
+	(ede-dir-to-projectfile): Move to ede-auto.el
+	(ede-buffer-object): Take a projsym arg.
+	Set if it is a symbol.
+	(ede-maybe-checkout): Moved later in file.
+	(ede-target-sourcecode): Moved to ede-base.el
+	(ede-adebug-*): Move to ede-base.el
+
+	* .cvsignore: Add *.info.
+
+	* ede-proj.el (ede-proj-project::project-rescan):
+	Call ede-load-project-file instead of local version.
+	(ede-proj-target::project-rescan): Deleted.  (Unused?)
+
+	* ede-files.el: (ede-project-autoload::ede-project-root)
+	(ede-project-autoload::ede-project-root-directory):
+	Deleted.  Moved to ede-auto.el.
+	(ede-convert-path): Add optional PROJECT arg.
+
+	* ede-custom.el (ede-customize-*): Copied from ede.el.
+
+	* ede-base.el (ede-target,ede-project-placeholder,ede-project):
+	Copied classes and methods from ede.el.
+
+	* ede-auto.el (ede-project-autoload):
+	Copied this and methods from ede.el and ede-files.el
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-insert-variables):
+	Do not add CURDIR to top if this is a metasubproject.
+
+2010-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-buffer-object):
+	If we fail to find an object in the current
+	project, loop upward looking for a match.
+
+	* project-am.el (ede-find-target):
+	Deleted.  EDE core takes care of this.
+	I'm not sure why going down the tree looking for a target helps either.
+	(project-am-objectcode::ede-buffer-mine)
+	(project-am-lisp::ede-buffer-mine)
+	(project-am-texinfo::ede-buffer-mine)
+	(project-am-man::ede-buffer-mine):
+	Create the searched filename as relative.
+
+2010-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-load-makefile):
+	obey an optional suggested name.
+	(project-am-expand-subdirlist): New, extracted from below.
+	Make recursive, and strip out duplicates.
+	(project-am-makefile::project-rescan): Extract above.
+	Accept an optional suggested name.
+	combine SUBDIRS, and DIST_SUBDIRS.
+	For subprojects, suggest a name that is the subdirectory.
+
+2010-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: it's -> its doc fixes.
+
+	* ede.texi: Patch from Hannu Koivisto:
+	(Creating a project, Customize Features, Extending EDE):
+	it's -> its fixes.
+
+	* ede.el: (ede-target::project-delete-target)
+	(ede-load-project-file)
+	(ede-project::ede-set-project-variables):
+	it's -> its doc fixes.
+
+	* ede-targets.texi: Patch from Hannu Koivisto:
+	(ede-target, ede-proj-target):
+	it's -> its fixes.
+
+	* ede-speedbar.el (ede-speedbar-remove-file-from-target):
+	it's -> its doc fixes.
+
+	* ede-projects.texi: Patch from Hannu Koivisto:
+	(ede-project-placeholder):
+	it's -> its fixes.
+
+	* ede-proj.el (ede-proj-target::project-delete-target):
+	it's -> its doc fixes.
+
+	* ede-proj-comp.el (ede-compilation-program): it's -> its doc fixes
+
+	* ede-files.el: (ede-project-placeholder::ede-project-root)
+	(ede-project-autoload::ede-project-root)
+	(ede-directory-get-open-project)
+	(ede-toplevel-project): it's -> its doc fixes.
+
+	* ede-dired.el (ede-dired-add-to-target): it's -> its fixes.
+
+	* ede-compilers.texi: Patch from Hannu Koivisto:
+	(ede-compilation-program, ede-compiler, ede-object-compiler)
+	(semantic-ede-grammar-compiler-class, ede-linker):
+	it's -> its fixes.
+
+2009-12-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-make-dist): Always use toplevel project.
+
+	* ede-proj.el: (ede-proj-project::project-make-dist)
+	(ede-proj-project::project-compile-project):
+	Use ede-proj-automake-p to determine which kind of compile to use.
+
+2009-12-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-insert-variables):
+	If this is the top project, set TOP to CURDIR.
+
+2009-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-with-makefile-current): Add recentf-exclude
+
+	* ede.el (ede-save-cache): Fix recentf-exclude expression.
+
+2009-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-apply-preprocessor-map):
+	Be robust to lists of ede-object being a target in a buffer.
+
+	* ede-pmake.el (ede-proj-target-makefile::ede-proj-makefile-insert-variables):
+	Always output a target's object list, regardless of compiler's vars
+	already being in the Makefile.
+
+2009-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-emacs.el (ede-emacs-target-c::ede-preprocessor-map):
+	Add config.h to the list of headers producing necessary macros.
+
+2009-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-pmake-insert-variable-shared):
+	When searching for old variables,
+	go to the end of the buffer, then search backward from there.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-shell.el (ede-shell-run-something,ede-shell-buffer):
+	Add autoload cookies.
+
+	* project-am.el (require): ede-shell.
+	(project-am-objectcode::project-run-target): New.
+	Merge from Emacs:
+	(project-am-type-alist)
+	(project-am-target::project-add-file)
+	(project-am-makefile::project-rescan)
+	(project-am-package-info): Typo/whitespace fixes
+	(project-am-extract-package-info): Rerequire autoconf-edit
+	(project-am-with-makefile-current): Use new semantic hook.
+
+	* project-am.el (project-am-objectcode::project-run-target): New.
+
+	* ede-system.el (provide): Fix.
+
+	* ede-proj-prog.el (ede-proj-target-makefile-program::ede-proj-makefile-insert-automake-post-variables):
+	Merge from Emacs.
+	(ede-proj-target-makefile-program::project-run-target):
+	New.
+
+	* ede-shell.el (ede-target::ede-shell-run-something): Use below.
+	(ede-target::ede-shell-buffer): New.
+
+	* ede-linux.el (ede-linux-version): Don't call "head".
+	(ede-linux-load): Wrap dir in file-name-as-directory.
+	Set :version slot.
+
+	* ede-emacs.el (ede-emacs-file-existing):
+	Wrap "dir" in file-name-as-directory during compare.
+	(ede-emacs-version):
+	Now return the Emacs/XEmacs differentiator, and get version
+	number from different places, and don't call egrep.
+	(ede-emacs-load): Use above better.
+	Set :version slot.
+	Call file-name-as-directory to set the directory.
+
+2009-10-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-target::project-run-target): New.
+
+	* ede-proj-skel.el (project-run-target): New
+
+	* ede-files.el (ede-get-locator-object):
+	When enabling locate, do so on "top".
+
+	* Makefile (ELISPPRELOAD): New.
+	(init, ede, proj-project, projects): Add preloads.
+
+	* Project.ede (ede): Add ede-shell.el
+	(ede-load, ede, proj-project, projects): Change compiler to add preload.
+
+	* ede.el (ede-target): Add a run target menu.
+	(ede-project): Add a run target keybinding.
+	(ede-minor-keymap): Add a run target keybinding.
+	(ede-run-target): New.
+	(ede-target::project-run-target): New.
+
+	* ede-shell.el (ede-target::ede-shell-run-something):
+	Get the directory the target is in via the current project directory.
+
+	* ede-shell.el: Manage a running shell for running programs.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Call below for automake files.
+	(ede-proj-project::ede-proj-makefile-automake-insert-subdirs)
+	(ede-proj-project::ede-proj-makefile-automake-insert-extradist):
+	New.
+
+	* ede-pconf.el (ede-proj-project::ede-proj-configure-test-required-file):
+	Force FILE expanded to the current target.
+	Use file-exists-p to check for it existing.
+
+	* ede-proj-shared.el (ede-proj-makefile-target-name):
+	Always use .la extension.
+
+	* ede-proj-shared.el (ede-proj-target-makefile-shared-object):
+	Only libtool compilers now available.
+	Add linkers for libtool.
+	(ede-gcc-libtool-shared-compiler, ede-g++-libtool-shared-compiler):
+	Remove SHELL.  Remove COMMANDS.  Add :rules.
+	(ede-cc-linker-libtool, ede-g++-linker-libtool): New.
+
+2009-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Merge from Emacs:
+	(ede-proj-target): Fix typeo
+	(ede-proj-project::project-new-target):
+	Whitespace/error cleanup.
+	(ede-proj-project::project-make-dist)
+	(ede-proj-project::project-compile-project)
+	(ede-proj-project::ede-proj-dist-makefile):
+	Change how the makefile is calculated.
+
+	* ede-proj-obj.el: Merge from Emacs repository
+	(ede-g++-linker, ede-gfortran-linker, ede-ld-linker): Change link lines.
+
+	* ede-proj-obj.el: Patch from Chong Yidong
+	(ede-proj-target-makefile-objectcode): Add below to available linkers
+	(ede-cc-linker): New.
+
+2009-10-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-shared.el: Patch from Sascha Wilde
+	(ede-proj-project::ede-proj-configure-synchronize):
+	Provide libtool extension when using autotmake project type.
+
+	* ede-pconf.el (ede-proj-project::ede-proj-configure-synchronize):
+	Simplify autoconf use to just "autoreconf -i".
+
+2009-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (kill-emacs-hook): Comment out ede-save-cache.
+	(ede-load-cache): Don't call at startup.
+	(ede-target-forms-menu): Disable Add File option if there are no
+	targets.
+
+2009-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-target-elisp):
+	Update doc for pre-load-packages.
+
+	* ede-proj-comp.el (ede-compilation-program::ede-proj-makefile-insert-variables):
+	Only insert each variable once.
+	(ede-compilation-program::ede-proj-makefile-insert-commands):
+	Convert mapcar to mapc to fix byte comp warnings.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Convert mapcar to mapc.
+	(ede-pmake-insert-variable-once): New.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp):
+	Add pre-load-packages slot.
+	(ede-emacs-preload-compiler): New.
+	(ede-proj-makefile-insert-preload-items): New.
+	(ede-proj-target-elisp::ede-proj-makefile-insert-variables):
+	Create ELISPPRELOAD variable.
+
+2009-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project::ede-preprocessor-map):
+	Do not deref table for lexical table iff table is nil.
+
+2009-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pconf.el (ede-proj-project::ede-proj-configure-synchronize):
+	Auto autoreconf tool.
+	(ede-proj-target::ede-proj-tweak-autoconf): Also add linkers.
+
+	* autoconf-edit.el (autoconf-preferred-macro-order):
+	Change AM_PROG_LIBTOOL to AC_PROG_LIBTOOL.
+
+	* ede-proj-shared.el (ede-proj-target-makefile-shared-object):
+	Add g++ versions.
+	(ede-gcc-shared-compiler, ede-gcc-libtool-shared-compiler):
+	Use AC_PROG_LIBTOOL, not AM version.
+
+	* ede-pmake.el (ede-proj-target-makefile::ede-proj-makefile-dependencies):
+	When creating the intermediate object variable, use the target name
+	which is the same as with compiler section.
+
+2009-09-12  David Engster <dengste@eml.cc>
+
+	* ede-proj-archive.el (ede-proj-target-makefile-archive):
+	Add new linker object.
+	(ede-gcc-archive-compiler): Removed.
+	(ede-archive-linker): New linker object for archive.
+	(ede-proj-makefile-insert-source-variables): Removed.
+	(ede-proj-makefile-garbage-patterns): New override to add library name to
+	garbage patterns.
+
+2009-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-locate.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	(ede-locate-global::initialize-instance)
+	(ede-locate-global::ede-locate-ok-in-project)
+	(ede-locate-global::ede-locate-file-in-project-impl)
+	(ede-locate-idutils::initialize-instance)
+	(ede-locate-idutils::ede-locate-ok-in-project)
+	(ede-locate-idutils::ede-locate-file-in-project-impl):
+	Add require to necessary tool inside each fcn.
+
+2009-09-08  David Engster <dengste@eml.cc>
+
+	* ede.texi (START-INFO-DIR-ENTRY): Fix directory entry.
+
+2009-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-project::ede-proj-setup-buildenvironment):
+	Do not do the automake synchronize till after all subprojects have
+	recreated their build environment.
+
+	* ede-proj-elisp.el: (ede-proj-target-elisp::ede-proj-tweak-autoconf)
+	(ede-proj-target-elisp::ede-proj-flush-autoconf):
+	Pass 'newfile to force on ede-expand-filename.
+	Expect nil out of ede-expand-filename.
+	Better messages.
+
+	* ede-pmake.el: (ede-proj-project::ede-proj-makefile-create)
+	(ede-pmake-varname)
+	(ede-proj-project::ede-proj-makefile-insert-variables-new):
+	Misc checkdoc fixes.
+
+	* ede-pconf.el (ede-proj-configure-file): Now confiure.ac.
+	(ede-pconf-create-file-query): New control variable if we should ask
+	about creating some files.
+	(ede-proj-project::ede-proj-configure-test-required-file):
+	Obey above new config.
+	(ede-proj-project::ede-proj-configure-synchronize):
+	Change how the makefile pathes are calculated for ac_output.
+	Map over all subprojects and targetes for autoconfi flush & tweak.
+	Call aclocal or autoconf more often when reconfiguring.
+	Change to wait for autoconf to finish running, and check that it was
+	ok, error if it is not.
+	When trying to validate that the Makefile exists, pass in a 'newfile
+	FORCE option to ede-expand-file-name.
+
+	* ede-files.el (ede-project::ede-expand-filename):
+	Convert to a cond statement,
+	and get 'force to be obeyed properly.  Also add a 'newfile feature to
+	'force, which ignores the cache if the cache reports back 'nomatch.
+
+	* autoconf-edit.el (autoconf-new-automake-string):
+	Put the AM_INIT_AUTOMAKE first arg in [].
+
+	* Makefile (aux-lisp_LISP): Add makefile-edit.el
+
+	* Project.ede (aux-lisp): Add makefile-edit.el
+
+2009-08-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* autoconf-edit.el: Patch from Pierre Lorenzon
+	(autoconf-new-program): Fix interactive call query for directory.
+	Use `expand-file-name' instead of 'concat'.
+	Look for both configure.in, and configure.ac.
+	Default to creating configure.ac.
+
+2009-07-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-extract-varname): Deleted.
+	Moved to makefile-edit.el
+	(project-am-makefile::project-rescan): Use makefile-extract-varname-from-text.
+
+	* makefile-edit.el (makefile-macro-file-list):
+	Fix regexp to include {} in file entries.
+	Use below.
+	(makefile-extract-varname-from-text): New,
+	copied from project-am-extract-varname.
+
+2009-07-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (makefile-edit): New require.
+	(project-am-makefile::project-compile-project)
+	(project-am-makefile::project-rescan)
+	(project-am-autoconf-file): Whitespace fixes.
+	(makefile-beginning-of-command,makefile-end-of-command)
+	(makefile-line-continued-p,makefile-move-to-macro)
+	(makefile-navigate-macro,makefile-macro-file-list):
+	Deleted.  See makefile-edit.el.
+
+	* makefile-edit.el: Utilities for editing/scanning a makefile.
+	Derived from project-am.el
+
+	* ede-proj.el (ede-proj-project::ede-buffer-mine):
+	Matching makfiles/configure scripts, add $ to end of regexp.
+
+	* project-am.el (project-am-type-alist): Misc comment updates.
+
+	* project-am.el: Modified patch from Marco Bardelli
+	(project-am-type-alist): Add more target types.
+	(project-am-header-pkg, project-am-header-chk)
+	(project-am-built-src, project-am-extra-dist): New classes.
+	(project-am-built-src::project-rescan)
+	(project-am-extra-dist::project-rescan): New methods.
+	(project-am-header-inst::project-am-macro): Change var name.
+	(project-am-header-pkg::project-am-macro)
+	(project-am-header-chk::project-am-macro): New
+	(project-am-texinfo::project-am-macro): Generated var name has no file
+	extension.
+	(project-am-man::project-am-macro): Return the plain name.
+
+2009-07-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project): Add a mailinglist.
+	(ede-set): Allow proj to be passed in.
+
+2009-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el:
+	Patch from Marco Bardelli, and modified heavilly by Eric Ludlam.
+	(project-am-type-alist): Added libs, ltlib, ltlibraries,  texinfo is indirect.
+	Doc fix.
+	(project-am-makefile): Add configureoutputfiles
+	(project-am-load): Fix typo
+	(project-am-find-topmost-level): Identify a wider range of automake files.
+	(project-am-load-makefile): Call project-am-package-info, and use
+	the results.
+	(project-am-makefile::project-rescan): As above.
+	(project-am-macro): Substitued - to _ when converting names.
+	(project-am-makefile::ede-buffer-mine): Accept varoius configure
+	files, plus anything found in configureoutputfiles.
+	(makefile-macro-file-list): Expand anything that is a variable.
+	(project-am-autoconf-file-options)
+	(project-am-autoconf-file,project-am-with-config-current)
+	(project-am-extract-shell-variable, project-am-extract-package-info)
+	(project-am-package-info): New.
+
+2009-07-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* autoconf-edit.el (autoconf-parameter-strip,autoconf-parameters-for-macro):
+	New functions.
+
+2009-07-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-new):
+	Throw convenient errors if the directory in question is not
+	accessible.
+
+2009-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-target::ede-proj-linkers):
+	Use eieio-instance-inheritor-slot-boundp instead of slot-boundp.
+
+	* ede-proj-obj.el (ede-proj-target-makefile-objectcode):
+	Add some todo notes.
+	(ede-object-compiler::ede-proj-makefile-insert-variables):
+	Use eieio-instance-inheritor-slot-boundp instead of slot-boundp
+
+	* ede-proj-comp.el (ede-compilation-program::ede-proj-makefile-insert-variables):
+	Use eieio-instance-inheritor-slot-boundp instead of slot-boundp
+
+2009-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-customize-forms-menu): Add "Reorder Targets" option.
+	From David Engster
+	(ede-project-sort-targets-order): New var.
+	(ede-project-sort-targets): New command.
+	(ede-project-sort-targets-list): New fcn for above.
+
+	* ede-proj-obj.el: Patch from David Engster:
+	(ede-proj-target-makefile-objectcode): Add fortran support.
+	(ede-source-f90, ede-source-f77): Fotran source types.
+	(ede-gfortran-compiler, ede-gfortran-module-compiler): Fortran compilers
+	(ede-gfortran-linker): Fortran linking.
+
+2009-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-insert-variables-new):
+	Comment out an incomplete function.
+	(ede-proj-target-makefile::ede-proj-makefile-insert-commands):
+	Only map the linkers into the makefile if said compiler
+	claims to use the linker.
+
+2009-03-19  Joakim Verona <joakim@verona.se>
+
+	* ede-proj-maven2.el:
+	improved building of subprojects from non-java project files
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile (VERSION): Update version.
+
+	* Makefile, Project.ede, ede.el (ede-version): Update version.
+
+2009-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-elisp-packages-to-loadpath):
+	Don't use a relative path name
+	if it is too far away.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-ignored-file-alist): New config variable
+	(ede-ignore-file): New fcn
+	(ede-auto-add-to-target): Use above to ignore some files without
+	asking any questions.
+
+	* Makefile (dist): Add missing -C to subdir invocation.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-insert-dist-rules):
+	Fix generation of dist to use -C.  (typo from previous rev.)
+
+2009-03-12  Joakim Verona <joakim@verona.se>
+
+	* ede-proj-maven2.el:
+	this patch improves "building of current target" with ede for maven2.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-make.el (ede-make-check-version):
+	Fix regexp to make the string "version" optional
+
+2009-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: When recursing with Make, use -C instead of cd.
+
+	* ede-pmake.el:
+	(ede-proj-project::ede-proj-makefile-insert-subproj-rules)
+	(ede-proj-project::ede-proj-makefile-insert-dist-rules)
+	(ede-proj-project::ede-proj-makefile-tags): When recursing with make,
+	use -C option to change directory.
+
+2009-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-maven2.el (ede-maven2-target-java::project-compile-target):
+	New method.
+
+	* ede-proj-maven2.el (ede): Moved requires.
+	(ede-maven2-load): Expand the file name of :file.
+
+	* ede-files.el (ede-toplevel-project):
+	When checking for an open project, if the
+	project type for this directory is the same as that of the found root
+	project, use the cached value.  If not, do some more calculations.
+
+	* ede.el (ede-minor-mode):
+	Force a project rescan, in case a new project type
+	was loaded.
+
+	* Makefile (ede_LISP): Add ede-make.el
+
+	* Project.ede (ede): Add ede-make.el
+
+	* ede-proj.el (ede-make): New require
+	(ede-proj-project::project-make-dist)
+	(project-compile-project)
+	(ede-proj-target-makefile::project-compile-target): Use ede-make-command.
+
+	* project-am.el (ede-make): New require
+	(project-am-compile-target-command): Use ede-make-command.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Make sure the user has a good version of GNU Make.
+
+	* ede-make.el: Identify a good version of GNU Make to use.
+
+2009-03-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (misc_AUX): Remove TODO
+
+	* Project.ede (misc): Remove TODO.
+
+2009-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Patch from: Hannu Koivisto
+	(global-ede-mode): Fix name of hook used.
+	(ede-parent-project): Fix bug when creating a project on a root drive
+	on windows.
+	Fix apparent inefficiency of calculating an answer unnecessarily.
+
+2009-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-files.el (ede-directory-get-toplevel-open-project):
+	Allow inode (pin) to not be
+	an integer.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el: Add TODO item into this file.
+
+	* ede-files.el (ede-find-subproject-for-directory):
+	Wrote an inode disabled version too.
+	(ede-directory-get-open-project): Add disabled inode support.
+
+	* ede.el (ede-save-cache): Disable recentf during saving of the cache.
+
+2009-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-add-project-to-global-list): Return first arg.
+	(ede-load-project-file): Force a directory re-load when looking up pfc.
+
+	* ede-files.el (ede-directory-project-p): Accept a 'force' option.
+
+2009-02-27  Joakim Verona <joakim@verona.se>
+
+	* ede-proj-maven2.el: maven2 support for ede, first stab
+
+2009-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (Custom Locate): Add TODO.
+
+	* ede-cpp-root.el: Update comments.
+	(ede-cpp-root-project::ede-cpp-root-header-file-p)
+	(ede-cpp-root-project::ede-system-include-path): Moved.
+
+	* ede-locate.el (require): Add cedet-cscope.
+	(ede-locate-setup-options): Add ede-locate-cscope custom option
+	(ede-locate-cscope, initialize-instance,ede-locate-ok-in-project)
+	(ede-locate-file-in-project-impl, ede-locate-test-cscope): New
+
+2009-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-simple.el (ede-simple-load): Fix.  Return the loaded object.
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-locate.el (require): Add cedet-idutils
+	(ede-locate-setup-options): Add ede-locate-idutils to custom type.
+	(ede-enable-locate-on-project): Fix logic so it works when not
+	in interactive mode.
+	(ede-locate-global::ede-locate-file-in-project-impl): Simplify.
+	(ede-locate-idutils): New class.
+	(ede-locate-idutils::initialize-instance)
+	(ede-locate-idutils::ede-locate-ok-in-project)
+	(ede-locate-idutils::ede-locate-file-in-project-impl): New methods.
+	(ede-locate-test-global): Fix doc.
+	(ede-locate-test-idutils): new.
+
+	* Makefile (EMACSFLAGS): New variable.
+	(init,ede,proj-project, projects,aux-lisp):
+	Use above flag.
+
+	* ede-proj-elisp.el (ede-emacs-compiler): Add EMACSFLAGS variable.
+	Use that instead of hard-coding the flags.
+
+2009-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Kill Makefile buffer unless it was already open.
+
+2009-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project::ede-cpp-root-translate-file):
+	New method,
+	extracted from below.
+	(ede-cpp-root-project::ede-expand-filename-impl): Use above.
+	(ede-cpp-root-project::ede-preprocessor-map): Make robust against
+	unfound files.
+
+2009-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-linux.el (ede-linux-target-c::ede-preprocessor-map):
+	Make sure we calculated the file name for version.h correctly before use.
+
+2009-02-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Patch from olexandr_syd
+	(project-am-type-alist): Add support for noinst_LIBRARIES
+
+2009-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (ede-cpp-root): Add :spp-files description.
+
+	* ede-targets.texi: Regenerated from sources.
+
+	* ede-projects.texi:
+	(ede-project-placeholder, ede-project, ede-cpp-root-project)
+	(ede-emacs-project, ede-simple-project, ede-proj-project)
+	(project-am-makefile, ede-step-project):
+	Regenerated from sources.
+
+2009-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project): Add :spp-files.
+	(ede-cpp-root-project::ede-preprocessor-map):
+	Apply :spp-files to the map.
+
+2009-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-files.el (ede--disable-inode): New option.
+	(ede--inode-for-dir): Set inode to - if above option is true.
+	(ede-directory-get-toplevel-open-project): Check for 0 inode before use.
+
+2009-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-files.el: (ede-project-placeholder::ede--project-inode)
+	(ede--put-inode-dir-hash, ede--get-inode-dir-hash)
+	(ede--inode-for-dir): Renamed private, use renamed.
+	(ede-directory-get-open-project): Use renamed items
+	(ede-directory-get-toplevel-open-project):
+	Use renamed items AND if inode is 0 (ie: windows) then skip inode cache.
+
+2009-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-target-elisp::project-compile-target):
+	Don't use ede-expandfilename, do a direct expansion instead.
+
+	* ede-proj-info.el (ede-documentation):
+	Fix to not use ede-expand-filename
+
+	* project-am.el (project-am-texinfo::ede-documentation):
+	Fix to not use ede-expandfilename.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (EDE): Updated to 1.0pre6.
+
+	* templates/Makefile, Makefile (VERSION): Updated to 1.0pre6.
+
+	* ede.el (ede-version): Updated to 1.0pre6.
+
+2009-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-locate.el (ede-locate-locate::ede-locate-ok-in-project):
+	Depend on the locate
+	feature instead of the program.
+
+	* ede-speedbar.el (ede-speedbar-file-setup):
+	Don't swap the speedbar list if it is not visible.
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-scan-for-targets):
+	Eliminate unused variable bindings.
+
+	* ede.el: (ede-project::ede-subproject-relative-path)
+	(ede-load-project-file, ede-adebug-project, ede-adebug-project-parent):
+	(ede-adebug-project-root): Eliminate unused variable bindings.
+
+	* ede-proj.el (project-add-file): Eliminate unused variable bindings.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp::project-compile-target):
+	Convert mapcar to mapc.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp::ede-proj-flush-autoconf):
+	Eliminate unused variable bindings.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Eliminate unused variable bindings.
+
+	* ede-pconf.el (ede-proj-project::ede-proj-configure-synchronize):
+	Eliminate unused variable bindings.
+
+	* ede-locate.el: (ede-locate-locate::ede-locate-ok-in-project)
+	(ede-locate-test-locate, ede-locate-test-global):
+	Eliminate unused variable bindings.
+
+	* ede-files.el (ede-project-autoload::ede-project-root-directory):
+	Eliminate unused variable bindings.
+
+	* ede-emacs.el (ede-emacs-project::ede-expand-filename-impl):
+	Eliminate unused variable bindings.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-project::project-new-target):
+	Improved error checking of project TYPE value.
+
+	* ede-load.el (ede): New require w/ detailed comment.
+
+2009-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-locate.el (locate):
+	Moved to condition-case so if it isn't available,
+	compilation will succeed.
+
+	* Makefile (misc_AUX): Remove NEWS
+
+	* Project.ede (misc): Remove news
+
+2009-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-locate.el: Add doc to commentary.
+
+2008-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (Make and Automake projects, Automake direct projects, Simple projects):
+	Change how nodes are specified.
+
+2008-12-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (EDE Project Concepts, Creating a project):
+	(Add/Remove files, Configurations):
+	(Project types, Make and Automake projects):
+	(Simple projects, ede-cpp-root):
+	(Custom Locate, Extending EDE):
+	(User interface methods, Base project methods):
+	(Compiler and Linker objects): Misc spelling fixes.
+
+	* ede.el (ede-project::project-interactive-select-target):
+	(ede-project::project-dist-files):
+	(ede-project::ede-description):
+	(ede-target::ede-buffer-documentation-files):
+	Doc string fixes.
+	(ede-add-project-to-global-list):
+	Add some nice error messages.
+
+	* ede-source.el (ede-sourcecode): Doc string fixes.
+
+	* ede-proj-prog.el (ede-proj-target-makefile-program): Fix doc string.
+
+	* ede-proj.el (ede-proj-target): Doc fix.
+	(ede-proj-target-alist): Fix name of misc project type.
+
+	* ede-proj-misc.el (ede-proj-target-makefile-miscelaneous):
+	Doc string fix.
+
+	* ede-proj-info.el (ede-proj-target-makefile-info::object-write):
+	Doc string fix.
+
+	* ede-pmake.el: (ede-proj-project::ede-proj-makefile-garbage-patterns)
+	(ede-proj-target::ede-proj-makefile-garbage-patterns):
+	Doc string fixes.
+
+	* ede-speedbar.el (ede-speedbar-remove-file-from-target):
+	Remove extraneous EDE load call.
+
+2008-12-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile: Copy templates into the dist.
+
+	* templates/Project.ede: New subproject file.
+
+	* Makefile (all): Add EDE_Templates
+	(EDE_Templates): New phony rule.
+	(dist): Add EDE_Templates
+
+	* ede.el (ede-adebug-project-parent, ede-adebug-project-root):
+	New debug commands.
+
+	* ede.el (ede-parent-project):
+	Try to fix bug where projects 3 deep returned
+	root instead of the actual parent.
+
+	* ede-files.el (ede-toplevel-project):
+	Fix bug returing an object, not a directory.
+
+2008-12-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-linux.el (ede-linux-project::ede-expand-filename-impl):
+	Renamed from ede-expand-filename.
+
+	* ede-emacs.el (ede-emacs-project::ede-expand-filename-impl):
+	Renamed from ede-expand-filename.
+
+	* ede-cpp-root.el (ede-cpp-root-project::ede-expand-filename-impl):
+	Renamed from ede-expand-filename.
+
+	* ede-files.el (ede-directory-get-open-project): Add 'rootreturn' arg.
+	Set rootreturn if provided.
+	Add second method for finding the project via inodes.
+	(ede-inode-get-toplevel-open-project): New fcn.
+	(ede-toplevel-project): Use buffer cache of current project if
+	available.
+	(ede-toplevel): Use buffer local variables when available.
+	(ede-get-locator-object): New fcn.
+	(ede-project::ede-expand-filename): Use locator hash, otherwise
+	use the method below.
+	(ede-project::ede-expand-filename-impl): code from ede-expand-filename.
+
+	* ede-locate.el (ede-enable-locate-on-project):
+	Ask questions for each possible match.
+	(ede-locate-base): Add "hash" slot.
+	(ede-locate-base::initialize-instance)
+	(ede-locate-base::ede-locate-file-in-hash)
+	(ede-locate-base::ede-locate-add-file-to-hash): New methods.
+
+	* ede.el (ede-object-root-project, ede-object-project):
+	New buffer local
+	variables.
+	(ede-minor-mode): Set two new vars above.
+	(ede-load-project-file): Add 'rootreturn' argument.
+	Return the root when found.
+	(ede-current-project): Use new variables to find current project.
+
+2008-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (Simple projects): Add below.
+	(ede-linux): New
+	(Custom Locate): New
+
+2008-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project-placeholder): Remove :type from dirinode slot.
+
+	* ede.texi (EDE Find File): New section.
+
+	* Makefile (ede_LISP): Add ede-locate.el
+
+	* Project.ede (ede): Add ede-locate.el
+
+	* ede-locate.el: New support for external locate tools.
+
+	* ede-cpp-root.el, ede-linux.el (ede-expand-filename):
+	Call-next-method on failure.
+
+	* ede.el (ede-project): Add locate-obj object.
+	(ede-minor-keymap): Add `ede-find-file' key "f" and menu item.
+	(ede-convert-path, ede-expand-filename): Moved to ede-files.el
+
+	* ede-files.el (ede-find-file): New command.
+	(ede-convert-path,ede-expand-filename):
+	 Moved to here from ede.el
+
+2008-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project::ede-convert-path):
+	Add backup path relitivizer via "file-truename".
+	(ede-apply-preprocessor-map): Don't set unless there is a table to add to.
+
+	* Makefile (projects_LISP): Add ede-linux.el
+
+	* Project.ede (projects): Add ede-linux.el
+
+	* ede-linux.el: Identify and support linux kernel projects.
+
+2008-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-parent-project, ede-current-project):
+	Add short-cuts to not load a project if the specified directory does
+	not pass project-p.
+
+	* ede-files.el (ede-project-placeholder::ede-project-inode):
+	New method.
+	(ede-project-placeholder::ede-find-subproject-for-directory): Do inode compares.
+	(ede-inode-directory-hash, ede-put-inode-dir-hash, ede-get-inode-dir-hash)
+	(ede-inode-for-dir): New
+	(ede-directory-get-open-project): Use inodes for direct compares.
+	(ede-directory-get-toplevel-open-project): Use inodes as backup if
+	string compares fail.
+
+	* ede.el (ede-project-placeholder): Add dirinode slot.
+
+	* ede-files.el (ede-project-directory-remove-hash):
+	Use maphash and regexp to do
+	matching, not subdirectory scanning.
+	(ede-directory-project-p): Expand the dir passed in.
+
+	* ede-emacs.el (ede-emacs-project::initialize-instance):
+	Add this to master project list.
+	(ede-find-subproject-for-directory): New.
+
+	* ede-cpp-root.el (ede-cpp-root-project::initialize-instance):
+	Add this to master project list.
+	(ede-find-subproject-for-directory): New.
+
+	* ede-simple.el (ede-simple-project::ede-find-subproject-for-directory):
+	New.
+
+	* ede-files.el (ede-find-subproject-for-directory): New fcn.
+	(ede-directory-get-open-project): Use above, replace body with call to below.
+	(ede-directory-get-toplevel-open-project): Made from above.
+	(ede-project-directory-remove-hash): Error catch subdir scanning.
+	(ede-toplevel-project-or-nil, ede-toplevel-project):
+	References the master list of projects to do work first, then
+	try to load as needed.
+	(ede-up-directory): Doc fix.
+
+	* ede.el (ede-with-projectfile): Comments
+	(ede-minor-mode): Get current dir's project from master list if
+	available.
+	(ede-add-project-to-global-list): New
+	(ede-load-project-file): Clear hash for input dir.
+	Use new fcn above.
+	(ede-parent-project): Extract parent from master list if available.
+
+	* ede-files.el (ede-directory-get-open-project):
+	Add actual implementation
+	(ede-project-directory-remove-hash): Remove subdirs also.
+	Be sure to only remove hash directory names.
+
+2008-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-scan-for-targets):
+	Fix byte compiler warnings.
+
+	* ede-cpp-root.el (Commentary): Add doc about FILENAME.
+	(ede-cpp-root-count): New tmp profiling tool.
+	(ede-cpp-root-project::initialize-instance): Add value to :directory.
+
+	* ede-emacs.el (ede-emacs-load): Set the :directory slot.
+
+	* ede-simple.el (ede-simple-load): Set the directory slot.
+
+	* ede-proj.el (ede-proj-load): Doc fix.
+	Set the :directory of the project.
+	(ede-proj-save): Don't store the :directory slot.
+
+	* project-am.el (project-am-load-makefile): Set the :directory.
+
+	* ede-files.el (ede-directory-project-p): Add use of a hash-table.
+	(ede-directory-in-open-project): New placeholder fcn.
+	(ede-project-directory-hash): New variable.
+	(ede-project-directory-remove-hash)
+	(ede-directory-project-from-hash)
+	(ede-directory-project-add-description-to-hash): New
+	(ede-directory-project-p): Use the above hash.
+
+	* ede.el (ede-project-placeholder): Add directory slot.
+	(global-ede-mode): Fix byte compiler warning.
+	(ede-new): Set the :directory for new projects.
+	Remove this dir from the project directory hash.
+	(ede-project::eieio-done-customizing,ede-set):
+	Fix byte compiler warnings.
+
+	* Makefile (ede_LISP): Add ede-files.el
+
+	* Project.ede (ede): Add ede-files.el
+
+	* ede.el (ede-project-root, ede-project-root-directory - all classes):
+	Moved
+	(ede-directory-project-p, ede-up-directory): Moved.
+	(ede-toplevel-project(-or-nil)): Moved.
+	(ede-toplevel): Moved
+	(ede-buffer-object): Update doc.
+	(ede-files): Require.
+
+	* ede-files.el: A copy of the file /directory scanning utilties.
+
+2008-11-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-save-cache): Make more robust to filesystem issues.
+	(ede-target::ede-buffer-mine): Protect against errors.
+
+2008-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-auto-add-to-target):
+	Use eieio-object-p instead of object-p.
+
+	* ede-speedbar.el: (ede-speedbar-menu, ede-speedbar-compile-line)
+	(ede-speedbar-get-top-project-for-line)
+	(ede-target::eieio-speedbar-derive-line-path):
+	Use eieio-object-p instead of object-p.
+
+2008-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-obj.el (ede-source-c++): Add more extension types for C++.
+
+2008-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-adebug-project):
+	Fix for change in API name in eieio-datadebug.
+
+2008-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project): Method invocation order is depth-first.
+
+	* ede-emacs.el (ede-emacs-project):
+	Method invocation order is depth-first.
+
+2008-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-type-alist): Update doc.
+
+	* ede-speedbar.el (ede-target::eieio-speedbar-child-make-tag-lines):
+	Put only filename in as token data.
+	(ede-file-find): Revert.
+
+	* ede-speedbar.el: Fix commentary.
+	(ede-file-find): File to find is only in token.
+
+	* project-am.el (project-am-type-alist): Add header variables.
+	Add 4th element meaning if it is an indirect automake variable.
+	(project-am-lisp): Remove :lisp
+	(project-am-header, project-am-header-noist, project-am-header-inst):
+	New target classes.
+	(project-am-with-makefile-current): New edebug setup hook for this.
+	(project-rescan): Extract target reading.
+	Eliminate special lisp section.
+	(project-am-scan-for-targets): Extracted from above.
+	(project-am-lisp::ede-buffer-mine): Replace :lisp with :source.
+	(*::ede-sb-expand, *::ede-sb-button): Remove all.
+
+	* ede.el (ede-parent-project): Fix to detect shortcut for finding root.
+
+2008-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (Creating a project): Add a cross-ref.
+
+	* ede-targets.texi (Targets): Regenerate Content
+
+	* ede-sourcecode.texi (Sourcecode): Regenerate Content
+
+	* ede-projects.texi (Project): Regenerate content.
+
+	* ede-compilers.texi (Compilers): Regenerate content.
+
+	* ede.texi (Simple projects): Add ede-emacs.
+	(ede-emacs): New section.
+
+2008-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-simple.el (ede-simple-project): change order of inheritance.
+
+	* ede-cpp-root.el (ede-cpp-root-project): change order of inheritance.
+
+	* ede-emacs.el (ede-emacs-project): change order of inheritance.
+
+	* ede-speedbar.el (ede-project::eieio-speedbar-object-children):
+	Handle errors.
+
+	* ede.el (ede-reset-all-buffers): New fcn.
+	(global-ede-mode): Call above.
+	(ede-rescan-toplevel): Call ede-reset-all-buffers.
+	(ede-buffer-object): Force reset of ede-object.
+	(ede-target-in-project-p): Handle a target that is unbound.
+
+	* ede-proj.el (ede-proj-project::project-rescan):
+	Re-write as deleting old project
+	from main project list, and completely re-reading.
+
+	* ede-simple.el (ede-comit-project): Fix caps
+
+	* ede-emacs.el (ede-emacs-version): New
+	(ede-emacs-load): Add a name w/ Emacs version.
+
+	* Makefile (all, dist): Add proj-project, and projects.
+	(proj-project, projects): New targets and associated variables.
+
+	* Project.ede ("EDE"): Add proj-project, and projects targets.
+	Divide "ede" into these multiple targets.
+	Add ede-emacs.el to the "projects" project.
+
+	* ede.el (ede-load): Not needed anymore.
+	(ede-parent-project): Allow ede-project-root to return null.
+
+	* ede-emacs.el: Support for an Emacs project.
+
+	* ede.el (ede-apply-target-options): New fcn.
+	(ede-minor-mode): Move items into above, and call above.
+	(ede-new-target, ede-delete-target, ede-add-file, ede-remove-file):
+	Call ede-apply-target-options instead of the keymap fcn.
+	(ede-project-root-directory): Expand the file also.
+	(ede-project::ede-convert-path,ede-project::ede-expand-filename):
+	Call ede-project-root-directory instead of calculating it inline.
+	(ede-apply-preprocessor-map): New fcn called from apply-target-options.
+
+	* ede.el (ede-save-cache): Protect against junk getting into the list.
+	(ede-build-forms-menu)
+	(ede-project-forms-menu)
+	(ede-customize-forms-menu): Protect against unbound targets list.
+	(ede-project-autoload::ede-project-root-directory): Force file to have
+	a value.
+	(ede-load-project-file): If a project isn't loaded correctly,
+	throw a nice error about the :load-type.
+
+	* ede-cpp-root.el (ede-cpp-root-project-root): Accept a DIR argument
+	(ede-cpp-root-project::ede-find-target): Provide a name.
+
+2008-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-srecode.el (ede-srecode-setup):
+	Require srecode-map before using some of its variables.
+
+2008-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (makefile-move-to-macro):
+	Add an optional NEXT argument.
+	(makefile-macro-file-list): Find all occurances of the macro, and add
+	their contents together.
+
+	* ede.el (ede-load-project-file):
+	Do not throw error when project-p passes but
+	there is no project.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Use SRecode to insert
+	the header.
+	(ede-proj-project::ede-proj-makefile-insert-variables-new):
+	New fcn, not yet in use.
+
+2008-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-toplevel-project): Protect against 'newpath' being nil.
+
+	* project-am.el (project-am-makefile::project-rescan):
+	Protect against loading of a
+	sub-project throwing an error.
+
+2008-08-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project-placeholder::ede-project-root-directory):
+	Allow a 2nd
+	optional argument.
+	(ede-project-autoload::ede-project-root-directory): Allow a 2nd
+	optional argument.  Pass this down to the :proj-root fcn.
+	(ede-project-autoload::ede-dir-to-projectfile):
+	Ask for the root of the input directory.  If we get it, we don't need
+	to cycle up the directory tree.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (global-ede-mode): Add autoload cookie.
+
+	* Makefile (LOADPATH): Added srecode dependency.
+	(ede_LISP): Added ede-srecode.el
+
+	* Project.ede ("EDE"): Add ede-srecode
+
+2008-07-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project): Doc fix.
+
+2008-06-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-toplevel):
+	Protect calls to `ede-project-root' from being called
+	on nil.
+
+	* ede-proj-skel.el: Fix comment spelling.  (Thanks Stefano Sabatini)
+
+2008-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/ede-make.srt: Base templates for Makefile generation in EDE
+
+	* ede-srecode.el: SRecode support.
+
+	* ede-proj.el (auto-mode-alist): Add $ to expression.
+
+2008-06-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-simple.el: Add todo comments.
+
+2008-06-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project::ede-expand-filename): Comment.
+	(ede-load-project-file): comment out a debug message.
+	(ede-adebug-project): Fix to use data-debug.
+
+2008-05-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-load):
+	Use file name handling functions instead of concat.
+	(project-am-with-makefile-current): New from project-am-load-makefile.
+	Remove semantic support when loading in a Makefile.
+	(project-am-load-makefile): Use above.
+	(project-am-extract-varname): New
+	(project-am-makefile::project-rescan): Set this' project makefile as
+	current during body.
+	Expand variables in SUBDIRS as needed.
+	Use file name handling functions instead of concat.
+
+2008-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-new): Force the object name to match :name.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp::project-compile-target):
+	Fix to use full filename when comparing src vs elc for date.
+
+2008-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-find-topmost-level):
+	Re-write to use file-name
+	manipulation functions.
+	(project-am-makefile::project-am-subtree): Rename subpath to subdir
+	(project-am-last-dir): Rewrite to use file-name manipulation functions.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("EDE"): Updated to 1.0pre5
+
+	* Makefile (VERSION): Udated to 1.0pre5
+
+	* ede.el (ede-version): Updated to 1.0pre5
+
+2008-03-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-project::project-new-target):
+	Update todo comments.
+
+	* ede-cpp-root.el: Remove todo
+
+2008-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (top): Remove detailed node listing.
+	(ede-cpp-root): Augmented with new features.
+
+	* ede-cpp-root.el (ede-cpp-root-project):
+	Add system-include-path and spp-table.
+	(ede-set-project-variables): Also set up the spp-table.
+	(ede-system-include-path, ede-preprocessor-map): Implemented for
+	both project and target.  Return saved entry from the project.
+
+	* ede.el:
+	(ede-project::ede-system-include-path, ede-project::ede-preprocessor-map)
+	(ede-target::ede-system-include-path, ede-target::ede-preprocessor-map):
+	New
+	(ede-project::ede-set-project-variables): Converted to method.
+	(ede-adebug-project): New
+
+2008-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-proj-project::ede-proj-configure-synchronize):
+	Do not use parent ref if parent == proj
+
+	* ede-pconf.el (ede-proj-project::ede-proj-configure-synchronize):
+	For setting AC
+	output, specify Makefiles for the root and all sub projects.
+
+	* ede.el (ede-project::ede-subproject-relative-path):
+	Allow parent-in to be specified.
+	Return "" if there is no parent.
+
+	* ede.el (ede-project::ede-map-subprojects): Doc fix.
+	(ede-project::ede-map-all-subprojects): New
+
+2008-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-target-elisp::project-compile-target):
+	Enable build when
+	default directory is incorrect.
+	(ede-proj-target-elisp-autoloads::ede-buffer-mine): New.
+	(ede-proj-target-elisp-autoloads::project-compile-target):
+	Stop calling update-autoloads interactively.
+	Pass in all needed arguments.
+
+2008-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-project-class-files):
+	ede-cpp-root is not an interactive project type.
+
+	* ede.el (ede-new): Restrict new project types.
+	Error if no valid project types found.
+
+2008-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project::ede-expand-filename):
+	Be sure to expand the
+	name against the include path.
+
+	* ede-proj-info.el (ede-makeinfo-find-info-filename):
+	More robust filename finding.
+
+2008-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el (ede-makeinfo-find-info-filename):
+	Don't add .info to filename.
+
+	* ede-proj-info.el (ede-makeinfo-find-info-filename):
+	Searching for filename is now
+	more robust.
+
+2008-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-add-file): Add error checking.
+
+2008-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-project): Unfix previous doc fix.
+	Add some more text explaining the /.
+
+	* ede-cpp-root.el (ede-cpp-root-project): Doc fix.
+
+2008-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Don't ask annoying question of the Makefile is empty.
+
+	* project-am.el (project-am-makefile::project-new-target):
+	Accept arguments to
+	replace prompts.
+
+	* ede-proj.el (ede-proj-project): Add :group attribs to some slots.
+	(ede-proj-project::project-new-target): Accept arguments to
+	replace interactive questions when needed.
+	(ede-proj-compilers, ede-proj-linkers):
+	Accept single values and turn into lists.
+
+	* ede.el (ede-project): Add tool-cache slot.
+	(ede-new): Support NAME input argument.
+	Force commit of parent project after adding a child.
+	(ede-new-target): Accept, and pass down argument lists.
+	Doc what those arguments might be.
+	(ede-add-file): If programatically passing in a string, look it up
+	in our list of projects.
+	(ede-project::project-new-target): Accept more arguments.
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi (all):
+	Replace references to EDE and other CEDET packages to use
+	macros.
+	(ede-cpp-root): Enhance this section some.
+
+2008-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-projects.texi: Regenerated from sources.
+
+2008-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (test_AUX): Deleted.
+
+	* Project.ede ("test"): Deleted.
+
+	* ede-proj.el (ede-proj-project::project-new-target):
+	Add new projects to the end of
+	the list.
+
+	* ede-proj-aux.el (ede-aux-source): Change name of the source object.
+
+2008-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-current-project): Allow an optional argument.
+
+	* ede.texi (top): copyight
+	(Project types): typo fix
+	(Automake direct projects): Discuss simple projects.  Add node
+	(Simple projects): New node, with subnotes
+	(ede-cpp-root, ede-simple): New
+
+	* ede-cpp-root.el (top): Updated comment w/ new features.
+	(ede-cpp-root-project): Add :include-path, and :header-match-regexp
+	(ede-cpp-root-project::ede-cpp-root-header-file-p): New fcn
+	(ede-cpp-root-default-expand-fcn): Deleted
+	(ede-cpp-root-project::ede-expand-filename): If the file being looked
+	for is a header, then try short-cut code that looks in the include path.
+
+	* ede.el (custom): Remove old compatibility layer.
+	(ede-project::ede-expand-filename): Use expand-file-name instead of concat.
+
+2007-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-load-cache): Save-excursion around fcn.
+	Store buffer in var, use var during kill.
+	Do not run ede-load-cache if we are in batch mode.
+
+2007-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-cpp-root.el (ede-cpp-root-file-existing):
+	Use `ede-project-root-directory'.
+	(ede-cpp-root-load): Accept a rootproj argument.
+	(ede-project-root): return this.
+	(ede-project-root-directory): Was ede-project-root.
+
+	* ede-simple.el (ede-simple-load): Accept a rootproj argument.
+
+	* ede-proj.el (ede-proj-load): Better doc.
+	Use better file/dirname concatination functions.
+	Implement rootproject setting features.
+
+	* ede.el (ede-project-placeholder): Add rootproject slot.
+	(ede-project-root): Add implementation.
+	(ede-project-root-directory): New
+	(ede-up-directory): Use technique suggested in Emacs manual.
+	(ede-toplevel-project): Add explicity shortcut using
+	`ede-project-root-directory'.
+	(ede-load-project-file): Add comments.
+	Pass in a rootproject
+	(ede-toplevel): Use `ede-project-root' as shortcut.
+	(ede-parent-project): Do better compare w/ `ede-project-root'results.
+
+	* project-am.el (project-am-load): Accept optional argument rootproj.
+
+2007-08-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-parent-project): Allow input object to be nil.
+	(ede-target-buffers): use memq instead of member when looking to see
+	if a buffer is in a list of possible targetes.
+
+2007-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Work around byte-compiler bug WRT tmp local variable.
+
+2007-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-toplevel-project): Fix bugs with single-root projects.
+	(ede-parent-project): Allow single-root projects to provide the answer
+	directly.
+	(ede-project::ede-target-in-project-p): Use memq to get correct
+	answers when two projects have identical targets.
+
+2007-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (ede_LISP): Add ede-cpp-root.el
+
+	* Project.ede ("ede"): add ede-cpp-root.el
+
+	* ede.el (ede-project-autoload): Add proj-root function
+	(ede-save-cache): Be more robust about jumk in the save-list.
+	(ede-project-placeholder::ede-project-root)
+	(ede-project-autoload::ede-project-root): New methods.
+	(ede-project-autoload::ede-dir-to-projectfile): fix bug when returning f
+	(ede-toplevel-project): Allow a project-autoload to provide a shortcut
+	to the root of the project.
+
+	* ede-cpp-root.el: New project type.
+
+2007-08-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-target::ede-proj-linkers):
+	Added debugging error.
+
+2007-07-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-save-cache):
+	Catch errors if the ede placeholder cache can't be written.
+
+2007-06-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-simple.el (ede-simple-projectfile-for-dir):
+	Don't ask to create a dir.
+	(ede-commit-project::ede-simple-project): Ask to create the storage
+	directory.
+
+2007-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Regress version to prerelease 4.
+
+	* Project.ede ("EDE"): Regress to prerelease 4
+
+	* ede.el (ede-version): Regress to prerelease 4
+
+2007-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("ede"): New dependency.
+
+	* ede-simple.el (cedet-files): New require.
+
+	* ede.el (ede-load): Move load location
+	(ede-project-autoload): autoload cookie.
+
+	* Makefile (ede_LISP): Added ede-simple.el
+
+	* ede-simple.el: Simple wrapper project.
+
+	* Project.ede ("EDE"): Add ede-simple.el
+
+	* ede.el (ede-new):
+	Allow proj-file slot to be a string (filename) or a fcn.
+
+2007-06-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project-autoload::ede-dir-to-projectfile):
+	Make sure DIR ends in
+	a /.
+
+2007-04-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-load-cache): Flush missing directories from the cache.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Tidier.
+
+	* ede-proj-elisp.el (ede-proj-makefile-insert-loadpath-items): New fcn.
+	(ede-proj-target-elisp::ede-proj-makefile-insert-variables): Use
+	above to strip out duplicates.
+
+	* ede-proj-comp.el (edebug-setup-hook):
+	Added `ede-pmake-insert-variable-shared'.
+
+2007-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-texinfo::ede-documentation):
+	Cause all returned file names to be fully expanded.
+
+	* ede-proj-info.el (ede-proj-target-makefile-info::ede-documentation):
+	Cause all returned file names to be fully expanded.
+
+2007-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el (ede-makeinfo-find-info-filename):
+	Use get-file-buffer before find-file-noselect.
+
+2007-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-aux.el (ede-aux-source): Fix doc string.
+
+2007-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-up-directory): Match lower case drive letters.
+
+2007-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-add-file): Add error messages of the add failed.
+
+2007-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el (ede-find-nearest-file-line): Use string-to-number.
+
+	* ede-proj.el (ede-proj-load): Use `insert-file-contents'.
+
+	* ede-pmake.el (ede-proj-project::ede-proj-makefile-create):
+	Don't use `beginning-of-buffer'.
+
+	* ede.el (ede-documentation-files): Add autoload cookie.
+
+	* autoconf-compat.el (font-lock): Add require to fix byte-comp issues
+
+2007-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project::ede-expand-filename, ede-load-project-file):
+	Handle erroneous data in project or directory lists.
+	From project-am.el use.
+
+2007-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-load-makefile):
+	Move project rescaning to after setting of
+	ede-object to prevent recursion.
+
+2006-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (:version): updated (removed means 1.0)
+
+	* Makefile (VERSION): updated
+
+	* ede.el (ede-version): Updated
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el, ede-util.el, ede-system.el, ede-speedbar.el, ede-source.el, ede-proj-skel.el, ede-proj-shared.el, ede-proj-scheme.el, ede-proj-prog.el, ede-proj-obj.el, ede-proj-misc.el, ede-proj-info.el, ede-proj-elisp.el, ede-proj.el, ede-proj-comp.el, ede-proj-aux.el, ede-proj-archive.el, ede-pmake.el, ede-pconf.el, ede-load.el, ede.el, ede-dired.el, autoconf-edit.el, autoconf-compat.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-up-directory):
+	Account for MS Windows style drive letters.
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-version): Updated.
+
+	* Project.ede (:version): Updated.
+
+	* Makefile (VERSION): Updated.
+
+2005-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-new): Force Project menu to appear on creation.
+
+	* ede-pmake.el (ede-proj-makefile-configuration-variables): New method.
+	(ede-proj-makefile-insert-variables): Insert configuration variables.
+
+	* ede.texi (top): Updated menu
+	(EDE Project Concepts): New section
+	(EDE Mode}: Tidied text.
+	(Creating a project): Tidied text.
+	(Building and Debugging): Tidied text.
+	(Modifying your project): Added sections.  Cleaned up text.
+	Added section on modifying a Project.ede specific features.
+	(Extending EDE): Added subsections.  Clarified some text.
+	(Compiler and Linker objects): New subsection with more info.
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("EDE"): Update version number
+
+	* Makefile (VERSION): Update version number
+	(misc_AUX): Add ChangeLog
+	(autoloads, init, ede, aux-lisp): Add quotes around EMACS.
+
+	* ede-proj-elisp.el (ede-emacs-compiler): Add quotes around EMACS.
+	(ede-emacs-cedet-autogen-compiler): Add quotes around EMACS.
+
+	* ede.el (ede-version): Update version number
+
+2005-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Add ChangeLog
+
+	* ede-proj-prog.el (ede-proj-target-makefile-program):
+	Add notes about variables only
+	used in automake right now.
+
+	* project-am.el: Requires specify .el files to prevent build problems.
+
+2005-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-new): Pay attention to project-autoload initializers.
+
+2005-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-prog.el (ede-proj-makefile-insert-automake-post-variables):
+	Comment out code
+	that was apparently never finished.
+
+	* ede-proj-comp.el (ede-proj-tweak-autoconf): Fix paren error.
+
+	* ede-pconf.el (ede-proj-configure-synchronize):
+	Fix calls to ede-map-targets.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-version): Update version number.
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede ("EDE"): Update version number.
+
+	* ede-util.el (ede-update-version):
+	Don't do work if the version did not change.
+
+2005-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-makefile-insert-variables):
+	Do not call next :AFTER method.
+	EIEIO is now fixed so this is automatic.
+
+2005-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-obj.el (ede-g++-linker, ede-ld-linker):
+	Fixed problem with duplicate $^.
+
+2005-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el (ede-file-find):
+	Make sure we possibly jump to the frame after finding
+	the file.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-version): Updated version number
+
+	* Makefile (VERSION): Updated version number
+
+	* Project.ede (EDE): Updated version number
+
+2005-01-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Makefile): Move @false command to next line.
+
+	* ede.texi (Creating a project): Add menu reference.
+
+	* ede.el (ede-minor-mode): update doc string.
+
+2004-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-makefile-create):
+	Ask before whacking a Makefile.
+
+2004-06-24  David Ponce  <david@dponce.com>
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	Fix shell quote and missing
+	new line.
+
+2004-06-22  David Ponce  <david@dponce.com>
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	Fix missing space in echo
+	message.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Distribute the autoload file
+
+	* ede-proj-elisp.el: (ede-proj-makefile-insert-dist-dependencies)
+	(ede-proj-makefile-insert-dist-filepatterns):
+	New methods.  Include the generated file into the distribution.
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	When inserting distribution
+	files, include special distribution files even if there is not
+	sourcevar to include.
+
+2004-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el (ede-makeinfo-source): Fix :garbagepattern.
+	(ede-makeinfo-find-info-filename): New function.
+	(ede-proj-makefile-target-name): Use it.
+
+	* ede-proj-info.el (ede-proj-makefile-insert-dist-filepatterns):
+	Use $(wildcard ...) to expand the "*" in info names.
+
+2004-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Updated all rules with latest autogenerated code.
+
+2004-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-comp.el (ede-makefile-rule): Doc update
+	(ede-proj-makefile-insert-commands): Enable lambda expressions
+	to be added to compiler command lists.
+
+2004-02-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	Add more data to help users get past out of date Makefiles.
+
+	* README: Revamped. We are a part of a CEDET install now.
+
+2004-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* autoconf-compat.el (autoconf-mode): remove autoload cookie.
+
+2004-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-buffer-mine::ede-proj-target-elisp):
+	New method.
+
+2004-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el (ede-makeinfo-compiler):
+	No need to specify output file.
+
+2003-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Do not dist loaddefs.
+
+	* ede-proj-elisp.el (ede-emacs-compiler, ede-emacs-cedet-autogen-compiler):
+	Add --no-site-file to list of arguments.
+	(ede-proj-makefile-sourcevar:ede-proj-target-elisp-autoloads):
+	Do not specify sourcevar as LOADDEFS.
+	(project-compile-target:ede-proj-target-elisp-autoloads): Doc fix
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	Enable meta-subprojects.
+	(ede-proj-makefile-tags): Call subprojects for tag creation w/ MFLAGS.
+
+	* ede-proj.el (ede-proj-project):
+	Add `automatic-dependencies' to the `settings' group.
+	Add `metasubproject' field.
+
+	* Project.ede: Now a meta-subproject.
+
+	* Makefile (dist): Remove local creation of tar file.
+
+2003-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules):
+	Add comment to remind me to
+	let the Makefile rebuild itself.
+
+2003-09-18  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (init): New target.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* ede-speedbar.el: Fix typo.
+
+	* ede.el (ede-load): Require it.  No more load ede-loaddefs.
+
+	* ede-load.el: New file.
+
+2003-09-16  David Ponce  <david@dponce.com>
+
+	* ede-proj-elisp.el (ede-proj-makefile-dependencies):
+	New method for class
+	ede-proj-target-elisp-autoloads.
+
+	* Makefile: Re-generated.
+
+	* ede-proj-elisp.el (ede-emacs-cedet-autogen-compiler):
+	Use $(LOADDEFS) instead of
+	"$@" in compiler's commands.
+	(ede-proj-makefile-target-name): Remove specialized method from
+	class ede-proj-target-elisp-autoloads.
+
+2003-09-11  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede:
+	Fix problem with "aux" file name which is a reserved device file
+	name on Windows.
+
+	(aux target): Rename to "misc".
+	(aux.lisp target): Rename to "aux-lisp".
+
+2003-09-10  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp-autoloads):
+	Add autoload-dirs slot.
+	(ede-emacs-cedet-autogen-compiler): Use $(LOADDIRS) instead of "."
+	in compiler's commands.
+	(ede-proj-makefile-insert-variables): Method of class
+	ede-proj-target-elisp-autoloads creates the LOADDIRS variable
+	definition.
+
+2003-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (auto-mode-alist): Autoload cookie.
+
+	* ede.el (ede-minor-mode): Make interactive.
+	Do not enable ede unless there is a project, or we are called
+	interactively.
+
+	* ede-dired.el (ede-dired-minor-mode):
+	Do not enable the minor mode if there is no
+	project, unless we were called interactively.
+
+2003-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Makefile for EDE.
+
+	* Project.ede ("ede"): Re-arranged source list to compile better
+
+	* ede-system.el (ede-upload-html-documentation):
+	Comment out non-existent function.
+
+	* ede-speedbar.el (ede): Don't require this anymore.
+
+	* ede-proj.el (ede-proj-target-elisp-autoloads): new autoload
+	(ede-proj-target-alist): Added above
+	(ede-proj-compilers): Make robust to single compiler.
+
+	* ede-pmake.el (ede-pmake-varname): add autoload cookie
+
+	* ede.el ("ede-loaddefs"): New load
+	(project-compile-project)
+	(project-compile-target)
+	(project-make-dist)
+	(ede-name)
+	(ede-description)
+	(ede-load-project-file)
+	(ede-parent-project)
+	(ede-target-parent): autoload cookies
+
+	* ede-proj-elisp.el (ede-proj-target-elisp): Added XEmacs compiler
+	(ede-xemacs-compiler): new
+	(ede-proj-target-elisp-autoloads): New class
+	(ede-emacs-cedet-autogen-compiler): New variable
+	(ede-proj-makefile-target-name)
+	(ede-proj-compilers)
+	(ede-proj-makefile-insert-source-variables)
+	(ede-proj-makefile-sourcevar)
+	(ede-proj-makefile-insert-variables)
+	(project-compile-target)
+	(ede-update-version-in-source)
+	(ede-proj-tweak-autoconf)
+	(ede-proj-flush-autoconf): new methods on ede-proj-target-elisp-autoloads
+
+2003-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el (ede-proj-project):
+	Add include-file as a Makefile option.
+
+2003-08-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-up-directory):
+	Updated to make sure there is a / at the end of
+	the returned file.
+
+2003-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-proj-makefile-insert-variables):
+	Use 'identity.
+
+	* ede-pmake.el (ede-proj-makefile-create): Improved some comments
+	(ede-pmake-end-of-variable): New fcn from below w/ fixes.
+	(ede-pmake-insert-variable-shared): Use above.
+
+2003-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (global-ede-mode): Remove some CVS conflict markers.
+
+2003-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el (project-am-load): Do not register this project.
+	It happens in EDE already.
+
+2003-02-22  David Ponce  <david@dponce.com>
+
+	* ede-speedbar.el (ede-file-find): Replaced `speedbar-line-path' with
+	`speedbar-line-directory' used since speedbar 0.15.
+
+2003-02-06  David Ponce  <david@dponce.com>
+
+	* ede.el (global-ede-mode):
+	Use `semanticdb-project-predicate-functions'
+	hook too.
+
+2003-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (ede): Change order of target dependencies.
+
+	* ede-proj-elisp.el (ede-proj-target-elisp):
+	Declair this target as being phony.
+
+	* ede-proj.el (ede-proj-target): Add `phony' class allocated slot.
+
+	* ede-pmake.el (ede-proj-makefile-create):
+	Create build targets for sub projects.
+	(ede-proj-makefile-insert-subproj-rules): New method.
+	(ede-proj-makefile-insert-rules): If a rule classifies itself as
+	phony, add phony rule.
+	(ede-proj-makefile-dependencies): Add auxilliary source to the
+	dependency list.
+
+2003-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-load-project-file): Removed unused variable.
+
+2003-01-22  David Ponce  <david@dponce.com>
+
+	* ede.el (ede-version): Fixed to be compatible with inversion decoder.
+
+	* Project.ede (ede-proj-project "EDE"): Fixed :version string to be
+	compatible with inversion decoder.
+
+2002-12-23  Richard Y. Kim <ryk@ap.com>
+
+	* ede-proj.el:
+	Surrounded (require 'ede) with eval-and-compile.  Without this fix, byte-compiled file is truncated after only one line of code!
+
+2002-11-28  David Ponce  <david@dponce.com>
+
+	* ede-proj-elisp.el (ede-proj-elisp-packages-to-loadpath):
+	Produce paths relative to
+	`default-directory'.
+
+2002-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-system.el (ede-upload-distribution):
+	Fix upload file to be complete.
+
+	* ede-proj-elisp.el (ede-emacs-compiler): Fixed up build line.
+
+2002-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* README: Added some TRAMP stuff.
+
+2001-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version update
+	Web info added.
+
+	* ede-system.el (ede-upload-distribution): Handle TRAMP filenames.
+	(ede-edit-web-page): New fcn
+	(ede-upload-html-documentation): New fcn
+
+	* ede-speedbar.el (ede-speedbar-make-map):
+	SPC toggles open/closed state.
+
+	* ede-proj.el (project-make-dist): Query before bashing old tar file.
+	(project-dist-files): Comment.
+
+	* ede-pmake.el (ede-proj-makefile-create):
+	DISTDIR now includes subproject directories.
+	(ede-proj-makefile-insert-variables): Specify a top variable.
+	(ede-proj-makefile-insert-dist-rules): Pass down DISTDIR.
+	(ede-proj-makefile-tags): Specify extra newlines.
+
+	* ede.el (ede-version): Update version
+
+2001-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-project): Added web-site file/directory slots.
+	Added new menu item to edit the home page.
+	(ede-html-documentation-files, ede-html-documentation): New fns
+	: Added autoloads for web site editing functions in ede-system.
+
+2001-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-auto-add-method): Doc fix
+	(ede-project-placeholder-cache-file, ede-project-cache-files): New veriables.
+	(ede-save-cache, ede-load-cache): New functions.
+	(kill-emacs-hook): Add `ede-save-cache',
+	Load cache at load time.
+	(ede-subproject-relative-path: ede-project): New method
+	(ede-subproject-p: ede-project): New method.
+	(ede-load-project-file): Remove files from project cache.
+	(ede-parent-project): Fix to work well with subprojects.
+
+	* ede-pmake.el (ede-proj-makefile-insert-dist-rules: ede-proj-project):
+	 Enable the makefile to build a dist across subdirectories.
+
+	* ede-proj.el (ede-proj-dist-makefile):
+	Return full paths to the makefiles we are
+	building.
+	(ede-proj-setup-buildenvironment): Build all subproject makefiles also.
+	(project-rescan): Use `object-of-class' instead of `obj-of-class'.
+
+2001-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el (ede-emacs-compiler): Added ; to end of loop.
+	(ede-proj-makefile-insert-variables): Make LOADPATH a shared variable
+	so that we don't replicate it's value over and over.
+
+	* ede-pmake.el (ede-pmake-insert-variable-shared):
+	Don't add a space in front of
+	additions to an existing variable unless the preceeding character is
+	not a space or =.
+
+2001-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: New file.
+	New URL type stuff.
+
+	* ede-system.el: New File.
+
+	* ede-proj.el (ede-proj-project):
+	Removed duplicate menu items.  Added upload-distribution.
+	(defmethod-dist-files:ede-proj-project): New method.
+
+	* ede.el (ede-project):
+	Added slots `web-site-url',`ftp-site', and `ftp-upload-site'
+	Added new menu item to browse a project's url and a separator.
+	(ede-project-forms-menu): Scan backwords through class hierarchy to
+	get all the menu items that need to be used.
+	(project-dist-files): New method.
+
+2001-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Removed ede-emacs.el.
+
+	* ede-proj-prog.el, ede-proj.el, ede-proj-comp.el, ede-pmake.el:
+	Fixed uses of `with-slots' to CLOS behavior.
+
+2001-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el: Always add loadpath to the list of variables.
+
+	* ede-proj-misc.el (ede-proj-makefile-dependency-files):
+	Do not return empty string.
+
+2001-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Fixed up the targets menu
+
+2001-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Added support for ECB directory paths.
+
+2001-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el (ede-toplevel-project-or-nil): new fcn
+	(ede-minor-mode): Use above fcn in `semanticdb-project-root-functions'.
+	(ede-up-directory): New implementation (Richard Kim)
+	(ede-toplevel-project): Expand input file name.
+
+2001-04-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el: Fixed compile warnings in compile-file-project.
+
+	* ede.el: Fixed the turn on hook for Emacs21 for dired mode.
+	Fixed `ede-up-directory' to hopefully be more platform independent.
+	Fixed up sourcecode finding function.
+
+	* ede.texi: Fixed the title and copyright.
+
+	* ede-speedbar.el:
+	Added an option to compile a target from the speedbar menu.
+
+	* ede-proj-skel.el: Fixed a URL.
+
+	* ede-targets.texi, ede-sourcecode.texi, ede-projects.texi, ede-compilers.texi:
+	Updated the documentation
+
+	* ede-proj-info.el: Added a new compiler type (texi2html)
+	Added html as a garbage pattern.
+	Fixed the makeinfo command to use the variable for makeinfo.
+	Add generated info files into the distribution.
+
+	* ede-proj-elisp.el:
+	Makefile generation code fixed to be more platform independent.
+
+	* ede-proj-archive.el (ede-gcc-archive-compiler):
+	Removed link variables, and fix command.
+
+	* ede-pmake.el: Changed URL in comments.
+	Added items to allow insertion of generated files into a dist.
+
+2001-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-sourcecode.texi, ede-compilers.texi, ede-projects.texi, ede-targets.texi:
+	*** empty log message ***
+
+2001-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Project file for EDE
+
+2001-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el:
+	Added `ede-directory-project-p' to `semanticdb-project-predicates' in
+	`global-ede-mode'.
+
+2001-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Fixed doc bug.
+
+2001-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi: Updated compiler object section.
+	Added some doc on the linker class.
+
+	* ede.el: Added `ede-turn-on-hook' fcn.
+	Account for vc-dired-mode in Emacs 21.
+	Everyone hook that used to call `ede-minor-mode' now calls `ede-turn-on-hook'.
+	Autoload in `ede-update-version' from the `ede-util' file.
+
+	* ede-source.el: Sourcecode object is now an instance inheritor.
+
+	* ede-proj.el: Added a menu bit to the project, with defaults.
+	Added `ede-want-file-auxiliary-p' method to targets.
+
+	* ede-proj-skel.el: Doc Fix.
+
+	* ede-proj-shared.el: Try to fix some linking bits.  Needs more work.
+
+	* ede-proj-elisp.el:
+	Use instance inheriting compiler class instead of making our own.
+	Fix Makefile generation to include LOADPATH variable use all the time.
+	Removed crufty bits from prev fix.
+
+	* ede-proj-comp.el:
+	Compiler objects now inherit from instance inheritor.
+
+	* ede-pmake.el: Use ede-map-targets in place of mapc.
+
+	* ede-pconf.el:
+	Use ede-map-targets in place of mapc, and `ede-map-any-target-p' in
+	place of `ede-or' and a mapcar.
+
+	* ede-dired.el: Account for vc-dired-mode in emacs 21.
+
+2000-11-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-util.el:
+	Fixed `ede-update-version-in-source' to handle lists of files.
+	Added `ede-make-buffer-writable'.
+
+2000-10-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Removed all version updating stuff to ede-tul.el
+	Added `ede-map-any-target-p'.
+
+	* ede-util.el: New file.
+
+2000-10-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el:
+	Added `versionsource', a way to let EDE auto-update source files with
+	version numbers in them.
+	Fixed up some of the menu generating code.
+	Added some ^L
+
+	* ede-proj-elisp.el: Fixed up some details in the compiler.
+	Added ede-update-version-in-source.
+
+2000-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el:
+	Do not display a projects version if it is a child of another project.
+
+	* ede-source.el: Added enable-subdirectories slot.
+
+	* ede-pconf.el: Mapcar convert to mapc when available.
+
+	* ede-pmake.el: mapcar to mapc in many places.
+	Update rule inserter to include any available linkers.
+
+	* ede-proj-comp.el:
+	Big piles of the new linker object, sharing a common system with
+	the compiler.
+
+	* ede-proj-elisp.el:
+	Have a special elisp compiler that handles lp (load path) command
+	insertion.  This enables a program with no explicit dependencies
+	to exclude the addition of them into the compile code.
+
+	* ede-proj-obj.el:
+	Added in linker settings, removed old linker compiler combo.
+	Removed `headers' slot.  Use auxsource.
+	Removed old crufty command insert for the old compiler class.
+	Added new crufty command insert for the updated compiler.
+	Removed old ede-buffer-mine, project-add-file, project-remove-file methods.
+
+	* ede-proj.el: Fixed custom for compiler/linker slots.
+	Updated add-file to use `object-add-to-list', appending to the end,
+	  and for the auxiliary files.
+	Fixed remove-file to handle aux-source parts.
+	Updated linker management code.
+
+	* ede.el: Fixed the menu to handle lists of objects.
+	Fixed up the buffer/sourcelist compare function.
+	Fixed file remove stuff to work with subdirs.
+
+	* ede-dired.el:
+	Rearranged the menu to better conform with ede-minor-mode's menu.
+
+2000-10-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Version change.
+	Do not allow `path' to be customized for targets.
+	Commented out `takes-compile-command'.
+	Added default menu items for projects.
+	Completely revamped the menu to have more auto-generated sub-menus.
+	Fixed up `ede-target-forms-menu' to include add/delete file.
+	Added `ede-build-forms-menu' for compilation.
+	Added `ede-project-forms-menu' for project options.
+	Added `ede-menu-items-build' method, used by `ede-build-forms-menu'.
+	When auto-adding a file, offer `new project' in subdirs.
+	Fixed `ede-convert-path' for targets with path information.
+	Revamped the loading harness to handle subdirs with no projects,
+	  allowing those sources to be added to a project higher in the tree.
+	Added new function `ede-target-buffer-in-sourcelist'.
+	Updated `ede-buffer-mine' to use `ede-target-buffer-in-sourcelist'.
+
+	* ede-proj.el: Added linker and availablelinkers slot in classes.
+	Added `ede-proj-linkers' method.
+	When saving a project, make sure we get the path from the original,
+	not the converted path used when saving.
+	Fix `ede-buffer-mine' for projects to correctly eject path when
+	looking up the actual project file.
+	Used `ede-target-buffer-in-sourcelist' when checking for buffer ownership.
+	Use `ede-convert-path' when adding/removeing sources into targets.
+	Use `object-add-to-list' and `object-remove-from-list' when
+	adding/removing sources.
+	In `ede-proj-makefile-create-maybe' make sure mfilename exists.
+
+	* ede-proj-comp.el: Converted some stuff for new `ede-linker' class.
+
+2000-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Added `ede-proj-register-target'.
+
+	* ede-proj-skel.el:
+	Added more comments, and added register target command.
+
+	* ede-proj-skel.el:
+	Fixed a typo and added more comments for want-file-p.
+	Added `ede-source-%NAME%'.  Uncommented sourcetype in the class.
+
+2000-10-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Added `ede-new-target-custom', `project-new-target-custom',
+	and added a :objectcreatefcn to the properties of the repeating object
+	in slot target.
+
+	* ede-proj.el: Added project-new-target-custom.
+
+	* ede.el:
+	Enable universal argument to `customize-project' and `customize-target'
+	to query the user for a group name with `eieio-read-customization-group'.
+
+2000-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Added :group, and :label to all appropriate slots.
+	Added ede-project-placeholder, for a master list of projects.
+	Stated added in support to use the placeholder.
+
+	* ede-proj.el: Fixed some custom-group settings.
+	Added custom-label to all areas of slots.
+
+2000-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-comp.el: Fixed bug when variable slot is unbound.
+	mapcar to mapc for speed in emacs 21.
+
+2000-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el:
+	Fixed up target name *again*.  Use the file name for the mainmenu.
+
+2000-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-shared.el, ede-proj-prog.el: Fixed compiler warning.
+
+	* ede-proj-archive.el: Fixed compiler warning.
+	Added compiler for this object.
+
+	* ede-pmake.el: Fixed compiler warning.
+
+	* ede-proj.el:
+	Project accepts Makefile and configure scripts as "mine".
+
+	* ede-proj-info.el:
+	Fixed the compiler for info files.  Intermediate objects are not created.
+
+	* ede-speedbar.el: Changed display mode to "Project".
+
+	* ede.texi: Lots and lots of changes.
+
+	* ede-proj.el:
+	When compiling a target, use the method that gets the target
+	name.
+
+	* ede-pmake.el: Use `ede-pmake-varname' to create the _OBJ variable.
+
+2000-09-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pconf.el:
+	Do not ask questions about reloading Makefile for checking.
+
+	* autoconf-edit.el:
+	Changing the version, and outputs no longer causes configure.in to change.
+
+	* ede-proj-info.el: Fixed paren typo.
+
+	* ede-proj-shared.el: Fixed type of first var in `-add-missing'.
+
+	* ede-proj-info.el:
+	Fixed `ede-proj-makefile-sourcevar' to use _TEXINFOS, not INFOS.
+	Added `ede-proj-configure-add-missing' for texinfo.tex.
+	Added `ede-proj-makefile-insert-source-variables' to do something
+	  special in automake mode (splitting the menu from the rest).
+
+	* ede-pmake.el:
+	Removed crufty variable from ede-proj-makefile-insert-source-variables.
+
+2000-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-source.el: New file.
+
+	* ede.el: Copyright update.
+	Added version number near version comment.
+	Updated project code loader to have meta slots.  Do not provide
+	  project-am as a create option.
+	Added `sourcetype' to target.
+	When adding a file to a target, offer to create a new target.
+	Provide smarter filtering when asking for a project type.
+	Let expand filename return something if a file doesn't exist based on param.
+	Let targets expand file names.
+	Changed `want-file-p' to look at a target's sourcecode slot.
+	Updated header finder to use sourcecode objects to derive them.
+	Added `ede-target-sourcecode' to return the sourcecode a target wants.
+	Added `ede-or' function.
+
+	* ede-proj.el: Copyright update.
+	Added require `ede-proj-comp'.
+	Added new slots in `ede-target' called availablecompilers.
+	Added slot `compiler' in `ede-proj-target-makefile'.
+	Removed `ede-makefile-rule' class (now in ede-proj-comp)
+	Removed `ede-want-file-p' for `ede-proj-target'.
+	Added `ede-proj-compilers', to return the compile set a give target uses.
+	Checkdoced a bunch of doc strings.
+
+	* ede-proj-skel.el:
+	Updated for lots of new methods.  Still needs work though.
+
+	* ede-proj-shared.el: Copyright update.
+	Removed libtool stuff from class.
+	Added defaults for availablecompilers.
+	Added `ede-gcc-shared-compiler', `ede-gcc-libtool-shared-compiler',
+	with some cruft ifed out.
+	Added `ede-proj-configure-add-missing',
+	 `ede-proj-makefile-insert-automake-pre-variables',
+	 `ede-proj-makefile-insert-automake-post-variables',
+	 `ede-proj-makefile-target-name', and
+	 `ede-proj-makefile-sourcevar (for automake stuff)
+
+	* ede-proj-scheme.el: Copyright update.
+	Removed `ede-want-file-p', now handled elsewhere.
+
+	* ede-proj-prog.el: Copyright update.
+	Added `ede-proj-makefile-insert-automake-pre-variables' and
+	`ede-proj-makefile-insert-automake-post-variables'.
+
+	* ede-proj-obj.el: Copyright update.
+	Added `ede-proj-objectcode-dependencies' state variable.
+	Added availablecompilers and sourcetype defaults
+	Removed garbage-patters, and insert-rules, and `want-file-p' methods.
+	Added `ede-object-compiler' class inheriting from `ede-compiler'.
+	Added `ede-source-c', `ede-gcc-compiler', `ede-source-c++',
+	and `ede-g++-compiler'.
+	Added methods for `ede-object-compiler' for
+	`ede-proj-makefile-insert-commands'. and `ede-proj-makefile-insert-variables'
+	Fixed up all other methods to use new compiler/source objects to
+	determine how to do things.
+	Removed logs of custom compile code for C.
+
+	* ede-proj-misc.el: Copyright update.
+	Removed eval-and-compile restriction.
+	Added availablecompilers and sourcetype defaults
+	Removed garbage-patters, and insert-rules, and `want-file-p' methods.
+	Added `ede-misc-source', and `ede-misc-compile' vars.
+	Do not call `call-next-method' in `ede-proj-makefile-insert-rules'.
+
+	* ede-proj-info.el: Copyright update.
+	Removed eval-and-compile restriction.
+	Added availablecompilers and sourcetype defaults
+	Added `ede-makeinfo-source' and `ede-makeinfo-compiler'.
+	Removed garbage-patters, and insert-rules.
+	Added `ede-proj-makefile-target-name' and `object-write' methods.
+
+	* ede-proj-elisp.el: Copyright update.
+	Added defaults for sourcetype, and availablecompilers.
+	Removed ede-want-file-p.
+	Added `ede-source-emacs' and `ede-emacs-compiler'.
+	Updated `ede-proj-makefile-insert-variables' to be :AFTER, and removed
+	 `call-next-method' from it, and insertion of the EMACS variable.
+	Removed garbage-patters, and insert-rules methods.
+	Removed AM_PATH_LISPDIR insertion from tweak-autoconf.
+
+	* ede-proj-comp.el: New file.
+
+	* ede-proj-aux.el: Copyright update.
+	Provide default for sourcetype.
+	Added `ede-aux-source' variable.
+
+	* ede-proj-archive.el: Copyright update.
+	Added `ede-proj-makefile-insert-source-variables' which produces
+	a different variable between Makefile and Makefile.am mode.
+
+	* ede-pmake.el: Copyright update.
+	Added comment on what we try to do.
+	Removed `have-cfiles'.  This should be handled by compiler/targets.
+	Enable targets to control dependency generation.
+	Removed libtool cruft, added into target and compiler code.
+	Added `ede-pmake-insert-variable-shared'.
+	Updated `ede-proj-makefile-insert-variables' for `ede-proj-target' to
+	 use source and compiler objects instead of making the target do the
+	 work in target specific code.
+	Updated `ede-proj-makefile-insert-variables' for `.target-makefile'
+	 to use compiler and source information also.
+	Updated rule insertion to use the compiler object.
+	Added target based makefile dependency generation via compiler objects.
+
+	* ede-pconf.el: Copyright update.
+	Update for change in `ede-expand-filename'.
+	Added `ede-proj-configure-test-required-file'.
+	Better checks for files created with --add-missing.
+	Create more files automatically, line NEWS.
+	Better Makefile flushing when switching between Makefile, and Makefile.am mode.
+	Enable compilers to also tweek autoconf from here.
+	Enable individual targets to use --add-missing, or create-missing.
+
+	* ede-dired.el: Copyright update.
+
+	* autoconf-edit.el: Copyright update.
+	Added some more macros to the ordering list.
+	Fixed insertion of new macros after macros with or without parameters.
+
+	* autoconf-compat.el: Copyright update.
+
+2000-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el: Removed the speedbar timer code.
+
+2000-07-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* autoconf-compat.el: added with-syntax-table.
+
+	* autoconf-edit.el: removed with-syntax-table.
+
+	* ede-proj-obj.el:
+	Added a comment discussing ede-pmake not being required.
+
+	* ede-pconf.el: require ede-proj instead of ede.
+
+	* ede-proj-aux.el: Added require of ede-pmake.
+
+	* project-am.el: Renamed ede-project-mine, to ede-buffer-mine.
+	Fixed up project-am-buffer-object to use ede-buffer-mine, and
+	thus simplify it.
+
+	* ede.el: Removed eval-when-compile stuff, added more requires.
+	Split some lines in the project-autoload object, added :initlializers.
+	Use initlizers so that `automake' mode is edeproject with initializers.
+	Added ede-commit-project base method on ede-project.
+	Added project-rescan base method on ede-project.
+	Added ede-convert-path for ede-target.
+	Added ede-find-target method for ede-project, with ede-buffer-mine
+	bases for ede-project, and ede-target.
+	Fiddled with speedbar autoloads till the compiled clean with
+	new EIEIO.
+
+	* ede-speedbar.el:
+	Removed eval-when-compile stuff, added more requires.
+
+	* ede-proj.el: Removed eval-when-compile stuff.
+	Removed `ede-find-target', and updated `ede-buffer-mine' to adopt some
+	of `ede-find-target's special ness.
+	Added `ede-buffer-mine' method for ede-proj-targets.
+	Added provide/require of pmake/pconf in .el form when compiling, and
+	moved it elsewhere.
+
+	* ede-proj-skel.el: Added `ede-buffer-mine' skeleton.
+
+	* ede-proj-scheme.el:
+	Removed eval-when-compile stuff.  Added more requires.
+
+	* ede-proj-obj.el: Removed eval-when-compile stuff.
+	Added `ede-buffer-mine' implementation for header files.
+
+	* ede-proj-elisp.el:
+	Removed eval-when-compile stuff, added more requires.
+	Make the sourcevar shared for automake mode.
+	Make EMACS shared in Makefile mode.
+
+	* ede-proj-aux.el, ede-proj-archive.el:
+	Removed eval-when-compile stuff.
+
+	* ede-pmake.el: Removed eval-when-compile stuff.
+	Added shared variables (variables that multiple targets may install.)
+
+	* ede-pconf.el: Removed eval-when-compile stuff.
+
+	* autoconf-edit.el: Removed autoconf into autoconf compat.
+
+	* autoconf-compat.el: New file.
+
+2000-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el:
+	Use eval-and-compile tricks when requiring other eieio based packages.
+
+	* ede.el:
+	Use eval-and-compile tricks when requiring other eieio based packages.
+	Added `ede-expand-filename' method for targets. (calls the project version.)
+
+	* ede-speedbar.el, ede-proj.el:
+	Use eval-and-compile tricks when requiring other eieio based packages.
+
+	* ede-pconf.el, ede-proj-elisp.el, ede-proj-scheme.el:
+	Change from tweek to tweak.
+
+	* ede-proj-skel.el: `eval-and-compile' requires.
+	Added skeletons for ede-proj-tweak-autoconf and ede-proj-flush-autoconf.
+
+	* ede-proj-shared.el: `eval-and-compile' requires.
+
+	* ede-proj-scheme.el: `eval-and-compile' requires.
+	Added `ede-proj-tweek-autoconf' method to add AM_INIT_GUILE_MODULE.
+
+2000-07-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-prog.el, ede-proj-obj.el, ede-proj-misc.el, ede-proj-info.el:
+	Eval and compile requires.
+
+	* ede-proj-elisp.el: Eval and compile requires.
+	Removed load path and requiresments.  Replaced with aux-packages.
+	Added ede-proj-elisp-packages-to-loadpath (see above)
+	Replaced path/requirements usage to above two comments.
+	Added `ede-proj-elisp-add-path', `ede-proj-tweek-autoconf'
+	`ede-proj-flush-autoconf'
+
+	* ede-proj-aux.el, ede-proj-archive.el: Eval and compile requires.
+
+	* ede-pmake.el: Added ede-proj-makefile-insert-user-rules method.
+	Insert user rules into the automake file.
+
+	* ede-pconf.el: Added a flush method to targets. (called first)
+	Added smart init compile phase.
+
+	* ede-dired.el: Added require for ede.
+
+	* autoconf-edit.el: Added copyright header.
+	Fixed loading of autoconf.el (if it exists.)
+	Fixed configure.in default section.
+	Added AM_INIT_GUILE_MODULE to main list of macros.
+	Fixed macro finding fn.
+	Fixed insert-new-macro doc.
+
+2000-07-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Removed dead field from ede-project.
+	Added a parameter to ede-toplevel, which is an object to start from.
+
+	* ede-pmake.el: Removed old pconf management.
+
+	* ede-proj.el: Converted to use configure.in when applicable.
+
+	* autoconf-edit.el: Vast quantities of changes.
+	Roughtly:
+	   Use Emacs21 autoconf mode.
+	   Added many editing functions (many of which are still untested.)
+
+	* ede-pconf.el:
+	Removed previous cruft.  Added in useful things which use autoconf-edit.el.
+
+2000-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el:
+	In ede-proj-makefile-insert-variables, make sure the EMACS variable
+	does not include full path to Emacs.
+
+2000-06-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-dired.el, ede-speedbar.el, ede-proj.el: Do not require ede.
+
+	* ede-proj-elisp.el: Added `debug-on-error' into the build process.
+
+2000-06-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Added eval-when-compile for ede-speedbar.
+
+	* ede.el: Updated version.
+	Fixed the menu for building a target.
+	Added ede-update-version and project-update-version.
+	Added a speedbar setup hook for the speedbar file mode menu hack.
+
+	* ede-speedbar.el: Added a hack for the speedbar-files display mode.
+	This adds extra menu items and keybindings.
+
+	* ede-proj.el:
+	Added partofall slot indicating if this target is built w/ ALL.
+	Added project-update-version method.
+
+	* ede-proj-misc.el: Default makefile is now empty.
+	Request ALL types of files.
+	Do not insert rule if there is no submakefile.
+	Update dependencies based on the existence of a submakefile.
+
+	* ede-pmake.el:
+	Do not insert compile/link variables if there are no C files.
+	Do not add targes to "all:" rule if they are not a part of all.
+
+	* ede-dired.el: Added make-dist to the dired project menu.
+
+2000-05-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Added support for the new EDE documentation query.
+
+2000-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el: Added ede-documentation method.
+
+	* ede.el: Added in new functions for the Semantic bovinator.
+	ede-documentation-files, ede-buffer-documentation-files,
+	ede-documentation
+
+	* ede-proj-skel.el:
+	Added in new stuff which the semantic bovinator will use.
+
+	* ede-speedbar.el: Updated for the latest speedbar.
+
+2000-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el:
+	Added ede-header-file, and ede-buffer-header-file for projects and targets.
+
+	* ede-proj-obj.el: Added ede-buffer-header-file.
+
+	* project-am.el: Now uses default override if applicable.
+
+	* project-am.el:
+	Added ede-buffer-header-file for project-am-objectcode.
+
+	* ede-proj-skel.el: Added ede-buffer-header-file
+
+2000-04-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Fixed some comments.
+	Added ede-toplevel and ede-expand-filename functions.
+
+2000-01-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el:
+	Updated to handle 'eieio' prefix now used in eieio for what was '-engine'
+
+	* ede-proj-shared.el:
+	Removed extraneous methods which were causing errors.
+
+1999-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Fixed name of ede-map-subprojects.
+
+	* ede-speedbar.el: Added a require 'speedbar during compile.
+	Fixed doc of child-make-tag-lines, and add depth param.
+
+	* ede-proj-obj.el: Calc have-libtool locally.
+
+	* ede-proj-elisp.el: Added smarts into compile-target.
+	Fixed the rules generated to handle requires w/ a .el.
+
+	* ede-pmake.el: Added an autoload for ede-proj-configure-create.
+
+	* ede-dired.el: Added a require for dired.
+
+1999-12-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el: Made all those new speedbar commands interactive
+
+1999-12-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-obj.el: converted to use the new speedbar code.
+
+	* ede-speedbar.el:
+	Added many elements to an ede specific keymap and menu.
+
+	* ede.el: Fixed ede-target-in-project-p for projects with subprojects.
+
+	* ede-proj-skel.el: Fix up speedbar references.
+
+	* ede-speedbar.el:
+	Fixed up info providers, which required fix ups to line path generator.
+
+1999-11-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Added some project mapping functions.
+
+	* ede-speedbar.el: Fix up some file finding details.
+
+1999-11-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el:
+	Added parent classes to ede-project, and ede-target so that we can
+	support speedbar using eieio-speedbar.
+	Fixed a dynamic target menu bug.
+
+	* ede-speedbar.el: Converted to use new eieio-speedbar adapter.
+
+1999-11-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-info.el:
+	Added ede-proj-makefile-sourcevar function which had been lost earlier.
+
+1999-11-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-skel.el: New file.
+
+	* ede-speedbar.el: Fixed a doc-string.
+
+	* ede-speedbar.el: Removed object specific button expanders.
+	Removed require of project-am.
+
+	* project-am.el: Added all the speedbar methods here.
+
+	* ede-proj-obj.el: Added speedbar button expand override function.
+
+	* ede-proj-prog.el: Fixed require statement.
+
+	* ede-proj-scheme.el: No target specific keymap entries.
+
+	* ede-proj-info.el, ede-proj-elisp.el: No target specific entries.
+
+	* ede.el:
+	Added a target specific menu in the Project menu which uses a :filter.
+
+	* ede-proj.el: Fixed some new doc strings for autoloads.
+
+1999-11-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-shared.el, ede-proj-scheme.el, ede-proj-misc.el, ede-proj-info.el, ede-proj-archive.el:
+	Fix comment.
+
+	* ede.el: Playing around with target menu again.
+
+	* ede-proj-aux.el: Fixed typo for makefile-sourcevar method
+
+	* ede-proj.el, ede-pmake.el:
+	Removed as many target specific methods as I could.
+
+	* ede-proj-archive.el: Added require
+
+	* ede-proj-shared.el, ede-proj-scheme.el, ede-proj-prog.el, ede-proj-obj.el, ede-proj-info.el, ede-proj-aux.el, ede-proj-archive.el, ede-proj-misc.el:
+	New file.
+
+1999-11-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj-elisp.el: New file.
+
+	* ede.el: Added an ede-version function.
+	Removed old target map (target specific keymap) and replaced with
+	a :forms menu keyword, and set-local-key calls.
+
+	* ede-pmake.el: Fixed paren problem
+
+1999-09-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Added the miscelaneous project type.
+
+	* ede-pmake.el: Added rules for the miscelaneous project type.
+
+1999-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el: Fixed ordering of targets in makefile.
+
+	* ede-proj.el:
+	Fixed reload code to handle unbound slots.  Probably should create a "copy-object" that
+	will do this for me.
+
+	* ede.el:
+	Removed crufty EIEIO (or .. null) type code and use unbound slot checking.
+
+1999-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Added types to objects.
+	Added initform to auxsource.
+	Call keymap updater even though it doesn't work yet.
+
+	* ede.el: Completely rehashed the menu.
+	Attempted to break out a special target menu.
+	Added types to as many fields as seemed apropriate.
+	Changed None to none for target completion.
+
+1999-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi: Fixed up compiler warnings.
+
+1999-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el:
+	Fixed info building target to work if there is no "main menu".
+	Fixed compiling lisp to have better compile script name. (less likely
+	to be used, since EIEIO had a conflict.
+
+1999-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Re-arranged the menu to specs based on Paul K.
+
+1999-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el: Added rules to make recursive tag files.
+
+1999-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el:
+	Switched from a new EIEIO fn to an older one for compatibility.
+	Fixed up doc strings in many functions.
+
+1999-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el:
+	Fixed the infos rule to work with multiple file targets.
+
+1999-06-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el: Added infos make rules, and shared object extensions.
+
+	* ede-pconf.el: New file.
+
+	* ede.el: Dired minor mode auto-load
+
+1999-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Made new target robust to dired-mode.
+
+	* ede-dired.el: New file.
+
+	* ede.el: Global ede mode now toggles correctly.
+	Added hooks for dired-mode into global-ede-mode, and ede-minor-mode.
+
+1999-04-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Fixed some simple bugs.
+
+	* ede.texi: Added empty nodes about project types.
+
+	* ede.el: Added map-subproject function.
+	Fixed subproject bugs.
+
+	* ede-proj.el:
+	Added shared object support.  There is an archive type, but it isn't
+	hooked up yet.
+
+	* ede-pmake.el:
+	Added shared object creation.  libtool support is still somewhat
+	broken.
+
+1999-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* README: New file.
+
+	* ede-proj.el: Fixed bug answering NO to project-new-target.
+
+	* ede-pmake.el:
+	Remove distribution subdirectory when done building the distribution.
+
+	* ede.texi: Added section on subprojects.
+	Fixed some typos.
+
+	* ede-pmake.el: depndecy->dependency.  Added .PHONY.
+
+	* ede-proj.el: Fixed phony
+	fixed project/makefile dependency check.
+
+	* ede.el: Fixed up compile project to go the top-level.
+
+	* project-am.el: Added names back into the project loader.
+
+	* ede-pmake.el:
+	For makefile: Added dependency file generation (stolen from automake)
+		Added COMPILE/LINK when there is c code.
+		Added LOADPATH and requirements for lisp.
+		Added clean target, and junk filtering.
+		Makefile depends on Project.ede file. (No autogen yet)
+
+	* ede-proj.el:
+	Updated the object code target.  Removed LDFLAGS, and added
+	configuration variables instead.
+	In lisp object, added requirements (things to require)
+	Added configuration variable defaults to the object code class.
+	Added automatic dependency flag into the object code type.
+	Enabled multiple targets per file in the loader.
+	Auto-save on removal of a target.
+	Added command to regenerate makefiles.
+	Make makefile generator smarter about auto-rebuild.
+
+	* ede.el:
+	Revamped targets so that a buffer can be part of multiple targets.
+	Updated commands to auto-ask for which target if there are multiple ones.
+	New function returns the buffers controlled by a target.
+	When a target is deleted, remove that object from all buffers that reffed it.
+
+1999-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.el: Fixed free variable in auto-add.
+
+	* project-am.el:
+	Fixed up :notation for items that no longer have initargs.
+
+	* ede.texi:
+	Added chapter on customizing ede, and moved some intro text from
+	"creating a project" into it, and added a bunch more stuff.
+
+	* ede-pmake.el:
+	Removed require to ede-proj so that it can be loaded w/out a byte compile.
+
+	* ede-proj.el: Added a scheme target.  (Useless at the moment)
+	Added subproject reading,creating support.
+	Fixed up bad variable references in makefile generator.
+
+	* ede.el: Removed initarg from subproj so that they are not saved.
+	Fixed up file references to handle subprojects better.
+	Added ede-add-subproject, ede-parent-project and ede-up-directory.
+
+	* ede-proj.el: Fixed project-rescan.
+
+	* ede.el: Fixed up macro ede-with-projectfile wrt oref file.
+	Fixed project creation with object-assoc (errors from earlier translation)
+
+1999-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el: Emacs lisp now generates makefile rules.
+
+	* ede-pmake.el: Emacs lisp now generates makefile rules.
+	Fixed up all target wrt variable and inference insertion.
+
+1999-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Removed bogus comments.
+	Changed all initargs refs to direct slot refs.
+
+	* ede.el: Fixed compile bugs in ede-with-projectfile.
+
+	* ede-pmake.el: Fixed compile error  with oref in makefile generator.
+
+1999-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi: Put content into the documentation.
+
+	* ede-proj.el: done-customizing now calls back to the previous method.
+	Useful for handling the local variable scenario.
+
+	* ede.el: Fixed project local variables, made work with customize.
+
+	* ede.el: Ran through checkdoc.
+	Added local variable support.
+	Added functions `ede-project-buffers', `ede-make-project-local-variable',
+	`ede-set-project-variables', and `ede-set' for setting project
+	variables.
+
+1999-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Added project compile command.
+	Fixed makefile mode loading.
+
+	* ede-pmake.el: Add makefile rules after all target.
+	Add extra sources to the sources variable if applicable.
+	Doc changes.
+	Added dependencies on source to headers.
+	Permit variables for libraries during link.
+
+	* ede-proj.el: Added header files to object targets.
+	Added extra rules for targets and projects.
+	Added make VARs for the project.
+	Fixed up lots of documentaion in objects.
+	Fixed customization completion.
+	Fixed want-file method for objects with extended file lists.
+	Fixed add method to add header files into the header section.
+	Added Remove for object method to find files in header list.
+	Added a compile command for the default project target. (make all)
+
+	* ede.el: Added auto-add to project.
+	Adding a file to a target will remove it from other targets.
+	Added method asking an object if it wants a file.
+
+1999-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-pmake.el: New file.
+
+	* ede-proj.el:
+	Added some fields into the objects for additional sources and rules.
+	Used repeating objects with :objecttype widget description. (for the nil case)
+	Added new makefile rule objects.  (for custom buffers.)
+	Remove :field reference where not apropriate. (faster)
+	Removed makefile generation into its own file.
+
+	* ede.el: Customize aliases.
+	Added a group.
+	Moved the debugger choice into this file.
+	Removed all old :field symbols where they weren't used for init (faster.)
+
+1999-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: :docstring -> :documentation
+
+	* ede-proj.el: Ran through checkdoc.
+	:mfile -> :makefile
+	:docstring -> :documentation
+	Added :makefile-type to project
+	Aded eieio-done-customizing methods to targets and projects.
+	Fixed up target creation.
+	Added some predicates for makefile type.
+	More compile target hacks
+	Makefile gen hacks.
+
+	* ede.el: :docstring -> :documentation
+	Added new custom commands for project objects.
+	Added new functions to get the parent project from a target. (search)
+
+1999-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-proj.el:
+	Removed source from ede-proj-target.  It's in ede-target.
+
+	* ede.el: Added ede-description method onto base project/target.
+
+	* ede-speedbar.el:
+	Added generic button/expand methods for ede-project and ede-buttons.
+	These seem to work fine with ede-proj.
+
+	* ede-proj.el: Added info node type.
+
+	* ede.texi: Added a menu, and the default nodes for EDE.
+
+	* ede-speedbar.el: This now depends on project-am
+	Several fixups for project-am.
+
+	* ede-proj.el: New file.
+
+	* ede.el: Tons of junk to make it work with ede-proj.el.
+	* default methods for all commands
+	* Update some functionality into ede commands.
+
+1999-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Project-am-rescan -> project-rescan
+
+	* ede.el: Speedbar enhancements.
+	Minor mode and global mode updates.
+
+1998-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede-speedbar.el: New file.
+
+	* project-am.el:
+	Ripped out top level mode stuff into EDE.  Retrofitted classes to be
+	based on the ede classes.  Fixed old commands into methods. (compile,
+	add/remove target).  Some of the stuff is non-functional.
+
+	* ede.el: New file.
+
+1998-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ede.texi: New file.
+
+1998-10-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Removed a comment about proto type
+
+1998-10-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Ran through checkdoc and ispell.
+
+	* project-am.el: Wrote global-project-am-mode.
+
+	* project-am.el: Enabled the debug target comman.
+
+	* project-am.el: Fixed up some compile warnings.
+
+	* project-am.el:
+	Added several menu items.  Implemented create,add,remove,modify,compile,dist
+	menu items.  Fixed up several bugs.  Added lots of stuff.
+
+1998-10-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: Added lots of project minor mode commands (empty)
+	Object data base builder is now based on a rescan method
+	which will incidentally create new stuff along the way.
+	Added named target objects (yea!)
+	Added a name program (to get the name from an obj, maybe delete later)
+	Fixed up speedbar stuff to use right variables (left overs)
+	Makefiles w/ one target in speedbar skip the intermediate target view.
+	Fixed some depth problems.
+
+1998-10-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el:
+	Converted all the speedbar stuff into methods.  SB code is now really
+	simple, and complex decisions are made via methods.
+	Copy my makefile updates into this file.
+	Made work w/ deep packages.
+
+1998-10-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* project-am.el: New file.
+
+1997-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* autoconf-edit.el: New file.
+
diff --git a/site/cedet-1.0pre7/ede/Makefile b/site/cedet-1.0pre7/ede/Makefile
new file mode 100644
index 0000000..f741d4c
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/Makefile
@@ -0,0 +1,128 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+misc_AUX=README ede-proj-skel.el ChangeLog
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../common/  ../srecode/ ../speedbar/ ../eieio/\
+   
+LOADDEFS=ede-loaddefs.el
+LOADDIRS=.
+init_LISP=ede-load.el
+ELISPPRELOAD= cedet-compat
+ede_LISP=ede.el ede-auto.el ede-base.el ede-custom.el ede-dired.el ede-source.el ede-util.el ede-system.el ede-speedbar.el ede-srecode.el ede-files.el ede-locate.el ede-make.el ede-shell.el
+proj-project_LISP=ede-proj.el ede-pmake.el ede-pconf.el ede-proj-elisp.el ede-proj-misc.el ede-proj-obj.el ede-proj-prog.el ede-proj-archive.el ede-proj-shared.el ede-proj-info.el ede-proj-scheme.el ede-proj-aux.el ede-proj-comp.el
+projects_LISP=project-am.el ede-simple.el ede-cpp-root.el ede-emacs.el ede-linux.el
+aux-lisp_LISP=autoconf-edit.el autoconf-compat.el makefile-edit.el
+ede_info_TEXINFOS=ede.texi ede-projects.texi ede-targets.texi ede-sourcecode.texi ede-compilers.texi
+MAKEINFO=makeinfo
+VERSION=1.0pre7
+DISTDIR=$(top)EDE-$(VERSION)
+
+
+
+all: autoloads init ede proj-project projects aux-lisp ede.info EDE_Templates
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: ede
+ede: $(ede_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: proj-project
+proj-project: $(proj-project_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: projects
+projects: $(projects_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: aux-lisp
+aux-lisp: $(aux-lisp_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+ede.info: $(ede_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+.PHONY:EDE_Templates
+EDE_Templates:
+	$(MAKE) -C templates
+
+tags: 
+	$(MAKE) -C templates/ $(MFLAGS) $@
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: autoloads ede.info
+	mkdir $(DISTDIR)
+	cp ede-loaddefs.el $(init_LISP) $(ede_LISP) $(proj-project_LISP) $(projects_LISP) $(aux-lisp_LISP) $(misc_AUX) $(ede_info_TEXINFOS) ede.info* $(ede_FILES) $(DISTDIR)
+	$(MAKE) -C templates $(MFLAGS) DISTDIR=$(DISTDIR)/templates dist
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/ede/Project.ede b/site/cedet-1.0pre7/ede/Project.ede
new file mode 100644
index 0000000..fd295b1
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/Project.ede
@@ -0,0 +1,65 @@
+;; Object EDE
+;; EDE project file.
+(ede-proj-project "EDE"
+  :name "EDE"
+  :version "1.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "ede-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("ede-load.el")
+    :compiler 'ede-emacs-preload-compiler
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-elisp "ede"
+    :name "ede"
+    :path ""
+    :source '("ede.el" "ede-auto.el" "ede-base.el" "ede-custom.el" "ede-dired.el" "ede-source.el" "ede-util.el" "ede-system.el" "ede-speedbar.el" "ede-srecode.el" "ede-files.el" "ede-locate.el" "ede-make.el" "ede-shell.el")
+    :versionsource '("ede.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "speedbar" "cedet-files" "srecode")
+    )
+   (ede-proj-target-elisp "proj-project"
+    :name "proj-project"
+    :path ""
+    :source '("ede-proj.el" "ede-pmake.el" "ede-pconf.el" "ede-proj-elisp.el" "ede-proj-misc.el" "ede-proj-obj.el" "ede-proj-prog.el" "ede-proj-archive.el" "ede-proj-shared.el" "ede-proj-info.el" "ede-proj-scheme.el" "ede-proj-aux.el" "ede-proj-comp.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "speedbar" "cedet-files" "srecode")
+    )
+   (ede-proj-target-elisp "projects"
+    :name "projects"
+    :path ""
+    :source '("project-am.el" "ede-simple.el" "ede-cpp-root.el" "ede-emacs.el" "ede-linux.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "cedet-files")
+    )
+   (ede-proj-target-elisp "aux-lisp"
+    :name "aux-lisp"
+    :path ""
+    :source '("autoconf-edit.el" "autoconf-compat.el" "makefile-edit.el")
+    )
+   (ede-proj-target-aux "misc"
+    :name "misc"
+    :path ""
+    :source '("README" "ede-proj-skel.el" "ChangeLog")
+    )
+   (ede-proj-target-makefile-info "ede"
+    :name "ede.info"
+    :path ""
+    :source '("ede.texi" "ede-projects.texi" "ede-targets.texi" "ede-sourcecode.texi" "ede-compilers.texi")
+    :mainmenu "ede.texi"
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/ede.shtml"
+  :web-site-directory "../www"
+  :web-site-file "ede.shtml"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :configuration-variables 'nil
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/ede/README b/site/cedet-1.0pre7/ede/README
new file mode 100755
index 0000000..1e19320
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/README
@@ -0,0 +1,14 @@
+EDE - Emacs Development Environment
+
+Compiling instructions:
+
+   Follow the INSTALL file in the top level of this distribution.
+
+To use the Web Site management features:
+
+Local file names are needed for copying distribution, and web pages.
+You can use ange-ftp or EFS for accessing FTP sites.  If some
+locations are accessible only through scp, or rcp, you can use TRAMP
+to copy files.
+
+http://ls6-www.informatik.uni-dortmund.de/~grossjoh/emacs/tramp.html
diff --git a/site/cedet-1.0pre7/ede/autoconf-compat.el b/site/cedet-1.0pre7/ede/autoconf-compat.el
new file mode 100755
index 0000000..bed5955
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/autoconf-compat.el
@@ -0,0 +1,139 @@
+;;; autoconf-compat.el --- Copied from Emacs 21 for backward compatibility
+;;;                        with older emacsen.
+;; Delta: 1) this comment
+;;           provide `autoconf-compat' instead of autoconf-mode.
+;;           Added `with-syntax-table' compatibility code.
+
+;;; autoconf.el --- Mode for editing Autoconf configure.in files.
+
+;; Copyright (C) 2000, 2004, 2007 Free Software Foundation, Inc.
+
+;; Author: Dave Love <fx@gnu.org>
+;; Keywords: languages
+;; $Revision: 1.6 $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Provides fairly minimal font-lock, imenu and indentation support
+;; for editing configure.in files.  Only Autoconf syntax is processed.
+;; There is no attempt to deal with shell text -- probably that will
+;; always lose.
+
+;; This is specialized for configure.in files.  It doesn't inherit the
+;; general M4 stuff from M4 mode.
+
+;; There is also an autoconf-mode.el in existence.  That appears to be
+;; for editing the Autoconf M4 source, rather than configure.in files.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'font-lock))
+
+(eval-and-compile (if (not (fboundp 'with-syntax-table))
+			
+;; Copied from Emacs 21 for compatibility with released Emacses.
+(defmacro with-syntax-table (table &rest body)
+  "Evaluate BODY with syntax table of current buffer set to a copy of TABLE.
+The syntax table of the current buffer is saved, BODY is evaluated, and the
+saved table is restored, even in case of an abnormal exit.
+Value is what BODY returns."
+  (let ((old-table (make-symbol "table"))
+	(old-buffer (make-symbol "buffer")))
+    `(let ((,old-table (syntax-table))
+	   (,old-buffer (current-buffer)))
+       (unwind-protect
+	   (progn
+	     (set-syntax-table (copy-syntax-table ,table))
+	     ,@body)
+	 (save-current-buffer
+	   (set-buffer ,old-buffer)
+	   (set-syntax-table ,old-table))))))
+
+))
+
+(defvar autoconf-mode-map (make-sparse-keymap))
+
+(defvar autoconf-mode-hook nil
+  "Hook run by `autoconf-mode'.")
+
+(defconst autoconf-font-lock-syntactic-keywords
+  '(("\\<dnl\\>" 0 '(11))))
+
+(defconst autoconf-definition-regexp
+  "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\(\\sw+\\)")
+
+(defvar autoconf-font-lock-keywords
+  `(("A[CM]_\\sw+" . font-lock-keyword-face)
+    (,autoconf-definition-regexp
+     3 font-lock-function-name-face)
+    ;; Are any other M4 keywords really appropriate for configure.in,
+    ;; given that we do `dnl'?
+    ("changequote" . font-lock-keyword-face)))
+
+(defvar autoconf-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\" "." table)
+    (modify-syntax-entry ?\n ">" table)
+    (modify-syntax-entry ?# "<" table)
+    table))
+
+(defvar autoconf-imenu-generic-expression
+  (list (list nil autoconf-definition-regexp 3)))
+
+;; It's not clear how best to implement this.
+(defun autoconf-current-defun-function ()
+  "Function to use for `add-log-current-defun-function' in Autoconf mode.
+This version looks back for an AC_DEFINE or AC_SUBST.  It will stop
+searching backwards at another AC_... command."
+  (save-excursion
+    (with-syntax-table autoconf-mode-syntax-table
+      (modify-syntax-entry ?_ "w")
+      (if (re-search-backward autoconf-definition-regexp
+			      (save-excursion (beginning-of-defun) (point))
+			      t)
+	  (match-string-no-properties 3)))))
+
+(defun autoconf-mode ()
+  "Major mode for editing Autoconf configure.in files."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map autoconf-mode-map)
+  (setq major-mode 'autoconf-mode)
+  (setq mode-name "Autoconf")
+  (set-syntax-table autoconf-mode-syntax-table)
+  (set (make-local-variable 'parens-require-spaces) nil) ; for M4 arg lists
+  (set (make-local-variable 'defun-prompt-regexp)
+       "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
+  (set (make-local-variable 'comment-start) "dnl ")
+  (set (make-local-variable 'comment-start-skip) "\\(\\<dnl\\|#\\) +")
+  (set (make-local-variable 'font-lock-syntactic-keywords)
+       autoconf-font-lock-syntactic-keywords)
+  (set (make-local-variable 'font-lock-defaults)
+       `(autoconf-font-lock-keywords nil nil (("_" . "w"))))
+  (set (make-local-variable 'imenu-generic-expression)
+       autoconf-imenu-generic-expression)
+  (set (make-local-variable 'imenu-syntax-alist) '(("_" . "w")))
+  (set (make-local-variable 'indent-line-function) #'indent-relative)
+  (set (make-local-variable 'add-log-current-defun-function)
+	#'autoconf-current-defun-function)
+  (run-hooks 'autoconf-mode-hook))
+
+(provide 'autoconf-compat)
+
+;;; autoconf.el ends here
diff --git a/site/cedet-1.0pre7/ede/autoconf-edit.el b/site/cedet-1.0pre7/ede/autoconf-edit.el
new file mode 100755
index 0000000..aff9e7e
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/autoconf-edit.el
@@ -0,0 +1,438 @@
+;;; autoconf-edit.el --- Keymap for autoconf
+
+;;  Copyright (C) 1998, 1999, 2000, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project
+;; RCS: $Id: autoconf-edit.el,v 1.12.2.1 2010/02/21 02:35:49 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; Autoconf editing and modification support, and compatibility layer
+;; for Emacses w/out autoconf mode built in.
+
+;;; Code:
+(if (locate-library "autoconf")
+
+    (condition-case nil
+	(require 'autoconf)
+      (error (require 'autoconf-mode "autoconf")))
+
+  (require 'autoconf-compat)
+
+  ;; This part is not in autoconf.el
+  (add-to-list 'auto-mode-alist '("\\<configure\\.in$" . autoconf-mode))
+  )
+
+(defvar autoconf-new-automake-string
+  "dnl Process this file with autoconf to produce a configure script
+
+AC_INIT(%s)
+AM_INIT_AUTOMAKE([%s], 0)
+AM_CONFIG_HEADER(config.h)
+
+dnl End the configure script.
+AC_OUTPUT(Makefile, [date > stamp-h] )\n"
+  "This string is used to initialize a new configure.in.
+The default is designed to be used with automake.
+The first %s will be filled with the test file.
+The second %s will be filled with the program name.")
+
+(defun autoconf-new-program (rootdir program testfile)
+  "Initialize a new configure.in in ROOTDIR for PROGRAM using TESTFILE.
+ROOTDIR is the root directory of a given autoconf controlled project.
+PROGRAM is the program to be configured.
+TESTFILE is the file used with AC_INIT.
+configure the initial configure script using `autoconf-new-automake-string'"
+  (interactive "DRoot Dir: \nsProgram: \nsTest File: ")
+  (if (bufferp rootdir)
+      (set-buffer rootdir)
+    (let ((cf1 (expand-file-name "configure.in" rootdir))
+	  (cf2 (expand-file-name "configure.ac" rootdir)))
+      (if (and (or (file-exists-p cf1) (file-exists-p cf2))
+	       (not (y-or-n-p (format "File %s exists.  Start Over? "
+				      (if (file-exists-p cf1)
+					  cf1 cf2)
+				      ))))
+	  (error "Quit"))
+      (find-file cf2)))
+  ;; Note, we only ask about overwrite if a string/path is specified.
+  (erase-buffer)
+  (insert (format autoconf-new-automake-string testfile program)))
+
+(defvar autoconf-preferred-macro-order
+  '("AC_INIT"
+    "AM_INIT_AUTOMAKE"
+    "AM_CONFIG_HEADER"
+    ;; Arg parsing
+    "AC_ARG_ENABLE"
+    "AC_ARG_WITH"
+    ;; Programs
+    "AC_PROG_MAKE_SET"
+    "AC_PROG_AWK"
+    "AC_PROG_CC"
+    "AC_PROG_CC_C_O"
+    "AC_PROG_CPP"
+    "AC_PROG_CXX"
+    "AC_PROG_CXXCPP"
+    "AC_ISC_POSIX"
+    "AC_PROG_F77"
+    "AC_PROG_GCC_TRADITIONAL"
+    "AC_PROG_INSTALL"
+    "AC_PROG_LEX"
+    "AC_PROG_LN_S"
+    "AC_PROG_RANLIB"
+    "AC_PROG_YACC"
+    "AC_CHECK_PROG"
+    "AC_CHECK_PROGS"
+    "AC_PROG_LIBTOOL"
+    ;; Libraries
+    "AC_CHECK_LIB"
+    "AC_PATH_XTRA"
+    ;; Headers
+    "AC_HEADER_STDC"
+    "AC_HEADER_SYS_WAIT"
+    "AC_HEADER_TIME"
+    "AC_HEADERS"
+    ;; Typedefs, structures
+    "AC_TYPE_PID_T"
+    "AC_TYPE_SIGNAL"
+    "AC_TYPE_UID_T"
+    "AC_STRUCT_TM"
+    ;; Compiler characteristics
+    "AC_CHECK_SIZEOF"
+    "AC_C_CONST"
+    ;; Library functions
+    "AC_CHECK_FUNCS"
+    "AC_TRY_LINK"
+    ;; System Services
+    ;; Other
+    "AM_PATH_LISPDIR"
+    "AM_INIT_GUILE_MODULE"
+    ;; AC_OUTPUT is always last
+    "AC_OUTPUT"
+    )
+  "List of macros in the order that they prefer to occur in.
+This helps when inserting a macro which doesn't yet exist
+by positioning it near other macros which may exist.
+From the autoconf manual:
+     `AC_INIT(FILE)'
+     checks for programs
+     checks for libraries
+     checks for header files
+     checks for typedefs
+     checks for structures
+     checks for compiler characteristics
+     checks for library functions
+     checks for system services
+     `AC_OUTPUT([FILE...])'")
+
+(defvar autoconf-multiple-macros
+  '("AC_ARG_ENABLE"
+    "AC_ARG_WITH"
+    "AC_CHECK_PROGS"
+    "AC_CHECK_LIB"
+    "AC_CHECK_SIZEOF"
+    "AC_TRY_LINK"
+    )
+  "Macros which appear multiple times.")
+
+(defvar autoconf-multiple-multiple-macros
+  '("AC_HEADERS" "AC_CHECK_FUNCS")
+  "Macros which appear multiple times, and perform multiple queries.")
+
+(defun autoconf-in-macro (macro)
+  "Non-nil if point is in a macro of type MACRO."
+  (save-excursion
+    (beginning-of-line)
+    (looking-at (concat "\\(A[CM]_" macro "\\|" macro "\\)"))))
+
+(defun autoconf-find-last-macro (macro &optional ignore-bol)
+  "Move to the last occurance of MACRO in FILE, and return that point.
+The last macro is usually the one in which we would like to insert more
+items such as CHECK_HEADERS."
+  (let ((op (point)) (atbol (if ignore-bol "" "^")))
+    (goto-char (point-max))
+    (if (re-search-backward (concat atbol (regexp-quote macro) "\\s-*\\((\\|$\\)") nil t)
+	(progn
+	  (unless ignore-bol (beginning-of-line))
+	  (point))
+      (goto-char op)
+      nil)))
+
+(defun autoconf-parameter-strip (param)
+  "Strip the parameter PARAM  of whitespace and misc characters."
+  ;; force greedy match for \n.
+  (when (string-match "\\`\n*\\s-*\\[?\\s-*" param)
+    (setq param (substring param (match-end 0))))
+  (when (string-match "\\s-*\\]?\\s-*\\'" param)
+    (setq param (substring param 0  (match-beginning 0))))
+  param)
+
+;;;###autoload
+(defun autoconf-parameters-for-macro (macro &optional ignore-bol ignore-case)
+  "Retrieve the parameters to MACRO.
+Returns a list of the arguments passed into MACRO as strings."
+  (let ((case-fold-search ignore-case))
+  (save-excursion
+    (when (autoconf-find-last-macro macro ignore-bol)
+      (forward-sexp 1)
+      (mapcar
+       #'autoconf-parameter-strip
+       (when (looking-at "(")
+	 (let* ((start (+ (point) 1))
+		(end (save-excursion
+		       (forward-sexp 1)
+		       (- (point) 1)))
+		(ans (buffer-substring-no-properties start end)))
+	   (split-string ans "," t))))))))
+
+(defun autoconf-position-for-macro (macro)
+  "Position the cursor where a new MACRO could be inserted.
+This will appear at the BEGINNING of the macro MACRO should appear AFTER.
+This is to make it compatible with `autoconf-find-last-macro'.
+Assume that MACRO doesn't appear in the buffer yet, so search
+the ordering list `autoconf-preferred-macro-order'."
+  ;; Search this list backwards.. heh heh heh
+  ;; This lets us do a reverse search easilly.
+  (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
+    (if (not ml) (error "Don't know how to position for %s yet" macro))
+    (setq ml (cdr ml))
+    (goto-char (point-max))
+    (while (and ml (not (autoconf-find-last-macro (car ml))))
+      (setq ml (cdr ml)))
+    (if (not ml) (error "Could not find context for positioning %s" macro))))
+
+(defun autoconf-insert-macro-at-point (macro &optional param)
+  "Add MACRO at the current point with PARAM."
+  (insert macro)
+  (if param
+      (progn
+	(insert "(" param ")")
+	(if (< (current-column) 3) (insert " dnl")))))
+    
+(defun autoconf-insert-new-macro (macro &optional param)
+  "Add a call to MACRO in the current autoconf file.
+Deals with macro order.  See `autoconf-preferred-macro-order' and
+`autoconf-multi-macros'.
+Optional argument PARAM is the parameter to pass to the macro as one string."
+  (cond ((member macro autoconf-multiple-macros)
+	 ;; This occurs multiple times
+	 (or (autoconf-find-last-macro macro)
+	     (autoconf-position-for-macro macro))
+	 (forward-sexp 2)
+	 (end-of-line)
+	 (insert "\n")
+	 (autoconf-insert-macro-at-point macro param))
+	((member macro autoconf-multiple-multiple-macros)
+	 (if (not param)
+	     (error "You must have a paramter for %s" macro))
+	 (if (not (autoconf-find-last-macro macro))
+	     (progn
+	       ;; Doesn't exist yet....
+	       (autoconf-position-for-macro macro)
+	       (forward-sexp 2)
+	       (end-of-line)
+	       (insert "\n")
+	       (autoconf-insert-macro-at-point macro param))
+	   ;; Does exist, can we fit onto the current line?
+	   (forward-sexp 2)
+	   (down-list -1)
+	   (if (> (+ (current-column) (length param))  fill-column)
+	       (insert " " param)
+	     (up-list 1)
+	     (end-of-line)
+	     (insert "\n")
+	     (autoconf-insert-macro-at-point macro param))))
+	((autoconf-find-last-macro macro)
+	 ;; If it isn't one of the multi's, it's a singleton.
+	 ;; If it exists, ignore it.
+	 nil)
+	(t
+	 (autoconf-position-for-macro macro)
+	 (forward-sexp 1)
+	 (if (looking-at "\\s-*(")
+	     (forward-sexp 1))
+	 (end-of-line)
+	 (insert "\n")
+	 (autoconf-insert-macro-at-point macro param))))
+
+(defun autoconf-find-query-for-header (header)
+  "Position the cursor where HEADER is queried."
+  (interactive "sHeader: ")
+  (let ((op (point))
+	(found t))
+    (goto-char (point-min))
+    (condition-case nil
+	(while (not
+		(progn
+		  (re-search-forward
+		   (concat "\\b" (regexp-quote header) "\\b"))
+		  (save-excursion
+		    (beginning-of-line)
+		    (looking-at "AC_CHECK_HEADERS")))))
+      ;; We depend on the search failing to exit our loop on failure.
+      (error (setq found nil)))
+    (if (not found) (goto-char op))
+    found))
+
+(defun autoconf-add-query-for-header (header)
+  "Add in HEADER to be queried for in our autoconf file."
+  (interactive "sHeader: ")
+  (or (autoconf-find-query-for-header header)
+      (autoconf-insert-new-macro "AC_CHECK_HEADERS" header)))
+
+
+(defun autoconf-find-query-for-func (func)
+  "Position the cursor where FUNC is queried."
+  (interactive "sFunction: ")
+  (let ((op (point))
+	(found t))
+    (goto-char (point-min))
+    (condition-case nil
+	(while (not
+		(progn
+		  (re-search-forward
+		   (concat "\\b" (regexp-quote func) "\\b"))
+		  (save-excursion
+		    (beginning-of-line)
+		    (looking-at "AC_CHECK_FUNCS")))))
+      ;; We depend on the search failing to exit our loop on failure.
+      (error (setq found nil)))
+    (if (not found) (goto-char op))
+    found))
+
+(defun autoconf-add-query-for-func (func)
+  "Add in FUNC to be queried for in our autoconf file."
+  (interactive "sFunction: ")
+  (or (autoconf-find-query-for-func func)
+      (autoconf-insert-new-macro "AC_CHECK_FUNCS" func)))
+
+(defvar autoconf-program-builtin
+  '(("AWK" . "AC_PROG_AWK")
+    ("CC" . "AC_PROG_CC")
+    ("CPP" . "AC_PROG_CPP")
+    ("CXX" . "AC_PROG_CXX")
+    ("CXXCPP" . "AC_PROG_CXXCPP")
+    ("F77" . "AC_PROG_F77")
+    ("GCC_TRADITIONAL" . "AC_PROG_GCC_TRADITIONAL")
+    ("INSTALL" . "AC_PROG_INSTALL")
+    ("LEX" . "AC_PROG_LEX")
+    ("LN_S" . "AC_PROG_LN_S")
+    ("RANLIB" . "AC_PROG_RANLIB")
+    ("YACC" . "AC_PROG_YACC")
+    )
+  "Association list of PROGRAM variables and their built-in MACRO.")
+
+(defun autoconf-find-query-for-program (prog)
+  "Position the cursor where PROG is queried.
+PROG is the VARIABLE to use in autoconf to identify the program.
+PROG excludes the _PROG suffix.  Thus if PROG were EMACS, then the
+variable in configure.in would be EMACS_PROG."
+  (let ((op (point))
+	(found t)
+	(builtin (assoc prog autoconf-program-builtin)))
+    (goto-char (point-min))
+    (condition-case nil
+	(re-search-forward
+	 (concat "^"
+		 (or (cdr-safe builtin)
+		     (concat "AC_CHECK_PROG\\s-*(\\s-*" prog "_PROG"))
+		 "\\>"))
+      (error (setq found nil)))
+    (if (not found) (goto-char op))
+    found))
+
+(defun autoconf-add-query-for-program (prog &optional names)
+  "Add in PROG to be queried for in our autoconf file.
+Optional NAMES is for non-built-in programs, and is the list
+of possible names."
+  (interactive "sProgram: ")
+  (if (autoconf-find-query-for-program prog)
+      nil
+    (let ((builtin (assoc prog autoconf-program-builtin)))
+      (if builtin
+	  (autoconf-insert-new-macro (cdr builtin))
+	;; Not built in, try the params item
+	(autoconf-insert-new-macro "AC_CHECK_PROGS" (concat prog "," names))
+	))))
+
+;;; Scrappy little changes
+;;
+(defvar autoconf-deleted-text nil
+  "Set to the last bit of text deleted during an edit.")
+
+(defvar autoconf-inserted-text nil
+  "Set to the last bit of text inserted during an edit.")
+
+(defmacro autoconf-edit-cycle (&rest body)
+  "Start an edit cycle, unsetting the modified flag if there is no change.
+Optional argument BODY is the code to execute which edits the autoconf file."
+  `(let ((autoconf-deleted-text nil)
+	 (autoconf-inserted-text nil)
+	 (mod (buffer-modified-p)))
+     ,@body
+     (if (and (not mod)
+	      (string= autoconf-deleted-text autoconf-inserted-text))
+	 (set-buffer-modified-p nil))))
+
+(defun autoconf-delete-parameter (index)
+  "Delete the INDEXth parameter from the macro starting on the current line.
+Leaves the cursor where a new parameter can be inserted.
+INDEX starts at 1."
+  (beginning-of-line)
+  (down-list 1)
+  (re-search-forward ", ?" nil nil (1- index))
+  (let ((end (save-excursion
+	       (re-search-forward ",\\|)" (save-excursion
+					    (end-of-line)
+					    (point)))
+	       (forward-char -1)
+	       (point))))
+    (setq autoconf-deleted-text (buffer-substring (point) end))
+    (delete-region (point) end)))
+
+(defun autoconf-insert (text)
+  "Insert TEXT."
+  (setq autoconf-inserted-text text)
+  (insert text))
+
+(defun autoconf-set-version (version)
+  "Set the version used with automake to VERSION."
+  (if (not (stringp version))
+      (signal 'wrong-type-argument '(stringp version)))
+  (if (not (autoconf-find-last-macro "AM_INIT_AUTOMAKE"))
+      (error "Cannot update version")
+    ;; Move to correct position.
+    (autoconf-edit-cycle
+     (autoconf-delete-parameter 2)
+     (autoconf-insert version))))
+
+(defun autoconf-set-output (outputlist)
+  "Set the files created in AC_OUTPUT to OUTPUTLIST.
+OUTPUTLIST is a list of strings representing relative paths
+to Makefiles, or other files using Autoconf substitution."
+  (if (not (autoconf-find-last-macro "AC_OUTPUT"))
+      (error "Cannot update version")
+    (autoconf-edit-cycle
+     (autoconf-delete-parameter 1)
+     (autoconf-insert (mapconcat (lambda (a) a) outputlist " ")))))
+
+(provide 'autoconf-edit)
+
+;;; autoconf-edit.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-auto.el b/site/cedet-1.0pre7/ede/ede-auto.el
new file mode 100644
index 0000000..308d820
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-auto.el
@@ -0,0 +1,128 @@
+;;; ede-auto.el --- Autoload features for EDE.
+;;
+;; Copyright (C) 2010 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-auto.el,v 1.2 2010/02/08 22:27:39 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; EDE Autoloads are a way to refer to different project types without
+;; loading those projects into Emacs.
+;;
+;; These routines are used to detect a project in a filesystem before
+;; handing over control to the usual EDE project system.
+
+;;; Code:
+;;;###autoload
+(defclass ede-project-autoload ()
+  ((name :initarg :name
+	 :documentation "Name of this project type")
+   (file :initarg :file
+	 :documentation "The lisp file belonging to this class.")
+   (proj-file :initarg :proj-file
+	      :documentation "Name of a project file of this type.")
+   (proj-root :initarg :proj-root
+	      :type function
+	      :documentation "A function symbol to call for the project root.
+This function takes no arguments, and returns the current directories
+root, if available.  Leave blank to use the EDE directory walking
+routine instead.")
+   (initializers :initarg :initializers
+		 :initform nil
+		 :documentation
+		 "Initializers passed to the project object.
+These are used so there can be multiple types of projects
+associated with a single object class, based on the initilizeres used.")
+   (load-type :initarg :load-type
+	      :documentation "Fn symbol used to load this project file.")
+   (class-sym :initarg :class-sym
+	      :documentation "Symbol representing the project class to use.")
+   (new-p :initarg :new-p
+	  :initform t
+	  :documentation
+	  "Non-nil if this is an option when a user creates a project.")
+   )
+  "Class representing minimal knowledge set to run preliminary EDE functions.
+When more advanced functionality is needed from a project type, that projects
+type is required and the load function used.")
+
+(defvar ede-project-class-files
+  (list
+   (ede-project-autoload "edeproject-makefile"
+			 :name "Make" :file 'ede-proj
+			 :proj-file "Project.ede"
+			 :load-type 'ede-proj-load
+			 :class-sym 'ede-proj-project)
+   (ede-project-autoload "edeproject-automake"
+			 :name "Automake" :file 'ede-proj
+			 :proj-file "Project.ede"
+			 :initializers '(:makefile-type Makefile.am)
+			 :load-type 'ede-proj-load
+			 :class-sym 'ede-proj-project)
+   (ede-project-autoload "automake"
+			 :name "automake" :file 'project-am
+			 :proj-file "Makefile.am"
+			 :load-type 'project-am-load
+			 :class-sym 'project-am-makefile
+			 :new-p nil)
+   )
+  "List of vectos defining how to determine what type of projects exist.")
+
+;;; EDE project-autoload methods
+;;
+(defmethod ede-project-root ((this ede-project-autoload))
+  "If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems."
+  nil)
+
+(defmethod ede-project-root-directory ((this ede-project-autoload)
+				       &optional file)
+  "If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems.
+Optional FILE is the file to test.  If there is no FILE, use
+the current buffer."
+  (when (not file)
+    (setq file default-directory))
+  (when (slot-boundp this :proj-root)
+    (let ((rootfcn (oref this proj-root)))
+      (when rootfcn
+	(condition-case nil
+	    (funcall rootfcn file)
+	  (error 
+	   (funcall rootfcn)))
+	))))
+
+(defmethod ede-dir-to-projectfile ((this ede-project-autoload) dir)
+  "Return a full file name of project THIS found in DIR.
+Return nil if the project file does not exist."
+  (let* ((d (file-name-as-directory dir))
+	 (root (ede-project-root-directory this d))
+	 (pf (oref this proj-file))
+	 (f (cond ((stringp pf)
+		   (expand-file-name pf (or root d)))
+		  ((and (symbolp pf) (fboundp pf))
+		   (funcall pf (or root d)))))
+	 )
+    (when (and f (file-exists-p f))
+      f)))
+
+
+(provide 'ede-auto)
+
+;;; ede-auto.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-base.el b/site/cedet-1.0pre7/ede/ede-base.el
new file mode 100644
index 0000000..9277558
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-base.el
@@ -0,0 +1,617 @@
+;;; ede-base.el --- Baseclasses for EDE.
+;;
+;; Copyright (C) 2010 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-base.el,v 1.2 2010/02/08 23:46:03 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Baseclasses for EDE.
+;;
+;; Contains all the base structures needed by EDE.
+
+;;; Code:
+(require 'eieio)
+(eval-when-compile
+  (require 'data-debug))
+
+;;; TARGET
+;;
+;; The TARGET is an entity in a project that knows about files
+;; and features of those files.
+
+;;;###autoload
+(defclass ede-target (eieio-speedbar-directory-button)
+  ((buttonface :initform speedbar-file-face) ;override for superclass
+   (name :initarg :name
+	 :type string
+	 :custom string
+	 :label "Name"
+	 :group (default name)
+	 :documentation "Name of this target.")
+   ;; @todo - I think this should be "dir", and not "path".
+   (path :initarg :path
+	 :type string
+	 ;:custom string
+	 ;:label "Path to target"
+	 ;:group (default name)
+	 :documentation "The path to the sources of this target.
+Relative to the path of the project it belongs to.")
+   (source :initarg :source
+	   :initform nil
+	   ;; I'd prefer a list of strings.
+	   :type list
+	   :custom (repeat (string :tag "File"))
+	   :label "Source Files"
+	   :group (default source)
+	   :documentation "Source files in this target.")
+   (versionsource :initarg :versionsource
+		  :initform nil
+		  :type list
+		  :custom (repeat (string :tag "File"))
+		  :label "Source Files with Version String"
+		  :group (source)
+		  :documentation
+		  "Source files with a version string in them.
+These files are checked for a version string whenever the EDE version
+of the master project is changed.  When strings are found, the version
+previously there is updated.")
+   ;; Class level slots
+   ;;
+   (sourcetype :allocation :class
+	       :type list ;; list of symbols
+	       :documentation
+	       "A list of `ede-sourcecode' objects this class will handle.
+This is used to match target objects with the compilers they can use, and
+which files this object is interested in."
+	       :accessor ede-object-sourcecode)
+   (keybindings :allocation :class
+		:initform (("D" . ede-debug-target))
+		:documentation 
+"Keybindings specialized to this type of target."
+		:accessor ede-object-keybindings)
+   (menu :allocation :class
+	 :initform ( [ "Debug target" ede-debug-target
+		       (and ede-object
+			    (obj-of-class-p ede-object ede-target)) ]
+		     [ "Run target" ede-run-target
+		       (and ede-object
+			    (obj-of-class-p ede-object ede-target)) ]
+		     )
+	 :documentation "Menu specialized to this type of target."
+	 :accessor ede-object-menu)
+   )
+  "A target is a structure that describes a file set that produces something.
+Targets, as with 'Make', is an entity that will manage a file set 
+and knows how to compile or otherwise transform those files into some
+other desired outcome.")
+
+;;; PROJECT/PLACEHOLDER
+;;
+;; Project placeholders are minimum parts of a project used
+;; by the project cache.  The project cache can refer to these placeholders,
+;; and swap them out with the real-deal when that project is loaded.
+;;
+(defclass ede-project-placeholder (eieio-speedbar-directory-button)
+  ((name :initarg :name
+	 :initform "Untitled"
+	 :type string
+	 :custom string
+	 :label "Name"
+	 :group (default name)
+	 :documentation "The name used when generating distribution files.")
+   (version :initarg :version
+	    :initform "1.0"
+	    :type string
+	    :custom string
+	    :label "Version"
+	    :group (default name)
+	    :documentation "The version number used when distributing files.")
+   (directory :type string
+	      :initarg :directory
+	      :documentation "Directory this project is associated with.")
+   (dirinode :documentation "The inode id for :directory.")
+   (file :type string
+	 :initarg :file
+	 :documentation "File name where this project is stored.")
+   (rootproject ; :initarg - no initarg, don't save this slot!
+    :initform nil
+    :type (or null ede-project-placeholder-child)
+    :documentation "Pointer to our root project.")
+   )
+  "Placeholder object for projects not loaded into memory.
+Projects placeholders will be stored in a user specific location
+and querying them will cause the actual project to get loaded.")
+
+;;; PROJECT
+;;
+;; An EDE project controls a set of TARGETS, and can also contain
+;; multiple SUBPROJECTS.
+;;
+;; The project defines a set of features that need to be built from
+;; files, in addition as to controlling what to do with the file set,
+;; such as creating distributions, compilation, and web sites.
+;;
+;; Projects can also affect how EDE works, by changing what appears in
+;; the EDE menu, or how some keys are bound.
+;;
+;;;###autoload
+(defclass ede-project (ede-project-placeholder)
+  ((subproj :initform nil
+	    :type list
+	    :documentation "Sub projects controlled by this project.
+For Automake based projects, each directory is treated as a project.")
+   (targets :initarg :targets
+	    :type list
+	    :custom (repeat (object :objectcreatefcn ede-new-target-custom))
+	    :label "Local Targets"
+	    :group (targets)
+	    :documentation "List of top level targets in this project.")
+   (locate-obj :type (or null ede-locate-base-child)
+	       :documentation
+	       "A locate object to use as a backup to `ede-expand-filename'.")
+   (tool-cache :initarg :tool-cache
+	       :type list
+	       :custom (repeat object)
+	       :label "Tool: "
+	       :group tools
+	       :documentation "List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.")
+   (mailinglist :initarg :mailinglist
+		:initform ""
+		:type string
+		:custom string
+		:label "Mailing List Address"
+		:group name
+		:documentation
+		"An email address where users might send email for help.")
+   (web-site-url :initarg :web-site-url
+		 :initform ""
+		 :type string
+		 :custom string
+		 :label "Web Site URL"
+		 :group name
+		 :documentation "URL to this projects web site.
+This is a URL to be sent to a web site for documentation.")
+   (web-site-directory :initarg :web-site-directory
+		       :initform ""
+		       :custom string
+		       :label "Web Page Directory"
+		       :group name
+		       :documentation
+		       "A directory where web pages can be found by Emacs.
+For remote locations use a path compatible with ange-ftp or EFS.
+You can also use TRAMP for use with rcp & scp.")
+   (web-site-file :initarg :web-site-file
+		  :initform ""
+		  :custom string
+		  :label "Web Page File"
+		  :group name
+		  :documentation
+		  "A file which contains the home page for this project.
+This file can be relative to slot `web-site-directory'.
+This can be a local file, use ange-ftp, EFS, or TRAMP.")
+   (ftp-site :initarg :ftp-site
+	     :initform ""
+	     :type string
+	     :custom string
+	     :label "FTP site"
+	     :group name
+	     :documentation
+	     "FTP site where this project's distribution can be found.
+This FTP site should be in Emacs form, as needed by `ange-ftp', but can
+also be of a form used by TRAMP for use with scp, or rcp.")
+   (ftp-upload-site :initarg :ftp-upload-site
+		    :initform ""
+		    :type string
+		    :custom string
+		    :label "FTP Upload site"
+		    :group name
+		    :documentation
+		    "FTP Site to upload new distributions to.
+This FTP site should be in Emacs form as needed by `ange-ftp'.
+If this slot is nil, then use `ftp-site' instead.")
+   (configurations :initarg :configurations
+		   :initform ("debug" "release")
+		   :type list
+		   :custom (repeat string)
+		   :label "Configuration Options"
+		   :group (settings)
+		   :documentation "List of available configuration types.
+Individual target/project types can form associations between a configuration,
+and target specific elements such as build variables.")
+   (configuration-default :initarg :configuration-default
+			  :initform "debug"
+			  :custom string
+			  :label "Current Configuration"
+			  :group (settings)
+			  :documentation "The default configuration.")
+   (local-variables :initarg :local-variables
+		    :initform nil
+		    :custom (repeat (cons (sexp :tag "Variable")
+					  (sexp :tag "Value")))
+		    :label "Project Local Variables"
+		    :group (settings)
+		    :documentation "Project local variables")
+   (keybindings :allocation :class
+		:initform (("D" . ede-debug-target)
+			   ("R" . ede-run-target))
+		:documentation "Keybindings specialized to this type of target."
+		:accessor ede-object-keybindings)
+   (menu :allocation :class
+	 :initform
+	 (
+	  [ "Update Version" ede-update-version ede-object ]
+	  [ "Version Control Status" ede-vc-project-directory ede-object ]
+	  [ "Edit Project Homepage" ede-edit-web-page
+	    (and ede-object (oref (ede-toplevel) web-site-file)) ]
+	  [ "Browse Project URL" ede-web-browse-home
+	    (and ede-object
+		 (not (string= "" (oref (ede-toplevel) web-site-url)))) ]
+	  "--"
+	  [ "Rescan Project Files" ede-rescan-toplevel t ]
+	  [ "Edit Projectfile" ede-edit-file-target
+	    (and ede-object
+		 (or (listp ede-object)
+		     (not (obj-of-class-p ede-object ede-project)))) ]
+	  )
+	 :documentation "Menu specialized to this type of target."
+	 :accessor ede-object-menu)
+   )
+  "Top level EDE project specification.
+All specific project types must derive from this project."
+  :method-invocation-order :depth-first)
+
+;;; Important macros for doing commands.
+;;
+(defmacro ede-with-projectfile (obj &rest forms)
+  "For the project in which OBJ resides, execute FORMS."
+  (list 'save-window-excursion
+	(list 'let* (list
+		     (list 'pf
+			   (list 'if (list 'obj-of-class-p
+					   obj 'ede-target)
+				 ;; @todo -I think I can change
+				 ;; this to not need ede-load-project-file
+				 ;; but I'm not sure how to test well.
+				 (list 'ede-load-project-file
+				       (list 'oref obj 'path))
+				 obj))
+		     '(dbka (get-file-buffer (oref pf file))))
+	      '(if (not dbka) (find-file (oref pf file))
+		 (switch-to-buffer dbka))
+	      (cons 'progn forms)
+	      '(if (not dbka) (kill-buffer (current-buffer))))))
+(put 'ede-with-projectfile 'lisp-indent-function 1)
+
+;;; The EDE persistent cache.
+;;
+;; The cache is a way to mark where all known projects live without
+;; loading those projects into memory, or scanning for them each time
+;; emacs starts.
+;; 
+(defcustom ede-project-placeholder-cache-file
+  (expand-file-name "~/.projects.ede")
+  "*File containing the list of projects EDE has viewed."
+  :group 'ede
+  :type 'file)
+
+(defvar ede-project-cache-files nil
+  "List of project files EDE has seen before.")
+
+(defun ede-save-cache ()
+  "Save a cache of EDE objects that Emacs has seen before."
+  (interactive)
+  (let ((p ede-projects)
+	(c ede-project-cache-files)
+	(recentf-exclude '( (lambda (f) t) ))
+	)
+    (condition-case nil
+	(progn
+	  (set-buffer (find-file-noselect ede-project-placeholder-cache-file t))
+	  (erase-buffer)
+	  (insert ";; EDE project cache file.
+;; This contains a list of projects you have visited.\n(")
+	  (while p
+	    (when (and (car p) (ede-project-p p))
+	      (let ((f (oref (car p) file)))
+		(when (file-exists-p f)
+		  (insert "\n  \"" f "\""))))
+	    (setq p (cdr p)))
+	  (while c
+	    (insert "\n \"" (car c) "\"")
+	    (setq c (cdr c)))
+	  (insert "\n)\n")
+	  (condition-case nil
+	      (save-buffer 0)
+	    (error
+	     (message "File %s could not be saved."
+		      ede-project-placeholder-cache-file)))
+	  (kill-buffer (current-buffer))
+	  )
+      (error
+       (message "File %s could not be read."
+	       	ede-project-placeholder-cache-file))
+
+      )))
+
+(defun ede-load-cache ()
+  "Load the cache of EDE projects."
+  (save-excursion
+    (let ((cachebuffer nil))
+      (condition-case nil
+	  (progn
+	    (setq cachebuffer
+		  (find-file-noselect ede-project-placeholder-cache-file t))
+	    (set-buffer cachebuffer)
+	    (goto-char (point-min))
+	    (let ((c (read (current-buffer)))
+		  (new nil)
+		  (p ede-projects))
+	      ;; Remove loaded projects from the cache.
+	      (while p
+		(setq c (delete (oref (car p) file) c))
+		(setq p (cdr p)))
+	      ;; Remove projects that aren't on the filesystem
+	      ;; anymore.
+	      (while c
+		(when (file-exists-p (car c))
+		  (setq new (cons (car c) new)))
+		(setq c (cdr c)))
+	      ;; Save it
+	      (setq ede-project-cache-files (nreverse new))))
+	(error nil))
+      (when cachebuffer (kill-buffer cachebuffer))
+      )))
+
+;;; Get the cache usable.
+
+;; @TODO - Remove this cache setup, or use this for something helpful.
+;;(add-hook 'kill-emacs-hook 'ede-save-cache)
+;;(when (not noninteractive)
+;;  ;; No need to load the EDE cache if we aren't interactive.
+;;  ;; This occurs during batch byte-compiling of other tools.
+;;  (ede-load-cache))
+
+
+;;; METHODS
+;;
+;; The methods in ede-base handle project related behavior, and DO NOT
+;; related to EDE mode commands directory, such as keybindings.
+;;
+;; Mode related methods are in ede.el.  These methods are related
+;; project specific activities not directly tied to a keybinding.
+(defmethod ede-subproject-relative-path ((proj ede-project) &optional parent-in)
+  "Get a path name for PROJ which is relative to the parent project.
+If PARENT is specified, then be relative to the PARENT project.
+Specifying PARENT is useful for sub-sub projects relative to the root project."
+  (let* ((parent (or parent-in (ede-parent-project proj)))
+	 (dir (file-name-directory (oref proj file))))
+    (if (and parent (not (eq parent proj)))
+	(file-relative-name dir (file-name-directory (oref parent file)))
+      "")))
+
+(defmethod ede-subproject-p ((proj ede-project))
+  "Return non-nil if PROJ is a sub project."
+  ;; @TODO - Use this in more places, and also pay attention to
+  ;; metasubproject in ede-proj.el
+  (ede-parent-project proj))
+
+
+;;; Default descriptive methods for EDE classes
+;;
+;; These are methods which you might want to override, but there is
+;; no need to in most situations because they are either a) simple, or
+;; b) cosmetic.
+
+;;;###autoload
+(defmethod ede-name ((this ede-target))
+  "Return the name of THIS targt."
+  (oref this name))
+
+(defmethod ede-target-name ((this ede-target))
+  "Return the name of THIS target, suitable for make or debug style commands."
+  (oref this name))
+
+(defmethod ede-name ((this ede-project))
+  "Return a short-name for THIS project file.
+Do this by extracting the lowest directory name."
+  (oref this name))
+
+;;;###autoload
+(defmethod ede-description ((this ede-project))
+  "Return a description suitable for the minibuffer about THIS."
+  (format "Project %s: %d subprojects, %d targets."
+	  (ede-name this) (length (oref this subproj))
+	  (length (oref this targets))))
+
+(defmethod ede-description ((this ede-target))
+  "Return a description suitable for the minibuffer about THIS."
+  (format "Target %s: with %d source files."
+	  (ede-name this) (length (oref this source))))
+
+;;; HEADERS/DOC
+;;
+;; Targets and projects are often associated with other files, such as
+;; header files, documentation files and the like.  Have strong
+;; associations can make useful user commands to quickly navigate
+;; between the files base on their assocaitions.
+;;
+(defun ede-header-file ()
+  "Return the header file for the current buffer.
+Not all buffers need headers, so return nil if no applicable."
+  (if ede-object
+      (ede-buffer-header-file ede-object (current-buffer))
+    nil))
+
+(defmethod ede-buffer-header-file ((this ede-project) buffer)
+  "Return nil, projects don't have header files."
+  nil)
+
+(defmethod ede-buffer-header-file ((this ede-target) buffer)
+  "There are no default header files in EDE.
+Do a quick check to see if there is a Header tag in this buffer."
+  (save-excursion
+    (set-buffer buffer)
+    (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
+	(buffer-substring-no-properties (match-beginning 1)
+					(match-end 1))
+      (let ((src (ede-target-sourcecode this))
+	    (found nil))
+	(while (and src (not found))
+	  (setq found (ede-buffer-header-file (car src) (buffer-file-name))
+		src (cdr src)))
+	found))))
+
+;;;###autoload
+(defun ede-documentation-files ()
+  "Return the documentation files for the current buffer.
+Not all buffers need documentations, so return nil if no applicable.
+Some projects may have multiple documentation files, so return a list."
+  (if ede-object
+      (ede-buffer-documentation-files ede-object (current-buffer))
+    nil))
+
+(defmethod ede-buffer-documentation-files ((this ede-project) buffer)
+  "Return all documentation in project THIS based on BUFFER."
+  ;; Find the info node.
+  (ede-documentation this))
+
+(defmethod ede-buffer-documentation-files ((this ede-target) buffer)
+  "Check for some documentation files for THIS.
+Also do a quick check to see if there is a Documentation tag in this BUFFER."
+  (save-excursion
+    (set-buffer buffer)
+    (if (re-search-forward "::Documentation:: \\([a-zA-Z0-9.]+\\)" nil t)
+	(buffer-substring-no-properties (match-beginning 1)
+					(match-end 1))
+      ;; Check the master project
+      (let ((cp (ede-toplevel)))
+	(ede-buffer-documentation-files cp (current-buffer))))))
+
+(defmethod ede-documentation ((this ede-project))
+  "Return a list of files that provides documentation.
+Documentation is not for object THIS, but is provided by THIS for other
+files in the project."
+  (let ((targ (oref this targets))
+	(proj (oref this subproj))
+	(found nil))
+    (while targ
+      (setq found (append (ede-documentation (car targ)) found)
+	    targ (cdr targ)))
+    (while proj
+      (setq found (append (ede-documentation (car proj)) found)
+	    proj (cdr proj)))
+    found))
+
+(defmethod ede-documentation ((this ede-target))
+  "Return a list of files that provides documentation.
+Documentation is not for object THIS, but is provided by THIS for other
+files in the project."
+  nil)
+
+(defun ede-html-documentation-files ()
+  "Return a list of HTML documentation files associated with this project."
+  (ede-html-documentation (ede-toplevel))
+  )
+
+(defmethod ede-html-documentation ((this ede-project))
+  "Return a list of HTML files provided by project THIS."
+  
+  )
+
+;;; Default "WANT" methods.
+;;
+;; These methods are used to determine if a target "wants", or could
+;; somehow handle a file, or some source type.
+;;
+(defmethod ede-want-file-p ((this ede-target) file)
+  "Return non-nil if THIS target wants FILE."
+  ;; By default, all targets reference the source object, and let it decide.
+  (let ((src (ede-target-sourcecode this)))
+    (while (and src (not (ede-want-file-p (car src) file)))
+      (setq src (cdr src)))
+    src))
+
+(defmethod ede-want-file-source-p ((this ede-target) file)
+  "Return non-nil if THIS target wants FILE."
+  ;; By default, all targets reference the source object, and let it decide.
+  (let ((src (ede-target-sourcecode this)))
+    (while (and src (not (ede-want-file-source-p (car src) file)))
+      (setq src (cdr src)))
+    src))
+
+(defmethod ede-target-sourcecode ((this ede-target))
+  "Return the sourcecode objects which THIS permits."
+  (let ((sc (oref this sourcetype))
+	(rs nil))
+    (while (and (listp sc) sc)
+      (setq rs (cons (symbol-value (car sc)) rs)
+	    sc (cdr sc)))
+    rs))
+
+
+;;; Debugging.
+;;
+;;;###autoload
+(defun ede-adebug-project ()
+  "Run adebug against the current ede project.
+Display the results as a debug list."
+  (interactive)
+  (require 'data-debug)
+  (when (ede-current-project)
+    (data-debug-new-buffer "*Analyzer ADEBUG*")
+    (data-debug-insert-object-slots (ede-current-project) "")
+    ))
+
+;;;###autoload
+(defun ede-adebug-project-parent ()
+  "Run adebug against the current ede parent project.
+Display the results as a debug list."
+  (interactive)
+  (require 'data-debug)
+  (when (ede-parent-project)
+    (data-debug-new-buffer "*Analyzer ADEBUG*")
+    (data-debug-insert-object-slots (ede-parent-project) "")
+    ))
+
+;;;###autoload
+(defun ede-adebug-project-root ()
+  "Run adebug against the current ede parent project.
+Display the results as a debug list."
+  (interactive)
+  (require 'data-debug)
+  (when (ede-toplevel)
+    (data-debug-new-buffer "*Analyzer ADEBUG*")
+    (data-debug-insert-object-slots (ede-toplevel) "")
+    ))
+
+
+;;; Hooks & Autoloads
+;;
+;;  These let us watch various activities, and respond apropriatly.
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec ede-with-projectfile
+	      (form def-body))))
+
+(provide 'ede-base)
+
+;;; ede-base.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-compilers.texi b/site/cedet-1.0pre7/ede/ede-compilers.texi
new file mode 100644
index 0000000..4cbd537
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-compilers.texi
@@ -0,0 +1,522 @@
+@c -*-texinfo-*-
+@c
+@c $Id: ede-compilers.texi,v 1.4 2010/01/07 02:12:20 zappo Exp $
+@c
+
+@c The next line is for the back-search to see what node this one
+@c resides in.
+
+@c @node Compilers,
+@c @chapter Compilers
+
+@c This command is a convenience to help rebuild this file.  Use C-x C-e
+@c on the expression below to rebuild the entire index (but only
+@c after loading in all relevant source files.)
+
+@c (eieiodoc-class ede-compilation-program "cm")
+@menu
+* ede-compilation-program ::
+*  ede-compiler ::
+*   ede-object-compiler ::
+*   semantic-ede-grammar-compiler-class ::
+*  ede-linker ::
+@end menu
+
+
+@node ede-compilation-program, ede-compiler,  , Compilers
+@comment  node-name,  next,  previous,  up
+@section ede-compilation-program
+@cmindex ede-compilation-program
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item ede-compilation-program
+@table @asis
+@item Children:
+@w{@xref{ede-compiler},} @w{@xref{ede-linker}.} 
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-compilation-program
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+Name of this type of compiler.
+@refill
+
+@item :variables
+Type: @code{list}
+
+Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
+@refill
+
+@item :sourcetype
+Type: @code{list}
+
+A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in.
+@refill
+
+@item :rules
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Auxiliary rules needed for this compiler to run.
+For example, yacc/lex files need additional chain rules, or inferences.
+@refill
+
+@item :commands
+Type: @code{list}
+
+The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.
+@refill
+
+@item :autoconf
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Autoconf function to call if this type of compiler is used.
+When a project is in Automake mode, this defines the autoconf function to
+call to initialize automake to use this compiler.
+For example, there may be multiple C compilers, but they all probably
+use the same autoconf form.
+@refill
+
+@item :objectextention
+Type: @code{string}
+
+A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-flush-autoconf :AFTER this 
+Flush the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed for @var{THIS} compiler object.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this 
+Insert variables needed by the compiler @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-commands :AFTER this 
+Insert the commands needed to use compiler @var{THIS}.
+The object creating makefile rules must call this method for the
+compiler it decides to use after inserting in the rule.
+@end deffn
+
+@deffn Method ede-object-sourcecode :AFTER this 
+Retrieves the slot @code{sourcetype} from an object of class @code{ede-compilation-program}
+@end deffn
+
+@deffn Method ede-proj-tweak-autoconf :AFTER this 
+Tweak the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+
+@node ede-compiler, ede-object-compiler, ede-compilation-program, Compilers
+@comment  node-name,  next,  previous,  up
+@section ede-compiler
+@cmindex ede-compiler
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item @w{@xref{ede-compilation-program}.}
+@table @code
+@item ede-compiler
+@table @asis
+@item Children:
+@w{@xref{ede-object-compiler},} @w{@xref{semantic-ede-grammar-compiler-class}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-compiler
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+Name of this type of compiler.
+@refill
+
+@item :variables
+Type: @code{list}
+
+Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
+@refill
+
+@item :sourcetype
+Type: @code{list}
+
+A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in.
+@refill
+
+@item :commands
+Type: @code{list}
+
+The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.
+@refill
+
+@item :objectextention
+Type: @code{string}
+
+A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.
+@refill
+
+@item :makedepends
+Type: @code{boolean} @*
+Default Value: @code{nil}
+
+Non-@code{nil} if this compiler can make dependencies.
+@refill
+
+@item :uselinker
+Type: @code{boolean} @*
+Default Value: @code{nil}
+
+Non-@code{nil} if this compiler creates code that can be linked.
+This requires that the containing target also define a list of available
+linkers that can be used.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-insert-object-variables :AFTER this targetname sourcefiles 
+Insert an OBJ variable to specify object code to be generated for @var{THIS}.
+The name of the target is @var{TARGETNAME} as a string.  @var{SOURCEFILES} is the list of
+files to be objectified.
+Not all compilers do this.
+@end deffn
+
+@deffn Method ede-compiler-intermediate-objects-p :AFTER this 
+Return non-@code{nil} if @var{THIS} has intermediate object files.
+If this compiler creates code that can be linked together,
+then the object files created by the compiler are considered intermediate.
+@end deffn
+
+@deffn Method ede-compiler-intermediate-object-variable :AFTER this targetname 
+Return a string based on @var{THIS} representing a make object variable.
+@var{TARGETNAME} is the name of the target that these objects belong to.
+@end deffn
+
+
+@node ede-object-compiler, semantic-ede-grammar-compiler-class, ede-compiler, Compilers
+@comment  node-name,  next,  previous,  up
+@section ede-object-compiler
+@cmindex ede-object-compiler
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item @w{@xref{ede-compilation-program}.}
+@table @code
+@item @w{@xref{ede-compiler}.}
+@table @code
+@item ede-object-compiler
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-object-compiler
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+Name of this type of compiler.
+@refill
+
+@item :variables
+Type: @code{list}
+
+Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
+@refill
+
+@item :sourcetype
+Type: @code{list}
+
+A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in.
+@refill
+
+@item :commands
+Type: @code{list}
+
+The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.
+@refill
+
+@item :objectextention
+Type: @code{string}
+
+A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.
+@refill
+
+@item :uselinker
+Type: @code{boolean} @*
+Default Value: @code{t}
+
+@xref{ede-compiler}.
+@item :dependencyvar
+Type: @code{list}
+
+A variable dedicated to dependency generation.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this 
+Insert variables needed by the compiler @var{THIS}.
+@end deffn
+
+
+@node semantic-ede-grammar-compiler-class, ede-linker, ede-object-compiler, Compilers
+@comment  node-name,  next,  previous,  up
+@section semantic-ede-grammar-compiler-class
+@cmindex semantic-ede-grammar-compiler-class
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item @w{@xref{ede-compilation-program}.}
+@table @code
+@item @w{@xref{ede-compiler}.}
+@table @code
+@item semantic-ede-grammar-compiler-class
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type semantic-ede-grammar-compiler-class
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+Name of this type of compiler.
+@refill
+
+@item :variables
+Type: @code{list}
+
+Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
+@refill
+
+@item :sourcetype
+Type: @code{list}
+
+A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in.
+@refill
+
+@item :commands
+Type: @code{list}
+
+The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.
+@refill
+
+@item :objectextention
+Type: @code{string}
+
+A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.
+@refill
+
+@end table
+
+@end table
+
+@node ede-linker,  , semantic-ede-grammar-compiler-class, Compilers
+@comment  node-name,  next,  previous,  up
+@section ede-linker
+@cmindex ede-linker
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item @w{@xref{ede-compilation-program}.}
+@table @code
+@item ede-linker
+No children
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-linker
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+Name of this type of compiler.
+@refill
+
+@item :variables
+Type: @code{list}
+
+Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
+@refill
+
+@item :sourcetype
+Type: @code{list}
+
+A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in.
+@refill
+
+@item :commands
+Type: @code{list}
+
+The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.
+@refill
+
+@item :objectextention
+Type: @code{string}
+
+A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.
+@refill
+
+@end table
+
+@end table
+
diff --git a/site/cedet-1.0pre7/ede/ede-cpp-root.el b/site/cedet-1.0pre7/ede/ede-cpp-root.el
new file mode 100644
index 0000000..c6bcfab
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-cpp-root.el
@@ -0,0 +1,518 @@
+;;; ede-cpp-root.el --- A simple way to wrap a C++ project with a single root
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-cpp-root.el,v 1.21 2009/09/30 23:49:52 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version $?GPL$, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; NOTE: ede-cpp-root.el has been commented so as to also make it
+;;       useful for learning how to make similar project types.
+;;
+;; Not everyone can use automake, or an EDE project type.  For
+;; pre-existing code, it is often helpful jut to be able to wrap the
+;; whole thing up in as simple a way as possible.
+;;
+;; The cpp-root project type will allow you to create a single object
+;; with no save-file in your .emacs file that will be recognized, and
+;; provide a way to easilly allow EDE to provide Semantic with the
+;; ability to find header files, and other various source files
+;; quickly.
+;;
+;; The cpp-root class knows a few things about C++ projects, such as
+;; the prevalence of "include" directories, and typical file-layout
+;; stuff.  If this isn't sufficient, you can subclass
+;; `ede-cpp-root-project' and add your own tweaks in just a few lines.
+;; See the end of this file for an example.
+;;
+;;; EXAMPLE
+;; 
+;; Add this to your .emacs file, modifying apropriate bits as needed.
+;;
+;; (ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
+;;
+;; Replace SOMENAME with whatever name you want, and the filename to
+;; an actual file at the root of your project.  It might be a
+;; Makefile, a README file.  Whatever.  It doesn't matter.  It's just
+;; a key to hang the rest of EDE off of.
+;;
+;; The most likely reason to create this project, is to help make
+;; finding files within the project faster.  In conjunction with
+;; Semantic completion, having a short include path is key.  You can
+;; override the include path like this:
+;;
+;; (ede-cpp-root-project "NAME" :file "FILENAME"
+;;     :include-path '( "/include" "../include" "/c/include" )
+;;     :system-include-path '( "/usr/include/c++/3.2.2/" )
+;;     :spp-table '( ("MOOSE" . "")
+;;                   ("CONST" . "const") )
+;;     :spp-files '( "include/config.h" )
+;;     ) 
+;;
+;;  In this case each item in the include path list is searched.  If
+;;  the directory starts with "/", then that expands to the project
+;;  root directory.  If a directory does not start with "/", then it
+;;  is relative to the default-directory of the current buffer when
+;;  the file name is expanded.
+;;
+;;  The include path only affects C/C++ header files.  Use the slot
+;;  :header-match-regexp to change it.
+;;
+;;  The :system-include-path allows you to specify full directory
+;;  names to include directories where system header files can be
+;;  found.  These will be applied to files in this project only.
+;;
+;;  The :spp-table provides a list of project specific #define style
+;;  macros that are unique to this project, passed in to the compiler
+;;  on the command line, or are in special headers.
+;;
+;;  The :spp-files option is like :spp-table, except you can provide a
+;;  file name for a header in your project where most of your CPP
+;;  macros reside.  Doing this can be easier than listing everything in
+;;  the :spp-table option.  The files listed in :spp-files should not
+;;  start with a /, and are relative to something in :include-path.;;  
+;;
+;; If you want to override the file-finding tool with your own
+;; function you can do this:
+;;
+;; (ede-cpp-root-project "NAME" :file "FILENAME" :locate-fcn 'MYFCN)
+;;
+;; Where FILENAME is a file in the root directory of the project.
+;; Where MYFCN is a symbol for a function.  See:
+;;
+;; M-x describe-class RET ede-cpp-root-project RET
+;;
+;; for documentation about the locate-fcn extension.
+;;
+;;; ADVANCED EXAMPLE
+;;
+;; If the cpp-root project style is right for you, but you want a
+;; dynamic loader, instead of hard-coding values in your .emacs, you
+;; can do that too, but you will need to write some lisp code.
+;;
+;; To do that, you need to add an entry to the
+;; `ede-project-class-files' list, and also provide two functions to
+;; teach EDE how to load your project pattern
+;;
+;; It would oook like this:
+;;
+;; (defun MY-FILE-FOR-DIR (&optional dir)
+;;   "Return a full file name to the project file stored in DIR."
+;;   <write your code here, or return nil>
+;;   )
+;;
+;; (defun MY-ROOT-FCN ()
+;;   "Return the root directory for `default-directory'"
+;;   ;; You might be able to use `ede-cpp-root-project-root'.
+;;   )
+;; 
+;; (defun MY-LOAD (dir)
+;;   "Load a project of type `cpp-root' for the directory DIR.
+;; Return nil if there isn't one."
+;;   (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
+;;                                :locate-fcn 'MYFCN)
+;;   )
+;;
+;; (add-to-list 'ede-project-class-files
+;; 	     (ede-project-autoload "cpp-root"
+;; 	      :name "CPP ROOT"
+;; 	      :file 'ede-cpp-root
+;; 	      :proj-file 'MY-FILE-FOR-DIR
+;;            :proj-root 'MY-ROOT-FCN
+;; 	      :load-type 'MY-LOAD
+;; 	      :class-sym 'ede-cpp-root)
+;; 	     t)
+;; 
+;;; TODO
+;;
+;; Need a way to reconfigure a project, and have it affect all open buffers.
+;; From Tobias Gerdin:
+;;   
+;;   >>3) Is there any way to refresh a ede-cpp-root-project dynamically? I have
+;;   >>some file open part of the project, fiddle with the include paths and would
+;;   >>like the open buffer to notice this when I re-evaluate the
+;;   >>ede-cpp-root-project constructor.
+;;   >
+;;   > Another good idea.  The easy way is to "revert-buffer" as needed.  The
+;;   > ede "project local variables" does this already, so it should be easy
+;;   > to adapt something.
+;;   
+;;   I actually tried reverting the buffer but Semantic did not seem to pick
+;;   up the differences (the "include summary" reported the same include paths).
+
+(require 'ede)
+
+;;; Code:
+
+;;; PROJECT CACHE:
+;;
+;; cpp-root projects are created in a .emacs or other config file, but
+;; there still needs to be a way for a particular file to be
+;; identified against it.  The cache is where we look to map a file
+;; against a project.
+;;
+;; Setting up a simple in-memory cache of active projects allows the
+;; user to re-load their configuration file several times without
+;; messing up the active project set.
+;;
+(defvar ede-cpp-root-project-list nil
+  "List of projects created by option `ede-cpp-root-project'.")
+
+(defun ede-cpp-root-file-existing (dir)
+  "Find a cpp-root project in the list of cpp-root projects.
+DIR is the directory to search from."
+  (let ((projs ede-cpp-root-project-list)
+	(ans nil))
+    (while (and projs (not ans))
+      (let ((root (ede-project-root-directory (car projs))))
+	(when (string-match (concat "^" (regexp-quote root)) dir)
+	  (setq ans (car projs))))
+      (setq projs (cdr projs)))
+    ans))
+
+;;; PROJECT AUTOLOAD CONFIG
+;;
+;; Each project type registers itself into the project-class list.
+;; This way, each time a file is loaded, EDE can map that file to a
+;; project.  This project type checks files against the internal cache
+;; of projects created by the user.
+;;
+;; EDE asks two kinds of questions.  One is, does this DIR belong to a
+;; project.  If it does, it then asks, what is the ROOT directory to
+;; the project in DIR.  This is easy for cpp-root projects, but more
+;; complex for multiply nested projects.
+;;
+;; If EDE finds out that a project exists for DIR, it then loads that
+;; project.  The LOAD routine can either create a new project object
+;; (if it needs to load it off disk) or more likely can return an
+;; existing object for the discovered directory.  cpp-root always uses
+;; the second case.
+
+;;;###autoload
+(defun ede-cpp-root-project-file-for-dir (&optional dir)
+  "Return a full file name to the project file stored in DIR."
+  (let ((proj (ede-cpp-root-file-existing dir)))
+    (when proj (oref proj :file))))
+
+(defvar ede-cpp-root-count 0
+  "Count number of hits to the cpp root thing.
+This is a debugging variable to test various optimizations in file
+lookup in the main EDE logic.")
+
+;;;###autoload
+(defun ede-cpp-root-project-root (&optional dir)
+  "Get the root directory for DIR."
+  (let ((projfile (ede-cpp-root-project-file-for-dir
+		   (or dir default-directory))))
+    (setq ede-cpp-root-count (1+ ede-cpp-root-count))
+    ;(debug)
+    (when projfile
+      (file-name-directory projfile))))
+
+;;;###autoload
+(defun ede-cpp-root-load (dir &optional rootproj)
+  "Return a CPP root object if you created one.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project."
+  ;; Snoop through our master list.
+  (ede-cpp-root-file-existing dir))
+
+;;;###autoload
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "cpp-root"
+	      :name "CPP ROOT"
+	      :file 'ede-cpp-root
+	      :proj-file 'ede-cpp-root-project-file-for-dir
+	      :proj-root 'ede-cpp-root-project-root
+	      :load-type 'ede-cpp-root-load
+	      :class-sym 'ede-cpp-root
+	      :new-p nil)
+	     t)
+
+;;; CLASSES
+;;
+;; EDE sets up projects with two kinds of objects.
+;;
+;; The PROJECT is a class that represents everything under a directory
+;; hierarchy.  A TARGET represents a subset of files within a project.
+;; A project can have multiple targets, and multiple sub-projects.
+;; Sub projects should map to sub-directories.
+;;
+;; The CPP-ROOT project maps any file in C or C++ mode to a target for
+;; C files.
+;;
+;; When creating a custom project the project developer an opportunity
+;; to run code to setup various tools whenever an associated buffer is
+;; loaded.  The CPP-ROOT project spends most of its time setting up C
+;; level include paths, and PreProcessor macro tables.
+
+(defclass ede-cpp-root-target (ede-target)
+  ()
+  "EDE cpp-root project target.
+All directories need at least one target.")
+
+;;;###autoload
+(defclass ede-cpp-root-project (ede-project eieio-instance-tracker)
+  ((tracking-symbol :initform 'ede-cpp-root-project-list)
+   (include-path :initarg :include-path
+		 :initform '( "/include" "../include/" )
+		 :type list
+		 :documentation
+		 "The default locate function expands filenames within a project.
+If a header file (.h, .hh, etc) name is expanded, and
+the :locate-fcn slot is nil, then the include path is checked
+first, and other directories are ignored.  For very large
+projects, this optimization can save a lot of time.
+
+Directory names in the path can be relative to the current
+buffer's `default-directory' (not starting with a /).  Directories
+that are relative to the project's root should start with a /, such
+as  \"/include\", meaning the directory `include' off the project root
+directory.")
+   (system-include-path :initarg :system-include-path
+			:initform nil
+			:type list
+			:documentation
+			"The system include path for files in this project.
+C files initialized in an ede-cpp-root-project have their semantic
+system include path set to this value.  If this is nil, then the
+semantic path is not modified.")
+   (spp-table :initarg :spp-table
+	      :initform nil
+	      :type list
+	      :documentation
+	      "C Preprocessor macros for your files.
+Preprocessor symbols will be used while parsing your files.
+These macros might be passed in through the command line compiler, or
+are critical symbols derived from header files.  Providing header files
+macro values through this slot improves accuracy and performance.
+Use `:spp-files' to use these files directly.")
+   (spp-files :initarg :spp-files
+	      :initform nil
+	      :type list
+	      :documentation
+	      "C header file with Preprocessor macros for your files.
+The PreProcessor symbols appearing in these files will be used while
+parsing files in this project.
+See `semantic-lex-c-preprocessor-symbol-map' for more on how this works.")
+   (header-match-regexp :initarg :header-match-regexp
+			:initform
+			"\\.\\(h\\(h\\|xx\\|pp\\|\\+\\+\\)?\\|H\\)$\\|\\<\\w+$"
+			:type string
+			:documentation
+			"Regexp used to identify C/C++ header files.")
+   (locate-fcn :initarg :locate-fcn
+	       :initform nil
+	       :type (or null function)
+	       :documentation
+	       "The locate function can be used in place of
+`ede-expand-filename' so you can quickly customize your custom target
+to use specialized local routines instead of the EDE routines.
+The function symbol must take two arguments:
+  NAME - The name of the file to find.
+  DIR - The directory root for this cpp-root project.
+
+It should return the fully qualified file name passed in from NAME.  If that file does not
+exist, it should return nil."
+	       )
+   )
+  "EDE cpp-root project class.
+Each directory needs a a project file to control it.")
+
+;;; INIT
+;;
+;; Most projects use `initialize-instance' to do special setup
+;; on the object when it is created.  In this case, EDE-CPP-ROOT can
+;; find previous copies of this project, and make sure that one of the
+;; objects is deleted.
+
+(defmethod initialize-instance ((this ede-cpp-root-project)
+				&rest fields)
+  "Make sure the :file is fully expanded."
+  ;; Add ourselves to the master list
+  (call-next-method)
+  (let ((f (expand-file-name (oref this :file))))
+    ;; Remove any previous entries from the main list.
+    (let ((old (eieio-instance-tracker-find (file-name-directory f)
+					    :directory 'ede-cpp-root-project-list)))
+      ;; This is safe, because :directory isn't filled in till later.
+      (when (and old (not (eq old this)))
+	(delete-instance old)))
+    ;; Basic initialization.
+    (when (or (not (file-exists-p f))
+	      (file-directory-p f))
+      (delete-instance this)
+      (error ":file for ede-cpp-root must be a file."))
+    (oset this :file f)
+    (oset this :directory (file-name-directory f))
+    (ede-project-directory-remove-hash (file-name-directory f))
+    (ede-add-project-to-global-list this)
+    (unless (slot-boundp this 'targets)
+      (oset this :targets nil))
+    ;; We need to add ourselves to the master list.
+    ;;(setq ede-projects (cons this ede-projects))
+    ))
+
+;;; SUBPROJ Management.
+;;
+;; This is a way to allow a subdirectory to point back to the root
+;; project, simplifying authoring new single-point projects.
+
+(defmethod ede-find-subproject-for-directory ((proj ede-cpp-root-project)
+					      dir)
+  "Return PROJ, for handling all subdirs below DIR."
+  proj)
+
+;;; TARGET MANAGEMENT
+;;
+;; Creating new targets on a per directory basis is a good way to keep
+;; files organized.  See ede-emacs for an example with multiple file
+;; types.
+(defmethod ede-find-target ((proj ede-cpp-root-project) buffer)
+  "Find an EDE target in PROJ for BUFFER.
+If one doesn't exist, create a new one for this directory."
+  (let* ((targets (oref proj targets))
+	 (dir default-directory)
+	 (ans (object-assoc dir :path targets))
+	 )
+    (when (not ans)
+      (setq ans (ede-cpp-root-target dir
+                 :name (file-name-nondirectory
+			(directory-file-name dir))
+		 :path dir
+		 :source nil))
+      (object-add-to-list proj :targets ans)
+      )
+    ans))
+
+;;; FILE NAMES
+;;
+;; One of the more important jobs of EDE is to find files in a
+;; directory structure.  cpp-root has tricks it knows about how most C
+;; projects are set up with include paths.
+;;
+;; This tools also uses the ede-locate setup for augmented file name
+;; lookup using external tools.
+(defmethod ede-expand-filename-impl ((proj ede-cpp-root-project) name)
+  "Within this project PROJ, find the file NAME.
+This knows details about or source tree."
+  ;; The slow part of the original is looping over subprojects.
+  ;; This version has no subprojects, so this will handle some
+  ;; basic cases.
+  (let ((ans (call-next-method)))
+    (unless ans
+      (let* ((lf (oref proj locate-fcn))
+	     (dir (file-name-directory (oref proj file))))
+	(if lf
+	    (setq ans (funcall lf name dir))
+	  (if (ede-cpp-root-header-file-p proj name)
+	      ;; Else, use our little hack.
+	      (let ((ip (oref proj include-path))
+		    (tmp nil))
+		(while ip
+		  ;; Translate
+		  (setq tmp (ede-cpp-root-translate-file proj (car ip)))
+		  ;; Test this name.
+		  (setq tmp (expand-file-name name tmp))
+		  (if (file-exists-p tmp)
+		      (setq ans tmp))
+		  (setq ip (cdr ip)) ))
+	    ;; Else, do the usual.
+	    (setq ans (call-next-method)))
+	  )))
+    (or ans (call-next-method))))
+
+(defmethod ede-project-root ((this ede-cpp-root-project))
+  "Return my root."
+  this)
+
+(defmethod ede-project-root-directory ((this ede-cpp-root-project))
+  "Return my root."
+  (file-name-directory (oref this file)))
+
+;;; C/CPP SPECIFIC CODE
+;;
+;; The following code is specific to setting up header files,
+;; include lists, and Preprocessor symbol tables.
+
+(defmethod ede-cpp-root-header-file-p ((proj ede-cpp-root-project) name)
+  "Non nil if in PROJ the filename NAME is a header."
+  (save-match-data
+    (string-match (oref proj header-match-regexp) name)))
+
+(defmethod ede-cpp-root-translate-file ((proj ede-cpp-root-project) filename)
+  "For PROJ, translate a user specified FILENAME.
+This is for project include paths and spp source files."
+  ;; Step one: Root of this project.
+  (let ((dir (file-name-directory (oref proj file))))
+
+    ;; Step two: Analyze first char, and rehost
+    (if (and (not (string= filename "")) (= (aref filename 0) ?/))
+	;; Check relative to root of project
+	(setq filename (expand-file-name (substring filename 1)
+					 dir))
+      ;; Relative to current directory.
+      (setq filename (expand-file-name filename)))
+
+    filename))
+
+(defmethod ede-set-project-variables ((project ede-cpp-root-project) &optional buffer)
+  "Set variables local to PROJECT in BUFFER.
+Also set up the lexical preprocessor map."
+  (call-next-method)
+  (when (and (featurep 'semantic-c) (featurep 'semantic-lex-spp))
+    (setq semantic-lex-spp-project-macro-symbol-obarray
+	  (semantic-lex-make-spp-table (oref project spp-table)))
+    ))
+
+(defmethod ede-system-include-path ((this ede-cpp-root-project))
+  "Get the system include path used by project THIS."
+  (oref this system-include-path))
+  
+(defmethod ede-preprocessor-map ((this ede-cpp-root-project))
+  "Get the pre-processor map for project THIS."
+  (let ((spp (oref this spp-table))
+	(root (ede-project-root this))
+	)
+    (mapc
+     (lambda (F)
+       (let* ((expfile (ede-expand-filename root F))
+	      (table (when expfile
+		       (semanticdb-file-table-object expfile)))
+	      )
+	 (when (not table)
+	   (message "Cannot find file %s in project." F))
+	 (when (and table (semanticdb-needs-refresh-p table))
+	   (semanticdb-refresh-table table)
+	   (setq spp (append spp (oref table lexical-table))))))
+     (oref this spp-files))
+    spp))
+
+(defmethod ede-system-include-path ((this ede-cpp-root-target))
+  "Get the system include path used by project THIS."
+  (ede-system-include-path (ede-target-parent this)))
+  
+(defmethod ede-preprocessor-map ((this ede-cpp-root-target))
+  "Get the pre-processor map for project THIS."
+  (ede-preprocessor-map  (ede-target-parent this)))
+
+
+(provide 'ede-cpp-root)
+;;; ede-cpp-root.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-custom.el b/site/cedet-1.0pre7/ede/ede-custom.el
new file mode 100644
index 0000000..3fa780a
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-custom.el
@@ -0,0 +1,207 @@
+;;; ede-custom.el --- customization of EDE projects.
+;;
+;; Copyright (C) 2010 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-custom.el,v 1.1 2010/02/08 21:58:27 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Customization commands/hooks for EDE.
+;;
+;; EIEIO supports customizing objects, and EDE uses this to allow
+;; users to change basic settings in their projects.
+;;
+
+;;; Code:
+;;; Customization
+;;
+;; Routines for customizing projects and targets.
+
+(require 'ede)
+(eval-when-compile (require 'eieio-custom))
+
+(defvar eieio-ede-old-variables nil
+  "The old variables for a project.")
+
+;;; Customization Commands
+;;
+;; These commands initialize custoization of EDE control objects.
+
+;;;###autoload
+(defun ede-customize-project (&optional group)
+  "Edit fields of the current project through EIEIO & Custom.
+Optional GROUP specifies the subgroup of slots to customize."
+  (interactive "P")
+  (require 'eieio-custom)
+  (let* ((ov (oref (ede-current-project) local-variables))
+	 (cp (ede-current-project))
+	 (group (if group (eieio-read-customization-group cp))))
+    (eieio-customize-object cp group)
+    (make-local-variable 'eieio-ede-old-variables)
+    (setq eieio-ede-old-variables ov)))
+;;;###autoload
+(defalias 'customize-project 'ede-customize-project)
+
+;;;###autoload
+(defun ede-customize-current-target(&optional group)
+  "Edit fields of the current target through EIEIO & Custom.
+Optional argument OBJ is the target object to customize.
+Optional argument GROUP is the slot group to display."
+  (interactive "P")
+  (require 'eieio-custom)
+  (if (not (obj-of-class-p ede-object ede-target))
+      (error "Current file is not part of a target."))
+  (let ((group (if group (eieio-read-customization-group ede-object))))
+    (ede-customize-target ede-object group)))
+;;;###autoload
+(defalias 'customize-target 'ede-customize-current-target)
+
+;;;###autoload
+(defun ede-customize-target (obj group)
+  "Edit fields of the current target through EIEIO & Custom.
+Optional argument OBJ is the target object to customize.
+Optional argument GROUP is the slot group to display."
+  (require 'eieio-custom)
+  (if (and obj (not (obj-of-class-p obj ede-target)))
+      (error "No logical target to customize"))
+  (eieio-customize-object obj (or group 'default)))
+
+;;; Target Sorting
+;;
+;; Target order can be important, but custom doesn't support a way
+;; to resort items in a list.  This function by David Engster allows
+;; targets to be re-arranged.
+
+(defvar ede-project-sort-targets-order nil
+  "Variable for tracking target order in `ede-project-sort-targets'.")
+
+;;;###autoload
+(defun ede-project-sort-targets ()
+  "Create a custom-like buffer for sorting targets of current project."
+  (interactive)
+  (let ((proj (ede-current-project))
+        (count 1)
+        current order)
+    (switch-to-buffer (get-buffer-create "*EDE sort targets*"))
+    (erase-buffer)
+    (setq ede-object-project proj)
+    (widget-create 'push-button
+                   :notify (lambda (&rest ignore)
+                             (let ((targets (oref ede-object-project targets))
+                                   cur newtargets)
+                               (while (setq cur (pop ede-project-sort-targets-order))
+                                 (setq newtargets (append newtargets
+                                                          (list (nth cur targets)))))
+                               (oset ede-object-project targets newtargets))
+                             (ede-commit-project ede-object-project)
+                             (kill-buffer))
+                   " Accept ")
+    (widget-insert "   ")
+    (widget-create 'push-button
+                   :notify (lambda (&rest ignore)
+			     (kill-buffer))
+                   " Cancel ")
+    (widget-insert "\n\n")
+    (setq ede-project-sort-targets-order nil)
+    (mapc (lambda (x)
+            (add-to-ordered-list
+             'ede-project-sort-targets-order
+             x x))
+          (number-sequence 0 (1- (length (oref proj targets)))))
+    (ede-project-sort-targets-list)
+    (use-local-map widget-keymap)
+    (widget-setup)
+    (goto-char (point-min))))
+
+(defun ede-project-sort-targets-list ()
+  "Sort the target list while using `ede-project-sort-targets'."
+  (save-excursion
+    (let ((count 0)
+          (targets (oref ede-object-project targets))
+          (inhibit-read-only t)
+          (inhibit-modification-hooks t))
+      (goto-char (point-min))
+      (forward-line 2)
+      (delete-region (point) (point-max))
+      (while (< count (length targets))
+        (if (> count 0)
+            (widget-create 'push-button
+                           :notify `(lambda (&rest ignore)
+                                      (let ((cur ede-project-sort-targets-order))
+                                        (add-to-ordered-list
+                                         'ede-project-sort-targets-order
+                                         (nth ,count cur)
+                                         (1- ,count))
+                                        (add-to-ordered-list
+                                         'ede-project-sort-targets-order
+                                         (nth (1- ,count) cur) ,count))
+                                      (ede-project-sort-targets-list))
+                           " Up ")
+          (widget-insert "      "))
+        (if (< count (1- (length targets)))
+            (widget-create 'push-button
+                           :notify `(lambda (&rest ignore)
+                                      (let ((cur ede-project-sort-targets-order))
+                                        (add-to-ordered-list
+                                         'ede-project-sort-targets-order
+                                         (nth ,count cur) (1+ ,count))
+                                        (add-to-ordered-list
+                                         'ede-project-sort-targets-order
+                                         (nth (1+ ,count) cur) ,count))
+                                      (ede-project-sort-targets-list))
+                           " Down ")
+          (widget-insert "        "))
+        (widget-insert (concat " " (number-to-string (1+ count)) ".:   "
+                               (oref (nth (nth count ede-project-sort-targets-order)
+                                          targets) name) "\n"))
+        (setq count (1+ count))))))
+
+;;; Customization hooks
+;;
+;; These hooks are used when finishing up a customization.
+(defmethod eieio-done-customizing ((proj ede-project))
+  "Call this when a user finishes customizing PROJ."
+  (let ((ov eieio-ede-old-variables)
+	(nv (oref proj local-variables)))
+    (setq eieio-ede-old-variables nil)
+    (while ov
+      (if (not (assoc (car (car ov)) nv))
+	  (save-excursion
+	    (mapc (lambda (b)
+		    (set-buffer b)
+		    (kill-local-variable (car (car ov))))
+		  (ede-project-buffers proj))))
+      (setq ov (cdr ov)))
+    (mapc (lambda (b) (ede-set-project-variables proj b))
+	  (ede-project-buffers proj))))
+
+;; These two methods should be implemented by subclasses of
+;; project and targets in order to account for user specified
+;; changes.
+(defmethod eieio-done-customizing ((target ede-target))
+  "Call this when a user finishes customizing TARGET."
+  nil)
+
+(defmethod ede-commit-project ((proj ede-project))
+  "Commit any change to PROJ to its file."
+  nil
+  )
+
+(provide 'ede-custom)
+;;; ede-custom.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-dired.el b/site/cedet-1.0pre7/ede/ede-dired.el
new file mode 100755
index 0000000..fc235ae
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-dired.el
@@ -0,0 +1,110 @@
+;;; ede-dired.el --- EDE extensions to dired.
+
+;;;  Copyright (C) 1998, 1999, 2000, 2003, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 0.4
+;; Keywords: project, make
+;; RCS: $Id: ede-dired.el,v 1.11 2010/01/07 02:12:49 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; This provides a dired interface to dired, allowing users to modify
+;; their project file by adding files (or whatever) directly from a
+;; dired buffer.
+
+(require 'easymenu)
+(require 'dired)
+(require 'ede)
+
+;;; Code:
+(defvar ede-dired-minor-mode nil
+  "Non-nil when in ede dired minor mode.")
+(make-variable-buffer-local 'ede-dired-minor-mode)
+
+(defvar ede-dired-keymap nil
+  "Keymap used for ede dired minor mode.")
+
+(if ede-dired-keymap
+    nil
+  (setq ede-dired-keymap (make-sparse-keymap))
+  (define-key ede-dired-keymap ".a" 'ede-dired-add-to-target)
+  (define-key ede-dired-keymap ".t" 'ede-new-target)
+  (define-key ede-dired-keymap ".s" 'ede-speedbar)
+  (define-key ede-dired-keymap ".C" 'ede-compile-project)
+  (define-key ede-dired-keymap ".d" 'ede-make-dist)
+  
+  (easy-menu-define
+   ede-dired-menu ede-dired-keymap "EDE Dired Minor Mode Menu"
+   '("Project"
+     [ "Add files to target" ede-dired-add-to-target (ede-current-project) ]
+     ( "Build" :filter ede-build-forms-menu)
+     "-"
+     [ "Create Project" ede-new (not (ede-current-project)) ]
+     [ "Create Target" ede-new-target (ede-current-project) ]
+     "-"
+     ( "Customize Project" :filter ede-customize-forms-menu )
+     [ "View Project Tree" ede-speedbar (ede-current-project) ]
+     ))
+  )
+
+(defun ede-dired-minor-mode (&optional arg)
+  "A minor mode that should only be activated in DIRED buffers.
+If ARG is nil, toggle, if it is a positive number, force on, if
+negative, force off."
+  (interactive "P")
+  (if (not (or (eq major-mode 'dired-mode)
+	       (eq major-mode 'vc-dired-mode)))
+      (error "Not in DIRED mode"))
+  (setq ede-dired-minor-mode
+	(not (or (and (null arg) ede-dired-minor-mode)
+		 (<= (prefix-numeric-value arg) 0))))
+  (if (and (not (ede-directory-project-p default-directory))
+	   (not (interactive-p)))
+      (setq ede-dired-minor-mode nil))
+  )
+
+(defun ede-dired-add-to-target (target)
+  "Add a file, or all marked files into a TARGET."
+  (interactive (list
+		(let ((ede-object (ede-current-project)))
+		  (ede-invoke-method 'project-interactive-select-target
+				     "Add files to Target: "))))
+  (let ((files (dired-get-marked-files t)))
+    (while files
+      (project-add-file target (car files))
+      ;; Find the buffer for this files, and set its ede-object
+      (if (get-file-buffer (car files))
+	  (save-excursion
+	    (set-buffer (get-file-buffer (car files)))
+	    (setq ede-object nil)
+	    (setq ede-object (ede-buffer-object (current-buffer)))))
+      ;; Increment.
+      (setq files (cdr files)))))
+
+;; Minor mode management.
+(add-to-list 'minor-mode-alist '(ede-dired-minor-mode " EDE"))
+(let ((a (assoc 'ede-dired-minor-mode minor-mode-map-alist)))
+  (if a
+      (setcdr a ede-dired-keymap)
+    (add-to-list 'minor-mode-map-alist (cons 'ede-dired-minor-mode
+					     ede-dired-keymap))))
+
+(provide 'ede-dired)
+
+;;; ede-dired.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-emacs.el b/site/cedet-1.0pre7/ede/ede-emacs.el
new file mode 100644
index 0000000..f081223
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-emacs.el
@@ -0,0 +1,297 @@
+;;; ede-emacs.el --- Special project for Emacs
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-emacs.el,v 1.10 2009/11/22 13:31:40 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide a special project type just for Emacs, cause Emacs is special.
+;;
+;; Identifies an Emacs project automatically.
+;; Speedy ede-expand-filename based on extension.
+;; Pre-populates the preprocessor map from lisp.h
+;;
+;; ToDo :
+;; * Add "build" options.
+;; * Add texinfo lookup options.
+;; * Add website
+
+(require 'ede)
+
+;;; Code:
+(defvar ede-emacs-project-list nil
+  "List of projects created by option `ede-emacs-project'.")
+
+(defun ede-emacs-file-existing (dir)
+  "Find a Emacs project in the list of Emacs projects.
+DIR is the directory to search from."
+  (let ((projs ede-emacs-project-list)
+	(ans nil))
+    (while (and projs (not ans))
+      (let ((root (ede-project-root-directory (car projs))))
+	(when (string-match (concat "^" (regexp-quote root))
+			    (file-name-as-directory dir))
+	  (setq ans (car projs))))
+      (setq projs (cdr projs)))
+    ans))
+
+;;;###autoload
+(defun ede-emacs-project-root (&optional dir)
+  "Get the root directory for DIR."
+  (when (not dir) (setq dir default-directory))
+  (let ((case-fold-search t)
+	(proj (ede-emacs-file-existing dir)))
+    (if proj
+	(ede-up-directory (file-name-directory
+			   (oref proj :file)))
+      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; an Emacs project here.
+      (when (string-match "emacs[^/]*" dir)
+	(let ((base (substring dir 0 (match-end 0))))
+	  (when (file-exists-p (expand-file-name "src/emacs.c" base))
+	      base))))))
+
+(defun ede-emacs-version (dir)
+  "Find the Emacs version for the Emacs src in DIR.
+Return a tuple of ( EMACSNAME . VERSION )."
+  (let ((buff (get-buffer-create " *emacs-query*"))
+	(emacs "Emacs")
+	(ver ""))
+    (save-excursion
+      (set-buffer buff)
+      (erase-buffer)
+      (setq default-directory (file-name-as-directory dir))
+      ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
+      (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" "configure.in")
+      (goto-char (point-min))
+      ;(re-search-forward "version=\\([0-9.]+\\)")
+      (cond
+       ;; Maybe XEmacs?
+       ((file-exists-p "version.sh")
+	(setq emacs "XEmacs")
+	(insert-file-contents "version.sh")
+	(goto-char (point-min))
+	(re-search-forward "emacs_major_version=\\([0-9]+\\)
+emacs_minor_version=\\([0-9]+\\)
+emacs_beta_version=\\([0-9]+\\)")
+	(setq ver (concat (match-string 1) "."
+			  (match-string 2) "."
+			  (match-string 3)))
+	)
+       ;; Insert other Emacs here...
+
+       ;; Vaguely recent version of GNU Emacs?
+       (t
+	(insert-file-contents "configure.in")
+	(goto-char (point-min))
+	(re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)")
+	(setq ver (match-string 1))
+	)
+       )
+      ;; Return a tuple
+      (cons emacs ver))))
+
+;;;###autoload
+(defun ede-emacs-load (dir &optional rootproj)
+  "Return an Emacs Project object if there is a match.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project."
+  (or (ede-emacs-file-existing dir)
+      ;; Doesn't already exist, so lets make one.
+      (let* ((vertuple (ede-emacs-version dir)))
+	(ede-emacs-project (car vertuple)
+			   :name (car vertuple)
+			   :version (cdr vertuple)
+			   :directory (file-name-as-directory dir)
+			   :file (expand-file-name "src/emacs.c"
+						   dir)))
+      (ede-add-project-to-global-list this)
+      )
+  )
+
+;;;###autoload
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "emacs"
+	      :name "EMACS ROOT"
+	      :file 'ede-emacs
+	      :proj-file "src/emacs.c"
+	      :proj-root 'ede-emacs-project-root
+	      :load-type 'ede-emacs-load
+	      :class-sym 'ede-emacs-project
+	      :new-p nil)
+	     t)
+
+(defclass ede-emacs-target-c (ede-target)
+  ()
+  "EDE Emacs Project target for C code.
+All directories need at least one target.")
+
+(defclass ede-emacs-target-el (ede-target)
+  ()
+  "EDE Emacs Project target for Emacs Lisp code.
+All directories need at least one target.")
+
+(defclass ede-emacs-target-misc (ede-target)
+  ()
+  "EDE Emacs Project target for Misc files.
+All directories need at least one target.")
+
+;;;###autoload
+(defclass ede-emacs-project (ede-project eieio-instance-tracker)
+  ((tracking-symbol :initform 'ede-emacs-project-list)
+   )
+  "Project Type for the Emacs source code."
+  :method-invocation-order :depth-first)
+
+(defmethod initialize-instance ((this ede-emacs-project)
+				&rest fields)
+  "Make sure the :file is fully expanded."
+  (call-next-method)
+  (unless (slot-boundp this 'targets)
+    (oset this :targets nil)))
+
+;;; File Stuff
+;;
+(defmethod ede-project-root-directory ((this ede-emacs-project)
+				       &optional file)
+  "Return the root for THIS Emacs project with file."
+  (ede-up-directory (file-name-directory (oref this file))))
+
+(defmethod ede-project-root ((this ede-emacs-project))
+  "Return my root."
+  this)
+
+(defmethod ede-find-subproject-for-directory ((proj ede-emacs-project)
+					      dir)
+  "Return PROJ, for handling all subdirs below DIR."
+  proj)
+
+;;; TARGET MANAGEMENT
+;;
+(defun ede-emacs-find-matching-target (class dir targets)
+  "Find a target that is a CLASS and is in DIR in the list of TARGETS."
+  (let ((match nil))
+    (dolist (T targets)
+      (when (and (object-of-class-p T class)
+		 (string= (oref T :path) dir))
+	(setq match T)
+      ))
+    match))
+
+(defmethod ede-find-target ((proj ede-emacs-project) buffer)
+  "Find an EDE target in PROJ for BUFFER.
+If one doesn't exist, create a new one for this directory."
+  (let* ((ext (file-name-extension (buffer-file-name buffer)))
+	 (cls (cond ((not ext)
+		     'ede-emacs-target-misc)
+		    ((string-match "c\\|h" ext)
+		     'ede-emacs-target-c)
+		    ((string-match "elc?" ext)
+		     'ede-emacs-target-el)
+		    (t 'ede-emacs-target-misc)))
+	 (targets (oref proj targets))
+	 (dir default-directory)
+	 (ans (ede-emacs-find-matching-target cls dir targets))
+	 )
+    (when (not ans)
+      (setq ans (make-instance 
+		 cls 
+		 :name (file-name-nondirectory
+			(directory-file-name dir))
+		 :path dir
+		 :source nil))
+      (object-add-to-list proj :targets ans)
+      )
+    ans))
+
+;;; UTILITIES SUPPORT.
+;;
+(defmethod ede-preprocessor-map ((this ede-emacs-target-c))
+  "Get the pre-processor map for Emacs C code.
+All files need the macros from lisp.h!"
+  (let* ((proj (ede-target-parent this))
+	 (root (ede-project-root proj))
+	 (table (semanticdb-file-table-object
+		 (ede-expand-filename root "lisp.h")))
+	 (config (semanticdb-file-table-object
+		  (ede-expand-filename root "config.h")))
+	 filemap
+	 )
+    (when table
+      (when (semanticdb-needs-refresh-p table)
+	(semanticdb-refresh-table table))
+      (setq filemap (append filemap (oref table lexical-table)))
+      )
+    (when config
+      (when (semanticdb-needs-refresh-p config)
+	(semanticdb-refresh-table config))
+      (setq filemap (append filemap (oref config lexical-table)))
+      )
+    filemap
+    ))
+
+(defun ede-emacs-find-in-directories (name base dirs)
+  "Find NAME is BASE directory sublist of DIRS."
+  (let ((ans nil))
+    (while (and dirs (not ans))
+      (let* ((D (car dirs))
+	     (ed (expand-file-name D base))
+	     (ef (expand-file-name name ed)))
+	(if (file-exists-p ef)
+	    (setq ans ef)
+	  ;; Not in this dir?  How about subdirs?
+	  (let ((dirfile (directory-files ed t))
+		(moredirs nil)
+		)
+	    ;; Get all the subdirs.
+	    (dolist (DF dirfile)
+	      (when (and (file-directory-p DF)
+			 (not (string-match "\\.$" DF)))
+		(push DF moredirs)))
+	    ;; Try again.
+	    (setq ans (ede-emacs-find-in-directories name ed moredirs))
+	    ))
+	(setq dirs (cdr dirs))))
+    ans))
+
+(defmethod ede-expand-filename-impl ((proj ede-emacs-project) name)
+  "Within this project PROJ, find the file NAME.
+Knows about how the Emacs source tree is organized."
+  (let* ((ext (file-name-extension name))
+	 (root (ede-project-root proj))
+	 (dir (ede-project-root-directory root))
+	 (dirs (cond
+		((not ext) nil)
+		((string-match "h\\|c" ext)
+		 '("src" "lib-src" "lwlib"))
+		((string-match "elc?" ext)
+		 '("lisp"))
+		((string-match "texi" ext)
+		 '("doc"))
+		(t nil)))
+	 )
+    (if (not dirs) (call-next-method)
+      (ede-emacs-find-in-directories name dir dirs))
+    ))
+
+
+(provide 'ede-emacs)
+;;; ede-emacs.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-files.el b/site/cedet-1.0pre7/ede/ede-files.el
new file mode 100644
index 0000000..54972ff
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-files.el
@@ -0,0 +1,484 @@
+;;; ede-files.el --- Associate projects with files and directories.
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-files.el,v 1.20 2010/02/08 21:59:41 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Directory and File scanning and matching functions.
+;;
+;; Basic Model:
+;;
+;; A directory belongs to a project if a ede-project-autoload structure
+;; matches your directory.
+;;
+;; A toplevel project is one where there is no active project above
+;; it.  Finding the toplevel project involves going up a directory
+;; till no ede-project-autoload structure matches.
+;; 
+
+(require 'ede)
+
+;;; Code:
+;;;###autoload
+(defun ede-find-file (file)
+  "Find FILE in project.  FILE can be specified without a directory.
+There is no completion at the prompt.  FILE is searched for within
+the current EDE project."
+  (interactive "sFile: ")
+  (let ((fname (ede-expand-filename (ede-current-project) file))
+	)
+    (unless fname
+      (error "Could not find %s in %s"
+	     file
+	     (ede-project-root-directory (ede-current-project))))
+    (find-file fname)))
+
+;;; Placeholders for ROOT directory scanning on base objects
+;;
+(defmethod ede-project-root ((this ede-project-placeholder))
+  "If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems."
+  (oref this rootproject))
+
+(defmethod ede-project-root-directory ((this ede-project-placeholder)
+				       &optional file)
+  "If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems.
+Optional FILE is the file to test.  It is ignored in preference
+of the anchor file for the project."
+  (file-name-directory (expand-file-name (oref this file))))
+
+
+(defmethod ede--project-inode ((proj ede-project-placeholder))
+  "Get the inode of the directory project PROJ is in."
+  (if (slot-boundp proj 'dirinode)
+      (oref proj dirinode)
+    (oset proj dirinode (ede--inode-for-dir (oref proj :directory)))))
+
+(defmethod ede-find-subproject-for-directory ((proj ede-project-placeholder)
+					      dir)
+  "Find a subproject of PROJ that corresponds to DIR."
+  (if ede--disable-inode
+      (let ((ans nil))
+	;; Try to find the right project w/out inodes.
+	(ede-map-subprojects 
+	 proj
+	 (lambda (SP)
+	   (when (not ans)
+	     (if (string= (file-truename dir) (oref SP :directory))
+		 (setq ans SP)
+	       (ede-find-subproject-for-directory SP dir)))))
+	ans)
+    ;; We can use inodes, so lets try it.
+    (let ((ans nil)
+	  (inode (ede--inode-for-dir dir)))
+      (ede-map-subprojects 
+       proj
+       (lambda (SP)
+	 (when (not ans)
+	   (if (equal (ede--project-inode SP) inode)
+	       (setq ans SP)
+	     (ede-find-subproject-for-directory SP dir)))))
+      ans)))
+
+;;; DIRECTORY IN OPEN PROJECT
+;;
+;; These routines match some directory name to one of the many pre-existing
+;; open projects.  This should avoid hitting the disk, or asking lots of questions
+;; if used throughout the other routines.
+(defvar ede-inode-directory-hash (make-hash-table
+				  ;; Note on test.  Can we compare inodes or something?
+				  :test 'equal)
+  "A hash of directory names and inodes.")
+
+(defun ede--put-inode-dir-hash (dir inode)
+  "Add to the EDE project hash DIR associated with INODE."
+  (when (fboundp 'puthash)
+    (puthash dir inode ede-inode-directory-hash)
+    inode))
+
+(defun ede--get-inode-dir-hash (dir)
+  "Get the EDE project hash DIR associated with INODE."
+  (when (fboundp 'gethash)
+    (gethash dir ede-inode-directory-hash)
+    ))
+
+(defvar ede--disable-inode nil
+  "Set to 't' to simulate systems w/out inode support.")
+
+(defun ede--inode-for-dir (dir)
+  "Return the inode for the directory DIR."
+  (let ((hashnode (ede--get-inode-dir-hash (expand-file-name dir))))
+    (or hashnode
+	(if ede--disable-inode
+	    (ede--put-inode-dir-hash dir 0)
+	  (let ((fattr (file-attributes dir)))
+	    (ede--put-inode-dir-hash dir (nth 10 fattr))
+	    )))))
+
+(defun ede-directory-get-open-project (dir &optional rootreturn)
+  "Return an already open project that is managing DIR.
+Optional ROOTRETURN specifies a symbol to set to the root project.
+If DIR is the root project, then it is the same."
+  (let* ((inode (ede--inode-for-dir dir))
+	 (ft (file-name-as-directory (expand-file-name dir)))
+	 (proj (ede--inode-get-toplevel-open-project inode))
+	 (ans nil))
+    ;; Try file based search.
+    (when (not proj)
+      (setq proj (ede-directory-get-toplevel-open-project ft)))
+    ;; Default answer is this project
+    (setq ans proj)
+    ;; Save.
+    (when rootreturn (set rootreturn proj))
+    ;; Find subprojects.
+    (when (and proj (or ede--disable-inode
+			(not (equal inode (ede--project-inode proj)))))
+      (setq ans (ede-find-subproject-for-directory proj ft)))
+    ans))
+
+(defun ede--inode-get-toplevel-open-project (inode)
+  "Return an already open toplevel project that is managing INODE.
+Does not check subprojects."
+  (when (or (and (numberp inode) (/= inode 0))
+	    (consp inode))
+    (let ((all ede-projects)
+	  (found nil)
+	  )
+      (while (and all (not found))
+	(when (equal inode (ede--project-inode (car all)))
+	  (setq found (car all)))
+	(setq all (cdr all)))
+      found)))
+
+(defun ede-directory-get-toplevel-open-project (dir)
+  "Return an already open toplevel project that is managing DIR."
+  (let ((ft (file-name-as-directory (expand-file-name dir)))
+	(all ede-projects)
+	(ans nil))
+    (while (and all (not ans))
+      ;; Do the check.
+      (let ((pd (oref (car all) :directory))
+	    )
+	(cond
+	 ;; Exact text match.
+	 ((string= pd ft)
+	  (setq ans (car all)))
+	 ;; Some sub-directory
+	 ((string-match (concat "^" (regexp-quote pd)) ft)
+	  (setq ans (car all)))
+	 ;; Exact inode match.  Useful with symlinks or complex automounters.
+	 ((let ((pin (ede--project-inode (car all)))
+		(inode (ede--inode-for-dir dir)))
+	    (and (not (eql pin 0)) (equal pin inode)))
+	  (setq ans (car all)))
+	 ;; Subdir via truename - slower by far, but faster than a traditional lookup.
+	 ((let ((ftn (file-truename ft))
+		(ptd (file-truename (oref (car all) :directory))))
+	    (string-match (concat "^" (regexp-quote ptd)) ftn))
+	  (setq ans (car all)))
+	 ))
+      (setq all (cdr all)))
+    ans))
+
+;;; DIRECTORY-PROJECT-P
+;;
+;; For a fresh buffer, or for a path w/ no open buffer, use this
+;; routine to determine if there is a known project type here.
+(defvar ede-project-directory-hash (make-hash-table
+				    ;; Note on test.  Can we compare inodes or something?
+				    :test 'equal)
+  "A hash of directory names and associated EDE objects.")
+
+(defun ede-project-directory-remove-hash (dir)
+  "Reset the directory hash for DIR.
+Do this whenever a new project is created, as opposed to loaded."
+  ;; TODO - Use maphash, and delete by regexp, not by dir searching!
+
+  (when (fboundp 'remhash)
+    (remhash (file-name-as-directory dir) ede-project-directory-hash)
+    ;; Look for all subdirs of D, and remove them.
+    (let ((match (concat "^" (regexp-quote dir))))
+      (maphash (lambda (K O)
+		 (when (string-match match K)
+		   (remhash K ede-project-directory-hash)))
+	       ede-project-directory-hash))
+    ))
+
+(defun ede-directory-project-from-hash (dir)
+  "If there is an already loaded project for DIR, return it from the hash."
+  (when (fboundp 'gethash)
+    (gethash dir ede-project-directory-hash nil)))
+
+(defun ede-directory-project-add-description-to-hash (dir desc)
+  "Add to the EDE project hash DIR associated with DESC."
+  (when (fboundp 'puthash)
+    (puthash dir desc ede-project-directory-hash)
+    desc))
+
+(defun ede-directory-project-p (dir &optional force)
+  "Return a project description object if DIR has a project.
+Optional argument FORCE means to ignore a hash-hit of 'nomatch.
+This depends on an up to date `ede-project-class-files' variable."
+  (let* ((dirtest (expand-file-name dir))
+	 (match (ede-directory-project-from-hash dirtest)))
+    (cond
+     ((and (eq match 'nomatch) (not force))
+      nil)
+     ((and match (not (eq match 'nomatch)))
+      match)
+     (t
+      (let ((types ede-project-class-files)
+	    (ret nil))
+	;; Loop over all types, loading in the first type that we find.
+	(while (and types (not ret))
+	  (if (ede-dir-to-projectfile (car types) dirtest)
+	      (progn
+		;; We found one!  Require it now since we will need it.
+		(require (oref (car types) file))
+		(setq ret (car types))))
+	  (setq types (cdr types)))
+	(ede-directory-project-add-description-to-hash dirtest (or ret 'nomatch))
+	ret)))))
+
+;;; TOPLEVEL
+;;
+;; These utilities will identify the "toplevel" of a project.
+;;
+(defun ede-toplevel-project-or-nil (dir)
+  "Starting with DIR, find the toplevel project directory, or return nil.
+nil is returned if the current directory is not a part ofa project."
+  (let* ((ans (ede-directory-get-toplevel-open-project dir)))
+    (if ans
+	(oref ans :directory)
+      (if (ede-directory-project-p dir)
+	  (ede-toplevel-project dir)
+	nil))))
+
+(defun ede-toplevel-project (dir)
+  "Starting with DIR, find the toplevel project directory."
+  (if (and (string= dir default-directory)
+	   ede-object-root-project)
+      ;; Try the local buffer cache first.
+      (oref ede-object-root-project :directory)
+    ;; Otherwise do it the hard way.
+    (let* ((thisdir (ede-directory-project-p dir))
+	   (ans (ede-directory-get-toplevel-open-project dir)))
+      (if (and ans ;; We have an answer
+	       (or (not thisdir) ;; this dir isn't setup
+		   (and (object-of-class-p ;; Same as class for this dir?
+			 ans (oref thisdir :class-sym)))
+		   ))
+	  (oref ans :directory)
+	(let* ((toppath (expand-file-name dir))
+	       (newpath toppath)
+	       (proj (ede-directory-project-p dir))
+	       (ans nil))
+	  (if proj
+	      ;; If we already have a project, ask it what the root is.
+	      (setq ans (ede-project-root-directory proj)))
+
+	  ;; If PROJ didn't know, or there is no PROJ, then
+
+	  ;; Loop up to the topmost project, and then load that single
+	  ;; project, and its sub projects.  When we are done, identify the
+	  ;; sub-project object belonging to file.
+	  (while (and (not ans) newpath proj)
+	    (setq toppath newpath
+		  newpath (ede-up-directory toppath))
+	    (when newpath
+	      (setq proj (ede-directory-project-p newpath)))
+
+	    (when proj
+	      ;; We can home someone in the middle knows too.
+	      (setq ans (ede-project-root-directory proj)))
+	    )
+	  (or ans toppath))))))
+
+;;; TOPLEVEL PROJECT
+;;
+;; The toplevel project is a way to identify the EDE structure that belongs
+;; to the top of a project.
+
+(defun ede-toplevel (&optional subproj)
+  "Return the ede project which is the root of the current project.
+Optional argument SUBPROJ indicates a subproject to start from
+instead of the current project."
+  (or ede-object-root-project
+      (let* ((cp (or subproj (ede-current-project)))
+	     )
+	(or (and cp (ede-project-root cp))
+	    (progn
+	      (while (ede-parent-project cp)
+		(setq cp (ede-parent-project cp)))
+	      cp)))))
+
+;;; DIRECTORY CONVERSION STUFF
+;;
+(defmethod ede-convert-path ((this ede-project) path)
+  "Convert path in a standard way for a given project.
+Default to making it project relative.
+Argument THIS is the project to convert PATH to."
+  (let ((pp (ede-project-root-directory this))
+	(fp (expand-file-name path)))
+    (if (string-match (regexp-quote pp) fp)
+	(substring fp (match-end 0))
+      (let ((pptf (file-truename pp))
+	    (fptf (file-truename fp)))
+	(if (string-match (regexp-quote pptf) fptf)
+	    (substring fptf (match-end 0))
+	  (error "Cannot convert relativize path %s" fp))))))
+
+(defmethod ede-convert-path ((this ede-target) path &optional project)
+  "Convert path in a standard way for a given project.
+Default to making it project relative.
+Argument THIS is the project to convert PATH to.
+Optional PROJECT is the project that THIS belongs to.  Associating
+a target to a project is expensive, so using this can speed things up."
+  (let ((proj (or project (ede-target-parent this))))
+    (if proj
+	(let ((p (ede-convert-path proj path))
+	      (lp (or (oref this path) "")))
+	  ;; Our target THIS may have path information.
+	  ;; strip this out of the conversion.
+	  (if (string-match (concat "^" (regexp-quote lp)) p)
+	      (substring p (length lp))
+	    p))
+      (error "Parentless target %s" this))))
+
+;;; FILENAME EXPANSION
+;;
+(defun ede-get-locator-object (proj)
+  "Get the locator object for project PROJ.
+Get it from the toplevel project.  If it doesn't have one, make one."
+  ;; Make sure we have a location object available for
+  ;; caching values, and for locating things more robustly.
+  (let ((top (ede-toplevel proj)))
+    (when (not (slot-boundp top 'locate-obj))
+      (ede-enable-locate-on-project top))
+    (oref top locate-obj)
+    ))
+
+(defmethod ede-expand-filename ((this ede-project) filename &optional force)
+  "Return a fully qualified file name based on project THIS.
+FILENAME should be just a filename which occurs in a directory controlled
+by this project.
+Optional argument FORCE forces the default filename to be provided even if it
+doesn't exist.
+If FORCE equals 'newfile, then the cache is ignored."
+  (let* ((loc (ede-get-locator-object this))
+	 (ha (ede-locate-file-in-hash loc filename))
+	 (ans nil)
+	 )
+    ;; NOTE: This function uses a locator object, which keeps a hash
+    ;; table of files it has found in the past.  The hash table is
+    ;; used to make commonly found file very fast to location.  Some
+    ;; complex routines, such as smart completion asks this question
+    ;; many times, so doing this speeds things up, especially on NFS
+    ;; or other remote file systems.
+    
+    ;; As such, special care is needed to use the hash, and also obey
+    ;; the FORCE option, which is needed when trying to identify some
+    ;; new file that needs to be created, such as a Makefile.
+    (cond 
+     ;; We have a hash-table match, AND that match wasn't the 'nomatch
+     ;; flag, we can return it.
+     ((and ha (not (eq ha 'nomatch)))
+      (setq ans ha))
+     ;; If we had a match, and it WAS no match, then we need to look
+     ;; at the force-option to see what to do.  Since ans is already
+     ;; nil, then we do nothing.
+     ((and (eq ha 'nomatch) (not (eq force 'newfile)))
+      nil)
+     ;; We had no hash table match, so we have to look up this file
+     ;; using the usual EDE file expansion rules.
+     (t
+      (let ((calc (ede-expand-filename-impl this filename)))
+	(if calc
+	    (progn
+	      (ede-locate-add-file-to-hash loc filename calc)
+	      (setq ans calc))
+	  ;; If we failed to calculate something, we
+	  ;; should add it to the hash, but ONLY if we are not
+	  ;; going to FORCE the file into existance.
+	  (when (not force)
+	    (ede-locate-add-file-to-hash loc filename 'nomatch))))
+      ))
+    ;; Now that all options have been queried, if the FORCE option is
+    ;; true, but ANS is still nil, then we can make up a file name.
+
+    ;; Is it forced?
+    (when (and force (not ans))
+      (let ((dir (ede-project-root-directory this)))
+	(setq ans (expand-file-name filename dir))))
+
+    ans))
+
+(defmethod ede-expand-filename-impl ((this ede-project) filename &optional force)
+  "Return a fully qualified file name based on project THIS.
+FILENAME should be just a filename which occurs in a directory controlled
+by this project.
+Optional argument FORCE forces the default filename to be provided even if it
+doesn't exist."
+  (let ((loc (ede-get-locator-object this))
+	(path (ede-project-root-directory this))
+	(proj (oref this subproj))
+	(found nil))
+    ;; find it Locally.
+    (setq found
+	  (cond ((file-exists-p (expand-file-name filename path))
+		 (expand-file-name filename path))
+		((file-exists-p (expand-file-name  (concat "include/" filename) path))
+		 (expand-file-name (concat "include/" filename) path))
+		(t
+		 (while (and (not found) proj)
+		   (setq found (when (car proj)
+				 (ede-expand-filename (car proj) filename))
+			 proj (cdr proj)))
+		 found)))
+    ;; Use an external locate tool.
+    (when (not found)
+      (setq found (car (ede-locate-file-in-project loc filename))))
+    ;; Return it
+    found))
+
+(defmethod ede-expand-filename ((this ede-target) filename &optional force)
+  "Return a fully qualified file name based on target THIS.
+FILENAME should a a filename which occurs in a directory in which THIS works.
+Optional argument FORCE forces the default filename to be provided even if it
+doesn't exist."
+  (ede-expand-filename (ede-target-parent this) filename force))
+
+;;; UTILITIES
+;;
+
+(defun ede-up-directory (dir)
+  "Return a dir that is up one directory.
+Argument DIR is the directory to trim upwards."
+  (let* ((fad (directory-file-name dir))
+	 (fnd (file-name-directory fad)))
+    (if (string= dir fnd) ; This will catch the old string-match against
+			  ; c:/ for DOS like systems.
+	nil
+      fnd)))
+
+(provide 'ede-files)
+;;; ede-files.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-linux.el b/site/cedet-1.0pre7/ede/ede-linux.el
new file mode 100644
index 0000000..c38f08a
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-linux.el
@@ -0,0 +1,243 @@
+;;; ede-linux.el --- Special project for Linux
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-linux.el,v 1.5 2009/10/16 03:50:47 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide a special project type just for Linux, cause Linux is special.
+;;
+;; Identifies an Linux project automatically.
+;; Speedy ede-expand-filename based on extension.
+;; Pre-populates the preprocessor map from lisp.h
+;;
+;; ToDo :
+;; * Add "build" options.
+;; * Add texinfo lookup options.
+;; * Add website
+
+(require 'ede)
+
+;;; Code:
+(defvar ede-linux-project-list nil
+  "List of projects created by option `ede-linux-project'.")
+
+(defun ede-linux-file-existing (dir)
+  "Find a Linux project in the list of Linux projects.
+DIR is the directory to search from."
+  (let ((projs ede-linux-project-list)
+	(ans nil))
+    (while (and projs (not ans))
+      (let ((root (ede-project-root-directory (car projs))))
+	(when (string-match (concat "^" (regexp-quote root)) dir)
+	  (setq ans (car projs))))
+      (setq projs (cdr projs)))
+    ans))
+
+;;;###autoload
+(defun ede-linux-project-root (&optional dir)
+  "Get the root directory for DIR."
+  (when (not dir) (setq dir default-directory))
+  (let ((case-fold-search t)
+	(proj (ede-linux-file-existing dir)))
+    (if proj
+	(ede-up-directory (file-name-directory
+			   (oref proj :file)))
+      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; an Linux project here.
+      (when (string-match "linux[^/]*" dir)
+	(let ((base (substring dir 0 (match-end 0))))
+	  (when (file-exists-p (expand-file-name "scripts/ver_linux" base))
+	      base))))))
+
+(defun ede-linux-version (dir)
+  "Find the Linux version for the Linux src in DIR."
+  (let ((buff (get-buffer-create " *linux-query*")))
+    (save-excursion
+      (set-buffer buff)
+      (erase-buffer)
+      (setq default-directory (file-name-as-directory dir))
+      (insert-file-contents "Makefile" nil 0 512)
+      (goto-char (point-min))
+      (let (major minor sub)
+	(re-search-forward "^VERSION *= *\\([0-9.]+\\)")
+	(setq major (match-string 1))
+	(re-search-forward "^PATCHLEVEL *= *\\([0-9.]+\\)")
+	(setq minor (match-string 1))
+	(re-search-forward "^SUBLEVEL *= *\\([0-9.]+\\)")
+	(setq sub (match-string 1))
+	(prog1
+	    (concat major "." minor "." sub)
+	  (kill-buffer buff)
+	  )))))
+
+;;;###autoload
+(defun ede-linux-load (dir &optional rootproj)
+  "Return an Linux Project object if there is a match.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project."
+  (or (ede-linux-file-existing dir)
+      ;; Doesn't already exist, so lets make one.
+      (ede-linux-project "Linux"
+			 :name "Linux"
+			 :version (ede-linux-version dir)
+			 :directory (file-name-as-directory dir)
+			 :file (expand-file-name "scripts/ver_linux"
+						 dir))
+      (ede-add-project-to-global-list this)
+      )
+  )
+
+;;;###autoload
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "linux"
+	      :name "LINUX ROOT"
+	      :file 'ede-linux
+	      :proj-file "scripts/ver_linux"
+	      :proj-root 'ede-linux-project-root
+	      :load-type 'ede-linux-load
+	      :class-sym 'ede-linux-project
+	      :new-p nil)
+	     t)
+
+(defclass ede-linux-target-c (ede-target)
+  ()
+  "EDE Linux Project target for C code.
+All directories need at least one target.")
+
+(defclass ede-linux-target-misc (ede-target)
+  ()
+  "EDE Linux Project target for Misc files.
+All directories need at least one target.")
+
+;;;###autoload
+(defclass ede-linux-project (ede-project eieio-instance-tracker)
+  ((tracking-symbol :initform 'ede-linux-project-list)
+   )
+  "Project Type for the Linux source code."
+  :method-invocation-order :depth-first)
+
+(defmethod initialize-instance ((this ede-linux-project)
+				&rest fields)
+  "Make sure the :file is fully expanded."
+  (call-next-method)
+  (unless (slot-boundp this 'targets)
+    (oset this :targets nil)))
+
+;;; File Stuff
+;;
+(defmethod ede-project-root-directory ((this ede-linux-project)
+				       &optional file)
+  "Return the root for THIS Linux project with file."
+  (ede-up-directory (file-name-directory (oref this file))))
+
+(defmethod ede-project-root ((this ede-linux-project))
+  "Return my root."
+  this)
+
+(defmethod ede-find-subproject-for-directory ((proj ede-linux-project)
+					      dir)
+  "Return PROJ, for handling all subdirs below DIR."
+  proj)
+
+;;; TARGET MANAGEMENT
+;;
+(defun ede-linux-find-matching-target (class dir targets)
+  "Find a target that is a CLASS and is in DIR in the list of TARGETS."
+  (let ((match nil))
+    (dolist (T targets)
+      (when (and (object-of-class-p T class)
+		 (string= (oref T :path) dir))
+	(setq match T)
+      ))
+    match))
+
+(defmethod ede-find-target ((proj ede-linux-project) buffer)
+  "Find an EDE target in PROJ for BUFFER.
+If one doesn't exist, create a new one for this directory."
+  (let* ((ext (file-name-extension (buffer-file-name buffer)))
+	 (cls (cond ((not ext)
+		     'ede-linux-target-misc)
+		    ((string-match "c\\|h" ext)
+		     'ede-linux-target-c)
+		    (t 'ede-linux-target-misc)))
+	 (targets (oref proj targets))
+	 (dir default-directory)
+	 (ans (ede-linux-find-matching-target cls dir targets))
+	 )
+    (when (not ans)
+      (setq ans (make-instance 
+		 cls 
+		 :name (file-name-nondirectory
+			(directory-file-name dir))
+		 :path dir
+		 :source nil))
+      (object-add-to-list proj :targets ans)
+      )
+    ans))
+
+;;; UTILITIES SUPPORT.
+;;
+(defmethod ede-preprocessor-map ((this ede-linux-target-c))
+  "Get the pre-processor map for Linux C code.
+All files need the macros from lisp.h!"
+  (let* ((proj (ede-target-parent this))
+	 (root (ede-project-root proj))
+	 (versionfile (ede-expand-filename root "include/linux/version.h"))
+	 (table (when (and versionfile (file-exists-p versionfile))
+		  (semanticdb-file-table-object versionfile)))
+	 (filemap '( ("__KERNEL__" . "")
+		     ))
+	 )
+    (when table
+      (when (semanticdb-needs-refresh-p table)
+	(semanticdb-refresh-table table))
+      (setq filemap (append filemap (oref table lexical-table)))
+      )
+    filemap
+    ))
+
+(defun ede-linux-file-exists-name (name root subdir)
+  "Return a file name if NAME exists under ROOT with SUBDIR in between."
+  (let ((F (expand-file-name name (expand-file-name subdir root))))
+    (when (file-exists-p F) F)))
+
+(defmethod ede-expand-filename-impl ((proj ede-linux-project) name)
+  "Within this project PROJ, find the file NAME.
+Knows about how the Linux source tree is organized."
+  (let* ((ext (file-name-extension name))
+	 (root (ede-project-root proj))
+	 (dir (ede-project-root-directory root))
+	 (F (cond
+	     ((not ext) nil)
+	     ((string-match "h" ext)
+	      (or (ede-linux-file-exists-name name dir "")
+		  (ede-linux-file-exists-name name dir "include"))
+	      )
+	     ((string-match "txt" ext)
+	      (ede-linux-file-exists-name name dir "Documentation"))
+	     (t nil)))
+	 )
+    (or F (call-next-method))))
+
+
+(provide 'ede-linux)
+;;; ede-linux.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-load.el b/site/cedet-1.0pre7/ede/ede-load.el
new file mode 100644
index 0000000..6cf724a
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-load.el
@@ -0,0 +1,43 @@
+;;; ede-load.el --- Autoload definitions for EDE
+
+;;; Copyright (C) 2003, 2009 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: ede-load.el,v 1.3 2009/01/10 13:30:15 zappo Exp $
+
+;; EDE is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize EDE for all supported conditions.
+
+;;; Code:
+;;
+;; We need to load the base EDE tools for XEmacs which sorts
+;; the files differently in the autoloads file.
+;;
+;; This isn't that big a deal since the act of reading in the autoloads
+;; happens to have the effect of loading EDE anyway, so this saves us
+;; the trouble.
+(require 'ede)
+
+;;; EDE autoloads
+;;
+(load "ede-loaddefs" nil t)
+
+(provide 'ede-load)
+
+;;; ede-load.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-loaddefs.el b/site/cedet-1.0pre7/ede/ede-loaddefs.el
new file mode 100644
index 0000000..43c1fc0
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-loaddefs.el
@@ -0,0 +1,404 @@
+;;; ede-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (autoconf-parameters-for-macro) "autoconf-edit"
+;;;;;;  "autoconf-edit.el" (19328 39941))
+;;; Generated autoloads from autoconf-edit.el
+
+(autoload 'autoconf-parameters-for-macro "autoconf-edit" "\
+Retrieve the parameters to MACRO.
+Returns a list of the arguments passed into MACRO as strings.
+
+\(fn MACRO &optional IGNORE-BOL IGNORE-CASE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (ede-target-parent ede-parent-project ede-load-project-file
+;;;;;;  project-make-dist project-compile-target project-compile-project
+;;;;;;  project-edit-file-target ede-compile-target ede-remove-file
+;;;;;;  global-ede-mode) "ede" "ede.el" (19328 24664))
+;;; Generated autoloads from ede.el
+
+(defvar ede-projects nil "\
+A list of all active projects currently loaded in Emacs.")
+
+(defvar ede-minor-mode nil "\
+Non-nil in EDE controlled buffers.")
+
+(autoload 'global-ede-mode "ede" "\
+Turn on variable `ede-minor-mode' mode when ARG is positive.
+If ARG is negative, disable.  Toggle otherwise.
+
+\(fn ARG)" t nil)
+
+(autoload 'ede-remove-file "ede" "\
+Remove the current file from targets.
+Optional argument FORCE forces the file to be removed without asking.
+
+\(fn &optional FORCE)" t nil)
+
+(autoload 'ede-compile-target "ede" "\
+Compile the current buffer's associated target.
+
+\(fn)" t nil)
+
+(autoload 'project-edit-file-target "ede" "\
+Edit the target OT associated w/ this file.
+
+\(fn (OT ede-target))" nil nil)
+
+(autoload 'project-compile-project "ede" "\
+Compile the entire current project OBJ.
+Argument COMMAND is the command to use when compiling.
+
+\(fn (OBJ ede-project) &optional COMMAND)" nil nil)
+
+(autoload 'project-compile-target "ede" "\
+Compile the current target OBJ.
+Argument COMMAND is the command to use for compiling the target.
+
+\(fn (OBJ ede-target) &optional COMMAND)" nil nil)
+
+(autoload 'project-make-dist "ede" "\
+Build a distribution for the project based on THIS project.
+
+\(fn (THIS ede-project))" nil nil)
+
+(autoload 'ede-load-project-file "ede" "\
+Project file independent way to read a project in from DIR.
+Optional ROOTRETURN will return the root project for DIR.
+
+\(fn DIR &optional ROOTRETURN)" nil nil)
+
+(autoload 'ede-parent-project "ede" "\
+Return the project belonging to the parent directory.
+nil if there is no previous directory.
+Optional argument OBJ is an object to find the parent of.
+
+\(fn &optional OBJ)" nil nil)
+
+(autoload 'ede-target-parent "ede" "\
+Return the project which is the parent of TARGET.
+It is recommended you track the project a different way as this function
+could become slow in time.
+
+\(fn TARGET)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil "ede-auto" "ede-auto.el" (19312 36827))
+;;; Generated autoloads from ede-auto.el
+
+(eieio-defclass-autoload 'ede-project-autoload 'nil "ede-auto" "Class representing minimal knowledge set to run preliminary EDE functions.\nWhen more advanced functionality is needed from a project type, that projects\ntype is required and the load function used.")
+
+;;;***
+
+;;;### (autoloads (ede-adebug-project-root ede-adebug-project-parent
+;;;;;;  ede-adebug-project ede-documentation-files ede-description
+;;;;;;  ede-name) "ede-base" "ede-base.el" (19312 41531))
+;;; Generated autoloads from ede-base.el
+
+(eieio-defclass-autoload 'ede-target '(eieio-speedbar-directory-button) "ede-base" "A target is a structure that describes a file set that produces something.\nTargets, as with 'Make', is an entity that will manage a file set \nand knows how to compile or otherwise transform those files into some\nother desired outcome.")
+
+(eieio-defclass-autoload 'ede-project '(ede-project-placeholder) "ede-base" "Top level EDE project specification.\nAll specific project types must derive from this project.")
+
+(autoload 'ede-name "ede-base" "\
+Return the name of THIS targt.
+
+\(fn (THIS ede-target))" nil nil)
+
+(autoload 'ede-description "ede-base" "\
+Return a description suitable for the minibuffer about THIS.
+
+\(fn (THIS ede-project))" nil nil)
+
+(autoload 'ede-documentation-files "ede-base" "\
+Return the documentation files for the current buffer.
+Not all buffers need documentations, so return nil if no applicable.
+Some projects may have multiple documentation files, so return a list.
+
+\(fn)" nil nil)
+
+(autoload 'ede-adebug-project "ede-base" "\
+Run adebug against the current ede project.
+Display the results as a debug list.
+
+\(fn)" t nil)
+
+(autoload 'ede-adebug-project-parent "ede-base" "\
+Run adebug against the current ede parent project.
+Display the results as a debug list.
+
+\(fn)" t nil)
+
+(autoload 'ede-adebug-project-root "ede-base" "\
+Run adebug against the current ede parent project.
+Display the results as a debug list.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (ede-cpp-root-load ede-cpp-root-project-root ede-cpp-root-project-file-for-dir)
+;;;;;;  "ede-cpp-root" "ede-cpp-root.el" (19326 59186))
+;;; Generated autoloads from ede-cpp-root.el
+
+(autoload 'ede-cpp-root-project-file-for-dir "ede-cpp-root" "\
+Return a full file name to the project file stored in DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'ede-cpp-root-project-root "ede-cpp-root" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'ede-cpp-root-load "ede-cpp-root" "\
+Return a CPP root object if you created one.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project.
+
+\(fn DIR &optional ROOTPROJ)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "cpp-root" :name "CPP ROOT" :file 'ede-cpp-root :proj-file 'ede-cpp-root-project-file-for-dir :proj-root 'ede-cpp-root-project-root :load-type 'ede-cpp-root-load :class-sym 'ede-cpp-root :new-p nil) t)
+
+(eieio-defclass-autoload 'ede-cpp-root-project '(ede-project eieio-instance-tracker) "ede-cpp-root" "EDE cpp-root project class.\nEach directory needs a a project file to control it.")
+
+;;;***
+
+;;;### (autoloads (ede-project-sort-targets ede-customize-target
+;;;;;;  ede-customize-current-target ede-customize-project) "ede-custom"
+;;;;;;  "ede-custom.el" (19312 35075))
+;;; Generated autoloads from ede-custom.el
+
+(autoload 'ede-customize-project "ede-custom" "\
+Edit fields of the current project through EIEIO & Custom.
+Optional GROUP specifies the subgroup of slots to customize.
+
+\(fn &optional GROUP)" t nil)
+
+(defalias 'customize-project 'ede-customize-project)
+
+(autoload 'ede-customize-current-target "ede-custom" "\
+Edit fields of the current target through EIEIO & Custom.
+Optional argument OBJ is the target object to customize.
+Optional argument GROUP is the slot group to display.
+
+\(fn &optional GROUP)" t nil)
+
+(defalias 'customize-target 'ede-customize-current-target)
+
+(autoload 'ede-customize-target "ede-custom" "\
+Edit fields of the current target through EIEIO & Custom.
+Optional argument OBJ is the target object to customize.
+Optional argument GROUP is the slot group to display.
+
+\(fn OBJ GROUP)" nil nil)
+
+(autoload 'ede-project-sort-targets "ede-custom" "\
+Create a custom-like buffer for sorting targets of current project.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (ede-emacs-load ede-emacs-project-root) "ede-emacs"
+;;;;;;  "ede-emacs.el" (19326 59186))
+;;; Generated autoloads from ede-emacs.el
+
+(autoload 'ede-emacs-project-root "ede-emacs" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'ede-emacs-load "ede-emacs" "\
+Return an Emacs Project object if there is a match.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project.
+
+\(fn DIR &optional ROOTPROJ)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "emacs" :name "EMACS ROOT" :file 'ede-emacs :proj-file "src/emacs.c" :proj-root 'ede-emacs-project-root :load-type 'ede-emacs-load :class-sym 'ede-emacs-project :new-p nil) t)
+
+(eieio-defclass-autoload 'ede-emacs-project '(ede-project eieio-instance-tracker) "ede-emacs" "Project Type for the Emacs source code.")
+
+;;;***
+
+;;;### (autoloads (ede-find-file) "ede-files" "ede-files.el" (19326
+;;;;;;  59186))
+;;; Generated autoloads from ede-files.el
+
+(autoload 'ede-find-file "ede-files" "\
+Find FILE in project.  FILE can be specified without a directory.
+There is no completion at the prompt.  FILE is searched for within
+the current EDE project.
+
+\(fn FILE)" t nil)
+
+;;;***
+
+;;;### (autoloads (ede-linux-load ede-linux-project-root) "ede-linux"
+;;;;;;  "ede-linux.el" (19326 59186))
+;;; Generated autoloads from ede-linux.el
+
+(autoload 'ede-linux-project-root "ede-linux" "\
+Get the root directory for DIR.
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'ede-linux-load "ede-linux" "\
+Return an Linux Project object if there is a match.
+Return nil if there isn't one.
+Argument DIR is the directory it is created for.
+ROOTPROJ is nil, since there is only one project.
+
+\(fn DIR &optional ROOTPROJ)" nil nil)
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "linux" :name "LINUX ROOT" :file 'ede-linux :proj-file "scripts/ver_linux" :proj-root 'ede-linux-project-root :load-type 'ede-linux-load :class-sym 'ede-linux-project :new-p nil) t)
+
+(eieio-defclass-autoload 'ede-linux-project '(ede-project eieio-instance-tracker) "ede-linux" "Project Type for the Linux source code.")
+
+;;;***
+
+;;;### (autoloads (ede-enable-locate-on-project) "ede-locate" "ede-locate.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from ede-locate.el
+
+(autoload 'ede-enable-locate-on-project "ede-locate" "\
+Enable an EDE locate feature on PROJECT.
+Attempt to guess which project locate style to use
+based on `ede-locate-setup-options'.
+
+\(fn &optional PROJECT)" t nil)
+
+;;;***
+
+;;;### (autoloads (ede-make-check-version) "ede-make" "ede-make.el"
+;;;;;;  (18872 24586))
+;;; Generated autoloads from ede-make.el
+
+(autoload 'ede-make-check-version "ede-make" "\
+Check the version of GNU Make installed.
+The check passes if the MAKE version is no high enough, or if it
+is not GNU make.
+If NOERROR is non-nil, return t for success, nil for failure.
+If NOERROR is nil, then throw an error on failure.  Return t otherwise.
+
+\(fn &optional NOERROR)" t nil)
+
+;;;***
+
+;;;### (autoloads (ede-pmake-varname) "ede-pmake" "ede-pmake.el"
+;;;;;;  (19326 59186))
+;;; Generated autoloads from ede-pmake.el
+
+(autoload 'ede-pmake-varname "ede-pmake" "\
+Convert OBJ into a variable name name.
+Change .  to _ in the variable name.
+
+\(fn OBJ)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil "ede-proj" "ede-proj.el" (19326 59186))
+;;; Generated autoloads from ede-proj.el
+
+(add-to-list 'auto-mode-alist '("Project\\.ede$" . emacs-lisp-mode))
+
+;;;***
+
+;;;### (autoloads (ede-shell-buffer ede-shell-run-something) "ede-shell"
+;;;;;;  "ede-shell.el" (19160 52698))
+;;; Generated autoloads from ede-shell.el
+
+(autoload 'ede-shell-run-something "ede-shell" "\
+Create a shell to run stuff for TARGET.
+COMMAND is a text string representing the thing to be run.
+
+\(fn (TARGET ede-target) COMMAND)" nil nil)
+
+(autoload 'ede-shell-buffer "ede-shell" "\
+Get the buffer for running shell commands for TARGET.
+
+\(fn (TARGET ede-target))" nil nil)
+
+;;;***
+
+;;;### (autoloads (ede-simple-load ede-simple-projectfile-for-dir)
+;;;;;;  "ede-simple" "ede-simple.el" (18853 53097))
+;;; Generated autoloads from ede-simple.el
+
+(add-to-list 'ede-project-class-files (ede-project-autoload "simple-overlay" :name "Simple" :file 'ede-simple :proj-file 'ede-simple-projectfile-for-dir :load-type 'ede-simple-load :class-sym 'ede-simple-project) t)
+
+(autoload 'ede-simple-projectfile-for-dir "ede-simple" "\
+Return a full file name to the project file stored in the current directory.
+The directory has three parts:
+  <STORAGE ROOT>/<PROJ DIR AS FILE>/ProjSimple.ede
+
+\(fn &optional DIR)" nil nil)
+
+(autoload 'ede-simple-load "ede-simple" "\
+Load a project of type `Simple' for the directory DIR.
+Return nil if there isn't one.
+ROOTPROJ is nil, since we will only create a single EDE project here.
+
+\(fn DIR &optional ROOTPROJ)" nil nil)
+
+(eieio-defclass-autoload 'ede-simple-project '(ede-project eieio-persistent) "ede-simple" "EDE Simple project class.\nEach directory needs a a project file to control it.")
+
+;;;***
+
+;;;### (autoloads (ede-srecode-insert ede-srecode-setup) "ede-srecode"
+;;;;;;  "ede-srecode.el" (18619 22854))
+;;; Generated autoloads from ede-srecode.el
+
+(autoload 'ede-srecode-setup "ede-srecode" "\
+Update various paths to get SRecode to identify our macros.
+
+\(fn)" nil nil)
+
+(autoload 'ede-srecode-insert "ede-srecode" "\
+Insert at the current point TEMPLATE.
+TEMPLATE should specify a context by using a string format of:
+  context:templatename
+Add DICTIONARY-ENTRIES into the dictionary before insertion.
+Note: Just like `srecode-insert', but templates found in 'ede app.
+
+\(fn TEMPLATE &rest DICTIONARY-ENTRIES)" nil nil)
+
+;;;***
+
+;;;### (autoloads (ede-update-version) "ede-util" "ede-util.el" (17213
+;;;;;;  40281))
+;;; Generated autoloads from ede-util.el
+
+(autoload 'ede-update-version "ede-util" "\
+Update the current projects main version number.
+Argument NEWVERSION is the version number to use in the current project.
+
+\(fn NEWVERSION)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("autoconf-compat.el" "ede-dired.el" "ede-load.el"
+;;;;;;  "ede-pconf.el" "ede-proj-archive.el" "ede-proj-aux.el" "ede-proj-comp.el"
+;;;;;;  "ede-proj-elisp.el" "ede-proj-info.el" "ede-proj-maven2.el"
+;;;;;;  "ede-proj-misc.el" "ede-proj-obj.el" "ede-proj-prog.el" "ede-proj-scheme.el"
+;;;;;;  "ede-proj-shared.el" "ede-proj-skel.el" "ede-source.el" "ede-speedbar.el"
+;;;;;;  "ede-system.el" "makefile-edit.el" "project-am.el") (19335
+;;;;;;  11025 697426))
+
+;;;***
+
+(provide 'ede-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; ede-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-locate.el b/site/cedet-1.0pre7/ede/ede-locate.el
new file mode 100644
index 0000000..5cad9c5
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-locate.el
@@ -0,0 +1,381 @@
+;;; ede-locate.el --- Locate support
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-locate.el,v 1.9 2009/09/11 23:44:12 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Support for various LOCATE type functions.
+;;
+;; A key feature of EDE is `ede-expand-filename', which allows a
+;; project to expand a filename reference in one file to some actual
+;; filename.
+;;
+;; In that way, you may #include <foo.h>, and without knowing how to
+;; read a Makefile, find it in <root>/include/foo.h.
+;;
+;; Some projects are regular, such as the Emacs project.  Some
+;; projects are completely controlled by EDE, such sh the Project.ede
+;; based projects.
+;;
+;; For other projects, haveing a "quick hack" to support these location
+;; routines is handy.
+;;
+;; The baseclass `ede-locate-base' provides the abstract interface to
+;; finding files in a project.
+;;
+;; New location routines will subclass `ede-locate-base'.
+;;
+;; How to use:
+;;
+;; Configure `ede-locate-setup-options' to add the types of locate
+;; features you have available.  EDE will then enable the correct one
+;; when it is available.
+
+(require 'ede)
+(eval-when-compile (require 'data-debug)
+		   (require 'eieio-datadebug)
+		   (require 'cedet-global)
+		   (require 'cedet-idutils)
+		   (require 'cedet-cscope))
+
+;; Older [X]Emacs don't have locate
+(condition-case nil
+    (require 'locate)
+  (error nil))
+
+;;; Code:
+(defcustom ede-locate-setup-options
+  '(ede-locate-base)
+  "List of locate objects to try out by default.
+Listed in order of preference.  If the first item cannot be used in
+a particular project, then the next one is tried.
+It is always assumed that `ede-locate-base' is at end of the list."
+  :group 'ede
+  :type '(repeat
+	  (choice (const :tag "None" ede-locate-base)
+		  (const :tag "locate" ede-locate-locate)
+		  (const :tag "GNU Global" ede-locate-global)
+		  (const :tag "ID Utils" ede-locate-idutils)
+		  (const :tag "CScope" ede-locate-cscope)))
+  )
+
+;;;###autoload
+(defun ede-enable-locate-on-project (&optional project)
+  "Enable an EDE locate feature on PROJECT.
+Attempt to guess which project locate style to use
+based on `ede-locate-setup-options'."
+  (interactive)
+  (let* ((proj (or project (ede-toplevel)))
+	 (root (ede-project-root-directory proj))
+	 (opts ede-locate-setup-options)
+	 (ans nil))
+    (while (and opts (not ans))
+      (when (ede-locate-ok-in-project (car opts) root)
+	;; If interactive, check with the user.
+	(when (or (not (interactive-p))
+		  (y-or-n-p (format "Set project locator to %s? " (car opts))))
+	  (setq ans (car opts))))
+      (setq opts (cdr opts)))
+    ;; No match?  Always create the baseclass for the hashing tool.
+    (when (not ans)
+      (when (interactive-p)
+	(message "Setting locator to ede-locate-base"))
+      (setq ans 'ede-locate-base))
+    (oset proj locate-obj (make-instance ans "Loc" :root root))
+    (when (interactive-p)
+      (message "Satting locator to %s." ans))
+    ))
+
+;;; LOCATE BASECLASS
+;;
+;; The baseclass for all location style queries.
+(defclass ede-locate-base ()
+  ((root :initarg :root
+	 :documentation
+	 "The root of these locat searches.")
+   (file :documentation
+	 "The last file search for with EDE locate.")
+   (lastanswer :documentation
+	      "The last answer provided by the locator.")
+   (hash :documentation
+	 "Hash table of previously found files.")
+   )
+  "Baseclass for LOCATE feature in EDE.")
+
+(defmethod initialize-instance ((loc ede-locate-base) &rest fields)
+  "Make sure we have a hash table."
+  ;; Basic setup.
+  (call-next-method)
+  ;; Make sure we have a hash table.
+  (oset loc hash (make-hash-table :test 'equal))
+  )
+
+(defmethod ede-locate-ok-in-project :static ((loc ede-locate-base)
+					     root)
+  "Is it ok to use this project type under ROOT."
+  t)
+
+(defmethod ede-locate-file-in-hash ((loc ede-locate-base)
+				    filestring)
+  "For LOC, is the file FILESTRING in our hashtable?"
+  (gethash filestring (oref loc hash)))
+
+(defmethod ede-locate-add-file-to-hash ((loc ede-locate-base)
+					filestring fullfilename)
+  "For LOC, add FILESTR to the hash with FULLFILENAME."
+  (puthash filestring fullfilename (oref loc hash)))
+
+(defmethod ede-locate-file-in-project ((loc ede-locate-base)
+				       filesubstring
+				       )
+  "Locate with LOC occurances of FILESUBSTRING.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  (let ((ans (ede-locate-file-in-project-impl loc filesubstring))
+	)
+    (oset loc file filesubstring)
+    (oset loc lastanswer ans)
+    ans))
+
+(defmethod ede-locate-file-in-project-impl ((loc ede-locate-base)
+					    filesubstring
+					    )
+  "Locate with LOC occurances of FILESUBSTRING.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  nil
+  )
+
+;;; LOCATE
+;;
+;; Using the standard unix "locate" command.
+;; Since locate is system wide, we need to hack the search
+;; to restrict it to within just this project.
+
+(defclass ede-locate-locate (ede-locate-base)
+  ()
+  "EDE Locator using the locate command.
+Configure the Emacs `locate-program' variable to also
+configure the use of EDE locate.")
+
+(defmethod ede-locate-ok-in-project :static ((loc ede-locate-locate)
+					     root)
+  "Is it ok to use this project type under ROOT."
+  (or (featurep 'locate) (locate-library "locate"))
+  )
+
+(defmethod ede-locate-file-in-project-impl ((loc ede-locate-locate)
+					    filesubstring)
+  "Locate with LOC occurances of FILESUBSTRING under PROJECTROOT.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  ;; We want something like:
+  ;;  /my/project/root*/filesubstring.c
+  (let* ((searchstr (concat (directory-file-name (oref loc root))
+			    "*/" filesubstring))
+	 (b (get-buffer-create "*LOCATE*"))
+	 (cd default-directory)
+	 )
+    (save-excursion
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer))
+    (require 'locate)
+    (apply 'call-process locate-command
+	   nil b nil
+	   searchstr nil)
+    (save-excursion
+      (set-buffer b)
+      (split-string (buffer-string) "\n" t))
+    )
+  )
+
+;;; GLOBAL
+;;
+(defclass ede-locate-global (ede-locate-base)
+  ()
+  "EDE Locator using GNU Global.
+Configure EDE's use of GNU Global through the cedet-global.el
+variable `cedet-global-command'.")
+
+(defmethod initialize-instance ((loc ede-locate-global)
+				&rest slots)
+  "Make sure that we can use GNU Global."
+  (require 'cedet-global)
+  ;; Get ourselves initialized.
+  (call-next-method)
+  ;; Do the checks.
+  (cedet-gnu-global-version-check)
+  (let* ((default-directory (oref loc root))
+	 (root (cedet-gnu-global-root)))
+    (when (not root)
+      (error "Cannot use GNU Global in %s"
+	     (oref loc root))))
+  )
+
+(defmethod ede-locate-ok-in-project :static ((loc ede-locate-global)
+					     root)
+  "Is it ok to use this project type under ROOT."
+  (require 'cedet-global)
+  (cedet-gnu-global-version-check)
+  (let* ((default-directory root)
+	 (newroot (cedet-gnu-global-root)))
+    newroot))
+
+(defmethod ede-locate-file-in-project-impl ((loc ede-locate-global)
+					    filesubstring)
+  "Locate with LOC occurances of FILESUBSTRING under PROJECTROOT.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  (require 'cedet-global)
+  (let ((default-directory (oref loc root)))
+    (cedet-gnu-global-expand-filename filesubstring)))
+
+;;; IDUTILS
+;;
+(defclass ede-locate-idutils (ede-locate-base)
+  ()
+  "EDE Locator using IDUtils.
+Configure EDE's use of IDUtils through the cedet-idutils.el
+file name searching variable `cedet-idutils-file-command'.")
+
+(defmethod initialize-instance ((loc ede-locate-idutils)
+				&rest slots)
+  "Make sure that we can use IDUtils."
+  ;; Get ourselves initialized.
+  (call-next-method)
+  ;; Do the checks.
+  (require 'cedet-idutils)
+  (cedet-idutils-version-check)
+  (when (not (cedet-idutils-support-for-directory (oref loc root)))
+    (error "Cannot use IDUtils in %s"
+	   (oref loc root)))
+  )
+
+(defmethod ede-locate-ok-in-project :static ((loc ede-locate-idutils)
+					     root)
+  "Is it ok to use this project type under ROOT."
+  (require 'cedet-idutils)
+  (cedet-idutils-version-check)
+  (when (cedet-idutils-support-for-directory root)
+    root))
+
+(defmethod ede-locate-file-in-project-impl ((loc ede-locate-idutils)
+					    filesubstring)
+  "Locate with LOC occurances of FILESUBSTRING under PROJECTROOT.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  (require 'cedet-idutils)
+  (let ((default-directory (oref loc root)))
+    (cedet-idutils-expand-filename filesubstring)))
+
+;;; CSCOPE
+;;
+(defclass ede-locate-cscope (ede-locate-base)
+  ()
+  "EDE Locator using Cscope.
+Configure EDE's use of Cscope through the cedet-cscope.el
+file name searching variable `cedet-cscope-file-command'.")
+
+(defmethod initialize-instance ((loc ede-locate-cscope)
+				&rest slots)
+  "Make sure that we can use Cscope."
+  ;; Get ourselves initialized.
+  (call-next-method)
+  ;; Do the checks.
+  (cedet-cscope-version-check)
+  (when (not (cedet-cscope-support-for-directory (oref loc root)))
+    (error "Cannot use Cscope in %s"
+	   (oref loc root)))
+  )
+
+(defmethod ede-locate-ok-in-project :static ((loc ede-locate-cscope)
+					     root)
+  "Is it ok to use this project type under ROOT."
+  (cedet-cscope-version-check)
+  (when (cedet-cscope-support-for-directory root)
+    root))
+
+(defmethod ede-locate-file-in-project-impl ((loc ede-locate-cscope)
+					    filesubstring)
+  "Locate with LOC occurances of FILESUBSTRING under PROJECTROOT.
+Searches are done under the current root of the EDE project
+that crated this ede locat object."
+  (let ((default-directory (oref loc root)))
+    (cedet-cscope-expand-filename filesubstring)))
+
+;;; TESTS
+;;
+;; Some testing routines.
+(defun ede-locate-test-locate (file)
+  "Test EDE Locate on FILE using LOCATE type.
+The search is done with the current EDE root."
+  (interactive "sFile: ")
+  (let ((loc (ede-locate-locate
+	      "test"
+	      :root (ede-project-root-directory
+		     (ede-toplevel)))))
+    (data-debug-new-buffer "*EDE Locate ADEBUG*")
+    (ede-locate-file-in-project loc file)
+    (data-debug-insert-object-slots loc "]"))
+  )
+
+(defun ede-locate-test-global (file)
+  "Test EDE Locate on FILE using GNU Global type.
+The search is done with the current EDE root."
+  (interactive "sFile: ")
+  (let ((loc (ede-locate-global
+	      "test"
+	      :root (ede-project-root-directory
+		     (ede-toplevel)))))
+    (data-debug-new-buffer "*EDE Locate ADEBUG*")
+    (ede-locate-file-in-project loc file)
+    (data-debug-insert-object-slots loc "]"))
+  )
+
+(defun ede-locate-test-idutils (file)
+  "Test EDE Locate on FILE using ID Utils type.
+The search is done with the current EDE root."
+  (interactive "sFile: ")
+  (let ((loc (ede-locate-idutils
+	      "test"
+	      :root (ede-project-root-directory
+		     (ede-toplevel)))))
+    (data-debug-new-buffer "*EDE Locate ADEBUG*")
+    (ede-locate-file-in-project loc file)
+    (data-debug-insert-object-slots loc "]"))
+  )
+
+(defun ede-locate-test-cscope (file)
+  "Test EDE Locate on FILE using CScope type.
+The search is done with the current EDE root."
+  (interactive "sFile: ")
+  (let ((loc (ede-locate-cscope
+	      "test"
+	      :root (ede-project-root-directory
+		     (ede-toplevel)))))
+    (data-debug-new-buffer "*EDE Locate ADEBUG*")
+    (ede-locate-file-in-project loc file)
+    (data-debug-insert-object-slots loc "]"))
+  )
+
+(provide 'ede-locate)
+;;; ede-locate.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-make.el b/site/cedet-1.0pre7/ede/ede-make.el
new file mode 100644
index 0000000..32cc042
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-make.el
@@ -0,0 +1,103 @@
+;;; ede-make.el --- General information about "make"
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-make.el,v 1.2 2009/03/12 01:06:18 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file needs to choose the version of "make" it wants to use.
+;; Whenever an executable "gmake" is available, we prefer that since
+;; it usually means GNU Make.  If it doesn't exist, use "make".
+;;
+;; Run tests on make --version to be sure it is GNU make so that
+;; logical error messages can be provided.
+
+;;; Code:
+
+(if (fboundp 'locate-file)
+    (defsubst ede--find-executable (exec)
+      "Return an expanded file name for a program EXEC on the exec path."
+      (locate-file exec exec-path))
+
+  ;; Else, older version of Emacs.
+  
+  (defsubst ede--find-executable (exec)
+    "Return an expanded file name for a program EXEC on the exec path."
+    (let ((p exec-path)
+	  (found nil))
+      (while (and p (not found))
+        (let ((f (expand-file-name exec (car p))))
+	  (if (file-exists-p f)
+	      (setq found f)))
+        (setq p (cdr p)))
+      found))
+  )
+
+(defvar ede-make-min-version "3.0"
+  "Minimum version of GNU make required.")
+
+(defcustom ede-make-command (cond ((ede--find-executable "gmake")
+				   "gmake")
+				  (t "make")) ;; What to do?
+  "The MAKE command to use for EDE when compiling.
+The makefile generated by EDE for C files uses syntax that depends on GNU Make,
+so this should be set to something that can execute GNU Make files."
+  :group 'ede
+  :type 'string)
+
+;;;###autoload
+(defun ede-make-check-version (&optional noerror)
+  "Check the version of GNU Make installed.
+The check passes if the MAKE version is no high enough, or if it
+is not GNU make.
+If NOERROR is non-nil, return t for success, nil for failure.
+If NOERROR is nil, then throw an error on failure.  Return t otherwise."
+  (interactive)
+  (let ((b (get-buffer-create "*EDE Make Version*"))
+	(cd default-directory)
+	(rev nil)
+	(ans nil)
+	)
+    (save-excursion
+      ;; Setup, and execute make.
+      (set-buffer b)
+      (setq default-directory cd)
+      (erase-buffer)
+      (call-process ede-make-command nil b nil
+		    "--version")
+      ;; Check the buffer for the string
+      (goto-char (point-min))
+      (when (looking-at "GNU Make\\(?: version\\)? \\([0-9][^,]+\\),")
+	(setq rev (match-string 1))
+	(setq ans (not (inversion-check-version rev nil ede-make-min-version))))
+
+      ;; Answer reporting.
+      (when (and (interactive-p) ans)
+	(message "GNU Make version %s.  Good enough for CEDET." rev))
+
+      (when (and (not noerror) (not ans))
+	(error "EDE requires GNU Make version %s or later.  Configure `ede-make-command' to fix"
+	       ede-make-min-version))
+      ans)))
+
+
+
+(provide 'ede-make)
+;;; ede-make.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-pconf.el b/site/cedet-1.0pre7/ede/ede-pconf.el
new file mode 100755
index 0000000..45cab09
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-pconf.el
@@ -0,0 +1,183 @@
+;;; ede-pconf.el --- configure.ac maintenance for EDE
+
+;;  Copyright (C) 1998, 1999, 2000, 2005, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project
+;; RCS: $Id: ede-pconf.el,v 1.18 2009/10/15 03:31:52 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; Code generator for autoconf configure.ac, and support files.
+
+(require 'ede-proj)
+(require 'autoconf-edit)
+
+(defvar ede-pconf-create-file-query 'ask
+  "Controls if queries are made while creating project files.
+A value of 'ask means to always ask the user before creating
+a file, such as AUTHORS.  A value of 'never means don't ask, and
+don't do it.  A value of nil means to just do it.")
+
+;;; Code:
+(defmethod ede-proj-configure-file ((this ede-proj-project))
+  "The configure.ac script used by project THIS."
+  (ede-expand-filename (ede-toplevel this) "configure.ac" t))
+
+(defmethod ede-proj-configure-test-required-file ((this ede-proj-project) file)
+  "For project THIS, test that the file FILE exists, or create it."
+  (let ((f (ede-expand-filename (ede-toplevel this) file t)))
+    (when (not (file-exists-p f))
+      (save-excursion
+	(find-file f)
+	(cond ((string= file "AUTHORS")
+	       (insert (user-full-name) " <" (user-login-name) ">"))
+	      ((string= file "NEWS")
+	       (insert "NEWS file for " (ede-name this)))
+	      (t (insert "\n")))
+	(save-buffer)
+	(when
+	    (and (eq ede-pconf-create-file-query 'ask)
+		 (not (eq ede-pconf-create-file-query 'never))
+		 (not (y-or-n-p
+		       (format "I had to create the %s file for you.  Ok? " file)))
+		 (error "Quit")))))))
+
+
+(defmethod ede-proj-configure-synchronize ((this ede-proj-project))
+  "Synchronize what we know about project THIS into configure.ac."
+  (let ((b (find-file-noselect (ede-proj-configure-file this)))
+	;;(td (file-name-directory (ede-proj-configure-file this)))
+	(targs (oref this targets))
+	(postcmd "")
+	(add-missing nil))
+    ;; First, make sure we have a file.
+    (if (not (file-exists-p (ede-proj-configure-file this)))
+	(autoconf-new-program b (oref this name) "Project.ede"))
+    (set-buffer b)
+    ;; Next, verify all targets of all subobjects.
+    (autoconf-set-version (oref this version))
+    (let ((top-level-project-local this))
+      (autoconf-set-output
+       (ede-map-all-subprojects
+	this
+	(lambda (sp) 
+	  ;; NOTE: don't put in ./Makefile - configure complains.
+	  (let ((dir (file-name-as-directory 
+		      (directory-file-name 
+		       (ede-subproject-relative-path sp top-level-project-local)))))
+	    (when (string= dir "./") (setq dir ""))
+	    ;; Use concat, because expand-file-name removes the relativeness.
+	    (concat dir "Makefile") )))))
+    ;;
+    ;; NOTE TO SELF.  TURN THIS INTO THE OFFICIAL LIST
+    ;;
+    (ede-proj-dist-makefile this)
+    ;; Loop over all targets to clean and then add themselves in.
+    (ede-map-all-subprojects 
+     this
+     (lambda (sp)
+       (ede-map-targets sp 'ede-proj-flush-autoconf)))
+    (ede-map-all-subprojects 
+     this
+     (lambda (sp)
+       (ede-map-targets this 'ede-proj-tweak-autoconf)))
+    ;; Now save
+    (save-buffer)
+    (setq postcmd "autoreconf -i;")
+
+    ;; Verify a bunch of files that are required by automake.
+    (ede-proj-configure-test-required-file this "AUTHORS")
+    (ede-proj-configure-test-required-file this "NEWS")
+    (ede-proj-configure-test-required-file this "README")
+    (ede-proj-configure-test-required-file this "ChangeLog")
+    ;; Let specific targets get missing files.
+    (mapc 'ede-proj-configure-create-missing targs)
+    ;; Verify that we have a make system.
+    (if (or (not (ede-expand-filename (ede-toplevel this) "Makefile"))
+	    ;; Now is this one of our old Makefiles?
+	    (save-excursion
+	      (set-buffer (find-file-noselect
+			   (ede-expand-filename (ede-toplevel this)
+						"Makefile" t) t))
+	      (goto-char (point-min))
+	      ;; Here is the unique piece for our makefiles.
+	      (re-search-forward "For use with: make" nil t)))
+	(setq postcmd (concat postcmd "./configure;")))
+    (if (not (string= "" postcmd))
+	(progn
+	  (compile postcmd)
+
+	  (while compilation-in-progress
+	    (accept-process-output)
+	    (sit-for 1))
+
+	  (save-excursion
+	    (set-buffer "*compilation*")
+	    (goto-char (point-max))
+
+	    (when (not (string= mode-line-process ":exit [0]"))
+	      (error "Configure failed!"))
+
+	    ;; The Makefile is now recreated by configure?
+	    (let ((b (get-file-buffer
+		      (ede-expand-filename (ede-toplevel this)
+					   "Makefile" 'newfile))))
+	      ;; This makes sure that if Makefile was loaded, and old,
+	      ;; that it gets flushed so we don't keep rebuilding
+	      ;; the autoconf system.
+	      (if b (kill-buffer b))))
+	  
+	  ))))
+
+(defmethod ede-proj-configure-recreate ((this ede-proj-project))
+  "Delete project THISes configure script and start over."
+  (if (not (ede-proj-configure-file this))
+      (error "Could not determine configure.ac for %S" (object-name this)))
+  (let ((b (get-file-buffer (ede-proj-configure-file this))))
+    ;; Destroy all evidence of the old configure.ac
+    (delete-file (ede-proj-configure-file this))
+    (if b (kill-buffer b)))
+  (ede-proj-configure-synchronize this))
+
+(defmethod ede-proj-tweak-autoconf ((this ede-proj-target))
+  "Tweak the configure file (current buffer) to accomodate THIS."
+  ;; Check the compilers belonging to THIS, and call the autoconf
+  ;; setup for those compilers.
+  (mapc 'ede-proj-tweak-autoconf (ede-proj-compilers this))
+  (mapc 'ede-proj-tweak-autoconf (ede-proj-linkers this))
+  )
+
+(defmethod ede-proj-flush-autoconf ((this ede-proj-target))
+  "Flush the configure file (current buffer) to accomodate THIS.
+By flushing, remove any cruft that may be in the file.  Subsequent
+calls to `ede-proj-tweak-autoconf' can restore items removed by flush."
+  nil)
+
+(defmethod ede-proj-configure-add-missing ((this ede-proj-target))
+  "Query if any files needed by THIS provided by automake are missing.
+Results in --add-missing being passed to automake."
+  nil)
+
+(defmethod ede-proj-configure-create-missing ((this ede-proj-target))
+  "Add any missing files for THIS by creating them."
+  nil)
+
+(provide 'ede-pconf)
+
+;;; ede-pconf.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-pmake.el b/site/cedet-1.0pre7/ede/ede-pmake.el
new file mode 100755
index 0000000..d3e409e
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-pmake.el
@@ -0,0 +1,695 @@
+;; ede-pmake.el --- EDE Generic Project Makefile code generator.
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-pmake.el,v 1.65 2010/02/08 17:58:19 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; Code generator for Makefiles.
+;;
+;; Here is how it should work:
+;; 1) Collect information about the project and targets
+;; 2) Insert header into the Makefile
+;; 3) Insert basic variables (target/source)
+;; 4) Conditional
+;;    a) Makefile
+;;       1) Insert support variables (compiler variables, etc)
+;;       2) Insert VERSION and DISTDIR
+;;       3) Specify top build dir if necessary
+;;       4) Specify compile/link commands (c, etc)
+;;       5) Specify dependency files
+;;       6) Specify all: target
+;;       7) Include dependency files
+;;       8) Insert commonized target specify rules
+;;       9) Insert clean: and dist: rules
+;;    b) Automake file
+;;       1) Insert distribution source variables for targets
+;;       2) Insert user requested rules
+
+(require 'ede-proj)
+(require 'ede-proj-obj)
+(require 'ede-proj-comp)
+
+;;; Code:
+(defmethod ede-proj-makefile-create ((this ede-proj-project) mfilename)
+  "Create a Makefile for all Makefile targets in THIS.
+MFILENAME is the makefile to generate."
+  (let ((mt nil)
+	(isdist (string= mfilename (ede-proj-dist-makefile this)))
+	(depth 0)
+	(orig-buffer nil)
+	(buff-to-kill nil)
+	)
+    ;; Find out how deep this project is.
+    (let ((tmp this))
+      (while (setq tmp (ede-parent-project tmp))
+	(setq depth (1+ depth))))
+    ;; Collect the targets that belong in a makefile.
+    (mapc
+     (lambda (obj)
+       (if (and (obj-of-class-p obj 'ede-proj-target-makefile)
+		(string= (oref obj makefile) mfilename))
+	   (setq mt (cons obj mt))))
+     (oref this targets))
+    ;; Fix the order so things compile in the right direction.
+    (setq mt (nreverse mt))
+    ;; Add in the header part of the Makefile*
+    (save-excursion
+      (setq orig-buffer (get-file-buffer mfilename))
+      (set-buffer (setq buff-to-kill (find-file-noselect mfilename)))
+      (goto-char (point-min))
+      (if (and
+	   (not (eobp))
+	   (not (looking-at "# Automatically Generated \\w+ by EDE.")))
+	  (if (not (y-or-n-p (format "Really replace %s? " mfilename)))
+	      (error "Not replacing Makefile"))
+	(message "Replace EDE Makefile"))
+      (erase-buffer)
+      (ede-srecode-setup)
+      ;; Insert a giant pile of stuff that is common between
+      ;; one of our Makefiles, and a Makefile.in
+      (ede-srecode-insert
+       "file:ede-empty"
+       "MAKETYPE"
+       (with-slots (makefile-type) this
+	 (cond ((eq makefile-type 'Makefile) "make")
+	       ((eq makefile-type 'Makefile.in) "autoconf")
+	       ((eq makefile-type 'Makefile.am) "automake")
+	       (t (error ":makefile-type in project invalid")))))
+
+      ;; Just this project's variables
+      (ede-proj-makefile-insert-variables this)
+
+      ;; Space
+      (insert "\n")
+
+      (cond
+       ((eq (oref this makefile-type) 'Makefile)
+	;; Make sure the user has the right kind of make
+	(ede-make-check-version)
+
+	(let* ((targ (if isdist (oref this targets) mt))
+	       (sp (oref this subproj))
+	       (df (apply 'append
+			  (mapcar (lambda (tg)
+				    (ede-proj-makefile-dependency-files tg))
+				  targ))))
+	  ;; Distribution variables
+	  (ede-compiler-begin-unique
+	    (mapc 'ede-proj-makefile-insert-variables targ))
+	  ;; Only add the distribution stuff in when depth != 0
+	  (let ((top  (ede-toplevel this))
+		(tmp this)
+		(subdir ""))
+	    (insert "VERSION=" (oref top version) "\n"
+		    "DISTDIR=$(top)" (oref top name) "-$(VERSION)")
+	    (while (ede-parent-project tmp)
+	      (setq subdir
+		    (concat
+		     "/"
+		     (file-name-nondirectory
+		      (directory-file-name
+		       (file-name-directory (oref tmp file))))
+		     subdir)
+		    tmp (ede-parent-project tmp)))
+	    (insert subdir "\n"))
+	  ;; Some built in variables for C code
+	  (if df
+	      (let ((tc depth))
+		(insert "top_builddir = ")
+		(while (/= 0 tc)
+		  (setq tc (1- tc))
+		  (insert "..")
+		  (if (/= tc 0) (insert "/")))
+		(insert "\n")))
+	  (insert "\n")
+	  ;; Create a variable with all the dependency files to include
+	  ;; These methods borrowed from automake.
+	  (if (and (oref this automatic-dependencies) df)
+	      (progn
+		(insert "DEP_FILES="
+			(mapconcat (lambda (f)
+				     (concat ".deps/"
+					     (file-name-nondirectory
+					      (file-name-sans-extension
+					       f)) ".P"))
+				   df " "))))
+	  ;; 
+	  ;; Insert ALL Rule
+	  ;;
+	  (insert "\n\nall:")
+	  (mapc (lambda (c)
+		  (if (and (slot-exists-p c 'partofall) (oref c partofall))
+		      ;; Only insert this rule if it is a part of ALL.
+		      (insert " " (ede-proj-makefile-target-name c))))
+		targ)
+	  (mapc (lambda (c)
+		  (insert " " (ede-name c))
+		  )
+		sp)
+	  (insert "\n\n")
+	  ;;
+	  ;; Add in the include files
+	  ;;
+	  (mapc (lambda (c)
+		  (insert "include " c "\n\n"))
+		(oref this include-file))
+	  ;; Some C inference rules
+	  ;; Dependency rules borrowed from automake.
+	  ;;
+	  ;; NOTE: This is GNU Make specific.
+	  (if (and (oref this automatic-dependencies) df)
+	      (insert "DEPS_MAGIC := $(shell mkdir .deps > /dev/null "
+		      "2>&1 || :)\n"
+		      "-include $(DEP_FILES)\n\n"))
+	  ;;
+	  ;; General makefile rules stored in the individual targets
+	  ;;
+	  (ede-compiler-begin-unique
+	    (ede-proj-makefile-insert-rules this)
+	    (mapc 'ede-proj-makefile-insert-rules targ))
+	  ;;
+	  ;; phony targets for sub projects
+	  ;;
+	  (mapc 'ede-proj-makefile-insert-subproj-rules sp)
+	  ;;
+	  ;; Distribution rules such as CLEAN and DIST
+	  ;;
+	  (when isdist
+	    (ede-proj-makefile-tags this mt)
+	    (ede-proj-makefile-insert-dist-rules this)))
+	(save-buffer))
+       ((eq (oref this makefile-type) 'Makefile.in)
+	(error "Makefile.in is not supported"))
+       ((eq (oref this makefile-type) 'Makefile.am)
+	(require 'ede-pconf)
+	;; Basic vars needed:
+	(ede-proj-makefile-automake-insert-subdirs this)
+	(ede-proj-makefile-automake-insert-extradist this)
+	;; Distribution variables
+	(let ((targ (if isdist (oref this targets) mt)))
+	  (ede-compiler-begin-unique
+	    (mapc 'ede-proj-makefile-insert-automake-pre-variables targ))
+	  (ede-compiler-begin-unique
+	    (mapc 'ede-proj-makefile-insert-source-variables targ))
+	  (ede-compiler-begin-unique
+	    (mapc 'ede-proj-makefile-insert-automake-post-variables targ))
+	  (ede-compiler-begin-unique
+	    (ede-proj-makefile-insert-user-rules this))
+	  (insert "\n# End of Makefile.am\n")
+	  (save-buffer))
+	)
+       (t (error "Unknown makefile type when generating Makefile")))
+      ;; Put the cursor in a nice place
+      (goto-char (point-min)))
+    ;; If we have an original buffer, then don't kill it.
+    (when (not orig-buffer)
+      (kill-buffer buff-to-kill))
+    ))
+
+;;; VARIABLE insertion
+;;
+(defun ede-pmake-end-of-variable ()
+  "Move to the end of the variable declaration under point."
+  (end-of-line)
+  (while (= (preceding-char) ?\\)
+    (forward-char 1)
+    (end-of-line))
+  )
+
+(defmacro ede-pmake-insert-variable-shared (varname &rest body)
+  "Add VARNAME into the current Makefile.
+Execute BODY in a location where a value can be placed."
+  `(let ((addcr t) (v ,varname))
+     (if (save-excursion
+	   (goto-char (point-max))
+	   (re-search-backward (concat "^" v "\\s-*=") nil t))
+	 (progn
+	   (goto-char (match-end 0))
+	   (ede-pmake-end-of-variable)
+	   (if (< (current-column) 40)
+	       (if (and (/= (preceding-char) ?=)
+			(/= (preceding-char) ? ))
+		   (insert " "))
+	     (insert "\\\n   "))
+	   (setq addcr nil))
+       (insert v "="))
+     ,@body
+     (if addcr (insert "\n"))
+     (goto-char (point-max))))
+(put 'ede-pmake-insert-variable-shared 'lisp-indent-function 1)
+
+(defmacro ede-pmake-insert-variable-once (varname &rest body)
+  "Add VARNAME into the current Makefile if it doesn't exist.
+Execute BODY in a location where a value can be placed."
+  `(let ((addcr t) (v ,varname))
+     (unless (re-search-backward (concat "^" v "\\s-*=") nil t)
+       (insert v "=")
+       ,@body
+       (if addcr (insert "\n"))
+       (goto-char (point-max)))
+     ))
+(put 'ede-pmake-insert-variable-once 'lisp-indent-function 1)
+
+;;; SOURCE VARIABLE NAME CONSTRUCTION
+;;
+;;;###autoload
+(defun ede-pmake-varname (obj)
+  "Convert OBJ into a variable name name.
+Change .  to _ in the variable name."
+  (let ((name (oref obj name)))
+    (while (string-match "\\." name)
+      (setq name (replace-match "_" nil t name)))
+    name))
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_YOU_FOUND_A_BUG"))
+
+;;; DEPENDENCY FILE GENERATOR LISTS
+;;
+(defmethod ede-proj-makefile-dependency-files ((this ede-proj-target))
+  "Return a list of source files to convert to dependencies.
+Argument THIS is the target to get sources from."
+  nil)
+
+;;; GENERIC VARIABLES
+;;
+(defmethod ede-proj-makefile-configuration-variables ((this ede-proj-project)
+						      configuration)
+  "Return a list of configuration variables from THIS.
+Use CONFIGURATION as the current configuration to query."
+  (cdr (assoc configuration (oref this configuration-variables))))
+
+(defmethod ede-proj-makefile-insert-variables-new ((this ede-proj-project))
+  "Insert variables needed by target THIS.
+
+NOTE: Not yet in use!  This is part of an SRecode conversion of
+      EDE that is in progress."
+;  (let ((conf-table (ede-proj-makefile-configuration-variables
+;		     this (oref this configuration-default)))
+;	(conf-done nil))
+;
+;    (ede-srecode-insert-with-dictionary
+;     "declaration:ede-vars"
+;
+;     ;; Insert all variables, and augment them with details from
+;     ;; the current configuration.
+;     (mapc (lambda (c)
+;
+;	     (let ((ldict (srecode-dictionary-add-section-dictionary
+;			   dict "VARIABLE"))
+;		   )
+;	       (srecode-dictionary-set-value ldict "NAME" (car c))
+;	       (if (assoc (car c) conf-table)
+;		   (let ((vdict (srecode-dictionary-add-section-dictionary
+;				 ldict "VALUE")))
+;		     (srecode-dictionary-set-value
+;		      vdict "VAL" (cdr (assoc (car c) conf-table)))
+;		     (setq conf-done (cons (car c) conf-done))))
+;	       (let ((vdict (srecode-dictionary-add-section-dictionary
+;			     ldict "VALUE")))
+;		 (srecode-dictionary-set-value vdict "VAL" (cdr c))))
+;	     )
+;
+;	   (oref this variables))
+;
+;     ;; Add in all variables from the configuration not allready covered.
+;     (mapc (lambda (c)
+;
+;	     (if (member (car c) conf-done)
+;		 nil
+;	       (let* ((ldict (srecode-dictionary-add-section-dictionary
+;			      dict "VARIABLE"))
+;		      (vdict (srecode-dictionary-add-section-dictionary
+;			      ldict "VALUE"))
+;		      )
+;		 (srecode-dictionary-set-value ldict "NAME" (car c))
+;		 (srecode-dictionary-set-value vdict "VAL" (cdr c))))
+;	     )
+;
+;	   conf-table)
+;
+     
+     ;; @TODO - finish off this function, and replace the below fcn
+
+;     ))
+  )
+
+(defmethod ede-proj-makefile-insert-variables ((this ede-proj-project))
+  "Insert variables needed by target THIS."
+  (let ((conf-table (ede-proj-makefile-configuration-variables
+		     this (oref this configuration-default)))
+	(conf-done nil))
+    ;; Insert all variables, and augment them with details from
+    ;; the current configuration.
+    (mapc (lambda (c)
+	    (insert (car c) "=")
+	    (if (assoc (car c) conf-table)
+		(progn
+		  (insert (cdr (assoc (car c) conf-table)) " ")
+		  (setq conf-done (cons (car c) conf-done))))
+	    (insert (cdr c) "\n"))
+	  (oref this variables))
+    ;; Add in all variables from the configuration not allready covered.
+    (mapc (lambda (c)
+	    (if (member (car c) conf-done)
+		nil
+	      (insert (car c) "=" (cdr c) "\n")))
+	  conf-table))
+  (let* ((top "")
+	 (tmp this))
+    ;; Use relativistic paths for subdirs.
+    (while (ede-parent-project tmp)
+      (setq tmp (ede-parent-project tmp)
+	    top (concat "../" top)))
+    ;; If this is the top, then use CURDIR.
+    (if (and (not (oref this metasubproject)) (string= top ""))
+	(insert "\ntop=\"$(CURDIR)\"/")
+      (insert "\ntop=" top)))
+  (insert "\nede_FILES=" (file-name-nondirectory (oref this file)) " "
+	  (file-name-nondirectory (ede-proj-dist-makefile this)) "\n"))
+
+(defmethod ede-proj-makefile-insert-source-variables ((this ede-proj-target)
+						      &optional
+						      moresource)
+  "Insert the source variables needed by THIS.
+Optional argument MORESOURCE is a list of additional sources to add to the
+sources variable."
+  (let ((sv (ede-proj-makefile-sourcevar this)))
+    ;; This variable may be shared between targets
+    (ede-pmake-insert-variable-shared (cond ((listp sv) (car sv))
+					    (t sv))
+      (insert (mapconcat (lambda (a) a) (oref this source) " "))
+      (if moresource
+	  (insert " \\\n   " (mapconcat (lambda (a) a) moresource " ") "")))))
+
+(defmethod ede-proj-makefile-insert-variables ((this ede-proj-target) &optional
+					       moresource)
+  "Insert variables needed by target THIS.
+Optional argument MORESOURCE is a list of additional sources to add to the
+sources variable."
+  (ede-proj-makefile-insert-source-variables this moresource)
+  )
+
+(defmethod ede-proj-makefile-configuration-variables ((this ede-proj-target-makefile)
+						      configuration)
+  "Return a list of configuration variables from THIS.
+Use CONFIGURATION as the current configuration to query."
+  (cdr (assoc configuration (oref this configuration-variables))))
+
+(defmethod ede-proj-makefile-insert-variables ((this ede-proj-target-makefile)
+					       &optional moresource)
+  "Insert variables needed by target THIS.
+Optional argument MORESOURCE is a list of additional sources to add to the
+sources variable."
+  (call-next-method)
+  (let* ((proj (ede-target-parent this))
+	 (conf-table (ede-proj-makefile-configuration-variables
+		      this (oref proj configuration-default)))
+	 (conf-done nil)
+	 )
+    ;; Add in all variables from the configuration not allready covered.
+    (mapc (lambda (c)
+	    (if (member (car c) conf-done)
+		nil
+	      (insert (car c) "=" (cdr c) "\n")))
+	  conf-table))
+  (let ((comp (ede-proj-compilers this))
+	(link (ede-proj-linkers this))
+	(name (ede-proj-makefile-target-name this))
+	(src (oref this source)))
+    (ede-proj-makefile-insert-object-variables (car comp) name src)
+    (while comp
+      (ede-compiler-only-once (car comp)
+	(ede-proj-makefile-insert-variables (car comp)))
+      (setq comp (cdr comp)))
+    (while link
+      (ede-linker-only-once (car link)
+	(ede-proj-makefile-insert-variables (car link)))
+      (setq link (cdr link)))))
+
+(defmethod ede-proj-makefile-insert-automake-pre-variables
+  ((this ede-proj-target))
+  "Insert variables needed by target THIS in Makefile.am before SOURCES."
+  nil)
+
+(defmethod ede-proj-makefile-insert-automake-post-variables
+  ((this ede-proj-target))
+  "Insert variables needed by target THIS in Makefile.am after SOURCES."
+  nil)
+
+;;; GARBAGE PATTERNS
+;;
+(defmethod ede-proj-makefile-garbage-patterns ((this ede-proj-project))
+  "Return a list of patterns that are considered garbage to THIS.
+These are removed with make clean."
+  (let ((mc (ede-map-targets
+	     this (lambda (c) (ede-proj-makefile-garbage-patterns c))))
+	(uniq nil))
+    (setq mc (sort (apply 'append mc) 'string<))
+    ;; Filter out duplicates from the targets.
+    (while mc
+      (if (and (car uniq) (string= (car uniq) (car mc)))
+	  nil
+	(setq uniq (cons (car mc) uniq)))
+      (setq mc (cdr mc)))
+    (nreverse uniq)))
+
+(defmethod ede-proj-makefile-garbage-patterns ((this ede-proj-target))
+  "Return a list of patterns that are considered garbage to THIS.
+These are removed with make clean."
+  ;; Get the  the source object from THIS, and use the specified garbage.
+  (let ((src (ede-target-sourcecode this))
+	(garb nil))
+    (while src
+      (setq garb (append (oref (car src) garbagepattern) garb)
+	    src (cdr src)))
+    garb))
+    
+
+;;; RULES
+;;
+(defmethod ede-proj-makefile-insert-subproj-rules ((this ede-proj-project))
+  "Insert a rule for the project THIS which should be a subproject."
+  (insert ".PHONY:" (ede-name this))
+  (newline)
+  (insert (ede-name this) ":")
+  (newline)
+  (insert "\t$(MAKE) -C " (directory-file-name (ede-subproject-relative-path this)))
+  (newline)
+  (newline)
+  )
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-proj-project))
+  "Insert rules needed by THIS target."
+  (mapc 'ede-proj-makefile-insert-rules (oref this inference-rules))
+  )
+
+(defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-project))
+  "Insert any symbols that the DIST rule should depend on.
+Argument THIS is the project that should insert stuff."
+  (mapc 'ede-proj-makefile-insert-dist-dependencies (oref this targets))
+  )
+
+(defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target))
+  "Insert any symbols that the DIST rule should depend on.
+Argument THIS is the target that should insert stuff."
+  nil)
+
+(defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target))
+  "Insert any symbols that the DIST rule should depend on.
+Argument THIS is the target that should insert stuff."
+  (ede-proj-makefile-insert-dist-dependencies this)
+  )
+
+(defmethod ede-proj-makefile-automake-insert-subdirs ((this ede-proj-project))
+  "Insert a SUBDIRS variable for Automake."
+  (ede-pmake-insert-variable-once "SUBDIRS"
+    (ede-map-subprojects
+     this (lambda (sproj)
+	    (insert " " (ede-subproject-relative-path sproj))
+	    ))))
+
+(defmethod ede-proj-makefile-automake-insert-extradist ((this ede-proj-project))
+  "Insert the EXTRADIST variable entries needed for Automake and EDE."
+  (ede-pmake-insert-variable-once "EXTRA_DIST"
+    (insert "Project.ede")))
+
+(defmethod ede-proj-makefile-insert-dist-rules ((this ede-proj-project))
+  "Insert distribution rules for THIS in a Makefile, such as CLEAN and DIST."
+  (let ((junk (ede-proj-makefile-garbage-patterns this))
+	tmp)
+    ;; Build CLEAN, DIST, TAG, and other rules here.
+    (if junk
+	(insert "\nclean:\n"
+		"\trm -f "
+		(mapconcat (lambda (c) c) junk " ")
+		"\n\n"))
+    ;; @TODO: ^^^ Clean should also recurse. ^^^
+
+    (insert ".PHONY: dist\n")
+    (insert "\ndist:")
+    (ede-proj-makefile-insert-dist-dependencies this)
+    (insert "\n")
+    (unless (or (ede-subproject-p this)
+		(oref this metasubproject))
+      ;; Only delete if we are the toplevel project.
+      (insert "\trm -rf $(DISTDIR)\n"))
+    (insert "\tmkdir $(DISTDIR)\n")	;We may need a -p, but I think not.
+    (setq tmp (oref this targets))
+    (insert "\tcp")
+    (while tmp
+      (let ((sv (ede-proj-makefile-sourcevar (car tmp))))
+	(if (listp sv)
+	    ;; Handle special case variables.
+	    (cond ((eq (cdr sv) 'share)
+		   ;; This variable may be shared between multiple targets.
+		   (if (re-search-backward (concat "\\$(" (car sv) ")")
+					   (save-excursion
+					     (beginning-of-line)
+					     (point))
+					   t)
+		       ;; If its already in the dist target, then skip it.
+		       nil
+		     (setq sv (car sv))))
+		  (t (setq sv (car sv)))))
+	(if (stringp sv)
+	    (insert " $(" sv ")"))
+	(ede-proj-makefile-insert-dist-filepatterns (car tmp))
+	(setq tmp (cdr tmp))))
+    (insert " $(ede_FILES) $(DISTDIR)\n")
+
+    ;; Call our sub projects.
+    (ede-map-subprojects
+     this (lambda (sproj)
+	    (let ((rp (directory-file-name (ede-subproject-relative-path sproj))))
+	      (insert "\t$(MAKE) -C " rp " $(MFLAGS) DISTDIR=$(DISTDIR)/" rp
+		      " dist"
+		      "\n"))))
+
+    ;; Tar up the stuff.
+    (unless (or (ede-subproject-p this)
+		(oref this metasubproject))
+      (insert "\ttar -cvzf $(DISTDIR).tar.gz $(DISTDIR)\n"
+	      "\trm -rf $(DISTDIR)\n"))
+
+    ;; Make sure the Makefile is ok.
+    (insert "\n"
+	    (file-name-nondirectory (buffer-file-name)) ": "
+	    (file-name-nondirectory (oref this file)) "\n"
+;;	    "$(EMACS) -batch Project.ede -l ede -f ede-proj-regenerate"
+	    "\t@echo Makefile is out of date!  "
+	    "It needs to be regenerated by EDE.\n"
+	    "\t@echo If you have not modified Project.ede, you can"
+	    " use 'touch' to update the Makefile time stamp.\n"
+	    "\t@false\n\n"
+	    "\n\n# End of Makefile\n")))
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-proj-target))
+  "Insert rules needed by THIS target."
+  nil)
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-proj-target-makefile))
+  "Insert rules needed by THIS target."
+  (mapc 'ede-proj-makefile-insert-rules (oref this rules))
+  (let ((c (ede-proj-compilers this)))
+    (when c
+      (mapc 'ede-proj-makefile-insert-rules c)
+      (if (oref this phony)
+	  (insert ".PHONY: " (ede-proj-makefile-target-name this) "\n"))
+      (insert (ede-proj-makefile-target-name this) ": "
+	      (ede-proj-makefile-dependencies this) "\n")
+      (ede-proj-makefile-insert-commands this)
+      )))
+
+(defmethod ede-proj-makefile-insert-commands ((this ede-proj-target-makefile))
+  "Insert the commands needed by target THIS.
+For targets, insert the commands needed by the chosen compiler."
+  (mapc 'ede-proj-makefile-insert-commands (ede-proj-compilers this))
+  (when (object-assoc t :uselinker (ede-proj-compilers this))
+    (mapc 'ede-proj-makefile-insert-commands (ede-proj-linkers this))))
+
+
+(defmethod ede-proj-makefile-insert-user-rules ((this ede-proj-project))
+  "Insert user specified rules needed by THIS target.
+This is different from `ede-proj-makefile-insert-rules' in that this
+function won't create the building rules which are auto created with
+automake."
+  (mapc 'ede-proj-makefile-insert-user-rules (oref this inference-rules)))
+
+(defmethod ede-proj-makefile-insert-user-rules ((this ede-proj-target))
+  "Insert user specified rules needed by THIS target."
+  (mapc 'ede-proj-makefile-insert-rules (oref this rules)))
+
+(defmethod ede-proj-makefile-dependencies ((this ede-proj-target-makefile))
+  "Return a string representing the dependencies for THIS.
+Some compilers only use the first element in the dependencies, others
+have a list of intermediates (object files), and others don't care.
+This allows customization of how these elements appear."
+  (let* ((c (ede-proj-compilers this))
+	 (io (ede-or (mapcar 'ede-compiler-intermediate-objects-p c)))
+	 (out nil))
+    (if io
+	(progn
+	  (while c
+	    (setq out
+		  (concat out "$(" (ede-compiler-intermediate-object-variable
+				    (car c)
+				    (ede-proj-makefile-target-name this)) ")")
+		  c (cdr c)))
+	  out)
+      (let ((sv (ede-proj-makefile-sourcevar this))
+	    (aux (oref this auxsource)))
+	(setq out
+	      (if (and (stringp sv) (not (string= sv "")))
+		  (concat "$(" sv ")")
+		""))
+	(while aux
+	  (setq out (concat out " " (car aux)))
+	  (setq aux (cdr aux)))
+	out))))
+
+;; Tags
+(defmethod ede-proj-makefile-tags ((this ede-proj-project) targets)
+  "Insert into the current location rules to make recursive TAGS files.
+Argument THIS is the project to create tags for.
+Argument TARGETS are the targets we should depend on for TAGS."
+  (insert "tags: ")
+  (let ((tg targets))
+    ;; Loop over all source variables and insert them
+    (while tg
+      (insert "$(" (ede-proj-makefile-sourcevar (car tg)) ") ")
+      (setq tg (cdr tg)))
+    (insert "\n")
+    (if targets
+	(insert "\tetags $^\n"))
+    ;; Now recurse into all subprojects
+    (setq tg (oref this subproj))
+    (while tg
+      (insert "\t$(MAKE) -C " (ede-subproject-relative-path (car tg)) " $(MFLAGS) $@\n")
+      (setq tg (cdr tg)))
+    (insert "\n")))
+
+
+(provide 'ede-pmake)
+
+;;; ede-pmake.el ends here
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/ede/ede-proj-archive.el b/site/cedet-1.0pre7/ede/ede-proj-archive.el
new file mode 100755
index 0000000..72923bc
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-archive.el
@@ -0,0 +1,66 @@
+;;; ede-proj-archive.el --- EDE Generic Project archive support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-archive.el,v 1.10 2009/09/12 22:18:11 davenar Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle object code archives in and EDE Project file.
+
+(require 'ede-pmake)
+(require 'ede-proj-obj)
+
+;;; Code:
+(defclass ede-proj-target-makefile-archive
+  (ede-proj-target-makefile-objectcode)
+  ((availablelinkers :initform (ede-archive-linker)))
+  "This target generates an object code archive.")
+
+(defvar ede-archive-linker
+  (ede-linker
+   "ede-archive-linker"
+   :name "ar"
+   :variables  '(("AR" . "ar")
+		 ("AR_CMD" . "$(AR) cr"))
+   :commands '("$(AR_CMD) lib$@.a $^")
+   :autoconf '(("AC_CHECK_PROGS" . "RANLIB, ranlib"))
+   :objectextention "")
+  "Linker object for creating an archive.")
+
+(defmethod ede-proj-makefile-insert-source-variables :BEFORE
+  ((this ede-proj-target-makefile-archive) &optional moresource)
+  "Insert bin_PROGRAMS variables needed by target THIS.
+We aren't acutally inserting SOURCE details, but this is used by the
+Makefile.am generator, so use it to add this important bin program."
+  (ede-pmake-insert-variable-shared
+      (concat "lib" (ede-name this) "_a_LIBRARIES")
+    (insert (concat "lib" (ede-name this) ".a"))))
+
+(defmethod ede-proj-makefile-garbage-patterns
+  ((this ede-proj-target-makefile-archive))
+  "Add archive name to the garbage patterns.
+This makes sure that the archive is removed with 'make clean'."
+  (let ((garb (call-next-method)))
+    (append garb (list (concat "lib" (ede-name this) ".a")))))
+
+(provide 'ede-proj-archive)
+
+;;; ede-proj-archive.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-aux.el b/site/cedet-1.0pre7/ede/ede-proj-aux.el
new file mode 100755
index 0000000..ddca9a7
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-aux.el
@@ -0,0 +1,48 @@
+;;; ede-proj-aux.el --- EDE Generic Project auxilliary file support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2007  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-aux.el,v 1.9 2008/01/20 00:09:51 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle auxiliary files (README, FAQ, etc) in and EDE Project file.
+
+(require 'ede-proj)
+(require 'ede-pmake)
+
+;;; Code:
+(defclass ede-proj-target-aux (ede-proj-target)
+  ((sourcetype :initform (ede-aux-source)))
+  "This target consists of aux files such as READMEs and COPYING.")
+
+(defvar ede-aux-source
+  (ede-sourcecode "ede-aux-source-txt"
+		  :name "Auxiliary Text"
+		  :sourcepattern "^[A-Z]+$\\|\\.txt$")
+  "Miscelaneous fields definition.")
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-aux))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_AUX"))
+
+(provide 'ede-proj-aux)
+
+;;; ede-proj-aux.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-comp.el b/site/cedet-1.0pre7/ede/ede-proj-comp.el
new file mode 100755
index 0000000..7e20cb1
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-comp.el
@@ -0,0 +1,345 @@
+;;; ede-proj-comp.el --- EDE Generic Project compiler/rule driver
+
+;;;  Copyright (C) 1999, 2000, 2001, 2004, 2005, 2007, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-comp.el,v 1.13 2010/01/07 02:13:56 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This software handles the maintenance of compiler and rule definitions
+;; for different object types.
+;;
+;; The `ede-compiler' class lets different types of project objects create
+;; definitions of compilers that can be swapped in and out for compiling
+;; source code.  Users can also define new compiler types whenever they
+;; some customized behavior.
+;;
+;; The `ede-makefile-rule' class lets users add customized rules into thier
+;; objects, and also lets different compilers add chaining rules to their
+;; behaviors.
+;;
+;; It is important that all new compiler types be registered once.  That
+;; way the chaining rules and variables are inserted into any given Makefile
+;; only once.
+;;
+;; To insert many compiler elements, wrap them in `ede-compiler-begin-unique'
+;; before calling their insert methods.
+;; To write a method that inserts a variable or rule for a compiler
+;; based object, wrap the body of your call in `ede-compiler-only-once'
+
+(require 'ede)				;source object
+(require 'autoconf-edit)
+
+;;; Types:
+(defclass ede-compilation-program (eieio-instance-inheritor)
+  ((name :initarg :name
+	 :type string
+	 :custom string
+	 :documentation "Name of this type of compiler.")
+   (variables :initarg :variables
+	      :type list
+	      :custom (repeat (cons (string :tag "Variable")
+				    (string :tag "Value")))
+	      :documentation
+	      "Variables needed in the Makefile for this compiler.
+An assoc list where each element is (VARNAME . VALUE) where VARNAME
+is a string, and VALUE is either a string, or a list of strings.
+For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.")
+   (sourcetype :initarg :sourcetype
+	       :type list ;; of symbols
+	       :documentation
+	       "A list of `ede-sourcecode' objects this class will handle.
+This is used to match target objects with the compilers and linkers
+they can use, and which files this object is interested in."
+	       :accessor ede-object-sourcecode)
+   (rules :initarg :rules
+	  :initform nil
+	  :type list
+	  :custom (repeat (object :objecttype ede-makefile-rule))
+	  :documentation
+	  "Auxiliary rules needed for this compiler to run.
+For example, yacc/lex files need additional chain rules, or inferences.")
+   (commands :initarg :commands
+	    :type list
+	    :custom (repeat string)
+	    :documentation
+	    "The commands used to execute this compiler.
+The object which uses this compiler will place these commands after
+its rule definition.")
+   (autoconf :initarg :autoconf
+	     :initform nil
+	     :type list
+	     :custom (repeat string)
+	     :documentation
+	     "Autoconf function to call if this type of compiler is used.
+When a project is in Automake mode, this defines the autoconf function to
+call to initialize automake to use this compiler.
+For example, there may be multiple C compilers, but they all probably
+use the same autoconf form.")
+   (objectextention :initarg :objectextention
+		    :type string
+		    :documentation
+		    "A string which is the extention used for object files.
+For example, C code uses .o on unix, and Emacs Lisp uses .elc.")
+   )
+  "A program used to compile or link a program via a Makefile.
+Contains everything needed to output code into a Makefile, or autoconf
+file.")
+
+(defclass ede-compiler (ede-compilation-program)
+  ((makedepends :initarg :makedepends
+		:initform nil
+		:type boolean
+		:documentation
+		"Non-nil if this compiler can make dependencies.")
+   (uselinker :initarg :uselinker
+	      :initform nil
+	      :type boolean
+	      :documentation
+	      "Non-nil if this compiler creates code that can be linked.
+This requires that the containing target also define a list of available
+linkers that can be used.")
+   )
+  "Definition for a compiler.
+Different types of objects will provide different compilers for
+different situations.")
+
+(defclass ede-linker (ede-compilation-program)
+  ()
+  "Contains information needed to link many generated object files together.")
+
+(defclass ede-makefile-rule ()
+  ((target :initarg :target
+	   :initform ""
+	   :type string
+	   :custom string
+	   :documentation "The target pattern.
+A pattern of \"%.o\" is used for inference rules, and would match object files.
+A target of \"foo.o\" explicitly matches the file foo.o.")
+   (dependencies :initarg :dependencies
+		 :initform ""
+		 :type string
+		 :custom string
+		 :documentation "Dependencies on this target.
+A pattern of \"%.o\" would match a file of the same prefix as the target
+if that target is also an inference rule pattern.
+A dependency of \"foo.c\" explicitly lists foo.c as a dependency.
+A variable such as $(name_SOURCES) will list all the source files
+belonging to the target name.")
+   (rules :initarg :rules
+	  :initform nil
+	  :type list
+	  :custom (repeat string)
+	  :documentation "Scripts to execute.
+These scripst will be executed in sh (Unless the SHELL variable is overriden).
+Do not prefix with TAB.
+Each individual element of this list can be either a string, or
+a lambda function.  (The custom element does not yet express that.")
+   (phony :initarg :phony
+	  :initform nil
+	  :type boolean
+	  :custom boolean
+	  :documentation "Is this a phony rule?
+Adds this rule to a .PHONY list."))
+  "A single rule for building some target.")
+
+;;; Code:
+(defvar ede-compiler-list nil
+  "The master list of all EDE compilers.")
+
+(defvar ede-linker-list nil
+  "The master list of all EDE compilers.")
+
+(defvar ede-current-build-list nil
+  "List of EDE compilers that have already inserted parts of themselves.
+This is used when creating a Makefile to prevend duplicate variables and
+rules from being created.")
+
+(defmethod initialize-instance :AFTER ((this ede-compiler) &rest fields)
+  "Make sure that all ede compiler objects are cached in 
+`ede-compiler-list'."
+  (add-to-list 'ede-compiler-list this))
+
+(defmethod initialize-instance :AFTER ((this ede-linker) &rest fields)
+  "Make sure that all ede compiler objects are cached in 
+`ede-linker-list'."
+  (add-to-list 'ede-linker-list this))
+
+(defmacro ede-compiler-begin-unique (&rest body)
+  "Execute BODY, making sure that `ede-current-build-list' is maintained.
+This will prevent rules from creating duplicate variables or rules."
+  `(let ((ede-current-build-list nil))
+    ,@body))
+
+(defmacro ede-compiler-only-once (object &rest body)
+  "Using OBJECT, execute BODY only once per Makefile generation."
+  `(if (not (member ,object ede-current-build-list))
+       (progn
+	 (add-to-list 'ede-current-build-list ,object)
+	 ,@body)))
+
+(defmacro ede-linker-begin-unique (&rest body)
+  "Execute BODY, making sure that `ede-current-build-list' is maintained.
+This will prevent rules from creating duplicate variables or rules."
+  `(let ((ede-current-build-list nil))
+    ,@body))
+
+(defmacro ede-linker-only-once (object &rest body)
+  "Using OBJECT, execute BODY only once per Makefile generation."
+  `(if (not (member ,object ede-current-build-list))
+       (progn
+	 (add-to-list 'ede-current-build-list ,object)
+	 ,@body)))
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec ede-compiler-begin-unique def-body)
+	    (def-edebug-spec ede-compiler-only-once (form def-body))
+	    (def-edebug-spec ede-linker-begin-unique def-body)
+	    (def-edebug-spec ede-linker-only-once (form def-body))
+	    (def-edebug-spec ede-pmake-insert-variable-shared (form def-body))
+	    ))
+
+;;; Querys
+(defun ede-proj-find-compiler (compilers sourcetype)
+  "Return a compiler from the list COMPILERS that will compile SOURCETYPE."
+  (while (and compilers
+	      (not (member sourcetype (oref (car compilers) sourcetype))))
+    (setq compilers (cdr compilers)))
+  (car-safe compilers))
+				  
+(defun ede-proj-find-linker (linkers sourcetype)
+  "Return a compiler from the list LINKERS to be used with SOURCETYPE."
+  (while (and linkers
+	      (slot-boundp (car linkers) 'sourcetype)
+	      (not (member sourcetype (oref (car linkers) sourcetype))))
+    (setq linkers (cdr linkers)))
+  (car-safe linkers))
+				  
+;;; Methods:
+(defmethod ede-proj-tweak-autoconf ((this ede-compilation-program))
+  "Tweak the configure file (current buffer) to accomodate THIS."
+  (mapcar
+   (lambda (obj)
+     (cond ((stringp obj)
+	      (autoconf-insert-new-macro obj))
+	     ((consp obj)
+	      (autoconf-insert-new-macro (car obj) (cdr obj)))
+	     (t (error "Autoconf directives must be a string, or cons cell")))
+     )
+   (oref this autoconf)))
+
+(defmethod ede-proj-flush-autoconf ((this ede-compilation-program))
+  "Flush the configure file (current buffer) to accomodate THIS."
+  nil)
+
+(defmethod ede-proj-makefile-insert-variables ((this ede-compilation-program))
+  "Insert variables needed by the compiler THIS."
+  (if (eieio-instance-inheritor-slot-boundp this 'variables)
+      (with-slots (variables) this
+	(mapcar
+	 (lambda (var)
+	   (ede-pmake-insert-variable-once (car var)
+	     (let ((cd (cdr var)))
+	       (if (listp cd)
+		   (mapc (lambda (c) (insert " " c)) cd)
+		 (insert cd)))))
+	 variables))))
+
+(defmethod ede-compiler-intermediate-objects-p ((this ede-compiler))
+  "Return non-nil if THIS has intermediate object files.
+If this compiler creates code that can be linked together,
+then the object files created by the compiler are considered intermediate."
+  (oref this uselinker))
+
+(defmethod ede-compiler-intermediate-object-variable ((this ede-compiler)
+						      targetname)
+  "Return a string based on THIS representing a make object variable.
+TARGETNAME is the name of the target that these objects belong to."
+  (concat targetname "_OBJ"))
+
+(defmethod ede-proj-makefile-insert-object-variables ((this ede-compiler)
+						      targetname sourcefiles)
+  "Insert an OBJ variable to specify object code to be generated for THIS.
+The name of the target is TARGETNAME as a string.  SOURCEFILES is the list of
+files to be objectified.
+Not all compilers do this."
+  (if (ede-compiler-intermediate-objects-p this)
+      (progn
+	(insert (ede-compiler-intermediate-object-variable this targetname)
+		"=")
+	(let ((src (oref this sourcetype)))
+	  (mapc (lambda (s)
+		  (let ((ts src))
+		    (while (and ts (not (ede-want-file-source-p
+					 (symbol-value (car ts)) s)))
+		      (setq ts (cdr ts)))
+		    ;; Only insert the object if the given file is a major
+		    ;; source-code type.
+		    (if ts;; a match as a source file.
+			(insert " " (file-name-sans-extension s)
+				(oref this objectextention)))))
+		sourcefiles)
+	  (insert "\n")))))
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-compilation-program))
+  "Insert rules needed for THIS compiler object."
+  (ede-compiler-only-once this
+    (mapc 'ede-proj-makefile-insert-rules (oref this rules))))
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-makefile-rule))
+  "Insert rules needed for THIS rule object."
+  (if (oref this phony) (insert ".PHONY: (oref this target)\n"))
+  (insert (oref this target) ": " (oref this dependencies) "\n\t"
+	  (mapconcat (lambda (c) c) (oref this rules) "\n\t")
+	  "\n\n"))
+
+(defmethod ede-proj-makefile-insert-commands ((this ede-compilation-program))
+  "Insert the commands needed to use compiler THIS.
+The object creating makefile rules must call this method for the
+compiler it decides to use after inserting in the rule."
+  (when (slot-boundp this 'commands)
+    (with-slots (commands) this
+      (mapc
+       (lambda (obj) (insert "\t"
+			     (cond ((stringp obj)
+				    obj)
+				   ((and (listp obj)
+					 (eq (car obj) 'lambda))
+				    (funcall obj))
+				   (t
+				    (format "%S" obj)))
+			     "\n"))
+       commands))
+    (insert "\n")))
+
+;;; Some details about our new macro
+;;
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec ede-compiler-begin-unique def-body)))
+(put 'ede-compiler-begin-unique 'lisp-indent-function 0)
+(put 'ede-compiler-only-once 'lisp-indent-function 1)
+(put 'ede-linker-begin-unique 'lisp-indent-function 0)
+(put 'ede-linker-only-once 'lisp-indent-function 1)
+
+(provide 'ede-proj-comp)
+
+;;; ede-proj-comp.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-elisp.el b/site/cedet-1.0pre7/ede/ede-proj-elisp.el
new file mode 100755
index 0000000..2226963
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-elisp.el
@@ -0,0 +1,438 @@
+;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-elisp.el,v 1.40 2009/10/01 02:24:22 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle Emacs Lisp in and EDE Project file.
+
+(require 'ede-proj)
+(require 'ede-pmake)
+(require 'ede-pconf)
+
+;;; Code:
+(defclass ede-proj-target-elisp (ede-proj-target-makefile)
+  ((menu :initform nil)
+   (keybindings :initform nil)
+   (phony :initform t)
+   (sourcetype :initform (ede-source-emacs))
+   (availablecompilers :initform (ede-emacs-compiler 
+				  ede-xemacs-compiler
+				  ede-emacs-preload-compiler))
+   (aux-packages :initarg :aux-packages
+		 :initform nil
+		 :type list
+		 :custom (repeat string)
+		 :documentation "Additional packages needed.
+There should only be one toplevel package per auxiliary tool needed.
+These packages location is found, and added to the compile time
+load path."
+   )
+   (pre-load-packages :initarg :pre-load-packages
+		      :initform nil
+		      :type list
+		      :custom (repeat string)
+		      :documentation "Additional packages to pre-load.
+Each package name will be loaded with `require'.
+Each package's directory should also appear in :aux-packages via a package name.
+You must use the `ede-emacs-preload-compiler' if you provide values in this slot.")
+   )
+  "This target consists of a group of lisp files.
+A lisp target may be one general program with many separate lisp files in it.")
+
+(defvar ede-source-emacs
+  (ede-sourcecode "ede-emacs-source"
+		  :name "Emacs Lisp"
+		  :sourcepattern "\\.el$"
+		  :garbagepattern '("*.elc"))
+  "Emacs Lisp source code definition.")
+
+(defvar ede-emacs-compiler
+  (ede-compiler
+   "ede-emacs-compiler"
+   :name "emacs"
+   :variables '(("EMACS" . "emacs")
+		("EMACSFLAGS" . "-batch --no-site-file"))
+   :commands
+   '("@echo \"(add-to-list 'load-path nil)\" > $@-compile-script"
+     "for loadpath in . ${LOADPATH}; do \\"
+     "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> $@-compile-script; \\"
+     "done;"
+     "@echo \"(setq debug-on-error t)\" >> $@-compile-script"
+     "\"$(EMACS)\" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^"
+     )
+   :autoconf '("AM_PATH_LISPDIR")
+   :sourcetype '(ede-source-emacs)
+;   :objectextention ".elc"
+   )
+  "Compile Emacs Lisp programs.")
+
+(defvar ede-emacs-preload-compiler
+  (clone
+   ede-emacs-compiler "ede-emacs-preload-compiler"
+   :commands
+   '("@echo \"(add-to-list 'load-path nil)\" > $@-compile-script"
+     "for loadpath in . ${LOADPATH}; do \\"
+     "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> $@-compile-script; \\"
+     "done;"
+     "for preload in ${ELISPPRELOAD}; do \\"
+     "   echo \"(load \\\"$$preload\\\")\" >> $@-compile-script; \\"
+     "done;"
+     "@echo \"(setq debug-on-error t)\" >> $@-compile-script"
+     "\"$(EMACS)\" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^"
+     ))
+  "Compile Emacs Lisp programs with preload libraries.")
+	 
+
+(defvar ede-xemacs-compiler
+  (clone ede-emacs-compiler "ede-xemacs-compiler"
+	 :name "xemacs"
+	 :variables '(("EMACS" . "xemacs")))
+  "Compile Emacs Lisp programs with XEmacs.")
+
+;;; Claiming files
+(defmethod ede-buffer-mine ((this ede-proj-target-elisp) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER.
+Lays claim to all .elc files that match .el files in this target."
+  (if (string-match "\\.elc$" (buffer-file-name buffer))
+      (let ((fname 
+	     (concat
+	      (file-name-sans-extension (buffer-file-name buffer))
+	      ".el")
+	     ))
+	;; Is this in our list.
+	(member fname (oref this auxsource))
+	)
+    (call-next-method) ; The usual thing.
+    ))
+
+;;; Emacs Lisp Compiler
+;;; Emacs Lisp Target
+(defun ede-proj-elisp-packages-to-loadpath (packages)
+  "Convert a list of PACKAGES, to a list of load path."
+  (let ((paths nil)
+	(ldir nil))
+    (while packages
+      (or (setq ldir (locate-library (car packages)))
+	  (error "Cannot find package %s" (car packages)))
+      (let* ((fnd (file-name-directory ldir))
+	     (rel (file-relative-name fnd))
+	     (full nil)
+	     )
+	;; Make sure the relative name isn't to far off
+	(when (string-match "^\\.\\./\\.\\./\\.\\./\\.\\." rel)
+	  (setq full fnd))
+	;; Do the setup.
+	(setq paths (cons (or full rel) paths)
+	      packages (cdr packages))))
+    paths))
+
+(defmethod project-compile-target ((obj ede-proj-target-elisp))
+  "Compile all sources in a Lisp target OBJ.
+Bonus: Return a cons cell: (COMPILED . UPTODATE)."
+  (let* ((proj (ede-target-parent obj))
+	 (dir (oref proj directory))
+	 (comp 0)
+	 (utd 0))
+    (mapc (lambda (src)
+	    (let* ((fsrc (expand-file-name src dir))
+		   (elc (concat (file-name-sans-extension fsrc) ".elc"))
+		   )
+	      (if (or (not (file-exists-p elc))
+		      (file-newer-than-file-p fsrc elc))
+		  (progn
+		    (setq comp (1+ comp))
+		    (byte-compile-file fsrc))
+		(setq utd (1+ utd)))))
+	    (oref obj source))
+    (message "All Emacs Lisp sources are up to date in %s" (object-name obj))
+    (cons comp utd)
+    ))
+
+(defmethod ede-update-version-in-source ((this ede-proj-target-elisp) version)
+  "In a Lisp file, updated a version string for THIS to VERSION.
+There are standards in Elisp files specifying how the version string
+is found, such as a `-version' variable, or the standard header."
+  (if (and (slot-boundp this 'versionsource)
+	   (oref this versionsource))
+      (let ((vs (oref this versionsource))
+	    (match nil))
+	(while vs
+	  (save-excursion
+	    (set-buffer (find-file-noselect
+			 (ede-expand-filename this (car vs))))
+	    (goto-char (point-min))
+	    (let ((case-fold-search t))
+	      (if (re-search-forward "-version\\s-+\"\\([^\"]+\\)\"" nil t)
+		  (progn
+		    (setq match t)
+		    (delete-region (match-beginning 1)
+				   (match-end 1))
+		    (goto-char (match-beginning 1))
+		    (insert version)))))
+	  (setq vs (cdr vs)))
+	(if (not match) (call-next-method)))))
+
+
+;;; Makefile generation functions
+;;
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-elisp))
+  "Return the variable name for THIS's sources."
+  (cond ((ede-proj-automake-p) '("lisp_LISP" . share))
+	(t (concat (ede-pmake-varname this) "_LISP"))))
+
+(defun ede-proj-makefile-insert-loadpath-items (items)
+  "Insert a sequence of ITEMS into the Makefile LOADPATH variable."
+    (when items
+      (ede-pmake-insert-variable-shared "LOADPATH"
+	(let ((begin (save-excursion (re-search-backward "\\s-*="))))
+	  (while items
+	    (when (not (save-excursion
+			 (re-search-backward
+			  (concat "\\s-" (regexp-quote (car items)) "[ \n\t\\]")
+			  begin t)))
+	      (insert " " (car items)))
+	    (setq items (cdr items)))))
+      ))
+
+(defun ede-proj-makefile-insert-preload-items (items)
+  "Insert a sequence of ITEMS into the Makefile ELISPPRELOAD variable."
+    (when items
+      (ede-pmake-insert-variable-shared "ELISPPRELOAD"
+	(let ((begin (save-excursion (re-search-backward "\\s-*="))))
+	  (while items
+	    (when (not (save-excursion
+			 (re-search-backward
+			  (concat "\\s-" (regexp-quote (car items)) "[ \n\t\\]")
+			  begin t)))
+	      (insert " " (car items)))
+	    (setq items (cdr items)))))
+      ))
+
+(defmethod ede-proj-makefile-insert-variables :AFTER ((this ede-proj-target-elisp))
+  "Insert variables needed by target THIS."
+  (let ((newitems (if (oref this aux-packages)
+		      (ede-proj-elisp-packages-to-loadpath
+		       (oref this aux-packages))))
+	(newpreload (oref this pre-load-packages))
+	)
+    (ede-proj-makefile-insert-loadpath-items newitems)
+    (when newpreload
+      (ede-proj-makefile-insert-preload-items newpreload))))
+
+(defun ede-proj-elisp-add-path (path)
+  "Add path PATH into the file if it isn't already there."
+  (goto-char (point-min))
+  (if (re-search-forward (concat "(cons \\\""
+				 (regexp-quote path))
+			 nil t)
+      nil;; We have it already
+    (if (re-search-forward "(cons nil" nil t)
+	(progn
+	  ;; insert stuff here
+	  (end-of-line)
+	  (insert "\n"
+		  "   echo \"(setq load-path (cons \\\""
+		  path
+		  "\\\" load-path))\" >> script")
+	  )
+      (error "Don't know how to update load path"))))
+
+(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp))
+  "Tweak the configure file (current buffer) to accomodate THIS."
+  (call-next-method)
+  ;; Ok, now we have to tweak the autoconf provided `elisp-comp' program.
+  (let ((ec (ede-expand-filename this "elisp-comp" 'newfile)))
+    (if (or (not ec) (not (file-exists-p ec)))
+	(message "No elisp-comp file.  There may be compile errors?  Rerun a second time.")
+      (save-excursion
+	(if (file-symlink-p ec)
+	    (progn
+	      ;; Desymlinkafy
+	      (rename-file ec (concat ec ".tmp"))
+	      (copy-file (concat ec ".tmp") ec)
+	      (delete-file (concat ec ".tmp"))))
+	(set-buffer (find-file-noselect ec t))
+	(ede-proj-elisp-add-path "..")
+	(let ((paths (ede-proj-elisp-packages-to-loadpath
+		      (oref this aux-packages))))
+	  ;; Add in the current list of paths
+	  (while paths
+	    (ede-proj-elisp-add-path (car paths))
+	    (setq paths (cdr paths))))
+	(save-buffer)) )))
+
+(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp))
+  "Flush the configure file (current buffer) to accomodate THIS."
+  ;; Remove crufty old paths from elisp-compile
+  (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))
+	)
+    (if (and ec (file-exists-p ec))
+	(save-excursion
+	  (set-buffer (find-file-noselect ec t))
+	  (goto-char (point-min))
+	  (while (re-search-forward "(cons \\([^ ]+\\) load-path)"
+				    nil t)
+	    (let ((path (match-string 1)))
+	      (if (string= path "nil")
+		  nil
+		(delete-region (save-excursion (beginning-of-line) (point))
+			       (save-excursion (end-of-line)
+					       (forward-char 1)
+					       (point))))))))))
+
+;;;
+;; Autoload generators
+;;
+(defclass ede-proj-target-elisp-autoloads (ede-proj-target-elisp)
+  ((availablecompilers :initform (ede-emacs-cedet-autogen-compiler))
+   (aux-packages :initform ("cedet-autogen"))
+   (phony :initform t)
+   (autoload-file :initarg :autoload-file
+		  :initform "loaddefs.el"
+		  :type string
+		  :custom string
+		  :documentation "The file that autoload definitions are placed in.
+There should be one load defs file for a given package.  The load defs are created
+for all Emacs Lisp sources that exist in the directory of the created target.")
+   (autoload-dirs :initarg :autoload-dirs
+		  :initform nil
+		  :type list
+		  :custom (repeat string)
+		  :documentation "The directories to scan for autoload definitions.
+If nil defaults to the current directory.")
+   )
+  "Target that builds an autoload file.
+Files do not need to be added to this target.")
+
+
+;;; Claiming files
+(defmethod ede-buffer-mine ((this ede-proj-target-elisp-autoloads) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER.
+Lays claim to all .elc files that match .el files in this target."
+  (if (string-match
+       (concat (regexp-quote (oref this autoload-file)) "$")
+       (buffer-file-name buffer))
+      t
+    (call-next-method) ; The usual thing.
+    ))
+
+;; Compilers
+(defvar ede-emacs-cedet-autogen-compiler
+  (ede-compiler
+   "ede-emacs-autogen-compiler"
+   :name "emacs"
+   :variables '(("EMACS" . "emacs"))
+   :commands
+   '("@echo \"(add-to-list 'load-path nil)\" > $@-compile-script"
+     "for loadpath in . ${LOADPATH}; do \\"
+     "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> $@-compile-script; \\"
+     "done;"
+     "@echo \"(require 'cedet-autogen)\" >> $@-compile-script"
+     "\"$(EMACS)\" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)"
+     )
+   :sourcetype '(ede-source-emacs)
+   )
+  "Build an autoloads file.")
+
+(defmethod ede-proj-compilers ((obj ede-proj-target-elisp-autoloads))
+  "List of compilers being used by OBJ.
+If the `compiler' slot is empty, get the car of the compilers list."
+  (let ((comp (oref obj compiler)))
+    (if comp
+	(if (listp comp)
+	    (setq comp (mapcar 'symbol-value comp))
+	  (setq comp (list (symbol-value comp))))
+      ;; Get the first element from our list of compilers.
+      (let ((avail (mapcar 'symbol-value (oref obj availablecompilers))))
+	(setq comp (list (car avail)))))
+    comp))
+
+(defmethod ede-proj-makefile-insert-source-variables ((this ede-proj-target-elisp-autoloads)
+						      &optional
+						      moresource)
+  "Insert the source variables needed by THIS.
+Optional argument MORESOURCE is a list of additional sources to add to the
+sources variable."
+  nil)
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-elisp-autoloads))
+  "Return the variable name for THIS's sources."
+  nil) ; "LOADDEFS")
+
+(defmethod ede-proj-makefile-dependencies ((this ede-proj-target-elisp-autoloads))
+  "Return a string representing the dependencies for THIS.
+Always return an empty string for an autoloads generator."
+  "")
+
+(defmethod ede-proj-makefile-insert-variables :AFTER ((this ede-proj-target-elisp-autoloads))
+  "Insert variables needed by target THIS."
+  (ede-pmake-insert-variable-shared "LOADDEFS"
+    (insert (oref this autoload-file)))
+  (ede-pmake-insert-variable-shared "LOADDIRS"
+    (insert (mapconcat 'identity
+                       (or (oref this autoload-dirs) '("."))
+                       " ")))
+  )
+
+(defmethod project-compile-target ((obj ede-proj-target-elisp-autoloads))
+  "Create or update the autoload target."
+  (require 'cedet-autogen)
+  (let ((default-directory (ede-expand-filename obj ".")))
+    (apply 'cedet-update-autoloads
+	   (oref obj autoload-file)
+	   (oref obj autoload-dirs))
+    ))
+
+(defmethod ede-update-version-in-source ((this ede-proj-target-elisp-autoloads) version)
+  "In a Lisp file, updated a version string for THIS to VERSION.
+There are standards in Elisp files specifying how the version string
+is found, such as a `-version' variable, or the standard header."
+  nil)
+
+(defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target-elisp-autoloads))
+  "Insert any symbols that the DIST rule should depend on.
+Emacs Lisp autoload files ship the generated .el files.
+Argument THIS is the target which needs to insert an info file."
+  ;; In some cases, this is ONLY the index file.  That should generally
+  ;; be ok.
+  (insert " " (ede-proj-makefile-target-name this))
+  )
+
+(defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target-elisp-autoloads))
+  "Insert any symbols that the DIST rule should distribute.
+Emacs Lisp autoload files ship the generated .el files.
+Argument THIS is the target which needs to insert an info file."
+  (insert " " (oref this autoload-file))
+  )
+
+(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads))
+  "Tweak the configure file (current buffer) to accomodate THIS."
+  (error "Autoloads not supported in autoconf yet."))
+
+(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads))
+  "Flush the configure file (current buffer) to accomodate THIS."
+  nil)
+
+(provide 'ede-proj-elisp)
+
+;;; ede-proj-elisp.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-info.el b/site/cedet-1.0pre7/ede/ede-proj-info.el
new file mode 100755
index 0000000..1d35c3c
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-info.el
@@ -0,0 +1,186 @@
+;;; ede-proj-info.el --- EDE Generic Project texinfo support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2004, 2007, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-info.el,v 1.23 2009/01/31 13:12:03 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle texinfo in and EDE Project file.
+
+(require 'ede-pmake)
+
+;;; Code:
+(defclass ede-proj-target-makefile-info (ede-proj-target-makefile)
+  ((menu :initform nil)
+   (keybindings :initform nil)
+   (availablecompilers :initform (ede-makeinfo-compiler
+				  ede-texi2html-compiler))
+   (sourcetype :initform (ede-makeinfo-source))
+   (mainmenu :initarg :mainmenu
+	     :initform ""
+	     :type string
+	     :custom string
+	     :documentation "The main menu resides in this file.
+All other sources should be included independently."))
+  "Target for a single info file.")
+
+(defvar ede-makeinfo-source
+  (ede-sourcecode "ede-makeinfo-source"
+		  :name "Texinfo"
+		  :sourcepattern "\\.texi?$"
+		  :garbagepattern '("*.info*" "*.html"))
+  "Texinfo source code definition.")
+
+(defvar ede-makeinfo-compiler
+  (ede-compiler
+   "ede-makeinfo-compiler"
+   :name "makeinfo"
+   :variables '(("MAKEINFO" . "makeinfo"))
+   :commands '("$(MAKEINFO) $<")
+   :autoconf '(("AC_CHECK_PROG" . "MAKEINFO, makeinfo"))
+   :sourcetype '(ede-makeinfo-source)
+   )
+  "Compile texinfo files into info files.")
+
+(defvar ede-texi2html-compiler
+  (ede-compiler
+   "ede-texi2html-compiler"
+   :name "texi2html"
+   :variables '(("TEXI2HTML" . "makeinfo -html"))
+   :commands '("makeinfo -o $@ $<")
+   :sourcetype '(ede-makeinfo-source)
+   )
+  "Compile texinfo files into html files.")
+
+;;; Makefile generation
+;;
+(defmethod ede-proj-configure-add-missing
+  ((this ede-proj-target-makefile-info))
+  "Query if any files needed by THIS provided by automake are missing.
+Results in --add-missing being passed to automake."
+  (not (ede-expand-filename (ede-toplevel) "texinfo.tex")))
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-info))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_TEXINFOS"))
+
+(defmethod ede-proj-makefile-insert-source-variables
+  ((this ede-proj-target-makefile-info) &optional moresource)
+  "Insert the source variables needed by THIS info target.
+Optional argument MORESOURCE is a list of additional sources to add to the
+sources variable.
+Does the usual for Makefile mode, but splits source into two variables
+when working in Automake mode."
+  (if (not (ede-proj-automake-p))
+      (call-next-method)
+    (let* ((sv (ede-proj-makefile-sourcevar this))
+	   (src (copy-sequence (oref this source)))
+	   (menu (or (oref this menu) (car src))))
+      (setq src (delq menu src))
+      ;; the info_TEXINFOS variable is probably shared
+      (ede-pmake-insert-variable-shared "info_TEXINFOS"
+	(insert menu))
+      ;; Now insert the rest of the source elsewhere
+      (ede-pmake-insert-variable-shared sv
+	(insert (mapconcat 'identity src " ")))
+      (if moresource
+	  (error "Texinfo files should not have moresource")))))
+
+(defun ede-makeinfo-find-info-filename (source)
+  "Find the info filename produced by SOURCE texinfo file."
+  (let ((opened (get-file-buffer source))
+	(buffer (or (get-file-buffer source)
+		    (find-file-noselect source nil t)))
+	info)
+    (with-current-buffer buffer
+      (save-excursion
+	(goto-char (point-min))
+	(and (re-search-forward "^@setfilename\\s-+\\([^.]+\\).info$" nil t)
+	     (setq info (match-string 1)))))
+    (unless (eq buffer opened)
+      (kill-buffer buffer))
+    info))
+
+(defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-info))
+  "Return the name of the main target for THIS target."
+  ;; The target should be the main-menu file name translated to .info.
+  (let* ((source (if (not (string= (oref this mainmenu) ""))
+ 		     (oref this mainmenu)
+ 		   (car (oref this source))))
+ 	 (info (ede-makeinfo-find-info-filename source)))
+    (concat (or info (file-name-sans-extension source)) ".info")))
+
+(defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target-makefile-info))
+  "Insert any symbols that the DIST rule should depend on.
+Texinfo files want to insert generated `.info' files.
+Argument THIS is the target which needs to insert an info file."
+  ;; In some cases, this is ONLY the index file.  That should generally
+  ;; be ok.
+  (insert " " (ede-proj-makefile-target-name this))
+  )
+
+(defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target-makefile-info))
+  "Insert any symbols that the DIST rule should depend on.
+Texinfo files want to insert generated `.info' files.
+Argument THIS is the target which needs to insert an info file."
+  ;; In some cases, this is ONLY the index file.  That should generally
+  ;; be ok.
+  (insert " " (ede-proj-makefile-target-name this) "*")
+  )
+
+;  (let ((n (ede-name this)))
+;    (if (string-match "\\.info$" n)
+;	n
+;      (concat n ".info"))))
+
+(defmethod object-write ((this ede-proj-target-makefile-info))
+  "Before committing any change to THIS, make sure the mainmenu is first."
+   (let ((mm (oref this mainmenu))
+	 (s (oref this source))
+	 (nl nil))
+     (if (or (string= mm "") (not mm) (string= mm (car s)))
+	 nil
+       ;; Make sure that MM is first in the list of items.
+       (setq nl (cons mm (delq mm s)))
+       (oset this source nl)))
+   (call-next-method))
+
+(defmethod ede-documentation ((this ede-proj-target-makefile-info))
+  "Return a list of files that provides documentation.
+Documentation is not for object THIS, but is provided by THIS for other
+files in the project."
+  (let* ((src (oref this source))
+	 (proj (ede-target-parent this))
+	 (dir (oref proj directory))
+	 (out nil)
+	 )
+    ;; convert src to full file names.
+    (while src
+      (setq out (cons
+		 (expand-file-name (car src) dir)
+		 out))
+      (setq src (cdr src)))
+    ;; Return it
+    out))
+
+(provide 'ede-proj-info)
+
+;;; ede-proj-info.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-misc.el b/site/cedet-1.0pre7/ede/ede-proj-misc.el
new file mode 100755
index 0000000..d7e67bb
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-misc.el
@@ -0,0 +1,93 @@
+;;; ede-proj-nusc.el --- EDE Generic Project Emacs Lisp support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2008  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-misc.el,v 1.8 2008/12/28 22:11:30 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle miscelaneous compilable projects in and EDE Project file.
+;; This misc target lets the user link in custom makefiles to an EDE
+;; project.
+
+(require 'ede-pmake)
+(require 'ede-proj-comp)
+
+;;; Code:
+(defclass ede-proj-target-makefile-miscelaneous (ede-proj-target-makefile)
+  ((sourcetype :initform (ede-misc-source))
+   (availablecompilers :initform (ede-misc-compile))
+   (submakefile :initarg :submakefile
+		:initform ""
+		:type string
+		:custom string
+		:documentation
+		"Miscellaneous sources which have a specialized makefile.
+The sub-makefile is used to build this target.")
+   )
+   "Miscelaneous target type.
+A user-written makefile is used to build this target.
+All listed sources are included in the distribution.")
+
+(defvar ede-misc-source
+  (ede-sourcecode "ede-misc-source"
+		  :name "Miscelaneous"
+		  :sourcepattern ".*")
+  "Miscelaneous fiels definition.")
+
+(defvar ede-misc-compile
+  (ede-compiler "ede-misc-compile"
+		:name "Sub Makefile"
+		:commands
+		'(
+		  )
+		:autoconf nil
+		:sourcetype '(ede-misc-source)
+		)
+  "Compile code via a sub-makefile.")
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-miscelaneous))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_MISC"))
+
+(defmethod ede-proj-makefile-dependency-files
+  ((this ede-proj-target-makefile-miscelaneous))
+  "Return a list of files which THIS target depends on."
+  (with-slots (submakefile) this
+    (cond ((string= submakefile "")
+	   nil)
+	  ((not submakefile)
+	   nil)
+	  (t (list submakefile)))))
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-proj-target-makefile-miscelaneous))
+  "Create the make rule needed to create an archive for THIS."
+  ;; DO NOT call the next method.  We will never have any compilers,
+  ;; or any dependencies, or stuff like this.  This rull will lets us
+  ;; deal with it in a nice way.
+  (insert (ede-name this) ": ")
+  (with-slots (submakefile) this
+    (if (string= submakefile "")
+	(insert "\n\t@\n\n")
+      (insert submakefile "\n" "\t$(MAKE) -f " submakefile "\n\n"))))
+
+(provide 'ede-proj-misc)
+
+;;; ede-proj-misc.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-obj.el b/site/cedet-1.0pre7/ede/ede-proj-obj.el
new file mode 100755
index 0000000..e3bda6f
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-obj.el
@@ -0,0 +1,287 @@
+;;; ede-proj-obj.el --- EDE Generic Project Object code generation support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2005, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-obj.el,v 1.17 2009/10/14 02:18:42 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handles a superclass of target types which create object code in
+;; and EDE Project file.
+
+(require 'ede-proj)
+;; (require 'ede-pmake)
+;; The above require is needed for ede-pmake-varname, but introduces
+;; a circular dependency.  Leave it be.
+
+(defvar ede-proj-objectcode-dodependencies nil
+  "Flag specifies to do automatic dependencies.")
+
+;;; Code:
+(defclass ede-proj-target-makefile-objectcode (ede-proj-target-makefile)
+  (;; Give this a new default
+   (configuration-variables :initform ("debug" . (("CFLAGS" . "-g")
+						  ("LDFLAGS" . "-g"))))
+   ;; @TODO - add an include path.
+   (availablecompilers :initform (ede-gcc-compiler
+				  ede-g++-compiler
+				  ede-gfortran-compiler
+				  ede-gfortran-module-compiler
+				  ;; More C and C++ compilers, plus
+				  ;; fortran or pascal can be added here
+				  ))
+   (availablelinkers :initform (ede-g++-linker
+				ede-cc-linker
+				ede-ld-linker
+				ede-gfortran-linker
+				;; Add more linker thingies here.
+				))
+   (sourcetype :initform (ede-source-c
+			  ede-source-c++
+			  ede-source-f77
+			  ede-source-f90
+			  ;; ede-source-other
+			  ;; This object should take everything that
+			  ;; gets compiled into objects like fortran
+			  ;; and pascal.
+			  ))
+   )
+  "Abstract class for Makefile based object code generating targets.
+Belonging to this group assumes you could make a .o from an element source
+file.")
+
+(defclass ede-object-compiler (ede-compiler)
+  ((uselinker :initform t)
+   (dependencyvar :initarg :dependencyvar
+		  :type list
+		  :custom (cons (string :tag "Variable")
+				(string :tag "Value"))
+		  :documentation
+		  "A variable dedicated to dependency generation."))
+  "Ede compiler class for source which must compiler, and link.")
+
+;;; C/C++ Compilers and Linkers
+;;
+(defvar ede-source-c
+  (ede-sourcecode "ede-source-c"
+		  :name "C"
+		  :sourcepattern "\\.c$"
+		  :auxsourcepattern "\\.h$"
+		  :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
+  "C source code definition.")
+
+(defvar ede-gcc-compiler
+  (ede-object-compiler
+   "ede-c-compiler-gcc"
+   :name "gcc"
+   :dependencyvar '("C_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
+   :variables '(("CC" . "gcc")
+		("C_COMPILE" .
+		 "$(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
+   :rules (list (ede-makefile-rule
+		 "c-inference-rule"
+		 :target "%.o"
+		 :dependencies "%.c"
+		 :rules '("@echo '$(C_COMPILE) -c $<'; \\"
+			  "$(C_COMPILE) $(C_DEPENDENCIES) -o $@ -c $<"
+			  )
+		 ))
+   :autoconf '("AC_PROG_CC" "AC_PROG_GCC_TRADITIONAL")
+   :sourcetype '(ede-source-c)
+   :objectextention ".o"
+   :makedepends t
+   :uselinker t)
+  "Compiler for C sourcecode.")
+
+(defvar ede-cc-linker
+  (ede-linker
+   "ede-cc-linker"
+   :name "cc"
+   :sourcetype '(ede-source-c)
+   :variables  '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
+   :commands '("$(C_LINK) -o $@ $^")
+   :objectextention "")
+   "Linker for C sourcecode.")
+
+(defvar ede-source-c++
+  (ede-sourcecode "ede-source-c++"
+		  :name "C++"
+		  :sourcepattern "\\.\\(cpp\\|cc\\|cxx\\)$"
+		  :auxsourcepattern "\\.\\(hpp\\|hh?\\|hxx\\)$"
+		  :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
+  "C++ source code definition.")
+
+(defvar ede-g++-compiler
+  (ede-object-compiler
+   "ede-c-compiler-g++"
+   :name "g++"
+   :dependencyvar '("CXX_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
+   :variables '(("CXX" "g++")
+		("CXX_COMPILE" .
+		 "$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
+		)
+   :rules (list (ede-makefile-rule
+		 "c++-inference-rule"
+		 :target "%.o"
+		 :dependencies "%.cpp"
+		 :rules '("@echo '$(CXX_COMPILE) -c $<'; \\"
+			  "$(CXX_COMPILE) $(CXX_DEPENDENCIES) -o $@ -c $<"
+			  )
+		 ))
+   :autoconf '("AC_PROG_CXX")
+   :sourcetype '(ede-source-c++)
+   :objectextention ".o"
+   :makedepends t
+   :uselinker t)
+  "Compiler for C sourcecode.")
+
+(defvar ede-g++-linker
+  (ede-linker
+   "ede-g++-linker"
+   :name "g++"
+   ;; Only use this linker when c++ exists.
+   :sourcetype '(ede-source-c++)
+   :variables  '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L."))
+   :commands '("$(CXX_LINK) -o $@ $^")
+   :autoconf '("AC_PROG_CXX")
+   :objectextention "")
+  "Linker needed for c++ programs.")
+
+;;; Fortran Compiler/Linker
+;;
+;; Contributed by David Engster
+(defvar ede-source-f90
+  (ede-sourcecode "ede-source-f90"
+		  :name "Fortran 90/95"
+		  :sourcepattern "\\.[fF]9[05]$"
+		  :auxsourcepattern "\\.incf$"
+		  :garbagepattern '("*.o" "*.mod" ".deps/*.P"))
+  "Fortran 90/95 source code definition.")
+
+(defvar ede-source-f77
+  (ede-sourcecode "ede-source-f77"
+		  :name "Fortran 77"
+		  :sourcepattern "\\.\\([fF]\\|for\\)$"
+		  :auxsourcepattern "\\.incf$"
+		  :garbagepattern '("*.o" ".deps/*.P"))
+  "Fortran 77 source code definition.")
+
+(defvar ede-gfortran-compiler
+  (ede-object-compiler
+   "ede-f90-compiler-gfortran"
+   :name "gfortran"
+   :dependencyvar '("F90_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
+   :variables '(("F90" . "gfortran")
+		("F90_COMPILE" .
+		 "$(F90) $(DEFS) $(INCLUDES) $(F90FLAGS)"))
+   :rules (list (ede-makefile-rule
+		 "f90-inference-rule"
+		 :target "%.o"
+		 :dependencies "%.f90"
+		 :rules '("@echo '$(F90_COMPILE) -c $<'; \\"
+			  "$(F90_COMPILE) $(F90_DEPENDENCIES) -o $@ -c $<"
+			  )
+		 ))
+   :sourcetype '(ede-source-f90 ede-source-f77)
+   :objectextention ".o"
+   :makedepends t
+   :uselinker t)
+  "Compiler for Fortran sourcecode.")
+
+(defvar ede-gfortran-module-compiler
+  (clone ede-gfortran-compiler
+	 "ede-f90-module-compiler-gfortran"
+	 :name "gfortranmod"
+	 :sourcetype '(ede-source-f90)
+	 :commands '("$(F90_COMPILE) -c $^")
+	 :objectextention ".mod"
+	 :uselinker nil)
+  "Compiler for Fortran 90/95 modules.")
+
+
+(defvar ede-gfortran-linker
+  (ede-linker
+   "ede-gfortran-linker"
+   :name "gfortran"
+   :sourcetype '(ede-source-f90 ede-source-f77)
+   :variables  '(("F90_LINK" . "$(F90) $(CFLAGS) $(LDFLAGS) -L."))
+   :commands '("$(F90_LINK) -o $@ $^")
+   :objectextention "")
+  "Linker needed for Fortran programs.")
+
+;;; Generic Linker
+;;
+(defvar ede-ld-linker
+  (ede-linker
+   "ede-ld-linker"
+   :name "ld"
+   :variables  '(("LD" . "ld")
+		 ("LD_LINK" . "$(LD) $(LDFLAGS) -L."))
+   :commands '("$(LD_LINK) -o $@ $^")
+   :objectextention "")
+  "Linker needed for c++ programs.")
+
+;;; The EDE object compiler
+;;
+(defmethod ede-proj-makefile-insert-variables ((this ede-object-compiler))
+  "Insert variables needed by the compiler THIS."
+  (call-next-method)
+  (if (eieio-instance-inheritor-slot-boundp this 'dependencyvar)
+      (with-slots (dependencyvar) this
+	  (insert (car dependencyvar) "=")
+	  (let ((cd (cdr dependencyvar)))
+	    (if (listp cd)
+		(mapc (lambda (c) (insert " " c)) cd)
+	      (insert cd))
+	    (insert "\n")))))
+
+;;; EDE Object target type methods
+;;
+(defmethod ede-proj-makefile-sourcevar
+  ((this ede-proj-target-makefile-objectcode))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_SOURCES"))
+
+(defmethod ede-proj-makefile-dependency-files
+  ((this ede-proj-target-makefile-objectcode))
+  "Return a list of source files to convert to dependencies.
+Argument THIS is the target to get sources from."
+  (append (oref this source) (oref this auxsource)))
+
+(defmethod ede-proj-makefile-insert-variables ((this ede-proj-target-makefile-objectcode)
+					       &optional moresource)
+  "Insert variables needed by target THIS.
+Optional argument MORESOURCE is not used."
+  (let ((ede-proj-objectcode-dodependencies
+	 (oref (ede-target-parent this) automatic-dependencies)))
+    (call-next-method)))
+
+(defmethod ede-buffer-header-file((this ede-proj-target-makefile-objectcode)
+				  buffer)
+  "There are no default header files."
+  (or (call-next-method)
+      ;; Ok, nothing obvious. Try looking in ourselves.
+      (let ((h (oref this auxsource)))
+	;; Add more logic here when the problem is better understood.
+	(car-safe h))))
+
+(provide 'ede-proj-obj)
+
+;;; ede-proj-obj.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-prog.el b/site/cedet-1.0pre7/ede/ede-proj-prog.el
new file mode 100755
index 0000000..7b972a9
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-prog.el
@@ -0,0 +1,134 @@
+;;; ede-proj-prog.el --- EDE Generic Project program support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2005, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-prog.el,v 1.11 2009/10/16 18:33:04 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle building programs from object files in and EDE Project file.
+
+(require 'ede-pmake)
+(require 'ede-proj-obj)
+
+;;; Code:
+(defclass ede-proj-target-makefile-program
+  (ede-proj-target-makefile-objectcode)
+  ((ldlibs :initarg :ldlibs
+	   :initform nil
+	   :type list
+	   :custom (repeat (string :tag "Library"))
+	   :documentation
+	   "Libraries, such as \"m\" or \"Xt\" which this program depends on.
+The linker flag \"-l\" is automatically prepended.  Do not include a \"lib\"
+prefix, or a \".so\" suffix.
+
+Note: Currently only used for Automake projects."
+	   )
+   (ldflags :initarg :ldflags
+	    :initform nil
+	    :type list
+	    :custom (repeat (string :tag "Link Flag"))
+	    :documentation
+	    "Additional flags to add when linking this target.
+Use ldlibs to add addition libraries.  Use this to specify specific
+options to the linker.
+
+Note: Not currently used.  This bug needs to be fixed.")
+   )
+   "This target is an executable program.")
+
+(defmethod ede-proj-makefile-insert-automake-pre-variables
+  ((this ede-proj-target-makefile-program))
+  "Insert bin_PROGRAMS variables needed by target THIS."
+  (ede-pmake-insert-variable-shared "bin_PROGRAMS"
+    (insert (ede-name this)))
+  (call-next-method))
+
+(defmethod ede-proj-makefile-insert-automake-post-variables
+  ((this ede-proj-target-makefile-program))
+  "Insert bin_PROGRAMS variables needed by target THIS."
+  (ede-pmake-insert-variable-shared
+      (concat (ede-name this) "_LDADD")
+    (mapc (lambda (c) (insert " -l" c)) (oref this ldlibs)))
+  ;; For other targets THIS depends on
+  ;;
+  ;; NOTE: FIX THIS
+  ;;
+  ;;(ede-pmake-insert-variable-shared
+  ;;    (concat (ede-name this) "_DEPENDENCIES")
+  ;;  (mapcar (lambda (d) (insert d)) (oref this FOOOOOOOO)))
+  (call-next-method))
+
+(defmethod ede-proj-makefile-insert-rules ((this ede-proj-target-makefile-program))
+  "Insert rules needed by THIS target."
+  (let ((ede-proj-compiler-object-linkflags
+	 (mapconcat 'identity (oref this ldflags) " ")))
+    (with-slots (ldlibs) this
+      (if ldlibs
+	  (setq ede-proj-compiler-object-linkflags
+		(concat ede-proj-compiler-object-linkflags
+			" -l"
+			(mapconcat 'identity ldlibs " -l")))))
+    (call-next-method)))
+
+(defmethod project-debug-target ((obj ede-proj-target-makefile-program))
+  "Debug a program target OBJ."
+  (let ((tb (get-buffer-create " *padt*"))
+	(dd (if (not (string= (oref obj path) ""))
+		(oref obj path)
+	      default-directory))
+	(cmd nil))
+    (unwind-protect
+	(progn
+	  (set-buffer tb)
+	  (setq default-directory dd)
+	  (setq cmd (read-from-minibuffer
+		     "Run (like this): "
+		     (concat (symbol-name ede-debug-program-function)
+			     " " (ede-target-name obj))))
+	  (funcall ede-debug-program-function cmd))
+      (kill-buffer tb))))
+
+(defmethod project-run-target ((obj ede-proj-target-makefile-program) &optional command)
+  "Run a program target OBJ.
+Optional COMMAND is the command to run in place of asking the user."
+  (require 'ede-shell)
+  (let ((tb (get-buffer-create " *padt*"))
+	(dd (if (not (string= (oref obj path) ""))
+		(oref obj path)
+	      default-directory))
+	(cmd nil))
+    (unwind-protect
+	(progn
+	  (set-buffer tb)
+	  (setq default-directory dd)
+	  (setq cmd (or command
+			(read-from-minibuffer
+			 "Run (like this): "
+			 (concat "./" (ede-target-name obj)))))
+	  (ede-shell-run-something obj cmd)
+	  )
+      (kill-buffer tb))))
+
+
+(provide 'ede-proj-prog)
+
+;;; ede-proj-prog.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-scheme.el b/site/cedet-1.0pre7/ede/ede-proj-scheme.el
new file mode 100755
index 0000000..ce4e606
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-scheme.el
@@ -0,0 +1,50 @@
+;;; ede-proj-scheme.el --- EDE Generic Project scheme (guile) support
+
+;;;  Copyright (C) 1998, 1999, 2000  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make, scheme
+;; RCS: $Id: ede-proj-scheme.el,v 1.8 2005/09/30 20:17:08 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle scheme (Guile) in and EDE Project file.
+;; This is a specialized do nothing class.
+
+(require 'ede-proj)
+(require 'autoconf-edit)
+
+;;; Code:
+(defclass ede-proj-target-scheme (ede-proj-target)
+  ((menu :initform nil)
+   (keybindings :initform nil)
+   (interpreter :initarg :interpreter
+		:initform "guile"
+		:type string
+		:custom string
+		:documentation "The preferred interpreter for this code.")
+   )
+  "This target consists of scheme files.")
+
+(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-scheme))
+  "Tweak the configure file (current buffer) to accomodate THIS."
+  (autoconf-insert-new-macro "AM_INIT_GUILE_MODULE"))
+
+(provide 'ede-proj-scheme)
+
+;;; ede-proj-scheme.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-shared.el b/site/cedet-1.0pre7/ede/ede-proj-shared.el
new file mode 100755
index 0000000..83449e3
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-shared.el
@@ -0,0 +1,209 @@
+;;; ede-proj-shared.el --- EDE Generic Project shared library support
+
+;;;  Copyright (C) 1998, 1999, 2000, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-shared.el,v 1.13 2009/10/15 03:02:58 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle shared object libraries in and EDE Project file.
+;; Tries to deal with libtool and non-libtool situations.
+
+(require 'ede-pmake)
+(require 'ede-proj-prog)
+
+;;; THIS NEEDS WORK.  SEE ede-proj-obj.
+
+;;; Code:
+(defclass ede-proj-target-makefile-shared-object
+  (ede-proj-target-makefile-program)
+  ((availablecompilers :initform (ede-gcc-libtool-shared-compiler
+				  ;;ede-gcc-shared-compiler
+				  ede-g++-libtool-shared-compiler
+				  ;;ede-g++-shared-compiler
+				  ))
+   (availablelinkers :initform (ede-cc-linker-libtool
+				ede-g++-linker-libtool
+				;; Add more linker thingies here.
+				))
+   (ldflags :custom (repeat (string :tag "Libtool flag"))
+	    :documentation
+	    "Additional flags to add when linking this shared library.
+Use ldlibs to add addition libraries.")
+   )
+  "This target generates a shared library.")
+
+(defvar ede-gcc-shared-compiler
+  (clone ede-gcc-compiler
+	 "ede-c-shared-compiler"
+	 :name "gcc -shared"
+	 :variables '(("CC_SHARED" . "gcc")
+		      ("C_SHARED_COMPILE" .
+		       "$(CC_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
+;	 :linkvariables '(("C_SHARED_LINK" .
+;			   "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
+;			  )
+;	 :commands '("$(C_SHARED_LINK) %s")
+	 ;; @TODO - addative modification of autoconf.
+	 :autoconf '("AC_PROG_LIBTOOL")
+	 )
+  "Compiler for C sourcecode.")
+
+(defvar ede-gcc-libtool-shared-compiler
+  (clone ede-gcc-shared-compiler
+	 "ede-c-shared-compiler-libtool"
+	 :name "libtool"
+	 :variables '(("LIBTOOL" . "libtool")
+		      ("LTCOMPILE" . "$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
+		      ("LTLINK" . "$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@")
+		      )
+	 :rules (list (ede-makefile-rule
+		       "cc-inference-rule-libtool"
+		       :target "%.o"
+		       :dependencies "%.c"
+		       :rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
+				"$(LTCOMPILE) -o $@ $<"
+				)
+		       ))
+	 :autoconf '("AC_PROG_LIBTOOL")
+	 )
+  "Compiler for C sourcecode.")
+
+(defvar ede-cc-linker-libtool
+  (clone ede-cc-linker
+   "ede-cc-linker-libtool"
+   :name "cc shared"
+   ;; Only use this linker when c++ exists.
+   :sourcetype '(ede-source-c++)
+   :variables  '(
+		 ("LIBTOOL" . "libtool")
+		 ("LTLINK" . "$(LIBTOOL) --tag=CPP --mode=link $(CPP) $(CFLAGS) $(LDFLAGS) -L. -o $@")
+		 )
+   :commands '("$(LTLINK) -o $@ $^")
+   :autoconf '("AC_PROG_LIBTOOL")
+   :objectextention ".la")
+  "Linker needed for c++ programs.")
+
+(defvar ede-g++-shared-compiler
+  (clone ede-g++-compiler
+	 "ede-c++-shared-compiler"
+	 :name "gcc -shared"
+	 :variables '(("CXX_SHARED" . "g++")
+		      ("CXX_SHARED_COMPILE" .
+		       "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
+	 ;; @TODO - addative modification of autoconf.
+	 :autoconf '("AC_PROG_LIBTOOL")
+	 )
+  "Compiler for C sourcecode.")
+
+(defvar ede-g++-libtool-shared-compiler
+  (clone ede-g++-shared-compiler
+	 "ede-c++-shared-compiler-libtool"
+	 :name "libtool"
+	 :variables '(("CXX" "g++")
+		      ("LIBTOOL" . "libtool")
+		      ("LTCOMPILE" . "$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
+		      )
+	 :rules (list (ede-makefile-rule
+		       "c++-inference-rule-libtool"
+		       :target "%.o"
+		       :dependencies "%.c"
+		       :rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
+				"$(LTCOMPILE) -o $@ $<"
+				)
+		       ))
+	 :autoconf '("AC_PROG_LIBTOOL")
+	 )
+  "Compiler for C sourcecode.")
+
+(defvar ede-g++-linker-libtool
+  (clone ede-g++-linker
+   "ede-g++-linker-libtool"
+   :name "g++"
+   ;; Only use this linker when c++ exists.
+   :sourcetype '(ede-source-c++)
+   :variables  '(
+		 ("LIBTOOL" . "libtool")
+		 ("LTLINK" . "$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(CFLAGS) $(LDFLAGS) -L. -o $@")
+		 )
+   :commands '("$(LTLINK) -o $@ $^")
+   :autoconf '("AC_PROG_LIBTOOL")
+   :objectextention ".la")
+  "Linker needed for c++ programs.")
+
+;;; @TODO - C++ versions of the above.
+
+(when nil
+  		 
+	       
+  (insert;; These C to O rules create dependencies
+   "%.o: %.c\n"
+   "\t@echo '$(COMPILE) -c $<'; \\\n"
+   "\t$(COMPILE)"
+   (if (oref this automatic-dependencies)
+       " -Wp,-MD,.deps/$(*F).P"
+     "")
+   " -c $<\n\n")
+  (if have-libtool
+      (insert;; These C to shared o rules create pic code.
+       "%.lo: %.c\n"
+       "\t@echo '$(LTCOMPILE) -c $<'; \\\n"
+       "\t$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<\n"
+       "\t@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \\\n"
+       "\t      < .deps/$(*F).p > .deps/$(*F).P\n"
+       "\t@-rm -f .deps/$(*F).p\n\n"))
+  )
+
+(defmethod ede-proj-configure-add-missing
+  ((this ede-proj-target-makefile-shared-object))
+  "Query if any files needed by THIS provided by automake are missing.
+Results in --add-missing being passed to automake."
+  (not (and (ede-expand-filename (ede-toplevel) "ltconfig")
+	    (ede-expand-filename (ede-toplevel) "ltmain.sh"))))
+
+(defmethod ede-proj-makefile-insert-automake-pre-variables
+  ((this ede-proj-target-makefile-shared-object))
+  "Insert bin_PROGRAMS variables needed by target THIS.
+We aren't acutally inserting SOURCE details, but this is used by the
+Makefile.am generator, so use it to add this important bin program."
+  (ede-pmake-insert-variable-shared "lib_LTLIBRARIES"
+     (insert (concat "lib" (ede-name this) ".la"))))
+
+(defmethod ede-proj-makefile-insert-automake-post-variables
+  ((this ede-proj-target-makefile-shared-object))
+  "Insert bin_PROGRAMS variables needed by target THIS.
+We need to override -program which has an LDADD element."
+  nil)
+
+(defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-shared-object))
+  "Return the name of the main target for THIS target."
+  ;; We need some platform gunk to make the .so change to .sl, or .a,
+  ;; depending on the platform we are going to compile against.
+  (concat "lib" (ede-name this) ".la"))
+
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-shared-object))
+  "Return the variable name for THIS's sources."
+  (if (eq (oref (ede-target-parent this) makefile-type) 'Makefile.am)
+      (concat "lib" (oref this name) "_la_SOURCES")
+    (call-next-method)))
+
+(provide 'ede-proj-shared)
+
+;;; ede-proj-shared.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj-skel.el b/site/cedet-1.0pre7/ede/ede-proj-skel.el
new file mode 100755
index 0000000..e1ad48e
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj-skel.el
@@ -0,0 +1,338 @@
+;;; ede-proj-%NAME%.el --- EDE Generic Project ...
+
+;;;  Copyright (C) 1999, 2000, 2001, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj-skel.el,v 1.14 2009/10/15 17:38:18 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handles ...
+;; in an EDE Project file.
+
+;; To use this skeleton file, replace all occurances of words in %PERCENT%
+;; with the proper named you wish to use.
+;;
+;; If a function is commented out, then you probably don't need to
+;; override it.  If it is not commented out, you probably need it, but
+;; there is no requirement that you implement it.
+
+(require 'ede-proj)
+
+;;; Code:
+;; This defines the class you will use.  In general, you probably
+;; want to inherit from `ede-proj-target-makefile', which has built it
+;; support for the creation of Makefile rules.  If your type will
+;; never use a Makefile, inherit from `ede-proj-target'.
+(defclass ede-proj-target-%NAME% (ede-proj-target-%PARENT%)
+  (;; Use these two items to modify the target specificy menu.
+   ;;(menu :initform nil)
+   ;;(keybindings :initform nil)
+   (sourcetype :initform (ede-source-%NAME%))   
+   ;;(availablecompilers :initform (ede-%NAME%-compiler))
+   ;; Add your specialized fields here
+   )
+  "Class for ....")
+
+;; Register you class with the ede target manager.  This enables
+;; the creation of targets of your type for users.
+(ede-proj-register-target "%NAME%" ede-proj-target-%NAME%)
+
+;;; COMPILER SUPPORT
+;;
+;; Support for specialized compilers for your object.
+
+;; Create an instance of a source code type which knows how to
+;; recognize your sourcecode.  The symbol created is used to cross
+;; reference targets compilers, and source files.
+(defvar ede-source-%NAME%
+  (ede-sourcecode "ede-%NAME%-source"
+		  :name "%LONGNAME%"
+		  :sourcepattern "\\.%EXT%$"
+		  :garbagepattern '("*.%EXT%"))
+  "Emacs Lisp source code definition.")
+
+;; It should be very rare to need to create a subclass of the `ede-compiler'
+;; object.  Do this if you need to override any of the base methods following
+;; this definition.
+;;(defclass ede-compiler-%NAME% (ede-compiler)
+;;  ()
+;;  "Specialized compiler for %NAME%")
+
+;; This variable is important to set if you are planning on supporting 
+;; a compiled form of your sources via a Makefile or Makefile.am
+;; If you do not create or use a compiler, remove the compiler init line
+;; from the class you create.
+;; You may create as many compiler elements as may be available for the
+;; type of source code you are starting with.
+;;
+;; If you have your own compiler class, then use the correct class initializer
+;; below.
+(defvar ede-%NAME%-compiler
+  (ede-compiler 
+   "ede-%NAME%-compiler"
+   :name "%NAME%"
+   :variables '(("%NAME-COMPILER%" . "%compiler-and-flags%"))
+   :commands
+   (list "$(%NAME-COMPILER%) -o $@ $^"
+	 )
+   :autoconf '("AC_%COMPILER-MACRO-FOR-AUTONAME-OR-nil%"))
+  "Compiler that can be used with `ede-proj-target-%NAME%'.")
+
+;;(defmethod ede-proj-tweak-autoconf ((this ede-compiler-%NAME%))
+;;  "Tweak the configure file (current buffer) to accomodate THIS."
+;;  (%do-stuff%)
+;;  (call-next-method)
+;;  (%do-other-stuff%))
+;;
+;;(defmethod ede-proj-flush-autoconf ((this ede-compiler-%NAME%))
+;;  "Flush the configure file (current buffer) to accomodate THIS."
+;;  (%do-stuff%)
+;;  (call-next-method)
+;;  (%do-other-stuff%))
+;;
+;;(defmethod ede-proj-makefile-insert-variables ((this ede-compiler-%NAME%))
+;;  "Insert variables needed by the compiler THIS."
+;;  (call-next-method)
+;;  (ede-compiler-only-once
+;;     (%do-stuff%)))
+;;
+;;(defmethod ede-proj-makefile-insert-rules ((this ede-compiler-%NAME%))
+;;  "Insert rules needed for THIS compiler object."
+;;  (call-next-method)
+;;  (ede-compiler-only-once
+;;     (%do-stuff%)))
+;;
+;; This is the method you are most likely to need to override if
+;; you need to create your own compiler class.
+;;(defmethod ede-proj-makefile-insert-commands ((this ede-compiler-%NAME%))
+;;  "Insert the commands needed to use compiler THIS."
+;;  (%do-stuff%)
+;;  (call-next-method)
+;;  (%do-other-stuff%))
+
+;;; EIEIO maintenance methods
+;;
+
+;; The chances of needing to implement this are near zero, but if
+;; you need to perform some action when the user hits "apply", this
+;; is the way to do it.
+;;(defmethod eieio-done-customizing ((target ede-proj-target-%NAME%))
+;;  "Called when a user finishes customizing this target."
+;;  (call-next-method)
+;;  (%do-my-stuff%))
+
+;;; EDE target smarts methods
+;;
+
+;; NOTE: This method is not generally necessary because the work can be
+;;       accomplished with the :sourcetype class property.
+;; This function lets you define what types of files you want to claim.
+;; Defining this provides a convenience for uses by not offering your
+;; target type for files you don't care about.
+;; (defmethod ede-want-file-p ((obj ede-proj-target-%NAME%) file)
+;;  "Return t if OBJ wants to own FILE."
+;;  (string-match "\\.%MYEXTENSION%$" file))
+
+;; When a buffer is read in, EDE checks to see which target this
+;; buffer belongs to.  The default method for all targets checks
+;; the file name against the list of known source files.
+;; If your target has additional source files stored elsewhere,
+;; this is how you will check.
+;;(defmethod ede-buffer-mine ((this ede-proj-target-%NAME%) buffer)
+;;  "Return non-nil if object THIS lays claim to the file in BUFFER."
+;;  (or (call-next-method)
+;;      (%additional-checks-here%)
+;;      ))
+
+;; This function lets you take files being added to your target and
+;; stick them into different slots.  This is useful if you have
+;; compilable sources and auxiliary files related to compilation that
+;; do not directly get compiled.  (Although in that case, you probably
+;; want to extend `ede-proj-target-makefile-objectcode'
+;;(defmethod project-add-file ((this ede-proj-target-%NAME%) file)
+;;  "Add to target THIS the current buffer represented as FILE."
+;;  (if (not (%do-something-special%))
+;;	(call-next-method)
+;;    (%do-my-special-stuff%)))
+
+;; Reverse tactic as above.
+;;(defmethod project-remove-file  ((target ede-proj-target-makefile-objectcode)
+;;				  file)
+;;  "For TARGET, remove FILE."
+;;  (if (not (%do-something-special%))
+;;	(call-next-method)
+;;    (%do-my-special-stuff%)))
+
+;; Provides a simple hook to do cleanup work if this target is deleted
+;; from a project.
+;;(defmethod project-delete-target ((this ede-proj-target-%NAME%))
+;;  "Delete THIS target from its parent project."
+;;  (%cleanup%)
+;;  (call-next-method))
+
+;;; EDE target do user stuff methods
+;;
+
+;; This method lets you control what commands are run when a user
+;; wants to compile your target.  If you inherit from a makefile
+;; target, then you can use "call-next-method" with a new
+;; command if needed, or just comment this out.
+;;(defmethod project-compile-target ((obj ede-proj-target-%NAME%)
+;;				     &optional command)
+;;  "Compile the current target OBJ.
+;;Argument COMMAND is the command to use for compiling the target
+;;if the user, or child class wishes to modify it."
+;;  (or (call-next-method %"new command string"%)
+;;      (project-compile-project (ede-current-project) %"some command"%)
+;;	(%do-stuff%)))
+
+;; This method lets you define how the target reacts to a debug
+;; command.  Comment this out if you do not support a debugger.
+;; If you don't support debugging, don't forget to also remove
+;; any specialized keybindings and menu items in the class definition.
+(defmethod project-debug-target ((obj ede-proj-target-%NAME%))
+  "Run the current target OBJ in an debugger."
+  (%do-stuff%))
+
+(defmethod project-run-target ((obj ede-proj-target-%NAME%))
+  "Run the current target OBJ in an debugger."
+  (%do-stuff%))
+
+;;; EDE project makefile code generation methods
+;;
+
+;; The name of the variable used in a Makefile for your main sources.
+;; Attempt to use automake conventions so that your target is easy to
+;; port when/if automake is supported by ede-proj.
+(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-%NAME%))
+  "Return the variable name for THIS's sources."
+  (concat (ede-pmake-varname this) "_%AUTOMAKE-VARIABLE-CONVENTION%"))
+
+;; Your main target in the Makefile may depend on additional source
+;; dependencies.  Use this to add more stuff.
+;;(defmethod ede-proj-makefile-dependency-files ((this ede-proj-target-%NAME%))
+;;  "Return a list of source files to convert to dependencies.
+;;Argument THIS is the target to get sources from."
+;;  (append (call-next-method) (%get-more-dependencies%)))
+
+;; This is a clever way of packing more files into your main source
+;; variable.  Only works if your "next" method is ede-proj-target.
+;;(defmethod ede-proj-makefile-insert-source-variables
+;;           ((this ede-proj-target-%NAME%) &optional moresource)
+;;  "Insert variables needed by target THIS."
+;;  (call-next-method this (oref this %moresourceslotname%))
+
+;; This method lets you add more variables specific to your type of target.
+;;(defmethod ede-proj-makefile-insert-variables ((this ede-proj-target-%NAME%)
+;;                                                &optional moresource)
+;;  "Insert variables needed by target THIS."
+;;  (call-next-method)
+;;  (insert "other variable thing"))
+
+;; This returns a string for the dependencies as they 
+(defmethod ede-proj-makefile-dependencies ((this ede-proj-target-%NAME%))
+  "Return a string representing the dependencies for THIS."
+  (or (call-next-method)
+      (%do-some-stuff%)))
+
+;; This is one of the most important methods which defines rules to
+;; place into a makefile for building.  If you inherit from
+;; `ede-proj-target-makefile', then this is the primary build
+;; mechanism.  If you can create a compiler object instead, then
+;; you probably don't have to do anything with this method.
+;; If you have an emacs-centric build method, then this
+;; is a secondary build method (for a distribution, for example.)
+;; It can also contain auxiliary make commands in addition to
+;; the main rules needed if not covered by the compiler object.
+;;(defmethod ede-proj-makefile-insert-rules ((this ede-proj-target-%NAME%))
+;;  "Insert rules needed by THIS target."
+;;  (insert ... ;; Create aux rules here
+;;        )
+;;  (call-next-method) ;; catch user-rules case and build main rules
+;;  (insert ... ;; Code to fill in the commands, or add more rules later.
+;;	  ))
+
+;; This function allows modifictions to configure.in.
+;; Only useful when a user specifies automake mode in EDE project.
+;; This may not be necessary, but is needed if special programs,
+;; libraries, header files, or other configurable items are needed.
+;;
+;; See the autoconf editing routines, most of which are safe
+;; to call multiple times.
+;(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-%NAME%))
+;  "Tweak the configure file (current buffer) to accomodate THIS."
+;  (autoconf-...)
+;  )
+
+;; This function allows the target to flush left overs.
+;; ie, if a previous configuration included some macro, then
+;;     you can remove it with this one.
+;; A subsequent call to `ede-proj-tweak-autoconf' will restore
+;; any changes if needed.
+;(defmethod ede-proj-flush-autoconf ((this ede-proj-%NAME%))
+;  "Flush the configure file (current buffer) to accomodate THIS."
+;  nil)
+
+;; This function is used to find a header file in which prototypes from
+;; BUFFER go.  This is used by advanced features for which this type
+;; of behavior is useful.  This feature is used mainly by tools
+;; using the SEMANTIC BOVINATOR http://cedet.sourceforge.net/semantic.shtml
+;; to perform advanced language specific actions.
+;;(defmethod ede-buffer-header-file((this ede-proj-target-%NAME%) buffer)
+;;  "Return the name of a file in which prototypes go."
+;;  (oref this ...))
+
+;; This function is used to return documentation files.  If this target
+;; contains documentation files, then return those files.  If this target
+;; does not provide documentation, delete this method.
+;;(defmethod ede-documentation ((this ede-target-%NAME%))
+;;  "Return a list of files that provides documentation.
+;;Documentation is not for object THIS, but is provided by THIS for other
+;;files in the project."
+;;  nil)
+
+;;; EDE speedbar browsing enhancements
+;;
+;; In general, none of these need to be defined unless your have slots
+;; for auxiliary source files.
+
+;; This lets you add buttons of things your target contains which may
+;; not be shown be default.
+;;
+;; You will need to tweak the functions used when clicking on the
+;; expand icon (maybe) and the item name (maybe). Leave those alone
+;; if they are simple source files.
+;;(defmethod eieio-speedbar-child-make-tag-lines ((this ede-proj-target-%NAME%))
+;;  "Create buttons for items belonging to THIS."
+;;  (call-next-method) ;; get the default buttons inserted.
+;;  (with-slots (%SOME-SLOTS%) this
+;;    (mapcar (lambda (car)
+;;		(speedbar-make-tag-line 'bracket ?+
+;;					'ede-tag-file
+;;					(concat (oref this :path) car)
+;;					car
+;;					'ede-file-find
+;;					(concat (oref this :path) car)
+;;					'speedbar-file-face depth))
+;;	      %A-SLOT%)))
+
+(provide 'ede-proj-%NAME%)
+
+;;; ede-proj-%NAME%.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-proj.el b/site/cedet-1.0pre7/ede/ede-proj.el
new file mode 100755
index 0000000..da4605e
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-proj.el
@@ -0,0 +1,676 @@
+;;; ede-proj.el --- EDE Generic Project file driver
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-proj.el,v 1.67 2010/02/08 22:00:45 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; EDE defines a method for managing a project.  EDE-PROJ aims to be a
+;; generic project file format based on the EIEIO object stream
+;; methods.  Changes in the project structure will require Makefile
+;; rebuild.  The targets provided in ede-proj can be augmented with
+;; additional target types inherited directly from `ede-proj-target'.
+
+(eval-and-compile '(require 'ede))
+(require 'ede-proj-comp)
+(require 'ede-make)
+
+;;; Class Definitions:
+(defclass ede-proj-target (ede-target)
+  ((auxsource :initarg :auxsource
+	      :initform nil
+	      :type list
+	      :custom (repeat (string :tag "File"))
+	      :label "Auxiliary Source Files"
+	      :group (default source)
+	      :documentation "Auxiliary source files included in this target.
+Each of these is considered equivalent to a source file, but it is not
+distributed, and each should have a corresponding rule to build it.")
+   (dirty :initform nil
+	  :type boolean
+	  :documentation "Non-nil when generated files needs updating.")
+   (compiler :initarg :compiler
+	     :initform nil
+	     :type (or null symbol)
+	     :custom (choice (const :tag "None" nil)
+			     :slotofchoices availablecompilers)
+	     :label "Compiler for building sources"
+	     :group make
+	     :documentation
+	     "The compiler to be used to compile this object.
+This should be a symbol, which contains the object defining the compiler.
+This enables save/restore to do so by name, permitting the sharing
+of these compiler resources, and global customization thereof.")
+   (linker :initarg :linker
+	     :initform nil
+	     :type (or null symbol)
+	     :custom (choice (const :tag "None" nil)
+			     :slotofchoices availablelinkers)
+	     :label "Linker for combining intermediate object files."
+	     :group make
+	     :documentation
+	     "The linker to be used to link compiled sources for this object.
+This should be a symbol, which contains the object defining the linker.
+This enables save/restore to do so by name, permitting the sharing
+of these linker resources, and global customization thereof.")
+   ;; Class allocated slots
+   (phony :allocation :class
+	  :initform nil
+	  :type boolean
+	  :documentation
+	  "A phony target is one where the build target does not relate to a file.
+Such targets are always built, but make knows how to deal with them..")
+   (availablecompilers :allocation :class
+		       :initform nil
+		       :type (or null list)
+		       :documentation
+		       "A list of `ede-compiler' objects.
+These are the compilers the user can choose from when setting the
+`compiler' slot.")
+   (availablelinkers :allocation :class
+		     :initform nil
+		     :type (or null list)
+		     :documentation
+		     "A list of `ede-linker' objects.
+These are the linkers the user can choose from when setting the
+`linker' slot.")
+   )
+  "Abstract class for ede-proj targets.")
+
+(defclass ede-proj-target-makefile (ede-proj-target)
+  ((makefile :initarg :makefile
+	     :initform "Makefile"
+	     :type string
+	     :custom string
+	     :label "Parent Makefile"
+	     :group make
+	     :documentation "File name of generated Makefile.")
+   (partofall :initarg :partofall
+	      :initform t
+	      :type boolean
+	      :custom boolean
+	      :label "Part of `all:' target"
+	      :group make
+	      :documentation
+	      "Non nil means the rule created is part of the all target.
+Setting this to nil creates the rule to build this item, but does not
+include it in the ALL`all:' rule.")
+   (configuration-variables
+    :initarg :configuration-variables
+    :initform nil
+    :type list
+    :custom (repeat (cons (string :tag "Configuration")
+			  (repeat
+			   (cons (string :tag "Name")
+				 (string :tag "Value")))))
+    :label "Environment Variables for configurations"
+    :group make
+    :documentation "Makefile variables appended to use in different configurations.
+These variables are used in the makefile when a configuration becomes active.
+Target variables are always renamed such as foo_CFLAGS, then included into
+commands where the variable would usually appear.")
+   (rules :initarg :rules
+	  :initform nil
+	  :type list
+	  :custom (repeat (object :objecttype ede-makefile-rule))
+	  :label "Additional Rules"
+	  :group (make)
+	  :documentation
+	  "Arbitrary rules and dependencies needed to make this target.
+It is safe to leave this blank.")
+   )
+  "Abstract class for Makefile based targets.")
+
+(autoload 'ede-proj-target-aux "ede-proj-aux"
+  "Target class for a group of lisp files." nil nil)
+(autoload 'ede-proj-target-elisp "ede-proj-elisp"
+  "Target class for a group of lisp files." nil nil)
+(autoload 'ede-proj-target-elisp-autoloads "ede-proj-elisp"
+  "Target class for generating autoload files." nil nil)
+(autoload 'ede-proj-target-scheme "ede-proj-scheme"
+  "Target class for a group of lisp files." nil nil)
+(autoload 'ede-proj-target-makefile-miscelaneous "ede-proj-misc"
+  "Target class for a group of miscelaneous w/ a special makefile." nil nil)
+(autoload 'ede-proj-target-makefile-program "ede-proj-prog"
+  "Target class for building a program." nil nil)
+(autoload 'ede-proj-target-makefile-archive "ede-proj-archive"
+  "Target class for building an archive of object code." nil nil)
+(autoload 'ede-proj-target-makefile-shared-object "ede-proj-shared"
+  "Target class for building a shared object." nil nil)
+(autoload 'ede-proj-target-makefile-info "ede-proj-info"
+  "Target class for info files." nil nil)
+
+(defvar ede-proj-target-alist
+  '(("program" . ede-proj-target-makefile-program)
+    ("archive" . ede-proj-target-makefile-archive)
+    ("sharedobject" . ede-proj-target-makefile-shared-object)
+    ("emacs lisp" . ede-proj-target-elisp)
+    ("emacs lisp autoloads" . ede-proj-target-elisp-autoloads)
+    ("info" . ede-proj-target-makefile-info)
+    ("auxiliary" . ede-proj-target-aux)
+    ("scheme" . ede-proj-target-scheme)
+    ("miscellaneous" . ede-proj-target-makefile-miscelaneous)
+    )
+  "Alist of names to class types for available project target classes.")
+
+(defun ede-proj-register-target (name class)
+  "Register a new target class with NAME and class symbol CLASS.
+This enables the creation of your target type."
+  (let ((a (assoc name ede-proj-target-alist)))
+    (if a
+	(setcdr a class)
+      (setq ede-proj-target-alist
+	    (cons (cons name class) ede-proj-target-alist)))))
+
+(defclass ede-proj-project (ede-project)
+  ((makefile-type :initarg :makefile-type
+		  :initform Makefile
+		  :type symbol
+		  :custom (choice (const Makefile)
+				  ;(const Makefile.in)
+				  (const Makefile.am)
+				  ;(const cook)
+				  )
+		  :documentation "The type of Makefile to generate.
+Can be one of 'Makefile, 'Makefile.in, or 'Makefile.am.
+If this value is NOT 'Makefile, then that overrides the :makefile slot
+in targets.")
+   (variables :initarg :variables
+	      :initform nil
+	      :type list
+	      :custom (repeat (cons (string :tag "Name")
+				    (string :tag "Value")))
+	      :group (settings)
+	      :documentation "Variables to set in this Makefile.")
+   (configuration-variables
+    :initarg :configuration-variables
+    :initform ("debug" (("DEBUG" . "1")))
+    :type list
+    :custom (repeat (cons (string :tag "Configuration")
+			  (repeat
+			   (cons (string :tag "Name")
+				 (string :tag "Value")))))
+    :group (settings)
+    :documentation "Makefile variables to use in different configurations.
+These variables are used in the makefile when a configuration becomes active.")
+   (inference-rules :initarg :inference-rules
+		    :initform nil
+		    :custom (repeat
+			     (object :objecttype ede-makefile-rule))
+		    :documentation "Inference rules to add to the makefile.")
+   (include-file :initarg :include-file
+		 :initform nil
+		 :custom (repeat
+			  (string :tag "Include File"))
+		 :documentation "Additional files to include.
+These files can contain additional rules, variables, and customizations.")
+   (automatic-dependencies
+    :initarg :automatic-dependencies
+    :initform t
+    :type boolean
+    :custom boolean
+    :group (default settings)
+    :documentation
+    "Non-nil to do implement automatic dependencies in the Makefile.")
+   (menu :initform
+	 (
+	  [ "Regenerate Makefiles" ede-proj-regenerate t ]
+	  [ "Upload Distribution" ede-upload-distribution t ]
+	  )
+	 )
+   (metasubproject
+    :initarg :metasubproject
+    :initform nil
+    :type boolean
+    :custom boolean
+    :group (default settings)
+    :documentation
+    "Non-nil if this is a metasubproject.
+Usually, a subproject is determined by a parent project.  If multiple top level
+projects are grouped into a large project not maintained by EDE, then you need
+to set this to non-nil.  The only effect is that the `dist' rule will then avoid
+making a tar file.")
+   )
+  "The EDE-PROJ project definition class.")
+
+;;; Code:
+(defun ede-proj-load (project &optional rootproj)
+  "Load a project file from PROJECT directory.
+If optional ROOTPROJ is provided then ROOTPROJ is the root project
+for the tree being read in.  If ROOTPROJ is nil, then assume that
+the PROJECT being read in is the root project."
+  (save-excursion
+    (let ((ret nil)
+	  (subdirs (directory-files project nil "[^.].*" nil)))
+      (set-buffer (get-buffer-create " *tmp proj read*"))
+      (unwind-protect
+	  (progn
+	    (insert-file-contents (concat project "Project.ede")
+				  nil nil nil t)
+	    (goto-char (point-min))
+	    (setq ret (read (current-buffer)))
+	    (if (not (eq (car ret) 'ede-proj-project))
+		(error "Corrupt project file"))
+	    (setq ret (eval ret))
+	    (oset ret file (concat project "Project.ede"))
+	    (oset ret directory project)
+	    (oset ret rootproject rootproj)
+	    )
+	(kill-buffer " *tmp proj read*"))
+      (while subdirs
+	(let ((sd (file-name-as-directory
+		   (expand-file-name (car subdirs) project))))
+	  (if (and (file-directory-p sd)
+		   (ede-directory-project-p sd))
+	      (oset ret subproj
+		    (cons (ede-proj-load sd (or rootproj ret))
+			  (oref ret subproj))))
+	  (setq subdirs (cdr subdirs))))
+      ret)))
+
+(defun ede-proj-save (&optional project)
+  "Write out object PROJECT into its file."
+  (save-excursion
+    (if (not project) (setq project (ede-current-project)))
+    (let ((b (set-buffer (get-buffer-create " *tmp proj write*")))
+	  (cfn (oref project file))
+	  (cdir (oref project directory)))
+      (unwind-protect
+	  (save-excursion
+	    (erase-buffer)
+	    (let ((standard-output (current-buffer)))
+	      (oset project file (file-name-nondirectory cfn))
+	      (slot-makeunbound project :directory)
+	      (object-write project ";; EDE project file."))
+	    (write-file cfn nil)
+	    )
+	;; Restore the :file on exit.
+	(oset project file cfn)
+	(oset project directory cdir)
+	(kill-buffer b)))))
+
+(defmethod ede-commit-local-variables ((proj ede-proj-project))
+  "Commit change to local variables in PROJ."
+  (ede-proj-save proj))
+
+(defmethod eieio-done-customizing ((proj ede-proj-project))
+  "Call this when a user finishes customizing this object.
+Argument PROJ is the project to save."
+  (call-next-method)
+  (ede-proj-save proj))
+
+(defmethod eieio-done-customizing ((target ede-proj-target))
+  "Call this when a user finishes customizing this object.
+Argument TARGET is the project we are completing customization on."
+  (call-next-method)
+  (ede-proj-save (ede-current-project)))
+
+(defmethod ede-commit-project ((proj ede-proj-project))
+  "Commit any change to PROJ to its file."
+  (ede-proj-save proj))
+
+(defmethod ede-buffer-mine ((this ede-proj-project) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (let ((f (ede-convert-path this (buffer-file-name buffer))))
+    (or (string= (file-name-nondirectory (oref this file)) f)
+	(string= (ede-proj-dist-makefile this) f)
+	(string-match "Makefile\\(\\.\\(in\\|am\\)\\)?$" f)
+	(string-match "config\\(ure\\.in\\|\\.stutus\\)?$" f)
+	)))
+
+(defmethod ede-buffer-mine ((this ede-proj-target) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (or (call-next-method)
+      (ede-target-buffer-in-sourcelist this buffer (oref this auxsource))))
+
+
+;;; EDE command functions
+;;
+(defvar ede-proj-target-history nil
+  "History when querying for a target type.")
+
+(defmethod project-new-target ((this ede-proj-project)
+			       &optional name type autoadd)
+  "Create a new target in THIS based on the current buffer."
+  (let* ((name (or name (read-string "Name: " "")))
+	 (type (or type
+		   (completing-read "Type: " ede-proj-target-alist
+				    nil t nil '(ede-proj-target-history . 1))))
+	 (ot nil)
+	 (src (if (and (buffer-file-name)
+		       (if (and autoadd (stringp autoadd))
+			   (string= autoadd "y")
+			 (y-or-n-p (format "Add %s to %s? " (buffer-name) name))))
+		  (buffer-file-name)))
+	 (fcn (cdr (assoc type ede-proj-target-alist)))
+	 )
+
+    (when (not fcn)
+      (error "Unknown target type %s for EDE Project" type))
+
+    (setq ot (funcall fcn name :name name
+		      :path (ede-convert-path this default-directory)
+		      :source (if src
+				  (list (file-name-nondirectory src))
+				nil)))
+    ;; If we added it, set the local buffer's object.
+    (if src (progn
+	      (setq ede-object ot)
+	      (ede-apply-object-keymap)))
+    ;; Add it to the project object
+    ;;(oset this targets (cons ot (oref this targets)))
+    ;; New form: Add to the end using fancy eieio function.
+    ;; @todone - Some targets probably want to be in the front.
+    ;;           How to do that?
+    ;; @ans - See elisp autoloads for answer
+    (object-add-to-list this 'targets ot t)
+    ;; And save
+    (ede-proj-save this)))
+
+(defmethod project-new-target-custom ((this ede-proj-project))
+  "Create a new target in THIS for custom."
+  (let* ((name (read-string "Name: " ""))
+	 (type (completing-read "Type: " ede-proj-target-alist
+				nil t nil '(ede-proj-target-history . 1))))
+    (funcall (cdr (assoc type ede-proj-target-alist)) name :name name
+	     :path (ede-convert-path this default-directory)
+	     :source nil)))
+
+(defmethod project-delete-target ((this ede-proj-target))
+  "Delete the current target THIS from its parent project."
+  (let ((p (ede-current-project))
+	(ts (oref this source)))
+    ;; Loop across all sources.  If it exists in a buffer,
+    ;; clear its object.
+    (while ts
+      (let* ((default-directory (oref this path))
+	     (b (get-file-buffer (car ts))))
+	(if b
+	    (save-excursion
+	      (set-buffer b)
+	      (if (eq ede-object this)
+		  (progn
+		    (setq ede-object nil)
+		    (ede-apply-object-keymap))))))
+      (setq ts (cdr ts)))
+    ;; Remove THIS from its parent.
+    ;; The two vectors should be pointer equivalent.
+    (oset p targets (delq this (oref p targets)))
+    (ede-proj-save (ede-current-project))))
+
+(defmethod project-add-file ((this ede-proj-target) file)
+  "Add to target THIS the current buffer represented as FILE."
+  (let ((file (ede-convert-path this file))
+	(src (ede-target-sourcecode this)))
+    (while (and src (not (ede-want-file-p (car src) file)))
+      (setq src (cdr src)))
+    (when src
+      (setq src (car src))
+      (cond ((ede-want-file-source-p this file)
+	     (object-add-to-list this 'source file t))
+	    ((ede-want-file-auxiliary-p this file)
+	     (object-add-to-list this 'auxsource file t))
+	    (t (error "`project-add-file(ede-target)' source mismatch error")))
+      (ede-proj-save))))
+
+(defmethod project-remove-file ((target ede-proj-target) file)
+  "For TARGET, remove FILE.
+FILE must be massaged by `ede-convert-path'."
+  ;; Speedy delete should be safe.
+  (object-remove-from-list target 'source (ede-convert-path target file))
+  (object-remove-from-list target 'auxsource (ede-convert-path target file))
+  (ede-proj-save))
+
+(defmethod project-update-version ((this ede-proj-project))
+  "The :version of project THIS has changed."
+  (ede-proj-save))
+
+(defmethod project-make-dist ((this ede-proj-project))
+  "Build a distribution for the project based on THIS target."
+  (let ((pm (ede-proj-dist-makefile this))
+	(df (project-dist-files this)))
+    (if (and (file-exists-p (car df))
+	     (not (y-or-n-p "Dist file already exists.  Rebuild? ")))
+	(error "Try `ede-update-version' before making a distribution"))
+    (ede-proj-setup-buildenvironment this)
+    (if (ede-proj-automake-p this)
+	(setq pm (expand-file-name "Makefile"
+				   (file-name-directory pm))))
+    (compile (concat ede-make-command " -f " pm " dist"))))
+
+(defmethod project-dist-files ((this ede-proj-project))
+  "Return a list of files that constitutes a distribution of THIS project."
+  (list
+   ;; Note to self, keep this first for the above fn to check against.
+   (concat (oref this name) "-" (oref this version) ".tar.gz")
+   ))
+
+(defmethod project-compile-project ((proj ede-proj-project) &optional command)
+  "Compile the entire current project PROJ.
+Argument COMMAND is the command to use when compiling."
+  (let ((pm (ede-proj-dist-makefile proj))
+	(default-directory (file-name-directory (oref proj file))))
+    (ede-proj-setup-buildenvironment proj)
+    (if (ede-proj-automake-p proj)
+	(setq pm (expand-file-name "Makefile"
+				   (file-name-directory pm))))
+    (compile (concat ede-make-command" -f " pm " all"))))
+
+;;; Target type specific compilations/debug
+;;
+(defmethod project-compile-target ((obj ede-proj-target) &optional command)
+  "Compile the current target OBJ.
+Argument COMMAND is the command to use for compiling the target."
+  (project-compile-project (ede-current-project) command))
+
+(defmethod project-compile-target ((obj ede-proj-target-makefile)
+				   &optional command)
+  "Compile the current target program OBJ.
+Optional argument COMMAND is the s the alternate command to use."
+  (ede-proj-setup-buildenvironment (ede-current-project))
+  (compile (concat ede-make-command " -f " (oref obj makefile) " "
+		   (ede-proj-makefile-target-name obj))))
+
+(defmethod project-debug-target ((obj ede-proj-target))
+  "Run the current project target OBJ in a debugger."
+  (error "Debug-target not supported by %s" (object-name obj)))
+
+(defmethod project-run-target ((obj ede-proj-target))
+  "Run the current project target OBJ."
+  (error "Run-target not supported by %s" (object-name obj)))
+
+(defmethod ede-proj-makefile-target-name ((this ede-proj-target))
+  "Return the name of the main target for THIS target."
+  (ede-name this))
+
+;;; Compiler and source code generators
+;;
+(defmethod ede-want-file-auxiliary-p ((this ede-target) file)
+  "Return non-nil if THIS target wants FILE."
+  ;; By default, all targets reference the source object, and let it decide.
+  (let ((src (ede-target-sourcecode this)))
+    (while (and src (not (ede-want-file-auxiliary-p (car src) file)))
+      (setq src (cdr src)))
+    src))
+
+(defmethod ede-proj-compilers ((obj ede-proj-target))
+  "List of compilers being used by OBJ.
+If the `compiler' slot is empty, concoct one on a first match found
+basis for any given type from the `availablecompilers' slot.
+Otherwise, return the `compiler' slot.
+Converts all symbols into the objects to be used."
+  (when (slot-exists-p obj 'compiler)
+    (let ((comp (oref obj compiler)))
+      (if comp
+	  ;; Now that we have a pre-set compilers to use, convert tye symbols
+	  ;; into objects for ease of use
+	  (if (listp comp)
+	      (setq comp (mapcar 'symbol-value comp))
+	    (setq comp (list (symbol-value comp))))
+	(let* ((acomp (oref obj availablecompilers))
+	       (avail (mapcar 'symbol-value acomp))
+	       (st (oref obj sourcetype))
+	       (sources (oref obj source)))
+	  ;; COMP is not specified, so generate a list from the available
+	  ;; compilers list.
+	  (while st
+	    (if (ede-want-any-source-files-p (symbol-value (car st)) sources)
+		(let ((c (ede-proj-find-compiler avail (car st))))
+		  (if c (setq comp (cons c comp)))))
+	    (setq st (cdr st)))))
+      ;; Return the disovered compilers
+      comp)))
+
+(defmethod ede-proj-linkers ((obj ede-proj-target))
+  "List of linkers being used by OBJ.
+If the `linker' slot is empty, concoct one on a first match found
+basis for any given type from the `availablelinkers' slot.
+Otherwise, return the `linker' slot.
+Converts all symbols into the objects to be used."
+  (when (slot-exists-p obj 'linker)
+    (let ((link (oref obj linker)))
+      (if link
+	  ;; Now that we have a pre-set linkers to use, convert type symbols
+	  ;; into objects for ease of use
+	  (if (symbolp link)
+	      (setq link (list (symbol-value link)))
+	    (error ":linker is not a symbol.  Howd you do that?"))
+	(let* ((alink (oref obj availablelinkers))
+	       (avail (mapcar 'symbol-value alink))
+	       (st (oref obj sourcetype))
+	       (sources (oref obj source)))
+	  ;; LINKER is not specified, so generate a list from the available
+	  ;; compilers list.
+	  (while st
+	    (if (ede-want-any-source-files-p (symbol-value (car st)) sources)
+		(let ((c (ede-proj-find-linker avail (car st))))
+		  (if c (setq link (cons c link)))))
+	    (setq st (cdr st)))
+	  (unless link
+	    ;; No linker stands out!  Loop over our linkers and pull out
+	    ;; the first that has no source type requirement.
+	    (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
+	      (setq avail (cdr avail)))
+	    (setq link (cdr avail)))))
+      ;; Return the disovered linkers
+      link)))
+
+
+;;; Target type specific autogenerating gobbldegook.
+;;
+(eval-when-compile
+  ;; This provides prevents recursive loading during a compile
+  (provide 'ede-proj)
+  (require 'ede-pmake "ede-pmake.el")
+  (require 'ede-pconf "ede-pconf.el"))
+
+(defun ede-proj-makefile-type (&optional proj)
+  "Makefile type of the current project PROJ."
+  (oref (or proj (ede-current-project)) makefile-type))
+
+(defun ede-proj-automake-p (&optional proj)
+  "Return non-nil if the current project PROJ is automake mode."
+  (eq (ede-proj-makefile-type proj) 'Makefile.am))
+
+(defun ede-proj-autoconf-p (&optional proj)
+  "Return non-nil if the current project PROJ is automake mode."
+  (eq (ede-proj-makefile-type proj) 'Makefile.in))
+
+(defun ede-proj-make-p (&optional proj)
+  "Return non-nil if the current project PROJ is automake mode."
+  (eq (ede-proj-makefile-type proj) 'Makefile))
+
+(defmethod ede-proj-dist-makefile ((this ede-proj-project))
+  "Return the name of the Makefile with the DIST target in it for THIS."
+  (cond ((eq (oref this makefile-type) 'Makefile.am)
+	 (concat (file-name-directory (oref this file))
+		 "Makefile.am"))
+	((eq (oref this makefile-type) 'Makefile.in)
+	 (expand-file-name "Makefile.in"
+			   (file-name-directory (oref this file))))
+	((object-assoc "Makefile" 'makefile (oref this targets))
+	 (expand-file-name "Makefile"
+			   (file-name-directory (oref this file))))
+	(t
+	 (let ((targets (oref this targets)))
+	   (while (and targets
+		       (not (obj-of-class-p
+			     (car targets)
+			     'ede-proj-target-makefile)))
+	     (setq targets (cdr targets)))
+	   (if targets (oref (car targets) makefile)
+	     (expand-file-name "Makefile"
+			       (file-name-directory (oref this file))))))))
+
+(defun ede-proj-regenerate ()
+  "Regenerate Makefiles for and edeproject project."
+  (interactive)
+  (ede-proj-setup-buildenvironment (ede-current-project) t))
+
+(defmethod ede-proj-makefile-create-maybe ((this ede-proj-project) mfilename)
+  "Create a Makefile for all Makefile targets in THIS if needed.
+MFILENAME is the makefile to generate."
+  ;; For now, pass through until dirty is implemented.
+  (require 'ede-pmake)
+  (if (or (not (file-exists-p mfilename))
+	  (file-newer-than-file-p (oref this file) mfilename))
+      (ede-proj-makefile-create this mfilename)))
+
+(defmethod ede-proj-setup-buildenvironment ((this ede-proj-project)
+					    &optional force)
+  "Setup the build environment for project THIS.
+Handles the Makefile, or a Makefile.am configure.in combination.
+Optional argument FORCE will force items to be regenerated."
+  (if (not force)
+      (ede-proj-makefile-create-maybe this (ede-proj-dist-makefile this))
+    (require 'ede-pmake)
+    (ede-proj-makefile-create this (ede-proj-dist-makefile this)))
+  ;; Rebuild all subprojects
+  (ede-map-subprojects
+   this (lambda (sproj) (ede-proj-setup-buildenvironment sproj force)))
+  ;; Autoconf projects need to do other kinds of initializations.
+  (when (and (ede-proj-automake-p this)
+	     (eq this (ede-toplevel this)))
+    (require 'ede-pconf)
+    ;; If the user wants to force this, do it some other way?
+    (ede-proj-configure-synchronize this)
+    ;; Now run automake to fill in the blanks, autoconf, and other
+    ;; auto thingies so that we can just say "make" when done.
+    )
+  )
+
+
+;;; Lower level overloads
+;;
+(defmethod project-rescan ((this ede-proj-project))
+  "Rescan the EDE proj project THIS."
+  (let ((root (or (ede-project-root this) this))
+	)
+    (setq ede-projects (delq root ede-projects))
+    (ede-load-project-file (ede-project-root-directory root))
+    ))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("Project\\.ede$" . emacs-lisp-mode))
+
+(provide 'ede-proj)
+
+;;; ede-proj.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-projects.texi b/site/cedet-1.0pre7/ede/ede-projects.texi
new file mode 100644
index 0000000..9d9e1f6
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-projects.texi
@@ -0,0 +1,1557 @@
+@c -*-texinfo-*-
+@c
+@c $Id: ede-projects.texi,v 1.6 2010/01/07 02:14:54 zappo Exp $
+@c
+
+@c The next line is for the back-search to see what node this one
+@c resides in.
+
+@c @node Project,
+@c @chapter Project Listing
+
+@c This command is a convenience to help rebuild this file.  Use C-x C-e
+@c on the expression below to rebuild the entire index (but only
+@c after loading in all relevant source files.)
+
+@c (eieiodoc-class ede-project-placeholder "pj")
+@menu
+* ede-project-placeholder ::
+*  ede-project ::
+*   ede-cpp-root-project ::
+*   ede-emacs-project ::
+*   ede-linux-project ::
+*   ede-maven-project ::
+*   ede-simple-project ::
+*   ede-simple-base-project ::
+*   ede-proj-project ::
+*   project-am-makefile ::
+*   ede-step-project ::
+@end menu
+
+
+@node ede-project-placeholder, ede-project,  , Project
+@comment  node-name,  next,  previous,  up
+@section ede-project-placeholder
+@pjindex ede-project-placeholder
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item ede-project-placeholder
+@table @asis
+@item Children:
+@w{@xref{ede-project}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-project-placeholder
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string} @*
+Default Value: @code{"Untitled"}
+
+The name used when generating distribution files.
+@refill
+
+@item :version
+Type: @code{string} @*
+Default Value: @code{"1.0"}
+
+The version number used when distributing files.
+@refill
+
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede--project-inode :AFTER proj 
+Get the inode of the directory project @var{PROJ} is in.
+@end deffn
+
+@deffn Method ede-project-root :AFTER this 
+If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems.
+@end deffn
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Find a subproject of @var{PROJ} that corresponds to @var{DIR}.
+@end deffn
+
+@deffn Method ede-project-root-directory :AFTER this &optional file 
+If a project knows its root, return it here.
+Allows for one-project-object-for-a-tree type systems.
+Optional @var{FILE} is the file to test.  It is ignored in preference
+of the anchor file for the project.
+@end deffn
+
+@deffn Method ede-project-force-load :AFTER this 
+Make sure the placeholder @var{THIS} is replaced with the real thing.
+Return the new object created in its place.
+@end deffn
+
+@deffn Method project-interactive-select-target :AFTER this prompt 
+Make sure placeholder @var{THIS} is replaced with the real thing, and pass through.
+@end deffn
+
+@deffn Method project-add-file :AFTER this file 
+Make sure placeholder @var{THIS} is replaced with the real thing, and pass through.
+@end deffn
+
+
+@node ede-project, ede-cpp-root-project, ede-project-placeholder, Project
+@comment  node-name,  next,  previous,  up
+@section ede-project
+@pjindex ede-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item ede-project
+@table @asis
+@item Children:
+@w{@xref{ede-cpp-root-project},} @w{@xref{ede-emacs-project},} @w{@xref{ede-linux-project},} @w{@xref{ede-maven-project},} @w{@xref{ede-simple-project},} @w{@xref{ede-simple-base-project},} @w{@xref{ede-proj-project},} @w{@xref{project-am-makefile},} @w{@xref{ede-step-project}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@item :web-site-url
+Type: @code{string} @*
+Default Value: @code{""}
+
+URL to this projects web site.
+This is a URL to be sent to a web site for documentation.
+@refill
+
+@item :web-site-directory @*
+Default Value: @code{""}
+
+A directory where web pages can be found by Emacs.
+For remote locations use a path compatible with ange-ftp or EFS.
+You can also use TRAMP for use with rcp & scp.
+@refill
+
+@item :web-site-file @*
+Default Value: @code{""}
+
+A file which contains the home page for this project.
+This file can be relative to slot @code{web-site-directory}.
+This can be a local file, use ange-ftp, EFS, or TRAMP.
+@refill
+
+@item :ftp-site
+Type: @code{string} @*
+Default Value: @code{""}
+
+FTP site where this project's distribution can be found.
+This FTP site should be in Emacs form, as needed by @code{ange-ftp}, but can
+also be of a form used by TRAMP for use with scp, or rcp.
+@refill
+
+@item :ftp-upload-site
+Type: @code{string} @*
+Default Value: @code{""}
+
+FTP Site to upload new distributions to.
+This FTP site should be in Emacs form as needed by @code{ange-ftp}.
+If this slot is @code{nil}, then use @code{ftp-site} instead.
+@refill
+
+@item :configurations
+Type: @code{list} @*
+Default Value: @code{("debug" "release")}
+
+List of available configuration types.
+Individual target/project types can form associations between a configuration,
+and target specific elements such as build variables.
+@refill
+
+@item :configuration-default @*
+Default Value: @code{"debug"}
+
+The default configuration.
+@refill
+
+@item :local-variables @*
+Default Value: @code{nil}
+
+Project local variables
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for project @var{THIS}.
+@end deffn
+
+@deffn Method ede-subproject-relative-path :AFTER proj &optional parent-in 
+Get a path name for @var{PROJ} which is relative to the parent project.
+If PARENT is specified, then be relative to the PARENT project.
+Specifying PARENT is useful for sub-sub projects relative to the root project.
+@end deffn
+
+@deffn Method eieio-speedbar-description :AFTER obj 
+Provide a speedbar description for @var{OBJ}.
+@end deffn
+
+@deffn Method ede-map-any-target-p :AFTER this proc 
+For project @var{THIS}, map @var{PROC} to all targets and return if any non-nil.
+Return the first non-@code{nil} value returned by @var{PROC}.
+@end deffn
+
+@deffn Method project-rescan :AFTER this 
+Rescan the EDE proj project @var{THIS}.
+@end deffn
+
+@deffn Method ede-map-subprojects :AFTER this proc 
+For object @var{THIS}, execute @var{PROC} on all direct subprojects.
+This function does not apply @var{PROC} to sub-sub projects.
+See also @dfn{ede-map-all-subprojects}.
+@end deffn
+
+@deffn Method ede-convert-path :AFTER this path 
+Convert path in a standard way for a given project.
+Default to making it project relative.
+Argument @var{THIS} is the project to convert @var{PATH} to.
+@end deffn
+
+@deffn Method ede-name :AFTER this 
+Return a short-name for @var{THIS} project file.
+Do this by extracting the lowest directory name.
+@end deffn
+
+@deffn Method ede-set-project-variables :AFTER project &optional buffer 
+Set variables local to @var{PROJECT} in @var{BUFFER}.
+@end deffn
+
+@deffn Method eieio-speedbar-derive-line-path :AFTER obj &optional depth 
+Return the path to @var{OBJ}.
+Optional @var{DEPTH} is the depth we start at.
+@end deffn
+
+@deffn Method ede-map-all-subprojects :AFTER this allproc 
+For object @var{THIS}, execute PROC on @var{THIS} and  all subprojects.
+This function also applies PROC to sub-sub projects.
+See also @dfn{ede-map-subprojects}.
+@end deffn
+
+@deffn Method project-update-version :AFTER ot 
+The @code{:version} of the project @var{OT} has been updated.
+Handle saving, or other detail.
+@end deffn
+
+@deffn Method ede-buffer-header-file :AFTER this buffer 
+Return @code{nil}, projects don't have header files.
+@end deffn
+
+@deffn Method ede-buffer-documentation-files :AFTER this buffer 
+Return all documentation in project @var{THIS} based on @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-map-targets :AFTER this proc 
+For object @var{THIS}, execute @var{PROC} on all targets.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return non-@code{nil} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-object-keybindings :BEFORE this 
+Retrieves the slot @code{keybindings} from an object of class @code{ede-project}
+@end deffn
+
+@deffn Method ede-description :AFTER this 
+Return a description suitable for the minibuffer about @var{THIS}.
+@end deffn
+
+@deffn Method eieio-speedbar-object-children :AFTER this 
+Return the list of speedbar display children for @var{THIS}.
+@end deffn
+
+@deffn Method project-make-dist :AFTER this 
+Build a distribution for the project based on @var{THIS} project.
+@end deffn
+
+@deffn Method ede-system-include-path :AFTER this 
+Get the system include path used by project @var{THIS}.
+@end deffn
+
+@deffn Method project-new-target-custom :AFTER proj 
+Create a new target.  It is up to the project @var{PROJ} to get the name.
+@end deffn
+
+@deffn Method ede-subproject-p :AFTER proj 
+Return non-@code{nil} if @var{PROJ} is a sub project.
+@end deffn
+
+@deffn Method ede-expand-filename :AFTER this filename &optional force 
+Return a fully qualified file name based on project @var{THIS}.
+@var{FILENAME} should be just a filename which occurs in a directory controlled
+by this project.
+Optional argument @var{FORCE} forces the default filename to be provided even if it
+doesn't exist.
+@end deffn
+
+@deffn Method ede-menu-items-build :AFTER obj &optional current 
+Return a list of menu items for building project @var{OBJ}.
+If optional argument @var{CURRENT} is non-@code{nil}, return sub-menu code.
+@end deffn
+
+@deffn Method ede-update-version-in-source :AFTER this version 
+Change occurrences of a version string in sources.
+In project @var{THIS}, cycle over all targets to give them a chance to set
+their sources to @var{VERSION}.
+@end deffn
+
+@deffn Method project-new-target :AFTER proj &rest args 
+Create a new target.  It is up to the project @var{PROJ} to get the name.
+@end deffn
+
+@deffn Method project-compile-project :AFTER obj &optional command 
+Compile the entire current project @var{OBJ}.
+Argument @var{COMMAND} is the command to use when compiling.
+@end deffn
+
+@deffn Method eieio-speedbar-object-buttonname :AFTER object 
+Return a string to use as a speedbar button for @var{OBJECT}.
+@end deffn
+
+@deffn Method ede-map-project-buffers :AFTER this proc 
+For @var{THIS}, execute @var{PROC} on all buffers belonging to @var{THIS}.
+@end deffn
+
+@deffn Method ede-expand-filename-impl :AFTER this filename &optional force 
+Return a fully qualified file name based on project @var{THIS}.
+@var{FILENAME} should be just a filename which occurs in a directory controlled
+by this project.
+Optional argument @var{FORCE} forces the default filename to be provided even if it
+doesn't exist.
+@end deffn
+
+@deffn Method eieio-done-customizing :AFTER proj 
+Call this when a user finishes customizing @var{PROJ}.
+@end deffn
+
+@deffn Method ede-html-documentation :AFTER this 
+Return a list of HTML files provided by project @var{THIS}.
+@end deffn
+
+@deffn Method ede-documentation :AFTER this 
+Return a list of files that provides documentation.
+Documentation is not for object @var{THIS}, but is provided by @var{THIS} for other
+files in the project.
+@end deffn
+
+@deffn Method project-interactive-select-target :AFTER this prompt 
+Interactively query for a target that exists in project @var{THIS}.
+Argument @var{PROMPT} is the prompt to use when querying the user for a target.
+@end deffn
+
+@deffn Method ede-target-in-project-p :AFTER proj target 
+Is @var{PROJ} the parent of @var{TARGET}?
+If @var{TARGET} belongs to a subproject, return that project file.
+@end deffn
+
+@deffn Method ede-find-target :AFTER proj buffer 
+Fetch the target in @var{PROJ} belonging to @var{BUFFER} or nil.
+@end deffn
+
+@deffn Method ede-add-subproject :AFTER proj-a proj-b 
+Add into @var{PROJ-A}, the subproject @var{PROJ-B}.
+@end deffn
+
+@deffn Method ede-commit-project :AFTER proj 
+Commit any change to @var{PROJ} to its file.
+@end deffn
+
+@deffn Method project-dist-files :AFTER this 
+Return a list of files that constitutes a distribution of @var{THIS} project.
+@end deffn
+
+@deffn Method ede-object-menu :BEFORE this 
+Retrieves the slot @code{menu} from an object of class @code{ede-project}
+@end deffn
+
+@deffn Method ede-commit-local-variables :AFTER proj 
+Commit change to local variables in @var{PROJ}.
+@end deffn
+
+
+@node ede-cpp-root-project, ede-emacs-project, ede-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-cpp-root-project
+@pjindex ede-cpp-root-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-cpp-root-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-cpp-root-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@item :include-path
+Type: @code{list} @*
+Default Value: @code{(quote ("/include" "../include/"))}
+
+The default locate function expands filenames within a project.
+If a header file (.h, .hh, etc) name is expanded, and
+the @code{:locate-fcn} slot is @code{nil}, then the include path is checked
+first, and other directories are ignored.  For very large
+projects, this optimization can save a lot of time.
+
+Directory names in the path can be relative to the current
+buffer's @code{default-directory} (not starting with a /).  Directories
+that are relative to the project's root should start with a /, such
+as  "/include", meaning the directory @code{include} off the project root
+directory.
+@refill
+
+@item :system-include-path
+Type: @code{list} @*
+Default Value: @code{nil}
+
+The system include path for files in this project.
+C files initialized in an ede-cpp-root-project have their semantic
+system include path set to this value.  If this is @code{nil}, then the
+semantic path is not modified.
+@refill
+
+@item :spp-table
+Type: @code{list} @*
+Default Value: @code{nil}
+
+C Preprocessor macros for your files.
+Preprocessor symbols will be used while parsing your files.
+These macros might be passed in through the command line compiler, or
+are critical symbols derived from header files.  Providing header files
+macro values through this slot improves accuracy and performance.
+Use `:spp-files' to use these files directly.
+@refill
+
+@item :spp-files
+Type: @code{list} @*
+Default Value: @code{nil}
+
+C header file with Preprocessor macros for your files.
+The PreProcessor symbols appearing in these files will be used while
+parsing files in this project.
+See @code{semantic-lex-c-preprocessor-symbol-map} for more on how this works.
+@refill
+
+@item :header-match-regexp
+Type: @code{string} @*
+Default Value: @code{"\\.\\(h\\(h\\|xx\\|pp\\|\\+\\+\\)?\\|H\\)$\\|\\<\\w+$"}
+
+Regexp used to identify C/C++ header files.
+@refill
+
+@item :locate-fcn
+Type: @code{(or null function)} @*
+Default Value: @code{nil}
+
+The locate function can be used in place of
+@dfn{ede-expand-filename} so you can quickly customize your custom target
+to use specialized local routines instead of the EDE routines.
+The function symbol must take two arguments:
+  NAME - The name of the file to find.
+  DIR - The directory root for this cpp-root project.
+
+It should return the fully qualified file name passed in from NAME.  If that file does not
+exist, it should return nil.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method initialize-instance :AFTER this &rest fields 
+Make sure the @code{:file} is fully expanded.
+@end deffn
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for project @var{THIS}.
+@end deffn
+
+@deffn Method ede-set-project-variables :AFTER project &optional buffer 
+Set variables local to @var{PROJECT} in @var{BUFFER}.
+Also set up the lexical preprocessor map.
+@end deffn
+
+@deffn Method ede-cpp-root-header-file-p :AFTER proj name 
+Non @code{nil} if in @var{PROJ} the filename @var{NAME} is a header.
+@end deffn
+
+@deffn Method ede-system-include-path :AFTER this 
+Get the system include path used by project @var{THIS}.
+@end deffn
+
+@deffn Method ede-project-root :AFTER this 
+Return my root.
+@end deffn
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Return @var{PROJ}, for handling all subdirs below @var{DIR}.
+@end deffn
+
+@deffn Method ede-project-root-directory :AFTER this 
+Return my root.
+@end deffn
+
+@deffn Method ede-expand-filename-impl :AFTER proj name 
+Within this project @var{PROJ}, find the file @var{NAME}.
+This knows details about or source tree.
+@end deffn
+
+@deffn Method ede-find-target :AFTER proj buffer 
+Find an EDE target in @var{PROJ} for @var{BUFFER}.
+If one doesn't exist, create a new one for this directory.
+@end deffn
+
+
+@node ede-emacs-project, ede-linux-project, ede-cpp-root-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-emacs-project
+@pjindex ede-emacs-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-emacs-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-emacs-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method initialize-instance :AFTER this &rest fields 
+Make sure the @code{:file} is fully expanded.
+@end deffn
+
+@deffn Method ede-project-root :AFTER this 
+Return my root.
+@end deffn
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Return @var{PROJ}, for handling all subdirs below @var{DIR}.
+@end deffn
+
+@deffn Method ede-project-root-directory :AFTER this &optional file 
+Return the root for @var{THIS} Emacs project with file.
+@end deffn
+
+@deffn Method ede-expand-filename-impl :AFTER proj name 
+Within this project @var{PROJ}, find the file @var{NAME}.
+Knows about how the Emacs source tree is organized.
+@end deffn
+
+@deffn Method ede-find-target :AFTER proj buffer 
+Find an EDE target in @var{PROJ} for @var{BUFFER}.
+If one doesn't exist, create a new one for this directory.
+@end deffn
+
+
+@node ede-linux-project, ede-maven-project, ede-emacs-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-linux-project
+@pjindex ede-linux-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-linux-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-linux-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method initialize-instance :AFTER this &rest fields 
+Make sure the @code{:file} is fully expanded.
+@end deffn
+
+@deffn Method ede-project-root :AFTER this 
+Return my root.
+@end deffn
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Return @var{PROJ}, for handling all subdirs below @var{DIR}.
+@end deffn
+
+@deffn Method ede-project-root-directory :AFTER this &optional file 
+Return the root for @var{THIS} Linux project with file.
+@end deffn
+
+@deffn Method ede-expand-filename-impl :AFTER proj name 
+Within this project @var{PROJ}, find the file @var{NAME}.
+Knows about how the Linux source tree is organized.
+@end deffn
+
+@deffn Method ede-find-target :AFTER proj buffer 
+Find an EDE target in @var{PROJ} for @var{BUFFER}.
+If one doesn't exist, create a new one for this directory.
+@end deffn
+
+
+@node ede-maven-project, ede-simple-project, ede-linux-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-maven-project
+@pjindex ede-maven-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-maven-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-maven-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method initialize-instance :AFTER this &rest fields 
+Make sure the @code{:targets} is setup.
+@end deffn
+
+@deffn Method ede-project-root :AFTER this 
+Return my root.
+@end deffn
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Return @var{PROJ}, for handling all subdirs below @var{DIR}.
+@end deffn
+
+@deffn Method ede-project-root-directory :AFTER this &optional file 
+Return the root for @var{THIS} Maven project with file.
+@end deffn
+
+@deffn Method ede-find-target :AFTER proj buffer 
+Find an EDE target in @var{PROJ} for @var{BUFFER}.
+If one doesn't exist, create a new one for this directory.
+@end deffn
+
+
+@node ede-simple-project, ede-simple-base-project, ede-maven-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-simple-project
+@pjindex ede-simple-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-simple-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-simple-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-find-subproject-for-directory :AFTER proj dir 
+Return @var{PROJ}, for handling all subdirs below @var{DIR}.
+@end deffn
+
+@deffn Method ede-commit-project :AFTER proj 
+Commit any change to @var{PROJ} to its file.
+@end deffn
+
+
+@node ede-simple-base-project, ede-proj-project, ede-simple-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-simple-base-project
+@pjindex ede-simple-base-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-simple-base-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  EDE Simple project base class.
+This one project could control a tree of subdirectories.
+
+@table @asis
+@end table
+
+@node ede-proj-project, project-am-makefile, ede-simple-base-project, Project
+@comment  node-name,  next,  previous,  up
+@section ede-proj-project
+@pjindex ede-proj-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-proj-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@item :makefile-type
+Type: @code{symbol} @*
+Default Value: @code{Makefile}
+
+The type of Makefile to generate.
+Can be one of @code{'Makefile}, 'Makefile.in, or 'Makefile.am.
+If this value is NOT @code{'Makefile}, then that overrides the @code{:makefile} slot
+in targets.
+@refill
+
+@item :variables
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Variables to set in this Makefile.
+@refill
+
+@item :configuration-variables
+Type: @code{list} @*
+Default Value: @code{("debug" (("DEBUG" . "1")))}
+
+Makefile variables to use in different configurations.
+These variables are used in the makefile when a configuration becomes active.
+@refill
+
+@item :inference-rules @*
+Default Value: @code{nil}
+
+Inference rules to add to the makefile.
+@refill
+
+@item :include-file @*
+Default Value: @code{nil}
+
+Additional files to include.
+These files can contain additional rules, variables, and customizations.
+@refill
+
+@item :automatic-dependencies
+Type: @code{boolean} @*
+Default Value: @code{t}
+
+Non-@code{nil} to do implement automatic dependencies in the Makefile.
+@refill
+
+@item :metasubproject
+Type: @code{boolean} @*
+Default Value: @code{nil}
+
+Non-@code{nil} if this is a metasubproject.
+Usually, a subproject is determined by a parent project.  If multiple top level
+projects are grouped into a large project not maintained by EDE, then you need
+to set this to non-nil.  The only effect is that the @code{dist} rule will then avoid
+making a tar file.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan the EDE proj project @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-create :AFTER this mfilename 
+Create a Makefile for all Makefile targets in @var{THIS}.
+@var{MFILENAME} is the makefile to generate.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method ede-proj-makefile-tags :AFTER this targets 
+Insert into the current location rules to make recursive TAGS files.
+Argument @var{THIS} is the project to create tags for.
+Argument @var{TARGETS} are the targets we should depend on for TAGS.
+@end deffn
+
+@deffn Method project-update-version :AFTER this 
+The @code{:version} of project @var{THIS} has changed.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this 
+Insert variables needed by target @var{THIS}.
+@end deffn
+
+@deffn Method project-make-dist :AFTER this 
+Build a distribution for the project based on @var{THIS} target.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-rules :AFTER this 
+Insert distribution rules for @var{THIS} in a Makefile, such as CLEAN and DIST.
+@end deffn
+
+@deffn Method project-new-target-custom :AFTER this 
+Create a new target in @var{THIS} for custom.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-dependencies :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Argument @var{THIS} is the project that should insert stuff.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-subproj-rules :AFTER this 
+Insert a rule for the project @var{THIS} which should be a subproject.
+@end deffn
+
+@deffn Method ede-proj-makefile-create-maybe :AFTER this mfilename 
+Create a Makefile for all Makefile targets in @var{THIS} if needed.
+@var{MFILENAME} is the makefile to generate.
+@end deffn
+
+@deffn Method ede-proj-configure-test-required-file :AFTER this file 
+For project @var{THIS}, test that the file @var{FILE} exists, or create it.
+@end deffn
+
+@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force 
+Setup the build environment for project @var{THIS}.
+Handles the Makefile, or a Makefile.am configure.in combination.
+Optional argument @var{FORCE} will force items to be regenerated.
+@end deffn
+
+@deffn Method ede-proj-makefile-garbage-patterns :AFTER this 
+Return a list of patterns that are considered garbage to @var{THIS}.
+These are removed with make clean.
+@end deffn
+
+@deffn Method ede-proj-configure-synchronize :AFTER this 
+Synchronize what we know about project @var{THIS} into configure.in.
+@end deffn
+
+@deffn Method project-new-target :AFTER this &optional name type autoadd 
+Create a new target in @var{THIS} based on the current buffer.
+@end deffn
+
+@deffn Method project-compile-project :AFTER proj &optional command 
+Compile the entire current project @var{PROJ}.
+Argument @var{COMMAND} is the command to use when compiling.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables-new :AFTER this 
+Insert variables needed by target @var{THIS}.
+
+NOTE: Not yet in use!  This is part of an SRecode conversion of
+      EDE that is in progress.
+@end deffn
+
+@deffn Method ede-proj-makefile-configuration-variables :AFTER this configuration 
+Return a list of configuration variables from @var{THIS}.
+Use @var{CONFIGURATION} as the current configuration to query.
+@end deffn
+
+@deffn Method eieio-done-customizing :AFTER proj 
+Call this when a user finishes customizing this object.
+Argument @var{PROJ} is the project to save.
+@end deffn
+
+@deffn Method ede-proj-configure-recreate :AFTER this 
+Delete project @var{THIS}es configure script and start over.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-user-rules :AFTER this 
+Insert user specified rules needed by @var{THIS} target.
+This is different from @dfn{ede-proj-makefile-insert-rules} in that this
+function won't create the building rules which are auto created with
+automake.
+@end deffn
+
+@deffn Method ede-proj-dist-makefile :AFTER this 
+Return the name of the Makefile with the DIST target in it for @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-configure-file :AFTER this 
+The configure.in script used by project @var{THIS}.
+@end deffn
+
+@deffn Method ede-commit-project :AFTER proj 
+Commit any change to @var{PROJ} to its file.
+@end deffn
+
+@deffn Method project-dist-files :AFTER this 
+Return a list of files that constitutes a distribution of @var{THIS} project.
+@end deffn
+
+@deffn Method ede-commit-local-variables :AFTER proj 
+Commit change to local variables in @var{PROJ}.
+@end deffn
+
+
+@node project-am-makefile, ede-step-project, ede-proj-project, Project
+@comment  node-name,  next,  previous,  up
+@section project-am-makefile
+@pjindex project-am-makefile
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item project-am-makefile
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-makefile
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Top level targets in this makefile.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan the makefile for all targets and sub targets.
+@end deffn
+
+@deffn Method project-am-subtree :AFTER ampf subdir 
+Return the sub project in @var{AMPF} specified by @var{SUBDIR}.
+@end deffn
+
+@deffn Method project-targets-for-file :AFTER proj 
+Return a list of targets the project @var{PROJ}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method project-new-target :AFTER proj &optional name type 
+Create a new target named @var{NAME}.
+Argument @var{TYPE} is the type of target to insert.  This is a string
+matching something in @code{project-am-type-alist} or type class symbol.
+Despite the fact that this is a method, it depends on the current
+buffer being in order to provide a smart default target type.
+@end deffn
+
+@deffn Method project-compile-project :AFTER obj &optional command 
+Compile the entire current project.
+Argument @var{COMMAND} is the command to use when compiling.
+@end deffn
+
+@deffn Method ede-find-target :AFTER amf buffer 
+Fetch the target belonging to @var{BUFFER}.
+@end deffn
+
+
+@node ede-step-project,  , project-am-makefile, Project
+@comment  node-name,  next,  previous,  up
+@section ede-step-project
+@pjindex ede-step-project
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-project-placeholder}.}
+@table @code
+@item @w{@xref{ede-project}.}
+@table @code
+@item ede-step-project
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-step-project
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :directory
+Type: @code{string}
+
+Directory this project is associated with.
+@refill
+
+@item :file
+Type: @code{string}
+
+File name where this project is stored.
+@refill
+
+@item :targets
+Type: @code{list}
+
+List of top level targets in this project.
+@refill
+
+@item :tool-cache
+Type: @code{list}
+
+List of tool cache configurations in this project.
+This allows any tool to create, manage, and persist project-specific settings.
+@refill
+
+@item :init-variables
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Variables to set in this Makefile, at top of file.
+@refill
+
+@item :additional-variables
+Type: @code{(or null list)} @*
+Default Value: @code{nil}
+
+Arbitrary variables needed from this project.
+It is safe to leave this blank.
+@refill
+
+@item :additional-rules
+Type: @code{(or null list)} @*
+Default Value: @code{nil}
+
+Arbitrary rules and dependencies needed to make this target.
+It is safe to leave this blank.
+@refill
+
+@item :installation-domain
+Type: @code{symbol} @*
+Default Value: @code{user}
+
+Installation domain specification.
+The variable GNUSTEP_INSTALLATION_DOMAIN is set at this value.
+@refill
+
+@item :preamble
+Type: @code{(or null list)} @*
+Default Value: @code{(quote ("GNUmakefile.preamble"))}
+
+The auxilliary makefile for additional variables.
+Included just before the specific target files.
+@refill
+
+@item :postamble
+Type: @code{(or null list)} @*
+Default Value: @code{(quote ("GNUmakefile.postamble"))}
+
+The auxilliary makefile for additional rules.
+Included just after the specific target files.
+@refill
+
+@item :metasubproject
+Type: @code{boolean} @*
+Default Value: @code{nil}
+
+Non-@code{nil} if this is a metasubproject.
+Usually, a subproject is determined by a parent project.  If multiple top level
+projects are grouped into a large project not maintained by EDE, then you need
+to set this to non-nil.  The only effect is that the @code{dist} rule will then avoid
+making a tar file.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan the EDE proj project @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-create :AFTER this mfilename 
+Create a GNUmakefile for all Makefile targets in @var{THIS}.
+@var{MFILENAME} is the makefile to generate.
+@end deffn
+
+@deffn Method project-update-version :AFTER this 
+The @code{:version} of project @var{THIS} has changed.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method project-make-dist :AFTER this 
+Build a distribution for the project based on @var{THIS} target.
+@end deffn
+
+@deffn Method project-new-target-custom :AFTER this 
+Create a new target in @var{THIS} for custom.
+@end deffn
+
+@deffn Method ede-proj-makefile-create-maybe :AFTER this mfilename 
+Create a Makefile for all Makefile targets in @var{THIS} if needed.
+@var{MFILENAME} is the makefile to generate.
+@end deffn
+
+@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force 
+Setup the build environment for project @var{THIS}.
+Handles the Makefile, or a Makefile.am configure.in combination.
+Optional argument @var{FORCE} will force items to be regenerated.
+@end deffn
+
+@deffn Method project-new-target :AFTER this &optional name type autoadd 
+Create a new target in @var{THIS} based on the current buffer.
+@end deffn
+
+@deffn Method project-compile-project :AFTER proj &optional command 
+Compile the entire current project @var{PROJ}.
+Argument @var{COMMAND} is the command to use when compiling.
+@end deffn
+
+@deffn Method eieio-done-customizing :AFTER proj 
+Call this when a user finishes customizing this object.
+Argument @var{PROJ} is the project to save.
+@end deffn
+
+@deffn Method ede-proj-dist-makefile :AFTER this 
+Return the name of the Makefile with the DIST target in it for @var{THIS}.
+@end deffn
+
+@deffn Method ede-commit-project :AFTER proj 
+Commit any change to @var{PROJ} to its file.
+@end deffn
+
+@deffn Method project-dist-files :AFTER this 
+Return a list of files that constitutes a distribution of @var{THIS} project.
+@end deffn
+
+@deffn Method ede-commit-local-variables :AFTER proj 
+Commit change to local variables in @var{PROJ}.
+@end deffn
+
+
diff --git a/site/cedet-1.0pre7/ede/ede-shell.el b/site/cedet-1.0pre7/ede/ede-shell.el
new file mode 100644
index 0000000..135520d
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-shell.el
@@ -0,0 +1,74 @@
+;;; ede-shell.el --- A shell controlled by EDE.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-shell.el,v 1.4 2009/10/16 19:47:38 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Run commands through a specialized EDE shell buffer.  Commands will
+;; be run as shell commands so users can type in their own thing in
+;; the shells for testing purposes.
+;;
+;; Each thing that EDE wants to use will create a shell to interact with it.
+
+;;; Code:
+;;;###autoload
+(defmethod ede-shell-run-something ((target ede-target) command)
+  "Create a shell to run stuff for TARGET.
+COMMAND is a text string representing the thing to be run."
+  (let* ((buff (ede-shell-buffer target))
+	 (cp (ede-target-parent target))
+	 (dd (oref cp :directory)))
+    ;; Show the new buffer.
+    (when (not (get-buffer-window buff))
+      (switch-to-buffer-other-window buff t))
+    ;; Force a shell into the buffer.
+    (shell buff)
+    (while (eq (point-min) (point))
+      (accept-process-output))
+    ;; Change the default directory
+    (if (not (string= (file-name-as-directory (expand-file-name default-directory))
+		      (file-name-as-directory (expand-file-name dd))))
+	;; Go there.
+	(setq command (concat (concat "cd " dd ";" command))))
+    ;; Run the command itself.
+    (ede-shell-run-command command)
+    ))
+  
+(defun ede-shell-run-command (command)
+  "Run the COMMAND in the current shell-buffer."
+  ;; go to end
+  (goto-char (point-max))
+  ;; Insert the stuff.
+  (goto-char (point-max))
+  (insert command)
+  ;; Send the command.
+  (comint-send-input)
+  )
+
+;;;###autoload
+(defmethod ede-shell-buffer ((target ede-target))
+  "Get the buffer for running shell commands for TARGET."
+  (let ((name (ede-name target)))
+    (get-buffer-create (format "*EDE Shell %s" name))))
+
+(provide 'ede-shell)
+
+;;; ede-shell.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-simple.el b/site/cedet-1.0pre7/ede/ede-simple.el
new file mode 100644
index 0000000..de8bfd4
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-simple.el
@@ -0,0 +1,126 @@
+;;; ede-simple.el --- Overlay an EDE structure on an existing project
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-simple.el,v 1.10 2009/02/25 23:08:25 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A vast majority of projects use non-EDE project techniques, such
+;; as hand written Makefiles, or other IDE's.
+;;
+;; The EDE-SIMPLE project type allows EDE to wrap an existing mechanism
+;; with minimal configuration, and then provides project-root
+;; information to Semantic or other tools, and also provides structure
+;; information for in-project include header discovery, or speedbar
+;; support.
+;;
+;; It will also support a the minimal EDE UI for compilation and
+;; configuration.
+
+;; @todo - Add support for cpp-root as an ede-simple project.
+;; @todo - Allow ede-simple to store locally.
+
+(require 'ede)
+(require 'cedet-files)
+
+;;; Code:
+;;;###autoload
+;; @todo - below is not compatible w/ Emacs 20!
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "simple-overlay"
+	      :name "Simple" :file 'ede-simple
+	      :proj-file 'ede-simple-projectfile-for-dir
+	      :load-type 'ede-simple-load
+	      :class-sym 'ede-simple-project)
+	     t)
+
+(defcustom ede-simple-save-directory "~/.ede"
+  "*Directory where simple EDE project overlays are saved."
+ :group 'ede
+ :type 'directory)
+
+(defcustom ede-simple-save-file-name "ProjSimple.ede"
+  "*File name used for simple project wrappers."
+  :group 'ede
+  :type 'string)
+
+;;;###autoload
+(defun ede-simple-projectfile-for-dir (&optional dir)
+  "Return a full file name to the project file stored in the current directory.
+The directory has three parts:
+  <STORAGE ROOT>/<PROJ DIR AS FILE>/ProjSimple.ede"
+  (let ((d (or dir default-directory))
+	)
+    (concat
+     ;; Storage root
+     (file-name-as-directory (expand-file-name ede-simple-save-directory))
+     ;; Convert directory to filename
+     (cedet-directory-name-to-file-name d)
+     ;; Filename
+     ede-simple-save-file-name)
+    ))
+
+;;;###autoload
+(defun ede-simple-load (dir &optional rootproj)
+  "Load a project of type `Simple' for the directory DIR.
+Return nil if there isn't one.
+ROOTPROJ is nil, since we will only create a single EDE project here."
+  (let ((pf (ede-simple-projectfile-for-dir dir))
+	(obj nil))
+    (when pf
+      (setq obj (eieio-persistent-read pf))
+      (oset obj :directory dir)
+      )
+    obj))
+
+(defclass ede-simple-target (ede-target)
+  ()
+  "EDE Simple project target.
+All directories need at least one target.")
+
+;;;###autoload
+(defclass ede-simple-project (ede-project eieio-persistent)
+  ((extension :initform ".ede")
+   (file-header-line :initform ";; EDE Simple Project")
+   )
+  "EDE Simple project class.
+Each directory needs a a project file to control it.")
+
+(defmethod ede-commit-project ((proj ede-simple-project))
+  "Commit any change to PROJ to its file."
+  (when (not (file-exists-p ede-simple-save-directory))
+    (if (y-or-n-p (concat ede-simple-save-directory
+			  " doesn't exist.  Create? "))
+	(make-directory ede-simple-save-directory)
+      (error "No save directory for new project")))
+  (eieio-persistent-save proj))
+
+(defmethod ede-find-subproject-for-directory ((proj ede-simple-project)
+					      dir)
+  "Return PROJ, for handling all subdirs below DIR."
+  proj)
+
+;;; TEST
+;;
+;; @TODO - write a simple test for EDE simple.
+
+(provide 'ede-simple)
+
+;;; ede-simple.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-source.el b/site/cedet-1.0pre7/ede/ede-source.el
new file mode 100755
index 0000000..1087cc9
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-source.el
@@ -0,0 +1,168 @@
+;;; ede-source.el --- EDE source code object
+
+;;;  Copyright (C) 2000, 2008  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-source.el,v 1.5 2008/12/28 22:14:28 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; Manage different types of source code.  A master list of source code types
+;; will be maintained, and used to track target objects, what they accept,
+;; and what compilers can be used.
+
+(require 'eieio-base)
+
+;;; Code:
+(defclass ede-sourcecode (eieio-instance-inheritor)
+  ((name :initarg :name
+	 :type string
+	 :documentation
+	 "The name of this type of source code.
+Such as \"C\" or \"Emacs Lisp\"")
+   (sourcepattern :initarg :sourcepattern
+		  :initform ".*"
+		  :type string
+		  :documentation
+		  "Emacs regexp matching sourcecode this target accepts.")
+   (auxsourcepattern :initarg :auxsourcepattern
+		     :initform nil
+		     :type (or null string)
+		     :documentation
+		     "Emacs regexp matching auxiliary source code this target accepts.
+Aux source are source code files needed for compilation, which are not compiled
+themselves.")
+   (enable-subdirectories :initarg :enable-subdirectories
+			  :initform nil
+			  :type boolean
+			  :documentation
+			  "Non nil if this sourcecode type uses subdirectories.
+If sourcecode always lives near the target creating it, this should be nil.
+If sourcecode can, or typically lives in a subdirectory of the owning
+target, set this to t.")
+   (garbagepattern :initarg :garbagepattern
+		   :initform nil
+		   :type list
+		   :documentation
+		   "Shell file regexp matching files considered as garbage.
+This is a list of items added to an `rm' command when executing a `clean'
+type directive.")
+   )
+  "Description of some type of source code.
+Objects will use sourcecode objects to define the types of source
+that they are willing to use.")
+
+(defvar ede-sourcecode-list nil
+  "The master list of all EDE compilers.")
+
+;;; Methods
+;;
+(defmethod initialize-instance :AFTER ((this ede-sourcecode) &rest fields)
+  "Make sure that all ede compiler objects are cached in 
+`ede-compiler-list'."
+  (let ((lst ede-sourcecode-list))
+    ;; Find an object of the same name.
+    (while (and lst (not (string= (oref this name) (oref (car lst) name))))
+      (setq lst (cdr lst)))
+    (if lst
+	;; Replace old definition
+	(setcar lst this)
+      ;; Add to the beginning of the list.
+      (setq ede-sourcecode-list (cons this ede-sourcecode-list)))))
+
+(defmethod ede-want-file-p ((this ede-sourcecode) filename)
+  "Return non-nil if sourcecode definition THIS will take FILENAME."
+  (or (ede-want-file-source-p this filename)
+      (ede-want-file-auxiliary-p this filename)))
+
+(defmethod ede-want-file-source-p ((this ede-sourcecode) filename)
+  "Return non-nil if THIS will take FILENAME as an auxiliary ."
+  (let ((case-fold-search nil))
+    (string-match (oref this sourcepattern) filename)))
+
+(defmethod ede-want-file-auxiliary-p ((this ede-sourcecode) filename)
+  "Return non-nil if THIS will take FILENAME as an auxiliary ."
+  (let ((case-fold-search nil))
+    (and (slot-boundp this 'auxsourcepattern)
+	 (oref this auxsourcepattern)
+	 (string-match (oref this auxsourcepattern) filename))))
+
+(defmethod ede-want-any-source-files-p ((this ede-sourcecode) filenames)
+  "Return non-nil if THIS will accept any source files in FILENAMES."
+  (ede-or (mapcar (lambda (c) (ede-want-file-source-p this c))
+		  filenames)))
+
+(defmethod ede-want-any-auxiliary-files-p ((this ede-sourcecode) filenames)
+  "Return non-nil if THIS will accept any aux files in FILENAMES."
+  (ede-or (mapcar (lambda (c) (ede-want-file-auxiliary-p this c))
+		  filenames)))
+
+(defmethod ede-want-any-files-p ((this ede-sourcecode) filenames)
+  "Return non-nil if THIS will accept any files in FILENAMES."
+  (ede-or (mapcar (lambda (c) (ede-want-file-p this c))
+		  filenames)))
+
+(defmethod ede-buffer-header-file ((this ede-sourcecode) filename)
+  "Return a list of file names of header files for THIS with FILENAME.
+Used to guess header files, but uses the auxsource regular expression."
+  (let ((dn (file-name-directory filename))
+	(ts (file-name-sans-extension (file-name-nondirectory filename)))
+	(ae (oref this auxsourcepattern)))
+    (if (not ae)
+	nil
+      (directory-files dn t (concat (regexp-quote ts) ae)))))
+
+;;; Utility functions
+;;
+(when nil
+  ;; not used at the moment.
+(defun ede-source-find (name)
+  "Find the sourcecode object based on NAME."
+  (object-assoc name :name ede-sourcecode-list))
+
+(defun ede-source-match (file)
+  "Find the list of soucecode objects which matches FILE."
+  (let ((lst ede-sourcecode-list)
+	(match nil))
+    (while lst
+      ;; ede-file-mine doesn't exist yet
+      (if (ede-file-mine (car lst) file)
+	  (setq match (cons (car lst) match)))
+      (setq lst (cdr lst)))
+    match))
+)
+;;; Master list of source code types
+;;
+;; This must appear at the end so that the init method will work.
+(defvar ede-source-scheme
+  (ede-sourcecode "ede-source-scheme"
+		  :name "Scheme"
+		  :sourcepattern "\\.scm$")
+  "Scheme source code definition.")
+
+;;(defvar ede-source-
+;;  (ede-sourcecode "ede-source-"
+;;		    :name ""
+;;		    :sourcepattern "\\.$"
+;;		    :garbagepattern '("*."))
+;;  " source code definition.")
+
+(provide 'ede-source)
+
+;;; ede-source.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-sourcecode.texi b/site/cedet-1.0pre7/ede/ede-sourcecode.texi
new file mode 100644
index 0000000..4338519
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-sourcecode.texi
@@ -0,0 +1,129 @@
+@c -*-texinfo-*-
+@c
+@c $Id: ede-sourcecode.texi,v 1.3 2008/09/07 14:35:51 zappo Exp $
+@c
+
+@c The next line is for the back-search to see what node this one
+@c resides in.
+
+@c @node Sourcecode,
+@c @chapter Source Code Types
+
+@c This command is a convenience to help rebuild this file.  Use C-x C-e
+@c on the expression below to rebuild the entire index (but only
+@c after loading in all relevant source files.)
+
+@c (eieiodoc-class ede-sourcecode "sc")
+@menu
+* ede-sourcecode ::
+@end menu
+
+
+@node ede-sourcecode,  ,  , Sourcecode
+@comment  node-name,  next,  previous,  up
+@section ede-sourcecode
+@scindex ede-sourcecode
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-instance-inheritor
+@table @code
+@item ede-sourcecode
+No children
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-sourcecode
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :parent-instance
+Type: @code{eieio-instance-inheritor-child}
+
+The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.
+@refill
+
+@item :name
+Type: @code{string}
+
+The name of this type of source code.
+Such as "C" or "Emacs Lisp"
+@refill
+
+@item :sourcepattern
+Type: @code{string} @*
+Default Value: @code{".*"}
+
+Emacs regex matching sourcecode this target accepts.
+@refill
+
+@item :auxsourcepattern
+Type: @code{(or null string)} @*
+Default Value: @code{nil}
+
+Emacs regex matching auxiliary source code this target accepts.
+Aux source are source code files needed for compilation, which are not comiled
+themselves.
+@refill
+
+@item :enable-subdirectories
+Type: @code{boolean} @*
+Default Value: @code{nil}
+
+Non @code{nil} if this sourcecode type uses subdirectores.
+If sourcecode always lives near the target creating it, this should be nil.
+If sourcecode can, or typically lives in a subdirectory of the owning
+target, set this to t.
+@refill
+
+@item :garbagepattern
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Shell file regex matching files considered as garbage.
+This is a list of items added to an @code{rm} command when executing a @code{clean}
+type directive.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-want-any-files-p :AFTER this filenames 
+Return non-@code{nil} if @var{THIS} will accept any files in @var{FILENAMES}.
+@end deffn
+
+@deffn Method ede-want-any-source-files-p :AFTER this filenames 
+Return non-@code{nil} if @var{THIS} will accept any source files in @var{FILENAMES}.
+@end deffn
+
+@deffn Method ede-want-any-auxiliary-files-p :AFTER this filenames 
+Return non-@code{nil} if @var{THIS} will accept any aux files in @var{FILENAMES}.
+@end deffn
+
+@deffn Method ede-buffer-header-file :AFTER this filename 
+Return a list of file names of header files for @var{THIS} with @var{FILENAME}.
+Used to guess header files, but uses the auxsource regular expression.
+@end deffn
+
+@deffn Method ede-want-file-p :AFTER this filename 
+Return non-@code{nil} if sourcecode definition @var{THIS} will take @var{FILENAME}.
+@end deffn
+
+@deffn Method ede-want-file-source-p :AFTER this filename 
+Return non-@code{nil} if @var{THIS} will take @var{FILENAME} as an auxiliary .
+@end deffn
+
+@deffn Method ede-want-file-auxiliary-p :AFTER this filename 
+Return non-@code{nil} if @var{THIS} will take @var{FILENAME} as an auxiliary .
+@end deffn
+
+
diff --git a/site/cedet-1.0pre7/ede/ede-speedbar.el b/site/cedet-1.0pre7/ede/ede-speedbar.el
new file mode 100755
index 0000000..ef5a0c5
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-speedbar.el
@@ -0,0 +1,354 @@
+;;; ede-speedbar.el --- Speedbar viewing of EDE projects
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make, tags
+;; RCS: $Id: ede-speedbar.el,v 1.35 2010/01/07 02:15:15 zappo Exp $
+
+;; This file is NOT part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Display a project's hierarchy in speedbar.
+;;
+
+;;; Code:
+(require 'speedbar)
+(require 'eieio-speedbar)
+
+;;; Speedbar support mode
+;;
+(defvar ede-speedbar-key-map nil
+  "A Generic object based speedbar display keymap.")
+
+(defun ede-speedbar-make-map ()
+  "Make the generic object based speedbar keymap."
+  (setq ede-speedbar-key-map (speedbar-make-specialized-keymap))
+
+  ;; General viewing things
+  (define-key ede-speedbar-key-map "\C-m" 'speedbar-edit-line)
+  (define-key ede-speedbar-key-map "+" 'speedbar-expand-line)
+  (define-key ede-speedbar-key-map "=" 'speedbar-expand-line)
+  (define-key ede-speedbar-key-map "-" 'speedbar-contract-line)
+  (define-key ede-speedbar-key-map " " 'speedbar-toggle-line-expansion)
+
+  ;; Some object based things
+  (define-key ede-speedbar-key-map "C" 'eieio-speedbar-customize-line)
+
+  ;; Some project based things
+  (define-key ede-speedbar-key-map "R" 'ede-speedbar-remove-file-from-target)
+  (define-key ede-speedbar-key-map "b" 'ede-speedbar-compile-line)
+  (define-key ede-speedbar-key-map "B" 'ede-speedbar-compile-project)
+  (define-key ede-speedbar-key-map "D" 'ede-speedbar-make-distribution)
+  (define-key ede-speedbar-key-map "E" 'ede-speedbar-edit-projectfile)
+  )
+
+(defvar ede-speedbar-menu
+  '([ "Compile" ede-speedbar-compile-line t]
+    [ "Compile Project" ede-speedbar-compile-project
+      (ede-project-child-p (speedbar-line-token)) ]
+    "---"
+    [ "Edit File/Tag" speedbar-edit-line
+      (not (eieio-object-p (speedbar-line-token)))]
+    [ "Expand" speedbar-expand-line
+      (save-excursion (beginning-of-line)
+		      (looking-at "[0-9]+: *.\\+. "))]
+    [ "Contract" speedbar-contract-line
+      (save-excursion (beginning-of-line)
+		      (looking-at "[0-9]+: *.-. "))]
+    "---"
+    [ "Remove File from Target" ede-speedbar-remove-file-from-target
+      (stringp (speedbar-line-token)) ]
+    [ "Customize Project/Target" eieio-speedbar-customize-line
+      (eieio-object-p (speedbar-line-token)) ]
+    [ "Edit Project File" ede-speedbar-edit-projectfile t]
+    [ "Make Distribution" ede-speedbar-make-distribution
+      (ede-project-child-p (speedbar-line-token)) ]
+    )
+  "Menu part in easymenu format used in speedbar while browsing objects.")
+
+(eieio-speedbar-create 'ede-speedbar-make-map
+		       'ede-speedbar-key-map
+		       'ede-speedbar-menu
+		       "Project"
+		       'ede-speedbar-toplevel-buttons)
+
+
+(defun ede-speedbar ()
+  "EDE development environment project browser for speedbar."
+  (interactive)
+  (speedbar-frame-mode 1)
+  (speedbar-change-initial-expansion-list "Project")
+  (speedbar-get-focus)
+  )
+
+(defun ede-speedbar-toplevel-buttons (dir)
+  "Return a list of objects to display in speedbar.
+Argument DIR is the directory from which to derive the list of objects."
+  ede-projects
+  )
+
+;;; Some special commands useful in EDE
+;;
+(defun ede-speedbar-remove-file-from-target ()
+  "Remove the file at point from its target."
+  (interactive)
+  (if (stringp (speedbar-line-token))
+      (progn
+	(speedbar-edit-line)
+	(ede-remove-file))))
+
+(defun ede-speedbar-compile-line ()
+  "Compile/Build the project or target on this line."
+  (interactive)
+  (let ((obj (eieio-speedbar-find-nearest-object)))
+    (if (not (eieio-object-p obj))
+	nil
+      (cond ((obj-of-class-p obj ede-project)
+	     (project-compile-project obj))
+	    ((obj-of-class-p obj ede-target)
+	     (project-compile-target obj))
+	    (t (error "Error in speedbar structure"))))))
+
+(defun ede-speedbar-get-top-project-for-line ()
+  "Return a project object for this line."
+  (interactive)
+  (let ((obj (eieio-speedbar-find-nearest-object)))
+    (if (not (eieio-object-p obj))
+	(error "Error in speedbar or ede structure")
+      (if (obj-of-class-p obj ede-target)
+	  (setq obj (ede-target-parent obj)))
+      (if (obj-of-class-p obj ede-project)
+	  obj
+	(error "Error in speedbar or ede structure")))))
+
+(defun ede-speedbar-compile-project ()
+  "Compile/Build the project which owns this line."
+  (interactive)
+  (project-compile-project (ede-speedbar-get-top-project-for-line)))
+
+(defun ede-speedbar-compile-file-project ()
+  "Compile/Build the target which the current file belongs to."
+  (interactive)
+  (let* ((file (speedbar-line-file))
+	 (buf (find-file-noselect file))
+	 (bwin (get-buffer-window buf 0)))
+    (if bwin
+	(progn
+	  (select-window bwin)
+	  (raise-frame (window-frame bwin)))
+      (dframe-select-attached-frame speedbar-frame)
+      (set-buffer buf)
+      (ede-compile-target))))
+
+(defun ede-speedbar-make-distribution ()
+  "Edit the project file based on this line."
+  (interactive)
+  (project-make-dist (ede-speedbar-get-top-project-for-line)))
+
+(defun ede-speedbar-edit-projectfile ()
+  "Edit the project file based on this line."
+  (interactive)
+  (project-edit-file-target (ede-speedbar-get-top-project-for-line)))
+
+;;; Speedbar Project Methods
+;;
+(defun ede-find-nearest-file-line ()
+  "Go backwards until we find a file."
+  (save-excursion
+    (beginning-of-line)
+    (looking-at "^\\([0-9]+\\):")
+    (let ((depth (string-to-number (match-string 1))))
+      (while (not (re-search-forward "[]] [^ ]"
+				     (save-excursion (end-of-line)
+						     (point))
+				     t))
+	(re-search-backward (format "^%d:" (1- depth)))
+	(setq depth (1- depth)))
+      (speedbar-line-token))))
+
+(defmethod eieio-speedbar-derive-line-path ((obj ede-project) &optional depth)
+  "Return the path to OBJ.
+Optional DEPTH is the depth we start at."
+  (file-name-directory (oref obj file))
+  )
+
+(defmethod eieio-speedbar-derive-line-path ((obj ede-target) &optional depth)
+  "Return the path to OBJ.
+Optional DEPTH is the depth we start at."
+  (let ((proj (ede-target-parent obj)))
+    ;; Check the type of line we are currently on.
+    ;; If we are on a child, we need a file name too.
+    (save-excursion
+      (let ((lt (speedbar-line-token)))
+	(if (or (eieio-object-p lt) (stringp lt))
+	    (eieio-speedbar-derive-line-path proj)
+	  ;; a child element is a token.  Do some work to get a filename too.
+	  (concat (eieio-speedbar-derive-line-path proj)
+		  (ede-find-nearest-file-line)))))))
+
+(defmethod eieio-speedbar-description ((obj ede-project))
+  "Provide a speedbar description for OBJ."
+  (ede-description obj))
+
+(defmethod eieio-speedbar-description ((obj ede-target))
+  "Provide a speedbar description for OBJ."
+  (ede-description obj))
+
+(defmethod eieio-speedbar-child-description ((obj ede-target))
+  "Provide a speedbar description for a plain-child of OBJ.
+A plain child is a child element which is not an EIEIO object."
+  (or (speedbar-item-info-file-helper)
+      (speedbar-item-info-tag-helper)))
+
+(defmethod eieio-speedbar-object-buttonname ((object ede-project))
+  "Return a string to use as a speedbar button for OBJECT."
+  (if (ede-parent-project object)
+      (ede-name object)
+    (concat (ede-name object) " " (oref object version))))
+
+(defmethod eieio-speedbar-object-buttonname ((object ede-target))
+  "Return a string to use as a speedbar button for OBJECT."
+  (ede-name object))
+
+(defmethod eieio-speedbar-object-children ((this ede-project))
+  "Return the list of speedbar display children for THIS."
+  (condition-case nil
+      (with-slots (subproj targets) this
+	(append subproj targets))
+    (error nil)))
+
+(defmethod eieio-speedbar-object-children ((this ede-target))
+  "Return the list of speedbar display children for THIS."
+  (oref this source))
+
+(defmethod eieio-speedbar-child-make-tag-lines ((this ede-target) depth)
+  "Create a speedbar tag line for a child of THIS.
+It has depth DEPTH."
+  (with-slots (source) this
+    (mapcar (lambda (car)
+ 	      (speedbar-make-tag-line 'bracket ?+
+ 				      'speedbar-tag-file
+				      car
+ 				      car
+ 				      'ede-file-find
+ 				      car
+ 				      'speedbar-file-face depth))
+	    source)))
+
+;;; Generic file management for TARGETS
+;;
+(defun ede-file-find (text token indent)
+  "Find the file TEXT at path TOKEN.
+INDENT is the current indentation level."
+  (speedbar-find-file-in-frame
+   (expand-file-name token (speedbar-line-directory indent)))
+  (speedbar-maybee-jump-to-attached-frame))
+
+(defun ede-create-tag-buttons (filename indent)
+  "Create the tag buttons associated with FILENAME at INDENT."
+  (let* ((lst (speedbar-fetch-dynamic-tags filename)))
+    ;; if no list, then remove expando button
+    (if (not lst)
+	(speedbar-change-expand-button-char ??)
+      (speedbar-with-writable
+	;; We must do 1- because indent was already incremented.
+	(speedbar-insert-generic-list (1- indent)
+				      lst
+				      'ede-tag-expand
+				      'ede-tag-find)))))
+
+(defun ede-tag-expand (text token indent)
+  "Expand a tag sublist.  Imenu will return sub-lists of specialized tag types.
+Etags does not support this feature.  TEXT will be the button
+string.  TOKEN will be the list, and INDENT is the current indentation
+level."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (speedbar-insert-generic-list indent token
+					   'ede-tag-expand
+					   'ede-tag-find))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defun ede-tag-find (text token indent)
+  "For the tag TEXT in a file TOKEN, goto that position.
+INDENT is the current indentation level."
+  (let ((file (ede-find-nearest-file-line)))
+    (speedbar-find-file-in-frame file)
+    (save-excursion (speedbar-stealthy-updates))
+    ;; Reset the timer with a new timeout when cliking a file
+    ;; in case the user was navigating directories, we can cancel
+    ;; that other timer.
+;    (speedbar-set-timer speedbar-update-speed)
+    (goto-char token)
+    (run-hooks 'speedbar-visiting-tag-hook)
+    ;;(recenter)
+    (speedbar-maybee-jump-to-attached-frame)
+    ))
+
+;;; EDE and the speedbar FILE display
+;;
+;; This will add a couple keybindings and menu items into the
+;; FILE display for speedbar.
+
+(defvar ede-speedbar-file-menu-additions
+  '("----"
+    ["Create EDE Target" ede-new-target (ede-current-project) ]
+    ["Add to project" ede-speedbar-file-add-to-project (ede-current-project) ]
+    ["Compile project" ede-speedbar-compile-project (ede-current-project) ]
+    ["Compile file target" ede-speedbar-compile-file-target (ede-current-project) ]
+    ["Make distribution" ede-make-dist (ede-current-project) ]
+    )
+  "Set of menu items to splice into the speedbar menu.")
+
+(defvar ede-speedbar-file-keymap
+  (let ((km (make-sparse-keymap)))
+    (define-key km "a" 'ede-speedbar-file-add-to-project)
+    (define-key km "t" 'ede-new-target)
+    (define-key km "s" 'ede-speedbar)
+    (define-key km "C" 'ede-speedbar-compile-project)
+    (define-key km "c" 'ede-speedbar-compile-file-target)
+    (define-key km "d" 'ede-make-dist)
+    km)
+  "Keymap spliced into the speedbar keymap.")
+
+(defun ede-speedbar-file-setup ()
+  "Setup some keybindings in the Speedbar File display."
+  (setq speedbar-easymenu-definition-special
+	(append speedbar-easymenu-definition-special
+		ede-speedbar-file-menu-additions
+		))
+  (define-key speedbar-file-key-map "." ede-speedbar-file-keymap)
+  ;; Finally, if the FILES mode is loaded, force a refresh
+  ;; of the menus and such.
+  (when (and (string= speedbar-initial-expansion-list-name "files")
+	     (buffer-live-p speedbar-buffer)
+	     )
+    (speedbar-change-initial-expansion-list "files")))
+
+(provide 'ede-speedbar)
+
+;;; ede-speedbar.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-srecode.el b/site/cedet-1.0pre7/ede/ede-srecode.el
new file mode 100644
index 0000000..9125192
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-srecode.el
@@ -0,0 +1,97 @@
+;;; ede-srecode.el --- EDE utilities on top of SRecoder
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: ede-srecode.el,v 1.2 2008/09/01 02:53:58 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; EDE utilities for using SRecode to generate project files, such as
+;; Makefiles.
+
+(require 'srecode)
+
+;;; Code:
+;;;###autoload
+(defun ede-srecode-setup ()
+  "Update various paths to get SRecode to identify our macros."
+  (let* ((lib (locate-library "ede.el" t))
+	 (ededir (file-name-directory lib))
+	 (tmpdir (file-name-as-directory
+		  (expand-file-name "templates" ededir))))
+    (when (not tmpdir)
+      (error "Unable to location EDE Templates directory"))
+
+    ;; Rig up the map.
+    (require 'srecode-map)
+    (add-to-list 'srecode-map-load-path tmpdir)
+    (srecode-map-update-map t)
+    
+    ;; We don't call this unless we need it.  Load in the templates.
+    (srecode-load-tables-for-mode 'makefile-mode)
+    (srecode-load-tables-for-mode 'makefile-mode 'ede)
+
+    ;; @todo - autoconf files.
+
+    ))
+
+(defmacro ede-srecode-insert-with-dictionary (template &rest forms)
+  "Insert TEMPLATE after executing FORMS with a dictionary.
+TEMPLATE should specify a context by using a string format of:
+  context:templatename
+Locally binds the variable DICT to a dictionary which can be
+updated in FORMS."
+  `(let* ((dict (srecode-create-dictionary))
+	  (temp (srecode-template-get-table (srecode-table)
+					    ,template
+					    nil
+					    'ede))
+	  )
+     (when (not temp)
+       (error "EDE template %s for %s not found!"
+	      ,template major-mode))
+     (srecode-resolve-arguments temp dict)
+
+     ;; Now execute forms for updating DICT.
+     (progn ,@forms)
+
+     (srecode-insert-fcn temp dict)
+     ))
+
+;;;###autoload
+(defun ede-srecode-insert (template &rest dictionary-entries)
+  "Insert at the current point TEMPLATE.
+TEMPLATE should specify a context by using a string format of:
+  context:templatename
+Add DICTIONARY-ENTRIES into the dictionary before insertion.
+Note: Just like `srecode-insert', but templates found in 'ede app."
+  (ede-srecode-insert-with-dictionary template
+
+    ;; Add in optional dictionary entries.
+    (while dictionary-entries
+      (srecode-dictionary-set-value dict
+				    (car dictionary-entries)
+				    (car (cdr dictionary-entries)))
+      (setq dictionary-entries
+	    (cdr (cdr dictionary-entries))))
+
+    ))
+
+(provide 'ede-srecode)
+;;; ede-srecode.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-system.el b/site/cedet-1.0pre7/ede/ede-system.el
new file mode 100644
index 0000000..23dbc6a
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-system.el
@@ -0,0 +1,138 @@
+;;; ede-system.el --- EDE working with the system (VC, FTP, ETC)
+
+;;;  Copyright (C) 2001, 2002, 2003, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make, vc
+;; RCS: $Id: ede-system.el,v 1.6 2009/10/16 18:33:59 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; EDE system contains some routines to work with EDE projects saved in
+;; CVS repositories, and services such as sourceforge which lets you
+;; perform releases via FTP.
+
+(require 'ede)
+
+;;; Code:
+
+;;; Web/FTP site node.
+;;
+(defun ede-web-browse-home ()
+  "Browse the home page of the current project."
+  (interactive)
+  (if (not (ede-toplevel))
+      (error "No project"))
+  (let ((home (oref (ede-toplevel) web-site-url)))
+    (if (string= "" home)
+	(error "Now URL is stored in this project"))
+    (require 'browse-url)
+    (browse-url home)
+    ))
+
+
+(defun ede-edit-web-page ()
+  "Edit the web site for this project."
+  (interactive)
+  (let* ((toplevel (ede-toplevel))
+	 (dir (oref toplevel web-site-directory))
+	 (file (oref toplevel web-site-file))
+	 (endfile (concat (file-name-as-directory dir) file)))
+    (if (string-match "^/r[:@]" endfile)
+	(require 'tramp))
+    (when (not (file-exists-p endfile))
+      (setq endfile file)
+      (if (string-match "^/r[:@]" endfile)
+	  (require 'tramp))
+      (if (not (file-exists-p endfile))
+	  (error "No project file found")))
+    (find-file endfile)))
+	 
+
+(defun ede-upload-distribution ()
+  "Upload the current distribution to the correct location.
+Use /user@ftp.site.com: file names for FTP sites.
+Download tramp, and use /r:machine: for names on remote sites w/out FTP access."
+  (interactive)
+  (let* ((files (project-dist-files (ede-toplevel)))
+	 (upload (if (string= (oref (ede-toplevel) ftp-upload-site) "")
+		     (oref (ede-toplevel) ftp-site)
+		   (oref (ede-toplevel) ftp-upload-site))))
+    (when (or (string= upload "")
+	      (not (file-exists-p upload)))
+      (error "Upload directory %S does not exist" upload))
+    (while files
+      (let ((localfile (concat (file-name-directory (oref (ede-toplevel) file))
+			       (car files))))
+	(if (not (file-exists-p localfile))
+	    (progn
+	      (message "File %s does not exist yet.  Building a distribution"
+		       localfile)
+	      (ede-make-dist)
+	      (error "File %s does not exist yet.  Building a distribution"
+		     localfile)
+	      ))
+	(setq upload
+	      (concat (directory-file-name upload)
+		      "/"
+		      (file-name-nondirectory localfile)))
+	(copy-file localfile upload)
+	(setq files (cdr files)))))
+  (message "Done uploading files...")
+  )
+
+(defun ede-upload-html-documentation ()
+  "Upload the current distributions documentation as HTML.
+Use /user@ftp.site.com: file names for FTP sites.
+Download tramp, and use /r:machine: for names on remote sites w/out FTP access."
+  (interactive)
+  (let* ((files nil) ;(ede-html-doc-files (ede-toplevel)))
+	 (upload (if (string= (oref (ede-toplevel) ftp-upload-site) "")
+		     (oref (ede-toplevel) ftp-site)
+		   (oref (ede-toplevel) ftp-upload-site))))
+    (when (or (string= upload "")
+	      (not (file-exists-p upload)))
+      (error "Upload directory %S does not exist" upload))
+    (while files
+      (let ((localfile (concat (file-name-directory (oref (ede-toplevel) file))
+			       (car files))))
+	(if (not (file-exists-p localfile))
+	    (progn
+	      (message "File %s does not exist yet.  Building a distribution"
+		       localfile)
+	      ;;(project-compile-target ... )
+	      (error "File %s does not exist yet.  Building a distribution"
+		     localfile)
+	      ))
+	(copy-file localfile upload)
+	(setq files (cdr files)))))
+  (message "Done uploading files...")
+  )
+
+;;; Version Control
+;;
+;; Do a few nice things with Version control systems.
+(defun ede-vc-project-directory ()
+  "Run `vc-directory' on the current project."
+  (interactive)
+  (let ((top (ede-toplevel-project-or-nil default-directory)))
+    (vc-directory top nil)))
+
+(provide 'ede-system)
+
+;;; ede-system.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede-targets.texi b/site/cedet-1.0pre7/ede/ede-targets.texi
new file mode 100644
index 0000000..9f8ac4c
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-targets.texi
@@ -0,0 +1,2790 @@
+@c -*-texinfo-*-
+@c
+@c $Id: ede-targets.texi,v 1.5 2010/01/07 02:15:42 zappo Exp $
+@c
+
+@c The next line is for the back-search to see what node this one
+@c resides in.
+
+@c @node Targets,
+@c @chapter Target Listing
+
+@c This command is a convenience to help rebuild this file.  Use C-x C-e
+@c on the expression below to rebuild the entire index (but only
+@c after loading in all relevant source files.)
+
+@c (eieiodoc-class ede-target "tg")
+@menu
+* ede-target ::
+*  ede-cpp-root-target ::
+*  ede-emacs-target-c ::
+*  ede-emacs-target-el ::
+*  ede-emacs-target-misc ::
+*  ede-linux-target-c ::
+*  ede-linux-target-misc ::
+*  ede-maven-target-java ::
+*  ede-maven-target-c ::
+*  ede-maven-target-misc ::
+*  ede-simple-target ::
+*  ede-proj-target ::
+*   ede-proj-target-makefile ::
+*    semantic-ede-proj-target-grammar ::
+*    ede-proj-target-makefile-objectcode ::
+*     ede-proj-target-makefile-archive ::
+*     ede-proj-target-makefile-program ::
+*      ede-proj-target-makefile-shared-object ::
+*    ede-proj-target-elisp ::
+*     ede-proj-target-elisp-autoloads ::
+*    ede-proj-target-makefile-miscelaneous ::
+*    ede-proj-target-makefile-info ::
+*   ede-proj-target-aux ::
+*   ede-proj-target-scheme ::
+*  project-am-target ::
+*   project-am-objectcode ::
+*    project-am-program ::
+*    project-am-lib ::
+*   project-am-header ::
+*    project-am-header-noinst ::
+*    project-am-header-inst ::
+*   project-am-lisp ::
+*   project-am-texinfo ::
+*   project-am-man ::
+@end menu
+
+
+@node ede-target, ede-cpp-root-target,  , Targets
+@comment  node-name,  next,  previous,  up
+@section ede-target
+@tgindex ede-target
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item ede-target
+@table @asis
+@item Children:
+@w{@xref{ede-cpp-root-target},} @w{@xref{ede-emacs-target-c},} @w{@xref{ede-emacs-target-el},} @w{@xref{ede-emacs-target-misc},} @w{@xref{ede-linux-target-c},} @w{@xref{ede-linux-target-misc},} @w{@xref{ede-maven-target-java},} @w{@xref{ede-maven-target-c},} @w{@xref{ede-maven-target-misc},} @w{@xref{ede-simple-target},} @w{@xref{ede-proj-target},} @w{@xref{project-am-target}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-target
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :source
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Source files in this target.
+@refill
+
+@item :versionsource
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Source files with a version string in them.
+These files are checked for a version string whenever the EDE version
+of the master project is changed.  When strings are found, the version
+previously there is updated.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for project @var{THIS}.
+@end deffn
+
+@deffn Method eieio-speedbar-description :AFTER obj 
+Provide a speedbar description for @var{OBJ}.
+@end deffn
+
+@deffn Method project-compile-target :AFTER obj &optional command 
+Compile the current target @var{OBJ}.
+Argument @var{COMMAND} is the command to use for compiling the target.
+@end deffn
+
+@deffn Method project-debug-target :AFTER obj 
+Run the current project target @var{OBJ} in a debugger.
+@end deffn
+
+@deffn Method ede-convert-path :AFTER this path 
+Convert path in a standard way for a given project.
+Default to making it project relative.
+Argument @var{THIS} is the project to convert @var{PATH} to.
+@end deffn
+
+@deffn Method ede-name :AFTER this 
+Return the name of @var{THIS} targt.
+@end deffn
+
+@deffn Method ede-target-buffer-in-sourcelist :AFTER this buffer source 
+Return non-@code{nil} if object @var{THIS} is in @var{BUFFER} to a @var{SOURCE} list.
+Handles complex path issues.
+@end deffn
+
+@deffn Method eieio-speedbar-derive-line-path :AFTER obj &optional depth 
+Return the path to @var{OBJ}.
+Optional @var{DEPTH} is the depth we start at.
+@end deffn
+
+@deffn Method ede-buffer-header-file :AFTER this buffer 
+There are no default header files in EDE.
+Do a quick check to see if there is a Header tag in this buffer.
+@end deffn
+
+@deffn Method project-remove-file :AFTER ot fnnd 
+Remove the current buffer from project target @var{OT}.
+Argument @var{FNND} is an argument.
+@end deffn
+
+@deffn Method ede-buffer-documentation-files :AFTER this buffer 
+Check for some documentation files for @var{THIS}.
+Also do a quick check to see if there is a Documentation tag in this @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return non-@code{nil} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-map-target-buffers :AFTER this proc 
+For @var{THIS}, execute @var{PROC} on all buffers belonging to @var{THIS}.
+@end deffn
+
+@deffn Method eieio-speedbar-child-description :AFTER obj 
+Provide a speedbar description for a plain-child of @var{OBJ}.
+A plain child is a child element which is not an EIEIO object.
+@end deffn
+
+@deffn Method ede-object-keybindings :BEFORE this 
+Retrieves the slot @code{keybindings} from an object of class @code{ede-target}
+@end deffn
+
+@deffn Method ede-description :AFTER this 
+Return a description suitable for the minibuffer about @var{THIS}.
+@end deffn
+
+@deffn Method eieio-speedbar-object-children :AFTER this 
+Return the list of speedbar display children for @var{THIS}.
+@end deffn
+
+@deffn Method ede-system-include-path :AFTER this 
+Get the system include path used by project @var{THIS}.
+@end deffn
+
+@deffn Method ede-object-sourcecode :BEFORE this 
+Retrieves the slot @code{sourcetype} from an object of class @code{ede-target}
+@end deffn
+
+@deffn Method ede-expand-filename :AFTER this filename &optional force 
+Return a fully qualified file name based on target @var{THIS}.
+@var{FILENAME} should a a filename which occurs in a directory in which @var{THIS} works.
+Optional argument @var{FORCE} forces the default filename to be provided even if it
+doesn't exist.
+@end deffn
+
+@deffn Method ede-menu-items-build :AFTER obj &optional current 
+Return a list of menu items for building target @var{OBJ}.
+If optional argument @var{CURRENT} is non-@code{nil}, return sub-menu code.
+@end deffn
+
+@deffn Method ede-want-file-p :AFTER this file 
+Return non-@code{nil} if @var{THIS} target wants @var{FILE}.
+@end deffn
+
+@deffn Method ede-update-version-in-source :AFTER this version 
+In sources for @var{THIS}, change version numbers to @var{VERSION}.
+@end deffn
+
+@deffn Method project-delete-target :AFTER ot 
+Delete the current target @var{OT} from its parent project.
+@end deffn
+
+@deffn Method ede-target-sourcecode :AFTER this 
+Return the sourcecode objects which @var{THIS} permits.
+@end deffn
+
+@deffn Method eieio-speedbar-child-make-tag-lines :AFTER this depth 
+Create a speedbar tag line for a child of @var{THIS}.
+It has depth @var{DEPTH}.
+@end deffn
+
+@deffn Method eieio-speedbar-object-buttonname :AFTER object 
+Return a string to use as a speedbar button for @var{OBJECT}.
+@end deffn
+
+@deffn Method eieio-done-customizing :AFTER target 
+Call this when a user finishes customizing @var{TARGET}.
+@end deffn
+
+@deffn Method project-edit-file-target :AFTER ot 
+Edit the target @var{OT} associated w/ this file.
+@end deffn
+
+@deffn Method ede-documentation :AFTER this 
+Return a list of files that provides documentation.
+Documentation is not for object @var{THIS}, but is provided by @var{THIS} for other
+files in the project.
+@end deffn
+
+@deffn Method ede-want-file-source-p :AFTER this file 
+Return non-@code{nil} if @var{THIS} target wants @var{FILE}.
+@end deffn
+
+@deffn Method ede-want-file-auxiliary-p :AFTER this file 
+Return non-@code{nil} if @var{THIS} target wants @var{FILE}.
+@end deffn
+
+@deffn Method project-add-file :AFTER ot file 
+Add the current buffer into project project target @var{OT}.
+Argument @var{FILE} is the file to add.
+@end deffn
+
+@deffn Method ede-target-name :AFTER this 
+Return the name of @var{THIS} target, suitable for make or debug style commands.
+@end deffn
+
+@deffn Method ede-object-menu :BEFORE this 
+Retrieves the slot @code{menu} from an object of class @code{ede-target}
+@end deffn
+
+
+@node ede-cpp-root-target, ede-emacs-target-c, ede-target, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-cpp-root-target
+@tgindex ede-cpp-root-target
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-cpp-root-target
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-cpp-root-target
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for project @var{THIS}.
+@end deffn
+
+@deffn Method ede-system-include-path :AFTER this 
+Get the system include path used by project @var{THIS}.
+@end deffn
+
+
+@node ede-emacs-target-c, ede-emacs-target-el, ede-cpp-root-target, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-emacs-target-c
+@tgindex ede-emacs-target-c
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-emacs-target-c
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-emacs-target-c
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for Emacs C code.
+All files need the macros from lisp.h!
+@end deffn
+
+
+@node ede-emacs-target-el, ede-emacs-target-misc, ede-emacs-target-c, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-emacs-target-el
+@tgindex ede-emacs-target-el
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-emacs-target-el
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-emacs-target-el
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-emacs-target-misc, ede-linux-target-c, ede-emacs-target-el, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-emacs-target-misc
+@tgindex ede-emacs-target-misc
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-emacs-target-misc
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-emacs-target-misc
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-linux-target-c, ede-linux-target-misc, ede-emacs-target-misc, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-linux-target-c
+@tgindex ede-linux-target-c
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-linux-target-c
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-linux-target-c
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-preprocessor-map :AFTER this 
+Get the pre-processor map for Linux C code.
+All files need the macros from lisp.h!
+@end deffn
+
+
+@node ede-linux-target-misc, ede-maven-target-java, ede-linux-target-c, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-linux-target-misc
+@tgindex ede-linux-target-misc
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-linux-target-misc
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-linux-target-misc
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-maven-target-java, ede-maven-target-c, ede-linux-target-misc, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-maven-target-java
+@tgindex ede-maven-target-java
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-maven-target-java
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-maven-target-java
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-maven-target-c, ede-maven-target-misc, ede-maven-target-java, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-maven-target-c
+@tgindex ede-maven-target-c
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-maven-target-c
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-maven-target-c
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-maven-target-misc, ede-simple-target, ede-maven-target-c, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-maven-target-misc
+@tgindex ede-maven-target-misc
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-maven-target-misc
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-maven-target-misc
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-simple-target, ede-proj-target, ede-maven-target-misc, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-simple-target
+@tgindex ede-simple-target
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-simple-target
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-simple-target
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+
+@node ede-proj-target, ede-proj-target-makefile, ede-simple-target, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target
+@tgindex ede-proj-target
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item ede-proj-target
+@table @asis
+@item Children:
+@w{@xref{ede-proj-target-makefile},} @w{@xref{ede-proj-target-aux},} @w{@xref{ede-proj-target-scheme}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :auxsource
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Auxilliary source files included in this target.
+Each of these is considered equivalent to a source file, but it is not
+distributed, and each should have a corresponding rule to build it.
+@refill
+
+@item :compiler
+Type: @code{(or null symbol)} @*
+Default Value: @code{nil}
+
+The compiler to be used to compile this object.
+This should be a symbol, which contains the object defining the compiler.
+This enables save/restore to do so by name, permitting the sharing
+of these compiler resources, and global customization thereof.
+@refill
+
+@item :linker
+Type: @code{(or null symbol)} @*
+Default Value: @code{nil}
+
+The linker to be used to link compiled sources for this object.
+This should be a symbol, which contains the object defining the linker.
+This enables save/restore to do so by name, permitting the sharing
+of these linker resources, and global customization thereof.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-compile-target :AFTER obj &optional command 
+Compile the current target @var{OBJ}.
+Argument @var{COMMAND} is the command to use for compiling the target.
+@end deffn
+
+@deffn Method project-rescan :AFTER this readstream 
+Rescan target @var{THIS} from the read list @var{READSTREAM}.
+@end deffn
+
+@deffn Method project-debug-target :AFTER obj 
+Run the current project target @var{OBJ} in a debugger.
+@end deffn
+
+@deffn Method ede-proj-configure-add-missing :AFTER this 
+Query if any files needed by @var{THIS} provided by automake are missing.
+Results in --add-missing being passed to automake.
+@end deffn
+
+@deffn Method ede-proj-flush-autoconf :AFTER this 
+Flush the configure file (current buffer) to accomodate @var{THIS}.
+By flushing, remove any cruft that may be in the file.  Subsequent
+calls to @dfn{ede-proj-tweak-autoconf} can restore items removed by flush.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method project-remove-file :AFTER target file 
+For @var{TARGET}, remove @var{FILE}.
+@var{FILE} must be massaged by @dfn{ede-convert-path}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-proj-configure-create-missing :AFTER this 
+Add any missing files for @var{THIS} by creating them.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this &optional moresource 
+Insert variables needed by target @var{THIS}.
+Optional argument @var{MORESOURCE} is a list of additional sources to add to the
+sources variable.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-post-variables :AFTER this 
+Insert variables needed by target @var{THIS} in Makefile.am after SOURCES.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-dependencies :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Argument @var{THIS} is the target that should insert stuff.
+@end deffn
+
+@deffn Method ede-proj-linkers :AFTER obj 
+List of linkers being used by @var{OBJ}.
+If the @code{linker} slot is empty, concoct one on a first match found
+basis for any given type from the @code{availablelinkers} slot.
+Otherwise, return the @code{linker} slot.
+Converts all symbols into the objects to be used.
+@end deffn
+
+@deffn Method ede-proj-makefile-garbage-patterns :AFTER this 
+Return a list of patterns that are considered garbage to @var{THIS}.
+These are removed with make clean.
+@end deffn
+
+@deffn Method ede-proj-tweak-autoconf :AFTER this 
+Tweak the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-compilers :AFTER obj 
+List of compilers being used by @var{OBJ}.
+If the @code{compiler} slot is empty, concoct one on a first match found
+basis for any given type from the @code{availablecompilers} slot.
+Otherwise, return the @code{compiler} slot.
+Converts all symbols into the objects to be used.
+@end deffn
+
+@deffn Method project-delete-target :AFTER this 
+Delete the current target @var{THIS} from its parent project.
+@end deffn
+
+@deffn Method ede-proj-makefile-target-name :AFTER this 
+Return the name of the main target for @var{THIS} target.
+@end deffn
+
+@deffn Method eieio-done-customizing :AFTER target 
+Call this when a user finishes customizing this object.
+Argument @var{TARGET} is the project we are completing customization on.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-user-rules :AFTER this 
+Insert user specified rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method project-add-file :AFTER this file 
+Add to target @var{THIS} the current buffer represented as @var{FILE}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-pre-variables :AFTER this 
+Insert variables needed by target @var{THIS} in Makefile.am before SOURCES.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-filepatterns :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Argument @var{THIS} is the target that should insert stuff.
+@end deffn
+
+@deffn Method ede-proj-makefile-dependency-files :AFTER this 
+Return a list of source files to convert to dependencies.
+Argument @var{THIS} is the target to get sources from.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-source-variables :AFTER this &optional moresource 
+Insert the source variables needed by @var{THIS}.
+Optional argument @var{MORESOURCE} is a list of additional sources to add to the
+sources variable.
+@end deffn
+
+
+@node ede-proj-target-makefile, semantic-ede-proj-target-grammar, ede-proj-target, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile
+@tgindex ede-proj-target-makefile
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item ede-proj-target-makefile
+@table @asis
+@item Children:
+@w{@xref{semantic-ede-proj-target-grammar},} @w{@xref{ede-proj-target-makefile-objectcode},} @w{@xref{ede-proj-target-elisp},} @w{@xref{ede-proj-target-makefile-miscelaneous},} @w{@xref{ede-proj-target-makefile-info}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :makefile
+Type: @code{string} @*
+Default Value: @code{"Makefile"}
+
+File name of generated Makefile.
+@refill
+
+@item :partofall
+Type: @code{boolean} @*
+Default Value: @code{t}
+
+Non @code{nil} means the rule created is part of the all target.
+Setting this to @code{nil} creates the rule to build this item, but does not
+include it in the ALL`all:' rule.
+@refill
+
+@item :configuration-variables
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Makefile variables appended to use in different configurations.
+These variables are used in the makefile when a configuration becomes active.
+Target variables are always renamed such as foo_CFLAGS, then included into
+commands where the variable would usually appear.
+@refill
+
+@item :rules
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Arbitrary rules and dependencies needed to make this target.
+It is safe to leave this blank.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-dependencies :AFTER this 
+Return a string representing the dependencies for @var{THIS}.
+Some compilers only use the first element in the dependencies, others
+have a list of intermediates (object files), and others don't care.
+This allows customization of how these elements appear.
+@end deffn
+
+@deffn Method project-compile-target :AFTER obj &optional command 
+Compile the current target program @var{OBJ}.
+Optional argument @var{COMMAND} is the s the alternate command to use.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this &optional moresource 
+Insert variables needed by target @var{THIS}.
+Optional argument @var{MORESOURCE} is a list of additional sources to add to the
+sources variable.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-commands :AFTER this 
+Insert the commands needed by target @var{THIS}.
+For targets, insert the commands needed by the chosen compiler.
+@end deffn
+
+@deffn Method ede-proj-makefile-configuration-variables :AFTER this configuration 
+Return a list of configuration variables from @var{THIS}.
+Use @var{CONFIGURATION} as the current configuration to query.
+@end deffn
+
+
+@node semantic-ede-proj-target-grammar, ede-proj-target-makefile-objectcode, ede-proj-target-makefile, Targets
+@comment  node-name,  next,  previous,  up
+@section semantic-ede-proj-target-grammar
+@tgindex semantic-ede-proj-target-grammar
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item semantic-ede-proj-target-grammar
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type semantic-ede-proj-target-grammar
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-compile-target :AFTER obj 
+Compile all sources in a Lisp target @var{OBJ}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+Lays claim to all -by.el, and -wy.el files.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-dependencies :AFTER this 
+Insert dist dependencies, or intermediate targets.
+This makes sure that all grammar lisp files are created before the dist
+runs, so they are always up to date.
+Argument @var{THIS} is the target that should insert stuff.
+@end deffn
+
+
+@node ede-proj-target-makefile-objectcode, ede-proj-target-makefile-archive, semantic-ede-proj-target-grammar, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-objectcode
+@tgindex ede-proj-target-makefile-objectcode
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item ede-proj-target-makefile-objectcode
+@table @asis
+@item Children:
+@w{@xref{ede-proj-target-makefile-archive},} @w{@xref{ede-proj-target-makefile-program}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-objectcode
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :configuration-variables
+Type: @code{list} @*
+Default Value: @code{("debug" ("CFLAGS" . "-g") ("LDFLAGS" . "-g"))}
+
+@xref{ede-proj-target-makefile}.
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-buffer-header-file :AFTER this buffer 
+There are no default header files.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-variables :AFTER this &optional moresource 
+Insert variables needed by target @var{THIS}.
+Optional argument @var{MORESOURCE} is not used.
+@end deffn
+
+@deffn Method ede-proj-makefile-dependency-files :AFTER this 
+Return a list of source files to convert to dependencies.
+Argument @var{THIS} is the target to get sources from.
+@end deffn
+
+
+@node ede-proj-target-makefile-archive, ede-proj-target-makefile-program, ede-proj-target-makefile-objectcode, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-archive
+@tgindex ede-proj-target-makefile-archive
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile-objectcode}.}
+@table @code
+@item ede-proj-target-makefile-archive
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-archive
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Create the make rule needed to create an archive for @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-source-variables :PRIMARY this 
+Insert bin_PROGRAMS variables needed by target @var{THIS}.
+We aren't acutally inserting SOURCE details, but this is used by the
+Makefile.am generator, so use it to add this important bin program.
+@end deffn
+
+
+@node ede-proj-target-makefile-program, ede-proj-target-makefile-shared-object, ede-proj-target-makefile-archive, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-program
+@tgindex ede-proj-target-makefile-program
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile-objectcode}.}
+@table @code
+@item ede-proj-target-makefile-program
+@table @asis
+@item Children:
+@w{@xref{ede-proj-target-makefile-shared-object}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-program
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :ldlibs
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Libraries, such as "m" or "Xt" which this program depends on.
+The linker flag "-l" is automatically prepended.  Do not include a "lib"
+prefix, or a ".so" suffix.
+
+Note: Currently only used for Automake projects.
+@refill
+
+@item :ldflags
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Additional flags to add when linking this target.
+Use ldlibs to add addition libraries.  Use this to specify specific
+options to the linker.
+
+Note: Not currently used.  This bug needs to be fixed.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-debug-target :AFTER obj 
+Debug a program target @var{OBJ}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Insert rules needed by @var{THIS} target.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-post-variables :AFTER this 
+Insert bin_PROGRAMS variables needed by target @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-pre-variables :AFTER this 
+Insert bin_PROGRAMS variables needed by target @var{THIS}.
+@end deffn
+
+
+@node ede-proj-target-makefile-shared-object, ede-proj-target-elisp, ede-proj-target-makefile-program, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-shared-object
+@tgindex ede-proj-target-makefile-shared-object
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile-objectcode}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile-program}.}
+@table @code
+@item ede-proj-target-makefile-shared-object
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-shared-object
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-configure-add-missing :AFTER this 
+Query if any files needed by @var{THIS} provided by automake are missing.
+Results in --add-missing being passed to automake.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-post-variables :AFTER this 
+Insert bin_PROGRAMS variables needed by target @var{THIS}.
+We need to override -program which has an LDADD element.
+@end deffn
+
+@deffn Method ede-proj-makefile-target-name :AFTER this 
+Return the name of the main target for @var{THIS} target.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-automake-pre-variables :AFTER this 
+Insert bin_PROGRAMS variables needed by target @var{THIS}.
+We aren't acutally inserting SOURCE details, but this is used by the
+Makefile.am generator, so use it to add this important bin program.
+@end deffn
+
+
+@node ede-proj-target-elisp, ede-proj-target-elisp-autoloads, ede-proj-target-makefile-shared-object, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-elisp
+@tgindex ede-proj-target-elisp
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item ede-proj-target-elisp
+@table @asis
+@item Children:
+@w{@xref{ede-proj-target-elisp-autoloads}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-elisp
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :aux-packages
+Type: @code{list} @*
+Default Value: @code{nil}
+
+Additional packages needed.
+There should only be one toplevel package per auxiliary tool needed.
+These packages location is found, and added to the compile time
+load path.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-compile-target :AFTER obj 
+Compile all sources in a Lisp target @var{OBJ}.
+Bonus: Return a cons cell: (COMPILED . UPTODATE).
+@end deffn
+
+@deffn Method ede-proj-flush-autoconf :AFTER this 
+Flush the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+Lays claim to all .elc files that match .el files in this target.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-tweak-autoconf :AFTER this 
+Tweak the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-update-version-in-source :AFTER this version 
+In a Lisp file, updated a version string for @var{THIS} to @var{VERSION}.
+There are standards in Elisp files specifying how the version string
+is found, such as a @code{-version} variable, or the standard header.
+@end deffn
+
+
+@node ede-proj-target-elisp-autoloads, ede-proj-target-makefile-miscelaneous, ede-proj-target-elisp, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-elisp-autoloads
+@tgindex ede-proj-target-elisp-autoloads
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item @w{@xref{ede-proj-target-elisp}.}
+@table @code
+@item ede-proj-target-elisp-autoloads
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-elisp-autoloads
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :aux-packages
+Type: @code{list} @*
+Default Value: @code{("cedet-autogen")}
+
+@xref{ede-proj-target-elisp}.
+@item :autoload-file
+Type: @code{string} @*
+Default Value: @code{"loaddefs.el"}
+
+The file that autoload definitions are placed in.
+There should be one load defs file for a given package.  The load defs are created
+for all Emacs Lisp sources that exist in the directory of the created target.
+@refill
+
+@item :autoload-dirs
+Type: @code{list} @*
+Default Value: @code{nil}
+
+The directories to scan for autoload definitions.
+If @code{nil} defaults to the current directory.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-dependencies :AFTER this 
+Return a string representing the dependencies for @var{THIS}.
+Always return an empty string for an autoloads generator.
+@end deffn
+
+@deffn Method project-compile-target :AFTER obj 
+Create or update the autoload target.
+@end deffn
+
+@deffn Method ede-proj-flush-autoconf :AFTER this 
+Flush the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+Lays claim to all .elc files that match .el files in this target.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-dependencies :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Emacs Lisp autoload files ship the generated .el files.
+Argument @var{THIS} is the target which needs to insert an info file.
+@end deffn
+
+@deffn Method ede-proj-tweak-autoconf :AFTER this 
+Tweak the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+@deffn Method ede-update-version-in-source :AFTER this version 
+In a Lisp file, updated a version string for @var{THIS} to @var{VERSION}.
+There are standards in Elisp files specifying how the version string
+is found, such as a @code{-version} variable, or the standard header.
+@end deffn
+
+@deffn Method ede-proj-compilers :AFTER obj 
+List of compilers being used by @var{OBJ}.
+If the @code{compiler} slot is empty, get the car of the compilers list.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-filepatterns :AFTER this 
+Insert any symbols that the DIST rule should distribute.
+Emacs Lisp autoload files ship the generated .el files.
+Argument @var{THIS} is the target which needs to insert an info file.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-source-variables :AFTER this &optional moresource 
+Insert the source variables needed by @var{THIS}.
+Optional argument @var{MORESOURCE} is a list of additional sources to add to the
+sources variable.
+@end deffn
+
+
+@node ede-proj-target-makefile-miscelaneous, ede-proj-target-makefile-info, ede-proj-target-elisp-autoloads, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-miscelaneous
+@tgindex ede-proj-target-makefile-miscelaneous
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item ede-proj-target-makefile-miscelaneous
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-miscelaneous
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :submakefile
+Type: @code{string} @*
+Default Value: @code{""}
+
+Miscellaneous sources which have a specialized makefile.
+The sub-makefile is used to build this target.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-insert-rules :AFTER this 
+Create the make rule needed to create an archive for @var{THIS}.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-dependency-files :AFTER this 
+Return a list of files which @var{THIS} target depends on.
+@end deffn
+
+
+@node ede-proj-target-makefile-info, ede-proj-target-aux, ede-proj-target-makefile-miscelaneous, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-makefile-info
+@tgindex ede-proj-target-makefile-info
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item @w{@xref{ede-proj-target-makefile}.}
+@table @code
+@item ede-proj-target-makefile-info
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-makefile-info
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :mainmenu
+Type: @code{string} @*
+Default Value: @code{""}
+
+The main menu resides in this file.
+All other sources should be included independently.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-configure-add-missing :AFTER this 
+Query if any files needed by @var{THIS} provided by automake are missing.
+Results in --add-missing being passed to automake.
+@end deffn
+
+@deffn Method object-write :AFTER this 
+Before committing any change to @var{THIS}, make sure the mainmenu is first.
+@end deffn
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-dependencies :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Texinfo files want to insert generated `.info' files.
+Argument @var{THIS} is the target which needs to insert an info file.
+@end deffn
+
+@deffn Method ede-proj-makefile-target-name :AFTER this 
+Return the name of the main target for @var{THIS} target.
+@end deffn
+
+@deffn Method ede-documentation :AFTER this 
+Return a list of files that provides documentation.
+Documentation is not for object @var{THIS}, but is provided by @var{THIS} for other
+files in the project.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-dist-filepatterns :AFTER this 
+Insert any symbols that the DIST rule should depend on.
+Texinfo files want to insert generated `.info' files.
+Argument @var{THIS} is the target which needs to insert an info file.
+@end deffn
+
+@deffn Method ede-proj-makefile-insert-source-variables :AFTER this &optional moresource 
+Insert the source variables needed by @var{THIS} info target.
+Optional argument @var{MORESOURCE} is a list of additional sources to add to the
+sources variable.
+Does the usual for Makefile mode, but splits source into two variables
+when working in Automake mode.
+@end deffn
+
+
+@node ede-proj-target-aux, ede-proj-target-scheme, ede-proj-target-makefile-info, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-aux
+@tgindex ede-proj-target-aux
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item ede-proj-target-aux
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-aux
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-makefile-sourcevar :AFTER this 
+Return the variable name for @var{THIS}'s sources.
+@end deffn
+
+
+@node ede-proj-target-scheme, project-am-target, ede-proj-target-aux, Targets
+@comment  node-name,  next,  previous,  up
+@section ede-proj-target-scheme
+@tgindex ede-proj-target-scheme
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{ede-proj-target}.}
+@table @code
+@item ede-proj-target-scheme
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type ede-proj-target-scheme
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :interpreter
+Type: @code{string} @*
+Default Value: @code{"guile"}
+
+The preferred interpreter for this code.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method ede-proj-tweak-autoconf :AFTER this 
+Tweak the configure file (current buffer) to accomodate @var{THIS}.
+@end deffn
+
+
+@node project-am-target, project-am-objectcode, ede-proj-target-scheme, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-target
+@tgindex project-am-target
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item project-am-target
+@table @asis
+@item Children:
+@w{@xref{project-am-objectcode},} @w{@xref{project-am-header},} @w{@xref{project-am-lisp},} @w{@xref{project-am-texinfo},} @w{@xref{project-am-man}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-target
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-compile-target :AFTER obj &optional command 
+Compile the current target.
+Argument @var{COMMAND} is the command to use for compiling the target.
+@end deffn
+
+@deffn Method project-compile-target-command :AFTER this 
+Default target to use when compiling a given target.
+@end deffn
+
+@deffn Method project-remove-file :AFTER ot fnnd 
+Remove the current buffer from any project targets.
+@end deffn
+
+@deffn Method project-make-dist :AFTER this 
+Run the current project in the debugger.
+@end deffn
+
+@deffn Method project-compile-project :AFTER obj &optional command 
+Compile the entire current project.
+Argument @var{COMMAND} is the command to use when compiling.
+@end deffn
+
+@deffn Method project-edit-file-target :AFTER obj 
+Edit the target associated w/ this file.
+@end deffn
+
+@deffn Method project-add-file :AFTER ot 
+Add the current buffer into a project.
+@var{OT} is the object target.  DIR is the directory to start in.
+@end deffn
+
+
+@node project-am-objectcode, project-am-program, project-am-target, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-objectcode
+@tgindex project-am-objectcode
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item project-am-objectcode
+@table @asis
+@item Children:
+@w{@xref{project-am-program},} @w{@xref{project-am-lib}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-objectcode
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object type.
+@end deffn
+
+@deffn Method project-debug-target :AFTER obj 
+Run the current project target in a debugger.
+@end deffn
+
+@deffn Method project-compile-target-command :AFTER this 
+Default target to use when compiling an object code target.
+@end deffn
+
+@deffn Method ede-buffer-header-file :AFTER this buffer 
+There are no default header files.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+
+@node project-am-program, project-am-lib, project-am-objectcode, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-program
+@tgindex project-am-program
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item @w{@xref{project-am-objectcode}.}
+@table @code
+@item project-am-program
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-program
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :ldadd @*
+Default Value: @code{nil}
+
+Additional LD args.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan object @var{THIS}.
+@end deffn
+
+
+@node project-am-lib, project-am-header, project-am-program, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-lib
+@tgindex project-am-lib
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item @w{@xref{project-am-objectcode}.}
+@table @code
+@item project-am-lib
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-lib
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan object @var{THIS}.
+@end deffn
+
+
+@node project-am-header, project-am-header-noinst, project-am-lib, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-header
+@tgindex project-am-header
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item project-am-header
+@table @asis
+@item Children:
+@w{@xref{project-am-header-noinst},} @w{@xref{project-am-header-inst}.} 
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-header
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-rescan :AFTER this 
+Rescan the Header sources.
+@end deffn
+
+
+@node project-am-header-noinst, project-am-header-inst, project-am-header, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-header-noinst
+@tgindex project-am-header-noinst
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item @w{@xref{project-am-header}.}
+@table @code
+@item project-am-header-noinst
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-header-noinst
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object.
+@end deffn
+
+
+@node project-am-header-inst, project-am-lisp, project-am-header-noinst, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-header-inst
+@tgindex project-am-header-inst
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item @w{@xref{project-am-header}.}
+@table @code
+@item project-am-header-inst
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-header-inst
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object.
+@end deffn
+
+
+@node project-am-lisp, project-am-texinfo, project-am-header-inst, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-lisp
+@tgindex project-am-lisp
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item project-am-lisp
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-lisp
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object.
+@end deffn
+
+@deffn Method project-rescan :AFTER this 
+Rescan the lisp sources.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+
+@node project-am-texinfo, project-am-man, project-am-lisp, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-texinfo
+@tgindex project-am-texinfo
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item project-am-texinfo
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-texinfo
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@item :include @*
+Default Value: @code{nil}
+
+Additional texinfo included in this one.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object type.
+@end deffn
+
+@deffn Method project-rescan :AFTER this 
+Rescan object @var{THIS}.
+@end deffn
+
+@deffn Method project-compile-target-command :AFTER this 
+Default target t- use when compling a texinfo file.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+@deffn Method ede-documentation :AFTER this 
+Return a list of files that provides documentation.
+Documentation is not for object @var{THIS}, but is provided by @var{THIS} for other
+files in the project.
+@end deffn
+
+
+@node project-am-man,  , project-am-texinfo, Targets
+@comment  node-name,  next,  previous,  up
+@section project-am-man
+@tgindex project-am-man
+
+@table @asis
+@item Inheritance Tree:
+@table @code
+@item eieio-speedbar
+@table @code
+@item eieio-speedbar-directory-button
+@table @code
+@item @w{@xref{ede-target}.}
+@table @code
+@item @w{@xref{project-am-target}.}
+@table @code
+@item project-am-man
+No children
+@end table
+
+@end table
+
+@end table
+
+@end table
+
+@end table
+@end table
+
+  Create a new object with name NAME of class type project-am-man
+
+@table @asis
+@item Slots:
+
+@table @code
+@item :name
+Type: @code{string}
+
+Name of this target.
+@refill
+
+@item :path
+Type: @code{string}
+
+The path to the sources of this target.
+Relative to the path of the project it belongs to.
+@refill
+
+@end table
+
+@end table
+@subsection Specialized Methods
+
+@deffn Method project-am-macro :AFTER this 
+Return the default macro to 'edit' for this object type.
+@end deffn
+
+@deffn Method project-rescan :AFTER this 
+Rescan object @var{THIS}.
+@end deffn
+
+@deffn Method ede-buffer-mine :AFTER this buffer 
+Return @code{t} if object @var{THIS} lays claim to the file in @var{BUFFER}.
+@end deffn
+
+
diff --git a/site/cedet-1.0pre7/ede/ede-util.el b/site/cedet-1.0pre7/ede/ede-util.el
new file mode 100755
index 0000000..accc828
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede-util.el
@@ -0,0 +1,101 @@
+;;; ede-util.el --- EDE utilities
+
+;;;  Copyright (C) 2000, 2005  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede-util.el,v 1.4 2005/09/30 20:17:29 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Utilities that may not require project specific help, and oporate
+;; on generic EDE structures.  Provide user level commands for activities
+;; not directly related to source code organization or makefile generation.
+
+(require 'ede)
+
+;;; Code:
+
+;;; Updating the version of a project.
+;;;###autoload
+(defun ede-update-version (newversion)
+  "Update the current projects main version number.
+Argument NEWVERSION is the version number to use in the current project."
+  (interactive (list (let* ((o (ede-toplevel))
+			    (v (oref o version)))
+		       (read-string (format "Update Version (was %s): " v)
+				  v nil v))))
+  (let ((ede-object (ede-toplevel)))
+    ;; Don't update anything if there was no change.
+    (unless (string= (oref ede-object :version) newversion)
+      (oset ede-object :version newversion)
+      (project-update-version ede-object)
+      (ede-update-version-in-source ede-object newversion))))
+
+(defmethod project-update-version ((ot ede-project))
+  "The :version of the project OT has been updated.
+Handle saving, or other detail."
+  (error "project-update-version not supported by %s" (object-name ot)))
+
+(defmethod ede-update-version-in-source ((this ede-project) version)
+  "Change occurrences of a version string in sources.
+In project THIS, cycle over all targets to give them a chance to set
+their sources to VERSION."
+  (ede-map-targets this (lambda (targ)
+			  (ede-update-version-in-source targ version))))
+
+(defmethod ede-update-version-in-source ((this ede-target) version)
+  "In sources for THIS, change version numbers to VERSION."
+  (if (and (slot-boundp this 'versionsource)
+	   (oref this versionsource))
+      (let ((vs (oref this versionsource)))
+	(while vs
+	  (save-excursion
+	    (set-buffer (find-file-noselect
+			 (ede-expand-filename this (car vs))))
+	    (goto-char (point-min))
+	    (let ((case-fold-search t))
+	      (if (re-search-forward "version:\\s-*\\([^ \t\n]+\\)" nil t)
+		  (progn
+		    (save-match-data
+		      (ede-make-buffer-writable))
+		    (delete-region (match-beginning 1)
+				   (match-end 1))
+		    (goto-char (match-beginning 1))
+		    (insert version)))))
+	  (setq vs (cdr vs))))))
+
+;;; Writable files
+;;
+;; Utils for EDE when it needs to write a file that could be covered by a
+;; version control system.
+(defun ede-make-buffer-writable (&optional buffer)
+  "Make sure that BUFFER is writable.
+If BUFFER isn't specified, use the current buffer."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (if buffer-read-only
+	(if (and vc-mode
+		 (y-or-n-p (format "Check out %s? " (buffer-file-name))))
+	    (vc-toggle-read-only)
+	  (if (not vc-mode)
+	      (toggle-read-only -1))))))
+  
+(provide 'ede-util)
+
+;;; ede-util.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede.el b/site/cedet-1.0pre7/ede/ede.el
new file mode 100755
index 0000000..dd3bea4
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede.el
@@ -0,0 +1,1313 @@
+;;; ede.el --- Emacs Development Environment gloss
+
+;;;  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: ede.el,v 1.147 2010/02/20 21:42:43 zappo Exp $
+(defconst ede-version "1.0pre7"
+  "Current version of the Emacs EDE.")
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; EDE is the top level Lisp interface to a project management scheme
+;; for Emacs.  Emacs does many things well, including editing,
+;; building, and debugging.  Folks migrating from other IDEs don't
+;; seem to thing this qualifies, however, because they still have to
+;; write the makefiles, and specify parameters to programs.
+;;
+;; This EDE mode will attempt to link these diverse programs together
+;; into a comprehensive single interface, instead of a bunch of
+;; different ones.
+
+;;; Install
+;;
+;;  This command enables project mode on all files.
+;;
+;;  (global-ede-mode t)
+
+(require 'ede-source)
+
+;;; Code:
+(defun ede-version ()
+  "Display the current running version of EDE."
+  (interactive) (message "EDE %s" ede-version))
+
+(require 'custom)
+
+(defgroup ede nil
+  "Emacs Development Environment gloss."
+  :group 'tools
+  :group 'convenience
+  )
+
+(defcustom ede-auto-add-method 'ask
+  "*Determins if a new source file shoud be automatically added to a target.
+Whenever a new file is encountered in a directory controlled by a
+project file, all targets are queried to see if it should be added.
+If the value is 'always, then the new file is added to the first
+target encountered.  If the value is 'multi-ask, then if more than one
+target wants the file, the user is asked.  If only one target wants
+the file, then then it is automatically added to that target.  If the
+value is 'ask, then the user is always asked, unless there is no
+target willing to take the file.  'never means never perform the check."
+  :group 'ede
+  :type '(choice (const always)
+		 (const multi-ask)
+		 (const ask)
+		 (const never)))
+
+(defcustom ede-debug-program-function 'gdb
+  "*Default Emacs command used to debug a target."
+  :group 'ede
+  :type 'sexp) ; make this be a list of options some day
+
+(require 'eieio)
+(require 'eieio-speedbar)
+(require 'ede-auto)
+(require 'ede-base)
+
+
+;;; Management variables
+;;
+;;;###autoload
+(defvar ede-projects nil
+  "A list of all active projects currently loaded in Emacs.")
+
+(defvar ede-object-root-project nil
+  "The current buffer's current root project.
+If a file is under a project, this specifies the project that is at
+the root of a project tree.")
+(make-variable-buffer-local 'ede-object-root-project)
+
+(defvar ede-object-project nil
+  "The current buffer's current project at that level.
+If a file is under a project, this specifies the project that contains the
+current target.")
+(make-variable-buffer-local 'ede-object-project)
+
+(defvar ede-object nil
+  "The current buffer's target object.
+This object's class determines how to compile and debug from a buffer.")
+(make-variable-buffer-local 'ede-object)
+
+(defvar ede-selected-object nil
+  "The currently user-selected project or target.
+If `ede-object' is nil, then commands will operate on this object.")
+
+(defvar ede-constructing nil
+  "Non nil when constructing a project hierarchy.")
+
+(defvar ede-deep-rescan nil
+  "Non nil means scan down a tree, otherwise rescans are top level only.
+Do not set this to non-nil globally.  It is used internally.")
+
+
+;;; Prompting
+;;
+(defun ede-singular-object (prompt)
+  "Using PROMPT, choose a single object from the current buffer."
+  (if (listp ede-object)
+      (ede-choose-object prompt ede-object)
+    ede-object))
+
+(defun ede-choose-object (prompt list-o-o)
+  "Using PROMPT, ask the user which OBJECT to use based on the name field.
+Argument LIST-O-O is the list of objects to choose from."
+  (let* ((al (object-assoc-list 'name list-o-o))
+	 (ans (completing-read prompt al nil t)))
+    (setq ans (assoc ans al))
+    (cdr ans)))
+
+;;; Menu and Keymap
+;;
+;;;###autoload
+(defvar ede-minor-mode nil
+  "Non-nil in EDE controlled buffers.")
+(make-variable-buffer-local 'ede-minor-mode)
+
+;; We don't want to waste space.  There is a menu after all.
+(add-to-list 'minor-mode-alist '(ede-minor-mode ""))
+
+(defvar ede-minor-keymap
+  (let ((map (make-sparse-keymap))
+	(pmap (make-sparse-keymap)))
+    (define-key pmap "e" 'ede-edit-file-target)
+    (define-key pmap "a" 'ede-add-file)
+    (define-key pmap "d" 'ede-remove-file)
+    (define-key pmap "t" 'ede-new-target)
+    (define-key pmap "g" 'ede-rescan-toplevel)
+    (define-key pmap "s" 'ede-speedbar)
+    (define-key pmap "l" 'ede-load-project-file)
+    (define-key pmap "f" 'ede-find-file)
+    (define-key pmap "C" 'ede-compile-project)
+    (define-key pmap "c" 'ede-compile-target)
+    (define-key pmap "\C-c" 'ede-compile-selected)
+    (define-key pmap "D" 'ede-debug-target)
+    (define-key pmap "R" 'ede-run-target)
+    ;; bind our submap into map
+    (define-key map "\C-c." pmap)
+    map)
+  "Keymap used in project minor mode.")
+
+(if ede-minor-keymap
+    (progn
+      (easy-menu-define
+	ede-minor-menu ede-minor-keymap "Project Minor Mode Menu"
+	'("Project"
+	  ( "Build" :filter ede-build-forms-menu )
+	  ( "Project Options" :filter ede-project-forms-menu )
+	  ( "Target Options" :filter ede-target-forms-menu )
+	  [ "Create Project" ede-new (not ede-object) ]
+	  [ "Load a project" ede t ]
+	  ;;	 [ "Select Active Target" 'undefined nil ]
+	  ;;	 [ "Remove Project" 'undefined nil ]
+	  "---"
+	  [ "Find File in Project..." ede-find-file t ]
+	  ( "Customize" :filter ede-customize-forms-menu )
+	  [ "View Project Tree" ede-speedbar t ]
+	  ))
+      ))
+
+;; Allow re-insertion of a new keymap
+(let ((a (assoc 'ede-minor-mode minor-mode-map-alist)))
+  (if a
+      (setcdr a ede-minor-keymap)
+    (add-to-list 'minor-mode-map-alist
+		 (cons 'ede-minor-mode ede-minor-keymap))
+    ))
+
+(defun ede-menu-obj-of-class-p (class)
+  "Return non-nil if some member of `ede-object' is a child of CLASS."
+  (if (listp ede-object)
+      (ede-or (mapcar (lambda (o) (obj-of-class-p o class)) ede-object))
+    (obj-of-class-p ede-object class)))
+
+(defun ede-build-forms-menu (menu-def)
+  "Create a sub menu for building different parts of an EDE system.
+Argument MENU-DEF is the menu definition to use."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Build Forms"
+    (let ((obj (ede-current-project))
+	  (newmenu nil) ;'([ "Build Selected..." ede-compile-selected t ]))
+	  targets
+	  targitems
+	  ede-obj
+	  (tskip nil))
+      (if (not obj)
+	  nil
+	(setq targets (when (slot-boundp obj 'targets)
+			(oref obj targets))
+	      ede-obj (if (listp ede-object) ede-object (list ede-object)))
+	;; First, collect the build items from the project
+	(setq newmenu (append newmenu (ede-menu-items-build obj t)))
+	;; Second, Declare the current target menu items
+	(if (and ede-obj (ede-menu-obj-of-class-p ede-target))
+	    (while ede-obj
+	      (setq newmenu (append newmenu
+				    (ede-menu-items-build (car ede-obj) t))
+		    tskip (car ede-obj)
+		    ede-obj (cdr ede-obj))))
+	;; Third, by name, enable builds for other local targets
+	(while targets
+	  (unless (eq tskip (car targets))
+	    (setq targitems (ede-menu-items-build (car targets) nil))
+	    (setq newmenu
+		  (append newmenu
+			  (if (= 1 (length targitems))
+			      targitems
+			    (cons (ede-name (car targets))
+				  targitems))))
+	    )
+	  (setq targets (cdr targets)))
+	;; Fourth, build sub projects.
+	;; -- nerp
+	;; Fifth, Add make distribution
+	(append newmenu (list [ "Make distribution" ede-make-dist t ]))
+	)))))
+
+(defun ede-target-forms-menu (menu-def)
+  "Create a target MENU-DEF based on the object belonging to this buffer."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Target Forms"
+    (let ((obj (or ede-selected-object ede-object)))
+      (append
+       '([ "Add File" ede-add-file
+	   (and (ede-current-project)
+		(oref (ede-current-project) targets)) ]
+	 [ "Remove File" ede-remove-file
+	   (and ede-object
+		(or (listp ede-object)
+		    (not (obj-of-class-p ede-object ede-project)))) ]
+	 "-")
+       (if (not obj)
+	   nil
+	 (if (and (not (listp obj)) (oref obj menu))
+	     (oref obj menu)
+	   (when (listp obj)
+	     ;; This is bad, but I'm not sure what else to do.
+	     (oref (car obj) menu)))))))))
+
+(defun ede-project-forms-menu (menu-def)
+  "Create a target MENU-DEF based on the object belonging to this buffer."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Project Forms"
+    (let* ((obj (ede-current-project))
+	   (class (if obj (object-class obj)))
+	   (menu nil))
+      (condition-case err
+	  (progn
+	    (while (and class (slot-exists-p class 'menu))
+	      ;;(message "Looking at class %S" class)
+	      (setq menu (append menu (oref class menu))
+		    class (class-parent class))
+	      (if (listp class) (setq class (car class))))
+	    (append
+	     '( [ "Add Target" ede-new-target (ede-current-project) ]
+		[ "Remove Target" ede-delete-target ede-object ]
+		"-")
+	     menu
+	     ))
+	(error (message "Err found: %S" err)
+	       menu)
+	)))))
+
+(defun ede-customize-forms-menu (menu-def)
+  "Create a menu of the project, and targets that can be customized.
+Argument MENU-DEF is the definition of the current menu."
+  (easy-menu-filter-return
+   (easy-menu-create-menu
+    "Customize Project"
+    (let* ((obj (ede-current-project))
+	   (targ (when (slot-boundp obj 'targets)
+		   (oref obj targets))))
+      (when obj
+	;; Make custom menus for everything here.
+	(append (list
+		 (cons (concat "Project " (ede-name obj))
+		       (eieio-customize-object-group obj))
+		 [ "Reorder Targets" ede-project-sort-targets t ]
+		 )
+		(mapcar (lambda (o)
+			  (cons (concat "Target " (ede-name o))
+				(eieio-customize-object-group o)))
+			targ)))))))
+
+
+(defun ede-apply-object-keymap (&optional default)
+  "Add target specific keybindings into the local map.
+Optional argument DEFAULT indicates if this should be set to the default
+version of the keymap."
+  (let ((object (or ede-object ede-selected-object)))
+    (condition-case nil
+	(let ((keys (ede-object-keybindings object)))
+	  (while keys
+	    (local-set-key (concat "\C-c." (car (car keys)))
+			   (cdr (car keys)))
+	    (setq keys (cdr keys))))
+      (error nil))))
+
+;;; Menu building methods for building
+;;
+(defmethod ede-menu-items-build ((obj ede-project) &optional current)
+  "Return a list of menu items for building project OBJ.
+If optional argument CURRENT is non-nil, return sub-menu code."
+  (if current
+      (list [ "Build Current Project" ede-compile-project t ])
+    (list (vector
+	   (list
+	    (concat "Build Project " (ede-name obj))
+	    `(project-compile-project ,obj))))))
+
+(defmethod ede-menu-items-build ((obj ede-target) &optional current)
+  "Return a list of menu items for building target OBJ.
+If optional argument CURRENT is non-nil, return sub-menu code."
+  (if current
+      (list [ "Build Current Target" ede-compile-target t ])
+    (list (vector
+	   (concat "Build Target " (ede-name obj))
+	   `(project-compile-target ,obj)
+	   t))))
+
+;;; Mode Declarations
+;;
+(eval-and-compile
+  (autoload 'ede-dired-minor-mode "ede-dired" "EDE commands for dired" t))
+
+(defun ede-apply-target-options ()
+  "Apply options to the current buffer for the active project/target."
+  (if (ede-current-project)
+      (ede-set-project-variables (ede-current-project)))
+  (ede-apply-object-keymap)
+  (ede-apply-preprocessor-map)
+  )
+
+(defun ede-turn-on-hook ()
+  "Turn on EDE minor mode in the current buffer if needed.
+To be used in hook functions."
+  (if (or (and (stringp (buffer-file-name))
+	       (stringp default-directory))
+	  ;; Emacs 21 has no buffer file name for directory edits.
+	  ;; so we need to add these hacks in.
+	  (eq major-mode 'dired-mode)
+	  (eq major-mode 'vc-dired-mode))
+      (ede-minor-mode 1)))
+
+(defun ede-minor-mode (&optional arg)
+  "Project minor mode.
+If this file is contained, or could be contained in an EDE
+controlled project, then this mode should be active.
+
+With argument ARG positive, turn on the mode.  Negative, turn off the
+mode.  nil means to toggle the mode."
+  (interactive "P")
+  (if (or (eq major-mode 'dired-mode)
+	  (eq major-mode 'vc-dired-mode))
+      (ede-dired-minor-mode arg)
+    (progn
+      (setq ede-minor-mode
+	    (not (or (and (null arg) ede-minor-mode)
+		     (<= (prefix-numeric-value arg) 0))))
+      (if (and ede-minor-mode (not ede-constructing))
+	  (ede-initialize-state-current-buffer)
+	;; If we fail to have a project here, turn it back off.
+	(if (not (interactive-p))
+	    (setq ede-minor-mode nil))))))
+
+(defun ede-initialize-state-current-buffer ()
+  "Initialize the current buffer's state for EDE.
+Sets buffer local variables for EDE."
+  (let* ((ROOT nil)
+	 (proj (ede-directory-get-open-project default-directory
+					       'ROOT)))
+    (when (or proj ROOT
+	      (ede-directory-project-p default-directory t))
+
+      (when (not proj)
+	;; @todo - this could be wasteful.
+	(setq proj (ede-load-project-file default-directory 'ROOT)))
+
+      (setq ede-object (ede-buffer-object (current-buffer)
+					  'ede-object-project))
+
+      (setq ede-object-root-project
+	    (or ROOT (ede-project-root ede-object-project)))
+
+      (if (and (not ede-object) ede-object-project)
+	  (ede-auto-add-to-target))
+
+      (ede-apply-target-options))))
+
+(defun ede-reset-all-buffers (onoff)
+  "Reset all the buffers due to change in EDE.
+ONOFF indicates enabling or disabling the mode."
+  (let ((b (buffer-list)))
+    (while b
+      (when (buffer-file-name (car b))
+	(save-excursion
+	  (set-buffer (car b))
+	  ;; Reset all state variables
+	  (setq ede-object nil
+		ede-object-project nil
+		ede-object-root-project nil)
+	  ;; Now re-initialize this buffer.
+	  (ede-initialize-state-current-buffer)
+	  )
+	)
+      (setq b (cdr b)))))
+
+;;;###autoload
+(defun global-ede-mode (arg)
+  "Turn on variable `ede-minor-mode' mode when ARG is positive.
+If ARG is negative, disable.  Toggle otherwise."
+  (interactive "P")
+  (if (not arg)
+      (if (member 'ede-turn-on-hook find-file-hooks)
+	  (global-ede-mode -1)
+	(global-ede-mode 1))
+    (if (or (eq arg t) (> arg 0))
+	(progn
+	  (add-hook 'semanticdb-project-predicate-functions 'ede-directory-project-p)
+	  (add-hook 'semanticdb-project-root-functions 'ede-toplevel-project-or-nil)
+	  (add-hook 'ecb-source-path-functions 'ede-ecb-project-paths)
+	  (add-hook 'find-file-hooks 'ede-turn-on-hook)
+	  (add-hook 'dired-mode-hook 'ede-turn-on-hook))
+      (remove-hook 'semanticdb-project-predicate-functions 'ede-directory-project-p)
+      (remove-hook 'semanticdb-project-root-functions 'ede-toplevel-project-or-nil)
+      (remove-hook 'ecb-source-path-functions 'ede-ecb-project-paths)
+      (remove-hook 'find-file-hooks 'ede-turn-on-hook)
+      (remove-hook 'dired-mode-hook 'ede-turn-on-hook))
+    (ede-reset-all-buffers arg)))
+
+(defvar ede-ignored-file-alist
+  '( "\\.cvsignore$"
+     "\\.#"
+     "~$"
+     )
+  "List of file name patters that EDE will never ask about.")
+
+(defun ede-ignore-file (filename)
+  "Should we ignore FILENAME?"
+  (let ((any nil)
+	(F ede-ignored-file-alist))
+    (while (and (not any) F)
+      (when (string-match (car F) filename)
+	(setq any t))
+      (setq F (cdr F)))
+    any))
+
+(defun ede-auto-add-to-target ()
+  "Look for a target that wants to own the current file.
+Follow the preference set with `ede-auto-add-method' and get the list
+of objects with the `ede-want-file-p' method."
+  (if ede-object (error "Ede-object already defined for %s" (buffer-name)))
+  (if (or (eq ede-auto-add-method 'never)
+	  (ede-ignore-file (buffer-file-name)))
+      nil
+    (let (wants desires)
+      ;; Find all the objects.
+      (setq wants (oref (ede-current-project) targets))
+      (while wants
+	(if (ede-want-file-p (car wants) (buffer-file-name))
+	    (setq desires (cons (car wants) desires)))
+	(setq wants (cdr wants)))
+      (if desires
+	  (cond ((or (eq ede-auto-add-method 'ask)
+		     (and (eq ede-auto-add-method 'multi-ask)
+			  (< 1 (length desires))))
+		 (let* ((al (append
+			     ;; some defaults
+			     '(("none" . nil)
+			       ("new target" . new))
+			     ;; If we are in an unparented subdir,
+			     ;; offer new a subproject
+			     (if (ede-directory-project-p default-directory)
+				 ()
+			       '(("create subproject" . project)))
+			     ;; Here are the existing objects we want.
+			     (object-assoc-list 'name desires)))
+			(case-fold-search t)
+			(ans (completing-read
+			      (format "Add %s to target: " (buffer-file-name))
+			      al nil t)))
+		   (setq ans (assoc ans al))
+		   (cond ((eieio-object-p (cdr ans))
+			  (ede-add-file (cdr ans)))
+			 ((eq (cdr ans) 'new)
+			  (ede-new-target))
+			 (t nil))))
+		((or (eq ede-auto-add-method 'always)
+		     (and (eq ede-auto-add-method 'multi-ask)
+			  (= 1 (length desires))))
+		 (ede-add-file (car desires)))
+		(t nil))))))
+
+
+;;; Interactive method invocations
+;;
+(defun ede (file)
+  "Start up EDE on something.
+Argument FILE is the file or directory to load a project from."
+  (interactive "fProject File: ")
+  (if (not (file-exists-p file))
+      (ede-new file)
+    (ede-load-project-file (file-name-directory file))))
+
+(defun ede-new (type &optional name)
+  "Create a new project starting of project type TYPE.
+Optional argument NAME is the name to give this project."
+  (interactive
+   (list (completing-read "Project Type: "
+			  (object-assoc-list
+			   'name
+			   (let* ((l ede-project-class-files)
+				  (cp (ede-current-project))
+				  (cs (when cp (object-class cp)))
+				  (r nil))
+			     (while l
+			       (if cs
+				   (if (eq (oref (car l) :class-sym)
+					   cs)
+				       (setq r (cons (car l) r)))
+				 (if (oref (car l) new-p)
+				     (setq r (cons (car l) r))))
+			       (setq l (cdr l)))
+			     (when (not r)
+			       (if cs
+				   (error "No valid interactive sub project types for %s"
+					  cs)
+				 (error "EDE error: Can't fin project types to create")))
+			     r)
+			   )
+			  nil t)))
+  ;; Make sure we have a valid directory
+  (when (not (file-exists-p default-directory))
+    (error "Cannot create project in non-existant directory %s" default-directory))
+  (when (not (file-writable-p default-directory))
+    (error "No write permissions for %s" default-directory))
+  ;; Create the project
+  (let* ((obj (object-assoc type 'name ede-project-class-files))
+	 (nobj (let ((f (oref obj file))
+		     (pf (oref obj proj-file)))
+		 ;; We are about to make something new, changing the
+		 ;; state of existing directories.
+		 (ede-project-directory-remove-hash default-directory)
+		 ;; Make sure this class gets loaded!
+		 (require f)
+		 (make-instance (oref obj class-sym)
+				:name (or name (read-string "Name: "))
+				:directory default-directory
+				:file (cond ((stringp pf)
+					     (expand-file-name pf))
+					    ((fboundp pf)
+					     (funcall pf))
+					    (t
+					     (error
+					      "Unknown file name specifier %S"
+					      pf)))
+				:targets nil)))
+	 (inits (oref obj initializers)))
+    ;; Force the name to match for new objects.
+    (object-set-name-string nobj (oref nobj :name))
+    ;; Handle init args.
+    (while inits
+      (eieio-oset nobj (car inits) (car (cdr inits)))
+      (setq inits (cdr (cdr inits))))
+    (let ((pp (ede-parent-project)))
+      (when pp
+	(ede-add-subproject pp nobj)
+	(ede-commit-project pp)))
+    (ede-commit-project nobj))
+  ;; Have the menu appear
+  (setq ede-minor-mode t)
+  ;; Allert the user
+  (message "Project created and saved.  You may now create targets."))
+
+(defmethod ede-add-subproject ((proj-a ede-project) proj-b)
+  "Add into PROJ-A, the subproject PROJ-B."
+  (oset proj-a subproj (cons proj-b (oref proj-a subproj))))
+
+(defun ede-invoke-method (sym &rest args)
+  "Invoke method SYM on the current buffer's project object.
+ARGS are additional arguments to pass to method sym."
+  (if (not ede-object)
+      (error "Cannot invoke %s for %s" (symbol-name sym)
+	     (buffer-name)))
+  ;; Always query a target.  There should never be multiple
+  ;; projects in a single buffer.
+  (apply sym (ede-singular-object "Target: ") args))
+
+(defun ede-rescan-toplevel ()
+  "Rescan all project files."
+  (interactive)
+  (let ((toppath (ede-toplevel-project default-directory))
+	(ede-deep-rescan t))
+    (project-rescan (ede-load-project-file toppath))
+    (ede-reset-all-buffers 1)
+    ))
+
+(defun ede-new-target (&rest args)
+  "Create a new target specific to this type of project file.
+Different projects accept different arguments ARGS.
+Typically you can specify NAME, target TYPE, and AUTOADD, where AUTOADD is
+a string \"y\" or \"n\", which answers the y/n question done interactively."
+  (interactive)
+  (apply 'project-new-target (ede-current-project) args)
+  (setq ede-object nil)
+  (setq ede-object (ede-buffer-object (current-buffer)))
+  (ede-apply-target-options))
+
+(defun ede-new-target-custom ()
+  "Create a new target specific to this type of project file."
+  (interactive)
+  (project-new-target-custom (ede-current-project)))
+
+(defun ede-delete-target (target)
+  "Delete TARGET from the current project."
+  (interactive (list
+		(let ((ede-object (ede-current-project)))
+		  (ede-invoke-method 'project-interactive-select-target
+				     "Target: "))))
+  ;; Find all sources in buffers associated with the condemned buffer.
+  (let ((condemned (ede-target-buffers target)))
+    (project-delete-target target)
+    ;; Loop over all project controlled buffers
+    (save-excursion
+      (while condemned
+	(set-buffer (car condemned))
+	(setq ede-object nil)
+	(setq ede-object (ede-buffer-object (current-buffer)))
+	(setq condemned (cdr condemned))))
+    (ede-apply-target-options)))
+
+(defun ede-add-file (target)
+  "Add the current buffer to a TARGET in the current project."
+  (interactive (list
+		(let ((ede-object (ede-current-project)))
+		  (ede-invoke-method 'project-interactive-select-target
+				     "Target: "))))
+  (when (stringp target)
+    (let* ((proj (ede-current-project))
+	   (ob (object-assoc-list 'name (oref proj targets))))
+      (setq target (cdr (assoc target ob)))))
+
+  (when (not target)
+    (error "Could not find specified target %S" target))
+
+  (project-add-file target (buffer-file-name))
+  (setq ede-object nil)
+  (setq ede-object (ede-buffer-object (current-buffer)))
+  (when (not ede-object)
+    (error "Can't add %s to target %s: Wrong file type"
+	   (file-name-nondirectory (buffer-file-name))
+	   (object-name target)))
+  (ede-apply-target-options))
+
+;;;###autoload
+(defun ede-remove-file (&optional force)
+  "Remove the current file from targets.
+Optional argument FORCE forces the file to be removed without asking."
+  (interactive "P")
+  (if (not ede-object)
+      (error "Cannot invoke remove-file for %s" (buffer-name)))
+  (let ((eo (if (listp ede-object)
+		(prog1
+		    ede-object
+		  (setq force nil))
+	      (list ede-object))))
+    (while eo
+      (if (or force (y-or-n-p (format "Remove from %s? " (ede-name (car eo)))))
+	  (project-remove-file (car eo) (buffer-file-name)))
+      (setq eo (cdr eo)))
+    (setq ede-object nil)
+    (setq ede-object (ede-buffer-object (current-buffer)))
+    (ede-apply-target-options)))
+
+(defun ede-edit-file-target ()
+  "Enter the project file to hand edit the current buffer's target."
+  (interactive)
+  (ede-invoke-method 'project-edit-file-target))
+
+(defun ede-compile-project ()
+  "Compile the current project."
+  (interactive)
+  ;; @TODO - This just wants the root.  There should be a better way.
+  (let ((cp (ede-current-project)))
+    (while (ede-parent-project cp)
+      (setq cp (ede-parent-project cp)))
+    (let ((ede-object cp))
+      (ede-invoke-method 'project-compile-project))))
+
+(defun ede-compile-selected (target)
+  "Compile some TARGET from the current project."
+  (interactive (list (project-interactive-select-target (ede-current-project)
+							"Target to Build: ")))
+  (project-compile-target target))
+
+;;;###autoload
+(defun ede-compile-target ()
+  "Compile the current buffer's associated target."
+  (interactive)
+  (ede-invoke-method 'project-compile-target))
+
+(defun ede-debug-target ()
+  "Debug the current buffer's assocated target."
+  (interactive)
+  (ede-invoke-method 'project-debug-target))
+
+(defun ede-run-target ()
+  "Debug the current buffer's assocated target."
+  (interactive)
+  (ede-invoke-method 'project-run-target))
+
+(defun ede-make-dist ()
+  "Create a distribution from the current project."
+  (interactive)
+  (let ((ede-object (ede-toplevel)))
+    (ede-invoke-method 'project-make-dist)))
+
+
+
+;;; EDE project target baseline methods.
+;;
+;;  If you are developing a new project type, you need to implement
+;;  all of these methods, unless, of course, they do not make sense
+;;  for your particular project.
+;;
+;;  Your targets should inherit from `ede-target', and your project
+;;  files should inherit from `ede-project'.  Create the appropriate
+;;  methods based on those below.
+
+(defmethod project-interactive-select-target ((this ede-project-placeholder) prompt)
+					; checkdoc-params: (prompt)
+  "Make sure placeholder THIS is replaced with the real thing, and pass through."
+  (project-interactive-select-target this prompt))
+
+(defmethod project-interactive-select-target ((this ede-project) prompt)
+  "Interactively query for a target that exists in project THIS.
+Argument PROMPT is the prompt to use when querying the user for a target."
+  (let ((ob (object-assoc-list 'name (oref this targets))))
+    (cdr (assoc (completing-read prompt ob nil t) ob))))
+
+(defmethod project-add-file ((this ede-project-placeholder) file)
+					; checkdoc-params: (file)
+  "Make sure placeholder THIS is replaced with the real thing, and pass through."
+  (project-add-file this file))
+
+(defmethod project-add-file ((ot ede-target) file)
+  "Add the current buffer into project project target OT.
+Argument FILE is the file to add."
+  (error "add-file not supported by %s" (object-name ot)))
+
+(defmethod project-remove-file ((ot ede-target) fnnd)
+  "Remove the current buffer from project target OT.
+Argument FNND is an argument."
+  (error "remove-file not supported by %s" (object-name ot)))
+
+;;;###autoload
+(defmethod project-edit-file-target ((ot ede-target))
+  "Edit the target OT associated w/ this file."
+  (find-file (oref (ede-current-project) file)))
+
+(defmethod project-new-target ((proj ede-project) &rest args)
+  "Create a new target.  It is up to the project PROJ to get the name."
+  (error "new-target not supported by %s" (object-name proj)))
+
+(defmethod project-new-target-custom ((proj ede-project))
+  "Create a new target.  It is up to the project PROJ to get the name."
+  (error "New-target-custom not supported by %s" (object-name proj)))
+
+(defmethod project-delete-target ((ot ede-target))
+  "Delete the current target OT from its parent project."
+  (error "add-file not supported by %s" (object-name ot)))
+
+;;;###autoload
+(defmethod project-compile-project ((obj ede-project) &optional command)
+  "Compile the entire current project OBJ.
+Argument COMMAND is the command to use when compiling."
+  (error "compile-project not supported by %s" (object-name obj)))
+
+;;;###autoload
+(defmethod project-compile-target ((obj ede-target) &optional command)
+  "Compile the current target OBJ.
+Argument COMMAND is the command to use for compiling the target."
+  (error "compile-target not supported by %s" (object-name obj)))
+
+(defmethod project-debug-target ((obj ede-target))
+  "Run the current project target OBJ in a debugger."
+  (error "debug-target not supported by %s" (object-name obj)))
+
+(defmethod project-run-target ((obj ede-target))
+  "Run the current project target OBJ."
+  (error "run-target not supported by %s" (object-name obj)))
+
+;;;###autoload
+(defmethod project-make-dist ((this ede-project))
+  "Build a distribution for the project based on THIS project."
+  (error "Make-dist not supported by %s" (object-name this)))
+
+(defmethod project-dist-files ((this ede-project))
+  "Return a list of files that constitutes a distribution of THIS project."
+  (error "Dist-files is not supported by %s" (object-name this)))
+
+(defmethod project-rescan ((this ede-project))
+  "Rescan the EDE proj project THIS."
+  (error "Rescanning a project is not supported by %s" (object-name this)))
+
+(defun ede-ecb-project-paths ()
+  "Return a list of all paths for all active EDE projects.
+This functions is meant for use with ECB."
+  (let ((p ede-projects)
+	(d nil))
+    (while p
+      (setq d (cons (file-name-directory (oref (car p) file))
+		    d)
+	    p (cdr p)))
+    d))
+
+;;; PROJECT LOADING/TRACKING
+;;
+(defun ede-add-project-to-global-list (proj)
+  "Add the project PROJ to the master list of projects.
+On success, return the added project."
+  (when (not proj)
+    (error "No project created to add to master list"))
+  (when (not (eieio-object-p proj))
+    (error "Attempt to add Non-object to master project list"))
+  (when (not (obj-of-class-p proj ede-project-placeholder))
+    (error "Attempt to add a non-project to the ede projects list"))
+  (add-to-list 'ede-projects proj)
+  proj)
+
+;;;###autoload
+(defun ede-load-project-file (dir &optional rootreturn)
+  "Project file independent way to read a project in from DIR.
+Optional ROOTRETURN will return the root project for DIR."
+  ;; Only load if something new is going on.  Flush the dirhash.
+  (ede-project-directory-remove-hash dir)
+  ;; Do the load
+  ;;(message "EDE LOAD : %S" file)
+  (let* ((file dir)
+	 (path (expand-file-name (file-name-directory file)))
+	 (pfc (ede-directory-project-p path))
+	 (toppath nil)
+	 (o nil))
+    (cond
+     ((not pfc)
+      ;; @TODO - Do we really need to scan?  Is this a waste of time?
+      ;; Scan upward for a the next project file style.
+      (let ((p path))
+	(while (and p (not (ede-directory-project-p p)))
+	  (setq p (ede-up-directory p)))
+	(if p (ede-load-project-file p)
+	  nil)
+	;; recomment as we go
+	;;nil
+	))
+     ;; Do nothing if we are buiding an EDE project already
+     (ede-constructing
+      nil)
+     ;; Load in the project in question.
+     (t
+      (setq toppath (ede-toplevel-project path))
+      ;; We found the top-most directory.  Check to see if we already
+      ;; have an object defining its project.
+      (setq pfc (ede-directory-project-p toppath t))
+
+      ;; See if its been loaded before
+      (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
+			    ede-projects))
+      (if (not o)
+	  ;; If not, get it now.
+	  (let ((ede-constructing t))
+	    (setq o (funcall (oref pfc load-type) toppath))
+	    (when (not o)
+	      (error "Project type error: :load-type failed to create a project"))
+	    (ede-add-project-to-global-list o)))
+
+      ;; Return the found root project.
+      (when rootreturn (set rootreturn o))
+
+      (let (tocheck found)
+	;; Now find the project file belonging to FILE!
+	(setq tocheck (list o))
+	(setq file (ede-dir-to-projectfile pfc (expand-file-name path)))
+	(while (and tocheck (not found))
+	  (let ((newbits nil))
+	    (when (car tocheck)
+	      (if (string= file (oref (car tocheck) file))
+		  (setq found (car tocheck)))
+	      (setq newbits (oref (car tocheck) subproj)))
+	    (setq tocheck
+		  (append (cdr tocheck) newbits))))
+	(if (not found)
+	    (message "No project for %s, but passes project-p test" file)
+	  ;; Now that the file has been reset inside the project object, do
+	  ;; the cache maintenance.
+	  (setq ede-project-cache-files
+		(delete (oref found file) ede-project-cache-files)))
+	found)))))
+
+;;; PROJECT ASSOCIATIONS
+;;
+;; Moving between relative projects.  Associating between buffers and
+;; projects.
+
+;;;###autoload
+(defun ede-parent-project (&optional obj)
+  "Return the project belonging to the parent directory.
+nil if there is no previous directory.
+Optional argument OBJ is an object to find the parent of."
+  (let* ((proj (or obj ede-object-project)) ;; Current project.
+	 (root (if obj (ede-project-root obj)
+		 ede-object-root-project)))
+    ;; This case is a SHORTCUT if the project has defined
+    ;; a way to calculate the project root.
+    (if (and root proj (eq root proj))
+	nil ;; we are at the root.
+      ;; Else, we may have a nil proj or root.
+      (let* ((thisdir (if obj (oref obj directory)
+			default-directory))
+	     (updir (ede-up-directory thisdir)))
+        (when updir
+	  ;; If there was no root, perhaps we can derive it from
+	  ;; updir now.
+	  (let ((root (or root (ede-directory-get-toplevel-open-project updir))))
+	    (or
+	     ;; This lets us find a subproject under root based on updir.
+	     (and root
+		  (ede-find-subproject-for-directory root updir))
+	     ;; Try the all structure based search.
+	     (ede-directory-get-open-project updir)
+	     ;; Load up the project file as a last resort.
+	     ;; Last resort since it uses file-truename, and other
+	     ;; slow features.
+	     (and (ede-directory-project-p updir)
+		  (ede-load-project-file
+		   (file-name-as-directory updir))))))))))
+
+(defun ede-current-project (&optional dir)
+  "Return the current project file.
+If optional DIR is provided, get the project for DIR instead."
+  (let ((ans nil))
+    ;; If it matches the current directory, do we have a pre-existing project?
+    (when (and (or (not dir) (string= dir default-directory))
+	       ede-object-project)
+      (setq ans ede-object-project)
+      )
+    ;; No current project.
+    (when (not ans)
+      (let* ((ldir (or dir default-directory)))
+	(setq ans (ede-directory-get-open-project ldir))
+	(or ans
+	    ;; No open project, if this dir pass project-p, then load.
+	    (when (ede-directory-project-p ldir)
+	      (setq ans (ede-load-project-file ldir))))))
+    ;; Return what we found.
+    ans))
+
+(defun ede-buffer-object (&optional buffer projsym)
+  "Return the target object for BUFFER.
+This function clears cached values and recalculates.
+Optional PROJSYM is a symbol, which will be set to the project
+that contains the target that becomes buffer's object."
+  (save-excursion
+    (if (not buffer) (setq buffer (current-buffer)))
+    (set-buffer buffer)
+    (setq ede-object nil)
+    (let* ((localpo (ede-current-project))
+	   (po localpo)
+	   (top (ede-toplevel po)))
+      (if po (setq ede-object (ede-find-target po buffer)))
+      ;; If we get nothing, go with the backup plan of slowly
+      ;; looping upward
+      (while (and (not ede-object) (not (eq po top)))
+	(setq po (ede-parent-project po))
+	(if po (setq ede-object (ede-find-target po buffer))))
+      ;; Filter down to 1 project if there are dups.
+      (if (= (length ede-object) 1)
+	  (setq ede-object (car ede-object)))
+      ;; Track the project, if needed.
+      (when (and projsym (symbolp projsym))
+	(if ede-object
+	    ;; If we found a target, then PO is the
+	    ;; project to use.
+	    (set projsym po)
+	  ;; If there is no ede-object, then the projsym
+	  ;; is whichever part of the project is most local.
+	  (set projsym localpo))
+	))
+    ;; Return our findings.
+    ede-object))
+
+(defmethod ede-target-in-project-p ((proj ede-project) target)
+  "Is PROJ the parent of TARGET?
+If TARGET belongs to a subproject, return that project file."
+  (if (and (slot-boundp proj 'targets)
+	   (memq target (oref proj targets)))
+      proj
+    (let ((s (oref proj subproj))
+	  (ans nil))
+      (while (and s (not ans))
+	(setq ans (ede-target-in-project-p (car s) target))
+	(setq s (cdr s)))
+      ans)))
+
+;;;###autoload
+(defun ede-target-parent (target)
+  "Return the project which is the parent of TARGET.
+It is recommended you track the project a different way as this function
+could become slow in time."
+  ;; @todo - use ede-object-project as a starting point.
+  (let ((ans nil) (projs ede-projects))
+    (while (and (not ans) projs)
+      (setq ans (ede-target-in-project-p (car projs) target)
+	    projs (cdr projs)))
+    ans))
+
+(defmethod ede-find-target ((proj ede-project) buffer)
+  "Fetch the target in PROJ belonging to BUFFER or nil."
+  (save-excursion
+    (set-buffer buffer)
+    (or ede-object
+	(if (ede-buffer-mine proj buffer)
+	    proj
+	  (let ((targets (oref proj targets))
+		(f nil))
+	    (while targets
+	      (if (ede-buffer-mine (car targets) buffer)
+		  (setq f (cons (car targets) f)))
+	      (setq targets (cdr targets)))
+	    f)))))
+
+(defmethod ede-target-buffer-in-sourcelist ((this ede-target) buffer source)
+  "Return non-nil if object THIS is in BUFFER to a SOURCE list.
+Handles complex path issues."
+  (member (ede-convert-path this (buffer-file-name buffer)) source))
+
+(defmethod ede-buffer-mine ((this ede-project) buffer)
+  "Return non-nil if object THIS lays claim to the file in BUFFER."
+  nil)
+
+(defmethod ede-buffer-mine ((this ede-target) buffer)
+  "Return non-nil if object THIS lays claim to the file in BUFFER."
+  (condition-case nil
+      (ede-target-buffer-in-sourcelist this buffer (oref this source))
+    ;; An error implies a bad match.
+    (error nil)))
+
+
+;;; Project mapping
+;;
+(defun ede-project-buffers (project)
+  "Return a list of all active buffers controlled by PROJECT.
+This includes buffers controlled by a specific target of PROJECT."
+  (let ((bl (buffer-list))
+	(pl nil))
+    (while bl
+      (save-excursion
+	(set-buffer (car bl))
+	(if (and ede-object (eq (ede-current-project) project))
+	    (setq pl (cons (car bl) pl))))
+      (setq bl (cdr bl)))
+    pl))
+
+(defun ede-target-buffers (target)
+  "Return a list of buffers that are controlled by TARGET."
+  (let ((bl (buffer-list))
+	(pl nil))
+    (while bl
+      (save-excursion
+	(set-buffer (car bl))
+	(if (if (listp ede-object)
+		(memq target ede-object)
+	      (eq ede-object target))
+	    (setq pl (cons (car bl) pl))))
+      (setq bl (cdr bl)))
+    pl))
+
+(defun ede-buffers ()
+  "Return a list of all buffers controled by an EDE object."
+  (let ((bl (buffer-list))
+	(pl nil))
+    (while bl
+      (save-excursion
+	(set-buffer (car bl))
+	(if ede-object
+	    (setq pl (cons (car bl) pl))))
+      (setq bl (cdr bl)))
+    pl))
+
+(defun ede-map-buffers (proc)
+  "Execute PROC on all buffers controled by EDE."
+  (mapcar proc (ede-buffers)))
+
+(defmethod ede-map-project-buffers ((this ede-project) proc)
+  "For THIS, execute PROC on all buffers belonging to THIS."
+  (mapcar proc (ede-project-buffers this)))
+
+(defmethod ede-map-target-buffers ((this ede-target) proc)
+  "For THIS, execute PROC on all buffers belonging to THIS."
+  (mapcar proc (ede-target-buffers this)))
+
+;; other types of mapping
+(defmethod ede-map-subprojects ((this ede-project) proc)
+  "For object THIS, execute PROC on all direct subprojects.
+This function does not apply PROC to sub-sub projects.
+See also `ede-map-all-subprojects'."
+  (mapcar proc (oref this subproj)))
+
+(defmethod ede-map-all-subprojects ((this ede-project) allproc)
+  "For object THIS, execute PROC on THIS and  all subprojects.
+This function also applies PROC to sub-sub projects.
+See also `ede-map-subprojects'."
+  (apply 'append 
+	 (list (funcall allproc this))
+	 (ede-map-subprojects
+	  this
+	  (lambda (sp)
+	    (ede-map-all-subprojects sp allproc))
+	  )))
+
+;; (ede-map-all-subprojects (ede-load-project-file "../semantic/") (lambda (sp) (oref sp file)))
+
+(defmethod ede-map-targets ((this ede-project) proc)
+  "For object THIS, execute PROC on all targets."
+  (mapcar proc (oref this targets)))
+
+(defmethod ede-map-any-target-p ((this ede-project) proc)
+  "For project THIS, map PROC to all targets and return if any non-nil.
+Return the first non-nil value returned by PROC."
+  (ede-or (ede-map-targets this proc)))
+
+;;; VC Handling
+;;
+(defun ede-maybe-checkout (&optional buffer)
+  "Check BUFFER out of VC if necessary."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (if (and buffer-read-only vc-mode
+	     (y-or-n-p "Checkout Makefile.am from VC? "))
+	(vc-toggle-read-only))))
+
+
+;;; Some language specific methods.
+;;
+;; These items are needed by ede-cpp-root to add better support for
+;; configuring items for Semantic.
+(defun ede-apply-preprocessor-map ()
+  "Apply preprocessor tables onto the current buffer."
+  (when (and ede-object (boundp 'semantic-lex-spp-macro-symbol-obarray))
+    (let* ((objs ede-object)
+	   (map (ede-preprocessor-map (if (consp objs)
+					  (car objs)
+					objs))))
+      (when map
+	;; We can't do a require for the below symbol.
+	(setq semantic-lex-spp-project-macro-symbol-obarray
+	      (semantic-lex-make-spp-table map))
+	)
+      (when (consp objs)
+	(message "Choosing preprocessor syms for project %s"
+		 (object-name (car objs))))
+      )))
+
+(defmethod ede-system-include-path ((this ede-project))
+  "Get the system include path used by project THIS."
+  nil)
+  
+(defmethod ede-preprocessor-map ((this ede-project))
+  "Get the pre-processor map for project THIS."
+  nil)
+
+(defmethod ede-system-include-path ((this ede-target))
+  "Get the system include path used by project THIS."
+  nil)
+  
+(defmethod ede-preprocessor-map ((this ede-target))
+  "Get the pre-processor map for project THIS."
+  nil)
+
+
+;;; Project-local variables
+;;
+(defun ede-make-project-local-variable (variable &optional project)
+  "Make VARIABLE project-local to PROJECT."
+  (if (not project) (setq project (ede-current-project)))
+  (if (assoc variable (oref project local-variables))
+      nil
+    (oset project local-variables (cons (list variable)
+					(oref project local-variables)))
+    (mapcar (lambda (b) (save-excursion
+			  (set-buffer  b)
+			  (make-local-variable variable)))
+	    (ede-project-buffers project))))
+
+(defmethod ede-set-project-variables ((project ede-project) &optional buffer)
+  "Set variables local to PROJECT in BUFFER."
+  (if (not buffer) (setq buffer (current-buffer)))
+  (save-excursion
+   (set-buffer buffer)
+   (mapcar (lambda (v)
+	     (make-local-variable (car v))
+	     ;; set its value here?
+	     (set (car v) (cdr v))
+	     )
+	   (oref project local-variables))))
+
+(defun ede-set (variable value &optional proj)
+  "Set the project local VARIABLE to VALUE.
+If VARIABLE is not project local, just use set."
+  (let ((p (or proj (ede-current-project)))
+	a)
+    (if (and p (setq a (assoc variable (oref p local-variables))))
+	(progn
+	  (setcdr a value)
+	  (mapc (lambda (b) (save-excursion
+			      (set-buffer b)
+			      (set variable value)))
+		(ede-project-buffers p)))
+      (set variable value))
+    (ede-commit-local-variables p))
+  value)
+
+(defmethod ede-commit-local-variables ((proj ede-project))
+  "Commit change to local variables in PROJ."
+  nil)
+
+
+;;; Accessors for more complex types where oref is inappropriate.
+;;
+
+;;; Lame stuff
+;;
+;; @todo - Can I remove this?
+(defun ede-or (arg)
+  "Do `or' like stuff to ARG because you can't apply `or'."
+  (while (and arg (not (car arg)))
+    (setq arg (cdr arg)))
+  arg)
+
+
+;;; Hooks & Autoloads
+;;
+;;  These let us watch various activities, and respond apropriatly.
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec ede-with-projectfile
+	      (form def-body))))
+
+;; Prevent warnings w/out requiring ede-speedbar.
+(eval-and-compile
+  (autoload 'ede-speedbar "ede-speedbar" "Run speedbar in EDE project mode." t)
+  (autoload 'ede-speedbar-file-setup "ede-speedbar" "EDE in Speedbar File mode hack." t)
+)
+
+(autoload 'ede-update-version "ede-util"
+  "Update the version of the current project." t)
+
+(autoload 'ede-vc-project-directory "ede-system" t
+  "Run `vc-directory' on the the current project.")
+
+(autoload 'ede-web-browse-home "ede-system" t
+  "Web browse this project's home page.")
+
+(autoload 'ede-edit-web-page "ede-system" t
+  "Edit the web site for this project.")
+
+(autoload 'ede-upload-distribution "ede-system" t
+  "Upload the dist for this project to the upload site.")
+
+(autoload 'ede-upload-html-documentation "ede-system" t
+  "Upload auto-generated HTML to the web site.")
+
+(provide 'ede)
+
+(require 'ede-files)
+
+;; If this does not occur after the provide, we can get a recursive
+;; load.  Yuck!
+(if (featurep 'speedbar)
+    (ede-speedbar-file-setup)
+  (add-hook 'speedbar-load-hook 'ede-speedbar-file-setup))
+
+;;; ede.el ends here
diff --git a/site/cedet-1.0pre7/ede/ede.info b/site/cedet-1.0pre7/ede/ede.info
new file mode 100644
index 0000000..3356e74
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede.info
@@ -0,0 +1,5274 @@
+This is ede.info, produced by makeinfo version 4.9 from ede.texi.
+
+START-INFO-DIR-ENTRY
+* ede: (ede).       Project management for Emacs
+END-INFO-DIR-ENTRY
+
+
+File: ede.info,  Node: Top,  Next: EDE Project Concepts,  Prev: (dir),  Up: (dir)
+
+   EDE is a collection of definitions called the _Emacs Development
+Extensions_.  EDE provides the gloss that simplifies the learning curve
+for all the very useful functionality of building and debugging under
+emacs.  In doing so it attempts to emulate a typical IDE (Integrated
+Development Environment).  What this means is that EDE can manage or
+create your makefiles and other building environment duties so the
+developer can concentrate on code, and not support files.  In doing so,
+it will be much easier for new programmers to learn and adopt the GNU
+ways of doing things.
+
+* Menu:
+
+* EDE Project Concepts::        EDE Project Concepts
+* EDE Mode::                    Turning on EDE mode.
+* Creating a project::          Creating a project.
+* Modifying your project::      Adding and removing files and targets.
+* Building and Debugging::      Initiating a build or debug session.
+* Miscellaneous commands::      Other project related commands.
+* Project types::               There are different types of projects.
+* Extending EDE::               Programming tips when extending.
+* Project::
+* Targets::
+* Sourcecode::
+* Compilers::
+
+
+File: ede.info,  Node: EDE Project Concepts,  Next: EDE Mode,  Prev: Top,  Up: Top
+
+1 EDE Project Concepts
+**********************
+
+EDE is a generic interface for managing projects.  In other words,
+there is one set of menus and keybindings specified by EDE, but there
+are multiple ways a project can be expressed via a build system.
+
+   You can learn about multiple *Note Project types::, or the specific
+build or debug commands in other chapters.
+
+   In EDE, a project hierarchy matches a directory hierarchy.  There
+would be a project root, and subprojects in different subdirectories.
+
+   Within each project, there can be multiple targets.  A target at the
+simplest level is a named collection of files within a project.  There
+are two important reasons for specifying a target.
+
+  1. A collection of files to be added to a distribution.
+
+  2. A collection of files that can be built into something else.
+
+   If you intend to write code, and have it tarred up and distributed
+under the GPL, all important files must be a part of some target so
+that they will be added to the distribution file.
+
+   Targets that are lists of files that can be built into something else
+will also be distributed, but the build process will also convert those
+files into some specified built thing, such as a program or compiled
+documentation.
+
+   Lastly, EDE provides a way for other tools to easily learn file
+associations.  For example, a program might need to restrict some sort
+of search to files in a single target, or need to discover the location
+of documentation or interface files.  EDE can provide this information.
+
+
+File: ede.info,  Node: EDE Mode,  Next: Creating a project,  Prev: EDE Project Concepts,  Up: Top
+
+2 EDE Mode
+**********
+
+EDE is implemented as a minor-mode, which augments other modes such as C
+mode, and Texinfo mode.  You can turn EDE on for all buffers by running
+the command `global-ede-mode', or by putting this in your `~/.emacs'
+file.
+
+     (global-ede-mode t)
+
+   When EDE is active for a given buffer, the menu item "Project"
+appears.  This menu contains several high-level functions to make
+working on a code set easier.  These items and keybindings never change
+regardless of the type of project you are actually working on.
+
+   The `ede.el' file is a minimal set of loading routines.  When
+different types of projects are encountered, source code for those
+projects are loaded at that time.
+
+
+File: ede.info,  Node: Creating a project,  Next: Modifying your project,  Prev: EDE Mode,  Up: Top
+
+3 Creating a project
+********************
+
+_Note:_ It is not necessary to Create a project as described below to
+use EDE.  Some kinds of projects are autodetected, such as projects
+that use Automake, Emacs, or Linux.  See *Note Simple projects::.
+
+   To create a new project that will also create Makefiles for you,
+first load a file you would want in that project into a buffer.  If you
+have a hierarchy of directories, choose a file in the topmost directory
+first.  From this buffer, run `ede-new'.
+
+   EDE can support several types of projects.  When creating a new
+project with the command `ede-new' you must choose the type of project
+you would like to create.  *Note Project types::.
+
+   Each type has its own benefits or language specific enhancements.
+You will be prompted for the type of project you would like to create.
+The simplest and most language agnostic project type is _Make_.  A
+derivation of this is the `Automake' type.
+
+   Not all project types can be created in this way.  For example, there
+are two ways to handle Automake based projects.  One is by making an
+_Automake_ project with `ede-new'.  The other is to just write some
+automake files which EDE will automatically detect, and put you into a
+different Automake mode.  Any GNU project using Automake will be
+detected in this way, and you can use EDE to modify those Makefiles for
+you.
+
+   If you just want to use EDE to know about a project so that other
+libraries, such as semantic, can take advantage of some core EDE APIs,
+then you can use some simpler projects.  See  *Note Simple projects::.
+
+3.1 Creating a subproject
+=========================
+
+A subproject is merely a project in a subdirectory of another project.
+You can create a subproject by using the `ede-new' command (or `"Create
+Project"' from the menu) while a in a subdirectory below an existing
+project.  This new project will be automatically added to the parent
+project, and will be automatically loaded when the parent is read.
+
+   When using a project command that involves a makefile, EDE uses the
+top-most project's makefile as a starting place for the build.  How the
+toplevel project handles subprojects in the build process is dependent
+on that project's type.
+
+
+File: ede.info,  Node: Modifying your project,  Next: Building and Debugging,  Prev: Creating a project,  Up: Top
+
+4 Modifying your project
+************************
+
+Your project and targets are systems with lots of options.  Generic
+features are listed here.  You will need to read sections on specific
+project types for detailed information on the project you might be
+using.
+
+* Menu:
+
+* Add/Remove target::
+* Add/Remove files::
+* Customize Features::
+* EDE Project Features::
+
+
+File: ede.info,  Node: Add/Remove target,  Next: Add/Remove files,  Prev: Modifying your project,  Up: Modifying your project
+
+4.1 Add/Remove target
+=====================
+
+A project with no targets isn't very useful, so you can use EDE to add
+and remove targets from your project.
+
+   You can create a new target with the `ede-new-target' command `C-c .
+t'.  If appropriate you will be given the option to add the current
+buffer into the newly created target.
+
+   When creating a target, you will be given an option list of target
+types.  Each target type will have its own build process and class of
+files it will accept.
+
+   You can remove a target with the command `ede-delete-target'.
+
+   The add and remove commands are in the `Project->Project Options'
+menu.
+
+
+File: ede.info,  Node: Add/Remove files,  Next: Customize Features,  Prev: Add/Remove target,  Up: Modifying your project
+
+4.2 Add/Remove files
+====================
+
+A target with no files isn't very useful, so you can use EDE to add and
+remove files to targets.  Sometimes files can belong to multiple
+targets, and that is OK.
+
+   You can add files into targets with the command `ede-add-file' bound
+to `C-c . a'.   If there are no targets created that you wish to use,
+you can type in `new target' to create a new target apropriate for the
+file you are adding.
+
+   You can remove files from a target with the `ede-remove-file' bound
+to `C-c . d'.  If the file is in multiple targets, it will query for
+every target it could be removed from.
+
+   When you are working in a project, if you load a new file into a
+buffer that is not a part of an active target, EDE will automatically
+remind you to add it to a target of your choosing.  If you do not wish
+to add it to a target, you can choose `none'.  You can customize the
+behavior with the variable `ede-auto-add-method'.
+
+
+File: ede.info,  Node: Customize Features,  Next: EDE Project Features,  Prev: Add/Remove files,  Up: Modifying your project
+
+4.3 Customize Features
+======================
+
+A project, and its targets, are objects using the `EIEIO' object
+system. *Note (eieio)EIEIO::.  These objects have data fields containing
+important information related to your work.
+
+   If the high-level functions aren't enough, you can tweak all
+user-customizable fields at any time by running the command
+`customize-project' or `customize-target'.  This will load the current
+project or target into a _customization buffer_ where you tweak
+individual slots.  This is usually necessary for project modes that are
+very complex.
+
+   Some project modes do not have a project file, but directly read a
+Makefile, or existing file.  Instead of letting you directly edit the
+object, you can edit the file.  Use the command `ede-edit-file-target'
+bound to `C-c . e'.
+
+
+File: ede.info,  Node: EDE Project Features,  Prev: Customize Features,  Up: Modifying your project
+
+4.4 EDE Project Features
+========================
+
+This section details user facing features of an EDE `Make' style
+project.  The specified options may be the same as in a `Automake'
+project, but are not the same as in an direct Automake project.
+
+   To modify any of the specific features mentioned here, you need to
+customize the project or target with `customize-project' or
+`customize-target'.
+
+   When you are customizing, you are directly manipulating slot values
+in EIEIO objects.  If you are interested in additional details, see
+*Note Extending EDE::
+
+* Menu:
+
+* Changing Compilers and Flags::
+* Configurations::
+
+
+File: ede.info,  Node: Changing Compilers and Flags,  Next: Configurations,  Prev: EDE Project Features,  Up: EDE Project Features
+
+4.4.1 Changing Compilers and Flags
+----------------------------------
+
+Targets that build stuff need compilers.  To change compilers, you need
+to customize the desired target.
+
+   In the `[Make]' section, you can then choose a new compiler or
+linker from the list.  If a linker you need is not available, you will
+need to create a new one.  *Note Compiler and Linker objects::.
+
+   If an existing compiler or linker is close, but you need to modify
+some flag set such as adding an include path you will need to add a
+configuration variable.
+
+   To start, you should create the basic setup, and construct a makefile
+with `ede-proj-regenerate'.  Look in the `Makefile' to see what
+commands are inserted.  Once you have determined the variable you need
+to modify, you can add a configuration for it.  *Note Configurations::.
+
+
+File: ede.info,  Node: Configurations,  Prev: Changing Compilers and Flags,  Up: EDE Project Features
+
+4.4.2 Configurations
+--------------------
+
+Configurations specify different ways to build a project.  For example,
+you may configure a project to be in "debug" mode, or perhaps in
+"release" mode.
+
+   The project, and each target type all have a slot named
+`configuration-variables'.  To add new variables to a configuration
+find this slot in the custom buffer, and insert a new configuration.
+Name it either "debug" or "release", then insert some number of
+name/value pairs to it.
+
+   You can have any number of valid configurations too.  To add a new
+configuration, customize your project.  Work in the `[Settings]' block
+for "configurations".  Add a new named configuration here.
+
+   To switch between different active configurations, modify the
+"configuration default" slot.
+
+
+File: ede.info,  Node: Building and Debugging,  Next: Miscellaneous commands,  Prev: Modifying your project,  Up: Top
+
+5 Building and Debugging
+************************
+
+EDE assumes you are writing some sort of program, so it attempts to
+facilitate this activity.  EDE will associate the current buffer with a
+target.  The target then knows how to compile or debug the given source
+file.
+
+   The following commands enable compilation and debugging.
+
+`C-c . c'
+     Compile the current target.
+
+`C-c . C'
+     Compile the entire project.
+
+`c-c . D'
+     Debug the current target.
+
+`ede-make-dist'
+     Build a distribution file for your project.
+
+   These commands, plus project or target specific options are available
+in the `Project' menu.
+
+
+File: ede.info,  Node: Miscellaneous commands,  Next: Project types,  Prev: Building and Debugging,  Up: Top
+
+6 Miscellaneous commands
+************************
+
+6.1 Rescan
+==========
+
+If you opt to go in and edit EDE project files directly, perhaps with
+the `ede-edit-file-target', you will need to have Emacs rescan the
+project files to update the internal data structures.
+
+   Use `ede-rescan-toplevel' bound to `C-c . g' to refresh your system.
+
+6.2 EDE Find File
+=================
+
+EDE can help you find files in your project.  Use `ede-find-file' bound
+to `C-c . f'.  It will prompt you for a name.  You can specify the name
+without a directory.  EDE will try to find a file with that name
+somewhere in your project.
+
+   EDE can use external tools to help with file finding.  Configure the
+variable `ede-locate-setup-options' to help EDE find external tools.
+
+ -- Variable: ede-locate-setup-options
+     List of locate objects to try out by default.  Listed in order of
+     preference.  If the first item cannot be used in a particular
+     project, then the next one is tried.  It is always assumed that
+     "ede-locate-base" is at end of the list.
+
+6.3 Speedbar
+============
+
+EDE also supports the speedbar package.  While speedbar works great
+against directories already, EDE provides a project display mode.  This
+lets you look at your source files as they are structured in your
+project.  Thus, where many files may be clumped together in one
+directory, the Project view will provide a hierarchical view of your
+files as grouped by target.
+
+   You can activate speedbar in this mode with the command
+`ede-speedbar'.  This is bound to `C-c . s'.
+
+
+File: ede.info,  Node: Project types,  Next: Extending EDE,  Prev: Miscellaneous commands,  Up: Top
+
+7 Project types
+***************
+
+There are currently three types of project modes.  One is
+`ede-project', and shows up as `Make' and `Automake' when creating new
+projects.
+
+   The other project type handles automake projects directly from the
+automake files.  EDE cannot make new projects of this type, assuming
+the user will do it themselves.  Use `ede-project' in `Automake' mode
+to have EDE create `Makefile.am' file, and a `configure.in' file.
+
+   The third project style are "Simple" projects.  If you already have
+project infrastructure for building and debugging, you can instead
+create a simple project that identifies a project root and can look up
+files.  The simple project styles are useful for working with tools
+that use EDE to look up files.
+
+* Menu:
+
+* Make and Automake projects::  Project types of `ede-project'
+* Automake direct projects::    Project interface on hand-written automake files.
+* Simple projects::             Projects EDE doesn't manage.
+
+
+File: ede.info,  Node: Make and Automake projects,  Next: Automake direct projects,  Up: Project types
+
+7.1 Make and Automake projects
+==============================
+
+A project of `ede-project' type creates a file called `Project.ede' in
+every project directory.  This is used to track your configuration
+information.  If you configure this project to be in `Makefile' mode,
+then this project will autogenerate a `Makefile'.  If you configure it
+in `Automake' mode a `Makefile.am' file will be created.  The automake
+bootstrapping routines will also import and maintain a configure.am
+script and a host of other files required by Automake.
+
+
+File: ede.info,  Node: Automake direct projects,  Next: Simple projects,  Prev: Make and Automake projects,  Up: Project types
+
+7.2 Automake direct projects
+============================
+
+The project type that reads `Makefile.am' directly is derived from the
+sources of the original `project-am.el' mode that was distributed
+independently.  This mode eventually became EDE.  The `project-am'
+project will read existing automake files, but will not generate them
+automatically, or create new ones.  As such, it is useful as a browsing
+tool, or as maintenance in managing file lists.
+
+
+File: ede.info,  Node: Simple projects,  Prev: Automake direct projects,  Up: Project types
+
+7.3 Simple Projects
+===================
+
+There can be a wide array of Simple projects.  The root for simple
+projects is the class `ede-simple-project'.  This handles the
+infrastructure of storing a .ede file if needed.
+
+   The class `ede-simple-project' is designed to be subclassed.  Then
+key EDE methods can be overridden to provide a quick wrapper over any
+project.
+
+   A second project type is `ede-cpp-root'.  This project type is
+designed to be created for a directory hierarchy full of C/C++ code.
+It can be configured with minimal lisp knowledge to do header file
+lookup for semantic, improving code completion performance.
+
+* Menu:
+
+* ede-cpp-root::        This project marks the root of a C/C++ code project.
+* ede-simple subclassing:: Create your own simple project.
+* ede-emacs::		A project for working with Emacs.
+* ede-linux::		A project for working with Linux kernels.
+* Custom Locate::       Customizing how to locate files in a simple project
+
+
+File: ede.info,  Node: ede-cpp-root,  Next: ede-simple subclassing,  Up: Simple projects
+
+7.3.1 ede-cpp-root
+------------------
+
+The `ede-cpp-root' project type will allow you to create a single
+object with no save-file in your `.emacs' file.  It will allow EDE to
+provide semantic with the ability to find header files quickly.
+
+   The `ede-cpp-root' class knows a few things about C++ projects, such
+as the prevalence of "include" directories, and typical file-layout
+stuff.  If this isn't sufficient, you can subclass
+`ede-cpp-root-project' and add your own tweaks in just a few lines.
+See the end of this file for an example.
+
+   In the most basic case, add this to your `.emacs' file, modifying
+appropriate bits as needed.
+
+     (ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
+
+   Replace SOMENAME with whatever name you want, and the filename to an
+actual file at the root of your project.  It might be a Makefile, a
+README file.  Whatever.  It doesn't matter.  It's just a key to hang
+the rest of EDE off of.
+
+   The most likely reason to create this project, is to speed up
+searching for includes files, or to simplify bootstrapping semantic's
+ability to find files without much user interaction.  In conjunction
+with semantic completion, having a short include path is key.  You can
+override the default include path and system include path like this:
+
+     (ede-cpp-root-project "NAME" :file "FILENAME"
+         :include-path '( "/include" "../include" "/c/include" )
+         :system-include-path '( "/usr/include/c++/3.2.2/" )
+         :spp-table '( ("MOOSE" . "")
+                       ("CONST" . "const") ) )
+
+   In this case each item in the include path list is searched.  If the
+directory starts with "/", then that expands to the project root
+directory.  If a directory does not start with "/", then it is relative
+to the default-directory of the current buffer when the file name is
+expanded.
+
+   The include path only affects C/C++ header files.  Use the slot
+`:header-match-regexp' to change it.
+
+   The `:system-include-path' allows you to specify full directory
+names to include directories where system header files can be found.
+These will be applied to files in this project only.
+
+   The `:spp-table' provides a list of project specific #define style
+macros that are unique to this project, passed in to the compiler on
+the command line, or are in special headers.  See the
+`semantic-lex-c-preprocessor-symbol-map' for more on how to format this
+entry.
+
+   If there is a single file in your project, you can instead set the
+`:spp-files' to a list of file names relative to the root of your
+project.  Specifying this is like setting the variable
+`semantic-lex-c-preprocessor-symbol-file' in semantic.
+
+   If you want to override the file-finding tool with your own function
+you can do this:
+
+     (ede-cpp-root-project "NAME" :file "FILENAME" :locate-fcn 'MYFCN)
+
+   Where MYFCN is a symbol for a function.  The locate function can be
+used in place of `ede-expand-filename' so you can quickly customize
+your custom target to use specialized local routines instead of the
+default EDE routines.  The function symbol must take two arguments:
+
+NAME
+     The name of the file to find.
+
+DIR
+     The directory root for this cpp-root project.
+
+   If the cpp-root project style is right for you, but you want a
+dynamic loader, instead of hard-coding path name values in your
+`.emacs', you can do that too, but you will need to write some lisp
+code.
+
+   To do that, you need to add an entry to the
+`ede-project-class-files' list, and also provide two functions to teach
+EDE how to load your project pattern
+
+   It would look like this:
+
+     (defun MY-FILE-FOR-DIR (&optional dir)
+       "Return a full file name to the project file stored in DIR."
+       <write your code here, or return nil>
+       )
+
+     (defun MY-ROOT-FCN ()
+       "Return the root fcn for `default-directory'"
+       ;; You might be able to use `ede-cpp-root-project-root'
+       ;; and not write this at all.
+       )
+
+     (defun MY-LOAD (dir)
+       "Load a project of type `cpp-root' for the directory DIR.
+     Return nil if there isn't one."
+       ;; Use your preferred constructin method here.
+       (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
+                                    :locate-fcn 'MYFCN)
+       )
+
+     (add-to-list 'ede-project-class-files
+     	     (ede-project-autoload "cpp-root"
+     	      :name "CPP ROOT"
+     	      :file 'ede-cpp-root
+     	      :proj-file 'MY-FILE-FOR-DIR
+                   :proj-root 'MY-ROOT-FCN
+     	      :load-type 'MY-LOAD
+     	      :class-sym 'ede-cpp-root)
+     	     t)
+
+   This example only creates an auto-loader, and does not create a new
+kind of project.
+
+
+File: ede.info,  Node: ede-simple subclassing,  Next: ede-emacs,  Prev: ede-cpp-root,  Up: Simple projects
+
+7.3.2 ede-simple Subclassing
+----------------------------
+
+todo - Write some doc.
+
+   In the meantime look in the commentary of ede-simple.el
+
+
+File: ede.info,  Node: ede-emacs,  Next: ede-linux,  Prev: ede-simple subclassing,  Up: Simple projects
+
+7.3.3 ede-emacs
+---------------
+
+The `ede-emacs' project will automatically identify an Emacs source
+tree, and enable EDE project mode for it.
+
+   It pre-populates the C Preprocessor symbol map for correct parsing,
+and has an optimized include file identification function.
+
+
+File: ede.info,  Node: ede-linux,  Next: Custom Locate,  Prev: ede-emacs,  Up: Simple projects
+
+7.3.4 ede-linux
+---------------
+
+The `ede-linux' project will automatically identify a Linux Kernel
+source tree, and enable EDE project mode for it.
+
+   It pre-populates the C Preprocessor symbol map for reasonable
+parsing, and has an optimized include file identification function.
+
+
+File: ede.info,  Node: Custom Locate,  Prev: ede-linux,  Up: Simple projects
+
+7.3.5 Custom Locate
+-------------------
+
+The various simple project styles all have one major drawback, which is
+that the files in the project are not completely known to EDE.  When
+the EDE API is used to try and file files by some reference name in the
+project, then that could fail.
+
+   @TODO - Add ID Utils and CScope examples
+
+   EDE can therefore use some external locate commands, such as the unix
+"locate" command, or "GNU Global".
+
+   Configuration of the tool you want to use such as `locate', or
+`global' will need to be done without the aid of EDE.  Once configured,
+however, EDE can use it.
+
+   To enable one of these tools, set the variable
+`ede-locate-setup-options' with the names of different locate objects.
+*Note Miscellaneous commands::.
+
+   Configure this in your `.emacs' before loading in CEDET or EDE.  If
+you want to add support for GNU Global, your configuration would look
+like this:
+
+     (setq ede-locate-setup-options '(ede-locate-global ede-locate-base))
+
+   That way, when a search needs to be done, it will first try using
+GLOBAL.  If global is not available for that directory, then it will
+revert to the base locate object.  The base object always fails to find
+a file.
+
+   You can add your own locate tool but subclassing from
+`ede-locate-base'.  The subclass should also implement two methods.
+See the code in `ede-locate.el' for GNU Global as a simple example.
+
+
+File: ede.info,  Node: Extending EDE,  Next: Project,  Prev: Project types,  Up: Top
+
+8 Extending EDE
+***************
+
+This chapter is intended for users who want to write new parts or fix
+bugs in EDE.  A knowledge of Emacs Lisp, and some EIEIO(CLOS) is
+required.
+
+   If you are in this chapter because you need to enhance or fix EDE,
+here are some suggestions:
+
+EDE doesn't recognize your project
+     In this case, you will need to read *Note Detecting a Project::.
+     If you think one of the existing project types should work, then
+     you will need to understand the detection process, then
+     investigate the project code to see what may be wrong.
+
+EDE doesn't support your project
+     In this case, you will need to read all the sections, though you
+     can skip those sections specific to the secions on sourcecode and
+     compiler/linker objects which are specific to the project type that
+     autogenerates Makefiles.
+
+EDE doesn't support your compiler/linker
+     For the EDE project types that build makefiles, you will want to
+     read the *Note Compiler and Linker objects:: section.
+
+EDE doesn't support your language
+     For the EDE project types that build makefiles, you will need to
+     read the section on the `ede-proj-project', which is a project
+     type that will accept new types of languages, and build Makefiles
+     that support that language.
+
+* Menu:
+
+* Development Overview::        Overview for developers
+* Detecting a Project::         How EDE identifies projects
+* User interface methods::      Methods associated with keybindings
+* Base project methods::        The most basic methods on EDE objects.
+* EDE proj-project::            Extending Makefile generating project types.
+* Sourcecode objects::          Defining new sourcecode classes.
+* Compiler and Linker objects::  Defining new compilers and linkers.
+
+
+File: ede.info,  Node: Development Overview,  Next: Detecting a Project,  Up: Extending EDE
+
+8.1 Development Overview
+========================
+
+EDE is made up of a series of classes implemented with EIEIO.  These
+classes define an interface that can be used to create different types
+of projects.
+
+   EDE defines two superclasses which are `ede-project' and
+`ede-target'.  All commands in EDE are usually meant to address the
+current project, or current target.
+
+   All specific projects in EDE derive subclasses of the EDE
+superclasses.  In this way, specific behaviors such as how a project is
+saved, or how a target is compiled can be customized by a project
+author in detail.  EDE communicates to these project objects via an API
+using methods.  The commands you use in EDE mode are high-level
+functional wrappers over these methods.  For details on different types
+of projects, *Note Project types::.  *Note (eieio)Top::. For details on
+using EIEIO to extending classes, and writing methods.
+
+   Some example project types are:
+
+`project-am'
+     Autmake project which reads existing Automake files.
+
+`ede-proj-project'
+     This project type will create `Makefiles', or `Makefile.am' files
+     to compile your project.
+
+`ede-linux'
+     This project type will detect linux source trees.
+
+`ede-emacs'
+     This proejct will detect an Emacs source tree.
+
+   There are several other project types as well.
+
+   The first class you need to know to create a new project type is
+`ede-project-autoload'.  New instances of this class are needed to
+define how Emacs associates different files/buffers with different
+project types.  All the autoloads are kept in the variable
+`ede-project-class-files'.
+
+   The next most important class to know is `ede-project'.  This is the
+baseclass defines how all projects behave.  The basic pattern for a
+project is that there is one project per directory, and the topmost
+project or directory defines the project as a whole.
+
+   Key features of `ede-project' are things like name and version
+number.  It also holds a list of `ede-target' objects and a list of sub
+projects, or more `ede-project' objects.
+
+   New project types must subclass `ede-project' to add special
+behavior. New project types also need to subclass `ede-target' to add
+specialty behavior.
+
+   In this way, the common EDE interface is designed to work against
+`ede-project', and thus all subclasses.
+
+   `ede-project' subclasses `ede-project-placeholder'.  This is the
+minimum necessary project needed to be cached between runs of Emacs.
+This way, Emacs can track all projects ever seen, without loading those
+projects into memory.
+
+   Here is a high-level UML diagram for the EDE system created with
+COGRE..
+
+     +-----------------------+	 +-----------------------+
+     |                       |        |ede-project-placeholder|
+     |ede-project-class-files|        +-----------------------+
+     |                       |        +-----------------------+
+     +-----------------------+        +-----------------------+
+     	   /\ 				     ^
+     	   \/				    /_\
+     	    |				     |
+      +--------------------+		       +-----------+	     +----------+
+      |ede-project-autoload|                |ede-project|         |ede-target|
+      +--------------------+<>--------------+-----------+<>-------+----------+
+      +--------------------+                +-----------+         +----------+
+      +--------------------+                +-----------+         +----------+
+     					     ^
+     					    /_\
+     					     |
+     		       +---------------------+-----------------+
+     		       |		     |		       |
+     		       |		     |		       |
+     		       |		     |		       |
+     	      +----------------+   +-------------------+  +---------+
+                   |ede-proj-project|   |project-am-makefile|  |ede-emacs|
+                   +----------------+   +-------------------+  +---------+
+                   +----------------+   +-------------------+  +---------+
+                   +----------------+   +-------------------+  +---------+
+
+
+File: ede.info,  Node: Detecting a Project,  Next: User interface methods,  Prev: Development Overview,  Up: Extending EDE
+
+8.2 Detecting a Project
+=======================
+
+Project detection happens with the list of `ede-project-autoload'
+instances stored in `ede-project-class-files'.  The full project
+detection scheme works like this:
+
+Step 1:
+     `find-file-hooks' calls `ede-turn-on-hook' on BUFFER.
+
+Step 2:
+     `ede-turn-on-hook' turns on `ede-minor-mode'
+
+Step 3:
+     `ede-minor-mode' looks to see if BUFFER is assicated with any open
+     projects.  If not, it calls `ede-load-project-file' to find a
+     project associated with the current directory BUFFER is in.
+
+Step 4:
+     `ede-minor-mode' associates the found project with the current
+     buffer with a series of variables, such as `ede-object', and
+     `ede-object-project' and `ede-object-root-project'.
+
+   Once a buffer is associated, EDE minor mode commands will operate on
+that buffer.
+
+   The function `ede-load-project-file' is at the heart of detecting
+projects, and it works by looping over all the known project autoload
+types in `ede-project-autoload' using the utility
+`ede-directory-project-p'.
+
+   The function `ede-directory-project-p' will call
+`ede-dir-to-projectfile' on every `ede-project-autoload' until one of
+them returns true.  The method `ede-dir-to-projectfile' in turn gets
+the `:proj-file' slot from the autoload.  If it is a string (ie, a
+project file name), it checks to see if that exists in BUFFER's
+directory.  If it is a function, then it calls that function and
+expects it to return a file name or nil.  If the file exists, then this
+directory is assumed to be part of a project, and
+`ede-directory-project-p' returns the instance of
+`ede-project-autoload' that matched.
+
+   If the current directory is a project, then EDE scans upwards till
+it finds the top of the project.  It does this by calling
+`ede-toplevel-project'.  If this hasn't already been discovered, the
+directories as scanned upward one at a time until a directory with no
+project is found.  The last found project becomes the project root.  If
+the ofund instance of `ede-project-autoload' has a valid `proj-root'
+slot value, then that function is called instead of scanning the
+project by hand.  Some project types have a short-cut for determining
+the root of a project, so this comes in handy.
+
+   Getting back to `ede-load-project-file', this now has an instance of
+`ede-project-autoload'.  It uses the `load-type' slot to both autoload
+in the project type, and to create a new instance of the project type
+found for the root of the project.  That project is added to the global
+list of all projects.  All subprojects are then created and assembled
+into the project data structures.
+
+
+File: ede.info,  Node: User interface methods,  Next: Base project methods,  Prev: Detecting a Project,  Up: Extending EDE
+
+8.3 User interface methods
+==========================
+
+These methods are core behaviors associated with user commands.  If you
+do not implement a method, there is a reasonable default that may do
+what you need.
+
+`project-add-file'
+     Add a file to your project.  Override this if you want to put new
+     sources into different fields depending on extension, or other
+     details.
+
+`project-remove-file'
+     Reverse of project-add-file.
+
+`project-compile-target'
+     Override this if you want to do something special when the user
+     "compiles" this target.
+
+`project-debug-target'
+     What to do when a user wants to debug your target.
+
+`project-update-version'
+     Easily update the version number of your project.
+
+`project-edit-file-target'
+     Edit the file the project's information is stored in.
+
+`project-new-target'
+     Create a new target in a project.
+
+`project-delete-target'
+     Delete a target from a project.
+
+`project-make-dist'
+     Make a distribution (tar archive) of the project.
+
+`project-rescan'
+     Rescan a project file, changing the data in the existing objects.
+
+
+File: ede.info,  Node: Base project methods,  Next: EDE proj-project,  Prev: User interface methods,  Up: Extending EDE
+
+8.4 Base project methods
+========================
+
+These methods are important for querying base information from project
+and target types:
+
+`ede-name'
+     Return a string that is the name of this target.
+
+`ede-target-name'
+     Return a string that is the name of the target used by a Make
+     system.
+
+`ede-description'
+     A brief description of the project or target.  This is currently
+     used by the `ede-speedbar' interface.
+
+`ede-want-file-p'
+     Return non-nil if a target will accept a given file.  It is
+     generally unecessary to override this.  See the section on source
+     code.
+
+`ede-buffer-mine'
+     Return non-nil if a buffer belongs to this target.  Used during
+     association when a file is loaded.  It is generally unecessary to
+     override this unless you keep auxiliary files.
+
+   These methods are used by the semantic package extensions *Note
+(semantic)Top::.
+
+`ede-buffer-header-file'
+     Return a header file belonging to a given buffer.  Prototypes are
+     place there when appropriate
+
+`ede-buffer-documentation-files'
+     Return the documentation file information about this file would be
+     stored in.
+
+`ede-documentation'
+     List all documentation a project or target is responsible for.
+
+
+File: ede.info,  Node: EDE proj-project,  Next: Sourcecode objects,  Prev: Base project methods,  Up: Extending EDE
+
+8.5 EDE proj-project
+====================
+
+The EDE proj-project is a project type that will build Makefiles.  This
+project type stores data in a `Project.ede', and implements new user
+commands for building a Makefile.
+
+   This project type can be extended through the use of new Targets,
+*Note Sourcecode objects::, or *Note Compiler and Linker objects::.
+
+   This project type could also be extended to support alternate forms
+of build systems, though no documentation has been setup for this.
+
+   TODO - write more for this.  See cedet-devel mailing list for help
+here.
+
+
+File: ede.info,  Node: Sourcecode objects,  Next: Compiler and Linker objects,  Prev: EDE proj-project,  Up: Extending EDE
+
+8.6 Sourcecode objects
+======================
+
+EDE projects track source file / target associates via source code
+objects.  The definitions for this is in `ede-source.el'.  A source
+code object contains methods that know how to identify a file as being
+of that class, (ie, a C file ends with `.c').  Some targets can handle
+many different types of sources which must all be compiled together.
+For example, a mixed C and C++ program would have instantiations of
+both sourcecode types.
+
+   When a target needs to know if it will accept a source file, it
+references its list of source code objects.  These objects then make
+that decision.
+
+   Source code objects are stored in the target objects as a list of
+symbols, where the symbol's value is the object.  This enables the
+project save file mechanism to work.
+
+   Here is an example for an instantiation of an Emacs Lisp source code
+object:
+
+     (defvar ede-source-emacs
+       (ede-sourcecode "ede-emacs-source"
+     		  :name "Emacs Lisp"
+     		  :sourcepattern "\\.el$"
+     		  :garbagepattern '("*.elc"))
+       "Emacs Lisp source code definition.")
+
+   If you want to recycle parts of an existing sourcecode object, you
+can clone the original, and then just tweak the parts that are
+different.  For example:
+
+     (defvar ede-source-emacs-autoload
+       (clone ede-source-emacs "ede-source-emacs-autoload"
+              :name "Emacs Lisp Autoload"
+              :sourcepattern "-loaddefs\\.el")
+       "Emacs Lisp autoload source code.")
+
+   In this case, the garbage pattern is the same.
+
+   *Note Sourcecode::.
+
+
+File: ede.info,  Node: Compiler and Linker objects,  Prev: Sourcecode objects,  Up: Extending EDE
+
+8.7 Compiler and Linker objects
+===============================
+
+In order for a target to create a `Makefile', it must know how to
+compile the sources into the program or desired data file, and possibly
+link them together.
+
+   A compiler object instantiation is used to associate a given target
+with a given source code type.  Some targets can handle many types of
+sources, and thus has many compilers available to it.  Some targets may
+have multiple compilers for a given type of source code.
+
+   EDE will examine the actual source files in a target, cross reference
+that against the compiler list to come up with the final set of
+compilers that will be inserted into the Makefile.
+
+   Compiler instantiations must also insert variables specifying the
+compiler it plans to use, in addition to creating Automake settings for
+`configure.in' when appropriate.
+
+   Compiler objects are stored in the target objects as a list of
+symbols, where the symbols value is the object.  This enables the
+project output mechanism to work more efficiently.
+
+   Targets will also have a special "compiler" slot which lets a user
+explicitly choose the compiler they want to use.
+
+   Here is an example for texinfo:
+
+     (defvar ede-makeinfo-compiler
+       (ede-compiler
+        "ede-makeinfo-compiler"
+        :name "makeinfo"
+        :variables '(("MAKEINFO" . "makeinfo"))
+        :commands '("makeinfo -o $ $<")
+        :autoconf '(("AC_CHECK_PROG" . "MAKEINFO, makeinfo"))
+        :sourcetype '(ede-makeinfo-source)
+        )
+       "Compile texinfo files into info files.")
+
+   *Note Compilers::.
+
+   When creating compiler instantiations, it may be useful to `clone'
+an existing compiler variable.  Cloning allows you to only modify parts
+of the original, while keeping the rest of the same.  Modification of
+the original will result in the clone also being changed for shared
+value slots.
+
+   The second important object is the linker class.  The linker is
+similar to the compiler, except several compilers might be used to
+create some object files, and only one linker is used to link those
+objects together.
+
+   See `ede-proj-obj.el' for examples of the combination.
+
+8.8 Class hierarchies
+=====================
+
+* Menu:
+
+* Project    :: The different project types.
+* Targets    :: The different target types.
+* Sourcecode :: Source Code management types.
+* Compilers  :: Compiler management types.
+
+
+File: ede.info,  Node: Project,  Next: Targets,  Prev: Extending EDE,  Up: Top
+
+9 Project
+*********
+
+* Menu:
+
+* ede-project-placeholder ::
+*  ede-project ::
+*   ede-cpp-root-project ::
+*   ede-emacs-project ::
+*   ede-linux-project ::
+*   ede-maven-project ::
+*   ede-simple-project ::
+*   ede-simple-base-project ::
+*   ede-proj-project ::
+*   project-am-makefile ::
+*   ede-step-project ::
+
+
+File: ede.info,  Node: ede-project-placeholder,  Next: ede-project,  Up: Project
+
+9.1 ede-project-placeholder
+===========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `ede-project-placeholder'
+
+                   Children:
+                         *Note ede-project::.
+
+
+
+
+Create a new object with name NAME of class type ede-project-placeholder
+
+Slots:
+
+    `:name'
+          Type: `string'
+          Default Value: `"Untitled"'
+
+          The name used when generating distribution files.
+
+    `:version'
+          Type: `string'
+          Default Value: `"1.0"'
+
+          The version number used when distributing files.
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+
+
+9.1.1 Specialized Methods
+-------------------------
+
+ -- Method: ede-project-inode :AFTER proj
+     Get the inode of the directory project PROJ is in.
+
+ -- Method: ede-project-root :AFTER this
+     If a project knows its root, return it here.  Allows for
+     one-project-object-for-a-tree type systems.
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Find a subproject of PROJ that corresponds to DIR.
+
+ -- Method: ede-project-root-directory :AFTER this &optional file
+     If a project knows its root, return it here.  Allows for
+     one-project-object-for-a-tree type systems.  Optional FILE is the
+     file to test.  It is ignored in preference of the anchor file for
+     the project.
+
+ -- Method: ede-project-force-load :AFTER this
+     Make sure the placeholder THIS is replaced with the real thing.
+     Return the new object created in its place.
+
+ -- Method: project-interactive-select-target :AFTER this prompt
+     Make sure placeholder THIS is replaced with the real thing, and
+     pass through.
+
+ -- Method: project-add-file :AFTER this file
+     Make sure placeholder THIS is replaced with the real thing, and
+     pass through.
+
+
+File: ede.info,  Node: ede-project,  Next: ede-cpp-root-project,  Prev: ede-project-placeholder,  Up: Project
+
+9.2 ede-project
+===============
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `ede-project'
+
+                        Children:
+                              *Note ede-cpp-root-project::,
+                              *Note ede-emacs-project::,
+                              *Note ede-linux-project::,
+                              *Note ede-maven-project::,
+                              *Note ede-simple-project::,
+                              *Note ede-simple-base-project::,
+                              *Note ede-proj-project::,
+                              *Note project-am-makefile::,
+                              *Note ede-step-project::.
+
+
+
+
+
+Create a new object with name NAME of class type ede-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+    `:web-site-url'
+          Type: `string'
+          Default Value: `""'
+
+          URL to this projects web site.  This is a URL to be sent to a
+          web site for documentation.
+
+    `:web-site-directory
+          '
+          Default Value: `""'
+
+          A directory where web pages can be found by Emacs.  For
+          remote locations use a path compatible with ange-ftp or EFS.
+          You can also use TRAMP for use with rcp & scp.
+
+    `:web-site-file
+          '
+          Default Value: `""'
+
+          A file which contains the home page for this project.  This
+          file can be relative to slot `web-site-directory'.  This can
+          be a local file, use ange-ftp, EFS, or TRAMP.
+
+    `:ftp-site'
+          Type: `string'
+          Default Value: `""'
+
+          FTP site where this project's distribution can be found.
+          This FTP site should be in Emacs form, as needed by
+          `ange-ftp', but can also be of a form used by TRAMP for use
+          with scp, or rcp.
+
+    `:ftp-upload-site'
+          Type: `string'
+          Default Value: `""'
+
+          FTP Site to upload new distributions to.  This FTP site
+          should be in Emacs form as needed by `ange-ftp'.  If this
+          slot is `nil', then use `ftp-site' instead.
+
+    `:configurations'
+          Type: `list'
+          Default Value: `("debug" "release")'
+
+          List of available configuration types.  Individual
+          target/project types can form associations between a
+          configuration, and target specific elements such as build
+          variables.
+
+    `:configuration-default
+          '
+          Default Value: `"debug"'
+
+          The default configuration.
+
+    `:local-variables
+          '
+          Default Value: `nil'
+
+          Project local variables
+
+
+
+9.2.1 Specialized Methods
+-------------------------
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for project THIS.
+
+ -- Method: ede-subproject-relative-path :AFTER proj &optional parent-in
+     Get a path name for PROJ which is relative to the parent project.
+     If PARENT is specified, then be relative to the PARENT project.
+     Specifying PARENT is useful for sub-sub projects relative to the
+     root project.
+
+ -- Method: eieio-speedbar-description :AFTER obj
+     Provide a speedbar description for OBJ.
+
+ -- Method: ede-map-any-target-p :AFTER this proc
+     For project THIS, map PROC to all targets and return if any
+     non-nil.  Return the first non-`nil' value returned by PROC.
+
+ -- Method: project-rescan :AFTER this
+     Rescan the EDE proj project THIS.
+
+ -- Method: ede-map-subprojects :AFTER this proc
+     For object THIS, execute PROC on all direct subprojects.  This
+     function does not apply PROC to sub-sub projects.  See also
+     "ede-map-all-subprojects".
+
+ -- Method: ede-convert-path :AFTER this path
+     Convert path in a standard way for a given project.  Default to
+     making it project relative.  Argument THIS is the project to
+     convert PATH to.
+
+ -- Method: ede-name :AFTER this
+     Return a short-name for THIS project file.  Do this by extracting
+     the lowest directory name.
+
+ -- Method: ede-set-project-variables :AFTER project &optional buffer
+     Set variables local to PROJECT in BUFFER.
+
+ -- Method: eieio-speedbar-derive-line-path :AFTER obj &optional depth
+     Return the path to OBJ.  Optional DEPTH is the depth we start at.
+
+ -- Method: ede-map-all-subprojects :AFTER this allproc
+     For object THIS, execute PROC on THIS and  all subprojects.  This
+     function also applies PROC to sub-sub projects.  See also
+     "ede-map-subprojects".
+
+ -- Method: project-update-version :AFTER ot
+     The `:version' of the project OT has been updated.  Handle saving,
+     or other detail.
+
+ -- Method: ede-buffer-header-file :AFTER this buffer
+     Return `nil', projects don't have header files.
+
+ -- Method: ede-buffer-documentation-files :AFTER this buffer
+     Return all documentation in project THIS based on BUFFER.
+
+ -- Method: ede-map-targets :AFTER this proc
+     For object THIS, execute PROC on all targets.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return non-`nil' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: ede-object-keybindings :BEFORE this
+     Retrieves the slot `keybindings' from an object of class
+     `ede-project'
+
+ -- Method: ede-description :AFTER this
+     Return a description suitable for the minibuffer about THIS.
+
+ -- Method: eieio-speedbar-object-children :AFTER this
+     Return the list of speedbar display children for THIS.
+
+ -- Method: project-make-dist :AFTER this
+     Build a distribution for the project based on THIS project.
+
+ -- Method: ede-system-include-path :AFTER this
+     Get the system include path used by project THIS.
+
+ -- Method: project-new-target-custom :AFTER proj
+     Create a new target.  It is up to the project PROJ to get the name.
+
+ -- Method: ede-subproject-p :AFTER proj
+     Return non-`nil' if PROJ is a sub project.
+
+ -- Method: ede-expand-filename :AFTER this filename &optional force
+     Return a fully qualified file name based on project THIS.
+     FILENAME should be just a filename which occurs in a directory
+     controlled by this project.  Optional argument FORCE forces the
+     default filename to be provided even if it doesn't exist.
+
+ -- Method: ede-menu-items-build :AFTER obj &optional current
+     Return a list of menu items for building project OBJ.  If optional
+     argument CURRENT is non-`nil', return sub-menu code.
+
+ -- Method: ede-update-version-in-source :AFTER this version
+     Change occurrences of a version string in sources.  In project
+     THIS, cycle over all targets to give them a chance to set their
+     sources to VERSION.
+
+ -- Method: project-new-target :AFTER proj &rest args
+     Create a new target.  It is up to the project PROJ to get the name.
+
+ -- Method: project-compile-project :AFTER obj &optional command
+     Compile the entire current project OBJ.  Argument COMMAND is the
+     command to use when compiling.
+
+ -- Method: eieio-speedbar-object-buttonname :AFTER object
+     Return a string to use as a speedbar button for OBJECT.
+
+ -- Method: ede-map-project-buffers :AFTER this proc
+     For THIS, execute PROC on all buffers belonging to THIS.
+
+ -- Method: ede-expand-filename-impl :AFTER this filename &optional
+          force
+     Return a fully qualified file name based on project THIS.
+     FILENAME should be just a filename which occurs in a directory
+     controlled by this project.  Optional argument FORCE forces the
+     default filename to be provided even if it doesn't exist.
+
+ -- Method: eieio-done-customizing :AFTER proj
+     Call this when a user finishes customizing PROJ.
+
+ -- Method: ede-html-documentation :AFTER this
+     Return a list of HTML files provided by project THIS.
+
+ -- Method: ede-documentation :AFTER this
+     Return a list of files that provides documentation.  Documentation
+     is not for object THIS, but is provided by THIS for other files in
+     the project.
+
+ -- Method: project-interactive-select-target :AFTER this prompt
+     Interactively query for a target that exists in project THIS.
+     Argument PROMPT is the prompt to use when querying the user for a
+     target.
+
+ -- Method: ede-target-in-project-p :AFTER proj target
+     Is PROJ the parent of TARGET?  If TARGET belongs to a subproject,
+     return that project file.
+
+ -- Method: ede-find-target :AFTER proj buffer
+     Fetch the target in PROJ belonging to BUFFER or nil.
+
+ -- Method: ede-add-subproject :AFTER proj-a proj-b
+     Add into PROJ-A, the subproject PROJ-B.
+
+ -- Method: ede-commit-project :AFTER proj
+     Commit any change to PROJ to its file.
+
+ -- Method: project-dist-files :AFTER this
+     Return a list of files that constitutes a distribution of THIS
+     project.
+
+ -- Method: ede-object-menu :BEFORE this
+     Retrieves the slot `menu' from an object of class `ede-project'
+
+ -- Method: ede-commit-local-variables :AFTER proj
+     Commit change to local variables in PROJ.
+
+
+File: ede.info,  Node: ede-cpp-root-project,  Next: ede-emacs-project,  Prev: ede-project,  Up: Project
+
+9.3 ede-cpp-root-project
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-cpp-root-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-cpp-root-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+    `:include-path'
+          Type: `list'
+          Default Value: `(quote ("/include" "../include/"))'
+
+          The default locate function expands filenames within a
+          project.  If a header file (.h, .hh, etc) name is expanded,
+          and the `:locate-fcn' slot is `nil', then the include path is
+          checked first, and other directories are ignored.  For very
+          large projects, this optimization can save a lot of time.
+
+          Directory names in the path can be relative to the current
+          buffer's `default-directory' (not starting with a /).
+          Directories that are relative to the project's root should
+          start with a /, such as  "/include", meaning the directory
+          `include' off the project root directory.
+
+    `:system-include-path'
+          Type: `list'
+          Default Value: `nil'
+
+          The system include path for files in this project.  C files
+          initialized in an ede-cpp-root-project have their semantic
+          system include path set to this value.  If this is `nil',
+          then the semantic path is not modified.
+
+    `:spp-table'
+          Type: `list'
+          Default Value: `nil'
+
+          C Preprocessor macros for your files.  Preprocessor symbols
+          will be used while parsing your files.  These macros might be
+          passed in through the command line compiler, or are critical
+          symbols derived from header files.  Providing header files
+          macro values through this slot improves accuracy and
+          performance.  Use `:spp-files' to use these files directly.
+
+    `:spp-files'
+          Type: `list'
+          Default Value: `nil'
+
+          C header file with Preprocessor macros for your files.  The
+          PreProcessor symbols appearing in these files will be used
+          while parsing files in this project.  See
+          `semantic-lex-c-preprocessor-symbol-map' for more on how this
+          works.
+
+    `:header-match-regexp'
+          Type: `string'
+          Default Value:
+          `"\\.\\(h\\(h\\|xx\\|pp\\|\\+\\+\\)?\\|H\\)$\\|\\<\\w+$"'
+
+          Regexp used to identify C/C++ header files.
+
+    `:locate-fcn'
+          Type: `(or null function)'
+          Default Value: `nil'
+
+          The locate function can be used in place of
+          "ede-expand-filename" so you can quickly customize your
+          custom target to use specialized local routines instead of
+          the EDE routines.  The function symbol must take two
+          arguments:   NAME - The name of the file to find.    DIR -
+          The directory root for this cpp-root project.
+
+          It should return the fully qualified file name passed in from
+          NAME.  If that file does not exist, it should return nil.
+
+
+
+9.3.1 Specialized Methods
+-------------------------
+
+ -- Method: initialize-instance :AFTER this &rest fields
+     Make sure the `:file' is fully expanded.
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for project THIS.
+
+ -- Method: ede-set-project-variables :AFTER project &optional buffer
+     Set variables local to PROJECT in BUFFER.  Also set up the lexical
+     preprocessor map.
+
+ -- Method: ede-cpp-root-header-file-p :AFTER proj name
+     Non `nil' if in PROJ the filename NAME is a header.
+
+ -- Method: ede-system-include-path :AFTER this
+     Get the system include path used by project THIS.
+
+ -- Method: ede-project-root :AFTER this
+     Return my root.
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Return PROJ, for handling all subdirs below DIR.
+
+ -- Method: ede-project-root-directory :AFTER this
+     Return my root.
+
+ -- Method: ede-expand-filename-impl :AFTER proj name
+     Within this project PROJ, find the file NAME.  This knows details
+     about or source tree.
+
+ -- Method: ede-find-target :AFTER proj buffer
+     Find an EDE target in PROJ for BUFFER.  If one doesn't exist,
+     create a new one for this directory.
+
+
+File: ede.info,  Node: ede-emacs-project,  Next: ede-linux-project,  Prev: ede-cpp-root-project,  Up: Project
+
+9.4 ede-emacs-project
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-emacs-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-emacs-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+
+
+9.4.1 Specialized Methods
+-------------------------
+
+ -- Method: initialize-instance :AFTER this &rest fields
+     Make sure the `:file' is fully expanded.
+
+ -- Method: ede-project-root :AFTER this
+     Return my root.
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Return PROJ, for handling all subdirs below DIR.
+
+ -- Method: ede-project-root-directory :AFTER this &optional file
+     Return the root for THIS Emacs project with file.
+
+ -- Method: ede-expand-filename-impl :AFTER proj name
+     Within this project PROJ, find the file NAME.  Knows about how the
+     Emacs source tree is organized.
+
+ -- Method: ede-find-target :AFTER proj buffer
+     Find an EDE target in PROJ for BUFFER.  If one doesn't exist,
+     create a new one for this directory.
+
+
+File: ede.info,  Node: ede-linux-project,  Next: ede-maven-project,  Prev: ede-emacs-project,  Up: Project
+
+9.5 ede-linux-project
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-linux-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-linux-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+
+
+9.5.1 Specialized Methods
+-------------------------
+
+ -- Method: initialize-instance :AFTER this &rest fields
+     Make sure the `:file' is fully expanded.
+
+ -- Method: ede-project-root :AFTER this
+     Return my root.
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Return PROJ, for handling all subdirs below DIR.
+
+ -- Method: ede-project-root-directory :AFTER this &optional file
+     Return the root for THIS Linux project with file.
+
+ -- Method: ede-expand-filename-impl :AFTER proj name
+     Within this project PROJ, find the file NAME.  Knows about how the
+     Linux source tree is organized.
+
+ -- Method: ede-find-target :AFTER proj buffer
+     Find an EDE target in PROJ for BUFFER.  If one doesn't exist,
+     create a new one for this directory.
+
+
+File: ede.info,  Node: ede-maven-project,  Next: ede-simple-project,  Prev: ede-linux-project,  Up: Project
+
+9.6 ede-maven-project
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-maven-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-maven-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+
+
+9.6.1 Specialized Methods
+-------------------------
+
+ -- Method: initialize-instance :AFTER this &rest fields
+     Make sure the `:targets' is setup.
+
+ -- Method: ede-project-root :AFTER this
+     Return my root.
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Return PROJ, for handling all subdirs below DIR.
+
+ -- Method: ede-project-root-directory :AFTER this &optional file
+     Return the root for THIS Maven project with file.
+
+ -- Method: ede-find-target :AFTER proj buffer
+     Find an EDE target in PROJ for BUFFER.  If one doesn't exist,
+     create a new one for this directory.
+
+
+File: ede.info,  Node: ede-simple-project,  Next: ede-simple-base-project,  Prev: ede-maven-project,  Up: Project
+
+9.7 ede-simple-project
+======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-simple-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-simple-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+
+
+9.7.1 Specialized Methods
+-------------------------
+
+ -- Method: ede-find-subproject-for-directory :AFTER proj dir
+     Return PROJ, for handling all subdirs below DIR.
+
+ -- Method: ede-commit-project :AFTER proj
+     Commit any change to PROJ to its file.
+
+
+File: ede.info,  Node: ede-simple-base-project,  Next: ede-proj-project,  Prev: ede-simple-project,  Up: Project
+
+9.8 ede-simple-base-project
+===========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-simple-base-project'
+                              No children
+
+
+
+
+
+EDE Simple project base class.  This one project could control a tree
+of subdirectories.
+
+
+
+File: ede.info,  Node: ede-proj-project,  Next: project-am-makefile,  Prev: ede-simple-base-project,  Up: Project
+
+9.9 ede-proj-project
+====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-proj-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-proj-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+    `:makefile-type'
+          Type: `symbol'
+          Default Value: `Makefile'
+
+          The type of Makefile to generate.  Can be one of `'Makefile',
+          'Makefile.in, or 'Makefile.am.  If this value is NOT
+          `'Makefile', then that overrides the `:makefile' slot in
+          targets.
+
+    `:variables'
+          Type: `list'
+          Default Value: `nil'
+
+          Variables to set in this Makefile.
+
+    `:configuration-variables'
+          Type: `list'
+          Default Value: `("debug" (("DEBUG" . "1")))'
+
+          Makefile variables to use in different configurations.  These
+          variables are used in the makefile when a configuration
+          becomes active.
+
+    `:inference-rules
+          '
+          Default Value: `nil'
+
+          Inference rules to add to the makefile.
+
+    `:include-file
+          '
+          Default Value: `nil'
+
+          Additional files to include.  These files can contain
+          additional rules, variables, and customizations.
+
+    `:automatic-dependencies'
+          Type: `boolean'
+          Default Value: `t'
+
+          Non-`nil' to do implement automatic dependencies in the
+          Makefile.
+
+    `:metasubproject'
+          Type: `boolean'
+          Default Value: `nil'
+
+          Non-`nil' if this is a metasubproject.  Usually, a subproject
+          is determined by a parent project.  If multiple top level
+          projects are grouped into a large project not maintained by
+          EDE, then you need to set this to non-nil.  The only effect
+          is that the `dist' rule will then avoid making a tar file.
+
+
+
+9.9.1 Specialized Methods
+-------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan the EDE proj project THIS.
+
+ -- Method: ede-proj-makefile-create :AFTER this mfilename
+     Create a Makefile for all Makefile targets in THIS.  MFILENAME is
+     the makefile to generate.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed by THIS target.
+
+ -- Method: ede-proj-makefile-tags :AFTER this targets
+     Insert into the current location rules to make recursive TAGS
+     files.  Argument THIS is the project to create tags for.  Argument
+     TARGETS are the targets we should depend on for TAGS.
+
+ -- Method: project-update-version :AFTER this
+     The `:version' of project THIS has changed.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this
+     Insert variables needed by target THIS.
+
+ -- Method: project-make-dist :AFTER this
+     Build a distribution for the project based on THIS target.
+
+ -- Method: ede-proj-makefile-insert-dist-rules :AFTER this
+     Insert distribution rules for THIS in a Makefile, such as CLEAN
+     and DIST.
+
+ -- Method: project-new-target-custom :AFTER this
+     Create a new target in THIS for custom.
+
+ -- Method: ede-proj-makefile-insert-dist-dependencies :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Argument
+     THIS is the project that should insert stuff.
+
+ -- Method: ede-proj-makefile-insert-subproj-rules :AFTER this
+     Insert a rule for the project THIS which should be a subproject.
+
+ -- Method: ede-proj-makefile-create-maybe :AFTER this mfilename
+     Create a Makefile for all Makefile targets in THIS if needed.
+     MFILENAME is the makefile to generate.
+
+ -- Method: ede-proj-configure-test-required-file :AFTER this file
+     For project THIS, test that the file FILE exists, or create it.
+
+ -- Method: ede-proj-setup-buildenvironment :AFTER this &optional force
+     Setup the build environment for project THIS.  Handles the
+     Makefile, or a Makefile.am configure.in combination.  Optional
+     argument FORCE will force items to be regenerated.
+
+ -- Method: ede-proj-makefile-garbage-patterns :AFTER this
+     Return a list of patterns that are considered garbage to THIS.
+     These are removed with make clean.
+
+ -- Method: ede-proj-configure-synchronize :AFTER this
+     Synchronize what we know about project THIS into configure.in.
+
+ -- Method: project-new-target :AFTER this &optional name type autoadd
+     Create a new target in THIS based on the current buffer.
+
+ -- Method: project-compile-project :AFTER proj &optional command
+     Compile the entire current project PROJ.  Argument COMMAND is the
+     command to use when compiling.
+
+ -- Method: ede-proj-makefile-insert-variables-new :AFTER this
+     Insert variables needed by target THIS.
+
+     NOTE: Not yet in use!  This is part of an SRecode conversion of
+       EDE that is in progress.
+
+ -- Method: ede-proj-makefile-configuration-variables :AFTER this
+          configuration
+     Return a list of configuration variables from THIS.  Use
+     CONFIGURATION as the current configuration to query.
+
+ -- Method: eieio-done-customizing :AFTER proj
+     Call this when a user finishes customizing this object.  Argument
+     PROJ is the project to save.
+
+ -- Method: ede-proj-configure-recreate :AFTER this
+     Delete project THISes configure script and start over.
+
+ -- Method: ede-proj-makefile-insert-user-rules :AFTER this
+     Insert user specified rules needed by THIS target.  This is
+     different from "ede-proj-makefile-insert-rules" in that this
+     function won't create the building rules which are auto created
+     with automake.
+
+ -- Method: ede-proj-dist-makefile :AFTER this
+     Return the name of the Makefile with the DIST target in it for
+     THIS.
+
+ -- Method: ede-proj-configure-file :AFTER this
+     The configure.in script used by project THIS.
+
+ -- Method: ede-commit-project :AFTER proj
+     Commit any change to PROJ to its file.
+
+ -- Method: project-dist-files :AFTER this
+     Return a list of files that constitutes a distribution of THIS
+     project.
+
+ -- Method: ede-commit-local-variables :AFTER proj
+     Commit change to local variables in PROJ.
+
+
+File: ede.info,  Node: project-am-makefile,  Next: ede-step-project,  Prev: ede-proj-project,  Up: Project
+
+9.10 project-am-makefile
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `project-am-makefile'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type project-am-makefile
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+          Default Value: `nil'
+
+          Top level targets in this makefile.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+
+
+9.10.1 Specialized Methods
+--------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan the makefile for all targets and sub targets.
+
+ -- Method: project-am-subtree :AFTER ampf subdir
+     Return the sub project in AMPF specified by SUBDIR.
+
+ -- Method: project-targets-for-file :AFTER proj
+     Return a list of targets the project PROJ.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: project-new-target :AFTER proj &optional name type
+     Create a new target named NAME.  Argument TYPE is the type of
+     target to insert.  This is a string matching something in
+     `project-am-type-alist' or type class symbol.  Despite the fact
+     that this is a method, it depends on the current buffer being in
+     order to provide a smart default target type.
+
+ -- Method: project-compile-project :AFTER obj &optional command
+     Compile the entire current project.  Argument COMMAND is the
+     command to use when compiling.
+
+ -- Method: ede-find-target :AFTER amf buffer
+     Fetch the target belonging to BUFFER.
+
+
+File: ede.info,  Node: ede-step-project,  Prev: project-am-makefile,  Up: Project
+
+9.11 ede-step-project
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-project-placeholder::.'
+
+                   `*Note ede-project::.'
+
+                        `ede-step-project'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-step-project
+
+Slots:
+
+    `:directory'
+          Type: `string'
+
+          Directory this project is associated with.
+
+    `:file'
+          Type: `string'
+
+          File name where this project is stored.
+
+    `:targets'
+          Type: `list'
+
+          List of top level targets in this project.
+
+    `:tool-cache'
+          Type: `list'
+
+          List of tool cache configurations in this project.  This
+          allows any tool to create, manage, and persist
+          project-specific settings.
+
+    `:init-variables'
+          Type: `list'
+          Default Value: `nil'
+
+          Variables to set in this Makefile, at top of file.
+
+    `:additional-variables'
+          Type: `(or null list)'
+          Default Value: `nil'
+
+          Arbitrary variables needed from this project.  It is safe to
+          leave this blank.
+
+    `:additional-rules'
+          Type: `(or null list)'
+          Default Value: `nil'
+
+          Arbitrary rules and dependencies needed to make this target.
+          It is safe to leave this blank.
+
+    `:installation-domain'
+          Type: `symbol'
+          Default Value: `user'
+
+          Installation domain specification.  The variable
+          GNUSTEP_INSTALLATION_DOMAIN is set at this value.
+
+    `:preamble'
+          Type: `(or null list)'
+          Default Value: `(quote ("GNUmakefile.preamble"))'
+
+          The auxilliary makefile for additional variables.  Included
+          just before the specific target files.
+
+    `:postamble'
+          Type: `(or null list)'
+          Default Value: `(quote ("GNUmakefile.postamble"))'
+
+          The auxilliary makefile for additional rules.  Included just
+          after the specific target files.
+
+    `:metasubproject'
+          Type: `boolean'
+          Default Value: `nil'
+
+          Non-`nil' if this is a metasubproject.  Usually, a subproject
+          is determined by a parent project.  If multiple top level
+          projects are grouped into a large project not maintained by
+          EDE, then you need to set this to non-nil.  The only effect
+          is that the `dist' rule will then avoid making a tar file.
+
+
+
+9.11.1 Specialized Methods
+--------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan the EDE proj project THIS.
+
+ -- Method: ede-proj-makefile-create :AFTER this mfilename
+     Create a GNUmakefile for all Makefile targets in THIS.  MFILENAME
+     is the makefile to generate.
+
+ -- Method: project-update-version :AFTER this
+     The `:version' of project THIS has changed.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: project-make-dist :AFTER this
+     Build a distribution for the project based on THIS target.
+
+ -- Method: project-new-target-custom :AFTER this
+     Create a new target in THIS for custom.
+
+ -- Method: ede-proj-makefile-create-maybe :AFTER this mfilename
+     Create a Makefile for all Makefile targets in THIS if needed.
+     MFILENAME is the makefile to generate.
+
+ -- Method: ede-proj-setup-buildenvironment :AFTER this &optional force
+     Setup the build environment for project THIS.  Handles the
+     Makefile, or a Makefile.am configure.in combination.  Optional
+     argument FORCE will force items to be regenerated.
+
+ -- Method: project-new-target :AFTER this &optional name type autoadd
+     Create a new target in THIS based on the current buffer.
+
+ -- Method: project-compile-project :AFTER proj &optional command
+     Compile the entire current project PROJ.  Argument COMMAND is the
+     command to use when compiling.
+
+ -- Method: eieio-done-customizing :AFTER proj
+     Call this when a user finishes customizing this object.  Argument
+     PROJ is the project to save.
+
+ -- Method: ede-proj-dist-makefile :AFTER this
+     Return the name of the Makefile with the DIST target in it for
+     THIS.
+
+ -- Method: ede-commit-project :AFTER proj
+     Commit any change to PROJ to its file.
+
+ -- Method: project-dist-files :AFTER this
+     Return a list of files that constitutes a distribution of THIS
+     project.
+
+ -- Method: ede-commit-local-variables :AFTER proj
+     Commit change to local variables in PROJ.
+
+
+File: ede.info,  Node: Targets,  Next: Sourcecode,  Prev: Project,  Up: Top
+
+10 Targets
+**********
+
+* Menu:
+
+* ede-target ::
+*  ede-cpp-root-target ::
+*  ede-emacs-target-c ::
+*  ede-emacs-target-el ::
+*  ede-emacs-target-misc ::
+*  ede-linux-target-c ::
+*  ede-linux-target-misc ::
+*  ede-maven-target-java ::
+*  ede-maven-target-c ::
+*  ede-maven-target-misc ::
+*  ede-simple-target ::
+*  ede-proj-target ::
+*   ede-proj-target-makefile ::
+*    semantic-ede-proj-target-grammar ::
+*    ede-proj-target-makefile-objectcode ::
+*     ede-proj-target-makefile-archive ::
+*     ede-proj-target-makefile-program ::
+*      ede-proj-target-makefile-shared-object ::
+*    ede-proj-target-elisp ::
+*     ede-proj-target-elisp-autoloads ::
+*    ede-proj-target-makefile-miscelaneous ::
+*    ede-proj-target-makefile-info ::
+*   ede-proj-target-aux ::
+*   ede-proj-target-scheme ::
+*  project-am-target ::
+*   project-am-objectcode ::
+*    project-am-program ::
+*    project-am-lib ::
+*   project-am-header ::
+*    project-am-header-noinst ::
+*    project-am-header-inst ::
+*   project-am-lisp ::
+*   project-am-texinfo ::
+*   project-am-man ::
+
+
+File: ede.info,  Node: ede-target,  Next: ede-cpp-root-target,  Up: Targets
+
+10.1 ede-target
+===============
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `ede-target'
+
+                   Children:
+                         *Note ede-cpp-root-target::,
+                         *Note ede-emacs-target-c::,
+                         *Note ede-emacs-target-el::,
+                         *Note ede-emacs-target-misc::,
+                         *Note ede-linux-target-c::,
+                         *Note ede-linux-target-misc::,
+                         *Note ede-maven-target-java::,
+                         *Note ede-maven-target-c::,
+                         *Note ede-maven-target-misc::,
+                         *Note ede-simple-target::,
+                         *Note ede-proj-target::,
+                         *Note project-am-target::.
+
+
+
+
+Create a new object with name NAME of class type ede-target
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:source'
+          Type: `list'
+          Default Value: `nil'
+
+          Source files in this target.
+
+    `:versionsource'
+          Type: `list'
+          Default Value: `nil'
+
+          Source files with a version string in them.  These files are
+          checked for a version string whenever the EDE version of the
+          master project is changed.  When strings are found, the
+          version previously there is updated.
+
+
+
+10.1.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for project THIS.
+
+ -- Method: eieio-speedbar-description :AFTER obj
+     Provide a speedbar description for OBJ.
+
+ -- Method: project-compile-target :AFTER obj &optional command
+     Compile the current target OBJ.  Argument COMMAND is the command
+     to use for compiling the target.
+
+ -- Method: project-debug-target :AFTER obj
+     Run the current project target OBJ in a debugger.
+
+ -- Method: ede-convert-path :AFTER this path
+     Convert path in a standard way for a given project.  Default to
+     making it project relative.  Argument THIS is the project to
+     convert PATH to.
+
+ -- Method: ede-name :AFTER this
+     Return the name of THIS targt.
+
+ -- Method: ede-target-buffer-in-sourcelist :AFTER this buffer source
+     Return non-`nil' if object THIS is in BUFFER to a SOURCE list.
+     Handles complex path issues.
+
+ -- Method: eieio-speedbar-derive-line-path :AFTER obj &optional depth
+     Return the path to OBJ.  Optional DEPTH is the depth we start at.
+
+ -- Method: ede-buffer-header-file :AFTER this buffer
+     There are no default header files in EDE.  Do a quick check to see
+     if there is a Header tag in this buffer.
+
+ -- Method: project-remove-file :AFTER ot fnnd
+     Remove the current buffer from project target OT.  Argument FNND
+     is an argument.
+
+ -- Method: ede-buffer-documentation-files :AFTER this buffer
+     Check for some documentation files for THIS.  Also do a quick
+     check to see if there is a Documentation tag in this BUFFER.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return non-`nil' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: ede-map-target-buffers :AFTER this proc
+     For THIS, execute PROC on all buffers belonging to THIS.
+
+ -- Method: eieio-speedbar-child-description :AFTER obj
+     Provide a speedbar description for a plain-child of OBJ.  A plain
+     child is a child element which is not an EIEIO object.
+
+ -- Method: ede-object-keybindings :BEFORE this
+     Retrieves the slot `keybindings' from an object of class
+     `ede-target'
+
+ -- Method: ede-description :AFTER this
+     Return a description suitable for the minibuffer about THIS.
+
+ -- Method: eieio-speedbar-object-children :AFTER this
+     Return the list of speedbar display children for THIS.
+
+ -- Method: ede-system-include-path :AFTER this
+     Get the system include path used by project THIS.
+
+ -- Method: ede-object-sourcecode :BEFORE this
+     Retrieves the slot `sourcetype' from an object of class
+     `ede-target'
+
+ -- Method: ede-expand-filename :AFTER this filename &optional force
+     Return a fully qualified file name based on target THIS.  FILENAME
+     should a a filename which occurs in a directory in which THIS
+     works.  Optional argument FORCE forces the default filename to be
+     provided even if it doesn't exist.
+
+ -- Method: ede-menu-items-build :AFTER obj &optional current
+     Return a list of menu items for building target OBJ.  If optional
+     argument CURRENT is non-`nil', return sub-menu code.
+
+ -- Method: ede-want-file-p :AFTER this file
+     Return non-`nil' if THIS target wants FILE.
+
+ -- Method: ede-update-version-in-source :AFTER this version
+     In sources for THIS, change version numbers to VERSION.
+
+ -- Method: project-delete-target :AFTER ot
+     Delete the current target OT from its parent project.
+
+ -- Method: ede-target-sourcecode :AFTER this
+     Return the sourcecode objects which THIS permits.
+
+ -- Method: eieio-speedbar-child-make-tag-lines :AFTER this depth
+     Create a speedbar tag line for a child of THIS.  It has depth
+     DEPTH.
+
+ -- Method: eieio-speedbar-object-buttonname :AFTER object
+     Return a string to use as a speedbar button for OBJECT.
+
+ -- Method: eieio-done-customizing :AFTER target
+     Call this when a user finishes customizing TARGET.
+
+ -- Method: project-edit-file-target :AFTER ot
+     Edit the target OT associated w/ this file.
+
+ -- Method: ede-documentation :AFTER this
+     Return a list of files that provides documentation.  Documentation
+     is not for object THIS, but is provided by THIS for other files in
+     the project.
+
+ -- Method: ede-want-file-source-p :AFTER this file
+     Return non-`nil' if THIS target wants FILE.
+
+ -- Method: ede-want-file-auxiliary-p :AFTER this file
+     Return non-`nil' if THIS target wants FILE.
+
+ -- Method: project-add-file :AFTER ot file
+     Add the current buffer into project project target OT.  Argument
+     FILE is the file to add.
+
+ -- Method: ede-target-name :AFTER this
+     Return the name of THIS target, suitable for make or debug style
+     commands.
+
+ -- Method: ede-object-menu :BEFORE this
+     Retrieves the slot `menu' from an object of class `ede-target'
+
+
+File: ede.info,  Node: ede-cpp-root-target,  Next: ede-emacs-target-c,  Prev: ede-target,  Up: Targets
+
+10.2 ede-cpp-root-target
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-cpp-root-target'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-cpp-root-target
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.2.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for project THIS.
+
+ -- Method: ede-system-include-path :AFTER this
+     Get the system include path used by project THIS.
+
+
+File: ede.info,  Node: ede-emacs-target-c,  Next: ede-emacs-target-el,  Prev: ede-cpp-root-target,  Up: Targets
+
+10.3 ede-emacs-target-c
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-emacs-target-c'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-emacs-target-c
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.3.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for Emacs C code.  All files need the
+     macros from lisp.h!
+
+
+File: ede.info,  Node: ede-emacs-target-el,  Next: ede-emacs-target-misc,  Prev: ede-emacs-target-c,  Up: Targets
+
+10.4 ede-emacs-target-el
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-emacs-target-el'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-emacs-target-el
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-emacs-target-misc,  Next: ede-linux-target-c,  Prev: ede-emacs-target-el,  Up: Targets
+
+10.5 ede-emacs-target-misc
+==========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-emacs-target-misc'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-emacs-target-misc
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-linux-target-c,  Next: ede-linux-target-misc,  Prev: ede-emacs-target-misc,  Up: Targets
+
+10.6 ede-linux-target-c
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-linux-target-c'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-linux-target-c
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.6.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-preprocessor-map :AFTER this
+     Get the pre-processor map for Linux C code.  All files need the
+     macros from lisp.h!
+
+
+File: ede.info,  Node: ede-linux-target-misc,  Next: ede-maven-target-java,  Prev: ede-linux-target-c,  Up: Targets
+
+10.7 ede-linux-target-misc
+==========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-linux-target-misc'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-linux-target-misc
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-maven-target-java,  Next: ede-maven-target-c,  Prev: ede-linux-target-misc,  Up: Targets
+
+10.8 ede-maven-target-java
+==========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-maven-target-java'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-maven-target-java
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-maven-target-c,  Next: ede-maven-target-misc,  Prev: ede-maven-target-java,  Up: Targets
+
+10.9 ede-maven-target-c
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-maven-target-c'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-maven-target-c
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-maven-target-misc,  Next: ede-simple-target,  Prev: ede-maven-target-c,  Up: Targets
+
+10.10 ede-maven-target-misc
+===========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-maven-target-misc'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-maven-target-misc
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-simple-target,  Next: ede-proj-target,  Prev: ede-maven-target-misc,  Up: Targets
+
+10.11 ede-simple-target
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-simple-target'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-simple-target
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+
+File: ede.info,  Node: ede-proj-target,  Next: ede-proj-target-makefile,  Prev: ede-simple-target,  Up: Targets
+
+10.12 ede-proj-target
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `ede-proj-target'
+
+                        Children:
+                              *Note ede-proj-target-makefile::,
+                              *Note ede-proj-target-aux::,
+                              *Note ede-proj-target-scheme::.
+
+
+
+
+
+Create a new object with name NAME of class type ede-proj-target
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:auxsource'
+          Type: `list'
+          Default Value: `nil'
+
+          Auxilliary source files included in this target.  Each of
+          these is considered equivalent to a source file, but it is not
+          distributed, and each should have a corresponding rule to
+          build it.
+
+    `:compiler'
+          Type: `(or null symbol)'
+          Default Value: `nil'
+
+          The compiler to be used to compile this object.  This should
+          be a symbol, which contains the object defining the compiler.
+          This enables save/restore to do so by name, permitting the
+          sharing of these compiler resources, and global customization
+          thereof.
+
+    `:linker'
+          Type: `(or null symbol)'
+          Default Value: `nil'
+
+          The linker to be used to link compiled sources for this
+          object.  This should be a symbol, which contains the object
+          defining the linker.  This enables save/restore to do so by
+          name, permitting the sharing of these linker resources, and
+          global customization thereof.
+
+
+
+10.12.1 Specialized Methods
+---------------------------
+
+ -- Method: project-compile-target :AFTER obj &optional command
+     Compile the current target OBJ.  Argument COMMAND is the command
+     to use for compiling the target.
+
+ -- Method: project-rescan :AFTER this readstream
+     Rescan target THIS from the read list READSTREAM.
+
+ -- Method: project-debug-target :AFTER obj
+     Run the current project target OBJ in a debugger.
+
+ -- Method: ede-proj-configure-add-missing :AFTER this
+     Query if any files needed by THIS provided by automake are missing.
+     Results in -add-missing being passed to automake.
+
+ -- Method: ede-proj-flush-autoconf :AFTER this
+     Flush the configure file (current buffer) to accomodate THIS.  By
+     flushing, remove any cruft that may be in the file.  Subsequent
+     calls to "ede-proj-tweak-autoconf" can restore items removed by
+     flush.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed by THIS target.
+
+ -- Method: project-remove-file :AFTER target file
+     For TARGET, remove FILE.  FILE must be massaged by
+     "ede-convert-path".
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: ede-proj-configure-create-missing :AFTER this
+     Add any missing files for THIS by creating them.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this &optional
+          moresource
+     Insert variables needed by target THIS.  Optional argument
+     MORESOURCE is a list of additional sources to add to the sources
+     variable.
+
+ -- Method: ede-proj-makefile-insert-automake-post-variables :AFTER this
+     Insert variables needed by target THIS in Makefile.am after
+     SOURCES.
+
+ -- Method: ede-proj-makefile-insert-dist-dependencies :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Argument
+     THIS is the target that should insert stuff.
+
+ -- Method: ede-proj-linkers :AFTER obj
+     List of linkers being used by OBJ.  If the `linker' slot is empty,
+     concoct one on a first match found basis for any given type from
+     the `availablelinkers' slot.  Otherwise, return the `linker' slot.
+     Converts all symbols into the objects to be used.
+
+ -- Method: ede-proj-makefile-garbage-patterns :AFTER this
+     Return a list of patterns that are considered garbage to THIS.
+     These are removed with make clean.
+
+ -- Method: ede-proj-tweak-autoconf :AFTER this
+     Tweak the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-proj-compilers :AFTER obj
+     List of compilers being used by OBJ.  If the `compiler' slot is
+     empty, concoct one on a first match found basis for any given type
+     from the `availablecompilers' slot.  Otherwise, return the
+     `compiler' slot.  Converts all symbols into the objects to be used.
+
+ -- Method: project-delete-target :AFTER this
+     Delete the current target THIS from its parent project.
+
+ -- Method: ede-proj-makefile-target-name :AFTER this
+     Return the name of the main target for THIS target.
+
+ -- Method: eieio-done-customizing :AFTER target
+     Call this when a user finishes customizing this object.  Argument
+     TARGET is the project we are completing customization on.
+
+ -- Method: ede-proj-makefile-insert-user-rules :AFTER this
+     Insert user specified rules needed by THIS target.
+
+ -- Method: project-add-file :AFTER this file
+     Add to target THIS the current buffer represented as FILE.
+
+ -- Method: ede-proj-makefile-insert-automake-pre-variables :AFTER this
+     Insert variables needed by target THIS in Makefile.am before
+     SOURCES.
+
+ -- Method: ede-proj-makefile-insert-dist-filepatterns :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Argument
+     THIS is the target that should insert stuff.
+
+ -- Method: ede-proj-makefile-dependency-files :AFTER this
+     Return a list of source files to convert to dependencies.
+     Argument THIS is the target to get sources from.
+
+ -- Method: ede-proj-makefile-insert-source-variables :AFTER this
+          &optional moresource
+     Insert the source variables needed by THIS.  Optional argument
+     MORESOURCE is a list of additional sources to add to the sources
+     variable.
+
+
+File: ede.info,  Node: ede-proj-target-makefile,  Next: semantic-ede-proj-target-grammar,  Prev: ede-proj-target,  Up: Targets
+
+10.13 ede-proj-target-makefile
+==============================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `ede-proj-target-makefile'
+
+                             Children:
+                                   *Note semantic-ede-proj-target-grammar::,
+                                   *Note ede-proj-target-makefile-objectcode::,
+                                   *Note ede-proj-target-elisp::,
+                                   *Note ede-proj-target-makefile-miscelaneous::,
+                                   *Note ede-proj-target-makefile-info::.
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:makefile'
+          Type: `string'
+          Default Value: `"Makefile"'
+
+          File name of generated Makefile.
+
+    `:partofall'
+          Type: `boolean'
+          Default Value: `t'
+
+          Non `nil' means the rule created is part of the all target.
+          Setting this to `nil' creates the rule to build this item,
+          but does not include it in the ALL`all:' rule.
+
+    `:configuration-variables'
+          Type: `list'
+          Default Value: `nil'
+
+          Makefile variables appended to use in different
+          configurations.  These variables are used in the makefile
+          when a configuration becomes active.  Target variables are
+          always renamed such as foo_CFLAGS, then included into
+          commands where the variable would usually appear.
+
+    `:rules'
+          Type: `list'
+          Default Value: `nil'
+
+          Arbitrary rules and dependencies needed to make this target.
+          It is safe to leave this blank.
+
+
+
+10.13.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-makefile-dependencies :AFTER this
+     Return a string representing the dependencies for THIS.  Some
+     compilers only use the first element in the dependencies, others
+     have a list of intermediates (object files), and others don't care.
+     This allows customization of how these elements appear.
+
+ -- Method: project-compile-target :AFTER obj &optional command
+     Compile the current target program OBJ.  Optional argument COMMAND
+     is the s the alternate command to use.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed by THIS target.
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this &optional
+          moresource
+     Insert variables needed by target THIS.  Optional argument
+     MORESOURCE is a list of additional sources to add to the sources
+     variable.
+
+ -- Method: ede-proj-makefile-insert-commands :AFTER this
+     Insert the commands needed by target THIS.  For targets, insert
+     the commands needed by the chosen compiler.
+
+ -- Method: ede-proj-makefile-configuration-variables :AFTER this
+          configuration
+     Return a list of configuration variables from THIS.  Use
+     CONFIGURATION as the current configuration to query.
+
+
+File: ede.info,  Node: semantic-ede-proj-target-grammar,  Next: ede-proj-target-makefile-objectcode,  Prev: ede-proj-target-makefile,  Up: Targets
+
+10.14 semantic-ede-proj-target-grammar
+======================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `semantic-ede-proj-target-grammar'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type
+semantic-ede-proj-target-grammar
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.14.1 Specialized Methods
+---------------------------
+
+ -- Method: project-compile-target :AFTER obj
+     Compile all sources in a Lisp target OBJ.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed by THIS target.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.  Lays
+     claim to all -by.el, and -wy.el files.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-dist-dependencies :AFTER this
+     Insert dist dependencies, or intermediate targets.  This makes
+     sure that all grammar lisp files are created before the dist runs,
+     so they are always up to date.  Argument THIS is the target that
+     should insert stuff.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-objectcode,  Next: ede-proj-target-makefile-archive,  Prev: semantic-ede-proj-target-grammar,  Up: Targets
+
+10.15 ede-proj-target-makefile-objectcode
+=========================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `ede-proj-target-makefile-objectcode'
+
+                                  Children:
+                                        *Note ede-proj-target-makefile-archive::,
+                                        *Note ede-proj-target-makefile-program::.
+
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-objectcode
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:configuration-variables'
+          Type: `list'
+          Default Value: `("debug" ("CFLAGS" . "-g") ("LDFLAGS" .
+          "-g"))'
+
+          *Note ede-proj-target-makefile::.
+
+
+10.15.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-buffer-header-file :AFTER this buffer
+     There are no default header files.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this &optional
+          moresource
+     Insert variables needed by target THIS.  Optional argument
+     MORESOURCE is not used.
+
+ -- Method: ede-proj-makefile-dependency-files :AFTER this
+     Return a list of source files to convert to dependencies.
+     Argument THIS is the target to get sources from.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-archive,  Next: ede-proj-target-makefile-program,  Prev: ede-proj-target-makefile-objectcode,  Up: Targets
+
+10.16 ede-proj-target-makefile-archive
+======================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `*Note ede-proj-target-makefile-objectcode::.'
+
+                                  `ede-proj-target-makefile-archive'
+                                        No children
+
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-archive
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.16.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Create the make rule needed to create an archive for THIS.
+
+ -- Method: ede-proj-makefile-insert-source-variables :PRIMARY this
+     Insert bin_PROGRAMS variables needed by target THIS.  We aren't
+     acutally inserting SOURCE details, but this is used by the
+     Makefile.am generator, so use it to add this important bin program.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-program,  Next: ede-proj-target-makefile-shared-object,  Prev: ede-proj-target-makefile-archive,  Up: Targets
+
+10.17 ede-proj-target-makefile-program
+======================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `*Note ede-proj-target-makefile-objectcode::.'
+
+                                  `ede-proj-target-makefile-program'
+
+                                       Children:
+                                             *Note ede-proj-target-makefile-shared-object::.
+
+
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-program
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:ldlibs'
+          Type: `list'
+          Default Value: `nil'
+
+          Libraries, such as "m" or "Xt" which this program depends on.
+          The linker flag "-l" is automatically prepended.  Do not
+          include a "lib" prefix, or a ".so" suffix.
+
+          Note: Currently only used for Automake projects.
+
+    `:ldflags'
+          Type: `list'
+          Default Value: `nil'
+
+          Additional flags to add when linking this target.  Use ldlibs
+          to add addition libraries.  Use this to specify specific
+          options to the linker.
+
+          Note: Not currently used.  This bug needs to be fixed.
+
+
+
+10.17.1 Specialized Methods
+---------------------------
+
+ -- Method: project-debug-target :AFTER obj
+     Debug a program target OBJ.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed by THIS target.
+
+ -- Method: ede-proj-makefile-insert-automake-post-variables :AFTER this
+     Insert bin_PROGRAMS variables needed by target THIS.
+
+ -- Method: ede-proj-makefile-insert-automake-pre-variables :AFTER this
+     Insert bin_PROGRAMS variables needed by target THIS.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-shared-object,  Next: ede-proj-target-elisp,  Prev: ede-proj-target-makefile-program,  Up: Targets
+
+10.18 ede-proj-target-makefile-shared-object
+============================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `*Note ede-proj-target-makefile-objectcode::.'
+
+                                  `*Note ede-proj-target-makefile-program::.'
+
+                                       `ede-proj-target-makefile-shared-object'
+                                             No children
+
+
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-shared-object
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.18.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-configure-add-missing :AFTER this
+     Query if any files needed by THIS provided by automake are missing.
+     Results in -add-missing being passed to automake.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-automake-post-variables :AFTER this
+     Insert bin_PROGRAMS variables needed by target THIS.  We need to
+     override -program which has an LDADD element.
+
+ -- Method: ede-proj-makefile-target-name :AFTER this
+     Return the name of the main target for THIS target.
+
+ -- Method: ede-proj-makefile-insert-automake-pre-variables :AFTER this
+     Insert bin_PROGRAMS variables needed by target THIS.  We aren't
+     acutally inserting SOURCE details, but this is used by the
+     Makefile.am generator, so use it to add this important bin program.
+
+
+File: ede.info,  Node: ede-proj-target-elisp,  Next: ede-proj-target-elisp-autoloads,  Prev: ede-proj-target-makefile-shared-object,  Up: Targets
+
+10.19 ede-proj-target-elisp
+===========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `ede-proj-target-elisp'
+
+                                  Children:
+                                        *Note ede-proj-target-elisp-autoloads::.
+
+
+
+
+
+
+
+Create a new object with name NAME of class type ede-proj-target-elisp
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:aux-packages'
+          Type: `list'
+          Default Value: `nil'
+
+          Additional packages needed.  There should only be one
+          toplevel package per auxiliary tool needed.  These packages
+          location is found, and added to the compile time load path.
+
+
+
+10.19.1 Specialized Methods
+---------------------------
+
+ -- Method: project-compile-target :AFTER obj
+     Compile all sources in a Lisp target OBJ.  Bonus: Return a cons
+     cell: (COMPILED . UPTODATE).
+
+ -- Method: ede-proj-flush-autoconf :AFTER this
+     Flush the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.  Lays
+     claim to all .elc files that match .el files in this target.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-tweak-autoconf :AFTER this
+     Tweak the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-update-version-in-source :AFTER this version
+     In a Lisp file, updated a version string for THIS to VERSION.
+     There are standards in Elisp files specifying how the version
+     string is found, such as a `-version' variable, or the standard
+     header.
+
+
+File: ede.info,  Node: ede-proj-target-elisp-autoloads,  Next: ede-proj-target-makefile-miscelaneous,  Prev: ede-proj-target-elisp,  Up: Targets
+
+10.20 ede-proj-target-elisp-autoloads
+=====================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `*Note ede-proj-target-elisp::.'
+
+                                  `ede-proj-target-elisp-autoloads'
+                                        No children
+
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-elisp-autoloads
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:aux-packages'
+          Type: `list'
+          Default Value: `("cedet-autogen")'
+
+          *Note ede-proj-target-elisp::.
+
+    `:autoload-file'
+          Type: `string'
+          Default Value: `"loaddefs.el"'
+
+          The file that autoload definitions are placed in.  There
+          should be one load defs file for a given package.  The load
+          defs are created for all Emacs Lisp sources that exist in the
+          directory of the created target.
+
+    `:autoload-dirs'
+          Type: `list'
+          Default Value: `nil'
+
+          The directories to scan for autoload definitions.  If `nil'
+          defaults to the current directory.
+
+
+
+10.20.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-makefile-dependencies :AFTER this
+     Return a string representing the dependencies for THIS.  Always
+     return an empty string for an autoloads generator.
+
+ -- Method: project-compile-target :AFTER obj
+     Create or update the autoload target.
+
+ -- Method: ede-proj-flush-autoconf :AFTER this
+     Flush the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.  Lays
+     claim to all .elc files that match .el files in this target.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-dist-dependencies :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Emacs
+     Lisp autoload files ship the generated .el files.  Argument THIS
+     is the target which needs to insert an info file.
+
+ -- Method: ede-proj-tweak-autoconf :AFTER this
+     Tweak the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-update-version-in-source :AFTER this version
+     In a Lisp file, updated a version string for THIS to VERSION.
+     There are standards in Elisp files specifying how the version
+     string is found, such as a `-version' variable, or the standard
+     header.
+
+ -- Method: ede-proj-compilers :AFTER obj
+     List of compilers being used by OBJ.  If the `compiler' slot is
+     empty, get the car of the compilers list.
+
+ -- Method: ede-proj-makefile-insert-dist-filepatterns :AFTER this
+     Insert any symbols that the DIST rule should distribute.  Emacs
+     Lisp autoload files ship the generated .el files.  Argument THIS
+     is the target which needs to insert an info file.
+
+ -- Method: ede-proj-makefile-insert-source-variables :AFTER this
+          &optional moresource
+     Insert the source variables needed by THIS.  Optional argument
+     MORESOURCE is a list of additional sources to add to the sources
+     variable.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-miscelaneous,  Next: ede-proj-target-makefile-info,  Prev: ede-proj-target-elisp-autoloads,  Up: Targets
+
+10.21 ede-proj-target-makefile-miscelaneous
+===========================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `ede-proj-target-makefile-miscelaneous'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-miscelaneous
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:submakefile'
+          Type: `string'
+          Default Value: `""'
+
+          Miscellaneous sources which have a specialized makefile.  The
+          sub-makefile is used to build this target.
+
+
+
+10.21.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Create the make rule needed to create an archive for THIS.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-dependency-files :AFTER this
+     Return a list of files which THIS target depends on.
+
+
+File: ede.info,  Node: ede-proj-target-makefile-info,  Next: ede-proj-target-aux,  Prev: ede-proj-target-makefile-miscelaneous,  Up: Targets
+
+10.22 ede-proj-target-makefile-info
+===================================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `*Note ede-proj-target-makefile::.'
+
+                             `ede-proj-target-makefile-info'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type
+ede-proj-target-makefile-info
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:mainmenu'
+          Type: `string'
+          Default Value: `""'
+
+          The main menu resides in this file.  All other sources should
+          be included independently.
+
+
+
+10.22.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-configure-add-missing :AFTER this
+     Query if any files needed by THIS provided by automake are missing.
+     Results in -add-missing being passed to automake.
+
+ -- Method: object-write :AFTER this
+     Before committing any change to THIS, make sure the mainmenu is
+     first.
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+ -- Method: ede-proj-makefile-insert-dist-dependencies :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Texinfo
+     files want to insert generated `.info' files.  Argument THIS is
+     the target which needs to insert an info file.
+
+ -- Method: ede-proj-makefile-target-name :AFTER this
+     Return the name of the main target for THIS target.
+
+ -- Method: ede-documentation :AFTER this
+     Return a list of files that provides documentation.  Documentation
+     is not for object THIS, but is provided by THIS for other files in
+     the project.
+
+ -- Method: ede-proj-makefile-insert-dist-filepatterns :AFTER this
+     Insert any symbols that the DIST rule should depend on.  Texinfo
+     files want to insert generated `.info' files.  Argument THIS is
+     the target which needs to insert an info file.
+
+ -- Method: ede-proj-makefile-insert-source-variables :AFTER this
+          &optional moresource
+     Insert the source variables needed by THIS info target.  Optional
+     argument MORESOURCE is a list of additional sources to add to the
+     sources variable.  Does the usual for Makefile mode, but splits
+     source into two variables when working in Automake mode.
+
+
+File: ede.info,  Node: ede-proj-target-aux,  Next: ede-proj-target-scheme,  Prev: ede-proj-target-makefile-info,  Up: Targets
+
+10.23 ede-proj-target-aux
+=========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `ede-proj-target-aux'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-proj-target-aux
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.23.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-makefile-sourcevar :AFTER this
+     Return the variable name for THIS's sources.
+
+
+File: ede.info,  Node: ede-proj-target-scheme,  Next: project-am-target,  Prev: ede-proj-target-aux,  Up: Targets
+
+10.24 ede-proj-target-scheme
+============================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note ede-proj-target::.'
+
+                        `ede-proj-target-scheme'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type ede-proj-target-scheme
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:interpreter'
+          Type: `string'
+          Default Value: `"guile"'
+
+          The preferred interpreter for this code.
+
+
+
+10.24.1 Specialized Methods
+---------------------------
+
+ -- Method: ede-proj-tweak-autoconf :AFTER this
+     Tweak the configure file (current buffer) to accomodate THIS.
+
+
+File: ede.info,  Node: project-am-target,  Next: project-am-objectcode,  Prev: ede-proj-target-scheme,  Up: Targets
+
+10.25 project-am-target
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `project-am-target'
+
+                        Children:
+                              *Note project-am-objectcode::,
+                              *Note project-am-header::,
+                              *Note project-am-lisp::,
+                              *Note project-am-texinfo::,
+                              *Note project-am-man::.
+
+
+
+
+
+Create a new object with name NAME of class type project-am-target
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.25.1 Specialized Methods
+---------------------------
+
+ -- Method: project-compile-target :AFTER obj &optional command
+     Compile the current target.  Argument COMMAND is the command to
+     use for compiling the target.
+
+ -- Method: project-compile-target-command :AFTER this
+     Default target to use when compiling a given target.
+
+ -- Method: project-remove-file :AFTER ot fnnd
+     Remove the current buffer from any project targets.
+
+ -- Method: project-make-dist :AFTER this
+     Run the current project in the debugger.
+
+ -- Method: project-compile-project :AFTER obj &optional command
+     Compile the entire current project.  Argument COMMAND is the
+     command to use when compiling.
+
+ -- Method: project-edit-file-target :AFTER obj
+     Edit the target associated w/ this file.
+
+ -- Method: project-add-file :AFTER ot
+     Add the current buffer into a project.  OT is the object target.
+     DIR is the directory to start in.
+
+
+File: ede.info,  Node: project-am-objectcode,  Next: project-am-program,  Prev: project-am-target,  Up: Targets
+
+10.26 project-am-objectcode
+===========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `project-am-objectcode'
+
+                             Children:
+                                   *Note project-am-program::,
+                                   *Note project-am-lib::.
+
+
+
+
+
+
+Create a new object with name NAME of class type project-am-objectcode
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.26.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object type.
+
+ -- Method: project-debug-target :AFTER obj
+     Run the current project target in a debugger.
+
+ -- Method: project-compile-target-command :AFTER this
+     Default target to use when compiling an object code target.
+
+ -- Method: ede-buffer-header-file :AFTER this buffer
+     There are no default header files.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+
+File: ede.info,  Node: project-am-program,  Next: project-am-lib,  Prev: project-am-objectcode,  Up: Targets
+
+10.27 project-am-program
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `*Note project-am-objectcode::.'
+
+                             `project-am-program'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type project-am-program
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:ldadd
+          '
+          Default Value: `nil'
+
+          Additional LD args.
+
+
+
+10.27.1 Specialized Methods
+---------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan object THIS.
+
+
+File: ede.info,  Node: project-am-lib,  Next: project-am-header,  Prev: project-am-program,  Up: Targets
+
+10.28 project-am-lib
+====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `*Note project-am-objectcode::.'
+
+                             `project-am-lib'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type project-am-lib
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.28.1 Specialized Methods
+---------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan object THIS.
+
+
+File: ede.info,  Node: project-am-header,  Next: project-am-header-noinst,  Prev: project-am-lib,  Up: Targets
+
+10.29 project-am-header
+=======================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `project-am-header'
+
+                             Children:
+                                   *Note project-am-header-noinst::,
+                                   *Note project-am-header-inst::.
+
+
+
+
+
+
+Create a new object with name NAME of class type project-am-header
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.29.1 Specialized Methods
+---------------------------
+
+ -- Method: project-rescan :AFTER this
+     Rescan the Header sources.
+
+
+File: ede.info,  Node: project-am-header-noinst,  Next: project-am-header-inst,  Prev: project-am-header,  Up: Targets
+
+10.30 project-am-header-noinst
+==============================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `*Note project-am-header::.'
+
+                             `project-am-header-noinst'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type
+project-am-header-noinst
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.30.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object.
+
+
+File: ede.info,  Node: project-am-header-inst,  Next: project-am-lisp,  Prev: project-am-header-noinst,  Up: Targets
+
+10.31 project-am-header-inst
+============================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `*Note project-am-header::.'
+
+                             `project-am-header-inst'
+                                   No children
+
+
+
+
+
+
+Create a new object with name NAME of class type project-am-header-inst
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.31.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object.
+
+
+File: ede.info,  Node: project-am-lisp,  Next: project-am-texinfo,  Prev: project-am-header-inst,  Up: Targets
+
+10.32 project-am-lisp
+=====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `project-am-lisp'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type project-am-lisp
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.32.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object.
+
+ -- Method: project-rescan :AFTER this
+     Rescan the lisp sources.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+
+File: ede.info,  Node: project-am-texinfo,  Next: project-am-man,  Prev: project-am-lisp,  Up: Targets
+
+10.33 project-am-texinfo
+========================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `project-am-texinfo'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type project-am-texinfo
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+    `:include
+          '
+          Default Value: `nil'
+
+          Additional texinfo included in this one.
+
+
+
+10.33.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object type.
+
+ -- Method: project-rescan :AFTER this
+     Rescan object THIS.
+
+ -- Method: project-compile-target-command :AFTER this
+     Default target t- use when compling a texinfo file.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+ -- Method: ede-documentation :AFTER this
+     Return a list of files that provides documentation.  Documentation
+     is not for object THIS, but is provided by THIS for other files in
+     the project.
+
+
+File: ede.info,  Node: project-am-man,  Prev: project-am-texinfo,  Up: Targets
+
+10.34 project-am-man
+====================
+
+Inheritance Tree:
+
+    `eieio-speedbar'
+
+         `eieio-speedbar-directory-button'
+
+              `*Note ede-target::.'
+
+                   `*Note project-am-target::.'
+
+                        `project-am-man'
+                              No children
+
+
+
+
+
+Create a new object with name NAME of class type project-am-man
+
+Slots:
+
+    `:name'
+          Type: `string'
+
+          Name of this target.
+
+    `:path'
+          Type: `string'
+
+          The path to the sources of this target.  Relative to the path
+          of the project it belongs to.
+
+
+
+10.34.1 Specialized Methods
+---------------------------
+
+ -- Method: project-am-macro :AFTER this
+     Return the default macro to 'edit' for this object type.
+
+ -- Method: project-rescan :AFTER this
+     Rescan object THIS.
+
+ -- Method: ede-buffer-mine :AFTER this buffer
+     Return `t' if object THIS lays claim to the file in BUFFER.
+
+
+File: ede.info,  Node: Sourcecode,  Next: Compilers,  Prev: Targets,  Up: Top
+
+11 Sourcecode
+*************
+
+The source code type is an object designed to associated files with
+targets.
+
+* Menu:
+
+* ede-sourcecode ::
+
+
+File: ede.info,  Node: ede-sourcecode,  Up: Sourcecode
+
+11.1 ede-sourcecode
+===================
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `ede-sourcecode'
+               No children
+
+
+Create a new object with name NAME of class type ede-sourcecode
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          The name of this type of source code.  Such as "C" or "Emacs
+          Lisp"
+
+    `:sourcepattern'
+          Type: `string'
+          Default Value: `".*"'
+
+          Emacs regex matching sourcecode this target accepts.
+
+    `:auxsourcepattern'
+          Type: `(or null string)'
+          Default Value: `nil'
+
+          Emacs regex matching auxiliary source code this target
+          accepts.  Aux source are source code files needed for
+          compilation, which are not comiled themselves.
+
+    `:enable-subdirectories'
+          Type: `boolean'
+          Default Value: `nil'
+
+          Non `nil' if this sourcecode type uses subdirectores.  If
+          sourcecode always lives near the target creating it, this
+          should be nil.  If sourcecode can, or typically lives in a
+          subdirectory of the owning target, set this to t.
+
+    `:garbagepattern'
+          Type: `list'
+          Default Value: `nil'
+
+          Shell file regex matching files considered as garbage.  This
+          is a list of items added to an `rm' command when executing a
+          `clean' type directive.
+
+
+
+11.1.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-want-any-files-p :AFTER this filenames
+     Return non-`nil' if THIS will accept any files in FILENAMES.
+
+ -- Method: ede-want-any-source-files-p :AFTER this filenames
+     Return non-`nil' if THIS will accept any source files in FILENAMES.
+
+ -- Method: ede-want-any-auxiliary-files-p :AFTER this filenames
+     Return non-`nil' if THIS will accept any aux files in FILENAMES.
+
+ -- Method: ede-buffer-header-file :AFTER this filename
+     Return a list of file names of header files for THIS with FILENAME.
+     Used to guess header files, but uses the auxsource regular
+     expression.
+
+ -- Method: ede-want-file-p :AFTER this filename
+     Return non-`nil' if sourcecode definition THIS will take FILENAME.
+
+ -- Method: ede-want-file-source-p :AFTER this filename
+     Return non-`nil' if THIS will take FILENAME as an auxiliary .
+
+ -- Method: ede-want-file-auxiliary-p :AFTER this filename
+     Return non-`nil' if THIS will take FILENAME as an auxiliary .
+
+
+File: ede.info,  Node: Compilers,  Prev: Sourcecode,  Up: Top
+
+12 Compilers
+************
+
+The compiler object is designed to associate source code with
+compilers.  The target then references the compilers it can use.  When
+the makefile is created, this object type knows how to create compile
+commands.
+
+* Menu:
+
+* ede-compilation-program ::
+*  ede-compiler ::
+*   ede-object-compiler ::
+*   semantic-ede-grammar-compiler-class ::
+*  ede-linker ::
+
+
+File: ede.info,  Node: ede-compilation-program,  Next: ede-compiler,  Up: Compilers
+
+12.1 ede-compilation-program
+============================
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `ede-compilation-program'
+
+              Children:
+                    *Note ede-compiler::, *Note ede-linker::.
+
+
+
+Create a new object with name NAME of class type ede-compilation-program
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          Name of this type of compiler.
+
+    `:variables'
+          Type: `list'
+
+          Variables needed in the Makefile for this compiler.  An assoc
+          list where each element is (VARNAME . VALUE) where VARNAME is
+          a string, and VALUE is either a string, or a list of strings.
+          For example, GCC would define CC=gcc, and emacs would define
+          EMACS=emacs.
+
+    `:sourcetype'
+          Type: `list'
+
+          A list of `ede-sourcecode' *Note ede-sourcecode::. objects
+          this class will handle.  This is used to match target objects
+          with the compilers and linkers they can use, and which files
+          this object is interested in.
+
+    `:rules'
+          Type: `list'
+          Default Value: `nil'
+
+          Auxiliary rules needed for this compiler to run.  For
+          example, yacc/lex files need additional chain rules, or
+          inferences.
+
+    `:commands'
+          Type: `list'
+
+          The commands used to execute this compiler.  The object which
+          uses this compiler will place these commands after its rule
+          definition.
+
+    `:autoconf'
+          Type: `list'
+          Default Value: `nil'
+
+          Autoconf function to call if this type of compiler is used.
+          When a project is in Automake mode, this defines the autoconf
+          function to call to initialize automake to use this compiler.
+          For example, there may be multiple C compilers, but they all
+          probably use the same autoconf form.
+
+    `:objectextention'
+          Type: `string'
+
+          A string which is the extention used for object files.  For
+          example, C code uses .o on unix, and Emacs Lisp uses .elc.
+
+
+
+12.1.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-proj-flush-autoconf :AFTER this
+     Flush the configure file (current buffer) to accomodate THIS.
+
+ -- Method: ede-proj-makefile-insert-rules :AFTER this
+     Insert rules needed for THIS compiler object.
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this
+     Insert variables needed by the compiler THIS.
+
+ -- Method: ede-proj-makefile-insert-commands :AFTER this
+     Insert the commands needed to use compiler THIS.  The object
+     creating makefile rules must call this method for the compiler it
+     decides to use after inserting in the rule.
+
+ -- Method: ede-object-sourcecode :AFTER this
+     Retrieves the slot `sourcetype' from an object of class
+     `ede-compilation-program'
+
+ -- Method: ede-proj-tweak-autoconf :AFTER this
+     Tweak the configure file (current buffer) to accomodate THIS.
+
+
+File: ede.info,  Node: ede-compiler,  Next: ede-object-compiler,  Prev: ede-compilation-program,  Up: Compilers
+
+12.2 ede-compiler
+=================
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `*Note ede-compilation-program::.'
+
+              `ede-compiler'
+
+                   Children:
+                         *Note ede-object-compiler::,
+                         *Note semantic-ede-grammar-compiler-class::.
+
+
+
+
+Create a new object with name NAME of class type ede-compiler
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          Name of this type of compiler.
+
+    `:variables'
+          Type: `list'
+
+          Variables needed in the Makefile for this compiler.  An assoc
+          list where each element is (VARNAME . VALUE) where VARNAME is
+          a string, and VALUE is either a string, or a list of strings.
+          For example, GCC would define CC=gcc, and emacs would define
+          EMACS=emacs.
+
+    `:sourcetype'
+          Type: `list'
+
+          A list of `ede-sourcecode' *Note ede-sourcecode::. objects
+          this class will handle.  This is used to match target objects
+          with the compilers and linkers they can use, and which files
+          this object is interested in.
+
+    `:commands'
+          Type: `list'
+
+          The commands used to execute this compiler.  The object which
+          uses this compiler will place these commands after its rule
+          definition.
+
+    `:objectextention'
+          Type: `string'
+
+          A string which is the extention used for object files.  For
+          example, C code uses .o on unix, and Emacs Lisp uses .elc.
+
+    `:makedepends'
+          Type: `boolean'
+          Default Value: `nil'
+
+          Non-`nil' if this compiler can make dependencies.
+
+    `:uselinker'
+          Type: `boolean'
+          Default Value: `nil'
+
+          Non-`nil' if this compiler creates code that can be linked.
+          This requires that the containing target also define a list
+          of available linkers that can be used.
+
+
+
+12.2.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-proj-makefile-insert-object-variables :AFTER this
+          targetname sourcefiles
+     Insert an OBJ variable to specify object code to be generated for
+     THIS.  The name of the target is TARGETNAME as a string.
+     SOURCEFILES is the list of files to be objectified.  Not all
+     compilers do this.
+
+ -- Method: ede-compiler-intermediate-objects-p :AFTER this
+     Return non-`nil' if THIS has intermediate object files.  If this
+     compiler creates code that can be linked together, then the object
+     files created by the compiler are considered intermediate.
+
+ -- Method: ede-compiler-intermediate-object-variable :AFTER this
+          targetname
+     Return a string based on THIS representing a make object variable.
+     TARGETNAME is the name of the target that these objects belong to.
+
+
+File: ede.info,  Node: ede-object-compiler,  Next: semantic-ede-grammar-compiler-class,  Prev: ede-compiler,  Up: Compilers
+
+12.3 ede-object-compiler
+========================
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `*Note ede-compilation-program::.'
+
+              `*Note ede-compiler::.'
+
+                   `ede-object-compiler'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type ede-object-compiler
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          Name of this type of compiler.
+
+    `:variables'
+          Type: `list'
+
+          Variables needed in the Makefile for this compiler.  An assoc
+          list where each element is (VARNAME . VALUE) where VARNAME is
+          a string, and VALUE is either a string, or a list of strings.
+          For example, GCC would define CC=gcc, and emacs would define
+          EMACS=emacs.
+
+    `:sourcetype'
+          Type: `list'
+
+          A list of `ede-sourcecode' *Note ede-sourcecode::. objects
+          this class will handle.  This is used to match target objects
+          with the compilers and linkers they can use, and which files
+          this object is interested in.
+
+    `:commands'
+          Type: `list'
+
+          The commands used to execute this compiler.  The object which
+          uses this compiler will place these commands after its rule
+          definition.
+
+    `:objectextention'
+          Type: `string'
+
+          A string which is the extention used for object files.  For
+          example, C code uses .o on unix, and Emacs Lisp uses .elc.
+
+    `:uselinker'
+          Type: `boolean'
+          Default Value: `t'
+
+          *Note ede-compiler::.
+
+    `:dependencyvar'
+          Type: `list'
+
+          A variable dedicated to dependency generation.
+
+
+
+12.3.1 Specialized Methods
+--------------------------
+
+ -- Method: ede-proj-makefile-insert-variables :AFTER this
+     Insert variables needed by the compiler THIS.
+
+
+File: ede.info,  Node: semantic-ede-grammar-compiler-class,  Next: ede-linker,  Prev: ede-object-compiler,  Up: Compilers
+
+12.4 semantic-ede-grammar-compiler-class
+========================================
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `*Note ede-compilation-program::.'
+
+              `*Note ede-compiler::.'
+
+                   `semantic-ede-grammar-compiler-class'
+                         No children
+
+
+
+
+Create a new object with name NAME of class type
+semantic-ede-grammar-compiler-class
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          Name of this type of compiler.
+
+    `:variables'
+          Type: `list'
+
+          Variables needed in the Makefile for this compiler.  An assoc
+          list where each element is (VARNAME . VALUE) where VARNAME is
+          a string, and VALUE is either a string, or a list of strings.
+          For example, GCC would define CC=gcc, and emacs would define
+          EMACS=emacs.
+
+    `:sourcetype'
+          Type: `list'
+
+          A list of `ede-sourcecode' *Note ede-sourcecode::. objects
+          this class will handle.  This is used to match target objects
+          with the compilers and linkers they can use, and which files
+          this object is interested in.
+
+    `:commands'
+          Type: `list'
+
+          The commands used to execute this compiler.  The object which
+          uses this compiler will place these commands after its rule
+          definition.
+
+    `:objectextention'
+          Type: `string'
+
+          A string which is the extention used for object files.  For
+          example, C code uses .o on unix, and Emacs Lisp uses .elc.
+
+
+
+
+File: ede.info,  Node: ede-linker,  Prev: semantic-ede-grammar-compiler-class,  Up: Compilers
+
+12.5 ede-linker
+===============
+
+Inheritance Tree:
+
+    `eieio-instance-inheritor'
+
+         `*Note ede-compilation-program::.'
+
+              `ede-linker'
+                    No children
+
+
+
+Create a new object with name NAME of class type ede-linker
+
+Slots:
+
+    `:parent-instance'
+          Type: `eieio-instance-inheritor-child'
+
+          The parent of this instance.  If a slot of this class is
+          reference, and is unbound, then  the parent is checked for a
+          value.
+
+    `:name'
+          Type: `string'
+
+          Name of this type of compiler.
+
+    `:variables'
+          Type: `list'
+
+          Variables needed in the Makefile for this compiler.  An assoc
+          list where each element is (VARNAME . VALUE) where VARNAME is
+          a string, and VALUE is either a string, or a list of strings.
+          For example, GCC would define CC=gcc, and emacs would define
+          EMACS=emacs.
+
+    `:sourcetype'
+          Type: `list'
+
+          A list of `ede-sourcecode' *Note ede-sourcecode::. objects
+          this class will handle.  This is used to match target objects
+          with the compilers and linkers they can use, and which files
+          this object is interested in.
+
+    `:commands'
+          Type: `list'
+
+          The commands used to execute this compiler.  The object which
+          uses this compiler will place these commands after its rule
+          definition.
+
+    `:objectextention'
+          Type: `string'
+
+          A string which is the extention used for object files.  For
+          example, C code uses .o on unix, and Emacs Lisp uses .elc.
+
+
+
+
+
+Tag Table:
+Node: Top157
+Node: EDE Project Concepts1383
+Node: EDE Mode2997
+Node: Creating a project3803
+Node: Modifying your project6125
+Node: Add/Remove target6607
+Node: Add/Remove files7375
+Node: Customize Features8450
+Node: EDE Project Features9386
+Node: Changing Compilers and Flags10112
+Node: Configurations11069
+Node: Building and Debugging11953
+Node: Miscellaneous commands12698
+Ref: ede-locate-setup-options13604
+Node: Project types14358
+Node: Make and Automake projects15435
+Node: Automake direct projects16078
+Node: Simple projects16662
+Node: ede-cpp-root17718
+Node: ede-simple subclassing22469
+Node: ede-emacs22722
+Node: ede-linux23104
+Node: Custom Locate23486
+Node: Extending EDE24965
+Node: Development Overview26829
+Node: Detecting a Project30893
+Node: User interface methods33655
+Node: Base project methods34883
+Node: EDE proj-project36248
+Node: Sourcecode objects36940
+Node: Compiler and Linker objects38639
+Node: Project41135
+Node: ede-project-placeholder41530
+Node: ede-project43585
+Node: ede-cpp-root-project53083
+Node: ede-emacs-project58040
+Node: ede-linux-project59808
+Node: ede-maven-project61573
+Node: ede-simple-project63169
+Node: ede-simple-base-project64423
+Node: ede-proj-project64962
+Node: project-am-makefile71871
+Node: ede-step-project74004
+Node: Targets78640
+Node: ede-target79778
+Node: ede-cpp-root-target86235
+Node: ede-emacs-target-c87151
+Node: ede-emacs-target-el88013
+Node: ede-emacs-target-misc88686
+Node: ede-linux-target-c89367
+Node: ede-linux-target-misc90233
+Node: ede-maven-target-java90916
+Node: ede-maven-target-c91599
+Node: ede-maven-target-misc92270
+Node: ede-simple-target92951
+Node: ede-proj-target93613
+Node: ede-proj-target-makefile99889
+Node: semantic-ede-proj-target-grammar103305
+Node: ede-proj-target-makefile-objectcode105013
+Node: ede-proj-target-makefile-archive106885
+Node: ede-proj-target-makefile-program108323
+Node: ede-proj-target-makefile-shared-object110530
+Node: ede-proj-target-elisp112552
+Node: ede-proj-target-elisp-autoloads114762
+Node: ede-proj-target-makefile-miscelaneous118443
+Node: ede-proj-target-makefile-info119958
+Node: ede-proj-target-aux122681
+Node: ede-proj-target-scheme123586
+Node: project-am-target124636
+Node: project-am-objectcode126535
+Node: project-am-program127983
+Node: project-am-lib128987
+Node: project-am-header129884
+Node: project-am-header-noinst130872
+Node: project-am-header-inst131853
+Node: project-am-lisp132824
+Node: project-am-texinfo133879
+Node: project-am-man135366
+Node: Sourcecode136385
+Node: ede-sourcecode136603
+Node: Compilers139299
+Node: ede-compilation-program139750
+Node: ede-compiler143020
+Node: ede-object-compiler146158
+Node: semantic-ede-grammar-compiler-class148358
+Node: ede-linker150245
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/ede/ede.texi b/site/cedet-1.0pre7/ede/ede.texi
new file mode 100755
index 0000000..58aa06c
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/ede.texi
@@ -0,0 +1,1081 @@
+\input texinfo   @c -*-texinfo-*-
+@c
+@c $Id: ede.texi,v 1.26 2010/02/20 14:26:41 zappo Exp $
+@c
+@setfilename ede.info
+@settitle Emacs Development Environment
+
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* ede: (ede).       Project management for Emacs
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
+@titlepage
+@sp 10
+@center @titlefont{ede}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2004, 2005, 2008, 2009, 2010 Eric M. Ludlam
+@end titlepage
+
+@macro cedet{}
+@i{CEDET}
+@end macro
+
+@macro semantic{}
+@i{semantic}
+@end macro
+
+@macro srecode{}
+@i{SRecode}
+@end macro
+
+@macro eieio{}
+@i{EIEIO}
+@end macro
+
+@macro ede{}
+@i{EDE}
+@end macro
+
+@macro cogre{}
+@i{COGRE}
+@end macro
+
+@macro speedbar{}
+@i{Speedbar}
+@end macro
+
+@contents
+
+@node top, EDE Project Concepts, (dir), (dir)
+@comment  node-name,  next,  previous,  up
+
+@ede{} is a collection of definitions called the 
+@emph{Emacs Development Extensions}.  @ede{} provides the gloss that
+simplifies the learning curve for all the very useful functionality of
+building and debugging under emacs.  In doing so it attempts to emulate
+a typical IDE (Integrated Development Environment).  What this means is
+that @ede{} can manage or create your makefiles and other building
+environment duties so the developer can concentrate on code, and not
+support files.  In doing so, it will be much easier for new programmers
+to learn and adopt the GNU ways of doing things.
+@refill
+
+@menu
+* EDE Project Concepts::        @ede{} Project Concepts
+* EDE Mode::                    Turning on @ede{} mode.
+* Creating a project::          Creating a project.
+* Modifying your project::      Adding and removing files and targets.
+* Building and Debugging::      Initiating a build or debug session.
+* Miscellaneous commands::      Other project related commands.
+* Project types::               There are different types of projects.
+* Extending EDE::               Programming tips when extending.
+* Project::                     
+* Targets::                     
+* Sourcecode::                  
+* Compilers::                   
+@end menu
+
+@node EDE Project Concepts, EDE Mode, top, top
+@chapter @ede{} Project Concepts
+
+@ede{} is a generic interface for managing projects.  In other words,
+there is one set of menus and keybindings specified by @ede{}, but there
+are multiple ways a project can be expressed via a build system.
+
+You can learn about multiple @ref{Project types}, or the specific
+build or debug commands in other chapters.
+
+In @ede{}, a project hierarchy matches a directory hierarchy.  There
+would be a project root, and subprojects in different subdirectories.
+
+Within each project, there can be multiple targets.  A target at the
+simplest level is a named collection of files within a project.  There
+are two important reasons for specifying a target.
+
+@enumerate
+@item
+A collection of files to be added to a distribution.
+@item
+A collection of files that can be built into something else.
+@end enumerate
+
+If you intend to write code, and have it tarred up and distributed
+under the GPL, all important files must be a part of some target so
+that they will be added to the distribution file.
+
+Targets that are lists of files that can be built into something else
+will also be distributed, but the build process will also convert
+those files into some specified built thing, such as a program or
+compiled documentation.
+
+Lastly, @ede{} provides a way for other tools to easily learn file
+associations.  For example, a program might need to restrict some sort
+of search to files in a single target, or need to discover the
+location of documentation or interface files.  @ede{} can provide this
+information.
+
+@node EDE Mode, Creating a project, EDE Project Concepts, top
+@chapter @ede{} Mode
+
+@ede{} is implemented as a minor-mode, which augments other modes such as C
+mode, and Texinfo mode.  You can turn @ede{} on for all buffers by running
+the command @code{global-ede-mode}, or by putting this in your
+@file{~/.emacs} file.
+
+@example
+(global-ede-mode t)
+@end example
+
+When @ede{} is active for a given buffer, the menu item ``Project''
+appears.  This menu contains several high-level functions to make
+working on a code set easier.  These items and keybindings never change
+regardless of the type of project you are actually working on.
+
+The @file{ede.el} file is a minimal set of loading routines.  When
+different types of projects are encountered, source code for those
+projects are loaded at that time.
+
+@node Creating a project, Modifying your project, EDE Mode, top
+@chapter Creating a project
+
+@emph{Note:} It is not necessary to Create a project as described below to
+use @ede{}.  Some kinds of projects are autodetected, such as projects
+that use Automake, Emacs, or Linux.  See @xref{Simple projects}.
+
+To create a new project that will also create Makefiles for you, first
+load a file you would want in that project into a buffer.  If you have
+a hierarchy of directories, choose a file in the topmost directory
+first.  From this buffer, run @command{ede-new}.
+
+@ede{} can support several types of projects.  When creating a new
+project with the command @command{ede-new} you must choose the type of
+project you would like to create.  @xref{Project types}.
+
+Each type has its own benefits or language specific enhancements.  You
+will be prompted for the type of project you would like to create.  The
+simplest and most language agnostic project type is @emph{Make}.  A
+derivation of this is the @samp{Automake} type.
+
+Not all project types can be created in this way.  For example, there
+are two ways to handle Automake based projects.  One is by making an
+@emph{Automake} project with @command{ede-new}.  The other is to just write
+some automake files which @ede{} will automatically detect, and put
+you into a different Automake mode.  Any GNU project using Automake
+will be detected in this way, and you can use @ede{} to modify those
+Makefiles for you.
+
+If you just want to use @ede{} to know about a project so that other
+libraries, such as @semantic{}, can take advantage of some core @ede{}
+APIs, then you can use some simpler projects.  See  @xref{Simple projects}.
+
+@section Creating a subproject
+
+A subproject is merely a project in a subdirectory of another project.
+You can create a subproject by using the @command{ede-new} command (or
+@samp{"Create Project"} from the menu) while a in a subdirectory below
+an existing project.  This new project will be automatically added to
+the parent project, and will be automatically loaded when the parent
+is read.
+
+When using a project command that involves a makefile, @ede{} uses
+the top-most project's makefile as a starting place for the build.  How
+the toplevel project handles subprojects in the build process is
+dependent on that project's type.
+
+@node Modifying your project, Building and Debugging, Creating a project, top
+@chapter Modifying your project
+
+Your project and targets are systems with lots of options.  Generic
+features are listed here.  You will need to read sections on specific
+project types for detailed information on the project you might be
+using.
+
+@menu
+* Add/Remove target::           
+* Add/Remove files::            
+* Customize Features::          
+* EDE Project Features::        
+@end menu
+
+@node Add/Remove target, Add/Remove files, Modifying your project, Modifying your project
+@section Add/Remove target
+
+A project with no targets isn't very useful, so you can use @ede{} to add
+and remove targets from your project.
+
+You can create a new target with the @command{ede-new-target} command
+@kbd{C-c . t}.  If appropriate you will be given the option to add the
+current buffer into the newly created target.
+
+When creating a target, you will be given an option list of target
+types.  Each target type will have its own build process and class of
+files it will accept.
+
+You can remove a target with the command @code{ede-delete-target}.
+
+The add and remove commands are in the @samp{Project->Project Options}
+menu.
+
+@node Add/Remove files, Customize Features, Add/Remove target, Modifying your project
+@section Add/Remove files
+
+A target with no files isn't very useful, so you can use @ede{} to add
+and remove files to targets.  Sometimes files can belong to multiple
+targets, and that is OK.
+
+You can add files into targets with the command @command{ede-add-file}
+bound to @kbd{C-c . a}.   If there are no targets created that you
+wish to use, you can type in @samp{new target} to create a new target
+apropriate for the file you are adding.
+
+You can remove files from a target with the @command{ede-remove-file}
+bound to @kbd{C-c . d}.  If the file is in multiple targets, it will
+query for every target it could be removed from.
+
+When you are working in a project, if you load a new file into a
+buffer that is not a part of an active target, @ede{} will automatically
+remind you to add it to a target of your choosing.  If you do not wish
+to add it to a target, you can choose @samp{none}.  You can customize
+the behavior with the variable @command{ede-auto-add-method}.
+
+@node Customize Features, EDE Project Features, Add/Remove files, Modifying your project
+@section Customize Features
+
+A project, and its targets, are objects using the @samp{EIEIO} object
+system. @xref{(eieio)EIEIO}.  These objects have data fields containing
+important information related to your work.
+
+If the high-level functions aren't enough, you can tweak all
+user-customizable fields at any time by running the command
+@command{customize-project} or @command{customize-target}.  This will
+load the current project or target into a @emph{customization buffer}
+where you tweak individual slots.  This is usually necessary for
+project modes that are very complex.
+
+Some project modes do not have a project file, but directly read a
+Makefile, or existing file.  Instead of letting you directly edit the
+object, you can edit the file.  Use the command
+@command{ede-edit-file-target} bound to @kbd{C-c . e}.
+
+@node EDE Project Features,  , Customize Features, Modifying your project
+@section EDE Project Features
+
+This section details user facing features of an @ede{} @samp{Make} style
+project.  The specified options may be the same as in a
+@samp{Automake} project, but are not the same as in an direct Automake
+project.
+
+To modify any of the specific features mentioned here, you need to
+customize the project or target with @command{customize-project} or
+@command{customize-target}.
+
+When you are customizing, you are directly manipulating slot values in
+@eieio{} objects.  If you are interested in additional details, see
+@ref{Extending EDE}
+
+@menu
+* Changing Compilers and Flags::  
+* Configurations::              
+@end menu
+
+@node Changing Compilers and Flags, Configurations, EDE Project Features, EDE Project Features
+@subsection Changing Compilers and Flags
+
+Targets that build stuff need compilers.  To change compilers, you
+need to customize the desired target.
+
+In the @samp{[Make]} section, you can then choose a new compiler or
+linker from the list.  If a linker you need is not available, you will
+need to create a new one.  @ref{Compiler and Linker objects}.
+
+If an existing compiler or linker is close, but you need to modify
+some flag set such as adding an include path you will need to add a
+configuration variable.
+
+To start, you should create the basic setup, and construct a makefile
+with @command{ede-proj-regenerate}.  Look in the @file{Makefile} to
+see what commands are inserted.  Once you have determined the variable
+you need to modify, you can add a configuration for it.
+@ref{Configurations}.
+
+@node Configurations,  , Changing Compilers and Flags, EDE Project Features
+@subsection Configurations
+
+Configurations specify different ways to build a project.  For
+example, you may configure a project to be in ``debug'' mode, or
+perhaps in ``release'' mode.
+
+The project, and each target type all have a slot named
+@code{configuration-variables}.  To add new variables to a
+configuration find this slot in the custom buffer, and insert a new
+configuration.  Name it either ``debug'' or ``release'', then insert
+some number of name/value pairs to it.
+
+You can have any number of valid configurations too.  To add a new
+configuration, customize your project.  Work in the @samp{[Settings]}
+block for ``configurations''.  Add a new named configuration here.
+
+To switch between different active configurations, modify the
+``configuration default'' slot.
+
+@node Building and Debugging, Miscellaneous commands, Modifying your project, top
+@chapter Building and Debugging
+
+@ede{} assumes you are writing some sort of program, so it attempts to
+facilitate this activity.  @ede{} will associate the current buffer with a
+target.  The target then knows how to compile or debug the given source
+file.
+
+The following commands enable compilation and debugging.
+
+@table @kbd
+@item C-c . c
+Compile the current target.
+@item C-c . C
+Compile the entire project.
+@item c-c . D
+Debug the current target.
+@item ede-make-dist
+Build a distribution file for your project.
+@end table
+
+These commands, plus project or target specific options are available
+in the @samp{Project} menu.
+
+@node Miscellaneous commands, Project types, Building and Debugging, top
+@chapter Miscellaneous commands
+
+@section Rescan
+
+If you opt to go in and edit @ede{} project files directly, perhaps with
+the @command{ede-edit-file-target}, you will need to have Emacs rescan
+the project files to update the internal data structures.
+
+Use @command{ede-rescan-toplevel} bound to @kbd{C-c . g} to refresh
+your system.
+
+@section EDE Find File
+
+@ede{} can help you find files in your project.  Use
+@command{ede-find-file} bound to @kbd{C-c . f}.  It will prompt you
+for a name.  You can specify the name without a directory.  EDE will
+try to find a file with that name somewhere in your project.
+
+@ede{} can use external tools to help with file finding.  Configure
+the variable @code{ede-locate-setup-options} to help EDE find external
+tools.
+
+@defvar ede-locate-setup-options
+@anchor{ede-locate-setup-options}
+List of locate objects to try out by default.
+Listed in order of preference.  If the first item cannot be used in
+a particular project, then the next one is tried.
+It is always assumed that @dfn{ede-locate-base} is at end of the list.
+@end defvar
+
+@section Speedbar
+
+@ede{} also supports the speedbar package.  While speedbar works great
+against directories already, @ede{} provides a project display mode.
+This lets you look at your source files as they are structured in your
+project.  Thus, where many files may be clumped together in one
+directory, the Project view will provide a hierarchical view of your
+files as grouped by target.
+
+You can activate speedbar in this mode with the command
+@command{ede-speedbar}.  This is bound to @kbd{C-c . s}.
+
+@node Project types, Extending EDE, Miscellaneous commands, top
+@chapter Project types
+
+There are currently three types of project modes.  One is
+@samp{ede-project}, and shows up as @samp{Make} and @samp{Automake}
+when creating new projects.
+
+The other project type handles automake projects directly from the
+automake files.  @ede{} cannot make new projects of this type, assuming
+the user will do it themselves.  Use @samp{ede-project} in
+@samp{Automake} mode to have @ede{} create @file{Makefile.am} file, and a
+@file{configure.in} file.
+@refill
+
+The third project style are ``Simple'' projects.  If you already have
+project infrastructure for building and debugging, you can instead
+create a simple project that identifies a project root and can look up
+files.  The simple project styles are useful for working with tools
+that use @ede{} to look up files.
+
+@menu
+* Make and Automake projects::  Project types of @samp{ede-project}
+* Automake direct projects::    Project interface on hand-written automake files.
+* Simple projects::             Projects @ede{} doesn't manage.
+@end menu
+
+@node Make and Automake projects
+@section Make and Automake projects
+
+A project of @samp{ede-project} type creates a file called
+@file{Project.ede} in every project directory.  This is used to track
+your configuration information.  If you configure this project to be
+in @samp{Makefile} mode, then this project will autogenerate a
+@file{Makefile}.  If you configure it in @samp{Automake} mode a
+@file{Makefile.am} file will be created.  The automake bootstrapping
+routines will also import and maintain a configure.am script and a
+host of other files required by Automake.
+
+@node Automake direct projects
+@section Automake direct projects
+
+The project type that reads @file{Makefile.am} directly is derived
+from the sources of the original @file{project-am.el} mode that was
+distributed independently.  This mode eventually became @ede{}.  The
+@samp{project-am} project will read existing automake files, but will
+not generate them automatically, or create new ones.  As such, it is
+useful as a browsing tool, or as maintenance in managing file lists.
+
+@node Simple projects
+@section Simple Projects
+
+There can be a wide array of Simple projects.  The root for simple
+projects is the class @code{ede-simple-project}.  This handles the
+infrastructure of storing a .ede file if needed.
+
+The class @code{ede-simple-project} is designed to be subclassed.
+Then key @ede{} methods can be overridden to provide a quick wrapper
+over any project.
+
+A second project type is @code{ede-cpp-root}.  This project type is
+designed to be created for a directory hierarchy full of C/C++ code.
+It can be configured with minimal lisp knowledge to do header file
+lookup for @semantic{}, improving code completion performance.
+
+@menu
+* ede-cpp-root::        This project marks the root of a C/C++ code project.
+* ede-simple subclassing:: Create your own simple project.
+* ede-emacs::		A project for working with Emacs.
+* ede-linux::		A project for working with Linux kernels.
+* Custom Locate::       Customizing how to locate files in a simple project
+@end menu
+
+@node ede-cpp-root
+@subsection ede-cpp-root
+
+The @code{ede-cpp-root} project type will allow you to create a single
+object with no save-file in your @file{.emacs} file.  It will allow
+@ede{} to provide @semantic{} with the ability to find header files
+quickly.
+
+The @code{ede-cpp-root} class knows a few things about C++ projects,
+such as the prevalence of "include" directories, and typical
+file-layout stuff.  If this isn't sufficient, you can subclass
+@code{ede-cpp-root-project} and add your own tweaks in just a few
+lines.  See the end of this file for an example.
+
+In the most basic case, add this to your @file{.emacs} file, modifying
+appropriate bits as needed.
+
+@example
+(ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
+@end example
+
+Replace @var{SOMENAME} with whatever name you want, and the filename
+to an actual file at the root of your project.  It might be a
+Makefile, a README file.  Whatever.  It doesn't matter.  It's just a
+key to hang the rest of @ede{} off of.
+
+The most likely reason to create this project, is to speed up
+searching for includes files, or to simplify bootstrapping @semantic{}'s
+ability to find files without much user interaction.  In conjunction
+with @semantic{} completion, having a short include path is key.  You can
+override the default include path and system include path like this:
+
+@example
+(ede-cpp-root-project "NAME" :file "FILENAME"
+    :include-path '( "/include" "../include" "/c/include" )
+    :system-include-path '( "/usr/include/c++/3.2.2/" )
+    :spp-table '( ("MOOSE" . "")
+                  ("CONST" . "const") ) )
+@end example
+
+ In this case each item in the include path list is searched.  If the
+directory starts with "/", then that expands to the project root
+directory.  If a directory does not start with "/", then it is
+relative to the default-directory of the current buffer when the file
+name is expanded.
+
+ The include path only affects C/C++ header files.  Use the slot
+@code{:header-match-regexp} to change it.
+
+The @code{:system-include-path} allows you to specify full directory
+names to include directories where system header files can be found.
+These will be applied to files in this project only.
+
+The @code{:spp-table} provides a list of project specific #define
+style macros that are unique to this project, passed in to the
+compiler on the command line, or are in special headers.
+See the @code{semantic-lex-c-preprocessor-symbol-map} for more
+on how to format this entry.
+
+If there is a single file in your project, you can instead set the
+@code{:spp-files} to a list of file names relative to the root of your
+project.  Specifying this is like setting the variable
+@code{semantic-lex-c-preprocessor-symbol-file} in semantic.
+
+If you want to override the file-finding tool with your own
+function you can do this:
+
+@example
+(ede-cpp-root-project "NAME" :file "FILENAME" :locate-fcn 'MYFCN)
+@end example
+
+Where @var{MYFCN} is a symbol for a function.  The locate function can
+be used in place of @code{ede-expand-filename} so you can quickly
+customize your custom target to use specialized local routines instead
+of the default @ede{} routines.  The function symbol must take two
+arguments: 
+
+@table @var
+@item NAME
+The name of the file to find.
+@item DIR
+The directory root for this cpp-root project.
+@end table
+
+
+If the cpp-root project style is right for you, but you want a dynamic
+loader, instead of hard-coding path name values in your @file{.emacs}, you
+can do that too, but you will need to write some lisp code.
+
+To do that, you need to add an entry to the
+@code{ede-project-class-files} list, and also provide two functions to
+teach @ede{} how to load your project pattern
+
+It would look like this:
+
+@example
+(defun MY-FILE-FOR-DIR (&optional dir)
+  "Return a full file name to the project file stored in DIR."
+  <write your code here, or return nil>
+  )
+
+(defun MY-ROOT-FCN ()
+  "Return the root fcn for `default-directory'"
+  ;; You might be able to use `ede-cpp-root-project-root'
+  ;; and not write this at all.
+  )
+
+(defun MY-LOAD (dir)
+  "Load a project of type `cpp-root' for the directory DIR.
+Return nil if there isn't one."
+  ;; Use your preferred constructin method here.
+  (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
+                               :locate-fcn 'MYFCN)
+  )
+
+(add-to-list 'ede-project-class-files
+	     (ede-project-autoload "cpp-root"
+	      :name "CPP ROOT"
+	      :file 'ede-cpp-root
+	      :proj-file 'MY-FILE-FOR-DIR
+              :proj-root 'MY-ROOT-FCN
+	      :load-type 'MY-LOAD
+	      :class-sym 'ede-cpp-root)
+	     t)
+@end example
+
+This example only creates an auto-loader, and does not create a new kind
+of project.
+
+@node ede-simple subclassing
+@subsection ede-simple Subclassing
+
+todo - Write some doc.
+
+  In the meantime look in the commentary of ede-simple.el
+
+@node ede-emacs
+@subsection ede-emacs
+
+The @code{ede-emacs} project will automatically identify an Emacs
+source tree, and enable EDE project mode for it.
+
+It pre-populates the C Preprocessor symbol map for correct parsing,
+and has an optimized include file identification function.
+
+@node ede-linux
+@subsection ede-linux
+
+The @code{ede-linux} project will automatically identify a Linux
+Kernel source tree, and enable EDE project mode for it.
+
+It pre-populates the C Preprocessor symbol map for reasonable parsing,
+and has an optimized include file identification function.
+
+@node Custom Locate
+@subsection Custom Locate
+
+The various simple project styles all have one major drawback, which
+is that the files in the project are not completely known to EDE.
+When the EDE API is used to try and file files by some reference name
+in the project, then that could fail.
+
+@@TODO - Add ID Utils and CScope examples
+
+@ede{} can therefore use some external locate commands, such as the unix
+``locate'' command, or ``GNU Global''.
+
+Configuration of the tool you want to use such as @code{locate}, or
+@code{global} will need to be done without the aid of @ede{}.  Once
+configured, however, @ede{} can use it.
+
+To enable one of these tools, set the variable
+@code{ede-locate-setup-options} with the names of different locate
+objects.  @ref{Miscellaneous commands}.
+
+Configure this in your @file{.emacs} before loading in CEDET or EDE.
+If you want to add support for GNU Global, your configuration would
+look like this:
+
+@example
+(setq ede-locate-setup-options '(ede-locate-global ede-locate-base))
+@end example
+
+That way, when a search needs to be done, it will first try using
+GLOBAL.  If global is not available for that directory, then it will
+revert to the base locate object.  The base object always fails to
+find a file.
+
+You can add your own locate tool but subclassing from
+@code{ede-locate-base}.  The subclass should also implement two
+methods.  See the code in @file{ede-locate.el} for GNU Global as a
+simple example.
+
+@node Extending EDE, Project, Project types, top
+@chapter Extending @ede{}
+
+This chapter is intended for users who want to write new parts or fix
+bugs in @ede{}.  A knowledge of Emacs Lisp, and some @eieio{}(CLOS) is
+required.
+
+If you are in this chapter because you need to enhance or fix @ede{},
+here are some suggestions:
+
+@table @asis
+@item @ede{} doesn't recognize your project
+In this case, you will need to read @ref{Detecting a Project}.  If you
+think one of the existing project types should work, then you will
+need to understand the detection process, then investigate the project
+code to see what may be wrong.
+@item @ede{} doesn't support your project
+In this case, you will need to read all the sections, though you can
+skip those sections specific to the secions on sourcecode and
+compiler/linker objects which are specific to the project type that
+autogenerates Makefiles.
+@item @ede{} doesn't support your compiler/linker
+For the @ede{} project types that build makefiles, you will want to
+read the @ref{Compiler and Linker objects} section.
+@item @ede{} doesn't support your language
+For the @ede{} project types that build makefiles, you will need to
+read the section on the @code{ede-proj-project}, which is a project
+type that will accept new types of languages, and build Makefiles that
+support that language.
+@end table
+
+
+@menu
+* Development Overview::        Overview for developers
+* Detecting a Project::         How EDE identifies projects
+* User interface methods::      Methods associated with keybindings
+* Base project methods::        The most basic methods on @ede{} objects.
+* EDE proj-project::            Extending Makefile generating project types.
+* Sourcecode objects::          Defining new sourcecode classes.
+* Compiler and Linker objects::  Defining new compilers and linkers.
+@end menu
+
+@node Development Overview
+@section Development Overview
+
+@ede{} is made up of a series of classes implemented with @eieio{}.
+These classes define an interface that can be used to create different
+types of projects. 
+
+@ede{} defines two superclasses which are @code{ede-project} and
+@code{ede-target}.  All commands in @ede{} are usually meant to
+address the current project, or current target.
+
+All specific projects in @ede{} derive subclasses of the @ede{} superclasses.
+In this way, specific behaviors such as how a project is saved, or how a
+target is compiled can be customized by a project author in detail.  @ede{}
+communicates to these project objects via an API using methods.  The
+commands you use in @ede{} mode are high-level functional wrappers over
+these methods.  For details on different types of projects,
+@ref{Project types}.  @ref{(eieio)Top}. For details on using @eieio{} to
+extending classes, and writing methods.
+
+Some example project types are:
+
+@table @code
+@item project-am
+Autmake project which reads existing Automake files.
+@item ede-proj-project
+This project type will create @file{Makefiles},
+or @file{Makefile.am} files to compile your project.
+@item ede-linux
+This project type will detect linux source trees.
+@item ede-emacs
+This proejct will detect an Emacs source tree.
+@end table
+
+There are several other project types as well.
+
+The first class you need to know to create a new project type is
+@code{ede-project-autoload}.  New instances of this class are needed
+to define how Emacs associates different files/buffers with different
+project types.  All the autoloads are kept in the variable
+@code{ede-project-class-files}.
+
+The next most important class to know is @code{ede-project}.  This is
+the baseclass defines how all projects behave.  The basic pattern for
+a project is that there is one project per directory, and the topmost
+project or directory defines the project as a whole.
+
+Key features of @code{ede-project} are things like name and version
+number.  It also holds a list of @code{ede-target} objects and a list
+of sub projects, or more @code{ede-project} objects.
+
+New project types must subclass @code{ede-project} to add special
+behavior. New project types also need to subclass @code{ede-target} to
+add specialty behavior.
+
+In this way, the common @ede{} interface is designed to work against
+@code{ede-project}, and thus all subclasses.
+
+@code{ede-project} subclasses @code{ede-project-placeholder}.  This is
+the minimum necessary project needed to be cached between runs of
+Emacs.  This way, Emacs can track all projects ever seen, without
+loading those projects into memory.
+
+Here is a high-level UML diagram for the @ede{} system created with @cogre{}..
+
+@example
++-----------------------+	 +-----------------------+
+|                       |        |ede-project-placeholder|
+|ede-project-class-files|        +-----------------------+
+|                       |        +-----------------------+
++-----------------------+        +-----------------------+
+	   /\ 				     ^ 
+	   \/				    /_\
+	    |				     |
+ +--------------------+		       +-----------+	     +----------+
+ |ede-project-autoload|                |ede-project|         |ede-target|
+ +--------------------+<>--------------+-----------+<>-------+----------+
+ +--------------------+                +-----------+         +----------+
+ +--------------------+                +-----------+         +----------+
+					     ^ 
+					    /_\
+					     |
+		       +---------------------+-----------------+
+		       |		     |		       |
+		       |		     |		       |
+		       |		     |		       |
+	      +----------------+   +-------------------+  +---------+
+              |ede-proj-project|   |project-am-makefile|  |ede-emacs|
+              +----------------+   +-------------------+  +---------+
+              +----------------+   +-------------------+  +---------+
+              +----------------+   +-------------------+  +---------+
+@end example
+
+
+@node Detecting a Project
+@section Detecting a Project
+
+Project detection happens with the list of @code{ede-project-autoload}
+instances stored in @code{ede-project-class-files}.  The full project
+detection scheme works like this:
+
+@table @asis
+@item Step 1:
+@code{find-file-hooks} calls @code{ede-turn-on-hook} on BUFFER.
+@item Step 2:
+@code{ede-turn-on-hook} turns on @code{ede-minor-mode}
+@item Step 3:
+@code{ede-minor-mode} looks to see if BUFFER is assicated with any
+open projects.  If not, it calls @code{ede-load-project-file} to find
+a project associated with the current directory BUFFER is in.
+@item Step 4:
+@code{ede-minor-mode} associates the found project with the current
+buffer with a series of variables, such as @code{ede-object}, and
+@code{ede-object-project} and @code{ede-object-root-project}.
+@end table
+
+Once a buffer is associated, @ede{} minor mode commands will operate
+on that buffer.
+
+The function @code{ede-load-project-file} is at the heart of detecting
+projects, and it works by looping over all the known project autoload
+types in @code{ede-project-autoload} using the utility
+@code{ede-directory-project-p}.
+
+The function @code{ede-directory-project-p} will call
+@code{ede-dir-to-projectfile} on every @code{ede-project-autoload}
+until one of them returns true.  The method
+@code{ede-dir-to-projectfile} in turn gets the @code{:proj-file} slot
+from the autoload.  If it is a string (ie, a project file name), it
+checks to see if that exists in BUFFER's directory.  If it is a
+function, then it calls that function and expects it to return a file
+name or nil.  If the file exists, then this directory is assumed to be
+part of a project, and @code{ede-directory-project-p} returns the
+instance of @code{ede-project-autoload} that matched.
+
+If the current directory is a project, then @ede{} scans upwards till
+it finds the top of the project.  It does this by calling
+@code{ede-toplevel-project}.  If this hasn't already been discovered,
+the directories as scanned upward one at a time until a directory with
+no project is found.  The last found project becomes the project
+root.  If the ofund instance of @code{ede-project-autoload} has a
+valid @code{proj-root} slot value, then that function is called instead
+of scanning the project by hand.  Some project types have a short-cut
+for determining the root of a project, so this comes in handy.
+
+Getting back to @code{ede-load-project-file}, this now has an instance
+of @code{ede-project-autoload}.  It uses the @code{load-type} slot to
+both autoload in the project type, and to create a new instance of the
+project type found for the root of the project.  That project is added
+to the global list of all projects.  All subprojects are then created
+and assembled into the project data structures.
+
+
+@node User interface methods
+@section User interface methods
+
+These methods are core behaviors associated with user commands.
+If you do not implement a method, there is a reasonable default that
+may do what you need.
+
+@table @code
+@item project-add-file
+Add a file to your project.  Override this if you want to put new
+sources into different fields depending on extension, or other details.
+@item project-remove-file
+Reverse of project-add-file.
+@item project-compile-target
+Override this if you want to do something special when the user
+"compiles" this target.
+@item project-debug-target
+What to do when a user wants to debug your target.
+@item project-update-version
+Easily update the version number of your project.
+@item project-edit-file-target
+Edit the file the project's information is stored in.
+@item project-new-target
+Create a new target in a project.
+@item project-delete-target
+Delete a target from a project.
+@item project-make-dist
+Make a distribution (tar archive) of the project.
+@item project-rescan
+Rescan a project file, changing the data in the existing objects.
+@end table
+
+@node Base project methods
+@section Base project methods
+
+These methods are important for querying base information from project
+and target types:
+
+@table @code
+@item ede-name
+Return a string that is the name of this target.
+@item ede-target-name
+Return a string that is the name of the target used by a Make system.
+@item ede-description
+A brief description of the project or target.  This is currently used
+by the @samp{ede-speedbar} interface.
+@item ede-want-file-p
+Return non-nil if a target will accept a given file.
+It is generally unecessary to override this.  See the section on source
+code.
+@item ede-buffer-mine
+Return non-nil if a buffer belongs to this target.  Used during
+association when a file is loaded.  It is generally unecessary to
+override this unless you keep auxiliary files.
+@end table
+
+These methods are used by the semantic package extensions @xref{(semantic)Top}.
+
+@table @code
+@item ede-buffer-header-file
+Return a header file belonging to a given buffer.  Prototypes are place
+there when appropriate
+@item ede-buffer-documentation-files
+Return the documentation file information about this file would be
+stored in.
+@item ede-documentation
+List all documentation a project or target is responsible for.
+@end table
+
+@node EDE proj-project
+@section EDE proj-project
+
+The @ede{} proj-project is a project type that will build Makefiles.
+This project type stores data in a @file{Project.ede}, and implements
+new user commands for building a Makefile.
+
+This project type can be extended through the use of new Targets,
+@ref{Sourcecode objects}, or @ref{Compiler and Linker objects}.
+
+This project type could also be extended to support alternate forms of
+build systems, though no documentation has been setup for this.
+
+TODO - write more for this.  See cedet-devel mailing list for help here.
+
+
+@node Sourcecode objects
+@section Sourcecode objects
+
+@ede{} projects track source file / target associates via source code
+objects.  The definitions for this is in @file{ede-source.el}.  A source
+code object contains methods that know how to identify a file as being
+of that class, (ie, a C file ends with @file{.c}).  Some targets can
+handle many different types of sources which must all be compiled
+together.  For example, a mixed C and C++ program would have
+instantiations of both sourcecode types.
+
+When a target needs to know if it will accept a source file, it
+references its list of source code objects.  These objects then make
+that decision.
+
+Source code objects are stored in the target objects as a list of
+symbols, where the symbol's value is the object.  This enables the
+project save file mechanism to work.
+
+Here is an example for an instantiation of an Emacs Lisp source code object:
+
+@example
+(defvar ede-source-emacs
+  (ede-sourcecode "ede-emacs-source"
+		  :name "Emacs Lisp"
+		  :sourcepattern "\\.el$"
+		  :garbagepattern '("*.elc"))
+  "Emacs Lisp source code definition.")
+@end example
+
+If you want to recycle parts of an existing sourcecode object, you can
+clone the original, and then just tweak the parts that are different.
+For example:
+
+@example
+(defvar ede-source-emacs-autoload
+  (clone ede-source-emacs "ede-source-emacs-autoload"
+         :name "Emacs Lisp Autoload"
+         :sourcepattern "-loaddefs\\.el")
+  "Emacs Lisp autoload source code.")
+@end example
+
+In this case, the garbage pattern is the same.
+
+@xref{Sourcecode}.
+
+@node Compiler and Linker objects
+@section Compiler and Linker objects
+
+In order for a target to create a @file{Makefile}, it must know how to
+compile the sources into the program or desired data file, and
+possibly link them together.
+
+A compiler object instantiation is used to associate a given target
+with a given source code type.  Some targets can handle many types of
+sources, and thus has many compilers available to it.  Some targets
+may have multiple compilers for a given type of source code.
+
+@ede{} will examine the actual source files in a target, cross reference
+that against the compiler list to come up with the final set of
+compilers that will be inserted into the Makefile.
+
+Compiler instantiations must also insert variables specifying the
+compiler it plans to use, in addition to creating Automake settings for
+@file{configure.in} when appropriate.
+
+Compiler objects are stored in the target objects as a list of
+symbols, where the symbols value is the object.  This enables the
+project output mechanism to work more efficiently.
+
+Targets will also have a special "compiler" slot which lets a user
+explicitly choose the compiler they want to use.
+
+Here is an example for texinfo:
+
+@example
+(defvar ede-makeinfo-compiler
+  (ede-compiler
+   "ede-makeinfo-compiler"
+   :name "makeinfo"
+   :variables '(("MAKEINFO" . "makeinfo"))
+   :commands '("makeinfo -o $@ $<")
+   :autoconf '(("AC_CHECK_PROG" . "MAKEINFO, makeinfo"))
+   :sourcetype '(ede-makeinfo-source)
+   )
+  "Compile texinfo files into info files.")
+@end example
+
+@xref{Compilers}.
+
+When creating compiler instantiations, it may be useful to @code{clone}
+an existing compiler variable.  Cloning allows you to only modify
+parts of the original, while keeping the rest of the same.
+Modification of the original will result in the clone also being
+changed for shared value slots.
+
+The second important object is the linker class.  The linker is similar
+to the compiler, except several compilers might be used to create some
+object files, and only one linker is used to link those objects together.
+
+See @file{ede-proj-obj.el} for examples of the combination.
+
+@section Class hierarchies
+
+@menu
+* Project    :: The different project types.
+* Targets    :: The different target types.
+* Sourcecode :: Source Code management types.
+* Compilers  :: Compiler management types.
+@end menu
+
+@defindex pj
+@defindex tg
+@defindex sc
+@defindex cm
+
+@node Project, Targets, Extending EDE, top
+@chapter Project
+
+@include ede-projects.texi
+
+@node Targets, Sourcecode, Project, top
+@chapter Targets
+
+@include ede-targets.texi
+
+@node Sourcecode, Compilers, Targets, top
+@chapter Sourcecode
+
+The source code type is an object designed to associated files with
+targets.
+
+@include ede-sourcecode.texi
+
+@node Compilers,  , Sourcecode, top
+@chapter Compilers
+
+The compiler object is designed to associate source code with
+compilers.  The target then references the compilers it can use.
+When the makefile is created, this object type knows how to create
+compile commands.
+
+@include ede-compilers.texi
+
+@bye
diff --git a/site/cedet-1.0pre7/ede/makefile-edit.el b/site/cedet-1.0pre7/ede/makefile-edit.el
new file mode 100644
index 0000000..99a341c
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/makefile-edit.el
@@ -0,0 +1,129 @@
+;;; makefile-edit.el --- Makefile editing/scanning commands.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: makefile-edit.el,v 1.2 2009/07/22 11:30:37 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Utilities for editing a Makefile for EDE Makefile management commands.
+;;
+;; Derived from project-am.el.
+;;
+;; Makefile editing and scanning commands
+;;
+;; Formatting of a makefile
+;;
+;; 1) Creating an automakefile, stick in a top level comment about
+;;    being created by emacs
+;; 2) Leave order of variable contents alone, except for SOURCE
+;;    SOURCE always keep in the order of .c, .h, the other stuff.
+
+;;; Things to do
+;; makefile-fill-paragraph -- refill a macro w/ backslashes
+;; makefile-insert-macro -- insert "foo = "
+
+
+;;; Code:
+
+(defun makefile-beginning-of-command ()
+  "Move the the beginning of the current command."
+  (interactive)
+  (if (save-excursion
+	(forward-line -1)
+	(makefile-line-continued-p))
+      (forward-line -1))
+  (beginning-of-line)
+  (if (not (makefile-line-continued-p))
+      nil
+    (while (and (makefile-line-continued-p)
+		(not (bobp)))
+      (forward-line -1))
+    (forward-line 1)))
+
+(defun makefile-end-of-command ()
+  "Move the the beginning of the current command."
+  (interactive)
+  (end-of-line)
+  (while (and (makefile-line-continued-p)
+	      (not (eobp)))
+    (forward-line 1)
+    (end-of-line)))
+
+(defun makefile-line-continued-p ()
+  "Return non-nil if the current line ends in continuation."
+  (save-excursion
+    (end-of-line)
+    (= (preceding-char) ?\\)))
+
+;;; Programatic editing of a Makefile
+;;
+(defun makefile-move-to-macro (macro &optional next)
+  "Move to the definition of MACRO.  Return t if found.
+If NEXT is non-nil, move to the next occurance of MACRO."
+  (let ((oldpt (point)))
+    (when (not next) (goto-char (point-min)))
+    (if (re-search-forward (concat "^\\s-*" macro "\\s-*[+:?]?=") nil t)
+	t
+      (goto-char oldpt)
+      nil)))
+
+(defun makefile-navigate-macro (stop-before)
+  "In a list of files, move forward until STOP-BEFORE is reached.
+STOP-BEFORE is a regular expression matching a file name."
+  (save-excursion
+    (makefile-beginning-of-command)
+    (let ((e (save-excursion
+	       (makefile-end-of-command)
+	       (point))))
+      (if (re-search-forward stop-before nil t)
+	  (goto-char (match-beginning 0))
+	(goto-char e)))))
+
+(defun makefile-macro-file-list (macro)
+  "Return a list of all files in MACRO."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((lst nil))
+      (while (makefile-move-to-macro macro t)
+	(let ((e (save-excursion
+		   (makefile-end-of-command)
+		   (point))))
+	  (while (re-search-forward "\\s-**\\([-a-zA-Z0-9./_@$%(){}]+\\)\\s-*" e t)
+	    (let ((var nil)(varexp nil)
+		  (match (buffer-substring-no-properties
+			  (match-beginning 1)
+			  (match-end 1))))
+	      (if (not (setq var (makefile-extract-varname-from-text match)))
+		  (setq lst (cons match lst))
+		(setq varexp (makefile-macro-file-list var))
+		(dolist (V varexp)
+		  (setq lst (cons V lst))))))))
+      (nreverse lst))))
+
+(defun makefile-extract-varname-from-text (text)
+  "Extract the variable name from TEXT if it is a variable reference.
+Return nil if it isn't a variable."
+  (save-match-data
+    (when (string-match "\\$\\s(\\([A-Za-z0-9_]+\\)\\s)" text)
+      (match-string 1 text))))
+
+
+(provide 'makefile-edit)
+;;; makefile-edit.el ends here
diff --git a/site/cedet-1.0pre7/ede/project-am.el b/site/cedet-1.0pre7/ede/project-am.el
new file mode 100755
index 0000000..e9186f4
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/project-am.el
@@ -0,0 +1,981 @@
+;;; project-am.el --- A project management scheme based on automake files.
+
+;;;  Copyright (C) 1998, 1999, 2000, 2003, 2005, 2007, 2008, 2009, 2010  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 0.0.3
+;; Keywords: project, make
+;; RCS: $Id: project-am.el,v 1.54 2010/02/08 23:48:48 zappo Exp $
+
+;; This file is NOT part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+;; The GNU Automake tool is the first step towards having a really
+;; good project management system.  It provides a simple and concise
+;; look at what is actually in a project, and records it in a simple
+;; fashion.
+;;
+;; project-am uses the structure defined in all good GNU projects with
+;; the Automake file as its base template, and then maintains that
+;; information during edits, automatically updating the automake file
+;; where appropriate.
+
+
+(eval-and-compile
+  ;; Compatibility for makefile mode.
+  (condition-case nil
+      (require 'makefile "make-mode")
+    (error (require 'make-mode "make-mode")))
+
+  ;; Requiring the .el files prevents incomplete builds.
+  (require 'eieio "eieio.el")
+  (require 'ede "ede.el"))
+
+(require 'ede-make)
+(require 'makefile-edit)
+(require 'autoconf-edit)
+
+(eval-when-compile (require 'ede-speedbar "ede-speedbar.el"))
+(eval-when-compile (require 'compile)
+		   (require 'ede-shell))
+
+;;; Code:
+(defgroup project-am nil
+  "File and tag browser frame."
+  :group 'tools
+  :group 'ede
+  )
+
+(defcustom project-am-compile-project-command nil
+  "*Default command used to compile a project."
+  :group 'project-am
+  :type 'string)
+
+(defcustom project-am-compile-target-command (concat ede-make-command " -k %s")
+  "*Default command used to compile a project."
+  :group 'project-am
+  :type 'string)
+
+(defcustom project-am-debug-target-function 'gdb
+  "*Default Emacs command used to debug a target."
+  :group 'project-am
+  :type 'sexp) ; make this be a list some day
+
+(defconst project-am-type-alist
+  '(("bin" project-am-program "bin_PROGRAMS" t)
+    ("sbin" project-am-program "sbin_PROGRAMS" t)
+    ("noinstbin" project-am-program "noinst_PROGRAMS" t)
+    ("checkbin" project-am-program "check_PROGRAMS" t)
+    ("lib" project-am-lib "lib_LIBS" t)
+    ("libraries" project-am-lib "lib_LIBRARIES" t)
+    ("librariesnoinst" project-am-lib "noinst_LIBRARIES" t)
+    ("pkglibraries" project-am-lib "pkglib_LIBRARIES" t)
+    ("checklibs" project-am-lib "check_LIBRARIES" t)
+    ("ltlibraries" project-am-lib "lib_LTLIBRARIES" t)
+    ("ltlibrariesnoinst" project-am-lib "noinst_LTLIBRARIES" t)
+    ("pkgltlibraries" project-am-lib "pkglib_LTLIBRARIES" t)
+    ("checkltlibs" project-am-lib "check_LTLIBRARIES" t)
+    ("headernoinst" project-am-header-noinst "noinst_HEADERS")
+    ("headerinst" project-am-header-inst "include_HEADERS")
+    ("headerpkg" project-am-header-pkg "pkginclude_HEADERS")
+    ("headerpkg" project-am-header-chk "check_HEADERS")
+    ("texinfo" project-am-texinfo "info_TEXINFOS" t)
+    ("man" project-am-man "man_MANS")
+    ("lisp" project-am-lisp "lisp_LISP")
+    ;; for other global files track EXTRA_
+    ("extrabin" project-am-program "EXTRA_PROGRAMS" t)
+    ("builtsrcs" project-am-built-src "BUILT_SOURCES")
+    ("extradist" project-am-extra-dist "EXTRA_DIST")
+    ;; Custom libraries targets?
+    ;; ("ltlibcustom" project-am-lib ".*?_LTLIBRARIES" t)
+    )
+  "Alist of type names and the type of object to create for them.
+Each entry is of th form:
+  (EMACSNAME CLASS AUTOMAKEVAR INDIRECT)
+where EMACSNAME is a name for Emacs to use.
+CLASS is the EDE target class to represent the target.
+AUTOMAKEVAR is the Automake variable to identify.  This cannot be a
+   regular expression.
+INDIRECT is optional.  If it is non-nil, then the variable in
+question lists other variables that need to be looked up.")
+
+(defclass project-am-target (ede-target)
+  nil
+  "Base target class for everything in project-am.")
+
+(defclass project-am-objectcode (project-am-target)
+  ((source :initarg :source :documentation "List of source files."))
+  "A target which creates object code, like a C program or library.")
+
+(defclass project-am-program (project-am-objectcode)
+  ((ldadd :initarg :ldadd :documentation "Additional LD args."
+	  :initform nil))
+  "A top level program to build")
+
+(defclass project-am-header (project-am-target)
+  ()
+  "A group of misc source files, such as headers.")
+
+(defclass project-am-header-noinst (project-am-header)
+  ()
+  "A group of header files that are not installed.")
+
+(defclass project-am-header-inst (project-am-header)
+  ()
+  "A group of header files that are not installed.")
+
+(defclass project-am-header-pkg (project-am-header)
+  ()
+  "A group of header files that are not installed.")
+
+(defclass project-am-header-chk (project-am-header)
+  ()
+  "A group of header files that are not installed.")
+
+(defclass project-am-lib (project-am-objectcode)
+  nil
+  "A top level library to build")
+
+(defclass project-am-lisp (project-am-target)
+  ()
+  "A group of Emacs Lisp programs to byte compile.")
+
+(defclass project-am-texinfo (project-am-target)
+  ((include :initarg :include
+	    :initform nil
+	    :documentation "Additional texinfo included in this one."))
+  "A top level texinfo file to build.")
+
+(defclass project-am-man (project-am-target)
+  nil
+  "A top level man file to build.")
+
+;; For generic files tracker like EXTRA_DIST
+(defclass project-am-built-src (project-am-target)
+  ()
+  "A group of Emacs Lisp programs to byte compile.")
+
+(defclass project-am-extra-dist (project-am-target)
+  ()
+  "A group of Emacs Lisp programs to byte compile.")
+
+(defclass project-am-makefile (ede-project)
+  ((targets :initarg :targets
+	    :initform nil
+	    :documentation "Top level targets in this makefile.")
+   (configureoutputfiles
+    :initform nil
+    :documentation
+    "List of files output from configure system.")
+   )
+  "Encode one makefile.")
+
+;;; Code:
+(defmethod project-add-file ((ot project-am-target))
+  "Add the current buffer into a project.
+OT is the object target.  DIR is the directory to start in."
+  (let* ((target (if ede-object (error "Already associated w/ a target")
+		   (let ((amf (project-am-load default-directory)))
+		     (if (not amf) (error "No project file"))
+		     (completing-read "Target: "
+				      (object-assoc-list 'name
+							 (oref amf targets))
+				      nil t))))
+	 ;; The input target might be new.  See if we can find it.
+	 (amf (ede-load-project-file (oref ot path)))
+	 (ot (object-assoc target 'name (oref amf targets)))
+	 (ofn (file-name-nondirectory (buffer-file-name))))
+    (if (not ot)
+	(setq ot
+	      (project-new-target
+	       target (project-am-preferred-target-type (buffer-file-name)))))
+    (ede-with-projectfile ot
+      (makefile-move-to-macro (project-am-macro ot))
+      (ede-maybe-checkout)
+      (makefile-end-of-command)
+      (insert " " ofn)
+      (makefile-fill-paragraph nil)
+      (project-rescan ot)
+      (save-buffer))
+    (setq ede-object ot)))
+
+(defmethod project-remove-file ((ot project-am-target) fnnd)
+  "Remove the current buffer from any project targets."
+  (ede-with-projectfile ot
+    (makefile-move-to-macro (project-am-macro ot))
+    (if (and buffer-read-only vc-mode
+	     (y-or-n-p "Checkout Makefile.am from VC? "))
+	(vc-toggle-read-only t))
+    (ede-maybe-checkout)
+    (makefile-navigate-macro (concat " *" (regexp-quote (ede-name fnnd))))
+    (replace-match "" t t nil 0)
+    (makefile-fill-paragraph nil)
+    (project-rescan ot)
+    (save-buffer))
+  (setq ede-object nil))
+
+(defmethod project-edit-file-target ((obj project-am-target))
+  "Edit the target associated w/ this file."
+  (find-file (concat (oref obj path) "Makefile.am"))
+  (goto-char (point-min))
+  (makefile-move-to-macro (project-am-macro obj))
+  (if (= (point-min) (point))
+      (re-search-forward (ede-target-name obj))))
+
+(defmethod project-new-target ((proj project-am-makefile)
+			       &optional name type)
+  "Create a new target named NAME.
+Argument TYPE is the type of target to insert.  This is a string
+matching something in `project-am-type-alist' or type class symbol.
+Despite the fact that this is a method, it depends on the current
+buffer being in order to provide a smart default target type."
+  (let* ((name (or name (read-string "Name: " "")))
+	 (type (or type
+		   (completing-read "Type: "
+				    project-am-type-alist
+				    nil t
+				    (cond ((eq major-mode 'texinfo-mode)
+					   "texinfo")
+					  ((eq major-mode 'nroff-mode)
+					   "man")
+					  ((eq major-mode 'emacs-lisp-mode)
+					   "lisp")
+					  (t "bin")))))
+	 (ntype (assoc type project-am-type-alist))
+	 (ot nil))
+    (setq ot (apply (car (cdr ntype)) name :name name
+		    :path (expand-file-name default-directory) nil))
+    (if (not ot) (error "Error creating target object %S" ntype))
+    (ede-with-projectfile ot
+      (goto-char (point-min))
+      (ede-maybe-checkout)
+      (makefile-next-dependency)
+      (if (= (point) (point-min))
+	  (goto-char (point-max))
+	(beginning-of-line)
+	(insert "\n")
+	(forward-char -1))
+      ;; Add the new target sources macro (if needed)
+      (if (project-am-macro ot)
+	  (makefile-insert-macro (project-am-macro ot)))
+      ;; Add to the list of objects.
+      (goto-char (point-min))
+      (makefile-move-to-macro (car (cdr (cdr ntype))))
+      (if (= (point) (point-min))
+	  (progn
+	    (if (re-search-forward makefile-macroassign-regex nil t)
+		(progn (forward-line -1)
+		       (end-of-line)
+		       (insert "\n"))
+	      ;; If the above search fails, thats ok.  We'd just want to be at
+	      ;; point-min anyway.
+	      )
+	    (makefile-insert-macro (car (cdr (cdr ntype))))))
+      (makefile-end-of-command)
+      (insert " " (ede-target-name ot))
+      (save-buffer)
+      ;; Rescan the object in this makefile.
+      (project-rescan ede-object))))
+
+;(defun project-am-rescan-toplevel ()
+;  "Rescan all projects in which the current buffer resides."
+;  (interactive)
+;  (let* ((tlof (project-am-find-topmost-level default-directory))
+;	 (tlo (project-am-load tlof))
+;	 (ede-deep-rescan t))  ; scan deep in this case.
+;    ;; tlo is the top level object for whatever file we are in
+;    ;; or nil.  If we have an object, call the rescan method.
+;    (if tlo (project-am-rescan tlo))))
+
+;;
+;; NOTE TO SELF
+;;
+;;  This should be handled at the EDE level, calling a method of the
+;; top most project.
+;;
+(defmethod project-compile-project ((obj project-am-target) &optional command)
+  "Compile the entire current project.
+Argument COMMAND is the command to use when compiling."
+  (require 'compile)
+  (if (not command)
+      (setq
+       command
+       ;; This interactive statement was taken from compile, and I'll
+       ;; use the same command history too.
+       (progn
+	 (if (not project-am-compile-project-command)
+	     (setq project-am-compile-project-command compile-command))
+	 (if (or compilation-read-command current-prefix-arg)
+	     (read-from-minibuffer "Project compile command: "
+				   ;; hardcode make -k
+				   ;; This is compile project after all.
+				   project-am-compile-project-command
+				   nil nil '(compile-history . 1))
+	   project-am-compile-project-command))))
+  ;; When compile a project, we might be in a subdirectory,
+  ;; so we have to make sure we move all the way to the top.
+  (let* ((default-directory (project-am-find-topmost-level default-directory)))
+    (compile command)))
+
+(defmethod project-compile-project ((obj project-am-makefile)
+				    &optional command)
+  "Compile the entire current project.
+Argument COMMAND is the command to use when compiling."
+  (require 'compile)
+  (if (not command)
+      (setq
+       command
+       ;; This interactive statement was taken from compile, and I'll
+       ;; use the same command history too.
+       (progn
+	 (if (not project-am-compile-project-command)
+	     (setq project-am-compile-project-command compile-command))
+	 (if (or compilation-read-command current-prefix-arg)
+	     (read-from-minibuffer "Project compile command: "
+				   ;; hardcode make -k
+				   ;; This is compile project after all.
+				   project-am-compile-project-command
+				   nil nil '(compile-history . 1))
+	   project-am-compile-project-command))))
+  ;; When compile a project, we might be in a subdirectory,
+  ;; so we have to make sure we move all the way to the top.
+  (let* ((default-directory (project-am-find-topmost-level default-directory)))
+    (compile command)))
+
+(defmethod project-compile-target ((obj project-am-target) &optional command)
+  "Compile the current target.
+Argument COMMAND is the command to use for compiling the target."
+  (require 'compile)
+  (if (not project-am-compile-project-command)
+      (setq project-am-compile-project-command compile-command))
+  (if (not command)
+      (setq
+       command
+       (if compilation-read-command
+	   (read-from-minibuffer "Project compile command: "
+				 ;; hardcode make -k
+				 ;; This is compile project after all.
+				 (if ede-object
+				     (format
+				      project-am-compile-target-command
+				      (project-compile-target-command
+				       ede-object))
+				   project-am-compile-target-command)
+				 nil nil
+				 '(compile-history . 1))
+	 (if ede-object
+	     project-am-compile-project-command
+	   (format
+	    project-am-compile-target-command
+	    (project-compile-target-command ede-object))))))
+  ;; We better be in the right place when compiling a specific target.
+  (compile command))
+
+(defmethod project-debug-target ((obj project-am-objectcode))
+  "Run the current project target in a debugger."
+  (let ((tb (get-buffer-create " *padt*"))
+	(dd (oref obj path))
+	(cmd nil))
+    (unwind-protect
+	(progn
+	  (set-buffer tb)
+	  (setq default-directory dd)
+	  (setq cmd (read-from-minibuffer
+		     "Run (like this): "
+		     (concat (symbol-name project-am-debug-target-function)
+			     " " (ede-target-name obj))))
+	  (funcall project-am-debug-target-function cmd))
+      (kill-buffer tb))))
+
+(defmethod project-run-target ((obj project-am-objectcode))
+  "Run the current project target in comint buffer."
+  (let ((tb (get-buffer-create " *padt*"))
+	(dd (oref obj path))
+	(cmd nil))
+    (unwind-protect
+	(progn
+	  (require 'ede-shell)
+	  (set-buffer tb)
+	  (setq default-directory dd)
+	  (setq cmd (read-from-minibuffer
+		     "Run (like this): "
+		     (concat (ede-target-name obj))))
+	  (ede-shell-run-something obj cmd)	  
+	  )
+      (kill-buffer tb))))
+
+(defmethod project-make-dist ((this project-am-target))
+  "Run the current project in the debugger."
+  (require 'compile)
+  (if (not project-am-compile-project-command)
+      (setq project-am-compile-project-command compile-command))
+  (project-compile-project this (concat project-am-compile-project-command
+					" dist")))
+
+;;; Project loading and saving
+;;
+(defun project-am-load (directory &optional rootproj)
+  "Read an automakefile DIRECTORY into our data structure.
+If a given set of projects has already been loaded, then do nothing
+but return the project for the directory given.
+Optional ROOTPROJ is the root EDE project."
+  (let* ((ede-constructiong t)
+	 (amo (object-assoc (expand-file-name "Makefile.am" directory)
+			    'file ede-projects)))
+    (when (not amo)
+      (setq amo (project-am-load-makefile directory)))
+    amo))
+
+(defun project-am-find-topmost-level (dir)
+  "Find the topmost automakefile starting with DIR."
+  (let ((newdir dir))
+    (while (or (file-exists-p (concat newdir "Makefile.am"))
+	       (file-exists-p (concat newdir "configure.ac"))
+	       (file-exists-p (concat newdir "configure.in"))
+	       )
+      (setq dir newdir newdir
+	    (file-name-directory (directory-file-name newdir))))
+    (expand-file-name dir)))
+
+(defmacro project-am-with-makefile-current (dir &rest forms)
+  "Set the Makefile.am in DIR to be the current buffer.
+Run FORMS while the makefile is current.
+Kill the makefile if it was not loaded before the load."
+  `(let* ((fn (expand-file-name "Makefile.am" ,dir))
+	  (fb nil)
+	  (kb (get-file-buffer fn)))
+     (if (not (file-exists-p fn))
+	nil
+      (save-excursion
+	(if kb (setq fb kb)
+	  ;; We need to find-file this thing, but don't use
+	  ;; any semantic features.
+	  (let ((semantic-init-hook nil)
+		(recentf-exclude '( (lambda (f) t) ))
+		)
+	    (setq fb (find-file-noselect fn)))
+	  )
+	(set-buffer fb)
+	(prog1 ,@forms
+	  (if (not kb) (kill-buffer (current-buffer))))))))
+(put 'project-am-with-makefile-current 'lisp-indent-function 1)
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec project-am-with-makefile-current
+	      (form def-body))))
+
+
+(defun project-am-load-makefile (path &optional suggestedname)
+  "Convert PATH into a project Makefile, and return its project object.
+It does not check for existing project objects.  Use `project-am-load'.
+Optional argument SUGGESTEDNAME will be the project name.
+This is used when subprojects are made in named subdirectories."
+  (project-am-with-makefile-current path
+    (if (and ede-object (project-am-makefile-p ede-object))
+	ede-object
+      (let* ((pi (project-am-package-info path))
+	     (sfn (when suggestedname
+		    (project-am-last-dir suggestedname)))
+	     (pn (or sfn (nth 0 pi) (project-am-last-dir fn)))
+	     (ver (or (nth 1 pi) "0.0"))
+	     (bug (nth 2 pi))
+	     (cof (nth 3 pi))
+	     (ampf (project-am-makefile
+		    pn :name pn
+		    :version ver
+		    :mailinglist (or bug "")
+		    :file fn)))
+	(oset ampf :directory (file-name-directory fn))
+	(oset ampf configureoutputfiles cof)
+	(make-local-variable 'ede-object)
+	(setq ede-object ampf)
+	;; Move the rescan after we set ede-object to prevent recursion
+	(project-rescan ampf)
+	ampf))))
+
+;;; Methods:
+(defmethod project-targets-for-file ((proj project-am-makefile))
+  "Return a list of targets the project PROJ."
+  (oref proj targets))
+
+(defun project-am-scan-for-targets (currproj dir)
+  "Scan the current Makefile.am for targets.
+CURRPROJ is the current project being scanned.
+DIR is the directory to apply to new targets."
+  (let* ((otargets (oref currproj targets))
+	 (ntargets nil)
+	 (tmp nil)
+	 )
+      (mapc
+       ;; Map all the different types
+       (lambda (typecar)
+	 (let ((macro (nth 2 typecar))
+	       (class (nth 1 typecar))
+	       (indirect (nth 3 typecar))
+	       ;(name (car typecar))
+	       )
+	   (if indirect
+	       ;; Map all the found objects
+	       (mapc (lambda (lstcar)
+		       (setq tmp (object-assoc lstcar 'name otargets))
+		       (when (not tmp)
+			 (setq tmp (apply class lstcar :name lstcar
+					  :path dir nil)))
+		       (project-rescan tmp)
+		       (setq ntargets (cons tmp ntargets)))
+		     (makefile-macro-file-list macro))
+	     ;; Non-indirect will have a target whos sources
+	     ;; are actual files, not names of other targets.
+	     (let ((files (makefile-macro-file-list macro)))
+	       (when files
+		 (setq tmp (object-assoc macro 'name otargets))
+		 (when (not tmp)
+		   (setq tmp (apply class macro :name macro
+				    :path dir nil)))
+		 (project-rescan tmp)
+		 (setq ntargets (cons tmp ntargets))
+		 ))
+	     )
+	   ))
+       project-am-type-alist)
+      ntargets))
+
+(defun project-am-expand-subdirlist (place subdirs)
+  "Store in PLACE the SUBDIRS expanded from variables.
+Strip out duplicates, and recurse on variables."
+  (mapc (lambda (sp)
+	  (let ((var (makefile-extract-varname-from-text sp)))
+	    (if var
+		;; If it is a variable, expand that variable, and keep going.
+		(project-am-expand-subdirlist
+		 place (makefile-macro-file-list var))
+	      ;; Else, add SP in if it isn't a dup.
+	      (if (member sp (symbol-value place))
+		  nil ; don't do it twice.
+		(set place (cons sp (symbol-value place))) ;; add
+		))))
+	subdirs)
+  )
+
+(defmethod project-rescan ((this project-am-makefile) &optional suggestedname)
+  "Rescan the makefile for all targets and sub targets."
+  (project-am-with-makefile-current (file-name-directory (oref this file))
+    ;;(message "Scanning %s..." (oref this file))
+    (let* ((pi (project-am-package-info (oref this directory)))
+	   (pn (nth 0 pi))
+	   (pv (nth 1 pi))
+	   (bug (nth 2 pi))
+	   (cof (nth 3 pi))
+	   (osubproj (oref this subproj))
+	   ;; 1/30/10 - We need to append these two lists together,
+	   ;; then strip out duplicates.  Expanding this list (via 
+	   ;; references to other variables should also strip out
+	   ;; dups
+	   (csubproj (append
+		      (makefile-macro-file-list "DIST_SUBDIRS")
+		      (makefile-macro-file-list "SUBDIRS")))
+	   (csubprojexpanded nil)
+	   (nsubproj nil)
+	   ;; Targets are excluded here because they require
+	   ;; special attention.
+	   (dir (expand-file-name default-directory))
+	   (tmp nil)
+	   (ntargets (project-am-scan-for-targets this dir))
+	   )
+
+      (if suggestedname
+	  (oset this name (project-am-last-dir suggestedname))
+	;; Else, setup toplevel project info.
+	(and pn (string= (directory-file-name
+			  (oref this directory))
+			 (directory-file-name
+			  (project-am-find-topmost-level
+			   (oref this directory))))
+	     (oset this name pn)
+	     (and pv (oset this version pv))
+	     (and bug (oset this mailinglist bug))
+	     (oset this configureoutputfiles cof)))
+
+      ;; Now that we have this new list, chuck the old targets
+      ;; and replace it with the new list of targets I just created.
+      (oset this targets (nreverse ntargets))
+      ;; We still have a list of targets.  For all buffers, make sure
+      ;; their object still exists!
+
+      ;; FIGURE THIS OUT
+
+      (project-am-expand-subdirlist 'csubprojexpanded csubproj)
+
+
+      ;; Ok, now lets look at all our sub-projects.
+      (mapc (lambda (sp)
+ 	      (let* ((subdir (file-name-as-directory
+ 			      (expand-file-name
+ 			       sp (file-name-directory (oref this :file)))))
+ 		     (submake (expand-file-name
+ 			       "Makefile.am"
+ 			       subdir)))
+ 		(if (string= submake (oref this :file))
+ 		    nil	;; don't recurse.. please!
+
+ 		  ;; For each project id found, see if we need to recycle,
+ 		  ;; and if we do not, then make a new one.  Check the deep
+ 		  ;; rescan value for behavior patterns.
+ 		  (setq tmp (object-assoc
+ 			     submake
+ 			     'file osubproj))
+ 		  (if (not tmp)
+ 		      (setq tmp
+ 			    (condition-case nil
+ 				;; In case of problem, ignore it.
+ 				(project-am-load-makefile subdir subdir)
+ 			      (error nil)))
+ 		    ;; If we have tmp, then rescan it only if deep mode.
+ 		    (if ede-deep-rescan
+ 			(project-rescan tmp subdir)))
+ 		  ;; Tac tmp onto our list of things to keep, but only
+ 		  ;; if tmp was found.
+ 		  (when tmp
+ 		    ;;(message "Adding %S" (object-print tmp))
+ 		    (setq nsubproj (cons tmp nsubproj)))))
+ 	      )
+ 	    (nreverse csubprojexpanded))
+      (oset this subproj nsubproj)
+      ;; All elements should be updated now.
+      )))
+
+
+(defmethod project-rescan ((this project-am-program))
+  "Rescan object THIS."
+  (oset this :source (makefile-macro-file-list (project-am-macro this)))
+  (oset this :ldadd (makefile-macro-file-list
+		     (concat (oref this :name) "_LDADD"))))
+
+(defmethod project-rescan ((this project-am-lib))
+  "Rescan object THIS."
+  (oset this :source (makefile-macro-file-list (project-am-macro this))))
+
+(defmethod project-rescan ((this project-am-texinfo))
+  "Rescan object THIS."
+  (oset this :include (makefile-macro-file-list (project-am-macro this))))
+
+(defmethod project-rescan ((this project-am-man))
+  "Rescan object THIS."
+  (oset this :source (makefile-macro-file-list (project-am-macro this))))
+
+(defmethod project-rescan ((this project-am-lisp))
+  "Rescan the lisp sources."
+  (oset this :source (makefile-macro-file-list (project-am-macro this))))
+
+(defmethod project-rescan ((this project-am-header))
+  "Rescan the Header sources for object THIS."
+  (oset this :source (makefile-macro-file-list (project-am-macro this))))
+
+(defmethod project-rescan ((this project-am-built-src))
+  "Rescan built sources for object THIS."
+  (oset this :source (makefile-macro-file-list "BUILT_SOURCES")))
+
+(defmethod project-rescan ((this project-am-extra-dist))
+  "Rescan object THIS."
+  (oset this :source (makefile-macro-file-list "EXTRA_DIST")))
+  ;; NOTE: The below calls 'file' then checks that it is some sort of
+  ;; text file.  The  file command may not be available on all platforms
+  ;; and some files may not exist yet.  (ie - auto-generated)
+
+  ;;(mapc
+  ;; (lambda (f)
+  ;;   ;; prevent garbage to be parsed, could we use :aux ?
+  ;;   (if (and (not (member f (oref this :source)))
+  ;;	      (string-match-p "ASCII\\|text"
+  ;;			      (shell-command-to-string
+  ;;			       (concat "file " f))))
+  ;;	 (oset this :source (cons f (oref this :source)))))
+  ;; (makefile-macro-file-list "EXTRA_DIST")))
+
+(defmethod project-am-macro ((this project-am-objectcode))
+  "Return the default macro to 'edit' for this object type."
+  (concat (subst-char-in-string ?- ?_ (oref this :name)) "_SOURCES"))
+
+(defmethod project-am-macro ((this project-am-header-noinst))
+  "Return the default macro to 'edit' for this object."
+  "noinst_HEADERS")
+
+(defmethod project-am-macro ((this project-am-header-inst))
+  "Return the default macro to 'edit' for this object."
+  "include_HEADERS")
+
+(defmethod project-am-macro ((this project-am-header-pkg))
+  "Return the default macro to 'edit' for this object."
+  "pkginclude_HEADERS")
+
+(defmethod project-am-macro ((this project-am-header-chk))
+  "Return the default macro to 'edit' for this object."
+  "check_HEADERS")
+
+(defmethod project-am-macro ((this project-am-texinfo))
+  "Return the default macro to 'edit' for this object type."
+  (concat (file-name-sans-extension (oref this :name)) "_TEXINFOS"))
+
+(defmethod project-am-macro ((this project-am-man))
+  "Return the default macro to 'edit' for this object type."
+  (oref this :name))
+
+(defmethod project-am-macro ((this project-am-lisp))
+  "Return the default macro to 'edit' for this object."
+  "lisp_LISP")
+
+(defun project-am-buffer-object (amf buffer)
+  "Return an object starting with AMF associated with BUFFER.
+nil means that this buffer belongs to no-one."
+  (if (not amf)
+      nil
+    (if (ede-buffer-mine amf buffer)
+	amf
+      (let ((targ (oref amf targets))
+	    (sobj (oref amf subproj))
+	    (obj nil))
+	(while (and targ (not obj))
+	  (if (ede-buffer-mine (car targ) buffer)
+	      (setq obj (car targ)))
+	  (setq targ (cdr targ)))
+	(while (and sobj (not obj))
+	  (setq obj (project-am-buffer-object (car sobj) buffer)
+		sobj (cdr sobj)))
+	obj))))
+
+(defmethod ede-buffer-mine ((this project-am-makefile) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (let ((efn  (expand-file-name (buffer-file-name buffer))))
+    (or (string= (oref this :file) efn)
+	(string-match "/configure\\.ac$" efn)
+	(string-match "/configure\\.in$" efn)
+	(string-match "/configure$" efn)
+	;; Search output files.
+	(let ((ans nil))
+	  (dolist (f (oref this configureoutputfiles))
+	    (when (string-match (concat (regexp-quote f) "$") efn)
+	      (setq ans t)))
+	  ans)
+	)))
+
+(defmethod ede-buffer-mine ((this project-am-objectcode) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (member (file-relative-name (buffer-file-name buffer) (oref this :path))
+	  (oref this :source)))
+
+(defmethod ede-buffer-mine ((this project-am-texinfo) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (let ((bfn (file-relative-name (buffer-file-name buffer)
+				 (oref this :path))))
+    (or (string= (oref this :name)  bfn)
+	(member bfn (oref this :include)))))
+
+(defmethod ede-buffer-mine ((this project-am-man) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (string= (oref this :name)
+	   (file-relative-name (buffer-file-name buffer) (oref this :path))))
+
+(defmethod ede-buffer-mine ((this project-am-lisp) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER."
+  (member (file-relative-name (buffer-file-name buffer) (oref this :path))
+	  (oref this :source)))
+
+(defmethod project-am-subtree ((ampf project-am-makefile) subdir)
+  "Return the sub project in AMPF specified by SUBDIR."
+  (object-assoc (expand-file-name subdir) 'file (oref ampf subproj)))
+
+(defmethod project-compile-target-command ((this project-am-target))
+  "Default target to use when compiling a given target."
+  ;; This is a pretty good default for most.
+  "")
+
+(defmethod project-compile-target-command ((this project-am-objectcode))
+  "Default target to use when compiling an object code target."
+  (oref this :name))
+
+(defmethod project-compile-target-command ((this project-am-texinfo))
+  "Default target t- use when compling a texinfo file."
+  (let ((n (oref this :name)))
+    (if (string-match "\\.texi?\\(nfo\\)?" n)
+	(setq n (replace-match ".info" t t n)))
+    n))
+
+
+;;; Generic useful functions
+
+(defun project-am-last-dir (file)
+  "Return the last part of a directory name.
+Argument FILE is the file to extract the end directory name from."
+  (let* ((s (file-name-directory file))
+	 (d (directory-file-name s))
+	 )
+    (file-name-nondirectory d))
+  )
+
+(defun project-am-preferred-target-type (file)
+  "For FILE, return the preferred type for that file."
+  (cond ((string-match "\\.texi?\\(nfo\\)$" file)
+	 project-am-texinfo)
+	((string-match "\\.[0-9]$" file)
+	 project-am-man)
+	((string-match "\\.el$" file)
+	 project-am-lisp)
+	(t
+	 project-am-program)))
+
+(defmethod ede-buffer-header-file((this project-am-objectcode) buffer)
+  "There are no default header files."
+  (or (call-next-method)
+      (let ((s (oref this source))
+	    (found nil))
+	(while (and s (not found))
+	  ;; Add more logic here if applicable.
+	  (if (string-match "\\.\\(h\\|H\\|hh\\|hpp\\)" (car s))
+	      (setq found (car s)))
+	  (setq s (cdr s)))
+	found)))
+
+(defmethod ede-documentation ((this project-am-texinfo))
+  "Return a list of files that provides documentation.
+Documentation is not for object THIS, but is provided by THIS for other
+files in the project."
+  (let* ((src (append (oref this source)
+		      (oref this include)))
+	 (proj (ede-target-parent this))
+	 (dir (oref proj directory))
+	 (out nil))
+    ;; Loop over all entries and expand
+    (while src
+      (setq out (cons
+		 (expand-file-name (car src) dir)
+		 out))
+      (setq src (cdr src)))
+    ;; return it
+    out))
+
+
+;;; Configure.in queries.
+;;
+(defvar project-am-autoconf-file-options
+  '("configure.in" "configure.ac")
+  "List of possible configure files to look in for project info.")
+
+(defun project-am-autoconf-file (dir)
+  "Return the name of the autoconf file to use in DIR."
+  (let ((ans nil))
+    (dolist (L project-am-autoconf-file-options)
+      (when (file-exists-p (expand-file-name L dir))
+	(setq ans (expand-file-name L dir))))
+    ans))
+
+(defmacro project-am-with-config-current (file &rest forms)
+  "Set the Configure FILE in the top most directory above DIR as current.
+Run FORMS in the configure file.
+Kill the Configure buffer if it was not already in a buffer."
+  `(save-excursion
+     (let ((fb (generate-new-buffer ,file)))
+       (set-buffer fb)
+       (erase-buffer)
+       (insert-file-contents ,file)
+       (prog1 ,@forms
+	 (kill-buffer fb)))))
+
+(put 'project-am-with-config-current 'lisp-indent-function 1)
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec project-am-with-config-current
+	      (form def-body))))
+
+(defmacro project-am-extract-shell-variable (var)
+  "Extract the value of the shell variable VAR from a shell script."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (concat "^" (regexp-quote var) "\\s-*=\\s-*")
+			     nil t)
+      (buffer-substring-no-properties (point) (point-at-eol)))))
+
+(defun project-am-extract-package-info (dir)
+  "Extract the package information for directory DIR."
+  (let ((conf-in (project-am-autoconf-file dir))
+	(conf-sh (expand-file-name "configure" dir))
+	(name (file-name-nondirectory
+	       (directory-file-name dir)))
+	(ver "1.0")
+	(bugrep nil)
+	(configfiles nil)
+	)
+    (cond
+     ;; Try configure.in or configure.ac
+     (conf-in
+      (require 'autoconf-edit)
+      (project-am-with-config-current conf-in
+	(let ((aci (autoconf-parameters-for-macro "AC_INIT"))
+	      (aia (autoconf-parameters-for-macro "AM_INIT_AUTOMAKE"))
+	      (acf (autoconf-parameters-for-macro "AC_CONFIG_FILES"))
+	      (aco (autoconf-parameters-for-macro "AC_OUTPUT"))
+	      )
+	  (cond
+	   ;; AC init has more than 1 parameter
+	   ((> (length aci) 1)
+	    (setq name (nth 0 aci)
+		  ver (nth 1 aci)
+		  bugrep (nth 2 aci)))
+	   ;; The init automake has more than 1 parameter
+	   ((> (length aia) 1)
+	    (setq name (nth 0 aia)
+		  ver (nth 1 aia)
+		  bugrep (nth 2 aia)))
+	   )
+	  ;; AC_CONFIG_FILES, or AC_OUTPUT lists everything that
+	  ;; should be detected as part of this PROJECT, but not in a
+	  ;; particular TARGET.
+	  (let ((outfiles (cond (aco (list (car aco)))
+				(t acf))))
+	    (if (> (length outfiles) 1)
+		(setq configfiles outfiles)
+	      (setq configfiles (split-string (car outfiles) " " t)))
+	    )
+	  ))
+      )
+     ;; Else, try the script
+     ((file-exists-p conf-sh)
+      (project-am-with-config-current conf-sh
+	(setq name (project-am-extract-shell-variable "PACKAGE_NAME")
+	      ver (project-am-extract-shell-variable "PACKAGE_VERSION")
+	      )
+	))
+     ;; Don't know what else....
+     (t
+      nil))
+    ;; Return stuff
+    (list name ver bugrep configfiles)
+    ))
+
+(defun project-am-package-info (dir)
+  "Get the package information for directory topmost project dir over DIR.
+Calculates the info with `project-am-extract-package-info'."
+  (let ((top (ede-toplevel)))
+    (when top (setq dir (oref top :directory)))
+    (project-am-extract-package-info dir)))
+
+(provide 'project-am)
+
+;;; project-am.el ends here
diff --git a/site/cedet-1.0pre7/ede/templates/Makefile b/site/cedet-1.0pre7/ede/templates/Makefile
new file mode 100644
index 0000000..47fbe4f
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/templates/Makefile
@@ -0,0 +1,38 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+Templates_MISC=ede-make.srt
+VERSION=1.0pre7
+DISTDIR=$(top)EDE-$(VERSION)/templates
+
+
+
+all: Templates
+
+Templates: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(Templates_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/ede/templates/Project.ede b/site/cedet-1.0pre7/ede/templates/Project.ede
new file mode 100644
index 0000000..8c5ff13
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/templates/Project.ede
@@ -0,0 +1,13 @@
+;; Object EDE Templates
+;; EDE project file.
+(ede-proj-project "EDE_Templates"
+  :name "EDE_Templates"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "Templates"
+    :name "Templates"
+    :path ""
+    :source '("ede-make.srt")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/ede/templates/ede-make.srt b/site/cedet-1.0pre7/ede/templates/ede-make.srt
new file mode 100644
index 0000000..7247a38
--- /dev/null
+++ b/site/cedet-1.0pre7/ede/templates/ede-make.srt
@@ -0,0 +1,49 @@
+;; ede-make.srt --- Templates for Makefiles used by EDE.
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "makefile-mode"
+set escape_start "{{"
+set escape_end "}}"
+set application "ede"
+
+context file
+
+template ede-empty :file
+----
+# Automatically Generated {{FILE}} by EDE.
+# For use with: {{MAKETYPE}}
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+----
+
+context declaration
+
+template ede-vars
+----
+{{#VARIABLE}}
+{{NAME}}={{#VALUE}} {{VAL}}{{/VALUE}}{{/VARIABLE}}
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/eieio/ChangeLog b/site/cedet-1.0pre7/eieio/ChangeLog
new file mode 100644
index 0000000..2c47cf6
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/ChangeLog
@@ -0,0 +1,2978 @@
+2010-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	(class-v, eieio-class-un-autoload, eieio-defclass, eieio-add-new-slot)
+	(defgeneric, eieio-oref, eieio-oref-default, eieio-generic-call)
+	(eieiomt-sym-optimize, eieio-generic-form)
+	(eieio-default-superclass::no-next-method)
+	(eieio-update-lisp-imenu-expression): it's -> its doc strings and comments.
+
+	* eieio.texi: Patch from Hannu Koivisto:
+	(Signal Handling): it's -> its fixes.
+
+2009-11-19  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* eieio-test-methodinvoke.el: fixed some typos in comments
+
+	* eieio-test-methodinvoke.el (header):
+	mention call-next-method tests in commentary section
+	(eieio-test-call-next-method-arguments) new variable for
+	call-next-method tests
+	(eieio-test-arguments-for): new function for call-next-method tests
+	(CNM-0, CNM-1-1, CNM-1-2, CNM-2): new classes for call-next-method
+	tests
+	(CNM-M): new methods for call-next-method tests
+	(call-next-method argument passing test): new
+
+2009-11-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Patch from Jan Moringen
+	(call-next-method): Stow the replacement argument list for future
+	call-next-method invocations.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSPRELOAD): New
+	(eieio, dist): Use reploads.
+
+	* Project.ede (eieio,examples): Use preload compiler and cedet-compat.
+
+2009-10-10  David Engster <dengste@eml.cc>
+
+	* eieio-base.el (eieio-persistent-save):
+	If buffer contains multibyte characters, choose
+	first applicable coding system automatically, so that user is not prompted.
+
+2009-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (boolean-p): Deleted in preference to booleanp.
+
+2009-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-test-methodinvoke.el (Ja, Jb, Jc, Jd, initialize-instance):
+	New.
+
+	* eieio.el (eieiomt-method-list):
+	Prevent duplicate :before or :after method
+	calls in multiple inheritance situations.
+
+2009-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-comp.el (byte-compile-file-form-defmethod):
+	Query xemacs feature, no strig-match.
+
+2009-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (data-debug): After load, pull in eieio-datadebug.
+
+	* eieio-datadebug.el (toplevel):
+	Add eieio objects to the list of data debug things to
+	recognize.
+
+2009-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fix comments
+
+	* eieio.el: Remove errors about recompiling eieio.
+	(eieio-unbound): Default value is now robust to recompiles.
+
+	* eieio-tests.el (class-typep-var, class-typep): Delete these tests.
+
+	* eieio.el (lambda-default): Deleted.
+	(eieio-default-eval-maybe): Remove special handling of lambda and lambda-default.
+	(eieio-set-defaults, eieio-default-superclass::initialize-instance):
+	Remove special handling of lambda-default.
+
+2009-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (class-typep): Remove slot4, the lambda-default test.
+
+	* d-config.texi, d-dataobj.texi, d-widget.texi, dbif-browse.el, dbif-edit.el, dbif.el, dialog-mode.el, dialog-tree.el, dialog.texi, dlg-class.el, dlg-config.el, e-config.el, ecfg-menu.el, widget-d.el, widget-i.el:
+	Remove unused old eieio packages.
+
+2009-07-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-comp.el (byte-compile-file-form-defmethod):
+	Try to use bytecomp-outbuffer, then use outbuffer.
+
+2009-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-describe-class, eieio-describe-generic):
+	Use `help-setup-xref'.
+
+2009-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-instance-inheritor::slot-unbound):
+	Added comments
+	(eieio-instance-inheritor::eieio-instance-inheritor-slot-boundp):
+	New method.
+
+2009-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-describe-class, eieio-describe-generic):
+	Make sure the string returned is for the help buffer.
+
+2009-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-perftest.el (eieio-perftest-elapsed-time): New fcn
+	(eieio-perftest-methodcall, eieio-perftest-onemethodcall):
+	Call above instead of the semantic version.
+
+	* eieio-opt.el (eieio-describe-class, eieio-describe-generic):
+	Use `help-buffer'
+	instead of "*Help*" for identifying the buffer to display help in.
+
+2009-06-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-hook): Remove some useless bits of documentation.
+
+2009-04-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent-read): Have the read of the object
+	occur while the originating buffer is current.
+
+2009-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass): Return the class symbol, not the vector.
+	(eieio-add-new-slot): Be safe copying the vector.
+
+2009-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el (chart-mode): Disable font lock, and undo.
+
+2009-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el (eieio-default-superclass::eieio-customize-object):
+	Comment fix.
+	(eieio-object-abstract-to-value): Doc fix.
+
+2009-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* .cvsignore: add *.info
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSFLAGS): New variable.
+	(init,eieio,examples,test): Use above.
+
+2009-02-01  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* eieio-tests.el (virtual-slot-class):
+	New class; used in tests for `slot-missing'
+	(virtual-slot-class::slot-missing): New method; simulates a virtual
+	slot
+	(vsca): Object of class virtual-slot-class; used in basic
+	`slot-missing' tests
+	(vscb): Another object of class virtual-slot-class; used to test calls
+	to `slot-missing' from constructor
+
+	* eieio.el (shared-initialize):
+	When setting slot values, dispatch missing slots
+	to `slot-missing', but do not try to set them with `eieio-oset' after
+	that
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (eieio): Updated to 1.0pre6.
+
+	* Makefile (VERSION): Updated to 1.2
+
+	* eieio.el (eieio-version): Updated to 1.2
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-datadebug.el (data-debug-insert-object-slots-from-point):
+	(data-debug-show):
+	Eliminate unused variable bindings.
+
+2009-01-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (intarag warning):
+	Make optional if framwork for getting last warnigs works.
+	(eieio-test-methodinvoke): New loading techinique
+
+2009-01-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (examples_LISP): Remove tree.el and call-tree.el
+
+	* Project.ede ("examples"): Remove tree.el and call-tree.el
+
+	* eieio.texi (Slot Options):
+	Add warnings about obsoleting bogus initform behavior
+	(Class Values): Remove refs to tree.el
+
+2009-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (lambda-default): Add TODO
+	(eieio-default-eval-maybe)
+	(eieio-default-superclass::initialize-instance):
+	Add warnings about using functions to initialize slots.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Quick Start, Introduction, Generics, Signals, Wish List):
+	Misc spelling fixes.
+
+2009-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-do-highlight):
+	Fix unused var bytcomp warning.
+
+	* linemark.el (linemark-next-in-buffer):
+	Fix unused var bytcomp warning.
+
+	* eieio.el (call-next-method): Fix unused var bytcomp warning.
+
+	* eieio-opt.el (eieio-display-method-list, eieio-help-mode-augmentation-maybee):
+	Fix unused var bytcomp warning.
+
+	* eieio-datadebug.el (eieio): New require
+
+	* eieio-custom.el (eieio-default-superclass::eieio-customize-object):
+	Fix unused var bytcomp warning.
+
+2009-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defgeneric-form-primary-only-one):
+	Fix insertion of class into generated code so it will be quoted in,
+	and not depend on the symbol-value which could be erroneously overriden.
+
+2008-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-describe-constructor): New autoload.
+
+	* eieio.el (eieio-defclass): Fix byte-comp warnings about mapcar.
+	(eieio-generic-call-primary-only): Fix byte-comp warning
+	that found a typo.
+	(describe-function): If an eieio constructor is passed in,
+	describe it as a constructor.
+
+	* eieio-custom.el (eieio-default-superclass::eieio-customize-object):
+	Fix byte-comp warnings about mapcar.
+
+	* linemark.el: (linemark-group::linemark-display)
+	(linemark-group::linemark-delete):
+	Fix byte-comp warnings about mapcar.
+
+	* eieio-opt.el (eieio-describe-class): Support a header fcn.
+	(eieio-describe-constructor):
+	Describe a function that is a constructor to some class.
+
+2008-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass-autoload): Fix child-p name.
+	(eieio-generic-call-primary-only): Better error messages.
+
+2008-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defgeneric-form-primary-only-one):
+	Set byte-compile-warnings to
+	nil to fix Emacs 21 compile issue.
+
+	* eieio-perftest.el: (eieio-perftest-methodcall)
+	(eieio-perftest-onemethodcall): Change how percents are calc'd.
+
+2008-12-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defgeneric-reset-generic-form-primary-only):
+	Byte compile the generated body.
+	Optimize the body a little more.
+	(eieio-defgeneric-form-primary-only-one):
+	Don't need to pass in classpredicate anymore.
+	(eieio-generic-call-primary-only): Fix doc typo.
+
+	* eieio-opt.el (eieio-describe-generic): Fix typo.
+
+	* eieio-opt.el (eieio-describe-generic):
+	Mention if there is only 1 primary method here.
+	(eieio-display-method-list): Add stats on how many methods have only
+	one primary method.
+
+	* eieio-perftest.el (eieio-perftest-onemethodcall): New
+
+	* eieio.el (generic-primary-only-one-p: New predicate. (eieio-defclass-autoload):
+	Fix typo for child-p
+	(eieio-defgeneric-form-primary-only-one)
+	(eieio-defgeneric-reset-generic-form-primary-only-one): New.
+	(eieio-defmethod): When optimizing method forms, if there is only
+	one primary method, setup this method using the form for only one
+	primary (new above.)
+	(eieio-generic-call-primary-only): Add missing local variable.
+
+2008-12-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (test_LISP): Add eieio-perftest.el
+
+	* Project.ede (test): Add eieio-perftest.el
+
+	* eieio-perftest.el: Performance testing setup.
+
+	* eieio.el (eieio-optimize-primary-methods-flag): New option.
+	(generic-primary-only-p): New predicate.
+	(eieio-defgeneric-reset-generic-form)
+	(eieio-defgeneric-form-primary-only)
+	(eieio-defgeneric-reset-generic-form-primary-only): New fcns.
+	(eieio-defgeneric): Move where the method's function is set.
+	(eieio-defmethod): Add optimizer at the end to choose primary-only
+	fast path.
+	(eieio-generic-call-primary-only): New fcn.
+
+	* eieio-opt.el (eieio-describe-generic):
+	Mention if a method is primary only.
+	(eieio-display-method-list): Add info about how many methods are
+	primary only.
+
+	* eieio-opt.el (eieio-display-method-list): New command.
+
+2008-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieiomt-method-list): Add comments.
+
+2008-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (toplevel):
+	Do not allow eieio to be loaded or byte-compiled twice.
+	(eieio-generic-call): error check the mclass value.
+	(eieiomt-method-list): Add a little more doc.
+
+2008-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el (chart-test-it-all): Add autoload cookie.
+
+2008-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Top): Remove CLOS refs.
+	(Quick Start, Introduction): Various updates.
+	(Building Classes): Added "inheritance" submenu
+	(Inheritance): New.
+	(Slot Options, Making New Objects)
+	(Accessing Slots): Various updates.
+	(Writing Methods, Static Methods): Add "Static Methods" submenu.
+	(Methods): Downcase method keys like :before, and various updates.
+	(Predicates): Updated doc from code.
+	Added TODO features.
+	(Association Lists): Updated doc from code.
+	(Base Classes, eieio-instance-tracker, Documentation): Various updates.
+	(Default Superclass): Break into sections.
+	(Initialization, Basic Methods,  Signal Handling):
+	New created from old content.  Various updates.
+	(Signals): Various updates.
+
+	* eieio-xml.el: (eieio-xml-override-prin1)
+	(eieio-xml-list-prin1): Use eieio-object-p.
+
+	* eieio-tests.el (static-method-class::static-method-class-method):
+	(static-method-class-2::static-method-class-method):
+	(obj1): Use eieio-object-p for tests.
+
+	* eieio-speedbar.el: (eieio-speedbar-menu, eieio-speedbar-buttons)
+	(eieio-speedbar::eieio-speedbar-expand)
+	(eieio-speedbar-item-info)
+	(eieio-speedbar-find-nearest-object)
+	(eieio-speedbar-line-path): Use eieio-object-p.
+
+	* eieio-custom.el (eieio-object-value-to-abstract): Use eieio-object-p.
+
+	* eieio-comp.el (byte-compile-file-form-defmethod):
+	Support upper and lowercase
+	method keys.
+
+	* eieio.el:
+	(method-static, method-before, method-primary, method-after)
+	(geneirc-method-static, method-geneirc-before)
+	(method-geneirc-primary, method-geneirc-after): Downcase key symbol in doc.
+	(class-v)
+	(eieio-object-p): Renamed from object-p.  Add alias.
+	(eieio-defclass): eieio-object-p, downcase :static.
+	(make-instance): doc fix.
+	(defmethod): Downcase method doc key symbols.
+	(eieio-defmethod): Support upper and lowercase key symbols, like :primary.
+	(eieio-oref, eieio-oref-default, eieio-oset, with-slots):
+	Use eieio-object-p. Doc fix.
+	(object-name, object-name-string, object-set-name-string, object-class)
+	(same-class-p, object-of-class-p, object-slots, slot-boundp, slot-exists-p):
+	Use eieio-object-p.
+	(find-class): Doc fix.
+	(object-assoc, object-add-to-list, object-remove-from-list)
+	(eieio-slot-name-index): Doc fix.
+	(eieio-generic-call-key): Downcase method keys, like :primary.
+	(eieio-generic-call): Use eieio-object-p.
+	(eieiomt-method-list, next-method-p, eieiomt-add):
+	Downcase method keys.  Doc fixes.
+	(eieio-default-superclass): Doc fix, downcase method keys.
+	(constructor, shared-initialize, initialize-instance): Doc fix.
+	(eieio-default-superclass::slot-missing)
+	(eieio-default-superclass::no-applicable-method)
+	(eieio-default-superclass::clone)
+	(destructor):
+	(eieio-default-superclass::object-print):
+	Add a generic with doc for each method.  Doc fixes.
+	(eieio-override-prin1, eieio-list-prin1)
+	(eieio-edebug-prin1-to-string): Use eieio-object-p.
+	(edebug-setup-hook): Downcase method keys.
+	("cedet-edebug"): Use eieio-object-p.
+
+2008-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-xml.el (object-write-xml): Replace 'field' with 'slot'.
+
+	* eieio-base.el (eieio-instance-tracker::initialize-instance, eieio-instance-tracker-find):
+	(eieio-singleton::constructor): Replace occurances of the word 'field'
+	with 'slot'.
+
+	* eieio-custom.el (eieio-custom-ignore-eieio-co,eieio-object-value-create,eieio-object-value-get):
+	Replace occurances of the world 'field' with 'slot'
+
+	* eieio-datadebug.el (data-debug-insert-object-slots,data-debug-insert-object-slots-from-point):
+	(data-debug-insert-object-button,eieio-default-superclass::data-debug/eieio-insert-slots):
+	(eieio-default-superclass::data-debug-show):
+	Replaced occurances of the word 'field' with 'slot'.
+
+	* eieio.el:
+	(this, class-parent, class-children, class-num-slots, method-num-slots)
+	(defclass, eieio-defclass-autoload, eieio-defclass,eieio-perform-slot-validation-for-default)
+	(eieio-add-new-slot,eieio-copy-parents-into-subclass,eieio-validate-slot-value)
+	(oref,oref-default,oset,object-assoc,eieio-slot-originating-class-p,eieio-slot-name-index)
+	(eieiomt-install,eieiomt-add,slot-value,eieio-default-superclass,eieio-default-superclass::constructor)
+	(eieio-default-superclass::initialize-instance,eieio-default-superclass::object-write):
+	Replace occurance of the work 'field' with 'slot'.
+	(eieio-field-originating-class-p,eieio-class-field-name-index)
+	(eieio-field-name-index,eieio-add-new-field): Renamed to have 'slot'
+	in the name instead of 'field'
+
+2008-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Class Options): Add method-invocation-order.
+	(Making New Objects): Remove some examples that don't fit anymore.
+
+	* eieio-speedbar.el (eieio-speedbar): Method invocation is depth-first.
+
+	* eieio-test-methodinvoke.el (Diamond Test):
+	Two new sections on diamond shaped class trees and
+	method invocation.
+
+	* eieio-datadebug.el (eieio-debug-methodinvoke): New fcn.
+
+	* eieio.el (class-method-invocation-order): New function.
+	(defclass): Add :method-invocation-order doc
+	(eieio-defclass): Add :method-invocation-order error checing.
+	(eieio-pre-method-execution-hooks): New
+	(eieio-generic-call): Run above hooks.
+	(eieiomt-method-list, eieiomt-sym-optimize):
+	Support :method-invocation-order use.
+
+2008-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Top): Move naming conventions.
+	Add method invocation.
+	Eliminate Demo programs.
+	Add wish list.
+	(Quick Start, Introduction, Slot Options): Various small fixes
+	suggested by RMS.
+	(Writing Methods): Add subnodes
+	(Generics, Methods): New subnodes from a bove.
+
+2008-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieiomt-sym-optimize):
+	Convert search to be depth-first, not breadth first.
+	This enables a more predictable method invocation preference order.
+
+2008-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (class-c test):
+	setf test uses more logical value for debugging.
+	(class-subc): Inheritance of some attributes test.
+
+	* eieio.el (eieio-add-new-field):
+	Do not reset the default value if the incomming
+	value is 'unbound, meaning not specified.
+
+2008-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass-autoload):
+	Comment and doc-string formatting.
+
+2008-08-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-help-augment-keymap):
+	Remove this fcn, and the setup code.
+	Both keybindings are now used for other things in Emacs.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass-autoload-map):
+	New obarray for autoload handling.
+	(eieio-defclass-autoload): Create an autoload for a class.
+	(eieio-class-un-autoload): Load in an autoload class
+	(eieio-defclass): Maintain class children and parantage from the class
+	autoload map.
+	(eieio-oref): Load autoload classes if ref'd by the class.
+
+2008-07-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieiomt-method-list):
+	If intput class is not a class (ie - nil) do
+	not call eieiomt-next on it.  Instead, allow `no-method-definition' to
+	be signaled.
+
+2008-06-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: Note new features for CLOS compatibility.
+
+2008-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated version number.
+
+	* Project.ede ("eieio"): Update version.
+
+	* eieio-tests.el (class-a::no-next-method): Takes extra arguments.
+	(class-b::no-applicable-method): Takes extra args.
+
+	* eieio.el (eieio-version): New version.
+	(defmethod): New doc string.
+	(class-parents, class-children): Update doc string for CLOS.
+	(class-direct-superclasses, class-direct-subclasses): New aliases.
+	(eieio-generic-call): Extra arg passed to `no-applicable-method'.
+	(call-next-method): no next method called with extra args.
+	(eieio-default-superclass::slot-unbound): Update doc for CLOS.
+	(eieio-default-superclass::no-next-method): Doc fix.
+
+	* eieio-xml.el: First revision.
+
+2008-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el: From Michael Reiher:
+	(eieio-overlay-lists): New compat
+	(eieio-default-superclass::eieio-customize-object): Use above.
+
+2008-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-describe-class-slots):
+	Support displaying the value of class
+	allocated slots.
+
+2008-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: (eieio-default-superclass)
+	(eieio-default-superclass::clone): Fix up doc strings.
+
+2008-05-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Top): Re-arrange topics
+	(Quick Start): Rephrase some things.  Add more about the examples.
+	Discuss constructors.
+	(Naming Conventions): Moved
+	(Building Classes): Add more text for initarg and examples in initform.
+	(Writing Methods): Add examples, and clean up formatting.
+	Re-write arg list description.
+	(Predicates): Formatting.
+	(Association Lists): Better descriptions
+	(Customizing): Remove E20 ref.
+	(Base Classes): Fix descriptions
+	(Default Superclass): Moved.  Better descriptions.
+	(Signals): Moved
+	(CLOS compatibility): Moved
+
+2008-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent::eieio-persistent-save):
+	Use `write-region'
+	to do the save so I can pass in `visit' of 1, and eliminate
+	the various messages being displayed.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Update to 1.0.1
+
+	* Project.ede ("eieio"): Update to version 1.0.1
+
+	* eieio.el (eieio-version): Update to 1.0.1
+
+2008-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-build-class-alist): add autoload cookie
+	(eieio-read-class): Pass instantiable-only down to alist builder.
+
+2008-03-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-copy-parents-into-subclass):
+	Inrement printer while copying.
+
+	* eieio-opt.el (eieio-describe-class-slots):
+	Show the printer attribute of slots.
+
+2008-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Added common.
+	(eieio_LISP): Added eieio-datadebug.el
+
+	* Project.ede ("eieio"): Add eieio-datadebug.el
+
+	* eieio.el (object-p): Autoload cookie.
+
+	* eieio-datadebug.el:
+	Data Debugger for Objects support, copied initially from semantic-adebug-eieio.
+
+2008-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass):
+	Auto-created accessor is now slot bound robust.
+
+2008-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent): Add `do-backup' slot.  Default t.
+	(eieio-persistent::eieio-persistent-save): Inhibit backups
+	if do-backup is nil.
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (object-name): Add autoload cookie.
+
+2008-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Accessing Slots, Association Lists):
+	Update doc from source
+
+2008-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent-read): Doc fix.
+
+	* eieio.el (object-remove-from-list, object-assoc): Update doc string
+
+2008-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (class-v): Change backquoting to eliminate warning.
+
+2008-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (obj): Add a test when loading test-p.el
+
+2007-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Modernize the texinfo @nodes a little.
+	Move the Compatibility section near the end.
+	Use @eieio{} macros throughout.
+
+2007-09-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Building Classes): Talk about the :printer option.
+
+	* eieio-tests.el (slotattr-base): Test printeres
+	(PO-slot1-printer): Add printer slot.
+	(PO): Use above slot printer.
+	Add test to make sure the printer actually ran.
+
+	* eieio.el (class-public-printer, class-class-allocation-printer):
+	New constant
+	(defclass): Update doc with a :printer slot option
+	(eieio-defclass): Allow :printer for slot attributes.
+	(eieio-add-new-field): Accept a print argument.
+	Set the print argument into the object.
+	(eieio-copy-parents-into-subclass): Copy printer options.
+	(eieio-default-superclass::object-write): If there is a slot :printer
+	attribute, then use it to print the value of the slot.
+
+2007-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (slotattr-class-base):
+	New test class for testing slot overrides of
+	class allocated slots.
+
+	* eieio.el (eieio-add-new-field):
+	Support overriding of custom/doc class slots.
+	Do not allow overriding of class slot protection.
+
+	* eieio-tests.el (slotattr-base):
+	New baseclass for testing overriding of various slot
+	attributes.
+
+	* eieio.el:
+	(class-public-a, class-public-d, class-public-doc, class-public-type)
+	(class-public-custom, class-public-custom-label)
+	(class-public-custom-group): Fix doc.
+	(eieio-add-new-field): From: Pierre Lorenzon (Thanks)
+	Allow overriding of slot attributes :initform, :initarg, :custom, and
+	:docstring.  Throw errors overriding :protection or :type.
+
+2007-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent::eieio-persistent-path-relative):
+	Remove comment.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-default-superclass::object-write):
+	Optimize slot writer.
+
+2007-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* linemark.el (linemark): Added group to tools.
+
+	* eieio-speedbar.el (eieio-speedbar-find-nearest-object, eieio-speedbar-line-path):
+	Use string-to-number
+
+	* eieio.el (inversion): Add require.
+
+	* eieio-custom.el (eieio-widget-test): Add to a customize group
+
+	* eieio-base.el (eieio-instance-inheritor::clone): Use string-to-number
+	(eieio-persistent-read): Use insert-file-contents.
+
+	* chart.el (chart-space-usage): Use string-to-number
+
+2007-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-default-superclass::clone):
+	Use string-to-number instead of string-to-int.
+
+2006-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el ("eieio-test-methodinvoke.el"):
+	switch to load library.
+
+2006-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (:version): updated (removed means 1.0)
+
+	* Makefile (VERSION): updated
+
+	* eieio.el (eieio-version): Updated
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tree.el, lmcompile.el, linemark.el, eieio-tests.el, eieio-test-methodinvoke.el, eieio-speedbar.el, eieio-opt.el, eieio-load.el, eieio.el, eieio-doc.el, eieio-custom.el, eieiocomp.el, eieio-comp.el, eieio-base.el, chart.el, call-tree.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Add test for setf through an :accessor.
+
+	* eieio.el (eieio-defclass):
+	Fix setf for accessor to access the correct slot name.
+
+2005-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-default-superclass::object-write): if to when.
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): Updated.
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede (:version): Updated.
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("eieio"): Update version number
+
+	* Makefile (VERSION): Update version number
+	(autoloads, init, eieio, examples, test): Add quotes around EMACS.
+
+2005-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (class-fun-value-seq): Bind locally in let statement.
+
+	* eieio-test-methodinvoke.el (eieio-test-method-store):
+	Add :STATIC to things recorded.
+	(eieio-test-match): Updated error to be more telling.
+	(F): Also test 'call-next-method'
+	Fixup results for test based on new answers.
+	(C, C-base1, C-base2): New test for constructors.
+
+	* eieio.el (eieio-version): Updated to beta2
+	(eieio-generic-call-next-method-list): New state variable.
+	(eieio-generic-call): Create a setup the primary method list.
+	(next-method-p): Return eieio-generic-call-next-method-list.
+	(call-next-method): Call tne next method from the list.
+	Shorten the list.
+
+2005-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-require-version):
+	Replace with an inversion implementatin.
+
+2005-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Misc_MISC): Added NEWS.
+
+	* Project.ede (Misc): Added NEWS file.
+
+	* NEWS: New News file.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede ("eieio"): Updated.
+
+2005-04-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (class-fun-value): New method ordering test.
+
+	* eieio-tests.el (static-method-class-method):
+	New tests to try against objects as
+	well as classes.
+
+2005-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-test-methodinvoke.el:
+	Add test for primary return val in presense of :AFTER methods.
+
+	* eieio.el (eieio-generic-call): Remove old static local variable.
+	If :PRIMARY results in no lambdas, do not put nil in the list.
+	If there are no lambdas found try finding static lambdas. (was
+	tlambdas which was wrong in code, right in previous checking msg.)
+	Remember only return vals for primary methods.
+	Track if we have a primary return val.  Not sure what to do with it yet.
+
+	* eieio-tests.el: Test slot accessors on :class slots via class symbol.
+
+	* eieio.el (eieio-defclass):
+	Make accessor on :class allocated slots static.
+
+	* eieio-test-methodinvoke.el:
+	Test that an object call call a static method.
+
+	* eieio.el (eieio-generic-call):
+	Allow an object to also call into a static
+	method.
+
+	* eieio-test-methodinvoke.el:
+	Add test A+,G to test holes between before/after methods.
+
+	* eieio.el (eieiomt-method-list):
+	Prevent the optimization array from providing
+	duplicates while making lists of before/after methods.
+
+	* Makefile: Update to support eieio 1.135.
+
+	* Project.ede: Add eieio-test-methodinvoke.el.
+
+	* eieio-tests.el, eieio-test-methodinvoke.el:
+	Fix for eieio version 1.135.
+
+	* eieio-base.el (slot-missing): Doc fix.
+
+	* eieio.el (call-next-method):
+	Restore original behavior of call-next-method.
+	It should only call the first method it encounters.
+
+2005-04-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): Reset to a beta value
+	(eieio-generic-call): Handle new list returns from eieiomt-method-list.
+	(eieiomt-method-list): New function
+	(call-next-method): Disable :BEFORE or :AFTER methods to call in.
+	Call all next methods.
+
+	* eieio-tests.el: Fixed for new way call-next-method works.
+
+	* eieio-test-methodinvoke.el: New test file.
+
+	* eieio.texi (Introduction): Remove ref to old FTP location.
+
+2005-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi:
+	Add comments from RMS on how to improve the manual to the end of the
+	manual so they are not forgotten.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): Update version number
+
+	* Makefile (VERSION): Updated version number
+
+	* Project.ede (eieio): Updated version number
+
+2005-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-speedbar.el (eieio-speedbar-key-map): Initialize to a value.
+	(eieio-speedbar-make-map): Move.  Return a keymap.
+	(eieio-speedbar-customization-line): Add todo item.
+
+2004-11-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el (chart-space-usage): Use shell-file-name instead of "csh".
+
+2004-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el: doc update.
+
+	* lmcompile.el (lmcompile-do-highlight):
+	Allow hits in buffers without file names.
+
+	* linemark.el (linemark-add-entry):
+	Allow entries in buffers not associated with files.
+	(linemark-display): Allow display in buffers not associated with files.
+	(viss-bookmark-clear-all-buffer): Clear bookmarks in buffers not
+	associated with files.
+
+2004-08-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-do-highlight):
+	Updated to work with my CVS Emacs.
+	Now handles a compile entry of (<errmark> . <destmark>)
+
+2004-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-do-highlight):
+	After switching buffers, protect against
+	moving the cursor.
+
+2004-07-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-reinitialize-errors): New alias
+	(lmcompile-do-highlight): Use alias.
+
+	* eieio-base.el (initialize-instance):
+	Use memq instead of member when testing for a
+	pre-existing symbol.
+	(eieio-persistent); comment update.
+
+2004-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (eieio-persistent):
+	Fix typo in `eieio-persistent-save' method name.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (dist): Distribute the autoload file
+
+2004-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass): whitespace removal.
+
+	* eieio-doc.el (eieiodoc-one-node):
+	Limit the amount of subclassing allowed.
+
+2004-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el (eieiodoc-class): Fix doc string.
+	Handle cases where the code is executed from inside @ignore section.
+
+2004-02-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Revamped. We are a part of a CEDET install now.
+
+2004-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-do-highlight): add autoload cookie.
+
+	* linemark.el (enable-visual-studio-bookmarks): add autoload cookie.
+
+2004-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede (version): Updated.
+
+	* eieio.el (eieio-version): Updated.
+	(edebug-setup-hook): Removed
+	(cedet-edebug): New eval-after-load segement to replace old
+	edebug setup.
+
+2003-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-class-button): Correct a space issue.
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Now a meta-subproject.
+
+	* Makefile (dist): Remove local creation of tar file.
+
+2003-10-01  David Ponce  <david@dponce.com>
+
+	* compare-strings.el: Remove.  Replaced by common/cedet-compat.el.
+
+2003-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede: Update version to 0.18beta1.
+
+	* eieio.el: Update version to 0.18beta1.
+	(eieiomt-get): Remove.
+
+2003-09-18  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (init): New target.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (autoloads): Change eieio-defs.el by eieio-loaddefs.el.
+
+	* eieio-load.el: New file.
+
+2003-09-16  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+2003-09-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el (prot-0): New class
+	(prot0-slot-2): New method.
+	Call above method in testing harness.
+
+2003-09-10  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (eieio target):
+	Add speedbar to aux-packages to ensure that eieio
+	will be byte-compiled with the speedbar library in cedet.
+
+2003-09-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-field-name-index):
+	API change to accept and OBJ field.
+	If slot is protected and OBJ inherits from the declaritive class,
+	then it is ok.
+	(eieio-oref, eieio-oref-default, eieio-oset, eieio-oset-default):
+	Change to use above new API.
+
+2003-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADDEFS): New
+	(all): Add eieio-defs.el
+	(eieio-defs.el): New
+	(dist): Added LOADDEFS
+
+	* Project.ede ("autoloads"): New
+	("test"): named object.
+
+	* eieio-opt.el (eieio-browse): autoload cookie
+
+2003-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* lmcompile.el (lmcompile-linemark-entry): Add errmsg slot.
+	(linemark-display:lmcompile-linemark-entry): Remove code now in
+	create routine.
+	(lmcompile-error-group): Use new linemark creation routine
+	(lmcompile-do-highlight): Get the face and error text.  Add it into
+	the object at creation time.
+
+	* linemark.el (linemark-create-group):
+	Now obsolete.  Call linemark-new-group.
+	(linemark-new-group): New generic group creation routine.
+	(linemark-add-entry): Allow passing in of :face arg.  Return created entry.
+	(viss-bookmark-group): Use new creation routine.
+
+2003-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el:
+	Changes submitted by: "Ben Menasha" <bmenasha@benmenasha.net>
+	(eieio-custom-ignore-eieio-co): New variable
+	(eieio-object-value-get): Save all groups of objects edited inline of
+	another object.
+
+2003-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: *** empty log message ***
+
+	* Project.ede (eieio): Version update
+	(examples): Added lmcompile.el
+
+	* eieio.texi (Introduction): Added lmcompile
+
+	* eieio.el (eieio-version): update to 0.18
+
+	* lmcompile.el: Emacs Compilation hit highlighting.
+
+	* linemark.el (linemark): New group
+	(linemark-stop-face, linemark-caution-face, linemark-go-face):
+	Changed default colors.
+	(linemark-funny-face): New default colors.  Doc fix.
+	(linemark-entry): Comment about XEmacs
+
+2003-02-22  David Ponce  <david@dponce.com>
+
+	* eieio-speedbar.el (eieio-speedbar-create-engine):
+	Replaced `speedbar-line-path' with
+	`speedbar-line-directory' used since speedbar 0.15.
+
+2003-01-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-defclass): Better defsetf for accessors
+	(eieio-defgeneric): Initialize method tree via eieiomt-install.
+	Better error message when turning an existing function into a method.
+	(eieiomt-install): New function from eieiomt-add.
+	(eieiomt-add): Remove old install into eieiomt-install.
+	Assume tables are always available.
+
+	* eieio-tests.el (generic1): tests for defgeneric.
+
+	* eieio.el: Remove CL related hooks from end.  Just do it.
+	(eieio-defclass): Remove cl loading from hook of defclass.
+	Enable setf on set methods.
+	(eieio-defgeneric): Add comment about not repeating a task.
+	Add fake `defun' so that emacs can find methods.
+	(eieio-unbind-method-implemenations): Function to reset a symbol as a
+	method.
+
+2002-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Test cloning.
+	More equivalence tests on singletons.
+
+	* eieio.el (make-instance): Support symbol's as names of an object.
+	(describe-variable): Fix doc.
+
+	* eieio-opt.el (eieio-help-mode-augmentation-maybee):
+	Add an unused argument for
+	XEmacs compatibility.
+
+2002-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-add-new-field):
+	Support overriding the :initarg for subclasses.
+
+2002-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): 0.17.1
+	(eieio-defgeneric): Allow overwriting of an autoload.
+	(eieio-defmethod): Always call eieio-defgeneric.
+	(eieio-generic-call): If passed in arg 1 is an autoloaded symbol,
+	load it's file.
+
+2002-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el (eieio-describe-class):
+	Fixed display of commas between parents.
+	Handle STATIC keywords.
+	(eieio-describe-generic): Handle STATIC keywords.
+	(eieio-help-mode-augmentation-maybee): Highlight STATIC keywords.
+
+2002-08-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* linemark.el (linemark-go-face): light background, use green.
+
+	* linemark.el: Overlay compatibility layer moved.
+	(linemark-entry): Don't specify a type for faces
+	(linemark-group): Don't specify a type for faces
+	(linemark-display): Don't error if overlay deleted before class.
+	(enable-visual-studio-bookmarks): Doc fix.
+
+2002-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (constructor::eieio-singleton):
+	Fix to handle unbound case instead of nil.
+
+2002-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Add test for inheritance/overload and static methods.
+
+2002-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Removed compare-strings.el from distribution.
+
+	* eieio-base.el: Do not require `compare-strings'.
+
+2002-08-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Base Classes): Added `eieio-singleton' and `eieio-named'
+	(eieio-singleton): New section
+	(eieio-named): New section
+
+	* eieio.texi (Writing Methods):
+	Added information about :STATIC methods.
+
+	* Project.ede: Updated version number.
+
+2002-07-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* linemark.el (linemark-next-in-buffer):
+	Correctly start search when going backward.
+	(linemark-end): Fix doc.
+
+2002-06-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el ("cl-macs"): Load silently.
+	(eieio-defclass): Removed old bootstrapping messages.
+
+	* eieio-base.el (eieio-singleton): New class.
+	(constructor::eieio-singleton): New method.
+
+	* linemark.el (linemark-next-in-buffer):
+	Accounts for extra embedded overlays.
+	(linemark-begin, linemark-end): New methods.
+
+	* eieio-tests.el: Added messages to method dispatch test.
+	Added test for static methods.
+	Added test for the singleton.
+
+	* eieio-comp.el (byte-compile-file-form-defmethod):
+	Account for STATIC methods.
+
+	* eieio.el (method-static): New constant.
+	(eieio-defclass): Constructor now uses `constructor'.
+	(defmethod): doc fix.
+	(eieio-defmethod): Account for :STATIC descriptor.
+	(eieio-generic-call): Call STATIC methods on a class.
+	(eieiomt-add): Add STATIC methods into the dispatch tables.
+	(eieiomt-get): Renamed `tag' as `key'.
+	(eieio-generic-form): Renamed tag to key.
+	(constructor): New static method.
+
+2002-06-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* linemark.el (linemark-add-entry): Revamped to now take a prop list.
+	(linemark-new-entry): Use :filename.
+
+	* linemark.el (linemark-new-entry): Use &rest args
+
+	* linemark.el (linemark-entry): Made the overlay protected
+	(linemark-at-point, linemark-kill-buffer-hook): Use `linemark-entry-child-p'.
+	(linemark-add-entry): Call new method on group for new entries.
+	(linemark-new-entry): New function
+
+2002-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): Update version.
+
+	* eieio-opt.el (eieio-class-speedbar): Prevent repeated refreshes.
+	(eieio-class-button): Do not put a empty folder on classes w/ no subclasses..
+
+2002-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-speedbar.el (eieio-speedbar-make-tag-line):
+	Better support for tag buttons
+	(eieio-speedbar-child-make-tag-lines): Fix error text.
+	(eieio-speedbar-expand): Only do child lines if there are children.
+
+2002-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version change
+
+	* eieio.el (eieio-version): Update to beta4
+
+	* eieio.texi (Predicates): Updated slot-boundp.
+
+	* eieio-tests.el:
+	Added test for `eieio-build-class-alist' & new instantiable flag.
+
+	* eieio-opt.el (eieio-build-class-alist, eieio-read-class, eieio-read-subclass):
+	Added INSTANTIABLE-ONLY flag.
+
+	* eieio.el (class-abstract-p): New function
+	(eieio-default-superclass): Made abstract.
+
+	* eieio-opt.el (eieio-describe-class):
+	If a class is abstract, display so.
+
+	* eieio-speedbar.el: (eieio-speedbar, eieio-speedbar-directory-button)
+	(eieio-speedbar-file-button): made abstract.
+
+	* eieio-base.el: (eieio-instance-inheritor, eieio-instance-tracker)
+	(eieio-persistent, eieio-named): Made abstract.
+
+2002-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Test passing a CLASS into slot-boundp.
+
+	* eieio.el (eieio-oref-default): Fix bugs when a class is passed in.
+	(slot-boundp): Allow a class to be passed in w/ a static slot.
+
+2002-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi (Building Classes): Added :abstract option to doc.
+
+	* eieio-tests.el:
+	Fix test so it can be run multiple times in one session.
+	Added :class allocated slot `slot-boundp' tests.
+	Added :abstract class instantiation tests.
+
+	* eieio.el (defclass): Allow, and enable :abstract class keyword.
+	(eieio-defclass): Obey :abstract class keyword.  Do not allow instantiation.
+
+2002-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-require-version): New function.
+
+2001-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Added more complex make instructions for including SPEEDBAR.
+
+	* eieio-tests.el (class-alloc-initarg): New test class
+	(class-c): Fixed spelling error.
+
+2001-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-persistent): Added extension field.
+	(eieio-persistent-save-interactive): New method.
+
+2001-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el (chart-face-color-list): Fix to be ok on terminals.
+	(chart-face-pixmap-list): Allow to be disabled on terminals.
+	(chart-face-use-pixmaps): New option
+	(chart-axis-draw): For Y axis labels, push into the bar if they are
+	too long.
+
+	* eieio.el (eieio-defclass):
+	Warn if class allocated slot has an initarg.
+
+2001-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Updated version.
+
+	* eieio.el: Update version.
+
+	* chart.el (chart-translate-namezone):
+	Fixed up math to handle small cases.
+	(chart-axis-draw): Fixed up some math for very small cases, and
+	to fix some odd rounding problems.
+	(chart-goto-xy): Do not allow x or y < 0
+
+	* eieio-tests.el: Fixed protection typos.
+	Fixed and added protection test methods.
+
+2001-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el (chart-axis-draw):
+	If limits are too small, force increment to 1.
+
+2001-08-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-initializing-object): New state variable.
+	(eieio-field-originating-class-p): New predicate.
+	(eieio-field-name-index): Use `eieio-field-originating-class-p' for
+	private slots to see if access is allowed.  Initialization of a new
+	object is exempt from this test.
+	(eieio-set-defaults): Set `eieio-initializing-object' to true.
+
+2001-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el (eieio-object-value-get):
+	When calculating the new name, make sure the
+	class feature :eieio-show-name is used.
+	(eieio-object-value-get): Only set the new name to an edited object if
+	there is a new name.  (nil is thrown out.)
+
+2001-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Fixed the upload directory.
+
+	* Project.ede: Added linemark and ChangeLog.
+	Added web page links.
+
+	* linemark.el (linemark-funny-face): Reverse light/dark colors.
+	(linemark-next-in-buffer): Reverse argument direction for getting a fcn.
+
+	* eieio.texi: Add linemark to the documentation.
+
+2001-08-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* linemark.el:
+	First revision of Line Mark as a part of the EIEIO package.
+
+2001-08-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Fixed main menu.
+	Added doc about generic reflected in eieio CVS 1.111.
+
+	* eieio-tests.el:
+	Changed the method order test to reflect changes in eieio 1.111.
+
+	* eieio.el (eieio-generic-call-key): new variable
+	(eieio-generic-call): Only pull up generics if there is no specific.
+	Save the current key in `eieio-generic-call-key'.
+	(next-method-p): Use `eieio-generic-call-key'.
+	(call-next-method): Use `eieio-generic-call-key'.
+	If no next method is found, search for a generic, and call that.
+
+2001-07-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Added tests for :protection.
+
+	* eieio.el (eieio-defclass):
+	Support :private, :protected, :public keywords.
+	Store the actual type of protection in the protection slot instead of
+	a boolean.
+	(eieio-field-name-index): Support private and protected differences.
+
+	* eieio.texi: Added naming conventions chapter.
+	Fixed example that has :protection use to use proper values.
+
+2001-07-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added setf method for oref by Arnd Kohrs.
+
+2001-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Use :class instead of class for allocation of slots.
+	Added tests for lambda actually running at instantiation time.
+
+	* eieio.el (defclass): Doc fix.
+	(eieio-defclass): Throw error if :allocation is not :class or :instance.
+	Added :public and :private possible protection values.
+	Convert new class initializer to use backquote.
+	(eieio-add-new-field): For class allocated slots, eval the initform if
+	needed when type checking, and for storage.
+	(initialize-instance): Check default args, and eval any lambdas in the
+	new scope.
+
+	* eieio-speedbar.el:
+	Use `:class' instead of `class' for class allocated slots.
+
+	* eieio-base.el:
+	Use `:class' instead of `class' for class allocated slots.
+	More description for `eieio-persistent'
+
+2001-07-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el:
+	Added test to make sure new objects get changes from oset-default.
+
+	* eieio.el (eieio-oset-default):
+	When setting a default, be sure to change the object cache.
+
+2001-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el:
+	Changed all `obj-of-class' calls to `object-of-class' calls.
+
+2001-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (object-of-class):
+	new name from obj-of-class.  Alias of old name.
+	(object-slots): Was obj-fields.
+
+	* eieio.texi: Changed `obj-slots' to `object-slots'.
+	Changed `obj-of-class-p' to `object-of-class-p'.
+
+	* eieio-comp.el (eieio-byte-compile-princ-code):
+	Replace an XEmacs string match with featurep.
+
+2001-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Update version.
+	New URLS
+
+	* eieio.texi (slot-exists-p): Fixed to match source (takes class now.)
+
+	* eieio.el (eieio-defmethod): Fixed typeo w/ writer creation.
+	(slot-exists-p): Can now take an object, or a class.
+
+2001-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: By Daniel Pittman <daniel@rimspace.net>
+	(eieio-defmethod): Tried to fix `writer', fixed `reader'.
+	(with-slots): Assignment to slots will set values in the objects now.
+
+2001-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Let the test run multiple times in a row.
+	Added test for :type testing on children of classes defining the :type
+
+2001-05-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added a type for typep for new classes.
+	Funny inclusion of certain cl scripts.
+
+2001-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-version): 0.17beta1
+
+	* eieio-base.el (slot-missing:eieio-named):
+	Added :object-name as another slot-name.
+
+2001-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el (eieio-set-name-string): New fcn.
+
+	* eieio-tests.el: Added tests for eieio-named class.
+
+	* eieio-base.el (eieio-named): New class
+	(slot-missing:eieio-named): New method.
+
+2001-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el (eieio-instance-inheritor):
+	Set :type of parent-instance to be
+	`eieio-instance-inheritor-child'
+
+2001-04-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el:
+	Removed complex relative file generator in place of the built in function.
+
+	* eieio.el (class-p): Updated doc.
+	(eieio-defclass): When extracting slot description flags, use
+	`plist-get' instead of `member' (suggested by Richard Kim)
+	(make-instance): Updated doc about the use of class symbols.
+	(eieio-perform-slot-validation): Removed special class cases.
+	By using `CLASSNAME-child' instead of `CLASSNAME' for a :type
+	specifier, the same effect can be achieved.
+
+	* eieio-opt.el: Added `eieio-read-subclass' function.
+
+	* eieio-doc.el (eieiodoc-one-node):
+	Fixed texification of the doc string for the class.
+
+2001-04-24  Richard Y. Kim <ryk@ap.com>
+
+	* tree.el: Added autoload cookies for the three top level comands.
+	Also set `truncate-lines' to `t' in `tree-mode' function to prevent line-wrapping.
+
+2001-04-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el:
+	If a persistent write fails, make sure the user isn't asked about
+	killing the buffer that was temporarilly created for writing.
+
+2001-04-17  Richard Y. Kim <ryk@ap.com>
+
+	* call-tree.el: Added `;;;###autoload' for `call-tree'.
+
+2001-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el: Fix so that the chart-emacs-* commands work with XEmacs.
+
+	* eieio-tests.el: Add a require for eieio-base.
+
+	* eieio.texi: Rearranged some features in the feature list.
+	Removed invalid section about executing code at instantiation time
+	in a slot init form.  (Use initialize-instance method overload
+	insead.)
+	Varios other fixes.
+
+	* Project.ede: Rearranged the project file.
+	Added call-tree.el
+
+	* eieio-tests.el: Header comment update.
+	Fixed persistent test to save the file to the current directory.
+
+	* eieio-speedbar.el, eieio.el, eieio-opt.el: Header comment update.
+
+2001-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el, eieio-custom.el, eieio-comp.el:
+	Removed ftp site information.
+
+	* INSTALL: Added web page link.
+	Removed explicit version from load path explaination.
+
+	* eieio.texi: Fixed cross reference (xref) nodes to speedbar.
+	Fixed compile bugs.
+	Removed unwanted node from main menu.
+
+	* eieio.el:
+	Fixed eieio-oref-default to correctly accept a class symbol again.
+
+	* chart.el: Removed ftp location.
+	Added spaces to the commentary
+	Fixed the base chart to recalc width/height at object creation time,
+	not class creation time.
+
+	* tree.el, call-tree.el: Removed FTP location from comments.
+
+	* eieio.el:
+	(defclass) If the class already exists, recover child list for the new
+	class.  This preserves existing class hierarchies, and protects the
+	user from the simple act of re compiling.
+
+2001-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: Added tests for `make-instance'.
+
+2001-02-16  David Ponce  <david@dponce.com>
+
+	* compare-strings.el: Added a `provide' statement.
+	Fixed a nasty bug in the `let' statement which reinitialized the local
+	variables i1 an i2 to nil!
+
+2001-02-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Fixed `object-add-to-list' to force the value of a slot to a list if
+	it is not currently a list or nil.
+
+2001-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el:
+	`initialize-instance:eieio-instance-tracker' append new items to the
+	end of the list.
+
+2001-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* compare-strings.el: Compatibility code for compare-strings.
+
+	* Project.ede: Project file for EIEIO
+
+2001-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed doc for eieio-perform-slot-validation.
+
+2001-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: In eieio-defclass, move the creation of the test fn before
+	initializing slots.  This lets slots accept objects of the same type.
+	Fixed `make-instance' to take the correct arguments.
+
+	* eieio-tests.el: Test self-referencing classes.
+
+	* eieio-base.el: Compare Strings backwards compatible bit.
+
+2001-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* psql.el: Beginnings of conversion to pg.el postgres library.
+
+	* dbif.el: Various hacks I don't remember.
+
+2001-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added docs on some new base classes.
+
+	* eieio-tests.el: Added tests for some new base classes.
+
+	* eieio-base.el: Removed incompatible add-to-list call.
+
+2000-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el:
+	Added additional highlighting to classes and methods in *Help* buffers.
+
+2000-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el:
+	eieio-persistent-save.  Locally bind `default-directory' to the
+	directory part of the object being saved.
+
+2000-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el: Comment updates.
+
+	* eieio.el: Removed the base classes.
+
+2000-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-base.el: New file.
+
+	* eieio.el:
+	Fixed a bug in the eieio-persistent relative path generator.
+	Made lists of objects output in `write-object' prettier.
+
+2000-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added the class `eieio-instance-tracker'.
+	For this class, added `initialize-instance', `delete-instance', and
+	the function `eieio-instance-tracker-find'.
+
+	* eieio.texi: Added eieio-instance-tracker.
+
+	* eieio-speedbar.el: Fixed some documentation.
+
+2000-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added eieio-persistent object documentation.
+
+	* eieio.el:
+	Added eieio-persistent-read function for reading eieio-persistent objects.
+
+	* eieio.el: Added eieio-persistent as a new base class.
+
+2000-12-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added new Base Classes chapter.
+	Added sections for eieio-instance-inheritor, and eieio-speedbar.
+
+	* eieio.el:
+	Enable an initform to be a function symbol without evaling it.
+	Enable field tests to "eval" a function if needed.
+	Enable oref default, and field tests to convert `lambda-default'.
+	New function `eieio-default-eval-maybe'.
+
+	* eieio-tests.el: Added function type test.
+	Added instance inheritor test.
+
+2000-12-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added `eieio-instance-inheritor', plus `slot-unbound', and `clone' methods.
+
+2000-11-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	unbound-slot was using the wrong symbol for error conditions.
+	added `error' as a condition for invalid-slot-type and unbound-slot.
+
+2000-10-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el: Implement slot widget type for objects.
+	Fixed `eieio-object-value-get' which had bugs from the last check in.
+
+2000-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el: Enabled :slotofchoice specifier for custom types.
+
+2000-10-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed recent functions to use slot-boundp properly.
+
+	* eieio.texi: Added discussion about class use in oref.
+	Added doc for `object-add-to-list' and `object-remove-from-list'.
+
+	* eieio.el: Added `quotation' around generic method name in doc.
+	Oref now can take a class for referencing class allocating slot values.
+	Added new functions `object-add-to-list' and `object-remove-from-list'.
+	Added some doc to `object-unbound' discussing `slot-boundp'.
+
+2000-10-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added doc for the new class specifiers.
+
+2000-10-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el:
+	Added support for :objectcreatefcn as part of the widget.
+	Fixed `eieio-object-value-to-abstract' for insert into list case.
+
+	* eieio-custom.el:
+	Added an `accept' button to `apply' and `bury' the buffer.
+	Fixed the widget-get-value thingy so that it also handled the
+	group specifier.
+
+	* eieio-custom.el: Added `eieio-read-customization-group' function.
+	In `eieio-object-value-create', allow null master-group for all slots,
+	  Show list of groups, with buttons to switch groups.
+	In `eieio-customize-object', put group name into the customization buffer.
+	Add a cancel button attached to bury-buffer.
+
+2000-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed some custom-group settings.
+	Added custom-label to all areas of slots.
+
+	* eieio-custom.el:
+	Added support for specifying a group when customizing.
+	Fixed up display to not print "Slot", to show the group
+	being edited, and to use new custom labels.
+	Added new fn `eieio-customize-object-group' for use
+	with easymenu :filters.
+
+2000-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed another customgroup bug.
+
+	* eieio-speedbar.el:
+	Fixed bug with info lines at the end of the display.
+
+	* eieio.texi:
+	Added :group :custom-group, and `class-option' documentation.
+
+	* eieio.el: Fixed `class-option' macro.  Must not have been using it.
+
+	* eieio.el: Removed class slot `class-doc'.
+	Added class slots for `class-public-custom-group' and
+	  `class-class-allocation-custom-group'.
+	Added :group slot specifier.  This groups slots in a class.
+	Added :custom-groups class option.  Lists all groups in this class.
+	  This is created automatically from :group specifiers.
+	Normal doc is now stored in the :documentation class specifier.
+	All support work for slot groups.
+
+2000-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el: Require eieio-opt.
+
+	* eieio-tests.el: Comment test for functions in classes.
+
+	* eieio-custom.el: Added `customize-object' shortcut.
+
+	* eieio.el: Update version number.
+	Fixed doc of `generic-p'.
+	When cloning, allow passing in of a new name, and replacement arguments.
+	In `write-object', do not try to access unbound slots.
+	In `eieio-edebug-prin1-to-string', handle lists of objects.
+	Fixed edebug spec for with-slots.
+
+2000-09-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el:
+	Added `eieio-class-nuke' which calls `eieio-class', but deletes all
+	  text following the cursor.  Useful in ede doc files.
+	Updated `eieiodoc-one-node' to display methods belonging to each
+	  class.
+	Added `eieio-insert-and-massage-docstring-with-args' for method
+	  documentation strings, and @var ing arguments when they are in
+	  the doc string.
+	Force line break after Type: label in slot docs.
+	Fixed up `texify-string' regular expressions a little.
+
+	* eieio-opt.el:
+	Updated `eieio-method-documentation' to return the arg lists also.
+	Updated `eieio-describe-class' to show method arguments.
+	Added `eieio-lambda-arglist' for fetching args from a symbol.
+
+2000-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Removed some customize autoloads.
+
+	* eieio.el: Fixed creating of generic methods from byte-code.
+
+	* eieio.texi: Added @end table.
+
+	* eieio.texi: Replaced intro text.
+	Added scheduling details for defmethod.
+	Added class-children
+	Updated info about describing classes and generics.
+
+	* eieio-comp.el:
+	Added support for the :PRIMART tag, and fixed bug when parsing args.
+
+	* eieio-tests.el: Defvared all the variables.
+	Added test for the :BEFORE/:AFTER tags for methods, plus generics.
+
+	* eieio-speedbar.el:
+	Updated comment to specify the needed version of speedbar.
+
+	* eieio.el: Added :PRIMARY to defmethod docs, and interpretation.
+	Track the class for the first arg when making methods.
+	If there is no class for the first arg, then it is a generic.
+	Fixed error checking in `eieiomt-add'.
+	In `eieio-generic-form' return generics correctly.
+	Added autoloads for describe-generic.
+
+	* eieio-opt.el: Augment the help keymap.
+
+	* eieio.el: Fixed autoload.
+
+	* eieio-comp.el: Eval and compile compatibility code.
+
+	* eieio-comp.el: Comments
+
+	* eieio.el: Removed `eieio-rebuild-generic-doc-string'.
+	Don't call this function either.
+
+	* eieio-opt.el: Describe-class returns the text created.
+	eieio-read-class now takes a history variable, or uses a default one.
+	Added eieieo-describe-generic, and several aliases.  Copied from
+	the eieio-rebuild-doc-string for functions.
+	Added eieio-read-generic-p, and eieio-read-generic
+	The help system augmenter will now find generics, and reset
+	the function apropriatly.
+
+	* eieio-opt.el:
+	Build slot definitions in `describe-class'.  This is no longer handled
+	by defclass.  (Faster load times.)
+
+	* eieio.el:
+	Do not rebuild doc string for class.  Handle in `describe-class'.
+	Rebuilt all macros using backquote.
+
+	* eieio-opt.el: Added `eieio-help-mode-augmentation-maybee'.
+	Fixed up `describe-class' to contain a list of parents, children.
+	Fixed up `eieio-all-generic-functions' to only include functions
+	defined specifically for the given class.
+	Fixed up `eieio-method-documentation' to not throw errors for
+	pass-through memoized method symbols.
+
+	* eieio.el:
+	Added `class-children', and `class-children-fast' functions.
+	Added autoload for `eieio-help-mode-augmentation-maybee', and added
+	it to the hooks for help.
+	Added advice to `describe-variable'
+
+	* eieio.el: Move version number up near the Version keyword.
+
+	* eieio-custom.el: Added apply-reset button creating function.
+	Put them at the top and bottom of a direct-edit custom buffer.
+	Removed additional indentation of SLOT tag.
+	You can direct-customize the same object twice.
+
+2000-08-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed a slot-missing setting when initializing an object.
+	Changed the signal output from the `slot-missing' method.
+
+2000-08-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Moved eval and compile beginning part to after some variables.
+	Updated some comments.
+	Updated `eieio-validate-*slot-value' to take the field being checked.
+	This is only used when signaling an error.
+
+2000-07-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added in compatibility section for `compiled-function-arglist'.
+	Used `eieio-compiled-function-arglist' in `eieio-rebuild-generic-doc-string'.
+
+	* eieio.el:
+	Do not print bootstrap message if byte compiling, and verbosity is nil.
+	Added eieio-defgeneric-form, and used it in eieio-defgeneric from
+	whence it was pulled.  (Needed by the byte compiler.)
+	Eval and compile all of eieio (bootstrap itself w/ the byte compiler.)
+
+	* eieio-comp.el:
+	Use byte-compile-function-environment to quiet the byte compiler for methods.
+	Remove if statement around above.
+	Make sure this function returns nil!
+
+	* eieio-speedbar.el, eieio-opt.el: Byte compilation fixes.
+
+2000-07-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el: Added new unbound slot to test object.
+	Add protection from unbound slots. (ei, skip them)
+	Add purty cullers to slot titles, and object name.
+
+	* eieio.texi: Added doc about eieio-error-unsupported-class-tags
+
+	* chart.el: Convert old -engines to eieio- fns.
+
+	* eieio-comp.el: Call eieio-defmethod instead of defmethod-engine.
+	In `byte-compile-file-form-defmethod', if meth is not bound, call
+	eieio-defgeneric to create the function definition so that warnings
+	aren't thrown.  Next, remove the new method from the byte-compiler's
+	list of unresolved functions.
+
+2000-07-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-custom.el, eieio-doc.el:
+	Updated to have -engine calls switched to eieio- calls.
+
+	* eieio-tests.el: Added invalid slot tag testing.
+
+	* eieio.el: Added `eieio-error-unsupported-class-tags', then used it in
+	eieio-defclass to wrap a block that throws an error if a bad
+	tag is encountered.
+
+2000-04-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added needed autoload for typep (needed in Emacs21 CVS).
+
+	* eieio.el:
+	Renamed all occurances of *-engine to eieio-* to tidy up the namespace.
+
+1999-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Updated version number.
+
+	* eieio-speedbar.el:
+	Added methods with errors for eieio-speedbar objects which don't
+	implement non-object children.
+
+	* eieio-custom.el: Moved eieio-done-customizing
+
+1999-12-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el:
+	Changed all eieio-speedbar functions to eieio-class-speedbar to be
+	more specific.
+
+	* eieio.texi: Removed references to dbiff.
+
+	* eieio.el: Updated version number.
+
+	* eieio-speedbar.el:
+	buttonface's type is now (or symbol face). That way it will pass even
+	if speedbar hasn't been loaded yet.
+	Fixed comments at beginning.
+
+	* eieio.texi: Spell checked.
+
+	* eieio.el: Added eieio-version variable and test function.
+	Ran through checkdoc.
+
+	* eieio.texi: Various MI updates to slots.
+	Doc class-parents* functions which are new with MI.  Note that
+	class-parent is depricated.
+
+	* eieio.el: Update version number
+
+	* eieio-speedbar.el: Tweeked the default keymap and menu.
+
+	* eieio.el:
+	When building the test function for new classes, make sure it is an
+	object before calling the `same-class-p' primitive.  Also add new
+	primitive `-child-p' to test of an object inherits anything from a
+	class
+
+	* eieio-tests.el:
+	Added tests for auto-generated predicates for class objects.
+
+	* eieio-speedbar.el:
+	Line info for children is now derived from the parent object.
+	nearest-object will now calc depth if it is not provided.
+
+1999-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-tests.el: New file.
+
+1999-11-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed oset for class-slots w/ type validation.
+	Fixed call-next-method to only call the first method found.
+
+1999-11-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-speedbar.el: Fixed random crufty bugs.
+
+	* eieio-speedbar.el: New file.
+
+1999-11-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi:
+	Changed no-method-definition method to no-applicable-method.
+
+	* chart.el: Added initargs to some slots.
+
+	* eieio.el:
+	changed no-method-definition to no-applicable-method as per hyperspec.
+
+	* eieio.texi: Removed anti-multi-inheritance documentation.
+	Added docs on no-method-definition and no-next-method methods
+	and signals
+
+	* eieio.el:
+	If a method is not available for a given object, call the method
+	`no-method-definition' instead of signaling it.  This method calls the
+	signal.  Call signal directly iff there is no object to call on.
+
+	New function next-method-p If there is no next method, call the method
+	`no-next-method' which is a new primitive method which signals that
+	there is no next method.
+
+	Make  sure `call-next-method' returns the value of the last lambda
+	called.
+
+	Add new signal `no-next-method'
+
+1999-11-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed doc of slot-unboundp
+	eieiomt-next now returns a list of parents.
+	call-next-method, and the sym-optimizer now can handle the
+	list of parents when searching for methods.
+
+	* eieio.el:
+	Fixed defmethod-engine to keep parent classes in the same order.
+	Fixed child-of-class-p to work properly with MI.
+
+1999-09-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Fixed compile errors
+
+	* eieio.el: Removed "execessive info" in a doc string for find-class.
+
+1999-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi:
+	Updated to the latest version.  Changed all "field" words to "slot" to
+	be compatible with CLOS.
+
+1999-09-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-opt.el: Removed thing-to-string
+
+	* eieio-doc.el: Fixed checkdoc stuff.
+
+	* eieio-opt.el: eieio-describe-class): Completely revamped to use
+	the documentation (pre-built), and new generic apropoing functions.
+	(eieio-read-class): New function
+	(eieio-all-generic-functions): New functions
+	(eieio-method-documentation): New function
+	(eieio-describe-slots): Deleted
+
+1999-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Do not add a default to doc strings if it is unbound.
+
+	* eieio-doc.el:
+	Be careful about unbound slots when creating doc.  Just leave off the
+	default value.
+
+	* eieio.texi: Added set-slot-value details.
+	Fixed a slot-value example.
+
+	* eieio.el: Added `set-slot-value'
+
+	* eieio.texi: Added doc about unbound slots, and `slot-makeunbound' and
+	'slot-unboundp'.
+
+	* eieio.el: Added slot-makeunbound, and implemented slot-boundp
+
+	* eieio.el: Implemented unbound slots.  New variable eieio-unbound.
+	New function eieio-barf-if-slot-unbound.
+	New method slot-unbound.
+	Initialize uninitialized slits to the uninterned symbol unbound.
+	Call eieio-barf-if-slot-unbound when returning a slot value.
+
+	* eieio.el:
+	Fixed type check when identifying specific classes or object.
+	Fixed Doc to -of-class-p functions.
+
+1999-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added documentation about class-options.
+	Fixed typo about standard-object.
+
+	* eieio.el:
+	Added class-options, including :documentation, and :allow-nil-initform.
+	Make it possible to disable typechecking of initializers completely.
+
+	* eieio-doc.el:
+	Fixed up compiler warnings (the xref followed by , or . in RH 6.0)
+
+1999-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el: Fixed to work with new eieio forms.
+
+	* eieio-doc.el: Fixed a compiler warning.
+
+	* eieio-opt.el: Fixed compiler warnings.
+
+	* eieio.el: Fixed some compiler warnings.
+
+	* eieio-doc.el: Added the Type specifier into the documentation.
+
+	* eieio.texi: Added a few more details on differnces.
+	Added xref for :type specifier.
+
+	* eieio.el: Added find-class, and boolean-p.
+	Added in a few section break comments.
+
+	* eieio.el (eieio-rebuild-doc-string): Add type to output.
+
+	* eieio.el: Convert TYPE slot in class into a vector for faster access.
+	Do type checking in oset and oset-default.
+	Do type checking when building a class's default values.
+
+1999-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Updated the version number.
+
+	* eieio-doc.el:
+	Fixed to handle the new class structure.  Add doc for class allocated
+	slots.  Private is a slot attribute.
+
+	* eieio-opt.el: Fixed `describe' to handle the new class structure.
+
+	* eieio.el:
+	Removed several old defconsts, (all with PRIVATE in them) and added
+	several new ones (class-protection, and all with `allocation' in
+	them).
+	(defclass-engine): Updated to handle multiple parents.  Removed all
+	ref to private parts.  Extract class init from parent to function, and
+	loop over it.  Reverse end results of public attributes.  Store
+	private status in a list.  Store class allocated vector information.
+	(eieio-add-new-field, eieio-copy-parents-into-subclass):New functions.
+	(oref-engine, oref-default-engine, oset-engine, oset-default-engine):
+	Handle class allocated field referencing.
+	(class-parents, class-parents-fast): New functions.
+	(class-parent, class-parent-fast): Update to call plural version.
+	(child-of-class-p): Update to handle multiple parents.
+	(eieio-class-field-name-index): New function.
+	(eieio-rebuild-doc-string): Removed private field docing.  Added
+	private as a property of regular slots.  Doc class allocated slots.
+
+1999-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed for use under XEmacs 20.  Upgraded version number.
+
+1999-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added the function object-assoc-list-safe.
+
+1999-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Patch from Dave Love to create a function index.
+
+1999-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile.old: Fixed make of doc rule.
+
+	* eieio.el: Updated the version number.
+
+1999-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Updated the list print routine.
+
+	* eieio-custom.el:
+	Updated the slottype filter to find augmented repeating object types.
+	When a widget's value is nil, but it's type is object, create a new object
+	of type :objecttype.
+	Turn the object name into an editable field which works.
+
+1999-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Fixed build problem.
+
+	* eieio.texi: Fixed up some rough edges.
+
+	* Makefile.old: Added lisp examples into the dist.
+
+	* psql.el, dbif-browse.el: Ran through checkdoc.
+
+	* chart.el: Ran through checkdoc.  Enabled runing on terminals.
+
+	* eieio-custom.el: Tweak the display.
+
+	* dlg-class.el: constructor -> initialize-instance changes.
+
+	* dbif-browse.el: Ran through checkdoc.
+
+	* Makefile.old: Updated for custom, and better VERSION setting
+
+1999-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Removed history party.
+
+1999-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: More on customizing objects.
+
+	* widget-d.el: :docstring -> :documentation
+
+	* eieio-custom.el:
+	Added new generic method for when an object is 'applyd'
+	Added object-edit custom type filter so sub-objects are not cloned
+	in edit-in-place mode.
+	Added :clone-object-children widget tag for above.
+	Added some buffer-local variable defvars to hack compiler warnings.
+
+1999-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el, eieio-custom.el: Ran through checkdoc.
+
+1999-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Fixed up lots of doc bugs.
+	Added customizing node
+	Changed :docstring to :documentation
+	Lots of tweeks, and added lots of new slot specifiers.
+
+	* eieio.el: :docstring to :documentation
+	Added :documentation to the help on defclass.
+	Changed slot validation to cl-macs `typep' function.
+	Added symbols to the eieio code printer
+	Added eieio-custom autoloads.
+
+	* eieio-custom.el: Fixed up the two way customization.
+	Added `eieio-customize-object' and `eieio-custom-widget-insert'
+	functions as conveniences which are also methods for editing an object
+	`in place'.  fixed up the 'object widget to clone the object before
+	storage, so the in-place editor is safe.
+	Tweeked the display.
+
+1999-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tree.el: Updated to use with-slots
+
+	* eieio.texi:
+	Added introspection chapter.  @defuns for obj-fields, and class-slot-initarg.
+	Removed comments about adding more built ins for wishlist.
+	Removed constructor/destructor doc, and all quoted functions, and
+	descriptions with @defun text describing the new initialize-instance,
+	shared-initialize, clone, and print-object methods.
+	Added @defun for with-slots
+	Added @defun for slot-exists-p, and slot-boundp.
+	Added @defun class-of
+
+	* eieio-custom.el: New file.
+
+	* eieio.el: Added indentation style for `with-slots'
+	Added `condition-case' protection in object-assoc.
+	Return nil if no initarg is available in initarg-to-attribute
+	Fixed `slot-missing' standard method.
+	Added `clone' standard method.
+	Moved `destructor'.
+	Added space between list elements when outputting.
+
+1999-01-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed compile warning in slot-missing generic fn.
+
+	* eieio.el:
+	Rearranged class slot positions to add allocation, type, and custom.
+	Updated docs for new slot types.
+	Use const instead of a number when checking for a parent.
+	When creating a class, handle the new types of reader, writer, alloc,
+	type, and custom.
+	Implement generation of generic functions for the reader/writer slot.
+	Rebane `constructor' to `initialize-instance'
+	Change all applicable calls of (signale 'invalid-slot-name ...) to
+	(slot-missing) generic method.
+	Added `eieio-perform-slot-validation' and `eieio-validate-slot-value'
+	for use with the :type slot specifier.  Used it in oset.
+	Added `with-slots' (thanks Kevin Rodgers)
+	Added comment that class-name is wrong.
+	Added `obj-fields', `class-slot-initarg', `slot-boundp', and `slot-exists-p'
+	Removed `eieio-set-fields'.  It became the method `shared-initialize'.
+	Added signal `invalid-slot-type' when generating errors for
+	the :type slot parameter.
+	Create an alias for `standard-class' to eieio-default-superclass.
+	Implemented `object-write' to write out an object in such a way that
+	it can be read in.  This require the fns `eieio-override-prin1', and
+	`eieio-list-prin1'
+	Added function `change-class' with no implementation but an error.
+	Added edebug spec for with-slots
+	Added eieio-custom autoload.
+
+1998-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Removed a typo.
+
+	* eieio-opt.el:
+	When describing a class, do not print the PRIVATE section if there are
+	no private fields.
+	Added a speedbar mode for showing the current EIEIO class state.
+
+1998-10-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile.old: Added Makefile and info rules.
+
+	* tree.el, eieio.el, eieio-opt.el, eieio-doc.el, eieio-comp.el, dbif.el:
+	Ran through checkdoc.
+
+	* dbif-edit.el: New file.
+
+	* chart.el: Ran through checkdoc.
+
+	* call-tree.el: Removed stray provide
+
+	* call-tree.el: Ran through checkdoc.
+
+	* Makefile.old: New file.
+
+	* eieiocomp.el: Fixed for lack of widget stuff.
+
+	* eieio.el: Fixed documentation for defclass.
+	Fixed creation of object predicate.
+	Added object-assoc, object-assoc-list.
+
+	* eieio.texi: Removed all the widget references.
+
+	* eieio.texi:
+	Added association list stuff (object-assoc, object-assoc-list)
+	Fixed some spelling.
+
+1998-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* psql.el: Got it to work again
+
+1998-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Doc fixes.
+
+1997-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Added an object-write method to the super class.
+
+1997-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog.texi: Added disclaimer
+
+1997-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Made checkdoc compliant
+
+1997-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el:
+	Fixed char-space-usage to use generic du, not at a specific path.
+
+	* widget-d.el:
+	Text widgets now have handle-motion set to 'traditional for optimizations.
+
+	* dialog-mode.el:
+	Added maybe key optimization.  Widgets can now specify thier handle-motion
+	field as 'traditional.  Traditional movement is handled by dialog-mode unless
+	the motions exceeds the bounds of the widget.
+
+	* widget-i.el:
+	Text field widgets no longer put their object on the < and > buttons
+
+1997-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-class.el: A boundp should have been fboundp in data-valid-color-p
+
+1997-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog.texi: changed "Dialog" to "Dialog Mode" in title
+
+	* dlg-class.el, dlg-config.el:
+	changed the name of dialog.el to dialog-mode.el
+
+	* eieiocomp.el: New file.
+
+	* dialog-mode.el:
+	Renamed this file.  Added some comments, and fixed xemacs color loader
+
+1997-01-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-class.el, dialog-mode.el: Fixed typo
+
+	* dialog.texi: fixed the includes
+
+	* dialog.texi: Fixed @includes to new file names
+
+1997-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tree.el: Updated some documentation
+
+	* dialog-mode.el: Fixed up documentation.
+
+	* dlg-config.el: changed doc strings
+
+	* eieio-doc.el: fixed documentation strings
+
+1997-01-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Modified all doc strings to conform to standards.
+	Modified all cl things to be more robust when loading.
+	Added eieio-hook run whenever defmethod is called.
+
+1997-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* d-config.texi: Re ran doc generator
+
+	* d-widget.texi: Re-ran with new hierarchy
+
+	* dialog.texi, eieio.texi: Updated.
+
+1997-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Iffed out imenu for XEmacs
+
+	* e-config.el:
+	Added XEmacs specific checks, including completely disableing those
+	dialogs which make no sense there.
+
+	* dlg-config.el:
+	Added XEmacs specific fixes, particularly around face/font management.
+	Make dlg-bunch-of-simple-toggles smart enough to throw out variables
+	which are not bound.
+
+	* dlg-class.el:
+	Added XEmacs specific fixes, particularly around face/font management
+	and lack of working replace-match
+
+1997-01-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-config.el:
+	Added help button to config frame.  Added new info button.  Added help
+	functions to all buttons which didn't already have help.  Updated
+	string-to-list functions to be more configurable.
+
+	* dlg-class.el:
+	Fixed bugs with data-object-symbol's edit-config-file method when
+	dealing with `nil' as a list
+
+	* e-config.el:
+	Updated to fix bugs found when testing the auto-edit feature.
+
+	* ecfg-menu.el:
+	Added new menu items for ange-ftp, dired, citation, bookmarks, and
+	ispell.  Added the autoload calls.  Made submenu for mail related
+	items.
+
+	* e-config.el:
+	Turned all blocks of toggles into dlg-bunch-of-simple-toggles calls,
+	and added many new dialog boxes including ange-ftp, dired, citation,
+	bookmarks, and ispell.  Added calls to the new dlg-info-button, took
+	advantage of the new widget-help system in many places.
+
+1997-01-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el: Added mode line modifications for dialog mode
+
+1997-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* widget-i.el, widget-d.el: Added support for widget level help
+
+	* dlg-config.el:
+	Specialized routines to help build configuration dialog boxes.
+
+	* dlg-class.el: Specialized classes for editing configuration items in.
+
+	* dialog-mode.el: Added support for widget-level help
+
+1997-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el:
+	Fixed compile bugs by moving some things around, and adding some
+	parameters or comments
+
+	* e-config.el: Fixed bug in postscript
+
+	* dlg-config.el: Changes to string-to-list
+
+	* dlg-class.el:
+	Added new translated version of data-object-symbol (user defined
+	translation)
+
+1997-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el, chart.el:
+	Added check so this file can be byte-compiled in batch mode
+
+1996-12-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added special command to update the lisp keywords to include
+	defmethod.
+
+1996-12-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-config.el:
+	Added a couple utility functions for use with the specialized data
+	objects
+
+	* widget-i.el: Fixed up option-text widget to be more reliable
+
+	* e-config.el: Fixed a few bugs, added lots of ps-print stuff
+
+1996-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	More XEmacs support, and fewer byte-compiler errors.  XEmacs now finds
+	background mode more reliably.
+
+	* eieio-doc.el: comment change
+
+	* eieio-opt.el: doc change
+
+	* eieio-comp.el:
+	Fixed XEmacs but when printing code with reference byte-code in it.
+
+	* widget-i.el:
+	Added some speed optimizations.  Fixed geometry management for groups
+	with no children.  Mouse yank in text fixed.  Title added to popup
+	menus on option buttons.  Fixed spelling.
+
+	* widget-d.el:
+	Spelling fixes.  Added :title to option button to customize menu title
+	and prompt string.
+
+	* eieio.el:
+	Fixed spelling all over.  Fixed some compiler warnings.  Added hack to
+	make edebug print objects and classes nicely.
+
+1996-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added new constants for inicies into classes and objects which were
+	not there before.
+	Fixed problems with lambda-default.  It behaves like lambda, except it
+	has `lambda-default' as the first symbol instead.
+
+1996-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio-doc.el: Fixed string to tex function and some comments
+
+	* eieio.texi:
+	Added updated information about call-next-method's new parameter
+
+	* widget-d.el:
+	Modified widget-text-field to maintain 2D scrolling info.
+	Added widget-text-box, widget-scrolled-text, widget-combo-box,
+	widget-arrow-button.
+	Updated widget-scale and widget-scrollbar so they worked.
+
+	* eieio.el: Added `replacement-args' to call-next-method
+	Added new method off default superclass for printing objects with a
+	summary
+
+	* dialog-mode.el: Added some keyboard bindings
+	Made dialog-refresh smarter
+	changed dialog-test
+
+	* eieio-opt.el: New file.
+
+	* widget-i.el:
+	Added giant text-widget speedups (redraw-smarts, value-cache)
+	Added multi-line text widgets
+	Added data-object `object-print' method
+	Finished Scrollbars & scales, added arrow-button
+	Created combo-box (text and option button combo)
+	Created scrolled text (scrollbar/multi-line text combination)
+
+1996-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Fixed up comments describing the object.
+	Added new default-object cache.  (Major speedup)
+	Fixed object-p to be faster
+	Fixed the signal for no method
+	Fixed lambda-default to work as documented under newer default scheme
+	When printing, the method tree is reversed so that they appear as
+	created.
+
+1996-11-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	Updated some key bindings, and fixed up the demo some.
+	dialog-build-group can now accept a string as the group, and it will
+	auto make a frame with that label
+
+	* dlg-class.el: fixed docstrings so they could be used in the manual.
+	Fixed data-object-command-option which was broken.  (Was evaluating a
+	string, not actually reading the string into a list first)
+
+	* eieio-comp.el: Fixed the comments
+
+	* eieio.el: Moved all browsing commands into eieio-opt.el
+	Added the eieio-attribute-to-initarg command
+	Changed oref-default-engine to accept a class as well as an object.
+
+	* widget-d.el:
+	Updated all the documentation so it was good enough for the texinfo
+	file
+
+	* eieio.texi:
+	Added notes about the new eieiodoc-class command for creating
+	documentation about classes in texinfo cross-referenced format
+
+	* d-widget.texi, d-dataobj.texi, d-config.texi: Fixed typo
+
+1996-11-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* d-config.texi, d-dataobj.texi, eieio-doc.el, dialog.texi, d-widget.texi:
+	New file.
+
+1996-11-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi:
+	Added documentation referring to the 0.8 upgrade (see eieio.el)
+
+1996-11-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added a new warning message when there is no method implementations,
+	and created new signal symbols no-method-definition and
+	invalid-slot-name.
+
+	* eieio.el:
+	Translated several things into macros, and fixed a bug in (call-next-method)
+	which ignored the superclass
+
+	* dlg-class.el:
+	Created more smart defaults to use the object name as the symbol or
+	command if needed.  Added feature to string-to-int to protect against
+	floating point numbers if needed.
+
+	* e-config.el:
+	Updated all widget and data-object initializers to use the new smart
+	defaults
+
+	* ecfg-menu.el: mail and rmail were split
+
+1996-11-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-config.el:
+	changed the dlg-init box to handle a new parameter, and take up less
+	space (4 lines minimum now.)
+
+	* e-config.el:
+	Added use of new dlg-init parameterer, and made radio-box in rmail
+	better
+
+1996-11-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* widget-i.el:
+	Upgraded box-drawing, and added some smarter geometry management
+
+	* dialog-mode.el: Added a bunch of xemacs support
+
+	* widget-i.el: Fixed some xemacs specific bugs and/or errors
+
+	* eieio.el: Moved byte-compiler specific stuff into a different file.
+	Added more edebug specs for all the different macros, and fixed the
+	one for defmethod.
+
+	* eieio-comp.el: New file.
+
+1996-11-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Fixed how classes are created so that defmethod can be called when
+	creating accessors.
+
+	* dlg-class.el:
+	Added or updated constructors of different types.  Fixed -list-index
+	section replacemet routine.
+
+	* widget-d.el: Added widget-gadget-translator type
+
+	* widget-i.el: Added gadget-translator type.
+	Added optimization for getting values from previous widget.
+	Added checks in resizers to avoid non-visual widgets
+	Labeled text now defaults it's label to it's name if none is given
+	Labels reverse-reference their data objects
+
+	* e-config.el: Updated to use the new widget smart defaults
+
+1996-11-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	Created new dialog-current-parent for use with dialog-build-group.
+	Fixed color maker.  Adjusted top-level-shell's init paramters
+	Added neat indent properties to -width-writeable macro
+	Added dialog-last-maybe-command variable to make maybe command
+	frieldlier to commands that like to know when they are repeating themselves.
+	Made create-widget not take a parameter, but be backward compatible still.
+	Deleted widget-bunch-o-chars.
+	changed dialog-test.
+
+	* dlg-class.el: New file.
+
+	* dlg-config.el: Removed all class definitions to dlg-class.el
+	Updated widget-creators to use new defaults from dialog set.
+
+	* widget-i.el:
+	Removed all old `get-*' routines, and made the accessors in widget-d
+	Created new heuristic defaults for x and y.
+	negative offsets are now `box' smart.
+	Boxed widgets can now have selected sides turned on or off.
+	Group size calculator is now box smart.
+	Gave new smart defaults to frame's label, and label's label.
+	Added widget-labeled-text implementation (verify only)
+	Added widget-push-button implementation (verify only)
+	Fixed radio box button init bug
+	Replaced occurances of `widget-bunch-o-chars' with make-string
+
+	* widget-d.el:
+	Added load hooks for widget-d file.  Started using accessors.
+	Changed initforms of x, y.  Added resizeable flag to visuals
+	Changed protection of boxed.   Added box-sides.
+	Created new widget-labeled-text group for text fields with labels.
+	Created new widget-push-button, to be used instead of widget-button
+	which now acts as a basic type from which other buttons inherit.
+	Added justification default for option button.
+
+	* eieio.el: Fixed :accessor part in class declaration to use methods.
+	Fixed some doc strings.  Added lisp indenting and compiling tags to
+	some symbols.  Created oset-default to set default values in existing
+	classes.  Added object-name-string function.
+
+1996-10-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: Removed all reference to classmethods
+
+1996-10-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* widget-d.el:
+	Added use of normalized coordinates to visuals.  Added handle-motion
+	for widgets which want to use motion keystrokes (up, down, etc)
+
+	* widget-i.el:
+	Fixed repetitive geometry management call (ick). Fixed frame label
+	positioning.  Fixed mouse-color over option & toggle button types.
+	Fixed cursor positioning over clicked buttons.  Removed recursive
+	input dispatching.  Added ability to create children at the beginning
+	of a list.
+
+	* dialog-mode.el: Moved geometry management to after construction phase
+
+1996-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	Implemented a new keyboard scheme with `maybe' keys, which will
+	execute commands from global map unless a widget is requireing those
+	keys.  At this time, the text widget grabs arrow keys for motion, but
+	otherwise they are used to navigate around the dialog box.
+
+	* widget-i.el: Upgraded some widget input to handle new keyboard scheme
+
+	* eieio.el: Fixed XEmacs related byte compilation errors
+
+	* widget-i.el: Fixed byte compilation errors associated with XEmacs
+
+1996-10-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Added the ability to byte compile methods using moder emacs lisp
+	byte-compiler
+
+	* dlg-config.el, e-config.el, chart.el, dbif-browse.el, widget-i.el:
+	Fixed byte-compile warnings
+
+1996-09-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* widget-i.el:
+	Text widget now attaches itself into a text property for faster access
+	by dialog mode.
+
+	* dialog-mode.el:
+	Added a way to make input bypass the recursive pass-in using nifty
+	text properties.
+
+1996-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	Tried to add some xemacs support, and started using some features of
+	regular emacs
+
+	* widget-i.el:
+	fixed some event management, and added a little xemacs support
+
+1996-09-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* e-config.el, ecfg-menu.el: New file.
+
+	* widget-d.el:
+	Added navigation list to toplevel shell, and added label list to labes
+	for multi-line labels
+
+	* widget-i.el:
+	Added ability in all widgets to handle symbol input events.  Labels
+	can now display multi-line strings. (thus, buttons can do multiline
+	strings.)  toplevel shell now creates a navigation list so TAB and
+	M-TAB now navigate widgets forwards and backwards quickly, without
+	complex tree searches.  This also speeds up general group input
+	distribution.
+
+	* dialog-mode.el:
+	Dialog can now load if the current font does not support bold or
+	italic.  Added smarter keymap handlers for symbols as well as
+	characters and event.  Added meta map, so all meta commands now work
+	in text fields.  Fixed dialog-test to not quit whenever alternate
+	buffer is shown, and to use positioning deltas
+
+	* dlg-config.el:
+	Added many new data objects which know how to save themselves as
+	symbols, hooks, disabled-commands, string-numbers, packages etc.  Also
+	added the ability to save themselves into a file, either the
+	.Xdefaults, or .emacs file.
+
+1996-08-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* widget-i.el:
+	Added verification speedups for rectangles, and relational positioning
+	updates.  Added option buttons, and help clicks for all buttons.
+
+	* widget-d.el: Added documentation strings to every field as apropriate
+
+	* eieio.el:
+	Added additional documentation support, and speedups using obarrays
+	instead of association lists.
+
+1996-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-config.el:
+	Added commands needed to display the automatic edits in a
+	configuration file.
+
+	* dialog-mode.el:
+	Added many keymap upgrades, some in the hope of getting xemacs to
+	work.  Also added many color loaders.
+
+1996-08-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Added new node describing the sample programs.
+
+1996-08-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dlg-config.el: New file.
+
+1996-07-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dialog-mode.el:
+	Made a better keymap, added specialized color loader for specialized
+	faces, and updated the test case
+
+	* widget-i.el:
+	Updated many behaviors, new faces, and added some methods to some
+	new widgets
+
+	* widget-d.el: Updated some classes, and added a few new ones.
+
+	* eieio.el:
+	Added big speedup to method execution by using a more intelligent
+	storage system
+
+1996-06-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi: Udated for newer version of eieio
+
+	* widget-d.el:
+	Moved some items out of private hands so that they can be worked with
+
+	* dialog-mode.el:
+	Fixed insert-overwrite-face so it uses text properties and not overlays
+	Fixed dialog-test so some of the faces really exist.
+
+	* widget-i.el: Fixed groups so that TAB navigates
+	Fixed buttons to use mouse face to make it more efficient
+
+1996-06-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* call-tree.el: New file.
+
+1996-06-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el:
+	Fixed comments in beginning, and added accessors, and attempts at
+	using setf with cl.el
+
+	* psql.el:
+	Updated many parts to manage the problems created with \\ in lisp
+	strings
+
+1996-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* psql.el: Added changes allowing a field to be blank.
+
+1996-04-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tree.el:
+	Added ability to change where a parent node appears (top. bottom,
+	middle) of children nodes.
+
+	* eieio.el:
+	Added speedup by attaching symbols to class names with values being
+	indexes into an object.
+
+1996-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dbif-browse.el: Removed errant function
+
+	* eieio.texi: Updated documentation
+
+	* tree.el: Added more comments, plus eieio-class-tree
+
+	* widget-i.el, widget-d.el, dialog-mode.el, dialog-tree.el: New file.
+
+	* eieio.el: *** empty log message ***
+
+	* psql.el, dbif.el, dbif-browse.el: New file.
+
+1996-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* chart.el: New file.
+
+1996-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.el: *** empty log message ***
+
+1996-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tree.el: Forgot to update version
+
+	* tree.el:
+	Added some more useful functions, converted classmethods to CLOS
+	methods, and discovered "make-string" which speeds up drawing
+
+	* eieio.el: Added defgeneric, defmethod and support routines
+
+	* eieio.texi:
+	Added details surrounding defgeneric and defmethod.  Updated wish list
+	et. all
+
+1996-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* eieio.texi, tree.el, eieio.el: New file.
+
diff --git a/site/cedet-1.0pre7/eieio/INSTALL b/site/cedet-1.0pre7/eieio/INSTALL
new file mode 100644
index 0000000..e7e6dc9
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/INSTALL
@@ -0,0 +1,14 @@
+Installation instructions for EIEIO
+
+The following updates to your .emacs file will help you get the most out of this
+update of eieio.
+
+1) Byte compile EIEIO
+2) Add eieio's directory to your load path.
+
+   Follow the INSTALL file in the top level of this distribution.
+
+3) To send bug reports, or participate in discussions about semantic,
+   use the mailing list cedet-eieio@@sourceforge.net via the URL:
+
+   http://lists.sourceforge.net/lists/listinfo/cedet-eieio
diff --git a/site/cedet-1.0pre7/eieio/Makefile b/site/cedet-1.0pre7/eieio/Makefile
new file mode 100644
index 0000000..1c7e5fd
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/Makefile
@@ -0,0 +1,111 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+EMACS=emacs
+LOADPATH= ../common/  ../speedbar/
+LOADDEFS=eieio-loaddefs.el
+LOADDIRS=.
+init_LISP=eieio-load.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+eieio_LISP=eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el eieio-base.el eieio-datadebug.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+ELISPPRELOAD= cedet-compat
+examples_LISP=chart.el eieio-speedbar.el linemark.el lmcompile.el
+eieio_info_TEXINFOS=eieio.texi
+MAKEINFO=makeinfo
+test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el
+Misc_MISC=INSTALL ChangeLog NEWS
+VERSION=1.2
+DISTDIR=$(top)eieio-$(VERSION)
+
+
+
+all: autoloads init eieio examples eieio.info
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: eieio
+eieio: $(eieio_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: examples
+examples: $(examples_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+eieio.info: $(eieio_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+.PHONY: test
+test: $(test_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+Misc: 
+	@
+
+tags: 
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: autoloads eieio.info
+	mkdir $(DISTDIR)
+	cp eieio-loaddefs.el $(init_LISP) $(eieio_LISP) $(examples_LISP) $(eieio_info_TEXINFOS) eieio.info* $(test_LISP) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/eieio/NEWS b/site/cedet-1.0pre7/eieio/NEWS
new file mode 100644
index 0000000..8604e6b
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/NEWS
@@ -0,0 +1,61 @@
+History of changes made to EIEIO
+
+
+Changes in EIEIO Version 1.1
+
+* Method `no-applicable-method' now has extra arguments which are
+  the arguments passed into the method with no-applicable-method.
+
+* `class-direct-superclasses', `class-direct-subclasses' are new CLOS
+   compatible aliases.
+
+* data-debug support
+  EIEIO now has support for the data-debug arbitrary data display tool.
+
+* Documentation Changes
+
+** The doc has been overhauled from Richard's comments.
+
+
+Changes In EIEIO Version 1.0
+
+* Method Invocation Changes
+  Several changes have been made to method invocation to make it more
+  compatible with CLOS.  These changes may be incompatible with
+  previous versions of EIEIO.
+
+** :BEFORE and :AFTER methods cannot call `call-next-method' anymore.
+
+** All inherited :BEFORE and :AFTER implementations are called for
+   each method call, with the most specific methods being called
+   first.
+
+** You can now call a :STATIC method by passing in an object as well
+   as a class.
+
+** accessor methods for :class allocated slots are now :static methods.
+
+* Linemark Changes
+
+** Allow creation of marks in files that are not associated with a file.
+
+** Linemark faces have changed slightly.
+
+** viss-bookmark changes
+
+*** You can clear bookmarks in bufferes not assocated with files.
+
+* lmcompile.el - new demo program for linemark.
+
+* Documentation Changes
+
+** Richard Stallman provided advice for the EIEIO manual.  This has
+   been appended to the end of the manual as a comment to be dealt
+   with.
+
+
+Local variables:
+mode: outline
+paragraph-separate: "[ 	]*$"
+end:
+
diff --git a/site/cedet-1.0pre7/eieio/Project.ede b/site/cedet-1.0pre7/eieio/Project.ede
new file mode 100644
index 0000000..60cfefb
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/Project.ede
@@ -0,0 +1,57 @@
+;; Object eieio
+;; EDE project file.
+(ede-proj-project "eieio"
+  :name "eieio"
+  :version "1.2"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "eieio-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("eieio-load.el")
+    )
+   (ede-proj-target-elisp "eieio"
+    :name "eieio"
+    :path ""
+    :source '("eieio.el" "eieio-comp.el" "eieio-opt.el" "eieio-custom.el" "eieio-doc.el" "eieio-base.el" "eieio-datadebug.el")
+    :versionsource '("eieio.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("speedbar" "data-debug")
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-elisp "examples"
+    :name "examples"
+    :path ""
+    :source '("chart.el" "eieio-speedbar.el" "linemark.el" "lmcompile.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-makefile-info "eieio.info"
+    :name "eieio.info"
+    :path ""
+    :source '("eieio.texi")
+    )
+   (ede-proj-target-elisp "test"
+    :name "test"
+    :path ""
+    :source '("eieio-tests.el" "eieio-test-methodinvoke.el" "eieio-perftest.el")
+    :partofall 'nil
+    )
+   (ede-proj-target-makefile-miscelaneous "Misc"
+    :name "Misc"
+    :path ""
+    :source '("INSTALL" "ChangeLog" "NEWS")
+    :partofall 'nil
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/eieio.shtml"
+  :web-site-directory "/r@scp:shell.sourceforge.net:cedet/htdocs"
+  :web-site-file "eieio.shtml"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :configuration-variables 'nil
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/eieio/chart.el b/site/cedet-1.0pre7/eieio/chart.el
new file mode 100755
index 0000000..bdcef95
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/chart.el
@@ -0,0 +1,758 @@
+;;; chart.el --- Draw charts (bar charts, etc)
+
+;;; Copyright (C) 1996, 1998, 1999, 2001, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; Version: 0.2
+;; RCS: $Id: chart.el,v 1.19 2009/03/28 13:04:10 zappo Exp $
+;; Keywords: OO, chart, graph
+;;                                                                          
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;;   This package is an experiment of mine aiding in the debugging of
+;; eieio, and proved to be neat enough that others may like to use
+;; it.  To quickly see what you can do with chart, run the command
+;; `chart-test-it-all'.
+;;
+;;   Chart current can display bar-charts in either of two
+;; directions.  It also supports ranged (integer) axis, and axis
+;; defined by some set of strings or names.  These name can be
+;; automatically derived from data sequences, which are just lists of
+;; anything encapsulated in a nice eieio object.
+;;
+;;   Current example apps for chart can be accessed via these commands:
+;; `chart-file-count'     - count files w/ matching extensions
+;; `chart-space-usage'    - display space used by files/directories
+;; `chart-emacs-storage'  - Emacs storage units used/free (garbage-collect)
+;; `chart-emacs-lists'    - length of Emacs lists
+;; `chart-rmail-from'     - who sends you the most mail (in -summary only)
+;;
+;; Customization:
+;;
+;;   If you find the default colors and pixmaps unpleasant, or too
+;; short, you can change them.  The variable `chart-face-color-list'
+;; contains a list of colors, and `chart-face-pixmap-list' contains
+;; all the pixmaps to use.  The current pixmaps are those found on
+;; several systems I found.  The two lists should be the same length,
+;; as the long list will just be truncated.
+;;
+;;   If you would like to draw your own stipples, simply create some
+;; xbm's and put them in a directory, then you can add:
+;;
+;; (setq x-bitmap-file-path (cons "~/mybitmaps" x-bitmap-file-path))
+;;
+;; to your .emacs (or wherever) and load the `chart-face-pixmap-list'
+;; with all the bitmaps you want to use.
+
+(require 'eieio)
+
+;;; Code:
+(defvar chart-map nil "Keymap used in chart mode.")
+(if chart-map
+    ()
+  (setq chart-map (make-sparse-keymap))
+  )
+
+(defvar chart-local-object nil
+  "Local variable containing the locally displayed chart object.")
+(make-variable-buffer-local 'chart-local-object)
+
+(defvar chart-face-list nil
+  "Faces used to colorize charts.
+List is limited currently, which is ok since you really can't display
+too much in text characters anyways.")
+
+(defvar chart-face-color-list '("red" "green" "blue"
+				"cyan" "yellow" "purple")
+  "Colors to use when generating `chart-face-list'.
+Colors will be the background color.")
+
+(defvar chart-face-pixmap-list
+  (if (and (fboundp 'display-graphic-p)
+	   (display-graphic-p))
+      '("dimple1" "scales" "dot" "cross_weave" "boxes" "dimple3"))
+  "If pixmaps are allowed, display these background pixmaps.
+Useful if new Emacs is used on B&W display")
+
+(defcustom chart-face-use-pixmaps nil
+  "*Non-nil to use fancy pixmaps in the background of chart face colors."
+  :group 'eieio
+  :type 'boolean)
+
+(if (and (if (fboundp 'display-color-p)
+	     (display-color-p)
+	   window-system)
+	 (not chart-face-list))
+    (let ((cl chart-face-color-list)
+	  (pl chart-face-pixmap-list)
+	  nf)
+      (while cl
+	(setq nf (make-face (intern (concat "chart-" (car cl) "-" (car pl)))))
+	(if (condition-case nil
+		(> (x-display-color-cells) 4)
+	      (error t))
+	    (set-face-background nf (car cl))
+	  (set-face-background nf "white"))
+	(set-face-foreground nf "black")
+	(if (and chart-face-use-pixmaps
+		 pl
+		 (fboundp 'set-face-background-pixmap))
+	    (condition-case nil
+		(set-face-background-pixmap nf (car pl))
+	      (error (message "Cannot set background pixmap %s" (car pl)))))
+	(setq chart-face-list (cons nf chart-face-list))
+	(setq cl (cdr cl)
+	      pl (cdr pl)))))
+
+(defun chart-mode ()
+  "Define a mode in Emacs for displaying a chart."
+  (kill-all-local-variables)
+  (use-local-map chart-map)
+  (setq major-mode 'chart-mode
+	mode-name "CHART")
+  (buffer-disable-undo)
+  (set (make-local-variable 'font-lock-global-modes) nil)
+  (font-lock-mode -1)
+  (run-hooks 'chart-mode-hook)
+  )
+
+(defun chart-new-buffer (obj)
+  "Create a new buffer NAME in which the chart OBJ is displayed.
+Returns the newly created buffer"
+  (save-excursion
+    (set-buffer (get-buffer-create (format "*%s*" (oref obj title))))
+    (chart-mode)
+    (setq chart-local-object obj)
+    (current-buffer)))
+
+(defclass chart ()
+  ((title :initarg :title
+	  :initform "Emacs Chart")
+   (title-face :initarg :title-face
+	       :initform 'bold-italic)
+   (x-axis :initarg :x-axis
+	   :initform nil )
+   (x-margin :initarg :x-margin
+	     :initform 5)
+   (x-width :initarg :x-width
+	    )
+   (y-axis :initarg :y-axis
+	   :initform nil)
+   (y-margin :initarg :y-margin
+	     :initform 5)
+   (y-width :initarg :y-width
+	    )
+   (key-label :initarg :key-label
+	      :initform "Key")
+   (sequences :initarg :sequences
+	      :initform nil)
+   )
+  "Superclass for all charts to be displayed in an emacs buffer")
+
+(defmethod initialize-instance :AFTER ((obj chart) &rest fields)
+  "Initialize the chart OBJ being created with FIELDS.
+Make sure the width/height is correct."
+  (oset obj x-width (- (window-width) 10))
+  (oset obj y-width (- (window-height) 12)))
+
+(defclass chart-axis ()
+  ((name :initarg :name
+	 :initform "Generic Axis")
+   (loweredge :initarg :loweredge
+	      :initform t)
+   (name-face :initarg :name-face
+	      :initform 'bold)
+   (labels-face :initarg :lables-face
+		:initform 'italic)
+   (chart :initarg :chart
+	  :initform nil)
+   )
+  "Superclass used for display of an axis.")
+
+(defclass chart-axis-range (chart-axis)
+  ((bounds :initarg :bounds
+	   :initform '(0.0 . 50.0))
+   )
+  "Class used to display an axis defined by a range of values")
+
+(defclass chart-axis-names (chart-axis)
+  ((items :initarg :items
+	  :initform nil)
+   )
+  "Class used to display an axis which represents different named items")
+
+(defclass chart-sequece ()
+  ((data :initarg :data
+	 :initform nil)
+   (name :initarg :name
+	 :initform "Data")
+   )
+  "Class used for all data in different charts")
+
+(defclass chart-bar (chart)
+  ((direction :initarg :direction
+	      :initform vertical))
+  "Subclass for bar charts. (Vertical or horizontal)")
+
+(defmethod chart-draw ((c chart) &optional buff)
+  "Start drawing a chart object C in optional BUFF.
+Erases current contents of buffer"
+  (save-excursion
+    (if buff (set-buffer buff))
+    (erase-buffer)
+    (insert (make-string 100 ?\n))
+    ;; Start by displaying the axis
+    (chart-draw-axis c)
+    ;; Display title
+    (chart-draw-title c)
+    ;; Display data
+    (message "Rendering chart...")
+    (sit-for 0)
+    (chart-draw-data c)
+    ;; Display key
+    ; (chart-draw-key c)
+    (message "Rendering chart...done")
+    ))
+
+(defmethod chart-draw-title ((c chart))
+  "Draw a title upon the chart.
+Argument C is the chart object."
+  (chart-display-label (oref c title) 'horizontal 0 0 (window-width)
+		       (oref c title-face)))
+
+(defmethod chart-size-in-dir ((c chart) dir)
+  "Return the physical size of chart C in direction DIR."
+  (if (eq dir 'vertical)
+      (oref c y-width)
+    (oref c x-width)))
+
+(defmethod chart-draw-axis ((c chart))
+  "Draw axis into the current buffer defined by chart C."
+  (let ((ymarg (oref c y-margin))
+	(xmarg (oref c x-margin))
+	(ylen (oref c y-width))
+	(xlen (oref c x-width)))
+    (chart-axis-draw (oref c y-axis) 'vertical ymarg
+		     (if (oref (oref c y-axis) loweredge) nil xlen)
+		     xmarg (+ xmarg ylen))
+    (chart-axis-draw (oref c x-axis) 'horizontal xmarg
+		     (if (oref (oref c x-axis) loweredge) nil ylen)
+		     ymarg (+ ymarg xlen)))
+  )
+
+(defmethod chart-axis-draw ((a chart-axis) &optional dir margin zone start end)
+  "Draw some axis for A in direction DIR at with MARGIN in boundry.
+ZONE is a zone specification.
+START and END represent the boundary."
+  (chart-draw-line dir (+ margin (if zone zone 0)) start end)
+  (chart-display-label (oref a name) dir (if zone (+ zone margin 3)
+					   (if (eq dir 'horizontal)
+					       1 0))
+		       start end (oref a name-face)))
+
+(defmethod chart-translate-xpos ((c chart) x)
+  "Translate in chart C the coordinate X into a screen column."
+  (let ((range (oref (oref c x-axis) bounds)))
+    (+ (oref c x-margin)
+       (round (* (float (- x (car range)))
+		 (/ (float (oref c x-width))
+		    (float (- (cdr range) (car range))))))))
+  )
+
+(defmethod chart-translate-ypos ((c chart) y)
+  "Translate in chart C the coordinate Y into a screen row."
+  (let ((range (oref (oref c y-axis) bounds)))
+    (+ (oref c x-margin)
+       (- (oref c y-width)
+	  (round (* (float (- y (car range)))
+		    (/ (float (oref c y-width))
+		       (float (- (cdr range) (car range)))))))))
+  )
+
+(defmethod chart-axis-draw ((a chart-axis-range) &optional dir margin zone start end)
+  "Draw axis information based upon a range to be spread along the edge.
+A is the chart to draw.  DIR is the direction.
+MARGIN, ZONE, START, and END specify restrictions in chart space."
+  (call-next-method)
+  ;; We prefer about 5 spaces between each value
+  (let* ((i (car (oref a bounds)))
+	 (e (cdr (oref a bounds)))
+	 (z (if zone zone 0))
+	 (s nil)
+	 (rng (- e i))
+	 ;; want to jump by units of 5 spaces or so
+	 (j (/ rng (/  (chart-size-in-dir (oref a chart) dir) 4)))
+	 p1)
+    (if (= j 0) (setq j 1))
+    (while (<= i e)
+      (setq s
+	    (cond ((> i 999999)
+		   (format "%dM" (/ i 1000000)))
+		  ((> i 999)
+		   (format "%dK" (/ i 1000)))
+		  (t
+		   (format "%d" i))))
+      (if (eq dir 'vertical)
+	  (let ((x (+ (+ margin z) (if (oref a loweredge)
+				       (- (length s)) 1))))
+	    (if (< x 1) (setq x 1))
+	    (chart-goto-xy x (chart-translate-ypos (oref a chart) i)))
+	(chart-goto-xy (chart-translate-xpos (oref a chart) i)
+		       (+ margin z (if (oref a loweredge) -1 1))))
+      (setq p1 (point))
+      (insert s)
+      (chart-zap-chars (length s))
+      (put-text-property p1 (point) 'face (oref a labels-face))
+      (setq i (+ i j))))
+)
+
+(defmethod chart-translate-namezone ((c chart) n)
+  "Return a dot-pair representing a positional range for a name.
+The name in chart C of the Nth name resides.
+Automatically compensates for for direction."
+  (let* ((dir (oref c direction))
+	 (w (if (eq dir 'vertical) (oref c x-width) (oref c y-width)))
+	 (m (if (eq dir 'vertical) (oref c y-margin) (oref c x-margin)))
+	 (ns (length
+	      (oref (if (eq dir 'vertical) (oref c x-axis) (oref c y-axis))
+		    items)))
+	 (lpn (/ (+ 1.0 (float w)) (float ns)))
+	 )
+    (cons (+ m (round (* lpn (float n))))
+	  (+ m -1 (round (* lpn (+ 1.0 (float n))))))
+    ))
+
+(defmethod chart-axis-draw ((a chart-axis-names) &optional dir margin zone start end)
+  "Draw axis information based upon A range to be spread along the edge.
+Optional argument DIR the direction of the chart.
+Optional argument MARGIN , ZONE, START and END specify boundaries of the drawing."
+  (call-next-method)
+  ;; We prefer about 5 spaces between each value
+  (let* ((i 0)
+	 (s (oref a items))
+	 (z (if zone zone 0))
+	 (r nil)
+	 (p nil)
+	 (odd nil)
+	 p1)
+    (while s
+      (setq odd (= (% (length s) 2) 1))
+      (setq r (chart-translate-namezone (oref a chart) i))
+      (if (eq dir 'vertical)
+	  (setq p (/ (+ (car r) (cdr r)) 2))
+	(setq p (- (+ (car r) (/ (- (cdr r) (car r)) 2))
+		   (/ (length (car s)) 2))))
+      (if (eq dir 'vertical)
+	  (let ((x (+ (+ margin z) (if (oref a loweredge)
+				       (- (length (car s)))
+				     (length (car s))))))
+	    (if (< x 1) (setq x 1))
+	    (if (> (length (car s)) (1- margin))
+		(setq x (+ x margin)))
+	    (chart-goto-xy x p))
+	(chart-goto-xy p (+ (+ margin z) (if (oref a loweredge)
+					     (if odd -2 -1)
+					   (if odd 2 1)))))
+      (setq p1 (point))
+      (insert (car s))
+      (chart-zap-chars (length (car s)))
+      (put-text-property p1 (point) 'face (oref a labels-face))
+      (setq i (+ i 1)
+	    s (cdr s))))
+)
+
+(defmethod chart-draw-data ((c chart-bar))
+  "Display the data available in a bar chart C."
+  (let* ((data (oref c sequences))
+	 (dir (oref c direction))
+	 (odir (if (eq dir 'vertical) 'horizontal 'vertical))
+	)
+    (while data
+      (if (stringp (car (oref (car data) data)))
+	  ;; skip string lists...
+	  nil
+	;; display number lists...
+	(let ((i 0)
+	      (seq (oref (car data) data)))
+	  (while seq
+	    (let* ((rng (chart-translate-namezone c i))
+		   (dp (if (eq dir 'vertical)
+			   (chart-translate-ypos c (car seq))
+			 (chart-translate-xpos c (car seq))))
+		  (zp (if (eq dir 'vertical)
+			  (chart-translate-ypos c 0)
+			(chart-translate-xpos c 0)))
+		  (fc (if chart-face-list
+			  (nth (% i (length chart-face-list)) chart-face-list)
+			'default))
+		  )
+	      (if (< dp zp)
+		  (progn
+		    (chart-draw-line dir (car rng) dp zp)
+		    (chart-draw-line dir (cdr rng) dp zp))
+		(chart-draw-line dir (car rng) zp (1+ dp))
+		(chart-draw-line dir (cdr rng) zp (1+ dp)))
+	      (if (= (car rng) (cdr rng)) nil
+		(chart-draw-line odir dp (1+ (car rng)) (cdr rng))
+		(chart-draw-line odir zp (car rng) (1+ (cdr rng))))
+	      (if (< dp zp)
+		  (chart-deface-rectangle dir rng (cons dp zp) fc)
+		(chart-deface-rectangle dir rng (cons zp dp) fc))
+	      )
+	    ;; find the bounds, and chart it!
+	    ;; for now, only do one!
+	    (setq i (1+ i)
+		  seq (cdr seq)))))
+      (setq data (cdr data))))
+  )
+
+(defmethod chart-add-sequence ((c chart) &optional seq axis-label)
+  "Add to chart object C the sequence object SEQ.
+If AXIS-LABEL, then the axis stored in C is updated with the bounds of SEQ,
+or is created with the bounds of SEQ."
+  (if axis-label
+      (let ((axis (eieio-oref c axis-label)))
+	(if (stringp (car (oref seq data)))
+	    (let ((labels (oref seq data)))
+	      (if (not axis)
+		  (setq axis (make-instance chart-axis-names
+					    :name (oref seq name)
+					    :items labels
+					    :chart c))
+		(oset axis items labels)))
+	  (let ((range (cons 0 1))
+		(l (oref seq data)))
+	    (if (not axis)
+		(setq axis (make-instance chart-axis-range
+					  :name (oref seq name)
+					  :chart c)))
+	    (while l
+	      (if (< (car l) (car range)) (setcar range (car l)))
+	      (if (> (car l) (cdr range)) (setcdr range (car l)))
+	      (setq l (cdr l)))
+	    (oset axis bounds range)))
+	(if (eq axis-label 'x-axis) (oset axis loweredge nil))
+	(eieio-oset c axis-label axis)
+	))
+  (oset c sequences (append (oref c sequences) (list seq))))
+
+;;; Charting optimizers
+
+(defmethod chart-trim ((c chart) max)
+  "Trim all sequences in chart C to be at most MAX elements long."
+  (let ((s (oref c sequences)))
+    (while s
+      (let ((sl (oref (car s) data)))
+	(if (> (length sl) max)
+	    (setcdr (nthcdr (1- max) sl) nil)))
+      (setq s (cdr s))))
+  )
+
+(defmethod chart-sort ((c chart) pred)
+  "Sort the data in chart C using predicate PRED.
+See `chart-sort-matchlist' for more details"
+  (let* ((sl (oref c sequences))
+	 (s1 (car sl))
+	 (s2 (car (cdr sl)))
+	 (s nil))
+    (if (stringp (car (oref s1 data)))
+	(progn
+	  (chart-sort-matchlist s1 s2 pred)
+	  (setq s (oref s1 data)))
+      (if (stringp (car (oref s2 data)))
+	  (progn
+	    (chart-sort-matchlist s2 s1 pred)
+	    (setq s (oref s2 data)))
+	(error "Sorting of chart %s not supported" (object-name c))))
+    (if (eq (oref c direction) 'horizontal)
+	(oset (oref c y-axis) items s)
+      (oset (oref c x-axis) items s)
+	))
+  )
+
+(defun chart-sort-matchlist (namelst numlst pred)
+  "Sort NAMELST and NUMLST (both SEQUENCE objects) based on predicate PRED.
+PRED should be the equivalent of '<, except it must expect two
+cons cells of the form (NAME . NUM).  See SORT for more details."
+  ;; 1 - create 1 list of cons cells
+  (let ((newlist nil)
+	(alst (oref namelst data))
+	(ulst (oref numlst data)))
+    (while alst
+      ;; this is reversed, but were are sorting anyway
+      (setq newlist (cons (cons (car alst) (car ulst)) newlist))
+      (setq alst (cdr alst)
+	    ulst (cdr ulst)))
+    ;; 2 - Run sort routine on it
+    (setq newlist (sort newlist pred)
+	  alst nil
+	  ulst nil)
+    ;; 3 - Separate the lists
+    (while newlist
+      (setq alst (cons (car (car newlist)) alst)
+	    ulst (cons (cdr (car newlist)) ulst))
+      (setq newlist (cdr newlist)))
+    ;; 4 - Store them back
+    (oset namelst data (reverse alst))
+    (oset numlst data (reverse ulst))))
+
+;;; Utilities
+
+(defun chart-goto-xy (x y)
+  "Move cursor to position X Y in buffer, and add spaces and CRs if needed."
+
+  (let ((indent-tabs-mode nil)
+	(num (goto-line (1+ y))))
+    (if (and (= 0 num) (/= 0 (current-column))) (newline 1))
+    (if (eobp) (newline num))
+    (if (< x 0) (setq x 0))
+    (if (< y 0) (setq y 0))
+    ;; Now, a quicky column moveto/forceto method.
+    (or (= (move-to-column x) x)
+	(let ((p (point)))
+	  (indent-to x)
+	  (remove-text-properties p (point) '(face))))))
+
+(defun chart-zap-chars (n)
+  "Zap up to N chars without deleteting EOLs."
+  (if (not (eobp))
+      (if (< n (- (save-excursion (end-of-line) (point)) (point)))
+	  (delete-char n)
+	(delete-region (point) (save-excursion (end-of-line) (point))))))
+
+(defun chart-display-label (label dir zone start end &optional face)
+  "Display LABEL in direction DIR in column/row ZONE between START and END.
+Optional argument FACE is the property we wish to place on this text."
+  (if (eq dir 'horizontal)
+      (let (p1)
+	(chart-goto-xy (+ start (- (/ (- end start) 2) (/ (length label) 2)))
+		       zone)
+	(setq p1 (point))
+	(insert label)
+	(chart-zap-chars (length label))
+	(put-text-property p1 (point) 'face face)
+	)
+    (let ((i 0)
+	  (stz (+ start (- (/ (- end start) 2) (/ (length label) 2)))))
+      (while (< i (length label))
+	(chart-goto-xy zone (+ stz i))
+	(insert (aref label i))
+	(chart-zap-chars 1)
+	(put-text-property (1- (point)) (point) 'face face)
+	(setq i (1+ i))))))
+
+(defun chart-draw-line (dir zone start end)
+  "Draw a line using line-drawing characters in direction DIR.
+Use column or row ZONE between START and END"
+  (chart-display-label
+   (make-string (- end start) (if (eq dir 'vertical) ?| ?\-))
+   dir zone start end))
+
+(defun chart-deface-rectangle (dir r1 r2 face)
+  "Colorize a rectangle in direction DIR across range R1 by range R2.
+R1 and R2 are dotted pairs.  Colorize it with FACE."
+  (let* ((range1 (if (eq dir 'vertical) r1 r2))
+	 (range2 (if (eq dir 'vertical) r2 r1))
+	 (y (car range2)))
+    (while (<= y (cdr range2))
+      (chart-goto-xy (car range1) y)
+      (put-text-property (point) (+ (point) (1+ (- (cdr range1) (car range1))))
+			 'face face)
+      (setq y (1+ y)))))
+
+;;; Helpful `I don't want to learn eieio just now' washover functions
+
+(defun chart-bar-quickie (dir title namelst nametitle numlst numtitle
+			      &optional max sort-pred)
+  "Wash over the complex eieio stuff and create a nice bar chart.
+Creat it going in direction DIR ['horizontal 'vertical] with TITLE
+using a name sequence NAMELST labeled NAMETITLE with values NUMLST
+labeled NUMTITLE.
+Optional arguments:
+Set the charts' max element display to MAX, and sort lists with
+SORT-PRED if desired."
+  (let ((nc (make-instance chart-bar
+			   :title title
+			   :key-label "8-m"  ; This is a text key pic
+			   :direction dir
+			   ))
+	(iv (eq dir 'vertical)))
+    (chart-add-sequence nc
+			(make-instance chart-sequece
+				       :data namelst
+				       :name nametitle)
+			(if iv 'x-axis 'y-axis))
+    (chart-add-sequence nc
+			(make-instance chart-sequece
+				       :data numlst
+				       :name numtitle)
+			(if iv 'y-axis 'x-axis))
+    (if sort-pred (chart-sort nc sort-pred))
+    (if (integerp max) (chart-trim nc max))
+    (switch-to-buffer (chart-new-buffer nc))
+    (chart-draw nc)))
+
+;;; Test code
+
+;;;###autoload
+(defun chart-test-it-all ()
+  "Test out various charting features."
+  (interactive)
+  (chart-bar-quickie 'vertical "Test Bar Chart"
+		     '( "U1" "ME2" "C3" "B4" "QT" "EZ") "Items"
+		     '( 5 -10 23 20 30 -3) "Values")
+  )
+
+;;; Sample utility function
+
+(defun chart-file-count (dir)
+  "Draw a chart displaying the number of different file extentions in DIR."
+  (interactive "DDirectory: ")
+  (if (not (string-match "/$" dir))
+      (setq dir (concat dir "/")))
+  (message "Collecting statistics...")
+  (let ((flst (directory-files dir nil nil t))
+	(extlst (list "<dir>"))
+	(cntlst (list 0)))
+    (while flst
+      (let* ((j (string-match "[^\\.]\\(\\.[a-zA-Z]+\\|~\\|#\\)$" (car flst)))
+	     (s (if (file-accessible-directory-p (concat dir (car flst)))
+		    "<dir>"
+		  (if j
+		      (substring (car flst) (match-beginning 1) (match-end 1))
+		    nil)))
+	     (m (member s extlst)))
+	(if (not s) nil
+	  (if m
+	      (let ((cell (nthcdr (- (length extlst) (length m)) cntlst)))
+		(setcar cell (1+ (car cell))))
+	    (setq extlst (cons s extlst)
+		  cntlst (cons 1 cntlst)))))
+      (setq flst (cdr flst)))
+    ;; Lets create the chart!
+    (chart-bar-quickie 'vertical "Files Extension Distribution"
+		       extlst "File Extensions"
+		       cntlst "# of occurances"
+		       10
+		       '(lambda (a b) (> (cdr a) (cdr b))))
+    ))
+
+(defun chart-space-usage (d)
+  "Display a top usage chart for directory D."
+  (interactive "DDirectory: ")
+  (message "Collecting statistics...")
+  (let ((nmlst nil)
+	(cntlst nil)
+	(b (get-buffer-create " *du-tmp*")))
+    (set-buffer b)
+    (erase-buffer)
+    (insert "cd " d ";du -sk * \n")
+    (message "Running `cd %s;du -sk *'..." d)
+    (call-process-region (point-min) (point-max) shell-file-name t
+			 (current-buffer) nil)
+    (goto-char (point-min))
+    (message "Scanning output ...")
+    (while (re-search-forward "^\\([0-9]+\\)[ \t]+\\([^ \n]+\\)$" nil t)
+      (let* ((nam (buffer-substring (match-beginning 2) (match-end 2)))
+	     (num (buffer-substring (match-beginning 1) (match-end 1))))
+	(setq nmlst (cons nam nmlst)
+	      ;; * 1000 to put it into bytes
+	      cntlst (cons (* (string-to-number num) 1000) cntlst))))
+    (if (not nmlst)
+	(error "No files found!"))
+    (chart-bar-quickie 'vertical (format "Largest files in %s" d)
+		       nmlst "File Name"
+		       cntlst "File Size"
+		       10
+		       '(lambda (a b) (> (cdr a) (cdr b))))
+    ))
+
+(defun chart-emacs-storage ()
+  "Chart the current storage requirements of Emacs."
+  (interactive)
+  (let* ((data (garbage-collect))
+	 (names '("strings/2" "vectors"
+		  "conses" "free cons"
+		  "syms" "free syms"
+		  "markers" "free mark"
+		  ;; "floats" "free flt"
+		  ))
+	 (nums (list (/ (nth 3 data) 2)
+		     (nth 4 data)
+		     (car (car data))	; conses
+		     (cdr (car data))
+		     (car (nth 1 data)) ; syms
+		     (cdr (nth 1 data))
+		     (car (nth 2 data))	; markers
+		     (cdr (nth 2 data))
+		     ;(car (nth 5 data)) ; floats are Emacs only
+		     ;(cdr (nth 5 data))
+		     )))
+    ;; Lets create the chart!
+    (chart-bar-quickie 'vertical "Emacs Runtime Storage Usage"
+		       names "Storage Items"
+		       nums "Objects")))
+
+(defun chart-emacs-lists ()
+  "Chart out the size of various important lists."
+  (interactive)
+  (let* ((names '("buffers" "frames" "processes" "faces"))
+	 (nums (list (length (buffer-list))
+		     (length (frame-list))
+		     (length (process-list))
+		     (length (face-list))
+		     )))
+    (if (fboundp 'x-display-list)
+	(setq names (append names '("x-displays"))
+	      nums (append nums (list (length (x-display-list))))))
+    ;; Lets create the chart!
+    (chart-bar-quickie 'vertical "Emacs List Size Chart"
+		       names "Various Lists"
+		       nums "Objects")))
+
+(defun chart-rmail-from ()
+  "If we are in an rmail summary buffer, then chart out the froms."
+  (interactive)
+  (if (not (eq major-mode 'rmail-summary-mode))
+      (error "You must invoke chart-rmail-from in an rmail summary buffer"))
+  (let ((nmlst nil)
+	(cntlst nil))
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "\\-[A-Z][a-z][a-z] +\\(\\w+\\)@\\w+" nil t)
+	(let* ((nam (buffer-substring (match-beginning 1) (match-end 1)))
+	       (m (member nam nmlst)))
+	  (message "Scanned username %s" nam)
+	  (if m
+	      (let ((cell (nthcdr (- (length nmlst) (length m)) cntlst)))
+		(setcar cell (1+ (car cell))))
+	    (setq nmlst (cons nam nmlst)
+		  cntlst (cons 1 cntlst))))))
+    (chart-bar-quickie 'vertical "Username Occurance in RMAIL box"
+		       nmlst "User Names"
+		       cntlst "# of occurances"
+		       10
+		       '(lambda (a b) (> (cdr a) (cdr b))))
+    ))
+
+
+(provide 'chart)
+
+;;; chart.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-base.el b/site/cedet-1.0pre7/eieio/eieio-base.el
new file mode 100755
index 0000000..940e464
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-base.el
@@ -0,0 +1,334 @@
+;;; eieio-base.el --- Base classes for EIEIO.
+
+;;;
+;; Copyright (C) 2000, 2001, 2002, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-base.el,v 1.29 2009/10/10 15:10:00 davenar Exp $
+;; Keywords: OO, lisp
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;; Base classes for EIEIO.  These classes perform some basic tasks
+;; but are generally useless on their own.  To use any of these classes,
+;; inherit from one or more of them.
+
+(require 'eieio)
+
+;;; Code:
+
+;;; eieio-instance-inheritor
+;;
+;; Enable instance inheritance via the `clone' method.
+;; Works by using the `slot-unbound' method which usually throws an
+;; error if a slot is unbound.
+(defclass eieio-instance-inheritor ()
+  ((parent-instance :initarg :parent-instance
+		    :type eieio-instance-inheritor-child
+		    :documentation
+		    "The parent of this instance.
+If a slot of this class is reference, and is unbound, then  the parent
+is checked for a value.")
+   )
+  "This special class can enable instance inheritance.
+Use `clone' to make a new object that does instance inheritance from
+a parent instance.  When a slot in the child is referenced, and has
+not been set, use values from the parent."
+  :abstract t)
+
+(defmethod slot-unbound ((object eieio-instance-inheritor) class slot-name fn)
+  "If a slot OBJECT in this CLASS is unbound, try to inherit, or throw a signal.
+SLOT-NAME, is the offending slot.  FN is the function signalling the error."
+  (if (slot-boundp object 'parent-instance)
+      ;; It may not look like it, but this line recurses back into this
+      ;; method if the parent instance's slot is unbound.
+      (eieio-oref (oref object parent-instance) slot-name)
+    ;; Throw the regular signal.
+    (call-next-method)))
+
+(defmethod clone ((obj eieio-instance-inheritor) &rest params)
+  "Clone OBJ, initializing `:parent' to OBJ.
+All slots are unbound, except those initialized with PARAMS."
+  (let ((nobj (make-vector (length obj) eieio-unbound))
+	(nm (aref obj object-name))
+	(passname (and params (stringp (car params))))
+	(num 1))
+    (aset nobj 0 'object)
+    (aset nobj object-class (aref obj object-class))
+    ;; The following was copied from the default clone.
+    (if (not passname)
+	(save-match-data
+	  (if (string-match "-\\([0-9]+\\)" nm)
+	      (setq num (1+ (string-to-number (match-string 1 nm)))
+		    nm (substring nm 0 (match-beginning 0))))
+	  (aset nobj object-name (concat nm "-" (int-to-string num))))
+      (aset nobj object-name (car params)))
+    ;; Now initialize from params.
+    (if params (shared-initialize nobj (if passname (cdr params) params)))
+    (oset nobj parent-instance obj)
+    nobj))
+
+(defmethod eieio-instance-inheritor-slot-boundp ((object eieio-instance-inheritor)
+						slot)
+  "Non-nil if the instance inheritor OBJECT's SLOT is bound.
+See `slot-boundp' for for details on binding slots.
+The instance inheritor uses unbound slots as a way cascading cloned
+slot values, so testing for a slot being bound requires extra steps
+for this kind of object."
+  (if (slot-boundp object slot)
+      ;; If it is regularly bound, return t.
+      t
+    (if (slot-boundp object 'parent-instance)
+	(eieio-instance-inheritor-slot-boundp (oref object parent-instance)
+					      slot)
+      nil)))
+
+
+;;; eieio-instance-tracker
+;;
+;; Track all created instances of this class.
+;; The class must initialize the `tracking-symbol' slot, and that
+;; symbol is then used to contain these objects.
+(defclass eieio-instance-tracker ()
+  ((tracking-symbol :type symbol
+		    :allocation :class
+		    :documentation
+		    "The symbol used to maintain a list of our instances.
+The instance list is treated as a variable, with new instances added to it.")
+   )
+  "This special class enables instance tracking.
+Inheritors from this class must overload `tracking-symbol' which is
+a variable symbol used to store a list of all instances."
+  :abstract t)
+
+(defmethod initialize-instance :AFTER ((this eieio-instance-tracker)
+				       &rest slots)
+  "Make sure THIS is in our master list of this class.
+Optional argument SLOTS are the initialization arguments."
+  ;; Theoretically, this is never called twice for a given instance.
+  (let ((sym (oref this tracking-symbol)))
+    (if (not (memq this (symbol-value sym)))
+	(set sym (append (symbol-value sym) (list this))))))
+
+(defmethod delete-instance ((this eieio-instance-tracker))
+  "Remove THIS from the master list of this class."
+  (set (oref this tracking-symbol)
+       (delq this (symbol-value (oref this tracking-symbol)))))
+
+;; In retrospect, this is a silly function.
+(defun eieio-instance-tracker-find (key slot list-symbol)
+  "Find KEY as an element of SLOT in the objects in LIST-SYMBOL.
+Returns the first match."
+  (object-assoc key slot (symbol-value list-symbol)))
+
+;;; eieio-singleton
+;;
+;; The singleton Design Pattern specifies that there is but one object
+;; of a given class ever created.  The EIEIO singleton base class defines
+;; a CLASS allocated slot which contains the instance used.  All calls to
+;; `make-instance' will either create a new instance and store it in this
+;; slot, or it will just return what is there.
+(defclass eieio-singleton ()
+  ((singleton :type eieio-singleton
+	      :allocation :class
+	      :documentation
+	      "The only instance of this class that will be instantiated.
+Multiple calls to `make-instance' will return this object."))
+  "This special class causes subclasses to be singletons.
+A singleton is a class which will only ever have one instace."
+  :abstract t)
+
+(defmethod constructor :STATIC ((class eieio-singleton) name &rest slots)
+  "Constructor for singleton CLASS.
+NAME and SLOTS initialize the new object.
+This constructor guarantees that no matter how many you request,
+only one object ever exists."
+  ;; NOTE TO SELF: In next version, make `slot-boundp' support classes
+  ;; with class allocated slots or default values.
+  (let ((old (oref-default class singleton)))
+    (if (eq old eieio-unbound)
+	(oset-default class singleton (call-next-method))
+      old)))
+
+
+;;; eieio-persistent
+;;
+;; For objects which must save themselves to disk.  Provides an
+;; `object-write' method to save an object to disk, and a
+;; `eieio-persistent-read' function to call to read an object
+;; from disk.
+;;
+;; Also provide the method `eieio-persistent-path-relative' to
+;; calculate path names relative to a given instance.  This will
+;; make the saved object location independent by converting all file
+;; references to be relative to the directory the object is saved to.
+;; You must call `eieio-peristent-path-relative' on each file name
+;; saved in your object.
+(defclass eieio-persistent ()
+  ((file :initarg :file
+	 :type string
+	 :documentation
+	 "The save file for this persistent object.
+This must be a string, and must be specified when the new object is
+instantiated.")
+   (extension :type string
+	      :allocation :class
+	      :initform ".eieio"
+	      :documentation
+	      "Extension of files saved by this object.
+Enables auto-choosing nice file names based on name.")
+   (file-header-line :type string
+		     :allocation :class
+		     :initform ";; EIEIO PERSISTENT OBJECT"
+		     :documentation
+		     "Header line for the save file.
+This is used with the `object-write' method.")
+   (do-backups :type boolean
+	       :allocation :class
+	       :initform t
+	       :documentation
+	       "Saving this object should make backup files.
+Setting to nil will mean no backups are made."))
+  "This special class enables persistence through save files
+Use the `object-save' method to write this object to disk.  The save
+format is Emacs Lisp code which calls the constructor for the saved
+object.  For this reason, only slots which do not have an `:initarg'
+specified will not be saved."
+  :abstract t)
+
+(defmethod eieio-persistent-save-interactive ((this eieio-persistent) prompt
+					      &optional name)
+  "Perpare to save THIS.  Use in an `interactive' statement.
+Query user for file name with PROMPT if THIS does not yet specify
+a file.  Optional argument NAME specifies a default file name."
+  (unless (slot-boundp this 'file)
+      (oset this file
+	    (read-file-name prompt nil
+			    (if   name
+				(concat name (oref this extension))
+			      ))))
+  (oref this file))
+
+(defun eieio-persistent-read (filename)
+  "Read a persistent object from FILENAME, and return it."
+  (let ((ret nil)
+	(buffstr nil))
+    (unwind-protect
+	(progn
+	  (save-excursion
+	    (set-buffer (get-buffer-create " *tmp eieio read*"))
+	    (insert-file-contents filename nil nil nil t)
+	    (goto-char (point-min))
+	    (setq buffstr (buffer-string)))
+	  ;; Do the read in the buffer the read was initialized from
+	  ;; so that any initialize-instance calls that depend on
+	  ;; the current buffer will work.
+	  (setq ret (read buffstr))
+	  (if (not (child-of-class-p (car ret) 'eieio-persistent))
+	      (error "Corrupt object on disk"))
+	  (setq ret (eval ret))
+	  (oset ret file filename))
+      (kill-buffer " *tmp eieio read*"))
+    ret))
+
+(defmethod object-write ((this eieio-persistent) &optional comment)
+  "Write persistent object THIS out to the current stream.
+Optional argument COMMENT is a header line comment."
+  (call-next-method this (or comment (oref this file-header-line))))
+
+(defmethod eieio-persistent-path-relative ((this eieio-persistent) file)
+  "For object THIS, make absolute file name FILE relative."
+  (file-relative-name (expand-file-name file)
+		      (file-name-directory (oref this file))))
+
+(defmethod eieio-persistent-save ((this eieio-persistent) &optional file)
+  "Save persistent object THIS to disk.
+Optional argument FILE overrides the file name specified in the object
+instance."
+  (save-excursion
+    (let ((b (set-buffer (get-buffer-create " *tmp object write*")))
+	  (default-directory (file-name-directory (oref this file)))
+	  (cfn (oref this file)))
+      (unwind-protect
+	  (save-excursion
+	    (erase-buffer)
+	    (let ((standard-output (current-buffer)))
+	      (oset this file
+		    (if file
+			(eieio-persistent-path-relative this file)
+		      (file-name-nondirectory cfn)))
+	      (object-write this (oref this file-header-line)))
+	    (let ((backup-inhibited (not (oref this do-backups)))
+		  (cs (car (find-coding-systems-region
+			    (point-min) (point-max)))))
+	      (unless (eq cs 'undecided)
+		(setq buffer-file-coding-system cs))
+	      ;; Old way - write file.  Leaves message behind.
+	      ;;(write-file cfn nil)
+	      
+	      ;; New way - Avoid the vast quantities of error checking
+	      ;; just so I can get at the special flags that disable
+	      ;; displaying random messages.
+	      (write-region (point-min) (point-max)
+			    cfn nil 1)
+	      ))
+	;; Restore :file, and kill the tmp buffer
+	(oset this file cfn)
+	(setq buffer-file-name nil)
+	(kill-buffer b)))))
+
+;; Notes on the persistent object:
+;; It should also set up some hooks to help it keep itself up to date.
+
+
+;;; Named object
+;;
+;; Named objects use the objects `name' as a slot, and that slot
+;; is accessed with the `object-name' symbol.
+
+(defclass eieio-named ()
+  ()
+  "Object with a name.
+Name storage already occurs in an object.  This object provides get/set
+access to it."
+  :abstract t)
+
+(defmethod slot-missing ((obj eieio-named)
+			 slot-name operation &optional new-value)
+  "Called when a on-existant slot is accessed.
+For variable `eieio-named', provide an imaginary `object-name' slot.
+Argument OBJ is the Named object.
+Argument SLOT-NAME is the slot that was attempted to be accessed.
+OPERATION is the type of access, such as `oref' or `oset'.
+NEW-VALUE is the value that was being set into SLOT if OPERATION were
+a set type."
+  (if (or (eq slot-name 'object-name)
+	  (eq slot-name :object-name))
+      (cond ((eq operation 'oset)
+	     (if (not (stringp new-value))
+		 (signal 'invalid-slot-type
+			 (list obj slot-name 'string new-value)))
+	     (object-set-name-string obj new-value))
+	    (t (object-name-string obj)))
+    (call-next-method)))
+
+(provide 'eieio-base)
+
+;;; eieio-base.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-comp.el b/site/cedet-1.0pre7/eieio/eieio-comp.el
new file mode 100755
index 0000000..0efbdb5
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-comp.el
@@ -0,0 +1,187 @@
+;;; eieio-comp.el -- eieio routines to help with byte compilation
+
+;;;
+;; Copyright (C) 1995,1996, 1998, 1999, 2000, 2001, 2002, 2005, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-comp.el,v 1.16 2009/09/13 11:31:55 zappo Exp $
+;; Keywords: oop, lisp, tools
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;  
+;; Byte compiler functions for defmethod.  This will affect the new GNU
+;; byte compiler for Emacs 19 and better.  This function will be called by
+;; the byte compiler whenever a `defmethod' is encountered in a file.
+;; It will output a function call to `eieio-defmethod' with the byte
+;; compiled function as a parameter.
+
+;;; Code:
+
+;; Some compatibility stuff
+(eval-and-compile
+  (if (not (fboundp 'byte-compile-compiled-obj-to-list))
+      (defun byte-compile-compiled-obj-to-list (moose) nil))
+
+  (if (not (boundp 'byte-compile-outbuffer))
+      (defvar byte-compile-outbuffer nil))
+  )
+
+;; This teaches the byte compiler how to do this sort of thing.
+(put 'defmethod 'byte-hunk-handler 'byte-compile-file-form-defmethod)
+
+(defun byte-compile-file-form-defmethod (form)
+  "Mumble about the method we are compiling.
+This function is mostly ripped from `byte-compile-file-form-defun', but
+it's been modified to handle the special syntax of the defmethod
+command.  There should probably be one for defgeneric as well, but
+that is called but rarely.  Argument FORM is the body of the method."
+  (setq form (cdr form))
+  (let* ((meth (car form))
+	 (key (progn (setq form (cdr form))
+		     (cond ((or (eq ':BEFORE (car form))
+				(eq ':before (car form)))
+			    (setq form (cdr form))
+			    ":before ")
+			   ((or (eq ':AFTER (car form))
+				(eq ':after (car form)))
+			    (setq form (cdr form))
+			    ":after ")
+			   ((or (eq ':PRIMARY (car form))
+				(eq ':primary (car form)))
+			    (setq form (cdr form))
+			    ":primary ")
+			   ((or (eq ':STATIC (car form))
+				(eq ':static (car form)))
+			    (setq form (cdr form))
+			    ":static ")
+			   (t ""))))
+	 (params (car form))
+	 (lamparams (byte-compile-defmethod-param-convert params))
+	 (arg1 (car params))
+	 (class (if (listp arg1) (nth 1 arg1) nil))
+	 (my-outbuffer (if (eval-when-compile (featurep 'xemacs))
+			   byte-compile-outbuffer 
+			 (condition-case nil
+			     bytecomp-outbuffer
+			   (error outbuffer))))
+	 )
+    (let ((name (format "%s::%s" (or class "#<generic>") meth)))
+      (if byte-compile-verbose
+	  ;; #### filename used free
+	  (message "Compiling %s... (%s)" (or filename "") name))
+      (setq byte-compile-current-form name) ; for warnings
+      )
+    ;; Flush any pending output
+    (byte-compile-flush-pending)
+    ;; Byte compile the body.  For the byte compiled forms, add the
+    ;; rest arguments, which will get ignored by the engine which will
+    ;; add them later (I hope)
+    (let* ((new-one (byte-compile-lambda
+		     (append (list 'lambda lamparams)
+			     (cdr form))))
+	   (code (byte-compile-byte-code-maker new-one)))
+      (princ "\n(eieio-defmethod '" my-outbuffer)
+      (princ meth my-outbuffer)
+      (princ " '(" my-outbuffer)
+      (princ key my-outbuffer)
+      (prin1 params my-outbuffer)
+      (princ " " my-outbuffer)
+      (eieio-byte-compile-princ-code code my-outbuffer)
+      (princ "))" my-outbuffer)
+      )
+    ;; Now add this function to the list of known functions.
+    ;; Don't bother with a doc string.   Not relevant here.
+    (add-to-list 'byte-compile-function-environment
+		 (cons meth
+		       (eieio-defgeneric-form meth "")))
+    
+    ;; Remove it from the undefined list if it is there.
+    (let ((elt (assq meth byte-compile-unresolved-functions)))
+      (if elt (setq byte-compile-unresolved-functions
+		    (delq elt byte-compile-unresolved-functions))))
+
+    ;; nil prevents cruft from appearing in the output buffer.
+    nil))
+
+
+(defun eieio-byte-compile-princ-code (code outbuffer)
+  "Xemacs and GNU Emacs do their things differently.
+Lets do it right on both platforms
+Argument CODE is the code to output.
+Argument OUTBUFFER is the buffer to dump the created code to."
+  (if (eval-when-compile (not (featurep 'xemacs)))
+      ;; FSF emacs
+      (prin1 code outbuffer)
+    ;; XEmacs
+    (if (atom code)
+	(princ "#[" outbuffer)
+      (princ "'(" outbuffer))
+    (let ((codelist (if (byte-code-function-p code)
+			(byte-compile-compiled-obj-to-list code)
+		      (append code nil))))
+      (while codelist
+	(eieio-prin1 (car codelist) outbuffer)
+	(princ " " outbuffer)
+	(setq codelist (cdr codelist))
+	))
+    (if (atom code)
+	(princ "]" outbuffer)
+      (princ ")" outbuffer))))
+
+(defun eieio-prin1 (code outbuffer)
+  "For XEmacs only, princ one item.
+Recurse into lists in search of `byte-code' which needs expanding...
+Argument CODE is the code to output.
+Argument OUTBUFFER is the buffer to dump the created code to."
+  (cond ((byte-code-function-p code)
+	 (let ((codelist (byte-compile-compiled-obj-to-list code)))
+	   (princ "#[" outbuffer)
+	   (while codelist
+	     (eieio-prin1 (car codelist) outbuffer)
+	     (princ " " outbuffer)
+	     (setq codelist (cdr codelist))
+	     )
+	   (princ "]" outbuffer)))
+	((vectorp code)
+	 (let ((i 0) (ln (length code)))
+	   (princ "[" outbuffer)
+	   (while (< i ln)
+	     (eieio-prin1 (aref code i) outbuffer)
+	     (princ " " outbuffer)
+	     (setq i (1+ i)))
+	   (princ "]" outbuffer)))
+	(t (prin1 code outbuffer))))
+    
+
+(defun byte-compile-defmethod-param-convert (paramlist)
+  "Convert method params into the params used by the defmethod thingy.
+Argument PARAMLIST is the paramter list to convert."
+  (let ((argfix nil))
+    (while paramlist
+      (setq argfix (cons (if (listp (car paramlist))
+			     (car (car paramlist))
+			   (car paramlist))
+			 argfix))
+      (setq paramlist (cdr paramlist)))
+    (nreverse argfix)))
+
+(provide 'eieio-comp)
+
+;;; eieio-comp.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-custom.el b/site/cedet-1.0pre7/eieio/eieio-custom.el
new file mode 100755
index 0000000..cee88c3
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-custom.el
@@ -0,0 +1,473 @@
+;;; eieio-custom.el -- eieio object customization
+
+;;; Copyright (C) 1999, 2000, 2001, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-custom.el,v 1.28 2009/03/17 00:50:59 zappo Exp $
+;; Keywords: OO, lisp
+;;                                                                          
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;           
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;;   This contains support customization of eieio objects.  Enabling
+;; your object to be customizable requires use of the slot attirbute
+;; `:custom'.
+
+(require 'eieio)
+(require 'widget)
+(require 'wid-edit)
+(require 'custom)
+
+;;; Compatibility
+;;
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (defalias 'eieio-overlay-lists (lambda () (list (extent-list))))
+    (defalias 'eieio-overlay-lists 'overlay-lists)
+    )
+  )
+;;; Code:
+(defclass eieio-widget-test-class nil
+  ((a-string :initarg :a-string
+	     :initform "The moose is loose"
+	     :custom string
+	     :label "Amorphous String"
+	     :group (default foo)
+	     :documentation "A string for testing custom.
+This is the next line of documentation.")
+   (listostuff :initarg :listostuff
+	       :initform ("1" "2" "3")
+	       :type list
+	       :custom (repeat (string :tag "Stuff"))
+	       :label "List of Strings"
+	       :group foo
+	       :documentation "A list of stuff.")
+   (uninitialized :initarg :uninitialized
+		  :type string
+		  :custom string
+		  :documentation "This slot is not initialized.
+Used to make sure that custom doesn't barf when it encounters one
+of these.")
+   (a-number :initarg :a-number
+	     :initform 2
+	     :custom integer
+	     :documentation "A number of thingies."))
+  "A class for testing the widget on.")
+
+(defcustom eieio-widget-test (eieio-widget-test-class "Foo")
+  "Test variable for editing an object."
+  :type 'object
+  :group 'eieio)
+
+(defface eieio-custom-slot-tag-face '((((class color)
+					(background dark))
+				       (:foreground "light blue"))
+				      (((class color)
+					(background light))
+				       (:foreground "blue"))
+				      (t (:italic t)))
+  "Face used for unpushable variable tags."
+  :group 'custom-faces)
+
+(defvar eieio-wo nil
+  "Buffer local variable in object customize buffers for the current widget.")
+(defvar eieio-co nil
+  "Buffer local variable in object customize buffers for the current obj.")
+(defvar eieio-cog nil
+  "Buffer local variable in object customize buffers for the current group.")
+
+ (defvar eieio-custom-ignore-eieio-co  nil
+   "When true, all customizable slots of the current object are updated.
+Updates occur regardless of the current customization group.")
+
+(define-widget 'object-slot 'group
+  "Abstractly modify a single slot in an object."
+  :tag "Slot"
+  :format "%t %v%h\n"
+  :convert-widget 'widget-types-convert-widget
+  :value-create 'eieio-slot-value-create
+  :value-get 'eieio-slot-value-get
+  :value-delete 'widget-children-value-delete
+  :validate 'widget-children-validate
+  :match 'eieio-object-match ;; same
+  )
+
+(defun eieio-slot-value-create (widget)
+  "Create the value of WIDGET."
+  (let ((chil nil)
+	)
+;    (setq chil (cons (widget-create-child-and-convert
+;		      widget 'visibility
+;		      :help-echo "Hide the value of this option."
+;		      :action 'eieio-custom-toggle-parent
+;		      t)
+;		     chil))
+    (setq chil (cons
+		(widget-create-child-and-convert
+		 widget (widget-get widget :childtype)
+		 :tag ""
+		 :value (widget-get widget :value))
+		chil))
+    (widget-put widget :children chil)))
+
+(defun eieio-slot-value-get (widget)
+  "Get the value of WIDGET."
+  (widget-value (car (widget-get widget :children))))
+
+(defun eieio-custom-toggle-hide (widget)
+  "Toggle visibility of WIDGET."
+  (let ((vc (car (widget-get widget :children))))
+    (cond ((eq (widget-get vc :eieio-custom-state) 'hidden)
+	   (widget-put vc :eieio-custom-state 'visible)
+	   (widget-put vc :value-face (widget-get vc :orig-face)))
+	  (t
+	   (widget-put vc :eieio-custom-state 'hidden)
+	   (widget-put vc :orig-face (widget-get vc :value-face))
+	   (widget-put vc :value-face 'invisible)
+	   ))
+    (widget-value-set vc (widget-value vc))))
+
+(defun eieio-custom-toggle-parent (widget &rest ignore)
+  "Toggle visibility of parent of WIDGET.
+Optional argument IGNORE is an extraneous parameter."
+  (eieio-custom-toggle-hide (widget-get widget :parent)))
+
+(define-widget 'object-edit 'group
+  "Abstractly modify a CLOS object."
+  :tag "Object"
+  :format "%v"
+  :convert-widget 'widget-types-convert-widget
+  :value-create 'eieio-object-value-create
+  :value-get 'eieio-object-value-get
+  :value-delete 'widget-children-value-delete
+  :validate 'widget-children-validate
+  :match 'eieio-object-match
+  :clone-object-children nil
+  )
+
+(defun eieio-object-match (widget value)
+  "Match info for WIDGET against VALUE."
+  ;; Write me
+  t)
+
+(defun eieio-filter-slot-type (widget slottype)
+  "Filter WIDGETs SLOTTYPE."
+  (if (widget-get widget :clone-object-children)
+      slottype
+    (cond ((eq slottype 'object)
+	   'object-edit)
+	  ((and (listp slottype)
+		(eq (car slottype) 'object))
+	   (cons 'object-edit (cdr slottype)))
+	  ((equal slottype '(repeat object))
+	   '(repeat object-edit))
+	  ((and (listp slottype)
+		(equal (car slottype) 'repeat)
+		(listp (car (cdr slottype)))
+		(equal (car (car (cdr slottype))) 'object))
+	   (list 'repeat
+		 (cons 'object-edit
+		       (cdr (car (cdr slottype))))))
+	  (t slottype))))
+
+(defun eieio-object-value-create (widget)
+  "Create the value of WIDGET."
+  (if (not (widget-get widget :value))
+      (widget-put widget
+		  :value (cond ((widget-get widget :objecttype)
+				(funcall (class-constructor
+					  (widget-get widget :objecttype))
+					 "Custom-new"))
+			       ((widget-get widget :objectcreatefcn)
+				(funcall (widget-get widget :objectcreatefcn)))
+			       (t (error "No create method specified")))))
+  (let* ((chil nil)
+	 (obj (widget-get widget :value))
+	 (master-group (widget-get widget :eieio-group))
+	 (cv (class-v (object-class-fast obj)))
+	 (slots (aref cv class-public-a))
+	 (flabel (aref cv class-public-custom-label))
+	 (fgroup (aref cv class-public-custom-group))
+	 (fdoc (aref cv class-public-doc))
+	 (fcust (aref cv class-public-custom)))
+    ;; First line describes the object, but may not editable.
+    (if (widget-get widget :eieio-show-name)
+	(setq chil (cons (widget-create-child-and-convert
+			  widget 'string :tag "Object "
+			  :sample-face 'bold
+			  (object-name-string obj))
+			 chil)))
+    ;; Display information about the group being shown
+    (when master-group
+      (let ((groups (class-option (object-class-fast obj) :custom-groups)))
+	(widget-insert "Groups:")
+	(while groups
+	  (widget-insert "  ")
+	  (if (eq (car groups) master-group)
+	      (widget-insert "*" (capitalize (symbol-name master-group)) "*")
+	    (widget-create 'push-button
+			   :thing (cons obj (car groups))
+			   :notify (lambda (widget &rest stuff)
+				     (eieio-customize-object
+				      (car (widget-get widget :thing))
+				      (cdr (widget-get widget :thing))))
+			   (capitalize (symbol-name (car groups)))))
+	  (setq groups (cdr groups)))
+	(widget-insert "\n\n")))
+    ;; Loop over all the slots, creating child widgets.
+    (while slots
+      ;; Output this slot if it has a customize flag associated with it.
+      (when (and (car fcust)
+		 (or (not master-group) (member master-group (car fgroup)))
+		 (slot-boundp obj (car slots)))
+	;; In this case, this slot has a custom type.  Create it's
+	;; children widgets.
+	(let ((type (eieio-filter-slot-type widget (car fcust)))
+	      (stuff nil))
+	  ;; This next bit is an evil hack to get some EDE functions
+	  ;; working the way I like.
+	  (if (and (listp type)
+		   (setq stuff (member :slotofchoices type)))
+	      (let ((choices (eieio-oref obj (car (cdr stuff))))
+		    (newtype nil))
+		(while (not (eq (car type) :slotofchoices))
+		  (setq newtype (cons (car type) newtype)
+			type (cdr type)))
+		(while choices
+		  (setq newtype (cons (list 'const (car choices))
+				      newtype)
+			choices (cdr choices)))
+		(setq type (nreverse newtype))))
+	  (setq chil (cons (widget-create-child-and-convert
+			    widget 'object-slot
+			    :childtype type
+			    :sample-face 'eieio-custom-slot-tag-face
+			    :tag
+			    (concat
+			     (make-string
+			      (or (widget-get widget :indent) 0)
+			      ? )
+			     (if (car flabel)
+				 (car flabel)
+			       (let ((s (symbol-name
+					 (or
+					  (class-slot-initarg
+					   (object-class-fast obj)
+					   (car slots))
+					  (car slots)))))
+				 (capitalize
+				  (if (string-match "^:" s)
+				      (substring s (match-end 0))
+				    s)))))
+			    :value (slot-value obj (car slots))
+			    :doc  (if (car fdoc) (car fdoc)
+				    "Slot not Documented.")
+			    :eieio-custom-visibility 'visible
+			    )
+			   chil))
+	  )
+	)
+      (setq slots (cdr slots)
+	    fdoc (cdr fdoc)
+	    fcust (cdr fcust)
+	    flabel (cdr flabel)
+	    fgroup (cdr fgroup)))
+    (widget-put widget :children (nreverse chil))
+    ))
+
+(defun eieio-object-value-get (widget)
+  "Get the value of WIDGET."
+  (let* ((obj (widget-get widget :value))
+	 (master-group eieio-cog)
+	 (cv (class-v (object-class-fast obj)))
+	 (fgroup (aref cv class-public-custom-group))
+	 (wids (widget-get widget :children))
+	 (name (if (widget-get widget :eieio-show-name)
+		   (car (widget-apply (car wids) :value-inline))
+		 nil))
+	 (chil (if (widget-get widget :eieio-show-name)
+		   (nthcdr 1 wids) wids))
+	 (cv (class-v (object-class-fast obj)))
+	 (slots (aref cv class-public-a))
+	 (fcust (aref cv class-public-custom)))
+    ;; If there are any prefix widgets, clear them.
+    ;; -- None yet
+    ;; Create a batch of initargs for each slot.
+    (while (and slots chil)
+      (if (and (car fcust)
+	       (or eieio-custom-ignore-eieio-co
+		   (not master-group) (member master-group (car fgroup)))
+	       (slot-boundp obj (car slots)))
+	  (progn
+	    ;; Only customized slots have widgets
+	    (let ((eieio-custom-ignore-eieio-co t))
+	      (eieio-oset obj (car slots)
+			  (car (widget-apply (car chil) :value-inline))))
+	    (setq chil (cdr chil))))
+      (setq slots (cdr slots)
+	    fgroup (cdr fgroup)
+	    fcust (cdr fcust)))
+    ;; Set any name updates on it.
+    (if name (aset obj object-name name))
+    ;; This is the same object we had before.
+    obj))
+
+(defmethod eieio-done-customizing ((obj eieio-default-superclass))
+  "When a applying change to a widget, call this method.
+This method is called by the default widget-edit commands.  User made
+commands should also call this method when applying changes.
+Argument OBJ is the object that has been customized."
+  nil)
+
+(defun customize-object (obj &optional group)
+  "Customize OBJ in a custom buffer.
+Optional argument GROUP is the sub-group of slots to display."
+  (eieio-customize-object obj group))
+
+(defmethod eieio-customize-object ((obj eieio-default-superclass)
+				   &optional group)
+  "Customize OBJ in a specialized custom buffer.
+To override call the `eieio-custom-widget-insert' to just insert the
+object widget.
+Optional argument GROUP specifies a subgroup of slots to edit as a symbol.
+These groups are specified with the `:group' slot flag."
+  ;; Insert check for multiple edits here.
+  (let* ((g (or group 'default)))
+    (switch-to-buffer (get-buffer-create
+		       (concat "*CUSTOMIZE "
+			       (object-name obj) " "
+			       (symbol-name g) "*")))
+    (toggle-read-only -1)
+    (kill-all-local-variables)
+    (erase-buffer)
+    (let ((all (eieio-overlay-lists)))
+      ;; Delete all the overlays.
+      (mapc 'delete-overlay (car all))
+      (mapc 'delete-overlay (cdr all)))
+    ;; Add an apply reset option at the top of the buffer.
+    (eieio-custom-object-apply-reset obj)
+    (widget-insert "\n\n")
+    (widget-insert "Edit object " (object-name obj) "\n\n")
+    ;; Create the widget editing the object.
+    (make-local-variable 'eieio-wo)
+    (setq eieio-wo (eieio-custom-widget-insert obj :eieio-group g))
+    ;;Now generate the apply buttons
+    (widget-insert "\n")
+    (eieio-custom-object-apply-reset obj)
+    ;; Now initialize the buffer
+    (use-local-map widget-keymap)
+    (widget-setup)
+    ;;(widget-minor-mode)
+    (goto-char (point-min))
+    (widget-forward 3)
+    (make-local-variable 'eieio-co)
+    (setq eieio-co obj)
+    (make-local-variable 'eieio-cog)
+    (setq eieio-cog group)))
+
+(defmethod eieio-custom-object-apply-reset ((obj eieio-default-superclass))
+  "Insert an Apply and Reset button into the object editor.
+Argument OBJ os the object being customized."
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (widget-apply eieio-wo :value-get)
+			   (eieio-done-customizing eieio-co)
+			   (bury-buffer))
+		 "Accept")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   ;; I think the act of getting it sets
+			   ;; it's value through the get function.
+			   (message "Applying Changes...")
+			   (widget-apply eieio-wo :value-get)
+			   (eieio-done-customizing eieio-co)
+			   (message "Applying Changes...Done."))
+		 "Apply")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (message "Resetting.")
+			   (eieio-customize-object eieio-co eieio-cog))
+		 "Reset")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (bury-buffer))
+		 "Cancel"))
+
+(defmethod eieio-custom-widget-insert ((obj eieio-default-superclass)
+				       &rest flags)
+  "Insert the widget used for editing object OBJ in the current buffer.
+Arguments FLAGS are widget compatible flags.
+Must return the created widget."
+  (apply 'widget-create 'object-edit :value obj flags))
+
+(define-widget 'object 'object-edit
+  "Instance of a CLOS class."
+  :format "%{%t%}:\n%v"
+  :value-to-internal 'eieio-object-value-to-abstract
+  :value-to-external 'eieio-object-abstract-to-value
+  :clone-object-children t
+  )
+
+(defun eieio-object-value-to-abstract (widget value)
+  "For WIDGET, convert VALUE to an abstract /safe/ representation."
+  (if (eieio-object-p value) value
+    (if (null value) value
+      nil)))
+
+(defun eieio-object-abstract-to-value (widget value)
+  "For WIDGET, convert VALUE from an abstract /safe/ representation."
+  value)
+
+
+;;; customization group functions
+;;
+;; These functions provide the ability to create dynamic menus to
+;; customize specific sections of an object.  They do not hook directly
+;; into a filter, but can be used to create easymenu vectors.
+(defmethod eieio-customize-object-group ((obj eieio-default-superclass))
+  "Create a list of vectors for customizing sections of OBJ."
+  (mapcar (lambda (group)
+	    (vector (concat "Group " (symbol-name group))
+		    (list 'customize-object obj (list 'quote group))
+		    t))
+	  (class-option (object-class-fast obj) :custom-groups)))
+
+(defvar eieio-read-custom-group-history nil
+  "History for the custom group reader.")
+
+(defmethod eieio-read-customization-group ((obj eieio-default-superclass))
+  "Do a completing read on the name of a customization group in OBJ.
+Return the symbol for the group, or nil"
+  (let ((g (class-option (object-class-fast obj) :custom-groups)))
+    (if (= (length g) 1)
+	(car g)
+      ;; Make the association list
+      (setq g (mapcar (lambda (g) (cons (symbol-name g) g)) g))
+      (cdr (assoc
+	    (completing-read (concat (oref obj name)  " Custom Group: ")
+			     g nil t nil 'eieio-read-custom-group-history)
+	    g)))))
+
+(provide 'eieio-custom)
+
+;;; eieio-custom.el ends here
+;; 
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/eieio/eieio-datadebug.el b/site/cedet-1.0pre7/eieio/eieio-datadebug.el
new file mode 100644
index 0000000..6573de7
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-datadebug.el
@@ -0,0 +1,161 @@
+;;; eieio-datadebug.el --- EIEIO extensions to the data debugger.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: eieio-datadebug.el,v 1.6 2009/09/12 02:33:31 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Extensions to data-debug for EIEIO objects.
+;;
+
+(require 'eieio)
+(require 'data-debug)
+
+;;; Code:
+
+;;;###autoload
+(defun data-debug-insert-object-slots (object prefix)
+  "Insert all the slots of OBJECT.
+PREFIX specifies what to insert at the start of each line."
+  (let ((attrprefix (concat (make-string (length prefix) ? ) "] "))
+	)
+    (data-debug/eieio-insert-slots object attrprefix)
+    )
+  )
+
+(defun data-debug-insert-object-slots-from-point (point)
+  "Insert the object slots found at the object button at POINT."
+  (let ((object (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-object-slots object
+				    (concat (make-string indent ? )
+					    "~ "))
+    (goto-char start)
+    ))
+
+;;;###autoload
+(defun data-debug-insert-object-button (object prefix prebuttontext)
+  "Insert a button representing OBJECT.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between PREFIX and the object button."
+  (let ((start (point))
+	(end nil)
+	(str (object-print object))
+	(tip (format "Object %s\nClass: %S\nParent(s): %S\n%d slots"
+		     (object-name-string object)
+		     (object-class object)
+		     (class-parents (object-class object))
+		     (length (object-slots object))
+		     ))
+	)
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-keyword-face)
+    (put-text-property start end 'ddebug object)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-object-slots-from-point)
+    (insert "\n")
+    )
+  )
+
+;;; METHODS
+;;
+;; Each object should have an opportunity to show stuff about itself.
+
+(defmethod data-debug/eieio-insert-slots ((obj eieio-default-superclass)
+						prefix)
+  "Insert the slots of OBJ into the current DDEBUG buffer."
+  (data-debug-insert-thing (object-name-string obj)
+				prefix
+				"Name: ")
+  (let* ((cl (object-class obj))
+	 (cv (class-v cl)))
+    (data-debug-insert-thing (class-constructor cl)
+				  prefix
+				  "Class: ")
+    ;; Loop over all the public slots
+    (let ((publa (aref cv class-public-a))
+	  (publd (aref cv class-public-d))
+	  )
+      (while publa
+	(if (slot-boundp obj (car publa))
+	    (let ((i (class-slot-initarg cl (car publa)))
+		  (v (eieio-oref obj (car publa))))
+	      (data-debug-insert-thing
+	       v prefix (concat 
+			 (if i (symbol-name i)
+			   (symbol-name (car publa)))
+			 " ")))
+	  ;; Unbound case
+	  (let ((i (class-slot-initarg cl (car publa))))
+	    (data-debug-insert-custom
+	     "#unbound" prefix
+	     (concat (if i (symbol-name i)
+		       (symbol-name (car publa)))
+		     " ")
+	     'font-lock-keyword-face))
+	  )
+	(setq publa (cdr publa) publd (cdr publd)))
+      )))
+
+;;; Augment the Data debug thing display list.
+(data-debug-add-specialized-thing (lambda (thing) (object-p thing))
+				  #'data-debug-insert-object-button)
+
+;;; DEBUG METHODS
+;;
+;; A generic function to run DDEBUG on an object and popup a new buffer.
+;;
+;;;###autoload
+(defmethod data-debug-show ((obj eieio-default-superclass))
+  "Run ddebug against any EIEIO object OBJ"
+  (data-debug-new-buffer (format "*%s DDEBUG*" (object-name obj)))
+  (data-debug-insert-object-slots obj "]"))
+
+;;; DEBUG FUNCTIONS
+;;
+(defun eieio-debug-methodinvoke (method class)
+  "Show the method invocation order for METHOD with CLASS object."
+  (interactive "aMethod: \nXClass Expression: ")
+  (let* ((eieio-pre-method-execution-hooks
+	  (lambda (l) (throw 'moose l) ))
+	 (data
+	  (catch 'moose (eieio-generic-call
+			 method (list class))))
+	 (buf (data-debug-new-buffer "*Method Invocation*"))
+	 (data2 (mapcar (lambda (sym)
+			  (symbol-function (car sym)))
+			  data))
+	 )
+    
+    (data-debug-insert-thing data2 ">" "")))
+
+
+(provide 'eieio-datadebug)
+
+;;; eieio-datadebug.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-doc.el b/site/cedet-1.0pre7/eieio/eieio-doc.el
new file mode 100755
index 0000000..cbb72fb
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-doc.el
@@ -0,0 +1,366 @@
+;;; eieio-doc.el --- create texinfo documentation for an eieio class
+
+;;; Copyright (C) 1996, 1998, 1999, 2000, 2001, 2004, 2005 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-doc.el,v 1.20 2005/09/30 20:18:01 zappo Exp $
+;; Keywords: OO, lisp, docs
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;;  Outputs into the current buffer documentation in texinfo format
+
+(require 'eieio-opt)
+
+;;  for a class, all it's children, and all it's slots.
+
+;;; Code:
+(defvar eieiodoc-currently-in-node nil
+  "String representing the node we go BACK to.")
+
+(defvar eieiodoc-current-section-level nil
+  "String represending what type of section header to use.")
+
+(defvar eieiodoc-prev-class nil
+  "Non-nil when while `eieiodoc-recurse' is running.
+Can be referenced from the recursed function.")
+
+(defvar eieiodoc-next-class nil
+  "Non-nil when `eieiodoc-recurse' is running.
+Can be referenced from the recursed function.")
+
+(defun eieiodoc-class-nuke (root-class indexstring &optional skiplist)
+  "Call `eieiodoc-class' after nuking everything from POINT on.
+ROOT-CLASS, INDEXSTRING, and SKIPLIST are the same as `eieiodoc-class'."
+  (delete-region (point) (point-max))
+  (sit-for 0)
+  (eieiodoc-class root-class indexstring skiplist))
+
+(defun eieiodoc-class (root-class indexstring &optional skiplist)
+  "Create documentation starting with ROOT-CLASS.
+The first job is to create an indented menu of all the classes
+starting with `root-class' and including all it's children.  Once this
+is done, @nodes are created for all the subclasses.  Each node is then
+documented with a description of the class, a brief inheritance tree
+\(with xrefs) and a list of all slots in a big table.  Where each slot
+is inherited from is also documented.  In addition, each class is
+documented in the index referenced by INDEXSTRING, a two letter code
+described in the texinfo manual.
+
+The optional third argument SKIPLIST is a list of object not to put
+into any menus, nodes or lists."
+  (interactive
+   (list (intern-soft
+	  (completing-read "Class: " (eieio-build-class-alist) nil t))
+	 (read-string "Index name (2 chars): ")))
+  (if (looking-at "[ \t\n]+@end ignore")
+      (goto-char (match-end 0)))
+  (save-excursion
+    (setq eieiodoc-currently-in-node
+	  (if (re-search-backward "@node \\([^,]+\\)" nil t)
+	      (buffer-substring (match-beginning 1) (match-end 1))
+	    "Top")
+	  eieiodoc-current-section-level
+	  (if (re-search-forward "@\\(chapter\\|\\(sub\\)*section\\)"
+				 (+ (point) 500) t)
+	      (progn
+		(goto-char (match-beginning 0))
+		(cond ((looking-at "@chapter") "section")
+		      ((looking-at "@section") "subsection")
+		      ((looking-at "@\\(sub\\)+section") "subsubsection")
+		      (t "subsubsection")))
+	    "subsubsection")))
+  (save-excursion
+    (eieiodoc-main-menu root-class skiplist)
+    (insert "\n")
+    (eieiodoc-recurse root-class 'eieiodoc-one-node nil skiplist)))
+  
+(defun eieiodoc-main-menu (class skiplist)
+  "Create a menu of all classes under CLASS indented the correct amount.
+SKIPLIST is a list of objects to skip"
+  (end-of-line)
+  (insert "\n@menu\n")
+  (eieiodoc-recurse class (lambda (class level)
+			(insert "* " (make-string level ? )
+				(symbol-name class) " ::\n"))
+		nil skiplist)
+  (insert "@end menu\n"))
+
+(defun eieiodoc-one-node (class level)
+  "Create a node for CLASS, and for all subclasses of CLASS in order.
+This function should only be called by `eieiodoc-class'
+Argument LEVEL is the current level of recursion we have hit."
+  (message "Building node for %s" class)
+  (insert "\n@node " (symbol-name class) ", "
+	  (if eieiodoc-next-class (symbol-name eieiodoc-next-class) " ") ", "
+	  (if eieiodoc-prev-class (symbol-name eieiodoc-prev-class) " ") ", "
+	  eieiodoc-currently-in-node "\n"
+	  "@comment  node-name,  next,  previous,  up\n"
+	  "@" eieiodoc-current-section-level " " (symbol-name class) "\n"
+	  ;; indexstring is grabbed from parent calling function
+	  "@" indexstring "index " (symbol-name class) "\n\n")
+  ;; Now lets create a nifty little inheritance tree
+  (let ((cl class)
+	(revlist nil)
+	(depth 0))
+    (while cl
+      (setq revlist (cons cl revlist)
+	    cl (class-parent cl)))
+    (insert "@table @asis\n@item Inheritance Tree:\n")
+    (while revlist
+      ;; root-class is dragged in from the top-level function
+      (insert "@table @code\n@item "
+	      (if (and (child-of-class-p (car revlist) root-class)
+		       (not (eq class (car revlist))))
+		  (concat "@w{@xref{" (symbol-name (car revlist)) "}.}")
+		(symbol-name (car revlist)))
+	      "\n")
+      (setq revlist (cdr revlist)
+	    depth (1+ depth)))
+    ;; the value of rclass is brought in from caller
+    (let ((clist (reverse (aref (class-v rclass) class-children))))
+      (if (not clist)
+	  (insert "No children")
+	(insert "@table @asis\n@item Children:\n")
+	(while clist
+	  (insert "@w{@xref{" (symbol-name (car clist)) "}")
+	  (if (cdr clist) (insert ",") (insert "."))
+	  (insert "} ")
+	  (setq clist (cdr clist)))
+	(insert "\n@end table\n")
+	))
+    (while (> depth 0)
+      (insert "\n@end table\n")
+      (setq depth (1- depth)))
+    (insert "@end table\n\n  "))
+  ;; Now lets build some documentation by extracting information from
+  ;; the class description vector
+  (let* ((cv (class-v class))
+	 (docs (aref cv class-public-doc))
+	 (names (aref cv class-public-a))
+	 (deflt (aref cv class-public-d))
+	 (prot (aref cv class-protection))
+	 (typev (aref cv class-public-type))
+	 (i 0)
+	 (set-one nil)
+	 (anchor nil)
+	 )
+    ;; doc of the class itself
+    (insert (eieiodoc-texify-docstring (documentation class) class)
+	    "\n\n@table @asis\n")
+    (if names
+	(progn
+	  (setq anchor (point))
+	  (insert "@item Slots:\n\n@table @code\n")
+	  (while names
+	    (if (eieiodoc-one-attribute class (car names) (car docs)
+					(car prot) (car deflt) (aref typev i))
+		(setq set-one t))
+	    (setq names (cdr names)
+		  docs (cdr docs)
+		  prot (cdr prot)
+		  deflt (cdr deflt)
+		  i (1+ i)))
+	  (insert "@end table\n\n")
+	  (if (not set-one) (delete-region (point) anchor))
+	  ))
+    (insert "@end table\n")
+    ;; Finally, document all the methods associated with this class.
+    (let ((methods (eieio-all-generic-functions class))
+	  (doc nil))
+      (if (not methods) nil
+	(if (string= eieiodoc-current-section-level "subsubsection")
+	    (insert "@" eieiodoc-current-section-level)
+	  (insert "@sub" eieiodoc-current-section-level))
+	(insert " Specialized Methods\n\n")
+	(while methods
+	  (setq doc (eieio-method-documentation (car methods) class))
+	  (insert "@deffn Method " (symbol-name (car methods)))
+	  (if (not doc)
+	      (insert "\n  Undocumented")
+	    (if (car doc)
+		(progn
+		  (insert " :BEFORE ")
+		  (eieiodoc-output-deffn-args (car (car doc)))
+		  (insert "\n")
+		  (eieiodoc-insert-and-massage-docstring-with-args
+		   (cdr (car doc)) (car (car doc)) class)))
+	    (setq doc (cdr doc))
+	    (if (car doc)
+		(progn
+		  (insert " :PRIMARY ")
+		  (eieiodoc-output-deffn-args (car (car doc)))
+		  (insert "\n")
+		  (eieiodoc-insert-and-massage-docstring-with-args
+		   (cdr (car doc)) (car (car doc)) class)))
+	    (setq doc (cdr doc))
+	    (if (car doc)
+		(progn
+		  (insert " :AFTER ")
+		  (eieiodoc-output-deffn-args (car (car doc)))
+		  (insert "\n")
+		  (eieiodoc-insert-and-massage-docstring-with-args
+		   (cdr (car doc)) (car (car doc)) class)))
+	    (insert "\n@end deffn\n\n"))
+	  (setq methods (cdr methods)))))
+    ))
+
+(defun eieiodoc-insert-and-massage-docstring-with-args (doc arglst class)
+  "Update DOC with texinfo strings using ARGLST with @var.
+Argument CLASS is the class passed to `eieiodoc-texify-docstring'."
+  (let ((start (point))
+	(end nil)
+	(case-fold-search nil))
+    ;; Insert the text
+    (insert (eieiodoc-texify-docstring doc class))
+    (setq end (point))
+    (save-restriction
+      (narrow-to-region start end)
+      (save-excursion
+	;; Now find arguments
+	(while arglst
+	  (goto-char (point-min))
+	  (while (re-search-forward (upcase (symbol-name (car arglst))) nil t)
+	    (replace-match "@var{\\&}" t))
+	  (setq arglst (cdr arglst)))))))
+
+(defun eieiodoc-output-deffn-args (arglst)
+  "Output ARGLST for a deffn."
+  (while arglst
+    (insert (symbol-name (car arglst)) " ")
+    (setq arglst (cdr arglst))))
+
+(defun eieiodoc-one-attribute (class attribute doc priv deflt type)
+  "Create documentation of CLASS for a single ATTRIBUTE.
+Assume this attribute is inside a table, so it is initiated with the
+@item indicator.  If this attribute is not inserted (because it is
+contained in the parent) then return nil, else return t.
+DOC is the documentation to use, PRIV is non-nil if it is a private slot,
+and DEFLT is the default value.  TYPE is the symbol describing what type
+validation is done on that slot."
+  (let ((pv (eieiodoc-parent-diff class attribute))
+	(ia (eieio-attribute-to-initarg class attribute))
+	(set-me nil))
+    (if (or (eq pv t) (not ia))
+	nil  ;; same in parent or no init arg
+      (setq set-me t)
+      (insert "@item " (if priv "Private: " "")
+	      (symbol-name ia))
+      (if (and type (not (eq type t)))
+	  (insert "\nType: @code{" (format "%S" type) "}"))
+      (if (not (eq deflt eieio-unbound))
+	  (insert " @*\nDefault Value: @code{"(format "%S" deflt) "}"))
+      (insert "\n\n")
+      (if (eq pv 'default)
+	  ;; default differs only, xref the parent
+	  ;; This should be upgraded to actually search for the last
+	  ;; differing default (or the original.)
+	  (insert "@xref{" (symbol-name (class-parent class)) "}.\n")
+	(insert (if doc (eieiodoc-texify-docstring doc class) "Not Documented")
+		"\n@refill\n\n")))
+    set-me))
+;;;
+;; Utilities
+;;
+(defun eieiodoc-recurse (rclass func &optional level skiplist)
+  "Recurse down all children of RCLASS, calling FUNC on each one.
+LEVEL indicates the current depth below the first call we are.  The
+function FUNC will be called with RCLASS and LEVEL.  This will then
+recursivly call itself once for each child class of RCLASS.  The
+optional fourth argument SKIPLIST is a list of objects to ignore while
+recursing."
+
+  (if (not level) (setq level 0))
+
+  ;; we reverse the children so they appear in the same order as it
+  ;; does in the code that creates them.
+  (let* ((children (reverse (aref (class-v rclass) class-children)))
+	 (ocnc eieiodoc-next-class)
+	 (eieiodoc-next-class (or (car children) ocnc))
+	 (eieiodoc-prev-class eieiodoc-prev-class))
+
+    (if (not (member rclass skiplist))
+	(progn
+	  (apply func (list rclass level))
+
+	  (setq eieiodoc-prev-class rclass)))
+
+    (while children
+      (setq eieiodoc-next-class (or (car (cdr children)) ocnc))
+      (setq eieiodoc-prev-class (eieiodoc-recurse (car children) func (1+ level)))
+      (setq children (cdr children)))
+    ;; return the previous class so that the prev/next node gets it right
+    eieiodoc-prev-class))
+
+(defun eieiodoc-parent-diff (class slot)
+  "Return nil if the parent of CLASS does not have slot SLOT.
+Return t if it does, and return 'default if the default has changed."
+  (let ((df nil) (err t)
+	(scoped-class (class-parent class))
+	(eieio-skip-typecheck))
+    (condition-case nil
+	(setq df (eieio-oref-default (class-parent class) slot)
+	      err nil)
+      (invalid-slot-name (setq df nil))
+      (error (setq df nil)))
+    (if err
+	nil
+      (if (equal df (eieio-oref-default class slot))
+	  t
+	'default))))
+
+(defun eieiodoc-texify-docstring (string class)
+  "Take STRING, (a normal doc string), and convert it into a texinfo string.
+For instances where CLASS is the class being referenced, do not Xref
+that class.
+
+ `function' => @dfn{function}
+ `variable' => @code{variable}
+ `class'    => @code{class} @xref{class}
+ `unknown'  => @code{unknonwn}
+ 'quoteme   => @code{quoteme}
+ non-nil    => non-@code{nil}
+ t          => @code{t}
+ :tag       => @code{:tag}
+ [ stuff ]  => @code{[ stuff ]}
+ Key        => @kbd{Key}"
+  (while (string-match "`\\([-a-zA-Z0-9]+\\)'" string)
+    (let* ((vs (substring string (match-beginning 1) (match-end 1)))
+	   (v (intern-soft vs)))
+      (setq string
+	    (concat
+	     (replace-match (concat
+			     (if (and (not (class-p v))(fboundp v))
+				 "@dfn{" "@code{")
+			     vs "}"
+			     (if (and (class-p v) (not (eq v class)))
+				 (concat " @xref{" vs "}.")))
+			    nil t string)))))
+  (while (string-match "\\( \\|^\\|-\\)\\(nil\\|t\\|'[-a-zA-Z0-9]+\\|:[-a-zA-Z0-9]+\\)\\([ ,]\\|$\\)" string)
+    (setq string (replace-match "@code{\\2}" t nil string 2)))
+  (while (string-match "\\( \\|^\\)\\(\\[[^]]+\\]\\)\\( \\|$\\)" string)
+    (setq string (replace-match "@code{\\2}" t nil string 2)))
+  (while (string-match "\\( \\|^\\)\\(\\(\\(C-\\|M-\\|S-\\)+\\([^ \t\n]\\|RET\\|SPC\\|TAB\\)\\)\\|\\(RET\\|SPC\\|TAB\\)\\)\\( \\|$\\)" string)
+    (setq string (replace-match "@kbd{\\2}" t nil string 2)))
+  string)
+
+(provide 'eieio-doc)
+
+;;; eieio-doc.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-load.el b/site/cedet-1.0pre7/eieio/eieio-load.el
new file mode 100644
index 0000000..6c45fd9
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-load.el
@@ -0,0 +1,36 @@
+;;; eieio-load.el --- Autoload definitions for EIEIO
+
+;;; Copyright (C) 2003 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: eieio-load.el,v 1.2 2005/09/30 20:18:08 zappo Exp $
+
+;; EIEIO is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize EIEIO for all supported conditions.
+
+;;; Code:
+;;
+
+;;; EIEIO autoloads
+;;
+(load "eieio-loaddefs" nil t)
+
+(provide 'eieio-load)
+
+;;; eieio-load.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-loaddefs.el b/site/cedet-1.0pre7/eieio/eieio-loaddefs.el
new file mode 100644
index 0000000..e379a50
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-loaddefs.el
@@ -0,0 +1,196 @@
+;;; eieio-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (call-tree) "call-tree" "call-tree.el" (17213 40289))
+;;; Generated autoloads from call-tree.el
+
+(autoload 'call-tree "call-tree" "\
+Build a call tree to show all functions called by FUNC.
+
+\(fn FUNC)" t nil)
+
+;;;***
+
+;;;### (autoloads (chart-test-it-all) "chart" "chart.el" (18894 8266))
+;;; Generated autoloads from chart.el
+
+(autoload 'chart-test-it-all "chart" "\
+Test out various charting features.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (data-debug-show data-debug-insert-object-button
+;;;;;;  data-debug-insert-object-slots) "eieio-datadebug" "eieio-datadebug.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from eieio-datadebug.el
+
+(autoload 'data-debug-insert-object-slots "eieio-datadebug" "\
+Insert all the slots of OBJECT.
+PREFIX specifies what to insert at the start of each line.
+
+\(fn OBJECT PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-object-button "eieio-datadebug" "\
+Insert a button representing OBJECT.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between PREFIX and the object button.
+
+\(fn OBJECT PREFIX PREBUTTONTEXT)" nil nil)
+
+(autoload 'data-debug-show "eieio-datadebug" "\
+Run ddebug against any EIEIO object OBJ
+
+\(fn (OBJ eieio-default-superclass))" nil nil)
+
+;;;***
+
+;;;### (autoloads (eieio-describe-generic eieio-build-class-alist
+;;;;;;  eieio-describe-constructor eieio-describe-class eieio-browse)
+;;;;;;  "eieio-opt" "eieio-opt.el" (19033 61958))
+;;; Generated autoloads from eieio-opt.el
+
+(autoload 'eieio-browse "eieio-opt" "\
+Create an object browser window to show all objects.
+If optional ROOT-CLASS, then start with that, otherwise start with
+variable `eieio-default-superclass'.
+
+\(fn &optional ROOT-CLASS)" t nil)
+
+(defalias 'describe-class 'eieio-describe-class)
+
+(autoload 'eieio-describe-class "eieio-opt" "\
+Describe a CLASS defined by a string or symbol.
+If CLASS is actually an object, then also display current values of that obect.
+Optional HEADERFCN should be called to insert a few bits of info first.
+
+\(fn CLASS &optional HEADERFCN)" t nil)
+
+(autoload 'eieio-describe-constructor "eieio-opt" "\
+Describe the constructor function FCN.
+Uses `eieio-describe-class' to describe the class being constructed.
+
+\(fn FCN)" t nil)
+
+(autoload 'eieio-build-class-alist "eieio-opt" "\
+Return an alist of all currently active classes for completion purposes.
+Optional argument CLASS is the class to start with.
+If INSTANTIABLE-ONLY is non nil, only allow names of classes which
+are not abstract, otherwise allow all classes.
+Optional argument BUILDLIST is more list to attach and is used internally.
+
+\(fn &optional CLASS INSTANTIABLE-ONLY BUILDLIST)" nil nil)
+
+(defalias 'describe-method 'eieio-describe-generic)
+
+(defalias 'describe-generic 'eieio-describe-generic)
+
+(defalias 'eieio-describe-method 'eieio-describe-generic)
+
+(autoload 'eieio-describe-generic "eieio-opt" "\
+Describe the generic function GENERIC.
+Also extracts information about all methods specific to this generic.
+
+\(fn GENERIC)" t nil)
+
+;;;***
+
+;;;### (autoloads (eieio-perftest-onemethodcall eieio-perftest-methodcall)
+;;;;;;  "eieio-perftest" "eieio-perftest.el" (19010 46106))
+;;; Generated autoloads from eieio-perftest.el
+
+(autoload 'eieio-perftest-methodcall "eieio-perftest" "\
+Test and time performance of method invocation.
+
+\(fn)" t nil)
+
+(autoload 'eieio-perftest-onemethodcall "eieio-perftest" "\
+Test and time performance of method invocation.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (object-write-xml) "eieio-xml" "eieio-xml.el" (18656
+;;;;;;  8049))
+;;; Generated autoloads from eieio-xml.el
+
+(autoload 'object-write-xml "eieio-xml" "\
+Write object THIS out to the current stream as XML.
+  If optional COMMENT is non-nil, include comments when outputting
+this object.
+@todo - support arbitrary schema output
+
+\(fn (THIS eieio-default-superclass) &optional COMMENT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (enable-visual-studio-bookmarks) "linemark" "linemark.el"
+;;;;;;  (18791 54624))
+;;; Generated autoloads from linemark.el
+
+(autoload 'enable-visual-studio-bookmarks "linemark" "\
+Bind the viss bookmark functions to F2 related keys.
+\\<global-map>
+\\[viss-bookmark-toggle]     - To=ggle a bookmark on this line.
+\\[viss-bookmark-next-buffer]   - Move to the next bookmark.
+\\[viss-bookmark-prev-buffer]   - Move to the previous bookmark.
+\\[viss-bookmark-clear-all-buffer] - Clear all bookmarks.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (lmcompile-do-highlight) "lmcompile" "lmcompile.el"
+;;;;;;  (18791 54642))
+;;; Generated autoloads from lmcompile.el
+
+(autoload 'lmcompile-do-highlight "lmcompile" "\
+Do compilation mode highlighting.
+Works on grep, compile, or other type mode.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (directory-tree-thing eieio-class-tree tree-test-it-all)
+;;;;;;  "tree" "tree.el" (17213 40344))
+;;; Generated autoloads from tree.el
+
+(autoload 'tree-test-it-all "tree" "\
+Try using various features of tree mode in a demo of it's display.
+
+\(fn)" t nil)
+
+(autoload 'eieio-class-tree "tree" "\
+Displays a class tree using the TREE package in another buffer.
+Optional argument ROOT-CLASS is the starting point.
+
+\(fn &optional ROOT-CLASS)" t nil)
+
+(autoload 'directory-tree-thing "tree" "\
+Start at the current directory, and build a giant tree of files.
+Argument PPATH is the path to the directory we are going to analyze.
+
+\(fn PPATH)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("eieio-base.el" "eieio-comp.el" "eieio-custom.el"
+;;;;;;  "eieio-doc.el" "eieio-load.el" "eieio-speedbar.el" "eieio-test-methodinvoke.el"
+;;;;;;  "eieio-tests.el" "eieio.el" "eieiocomp.el" "psql.el") (19335
+;;;;;;  11024 550603))
+
+;;;***
+
+(provide 'eieio-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; eieio-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-opt.el b/site/cedet-1.0pre7/eieio/eieio-opt.el
new file mode 100755
index 0000000..ad5c5d7
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-opt.el
@@ -0,0 +1,703 @@
+;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar)
+
+;;; Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-opt.el,v 1.39 2009/07/12 14:24:06 zappo Exp $
+;; Keywords: OO, lisp
+;;                                                                          
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;           
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;;   This contains support functions to eieio.  These functions contain
+;; some small class browser and class printing functions.
+;;
+
+(require 'eieio)
+
+;;; Code:
+;;;###autoload
+(defun eieio-browse (&optional root-class)
+  "Create an object browser window to show all objects.
+If optional ROOT-CLASS, then start with that, otherwise start with
+variable `eieio-default-superclass'."
+  (interactive (if current-prefix-arg
+		   (list (read (completing-read "Class: "
+						(eieio-build-class-alist)
+						nil t)))
+		 nil))
+  (if (not root-class) (setq root-class 'eieio-default-superclass))
+  (if (not (class-p root-class)) (signal 'wrong-type-argument (list 'class-p root-class)))
+  (display-buffer (get-buffer-create "*EIEIO OBJECT BROWSE*") t)
+  (save-excursion
+    (set-buffer (get-buffer "*EIEIO OBJECT BROWSE*"))
+    (erase-buffer)
+    (goto-char 0)
+    (eieio-browse-tree root-class "" "")
+    ))
+
+(defun eieio-browse-tree (this-root prefix ch-prefix)
+  "Recursively, draws the children of the given class on the screen.
+Argument THIS-ROOT is the local root of the tree.
+Argument PREFIX is the character prefix to use.
+Argument CH-PREFIX is another character prefix to display."
+  (if (not (class-p (eval this-root))) (signal 'wrong-type-argument (list 'class-p this-root)))
+  (let ((myname (symbol-name this-root))
+	(chl (aref (class-v this-root) class-children))
+	(fprefix (concat ch-prefix "  +--"))
+	(mprefix (concat ch-prefix "  |  "))
+	(lprefix (concat ch-prefix "     ")))
+    (insert prefix myname "\n")
+    (while (cdr chl)
+      (eieio-browse-tree (car chl) fprefix mprefix)
+      (setq chl (cdr chl)))
+    (if chl
+	(eieio-browse-tree (car chl) fprefix lprefix))
+    ))
+
+;;; CLASS COMPLETION / DOCUMENTATION
+;;;###autoload
+(defalias 'describe-class 'eieio-describe-class)
+;;;###autoload
+(defun eieio-describe-class (class &optional headerfcn)
+  "Describe a CLASS defined by a string or symbol.
+If CLASS is actually an object, then also display current values of that obect.
+Optional HEADERFCN should be called to insert a few bits of info first."
+  (interactive (list (eieio-read-class "Class: ")))
+  (with-output-to-temp-buffer (help-buffer) ;"*Help*"
+    (help-setup-xref (list #'eieio-describe-class class headerfcn)
+		     (interactive-p))
+
+    (when headerfcn (funcall headerfcn))
+
+    (if (class-option class :abstract)
+	(princ "Abstract "))
+    (princ "Class ")
+    (prin1 class)
+    (terpri)
+    ;; Inheritence tree information
+    (let ((pl (class-parents class)))
+      (when pl
+	(princ " Inherits from ")
+	(while pl
+	  (princ "`") (prin1 (car pl)) (princ "'")
+	  (setq pl (cdr pl))
+	  (if pl (princ ", ")))
+	(terpri)))
+    (let ((ch (class-children class)))
+      (when ch
+	(princ " Children ")
+	(while ch
+	  (princ "`") (prin1 (car ch)) (princ "'")
+	  (setq ch (cdr ch))
+	  (if ch (princ ", ")))
+	(terpri)))
+    (terpri)
+    ;; System documentation
+    (let ((doc (documentation-property class 'variable-documentation)))
+      (when doc
+	(princ "Documentation:")
+	(terpri)
+	(princ doc)
+	(terpri)
+	(terpri)))
+    ;; Describe all the slots in this class
+    (eieio-describe-class-slots class)
+    ;; Describe all the methods specific to this class.
+    (let ((methods (eieio-all-generic-functions class))
+	  (doc nil))
+      (if (not methods) nil
+	(princ "Specialized Methods:")
+	(terpri)
+	(terpri)
+	(while methods
+	  (setq doc (eieio-method-documentation (car methods) class))
+	  (princ "`")
+	  (prin1 (car methods))
+	  (princ "'")
+	  (if (not doc)
+	      (princ "  Undocumented")
+	    (if (car doc)
+		(progn
+		  (princ "  :STATIC ")
+		  (prin1 (car (car doc)))
+		  (terpri)
+		  (princ (cdr (car doc)))))
+	    (setq doc (cdr doc))
+	    (if (car doc)
+		(progn
+		  (princ "  :BEFORE ")
+		  (prin1 (car (car doc)))
+		  (terpri)
+		  (princ (cdr (car doc)))))
+	    (setq doc (cdr doc))
+	    (if (car doc)
+		(progn
+		  (princ "  :PRIMARY ")
+		  (prin1 (car (car doc)))
+		  (terpri)
+		  (princ (cdr (car doc)))))
+	    (setq doc (cdr doc))
+	    (if (car doc)
+		(progn
+		  (princ "  :AFTER ")
+		  (prin1 (car (car doc)))
+		  (terpri)
+		  (princ (cdr (car doc)))))
+	    (terpri)
+	    (terpri))
+	  (setq methods (cdr methods))))))
+  (save-excursion
+    (set-buffer (help-buffer))
+    (buffer-string)))
+
+(defun eieio-describe-class-slots (class)
+  "Describe the slots in CLASS.
+Outputs to the standard output."
+  (let* ((cv (class-v class))
+	 (docs   (aref cv class-public-doc))
+	 (names  (aref cv class-public-a))
+	 (deflt  (aref cv class-public-d))
+	 (types  (aref cv class-public-type))
+	 (publp (aref cv class-public-printer))
+	 (i      0)
+	 (prot   (aref cv class-protection))
+	 )
+    (princ "Instance Allocated Slots:")
+    (terpri)
+    (terpri)
+    (while names
+      (if (car prot) (princ "Private "))
+      (princ "Slot: ")
+      (prin1 (car names))
+      (when (not (eq (aref types i) t))
+	(princ "    type = ")
+	(prin1 (aref types i)))
+      (unless (eq (car deflt) eieio-unbound)
+	(princ "    default = ")
+	(prin1 (car deflt)))
+      (when (car publp)
+	(princ "    printer = ")
+	(prin1 (car publp)))
+      (when (car docs)
+	(terpri)
+	(princ "  ")
+	(princ (car docs))
+	(terpri))
+      (terpri)
+      (setq names (cdr names)
+	    docs (cdr docs)
+	    deflt (cdr deflt)
+	    publp (cdr publp)
+	    prot (cdr prot)
+	    i (1+ i)))
+    (setq docs  (aref cv class-class-allocation-doc)
+	  names (aref cv class-class-allocation-a)
+	  types (aref cv class-class-allocation-type)
+	  i     0
+	  prot  (aref cv class-class-allocation-protection))
+    (when names
+	(terpri)
+	(princ "Class Allocated Slots:"))
+	(terpri)
+	(terpri)
+    (while names
+      (when (car prot)
+	(princ "Private "))
+      (princ "Slot: ")
+      (prin1 (car names))
+      (unless (eq (aref types i) t)
+	(princ "    type = ")
+	(prin1 (aref types i)))
+      (condition-case nil
+	  (let ((value (eieio-oref class (car names))))
+	    (princ "   value = ")
+	    (prin1 value))
+	  (error nil))
+      (when (car docs)
+	(terpri)
+	(princ "  ")
+	(princ (car docs))
+	(terpri))
+      (terpri)
+      (setq names (cdr names)
+	    docs (cdr docs)
+	    prot (cdr prot)
+	    i (1+ i)))))
+
+;;;###autoload
+(defun eieio-describe-constructor (fcn)
+  "Describe the constructor function FCN.
+Uses `eieio-describe-class' to describe the class being constructed."
+  (interactive
+   ;; Use eieio-read-class since all constructors have the same name as
+   ;; the class they create.
+   (list (eieio-read-class "Class: ")))
+  (eieio-describe-class
+   fcn (lambda ()
+	 ;; Describe the constructor part.
+	 (princ "Object Constructor Function: ")
+	 (prin1 fcn)
+	 (terpri)
+	 (princ "Creates an object of class ")
+	 (prin1 fcn)
+	 (princ ".")
+	 (terpri)
+	 (terpri)
+	 ))
+  )
+
+;;;###autoload
+(defun eieio-build-class-alist (&optional class instantiable-only buildlist)
+  "Return an alist of all currently active classes for completion purposes.
+Optional argument CLASS is the class to start with.
+If INSTANTIABLE-ONLY is non nil, only allow names of classes which
+are not abstract, otherwise allow all classes.
+Optional argument BUILDLIST is more list to attach and is used internally."
+  (let* ((cc (or class eieio-default-superclass))
+	 (sublst (aref (class-v cc) class-children)))
+    (if (or (not instantiable-only) (not (class-abstract-p cc)))
+	(setq buildlist (cons (cons (symbol-name cc) 1) buildlist)))
+    (while sublst
+      (setq buildlist (eieio-build-class-alist
+		       (car sublst) instantiable-only buildlist))
+      (setq sublst (cdr sublst)))
+    buildlist))
+
+(defvar eieio-read-class nil
+  "History of the function `eieio-read-class' prompt.")
+
+(defun eieio-read-class (prompt &optional histvar instantiable-only)
+  "Return a class chosen by the user using PROMPT.
+Optional argument HISTVAR is a variable to use as history.
+If INSTANTIABLE-ONLY is non nil, only allow names of classes which
+are not abstract."
+  (intern (completing-read prompt (eieio-build-class-alist nil instantiable-only)
+			   nil t nil
+			   (or histvar 'eieio-read-class))))
+
+(defun eieio-read-subclass (prompt class &optional histvar instantiable-only)
+  "Return a class chosen by the user using PROMPT.
+CLASS is the base class, and completion occurs across all subclasses.
+Optional argument HISTVAR is a variable to use as history.
+If INSTANTIABLE-ONLY is non nil, only allow names of classes which
+are not abstract."
+  (intern (completing-read prompt
+			   (eieio-build-class-alist class instantiable-only)
+			   nil t nil
+			   (or histvar 'eieio-read-class))))
+
+;;; METHOD COMPLETION / DOC
+;;
+;;;###autoload
+(defalias 'describe-method 'eieio-describe-generic)
+;;;###autoload
+(defalias 'describe-generic 'eieio-describe-generic)
+;;;###autoload
+(defalias 'eieio-describe-method 'eieio-describe-generic)
+;;;###autoload
+(defun eieio-describe-generic (generic)
+  "Describe the generic function GENERIC.
+Also extracts information about all methods specific to this generic."
+  (interactive (list (eieio-read-generic "Generic Method: ")))
+  (if (not (generic-p generic))
+      (signal 'wrong-type-argument '(generic-p generic)))
+  (with-output-to-temp-buffer (help-buffer) ; "*Help*"
+    (help-setup-xref (list #'eieio-describe-generic generic) (interactive-p))
+
+    (prin1 generic)
+    (princ " is a generic function")
+    (when (generic-primary-only-p generic)
+      (princ " with only ")
+      (when (generic-primary-only-one-p generic)
+	(princ "one "))
+      (princ "primary method")
+      (when (not (generic-primary-only-one-p generic))
+	(princ "s"))
+      )
+    (princ ".")
+    (terpri)
+    (terpri)
+    (let ((d (documentation generic)))
+      (if (not d)
+	  (princ "The generic is not documented.\n")
+	(princ "Documentation:")
+	(terpri)
+	(princ d)
+	(terpri)
+	(terpri)))
+    (princ "Implementations:")
+    (terpri)
+    (terpri)
+    (let ((i 3)
+	  (prefix [ ":STATIC" ":BEFORE" ":PRIMARY" ":AFTER" ] ))
+      ;; Loop over fanciful generics
+      (while (< i 6)
+	(let ((gm (aref (get generic 'eieio-method-tree) i)))
+	  (when gm
+	    (princ "Generic ")
+	    (princ (aref prefix (- i 3)))
+	    (terpri)
+	    (princ (or (nth 2 gm) "Undocumented"))
+	    (terpri)
+	    (terpri)))
+	(setq i (1+ i)))
+      (setq i 0)
+      ;; Loop over defined class-specific methods
+      (while (< i 3)
+	(let ((gm (reverse (aref (get generic 'eieio-method-tree) i))))
+	  (while gm
+	    (princ "`")
+	    (prin1 (car (car gm)))
+	    (princ "'")
+	    ;; prefix type
+	    (princ " ")
+	    (princ (aref prefix i))
+	    (princ " ")
+	    ;; argument list
+	    (let* ((func (cdr (car gm)))
+		   (arglst (eieio-lambda-arglist func)))
+	      (prin1 arglst))
+	    (terpri)
+	    ;; 3 because of cdr
+	    (princ (or (documentation (cdr (car gm)))
+		       "Undocumented"))
+	    (setq gm (cdr gm))
+	    (terpri)
+	    (terpri)))
+	(setq i (1+ i)))))
+  (save-excursion
+    (set-buffer (help-buffer))
+    (buffer-string)))
+
+(defun eieio-lambda-arglist (func)
+  "Return the argument list of FUNC, a function body."
+  (if (symbolp func) (setq func (symbol-function func)))
+  (if (byte-code-function-p func)
+      (eieio-compiled-function-arglist func)
+    (car (cdr func))))
+
+(defun eieio-all-generic-functions (&optional class)
+  "Return a list of all generic functions.
+Optional CLASS argument returns only those functions that contain methods for CLASS."
+  (let ((l nil) tree (cn (if class (symbol-name class) nil)))
+    (mapatoms
+     (lambda (symbol)
+       (setq tree (get symbol 'eieio-method-obarray))
+       (if tree
+	   (progn
+	     ;; A symbol might be interned for that class in one of
+	     ;; these three slots in the method-obarray.
+	     (if (or (not class)
+		     (fboundp (intern-soft cn (aref tree 0)))
+		     (fboundp (intern-soft cn (aref tree 1)))
+		     (fboundp (intern-soft cn (aref tree 2))))
+		 (setq l (cons symbol l)))))))
+    l))
+
+(defun eieio-method-documentation (generic class)
+  "Return a list of the specific documentation of GENERIC for CLASS.
+If there is not an explicit method for CLASS in GENERIC, or if that
+function has no documentation, then return nil."
+  (let ((tree (get generic 'eieio-method-obarray))
+	(cn (symbol-name class))
+	before primary after)
+    (if (not tree)
+	nil
+      ;; A symbol might be interned for that class in one of
+      ;; these three slots in the method-obarray.
+      (setq before (intern-soft cn (aref tree 0))
+	    primary (intern-soft cn (aref tree 1))
+	    after (intern-soft cn (aref tree 2)))
+      (if (not (or (fboundp before)
+		   (fboundp primary)
+		   (fboundp after)))
+	  nil
+	(list (if (fboundp before)
+		  (cons (eieio-lambda-arglist before)
+			(documentation before))
+		nil)
+	      (if (fboundp primary)
+		  (cons (eieio-lambda-arglist primary)
+			(documentation primary))
+		nil)
+	      (if (fboundp after)
+		  (cons (eieio-lambda-arglist after)
+			(documentation after))
+		nil))))))
+
+(defvar eieio-read-generic nil
+  "History of the `eieio-read-generic' prompt.")
+
+(defun eieio-read-generic-p (fn)
+  "Function used in function `eieio-read-generic'.
+This is because `generic-p' is a macro.
+Argument FN is the function to test."
+  (generic-p fn))
+
+(defun eieio-read-generic (prompt &optional historyvar)
+  "Read a generic function from the minibuffer with PROMPT.
+Optional argument HISTORYVAR is the variable to use as history."
+  (intern (completing-read prompt obarray 'eieio-read-generic-p
+			   t nil (or historyvar 'eieio-read-generic))))
+
+;;; METHOD STATS
+;;
+;; Dump out statistics about all the active methods in a session.
+(defun eieio-display-method-list ()
+  "Display a list of all the methods and what features are used."
+  (interactive)
+  (let* ((meth1 (eieio-all-generic-functions))
+	 (meth (sort meth1 (lambda (a b)
+			     (string< (symbol-name a)
+				      (symbol-name b)))))
+	 (buff (get-buffer-create "*EIEIO Method List*"))
+	 (methidx 0)
+	 (standard-output buff)
+	 (slots '(method-static
+		  method-before
+		  method-primary
+		  method-after
+		  method-generic-before
+		  method-generic-primary
+		  method-generic-after))
+	 (slotn '("static"
+		  "before"
+		  "primary"
+		  "after"
+		  "G bef"
+		  "G prim"
+		  "G aft"))
+	 (idxarray (make-vector (length slots) 0))
+	 (primaryonly 0)
+	 (oneprimary 0)
+	 )
+    (switch-to-buffer-other-window buff)
+    (erase-buffer)
+    (dolist (S slotn)
+      (princ S)
+      (princ "\t")
+      )
+    (princ "Method Name")
+    (terpri)
+    (princ "--------------------------------------------------------------------")
+    (terpri)
+    (dolist (M meth)
+      (let ((mtree (get M 'eieio-method-tree))
+	    (P nil) (numP)
+	    (!P nil))
+	(dolist (S slots)
+	  (let ((num (length (aref mtree (symbol-value S)))))
+	    (aset idxarray (symbol-value S)
+		  (+ num (aref idxarray (symbol-value S))))
+	    (prin1 num)
+	    (princ "\t")
+	    (when (< 0 num)
+	      (if (eq S 'method-primary)
+		  (setq P t numP num)
+		(setq !P t)))
+	    ))
+	;; Is this a primary-only impl method?
+	(when (and P (not !P))
+	  (setq primaryonly (1+ primaryonly))
+	  (when (= numP 1)
+	    (setq oneprimary (1+ oneprimary))
+	    (princ "*"))
+	  (princ "* ")
+	  )
+	(prin1 M)
+	(terpri)
+	(setq methidx (1+ methidx))
+	)
+      )
+    (princ "--------------------------------------------------------------------")
+    (terpri)
+    (dolist (S slots)
+      (prin1 (aref idxarray (symbol-value S)))
+      (princ "\t")
+      )
+    (prin1 methidx)
+    (princ " Total symbols")
+    (terpri)
+    (dolist (S slotn)
+      (princ S)
+      (princ "\t")
+      )
+    (terpri)
+    (terpri)
+    (princ "Methods Primary Only: ")
+    (prin1 primaryonly)
+    (princ "\t")
+    (princ (format "%d" (* (/ (float primaryonly) (float methidx)) 100)))
+    (princ "% of total methods")
+    (terpri)
+    (princ "Only One Primary Impl: ")
+    (prin1 oneprimary)
+    (princ "\t")
+    (princ (format "%d" (* (/ (float oneprimary) (float primaryonly)) 100)))
+    (princ "% of total primary methods")
+    (terpri)
+    ))
+
+;;; HELP AUGMENTATION
+;;
+(defun eieio-help-mode-augmentation-maybee (&rest unused)
+  "For buffers thrown into help mode, augment for eieio.
+Arguments UNUSED are not used."
+  ;; Scan created buttons so far if we are in help mode.
+  (when (eq major-mode 'help-mode)
+    (save-excursion
+      (goto-char (point-min))
+      (let ((pos t) (inhibit-read-only t))
+	(while pos
+	  (if (get-text-property (point) 'help-xref) ; move off reference
+	      (goto-char
+	       (or (next-single-property-change (point) 'help-xref)
+		   (point))))
+	  (setq pos (next-single-property-change (point) 'help-xref))
+	  (when pos
+	    (goto-char pos)
+	    (let* ((help-data (get-text-property (point) 'help-xref))
+		   ;(method (car help-data))
+		   (args (cdr help-data)))
+	      (when (symbolp (car args))
+		(cond ((class-p (car args))
+		       (setcar help-data 'eieio-describe-class))
+		      ((generic-p (car args))
+		       (setcar help-data 'eieio-describe-generic))
+		      (t nil))
+		))))
+	;; start back at the beginning, and highlight some sections
+	(goto-char (point-min))
+	(while (re-search-forward "^\\(Documentation\\|Implementations\\):$" nil t)
+	    (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+	(goto-char (point-min))
+	(if (re-search-forward "^Specialized Methods:$" nil t)
+	    (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+	(goto-char (point-min))
+	(while (re-search-forward "^\\(Instance\\|Class\\) Allocated Slots:$" nil t)
+	    (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+	(goto-char (point-min))
+	(while (re-search-forward ":\\(STATIC\\|BEFORE\\|AFTER\\|PRIMARY\\)" nil t)
+	    (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+	(goto-char (point-min))
+	(while (re-search-forward "^\\(Private \\)?Slot:" nil t)
+	    (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+	))))
+
+;;; SPEEDBAR SUPPORT
+;;
+(eval-when-compile
+  (condition-case nil
+      (require 'speedbar)
+    (error (message "Error loading speedbar... ignored."))))
+
+(defvar eieio-class-speedbar-key-map nil
+  "Keymap used when working with a project in speedbar.")
+
+(defun eieio-class-speedbar-make-map ()
+  "Make a keymap for eieio under speedbar."
+  (setq eieio-class-speedbar-key-map (speedbar-make-specialized-keymap))
+
+  ;; General viewing stuff
+  (define-key eieio-class-speedbar-key-map "\C-m" 'speedbar-edit-line)
+  (define-key eieio-class-speedbar-key-map "+" 'speedbar-expand-line)
+  (define-key eieio-class-speedbar-key-map "-" 'speedbar-contract-line)
+  )
+
+(if eieio-class-speedbar-key-map
+    nil
+  (if (not (featurep 'speedbar))
+      (add-hook 'speedbar-load-hook (lambda ()
+				      (eieio-class-speedbar-make-map)
+				      (speedbar-add-expansion-list
+				       '("EIEIO"
+					 eieio-class-speedbar-menu
+					 eieio-class-speedbar-key-map
+					 eieio-class-speedbar))))
+    (eieio-class-speedbar-make-map)
+    (speedbar-add-expansion-list '("EIEIO"
+				   eieio-class-speedbar-menu
+				   eieio-class-speedbar-key-map
+				   eieio-class-speedbar))))
+
+(defvar eieio-class-speedbar-menu
+  ()
+  "Menu part in easymenu format used in speedbar while in `eieio' mode.")
+
+(defun eieio-class-speedbar (dir-or-object depth)
+  "Create buttons in speedbar that represents the current project.
+DIR-OR-OBJECT is the object to expand, or nil, and DEPTH is the current
+expansion depth."
+  (when (eq (point-min) (point-max))
+    ;; This function is only called once, to start the whole deal.
+    ;; Ceate, and expand the default object.
+    (eieio-class-button eieio-default-superclass 0)
+    (forward-line -1)
+    (speedbar-expand-line)))
+
+(defun eieio-class-button (class depth)
+  "Draw a speedbar button at the current point for CLASS at DEPTH."
+  (if (not (class-p class))
+      (signal 'wrong-type-argument (list 'class-p class)))
+  (let ((subclasses (aref (class-v class) class-children)))
+    (if subclasses
+	(speedbar-make-tag-line 'angle ?+
+				'eieio-sb-expand
+				class
+				(symbol-name class)
+				'eieio-describe-class-sb
+				class
+				'speedbar-directory-face
+				depth)
+      (speedbar-make-tag-line 'angle ?  nil nil
+			      (symbol-name class)
+			      'eieio-describe-class-sb
+			      class
+			      'speedbar-directory-face
+			      depth))))
+
+(defun eieio-sb-expand (text class indent)
+  "For button TEXT, expand CLASS at the current location.
+Argument INDENT is the depth of indentation."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (let ((subclasses (aref (class-v class) class-children)))
+	       (while subclasses
+		 (eieio-class-button (car subclasses) (1+ indent))
+		 (setq subclasses (cdr subclasses)))))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defun eieio-describe-class-sb (text token indent)
+  "Describe the class TEXT in TOKEN.
+INDENT is the current indentation level."
+  (speedbar-with-attached-buffer
+   (eieio-describe-class token))
+  (speedbar-maybee-jump-to-attached-frame))
+
+(provide 'eieio-opt)
+
+;;; eieio-opt.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-perftest.el b/site/cedet-1.0pre7/eieio/eieio-perftest.el
new file mode 100644
index 0000000..e261c04
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-perftest.el
@@ -0,0 +1,155 @@
+;;; eieio-perftest.el --- Performance tests
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: eieio-perftest.el,v 1.4 2009/06/24 23:17:46 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Miscelaneous performance tests
+
+;;; Code:
+
+(defclass eieio-perftest-1 ()
+  ((slot1 :initarg :slot1)
+   (slottype :initarg :slottype
+	     :type number)
+   )
+  "Baseclass for some performance tests.")
+
+(defclass eieio-perftest-2 (eieio-perftest-1)
+  ((slot3 :initarg :slot3)
+   )
+  "Subclass for some performance tests.")
+
+(defmethod eieio-perftest-meth-1 ((this eieio-perftest-1))
+  "Performance test method."
+  (+ 1 1))
+
+(defmethod eieio-perftest-meth-1 ((this eieio-perftest-2))
+  "Performance test method."
+  (+ 1 (call-next-method)))
+
+(defmethod eieio-perftest-meth-2 ((this eieio-perftest-1))
+  "Performance test method."
+  (+ 1 1))
+
+;;; Timing Functions
+;;
+(defun eieio-perftest-elapsed-time (start end)
+  "Copied from elp.el.  Was elp-elapsed-time.
+Argument START and END bound the time being calculated."
+  (+ (* (- (car end) (car start)) 65536.0)
+     (- (car (cdr end)) (car (cdr start)))
+     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+
+;;;###autoload
+(defun eieio-perftest-methodcall ()
+  "Test and time performance of method invocation."
+  (interactive)
+  (let ((end nil) (start nil)
+	(idx 0)
+	(one (eieio-perftest-2 "test"))
+	(gen nil)
+	(prim nil)
+	)
+    (eieio-defgeneric-reset-generic-form 'eieio-perftest-meth-1)
+    (setq start (current-time))
+    (while (> 10000 idx)
+      (assert (= (eieio-perftest-meth-1 one) 3))
+      (setq idx (1+ idx)))
+    (setq end (current-time))
+    (setq gen (eieio-perftest-elapsed-time start end))
+
+    (eieio-defgeneric-reset-generic-form-primary-only 'eieio-perftest-meth-1)
+    (setq start (current-time))
+    (setq idx 0)
+    (while (> 10000 idx)
+      (assert (= (eieio-perftest-meth-1 one) 3))
+      (setq idx (1+ idx)))
+    (setq end (current-time))
+    (setq prim (eieio-perftest-elapsed-time start end))
+
+    (let ((pcentf (* 100.0 (- 1 (/ prim gen))))
+	  (pcents (* 100.0 (- 1 (/ gen prim))))
+	  )
+
+      (message "Generic: %1.4f  Primaryonly: %1.4f sec is %1.2f%% %s"
+	       gen prim
+	       (if (> gen prim) pcentf pcents)
+	       (if (> gen prim) "faster" "slower")))
+    
+    ))
+
+;;;###autoload
+(defun eieio-perftest-onemethodcall ()
+  "Test and time performance of method invocation."
+  (interactive)
+  (let ((end nil) (start nil)
+	(idx 0)
+	(two (eieio-perftest-2 "test"))
+	(gen nil)
+	(prim nil)
+	(one nil)
+	)
+    (eieio-defgeneric-reset-generic-form 'eieio-perftest-meth-2)
+    (setq start (current-time))
+    (while (> 20000 idx)
+      (assert (= (eieio-perftest-meth-2 two) 2))
+      (setq idx (1+ idx)))
+    (setq end (current-time))
+    (setq gen (eieio-perftest-elapsed-time start end))
+
+    (eieio-defgeneric-reset-generic-form-primary-only 'eieio-perftest-meth-2)
+    (setq start (current-time))
+    (setq idx 0)
+    (while (> 20000 idx)
+      (assert (= (eieio-perftest-meth-2 two) 2))
+      (setq idx (1+ idx)))
+    (setq end (current-time))
+    (setq prim (eieio-perftest-elapsed-time start end))
+
+    (eieio-defgeneric-reset-generic-form-primary-only-one 'eieio-perftest-meth-2)
+    (setq start (current-time))
+    (setq idx 0)
+    (while (> 20000 idx)
+      (assert (= (eieio-perftest-meth-2 two) 2))
+      (setq idx (1+ idx)))
+    (setq end (current-time))
+    (setq one (eieio-perftest-elapsed-time start end))
+
+    (let ((pcentf (* 100.0 (- 1 (/ prim gen))))
+	  (pcents (* 100.0 (- 1 (/ gen prim))))
+	  (1centf (* 100.0 (- 1 (/ one gen))))
+	  (1cents (* 100.0 (- 1 (/ gen one))))
+	  )
+
+      (message "Gen: %1.4f  Prim: %1.4f is %1.2f%% %s One: %1.4f is %1.2f%% %s"
+	       gen prim
+	       (if (> gen prim) pcentf pcents)
+	       (if (> gen prim) "faster" "slower")
+	       one
+	       (if (> gen one) 1centf 1cents)
+	       (if (> gen one) "faster" "slower")
+	       ))
+    
+    ))
+
+(provide 'eieio-perftest)
+;;; eieio-perftest.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-speedbar.el b/site/cedet-1.0pre7/eieio/eieio-speedbar.el
new file mode 100755
index 0000000..fbe78b2
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-speedbar.el
@@ -0,0 +1,426 @@
+;;; eieio-speedbar.el -- Classes for managing speedbar displays.
+
+;;;
+;; Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007, 2008 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-speedbar.el,v 1.20 2008/09/29 00:20:17 zappo Exp $
+;; Keywords: oop, tools
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;  
+;;  This provides some classes that can be used as a parent which
+;; will automatically provide SPEEDBAR support for any list of objects
+;; of that type.
+;;
+;; This file requires speedbar version 0.10 or later.
+
+;;; Creating a new speedbar mode based on a pre-existing object hierarchy
+;;
+;; To create a new speedbar mode based on lists of objects is easier
+;; than creating a whole new speedbar mode from scratch.
+;;
+;; 1) Objects that will have lists of items that can be expanded
+;;    should also inherit from the classes:
+;;  * `eieio-speedbar'                  - specify your own button behavior
+;;  * `eieio-speedbar-directory-button' - objects that behave like directories
+;;  * `eieio-speedbar-file-button'      - objects that behave like files
+;;
+;; 2) Objects that have lists of children should implement the method
+;;    `eieio-speedbar-object-children' which returns a list of more
+;;    objects, or a list of strings.
+;;
+;; 3) Objects that return a list of strings should also implement these
+;;    methods:
+;;  * `eieio-speedbar-child-make-tag-lines' - make tag lines for a child.
+;;  * `eieio-speedbar-child-description' - describe non-object children
+;;
+;; 4) Objects which have expanded information should implement the method
+;;    `eieio-speedbar-description' to produce more information.
+;;
+;; 5) Objects that are associated with a directory should implement
+;;    the method `eieio-speedbar-derive-line-path' which returns a
+;;    path.
+;;
+;; 6) Objects that have a specialized behavior when clicked should
+;;    define the method `eieio-speedbar-handle-click'.
+;;
+;; To initialize a new eieio based speedbar display, do the following.
+;;
+;; 1) Create a keymap variable `foo-speedbar-key-map'.
+;;    This keymap variable should be initialized in a function.
+;;    If you have no special needs, use `eieio-speedbar-key-map'
+;;
+;; 2) Create a variable containing an easymenu definition compatible
+;;    with speedbar.  if you have no special needs, use
+;;    `eieio-speedbar-menu'.
+;;
+;; 3) Create a function which returns the top-level list of children
+;;    objects to be displayed in speedbar.
+;;
+;; 4) Call `eieio-speedbar-create' as specified in it's documentation
+;;    string.   This will automatically handle cases when speedbar is
+;;    not already loaded, and specifying all overload functions.
+;;
+;; 5) Create an initliazer function which looks like this:
+;; 
+;; (defun my-speedbar-mode-initilaize ()
+;;   "documentation"
+;;   (interactive)
+;;   (speedbar-frame-mode 1)
+;;   (speedbar-change-initial-expansion-list mymodename)
+;;   (speedbar-get-focus))
+;; 
+;; where `mymodename' is the same value as passed to `eieio-speedbar-create'
+;; as the MODENAME parameter.
+
+;; @todo - Can we make this ECB friendly?
+
+;;; Code:
+(require 'eieio)
+(require 'eieio-custom)
+(require 'speedbar)
+
+;;; Support a way of adding generic object based modes into speedbar.
+;;
+(defun eieio-speedbar-make-map ()
+  "Make the generic object based speedbar keymap."
+  (let ((map (speedbar-make-specialized-keymap)))
+
+    ;; General viewing things
+    (define-key map "\C-m" 'speedbar-edit-line)
+    (define-key map "+" 'speedbar-expand-line)
+    (define-key map "=" 'speedbar-expand-line)
+    (define-key map "-" 'speedbar-contract-line)
+
+    ;; Some object based things
+    (define-key map "C" 'eieio-speedbar-customize-line)
+    map))
+
+(defvar eieio-speedbar-key-map (eieio-speedbar-make-map)
+  "A Generic object based speedbar display keymap.")
+
+(defvar eieio-speedbar-menu
+  '([ "Edit Object/Field" speedbar-edit-line t]
+    [ "Expand Object" speedbar-expand-line
+      (save-excursion (beginning-of-line)
+		      (looking-at "[0-9]+: *.\\+. "))]
+    [ "Contract Object" speedbar-contract-line
+      (save-excursion (beginning-of-line)
+		      (looking-at "[0-9]+: *.-. "))]
+    "---"
+    [ "Customize Object" eieio-speedbar-customize-line
+      (eieio-object-p (speedbar-line-token)) ]
+    )
+  "Menu part in easymenu format used in speedbar while browsing objects.")
+
+;; Note to self:  Fix this silly thing!
+(defalias 'eieio-speedbar-customize-line  'speedbar-edit-line)
+
+(defun eieio-speedbar-create (map-fn map-var menu-var modename fetcher)
+  "Create a speedbar mode for displaying an object hierarchy.
+MAP-FN is the keymap generator function used for extra keys.
+MAP-VAR is the keymap variable used.
+MENU-VAR is the symbol containting an easymenu compatible menu part to use.
+MODENAME is a s tring used to identify this browser mode.
+FETCHER is a generic function used to fetch the base object list used when
+creating the speedbar display."
+  (if (not (featurep 'speedbar))
+      (add-hook 'speedbar-load-hook
+		(list 'lambda nil
+		      (list 'eieio-speedbar-create-engine
+			    map-fn map-var menu-var modename fetcher)))
+    (eieio-speedbar-create-engine map-fn map-var menu-var modename fetcher)))
+
+(defun eieio-speedbar-create-engine (map-fn map-var menu-var modename fetcher)
+  "Create a speedbar mode for displaying an object hierarchy.
+Called from `eieio-speedbar-create', or the speedbar load-hook.
+MAP-FN, MAP-VAR, MENU-VAR, MODENAME, and FETCHER are the same as
+`eieio-speedbar-create'."
+  ;; make sure the keymap exists
+  (funcall map-fn)
+  ;; Add to the expansion list.
+  (speedbar-add-expansion-list
+   (list modename
+	 menu-var
+	 map-var
+	 (list 'lambda '(dir depth)
+	       (list 'eieio-speedbar-buttons 'dir 'depth
+		     (list 'quote fetcher)))))
+  ;; Set the special functions.
+  (speedbar-add-mode-functions-list
+   (list modename
+	 '(speedbar-item-info . eieio-speedbar-item-info)
+	 '(speedbar-line-directory . eieio-speedbar-line-path))))
+
+(defun eieio-speedbar-buttons (dir-or-object depth fetcher)
+  "Create buttons for the speedbar display.
+Start in directory DIR-OR-OBJECT.  If it is an object, just display that
+objects subelements.
+Argument DEPTH specifies how far down we have already been displayed.
+If it is a directory, use FETCHER to fetch all objects associated with
+that path."
+  (let ((objlst (cond ((eieio-object-p dir-or-object)
+		       (list dir-or-object))
+		      ((stringp dir-or-object)
+		       (funcall fetcher dir-or-object))
+		      (t dir-or-object))))
+    (if (not objlst)
+	(speedbar-make-tag-line nil nil nil nil "Empty display" nil nil nil
+				depth)
+      ;; Dump all objects into speedbar
+      (while objlst
+	(eieio-speedbar-make-tag-line (car objlst) depth)
+	(setq objlst (cdr objlst))))))
+
+
+;;; DEFAULT SUPERCLASS baseline methods
+;;
+;; First, define methods onto the superclass so all classes
+;; will have some minor support.
+
+(defmethod eieio-speedbar-description ((object eieio-default-superclass))
+  "Return a string describing OBJECT."
+  (object-name-string object))
+
+(defmethod eieio-speedbar-derive-line-path ((object eieio-default-superclass))
+  "Return the path which OBJECT has something to do with."
+  nil)
+
+(defmethod eieio-speedbar-object-buttonname ((object eieio-default-superclass))
+  "Return a string to use as a speedbar button for OBJECT."
+  (object-name-string object))
+
+(defmethod eieio-speedbar-make-tag-line ((object eieio-default-superclass)
+					 depth)
+  "Insert a tag line into speedbar at point for OBJECT.
+By default, all objects appear as simple TAGS with no need to inherit from
+the special `eieio-speedbar' classes.  Child classes should redefine this
+method to create more accurate tag lines.
+Argument DEPTH is the depth at which the tag line is inserted."
+  (speedbar-make-tag-line nil nil nil nil
+			  (eieio-speedbar-object-buttonname object)
+			  'eieio-speedbar-object-click
+			  object
+			  'speedbar-tag-face
+			  depth))
+
+(defmethod eieio-speedbar-handle-click ((object eieio-default-superclass))
+  "Handle a click action on OBJECT in speedbar.
+Any object can be represented as a tag in SPEEDBAR without special
+attributes.  These default objects will be pulled up in a custom
+object edit buffer doing an in-place edit.
+
+If your object represents some other item, override this method
+and take the apropriate action."
+  (require 'eieio-custom)
+  (speedbar-with-attached-buffer
+   (eieio-customize-object object))
+  (speedbar-maybee-jump-to-attached-frame))
+
+
+;;; Class definitions
+;;
+;; Now define a special speedbar class with some
+;; variables with :allocation class which can be attached into
+;; object hierarchies.
+;;
+;; These more complex types are for objects which wish to display
+;; lists of children buttons.
+
+(defclass eieio-speedbar nil
+  ((buttontype :initform nil
+	       :type symbol
+	       :documentation
+	       "The type of expansion button used for objects of this class.
+Possible values are those symbols supported by the `exp-button-type' argument
+to `speedbar-make-tag-line'."
+	       :allocation :class)
+   (buttonface :initform speedbar-tag-face
+	       :type (or symbol face)
+	       :documentation
+	       "The face used on the textual part of the button for this class.
+See `speedbar-make-tag-line' for details."
+	       :allocation :class)
+   (expanded :initform nil
+	     :type boolean
+	     :documentation
+	     "State of an object being expanded in speedbar.")
+   )
+  "Class which provides basic speedbar support for child classes.
+Add one of thie child classes to this class to the parent list of a class."
+  :method-invocation-order :depth-first
+  :abstract t)
+
+(defclass eieio-speedbar-directory-button (eieio-speedbar)
+  ((buttontype :initform angle)
+   (buttonface :initform speedbar-directory-face))
+  "Class providing support for objects which behave like a directory."
+  :method-invocation-order :depth-first
+  :abstract t)
+
+(defclass eieio-speedbar-file-button (eieio-speedbar)
+  ((buttontype :initform bracket)
+   (buttonface :initform speedbar-file-face))
+  "Class providing support for objects which behave like a directory."
+  :method-invocation-order :depth-first
+  :abstract t)
+
+
+;;; Methods to eieio-speedbar-* which do not need to be overriden
+;;
+(defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
+					 depth)
+  "Insert a tag line into speedbar at point for OBJECT.
+All objects a child of symbol `eieio-speedbar' can be created from this
+method.  Override this if you need non-traditional tag lines.
+Argument DEPTH is the depth at which the tag line is inserted."
+  (let ((children (eieio-speedbar-object-children object))
+	(exp (oref object expanded)))
+    (if (not children)
+	(if (eq (oref object buttontype) 'expandtag)
+	    (speedbar-make-tag-line 'statictag
+				    ?  nil nil
+				    (eieio-speedbar-object-buttonname object)
+				    'eieio-speedbar-object-click
+				    object
+				    (oref object buttonface)
+				    depth)
+	  (speedbar-make-tag-line (oref object buttontype)
+				  ?  nil nil
+				  (eieio-speedbar-object-buttonname object)
+				  'eieio-speedbar-object-click
+				  object
+				  (oref object buttonface)
+				  depth))
+      (speedbar-make-tag-line (oref object buttontype)
+			      (if exp ?- ?+)
+			      'eieio-speedbar-object-expand
+			      object
+			      (eieio-speedbar-object-buttonname object)
+			      'eieio-speedbar-object-click
+			      object
+			      (oref object buttonface)
+			      depth)
+      (if exp
+	  (eieio-speedbar-expand object (1+ depth))))))
+
+(defmethod eieio-speedbar-child-make-tag-lines ((object eieio-speedbar) depth)
+  "Base method for creating tag lines for non-object children."
+  (error "You must implement `eieio-speedbar-child-make-tag-lines' for %s"
+	 (object-name object)))
+
+(defmethod eieio-speedbar-expand ((object eieio-speedbar) depth)
+  "Expand OBJECT at indentation DEPTH.
+Inserts a list of new tag lines representing expanded elements withing
+OBJECT."
+  (let ((children (eieio-speedbar-object-children object)))
+    (cond ((eieio-object-p (car children))
+	   (mapcar (lambda (car)
+		     (eieio-speedbar-make-tag-line car depth))
+		   children))
+	  (children (eieio-speedbar-child-make-tag-lines object depth)))))
+
+
+;;; Speedbar specific function callbacks.
+;;
+(defun eieio-speedbar-object-click (text token indent)
+  "Handle a user click on TEXT representing object TOKEN.
+The object is at indentation level INDENT."
+  (eieio-speedbar-handle-click token))
+
+(defun eieio-speedbar-object-expand (text token indent)
+  "Expand object represented by TEXT.  TOKEN is the object.
+INDENT is the current indentation level."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (oset token expanded t)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (eieio-speedbar-expand token (1+ indent)))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (oset token expanded nil)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops... not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defmethod eieio-speedbar-child-description ((obj eieio-speedbar))
+  "Return a description for a child of OBJ which is not an object."
+  (error "You must implement `eieio-speedbar-child-description' for %s"
+	 (object-name obj)))
+
+(defun eieio-speedbar-item-info ()
+  "Display info for the current line when in EDE display mode."
+  ;; Switch across the types of the tokens.
+  (let ((tok (speedbar-line-token)))
+    (cond ((eieio-object-p tok)
+	   (message (eieio-speedbar-description tok)))
+	  (t
+	   (let ((no (eieio-speedbar-find-nearest-object)))
+	     (if no
+		 (eieio-speedbar-child-description no)))))))
+
+(defun eieio-speedbar-find-nearest-object (&optional depth)
+  "Search backwards to the first line associated with an object.
+Optional argument DEPTH is the current depth of the search."
+  (save-excursion
+    (if (not depth)
+	(progn
+	  (beginning-of-line)
+	  (when (looking-at "^\\([0-9]+\\):")
+	    (setq depth (string-to-number (match-string 1))))))
+    (when depth
+      (while (and (not (eieio-object-p (speedbar-line-token)))
+		  (> depth 0))
+	(setq depth (1- depth))
+	(re-search-backward (format "^%d:" depth) nil t))
+      (speedbar-line-token))))
+
+(defun eieio-speedbar-line-path (&optional depth)
+  "If applicable, return the path to the file the cursor is on.
+Optional DEPTH is the depth we start at."
+  (save-match-data
+    (if (not depth)
+	(progn
+	  (beginning-of-line)
+	  (looking-at "^\\([0-9]+\\):")
+	  (setq depth (string-to-number (match-string 1)))))
+    ;; This whole function is presently bogus.  Make it better later.
+    (let ((tok (eieio-speedbar-find-nearest-object depth)))
+      (if (eieio-object-p tok)
+	  (eieio-speedbar-derive-line-path tok)
+	default-directory))))
+
+
+;;; Methods to the eieio-speedbar-* classes which need to be overriden.
+;;
+(defmethod eieio-speedbar-object-children ((object eieio-speedbar))
+  "Return a list of children to be displayed in SPEEDBAR.
+If the return value is a list of OBJECTs, then those objects are
+queried for details.  If the return list is made of strings,
+then this object will be queried for the details needed
+to create a speedbar button."
+  nil)
+
+(provide 'eieio-speedbar)
+
+;;; eieio-speedbar.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio-test-methodinvoke.el b/site/cedet-1.0pre7/eieio/eieio-test-methodinvoke.el
new file mode 100644
index 0000000..65abb03
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-test-methodinvoke.el
@@ -0,0 +1,456 @@
+;;; eieio-testsinvoke.el -- eieio tests for method invokation
+
+;;;
+;; Copyright (C) 2005, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-test-methodinvoke.el,v 1.11 2009/11/19 01:20:25 scymtym Exp $
+;; Keywords: oop, lisp, tools
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+;;
+
+;;; Commentary:
+;;
+;; Test method invocation order.  From the common lisp reference
+;; manual:
+;;
+;; QUOTE:
+;; - All the :before methods are called, in most-specific-first
+;;   order.  Their values are ignored.  An error is signaled if
+;;   call-next-method is used in a :before method.
+;;
+;; - The most specific primary method is called. Inside the body of a
+;;   primary method, call-next-method may be used to call the next
+;;   most specific primary method. When that method returns, the
+;;   previous primary method can execute more code, perhaps based on
+;;   the returned value or values. The generic function no-next-method
+;;   is invoked if call-next-method is used and there are no more
+;;   applicable primary methods. The function next-method-p may be
+;;   used to determine whether a next method exists. If
+;;   call-next-method is not used, only the most specific primary
+;;   method is called.
+;;
+;; - All the :after methods are called, in most-specific-last order.
+;;   Their values are ignored.  An error is signaled if
+;;   call-next-method is used in a :after method.
+;;
+;;
+;; Also test behavior of `call-next-method'. From clos.org:
+;;
+;; QUOTE:
+;; When call-next-method is called with no arguments, it passes the
+;; current method's original arguments to the next method.
+
+(defvar eieio-test-method-order-list nil
+  "List of symbols stored during method invocation.")
+
+(defun eieio-test-method-store ()
+  "Store current invocation class symbol in the invocation order list."
+  (let* ((keysym (aref [ :STATIC :BEFORE :PRIMARY :AFTER ]
+		       (or eieio-generic-call-key 0)))
+	 (c (list eieio-generic-call-methodname keysym scoped-class)))
+    (setq eieio-test-method-order-list
+	  (cons c eieio-test-method-order-list))))
+
+(defun eieio-test-match (rightanswer)
+  "Do a test match."
+  (if (equal rightanswer eieio-test-method-order-list)
+      t
+    (error "eieio-test-methodinvoke.el: Test Failed!")))
+
+(defvar eieio-test-call-next-method-arguments nil
+  "List of passed to methods during execution of `call-next-method'.")
+
+(defun eieio-test-arguments-for (class)
+  "Returns arguments passed to method of CLASS during `call-next-method'."
+  (cdr (assoc class eieio-test-call-next-method-arguments)))
+
+;;; This Example was submitted by darkman:
+;;
+;; drkm <darkman_spam@yahoo.fr>
+(defclass A () ())
+(defclass AA (A) ())
+(defclass AAA (AA) ())
+
+(defmethod F :BEFORE ((p A))
+  (eieio-test-method-store))
+(defmethod F :BEFORE ((p AA))
+  (eieio-test-method-store))
+(defmethod F :BEFORE ((p AAA))
+  (eieio-test-method-store))
+
+(defmethod F ((p A))
+  (eieio-test-method-store))
+(defmethod F ((p AA))
+  (eieio-test-method-store))
+
+(defmethod F :AFTER ((p A))
+  (eieio-test-method-store))
+(defmethod F :AFTER ((p AA))
+  (eieio-test-method-store))
+(defmethod F :AFTER ((p AAA))
+  (eieio-test-method-store))
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (F :BEFORE AAA)
+	     (F :BEFORE AA)
+	     (F :BEFORE A)
+	     ;; Not primary A method
+	     (F :PRIMARY AA)
+	     ;; No call-next-method in AA to get to A.
+	     (F :AFTER A)
+	     (F :AFTER AA)
+	     (F :AFTER AAA)
+	     )))
+  (F (AAA nil))
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  (eieio-test-match ans))
+
+(defmethod G :BEFORE ((p A))
+  (eieio-test-method-store))
+(defmethod G :BEFORE ((p AAA))
+  (eieio-test-method-store))
+
+(defmethod G ((p A))
+  (eieio-test-method-store))
+
+(defmethod G :AFTER ((p A))
+  (eieio-test-method-store))
+(defmethod G :AFTER ((p AAA))
+  (eieio-test-method-store))
+
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (G :BEFORE AAA)
+	     (G :BEFORE A)
+	     ;; Not primary A method
+	     (G :PRIMARY A)
+	     ;; No call-next-method in AA to get to A.
+	     (G :AFTER A)
+	     (G :AFTER AAA)
+	     )))
+  (G (AAA nil))
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  (eieio-test-match ans))
+
+;;; Test Multiple Inheritance.
+;;
+(defclass B-base1 () ())
+(defclass B-base2 () ())
+(defclass B (B-base1 B-base2) ())
+
+(defmethod F :BEFORE ((p B-base1))
+  (eieio-test-method-store))
+
+(defmethod F :BEFORE ((p B-base2))
+  (eieio-test-method-store))
+
+(defmethod F :BEFORE ((p B))
+  (eieio-test-method-store))
+
+(defmethod F ((p B))
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p B-base1))
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p B-base2))
+  (eieio-test-method-store)
+  (when (next-method-p)
+    (call-next-method))
+  )
+
+(defmethod F :AFTER ((p B-base1))
+  (eieio-test-method-store))
+
+(defmethod F :AFTER ((p B-base2))
+  (eieio-test-method-store))
+
+(defmethod F :AFTER ((p B))
+  (eieio-test-method-store))
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (F :BEFORE B)
+	     (F :BEFORE B-base1)
+	     (F :BEFORE B-base2)
+
+	     (F :PRIMARY B)
+	     (F :PRIMARY B-base1)
+	     (F :PRIMARY B-base2)
+
+	     (F :AFTER B-base2)
+	     (F :AFTER B-base1)
+	     (F :AFTER B)
+	     )))
+  (F (B nil))
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  ;;(message "%S" eieio-test-method-order-list)
+  (eieio-test-match ans)
+  )
+
+;;; Test static invokation
+;;
+(defmethod H :STATIC ((class A))
+  "No need to do work in here."
+  'moose)
+
+;; Both of these situations should succeed.
+(H A)
+(H (A nil))
+
+;;; Return value from :PRIMARY
+;;
+(defmethod I :BEFORE ((a A))
+  (eieio-test-method-store)
+  ":before")
+
+(defmethod I :PRIMARY ((a A))
+  (eieio-test-method-store)
+  ":primary")
+
+(defmethod I :AFTER ((a A))
+  (eieio-test-method-store)
+  ":after")
+
+(let ((eieio-test-method-order-list nil)
+      (ans  (I (A nil))))
+  (unless (string= ans ":primary")
+    (error "Value %S erroneously provided in method call."
+	   ans)))
+
+;;; Multiple inheritance and the 'constructor' method.
+;;
+;; Constructor is a static method, so this is really testing
+;; static method invocation and multiple inheritance.
+;;
+(defclass C-base1 () ())
+(defclass C-base2 () ())
+(defclass C (C-base1 C-base2) ())
+
+(defmethod constructor :STATIC ((p C-base1) &rest args)
+  (eieio-test-method-store)
+  (if (next-method-p) (call-next-method))
+  )
+
+(defmethod constructor :STATIC ((p C-base2) &rest args)
+  (eieio-test-method-store)
+  (if (next-method-p) (call-next-method))
+  )
+
+(defmethod constructor :STATIC ((p C) &rest args)
+  (eieio-test-method-store)
+  (call-next-method)
+  )
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (constructor :STATIC C)
+	     (constructor :STATIC C-base1)
+	     (constructor :STATIC C-base2)
+	     )))
+  (C nil)
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  (eieio-test-match ans)
+  )
+
+;;; Diamond Test
+;;
+;; For a diamond shaped inheritance structure, (call-next-method) can break.
+;; As such, there are two possible orders.
+
+(defclass D-base0 () () :method-invocation-order :depth-first)
+(defclass D-base1 (D-base0) () :method-invocation-order :depth-first)
+(defclass D-base2 (D-base0) () :method-invocation-order :depth-first)
+(defclass D (D-base1 D-base2) () :method-invocation-order :depth-first)
+
+(defmethod F ((p D))
+  "D"
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p D-base0))
+  "D-base0"
+  (eieio-test-method-store)
+  ;; This should have no next
+  ;; (when (next-method-p) (call-next-method))
+  )
+
+(defmethod F ((p D-base1))
+  "D-base1"
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p D-base2))
+  "D-base2"
+  (eieio-test-method-store)
+  (when (next-method-p)
+    (call-next-method))
+  )
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (F :PRIMARY D)
+	     (F :PRIMARY D-base1)
+	     ;; (F :PRIMARY D-base2)
+	     (F :PRIMARY D-base0)
+	     )))
+  (F (D nil))
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  (message "%S" eieio-test-method-order-list)
+  (eieio-test-match ans)
+  )
+
+;;; Other invocation order
+
+(defclass E-base0 () () :method-invocation-order :breadth-first)
+(defclass E-base1 (E-base0) () :method-invocation-order :breadth-first)
+(defclass E-base2 (E-base0) () :method-invocation-order :breadth-first)
+(defclass E (E-base1 E-base2) () :method-invocation-order :breadth-first)
+
+(defmethod F ((p E))
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p E-base0))
+  (eieio-test-method-store)
+  ;; This should have no next
+  ;; (when (next-method-p) (call-next-method))
+  )
+
+(defmethod F ((p E-base1))
+  (eieio-test-method-store)
+  (call-next-method))
+
+(defmethod F ((p E-base2))
+  (eieio-test-method-store)
+  (when (next-method-p)
+    (call-next-method))
+  )
+
+(let ((eieio-test-method-order-list nil)
+      (ans '(
+	     (F :PRIMARY E)
+	     (F :PRIMARY E-base1)
+	     (F :PRIMARY E-base2)
+	     (F :PRIMARY E-base0)
+	     )))
+  (F (E nil))
+  (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+  (message "%S" eieio-test-method-order-list)
+  (eieio-test-match ans)
+  )
+
+;;; Jan's methodinvoke order w/ multiple inheritance and :after methods.
+;;
+(defclass Ja ()
+  ())
+
+(defmethod initialize-instance :after ((this Ja) &rest slots)
+  (message "+Ja")
+
+  (when (next-method-p)
+    (call-next-method))
+
+  (message "-Ja"))
+
+(defclass Jb ()
+  ())
+
+(defmethod initialize-instance :after ((this Jb) &rest slots)
+  (message "+Jb")
+
+  (when (next-method-p)
+    (call-next-method))
+
+  (message "-Jb"))
+
+(defclass Jc (Jb)
+  ())
+
+(defclass Jd (Jc Ja)
+  ())
+
+(defmethod initialize-instance ((this Jd) &rest slots)
+  (message "+Jd")
+
+  (when (next-method-p)
+    (call-next-method))
+
+  (message "-Jd"))
+
+(Jd "test")
+
+;;; call-next-method with replacement arguments across a simple class hierarchy.
+;;
+
+(defclass CNM-0 ()
+  ())
+
+(defclass CNM-1-1 (CNM-0)
+  ())
+
+(defclass CNM-1-2 (CNM-0)
+  ())
+
+(defclass CNM-2 (CNM-1-1 CNM-1-2)
+  ())
+
+(defmethod CNM-M ((this CNM-0) args)
+  (push (cons 'CNM-0 (copy-sequence args))
+	eieio-test-call-next-method-arguments)
+  (when (next-method-p)
+    (call-next-method
+     this (cons 'CNM-0 args))))
+
+(defmethod CNM-M ((this CNM-1-1) args)
+  (push (cons 'CNM-1-1 (copy-sequence args))
+	eieio-test-call-next-method-arguments)
+  (when (next-method-p)
+    (call-next-method
+     this (cons 'CNM-1-1 args))))
+
+(defmethod CNM-M ((this CNM-1-2) args)
+  (push (cons 'CNM-1-2 (copy-sequence args))
+	eieio-test-call-next-method-arguments)
+  (when (next-method-p)
+    (call-next-method)))
+
+(defmethod CNM-M ((this CNM-2) args)
+  (push (cons 'CNM-2 (copy-sequence args))
+	eieio-test-call-next-method-arguments)
+  (when (next-method-p)
+    (call-next-method
+     this (cons 'CNM-2 args))))
+
+(let ((eieio-test-call-next-method-arguments nil))
+  (CNM-M (CNM-2 "") '(INIT))
+  (unless (and (equal (eieio-test-arguments-for 'CNM-0)
+		      '(CNM-1-1 CNM-2 INIT))
+	       (equal (eieio-test-arguments-for 'CNM-1-1)
+		      '(CNM-2 INIT))
+	       (equal (eieio-test-arguments-for 'CNM-1-2)
+		      '(CNM-1-1 CNM-2 INIT))
+	       (equal (eieio-test-arguments-for 'CNM-2)
+		      '(INIT)))
+    (error "eieio-test-methodinvoke.el: Test Failed!")))
diff --git a/site/cedet-1.0pre7/eieio/eieio-tests.el b/site/cedet-1.0pre7/eieio/eieio-tests.el
new file mode 100755
index 0000000..f16feaf
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio-tests.el
@@ -0,0 +1,1080 @@
+;;; eieio-tests.el -- eieio tests routines
+
+;;;
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio-tests.el,v 1.48 2009/08/30 01:01:31 zappo Exp $
+;; Keywords: oop, lisp, tools
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+;;
+
+;;; Commentary:
+;;  
+;; Test the various features of EIEIO.  To run the tests, evaluate the
+;; entire buffer.
+
+(require 'eieio-base)
+
+;;; Code:
+
+;;; Multiple Inheritance, and method signal testing
+;;
+(defclass class-a ()
+  ((water :initarg :water
+	  :initform h20
+	  :type symbol
+	  :documentation "Detail about water.")
+   (classslot :initform penguin
+	      :type symbol
+	      :documentation "A class allocated slot."
+	      :allocation :class)
+   (test-tag :initform nil
+	     :documentation "Used to make sure methods are called.")
+   (self :initform nil
+	 :type (or null class-a)
+	 :documentation "Test self referencing types.")
+   )
+  "Class A")
+
+(condition-case msg
+
+    ;; Only run this test if the message framework thingy works.
+    (when (and (message "foo") (string= "foo" (current-message)))
+
+      (defclass class-alloc-initarg ()
+	((throwwarning :initarg :throwwarning
+		       :allocation :class))
+	"Throw a warning mixing allocation class and an initarg.")
+
+      (when (not (string-match "Class allocated slots do not need :initarg"
+			       (or (current-message) "")))
+	(message "Errant message : %S" (current-message))
+	(error ":initarg and :allocation warning not thrown!"))
+      )
+  (error (error "%S" msg)))
+  
+
+(defclass class-b ()
+  ((land :initform "Sc"
+	 :type string
+	 :documentation "Detail about land."))
+  "Class b")
+
+(defclass class-ab (class-a class-b)
+  ((amphibian :initform "frog"
+	      :documentation "Detail about amphibian on land and water."))
+  "Class A and B combined.")
+
+
+;;; Defining a class with a slot tag error
+;;
+(let ((eieio-error-unsupported-class-tags t))
+  (condition-case nil
+      (progn
+	(defclass class-error ()
+	  ((error-slot :initarg :error-slot
+		       :badslottag 1))
+	  "A class with a bad slot tag.")
+	(error "No error was thrown for badslottag"))
+    (invalid-slot-type nil)))
+
+(let ((eieio-error-unsupported-class-tags nil))
+  (condition-case nil
+      (progn
+	(defclass class-error ()
+	  ((error-slot :initarg :error-slot
+		       :badslottag 1))
+	  "A class with a bad slot tag."))
+    (invalid-slot-type
+     (error "invalid-slot-type thrown when eieio-error-unsupported-class-tags is nil")
+     )))
+
+;;; Abstract base classes
+;;
+(defclass abstract-class ()
+  ((some-slot :initarg :some-slot
+	      :initform nil
+	      :documentation "A slot."))
+  :documentation "An abstract claptionass."
+  :abstract t)
+
+(if (condition-case nil
+	(progn
+	  (abstract-class "Test")
+	  t)
+      (error nil))
+    (error "Instantiation of an abstract class allowed."))
+
+;;; Generics (and the definition therof)
+;;
+(defun anormalfunction () "A plain function for error testing." nil)
+
+(if (condition-case nil
+	(defgeneric anormalfunction () 
+	  "Attempt to turn it into a generic.")
+      (error nil))
+    (error "Generic function created over an existing function."))
+
+(defgeneric generic1 () "First generic function")
+
+(if (not (generic-p 'generic1))
+    (error "defgeneric did not make a generic method."))
+
+(defmethod generic1 ((c class-a))
+  "Method on generic1.")
+
+;;; Class with a static method
+;;
+(defclass static-method-class ()
+  ((some-slot :initform nil
+	      :allocation :class
+	      :documentation "A slot."))
+  :documentation "A class used for testing static methods.")
+
+(defmethod static-method-class-method :STATIC ((c static-method-class) value)
+  "Test static methods.
+Argument C is the class bound to this static method."
+  (if (eieio-object-p c) (setq c (object-class c)))
+  (oset-default c some-slot value))
+
+(condition-case nil
+    (static-method-class-method static-method-class 'class)
+  (error (error "Failed to call static method on a class.")))
+(if (not (eq (oref static-method-class some-slot) 'class))
+    (error "Call to static method on a class did not run."))
+
+(condition-case nil
+    (static-method-class-method (static-method-class "test") 'object)
+  (error (error "Failed to call static method on an object.")))
+(if (not (eq (oref static-method-class some-slot) 'object))
+    (error "Call to static method on an object did not run."))
+
+(defclass static-method-class-2 (static-method-class)
+  ()
+  "A second class after the previous for static methods.")
+
+(defmethod static-method-class-method :STATIC ((c static-method-class-2) value)
+  "Test static methods.
+Argument C is the class bound to this static method."
+  (if (eieio-object-p c) (setq c (object-class c)))
+  (oset-default c some-slot (intern (concat "moose-" (symbol-name value)))))
+
+(condition-case nil
+    (static-method-class-method static-method-class-2 'class)
+  (error (error "Failed to call 2nd static method on a class.")))
+(if (not (eq (oref static-method-class-2 some-slot) 'moose-class))
+    (error "Call to 2nd static method on a class did not run."))
+
+(condition-case nil
+    (static-method-class-method (static-method-class-2 "test") 'object)
+  (error (error "Failed to call 2nd static method on an object.")))
+(if (not (eq (oref static-method-class-2 some-slot) 'moose-object))
+    (error "Call to 2nd static method on an object did not run."))
+
+
+;;; Perform method testing
+;;
+
+;; allocate an object to use
+(defvar ab nil)
+(setq ab (class-ab "abby"))
+(defvar a nil)
+(setq a (class-a "aye"))
+(defvar b nil)
+(setq b (class-b "fooby"))
+
+(condition-case nil
+    (progn
+      ;; Try make-instance on these guys...
+      (make-instance 'class-ab)
+      (make-instance 'class-a :water 'cho)
+      (make-instance 'class-b "a name")
+      )
+  (error "make-instance error."))
+
+;; Play with call-next-method
+(defmethod class-cn ((a class-a))
+  "Try calling `call-next-method' when there isn't one.
+Argument A is object of type symbol `class-a'."
+  (call-next-method)
+  )
+
+(defmethod no-next-method ((a class-a) &rest args)
+  "Override signal throwing for variable `class-a'.
+Argument A is the object of class variable `class-a'."
+  'moose)
+
+(if (eq (class-cn ab) 'moose)
+    nil
+  (error "no-next-method return value failure."))
+
+;; Non-existing methods.
+(defmethod no-applicable-method ((b class-b) method &rest args)
+  "No need.
+Argument B is for booger.
+METHOD is the method that was attempting to be called."
+  'moose)
+
+(if (eq (class-cn b) 'moose)
+    nil
+  (error "no-applicable-method return value failure."))
+
+;;; play with methods and mi
+(defmethod class-fun ((a class-a))
+  "Fun with class A."
+  'moose)
+
+(defmethod class-fun ((b class-b))
+  "Fun with class B."
+  (error "Class B fun should not be called")
+  )
+
+(if (eq (class-fun ab) 'moose)
+    nil
+  (error "Inheritance method check."))
+
+(defmethod class-fun-foo ((b class-b))
+  "Foo Fun with class B."
+  'moose)
+
+(if (eq (class-fun-foo ab) 'moose)
+    nil
+  (error "Multiple inheritance method check."))
+
+;; Play with next-method and mi
+(defmethod class-fun2 ((a class-a))
+  "More fun with class A."
+  'moose)
+
+(defmethod class-fun2 ((b class-b))
+  "More fun with class B."
+  (error "Class B fun2 should not be called")
+  )
+
+(defmethod class-fun2 ((ab class-ab))
+  "More fun with class AB."
+  (call-next-method))
+
+(if (eq (class-fun2 ab) 'moose)
+    nil
+  (error "Call next method inheritance check failed."))
+
+;; How about if B is the only slot?
+(defmethod class-fun3 ((b class-b))
+  "Even More fun with class B."
+  'moose)
+
+(defmethod class-fun3 ((ab class-ab))
+  "Even More fun with class AB."
+  (call-next-method))
+
+(if (eq (class-fun3 ab) 'moose)
+    nil
+  (error "Call next method MI check failed."))
+
+;; Try the self referencing test
+(oset a self a)
+(oset ab self ab)
+
+
+;;; Test the BEFORE, PRIMARY, and AFTER method tags.
+;;
+(let ((lib (locate-library  "eieio-test-methodinvoke.el")))
+  (load-file lib))
+
+;;; Test value of a generic function call
+;;
+(defvar class-fun-value-seq '())
+
+(defmethod class-fun-value :BEFORE ((a class-a))
+  "Return `before', and push `before' in `class-fun-value-seq'."
+  (push 'before class-fun-value-seq)
+  'before)
+
+(defmethod class-fun-value :PRIMARY ((a class-a))
+  "Return `primary', and push `primary' in `class-fun-value-seq'."
+  (push 'primary class-fun-value-seq)
+  'primary)
+
+(defmethod class-fun-value :AFTER ((a class-a))
+  "Return `after', and push `after' in `class-fun-value-seq'."
+  (push 'after class-fun-value-seq)
+  'after)
+
+(let* ((class-fun-value-seq nil)
+       (value (class-fun-value a)))
+  (unless (eq value 'primary)
+    (error
+     "Value of the generic function call isn't the primary method value [%S]."
+     value))
+  (unless (equal class-fun-value-seq '(after primary before))
+    (error "Methods were not called from :BEFORE to :AFTER.")))
+
+
+;;; Test initialization methods
+;;
+(defmethod initialize-instance ((a class-a) &rest slots)
+  "Initialize the slots of class-a."
+  (call-next-method)
+  (if (/= (oref a test-tag) 1)
+      (error "shared-initialize test failed."))
+  (oset a test-tag 2))
+
+(defmethod shared-initialize ((a class-a) &rest slots)
+  "Shared initialize method for class-a."
+  (call-next-method)
+  (oset a test-tag 1))
+
+(let ((ca (class-a "class act")))
+  (if (/=  (oref ca test-tag) 2)
+      (error "initialize-instance test failed."))
+  )
+
+
+;;; Perform slot testing
+;;
+(if (and (oref ab water)
+	 (oref ab land)
+	 (oref ab amphibian))
+    nil
+  (error "Slot checks failed"))
+
+(defmethod slot-missing ((ab class-ab) &rest foo)
+  "If a slot in AB is unbound, return something cool.  FOO."
+  'moose)
+
+(if (eq (oref ab ooga-booga) 'moose)
+    nil
+  (error "Missing slot override failed."))
+
+(condition-case nil
+    (progn
+      (oref a ooga-booga)
+      (error "No invalid slot error thrown."))
+  (invalid-slot-name nil))
+
+(slot-makeunbound a 'water)
+
+(if (slot-boundp a 'water)
+    (error "Slot makeunbound failed slot-bound-p test"))
+
+(if (and (slot-exists-p a 'water)
+	 (not (slot-exists-p a 'moose)))
+    nil
+  (error "Slot exists-p failed"))
+
+(condition-case nil
+    (progn
+      (oref a water)
+      (error ""))
+  (unbound-slot nil)
+  (error (error "Oref of unbound slot succeeded.")))
+
+(defclass virtual-slot-class ()
+  ((base-value :initarg :base-value))
+  "Class has real slot :base-value and simulated slot :derived-value.")
+
+(defmethod slot-missing ((vsc virtual-slot-class)
+			 slot-name operation &optional new-value)
+  "Simulate virtual slot derived-value."
+  (cond
+   ((or (eq slot-name :derived-value)
+	(eq slot-name 'derived-value))
+    (with-slots (base-value) vsc
+      (if (eq operation 'oref)
+	  (+ base-value 1)
+	(setq base-value (- new-value 1)))))
+   (t (call-next-method)))
+  )
+
+(defvar vsca)
+(setq vsca (virtual-slot-class "vsca" :base-value 1))
+(unless (= (oref vsca :base-value) 1)
+  (error "Wrong slot value."))
+(unless (= (oref vsca :derived-value) 2)
+  (error "Wrong slot value."))
+
+(oset vsca :derived-value 3)
+(unless (= (oref vsca :base-value) 2)
+  (error "Wrong slot value."))
+(unless (= (oref vsca :derived-value) 3)
+  (error "Wrong slot value."))
+
+(oset vsca :base-value 3)
+(unless (= (oref vsca :base-value) 3)
+  (error "Wrong slot value."))
+(unless (= (oref vsca :derived-value) 4)
+  (error "Wrong slot value."))
+
+;; should also be possible to initialize instance using virtual slot
+(defvar vscb)
+(setq vscb (virtual-slot-class "vscb" :derived-value 5))
+(unless (= (oref vscb :base-value) 4)
+  (error "Wrong slot value."))
+(unless (= (oref vscb :derived-value) 5)
+  (error "Wrong slot value."))
+
+(defmethod slot-unbound ((a class-a) &rest foo)
+  "If a slot in A is unbound, ignore FOO."
+  'moose)
+
+(if (eq (oref a water) 'moose)
+    nil
+  (error "Unbound slot reference failed."))
+
+(oset a water 'moose)
+(if (eq (oref a water) 'moose)
+    nil
+  (error "Oset of unbound failed."))
+
+(if (not (eq (oref a water) (oref-default a water)))
+    nil
+  (error "oref/oref-default comparison failed."))
+
+(oset-default (object-class a) water 'moose)
+(if (eq (oref a water) (oref-default a water))
+    nil
+  (error "oset-default -> oref/oref-default comparison failed."))
+
+;; After setting 'water to 'moose, make sure a new object has
+;; the right stuff.
+(oset-default (object-class a) water 'penguin)
+(if (eq (oref (class-a "foo") water) 'penguin)
+    nil
+  (error "oset-default, new instance value failed."))
+
+(defmethod slot-unbound ((a class-a) &rest foo)
+  "If a slot in A is unbound, ignore FOO."
+  ;; Disable the old slot-unbound so we can run this test
+  ;; more than once
+  (call-next-method))
+
+;; Slot type checking
+(condition-case nil
+    (progn
+      (oset ab water "a string, not a symbol")
+      (error "Slot set to invalid type successfully."))
+  (invalid-slot-type nil))
+
+(condition-case nil
+    (progn
+      (oset ab classslot "a string, not a symbol")
+      (error "Slot set to invalid type successfully."))
+  (invalid-slot-type nil))
+
+(condition-case nil
+    (progn
+      (class-a "broken-type-a" :water "a string not a symbol")
+      (error "Slot set to invalid type at creation successfully."))
+  (invalid-slot-type nil))
+
+;; Test out class allocated slots
+(defvar aa nil)
+(setq aa (class-a "another"))
+
+(let ((newval 'moose))
+  (oset aa classslot newval)
+  (if (and (eq (oref a classslot) newval)
+	   (eq (oref aa classslot) newval))
+      nil
+    (error "Class slots are tracking between objects")))
+
+(if (not (slot-boundp a 'classslot))
+    (error "Class allocatd slot thought unbound when it is bound."))
+
+(if (not (slot-boundp class-a 'classslot))
+    (error "Class allocatd slot thought unbound when it is bound."))
+
+(slot-makeunbound a 'classslot)
+
+(if (slot-boundp a 'classslot)
+    (error "Class allocatd slot thought bound when it is unbound."))
+
+(if (slot-boundp class-a 'classslot)
+    (error "Class allocatd slot thought bound when it is unbound."))
+
+
+;;; Inheritance status
+;;
+(if (and
+     (child-of-class-p class-ab class-a)
+     (child-of-class-p class-ab class-b)
+     (object-of-class-p a class-a)
+     (object-of-class-p ab class-a)
+     (object-of-class-p ab class-b)
+     (object-of-class-p ab class-ab)
+     (eq (class-parents class-a) nil)
+     (equal (class-parents class-ab) '(class-a class-b))
+     (same-class-p a class-a)
+     (class-a-p a)
+     (not (class-a-p ab))
+     (class-a-child-p a)
+     (class-a-child-p ab)
+     (not (class-a-p "foo"))
+     (not (class-a-child-p "foo"))
+     )
+    nil
+  (error "Inheritance tests: failed"))
+
+
+;;; Slot parameter testing
+;;
+(defclass class-c ()
+  ((slot-1 :initarg :moose
+	   :initform moose
+	   :type symbol
+	   :allocation :instance
+	   :documentation "Fisrt slot testing slot arguments."
+	   :custom symbol
+	   :label "Wild Animal"
+	   :group borg
+	   :protection :public)
+   (slot-2 :initarg :penguin
+	   :initform "penguin"
+	   :type string
+	   :allocation :instance
+	   :documentation "Second slot testing slot arguments."
+	   :custom string
+	   :label "Wild bird"
+	   :group vorlon
+	   :accessor get-slot-2
+	   :protection :private)
+   (slot-3 :initarg :emu
+	   :initform emu
+	   :type symbol
+	   :allocation :class
+	   :documentation "Third slot test class allocated accessor"
+	   :custom symbol
+	   :label "Fuzz"
+	   :group tokra
+	   :accessor get-slot-3
+	   :protection :private)
+   )
+  (:custom-groups (foo))
+  "A class for testing slot arguments."
+  )
+
+(defvar t1 nil)
+(setq t1 (class-c "C1"))
+
+(if (not (and (eq (oref t1 slot-1) 'moose)
+	      (eq (oref t1 :moose) 'moose)))
+    (error "Initialization of slot failed."))
+
+(condition-case nil
+    (progn
+      (oref t1 slot-2)
+      (error "Reference of private slot passed."))
+  (invalid-slot-name nil))
+
+(if (not (string= (get-slot-2 t1) "penguin"))
+    (error "Accessor to private slot returned bad value."))
+
+(condition-case nil
+    (progn
+      (class-c "C2" :moose "not a symbol")
+      (error "A string was set on a symbol slot during init."))
+  (invalid-slot-type nil))
+
+(if (not (eq (get-slot-3 t1) 'emu))
+    (error "Accessor to private :class slot returned bad value from object."))
+
+(if (not (eq (get-slot-3 class-c) 'emu))
+    (error "Accessor to private :class slot returned bad value from class."))
+
+(setf (get-slot-3 t1) 'setf-emu)
+(if (not (eq (get-slot-3 t1) 'setf-emu))
+    (error "setf and get through accessor failed!"))
+
+;; Slot Default inheritance Testing
+;;
+(defclass class-subc (class-c)
+  ((slot-1 ;; :initform moose  - don't override this
+	   )
+   (slot-2 :initform "linux" ;; Do override this one
+	   :protection :private
+	   )
+   ;; (slot-3 :initform emu) - don't touch this one.
+   )
+  "A class for testing slot arguments."
+  )
+
+(defvar t2 nil)
+(setq t2 (class-subc "subc"))
+
+(if (not (and (eq (oref t2 slot-1) 'moose)
+	      (eq (oref t2 :moose) 'moose)))
+    (error "Initialization of slot failed."))
+
+(if (not (string= (get-slot-2 t2) "linux"))
+    (error "Accessor to private slot returned bad value."))
+
+(condition-case nil
+    (progn
+      (oref t2 slot-2)
+      (error "Reference of private slot passed."))
+  (invalid-slot-name nil))
+
+(if (not (string= (get-slot-2 t2) "linux"))
+    (error "Accessor to private slot returned bad value."))
+
+(condition-case nil
+    (progn
+      (class-subc "C2" :moose "not a symbol")
+      (error "A string was set on a symbol slot during init."))
+  (invalid-slot-type nil))
+
+
+(when nil
+
+  ;;; HACK ALERT: The new value of a class slot is inherited by the
+  ;; subclass!  This is probably a bug.  We should either share the slot
+  ;; so sets on the baseclass change the subclass, or we should inherit
+  ;; the original value. 
+
+  (if (not (eq (get-slot-3 t2) 'emu))
+      (error "Accessor to private :class slot returned bad value from object."))
+
+  (if (not (eq (get-slot-3 class-subc) 'emu))
+      (error "Accessor to private :class slot returned bad value from class."))
+
+  (setf (get-slot-3 t2) 'setf-emu)
+  (if (not (eq (get-slot-3 t2) 'setf-emu))
+      (error "setf and get through accessor failed!"))
+  )
+
+;; Slot protection
+(defclass prot-0 ()
+  ()
+  "Protection testing baseclass.")
+
+(defmethod prot0-slot-2 ((s2 prot-0))
+  "Try to access slot-2 from this class which doesn't have it.
+The object S2 passed in will be of class prot-1, which does have
+the slot.  This could be allowed, and currently is in EIEIO.
+Needed by the eieio persistant base class."
+  (oref s2 slot-2))
+
+(defclass prot-1 (prot-0)
+  ((slot-1 :initarg :slot-1
+	   :initform nil
+	   :protection :public)
+   (slot-2 :initarg :slot-2
+	   :initform nil
+	   :protection :protected)
+   (slot-3 :initarg :slot-3
+	   :initform nil
+	   :protection :private))
+  "A class for testing the :protection option.")
+
+(defclass prot-2 (prot-1)
+  nil
+  "A class for testing the :protection option.")
+
+(defmethod prot1-slot-2 ((s2 prot-1))
+  "Try to access slot-2 in S2."
+  (oref s2 slot-2))
+
+(defmethod prot1-slot-2 ((s2 prot-2))
+  "Try to access slot-2 in S2."
+  (oref s2 slot-2))
+
+(defmethod prot1-slot-3-only ((s2 prot-1))
+  "Try to access slot-3 in S2.
+Do not override for `prot-2'."
+  (oref s2 slot-3))
+
+(defmethod prot1-slot-3 ((s2 prot-1))
+  "Try to access slot-3 in S2."
+  (oref s2 slot-3))
+
+(defmethod prot1-slot-3 ((s2 prot-2))
+  "Try to access slot-3 in S2."
+  (oref s2 slot-3))
+
+(defvar p1 nil)
+(setq p1 (prot-1 ""))
+(defvar p2 nil)
+(setq p2 (prot-2 ""))
+
+(condition-case nil
+    (oref p1 slot-1)
+  (error (error "Error accessing public slot.")))
+(condition-case nil
+    (oref p2 slot-1)
+  (error (error "Error accessing public slot.")))
+
+(condition-case nil
+    (progn
+      (oref p1 slot-2)
+      (error "Accessing protected slot out of context succeeded."))
+  (error nil))
+(condition-case nil
+    (prot1-slot-2 p1)
+  (error (error "Error accessing protected slot in a method.")))
+(condition-case nil
+    (prot1-slot-2 p2)
+  (error (error "Error accessing protected slot in a subclass method.")))
+(condition-case nil
+    (prot0-slot-2 p1)
+  (error (error "Error accessing protected slot from parent class method.")))
+
+(condition-case nil
+    (progn
+      (oref p1 slot-3)
+      (error "Accessing private slot out of context succeeded."))
+  (error nil))
+(condition-case nil
+    (prot1-slot-3 p1)
+  (error (error "Error accessing private slot in a method.")))
+(condition-case nil
+    (progn
+      (prot1-slot-3 p2)
+      (error "Accessing private slot in a subclass method succeeded."))
+  (error nil))
+
+(condition-case nil
+    (prot1-slot-3-only p1)
+  (error (error "Accessing private slot by same class failed.")))
+
+(condition-case nil
+    (prot1-slot-3-only p2)
+  (error (error "Accessing private slot by subclass in sameclass method failed.")))
+
+;;; eieio-instance-inheritor
+;; Test to make sure this works.
+(defclass II (eieio-instance-inheritor)
+  ((slot1 :initform 1)
+   (slot2)
+   (slot3))
+  "Instance Inheritor test class.")
+
+(defvar II1 nil)
+(setq II1 (II "II Test."))
+(oset II1 slot2 'cat)
+(defvar II2 nil)
+(setq II2 (clone II1 "II2 Test."))
+(oset II2 slot1 'moose)
+(defvar II3 nil)
+(setq II3 (clone II2 "II3 Test."))
+(oset II3 slot3 'penguin)
+
+(cond ((not (eq (oref II3 slot1) 'moose))
+       (error "Instance inheritor: Level one inheritance failed."))
+      ((not (eq (oref II3 slot2) 'cat))
+       (error "Instance inheritor: Level two inheritance failed."))
+      ((not (eq (oref II3 slot3) 'penguin))
+       (error "Instance inheritor: Level zero inheritance failed."))
+      (t t))
+
+;;; Test slot attribute override patterns
+;;
+(defclass slotattr-base ()
+  ((initform :initform init)
+   (type :type list)
+   (initarg :initarg :initarg)
+   (protection :protection :private)
+   (custom :custom (repeat string)
+	   :label "Custom Strings"
+	   :group moose)
+   (docstring :documentation
+	      "Replace the doc-string for this property.")
+   (printer :printer printer1)
+   )
+  "Baseclass we will attempt to subclass.
+Subclasses to override slot attributes.")
+
+(let ((good-fail t))
+  (condition-case nil
+      (progn
+	(defclass slotattr-fail (slotattr-base)
+	  ((protection :protection :public)
+	   )
+	  "This class should throw an error.")
+	(setq good-fail nil))
+    (error nil))
+  (if (not good-fail)
+      (error "Subclass overrode :protection slot attribute.")))
+
+(let ((good-fail t))
+  (condition-case nil
+      (progn
+	(defclass slotattr-fail (slotattr-base)
+	  ((type :type string)
+	   )
+	  "This class should throw an error.")
+	(setq good-fail nil))
+    (error nil))
+  (if (not good-fail)
+      (error "Subclass overrode :type slot attribute.")))
+
+
+(defclass slotattr-ok (slotattr-base)
+  ((initform :initform no-init)   
+   (initarg :initarg :initblarg)
+   (custom :custom string
+	   :label "One String"
+	   :group cow)
+   (docstring :documentation
+	      "A better doc string for this class.")
+   (printer :printer printer2)
+   )
+  "This class should allow overriding of various slot attributes.")
+
+(let ((obj (slotattr-ok "moose")))
+  (if (not (eq (oref obj initform) 'no-init))
+      (error "Initform did not override in instance allocation."))
+)
+
+;;; Test slot attribute override patterns for CLASS allocated slots
+;;
+(defclass slotattr-class-base ()
+  ((initform :allocation :class
+	     :initform init)
+   (type :allocation :class
+	 :type list)
+   (initarg :allocation :class
+	    :initarg :initarg)
+   (protection :allocation :class
+	       :protection :private)
+   (custom :allocation :class
+	   :custom (repeat string)
+	   :label "Custom Strings"
+	   :group moose)
+   (docstring :allocation :class
+	      :documentation
+	      "Replace the doc-string for this property.")
+   )
+  "Baseclass we will attempt to subclass.
+Subclasses to override slot attributes.")
+
+(let ((good-fail t))
+  (condition-case nil
+      (progn
+	(defclass slotattr-fail (slotattr-class-base)
+	  ((protection :protection :public)
+	   )
+	  "This class should throw an error.")
+	(setq good-fail nil))
+    (error nil))
+  (if (not good-fail)
+      (error "Subclass overrode :protection slot attribute.")))
+
+(let ((good-fail t))
+  (condition-case nil
+      (progn
+	(defclass slotattr-fail (slotattr-class-base)
+	  ((type :type string)
+	   )
+	  "This class should throw an error.")
+	(setq good-fail nil))
+    (error nil))
+  (if (not good-fail)
+      (error "Subclass overrode :type slot attribute.")))
+
+
+(defclass slotattr-class-ok (slotattr-class-base)
+  ((initform :initform no-init)   
+   (initarg :initarg :initblarg)
+   (custom :custom string
+	   :label "One String"
+	   :group cow)
+   (docstring :documentation
+	      "A better doc string for this class.")
+   )
+  "This class should allow overriding of various slot attributes.")
+
+(if (not (eq (oref-default slotattr-class-ok initform) 'no-init))
+    (error "Initform did not override in instance allocation."))
+
+
+(let* ((cv (class-v 'slotattr-ok))
+       (docs   (aref cv class-public-doc))
+       (names  (aref cv class-public-a))
+       (cust   (aref cv class-public-custom))
+       (label  (aref cv class-public-custom-label))
+       (group  (aref cv class-public-custom-group))
+       (types  (aref cv class-public-type))
+       (args   (aref cv class-initarg-tuples))
+       (i 0)
+       )
+  
+  (if (not (assoc :initblarg args))
+      (error ":initarg did not override for subclass."))
+
+  (while (< i (length names))
+
+    (cond
+     ((eq (nth i names) 'custom)
+      (if (not (eq (nth i cust) 'string))
+	  (error "Custom slot attribute did not override."))
+      (if (not (string= (nth i label) "One String"))
+	  (error "Custom Label slot attribute did not override."))
+      (let ((grp (nth i group)))
+	(if (not (and (memq 'moose grp) (memq 'cow grp)))
+	    (error "Custom Group slot attribute did not combine."))
+	))
+
+     (t nil))
+
+    (setq i (1+ i))))
+
+;;; Test clone on boring objects too!
+;;
+(defvar CLONETEST1 nil)
+(defvar CLONETEST2 nil)
+;; A simple make instance with EIEIO extension
+(setq CLONETEST1 (make-instance 'class-a "a"))
+(setq CLONETEST2 (clone CLONETEST1))
+
+;; CLOS form of make-instance
+(setq CLONETEST1 (make-instance 'class-a))
+(setq CLONETEST2 (clone CLONETEST1))
+
+
+;;; Test the persistent object, and object-write by side-effect.
+;;
+(defclass PO (eieio-persistent)
+  ((slot1 :initarg :slot1
+	  :initform 'moose
+	  :printer PO-slot1-printer)
+   (slot2 :initarg :slot2
+	  :initform "foo"))
+  "A Persistent object with two initializable slots.")
+
+(defun PO-slot1-printer (slotvalue)
+  "Print the slot value SLOTVALUE to stdout.
+Assume SLOTVALUE is a symbol of some sort."
+  (princ "(make-symbol \"")
+  (princ (symbol-name slotvalue))
+  (princ "\")")
+  nil)
+;;(PO-slot1-printer 'moose)
+
+(defvar PO1 nil)
+(setq PO1 (PO "persist" :slot1 'goose :slot2 "testing"
+	      :file (concat default-directory "test-p.el")))
+
+(eieio-persistent-save PO1)
+
+(let ((obj (eieio-persistent-read "test-p.el")))
+  (message "%S" obj)
+  )
+
+
+(let* ((find-file-hooks nil)
+       (tbuff (find-file-noselect "test-p.el"))
+       )
+  (condition-case nil
+      (unwind-protect
+	  (save-excursion
+	    (set-buffer tbuff)
+	    (goto-char (point-min))
+	    (re-search-forward ":slot1 (make-symbol"))
+	(kill-buffer tbuff))
+    (error "PO's Slot1 printer function didn't work.")))
+
+
+;;; Test the instance tracker
+;;
+(defclass IT (eieio-instance-tracker)
+  ((tracking-symbol :initform IT-list)
+   (slot1 :initform 'die))
+  "Instance Tracker test object.")
+
+(defvar IT-list nil)
+(defvar IT1 nil)
+(setq IT1 (IT "trackme"))
+
+(if (not (eieio-instance-tracker-find 'die 'slot1 'IT-list))
+    (error "Instance tracker lost an instance."))
+
+(delete-instance IT1)
+
+(if (eieio-instance-tracker-find 'die 'slot1 'IT-list)
+    (error "Instance tracker delete failed."))
+
+
+;;; Test singletons
+;;
+(defclass SINGLE (eieio-singleton)
+  ((a-slot :initarg :a-slot :initform t))
+  "A Singleton test object.")
+
+(let ((obj1 (SINGLE "Moose"))
+      (obj2 (SINGLE "Cow")))
+  (if (not (and (eieio-object-p obj1)
+		(eieio-object-p obj2)
+		(eq obj1 obj2)
+		(oref obj1 a-slot)))
+      (error "Two instances of a singleton")))
+
+
+;;; Test the named object.
+;;
+(defclass NAMED (eieio-named)
+  ((some-slot :initform nil)
+   )
+  "A class inheriting from eieio-named.")
+
+(defvar N nil)
+(setq N (NAMED "Foo"))
+
+(if (not (string= "Foo" (oref N object-name)))
+    (error "Named object `object-name' slot ref failed."))
+
+(condition-case err
+    (progn
+      (oref N missing-slot)
+      (error "Access to missing slot passed."))
+  (invalid-slot-name nil))
+
+(oset N object-name "NewName")
+
+(if (not (string= "NewName" (oref N object-name)))
+    (error "Named object `object-name' slot set/ref failed."))
+
+
+;;; Test some utilities in EIEIO-OPT
+;;
+(defclass opt-test1 ()
+  ()
+  "Abstract base class"
+  :abstract t)
+
+(defclass opt-test2 (opt-test1)
+  ()
+  "Instantiable child")
+
+(require 'eieio-opt)
+
+(if (/= (length (eieio-build-class-alist opt-test1 nil)) 2)
+    (error "eieio-build-class-alist did not return all possible classes"))
+
+(if (/= (length (eieio-build-class-alist opt-test1 t)) 1)
+    (error "eieio-build-class-alist did not filter on INSTANTIABLE-ONLY"))
+
+
+;;;
+(message "All tests passed.")
+
+(provide 'eieio-tests)
+
+;;; eieio-tests.el ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio.el b/site/cedet-1.0pre7/eieio/eieio.el
new file mode 100755
index 0000000..5a0b99c
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio.el
@@ -0,0 +1,2825 @@
+;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects
+;;               or maybe Eric's Implementation of Emacs Intrepreted Objects
+
+;;;
+;; Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 Eric M. Ludlam
+;;
+;; Author: <zappo@gnu.org>
+;; RCS: $Id: eieio.el,v 1.193 2010/01/07 02:22:21 zappo Exp $
+;; Keywords: OO, lisp
+
+(defvar eieio-version "1.2"
+  "Current version of EIEIO.")
+
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+
+;;; Commentary:
+;;
+;; EIEIO is a series of Lisp routines which implements a subset of
+;; CLOS, the Common Lisp Object System.  In addition, EIEIO also adds
+;; a few new features which help it integrate more strongly with the
+;; Emacs running environment.
+;;
+;; See eieio.texi for complete documentation on using this package.
+
+;; There is funny stuff going on with typep and deftype.  This
+;; is the only way I seem to be able to make this stuff load properly.
+
+;; @TODO - fix :initform to be a form, not a quoted value
+;; @TODO - Prefix non-clos functions with `eieio-'.
+
+(require 'cl)
+(load "cl-macs" nil t) ; No provide in this file.
+
+;;; Code:
+(defun eieio-version ()
+  "Display the current version of EIEIO."
+  (interactive)
+  (message eieio-version))
+
+(require 'inversion)
+
+(defun eieio-require-version (major minor &optional beta)
+  "Non-nil if this version of EIEIO does not satisfy a specific version.
+Arguments can be:
+
+  (MAJOR MINOR &optional BETA)
+
+  Values MAJOR and MINOR must be integers.  BETA can be an integer, or
+excluded if a released version is required.
+
+It is assumed that if the current version is newer than that specified,
+everything passes.  Exceptions occur when known incompatibilities are
+introduced."
+  (inversion-test 'eieio
+		  (format "%s.%s%s" major minor
+			  (if beta (format "beta%s" beta) ""))))
+
+(eval-and-compile
+;; About the above.  EIEIO must process its own code when it compiles
+;; itself, thus, by eval-and-compiling outselves, we solve the problem.
+
+;; Compatibility
+(if (fboundp 'compiled-function-arglist)
+
+    ;; XEmacs can only access a compiled functions arglist like this:
+    (defalias 'eieio-compiled-function-arglist 'compiled-function-arglist)
+
+  ;; Emacs doesn't have this function, but since FUNC is a vector, we can just
+  ;; grab the appropriate element.
+  (defun eieio-compiled-function-arglist (func)
+    "Return the argument list for the compiled function FUNC."
+    (aref func 0))
+
+  )
+
+
+;;;
+;; Variable declarations.
+;;
+
+(defvar eieio-hook nil
+  "*This hook is executed, then cleared each time `defclass' is called.")
+
+(defvar eieio-error-unsupported-class-tags nil
+  "*Non nil to throw an error if an encountered tag us unsupported.
+This may prevent classes from CLOS applications from being used with EIEIO
+since EIEIO does not support all CLOS tags.")
+
+(defvar eieio-skip-typecheck nil
+  "*If non-nil, skip all slot typechecking.
+Set this to t permanently if a program is functioning well to get a
+small speed increase.  This variable is also used internally to handle
+default setting for optimization purposes.")
+
+(defvar eieio-optimize-primary-methods-flag t
+  "Non-nil means to optimize the method dispatch on primary methods.")
+
+;; State Variables
+(defvar this nil
+  "Inside a method, this variable is the object in question.
+DO NOT SET THIS YOURSELF unless you are trying to simulate friendly slots.
+
+Note: Embedded methods are no longer supported.  The variable THIS is
+still set for CLOS methods for the sake of routines like
+`call-next-method'")
+
+(defvar scoped-class nil
+  "This is set to a class when a method is running.
+This is so we know we are allowed to check private parts or how to
+execute a `call-next-method'.  DO NOT SET THIS YOURSELF!")
+
+(defvar eieio-initializing-object  nil
+  "Set to non-nil while initializing an object.")
+
+(defconst eieio-unbound
+  (if (and (boundp 'eieio-unbound) (symbolp eieio-unbound))
+      eieio-unbound
+    (make-symbol "unbound"))
+  "Uninterned symbol representing an unbound slot in an object.")
+
+;; This is a bootstrap for eieio-default-superclass so it has a value
+;; while it is being built itself.
+(defvar eieio-default-superclass nil)
+
+(defconst class-symbol 1 "Class's symbol (self-referencing.).")
+(defconst class-parent 2 "Class parent slot.")
+(defconst class-children 3 "Class children class slot.")
+(defconst class-symbol-obarray 4 "Obarray permitting fast access to variable position indexes.")
+;; @todo
+;; the word "public" here is leftovers from the very first version.
+;; Get rid of it!
+(defconst class-public-a 5 "Class attribute index.")
+(defconst class-public-d 6 "Class attribute defaults index.")
+(defconst class-public-doc 7 "Class documentation strings for attributes.")
+(defconst class-public-type 8 "Class type for a slot.")
+(defconst class-public-custom 9 "Class custom type for a slot.")
+(defconst class-public-custom-label 10 "Class custom group for a slot.")
+(defconst class-public-custom-group 11 "Class custom group for a slot.")
+(defconst class-public-printer 12 "Printer for a slot.")
+(defconst class-protection 13 "Class protection for a slot.")
+(defconst class-initarg-tuples 14 "Class initarg tuples list.")
+(defconst class-class-allocation-a 15 "Class allocated attributes.")
+(defconst class-class-allocation-doc 16 "Class allocated documentation.")
+(defconst class-class-allocation-type 17 "Class allocated value type.")
+(defconst class-class-allocation-custom 18 "Class allocated custom descriptor.")
+(defconst class-class-allocation-custom-label 19 "Class allocated custom descriptor.")
+(defconst class-class-allocation-custom-group 20 "Class allocated custom group.")
+(defconst class-class-allocation-printer 21 "Class allocated printer for a slot.")
+(defconst class-class-allocation-protection 22 "Class allocated protection list.")
+(defconst class-class-allocation-values 23 "Class allocated value vector.")
+(defconst class-default-object-cache 24
+  "Cache index of what a newly created object would look like.
+This will speed up instantiation time as only a `copy-sequence' will
+be needed, instead of looping over all the values and setting them
+from the default.")
+(defconst class-options 25
+  "Storage location of tagged class options.
+Stored outright without modifications or stripping.")
+
+(defconst class-num-slots 26
+  "Number of slots in the class definition object.")
+
+(defconst object-class 1 "Index in an object vector where the class is stored.")
+(defconst object-name 2 "Index in an object where the name is stored.")
+
+(defconst method-static 0 "Index into :static tag on a method.")
+(defconst method-before 1 "Index into :before tag on a method.")
+(defconst method-primary 2 "Index into :primary tag on a method.")
+(defconst method-after 3 "Index into :after tag on a method.")
+(defconst method-num-lists 4 "Number of indexes into methods vector in which groups of functions are kept.")
+(defconst method-generic-before 4 "Index into generic :before tag on a method.")
+(defconst method-generic-primary 5 "Index into generic :primary tag on a method.")
+(defconst method-generic-after 6 "Index into generic :after tag on a method.")
+(defconst method-num-slots 7 "Number of indexes into a method's vector.")
+
+;; How to specialty compile stuff.
+(autoload 'byte-compile-file-form-defmethod "eieio-comp"
+  "This function is used to byte compile methods in a nice way.")
+(put 'defmethod 'byte-hunk-handler 'byte-compile-file-form-defmethod)
+
+(eval-when-compile (require 'eieio-comp))
+
+
+;;; Important macros used in eieio.
+;;
+(defmacro class-v (class)
+  "Internal: Return the class vector from the CLASS symbol."
+  ;; No check: If eieio gets this far, it has probably been checked already.
+  `(get ,class 'eieio-class-definition))
+
+(defmacro class-p (class)
+  "Return t if CLASS is a valid class vector.
+CLASS is a symbol."
+  ;; this new method is faster since it doesn't waste time checking lots of
+  ;; things.
+  `(condition-case nil
+       (eq (aref (class-v ,class) 0) 'defclass)
+     (error nil)))
+
+;;;###autoload
+(defmacro eieio-object-p (obj)
+  "Return non-nil if OBJ is an EIEIO object."
+  `(condition-case nil
+       (let ((tobj ,obj))
+	 (and (eq (aref tobj 0) 'object)
+	      (class-p (aref tobj object-class))))
+     (error nil)))
+(defalias 'object-p 'eieio-object-p)
+
+(defmacro class-constructor (class)
+  "Return the symbol representing the constructor of CLASS."
+  `(aref (class-v ,class) class-symbol))
+
+(defmacro generic-p (method)
+  "Return t if symbol METHOD is a generic function.
+Only methods have the symbol `eieio-method-obarray' as a property (which
+contains a list of all bindings to that method type.)"
+  `(and (fboundp ,method) (get ,method 'eieio-method-obarray)))
+
+(defun generic-primary-only-p (method)
+  "Return t if symbol METHOD is a generic function with only primary methods.
+Only methods have the symbol `eieio-method-obarray' as a property (which
+contains a list of all bindings to that method type.)
+Methods with only primary implementations are executed in an optimized way."
+  (and (generic-p method)
+       (let ((M (get method 'eieio-method-tree)))
+	 (and (< 0 (length (aref M method-primary)))
+	      (not (aref M method-static))
+	      (not (aref M method-before))
+	      (not (aref M method-after))
+	      (not (aref M method-generic-before))
+	      (not (aref M method-generic-primary))
+	      (not (aref M method-generic-after))))
+       ))
+
+(defun generic-primary-only-one-p (method)
+  "Return t if symbol METHOD is a generic function with only primary methods.
+Only methods have the symbol `eieio-method-obarray' as a property (which
+contains a list of all bindings to that method type.)
+Methods with only primary implementations are executed in an optimized way."
+  (and (generic-p method)
+       (let ((M (get method 'eieio-method-tree)))
+	 (and (= 1 (length (aref M method-primary)))
+	      (not (aref M method-static))
+	      (not (aref M method-before))
+	      (not (aref M method-after))
+	      (not (aref M method-generic-before))
+	      (not (aref M method-generic-primary))
+	      (not (aref M method-generic-after))))
+       ))
+
+(defmacro class-option-assoc (list option)
+  "Return from LIST the found OPTION.  Nil if it doesn't exist."
+  `(car-safe (cdr (memq ,option ,list))))
+
+(defmacro class-option (class option)
+  "Return the value stored for CLASS' OPTION.
+Return nil if that option doesn't exist."
+  `(class-option-assoc (aref (class-v ,class) class-options) ',option))
+
+(defmacro class-abstract-p (class)
+  "Return non-nil if CLASS is abstract.
+Abstract classes cannot be instantiated."
+  `(class-option ,class :abstract))
+
+(defmacro class-method-invocation-order (class)
+  "Return the invocation order of CLASS.
+Abstract classes cannot be instantiated."
+  `(or (class-option ,class :method-invocation-order)
+       :breadth-first))
+
+
+;;; Defining a new class
+;;
+(defmacro defclass (name superclass slots &rest options-and-doc)
+  "Define NAME as a new class derived from SUPERCLASS with SLOTS.
+OPTIONS-AND-DOC is used as the class' options and base documentation.
+SUPERCLASS is a list of superclasses to inherit from, with SLOTS
+being the slots residing in that class definition.  NOTE: Currently
+only one slot may exist in SUPERCLASS as multiple inheritance is not
+yet supported.  Supported tags are:
+
+  :initform   - initializing form
+  :initarg    - tag used during initialization
+  :accessor   - tag used to create a function to access this slot
+  :allocation - specify where the value is stored.
+                defaults to `:instance', but could also be `:class'
+  :writer     - a function symbol which will `write' an object's slot
+  :reader     - a function symbol which will `read' an object
+  :type       - the type of data allowed in this slot (see `typep')
+  :documentation
+              - A string documenting use of this slot.
+
+The following are extensions on CLOS:
+  :protection - Specify protection for this slot.
+                Defaults to `:public'.  Also use `:protected', or `:private'
+  :custom     - When customizing an object, the custom :type.  Public only.
+  :label      - A text string label used for a slot when customizing.
+  :group      - Name of a customization group this slot belongs in.
+  :printer    - A function to call to print the value of a slot.
+                See `eieio-override-prin1' as an example.
+
+A class can also have optional options.  These options happen in place
+of documentation, (including a :documentation tag) in addition to
+documentation, or not at all.  Supported options are:
+
+  :documentation - The doc-string used for this class.
+
+Options added to EIEIO:
+
+  :allow-nil-initform - Non-nil to skip typechecking of initforms if nil.
+  :custom-groups      - List of custom group names.  Organizes slots into
+                        reasonable groups for customizations.
+  :abstract           - Non-nil to prevent instances of this class.
+                        If a string, use as an error string if someone does
+                        try to make an instance.
+  :method-invocation-order
+                      - Control the method invokation order if there is
+                        multiple inheritance.  Valid values are:
+                         :breadth-first - The default.
+                         :depth-first
+
+Options in CLOS not supported in EIEIO:
+
+  :metaclass - Class to use in place of `standard-class'
+  :default-initargs - Initargs to use when initializing new objects of
+                      this class.
+
+Due to the way class options are set up, you can add any tags in you
+wish, and reference them using the function `class-option'."
+  ;; We must `eval-and-compile' this so that when we byte compile
+  ;; an eieio program, there is no need to load it ahead of time.
+  ;; It also provides lots of nice debugging errors at compile time.
+  `(eval-and-compile
+     (eieio-defclass ',name ',superclass ',slots ',options-and-doc)))
+
+(defvar eieio-defclass-autoload-map (make-vector 7 nil)
+  "Symbol map of superclasses we find in autoloads.")
+
+;;;###autoload
+(defun eieio-defclass-autoload (cname superclasses filename doc)
+  "Create autoload symbols for the EIEIO class CNAME.
+SUPERCLASSES are the superclasses that CNAME inherites from.
+DOC is the docstring for CNAME.
+This function creates a mock-class for CNAME and adds it into
+SUPERCLASSES as children.
+It creates an autoload function for CNAME's constructor."
+  ;; Assume we've already debugged inputs.
+
+  (let* ((oldc (when (class-p cname) (class-v cname)))
+	 (newc (make-vector class-num-slots nil))
+	 )
+    (if oldc
+	nil ;; Do nothing if we already have this class.
+
+      ;; Create the class in NEWC, but don't fill anything else in.
+      (aset newc 0 'defclass)
+      (aset newc class-symbol cname)
+
+      (let ((clear-parent nil))
+	;; No parents?
+	(when (not superclasses)
+	  (setq superclasses '(eieio-default-superclass)
+		clear-parent t)
+	  )
+
+	;; Hook our new class into the existing structures so we can
+	;; autoload it later.
+	(dolist (SC superclasses)
+
+
+	  ;; TODO - If we create an autoload that is in the map, that
+	  ;;        map needs to be cleared!
+
+
+	  ;; Does our parent exist?
+	  (if (not (class-p SC))
+	    
+	      ;; Create a symbol for this parent, and then store this
+	      ;; parent on that symbol.
+	      (let ((sym (intern (symbol-name SC) eieio-defclass-autoload-map)))
+		(if (not (boundp sym))
+		    (set sym (list cname))
+		  (add-to-list sym cname))
+		)
+
+	    ;; We have a parent, save the child in there.
+	    (when (not (member cname (aref (class-v SC) class-children)))
+	      (aset (class-v SC) class-children
+		    (cons cname (aref (class-v SC) class-children)))))
+
+	  ;; save parent in child
+	  (aset newc class-parent (cons SC (aref newc class-parent)))
+	  )
+
+	;; turn this into a useable self-pointing symbol
+	(set cname cname)
+
+	;; Store the new class vector definition into the symbol.  We need to
+	;; do this first so that we can call defmethod for the accessor.
+	;; The vector will be updated by the following while loop and will not
+	;; need to be stored a second time.
+	(put cname 'eieio-class-definition newc)
+
+	;; Clear the parent
+	(if clear-parent (aset newc class-parent nil))
+
+	;; Create an autoload on top of our constructor function.
+	(autoload cname filename doc nil nil)
+	(autoload (intern (concat (symbol-name cname) "-p")) filename "" nil nil)
+	(autoload (intern (concat (symbol-name cname) "-child-p")) filename "" nil nil)
+
+	))))
+
+(defsubst eieio-class-un-autoload (cname)
+  "If class CNAME is in an autoload state, load its file."
+  (when (eq (car-safe (symbol-function cname)) 'autoload)
+    (load-library (car (cdr (symbol-function cname))))))
+
+(defun eieio-defclass (cname superclasses slots options-and-doc)
+  "See `defclass' for more information.
+Define CNAME as a new subclass of SUPERCLASSES, with SLOTS being the
+slots residing in that class definition, and with options or documentation
+OPTIONS-AND-DOC as the toplevel documentation for this class."
+  ;; Run our eieio-hook each time, and clear it when we are done.
+  ;; This way people can add hooks safely if they want to modify eieio
+  ;; or add definitions when eieio is loaded or something like that.
+  (run-hooks 'eieio-hook)
+  (setq eieio-hook nil)
+
+  (if (not (symbolp cname)) (signal 'wrong-type-argument '(symbolp cname)))
+  (if (not (listp superclasses)) (signal 'wrong-type-argument '(listp superclasses)))
+
+  (let* ((pname (if superclasses superclasses nil))
+	 (newc (make-vector class-num-slots nil))
+	 (oldc (when (class-p cname) (class-v cname)))
+	 (groups nil) ;; list of groups id'd from slots
+	 (options nil)
+	 (clearparent nil))
+
+    (aset newc 0 'defclass)
+    (aset newc class-symbol cname)
+
+    ;; If this class already existed, and we are updating its structure,
+    ;; make sure we keep the old child list.  This can cause bugs, but
+    ;; if no new slots are created, it also saves time, and prevents
+    ;; method table breakage, particularly when the users is only
+    ;; byte compiling an EIEIO file.
+    (if oldc
+	(aset newc class-children (aref oldc class-children))
+      ;; If the old class did not exist, but did exist in the autoload map, then adopt those children.
+      ;; This is like the above, but deals with autoloads nicely.
+      (let ((sym (intern-soft (symbol-name cname) eieio-defclass-autoload-map)))
+	(when sym
+	  (condition-case nil
+	      (aset newc class-children (symbol-value sym))
+	    (error nil))
+	  (unintern (symbol-name cname) eieio-defclass-autoload-map)
+	  ))
+      )
+
+    (cond ((and (stringp (car options-and-doc))
+		(/= 1 (% (length options-and-doc) 2)))
+	   (error "Too many arguments to `defclass'"))
+	  ((and (symbolp (car options-and-doc))
+		(/= 0 (% (length options-and-doc) 2)))
+	   (error "Too many arguments to `defclass'"))
+	  )
+
+    (setq options
+	  (if (stringp (car options-and-doc))
+	      (cons :documentation options-and-doc)
+	    options-and-doc))
+
+    (if pname
+	(progn
+	  (while pname
+	    (if (and (car pname) (symbolp (car pname)))
+		(if (not (class-p (car pname)))
+		    ;; bad class
+		    (error "Given parent class %s is not a class" (car pname))
+		  ;; good parent class...
+		  ;; save new child in parent
+		  (when (not (member cname (aref (class-v (car pname)) class-children)))
+		    (aset (class-v (car pname)) class-children
+			  (cons cname (aref (class-v (car pname)) class-children))))
+		  ;; Get custom groups, and store them into our local copy.
+		  (mapc (lambda (g) (add-to-list 'groups g))
+			(class-option (car pname) :custom-groups))
+		  ;; save parent in child
+		  (aset newc class-parent (cons (car pname) (aref newc class-parent))))
+	      (error "Invalid parent class %s" pname))
+	    (setq pname (cdr pname)))
+	  ;; Reverse the list of our parents so that they are prioritized in
+	  ;; the same order as specified in the code.
+	  (aset newc class-parent (nreverse (aref newc class-parent))) )
+      ;; If there is nothing to loop over, then inherit from the
+      ;; default superclass.
+      (unless (eq cname 'eieio-default-superclass)
+	;; adopt the default parent here, but clear it later...
+	(setq clearparent t)
+	;; save new child in parent
+	(if (not (member cname (aref (class-v 'eieio-default-superclass) class-children)))
+	    (aset (class-v 'eieio-default-superclass) class-children
+		  (cons cname (aref (class-v 'eieio-default-superclass) class-children))))
+	;; save parent in child
+	(aset newc class-parent (list eieio-default-superclass))))
+    
+    ;; turn this into a useable self-pointing symbol
+    (set cname cname)
+
+    ;; These two tests must be created right away so we can have self-
+    ;; referencing classes.  ei, a class whose slot can contain only
+    ;; pointers to itself.
+
+    ;; Create the test function
+    (let ((csym (intern (concat (symbol-name cname) "-p"))))
+      (fset csym
+	    (list 'lambda (list 'obj)
+		  (format "Test OBJ to see if it an object of type %s" cname)
+		  (list 'and '(eieio-object-p obj)
+			(list 'same-class-p 'obj cname)))))
+
+    ;; Make sure the method invocation order  is a valid value.
+    (let ((io (class-option-assoc options :method-invocation-order)))
+      (when (and io (not (member io '(:depth-first :breadth-first))))
+	(error "Method invocation order %s is not allowed" io)
+	))
+
+    ;; Create a handy child test too
+    (let ((csym (intern (concat (symbol-name cname) "-child-p"))))
+      (fset csym
+	    `(lambda (obj)
+	       ,(format
+		  "Test OBJ to see if it an object is a child of type %s"
+		  cname)
+	       (and (eieio-object-p obj)
+		    (object-of-class-p obj ,cname))))
+    
+      ;; When using typep, (typep OBJ 'myclass) returns t for objects which
+      ;; are subclasses of myclass.  For our predicates, however, it is
+      ;; important for EIEIO to be backwards compatible, where
+      ;; myobject-p, and myobject-child-p are different.
+      ;; "cl" uses this technique to specify symbols with specific typep
+      ;; test, so we can let typep have the CLOS documented behavior
+      ;; while keeping our above predicate clean.
+      (eval `(deftype ,cname ()
+	       '(satisfies
+		 ,(intern (concat (symbol-name cname) "-child-p")))))
+
+      )
+
+    ;; before adding new slots, lets add all the methods and classes
+    ;; in from the parent class
+    (eieio-copy-parents-into-subclass newc superclasses)
+
+    ;; Store the new class vector definition into the symbol.  We need to
+    ;; do this first so that we can call defmethod for the accessor.
+    ;; The vector will be updated by the following while loop and will not
+    ;; need to be stored a second time.
+    (put cname 'eieio-class-definition newc)
+
+    ;; Query each slot in the declaration list and mangle into the
+    ;; class structure I have defined.
+    (while slots
+      (let* ((slot1  (car slots))
+	     (name    (car slot1))
+	     (slot   (cdr slot1))
+	     (acces   (plist-get slot ':accessor))
+	     (init    (or (plist-get slot ':initform)
+			  (if (member ':initform slot) nil
+			    eieio-unbound)))
+	     (initarg (plist-get slot ':initarg))
+	     (docstr  (plist-get slot ':documentation))
+	     (prot    (plist-get slot ':protection))
+	     (reader  (plist-get slot ':reader))
+	     (writer  (plist-get slot ':writer))
+	     (alloc   (plist-get slot ':allocation))
+	     (type    (plist-get slot ':type))
+	     (custom  (plist-get slot ':custom))
+	     (label   (plist-get slot ':label))
+	     (customg (plist-get slot ':group))
+	     (printer (plist-get slot ':printer))
+
+	     (skip-nil (class-option-assoc options :allow-nil-initform))
+	     )
+
+	(if eieio-error-unsupported-class-tags
+	    (let ((tmp slot))
+	      (while tmp
+		(if (not (member (car tmp) '(:accessor
+					     :initform
+					     :initarg
+					     :documentation
+					     :protection
+					     :reader
+					     :writer
+					     :allocation
+					     :type
+					     :custom
+					     :label
+					     :group
+					     :printer
+					     :allow-nil-initform
+					     :custom-groups)))
+		    (signal 'invalid-slot-type (list (car tmp))))
+		(setq tmp (cdr (cdr tmp))))))
+
+	;; Clean up the meaning of protection.
+	(cond ((or (eq prot 'public) (eq prot :public)) (setq prot nil))
+	      ((or (eq prot 'protected) (eq prot :protected)) (setq prot 'protected))
+	      ((or (eq prot 'private) (eq prot :private)) (setq prot 'private))
+	      ((eq prot nil) nil)
+	      (t (signal 'invalid-slot-type (list ':protection prot))))
+
+	;; Make sure the :allocation parameter has a valid value.
+	(if (not (or (not alloc) (eq alloc :class) (eq alloc :instance)))
+	    (signal 'invalid-slot-type (list ':allocation alloc)))
+
+	;; The default type specifier is supposed to be t, meaning anything.
+	(if (not type) (setq type t))
+
+	;; Label is nil, or a string
+	(if (not (or (null label) (stringp label)))
+	    (signal 'invalid-slot-type (list ':label label)))
+	
+	;; Is there an initarg, but allocation of class?
+	(if (and initarg (eq alloc :class))
+	    (message "Class allocated slots do not need :initarg"))
+
+	;; intern the symbol so we can use it blankly
+	(if initarg (set initarg initarg))
+
+	;; The customgroup should be a list of symbols
+	(cond ((null customg)
+	       (setq customg '(default)))
+	      ((not (listp customg))
+	       (setq customg (list customg))))
+	;; The customgroup better be a symbol, or list of symbols.
+	(mapc (lambda (cg)
+		(if (not (symbolp cg))
+		    (signal 'invalid-slot-type (list ':group cg))))
+		customg)
+
+	;; First up, add this slot into our new class.
+	(eieio-add-new-slot newc name init docstr type custom label customg printer
+			     prot initarg alloc 'defaultoverride skip-nil)
+
+	;; We need to id the group, and store them in a group list attribute.
+	(mapc (lambda (cg) (add-to-list 'groups cg)) customg)
+
+	;; anyone can have an accessor function.  This creates a function
+	;; of the specified name, and also performs a `defsetf' if applicable
+	;; so that users can `setf' the space returned by this function
+	(if acces
+	    (progn
+	      (eieio-defmethod acces
+		(list (if (eq alloc :class) :static :primary)
+		      (list (list 'this cname))
+		      (format
+		       "Retrieves the slot `%s' from an object of class `%s'"
+		       name cname)
+		      (list 'if (list 'slot-boundp 'this (list 'quote name))
+			    (list 'eieio-oref 'this (list 'quote name))
+			    ;; Else - Some error?  nil?
+			    nil
+			    )))
+	      ;; Thanks Pascal Bourguignon <pjb@informatimago.com>
+	      ;; For this complex macro.
+	      (eval (macroexpand
+		     (list  'defsetf acces '(widget) '(store)
+			    (list 'list ''eieio-oset 'widget
+				  (list 'quote (list 'quote name)) 'store))))
+	      ;;`(defsetf ,acces (widget) (store) (eieio-oset widget ',cname store))
+	      )
+	  )
+	;; If a writer is defined, then create a generic method of that
+	;; name whose purpose is to set the value of the slot.
+	(if writer
+	    (progn
+	      (eieio-defmethod writer
+		(list (list (list 'this cname) 'value)
+		      (format "Set the slot `%s' of an object of class `%s'"
+			      name cname)
+		      `(setf (slot-value this ',name) value)))
+	      ))
+	;; If a reader is defined, then create a generic method
+	;; of that name whose purpose is to access this slot value.
+	(if reader
+	    (progn
+	      (eieio-defmethod reader
+		(list (list (list 'this cname))
+		      (format "Access the slot `%s' from object of class `%s'"
+			      name cname)
+		      `(slot-value this ',name)))))
+	)
+      (setq slots (cdr slots)))
+
+    ;; Now that everything has been loaded up, all our lists are backwards!  Fix that up now.
+    (aset newc class-public-a (nreverse (aref newc class-public-a)))
+    (aset newc class-public-d (nreverse (aref newc class-public-d)))
+    (aset newc class-public-doc (nreverse (aref newc class-public-doc)))
+    (aset newc class-public-type
+	  (apply 'vector (nreverse (aref newc class-public-type))))
+    (aset newc class-public-custom (nreverse (aref newc class-public-custom)))
+    (aset newc class-public-custom-label (nreverse (aref newc class-public-custom-label)))
+    (aset newc class-public-custom-group (nreverse (aref newc class-public-custom-group)))
+    (aset newc class-public-printer (nreverse (aref newc class-public-printer)))
+    (aset newc class-protection (nreverse (aref newc class-protection)))
+    (aset newc class-initarg-tuples (nreverse (aref newc class-initarg-tuples)))
+
+    ;; The storage for class-class-allocation-type needs to be turned into
+    ;; a vector now.
+    (aset newc class-class-allocation-type
+	  (apply 'vector (aref newc class-class-allocation-type)))
+
+    ;; Also, take class allocated values, and vectorize them for speed.
+    (aset newc class-class-allocation-values
+	  (apply 'vector (aref newc class-class-allocation-values)))
+
+    ;; Attach slot symbols into an obarray, and store the index of
+    ;; this slot as the variable slot in this new symbol.  We need to
+    ;; know about primes, because obarrays are best set in vectors of
+    ;; prime number length, and we also need to make our vector small
+    ;; to save space, and also optimal for the number of items we have.
+    (let* ((cnt 0)
+	   (pubsyms (aref newc class-public-a))
+	   (prots (aref newc class-protection))
+	   (l (length pubsyms))
+	   (vl (let ((primes '( 3 5 7 11 13 17 19 23 29 31 37 41 43 47
+				  53 59 61 67 71 73 79 83 89 97 101 )))
+		 (while (and primes (< (car primes) l))
+		   (setq primes (cdr primes)))
+		 (car primes)))
+	   (oa (make-vector vl 0))
+	   (newsym))
+      (while pubsyms
+	(setq newsym (intern (symbol-name (car pubsyms)) oa))
+	(set newsym cnt)
+	(setq cnt (1+ cnt))
+	(if (car prots) (put newsym 'protection (car prots)))
+	(setq pubsyms (cdr pubsyms)
+	      prots (cdr prots)))
+      (aset newc class-symbol-obarray oa)
+      )
+
+    ;; Create the constructor function
+    (if (class-option-assoc options :abstract)
+	;; Abstract classes cannot be instantiated.  Say so.
+	(let ((abs (class-option-assoc options :abstract)))
+	  (if (not (stringp abs))
+	      (setq abs (format "Class %s is abstract" cname)))
+	  (fset cname
+		`(lambda (&rest stuff)
+		   ,(format "You cannot create a new object of type %s" cname)
+		   (error ,abs))))
+
+      ;; Non-abstract classes need a constructor.
+      (fset cname
+	    `(lambda (newname &rest slots)
+	       ,(format "Create a new object with name NAME of class type %s" cname)
+	       (apply 'constructor ,cname newname slots)))
+      )
+
+    ;; Set up a specialized doc string.
+    ;; Use stored value since it is calculated in a non-trivial way
+    (put cname 'variable-documentation
+	 (class-option-assoc options :documentation))
+
+    ;; We have a list of custom groups.  Store them into the options.
+    (let ((g (class-option-assoc options :custom-groups)))
+      (mapc (lambda (cg) (add-to-list 'g cg)) groups)
+      (if (memq :custom-groups options)
+	  (setcar (cdr (memq :custom-groups options)) g)
+	(setq options (cons :custom-groups (cons g options)))))
+
+    ;; Set up the options we have collected.
+    (aset newc class-options options)
+
+    ;; if this is a superclass, clear out parent (which was set to the
+    ;; default superclass eieio-default-superclass)
+    (if clearparent (aset newc class-parent nil))
+
+    ;; Create the cached default object.
+    (let ((cache (make-vector (+ (length (aref newc class-public-a))
+				 3) nil)))
+      (aset cache 0 'object)
+      (aset cache object-class cname)
+      (aset cache object-name 'default-cache-object)
+      (let ((eieio-skip-typecheck t))
+	;; All type-checking has been done to our satisfaction
+	;; before this call.  Don't waste our time in this call..
+	(eieio-set-defaults cache t))
+      (aset newc class-default-object-cache cache))
+
+    ;; Return our new class object
+    ;; newc
+    cname
+    ))
+
+(defun eieio-perform-slot-validation-for-default (slot spec value skipnil)
+  "For SLOT, signal if SPEC does not match VALUE.
+If SKIPNIL is non-nil, then if VALUE is nil, return t."
+  (let ((val (eieio-default-eval-maybe value)))
+    (if (and (not eieio-skip-typecheck)
+	     (not (and skipnil (null val)))
+	     (not (eieio-perform-slot-validation spec val)))
+	(signal 'invalid-slot-type (list slot spec val)))))
+
+(defun eieio-add-new-slot (newc a d doc type cust label custg print prot init alloc
+				 &optional defaultoverride skipnil)
+  "Add into NEWC attribute A.
+If A already exists in NEWC, then do nothing.  If it doesn't exist,
+then also add in D (defualt), DOC, TYPE, CUST, LABEL, CUSTG, PRINT, PROT, and INIT arg.
+Argument ALLOC specifies if the slot is allocated per instance, or per class.
+If optional DEFAULTOVERRIDE is non-nil, then if A exists in NEWC,
+we must override its value for a default.
+Optional argument SKIPNIL indicates if type checking should be skipped
+if default value is nil."
+  ;; Make sure we duplicate those items that are sequences.
+  (condition-case nil
+      (if (sequencep d) (setq d (copy-sequence d)))
+    ;; This copy can fail on a cons cell with a non-cons in the cdr.  Lets skip it if it doesn't work.
+    (error nil))
+  (if (sequencep type) (setq type (copy-sequence type)))
+  (if (sequencep cust) (setq cust (copy-sequence cust)))
+  (if (sequencep custg) (setq custg (copy-sequence custg)))
+
+  ;; To prevent override information w/out specification of storage,
+  ;; we need to do this little hack.
+  (if (member a (aref newc class-class-allocation-a)) (setq alloc ':class))
+
+  (if (or (not alloc) (and (symbolp alloc) (eq alloc ':instance)))
+      ;; In this case, we modify the INSTANCE version of a given slot.
+
+      (progn
+
+	;; Only add this element if it is so-far unique
+	(if (not (member a (aref newc class-public-a)))
+	    (progn
+	      (eieio-perform-slot-validation-for-default a type d skipnil)
+	      (aset newc class-public-a (cons a (aref newc class-public-a)))
+	      (aset newc class-public-d (cons d (aref newc class-public-d)))
+	      (aset newc class-public-doc (cons doc (aref newc class-public-doc)))
+	      (aset newc class-public-type (cons type (aref newc class-public-type)))
+	      (aset newc class-public-custom (cons cust (aref newc class-public-custom)))
+	      (aset newc class-public-custom-label (cons label (aref newc class-public-custom-label)))
+	      (aset newc class-public-custom-group (cons custg (aref newc class-public-custom-group)))
+	      (aset newc class-public-printer (cons print (aref newc class-public-printer)))
+	      (aset newc class-protection (cons prot (aref newc class-protection)))
+	      (aset newc class-initarg-tuples (cons (cons init a) (aref newc class-initarg-tuples)))
+	      )
+	  ;; When defaultoverride is true, we are usually adding new local
+	  ;; attributes which must override the default value of any slot
+	  ;; passed in by one of the parent classes.
+	  (when defaultoverride
+	    ;; There is a match, and we must override the old value.
+	    (let* ((ca (aref newc class-public-a))
+		   (np (member a ca))
+		   (num (- (length ca) (length np)))
+		   (dp (if np (nthcdr num (aref newc class-public-d))
+			 nil))
+		   (tp (if np (nth num (aref newc class-public-type))))
+		   )
+	      (if (not np)
+		  (error "Eieio internal error overriding default value for %s"
+			 a)
+		;; If type is passed in, is it the same?
+		(if (not (eq type t))
+		    (if (not (equal type tp))
+			(error
+			 "Child slot type `%s' does not match inherited type `%s' for `%s'"
+			 type tp a)))
+		;; If we have a repeat, only update the initarg...
+		(unless (eq d eieio-unbound)
+		  (eieio-perform-slot-validation-for-default a tp d skipnil)
+		  (setcar dp d))
+		;; If we have a new initarg, check for it.
+		(when init
+		  (let* ((inits (aref newc class-initarg-tuples))
+			 (inita (rassq a inits)))
+		    ;; Replace the CAR of the associate INITA.
+		    ;;(message "Initarg: %S replace %s" inita init)
+		    (setcar inita init)
+		    ))
+
+		;; PLN Tue Jun 26 11:57:06 2007 : The protection is
+		;; checked and SHOULD match the superclass
+		;; protection. Otherwise an error is thrown. However
+		;; I wonder if a more flexible schedule might be
+		;; implemented.
+		;;
+		;; EML - We used to have (if prot... here,
+		;;       but a prot of 'nil means public.
+		;;
+		(let ((super-prot (nth num (aref newc class-protection)))
+		      )
+		  (if (not (eq prot super-prot))
+		      (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
+			     prot super-prot a)))
+		;; End original PLN
+
+		;; PLN Tue Jun 26 11:57:06 2007 :
+		;; We do a non redundant combination of ancient
+		;; custom groups and new ones using the common lisp
+		;; `union' method.
+		(when custg
+		  (let ((where-groups
+			 (nthcdr num (aref newc class-public-custom-group))))
+		    (setcar where-groups
+			    (union (car where-groups)
+				   (if (listp custg) custg (list custg))))))
+		;;  End PLN
+		  
+		;;  PLN Mon Jun 25 22:44:34 2007 : If a new cust is
+		;;  set, simply replaces the old one.
+		(when cust
+		  ;; (message "Custom type redefined to %s" cust)
+		  (setcar (nthcdr num (aref newc class-public-custom)) cust))
+
+		;; If a new label is specified, it simply replaces
+		;; the old one.
+		(when label
+		  ;; (message "Custom label redefined to %s" label)
+		  (setcar (nthcdr num (aref newc class-public-custom-label)) label))
+		;;  End PLN
+
+		;; PLN Sat Jun 30 17:24:42 2007 : when a new
+		;; doc is specified, simply replaces the old one.
+		(when doc
+		  ;;(message "Documentation redefined to %s" doc)
+		  (setcar (nthcdr num (aref newc class-public-doc))
+			  doc))
+		;; End PLN
+
+		;; If a new printer is specified, it simply replaces
+		;; the old one.
+		(when print
+		  ;; (message "printer redefined to %s" print)
+		  (setcar (nthcdr num (aref newc class-public-printer)) print))
+
+		)))
+	  ))
+
+    ;; CLASS ALLOCATED SLOTS
+    (let ((value (eieio-default-eval-maybe d)))
+      (if (not (member a (aref newc class-class-allocation-a)))
+	  (progn
+	    (eieio-perform-slot-validation-for-default a type value skipnil)
+	    ;; Here we have found a :class version of a slot.  This
+	    ;; requires a very different aproach.
+	    (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a)))
+	    (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc)))
+	    (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type)))
+	    (aset newc class-class-allocation-custom (cons cust (aref newc class-class-allocation-custom)))
+	    (aset newc class-class-allocation-custom-label (cons label (aref newc class-class-allocation-custom-label)))
+	    (aset newc class-class-allocation-custom-group (cons custg (aref newc class-class-allocation-custom-group)))
+	    (aset newc class-class-allocation-protection (cons prot (aref newc class-class-allocation-protection)))
+	    ;; Default value is stored in the 'values section, since new objects
+	    ;; can't initialize from this element.
+	    (aset newc class-class-allocation-values (cons value (aref newc class-class-allocation-values))))
+	(when defaultoverride
+	  ;; There is a match, and we must override the old value.
+	  (let* ((ca (aref newc class-class-allocation-a))
+		 (np (member a ca))
+		 (num (- (length ca) (length np)))
+		 (dp (if np
+			 (nthcdr num
+				 (aref newc class-class-allocation-values))
+		       nil))
+		 (tp (if np (nth num (aref newc class-class-allocation-type))
+		       nil)))
+	    (if (not np)
+		(error "Eieio internal error overriding default value for %s"
+		       a)
+	      ;; If type is passed in, is it the same?
+	      (if (not (eq type t))
+		  (if (not (equal type tp))
+		      (error
+		       "Child slot type `%s' does not match inherited type `%s' for `%s'"
+		       type tp a)))
+	      ;; EML - Note: the only reason to override a class bound slot
+	      ;;       is to change the default, so allow unbound in.
+
+	      ;; If we have a repeat, only update the vlaue...
+	      (eieio-perform-slot-validation-for-default a tp value skipnil)
+	      (setcar dp value))
+
+	    ;; PLN Tue Jun 26 11:57:06 2007 : The protection is
+	    ;; checked and SHOULD match the superclass
+	    ;; protection. Otherwise an error is thrown. However
+	    ;; I wonder if a more flexible schedule might be
+	    ;; implemented.
+	    (let ((super-prot
+		   (car (nthcdr num (aref newc class-class-allocation-protection)))))
+	      (if (not (eq prot super-prot))
+		  (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
+			 prot super-prot a)))
+	    ;; We do a non redundant combination of ancient
+	    ;; custom groups and new ones using the common lisp
+	    ;; `union' method.
+	    (when custg
+	      (let ((where-groups
+		     (nthcdr num (aref newc class-class-allocation-custom-group))))
+		(setcar where-groups
+			(union (car where-groups)
+			       (if (listp custg) custg (list custg))))))
+	    ;;  End PLN
+
+	    ;; PLN Sat Jun 30 17:24:42 2007 : when a new
+	    ;; doc is specified, simply replaces the old one.
+	    (when doc
+	      ;;(message "Documentation redefined to %s" doc)
+	      (setcar (nthcdr num (aref newc class-class-allocation-doc))
+		      doc))
+	    ;; End PLN
+
+	    ;; If a new printer is specified, it simply replaces
+	    ;; the old one.
+	    (when print
+	      ;; (message "printer redefined to %s" print)
+	      (setcar (nthcdr num (aref newc class-class-allocation-printer)) print))
+
+	    ))
+	))
+    ))
+
+(defun eieio-copy-parents-into-subclass (newc parents)
+  "Copy into NEWC the slots of PARENTS.
+Follow the rules of not overwritting early parents when applying to
+the new child class."
+  (let ((ps (aref newc class-parent))
+	(sn (class-option-assoc (aref newc class-options)
+				':allow-nil-initform)))
+    (while ps
+      ;; First, duplicate all the slots of the parent.
+      (let ((pcv (class-v (car ps))))
+	(let ((pa (aref pcv class-public-a))
+	      (pd (aref pcv class-public-d))
+	      (pdoc (aref pcv class-public-doc))
+	      (ptype (aref pcv class-public-type))
+	      (pcust (aref pcv class-public-custom))
+	      (plabel (aref pcv class-public-custom-label))
+	      (pcustg (aref pcv class-public-custom-group))
+	      (printer (aref pcv class-public-printer))
+	      (pprot (aref pcv class-protection))
+	      (pinit (aref pcv class-initarg-tuples))
+	      (i 0))
+	  (while pa
+	    (eieio-add-new-slot newc
+				 (car pa) (car pd) (car pdoc) (aref ptype i)
+				 (car pcust) (car plabel) (car pcustg)
+				 (car printer)
+				 (car pprot) (car-safe (car pinit)) nil nil sn)
+	    ;; Increment each value.
+	    (setq pa (cdr pa)
+		  pd (cdr pd)
+		  pdoc (cdr pdoc)
+		  i (1+ i)
+		  pcust (cdr pcust)
+		  plabel (cdr plabel)
+		  pcustg (cdr pcustg)
+		  printer (cdr printer)
+		  pprot (cdr pprot)
+		  pinit (cdr pinit))
+	    )) ;; while/let
+	;; Now duplicate all the class alloc slots.
+	(let ((pa (aref pcv class-class-allocation-a))
+	      (pdoc (aref pcv class-class-allocation-doc))
+	      (ptype (aref pcv class-class-allocation-type))
+	      (pcust (aref pcv class-class-allocation-custom))
+	      (plabel (aref pcv class-class-allocation-custom-label))
+	      (pcustg (aref pcv class-class-allocation-custom-group))
+	      (printer (aref pcv class-class-allocation-printer))
+	      (pprot (aref pcv class-class-allocation-protection))
+	      (pval (aref pcv class-class-allocation-values))
+	      (i 0))
+	  (while pa
+	    (eieio-add-new-slot newc
+				 (car pa) (aref pval i) (car pdoc) (aref ptype i)
+				 (car pcust) (car plabel) (car pcustg)
+				 (car printer)
+				 (car pprot) nil ':class sn)
+	    ;; Increment each value.
+	    (setq pa (cdr pa)
+		  pdoc (cdr pdoc)
+		  pcust (cdr pcust)
+		  plabel (cdr plabel)
+		  pcustg (cdr pcustg)
+		  printer (cdr printer)
+		  pprot (cdr pprot)
+		  i (1+ i))
+	    ))) ;; while/let
+      ;; Loop over each parent class
+      (setq ps (cdr ps)))
+    ))
+
+;;; CLOS style implementation of object creators.
+;;
+(defun make-instance (class &rest initargs)
+  "Make a new instance of CLASS based on INITARGS.
+CLASS is a class symbol.  For example:
+
+  (make-instance 'foo)
+
+  INITARGS is a property list with keywords based on the :initarg
+for each slot.  For example:
+
+  (make-instance 'foo :slot1 value1 :slotN valueN)
+
+Compatability note:
+
+If the first element of INITARGS is a string, it is used as the
+name of the class.
+
+In EIEIO, the class' constructor requires a name for use when printing.
+`make-instance' in CLOS doesn't use names the way Emacs does, so the
+class is used as the name slot instead when INITARGS doesn't start with
+a string."
+  (if (and (car initargs) (stringp (car initargs)))
+      (apply (class-constructor class) initargs)
+    (apply  (class-constructor class)
+	    (cond ((symbolp class) (symbol-name class))
+		  (t (format "%S" class)))
+	    initargs)))
+
+
+;;; CLOS methods and generics
+;;
+(defmacro defgeneric (method args &optional doc-string)
+  "Create a generic function METHOD.  ARGS is ignored.
+DOC-STRING is the base documentation for this class.  A generic
+function has no body, as its purpose is to decide which method body
+is appropriate to use.  Use `defmethod' to create methods, and it
+calls defgeneric for you.  With this implementation the arguments are
+currently ignored.  You can use `defgeneric' to apply specialized
+top level documentation to a method."
+  `(eieio-defgeneric (quote ,method) ,doc-string))
+
+(defun eieio-defgeneric-form (method doc-string)
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD."
+  `(lambda (&rest local-args)
+     ,doc-string
+     (eieio-generic-call (quote ,method) local-args)))
+
+(defsubst eieio-defgeneric-reset-generic-form (method)
+  "Setup METHOD to call the generic form."
+  (let ((doc-string (documentation method)))
+    (fset method (eieio-defgeneric-form method doc-string))))
+
+(defun eieio-defgeneric-form-primary-only (method doc-string)
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD."
+  `(lambda (&rest local-args)
+     ,doc-string
+     (eieio-generic-call-primary-only (quote ,method) local-args)))
+
+(defsubst eieio-defgeneric-reset-generic-form-primary-only (method)
+  "Setup METHOD to call the generic form."
+  (let ((doc-string (documentation method)))
+    (fset method (eieio-defgeneric-form-primary-only method doc-string))))
+
+(defun eieio-defgeneric-form-primary-only-one (method doc-string
+						      class
+						      impl
+						      )
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD.
+CLASS is the class symbol needed for private method access.
+IMPL is the symbol holding the method implementation."
+  ;; NOTE: I tried out byte compiling this little fcn.  Turns out it
+  ;; is faster to execute this for not byte-compiled.  ie, install this,
+  ;; then measure calls going through here.  I wonder why.
+  (require 'bytecomp)
+  (let ((byte-compile-free-references nil)
+	(byte-compile-warnings nil)
+	)
+    (byte-compile-lambda
+     `(lambda (&rest local-args)
+	,doc-string
+	;; This is a cool cheat.  Usually we need to look up in the
+	;; method table to find out if there is a method or not.  We can
+	;; instead make that determination at load time when there is
+	;; only one method.  If the first arg is not a child of the class
+	;; of that one implementation, then clearly, there is no method def.
+	(if (not (eieio-object-p (car local-args)))
+	    ;; Not an object.  Just signal.
+	    (signal 'no-method-definition (list ,(list 'quote method) local-args))
+	
+	  ;; We do have an object.  Make sure it is the right type.
+	  (if ,(if (eq class eieio-default-superclass)
+		   nil ; default superclass means just an obj.  Already asked.
+		 `(not (child-of-class-p (aref (car local-args) object-class)
+					 ,(list 'quote class)))
+		 )
+	      
+	      ;; If not the right kind of object, call no applicable
+	      (apply 'no-applicable-method (car local-args)
+		     ,(list 'quote method) local-args)
+
+	    ;; It is ok, do the call.
+	    ;; Fill in inter-call variables then evaluate the method.
+	    (let ((scoped-class ,(list 'quote class))
+		  (eieio-generic-call-next-method-list nil)
+		  (eieio-generic-call-key method-primary)
+		  (eieio-generic-call-methodname ,(list 'quote method))
+		  (eieio-generic-call-arglst local-args)
+		  )
+	      (apply ,(list 'quote impl) local-args)
+	      ;(,impl local-args)
+	      ))))
+     )
+  ))
+
+(defsubst eieio-defgeneric-reset-generic-form-primary-only-one (method)
+  "Setup METHOD to call the generic form."
+  (let* ((doc-string (documentation method))
+	 (M (get method 'eieio-method-tree))
+	 (entry (car (aref M method-primary)))
+	 )
+    (fset method (eieio-defgeneric-form-primary-only-one
+		  method doc-string
+		  (car entry)
+		  (cdr entry)
+		  ))))
+
+(defun eieio-defgeneric (method doc-string)
+  "Engine part to `defgeneric' macro defining METHOD with DOC-STRING."
+  (if (and (fboundp method) (not (generic-p method))
+	   (or (byte-code-function-p (symbol-function method))
+	       (not (eq 'autoload (car (symbol-function method)))))
+	   )
+      (error "You cannot create a generic/method over an existing symbol: %s"
+	     method))
+  ;; Don't do this over and over.
+  (unless (fboundp 'method)
+    ;; This defun tells emacs where the first definition of this
+    ;; method is defined.
+    `(defun ,method nil)
+    ;; Make sure the method tables are installed.
+    (eieiomt-install method)
+    ;; Apply the actual body of this function.
+    (fset method (eieio-defgeneric-form method doc-string))
+    ;; Return the method
+    'method))
+
+(defun eieio-unbind-method-implementations (method)
+  "Make the generic method METHOD have no implementations..
+It will leave the original generic function in place, but remove
+reference to all implementations of METHOD."
+  (put method 'eieio-method-tree nil)
+  (put method 'eieio-method-obarray nil))
+
+(defmacro defmethod (method &rest args)
+  "Create a new METHOD through `defgeneric' with ARGS.
+
+The second optional argument KEY is a specifier that
+modifies how the method is called, including:
+   :before - Method will be called before the :primary
+   :primary - The default if not specified.
+   :after - Method will be called after the :primary
+   :static - First arg could be an object or class
+The next argument is the ARGLIST.  The ARGLIST specifies the arguments
+to the method as with `defun'.  The first argument can have a type
+specifier, such as:
+  ((VARNAME CLASS) ARG2 ...)
+where VARNAME is the name of the local variable for the method being
+created.  The CLASS is a class symbol for a class made with `defclass'.
+A DOCSTRING comes after the ARGLIST, and is optional.
+All the rest of the args are the BODY of the method.  A method will
+return the value of the last form in the BODY.
+
+Summary:
+
+ (defmethod mymethod [:before | :primary | :after | :static]
+                     ((typearg class-name) arg2 &optional opt &rest rest)
+    \"doc-string\"
+     body)"
+  `(eieio-defmethod (quote ,method) (quote ,args)))
+
+(defun eieio-defmethod (method args)
+  "Work part of the `defmethod' macro defining METHOD with ARGS."
+  (let ((key nil) (body nil) (firstarg nil) (argfix nil) (argclass nil) loopa)
+    ;; find optional keys
+    (setq key
+	  (cond ((or (eq ':BEFORE (car args))
+		     (eq ':before (car args)))
+		 (setq args (cdr args))
+		 method-before)
+		((or (eq ':AFTER (car args))
+		     (eq ':after (car args)))
+		 (setq args (cdr args))
+		 method-after)
+		((or (eq ':PRIMARY (car args))
+		     (eq ':primary (car args)))
+		 (setq args (cdr args))
+		 method-primary)
+		((or (eq ':STATIC (car args))
+		     (eq ':static (car args)))
+		 (setq args (cdr args))
+		 method-static)
+		;; Primary key
+		(t method-primary)))
+    ;; get body, and fix contents of args to be the arguments of the fn.
+    (setq body (cdr args)
+	  args (car args))
+    (setq loopa args)
+    ;; Create a fixed version of the arguments
+    (while loopa
+      (setq argfix (cons (if (listp (car loopa)) (car (car loopa)) (car loopa))
+			 argfix))
+      (setq loopa (cdr loopa)))
+    ;; make sure there is a generic
+    (eieio-defgeneric
+     method
+     (if (stringp (car body))
+	 (car body) (format "Generically created method `%s'" method)))
+    ;; create symbol for property to bind to.  If the first arg is of
+    ;; the form (varname vartype) and `vartype' is a class, then
+    ;; that class will be the type symbol.  If not, then it will fall
+    ;; under the type `primary' which is a non-specific calling of the
+    ;; function.
+    (setq firstarg (car args))
+    (if (listp firstarg)
+	(progn
+	  (setq argclass  (nth 1 firstarg))
+	  (if (not (class-p argclass))
+	      (error "Unknown class type %s in method parameters"
+		     (nth 1 firstarg))))
+      (if (= key -1)
+	  (signal 'wrong-type-argument (list :static 'non-class-arg)))
+      ;; generics are higher
+      (setq key (+ key 3)))
+    ;; Put this lambda into the symbol so we can find it
+    (if (byte-code-function-p (car-safe body))
+	(eieiomt-add method (car-safe body) key argclass)
+      (eieiomt-add method (append (list 'lambda (reverse argfix)) body)
+		   key argclass))
+    )
+
+  (when eieio-optimize-primary-methods-flag
+    ;; Optimizing step:
+    ;;
+    ;; If this method, after this setup, only has primary methods, then
+    ;; we can setup the generic that way.
+    (if (generic-primary-only-p method)
+	;; If there is only one primary method, then we can go one more
+	;; optimization step.
+	(if (generic-primary-only-one-p method)
+	    (eieio-defgeneric-reset-generic-form-primary-only-one method)
+	  (eieio-defgeneric-reset-generic-form-primary-only method))
+      (eieio-defgeneric-reset-generic-form method)))
+
+  method)
+
+;;; Slot type validation
+;;
+(defun eieio-perform-slot-validation (spec value)
+  "Return non-nil if SPEC does not match VALUE."
+  ;; typep is in cl-macs
+  (or (eq spec t)			; t always passes
+      (eq value eieio-unbound)		; unbound always passes
+      (typep value spec)))
+
+(defun eieio-validate-slot-value (class slot-idx value slot)
+  "Make sure that for CLASS referencing SLOT-IDX, that VALUE is valid.
+Checks the :type specifier.
+SLOT is the slot that is being checked, and is only used when throwing
+and error."
+  (if eieio-skip-typecheck
+      nil
+    ;; Trim off object IDX junk added in for the object index.
+    (setq slot-idx (- slot-idx 3))
+    (let ((st (aref (aref (class-v class) class-public-type) slot-idx)))
+      (if (not (eieio-perform-slot-validation st value))
+	  (signal 'invalid-slot-type (list class slot st value))))))
+
+(defun eieio-validate-class-slot-value (class slot-idx value slot)
+  "Make sure that for CLASS referencing SLOT-IDX, that VALUE is valid.
+Checks the :type specifier.
+SLOT is the slot that is being checked, and is only used when throwing
+and error."
+  (if eieio-skip-typecheck
+      nil
+    (let ((st (aref (aref (class-v class) class-class-allocation-type)
+		    slot-idx)))
+      (if (not (eieio-perform-slot-validation st value))
+	  (signal 'invalid-slot-type (list class slot st value))))))
+
+(defun eieio-barf-if-slot-unbound (value instance slotname fn)
+  "Throw a signal if VALUE is a representation of an UNBOUND slot.
+INSTANCE is the object being referenced.  SLOTNAME is the offending
+slot.  If the slot is ok, return VALUE.
+Argument FN is the function calling this verifier."
+  (if (and (eq value eieio-unbound) (not eieio-skip-typecheck))
+      (slot-unbound instance (object-class instance) slotname fn)
+    value))
+
+;;; Get/Set slots in an object.
+;;
+(defmacro oref (obj slot)
+  "Retrieve the value stored in OBJ in the slot named by SLOT.
+Slot is the name of the slot when created by `defclass' or the label
+created by the :initarg tag."
+  `(eieio-oref ,obj (quote ,slot)))
+
+(defun eieio-oref (obj slot)
+  "Return the value in OBJ at SLOT in the object vector."
+  (if (not (or (eieio-object-p obj) (class-p obj)))
+      (signal 'wrong-type-argument (list '(or eieio-object-p class-p) obj)))
+  (if (not (symbolp slot))
+      (signal 'wrong-type-argument (list 'symbolp slot)))
+  (if (class-p obj) (eieio-class-un-autoload obj))
+  (let* ((class (if (class-p obj) obj (aref obj object-class)))
+	 (c (eieio-slot-name-index class obj slot)))
+    (if (not c)
+	;; It might be missing because it is a :class allocated slot.
+	;; Lets check that info out.
+	(if (setq c (eieio-class-slot-name-index class slot))
+	    ;; Oref that slot.
+	    (aref (aref (class-v class) class-class-allocation-values) c)
+	  ;; The slot-missing method is a cool way of allowing an object author
+	  ;; to intercept missing slot definitions.  Since it is also the LAST
+	  ;; thing called in this fn, its return value would be retrieved.
+	  (slot-missing obj slot 'oref)
+	  ;;(signal 'invalid-slot-name (list (object-name obj) slot))
+	  )
+      (if (not (eieio-object-p obj))
+	  (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+      (eieio-barf-if-slot-unbound (aref obj c) obj slot 'oref))))
+
+(defalias 'slot-value 'eieio-oref)
+(defalias 'set-slot-value 'eieio-oset)
+
+(defmacro oref-default (obj slot)
+  "Gets the default value of OBJ (maybe a class) for SLOT.
+The default value is the value installed in a class with the :initform
+tag.  SLOT can be the slot name, or the tag specified by the :initarg
+tag in the `defclass' call."
+  `(eieio-oref-default ,obj (quote ,slot)))
+
+(defun eieio-oref-default (obj slot)
+  "Does the work for the macro `oref-default' with similar parameters.
+Fills in OBJ's SLOT with its default value."
+  (if (not (or (eieio-object-p obj) (class-p obj))) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (if (not (symbolp slot)) (signal 'wrong-type-argument (list 'symbolp slot)))
+  (let* ((cl (if (eieio-object-p obj) (aref obj object-class) obj))
+	 (c (eieio-slot-name-index cl obj slot)))
+    (if (not c)
+	;; It might be missing because it is a :class allocated slot.
+	;; Lets check that info out.
+	(if (setq c
+		  (eieio-class-slot-name-index cl slot))
+	    ;; Oref that slot.
+	    (aref (aref (class-v cl) class-class-allocation-values)
+		  c)
+	  (slot-missing obj slot 'oref-default)
+	  ;;(signal 'invalid-slot-name (list (class-name cl) slot))
+	  )
+      (eieio-barf-if-slot-unbound
+       (let ((val (nth (- c 3) (aref (class-v cl) class-public-d))))
+	 (eieio-default-eval-maybe val))
+       obj cl 'oref-default))))
+
+(defun eieio-default-eval-maybe (val)
+  "Check VAL, and return what `oref-default' would provide."
+  ;; check for quoted things, and unquote them
+  (if (and (listp val) (eq (car val) 'quote))
+      (car (cdr val))
+    ;; return it verbatim
+    val))
+
+;;; Object Set macros
+;;
+(defmacro oset (obj slot value)
+  "Set the value in OBJ for slot SLOT to VALUE.
+SLOT is the slot name as specified in `defclass' or the tag created
+with in the :initarg slot.  VALUE can be any Lisp object."
+  `(eieio-oset ,obj (quote ,slot) ,value))
+
+(defun eieio-oset (obj slot value)
+  "Does the work for the macro `oset'.
+Fills in OBJ's SLOT with VALUE."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (if (not (symbolp slot)) (signal 'wrong-type-argument (list 'symbolp slot)))
+  (let ((c (eieio-slot-name-index (object-class-fast obj) obj slot)))
+    (if (not c)
+	;; It might be missing because it is a :class allocated slot.
+	;; Lets check that info out.
+	(if (setq c
+		  (eieio-class-slot-name-index (aref obj object-class) slot))
+	    ;; Oset that slot.
+	    (progn
+	      (eieio-validate-class-slot-value (object-class-fast obj) c value slot)
+	      (aset (aref (class-v (aref obj object-class))
+			  class-class-allocation-values)
+		    c value))
+	  ;; See oref for comment on `slot-missing'
+	  (slot-missing obj slot 'oset value)
+	  ;;(signal 'invalid-slot-name (list (object-name obj) slot))
+	  )
+      (eieio-validate-slot-value (object-class-fast obj) c value slot)
+      (aset obj c value))))
+
+(defmacro oset-default (class slot value)
+  "Set the default slot in CLASS for SLOT to VALUE.
+The default value is usually set with the :initform tag during class
+creation.  This allows users to change the default behavior of classes
+after they are created."
+  `(eieio-oset-default ,class (quote ,slot) ,value))
+
+(defun eieio-oset-default (class slot value)
+  "Does the work for the macro `oset-default'.
+Fills in the default value in CLASS' in SLOT with VALUE."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (if (not (symbolp slot)) (signal 'wrong-type-argument (list 'symbolp slot)))
+  (let* ((scoped-class class)
+	 (c (eieio-slot-name-index class nil slot)))
+    (if (not c)
+	;; It might be missing because it is a :class allocated slot.
+	;; Lets check that info out.
+	(if (setq c (eieio-class-slot-name-index class slot))
+	    (progn
+	      ;; Oref that slot.
+	      (eieio-validate-class-slot-value class c value slot)
+	      (aset (aref (class-v class) class-class-allocation-values) c
+		    value))
+	  (signal 'invalid-slot-name (list (class-name class) slot)))
+      (eieio-validate-slot-value class c value slot)
+      ;; Set this into the storage for defaults.
+      (setcar (nthcdr (- c 3) (aref (class-v class) class-public-d))
+	      value)
+      ;; Take the value, and put it into our cache object.
+      (eieio-oset (aref (class-v class) class-default-object-cache)
+		  slot value)
+      )))
+
+;;; Handy CLOS macros
+;;
+(defmacro with-slots (spec-list object &rest body)
+  "Bind SPEC-LIST lexically to slot values in OBJECT, and execute BODY.
+This establishes a lexical environment for referring to the slots in
+the instance named by the given slot-names as though they were
+variables.  Within such a context the value of the slot can be
+specified by using its slot name, as if it were a lexically bound
+variable.  Both setf and setq can be used to set the value of the
+slot.
+
+SPEC-LIST is of a form similar to `let'.  For example:
+
+  ((VAR1 SLOT1)
+    SLOT2
+    SLOTN
+   (VARN+1 SLOTN+1))
+
+Where each VAR is the local variable given to the associated
+SLOT.  A Slot specified without a variable name is given a
+variable name of the same name as the slot."
+  ;; Transform the spec-list into a symbol-macrolet spec-list.
+  (let ((mappings (mapcar (lambda (entry)
+			    (let ((var  (if (listp entry) (car entry) entry))
+				  (slot (if (listp entry) (cadr entry) entry)))
+			      (list var `(slot-value ,object ',slot))))
+			  spec-list)))
+    (append (list 'symbol-macrolet mappings)
+	    body)))
+(put 'with-slots 'lisp-indent-function 2)
+
+
+;;; Simple generators, and query functions.  None of these would do
+;;  well embedded into an object.
+;;
+(defmacro object-class-fast (obj) "Return the class struct defining OBJ with no check."
+  `(aref ,obj object-class))
+  
+(defun class-name (class) "Return a Lisp like symbol name for CLASS."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  ;; I think this is supposed to return a symbol, but to me CLASS is a symbol,
+  ;; and I wanted a string.  Arg!
+  (format "#<class %s>" (symbol-name class)))
+
+;;;###autoload
+(defun object-name (obj &optional extra)
+  "Return a Lisp like symbol string for object OBJ.
+If EXTRA, include that in the string returned to represent the symbol."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (format "#<%s %s%s>" (symbol-name (object-class-fast obj))
+	  (aref obj object-name) (or extra "")))
+
+(defun object-name-string (obj) "Return a string which is OBJ's name."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (aref obj object-name))
+
+(defun object-set-name-string (obj name) "Set the string which is OBJ's NAME."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (if (not (stringp name)) (signal 'wrong-type-argument (list 'stringp name)))
+  (aset obj object-name name))
+
+(defun object-class (obj) "Return the class struct defining OBJ."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (object-class-fast obj))
+(defalias 'class-of 'object-class)
+
+(defun object-class-name (obj) "Return a Lisp like symbol name for OBJ's class."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (class-name (object-class-fast obj)))
+
+(defmacro class-parents-fast (class) "Return parent classes to CLASS with no check."
+  `(aref (class-v ,class) class-parent))
+
+(defun class-parents (class)
+  "Return parent classes to CLASS.  (overload of variable).
+
+The CLOS function `class-direct-superclasses' is aliased to this function."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (class-parents-fast class))
+
+(defmacro class-children-fast (class) "Return child classes to CLASS with no check."
+  `(aref (class-v ,class) class-children))
+
+(defun class-children (class)
+"Return child classses to CLASS.
+
+The CLOS function `class-direct-subclasses' is aliased to this function."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (class-children-fast class))
+
+;; Official CLOS functions.
+(defalias 'class-direct-superclasses 'class-parents)
+(defalias 'class-direct-subclasses 'class-children)
+
+(defmacro class-parent-fast (class) "Return first parent class to CLASS with no check."
+  `(car (class-parents-fast ,class)))
+
+(defmacro class-parent (class) "Return first parent class to CLASS.  (overload of variable)."
+  `(car (class-parents ,class)))
+
+(defmacro same-class-fast-p (obj class) "Return t if OBJ is of class-type CLASS with no error checking."
+  `(eq (aref ,obj object-class) ,class))
+
+(defun same-class-p (obj class) "Return t if OBJ is of class-type CLASS."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (same-class-fast-p obj class))
+
+(defun object-of-class-p (obj class)
+  "Return non-nil if OBJ is an instance of CLASS or CLASS' subclasses."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  ;; class will be checked one layer down
+  (child-of-class-p (aref obj object-class) class))
+;; Backwards compatibility
+(defalias 'obj-of-class-p 'object-of-class-p)
+
+(defun child-of-class-p (child class)
+  "If CHILD class is a subclass of CLASS."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (if (not (class-p child)) (signal 'wrong-type-argument (list 'class-p child)))
+  (let ((p nil))
+    (while (and child (not (eq child class)))
+      (setq p (append p (aref (class-v child) class-parent))
+	    child (car p)
+	    p (cdr p)))
+    (if child t)))
+
+(defun object-slots (obj) "List of slots available in OBJ."
+  (if (not (eieio-object-p obj)) (signal 'wrong-type-argument (list 'eieio-object-p obj)))
+  (aref (class-v (object-class-fast obj)) class-public-a))
+
+(defun class-slot-initarg (class slot) "Fetch from CLASS, SLOT's :initarg."
+  (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
+  (let ((ia (aref (class-v class) class-initarg-tuples))
+	(f nil))
+    (while (and ia (not f))
+      (if (eq (cdr (car ia)) slot)
+	  (setq f (car (car ia))))
+      (setq ia (cdr ia)))
+    f))
+
+;;; CLOS queries into classes and slots
+;;
+(defun slot-boundp (object slot)
+  "Non-nil if OBJECT's SLOT is bound.
+Setting a slot's value makes it bound.  Calling `slot-makeunbound' will
+make a slot unbound.
+OBJECT can be an instance or a class."
+  ;; Skip typechecking while retrieving this value.
+  (let ((eieio-skip-typecheck t))
+    ;; Return nil if the magic symbol is in there.
+    (if (eieio-object-p object)
+	(if (eq (eieio-oref object slot) eieio-unbound) nil t)
+      (if (class-p object)
+	  (if (eq (eieio-oref-default object slot) eieio-unbound) nil t)
+	(signal 'wrong-type-argument (list 'eieio-object-p object))))))
+
+(defun slot-makeunbound (object slot)
+  "In OBJECT, make SLOT unbound."
+  (eieio-oset object slot eieio-unbound))
+
+(defun slot-exists-p (object-or-class slot)
+  "Non-nil if OBJECT-OR-CLASS has SLOT."
+  (let ((cv (class-v (cond ((eieio-object-p object-or-class)
+			    (object-class object-or-class))
+			   ((class-p object-or-class)
+			    object-or-class))
+		     )))
+    (or (memq slot (aref cv class-public-a))
+	(memq slot (aref cv class-class-allocation-a)))
+    ))
+
+(defun find-class (symbol &optional errorp)
+  "Return the class that SYMBOL represents.
+If there is no class, nil is returned if ERRORP is nil.
+If ERRORP is non-nil, `wrong-argument-type' is signaled."
+  (if (not (class-p symbol))
+      (if errorp (signal 'wrong-type-argument (list 'class-p symbol))
+	nil)
+    (class-v symbol)))
+
+;;; Slightly more complex utility functions for objects
+;;
+(defun object-assoc (key slot list)
+  "Return an object if KEY is `equal' to SLOT's value of an object in LIST.
+LIST is a list of objects who's slots are searched.
+Objects in LIST do not need to have a slot named SLOT, nor does
+SLOT need to be bound.  If these errors occur, those objects will
+be ignored."
+  (if (not (listp list)) (signal 'wrong-type-argument (list 'listp list)))
+  (while (and list (not (condition-case nil
+			    ;; This prevents errors for missing slots.
+			    (equal key (eieio-oref (car list) slot))
+			  (error nil))))
+    (setq list (cdr list)))
+  (car list))
+
+(defun object-assoc-list (slot list)
+  "Return an association list with the contents of SLOT as the key element.
+LIST must be a list of objects with SLOT in it.
+This is useful when you need to do completing read on an object group."
+  (if (not (listp list)) (signal 'wrong-type-argument (list 'listp list)))
+  (let ((assoclist nil))
+    (while list
+      (setq assoclist (cons (cons (eieio-oref (car list) slot)
+				  (car list))
+			    assoclist))
+      (setq list (cdr list)))
+    (nreverse assoclist)))
+
+(defun object-assoc-list-safe (slot list)
+  "Return an association list with the contents of SLOT as the key element.
+LIST must be a list of objects, but those objects do not need to have
+SLOT in it.  If it does not, then that element is left out of the association
+list."
+  (if (not (listp list)) (signal 'wrong-type-argument (list 'listp list)))
+  (let ((assoclist nil))
+    (while list
+      (if (slot-exists-p (car list) slot)
+	  (setq assoclist (cons (cons (eieio-oref (car list) slot)
+				      (car list))
+				assoclist)))
+      (setq list (cdr list)))
+    (nreverse assoclist)))
+
+(defun object-add-to-list (object slot item &optional append)
+  "In OBJECT's SLOT, add ITEM to the list of elements.
+Optional argument APPEND indicates we need to append to the list.
+If ITEM already exists in the list in SLOT, then it is not added.
+Comparison is done with `equal' through the `member' function call.
+If SLOT is unbound, bind it to the list containing ITEM."
+  (let (ov)
+    ;; Find the originating list.
+    (if (not (slot-boundp object slot))
+	(setq ov (list item))
+      (setq ov (eieio-oref object slot))
+      ;; turn it into a list.
+      (unless (listp ov)
+	(setq ov (list ov)))
+      ;; Do the combination
+      (if (not (member item ov))
+	  (setq ov
+		(if append
+		    (append ov (list item))
+		  (cons item ov)))))
+    ;; Set back into the slot.
+    (eieio-oset object slot ov)))
+
+(defun object-remove-from-list (object slot item)
+  "In OBJECT's SLOT, remove occurrences of ITEM.
+Deletion is done with `delete', which deletes by side effect
+and comparisons are done with `equal'.
+If SLOT is unbound, do nothing."
+  (if (not (slot-boundp object slot))
+      nil
+    (eieio-oset object slot (delete item (eieio-oref object slot)))))
+
+;;; EIEIO internal search functions
+;;
+(defun eieio-slot-originating-class-p (start-class slot)
+  "Return Non-nil if START-CLASS is the first class to define SLOT.
+This is for testing if `scoped-class' is the class that defines SLOT
+so that we can protect private slots."
+  (let ((par (class-parents start-class))
+	(ret t))
+    (if (not par)
+	t
+      (while (and par ret)
+	(if (intern-soft (symbol-name slot)
+			 (aref (class-v (car par))
+			       class-symbol-obarray))
+	    (setq ret nil))
+	(setq par (cdr par)))
+      ret)))
+
+(defun eieio-slot-name-index (class obj slot)
+  "In CLASS for OBJ find the index of the named SLOT.
+The slot is a symbol which is installed in CLASS by the `defclass'
+call.  OBJ can be nil, but if it is an object, and the slot in question
+is protected, access will be allowed if obj is a child of the currently
+`scoped-class'.
+If SLOT is the value created with :initarg instead,
+reverse-lookup that name, and recurse with the associated slot value."
+  ;; Removed checks to outside this call
+  (let* ((fsym (intern-soft (symbol-name slot)
+			    (aref (class-v class)
+				  class-symbol-obarray)))
+	 (fsi (if (symbolp fsym) (symbol-value fsym) nil)))
+    (if (integerp fsi)
+	(cond
+	 ((not (get fsym 'protection))
+	  (+ 3 fsi))
+	 ((and (eq (get fsym 'protection) 'protected)
+	       scoped-class
+	       (or (child-of-class-p class scoped-class)
+		   (and (eieio-object-p obj)
+			(child-of-class-p class (object-class obj)))))
+	  (+ 3 fsi))
+	 ((and (eq (get fsym 'protection) 'private)
+	       (or (and scoped-class
+			(eieio-slot-originating-class-p scoped-class slot))
+		   eieio-initializing-object))
+	  (+ 3 fsi))
+	 (t nil))
+      (let ((fn (eieio-initarg-to-attribute class slot)))
+	(if fn (eieio-slot-name-index class obj fn) nil)))))
+
+(defun eieio-class-slot-name-index (class slot)
+  "In CLASS find the index of the named SLOT.
+The slot is a symbol which is installed in CLASS by the `defclass'
+call.  If SLOT is the value created with :initarg instead,
+reverse-lookup that name, and recurse with the associated slot value."
+  ;; This will happen less often, and with fewer slots.  Do this the
+  ;; storage cheap way.
+  (let* ((a (aref (class-v class) class-class-allocation-a))
+	 (l1 (length a))
+	 (af (memq slot a))
+	 (l2 (length af)))
+    ;; Slot # is length of the total list, minus the remaining list of
+    ;; the found slot.
+    (if af (- l1 l2))))
+
+;;; CLOS generics internal function handling
+;;
+(defvar eieio-generic-call-methodname nil
+  "When using `call-next-method', provides a context on how to do it.")
+(defvar eieio-generic-call-arglst nil
+  "When using `call-next-method', provides a context for parameters.")
+(defvar eieio-generic-call-key nil
+  "When using `call-next-method', provides a context for the current key.
+Keys are a number representing :before, :primary, and :after methods.")
+(defvar eieio-generic-call-next-method-list nil
+  "When executing a PRIMARY or STATIC method, track the 'next-method'.
+During executions, the list is first generated, then as each next method
+is called, the next method is popped off the stack.")
+
+(defvar eieio-pre-method-execution-hooks nil
+  "*Hooks run just before a method is executed.
+The hook function must accept on argument, this list of forms
+about to be executed.")
+
+(defun eieio-generic-call (method args)
+  "Call METHOD with ARGS.
+ARGS provides the context on which implementation to use.
+This should only be called from a generic function."
+  ;; We must expand our arguments first as they are always
+  ;; passed in as quoted symbols
+  (let ((newargs nil) (mclass nil)  (lambdas nil) (tlambdas nil) (keys nil)
+	(eieio-generic-call-methodname method)
+	(eieio-generic-call-arglst args)
+	(firstarg nil)
+	(primarymethodlist nil))
+    ;; get a copy
+    (setq newargs args
+	  firstarg (car newargs))
+    ;; Is the class passed in autoloaded?
+    ;; Since class names are also constructors, they can be autoloaded
+    ;; via the autoload command.  Check for this, and load them in.
+    ;; It is ok if it doesn't turn out to be a class.  Probably want that
+    ;; function loaded anyway.
+    (if (and (symbolp firstarg)
+	     (fboundp firstarg)
+	     (listp (symbol-function firstarg))
+	     (eq 'autoload (car (symbol-function firstarg))))
+	(load (nth 1 (symbol-function firstarg))))
+    ;; Determine the class to use.
+    (cond ((eieio-object-p firstarg)
+	   (setq mclass (object-class-fast firstarg)))
+	  ((class-p firstarg)
+	   (setq mclass firstarg))
+	  )
+    ;; Make sure the class is a valid class
+    ;; mclass can be nil (meaning a generic for should be used.
+    ;; mclass cannot have a value that is not a class, however.
+    (when (and (not (null mclass)) (not (class-p mclass)))
+      (error "Cannot dispatch method %S on class %S"
+	     method mclass)
+      )
+    ;; Now create a list in reverse order of all the calls we have
+    ;; make in order to successfully do this right.  Rules:
+    ;; 1) Only call generics if scoped-class is not defined
+    ;;    This prevents multiple calls in the case of recursion
+    ;; 2) Only call static if this is a static method.
+    ;; 3) Only call specifics if the definition allows for them.
+    ;; 4) Call in order based on :before, :primary, and :after
+    (when (eieio-object-p firstarg)
+      ;; Non-static calls do all this stuff.
+
+      ;; :after methods
+      (setq tlambdas
+	    (if mclass
+		(eieiomt-method-list method method-after mclass)
+	      (list (eieio-generic-form method method-after nil)))
+	    ;;(or (and mclass (eieio-generic-form method method-after mclass))
+	    ;;	(eieio-generic-form method method-after nil))
+	    )
+      (setq lambdas (append tlambdas lambdas)
+	    keys (append (make-list (length tlambdas) method-after) keys))
+      
+      ;; :primary methods
+      (setq tlambdas
+	    (or (and mclass (eieio-generic-form method method-primary mclass))
+		(eieio-generic-form method method-primary nil)))
+      (when tlambdas
+	(setq lambdas (cons tlambdas lambdas)
+	      keys (cons method-primary keys)
+	      primarymethodlist
+	      (eieiomt-method-list method method-primary mclass)))
+
+      ;; :before methods
+      (setq tlambdas
+	    (if mclass
+		(eieiomt-method-list method method-before mclass)
+	      (list (eieio-generic-form method method-before nil)))
+	    ;;(or (and mclass (eieio-generic-form method method-before mclass))
+	    ;;	(eieio-generic-form method method-before nil))
+	    )
+      (setq lambdas (append tlambdas lambdas)
+	    keys (append (make-list (length tlambdas) method-before) keys))
+      )
+
+    ;; If there were no methods found, then there could be :static methods.
+    (when (not lambdas)
+      (setq tlambdas
+	    (eieio-generic-form method method-static mclass))
+      (setq lambdas (cons tlambdas lambdas)
+	    keys (cons method-static keys)
+	    primarymethodlist  ;; Re-use even with bad name here
+	    (eieiomt-method-list method method-static mclass)))
+
+    (run-hook-with-args 'eieio-pre-method-execution-hooks
+			primarymethodlist)
+
+    ;; Now loop through all occurances forms which we must execute
+    ;; (which are happily sorted now) and execute them all!
+    (let ((rval nil) (lastval nil) (rvalever nil) (found nil))
+      (while lambdas
+	(if (car lambdas)
+	    (let* ((scoped-class (cdr (car lambdas)))
+		   (eieio-generic-call-key (car keys))
+		   (has-return-val
+		    (or (= eieio-generic-call-key method-primary)
+			(= eieio-generic-call-key method-static)))
+		   (eieio-generic-call-next-method-list
+		    ;; Use the cdr, as the first element is the fcn
+		    ;; we are calling right now.
+		    (when has-return-val (cdr primarymethodlist)))
+		   )
+	      (setq found t)
+	      ;;(setq rval (apply (car (car lambdas)) newargs))
+	      (setq lastval (apply (car (car lambdas)) newargs))
+	      (when has-return-val
+	      	(setq rval lastval
+	      	      rvalever t))
+	      ))
+	(setq lambdas (cdr lambdas)
+	      keys (cdr keys)))
+      (if (not found)
+	  (if (eieio-object-p (car args))
+	      (setq rval (apply 'no-applicable-method (car args) method args)
+		    rvalever t)
+	    (signal
+	     'no-method-definition
+	     (list method args))))
+      ;; Right Here... it could be that lastval is returned when
+      ;; rvalever is nil.  Is that right?
+      rval)))
+
+(defun eieio-generic-call-primary-only (method args)
+  "Call METHOD with ARGS for methods with only :PRIMARY implementations.
+ARGS provides the context on which implementation to use.
+This should only be called from a generic function.
+
+This method is like `eieio-generic-call', but only
+implementations in the :PRIMARY slot are queried.  After many
+years of use, it appears that over 90% of methods in use
+have :PRIMARY implementations only.  We can therefore optimize
+for this common case to improve performance."
+  ;; We must expand our arguments first as they are always
+  ;; passed in as quoted symbols
+  (let ((newargs nil) (mclass nil)  (lambdas nil)
+	(eieio-generic-call-methodname method)
+	(eieio-generic-call-arglst args)
+	(firstarg nil)
+	(primarymethodlist nil)
+	)
+    ;; get a copy
+    (setq newargs args
+	  firstarg (car newargs))
+
+    ;; Determine the class to use.
+    (cond ((eieio-object-p firstarg)
+	   (setq mclass (object-class-fast firstarg)))
+	  ((not firstarg)
+	   (error "Method %s called on nil" method))
+	  ((not (eieio-object-p firstarg))
+	   (error "Primary-only method %s called on something not an object" method))
+	  (t
+	   (error "EIEIO Error: Improperly classified method %s as primary only"
+		  method)
+	  ))
+    ;; Make sure the class is a valid class
+    ;; mclass can be nil (meaning a generic for should be used.
+    ;; mclass cannot have a value that is not a class, however.
+    (when (null mclass)
+      (error "Cannot dispatch method %S on class %S" method mclass)
+      )
+
+    ;; :primary methods
+    (setq lambdas (eieio-generic-form method method-primary mclass))
+    (setq primarymethodlist  ;; Re-use even with bad name here
+	  (eieiomt-method-list method method-primary mclass))
+
+    ;; Now loop through all occurances forms which we must execute
+    ;; (which are happily sorted now) and execute them all!
+    (let* ((rval nil) (lastval nil) (rvalever nil)
+	   (scoped-class (cdr lambdas))
+	   (eieio-generic-call-key method-primary)
+	   ;; Use the cdr, as the first element is the fcn
+	   ;; we are calling right now.
+	   (eieio-generic-call-next-method-list (cdr primarymethodlist))
+	   )
+
+      (if (or (not lambdas) (not (car lambdas)))
+
+	  ;; No methods found for this impl...
+	  (if (eieio-object-p (car args))
+	      (setq rval (apply 'no-applicable-method (car args) method args)
+		    rvalever t)
+	    (signal
+	     'no-method-definition
+	     (list method args)))
+
+	;; Do the regular implementation here.
+
+	(run-hook-with-args 'eieio-pre-method-execution-hooks
+			    lambdas)
+	
+	(setq lastval (apply (car lambdas) newargs))
+	(setq rval lastval
+	      rvalever t)
+	)
+
+      ;; Right Here... it could be that lastval is returned when
+      ;; rvalever is nil.  Is that right?
+      rval)))
+
+(defun eieiomt-method-list (method key class)
+  "Return an alist list of methods lambdas.
+METHOD is the method name.
+KEY represents either :before, or :after methods.
+CLASS is the starting class to search from in the method tree.
+If CLASS is nil, then an empty list of methods should be returned."
+  ;; Note: eieiomt - the MT means MethodTree.  See more comments below
+  ;; for the rest of the eieiomt methods.
+  (let ((lambdas nil)
+	(mclass (list class)))
+    (while mclass
+      ;; Note: a nil can show up in the class list once we start
+      ;;       searching through the method tree.
+      (when (car mclass)
+	;; lookup the form to use for the PRIMARY object for the next level
+	(let ((tmpl (eieio-generic-form method key (car mclass))))
+	  (when (or (not lambdas)
+		    ;; This prevents duplicates coming out of the
+		    ;; class method optimizer.  Perhaps we should
+		    ;; just not optimize before/afters?
+		    (not (member tmpl lambdas)))
+	    (setq lambdas (cons tmpl lambdas))
+	    (if (null (car lambdas))
+		(setq lambdas (cdr lambdas))))))
+      ;; Add new classes to mclass.  Since our input might not be a class
+      ;; protect against that.
+      (if (car mclass)
+	  ;; If there is a class, append any methods it may provide
+	  ;; to the remainder of the class list.
+	  (let ((io (class-method-invocation-order (car mclass))))
+	    (if (eq io :depth-first)
+		;; Depth first.
+		(setq mclass (append (eieiomt-next (car mclass)) (cdr mclass)))
+	      ;; Breadth first.
+	      (setq mclass (append (cdr mclass) (eieiomt-next (car mclass)))))
+	    )
+	;; Advance to next entry in mclass if it is nil.
+	(setq mclass (cdr mclass)))
+      )
+    (if (eq key method-after)
+	lambdas
+      (nreverse lambdas))))
+
+(defun next-method-p ()
+  "Non-nil if there is a next method.
+Returns a list of lambda expressions which is the `next-method'
+order."
+  eieio-generic-call-next-method-list)
+
+(defun call-next-method (&rest replacement-args)
+  "Call the superclass method from a subclass method.
+The superclass method is specified in the current method list,
+and is called the next method.
+
+If REPLACEMENT-ARGS is non-nil, then use them instead of
+`eieio-generic-call-arglst'.  The generic arg list are the
+arguments passed in at the top level.
+
+Use `next-method-p' to find out if there is a next method to call."
+  (if (not scoped-class)
+      (error "Call-next-method not called within a class specific method"))
+  (if (and (/= eieio-generic-call-key method-primary)
+	   (/= eieio-generic-call-key method-static))
+      (error "Cannot `call-next-method' except in :primary or :static methods")
+    )
+  (let ((newargs (or replacement-args eieio-generic-call-arglst))
+	(next (car eieio-generic-call-next-method-list))
+	)
+    (if (or (not next) (not (car next)))
+	(apply 'no-next-method (car newargs) (cdr newargs))
+      (let* ((eieio-generic-call-next-method-list
+	      (cdr eieio-generic-call-next-method-list))
+	     (eieio-generic-call-arglst newargs)
+	     (scoped-class (cdr next))
+	     (fcn (car next))
+	     )
+	(apply fcn newargs)
+	))))
+
+;;;
+;; eieio-method-tree : eieiomt-
+;;
+;; Stored as eieio-method-tree in property list of a generic method
+;;
+;; (eieio-method-tree . [BEFORE PRIMARY AFTER
+;;                       genericBEFORE genericPRIMARY genericAFTER])
+;; and
+;; (eieio-method-obarray . [BEFORE PRIMARY AFTER
+;;                          genericBEFORE genericPRIMARY genericAFTER])
+;;    where the association is a vector.
+;;    (aref 0  -- all static methods.
+;;    (aref 1  -- all methods classified as :before
+;;    (aref 2  -- all methods classified as :primary
+;;    (aref 3  -- all methods classified as :after
+;;    (aref 4  -- a generic classified as :before
+;;    (aref 5  -- a generic classified as :primary
+;;    (aref 6  -- a generic classified as :after
+;;
+(defvar eieiomt-optimizing-obarray nil
+  "While mapping atoms, this contain the obarray being optimized.")
+
+(defun eieiomt-install (method-name)
+  "Install the method tree, and obarray onto METHOD-NAME.
+Do not do the work if they already exist."
+  (let ((emtv (get method-name 'eieio-method-tree))
+	(emto (get method-name 'eieio-method-obarray)))
+    (if (or (not emtv) (not emto))
+	(progn
+	  (setq emtv (put method-name 'eieio-method-tree
+			  (make-vector method-num-slots nil))
+		emto (put method-name 'eieio-method-obarray
+			  (make-vector method-num-slots nil)))
+	  (aset emto 0 (make-vector 11 0))
+	  (aset emto 1 (make-vector 11 0))
+	  (aset emto 2 (make-vector 41 0))
+	  (aset emto 3 (make-vector 11 0))
+	  ))))
+
+(defun eieiomt-add (method-name method key class)
+  "Add to METHOD-NAME the forms METHOD in a call position KEY for CLASS.
+METHOD-NAME is the name created by a call to `defgeneric'.
+METHOD are the forms for a given implementation.
+KEY is an integer (see comment in eieio.el near this function) which
+is associated with the :static :before :primary and :after tags.
+It also indicates if CLASS is defined or not.
+CLASS is the class this method is associated with."
+  (if (or (> key method-num-slots) (< key 0))
+      (error "Eieiomt-add: method key error!"))
+  (let ((emtv (get method-name 'eieio-method-tree))
+	(emto (get method-name 'eieio-method-obarray)))
+    ;; Make sure the method tables are available.
+    (if (or (not emtv) (not emto))
+	(error "Programmer error: eieiomt-add"))
+    ;; only add new cells on if it doesn't already exist!
+    (if (assq class (aref emtv key))
+	(setcdr (assq class (aref emtv key)) method)
+      (aset emtv key (cons (cons class method) (aref emtv key))))
+    ;; Add function definition into newly created symbol, and store
+    ;; said symbol in the correct obarray, otherwise use the
+    ;; other array to keep this stuff
+    (if (< key method-num-lists)
+	(let ((nsym (intern (symbol-name class) (aref emto key))))
+	  (fset nsym method)))
+    ;; Now optimize the entire obarray
+    (if (< key method-num-lists)
+	(let ((eieiomt-optimizing-obarray (aref emto key)))
+	  ;; @todo - Is this overkill?  Should we just clear the symbol?
+	  (mapatoms 'eieiomt-sym-optimize eieiomt-optimizing-obarray)))
+    ))
+
+(defun eieiomt-next (class)
+  "Return the next parent class for CLASS.
+If CLASS is a superclass, return variable `eieio-default-superclass'.  If CLASS
+is variable `eieio-default-superclass' then return nil.  This is different from
+function `class-parent' as class parent returns nil for superclasses.  This
+function performs no type checking!"
+  ;; No type-checking because all calls are made from functions which
+  ;; are safe and do checking for us.
+  (or (class-parents-fast class)
+      (if (eq class 'eieio-default-superclass)
+	  nil
+	'(eieio-default-superclass))))
+
+(defun eieiomt-sym-optimize (s)
+  "Find the next class above S which has a function body for the optimizer."
+  ;; (message "Optimizing %S" s)
+  (let* ((es (intern-soft (symbol-name s))) ;external symbol of class
+	 (io (class-method-invocation-order es))
+	 (ov nil)
+	 (cont t))
+    ;; This converts ES from a single symbol to a list of parent classes.
+    (setq es (eieiomt-next es))
+    ;; Loop over ES, then its children individually.
+    ;; We can have multiple hits only at one level of the parent tree.
+    (while (and es cont)
+      (setq ov (intern-soft (symbol-name (car es)) eieiomt-optimizing-obarray))
+      (if (fboundp ov)
+	  (progn
+	    (set s ov)			;store ov as our next symbol
+	    (setq cont nil))
+	(if (eq io :depth-first)
+	    ;; Pre-pend the subclasses of (car es) so we get
+	    ;; DEPTH FIRST optimization.
+	    (setq es (append (eieiomt-next (car es)) (cdr es)))
+	  ;; Else, we are breadth first.
+	  ;; (message "Class %s is breadth first" es)
+	  (setq es (append (cdr es) (eieiomt-next (car es))))
+	  )))
+    ;; If there is no nearest call, then set our value to nil
+    (if (not es) (set s nil))
+    ))
+
+(defun eieio-generic-form (method key class)
+ "Return the lambda form belonging to METHOD using KEY based upon CLASS.
+If CLASS is not a class then use `generic' instead.  If class has no
+form, but has a parent class, then trace to that parent class.  The
+first time a form is requested from a symbol, an optimized path is
+memoized for future faster use."
+ (let ((emto (aref (get method 'eieio-method-obarray)
+		   (if class key (+ key 3)))))
+   (if (class-p class)
+       ;; 1) find our symbol
+       (let ((cs (intern-soft (symbol-name class) emto)))
+	 (if (not cs)
+	     ;; 2) If there isn't one, then make one.
+	     ;;    This can be slow since it only occurs once
+	     (progn
+	       (setq cs (intern (symbol-name class) emto))
+	       ;; 2.1) Cache its nearest neighbor with a quick optimize
+	       ;;      which should only occur once for this call ever
+	       (let ((eieiomt-optimizing-obarray emto))
+		 (eieiomt-sym-optimize cs))))
+	 ;; 3) If it is bound return this one.
+	 (if (fboundp  cs)
+	     (cons cs (aref (class-v class) class-symbol))
+	   ;; 4) If it is not bound then this variable knows something
+	   (if (symbol-value cs)
+	       (progn
+		 ;; 4.1) This symbol holds the next class in its value
+		 (setq class (symbol-value cs)
+		       cs (intern-soft (symbol-name class) emto))
+		 ;; 4.2) The optimizer should always have chosen a
+		 ;;      function-symbol
+		 ;;(if (fboundp cs)
+		 (cons cs (aref (class-v (intern (symbol-name class)))
+				class-symbol))
+		   ;;(error "EIEIO optimizer: erratic data loss!"))
+		 )
+	       ;; There never will be a funcall...
+	       nil)))
+     ;; for a generic call, what is a list, is the function body we want.
+     (let ((emtl (aref (get method 'eieio-method-tree)
+		       (if class key (+ key 3)))))
+       (if emtl
+	   ;; The car of EMTL is supposed to be a class, which in this
+	   ;; case is nil, so skip it.
+	   (cons (cdr (car emtl)) nil)
+	 nil)))))
+
+;;;
+;; Way to assign slots based on a list.  Used for constructors, or
+;; even resetting an object at run-time
+;;
+(defun eieio-set-defaults (obj &optional set-all)
+  "Take object OBJ, and reset all slots to their defaults.
+If SET-ALL is non-nil, then when a default is nil, that value is
+reset.  If SET-ALL is nil, the slots are only reset if the default is
+not nil."
+  (let ((scoped-class (aref obj object-class))
+	(eieio-initializing-object t)
+	(pub (aref (class-v (aref obj object-class)) class-public-a)))
+    (while pub
+      (let ((df (eieio-oref-default obj (car pub))))
+	(if (or df set-all)
+	    (eieio-oset obj (car pub) df)))
+      (setq pub (cdr pub)))))
+
+(defun eieio-initarg-to-attribute (class initarg)
+  "For CLASS, convert INITARG to the actual attribute name.
+If there is no translation, pass it in directly (so we can cheat if
+need be.. May remove that later...)"
+  (let ((tuple (assoc initarg (aref (class-v class) class-initarg-tuples))))
+    (if tuple
+	(cdr tuple)
+      nil)))
+
+(defun eieio-attribute-to-initarg (class attribute)
+  "In CLASS, convert the ATTRIBUTE into the corresponding init argument tag.
+This is usually a symbol that starts with `:'."
+  (let ((tuple (rassoc attribute (aref (class-v class) class-initarg-tuples))))
+    (if tuple
+	(car tuple)
+      nil)))
+
+
+;;; Here are some special types of errors
+;;
+(intern "no-method-definition")
+(put 'no-method-definition 'error-conditions '(no-method-definition error))
+(put 'no-method-definition 'error-message "No method definition")
+
+(intern "no-next-method")
+(put 'no-next-method 'error-conditions '(no-next-method error))
+(put 'no-next-method 'error-message "No next method")
+
+(intern "invalid-slot-name")
+(put 'invalid-slot-name 'error-conditions '(invalid-slot-name error))
+(put 'invalid-slot-name 'error-message "Invalid slot name")
+
+(intern "invalid-slot-type")
+(put 'invalid-slot-type 'error-conditions '(invalid-slot-type error nil))
+(put 'invalid-slot-type 'error-message "Invalid slot type")
+
+(intern "unbound-slot")
+(put 'unbound-slot 'error-conditions '(unbound-slot error nil))
+(put 'unbound-slot 'error-message "Unbound slot")
+
+;;; Here are some CLOS items that need the CL package
+;;
+
+(defsetf slot-value (obj slot) (store) (list 'eieio-oset obj slot store))
+(defsetf eieio-oref (obj slot) (store) (list 'eieio-oset obj slot store))
+
+;; The below setf method was written by Arnd Kohrs <kohrs@acm.org>
+(define-setf-method oref (obj slot)
+  (let ((obj-temp (gensym))
+	(slot-temp (gensym))
+	(store-temp (gensym)))
+    (list (list obj-temp slot-temp)
+	  (list obj `(quote ,slot))
+	  (list store-temp)
+	  (list 'set-slot-value obj-temp slot-temp
+		store-temp)
+	  (list 'slot-value obj-temp slot-temp))))
+
+
+;;;
+;; We want all objects created by EIEIO to have some default set of
+;; behaviours so we can create object utilities, and allow various
+;; types of error checking.  To do this, create the default EIEIO
+;; class, and when no parent class is specified, use this as the
+;; default.  (But don't store it in the other classes as the default,
+;; allowing for transparent support.)
+;;
+
+(defclass eieio-default-superclass nil
+  nil
+  "Default parent class for classes with no specified parent class.
+Its slots are automatically adopted by classes with no specified
+parents.  This class is not stored in the `parent' slot of a class vector."
+  :abstract t)
+
+(defalias 'standard-class 'eieio-default-superclass)
+
+(defgeneric constructor (class newname &rest slots)
+  "Default constructor for CLASS `eieio-defualt-superclass'.")
+
+(defmethod constructor :static
+  ((class eieio-default-superclass) newname &rest slots)
+  "Default constructor for CLASS `eieio-defualt-superclass'.
+NEWNAME is the name to be given to the constructed object.
+SLOTS are the initialization slots used by `shared-initialize'.
+This static method is called when an object is constructed.
+It allocates the vector used to represent an EIEIO object, and then
+calls `shared-initialize' on that object."
+  (let* ((new-object (copy-sequence (aref (class-v class)
+					  class-default-object-cache))))
+    ;; Update the name for the newly created object.
+    (aset new-object object-name newname)
+    ;; Call the initialize method on the new object with the slots
+    ;; that were passed down to us.
+    (initialize-instance new-object slots)
+    ;; Return the created object.
+    new-object))
+
+(defgeneric shared-initialize (obj slots)
+  "Set slots of OBJ with SLOTS which is a list of name/value pairs.
+Called from the constructor routine.")
+
+(defmethod shared-initialize ((obj eieio-default-superclass) slots)
+  "Set slots of OBJ with SLOTS which is a list of name/value pairs.
+Called from the constructor routine."
+  (let ((scoped-class (aref obj object-class)))
+    (while slots
+      (let ((rn (eieio-initarg-to-attribute (object-class-fast obj)
+					    (car slots))))
+	(if (not rn)
+	    (slot-missing obj (car slots) 'oset (car (cdr slots)))
+	  (eieio-oset obj rn (car (cdr slots)))))
+      (setq slots (cdr (cdr slots))))))
+
+(defgeneric initialize-instance (this &optional slots)
+    "Constructs the new object THIS based on SLOTS.")
+
+(defmethod initialize-instance ((this eieio-default-superclass)
+				&optional slots)
+    "Constructs the new object THIS based on SLOTS.
+SLOTS is a tagged list where odd numbered elements are tags, and
+even numbered elements are the values to store in the tagged slot.  If
+you overload the `initialize-instance', there you will need to call
+`shared-initialize' yourself, or you can call `call-next-method' to
+have this constructor called automatically.  If these steps are not
+taken, then new objects of your class will not have their values
+dynamically set from SLOTS."
+    ;; First, see if any of our defaults are `lambda', and
+    ;; re-evaluate them and apply the value to our slots.
+    (let* ((scoped-class (class-v (aref this object-class)))
+	   (slot (aref scoped-class class-public-a))
+	   (defaults (aref scoped-class class-public-d)))
+      (while slot
+	(setq slot (cdr slot)
+	      defaults (cdr defaults))))
+    ;; Shared initialize will parse our slots for us.
+    (shared-initialize this slots))
+
+(defgeneric slot-missing (object slot-name operation &optional new-value)
+  "Method invoked when an attempt to access a slot in OBJECT fails.")
+
+(defmethod slot-missing ((object eieio-default-superclass) slot-name
+			 operation &optional new-value)
+  "Method invoked when an attempt to access a slot in OBJECT fails.
+SLOT-NAME is the name of the failed slot, OPERATION is the type of access
+that was requested, and optional NEW-VALUE is the value that was desired
+to be set.
+
+This method is called from `oref', `oset', and other functions which
+directly reference slots in EIEIO objects."
+  (signal 'invalid-slot-name (list (object-name object)
+				   slot-name)))
+
+(defgeneric slot-unbound (object class slot-name fn)
+  "Slot unbound is invoked during an attempt to reference an unbound slot.")
+
+(defmethod slot-unbound ((object eieio-default-superclass)
+			 class slot-name fn)
+  "Slot unbound is invoked during an attempt to reference an unbound slot.
+OBJECT is the instance of the object being reference.  CLASS is the
+class of OBJECT, and SLOT-NAME is the offending slot.  This function
+throws the signal `unbound-slot'.  You can overload this function and
+return the value to use in place of the unbound value.
+Argument FN is the function signaling this error.
+Use `slot-boundp' to determine if a slot is bound or not.
+
+In CLOS, the argument list is (CLASS OBJECT SLOT-NAME), but
+EIEIO can only dispatch on the first argument, so the first two are swapped."
+  (signal 'unbound-slot (list (class-name class) (object-name object)
+			      slot-name fn)))
+
+(defgeneric no-applicable-method (object method &rest args)
+  "Called if there are no implementations for OBJECT in METHOD.")
+
+(defmethod no-applicable-method ((object eieio-default-superclass)
+				 method &rest args)
+  "Called if there are no implementations for OBJECT in METHOD.
+OBJECT is the object which has no method implementation.
+ARGS are the arguments that were passed to METHOD.
+
+Implement this for a class to block this signal.  The return
+value becomes the return value of the original method call."
+  (signal 'no-method-definition (list method (object-name object)))
+  )
+
+(defgeneric no-next-method (object &rest args)
+"Called from `call-next-method' when no additional methods are available.")
+
+(defmethod no-next-method ((object eieio-default-superclass)
+			   &rest args)
+  "Called from `call-next-method' when no additional methods are available.
+OBJECT is othe object being called on `call-next-method'.
+ARGS are the  arguments it is called by.
+This method signals `no-next-method' by default.  Override this
+method to not throw an error, and its return value becomes the
+return value of `call-next-method'."
+  (signal 'no-next-method (list (object-name object) args))
+)
+
+(defgeneric clone (obj &rest params)
+  "Make a copy of OBJ, and then supply PARAMS.
+PARAMS is a parameter list of the same form used by `initialize-instance'.
+
+When overloading `clone', be sure to call `call-next-method'
+first and modify the returned object.")
+
+(defmethod clone ((obj eieio-default-superclass) &rest params)
+  "Make a copy of OBJ, and then apply PARAMS."
+  (let ((nobj (copy-sequence obj))
+	(nm (aref obj object-name))
+	(passname (and params (stringp (car params))))
+	(num 1))
+    (if params (shared-initialize nobj (if passname (cdr params) params)))
+    (if (not passname)
+	(save-match-data
+	  (if (string-match "-\\([0-9]+\\)" nm)
+	      (setq num (1+ (string-to-number (match-string 1 nm)))
+		    nm (substring nm 0 (match-beginning 0))))
+	  (aset nobj object-name (concat nm "-" (int-to-string num))))
+      (aset nobj object-name (car params)))
+    nobj))
+
+(defgeneric destructor (this &rest params)
+  "Destructor for cleaning up any dynamic links to our object.")
+
+(defmethod destructor ((this eieio-default-superclass) &rest params)
+  "Destructor for cleaning up any dynamic links to our object.
+Argument THIS is the object being destroyed.  PARAMS are additional
+ignored parameters."
+  ;; No cleanup... yet.
+  )
+
+(defgeneric object-print (this &rest strings)
+  "Pretty printer for object THIS.  Call function `object-name' with STRINGS.
+
+It is sometimes useful to put a summary of the object into the
+default #<notation> string when using eieio browsing tools.
+Implement this method to customize the summary.")
+
+(defmethod object-print ((this eieio-default-superclass) &rest strings)
+  "Pretty printer for object THIS.  Call function `object-name' with STRINGS.
+The default method for printing object THIS is to use the
+function `object-name'.
+
+It is sometimes useful to put a summary of the object into the
+default #<notation> string when using eieio browsing tools.
+
+Implement this function and specify STRINGS in a call to
+`call-next-method' to provide additional summary information.
+When passing in extra strings from child classes, always remember
+to prepend a space."
+  (object-name this (apply 'concat strings)))
+
+(defvar eieio-print-depth 0
+  "When printing, keep track of the current indentation depth.")
+
+(defgeneric object-write (this &optional comment)
+  "Write out object THIS to the current stream.
+Optional COMMENDS will add comments to the beginning of the output.")
+
+(defmethod object-write ((this eieio-default-superclass) &optional comment)
+  "Write object THIS out to the current stream.
+This writes out the vector version of this object.  Complex and recursive
+object are discouraged from being written.
+  If optional COMMENT is non-nil, include comments when outputting
+this object."
+  (when comment
+    (princ ";; Object ")
+    (princ (object-name-string this))
+    (princ "\n")
+    (princ comment)
+    (princ "\n"))
+  (let* ((cl (object-class this))
+	 (cv (class-v cl)))
+    ;; Now output readable lisp to recreate this object
+    ;; It should look like this:
+    ;; (<constructor> <name> <slot> <slot> ... )
+    ;; Each slot's slot is writen using its :writer.
+    (princ (make-string (* eieio-print-depth 2) ? ))
+    (princ "(")
+    (princ (symbol-name (class-constructor (object-class this))))
+    (princ " \"")
+    (princ (object-name-string this))
+    (princ "\"\n")
+    ;; Loop over all the public slots
+    (let ((publa (aref cv class-public-a))
+	  (publd (aref cv class-public-d))
+	  (publp (aref cv class-public-printer))
+	  (eieio-print-depth (1+ eieio-print-depth)))
+      (while publa
+	(when (slot-boundp this (car publa))
+	  (let ((i (class-slot-initarg cl (car publa)))
+		(v (eieio-oref this (car publa)))
+		)
+	    (unless (or (not i) (equal v (car publd)))
+	      (princ (make-string (* eieio-print-depth 2) ? ))
+	      (princ (symbol-name i))
+	      (princ " ")
+	      (if (car publp)
+		  ;; Use our public printer
+		  (funcall (car publp) v)
+		;; Use our generic override prin1 function.
+		(eieio-override-prin1 v))
+	      (princ "\n"))))
+	(setq publa (cdr publa) publd (cdr publd)
+	      publp (cdr publp)))
+      (princ (make-string (* eieio-print-depth 2) ? )))
+    (princ ")\n")))
+
+(defun eieio-override-prin1 (thing)
+  "Perform a prin1 on THING taking advantage of object knowledge."
+  (cond ((eieio-object-p thing)
+	 (object-write thing))
+	((listp thing)
+	 (eieio-list-prin1 thing))
+	((class-p thing)
+	 (princ (class-name thing)))
+	((symbolp thing)
+	 (princ (concat "'" (symbol-name thing))))
+	(t (prin1 thing))))
+
+(defun eieio-list-prin1 (list)
+  "Display LIST where list may contain objects."
+  (if (not (eieio-object-p (car list)))
+      (progn
+	(princ "'")
+	(prin1 list))
+    (princ "(list ")
+    (if (eieio-object-p (car list)) (princ "\n "))
+    (while list
+      (if (eieio-object-p (car list))
+	  (object-write (car list))
+	(princ "'")
+	(prin1 (car list)))
+      (princ " ")
+      (setq list (cdr list)))
+    (princ (make-string (* eieio-print-depth 2) ? ))
+    (princ ")")))
+
+
+;;; Unimplemented functions from CLOS
+;;
+(defun change-class (obj class)
+  "Change the class of OBJ to type CLASS.
+This may create or delete slots, but does not affect the return value
+of `eq'."
+  (error "Eieio: `change-class' is unimplemented"))
+
+)
+
+
+;;; Interfacing with edebug
+;;
+(defun eieio-edebug-prin1-to-string (object &optional noescape)
+  "Display eieio OBJECT in fancy format.  Overrides the edebug default.
+Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
+  (cond ((class-p object) (class-name object))
+	((eieio-object-p object) (object-print object))
+	((and (listp object) (or (class-p (car object))
+				 (eieio-object-p (car object))))
+	 (concat "(" (mapconcat 'eieio-edebug-prin1-to-string object " ") ")"))
+	(t (prin1-to-string object noescape))))
+
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec defmethod
+	      (&define			; this means we are defining something
+	       [&or name ("setf" :name setf name)]
+	       ;; ^^ This is the methods symbol
+	       [ &optional symbolp ]    ; this is key :before etc
+	       list              ; arguments
+	       [ &optional stringp ]    ; documentation string
+	       def-body	                ; part to be debugged
+	       ))
+	    ;; The rest of the macros
+	    (def-edebug-spec oref (form quote))
+	    (def-edebug-spec oref-default (form quote))
+	    (def-edebug-spec oset (form quote form))
+	    (def-edebug-spec oset-default (form quote form))
+	    (def-edebug-spec class-v form)
+	    (def-edebug-spec class-p form)
+	    (def-edebug-spec eieio-object-p form)
+	    (def-edebug-spec class-constructor form)
+	    (def-edebug-spec generic-p form)
+	    (def-edebug-spec with-slots (list list def-body))
+	    ;; I suspect this isn't the best way to do this, but when
+	    ;; cust-print was used on my system all my objects
+	    ;; appeared as "#1 =" which was not useful.  This allows
+	    ;; edebug to print my objects in the nice way they were
+	    ;; meant to with `object-print' and `class-name'
+	    ;; (defalias 'edebug-prin1-to-string 'eieio-edebug-prin1-to-string)
+	    )
+	  )
+
+(eval-after-load "cedet-edebug"
+  '(progn
+     (cedet-edebug-add-print-override '(class-p object) '(class-name object) )
+     (cedet-edebug-add-print-override '(eieio-object-p object) '(object-print object) )
+     (cedet-edebug-add-print-override '(and (listp object)
+					    (or (class-p (car object)) (eieio-object-p (car object))))
+				      '(cedet-edebug-prin1-recurse object) )
+     ))
+
+(eval-after-load "data-debug"
+  '(require 'eieio-datadebug))
+
+;;; Interfacing with imenu in emacs lisp mode
+;;    (Only if the expression is defined)
+;;
+(if (eval-when-compile (boundp 'list-imenu-generic-expression))
+(progn
+
+(defun eieio-update-lisp-imenu-expression ()
+  "Examine `lisp-imenu-generic-expression' and modify it to find `defmethod'."
+  (let ((exp lisp-imenu-generic-expression))
+    (while exp
+      ;; it is of the form '( ( title expr indx ) ... )
+      (let* ((subcar (cdr (car exp)))
+	     (substr (car subcar)))
+	(if (and (not (string-match "|method\\\\" substr))
+		 (string-match "|advice\\\\" substr))
+	    (setcar subcar
+		    (replace-match "|advice\\|method\\" t t substr 0))))
+      (setq exp (cdr exp)))))
+
+(eieio-update-lisp-imenu-expression)
+
+))
+
+;;; Autoloading some external symbols, and hooking into the help system
+;;
+
+(autoload 'eieio-help-mode-augmentation-maybee "eieio-opt" "For buffers thrown into help mode, augment for eieio.")
+(autoload 'eieio-browse "eieio-opt" "Create an object browser window" t)
+(autoload 'eieio-describe-class "eieio-opt" "Describe CLASS defined by a string or symbol" t)
+(autoload 'eieio-describe-constructor "eieio-opt" "Describe the constructor function FCN." t)
+(autoload 'describe-class "eieio-opt" "Describe CLASS defined by a string or symbol" t)
+(autoload 'eieio-describe-generic "eieio-opt" "Describe GENERIC defined by a string or symbol" t)
+(autoload 'describe-generic "eieio-opt" "Describe GENERIC defined by a string or symbol" t)
+(autoload 'eieiodoc-class "eieio-doc" "Create texinfo documentation about a class hierarchy." t)
+
+(autoload 'customize-object "eieio-custom" "Create a custom buffer editing OBJ.")
+
+;; make sure this shows up after the help mode hook.
+(add-hook 'temp-buffer-show-hook 'eieio-help-mode-augmentation-maybee t)
+(require 'advice)
+(defadvice describe-variable (around eieio-describe activate)
+  "Display the full documentation of FUNCTION (a symbol).
+Returns the documentation as a string, also."
+  (if (class-p (ad-get-arg 0))
+      (eieio-describe-class (ad-get-arg 0))
+    ad-do-it))
+
+(defadvice describe-function (around eieio-describe activate)
+  "Display the full documentation of VARIABLE (a symbol).
+Returns the documentation as a string, also."
+  (if (generic-p (ad-get-arg 0))
+      (eieio-describe-generic (ad-get-arg 0))
+    (if (class-p (ad-get-arg 0))
+	(eieio-describe-constructor (ad-get-arg 0))
+      ad-do-it)))
+
+(provide 'eieio)
+;;; eieio ends here
diff --git a/site/cedet-1.0pre7/eieio/eieio.info b/site/cedet-1.0pre7/eieio/eieio.info
new file mode 100644
index 0000000..d35123c
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio.info
@@ -0,0 +1,1950 @@
+This is eieio.info, produced by makeinfo version 4.9 from eieio.texi.
+
+   This manual documents CEDET, a collection of other tools.
+
+   Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+START-INFO-DIR-ENTRY
+* eieio: (eieio).       Objects for Emacs
+END-INFO-DIR-ENTRY
+
+   This file documents EIEIO.  _Enhanced Implementation of Emacs
+Interpreted Objects_
+
+   Copyright (C) 2007 Eric M. Ludlam
+
+
+File: eieio.info,  Node: Top,  Next: Quick Start,  Up: (dir)
+
+Enhanced Implementation of Emacs Interpreted Objects
+****************************************************
+
+EIEIO is a framework for writing object oriented applications in emacs
+Lisp, and is a result of my taking various object oriented classes at
+work and my attempt to understand some of it better by implementing it.
+The real reason I started EIEIO is because someone in one of my classes
+said "I bet emacs can't do that!".  Well then, I just had to prove them
+wrong!
+
+* Menu:
+
+* Quick Start::           A Quick start for .
+* Introduction::          Why use EIEIO?  Basic overview, samples list.
+* Building Classes::      How to write new class structures.
+* Making New Objects::    How to construct new objects.
+* Accessing Slots::       How to access a slot.
+* Writing Methods::       How to write a method.
+* Method Invocation::     How methods are invoked.
+* Predicates::            Class-p, Object-p, etc-p.
+* Association Lists::     List of objects as association lists.
+* Customizing::           Customizing objects.
+* Introspection::         Looking inside a class.
+* Base Classes::          Additional classes you can inherit from.
+* Browsing::              Browsing your class lists.
+* Class Values::          Displaying information about a class or object.
+* Documentation::         Automatically creating texinfo documentation
+* Default Superclass::    The root superclasses.
+* Signals::               When you make errors
+* Naming Conventions::    Name your objects in an Emacs friendly way.
+* CLOS compatibility::    What are the differences?
+* Wish List::             Things about EIEIO that could be improved.
+* Function Index::
+
+
+File: eieio.info,  Node: Quick Start,  Next: Introduction,  Prev: Top,  Up: Top
+
+1 Quick Start
+*************
+
+EIEIO provides an Object Oriented layer for Emacs Lisp.  You can use
+EIEIO to create classes, methods for those classes, and instances of
+classes.
+
+   To start, create a class:
+
+     (defclass record () ; No superclasses
+       ((name :initarg :name
+              :initform ""
+              :type string
+              :custom string
+              :documentation "The name of a person.")
+        (birthday :initarg :birthday
+                  :initform "Jan 1, 1970"
+                  :custom string
+                  :type string
+                  :documentation "The person's birthday.")
+        (phone :initarg :phone
+               :initform ""
+               :documentation "Phone number."))
+       "A single record for tracking people I know.")
+
+   In this example, the class `record' is declared with three slots,
+which are `name', `birthday', and `phone'.
+
+   You can create methods against your classes.  A simple method may
+look like this:
+
+     (defmethod call-record ((rec record) &optional scriptname)
+       "Dial the phone for the record REC.
+     Execute the program SCRIPTNAME as to dial the phone."
+       (message "Dialing the phone for %s"  (oref rec name))
+       (shell-command (concat (or scriptname "dialphone.sh")
+                              " "
+                              (oref rec phone))))
+
+   In this example, the first argument to `call-record' is a list.  The
+list is of the form (VARNAME CLASSNAME).
+
+   VARNAME is the name of the variable used for the first argument.
+CLASSNAME is the name of the class that is expected as the first
+argument for this method.
+
+   EIEIO dispatches methods based on the type of the first argument.
+You can have multiple methods with the same name for different classes
+of object.  When the `call-record' method is called, the first argument
+is examined to determine the class of that argument, and the method
+matching the input type is then executed.
+
+   Once the behavior of a class is defined, you can create a new object
+of type `record'.  Objects are created by calling the constructor.  The
+constructor is a function with the same name as your class which
+returns a new instance of that class. It might look like this:
+
+     (setq rec (record "Eric" :name "Eric" :birthday "June" :phone "555-5555"))
+
+   The first argument is the name given to this instance.  Each instance
+is given a name so different instances can be easily distinguished
+during debugging.
+
+   It can be a bit repetitive to also have a :name slot.  A handy
+baseclass to use in this case is `eieio-named'.  *Note eieio-named::.
+
+   Calling methods on an object is a lot like calling any function.  The
+first argument should be an object of a class which has had this method
+defined for it.  In this example it would look like this:
+
+     (call-record rec)
+
+   or
+
+     (call-record rec "my-call-script")
+
+   In these examples, the method `call-record' is called.  EIEIO
+examines the class of `rec' and method defined above will be called.
+If `rec' is some other class, or a number, or other datatype, then it
+will signal `no-method-definition'. *Note Signals::.
+
+
+File: eieio.info,  Node: Introduction,  Next: Building Classes,  Prev: Quick Start,  Up: Top
+
+2 Introduction
+**************
+
+EIEIO is a CLOS (Common Lisp Object System) compatibility layer.  Due
+to restrictions in the Emacs Lisp language, CLOS cannot be completely
+supported, and a few functions have been added in place of setf.
+
+2.1 What EIEIO supports
+=======================
+
+  1. A structured framework for the creation of basic classes with
+     attributes and methods using singular inheritance similar to CLOS.
+
+  2. Type checking, and slot unbinding.
+
+  3. Method definitions similar to CLOS.
+
+  4. Simple and complex class browsers.
+
+  5. Edebug support for methods.
+
+  6. Imenu updates.
+
+  7. Byte compilation support of methods.
+
+  8. Help system extensions for classes and methods.
+
+  9. Automatic texinfo documentation generator.
+
+ 10. Several base classes for interesting tasks.
+
+ 11. Simple test suite.
+
+ 12. Public and private classifications for slots (extensions to CLOS)
+
+ 13. Customization support in a class (extension to CLOS)
+
+2.2 Issues using EIEIO
+======================
+
+Complete `defclass' tag support
+     All CLOS tags are currently supported, but the following are not
+     currently implemented correctly:
+
+    `:metaclass'
+          There is only one base superclass for all EIEIO classes,
+          which is the `eieio-default-superclass'.
+
+    `:default-initargs'
+          Each slot has an `:initarg' tag, so this is not really
+          necessary.
+
+Mock object initializers
+     Each class contains a mock object used for fast initialization of
+     instantiated objects.  Using functions with side effects on object
+     slot values can potentially cause modifications in the mock
+     object.  EIEIO should use a deep copy but currently does not.
+
+`:around' method tag
+     This CLOS method tag is non-functional.
+
+
+
+File: eieio.info,  Node: Building Classes,  Next: Making New Objects,  Prev: Introduction,  Up: Top
+
+3 Building Classes
+******************
+
+A class is a definition for organizing data and methods together.  In
+EIEIO a class has similar structure to that found in other OO languages.
+
+   Create a new class `defclass'.
+
+ -- Function: defclass class-name superclass-list slot-list
+          options-or-doc
+     This function is specified by CLOS, and EIEIO conforms in
+     structure.
+
+     Creates a new class called CLASS-NAME.  In Emacs, the class is
+     represented as a self-referential symbol with the name CLASS-NAME.
+     The structure of the class is stored on the CLASS-NAME symbol as
+     a property.
+
+     The CLASS-NAME symbol's variable documentation string is a
+     modified version of the doc string found in OPTIONS-OR-DOC.  Each
+     time a method is defined the symbol's documentation string is
+     updated to include the methods documentation as well.
+
+     The parent classes for CLASS-NAME is SUPERCLASS-LIST.  Each
+     element of SUPERCLASS-LIST must be a class.  These classes are the
+     parents of the class being created.  Every slot that appears in
+     each parent class is replicated in the new class.
+
+     If two parents share the same slot name, the parent which appears
+     in the SUPERCLASS-LIST first sets the tags for that slot.  If a
+     slot in the new class' slot list matches a parent, then the new
+     specifications for the child class override that of the parent.
+
+     Whenever defclass is used to create a new class, two predicates are
+     created for it.  The predicate names are `CLASS-NAME-p' and
+     `CLASS-NAME-child-p'
+
+      -- Function: CLASS-NAME-p object
+          Return `t' if OBJECT is of the class CLASS-NAME.
+
+      -- Function: CLASS-NAME-child-p object
+          Return `t' if OBJECT is of the class CLASS-NAME, or is of a
+          subclass of CLASS-NAME.
+
+
+ -- Variable: eieio-error-unsupported-class-tags
+     If Non-nil, then `defclass' will signal an error if a tag in a
+     slot specifier is unsupported.
+
+     This option is here to support programs written with older
+     versions of EIEIO when such errors were not produced.
+
+* Menu:
+
+* Inheritance::         How to specify parents classes
+* Slot Options::	How to specify features of a slot.
+* Class Options::	How to specify features for this class.
+
+
+File: eieio.info,  Node: Inheritance,  Next: Slot Options,  Up: Building Classes
+
+3.1 Inheritance
+===============
+
+A basic feature of an object oriented language is inheritance.  In
+EIEIO, a defined class specifies the super classes it inherites from
+with the second argument to defclass.
+
+   For example, a parent class might be:
+
+     (defclass my-baseclass ()
+        ((slot-A :initarg :slot-A)
+         (slot-B :initarg :slot-B))
+       "My Baseclass.")
+
+   To subclass from `my-baseclass', you would specify it in the
+superclass list.
+
+     (defclass my-subclass (my-baseclass)
+        ((specific-slot-A :initarg specific-slot-A)
+         )
+        "My subclass of my-baseclass")
+
+   Instances of `my-subclass' will inherit `slot-A' and `slot-B', in
+addition to having `specific-slot-A' from the declaration of
+`my-subclass'.
+
+   EIEIO also supports multiple inheritance.  If there was a second
+baseclass, or perhaps an interface style class, it could be declared
+like this:
+
+     (defclass my-interface ()
+        ((interface-slot :initarg :interface-slot))
+        "An interface to special behavior."
+        :abstract t)
+
+   The interface class defines a special `interface-slot', and also
+specifies itself as abstract.  Abstract classes cannot be instantiated.
+It is not required to make interfaces abstract, but it is a good idea.
+
+   To use a baseclass, and the interface, the subclass declaration would
+now look like this:
+
+     (defclass my-subclass (my-baseclass my-interface)
+        ((specific-slot-A :initarg specific-slot-A)
+         )
+        "My subclass of my-baseclass")
+
+   Now `my-subclass' has also has `interface-slot'.
+
+   If `my-baseclass' and `my-interface' had slots with the same name,
+then the superclass showing up in the list first will define the slot
+attributes.
+
+   Inheritance in EIEIO is more than just combining different slots.
+It is also important in method invocation.  *Note Methods::.
+
+   If a method is called on an instance of `my-subclass', and that
+method only has an implementation on `my-baseclass', or perhaps
+`my-interface', then the implementation for the baseclass is called.
+
+   If there is a method implementation for `my-subclass', and another
+in `my-baseclass', the implementation for `my-subclass' can call up to
+the superclass as well.
+
+
+File: eieio.info,  Node: Slot Options,  Next: Class Options,  Prev: Inheritance,  Up: Building Classes
+
+3.2 Slot Options
+================
+
+SLOT-LIST is a list of elements where each element defines one slot.
+Each slot is a list of the form:
+
+       (SLOT-NAME :TAG1 ATTRIB-VALUE1
+                  :TAG2 ATTRIB-VALUE2
+                  :TAGN ATTRIB-VALUEN)
+
+   where SLOT-NAME is a symbol that will be used to refer to the slot.
+:TAG is a symbol that describes a feature to be set on the slot.
+ATTRIB-VALUE is a lisp expression that will be used for :TAG.
+
+   Valid tags are:
+
+`:initarg'
+     The `:initarg' specifier gives this slot a name that can be used
+     in the argument list of the constructor to specify a value for the
+     new instance being created.
+
+     A good symbol to use for initarg is one that starts with a colon
+     `:'.
+
+     The slot specified like this:
+            (myslot :initarg :myslot)
+     could then be initialized to the number 1 like this:
+            (myobject "name" :myslot 1)
+
+     *Note Making New Objects::.
+
+`:initform'
+     A expression used as the default value for this slot.
+
+     If `:initform' is left out, that slot defaults to being unbound.
+     It is an error to reference an unbound slot, so if you need slots
+     to always be in a bound state, you should always use an
+     `:initform' specifier.
+
+     Use `slot-boundp' to test if a slot is unbound *Note Predicates::.
+     Use `slot-makeunbound' to set a slot to being unbound after giving
+     it a value *Note Accessing Slots::.
+
+     The value passed to initform is automatically quoted.  Thus,
+          :initform (1 2 3)
+     appears as the specified list in the default object.  A symbol
+     that is a function like this:
+          :initform +
+     will set the initial value as that symbol.  A function that is a
+     lambda expression, like this:
+          :initform (lambda () some-variablename)
+
+     will be evaluated at instantiation time to the value of
+     `some-variablename'.
+
+     Lastly, using the function `lambda-default' instead of `lambda'
+     will let you specify a lambda expression to use as the value,
+     without evaluation, thus:
+          :initform (lambda-default () some-variablename)
+     @TODO - This will be deleted after fair warning.
+
+     will not be evaluated at instantiation time, and the value in this
+     slot will instead be `(lambda () some-variablename)'.
+
+     After a class has been created with `defclass', you can change
+     that default value with `oset-default'. *Note Accessing Slots::.
+
+`:type'
+     An unquoted type specifier used to validate data set into this
+     slot.  *Note (cl)Type Predicates::.  Here are some examples:
+    `symbol'
+          A symbol.
+
+    `number'
+          A number type
+
+    `my-class-name'
+          An object of your class type.
+
+    `(or null symbol)'
+          A symbol, or nil.
+
+    `function'
+          A function symbol, or a `lambda-default' expression.
+
+
+`:allocation'
+     Either :class or :instance (defaults to :instance) used to specify
+     how data is stored.  Slots stored per instance have unique values
+     for each object.  Slots stored per class have shared values for
+     each object.  If one object changes a :class allocated slot, then
+     all objects for that class gain the new value.
+
+`:documentation'
+     Documentation detailing the use of this slot.  This documentation
+     is exposed when the user describes a class, and during
+     customization of an object.
+
+`:accessor'
+     Name of a generic function which can be used to fetch the value of
+     this slot.  You can call this function later on your object and
+     retrieve the value of the slot.
+
+     This options is in the CLOS spec, but is not fully compliant in
+     EIEIO.
+
+`:writer'
+     Name of a generic function which will write this slot.
+
+     This options is in the CLOS spec, but is not fully compliant in
+     EIEIO.
+
+`:reader'
+     Name of a generic function which will read this slot.
+
+     This options is in the CLOS spec, but is not fully compliant in
+     EIEIO.
+
+`:custom'
+     A custom :type specifier used when editing an object of this type.
+     See documentation for `defcustom' for details.  This specifier is
+     equivalent to the :type spec of a `defcustom' call.
+
+     This options is specific to Emacs, and is not in the CLOS spec.
+
+`:label'
+     When customizing an object, the value of :label will be used
+     instead of the slot name.  This enables better descriptions of the
+     data than would usually be afforded.
+
+     This options is specific to Emacs, and is not in the CLOS spec.
+
+`:group'
+     Similar to `defcustom''s :group command, this organizes different
+     slots in an object into groups.  When customizing an object, only
+     the slots belonging to a specific group need be worked with,
+     simplifying the size of the display.
+
+     This options is specific to Emacs, and is not in the CLOS spec.
+
+`:printer'
+     This routine takes a symbol which is a function name.  The function
+     should accept one argument.  The a rgument is the value from the
+     slot to be printed.  The function in `object-write' will write the
+     slot value out to a printable form on `standard-output'.
+
+     The output format MUST be  something that could in turn be
+     interpreted with `read' such that the object can be brought back
+     in from the output stream.  Thus, if you wanted to output a
+     symbol, you would need to quote the symbol.  If you wanted to run
+     a function on load, you can output the code to do the construction
+     of the value.
+
+`:protection'
+     When using a slot referencing function such as `slot-value', and
+     the value behind SLOT is private or protected, then the current
+     scope of operation must be within a method of the calling object.
+
+     Valid values are:
+
+    `:public'
+          Access this slot from any scope.
+
+    `:protected'
+          Access this slot only from methods of the same class or a
+          child class.
+
+    `:private'
+          Access this slot only from methods of the same class.
+
+     This options is specific to Emacs, and is not in the CLOS spec.
+
+
+
+File: eieio.info,  Node: Class Options,  Prev: Slot Options,  Up: Building Classes
+
+3.3 Class Options
+=================
+
+A Class can have class options.  EIEIO supports these class options.
+
+`:documentation'
+     Doc string to use for this class.
+
+     If an Emacs style documentation string is also provided, then this
+     option is ignored.  An Emacs style documentation string is not
+     prefixed by the `:documentation' tag, and appears after the list
+     of slots, and before the options.
+
+`:allow-nil-initform'
+     If this option is non-nil, and the `:initform' is `nil', but the
+     `:type' is specifies something such as `string' then allow this to
+     pass.  The default is to have this option be off.  This is
+     implemented as an alternative to unbound slots.
+
+     This options is specific to Emacs, and is not in the CLOS spec.
+
+`:abstract'
+     A class which is `:abstract' cannot be instantiated, and instead
+     is used to define an interface which subclasses should implement.
+
+     This option is specific to Emacs, and is not in the CLOS spec.
+
+`:custom-groups'
+     This is a list of groups that can be customized within this class.
+     This slot is auto-generated when a class is created and need not
+     be specified.  It can be retrieved with the `class-option' command,
+     however, to see what groups are available.
+
+     This option is specific to Emacs, and is not in the CLOS spec.
+
+`:method-invocation-order'
+     This controls the order in which method resolution occurs for
+     `:primary' methods in cases of multiple inheritance.  The order
+     affects which method is called first in a tree, and if
+     `call-next-method' is used, it controls the order in which the
+     stack of methods are run.
+
+     Valid values are:
+
+    `:breadth-first'
+          Search for methods in the class hierarchy in breadth first
+          order.  This is the default.
+
+    `:depth-first'
+          Search for methods in the class hierarchy in a depth first
+          order.
+
+     For more on method invocation order, *Note Method Invocation::.
+
+`:metaclass'
+     Unsupported CLOS option.  Enables the use of a different base
+     class other than `standard-class'.
+
+`:default-initargs'
+     Unsupported CLOS option.  Specifies a list of initargs to be used
+     when creating new objects.  As far as I can tell, this duplicates
+     the function of `:initform'.
+
+   *Note CLOS compatibility::, for more details on CLOS tags versus
+EIEIO specific tags.
+
+
+File: eieio.info,  Node: Making New Objects,  Next: Accessing Slots,  Prev: Building Classes,  Up: Top
+
+4 Making New Objects
+********************
+
+When simple class is defined, such as:
+     (defclass record ()
+        ( ) "Doc String")
+
+   it is possible to create create objects of that class type.
+
+   Calling `defclass' has defined two new functions.  One is the
+constructor RECORD, and the other is the predicate, RECORD-P.
+
+ -- Function: record object-name &rest slots
+     This creates and returns a new object.  This object is not
+     assigned to anything, and will be garbage collected if not saved.
+     This object will be given the string name OBJECT-NAME.  There can
+     be multiple objects of the same name, but the name slot provides a
+     handy way to keep track of your objects.  SLOTS is just all the
+     slots you wish to preset.  Any slot set as such _will not_ get its
+     default value, and any side effects from a slot's `:initform' that
+     may be a function will not occur.
+
+     An example pair would appear simply as `:value 1'.  Of course you
+     can do any valid Lispy thing you want with it, such as `:value (if
+     (boundp 'special-symbol) special-symbol nil)'
+
+     Example of creating an object from a class:
+
+          (record "test" :value 3 :reference nil)
+
+
+   To create an object from a class symbol, use use `make-instance'.
+
+ -- Function: make-instance class &rest initargs
+     Make a new instance of CLASS based on INITARGS.  CLASS is a class
+     symbol.  For example:
+
+            (make-instance 'foo)
+
+     INITARGS is a property list with keywords based on the `:initarg'
+     for each slot.  For example:
+
+            (make-instance `'foo' `:slot1' value1 `:slotN' valueN)
+
+     Compatability note:
+
+     If the first element of INITARGS is a string, it is used as the
+     name of the class.
+
+     In EIEIO, the class' constructor requires a name for use when
+     printing.  "make-instance" in CLOS doesn't use names the way Emacs
+     does, so the class is used as the name slot instead when INITARGS
+     doesn't start with a string.
+
+
+File: eieio.info,  Node: Accessing Slots,  Next: Writing Methods,  Prev: Making New Objects,  Up: Top
+
+5 Accessing Slots
+*****************
+
+There are several ways to access slot values in an object.  The naming
+convention and argument order is similar to that found in Emacs Lisp for
+referencing vectors.  The basics for referencing, setting, and calling
+methods are all accounted for.
+
+ -- Function: oset object slot value
+     This sets the value behind SLOT to VALUE in OBJECT.  `oset'
+     returns VALUE.
+
+ -- Function: oset-default class slot value
+     This sets the `:initform' for SLOT in CLASS to VALUE.  This will
+     allow a user to set both public and private defaults after the
+     class has been constructed.
+
+     This function provides a way to to configure the default behavior
+     of packages built with classes the same way `setq-default' is used
+     for buffer-local variables.
+
+     For example, if a user wanted all `data-objects' (*note Building
+     Classes::) to inform a special object of his own devising when they
+     changed, this can be arranged by simply executing this bit of code:
+
+          (oset-default data-object reference (list my-special-object))
+
+
+ -- Function: oref obj slot
+     Retrieve the value stored in OBJ in the slot named by SLOT.  Slot
+     is the name of the slot when created by "defclass" or the label
+     created by the `:initarg' tag.
+
+ -- Function: oref-default obj slot
+     Gets the default value of OBJ (maybe a class) for SLOT.  The
+     default value is the value installed in a class with the
+     `:initform' tag.  SLOT can be the slot name, or the tag specified
+     by the `:initarg' tag in the "defclass" call.
+
+   These next accessors are defined by CLOS to reference or modify slot
+values, and use the previously mentioned set/ref routines.
+
+ -- Function: slot-value object slot
+     This function retrieves the value of SLOT from OBJECT.  Unlike
+     `oref', the symbol for SLOT must be quoted.
+
+ -- Function: set-slot-value object slot value
+     This is not a CLOS function, but is meant to mirror `slot-value' if
+     you don't want to use the cl package's `setf' function.  This
+     function sets the value of SLOT from OBJECT.  Unlike `oset', the
+     symbol for SLOT must be quoted.
+
+ -- Function: slot-makeunbound object slot
+     This function unbinds SLOT in OBJECT.  Referencing an unbound slot
+     can signal an error.
+
+ -- Function: object-add-to-list object slot item &optional append
+     In OBJECT's SLOT, add ITEM to the list of elements.  Optional
+     argument APPEND indicates we need to append to the list.  If ITEM
+     already exists in the list in SLOT, then it is not added.
+     Comparison is done with "equal" through the "member" function call.
+     If SLOT is unbound, bind it to the list containing ITEM.
+
+ -- Function: object-remove-from-list object slot item
+     In OBJECT's SLOT, remove occurrences of ITEM.  Deletion is done
+     with "delete", which deletes by side effect and comparisons are
+     done with "equal".  If SLOT is unbound, do nothing.
+
+ -- Function: with-slots spec-list object &rest body
+     Bind SPEC-LIST lexically to slot values in OBJECT, and execute
+     BODY.  This establishes a lexical environment for referring to the
+     slots in the instance named by the given slot-names as though they
+     were variables.  Within such a context the value of the slot can be
+     specified by using its slot name, as if it were a lexically bound
+     variable.  Both setf and setq can be used to set the value of the
+     slot.
+
+     SPEC-LIST is of a form similar to "let".  For example:
+
+            ((VAR1 SLOT1)
+              SLOT2
+              SLOTN
+             (VARN+1 SLOTN+1))
+
+     Where each VAR is the local variable given to the associated SLOT.
+     A Slot specified without a variable name is given a variable name
+     of the same name as the slot.
+
+          (defclass myclass () (x :initarg 1))
+          (setq mc (make-instance 'myclass))
+          (with-slots (x) mc x)                      => 1
+          (with-slots ((something x)) mc something)  => 1
+
+
+File: eieio.info,  Node: Writing Methods,  Next: Method Invocation,  Prev: Accessing Slots,  Up: Top
+
+6 Writing Methods
+*****************
+
+Writing a method in EIEIO is similar to writing a function.  The
+differences are that there are some extra options and there can be
+multiple definitions under the same function symbol.
+
+   Where a method defines an implementation for a particular data type,
+a "generic method" accepts any argument, but contains no code.  It is
+used to provide the dispatching to the defined methods.  A generic
+method has no body, and is merely a symbol upon which methods are
+attached.  It also provides the base documentation for what methods
+with that name do.
+
+* Menu:
+
+* Generics::
+* Methods::
+* Static Methods::
+
+
+File: eieio.info,  Node: Generics,  Next: Methods,  Up: Writing Methods
+
+6.1 Generics
+============
+
+Every method created in EIEIO will have one corresponding generic.  In
+EIEIO the generic provides symbol bound as a function, and the base
+documentation
+
+ -- Function: defgeneric method arglist [doc-string]
+     METHOD is the unquoted symbol to turn into a function.  ARGLIST is
+     the default list of arguments to use (not implemented yet).
+     DOC-STRING is the documentation used for this symbol.
+
+     A generic function acts as a place holder for methods.  There is
+     no need to call `defgeneric' yourself, as `defmethod' will call it
+     if necessary.  Currently the argument list is unused.
+
+     `defgeneric' will prevent you from turning an existing Emacs Lisp
+     function into a generic function.
+
+     You can also create a generic method with `defmethod'.  When a
+     method is created and there is no generic method in place with that
+     name, then a new generic will be created, and the new method will
+     use it.
+
+   In CLOS a generic call also be used to provide an argument list, and
+dispatch precedence for all the arguments.  In EIEIO, dispatching only
+occurs for the first argument, so the ARGLIST is not used.
+
+
+File: eieio.info,  Node: Methods,  Next: Static Methods,  Prev: Generics,  Up: Writing Methods
+
+6.2 Methods
+===========
+
+A method is a function which will be executed if the first argument
+passed to it matches the class the method was written for.  Multiple
+definitions for a single method name can exist, one for each class
+defined in EIEIO.
+
+   Methods are created with the `defmethod' macro, which is similar to
+`defun'.
+
+ -- Macro: defmethod method [:before | :primary | :after | :static ]
+          arglist [doc-string] forms
+     METHOD is the name of the function to be created.
+
+     `:before' and `:after' specify execution order, and represent when
+     this form is to be called.  If neither of these symbols are
+     present, then the default priority is, before `:after', after
+     `:before', and is represented in CLOS as `:primary'.
+
+     Note: The `:BEFORE', `:PRIMARY', `:AFTER', and `:STATIC' method
+     tags were in all capital letters in previous versions of EIEIO.
+
+     `arglist' is the list of argument to this method.
+
+     DOC-STRING is the documentation attached to the implementation.
+     All method doc-strings are concatenated into the generic method's
+     function documentation.
+
+     FORMS is the body of the function.
+
+
+   Only the _first_ argument may have a type specifier.
+     (defmethod mymethod ((obj classname) secondarg)
+       "Doc string" )
+
+   In this example, `mymethod' has a first argument of OBJ, and this
+method will only execute if OBJ is an EIEIO class of type `classname'.
+
+   TODO - The _generic_ term below is not the same as a defgeneric
+generic.  The below generic means that there is no type specifier.  FIX
+THIS DOC.
+
+   If no type specifier is supplied, then the method becomes a generic
+method, which will work for any object.
+
+   A method with no type specifier is a `generic'.  If a given class has
+no implementation, then the generic will be called when that method is
+used on a given object of that class.
+
+   If two `defmethod's appear with arglists that do not have a type
+specifier, then the first implementation will be replaced.  Only one
+generic per execution specifier such as `:before', `:primary', or
+`:after'.
+
+   When when a method is called on an object, but there is no method
+specified for that object, but there is a method specified for object's
+parent class, the parent class' method will be called.  If there is a
+method defined for both, only the child's method is called.  For a
+child method to call a parent's method, use `call-next-method'.
+
+   If multiple methods and generics are defined for the same method and
+class, they are executed in this order:
+
+method :before
+
+generic :before
+
+method :primary
+
+generic :primary
+
+method :after
+
+generic :after
+
+   If no methods exist, then the signal and error named
+`no-method-definition'. *Note Signals::
+
+   See the file `eieio-test.el' for an example testing these
+differently tagged methods.
+
+ -- Function: call-next-method &rest replacement-args
+     Call the superclass method from a subclass method.  The superclass
+     method is specified in the current method list, and is called the
+     next method.
+
+     If REPLACEMENT-ARGS is non-`nil', then use them instead of
+     `eieio-generic-call-arglst'.  The generic arg list are the
+     arguments passed in at the top level.
+
+     Use "next-method-p" to find out if there is a next method to call.
+
+ -- Function: next-method-p
+     Non-`nil' if there is a next method.  Returns a list of lambda
+     expressions which is the `next-method' order.
+
+   In this implementation, not all features of CLOS exist.
+
+  1. There is currently no `:around' tag.
+
+  2. CLOS allows multiple sets of type-cast arguments, where EIEIO only
+     allows the first argument to be cast.
+
+
+File: eieio.info,  Node: Static Methods,  Prev: Methods,  Up: Writing Methods
+
+6.3 Static Methods
+==================
+
+Static methods do not depend on an object instance, but instead operate
+on an object's class.  Create a static method by using the `:static'
+key with `defmethod'.
+
+   Do not treat the first argument of a `:static' method as an object
+unless you test it first.  Use the functions `oref-default' or
+`oset-default' which will work on a class, or on the class of an object.
+
+   A Class' `constructor' method is defined as a `:static' method.
+
+   Note: The `:static' keyword is unique to EIEIO.
+
+   TODO - Write some more about static methods here
+
+
+File: eieio.info,  Node: Method Invocation,  Next: Predicates,  Prev: Writing Methods,  Up: Top
+
+7 Method Invocation
+*******************
+
+TODO - writeme
+
+
+File: eieio.info,  Node: Predicates,  Next: Association Lists,  Prev: Method Invocation,  Up: Top
+
+8 Predicates and Utilities
+**************************
+
+Now that we know how to create classes, access slots, and define
+methods, it might be useful to verify that everything is doing ok.  To
+help with this a plethora of predicates have been created.
+
+ -- Function: find-class symbol &optional errorp
+     Return the class that SYMBOL represents.  If there is no class,
+     `nil' is returned if ERRORP is `nil'.  If ERRORP is non-`nil',
+     `wrong-argument-type' is signaled.
+
+ -- Function: class-p class
+     Return `t' if CLASS is a valid class vector.  CLASS is a symbol.
+
+ -- Function: slot-exists-p object-or-class slot
+     Non-`nil' if OBJECT-OR-CLASS has SLOT.
+
+ -- Function: slot-boundp object slot
+     Non-`nil' if OBJECT's SLOT is bound.  Setting a slot's value makes
+     it bound.  Calling "slot-makeunbound" will make a slot unbound.
+     OBJECT can be an instance or a class.
+
+ -- Function: class-name class
+     Return a string of the form `#<class myclassname>' which should
+     look similar to other Lisp objects like buffers and processes.
+     Printing a class results only in a symbol.
+
+ -- Function: class-option class option
+     Return the value in CLASS of a given OPTION.  For example:
+
+          (class-option eieio-default-superclass :documentation)
+
+     Will fetch the documentation string for `eieio-default-superclass'.
+
+ -- Function: class-constructor class
+     Return a symbol used as a constructor for CLASS.  The constructor
+     is a function used to create new instances of CLASS. This function
+     provides a way to make an object of a class without knowing what
+     it is.  This is not a part of CLOS.
+
+ -- Function: object-name obj
+     Return a string of the form `#<object-class myobjname>' for OBJ.
+     This should look like Lisp symbols from other parts of emacs such
+     as buffers and processes, and is shorter and cleaner than printing
+     the object's vector.  It is more useful to use `object-print' to
+     get and object's print form, as this allows the object to add
+     extra display information into the symbol.
+
+ -- Function: object-class obj
+     Returns the class symbol from OBJ.
+
+ -- Function: class-of obj
+     CLOS symbol which does the same thing as `object-class'
+
+ -- Function: object-class-fast obj
+     Same as `object-class' except this is a macro, and no
+     type-checking is performed.
+
+ -- Function: object-class-name obj
+     Returns the symbol of OBJ's class.
+
+ -- Function: class-parents class
+     Returns the direct parents class of CLASS.  Returns `nil' if it is
+     a superclass.
+
+ -- Function: class-parents-fast class
+     Just like `class-parent' except it is a macro and no type checking
+     is performed.
+
+ -- Function: class-parent class
+     Deprecated function which returns the first parent of CLASS.
+
+ -- Function: class-children class
+     Return the list of classes inheriting from CLASS.
+
+ -- Function: class-children-fast class
+     Just like `class-children', but with no checks.
+
+ -- Function: same-class-p obj class
+     Returns `t' if OBJ's class is the same as CLASS.
+
+ -- Function: same-class-fast-p obj class
+     Same as `same-class-p' except this is a macro and no type checking
+     is performed.
+
+ -- Function: object-of-class-p obj class
+     Returns `t' if OBJ inherits anything from CLASS.  This is
+     different from `same-class-p' because it checks for inheritance.
+
+ -- Function: child-of-class-p child class
+     Returns `t' if CHILD is a subclass of CLASS.
+
+ -- Function: generic-p method-symbol
+     Returns `t' if `method-symbol' is a generic function, as opposed
+     to a regular Emacs Lisp function.
+
+
+File: eieio.info,  Node: Association Lists,  Next: Customizing,  Prev: Predicates,  Up: Top
+
+9 Association Lists
+*******************
+
+Lisp offers the concept of association lists, with primitives such as
+`assoc' used to access them.  EIEIO provides a few such functions to
+help with using lists of objects easily.
+
+ -- Function: object-assoc key slot list
+     Return an object if KEY is "equal" to SLOT's value of an object in
+     LIST.  LIST is a list of objects who's slots are searched.
+     Objects in LIST do not need to have a slot named SLOT, nor does
+     SLOT need to be bound.  If these errors occur, those objects will
+     be ignored.
+
+ -- Function: object-assoc-list slot list
+     Return an association list generated by extracting SLOT from all
+     objects in LIST.  For each element of LIST the `car' is the value
+     of SLOT, and the `cdr' is the object it was extracted from.  This
+     is useful for generating completion tables.
+
+ -- Function: eieio-build-class-alist &optional base-class
+     Returns an alist of all currently defined classes.  This alist is
+     suitable for completion lists used by interactive functions to
+     select a class.  The optional argument BASE-CLASS allows the
+     programmer to select only a subset of classes which includes
+     BASE-CLASS and all its subclasses.
+
+
+File: eieio.info,  Node: Customizing,  Next: Introspection,  Prev: Association Lists,  Up: Top
+
+10 Customizing Objects
+**********************
+
+EIEIO supports custom through two new widget types.  If a variable is
+declared as type `'object', then full editing of slots via the widgets
+is made possible.  This should be used carefully, however, because
+objects modified are cloned, so if there are other references to these
+objects, they will no longer be linked together.
+
+   If you want in place editing of objects, use the following methods:
+
+ -- Function: eieio-customize-object object
+     Create a custom buffer and insert a widget for editing OBJECT.  At
+     the end, an `Apply' and `Reset' button are available.  This will
+     edit the object "in place" so references to it are also changed.
+     There is no effort to prevent multiple edits of a singular object,
+     so care must be taken by the user of this function.
+
+ -- Function: eieio-custom-widget-insert object flags
+     This method inserts an edit object into the current buffer in
+     place.  It is implemented as `(widget-create 'object-edit :value
+     object)'.  This method is provided as a locale for adding
+     tracking, or specializing the widget insert procedure for any
+     object.
+
+   To define a slot with an object in it, use the `object' tag.  This
+widget type will be automatically converted to `object-edit' if you do
+in place editing of you object.
+
+   If you want to have additional actions taken when a user clicks on
+the `Apply' button, then overload the method `eieio-done-customizing'.
+This method does nothing by default, but that may change in the future.
+This would be the best way to make your objects persistent when using
+in-place editing.
+
+10.1 Widget extention
+=====================
+
+When widgets are being created, one new widget extention has been added,
+called the `:slotofchoices'.  When this occurs in a widget definition,
+all elements after it are removed, and the slot is specifies is queried
+and converted into a series of constants.
+
+     (choice (const :tag "None" nil)
+             :slotofchoices morestuff)
+
+   and if the slot `morestuff' contains `(sym1 sym2 sym3)', the above
+example is converted into:
+
+     (choice (const :tag "None" nil)
+             (const sym1)
+             (const sym2)
+             (const sym3))
+
+   This is useful when a given item needs to be selected from a list of
+items defined in this second slot.
+
+
+File: eieio.info,  Node: Introspection,  Next: Base Classes,  Prev: Customizing,  Up: Top
+
+11 Introspection
+****************
+
+Introspection permits a programmer to peek at the contents of a class
+without any previous knowledge of that class.  While EIEIO implements
+objects on top of vectors, and thus everything is technically visible,
+some functions have been provided.  None of these functions are a part
+of CLOS.
+
+ -- Function: object-slots obj
+     Return the list of public slots for OBJ.
+
+ -- Function: class-slot-initarg class slot
+     For the given CLASS return the :initarg associated with SLOT.  Not
+     all slots have initargs, so the return value can be nil.
+
+
+File: eieio.info,  Node: Base Classes,  Next: Browsing,  Prev: Introspection,  Up: Top
+
+12 Base Classes
+***************
+
+Asside from `eieio-default-superclass', EIEIO comes with some
+additional classes that you can use.  By using multiple inheritance, it
+is possible to use several features at the same time.
+
+* Menu:
+
+* eieio-instance-inheritor::    Enable value inheritance between instances.
+* eieio-instance-tracker::      Enable self tracking instances.
+* eieio-singleton::             Only one instance of a given class.
+* eieio-persistent::            Enable persistence for a class.
+* eieio-named::                 Use the object name as a :name slot.
+* eieio-speedbar::              Enable speedbar support in your objects.
+
+
+File: eieio.info,  Node: eieio-instance-inheritor,  Next: eieio-instance-tracker,  Up: Base Classes
+
+12.1 `eieio-instance-inheritor'
+===============================
+
+This class is in package `eieio-base'.
+
+   Instance inheritance is a mechanism whereby the value of a slot in
+object instance can reference the parent instance.  If the parent's slot
+value is changed, then the child instance is also changed.  If the
+child's slot is set, then the parent's slot is not modified.
+
+ -- Class: eieio-instance-inheritor parent-instance
+     A class whose instances are enabled with instance inheritance.
+     The PARENT-INSTANCE slot indicates the instance which is
+     considered the parent of the current instance.  Default is `nil'.
+
+   To use this class, inherit from it with your own class.  To make a
+new instance that inherits from and existing instance of your class,
+use the `clone' method with additional parameters to specify local
+values.
+
+   The `eieio-instance-inheritor' class works by causing cloned objects
+to have all slots unbound.  This class' `slot-unbound' method will
+cause references to unbound slots to be redirected to the parent
+instance.  If the parent slot is also unbound, then `slot-unbound' will
+signal an an error named `slot-unbound'.
+
+
+File: eieio.info,  Node: eieio-instance-tracker,  Next: eieio-singleton,  Prev: eieio-instance-inheritor,  Up: Base Classes
+
+12.2 `eieio-instance-tracker'
+=============================
+
+This class is in package `eieio-base'.
+
+   Sometimes it is useful to keep a master list of all instances of a
+given class.  The class `eieio-instance-tracker' performs this task.
+
+ -- Class: eieio-instance-tracker tracker-symbol
+     Enable instance tracking for this class.  The slot TRACKER-SYMBOL
+     should be initialized in inheritors of this class to a symbol
+     created with `defvar'.  This symbol will serve as the variable
+     used as a master list of all objects of the given class.
+
+ -- Method on eieio-instance-tracker: initialize-instance obj slot
+     This method is defined as an `:after' method.  It adds new
+     instances to the master list.  Do not overload this method unless
+     you use `call-next-method.'
+
+ -- Method on eieio-instance-tracker: delete-instance obj
+     Remove OBJ from the master list of instances of this class.  This
+     may let the garbage collector nab this instance.
+
+ -- eieio-instance-tracker-find: key slot list-symbol
+     This convenience function lets you find instances.  KEY is the
+     value to search for.  SLOT is the slot to compare KEY against.
+     The function `equal' is used for comparison.  The paramter
+     LIST-SYMBOL is the variable symbol which contains the list of
+     objects to be searched.
+
+
+File: eieio.info,  Node: eieio-singleton,  Next: eieio-persistent,  Prev: eieio-instance-tracker,  Up: Base Classes
+
+12.3 `eieio-singleton'
+======================
+
+This class is in package `eieio-base'.
+
+ -- Class: eieio-singleton
+     Inheriting from the singleton class will guarantee that there will
+     only ever be one instance of this class.  Multiple calls to
+     `make-instance' will always return the same object.
+
+
+File: eieio.info,  Node: eieio-persistent,  Next: eieio-named,  Prev: eieio-singleton,  Up: Base Classes
+
+12.4 `eieio-persistent'
+=======================
+
+This class is in package `eieio-base'.
+
+   If you want an object, or set of objects to be persistent, meaning
+the slot values are important to keep saved between sessions, then you
+will want your top level object to inherit from `eieio-persistent'.
+
+   To make sure your persistent object can be moved, make sure all file
+names stored to disk are made relative with
+`eieio-persistent-path-relative'.
+
+ -- Class: eieio-persistent file file-header-line
+     Enables persistence for instances of this class.  Slot FILE with
+     initarg `:file' is the file name in which this object will be
+     saved.  Class allocated slot FILE-HEADER-LINE is used with method
+     `object-write' as a header comment.
+
+   All objects can write themselves to a file, but persistent objects
+have several additional methods that aid in maintaining them.
+
+ -- Method on eieio-persistent: eieio-persistent-save obj &optional file
+     Write the object OBJ to its file.  If optional argument FILE is
+     specified, use that file name instead.
+
+ -- Method on eieio-persistent: eieio-persistent-path-relative obj file
+     Return a file name derived from FILE which is relative to the
+     stored location of OBJ.  This method should be used to convert
+     file names so that they are relative to the save file, making any
+     system of files movable from one location to another.
+
+ -- Method on eieio-persistent: object-write obj &optional comment
+     Like `object-write' for `standard-object', but will derive a
+     header line comment from the class allocated slot if one is not
+     provided.
+
+ -- Function: eieio-persistent-read filename
+     Read FILENAME which contains an `eieio-persistent' object
+     previously written with `eieio-persistent-save'.
+
+
+File: eieio.info,  Node: eieio-named,  Next: eieio-speedbar,  Prev: eieio-persistent,  Up: Base Classes
+
+12.5 `eieio-named'
+==================
+
+This class is in package `eieio-base'.
+
+ -- Class: eieio-named
+     Object with a name.  Name storage already occurs in an object.
+     This object provides get/set access to it.
+
+
+File: eieio.info,  Node: eieio-speedbar,  Prev: eieio-named,  Up: Base Classes
+
+12.6 `eieio-speedbar'
+=====================
+
+This class is in package `eieio-speedbar'.
+
+   If a series of class instances map to a tree structure, it is
+possible to cause your classes to be displayable in Speedbar. *Note
+Top: (speedbar)Top.  Inheriting from these classes will enable a
+speedbar major display mode with a minimum of effort.
+
+ -- Class: eieio-speedbar buttontype buttonface
+     Enables base speedbar display for a class.  The slot BUTTONTYPE is
+     any of the symbols allowed by the function
+     `speedbar-make-tag-line' for the EXP-BUTTON-TYPE argument *Note
+     Extending: (speedbar)Extending.  The slot BUTTONFACE is the face
+     to use for the text of the string displayed in speedbar.  The
+     slots BUTTONTYPE and BUTTONFACE are class allocated slots, and do
+     not take up space in your instances.
+
+ -- Class: eieio-speedbar-directory-button buttontype buttonface
+     This class inherits from `eieio-speedbar' and initializes
+     BUTTONTYPE and BUTTONFACE to appear as directory level lines.
+
+ -- Class: eieio-speedbar-file-button buttontype buttonface
+     This class inherits from `eieio-speedbar' and initializes
+     BUTTONTYPE and BUTTONFACE to appear as file level lines.
+
+   To use these classes, inherit from one of them in you class.  You can
+use multiple inheritance with them safely.  To customize your class for
+speedbar display, override the default values for BUTTONTYPE and
+BUTTONFACE to get the desired effects.
+
+   Useful methods to define for your new class include:
+
+ -- Method on eieio-speedbar: eieio-speedbar-derive-line-path obj depth
+     Return a string representing a directory associated with an
+     instance of OBJ.  DEPTH can be used to indice how many levels of
+     indentation have been opened by the user where OBJ is shown.
+
+ -- Method on eieio-speedbar: eieio-speedbar-description obj
+     Return a string description of OBJ.  This is shown in the
+     minibuffer or tooltip when the mouse hovers over this instance in
+     speedbar.
+
+ -- Method on eieio-speedbar: eieio-speedbar-child-description obj
+     Return a string representing a description of a child node of OBJ
+     when that child is not an object.  It is often useful to just use
+     item info helper functions such as
+     `speedbar-item-info-file-helper'.
+
+ -- Method on eieio-speedbar: eieio-speedbar-object-buttonname obj
+     Return a string which is the text displayed in speedbar for OBJ.
+
+ -- Method on eieio-speedbar: eieio-speedbar-object-children obj
+     Return a list of children of OBJ.
+
+ -- Method on eieio-speedbar: eieio-speedbar-child-make-tag-lines obj
+          depth
+     This method inserts a list of speedbar tag lines for OBJ to
+     represent its children.  Implement this method for your class if
+     your children are not objects themselves.  You still need to
+     implement `eieio-speedbar-object-children'.
+
+     In this method, use techniques specified in the Speedbar manual.
+     *Note Extending: (speedbar)Extending.
+
+   Some other functions you will need to learn to use are:
+
+ -- eieio-speedbar-create: make-map key-map menu name toplevelfn
+     Register your object display mode with speedbar.  MAKE-MAP is a
+     function which initialized you keymap.  KEY-MAP is a symbol you
+     keymap is installed into.  MENU is an easy menu vector
+     representing menu items specific to your object display.  NAME is
+     a short string to use as a name identifying you mode.  TOPLEVELFN
+     is a function called which must return a list of objects
+     representing those in the instance system you wish to browse in
+     speedbar.
+
+     Read the Extending chapter in the speedbar manual for more
+     information on how speedbar modes work *Note Extending:
+     (speedbar)Extending.
+
+
+File: eieio.info,  Node: Browsing,  Next: Class Values,  Prev: Base Classes,  Up: Top
+
+13 Browsing class trees
+***********************
+
+To browse all the currently loaded classes in emacs, simply run the
+EIEIO browser.  `M-x eieio-browse'.  This browses all the way from the
+default super-duper class eieio-default-superclass, and lists all
+children in an indented tree structure.
+
+   To browse only from a specific class, pass it in as an alternate
+parameter.
+
+   Here is a sample tree from our current example:
+
+     eieio-default-superclass
+       +--data-object
+            +--data-object-symbol
+
+   Note that we start with eieio-default-superclass.  *Note Default
+Superclass::.
+
+   Note: new classes are consed into the inheritance lists, so the tree
+comes out upside-down.
+
+
+File: eieio.info,  Node: Class Values,  Next: Documentation,  Prev: Browsing,  Up: Top
+
+14 Class Values
+***************
+
+Details about any class or object can be retrieved using the function
+`eieio-describe-class' function.  Interactively, type in the name of a
+class.  In a program, pass it a string with the name of a class, a
+class symbol, or an object.  The resulting buffer will display all slot
+names.
+
+   Additionally, all methods defined to have functionality on this
+class is displayed.
+
+
+File: eieio.info,  Node: Documentation,  Next: Default Superclass,  Prev: Class Values,  Up: Top
+
+15 Documentation
+****************
+
+It is possible to automatically create documentation for your classes in
+texinfo format by using the tools in the file `eieio-doc.el'
+
+ -- Command: eieiodoc-class class indexstring &optional skiplist
+     This will start at the current point, and created an indented menu
+     of all the child classes of, and including CLASS, but skipping any
+     classes that might be in SKIPLIST It will then create nodes for
+     all these classes, subsection headings, and indexes.
+
+     Each class will be indexed using the texinfo labeled index
+     INDEXSTRING which is a two letter description.  *Note (texinfo)
+     New Indices::.
+
+     To use this command, the texinfo macro
+
+          @defindex @var { indexstring }
+
+     where INDEXSTRING is replaced with the two letter code.
+
+     Next, an inheritance tree will be created listing all parents of
+     that section's class.
+
+     Then,all the slots will be expanded in tables, and described using
+     the documentation strings from the code.  Default values will also
+     be displayed.  Only those slots with `:initarg' specified will be
+     expanded, others will be hidden.  If a slot is inherited from a
+     parent, that slot will also be skipped unless the default value is
+     different.  If there is a change, then the documentation part of
+     the slot will be replace with an @xref back to the parent.
+
+     This command can only display documentation for classes whose
+     definitions have been loaded in this Emacs session.
+
+
+
+File: eieio.info,  Node: Default Superclass,  Next: Signals,  Prev: Documentation,  Up: Top
+
+16 Default Superclass
+*********************
+
+All defined classes, if created with no specified parent class) will
+inherit from a special class stored in `eieio-default-superclass'.
+This superclass is quite simple, but with it, certain default methods
+or attributes can be added to all objects.  In CLOS, this would be
+named `STANDARD-CLASS', and that symbol is an alias to
+`eieio-default-superclass'.
+
+   Currently, the default superclass is defined as follows:
+
+     (defclass eieio-default-superclass nil
+       nil
+       "Default parent class for classes with no specified parent class.
+     Its slots are automatically adopted by classes with no specified
+     parents.  This class is not stored in the `parent' slot of a class vector."
+       :abstract t)
+
+   The default superclass implements several methods providing a default
+behavior for all objects created by EIEIO.
+
+* Menu:
+
+* Initialization::      How objects are initialized
+* Basic Methods::       Clone, print, and write
+* Signal Handling::     Methods for managing signals.
+
+
+File: eieio.info,  Node: Initialization,  Next: Basic Methods,  Up: Default Superclass
+
+16.1 Initialization
+===================
+
+When creating an object of any type, you can use its constructor, or
+`make-instance'.  This, in turns calls the method
+`initialize-instance', which then calls the method `shared-initialize'.
+
+   These methods are all implemented on the default superclass so you do
+not need to write them yourself, unless you need to override one of
+their behaviors.
+
+   Users should not need to call `initialize-instance' or
+`shared-initialize', as these are used by `make-instance' to initialize
+the object.  They are instead provided so that users can augment these
+behaviors.
+
+ -- Function: initialize-instance obj &rest slots
+     Initialize OBJ.  Sets slots of OBJ with SLOTS which is a list of
+     name/value pairs.  These are actually just passed to
+     `shared-initialize'.
+
+ -- Function: shared-initialize obj &rest slots
+     Sets slots of OBJ with SLOTS which is a list of name/value pairs.
+
+     This is called from the default `constructor'.
+
+
+File: eieio.info,  Node: Basic Methods,  Next: Signal Handling,  Prev: Initialization,  Up: Default Superclass
+
+16.2 Basic Methods
+==================
+
+Additional useful methods defined on the base sublcass are:
+
+ -- Function: clone obj &rest params
+     Make a copy of OBJ, and then apply PARAMS.  PARAMS is a parameter
+     list of the same form as INITIALIZE-INSTANCE which are applied to
+     change the object.  When overloading "clone", be sure to call
+     "call-next-method" first and modify the returned object.
+
+ -- Function: object-print this &rest strings
+     Pretty printer for object THIS.  Call function "object-name" with
+     STRINGS.  The default method for printing object THIS is to use the
+     function "object-name".
+
+     It is sometimes useful to put a summary of the object into the
+     default #<notation> string when using eieio browsing tools.
+
+     Implement this function and specify STRINGS in a call to
+     "call-next-method" to provide additional summary information.
+     When passing in extra strings from child classes, always remember
+     to prepend a space.
+
+          (defclass data-object ()
+             (value)
+             "Object containing one data slot.")
+
+          (defmethod object-print ((this data-object) &optional strings)
+            "Return a string with a summary of the data object as part of the name."
+            (apply 'call-next-method this
+                   (cons (format " value: %s" (render this)) strings)))
+
+     here is what some output could look like:
+          (object-print test-object)
+             => #<data-object test-object value: 3>
+
+ -- Function: object-write obj &optional comment
+     Write OBJ onto a stream in a readable fashion.  The resulting
+     output will be Lisp code which can be used with `read' and `eval'
+     to recover the object.  Only slots with `:initarg's are written to
+     the stream.
+
+
+File: eieio.info,  Node: Signal Handling,  Prev: Basic Methods,  Up: Default Superclass
+
+16.3 Signal Handling
+====================
+
+The default superclass defines methods for managing error conditions.
+These methods all throw a signal for a particular error condition.
+
+   By implementing one of these methods for a class, you can change the
+behavior that occurs during one of these error cases, or even ignore
+the error by providing some behavior.
+
+ -- Function: slot-missing ab &rest foo
+     Method invoked when an attempt to access a slot in OBJECT fails.
+     SLOT-NAME is the name of the failed slot, OPERATION is the type of
+     access that was requested, and optional NEW-VALUE is the value
+     that was desired to be set.
+
+     This method is called from `oref', `oset', and other functions
+     which directly reference slots in EIEIO objects.
+
+     The default method signals an error of type `invalid-slot-name'.
+     *Note Signals::.
+
+     You may override this behavior, but it is not expected to return
+     in the current implementation.
+
+     This function takes arguments in a different order than in CLOS.
+
+ -- Function: slot-unbound object class slot-name fn
+     Slot unbound is invoked during an attempt to reference an unbound
+     slot.  OBJECT is the instance of the object being reference.
+     CLASS is the class of OBJECT, and SLOT-NAME is the offending slot.
+     This function throws the signal `unbound-slot'.  You can overload
+     this function and return the value to use in place of the unbound
+     value.  Argument FN is the function signaling this error.  Use
+     "slot-boundp" to determine if a slot is bound or not.
+
+     In CLOS, the argument list is (CLASS OBJECT SLOT-NAME), but EIEIO
+     can only dispatch on the first argument, so the first two are
+     swapped.
+
+ -- Function: no-applicable-method object method &rest args
+     Called if there are no implementations for OBJECT in METHOD.
+     OBJECT is the object which has no method implementation.  ARGS are
+     the arguments that were passed to METHOD.
+
+     Implement this for a class to block this signal.  The return value
+     becomes the return value of the original method call.
+
+ -- Function: no-next-method object &rest args
+     Called from "call-next-method" when no additional methods are
+     available.  OBJECT is othe object being called on
+     "call-next-method".  ARGS are the  arguments it is called by.
+     This method signals "no-next-method" by default.  Override this
+     method to not throw an error, and its return value becomes the
+     return value of "call-next-method".
+
+
+File: eieio.info,  Node: Signals,  Next: Naming Conventions,  Prev: Default Superclass,  Up: Top
+
+17 Signals
+**********
+
+There are new condition names (signals) that can be caught when using
+EIEIO.
+
+ -- Signal: invalid-slot-name obj-or-class slot
+     This signal is called when an attempt to reference a slot in an
+     OBJ-OR-CLASS is made, and the SLOT is not defined for it.
+
+ -- Signal: no-method-definition method arguments
+     This signal is called when METHOD is called, with ARGUMENTS and
+     nothing is resolved.  This occurs when METHOD has been defined,
+     but the arguments make it impossible for EIEIO to determine which
+     method body to run.
+
+     To prevent this signal from occurring in your class, implement the
+     method `no-applicable-method' for your class.  This method is
+     called when to throw this signal, so implementing this for your
+     class allows you block the signal, and perform some work.
+
+ -- Signal: no-next-method class arguments
+     This signal is called if the function `call-next-method' is called
+     and there is no next method to be called.
+
+     Overload the method `no-next-method' to protect against this
+     signal.
+
+ -- Signal: invalid-slot-type slot spec value
+     This signal is called when an attempt to set SLOT is made, and
+     VALUE doesn't match the specified type SPEC.
+
+     In EIEIO, this is also used if a slot specifier has an invalid
+     value during a `defclass'.
+
+ -- Signal: unbound-slot object class slot
+     This signal is called when an attempt to reference SLOT in OBJECT
+     is made, and that instance is currently unbound.
+
+
+File: eieio.info,  Node: Naming Conventions,  Next: CLOS compatibility,  Prev: Signals,  Up: Top
+
+18 Naming Conventions
+*********************
+
+The Emacs Lisp programming manual has a great chapter programming
+conventions that help keep each Emacs package working nicely with the
+entire system.  *Note (elisp)Standards:: An EIEIO based program needs to
+follow these conventions, while simultaneously taking advantage of the
+Object Oriented features.
+
+   Here is how the Emacs Lisp naming conventions (*note
+(elisp)Standards::) apply to EIEIO:
+
+   * Come up with a package prefix that is relatively short.  Prefix
+     all classes, and methods with your prefix.  This is a standard
+     convention for functions and variables in Emacs.
+
+   * Do not prefix method names with the class name.  All methods in
+     EIEIO are "virtual", and are dynamically dispatched.  Anyone can
+     override your methods at any time.  Your methods should be prefixed
+     with your package name.
+
+   * Do not prefix slots in your class.  The slots are always locally
+     scoped to your class, and need no prefixing.
+
+   * If your library inherits from other libraries of classes, you must
+     "require" that library with the `require' command.
+
+
+
+File: eieio.info,  Node: CLOS compatibility,  Next: Wish List,  Prev: Naming Conventions,  Up: Top
+
+19 CLOS compatibility
+*********************
+
+As you read this, it is important to know that I have just recently
+learned some of the CLOS syntax, but have never used it myself outside
+of the EIEIO framework.  I'm primarily and Emacs Lisp hacker who wrote
+EIEIO to help myself learn some of the mechanics of Object Oriented
+programming.
+
+   Currently, the following functions should behave almost as expected
+from CLOS.
+
+`defclass'
+     All slot keywords are available but not all work correctly.  Slot
+     keyword differences are:
+
+    :reader, and :writer tags
+          Create methods that signal errors instead of creating an
+          unqualified method.  You can still create new ones to do its
+          business.
+
+    :accessor
+          This should create an unqualified method to access a slot, but
+          instead pre-builds a method that gets the slot's value.
+
+    :type
+          Specifier uses the `typep' function from the `cl' package.
+          *Note (cl)Type Predicates::. It therefore has the same issues
+          as that package.  Extensions include the ability to provide
+          object names.
+
+     Defclass also supports class options, but does not currently use
+     values of `:metaclass', and `:default-initargs'.
+
+`make-instance'
+     Make instance works as expected, however it just uses the EIEIO
+     instance creator automatically generated when a new class is
+     created.  *Note Making New Objects::.
+
+`defgeneric'
+     Creates the desired symbol, and accepts all of the expected
+     arguments except `:around'.
+
+`defmethod'
+     Calls defgeneric, and accepts most of the expected arguments.  Only
+     the first argument to the created method may have a type specifier.
+     To type cast against a class, the class must exist before
+     defmethod is called. In addition, the `:around' tag is not
+     supported.
+
+`call-next-method'
+     Inside a method, calls the next available method up the
+     inheritance tree for the given object.  This is different than
+     that found in CLOS because in EIEIO this function accepts
+     replacement arguments.  This permits subclasses to modify
+     arguments as they are passed up the tree.  If no arguments are
+     given, the expected CLOS behavior is used.
+
+`setf'
+     If the common-lisp subsystem is loaded, the setf parameters are
+     also loaded so the form `(setf (slot-value object slot) t)' should
+     work.
+
+   CLOS supports the `describe' command, but EIEIO only provides
+`eieio-describe-class', and `eieio-describe-generic'.  These functions
+are adviced into `describe-variable', and `describe-function'.
+
+   When creating a new class (*note Building Classes::) there are
+several new keywords supported by EIEIO.
+
+   In EIEIO tags are in lower case, not mixed case.
+
+
+File: eieio.info,  Node: Wish List,  Next: Function Index,  Prev: CLOS compatibility,  Up: Top
+
+20 Wish List
+************
+
+EIEIO is an incomplete implementation of CLOS.  Finding ways to improve
+the compatability would help make CLOS style programs run better in
+Emacs.
+
+   Some important compatability features that would be good to add are:
+
+  1. `:around' method key.
+
+  2. Method dispatch for built-in types.
+
+  3. Method dispatch for multiple argument typing.
+
+  4. Improve integration with the `cl' package.
+
+   There are also improvements to be made to allow EIEIO to operate
+better in the Emacs environment.
+
+  1. Allow subclasing of Emacs built-in types, such as faces, markers,
+     and buffers.
+
+  2. Allow method overloading of method-like functions in Emacs.
+
+
+File: eieio.info,  Node: Function Index,  Prev: Wish List,  Up: Top
+
+Function Index
+**************
+
+[index]
+* Menu:
+
+* call-next-method:                      Methods.              (line 86)
+* child-of-class-p:                      Predicates.           (line 94)
+* class-children:                        Predicates.           (line 77)
+* class-children-fast:                   Predicates.           (line 80)
+* class-constructor:                     Predicates.           (line 39)
+* class-name:                            Predicates.           (line 27)
+* CLASS-NAME-child-p:                    Building Classes.     (line 44)
+* CLASS-NAME-p:                          Building Classes.     (line 41)
+* class-of:                              Predicates.           (line 56)
+* class-option:                          Predicates.           (line 32)
+* class-p:                               Predicates.           (line 16)
+* class-parent:                          Predicates.           (line 74)
+* class-parents:                         Predicates.           (line 66)
+* class-parents-fast:                    Predicates.           (line 70)
+* class-slot-initarg:                    Introspection.        (line 16)
+* clone:                                 Basic Methods.        (line  9)
+* defclass:                              Building Classes.     (line 13)
+* defgeneric:                            Generics.             (line 11)
+* defmethod:                             Methods.              (line 16)
+* delete-instance on eieio-instance-tracker: eieio-instance-tracker.
+                                                               (line 23)
+* eieio-build-class-alist:               Association Lists.    (line 24)
+* eieio-custom-widget-insert:            Customizing.          (line 22)
+* eieio-customize-object:                Customizing.          (line 15)
+* eieio-persistent-path-relative on eieio-persistent: eieio-persistent.
+                                                               (line 30)
+* eieio-persistent-read:                 eieio-persistent.     (line 41)
+* eieio-persistent-save on eieio-persistent: eieio-persistent. (line 26)
+* eieio-speedbar-child-description on eieio-speedbar: eieio-speedbar.
+                                                               (line 48)
+* eieio-speedbar-child-make-tag-lines on eieio-speedbar: eieio-speedbar.
+                                                               (line 61)
+* eieio-speedbar-derive-line-path on eieio-speedbar: eieio-speedbar.
+                                                               (line 38)
+* eieio-speedbar-description on eieio-speedbar: eieio-speedbar.
+                                                               (line 43)
+* eieio-speedbar-object-buttonname on eieio-speedbar: eieio-speedbar.
+                                                               (line 54)
+* eieio-speedbar-object-children on eieio-speedbar: eieio-speedbar.
+                                                               (line 57)
+* eieiodoc-class:                        Documentation.        (line 10)
+* find-class:                            Predicates.           (line 11)
+* generic-p:                             Predicates.           (line 97)
+* initialize-instance:                   Initialization.       (line 20)
+* initialize-instance on eieio-instance-tracker: eieio-instance-tracker.
+                                                               (line 18)
+* invalid-slot-name:                     Signals.              (line 10)
+* invalid-slot-type:                     Signals.              (line 32)
+* key:                                   eieio-instance-tracker.
+                                                               (line 27)
+* make-instance:                         Making New Objects.   (line 37)
+* make-map:                              eieio-speedbar.       (line 72)
+* next-method-p:                         Methods.              (line 97)
+* no-applicable-method:                  Signal Handling.      (line 44)
+* no-method-definition:                  Signals.              (line 14)
+* no-next-method <1>:                    Signals.              (line 25)
+* no-next-method:                        Signal Handling.      (line 52)
+* object-add-to-list:                    Accessing Slots.      (line 60)
+* object-assoc:                          Association Lists.    (line 11)
+* object-assoc-list:                     Association Lists.    (line 18)
+* object-class:                          Predicates.           (line 53)
+* object-class-fast:                     Predicates.           (line 59)
+* object-class-name:                     Predicates.           (line 63)
+* object-name:                           Predicates.           (line 45)
+* object-of-class-p:                     Predicates.           (line 90)
+* object-print:                          Basic Methods.        (line 15)
+* object-remove-from-list:               Accessing Slots.      (line 67)
+* object-slots:                          Introspection.        (line 13)
+* object-write:                          Basic Methods.        (line 41)
+* object-write on eieio-persistent:      eieio-persistent.     (line 36)
+* oref:                                  Accessing Slots.      (line 32)
+* oref-default:                          Accessing Slots.      (line 37)
+* oset:                                  Accessing Slots.      (line 12)
+* oset-default:                          Accessing Slots.      (line 16)
+* record:                                Making New Objects.   (line 16)
+* same-class-fast-p:                     Predicates.           (line 86)
+* same-class-p:                          Predicates.           (line 83)
+* set-slot-value:                        Accessing Slots.      (line 50)
+* shared-initialize:                     Initialization.       (line 25)
+* slot-boundp:                           Predicates.           (line 22)
+* slot-exists-p:                         Predicates.           (line 19)
+* slot-makeunbound:                      Accessing Slots.      (line 56)
+* slot-missing:                          Signal Handling.      (line 14)
+* slot-unbound:                          Signal Handling.      (line 31)
+* slot-value:                            Accessing Slots.      (line 46)
+* unbound-slot:                          Signals.              (line 39)
+* with-slots:                            Accessing Slots.      (line 72)
+
+
+
+Tag Table:
+Node: Top855
+Node: Quick Start2568
+Node: Introduction5784
+Node: Building Classes7641
+Node: Inheritance10026
+Node: Slot Options12326
+Node: Class Options18488
+Node: Making New Objects20974
+Ref: make-instance22398
+Node: Accessing Slots23070
+Ref: oref24294
+Ref: oref-default24507
+Ref: slot-value24927
+Ref: set-slot-value25092
+Ref: object-add-to-list25549
+Ref: object-remove-from-list25941
+Ref: with-slots26190
+Node: Writing Methods27176
+Node: Generics27920
+Node: Methods29168
+Ref: call-next-method32155
+Ref: next-method-p32590
+Node: Static Methods32929
+Node: Method Invocation33593
+Node: Predicates33749
+Ref: find-class34150
+Ref: class-p34356
+Ref: slot-exists-p34476
+Ref: slot-boundp34559
+Node: Association Lists37481
+Ref: object-assoc37839
+Node: Customizing38808
+Node: Introspection41255
+Node: Base Classes41932
+Node: eieio-instance-inheritor42668
+Node: eieio-instance-tracker43935
+Node: eieio-singleton45392
+Node: eieio-persistent45820
+Node: eieio-named47717
+Node: eieio-speedbar48043
+Node: Browsing51876
+Node: Class Values52658
+Node: Documentation53157
+Node: Default Superclass54782
+Node: Initialization55921
+Node: Basic Methods56994
+Ref: clone57245
+Ref: object-print57563
+Node: Signal Handling58890
+Ref: slot-missing59382
+Ref: slot-unbound60073
+Ref: no-applicable-method60765
+Ref: no-next-method61130
+Node: Signals61498
+Node: Naming Conventions63115
+Node: CLOS compatibility64345
+Node: Wish List67215
+Node: Function Index67990
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/eieio/eieio.texi b/site/cedet-1.0pre7/eieio/eieio.texi
new file mode 100755
index 0000000..f37d78f
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/eieio.texi
@@ -0,0 +1,1988 @@
+
+\input texinfo   @c -*-texinfo-*-
+@c
+@c $Id: eieio.texi,v 1.63 2010/01/07 02:19:54 zappo Exp $
+@c
+
+@c
+@c THIS MANUAL NEEDS WORK:
+@c
+@c See the comments at the end of this document.
+@c they need to be integrated into the text of this manual.
+@c
+@setfilename eieio.info
+@set TITLE Enhanced Implementation of Emacs Interpreted Objects
+@set AUTHOR Eric M. Ludlam
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@copying
+This manual documents CEDET, a collection of other tools.
+
+Copyright @copyright{} 2007, 2008, 2009 Eric M. Ludlam
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* eieio: (eieio).       Objects for Emacs
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@ifinfo
+This file documents EIEIO.
+@emph{@value{TITLE}}
+
+Copyright @copyright{} 2007 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1995,1996,1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@macro eieio{}
+@i{EIEIO}
+@end macro
+
+@node Top
+@comment  node-name,  next,  previous,  up
+@top @value{TITLE}
+
+@eieio{} is a framework for writing object oriented applications in emacs
+Lisp, and is a result of my taking various object oriented classes at
+work and my attempt to understand some of it better by implementing it.
+The real reason I started @eieio{} is because someone in one of my classes
+said "I bet emacs can't do that!".  Well then, I just had to prove them
+wrong!
+
+@menu
+* Quick Start::           A Quick start for .
+* Introduction::          Why use @eieio{}?  Basic overview, samples list.
+* Building Classes::      How to write new class structures.
+* Making New Objects::    How to construct new objects.
+* Accessing Slots::       How to access a slot.
+* Writing Methods::       How to write a method.
+* Method Invocation::     How methods are invoked.
+* Predicates::            Class-p, Object-p, etc-p.
+* Association Lists::     List of objects as association lists.
+* Customizing::           Customizing objects.
+* Introspection::         Looking inside a class.
+* Base Classes::          Additional classes you can inherit from.
+* Browsing::              Browsing your class lists.
+* Class Values::          Displaying information about a class or object.
+* Documentation::         Automatically creating texinfo documentation
+* Default Superclass::    The root superclasses.
+* Signals::               When you make errors
+* Naming Conventions::    Name your objects in an Emacs friendly way.
+* CLOS compatibility::    What are the differences?
+* Wish List::             Things about EIEIO that could be improved.
+* Function Index::
+@end menu
+
+@node Quick Start
+@chapter Quick Start
+
+@eieio{} provides an Object Oriented layer for Emacs Lisp.  You can
+use @eieio{} to create classes, methods for those classes, and
+instances of classes.
+
+To start, create a class:
+
+@example
+(defclass record () ; No superclasses
+  ((name :initarg :name
+         :initform ""
+         :type string
+         :custom string
+         :documentation "The name of a person.")
+   (birthday :initarg :birthday
+             :initform "Jan 1, 1970"
+             :custom string
+             :type string
+             :documentation "The person's birthday.")
+   (phone :initarg :phone
+          :initform ""
+          :documentation "Phone number."))
+  "A single record for tracking people I know.")
+@end example
+
+In this example, the class @code{record} is declared with three slots,
+which are @code{name}, @code{birthday}, and @code{phone}.
+
+You can create methods against your classes.  A simple method may look
+like this:
+
+@example
+(defmethod call-record ((rec record) &optional scriptname)
+  "Dial the phone for the record REC.
+Execute the program SCRIPTNAME as to dial the phone."
+  (message "Dialing the phone for %s"  (oref rec name))
+  (shell-command (concat (or scriptname "dialphone.sh")
+                         " "
+                         (oref rec phone))))
+@end example
+
+In this example, the first argument to @code{call-record} is a list.
+The list is of the form (@var{varname} @var{classname}).
+
+@var{varname} is the name of the variable used for the first argument.
+@var{classname} is the name of the class that is expected as the first
+argument for this method.
+
+@eieio{} dispatches methods based on the type of the first argument.
+You can have multiple methods with the same name for different classes
+of object.  When the @code{call-record} method is called, the first
+argument is examined to determine the class of that argument, and the
+method matching the input type is then executed.
+
+Once the behavior of a class is defined, you can create a new
+object of type @code{record}.  Objects are created by calling the
+constructor.  The constructor is a function with the same name as your
+class which returns a new instance of that class. It might look like
+this:
+
+@example
+(setq rec (record "Eric" :name "Eric" :birthday "June" :phone "555-5555"))
+@end example
+
+The first argument is the name given to this instance.  Each instance
+is given a name so different instances can be easily distinguished
+during debugging.
+
+It can be a bit repetitive to also have a :name slot.  A handy
+baseclass to use in this case is @code{eieio-named}.
+@ref{eieio-named}.
+
+Calling methods on an object is a lot like calling any function.  The
+first argument should be an object of a class which has had this
+method defined for it.  In this example it would look like this:
+
+@example
+(call-record rec)
+@end example
+
+or
+
+@example
+(call-record rec "my-call-script")
+@end example
+
+In these examples, the method @code{call-record} is called.  @eieio{}
+examines the class of @code{rec} and method defined above will be
+called.  If @code{rec} is some other class, or a number, or other
+datatype, then it will signal
+@code{no-method-definition}. @ref{Signals}.
+
+@node Introduction
+@comment  node-name,  next,  previous,  up
+@chapter Introduction
+
+
+  @eieio{} is a CLOS (Common Lisp Object System) compatibility layer.  Due
+to restrictions in the Emacs Lisp language, CLOS cannot be completely
+supported, and a few functions have been added in place of setf.
+
+@section What @eieio{} supports
+
+@enumerate
+@item
+A structured framework for the creation of basic classes with attributes
+and methods using singular inheritance similar to CLOS.
+@item
+Type checking, and slot unbinding.
+@item
+Method definitions similar to CLOS.
+@item
+Simple and complex class browsers.
+@item
+Edebug support for methods.
+@item
+Imenu updates.
+@item
+Byte compilation support of methods.
+@item
+Help system extensions for classes and methods.
+@item
+Automatic texinfo documentation generator.
+@item
+Several base classes for interesting tasks.
+@item
+Simple test suite.
+@item
+Public and private classifications for slots (extensions to CLOS)
+@item
+Customization support in a class (extension to CLOS)
+@end enumerate
+
+@section Issues using @eieio{}
+
+@table @asis
+@item Complete @code{defclass} tag support
+All CLOS tags are currently supported, but the following are not
+currently implemented correctly:
+
+@table @code
+@item :metaclass
+There is only one base superclass for all @eieio{} classes, which is
+the @code{eieio-default-superclass}.
+@item :default-initargs
+Each slot has an @code{:initarg} tag, so this is not really necessary.
+@end table
+
+@item Mock object initializers
+Each class contains a mock object used for fast initialization of
+instantiated objects.  Using functions with side effects on object slot
+values can potentially cause modifications in the mock object.  @eieio{}
+should use a deep copy but currently does not.
+
+@item @code{:around} method tag
+This CLOS method tag is non-functional.
+
+@end table
+
+@node Building Classes
+@comment  node-name,  next,  previous,  up
+@chapter Building Classes
+
+A class is a definition for organizing data and methods together.  In
+@eieio{} a class has similar structure to that found in other OO
+languages.
+
+Create a new class @code{defclass}.
+
+@defun defclass class-name superclass-list slot-list options-or-doc
+
+This function is specified by CLOS, and @eieio{} conforms in structure.
+
+Creates a new class called @var{class-name}.  In Emacs, the class is
+represented as a self-referential symbol with the name
+@var{class-name}.  The structure of the class is stored on the
+@var{class-name} symbol as a property.
+
+The @var{class-name} symbol's variable documentation string is a
+modified version of the doc string found in @var{options-or-doc}.
+Each time a method is defined the symbol's documentation string is
+updated to include the methods documentation as well.
+
+The parent classes for @var{class-name} is @var{superclass-list}.
+Each element of @var{superclass-list} must be a class.  These classes
+are the parents of the class being created.  Every slot that appears
+in each parent class is replicated in the new class.
+
+  If two parents share the same slot name, the parent which appears in
+the @var{superclass-list} first sets the tags for that slot.  If
+a slot in the new class' slot list matches a parent, then the new
+specifications for the child class override that of the parent.
+
+Whenever defclass is used to create a new class, two predicates are
+created for it.  The predicate names are @code{@var{CLASS-NAME}-p} and
+@code{@var{CLASS-NAME}-child-p}
+
+@defun CLASS-NAME-p object
+Return @code{t} if @var{OBJECT} is of the class @var{CLASS-NAME}.
+@end defun
+
+@defun CLASS-NAME-child-p object
+Return @code{t} if @var{OBJECT} is of the class @var{CLASS-NAME},
+or is of a subclass of @var{CLASS-NAME}.
+@end defun
+
+@end defun
+
+
+@defvar eieio-error-unsupported-class-tags
+If Non-nil, then @code{defclass} will signal an error if a tag
+in a slot specifier is unsupported.
+
+This option is here to support programs written with older versions of
+@eieio{} when such errors were not produced.
+@end defvar
+
+@menu
+* Inheritance::         How to specify parents classes
+* Slot Options::	How to specify features of a slot.
+* Class Options::	How to specify features for this class.
+@end menu
+
+@node Inheritance
+@section Inheritance
+
+A basic feature of an object oriented language is inheritance.  In
+@eieio{}, a defined class specifies the super classes it inherites
+from with the second argument to defclass.
+
+For example, a parent class might be:
+
+@example
+(defclass my-baseclass ()
+   ((slot-A :initarg :slot-A)
+    (slot-B :initarg :slot-B))
+  "My Baseclass.")
+@end example
+
+To subclass from @code{my-baseclass}, you would specify it in the
+superclass list.
+
+@example
+(defclass my-subclass (my-baseclass)
+   ((specific-slot-A :initarg specific-slot-A)
+    )
+   "My subclass of my-baseclass")
+@end example
+
+Instances of @code{my-subclass} will inherit @code{slot-A} and
+@code{slot-B}, in addition to having @code{specific-slot-A} from the
+declaration of @code{my-subclass}.
+
+@eieio{} also supports multiple inheritance.  If there was a second
+baseclass, or perhaps an interface style class, it could be declared
+like this:
+
+@example
+(defclass my-interface ()
+   ((interface-slot :initarg :interface-slot))
+   "An interface to special behavior."
+   :abstract t)
+@end example
+
+The interface class defines a special @code{interface-slot}, and also
+specifies itself as abstract.  Abstract classes cannot be
+instantiated.  It is not required to make interfaces abstract, but it
+is a good idea.
+
+To use a baseclass, and the interface, the subclass declaration would
+now look like this:
+
+@example
+(defclass my-subclass (my-baseclass my-interface)
+   ((specific-slot-A :initarg specific-slot-A)
+    )
+   "My subclass of my-baseclass")
+@end example
+
+Now @code{my-subclass} has also has @code{interface-slot}.
+
+If @code{my-baseclass} and @code{my-interface} had slots with the same
+name, then the superclass showing up in the list first will define the
+slot attributes.
+
+Inheritance in @eieio{} is more than just combining different slots.
+It is also important in method invocation.  @ref{Methods}.
+
+If a method is called on an instance of @code{my-subclass}, and that
+method only has an implementation on @code{my-baseclass}, or perhaps
+@code{my-interface}, then the implementation for the baseclass is
+called.
+
+If there is a method implementation for @code{my-subclass}, and
+another in @code{my-baseclass}, the implementation for
+@code{my-subclass} can call up to the superclass as well.
+
+@node Slot Options
+@section Slot Options
+
+@var{slot-list} is a list of elements where each element defines one slot.
+Each slot is a list of the form:
+
+@example
+  (SLOT-NAME :TAG1 ATTRIB-VALUE1
+             :TAG2 ATTRIB-VALUE2
+             :TAGN ATTRIB-VALUEN)
+@end example
+
+where @var{SLOT-NAME} is a symbol that will be used to refer to the
+slot.  @var{:TAG} is a symbol that describes a feature to be set
+on the slot.  @var{ATTRIB-VALUE} is a lisp expression that will be
+used for @var{:TAG}.
+
+Valid tags are:
+
+@table @code
+@item :initarg
+The @code{:initarg} specifier gives this slot a name that can be used
+in the argument list of the constructor to specify a value for the new
+instance being created.
+
+A good symbol to use for initarg is one that starts with a colon @code{:}.
+
+The slot specified like this:
+@example
+  (myslot :initarg :myslot)
+@end example
+could then be initialized to the number 1 like this:
+@example
+  (myobject "name" :myslot 1)
+@end example
+
+@xref{Making New Objects}.
+
+@item :initform
+A expression used as the default value for this slot.
+
+If @code{:initform} is left out, that slot defaults to being unbound.
+It is an error to reference an unbound slot, so if you need
+slots to always be in a bound state, you should always use an
+@code{:initform} specifier.
+
+Use @code{slot-boundp} to test if a slot is unbound @ref{Predicates}.
+Use @code{slot-makeunbound} to set a slot to being unbound after
+giving it a value @ref{Accessing Slots}.
+
+The value passed to initform is automatically quoted.  Thus,
+@example
+:initform (1 2 3)
+@end example
+appears as the specified list in the default object.
+A symbol that is a function like this:
+@example
+:initform +
+@end example
+will set the initial value as that symbol.
+A function that is a lambda expression, like this:
+@example
+:initform (lambda () some-variablename)
+@end example
+
+will be evaluated at instantiation time to the value of
+@code{some-variablename}.
+@c This feature was more annoying than useful.  Use the
+@c `initialize-instance' function to do this.
+@c
+@c On the other hand, if you need code to be
+@c executed at instantiation time as the initform, code like this:
+@c @example
+@c :initform (lambda () (+ 1 some-global-var))
+@c @end example
+@c will be identified as a function call, and be executed in place.
+
+@cindex lambda-default
+
+
+Lastly, using the function @code{lambda-default} instead of
+@code{lambda} will let you specify a lambda expression to use as the
+value, without evaluation, thus:
+@example
+:initform (lambda-default () some-variablename)
+@end example
+@@TODO - This will be deleted after fair warning.
+
+will not be evaluated at instantiation time, and the value in this
+slot will instead be @code{(lambda () some-variablename)}.
+
+After a class has been created with @code{defclass}, you can change
+that default value with @code{oset-default}. @ref{Accessing Slots}.
+
+@item :type
+An unquoted type specifier used to validate data set into this slot.
+@xref{(cl)Type Predicates}.
+Here are some examples:
+ @table @code
+ @item symbol
+ A symbol.
+ @item number
+ A number type
+ @item my-class-name
+ An object of your class type.
+ @item (or null symbol)
+ A symbol, or nil.
+ @item function
+ A function symbol, or a @code{lambda-default} expression.
+
+ @end table
+
+@item :allocation
+Either :class or :instance (defaults to :instance) used to
+specify how data is stored.  Slots stored per instance have unique
+values for each object.  Slots stored per class have shared values for
+each object.  If one object changes a :class allocated slot, then all
+objects for that class gain the new value.
+
+@item :documentation
+Documentation detailing the use of this slot.  This documentation is
+exposed when the user describes a class, and during customization of an
+object.
+
+@item :accessor
+Name of a generic function which can be used to fetch the value of this slot.
+You can call this function later on your object and retrieve the value
+of the slot.
+
+This options is in the CLOS spec, but is not fully compliant in @eieio{}.
+
+@item :writer
+Name of a generic function which will write this slot.
+
+This options is in the CLOS spec, but is not fully compliant in @eieio{}.
+
+@item :reader
+Name of a generic function which will read this slot.
+
+This options is in the CLOS spec, but is not fully compliant in @eieio{}.
+
+@item :custom
+A custom :type specifier used when editing an object of this type.
+See documentation for @code{defcustom} for details.  This specifier is
+equivalent to the :type spec of a @code{defcustom} call.
+
+This options is specific to Emacs, and is not in the CLOS spec.
+
+@item :label
+When customizing an object, the value of :label will be used instead
+of the slot name.  This enables better descriptions of the data than
+would usually be afforded.
+
+This options is specific to Emacs, and is not in the CLOS spec.
+
+@item :group
+Similar to @code{defcustom}'s :group command, this organizes different
+slots in an object into groups.  When customizing an object, only the
+slots belonging to a specific group need be worked with, simplifying the
+size of the display.
+
+This options is specific to Emacs, and is not in the CLOS spec.
+
+@item :printer
+This routine takes a symbol which is a function name.  The function
+should accept one argument.  The a rgument is the value from the slot
+to be printed.  The function in @code{object-write} will write the
+slot value out to a printable form on @code{standard-output}.
+
+The output format MUST be  something that could in turn be interpreted
+with @code{read} such that the object can be brought back in from the
+output stream.  Thus, if you wanted to output a symbol, you would need
+to quote the symbol.  If you wanted to run a function on load, you
+can output the code to do the construction of the value.
+
+@item :protection
+When using a slot referencing function such as @code{slot-value}, and
+the value behind @var{slot} is private or protected, then the current
+scope of operation must be within a method of the calling object.
+
+Valid values are:
+
+@table @code
+@item :public
+Access this slot from any scope.
+@item :protected
+Access this slot only from methods of the same class or a child class.
+@item :private
+Access this slot only from methods of the same class.
+@end table
+
+This options is specific to Emacs, and is not in the CLOS spec.
+
+@end table
+
+@node Class Options
+@section Class Options
+A Class can have class options.  @eieio{} supports these class options.
+
+@table @code
+@item :documentation
+Doc string to use for this class.
+
+If an Emacs style documentation string is also provided, then this
+option is ignored.  An Emacs style documentation string is not
+prefixed by the @code{:documentation} tag, and appears after the list
+of slots, and before the options.
+
+@item :allow-nil-initform
+If this option is non-nil, and the @code{:initform} is @code{nil}, but
+the @code{:type} is specifies something such as @code{string} then allow
+this to pass.  The default is to have this option be off.  This is
+implemented as an alternative to unbound slots.
+
+This options is specific to Emacs, and is not in the CLOS spec.
+
+@item :abstract
+A class which is @code{:abstract} cannot be instantiated, and instead
+is used to define an interface which subclasses should implement.
+
+This option is specific to Emacs, and is not in the CLOS spec.
+
+@item :custom-groups
+This is a list of groups that can be customized within this class.  This
+slot is auto-generated when a class is created and need not be
+specified.  It can be retrieved with the @code{class-option} command,
+however, to see what groups are available.
+
+This option is specific to Emacs, and is not in the CLOS spec.
+
+@item :method-invocation-order
+This controls the order in which method resolution occurs for
+@code{:primary} methods in cases of multiple inheritance.  The order
+affects which method is called first in a tree, and if
+@code{call-next-method} is used, it controls the order in which the
+stack of methods are run.
+
+Valid values are:
+
+@table @code
+@item :breadth-first
+Search for methods in the class hierarchy in breadth first order.
+This is the default.
+@item :depth-first
+Search for methods in the class hierarchy in a depth first order.
+@end table
+
+For more on method invocation order, @ref{Method Invocation}.
+
+
+@item :metaclass
+Unsupported CLOS option.  Enables the use of a different base class other
+than @code{standard-class}.
+
+@item :default-initargs
+Unsupported CLOS option.  Specifies a list of initargs to be used when
+creating new objects.  As far as I can tell, this duplicates the
+function of @code{:initform}.
+@end table
+
+@xref{CLOS compatibility}, for more details on CLOS tags versus @eieio{}
+specific tags.
+
+@node Making New Objects
+@comment  node-name,  next,  previous,  up
+@chapter Making New Objects
+
+When simple class is defined, such as:
+@example
+(defclass record ()
+   ( ) "Doc String")
+@end example
+
+it is possible to create create objects of that class type.
+
+Calling @code{defclass} has defined two new functions.  One is the
+constructor @var{record}, and the other is the predicate,
+@var{record-p}.
+
+@defun record object-name &rest slots
+
+This creates and returns a new object.  This object is not assigned to
+anything, and will be garbage collected if not saved.  This object
+will be given the string name @var{object-name}.  There can be
+multiple objects of the same name, but the name slot provides a handy
+way to keep track of your objects.  @var{slots} is just all the slots
+you wish to preset.  Any slot set as such @emph{will not} get its
+default value, and any side effects from a slot's @code{:initform}
+that may be a function will not occur.
+
+An example pair would appear simply as @code{:value 1}.  Of course you
+can do any valid Lispy thing you want with it, such as
+@code{:value (if (boundp 'special-symbol) special-symbol nil)}
+
+Example of creating an object from a class:
+
+@example
+(record "test" :value 3 :reference nil)
+@end example
+
+@end defun
+
+To create an object from a class symbol, use use @code{make-instance}.  
+
+@defun make-instance class &rest initargs
+@anchor{make-instance}
+Make a new instance of @var{class} based on @var{initargs}.
+@var{class} is a class symbol.  For example:
+
+@example
+  (make-instance 'foo)
+@end example
+
+  @var{initargs} is a property list with keywords based on the @code{:initarg}
+for each slot.  For example:
+
+@example
+  (make-instance @code{'foo} @code{:slot1} value1 @code{:slotN} valueN)
+@end example
+
+Compatability note:
+
+If the first element of @var{initargs} is a string, it is used as the
+name of the class.
+
+In @eieio{}, the class' constructor requires a name for use when printing.
+@dfn{make-instance} in CLOS doesn't use names the way Emacs does, so the
+class is used as the name slot instead when @var{initargs} doesn't start with
+a string.
+@end defun
+
+@node Accessing Slots
+@comment  node-name,  next,  previous,  up
+@chapter Accessing Slots
+
+There are several ways to access slot values in an object.  The naming
+convention and argument order is similar to that found in Emacs Lisp for
+referencing vectors.  The basics for referencing, setting, and calling
+methods are all accounted for.
+
+@defun oset object slot value
+This sets the value behind @var{slot} to @var{value} in @var{object}.
+@code{oset} returns @var{value}.
+@end defun
+
+@defun oset-default class slot value
+This sets the @code{:initform} for @var{slot} in @var{class} to
+@var{value}.  This will allow a user to set both public and private
+defaults after the class has been constructed.
+
+This function provides a way to to configure the default behavior of
+packages built with classes the same way @code{setq-default} is used
+for buffer-local variables.
+
+For example, if a user wanted all @code{data-objects} (@pxref{Building
+Classes}) to inform a special object of his own devising when they
+changed, this can be arranged by simply executing this bit of code:
+
+@example
+(oset-default data-object reference (list my-special-object))
+@end example
+
+@end defun
+
+@defun oref obj slot
+@anchor{oref}
+Retrieve the value stored in @var{obj} in the slot named by @var{slot}.
+Slot is the name of the slot when created by @dfn{defclass} or the label
+created by the @code{:initarg} tag.
+@end defun
+
+@defun oref-default obj slot
+@anchor{oref-default}
+Gets the default value of @var{obj} (maybe a class) for @var{slot}.
+The default value is the value installed in a class with the @code{:initform}
+tag.  @var{slot} can be the slot name, or the tag specified by the @code{:initarg}
+tag in the @dfn{defclass} call.
+@end defun
+
+These next accessors are defined by CLOS to reference or modify slot
+values, and use the previously mentioned set/ref routines.
+
+@defun slot-value object slot
+@anchor{slot-value}
+This function retrieves the value of @var{slot} from @var{object}.
+Unlike @code{oref}, the symbol for @var{slot} must be quoted.
+@end defun
+
+@defun set-slot-value object slot value
+@anchor{set-slot-value}
+This is not a CLOS function, but is meant to mirror @code{slot-value} if
+you don't want to use the cl package's @code{setf} function.  This
+function sets the value of @var{slot} from @var{object}.  Unlike
+@code{oset}, the symbol for @var{slot} must be quoted.
+@end defun
+
+@defun slot-makeunbound object slot
+This function unbinds @var{slot} in @var{object}.  Referencing an
+unbound slot can signal an error.
+@end defun
+
+@defun object-add-to-list object slot item &optional append
+@anchor{object-add-to-list}
+In OBJECT's @var{slot}, add @var{item} to the list of elements.
+Optional argument @var{append} indicates we need to append to the list.
+If @var{item} already exists in the list in @var{slot}, then it is not added.
+Comparison is done with @dfn{equal} through the @dfn{member} function call.
+If @var{slot} is unbound, bind it to the list containing @var{item}.
+@end defun
+
+@defun object-remove-from-list object slot item
+@anchor{object-remove-from-list}
+In OBJECT's @var{slot}, remove occurrences of @var{item}.
+Deletion is done with @dfn{delete}, which deletes by side effect
+and comparisons are done with @dfn{equal}.
+If @var{slot} is unbound, do nothing.
+@end defun
+
+@defun with-slots spec-list object &rest body
+@anchor{with-slots}
+Bind @var{spec-list} lexically to slot values in @var{object}, and execute @var{body}.
+This establishes a lexical environment for referring to the slots in
+the instance named by the given slot-names as though they were
+variables.  Within such a context the value of the slot can be
+specified by using its slot name, as if it were a lexically bound
+variable.  Both setf and setq can be used to set the value of the
+slot.
+
+@var{spec-list} is of a form similar to @dfn{let}.  For example:
+
+@example
+  ((VAR1 SLOT1)
+    SLOT2
+    SLOTN
+   (VARN+1 SLOTN+1))
+@end example
+
+Where each @var{var} is the local variable given to the associated
+@var{slot}.  A Slot specified without a variable name is given a
+variable name of the same name as the slot.
+
+@example
+(defclass myclass () (x :initarg 1))
+(setq mc (make-instance 'myclass))
+(with-slots (x) mc x)                      => 1
+(with-slots ((something x)) mc something)  => 1
+@end example
+@end defun
+
+@node Writing Methods
+@comment  node-name,  next,  previous,  up
+@chapter Writing Methods
+
+Writing a method in @eieio{} is similar to writing a function.  The
+differences are that there are some extra options and there can be
+multiple definitions under the same function symbol.
+
+Where a method defines an implementation for a particular data type, a
+@dfn{generic method} accepts any argument, but contains no code.  It
+is used to provide the dispatching to the defined methods.  A generic
+method has no body, and is merely a symbol upon which methods are
+attached.  It also provides the base documentation for what methods
+with that name do.
+
+@menu
+* Generics::
+* Methods::
+* Static Methods::
+@end menu
+
+@node Generics
+@section Generics
+
+Every method created in @eieio{} will have one corresponding generic.
+In @eieio{} the generic provides symbol bound as a function, and the
+base documentation
+
+@defun defgeneric method arglist [doc-string]
+
+@var{method} is the unquoted symbol to turn into a function.
+@var{arglist} is the default list of arguments to use (not implemented yet).
+@var{doc-string} is the documentation used for this symbol.
+
+A generic function acts as a place holder for methods.  There is no need
+to call @code{defgeneric} yourself, as @code{defmethod} will call it if
+necessary.  Currently the argument list is unused.
+
+@code{defgeneric} will prevent you from turning an existing Emacs Lisp
+function into a generic function.
+
+You can also create a generic method with @code{defmethod}.  When a
+method is created and there is no generic method in place with that
+name, then a new generic will be created, and the new method will use
+it.
+@end defun
+
+In CLOS a generic call also be used to provide an argument list,
+and dispatch precedence for all the arguments.  In @eieio{},
+dispatching only occurs for the first argument, so the @var{arglist}
+is not used.
+
+@node Methods
+@section Methods
+
+A method is a function which will be executed if the first argument
+passed to it matches the class the method was written for.  Multiple
+definitions for a single method name can exist, one for each class
+defined in @eieio{}.
+
+Methods are created with the @code{defmethod} macro, which is similar
+to @code{defun}.
+
+@defmac defmethod method [:before | :primary | :after | :static ] arglist [doc-string] forms
+
+@var{method} is the name of the function to be created.
+
+@code{:before} and @code{:after} specify execution order, and
+represent when this form is to be called.  If neither of these symbols
+are present, then the default priority is, before @code{:after}, after
+@code{:before}, and is represented in CLOS as @code{:primary}.
+
+@b{Note:} The @code{:BEFORE}, @code{:PRIMARY}, @code{:AFTER}, and
+@code{:STATIC} method tags were in all capital letters in previous
+versions of @eieio{}.
+
+@code{arglist} is the list of argument to this method.
+
+@var{doc-string} is the documentation attached to the implementation.
+All method doc-strings are concatenated into the generic method's
+function documentation.
+
+@var{forms} is the body of the function.
+
+@end defmac
+
+Only the @emph{first} argument may have a type specifier.
+@example
+(defmethod mymethod ((obj classname) secondarg)
+  "Doc string" )
+@end example
+
+In this example, @code{mymethod} has a first argument of @var{obj},
+and this method will only execute if @var{obj} is an @eieio{} class of
+type @code{classname}.
+
+TODO - The @emph{generic} term below is not the same as a defgeneric
+generic.  The below generic means that there is no type specifier.
+FIX THIS DOC.
+
+If no type specifier is supplied, then the method becomes a generic
+method, which will work for any object.
+
+A method with no type specifier is a @code{generic}.  If a given class has
+no implementation, then the generic will be called when that method is
+used on a given object of that class.
+
+If two @code{defmethod}s appear with arglists that do not have a type
+specifier, then the first implementation will be replaced.  Only one
+generic per execution specifier such as @code{:before},
+@code{:primary}, or @code{:after}.
+
+When when a method is called on an object, but there is no method
+specified for that object, but there is a method specified for
+object's parent class, the parent class' method will be called.  If
+there is a method defined for both, only the child's method is called.
+For a child method to call a parent's method, use
+@code{call-next-method}.
+
+If multiple methods and generics are defined for the same method and
+class, they are executed in this order:
+
+@table @asis
+@item method :before
+@item generic :before
+@item method :primary
+@item generic :primary
+@item method :after
+@item generic :after
+@end table
+
+If no methods exist, then the signal and error named
+@code{no-method-definition}. @ref{Signals}
+
+See the file @file{eieio-test.el} for an example testing these
+differently tagged methods.
+
+@defun call-next-method &rest replacement-args
+@anchor{call-next-method}
+Call the superclass method from a subclass method.
+The superclass method is specified in the current method list,
+and is called the next method.
+
+If @var{replacement-args} is non-@code{nil}, then use them instead of
+@code{eieio-generic-call-arglst}.  The generic arg list are the
+arguments passed in at the top level.
+
+Use @dfn{next-method-p} to find out if there is a next method to call.
+@end defun
+
+@defun next-method-p
+@anchor{next-method-p}
+Non-@code{nil} if there is a next method.
+Returns a list of lambda expressions which is the @code{next-method}
+order.
+@end defun
+
+In this implementation, not all features of CLOS exist.
+
+@enumerate
+@item
+There is currently no @code{:around} tag.
+@item
+CLOS allows multiple sets of type-cast arguments, where @eieio{} only
+allows the first argument to be cast.
+@end enumerate
+
+@node Static Methods
+@section Static Methods
+
+Static methods do not depend on an object instance, but instead
+operate on an object's class.  Create a static method by using the
+@code{:static} key with @code{defmethod}.
+
+Do not treat the first argument of a @code{:static} method as an
+object unless you test it first.  Use the functions
+@code{oref-default} or @code{oset-default} which will work on a class,
+or on the class of an object.
+
+A Class' @code{constructor} method is defined as a @code{:static}
+method.
+
+@b{Note:} The @code{:static} keyword is unique to @eieio{}.
+
+TODO - Write some more about static methods here
+
+@node Method Invocation
+@chapter Method Invocation
+
+TODO - writeme
+
+@node Predicates
+@comment  node-name,  next,  previous,  up
+@chapter Predicates and Utilities
+
+Now that we know how to create classes, access slots, and define
+methods, it might be useful to verify that everything is doing ok.  To
+help with this a plethora of predicates have been created.
+
+@defun find-class symbol &optional errorp
+@anchor{find-class}
+Return the class that @var{symbol} represents.
+If there is no class, @code{nil} is returned if @var{errorp} is @code{nil}.
+If @var{errorp} is non-@code{nil}, @code{wrong-argument-type} is signaled.
+@end defun
+
+@defun class-p class
+@anchor{class-p}
+Return @code{t} if @var{class} is a valid class vector.
+@var{class} is a symbol.
+@end defun
+
+@defun slot-exists-p object-or-class slot
+@anchor{slot-exists-p}
+Non-@code{nil} if @var{object-or-class} has @var{slot}.
+@end defun
+
+@defun slot-boundp object slot
+@anchor{slot-boundp}
+Non-@code{nil} if OBJECT's @var{slot} is bound.
+Setting a slot's value makes it bound.  Calling @dfn{slot-makeunbound} will
+make a slot unbound.
+@var{object} can be an instance or a class.
+@end defun
+
+@defun class-name class
+Return a string of the form @samp{#<class myclassname>} which should look
+similar to other Lisp objects like buffers and processes.  Printing a
+class results only in a symbol.  
+@end defun
+
+@defun class-option class option
+Return the value in @var{CLASS} of a given @var{OPTION}.
+For example:
+
+@example
+(class-option eieio-default-superclass :documentation)
+@end example
+
+Will fetch the documentation string for @code{eieio-default-superclass}.
+@end defun
+
+@defun class-constructor class
+Return a symbol used as a constructor for @var{class}.  The
+constructor is a function used to create new instances of
+@var{CLASS}. This function provides a way to make an object of a class
+without knowing what it is.  This is not a part of CLOS.
+@end defun
+
+@defun object-name obj
+Return a string of the form @samp{#<object-class myobjname>} for @var{obj}.
+This should look like Lisp symbols from other parts of emacs such as
+buffers and processes, and is shorter and cleaner than printing the
+object's vector.  It is more useful to use @code{object-print} to get
+and object's print form, as this allows the object to add extra display
+information into the symbol.
+@end defun
+
+@defun object-class obj
+Returns the class symbol from @var{obj}.
+@end defun
+
+@defun class-of obj
+CLOS symbol which does the same thing as @code{object-class}
+@end defun
+
+@defun object-class-fast obj
+Same as @code{object-class} except this is a macro, and no
+type-checking is performed.
+@end defun
+
+@defun object-class-name obj
+Returns the symbol of @var{obj}'s class.
+@end defun
+
+@defun class-parents class
+Returns the direct parents class of @var{class}.  Returns @code{nil} if
+it is a superclass.
+@end defun
+
+@defun class-parents-fast class
+Just like @code{class-parent} except it is a macro and no type checking
+is performed.
+@end defun
+
+@defun class-parent class
+Deprecated function which returns the first parent of @var{class}.
+@end defun
+
+@defun class-children class
+Return the list of classes inheriting from @var{class}.
+@end defun
+
+@defun class-children-fast class
+Just like @code{class-children}, but with no checks.
+@end defun
+
+@defun same-class-p obj class
+Returns @code{t} if @var{obj}'s class is the same as @var{class}.
+@end defun
+
+@defun same-class-fast-p obj class
+Same as @code{same-class-p} except this is a macro and no type checking
+is performed.
+@end defun
+
+@defun object-of-class-p obj class
+Returns @code{t} if @var{obj} inherits anything from @var{class}.  This
+is different from @code{same-class-p} because it checks for inheritance.
+@end defun
+
+@defun child-of-class-p child class
+Returns @code{t} if @var{child} is a subclass of @var{class}.
+@end defun
+
+@defun generic-p method-symbol
+Returns @code{t} if @code{method-symbol} is a generic function, as
+opposed to a regular Emacs Lisp function.
+@end defun
+
+@node Association Lists
+@chapter Association Lists
+
+Lisp offers the concept of association lists, with primitives such as
+@code{assoc} used to access them.  @eieio{} provides a few such functions
+to help with using lists of objects easily.
+
+@defun object-assoc key slot list
+@anchor{object-assoc}
+Return an object if @var{key} is @dfn{equal} to SLOT's value of an object in @var{list}.
+@var{list} is a list of objects who's slots are searched.
+Objects in @var{list} do not need to have a slot named @var{slot}, nor does
+@var{slot} need to be bound.  If these errors occur, those objects will
+be ignored.
+@end defun
+
+
+@defun object-assoc-list slot list
+Return an association list generated by extracting @var{slot} from all
+objects in @var{list}.  For each element of @var{list} the @code{car} is
+the value of @var{slot}, and the @code{cdr} is the object it was
+extracted from.  This is useful for generating completion tables.
+@end defun
+
+@defun eieio-build-class-alist &optional base-class
+Returns an alist of all currently defined classes.  This alist is
+suitable for completion lists used by interactive functions to select a
+class.  The optional argument @var{base-class} allows the programmer to
+select only a subset of classes which includes @var{base-class} and
+all its subclasses.
+@end defun
+
+@node Customizing
+@comment node-name, next, previous, up
+@chapter Customizing Objects
+
+@eieio{} supports custom through two new widget types.  If a variable
+is declared as type @code{'object}, then full editing of slots via the
+widgets is made possible.  This should be used carefully, however,
+because objects modified are cloned, so if there are other references
+to these objects, they will no longer be linked together.
+
+If you want in place editing of objects, use the following methods:
+
+@defun eieio-customize-object object
+Create a custom buffer and insert a widget for editing @var{object}.  At
+the end, an @code{Apply} and @code{Reset} button are available.  This
+will edit the object "in place" so references to it are also changed.
+There is no effort to prevent multiple edits of a singular object, so
+care must be taken by the user of this function.
+@end defun
+
+@defun eieio-custom-widget-insert object flags
+This method inserts an edit object into the current buffer in place.
+It is implemented as @code{(widget-create 'object-edit :value object)}.
+This method is provided as a locale for adding tracking, or
+specializing the widget insert procedure for any object.
+@end defun
+
+To define a slot with an object in it, use the @code{object} tag.  This
+widget type will be automatically converted to @code{object-edit} if you
+do in place editing of you object.
+
+If you want to have additional actions taken when a user clicks on the
+@code{Apply} button, then overload the method @code{eieio-done-customizing}.
+This method does nothing by default, but that may change in the future.
+This would be the best way to make your objects persistent when using
+in-place editing.
+
+@section Widget extention
+
+When widgets are being created, one new widget extention has been added,
+called the @code{:slotofchoices}.  When this occurs in a widget
+definition, all elements after it are removed, and the slot is specifies
+is queried and converted into a series of constants.
+
+@example
+(choice (const :tag "None" nil)
+        :slotofchoices morestuff)
+@end example
+
+and if the slot @code{morestuff} contains @code{(sym1 sym2 sym3)}, the
+above example is converted into:
+
+@example
+(choice (const :tag "None" nil)
+        (const sym1)
+        (const sym2)
+        (const sym3))
+@end example
+
+This is useful when a given item needs to be selected from a list of
+items defined in this second slot.
+
+@node Introspection
+@chapter Introspection
+
+Introspection permits a programmer to peek at the contents of a class
+without any previous knowledge of that class.  While @eieio{} implements
+objects on top of vectors, and thus everything is technically visible,
+some functions have been provided.  None of these functions are a part
+of CLOS.
+
+@defun object-slots obj
+Return the list of public slots for @var{obj}.
+@end defun
+
+@defun class-slot-initarg class slot
+For the given @var{class} return the :initarg associated with
+@var{slot}.  Not all slots have initargs, so the return value can be
+nil.
+@end defun
+
+@node Base Classes
+@comment  node-name,  next,  previous,  up
+@chapter Base Classes
+
+Asside from @code{eieio-default-superclass}, @eieio{} comes with some
+additional classes that you can use.  By using multiple inheritance, it
+is possible to use several features at the same time.
+
+@menu
+* eieio-instance-inheritor::    Enable value inheritance between instances.
+* eieio-instance-tracker::      Enable self tracking instances.
+* eieio-singleton::             Only one instance of a given class.
+* eieio-persistent::            Enable persistence for a class.
+* eieio-named::                 Use the object name as a :name slot.
+* eieio-speedbar::              Enable speedbar support in your objects.
+@end menu
+
+@node eieio-instance-inheritor
+@comment  node-name,  next,  previous,  up
+@section @code{eieio-instance-inheritor}
+
+This class is in package @file{eieio-base}.
+
+Instance inheritance is a mechanism whereby the value of a slot in
+object instance can reference the parent instance.  If the parent's slot
+value is changed, then the child instance is also changed.  If the
+child's slot is set, then the parent's slot is not modified.
+
+@deftp {Class} eieio-instance-inheritor parent-instance
+A class whose instances are enabled with instance inheritance.
+The @var{parent-instance} slot indicates the instance which is
+considered the parent of the current instance.  Default is @code{nil}.
+@end deftp
+
+@cindex clone
+To use this class, inherit from it with your own class.
+To make a new instance that inherits from and existing instance of your
+class, use the @code{clone} method with additional parameters
+to specify local values.
+
+@cindex slot-unbound
+The @code{eieio-instance-inheritor} class works by causing cloned
+objects to have all slots unbound.  This class' @code{slot-unbound}
+method will cause references to unbound slots to be redirected to the
+parent instance.  If the parent slot is also unbound, then
+@code{slot-unbound} will signal an an error named @code{slot-unbound}.
+
+@node eieio-instance-tracker
+@section @code{eieio-instance-tracker}
+
+This class is in package @file{eieio-base}.
+
+Sometimes it is useful to keep a master list of all instances of a given
+class.  The class @code{eieio-instance-tracker} performs this task.
+
+@deftp {Class} eieio-instance-tracker tracker-symbol
+Enable instance tracking for this class.
+The slot @var{tracker-symbol} should be initialized in inheritors of
+this class to a symbol created with @code{defvar}.  This symbol will
+serve as the variable used as a master list of all objects of the given
+class.
+@end deftp
+
+@defmethod eieio-instance-tracker initialize-instance obj slot
+This method is defined as an @code{:after} method.
+It adds new instances to the master list.  Do not overload this method
+unless you use @code{call-next-method.}
+@end defmethod
+
+@defmethod eieio-instance-tracker delete-instance obj
+Remove @var{obj} from the master list of instances of this class.
+This may let the garbage collector nab this instance.
+@end defmethod
+
+@deffn eieio-instance-tracker-find key slot list-symbol
+This convenience function lets you find instances.  @var{key} is the
+value to search for.  @var{slot} is the slot to compare @var{KEY}
+against.  The function @code{equal} is used for comparison.
+The paramter @var{list-symbol} is the variable symbol which contains the
+list of objects to be searched.
+@end deffn
+
+@node eieio-singleton
+@comment  node-name,  next,  previous,  up
+@section @code{eieio-singleton}
+
+This class is in package @file{eieio-base}.
+
+@deftp {Class} eieio-singleton
+Inheriting from the singleton class will guarantee that there will
+only ever be one instance of this class.  Multiple calls to
+@code{make-instance} will always return the same object.
+@end deftp
+
+@node eieio-persistent
+@comment  node-name,  next,  previous,  up
+@section @code{eieio-persistent}
+
+This class is in package @file{eieio-base}.
+
+If you want an object, or set of objects to be persistent, meaning the
+slot values are important to keep saved between sessions, then you will
+want your top level object to inherit from @code{eieio-persistent}.
+
+To make sure your persistent object can be moved, make sure all file
+names stored to disk are made relative with
+@code{eieio-persistent-path-relative}.
+
+@deftp {Class} eieio-persistent file file-header-line
+Enables persistence for instances of this class.
+Slot @var{file} with initarg @code{:file} is the file name in which this
+object will be saved.
+Class allocated slot @var{file-header-line} is used with method
+@code{object-write} as a header comment.
+@end deftp
+
+All objects can write themselves to a file, but persistent objects have
+several additional methods that aid in maintaining them.
+
+@defmethod eieio-persistent eieio-persistent-save obj &optional file
+Write the object @var{obj} to its file.
+If optional argument @var{file} is specified, use that file name
+instead.
+@end defmethod
+
+@defmethod eieio-persistent eieio-persistent-path-relative obj file
+Return a file name derived from @var{file} which is relative to the
+stored location of @var{OBJ}.  This method should be used to convert
+file names so that they are relative to the save file, making any system
+of files movable from one location to another.
+@end defmethod
+
+@defmethod eieio-persistent object-write obj &optional comment
+Like @code{object-write} for @code{standard-object}, but will derive
+a header line comment from the class allocated slot if one is not
+provided.
+@end defmethod
+
+@defun eieio-persistent-read filename
+Read @var{filename} which contains an @code{eieio-persistent} object
+previously written with @code{eieio-persistent-save}.
+@end defun
+
+@node eieio-named
+@comment  node-name,  next,  previous,  up
+@section @code{eieio-named}
+
+This class is in package @file{eieio-base}.
+
+@deftp {Class} eieio-named
+Object with a name.
+Name storage already occurs in an object.  This object provides get/set
+access to it.
+@end deftp
+
+@node eieio-speedbar
+@comment  node-name,  next,  previous,  up
+@section @code{eieio-speedbar}
+
+This class is in package @file{eieio-speedbar}.
+
+If a series of class instances map to a tree structure, it is possible
+to cause your classes to be displayable in Speedbar. @xref{Top,,,speedbar}.
+Inheriting from these classes will enable a speedbar major display mode
+with a minimum of effort.
+
+@deftp {Class} eieio-speedbar buttontype buttonface
+Enables base speedbar display for a class.
+@cindex speedbar-make-tag-line
+The slot @var{buttontype} is any of the symbols allowed by the
+function @code{speedbar-make-tag-line} for the @var{exp-button-type}
+argument @xref{Extending,,,speedbar}.
+The slot @var{buttonface} is the face to use for the text of the string
+displayed in speedbar.
+The slots @var{buttontype} and @var{buttonface} are class allocated
+slots, and do not take up space in your instances.
+@end deftp
+
+@deftp {Class} eieio-speedbar-directory-button buttontype buttonface
+This class inherits from @code{eieio-speedbar} and initializes 
+@var{buttontype} and @var{buttonface} to appear as directory level lines.
+@end deftp
+
+@deftp {Class} eieio-speedbar-file-button buttontype buttonface
+This class inherits from @code{eieio-speedbar} and initializes 
+@var{buttontype} and @var{buttonface} to appear as file level lines.
+@end deftp
+
+To use these classes, inherit from one of them in you class.  You can
+use multiple inheritance with them safely.  To customize your class for
+speedbar display, override the default values for @var{buttontype} and
+@var{buttonface} to get the desired effects.
+
+Useful methods to define for your new class include:
+
+@defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth
+Return a string representing a directory associated with an instance
+of @var{obj}.  @var{depth} can be used to indice how many levels of
+indentation have been opened by the user where @var{obj} is shown.
+@end defmethod
+
+
+@defmethod eieio-speedbar eieio-speedbar-description obj
+Return a string description of @var{OBJ}.
+This is shown in the minibuffer or tooltip when the mouse hovers over
+this instance in speedbar.
+@end defmethod
+
+@defmethod eieio-speedbar eieio-speedbar-child-description obj
+Return a string representing a description of a child node of @var{obj}
+when that child is not an object.  It is often useful to just use
+item info helper functions such as @code{speedbar-item-info-file-helper}.
+@end defmethod
+
+@defmethod eieio-speedbar eieio-speedbar-object-buttonname obj
+Return a string which is the text displayed in speedbar for @var{obj}.
+@end defmethod
+
+@defmethod eieio-speedbar eieio-speedbar-object-children obj
+Return a list of children of @var{obj}.
+@end defmethod
+
+@defmethod eieio-speedbar eieio-speedbar-child-make-tag-lines obj depth
+This method inserts a list of speedbar tag lines for @var{obj} to
+represent its children.  Implement this method for your class
+if your children are not objects themselves.  You still need to
+implement @code{eieio-speedbar-object-children}.
+
+In this method, use techniques specified in the Speedbar manual.
+@xref{Extending,,,speedbar}.
+@end defmethod
+
+Some other functions you will need to learn to use are:
+
+@deffn eieio-speedbar-create make-map key-map menu name toplevelfn
+Register your object display mode with speedbar.
+@var{make-map} is a function which initialized you keymap.
+@var{key-map} is a symbol you keymap is installed into.
+@var{menu} is an easy menu vector representing menu items specific to your
+object display.
+@var{name} is a short string to use as a name identifying you mode.
+@var{toplevelfn} is a function called which must return a list of
+objects representing those in the instance system you wish to browse in
+speedbar.
+
+Read the Extending chapter in the speedbar manual for more information
+on how speedbar modes work
+@xref{Extending,,,speedbar}. 
+@end deffn
+
+@node Browsing
+@comment  node-name,  next,  previous,  up
+@chapter Browsing class trees
+
+To browse all the currently loaded classes in emacs, simply run the
+@eieio{} browser.  @kbd{M-x eieio-browse}.  This browses all the way from
+the default super-duper class eieio-default-superclass, and lists all
+children in an indented tree structure.
+
+To browse only from a specific class, pass it in as an alternate
+parameter.
+
+Here is a sample tree from our current example:
+
+@example
+eieio-default-superclass
+  +--data-object
+       +--data-object-symbol
+@end example
+
+Note that we start with eieio-default-superclass.  @xref{Default Superclass}.
+
+Note: new classes are consed into the inheritance lists, so the tree
+comes out upside-down.
+
+@node Class Values
+@comment  node-name,  next,  previous,  up
+@chapter Class Values
+
+Details about any class or object can be retrieved using the function
+@code{eieio-describe-class} function.  Interactively, type in the name of
+a class.  In a program, pass it a string with the name of a class, a
+class symbol, or an object.  The resulting buffer will display all slot
+names.
+
+Additionally, all methods defined to have functionality on this class is
+displayed.
+
+@node Documentation
+@comment  node-name,  next,  previous,  up
+@chapter Documentation
+
+It is possible to automatically create documentation for your classes in
+texinfo format by using the tools in the file @file{eieio-doc.el}
+
+@deffn Command eieiodoc-class class indexstring &optional skiplist
+
+This will start at the current point, and created an indented menu of
+all the child classes of, and including @var{class}, but skipping any
+classes that might be in @var{skiplist} It will then create nodes for
+all these classes, subsection headings, and indexes.
+
+Each class will be indexed using the texinfo labeled index
+@var{indexstring} which is a two letter description.
+@xref{(texinfo) New Indices}.
+
+To use this command, the texinfo macro
+
+@example
+@@defindex @@var @{ indexstring @}
+@end example
+
+@noindent
+where @var{indexstring} is replaced with the two letter code.
+
+Next, an inheritance tree will be created listing all parents of that
+section's class.
+
+Then,all the slots will be expanded in tables, and described
+using the documentation strings from the code.  Default values will also
+be displayed.  Only those slots with @code{:initarg} specified will be
+expanded, others will be hidden.  If a slot is inherited from a parent,
+that slot will also be skipped unless the default value is different.
+If there is a change, then the documentation part of the slot will be
+replace with an @@xref back to the parent.
+
+This command can only display documentation for classes whose
+definitions have been loaded in this Emacs session.
+
+@end deffn
+
+@node Default Superclass
+@comment  node-name,  next,  previous,  up
+@chapter Default Superclass
+
+All defined classes, if created with no specified parent class) will
+inherit from a special class stored in
+@code{eieio-default-superclass}.  This superclass is quite simple, but
+with it, certain default methods or attributes can be added to all
+objects.  In CLOS, this would be named @code{STANDARD-CLASS}, and that
+symbol is an alias to @code{eieio-default-superclass}.
+@refill
+
+Currently, the default superclass is defined as follows:
+
+@example
+(defclass eieio-default-superclass nil
+  nil
+  "Default parent class for classes with no specified parent class.
+Its slots are automatically adopted by classes with no specified
+parents.  This class is not stored in the `parent' slot of a class vector."
+  :abstract t)
+@end example
+
+The default superclass implements several methods providing a default
+behavior for all objects created by @eieio{}.
+
+@menu
+* Initialization::      How objects are initialized
+* Basic Methods::       Clone, print, and write
+* Signal Handling::     Methods for managing signals.
+@end menu
+
+@node Initialization
+@section Initialization
+
+When creating an object of any type, you can use its constructor, or
+@code{make-instance}.  This, in turns calls the method
+@code{initialize-instance}, which then calls the method
+@code{shared-initialize}.
+
+These methods are all implemented on the default superclass so you do
+not need to write them yourself, unless you need to override one of
+their behaviors.
+
+Users should not need to call @code{initialize-instance} or
+@code{shared-initialize}, as these are used by @code{make-instance} to
+initialize the object.  They are instead provided so that users can
+augment these behaviors.
+
+@defun initialize-instance obj &rest slots
+Initialize @var{obj}.  Sets slots of @var{obj} with @var{slots} which
+is a list of name/value pairs.  These are actually just passed to
+@code{shared-initialize}.
+@end defun
+
+@defun shared-initialize obj &rest slots
+Sets slots of @var{obj} with @var{slots} which is a list of name/value
+pairs.
+
+This is called from the default @code{constructor}.
+@end defun
+
+@node Basic Methods
+@section Basic Methods
+
+Additional useful methods defined on the base sublcass are:
+
+@defun clone obj &rest params
+@anchor{clone}
+Make a copy of @var{obj}, and then apply @var{params}.
+@var{params} is a parameter list of the same form as @var{initialize-instance}
+which are applied to change the object.  When overloading @dfn{clone}, be
+sure to call @dfn{call-next-method} first and modify the returned object.
+@end defun
+
+@defun object-print this &rest strings
+@anchor{object-print}
+Pretty printer for object @var{this}.  Call function @dfn{object-name} with @var{strings}.
+The default method for printing object @var{this} is to use the
+function @dfn{object-name}.
+
+It is sometimes useful to put a summary of the object into the
+default #<notation> string when using eieio browsing tools.
+
+Implement this function and specify @var{strings} in a call to
+@dfn{call-next-method} to provide additional summary information.
+When passing in extra strings from child classes, always remember
+to prepend a space.
+
+@example
+(defclass data-object ()
+   (value)
+   "Object containing one data slot.")
+
+(defmethod object-print ((this data-object) &optional strings)
+  "Return a string with a summary of the data object as part of the name."
+  (apply 'call-next-method this 
+         (cons (format " value: %s" (render this)) strings)))
+@end example
+
+here is what some output could look like:
+@example
+(object-print test-object)
+   => #<data-object test-object value: 3>
+@end example
+@end defun
+
+@defun object-write obj &optional comment
+Write @var{obj} onto a stream in a readable fashion.  The resulting
+output will be Lisp code which can be used with @code{read} and
+@code{eval} to recover the object.  Only slots with @code{:initarg}s
+are written to the stream.
+@end defun
+
+@node Signal Handling
+@section Signal Handling
+
+The default superclass defines methods for managing error conditions.
+These methods all throw a signal for a particular error condition.
+
+By implementing one of these methods for a class, you can change the
+behavior that occurs during one of these error cases, or even ignore
+the error by providing some behavior.
+
+@defun slot-missing ab &rest foo
+@anchor{slot-missing}
+Method invoked when an attempt to access a slot in @var{object} fails.
+@var{slot-name} is the name of the failed slot, @var{operation} is the type of access
+that was requested, and optional @var{new-value} is the value that was desired
+to be set.
+
+This method is called from @code{oref}, @code{oset}, and other functions which
+directly reference slots in EIEIO objects.
+
+The default method signals an error of type @code{invalid-slot-name}.
+@xref{Signals}.
+
+You may override this behavior, but it is not expected to return in the
+current implementation.
+
+This function takes arguments in a different order than in CLOS.
+@end defun
+
+@defun slot-unbound object class slot-name fn
+@anchor{slot-unbound}
+Slot unbound is invoked during an attempt to reference an unbound slot.
+@var{object} is the instance of the object being reference.  @var{class} is the
+class of @var{object}, and @var{slot-name} is the offending slot.  This function
+throws the signal @code{unbound-slot}.  You can overload this function and
+return the value to use in place of the unbound value.
+Argument @var{fn} is the function signaling this error.
+Use @dfn{slot-boundp} to determine if a slot is bound or not.
+
+In @var{clos}, the argument list is (@var{class} @var{object} @var{slot-name}), but
+@var{eieio} can only dispatch on the first argument, so the first two are swapped.
+@end defun
+
+@defun no-applicable-method object method &rest args
+@anchor{no-applicable-method}
+Called if there are no implementations for @var{object} in @var{method}.
+@var{object} is the object which has no method implementation.
+@var{args} are the arguments that were passed to @var{method}.
+
+Implement this for a class to block this signal.  The return
+value becomes the return value of the original method call.
+@end defun
+
+@defun no-next-method object &rest args
+@anchor{no-next-method}
+Called from @dfn{call-next-method} when no additional methods are available.
+@var{object} is othe object being called on @dfn{call-next-method}.
+@var{args} are the  arguments it is called by.
+This method signals @dfn{no-next-method} by default.  Override this
+method to not throw an error, and its return value becomes the
+return value of @dfn{call-next-method}.
+@end defun
+
+@node Signals
+@comment  node-name,  next,  previous,  up
+@chapter Signals
+
+There are new condition names (signals) that can be caught when using
+@eieio{}.
+
+@deffn Signal invalid-slot-name obj-or-class slot
+This signal is called when an attempt to reference a slot in an
+@var{obj-or-class} is made, and the @var{slot} is not defined for
+it.
+@end deffn
+
+@deffn Signal no-method-definition method arguments
+This signal is called when @var{method} is called, with @var{arguments}
+and nothing is resolved.  This occurs when @var{method} has been
+defined, but the arguments make it impossible for @eieio{} to determine
+which method body to run.
+
+To prevent this signal from occurring in your class, implement the
+method @code{no-applicable-method} for your class.  This method is
+called when to throw this signal, so implementing this for your class
+allows you block the signal, and perform some work.
+@end deffn
+
+@deffn Signal no-next-method class arguments
+This signal is called if the function @code{call-next-method} is called
+and there is no next method to be called.
+
+Overload the method @code{no-next-method} to protect against this signal.
+@end deffn
+
+@deffn Signal invalid-slot-type slot spec value
+This signal is called when an attempt to set @var{slot} is made, and
+@var{value} doesn't match the specified type @var{spec}.
+
+In @eieio{}, this is also used if a slot specifier has an invalid value
+during a @code{defclass}.
+@end deffn
+
+@deffn Signal unbound-slot object class slot
+This signal is called when an attempt to reference @var{slot} in
+@var{object} is made, and that instance is currently unbound.
+@end deffn
+
+@node Naming Conventions
+@comment  node-name,  next,  previous,  up
+@chapter Naming Conventions
+
+The Emacs Lisp programming manual has a great chapter programming
+conventions that help keep each Emacs package working nicely with the
+entire system.  @ref{(elisp)Standards} An @eieio{} based program needs to
+follow these conventions, while simultaneously taking advantage of the
+Object Oriented features.
+
+Here is how the Emacs Lisp naming conventions
+(@pxref{(elisp)Standards}) apply to EIEIO:
+
+
+@itemize
+
+@item Come up with a package prefix that is relatively short.  Prefix
+all classes, and methods with your prefix.  This is a standard
+convention for functions and variables in Emacs.
+
+@item Do not prefix method names with the class name.  All methods in
+@eieio{} are ``virtual'', and are dynamically dispatched.  Anyone can
+override your methods at any time.  Your methods should be prefixed
+with your package name.
+
+@item Do not prefix slots in your class.  The slots are always locally
+scoped to your class, and need no prefixing.
+
+@item If your library inherits from other libraries of classes, you
+must ``require'' that library with the @code{require} command.
+
+@end itemize
+
+@node CLOS compatibility
+@comment  node-name,  next,  previous,  up
+@chapter CLOS compatibility
+
+As you read this, it is important to know that I have just recently
+learned some of the CLOS syntax, but have never used it myself outside
+of the @eieio{} framework.  I'm primarily and Emacs Lisp hacker who wrote
+@eieio{} to help myself learn some of the mechanics of Object Oriented
+programming.
+
+Currently, the following functions should behave almost as expected from
+CLOS.
+
+@table @code
+
+@item defclass
+All slot keywords are available but not all work correctly.
+Slot keyword differences are:
+
+@table @asis
+
+@item :reader, and :writer tags
+Create methods that signal errors instead of creating an unqualified
+method.  You can still create new ones to do its business.
+
+@item :accessor
+This should create an unqualified method to access a slot, but
+instead pre-builds a method that gets the slot's value.
+
+@item :type
+Specifier uses the @code{typep} function from the @file{cl}
+package.  @xref{(cl)Type Predicates}. It therefore has the same issues as
+that package.  Extensions include the ability to provide object names.
+@end table
+
+Defclass also supports class options, but does not currently use values
+of @code{:metaclass}, and @code{:default-initargs}.
+
+@item make-instance
+Make instance works as expected, however it just uses the @eieio{} instance
+creator automatically generated when a new class is created.
+@xref{Making New Objects}.
+
+@item defgeneric
+Creates the desired symbol, and accepts all of the expected arguments
+except @code{:around}.
+
+@item defmethod
+Calls defgeneric, and accepts most of the expected arguments.  Only
+the first argument to the created method may have a type specifier.
+To type cast against a class, the class must exist before defmethod is
+called. In addition, the @code{:around} tag is not supported.
+
+@item call-next-method
+Inside a method, calls the next available method up the inheritance tree
+for the given object.  This is different than that found in CLOS because
+in @eieio{} this function accepts replacement arguments.  This permits
+subclasses to modify arguments as they are passed up the tree.  If no
+arguments are given, the expected CLOS behavior is used.
+@item setf
+If the common-lisp subsystem is loaded, the setf parameters are also
+loaded so the form @code{(setf (slot-value object slot) t)} should
+work.
+@end table
+
+CLOS supports the @code{describe} command, but @eieio{} only provides
+@code{eieio-describe-class}, and @code{eieio-describe-generic}.  These
+functions are adviced into @code{describe-variable}, and
+@code{describe-function}.
+
+When creating a new class (@pxref{Building Classes}) there are several
+new keywords supported by @eieio{}.
+
+In @eieio{} tags are in lower case, not mixed case.
+
+@node Wish List
+@chapter Wish List
+
+@eieio{} is an incomplete implementation of CLOS.  Finding ways to
+improve the compatability would help make CLOS style programs run
+better in Emacs.
+
+Some important compatability features that would be good to add are:
+
+@enumerate
+@item
+@code{:around} method key.
+
+@item
+Method dispatch for built-in types.
+@item
+Method dispatch for multiple argument typing.
+@item
+Improve integration with the @file{cl} package.
+@end enumerate
+
+There are also improvements to be made to allow @eieio{} to operate
+better in the Emacs environment.  
+
+@enumerate
+@item
+Allow subclasing of Emacs built-in types, such as faces, markers, and
+buffers.
+@item
+Allow method overloading of method-like functions in Emacs.
+@end enumerate
+
+@node Function Index
+@unnumbered Function Index
+
+@printindex fn
+
+@contents
+@bye
diff --git a/site/cedet-1.0pre7/eieio/linemark.el b/site/cedet-1.0pre7/eieio/linemark.el
new file mode 100644
index 0000000..3b88852
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/linemark.el
@@ -0,0 +1,451 @@
+;;; linemark.el --- Manage groups of lines with marks.
+;;
+;; Author: Eric M. Ludlam <eludlam@mathworks.com>
+;; Maintainer: Eric M. Ludlam <eludlam@mathworks.com>
+;; Created: Dec 1999
+;; Keywords: lisp
+;;
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; This is a library of routines which help Lisp programmers manage
+;; groups of marked lines.  Common uses for marked lines are debugger
+;; breakpoints and watchpoints, or temporary line highlighting.  It
+;; could also be used to select elements from a list.
+;;
+;; The reason this tool is useful is because cross-emacs overlay
+;; management can be a pain, and overlays are certainly needed for use
+;; with font-lock.
+
+(require 'eieio)
+
+;;; Code:
+;; Compatibility
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (progn
+	(defalias 'linemark-overlay-live-p 'extent-live-p)
+	(defalias 'linemark-make-overlay 'make-extent)
+	(defalias 'linemark-overlay-put 'set-extent-property)
+	(defalias 'linemark-overlay-get 'extent-property)
+	(defalias 'linemark-delete-overlay 'delete-extent)
+	(defalias 'linemark-overlays-at
+	  (lambda (pos) (extent-list nil pos pos)))
+	(defalias 'linemark-overlays-in 
+	  (lambda (beg end) (extent-list nil beg end)))
+	(defalias 'linemark-overlay-buffer 'extent-buffer)
+	(defalias 'linemark-overlay-start 'extent-start-position)
+	(defalias 'linemark-overlay-end 'extent-end-position)
+	(defalias 'linemark-next-overlay-change 'next-extent-change)
+	(defalias 'linemark-previous-overlay-change 'previous-extent-change)
+	(defalias 'linemark-overlay-lists
+	  (lambda () (list (extent-list))))
+	(defalias 'linemark-overlay-p 'extentp)
+	)
+    (defalias 'linemark-overlay-live-p 'overlay-buffer)
+    (defalias 'linemark-make-overlay 'make-overlay)
+    (defalias 'linemark-overlay-put 'overlay-put)
+    (defalias 'linemark-overlay-get 'overlay-get)
+    (defalias 'linemark-delete-overlay 'delete-overlay)
+    (defalias 'linemark-overlays-at 'overlays-at)
+    (defalias 'linemark-overlays-in 'overlays-in)
+    (defalias 'linemark-overlay-buffer 'overlay-buffer)
+    (defalias 'linemark-overlay-start 'overlay-start)
+    (defalias 'linemark-overlay-end 'overlay-end)
+    (defalias 'linemark-next-overlay-change 'next-overlay-change)
+    (defalias 'linemark-previous-overlay-change 'previous-overlay-change)
+    (defalias 'linemark-overlay-lists 'overlay-lists)
+    (defalias 'linemark-overlay-p 'overlayp)
+    ))
+
+(defgroup linemark nil
+  "Line marking/highlighting."
+  :group 'tools
+  )
+
+(eval-and-compile
+  ;; These faces need to exist to show up as valid default
+  ;; entries in the classes defined below.
+
+(defface linemark-stop-face '((((class color) (background light))
+			       (:background "#ff8888"))
+			      (((class color) (background dark))
+			       (:background "red3")))
+  "*Face used to indicate a STOP type line."
+  :group 'linemark)
+
+(defface linemark-caution-face '((((class color) (background light))
+				  (:background "yellow"))
+				 (((class color) (background dark))
+				  (:background "yellow4")))
+  "*Face used to indicate a CAUTION type line."
+  :group 'linemark)
+				  
+(defface linemark-go-face '((((class color) (background light))
+			     (:background "#88ff88"))
+			    (((class color) (background dark))
+			     (:background "green4")))
+  "*Face used to indicate a GO, or OK type line."
+  :group 'linemark)
+
+(defface linemark-funny-face '((((class color) (background light))
+				(:background "cyan"))
+			       (((class color) (background dark))
+				(:background "blue3")))
+  "*Face used for elements with no particular criticality."
+  :group 'linemark)
+
+)
+
+(defclass linemark-entry ()
+  ((filename :initarg :filename
+	     :type string
+	     :documentation "File name for this mark.")
+   (line     :initarg :line
+	     :type number
+	     :documentation "Line number where the mark is.")
+   (face     :initarg :face
+; Something created w/ defface is not a face in XEmacs.
+;	     :type face
+	     :initform linemark-caution-face
+	     :documentation "The face to use for display.")
+   (parent   :documentation "The parent `linemark-group' containing this."
+	     :type linemark-group)
+   (overlay  :documentation "Overlay created to show this mark."
+	     :type (or linemark-overlay null)
+	     :initform nil
+	     :protection protected))
+  "Track a file/line associations with overlays used for display.")
+
+(defclass linemark-group ()
+  ((marks :initarg :marks
+	  :type list
+	  :initform nil
+	  :documentation "List of `linemark-entries'.")
+   (face :initarg :face
+	 :initform linemark-funny-face
+; Something created w/ defface is not a face in XEmacs.
+;	 :type (or null face)
+	 :documentation "Default face used to create new `linemark-entries'.")
+   (active :initarg :active
+	   :type boolean
+	   :initform t
+	   :documentation "Track if these marks are active or not."))
+  "Track a common group of `linemark-entries'.")
+
+;;; Functions
+;;
+(defvar linemark-groups nil
+  "List of groups we need to track.")
+
+(defun linemark-create-group (name &optional defaultface)
+  "*Obsolete*.
+Create a group object for tracking linemark entries.
+Do not permit multiple groups with the same NAME.
+Optional argument DEFAULTFACE is the :face slot for the object."
+  (linemark-new-group 'linemark-group name :face defaultface)
+  )
+
+(defun linemark-new-group (class name &rest args)
+  "Create a new linemark group based on the linemark CLASS.
+Give this group NAME.  ARGS are slot/value pairs for
+the new instantiation."
+  (let ((newgroup nil)
+	(foundgroup nil)
+	(lmg linemark-groups))
+    ;; Find an old group.
+    (while (and (not foundgroup) lmg)
+      (if (string= name (object-name-string (car lmg)))
+	  (setq foundgroup (car lmg)))
+      (setq lmg (cdr lmg)))
+    ;; Which group to use.
+    (if foundgroup
+	;; Recycle the old group
+	(setq newgroup foundgroup)
+      ;; Create a new group
+      (setq newgroup (apply 'make-instance class name args))
+      (setq linemark-groups (cons newgroup linemark-groups)))
+    ;; Return the group
+    newgroup))
+
+(defun linemark-at-point (&optional pos group)
+  "Return the current variable `linemark-entry' at point.
+Optional POS is the position to check which defaults to point.
+If GROUP, then make sure it also belongs to GROUP."
+  (if (not pos) (setq pos (point)))
+  (let ((o (linemark-overlays-at pos))
+	(found nil))
+    (while (and o (not found))
+      (let ((og (linemark-overlay-get (car o) 'obj)))
+	(if (and og (linemark-entry-child-p og))
+	    (progn
+	      (setq found og)
+	      (if group
+		  (if (not (eq group (oref found parent)))
+		      (setq found nil)))))
+	(setq o (cdr o))))
+    found))
+
+(defun linemark-next-in-buffer (group &optional arg wrap)
+  "Return the next mark in this buffer belonging to GROUP.
+If ARG, then find that manu marks forward or backward.
+Optional WRAP argument indicates that we should wrap around the end of
+the buffer."
+  (if (not arg) (setq arg 1)) ;; default is one forward
+  (let* ((entry (linemark-at-point (point) group))
+	 (nc (if entry
+		 (if (< 0 arg) (linemark-end entry)
+		   (linemark-begin entry))
+	       (point)))
+	 (dir (if (< 0 arg) 1 -1))
+	 (ofun (if (> 0 arg)
+		   'linemark-previous-overlay-change
+		 'linemark-next-overlay-change))
+	 (bounds (if (< 0 arg) (point-min) (point-max)))
+	 )
+    (setq entry nil)
+    (catch 'moose
+      (save-excursion
+	(while (and (not entry) (/= arg 0))
+	  (setq nc (funcall ofun nc))
+	  (setq entry (linemark-at-point nc group))
+	  (if (not entry)
+	      (if (or (= nc (point-min)) (= nc (point-max)))
+		  (if (not wrap)
+		      (throw 'moose t)
+		    (setq wrap nil ;; only wrap once
+			  nc bounds))))
+	  ;; Ok, now decrement arg, and keep going.
+	  (if entry
+	      (setq arg (- arg dir)
+		    nc (linemark-end entry))))))
+    entry))
+
+;;; Methods that make things go
+;;
+(defmethod linemark-add-entry ((g linemark-group) &rest args)
+  "Add a `linemark-entry' to G.
+It will be at location specified by :filename and :line, and :face
+which are property list entries in ARGS.
+Call the new entrie's activate method."
+  (let ((file (plist-get args :filename))
+	(line (plist-get args :line))
+	(face (plist-get args :face)))
+    (if (not file)
+        (progn
+          (setq file (buffer-file-name))
+          (if file
+              (setq file (expand-file-name file))
+            (setq file (buffer-name)))))
+    (when (not line)
+      (setq line (count-lines (point-min) (point)))
+      (if (bolp) (setq line (1+ line))))
+    (setq args (plist-put args :filename file))
+    (setq args (plist-put args :line line))
+    (let ((new-entry (apply 'linemark-new-entry g args)))
+      (oset new-entry parent g)
+      (oset new-entry face (or face (oref g face)))
+      (oset g marks (cons new-entry (oref g marks)))
+      (if (oref g active)
+	    (linemark-display new-entry t))
+      new-entry)
+    ))
+
+(defmethod linemark-new-entry ((g linemark-group) &rest args)
+  "Create a new entry for G using init ARGS."
+  (let ((f (plist-get args :filename))
+	(l (plist-get args :line)))
+    (apply 'linemark-entry (format "%s %d" f l)
+	   args)))
+
+(defmethod linemark-display ((g linemark-group) active-p)
+  "Set object G to be active or inactive."
+  (mapc (lambda (g) (linemark-display g active-p)) (oref g marks))
+  (oset g active active-p))
+
+(defmethod linemark-display ((e linemark-entry) active-p)
+  "Set object E to be active or inactive."
+  (if active-p
+      (with-slots ((file filename)) e
+	(if (oref e overlay)
+	    ;; Already active
+	    nil
+          (let ((buffer))
+	    (if (get-file-buffer file)
+                (setq buffer (get-file-buffer file))
+              (setq buffer (get-buffer file)))
+            (if buffer
+		(save-excursion
+                  (set-buffer buffer)
+                  (save-excursion
+                    (goto-line (oref e line))
+                    (beginning-of-line)
+                    (oset e overlay
+                          (linemark-make-overlay (point)
+                                                 (save-excursion
+                                                   (end-of-line) (point))
+                                                 (current-buffer)))
+                    (with-slots (overlay) e
+                      (linemark-overlay-put overlay 'face (oref e face))
+                      (linemark-overlay-put overlay 'obj e)
+                      (linemark-overlay-put overlay 'tag 'linemark))))))))
+    ;; Not active
+    (with-slots (overlay) e
+      (if overlay
+	  (progn
+	    (condition-case nil
+		;; During development of linemark programs, this is helpful
+		(linemark-delete-overlay overlay)
+	      (error nil))
+	    (oset e overlay nil))))))
+
+(defmethod linemark-delete ((g linemark-group))
+  "Remove group G from linemark tracking."
+  (mapc 'linemark-delete (oref g marks))
+  (setq linemark-groups (delete g linemark-groups)))
+
+(defmethod linemark-delete ((e linemark-entry))
+  "Remove entry E from it's parent group."
+  (with-slots (parent) e
+    (oset parent marks (delq e (oref parent marks)))
+    (linemark-display e nil)))
+
+(defmethod linemark-begin ((e linemark-entry))
+  "Position at the start of the entry E."
+  (with-slots (overlay) e
+    (linemark-overlay-start overlay)))
+
+(defmethod linemark-end ((e linemark-entry))
+  "Position at the end of the entry E."
+  (with-slots (overlay) e
+    (linemark-overlay-end overlay)))
+
+;;; Trans buffer tracking
+;;
+;; This section sets up a find-file-hook and a kill-buffer-hook
+;; so that marks that aren't displayed (because the buffer doesn't
+;; exist) are displayed when said buffer appears, and that overlays
+;; are removed when the buffer buffer goes away.
+
+(defun linemark-find-file-hook ()
+  "Activate all marks which can benifit from this new buffer."
+  (mapcar (lambda (g) (linemark-display g t)) linemark-groups))
+
+(defun linemark-kill-buffer-hook ()
+  "Deactivate all entries in the current buffer."
+  (let ((o (linemark-overlays-in (point-min) (point-max)))
+	(to nil))
+    (while o
+      (setq to (linemark-overlay-get (car o) 'obj))
+      (if (and to (linemark-entry-child-p to))
+	  (linemark-display to nil))
+      (setq o (cdr o)))))
+
+(add-hook 'find-file-hooks 'linemark-find-file-hook)
+(add-hook 'kill-buffer-hook 'linemark-kill-buffer-hook)
+
+;;; Demo mark tool: Emulate MS Visual Studio bookmarks
+;;
+(defvar viss-bookmark-group (linemark-new-group 'linemark-group "viss")
+  "The VISS bookmark group object.")
+
+(defun viss-bookmark-toggle ()
+  "Toggle a bookmark on the current line."
+  (interactive)
+  (let ((ce (linemark-at-point (point) viss-bookmark-group)))
+    (if ce
+	(linemark-delete ce)
+      (linemark-add-entry viss-bookmark-group))))
+
+(defun viss-bookmark-next-buffer ()
+  "Move to the next bookmark in this buffer."
+  (interactive)
+  (let ((n (linemark-next-in-buffer viss-bookmark-group 1 t)))
+    (if n (goto-line (oref n line)) (ding))))
+
+(defun viss-bookmark-prev-buffer ()
+  "Move to the next bookmark in this buffer."
+  (interactive)
+  (let ((n (linemark-next-in-buffer viss-bookmark-group -1 t)))
+    (if n (goto-line (oref n line)) (ding))))
+
+(defun viss-bookmark-clear-all-buffer ()
+  "Clear all bookmarks in this buffer."
+  (interactive)
+  (mapcar (lambda (e)
+	    (if (or (string= (oref e filename) (buffer-file-name))
+                    (string= (oref e filename) (buffer-name)))
+		(linemark-delete e)))
+	  (oref viss-bookmark-group marks)))
+
+;; These functions only sort of worked and were not really useful to me.
+;;
+;;(defun viss-bookmark-next ()
+;;  "Move to the next bookmark."
+;;  (interactive)
+;;  (let ((c (linemark-at-point (point) viss-bookmark-group))
+;;	  (n nil))
+;;    (if c
+;;	  (let ((n (member c (oref viss-bookmark-group marks))))
+;;	    (if n (setq n (car (cdr n)))
+;;	      (setq n (car (oref viss-bookmark-group marks))))
+;;	    (if n (goto-line (oref n line)) (ding)))
+;;	;; if no current mark, then just find a local one.
+;;	(viss-bookmark-next-buffer))))
+;;
+;;(defun viss-bookmark-prev ()
+;;  "Move to the next bookmark."
+;;  (interactive)
+;;  (let ((c (linemark-at-point (point) viss-bookmark-group))
+;;	  (n nil))
+;;    (if c
+;;	  (let* ((marks (oref viss-bookmark-group marks))
+;;		 (n (member c marks)))
+;;	    (if n
+;;		(setq n (- (- (length marks) (length n)) 1))
+;;	      (setq n (car marks)))
+;;	    (if n (goto-line (oref n line)) (ding)))
+;;	;; if no current mark, then just find a local one.
+;;	(viss-bookmark-prev-buffer))))
+;;
+;;(defun viss-bookmark-clear-all ()
+;;  "Clear all viss bookmarks."
+;;  (interactive)
+;;  (mapcar (lambda (e) (linemark-delete e))
+;;	    (oref viss-bookmark-group marks)))
+;;
+
+;;;###autoload
+(defun enable-visual-studio-bookmarks ()
+  "Bind the viss bookmark functions to F2 related keys.
+\\<global-map>
+\\[viss-bookmark-toggle]     - To=ggle a bookmark on this line.
+\\[viss-bookmark-next-buffer]   - Move to the next bookmark.
+\\[viss-bookmark-prev-buffer]   - Move to the previous bookmark.
+\\[viss-bookmark-clear-all-buffer] - Clear all bookmarks."
+  (interactive)
+  (define-key global-map [(f2)] 'viss-bookmark-toggle)
+  (define-key global-map [(shift f2)] 'viss-bookmark-prev-buffer)
+  (define-key global-map [(control f2)] 'viss-bookmark-next-buffer)
+  (define-key global-map [(control shift f2)] 'viss-bookmark-clear-all-buffer)
+)
+
+(provide 'linemark)
+
+;;; linemark.el ends here
diff --git a/site/cedet-1.0pre7/eieio/lmcompile.el b/site/cedet-1.0pre7/eieio/lmcompile.el
new file mode 100644
index 0000000..720ebd0
--- /dev/null
+++ b/site/cedet-1.0pre7/eieio/lmcompile.el
@@ -0,0 +1,218 @@
+;;; lmcompile.el --- highlight compile error lines
+
+;;
+;; Author: Eric M. Ludlam <eludlam@mathworks.com>
+;; Maintainer: Eric M. Ludlam <eludlam@mathworks.com>
+;; Keywords: lisp
+;;
+;; Copyright (C) 2003, 2004, 2005, 2009 Eric M. Ludlam
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;;  This package uses the compile package, and the linemark package to
+;; highlight all lines showing errors.
+
+;;; Notes:
+;;
+;; Thanks to Markus Gritsch for adding support for grep-buffers, where
+;; no file is associated with a buffer.  (Similar work in linemark.el)
+
+(require 'linemark)
+
+;;; Code:
+(defclass lmcompile-linemark-group (linemark-group)
+  (
+   )
+  "Linemark Group for compile error highlights.")
+
+(defclass lmcompile-linemark-entry (linemark-entry)
+  ((errormarker :initarg :errormarker
+		:type marker
+		:documentation
+		"Marker pointing to the source of the match.")
+   (errmsg :initarg :errmsg
+	   :type string
+	   :documentation
+	   "The match text of the error in question.")
+   )
+  "Linemark Group for one compile error highlight.
+Tracks additional information about the error.")
+
+(defmethod linemark-new-entry ((g linemark-group) &rest args)
+  "Create a new entry for G using init ARGS."
+  (let ((f (plist-get args :filename))
+	(l (plist-get args :line)))
+    (apply 'lmcompile-linemark-entry (format "%s %d" f l)
+	   args)))
+
+(defmethod linemark-display ((e lmcompile-linemark-entry) active-p)
+  "Set object E to be active or inactive."
+  ;; Do the rest of our work
+  (call-next-method)
+
+  ;; Add a tool tip
+  (when (and active-p
+	     (slot-boundp e 'overlay)
+	     (oref e overlay)
+	     (slot-boundp e 'errmsg)
+	     )
+
+    (linemark-overlay-put (oref e overlay)
+			  'help-echo
+			  (oref e errmsg))
+    )
+  )
+
+(defun lmcompile-create-group (name)
+  "Create a group object for tracking linemark entries.
+Do not permit multiple groups with the same NAME."
+  (let ((newgroup (lmcompile-linemark-group name))
+	(foundgroup nil)
+	(lmg linemark-groups))
+    (while (and (not foundgroup) lmg)
+      (if (string= name (object-name-string (car lmg)))
+	  (setq foundgroup (car lmg)))
+      (setq lmg (cdr lmg)))
+    (if foundgroup
+	(setq newgroup foundgroup)
+      (setq linemark-groups (cons newgroup linemark-groups))
+      newgroup)))
+
+(defvar lmcompile-error-group
+  (linemark-new-group 'lmcompile-linemark-group "compiler errors")
+  "The LMCOMPILE error group object.")
+
+(defun lmcompile-clear ()
+  "Flush all compile error entries."
+  (interactive)
+  (mapcar (lambda (e) (linemark-delete e))
+	  (oref lmcompile-error-group marks)))
+
+;; Compatibility
+(if (fboundp 'compile-reinitialize-errors)
+    (defalias 'lmcompile-reinitialize-errors 'compile-reinitialize-errors)
+  ;; Newer versions of Emacs:
+  (defun lmcompile-reinitialize-errors (&rest foo)
+    "Find out what this should be."
+    (error "Need replacement for `compile-reinitialize-errors")
+    )
+  )
+
+;;;###autoload
+(defun lmcompile-do-highlight ()
+  "Do compilation mode highlighting.
+Works on grep, compile, or other type mode."
+  (interactive)
+
+  ;; Flush out the old
+  (lmcompile-clear)
+
+  ;; Set the buffer appropriately
+  (setq compilation-last-buffer (compilation-find-buffer))
+
+  ;; Get the list of errors to be activated.
+  (lmcompile-reinitialize-errors nil)
+  
+  (let ((marks
+	 (save-excursion
+	   (set-buffer compilation-last-buffer)
+	   compilation-error-list))
+	)
+    (while marks
+      (let (errmark
+            file
+            line
+            (face nil)
+            (case-fold-search t)
+            (txt nil)
+            )
+
+        (setq errmark (car (car marks)))
+        (if (listp (cdr (car marks)))
+            (progn ; So a list containing filename, linenumber, ... like (grep) provides is used.
+              (setq file (nth 1 (car marks)))
+              (setq line (nth 2 (car marks)))
+
+              (setq file (concat (car (cdr file))
+                                 (car file)))
+
+              ;; In case file contains an absolute path, the above doesn't work, at least not on Win32.  Use this version.
+              ;; Originally suggested by: Markus Gritsch
+              (if (not (file-exists-p file))
+                  (setq file (car (nth 1 (car marks))))))
+
+          (progn ; Otherwise we assume that we have a marker, which works also on buffers which have no file associated.
+            (setq file (buffer-name (marker-buffer (cdr (car marks)))))
+
+            (setq line (save-excursion
+                         (set-buffer (marker-buffer (cdr (car marks))))
+                         (save-excursion
+                           (goto-char (cdr (car marks)))
+                           (count-lines 1 (1+ (point))))))))
+
+	;; We've got the goods, lets add in an entry.
+	;; If we can't find the file, skip it.  It'll be
+	;; found eventually.
+	(when (or (file-exists-p file) (bufferp (marker-buffer (cdr (car marks)))))
+
+	  (condition-case nil
+	      (save-excursion
+		(set-buffer (marker-buffer errmark))
+		(save-excursion
+		  (goto-char errmark)
+	  
+		  (setq face (cond
+			      ((re-search-forward "error" (point-at-eol) t)
+			       'linemark-stop-face)
+			      ((re-search-forward "warning" (point-at-eol) t)
+			       'linemark-caution-face)
+			      (t
+			       'linemark-go-face)))))
+	    (error nil))
+
+	  (condition-case nil
+	      (save-excursion
+		(set-buffer (marker-buffer errmark))
+		(save-excursion
+		  (goto-char errmark)
+		  (setq txt (buffer-substring-no-properties
+			     (point-at-bol) (point-at-eol)))
+		  ;; Strip positional information
+		  (while (string-match "[0-9]:" txt)
+		    (setq txt (substring txt (match-end 0))))
+		  ;; Strip leading whitespace (if any)
+		  (when (string-match "^\\s-++" txt)
+		    (setq txt (substring txt (match-end 0))))
+		  ))
+	    (error nil))
+
+	  (linemark-add-entry
+	   lmcompile-error-group
+	   :filename file
+	   :line line
+	   :errormarker errmark
+	   :face face
+	   :errmsg txt
+	   )
+
+	  ))
+      (setq marks (cdr marks)))))
+
+(provide 'lmcompile)
+
+;;; lmcompile.el ends here
diff --git a/site/cedet-1.0pre7/semantic/AUTHORS b/site/cedet-1.0pre7/semantic/AUTHORS
new file mode 100644
index 0000000..000bfd9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/AUTHORS
@@ -0,0 +1,4 @@
+Eric M. Ludlam <zappo@gnu.org>
+David Ponce <david@dponce.com>
+Richard Kim <ryk@dspwiz.com>
+Klaus Berndl <klaus.berndl@sdm.de>
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/semantic/ChangeLog b/site/cedet-1.0pre7/semantic/ChangeLog
new file mode 100644
index 0000000..2e74931
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ChangeLog
@@ -0,0 +1,23484 @@
+2010-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el (semantic-ia-get-completions,semantic-ia-get-completions-deprecated):
+	Deprecation replacements for old fcns.
+
+2010-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi,semantic-texi-update-doc-from-source):
+	Use SRecode to insert the doc instead of the old "document" feature
+	which was deprecated.
+
+	* semanticdb-find.el (semanticdb-test-current-database-list): New.
+
+2010-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest-c.el (semantic-utest-c-conditionals):
+	Disable test in XEmacs
+
+	* semantic-texi.el (semantic-default-texi-setup):
+	Add senator-step-at-tag-classes
+
+	* semantic-html.el (semantic-default-html-setup):
+	Add senator-step-at-tag-classes
+
+2010-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (varname): Remove opt-assign support.
+	(varname-opt-initializer): New, use assign and list.
+	(varnamelist): Add opt initializer here.
+
+	* bovine/c.by (expr-binop): New.
+	(expression): Handle binary expressions
+	(unaryexpression): The old expression.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Strip out duplicates
+	from scopetypes.
+	(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
+	looking for as part of the scoped tags list.
+
+	* bovine/semantic-c.el (semantic-expand-c-tag-namelist):
+	Split a full type from a typedef out
+	to its own tag.
+
+	* tests/testtypedefs.cpp (epd_info, epd_probe):
+	New example from yupeng.
+
+2010-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el (semantic-default-which-function):
+	Fix bug where color was missused as PARENT for
+	semantic-format-tag-name.
+	Use semantic-type-relation-separator-character as the separator
+	instead of hard-coding the ".".
+
+2010-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el: (semantic-c-convert-spp-value-to-hideif-value)
+	(semantic-c-evaluate-symbol-for-hideif): If a string matches a
+	number regexp, convert to a number.
+
+2010-02-09  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* semantic-utest.el (semantic-utest-Python-buffer-contents):
+	extended Python test code
+	(semantic-utest-Python-name-contents): added corresponding expected
+	tags
+	(semantic-utest-Python): cosmetic changes
+	(semantic-utest-kill-indicator): fixed typo in comment
+
+2010-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el (semantic-edits-assert-valid-region): Doc fix.
+
+2010-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-work-parse-neighboring-files-flag):
+	Default now nil.
+	(semantic-idle-work-update-headers-flag): Default now nil.
+
+	* semantic-load.el (semantic-load-enable-code-helpers):
+	Also set idle work update-headers to t.
+	(semantic-load-enable-gaudy-code-helpers):
+	Move the loading of code helpers to the front.
+	Set idle work parse neighboring files to t
+	(semantic-load-enable-excessive-code-helpers):
+	Move loading of gaudy helpers first.
+
+2010-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile (Tests_MISC): Add testsppcond.cpp
+
+	* tests/Project.ede ("semantic/tests"): Add "testsppcond.cpp".
+
+	* semantic-load.el (semantic-load-enable-excessive-code-helpers):
+	Fix type turning on
+	global-semantic-idle-tag-highlight-mode.
+
+2010-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testnsp.cpp (AAA, AAA::Private, AAA::aaa): New completion test.
+
+	* semanticdb-typecache.el (semanticdb-typecache-faux-namespace):
+	New, extracted from merge below.
+	(semanticdb-typecache-merge-streams):
+	Use above fcn directly.
+	When determining when to merge, if any tag is faux, then assume there
+	could be a missmatch due to unknown use case, and merge anyway.
+	(semanticdb-expand-nested-tag): New overload.
+	(semanticdb-table::semanticdb-typecache-file-tags):
+	When deriving tags from a file, give the mode a chance to monkey with
+	the tag copy, expanding tags as needed.
+
+	* bovine/semantic-c.el (c++-mode::semanticdb-expand-nested-tag):
+	New override.
+
+2010-01-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-load-enable-excessive-code-helpers):
+	Enable idle tag highlight mode.
+
+	* semantic-decorate-include.el (semantic-decoration-on-unknown-includes):
+	Change light background
+	color to be paler.
+	(semantic-decoration-on-includes-highlight-default):
+	Check that the include tag has a postion based on reported stack
+	trace.  Not sure how to reproduce.
+
+	* semantic-idle.el (semantic-idle-work-update-headers-flag): New
+	(semantic-idle-work-for-one-buffer): Use above.
+
+2010-01-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-prefix-map): Add keybinding for a full reparse.
+
+	* semantic-utest-c.el (semantic-utest-c-conditionals): New
+	(semantic-utest-c): Convert to dispatching to different fcns.
+	(semantic-utest-c-compare): Renamed from semantic-utest-c.
+	No longer interactive.
+	(semantic-utest-c-conditionals): New.
+
+	* tests/testsppcond.cpp: New tests.
+
+	* bovine/semantic-c.el (semantic-lex-c-if):
+	Change to only handle #if, and #elif.
+	(semantic-c-do-lex-if): Handle errors from hideif.
+	(semantic-lex-c-ifdef): New, just for ifdef and ifndef.
+	(semantic-c-do-lex-ifdef): Resurrected from older revision, but just
+	for ifdefs.
+	(c-mode::semantic-parse-region): Add semantic-lex-c-ifdef.
+
+2010-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (require): Add hideif.
+	(semantic-c-skip-conditional-section): Add comments.
+	(semantic-lex-c-if): Shortened.
+	Patch from Brian Carlson, and re-written a lot.
+	(semantic-c-do-lex-if): Use hideif.
+	(semantic-c-convert-spp-value-to-hideif-value)
+	(semantic-c-evaluate-symbol-for-hideif): New macro eval.
+	(semantic-c-hideif-lookup, semantic-c-hideif-defined):
+	New hideif replacement fcns.
+	(semantic-c-takeover-hideif): New state var.
+	(hif-defined, hif-lookup): New advice.
+
+2010-01-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsppreplaced.c (mr_moose_ops): New test.
+
+	* tests/testsppreplace.c (mr_moose, mr_moose_ops): New test.
+
+	* semantic-lex-spp.el (semantic-lex-spp-lex-text-string):
+	Add recursion limit.
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Put a recursion limit in.
+
+2010-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el: Patch from Hannu Koivisto:
+	(semantic-ia-cache): deleted
+	(semantic-ia-get-completions): deleted
+	(semantic-ia-complete-symbol, semantic-ia-complete-symbol-menu):
+	(semantic-ia-complete-tip): don't use above.
+
+	* doc/user-guide.texi: Patch from Hannu Koivisto:
+	(semanticdb, Semanticdb Search Configuration):
+	it's -> its fixes.
+
+	* doc/tags.texi: Patch from Hannu Koivisto:
+	(Tag Query):  it's -> its fixes.
+
+	* doc/app-dev-guide.texi: Patch from Hannu Koivisto:
+	(Tag Highlighting, Tag Members, DB Search Paths, Semanticdb references):
+	(Context Analysis):
+	 it's -> its fixes.
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map):
+	it's -> its doc fix.
+
+	* semanticdb-ref.el (semanticdb-ref-test): it's -> its doc fix.
+
+	* semanticdb-find.el (semantic-reset, semanticdb-find-translate-path):
+	it's -> its doc fix.
+
+	* semantic-tag.el (semantic-tag-function-parent): it's -> its doc fix.
+
+	* semantic-sort.el (semantic-tag-external-member-p):
+	it's -> its doc fix.
+
+	* semantic-decorate.el (semantic-unhighlight-tag): it's -> its doc fix.
+
+2010-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-table::semanticdb-refresh-table):
+	Modified patch originally from Iain Nicol.
+	If forcing a refresh on a file not in a buffer, use
+	semantic-find-file-noselect, and delete the buffer after use.
+
+2009-12-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (EMACS): Remove.
+
+	* semantic-scope.el (semantic-analyze-scoped-inherited-tag-map):
+	Add note about save-excursion.
+
+	* semantic-doc.el (semantic-documentation-comment-preceeding-tag):
+	Add autoload cookie.
+
+2009-12-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-calc.el (wisent-calc, wisent-calc-utest):
+	Add autoload cookies.
+
+	* wisent/wisent-calc.el (wisent-calc): Return answer.
+	Don't print message if not interactive.
+	(wisent-calc-factorial, wisent-calc-not, wisent-calc-=): New.
+	(wisent-calc-test-expressions): New variable.
+	(wisent-calc-utest): New test.
+
+	* wisent/wisent-calc.wy (FACT,NOT): New
+	(exp): Add = now does 0 or 1, not nil/t
+	Add ~ (not) operator.
+	Add ~ (factorial) operator.
+	(wisent-calc-setup-parser): Add ~ and ! to syntax table.
+
+2009-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-calc.wy (exp):
+	Fix quoting in of ^ character.  Apparently \^ is some big-ass number.
+
+2009-12-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-dep.el (semantic-dependency-find-file-on-path):
+	Fix case dereferencing
+	ede-object when it is a list.
+
+2009-12-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-test-translate-path):
+	Remove require of adebug.
+
+2009-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-skip-conditional-section): Comment
+	(semantic-c-describe-environment): Add project macro symbol array.
+
+2009-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-do-completion): Fix typo.
+
+	* semantic-complete.el (semantic-complete-do-completion):
+	Comment out two lines to improve
+	completion behavior.
+	Patch from Chong Yiddong:
+	(semantic-complete-read-tag-engine): Add 'default' to default
+	(semantic-complete-test,semantic-complete-jump-local):
+	Add "Jump To" to prompts
+
+2009-10-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el: Merge from Emacs:
+	(semantic-complete-read-tag-engine)
+	(semantic-complete-inline-tag-engine)
+	(semantic-complete-inline-custom-type)
+	(semantic-complete-read-tag-analyzer):
+	Fix spelling.
+
+2009-10-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-anlyzer-do-replace):
+	When extracting the argument list, limit only by point-max.
+
+	* tests/testsppreplaced.c, tests/testsppreplace.c (myFcn4): New test.
+
+2009-10-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Call below instead of pulling up a
+	.emacs file.
+	(semantic-c-debug-mode-init-last-mode)
+	(semantic-c-debug-mode-init, semantic-c-debug-mode-init-pch):
+	New for debugging mode inits.
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Add some messaging to mode initialization.
+
+2009-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Fix generation issue.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/Makefile (ELISPPRELOAD): New
+	(symref): Use above.
+
+	* symref/Project.ede (symref): Add preload compiler and preloads.
+
+	* bovine/Makefile (ELISPPRELOAD): New
+	(languages): Use above.
+
+	* bovine/Project.ede (languages): Add preload compiler and preloads.
+
+	* semanticdb-find.el (require): Add adebug.
+	Merge from Emacs
+	(semanticdb-implied-include-tags)
+	(semanticdb-find-test-translate-path)
+	(semanticdb-find-adebug-insert-scanned-tag-cons)
+	(semanticdb-find-result-mapc)
+	(semanticdb-find-toggle-logging)
+	(semanticdb-brute-find-tags-by-class)
+	(semanticdb-brute-deep-find-tags-for-completion):
+	Misc typo fixes.
+
+	* Makefile (ELISPRELOAD): New
+	(semantic, utils, Database, Tools, Analyzer):
+	Add in preloads.
+
+	* Project.ede (semantic, utils, Database, tools, Analyzer, Languages):
+	Use preload compiler, add preloads.
+
+2009-10-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-tag-highlight): Use
+	semantic-idle-summary-highlight-face as the highlighting.
+
+2009-10-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el (semantic-analyze-scoped-inherited-tag-map):
+	Wrap calculation of tmpscope so that the regular scope will continue
+	to work.
+
+2009-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-highlight-func-mode): Fix doc.
+
+	* semantic-fw.el (semantic-buffer-local-value):
+	Add an Emacs 21 variant.
+
+2009-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-mode.el: Patch from Chong Chong Yidong
+	(semanticdb-mode-hook): Rename from *-hooks.
+	Define obsolete alias.
+	(global-semanticdb-minor-mode, semanticdb-semantic-init-hook-fcn):
+	Use new hook name.
+
+	* semanticdb-global.el: Patch from Chong Chong Yidong
+	(semanticdb-enable-gnu-global-databases): Use new hook names.
+
+	* semantic.el: Patch from Chong Chong Yidong
+	(semantic-init-hook, semantic-init-mode-hook)
+	(semantic-init-db-hook): Rename from *-hooks.  Define obsolete aliases.
+	(semantic-new-buffer-fcn): Use new hook names.
+
+	* semantic-util.el: Patch from Chong Chong Yidong
+	(semantic-describe-buffer): Use new hook names.
+
+	* semantic-util-modes.el: Patch from Chong Chong Yidong
+	(semantic-show-parser-state-mode-setup)
+	(semantic-mode-line-update, semantic-toggle-minor-mode-globally):
+	Use new hook names.
+
+	* semantic-load.el: Patch from Chong Chong Yidong
+	(semantic-load-enable-code-helpers)
+	(semantic-load-enable-excessive-code-helpers): Use new hook names.
+
+	* semantic-imenu.el: Patch from Chong Chong Yidong
+	(semantic-imenu-semanticdb-hook): Use new hook name semanticdb-mode-hook.
+
+	* semantic-idle.el: Patch from Chong Chong Yidong
+	(semantic-before-idle-scheduler-reparse-hook)
+	(semantic-after-idle-scheduler-reparse-hook): Rename from *-hooks.
+	Define obsolete aliases.
+	(semantic-idle-scheduler-refresh-tags): Use new hook names.
+
+	* semantic-fw.el: Patch from Chong Chong Yidong
+	(semantic-find-file-noselect): Use new hook names.
+
+	* semantic-edit.el: Patch from Chong Chong Yidong
+	(semantic-edits-incremental-reparse-failed-hook):
+	Rename from *-hooks.  Define obsolete alias.
+	(semantic-edits-incremental-fail): Use new hook name.
+
+	* semantic-decorate-mode.el: Patch from Chong Yidong
+	(semantic-decorate-pending-decoration-hook):
+	Rename from *-hooks.  Define obsolete alias.
+	(semantic-decorate-add-pending-decoration)
+	(semantic-decorate-flush-pending-decorations): Use new hook name.
+
+2009-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-skip-conditional-section): Doc fix.
+	(semantic-c-parse-lexical-token):
+	Protect against initializing the major mode from throwing errors, ie-
+	user hooks.
+
+	* semantic-lex-spp.el (semantic-lex-spp-lex-text-string):
+	Protect installing a major mode from throwing errors.
+
+2009-09-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el: Patch from Chong Yidong:
+	(semanticdb-project-database-file::semanticdb-file-directory-exists-p):
+	Use semanticdb--inhibit-make-directory to only ask the user once to
+	create a non-existant .semanticdb directory.
+
+	* semanticdb.el: Patch from Chong Yidong:
+	(semanticdb--inhibit-create-file-directory): New
+	(semanticdb-save-all-db): bind above when saving the database list.
+
+	* senator.el: Patch from Chong Yidong:
+	(senator-find-tag-for-completion):
+	Only call semanticdb-fast-strip-find-results on semanticdb results.
+	Remove tagsb local variable.
+
+2009-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Wrap the "goto" part with save-match-data.
+
+	* bovine/semantic-c.el (semantic-c-parse-token-hack-depth): New
+	(semantic-c-parse-lexical-token): Allow recursion.
+
+2009-09-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Save match data when setting up the
+	secondary parse buffer.
+
+	* semantic-lex-spp.el (semantic-lex-spp-lex-text-string):
+	Save match data around calling the major mode to enable.
+
+2009-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-table::semanticdb-get-buffer):
+	Wrap find-file in save-match-data
+
+	* semanticdb-global.el (semanticdb-test-gnu-global):
+	Wrap find-file in save-match-data
+
+	* semantic-util.el (semantic-file-tag-table, semantic-recursive-find-nonterminal-by-name):
+	Wrap find-file in save-match-data
+
+	* semantic-tag.el (semantic-tag-buffer):
+	Wrap find-file in save-match-data
+
+	* semantic-fw.el (semantic-find-file-noselect):
+	Wrap find-file in save-match-data
+
+	* semantic-format.el (semantic-format-tag-short-doc-default):
+	Wrap find-file in save-match-data
+
+	* document-vars.el, document.el, semantic-cb.el: Remove obsolete files.
+
+2009-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsppreplaced.c (ABtest): New test result.
+
+	* tests/testsppreplace.c (CONCAT,PASTE,OBJ,PREFIX,ABtest):
+	New macros and test.
+
+2009-09-13  David Engster <dengste@eml.cc>
+
+	* tests/testusing.cpp, tests/testusing.hh (alias_for_somestuff, alias_for_outerinner):
+	New tests for normal namespace
+	aliases.
+
+	* bovine/semantic-c.el (semantic-c-dereference-namespace-alias):
+	Deal correctly with nested
+	namespaces.  Make sure type actually exists in original namespace.
+
+2009-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Use below fcn.  Don't run tests if nil.
+	(semantic-ia-utest-ffns): New.
+
+	* semantic-format.el: Used whitespace-cleanup
+
+	* semantic-format.el (semantic-test-all-format-tag-functions):
+	Moved to end of file.
+
+2009-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-hack-depth): New var.
+	(semantic-lex-spp-lex-text-string): Use above to enable recursion.
+
+	* semantic-fw.el (data-debug; add-specialized-thing):
+	Add custoimzations to data-debug for semantic tags.
+
+	* semantic-analyze.el (semantic-adebug-analyze):
+	New (moved from semantic-adebug.el)
+
+	* semantic-adebug.el (eieio,semantic,semantic-tag,semantic-format,semantic-find):
+	New requires.
+	(semantic-adebug-analyze, semantic-adebug-edebug-expr): Deleted.
+
+2009-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-adebug.el, semantic-analyze-complete.el, semantic-analyze-debug.el, semantic-analyze-fcn.el, semantic-analyze-refs.el, semantic-analyze.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semantic-chart.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-chart-database-size): Change if to unless.
+
+	* semantic-complete.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-complete-inline-custom-type)
+	(semantic-complete-inline-analyzer-displayor-class):
+	Moved earlier in the file.
+
+	* semantic-ctxt.el, semantic-debug.el, semantic-decorate-include.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semantic-decorate-mode.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(global-semantic-decoration-mode): Moved to fix bytecomp warnings.
+
+	* semantic-dep.el, semantic-doc.el, semantic-elp.el, semantic-find.el, semantic-fw.el, semantic-html.el, semantic-ia-sb.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semantic-ia.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-ia-insert-tag, semantic-ia-insert-tag-default):
+	Moved earlier in the file.
+
+	* semantic-idle.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-ctxt): Move require to top of file.
+
+	* semantic-lex-spp.el, semantic-sb.el, semantic-scope.el, semantic-tag-write.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semantic-lex.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-lex-token-bounds, semantic-lex-token-start)
+	(semantic-lex-token-end, semantic-lex-unterminated-syntax-detected):
+	Moved earlier in the file.
+
+	* semantic-tag.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic--tag-get-property, semantic-tag-type-members)
+	(semantic-tag-type, semantic--tag-unlink-list-from-buffer)
+	(semantic--tag-link-list-to-buffer):
+	Moved earlier in the file.
+
+	* semantic-texi.el, semantic-util-modes.el, semantic-util.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semantic.el: Patch from Chong Yidong:  Remove trailing whitespace.
+	Move version number decl after Commentary.
+	Fix footer.
+
+	* semanticdb-debug.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semanticdb-ebrowse.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semanticdb-table-ebrowse, semanticdb-project-database-ebrowse):
+	Moved earlier in the file.
+
+	* semanticdb-el.el, semanticdb-file.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* semanticdb-find.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semanticdb-find-table-for-include): Moved the overload, but not
+	the default impl.
+
+	* semanticdb-global.el:
+	Patch from Chong Yidong:  Remove trailing whitespace, and
+	(semanticdb-project-database-global): Moved to fix bytecomp warning.
+
+	* semanticdb-javascript.el, semanticdb-mode.el, semanticdb-typecache.el, bovine/bovine-debug.el, bovine/semantic-bovine.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* bovine/semantic-c.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+	(semantic-expand-c-tag): Fix typo on local variable typeref.
+
+	* bovine/semantic-el.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* bovine/semantic-java.el: Remove unused History section.
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* bovine/semantic-make.el, symref/semantic-symref-filter.el, symref/semantic-symref-list.el, symref/semantic-symref.el, wisent/wisent-comp.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* wisent/wisent-java.el: Remove History seciton.
+
+	* wisent/wisent-javascript.el, wisent/wisent.el:
+	Patch from Chong Yidong:  Remove trailing whitespace.
+
+	* bovine/semantic-java.el: (semantic-java-prototype-function)
+	(semantic-java-prototype-variable)
+	(semantic-java-prototype-type): Doc fix
+	(java-mode::semantic-format-tag-prototype):
+	Renamed from semantic-format-prototype-tag, which didn't match
+	the overloadable function.
+
+2009-09-08  David Engster <dengste@eml.cc>
+
+	* doc/grammar-fw.texi (Grammar Development Cycle): typo
+
+2009-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-analyzer-push-tokens-for-symbol):
+	Add count to
+	locally bound variables.
+
+2009-09-02  David Engster <dengste@eml.cc>
+
+	* tests/testpolymorph.cpp:
+	Added further examples for template specializations.
+
+	* tests/testusing.cpp, tests/testusing.hh (otherstuff, morestuff, evenmorestuff, outer::inner):
+	Various new tests
+	for the new namespace/using dereferencer.
+
+	* bovine/semantic-c.el:
+	(semantic-c-dereference-namespace, semantic-c-dereference-namespace-alias)
+	(semantic-c-check-type-namespace-using):  New dereferencer for namespace
+	aliases and for types which are aliased through using statements.
+	(semantic-analyze-dereference-metatype): Include the above.
+
+2009-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-work-core-handler):
+	Move test for the semanticdb
+	feature out a level to also encompas the two calls to semanticdb save.
+
+2009-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (commentary): Add missings cases of const.
+
+	* tests/testpolymorph.cpp: Polymorphism test file.
+
+2009-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-skel.el, semanticdb-javascript.el, semanticdb-java.el, semanticdb-global.el, semanticdb-el.el, semanticdb-cscope.el (semanticdb-search):
+	Remove require.
+
+	* semanticdb.el, semanticdb-find.el: (semanticdb-search-results-table)
+	(semanticdb-search-results-table::semanticdb-refresh-table):
+	Copied from semanticdb-search.
+
+	* semanticdb-search.el: (semanticdb-search-results-table)
+	(semanticdb-search-results-table::semanticdb-refresh-table): Deleted.
+
+2009-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-javascript.el (semanticdb-javascript):
+	Fix provide statement.
+
+	* tests/Makefile (Tests_MISC): Add testnsp.cpp
+
+	* tests/Project.ede (Tests): Add testnsp.cpp.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-split-signature-summary-default):
+	Add space to list of splitting chars.
+
+	* semantic-utest-c.el (semantic-utest-c): Improve failure message.
+
+2009-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (sformat): Eliminate use of sformat
+	(semantic-grammar-header-template, semantic-grammar-footer-template):
+	Convert to a list w/ symbols instead of sformat.
+	(semantic-grammar-header, semantic-grammar-footer): Expand the
+	template without SFormat.
+	(semantic-grammar-eldoc-get-macro-docstring): Fix compile warning in
+	Emacs 23.
+
+	* semantic-lex-spp.el (semantic-lex-spp-one-token-to-txt):
+	Add short-circuit to avoid
+	recursion on self-referencing names.
+	(semantic-lex-spp-lex-text-string): Always set up buffer local spp
+	specific variables in specialized buffer since they change over time.
+
+2009-08-29  David Engster <dengste@eml.cc>
+
+	* tests/testsppreplace.c, tests/testsppreplaced.c (std, inside_std_namespace):
+	New test for VC++ macro hack (_STD_BEGIN/END).
+
+	* bovine/semantic-c.el: (semantic-lex-c-VC++-begin-std-namespace)
+	(semantic-lex-c-VC++-end-std-namespac): New analyzers to handle VC++
+	namespace macros _STD_BEGIN and _STD_END.
+	(semantic-c-lexer): Include the above.
+
+2009-08-28  David Engster <dengste@eml.cc>
+
+	* bovine/semantic-gcc.el (semantic-gcc-setup):
+	Remove parsing of CPATH/C(PP)_INCLUDE_PATH environment
+	variables. It is not used anymore and throws an error when undefined.
+
+2009-08-26  David Engster <dengste@eml.cc>
+
+	* bovine/semantic-gcc.el (semantic-gcc-query):
+	Set LC_ALL instead of LC_MESSAGE to enforce English
+	output, since it has higher priority.
+
+2009-08-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-lex-text-string):
+	Wrap sub-buffer part in save-excursion.
+
+2009-08-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Added testnsp.cpp.
+
+	* semantic-scope.el (semantic-analyze-scoped-inherited-tag-map):
+	Add section to calculate a new miniscope to use when looking up the
+	parent in case the name provided in the parent of TYPE can only be
+	found in that scope.
+
+	* tests/testnsp.cpp:
+	New tests for class parent names derived from local scope.
+
+	* semantic-lex-spp.el (semantic-lex-spp-stream-for-arglist):
+	Enable the test I talked about
+	in the previous checkin.
+
+	* semantic-lex-spp.el (semantic-lex-spp-stream-for-arglist):
+	Add case for if the incoming token carries a string with it.  If it
+	does call below instead.
+	(semantic-lex-spp-lex-text-string): New.
+
+2009-08-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (declaration, codeblock,namespacesubparts):
+	Remove tag creation code for using.
+	(type): Daveid Engster patch:  Parse namespace foo=bar;
+	(using): Break out the name part of the using to below.
+	Create using tag here, differentiating based on namespace.
+	(usingname): New
+
+2009-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-c.el (wisent-c-lex-buffer):
+	Fix nakes of keyword and token tables for c.
+
+	* tests/testdoublens.cpp (foo_fcn):
+	New test for senator-go-to-up-reference.
+
+	* tests/Makefile (Tests_MISC): Add testvarnames.c
+
+	* tests/Project.ede (Tests): Add testvarnames.
+
+	* bovine/semantic-gcc.el (semantic-gcc-test-strings):
+	Add a bsd example.
+	(semantic-gcc-test-output-parser): Don't test for the prefix, as it is
+	not used anymore.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-partial-synchronize):
+	Be sure to re-update the lexical table.
+
+	* semanticdb-find.el (semanticdb-implied-include-tags):
+	Improve documentation.
+
+	* semantic-lex-spp.el (semantic-lex-spp-table-write-slot-value):
+	Add another error test.
+
+2009-07-28  Alex Ott <alexott@gmail.com>
+
+	* bovine/semantic-gcc.el:
+	explicitly set LC_MESSAGES to C to avoid problems with output in different languages
+
+2009-07-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semantic-ectag-lang.el (semantic-ectag-add-language-support):
+	Renamed (fixed spelling)
+	(*-mode): Fixed setup to use correct spelling of above.
+
+2009-07-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add testvarnames.c
+
+	* bovine/semantic-c.el (semantic-expand-c-tag):
+	Remove names-as-list part into below new tag.
+	Also support extracting complex :type from var or fcn to make it it's
+	own tag at the toplevel, but only if it has a name.
+	(semantic-expand-c-tag-namelist):
+	New fcn, derived from above.
+
+	* tests/testvarnames.c:
+	Tests var variables with inline structures with names.
+
+2009-07-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-expand-c-tag):
+	Change to use `semantic-tag-of-class-p'.
+	(semantic-c-reconstitute-token):
+	Remove extra restriction on fcn ptr detection.
+
+2009-07-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testusing.hh: Patch from David Engster:
+	(somestuff::OnceClass): New test class
+
+	* tests/testusing.cpp: Patch from David Engster:
+	(func2,func3): New
+
+2009-07-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-c-nested-namespace-ignore-second):
+	Expand on doc string.
+	(c++-mode::semantic-ctxt-scoped-types): Patch from David Engster:
+	Capture using statements from the context within a function.
+
+2009-07-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (codeblock): Add using support.
+
+	* bovine/semantic-gcc.el (semantic-gcc-setup):
+	Remove unused first argument.
+	(semantic-gcc-test-output-parser-this-machine): New.
+
+	* bovine/semantic-gcc.el: Patch from Lennart Borgman:
+	(semantic-gcc-query): Dox fix.  Capture error text also.
+	(semantic-gcc-get-include-paths): New.
+	(semantic-cpp-defs): Dox fix.
+	(semantic-gcc-fields): Be robust to foreign languages.
+	(semantic-gcc-setup): Change how include paths are extracted from GCC.
+	Provide separate include paths for both C and C++.
+	(semantic-gcc-test-strings): Add David Engster's gcc output.
+	(semantic-gcc-test-output-parser): Also query --target for the target.
+
+	* semantic-util.el (semantic-describe-buffer): Use `help-setup-xref'.
+
+	* semantic-decorate-include.el: (semantic-decoration-include-describe)
+	(semantic-decoration-unknown-include-describe)
+	(semantic-decoration-unparsed-include-describe)
+	(semantic-decoration-all-include-summary):
+	Use `help-setup-xref'.
+
+	* doc/user-guide.texi (semanticdb-implied-include-tags): New doc.
+
+	* semanticdb-find.el (semanticdb-implied-include-tags):
+	New configuration
+	(semanticdb-find-translate-path-includes--internal): Include all
+	implied include tags.
+
+	* bovine/semantic-c.el (semantic-lex-c-nested-namespace-ignore-second):
+	New configuration
+	(semantic-lex-c-namespace-begin-nested-macro):
+	If above is t, squeeze out the second namespace.
+
+	* semantic-utest-c.el (semantic-utest-c):
+	Force obey of nested namespace.
+
+2009-07-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (define-child-mode): Moved to beginning of file.
+	(semantic-c-reset-preprocessor-symbol-map):
+	Throw a message if a refresh fails.
+
+	* ctags/semantic-ectag-parse.el: Patch from Ray Racine:
+	(semantic-ectag-parse-one-tag): Add Scala tag support such as:
+	value, import, trait.
+
+2009-07-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	when getting lexical
+	tables, use the FORCE argument to make sure the table is up to date.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-refresh-table):
+	Add unused
+	FORCE argument.
+
+	* semanticdb-search.el (semanticdb-table::semanticdb-refresh-table):
+	Add unused FORCE argument.
+
+	* semanticdb.el (semanticdb-table::semanticdb-refresh-table):
+	Add a FORCE option
+	to not optimize out files not in buffers.
+
+2009-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-grep.el (grep): Require of grep optional.
+
+	* bovine/Makefile, ctags/Makefile (VERSION): Updated to 1.0pre7
+
+	* semanticdb-mk.el: Add comments about an enhancement.
+
+	* semantic-decorate-include.el: (semantic-decoration-include-describe)
+	(semantic-decoration-unknown-include-describe)
+	(semantic-decoration-unparsed-include-describe)
+	(semantic-decoration-all-include-summary): Use `help-buffer' instead
+	of "*Help*" for identifying the buffer to display help in.
+
+2009-06-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-save-db):
+	Move the query for dirtyness first in the list to cut down on file io.
+
+2009-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-self-insert):
+	Exit if already doing completion.
+	Add a call to refresh any tags at the beginning.
+	Wrap possibly lengthy calculations with `semantic-exit-on-input'.
+
+	* ctags/semantic-ectag-util.el (semantic-ectag-program-list): New.
+	(semantic-ectag-program): default as nil.
+	(semantic-ectag-program): New function to loop over program list
+	looking for a likely ctags candidate.
+	(semantic-ectag-run): Use above function.
+	(semantic-ectag-version): Be robust to errors running ctags.
+	Produce a wider range of useful error messages.
+	(semantic-ectag-test-version): Be robust to ctags not running,
+	and error w/ a useful command.
+
+2009-05-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Tag Query): Update doc for semantic-tag-docstring.
+
+	* semantic-tag.el (semantic-tag-docstring):
+	Add refs to `semantic-documentation-for-tag' in doc string.
+
+2009-05-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-documentation-for-tag):
+	Only extract doc
+	from a tag that has a buffer location.
+
+2009-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	Use `semantic-buffer-local-value' in place of `buffer-local-value'.
+
+	* semantic-fw.el (semantic-buffer-local-value):
+	New alias for Emacs and XEmacs.
+
+2009-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-scm.el (semantic-scheme-lexer):
+	Use semantic-lex-scheme-symbol instead of the
+	built-in one.
+
+	* bovine/scheme.by (semantic-scheme-lexer): Add number support.
+
+	* bovine/semantic-scm.el (semantic-lex-scheme-symbol): New analyzer
+	(semantic-scheme-lexer): Add number support
+
+2009-05-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el: Patch from Henry S. Thompson
+	(semantic-go-to-tag): Protect against non-tag parent when getting
+	:line attribute.
+
+	* semantic-utest.el (semantic-utest-temp-directory): New variable.
+	(semantic-utest-fname): Use above.
+
+	* semantic-format.el: Suggestion from Klaus Berndl:
+	(semantic--format-colorize-text): Return text if no font-lock.
+
+2009-04-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-core-handler):
+	Move save-excursion around each idle service.
+	(semantic-idle-tag-highlight):
+	Doc fix.
+
+2009-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (senator):
+	Add senator-go-to-up-reference, and some more keybindings.
+
+	* senator.el (senator-go-to-up-reference):
+	Allow semantic-up-reference to return
+	things other than tags.
+	(semantic-up-reference-default):
+	For includes, also return a buffer or a file.
+	For tags, use analyzer tools to find the miscelaneous things, such as
+	supperclasses, or method class, or non-prototypes.
+	(senator-prefix-map): Add keybindings for semantic symref.
+	(senator-menu-bar): Rename symref menu items to be more clear.
+	Add UML / COGRE submenu.
+
+	* semantic-complete.el (semantic-complete-analyze-inline):
+	Do not do a pretend TAB if there was nothing to complete.
+
+	* semantic-util-modes.el: Patch suggestion from Klaus Berndl
+	(semantic-stickyfunc-indent-string):
+	Replace unbound variable with second call to the function.
+
+	* semantic-utest.el (semantic-utest-fname): New fcn.
+	(semantic-utest-C-filename, semantic-utest-Python)
+	(semantic-utest-Javascript, semantic-utest-Java):
+	(semantic-utest-Html, semantic-utest-Csharp):
+	Use above to calculate file name.
+
+	* semantic-decorate-include.el (semantic-decoration-all-include-summary):
+	Add ede system include path dump.
+
+2009-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest.el (semantic-utest-makebuffer):
+	Force not read-only buffer.
+
+2009-04-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-global.el:
+	(semanticdb-table-global::semanticdb-find-tags-by-name-method)
+	(semanticdb-table-global::semanticdb-find-tags-by-name-regexp-method):
+	Do not request that files remain open.
+
+	* semantic.el (semantic-new-buffer-fcn):
+	Add hook for cloning the buffer.
+
+	* bovine/semantic-el.el (semantic-elisp-desymbolify-args): New.
+	(defun, defmethod): Use new fcn above.
+	(emacs-lisp-mode::semantic-get-local-variables): Fix to also get local
+	vars from a lambda expression.
+	(emacs-lisp-mode::semantic-ctxt-current-function):
+	Allow special arg for get-local-variables so it can better loop
+	upward.
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map-builtin):
+	Add __attribute__ as a no-op preprocessor symbol.
+
+	* bovine/c.by (__ATTRIBUTE__): Remove keyword.
+	(opt-attribute): Removed.
+	(typesimple,fun-or-proto): Don't use above.
+
+2009-04-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el: Patch from Dave S
+	(semantic-find-file-noselect): Use different value for recentf-exclude
+	to actually exclude things.
+
+2009-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest-c.el (semantic-utest-c):
+	Show tag prototypes, not the full tag structure.
+
+	* tests/testsppreplaced.c (MACROA): New test result.
+
+	* tests/testsppreplace.c (STARTMACRO,MACROA,MACROB, STARTMACRO):
+	New tests.
+
+	* semantic-lex-spp.el (semantic-lex-spp-expanded-macro-stack,semantic-lex-with-macro-used):
+	New
+	(semantic-lex-spp-symbol): Do not return symbols that have been expanded.
+	(semantic-lex-spp-reset-hook): Reset the macro stack, just in case.
+	(semantic-lex-spp-token-macro-to-macro-stream): Wrap call to macro
+	expansion in semantic-lex-with-macro-used.
+	(semantic-lex-spp-analyzer-push-tokens-for-symbol):
+	Push macros to be expanded onto the macro stack.
+
+2009-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-dereference-typedef):
+	Make sure the filename is propagated
+	onto the typedef part where the typedef holds the concrete class.
+
+	* semantic-analyze-fcn.el:
+	(semantic-analyze-dereference-metatype-stack)
+	(semantic-analyze-dereference-metatype): Doc fix.
+
+2009-04-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define): Comment Spelling fix.
+
+	* semantic-analyze.el (semantic-analyze-find-tag): Comment spell fix.
+
+2009-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/app-dev-guide.texi (Custom Search, DB Generic Search):
+	Add subclasses-of-type search.
+
+	* semanticdb-find.el (semanticdb-find-adebug-scanned-includes):
+	Fix unused var
+	(semanticdb-find-tags-subclasses-of-type)
+	(semanticdb-abstract-table::semanticdb-find-tags-external-children-of-type-method):
+	New.
+
+	* semantic-find.el (semantic-find-tags-subclasses-of-type): New.
+
+2009-04-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-filter.el (semantic-symref-hits-in-region):
+	Add autoload cookie.
+
+	* tests/testsubclass.cpp (otherFunction): Add symref hit test.
+
+	* tests/testtemplates.cpp (main): Add symref hit test.
+
+	* doc/tags.texi (Tag Query): Fix doc for semantic-equivalent-tag-p.
+
+	* semanticdb-typecache.el (semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Track the last value of 'ans' and clear ans at the top of each loop.
+	If the last part of the datatype is nil, then the entire search should fail.
+
+	* semantic-tag.el (semantic-equivalent-tag-p): Fix doc string.
+
+2009-04-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-filter.el (require): Add srecode-fields.
+	(semantic-symref-rename-local-variable): New.
+
+	* symref/Makefile (LOADPATH): Add srecode.
+
+	* symref/Project.ede ("Symref"): Add aux-package srecode.
+
+	* semantic-elp.el (semantic-elp-analyze-list): Fix name of renmed fcns.
+	(semantic-elp-symref-list): New.
+	(semantic-elp-analyze-symref-hits): New.
+	(semantic-elp-symref-hit-count): New.
+
+	* tests/testdoublens.hpp (decl_stage1_Foo): New.
+
+	* semantic-ia-utest.el (semantic-src-utest-buffer-refs):
+	Cleanup compile warnings.
+
+	* semantic-ia-utest.el (semantic-symref, semantic-symref-filter):
+	New requires.
+	(semantic-ia-utest): Add symref hit count test.
+	(semantic-ia-utest-buffer, semantic-ia-utest-buffer-refs)
+	(semantic-sr-utest-buffer-refs): Doc fix.
+	(semantic-src-utest-buffer-refs): New.
+
+	* symref/semantic-symref-filter.el (semantic-symref-test-count-hits-in-tag):
+	Add autoload cookie.
+	Add time info to interactive result.
+
+	* senator.el (Idle Symbol Highlight): New menu item.
+
+	* semantic-scope.el (semantic-scope-cache): Add localargs slot.
+	(semantic-scope-cache::semantic-reset): Reset above.
+	(semantic-calculate-scope): Calculate new slot value seperate from localvar.
+	(semantic-scope-find): Search also the localargs.
+	(semantic-scope-cache::semantic-analyze-show): Show the local args.
+
+	* semantic-analyze.el (semantic-analyze-current-symbol-default):
+	Disable the messaging.
+
+	* semantic-ctxt.el (semantic-get-local-variables-default):
+	Add caching system for local variable parsing.  Some parsing can
+	take up to .3 to .4 seconds on my system.  In a repetative analysis
+	within the same function, this can be a big drag.
+
+2009-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Move recalculation of miniscope for type analysis closer to the call
+	so it is not always done.
+
+	* tests/testdoublens.cpp (test_fcn): Add two type name completions.
+	Change numbering of completion tests.
+
+	* semantic-idle.el (semantic-idle-summary):
+	Remove call to semantic-idle-tag-highlight.
+	(semantic-idle-tag-highlight): Moved
+	(semantic-idle-tag-highlight): New
+
+	* symref/Makefile (symref_LISP): Add semantic-symref-filter.el
+
+	* symref/Project.ede (symref): Add semantic-symref-filter.el
+
+	* symref/semantic-symref-filter.el:
+	Routines for filtering symref hits to make them more accurate.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Use semantic-analyze-type-to-name instead of
+	semantic-analyze-tag-type-to-name.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	When looping over the sequence, if tmp is a type, then call
+	semantic-analyze-type on it.  Capture a miniscope for use
+	with this call.
+	(semantic-analyze-current-symbol)
+	semantic-analyze-current-symbol-default): New experimental fcns.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-to-name):
+	Renamed from semantic-analyze-tag-type-to-name;
+	(semantic-analyze-tag-type): Re-wrote to call below.
+	(semantic-analyze-type): New from above.
+	Changed to use semantic-analyze-type-to-name.
+
+2009-03-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-summary-highlight-face): New
+	(semantic-idle-summary-maybe-highlight): New
+	(semantic-idle-summary): Use above.
+
+2009-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-list.el (semantic-symref-symbol):
+	Pull some symbol from under the cursor.
+	(semantic-symref-results-mode): Force disable of undo and font-lock.
+
+	* symref/semantic-symref.el (semantic-symref-result::semantic-symref-result-get-tags):
+	Disable EDE asking questions while loading up files even if we
+	keep those files open.
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	Pass DONTLOAD to semantic-file-table-object.
+	Wrap table refresh in condition-case to capture errors.
+
+2009-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	Do not run if we haven't
+	finished loading yet.
+	Call this function after we provide semantic-c feature.
+
+2009-03-27  Alex Ott <alexott@gmail.com>
+
+	* senator.el: fix error
+
+	* senator.el:
+	replace deleted function facemenu-get-face with corresponding code
+
+2009-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Signal an error if semantic parsers aren't active.
+
+2009-03-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el (semantic-scope-find):
+	When switching to split-name search mode,
+	also check the fullscope for the first symbol in the list.
+
+	* tests/testdoublens.cpp (d, d::e, d::f, d::e::Foo, d::f::Bar, d::f::Bar::baz):
+	New
+
+2009-03-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map-builtin):
+	Add __declspec as a no-op.
+
+	* tests/testdoublens.cpp (a::b::Bar, a::b::baz): New test.
+
+	* tests/testdoublens.hpp (a::b::Foo): New test base.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	If parentinherited is empty, go calculate
+	scoped tags, then try again in case the parent is scoped in some
+	namespace in scope.
+
+2009-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el: (semantic-lex-c-namespace-begin-macro)
+	(semantic-lex-c-namespace-begin-nested-macro): Support _ in names.
+
+2009-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el (semantic-ia-speedbar):
+	Wrap button writing in save-excursion.
+	Customize face used for
+	(semantic-analyze-context-functionarg::semantic-ia-sb-more-buttons):
+	Insert arguments as an indexed string list so the current arg is highlighted.
+	(semantic-ia-sb-string-list):
+	Customize the face used for one string based on index.
+
+	* bovine/semantic-c.el (semantic-expand-c-tag):
+	Pass setting of references through.
+
+	* tests/testsppreplaced.c, tests/testsppreplace.c (baz, foo::bar):
+	New namespace tests.
+
+	* bovine/semantic-c.el: (semantic-lex-c-namespace-begin-macro)
+	(semantic-lex-c-namespace-begin-nested-macro)
+	(semantic-lex-c-namespace-end-macro): New analyzers
+	(semantic-c-lexer): Add above in.
+	(c-mode::semantic-parse-region): Handle special semantic-list tokens
+	from the name space fakery above.
+
+2009-03-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el (semantic-ia-speedbar): Pull out scope seperately.
+	Also show current tag seperately from the analysis.
+	(semantic-ia-sb-show-scope): New fcn
+	(semantic-analyze-context::semantic-ia-sb-more-buttons):
+	Don't show local variables.
+
+2009-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-java.el (java-mode::semantic-tag-include-filename):
+	New override
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile, wisent/Makefile, symref/Makefile, doc/Makefile (VERSION):
+	Update version number.
+
+	* semanticdb.el (semanticdb-create-table-for-file-not-in-buffer):
+	Do not run
+	out-of-buffer create fcn if it is a remote file.
+
+	* semantic.el (semantic-version): Update version.
+
+	* Makefile, Project.ede (VERSION): Update version number.
+
+2009-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-custom.el: Support widget style editing of Semantic TAGS.
+
+2009-03-16  Alex Ott <alexott@gmail.com>
+
+	* ctags/semantic-ectag-parse.el: - revert previous change
+
+	* ctags/semantic-ectag-parse.el:
+	- small fix for using ectags with remote files
+
+2009-03-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Save the buffer reguardless of if
+	we are in interactive or batch mode.
+
+	* tests/testsppreplace.c (MACRO0,MACRO1,MACRO2): New
+	(that_foo, this_foo): New fcn created with above macros.
+
+	* tests/testsppreplaced.c (that_foo, this_foo): New.
+
+	* semantic-lex-spp.el (semantic-lex-spp-dynamic-macro-symbol-obarray-stack):
+	New variable.
+	(semantic-lex-spp-dynamic-map-stack)
+	(semantic-lex-spp-symbol-push)
+	(semantic-lex-spp-symbol-pop): New fcns.
+	(semantic-lex-spp-reset-hook): Reset the stack (above).
+	(semantic-lex-spp-token-macro-to-macro-stream):
+	Push new args into the symbol table, and pop them out later.
+	Uses above new fcns.
+
+2009-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (CPP): New token.
+	(extern-c): Add extern CPP support.
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	Disable recursion.
+	Disable use of semanticdb-out-of-buffer-create-table-fcn.
+
+	* semanticdb-mode.el (semanticdb-current-table): Add autoload cookie.
+
+2009-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (object-write):
+	Clear the debug-on-write flag if it is used.
+
+	* semanticdb-file.el (semanticdb-data-debug-on-write-error):
+	New variable
+	(object-write): Use above to call data debugger.
+
+	* semanticdb-file.el (semanticdb-table::object-write):
+	Try to produce additional output.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Add checking to make sure the unit test file is
+	available.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-normalize-one-tag):
+	Always return some result.  If we can't find the symbol, then
+	fake it out by returning ourself.
+
+	* Makefile (dist): Add missing -C to subdir invocation.
+
+	* bovine/c.by (opt-stuff-after-symbol):
+	Renamed from opt-function-call-args.
+	Add BRACK_BLCK support.
+
+2009-03-11  Joakim Verona <joakim@verona.se>
+
+	* semanticdb-java.el: added some traces
+
+2009-03-10  Joakim Verona <joakim@verona.se>
+
+	* semanticdb-java.clj: Clojure/Java backend for semanticdb
+
+	* semanticdb-java.el: use Clojure as backend for java queries
+
+2009-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semantic-ectag-lang.el:
+	Comment out some language support declarations.
+	(semantic-load-enable-primary-exuberent-ctags-support):
+	Uncomment some languages I tested today.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-buffer):
+	Fix output of error types.
+	(semantic-ectag-parse-file-with-mode): Pass language force flag to ctags.
+	(semantic-ectag-parse-one-tag): Support program and declaration.
+	Combine define and macro.
+	Add subroutine/procedure as functions.
+	Add local.. but I don't like it.
+	Improve error message.
+
+	* ctags/Makefile (ctags_LISP):  Add semantic-ectag-lang2.el
+
+	* ctags/Project.ede (ctags): Add semantic-ectag-lang2.el
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-collect-errors):
+	new var.
+	(semantic-ectag-parse-buffer): Support display of parsing errors.
+	(semantic-ectag-parse-tags): Handle a nil from parse-one-tag.
+	Fix child lists to be in correct order.
+	(semantic-ectag-parse-one-tag): If a class is unknown, just return
+	nil. Store the error for later display if desired.
+
+	* semantic-load.el (semantic-load-enable-all-exuberent-ctags-support):
+	Moved to here from semantic-ectag-lang.  Calls two new fcns
+	for the two classes of ectag support.
+
+	* ctags/semantic-ectag-lang.el:
+	(c-mode::semantic-ectag-lang, c++-mode::semantic-ectag-lang)
+	(c-mode::semantic-ectag-lang-kind, c-mode::semantic-ectag-lang-extra-flags)
+	(semantic-ectag-split-signature-summary)
+	(semantic-ectag-set-langugage-attributes)
+	(emacs-lisp-mode::semantic-ectag-lang)
+	(emacs-lisp-mode::semantic-ectag-lang-kind):
+	Moved to semantic-ectag-lang2.el.
+	(semantic-ectag-simple-setup): New, copied from sh version.
+	(semantic-ectg-add-language-support): New macro.
+	(*-mode): New mode support for many languages.
+	(semantic-load-enable-primary-exuberent-ctags-support): New.
+	(semantic-load-enable-all-exuberent-ctags-support): Deleted.
+	Moved to semantic-load.
+
+	* ctags/semantic-ectag-lang2.el:
+	CTags support as a secondary parser for some languges.
+
+2009-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: When recursing with Make, use -C instead of cd.
+
+	* tests/Makefile (Tests_MISC): add teststruct.cpp
+
+	* tests/Project.ede ("Tests"): Add teststruct.cpp
+
+	* bovine/.cvsignore: Simplify -by.el ingoring.
+
+	* wisent/.cvsignore: Simplify -wy.el ingoring.
+
+	* doc/.cvsignore: Remove compiled output.
+
+	* tests/testsubclass.cpp (animal::moose::doNothing):
+	Add test for enums.
+
+	* tests/testsubclass.hh (moose::moose_enum): New.
+
+	* semantic-scope.el (semantic-analyze-scoped-tags-default):
+	Once we have our scoped types,
+	see if there are any constants to be promoted into the scope from any
+	of those types.
+
+	* semantic-analyze-complete.el (semantic-analyze-type-constants):
+	Remove old implementation.
+
+2009-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (template-var): Support sizeof expressions.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::project-compile-target):
+	Save excursion when creating the grammar file.
+
+	* semantic-fw.el (xemacs::semantic-make-overlay):
+	Add front/rear advance argument support.
+
+	* semantic-util-modes.el (semantic-highlight-func-highlight-current-tag):
+	Set front-advance on
+	the overlay.
+
+	* semantic-decorate.el (semantic-tag-create-secondary-overlay):
+	Turn on front-advance on the overlay
+
+	* symref/semantic-symref-grep.el (grep): New require
+	(semantic-symref-filepattern-alist): Remove Emacs lisp mode, add html-mode.
+	(semantic-symref-derive-find-filepatterns)
+	(semantic-symref-grep-use-template): New functions
+	(semantic-symref-grep-expand-keywords): New variable
+	(semantic-symref-tool-grep::semantic-symref-perform-search):
+	Use above new commands for calculating file patterns, and use
+	grep templates if needed.
+
+2009-03-07  Joakim Verona <joakim@verona.se>
+
+	* tests/maven2-testproject/README: readme for the maven test project
+
+	* tests/maven2-testproject/rootproject/child1project/pom.xml, tests/maven2-testproject/rootproject/child1project/src/main/java/cedet/test/child1project/App.java, tests/maven2-testproject/rootproject/child1project/src/test/java/cedet/test/child1project/AppTest.java, tests/maven2-testproject/rootproject/child2project/pom.xml, tests/maven2-testproject/rootproject/child2project/src/main/java/cedet/test/child2project/App.java, tests/maven2-testproject/rootproject/child2project/src/test/java/cedet/test/child2project/AppTest.java, tests/maven2-testproject/rootproject/pom.xml:
+	added maven2 test project
+
+2009-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el (semantic-ia-complete-symbol):
+	Handle case where there is no
+	prefix. (ie, it is nil).
+
+	* symref/semantic-symref-grep.el: Patch from David Engster
+	(semantic-symref-tool-grep::semantic-symref-parse-tool-output-one-line):
+	Fix windows drive-letter regexp.
+
+	* semantic-fw.el (semantic-test-throw-on-input):
+	Fix event cleanup if statement.
+
+	* bovine/semantic-gcc.el (semantic-gcc-test-output-parser):
+	Add autoload cookie.
+
+	* symref/semantic-symref-grep.el: Patch from David Engster
+	(semantic-symref-tool-grep::semantic-symref-parse-tool-output-one-line):
+	Update regexp to handle Windows drive numbers.
+
+	* bovine/semantic-gcc.el: Patch from Alastair Rankine
+	(semantic-gcc-test-strings): Added some more of his platforms.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore, bovine/.cvsignore, ctags/.cvsignore, symref/.cvsignore, wisent/.cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-fcn.el (semantic-analyze-dereference-metatype-stack):
+	Turn recursion error into a message.
+	Throw out of the while loop.
+
+	* bovine/semantic-gcc.el: Patch from: Alastair Rankine
+	(semantic-gcc-setup): Handles some installations for which the --gxx-include-dir field is
+	an absolute path, instead of relative from --prefix.
+	Tests that directories are present prior to adding them as system includes
+
+	* bovine/semantic-c.el:
+	(semantic-c-dependency-system-include-path, semantic-default-c-path)
+	(semantic-dependency-include-path): Moved
+
+	* semantic-ia.el: Patch by Tobias Gerdin
+	(semantic-ia-fast-mouse-jump): New command
+
+	* doc/user-guide.texi (Smart Jump): Add semantic-ia-fast-mouse-jump.
+
+2009-03-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-gcc.el: Patch from Alex Ott:
+	(semantic-gcc-query): Add optinal gcc-option arguments.
+	Use the options if provided.
+	(semantic-cpp-defs): New command.
+	(semantic-gcc-setup): Query defines, and set them up.
+
+2009-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-analyzer-push-tokens-for-symbol):
+	Put in macro reference limit to prevent macro recursion hang.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Throw an error if failures were found.
+	(semantic-sr-utest-buffer-refs): Sort results before comparison.
+
+	* tests/testsubclass.cpp (deer::moose::getAntlers):
+	Change symref result to be sorted.
+
+	* semantic-util-modes.el (semantic-highlight-func-mode-setup):
+	turn off highlight if it is on
+	when disabling.
+	(semantic-highlight-func-highlight-current-tag): New DISABLE argument.
+
+2009-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el, semantic-utest.el: Merge from 1.0pre6 branch
+
+2009-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile (Tests_MISC): Add testsppcomplete.c
+
+	* tests/Project.ede ("semantic/tests"): Add testsppcomplete.c
+
+	* symref/semantic-symref-global.el (semantic-symref-tool-global):
+	Fix case problem in doc.
+
+	* symref/semantic-symref.el (semantic-symref-tool-alist):
+	Add cscope support.
+
+	* symref/Makefile (symref_LISP): Add semantic-symref-cscope.el
+
+	* symref/Project.ede (symref): Add semantic-symref-cscope.el
+
+	* symref/semantic-symref-cscope.el: CScope support for symref.
+
+2009-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add testsppcomplete.c
+
+	* tests/testsppcomplete.c: Completions test with lots of nested macros.
+
+	* tests/testsppreplaced.c (noodle): New macro tests.
+
+	* tests/testsppreplace.c (Amacro, mf_Amacro, noodle): New macro tests.
+
+	* semantic-lex-spp.el (semantic-lex-spp-token-macro-to-macro-stream):
+	Save the arglist.
+	When a symbol in the macro stream can be replaced by a macro, also
+	calculate if there are arguments that can be used, and use them.
+	(semantic-lex-spp-merge-streams): Delete spp-replace-replace token info.
+	(semantic-lex-spp-analyzer-push-tokens-for-symbol):
+	Before doing a macro replacement, perform a high level token
+	dereference for tokens that refer to macros that refer to more macros.
+	(semantic-lex-spp-stream-for-macro): Delete spp-replace-replace stuff.
+
+	* bovine/semantic-c.el (semantic-cpp-lexer):
+	Do not do spp replacement inside the preprocessor.
+
+	* semantic-lex.el (semantic-lex-token-p): Fixed.
+
+2009-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-debug.el (semanticdb-dump-all-table-summary):
+	Fix create output buffer correctly.
+
+	* doc/user-guide.texi (SymRef):
+	Refer to idutils.  Add semantic-symref-tool-alist doc.
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref.el (semantic-symref-tool-alist): New variable.
+	(semantic-symref-detect-symref-tool): Use above instead of inline detection.
+
+	* symref/semantic-symref-idutils.el (semantic-symref-tool-idutils):
+	Add autoload cookie.
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	Remove direct replacement code, as it is
+	now handled properly in semantic-lex-spp.
+
+	* semantic-lex-spp.el (semantic-lex-spp-token-macro-to-macro-stream):
+	Add in large descriptive comments.
+	Regroup code, change names of some internal variables.
+	Use `semantic-lex-token-class' instead of `car' where apropriate.
+
+	* ctags/Makefile (EMACSFLAGS): New variable
+	(ctags): Use above.
+
+	* bovine/Makefile (EMACSFLAGS): New variable.
+	(bovinator, languages): Use above.
+
+	* wisent/Makefile (EMACSFLAGS): New variable
+	(tools,wisent,languages): Use above.
+
+	* symref/semantic-symref.el (semantic-symref-detect-symref-tool):
+	Add idutils detection.
+
+	* symref/Makefile (EMACSFLAGS): New flag
+	(symref_LISP): Add semantic-symref-idutils.el
+	(symref): Use EMACSFLAGS
+
+	* symref/Project.ede (symref): Add semantic-symref-idutils.el
+
+	* semantic-fw.el (semantic-find-file-noselect):
+	Change first version of Emacs to
+	support :safe value for enable-local-variables to 22.0
+
+	* Makefile (EMACSFLAGS): New variable.
+	(init,semantic,utils,Database,tools,Analyzer,Languages,maintenance)
+	(tests): Use above.
+
+2009-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-idutils.el:
+	Support for idutils is Semantic Symref.
+
+2009-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-simple-macro-to-macro-stream):
+	Update comments.
+	(semantic-lex-spp-token-macro-to-macro-stream): remove null and single
+	token cases.
+	(semantic-lex-spp-macro-to-macro-stream): Adopt tests for null, single
+	token, and put the conditionals in front of
+	semantic-lex-spp-token-macro-to-macro-stream and
+	semantic-lex-spp-simple-macro-to-macro-stream to make those fcns simpler.
+
+	* semantic-lex-spp.el (semantic-lex-spp-symbol-set):
+	Rename arg from obarray to obarray-in.
+	(semantic-lex-spp-one-token-and-move-for-macro):
+	If found token extends past MAX, then crop it.
+
+	* semantic-fw.el (semantic-find-file-noselect):
+	Set enable-local-variables to different
+	values depending on Emacs version.
+
+2009-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el: (semantic-lex-spp-macro-symbol-obarray)
+	(semantic-lex-spp-project-macro-symbol-obarray)
+	(semantic-lex-spp-project-dynamic-symbol-obarray)
+	(semantic-lex-spp-symbol): Doc fixes.
+	(semantic-lex-spp-set-dynamic-table)
+	(semantic-lex-spp-reset-hook): Doc fix.
+	(semantic-lex-spp-reset-dynamic-table): Deleted.
+	(semantic-lex-spp-simple-macro-to-macro-stream):
+	(semantic-lex-spp-macro-with-args): Moved.
+	(semantic-lex-spp-simple-macro-to-macro-stream)
+	(semantic-lex-spp-token-macro-to-macro-stream): New, extracted from:
+	(semantic-lex-spp-macro-to-macro-stream): Call above two fcns.
+	(semantic-lex-spp-one-token-to-txt): Doc fix.
+	(semantic-lex-spp-write-test): Doc fix.
+	(semantic-lex-spp-write-utest): New.
+	(semantic-lex-spp-describe): Moved.
+
+2009-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Allow display of context if there
+	is no bounds in the context.
+	(semantic-analyze-current-context-default):
+	Allow context objects to be created with no bounds IF they are
+	function arguments or assignments.
+	Revamped the order and conditional for how these items are created.
+	Original patch from hannes.janetzek.
+	(semantic-analyze-context::semantic-analyze-pulse):
+	Don't pulse if the bounds are empty.
+
+2009-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-spp-merge-streams):
+	Deleted.  Moved to semantic-lex-spp.el
+	(semantic-lex-cpp-hashhash): Change output to be a 'spp-concat class token.
+
+	* semantic-lex-spp.el (semantic-lex-spp-merge-streams):
+	New.  Moved from semantic-c.
+	(semantic-lex-spp-use-headers-flag): Doc fix.
+
+	* semantic-lex-spp.el (commentary):
+	Add todo item on namespace in a macro issue.
+
+	* tests/testsppreplaced.c (foo):
+	add replacement code for macro-in-a-macro.
+
+	* tests/testsppreplace.c (semantic-lex-cpp-define):
+	Add macro in a macro.
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	Extract macro merge into a fcn.
+	(semantic-lex-spp-merge-streams): New fcn from above.
+	Add in support for spp-replace-replace doing a replcement.
+
+	* semantic-utest.el: (semantic-utest-PHP-buffer-contents)
+	(semantic-utest-PHP-name-contents): New
+	(semantic-utest-makebuffer): Use semantic-find-file-noselect.
+	(semantic-utest-PHP): New.
+	(semantic-utest-Csharp): Test for csharp mode before testing.
+	(semantic-utest-Erlang, semantic-utest-Texi):
+	Comment out for now.
+	(semantic-utest-main): Add PHP.
+	Uncomment csharp.
+
+2009-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-file-with-mode):
+	Protect against mode startup failure.
+	(semantic-ectag-split-fields): Add struct support.
+
+2009-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Idle Completions Mode): Update doc for a fcn.
+
+	* semantic-complete.el: (semantic-complete-analyze-inline)
+	(semantic-complete-analyze-inline-idle):
+	Update doc.
+
+	* NEWS: Add semanticdb-cleanup-cache-files, and note at top.
+
+	* semantic-load.el (semantic-load-enable-minimum-features):
+	Add comment about cleaning up cache files.
+
+2009-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add teststruct.cpp
+
+	* tests/teststruct.cpp: Testing structs and inheritance.
+
+	* bovine/c.by (semantic-tag-type-superclass-protection):
+	Default protection is "unspecified", which really means, figure it out later.
+
+	* semantic-tag.el (semantic-tag-type-superclass-protection):
+	Support an "unspecified" inheritance model.
+
+	* bovine/semantic-gcc.el: Patch from Alastair Rankine:
+	(semantic-gcc-setup): Also look for --with-gxx-include-dir
+	when calculating cpp include path.
+
+2009-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-prefix-map):
+	Add transpose and copy-to-register bindinds.
+	(senator-menu-bar): Add two transpose functions to menu.
+	(senator-copy-tag): Copy body to kill ring.  Add help msg.
+	(senator-kill-tag): Add help message.
+	(senator-yank-tag): Add help message.
+
+2009-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-cleanup-cache-files): New command.
+
+2009-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (replace-regexp-in-string): Deleted.
+	Moved to cedet-files.el
+
+	* semantic-fw.el: Patch from DaveS
+	(semantic-find-file-noselect): Disable auto-insert, and local
+	variables and eval.
+
+2009-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-reconstitute-token):
+	For functions, pull off 9th part for
+	the template specifier.
+
+	* tests/testtemplates.cpp (NS):
+	Add ref into this namespace.  Also add a using.
+	(main): Add new tests for parsing namespace symbols with template
+	specifiers.
+
+	* bovine/c.by (typeformbase):
+	Add :template-specifier to 2nd to last rule.
+	Use special namespace-symbol rule.
+	(func-decl): Add template specifier info to production.
+	(namespace-symbol-for-typeformbase): New rule.
+
+	* senator.el (senator-adebug-tag): New command.
+	(senator-prefix-map): Add above onto "/"
+
+2009-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile (Tests_MISC):
+	Add testtemplates.cpp and testjavacomp.java
+
+	* tests/Project.ede ("Tests"):
+	Add testtemplates.cpp and testjavacomp.java
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add in testtemplates.cpp and
+	testjavacomp.java
+
+	* tests/testjavacomp.java: New tests for smart completion in java.
+
+	* tests/testsubclass.cpp (i_dont_have_symrefs): New symref test.
+
+	* bovine/semantic-c.el (semantic-c-member-of-autocast): New option.
+	(semantic-c-dereference-typedef)
+	(semantic-c--instantiate-template)
+	(semantic-c--template-name-1)
+	(semantic-c--template-name)
+	(semantic-c-dereference-template)
+	(semantic-c-dereference-member-of): New functions.
+	(semantic-analyze-dereference-metatype): Updated to handle a
+	list of dereferencing options.
+
+	* doc/tags.texi (Tag Internals): Add below.
+	(Copying Tags): Move clone/copy and add semantic-tag-deep-copy-one-tag.
+
+	* semantic-tag.el (semantic-tag-deep-copy-one-tag): Doc update.
+
+	* semantic-tag.el: (semantic-tag-set-name)
+	(semantic-tag-deep-copy-one-tag): New API fcns
+	(semantic--tag-deep-copy-attributes)
+	(semantic--tag-deep-copy-value)
+	(semantic--tag-deep-copy-tag-list): New private functions.
+
+	* semantic-analyze-debug.el: Patch from 'Raf'
+	(semantic-analyzer-debug-missing-innertype): Get the car of
+	dereferenced metatypes.
+
+	* tests/testtemplates.cpp:
+	New test file for dereferencing smart pointers.
+
+	* semantic-analyze-fcn.el: Patch from 'Raf'.
+	(semantic-analyze-tag-type): Rename ttype localvar to type-declaration.
+	Pass type-declaration to dereference-metatype-stack as 3rd arg.
+	(semantic-analyze-dereference-metatype-stack)
+	(semantic-analyze-dereference-metatype): Accept 3rd arg of
+	type-declaration used for more complex dereferences.
+
+2009-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref.el (semantic-symref-find-references-by-name):
+	Add new arg to return the
+	tool used for the search.
+
+	* semantic-ia-utest.el (semantic-sr-utest-buffer-refs):
+	Provide some more debugging info.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions):
+	If no context was provided or found, then issue a useful error.
+
+	* semantic-load.el (semantic-load-enable-excessive-code-helpers):
+	Add `semantic-highlight-func-mode' as on.
+
+	* senator.el ("Highlight Func"): New menu item.
+
+	* semantic-util-modes.el (semantic-stickyfunc-tag-to-stick): New util.
+	(semantic-stickyfunc-fetch-stickyline): Use above.
+	(*-semantic-highlight-func-*): New minor mode.
+
+	* doc/minor-modes.texi (Code Helpers): Add below.
+	(Highlight Func Mode): New section.
+
+	* semanticdb.el (semanticdb-create-table-for-file-not-in-buffer):
+	Remove debug statement.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::project-compile-target):
+	Fix loading up grammar files while compiling.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (semantic): Updated to 2.0pre6.
+
+	* bovine/Makefile, ctags/Makefile, doc/Makefile, symref/Makefile, tests/Makefile, wisent/Makefile, Makefile (VERSION):
+	Updated to 2.0pre6.
+
+	* semantic.el (semantic-version): Updated to 2.0pre6.
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-insert-include-summary):
+	Add display of EDE include search features.
+
+	* semantic-decorate-include.el (semantic-decoration-all-include-summary):
+	Improve display of EDE
+	search features.
+
+2009-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-dep.el (semantic--dependency-find-file-on-path):
+	Use `locate-file' if this
+	Emacs has it, otherwise use an inline implementation.
+
+	* bovine/semantic-c.el (document): Don't require document.el.
+	(c-mode::document-comment-start)
+	(c-mode::document-comment-prefix)
+	(c-mode::document-comment-end): Delete.
+
+	* wisent/wisent-python.el (python-2-mode, python-3-mode):
+	Add as child modes.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-menu-bar): Add summarize includes.
+
+	* semanticdb-el.el:
+	(semanticdb-table-emacs-lisp::semanticdb-refresh-table)
+	(semanticdb-table-emacs-lisp::semanticdb-needs-refresh-p): New.
+
+	* bovine/semantic-erlang.el (erlang-edoc): No longer require this.
+
+	* bovine/Makefile (languages_LISP): Remove erlang-edoc.el
+
+	* bovine/Project.ede ("languages"): Remove erlang-edoc.el
+
+	* bovine/semantic-skel.el (semantic-default-skel-setup):
+	Remove traces of old 'document' tool.
+
+	* bovine/semantic-scm.el (require, semantic-default-scheme-setup):
+	Remove traces of old 'document' tool.
+
+	* bovine/semantic-erlang.el (require, semantic-erlang-default-setup):
+	Remove traces of old 'document' tool.
+
+	* wisent/wisent-java.el, wisent/wisent-java-tags.el (require, wisent-java-default-setup):
+	Remove traces of old 'document' tool.
+
+	* wisent/wisent-c.el (wisent-c-default-setup):
+	Remove traces of old 'document' tool.
+
+	* semantic-utest.el (semantic-utest-Java, semantic-utest-Html):
+	Hacks to keep it working in XEmacs.
+
+2009-01-24  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* semantic-tag.el (log-edit-mode: semantic-insert-foreign-tag):
+	fixed typo in docstring
+	(change-log-mode: semantic-insert-foreign-tag): fixed typo in
+	docstring
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest.el (semantic-utest-Javascript):
+	Protect against failure when
+	javascript-mode is not installed.
+	(semantic-utest-main): Add shutdown.
+	(semantic-utest-taglists-equivalent-p): Improve error messages.
+
+	* semantic-ia-utest.el (semantic-ia-utest-error-log-list): New var.
+	(semantic-ia-utest): Use new cedet-utest APIs.
+	Change indentation of messages.
+	(semantic-ia-utest-buffer, semantic-ia-utest-buffer-refs):
+	(semantic-sr-utest-buffer-refs):
+	Change indentation of messages.
+	Add various errors to an error list.
+
+	* semantic-fw.el (semantic-test-data-cache):
+	Create a buffer for this test, and add some text.
+
+	* semantic-chart.el (semantic-chart-database-size):
+	Replace object-assoc-list with inline to protect against
+	unbound slots.
+
+	* semanticdb-ref.el (semanticdb-ref-test):
+	Eliminate unused variable bindings.
+
+	* semanticdb-debug.el: (semanticdb-adebug-current-database)
+	(semanticdb-adebug-current-table)
+	(semanticdb-adebug-project-database-list):
+	Eliminate unused variable bindings.
+
+	* semantic-find.el (semantic-brute-find-tag-by-function):
+	Eliminate unused variable bindings.
+
+	* semantic-edit.el (semantic-edits-change-function-handle-changes):
+	Eliminate unused variable bindings.
+
+	* semantic-analyze-fcn.el (semantic-analyze-tag-type):
+	Eliminate unused variable bindings.
+
+	* semantic-adebug.el: (data-debug-insert-tag-parts-from-point)
+	(data-debug-insert-taglist-from-point)
+	(data-debug-insert-find-results-from-point)
+	(data-debug-insert-db-and-tag-from-point)
+	(semantic-adebug-bovinate)
+	(semantic-adebug-searchdb)
+	(semantic-adebug-analyze)
+	(semantic-adebug-edebug-expr):
+	Eliminate unused bound variables.
+
+2009-01-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-global.el (semanticdb-enable-gnu-global-databases):
+	Add autoload cookie.
+
+	* doc/grammar-fw.texi (top): New node on grammar development.
+	(Grammar Development Cycle): New node.
+
+	* senator.el (senator-pulse-tag): Add a message too.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Replace occurances of `semantic-find-tags-by-name-regexp' with
+	`semantic-find-tags-for-completion'.
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Improved error checking on input tags.
+
+	* doc/user-guide.texi:
+	(imenu, senator, Smart Completion, Smart Summary)
+	(Smart Completion Debugging, Idle Scheduler, Reparsing Options)
+	(Idle Working Options, Debugging Idle Time Issues Idle Completions Mode)
+	(Changing Backends, Create System Databases, Debugging):
+	Misc spelling fixes.
+	(top, SymRef): Add new section `SymRef'
+
+	* doc/tags.texi (Tag Basics, Tag Hooks): Misc spelling fixes.
+
+	* doc/overview.texi (Overview): Fixed spelling.
+
+	* doc/minor-modes.texi (Semantic Minor Modes): Fixed this comment
+
+	* doc/minor-modes.texi (Semantic Minor Modes, MRU Bookmarks Mode, Parser State):
+	Misc spelling fixes.
+
+	* doc/lang-support-guide.texi:
+	(top, Semantic Overload Mechanism, Lexer Overview, Lexer Construction)
+	(Lexer Built In Analyzers, Lexer Analyzer Construction, External Parsers)
+	(Parsing a language file, Parser Backend Support, Example Backend File)
+	(Tag Expansion, Bovine Parser Debugging, Overlay Debugging)
+	(Incremental Parser Debugging, Semantic 1.4 Doc):
+	Misc spelling fixes.
+
+	* doc/internals.texi (Tag handling): Misc spelling fixes.
+
+	* doc/installation.texi (Canned Configuration, Parsing Optimization):
+	Misc spelling fixes.
+
+	* doc/app-dev-guide.texi:
+	(top, Specialty Search, Custom Search, Tags at Point, Tag Secondary Overlays)
+	(Tag Completion Convenience Functions, Tag Collectors, Format Tag)
+	(Jump to a Tag, DB Results, DB Data Type Search, System Databases)
+	(Idle Scheduling, Data Debugger):
+	Misc spelling fixes.
+
+	* senator.el (senator-pulse-tag): Force a reparse.
+
+	* document.el: Comment Spelling fix
+
+	* Makefile (tools_LISP): Deleted "document" tools.
+
+	* Project.ede ("tools"): Deleted "document" tools.
+
+	* semantic-mru-bookmark.el (semantic-bookmark::semantic-mrub-update):
+	Add condition-case to fix
+	some issue w/ XEmacs I couldn't figure out.
+
+	* bovine/c.by (opt-function-call-args): New
+	(multi-stage-dereference): Renamed from `function-call'
+	(expression): Use above.  Add "new builtintype" suppoert.
+
+	* semantic-fw.el: (semantic-test-throw-on-input)
+	Support Emacsen that don't have `read-event'.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-split-signature-summary-default):
+	Use cedet-split-string.
+
+	* bovine/semantic-gcc.el (semantic-gcc-fields): Use cedet-split-string.
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-add-tree-to-table):
+	Use cedet-split-string.
+
+	* semantic-lex-spp.el (semantic-lex-spp-first-token-arg-list):
+	Use cedet-split-string.
+
+	* semantic-mru-bookmark.el (semantic-ring-size): New compat fcn.
+	(semantic-bookmark-ring::semantic-mrub-push):
+	Use above compat fcn.
+
+	* ctags/semanticdb-ectag.el (semanticdb-ectag-create-table-for-file-not-in-buffer):
+	Fix unused var bytcomp warning.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-buffer):
+	Fix unused var bytcomp warning.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-form):
+	Fix unused var bytcomp warning.
+
+	* wisent/wisent.el (wisent-skip-block): Fix unused var bytcomp warning.
+
+	* wisent/wisent-comp.el: (wisent-build-relations, wisent-set-conflicts)
+	(wisent-count-sr-conflicts, wisent-print-reductions)
+	(wisent-semantic-action-expand-body, wisent-parse-grammar):
+	Fix unused var bytcomp warning.
+
+	* symref/semantic-symref.el (semantic-symref-data-debug-last-result):
+	(semantic-symref-result::semantic-symref-result-get-tags):
+	Fix unused var bytcomp warning.
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-format-tag-abbreviate):
+	(emacs-lisp-mode::semantic-format-tag-prototype):
+	Fix unused var bytcomp warning.
+
+	* bovine/semantic-c.el (semantic-c-describe-environment):
+	Fix error typo
+
+	* senator.el (senator-register-custom-menu):
+	Fix unused var bytcomp warning.
+
+	* semanticdb.el (semanticdb-table::semanticdb-equivalent-mode):
+	Use mode-local-use-bindings-p to perform the test.
+
+	* semanticdb-typecache.el (semanticdb-typecache-add-dependant, semanticdb-typecache-file-tags):
+	(semanticdb-typecache-refresh-for-buffer):
+	(semanticdb-typecache-dump, semanticdb-db-typecache-dump):
+	Fix unused var bytcomp warning.
+
+	* semanticdb-ref.el (semanticdb-table::semanticdb-check-references):
+	Fix unused var bytcomp warning.
+
+	* semanticdb-global.el (semanticdb-test-gnu-global):
+	Fix unused var bytcomp warning.
+
+	* semanticdb-find.el (semanticdb-find-test-translate-path):
+	(semanticdb-find-test-translate-path-no-loading):
+	(semanticdb-find-adebug-lost-includes):
+	(semanticdb-find-adebug-scanned-includes):
+	Fix unused var bytcomp warning.
+
+	* semanticdb-debug.el (semanticdb-dump-all-table-summary):
+	Fix unused var bytcomp warning.
+
+	* semantic-util-modes.el (semantic-stickyfunc-menu):
+	Fix unused var bytcomp warning.
+
+	* semantic-texi.el (semantic-analyze-current-context):
+	Fix unused var bytcomp warning.
+
+	* semantic-tag.el (semantic-tag-components-with-overlays-default):
+	Fix unused var bytcomp warning.
+
+	* semantic-tag-write.el (semantic-tag-write-one-tag):
+	Fix unused var bytcomp warning.
+
+	* semantic-sort.el (semantic-unique-tag-table-by-name, semantic-unique-tag-table):
+	Fix unused var bytcomp warning.
+
+2009-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el: (semantic-analyze-scoped-types-default)
+	(semantic-analyze-scope-nested-tags-default)
+	(semantic-analyze-scope-calculate-access-default)
+	(semantic-calculate-scope):
+	Fix unused var bytcomp warning.
+
+	* semantic-mru-bookmark.el (semantic-mrub-cache-flush-fcn, semantic-adebug-mrub):
+	Fix unused var bytcomp warning.
+
+	* semantic-lex-spp.el (semantic-lex-spp-anlyzer-do-replace):
+	Fix unused var bytcomp warning.
+
+	* semantic-idle.el (semantic-idle-core-handler, semantic-idle-work-core-handler):
+	Fix unused var bytcomp warning.
+
+	* semantic-ia.el (semantic-ia-complete-symbol-menu, semantic-ia-complete-tip):
+	Fix unused var bytcomp warning.
+
+	* semantic-ia-utest.el (semantic-ia-utest-buffer-refs):
+	Fix unused var bytcomp warning.
+
+	* semantic-ia-sb.el (semantic-ia-speedbar):
+	Fix unused var bytcomp warning.
+
+	* semantic-grammar.el (semantic-grammar-token-%put-properties):
+	(semantic-grammar-complete):
+	(semantic-grammar-mode::semantic-analyze-current-context):
+	Fix unused var bytcomp warning.
+
+	* semantic-fw.el (semantic-varalias-obsolete):
+	Fix unused var bytcomp warning.
+
+	* semantic-find.el (semantic-brute-find-first-tag-by-name): Doc fix.
+	(semantic-brute-find-tag-by-function): Reorganize fcn to
+	remove unused bound vars.
+	Redoc that search-includes is not implemented.
+	(semantic-brute-find-first-tag-by-function):
+	Fix unused var bytcomp warning.
+
+	* semantic-edit.el (semantic-edits-splice-remove):
+	Fix unused var bytcomp warning.
+
+	* semantic-doc.el (semantic-documentation-comment-preceeding-tag):
+	Fix unused var bytcomp warning.
+
+	* semantic-decorate.el (semantic-tag-create-secondary-overlay):
+	Fix unused var bytcomp warning.
+
+	* semantic-decorate-include.el (semantic-decoration-include-describe, semantic-decoration-include-menu):
+	(semantic-decoration-unknown-include-menu):
+	(semantic-decoration-unparsed-include-menu):
+	Fix unused var bytcomp warning.
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Fix unused var bytcomp warning.
+
+	* semantic-complete.el (semantic-complete-read-tag-engine, semantic-complete-current-match):
+	(semantic-displayor-ghost::semantic-displayor-focus-request):
+	Fix unused var bytcomp warning.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	(semantic-analyze-current-context-default):
+	Fix unused var bytcomp warning.
+
+	* semantic-analyze-refs.el (semantic-analyze-references::semantic-analyze-refs-impl):
+	(semantic-analyze-current-tag): Fix unused var bytcomp warning.
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-global-symbol):
+	(semantic-analyzer-debug-missing-datatype):
+	(semantic-analyzer-debug-test-local-context):
+	(semantic-analyzer-debug-insert-include-summary):
+	Fix unused var bytcomp warning.
+
+2009-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-normalize-tags):
+	Fix free var ref.
+	(semanticdb-table-emacs-lisp::semanticdb-normalize-one-tag):
+	Special case use of `symbol-file' for older Emacsen.
+
+	* bovine/semantic-c.el (semantic-c-skip-conditional-section):
+	Fix to handle elif special.
+	Fix regexp for whitespace checking.
+	(semantic-lex-c-if): Convert body into a function.
+	(semantic-c-do-lex-if): Defun of above.
+	(semantic-lex-c-macrobits): Add elif and else.
+	(semantic-cpp-lexer): Move whitespace handling after preprocessor.
+
+	* bovine/semantic-c.el (semantic-lex-c-macrobits):
+	Allow pre-# whitespace.
+	(semantic-c-lexer): Move ignore-whitespace handlers after macros
+
+	* semantic-complete.el (semantic-complete-inline-project):
+	Throw in a free TAB complete
+	when starting up this completion mode.
+
+2009-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-strip-find-results):
+	If a database fails to provide a
+	file, then just ignore the problem.
+
+	* semantic-ctxt.el: Section name fixes.
+	(semantic-end-of-command-default): Doc fix.
+	(semantic-ctxt-current-symbol): Doc fix
+	(semantic-ctxt-current-symbol-default):
+	Wrap in save-excursion.
+
+	* semantic-analyze.el (semantic-analyze-context::semantic-analyze-pulse):
+	New option
+	(semantic-analyze-pop-to-context): Pulse the context being dumped.
+
+	* semantic-adebug.el (semantic-adebug-analyze):
+	Special case no-results.
+	Pulse the analyzed prefix.
+
+2009-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Remove last debug statement.
+
+2009-01-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag.el: (log-edit-mode::semantic-insert-foreign-tag)
+	(chang-log-mode::semantic-insert-foreign-tag): New
+
+2008-12-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-list.el:
+	(semantic-symref, semantic-symref-symbol)
+	(semantic-symref-list-next-line): Doc updates.
+
+	* bovine/semantic-el.el: (semantic-elisp-use-read)
+	(emacs-lisp-mode::semantic-get-local-variables):
+	Use buffer-substring-no-properties instead of buffer-substring.
+
+	* senator.el (senator-force-refresh): New command.
+	(senator-menu-bar): Add above.
+	Add "find this tag" and "find symbol" from symref/
+
+	* semantic-texi.el (semantic-insert-foreign-tag): Deleted.
+	Moved to srecode-texi.el
+
+	* semantic-tag.el (semantic-foreign-tag):
+	Add doc to the foreign tag, just in case.
+
+	* semantic-edit.el (semantic-change-function):
+	Disable point-motion hooks
+	while running sub-hooks.
+
+	* semantic-doc.el (semantic-documentation-comment-preceeding-tag):
+	Doc fix.
+
+	* semantic-debug.el (semantic-debug-parser::semantic-debug-parser-frames):
+	Fix name.
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Disable another debug statement, and
+	instead fill in the file truename.
+
+2008-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-file-table-object): Remove previous "fix".
+	Fix default case instead an allow for fullfilename to be derived from
+	a found table.
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Add case for a found table that needs refresh.
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Protect against nil fullfile for one test.
+
+2008-12-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el:
+	(semanticdb-file-table-hash, semanticdb-file-table-object-from-hash)
+	(semanticdb-file-table-object-put-hash): File/table hash var/fcns.
+	(semanticdb-file-table-object): First try to extract the
+	table from the hash.  Then go the old route.
+	Store found table in the hash when done.
+	Stop using `find-buffer-visiting', and use `get-file-buffer'.  It
+	should be faster.
+	Add some debug code.
+
+	* semantic-dep.el (semantic--dependency-find-file-on-path):
+	Use `locate-path' internal fcn, not old loop.
+	Convert to defsubst.
+
+	* semanticdb-find.el (semanticdb-find-table-for-include): Doc fix.
+	(semanticdb-find-table-for-include-default):
+	For using the traditional semanticdb-current-database-list,
+	check for EDE on the current project, not the origin of the
+	file currently being examined.  The base project controls
+	the include path.
+
+	* semantic-elp.el (semantic-elp-emacs-core-list): Add locate-file.
+	(semantic-elp-ede-core-list): Add several EDE functions.
+	(semantic-elp-semantic-core-list): Comment out tag-lessp.
+	(semantic-elp-profile-typecache): New fcn.
+	(semantic-elp-typecache-enable): Use above as set-master.
+	Enable the include-path, not just the core path.
+	(semantic-elp-analyze): Call semantic-elp-profile-typecache, the new
+	master set function for typecache calculations.
+
+2008-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c++-mode::semantic-ctxt-scoped-types):
+	Convert from c-mode to c++-mode function.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	Support a path that is a filename.
+
+	* semantic-elp.el (semantic-adebug): New require.
+	(semantic-elp-object): Add "answer" slot.
+	(semantic-elp-analyze): Reorg.
+	Do full parse of current buffer before starting.
+	(semantic-elp-searchdb): New.
+
+	* semantic-adebug.el (eieio-datadebug): Add require.
+	(data-debug-insert-find-results-button): Fix to use
+	find-results-from-point.
+	(semanticdb-debug-file-tag-check): Fix to work.
+
+2008-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache::semanticdb-partial-synchronize):
+	Doc fix.
+	(semanticdb-abstract-table::semanticdb-typecache-file-tags): New method.
+	(semanticdb-table::semanticdb-typecache-include-tags): Moved creation
+	of some local vars inside an if statement to make the work optional.
+
+2008-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	If path is a buffer, find the cache from that buffer.
+	(semanticdb-find-result-prin1-to-string):
+	Add different format style if it is really big.
+
+2008-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/Makefile (LOADPATH): Add speedbar support.
+
+	* symref/Project.ede (symref): Depend on speedbar.
+
+	* symref/semantic-symref-list.el (semantic-symref, semantic-symref-symbol):
+	Supply name arg to below.
+	(semantic-symref-produce-list-on-results): Take new argument str.
+
+	* semantic-elp.el (semantic-elp-eieio-core-list): Add new EDE fcns.
+	(semantic-elp-ede-core-list): Add new fcns.
+	(semantic-elp-analyze): Fix filename.
+
+2008-12-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-list.el (semantic-symref-produce-list-on-results):
+	New fcn from below.
+	(semantic-symref): Extract second half to above.
+	(semantic-symref-symbol): New command.
+
+	* symref/semantic-symref-global.el (semantic-symref-tool-global):
+	Doc fix.
+	(semantic-symref-tool-global::semantic-symref-parse-tool-output-one-line):
+	Special case completions, which has no extra info.
+
+	* symref/semantic-symref-grep.el (semantic-symref-tool-grep::semantic-symref-perform-search):
+	Let users know that grep can't do some symref searches.
+
+	* senator.el: (senator-beginning-of-defun, senator-end-of-defun)
+	(senator-narrow-to-defun): Force reparse at the beginning of each.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Remove system include test when
+	looking for includes.
+
+	* semantic-lex-spp.el:
+	(semantic-lex-spp-analyzer-push-tokens-for-symbol)
+	(semantic-lex-spp-replace-or-symbol-or-keyword): Fix name typo.
+
+2008-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Add symref to loadpath.
+
+	* Project.ede (Database): Needs semantic-symref
+
+	* semanticdb-global.el (semanticdb-global): New require.
+
+	* semantic-ia-utest.el (semantic-ia-utest): Arg is now optional.
+
+	* semanticdb.el (semanticdb-table::semanticdb-in-buffer-p):
+	Protect against dead buffers.
+
+	* semanticdb-global.el (semanticdb-enable-gnu-global-databases):
+	Add setup code for mode.
+	(semanticdb-enable-gnu-global-hook): New fcn.
+	(semanticdb-enable-gnu-global-in-buffer): Add setting of the throttle
+	to include omniscience databases.
+	(semanticdb-table-global::semanticdb-equivalent-mode):
+	Hack to get things to work.
+	(semanticdb-table-global::semanticdb-find-tags-for-completion-method):
+	Convert a string list into a set of faux tags.
+
+	* symref/semantic-symref.el (semantic-symref-result): Add :hit-text
+	(semantic-symref-tool-baseclass::semantic-symref-get-result):
+	If an incomming result is a list of strings, set those onto
+	:hit-text.
+
+	* semantic.el (semantic-init-mode-hooks): New option.
+	(semantic-new-buffer-fcn): Call new hook.
+
+	* Makefile (Database_LISP): Add semanticdb-global.el
+
+	* Project.ede (Database): Add semanticdb-global.el
+
+	* semanticdb-global.el: Use GNU Global as an omniscient database.
+
+2008-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-missing-innertype):
+	Use `semantic-equivalent-tag-p' instead of `eq'.
+
+	* symref/semantic-symref-list.el: Patch from Alex Ott:
+	(semantic-symref-results-mode-map): Add q quit option.
+	(semantic-symref-hide-buffer): New command
+	(semantic-symref-rb-toggle-expand-tag): Fix read-only flag setting.
+
+2008-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semantic-ectag-lang.el (semantic-ectag-lang-extra-flags):
+	Support includes w/ / in them.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-file-table):
+	Cheater version of this method with simpler logic.
+
+	* semanticdb-mode.el (semanticdb-semantic-init-hook-fcn):
+	Set the tables buffer to the
+	current buffer.
+	(semanticdb-kill-hook): Clear the table's buffer slot.
+
+	* semanticdb.el (semanticdb-table): Add a buffer slot.
+	(semanticdb-in-buffer-p): Ues the buffer slot to get the buffer.
+	(semanticdb-table::semanticdb-refresh-table)
+	(semanticdb-table::semanticdb-needs-refresh-p): Use in-buffer-p only.
+	(semanticdb-file-table-object): Replace find-buffer-visiting with
+	calls to in-buffer-p
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	If the parent stack includes non-types, strip them off.  (ie, function
+	arg has a function on the stack.)
+
+	* semantic-ia.el (eval-when-compile): Add analyzer functions.
+
+	* semantic-elp.el (semantic-elp-emacs-core-list):
+	Add file-truename, and find-buffer-visiting.
+	(semantic-elp-eieio-core-list): Add eieiomt-method-list.
+	(semantic-elp-data::data-debug/eieio-insert-slots): Renamed from insert-fields.
+
+	* semanticdb-typecache.el (semanticdb-typecache-safe-tag-list):
+	Do not return a buffers main tag
+	list unmodified.
+
+	* semantic-scope.el (semantic-completable-tags-from-type): New
+	(semantic-analyze-scoped-type-parts): Use above to get tag components.
+
+2008-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semantic-ectag-lang.el (c-mode::semantic-ectag-lang-extra-flags):
+	Support both C and C++.
+	(c++-mode::semantic-ectag-lang-extra-flags): Deleted.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-buffer):
+	Require the lang support.
+
+	* semantic-complete.el (semantic-complete-inline-project): Fix doc.
+
+	* semantic-decorate-include.el (semantic-decoration-include-visit):
+	Add autoload cookie.
+
+	* symref/semantic-symref.el:
+	(semantic-symref-find-tags-by-name, semantic-symref-find-tags-by-regexp)
+	(semantic-symref-find-tags-by-completion): New fcns
+	(semantic-symref-tool-baseclass): Add more doc.
+
+	* semanticdb-typecache.el (semanticdb-typecache-apply-filename):
+	Fixed put of :filename to
+	correct tag.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method): Don't
+	apply filenames to copied tags, it occurs w/ copy fcn.
+	(semanticdb-typecache-complete-flush): New command.
+
+	* semantic-scope.el (semantic-analyze-scoped-type-parts):
+	Apply :filename to copies in a
+	safer way.
+
+	* semantic-tag.el (semantic-tag-copy):
+	Don't need to put :filename on w/ no side effects
+	as we are operating on a copy already.
+
+	* semantic-ia.el (semantic-ia--fast-jump-helper):
+	Check input tag for positional info.
+	(semantic-ia-fast-jump): Add special support for include tags.
+
+2008-12-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-elp.el (semantic-elp-analyze-list):
+	Remove semantic-analyze-inherited-tags
+
+2008-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-list.el (Commentary): Updated.
+	(pulse): Add require.
+	(semantic-symref-list-toggle-showing):
+	Fix typo searching for the +/- button.
+
+	* symref/semantic-symref.el (Commentary): Added more.
+
+2008-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref-grep.el (semantic-symref-filepattern-alist):
+	Fix emacs lisp mode.
+	(semantic-symref-perform-search): Fix doc.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-file-directory-exists-p):
+	If a database doens't have a file, then don't save it.
+
+	* semantic-tag.el (semantic--tag-find-parent-by-name):
+	Handle cases where the name doesn't split.
+
+	* semantic-format.el (semantic-format-tag-prototype-default):
+	Sometimes the typemodifiers is not a list.  Handle multiple cases.
+
+	* symref/semantic-symref-global.el (cedet-global): New require
+	(semantic-symref-global-command): Deleted.
+	(semantic-symref-tool-global::semantic-symref-perform-search):
+	Remove old calling impl.  Call into the cedet-global command instead.
+
+2008-12-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c-mode::semantic-ctxt-scoped-types):
+	Pull in using statements from
+	headers too.
+
+2008-12-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/Makefile (symref_LISP): Add semantic-symref-list.el
+
+	* symref/Project.ede ("symref"): Add semantic-symref-list.el
+
+	* symref/semantic-symref-list.el:
+	First pass at a semantic symbol reference navigation mode.
+
+2008-12-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref.el (semantic-symref-result::semantic-symref-result-get-tags):
+	Support `open-buffers' argument.
+	Place cursor on maching text when calculating the tag.  If we have a
+	match to a tag of the same name, then get the enclosing parent tag
+	name when available.
+
+2008-11-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-format.el (semantic-test-all-format-tag-functions):
+	Change how the parent tag is calculated to be simpler.
+
+	* symref/Makefile (symref_LISP): Add -grep.el
+
+	* symref/Project.ede (symref): Add -grep.el
+
+	* tests/testsubclass.cpp, tests/testfriends.cpp: Add symref tests.
+
+	* symref/semantic-symref-global.el (semantic-symref-tool-global::semantic-symref-perform-search):
+	Support scopiing flags, and searchtype flags.
+
+	* symref/semantic-symref.el: (semantic-symref-find-references-by-name)
+	(semantic-symref-find-file-references-by-name):
+	Change how scope is setup.
+	(semantic-symref-find-text): New fcn.
+	(semantic-symref-result::semantic-symref-result-get-tags):
+	Replace goto-line w/ something more direct.
+	(semantic-*-grep): Moved to semantic-symref-grep.el
+
+	* symref/semantic-symref-grep.el: Support symref tool via "grep".
+	Copied from semantic-symref.el.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Add Uarg for controlling which tests go.
+	Clear the cache and reparse for all tests.
+	(semantic-ia-utest-buffer, semantic-ia-utest-buffer-refs):
+	No longer interactive.
+	Don't clear/reparse here.
+	(semantic-sr-utest-buffer-refs): New test fcn.
+
+	* senator.el (add-log-current-defun):
+	Fix for use with updated canonical name formatter.
+
+	* symref/semantic-symref-global.el:
+	(semantic-symref-tool-global::semantic-symref-perform-search)
+	(semantic-symref-tool-global::semantic-symref-parse-tol-output-one-line):
+	Support the :resulttype slot.
+
+	* symref/semantic-symref.el (semantic-symref-instantiate):
+	Accept args for the new instance.
+	(semantic-symref-last-result): New State.
+	(semantic-symref-data-debug-last-result): Debug routine.
+	(semantic-symref-find-references-by-name): Pass in more args.
+	Use above debug option.
+	(semantic-symref-find-file-references-by-name): New.
+	(semantic-symref-result): Rename hit-alist to hit-lines.
+	Ad hit-files.  Fix init args.
+	(semantic-symref-result::semantic-syref-result-get-files): New method
+	(semantic-symref-result::semantic-syref-result-get-tags): New method
+	(semantic-symref-tool-baseclass): Add searchtype, searchscope, resulttype.
+	(semantic-symref-tool-baseclass::semantic-symref-tool-baseclass::semantic-symref-get-result):
+	Update to handle new slots.
+	(semantic-symref-filepattern-alist): Fix name.
+	(semantic-symref-tool-grep::semantic-symref-tool-grep::semantic-symref-perform-search):
+	(semantic-symref-tool-grep::semantic-symref-tool-grep::semantic-symref-parse-tool-output-one-line):
+	Track :resulttype output.
+
+2008-11-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-format.el (semantic-format-tag-canonical-name-default):
+	Re-wrote to handle nested tags, and named parents.
+
+	* semantic-decorate-include.el (semantic-decoration-on-unknown-include-menu):
+	Fix :help typo
+	(semantic-decoration-include-menu)
+	(semantic-decoration-unknown-include-menu)
+	(semantic-decoration-unparsed-include-menu):
+	Use new compatibility fcn `semantic-popup-menu'.
+
+	* semantic-fw.el (semantic-popup-menu): New compatibility alias.
+
+	* tests/Makefile ("Tests_MISC"): Add testusing.[ch]pp
+
+	* tests/Project.ede ("semantic/tests"): Add testusing.[ch]pp
+
+	* tests/testsubclass.hh (setFeet): Make as virtual.
+
+	* semantic-load.el (load-path): Add symref subproject.
+
+	* Makefile (LOADDIRS): Add symref
+	(all, .PHONY, tags, dist): Add symref subproject.
+
+	* Project.ede ("autoloads"): Add symref.
+
+	* symref/Makefile: New Makefile for symbol reference querying.
+
+	* symref/Project.ede: New project for symbol reference querying.
+
+	* symref/semantic-symref-global.el (semantic-symref-tool-global):
+	Add autoload cookie.
+	(semantic-symref-tool-global::semantic-symref-perform-search):
+	Change flags.  Clear query buffer.
+
+	* symref/semantic-symref.el (semantic-symref-tool):
+	Change default to 'detect.
+	(semantic-symref-detect-symref-tool)
+	(semantic-symref-instantiate): New fcn.
+	(semantic-symref-find-references-by-name): Remove bits into above two
+	new fcn.
+	(semantic-symref-tool-baseclass::semantic-symref-get-result):
+	Also set :created-by in results.
+	(semantic-symref-tool-grep::semantic-symref-perform-search):
+	Fix up command switches (cmds) creation.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Force refresh of semanticdb tables before searching them.
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Force refresh of a semanticdb table
+	when one is passed in.
+
+	* semantic-decorate-include.el (semantic-decoratiton-mouse-3): New var.
+	(semantic-decoration-on-include-map)
+	(semantic-decoration-on-unknown-include-map)
+	(semantic-decoration-on-unparsed-include-map): Use above
+	(semantic-decoration-on-include-menu)
+	(semantic-decoration-on-unknown-include-menu)
+	(semantic-decoration-on-unparsed-include-menu): Use semantic-menu-item.
+
+	* senator.el (senator-menu-item):
+	Replace with alias into semantic-fw.el.
+
+	* semantic-fw.el (semantic-event-window):
+	New alias/defun for XEmacs/Emacs.
+	(semantic-menu-item): New fcn.
+
+2008-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testdoublens.hpp (~Foo): New.
+
+	* tests/testdoublens.cpp (Name2::get, Name2::publishStuff, Name3::sendStuff):
+	Add symref test markers.
+
+	* ctags/semantic-ectag-util.el (require): inversion
+	(semantic-ectag-run): Protect against problems running ctags.
+	(semantic-ectag-test-version): Require inversion.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-split-fields):
+	Fix typo.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-one-tag):
+	Don't pass class to below.
+	(semantic-ectag-split-fields): Simplify looping constructs.
+	Add implementation support.
+
+	* bovine/c.by (typeformbase): Support template specifiers.
+
+	* semantic-ia.el (semantic-ia--fast-jump-helper): Renamed from typo.
+	(semantic-ia-fast-jump): Fix use of above.
+
+	* semantic-fw.el (semantic-find-file-noselect): Add xemacs support.
+
+	* semantic-analyze-refs.el (semantic--analyze-refs-full-lookup-with-parents):
+	When looking up for parnts, in name search loop,
+	fix parent list passed into find-tags-with-parent.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Fix sorting of parents if multiple namespaces and named parent on fcn.
+
+	* semantic-analyze-refs.el (semantic--analyze-refs-find-tags-with-parent):
+	Handle case where the
+	split name of p is still a string.
+
+	* semantic-util-modes.el (semantic-add-minor-mode):
+	Fix for desktop-minor-mode-handlers setup.
+
+2008-11-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref.el (semantic-symref-filepattern-alist):
+	Fix up various expressions.
+	(semantic-symref-tool-grep::semantic-symref-perform-search): Handle
+	complex find pattern lists.
+	Error if unsupported mode.
+	(semantic-symref-tool-grep::semantic-symref-parse-tool-output-one-line):
+	Improve the regexp.
+
+	* symref/semantic-symref-global.el:
+	First pass at using GNU global as a symref backend.
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list): Add testusing.cpp
+
+	* tests/testusing.hh, tests/testusing.cpp:
+	First edition of test suite for using statements in C
+
+	* bovine/semantic-c.el (semantic-ctxt-scoped-types):
+	Search for using statements scoped w/in included namespaces.
+
+2008-11-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* symref/semantic-symref.el: Symbol reference searching utility.
+
+2008-11-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el: Patch from Alastair Rankine:
+	(semanticdb-ebrowse-add-globals-to-table)
+	(semanticdb-ebrowse-add-tree-to-table):
+	unknown_proxy.hh should be in the default directory.
+
+2008-11-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Fix case of ( at beginning of
+	command looping forever.
+
+2008-11-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el (semantic-analyze-scoped-tags-default):
+	Make namespace check more robust.
+
+	* semantic-lex-spp.el (semantic-lex-spp-table-write-slot-value):
+	Protect against too-large a data structure when writing out macros.
+
+2008-11-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-gcc.el (semantic-gcc-query):
+	If the gcc cmd doesn't exist, don't error.
+
+2008-11-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-add-minor-mode):
+	Do not add handlers if the variable is not
+	available.
+
+2008-10-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-include-visit):
+	Use `semantic-dependency-tag-file'
+	to extract the filename from the include tag, then jump to it's location.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Use `semantic-tag-include-filename' to
+	extract the filename from the tag.
+
+2008-10-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/lang-support-guide.texi (Tag Structure):
+	Update PROPERTIES a little.
+	(Language Support Overview): Minor changes.
+	(Semantic Overload Mechanism): Revamp w/ new name `overloadable-'.
+	(Application API Structure)
+	(Writing Lexers, Lexer Construction)
+	(Keywords, External Parsers): Minor changes
+
+	* semantic-lex.el (Commentary): Merge in some of David's changes.
+
+2008-10-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el: Patch from Alex Ott:
+	(semantic-desktop-ignore-this-minor-mode): New
+	(semantic-add-minor-mode): Use above instead of nil when initialiing
+	`desktop-minor-mode-handlers'.
+
+	* INSTALL: Discuss exuberent ctag support.
+
+	* doc/installation.texi (Canned Configuration):
+	Add ctags enabling fcn reference.
+
+	* doc/user-guide.texi (top): Removed below.  Change analyzer summary.
+	(ctags): Remove the node.
+
+	* doc/user-guide.texi (top): Add below.
+	(Exuberent ctags): New section
+
+2008-10-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-add-minor-mode):
+	Disable any semantic mode for Desktop restore.
+
+	* ctags/semanticdb-ectag.el (semanticdb-enable-exuberent-ctags):
+	Renamed from
+	semantic-enable-exuberent-ctags.
+
+	* ctags/semantic-ectag-lang.el (semantic-load-enable-all-exuberent-ctags-support):
+	Renamed from semantic-enable-all-exuberent-ctags-support.
+	Add ctags version testing.
+
+	* ctags/semantic-ectag-lang.el (c-mode::semantic-ectag-set-language-attributes):
+	Replace call to semantic--tag-put-attributes with the pre-existing
+	version.
+
+	* semantic-util.el (semantic-describe-buffer):
+	Add two lex vars to list.
+
+	* semantic-tag.el (semantic--tag-put-attribute):
+	Delete.  It already existed.
+
+	* semantic-imenu.el (semantic-imenu-goto-function):
+	Add tag pulsing when visiting.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-buffer):
+	Return the tag list.
+	(semantic-ectag-add-child,semantic-ectag-add-parent):
+	Replace call to semantic--tag-put-attributes with the pre-existing
+	version.
+	(semantic-ectag-setup-parse-table, semantic-ectag-parse-region)
+	(semantic-ectag-parse-changes, semantic-ectag-expand-tag):
+	New functions for using ectag as the main parser in a buffer.
+
+2008-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-describe-buffer-var-helper): New fcn
+	(semantic-describe-buffer): New command.
+	(semantic-current-tag-interactive): Renamed from `semantic-current-token'.
+
+	* ctags/semantic-ectag-util.el (semantic-ectag-program):
+	Set default to just `ctags'.
+
+2008-10-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/semanticdb-ectag.el (semantic-enable-exuberent-ctags):
+	Also accept symbols into the fcn.
+
+2008-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* ctags/Makefile (ctags_LISP): Add semanticdb-ectag.el
+
+	* ctags/Project.ede ("ctags"): Add semanticdb-ectag.el
+
+	* ctags/semantic-ectag-util.el (semantic-enable-exuberent-ctags):
+	Deleted.
+	(semantic-ectag-version): Enforce +regex ctags configuration.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-parse-buffer):
+	Extract part into below.
+	(semantic-ectag-parse-file-with-mode): New fcn from above.
+	Extract variable values from mode-local directly.
+	(semantic-ectag-parse-one-tag): Added macro and enumerator support.
+	Added const tracking.
+
+	* ctags/semantic-ectag-lang.el: (c++-mode::semantic-ectag-lang)
+	(c++-mode::semantic-ectag-lang-kind): Added c++ version.
+
+	* ctags/semanticdb-ectag.el: SemanticDB integration with ctag parsers.
+
+	* semanticdb.el (semanticdb-create-table-for-file):
+	Minor code rearrangement.
+	(semanticdb-file-table-object): Extract section into below new fcn.
+	(semanticdb-create-table-for-file-not-in-buffer): New, extracted from above.
+	Added ability to configure with a local variable.
+	(semanticdb-out-of-buffer-create-table-fcn): New variable.
+
+	* semantic-tag.el (semantic--tag-put-attribute): New fcn.
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Support the :line attribute which may
+	be provided out of external taggers that don't support char positions.
+
+	* ctags/semantic-ectag-lang.el (c-mode::semantic-ectag-lang-kind):
+	Add 'i'
+	(c-mode::semantic-ectag-lang-extra-flags)
+	(c++-mode::semantic-ectag-lang-extra-flags):
+	New settings for adding #include support.
+	(c-mode::semantic-ectag-split-signature-summary):
+	New override for splitting a signature.
+	(c-mode::semantic-ectag-set-language-attributes):
+	New override for adding constructor/destructor flags to C tags.
+
+	* ctags/semantic-ectag-parse.el (semantic-ectag-lang-extra-flags):
+	New mode variable.
+	(semantic-ectag-parse-buffer): Add above flag to list of flags passed
+	to ctags.
+	(semantic-ectag-parse-one-tag): Support kind=include
+
+	* ctags/semantic-ectag-util.el (semantic-ectag-lang-and-kinds):
+	Switch to the support buffer and move point.
+
+	* ctags/semantic-ectag-parse.el (semaentic-ectag-lang): New require
+	(semantic-ectag-parse-buffer): Add no sorting flag to call.
+	Set major mode in ctag output buffer matching original.
+	(semantic-ectag-parse-tags): Remove inner loop into new fcn.
+	This is now a loop, with complex reparenting mechanism.
+	(semantic-ectag-add-child, semantic-ectag-add-parent): New
+	(semantic-ectag-parse-one-tag): New.  Was in parse-tags before.
+	(semantic-ectag-split-signature-summary-default): Simplify for
+	default.
+	(semantic-ectag-set-language-attributes): New overloadable fcn & default.
+
+	* bovine/semantic-c.el (c-mode::semantic-analyze-unsplit-name):
+	New language override.
+
+	* semantic-analyze-fcn.el (semantic-analyze-unsplit-name): Fix typo
+
+	* semantic-analyze-fcn.el (semantic-analyze-unsplit-name):
+	New overloadable function and default.
+
+2008-10-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-table-write-slot-value):
+	Add CR after comment during write.
+
+2008-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Add ctags
+	(LOADDIRS): Add ctags
+	(ctags): New target/subproject
+	(all, tags, dist): Add ctags
+
+	* Project.ede (autoloads): Add ctags to list of autoload dirs.
+	(semantic): Add semantic-ectag-util to list of aux packages.
+
+	* semantic-load.el (ctags): Add ctags subdir to load path.
+
+	* ctags/Makefile: Makefile for exuberent ctag support.
+
+	* ctags/Project.ede: Project for exuberent ctag support.
+
+	* ctags/semantic-ectag-lang.el: Support for some languages using ctags.
+
+	* ctags/semantic-ectag-parse.el:
+	Support for converting exuberent ctag tags into semantic tags.
+
+	* ctags/semantic-ectag-util.el:
+	Support for running exuberent ctags as a subprocess.
+
+	* semanticdb-ebrowse.el (semanticdb-table-ebrowse::semanticdb-normalize-tags):
+	Doc updates.
+	Minor code restructure.
+	(semanticdb-table-ebrowse::semanticdb-normalize-one-tag): New method.
+
+	* semanticdb-cscope.el (semanticdb-cscope-dump): Use data-debug api.
+
+	* semantic-utest.el (cedet-utests): Fix name typo
+
+	* semantic-utest.el (cedet-utest): New require.
+	(semantic-utest-main): Lots of messaging using cedet-utest.
+
+	* semantic-texi.el: (semantic-texi-update-doc-from-texi)
+	(semantic-texi-goto-source): When stripping find results, don't load
+	their buffers.
+
+	* semantic-mru-bookmark.el (semantic-bookmark::initialize-instance):
+	Minor restructure.
+
+	* semantic-ia-utest.el (cedet-utests): New require.
+	(semantic-ia-utest): Remove buffer recenter.
+	(semantic-ia-utest-buffer-refs): Don't set 'a'.
+	(semantic-ia-utest-start-log, semantic-ia-utest-log):
+	Replace impl w/ calls into cedet-utest.
+
+	* semantic-fw.el (semantic-test-data-cache):
+	Replace fail message w/ error.
+	(semantic-test-throw-on-input): Message to ask for a keypress.
+	Do not use sit-for.
+
+	* semantic-analyze-fcn.el (semantic-analyze-select-best-tag):
+	White-space cleanup.
+
+	* semantic-adebug.el (semanticdb-debug-file-tag-check):
+	Replace object-print w/ eieio-object-print.
+
+2008-10-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Do not do special stuff for includes.
+
+	* semanticdb-find.el (semanticdb-strip-find-results):
+	Do not use `semanticdb-get-buffer' unless `find-file-match'
+	is specified propertly.
+
+2008-10-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el:
+	(semantic-ia-get-completions, semantic-ia-complete-symbol)
+	(semantic-ia-complete-symbol-menu, semantic-ia-show-doc)
+	(semantic-ia-describe-class): Add comments
+	(semantic-ia--fast-jump-heper): New
+	Derived from below.  Adds REFS analysis to find implementation
+	of target tag.
+	(semantic-ia-fast-jump): Update to use above.
+
+2008-10-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsubclass.cpp:
+	(animal::moose::setFeet, animal::moose::getFeet)
+	(animal::moose::doNothing, bool deer::moose::getAntlers)
+	(deer::moose::setAntlers, sneaky::antelope::testAccess)
+	(deer::moose::doSomething, sneaky::bugalope::testAccess):
+	Augment with analyzer ref tests.
+
+	* semantic-utest.el (semantic-utest-makebuffer): Disable font lock.
+	(semantic-utest-C): Remove messages.
+	(semantic-utest-generic): Remove messages.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Moved some loging msgs here.
+	(semantic-ia-utest-buffer): Call the refs test per buffer also.
+	(semantic-ia-utest-buffer-refs): New.
+	(semantic-ia-utest-log): Use save-excursion.
+
+	* semantic-analyze-refs.el (semantic-analyze-references::semantic-analyze-refs-impl):
+	Only return
+	impls.  If there are none, return nil.
+	(semantic--analyze-refs-full-lookup-with-parents): Pass 2nd arg
+	`noerror' as 2 when doing a full lookup, as we handle nil.
+	(semantic--analyze-refs-full-lookup-simple): Add optional noerror arg
+	to suppress errors, and return nil when there is an issue.
+	(semantic-analyze-proto-impl-toggle): Use car of the impl list.
+
+	* semantic-sort.el (semantic-tag-external-class-default):
+	When stripping find results,
+	cache the name into the tag.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Allow parents from
+	nesting to be determined for variables.
+
+	* semanticdb-java.el (semanticdb-table-java): Doc Fix.
+	(semanticdb-find-default-throttle): New.
+	(semanticdb-file-table): Remove implementation.
+	(semanticdb-find-tags-for-completion-method): Add impl.
+	(semanticdb-deep-find-tags-by-name-method)
+	(semanticdb-deep-find-tags-by-name-regexp-method)
+	(semanticdb-deep-find-tags-for-completion-method): New
+	(semanticdb-find-tags-external-children-of-type-method): Doc fix.
+
+2008-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-load-enable-code-helpers): Doc fix.
+	(semantic-load-enable-gaudy-code-helpers): Doc fix
+	(semantic-load-enable-excessive-code-helpers): Include `guady-code-helpers'.
+	(semantic-load-enable-semantic-debugging-helpers): Doc fix.
+
+2008-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex.el (Commentary:): Re-wrote this section
+	(semantic-lex-map-keywords)
+	(semantic-lex-highlight-token)
+	(semantic-lex-newline-as-whitespace)
+	(semantic-lex-whitespace)
+	(semantic-lex-ignore-whitespace): Doc and comment fixes.
+
+2008-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-adebug.el (data-debug-insert-tag): Doc update.
+	(data-debug-insert-db-and-tag-button,data-debug-insert-db-and-tag-from-point):
+	New functions.
+
+	* bovine/c.by (knr-one-variable-decl): Support declmods, like register.
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Support a parent that is a database table.
+
+	* semantic-analyze-refs.el (semantic-analyze-references::semantic-analyze-refs-impl):
+	Fix best tag finding trick.
+
+	* Makefile (Analyzer_LISP): Add semantic-analyze-refs.el
+
+	* Project.ede ("Analyzer"): Add semantic-analyze-refs.el
+
+	* semantic-analyze-refs.el: Reference Analysis for a tag.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Fix sorting of returned parents.
+
+2008-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-table-write-slot-value):
+	When writing out a lexical
+	table, if an error occurs, emit "nil", in addition to the comment.
+
+	* semantic-ia.el (pulse): New require.
+	(semantic-ia-fast-jump): Pulse tag after jumping to it.
+
+	* semantic-complete.el (semantic-displayor-traditional-with-focus-highlight):
+	Change
+	inheritance order.
+	(semantic-displayor-traditional-with-focus-highlight::semantic-displayor-focus-request):
+	Use `semanticdb-normalize-one-tag' when attempting to focus.
+	(semantic-complete-jump): Enable searching through system databases.
+
+	* semanticdb-find.el (semanticdb-strip-find-results):
+	Use semanticdb-normalize-one-tag to
+	find the tag buffer and file.
+	(semanticdb-find-result-nth-in-buffer): Use
+	semanticdb-normalize-one-tag when identifying the tag's buffer.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-normalize-one-tag):
+	Doc fix.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-normalize-tags):
+	Loop over below.
+	(semanticdb-table-emacs-lisp::semanticdb-find-tags-by-class-method):
+	Use `symbol-file' to derive location of the real tag.
+
+	* semanticdb-ref.el (semanticdb-ref-test):
+	Fix for change in API name in eieio-datadebug.
+
+	* semantic-mru-bookmark.el (semantic-adebug-mrub):
+	Fix for change in API name in eieio-datadebug.
+
+	* semantic-lex.el (semantic-lex-debug): New debug fcn.
+
+	* semantic-adebug.el (semantic-adebug-analyze):
+	Fix for change in API name in eieio-datadebug.
+
+2008-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-minimum-working-buffer-size):
+	New configuration variable.
+	(semantic-fetch-tags): Don't using working display if buffer
+	is larger than above configuration variable.
+
+2008-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-adebug.el (semanticdb-debug-file-tag-check):
+	Remove 2nd argument from `file-attributes'
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-normalize-one-tag):
+	New fcn.
+	(semanticdb-table::semanticdb-needs-refresh-p)
+	(semanticdb-abstract-table::semanticdb-synchronize):
+	Remove 2nd argument from `file-attributes'.
+
+	* semanticdb-file.el (semanticdb-table::object-write):
+	Remove 2nd argument from `file-attributes'
+
+	* semanticdb-mode.el (semanticdb-kill-hook):
+	Remove 2nd argument from `file-attributes'
+
+2008-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-search.el (semanticdb-search-results-table::semanticdb-printable-name):
+	Deleted.
+
+	* semanticdb-file.el (semanticdb-full-filename):
+	Deleted.  (Moved to semanticdb.el)
+
+	* semanticdb-ebrowse.el (semanticdb-create-ebrowse-database): Doc fix.
+	(semanticdb-load-ebrowse-caches): Use the regular save directory.
+	(semanticdb-ebrowse-file-for-directory): Use the regular save directory.
+
+	* Makefile (Database_LISP): Add semanticdb-mode.el
+
+	* Project.ede (Database): Add semanticdb-mode.el
+
+	* semanticdb.el:
+	(semanticdb-current-database, semanticdb-current-table)
+	(make-variable-buffer-local, semanticdb-global-mode)
+	(semanticdb-mode-hooks, semanticdb-hooks, semanticdb-minor-mode-p)
+	(global-semanticdb-minor-mode, semanticdb-toggle-global-mode)
+	(semanticdb-semantic-init-hook-fcn, semanticdb-revert-hook)
+	(semanticdb-kill-hook, semanticdb-kill-emacs-hook, semanticdb-synchronize-table)
+	(semanticdb-partial-synchronize-table):
+	Moved to semantic.el
+
+	* semanticdb-mode.el: Moved Semanticdb MODE stuff from semanticdb.el.
+
+2008-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-gcc.el (semantic-gcc-query):
+	make robust to running w/ a bogus directory.
+
+	* semantic-ia-sb.el (semantic-ia-speedbar): Add call to below.
+	(semantic-analyze-context::semantic-ia-sb-show-doc): New method.
+
+	* semantic-doc.el (semantic-doc-snarf-comment-for-tag):
+	Make robust to situations where block-comment-end is unbound.
+
+2008-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (top): Add idle working options section.
+	(Idle Working Options): New.
+
+	* doc/lang-support-guide.texi (Debugging):
+	Remove analyzer debugging section.
+
+	* doc/installation.texi (Canned Configuration):
+	Add more descriptive text for the different cans.
+	(Search Optimization): Add subsection headings.
+	Re-sort some of the doc.
+	Add some new features to the doc.
+	(Parsing Optimization): Fix typo.
+
+	* semantic-load.el (semantic-load-enable-code-helpers):
+	Enable mru-bookmark mode.
+	(semantic-load-enable-excessive-code-helpers): Enable decorating
+	private and protected methods.
+
+	* semantic-idle.el (semantic-debug-idle-work-function): Fix doc.
+
+	* semantic-decorate-mode.el:
+	(semantic-decoration-on-private-members-face)
+	(semantic-decoration-on-protected-members-face):
+	Brighten up the faces for dark backgrounds.
+
+	* semantic-lex-spp.el (semantic-lex-spp-one-token-to-txt):
+	If we get a NULL value,
+	return "".
+
+	* semantic-analyze.el: (semantic-analyze-find-tag-sequence)
+	(semantic-analyze-find-tag-sequence-default): Add throwsym argument.
+	Throw instead of error if this is set.
+	(semantic-analyze-current-context-default):
+	Specify a throwsym to above if in toggle-debug-mode so that
+	we don't get errors as a part of operation.
+
+2008-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (knr-varnamelist, knr-one-variable-decl): New
+	(knr-arguments): Use above.
+
+	* semantic-javascript.el: Remove erroneous file.
+
+2008-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Database_LISP): Add semanticdb-javascript.el
+
+	* Project.ede (Database): Add semanticdb-javascript.
+
+	* semanticdb-javascript.el: Moved from contrib area.
+
+	* semantic-javascript.el: Moved from contrib.
+
+	* wisent/Makefile (wy_SEMANTIC_GRAMMAR, wy_SEMANTIC_GRAMMAR_EL, languages_LISP, ):
+	Add a javascript parser.
+
+	* wisent/Project.ede ("wy", "languages"): Add the javascript parser.
+
+	* wisent/wisent-javascript-jv.wy:
+	Moved from contrib/wisent-javascript-jv.wy
+
+	* wisent/wisent-javascript.el: Moved from contrib/wisent-javascript.el
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Tried to make a little speedier.
+
+	* semantic-lex.el (semantic-lex-token-p): Remove copy-paste bug.
+
+	* semantic-lex.el:
+	(semantic-lex-token-p, semantic-lex-token-without-text-p)
+	(semantic-lex-token-with-text-p): New fcns.
+
+	* semantic-tag.el (semantic-tag-docstring):
+	Handle the case where the doc is stored as a
+	string.  Handle the case where the string is in the lexical token.
+
+	* semantic-idle.el (semantic-idle-summary-function): Change value to
+	semantic-format-tag-summarize-with-file.
+	(semantic-idle-summary-format-default): Deleted.
+	It now appears as semantic-format-tag-summarize-with-file.
+
+	* semantic-format.el (semantic-format-tag-functions):
+	Add summarize-with-file, and short-doc.
+	(semantic-format-face-alist): Add documentation type.
+	(semantic-format-tag-summarize-with-file)
+	(semantic-format-tag-short-doc): New.
+
+2008-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Move many feature shut-off options
+	into semantic-find-file-noselect.
+
+	* semantic-fw.el (semantic-find-file-noselect):
+	Add many more things to shut-off before
+	opening a file.
+
+	* bovine/semantic-java.el (semantic-java-doc-keywords-map):
+	Minor doc fix.
+
+	* bovine/semantic-gcc.el (semantic-gcc-setup):
+	Add more root include paths like /usr/include.
+	Return nil.
+
+	* semantic-chart.el (semantic-chart-analyzer):
+	Fixed calculation of typecache size.
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-missing-innertype):
+	Don't throw an error for a metatype issue.
+
+2008-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-dependency-tag-file):
+	Use `find-library-name' if available.
+
+	* bovine/semantic-el.el: Patch from David Engster
+	(emacs-lisp-mode::semantic-dependency-tag-file):
+	If the .el file doesn't exist, check for .el.gz as found in some linux
+	distros.
+
+2008-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest.el (semantic-utest-makebuffer):
+	Turn off buffer-save  questions.
+	Re-enable font-lock.
+	(semantic-utest-C): Turn off the buffer modification bit.
+	(semantic-utest-generic): Improve doc string.
+	Turn off the buffer modification bit.
+
+	* semantic-decorate-include.el (semantic-decoration-include-describe):
+	Add nice error msg.
+
+2008-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-on-includes-highlight-default):
+	For unparsed files, if no table is identified, don't setup
+	synchronization references.
+
+2008-08-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-describe-environment):
+	New debugging command.
+
+	* bovine/semantic-c.el (semantic-gcc-setup):
+	Call this fcn if we are on a machine likely to
+	use gcc.
+
+	* bovine/Makefile (languages_LISP): Add semantic-gcc.
+
+	* bovine/Project.ede ("examples"): Add semantic-gcc.el
+
+	* bovine/make.by (commands): Each command starts w/ BOL.
+
+	* senator.el (senator-prefix-map): Add ? binding for
+	(semantic-pulse-tag): New utility fcn.
+
+	* semantic-utest.el (semantic-utest-Makefile-buffer-contents):
+	Use TABs.
+	(semantic-utest-makebuffer): Turn off font-lock.
+
+2008-08-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-gcc.el (semantic-gcc-fields):
+	Re-write to string-match each line.
+	On match, pull out the desired string.
+	(semantic-gcc-setup): Use 'target first, then --host field.
+	(sematnic-gcc-test-strings, semantic-gcc-test-strings-fail):
+	New test vars
+	(semantic-gcc-test-output-parser): New testing function.
+
+	* bovine/semantic-gcc.el (semantic-gcc-setup): Add autoload cookie.
+
+	* bovine/semantic-gcc.el:
+	Support simple setup of some C++ settings by querying GCC about where
+	it keeps things.
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	When finding t able for
+	preprocessor symbol files, make sure the table has been refreshed.
+
+2008-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag.el (semantic--tag-find-parent-by-name): New fcn
+	(semantic-tag-type-superclass-protection): Use above.
+
+	* semantic-scope.el: (semantic-analyze-scope-lineage-tags-default)
+	(semantic-analyze-scoped-inherited-tags): When calling
+	semantic-tag-type-superclass-protection make sure the
+	passed in parent is a string.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Use semantic-find-file-noselect
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Use semantic-find-file-noselect
+
+	* semantic-fw.el (semantic-find-file-noselect): New fcn
+
+2008-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-file-directory-exists-p):
+	New.
+	(semanticdb-project-database-file::semanticdb-save-db):
+	Use above.
+
+2008-08-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el (semantic-texi-command-completion-list):
+	For old XEmacses,
+	split up the regexp based texinfo environment variable.
+
+	* bovine/semantic-c.el: (semantic-lex-c-preprocessor-symbol-map)
+	(semantic-lex-c-preprocessor-symbol-file):
+	Wrap call to reset-preprocessor in condition-case, then call
+	the reset after both these variables.  Fixes a bug with older Emacsen
+	which put the entire defcustom into the autoload file.
+
+	* doc/user-guide.texi (Charts): Use new tag terminology.
+
+	* semantic-scope.el (semantic-analyze-scoped-type-parts):
+	Prevent errors if TYPE is nil.
+
+2008-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	Use a temporary lexer when inside a macro.
+	(semantic-c-lexer): Doc fix.
+	(semantic-cpp-lexer): New lexer.  As above, but with ## support.
+	(semantic-expand-c-tag): Typedefs to get the :superclasses slot unprocessed.
+	(c-mode::semantic-tag-components): Use the :typedef attribute, not the
+	superclasses list.
+	(c-mode::semantic-analyze-dereference-metatype): Support output of
+	tags directly.
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-global-symbol):
+	Catch and display any errors
+	that resulted during the sequence lookup.
+
+	* semantic-analyze-fcn.el (semantic-analyze-dereference-metatype-stack):
+	Better error msg.
+	(semantic-analyze-dereference-metatype): Allow a tag to be returned
+	from the override.
+
+	* semantic-analyze.el (semantic-analyze-error-stack): New variable
+	(semantic-analyze-push-error): New fcn
+	(semantic-analyze-context): Add "errors" slot.
+	(semantic-analyze-current-context-default): Support an error stack.
+	Replace condition-case code to not activate if debug-on-error is on.
+	When condition-cases are active, store any cast errors.
+	(semantic-analyze-context::semantic-analyze-show):
+	Display the error slot.
+
+	* doc/grammar-fw.texi (Overview): Minor edits.
+
+	* doc/glossary.texi (Glossary): Spelling fixes.
+	Add def for nonterminal.
+	Add note about tag binding
+
+	* doc/app-dev-guide.texi (Searching Tag Tables): Syntax fix
+	(Deep Search, Parser Hooks): nonterminal -> tag
+	(Semantic Database, Semanticdb in Programs, Semanticdb Tag Queries):
+	Spelling.
+	(DB Generic Search): Re-write begining.  Add note on backward
+	compatible arg.
+
+	* semantic-dep.el (defcustom-mode-local-semantic-dependency-system-include-path):
+	Doc fix.
+
+2008-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Fix condition-case mis-use.
+
+2008-08-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-mru-bookmark.el (semantic-bookmark::semantic-mrub-visit):
+	Undo last change.
+	(semantic-bookmark::semantic-mrub-preflush): Fix typo.
+
+	* semantic-mru-bookmark.el (semantic-bookmark::semantic-mrub-visit):
+	Don't do fancy checks for a
+	tag in a buffer.  Just use `semantic-go-to-tag'.
+	(semantic-bookmark::semantic-mrub-preflush): Replace
+	`semantic-tag-buffer' with `semantic-tag-in-bufer'.
+
+2008-08-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-one-token-to-txt): New
+	(semantic-lex-spp-macro-to-macro-stream): Do not expand a macro
+	if the macro has args, but is not supplied an argument list.
+	Patch from lsdsgster@...
+	(semantix-lex-spp-analyzer-push-tokens-for-symbol): Fix a typo.
+
+	* tests/testsppreplaced.c (tail_fcn): Add
+	(__gthrw_foo): Add.
+
+	* tests/testsppreplace.c (tail_fcn): syntax fix.
+	(__gthrw_, __gthrw_foo): New tests.
+
+2008-08-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el:
+	Added comment separators for different sections.
+	(semantic-tag-include-filename): Moved.
+	(semantic-ia-insert-tag): New overload by David <de_bb@...>
+
+	* semantic-ia.el (semantic-ia-insert-tag):
+	Converted to overloadable function.
+	(semantic-ia-inser-tag-default): New name, old code.
+
+2008-07-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (one-class-parent):
+	Allow virtual to appear either before or after
+	protection keywords.
+
+	* semantic-decorate-include.el (semanticdb-file-table-object):
+	Do not deref an unfound table.
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Add case where the file is in a
+	buffer, but has not semanticdb table.  (do nothing).
+	Make sure a file did not exist in a buffer before killing.  Debug that
+	case in case it comes up.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (eieio): Add require before loading the loaddefs.
+
+2008-07-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Do not use ede to expand a filename if
+	there is no project.
+
+2008-07-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile (Tests_MISC): Add testfriends.cpp.
+
+	* tests/Project.ede ("Tests"): Add testfriends.cpp.
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add testfriends.cpp.
+
+	* semantic-scope.el (semantic-analyze-scope-calculate-access-default):
+	Add friend
+	searching support.
+
+	* tests/testfriends.cpp: Unit test for completion using friend classes.
+
+	* bovine/c.by (FRIEND): Add summary.
+	(classsubparts): Add support for FRIEND functions and classes.
+
+	* semanticdb-typecache.el (semanticdb-typecache-find,semanticdb-typecache-find-default):
+	Stop accepting SCOPERETURN.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Stop accepting SCOPERETURN.
+	Instead put the scope onto a cloned tag.
+
+	* semantic-analyze-fcn.el:
+	(semantic-analyze-tag-type, semantic-analyze-dereference-metatype)
+	(semantic-analyze-dereference-metatype-1):
+	 Stop using scopereturn from semanticdb-typecache-find.  Get scope
+	 from returned tag instead.
+
+	* semantic-scope.el: (semantic-scope-tag-clone-with-scope)
+	(semantic-scope-tag-get-scope): New utilities.
+
+2008-06-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-include-describe):
+	Fix spelling in output.  (Thanks Stefano Sabatini)
+
+2008-06-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (semantic-throw-on-input):
+	Also throw on process input.
+	Thanks David Hansen.
+
+2008-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-highlight-edits-face, semantic-unmatched-syntax-face):
+	Set to semantic-faces group.
+
+	* semantic-complete.el (semantic-complete-inline-face):
+	Change group to semantic-faces
+
+2008-06-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic): Doc string update.
+	(semantic-faces): New group.
+
+2008-06-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-table): Add todo comment.
+	(semanticdb-table::semanticdb-needs-refresh-p): Do not use empty tag
+	list as indicator of out of date-ness.
+
+	* bovine/c.by: Add todo comments.
+
+	* tests/testdoublens.cpp (test_fcn):
+	New test that tries the multi-layer metatype.
+
+	* tests/testdoublens.hpp: Add a 4 layer stack of metatypes.
+
+	* bovine/semantic-c.el (c-mode::semantic-analyze-dereference-metatype):
+	Handle typedef's that return a list or string for the new type.
+
+	* bovine/c.by (class-parents): Return as a list.
+
+	* semantic-analyze-fcn.el (semantic-analyze-tag-type):
+	Captures the scope from
+	semanticdb-typecache-find, and apply into the scope when dereferencing
+	metatypes.
+	(semantic-analyze-dereference-metatype-1): Update scope's typecache as we
+	loop downward through a metatype dereference.
+
+	* semantic-chart.el: (semantic-chart-database-size)
+	(semantic-chart-tag-complexity): Fix doc strings.
+
+	* semantic-scope.el (semantic-scope-cache): Add typescope slot
+	(semantic-scope-cache::semantic-reset): Reset typescope slot.
+	(semantic-scope-cache::semantic-scope-set-typecache): New
+	(semantic-scope-find): Also search the typecache slot.
+	If we have a split name, also loop over the search to find
+	something in the typecache.
+
+	* semanticdb-typecache.el (semanticdb-typecache-find,semanticdb-typecache-find-default):
+	Add SCOPERETURN argument.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Implement SCOPERETURN support.
+
+	* semantic-adebug.el (semanticdb-debug-file-tag-check): New fcn.
+
+2008-06-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Add protection around EDE call.
+
+2008-06-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-fcn.el (semantic-analyze-tag-type):
+	Add nometaderef option.
+	(semantic-analyze-dereference-metatype):
+	Break out functional part into:
+	(semantic-analyze-dereference-metatype-1): So it could be debugged.
+
+	* semanticdb-find.el (semanticdb-find-scanned-include-tags):
+	New tracking variable.
+	(semanticdb-find-translate-path-includes--internal):
+	Track all include tags scanned.
+	(semanticdb-find-adebug-lost-includes): Optimize
+	(semanticdb-find-adebug-insert-scanned-tag-cons): New data-debug helper.
+	(semanticdb-find-adebug-scanned-includes): New command.
+
+	* semantic-adebug.el (data-debug-insert-tag-parts-from-point):
+	Add autoload cookie.
+
+	* semanticdb.el (semanticdb-file-table-object): Disable EDE asking.
+	Disable font-locking.
+
+	* semantic-analyze-debug.el (semantic-analyzer-debug-missing-innertype):
+	Expand metatypes
+	explicity to see what may be wrong.
+	(semantic-analyzer-debug-insert-tag): Put homeless tags in quotes.
+
+2008-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-before-toplevel-cache-flush-hook): Fix doc.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Put filenames
+	from whence included onto the found include tags.
+	(semanticdb-find-table-for-include-default): Remove one early
+	condition which was a duplicate.  Should now correctly
+	find sub-includes based on originating files.
+	(semanticdb-find-tags-collector): Updated doc.
+	Ask not to use find-file-match argument.
+
+	* semanticdb-search.el: (semanticdb-collect-find-results)
+	(semanticdb-find-nonterminal-by-token)
+	(semanticdb-find-nonterminal-by-name)
+	(semanticdb-find-nonterminal-by-name-regexp)
+	(semanticdb-find-nonterminal-by-type)
+	(semanticdb-find-nonterminal-by-property)
+	(semanticdb-find-nonterminal-by-extra-spec)
+	(semanticdb-find-nonterminal-by-extra-spec-value)
+	(semanticdb-find-nonterminal-external-children-of-type)
+	(semanticdb-find-nonterminal-by-function)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-token-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-name-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-name-regexp-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-type-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-property-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-extra-spec-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-extra-spec-value-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-external-children-of-type-method)
+	(semanticdb-project-database::semanticdb-find-nonterminal-by-function-method):
+	Add obsolete to doc-string.
+
+2008-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-work-parse-neighboring-files-flag):
+	New
+	(semantic-idle-work-core-handler): Use above to allow disabling this feature.
+
+	* semantic-lex-spp.el (semantic-lex-spp-table-write-slot-value):
+	Protect the print of macros with condition-case.
+
+2008-06-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-table): Add slot printer for lexical table.
+
+	* semantic-lex-spp.el (semantic-lex-spp-macro-max-length-to-save): New
+	(semantic-lex-spp-table-write-slot-value): New slot writer
+	(semantic-lex-spp-write-test): New test fcn.
+
+	* doc/user-guide.texi (Create System Databases):
+	Remove semanticdb-create-system-database
+
+	* doc/internals.texi (Semantic Internals): Add Tests item.
+	(Tests): List tests in semantic.
+
+	* doc/internals.texi (Semanticdb): Remove semanticdb-system.el
+
+	* doc/app-dev-guide.texi (Semantic Parsed System Databases): Deleted.
+
+	* Makefile (Database_LISP): Remove semanticdb-system.
+
+	* Project.ede ("semantic"): Remove semanticdb-system.
+
+	* semantic-load.el (semantic-load-enable-minimum-features):
+	Remove semanticdb-system refs.
+
+	* semanticdb-system.el: (semanticdb-default-system-save-directory)
+	(semanticdb-default-system-file-name)
+	(semanticdb-create-system-database)
+	(semanticdb-load-system-caches): Remove autoload
+
+	* semantic-cb.el (semantic-cb-project): add namespace
+	(semantic-cb-tag-abstract): New baseclass.
+	(semantic-cb-namespace): New.
+	(semantic-cb-tag): Inherit from abstract
+	(semantic-cb-new-class-browser): Tried to fix.
+	(semantic-cb-adebug): Remove autoload
+	(semantic-dot): Remove autoload
+	(semantic-cb-speedbar-mode): Remove autoload.
+
+	* senator.el, semantic-tag-ls.el, semantic-tag-file.el, semantic-sort.el, semantic-sb.el, semantic-lex.el, semantic-idle.el, semantic-grammar.el, semantic-format.el, semantic-find.el, semantic.el, semantic-doc.el, semantic-decorate-mode.el, semanticdb-typecache.el, semanticdb-find.el, semantic-ctxt.el, semantic-analyze-fcn.el, semantic-analyze.el, semantic-analyze-complete.el:
+	Convert define-overload to define-overloadable-function.
+
+2008-06-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-work-for-one-buffer):
+	Comment updates.
+	(semantic-idle-work-core-handler): Track current buffer.
+	Call below for current buffer.
+	(semantic-idle-scheduler-work-parse-neighboring-files): New
+	(semantic-idle-pnf-test): New
+
+	* semantic-elp.el (semantic-elp-emacs-core-list): Add file-attributes
+	(semantic-elp-semanticdb-core-list): Add needs-refresh-p,
+	directory-loaded-p, full-filename, and create-table-for-file.
+	(semantic-elp-object-base): New.
+	(semantic-elp-object): Renamed to below, and made this be just
+	a single timed entry.
+	(semantic-elp-object-analyze): Was semantic-elp-object.
+	(semantic-elp-analyze): Use new name above.
+	(semantic-elp-idle-work): New
+
+	* semanticdb-file.el (semanticdb-table::object-write):
+	Set the filesize and lastmodetime
+	when writing.
+	(semanticdb-table::semanticdb-full-filename):
+	Use expand-file-name instead of concat.
+
+	* semanticdb.el (semanticdb-table): Add fsize, and lastmodetime.
+	(semanticdb-table::semanticdb-needs-refresh-p): Use filesize, and
+	lastmodetime to gage if a table with no buffer is up to date or not.
+	(semanticdb-abstract-table::semanticdb-synchronize)
+	(semanticdb-kill-hook): Set a table's file size and lastmodtime.
+	(semanticdb-file-table-object): Reorganize as a cond statement.
+	Track a table being up to date outside of loading.
+
+2008-06-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-all-include-summary):
+	Also add include path description.
+
+2008-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Fix so if cursor points
+	directly at a fieldsep, it doesn't move.
+
+2008-06-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsubclass.cpp (otherFunction, *::testAccess):
+	New function/methods with new tests.
+
+	* tests/testsubclass.hh (quadruped, sneaky::antelope, sneaky::jackalope, sneaky::bugalope):
+	New
+
+	* bovine/semantic-c.el (c-mode::semantic-tag-protection): Arg rename.
+
+	* bovine/c.by (opt-class-parent): New
+	(class-parents): Use above instead of inline.
+	(opt-class-protection): Return "private" when empty.
+
+	* semantic-scope.el (semantic-analyze-scope-lineage-tags-default):
+	Get the lineage
+	protection from the `superclass-protection' fcn.
+	(semantic-analyze-scope-calculate-access-default):
+	More complex protection calculation from lineage.
+	(semantic-analyze-scoped-type-parts): Added `protection' argument.
+	Pass access down to inherited tag finder.
+	(semantic-analyze-scoped-inherited-tags): Do not allow access to any
+	parental tags unless access is more than public or the inheritance is public.
+
+	* semantic-tag.el (semantic-tag-type-superclasses):
+	Account for tags in the parents
+	list.
+	(semantic-tag-type-superclass-protection): New function.
+	(semantic-tag-include-filename, semantic-tag-alias-definition)
+	(semantic-tag-components, semantic-tag-components-with-overlays)
+	(semantic--tag-expand, semantic-obtain-foreign-tag)
+	(semantic-insert-foreign-tag): Use `define-overloadable-function'
+	instead of `define-overload'.
+
+	* semantic-ia-utest.el (semantic-ia-utest-buffer):
+	Provide better error reporting if bad lisp
+	in comments for desired result.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Pass missing scope into
+	`semantic-analyze-scoped-type-parts'.
+
+2008-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c-mode::semantic-idle-summary-current-symbol-info):
+	Support SPP Macro display via idle summary.
+
+2008-05-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-find-tag):
+	Use `semantic-analyze-select-best-tag'
+	to convert lists of tags from searches into a single tag.
+
+	* semantic-analyze-fcn.el (semantic-analyze-find-tag):
+	Be robust to sending in a single tag.
+
+2008-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-dependency-tag-file):
+	Support the case when
+	the library is not on the load path.
+
+2008-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.c (fun1p1): New
+	(funk3): Add printf and math tests.
+
+	* tests/Makefile (Tests_MISC): Add testtypedefs.cpp
+
+	* tests/Project.ede (Tests): Add testtypedefs.cpp
+
+	* tests/test.cpp (stdio.h): Move include
+	(class3::method1_for_class3)
+	(class3::method4_for_class3):  Add some options for fiddling with completions.
+	(NS): New namespace parsing tests.
+	(Action): Comment.
+
+	* tests/testsubclass.cpp (pub_priv):
+	New namespace from Ming-Wei for testing access
+	features in the completion engine.
+
+	* bovine/semantic-el.el:
+	Add `define-overloadable-function' to the function parser.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Init a log buffer, and show it at the end.
+	(semantic-ia-utest-buffer): Output all messages into the log.
+	(semantic-ia-utest-start-log, semantic-ia-utest-log): New
+
+	* semantic-idle.el (semantic-idle-work-for-one-buffer):
+	Be careful before calling semanticdb-find-translate-path.
+
+	* semantic-ia.el (semantic-ia-describe-class):
+	Use renamed semantic-analyze-scoped-type-parts.
+
+	* semantic-elp.el (semantic-elp-scope-list, semantic-elp-analyze-list):
+	Use renamed semantic-analyze-scoped-type-parts.
+
+	* semantic-decorate-include.el (semanticdb, semanticdb-ref, semanticdb-find):
+	New requires.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-parts,semantic-analyze-inherited-tags):
+	Moved to semantic-scope.el.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Use renamed semantic-analyze-scoped-type-parts.
+	(semantic-analyze-find-tag): Handle a pre-split tag.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Use renamed semantic-analyze-scoped-type-parts.
+
+	* semantic-scope.el (semantic-scope-cache): Add parentinheritance
+	(semantic-scope-cache::semantic-reset): Reset above new slot.
+	(semantic-analyze-scoped-types)
+	(semantic-analyze-scope-nested-tags):
+	Use new overloadable macro.
+	(semantic-analyze-scope-nested-tags-default):
+	Make a miniscope to use in additional searches.
+	Redo Step1 to handle lists via typecache.
+	Rewrite step 2 to use the miniscope for searches,
+	and handle names with more than 1 type in the chain.
+	(semantic-analyze-scope-lineage-tags)
+	(semantic-analyze-scope-lineage-tags-default): New overload.
+	(semantic-analyze-scoped-tags): Use overloadable macro.
+	(semantic-analyze-scoped-tags-default):
+	Add a miniscope for searches.
+	(semantic-analyze-scope-calculate-access)
+	(semantic-analyze-scope-calculate-access-default): New overloadable
+	(semantic-analyze-scope-type-parts)
+	(semantic-analyze-scoped-inherited-tags): New fcns coped
+	from semantic-analyze-fcn, and made specific to this scope.
+	(semantic-analyze-scoped-inherited-tag-map): New routine
+	for mapping a fcn across inherited tags from a single type.
+	(semantic-calculate-scope): Force  scope reset when interactive.
+
+	* semanticdb-typecache.el (semanticdb-find): New require.
+	(semanticdb-typecache-merge-streams): fix typo
+	(semanticdb-typecache-find-by-name-helper): New.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Use above new fcn for searches.
+	Re-organize code searching a name list to be simpler and more obvious.
+
+	* semantic-adebug.el (data-debug-insert-tag-list):
+	Support more error conditions in a tag list.
+	(data-debug-insert-tag-list-button): Use safe-length.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp):
+	Subclass from the abstract table,
+	not the old search table.
+
+	* semanticdb-find.el:
+	(semanticdb-abstract-table::semanticdb-find-tags-by-name-method)
+	(semanticdb-abstract-table::semanticdb-find-tags-by-name-regexp-method)
+	(semanticdb-abstract-table::semanticdb-find-tags-for-completion-method)
+	(semanticdb-abstract-table::semanticdb-find-tags-by-class-method)
+	(semanticdb-abstract-table::semanticdb-find-external-children-of-type-method):
+	Bind to abstract table.
+	(semanticdb-abstract-table::semanticdb-deep-find-tags-by-name-method)
+	(semanticdb-abstract-table::semanticdb-deep-find-tags-by-name-regexp-method)
+	(semanticdb-abstract-table::semanticdb-deep-find-tags-for-completion-method):
+	Bind to abstract table.
+
+	* semantic-complete.el (semantic-complete-read-tag-engine):
+	Add todo comment
+	(semantic-complete-inline-tag-project): New startup function
+	(semantic-complete-inline-project): New complete prompt
+
+2008-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add testtypedefs.cpp
+
+	* tests/testsubclass.hh (cmath): Remove includes.
+
+	* tests/testsubclass.cpp (iostream): Remove include
+
+	* tests/testtypedefs.cpp:
+	New unit test examples using typedef resolution.
+
+	* semantic-analyze-fcn.el (semantic-analyze-dereference-metatype-stack):
+	Doc string fix.
+	(semantic-analyze-dereference-metatype): Scope find returns a list,
+	but typecache find does not.  Be sure to return the `car' of the scope
+	found list.
+
+2008-05-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (typeformbase): handle template specifiers.
+
+2008-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ref.el (semanticdb-add-reference): Add autoload cookie.
+
+2008-05-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el: (semantic-lex-c-preprocessor-symbol-map)
+	(semantic-lex-c-preprocessor-symbol-file): Add autoload cookies back in.
+
+	* bovine/c.by (OPSTART): Deleted.
+	(expr-start): New
+	(expression): Support basic casting.
+
+2008-05-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el: (semantic-lex-c-preprocessor-symbol-map)
+	(semantic-lex-c-preprocessor-symbol-file): Remove autoload cookie.
+	(c-mode::semantic-find-tags-by-scope-protection): Fix doc string.
+
+	* semantic-load.el ("speedbar"):
+	Remove require of semantic-cb on speedbar load.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Remove second
+	oref of scope.
+
+	* semantic-analyze-fcn.el (semantic-analyze-inherited-tags):
+	Remove conversion of scope from
+	object to list.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-parts):
+	Accept a noinherit optional argument.
+	Don't do inherited tag queries when used.
+	(semantic-analyze-inherited-tags): Pass in noinherit t when getting
+	type parts.  Recurse on our own.
+
+	* bovine/c.by (expression): Support "new symbol" as an expression.
+
+2008-05-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (top):
+	Add link to semantic manual for configuration addvice.
+	Re-arrage some of the menu.
+	(Smart Completion Debugging): Moved.
+	(Idle Scheduler): Discuss new work idle timer, and verbose flag.
+	Added summaries to menu items.
+	(Idle Summary Mode): re-write first paragraph.
+	Add discussion of out-of-context-faces.
+	(Idle Completions Mode): Discuss where completion code is.
+	Discuss options from that code.
+	(Semanticdb System Backends)
+	(Changing Backends):  Suggest these vars are auto-setup.
+	(Script Generated Cache Files):
+	(Debugging): Add code in from cedet debugging manual.
+	Move stuff around.
+
+	* doc/overview.texi (Semantic Components): fix grammar.
+
+	* doc/minor-modes.texi (Tag Decoration Mode):
+	Add many new decoration modes.
+
+	* doc/installation.texi (Installation):
+	Discuss the CEDET install manual.
+	(Search Optimization): Fix based on new defaults.
+	Discuss ebrowse issues.
+	(Parsing Optimization): Discuss new idle work timer.
+
+	* doc/app-dev-guide.texi (top):
+	Rename App Debugger node to Data Debugger
+	(Override Methods): Describe mode-local.el.
+	Fix description with more examples.
+	(Making New Methods): Specify new method names
+	Fix doc string.  Add mode-local variable descriptions.
+	(DB Results): Add find-result-mapc
+	(Example Programs): Delete section.
+	(Analysis Overview): Add scope object, and typecache.
+	(Data Debugger): Renamed from App Debugger
+	Rewrite some sections.
+	Discuss edebug keybinding.
+
+	* semantic.el (semantic-inhibit-functions): Fix doc string.
+
+	* doc/internals.texi (Semantic Internals): Now with a menu.
+	(Parser code, Tag handling, Semanticdb, Analyzer, Tools):
+	New sections.
+
+	* semantic-idle.el (semantic-idle-work-for-one-buffer):
+	Do not work with the typecache
+	if the feature hasn't been activated.
+	(semantic-idle-work-core-handler): Save all the databases.
+	(semantic-idle-scheduler-work-function):
+	Wrap message display in verbose flag check.
+
+	* semanticdb-typecache.el (semanticdb-typecache-refresh-for-buffer):
+	Add autoload cookie.
+
+2008-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-save-db):
+	Add supress-questions argument.
+	Shorten the file-error class of signal from the save.
+	Ask question only if supress-questions is not specified.
+
+	* semanticdb.el (semanticdb-project-database::semanticdb-save-db):
+	Add optional
+	supress-questions argument.
+	(semanticdb-save-all-db-idle):
+	Capture issues with semantic-safe.
+	Pass in supress-questions of t to semanticdb-save-db.
+
+	* tests/testsppreplace.c (tail_fcn): Support a bogus macro usage.
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map-builtin):
+	Moved.
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Remove debug message.
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords): add
+	`defcustom-mode-local-semantic-dependency-system-include-path'.
+	(edebug-setup-hook): Fix semantic-exit-on-input.
+
+	* semanticdb-typecache.el (semanticdb-database-typecache):
+	New cache for a database.
+	(semanticdb-database-typecache::semantic-reset)
+	(semanticdb-database-typecache::semanticdb-synchronize)
+	(semanticdb-database-typecache::semanticdb-partial-synchronize):
+	New methods.
+	(semanticdb-project-database::semanticdb-get-typecache)
+	(semanticdb-project-database::semanticdb-typecache-for-database):
+	New methods.
+	(semanticdb-typecache-refresh-for-buffer):
+	New function.
+	(semanticdb-typecache-dump):Use above.
+	(semanticdb-db-typecache-dump): New fcn.
+
+	* semanticdb-find.el (semanticdb-find-translate-path):
+	Add doc about overloading.
+	(semanticdb-find-translate-path-brutish-default): Add throw-on-input.
+	(semanticdb-find-translate-path-includes--internal):
+	Add case for when path is a buffer.
+
+	* semanticdb.el (semanticdb-project-database):
+	Add a cache, it won't save.
+	(semanticdb-abstract-cache)
+	(semanticdb-abstract-table::semanticdb-cache-get)
+	(semanticdb-abstract-table::semanticdb-cache-remove)
+	(semanticdb-abstract-cache::semanticdb-synchronize)
+	(semanticdb-abstract-cache::semanticdb-partial-synchronize):
+	Moved
+	(semanticdb-abstract-db-cache)
+	(semanticdb-project-database::semanticdb-cache-get)
+	(semanticdb-project-database::semanticdb-cache-remove)
+	(semanticdb-abstract-db-cache::semanticdb-synchronize)
+	(semanticdb-abstract-db-cache::semanticdb-partial-synchronize):
+	New abstract cache attached to a database.
+
+	* semantic-idle.el (semantic-idle-scheduler-work-timer):
+	New timer variable.
+	(semantic-idle-scheduler-work-idle-time): New timer time.
+	(semantic-idle-scheduler-setup-timer): Renamed to
+	(semantic-idle-scheduler-setup-timers): Also setup new work timer.
+	(semantic-idle-scheduler-mode-setup): Use new name above.
+	(semantic-idle-work-for-one-buffer)
+	(semantic-idle-work-core-handler)
+	(semantic-debug-idle-work-function)
+	(semantic-idle-scheduler-work-function): New work timer code.
+
+2008-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-core-handler):
+	Wrap core bits in `semantic-safe' and
+	describe each.
+	(semantic-debug-idle-function): New command
+	(semantic-idle-scheduler-function): Remove error handling from here.
+
+2008-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (tools_LISP):  Remove semantic-cb.el
+
+	* Project.ede ("tools"): Remove semantic-cb.el
+
+	* senator.el (senator-menu-bar): Remove class browser references.
+
+	* doc/user-guide.texi (top, speedbar, Document):
+	Remove refs to the class browser.
+
+2008-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Project.ede ("semantic/wisent"): Update name.
+
+	* tests/Project.ede ("semantic/tests"): updated name.
+
+	* doc/Project.ede ("semantic/doc"): Updated name.
+
+	* bovine/Project.ede ("semantic/bovine"): Updated name.
+
+	* semanticdb-find.el (semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Fix typeo: typecache -> type-cache slot name.
+	(semanticdb-find-result-mapc): New function.
+
+2008-05-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest-c.el (semantic-utest-c):
+	Use `semantic-tag-similar-with-subtags-p'.
+
+	* semantic-tag.el (semantic-tag-similar-with-subtags-p): New function.
+	(semantic--tag-unlink-cache-from-buffer): todo question
+
+	* semantic-edit.el: Commentary: Add todo comment.
+
+	* tests/testsppreplaced.c (continuation_symbol, tail):
+	New test functions.
+
+	* tests/testsppreplace.c (WITH_CONT): New macro/fcn.
+	(tail_with_args_and_long_name, int_arg): New macros
+	(tail): New test function.
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	If a macro stream has a replace-replace token
+	then this macro becomes equivalent to the referenced macro.
+
+	* semantic-lex-spp.el (semantic-lex-spp-replacements-enabled):
+	New control value.
+	(semantix-lex-spp-analyzer-push-tokens-for-symbol): New fcn.
+	(semantic-lex-spp-replace-or-symbol-or-keyword): Extract body into above.
+	(semantic-lex-spp-stream-for-macro): Allow spp-replace-replace macros
+	to be translated to the output stream.
+
+2008-05-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-save-db):
+	Remove status messages to make more quiet.
+
+2008-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsppreplace.c (NOT_WITH_ARGS): New macro
+	(not_with_args_fcn): New
+
+	* tests/testsppreplaced.c (not_with_args_fcn): New
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	Only do macro w/ args if the paren
+	is right after the macro name.
+
+2008-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-system.el (semanticdb-project-database-system::semanticdb-create-database):
+	Save
+	the object, and return it.
+	(semanticdb-project-database-system::semanticdb-load-system-database):
+	Protect against unbound tags slot.
+
+2008-04-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el: (semantic-displayor-point-position)
+	(semantic-complete-inline-analyzer): Update from Dan Kruchinin
+	fixing the tooltip flickering problem, but adding a positioning issue.
+	(semantic-complete-inline-analyzer): Add better error message.
+
+	* bovine/semantic-c.el (c-mode::semantic-type-relation-separator-character):
+	Add ::
+
+	* semantic-ctxt.el (semantic-ctxt-current-class-list-default):
+	Add 'type as an option
+	if there is no local tag, and also to the body of functions.
+
+2008-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-obey-conditional-section-parsing-flag):
+	New option.
+	(semantic-c-skip-conditional-section): Obey above option.
+
+2008-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsppreplaced.c (MUTLI_ARGS): New macro test.
+
+	* tests/testsppreplace.c (MUTLI_ARGS, NO_BODY): New macro tests.
+
+	* semantic-lex-spp.el (semantic-lex-spp-stream-for-arglist):
+	Allow syms and semantic-lists.
+
+	* bovine/semantic-c.el (semantic-c-parse-lexical-token):
+	Extract active macro table from
+	semantic token.  If available, apply to spp macro stream.
+
+	* semantic-lex-spp.el (semantic-lex-spp-macro-with-args):
+	Robust to val being a token, not a
+	token list.
+	(semantic-lex-spp-macro-to-macro-stream): Handle null val.
+	Better question about what input val is.
+	Store arglist alist onto semantic-list text part.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-macro-to-macro-stream):
+	TODO comment
+	(semantic-lex-spp-anlyzer-do-replace): New fcn.
+	(semantic-lex-spp-replace-or-symbol-or-keyword): Use above new fcn.
+	(semantic-lex-spp-stream-for-arglist): Throw out non-symbols.
+
+	* bovine/semantic-c.el (semantic-c-reset-preprocessor-symbol-map):
+	Moved.
+
+	* wisent/Makefile, tests/Makefile (VERSION): Update to 2.0pre5
+
+	* doc/user-guide.texi: (Semanticdb Search Configuration)
+	(Include paths): Discuss semantic-customize-system-include-path
+
+	* doc/Makefile, bovine/Makefile, Makefile (VERSION): Update to 2.0pre5
+
+	* Project.ede ("semantic"): Update to version 2.0pre5
+
+	* semantic.el (semantic-version): Update to 2.0pre5
+
+	* bovine/semantic-c.el: (semantic-lex-c-preprocessor-symbol-map)
+	(semantic-lex-c-preprocessor-symbol-file): autoload cookies
+
+2008-04-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map):
+	Fix doc string.
+	Update :set attribute.
+	(semantic-lex-c-preprocessor-symbol-file): New variable.
+	(semantic-c-reset-preprocessor-symbol-map): New function
+	(semantic-c-add-preprocessor-symbol): Use above.
+	(semantic-default-c-setup): Remove setting lex symbol map.
+
+2008-04-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsppreplaced.c: Prototypes for updated testspprelace.c
+
+	* tests/testsppreplace.c: Test INT_FCN (if'd out before).
+	Test P_ and P__ macros found in emacs' lisp.h
+
+	* bovine/semantic-c.el (semantic-lex-cpp-define):
+	Support finding an arg list.
+	(semantic-c-lex-ignore-newline): New lex analyzer
+	(semantic-c-lexer): Use above.
+	(semantic-c-parse-lexical-token):
+	Hack in mode-local bindings to temp buffer.
+
+	* semantic-lex-spp.el (semantic-lex-spp-macro-with-args): New function
+	(semantic-lex-spp-macro-to-macro-stream): Handle macro streams that
+	include an argument list.  Accept that arglist as input.
+	(semantic-lex-spp-replace-or-symbol-or-keyword): Parse arglist if
+	there is one for matched macros with arg lists.
+	(semantic-lex-spp-first-token-arg-list): New fcn.
+	(semantic-lex-spp-stream-for-arglist): New fcn.
+
+	* semantic-lex.el (semantic-lex-test, semantic-lex-test-region):
+	Dump the result.
+	(semantic-lex-token-bounds): Instead of testing for string, test for
+	not a number.
+	(semantic-lex-ignore-newline): Fix doc.
+
+	* semanticdb.el (semanticdb-revert-hook): New
+	(semanticdb-kill-hook): If too much work needs to be done, don't do
+	it, and clear the cache instead and mark point-max is 0.
+	(semanticdb-hooks): Add before-revert-hook.
+
+	* semantic-decorate-include.el (semantic-decoration-unparsed-include-do-reset):
+	In this hook, pass in the tag table so we don't do a full reparse.
+
+	* bovine/semantic-c.el (semantic-lex-c-include-system-old): Deleted.
+
+2008-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-dep.el (defcustom-mode-local-semantic-dependency-system-include-path):
+	In
+	:set for custom, do not call the decoration routine if it is not bound.
+
+2008-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-unparsed-include-do-reset):
+	autoload cookie.
+
+2008-04-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-menu-bar): Add inline smart completion,
+	and the analyzer debug assitant
+
+	* semantic-analyze-debug.el (semantic-analyze-debug-assist):
+	Don't call debug-found-prefix w/out a ctxt.
+	(semantic-analyzer-debug-test-local-context): Don't ask question
+	anymore.  Return t.
+
+2008-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Analyzer_LISP): Add semantic-analyze-debug.el
+
+	* Project.ede ("Analyzer"): Add semantic-analyze-debug.el
+
+	* semantic-analyze-debug.el: Debug helper for semantic analyzer.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Fixed indentation issue.
+
+	* semantic-decorate-include.el: (semantic-decoration-on-include-menu)
+	(semantic-decoration-on-unknown-include-menu)
+	(semantic-decoration-on-unparsed-include-menu):
+	Use semantic-customize-system-include-path instead of deleted fcn.
+	(semantic-decoration-customize-include-path): Deleted
+	(semantic-decoration-all-include-summary): List lost includes too.
+
+	* semantic-dep.el (semantic-customize-system-include-path):
+	New command.
+
+2008-04-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c-mode::semantic-parse-region):
+	Call to below for macroexpand.
+	(semantic-c-parse-lexical-token): New fcn.
+
+2008-04-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el:
+	(semantic-complete-inline-analyzer-displayor-class)
+	(semantic-complete-inline-analyzer-idle-displayor-class): Remove
+	autoload cookies.
+
+2008-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-save-all-db-idle): Don't babble about save.
+
+	* wisent/wisent-python.el (semantic-python-dependency-system-include-path):
+	Fix doc string.
+
+	* wisent/wisent-python.el (semantic-python-dependency-system-include-path):
+	New
+
+	* semantic-decorate-include.el: (semantic-decoration-on-include-menu)
+	(semantic-decoration-on-unknown-include-menu)
+	(semantic-decoration-on-unparsed-include-menu):
+	Add customize system include path.
+	(semantic-decoration-customize-include-path): New
+
+	* doc/app-dev-guide.texi (Searching Tag Tables):
+	Refer to database search for some cases.
+	(DB Search Paths): Add new macro for mode include system path.
+	(App Debugger): Fix to refer to data-debug
+
+	* bovine/semantic-skel.el (top comment): Refer to wisent.
+	(semantic-makefile-dependency-system-include-path): New.
+
+	* bovine/semantic-scm.el (semantic-default-scheme-path): Convert to use
+	defcustom-mode-local-semantic-dependency-system-include-path
+
+	* bovine/semantic-make.el (semantic-makefile-dependency-system-include-path):
+	New
+
+	* bovine/semantic-java.el (semantic-java-dependency-system-include-path):
+	New.
+
+	* bovine/semantic-erlang.el (semantic-erlang-dependency-system-include-path):
+	New
+
+	* bovine/semantic-c.el (semantic-c-dependency-system-include-path):
+	Convert to use
+	defcustom-mode-local-semantic-dependency-system-include-path
+
+	* semantic-mru-bookmark.el (semantic-bookmark-ring::semantic-mrub-push):
+	Fix variable issue.
+
+	* semantic-elp.el (data-debug): Add data-debug require.
+
+	* semantic-dep.el (semantic-dependency-system-include-path): Doc update
+	(defcustom-mode-local-semantic-dependency-system-include-path):
+	New macro.
+
+2008-03-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-write.el (semantic-tag-write-tag-list):
+	Make sure we always have tags in a
+	suspected tag list.
+
+2008-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-inline-custom-type):
+	Remove autoload cookie.
+
+	* semantic-idle.el (semantic-idle-completion-list-default):
+	Use new idle inline
+	complete function.
+
+	* semantic-complete.el (semantic-complete-inline-done):
+	Better key lookup.
+	(semantic-displayor-abstract)
+	(semantic-displayor-traditional)
+	(semantic-displayor-focus-abstract)
+	(semantic-displayor-traditional-with-focus-highlight)
+	(semantic-displayor-tooltip)
+	(semantic-displayor-ghost): New doc strings.
+	(semantic-complete-inline-custom-type): New
+	(semantic-complete-inline-analyzer-displayor-class):
+	Default is 'traditional'.  New custom type.
+	(semantic-complete-inline-analyzer): Doc update.
+	(semantic-complete-inline-analyzer-idle-displayor-class): New option.
+	(semantic-complete-inline-analyzer-idle): New function.
+
+	* semantic-decorate-include.el (semantic-decoration-unparsed-include-do-reset):
+	Only run the reset
+	if our decoration mode is currently on.
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map):
+	Add a custom :set method
+	to apply changes to the preprocessor map.
+	(semantic-c-dependency-system-include-path): Add a custom :set method
+	to apply changes to the mode-local include path.
+	Also, redecorate includes that may have changed.
+	(semantic-c-add-preprocessor-symbol): Rebuild table with both
+	preprocessor maps.
+
+2008-03-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-include.el (semantic-decoration-unparsed-include-refrence-reset):
+	Use
+	semanticdb-in-buffer-p to not load in files.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-in-buffer-p):
+	New
+
+	* semantic-tag-write.el (semantic-tag-write-one-value):
+	Fix spelling error.
+
+	* semantic-idle.el (semantic-idle-scheduler-refresh-tags):
+	Make sure we still return the
+	lexically safe state.
+
+	* semanticdb-file.el (object-write):
+	Do not unlink tags from the buffer before safe.
+	New printer does not require the unlink to occur.
+
+	* semanticdb.el (semanticdb-abstract-table): Add printer for tags
+	(semanticdb-save-all-db-idle): New fcn
+	(semanticdb-hooks): Add idle safe to auto-save-hook.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions):
+	Don't refresh tags.
+	Done by context.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Force tags to be up to date but
+	lexically safe doing so.  Replace interactive-only non-lexically safe
+	version.
+
+2008-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (semantic_LISP): Add semantic-tag-write.el
+
+	* Project.ede ("semantic"): Add semantic-tag-write.el
+
+	* semantic-tag-write.el: Write tags to standard output.
+
+2008-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-adebug-eieio.el: Moved to eieio module.
+
+	* tests/testsppreplace.c: Add bad macro test.  Used to hang the parser.
+
+	* Makefile (tools_LISP): Remove semantic-adebug-eieio.el
+
+	* Project.ede ("tools"): Remove semantic-adebug-eieio.
+
+	* semantic-tag.el (semantic-tag-p): Add autoload cookie.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	Use new data-debug instead of semantic-adebug.
+
+	* semantic-mru-bookmark.el (semantic-adebug-mrub):
+	Use new data-debug instead of semantic-debug.
+
+	* semantic-load.el (semantic-load-enable-gaudy-code-helpers):
+	idle code completion no
+	longer depends on tooltips.
+
+	* semantic-elp.el: (semantic-elp-goto-function)
+	(semantic-elp-data::semantic-elp-dump-table)
+	(semantic-elp-data::data-debug/eieio-insert-fields)
+	(semantic-elp-change-sort-adebug)
+	(semantic-elp-analyze):
+	(semantic-elp-show-last-run):
+	(semantic-elp-load-old-run):
+	Use new data-debug APIs instead of semantic-adebug.
+
+	* semanticdb-typecache.el (semanticdb-typecache-dump):
+	Use new data-debug instead of semantic-debug.
+
+	* semanticdb-ref.el (semanticdb-ref-test):
+	Use new data-debug instead of semantic-debug.
+
+	* semanticdb-find.el: (semanticdb-find-test-translate-path)
+	(semanticdb-find-test-translate-path-no-loading)
+	(semanticdb-find-adebug-lost-includes):
+	Use new data-debug instead of semantic-debug.
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-dump):
+	Use new data-debug instead of semantic-debug.
+
+	* semanticdb-debug.el:
+	(semanticdb-dump-all-table-summary,semanticdb-adebug-current-database)
+	(semanticdb-adebug-current-table, semanticdb-adebug-project-database-list):
+	Use new data-debug instead of semantic-debug.
+
+	* semantic-cb.el (semantic-adebug): Delete old require
+	(data-debug): new require.
+	(semantic-cb-adebug): Use new data-debug instead of semantic-debug.
+
+	* semantic-adebug.el: Delete All non-semantic data-debug support.
+	Convert names from semantic-adebug to data-debug.
+	Keep old interactive functions, fix to use data-debug intead.
+
+	* semantic-adebug.el (semantic-adebug-insert-string, semantic-adebug-insert-symbol):
+	New
+	(semantic-adebug-insert-custom): New
+	(semantic-adebug-thing-alist): New var for customizing insert-thing.
+	(semantic-adebug-insert-thing): Use above alist.
+
+2008-03-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c-mode::semantic-parse-region):
+	Fix so it doesn't use lse unless it
+	really is a nested parse.
+
+	* bovine/semantic-c.el (semantic-parse-region):
+	New overload.  Detect macro expansion, and
+	short circuit problems that would cause recursion.
+
+2008-03-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el (semantic-html-new-section-tag):
+	Anchors are not sections.
+	(semantic-html-recursive-combobulate-list): Last section goes to end
+	of buffer.
+
+	* tests/testdoublens.cpp (Name2::get): Semi colons.
+	(A::foo, A::bar, A::bar::xx): New.
+
+	* semantic-ia-utest.el (semantic-ia-utest-buffer):
+	Put protection around completion gen.
+
+	* semantic-ia.el (semantic-ia-complete-symbol):
+	Comment out message stmnt
+	(semantic-ia-describe-class): Fix doc.
+
+	* Makefile: Resorted modules, regenerated from project.ede 1.74.
+
+	* Project.ede ("semantic"): Resort modules.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Do typecache search on full stack at the same time, or switch
+	to old style.
+
+2008-03-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	If nested tag is a namespace, then get the typecache of that
+	namespace instead of using the immediate tag only.
+
+	* semantic-decorate-include.el (semantic-decoration-all-include-summary):
+	Fix calculation of
+	known/unknown includes.
+	Fix display of all headers table.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Don't cache 'none on includes.
+
+	* semantic-load.el (semantic-load-enable-gaudy-code-helpers):
+	Require the include decorations.
+
+	* semantic-decorate-mode.el (semantic-decorate-include):
+	Don't require anymore.
+
+	* semantic-decorate-include.el (semantic-decorate-mode):
+	New requirement.
+
+	* semanticdb-typecache.el (semanticdb-typecache, semanticdb-typecache-merge-streams):
+	Update @todo's
+
+	* semanticdb-file.el (semantic): New requirement.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-parts): Add a comment
+
+	* semantic-analyze.el (semantic): New requirement.
+
+	* tests/testsppreplaced.c: Match to testsppreplace.c
+
+	* semantic-adebug.el (semantic-adebug-new-buffer):
+	Use pop-to-buffer instead of
+	switch-to-buffer.
+
+2008-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-test-translate-path-no-loading):
+	New debug command.
+
+	* semantic-decorate-include.el: (semantic-decoration-on-include-menu)
+	(semantic-decoration-on-unknown-include-menu)
+	(semantic-decoration-on-unparsed-include-menu): Add new entries
+	for file summary, include summary, and other lists.
+	(semantic-decoration-include-describe): Add more summary information.
+	(semantic-decoration-all-include-summary): New.
+
+	* semantic-decorate-mode.el: All functions and variables between:
+	(semantic-decoration-on-includes)
+	(semantic-decoration-unparsed-include-parse-all-includes):
+	Moved to semantic-decorate-include.
+	(semantic-decorate-include): New require.
+
+	* semantic-decorate-include.el: Decoration modes for includes.
+
+2008-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (tests_LISP): Added semantic-utest-c.el
+
+	* Project.ede ("semantic":"tests"): Add semantic-utest-c.el
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map):
+	Doc update.
+
+	* semantic-lex-spp.el (semantic-lex-spp-project-macro-symbol-obarray):
+	New
+	(semantic-lex-spp-symbol): Search the project table as well.
+	(semantic-lex-spp-macros): Provide project macros.
+
+	* semantic-dep.el (semantic-dependency-find-file-on-path):
+	If EDE is enabled, get any
+	system path it may provide, and search that too.
+
+	* semanticdb.el (require semantic-lex-spp): New
+	(semanticdb-abstract-table): Remove dirty and db-refs.
+	(semanticdb-table): Add dirty, db-refs from above, and lexical-table
+	(semantic-table::object-print): Doc fix.
+	(semantic-abstract-table::semanticdb-dirty-p): Return nil
+	(semantic-table::semanticdb-dirty-p): Old impl from above.
+	(semanticdb-semantic-init-hook-fcn): Restore any lexical table.
+	Add detailed comments about restoration order.
+	(semanticdb-synchronize): Save off the unmatched syntax and
+	lexical table.
+	(semanticdb-partial-synchronize): Save off unmatched syntax.
+
+	* semantic-lex-spp.el (semantic-lex-spp-save-table, semantic-lex-spp-set-dynamic-table):
+	New
+
+2008-03-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsubclass.hh (stdio.h):
+	Stop including - it messes up teh test.
+
+	* tests/Makefile (Tests_MISC):
+	Add testspp.c testsppreplace.c testsppreplaced.c
+
+	* tests/Project.ede ("Tests"):
+	Add : "testspp.c" "testsppreplace.c" "testsppreplaced.c"
+
+	* semantic-utest-c.el: C unit tests.
+
+	* tests/testspp.c (EMU, parse_around_emu, SUBFLOAT, returnanfloat):
+	Deleted.
+	Moved elsewhere.
+
+	* tests/testsppreplace.c: Macro replacement for C/SPP.
+
+	* bovine/semantic-c.el (semantic-c-lex-one-token-and-move,semantic-c-lex-stream-for-macro):
+	Deleted.  Moved into semantic-lex-spp.el.
+	(semantic-lex-cpp-define): Use spp version of a bove.
+
+	* semantic-lex-spp.el (semantic-lex-spp-string-to-macro-stream):
+	Renamed to
+	(semantic-lex-spp-macro-to-macro-stream): New name.
+	(semantic-lex-spp-replace-or-symbol-or-keyword): Use above rename.
+	(semantic-lex-spp-one-token-and-move-for-macro, semantic-lex-spp-stream-for-macro):
+	New, moved from semantic-c.el.
+	(define-lex-spp-macro-declaration-analyzer): Refer to above new fcn
+	for use with this macro.
+
+	* bovine/semantic-c.el (semantic-c-lex-one-token-and-move, semantic-c-lex-stream-for-macro):
+	New
+	(semantic-lex-cpp-define): Use above.  Create SPP macros with token
+	streams.
+
+	* bovine/c.by (DELETE): New token, not used except for help.
+
+	* semantic-lex-spp.el (semantic-lex-spp-symbol-set):
+	More error checking.
+	(semantic-lex-spp-extract-regex-and-compare): New
+	(semantic-lex-spp-string-to-macro-stream): Add conversion
+	for a lexical token, a lexical token stream, or arbitrary strings
+	which are converted to the correct type of token.
+
+2008-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-fcn.el (semantic-analyze-tag-type): Call below
+	(semantic-analyze-dereference-metatype-stack): New.
+	Calls semantic-analyze-dereference-metatype repeatedly until nothing
+	new shows up.
+
+	* doc/user-guide.texi (Smart Completion Debugging):
+	Add notes as to why a type may not have
+	been parsed.
+
+	* semantic-dep.el: (semantic-add-system-include)
+	(semantic-remove-system-include): Doc and prompt updates.
+
+	* senator.el ("Idle Scheduler"): Add verbose flag customization
+	("Idle Summaries"): Add summary function customization
+	("Idle Completion"): Add displayor class customization.
+	(senator-menu-bar): Fix jump anywhere option.
+
+	* semantic-decorate-mode.el: (semantic-decoration-on-includes)
+	(semantic-decoration-on-include-map)
+	(semantic-decoration-on-include-menu)
+	(semantic-decoration-on-includes)
+	(semantic-decoration-on-includes-p-default)
+	(semantic-decoration-on-includes-highlight-default)
+	(semantic-decoration-include-describe)
+	(semantic-decoration-include-visit)
+	(semantic-decoration-include-menu): New decoration mode functions.
+	Replaces the unknown and unparsed decoration modes with only a single
+	mode.
+	(semantic-decoration-on-unknown-include-map): Context menu only.
+	(semantic-decoration-on-unparsed-include-map): Context menu only.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Stop caching the found location
+	of header files.
+
+2008-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el (semantic-decorate-add-decorations):
+	Disable message.
+	(semantic-decorate-pending-decoration-hooks)
+	(semantic-decorate-add-pending-decoration)
+	(semantic-decorate-flush-pending-decorations): New
+	(semantic-decoration-unparsed-include-refrence-reset): Use pending
+	decoration system.
+	(semantic-decoration-unparsed-include-do-reset): New pending deco fcn.
+
+	* semantic-idle.el (semantic-idle-scheduler-refresh-tags):
+	Call pending decoration commands.
+
+2008-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-file-table-object):
+	Save a temporarilly loaded file in a variable to be killed later.
+	Disable semantic-init-hooks so all major modes are disabled during
+	this quick parse.
+
+	* semantic-decorate-mode.el (semantic-build-decoration-mode-menu):
+	Reverse the styles menu.
+	(semantic-decoration-on-unknown-includes): Change light background color
+	(semantic-decoration-unknown-include-describe)
+	(semantic-decoration-unparsed-include-describe): Don't require event.
+	Add some more info.
+	(semantic-decoration-unparsed-include-refrence-reset):
+	Use `semanticdb-get-buffer' instead of `get-file-buffer'.
+
+	* semantic-util.el (semantic-file-tag-table):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+	* semanticdb-system.el (semanticdb-project-database-system::semanticdb-load-system-database):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+	* semanticdb-file.el (semanticdb-table::semanticdb-live-p):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+	* semanticdb.el: (semanticdb-table::semanticdb-refresh-table)
+	(semanticdb-table::semanticdb-needs-refresh-p):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+	* semanticdb-debug.el (semanticdb-table-sanity-check):
+	Use find-buffer-visiting instead of get-file-buffer.
+
+2008-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el (semanticdb): New require
+	(semantic-decoration-unparsed-include-refrence-reset): Remove our
+	synchro cache, as the next bit will cause it to be recreated.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-cache-remove):
+	New
+	(semanticdb-abstract-table::semanticdb-synchronize): Make copy of
+	cache list before synchronizing them.
+
+	* semanticdb-file.el (semanticdb-cache-filename):
+	Stop using expand-file-name.
+	It breaks storing caches in a separate directory.
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions):
+	When interactively called,
+	make sure tags are up to date.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	When interactively called, make sure tags
+	are up to date.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	When interactively called, make sure tags
+	are up to date.
+
+2008-03-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el (semantic-decorate-tag): Doc Addition
+	(semantic-decoration-on-unknown-include-map): New
+	(semantic-decoration-on-unknown-includes-highlight-default):
+	Put a mouse and keymap on the overlay.
+	(semantic-decoration-unknown-include-describe): New
+	(semantic-decoration-on-unparsed-includes): New face.
+	(semantic-decoration-on-unparse-include-map): New
+	(semantic-decoration-on-unparsed-includes): New deco mode.
+	(semantic-decoration-on-unparsed-includes-p-default)
+	(semantic-decoration-on-unparsed-includes-highlight-default)
+	(semantic-decoration-unparsed-include-describe): New
+	(semantic-decoration-unparsed-include-cache): New cache class.
+	(semantic-decoration-unparsed-include-cache::semantic-reset)
+	(semantic-decoration-unparsed-include-cache::semanticdb-partial-synchronize)
+	(semantic-decoration-unparsed-include-cache::semanticdb-synchronize):
+	New methods
+	(semantic-decoration-unparsed-include-refrence-reset): New
+
+	* semantic-mru-bookmark.el (semantic-bookmark::semantic-mrub-preflush):
+	Protect against unbound slots in sbm before referencing.
+
+	* semanticdb.el (global-semanticdb-minor-mode):
+	Do not call setup functions if we are
+	not changing the semanticdb state.
+
+	* semantic-idle.el (semantic-idle-completion-list-default):
+	We support non-tooltip
+	Emacsen by default now with new displayro in semantic-complete.
+
+	* semanticdb-ref.el (semanticdb-abstract-table::semanticdb-add-reference):
+	When calling
+	`find-table-for-include', make sure we don't load unloaded tables.
+	(semanticdb-table::semanticdb-refresh-references): Remove comment.
+
+2008-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-need-cache-update-p):
+	New, extracted from below.
+	(semanticdb-find-translate-path-includes-default): Extract main logic
+	for deciding when to do an update into the above fcn.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-cache-filename):
+	Use `expand-file-name' instead of concat to make file names.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-full-filename):
+	New.
+
+	* semantic-complete.el (semantic-complete-do-completion):
+	Return a note  about what the
+	completion step was.
+	(semantic-complete-inline-map): Add ? to describe the map.
+	(semantic-complete-inline-tag-engine): Force display right away.
+	(semantic-complete-inline-TAB): Force a redisplay if we did a
+	completion step.
+	(semantic-displayor-traditional::semantic-displayor-show-request):
+	Near 1317: Fix class this method is declared against.
+	(semantic-displayor-ghost): Add `first-show' slot.
+	(semantic-displayor-ghost::semantic-displayor-next-action): New
+	(semantic-displayor-ghost::semantic-displayor-focus-request):
+	Improve output message.
+
+2008-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-completion-inline-active-p):
+	If the inline overlay is dead,
+	then delete the thing.
+	(semantic-complete-read-tag-engine): Make sure we call cleanups
+	on the collector and displayor.
+	(semantic-complete-do-completion): Doc fix.
+	Call `semantic-displayor-focus-next' before calling a focus request.
+	(semantic-complete-inline-map): Add `semantic-complete-inline-done'.
+	(semantic-complete-inline-done): New
+	(semantic-displayor-ghost)
+	(semantic-displayor-ghost::semantic-displayor-cleanup)
+	(semantic-displayor-ghost::semantic-displayor-set-completions)
+	(semantic-displayor-ghost::semantic-displayor-focus-request): New
+	(semantic-complete-inline-analyzer-displayor-class): Set to new
+	'ghost default.
+
+2008-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent.el (wisent-char-p): Put eval-and-compile elsewhere.
+	You can't byte-compile and use wisent in the same Emacs process otherwise.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::project-compile-target):
+	Enable for use when default-directory is incorrect.
+	Make this work.  I don't think it was tested.
+
+2008-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-make.el (semantic-lex-make-backslash-newline):
+	Deleted
+	(semantic-lex-make-backslash-no-newline): New.
+	(semantic-make-lexer): Use new lexer.  The \ continuation char should
+	cancel the creation of bol tokens.
+
+	* bovine/make.by (Makefile):
+	Put "bol newline"as the first item for speed.
+	(conditional, include, elements): Use some-whitespace
+	(opt-whitespace): Use some-whitespace
+	(some-whitespace): New
+
+2008-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-find-tag-for-completion):
+	Make robust to some errors out of
+	the analyzer.
+
+	* senator.el (senator-find-tag-for-completion):
+	If smart completions found, then
+	don't bother with boring completion.
+	(senator-current-symbol-start): Use semantic-ctxt API.
+	(senator-complete-symbol): Spelling fix.
+
+2008-03-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Optimize out second call to ede-find,
+	which can be expensive.
+
+	* semantic-ia.el (semantic-ia-fast-jump): Don't deref empty context.
+
+2008-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (LOADPATH): Add ede.
+
+	* doc/user-guide.texi (Semanticdb Roots): Add EDE suggestion.
+	(Semanticdb search debugging commands): Suggest search configuration chapter.
+
+	* bovine/Makefile:  (LOADPATH): EDE on load path.
+
+	* semantic-mru-bookmark.el (semantic-mrub-find-nearby-tag):
+	Stop fetching tags.  This causes
+	every edit type to do a reparse which is bad-news!
+
+	* semantic-fw.el (xemacs: semantic-overlays-at):
+	Wrap in condition-case so it won't
+	throw an error.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::ede-proj-makefile-insert-variables):
+	Add EDE to list of required packages in loadpath.
+
+	* document.el (ede): Stop requiring.
+
+2008-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map-builtin):
+	New
+	(semantic-default-c-setup): Use above.
+
+2008-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (top): Add smart completion debuggin menu
+	(Semanticdb Search Configuration): Turn of phrase.
+	(Search Throttle): Describe system vs regular include files.
+	(Smart Completion Debugging): New section.
+	(Speed Debug): Describe semantic-elp.el
+
+	* semantic-adebug.el (semantic-adebug-insert-ring-contents):
+	Don't use ring-elements.
+	Loop via index instead.
+
+	* semantic-adebug.el (semantic-adebug-insert-ring-button):
+	Improved ring display.
+
+	* semantic-mru-bookmark.el (semantic-bookmark::semantic-mrub-visit):
+	Restore location in tag too.
+	(semantic-mrub-find-nearby-tag): Force a reparse if needed.
+	(semantic-bookmark-ring::semantic-mrub-push): Don't need elts anymore.
+	(semantic-mrub-cache-flush-fcn): Loop by index over ring.
+	(semantic-mru-bookmark-change-hook-fcn): Dox fix.
+	(semantic-mrub-ring-t-assoc-list): New
+	(semantic-mrub-completing-read): Use above.
+	(push-mark): No-need for interactive set-mark.
+
+2008-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-system.el (semanticdb-system-database-warn-level):
+	Make smaller
+	(semanticdb-default-system-file-name): New name.
+	(semanticdb-project-database-system::semanticdb-create-database):
+	Add in system paths too.
+	(semanticdb-project-database-system::semanticdb-file-name-non-directory): New
+	(semanticdb-load-system-caches): New varname for system file.
+	(semanticdb-project-database-system::semanticdb-load-system-database):
+	Opt to no pre-parse files.
+	(semanticdb-project-database-system-c): Expand the regexp.
+
+	* document.el (document-insert-texinfo): Autoload cookie.
+
+	* semantic-mru-bookmark.el (push-mark): New advice.
+	(set-mark-command): Comment out old advice.
+
+	* bovine/semantic-el.el (semantic-elisp-clos-slot-property-string):
+	Support numbers
+	(defface): Never a const
+	(defimage): Never a const.
+
+	* semantic-tag-file.el (semantic-dependency-include-path): Deleted.
+
+	* semantic-tag.el (semantic-tag-similar-p):
+	Fixed bugs found when using with cedet-integ.el.
+	Added ignorable-attributes argument.
+
+	* semantic-mru-bookmark.el (semantic-bookmark-ring::semantic-mrub-push):
+	Don't ref ring if empty.
+
+2008-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-mru-bookmark.el (semantic-mrub-find-nearby-tag): New
+	(semantic-bookmark-ring::semantic-mrub-push): Use nearby tags too.
+	More reliable removal of duplicate tags.
+
+2008-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache-add-dependant):
+	Add autoload cookie.
+
+2008-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scope.el (semantic-calculate-scope):
+	Add ourselves to the typecache as a dependancy.
+
+	* semanticdb-typecache.el (semanticdb-typecache): Add dependants
+	(semanticdb-typecache::semantic-reset): Reset our dependants.
+	(semanticdb-typecache::semanticdb-partial-synchronize): Reset our dependants
+	(semanticdb-typecache-add-dependant): Add a new dependant.
+
+2008-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-table::object-write):
+	Use `semanticdb-in-buffer-p' instead
+	of `get-file-buffer'.
+
+	* semanticdb.el (semanticdb-table::semanticdb-in-buffer-p):
+	Extract buffer from first tag.
+	(semanticdb-table::semanticdb-get-buffer): Use above before using find-file.
+
+	* semanticdb-typecache.el (semanticdb-table::semanticdb-typecache-include-tags):
+	Calc the
+	translated path first, then get the typecache.  Makes sure the
+	typecache has been reset if needed.
+
+	* semanticdb-file.el (semanticdb-load-database):
+	Put filename in err msg.
+
+	* doc/tags.texi (Tag Basics, Tag Query, Tag Overlay, Tag Hooks):
+	Update doc from src.
+
+	* doc/app-dev-guide.texi (Override Methods): Move stuff too
+	(Tag File Reference): New section.
+	(Jump to a Tag): New section
+
+	* semantic-tag.el (semantic-tag-in-buffer-p): Doc fix.
+	(semantic-tag-of-type-p): Doc fix.
+	(semantic-tag-similar-p): New predicate.
+	(semantic-tag-faux-p): Doc fix.
+	(semantic-tag-new-variable): Doc fix
+	(semantic-tag-type): Doc fix
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::project-compile-target):
+	use mapc instead of mapcar.
+
+	* semantic-dep.el (`semantic-dependency-system-include-path):
+	Type in making symbol
+	buffer local.
+
+	* semantic-decorate-mode.el (semantic-tag-boundary-highlight-default):
+	Do not do anything
+	if the tags buffer is invalid.
+
+	* semantic-debug.el (semantic-debug-interface::semantic-debug-unhighlight):
+	Use mapc
+	instead of mapcar.
+
+	* semanticdb-ref.el (semanticdb-table::semanticdb-notify-references):
+	Use mapc instead
+	of mapcar.
+
+	* bovine/c.by (macro-expression-list, macro-def, opt-define-arglist):
+	Deleted.
+	(macro, define): Stop using above.
+	The lexer now supports that stuff for us.
+
+	* semantic-lex.el (define-lex): Commented out part w/ lexer timeout.
+	Add call to `semantic-throw-on-input'.
+
+	* bovine/semantic-make.el (semantic-lex-make-ignore-automake-conditional):
+	New lexer
+	(semantic-make-lexer): Use above new lexer.  Add BOL lexer.
+	(semantic-make-expand-tag): Recycle input tag if name list is
+	just one item.  Comments for instrumentation.
+
+	* bovine/make.by (Makefile):
+	Require bol tags in front of variables, rules,
+	conditionals, and includes.
+
+	* semantic.el (semantic-fetch-tags-fast): Always return something.
+	(semantic-parse-region-default): Make sure the buffer is wide while
+	trying to parse the region.
+
+	* semantic-imenu.el (semantic-create-imenu-index):
+	Use `semantic-fetch-tags-fast'
+	so we don't get hung-up in imenu.
+
+2008-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el (semantic-edits-splice-remove):
+	Add safety when removing first tag.
+	If we can't find an end to splice into, then throw reparse error.
+	Add safety when removing non-first tag.  If we can't find the tag
+	to remove, then throw a reparse error.
+
+2008-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-create-table-for-file):
+	Don't expand filename.  It
+	happens laer.
+	(semanticdb-file-table-object): Use file-truename.
+
+	* semanticdb.el (semanticdb-table::semanticdb-needs-refresh-p):
+	File attributes
+	returns a list, so use nth.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-create-database):
+	Use `file-truename'.
+	(semanticdb-project-database-file::semanticdb-file-name-directory):
+	Change how we expand the filename.
+
+	* semanticdb.el:
+	(semanticdb-project-database::semanticdb-create-database)
+	(semanticdb-get-database)
+	(semanticdb-project-database::semanticdb-file-table): Use `file-truename'
+	(semanticdb-current-database): Don't expand filename.  Not needed
+	since that is done in create-database.
+	(semanticdb-current-database-list): Use `file-truename' on inputs and
+	each root.  Don't loop over roots since there can be only one.
+
+2008-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-clear-toplevel-cache):
+	Use mapc instead of mapcar.
+
+	* semanticdb.el (semanticdb-save-all-db): Use mapc instead of mapcar.
+
+	* semantic-idle.el (semantic-idle-summary-format-default):
+	Only show filename if the file
+	is not the current buffer.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-parts):
+	When pulling type slots out, apply a filename
+	to those tags so we can find them later.
+
+	* semanticdb-typecache.el (semanticdb-typecache-safe-tag-list):
+	Be sure to return tags if the table is in a buffer.
+
+	* semantic-analyze.el (semantic-analyze-current-context-default):
+	Fix query for functions
+	that are incomplete.
+
+	* semantic-idle.el (semantic-idle-summary-function): change to...
+	(semantic-idle-summary-format-default): New fcn.
+
+	* semanticdb-typecache.el (semanticdb-typecache-apply-filename):
+	Restore storage of filename in tags.
+	(semanticdb-typecache-safe-tag-list): Add filenames to all tags not in
+	a buffer.
+	(semanticdb-table::semanticdb-typecache-file-tags): Force tags to have
+	file names.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method): Store
+	filename into tags in search if find-file-match is not used.
+
+	* semanticdb.el (semanticdb-project-database::semanticdb-create-database):
+	Expand filename in reference-directory slot.
+	(semanticdb-table::semanticdb-in-buffer-p): New function.
+	(semanticdb-get-database, semanticdb-current-database)
+	(semanticdb-create-table-for-file): Expand filename when creating the DB.
+
+	* semantic-analyze-fcn.el (semantic-analyze-find-tags-by-prefix):
+	Use an arg to
+	strip-find-results so that filenames are stored in the tags.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Track filename
+	throughout the find and insert into the tags.
+	(semantic-analyze-find-tag): Use strip-find-results w/ arg so
+	that filename is saved in the return tags.
+
+	* semanticdb-find.el (semanticdb-strip-find-results): Fix typo.
+
+	* semanticdb-find.el (semanticdb-strip-find-results):
+	Allow find-fil-match arg to
+	be 'name, in which case only insert the filename into the tag.
+
+	* semanticdb-file.el (semanticdb-project-database-file):
+	Add `do-backup' default nil.
+	(semanticdb-project-database-file::semanticdb-create-database):
+	Expand the filename.
+
+2008-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el (semantic-default-html-setup):
+	imenu-expandable-tag-classes should be
+	a list.
+
+	* semanticdb-debug.el (semanticdb-dump-all-table-summary): Moved.
+	(semanticdb-adebug-database-list): Deleted, alias of above.
+	(semanticdb-adebug-project-database-list): New.
+
+	* doc/app-dev-guide.texi (DB Results):
+	Discuss semanticdb-fast-strip-find-results.
+
+	* semantic-ia-utest.el (semantic-ia-utest-buffer):
+	Display number of testpoints hit.
+
+	* doc/user-guide.texi (Include paths): Refer to debugging tools
+	(Semanticdb search debugging commands): Add semanticdb-find-adebug-lost-includes
+
+	* semanticdb-find.el (semanticdb-find-lost-includes): New variable
+	(semanticdb-find-translate-path-includes--internal): Track lost
+	include files.
+	(semanticdb-find-adebug-lost-includes): Debug listing for lost includes.
+
+	* semantic-elp.el (semantic-elp-eieio-core-list):
+	add eieio-generic-call
+	(semantic-elp-data): Add total
+	(semantic-elp-data::semantic-adebug/eieio-insert-fields): Insert total time.
+	(semantic-elp-object): Add total
+	(semantic-elp-analyze): Record the grand total.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Push the char
+	include name before checking if we could find it to prevent checking
+	the same header multiple times.
+
+	* semanticdb.el (semanticdb-current-database-list):
+	Use nconc for final list.
+
+	* semantic-adebug.el (semantic-adebug-insert-thing):
+	Give unknowns a bold face at least.
+
+2008-02-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-find-tag-for-completion):
+	Use semanticdb-fast-strip-find-results.
+
+	* semantic-texi.el (semantic-texi-goto-source):
+	Use semanticdb-fast-strip-find-results.
+
+	* semantic-elp.el (semantic-elp-ede-core-list): New var.
+	(semantic-elp-semanticdb-core-list): Add semanticdb-file-table-object.
+	(semantic-elp-semanticdb-find-list): Add fast-strip-find-results
+	(semantic-elp-core-enable): Load thte ede-core list.
+	(semantic-elp-goto-function): New
+	(semantic-elp-data::semantic-elp-dump-table): Support goto-function on
+	each result entry.
+	(semantic-elp-data::semantic-adebug/eieio-insert-fields):
+	Support not contracting after the 'sort style.
+	(semantic-elp-change-sort-adebug): Remove old text before inserting
+	new text.
+
+	* semantic-analyze-fcn.el (semantic-analyze-find-tags-by-prefix):
+	Use semanticdb-fast-strip-find-results.
+
+	* semantic-analyze.el (semantic-analyze-find-tag):
+	Use semanticdb-fast-strip-find-results.
+
+	* semanticdb-typecache.el (semanticdb-typecache, semanticdb-typecache-notify-reset):
+	Autoload cookies.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Use nconc instead
+	of append when possible.
+	(semanticdb-find-table-for-include-default):
+	Do not do project search if it is a system include style include.
+	(semanticdb-strip-find-results): Doc update.
+	Revert nconc back to append.
+	(semanticdb-fast-strip-find-results): New.
+
+	* semantic-adebug.el (semantic-adebug-line-expndable-p): New
+	(semantic-adebug-expand-current-line): Run the fcn if it is not
+	expandable.  This seems to make no sense, but it does!
+	(semantic-adebug-expand-or-contract): Do not contract if line
+	is not expandable.
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (tools_LISP): Added semanticdb-debug.el
+
+	* Project.ede ("tools"): Added semanticdb-debug.el
+
+	* semanticdb-debug.el: Features extracted from semanticdb.el
+
+	* semantic-ia-utest.el (semantic-ia-utest):
+	Make sure we are in the right directory when we
+	run the tests.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-save-db):
+	Do not save a
+	DB if it is not dirty.
+	(semanticdb-table::object-write): Reset dirty flag after save.
+	Comment about restoring decorations, but not implemented.
+
+	* semanticdb.el (semanticdb-abstract-table): Add non-saving dirty flag.
+	(semanticdb-abstract-table::semanticdb-set-dirty): New method.
+	(semanticdb-table::object-print): Add DIRTY to dirty tables.
+	(semanticdb-project-database::object-print): New
+	(semanticdb-abstract-table::semanticdb-dirty-p): New
+	(semanticdb-project-database::semanticdb-dirty-p): New
+	(semanticdb-semantic-init-hook-fcn): Reset dirty-flag after file load.
+	(semanticdb-create-table-for-file): Stop resetting everything.
+	(semanticdb-abstract-table::semanticdb-synchronize)
+	(semanticdb-abstract-table::semanticdb-partial-synchronize):
+	Set the table to be dirty during a synchronize.
+	(semanticdb-adebug-current-database-list)
+	(semanticdb-adebug-current-database)
+	(semanticdb-adebug-current-table)
+	(semanticdb-table-oob-sanity-check)
+	(semanticdb-table-sanity-check)
+	(semanticdb-database-sanity-check)
+	(semanticdb-dump-all-table-summary): Moved to a new file.
+
+	* semantic-adebug-eieio.el (semantic-adebug-insert-object-button):
+	Use object print names.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	Make scope calculation robust to no
+	semanticdb running.
+
+	* bovine/semantic-c.el (c-mode::semantic-find-tags-by-scope-protection):
+	New override for c-mode.
+
+	* semantic-tag-ls.el (semantic-tag-protected-p):
+	Pull null-check up before
+	fetching of the tags protection for short-cut in this case.
+
+	* semantic-find.el (semantic-find-tags-by-scope-protection):
+	Convert into an override
+	(semantic-find-tags-by-scope-protection-default): Body of original.
+
+2008-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Add a short-cut through
+	the typecache.  Not sure if it is good yet.
+	(semantic-analyze-find-tag): If we have a list of names, go through
+	the typecache first.  Lists usually come from compound datatype
+	names.  If that fails, do what we did before.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Track names of
+	files included so far.  Short-cut a semanticdb call if we've seen a
+	name before.
+
+	* semantic-scope.el (semantic-analyze-scoped-types-default):
+	Only merge streams if we have
+	something to merge.
+
+	* semantic-elp.el (semantic-elp-load-old-run): Add autoload cookie.
+
+	* semanticdb-typecache.el (semanticdb-typecache-find-default):
+	Remove stray argument erroneously
+	added in previous checkin.
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Add short-cut for when no
+	merging is needed.
+	(semanticdb-table::semanticdb-typecache-file-tags): Do not merge
+	streams if we find no tags.
+	(semanticdb-typecache-find): Doc fix.
+
+	* semantic-elp.el (semantic-elp-typecache-list): Fixup the list.
+	(semantic-elp-analyze): Force typecache to be fully expanded.
+
+	* semanticdb-typecache.el (semanticdb-table::semanticdb-typecache-include-tags):
+	Do not
+	do a typecache for non table tables.
+	(semanticdb-typecache-dump): Force a fill in for the parts that
+	need dumping.
+
+2008-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el ("MRU Bookmark"): New menu item.
+	(senator-try-expand-semantic): @todo
+
+	* semanticdb-typecache.el (semanticdb-typecache):
+	Add filestream and include stream slots.
+	(semanticdb-abstract-table::semantic-reset)
+	(semanticdb-abstract-table::semanticdb-typecache-notify-reset)
+	(semanticdb-abstract-table::semanticdb-partial-synchronize): New methods.
+	(semanticdb-abstract-table::semanticdb-get-typecache): Re-wrote.
+	(semanticdb-typecache-merge-streams): Doc fix
+	(semanticdb-abstract-table::semanticdb-typecache-merge)
+	(semanticdb-stream-to-typecache)
+	(semanticdb-typecache-update x2): Deleted.
+	(semanticdb-table::semanticdb-typecache-file-tags)
+	(semanticdb-table::semanticdb-typecache-include-tags): New methods
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Re-written for two part search.
+
+	* semanticdb-find.el: (semanticdb-find-search-index::semantic-reset)
+	(semanticdb-find-search-index::semanticdb-synchronize): Call reset on
+	type-cache instead of deleting it.
+	(semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Call partial synchronize on the typecache.  If it claims to have
+	done anything, then do a notify.
+
+	* semantic-analyze-fcn.el (semantic-analyze-type-parts):
+	Stop getting external methods... for a while.
+	The profiler said this took up a lot of time.
+	(semantic-analyze-inherited-tags): Use nconc instead of append for
+	some list concatenation.
+
+	* semantic-analyze-complete.el (semantic-analyze-tags-of-class-list, semantic-analyze-possible-completions-default):
+	Use nconc instead of appen for some lists that we know are permutable.
+
+	* semantic-elp.el (semantic-elp-object):
+	Remove the values, keep only the timing info
+	(semantic-elp-data): New object.
+	(semantic-elp-dump-table, semantic-adebug/eieio-insert-fields)
+	((semantic-elp-change-sort-adebug): New methods on elp-data.
+	(semantic-elp-results): Do not use elp to display results.
+	Convert vector into a semantic-elp-data object.  Accept a name
+	for this object.
+	(semantic-elp-analyze): Give our objects names.
+	Try to save the run into a file for safe-keeping.
+	(semantic-elp-show-last-run, semantic-elp-load-old-run): New commands.
+
+	* semantic-adebug.el (semantic-adebug-map): Add CR to do toggling.
+
+2008-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	use nconc instead of append.
+	(semanticdb-strip-find-results): Use nconc instead of append.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	Protect against bad local variable calculation.
+
+	* semantic-sort.el (semantic-tag-lessp-name-then-type):
+	Local variable optimization.
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Use nconc instead of append
+	since inputs are permutable.
+
+	* Makefile (tools_LISP): Add semantic-elp.el
+
+	* Project.ede (tools): Add semantic-elp.el
+
+	* semantic-elp.el: Utility for using ELP against analyzer code.
+
+2008-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-incomplete-cache-entries-p):
+	Do not error if the
+	table has no point-max.
+
+	* senator.el (senator-menu-bar):
+	Add item for `semantic-chart-analyzer'.
+
+	* semantic-chart.el (semantic-chart-analyzer): New command.
+
+	* semanticdb-find.el (semanticdb-find-search-index::semantic-reset):
+	Reset the scope too.
+	(semanticdb-find-table-for-include-default): Use
+	`semantic-tag-in-buffer-p' when looking for already buffer'd tags.
+
+	* semantic-scope.el (semantic-scope-cache-get, semantic-scope-cache-set):
+	Deleted.
+	(semantic-scope-reset-cache): New.
+
+	* semantic-analyze.el (semantic-analyze-find-tag):
+	Fix bug calling find-tag-sequence to new
+	argument order.
+
+	* semanticdb-file.el (semanticdb-persistent-path):
+	New default `always'.
+	(semanticdb-project-database-file::semanticdb-write-directory-p):
+	Todo comment.
+
+2008-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Use `semantic-tag-in-buffer-p'
+	instead of the version that reads in files.
+
+	* semantic-tag-ls.el (semantic-tag-calculate-parent-default):
+	Do not load tag files in.
+	(semantic-tag-protection): Do not load tag files in.
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Use `semantic-tag-in-buffer-p' instead of
+	`semantic-tag-buffer' when asking if a tag has a buffer.
+	(semantic-dependency-tag-file): When trying to find a tag location,
+	set `default-directory' instead of making the tag file current.
+	Avoid's loading in a new file during a simple question.
+
+	* semantic-tag.el (semantic-tag-in-buffer-p): New fcn.
+	(semantic-tag-buffer): Use above.
+	(semantic-tag-file-name): Use `semantic-tag-in-buffer-p'.
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Use newer API for `speedbar-line-directory'.
+
+	* semanticdb.el (semanticdb-table::semanticdb-get-buffer):
+	Do not blindly call
+	`find-file-noselect'. Instead check if there is a buffer for that file
+	first.
+
+	* semantic-analyze-fcn.el (semantic-analyze-find-tags-by-prefix):
+	Do not pass "find-file" flag
+	to strip-find-results.
+
+	* semantic-lex-spp.el (define-lex-spp-include-analyzer):
+	Remove message output.
+
+2008-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-fcn.el (semantic-analyze-tag-type):
+	Make sope param optional.
+
+	* semantic-ia-sb.el (semantic-ia-speedbar):
+	Stop showing fcn args.  They are now in the
+	local variables list.
+	(semantic-analyze-context::semantic-ia-sb-more-buttons):
+	Get the local variables from the scope.
+
+	* tests/testsubclass.cpp (someFunction): New scope testing cases.
+
+	* semantic-texi.el (texinfo-mode::semantic-analyze-current-context):
+	Use new
+	`semantic-ctxt-current-symbol-and-bounds' over older API that is now gone.
+
+	* semantic-scope.el (semantic-calculate-scope):
+	Always recalc local variables.
+
+	* semantic-ia-utest.el (semantic-ia-utest-buffer):
+	Do not use system tags during the run.
+
+	* semantic-ia-sb.el (semantic-ia-sb-tag-info):
+	semantic-analyze-tag-type needs
+	a second argument now.
+
+	* semantic-grammar.el (semantic-grammar-mode::semantic-analyze-current-context):
+	Remove extra :scope setting.
+
+	* semantic-analyze.el (semantic-analyze-current-context-default):
+	Make sure fntag is fully
+	discovered before use.
+	(semantic-analyze-context::semantic-analyze-show):
+	Do not deref scope if it is nil.  (texi analyzer for example.)
+
+	* semantic-analyze-complete.el (semantic-analyze-tags-of-class-list):
+	Add autoload.
+
+2008-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-summary-current-symbol-info-default):
+	Disable 'unloaded feature in `semanticdb-find-default-throttle'
+	during lookup for summary mode.
+
+	* semanticdb-find.el (semanticdb-find-incomplete-cache-entries-p):
+	New util.
+	(semanticdb-find-translate-path-includes-default): If we
+	have a cache, only use if (complex condition) based on state of
+	'unloaded' and empty tables in the cache.
+	(semanticdb-find-load-unloaded): If not to load, still make the
+	table specifying 'dontload'.
+	(semanticdb-find-table-for-include-default):
+	Use `semanticdb-find-load-unloaded' in more spots, including
+	getting rid of complex system header loader.
+
+	* semanticdb.el (semanticdb-semantic-init-hook-overload): Deleted
+	(semanticdb-table::semanticdb-equivalent-mode): Allow "null" as ok.
+	These tables are empty anyway.
+	(semanticdb-semantic-init-hook-fcn): Fix doc.
+	Split out code into below.
+	(semanticdb-create-table-for-file): New split from above.
+	(semanticdb-abstract-table::semanticdb-synchronize): Set pointmax.
+	(semanticdb-adebug-current-database-list)
+	(semanticdb-adebug-current-database)
+	(semanticdb-adebug-current-table): New debug fcns.
+	(semanticdb-file-table-object): If 'dontload' is specified,
+	create a blank representation of this file.
+	If we find a table, but it's pointmax is empty, and we want to
+	load, then do the load there.
+
+2008-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-completion-inline-active-p):
+	Add autoload cookie.
+
+2008-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-semantic-init-hook-fcn):
+	Only init in buffers that have
+	a file associated with them.
+
+2008-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-grammar-mode::semantic-analyze-current-context):
+	Fix analyzer overrides to new style.
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Set buffer to tag buffer (if
+	available) so that the correct override is run.
+
+	* semanticdb.el (semanticdb-hooks):
+	Add a change-major-mode-hook same as kill-hook.
+	If a mode changes, all the overlays need to be whacked within the
+	stored database otherwise semantic will kill off the overlays from the
+	buffer instead in preparing for the new mode.
+
+	* semantic-analyze.el (semantic-analyze-context):
+	Allow null SCOPE for modes where
+	it makes no sense to have a scope.
+
+2008-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-insert-foreign-tag):
+	Remove unused incorrect second argument.
+
+	* semantic-texi.el (semantic-texi-super-regex): Add "top"
+	(semantic-texi-recursive-combobulate-list): If a section is
+	immediately prefixed with a @node, then include it in the region for
+	that section.
+	Also, fix bugs where nodes that intersect eobp do not get their end
+	point reset.
+	(semantic-up-context, semantic-beginning-of-context): New overrides.
+	(semantic-insert-foreign-tag): Moved.
+	(semantic-tag-texi-section-text-bounds, semantic-texi-current-environment):
+	New functions.
+
+2008-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (form-parsers for: defface, defimage & defezimage, defgroup):
+	New form parsers split from the one that made variables.
+
+2008-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Makefile (Tests_AUX): Renamed to ...
+	(Tests_MISC): Add testdoublens.c/h
+	(dist): Name change.
+
+	* Makefile (tools_LISP): Remove semantic-utest.el
+	(tests_LISP): New
+	(tests): New rules
+	(dist): Add tests_LISP
+
+	* Project.ede ("tools"): Remove semantic-utest.el
+	("tests"): New target, contains semantic-utest.el, and semantic-ia-utest.el
+
+	* semantic-ia-utest.el (semantic): Add require for byte-comp stage
+
+	* tests/Project.ede ("Tests"):
+	Convert to miscelaneous target.  Add testdoublehs.c/h files.
+
+2008-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testsubclass.hh (animal::moose, alces::alces, deer::alces):
+	Added various fields for
+	unit testing.
+
+	* semantic-ia-utest.el (semantic-ia-utest-file-list):
+	Add testsubclass.cpp
+
+	* tests/testsubclass.cpp (deer::alces::createMoose):
+	Add some unit test entries.
+
+	* tests/testdoublens.cpp:
+	Header file for unit tests for the completion engine.
+
+	* tests/testdoublens.hpp: Header file for uni
+
+	* semantic-ia-utest.el: Analyzer unit test for completion engines.
+
+2008-01-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (varnamelist):
+	Support refs in parser.  Doesn't save the info though.
+
+2008-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-abstract-table::semanticdb-typecache-find-method):
+	When searching for a list of names in the typecache, if we are not
+	on the last entry, make sure the found entry is of class 'type.
+	If it is not, then filter the current stream for things of class 'type.
+
+	* semantic-scope.el (semantic-analyze-scope-nested-tags-default):
+	Look up tag names via
+	nesting first.  Append names from :parent part of a function.  use
+	typecache to find it, or backup find routine.
+	(semantic-calculate-scope): doc fix.
+	(semantic-scope-find): Enable to accept just a list of tags to search
+	while bootstrapping a scope table.
+
+2008-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (senator): Add j and J bindings.
+	(Include paths): Add link to search optimization section.
+
+	* doc/installation.texi (Search Optimization):
+	Add info about project roots, and links to
+	search configuration, and simple EDE projects.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes--internal):
+	Calculate a
+	current table.  Pass in when looking for include files.
+	(semanticdb-find-table-for-include): Doc update.
+	(semanticdb-find-table-for-include-default): Restructured the include
+	lookup.   Use EDE when available to find header files.  See
+	corresponding changes to ede-cpp-root for purpose.
+
+	* semanticdb-typecache.el (semanticdb-table::semanticdb-typecache-update):
+	Pass ourself into
+	semanticdb-find-table-for-include.
+
+2008-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el (semantic-decoration-on-unknown-includes-highlight-default):
+	Use
+	`semantic-decorate-tag' instead of setting the face on the tag directly.
+
+	* semanticdb-typecache.el (semanticdb-table::semanticdb-typecache-update):
+	Fix comment.
+
+2008-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-default-save-directory):
+	Use ~/.semanticdb as the new
+	default save directory.
+	(semanticdb-project-database-file::semanticdb-create-database):
+	Fix the name of created DBs to be based on directory.
+
+	* semanticdb.el (semanticdb-abstract-table): Fixed doc
+	(semanticdb-abstract-cache): Fixed doc
+	(semanticdb-table): Added todo comment
+	(semanticdb-project-database::semanticdb-create-database):
+	Fixed name of newly created databases.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence-default):
+	Doc update
+	(semantic-analyze-current-context-default): When analyzing a function
+	call, if the tag that comes back is instead a type (and not a
+	function), then look in that type for a function with the same name,
+	and use that instead.
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Remove elements from previous
+	patch for whitespace robustness on first "looking-at" statement.
+
+2008-01-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Allow arbitrary white-space
+	around the field spec sepearators.
+	Suggestion from Nikolaj Schumacher, and adapted from his patch.
+
+	* semantic-format.el (semantic--format-tag-arguments):
+	Support the 'formatter' argument.
+
+2007-12-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el (semantic-ia-show-summary):
+	Replace internal logic with
+	`semantic-analyze-interesting-tag' and merge the good parts.
+
+	* semantic-analyze.el (semantic-analyze-context::semantic-analyze-interesting-tag):
+	Replace old logic with a loop that handles longer chains of tags.
+
+	* semantic-analyze.el (semantic-analyze-context::semantic-analyze-interesting-tag):
+	Reverse the analyzer prefix to get the most detailed tag as being interesting.
+
+2007-11-07  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-old-isearch-search-fun): New variable.
+	(senator-isearch-mode-hook): Use it to try to preserve a previous
+	value of `isearch-search-fun-function'.
+
+2007-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-get-local-variables-default):
+	Do not calc local variables if
+	the buffer isn't parseable.
+
+2007-09-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el: (semantic-lex-c-include-system)
+	(semantic-lex-c-include): Fix regex so includes work w/out a space.
+	(semantic-type-relation-separator-character): Fix doc.
+
+2007-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze-complete.el (semantic-analyze-possible-completions-default):
+	Fix bug where old slot names were referenced.
+
+	* semantic-analyze.el: (semantic-analyze-find-tag-sequence-default)
+	(semantic-analyze-find-tag): Do not call semantic-scope-find if there
+	is no scope.
+
+	* semantic-analyze-fcn.el: (semantic-analyze-dereference-metatype)
+	(semantic-analyze-tag-type): Do not call scopefind if scope is nil.
+
+2007-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (NEW): New token for the `new' keyword
+	(expression): Support newing new values for pointers.
+
+2007-09-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Autoload cookie.
+
+2007-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (tools_LISP): Add in new files:
+	semantic-analyze-fcn.el semantic-analyze-complete.el semantic-scope.el
+
+	* Project.ede ("semantic"): Add in new files:
+	semantic-analyze-fcn.el semantic-analyze-complete.el semantic-scope.el
+
+	* semantic-analyze.el: (semantic-analyze)
+	(semantic-analyze-type-constants)
+	(semantic-analyze-tags-of-class-list)
+	(semantic-analyze-possible-completions)
+	(semantic-analyze-possible-completions-default)
+	(semantic-analyze-complete)
+	(semantic-analyze-tag-prototype-p)
+	(semantic-analyze-tag-prototype-p-default)
+	(semantic-analyze-split-name)
+	(semantic-analyze-split-name-default)
+	(semantic-analyze-select-best-tag)
+	(semantic-analyze-find-tags-by-prefix)
+	(semantic-analyze-tag-type-to-name)
+	(semantic-analyze-tag-type)
+	(semantic-analyze-dereference-metatype)
+	(semantic-analyze-type-parts)
+	(semantic-analyze-inherited-tags)
+	(semantic-analyze-fcn): Moved into other files.
+	(semantic-analyze-context): Remove scope slots that contained lists.
+	The old scope slot now contains an object only.
+	(semantic-analyze-find-tag-sequence):
+	Turned into an overload method.
+	Converted to use new scope object.
+	(semantic-analyze-find-tag):
+	Use new scope object.
+	Use new typecache for finding datatypes.
+	(semantic-analyze-current-context-default):
+	Use new scope object, removing all scope calculations.
+
+	* semantic-analyze-complete.el:
+	Routines such as semantic-analyze-possible-completions copied from
+	semantic-analyze.el that all deal with smart completion.
+
+	* semantic-analyze-fcn.el:
+	Various routines copied from semantic-analyze.el
+
+	* doc/tags.texi (semantic-tag<): Deleted.
+
+	* bovine/semantic-c.el (semantic-tag<): Deleted. (Not needed anymore.)
+
+	* semantic-scope.el:
+	New routines for calculating and maintaining a list of tags that fall
+	within "scope".
+
+	* semantic-tag.el (semantic-tag<, semantic-tag<-default, semantic-tag<-with-type):
+	Deleted.
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Use sort routine now in
+	semantic-sort.el.
+	(semanticdb-typecache-find): Add find-file-match.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Make sure input type is always a list.
+
+	* semantic-sort.el (semantic-tag-lessp-name-then-type): New fcn.
+	(semantic-sort-tags-by-name-then-type-increasing)
+	(semantic-sort-tags-by-name-then-type-decreasing): New sort routines.
+	(semantic-unique-tag-table-by-name): More doc.
+	(semantic-unique-tag-table): More doc.
+
+	* semanticdb-find.el (semanticdb-find-search-index::semantic-reset):
+	New method.
+	(semanticdb-find-search-index::semantic-synchronize): use above.
+	(semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Use reset method.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-cache-get):
+	Fix assert.
+	Fix adding to the list.
+
+	* semantic-ctxt.el: (semantic-ctxt-current-symbol-and-bounds)
+	(semantic-ctxt-current-symbol-and-bounds-default): New ctxt fcns
+	moved to here from semantic-analyze.el
+
+	* semantic-adebug.el (semantic-adebug-analyze):
+	Optional CTXT input argument.
+
+	* semantic-adebug-eieio.el (semantic-adebug-show): New method.
+
+2007-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (inversion-require): Require newer version of eieio.
+	(semanticdb-abstract-table): Remove `file-refs' slot.
+	Add `cache' slot.
+	(semanticdb-abstract-search-index::semanticdb-synchronize)
+	(semanticdb-abstract-search-index::semanticdb-partial-synchronize):
+	Moved.
+	(semanticdb-abstract-cache): New class
+	(semanticdb-abstract-cache::semanticdb-cache-get)
+	(semanticdb-abstract-cache::semanticdb-synchronize)
+	(semanticdb-abstract-cache::semanticdb-partial-synchronize): New methods.
+	(semanticdb-abstract-table::semanticdb-synchronize)
+	(semanticdb-abstract-table::semanticdb-partial-synchronize):
+	Synchronize all caches as needed.
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords):
+	Add new spp lex analyzer for includes.
+
+	* semanticdb-typecache.el (semanticdb-typecache): Remove discard log
+	(semanticdb-abstract-table::semanticdb-get-typecache): Doc fix.
+
+	* semanticdb-ref.el (semanticdb-table::semanticdb-refresh-references):
+	rearranged
+
+	* semanticdb-mk.el: Add todo comment.
+
+	* semanticdb-find.el (semanticdb-find-translate-path): Doc update.
+
+2007-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Tag Query): Add `semantic-tag<'
+
+	* doc/app-dev-guide.texi (Semantic Database):
+	Add `Semanticdb referenbces'
+	(Semanticdb Tag Queries): Add `DB Data Type Search'.
+	(DB Search Paths): Add note about references and cahces.
+	(DB Data Type Search): New
+	(Semanticdb references): New
+
+	* bovine/semantic-c.el:
+	(semantic-lex-cpp-define, semantic-lex-cpp-undef, semantic-lex-c-if)
+	(semantic-lex-c-macro-else, semantic-lex-c-macrobits):
+	Allow spaces between # and define.
+	(semantic-lex-c-include-system-old): Renamed old version
+	(semantic-lex-c-include-system, semantic-lex-c-include): New analyzers
+	for includes statements using SPP macro processor.
+	(semantic-c-lexer): Use new include analyers.
+	(semantic-c-reconstitute-token): Only mark something as a fcnpointer
+	if it is not the * operator.
+	(c-mode::semantic-tag<): New override method.
+	(semantic-ctxt-scoped-types): Use the types from using statements.
+	(c++-mode::semantic-get-local-variables): Doc fix.
+
+	* bovine/c.by (INCLUDE): Remove
+	(declaration): Create a tag for 'using statements.
+	(macro-or-include): Delete
+	(macro): Merge in includes.  Use new spp include style.
+	(namespacesubparts): Create using tags.
+	(using): Return the datatype as a tag when a USING is found.
+
+	* semantic-lex-spp.el (semantix-lex-spp-symbol-replacement):
+	Deleted unused fcn.
+	(define-lex-spp-macro-declaration-analyzer): Doc Fix
+	(semantic-lex-spp-use-headers-flag): New option for languages.
+	(semantic-lex-spp-merge-header): Fcn for merging in macros from
+	header files.
+	(semantic-lex-spp-include-analyzer): New analyzer macro.
+	(edebug-setup-hook): Add above.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-stream):
+	Always use semantic-lex API to decode
+	parts of a lexical token.
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Use `semantic-tag<' to sort.
+
+	* semantic-tag.el (semantic-tag-of-type-p):
+	Fix bug testing two types that are tags.
+	(semantic-tag<, semantic-tag<-default): New overload method.
+	(semantic-tag<-with-type): New function to use when overriding semantic-tag<.
+
+2007-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-abstract-table::semanticdb-get-typecache):
+	Force table
+	refresh before fetch.
+	(semanticdb-typecache-dump): don't need to refresh anymore.
+
+	* semantic-tag.el (semantic-tag-of-type-p):
+	If we don't know the type, use "".
+
+	* semanticdb-typecache.el (semanticdb-typecache-length): New fcn
+	(semanticdb-typecache-merge-streams): Fix type compare.
+
+2007-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache): Add a discard log
+	(semanticdb-debug-log): New class (TBU)
+	(semanticdb-typecache-merge-streams): Get 'prev' from the actual answer.
+
+2007-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache-apply-filename): New
+	(semanticdb-typecache-safe-tag-members): Call above.
+	(semanticdb-typecache::semanticdb-typecache-merge): Doc
+	(semanticdb-stream-to-typecache): Call `apply-filename' on the stream.
+	(semanticdb-table::semanticdb-typecache-update):
+	Name object with full filename.
+	(semanticdb-typecache-find): Now an overload method.
+	(semanticdb-typecache-find-default): Call a method on a semanticdb table.
+	(semanticdb-abstract-table::semanticdb-typecache-find-method):
+	Was `semanticdb-typecache-find'.  Now also tracks filenames and loads
+	them on demand.
+
+	* semantic-tag.el (semantic-tag-copy):
+	Adding the filename to the copy is now done
+	without side-effect.
+
+	* semanticdb-typecache.el (semanticdb-typecache-safe-tag-members):
+	New function.
+	(semanticdb-typecache-merge-streams): Make safe copies of tags.
+	Remove some messages.
+	(semanticdb-typecache::semanticdb-typecache-merge)
+	(semanticdb-stream-to-typecache): Make safe copies of referenced
+	streams of tags.
+	(semanticdb-table::semanticdb-typecache-update): Add recursion protection
+	(semanticdb-typecache-find): New method.
+	(semanticdb-typecache-dump): Force refresh for every dump.
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Add support for semanticdb find results.
+
+2007-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-typecache.el (semanticdb-typecache-merge-streams):
+	Namespace compare,
+	must be of class 'type
+	(semanticdb-abstract-table::semanticdb-typecache-update):
+	Remove messages.
+
+	* semanticdb-typecache.el (semanticdb-typecache):
+	New class for cache storage.
+	(semanticdb-abstract-table::semanticdb-have-typecache-p): New.
+	(semanticdb-typecache-merge): Now a method.
+	(semanticdb-typecache-merge-streams): Was -merge
+	(semanticdb-typecache::semanticdb-typecache-merge): Create an object
+	instead of just a stream.
+	(semanticdb-typecache-recursion-flag): New flag.
+	(semanticdb-typecache-update): Add anti-recursion loop for forcing
+	all tag lists to have tables made for them.
+	(semanticdb-typecache-dump): Dump an object, not a list.
+
+	* semanticdb-ref.el (semanticdb-refresh-references):
+	Add method for table baseclass.
+
+	* semanticdb-find.el (semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Flush typecache on include change too.
+	(semanticdb-find-test-translate-path): Refresh the tag list.
+
+	* semanticdb-ref.el (semanticdb-ref-test): Fix interactive specifier.
+	Fix buffer name.
+
+	* semantic-format.el (semantic-test-all-token->text-functions):
+	Deleted alias.
+
+	* semantic-tag-ls.el (semantic-tag-prototype-p, semantic-tag-prototype-p-default):
+	New
+	function.  Copied from semantic-analyze.
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Correctly detect semanticdb tables,
+	and get the tags properly.
+
+	* Makefile (tools_LISP): Add semanticdb-typecache.el
+
+	* Project.ede ("tools"): Add semanticdb-typecache.el
+
+	* semanticdb-typecache.el: Type information cache.
+
+	* semanticdb-find.el (semanticdb-find-search-index): Add typecache
+	(semanticdb-find-search-index::semanticdb-synchronize)
+	(semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Synchronization of the type-cache.
+
+2007-08-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-inherited-tags):
+	Allow errors to be thrown when
+	searching for parents so that successive searches will be ok.
+	(semantic-analyze-current-context-default): Make sure arguments are in
+	our list of local variables.
+
+	* semantic-ia.el: (semantic-ia-fast-jump)
+	(semantic-ia-show-doc): Use interactive "d" instead of "P".
+
+	* Makefile (tools_LISP): Add semanticdb-ref.el
+
+	* Project.ede ("tools"): Add semanticdb-ref.el
+
+	* semantic-lex.el (semantic-lex-catch-errors): No more message output.
+
+	* semantic-decorate-mode.el (semantic-decoration-on-unknown-includes-p-default):
+	Use `semantic-dependency-tag-file' instead of the table lookup.
+
+	* semanticdb-find.el (semanticdb-ref): New include
+	(semanticdb-find-search-index::semanticdb-synchronize)
+	(semanticdb-find-search-index::semanticdb-partial-synchronize):
+	Notify those who refer to us that they need their indicies reset.
+	(semanticdb-find-translate-path-includes-default):
+	Refresh our references.
+
+	* semanticdb-ref.el: Cross sematnicdb references.
+
+2007-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el (semantic-decoration-on-unknown-includes):
+	New face and decoration
+	mode.
+	(semantic-decoration-on-unknown-includes-p-default)
+	(semantic-decoration-on-unknown-includes-highlight-default): New.
+
+	* semantic-analyze.el (semantic-analyze-possible-completions-default):
+	Throw an error if the prefix text detected cannot be found.
+
+	* semanticdb-find.el (semanticdb-find-default-throttle): Add `local
+	(semanticdb-find-search-index) : New class
+	(semanticdb-find-search-index::semanticdb-synchronize)
+	(semanticdb-find-search-index::semanticdb-partial-synchronize): New
+	(semanticdb-find-translate-path-includes-default): Move contents to
+	an internal function.
+	Handle index caching of the include list instead.
+	(semanticdb-find-translate-path-includes--internal): New, from old -default.
+	(semanticdb-find-table-for-include-default): Don't initialize local
+	variable `roots' until it will most certainly be needed.
+
+	* semanticdb.el (semanticdb-default-find-index-class): New variable.
+	(semanticdb-abstract-table): Add index slot.
+	Add speculative slots for file and db references.
+	(semanticdb-abstract-search-index): New class.
+	(semanticdb-abstract-table::semanticdb-get-table-index): New method.
+	(semanticdb-abstract-search-index::semanticdb-synchronize)
+	(semanticdb-abstract-search-index::semanticdb-partial-synchronize)
+	(semanticdb-abstract-table::semanticdb-synchronize)
+	(semanticdb-abstract-table::semanticdb-partial-synchronize): New
+	(semanticdb-partial-synchronize-table): New
+	(semanticdb-synchronize-table): Call synchronize on the index.
+	(semanticdb-hooks): Add partial cache-change-hook.
+	(semanticdb-file-table-object): Don't ask about a refresh
+	if there is no table to ask.
+
+2007-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el: (Commentary)
+	(semantic-after-partial-cache-change-hook)
+	(semantic-change-function)
+	(semantic-edits-change-in-one-tag-p)
+	(semantic-edits-change-leaf-tag)
+	(semantic-edits-change-over-tags)
+	(semantic-edits-incremental-parser-1)
+	(semantic-edits-splice-insert): Replace occurances of `token' with
+	`tag' for new lingo.
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-stickyfunc-sticky-classes):
+	New setting.
+
+	* bovine/semantic-c.el (semanticdb-project-database-cscope::semanticdb-create-database):
+	New override method.  Add "this" always to method conetxt.
+
+	* semanticdb-cscope.el (semanticdb-project-database-cscope::semanticdb-create-database):
+	Create a single base table.
+
+	* semanticdb-cscope.el: Skeleton of CSCOPE support for semanticdb.
+
+2007-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (c++-mode::semanticdb-find-default-throttle):
+	Deleted.
+
+	* NEWS: Add various new items.
+
+2007-08-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Analyzer): Change around the menu
+	(Smart Completion): Add idle completion
+	(Smart Summary): Moved some items from completion.  Added
+	`semantic-ia-describe-class'.
+	(Smart Jump): New section.
+
+	* semantic-ia.el: (semantic-ia-describe-class)
+	(semantic-ia-fast-jump): Update doc.
+
+	* semantic-ia.el (semantic-ia-fast-jump):
+	Show buffer after jumping to tags
+	(semantic-ia-describe-class): Provide nice error on failed search.
+
+	* semantic-analyze.el (semantic-analyze-inherited-tags):
+	Only collect parent parts if the
+	parent was found.
+
+	* semantic-ctxt.el (semantic-get-all-local-variables-default):
+	Append the arguments and
+	the variables together.
+
+	* doc/semantic.texi: Update copyright lines.
+
+	* doc/app-dev-guide.texi (top): Fix inforef link.
+
+	* semantic-ia.el (semantic-ia-fast-jump): New command.
+	(semantic-ia-describe-class): New command.
+
+	* semantic-cb.el (semantic-cb-adebug): Fix free variable.
+
+	* semantic-util-modes.el (semantic-stickyfunc-header-line-format):
+	Use Emacs 22 magic found on emacswiki.
+
+	* semantic-cb.el (semantic-cb-adebug):
+	New command to debug the Class Browser object.
+
+	* semantic-adebug.el (semantic-adebug-insert-stuff-list-button):
+	Do not fill in the tooltip
+	for things that could be very large.
+
+2007-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate.el (semantic-tag-highlight-start-face, semantic-tag-highlight-face):
+	Remove these faces.
+	(semantic-decorate-int-to-hex, semantic-color-values-to-hex)
+	(semantic-pulse-iterations, semantic-lighten-highlight)
+	(semantic-highlight-reset-face, semantic-decorate-pulse)
+	(semantic-momentery-unhighlight-tag)
+	(semantic-decorate-test-pulse, semantic-momentary-highlight-pulse-flag):
+	Deleted.  Moved to pulse.el.
+	(pulse): New require
+	(semantic-momentary-highlight-tag[-line]):
+	Use pulse.el
+
+2007-07-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el (sgml-mode):
+	If it doesn't exist, try psgml-mode instead.
+
+2007-06-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Only do an EDE search for non-system
+	includes.
+
+2007-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate.el (semantic-momentary-highlight-pulse-flag):
+	Wrap logic on condition-case.
+
+	* wisent/Makefile (VERSION): Regress to 2.0 prerelease 4
+
+	* tests/testsubclass.hh (deer::alces):
+	Updated for testsubclass.cpp changes.
+
+	* tests/testsubclass.cpp (animal::moose::doNothing):
+	Add some completable code.
+	(deer::alces::doLatinStuff): Add args and such.
+	(deer::alces::createMoose): New test fcn for completion engine.
+
+	* tests/Makefile, doc/Makefile (VERSION): Regress to 2.0 prerelease 4
+
+	* doc/lang-support-guide.texi (Tag Structure):
+	Add description of ATTRIBUTES.  Fix names property
+	accessor functions.
+
+	* bovine/Makefile (VERSION): Regress to 2.0 prerelease 4
+
+	* semantic-sort.el (semantic-tag-external-member-parent-default):
+	Remove iff
+
+	* semantic-lex-spp.el: Add ToDo item.
+
+	* semantic.el (semantic-version): Regress to 2.0 pre 4.
+	(Commentary): Update doc.
+
+	* Project.ede ("semantic"): Regress version to prerelease 4.
+
+	* Makefile (VERSION): Regress to 2.0 prerelease 4
+
+2007-06-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-inline-exit):
+	Restore original window configuration
+	(semantic-complete-inline-tag-engine): Store window configuration
+	(semantic-complete-inline-analyzer-displayor-class): New option.
+	(semantic-complete-inline-analyzer): Create a display based on the above.
+
+2007-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-default-throttle): Add 'unloaded.
+
+2007-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/installation.texi (Canned Configuration):
+	Update code-helpers w/ MRU bookmarks
+
+	* doc/minor-modes.texi (Code Helpers): Addd below
+	(MRU Bookmarks Mode): New node on new minor-mode.
+
+	* semantic-load.el (semantic-load-enable-code-helpers):
+	Add semantic-mru-bookmark-mode.
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-get-ebrowse-structure):
+	Update doc
+	(semanticdb-project-database-ebrowse::semanticdb-create-database): Add c-mode
+	(semanticdb-ebrowse-dump): Use adebug.
+
+	* Makefile (tools_LISP): Add semantic-mru-bookmark.el
+
+	* Project.ede ("semantic"): Add semantic-mru-bookmark.el
+
+	* semantic-mru-bookmark.el (semantic-mru-bookmark-mode): Update doc.
+
+	* semantic-decorate.el (semantic-momentary-highlight-pulse-flag):
+	New option.
+	(semantic-momentary-highlight-one-tag-line)
+	(semantic-momentary-highlight-tag): Only pulse based on option.
+
+2007-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testspp.c: Added sections for:
+	#if defined
+	#elif
+	#else
+	for macro parsing testing.
+
+	* bovine/c.by (DEFINE, UNDEFINE): Removed.
+	(define): Fix default value to correct token.
+
+	* bovine/semantic-c.el (semantic-c-end-of-macro): Moved.
+	(semantic-lex-cpp-define): Move end point to the end of the macro.
+	(semantic-c-skip-conditional-section): New function
+	(semantic-lex-c-if): Skip only subsets of a #if section.
+	Add warnings when we skip.
+	(semantic-lex-c-macrobits): Remove if handling.
+	(semantic-lex-c-macro-else): New lexer.
+	(semantic-c-lexer): Add semantic-lex-c-macro-else.
+
+	* semantic-lex-spp.el (define-lex-spp-macro-declaration-analyzer):
+	Support shifting lex-end-point.
+	(edebug-setup-hook): Add edebug knowledge about these new macros.
+
+	* semantic.el (semantic-clear-toplevel-cache): Clear parser warnings
+	(semantic-fetch-tags): Keep parser warnings during full parse.
+	(semantic-parser-warnings): New local variable
+	(semantic-clear-parser-warnings, semantic-push-parser-warning)
+	New functions
+	(semantic-dump-parser-warnings): New Command
+
+2007-05-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-add-preprocessor-symbol):
+	Allow resetting of values in the
+	C list.
+
+	* semantic-lex-spp.el (semantic-lex-spp-symbol-set):
+	Treat value of "" as nil.
+	(semantic-lex-make-spp-table): Pass value directly to new symbol.
+
+	* bovine/c.by (__ATTRIBUTE__): New symbol
+	(opt-attribute): Optional gcc attribute thingy.
+	(type,fun-or-proto-end): Use opt-attribute
+
+2007-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el (document):
+	Stop requiring this.  Causes fail in Makefile build.
+
+	* semantic-fw.el (semantic-subst-char-in-string): Remove sample impl.
+	Moved to cedet-compat.
+
+	* semanticdb-file.el (cedet-files): New requirement.
+	(semanticdb-dir-sep-char): Moved to here.
+	Marked for later deletion.
+	(semanticdb-fix-pathname): Moved to here.
+	Replaced body w/ `file-name-as-directory'.
+	Marked for later deletion.
+	(semanticdb-project-database-file::semanticdb-file-name-directory):
+	Replace inner path conversion to a call to `semanticdb-file-name-directory'.
+
+	* semanticdb.el (semanticdb-dir-sep-char, semanticdb-fix-pathname):
+	Moved.
+
+2007-05-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate.el (semantic-tag-highlight-start-face, semantic-tag-highlight-face):
+	New faces.
+	(semantic-decorate-int-to-hex, semantic-color-values-to-hex):
+	New fcns copied from Drew Adams.
+	(semantic-pulse-iterations): New configurable variable.
+	(semantic-lighten-highlight, semantic-highlight-reset-face):
+	(semantic-decorate-pulse, semantic-decorate-test-pulse):
+	New core color pulsing functions
+	(semantic-highlight-tag): Change default face
+	 to 'semantic-tag-highlight-face.
+	(semantic-momentary-highlight-one-tag-line)
+	(semantic-momentary-highlight-tag): Use tag pulsing if no face is provided.
+
+	* doc/installation.texi (Installation):
+	New name.  Many new sections w/ basic configuration advice.
+
+	* doc/user-guide.texi (Semanticdb Search Configuration):
+	Add ref to ebrowse.
+	(Search Throttle): Add example.
+
+	* doc/semantic.texi (top): Copyright
+	(Installation/Basic Configuration): New name.
+
+	* semantic-adebug.el (semantic-adebug-insert-property-list, semantic-adebug-insert-stuff-list):
+	Add autoload cookie.
+
+2007-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-select-best-tag):
+	Prefer tags w/ type info.
+
+	* bovine/semantic-c.el (semantic-lex-c-if):
+	Support #if defined() type syntax.
+
+	* tests/testspp.c:
+	Add #if defined() and #if !defined() macros for testing SPP.
+
+	* semantic-tag.el (semantic-tag-with-position-p):
+	If it has an overlay, it must be live.
+
+	* bovine/semantic-c.el (semantic-c-add-preprocessor-symbol):
+	New command.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Add todo comment.
+
+	* semantic-load.el (semantic-load-enable-minimum-features): doc fix.
+
+	* semantic-dep.el (semantic-add-system-include, semantic-remove-system-include):
+	Force passed in dirs to be directory names.
+	(semantic-reset-system-include): New command
+
+	* semanticdb-find.el (semanticdb-find-load-unloaded-default):
+	Fix varname typo!
+	(semanticdb-find-test-translate-path,semanticdb-brute-deep-find-tags-for-completion):
+	Add autoload cookies.
+
+	* semanticdb-file.el (semanticdb-project-database-file::semanticdb-save-db):
+	Make robust to various types of errors that may occur.
+
+	* semanticdb.el (semanticdb-dump-all-table-summary):
+	Convert to use adebug.
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-C-file-p):
+	make robust to itty-bitty files
+	(semanticdb-create-ebrowse-database): Force / to tail of dir names.
+	(semanticdb-ebrowse-get-ebrowse-structure): Turn off undo.
+
+2007-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi:
+	Add new section about configuring semanticdb search routines.
+
+2007-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-mru-bookmark.el (semantic-mrub-completing-read):
+	Fix case of only one entry in ring.
+	(set-mark-command): Advise better function.
+
+	* semantic-mru-bookmark.el: New bookmark/mru tag mode.
+
+	* semantic-tag.el (semantic-tag-copy): Enhance doc string.
+
+	* semantic-adebug.el (semantic-adebug-insert-tag-parts):
+	Make tag start/end display more robust.
+	(semantic-adebug-insert-ring-contents)
+	(semantic-adebug-insert-ring-items-from-point)
+	(semantic-adebug-insert-ring-button): New ring debug support.
+	(semantic-adebug-insert-thing): Add rings.
+	(semantic-adebug-analyze): Fix buffer name.
+	(semantic-adebug-edebug-expr): New command to be bound into EDEBUG support.
+
+	* semantic-adebug-eieio.el (semantic-adebug-insert-object-fields):
+	Add autoload cookie.
+
+2007-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-do-completion):
+	Support 'displayend option.
+	Use exactmatch completion list if we have it, otherwise the full list.
+	If displayend, then always use the fulll list.
+	(semantic-complete-next-action): Allow displayor and collector to both
+	have a say.
+	(semantic-collector-abstract::semantic-collector-next-action):
+	When the exact-match list is 1 long, but there are lots of regular
+	completions, then don't say done on second matching keystroke.
+	(semantic-displayor-focus-abstract::semantic-displayor-next-action):
+	When the focus cycles, return 'displayend.
+
+2007-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Tag Hooks): Added unlink-copy-hook.
+	(Creating Tags): Updated semantic-tag-copy w/ unlink-copy-hook.
+
+	* semantic-decorate.el (semantic-tag-create-secondary-overlay):
+	Add an unlink-copy-hook.
+	(semantic--tag-unlink-copy-secondary-overlays): New function
+	(semantic--tag-unlink-secondary-overlays): Remove unlink-copy-hook.
+
+	* semantic-tag.el (semantic-tag-copy):
+	Run unlink-copy-hook on the copied tag.
+	Added comments a bout trying to do special copy things to the tag members.
+
+2007-04-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Save point location when calculating a
+	filename for a given include tag.
+
+2007-03-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semantic-adebug): Remove requirement.
+
+	* semantic-adebug.el (semantic-adebug-new-buffer): autoload cookie.
+
+2007-03-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (require): Add semantic-adebug during compile
+	(semanticdb-find-table-for-include-default): Take out special stuff
+	for omniscient databases.  Simplify case where we know where the file is.
+	(semanticdb-find-test-translate-path): Convert to use adebug.
+
+	* semanticdb-find.el:
+	(semanticdb-strip-find-results, semanticdb-find-results-p)
+	(semanticdb-find-result-with-nil-p)
+	(semanticdb-find-reslut-nth, semanticdb-find-result-nth-in-buffer):
+	Add autoload cookie.
+
+2007-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-throttle-custom-list):
+	Add autoload cookie.
+	(semanticdb-find-result-prin1-to-string): Fix doc.
+
+2007-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Analyzer): Update various command strings.
+	(Smart Idle Completion): new section
+
+	* semanticdb.el: Add comment.
+
+	* semanticdb-ebrowse.el (semanticdb-project-database-ebrowse):
+	Doc update.
+
+	* semantic-adebug.el (semantic-adebug-bovinate): Doc updates.
+
+	* doc/app-dev-guide.texi: (top)
+	(Tag Sorting)
+	(Tag Completion Convenience Functions)
+	(Custom Tag Completion Functions)
+	(Tag Collectors)
+	(Tag Displayors)
+	(Old Tag Completion)
+	(Override Methods)
+	(Format Tag)
+	(Tag Members)
+	(Tag Details)
+	(Parser Hooks)
+	(Semanticdb in Programs)
+	(DB Results)
+	(DB Basic Name Search)
+	(DB Basic Brute Search)
+	(DB Advanced Search)
+	(DB Generic Brute Search)
+	(System Databases)
+	(Blocks)
+	(Local Variables)
+	(Derived Context)
+	(Context Analysis)
+	(Analysis Overview): Update @defun's from source.
+	(App Debugger): New Section
+
+	* semantic-complete.el: (semantic-collector-abstract)
+	(semantic-collector-buffer-abstract)
+	(semantic-collector-buffer-deep)
+	(semantic-collector-project-abstract)
+	(semantic-displayor-abstract)
+	(semantic-displayor-traditional)
+	(semantic-displayor-traditional-with-focus-highlight)
+	(semantic-complete-read-tag-analyzer)
+	(semantic-complete-inline-analyzer): Doc Enhancements.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (LOADPATH): Strip out duplicates
+	(wy_SEMANTIC_GRAMMER_EL, dist): Spelling fix
+
+	* bovine/Makefile (LOADPATH): Remove duplicates
+	(by_SEMANTIC_GRAMMAR_EL,dist): Spelling fix.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar::ede-proj-makefile-insert-variables):
+	Use `ede-proj-makefile-insert-loadpath-items'.
+
+	* Makefile (LOADPATH): Remove duplicates
+
+	* Makefile (metagrammar_SEMANTIC_GRAMMAR_EL, dist): Spelling fix.
+	(tools_LISP): Add adebug files.
+
+	* Project.ede ("tools"): Add adebug files.
+
+	* semantic-analyze.el (semantic-analyze-possible-completions-default):
+	:operator-flag.
+
+	* bovine/semantic-c.el (semantic-c-reconstitute-token):
+	Add an operator-flag
+
+	* semantic-analyze.el (semantic-analyze-possible-completions-default):
+	Revamp raw results
+	stripping.  Strip operators, destructor/constructor.
+
+	* semantic-adebug.el (semantic-adebug-insert-find-results-from-point):
+	Remove 'parent'.
+
+	* semantic-adebug-eieio.el: Adebug support for EIEIO objects.
+
+	* semantic-adebug.el: Basic debugger for Semantic data structures.
+
+2007-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Tag Attributes Internals, Tag Properties Internals):
+	Fix @dots.
+	Delete duplicates.
+
+	* semanticdb-system.el (semanticdb-project-database-system::semanticdb-load-system-database):
+	use oref-default for major-modes.  Thanks Jamie Macbeth.
+
+	* document.el (document-texify-elisp-docstring): Fix @dots replacement.
+
+2007-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-reconstitute-token):
+	Use `semantic-tag-new-type'
+	when fabricating the :type of a constructor.
+
+2007-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el (document-texify-elisp-docstring):
+	Fix byte-comp found warning.
+
+	* document.el (document-massage-to-texinfo):
+	Do not @var the variable 'a'.
+	(document-texify-elisp-docstring): Add @dots.
+
+	* doc/tags.texi (Tag Basics): Added a few extra blurbs.
+	(Tag Query): Rearranged, sorted, added subsections.
+	(Tag Overlay, Tag Hooks, Misc Tag Functions,Tag Attributes Internals)
+	(Tag Properties Internals,Tag Overlay Internals,Creating Tags):
+	Updated doc of @defuns from the source.
+
+	* bovine/semantic-c.el (c-mode::semantic-format-tag-type): Move fcn.
+	Do not print 'class' if the type is of type class.
+
+	* semantic-format.el (semantic-test-all-format-tag-functions):
+	Add argument.
+	Universal argument now prints the text w/out color.
+	(semantic-format-tag-type-default): Obey the color argument.
+
+	* semantic-tag.el:
+	(semantic-tag-name, semantic-tag-overlay, semantic-equivalent-tag-p)
+	(semantic-tag-of-type-p, semantic-tag-new-variable)
+	(semantic-tag-new-function, semantic-tag-new-type)
+	(semantic-tag-new-include,semantic-tag-new-package,
+	semantic-tag-new-code,semantic-tag-modifiers,semantic-tag-include-filename)
+	(semantic-tag-components,semantic-narrow-to-tag):
+	Updated doc strings with more details.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi):
+	Use a deep search to find fcns
+	within a document.
+	(semantic-texi-update-doc-from-source)
+	(semantic-texi-goto-source): Use `semanticdb-with-match-any-mode' and
+	a brutish deep search.
+
+	* semanticdb.el (semanticdb-match-any-mode): New variable
+	(semanticdb-with-match-any-mode): New macro
+	(semanticdb-equivalent-mode-for-search): Obey semanticdb-match-any-mode.
+
+	* semantic-tag.el (semantic-tag-file-name): Update doc.
+
+2007-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-tag-type):
+	When finding a tag for a type,  ask for
+	only tags that are class 'type.
+	(semantic-analyze-possible-completions-default): When matching name
+	matching completions loop over each one, and validate the type name is
+	the same, or that the symbol is a compound type.  Compound type
+	detection is now looked up.  (Thanks Jamie Macbeth.)
+
+2007-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-project-database-emacs-lisp::semanticdb-get-database-tables):
+	Nicer name.
+	(semanticdb-project-database-emacs-list::semanticdb-find-translate-path):
+	Delete.
+	(semanticdb-table-emacs-lisp::semanticdb-equivalent-mode): Doc fix.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	Always append
+	omniscient system databases to our load path.
+	(semanticdb-find-load-unloaded): New override function for loading in
+	a database that is currently not in any databases.
+	(semanticdb-find-table-for-include-default): Use above.
+
+2007-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/wisent.texi:
+	(Grammar format, Compiling a grammar, Conflicts, Iterative style)
+	(Bison style): Minor language changes.
+
+	* bovine/c.by (opt-template-equal): Support =SYM and not just =<SYM>
+	(func-decl): Add support for arg-listless function that has a TRY
+	at the end.
+	(fun-or-proto-end): Use fun-try-end.
+	(fun-try-end): new for try blocks.
+	(fun-try-several-catches): Multiple stacked catch blocks after a try.
+	(function-call): Add more function call options.
+
+	* bovine/semantic-el.el (semantic-elisp-form-to-doc-string):
+	Add TODO comment about Lisp.
+
+	* semantic-ede-grammar.el:
+	(semantic-ede-proj-target-grammar::ede-proj-makefile-insert-variables)
+	(semantic-ede-proj-target-grammar::ede-proj-makefile-insert-dist-dependencies):
+	Fix spelling error of SEMANTIC_GRAMMAR_EL.  Thanks Tetsurou Okazaki.
+
+	* semantic-lex.el (define-lex):
+	Override `parse-sexp-lookup-properties' so that
+	text properties can't screw up our modified syntax table.
+
+	* tests/test.py: Added test cases for implicity joining.
+
+	* wisent/wisent-python.wy (function_parameter_list, paren_class_list):
+	Set wisent-python-EXPANDING-block to t when expanding the sub-block.
+
+	* wisent/wisent-python.el (wisent-python-EXPANDING-block):
+	New lexical state variable.
+	(wisent-python-implicit-line-joining-p): Use above, no searching.
+	(wisent-python-end-of-block): Fix doc string.
+
+	* INSTALL: Fix counting.
+
+	* semantic-load.el (noninteractive):
+	Do not load minimum features by default.
+
+2007-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-dereference-metatype): Moved
+	(semantic-analyze-type-parts): Moved.
+	(semantic-analyze-select-best-tag): New fcn
+	(semantic-analyze-find-tag): Replace comple mess at end w/
+	`semantic-analyze-select-best-tag'.
+	(semantic-analyze-tag-type): Replace FIXME comment with
+	`semantic-analyze-select-best-tag'.
+	(semantic-analyze-find-tag-sequence): Replace `should be smarter'
+	comment with `semantic-analyze-select-best-tag'.
+	Replace `semantic-find-first-tag-by-name' with the plural version.
+	Replace "should be smarter" comment with
+	`semantic-analyze-select-best-tag'.
+
+	* bovine/c.by (typesimple):
+	Class/struct w/ no body is considered a prototype.
+
+2007-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (semanticdb-create-ebrowse-database):
+	Load file should use the helper.
+	(semanticdb-load-ebrowse-caches): Remove comments
+	(semanticdb-ebrowse-load-helper): New function.  Check for obsolete files.
+
+	* semantic-ia.el (semantic-ia-complete-symbol-menu):
+	Use senator if semantic gets nothing.
+
+	* semantic-analyze.el (semantic-analyze-dereference-metatype):
+	Add scope argument, pass down.
+	(semantic-analyze-tag-type): Add scope argument, pass down.
+	(semantic-analyze-find-tag-sequence): Pass scope through to above.
+	(semantic-analyze-scoped-tags): For any namespace, search for all
+	other occurances and merge.
+
+	* bovine/semantic-c.el (c-mode::semantic-analyze-dereference-metatype):
+	Add scope argument.
+
+	* semantic-complete.el (semantic-complete-self-insert):
+	Handy function for doing completion
+	when typing in a key that needs to insert itself.
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-add-tree-to-table):
+	Fixed bugs found when run
+	against C files.
+
+2007-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (semanticdb-ebrowse-file-match): New variable
+	(semanticdb-ebrowse-C-file-p): New predicate
+	(semanticdb-create-ebrowse-database): Use new predicate instead of old code.
+
+2007-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (comments): Deleted
+	(semanticdb-table-ebrowse::semanticdb-find-tags-by-name-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-by-name-regexp-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-for-completion-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-external-children-of-type-method):
+	Updated various to describe new methods.
+
+	(jvebrowse-find, fvebrowse-find2, jvebrowse-find-name): Deleted
+
+	* semanticdb-ebrowse.el (ebrowse):
+	Add eval-and-compile to fix byte-comp warnings.
+	(semanticdb-project-database-ebrowse): Remove the 'globals' slot.
+	(semanticdb-project-database-ebrowse::semanticdb-create-database):
+	Track default-directory.  Don't track the 'globals'.
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-strip-trees):
+	New function
+
+	(semanticdb-ebrowse-strip-tables)
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-add-etree-to-table)
+	(semanticdb-table-ebrowse::semanticdb-file-table-add)
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-extract-globals)
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-extract-globals-from-sublist):
+	Deleted
+
+	(semanticdb-normalize-tag): Renamed.
+	(semanticdb-table-ebrowse::semanticdb-get-tags): Deleted.
+	(semanticdb-ebrowse-add-globals-to-table): New fcn
+	(semanticdb-ebrowse-add-tree-to-table): New fcn
+
+
+	(semanticdb-table-ebrowse::semanticdb-ebrowse-find-tags-by-name-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-by-name-regexp-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-for-completion-method)
+	(semanticdb-find-tags-by-class-method)
+	(semanticdb-table-ebrowse::semanticdb-find-tags-external-children-of-type-method):
+	Revamped to use `call-next-method'.
+
+	* semanticdb-find.el (eieio): Add require
+	(semanticdb-find-translate-path-brutish-default):
+	Use `semanticdb-equivalent-mode-for-search'.
+	Only get the baseDB's dir if there is a base DB.
+	(semanticdb-find-translate-path-includes-default):
+	Use `semanticdb-equivalent-mode-for-search'.
+	(semanticdb-find-table-for-include-default):
+	Revamp how explicitly identified file's tables are loaded to also
+	go through system style databases, if available.
+	Obey the 'unloaded' throttle as well.
+	(semanticdb-strip-find-results): Use 'semanticdb-normalize-tags'.
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-normalize-tags):
+	Add method.
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-normalize-tags):
+	Change name.
+	Takes and returns a list.
+	(semanticdb-equivalent-mode-for-search): New function.
+	Allows some modes to search in any other modes buffers.
+
+	* semantic-ctxt.el (semantic-command-separation-character):
+	Add autoload cookie.
+
+	* semantic-complete.el (semantic-complete-inline-force-display):
+	Add autoload cookie.
+
+	* wisent/wisent.el (wisent-char-p): Fix byte-comp warnings.
+
+	* wisent/wisent-debug.el (wisent-debug-pp-to-string):
+	Fix byte-comp warning.
+
+	* wisent/wisent-comp.el (wisent-check-$N): Use string-to-number.
+
+	* bovine/semantic-java.el (semantic-doc): add require
+	(semantic-java-expand-tag): Add a variable to a let statement.
+
+	* bovine/semantic-el.el (emacs-lisp-mode::semantic-documentation-for-tag):
+	Use documentation-property as documented.
+
+	* bovine/semantic-c.el (semantic-lex-c-if):
+	Remove erroneous debug message.
+	(semantic-c-end-of-macro): Remove byte-comp warning.
+
+	* bovine/semantic-bovine.el: Doc fix.
+	(bovine-debug): Add require
+	(semantic-bovinate-nonterminal-check-obarray): Add autoload cookie.
+
+	* bovine/erlang-edoc.el (document-vars): Add require
+	(erlang-edoc-type-spec, erlang-edoc-desc-spec): Add customize group.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-form):
+	Use string-to-number
+	(bovine-grammar-parsetable-builder): Fix format string.
+
+	* senator.el (semanticdb-find): add require.
+
+	* semantic-util-modes.el (semantic-stickyfunc-indent-string):
+	Add to customize group.
+
+	* semantic-util.el (semantic-assert-valid-token):
+	Fix a message w/ not enough arguments.
+
+	* semantic-tag-file.el:
+	Remove ede require.  It had some wierd byte-comp issues.
+
+	* semantic-sb.el (semantic-sb-detail-parent): Use string-to-number.
+
+	* semantic-lex.el (semantic-flex):
+	Add noisy message to encourage conversion.
+
+	* semantic-imenu.el: Add some autoload cookies.
+
+	* semantic-html.el (semantic-default-html-setup):
+	Fix typo for imenu support.
+
+	* semantic-fw.el (string-to-number): Add alias if we have an old emacs.
+
+2007-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (ede): Require in EDE during byte-comp.
+
+	* semantic-tag.el (semantic--tag-expand):
+	Explain why there is a byte-comp warning.
+
+	* semantic-grammar.el (semantic-idle): Add require.
+	(semantic-grammar-mode::senator-add-log-tags): Use newer name.
+
+	* semantic-fw.el (semantic-alias-obsolete):
+	Do not throw warning if within the CEDET
+	tool suite.  I have to use those fns for compatibility issues.
+
+	* semantic.el (semantic): Add semantic group to 'lisp' group.
+
+	* semantic-edit.el (semantic-edits-verbose-flag): Add autoload cookie.
+
+	* semantic-dep.el (semantic--dependency-find-file-on-path):
+	Add autoload cookie.
+
+	* semantic-decorate.el (semantic-momentary-highlight-one-tag-line):
+	Use semantic-make-overlay.
+
+	* semantic-complete.el (semanticdb-find):
+	Require it.  Fix byte-comp warnings
+	(minibuffer-contents): Fix byte-comp warnings
+
+	* document.el (ede): Try to get it loaded for byte-comp.
+	(document-get-date-time-string): Use string-to-number
+
+2007-02-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (semanticdb-create-ebrowse-database):
+	Expand the dirname
+	(semanticdb-ebrowse-file-for-directory): Expand the dirname
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-add-etree-to-table):
+	Formatting change.
+
+	* semanticdb.el (semanticdb-current-database-list):
+	Remove erroneous test before
+	including a DB.
+	(semanticdb-kill-hook): Doc fix.
+	(semanticdb-file-table-object): Add dontload argument.
+
+2007-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-grammar-batch-build-packages):
+	Add msg when batch compiling
+	to debug the source of the compiler function.
+
+	* semantic-load.el (compat vars):
+	Do not use compatibility variables in batch mode.
+
+	* wisent/wisent-java-tags.wy (unicode):
+	Quote in the \ for the syntax regexp.
+
+2007-02-08  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.wy (<unicode>):
+	add missing `syntax' property.
+	(epilogue): Replace `wisent-java-tags-unicode-analyzer'
+	declaration by auto-generated declaration of
+	`wisent-java-tags-wy--<unicode>-regexp-analyzer'.
+
+2007-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-java-tags.wy (wisent-java-tags-unicode-analyzer):
+	New lexical analyzer.
+	(wisent-java-tags-lexer): Added unicode support.
+
+2007-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el (semantic-ia-complete-symbol):
+	Fix case when the context's prefix
+	is a tag, not a string.
+
+2007-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-abstract-table::semanticdb-normalize-tag):
+	Changed the baseclass this derives from.
+
+2007-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede (tools): Added semantic-utest.el
+
+	* Makefile (tools_LISP): Added semantic-utest.el
+
+	* tests/test.cpp (class3::method1_for_class3, namespace1, funny_prototype):
+	Added various features for testing code the analyzer.
+
+	* doc/tags.texi (Tag Query):
+	Add semantic-tag-type-compound-p and semantic-tag-faux-p.
+
+	* semantic-utest.el (semantic-utest-Python-buffer-contents):
+	Change from setq to defvar.
+
+	* semantic-format.el (semantic-format-tag-uml-protection-to-string-default):
+	Copy our protection strings so fonts that are applied don't change
+	the original stored string.
+
+2007-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-merge-namespaces):
+	New function.
+	(semantic-analyze-find-tag): Merge namespaces if a tag found is a namespace.
+
+	* tests/testsubclass.cpp, tests/testsubclass.hh (deer::alces):
+	Adding new namespace and class for testing this case in
+	the analyzer.
+
+2007-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-inherited-tags):
+	Child classes can see protected
+	memebers of parents.
+
+	* bovine/semantic-c.el (c-mode::semantic-analyze-split-name):
+	Use older interface to split-string.
+
+	* semantic-format.el (semantic-format-tag-prototype-default):
+	Remove display of a compound
+	type's contents.  Big and messy.
+
+	* tests/testsubclass.hh, tests/testsubclass.cpp:
+	Test case for subclasses in C++ for the semantic analyzer.
+
+	* bovine/semantic-c.el (c-mode::semantic-analyze-split-name):
+	New implementation for C.
+
+	* semantic-analyze.el (semantic-analyze-split-name):
+	New overload function.
+	(semantic-analyze-find-tag): Test if NAME is splittable.
+	Use alternate lookup method if it is.
+	(semantic-analyze-find-tag-sequence): Handle the case if the first
+	entry in the sequence is a type we can use directly.
+
+2007-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-utest.el: Unit tests.
+
+2007-01-23  David Ponce  <david@dponce.com>
+
+	* wisent/semantic-wisent.el (wisent-parse-stream):
+	Signal when wisent-parse-max-stack-size
+	might need to be increased.
+
+2007-01-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/testspp.c: Test various states of SPP lexing.
+
+	* bovine/c.by (BOOL): New token for C++.  Sadly, also added for C.
+	(macro, macro-or-include, define): Use new SPP token symbols.
+	(builtintype-types): Added BOOL.
+
+	* bovine/semantic-c.el (semantic-lex-spp): new requirement
+	(semantic-lex-c-preprocessor-symbol-map): Change the customize format.
+	(semantic-lex-c-preprocessor-dynamic-symbol-map)
+	(semantic-lex-c-preprocessor-p, semantic-lex-c-define)
+	(semantic-lex-c-preprocess-replace-or-symbol-or-keyword)
+	(semantic-lex-c-if-0, semantic-lex-c-if): Deleted.
+	(semantic-lex-cpp-define, semantic-lex-cpp-undef)
+	(semantic-lex-c-if, semantic-lex-c-macrobits): New functions
+	(semantic-c-lexer): Use SPP instead of previously hacked preprocessor stuff.
+	(c-mode::semantic-dependency-system-include-path):
+	(semantic-default-c-path): New value is nil.
+	(semantic-dependency-system-include-path): New variable
+	(semantic-default-c-setup): Add the SPP reset hook.
+
+	* semantic-lex.el (semantic-lex-reset-hooks): new variable.
+	(define-lex): Call the lexical reset hooks.
+
+	* semantic-lex-spp.el (semantic-lex-spp-reset-hook):
+	New function to use as a hook.
+	(semantic-lex-spp-describe): Improve the layout a little.
+
+	* semantic-lex-spp.el (semantic-lex-spp-reset-dynamic-table): New fcn.
+
+	* semanticdb-ebrowse.el (semanticdb-table-ebrowse::semanticdb-find-tags-by-name-method):
+	Remove message.
+	(jvebrowse-find2): Add comment about last fix.
+
+	* semantic-format.el (semantic-format-tag-name-from-anything):
+	If anything is a tag, and that tag has no name, then use the type
+	of the tag instead.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	When using
+	semanticdb to find tags in a table, use the method, not the generic
+	search term.  This avoids recursion.
+
+2007-01-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (semanticdb-create-ebrowse-database):
+	Fix post loading of a created
+	EBROWSE file.
+
+2007-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el (ebrowse): Catch errors while loading.
+	(semanticdb-table-ebrowse): Add 'global-extract' slot.
+	(semanticdb-project-database-ebrowse): Remove 'mytables' slot.
+	Add a 'globals' slot.
+	(semanticdb-get-database-tables): Deleted
+	(semanticdb-ebrowse-get-ebrowse-structure): Block ebrowse from
+	displaying a progress bar.
+	(semanticdb-project-database-ebrowse::semanticdb-create-database):
+	Search for globals.  Apply globals to constructed tables.
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-strip-tables):
+	Find globals.
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-add-etree-to-table):
+	Use `semanticdb-create-table' to construct new tables.
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-extract-globals)
+	(semanticdb-project-database-ebrowse::semanticdb-ebrowse-extract-globals-from-sublist)
+	(semanticdb-project-database-ebrowse::semanticdb-normalize-tag)
+	New methods.
+	(semanticdb-table-ebrowse::semanticdb-equivalent-mode)
+	(semanticdb-table-ebrowse::semanticdb-find-translate-path):
+	Deleted methods.
+	(semanticdb-table-ebrowse::semanticdb-find-tags-by-name-method):
+	Better doc.
+	Constructed tags are marked as 'faux', since they are not tightly
+	bound to the buffer.
+
+	* semantic-load.el (semantic-load-enable-minimum-features):
+	Add support for loading in ebrowse caches.
+	No ebrowse cache loading on XEmacs.
+
+	* semantic-dep.el (semantic--dependency-find-file-on-path):
+	Add autoload cookie.
+	Mmm... cookies.
+
+	* semanticdb-find.el (semanticdb-strip-find-results):
+	Allow each table in which a match was found to convert the found
+	tags into something better.
+
+	* semanticdb.el (semanticdb-table::semanticdb-normalize-tag):
+	New method.
+
+	* semantic-analyze.el (semantic-analyze-current-context-default):
+	Don't do scope analysis if there are no bounds to a symbol to analyze
+	later.
+
+2007-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords):
+	Add two spp lexical macros.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-stream):
+	Use `semantic-lex-token-end' and
+	`semantic-lex-token-start' instead of directly referencing into the
+	lexical tokens w/ car and cdr.
+
+2007-01-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el (semantic-lex-spp-describe):
+	Fix compiler warning.
+
+	* semantic-lex.el (semantic-lex-keyword-symbol): Update doc.
+	(semantic-lex-test): Add timing information
+	(semantic-lex-token): Allow an optional string to be added to a token.
+	(semantic-lex-token-bounds): If a token has a string (it's a macro),
+	then bounds are in a different place.
+	(semantic-lex-token-start): When a token contains a string return that
+	instead of extracting the string from the current buffer.
+
+	* semantic-lex-spp.el (semantic-lex-make-spp-table):
+	Fix some argument calls.
+
+	* Makefile (semantic_LISP, tolls_lisp): Added new files.
+
+	* Project.ede: Add semantic-dep.el and semanticdb-ebrowse.el
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	Fix reference to
+	list of tables.
+	(semanticdb-find-translate-path-includes-default):
+	When recursing into dependency files for more dependencies, do a
+	semanticdb specific search if the found table is based on semanticdb.
+	(semanticdb-find-test-translate-path): Be robust to tables that do no
+	provide a raw list of tags.
+
+	* semantic-decorate.el (semantic-momentary-unhighlight-one-tag-line):
+	Fix doc.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Move some parts to semantic-dep.el.
+	Use routines in semantic-dep.el.
+
+	* semantic-dep.el: Functions for dependency lookup (include tags).
+	Contains the search path that was in semantic-tag-file.
+
+	* semanticdb-ebrowse.el (semanticdb-create-ebrowse-database):
+	Added autoload tag.
+	Force load of created loader file.
+	(semanticdb-ebrowse-database-list): deleted.
+	(semanticdb-project-database-ebrowse): Remove tracking symbol.
+	Add system-include-p flag.
+	(c++-mode::semanticdb-find-default-throttle): Change to `project system recursive'.
+	(semanticdb-project-database-ebrowse::semanticdb-create-database):
+	Recycled ebrowse database objects that are pointing at the same place.
+	(semanticdb-project-database-ebrowse::semanticdb-file-table):
+	Search the table list with only the filename.
+
+2007-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-table-emacs-lisp::semanticdb-find-tags-by-name-method):
+	Fix a typeo.
+
+	* semantic-edit.el (semantic-edits-change-over-tokens):
+	When searching end-of-buffer tags
+	for hits, do not compare against next tag unless there is a next tag.
+
+2007-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el: Merge in changes from Joakim Verona.
+	Updated commentary.
+	(semanticdb-create-ebrowse-database, semanticdb-load-ebrowse-caches):
+	New user functions for setting up databases.
+	(semanticdb-needs-refresh-p): New JV * EL.
+	(semanticdb-ebrowse-file-for-directory): new utility.
+	(semanticdb-ebrowse-database-list): Local tracker variable.
+	(*): Updates from JV.
+
+2006-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Remove the kill/restart of the
+	idle timer.
+
+2006-08-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate.el: (semantic-momentary-highlight-one-tag-line)
+	(semantic-momentary-unhighlight-on-tag-line): New fcns
+	(semantic-momentary-highlight-tag): If a tag has no overlay,
+	use above.
+
+2006-07-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-find-tag-for-completion):
+	Add semantic-analysis mode as an
+	option for finding completions.  Add semanticdb results stripping here.
+	(senator-complete-symbol): Removed semanticdb result stripping.
+	(senator-completion-menu-item): Removed semanticdb result stripping.
+
+	* semantic-tag-ls.el (semantic-tag-protection):
+	Add extra check that the tag has an overlay.
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Add an extra means of extracting a file name
+	from a token.
+
+	* semantic-ia-sb.el (semantic-ia-speedbar):
+	Set the active mode for tag-display
+	(semantic-ia-sb-string-list): Better non-tag tag word.
+
+	* semantic-edit.el (semantic-edits-verbose-flag): Make customizable.
+
+	* semanticdb-skel.el:
+	Removed refs to emacs-lisp, replace with generic terms
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	Only return tables in a DB of the same major mod as the current major-mode.
+
+	* semanticdb.el: (semanticdb-get-buffer)
+	(semanticdb-file-table-object): Pass extra option to
+	find-file-noselect to avoid displaying warnings.
+
+2006-07-04  David Ponce  <david@dponce.com>
+
+	* semantic-ede-grammar.el:
+	Fix recursive (require 'semantic-ede-grammar) error on Emacs 22.
+
+2006-05-31  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (wildcard, wildcard_1, wildcard_2, wildcard_3):
+	Add space around
+	keywords in the returned value.
+	(method_declarator, constructor_declarator, annotation): Pass $I
+	placeholder to SKIP-BLOCK.
+	(method_header, constructor_declaration): Set :template-specifier
+	as a string for now.
+	(type_parameters, type_parameter_list, type_parameter_list_1)
+	(type_parameter, type_parameter_1, type_bound_opt, type_bound)
+	(type_bound_1, additional_bound_list_opt)
+	(additional_bound_list, additional_bound_list_1)
+	(additional_bound, additional_bound_1): Produce a string for now.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-expand-tag):
+	Remove.
+	(wisent-java-default-setup): Use `semantic-java-expand-tag'.
+
+	* wisent/wisent-grammar-macros.el (wisent-grammar-SKIP-BLOCK):
+	Receive an optional $I placeholder
+	symbol.
+
+	* bovine/semantic-java.el:
+	(semantic-java-dim, semantic-java-expand-tag)
+	(semantic-java-type): New functions.
+	(semantic-java-prototype-variable): Use `semantic-java-type'.
+	(semantic-java-prototype-function): Likewise.  Include
+	:template-specifier.
+	(semantic-java-prototype-type): Include :template-specifier.
+
+2006-05-19  David Ponce  <david@dponce.com>
+
+	* semantic-format.el (semantic--format-tag-arguments): Fix last change.
+
+2006-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el: (semantic-get-local-variables-default)
+	(semantic-get-local-arguments): Add a :filename property to
+	every found tag so the source buffer can be found later.
+
+2006-03-27  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-parse-verbose-flag, wisent-recovering):
+	Doc fix.
+
+	* wisent/wisent-comp.el:
+	(wisent-debug-flag, wisent-new-log-flag, wisent-verbose-flag)
+	(wisent-single-start-flag, wisent-compile-grammar): Doc fix.
+	(wisent-automaton-lisp-form): New function renamed from
+	`wisent-byte-compile-automaton'.  Don't byte-compile here.
+	(wisent-byte-compile-grammar): Use it.  byte-compile here.
+
+2006-02-24  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (modifiers, modifier): Revert last change.
+	(class_body_declaration)
+	(interface_member_declaration): Use the SKIP-TOKEN macro.
+	(enum_body, enum_arguments_opt)
+	(constructor_body, array_initializer, block, switch_block)
+	(dim_expr, annotation_type_body)
+	(member_value_array_initializer): Use the SKIP-BLOCK macro.
+	(method_declarator)
+	(constructor_declarator): Likewise.  Improve recovery rule.
+	(annotation): Return the annotation name.
+
+	* wisent/wisent-grammar-macros.el: (wisent-grammar-SKIP-BLOCK)
+	(wisent-grammar-SKIP-TOKEN): New functions.
+	(wisent-grammar-mode::semantic-grammar-macros): Add SKIP-BLOCK and
+	SKIP-TOKEN macros.
+
+	* wisent/wisent.el (wisent-skip-block):
+	Accept the starting location of the block as
+	an optional parameter.
+
+2006-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex-spp.el:
+	Semantic Pre-processor, for emulating pre-processors and their symbols.
+
+2006-02-23  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (package_declaration):
+	Simplify. Store package modifiers for
+	future use.
+	(modifiers): Ignore nil values.
+	(modifier): Don't store annotation for now.
+	(formal_parameter, local_variable_declaration, foreach_statement)
+	(foreach_statement_no_short_if): Handle annotations.
+
+2006-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-lex-c-preprocessor-symbol-map):
+	New option
+	(semantic-lex-c-preprocessor-dynamic-symbol-map): New var (unused)
+	(semantic-lex-c-preprocessor-p): New fn
+	(semantic-lex-c-define): New lexer (unused)
+	(semantic-lex-c-preprocessor-replace-or-symbol-or-keyword): New lexer
+	(semantic-c-lexer): Use new lexer
+
+2006-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el (semantic-edits-assert-valid-region): New macro
+	(semantic-edits-incremental-parser-1): Protect against a bug where
+	psrse-start is after parse-end.
+	Added debugging assistance.
+	Added some comments in some confusing code.
+
+	* tests/test.py (HTTPServer.server_bind): Uncomment.
+
+	* wisent/wisent-python.el (wisent-python-default-setup):
+	Remove errant paren.
+
+	* semantic-load.el (semantic-load-enable-semantic-debugging-helpers):
+	Enable incremental
+	parser verbosity.
+
+	* doc/user-guide.texi (Speed Debug): New node.
+
+2006-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-python.el (wisent-python-default-setup):
+	Apply the semantic imenu override
+	so we don't use the one in python.el.
+	Add symbol-> name association lists.
+
+2006-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/Project.ede (images): Added grammar-fw-ov.txt
+
+	* wisent/Makefile, tests/Makefile, doc/Makefile, bovine/Makefile (VERSION):
+	updated
+
+	* semantic-load.el (semantic-load-enable-guady-code-helpers): Alias.
+
+	* semantic.el (semantic-version): Updated
+
+	* Project.ede (:version): updated
+
+	* Makefile (VERSION): updated
+
+	* semantic-ia.el (semantic-ia-show-summary): New fcn/example
+
+	* senator.el (semantic-narrow-to-tag):
+	Undo previous... already defined as narrow-to-defun
+
+	* semantic-tag.el (semantic-narrow-to-tag): Make this interactive.
+
+	* senator.el (senator-menu-bar): Add item for senator-narrow-to-tag.
+
+	* semantic-load.el, INSTALL: Fix gaudy typo
+
+2006-01-12  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.wy (variable_declarators):
+	Include the COMMA delimiter into compound
+	declaration bounds.
+
+2006-01-09  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (variable_declarators):
+	Include the COMMA delimiter into compound
+	declaration bounds.
+
+	* senator.el (senator-search-tag-name):
+	Search the tag name between word
+	delimiters, whitespaces, or punctuations.
+
+2006-01-03  David Ponce  <david@dponce.com>
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default):
+	Skip array-like
+	expressions around symbols.
+
+	* bovine/semantic-c.el (c-mode::semantic-type-relation-separator-character):
+	Revert last
+	change.
+
+2005-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (c-mode::semantic-type-relation-separator-character):
+	Add simple Arrays as occuring between symbols.
+
+2005-11-22  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (static_initializer):
+	Use :typemodifiers attribute.
+	(block_statements): Use :members attribute.
+	(method_declaration, constructor_declaration): Don't store the
+	:body attribute to save place in the tag database.
+
+	* senator.el (senator-previous-tag-or-parent): Don't use
+	`semantic-find-tag-by-overlay-prev' which skips the current tag
+	when point is at the end of a tag overlay.
+
+2005-11-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (local_variable_declaration):
+	Fix tag production.
+
+2005-11-03  David Ponce  <david@dponce.com>
+
+	* semantic-ia.el (semantic-ia-complete-symbol-menu):
+	XEmacs `imenu--mouse-menu'
+	compatibility fix.
+
+2005-10-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia.el (semantic-ia-complete-symbol):
+	Use `senator-complete-symbol' as backup
+	technique if smart stuff fails.
+
+	* semantic-ia.el (semantic-ia-complete-symbol-menu):
+	Fix case with only one menu item.
+
+	* bovine/semantic-c.el (semantic-expand-c-tag):
+	Replace obsolete 'token-parent' call with
+	'tag-type-superclasses' call instead.
+
+	* bovine/c.by (typesimple): For typedef, pass 'parent' in as a list
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp (stdio.h): New include.
+	(simple1): New function.
+	(class1): Add var12
+	(class3): Add operator^=
+	(class3::method1_for_class3): Various smart completion testing changes.
+	(class4): Add constructor initializers
+	(Action): Add operator+=.
+
+	* tests/test.c (fun1): New.
+
+	* tests/gr-test.wy, doc/fdl.texi, wisent/wisent-python.wy, wisent/wisent-python.el, wisent/wisent-java.wy, wisent/wisent-java-tags.wy, wisent/wisent-java-tags.el, wisent/wisent-java.el, wisent/wisent-grammar-macros.el, wisent/wisent-grammar.el, wisent/wisent-expr.el, wisent/wisent.el, wisent/wisent-debug.el, wisent/wisent-c.wy, wisent/wisent-comp.el, wisent/wisent-cim.wy, wisent/wisent-c.el, wisent/wisent-calc.wy, wisent/wisent-calc.el, wisent/wisent-awk.wy, wisent/semantic-wisent.el, wisent/bison-wisent.el, bovine/skeleton.by, bovine/semantic-skeleton-by.el, bovine/semantic-skel.el, bovine/semantic-scm.el, bovine/semantic-make.el, bovine/semantic-java.el, bovine/semantic-erlang.el, bovine/semantic-el.el, bovine/semantic-c.el, bovine/semantic-bovine.el, bovine/scheme.by, bovine/make.by, bovine/erlang-edoc.el, bovine/erlang.by, bovine/c.by, bovine/bovine-grammar-macros.el, bovine/bovine-grammar.el, bovine/bovine-debug.el, senator.el, semantic-util-modes.el, semantic-util.el, semantic-texi.el, semantic-tag-ls.el, semantic-tag-file.el, semantic-tag.el, semantic-sort.el, semantic-sb.el, semantic-regtest.el, semantic-load.el, semantic-lex.el, semantic-inc.el, semantic-imenu.el, semantic-idle.el, semantic-ia-sb.el, semantic-ia.el, semantic-html.el, semantic-grammar-wy.el, semantic-grammar.wy, semantic-grammar.el, semantic-fw.el, semantic-format.el, semantic-fold.el, semantic-find.el, semantic-example.el, semantic.el, semantic-edit.el, semantic-ede-grammar.el, semantic-doc.el, semantic-decorate-mode.el, semantic-decorate.el, semantic-debug.el, semanticdb-system.el, semanticdb-skel.el, semanticdb.sh, semanticdb-search.el, semanticdb-mk.el, semanticdb-java.el, semanticdb-find.el, semanticdb-file.el, semanticdb-el.el, semanticdb.el, semanticdb-ebrowse.el, semantic-ctxt.el, semantic-complete.el, semantic-chart.el, semantic-cb.el, semantic-ast.el, semantic-analyze.el, document-vars.el, document.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (HAT): Fix regexp.
+
+	* bovine/semantic-c.el (c-mode::semantic-format-tag-canonical-name):
+	New override.
+
+	* document.el (document-find-file): Fix warning.
+
+	* document.el (document): Fix doc.
+	(document-inline): Use overlays to find the current tag.
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Use below for getting a comment.
+	(semantic-documentation-comment-preceeding-tag): New function.
+	Like code taken from above, but using overlays to find boundaries
+	between tags.  Robust to functions with no preceeding comments.
+
+	* semantic-debug.el (semantic-debug-interface::semantic-debug-highlight-rule):
+	Make very
+	long rules visible when focus changes to the end of those rules.
+
+	* semantic-find.el (semantic-find-tag-by-overlay-prev):
+	Find stops at END of tags when
+	going backward.
+	(semantic-brute-find-first-tag-by-function): Fix doc string.
+	(semantic-brute-find-tag-by-position): Fix doc string.
+
+2005-09-21  David Ponce  <david@dponce.com>
+
+	* senator.el: (semantic-insert-foreign-tag-default)
+	(semantic-insert-foreign-tag): Move to semantic-tag.el.
+	(senator-copy-tag, senator-yank-tag)
+	(senator-copy-tag-to-register)
+	(insert-register, jump-to-register): Use foreign tags.
+
+	* semantic-texi.el (semantic-insert-foreign-tag):
+	Receive a foreign tag.  Use
+	`semantic-tag-buffer'.
+
+	* semantic-tag.el (semantic-tag-buffer):
+	Handle tag with an originating file.
+	(semantic-tag-mode)
+	(semantic-foreign-tag-invalid, semantic-foreign-tag-p)
+	(semantic-foreign-tag-check, semantic-foreign-tag)
+	(semantic-obtain-foreign-tag): New functions.
+	(semantic-insert-foreign-tag-default)
+	(semantic-insert-foreign-tag): Move from senator.el.  Change
+	arguments.
+
+	* semantic-grammar.el: (semantic-ctxt-current-function)
+	(semantic-ctxt-current-argument)
+	(semantic-ctxt-current-assignment)
+	(semantic-ctxt-current-class-list): Take into account the optional
+	argument POINT.
+	(semantic-ctxt-current-mode): New function.
+
+	* semantic-ctxt.el: (semantic-ctxt-current-mode)
+	(semantic-ctxt-current-mode-default): New functions.
+
+	* document.el (document-massage-to-texinfo): Use `semantic-tag-mode'.
+
+2005-09-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (operatorsym):
+	 Move HAT EQUAL operatorysym to the end of the list.
+	It breaks following rules.
+
+2005-09-07  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-el.el (eval-and-compile, eval-when-compile):
+	Make the nested form parser
+	more robust.
+
+2005-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (add-log-current-defun): Output canonical names too.
+	Work harder at finding a parent to add to canonical name.
+
+	* semantic-format.el (semantic-format-tag-functions):
+	Add semantic-format-tag-canonical-name.
+	(semantic-format-parent-separator): New option.
+	(semantic--format-tag-arguments): Use below fcn
+	(semantic-format-tag-name-from-anything): New function (from above)
+	(semantic--format-tag-parent-tree): New unfinished function.
+	(semantic-format-tag-canonical-name): New overload function.
+	(semantic-format-tag-abbreviate-default): Use above.
+
+2005-08-27  David Ponce  <david@dponce.com>
+
+	* doc/tags.texi (Tag Overlay): Fix @strong{Note...} warning.
+
+2005-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Tag Query): New doc.
+
+	* semantic-tag.el (semantic-tag-named-parent): New function
+	(semantic-tag-function-parent): Use above.
+
+2005-08-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fold.el (semantic-folding-click): doc update
+	(provide): Add one.
+
+2005-07-14  David Ponce  <david@dponce.com>
+
+	* Makefile, wisent/Makefile, bovine/Makefile: Re-generate.
+
+	* semantic-ede-grammar.el: (semantic-ede-grammar-compiler-wisent)
+	(semantic-ede-grammar-compiler-bovine): Add quotes around EMACS.
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-version): Updated.
+
+	* Project.ede (:version): Updated.
+
+	* wisent/Makefile, tests/Makefile, doc/Makefile, bovine/Makefile, Makefile (VERSION):
+	Updated.
+
+	* senator.el: toplevel: ran checkdoc, cleaned up errant whitespace.
+	(senantor-fold-tag,senator-unfold-tag,senator-fold-tag-toggle): Doc fix.
+	(senator-go-to-up-reference): Error fix.
+	(semantic-up-reference-default): Error fix.
+
+	* semantic-util-modes.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+	* semantic-util.el (semantic-recursive-find-nonterminal-by-name):
+	Doc change pending deletion.
+
+	* semantic-tag-file.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+	* semantic-tag.el (semantic-tag-faux-p): Doc fix.
+
+	* semantic-sort.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+	* semantic-sb.el: (semantic-sb-tag-set-buffer)
+	(semantic-sb-insert-tag-table): Doc fix.
+
+	* semantic-load.el (semantic-load-enable-minimum-features):
+	Fix broken if statement.
+
+	* semantic-lex.el (semantic-lex-expand-block-specs): Doc fix.
+
+	* semantic-idle.el, semantic-grammar.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+	* semantic-fw.el: Copyright updated.
+
+	* semantic-example.el: Checkdoc fixes.
+
+	* semantic.el: toplevel: ran checkdoc, cleaned up errant whitespace.
+	(semantic-parse-region): Doc fix.
+	(semantic-parse-region-default): Error msg fixes.
+
+	* semantic-decorate-mode.el (global-semantic-decoration-mode):
+	(semantic-decoration-mode): Checkdoc fixes.
+
+	* semantic-decorate.el (semantic-set-tag-folded-isearch): Doc fix.
+
+	* semantic-debug.el: (semantic-debug-find-parser-source)
+	(semantic-debug-set-breakpoint)
+	(semantic-debug-parser-fames): Various checkdoc fixes.
+
+	* semanticdb-system.el: (semanticdb-load-system-database)
+	(semanticdb-collect-matching-filenames): Doc fix.
+
+	* semanticdb-find.el: Commentary: updated.
+	(semanticdb-find-table-for-include-default): Add comment about cache loading.
+	(semanticdb-find-test-translate-path): doc fix.
+	(semanticdb-find-result-test): Fix error message.
+
+	* semanticdb-file.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+	(semanticdb-file-name-directory): Doc fix.
+	Renamed argument PATH to DIRECTORY for GNU conventions.
+
+	* semanticdb-el.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+	* semanticdb.el (semanticdb-file-table): Doc fix.
+
+	* semantic-ctxt.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+	(semantic-ctt-current-argument-default): Doc fix.
+
+	* semantic-complete.el, semantic-chart.el, semantic-analyze.el:
+	toplevel: ran checkdoc, cleaned up errant whitespace.
+
+2005-06-13  David Ponce  <david@dponce.com>
+
+	* semantic-util-modes.el (semantic-stickyfunc-mode-setup):
+	Fix last change.  Thanks to
+	Nicholas Sandow <njsand@internode.on.net>.
+
+2005-06-11  David Ponce  <david@dponce.com>
+
+	* semantic-util-modes.el (semantic-stickyfunc-old-hlf):
+	No more automatically buffer local.
+	(semantic-stickyfunc-mode-setup): Fix save/restore of previous
+	header line.
+
+2005-06-02  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-mode):
+	Use `semantic-run-mode-hooks'.
+
+	* semantic-fw.el (semantic-run-mode-hooks): New compatibility function.
+	(semantic-safe): Add the current buffer to the error message.
+
+	* semantic-decorate-mode.el (semantic-build-decoration-mode-menu):
+	Add autoload cookie.
+
+2005-05-19  David Ponce  <david@dponce.com>
+
+	* senator.el: (senator-search-ignore-tag-classes)
+	(senator--search-filter): New variables.
+	(senator-search-default-tag-filter): New function.
+	(senator-search-tag-filter): Remove.
+	(senator-search-tag-filter-functions): New hook.
+	(senator-search): Use it.
+	(senator-search-set-tag-class-filter): Likewise. Doc fix.
+
+2005-05-13  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-search-tag-name):
+	Don't fail if TAG name doesn't come
+	from source. Doc fix.
+	(senator-search): Likewise.
+
+2005-05-08  Suraj Acharya <sacharya@gmail.com>
+
+	* semantic-fw.el:
+	added a binding for overlay-size/extent-length to semantic-overlay-size
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (VERSION): Update version number
+	(tools, wisent, languages): Add quotes around EMACS.
+
+	* tests/Makefile (VERSION): Update version number
+
+	* semantic-fold.el (semantic-tag-folding-decoration):
+	Disable folding style by default.
+
+	* semantic-debug.el (semantic-debug-find-parser-source):
+	Provide a useful error if the
+	parser source was not found.
+
+	* semantic-load.el (semantic-load-system-cache-loaded): New variable.
+	(semantic-load-enable-minimum-features): Do not load system caches
+	more than once.
+
+	* semantic-idle.el (semantic-idle-summary-current-symbol-info-context):
+	Be robust to failures in analysis calculation.
+
+	* semantic.el (semantic-version): Update version number
+
+	* semanticdb-system.el (semanticdb-load-system-caches):
+	Disable loading non cache files.
+	This allows other types of files in the cache directory.
+
+	* INSTALL: Added semantic-load-enable-guady-code-helpers.
+	Add custom setup section.
+
+	* Makefile (VERSION): Update version number
+	(autoloads, maintenance, init, semantic, Languages, tools, senator):
+	Add quotes around EMACS.
+
+	* Project.ede ("semantic"): Update version number
+
+	* bovine/Makefile (VERSION): Update version number
+	(bovinator, languages): Add quotes around EMACS.
+
+	* doc/Makefile (VERSION): Update version number
+	(semantic-user_info_TEXINFOS): Added minor-modes.texi.
+
+	* doc/Project.ede ("semantic-user.info"):
+	Broke out minor modes section to new file.
+
+	* doc/user-guide.texi (senator): Add some new keybindings
+	(Analyzer): Replace 'token' with 'tag'.
+	(Class Browser): Tidy up some text.
+	(Idle Scheduler): Menu update.
+	(Idle Summary Mode): Add new variable.  Remove completions mode.
+	(Idle Completions Mode): New section.
+	(Minor Modes): Moved into a sub-file.
+
+	* doc/minor-modes.texi: Doc for various minor modes.
+
+2005-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-ebrowse.el: Ebrowse semanticdb backend.
+
+2005-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-register-custom-menu):
+	Add space to menu item name.
+	(senator-menu-bar): Move some items.
+	Add decoration sub-menu.
+
+	* semantic-load.el (semantic-load-enable-code-helpers):
+	Remove some items
+	(semantic-load-enable-guady-code-helpers): New
+	(semantic-load-enable-excessive-code-helpers): Remove ref to old variable.
+
+	* semantic-decorate-mode.el (semantic-decoration-style-enabled-p):
+	New fcn.
+	(semantic-decoration-menu-cache, semantic-decoration-build-style-menu)
+	(semantic-build-decoration-mode-menu): New.
+	(define-semantic-decoration-style): Enable a set of optional flags.
+	(semantic-tag-boundary-p-default): Remove minimum size constraint.
+	(semantic-decoration-on-private-members)
+	(semantic-decoration-on-protected-members): Disable by default.
+
+2005-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-stickyfunc-mode-map):
+	Add keypress for menu in header line.
+	(semantic-stickyfunc-popup-menu): New variable and menu.
+	(semantic-stickyfunc-menu): Command.
+
+2005-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag.el: Update Commentary.
+
+2005-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-load-enable-code-helpers):
+	For code helpers, do not turn on
+	completions mode if there are no tooltips.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-version): Update version number.
+
+	* wisent/Makefile, tests/Makefile, doc/Makefile, bovine/Makefile, Makefile (VERSION):
+	Updated.
+
+	* Project.ede ("semantic"): Update version number.
+
+	* bovine/semantic-el.el (semantic-dependency-tag-file):
+	Renamed from old not compatible name.
+
+	* semantic-sort.el (semantic-tag-external-member-parent): Fix Typo.
+
+	* NEWS: Add section on lexical debugging.
+
+2005-04-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fold.el (semantic-tag-folding-decoration-p-default):
+	Fix comment.
+	Only show +/- if in folding mode.
+	(semantic-tag-folding-decoration-highlight-default):
+	Fix doc.
+
+2005-04-16  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-faux-p, semantic-tag-set-faux):
+	Rename the 'faux
+	property to :faux-flag.
+
+	* semantic-sort.el (semantic-adopt-external-members):
+	Use `semantic-tag-set-faux'.
+
+	* bovine/c.by (operatorsym): Fix previous change.
+
+2005-04-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-go-to-up-reference): New command.
+	(semantic-up-reference[-default]): New override method.
+	(senator-prefix-map): Add up-reference command.
+	(senator-menu-bar): same.
+
+2005-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-tag-protection):
+	Use tag equivalency, not eq.
+
+	* bovine/c.by (MOD, HAT, OR): New tokens.
+	(operatorsym): Add many more possible overloadable operators.
+
+	* semantic-sort.el (semantic-adopt-external-members):
+	Revamp to use 'faux' tag interface
+	added to semantic-tag.el
+
+	* semantic-tag.el (semantic-tag-faux-p, semantic-tag-set-faux):
+	New functions
+
+2005-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (fun-or-proto-end): Allow arguments after catch.
+
+	* bovine/c.by (fun-or-proto-end): Allow initializers after TRY.
+
+	* bovine/c.by (TRY, CATCH): New tokens
+	(fun-or-proto-end): Add TRY/CATCH option to function body.
+
+	* semantic-idle.el (semantic-idle-core-handler):
+	Allow services to run if lexical unsafe.
+	(semantic-idle-summary-current-symbol-info-context):
+	Use new analyzer API call to get an interesting tag.
+
+	* semantic-analyze.el (semantic-analyze-interesting-tag):
+	New methods for `semantic-analyze-context', `-functionarg', and
+	`-assignment'.
+
+	* semantic-ctxt.el (semantic-end-of-context-default):
+	Make robust to incomplete syntax.
+
+	* semantic.el (semantic-refresh-tags-safe): New function.
+
+	* semantic-lex.el (semantic-lex-debug-analyzers): New option.
+	(semantic-lex-unterminated-syntax-protection): Debug syntax problems
+	iff both lex debug and debug-on-error is active.
+
+2005-03-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el: (semantic-imenu-index-directory)
+	(semantic-imenu-auto-rebuild-directory-indexes): New default value is nil.
+
+2005-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Be sure to switch to the buffer being
+	jumped to by `semantic-go-to-tag'.
+
+2005-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-tag-file.el (semantic-go-to-tag): Use `cond'.
+	Use `semantic-tag-file-name' when applicable.
+	If no position is found, use current buffer and re-search-forward.
+	(semantic-dependency-tag-file): Switch to tag originating buffer
+	before calling any override methods.
+	Add caching mechanism around the override part.
+
+2005-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic--elisp-parse-table):
+	Fix reverse issue on tag lists.
+	(semantic-elisp-setup-form-parser): New parser entity
+	(defvar): Add defezimage.
+	(defmethod): Don't specify parent of not specified in arg list.
+	(define-mode-overload-implementation): Add obsolete comment.
+
+	* tests/test.el: New test functions for Emacs Lisp.
+
+	* semantic-util-modes.el (semantic-stickyfunc-mode-setup):
+	Pass a second argument to
+	local-variable-p.
+
+2005-02-15  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* semantic-regtest.el: - Removed the semantic 1.4 support
+	- Whitespace-normalizing of tag-name and tag-text
+	- Added help-echos for semantic-regtest-mode
+	- distinction between user-commands and internal-equivalents for being used
+	  from within elisp
+	- new option semantic-regtest-print-tag-boundaries
+
+2005-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-stickyfunc-indent-string):
+	New default value calculated from
+	the environment.
+	(semantic-stickyfunc-fetch-stickyline): Replace tabs with spaces
+	before presenting the string.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Cache found dependency in tag
+	property.  If it isn't found, cache that too.
+
+	* semantic-idle.el (semantic-idle-scheduler-verbose-flag): New option
+	(semantic-idle-core-handler)
+	(semantic-idle-scheduler-refresh-tags): Be verbose if flag is
+	non-nil.
+
+2005-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-system.el (semanticdb-system-database-warn-level):
+	New option
+	(semanticdb-system-db-directory-search-recursed): New state
+	(semanticdb-load-system-database): Ask if files list is very long
+	(semanticdb-collect-matching-filenames): Add not-recursive option.
+
+	* senator.el (semantor-fold-tag, senator-unfold-tag, senator-fold-tag-tooggle):
+	New commands.
+	(senator-prefix-map): Add folding commands.
+	(senator-menu-bar): Add folding commands.
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fold.el: Folding decoration/mode.
+
+	* wisent/Makefile, tests/Makefile (VERSION): Updated version number.
+
+	* tests/test.cpp (method1_for_class3):
+	Added space where completion tests cn occur
+	(method5_for_class3): Added 'doc' string in comment at top.
+
+	* doc/user-guide.texi (semanticdb): Refer to updated install mechanism.
+	(Semanticdb Search Configuration): Added throttle discussion.
+	(Semanticdb System Backends): Mention the omniscience throttle key.
+
+	* doc/app-dev-guide.texi (top): Add Tag Decoration node
+	(Tag Decoration): New chapter with several subsections
+	(Semanticdb Tag Queries): Fixed up first paragraph
+	Remove path translation.
+	(DB Results): Change "token" to "tag".
+	(DB Search Paths): New section
+
+	* doc/Makefile, bovine/Makefile (VERSION): Updated version number.
+
+	* NEWS: Added folded tags to news.
+	Fixed name of a function with -nonterminal-
+	Added info about texi parser.
+
+	* Makefile (VERSION): Updated version number.
+
+	* Makefile (VERSION): Updated version number.
+	(example_MISC): Added semanticdb-skel.el
+
+	* Project.ede ("semantic"): Update version number.
+	("example"): Added semanticdb-skel.el
+
+	* semantic-fold.el: A hack for a folding mode with +/- in the fringe.
+
+	* semantic-decorate.el (semantic-set-tag-folded, semantic-tag-folded-p):
+	New functions.
+	(semantic-set-tag-folded-isearch): New callback
+
+2005-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-test-translate-path):
+	Refer to the throttle
+	variable in doc string.
+
+2005-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-skel.el:
+	First pass at a skeleton for making new semanticdb system databases.
+
+2005-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-find-default-throttle):
+	Rename 'omnipotent' to 'omniscience'
+
+	* semanticdb-find.el: (semanticdb-find-throttle-custom-list)
+	(semanticdb-find-default-throttle)
+	(semanticdb-find-table-for-include-default): Rename 'omnipotent' to
+	'omniscience', which is a better word.
+
+2005-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-default-c-path):
+	Add to semantic custom group.
+
+	* semantic-load.el (semantic-load-enable-minimum-features): Fix doc
+
+	* semanticdb-system.el (semanticdb-load-system-caches):
+	Don't load backup files.
+	(semanticdb-load-system-database): Force tag parsing at load
+	time since this is no longer guaranteed.
+
+	* semanticdb-find.el (semanticdb-find-throttle-custom-list):
+	New variable
+	(semanticdb-find-default-throttle): New user option.
+	(semanticdb-find-throttle-active-p): New predicate
+	(semanticdb-find-translate-path-includes-default):
+	Only recurse if recursion is enabled.
+	(semanticdb-find-table-for-include-default):
+	Add throttling code.
+	Re-enable old system database loading.
+	Use new commnds to get system databases if available, then
+	resort to a normal load.
+	(semanticdb-find-test-translate-path): Update from Jan's input.
+
+	* semanticdb-el.el (semanticdb-find-default-throttle):
+	Specifiy an Emacs Lisp value.
+
+	* semanticdb.el (semanticdb-dump-all-table-summary):
+	New debugging command.
+	(semanticdb-file-table-object): When loading a table, make sure
+	we grab system databases too.
+
+2005-01-28  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-buffer):
+	Ensure the tag's overlay is living.
+
+	* semantic-fw.el: (semantic-overlay-live-p) [XEmacs]: Align with Emacs'
+	`overlay-buffer' behavior.
+
+2005-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Minor Modes): Update doc to many minor modes.
+	highlight-by-attribute mode was replaced with decoration mode.
+	(semanticdb): Update doc with doc-strings, usually by
+	adding an achor.
+
+	* semantic.el (semantic-version): Update to 2.0!  Whoo Hoo!
+	(semantic-repeat-parse-whole-stream): Add infinite loop detection.
+
+	* semantic-cb.el: (semantic-cb-tag)
+	(semantic-cb-type)
+	(semantic-cb-add-incomplete-type)
+	(semantic-cb-new-class-browser)
+	(semantic-cb-complete-type)
+	(semantic-cb-convert-type)
+	(semantic-cb-convert-children)
+	(initialize-instance)
+	(semantic-dot*)
+	(eieio-speedbar-*): Replace all references to TOKEN with TAG.
+	(semantic-cb-speedbar-key-map): Create an eieio-speedbar-key-map.
+
+	* semanticdb.el (semanticdb-current-database-list):
+	If no roots are found, use the
+	current directory as the root.
+
+2005-01-20  David Ponce  <david@dponce.com>
+
+	* doc/internals.texi (Semanticdb): New section.
+
+	* doc/semantic.texi: Copyright update.
+
+2005-01-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-inline-analyzer):
+	Allow completion when the
+	current symbol is empty, but there is an active parent symbol.
+
+2005-01-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el (semantic-sb-tag-children-to-expand): Delete.
+	The semantic support file already does this.
+
+	* bovine/semantic-el.el: Fix copyright.
+
+2005-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el, semantic-grammar.el, semantic-ia.el, semantic-sb.el, semanticdb-find.el:
+	Fix copyright year listing
+
+2005-01-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-documentation-for-tag):
+	For tags with no known
+	documentation, cheat and snag some from the Emacs environment.
+
+	* semanticdb.el (semanticdb-project-root-functions): Update doc.
+	(semanticdb-current-database-list): Allow prev to return multiple
+	roots.
+
+	* semanticdb-el.el (semanticdb-find-translate-path):
+	Prevent the systemdb from being
+	added when we recurse into this fcn.
+
+	* semanticdb-find.el (semanticdb-find-test-translate-path): Fix doc
+	(semanticdb-strip-find-results): Implement previously missing
+	feature for `find-file-match'.
+	(semanticdb-find-tags-collector): Reverse return results so they
+	are in the same order as the input path.
+
+	* doc/user-guide.texi (Smart Completion): Added semantic-ia-show-doc
+
+	* semantic-ia.el (semantic-ia-sow-doc): New command.
+
+	* semantic-sb.el: Update comment/TODO
+
+	* semantic-sb.el (semantic-sb-tag-set-buffer, semantic-sb-with-tag-buffer):
+	New fcn/macro
+	(semantic-sb-tag-children-to-expand-default)
+	(semantc-sb-one-button, semantic-sb-insert-details)
+	(semantic-sb-fetch-tag-table): Wrap calls to override methods
+	with new macro.
+
+2005-01-12  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-grammar-macros.el (wisent-grammar-ALIAS-TAG):
+	New function.
+	(semantic-grammar-macros): Add ALIAS-tAG.
+
+2005-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-sb-one-button):
+	Replace old logic with new override function.
+
+	* semantic-grammar.el (semantic-grammar-syntax-help):
+	Add ALIAS-TAG help.
+
+	* doc/lang-support-guide.texi (Incremental Parser Debugging):
+	Add verbosity flag.
+
+	* semantic-edit.el (semantic-edits-verbose-flag): New flag.
+	(semantic-parse-changes-failed, semantic-edits-incremental-fail)
+	(semantic-edits-incremental-parser-1): Use above new flag.
+
+	* doc/lang-support-guide.texi (Incremental Parser Debugging):
+	Updated to changes in lisp code.
+
+	* semantic-util-modes.el (semantic-show-parser-state-marker):
+	change state symbol so it is
+	more visible.
+
+	* bovine/bovine-grammar-macros.el (bovine-grammar-ALIAS-TAG): New fcn
+	(semantic-grammar-macros): Add above.
+
+2005-01-10  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-parse-region-default):
+	Try to reuse tokens from inside
+	collapsed blocks.
+	(semantic-fetch-tags): Initialize `semantic-lex-block-streams'.
+
+	* semantic-lex.el: (semantic-lex-block-streams)
+	(semantic-lex-block-stack): New variables.
+	(define-lex): Use them.  Improved error messages.  Handle
+	unterminated collapsed blocks.
+	(semantic-lex-start-block, semantic-lex-end-block): New functions.
+	(semantic-lex-expand-block-specs): New function.
+	(semantic-lex-push-token): Use it.  Doc fix.
+
+2005-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el (semantic-html-extract-section-name):
+	Fix up requires.
+	Improve robustness of anchor text extraction.
+
+2005-01-06  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el: (semantic-tag-new-alias, semantic-tag-alias-class)
+	(semantic-tag-alias-definition): New functions.
+
+2005-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-describe-tag, semantic-add-label, semantic-show-label):
+	Convert "token" names to "tag".
+
+2005-01-05  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-production-bounds):
+	Ensure i doesn't go beyond j.
+
+	* bovine/semantic-el.el (defstruct):
+	Don't put doc string in structure members.  Handle
+	defstruct name when it is a simple symbol.
+
+2005-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el (semantic-cb-speedbar-mode):
+	Force a new class browser to be created
+	before initializing speedbar.
+
+2004-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-default-to-tag):
+	Get car of search results.
+	(semantic-displayor-focus-request): Have match index be 1 based.
+
+2004-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	Fix comments
+	(semanticdb-find-test-translate-path): New command.
+
+2004-12-01  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-add-log-tags): Doc fix.
+	(add-log-current-defun): Process tags in reverse order to examine
+	the ones closest to point first (thanks to Alan Shutko
+	<ashutko@express-scripts.com>).  Minor code improvements.
+
+2004-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (subst-char-in-string):
+	Removed previous re-implementation.
+
+	* semanticdb-file.el (semanticdb-file-name-directory):
+	 Use compatible version of subst-char-in-string.
+
+	* semantic-fw.el (subst-char-in-string):
+	New alias/compat function.  Thanks Andrey Slusar.
+	(semantic-safe): Notes to self.
+
+2004-10-21  David Ponce  <david@dponce.com>
+
+	* semantic-imenu.el (working): Require it.
+	(semantic-imenu-rebuild-directory-indexes): Use
+	`working-temp-message' to not obscure other important messages.
+
+2004-10-19  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (subst-char-in-string):
+	Define if not fboundp for compatibility
+	with XEmacs.
+
+2004-10-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el (semantic-ia-sb-key-map): Fix name of info function
+	(semantic-ia-sb-tag-info): Don't show info for non-tags.
+	Remove use of old semantic-ia-sb-last-analysis.
+	(semantic-ia-sb-line-path, semantic-ia-sb-complete):
+	Remove use of old semantic-ia-sb-last-analysis.
+
+2004-10-05  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-p): Fix last change.
+
+2004-10-04  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-p): Return nil if an error occurs.
+
+2004-09-22  David Ponce  <david@dponce.com>
+
+	* bovine/skeleton.by (PERIOD):
+	Replace \\b \\b by \\` \\' in token regexp.
+
+	* bovine/make.by: (COLON, PLUS, EQUAL)
+	(DOLLAR, BACKSLASH): Replace \\b \\b by \\` \\' in token regexp.
+
+	* bovine/erlang.by: (HASH, PERIOD, COLON, SEMICOLON, STAR, AMPERSAND)
+	(DIVIDE, PLUS, MINUS, BANG, WHY, EQUAL, LESS, GREATER)
+	(COMA, VDE): Replace \\b \\b by \\` \\' in token regexp.
+
+	* bovine/c.by: (HASH, PERIOD, COLON, SEMICOLON, STAR, AMPERSAND)
+	(DIVIDE, PLUS, MINUS, BANG, EQUAL, LESS, GREATER)
+	(COMA, TILDE): Replace \\b \\b by \\` \\' in token regexp.
+
+2004-09-21  David Ponce  <david@dponce.com>
+
+	* NEWS: Add note about Elisp parser improvement.
+
+	* bovine/semantic-el.el (semantic-emacs-lisp-lexer): Move.
+	(semantic-elisp-reuse-form-parser): New function.
+	(semantic-elisp-setup-form-parser): New function.
+	(semantic-elisp-use-read): Use it.
+	(eval-and-compile, eval-when-compile, defun, defun*, defsubst)
+	(defmacro, define-overload, defvar, defconst, defcustom)
+	(defface, defimage, autoload, defmethod, defgeneric, defadvice)
+	(defclass, defstruct, define-lex)
+	(define-mode-overload-implementation, define-mode-local-override)
+	(defvar-mode-local, require, provide): Setup form parsers.
+
+2004-09-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.el (wisent-python-forward-line):
+	Don't use forward-sexp to skip
+	comment at end of line.
+	(wisent-python-end-of-block): Include final newline in block.
+
+	* wisent/wisent-python.wy:
+	Reorder and cleanup token declarations to avoid warnings.
+	Auto-generate symbol, keyword, number, block and punctuation
+	analyzers.
+	Use %keyword to declare keywords.
+	(class_declaration): Fix TYPE-TAG production.
+	(paren_class_list): Return a list of class names.
+	(paren_class): Handle dotted name.
+
+	* wisent/wisent-python.el: Remove obsolete code and update comments.
+	Use variable and function names consistent with the library name.
+	Cleanup and improve lexical analysis code.
+
+	(wisent-python-explicit-line-continuation): Remove.
+	(wisent-python-string-re): Update from python 2.3 specs.
+	(wisent-python-indent-stack): Rename from
+	wisent-python-lexer-indent-stack.  Move.  All uses changed.
+	(semantic-lex-python-pop-indent-stack): Remove.
+	(wisent-python-implicit-line-joining-p)
+	(wisent-python-forward-string)
+	(wisent-python-forward-line-skip-indented)
+	(wisent-python-end-of-block): New functions.
+	(wisent-python-scan-lists, scan-lists): Remove.
+	(wisent-python-forward-line): Rename from python-next-line.
+	Simplify and make more robust.
+	(wisent-python-lex-beginning-of-line): Rename from
+	semantic-lex-python-beginning-of-line.  All uses changed.
+	Simplify with use of above new functions.  Don't hard code too
+	much things.
+	(semantic-lex-python-reset-continued-line): Remove.
+	(wisent-python-lex-end-of-line): Rename from
+	semantic-lex-python-newline.  All uses changed.  Does nothing if
+	implicit line joining.  No more handle what remains in the
+	indentation stack.
+	(wisent-python-lex-string): Rename from
+	semantic-lex-python-string.  All uses changed.  Simplify with use
+	of wisent-python-forward-string.
+	(wisent-python-lex-ignore-backslash): Rename from
+	semantic-lex-python-charquote, simplify.  All uses changed.
+	(semantic-lex-python-symbol, semantic-lex-python-number)
+	(semantic-lex-python-blocks): Remove.  Auto-generate.
+	(wisent-python-lexer): Rename from semantic-python-lexer.  All
+	uses changed.  Use updated and auto-generated analyzers.
+	(semantic-parse-region): Remove.
+	(semantic-lex): Override in python-mode to handle the indentation
+	stack.
+	(semantic-get-local-variables): Move.
+	(wisent-python-default-setup): Set parse-sexp-ignore-comments to
+	non-nil.  Remove unnecessary code.
+	(wisent-python-lex-buffer): Code cleanup.
+
+	* semantic-lex.el (semantic-lex-init): Code cleanup.
+	(semantic-lex-unterminated-syntax-protection): Don't catch errors
+	when debug-on-error is set.
+	(semantic-lex-catch-errors): Code cleanup.  Print the symbol on
+	which lexical analysis failed.
+
+	* semantic-idle.el (semantic-idle-core-handler):
+	Ignore non file buffers.  Check here
+	if the idle scheduler is enabled in current buffer.  Use dolist
+	and with-current-buffer to simplify the code.
+	(semantic-idle-scheduler-function): Let a chance to process other
+	buffers even if the idle scheduler is not enabled in current
+	buffer.  Ensure to always resume the idle scheduler timer.  Don't
+	do unnecessary save match data.
+
+	* semantic.el (semantic-new-buffer-fcn):
+	Set semantic-new-buffer-fcn-was-run to
+	non-nil before calling semantic functions.  Remove unnecessary
+	call to semantic-parse-tree-set-needs-rebuild.
+	(semantic-parse-region-default): Fix messages.  Remove obsolete
+	code and comments.
+
+2004-09-08  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-c.el (semantic-tag-abstract-p):
+	Also check for virtual modifier in
+	function tag.
+
+2004-08-25  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (prologue): Define `wisent-java-wy--anons'.
+	(field_declaration): Include definition of anonymous classes.
+	(variable_declarator): Handle definition of anonymous classes.
+	(class_instance_creation_expression): Ditto.
+
+	* wisent/wisent-java.el (wisent-java-default-setup): Setup
+	`semantic-imenu-expandable-tag-classes' to expand types and
+	variables.
+
+	* doc/user-guide.texi (imenu):
+	Document `semantic-imenu-expandable-tag-classes' in place
+	of `semantic-imenu-expandable-tag-class'.
+
+	* semantic-texi.el (semantic-default-texi-setup): Update to use
+	`semantic-imenu-expandable-tag-classes'.
+
+	* semantic-imenu.el (semantic-imenu-expandable-tag-classes):
+	Rename from
+	`semantic-imenu-expandable-tag-class'.  Accept a list of tag
+	classes.  All uses changed.
+
+	* semanticdb.el (semanticdb-file-table-object):
+	After loading a file, ensure that
+	the returned DB table contains tags.
+
+2004-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-mk.el (toplevel): Remove "compare" message.
+	Add better per-file message reporting number of toplevel tags.
+	Fix bug when jumping between subdirectories.
+
+2004-08-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-python.el (python-next-line):
+	Fix hang on unterminated lists.
+
+2004-08-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (initialize-instance):
+	Make tooltip loading safe.
+
+	* semanticdb-mk.el (semanticdb-mk-find-eieio): Deleted.
+	("Old setup code"): Replaced with
+	("New setup code"): load cedet.el from the usual place for a full seutp.
+	("Argument parser"): Stop if there are no files found.
+
+	* semanticdb.sh: Add smarter auto-path setup.
+
+2004-07-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el (semantic-html-set-endpoint, semantic-html-recursive-combobulate-list):
+	Fix locatins still refering to "texinfo" files.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	Update code comments.
+
+2004-07-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords):
+	Made Emacs 21.2 safe.
+
+2004-07-26  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi (Editing grammars):
+	Document `semantic-grammar-insert-keyword'.
+
+2004-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-tag-abstract-p):
+	Fix bug referencing cs.
+
+2004-07-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: Added `semantic-decoration-mode'.
+
+2004-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (VERSION): Updated to beta3
+
+	* tests/test.cpp (method1_for_class3, method4_for_class3):
+	Various completion tests.
+
+	* tests/test.c (funcptr): Test function pointer parsing.
+
+	* tests/scopetest.cpp (amethod2):
+	Added some entries to test completion.
+
+	* tests/Makefile, doc/Makefile, bovine/Makefile, Makefile (VERSION):
+	Updated to beta3
+
+	* semantic-fw.el (semantic-compile-warn):
+	Make sure this alias is evaluated at compile time.
+
+	* semantic-grammar.el (semantic-grammar-map, semantic-grammar-menu):
+	Add
+	semantic-grammar-insert-keyword function.
+	(semantic-grammar-insert-keyword): New function.
+
+	* semantic.el (semantic-version): Version change.
+
+	* Project.ede ("semantic"): Version chane.
+
+	* semanticdb-find.el (semanticdb-find-result-test): new function
+
+2004-07-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-default-to-tag):
+	Extract tag from find-result-nth
+	correctly.
+	(semantic-collector-abstract): Change datatype of
+	last-all-completions to allow nil.
+	(semantic-collector-calculate-completions-raw): Break it up so
+	it is easier to debug.
+	(semantic-collector-calculate-completions): Only calculate
+	last-completion slot if there is a value for `completion'.
+
+2004-07-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-persistent-path): doc fix.
+
+	* semantic-ctxt.el (semantic-get-local-variables-default):
+	Do nothing if there is no
+	parser table.
+
+	* semantic-html.el (html-helper-mode):
+	Make this a child mode of html-mode.
+
+	* semantic.el (semantic-parse-region-default):
+	Do nothing if the parse table has a
+	bad value.
+
+	* bovine/semantic-c.el: (semantic-tag-expand-function)
+	(semantic-dependency-include-path)
+	(semantic-orphaned-member-metaparent-type)
+	(semantic-symbol->name-assoc-list)
+	(semantic-symbol->name-assoc-list-for-type-parts)
+	(imenu-create-index-function)
+	(semantic-type-relation-separator-character)
+	(semantic-command-separation-character)
+	(document-comment-start)
+	(document-comment-line-prefix)
+	(document-comment-end)
+	(senator-step-at-tag-classes): New mode local variables
+	(semantic-default-c-setup): Removed above from hook.
+
+	* bovine/semantic-c.el:
+	(semantic-format-tag-name, semantic-tag-protection)
+	(semantic-tag-components, semantic-format-tag-type)
+	(semantic-format-tag-concise-prototype)
+	(semantic-format-tag-uml-prototype, semantic-tag-abstract-p)
+	(semantic-analyze-dereference-metatype)
+	(semantic-analyze-type-constants): Converted from semantic-c-* to
+	methods created with `define-mode-local-override'.
+	(semantic-default-c-setup): Remove old setup code
+	(c++-mode): Declair as a mode-local child of c-mode.
+
+2004-07-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Fix numbering issue.
+
+2004-06-29  David Ponce  <david@dponce.com>
+
+	* semantic-edit.el (working): Require.
+	(semantic-parse-changes-failed): Use `working-temp-message'.
+	(semantic-edits-incremental-fail)
+	(semantic-edits-incremental-parser)
+	(semantic-edits-incremental-parser-1): Likewise.
+
+	* bovine/semantic-c.el (semantic-c-end-of-macro): New function.
+	(semantic-lex-c-if): Use it.
+
+	* semantic-decorate-mode.el (semantic-decoration-mode):
+	Add autoload cookie.
+
+2004-06-28  David Ponce  <david@dponce.com>
+
+	* semantic-decorate-mode.el (semantic-decoration-styles):
+	Remove duplicate definition.
+
+2004-06-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el: (global-semantic-idle-scheduler-mode)
+	(define-semantic-idle-service): Added to semantic-modes group.
+
+	* semantic-decorate-mode.el (semantic-decoration-styles): Moved
+	(global-semantic-decoration-mode): Add to semantic-modes group.
+	(define-semantic-decoration-style): Do not eval-and-compile in the macro.
+
+	* semantic-util-modes.el (semantic-modes): New customization group
+	(global-semantic-highlight-edits-mode)
+	(global-semantic-show-unmatched-syntax-mode)
+	(global-semantic-stickyfunc-mode): Add to new customization group.
+
+2004-06-28  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.el (semantic-get-local-variables): New override.
+
+	* semantic-decorate-mode.el (semantic-decoration-styles):
+	Move before first use and make
+	available at compilation time.
+
+2004-06-24  David Ponce  <david@dponce.com>
+
+	* bovine/Makefile, doc/Makefile, Makefile, tests/Makefile, wisent/Makefile:
+	Re-generated.
+
+	* semantic.el (semantic-new-buffer-fcn):
+	Don't setup semantic again if buffer is
+	already semantic-enabled.
+
+2004-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el: (semantic-load-enable-minimum-features)
+	(semantic-load-enable-code-helpers)
+	(semantic-load-enable-excessive-code-helpers)
+	(semantic-load-enable-semantic-debugging-helpers): New functions
+	toplevel: Remove old enabling code, replace with call
+	to new functions.
+
+	* Makefile (tools_LISP): Includese semantic-decorate-mode.el
+
+	* Project.ede: ("tools") Added semantic-decoration-mode.el
+
+	* semantic-format.el (semantic-format-tag-custom-list):
+	Add autoload cookie.
+
+	* bovine/semantic-el.el (semantic-format-tag-abbreviate):
+	Remove trailing space from name.
+	(semantic-format-tag-prototype): If there are no arguments, remove
+	trailing space from name.
+
+	* semantic-complete.el (semantic-complete-inline-analyzer):
+	Enable inline completion if there
+	is only one match, and that match is not the same as the input symbol.
+
+2004-06-22  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (defvar-mode-local, defconst-mode-local):
+	Remove setup of
+	lisp-indent-function property now in common/mode-local.el.
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords): Add
+	`define-semantic-decoration-style'.
+
+2004-06-21  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (semantic-compile-warn): New function.
+	(semantic-alias-obsolete): Use it to issue less intrusive
+	messages.
+	(semantic-varalias-obsolete): Ditto.
+
+2004-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el:
+	Note: The functionality moved to semantic-decoration-mode:
+
+	(global-semantic-show-tag-boundaries-mode)
+	(semantic-show-tag-boundaries-setup)
+	(semantic-show-tag-boundaries-mode)
+	(semantic-tag-boundary-p-default)
+	(semantic-tag-boundary-overlay-p)
+	(semantic-stb-flush-rogue-boundaries)
+	(semantic-stb-clear-boundaries)
+	(semantic-stb-after-full-reparse-hook)
+	(semantic-stb-reparse-hook)
+	(semantic-stb-highlight-tag-line1)
+	(global-semantic-highlight-by-attribute-mode)
+	(semantic-highlight-by-attribute-setup)
+	(semantic-highlight-by-attribute-mode)
+	(semantic-hba-clear-highlighting)
+	(semantic-hba-reparse-hook)
+	(semantic-hba-highlight-tag): Deleted functions
+	(semantic-show-tag-boundaries-mode)
+	(semantic-highlight-by-attribute-mode): Deleted variables
+	(global-semantic-show-tag-boundaries-mode)
+	(semantic-show-tag-boundaries-hook)
+	(global-semantic-highlight-by-attribute-mode)
+	(semantic-highlight-by-attribute-hook)
+	(semantic-highlight-attribute-alist): Deleted custom vars.
+
+	* senator.el (senator-register-custom-menu): New function.
+	(senator-register-mode-menu-entry): Add `custom' argument.
+	Add customization menu entries to the dynamic list.
+	(senator-build-mode-sub-menu): Support Customization menu entries.
+	("Senator"): Add customize group entry.
+	("Highlight changes", "Highlight Unmatched Syntax"):  Add customize face entry
+	("Idle Scheduler"): Add entry to customize two variables.
+	("Tag Decoration"): New entry.
+	("Show Tag Boundaries", "Highlight Tags by attribute"): Deleted.
+
+	* doc/lang-support-guide.texi (Parsing a language file):
+	Add space between paragraphs
+
+	* semantic-decorate-mode.el (semantic-decorate-add-decorations):
+	Support invalid entries in the
+	styles list.
+	(semantic-decoration-styles): Enable customization.
+
+2004-06-19  David Ponce  <david@dponce.com>
+
+	* doc/lang-support-guide.texi (Parsing a language file): Doc for
+	`semantic-fetch-available-tags'.
+
+2004-06-18  David Ponce  <david@dponce.com>
+
+	* semantic-decorate-mode.el (semantic-decoration-mode-setup): Use
+	`semantic-fetch-available-tags' to postpone parse till after the
+	buffer is displayed.
+
+	* semantic.el (semantic-fetch-available-tags): New function.
+
+2004-06-17  David Ponce  <david@dponce.com>
+
+	* semantic-decorate-mode.el (semantic-decorate, cl): Require.
+	(semantic-decorate-style-predicate)
+	(semantic-decorate-style-highlighter)
+	(semantic-decoration-p)
+	(semantic-decoration-set-property)
+	(semantic-decoration-get-property)
+	(semantic-decoration-set-face)
+	(semantic-decoration-face)
+	(semantic-decoration-set-priority)
+	(semantic-decoration-priority)
+	(semantic-decoration-move)
+	(semantic-decorate-tag)
+	(semantic-decorate-clear-tag)
+	(semantic-decorate-tag-decoration)
+	(semantic-decorate-flush-decorations)
+	(semantic-decorate-clear-decorations)
+	(semantic-decorate-add-decorations)
+	(semantic-decorate-tags-after-full-reparse)
+	(semantic-decorate-tags-after-partial-reparse): New functions.
+	(semantic-decoration-styles): New variable.
+	(global-semantic-decoration-mode): Doc fix.
+	(semantic-decoration-mode-hook): Rename from
+	`semantic-decoration-hook'.  Callers updated.
+	(semantic-decoration-mode-setup): Rename from
+	`semantic-decoration-setup'.  Callers updated.  Use new functions.
+	(semantic-decoration-mode): Doc fix.
+	(semantic-decorate-tag-secondary-overlay-p)
+	(semantic-dso-flush-rogue-overlays)
+	(semantic-dso-clear)
+	(semantic-dso-after-full-reparse-hook)
+	(semantic-decorate-reparse-hook)
+	(semantic-decoration-primary-alist)
+	(semantic-decoration-secondary-alist)
+	(define-semantic-decoration-on-primary-overlay)
+	(define-semantic-decoration-on-secondary-overlay): Remove.
+	(semantic-toggle-decoration-style): New command.
+	(define-semantic-decoration-style): New macro.
+	(semantic-tag-boundary-face): Doc fix.
+	(semantic-tag-boundary-p-default): Doc fix and minor code change.
+	(semantic-tag-boundary-highlight-default): Update doc and code.
+	(semantic-decoration-on-private-members)
+	(semantic-decoration-on-private-members-face)
+	(semantic-decoration-on-private-members-p-default)
+	(semantic-decoration-on-private-members-highlight-default) Rename
+	from `semantic-decoration-private-*'.  Update doc and code.
+	(semantic-decoration-on-protected-members)
+	(semantic-decoration-on-protected-members-face)
+	(semantic-decoration-on-protected-members-p-default)
+	(semantic-decoration-on-protected-members-highlight-default):
+	Rename from `semantic-decoration-protected-*'.  Update doc and
+	code.
+
+2004-06-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (formal_parameter): Fix :typemodifiers value.
+	(local_variable_declaration): Likewise.
+
+2004-06-14  David Ponce  <david@dponce.com>
+
+	* semantic-decorate-mode.el (global-semantic-decoration-mode):
+	Fix :require.
+
+2004-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-decorate-mode.el:
+	Define a major mode for managing tag decorations.
+	Define a way for creating decoration styles on the primary overlay.
+	Define a way for creating decoration styles using a secondary overlay.
+	Define replacements for defaults in semantic-higlight-by-attribute-mode
+	and a replacement for semantic-show-tag-boundaries-mode.
+
+2004-06-12  David Ponce  <david@dponce.com>
+
+	* semantic-edit.el (semantic-edits-incremental-parser):
+	Schedule a full re-parse
+	on error, when `debug-on-error' is not set.
+
+2004-06-11  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-minor-mode-setup):
+	Remove unnecessary `condition-case'.
+
+2004-06-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-minor-mode-setup):
+	Do not parse buffer when enabling senator.
+
+	* semantic-util-modes.el (semantic-show-unmatched-syntax-mode-setup):
+	When enabling the mode,
+	if the syntax is out of date, do not immediatly display.
+	(semantic-show-tag-boundaries-mode): Doc fix
+	(semantic-highlight-by-attribute-mode): Doc fix
+
+	* semantic-util-modes.el: Remove History: comment block.
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Wrap body in `save-match-data'
+
+2004-06-09  David Ponce  <david@dponce.com>
+
+	* semantic-edit.el (semantic-edits-change-between-tokens):
+	Fix error on change after
+	the last tag.
+	(semantic-parse-changes-failed): Use `throw' instead of `signal'.
+	(semantic-parse-changes-failed): Remove error condition.
+	(semantic-edits-incremental-parser-1): Rename from
+	`semantic-edits-incremental-parser'.  Remove `condition-case'.
+	(semantic-edits-incremental-parser): Call it safely.
+
+	* semantic-edit.el (semantic-parse-changes-failed):
+	New error condition.
+	(semantic-parse-changes-failed): New function.
+	(semantic-edits-incremental-parser): Use it.
+
+2004-06-08  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Use Unix EOLs, so that the
+	generated file is portable to all platforms.
+
+2004-06-06  David Ponce  <david@dponce.com>
+
+	* semantic-idle.el (semantic-idle-summary):
+	Move (require 'eldoc), which always
+	returns non-nil, outside of the `or' condition.
+
+2004-05-26  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.wy (suite): Fix last change.
+
+2004-05-25  David Ponce  <david@dponce.com>
+
+	* bovine/Makefile, tests/Makefile, wisent/Makefile, Makefile:
+	Re-generated to start Emacs with --no-site-file.
+
+	* semantic-ede-grammar.el (semantic-ede-grammar-compiler-wisent):
+	Start Emacs with
+	--no-site-file option instead of -q.
+	(semantic-ede-grammar-compiler-bovine): Likewise.
+
+2004-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-python.wy (suite):
+	Do not reverse the list of items from the indented block.
+
+	* semantic-idle.el (define-semantic-idle-service): Comment fixes.
+	(semantic-idle-summary): Add require for eldoc in this function.
+
+	* semantic-util-modes.el: (semantic-highlight-attribute-face-private)
+	(semantic-highlight-attibute-face-protected): Convert light background
+	from an overline to a background color.
+
+2004-05-12  David Ponce  <david@dponce.com>
+
+	* semantic.el: (semantic-symbol->name-assoc-list-for-type-parts)
+	(semantic-expand-nonterminal, semantic--buffer-cache)
+	(semantic-edits-are-safe, semantic--before-fetch-tags-hook)
+	(semantic-after-toplevel-bovinate-hook)
+	(semantic-after-toplevel-cache-change-hook)
+	(semantic-init-db-hooks, semantic-parse-stream)
+	(semantic-parse-region, semantic-parse-region-default)
+	(semantic-clear-toplevel-cache, semantic-working-type)
+	(semantic-bovinate-from-nonterminal): Doc fix.
+	(bovinate): Fix message.
+
+2004-05-08  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-inhibit-functions): New variable.
+	(semantic-new-buffer-fcn): Use it.
+
+2004-04-29  David Ponce  <david@dponce.com>
+
+	* semantic-tag-ls.el (semantic-tag-abstract-p):
+	Declare with `define-overload'.
+	(semantic-tag-leaf-p): Likewise.
+	(semantic-nonterminal-abstract): Make obsolete overload.  Fix alias.
+	(semantic-nonterminal-leaf): Likewise.
+	(semantic-tag-abstract-p-default)
+	(semantic-tag-leaf-p-default)
+	(semantic-tag-static-p-default): Doc fix.
+	(semantic-nonterminal-abstract-default)
+	(semantic-nonterminal-leaf)
+	(semantic-nonterminal-leaf-default)
+	(semantic-nonterminal-static-default): Fix alias.
+
+	* semantic-tag-file.el (semantic-prototype-file):
+	Declare with `define-overload'.
+
+	* semantic-fw.el:
+	(semantic-fetch-overload, define-mode-overload-implementation)
+	(semantic-with-mode-bindings, define-semantic-child-mode): Mark
+	obsolete.
+	(semantic-fw-font-lock-keywords): Don't highlight them.
+
+	* semantic-analyze.el (semantic-analyze-dereference-metatype):
+	Declare with
+	`define-overload'.
+	(semantic-analyze-type-constants): Likewise.
+
+	* semantic-grammar.el: Rename `define-mode-overload-implementation' to
+	`define-mode-local-override', and `semantic-with-mode-bindings' to
+	`with-mode-local'.
+
+	* bovine/semantic-el.el:
+	Rename `define-mode-overload-implementation' to
+	`define-mode-local-override', and `define-semantic-child-mode' to
+	`define-child-mode'.
+
+	* bovine/semantic-java.el, bovine/semantic-make.el, bovine/semantic-scm.el, wisent/wisent-java-tags.el, wisent/wisent-java.el, wisent/wisent-python.el, semantic-html.el, semantic-texi.el, semanticdb-el.el:
+	Rename `define-mode-overload-implementation' to
+	`define-mode-local-override'.
+
+2004-04-28  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-el.el (semantic-emacs-lisp-overridable-doc): Use
+	`overload-docstring-extension'.
+	(semantic-documentation-for-tag): Simplify.
+	(semantic-insert-foreign-token): Rename to...
+	(semantic-insert-foreign-tag): The right name.
+
+	* senator.el (senator-insert-foreign-tag-default): Rename to...
+	(semantic-insert-foreign-tag-default): Doc fix.
+	(senator-insert-foreign-tag): Rename to...
+	(semantic-insert-foreign-tag): Declare with
+	`define-overload'.  Doc fix.  Update references.
+	(semantic-insert-foreign-token): Declare obsolete overload.
+
+	* semantic-texi.el (semantic-texi-expand-tag):
+	Use `semantic-tag-components'.
+	(semantic-sb-tag-children-to-expand): Likewise.
+	(semantic-texi-components): Replace by...
+	(semantic-tag-components): New mode local overload.
+	(semantic-texi-insert-foreign-tag): Declare as mode local
+	overload.
+	(semantic-default-texi-setup): Don't install overrides here.
+
+	* semantic-tag-ls.el (semantic-tag-protection):
+	Declare with `define-overload'.
+	(semantic-tag-full-name): Likewise.
+	(semantic-nonterminal-protection): Declare obsolete overload.
+	(semantic-nonterminal-full-name): Likewise.
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Declare with `define-overload'.
+	(semantic-dependency-tag-file): Likewise.
+	(semantic-find-nonterminal): Declare obsolete overload.
+	(semantic-find-dependency): Likewise.
+
+	* semantic-idle.el (semantic-eldoc-current-symbol-info): Use
+	`make-obsolete-overload'.
+
+	* semantic-ia-sb.el (semantic-ia-sb-complete): Fix comment.
+
+	* semantic-fw.el (mode-local): Require.
+	(semantic-overload-symbol-from-function): Move.
+	(semantic-alias-obsolete): Detect and make obsolete overload too.
+	(semantic-make-obsolete-overload)
+	(semantic-obsolete-overload): Remove.
+	(semantic-map-buffers): Use `mode-local-map-file-buffers'.
+	(semantic-map-mode-buffers): Alias of `mode-local-map-mode-buffers'.
+	(semantic-set-parent-mode, semantic-get-parent-mode)
+	(semantic-symbol-table, semantic-bindings-active-mode)
+	(semantic-new-bindings, semantic-bind, semantic-symbol)
+	(semantic-symbol-value, semantic-set-local-variable)
+	(semantic-activate-mode-bindings)
+	(semantic-deactivate-mode-bindings): Remove.
+	(semantic-fetch-overload): Alias of `fetch-overload'.
+	(define-mode-overload-implementation): Alias of
+	`define-mode-local-override'.
+	(semantic-with-mode-bindings): Alias of `with-mode-local'.
+	(define-semantic-child-mode): Alias of `define-child-mode'.
+	(defvar-mode-local, defconst-mode-local)
+	(define-overload): Now in mode-local.
+	(semantic-install-function-overrides): Use `mode-local-bind'.
+	(semantic--override, semantic--expand-overrides)
+	(semantic--overload-body, semantic-function-overload-p)
+	(semantic-overload-docstring-extension)
+	(semantic-augment-function-help, describe-function)
+	(semantic-print-binding, semantic-print-bindings)
+	(semantic-describe-bindings-2, semantic-describe-bindings-1)
+	(semantic-describe-buffer-bindings)
+	(semantic-describe-mode-bindings): Remove.
+	(semantic-fw-font-lock-keywords, edebug-setup-hook): Update.
+
+	* semantic.el (semantic-new-buffer-fcn): Remove call to
+	`semantic-activate-mode-bindings'.
+	(mode-local-init-hook): Add above to it.
+	(semantic-changed-mode-buffers)
+	(semantic-post-change-major-mode-function)
+	(semantic-change-major-mode-hook-function): Remove.
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Declare with `define-overload'.
+	(semantic-find-documentation): Declare obsolete overload.
+
+	* semanticdb-el.el (semanticdb-equivalent-mode):
+	Use `mode-local-active-mode'.
+
+	* semantic-ctxt.el (semantic-up-context):
+	Declare with `define-overload'.
+	(semantic-get-local-variables): Likewise.
+	(semantic-get-local-variables-default): Remove unnecessary
+	optional argument.  Doc fix.
+	(semantic-get-local-arguments): Declare with `define-overload'.
+	Save excursion.  Improve error message.
+	(semantic-get-local-arguments-default): Remove unnecessary
+	optional argument.  Doc fix.
+
+	* semantic-analyze.el (semantic-analyze-current-context): Declare with
+	`define-overload'.
+	(semantic-analyze-possible-completions): Likewise.
+
+2004-04-23  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (semantic-current-bindings): Remove.
+	(semantic-new-bindings): Just return an empty symbol table.
+	(semantic-bind): Updated.
+	(semantic-symbol): Lookup for symbol into buffer local and/or
+	hierarchy of modes bindings.
+	(semantic-set-local-variable): Move definition.
+	(define-mode-overload-implementation): Use
+	`semantic-overload-symbol-from-function'.  Doc fix.
+	(semantic-with-mode-bindings): Doc fix.
+	(semantic-print-bindings, semantic-print-binding)
+	(semantic-describe-bindings-1, semantic-describe-bindings-2)
+	(semantic-describe-buffer-bindings): New functions.
+	(semantic-describe-mode-bindings): New commands.
+
+2004-04-20  David Ponce  <david@dponce.com>
+
+	* semantic-idle.el (semantic-idle-summary-current-symbol-info):
+	New overload.
+	(eldoc-current-symbol-info): Obsoleted by above overload.
+	(semantic-idle-summary): Use above new overload.
+
+	* semantic-fw.el: (semantic-make-obsolete-overload)
+	(semantic-obsolete-overload): New function.
+	(semantic-fetch-overload): Handle obsoleted overloads.
+	(semantic--override, semantic--expand-overrides)
+	(semantic--overload-body): New functions.
+	(define-overload): Use them.
+	(semantic-fw-font-lock-keywords): Add
+	`semantic-make-obsolete-overload'.
+
+2004-04-13  David Ponce  <david@dponce.com>
+
+	* doc/lang-support-guide.texi, doc/semantic.texi, doc/user-guide.texi, doc/wisent.texi, doc/bovine.texi, doc/grammar-fw.texi, doc/app-dev-guide.texi:
+	Add a table of contents.
+
+2004-04-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-system.el (semanticdb-load-system-database):
+	Fix variable name typo.
+
+2004-04-06  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-production-bounds): New function.
+
+	* wisent/wisent-comp.el (wisent-check-$N):
+	Return non-nil for valid $regionN symbols.
+	Improve warning message.
+	(wisent-semantic-action): Only bind referenced $regionN symbols.
+	Compute $region directly from stack.  Avoid to generate
+	unnecessary code.
+
+	* semantic-lex.el (semantic-lex-push-token): Don't eval TOKEN twice.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/Makefile (clean): Clean all info files.
+
+	* Makefile (dist): Distribute the autoload file
+
+2004-04-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-default-c-setup):
+	New versions of c++-mode declare < and >
+	to make a list.  Disable it.
+
+2004-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-bovinate-toplevel):
+	New function for backward compat.
+
+2004-03-31  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-make.el (semantic-make-expand-tag):
+	Fix according to latest grammar
+	change.
+
+2004-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/Makefile (Documentation_TEXINFOS): Remove duplicate semantic.texi
+	(all): New names for some info names.
+	(semantic-user.info, semantic-appdev.info, semantic-langdev.info):
+	New names.
+	(clean): Update info garbage pattern.
+	(dist): New names for some info names.
+
+	* doc/Makefile (Documentation_TEXINFOS):
+	Remove second copy of semantic.texi
+
+	* doc/Project.ede (Documentation): Remove second copy of semantic.texi
+
+2004-03-30  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-parse-verbose-flag): Add autoload cookie.
+
+	* wisent/wisent-comp.el (wisent-verbose-flag): Add autoload cookie.
+
+	* doc/Makefile: Rebuild.
+
+	* doc/Project.ede ("images"): New target.
+
+2004-03-28  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-mode):
+	Merge `set' and `make-local-variable'.
+	Make `semantic-format-face-alist' local to buffer.
+
+	* wisent/Makefile: Rebuild.
+
+	* wisent/Project.ede (taggers): Rename target to "wy".
+
+	* wisent/wisent.el ($region, $nterm, $action): Initialize to nil to fix
+	byte-compiler warnings in dependent libraries.
+
+	* semantic-util.el (semantic-file-tag-table):
+	Remove CHECKCACHE argument.
+	(semantic-something-to-tag-table): Fix call to above.
+
+	* semantic-html.el (semantic-html-recursive-combobulate-list): Use
+	`assoc-ignore-case'.  `assoc-string' is a new function in GNU
+	Emacs CVS.
+
+2004-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (misc_AUX): Add renamelist.txt
+
+	* Project.ede ("semantic"): Add renamelist.txt.
+
+	* doc/tags.texi (Semantic Tags):
+	Replace "bovine" type named fns with new names.
+
+	* doc/lang-support-guide.texi:
+	(Language Support Overview, Semantic Parser Structure)
+	(Writing Lexers, Writing Parsers, Parsing a language file):
+	(Semantic 1.4 Doc): Replace "bovine" type named fns with new names.
+
+	* bovine/semantic-make.el (require):
+	Add semantic-format and semantic-analyze
+
+	* bovine/semantic-c.el (require): Add semantic-tag-ls.
+
+	* semantic.el (semantic-fetch-tags): Doc fix.
+
+	* semantic-ede-grammar.el (semantic-ede-grammar-compiler-class):
+	Doc fix.
+
+	* semantic-ctxt.el (semantic-get-local-variables): Doc fix
+
+	* semantic-complete.el (semantic-displayor-show-request): Note to self.
+
+	* renamelist.txt: List of all functions that have been renamed.
+
+	* doc/app-dev-guide.texi (Override Methods):
+	Removed Local Context from override methods list.
+	(Lexical Safety): Fix ref to semantic-fetch-tags.
+	(Blocks): Updated all deffn with automatic command.
+	(Local Variables): same
+	(Derived Context): same
+	(Analysis Overview): Teaked the diagram.
+
+2004-03-26  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy:
+	Major revision of the grammar to support Java 1.5 specifications.
+
+	* wisent/wisent-java.el: Code reordered.
+	(wisent-java-expand-tag)
+	(semantic-get-local-variables-java-mode): Update for new grammar.
+	(wisent-java-init-parser-context): New function.
+	(wisent-java-default-setup): Use it.  Doc fix.
+	(wisent-java-parse-error): Remove.
+
+2004-03-25  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (constructor_declaration): Fix typo.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy (constructor_declaration):
+	Add :contructor-flag.
+
+	* semantic-tag.el (semantic-tag-function-constructor-p): New function.
+
+	* doc/wisent.texi (Grammar format): Fix doc and style.  Update example.
+	(Compiling a grammar): Fix doc and style.
+	(Grammar Debugging): Ditto.  Add doc for
+	`wisent-toggle-verbose-flag'.
+	(Understanding the automaton): Fix style.
+	(Wisent Parsing): Fix style and doc.  Add variable indexes.
+	(Writing a lexer): Add variable index.
+	(Actions goodies): Fix doc.
+	(Report errors): Add doc for `wisent-message',
+	`wisent-token-to-string', `wisent-parse-verbose-flag' and
+	`wisent-parse-toggle-verbose-flag'.
+	(Error recovery): Fix doc and style.
+	(Debugging actions): Ditto.
+	(Wisent Lex): Ditto.
+
+2004-03-24  David Ponce  <david@dponce.com>
+
+	* wisent/semantic-wisent.el (wisent-error-function): Default to nil.
+
+	* wisent/wisent.el (wisent-char-p): Move here from wisent-comp.el.
+	(wisent-escape-sequence-strings): New constant.
+	(wisent-region)
+	(wisent-pre-parse-hook, wisent-post-parse-hook)
+	(wisent-loop): Move declaration.
+	(wisent-parse-verbose-flag): New variable.
+	(wisent-item-to-string, wisent-token-to-string)
+	(wisent-parse-toggle-verbose-flag)
+	(wisent-message): New function.
+	(wisent-parse-max-stack-size)
+	(wisent-parse-max-recover)
+	(wisent-parse-lexer-function)
+	(wisent-parse-error-function)
+	(wisent-input, wisent-recovering)
+	(wisent-errok, wisent-clearin, wisent-abort)
+	(wisent-parse-action): Doc fix.
+	($region, $nterm): Remove default value and doc string.
+	($action): New.
+	(wisent-skip-token): No more inlined. Doc fix. Inform about
+	skipped token.
+	(wisent-skip-block): Doc fix.  Return nil.  Inform about skipped
+	tokens.
+	(wisent-parse): Use `wisent-message' as default error reporting
+	function.  Report expected tokens on syntax error.  Inform about
+	skipped tokens.  Simplify (and fix?) error recovery code.
+
+	* wisent/wisent-comp.el (wisent-char-p): Move to from wisent.el.
+	(wisent-context-name, wisent-reduce-grammar)
+	(wisent-add-lookback-edge,  wisent-push-token)
+	(wisent-push-var, wisent-parse-nonterminals)
+	(wisent-parse-grammar): Fix error messages.
+	(wisent-struct, wisent-debug-flag, wisent-new-log-flag)
+	(wisent-verbose-flag, wisent-single-start-flag)
+	(wisent-append-to-log-file, wisent-TC)
+	(wisent-initialize-closure): Doc fix.
+	(wisent-escape-sequence-tags): Remove.
+	(wisent-tag): Use `wisent-item-to-string' from wisent.el.
+	(wisent-map-goto): Fix doc and error message.
+	(wisent-defcontext 'semantic-actions): Add NAME.
+	(wisent-token-actions): Rename to...
+	(wisent-state-actions): Fix working message.  Callers updated.
+	(wisent-goto-actions): Fix working message.
+	(wisent-check-$N): Include action name in message.
+	(wisent-semantic-action-expand-body): Doc fix.  Rename $N-LIST
+	argument to FOUND.
+	(wisent-semantic-action): Share action name with called functions.
+
+	* wisent/wisent-calc.wy (line): Add error recovery rule.
+
+	* wisent/wisent-calc.el (wisent-calc):
+	Use default syntax error reporting function.
+
+2004-03-21  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el: Renamed to semantic-wisent.el.
+
+	* wisent/Makefile: Re-generated.
+
+	* wisent/Project.ede (wisent):
+	Include semantic-wisent instead of wisent-bovine.
+	Add speedbar to aux packages to ensure that the cedet version of
+	speedbar will be in the load-path.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-python.el, semantic-grammar.el, wisent/wisent-c.el, wisent/wisent-calc.el, wisent/wisent-java.el (semantic-wisent):
+	Require instead of wisent-bovine.
+
+	* wisent/semantic-wisent.el: Renamed from wisent-bovine.el.
+
+	* semantic-util-modes.el, semantic-util.el: Commentary fix.
+
+	* semantic-sb.el (semantic-sb-fetch-tag-table): Doc fix.
+
+	* semantic-imenu.el: (semantic-create-imenu-index)
+	(semantic-create-imenu-index-1): Doc fix.
+
+	* semantic.el (semantic-fetch-tags): Doc fix.
+	(semantic-bovinate-toplevel): Define as alias of the above.
+	(semantic-repeat-parse-whole-stream): Doc fix.  Use tag instead
+	of token.
+
+2004-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-scm.el (semantic-format): Add compile time require
+
+	* bovine/erlang-edoc.el (erlang-edoc--tag-name): Moved and renamed.
+	(erlang-edoc-inline)
+	(erlang-edoc-insert-comment-new)
+	(erlang-edoc-insert-comment)
+	(erlang-edoc--function-template)
+	(erlang-edoc--record-template)
+	(erlang-edoc--strip-arity)
+	(erlang-edoc--type-specs)
+	(erlang-edoc--nonterm-comment)
+	(erlang-edoc): Use new names, such as `semantic-tag-name'.
+
+2004-03-20  David Ponce  <david@dponce.com>
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic.el (semantic-bovination-working-type): Fix typo in alias.
+
+2004-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-grammar.el (wisent-grammar-setupcode-builder):
+	Use new names.  See semantic.el V 1.177.
+
+	* wisent/wisent-calc.el (wisent-calc):
+	Use new names.  See semantic.el V 1.177.
+
+	* wisent/wisent-bovine.el (wisent-parse-stream, wisent-parse-region):
+	Use new names.  See semantic.el V 1.177.
+
+	* wisent/Makefile, doc/Makefile (Makefile):
+	Updated from new EDE sources.
+
+	* bovine/semantic-el.el (semantic-toplevel-elisp-bovine-table):
+	Renamed to
+	(semantic--elisp-parse-table): new name.
+	(semantic-toplevel-bovine-table): Renamed mode value to
+	(semantic--parse-table): New name.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-nonterminal-check-obarray):
+	Moved this here.
+	(semantic-bovinate-stream): Use new names.  See semantic.el V 1.177.
+
+	* bovine/Makefile (Makefile): Updated from new EDE sources.
+
+	* bovine/erlang-edoc.el (erlang-edoc-inline):
+	* bovine/bovine-grammar.el (bovine-grammar-setupcode-builder):
+	Use new names.  See semantic.el V 1.177.
+
+	* senator.el (senator-parse, senator-try-expand-semantic):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-util-modes.el: (semantic-show-unmatched-syntax-mode-setup)
+	(semantic-show-tag-boundaries-setup)
+	(semantic-highlight-by-attribute-setup):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-util.el (semantic-describe-token): Renamed to
+	(semantic-describe-tag): New name.  Also use new names.
+	(semantic-file-tag-table)
+	(semantic-something-to-tag-table)
+	(semantic-recursive-find-nonterminal-by-name)
+	(semantic-read-symbol, semantic-add-label, semantic-show-label)
+	(semantic-hack-search, semantic-sanity-check):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-texi.el (semantic-texi-bovinate-headings): Rename to
+	(semantic-texi-parse-headings): New name.
+	(semantic-texi-parse-region, semantic-default-texi-setup)
+	(semantic-texi-find-documentation)
+	(semantic-texi-update-doc-from-texi)
+	(semantic-texi-update-doc-from-source)
+	(semantic-texi-goto-source): Use new names.  See semantic.el V 1.177.
+
+	* semantic-tag-file.el (semantic-go-to-tag): Update comments.
+
+	* semantic-tag.el: (semantic--tag-unlink-cache-from-buffer)
+	(semantic--tag-link-cache-to-buffer):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-sb.el (semantic-sb-maybe-token-to-button): Doc fix.
+	(semantic-insert-bovine-list): Rename to
+	(semantic-sb-insert-tag-table): New name.
+	(semantic-fetch-dynamic-bovine): Rename to
+	(semantic-sb-fetch-tag-table): new name.
+	(semantic-sb-insert-details): Use new names above.
+	(speedbar-dynamic-tags-function-list): Use new names.  See semantic.el V 1.177.
+
+	* semantic-imenu.el: (semantic-create-imenu-index)
+	(which-function): Use new names.  See semantic.el V 1.177.
+
+2004-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-scheduler-refresh-tags):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-html.el (semantic-default-html-setup):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-grammar-wy.el (semantic-grammar-wy--install-parser):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-format.el (semantic-test-all-format-tag-functions):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-find.el (semantic-brute-find-tag-by-position):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-example.el (se-jump):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic-debug.el (semantic-debug):
+	Use new names.  See semantic.el V 1.177.
+
+	* semanticdb-search.el (semanticdb-refresh-table): Update doc string.
+
+	* semanticdb-file.el (object-write):
+	Use new names.  See semantic.el V 1.177.
+
+	* semanticdb.el:
+	(semanticdb-refresh-table, semanticdb-semantic-init-hook-fcn)
+	(semanticdb-kill-hook): Use new names.  See semantic.el V 1.177.
+	(semanticdb-post-bovination): Renamed to
+	(semantic-synchronize-table): New name.
+	(semanticdb-hooks): Use new name above
+
+	* semantic-ctxt.el: (semantic-get-local-variables)
+	(semantic-get-local-variables-default): Use new names.
+	See semantic.el V 1.177.
+
+	* Makefile: misc_AUX: Add ONEWS.
+
+	* Project.ede ("misc"): Add ONEWS.
+
+	* document.el (document, document-inline, document-update-comment):
+	Use new names.
+	See semantic.el V 1.177.
+
+	* semantic-edit.el (semantic-edits-change-function-handle-changes):
+	Move call to set that
+	the parse tree needs update up one level.
+	(semantic-edits-change-between-tokens)
+	(semantic-edits-change-over-tokens, semantic-edits-incremental-parser)
+	(semantic-edits-splice-remove, semantic-edits-splice-insert):
+	Use new names.  See semantic.el V 1.177.
+
+	* semantic.el (semantic-after-toplevel-bovinate-hook):
+	Fix obsoletion call.
+
+	* semantic.el (Commentary): Rewrite last paragraph.
+	(semantic-toplevel-bovine-table): Renamed to
+	(semantic--parse-table): New name
+	(semantic-toplevel-bovine-cache): Renamed to
+	(semantic--buffer-cache): New name
+	(semantic-edits-are-safe): Doc update
+	(semantic-bovinate-nonterminal-check-obarray):
+	Removed to bovine/semantic-bovine.el
+	(semantic-before-toplevel-bovination-hook): Rename to
+	(semantic--before-fetch-tags-hook): New name
+	(semantic-after-toplevel-bovinate-hook): Made obsolete
+	(semantic-bovine-unmatched-syntax-refresh-needed-p): Renamed to
+	(semantic--umatched-syntax-needs-refresh-p): New name
+	(semantic-new-buffer-fcn): Use new names.
+	(semantic-rebovinate-quickly-hook): Renamed to
+	(semantic-fetch-tags-fast): New name.
+	(eval-defun-hooks): Use new function name above.
+	(semantic-edebug): Doc change.
+	(bovinate): New doc.  Use new names where apropriate.
+	(bovinate-debug): Deleted.
+	(semantic-parse-stream): New names in doc.
+	(semantic-bovinate-unmatched-syntax): Renamed to
+	(semantic-unmatched-syntax-tokens): New name.  Use new names.
+	(semantic-clear-toplevel-cache): Use new names.
+	(semantic-set-toplevel-bovine-cache): Renamed to
+	(semantic--set-buffer-cache): New name.  Use new names.
+	(semantic-bovination-working-type): Renamed to
+	(semantic-working-type): New name.
+	(semantic-bovinate-toplevel): Renamed to
+	(semantic-fetch-tags): New name.
+	(semantic-repeat-parse-whole-stream): Use new names.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-includes-default):
+	Add `semantic-throw-on-input' while looping over include tags.
+
+2004-03-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy:
+	Re-introduce rules to fully parse language constructs.
+	Add Java 1.4 assert statement.
+	First attempt to produce tags for declarations inside blocks.
+
+	* semantic-lex.el (semantic-lex-preset-default-types):
+	Fix punctuation regexp.
+
+2004-03-11  David Ponce  <david@dponce.com>
+
+	* doc/tags.texi:
+	Info style fixes.  Use lowercase in @var markups.  Fix doc
+	strings with renamed tag attributes.
+
+	* doc/wisent.texi (Debugging actions): Fix doc string style.
+	(Iterative style, Bison style): Fix examples with renamed tag
+	attributes.
+
+	* doc/bovine.texi (Optional Lambda Expression):
+	Fix renamed tag attributes.
+
+	* document.el (document-massage-to-texinfo):
+	Use lowercase in @var markup.
+
+2004-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-ctxt-current-function, semantic-ctxt-current-argument):
+	New overload implementations.
+	(semantic-analyze-possible-completions): Use
+	`semantic-with-mode-bindings' and recurse when in lisp code.
+
+	* semantic-format.el (semantic-test-all-format-tag-functions):
+	Remove doc about semantic-token->text-functions.
+
+	* semantic-example.el (se-show):
+	Removed ref to semantic-token->text-functions.
+
+	* semanticdb-el.el (semanticdb-equivalent-mode): Also pay attention to
+	`semantic-bindings-active-mode'.
+	(semanticdb-find-translate-path): New overload for
+	`emacs-lisp-mode'.  Always includes the system database
+	since all Emacs programs also include the system database.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	make input arg optional.
+	(semantic-analyze-current-context-default):
+	Calculate the assignment tag in `condition-case'.
+	(semantic-analyze-possible-completions-default):
+	Uniquafy by name instead of by position and name.
+
+	* semantic-sb.el: (semantic-sb-tag-children-to-expand)
+	(semantic-sb-tag-children-to-expand-default):
+	New override fcn and the default.
+	(semantic-sb-one-button): Use above to choose to expand a tag.
+	(semantic-sb-insert-details): If there is no built in way
+	to show a child details, instead ask it for it's components
+	and do something smiple to show them.
+
+	* semantic-texi.el: (semantic-sb-tag-children-to-expand)
+	(semantic-ctxt-current-class-list)
+	(semantic-format-tag-abbreviate, semantic-format-tag-prototype)
+	(semantic-analyze-current-contet)
+	(semantic-analyze-possible-completions): New overloads
+	(semantic-texi-command-completion-list): New variable.
+
+	* Makefile (Languages_LISP): Added semantic-html.el
+	(Makefile): New friendlier message if makefile out of date.
+
+	* Project.ede (Languages): Added semantic-html.el.
+
+	* NEWS (Smart Completion): New section.
+	(HTML parser): New section added.
+	(Makefile parser): Description of smart completion.
+
+2004-03-10  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy:
+	(goal, class_declaration, interface_declaration)
+	(constructor_declaration, method_declaration)
+	(formal_parameter, field_declarations_opt, field_declaration)
+	(abstract_method_declaration): Rename attributes.
+
+	* wisent/wisent-java-tags.wy:
+	(class_declaration, interface_declaration)
+	(constructor_declaration, method_declaration)
+	(formal_parameter, field_declaration): Rename attributes.
+
+	* wisent/wisent-java.el (wisent-java-expand-tag): Rename attribute.
+
+	* wisent/wisent-c.wy: (declaration, parameter-declaration)
+	(function-definition): Rename attribute.
+
+	* wisent/wisent-c.el (wisent-c-expand-tag): Rename attributes.
+
+	* bovine/semantic-el.el: (semantic-elisp-clos-args-to-semantic)
+	(semantic-elisp-use-read)
+	(semantic-tag-static-p): Rename attributes.
+	(semantic-tag-protection): Ditto.  Doc fix.
+
+	* bovine/semantic-c.el:
+	(semantic-expand-c-tag, semantic-c-reconstitute-token)
+	(semantic-c-reconstitute-template, semantic-c-format-tag-name)
+	(semantic-c-format-tag-type, semantic-c-tag-template)
+	(semantic-c-tag-template-specifier)
+	(semantic-c-analyze-dereference-metatype)
+	(semantic-c-tag-abstract-p): Rename attributes.
+
+	* bovine/erlang.by (macro-def-list): Rename attribute.
+
+	* bovine/c.by: (macro-or-include, define, enumsubparts)
+	(typesimple, template-type, variablearg)
+	(fun-or-proto-end): Rename attributes.
+
+	* semantic-util-modes.el (semantic-tag-boundary-p-default):
+	Rename attribute.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi):
+	Rename attribute.
+
+	* semantic-tag.el: (semantic-tag-modifiers)
+	(semantic-tag-function-throws)
+	(semantic-tag-function-parent)
+	(semantic-tag-function-destructor-p)
+	(semantic-tag-variable-constant-p): Rename attribute.
+
+	* semantic-sort.el (semantic-tag-external-member-parent-default):
+	Rename attribute.
+	(semantic-tag-external-member-p): Doc fix.
+
+	* semantic-format.el (semantic-format-tag-prototype-default):
+	Rename attributes.
+	(semantic-format-tag-concise-prototype-default): Ditto.
+
+	* semanticdb-el.el (semanticdb-elisp-sym->tag): Rename attribute.
+
+	* semantic-analyze.el (semantic-analyze-tag-prototype-p-default):
+	Rename attribute.
+
+	* document.el (document-insert-texinfo): Rename attribute.
+
+2004-03-09  David Ponce  <david@dponce.com>
+
+	* doc/bovine.texi (Optional Lambda Expressions): Fix info style.
+	(Bovine Examples): Fix info style and update examples according to
+	BY grammar specifications.
+
+	* doc/grammar-fw.texi (start Decl): Fix inforef.
+
+	* senator.el (senator-isearch-search-fun): New function.
+	(senator-isearch-mode-hook): Use it when possible.
+	(boundp 'isearch-search-fun-function): Don't advice built-in
+	search functions.
+	(isearch-mode-end-hook): Add `senator-isearch-mode-hook'.
+
+2004-03-08  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (semantic-activate-mode-bindings):
+	Fix parent modes & mode order.
+
+	* semantic-fw.el (semantic-activate-mode-bindings):
+	Activate mode local bindings
+	from parent modes.
+	(semantic-activate-mode-bindings): Deactivate mode local bindings
+	from parent modes.
+
+	* semantic-fw.el (semantic-with-mode-bindings): Call
+	semantic-[de]activate-mode-bindings with an explicit mode.
+	(semantic-activate-mode-bindings): Revert previous change.
+	(semantic-deactivate-mode-bindings): Use current major mode as
+	default mode.
+
+	* semantic-fw.el (semantic-current-bindings): Fix last change.
+	(semantic-symbol): Don't change the local symbol table when
+	`semantic-bindings-active-mode' is non-nil.
+
+2004-03-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-html.el: HTML support.
+
+2004-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-sb-one-button):
+	Format the string in the context of the
+	originating buffer.
+
+	* semantic-analyze.el: (semantic-analyze-current-context)
+	(semantic-analyze-possible-completions):
+	Only execute with the current modified syntax table.
+
+	* bovine/semantic-make.el (semantic-ctxt-current-class-list):
+	Variables can have functions, not
+	variable parts.
+	(semantic-format-tag-abbreviate)
+	(semantic-format-tag-prototype): file -> filename confusion
+	(semantic-analyze-possible-completions): Only calc file list if
+	filename is a possible class.
+
+	* bovine/semantic-make.el (semantic-default-make-setup):
+	Add "Files" to assoc list.
+	(semantic-function-argument-separator): New mode variable
+	(semantic-ctxt-current-class-list)
+	(semantic-format-tag-abbreviate)
+	(semantic-format-tag-prototype)
+	(semantic-format-tag-concise-prototype)
+	(semantic-format-tag-uml-prototype)
+	(semantic-analyze-possible-completions): New override methods.
+
+	* bovine/make.by (elements): Splice them together.
+
+	* semantic-grammar.el (semantic-grammar-complete):
+	use `semantic-grammar-in-lisp-p'
+	(eldoc-current-symbol-info): Renamed
+	(semantic-idle-summary-current-symbol-info): to this.
+	(semantic-ctxt-current-class-list): New method.
+	(semantic-analyze-current-context)
+	(semantic-analyze-possible-completions): New methods.
+
+	* doc/tags.texi (Creating Tags):
+	Reran defun generation script on some entries.
+
+	* doc/app-dev-guide.texi (Override Methods):
+	Add semantic-with-mode-bindings.
+
+	* semantic-ctxt.el (semantic-ctxt-current-class-list-default):
+	Make robust when there
+	is not tag under point.
+
+	* semantic-fw.el (semantic-bindings-active-mode): New variable
+	(semantic-current-bindings): Also pay attention to above var.
+	(semantic-activate-mode-bindings): Do not use major-mode.
+	(semantic-with-mode-bindings): New macro.
+
+	* semantic-analyze.el (semantic-analyze-tags-of-class-list):
+	New function
+	(semantic-analyze-possible-completions): Turn input arg to a
+	context here.
+	(semantic-analyze-possible-completions-default):
+	Remove login in above.
+	Use new fcn above.
+
+2004-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/app-dev-guide.texi (Tag Details): Updated defuns via script.
+	(Local Context): Updated defuns, and added
+	`semantic-ctxt-current-class-list'.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi):
+	Do not accept override-function
+	tags to insert as doc.  Always look for the original.
+
+	* semantic-tag.el (semantic-equivalent-tag-p):
+	Allow two tags to not have a buffer.
+
+	* semantic-ctxt.el (semantic-ctxt-current-class-list):
+	new override method.
+	(semantic-ctxt-current-class-list-default): new override implementation.
+
+	* bovine/semantic-el.el (semantic-ctxt-current-function):
+	Don't use built-in anymore.
+	Find it ourselves.
+	(semantic-ctxt-current-class-list): New override.
+
+	* semantic-analyze.el (semantic-analyze-context):
+	Added PREFIXCLASS slot.
+	(semantic-analyze-current-context-default): Find and store the prefixclass
+	(semantic-analyze-type-constraint): Only calculate on TAG input.
+	(semantic-analyze-possible-completions): Made into an override method.
+	(semantic-analyze-possible-completions-default): Old body of above.
+	Added desired-class filter on output.
+	(semantic-analyze-princ-sequence): More logical flow.
+
+2004-03-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el: (semantic-analyze-find-tags-by-prefix)
+	(semantic-analyze-find-tag): Do not require that tags are
+	only allowed if there is a file.  If a file is there, load it.
+	(semantic-analyze-find-tag-sequence): Allow non-variables to be found.
+	(semantic-analyze-calculate-bounds): New function
+	(semantic-analyze-current-context): Made an override function
+	(semantic-analyze-current-context-default): Implementation from
+	above.
+	(semantic-analyze-princ-sequence): If a non-tag is being displayed,
+	mark it so it is obvious.
+
+	* semantic-idle.el (semantic-idle-summary-out-of-context-faces):
+	Add string-face.
+
+	* bovine/semantic-el.el (semantic-ctxt-current-assignment):
+	Moved and Implemented.
+	(semantic-ctxt-current-function): Improved.
+	(semantic-format-tag-abbreviate, semantic-format-tag-prototype)
+	(semantic-format-tag-concise-prototype)
+	(semantic-format-tag-uml-prototype): New implementations.
+
+2004-03-03  David Ponce  <david@dponce.com>
+
+	* doc/overview.texi (Overview): Rewrite.
+	(Semantic Components): Fix typos and style.
+
+2004-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el (document-texify-elisp-docstring):
+	Support `.' as a char after
+	quoted symbols.
+
+2004-03-03  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi (Overview): Add ref. to sections...
+	(BY grammars): Add note and ref. to the bovine manual.
+	(WY grammars): Add note and ref. to the wisent manual.
+
+2004-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-displayor-window-edges):
+	eval-AND-compile this block.
+
+	* semantic-tag-ls.el (semantic-tag-protection, semantic-tag-full-name):
+	Add 'semantic-overload' property.
+	(semantic-tag-abstract-p, semantic-tag-leaf-p):
+	Fix call to default which was renamed.
+
+	* doc/lang-support-guide.texi (Tag Structure):
+	Renamed `semantic-expand-nonterminal' reference to
+	`semantic-tag-expand-function'.
+	(Writing Parsers): Added `Parser Backend Support' section.
+	(Parsing a language file): Removed `semantic-bovinate-stream' as it is
+	not a 2.0 compatible function.
+	(Parser Backend Support): New node and subnodes.
+	(Parser Output tools): Fixed formatting of a keymap table.
+
+	* doc/glossary.texi (Glossary): Changed the format.
+	Added token table.
+
+	* bovine/semantic-skel.el (semantic-skeleton-expand-tag): Renamed
+	(semantic-default-skel-setup): Updated.
+
+2004-03-02  David Ponce  <david@dponce.com>
+
+	* doc/user-guide.texi (Contact information for Senator): Remove.
+
+	Add common ending nodes.
+
+	* doc/semantic.texi (top):
+	Remove info ref from menu that produce bad URLs in HTML
+	output.  Move them into...
+	(Semantic Manuals): New chapter with ref to other manuals.
+
+	* doc/semanticheader.texi: Add common settings in this file.
+	(obsolete): Improve readability.
+
+	* doc/lang-support-guide.texi (direntry): Fix typo.
+	(Compiling): Rename to...
+	(Parsing a language file): Update definitions.
+	(Writing Parsers): Add ref. to parser manuals.  Remove from menu.
+	(Grammar Programming Environment): Add ref. to grammar framework
+	manual.  Remove duplicated things.
+	(Parser Output tools): Fix typo.
+
+	Add common ending nodes.
+
+	* doc/grammar-fw.texi (Editing grammars): Add note about
+	semantic-grammar-create-package.
+
+	* doc/bovine.texi (top): Update.
+	(%start, %languagemode, %token): Remove.
+	(Starting Rules): New.
+	(Bovine Grammar Rules): Update.
+	(How Lexical Tokens Match)
+	(Grammar-to-Lisp Details)
+	(Order of components in rules): New sections.
+
+	Add common ending nodes.
+
+	* doc/app-dev-guide.texi (top): Fix inforef.
+
+	Add common ending nodes.
+
+2004-03-01  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi (languagemode Decl): Use mode1 for consistency.
+	(Querying grammars): New intro.  Add...
+	(Grammar Tags, Querying Declarations): New subsections.
+
+	* doc/grammar-fw.texi (Editing grammars): Better @inforef.
+	(Grammar Macros): Typo.
+	(Adding a new grammar mode): Add...
+	(Specialized Implementation, Querying grammars): New sections.
+
+2004-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/app-dev-guide.texi (Context Analysis):
+	Added new menu and three sub chapters.
+
+	* semantic-format.el (semantic-format-tag-type): Autoload cookie.
+
+	* doc/app-dev-guide.texi (Format Tag): Add `semantic-format-tag-type'.
+
+	* doc/tags.texi (Tag Basics):
+	Fix name of `semantic-tag-expand-function'.
+
+	* bovine/semantic-el.el (semantic-tag-static): Renamed to
+	(semantic-tag-static-p): New name.
+
+	* bovine/semantic-c.el (semantic-c-tag-abstract): Renamed to
+	(semantic-c-tag-abstract-p): New name.  Use new name when
+	deferring to the default.
+	(semantic-default-c-setup): Use new name above.
+
+	* semantic-format.el: (semantic--format-uml-post-colorize)
+	(semantic-uml-attribute-string): Use new names for
+	`semantic-tag-abstract-p', `semantic-tag-leaf-p',
+	`semantic-tag-static-p'.
+
+	* semantic-tag-ls.el (semantic-tag-abstract): Renamed to
+	(semantic-tag-abstract-p): New name
+	(semantic-tag-abstract-p-default): New name
+	(semantic-tag-leaf): Renamed to
+	(semantic-tag-leaf-p): New name.
+	(semantic-tag-leaf-p-default): New name.
+	(semantic-tag-static): Renamed to
+	(semantic-tag-static-p): New name
+	(semantic-tag-static-p-default): New name
+
+	* doc/app-dev-guide.texi (Tag Details):
+	Updated names of some functions.
+
+2004-02-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/lang-support-guide.texi (Writing Parsers):
+	Added menu item pointing to Grammar Framework.
+
+	* INSTALL: Revamped. We are a part of a CEDET install now.
+
+2004-02-27  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi (use-macros Decl): More things.
+	(Editing grammars): Add note about
+	semantic-grammar-find-macro-expander and semanticdb.
+	(Grammar Macros): More things.
+	(Common grammar macros): Add ref.
+
+2004-02-26  David Ponce  <david@dponce.com>
+
+	* semantic-idle.el (semantic-idle-scheduler-max-buffer-size):
+	Declare before first
+	use.  Fix doc string.
+	(define-semantic-idle-service): Use `eval-and-compile' to have
+	generated declarations available at compile time.
+
+	* semantic-ia-sb.el (semantic-ia-sb-string-list):
+	Use `semantic-ia-sb-tag-info'
+	instead of `semantic-ia-sb-token-info'.
+	(semantic-ia-sb-completion-list): Ditto.
+	(semantic-ia-sb-tag-info): Use `semantic-analyze-tag-type' instead
+	of `semantic-analyze-token-type'.
+
+	* semantic-complete.el (semantic-displayor-window-edges):
+	New compatibility function.
+	(semantic-displayor-point-position): Use it.
+
+	* wisent/wisent-grammar.el (wisent-grammar-menu): New variable.
+	(wisent-grammar-mode): Setup the grammar menu.
+
+	* wisent/wisent-comp.el (wisent-toggle-verbose-flag): New command.
+
+	* bovine/bovine-grammar.el (bovine-grammar-menu): New variable.
+	(bovine-grammar-mode): Setup the grammar menu.
+
+	* semantic-grammar.el (semantic-grammar-recreate-package): New command.
+	(semantic-grammar-menu): New variable.
+	(semantic-grammar-setup-menu-emacs)
+	(semantic-grammar-setup-menu-xemacs)
+	(semantic-grammar-setup-menu): New functions.
+
+2004-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el (semantic-cb-speedbar-buttons):
+	Do not create a class browser
+	if one already exists.  Allow a power click to force a refresh.
+
+2004-02-23  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi (Grammar Rules): Fix @inforef.
+
+	* semantic-idle.el (semantic-idle-core-handler):
+	Only re-parse buffers having the
+	same major mode as the current buffer, before eval of scheduled
+	services.  Then re-parse other buffers.
+
+	* doc/grammar-fw.texi (Grammar Rules):
+	Add %prec, mid-rule actions and $N values.
+
+	* doc/grammar-fw-ov.txt: New diagram.
+
+2004-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el: Update credits for tooltip displayor.
+
+	* semantic-format.el (semantic-format-tag-uml-protection): Update doc.
+
+	* bovine/semantic-el.el (semantic-nonterminal-protection): Renamed to
+	(semantic-tag-protection): new name
+	(semantic-elisp-nonterminal-static): Renamed to
+	(semantic-tag-static): new name.
+
+	* semantic-ia-sb.el (semantic-ia-sb-last-analysis): Deleted
+	(semantic-speedbar-analysis): Doc Fix
+	(semantic-ia-speedbar): Don't use above deleted cache index.
+
+	* semantic-tag-ls.el (semantic-tag-calculate-parent-default):
+	After switching buffers,
+	add a second `save-excursion' to protect that movement.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Do not cache the data if the
+	bounds are empty.
+
+2004-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Exit if recursively editing.
+
+2004-02-20  David Ponce  <david@dponce.com>
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic-grammar.wy (prologue):
+	Remove `semantic-grammar-wy--tag-value'.
+	Define ` semantic-grammar-wy--nterm' and `
+	semantic-grammar-wy--rindx'.
+	(put_decl): Simplify semantic actions.
+	(use_macros_decl): Ditto.
+	(put_name_list, use_name_list): Return names instead of tags.
+	(put_value_list): Return values instead of tags.
+	(put_names): Change tag format.
+	(put_values, use_names): Ditto.
+	(nonterminal): Initialize nonterminal name and rule index.
+	(rule): Rule name based on nonterminal name and rule index.
+	Increment rule index.  Signal an error on duplicate %prec.
+
+2004-02-19  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el (semantic-cache-data-to-buffer):
+	Use cache-name instead of tag.
+	Check for errors before to create the overlay.
+	(semantic-cache-data-post-command-hook): Use `oldcache' in the
+	loop.
+	(semantic-get-cache-data): Use cache-name instead of tag.
+
+2004-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-get-local-variables): Implemented it.
+
+	* semantic-sort.el (semantic-unique-tag-table):
+	Support lists mixed tags with and without
+	buffer positions.
+
+	* bovine/semantic-c.el (semantic-c-tag-protection):
+	If no protection was specified, and
+	the tag has a class, return public only iff that parent is also
+	of the 'type class.  This prevents function arguments from
+	being given a protection string.
+
+	* bovine/semantic-el.el (semantic-nonterminal-protection):
+	Only return 'public for unspecified
+	protection if there is a parent class.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Use new buffer data cache
+	to save the calculated context so a second call in the same small
+	area will be faster.
+
+	* semantic-fw.el (semantic-cache-data-overlays): New state variable
+	(semantic-cache-data-to-buffer, semantic-cache-data-post-command-hook)
+	(semantic-get-cache-data): New functions
+	(semantic-test-data-cache): New testing function.
+
+2004-02-18  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-parse-stream):
+	Use `semantic-safe' to help debugging.
+	(wisent-parse-region): Likewise.
+
+	* semantic-idle.el (semantic-idle-scheduler-enabled-p):
+	Take into account
+	`semantic-idle-scheduler-max-buffer-size'.
+	(semantic-idle-core-handler): New function.
+	(semantic-idle-scheduler-function): Call it through
+	`semantic-safe' to help debugging.  Doc fix.
+	(semantic-idle-scheduler-refresh-tags): Doc fix.
+
+	* semantic-fw.el (semantic-safe): New macro.
+	(semantic-fw-font-lock-keywords): Add
+	`define-semantic-idle-service'.
+
+2004-02-17  David Ponce  <david@dponce.com>
+
+	* document.el (document-update-history): Fix doc string.
+	(document-update-paramlist): Likewise.
+
+	* doc/wisent.texi: Major update to sync. with semantic version 2.
+
+2004-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (avoid): No longer required.
+	(semantic-complete-post-command-hook): Protect against errors.
+	(initialize-instance::semantic-displayor-tooltip): Do not require avoid.
+	(semantic-displayor-point-position): New fcn
+	(semantic-displayor-tooltip-show): Use above.
+	Reposition mouse pointer by pixel location.
+
+2004-02-16  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi: Don't skip line after @deffn.
+	(put Decl): Rewrite to look better in HTML output.
+	(token Decl): Ditto.  Use match-value instead of token-value.
+
+	* doc/grammar-fw.texi: Fix cross-references.
+
+	* doc/grammar-fw.texi (Grammar outline):
+	Remove section.  All sub sections promoted.
+	(Common facilities): Ditto.
+	(Terminal and Nonterminal Symbols): New section.
+	(Declarations): Reference it.
+	(Grammar Rules): Complete.
+	(Macros): Rename to "Grammar Macros".
+
+2004-02-13  David Ponce  <david@dponce.com>
+
+	* bovine/bovine-grammar.el (bovine-grammar-parsetable-builder):
+	start/scopestart generate
+	true internal rules.  Use the first grammar rule as default start
+	rule.  Check some trivial things about grammar correctness.
+
+2004-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/bovine.texi (Order of MATCH rules): New section
+
+	* tests/Makefile (Tests_AUX): Added scope tests.
+
+	* tests/Project.ede: Project file for the test directory.
+
+	* tests/scopetest.java, tests/scopetest.cpp: Tests for scope analysis.
+
+	* wisent/Makefile (VERSION): Updated.
+
+	* doc/Makefile (semantic-grammar_TEXINFOS): New
+	(dist): Add above.
+
+	* doc/Project.ede ("semantic-grammar"): New info file.
+
+	* doc/user-guide.texi (semantic-show-parser-state-mode):
+	Updated from code.
+
+	* bovine/Makefile (VERSION): updated.
+
+	* NEWS (Obsoletion Strategy): Add about semantic-varalias-obsolete.
+	(semanticdb-find-*-by-name-for-completion): Renamed as apropriate.
+	(semantic-idle-*): Updated.
+
+	* semantic.el (semantic-version): updated to beta 2.
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede (version): Updated.
+
+	* semantic-util-modes.el: (semantic-highlight-edits-mode)
+	(semantic-show-unmatched-syntax-mode): Doc string updates.
+
+	* semantic-tag-ls.el (semantic-tag-protected-p): Add autoload cookie.
+
+	* semantic-lex.el (semantic-lex-debug): Doc update.
+
+	* semantic-idle.el: (semantic-idle-summary-current-symbol-info-brutish)
+	(semantic-idle-summary-current-symbol-keyword):
+	Fixed byte compiler warnings.
+
+	* semantic-fw.el (semantic-test-throw-on-input): Add another test case.
+
+	* semantic-tag.el (cedet-edebug):
+	New eval-after-load for edebug support.
+	(semantic--tag-expand): Add message in case of debug call.
+
+	* semanticdb-find.el (cedet-edebug):
+	New eval-after-load for edebug support.
+
+	* doc/lang-support-guide.texi (Application API Structure):
+	Add a menu and menu for:
+	(Semantic Analyzer Support): Add comment about what should go in this node.
+	(Debugging): Add large menu, move old content to a section.
+	(Lexical Debugging, Parser Output tools, Bovine Parser Debugging)
+	(Wisent Parser Debugging, Overlay Debugging, Incremental Parser Debugging)
+	(Debugging Analysis): New sections.
+	(Semantic 1.4 Doc): Location of old Debugging section text.
+
+2004-02-11  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi: Fix direntry.
+	(Overview): Use a graphic image if possible.
+	(Adding a new grammar mode): Add function and variable
+	definitions.
+
+	* doc/grammar-fw-ov.dia, doc/grammar-fw-ov.png, doc/grammar-fw-ov.txt:
+	New file.
+
+2004-02-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sort.el (semantic-string-lessp-ci):
+	Accept a value of t from `compare-strings'.
+	Thanks Dimitry Gashinsky.
+
+2004-02-10  David Ponce  <david@dponce.com>
+
+	* semantic-idle.el (semantic-idle-summary-out-of-context-faces):
+	New variable.
+	(semantic-idle-summary-useful-context-p): Use it.
+
+2004-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sort.el (semantic-unique-tag-table): Fix doc.
+
+	* doc/app-dev-guide.texi (Tag Sorting): Add semantic-unique-tag-table.
+
+	* semantic-analyze.el (semantic-analyze-tag-prototype-p): New fcn
+	(semantic-analyze-find-tag): Skip over prototypes, but return
+	one if there is no real version.
+
+	* senator.el (senator-try-expand-semantic): Don't quote 1st arg to
+	semantic-lex-catch-errors.
+
+	* semantic-util-modes.el (semantic-show-parser-state-mode): Doc Update
+	(semantic-show-parser-state-marker): Show unparseable state.
+
+	* semantic-idle.el (semantic-idle-summary-useful-context-p): New fcn
+	(semantic-idle-summary): Don't show summaries if it's boring.
+	(semantic-idle-completion-list-default): Don't do completion
+	if it's boring context.
+
+2004-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el: Add vocabulary section.
+
+	* semantic-analyze.el (semantic-analyze-tag-type): Comment
+	(semantic-analyze-inherited-tags): Recurse across all parents.
+	(semantic-analyze-scoped-tags): Allow each element to find
+	itself in previously found scopes
+
+	* semantic-idle.el (semantic-idle-scheduler-refresh-tags): Fix use of
+	`semantic-lex-catch-errors'.
+
+2004-02-06  David Ponce  <david@dponce.com>
+
+	* semantic-analyze.el (semantic-analyze-find-tags-by-prefix): Use
+	`semanticdb-strip-find-results' and
+	`semantic-find-tags-for-completion'.
+	(semantic-analyze-find-tag): Fix when the TAGCLASS argument is not
+	provided.
+
+2004-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-try-completion):
+	Replace old call to `buffer-string'
+	with `semantic-completion-text'.
+
+	* semantic-sort.el: (semantic-unique-tag-table-by-name)
+	(semantic-unique-tag-table): When sorting, does not modify original
+	list by side-effect.
+
+	* semantic-analyze.el (semantic-analyze-find-tag):
+	Accept SCOPE tags for additional
+	searching.  Make TAGCLASS argument work as documented.
+	(semantic-analyze-inherited-tags)
+	(semantic-analyze-type-parts): Accept SCOPE tags for additional
+	searching.
+	(semantic-analyze-scope-nested-tags): Accept SCOPETYPE argument
+	for parent data types to search.
+	(semantic-analyze-scoped-types): Move code so that a parent can be
+	found in the local scope which is also calculated here.
+	(semantic-analyze-possible-completions): Pass in the scope from
+	the context into top level search.
+
+2004-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-ctxt-scoped-types): New fcn
+	(semantic-default-c-setup): Use above.
+
+	* semantic-ctxt.el (semantic-ctxt-scoped-types): Update Doc.
+
+	* semantic-imenu.el (semantic-imenu-sort-bucket-function):
+	Add better customization.
+
+	* semantic-sort.el (semantic-sort-tag-type): Change token->tag.
+	(semantic-sort-tokens-by-name-increasing): Renamed to
+	(semantic-sort-tags-by-name-increasing): new name
+	(semantic-sort-tokens-by-name-decreasing): Renamed to
+	(semantic-sort-tags-by-name-decreasing): new name
+	(semantic-sort-tokens-by-type-increasing): Renamed to
+	(semantic-sort-tags-by-type-increasing): new name
+	(semantic-sort-tokens-by-type-decreasing): Renamed to
+	(semantic-sort-tags-by-type-decreasing): new name
+	(semantic-sort-tokens-by-name-increasing-ci): Renamed to
+	(semantic-sort-tags-by-name-increasing-ci): new name
+	(semantic-sort-tokens-by-name-decreasing-ci): Renamed to
+	(semantic-sort-tags-by-name-decreasing-ci): new name
+	(semantic-sort-tokens-by-type-increasing-ci): Renamed to
+	(semantic-sort-tags-by-type-increasing-ci): new name
+	(semantic-sort-tokens-by-type-decreasing-ci): Renamed to
+	(semantic-sort-tags-by-type-decreasing-ci): new name
+	(semantic-unique-tag-table-by-name): Use new name
+	(semantic-unique-tag-table): Sort by position first, then unique.
+
+	* semantic-analyze.el (semantic-analyze-inherited-tags): Fixed typo.
+
+	* semantic-idle.el: (semantic-idle-completion-popup-max-size)
+	(semantic-idle-completion-popup-list)
+	(semantic-idle-completion-region-map)
+	(semantic-idle-completion-TAB)
+	(semantic-idle-completion-self-insert)
+	(semantic-idle-create-overlay-with-completion-map)
+	(semantic-idle-momentary-unoverlay)
+	(semantic-idle-momentary-overlay-with-completion-map): Deleted.
+	(semantic-idle-completion-list-default):
+	Remove old implementation.  Use `semantic-complete-analyze-inline'
+	instead, and force the popup display if needed.
+
+	* semantic-complete.el (semantic-completion-inline-active-p):
+	New function
+	(semantic-complete-post-command-hook): Remove auto-display code
+	(semantic-complete-inline-force-display): New fcn from above.
+	(semantic-displayor-tooltip::semantic-displayor-show-request):
+	Force display to only be unique names.
+	(semantic-complete-inline-analyzer): Don't start up iff there is
+	nothing useful to display.
+	(semantic-complete-analyze-inline): Show message if interactive, and
+	the engine didn't start up.
+
+	* semantic-complete.el (semantic-complete-post-command-hook):
+	Robust to buffer switch.
+	(semantic-displayor-show-request): Changes to messages output
+	in the tooltip.
+
+	* semantic-sort.el (semantic-unique-tag-table): New fcn.
+
+	* semantic-analyze.el (semantic-analyze-possible-completions):
+	Make sure all tags in return list are sorted (alphanumerically) and
+	unique.
+
+	* doc/app-dev-guide.texi (top): Renamed below
+	(Searching Tag Tables): Renamed from "Tag Tables"
+	(Breadth Search): New section, old content.
+	(Deep Search, Specialty Search, Custom Search): New sections
+	(Tag Details)
+	(Example Programs): Reference "Searching Tag TAbles" by new name.
+
+	* semantic-complete.el (semantic-displayor-tooltip::semantic-displayor-show-request):
+	Also test if tooltip mode is active.
+
+2004-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-inherited-tags): New fcn
+	(semantic-analyze-type-parts): Add also inherited tags
+	(semantic-analyze-scoped-tags): Moved
+
+	* semantic-find.el (semantic-find-tags-by-scope-protection): New fcn
+
+	* semantic-tag-ls.el (semantic-tag-protected-p): New fcn.
+
+2004-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-scope-nested-tags): New fcn
+	(semantic-analyze-scoped-types): Use above, some logic of which came
+	from this one.
+
+	* semantic-analyze.el (semantic-analyze-find-tag-sequence): Doc fix
+	(semantic-analyze-scoped-types): Fix nesting error in code.
+
+2004-02-02  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi: Add more things.
+
+	* bovine/semantic-java.el (semantic-ctxt-scoped-types):
+	Don't return tags but names.
+
+	* bovine/semantic-java.el (semantic-ctxt-scoped-types):
+	New override for `java-mode'.
+
+2004-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-inline-overlay): Moved here
+	(semantic-completion-message): Moved.  Support inline completion.
+	(semantic-complete-default-to-tag)
+	(semantic-complete-current-match)
+	(semantic-complete-do-completion):  Protect completion calculation
+	from cursor movement.
+	(semantic-complete-inline-map): Changed several keybindings.
+	(semantic-complete-inline-quit): New fcn
+	(semantic-complete-inline-exit): Make interactive
+	(semantic-complete-post-command-hook): Always popup completions.
+	(semantic-complete-inline-TAB): non-partial completion.
+	(semantic-complete-inline-up): Fix typo
+	(semantic-displayor-tooltip): New parent type.  Enable graceful
+	degredation of service.  Methods below of this type
+	(semantic-displayor-show-request): Call to parent class if tooltips
+	are not available.
+	(semantic-displayor-scroll-request): New method
+	(semantic-complete-inline-analyzer): Use tooltips.  Autoload cookie.
+	(semantic-complete-read-tag-buffer-deep)
+	(semantic-complete-read-tag-project)
+	(semantic-complete-read-tag-analyzer)
+	(semantic-complete-anlyze-and-replace): Add autoload cookies.
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Support "" in bounds.
+	(semantic-analyze-possible-completions): Allow variables or methods
+	that have a compound data type to be included in completion lists.
+
+	* semantic-find.el (semantic-deep-find-tags-by-name): New function.
+
+	* semantic-tag.el (semantic-tag-type-compound-p): New fcn
+
+2004-02-01  David Ponce  <david@dponce.com>
+
+	* doc/grammar-fw.texi: New grammar framework manual.
+
+2004-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (Commentary:):
+	Updated.  Discuss INLINE completion
+	(semantic-completion-text, semantic-completion-delete-text):
+	New function wrappers.
+	(semantic-complete-read-tag-engine): Doc update.
+	(semantic-complete-inline-map): New keymap
+	(semantic-complete-inline-face): New face
+	(semantic-complete-inline-overlay): New variable
+	(semantic-complete-inline-text)
+	(semantic-complete-inline-delete-text)
+	(semantic-complete-inline-exit)
+	(semantic-complete-pre-command-hook)
+	(semantic-complete-post-command-hook)
+	(semantic-complete-inline-tag-engine): New functions
+	(semantic-complete-inline-TAB)
+	(semantic-complete-inline-up)
+	(semantic-complete-inline-down): New commands
+	(semantic-complete-current-match)
+	(semantic-complete-try-completion)
+	(semantic-complete-do-completion)
+	(semantic-collector-next-action)
+	(semantic-displayor-current-focus)
+	(semantic-displayor-focus-request)
+	(semantic-complete-inline-analyzer)
+	(semantic-complete-analyze-and-replace)
+	(semantic-complete-analyze-inline): Use new wrappers for dealing with
+	minibuffer text.
+
+	* semantic-analyze.el (semantic-analyze-find-nonterminals-by-prefix):
+	Renamed to
+	(semantic-analyze-find-tags-by-prefix): New name.
+	(semantic-analyze-find-nontermials): Renamed to
+	(semantic-analyze-find-tags): new name.
+	(semantic-analyze-token-type-to-name): renamed to
+	(semantic-analyze-tag-type-to-name): new name
+	(semantic-analyze-token-type): renamed to
+	(semantic-analyze-tag-type): new name
+	(semantic-analyze-find-nonterminal-sequence): renamed to
+	(semantic-analyze-find-tag-sequence): new name
+	(semantic-analyze-scoped-nonterminals): renamed to
+	(semantic-analyze-scoped-tags): new name
+	(semantic-analyze-dereference-metatype)
+	(semantic-analyze-type-parts)
+	(semantic-analyze-scoped-types)
+	(semantic-analyze-context)
+	(semantic-analyze-context-assignment)
+	(semantic-analyze-context-functionarg)
+	(semantic-analyze-context-return)
+	(semantic-analyze-current-context)
+	(semantic-analyze-type-constraint)
+	(semantic-analyze-type-constants)
+	(semantic-analyze-possible-completions)
+	(semantic-analyze-summary-function)
+	(semantic-analyze-pric-sequence): Renamed occurances of "token"
+	to "tag", and "nonterminal" to "tag".
+	Also true for renamed fns above.
+
+2004-01-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el ("Idle Summaries", "Idle Completion"): Fix typos.
+	(senator-menu-bar): Add narrow-to-tag binding
+
+	* semantic-util-modes.el (semantic-show-unmatched-lex-tokens-fetch):
+	New fcn
+
+	* semantic-grammar.el (semantic-grammar-complete): Extend doc.
+
+	* semanticdb-file.el (object-write):
+	Keep the unmatched syntax up to date.
+	Success is bound to use of `semantic-show-unmatched-syntax-mode'.
+
+	* semanticdb.el (semanticdb-post-bovination-unmatched-syntax): Deleted
+	(semanticdb-hooks): Remove above from list.
+
+	* bovine/Makefile (bovinator, languages): --no-site-file
+
+	* bovine/c.by (UNDEFINE): New keyword
+	(define): Add UNDEF support.
+
+	* doc/lang-support-guide.texi (Tag Structure): Describe CLASS more.
+	(Language Support Overview): Moved old comment.  Added new content.
+	(Semantic Overload Mechanism): New intro.
+	Describe the default a little more.
+	Added more about advice.
+	(Semantic Parser Structure): new
+	(Application API Structure): New
+	(Lexer Overview): Typos
+	(Lexer Construction): Discus deprication of semantic-flex.
+	Update define-lex.
+	(Grammar Files): Removed.  This is in the bovine section.
+	(Grammar Programming Environment): New content.
+
+	* doc/bovine.texi (Optional Lambda Expression):
+	Added details on new TAG macros.
+
+	* wisent/Makefile (languages_LISP): Removed wisent-java-lex.el
+	(tools, wisent, languages): Exclude site-init file.
+
+	* wisent/Project.ede ("languages"): Remove wisent-java-lex.el
+
+2004-01-23  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-lex.el: Remove.  No more used.
+
+	* wisent/wisent-grammar.el (wisent-grammar-tokentable-builder):
+	Remove.  Not more necessary.
+	(wisent-grammar-mode): Updated.
+
+	* wisent/wisent-bovine.el:
+	(wisent-lex-token-rules, wisent-lex-token-get)
+	(wisent-lex-match, wisent-flex): Remove.  Obsolete.
+	(wisent-lex-make-token-table): Alias of
+	`semantic-lex-make-type-table'.
+
+	* semantic-lex.el:
+	(semantic--lex-delim-spec, semantic--lex-block-specs)
+	(semantic-lex-block-type): Remove.  No more necessary.
+	(define-lex-block-type-analyzer): Improve doc string.
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* NEWS: Add "Auto-generation of lexical rules" topic.
+	Use "lexical rule" instead of "single lexical analyzer"
+	terminology.
+
+2004-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ede-grammar.el (ede-buffer-mine::semantic-ede-proj-target-grammar):
+	New method.
+
+2004-01-19  David Ponce  <david@dponce.com>
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic-grammar.wy:
+	(<keyword>, <symbol>, <string>, <qlist>, <sexp>, <block>)
+	(<punctuation>): Declare as types.
+	(PERCENT_PERCENT): Fix regexp.
+	(PREFIXED_LIST): Move regexp to <qlist> type syntax.
+	(PAREN_BLOCK, BRACE_BLOCK): Fix block definition.
+	(LPAREN, RPAREN): New tokens.
+	(epilogue): Define `semantic-grammar-lexer' here.
+
+	* semantic-grammar.el (semantic-grammar-wy):
+	Require after specific analyzers.
+	(semantic-grammar-lex-c-char-re): Move before analyzers.
+	(semantic-grammar-lex-symbol, semantic-grammar-lex-string)
+	(semantic-grammar-lex-char, semantic-grammar-lex-blocks)
+	(semantic-grammar-lex-sexp, semantic-grammar-lex-prefixed-list)
+	(semantic-grammar-lexer): Remove.  Defined in grammar.
+
+2004-01-18  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy:
+	(<block>, <punctuation>, <symbol>, <string>)
+	(<number>, <keyword>): Use default values in %type declarations.
+
+	* semantic-lex.el (semantic-lex-preset-default-types): New function.
+	(semantic-lex-make-type-table): Use it.
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic-grammar.wy (plist_opt): New rule.
+	(type_decl): Use it.
+
+	* semantic-grammar.el (semantic-grammar-token-%type-properties):
+	Remember types
+	explicitly declared with a %type statement.
+	(semantic-grammar-insert-defanalyzer): Generate analyzer for
+	explicitly declared types.
+	(semantic-grammar-create-package): Add optional argument force to
+	unconditionally re-generate Lisp code.
+
+2004-01-16  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar--lex-block-specs):
+	Fix doc and condition-case.
+
+	* wisent/wisent-java.wy: Use %keyword to declare keywords.
+	Automatically generate analyzers used to build the lexer.
+
+	(<block>, <punctuation>, <symbol>, <string>)
+	(<number>, <keyword>): Add %type declaration.
+	(epilogue): Add lexer declaration.
+
+	* wisent/wisent-java.el (require 'wisent-java-lex): Remove.
+
+	* semantic-grammar.el (semantic-grammar-insert-defanalyzer):
+	Fix use of quote in
+	declaration of regexp analyzer.
+
+	* wisent/wisent-java-tags.wy: Use %keyword to declare keywords.
+	Automatically generate analyzers used to build the lexer.
+
+	(<block>, <punctuation>, <symbol>, <string>)
+	(<number>, <keyword>): Add %type declaration.
+	(epilogue): Add lexer declaration.
+
+	* wisent/wisent-java-tags.el (require 'wisent-java-lex): Remove.
+
+	* semantic-lex.el (semantic-lex-make-type-table):
+	Implicitly create types with
+	properties but without tokens associated.
+	(define-lex-keyword-type-analyzer)
+	(define-lex-sexp-type-analyzer): New macros.
+
+	* semantic-grammar.el (semantic-grammar-token-%type-properties):
+	%type statements
+	unconditionally declare new types.
+	(semantic-grammar-token-properties): Updated.
+	(semantic-grammar-quoted-form): New function.
+	(semantic-grammar-insert-defanalyzer): Use it to fix use of quote
+	in analyzer declarations. Enclose type between < > in generated
+	analyzer name.  Fix conditions that select the type of analyzer to
+	declare.  Add declaration of sexp and keyword analyzers.
+	(semantic-grammar-mode-keywords-1): Add highlighting of semantic
+	keywords.
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords): Add new macro names.
+
+2004-01-15  David Ponce  <david@dponce.com>
+
+	* tests/gr-test.wy (block):
+	Remove unnecessary \( and \) delimiters from the syntax
+	regexp.
+
+	* semantic-lex.el (define-lex-string-type-analyzer): Add missing comma.
+
+2004-01-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-collector-analyze-completions):
+	New collector class
+	(semantic-collector-calculate-completions-raw): New method on above.
+	(semantic-complete-read-tag-buffer-deep)
+	(semantic-complete-read-tag-project): Fix doc string
+	(semantic-complete-read-tag-analyzer): New function
+	(semantic-complete-analyze-inline): New command
+
+	* semantic-analyze.el (semantic-analyze-context): Fixed doc strings.
+	Add :buffer slot.
+	(semantic-analyze-current-context): Set the :buffer slot in above.
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Move catch inside the condition case.
+
+2004-01-14  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el: Fix last check-in.
+
+	* semantic-lex.el: (define-lex-regex-type-analyzer)
+	(define-lex-string-type-analyzer)
+	(define-lex-block-type-analyzer): New macros.
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic-grammar.wy: Introduce new %type statement.
+
+	(TYPE): New keyword.
+	(decl): Handle type_decl.
+	(type_decl, plist): New rules.
+
+	Fix errors due to use of ill-formed tags in EXPANDFULL mechanism.
+
+	(prologue): Define function `semantic-grammar-wy--tag-value'.
+	(put_decl, use_macros_decl): In semantic actions, use
+	`semantic-grammar-wy--tag-value' instead of `semantic-tag-name' to
+	retrieve the value of EXPANDFULL tags.
+	(put_names, put_values, use_names): Produce valid tags.
+
+	* semantic-grammar.el (require 'pp):
+	Moved to top level.  All callers updated.
+	(semantic-grammar-token-%type-properties)
+	(semantic-grammar-token-%put-properties): New functions.
+	(semantic-grammar-token-properties): Use them.
+	(semantic-grammar--lex-block-specs): New variable.
+	(semantic-grammar-insert-define)
+	(semantic-grammar--lex-delim-spec)
+	(semantic-grammar--lex-block-specs)
+	(semantic-grammar-insert-defanalyzer)
+	(semantic-grammar-insert-defanalyzers): New functions.
+	(semantic-grammar-create-package): Use the latter.
+
+	* tests/gr-test.wy: New file.
+
+2004-01-13  David Ponce  <david@dponce.com>
+
+	* doc/wisent.texi (Wisent Parsing): Add `wisent-pre-parse-hook' and
+	`wisent-post-parse-hook'.
+	(Error recovery): Add `wisent-abort'.
+
+2004-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Idle Summary Mode):
+	Added `semantic-idle-completions-mode'.
+
+	* doc/app-dev-guide.texi (Tag Sorting):
+	Added `semantic-unique-tag-table-by-name'.
+
+	* semantic-idle.el (semantic-idle-completion-region-map):
+	New binding for TAB
+	(semantic-idle-completion-TAB): New command
+	(semantic-idle-complete-self-insert): New command
+	(semantic-idle-momentary-unoverlay):
+	Reset `this-command' via keymap.
+	If self-insert-command is to be run, reset to our own version.
+
+	* semantic-ia.el (semantic-ia-complete-symbol-menu, semantic-ia-complete-tip):
+	autoload cookies.
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Wrap idle functions in save-excursion.
+	Let idle functions run even if there was a lexical failure.
+	(semantic-idle-summary): Support trailing dots for long lists.
+	(semantic-idle-completion-region-map): New keymap.
+	(semantic-idle-create-overlay-with-completion-map)
+	(semantic-idle-momentary-unoverlay)
+	(semantic-idle-momentary-overlay-with-completion-map): New fcns
+	(semantic-idle-completion-list-default): Call above new fcn
+	to show what the tooltips is for.  Bind TAB to do the completion.
+
+2004-01-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-make.el (semantic-get-local-variables):
+	Override to return nil.
+
+	* semantic-ctxt.el:
+	(semantic-end-of-command-default, semantic-beginning-of-command-default)
+	(semantic-ctxt-current-symbol-default)
+	(semantic-ctxt-current-assignment-default)
+	(semantic-ctxt-current-function-default)
+	(semantic-ctxt-current-argument-default):
+	Wrap body in `with-syntax-table' and the lexical syntax table.
+	That way variables and things are matched the same way the lexer
+	matches them.
+
+2004-01-12  David Ponce  <david@dponce.com>
+
+	* semantic-idle.el (global-semantic-idle-scheduler-mode):
+	defcustom requires
+	semantic-idle instead of semantic-util-modes.
+	(define-semantic-idle-service): Likewise.
+	(semantic-idle-scheduler-mode): Add autoload cookie.
+
+2004-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-idle-completions-mode): Enable as useful.
+
+	* semantic-idle.el (semantic-idle-scheduler-function):
+	Be sure to loop over the queue of idle functions.
+	(semantic-idle-summary-current-symbol-info-brutish)
+	(semantic-idle-summary-current-symbol-keyword):
+	Do nothing if there was no found thing at point.
+	(semantic-idle-completion-popup-max-size): New option.
+	(semantic-idle-completion-popup-list)
+	(semantic-idle-completion-list-default): New functions
+	(semantic-idle-completions): New idle service.
+
+	* semantic-sort.el (semantic-unique-tag-table-by-name): New function.
+
+	* semantic-ctxt.el (semantic-get-local-variables-default):
+	Wrap body in `save-excursion'.
+
+2004-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (global-semantic-idle-scheduler-mode):
+	More documentation.
+	(semantic-idle-scheduler-working-in-modeline-flag): Delete dup.
+	(semantic-idle-summary-find-current-symbol-tag): More doc.
+	(semantic-idle-summary-current-symbol-info-brutish): Does some of what
+	the old print routine did.
+	(semantic-idle-summary-current-symbol-keyword): Gets info if the
+	current symbol is a keyword.
+	(semantic-idle-summary-current-symbol-info-context): New routine
+	to get a tag based on the current context (see semantic-analyze.el)
+	(semantic-idle-summary-current-symbol-info-default): Rebuilt to use
+	a sequence of attempted matches.
+
+	* senator.el (senator-menu-bar): Jump menu items.
+
+	* semantic-tag-file.el (semantic-dependency-tag-file):
+	Setting the buffer to a tag before trying to find the include file
+	is now optional.  Note to fix in the future.
+
+	* semantic-tag.el (semantic-tag-copy):
+	Do not modify filename/overlay if this tag
+	does not include a position.
+
+	* semantic-grammar.el (eldoc-current-symbol-info):
+	Use new semantic-idle-summary function
+	instead of old senator version.
+
+	* semanticdb.el (semanticdb-file-table-object): Delete buffers to files
+	loaded in to refresh a tags table.
+
+	* semanticdb-find.el (semanticdb-find-table-for-include-default):
+	fix typo
+
+	* semanticdb-find.el (semanticdb-find-table-for-include-default):
+	Use `expand-file-name' instead of `concat'.
+	Use fname (which we calculated) when loading the table for the
+	include file.
+	(semanticdb-find-log-flag, semanticdb-find-log-buffer-name): New var
+	(semanticdb-find-toggle-logging, semanticdb-reset-log): New commands
+	(semanticdb-find-log-move-to-end, semanticdb-find-log-new-search)
+	(semanticdb-find-log-activity): New logging functions.
+	(semanticdb-find-tags-collector): Use new logging functions.
+
+2004-01-09  David Ponce  <david@dponce.com>
+
+	* semantic-load.el:
+	Add doc directories into `Info-default-directory-list' instead of
+	`Info-directory-list'.  Use `expand-file-name' to manipulate
+	directory names.
+
+2004-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: Add lexical safety note.
+	Add idle-scheduler related data.
+
+	* doc/user-guide.texi (top): Add Idle Scheduler
+	(Idle Scheduler): New node, new content
+	(Minor Modes): Remove auto-parser mode and summary mode.
+
+	* doc/app-dev-guide.texi (top):
+	Renamed Parser Hooks to Parser Features.  Added Idle Scheduling
+	(Parser Features): New name.  Add a menu.
+	(Parser State): New Node, old content
+	(Parser Hooks): New Node, old content
+	(Lexical Safety): New Node with new text
+	(Idle Scheduling): New node and new content
+
+	* semantic-complete.el (semantic-collector-try-completion-whitespace):
+	Be robust to more
+	types of non-matching whitespace completion.
+
+2004-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (Info-directory-list):
+	Add our directory to the master list.
+
+	* doc/Makefile: Regenerated
+
+	* doc/Project.ede:
+	(semantic-user.info, semantic-appdev.info, semantic-langdev.info)
+	(bovine.info, wisent.info): New manuals split from Documentation.
+
+	* doc/wisent.texi, doc/user-guide.texi, doc/tags.texi:
+	Convert to stand alone manual.
+
+	* doc/semantic.texi:
+	Convert the users guide, developers guide, an lang support guide into
+	standalong manuals.
+
+	* doc/semanticheader.texi: Common macros for semantic manuals.
+
+	* doc/lang-support-guide.texi: Convert to stand alone manual.
+	Add notes in sections written for semantic 1.4 not yet updated.
+
+	* doc/installation.texi:
+	Add details about semantic being a part of CEDET.
+
+	* doc/bovine.texi: Convert to stand alone manual.
+
+	* doc/app-dev-guide.texi: Convert to stand alone manual.
+	Add semanticdb search results node.
+	Fixed a couple typos.
+
+2004-01-08  David Ponce  <david@dponce.com>
+
+	* semantic-lex.el (semantic-lex-catch-errors):
+	Preserve the values of point, mark
+	and the current buffer.
+
+	* senator.el (senator-save-registered-mode-settings): Don't hang when
+	`customize-save-variable' fails.
+
+2004-01-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex.el (semantic-lex-debug-break): Use `semantic-read-char'.
+
+2003-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el:
+	(semantor-eldoc-use-color, semantic-eldoc-summary-function)
+	(senator-find-current-symbol-tag)
+	(senator-eldoc-print-current-symbol-info-default)
+	(senator-eldoc-print-current-symbol-info): Deleted
+	(eldoc-print-current-symbol-info): Deleted advice.
+	(senator-try-expand-semantic): Catch errors on initial parse.
+
+2003-12-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-parse-tree-unparseable, semantic-parse-tree-unparseable-p):
+	New functions.
+	(semantic-new-buffer-fcn-was-run): New variable
+	(semantic-active-p): Change to use above variable.
+	(semantic-new-buffer-fcn): Use content of old `semantic-active-p' to
+	detect activation state.  Set new variable above to t.
+	(bovinate): Don't show the parse dump buffer if CLEAR set.
+	(semantic-bovinate-toplevel): Do not parse the buffer it it is
+	currently set as "unparseable".
+
+	* semantic-idle.el (semantic-idle-scheduler-idle-time): Fix doc.
+	(semantic-before-idle-scheduler-reparse-hooks)
+	(semantic-after-idle-scheduler-reparse-hooks): Update doc.
+	(semantic-idle-scheduler-refresh-tags): Remove lexical catch
+	functions.  Use 'semantic-lex-catch-errors' instead.
+	(semantic-idle-summary-current-symbol-info-default):
+	Fix senator references.
+
+	* semantic-lex.el (semantic-lex-catch-errors): New macro
+	(edebug-setup-hook): Support above.
+
+2003-12-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el (semanticdb-find-tags-collector):
+	Call `semantic-throw-on-input'
+	between each DB search.
+
+	* semantic-idle.el: (smeantic-idle-scheduler-input-function)
+	(semantic-idle-scheduler-user-input-waiting-p): Deleted
+	(semantic-idle-scheduler-function): Message on caught errors.
+	Use `semantic-exit-on-input' macro.
+
+	* semantic-fw.el (semantic-varalias-obsolete):
+	Only emit compatibility warnings on
+	when byte compiling.
+	(semantic-current-input-throw-symbol): New var.
+	(semantic-exit-on-input, semantic-throw-on-input): New macros
+	(semantic-test-throw-on-input): New test fcn
+	(edebug-setup-hook): Add `semantic-exit-on-input' edubug support.
+
+2003-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (global-semantic-auto-parse-mode, semantic-auto-parse-*):
+	Deleted
+	(global-semantic-summary-mode, semantic-summary-mode-*): Deleted
+	(semantic-show-tag-boundaries-mode): Fix start message
+	(semantic-stb-reparse-hook): Do not delete secondary overlays fcn start.
+	Add a sanity check to prove that it wasn't needed.
+
+	* Makefile: Regenerated from Project.ede;
+	--no-site-init added to many compile commands.
+
+	* Project.ede ("semantic"): Add semantic-idle.el
+
+	* semantic-grammar.el (semantic-format-tag-abbreviate):
+	Renamed from old.
+	(semantic-tag-boundary-p): New overload method
+	(semantic-format-tag-summarize): Renamed from old.
+
+	* senator.el ("Auto Parse", "Summaries): Delete old menu items
+	("Idle Scheduler", "Udle Summaries"): New menu items
+
+	* semantic-load.el (global-semantic-summary-mode, global-semantic-auto-parse-mode):
+	Do not initialize.
+	(global-semantic-idle-scheduler, global-semantic-idle-summary-mode):
+	Enable these new modes.
+
+2003-12-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el (semantic-auto-parse-mode, global-semantic-auto-parse-mode):
+	New alias
+	(define-semantic-idle-service): Fix cut & paste errors
+	(semantic-idle-summary): Add overload symbols.
+	(semantic-summary-mode, global-semantic-summary-mode): New alias
+
+	* semantic-decorate.el (semantic-tag-secondary-overlays): Moved.
+	(semantic-tag-get-secondary-overlay): New fcn
+	(semantic-tag-delete-secondary-overlay): Use above
+
+2003-12-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-show-parser-state-mode-setup):
+	Use idle-scheduler hooks
+	instead of auto-pase hooks.
+	(semantic-show-tag-boundaries-setup): Use new hook for
+	`semantic-after-toplevel-cache-change-hook'
+	On disble, completely flush all found boundary overlays.
+	(semantic-tag-boundary-p): doc fix
+	(semantic-stb-flush-rogue-boundaries): New function
+	(semantic-stb-after-full-reparse-hook): New function used as hook
+	(semantic-stb-reparse-hook): Delete boundaries on tags before adding
+	a new one.
+
+	* semantic-idle.el (semantic-idle-scheduler-idle-time):
+	Change to 2 seconds
+	(semantic-idle-scheduler-add, semantic-idle-scheduler-remove):
+	Add autoload cookies
+	(semantic-idle-scheduler-function): Reparse all buffers.
+	Manage timers in this routines.
+	Protect insides from long-jump.
+	(semantic-idle-scheduler-refresh-tags): Remove timer management.
+	(define-semantic-idle-service): New macro
+	(semanticidle-summary-function)
+	(semantic-idle-summary-find-current-symbol-tag)
+	(semantic-idle-summary-current-symbol-info-default): New fcns
+	(semantic-idle-summary): New idle minor mode.
+
+2003-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-idle.el: New file.
+
+2003-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-prefix-map):
+	Have senator use the new semantic-complete
+	jump prompt demos instead of senator-jump. (experiment).
+
+	* doc/app-dev-guide.texi (Local Context):
+	Added semantic-ctxt-current-thing.
+
+	* semanticdb-find.el (semanticdb-find-results-p, semanticdb-find-result-with-nil-p):
+	Made tests more accurate.
+
+2003-12-16  David Ponce  <david@dponce.com>
+
+	* semantic-grammar-wy.el: Re-generated.
+
+	* semantic-grammar.wy:
+	Introduce new %keyword statement to declare keywords.
+	Allow use of <token-type> forms in %put statements.
+
+	(use_names): Add to start symbols.
+	(KEYWORD): New keyword.
+	(DEFAULT-PREC, NO-DEFAULT-PREC, KEYWORD, LANGUAGEMODE)
+	(LEFT, NONASSOC, PACKAGE, PREC, PUT, QUOTEMODE, RIGHT)
+	(SCOPESTART, START, TOKEN, USE-MACROS): Declare with %keyword
+	instead of %token.
+	(KEYWORDTABLE, OUTPUTFILE, PARSETABLE, SETUPFUNCTION)
+	(TOKENTABLE): Remove.  Obsolete.
+	(decl): Add keyword_decl rule.  Remove obsolete rules.
+	(put_decl): Use put_name rule instead of SYMBOL.
+	(put_names): Likewise.
+	(put_name, keyword_decl, use_names): New rules.
+	(use_name_list): New rule.
+	(use_macros_decl): Use it.
+	(keywordtable_decl, outputfile_decl, parsetable_decl)
+	(setupfunction_decl, tokentable_decl): Remove.  Obsolete.
+
+	* semantic-grammar.el (semantic-grammar-lex-symbol):
+	Accept colon as symbol prefix.
+	(semantic-grammar-anchored-indentation): Take care of colon used
+	as symbol prefix.
+
+2003-12-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-do-completion):
+	Add 'empty support
+	(semantic-complete-next-action): fix doc
+	(semantic-collector-abstract): Change type of last-all-completions
+	(semantic-collector-next-action): If there are completions, return
+	empty state.
+	(semantic-collector-calculate-completions-raw): Put in a db table
+	instead of nil.
+	(semantic-collector-try-completion-whitespace): Handle case of exact
+	matches amongst non exact matches
+	(semantic-collector-calculate-cache): Put in a db table.
+
+2003-12-11  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-eldoc-print-current-symbol-info): Check that
+	`eldoc-echo-area-use-multiline-p' is defined.
+
+2003-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-ctxt-current-function):
+	Make sure strings are returned.
+
+	* semantic-util-modes.el: (semantic-highlight-attribute-face-private)
+	(semantic-highlight-attribute-face-protected)
+	(semantic-highlight-attribute-face-private): New colors.
+
+	* NEWS: Fix names search-result -> find-result
+
+	* semanticdb-file.el (semanticdb-create-database):
+	Provde a more intelligent name for new DBs.
+
+	* semanticdb.el (object-print): New method
+
+	* semantic-cb.el (semantic-cb-new-class-browser): Turn of system DB.
+	Use `semanticdb-brute-find-tags-by-class' to scan all files in a project.
+
+	* semanticdb-find.el (semanticdb-find-result-prin1-to-string):
+	New debug fcn
+	(semanticdb-find-tags-by-class): doc fix.
+	(semanticdb-brute-find-tags-by-class): New fcn
+
+	* semantic-complete.el (semantic-collector-calculate-completions):
+	Add new argument for PREFIX.
+	(semantic-complete-default-to-tag): Use new arg
+	(semantic-complete-current-match): Use new arg
+	(semantic-complete-hack-word-boundaries): New function.
+	(semantic-complete-do-completion): Use new arg and new fcn
+	(semantic-complete-try-completion): Support partial completion
+	of word boundary characters.
+	(semantic-collector-abstract): Add cache for whitespace completion.
+	(semantic-collector-next-action): Support whitespace completion
+	and 'done state.
+	(semantic-complete-next-action): Doc fix. (see previous)
+	(semantic-collector-try-completion-whitespace)
+	(semantic-collect-r-current-whitespace-completion): New fcns
+
+2003-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex.el (define-lex): Doc fix.
+
+2003-12-05  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (PAREN_BLOCK, BRACE_BLOCK, BRACK_BLOCK):
+	New tokens.
+
+	* wisent/wisent-java-tags.wy (PAREN_BLOCK): Change type to <block>.
+	(BRACE_BLOCK, BRACK_BLOCK): Likewise.
+
+	* wisent/wisent-java-lex.el (wisent-java-lex-blocks): Remove.
+	(wisent-java-tags-lexer): Use `semantic-lex-block-type'.
+	(wisent-java-lexer): Ditto.
+
+	* semantic-lex.el (semantic--lex-block-specs): New variable.
+	(semantic--lex-delim-spec): New function.
+	(semantic--lex-block-specs): New function.
+	(semantic-lex-block-type): New lexical analyzer.
+
+2003-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-current-match):
+	Account for new return arg of
+	`semanticdb-find-result-nth'.  Use `semanticdb-find-result-nth-in-buffer'
+	 when getting the final tag to return to the prompt.
+	(semantic-complete-jump-local): Renamed from below.
+	(semantic-complete-jump): Uses project level prompt for jumping.
+
+	* semantic-complete.el (semantic-complete-choose-default):
+	Moved to semantic-ctxt.el
+	(semantic-complete-default-to-tag): Use `semantic-ctxt-current-thing'.
+	(semantic-displayor-focus-request): Improve focus summary output.
+	Make tag highlighting more robust to file loading.
+	Show minibuffer message for position of current cycle, AND
+	mimic completion on the current minibuffer contents.
+
+	* semantic-ctxt.el (semantic-ctxt-current-thing): new function.
+
+	* semantic-complete.el (semantic-displayor-focus-next-tag):
+	Fixed to use new datatype of TABLE.
+	(semantic-displayor-focus-request): Fixed to also show summaries if a
+	tag cannot be focused on due to lack of position or lack of buffer.
+
+	* semanticdb.el (semanticdb-get-buffer:semanticdb-abstract-table):
+	New method.
+	(semanticdb-get-buffer:semanticdb-table): New method.
+	(semanticdb-set-buffer): Use above.
+
+2003-12-01  David Ponce  <david@dponce.com>
+
+	* semantic-lex.el (semantic-lex-make-type-table):
+	Reset ALIST before processing next
+	token type spec.
+
+2003-11-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-system.el (semanticdb-create-system-database):
+	Add autoload cookie.
+
+	* semantic-complete.el (semantic-complete-read-tag-engine):
+	Replaced setup with something simpler.
+	Replaced end with single function call.
+	(semantic-completion-message): Moved
+	(semantic-complete-active-default): New variable
+	(semantic-complete-choose-default): Moved
+	(semantic-complete-default-to-tag): New
+	(semantic-complete-current-matched-tag): New variable
+	(semantic-complete-current-match): New fcn
+	(semantic-complete-done): Moved and simplified.
+	(semantic-complete-try-completion): Pass extra arg to `semantic-collector-try-completion'
+	(semantic-complete-do-completion):
+	Rebind some globals to local variables.
+	Add implementation for 'scroll action type.
+	(semantic-complete-next-action): New fcn.
+	(semantic-collector-abstract): Make 'last-prefix protected.
+	Rename `match-list' to `current-exact-match'.
+	(semantic-collector-next-action): Move and simplify.
+	(semantic-collector-calculate-completions): Differentiate between
+	single and multiple exact matches vs multiple different matches.
+	(semantic-collector-current-exact-match): New name.
+	(semantic-collector-all-completions, semantic-collector-try-completion):
+	Accept and use new prefix argument.
+	(semantic-collector-flush): Account for renamed match-list.
+	(semantic-displayor-abstract): Make table and last-prefix protected.
+	(semantic-displayor-next-action): Return 'scroll instead of 'focus.
+	(semantic-displayor-focus-request): Ding
+	(semantic-displayor-scroll-request): New method
+	(semantic-displayor-focus-abstract): Make 'focus protected.
+	(semantic-displayor-next-action): New method.
+	(semantic-displayor-current-focus): More protection around search.
+
+2003-11-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el: (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-deep-find-tags-by-name-method)
+	(semanticdb-deep-find-tags-by-name-regexp-method)
+	(semanticdb-deep-find-tags-external-children-of-type-method):
+	Accept new TAGS argument.  Dispatch to superclass if passed in.
+
+	* semanticdb-find.el (semanticdb-find-translate-path): Update doc
+	(semanticdb-find-translate-path-default):
+	Support find results as a path.
+	(semanticdb-find-result-nth, semantic-find-result-nth-in-buffer):
+	Return a cons cell which includes the table the tag was found in.
+	(semanticdb-find-tags-collector): Handle find results in the path.
+	(semanticdb-find-tags-by-name, semanticdb-find-tags-by-name-regexp)
+	(semanticdb-find-tags-for-completion, semanticdb-find-tags-by-class)
+	(semanticdb-deep-find-tags-by-name, semanticdb-deep-find-tags-by-name-regexp)
+	(semanticdb-deep-find-tags-for-completion)
+	(semanticdb-brute-deep-find-tags-by-name)
+	(semanticdb-find-tags-external-children-of-type):
+	Lambda expression sent to collector taks a TAGS argument.
+	(semanticdb-find-tags-by-name-method):
+	(semanticdb-find-tags-by-for-completion-method)
+	(semanticdb-find-tags-by-class-method)
+	(semanticdb-find-deep-tags-by-name-method)
+	(semanticdb-find-deep-tags-by-name-regexp-method)
+	(semanticdb-find-deep-tags-by-for-completion-method):
+	Accept a TAGS argument into the method.  Search that tag list if
+	passed in.
+
+2003-11-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el: Update commentary.
+	(semantic-complete-read-tag-engine): handle empty match-lists.
+	handle tags that do not have positions.
+	Use new semanticdb find results API for tags read from a database.
+	(semantic-complete-done): Force full recalculation on CR.
+	(semantic-complete-try-completion): Use new semanticdb find result
+	api.  make sure minibuffer contents are flushed.
+	(semantic-collector-abstract): Force the cache to be of :type
+	semanticdb-find-result-with-nil.
+	(semantic-collector-get-cache,
+	semantic-collector-calculate-completions-raw):
+	New methods.
+	(semantic-collector-calculate-completions):
+	Use new accessors.
+	(semantic-collector-get-match-list, semantic-collector-get-match):
+	New methods.
+	(semantic-collector-calculate-cache): Create cache in semanticdb
+	format.
+	(semantic-collector-project-abstract): New class.
+	(semantic-collector-project): New class.
+	(semantic-collector-calculate-completions-raw): New method on above.
+	9semantic-collector-project-brutish): New class.
+	(semantic-collector-calculate-completions-raw): New method on above.
+	(semantic-displayor-abstract): Use db find result as table type.
+	(semantic-displayor-current-focus): For above, return nil.
+	(semantic-displayor-show-request): Use semanticdb-strip-find-results.
+	(semantic-displayor-focus-abstract): New slot 'find-file-focus'.
+	(semantic-displayor-current-focus): For above, use semanticdb-find-results-nth.
+	(semantic-displayor-tradition-with-focus-highlight): Specify
+	'find-file-focus' slot value as t.
+	(semantic-complete-read-tag-project): New function
+	(semantic-complete-test): Change which function is tested here.
+
+	* semantic-format.el (semantic-format-tag-protection-symbol-to-string-assoc-list):
+	New
+	variable.
+	(semantic-format-tag-uml-protection-to-string): Now an override
+	method.
+	(semantic-format-tag-uml-protection-to-string-default): New function.
+	Now uses semantic-format-tag-protection-symbol-to-string-assoc-list.
+
+	* semantic-texi.el (semantic-texi-associated-files):
+	Use `semanticdb-get-database-tables' method.
+
+	* semantic-imenu.el (semantic-create-imenu-directory-index):
+	Use `semanticdb-get-database-tables' method.
+
+	* semanticdb-search.el (semanticdb-find-nonterminal-by-function-method):
+	Use `semanticdb-get-database-tables' method.
+
+	* semanticdb-find.el (semanticdb-find-translate-path-brutish-default):
+	Use `semanticdb-get-database-tables' method.
+	(semanticdb-strip-find-results, semanticdb-find-results-p)
+	(semanticdb-find-results-with-nil-p, semanticdb-find-result-length)
+	(semanticdb-find-result-nth): New methods
+	(semanticdb-find-tags-collector): Protect action by `save-excursion'.
+	(semanticdb-brute-deep-find-tags-for-completion): new function.
+
+	* semanticdb-file.el (semanticdb-load-database):
+	Use `semanticdb-get-database-tables' method.
+
+	* semantic-chart.el (semantic-chart-database-size):
+	Use `semanticdb-get-database-tables' method.
+
+	* semanticdb-el.el (semanticdb-file-table): Call new below method.
+	(emanticdb-get-database-tables): Body was 'semanticdb-file-table'
+	Table slot either has a value, or is unbound.  It isn't nil.
+	(semanticdb-elisp-sym-function-arglist): Use eieio function that
+	returns an arglist.
+	(semanticdb-elisp-sym->tag): More robust test for 'user-visible'
+	value of functions.
+
+	* semanticdb.el (semanticdb-project-database):
+	Make the 'tables' slot protected.
+	Add :accessor `semanticdb-get-database-tables'.
+	(semanticdb-flush-database-tables): New method
+	(semanticdb-current-database-list): Make sure `reference-directory'
+	is bound before using it.
+	(semanticdb-database-sanity-check): Use
+	`semanticdb-get-database-tables' method.
+
+	* Makefile, wisent/Makefile, wisent/Project.ede, Project.ede, bovine/Makefile, bovine/Project.ede, bovine/semantic-erlang.el, bovine/semantic-make.el, semantic-format.el, semantic-fw.el, semantic-grammar.el, semantic-imenu.el, semantic-regtest.el, semantic-sort.el, semantic-tag.el, semanticdb-file.el, semanticdb-find.el, semanticdb-search.el, semanticdb.el, senator.el:
+	Merged with cedet-1p0beta1 branch.
+
+2003-10-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Summary Mode): Added summary function option.
+
+	* senator.el (senator-eldoc-summary-function): New option.
+	(senator-eldoc-print-current-symbol-info):
+	Obey `eldoc-echo-area-use-multiline-p'
+
+2003-10-02  David Ponce  <david@dponce.com>
+
+	* doc/wisent.texi:
+	Clarify definition of rule precedence in "Grammar format" node.
+
+	* semantic-grammar-wy.el: Re-generate.
+
+	* semantic-grammar.wy:
+	Handle %default-prec/%no-default-prec declarations introduced in
+	Bison 1.875c, to enable/disable default rule precedences.
+	(NO-DEFAULT-PREC): New keyword.
+	(default_prec_decl): Remove argument.
+	(no_default_prec_decl): New rule.
+	(decl): Use it.
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Now a meta-subproject.
+
+	* wisent/Makefile, tests/Makefile, doc/Makefile, bovine/Makefile (dist):
+	Now phony.
+
+	* Makefile (dist): Remove local creation of tar file.
+	(dist,tags): Call subprojects differently.
+
+2003-10-01  David Ponce  <david@dponce.com>
+
+	* doc/wisent.texi:
+	Add paragraphs on default-prec feature in "Grammar format" node.
+
+	* semantic-grammar-wy.el: Re-generate.
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Generate Lisp code if the
+	grammar in the current buffer is modified.
+
+	* semantic-grammar.wy:
+	Handle new %default-prec declaration introduced in Bison 1.875c,
+	to enable (the default) or disable default rule precedences.
+	(DEFAULT-PREC): New token.
+	(default_prec_decl): New rule.
+	(decl): Use it.
+
+	* wisent/wisent-comp.el:
+	Handle new default-prec feature introduced in Bison 1.875c,
+	to enable (the default) or disable default rule precedences.
+	Add `default-prec' to compile-grammar context.
+	(wisent-parse-grammar): Handle `default-prec' in associativity
+	rules.
+
+2003-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-debug.el, semanticdb.el, semantic-analyze.el:
+	Dependent on eieio 0.18beta1.
+
+2003-09-24  David Ponce  <david@dponce.com>
+
+	* sformat.el, working.el: Move to common.
+
+	* Makefile: Re-generate.
+
+	* Project.ede (tools):
+	Remove sformat.el and working.el from target sources.
+
+2003-09-18  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (init): Remove semantic-autogen.el from target.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-menu-bar): Fix typo.
+
+	* Makefile: Re-generated.
+
+	* Project.ede (autoloads):
+	Change semantic-al.el by semantic-loaddefs.el.
+
+	* semantic-fw.el: Load semantic-loaddefs instead of semantic-al.
+
+2003-09-16  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* semantic-edit.el (semantic-changes-in-region):
+	Don't go outside buffer's bounds.
+
+	* bovine/erlang.bnf, semantic-autogen.el: Remove.  Obsolete.
+
+	* wisent/Wisent.mk: Remove.  No more used.
+
+	* wisent/Makefile: Re-generated.
+
+	* wisent/Project.ede (make): Remove target.  No more useful.
+
+	* Makefile: Re-generated.
+
+2003-09-12  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic--tag-hook-value): New variable.
+	(semantic-tag-add-hook): Use `add-hook'.
+	(semantic-tag-remove-hook): Use `remove-hook'.
+	(semantic--tag-run-hooks): Use new variable above.
+
+2003-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: (Versioning, Naming conventions, Grammar build process)
+	(semanticdb-find.el, semantic-show-tag-boundaries)
+	(semantic-highlight-by-attribute-mode): New
+	(bovine-grammar-mode): don't support bnf.
+	(semanticdb-search.el): Updated.
+	(seup): updated
+	(Erlang parser added): Updated
+
+2003-09-10  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (autoloads target):
+	Add "bovine" and "wisent" sub-directories to
+	autoload-dirs.
+
+2003-09-09  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Use a sub-menu for each Semantic minor mode to shorten the
+	Senator/Modes menu.
+
+	(senator-base-local-label)
+	(senator-base-global-label)
+	(senator-uniquify-count): Remove.
+	(senator-build-command-menu-item): Simplify.
+	(senator-mode-menu-item-format)
+	(senator-mode-menu-item-format-tty): Remove.
+	(senator-mode-menu-local-toggle-label)
+	(senator-mode-menu-global-toggle-label): New options.
+	(senator-build-mode-menu-items): Renamed to...
+	(senator-build-mode-sub-menu): Build a minor mode sub-menu instead
+	of separate menu items.
+	(senator-build-modes-menu): Use it.
+
+2003-09-08  David Ponce  <david@dponce.com>
+
+	* wisent/Makefile: Re-generated.
+
+	* wisent/Project.ede (taggers):
+	Move after "wisent" target to use byte-compiled
+	grammar compiler and speed up build.
+	(languages): Remove "wisent-awk-wy.el" from target.
+
+	* semantic-grammar-wy.el: Resurrect.  Needed to parse grammars!
+
+	* wisent/wisent-c-wy.el, wisent/wisent-calc-wy.el, wisent/wisent-java-tags-wy.el, wisent/wisent-java-wy.el, wisent/wisent-python-wy.el:
+	Remove.  Generated.
+
+	* wisent/fdl.texi: Remove.  Moved to doc.
+
+	* semantic-grammar-wy.el: Remove.  Generated.
+
+	* wisent/wisent-grammar.el (semantic-find): Require at compile time.
+
+	* doc/Makefile: Re-generated.
+
+	* doc/Project.ede (Documentation): Remove semanticdb.texi from target.
+
+	* bovine/Makefile: Re-generated.
+
+	* bovine/Project.ede (languages): Add semantic-java.el to target.
+
+	* semantic-sort.el: (semantic-tag-external-member-parent)
+	(semantic-tag-external-member-p)
+	(semantic-tag-external-member-children): Add autoload cookie.
+
+2003-09-07  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-java.el (semantic-java-prototype-nonterminal):
+	Add as obsolete alias of
+	`semantic-format-prototype-tag-java-mode'.
+
+	* wisent/wisent-bovine.el (wisent-parse-region):
+	Fix local variable name and invalid
+	function names.
+
+	* semantic-sort.el (semantic-find): Add compile-time require.
+
+	* semantic-sb.el (inversion-require): Fix speedbar version.
+
+	* semantic-grammar.el (semantic-find): Add compile-time require.
+
+	* semantic-find.el (semantic-sort): Remove compile-time require.
+
+2003-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el (semantic-dot): autload cookie.
+
+	* semanticdb-el.el (semanticdb-find-tags-by-class-method): New method
+
+	* wisent/Makefile (doc): Removed vars and rule.
+
+	* wisent/Project.ede (doc): Removed
+
+	* Makefile (LOADDEFS): New
+	(maintenance_LISP): removed autoload file
+	(all): Add autoload
+	(semantic-al.el): new rule
+	(init): remove semantic-al.el
+	(dist): add loaddefs.
+
+	* Project.ede ("init"): Removed autoload generator
+	("autoloads"): New
+
+2003-09-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-scm-by.el: autogenerated now
+
+	* bovine/semantic-make-by.el: autogenerated now.
+
+	* bovine/semantic-erlang-by.el: autogenerated now
+
+	* bovine/semantic-c-by.el: Auto generated in makefile
+
+2003-09-05  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-get-local-variables):
+	Replace by a
+	define-mode-overload-implementation of
+	`semantic-get-local-variables'.
+	(semantic-install-function-overrides): Remove call.
+
+	* bovine/semantic-java.el: (semantic-java-prototype-function)
+	(semantic-java-prototype-variable)
+	(semantic-java-prototype-type): Doc fix.
+	(semantic-java-prototype-tag): Replace by a
+	define-mode-overload-implementation of
+	`semantic-format-prototype-tag'.
+	(semantic-java-find-documentation): Replace by a
+	define-mode-overload-implementation of
+	`semantic-documentation-for-tag'.  Fix implementation.
+
+	* semantic-doc.el (semantic-doc-snarf-comment-for-tag):
+	As indicated in doc string
+	allow to pass `lex' in NOSNARF argument.
+	(semantic-find-documentation): Declare obsolete.
+
+2003-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-scm.el:
+	(semantic-format-tag-prototype, semantic-documentation-for-tag)
+	(semantic-insert-foreign-tag): New name compatible
+
+	* bovine/semantic-el.el (semantic-bovine): New requirement
+
+	* bovine/semantic-bovine.el (semantic-lambda): Add autoload
+
+2003-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el (senator-transpose-tags-down): doc fix
+
+	* semantic-tag-file.el (semantic-go-to-tag): Doc fix.
+
+	* semantic-sort.el (semantic-adopt-external-members):
+	Doc fix.  Use new names.
+	(semantic-nonterminal-external-member-parent): Renamed to
+	(semantic-tag-external-member-parent): New name.
+	(semantic-nonterminal-external-member-parent-default): Renamed to
+	(semantic-tag-external-member-parent-default): new name
+	(semantic-nonterminal-external-member-p): renamed to
+	(semantic-tag-external-member-p): new name
+	(semantic-nonterminal-external-member-p-default): renamed to
+	(semantic-tag-external-member-p-default): new name
+	(semantic-nonterminal-external-member-children): renamed to
+	(semantic-tag-external-member-children): new name
+	(semantic-nonterminal-external-member-children-default): renamed to
+	(semantic-tag-external-member-children-default): new name
+
+	* semantic-fw.el:
+	Make documentation aspects of overload functions available to external modules:
+	(semantic-overload-symbol-from-function): new function
+	(define-overload): Use above
+	(semantic-overload-docstring-extension): New function
+	(semantic-augment-function-help): Use above
+
+	* semantic-find.el (semantic-find-tags-external-children-of-type):
+	Use `semantic-tag-extenal-member-parent'.
+
+	* semantic-complete.el (semantic-complete-read-tag-buffer-deep):
+	doc fix
+
+	* semantic-cb.el (semantic-cb-convert-type):
+	Use `semantic-tag-extenal-member-children'.
+
+	* semantic-analyze.el (semantic-analyze-type-parts):
+	Use `semantic-tag-extenal-member-children'.
+
+2003-09-02  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-bovine.el (semantic-lambda):
+	Move here from semantic/semantic.el.
+	(semantic-bovinate-nonterminal-db-nt): Doc fix.
+
+	* bovine/bovine-grammar.el (bovine-grammar-parsetable-builder):
+	Doc fix.
+
+	* semantic.el (semantic-toplevel-bovine-table): Doc fix.
+	(semantic-toplevel-bovine-table-source): Remove.  No more used.
+	(semantic-lambda): Move to bovine/semantic-bovine.el.
+	(semantic-bovinate-region-until-error)
+	(semantic-bovinate-from-nonterminal-full): Make obsolete.
+
+	* semantic-util.el (semantic-equivalent-major-modes): Doc fix.
+
+2003-09-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/wisent.texi:
+	(Wisent Overview, Wisent Grammar, Grammar format, Example)
+	(Compiling a grammar, Conflicts, Grammar Debugging)
+	(Understanding the automaton, Wisent Parsing)
+	(Writing a lexer, Actions goodies, Report errors)
+	(Error recovery, Debugging actions, Wisent Semantic)
+	(WY grammar format, Percent-keywords, WY Major Mode)
+	(Grammar styles, Iterative style, Bison style)
+	(Mixed style, Start nonterminals, Useful functions)
+	(Wisent Lex, Wisent Index): Updated @section and @node names
+	to be compatible with makeinfo.
+
+	* doc/user-guide.texi (senator): Fixed ref.
+
+	* doc/lang-support-guide.texi (Language Support Developer's Guide):
+	Removed empty node.
+	(Keywords): @ref updates.
+	(Keyword Properties): Added property tables
+	(Writing Parsers): Update refs
+	(External Parsers, Bovine Parsers, Wisent Parsers, Grammar)
+	(Programming Environment): Updated sections to be makeinfo compatible.
+
+	* doc/bovine.texi:
+	(%start, %languagemode, %token, Bovine Grammar Rules)
+	(Optional Lambda Expression): Updated sectioning names to make
+	compatible with makeinfo.
+
+2003-08-31  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-grammar-macros.el: (wisent-grammar-EXPAND)
+	(wisent-grammar-EXPANDFULL): Doc fix.
+	(wisent-grammar-TAG)
+	(wisent-grammar-VARIABLE-TAG)
+	(wisent-grammar-FUNCTION-TAG)
+	(wisent-grammar-TYPE-TAG)
+	(wisent-grammar-INCLUDE-TAG)
+	(wisent-grammar-PACKAGE-TAG)
+	(wisent-grammar-CODE-TAG)
+	(wisent-grammar-EXPANDTAG)
+	(wisent-grammar-AST-ADD)
+	(wisent-grammar-AST-PUT)
+	(wisent-grammar-AST-GET)
+	(wisent-grammar-AST-GET1)
+	(wisent-grammar-AST-GET-STRING)
+	(wisent-grammar-AST-MERGE): Use explicit arguments.
+
+	* bovine/semantic-scm-by.el, bovine/semantic-erlang-by.el:
+	Re-generated.
+
+	* bovine/scheme.by (scheme): Fix call to the EXPAND macro.
+
+	* bovine/erlang.by: (module-attr, import-attr, import-name-list)
+	(fun-clause, macro-def, include-dir)
+	(include-lib-dir): Fix call to the EXPAND macro.
+	(record-decl, record-def): Fix call to the EXPANDFULL macro.
+
+	* bovine/bovine-grammar-macros.el: (bovine-grammar-EXPAND)
+	(bovine-grammar-EXPANDFULL)
+	(bovine-grammar-TAG)
+	(bovine-grammar-VARIABLE-TAG)
+	(bovine-grammar-FUNCTION-TAG)
+	(bovine-grammar-TYPE-TAG)
+	(bovine-grammar-INCLUDE-TAG)
+	(bovine-grammar-PACKAGE-TAG)
+	(bovine-grammar-CODE-TAG): Use explicit arguments.
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Move insert of declaration
+	header into declaration part.
+
+2003-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el: (senator-transpose-tags-up)
+	(senator-transpose-tags-down): New commands.
+
+	* semantic-texi.el (semantic-default-texi-setup):
+	Bind f9 to update texi from texi.
+
+	* doc/wisent.texi:
+	Converted from stand along documentation to part of semantic manual.
+	(Wisent Parsers): Renamed.
+	(Wisent Grammar): Renamed
+	(Wisent Parsing): Renamed
+	(Wisent Index): Unchaptered.
+
+	* doc/semantic.texi: Added Richard to AUTHORS.
+
+	* doc/Project.ede, doc/Makefile: Added bovine and wisent texi files.
+
+	* doc/lang-support-guide.texi (Language Support Developer's Guide):
+	Rename BNF section.
+	(Language Support Overview): Use semantic macro.
+	(Writing Parsers): Divided into three parser type sections.
+	(Writing Grammars): Emptied out.
+
+	* doc/bovine.texi: New.
+
+	* doc/app-dev-guide.texi (Override Methods):
+	Add pointer to the app dev guide.
+	(Tag Details): Anchors and obsolete tags..
+	(System Databases): Added Anchor.
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Add an :overloadable attribute.
+	(semantic-emacs-lisp-overridable-doc)
+	(semantic-emacs-lisp-obsoleted-doc): New functions
+	(semantic-documentation-for-tag): Add above new info to doc strings.
+
+	* semantic.texi: Now exists in the doc directory.
+
+	* doc/wisent.texi, wisent/wisent.texi:
+	Renamed wisent/wisent.texi to doc/wisent.texi
+
+	* document.el (document-insert-texinfo):
+	Add an anchor to all definitions.
+
+2003-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi: (Script Generated Cache Files)
+	(Create System Databases): New sections.
+
+	* doc/app-dev-guide.texi (Semantic Database):
+	Added new sections for seraching and system databases.
+	(Semanticdb in Programs): Updated
+	(Semanticdb Tag Queries): Updated
+
+	* doc/app-dev-guide.texi: (Tag Collectors)
+	(Tag Displayors):  Removed class hierarcy.  (subsubsubsections bad.)
+	(Override Methods): New node `tag-members'.
+	(Format Tag): Updated all functions
+	(Tag members): New section
+	(Tag Details): Updated all functions
+	(Local Context): Updated all functions
+	(Parser Hooks): updated all hooks.
+
+2003-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/app-dev-guide.texi (Application Developer's Guide):
+	Fix menu.  Add semanticdb.
+	(Tags at Point): Add next/prev by overlay.
+	(Tag Completion): Delegate previous doc as "old".
+	All new doc for the new `semantic-complete.el' code.
+	(Format Tag): Fcn name fixes.
+	(Semantic Database): new
+
+	* bovine/Makefile (bovinator_LISP): Removed semantic-bnf.el
+
+	* Makefile: Added EDE onto the load path.
+
+	* Project.ede: Added ede as a path extension.
+
+	* semantic-util-modes.el (semantic-decorate): New require.
+
+	* semantic-util.el (semanticdb): New require.
+
+	* semantic-texi.el (semantic-doc): New require
+	(semantic-texi-find-documentation): Fix compiler warning.
+	(semantic-texi-update-doc-from-texi): Fix prototype doc transfer.
+	(semantic-texi-update-doc-from-source): Fix compiler warning.
+
+	* semantic-sort.el (semantic-bucketize-tag-class): Fix doc.
+
+	* semantic-grammar.el (semantic-format): new require.
+
+	* semantic-format.el (semantic-format-tag-summarize-default):
+	Don't use bucketize
+	function.  Just get the class.
+
+	* semantic-find.el (semantic-sort): New require.
+
+	* semantic-doc.el (semantic-documentation-for-tag):
+	Use `semantic-go-to-tag'.
+
+	* semantic-decorate.el (semantic-tag-delete-secondary-overlay):
+	Added autoload cookie.
+
+	* semanticdb-el.el (eieio-opt):
+	New require for byte-compiler modifications.
+
+	* semantic-cb.el (semanticdb-find, semantic-sort): New require
+	(eieio-speedbar-handle-click): Rename token to tag.
+
+	* semantic-analyze.el (semantic-sort): new require.
+
+	* bovine/semantic-bnf.el: *** empty log message ***
+
+	* bovine/Project.ede (bovinator): Remove semantic-bnf.el
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Fixed compiler warnings
+	(semantic-recursive-find-nonterminal-by-name):
+	Replace obsoleted function call with new call.
+
+2003-08-29  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-erlang-by.el: Re-generated.
+
+	* bovine/erlang.by (record-def): Fix call to TYPE-TAG.
+	(include-dir, include-lib-dir): Fix call to INCLUDE-TAG.
+
+	* semantic-grammar.el (semantic-grammar-buffer-file): New function.
+	(semantic-grammar-package, semantic-grammar-keywordtable)
+	(semantic-grammar-tokentable, semantic-grammar-parsetable)
+	(semantic-grammar-setupfunction, semantic-grammar-header)
+	(semantic-grammar-footer): Use it.
+
+	(semantic-grammar-batch-build-one-package): Increase some Emacs
+	limits to byte-compile complex grammar tables.
+
+2003-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/tags.texi (Semantic Tags): New menu item.
+	(Tag Hooks): New section
+	(Misc Tag Internals): Add refs to tag hooks.
+
+	* doc/user-guide.texi (senator): Fix Command typo
+	(semanticdb): Removed Semanticdb configuration node.
+
+	* doc/overview.texi (Semantic Components):
+	Remove BNF and bovine references.
+
+	* doc/user-guide.texi (semanticdb): Doc fix
+	(Semanticdb Configuration): Updated.
+	(Semanticdb Tag Storage, Semanticdb Search Configuration)
+	(Semanticdb System Backends, Changing Backends): New subsubsections.
+
+2003-08-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ede-grammar.el (ede-proj-makefile-insert-dist-dependencies):
+	New method
+
+2003-08-28  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-erlang-by.el: Re-generated.
+
+	* bovine/erlang.by (binary-segment-rest):
+	Use basic-type instead of integer-literal.
+	(binary-unit): Likewise.
+
+2003-08-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/lang-support-guide.texi: (Writing Lexers)
+	(Lexer Overview): Change to `semantic-lex'.
+	(Lexer Options): Deleted
+	(Lexer Construction): New
+	(Lexer Built In Analyzers): New
+	(Keywords): Updated
+	(Writing Parsers): Added note to self.
+	(Rules): Updated just enough so it compiles.
+
+	* bovine/Makefile (by_SEMANTIC_GRAMMAR): Added erlang.by
+
+	* bovine/Project.ede ("by"): Added erlang.by
+
+	* bovine/erlang.bnf: (binary-segment-rest)
+	(binary-unit): David Wallin's changes.
+
+2003-08-28  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-erlang.el: Convert old BNF grammar to new BY format.
+
+	(semantic-erlang-by): Require.
+	(semantic-erlang-lex-char)
+	(semantic-erlang-lexer): New function.
+	(semantic-default-erlang-setup): Rename to...
+	(semantic-erlang-default-setup): New.  Update all references.
+	(semantic-toplevel-erlang-bovine-table)
+	(semantic-erlang-keyword-table): Remove.
+
+	* bovine/semantic-erlang-by.el, bovine/erlang.by: New file.
+
+	* semantic-util-modes.el: (semantic-stickyfunc-old-hlf)
+	(semantic-stickyfunc-header-line-format): New variables.
+	(semantic-stickyfunc-mode-setup): When turning sticky func mode
+	on/off, take care of a header line previously there.
+
+2003-08-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el (document-texify-elisp-docstring):
+	Add <> as valid symbols characters.
+
+	* semantic-texi.el (semantic-texi-set-endpoint): New fcn
+	(semantic-texi-recursive-combobulate-list): Set section end point to
+	the logical end of those sections instead of the end of the regexp.
+	(semantic-default-texi-setup): Add stickyfunc support.
+	(semantic-texi-update-doc-from-texi): Look for prototype, and
+	variable doc strings.  Go for the function first, then variable, then
+	prototype.
+
+	* semantic-util-modes.el:
+	(semantic-highlight-edits-face, semantic-highlight-edits-mode)
+	(semantic-show-unmatched-syntax-mode, semantic-auto-parse-mode)
+	(semantic-show-parser-state-mode, semantic-summary-mode)
+	(semantic-stickyfunc-mode, semantic-show-tag-boundaries-mode)
+	(semantic-highlight-attribute-alist)
+	(semantic-highlight-by-attribute-mode): Doc Fix
+	(semantic-stickyfunc-sticky-classes): Made buffer local.
+	(semantic-stickyfunc-fetch-stickyline): Start at bottom, and find
+	first matching tag class.
+
+	* doc/user-guide.texi (Semantic User's Guide): updated the menu.
+	(Speedbar): Fixed ref to class browser.
+	(Minor Modes): Added Summary Mode, Sticky Functions, Tag Boundaries,
+	and attribute highlighting modes.
+
+2003-08-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi: (speedbar)
+	(imenu): Added @file around .emacs
+	(senator): Updated commands with new tag based names.
+	Updated all doc strings.
+	(Analyzer): Updated doc strings.
+	Augmented some documentation.
+	(Smart Completion): Updated doc strings.
+	(Speedbar Analysis): Updated @ref to capitalized names.
+	(Class Browser): Removed explicit reference to EIEIO.
+	Formated some text.
+	(Document): updated doc strings.
+	Fixed target file for document output.
+	Augmented text around commands.
+	(Charts): Updated doc strings and function names.
+	(Minor Modes): added subsection nheaders.
+	Replaced obsolete commands with new commands.
+	Updated all existing doc.
+	Added some new text around each mode.
+
+2003-08-27  David Ponce  <david@dponce.com>
+
+	* senator.el: (senator-search-forward, senator-re-search-forward)
+	(senator-word-search-forward): Doc fix.
+	(senator-search-backward, senator-re-search-backward)
+	(senator-word-search-backward): Doc fix.
+	(senator-menu-bar): Fix use of obsolete variable.
+
+2003-08-26  David Ponce  <david@dponce.com>
+
+	* doc/user-guide.texi: Fix node @ref.
+
+2003-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/user-guide.texi (Semantic User's Guide): Added ECB
+	(speedbar): token->tag fix
+	(ECB): New node
+	(imenu): Update all variables.
+	(senator): Update all command in first few subsubsections.
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Fixed user-visible typo.
+	(semantic-documentation-for-tag): Use substitute command keys on
+	found string.
+
+	* senator.el (senator-kill-tag): Doc fix.
+	(senator-isearch-toggle-semantic-mode): Doc fix.
+
+	* semantic-texi.el (semantic-default-texi-setup):
+	Use new imenu variable names
+	(semantic-texi-update-doc-from-texi): If the first doc match is a
+	prototype, keep searching for the original.  If there is no original,
+	use the prototype.
+
+	* semantic-imenu.el (semantic-imenu-summary-function): Doc fix.
+	(semantic-imenu-expand-type-members): Renamed from ...
+	(semantic-imenu-expand-type-parts): Obsolete
+	(semantic-imenu-bucketize-type-members): Renamed from ...
+	(semantic-imenu-bucketize-type-parts): Obsolete
+	(semantic-imenu-sort-bucket-function): Doc fix.
+	(semantic-imenu-expandable-tag-class): Renamed from ...
+	(semantic-imenu-expandable-token): Obsolete
+	(semantic-create-imenu-index-1, semantic-create-imenu-subindex)
+	(semantic-imenu-toggle-bucketize-type-parts)
+	(semantic-default-which-function): Use renamed variables.
+
+	* document.el (document-texify-elisp-docstring):
+	Support kbd items followed by punctuation.
+
+2003-08-26  David Ponce  <david@dponce.com>
+
+	* doc/lang-support-guide.texi: Fix node @ref.
+
+2003-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el: (define-lex-analyzer)
+	(define-lex-regex-analyzer)
+	(semantic-lex-number): Use `semantic-format-tag-name' instead of
+	obsolete fcn.
+
+	* semantic-lex.el: (define-lex-analyzer)
+	(define-lex-regex-analyzer)
+	(semantic-lex-number): Doc fix
+
+2003-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/lang-support-guide.texi (Parser Error Handling):
+	replace `token' fcns with `tag' fcns.
+	(Tag Structure): Removed contents of standard tags.  Refer to creating tags
+	chapter instead.
+	(Language Support Overview)
+	(Semantic Overload Mechanism): Various token->tag updates
+	(Writing Lexers)
+	(Lexer Overview)
+	(Lexer Output): Refer to sematnic-lex.  This needs more work.
+
+	* Makefile (semantic_LISP): Added semantic-ast
+	(maintenance_LISP): new
+	(maintenance): New
+	(dist): Add above new sources.
+
+	* Project.ede ("maintenance"): New target.
+
+	* doc/glossary.texi (Glossary):
+	Added more definitions to some keywords.
+
+	* doc/Makefile (Documentation_TEXINFOS): Add tags.texi.
+
+	* doc/Project.ede (Documentation): Add tags.texi.
+
+	* bovine/semantic-el.el (semantic-elisp-store-documentation-in-tag):
+	New flag.
+	(semantic-elisp-do-doc): New flag
+	(semantic-elisp-use-read): Add doc strings to tags iff above flag is enabled.
+	(semantic-documentation-for-tag): Get doc string from tag.
+	If there isn't one, re-run semantic-elisp-use-read with doc turned on.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi):
+	Use new search routine.
+	Combine all tags into one long list.
+	(semantic-texi-update-doc-from-source): Use new doc fetching name.
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Use semanticdb-get-tags instead of oref.
+
+	* semanticdb-find.el (semanticdb-find-translate-path):
+	Accept a `brutish' flag.
+	(semanticdb-find-translate-path-default): Accept a brutish flag.
+	(semanticdb-find-translate-path-brutish-default)
+	(semanticdb-find-translate-path-includes-default): New fcns.
+	(semanticdb-find-tags-collector): Pass through a brutish flag to the collector.
+	(semanticdb-brute-deep-find-tags-by-name): New fcn.
+
+	* semanticdb.el (semanticdb-current-database-list):
+	Add optional DIR argument for
+	starting directory.
+
+2003-08-25  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	In message, use the package
+	name instead of the Lisp file name.
+	(semantic-grammar-batch-build-one-package): Use
+	`byte-compile-dest-file' to obtain the compiled file name.
+
+2003-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/app-dev-guide.texi:
+	(Application Developer's Guide, Tag Tables, Tags at Point)
+	(Tag Sorting, Tag Completion, Override Methods, Format Tag)
+	(Tag Details, Parser Hooks, Example Programs):
+	Removed references to `token' and `nonterminal' where apropriate.
+	Fixed all cross links within this file.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi):
+	Use brute search when finding
+	the tag for the doc.
+
+	* semantic-sort.el (semantic-mark-external-member-function): Doc fix.
+
+	* semantic-edit.el (semantic-after-partial-cache-change-hook): Doc fix.
+
+	* semantic-ede-grammar.el (semantic-ede-proj-target-grammar):
+	Added new source and compiler types.
+	(semantic-ede-source-grammar): Renamed to
+	(semantic-ede-source-grammar-wisent):
+	(semantic-ede-grammar-compiler): Renamed to
+	(semantic-ede-grammar-compiler-wisent):
+	(semandic-ede-source-grammar-bovine, semantic-ede-grammar-compiler-bovine):
+	New.
+
+	* bovine/Makefile, bovine/Project.ede:
+	Replaced old by target with new by target of semantic grammar type.
+
+2003-08-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (LOADPATH): New stuf added
+	(wy): Removed
+	(all): added taggers
+	(dist): removed wy, added taggers
+	(taggers): new rule for compiling .wy files.
+
+	* wisent/Project.ede (taggers): New
+	(wy): deleted
+
+	* semantic-ede-grammar.el (semantic-grammar): move require.
+	(semantic-ede-proj-target-grammar): autoload cookie
+	(semantic-ede-grammar-compiler): Remove extra rules.  Use one single
+	batch of actions.
+	(ede-compile-intermediate-objects-p, ede-compiler-intermediate-object-variable):
+	Removed.
+	(ede-proj-makefile-insert-variables): changed extra variable to be
+	the .el files.
+	(ede-proj-makefile-insert-rules): Removed intermediate rules used before.
+	(end of file): Fixed provide statement, and method for adding this
+	project class.
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Do not create the package if the
+	package is not out of date.
+	(semantic-grammar-batch-build-one-package): Do not byte compile if the
+	compiled file is not out of date.
+
+2003-08-21  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-create-package):
+	Return name of created file.
+	(semantic-grammar-create-package-from-file): Replace by...
+	(semantic-grammar-batch-build-one-package): New fcn.  Creates the
+	package AND byte compiles it.
+	(semantic-grammar-batch-create-package): Rename to...
+	(semantic-grammar-batch-build-packages): Use new fcn above.  Error
+	checks with user comprehensible messages.  Remove vc from
+	find-file-hooks.  It causes bad stuff to happen in Emacs 20.
+
+2003-08-20  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (eldoc-current-symbol-info): Fix typo.
+
+	* semantic-grammar.el: (semantic-grammar-insert-defconst)
+	(semantic-grammar-insert-defun): No more call `eval-defun'.
+	(semantic-grammar-file-regexp): New option.
+	(semantic-grammar-noninteractive): New function.
+	(semantic-grammar-create-package): Doc fix.  Use `eval-region' to
+	evaluate declarations and epilogue.  Handle when run in batch
+	mode.
+	(semantic-grammar-create-package-from-file)
+	(semantic-grammar-batch-create-package): New functions.
+	(semantic-grammar-mode, semantic-abbreviate-nonterminal)
+	(semantic-summarize-nonterminal): Don't use obsolete API.
+	(semantic-grammar-function-argstring-from-docstring)
+	(semantic-grammar-eldoc-get-macro-docstring): New functions.
+	(eldoc-current-symbol-info): Handle grammar macros.
+
+	* semantic-format.el (semantic-colorize-text): Declare obsolete.
+
+2003-08-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-c.el (c-mode-hook): Remove autoload cookie.
+
+	* senator.el: (senator-find-nonterminal-by-name)
+	(senator-find-nonterminal-by-name-regexp): Remove "." at end of
+	error message.
+	(senator-search-tag-filter): New option.
+	(senator-search-forward-raw)
+	(senator-search-backward-raw): Remove.  Replace by...
+	(senator-search): New function.
+	(senator-re-search-forward, senator-re-search-backward)
+	(senator-word-search-forward, senator-word-search-backward)
+	(senator-search-forward, senator-search-backward): Use it.
+	(senator-last-search-type): New variable.
+	(senator-nonincremental-repeat-search-forward)
+	(senator-nonincremental-repeat-search-backward): Use it.
+	(senator-nonincremental-search-forward)
+	(senator-nonincremental-search-backward)
+	(senator-nonincremental-re-search-forward)
+	(senator-nonincremental-re-search-backward): Set it.
+	(senator-nonincremental-repeat-re-search-forward)
+	(senator-nonincremental-repeat-re-search-backward): Remove.
+	(senator-search-set-tag-class-filter): New command.
+	(senator-prefix-map): Add keyboard shortcut for it.
+	(senator-menu-bar): Update search sub menu.
+
+2003-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ede-grammar.el: EDE interface for grammar files.
+
+	* senator.el (senator-menu-bar):
+	Changed names of all charting functions.
+
+	* semantic-util.el (semantic-something-to-tag-table): Update doc.
+
+	* semantic-chart.el:
+	(semantic-chart-database-size, semantic-chart-tags-by-class)
+	(semantic-chart-tag-complexity):  New fcn name.  Remove all references
+	to nonterminal or token.
+
+2003-08-15  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.wy (USE-MACROS): New token.
+	(decl): Add following...
+	(use_macros_decl): New rule.
+
+	* semantic-grammar.el (semantic-grammar-epilogue-start):
+	Ensure the start location will
+	never be reached when there is no epilogue.
+	(semantic-grammar-tokens): Use `semantic-tag-type'.
+	(semantic-summarize-nonterminal): Likewise.
+	(semantic-grammar-use-macros): New function.
+	(semantic-grammar-macros): Use it.
+	(semantic--grammar-macdecl-re)
+	(semantic--grammar-macros-regexp-2): New variables.
+	(semantic--grammar-clear-macros-regexp-2): New function.
+	(semantic--grammar-macros-regexp-2): Implement.
+	(semantic-grammar-map): Add shortcut key for
+	`semantic-grammar-find-macro-expander'.
+	(semantic-grammar-mode): Install
+	`semantic--grammar-clear-macros-regexp-2' in local
+	`before-change-functions' hooks.
+	(semantic--grammar-macro-function-tag)
+	(semantic--grammar-macro-lib-part)
+	(semantic--grammar-macro-compl-elt)
+	(semantic--grammar-macro-compl-dict): New functions.
+	(semantic-grammar-find-macro-expander): New command.
+
+	* semantic-grammar-wy.el: Re-generated.
+
+2003-08-15  Richard Y. Kim <ryk@ap.com>
+
+	* doc/app-dev-guide.texi, doc/lang-support-guide.texi, doc/semantic.texi, doc/tags.texi:
+	Created a new file, tags.texi, which documents the API for accessing semantic tags.  This file is a section @include'd by app-dev-guide.texi.
+
+2003-08-14  David Ponce  <david@dponce.com>
+
+	* semanticdb-find.el (semanticdb-find-translate-path-default):
+	Make code more efficient
+	and compatible with old versions of Emacs.
+	(semanticdb-find-tags-collector): Skip tables not associated to a
+	file when FIND-FILE-MATCH is non-nil.
+
+2003-08-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-grammar.el (wisent-grammar-macros): Require it.
+	(wisent-grammar-region-placeholder)
+	(wisent-grammar-EXPAND)
+	(wisent-grammar-EXPANDFULL)
+	(wisent-grammar-TAG)
+	(wisent-grammar-VARIABLE-TAG)
+	(wisent-grammar-FUNCTION-TAG)
+	(wisent-grammar-TYPE-TAG)
+	(wisent-grammar-INCLUDE-TAG)
+	(wisent-grammar-PACKAGE-TAG)
+	(wisent-grammar-EXPANDTAG)
+	(wisent-grammar-CODE-TAG)
+	(wisent-grammar-AST-ADD)
+	(wisent-grammar-AST-PUT)
+	(wisent-grammar-AST-GET)
+	(wisent-grammar-AST-GET1)
+	(wisent-grammar-AST-GET-STRING)
+	(wisent-grammar-AST-MERGE)
+	(wisent-grammar-builtins)
+	(wisent-grammar-builtin-names): Remove.  New definition in
+	wisent-grammar-macros library.
+	(wisent-grammar-expand-builtins): Move and rename...
+	(wisent-grammar-expand-macros): New function.
+	(wisent-grammar--macros): New variable.
+	(wisent-grammar-nonterminals): Use `wisent-grammar-expand-macros'.
+	Initialize macro definitions.
+	(wisent-grammar-mode): Don't setup
+	`semantic-grammar-builtin-names'.
+
+	* wisent/wisent-grammar-macros.el: New file.
+
+	* bovine/bovine-grammar.el (bovine-grammar-macros): Require it.
+	(bovine--grammar-macros): New variable.
+	(bovine-grammar-expand-EXPAND)
+	(bovine-grammar-expand-EXPANDFULL)
+	(bovine-grammar-expand-ASSOC)
+	(bovine-grammar-expand-TAG)
+	(bovine-grammar-expand-VARIABLE-TAG)
+	(bovine-grammar-expand-FUNCTION-TAG)
+	(bovine-grammar-expand-TYPE-TAG)
+	(bovine-grammar-expand-INCLUDE-TAG)
+	(bovine-grammar-expand-PACKAGE-TAG)
+	(bovine-grammar-expand-CODE-TAG): Remove.  New definition in
+	bovine-grammar-macros library.
+	(bovine-grammar-expand-form): Don't use hard-coded expanders.
+	(bovine-grammar-expand-action): Likewise.
+	(bovine-grammar-parsetable-builder): Initialize macro definitions.
+
+	* bovine/bovine-grammar-macros.el: New file.
+
+	* semantic-grammar.wy (decl): Remove extra empty rule.
+
+	* semantic-grammar.el (semantic-grammar-macros):
+	New variable and function.
+	(semantic-grammar-header-template): Use %C and %V for respectively
+	the copyright line and the version keyword.
+	(semantic-grammar-copyright-line): New function.
+	(semantic-grammar-header): Use it.  Setup %C and %V.  No more
+	inlined.
+	(semantic-grammar-footer): Doc fix.  No more inlined.
+	(semantic-grammar-token-data)
+	(semantic-grammar-keyword-data)
+	(semantic-grammar-parser-data)
+	(semantic-grammar-setup-data): No more inlined.
+	(semantic-grammar-create-package): Improve generation-evaluation
+	of lisp code.
+	(semantic--grammar-macros-regexp-1): New variable and function.
+	(semantic--grammar-macros-regexp-2): New variable.
+	(semantic--grammar-macros-matcher): New function.
+	(semantic-grammar-builtin-names)
+	(semantic-grammar-builtin-names-regexp)
+	(semantic-grammar-builtin-names-matcher): Remove.
+	(semantic-grammar-mode-keywords-1): Use
+	`semantic--grammar-macros-matcher'.
+	(semantic-grammar-map): Add ':' to electric punctuations.
+	(semantic-grammar-skip-comments-backward)
+	(semantic-grammar-goto-grammar-indent-anchor)
+	(semantic-grammar-between-name-and-colon-p)
+	(semantic-grammar-grammar-compute-indentation): Remove.
+	(semantic-grammar-backward-item)
+	(semantic-grammar-anchored-indentation): New function.
+	(semantic-grammar-do-grammar-indent): Simplify.  Use above new
+	functions.
+
+	* semantic-grammar-wy.el: Re-generated.
+
+2003-08-11  Richard Y. Kim <ryk@ap.com>
+
+	* doc/semantic.texi: Added @semantic{} macro.
+
+	* doc/lang-support-guide.texi:
+	Added sections titled "Tag Structure" and "Semantic Overload Mechanism".
+
+2003-08-06  David Ponce  <david@dponce.com>
+
+	* semantic-find.el (semantic-find-first-tag-by-name): Use `assoc' and
+	`assoc-ignore-case' instead of `assoc-string'.
+
+2003-08-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (languages_LISP): Removed unneeded lisp code
+	(Wisent.mk): Include this file
+	(dist): Aux makefile added to dist.
+
+	* wisent/Wisent.mk: Makefile extension for autogenerated Wisent code.
+
+2003-08-02  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-awk.el, wisent/wisent-cim.el: Obsolete file removed.
+
+	* wisent/wisent-python.el (wisent-python-wy): Require.
+	(wisent-python-parser-tables, wisent-python-keywords)
+	(wisent-python-tokens): Remove.
+	(wisent-python-default-setup): Moved.  Call generated function to
+	setup parser internals.  Do user's setup here.
+
+	* wisent/wisent-java-tags.el (wisent-java-tags-wy): Require.
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens): Remove.
+	(wisent-java-default-setup): Call generated function to setup
+	parser internals.  Do user's setup here.  Use new variable
+	`senator-step-at-tag-classes'.
+
+	* wisent/wisent-java.el (wisent-java-wy): Require.
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens): Remove.
+	(wisent-java-default-setup): Call generated function to setup
+	parser internals.  Do user's setup here.  Use new variable
+	`senator-step-at-tag-classes'.
+	(semantic-default-java-setup): Remove obsolete `remove-hook'.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy, wisent/wisent-python.wy:
+	(%outputfile, %parsetable, %tokentable)
+	(%keywordtable, %setupfunction, setupcode): Remove.
+
+	* wisent/wisent-grammar.el (require 'cl): Remove.
+	(wisent-grammar-EXPAND)
+	(wisent-grammar-EXPANDFULL): Fix error message.
+	(wisent-grammar-CODE-TAG): Add missing comma.
+	(wisent-grammar-expand-builtins): No more expand macros.
+	(wisent-grammar-expand-sexpr): Remove.  All callers changed.
+	(wisent-grammar-setupcode-builder): Return only code to setup
+	parser internals.
+
+	* wisent/wisent-calc.el (wisent-calc-wy): Require.
+	(wisent-calc-automaton, wisent-c-keyword-table)
+	(wisent-calc-tokens): Remove.
+	(wisent-calc-setup-parser): Moved in grammar epilogue.
+	(wisent-calc): No more depend on `wisent-calc-automaton'.
+
+	* wisent/wisent-calc.wy: (%outputfile, %parsetable, %tokentable)
+	(%setupfunction, setupcode): Remove.
+	(epilogue) <wisent-calc-setup-parser>: New.
+
+	* wisent/wisent-c.el (wisent-c-wy): Require.
+	(semantic-ast): Remove.  It is required in above library.
+	(wisent-c-parser-automaton, wisent-c-keyword-table)
+	(wisent-c-token-table): Remove.
+	(wisent-c-default-setup): Call generated function to setup
+	parser internals.  Do user's setup here.  Use new variable
+	`senator-step-at-tag-classes'.
+
+	* wisent/wisent-c.wy: (%outputfile, %parsetable, %tokentable)
+	(%keywordtable, %setupfunction): Remove.
+	(prologue): New.
+
+	* wisent/wisent-awk.wy, wisent/wisent-cim.wy:
+	(%outputfile, %parsetable, %tokentable)
+	(%keywordtable, %setupfunction): Remove.
+
+	* wisent/wisent-c-wy.el, wisent/wisent-calc-wy.el, wisent/wisent-java-tags-wy.el, wisent/wisent-java-wy.el, wisent/wisent-python-wy.el:
+	New generated file.
+
+	* bovine/semantic-skel.el (semantic-skeleton-by): Require.
+	(semantic-toplevel-skeleton-bovine-table)
+	(semantic-scheme-skeleton-table): Remove.
+	(semantic-default-skel-setup): Call generated function to setup
+	parser internals.  Do user's setup here.
+
+	* bovine/semantic-scm.el (semantic-scm-by): Require.
+	(semantic-toplevel-scheme-bovine-table)
+	(semantic-scheme-keyword-table): Remove.
+	(semantic-default-scheme-setup): Call generated function to setup
+	parser internals.  Do user's setup here.
+
+	* bovine/semantic-make.el (semantic-make-by): Require.
+	(semantic-toplevel-make-bovine-table)
+	(semantic-make-keyword-table): Remove.
+	(semantic-default-make-setup): Call generated function to setup
+	parser internals.  Do user's setup here.
+
+	* bovine/semantic-c.el (semantic-c-by): Require.
+	(semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table): Remove.
+	(semantic-default-c-setup): Call generated function to setup
+	parser internals.  Do user's setup here.  Use new variable
+	`senator-step-at-tag-classes'.
+
+	* bovine/c.by, bovine/make.by, bovine/scheme.by, bovine/skeleton.by:
+	(setupcode, %outputfile, %parsetable)
+	(%keywordtable, %setupfunction): Remove.
+	(%package): New.
+
+	* bovine/bovine-grammar.el (bovine-grammar-setupcode-builder):
+	Only setup parser internals.
+
+	* bovine/semantic-c-by.el, bovine/semantic-make-by.el, bovine/semantic-scm-by.el, bovine/semantic-skeleton-by.el:
+	New generated file.
+
+	* semantic-grammar.wy: Parse new grammar outline.
+
+	(setupcode, %outputfile, %parsetable)
+	(%tokentable, %setupfunction): Remove.
+	(%start) Add prologue epilogue.
+	(LANGUAGEMODE, LEFT, NONASSOC, PREC, PUT, QUOTEMODE)
+	(RIGHT, SCOPESTART, START, TOKEN)
+	(KEYWORDTABLE, OUTPUTFILE, PARSETABLE)
+	(SETUPFUNCTION, TOKENTABLE): Keywords begin with `%'.
+	(PACKAGE): New keyword.
+	(PERCENT_PERCENT, PROLOGUE, EPILOGUE): New tokens.
+	(PERCENT): Remove.
+	(grammar): Add prologue and epilogue rules.
+	(prologue, epilogue): New rules.
+	(decl): Add package_decl, precedence_decl rules.  Remove
+	left_decl, right_decl and nonassoc decl.
+	(package_decl, precedence_decl, associativity): New rules.
+	(any_symbol, level): Remove.  All callers changed.
+
+	* semantic-grammar.el:
+	New outline of semantic input grammars, conform to bison's one.
+	Lisp code generated from a grammar is now in its own library.
+
+	(semantic-grammar-wy, sformat): Require.
+	(semantic-grammar-lex-prologue)
+	(semantic-grammar-lex-epilogue): New lex analyzers.
+	(semantic-grammar-lexer): Use them.
+	(semantic-grammar-lex-epilogue-start): New function.
+	(semantic-grammar-automaton)
+	(semantic-grammar-keywords)
+	(semantic-grammar-tokens): Remove.
+	(semantic-grammar-prologue)
+	(semantic-grammar-epilogue)
+	(semantic-grammar-package): New functions.
+	(semantic-grammar-setupcode-text)
+	(semantic-grammar-setupcode-forms)
+	(semantic-grammar-outputfile): Remove.
+	(semantic-grammar-setupfunction)
+	(semantic-grammar-tokentable)
+	(semantic-grammar-parsetable)
+	(semantic-grammar-keywordtable): New implementation.
+	(semantic-grammar-autogen-cookie)
+	(semantic-grammar-autogen-cookie-re)
+	(semantic-grammar-buffer)
+	(semantic-grammar-beginning-of-code)
+	(semantic-grammar-beginning-of-body)
+	(semantic-grammar-with-outputfile)
+	(semantic-grammar-with-grammar-buffer)
+	(semantic-grammar-update-def)
+	(semantic-grammar-update-parsetable)
+	(semantic-grammar-update-keywordtable)
+	(semantic-grammar-update-tokentable)
+	(semantic-grammar-update-setupfunction)
+	(semantic-grammar-update-outputfile)
+	(semantic-grammar-setupcode-value)
+	(semantic-grammar-keywordtable-value)
+	(semantic-grammar-tokentable-value)
+	(semantic-grammar-parsetable-value): Remove.
+	(semantic--grammar-input-buffer)
+	(semantic--grammar-output-buffer)
+	(semantic-grammar-insert-defconst)
+	(semantic-grammar-insert-defun)
+	(semantic-grammar-header-template)
+	(semantic-grammar-footer-template)
+	(semantic-grammar-header)
+	(semantic-grammar-footer)
+	(semantic-grammar-token-data)
+	(semantic-grammar-keyword-data)
+	(semantic-grammar-parser-data)
+	(semantic-grammar-setup-data)
+	(semantic-grammar-create-package): New.
+	(semantic-grammar-syntax-table): Give word syntax class to '%'.
+	(semantic-grammar-mode-keywords-1): Update for new syntax.
+	(semantic-grammar-map): Map C-c C-c to
+	`semantic-grammar-create-package'.
+	(semantic-grammar-in-lisp-p): Take into account the epilogue code.
+	(emantic-grammar-do-lisp-indent): Likewise.
+	(semantic-grammar-mode): Doc fix.  Update semantic setup.
+
+	* semantic-grammar-wy.el: New generated file.
+
+2003-08-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/c.by (setq): Use new names.
+	(knr-arguments): Use new name of expand fcn.
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table): new c.by
+	(semantic-expand-c-tag): new name
+	(semantic-c-tag-protection): new name
+	(semantic-c-tag-template): new name
+	(semantic-c-format-tag-uml-prototype): use new names
+	(semantic-c-tag-abstract): new name
+	(semantic-default-c-setup): use new override methods.
+
+	* semantic-cb.el (semantic-cb-new-class-browser):
+	Use `semanticdb-find-tags-by-class',
+	instead of old method.
+
+	* senator.el (senator-step-at-tag-classes, senator-step-at-start-end-tag-classes):
+	Added autoload cookies.
+
+	* semantic-tag-file.el (semantic-dependency-include-path):
+	autoload cookie.
+
+	* semantic-sort.el (semantic-orphaned-member-metaparent-type):
+	Autoload cookie.
+
+	* semanticdb-find.el (semanticdb-find-table-for-include):
+	autoload cookie.
+	(semanticdb-find-tags-by-class): New function
+	(semanticdb-find-tags-by-class-method): New method.
+
+	* bovine/semantic-c.el (semantic-default-c-setup):
+	Use new name `semantor-step-at-tag-classes'
+
+	* semantic-texi.el (semantic-default-texi-setup):
+	Use new name `semantor-step-at-start-end-tag-classes'
+	Use `insert-forgeign-tag' as new override methods.
+
+	* senator.el (senator-step-at-tag-classes): Renamed, obsolete old.
+	(senator-step-at-start-end-tag-classes): Renamed, obsolete old.
+	(senator-current-tag): renamed
+	(senator-step-at-start-end-p): Use new names
+	(senator-middle-of-tag-p): Renamed
+	(senator-previous-tag-or-parent): Renamed
+	(senator-full-tag-name): Renamed
+	(senator-current-type-context): Use new names
+	(senator-search-tag-name): Renamed
+	(senator-search-forward-raw): use new names
+	(senator-search-backward-raw): use new names
+	(senator-next-tag): renamed
+	(senator-previous-tag): renamed
+	(senator-previous-token): renamed
+	(senator-toggle-read-only): Use new names
+	(senator-toggle-intangible): use new names
+	(senator-set-face): use new names
+	(senator-clear-tag): renamed
+	(senator-prefix-map): use new names
+	(senator-menu-bar): use new names
+	(senator-beginning-of-defun): use new names
+	(senator-end-of-defun): use new names
+	(senator-add-log-tags): renamed
+	(add-log-current-defun): use new names
+	(senator-insert-foreign-tag): renamed.  Aliased, made compatible.
+	(insert-register): use new names
+
+2003-07-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el: (semanticdb-default-file-name)
+	(semanticdb-persistent-path): Doc fix
+	(semanticdb-project-database-file): Rename token-version to tag-version.
+	(semanticdb-create-database): Initialize renamed field
+	(semanticdb-load-database): Test renamed field.
+	(semanticdb-save-db): Print messages with tag instead of token.
+
+2003-07-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-load-imenu-string): New variable
+	(imenu init): Use above new variable for string.
+
+2003-07-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-search.el (semanticdb-refresh-table):
+	Doc fix (replace token with tag)
+
+	* semanticdb-el.el (semanticdb-elisp-sym->tag):
+	Doc fix (replace token with tag)
+
+	* semanticdb.el: (semanticdb-refresh-table)
+	(semanticdb-needs-refresh-p): doc fix (replace 'token' with tag)
+	(semanticdb-save-current-db, semanticdb-save-all-db):doc fix.
+	Message fix.
+	(semanticdb-project-predicate-functions): doc fix
+	(semanticdb-kill-hook)
+	(semanticdb-table-oob-sanity-check): message fix
+
+2003-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* doc/Makefile: EDE Generated Makefile.
+
+	* doc/Project.ede: Project file for semantic doc.
+
+2003-07-22  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-el.el (lisp-mode):
+	Define as child of `emacs-lisp-mode'.
+	(lisp-mode-hook): Add hook `semantic-default-elisp-setup' and
+	autoload cookie.
+
+	* semantic-fw.el: (semantic-set-parent-mode)
+	(semantic-get-parent-mode): New functions.
+	(define-semantic-child-mode): New macro.
+	(semantic-current-bindings): Use `semantic-get-parent-mode'.
+	(semantic-fw-font-lock-keywords): Add highlighting of
+	`define-semantic-child-mode'.
+
+2003-07-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-show-tag-boundaries-mode, semantic-highlight-by-attribute-mode):
+	Turn on by default (for a little while anyway.)
+
+	* senator.el (menu):
+	Added stickyfunc, tag-boundary, and attribute highlighting
+	mode menus.
+
+	* semantic-util-modes.el (global-semantic-highlight-edits-mode):
+	Fix doc.
+	(global-semantic-show-tag-boundaries-mode)
+	(global-semantic-highlight-by-attribute-mode)
+	(global-semantic-show-tag-boundaries-mode)
+	(semantic-highlight-attribute-alist_
+	(semantic-highlight-by-attribute-hook)
+	(semantic-show-tag-boundaries-hook)
+	(defvar semantic-highlight-by-attribute-mode)
+	(defvar semantic-show-tag-boundaries-mode): New variables
+	(semantic-highlight-attribute-face-private)
+	(semantic-highlight-attribute-face-protected)
+	(semantic-tag-boundary-face): New faces
+	(semantic-tag-boundary-p)
+	(global-semantic-highlight-by-attribute-mode)
+	(semantic-hba-clear-highlighting)
+	(semantic-hba-highlight-tag)
+	(semantic-hba-reparse-hook)
+	(semantic-highlight-by-attribute-mode)
+	(semantic-highlight-by-attribute-setup)
+	(semantic-show-tag-boundaries-mode)
+	(semantic-show-tag-boundaries-setup)
+	(semantic-stb-clear-boundaries)
+	(semantic-stb-highlight-tag-line1)
+	(semantic-stb-reparse-hook)
+	(semantic-tag-boundary-overlay-p)
+	(semantic-tag-boundary-p-default): New functions
+
+	* semantic-format.el (ezimage): New dependency
+	(semantic-format-use-images-flag): New variable
+	(semantic-format-tag-protection-image-alist): New variable
+	(semantic-format-tag-uml-protection-to-string)
+	(semantic-format-tag-uml-protection): Add color parameter.
+	Add image if applicable.
+	(semantic-format-tag-uml-abbreviate-default)
+	(semantic-format-tag-uml-prototype-default)
+	(semantic-format-tag-uml-concise-prototype-default):
+	Call format-tag-uml-protection with new color parameter.
+
+2003-07-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el:
+	(document-insert-texinfo, document-generate-documentation)
+	(document-generate-new-documentation, document-function-name-comment)
+	(document-parameter-comment, document-update-paramlist)
+	(document-massage-to-texinfo): Use -tag- based names instead of
+	-nonterminal- names.  Rename variables 'nonterm' to 'tag'.
+
+	* semantic-tag-ls.el (semantic-tag-calculate-parent): New function
+	(semantic-tag-protection): Use above.
+
+	* semantic-decorate.el:
+	(semantic-tag-create-secondary-overlay, semantic-tag-delete-secondary-overlay)
+	(semantic--tag-unlink-secondary-overlays, semantic--tag-link-secondary-overlays)
+	(semantic-tag-secondary-overlays): New functions.
+
+	* semantic-tag.el: (semantic-tag-add-hook, semantic-tag-remove-hook)
+	(semantic--tag-run-hooks): New functions
+	(semantic--tag-unlink-from-buffer, semantic--tag-link-to-buffer):
+	Run hooks specific to each action.
+
+	* semantic-format.el:
+	(semantic--format-uml-post-colorize, semantic-uml-attribute-string)
+	(semantic-format-tag-uml-protection): Use new names
+	semantic-tag-abstract, semantic-tag-static, semantic-tag-leaf and
+	semantic-tag-protection.
+
+2003-07-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile ("semantic_LISP"):
+	Added semantic-tag-file, semantic-doc, and semantic-tag-ls.
+
+	* Project.ede ("semantic"):
+	Added semantic-tag-file, semantic-doc, and semantic-tag-ls.
+
+	* semantic-util.el:
+	(semantic-dependency-include-path, semantic-find-dependency)
+	(semantic-find-nonterminal, semantic-find-documentation)
+	(semantic-find-doc-snarf-comment, semantic-prototype-file)
+	(semantic-nonterminal-protection)
+	(semantic-nonterminal-protection-default)
+	(semantic-nonterminal-abstract, semantic-nonterminal-abstract-default)
+	(semantic-nonterminal-leaf, semantic-nonterminal-leaf-default)
+	(semantic-nonterminal-static-default, semantic-nonterminal-full-name)
+	(semantic-nonterminal-full-name-default, semantic-narrow-to-token)
+	(semantic-with-buffer-narrowed-to-current-token)
+	(semantic-with-buffer-narrowed-to-token):
+	Deleted.  Moved to other files and renamed.
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	use semantic-go-to-tag instead of old name.
+
+	* semantic-tag-file.el (semantic-go-to-tag):
+	Use semantic-dependency-tag-file instead of old name.
+
+	* semantic-tag-ls.el:
+	(semantic-tag-protection, semantic-tag-protection-default, semantic-tag-abstract)
+	(semantic-tag-abstract-default, semantic-tag-leaf, semantic-tag-leaf-default)
+	(semantic-tag-static-default, semantic-tag-full-name, semantic-tag-full-name-default):
+	Copied from semantic-util.el
+	Renamed to new naming conventions
+	Obsoleted old names.
+
+	* semantic-doc.el:
+	(semantic-documentation-for-tag, semantic-doc-snarf-comment-for-tag)
+	Copied from semantic-util.el.
+	Renamed functions to better suit new naming conventions.
+	Obsoleted old names.
+
+	* semantic-tag-file.el:
+	(semantic-go-to-tag, semantic-dependency-include-path)
+	(semantic-dependency-tag-file, semantic-prototype-file)
+	Copied from semantic-util.el.
+	Renamed functions to better suit new naming conventions.
+	Obsoleted old names.
+
+	* semantic-tag.el:
+	(semantic-narrow-to-tag, semantic-with-buffer-narrowed-to-current-tag)
+	(semantic-with-buffer-narrowed-to-tag): Copied from semantic-util.el.
+	Renamed.  Obsoleted old names.
+
+	* semantic-format.el (semantic-format-tag-functions):
+	Add autoload cookie to.
+	(semantic-token->text-functions): Alias to the replacement.
+
+	* semantic-complete.el (require): Make loading of tooltip optional.
+	(semantic-displayor-focus-request, semantic-complete-jump): Use
+	`semantic-momentary-highlight-tag' instead of the `-token' version.
+
+2003-07-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-c.el, wisent/wisent-c.wy, doc/C99-gram.texi: New file.
+
+	* wisent/wisent-grammar.el:
+	(wisent-grammar-AST-ADD, wisent-grammar-AST-PUT)
+	(wisent-grammar-AST-GET, wisent-grammar-AST-GET1)
+	(wisent-grammar-AST-GET-STRING)
+	(wisent-grammar-AST-MERGE): New functions.
+	(wisent-grammar-builtins): Add above new AST built-ins.
+	(wisent-grammar-builtin-names): New function.
+	(wisent-grammar-expand-builtins): Expand car of expression too.
+	(semantic-grammar-mode): Set built-in names.
+
+	* semantic-grammar.el: (semantic-grammar-builtin-names)
+	(semantic-grammar-builtin-names-regexp): New variables.
+	(semantic-grammar-builtin-names-matcher): New function.
+	(semantic-grammar-mode-keywords-1): Use it.
+
+	* semantic-ast.el: New library.
+
+2003-07-04  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-momentary-highlight-token): Renamed to...
+	(senator-momentary-highlight-tag): All callers updated.  Use new
+	semantic-decorate API.
+	(senator-toggle-read-only, senator-toggle-intangible)
+	(senator-set-face, senator-clear-token)
+	(senator-menu-bar): Use new semantic-decorate API.
+
+	* semantic-decorate.el:
+	(semantic-highlight-token, semantic-unhighlight-token)
+	(semantic-momentary-highlight-token)
+	(semantic-momentary-unhighlight-token)
+	(semantic-set-token-face, semantic-set-token-invisible)
+	(semantic-token-invisible-p, semantic-set-token-intangible)
+	(semantic-token-intangible-p, semantic-set-token-read-only)
+	(semantic-token-read-only-p): Add autoload cookies.
+
+2003-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("semantic"): Added semantic-decorate.el
+
+	* Makefile (semantic_LISP): Added semantic-decorate.el
+
+	* semantic-util.el:
+	(semantic-highlight-token, semantic-unhighlight-token)
+	(semantic-momentary-unhighlight-token, semantic-momentary-highlight-token)
+	(semantic-set-token-face, semantic-set-token-invisible)
+	(semantic-token-invisible-p, semantic-set-token-intangible)
+	(semantic-token-intangible-p, semantic-overlay-signal-read-only)
+	(semantic-set-token-read-only, semantic-token-read-only-p):
+	Removed into semantic-decorate.el.
+
+	* semantic-decorate.el: Coped from semantic-util.
+	Renamed all fns to new `tag' notation.
+
+2003-06-29  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-loop): New internal variable.
+	(wisent-clearin): Doc fix.
+	(wisent-abort): New macro.
+	(wisent-pre-parse-hook, wisent-post-parse-hook): New hooks.
+	(wisent-parse): Use above new stuff.
+
+	* semantic-grammar.el (semantic-grammar-mode-keywords-1):
+	In rules, highlight reserved
+	terminal `error' in bold face.
+	(semantic-grammar-in-lisp-p): New function.
+
+2003-06-20  David Ponce  <david@dponce.com>
+
+	* semanticdb-find.el: (semanticdb-find-tags-by-name)
+	(semanticdb-find-tags-by-name-regexp)
+	(semanticdb-find-tags-for-completion)
+	(semanticdb-deep-find-tags-by-name)
+	(semanticdb-deep-find-tags-by-name-regexp)
+	(semanticdb-deep-find-tags-for-completion)
+	(semanticdb-find-tags-external-children-of-type): Add autoload
+	cookies.
+
+	* semantic-grammar.el (semantic-grammar-goto-grammar-indent-anchor):
+	In certain cases
+	`forward-sexp' ignore important punctuations.  Use
+	`skip-syntax-backward' instead to skip punctuations.
+
+2003-06-19  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-mode):
+	Set buffer local value of
+	`parse-sexp-ignore-comments' to non-nil to fix indentation
+	problems when there are unbalanced parenthesis in comments.
+	(semantic-grammar-goto-grammar-indent-anchor): Consider %prec like
+	another symbol in rule.
+	(semantic-grammar-grammar-compute-indentation): Don't consider
+	%prec like other percent keywords that are aligned at beginning of
+	line.
+
+2003-06-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (require): Add dependency on avoid and tooltips.
+	(semantic-complete-read-tag-buffer-deep): Moved
+	(semantic-displayor-focus-abstract,semantic-displayor-tooltip)
+	(semantic-displayor-show-request): Cleaned up white space and doc.
+
+	* semanticdb.el (semanticdb-current-database-list):
+	Use reference directory, not file
+	storage.
+
+2003-06-05  David Ponce  <david@dponce.com>
+
+	* tests/test.cpp:
+	New test cases for nested classes or structs defined outside of
+	the containing class/struct, and for "short int".
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table):
+	Re-generated.
+
+	* bovine/c.by: Updated comments.
+
+	From Jens Rock <jens.rock@asamnet.de>:
+	(typesimple): Handle an opt-class before the type name, and return
+	it in the `parent' attribute of the tag.
+	(builtintype-types): Handle "short int".
+
+2003-06-04  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-goto-grammar-indent-anchor):
+	Fixed infinite
+	loop when indenting after a %prec clause.
+
+2003-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/erlang.bnf:
+	Incorporated changes from David Wallin and Vladimir G. Sekissov.
+
+2003-05-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-find.el (semantic-flatten-tags-table):
+	Removed.  Moved to semantic-sort.el
+
+	* semantic-sort.el (semantic-flatten-tags-table):
+	New, from semantic-find.el
+
+	* semantic-util-modes.el: (global-semantic-highlight-edits-mode)
+	(global-semantic-show-unmatched-syntax-mode)
+	(global-semantic-show-parser-state-mode)
+	(global-semantic-summary-mode)
+	(global-semantic-stickyfunc-mode): Improve doc strings.
+	(semantic-stickyfunc-indent-string): New variable
+	(semantic-stickyfunc-mode-setup): Use above.
+
+	* semantic-sb.el (semantic-sb-info-format-tag-function):
+	Add this back in.  It is used
+	in speedbar.el.
+
+	* semantic-load.el (header-line-format):
+	Quote in this symbol when testing.
+
+	* semantic-find.el (semantic-flatten-tags-table):
+	Flatten only tags with positions.
+
+	* semanticdb-find.el: Added todo list.
+
+	* Makefile (semantic_LISP): Added semantic-complete and semantic-sort
+	(.PHONY): Documentation target
+	(Documentation): build target for the doc directory
+	(tags): tags in the doc dir
+	(dist): distribute the doc dir.
+
+	* Project.ede (semantic): Added semantic-sort and semantic-complete
+	(tools): Added semantic-regtest
+
+	* semantic-util.el: - (defvar semantic-bucketize-token-token
+	- (defun semantic-bucketize (tags &optional parent filter)
+	- (defvar semantic-orphaned-member-metaparent-type "class"
+	- (defvar semantic-mark-external-member-function nil
+	- (defun semantic-adopt-external-members (tags)
+	(semantic-string-lessp-ci)
+	(semantic-sort-token-type)
+	(semantic-sort-tokens-by-name-increasing)
+	(semantic-sort-tokens-by-name-decreasing)
+	(semantic-sort-tokens-by-type-increasing)
+	(semantic-sort-tokens-by-type-decreasing)
+	(semantic-sort-tokens-by-name-increasing-ci)
+	(semantic-sort-tokens-by-name-decreasing-ci)
+	(semantic-sort-tokens-by-type-increasing-ci)
+	(semantic-sort-tokens-by-type-decreasing-ci)
+	(semantic-nonterminal-external-member-parent)
+	(semantic-nonterminal-external-member-parent-default)
+	(semantic-nonterminal-external-member-p)
+	(semantic-nonterminal-external-member-p-default)
+	(semantic-nonterminal-external-member-children)
+	(semantic-nonterminal-external-member-children-default):
+	Deleted.  Moved to semantic-sort.el
+
+	* semantic-format.el (semantic-format-tag-prin1): Doc fix
+	(semantic-format-tag-summarize-default): Use
+	`semantic-bucketize-tag-class' instead of old name.
+
+	* semantic-sort.el: Sorting routines pulled from semantic-util.el
+
+2003-05-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-reconstitute-token):
+	Support function pointers
+	(semantic-c-format-tag-name): New override method
+	(semantic-default-c-setup): Added `semantic-c-format-tag-name'
+	override method.
+
+	* bovine/c.by: Support function pointers.
+
+2003-05-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el:
+	(semantic-toplevel-c-bovine-table),(semantic-c-keyword-table),
+	(semantic-default-c-setup): new c.by v 1.13
+
+	* bovine/c.by (arg-sub-list): Support ... as a variable.
+
+2003-05-19  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-completion-menu-popup):
+	Reverted 2002-12-29 change:
+
+	"Use a local `imenu-default-goto-function' to avoid conflicts with
+	another buffer local definition of that function.  Ensure that the
+	local goto function will return the selected imenu item."
+
+	That conflicted with `imenu--mouse-menu' specification, and worked
+	only with buggy version in GNU Emacs 21.3.50.1 HEAD.
+
+2003-05-13  David Ponce  <david@dponce.com>
+
+	* semantic-complete.el (semantic-complete-read-tag-engine):
+	 Fixed condition that was
+	always true.
+	(semantic-complete-done):  Use `semantic-complete-try-completion'
+	instead of `semantic-complete-do-completion' to not alter last
+	focused tag.  Accept input that match displayor focus entry.
+	(semantic-complete-try-completion): New function.
+	(semantic-complete-do-completion): Moved the actual completion
+	code into the above new function.  Use it.
+	(semantic-complete-jump): New command.
+
+2003-05-12  David Ponce  <david@dponce.com>
+
+	* semantic-complete.el (semantic-complete-done):
+	Accept input that matches one element of
+	calculated completions.
+
+2003-05-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-minibuffer-conents, semantic-delete-minibuffer-conents):
+	New aliases.
+	(semantic-complete-done, semantic-complete-do-completion)
+	(semantic-collector-next-action, semantic-displayor-next-action):
+	Use new aliases instead of the original.
+
+	* semantic-complete.el (semantic-complete-read-tag-buffer-deep):
+	Comment about tooltip displayor.
+	(semantic-displayor-tooltip): New class
+	(semantic-displayor-show-request:semantic-displayor-tooltip): New method
+	(semantic-displayor-tooltip-show): New function.
+
+2003-05-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-complete-read-tag-engine):
+	Be aware of a displayor's ability
+	to focus in on a specific tag.
+	(semantic-complete-do-completion): Use updated displayor APIs.
+	Account for new 'focus state.
+	(semantic-complete-read-tag-buffer-deep): Try out new focusing displayor.
+	(semantic-collector-next-action): Use displayor to determine
+	display's state.
+	(semantic-displayor-abstract): Remove initarg for table.
+	Add `last-prefix' slot.
+	(semantic-displayor-next-action): New methods
+	(semantic-displayor-set-completions): Add argument.
+	(semantic-displayor-focus-request): New method
+	(semantic-displayor-current-focus): New method
+	(semantic-displayor-focus-abstract): New class
+	(semantic-displayor-set-completions, semantic-displayor-focus-next-tag)
+	(semantic-displayor-current-focus): New methods on above new class.
+	(semantic-displayor-traditional-with-focus-highlight): New class.
+	(semantic-displayor-focus-request): New method on above.
+	(semantic-complete-test): New name.
+
+2003-04-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-complete.el (semantic-ctxt): New dependency
+	(semantic-complete-read-tag-engine): Update doc.
+	Add full support for default-tag parameter.  Dynamically add it to the
+	prompt.  Fetch the default if the user just hits RET.
+	(semantic-complete-done): Accept if prompt is empty.
+	(semantic-complete-choose-default): New fcn
+	(semantic-complete-read-tag-buffer-deep): Doc fix
+	(constructor): Unbind `match-list'.
+	(semantic-completion-test): Use %S format string.
+
+	* semantic-complete.el (semantic-complete-key-map):
+	Add history navigation
+	(semantic-complete-read-tag-engine): Provide default history symbol.
+	(semantic-complete-help): Deleted
+	(semantic-complete-done): Don't exit unless there is a match.
+	(semantic-complete-do-completion): Use `delete-minibuffer-contents'.
+
+	* semantic-complete.el (semantic-collector-per-buffer-list):
+	make buffer local
+	(semantic-collector-calculate-completions): Use complare strings better.
+	Do not optimize when last-prefix is used.
+	(semantic-collector-all-completions): Safe reference of
+	last-all-completions slot.
+
+	* semantic-complete.el: Completion tools.
+
+2003-04-19  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-tag.el: Rephrased the doc-string for semantic-tag-file-name.
+	Also added semantic-alias-obsolete form for semantic-equivalent-tokens-p.
+
+	* semantic-util.el: Corrected spelling in comments and strings.
+
+2003-04-14  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* semantic-regtest.el:
+	Added first try of compatibility code so this library works with semantic
+	2.0 as well as with semantic 1.4.
+
+2003-04-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-regtest.el: (semantic-regtest-convert-tag-table)
+	(semantic-regtest-convert-tag): New functions.
+
+2003-04-12  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* semantic-regtest.el: Initial version of the regression-test library
+
+2003-04-11  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* semantic-util-modes.el (semantic-stickyfunc-fetch-stickyline):
+	Search forward to the tag-name to get
+	more useful information in the header line.
+
+2003-04-09  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.el (wisent-python-parser-tables): Re-generated.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy (setupcode):
+	Use `semantic-format-tag-prototype' for the
+	`semantic-imenu-summary-function'.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-default-setup):
+	Re-generated.
+	Override `format-tag-prototype' instead of `prototype-nonterminal'.
+
+	* bovine/semantic-java.el: (semantic-java-prototype-function)
+	(semantic-java-prototype-variable)
+	(semantic-java-prototype-type): Use semantic-format-tag API.
+	(semantic-java-prototype-nonterminal): Renamed...
+	(semantic-java-prototype-tag): New function.  Use
+	semantic-format-tag API.
+	(semantic-java-find-documentation): Use `semantic-current-tag'.
+
+	* senator.el: (senator-completion-menu-summary-function)
+	(senator-completion-menu-item)
+	(senator-insert-foreign-token-default)
+	(senator-insert-foreign-token, senator-copy-token)
+	(senator-eldoc-print-current-symbol-info): Use semantic-format-tag
+	API.
+	(senator-add-log-tokens): Doc fix.
+	(senator-find-current-symbol-tag): New function.
+	(senator-eldoc-print-current-symbol-info-default): Use it.
+
+	* semantic-format.el (semantic-format-tag-prototype-default):
+	Only set args if
+	appropriate.
+
+2003-04-09  Richard Y. Kim <ryk@ap.com>
+
+	* doc/app-dev-guide.texi, doc/glossary.texi, doc/lang-support-guide.texi, doc/semantic.texi, doc/user-guide.texi:
+	Cut and pasted the content of old semantic.texi into separate files.
+
+	Also started documenting new API functions.
+
+2003-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-c-nonterminal-protection):
+	Defaultprotection is now nil.
+	(semantic-c-format-tag-type): New override.
+	(semantic-c-template-string-body)
+	(semantic-c-concise-prototype-nonterminal)
+	(semantic-c-uml-prototype-nonterminal): Use `semantic-format-tag*'
+	for tag formating.
+	(semantic-default-c-setup): Setup above new overrides.
+
+	* Makefile (semantic_LISP): Add semantic-format.el
+
+	* Project.ede (semantic): Add semantic-format.el
+
+	* semantic-ia-sb.el (semantic-ia-sb-key-map):
+	Use `semantic-ia-sb-show-tag-info'.
+	(semantic-ia-sb-show-tag-info): New name
+
+	* semantic-ia-sb.el: (semantic-ia-speedbar)
+	(semantic-ia-sb-string-list)
+	(semantic-ia-sb-completion-list)
+	(semantic-ia-sb-tag-info)
+	(semantic-ia-sb-line-path)
+	(semantic-ia-sb-complete): Use new semantic-tag, and
+	semantic-format-tag methods.
+
+	* semantic-ia.el: (semantic-ia-completion-format-tag-function)
+	(semantic-ia-completion-menu-format-tag-function):  New name.
+	Use `semantic-format-tag-custom-list
+	(semantic-ia-cache): doc fix.
+	(semantic-ia-complete-symbol)
+	(semantic-ia-complete-symbol-menu)
+	(semantic-ia-complete-tip): Use `tag' instead of `token' for names.
+
+	* semantic-example.el (se-jump, se-summary-function, se-show, se-db-apropos-show):
+	Use new -tag- API calls.
+
+	* semanticdb-system.el (Commentary): Doc fix.
+
+	* semanticdb-search.el: (semanticdb-find-nonterminal-by-token-method)
+	(semanticdb-find-nonterminal-by-name-method)
+	(semanticdb-find-nonterminal-by-name-regexp-method)
+	(semanticdb-find-nonterminal-by-type-method)
+	(semanticdb-find-nonterminal-by-property-method)
+	(semanticdb-find-nonterminal-by-extra-spec-method)
+	(semanticdb-find-nonterminal-by-extra-spec-value-method)
+	(semanticdb-find-nonterminal-external-children-of-type-method):
+	Use `semantic-brute-find-tags*' functions..
+
+	* semanticdb.el (semanticdb-table-oob-sanity-check):
+	Use semantic-format-tag-summarize
+
+	* semantic-cb.el (semantic-cb-token): Use semantic-tag for :type
+	(semantic-cb-complete-type, semantic-cb-find-parent)
+	(semantic-cb-convert-type, semantic-cb-convert-children)
+	(initialize-instance, eieio-speedbar-description): Use new semantic-tag*,
+	semantic-format-tag* functions
+
+	* semantic-analyze.el (semantic-analyze-summary-function):
+	Use `semantic-format-tag-custom-list'
+	(semantic-analyze-princ-sequence): Use `semantic--format-colorize-text'.
+
+	* semantic-sb.el (semantic-sb-button-format-tag-function): New name
+	(semantic-sb-info-token->text-function): Commented out (not used)
+	(semantic-sb-one-button): Use new name of above variable.
+
+	* semantic-texi.el: (semantic-texi-update-doc-from-texi)
+	(semantic-texi-goto-source): Use `semanticdb-deep-find-*' for searches.
+
+	* semantic-imenu.el (semantic-imenu-summary-function):
+	Use `semantic-format-tag-custom-list'.
+	(semantic-imenu-tag-overlay): Doc fix.
+	(semantic-create-imenu-subindex): Make sure tags have a position
+	before adding them to imenu.
+	(semantic-default-which-function): Use `semantic-format-tag*' for
+	tag translation.
+
+	* semantic-util.el (semantic-describe-token):
+	Use semantic-format-tag-summarize.
+	(semantic-sanity-check): Use semantic-format-tag-concise-prototype.
+
+	* semantic-util.el: (semantic-recursive-find-nonterminal-by-name)
+	(semantic-token->text-functions, semantic-token->text-custom-list)
+	(semantic-function-argument-separator)
+	(semantic-test-all-token->text-functions, semantic-face-alist)
+	(semantic-colorize-text, semantic-colorize-merge-text)
+	(semantic-prin1-nonterminal, semantic-name-nonterminal)
+	(semantic-name-nonterminal-default, semantic-abbreviate-nonterminal)
+	(semantic-abbreviate-nonterminal-default, semantic-summarize-nonterminal)
+	(semantic-summarize-nonterminal-default, semantic-prototype-nonterminal)
+	(semantic-prototype-nonterminal-default-args)
+	(semantic-prototype-nonterminal-default)
+	(semantic-concise-prototype-nonterminal)
+	(semantic-concise-prototype-nonterminal-default)
+	(semantic-uml-colon-string, semantic-uml-no-protection-string)
+	(semantic-uml-post-colorize, semantic-uml-attribute-string)
+	(semantic-uml-protection-to-string)
+	(semantic-uml-token-or-string-to-string)
+	(semantic-uml-abbreviate-nonterminal)
+	(semantic-uml-abbreviate-nonterminal-default)
+	(semantic-uml-arguments-to-string, semantic-uml-prototype-nonterminal)
+	(semantic-uml-prototype-nonterminal-default)
+	(semantic-uml-concise-prototype-nonterminal)
+	(semantic-uml-concise-prototype-nonterminal-default):
+	Deleted.  Moved to semantic-format.el
+
+2003-04-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-python.el: (wisent-python-parser-tables)
+	(wisent-python-tokens)
+	(wisent-python-default-setup): Regenerated from wisent-python.wy
+
+	* wisent/wisent-python.wy:
+	(print_stmt, expr_stmt, del_stmt, pass_stmt, break_stmt, yield_stmt)
+	(global_stmt, exec_stmt, assert_stmt, if_stmt, while_stmt, for_stmt)
+	(try_stmt): Add argument to CODE-TAG statements
+	(import_stmt): Add argument to INCLUDE-TAG call
+
+	* semantic-format.el (semantic-format-tag-type):
+	Renamed as public, and as an overload.
+	(semantic-format-tag-prototype-default)
+	(semantic--format-tag-uml-type): New name for format-tag-type
+	(semantic-format-tag-uml-prototype-default): Fix compiler warning
+
+2003-04-07  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-make.el (semantic-expand-make-nonterminal):
+	Removed.  Replaced by...
+	(semantic-make-expand-tag): New function.
+	(semantic-default-make-setup): Re-generated.
+
+	* bovine/make.by (setupcode): Use `semantic-make-expand-tag' as
+	`semantic-tag-expand-function'.
+
+	* semanticdb-el.el: (semanticdb-deep-find-tags-by-name-method)
+	(semanticdb-deep-find-tags-by-name-regexp-method)
+	(semanticdb-deep-find-tags-for-completion-method): New methods.
+
+	* senator.el (senator-completion-flatten-stream): Use
+	`semantic-tag-components' instead of
+	`semantic-tag-components-with-overlays'.
+	(senator-find-nonterminal-by-name)
+	(senator-find-nonterminal-by-name-regexp): No more supported.
+	(senator-find-tag-for-completion): New function.
+	(senator-complete-symbol, senator-completion-menu-popup): Use it.
+
+	* semanticdb-find.el: (semanticdb-deep-find-tags-by-name)
+	(semanticdb-deep-find-tags-by-name-regexp)
+	(semanticdb-deep-find-tags-for-completion): New functions.
+	(semanticdb-deep-find-tags-by-name-method)
+	(semanticdb-deep-find-tags-by-name-regexp-method)
+	(semanticdb-deep-find-tags-for-completion-method): New methods.
+
+	* semantic-find.el (semantic--find-tags-by-macro):
+	For consistency, argument TABLE is
+	optional.
+	(semantic-find-tags-by-name): Removed extra call to
+	`semantic-something-to-tag-table'.
+	(semantic-deep-find-tags-by-name)
+	(semantic-deep-find-tags-for-completion)
+	(semantic-deep-find-tags-by-name-regexp): New functions.
+
+2003-04-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-format.el: Copied all token->text functions in.
+	Convert all token and nonterminal references to 'tag'.
+
+	* semanticdb-java.el: Removed old definitions
+	Derived new definitions from semanticdb.el
+
+2003-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Support require directory part
+	(semantic-tag-include-filename): New overload.
+
+	* Makefile (tools_LISP): Added semanticdb-find.el.
+
+	* Project.ede (tools): Added semanticdb-find.
+
+	* semantic-analyze.el (require):
+	Use semanticdb-find instead of semanticdb-search
+	(semantic-analyze-find-nonterminals-by-prefix): Use new
+	semanticdb-find-tags-for-completion fcn.
+	(semantic-analyze-find-nonterminal): Use new
+	semanticdb-find-tags-by-name fcn.
+
+	* semantic-util.el (semantic-something-to-tag-table):
+	Support semanticdb-tables as something.
+	(semantic-find-dependency): Rename all token vars to tag.
+	(semantic-nonterminal-external-member-children-default): Use new
+	sematnicdb-find-tags-external-children-of-type fn.
+
+	* semanticdb-el.el (semanticdb-find-tags-for-completion-method):
+	Fixed typo.
+
+	* semanticdb-el.el: (semanticdb-find-table)
+	(semanticdb-get-tags)
+	(semanticdb-equivalent-mode): New methods
+	(sematnicdb-elisp-sym-tag): New name.  Allow string input.
+	(semanticdb-find-nonterminal-*): deleted
+	(semanticdb-find-tags-by-name-method)
+	(semanticdb-find-tags-by-name-regexp-method): Renamed from old methods.
+	(semanticdb-find-tags-for-completion-method): New method
+	(sematnicdb-find-tags-external-children-of-type-method): New name.
+
+	* semanticdb-search.el: (semanticdb-find-nonterminal-by-token)
+	(semanticdb-find-nonterminal-by-name)
+	(semanticdb-find-nonterminal-by-name-regexp)
+	(semanticdb-find-nonterminal-by-type)
+	(semanticdb-find-nonterminal-by-property)
+	(semanticdb-find-nonterminal-by-extra-spec)
+	(semanticdb-find-nonterminal-by-extra-spec-value)
+	(semanticdb-find-nonterminal-by-function): made obsolete
+	(semanticdb-find-nonterminal-by-function-method): doc fix.
+	Use semanticdb-get-tags.
+
+	* semantic-find.el (semantic-find-tags-external-children-of-type): New
+	(semantic-find-nonterminal-by-extra-spec-value): Better obsolete call
+
+	* semanticdb-find.el (semanticdb-find-translate-path-default): Moved
+	Better logic for not testing the same file twice.
+	(semanticdb-find-table-fo-include-default): Moved.
+	(semanticdb-find-tags-external-children-of-type-method): New fcn
+
+	* semanticdb-file.el (object-write):
+	use semantic--tag-[un]link-cache-[to|from]-buffer.
+
+	* semanticdb-file.el (semanticdb-persistent-path): Doc fix
+	(semanticdb-project-database-file): Doc fix
+	(replace-regexp-in-string): doc fix
+
+	* semanticdb.el (semanticdb-abstract-table): Renamed tokens to tags
+	(semanticdb-table): Doc fix
+	(semanticdb-get-database): Use `semanticdb-create-database' only
+	which does the logic this fn used to do.
+	(semanticdb-directory-loaded-p): Doc fix.
+	(semanticdb-needs-refresh-p): Use 'tags slot name
+	(semanticdb-equivalent-mode): New method on a table
+	(semanticdb-semantic-init-hook-fcn): Use 'tags slot name
+	(semanticdb-post-bovination): Use 'tags slot name
+	(semanticdb-table-oob-sanity-check): Use tags slot name
+	(semanticdb-table-sanity-check): Use tags slot name
+	(semanticdb-file-stream): Replace contents with call too...
+	(semanticdb-find-table-object): New fcn
+
+2003-04-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-debug.el: (semantic-debug-highlight-rule)
+	(semantic-debug-set-breakpoint): Use new -tag- and -find-tag- API.
+
+	* bovine/bovine-debug.el (semantic-debug-frame-highlight):
+	Use new -tag- API
+
+	* bovine/semantic-scm.el: (semantic-scheme-prototype-nonterminal)
+	(semantic-scheme-find-documentation)
+	(semantic-scheme-insert-foreign-token): Use new tag API.
+
+	* bovine/semantic-bnf.el: (semantic-bovine-bnf-table)
+	(semantic-bnf-keyword-table)
+	(semantic-bnf-token-name-symbol)
+	(semantic-bnf-ASSOC)
+	(semantic-bnf-to-bovine)
+	(semantic-bnf-to-lalr-ASSOC)
+	(semantic-bnf-terminal-token-p)
+	(semantic-bnf-token-table)
+	(semantic-bnf-find-terminal-assocs)
+	(semantic-bnf-to-lalr)
+	(semantic-bnf-find-table-destination)
+	(semantic-bnf-find-keyword-destination)
+	(semantic-bnf-find-languagemode)
+	(semantic-bnf-find-setup-code)
+	(semantic-bnf-find-parser-mode)
+	(semantic-bnf-find-token-destination)
+	(semantic-bnf-generate-and-load)
+	(semantic-bnf-generate-one-rule)
+	(semantic-bnf-find-state-position)
+	(semantic-bnf-looking-at-%token-not-keyword)
+	(semantic-bnf-summarize-nonterminal): Replace calls to
+	`semantic-token-*' with `semantic-tag-*', and from
+	`semantic-find-nonterminal*' with `semantic-find-tags-*'.
+	(semantic-bnf-mode): As above, and new override for
+	`nonterminal-componenets'.
+	(semantic-bnf-tag-components): As above and
+	changed from `semantic-bnf-nonterminal-children'.
+
+	* bovine/semantic-make.el (semantic-expand-make-nonterminal):
+	Use new -tag- APIs
+
+	* semantic-find.el (semantic--find-tags-by-function):
+	Replaced mapc w/ while loop
+	(semantic--find-tags-by-macro): New macro
+	(semantic-find-tags-by-name)
+	(semantic-find-tags-for-completion)
+	(semantic-find-tags-by-name-regexp)
+	(semantic-find-tags-by-class)
+	(semantic-find-tags-by-type): Use `semantic--find-tags-by-macro'
+	(semantic-brute-find-first-tag-by-name): Use
+	`semantic-something-to-tag-table'.
+
+	* semantic-tag.el (semantic-tag-of-type-p): Remove error message
+	(semantic-tag-include-filename): New overload fcn
+	(semantic-tag-include-filename-default): New overload implementation
+	(semantic-tag-components-with-overlays): Remove IGNORE argument
+	(semantic-tag-components-with-overlays-default): Remove INGNORE argument
+
+2003-04-04  David Ponce  <david@dponce.com>
+
+	* semantic-fw.el: (defvar-mode-local)
+	(defconst-mode-local): Call `semantic-symbol' with arguments in
+	the right order.
+
+	* tests/test.cpp: Sync. with v1p4 branch.
+	Two additional tests for latest c.by modifications.
+
+	* bovine/semantic-c.el: Sync. with v1p4 branch.
+	(semantic-toplevel-c-bovine-table): Re-generated.
+
+	* bovine/c.by: Sync. with v1p4 branch.
+	(namespace-symbol): Fixed so also template-specifiers can be
+	parsed here.
+	(typeformbase): ajusted for new namespace-symbol definition.
+
+	* senator.el: Applied fix for bug #692919 from v1p4 branch.
+	Unconditionally add `senator-hippie-expand-hook' to
+	`senator-minor-mode-hook'.
+
+2003-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-find.el:
+	Find routines for semanticdb.  Searches done via `include' tags.
+
+2003-04-02  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-make.el: (semantic-toplevel-make-bovine-table)
+	(semantic-make-keyword-table)
+	(semantic-default-make-setup): Re-generated.
+
+	* bovine/make.by, wisent/wisent-java-tags.wy, wisent/wisent-java.wy (setupcode):
+	Set `semantic-tag-expand-function' instead of
+	obsolete `semantic-expand-nonterminal'.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+	(wisent-java-expand-nonterminal): Renamed to...
+	(wisent-java-expand-tag): New.
+
+	* semantic-fw.el (define-overload):
+	Removed unnecessary autoload cookie.
+
+2003-04-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-find.el (semantic-find-tags-by-type): Fix typo
+
+	* semantic-find.el (semantic-find-tags-by-type):
+	Use `semantic-tag-of-type-p' for comparison.
+
+	* semantic-tag.el (semantic-tag-of-type-p): New.
+
+	* semantic-analyze.el (inversion-require): Eval when compile
+	(semantic-analyze-find-nonterminals-by-prefix)
+	(semantic-analyze-find-nonterminal)
+	(semantic-analyze-dereference-metatype)
+	(semantic-analyze-token-type)
+	(semantic-analyze-type-parts)
+	(semantic-analyze-scoped-types)
+	(semantic-analyze-current-context)
+	(semantic-analyze-type-constraint)
+	(semantic-analyze-type-constants)
+	(semantic-analyze-possible-completions)
+	(semantic-analyze-princ-sequence): Use new `semantic-tag*' API
+	instead of `semantic-token*'.
+	Use new `semantic-find-tag*' API instead of `semantic-find-nonterminal*'.
+	(semantic-analyze-find-nonterminal-sequence): As above.
+	Reordered search so that inner scope items are found first.
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table): New c.by
+	(semantic-c-nonterminal-abstract): Use `semantic-brute-find-tag-by-attribute'
+	instead of `semantic-find-nonterminal-by-extra-spec'
+
+	* bovine/c.by (template-type): Fix call to TYPE-TAG
+	(typeformbase): Use TYPE-TAG instead of forming my own tags.
+
+	* semanticdb.el, semantic-sb.el (inversion-require):
+	Wrap in eval-and-compile.
+
+	* semanticdb.el (semanticdb-semantic-init-hook-fcn): Use
+	`semantic--tag-link-cache-to-buffer' instead of
+	`semantic-overlay-cache'.
+	(semanticdb-kill-hook): Use
+	`semantic--tag-unlink-cache-to-buffer' instead of
+	`semantic-deoverlay-cache'.
+	(semanticdb-table-oob-sanity-check): Use new `semantic-tag*' API.
+
+	* semantic-ctxt.el: (semantic-up-context)
+	(semantic-get-local-arguments-default): Use `semantic-current-tag*'
+	insteado of `semantic-current-nonterminal*'.
+
+	* document.el: (document-insert-function-comment-new)
+	(document-parameter-comment)
+	(document-update-paramlist): Fix typos in last conversion.
+
+	* document.el: (document)
+	(document-inline)
+	(document-insert-texinfo)
+	(document-insert-defun-comment)
+	(document-update-comment)
+	(document-insert-function-comment-new)
+	(document-function-name-comment)
+	(document-insert-parameters)
+	(document-parameter-comment)
+	(document-argument-name)
+	(document-update-paramlist)
+	(document-longest-name): Move from old `-token-' or
+	`-find-nonterminal-' API calls to new `-tag-' and `-find-tag-' API calls.
+
+	* semantic-util-modes.el: (semantic-clean-token-of-unmatched-syntax)
+	(semantic-stickyfunc-mode)
+	(semantic-stickyfunc-fetch-stickyline): Use new `semantic-tag-*'
+	functions instead of `semantic-token*'.
+
+	* semantic-util.el (semantic-prototype-nonterminal-default):
+	Handle a list of type modifiers.
+
+	* semantic-token.el: Replaced by semantic-tag.el
+
+	* semantic-texi.el: (semantic-texi-find-documentation)
+	(semantic-texi-update-doc-from-texi)
+	(semantic-texi-update-doc-from-source)
+	(semantic-texi-goto-source): Use `semantic-find-tag*' instead of
+	`semantic-find-nonterminal*'.
+
+	* semantic-find.el (semantic-current-nonterminal-of-type):
+	Fixed obsolete name.
+
+	* semantic-chart.el: (semantic-chart-token-complexity)
+	(semantic-chart-nonterminal-complexity-token): Use new
+	`semantic-find-tag*' API instead of old `semantic-find-nonterminal*'
+
+	* semantic-edit.el: (semantic-edits-change-in-one-token-p)
+	(semantic-edits-change-leaf-token)
+	(semantic-edits-change-between-tokens)
+	(semantic-edits-change-over-tokens)
+	(semantic-edits-incremental-parser)
+	(semantic-edits-splice-remove)
+	(semantic-edits-splice-insert)
+	(semantic-edits-splice-replace): Use `semantic-tag-*' instead of
+	`semantic-token-*' functions.
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table): Updated c.by
+	(semantic-expand-c-nonterminal): Better `extern' support.
+
+	* bovine/c.by (extern-c): Fixed the extern tag
+	(classsubparts): Set label name as a string
+	(namespacesubparts): Set label name as a string
+
+2003-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: (semantic-bovinate-toplevel)
+	(semantic-repeat-parse-whole-stream): Use new semantic-tag* API.
+
+2003-04-01  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-eldoc-print-current-symbol-info-default): Use
+	semantic-lex API.
+
+	* semantic.el (semantic-unmatched-syntax-hook):
+	Doc fix.  Reference semantic-lex
+	functions.
+
+	* semantic-tag.el: (semantic-tag-new-variable)
+	(semantic-tag-new-function)
+	(semantic-tag-new-type)
+	(semantic-tag-new-include)
+	(semantic-tag-new-package)
+	(semantic-tag-new-code): Inline functions instead of macros.
+
+	* semantic-ia-sb.el (semantic-ia-sb-token-info): Use semantic-lex API.
+
+	* document.el (document-update-history, document-update-paramlist): Use
+	semantic-lex API.
+
+	* wisent/wisent-grammar.el:
+	(wisent-grammar-assocs, wisent-grammar-terminals)
+	(wisent-grammar-nonterminals): Use new semantic-find API.
+
+	* senator.el: (senator-current-token, senator-step-at-parent)
+	(senator-previous-token-or-parent)
+	(senator-current-type-context)
+	(senator-find-nonterminal-by-name)
+	(senator-find-nonterminal-by-name-regexp)
+	(senator-search-forward-raw, senator-search-backward-raw)
+	(senator-next-token, senator-previous-token)
+	(senator-menu-bar, add-log-current-defun)
+	(senator-eldoc-print-current-symbol-info-default): Use new
+	semantic-find API.
+
+	* semantic-load.el:
+	(require 'semantic-fw) instead of loading semantic-al.el.
+
+	* semantic-imenu.el (which-function): Use new semantic-find API.
+
+	* semantic-grammar.el (semantic-summarize-nonterminal): Use
+	`semantic--find-tags-by-function' instead of
+	`semantic-brute-find-tag-by-function'.
+
+	* semantic-fw.el (semantic-alias-obsolete):
+	Moved with compatibility code.
+	(load "semantic-al") after compatibility code.
+
+	* semantic-find.el: (semantic-brute-find-first-tag-by-name)
+	(semantic-brute-find-tag-by-class)
+	(semantic-brute-find-tag-standard)
+	(semantic-brute-find-tag-by-type)
+	(semantic-brute-find-tag-by-type-regexp)
+	(semantic-brute-find-tag-by-name-regexp)
+	(semantic-brute-find-tag-by-property)
+	(semantic-brute-find-tag-by-attribute)
+	(semantic-brute-find-tag-by-attribute-value)
+	(semantic-brute-find-tag-by-function)
+	(semantic-brute-find-first-tag-by-function)
+	(semantic-brute-find-tag-by-position)
+	(semantic-brute-find-innermost-tag-by-position): Added autoload
+	cookies.
+	(semantic-find-nonterminal-by-overlay)
+	(semantic-find-nonterminal-by-overlay-in-region)
+	(semantic-find-nonterminal-by-overlay-next)
+	(semantic-find-nonterminal-by-overlay-prev)
+	(semantic-find-nonterminal-parent-by-overlay)
+	(semantic-current-nonterminal)
+	(semantic-current-nonterminal-parent)
+	(semantic-current-nonterminal-of-class)
+	(semantic-find-nonterminal-by-name)
+	(semantic-find-nonterminal-by-token)
+	(semantic-find-nonterminal-standard)
+	(semantic-find-nonterminal-by-type)
+	(semantic-find-nonterminal-by-type-regexp)
+	(semantic-find-nonterminal-by-name-regexp)
+	(semantic-find-nonterminal-by-property)
+	(semantic-find-nonterminal-by-extra-spec)
+	(semantic-find-nonterminal-by-attribute-value)
+	(semantic-find-nonterminal-by-function)
+	(semantic-find-nonterminal-by-function-first-match)
+	(semantic-find-nonterminal-by-position)
+	(semantic-find-innermost-nonterminal-by-position): Added autoload
+	cookies to `semantic-alias-obsolete' definitions.
+	(semantic-find-first-nonterminal-by-name): Alias replaced by
+	`semantic-find-nonterminal-by-name'.
+
+2003-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-sb-one-button):
+	Use tag as an argument.  Use new tag API.
+	If there is a type, also make tag expandable.
+	(semantic-sb-insert-details): Use tag as an argument.  Use new tag API.
+	Variables can also insert their type.
+	(semantic-sb-detail-parent): Use new -tag- API.
+
+	* semantic-tag.el (semantic-token-variable-default):
+	Added alias-obsolete
+
+	* semantic-util.el (semantic-bucketize):
+	Rename local variables and arg to be derived of 'tag'
+	(semantic-recursive-find-nonterminal-by-name):
+	(semantic-read-symbol):
+	(semantic-nonterminal-external-member-children-default):
+	(semantic-current-token):
+	Use new `semantic-find-tag*' API
+
+	* bovine/bovine-grammar.el (bovine-grammar-parsetable-builder):
+	Use new `semantic-find-tag*' API
+	instead of `semantic-find-nonterminal*'
+
+	* semantic-find.el: (semantic-find-nonterminal-by-position)
+	(semantic-find-innermost-nonterminal-by-position): Fix alias/obsolete name.
+
+	* semantic-util.el: (semantic-recursive-find-nonterminal-by-name)
+	(semantic-read-symbol)
+	(semantic-test-all-token->text-functions)
+	(semantic-find-dependency)
+	(semantic-find-nonterminal)
+	(semantic-find-documentation)
+	(semantic-hack-search):
+	Use `semantic-brute-find-tag-*' or `semantic-find-tag-*' APIs instead
+	of old nonterminal verison.
+
+	* semantic-grammar.el (semantic-grammar-ASSOC):
+	Use semantic-tag-make-assoc-list.
+	(semantic-grammar-as-string): Doc fix
+	(semantic-grammar-edits-new-change-hook-fcn)
+	(semantic-grammar-first-tag-name)
+	(semantic-grammar-tag-symbols)
+	(semantic-grammar-setupcode-text)
+	(semantic-grammar-keywords)
+	(semantic-grammar-tokens)
+	(semantic-grammar-token-properties)
+	(semantic-grammar-complete)
+	(semantic-summarize-nonterminal):
+	Use new semantic-find-tag* functions instead of semantic-find-nonterminal*
+
+	* Makefile (semantic_LISP): Add semantic-find.el
+
+	* Project.ede (semantic): add semantic-find.el
+
+	* semantic-util.el (semantic-file-token-stream): Renamed to...
+	(semantic-file-tag-table): Updated doc string.
+	(semantic-something-to-stream): Renamed to...
+	(semantic-something-to-tag-table): Add support for tag filenames
+	(semantic-find-nonterminal-by-*): Deleted.  See semantic-find.el
+	(semantic-current-nonterminal-*): Deleted.  See semantic-find.el
+	(semantic-bucketize-token-token)
+	(semantic-adopt-external-members)
+	(semantic-sort-token-type)
+	(semantic-sort-tokens-by-name-increasing)
+	(semantic-sort-tokens-by-name-increasing-ci)
+	(semantic-recursive-find-nonterminal-by-name)
+	(semantic-read-variable)
+	(semantic-read-function)
+	(semantic-read-type)
+	(semantic-test-all-token->text-functions)
+	(semantic-name-nonterminal-default)
+	(semantic-abbreviate-nonterminal-default)
+	(semantic-prototype-nonterminal-default-args)
+	(semantic-prototype-nonterminal-default)
+	(semantic-concise-prototype-nonterminal-default)
+	(semantic-uml-token-or-string-to-string)
+	(semantic-uml-prototype-nonterminal-default)
+	(semantic-uml-concise-prototype-nonterminal-default)
+	(semantic-find-dependency)
+	(semantic-find-nonterminal)
+	(semantic-find-documentation)
+	(semantic-nonterminal-external-member-parent-default)
+	(semantic-nonterminal-external-member-p-default)
+	(semantic-nonterminal-external-member-children-default)
+	(semantic-nonterminal-protection-default)
+	(semantic-nonterminal-abstract-default)
+	(semantic-nonterminal-leaf-default)
+	(semantic-nonterminal-static-default)
+	(semantic-nonterminal-full-name)
+	(semantic-highlight-token)
+	(semantic-unhighlight-token)
+	(semantic-set-token-face)
+	(semantic-set-token-read-only)
+	(semantic-token-read-only-p)
+	(semantic-narrow-to-token)
+	(semantic-describe-token)
+	(semantic-add-label)
+	(semantic-show-label)
+	(semantic-assert-valid-token)
+	(semantic-sanity-check):
+	Use new semantic-tag- functions instead of semantic-token*
+	Use new semantic-find-tag* functions instead of semantic-find-nonterminal*
+	Use new semantic-current-tag* functions instead of
+	semantic-current-nonterminal*
+
+	* semantic-tag.el (semantic-equivalent-tag-p): Fix fcn name typo.
+	(semantic-tag-docstring): Use new lex API
+	(semantic-tag-children-compatibility): New fcn
+	(semantic-nonterminal-children): Use above for alias
+
+	* semantic-lex.el (semantic-lex-test-region): New command
+
+2003-03-31  David Ponce  <david@dponce.com>
+
+	* semantic-texi.el: (semantic-texi-parse-region)
+	(semantic-texi-bovinate-headings)
+	(semantic-texi-find-documentation)
+	(semantic-texi-update-doc-from-texi)
+	(semantic-texi-update-doc-from-source)
+	(semantic-texi-update-doc)
+	(semantic-texi-goto-source): Use semantic-tag API and terminology.
+
+	(semantic-texi-raw-to-cooked-token): Renamed to...
+	(semantic-texi-expand-tag): New.
+	(semantic-texi-new-section-tag)
+	(semantic-texi-new-def-tag): New functions.
+	(semantic-texi-recursive-combobulate-list): Use them.
+	(semantic-texi-nonterminal-children): Renamed to...
+	(semantic-texi-components): New.
+	(semantic-texi-insert-foreign-token): Renamed to...
+	(semantic-texi-insert-foreign-tag): New.
+	(semantic-default-texi-setup): Reflect above changes.
+
+	* semantic-imenu.el: (semantic-imenu-bucketize-file)
+	(semantic-imenu-buckets-to-submenu)
+	(semantic-imenu-expandable-token)
+	(semantic-create-imenu-index)
+	(semantic-create-imenu-directory-index)
+	(semantic-create-imenu-index-1)
+	(semantic-create-imenu-subindex)
+	(semantic-which-function)
+	(semantic-default-which-function): Use semantic-tag API and
+	terminology.
+	(semantic-imenu-token-overlay): Renamed to...
+	(semantic-imenu-tag-overlay): New.
+
+	* wisent/wisent-grammar.el: (wisent-grammar-assocs)
+	(wisent-grammar-terminals)
+	(wisent-grammar-nonterminals): Use semantic-tag API.
+
+	* semantic-grammar.wy (put_decl): Use semantic-tag API.
+
+	* semantic-grammar.el: (semantic-grammar-automaton)
+	(semantic-grammar-keywords, semantic-grammar-tokens)
+	(semantic-grammar-setup-semantic): Re-generated.
+	(semantic-grammar-edits-new-change-hook-fcn)
+	(semantic-grammar-first-tag-name)
+	(semantic-grammar-tag-symbols)
+	(semantic-grammar-setupcode-text)
+	(semantic-grammar-keywords)
+	(semantic-grammar-keyword-properties)
+	(semantic-grammar-tokens)
+	(semantic-grammar-token-properties)
+	(semantic-abbreviate-nonterminal)
+	(semantic-summarize-nonterminal): Use semantic-tag API.
+
+2003-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-find.el (toplevel): Added many autoload cookies
+	(semantic-find-tags-by-type): Fixed typo.
+	(semantic-brute-find-tag-by-function): Use semantic-something-to-tag-table.
+	(semantic-brute-find-first-tag-by-function): As above
+	(semantic-alias-obsolete ...*): Fixed order.
+	Fixed some names which were wrong.
+
+	* semantic-find.el: (semantic-find-tag-by-overlay)
+	(semantic-find-tag-by-overlay-in-region)
+	(semantic-find-tag-by-overlay-next)
+	(semantic-current-tag, semantic-current-tag-parent)
+	(semantic-current-tag-of-class): Doc fix
+	(semantic--find-tags-by-function)
+	(semantic-find-first-tag-by-name)
+	(semantic-find-tags-by-name)
+	(semantic-find-tags-for-completion)
+	(semantic-find-tags-by-name-regexp)
+	(semantic-find-tags-by-class)
+	(semantic-find-tags-by-type): New FIND API functions.
+	(semantic-flatten-tags-table): New function
+	(semantic-brute-find-first-tag-by-name)
+	(semantic-brute-find-tag-by-class)
+	(semantic-brute-find-tag-by-type)
+	(semantic-brute-find-tag-by-type-regexp)
+	(semantic-brute-find-tag-by-function): Doc fix
+
+	* bovine/bovine-grammar.el (bovine-grammar-parsetable-builder):
+	Rename all "token" variables
+	with "tag".  Use new -tag- accessor functions.
+	Use new `semantic-tag-components-semantic-grammar-mode' instead of
+	the `-nonterminal-children' version.
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table): New c.by
+	(semantic-expand-c-nonterminal): Use new -tag- functions for tags.
+	Use `semantic-tag-new-*' for rebuilt tags.
+	(semantic-c-reconstitute-token)
+	(semantic-c-reconstitute-template)
+	(semantic-c-nonterminal-protection)
+	(semantic-c-nonterminal-abstract): Use new -tag- functions.
+	(semantic-default-c-setup): Rebulit.
+	Overload `tag-components' instead of `nonterminal-children'.
+
+	* bovine/c.by (setq): Use new `semantic-tag-expand-function' variable.
+	(extern-c): Turn `extern' list into a TAG that is later eliminated
+	(classsubparts): Quote in label
+	(namespacesubparts): Quote in label
+
+2003-03-28  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-menu-bar): Fixed item help string.
+
+	* senator.el:
+	All these functions updated to use the new semantic-tag API and
+	terminology.
+
+	(senator-step-at-token-ids, senator-step-at-start-end-token-ids)
+	(senator-highlight-found, senator-parse)
+	(senator-completion-cache-flush-fcn)
+	(senator-completion-uniquify-names)
+	(senator-completion-list, senator-find-nonterminal-by-name)
+	(senator-find-nonterminal-by-name-regexp)
+	(senator-completion-menu-insert-function)
+	(senator-search-forward, senator-re-search-forward)
+	(senator-word-search-forward, senator-search-backward)
+	(senator-re-search-backward, senator-word-search-backward)
+	(senator-set-foreground, senator-set-background)
+	(senator-current-token, senator-momentary-highlight-token)
+	(senator-step-at-start-end-p, senator-skip-p)
+	(senator-middle-of-token-p, senator-step-at-parent)
+	(senator-previous-token-or-parent, senator-full-token-name)
+	(senator-completion-flatten-stream)
+	(senator-completion-function-args)
+	(senator-completion-refine-name, senator-completion-stream)
+	(senator-current-type-context, senator-search-token-name)
+	(senator-search-forward-raw, senator-search-backward-raw)
+	(senator-next-token, senator-previous-token)
+	(senator-jump-noselect, senator-jump, senator-jump-regexp)
+	(senator-complete-symbol, senator-completion-menu-insert-default)
+	(senator-completion-menu-item, senator-toggle-read-only)
+	(senator-toggle-intangible, senator-set-face, senator-clear-token)
+	(senator-menu-bar, senator-beginning-of-defun)
+	(senator-end-of-defun, senator-narrow-to-defun)
+	(senator-mark-defun, beginning-of-defun, end-of-defun)
+	(narrow-to-defun, mark-defun, c-mark-function)
+	(senator-add-log-tokens, add-log-current-defun)
+	(senator-token-ring, senator-insert-foreign-token-default)
+	(senator-insert-foreign-token, senator-copy-token)
+	(senator-kill-token, senator-yank-token)
+	(senator-copy-token-to-register, insert-register)
+	(jump-to-register, senator-eldoc-print-current-symbol-info)
+
+	(senator-jump-completion-list): Use `format' to avoid `sequencep'
+	errors, when concatenating things.
+
+	* semantic-ctxt.el: (semantic-up-context)
+	(semantic-get-local-variables)
+	(semantic-get-local-variables-default): Doc fix.
+	(semantic-get-local-arguments): Doc fix.  Use semantic-tag API.
+	(semantic-get-local-arguments-default): Use semantic-tag API.
+	(semantic-get-all-local-variables): Doc fix.
+
+2003-03-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-find.el: (semantic-find-tag-by-overlay)
+	(semantic-find-tag-by-overlay-in-region)
+	(semantic-find-tag-by-overlay-next)
+	(semantic-find-tag-by-overlay-prev)
+	(semantic-find-tag-parent-by-overlay)
+	(semantic-current-tag)
+	(semantic-current-tag-parent)
+	(semantic-current-tag-of-class)
+	(semantic-brute-find-first-tag-by-name)
+	(semantic-brute-find-tag-by-class)
+	(semantic-brute-find-tag-standard)
+	(semantic-brute-find-tag-by-type)
+	(semantic-brute-find-tag-by-type-regexp)
+	(semantic-brute-find-tag-by-name-regexp)
+	(semantic-brute-find-tag-by-property)
+	(semantic-brute-find-tag-by-attribute)
+	(semantic-brute-find-tag-by-attribute-value)
+	(semantic-brute-find-tag-by-function)
+	(semantic-brute-find-first-tag-by-function)
+	(semantic-brute-find-tag-by-position)
+	(semantic-brute-find-innermost-tag-by-position): New fcns copied
+	from semantic-util.el
+
+2003-03-27  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-el.el (semantic-toplevel-elisp-bovine-table 'bovine-toplevel):
+	just pass
+	tags already expanded.
+	(semantic-elisp-clos-args-to-semantic): Use
+	`semantic-tag-new-variable'.
+	(semantic-expand-elisp-nonterminal): Removed.
+	(semantic-find-dependency)
+	(semantic-find-documentation)
+	(semantic-insert-foreign-token)
+	(semantic-nonterminal-protection)
+	(semantic-elisp-nonterminal-static): Use the semantic-tag API.
+	(semantic-expand-nonterminal): Removed mode local override.
+
+	* semantic-tag.el (semantic--tag-expand): More comments.
+
+	* semantic-tag.el (semantic-tag-components): Added autoload cookie.
+	(semantic-alias-obsolete 'semantic-nonterminal-children): Removed
+	autoload cookie.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-get-local-variables):
+	Doc fix.
+	(wisent-java-expand-nonterminal): Use new semantic-tag API.
+
+	* wisent/wisent-bovine.el (wisent-token, wisent-cooked-token): Removed.
+	(wisent-cook-tag, wisent-parse-region): Use new semantic-tag API.
+
+	* bovine/semantic-java.el: (semantic-java-prototype-function)
+	(semantic-java-prototype-variable)
+	(semantic-java-prototype-type)
+	(semantic-java-prototype-nonterminal): Use new semantic-tag API.
+	(semantic-java-find-documentation): Likewise.  Use semantic-lex
+	API instead of obsolete semantic-flex one.
+	(semantic-java-get-local-variables): Removed.
+	(semantic-java-doc-keyword-before-p)
+	(semantic-java-doc-keywords-map)
+	(semantic-java-doc-setup): Use semantic-lex API instead of
+	obsolete semantic-flex one.
+
+	* semantic.el: Replaced library semantic-token by semantic-tag.
+	(semantic-deoverlay-token, semantic-overlay-token)
+	(semantic-deoverlay-list, semantic-overlay-list)
+	(semantic-deoverlay-cache, semantic-overlay-cache)
+	(semantic-cooked-token-p, semantic-raw-to-cooked-token)
+	(semantic-bovinate-make-assoc-list): Removed.
+
+	* semantic-util.el: (semantic-nonterminal-children)
+	(semantic-nonterminal-children-default): Removed.
+
+	* semantic-tag.el:
+	(semantic-tag-set-bounds, semantic-tag-put-attribute)
+	(semantic-tag-put-attribute-no-side-effect)
+	(semantic-tag-get-attribute, semantic--tag-put-property)
+	(semantic--tag-put-property-no-side-effect)
+	(semantic--tag-get-property, semantic-tag-new-type)
+	(semantic-tag-docstring, semantic-tag-type-members)
+	(semantic-tag-type-superclasses, semantic-tag-type-interfaces)
+	(semantic-tag-function-arguments)
+	(semantic-tag-function-throws, semantic-tag-function-parent)
+	(semantic-tag-function-destructor-p)
+	(semantic-tag-variable-default)
+	(semantic-tag-variable-constant-p)
+	(semantic-tag-include-system-p, semantic-tag-code-detail)
+	(semantic-tag-components-with-overlays)
+	(semantic-tag-components-with-overlays-default)
+	(semantic--tag-expand)
+	(semantic-token-type-parent): Fixed.
+	(semantic-tag-make-plist): Use `zerop' to check for number zero.
+	(semantic--tag-copy-properties): New function.
+
+	* semantic-grammar.el (semantic-nonterminal-children):
+	Override removed replaced by...
+	(semantic-tag-components): New override.
+	(semantic-summarize-nonterminal): Use `semantic-tag-components'
+	in place of `semantic-nonterminal-children'.
+
+	* semantic-fw.el (semantic-bind): Ignore rebinding with the same value.
+
+	* semantic-edit.el (semantic-edits-splice-replace): Use
+	`semantic--tag-copy-properties'.
+
+	* Project.ede (ede-proj-target-elisp "semantic"):
+	Updated :source to include
+	semantic-tag.el in place of semantic-token.el.
+
+	* Makefile: Re-generated from Project.ede.
+
+2003-03-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-current-context):
+	Protect call to forward-sexp.
+
+2003-03-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/wisent-grammar.el (wisent-grammar-EXPAND, wisent-grammar-EXPANDFULL):
+	Add error message
+	when the nonterminal used for expansion does not appear with a %start
+	entry.
+
+2003-03-22  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el: (semantic-tag-file-name, semantic-tag-copy)
+	(semantic--tag-unlink-from-buffer)
+	(semantic--tag-link-to-buffer)
+	(semantic--tag-unlink-list-from-buffer)
+	(semantic--tag-link-list-to-buffer)
+	(semantic--tag-unlink-cache-from-buffer)
+	(semantic--tag-link-cache-to-buffer)
+	(semantic--tag-expanded-p, semantic--tag-expand): New functions.
+	(semantic-tag-expand-function): New variable.
+
+2003-03-21  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-set-overlay):
+	Reserved for internal use, and
+	renamed...
+	(semantic--tag-set-overlay): New.
+	(semantic-tag-extent): Renamed...
+	(semantic-tag-bounds): New.
+	(semantic-tag-set-bounds): New.
+	(semantic-tag-of-class-p): New.
+	(semantic-equivalent-tag-p): Use `equal' to compare names, the
+	above function to compare classes, and `semantic-tag-bounds' to
+	compare bounds.
+	(semantic-tag-new-type): Use `members' instead of `children' or
+	`part-list'.
+	(semantic-tag-type-parts): Renamed...
+	(semantic-tag-type-members): New.
+	(semantic-token-type-parent): Moved to the obsolete code section.
+	(semantic-tag-components-default): Fixed.
+	(semantic-tag-components-with-overlays-default): Fixed typos.
+
+2003-03-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Use `semantic-tag-new-code'.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-form):
+	Fix caps problem.
+
+	* bovine/semantic-scm.el (semantic-toplevel-scheme-bovine-table):
+	Regenerated.
+
+	* bovine/scheme.by (scheme-in-list): Use CODE-TAG.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-CODE-TAG):
+	New function
+	(bovine-grammar-expand-form): Use above.
+
+	* semantic-grammar.el (semantic-grammar-syntax-help):
+	Added CODE-TAG macro help.
+
+	* semantic-tag.el (semantic-tag-components-with-overlays-default):
+	Replace `token' with `tag'
+
+	* semantic-tag.el (semantic-tag-variable-optsuffix): Deleted
+	(semantic-tag-componenets, semantic-tag-components-with-overlays):
+	New override functions
+	(semantic-tag-componenets-default)
+	(semantic-tag-components-with-overlays-default): New functions
+	(semantic-nonterminal-children): Obsolete function
+
+2003-03-20  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el (semantic-tag-clone): New implementation.
+
+	* semantic-ctxt.el (semantic-get-local-arguments):
+	Use `semantic-tag-new-variable'.
+
+	* semantic-tag.el (semantic-tag): Ensure that the list has 5 elements.
+	(semantic-clone-tag): Renamed...
+	(semantic-tag-clone): New.
+
+2003-03-19  David Ponce  <david@dponce.com>
+
+	* semantic-tag.el: New file.
+
+2003-03-18  David Ponce  <david@dponce.com>
+
+	* semantic-autogen.el (semantic-autogen-kill-xemacs-autoloads-feature):
+	New function.
+	(semantic-autogen-update-header): Use it.
+
+2003-03-18  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-token.el, wisent/wisent-grammar.el, wisent/wisent-python.el, wisent/wisent-python.wy:
+	Created CODE-TAG builtin in wisent-grammar.el.  Then
+	replaced all (wisent-token ...) from wisent-python.wy with
+	CODE-TAG construct.  With this change, wisent-python.wy no
+	longer uses wisent-token function.
+
+2003-03-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-parse-stream):
+	Doc fix.  Use tag in place of token.
+	(wisent-parse-region): Likewise.  Renamed `tag' local
+	variable `token'.
+
+	* semantic-grammar.el (semantic-grammar-edits-new-change-hook-fcn):
+	Doc fix.  Use tag
+	in place of token.
+	(senator-add-log-tokens): Likewise.
+	(semantic-nonterminal-children): Likewise.  Renamed `tag' local
+	variable `token'.
+	(semantic-abbreviate-nonterminal): Likewise.
+	(semantic-summarize-nonterminal): Likewise.  Fixed to use new tag
+	structure.  Extended for `nonassoc' tags.
+	(semantic-grammar-token-name): Renamed...
+	(semantic-grammar-first-tag-name): New.
+	(semantic-grammar-token-symbols): Renamed...
+	(semantic-grammar-tag-symbols): New.
+	(semantic-grammar-setupfunction, semantic-grammar-tokentable)
+	(semantic-grammar-parsetable, semantic-grammar-keywordtable)
+	(semantic-grammar-languagemode, semantic-grammar-start)
+	(semantic-grammar-scopestart, semantic-grammar-quotemode)
+	(semantic-grammar-outputfile): Use new names above.
+	(semantic-grammar-tokens): Doc fix.  Renamed `tag' local
+	variables `token'.
+	(semantic-grammar-token-properties)
+	(semantic-grammar-tokentable-builder-default)
+	(semantic-grammar-tokentable-builder)
+	(semantic-grammar-tokentable-value): Doc fix.
+	(semantic-grammar-syntax-help "TAG"): Use "tag-class" in place of
+	"type-token".
+	(semantic-abbreviate-nonterminal): Doc fix.  Renamed `tag' local
+	variable `token'.
+
+2003-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-bovine.el (semantic-bovinate-stream):
+	Stop using obsoleted fcns.
+
+	* NEWS: semantic-stickyfunc-mode
+
+	* semantic-util-modes.el (semantic-stickyfunc-fetch-stickyline):
+	Quote out %'s in return string.
+
+	* semantic-util.el (semantic-read-variable, semantic-read-function, semantic-read-type):
+	Fix to auto-select the correct streams.
+
+	* semantic-load.el:
+	Enable stickyfunc mode when header-line-format is available.
+
+	* semanticdb-search.el (semanticdb-collect-find-results):
+	Make `ignore-system' actually work.
+
+	* semantic-cb.el (semantic-cb-clear-current-project): New fcn
+	(semantic-cb-new-class-browser): Do not get data from system libraries
+	(semantic-cb-find-node-in-list, semantic-db-find-node): New methods
+	(semantic-dot): New command
+	(semantic-dot-token-name, semantic-dot-insert-token): New methods
+	(semantic-cb-speedbar-menu): Add graphing option
+	(semantic-cb-speedbar-dot): New speedbar command.
+
+2003-03-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-grammar-mode):
+	Add support for stickyfunc.
+	(semantic-grammar-syntax-help): Make keys : prefixed for tag generators.
+
+	* semantic-util-modes.el (semantic-stickyfunc-fetch-stickyline):
+	Add nice default when not on
+	a function.
+
+2003-03-16  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-grammar.el: Require 'cl.
+	(wisent-grammar-TAG): Use `semantic-tag'.
+	(wisent-grammar-expand-builtins): New function.
+	(wisent-grammar-expand-sexpr): Use it.  Call `cl-macroexpand-all'
+	to expand macros.
+	(wisent-grammar-assocs, wisent-grammar-terminals)
+	(wisent-grammar-nonterminals): Use `semantic-token-extra-spec'.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton)
+	(wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* bovine/bovine-grammar.el (bovine-grammar-parsetable-builder): Use
+	`semantic-token-extra-spec'.
+
+	* semantic-grammar.wy (PREFIXED_LIST): New token.
+	(any_value, action): Use it.
+	(code, declaration, languagemode_decl, outputfile_decl)
+	(setupfunction_decl, keywordtable_decl, parsetable_decl)
+	(tokentable_decl, token_decl, start_decl, scopestart_decl)
+	(quotemode_decl, left_decl, right_decl, nonassoc_decl)
+	(put_decl, put_names, put_values, nonterminal)
+	(rule): Use TAG macros.
+	(token_type, level): Use `progn'.
+
+	* semantic-grammar.el (semantic-grammar-lex-prefixed-list):
+	New analyzer.
+	(semantic-grammar-lexer): Use it.
+	(semantic-grammar-automaton)
+	(semantic-grammar-keywords, semantic-grammar-tokens)
+	(semantic-grammar-setup-semantic): Re-generated.
+	(semantic-grammar-code-value): Removed.
+	(semantic-grammar-setupcode-text): Get code from buffer.
+	(semantic-grammar-setupcode-forms): Use
+	`semantic-grammar-setupcode-text'.
+	(semantic-nonterminal-children)
+	(semantic-grammar-token-symbols)
+	(semantic-grammar-keywords)
+	(semantic-grammar-keyword-properties)
+	(semantic-grammar-tokens)
+	(semantic-grammar-token-properties): Use
+	`semantic-token-extra-spec'.
+	(semantic-grammar-mode-keywords-1): Highlight :keywords here.
+	(semantic-grammar-mode-keywords-3): Fixed redundancy.
+
+2003-03-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el (semantic-cb-find-parent):
+	Allow unfound parents gracefully.
+	(semantic-cb-convert-type): Use new DB based external member finder fcn.
+
+	* bovine/Project.ede (languages): Removed semantic-java.el
+
+	* bovine/Makefile (languages_LISP): Removed semantic-java.el
+
+2003-03-15  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-fw.el:
+	White space change only.  Simply lined up overlay related aliases.
+
+2003-03-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-show-unmatched-syntax):
+	Use new lex API for token access.
+	(semantic-summary-mode-setup): Fix doc string.
+	(global-semantic-stickyfunc-mode, semantic-stickyfunc-mode-hook)
+	(semantic-stickyfunc-mode-map, semantic-stickyfunc-mode-setup)
+	( semantic-stickyfunc-sticky-classes, semantic-stickyfunc-fetch-stickyline):
+	New functions and variables.
+	(semantic-stickyfunc-mode): New minor mode.
+
+	* bovine/semantic-scm.el, bovine/semantic-make.el: Regenerated.
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Use new -tag- instead of -token- fcns.
+
+	* bovine/semantic-c.el: Regenerated.
+
+	* bovine/bovine-grammar.el:
+	(bovine-grammar-expand-TAG, bovine-grammar-expand-VARIABLE-TAG)
+	(bovine-grammar-expand-FUNCTION-TAG, bovine-grammar-expand-TYPE-TAG)
+	(bovine-grammar-expand-INCLUDE-TAG, bovine-grammar-expand-PACKAGE-TAG):
+	Use -tag- fcns instead of -token.
+
+2003-03-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.el: (wisent-python-parser-tables)
+	(wisent-python-keywords, wisent-python-tokens)
+	(wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java.el, wisent/wisent-java-tags.el:
+	(wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+	(wisent-java-expand-nonterminal): Use `semantic-token-extra-specs'
+	in place of `semantic-token-variable-extra-specs'.
+
+	* wisent/wisent-grammar.el:
+	(wisent-grammar-TAG, wisent-grammar-VARIABLE-TAG)
+	(wisent-grammar-FUNCTION-TAG, wisent-grammar-TYPE-TAG)
+	(wisent-grammar-INCLUDE-TAG, wisent-grammar-PACKAGE-TAG)
+	(wisent-grammar-EXPANDTAG): Use `semantic-tag' API and new
+	`wisent-...-tag' names.
+
+	* wisent/wisent-bovine.el (wisent-cooked-token):
+	Use `semantic-tag' API.
+	(wisent-raw-token): Renamed to...
+	(wisent-raw-tag): New.
+	(wisent-cook-token): Renamed to...
+	(wisent-cook-tag): New.  Use `semantic-tag' API.
+	(wisent-parse-region): Use `semantic-tag' API.
+
+2003-03-14  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Replaced (wisent-token ...) with VARIABLE-TAG, FUNCTION-TAG, etc.
+
+2003-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-elisp-sym->nonterm):
+	Use `semantic-tag-new-*' instead of
+	explicit lists.
+	(semanticdb-find-nonterminal-by-token-method): Fixed typo for
+	searching for variables and types.
+
+	* semantic-util.el (semantic-adopt-external-members):
+	Use `tag' instead of `token'.
+	Use new `semantic-clone-tag'.
+	(semantic-find-doc-snarf-comment): Do not use obsolete -flex- fcn.
+
+	* semantic-token.el (semantic-tag-put, semantic-tag-put-no-side-effect, semantic-tag-get):
+	New from old -token- versions.  Obsolete old names.
+	(semantic-clone-tag): New fcn.
+
+	* semantic-token.el:
+	(semantic-tag, semantic-tag-new-variable, semantic-tag-new-function)
+	(semantic-tag-new-type, semantic-tag-new-include, semantic-tag-new-package):
+	New routines from old -token- verison.
+	(semantic-token, semantic-token-new-variable, semantic-token-new-function)
+	(semantic-token-new-type, semantic-token-new-include)
+	(semantic-token-new-package): Obsoleted
+
+	* 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): Obsolete.
+
+	* semantic-util.el (semantic-summerize-nonterminal): Obsolete
+
+	* semantic-fw.el (semantic-fw-font-lock-keywords): Added below.
+	(semantic-alias-obsolete): New fcn.
+
+2003-03-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-expand-nonterminal):
+	Use `semantic-token-extra-spec'.
+
+	* semantic-token.el (semantic-token-plist-indexes): New constant.
+	(semantic-token-plist-index): New function.
+	(semantic-token-extra-specs, semantic-token-extra-spec)
+	(semantic-token-add-extra-spec): Generalized.
+	(semantic-token-type): Use `memq' instead of `member'.
+	(semantic-token-modifiers): Generalized.
+	(semantic-token-type-extra-specs)
+	(semantic-token-function-extra-specs)
+	(semantic-token-variable-extra-specs): Alias of
+	`semantic-token-extra-specs'.
+	(semantic-token-type-extra-spec)
+	(semantic-token-function-extra-spec)
+	(semantic-token-variable-extra-spec): Alias of
+	`semantic-token-extra-spec'.
+	(semantic-token-type-modifiers)
+	(semantic-token-function-modifiers)
+	(semantic-token-function-throws)
+	(semantic-token-function-parent)
+	(semantic-token-function-destructor)
+	(semantic-token-variable-modifiers)
+	(semantic-token-variable-const)
+	(semantic-token-variable-optsuffix): Use
+	`semantic-token-extra-spec'.
+
+	* semantic-grammar.el (semantic-grammar-mode-keywords-1):
+	Highlight more TAG macros.
+
+	* wisent/wisent-java.wy:
+	(compilation_unit, package_declaration, import_declaration)
+	(class_declaration, field_declarations_opt, field_declaration)
+	(method_declaration, formal_parameter, constructor_declaration)
+	(interface_declaration)
+	(abstract_method_declaration): Use TAG macros.
+
+	* wisent/wisent-java.el: (wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+	(wisent-java-expand-nonterminal): Embedded tags are now the value
+	of the extra specifier `tree'.
+
+	* wisent/wisent-java-tags.wy:
+	(package_declaration, import_declaration, class_declaration)
+	(interface_declaration, constructor_declaration)
+	(method_declaration, formal_parameter)
+	(field_declaration): Use TAG macros.
+
+	* wisent/wisent-java-tags.el: (wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-grammar.el:
+	(wisent-grammar-TAG, wisent-grammar-VARIABLE-TAG)
+	(wisent-grammar-FUNCTION-TAG, wisent-grammar-TYPE-TAG)
+	(wisent-grammar-INCLUDE-TAG, wisent-grammar-PACKAGE-TAG)
+	(wisent-grammar-EXPANDTAG): New functions.
+	(wisent-grammar-builtins): Added new expanders for TAG macros.
+
+	* wisent/wisent-bovine.el (wisent-raw-token, wisent-cook-token):
+	New functions.
+
+2003-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-scm.el: regenerated
+
+	* bovine/scheme.by (scheme-in-list): Quote code symbol.
+
+	* bovine/semantic-make.el: regenerated.
+
+	* bovine/make.by (include): Fix quote rule.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-stream):
+	Removed old dump-detail code.
+	Added in error condition call to the debugger.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-form): Fixed typo
+
+	* bovine/bovine-debug.el (semantic-bovine-debug-error-frame, and related methods):
+	New class and methods for an error frame.
+
+	* semantic-debug.el (semantic-debug-mode-map): Added eval-expression.
+	(semantic-debug-mode): Updated doc string.
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Use new token creation macros.
+
+	* bovine/semantic-scm.el: Regnerated.
+
+	* bovine/scheme.by (scheme-in-list): Update to new TAG macros.
+
+	* bovine/semantic-make.el: Regnerated.
+
+	* bovine/make.by (variable, rule, include):
+	Use new TAG creation macros.
+
+2003-03-11  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el: (semantic-grammar-languagemode)
+	(semantic-grammar-start): Doc fix.
+	(semantic-grammar-update-outputfile): Reverted last change.
+	(semantic-grammar-mode-keywords-1): Highlight TAG macros.
+
+	* semantic-fw.el (semantic-map-mode-buffers):
+	Accept a list of major modes.
+
+2003-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (senator-add-log-tokens): New mode variable.
+
+	* senator.el (senator-add-log-tokens): New variable
+	(add-log-current-defun): Use above.
+
+	* bovine/semantic-c.el:
+	(semantic-toplevel-c-bovine-table, semantic-c-keyword-table)
+	(semantic-default-c-setup): Regenerated
+	(semantic-c-reconstitute-token): Reduce function types of 1 string
+	in a list.
+
+	* bovine/c.by (CONTINUE): Fix spelling in summary.
+	(macro-or-include, define, classsubparts, enumsubparts, typesimple)
+	(type, template-type, variablearg): Use new token creation macros.
+
+	* bovine/bovine-grammar.el:
+	(bovine-grammar-expand-TAG, bovine-grammar-expand-FUNCTION-TAG)
+	(bovine-grammar-expand-TYPE-TAG, bovine-grammar-expand-PACKAGE-TAG):
+	New langauge macros
+	(bovine-grammar-expand-form): Use above new macros.
+	(bovine-grammar-parsetable-builder): Use direct name of child expand fcn.
+
+	* semanticdb.el (semanticdb-save-current-db): New command.
+
+	* semantic-grammar.el (semantic-install-function-overrides):
+	Removed old global install
+	(semantic-nonterminal-children): Coverted to overload-implementation.
+	(semantic-grammar-update-outputfile): Go through list of major modes
+	when updating the config function.
+	(semantic-grammar-map): Added semantic-grammar-complete.
+	(semantic-grammar-syntax-help): New variable
+	(semantic-grammar-complete, eldoc-current-symbol-info)
+	(semantic-abbreviate-nonterminal, semantic-summarize-nonterminal):
+	New functions/overloads.
+
+2003-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-file.el (semanticdb-load-database):
+	Always reset the parent db in read tables.
+	Delete read instance when the DB struct is out of date.
+
+2003-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/bovine-grammar.el: (bovine-grammar-expand-VARIABLE-TAG)
+	(bovine-grammar-expand-INCLUDE-TAG): New fcn
+	(bovine-grammar-expand-form): Call new fcns.
+
+	* semantic-sb.el (speedbar): Use inversion to load.
+
+	* semantic.el (semantic-version): Eval and compile
+	(inversion): New include
+	(semantic-require-version): Use inversion to implement.
+
+	* semantic-debug.el (eieio): Use inversion to load.
+
+	* semanticdb.el (eieio): Use inversion to load.
+	(semanticdb-needs-refresh-p): New convenience method.
+	(semanticdb-semantic-init-hook-fcn): Better handling of unmatched
+	syntax errors.
+
+	* semantic-analyze.el (eieio): Use inversion to load.
+
+2003-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-java.el: *** empty log message ***
+
+2003-03-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (LOADPATH): Added common.
+
+	* wisent/Project.ede (wisent): Added inversion dependency
+
+	* bovine/Makefile (LOADPATH): Added common.
+
+	* bovine/Project.ede (bovinator): Added inversion dependency.
+
+	* Makefile (LOADPATH): Added common.
+
+	* Project.ede (tools): Added inversion dependency
+
+2003-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: Added note on semanticdb-file depending on inversion.
+
+	* semanticdb-file.el (inversion): New requirement
+	(semanticdb-file-version, semanticdb-file-incompatible-version): New vars
+	(semanticdb-project-database-file): Added `semantic-token-version',
+	and `semanticdb-version' slots.
+	(semanticdb-create-database): Set the version values.
+	(semanticdb-load-database): If a loaded file is an old version, flush
+	as much as necessary so nothing crashes.
+
+	* semantic-token.el (semantic-token-version, semantic-token-incompatible-version):
+	new variables.
+
+2003-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-token.el (semantic-token-get, semantic-token-put*): Moved
+	(semantic-token-*-p): Moved
+	(semantic-token, semantic-token-new-*): New
+
+2003-02-27  Richard Y. Kim <ryk@ap.com>
+
+	* doc/semantic.texi: Split copyright to two lines.
+
+	* doc/app-dev-guide.texi:
+	Changed structure commands such as @section.  A simple cleanup after pasting this from the old manual.
+
+	* doc/app-dev-guide.texi, doc/fdl.texi, doc/glossary.texi, doc/installation.texi, doc/lang-support-guide.texi, doc/overview.texi, doc/semantic.texi, doc/user-guide.texi:
+	Moved the content of the old semantic.texi into appropriate chapters in the new manual.
+
+2003-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (semantic_LISP): Added semantic-token.el
+
+	* Project.ede (semantic): Added semantic-token.el
+
+	* semanticdb-el.el (eieio):
+	Require while compiling only.  Needed for cleaner byte-compile.
+
+	* semantic-util.el (semantic-equivalent-tokens-p):
+	Moved to semantic-token.el
+	(semantic-token-*): Liekwise.
+
+	* semantic-fw.el (semantic-tfe-overlay -properties -number):
+	Moved to semantic-token.el
+	(semantic-token-*): Likewise.
+
+	* semantic.el (semantic-token): Require it.
+	(semantic-delete-overlay-maybe): moved.
+
+	* semantic-token.el: All token access functions moved here.
+
+	* NEWS: Added search classes.
+
+2003-02-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-nonterminal-external-member-parent):
+	Use `define-overload'.
+	(semantic-nonterminal-external-member-p): Use `define-overload'.
+	(semantic-nonterminal-external-member-children): Use `define-overload'.
+	(semantic-nonterminal-external-member-children-db): Deleted
+	(semantic-nonterminal-external-member-children-default): Use new
+	semanticdb-search routine for finding external member chidren instead
+	of above.
+
+	* semantic-util-modes.el (semantic-auto-parse-enabled-p):
+	Do not auto-parse if doing a lexial
+	debug.  Fix logic error.
+
+	* semantic-analyze.el (semantic-analyze-type-parts):
+	Use new semanticdb search for external
+	children instead of the fn in semantic-util.
+	(semantic-analyze-token-type)
+	(semantic-analyze-find-nonterminal-sequence)
+	(semantic-analyze-current-context)
+	(semantic-analyze-possible-completions):
+	 Use `semantic-analyze-type-parts' instead of children.
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Try to support multiple versions of speedbar.
+
+	* semanticdb-el.el (semanticdb-find-nonterminal-external-children-of-type-method):
+	New
+
+	* semanticdb-search.el (Commentary): Updated
+	(semanticdb-find-nonterminal-external-children-of-type,
+	semanticdb-find-nonterminal-external-children-of-type-method): New
+
+2003-02-25  Richard Y. Kim <ryk@ap.com>
+
+	* doc/Makefile, doc/app-dev-guide.texi, doc/installation.texi, doc/internals.texi, doc/lang-support-guide.texi, doc/overview.texi, doc/semantic.texi, doc/user-guide.texi:
+	Initial check in of the merged semantic manual.
+
+2003-02-24  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Eric's fixes.
+
+2003-02-23  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi:
+	Updated to take into account latest changes in Wisent and
+	Semantic.
+
+2003-02-22  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.wy (goal): Fixed comment delimiter.
+
+	* semantic-grammar.el:
+	No more depend on `with-syntax-table' implementation.  For
+	example, since GNU Emacs 21.4 `with-syntax-table' no more use a
+	copy of the given syntax table.
+
+	(semantic-grammar-skip-quoted-syntax-table): New variable.
+	(semantic-grammar-goto-grammar-indent-anchor): Use it.
+	(semantic-grammar-brackets-as-parens-syntax-table): New variable.
+	(semantic-grammar-do-lisp-indent): Use it.
+
+	* semantic-ia-sb.el (speedbar-add-mode-functions-list "Analyse"):
+	Replaced
+	`speedbar-line-path' with `speedbar-line-directory' used since
+	speedbar 0.15.
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Replaced `speedbar-line-path' with
+	`speedbar-line-directory' used since speedbar 0.15.
+
+2003-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-sb-token-jump):
+	Use new `speedbar-before-visiting-tag-hook'.
+
+2003-02-20  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-debug.el:
+	Requires `pp' if `pprint' feature was not found.
+
+	* semantic-grammar.el (semantic-grammar-as-string):
+	Requires `pp' feature.
+
+2003-02-20  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Replaced one use of 'end' free variable with (cdr semantic-lex-analysis-bounds).
+
+2003-02-19  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-debug.el: New file.
+
+	* wisent/wisent.el (autoload 'wisent-compile-grammar): Removed.
+	(wisent-automaton-p): New.
+	(wisent-translate, wisent-untranslate): Removed.
+	(wisent-parse): Use new automaton format.
+
+	* wisent/wisent-python.el: (wisent-python-parser-tables)
+	(wisent-python-keywords, wisent-python-tokens)
+	(wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java.el, wisent/wisent-java-tags.el:
+	(wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-grammar.el (wisent-grammar-parsetable-builder):
+	Ensure that the grammar
+	[byte-]compiler is available to handle byte-compilation of the
+	grammar.
+
+	* wisent/wisent-comp.el (wisent-defcontext semantic-actions):
+	Moved before first use.
+	(wisent-token-actions): Create new semantic actions obarray.  Fill
+	the action table with semantic action symbols instead of negative
+	item numbers.
+	(wisent-goto-actions): Fill the goto table with nonterminal
+	symbols instead of item numbers.
+	(wisent-semantic-action): Store code of action in the function
+	cell of a symbol interned in the semantic actions obarray.  Return
+	that symbol.  The new semantic action variable `$action' is bound
+	to the name of that symbol.
+	(wisent-semantic-actions, wisent-token-translations): Removed.
+	(wisent-parser-automaton): Return a vector of 4 elements: the
+	action table, the goto table, the alist of start symbols, and the
+	semantic actions obarray.
+	(wisent-parse-nonterminals): Produce symbolic location of semantic
+	actions.
+	(wisent-parse-grammar): Intern generated symbols.
+	(wisent-compiled-grammar-p): Removed.
+	(wisent-compile-grammar): Doc fix.  Use `wisent-automaton-p'.
+	(wisent-byte-compile-grammar)
+	(wisent-byte-compile-automaton): New functions.
+
+	* wisent/wisent-cim.el: (wisent-cim-automaton)
+	(wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton, wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* wisent/wisent-awk.el: (wisent-awk-automaton)
+	(wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+	* wisent/Project.ede (ede-proj-target-elisp "wisent"):
+	Added wisent-debug.el.
+
+	* wisent/Makefile: Re-generated.
+
+	* semantic-grammar.el: (semantic-grammar-automaton)
+	(semantic-grammar-keywords, semantic-grammar-tokens)
+	(emantic-grammar-setup-semantic): Re-generated.
+
+	* bovine/java.bnf: Obsolete file removed.
+
+	* bovine/semantic-java.el: Removed obsolete code related to java.bnf.
+
+2003-02-19  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Replaced 'depth' free variable with semantic-lex-maximum-depth,
+	replaced two code fragments protected with condition-case with
+	semantic-lex-unterminated-syntax-protection macro, and
+	added wisent-python-lex-buffer test command.
+
+2003-02-18  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Fixed a regexp in python-next-line so that backquotes in python code do not break it.
+
+	* wisent/wisent-python.el:
+	Replaced end-point and current-depth with semantic-lex-end-point and semantic-lex-current-depth.
+
+	* wisent/wisent-python.el:
+	Modified all (semantic-lex-token ...) with (semantic-lex-push-token (semantic-lex-token ...)) to conform to the new lexer.
+
+2003-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-c.el (semantic-toplevel-c-bovine-table): Regenerated
+	(semantic-c-keyword-table): Regenerated
+	(semantic-default-c-setup): Regenerated with semantic-debug suppoert.
+
+2003-02-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-grammar.el (wisent-grammar-setupcode-builder): Setup
+	`semantic-debug-parser-source'.
+
+	* wisent/wisent-java-lex.el: (wisent-java-lex-symbol)
+	(wisent-java-lex-symbol2)
+	(wisent-java-lex-string): Follow lexical API changes.
+
+	* semantic-grammar.el (semantic-grammar-lex-sexp): Fixed typo.
+
+2003-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/Project.ede ("bnf"): gone
+	("examples"): no more bnf.
+
+	* bovine/Makefile (examples_MISC): No more .bnf
+	(bnf_MISC): Removed
+	(all): removed bnf
+	(bnf): gone
+	(dist): no more bnf.
+
+	* bovine/Makefile, bovine/c.bnf, bovine/make.bnf, bovine/make.by, bovine/scheme.bnf, bovine/scheme.by, bovine/skeleton.bnf:
+	*** empty log message ***
+
+	* semantic-util-modes.el (semantic-auto-parse-bovinate): Use
+	`semantic-lex-unterminated-syntax-end-function' in addition to the
+	old `-flex-' version.
+
+	* semantic-util-modes.el (semantic-auto-parse-enabled-p):
+	Do not parse if debugging is enabled.
+
+	* semantic-debug.el (semantic-debug): Do not turn off auto-parse.
+
+	* semantic-sb.el (semantic-sb-detail-parent):
+	Use `semantic-token-with-position-p'.
+
+	* semantic-debug.el (semantic-debug-highlight-lexical-token):
+	Use lexical analyzer highlighter.
+
+	* bovine/semantic-skel.el (semantic-lex-skel-if-0):
+	Update to new lexer API.
+
+	* bovine/semantic-make.el (semantic-lex-make-backslash-newline, semantic-lex-make-command):
+	(semantic-default-make-setup): Update to new lexer API.
+
+	* bovine/semantic-c.el:
+	(semantic-lex-c-if-0, semantic-lex-c-include-system)
+	(semantic-lex-c-ignore-ending-backslash): Updated to new lexer API
+
+	* semantic-grammar.el:
+	(semantic-grammar-lex-symbol, semantic-grammar-lex-string)
+	(semantic-grammar-lex-sexp): Use new lexer APIs.
+
+	* semantic-lex.el (semantic-lex-test): New command
+	(semantic-lex-debug): New variable and new command.
+	(semantic-lex-highlight-token): New function
+	(semantic-lex-debug-break): New function
+	(semantic-lex-end-point, semantic-lex-current-depth)
+	(semantic-lex-maximum-depth, semantic-lex-token-stream)
+	(semantic-lex-analysis-bounds): New state variables
+	(define-lex): Replace all local variables with references to above
+	 new global variables.
+	 Improved lexical hang detection.
+	(semantic-lex-push-token): New fcn
+	(semantic-lex-token): Spit out push part.
+	(semantic-lex-unterminated-syntax-detected): New fcn
+	(semantic-lex-unterminated-syntax-protection): New macro
+	(define-lex-analyzer): Updated doc string.
+	 Generated fcn binds more new state variables.
+	(define-lex-simple-regex-analyzer, define-lex-block-analyzer)
+	(semantic-lex-beginning-of-line, semantic-lex-newline-as-whitespace)
+	(semantic-lex-symbol-or-keyword, semantic-lex-punctuation-type)
+	(semantic-lex-comments, semantic-lex-comments-as-whitespace)
+	(semantic-lex-ignore-comments): Use `semantic-lex-push-token'.
+	 Use `semantic-lex-unterminated-syntax-protection' macro if apropriate.
+	 Use new state variables as apropriate.
+
+	* semantic.el (bovinate-debug): Deprecated.
+
+2003-02-15  David Ponce  <david@dponce.com>
+
+	* semantic-autogen.el: New implementation.
+
+	(semantic-autogen-noninteractive)
+	(semantic-autogen-keywordp): New compatibility stuff.
+	(make-autoload): New before advice.
+	(semantic-autogen-header)
+	(semantic-autogen-file, semantic-autogen-subdirs)
+	(semantic-autogen-update-header): New.
+	(semantic-hack-autoloads): Delegate to `batch-update-autoloads'.
+
+2003-02-14  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-scm.el: (semantic-toplevel-scheme-bovine-table)
+	(semantic-scheme-keyword-table)
+	(semantic-default-scheme-setup): Re-generated from scheme.by.
+
+	* bovine/scheme.by (OPENPAREN, CLOSEPAREN): Fixed token type.
+	(scheme-in-list): Handle function body.
+	(sequence): New nonterminal.
+
+	* semantic-debug.el (semantic-debug-find-parser-source):
+	Fixed error when parser
+	source don't exist in `load-path'.  Use `locate-library'.
+
+2003-02-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton)
+	(wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* wisent/wisent-calc.wy (setupcode):
+	Added missing punctuations in lexer syntax table.
+
+	* bovine/semantic-el.el: (semantic-ctxt-current-symbol emacs-lisp-mode)
+	(semantic-ctxt-current-function emacs-lisp-mode): Return result
+	in a list.
+
+	* semanticdb-el.el (semanticdb-find-nonterminal-by-name-regexp-method):
+	Ensure it
+	returns valid data.  Code simplified.
+
+2003-02-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/bovine-grammar.el (bovine-grammar-setupcode-builder):
+	New debug variables now set.
+
+	* bovine/Makefile (bovinator_LISP): Added bovine-debug.el
+	(LOADPATH): added eieio and wisent
+	(examples_LISP): added skeleton.by
+	(by_MISC): added make and scheme .by files.
+
+	* bovine/Project.ede (bovinator): Added EIEIO dependency.
+	Added `bovine-debug.el' support file.
+	(examples): Added skeleton.by.
+	(by): Added make and scheme.
+
+	* Makefile (tools_LISP): Added semantic-debug.el.
+
+	* Project.ede ("semantic"): Added `semantic-debug' API interface.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-stream):
+	Use new bovine debug interface.
+	Removed other debugger sections.
+	(semantic-dump-buffer-init, semantic-dump-detail)
+	(semantic-bovinate-debug-table, semantic-bovinate-debug-set-table)
+	(semantic-bovinate-debug-buffer, semantic-bovinate-show)
+	(semantic-bovinate-create-reference)
+	(semantic-bovinate-create-reference-token-list)
+	(semantic-bovinate-add-reference, semantic-bovinate-compare-reference)
+	(semantic-bovinate-reference-temp-list): Deleted.
+
+	* semantic-debug.el:
+	(semantic-debug-parser-class, semantic-debug-enabled)
+	(semantic-debug-current-interface, semantic-debug-current-parser): New
+	(semantic-debug-interface): Added several new slots.
+	(semantic-debug-frame, semantic-debug-set-parser-location)
+	(semantic-debug-set-source-location): New
+	(semantic-debug-interface-layout): Fixed.
+	(semantic-debug-frame): Removed cruft.
+	(semantic-debug-highlight-lexical-token)
+	(semantic-debug-highlight-rule, semantic-debug-unhighlight)
+	(semantic-debug-break): New
+	(semantic-debug-mode-map): Added abort and SPC bindings
+	(semantic-debug-mode): Fixed
+	(semantic-debug-next): Exit recursive edit
+	(semantic-debug-step): Exit recursive edit
+	(semantic-debug-fail-match): implemented.
+	(semantic-debug-quit): Exit recursive edit.
+	(semantic-debug-abort): new
+	(semantic-debug-set-breakpoint): name change
+	(semantic-debug-parser): Updated all methods.
+
+	* bovine/bovine-debug.el:
+	Implementation of `semantic-debug' interface for the bovine parser.
+
+	* semanticdb.el (semanticdb-create-table):
+	Fixed name of object to not use scoped variable.
+
+2003-02-10  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Reworked the python parser to be able to parse member variables and
+	functions of classes sufficiently well to make ECB work!
+
+2003-02-08  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Fixed semantic-lex-python-charquote lexical analyzer so that explicit line continuations via backslashes are handled properly.
+
+	* wisent/wisent-python.wy:
+	Fixed wiset-token expressions to produce tokens that conform to the specification at "(semantic)Style Guide" info node.
+
+2003-02-07  David Ponce  <david@dponce.com>
+
+	* semantic-lex.el (semantic-lex-whitespace):
+	Increment `end-point' when it merges
+	successive tokens.
+
+2003-02-06  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-update-outputfile): Use
+	`semantic-map-mode-buffers'.  Make sure the grammar output file
+	was required.
+
+2003-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* NEWS: Added news about sematnicdb.
+
+	* semantic-debug.el (semantic-debug-frame, semantic-debug-create-frame):
+	Adjust doc strings based on David's input.
+
+	* semantic-debug.el: Basic framework for the debugger.
+
+2003-02-03  David Ponce  <david@dponce.com>
+
+	* tests/templates.cpp: Sync with v1p4 branch.
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Re-generated from c.by.
+
+	* bovine/c.by: Sync with c.bnf in v1p4 branch.
+
+	(template-var): Handle any arguments with optional '&' and '*'
+	operators.
+	(template-type): Use variablearg rule.
+
+	* semanticdb.el (semanticdb-project-predicates): Renamed to...
+	(semanticdb-project-predicate-functions): New.
+	(semanticdb-current-database-list): Use
+	`run-hook-with-args-until-success' to run
+	`semanticdb-project-root-functions'.  Minor changes.
+
+	* semanticdb-file.el (semanticdb-write-directory-p): Use
+	`run-hook-with-args-until-success' to run
+	`semanticdb-project-predicate-functions'.
+
+	* NEWS: no message
+
+2003-02-02  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Lots of comment clean ups plus removal of unused code.
+
+	* wisent/wisent-python.wy:
+	Removed code to truncate string literals to first 16 characters.  It was a debugging aid.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Updated the python grammar to include the base class information in tokens representing a class.
+
+2003-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/skeleton.by (OPERATORS): New
+	(expression): Use above.
+
+	* bovine/semantic-skel.el (semantic-flex-skeleton-extensions): deleted
+	(semantic-lex-skel-if-0, semantic-skeleton-lexer): New
+
+	* bovine/skeleton.by: Example of using the .by format.
+
+	* bovine/semantic-scm.el (semantic-scheme-lexer): New lexer.
+	(semantic-*-scheme...): Generated from scheme.by
+
+	* bovine/scheme.by: Scheme parser, ported from scheme.bnf
+
+2003-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-grammar.el (semantic-grammar-update-def):
+	Evaluate after creation.
+	(semantic-grammar-update-setupfunction): Evaluate after creation.
+	(semantic-grammar-update-outputfile): Loop over all buffers.
+	Call the setup function on all buffers matching the mode we are
+	building a parser for.
+
+	* bovine/semantic-make.el (semantic-toplevel-make-bovine-table):
+	Updated from make.by
+	(semantic-make-keyword-table): Updated from make.by
+	(semantic-flex-make-extensions, semantic-flex-make-command)
+	(semantic-flex-nonewline): deleted
+	(semantic-lex-make-backslash-newline, semantic-lex-make-command):
+	New lexical analyzers.
+	(semantic-make-lexer): New lexer.
+	(semantic-default-make-setup): Updated from make.by.
+
+	* semantic.el (semantic-elapsed-time): New fn.
+	(bovinate): Use above to calculate elapsed time.
+
+2003-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/make.by (elements): Comment out EMPTY
+	(opt-whitespace): Comment out EMPTY
+
+	* semantic-lex.el (define-lex-analyzer):
+	The analyzer created as a function now wraps up
+	the token stream so `semantic-lex-token' works.
+
+2003-01-31  Richard Y. Kim <ryk@ap.com>
+
+	* NEWS: Added mention of python parser in the Languages section.
+
+	* wisent/wisent-python.el:
+	Updated the forms automatically generated from wisent-python.wy.
+	Apart from this, no other changes were made.
+
+	* wisent/wisent-python.wy:
+	The base class list tokens are now generated for class tokens.
+
+	* wisent/wisent-python.wy:
+	Cleaned up many semantic actions by getting rid of debug code and unncessary code.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Variable assignment statements and function formal parameters now generate 'variable tokens instead of the generic 'code tokens.
+
+2003-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/make.by: First attempt.
+
+2003-01-30  David Ponce  <david@dponce.com>
+
+	* tests/templates.cpp: Sync with v1p4 branch.
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Re-generated from c.by.
+
+	* bovine/c.by: Sync with c.bnf in v1p4 branch.
+
+	(template-var): Handle literal or constant.
+	(typeformbase): Fixed.
+
+	* Makefile: Rebuilt from Project.ede.
+
+2003-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-erlang.el:
+	Erlang support by Vladimir G. Sekissov <svg@surnet.ru>
+
+	* bovine/erlang-edoc.el:
+	Erlang support of the `document' API by Vladimir G. Sekissov <svg@surnet.ru>
+
+	* bovine/erlang.bnf:
+	Erlang support by Vladimir G. Sekissov <svg@surnet.ru>
+
+	* Project.ede (init): Fixed object name.
+	(misc): Added AUTHORS file.
+
+	* AUTHORS: Major contributors to Semantic.
+
+2003-01-30  David Ponce  <david@dponce.com>
+
+	* tests/test.cpp: Sync with v1p4 branch.
+
+	* bovine/semantic-c.el (semantic-lex-c-string):
+	New analyzer for C strings.
+	(semantic-c-lexer): Use it.
+
+2003-01-29  David Ponce  <david@dponce.com>
+
+	* tests/test.cpp: Sync with v1p4 branch.
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Re-generated from c.by.
+
+	* bovine/c.by: Sync with c.bnf in v1p4 branch.
+
+	(WCHAR): New token.
+	(builtintype-types): Use it.
+	(variablearg): Removed opt-stars.
+	(variablearg-opt-name): Handle pointers for unnamed arguments.
+	(string-seq): New nonterminal.
+	(expression): Use it instead of string.
+
+	* tests/Makefile: New file.
+
+	* wisent/Makefile: Rebuilt.
+
+	* wisent/Project.ede (ede-proj-target-makefile-info "doc"):
+	Removed :partofall option.
+	(ede-proj-target-elisp "languages"): Moved after "wisent" target.
+
+	* bovine/Makefile, Makefile: Rebuilt.
+
+	* Project.ede (ede-proj-target-elisp "tools"):
+	Removed "semanticdb-obj.el".
+
+	* semantic-mode.el: Obsolete file removed .
+
+2003-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el (semantic-elisp-use-read):
+	Give `define-mode-overload-implementation'
+	a parent.
+	Identify `defvar-mode-local' as a variable. Give it a parent.
+
+	* bovine/semantic-c.el (semantic-lex-c-if): Support #elif
+
+	* wisent/Project.ede (tools): New target with `bison-wisent.el' in it.
+
+2003-01-28  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-version): Updated to 2.0beta1.
+
+	* Project.ede (ede-proj-project "semantic"):
+	Updated :version to 2.0beta1.
+
+	* NEWS: Minor changes.
+
+	* tests/test.cpp:
+	Sync with changes made by Klaus Berndl <klaus.berndl@sdm.de>
+	in v1p4 branch.
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Re-generated from c.by.
+
+	* bovine/c.by (macro-def): Fixed typo.
+
+	Sync with changes made by Klaus Berndl <klaus.berndl@sdm.de>
+	in c.bnf in v1p4 branch.
+
+	(typesimple): Typedefs can also include declmods.
+	(CVDECLMOD)
+	(cv-declmods): New rules.
+	(DECLMOD): Use CVDECLMOD.
+	(codeblock-var-or-fun): Allow declmods after typeformbase too.
+	(variablearg): Allow cv-declmods after typeformbase.
+
+	* semanticdb.el (semanticdb-file-stream):
+	Ensure that the non-persistent slot
+	`reference-directory' is initialized.
+
+2003-01-27  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-file-stream):
+	Use `semanticdb-create-database' instead of
+	a hard-coded database file name based on given file name plus
+	`semanticdb-default-file-name'.
+
+	* bovine/c.bnf:
+	Added comment to signal that this grammar is now obsoleted
+	by the one in c.by!
+
+	(outputfile): Commented out to avoid overwrite of semantic-c.el.
+
+	Sync with changes made by Klaus Berndl <klaus.berndl@sdm.de>
+	in c.bnf in v1p4 branch.
+
+	(TYPENAME): New keyword.  Added summary.
+	(declaration): Moved define after var-or-fun.
+	(macro-expression-list)
+	(macro-def): New.
+	(macro-or-include): Use macro-def.
+	(define): Use macro-def.  Fixed semantic action.
+	(class-parents): Fixed semantic actions.
+	(type): Handle unnamed namespaces.
+	(using): Handle "using namespace XXX".
+	(template-type): Handle namespace-symbol and keyword typename.
+	(DECLMOD): Removed SIGNED and UNSIGNED.  Handle TYPENAME.
+	(builtintype-types)
+	(signedmod): New.
+	(builtintype): Use them.
+	(opt-initializers)
+	(varname): Handle namespace-symbol.
+	(namespace-opt-class): New.
+	(opt-class): Use it.
+	(operatorsym): Handle PARENS and BRAKETS.
+	(opt-expression): Removed.
+	(function-call)
+	(expression): Handle namespace-symbol.
+
+2003-01-25  David Ponce  <david@dponce.com>
+
+	* semantic-lex.el (semantic-lex-make-type-table):
+	Fixed resetting of `default' value.
+	More understandable warning message.
+
+2003-01-25  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Added comments for each keyword, deleted unused code, and scrubbed comments.
+
+	* wisent/wisent-python.el:
+	Matching changes to the .wy file just checked in.
+
+	* wisent/wisent-python.wy:
+	All tokens except 'import', 'function', and 'type' are now of type
+	'code' whose value is the keyword involved in the expression.
+
+	The following are such keywords: print, del, pass, break, continue,
+	return, yield, raise, global, exec, assert, if, while, for, try
+
+	Also "expr" value is used with 'code' token type for other exressions
+	that do not have a keyword.
+
+2003-01-24  David Ponce  <david@dponce.com>
+
+	* tests/templates.cpp, tests/test.cpp:
+	Sync with changes made by Klaus Berndl <klaus.berndl@sdm.de>
+	in v1p4 branch.
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Re-generated from c.by.
+
+	(semantic-lex-c-ignore-ending-backslash): New.
+	(semantic-c-lexer): Use it.
+
+	* bovine/c.by:
+	Sync with changes made by Klaus Berndl <klaus.berndl@sdm.de>
+	in c.bnf in v1p4 branch.
+
+	(PARENS, BRAKETS): New tokens.
+	(TYPENAME): New keyword.  Added summary.
+	(declaration): Moved define after var-or-fun.
+	(macro-expression-list)
+	(macro-def): New.
+	(macro-or-include): Use macro-def.
+	(define): Use macro-def.  Fixed semantic action.
+	(class-parents): Fixed semantic actions.
+	(type): Handle unnamed namespaces.
+	(using): Handle "using namespace XXX".
+	(template-type): Handle namespace-symbol and keyword typename.
+	(DECLMOD): Removed SIGNED and UNSIGNED.  Handle TYPENAME.
+	(builtintype-types)
+	(signedmod): New.
+	(builtintype): Use them.
+	(opt-initializers)
+	(varname): Handle namespace-symbol.
+	(namespace-opt-class): New.
+	(opt-class): Use it.
+	(operatorsym): Handle PARENS and BRAKETS.
+	(opt-expression): Removed.
+	(function-call)
+	(expression): Handle namespace-symbol.
+
+	* NEWS: Completed "Grammar framework." topic.
+
+2003-01-24  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Deleted debug code that I forgot to take out before the last check in.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Reorganized the grammar by better grouping related non-terminals together.
+
+	Also rewrote all the semantic actions so that proper semantic tokens are generated.
+
+2003-01-22  David Ponce  <david@dponce.com>
+
+	* NEWS: Starting Semantic 2.0 changes.
+
+	* ONEWS: Old NEWS file.
+
+2003-01-21  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-file-table):
+	Use a filename relative to the project
+	database's target directory when searching for a table object.
+
+2003-01-09  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-bovine.el (semantic-bovinate-nonterminal-db-nt):
+	Doc fix.
+
+	* semantic-lex.el (define-lex-analyzer):
+	Define the single analyzer as function too.
+	(define-lex-regex-analyzer)
+	(define-lex-simple-regex-analyzer)
+	(define-lex-block-analyzer): Doc fix.  Use `define-lex-analyzer'.
+	(semantic-lex-newline-as-whitespace)
+	(semantic-lex-ignore-newline): Removed extra white spaces.
+	(semantic-lex-paren-or-list): Doc fix.
+
+2003-01-06  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Finally converted python's lexer to use the new lexer, i.e., wisent-lex, and not use the old lexer wisent-flex.
+
+2002-12-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-beginning-of-command): Doc fix.
+
+2002-12-29  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-c.el: (semantic-toplevel-c-bovine-table)
+	(semantic-c-keyword-table)
+	(semantic-default-c-setup): Generated from c.by.
+
+	(semantic-c-classname)
+	(semantic-c-analyze-dereference-metatype): Doc fix.
+
+	* bovine/c.by (outputfile): Output to "semantic-c.el".
+	(class-parents): Enable namespace names for class parent declarations.
+	(opt-class-declmods): New.
+	(using): Fixed typo.
+	(DECLMOD): Add virtual as a possible declaration modifier.
+	(typeformbase): Accept namespace names.
+	(typeformclassbase): Removed.
+	(throw-exception-list): Enable namespace exceptions.
+	(variablearg): Added opt-stars.
+	(namespace-symbol): New.
+
+	* bovine/c.bnf (class-parents):
+	Enable namespace names for class parent declarations.
+	(opt-class-declmods): New.
+	(using): Fixed typo.
+	(DECLMOD): Add virtual as a possible declaration modifier.
+	(typeformbase): Accept namespace names.
+	(typeformclassbase): Removed.
+	(throw-exception-list): Enable namespace exceptions.
+	(variablearg): Added opt-stars.
+	(namespace-symbol): New.
+
+	* senator-isearch.el: Obsolete file.
+
+	* senator.el (senator-completion-menu-popup): Use a local
+	`imenu-default-goto-function' to avoid conflicts with another buffer
+	local definition of that function.  Ensure that the local goto
+	function will return the selected imenu item.
+
+	* semantic-util.el: (semantic-type-relation-separator-character)
+	(semantic-abbreviate-nonterminal): Doc fix.
+
+	* semantic-util-modes.el: (semantic-update-mode-line)
+	(global-semantic-show-unmatched-syntax-mode)
+	(semantic-unmatched-syntax-face)
+	(semantic-show-unmatched-syntax)
+	(semantic-show-unmatched-syntax-mode)
+	(semantic-show-unmatched-syntax-next)
+	(semantic-auto-parse-no-working-message)
+	(semantic-auto-parse-working-in-modeline-flag)
+	(semantic-auto-parse-max-buffer-size)
+	(global-semantic-auto-parse-mode)
+	(semantic-auto-parse-bovinate)
+	(global-semantic-summary-mode): Doc fix.
+
+	* semantic-texi.el (semantic-texi-super-regex):
+	Added matcher for `defopt'.
+	(semantic-texi-name-field-list): Add `defopt' as a parsable field
+	entry.
+	(semantic-texi-recursive-combobulate-list): Doc fix.
+
+	* semantic-imenu.el (semantic-imenu-goto-function): Forward to
+	`imenu-default-goto-function' when POSITION probably don't came from a
+	semantic imenu.
+
+	(semantic-imenu-flush-fcn): Reset `imenu-menubar-modified-tick' to
+	force rebuild of the imenu.
+
+	* document.el (eval-when-compile 'semantic 'semantic-util):
+	XEmacs change: needed to
+	define macros at compile time.
+
+	(document-function-name-comment)
+	(document-insert-parameters)
+	(document-parameter-comment)
+	(document-argument-name)
+	(document-programmer->english): Doc fix.
+
+2002-12-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el (semantic-cb-token):
+	table type is now semanticdb-abstract-table
+
+2002-12-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-el.el (semanticdb-find-nonterminal-by-function-method):
+	Disable body of `semanticdb-find-nonterminal-by-function-method'.
+	It makes the class browser unbelievably slow as it insists on
+	generating a class browser for all of Emacs.  Fix class browser
+	then re-enable later.
+
+2002-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile (wy_MISC): Remove wisent-wy.
+	(tools_LISP, tools): New
+
+2002-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el:
+	(semantic-edits-change-leaf-token, semantic-edits-change-between-tokens)
+	(semantic-edits-change-over-tokens, semantic-edits-splice-remove):
+	(semantic-edits-splice-insert):  Get raw parent token list.
+	Check children for position.  Need raw list for accurate splicing.
+
+2002-11-15  David Ponce  <david@dponce.com>
+
+	* semantic-util.el (semantic-find-doc-snarf-comment):
+	Use `semantic-comment-lexer' as
+	default lexer.
+
+	* semantic-lex.el (semantic-lex-map-symbols):
+	Fixed misplaced right parenthesis.
+	(semantic-lex-keywords)
+	(semantic-lex-types): Fixed missing `setq'.
+	(semantic-comment-lexer): New predefined lexer.
+
+2002-10-30  David Ponce  <david@dponce.com>
+
+	* bovine/semantic-el.el (require 'find-func): Added.
+	(semantic-end-of-command)
+	(semantic-beginning-of-command): Handle error when the point is
+	outside of a parenthesized block.
+
+	* bovine/bovine-grammar.el (bovine-grammar-expand-ASSOC):
+	Apply `semantic-grammar-ASSOC' to
+	ASSOC parameters.
+	(bovine-grammar-setupcode-builder): Added setup of
+	`semantic-toplevel-bovine-table-source' and
+	`semantic-equivalent-major-modes'.
+
+	* semantic-grammar.el (semantic-grammar-update-setupfunction):
+	Insert appropriate newline
+	after setup code.
+
+2002-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/bison-wisent.el (bison->wisent): Autoload cookie.
+	(bison->wisent-action-replace-once): Do not put in Action text.
+
+	* semantic.el:
+	Do not try doing any parsing if the buffer does not have semantic active.
+
+2002-10-02  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-python.el: (wisent-python-parser-tables)
+	(wisent-python-keywords, wisent-python-tokens)
+	(wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables)
+	(wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-java-lex.el: (wisent-java-tags-lexer)
+	(wisent-java-lexer): Use `semantic-lex-punctuation-type'.
+
+	* wisent/wisent-grammar.el (wisent-grammar-setupcode-builder):
+	Generate setup of
+	`semantic-lex-types-obarray'.
+
+	* wisent/wisent-cim.el: (wisent-cim-automaton)
+	(wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton)
+	(wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* wisent/wisent-bovine.el: (wisent-lex-token-rules)
+	(wisent-lex-token-get)
+	(wisent-lex-make-token-table): Use new `wisent-lex-type-...' API.
+	(wisent-lex-punctuation): Removed.
+
+	* wisent/wisent-awk.el: (wisent-awk-automaton)
+	(wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+	* semantic-lex.el (semantic-lex-tokens-obarray): Renamed to...
+	(semantic-lex-types-obarray): New.
+	(semantic-lex-token-invalid): Renamed to...
+	(semantic-lex-type-invalid): New.
+	(semantic-lex-token-symbol): Renamed to...
+	(semantic-lex-type-symbol): New.
+	(semantic-lex-token-class-p): Renamed to...
+	(semantic-lex-type-p): New.
+	(semantic-lex-token-set): Renamed to...
+	(semantic-lex-type-set): New.
+	(semantic-lex-token-value): Renamed to...
+	(semantic-lex-type-value): New.
+	(semantic-lex-token-put): Renamed to...
+	(semantic-lex-type-put): New.
+	(semantic-lex-token-get): Renamed to...
+	(semantic-lex-type-get): New.
+	(semantic-lex-make-token-table): Renamed to...
+	(semantic-lex-make-type-table): New.
+	(semantic-lex-map-tokens): Renamed to...
+	(semantic-lex-map-types): New.
+	(semantic-lex-tokens): Renamed to...
+	(semantic-lex-types): New.
+
+	(semantic-lex-punctuation-type): New.
+
+	* semantic-grammar.el (semantic-grammar-lexer):
+	Use `semantic-lex-punctuation-type'.
+	(semantic-grammar-automaton)
+	(semantic-grammar-keywords, semantic-grammar-tokens)
+	(semantic-grammar-setup-semantic): Re-generated.
+	(semantic-grammar-tokentable-builder-default): Call
+	`semantic-lex-make-type-table'.
+	(semantic-grammar-syntax-table): Removed '?' as a quote character.
+
+2002-09-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-fw.el (define-mode-overload-implementation):
+	Do not force such method to be
+	protected.  This prevents a .el file from being loaded twice.
+	(semantic-function-overload-p): New method.
+	(semantic-augment-function-help): If a symbol being described is
+	overloaded, add some help to the user query.
+	(describe-function): New advice.
+
+	* semantic-lex.el (define-lex):
+	Make sure that a token is eaten for each pass to
+	prevent hangs.
+
+2002-09-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el:
+	(semantic-up-context, semantic-get-local-variables, semantic-end-of-command)
+	(semantic-beginning-of-command, semantic-ctxt-current-symbol)
+	(semantic-ctxt-current-assignment, semantic-ctxt-current-argument): New
+
+	* senator.el: Remove highlight dirty tokens menu item.
+
+	* semantic-ctxt.el (semantic-up-context):
+	Add `semantic-overload' property.
+	(semantic-beginning/end-of-context): Use `define-overload'.
+	(semantic-beginning/end-of-context-default): Accept parameter.
+	(semantic-with-buffer-narrowed-to-context): Change indent function.
+	(semantic-get-local-variables): pass argument to default.
+	Add `semantic-overload' property.
+	(semantic-get-local-variables-default): Accept paramter
+	(semantic-get-local-arguments): Add `semantic-overload' property.
+	(semantic-get-local-arguments-default): Accept parameter.
+	(semantic-end/beginning-of-command): Convert to `define-overload'.
+	(semantic-end/beginning-of-command): Accept new paramter.
+	(semantic-with-buffer-narrowed-to-command): Change indent functgion
+	(semantic-ctxt-current-symbol): Convert to `define-overload.
+	(semantic-ctxt-current-symbol-default): Added paramter.
+	(semantic-ctxt-current-assignment): Convert to `define-overload'
+	(semantic-ctxt-current-assignment-default): Add paramter.
+	(semantic-ctxt-scoped-types): Convert to `define-overload'
+	(semantic-ctxt-scoped-types-default): Add paramter.
+
+2002-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (bovinate): Added timer to determine length of parsing.
+
+2002-09-12  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (semantic-grammar-lex-symbol):
+	Undo previous change.
+	(semantic-grammar-automaton)
+	(semantic-grammar-keywords)
+	(semantic-grammar-tokens)
+	(semantic-grammar-setup-semantic): Re-generated.
+	(semantic-grammar-syntax-table): Added '.' as symbol constituent, and
+	'?' and '\' as quote characters.
+	(semantic-grammar-mode-keywords-1): Fixed symbol regexps.
+
+	* semantic-grammar.wy (setupcode): Setup `semantic-lex-comment-regex'.
+
+2002-09-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-lex-punctuation):
+	Continue lexical analysis if a punctuation
+	don't match.
+
+	* semantic-grammar.wy (setupcode):
+	Removed setup of `semantic-lex-number-expression'.
+	(token [NUMBER]): Removed.
+	(token [PREFIX-EXP]): Renamed to SEXP.
+	(any_value): Updated to reflect above changes.
+
+	* semantic-grammar.el (semantic-grammar-lex-symbol):
+	Include '.' in symbol.
+	(semantic-grammar-lex-number)
+	(semantic-grammar-lex-prefixed-expression): Removed.
+	(semantic-grammar-lex-sexp): New.
+	(semantic-grammar-lexer): Updated to reflect above changes.
+	(semantic-grammar-automaton)
+	(semantic-grammar-keywords)
+	(semantic-grammar-tokens)
+	(semantic-grammar-setup-semantic): Re-generated.
+
+2002-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/bison-wisent.el: Translate bison files into wisent.
+
+2002-09-10  David Ponce  <david@dponce.com>
+
+	* semantic-grammar.el (require 'semantic-edit): at compilation time.
+	(semantic-grammar-edits-new-change-hook-fcn): New function.
+	(semantic-grammar-mode): Use it.
+
+	* semantic-edit.el (semantic-edits-change-leaf-token):
+	Take into account change at
+	beginning of leaf token.
+	(semantic-edits-incremental-parser): When there is a change between
+	tokens and the change is stuck on the first surrounding token,
+	re-parse that token.  Get reparse-symbol from cache-list when tokens
+	is nil.
+
+2002-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Project.ede, bovine/Project.ede, Project.ede:
+	Updated with new files dependencies.
+
+	* bovine/semantic-bovine.el (semantic-bovinate-debug-buffer):
+	autoload cookie.
+
+	* semantic-load.el (semantic-al): eval-and-compile this.
+	(imenu...): wrap in condition-case to protect .wy files.
+	(global-semantic-*-mode): Moved around a little
+	(semanticdb-load-system-cache): Load in the system cache if available.
+
+	* semanticdb-system.el:
+	Database for system directories.  (Such as C include files)
+
+	* semanticdb-file.el:
+	(semanticdb-default-file-name, semanticdb-default-save-directory)
+	(semanticdb-persistent-path, semanticdb-project-database-file):
+	autoload cookies.
+	(semanticdb-file-loaded-p, semanticdb-live-p): Moved
+	(semanticdb-create-database): Pass down class being created when
+	calculating database path.
+	(semanticdb-full-filename): Moved
+	(semanticdb-file-name-non-directory): New
+	(semanticdb-file-name-directory): Use new dir-sep-char.
+	Better final path concatenation.
+
+	* semanticdb.el (semanticdb-create-table): Comments
+	(semanticdb-dir-sep-char): New
+	(semanticdb-fix-pathname): New
+	(semanticdb-minor-mode-p): autoload cookie.
+	(semanticdb-file): Requirement removed.
+
+	* semantic-util-modes.el (global-semantic-show-dirty-mode*): REMOVED
+	(semantic-show-dirty*): REMOVED
+	(sematic-dirty*): REMOVED
+
+	* semantic-util.el (semantic-prototype-nonterminal-default-args):
+	Pass `color' to sub-calls.
+	(semantic-nonterminal-children): autoload cookie.
+
+	* semantic-ia.el (senator): Added requirement.
+
+	* semantic-fw.el (semantic-al): Added require.
+
+	* semantic-edit.el (semantic-change-function): Moved.
+	(semantic-dirty-tokens, semantic-dirty-token-hooks)
+	(semantic-pre-clean-token-hooks, semantic-clean-token-hooks)
+	(semantic-remove-dirty-children-internal)
+	(semantic-remove-dirty-children): REMOVED
+	(semantic-rebovinate-token, semantic-cleanup-dirty-tokens)
+	(semantic-change-function-mark-dirty)
+	(semantic-find-nearby-dirty-tokens)
+	(semantic-set-tokens-dirty-in-region): REMOVED
+
+	* semantic.el (semantic-clear-toplevel-cache):
+	Removed knowledge of dirty tokens.
+
+	* semantic-autogen.el (make-autoload):
+	Support defmethod as an autoload.
+
+2002-09-05  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el, wisent/wisent-wy.wy: No more used.
+
+	* wisent/wisent-python.el:
+	(wisent-python-parser-tables, wisent-python-keywords)
+	(wisent-python-tokens, wisent-python--default-setup): Re-generated.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-cim.el:
+	(wisent-cim-automaton, wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.wy (setupcode):
+	Setup lexer to `wisent-calc-lexer'.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton, wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+	(wisent-calc-lex-number, wisent-calc-lex-punctuation)
+	(wisent-calc-lexer): New.
+	(wisent-calc): Use them.
+
+	* wisent/wisent-bovine.el: (wisent-lex-tokens-obarray)
+	(wisent-lex-add-token, wisent-lex-put-default): Removed.
+	(wisent-lex-token-rules, wisent-lex-token-get)
+	(wisent-lex-make-token-table): Use `semantic-lex-token' stuff.
+
+	* wisent/wisent-awk.el:
+	(wisent-awk-automaton, wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+	* wisent/wisent-grammar.el, bovine/bovine-grammar.el, bovine/c.by:
+	Initial revision.
+
+	* semantic-lex.el:
+	(semantic-lex-map-symbols, semantic-lex-keyword-invalid)
+	(semantic-lex-keyword-symbol, semantic-lex-keyword-set)
+	(semantic-lex-keyword-value): New.
+	(semantic-lex-keyword-p, semantic-lex-keyword-get)
+	(semantic-lex-keyword-put, semantic-lex-map-keywords): Use them.
+
+	(semantic-lex-tokens-obarray, semantic-lex-token-invalid)
+	(semantic-lex-token-symbol, semantic-lex-token-class-p)
+	(semantic-lex-token-set, semantic-lex-token-value)
+	(semantic-lex-token-put, semantic-lex-token-get)
+	(semantic-lex-make-token-table, semantic-lex-map-tokens)
+	(semantic-lex-tokens): New.
+
+	* semantic-grammar.el, semantic-grammar.wy: Initial revision.
+
+2002-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-file-table):
+	Use `eieio-persistent-path-relative'.
+
+2002-08-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* wisent/Makefile:
+	Added bovine directory to load path so semantic-java will be available.
+
+	* Makefile: Added semanticdb-el.
+
+	* semantic-fw.el (semantic-overlay-properties, semantic-overlay-move):
+	XEmacs aliases.
+	(define-mode-overload-implementation): Moved actual assignment
+	outside eval-and-compile to prevent errors when compiling a file
+	already loaded once.
+
+2002-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bovine/semantic-el.el: Enable Emacs Lisp semanticdb extensions.
+
+	* semanticdb-el.el: System database for Emacs.
+
+	* semanticdb-search.el (semanticdb-search-results-table): New class
+	(semanticdb-refresh-table::semanticdb-search-results-table): New method.
+	(semanticdb-collect-find-results): Added `ignore-system', and
+	`find-file-on-match' arguments.  Ignore system forces the system
+	databases to be skipped.  Find-file-on-match ignores all DBs with
+	tables that are not associated with files.
+	(semanticdb-find-nonterminal-by-*): Added `ignore-system' argument.
+
+	* semanticdb.el (semanticdb-abstract-table): New class
+	(semanticdb-table): Inherit from above.
+	(semanticdb-project-system-databases): New variable.
+	(semanticdb-search-system-databases): New variable
+	(semanticdb-current-database-list): Doc update.
+	Add system databases to list when requested.
+
+2002-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-get-database): Added back in.
+
+2002-08-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-search.el (semanticdb-collect-find-results):
+	Rename input arguments to prevent
+	collision.
+	Fix empty result filter to correctly add real results.
+
+2002-08-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (PREFIX-EXP): new token.
+	(any_value): Added PREFIX-EXP rule.
+	(nonterminal): Removed error rule.
+
+	* wisent/wisent-wy.el (wisent-wy-lex-prefixed-expression): New.
+	(wisent-wy-lexer): Use it.
+	(wisent-wy-lex-buffer): Fixed bad lexer name.
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+	(wisent-wy-syntax-table): Added expression prefix characters.
+
+	* wisent/wisent-bovine.el: (wisent-parse-stream)
+	(wisent-parse-region): Manage a stack of lookahead tokens to ensure
+	all unrecognized tokens will be collected in
+	`semantic-unmatched-syntax-cache'.
+	(edebug-setup-hook): Added `edebug' specifications of local macros.
+
+	* bovine/semantic-bovine.el (require 'semantic):
+	Added to eliminate compiler warnings.
+
+	* semantic-lex.el (edebug-setup-hook):
+	Added `edebug' specifications of local macros.
+
+	* semantic-fw.el (setq-mode-local):
+	Take care of side effects! Evaluate each VAL only
+	once, and in the given order.
+	(edebug-setup-hook): Added `edebug' specifications of local macros.
+
+2002-08-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-char-p): New compatibility function.
+	(wisent-tag, wisent-ISVALID-TOKEN)
+	(wisent-parse-nonterminals): Use it.
+
+	* semantic.el (semantic-new-buffer-fcn):
+	Use `semantic-activate-mode-bindings'.
+
+	* semantic-fw.el: (semantic-override-table, semantic-current-overrides)
+	(semantic-new-overrides, semantic-symbol-value-for-mode)
+	(semantic-symbol-value-mode-assign, semantic-setq-major-mode)
+	(setq-major-mode): Removed.  Replaced by the following new API...
+
+	(semantic-symbol-table, semantic-current-bindings)
+	(semantic-new-bindings, semantic-bind)
+	(semantic-symbol, semantic-symbol-value)
+	(semantic-set-local-variable, semantic-activate-mode-bindings)
+	(mode-local-value, setq-mode-local, defvar-mode-local)
+	(defconst-mode-local): New.
+
+	(semantic-fetch-overload)
+	(semantic-install-function-overrides): Use new API.
+
+	(semantic-fw-font-lock-keywords): New constant.
+	Font lock keywords to highlight Semantic forms.  Installed with
+	`font-lock-add-keywords' if possible.
+
+	* bovine/semantic-java.el: (semantic-default-java-setup)
+	(add-hook 'java-mode-hook): Commented out.
+
+	* bovine/semantic-el.el (setq-major-mode):
+	Replaced by `defvar-mode-local'.
+
+2002-08-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el: (add-to-list 'auto-mode-alist)
+	(eval-after-load "speedbar"): New autoloads.
+
+	* wisent/wisent-python.el: (add-hook 'python-mode-hook)
+	(wisent-python-default-setup): Added autoload cookie.
+
+	* wisent/wisent-java-tags.el: (wisent-java-default-setup)
+	(add-hook 'java-mode-hook): Added autoload cookie.
+	(remove-hook 'java-mode-hook): Removed.
+
+	* bovine/semantic-java.el: (semantic-default-java-setup)
+	(add-hook 'java-mode-hook): Removed autoload cookie.
+
+	* bovine/semantic-bnf.el (eval-after-load "speedbar"):
+	Removed duplicate.
+	Added missing quote.
+
+	* semantic-load.el (autoload 'wisent-wy-mode): Removed.
+	(auto-mode-alist): Removed 'wisent-wy-mode.
+	Removed senator configuration.
+
+2002-08-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Added wisent sub project.
+
+	* semantic-load.el, semantic-autogen.el:
+	Added bovine subdirectory to loadpath.
+
+	* Project.ede: Moved piles of sources into the bovine directory.
+
+	* Makefile: Added sub projects "bovine/" and "/wisent".
+
+	* bovine/Makefile: Makefile for the bovinator.
+
+	* bovine/Project.ede: Project file for the bovinator
+
+	* wisent/Makefile: Makefile for wisent.
+
+	* wisent/Project.ede: Project file for wisent.
+
+	* bovine/semantic-make.el, semantic-make.el:
+	Renamed semantic-make.el to bovine/semantic-make.el
+
+	* bovine/semantic-skel.el, semantic-skel.el:
+	Renamed semantic-skel.el to bovine/semantic-skel.el
+
+	* bovine/semantic-scm.el, semantic-scm.el:
+	Renamed semantic-scm.el to bovine/semantic-scm.el
+
+	* bovine/semantic-java.el, semantic-java.el:
+	Renamed semantic-java.el to bovine/semantic-java.el
+
+	* bovine/semantic-c.el, semantic-c.el:
+	Renamed semantic-c.el to bovine/semantic-c.el
+
+	* bovine/semantic-el.el, semantic-el.el:
+	Renamed semantic-el.el to bovine/semantic-el.el
+
+	* bovine/semantic-bnf.el, semantic-bnf.el:
+	Renamed semantic-bnf.el to bovine/semantic-bnf.el
+
+	* bovine/skeleton.bnf, skeleton.bnf:
+	Renamed skeleton.bnf to bovine/skeleton.bnf
+
+	* bovine/scheme.bnf, scheme.bnf:
+	Renamed scheme.bnf to bovine/scheme.bnf
+
+	* bovine/make.bnf, make.bnf: Renamed make.bnf to bovine/make.bnf
+
+	* bovine/java.bnf, java.bnf: Renamed java.bnf to bovine/java.bnf
+
+	* bovine/c.bnf, c.bnf: Renamed c.bnf to bovine/c.bnf
+
+	* c.bnf: Removed flex extensions.
+
+	* bovine/semantic-bovine.el, semantic-bovine.el:
+	Renamed semantic-bovine.el to bovine/semantic-bovine.el
+
+	* semantic-load.el: Removed .bnf mode setup.
+	Removed speedbar .bnf and .wy setup.
+	Add wisent directoy to load path.
+	Removed incremental parser code.
+
+	* semantic-edit.el:
+	Added autoload cookies for setting up the new incremental parser.
+
+	* semantic-cb.el: Require semanticdb, and semanticdb-search
+
+	* semantic-bnf.el: Autoload cookie for mode setup.
+	Autoload cookie for new speedbar setup.
+
+	* semantic-analyze.el: Also require semanticdb-search.
+
+	* semantic-autogen.el (semantic-hack-autoloads): Added wisent.
+
+2002-08-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (setupcode):
+	Use default value of `wisent-lexer-function'.
+
+	* wisent/wisent-wy.el (wisent-wy-lexer): Use new wisent-lex API.
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+	(wisent-wy-setupcode)
+	(wisent-wy-tokentable-value): Generate new wisent-lex API.
+
+	* wisent/wisent-python.wy (setupcode):
+	Use `wisent-flex' as `wisent-lexer-function'.
+
+	* wisent/wisent-python.el: (string-indentation, wisent-python-lex-bol)
+	(wisent-python-lex-open-paren, wisent-python-lex-close-paren)
+	(wisent-python-lex-newline, wisent-python-lex-backslash)
+	(wisent-python-raw-string-handler): Use new wisent-lex API.
+
+	(wisent-python-parser-tables, wisent-python-keywords)
+	(wisent-python-tokens, wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java.wy (setupcode):
+	Use default value of `wisent-lexer-function'.
+
+	* wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+	(wisent-java-get-local-variables): Use `semantic-parse-region'.
+
+	* wisent/wisent-java-tags.wy (setupcode):
+	Use default value of `wisent-lexer-function'.
+
+	* wisent/wisent-java-tags.el:
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+	(wisent-java-get-local-variables): Tell `semantic-parse-region' to
+	return on error.
+
+	* wisent/wisent-java-lex.el (wisent-java-tags-lexer, wisent-java-lexer):
+	Use new wisent-lex API.
+
+	* wisent/wisent-cim.el:
+	(wisent-cim-automaton, wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.wy (setupcode): Use the new semantic-lex API.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton, wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+	(wisent-calc): Use new wisent-lex API.
+
+	* wisent/wisent-bovine.el:
+	New wisent-lex API that replaces the old wisent-flex one.
+
+	(wisent-flex-istream): Renamed `wisent-lex-istream'.
+	(wisent-flex-tokens-obarray): Renamed `wisent-lex-tokens-obarray'.
+	(wisent-lexer-lookahead): Renamed `wisent-lex-lookahead'.
+	(wisent-flex-token-rules): Renamed `wisent-lex-token-rules'.
+	(wisent-flex-token-get): Renamed `wisent-lex-token-get'.
+	(wisent-flex-add-token): Renamed `wisent-lex-add-token'.
+	(wisent-flex-put-default): Renamed `wisent-lex-put-default'.
+	(wisent-flex-make-token-table): Renamed
+	`wisent-lex-make-token-table'.
+	(wisent-flex-match): Renamed `wisent-lex-match'.
+	(wisent-flex-punctuation): Renamed `wisent-lex-punctuation'.
+	(wisent-flex-eoi): Renamed `wisent-lex-eoi'.
+
+	(define-wisent-lexer, wisent-flex, wisent-lex)
+	(wisent-parse-stream): Use new wisent-lex API.
+
+	(wisent-error-function): Moved.
+	(wisent-lexer-function): Ditto.  Default to `wisent-lex'.
+	(wisent-collect-unmatched-syntax): Naming.  Doc string.
+	(wisent-parse-region): New function.
+
+	* wisent/wisent-awk.el:
+	(wisent-awk-automaton, wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+	* semantic-edit.el (semantic-edits-incremental-parser):
+	Don't mark parse tree up to date
+	if incremental parse failed.
+
+2002-08-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb-search.el (semanticdb-collect-find-results):
+	Fixed compile warnings.
+
+	* Makefile: Updated project with new semanticdb files.
+
+	* semanticdb.sh: Script for building semantic cache files.
+
+	* semanticdb-mk.el: Script for buinding semantic cache files.
+
+	* semanticdb-search.el (semanticdb-file-stream):
+	Moved back to semanticdb.el.
+
+	* semanticdb.el:
+	(semanticdb-default-file-name, semanticdb-default-save-directory)
+	(semanticdb-persistent-path, semanticdb-save-database-hooks):
+	Moved to semanticdb-file.el
+	(semanticdb-project-database): No longer persistent.
+	(semanticdb-new-database-class): New variable.
+	(semanticdb-create-database): Now a static method.
+	(semanticdb-file-loaded-p, semanticdb-get-database)
+	(semanticdb-load-database, semanticdb-live-p)
+	(semanticdb-save-db, semanticdb-save-all-db)
+	(semanticdb-full-filename, semanticdb-live-p)
+	(object-write): Moved to semanticdb-file.el
+	(semanticdb-create-table): New method.
+	(semanticdb-write-directory-p, semanticdb-cache-filename)
+	Moved to semanticdb-file.el
+	(semanticdb-semantic-init-hook-fcn):
+	Use new static method to create database from variable.
+	Use new method for creating new tables.
+	(semanticdb-find-*): Moved to semanticdb-search.el
+
+	* semanticdb-search.el: Moved from semanticdb.
+	(semanticdb-collect-find-results): New fcn
+	(semanticdb-find-nonterminal-*): Changed to call above.
+	(semanticdb-find-nonterminal-*-method): New methods
+	(semanticdb-find-nonterminal-by-function-method): Used to be
+	`semanticdb-find-nonterminal-by-function', but for only one database.
+
+	* semanticdb-file.el:
+	Created from semanticdb.el.  Most functions unchanged.
+	(semanticdb-project-database-file): New class
+	(semanticdb-create-database): New static method.
+	Fixed bug when no file on disk yet.
+
+2002-08-10  David Ponce  <david@dponce.com>
+
+	* semantic-java.el, semantic-texi.el:
+	Moved autoload cookie to the right place.
+
+	* semantic.el (semantic-repeat-parse-whole-stream):
+	Removed unused argument DEPTH.
+	(semantic-parse-region-default): Updated call.
+
+2002-08-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-autogen.el:
+	For non-interactive mode, set loadpath nil, find-file-hooks to nil,
+	and supress file warnings.
+	(semantic-hack-autoloads): Remove extra save-buffer.
+	(make-autoload): Support defclass
+
+	* Makefile: Makefile for semantic.
+
+	* Project.ede (semantic-al.el): Added better dependencies.
+
+2002-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el: Load semantic-al.
+	Removed all auto-loads and mode hook assignments now in semantic-al.
+
+	* semantic-edit.el (semantic-edits-incremental-parser):
+	Added autoload tag.
+	Removed debug code I said I'd remove.
+
+	* semantic-fw.el (define-overload): Added autoload tag.
+
+	* semantic-ia-sb.el (semantic-speedbar-analysis): Added autoload tag.
+
+	* semantic-texi.el, semantic-make.el, semantic-scm.el, semantic-java.el, semantic-el.el, semantic-c.el:
+	Add autoload tags to mode hooks
+
+	* semantic-bovine.el (semantic-bovinate-stream): Added autoload tag.
+
+	* semantic-analyze.el (semantic-analyze-possible-completions):
+	Autoload tag.
+
+2002-08-09  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-bovinate-toplevel):
+	Preserve the unmatched syntax cache
+	after a full parse.
+
+2002-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-autogen.el (autoload): New require
+	(define-overload): Set `doc-string-elt' as property.
+	(make-autoload): Taken from Emacs21 autoload.el.  Added
+	`define-overload' to create a function autoload.
+
+2002-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added semantic-autogen to 'init' target.
+	Added special rules to build semantic-al.el
+	Version update.
+
+	* semantic-autogen.el: Fixed to be usable from a Makefile.
+	(semantic-hack-autoloads): Newline changes.  Safe buffer.
+
+	* semantic-autogen.el: Generate auto-load files.
+
+2002-08-08  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el (wisent-wy-region-placeholder):
+	Used `$i' instead of `$n'!
+
+	* wisent/wisent-java-tags.el (wisent-java-get-local-variables):
+	Use `semantic-parse-region'.
+
+	* semantic.el (semantic-version): Moved to "2.0alpha4".
+
+	(semantic-toplevel-bovine-cache-check)
+	(semantic-toplevel-bovine-force-reparse)
+	(semantic-bovine-toplevel-full-reparse-needed-p)
+	(semantic-bovinate-toplevel-override): Removed.
+
+	(semantic-parse-tree-state)
+	(semantic-parse-tree-set-needs-update)
+	(semantic-parse-tree-needs-update-p)
+	(semantic-parse-tree-set-needs-rebuild)
+	(semantic-parse-tree-needs-rebuild-p)
+	(semantic-parse-tree-set-up-to-date)
+	(semantic-parse-tree-up-to-date-p): New parse tree state API.
+
+	(semantic-bovine-umatched-syntax-refresh-needed-p)
+	(semantic-new-buffer-fcn, semantic-rebovinate-quickly-hook)
+	(semantic-clear-toplevel-cache)
+	(semantic-set-toplevel-bovine-cache): Use it.
+	(semantic-bovinate-toplevel): Ditto.  Removed
+	`semantic-bovinate-toplevel-override' stuff.
+
+	(semantic-active-p): Inlined.
+	(semantic-bovinate-unmatched-syntax): Removed CHECKCACHE argument.
+	(semantic-bovine-umatched-syntax-refresh-needed-p): Ditto.  Use new
+	parse tree state API.
+
+	(semantic-parse-stream, semantic-parse-changes)
+	(semantic-parse-region, semantic-parse-region-default): Moved to
+	eliminate byte-compiler warnings.
+
+	(require 'semantic-edit): Removed.
+
+	* semantic-util-modes.el: (semantic-show-parser-state-auto-marker)
+	(semantic-show-parser-state-marker): Use new parse tree state API.
+
+	* semantic-texi.el (semantic-texi-bovinate-toplevel): Renamed to...
+	(semantic-texi-parse-region): New.  Use parser plug-in API.
+	(semantic-texi-parse-changes): New.
+	(semantic-default-texi-setup): Install them as a parser plug-in.
+
+	* semantic-load.el: (semantic-edits-flush-changes)
+	(semantic-edits-change-function-handle-changes): auto loaded.
+
+	* semantic-edit.el: (semantic-edits-need-reparse)
+	(semantic-bovine-toplevel-partial-reparse-needed-p): Removed.
+	(semantic-edits-change-function-handle-changes)
+	(semantic-edits-flush-changes): Added autoload cookie.
+
+	(semantic-edits-change-function-handle-changes)
+	(semantic-edits-incremental-fail)
+	(semantic-edits-incremental-parser)
+	(semantic-rebovinate-token)
+	(semantic-cleanup-dirty-tokens)
+	(semantic-change-function-mark-dirty): Use new parse tree state API.
+
+2002-08-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el:
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+
+	(wisent-wy-EXPANDTHING): Removed.
+	(wisent-wy-region-placeholder): New function.
+	(wisent-wy-EXPAND, wisent-wy-EXPANDFULL): Use it.
+
+	(wisent-wy-setupcode): Updated to use new Semantic parse API.
+
+	* wisent/wisent-python.el:
+	(wisent-python-parser-tables, wisent-python-keywords)
+	(wisent-python-tokens, wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-comp.el (wisent-parse-grammar): Doc string fix.
+
+	* wisent/wisent-cim.el:
+	(wisent-cim-automaton, wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton, wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-nonterminal): Renamed to...
+	(wisent-parse-stream): New.
+
+	* wisent/wisent-awk.el:
+	(wisent-awk-automaton, wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+	* semantic.el (semantic-bovinate-parser-name): Renamed to...
+	(semantic-parser-name): New.
+	(semantic-bovination-working-message): Use it.
+	(semantic-parse-region): Replace `semantic-bovinate-region'.
+	(semantic-parse-stream): Replace `semantic-bovinate-nonterminal'.
+	(semantic-parse-changes): Replace
+	`semantic-bovinate-incremental-parser'.
+	(semantic-parse-region-default): Replace
+	`semantic-bovinate-region-default'.
+	(semantic-repeat-parse-whole-stream): Replace
+	 `semantic-bovinate-nonterminals'.
+	(semantic-bovinate-toplevel, semantic-bovinate-region-until-error)
+	(semantic-bovinate-from-nonterminal)
+	(semantic-bovinate-from-nonterminal-full): Use new parse API.
+
+	* semantic-load.el:
+	(semantic-parse-stream-default, semantic-parse-changes-default)
+	(semantic-parse-region-default): Added autoloads.
+
+	* semantic-el.el (semantic-elisp-use-read):
+	Use `semantic-parse-region'.
+
+	* semantic-edit.el (semantic-bovinate-incremental-parser): Removed.
+	(semantic-bovinate-incremental-parser-default): Renamed to...
+	(semantic-edits-incremental-parser): New.  Use `semantic-parse-region'.
+	(semantic-parse-changes-default): Alias of it.
+	(semantic-rebovinate-token): Use `semantic-parse-stream'.
+
+	* semantic-bovine.el (semantic-bovinate-region-default): Removed.
+	(semantic-bovinate-nonterminal-default): Renamed to...
+	(semantic-bovinate-stream): New.
+	(semantic-parse-stream-default): Alias of it.
+
+2002-08-05  David Ponce  <david@dponce.com>
+
+	* semantic-edit.el (semantic-bovinate-incremental-parser-default):
+	ensure that content of
+	the `changes' variable will be processed entirely by resetting the
+	`parse-start' value after processing a change group.
+
+2002-08-04  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el (wisent-wy-EXPAND): Reverted last change.
+
+	* wisent/wisent-wy.el:
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+	(wisent-wy-EXPANDTHING): New argument DEPTH.
+	(wisent-wy-EXPAND)
+	(wisent-wy-EXPANDFULL): Generate call to `semantic-bovinate-region'.
+
+	* wisent/wisent-python.el:
+	(wisent-python-parser-tables, wisent-python-keywords)
+	(wisent-python-tokens, wisent-python-default-setup): Re-generated.
+
+	* wisent/wisent-java-tags.el:
+	(wisent-java-parser-tables, wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+	(wisent-java-get-local-variables): Use `semantic-bovinate-region'.
+
+	* semantic.el (semantic-bovinate-from-nonterminal-full):
+	Use depth 1 by default.
+
+	* wisent/wisent-awk.bnf, wisent/wisent-calc.bnf, wisent/wisent-cim.bnf, wisent/wisent-java-tags.bnf, wisent/wisent-java.bnf:
+	Deleted. Obsolete.
+
+	* wisent/wisent-flex.el: Deleted. Code moved to wisent-bovine.el.
+
+	* wisent/wisent-wy.el:
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+	(wisent-wy-setupcode): Install `wisent-bovinate-nonterminal' as
+	'bovinate-nonterminal override.  No more use the buffer local variable
+	`semantic-bovinate-parser'.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords, wisent-java-tokens)
+	(wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-java-lex.el (require 'wisent-bovine):
+	Instead of 'wisent-flex.
+
+	* wisent/wisent-cim.el:
+	(wisent-cim-automaton, wisent-cim-keywords, wisent-cim-tokens)
+	(wisent-cim-default-setup): Re-generated.
+
+	* wisent/wisent-calc.el: (wisent-calc-automaton, wisent-calc-tokens)
+	(wisent-calc-setup-parser): Re-generated.
+
+	* wisent/wisent-bovine.el: Merged code from wisent-flex.el.
+	(wisent-bovinate-nonterminal): Obeys new parser plug-in API.
+
+	* wisent/wisent-awk.el:
+	(wisent-awk-automaton, wisent-awk-keywords, wisent-awk-tokens)
+	(wisent-awk-setup-parser): Re-generated.
+
+2002-08-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-edit.el (semantic-bovinate-incremental-parser-default):
+	Fixed typo.
+
+	* Project.ede:
+	Added `semantic-lex.el', `semantic-bovine.el', `semantic-edit.el', and
+	'semantic-fw.el' to the `semantic' target.
+
+	* semantic-el.el (semantic-elisp-use-read): Use `bovinate-region'.
+	(semantic-emacs-lisp-lexer): Support `define-overload', `define-lex',
+	and `define-mode-overload-implementation'.
+	(semantic-emacs-lisp-lexer): New lexer.
+	(semantic-elisp-find-dependency, semantic-elisp-find-documentation)
+	(semantic-insert-foreign-token, semantic-nonterminal-protection):
+	(semantic-elisp-nonterminal-static): Create using
+	`define-mode-overload-implementation'.
+	(semantic-default-elisp-setup): Emptied out all steqs into toplevel
+	using `setq-major-mode'.
+
+	* semantic-util-modes.el (semantic-highlight-edits-face):
+	Change color to darker gray for dark background
+
+	* semantic-util.el (semantic-map-buffers): Moved to semantic-fw.el
+
+	* semantic-load.el: Imported some autoloads from semantic.el
+
+	* semantic-lex.el (semantic-fw): New require.
+	(semantic-lex-keyword-p): Check for keyword obarray before reference.
+	(define-lex): Added debug information.
+	(semantic-lex): Create as an overload.
+
+	* semantic-edit.el (semantic-bovinate-incremental-parser):
+	New override fcn.
+	(semantic-bovinate-incremental-parser-default): Renamed.
+	Added debugging if statements.
+	(semantic-rebovinate-token): Renamed for `lex', not `flex'.
+
+	* semantic-c.el:
+	(semantic-flex-c-extensions, semantic-flex-c-include-system)
+	(semantic-flex-c-if-0, semantic-flex-c-if): Deleted.
+	(semantic-default-c-setup): Do not assign `semantic-flex-extensions'.
+
+	* semantic-bovine.el (semantic-bovinate-region-default):
+	Added needed new arguments.
+	(semantic-bovinate-nonterminal-default): Removed TABLE argument.
+
+	* semantic.el (semantic-bovinate-parser): Deleted
+	(semantic-bovinate-incremental-parser): Deleted.
+	(semantic-new-buffer-fcn): Assign mode-local variables.
+	(semantic-set-toplevel-bovine-cache): Moved.
+	(semantic-bovinate-toplevel): Use new override fcn instead of old symbol.
+	(semantic-bovinate-region): Added arguments depth and returnonerror.
+	(semantic-bovinate-nonterminal): Moved & converted to an overload fcn.
+	(semantic-bovination-active-table): Deleted.
+	(semantic-bovinate-nonterminals): Use new api to `semantic-bovinate-nonterminal'
+	(semantic-bovinate-from-nonterminal, semantic-bovinate-from-nonterminal-full):
+	Now wraps `semantic-bovinate-region'.
+	(autoloads...): Moved to semantic-load.
+
+	* semantic-fw.el (semantic-map-buffers): Moved from semantic.el
+	(semantic-map-mode-buffers): New fcn
+	(define-mode-overload-implementation): New macro
+	(semantic-symbol-value-for-mode, semantic-symbol-value-mode-assign)
+	(semantic-setq-major-mode, setq-major-mode): New mode local variables API.
+
+2002-08-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el:
+	Changed bovinate-toplevel autoload to bovinate-region.
+
+	* semantic-edit.el (semantic-edits-bovinate-region): Deleted.
+	(semantic-edits-incremental-parser): Use `semantic-bovinate-region'
+	instead of above.
+
+	* semantic.el (semantic-bovinate-region): New overload fcn.
+	(semantic-bovinate-toplevel): Use `semantic-bovinate-region' for
+	toplevel parsing.  Do not use lex.
+	Left comments behind describing problems with unmatched syntax that
+	needs fixing.
+
+	* semantic-bovine.el (semantic-bovinate-region-default): New function.
+
+	* working.el (working-status, working-dynamic-status):
+	Made robust when called
+	outside of working forms.
+
+2002-07-31  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-bovinate-toplevel):
+	Removed working stuff around
+	incremental re-parse.
+
+	* semantic-util-modes.el (semantic-auto-parse-bovinate):
+	Disable the auto parse timer while
+	re-parsing.
+	(semantic-auto-parse-kill-timer): New function.
+
+	* semantic-fw.el (semantic-current-overrides):
+	Now if optional argument MODE is
+	specified return the override table of that mode or its parents.
+	(semantic-install-function-overrides): New mode override table
+	inherits from mode parents.
+	(semantic-fetch-overload): Removed optional argument MODE.
+
+	* semantic-edit.el (semantic-edits-bovinate-region):
+	Working stuff moved from
+	`semantic-bovinate-toplevel'.
+	(semantic-edits-incremental-parser): Trigger full re-parse on error.
+
+2002-07-30  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (setupcode):  No more install overrides here.
+
+	* wisent/wisent-wy.el:
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+	(semantic-install-function-overrides): Install in `wisent-wy-mode'.
+	(add-to-list 'auto-mode-alist)
+	(speedbar-add-supported-extension): Removed.  In semantic-load.el.
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+	(semantic-install-function-overrides): Install in `java-mode'.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy (setupcode):
+	 No more install overrides here.
+
+	* semantic-java.el (semantic-default-java-setup):
+	No more install overrides here.
+	(semantic-install-function-overrides): Install in `java-mode'.
+
+	* semantic-fw.el (semantic-install-function-overrides):
+	set table with existing mode
+	override table.
+
+	* senator.el (senator-minor-mode-setup): Use
+	`semantic-after-toplevel-cache-change-hook' and
+	`semantic-after-partial-cache-change-hook' instead of
+	`semantic--before-toplevel-cache-flush-hook' and
+	`semantic-clean-token-hooks'.
+
+2002-07-29  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-register-mode-menu-entry ["Highlight Dirty Tokens"]):
+	Commented out.
+	(senator-register-mode-menu-entry ["Highlight changes"])
+	(senator-register-mode-menu-entry ["Show parser state"]): Added.
+
+	* semantic.el (semantic-bovinate-toplevel):
+	Added missing `working-status-form'
+	around incremental parse.
+	(semantic-bovinate-from-nonterminal)
+	(semantic-bovinate-from-nonterminal-full)
+	(semantic-bovinate-region-until-error): Inlined to avoid an
+	unnecessary extra call.
+
+	* semantic-util.el:
+	(semantic-name-nonterminal, semantic-abbreviate-nonterminal)
+	(semantic-summarize-nonterminal, semantic-prototype-nonterminal)
+	(semantic-concise-prototype-nonterminal)
+	(semantic-uml-abbreviate-nonterminal)
+	(semantic-uml-prototype-nonterminal)
+	(semantic-uml-concise-prototype-nonterminal)
+	(semantic-nonterminal-static): Use `define-overload' instead of
+	`semantic-defoverload'.
+
+	(semantic-find-dependency, semantic-find-nonterminal)
+	(semantic-find-documentation): Put the right property
+	'semantic-overload.
+
+	* semantic-imenu.el (semantic-imenu-flush-fcn, semantic-create-imenu-index):
+	 Use
+	`semantic-after-toplevel-cache-change-hook' and
+	`semantic-after-partial-cache-change-hook' instead of
+	`semantic--before-toplevel-cache-flush-hook' and
+	`semantic-clean-token-hooks'.
+
+	* semantic-fw.el (semantic-current-overrides, semantic-new-overrides):
+	New functions.
+	(semantic-install-function-overrides): Use them.  New optional
+	argument MODE to install into.
+	(semantic-fetch-overload): Use `semantic-current-overrides'.
+	(semantic-defoverload): Renamed to...
+	(define-overload): New macro.
+
+	* semantic-edit.el (semantic-edits-bovinate-region):
+	Added missing parameter
+	reparse-symbol.
+	(semantic-edits-incremental-parser): Set reparse-symbol.
+	(semantic-edits-splice-remove): Fixed typo.
+
+2002-07-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el: Require semantic.
+	(global-semantic-highlight-edits-mode & friends): New mode.
+	(semantic-auto-parse-no-working-message): default nil
+	(semantic-auto-parse-working-in-modeline-flag): default nil.
+	(semantic-auto-parse-mode-hook): doc fix
+	(semantic-before-auto-parse-hooks, semantic-after-auto-parse-hooks):
+	New hooks.
+	(semantic-auto-parse-bovinate): Use new hooks.
+	(global-semantic-show-parser-state-mode & friends): New mode.
+
+	* semantic-load.el: Use new incremental parser by default.
+	Turn on `global-semantic-highlight-edits-mode' for everything-on
+	Turn on `global-semantic-show-parser-state-mode' for useful things.
+
+	* semantic.el (semantic-bovinate-incremental-parser): New variable.
+	(bovinate): Negative clear arg does not display tokens.
+	(semantic-bovinate-toplevel): Use `semantic-bovinate-incremental-parser'.
+	Move all dirty token references to semantic-edit.el
+	(semantic-bovinate-nonterminal, semantic-bovinate-nonterminals): Doc fix
+
+	* semantic-edit.el (semantic-edits-need-reparse): New state variable
+	(semantic-change-hooks): Moved
+	(semantic-reparse-needed-change-hook, semantic-no-reparse-needed-change-hook)
+	(semantic-edits-new-change-hooks, semantic-edits-delete-change-hooks)
+	(semantic-edits-move-change-hooks, semantic-edits-reparse-change-hooks)
+	(semantic-edits-incrementarl-reparse-failed-hooks): New hooks
+	(semantic-bovine-toplevel-partial-reparse-needed-p): Updated to
+	handle old and new reparse mechanisms.
+	(semantic-changes-in-region, semantic-edits-change-function-handle-changes)
+	(semantic-edits-flush-change, semantic-edits-flush-changes) New
+	functions for handling small changes.
+	(semantic-edits-bovinate-region): New parser entry.
+	(semantic-edits-change-in-one-token-p): New fcn.  May be deleted later.
+	(semantic-edits-os, semantic-edits-oe): Temporary functions.
+	(semantic-edits-change-leaf-token, semantic-edits-change-between-tokens)
+	(semantic-edits-change-over-tokens): New change analyzers
+	(semantic-edits-incremental-fail): New function
+	(semantic-edits-incremental-parser): New incremental parser function.
+	(semantic-edits-splice-remove, semantic-edits-splice-insert)
+	(semantic-edits-splice-replace): New cache splicing routines.
+	(semantic-rebovinate-token): Use `semantic-edits-incremental-fail'.
+	(semantic-cleanup-dirty-tokens): New fcn
+
+	* semantic-util.el (semantic-find-nonterminal-by-overlay-prev): Doc fix
+	(semantic-find-nonterminal-parent-by-overlay): New fcn
+
+	* semantic-fw.el (semantic-overlay-properties,semantic-overlay-move):
+	New aliases
+	(semantic-mode-line-update): New alias.
+
+2002-07-26  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el: (wisent-parse-error-function, wisent-lexer)
+	($region, $nterm): Moved definitions.
+	(wisent-push): Removed.
+
+	* wisent/wisent-comp.el (semantic-actions): New local context.
+	(wisent-semantic-action): Set unused entries to nil.  In semantic
+	action lambda expression, removed call to `wisent-push', use
+	un-interned symbols for local variables.
+	(wisent-semantic-actions): Use local context `semantic-actions'.
+
+2002-07-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-find-nonterminal-by-function):
+	Added more references in
+	doc string.
+
+	* semantic-el.el (semantic-elisp-nonterminal-static): Fix doc.
+
+	* semantic.el:
+	(semantic-bovine-toplevel, semantic-bovinate-nonterminals)
+	(semantic-bovinate-nonterminal): Use `semantic-lex-depth'.
+	(semantic-bovination-active-table): New variable.
+	(semantic-bovinate-nonterminal): Set new variable.
+	(semantic-bovinate-from-nonterminal): Use above variable.
+
+	* semantic-util.el (semantic-override-table, semantic-install-function-overrides, semantic-fetch-overload):
+	Moved to semantic-fw.el
+	(semantic-colorize-text): Check for font-lock.
+	(semantic-name-nonterminal, semantic-abbreviate-nonterminal)
+	(semantic-summerize-nonterminal, semantic-prototype-nonterminal)
+	(semantic-concise-prototype-nonterminal)
+	(semantic-uml-abbreviate-nonterminal)
+	(semantic-uml-prototype-nonterminal)
+	(semantic-uml-concise-prototype-nonterminal): Use new
+	`semantic-defoverload' macro to create.
+	(semantic-find-dependency, semantic-find-nonterminal)
+	(semantic-find-documentation): Put 'semantic-defoverload' on them.
+	(semantic-nonterminal-static): Create with `semantic-defoverload'.
+
+	* semantic.el (semantic-overlay-*): Moved aliases to semantic-fw.el.
+	(semantic-edebug, semantic-dump-parse): Moved closer to parsing routines.
+	(semantic-bovinate-parser, semantic-bovinate-parser-name): Moved
+	closer to parser.
+	(semantic-tfe-*, semantic-token-*): Moved to semantic-fw.el
+
+	* semantic-fw.el:
+	Moved compatibility and simple functionality here from semantic.el
+
+2002-07-20  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (array_creation_expression):
+	Added missing rules.
+
+	* wisent/wisent-java.el:
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-flex.el (require 'wisent-bovine): Instead of 'semantic.
+	(wisent-flex-punctuation): Moved.
+	(define-wisent-lexer): New macro.
+	(wisent-flex): Defined with `define-wisent-lexer'.  Use semantic-lex
+	API instead of semantic-flex one.
+	(wisent-lex): Ditto.
+
+	* wisent/wisent-bovine.el (provide 'wisent-bovine): Moved at beginning.
+	(wisent-cooked-token): Made a macro.
+	(wisent-lexer-wrapper): Removed.
+	(wisent-bovinate-nonterminal): Use `wisent-lexer-function' instead of
+	`wisent-lexer-wrapper'.
+
+	* semantic.el (semantic-bovinate-parser): Set default value to
+	`semantic-bovinate-nonterminal-default'.
+	(semantic-bovinate-nonterminal): Moved, simplified & inlined.
+	(semantic-bovinate-nonterminals): Simplified working percent
+	computation.
+
+	* semantic-lex.el (semantic-lex-syntax-table): New variable.
+	(semantic-lex-init): Moved.
+	(semantic-lex): Ditto.  Simplified & inlined.
+	(semantic-lex-one-token): Simplified.
+	(define-lex): Use `semantic-lex-syntax-table'.
+	(semantic-lex-token-bounds): New function.
+	(semantic-lex-token-start, semantic-lex-token-end): Use it.
+	(semantic-lex-buffer, semantic-lex-list): New functions.
+	(semantic-lex-newline-as-whitespace, semantic-lex-whitespace)
+	(semantic-lex-comments, semantic-lex-comments-as-whitespace): Use
+	token API instead of `car', `cdr'.
+	(semantic-flex-buffer):  Alias of `semantic-lex-buffer'.
+	(semantic-flex-list): Alias of `semantic-lex-list'.
+
+2002-07-17  David Ponce  <david@dponce.com>
+
+	* semantic-java.el: Reorganized code.
+	(semantic-java-lexer): New function.
+	(semantic-default-java-setup): Re-generated.
+
+	* java.bnf (setupcode): Use new Semantic 2.x lexical analysis API.
+
+	* wisent/wisent-wy.el (require 'semantic-lex): Removed.  Not necessary.
+	(wisent-wy-lex-symbol): Use `semantic-lex-keyword-p' instead of
+	`semantic-flex-keyword-p'.
+	(wisent-wy-lex-punctuation): Removed.
+	(wisent-wy-lexer): Use `wisent-flex-punctuation' instead of
+	`wisent-wy-lex-punctuation'.
+	(wisent-wy-keywordtable-value): Use `semantic-lex-make-keyword-table'
+	instead of `semantic-flex-make-keyword-table'.
+
+	* wisent/wisent-java-lex.el (require 'semantic-lex):
+	Removed.  Not necessary.
+	(wisent-java-lex-symbol, wisent-java-lex-symbol2): Use
+	`semantic-lex-keyword-p' instead of `semantic-flex-keyword-p'.
+	(wisent-java-lex-punctuation): Removed.
+	(wisent-java-tags-lexer, wisent-java-lexer): Use
+	`wisent-flex-punctuation' instead of `wisent-java-lex-punctuation'.
+
+	* wisent/wisent-flex.el (wisent-flex-punctuation): New macro.
+	(wisent-lex): Use `semantic-lex-token-text' instead of
+	`semantic-flex-text'.
+
+2002-07-16  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el (require 'semantic-lex): Added.
+	(wisent-wy-c-char-re): Renamed to...
+	(wisent-wy-lex-c-char-re): New constant.
+	(wisent-wy-item-value, wisent-wy-tokens)
+	(wisent-wy-mode-keywords-1): Use it.
+	(wisent-wy-flex-extensions, wisent-wy-flex-char): Removed.
+	(wisent-wy-lex-symbol, wisent-wy-lex-number, wisent-wy-lex-string)
+	(wisent-wy-lex-char, wisent-wy-lex-punctuation)
+	(wisent-wy-lex-blocks): New macros.
+	(wisent-wy-lexer, wisent-wy-lex-buffer): New functions.
+	(wisent-wy-automaton, wisent-wy-keywords, wisent-wy-tokens)
+	(wisent-wy-setup-semantic): Re-generated.
+
+	* wisent/wisent-wy.wy (setupcode):
+	Setup new Semantic lexical analysis tools.
+
+	* wisent/wisent-java.el (require 'wisent-java-lex): Added.
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy (setupcode):
+	Setup new Semantic lexical analysis tools.
+
+	* wisent/wisent-java-tags.el (require 'wisent-java-lex): Added.
+	(wisent-java-expand-nonterminal): Moved.  No more needed at
+	compilation time.
+	(wisent-java-parser-tables, wisent-java-keywords)
+	(wisent-java-tokens, wisent-java-default-setup): Re-generated.
+
+	* wisent/wisent-java-lex.el: Wisent Java Lexical Analyzers.
+
+	* semantic-lex.el (define-lex-block-analyzer): New macro.
+
+	* semantic-load.el (autoload): `define-lex-block-analyzer'.
+
+2002-07-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-flex.el (wisent-lex): New function.
+
+	* semantic-lex.el (with-syntax-table): Moved.
+	(semantic-lex-make-keyword-table, semantic-lex-keyword-p)
+	(semantic-lex-keyword-put, semantic-lex-keyword-get)
+	(semantic-lex-map-keywords, semantic-lex-keywords): New functions.
+	(semantic-lex-analyzer): Default to `semantic-flex'.  buffer-local
+	when set in any fashion.
+	(semantic-lex-depth): Fixed `make-variable-buffer-local'.
+	(define-lex): Use value of `semantic-lex-depth' as the default depth
+	if it is not specified.
+	(semantic-lex-token-class, semantic-lex-token-start)
+	(semantic-lex-token-end, semantic-lex-token-text): New functions.
+	(semantic-lex-symbol-or-keyword): Use `semantic-lex-keyword-p'
+	instead of `semantic-flex-keyword-p'.
+
+	Compatibility with Semantic 1.x API.
+
+	(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): Aliased to
+	their counterparts in 2.x API.
+	(semantic-flex-keywords-obarray, semantic-flex-tokens)
+	(semantic-flex-unterminated-syntax-end-function)
+	(semantic-flex-extensions, semantic-flex-syntax-modifications)
+	(semantic-ignore-comments, semantic-flex-enable-newlines)
+	(semantic-flex-enable-whitespace, semantic-flex-enable-bol)
+	(semantic-number-expression, semantic-flex-depth, semantic-flex)
+	(semantic-flex-buffer, semantic-flex-list): Moved from semantic.el.
+	(semantic-flex-tokens): Default to value of `semantic-lex-tokens'.
+	(semantic-number-expression): Default to value of
+	`semantic-lex-number-expression'.
+
+	* semantic-util.el (semantic-find-doc-snarf-comment):
+	Call `semantic-lex' instead of
+	`semantic-flex'.
+
+	* semantic-edit.el (semantic-rebovinate-token):
+	Call `semantic-lex' instead of
+	`semantic-flex'.
+
+	* semantic-bovine.el:
+	(semantic-lambda, semantic-bovinate-from-nonterminal)
+	(semantic-bovinate-from-nonterminal-full)
+	(semantic-bovinate-region-until-error):  Moved these runtime
+	functions into semantic.el.
+
+	* semantic.el (semantic-version): Updated to 2.0alpha2
+	(require 'semantic-lex): Added.
+	(semantic-flex-start, semantic-flex-end, semantic-flex-text)
+	(semantic-flex-keywords-obarray, 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-tokens)
+	(semantic-flex-unterminated-syntax-end-function)
+	(semantic-flex-extensions, semantic-flex-syntax-modifications)
+	(semantic-ignore-comments, semantic-flex-enable-newlines)
+	(semantic-flex-enable-whitespace, semantic-flex-enable-bol)
+	(semantic-number-expression, semantic-flex-depth, semantic-flex)
+	(semantic-flex-buffer, semantic-flex-list): Moved to semantic-lex.el.
+	(semantic-token-docstring, semantic-bovinate-toplevel): Call
+	`semantic-lex' instead of `semantic-flex'.
+	(semantic-lambda, semantic-bovinate-from-nonterminal)
+	(semantic-bovinate-from-nonterminal-full)
+	(semantic-bovinate-region-until-error): Moved back here from
+	semantic-bovine.el.  Use `semantic-lex' instead of `semantic-flex'.
+
+2002-07-12  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-lex.el:
+	Added missing quote character for the newline symbol in semantic-lex-newline.
+
+2002-07-11  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Implemented new lexer for python using the C version in semantic-c.el as a model.
+
+2002-07-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-new-buffer-fcn):
+	Re-arranged so lex inits first.
+
+	* semantic-util.el (semantic-change-function-mark-dirty, semantic-find-nearby-dirty-tokens):
+	(semantic-set-tokens-dirty-in-region): Moved to `semantic-edit.el'.
+
+	* semantic-lex.el: Added some autoload cookies.
+	(semantic-lex): Fix docstring.  Fix call to variable.
+	(with-syntax-table): Compatibility macro moved from semantic.el.
+
+	* semantic-c.el (semantic-lex-c-if-0, semantic-lex-c-if):
+	semantic-lex-c-include-system): New analyzers
+	(semantic-c-lexer): New lexical analyzer for C.
+	(semantic-default-c-setup): Added define of new lexer.
+
+	* semantic.el (semantic-version): Update to 2.0 status.
+
+	* semantic-load.el: Added default bovinator autoload.
+	Added lex autoloads.
+
+	* semantic-edit.el: The user-editing portion of semantic.el
+
+2002-07-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el (semantic-bovinate-nonterminal, semantic-lex-init):
+	New autoloads.
+
+	* semantic-bovine.el: LL parser from semantic.el.
+
+	* semantic.el (semantic-flex-depth): Moved near flex.
+	(semantic-ignore-comments): Moved flex.
+	(semantic-new-buffer-fcn): Added init for semantic-lex.
+	(semantic-bovinate-nonterminal): Moved to semantic-bovine
+	(semantic-bovinate-nonterminal-default & friends): Moved to semantic-bovine.el
+
+	* semantic-lex.el (semantic-lex-depth): Imported from semantic.el
+	(define-lex-analyzer, define-lex-regex-analyzer)
+	(define-lex-simple-regex-analyzer): Added `eval-and-compile'.
+
+2002-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-lex.el: Flexible lexical analysis.
+
+2002-07-03  David Ponce  <david@dponce.com>
+
+	* semantic-load.el (autoload): `wisent-wy-mode'.
+	(auto-mode-alist): Added '("\\.wy$" . wisent-wy-mode).
+	(speedbar-add-supported-extension): Added ".wy".
+
+	* wisent/wisent.texi: Some fixes from Eric ;-) + additions.
+
+2002-07-02  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-flex.el (wisent-flex-eoi-token): Replaced by...
+	(wisent-flex-eoi): New macro.
+	(wisent-flex): Use it.
+
+2002-07-02  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el:
+	Updated with the latest CVS code to get in sync with the recent semantic/wisent changes.
+
+2002-07-01  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (put_names):
+	Use `wisent-token' to return a valid Semantic raw token.
+	(put_values): Ditto.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+
+2002-06-30  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.wy (setupcode):
+	Removed setup of `wisent-skip-token-hook'.
+
+	* wisent/wisent-java.el, wisent/wisent-java-tags.el (wisent-java-parser-tables):
+	Re-generated.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-tokens): Ditto.
+	(wisent-java-default-setup): Ditto.
+
+	* wisent/wisent-cim.el (wisent-cim-automaton): Re-generated.
+	(wisent-cim-keywords): Ditto.
+	(wisent-cim-tokens): Ditto.
+	(wisent-cim-default-setup): Ditto.
+
+	* wisent/wisent-calc.el (wisent-calc-automaton): Re-generated.
+	(wisent-calc-tokens): Ditto.
+	(wisent-calc-setup-parser): Ditto.
+
+	* wisent/wisent-awk.el (wisent-awk-automaton): Re-generated.
+	(wisent-awk-keywords): Ditto.
+	(wisent-awk-tokens): Ditto.
+	(wisent-awk-setup-parser): Ditto.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-setupcode): Set `wisent-discarding-token-functions' as
+	local hook, to `wisent-collect-unmatched-syntax'.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-nonterminal): Use
+	`wisent-discarding-token-functions' hook instead of calling
+	`wisent-collect-unmatched-syntax'.
+
+	* wisent/wisent.el (wisent-skip-token-hook):
+	To follow conventions from the Emacs Lisp
+	Reference Manual for naming abnormal hooks, renamed to...
+	(wisent-discarding-token-functions): New variable.
+	(wisent-skip-token): Use it.
+	(wisent-skip-block): Ditto.
+	(wisent-parse): Ditto.
+
+	* wisent/wisent.texi: no message
+
+2002-06-29  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (code): Setup `semantic-expand-nonterminal'.
+	(put_names): Return a single token instead of a list of one token.
+	(put_values): Ditto.
+	(rhs): New nonterminal.
+	(rules): Use it.
+	(action_opt): Removed.
+	(elements): Removed.
+	(element): Removed.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-EXPAND): Generate call to
+	`semantic-bovinate-from-nonterminal' instead of
+	`wisent-bovinate-from-nonterminal'.
+	(wisent-wy-EXPANDFULL): Generate call to
+	`semantic-bovinate-from-nonterminal-full' instead of
+	`wisent-bovinate-from-nonterminal-full'.
+	(wisent-wy-setupcode): Generate setup of `semantic-bovinate-parser'
+	and `semantic-bovinate-parser-name' instead of
+	`semantic-bovinate-toplevel-override'.
+
+	* wisent/wisent-java.wy (code): Setup `semantic-expand-nonterminal' and
+	`wisent-skip-token-hook'.
+	(goal): Produce a 'goal raw token.
+	(field_declarations_opt): Ditto.
+	(package_declaration): Use `wisent-cooked-token' to produce a cooked
+	token.
+	(import_declaration): Ditto.
+	(class_declaration): Ditto.
+	(field_declaration): Ditto.
+	(method_declaration): Ditto.
+	(formal_parameter): Ditto.
+	(constructor_declaration): Ditto.
+	(interface_declaration): Ditto.
+	(abstract_method_declaration): Ditto.
+
+	* wisent/wisent-java.el (wisent-java-expand-nonterminal):
+	Moved.  No more needed at compile
+	time.  Expand 'goal tokens too.
+	(wisent-java-parser-tables): Re-generated.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-tokens): Ditto.
+	(wisent-java-default-setup): Ditto.
+
+	* wisent/wisent-java-tags.wy (code):
+	Setup `semantic-expand-nonterminal'.
+	(formal_parameters): Skip RPAREN.
+	(field_declaration): No more call `wisent-java-expand-nonterminal'.
+	It is now handled via the standard `semantic-expand-nonterminal'
+	mechanism.
+
+	* wisent/wisent-java-tags.el (wisent-java-parser-tables): Re-generated.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-default-setup): Ditto.
+	(wisent-java-get-local-variables): Use
+	`semantic-bovinate-from-nonterminal-full' instead of
+	`wisent-bovinate-from-nonterminal-full'.  The working stuff is now
+	handled by the `semantic-get-local-variables' wrapper.
+
+	* wisent/wisent-cim.wy (outputfile): Fixed bad file name.
+
+	* wisent/wisent-cim.el (wisent-cim-automaton): Re-generated.
+	(wisent-cim-keywords): Ditto.
+	(wisent-cim-tokens): Ditto.
+	(wisent-cim-default-setup): Ditto.
+
+	* wisent/wisent-calc.el (wisent-calc-automaton): Re-generated.
+	(wisent-calc-tokens): Ditto.
+	(wisent-calc-setup-parser): Ditto.
+
+	* wisent/wisent-bovine.el (wisent-token):
+	No more setup the 'reparse-symbol property.  Return a
+	single raw token instead of a list of one token.
+	(wisent-cooked-token): New function.
+	(wisent-lexer-wrapper): No more provide working goodies.
+	(wisent-bovinate-nonterminal): Push back the `wisent-lookahead' token
+	into the input stream.  Thus, it no more depends on external
+	initialization of `wisent-lexer-lookahead'.  Return one nonterminal
+	token at a time.  Ensure that unmatched tokens are collected here, not
+	in `semantic-bovinate-nonterminals'.
+	(wisent-bovinate-nonterminals): Removed.
+	(wisent-bovinate-toplevel): Ditto.
+	(wisent-bovinate-toplevel): Ditto.
+	(wisent-bovinate-from-nonterminal-full): Ditto.
+	(wisent-bovinate-region-until-error): Ditto.
+	(semantic-bovinate-toplevel): Advice removed.
+
+	* wisent/wisent-awk.el (wisent-awk-automaton): Re-generated.
+	(wisent-awk-keywords): Ditto.
+	(wisent-awk-tokens): Ditto.
+	(wisent-awk-setup-parser): Ditto.
+
+	* semantic.el (semantic-bovinate-parser): New variable.
+	(semantic-bovinate-parser-name): New variable.
+	(semantic-bovinate-nonterminal): Use it.
+	(semantic-bovinate-nonterminal-default): New function.
+	(semantic-bovination-working-message): New function.
+	(semantic-rebovinate-token): Removed unnecessary reference to
+	'bovine-toplevel nonterminal.
+	(semantic-bovinate-toplevel): Ditto. Use
+	`semantic-bovination-working-message'.
+	(semantic-cooked-token-p): New function.
+	(semantic-raw-to-cooked-token): Use it.
+	(semantic-bovinate-nonterminals): Update the 'reparse-symbol property
+	of cooked tokens.
+
+	* semantic-java.el (semantic-java-get-local-variables):
+	The working stuff is now handled
+	by the `semantic-get-local-variables' wrapper.
+
+	* semantic-ctxt.el (semantic-get-local-variables):
+	Handle working stuff here.  Removed
+	unnecessary call to `semantic-deoverlay-list'.
+	(semantic-get-local-variables-default): The working stuff is now
+	handled by the `semantic-get-local-variables' wrapper.
+
+2002-06-27  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Addition to section "Grammar debugging".
+	New section "Understanding the automaton".
+	Reorganized some chapters.
+
+	* wisent/fdl.texi:
+	Put @node/@appendix inside an @ignore block, so the file can be
+	included safely!  Thanks to Richard Y. Kim <ryk@dspwiz.com> for this
+	tip.
+
+	* wisent/wisent.texi:
+	Grammar style examples are no more separate nodes.
+	Some fixes.
+	New chapter on start nonterminals.
+	Re-included @node/@appendix for GNU Free Documentation License,
+	before including fdl.texi.
+
+2002-06-26  David Ponce  <david@dponce.com>
+
+	* wisent/fdl.texi: Moved @node & @appendix lines from wisent.texi.
+
+	* wisent/wisent.texi:
+	Removed NEXT, PREV, and UP links following @node name as well the
+	following line with @comment.  Thanks to Richard Y. Kim
+	<ryk@dspwiz.com> for the tip!
+
+	* wisent/wisent.texi: More fixes, clarifications and additions.
+
+2002-06-25  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Still more additions!
+
+2002-06-25  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Fixed up the flex handlers to handle "raw strings" delimited by
+	double quotes, single quotes, and triple double quotes.
+
+	With this fix, the first 20 or so files in /usr/lib/python2.2
+	directory can be parsed!
+
+2002-06-24  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: More additions & fixes.
+
+2002-06-24  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Added David's support for "raw strings" via the introduction of the raw-string token.  This needs to be revisited later to see if we can optimize it.
+
+2002-06-23  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: More fixes.
+	Added index entries.
+	Use the GNU Free Documentation License.
+
+	* wisent/fdl.texi:
+	New file.  Text of the GNU Free Documentation License.
+
+2002-06-23  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Added support for \ token which is the explicit line continuation token.
+	This was done by adding BACKSLASH token along with a handler which gets rid
+	of 'newline and 'bol tokens that follow the \ token.
+
+2002-06-22  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Fixes & more text added.
+
+2002-06-22  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Fixed 'lambdef' NT by adding the missing 'varargslist_opt'.
+
+	* tests/test.py:
+	Added the content of /usr/lib/python2.2/BaseHTTPServer.py.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Rather than blindly implementing 'varargslist' NT, I refactored the rules to be cleaner.  With this change, /usr/lib/python2.2/BaseHTTPServer.py now parses successfully.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	Deleted `(read $1)' semantic rule for `one_or_more_string' NT,
+	because it generates an error for single quoted strings!
+
+	* wisent/wisent-python.el:
+	wisent-python-default-setup is added back to python-mode-hook.
+	I tried adding this to semantic-init-hooks, but that does
+	not work.
+
+2002-06-21  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Major update!
+
+2002-06-21  Richard Y. Kim <ryk@ap.com>
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	The lexer must not generate NEWLINE, DEDENT, nor INDENT tokens when a
+	physical line is continued onto the next line.  Such line continuation
+	occurs when (, [, or { appear in a line without matching ), ],
+	and/or } tokens. This is called implicit line continuation in python.
+
+	The implementation relys on wisent's token "handler" feature for
+	'newline', 'open-paren', and 'close-paren' tokens.
+
+	* wisent/wisent-python.el:
+	Pick up changes recently made in wisent-python.wy.
+
+	* wisent/wisent-python.wy:
+	wisent-python-lexer-indent-stack defaults to '(0) rather than nil.
+
+	Reverted 'stmt' NT back to official rule rather than a hack that I had.
+
+	Renamed trailer_opt to trailer_zom then fixed the rule accordingly,
+	i.e., "zero or more" rather than "zero or one". Ditto for exponent_opt
+	NT.
+
+	'argument' NT was modified slightly from the official rule in order to
+	parse function calls with arguments, e.g., f(x).  Need to revisit this
+	later to see why the official rule does not parse 'f(x)'.
+
+	* wisent/wisent-python.wy:
+	Added over 20 new semantic rules to aid in debugging.
+
+	* wisent/wisent-python.wy:
+	Cosmetic indentation change only.  Lined up keywords so that they all start in the same column.
+
+2002-06-19  Richard Y. Kim <ryk@ap.com>
+
+	* tests/test.py: Python code to excersize the parser.
+
+	* wisent/wisent-python.el, wisent/wisent-python.wy:
+	First unfinished version of the Python parser.
+
+2002-06-18  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Use `senator-minor-mode-hook' to add semantic completion to
+	`hippie-expand'.  Thanks to Phillip Lord <p.lord@russet.org.uk>.
+
+	(hippie-expand): Removed `defadvice'.
+	(senator-try-function-already-enabled): New variable.
+	(senator-hippie-expand-hook): New function.
+	(senator-try-expand-semantic): Removed (require 'senator).  Added an
+	autoload cookie.
+
+	* semantic-bnf.el (semantic-bnf-complete): Removed (require 'senator).
+
+	* semantic-load.el (senator-try-expand-semantic): auto-loaded.
+	(senator-complete-symbol): auto-loaded.
+
+2002-06-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el (semantic-elisp-use-read): Support `defun*'.
+
+2002-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp: New tets in include, namespace, and templates.
+
+	* tests/test.c: Various new tests.
+
+	* semantic-util.el (semantic-nonterminal-full-name): New name.
+	(semantic-nonterminal-full-name-default): New name.
+	(semantic-assert-valid-token): New function.
+
+	* semantic.el: Removed crufty History comment.
+	(semantic-flex-tokens): Removed trailing whitespace.
+
+	* semanticdb.el (semanticdb-table-oob-santity-check, semantic-table-sanity-check):
+	(semanticdb-database-santity-check): New functions.
+
+2002-06-13  David Ponce  <david@dponce.com>
+
+	* INSTALL, semantic.texi: Fixed typo.
+
+2002-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf.
+	(semantic-flex-c-extensions): Added `semantic-flex-c-include-system'.
+	(semantic-flex-c-include-system): New fn.
+
+	* c.bnf (macro-or-include): Use new lexical symbol system-include
+	(filename-prefix, filename-extension,filename): Deleted.
+	(namespacesubparts): Added template and using clauses
+	(using): Added :: notation support.
+	(METADECLMOD): Added MUTABLE
+	(func-decl): Added template type specifier
+	(throw-exception-list): Support empty throw lists.
+	(function-call): New rule.
+	(expression): Support function calls in expressions.
+
+2002-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Added mailing list information.
+
+	* semantic.texi (Top): Removed request for parser help.
+	Added mailing list information.
+
+2002-06-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-flex.el (wisent-flex):
+	Fixed incorrect "eating" of `wisent-flex-istream'.
+
+2002-06-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-flex.el (wisent-flex-token-get): Doc fix.
+	(wisent-flex): Doc fix.  New 'handler mapping rule.
+
+	* semantic.texi: no message
+
+2002-05-31  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-flex-tokens): Updated token list.
+	(semantic-flex-enable-bol): New variable.
+	(semantic-flex): Use it to catch beginning of lines when needed.
+	Handle `semantic-flex-extensions' first, just after BOL.
+	Handle newlines and whitespaces independently.
+	Return comments as whitespaces when `semantic-ignore-comments' and
+	`semantic-flex-enable-whitespace' are both non-nil.
+	Correctly handle newlines following comments.
+
+2002-05-16  David Ponce  <david@dponce.com>
+
+	* semantic-util.el (semantic-summarize-nonterminal-default): Use
+	`semantic-symbol->name-assoc-list-for-type-parts' and
+	`semantic-bucketize-token-token'.
+
+2002-05-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-parser-tables):
+	Re-generated from updated grammar.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-tokens): Ditto.
+	(wisent-java-default-setup): Ditto.
+
+	* wisent/wisent-java-tags.wy, wisent/wisent-java.wy (setup):
+	take into account new
+	`semantic-symbol->name-assoc-list-for-type-parts' option.
+
+	* semantic-java.el (semantic-default-java-setup):
+	Re-generated from updated grammar.
+
+	* java.bnf (setup): take into account new
+	`semantic-symbol->name-assoc-list-for-type-parts' option.
+
+2002-05-13  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-bnf.el, semantic.el:
+	Corrected spelling in comments and doc-strings.
+
+	* semantic.texi:
+	Corrected spelling and added "LocalWords" at the end of the file as
+	texinfo comments for the benefit of future ispell runs.
+
+2002-05-09  Richard Y. Kim <ryk@ap.com>
+
+	* semantic-bnf.el:
+	Added (eval-after-load "info-look" ...) form to hook up semantic-bnf-mode with semantic.info file.
+
+	* semantic.texi:
+	Replaced use of "@table...@end table" with "@deffn ... @end deffn" for
+	the BNF settings so that a proper index entry is create for each
+	setting.
+
+2002-05-08  David Ponce  <david@dponce.com>
+
+	* semantic-util.el (semantic-util):
+	provided before requiring semantic-util-modes to
+	avoid recursive load.
+
+2002-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el: Added a provide statement to end.
+
+	* semantic-util.el (semantic-something-to-stream): Fixed typos
+	(semantic-find-nonterminal-by-function-first-match): Fixed typos
+
+	* Project.ede, document.el, make.bnf, semantic-analyze.el, semantic-c.el, semantic-ctxt.el, semantic-el.el, semantic-imenu.el, semantic-load.el, semantic-make.el, semantic-sb.el, semantic-texi.el, semantic.el, semanticdb.el, senator.el, sformat.el, working.el, c.bnf:
+	Merged from v1_4 branch.
+
+	* semantic-util.el: Merged from v1_4 branch.
+	(semantic-something-to-stream): New function.
+	(semantic-find-nonterminal-by-function):
+	(semantic-find-nonterminal-by-function-first-match): Use above.
+	(semantic-nonterminal-full-package-name): New function
+	(semantic-nonterminal-full-package-name-default): New function
+
+2002-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el (semantic-bnf-to-bovine):
+	Remove errant space from last CR insert.
+
+2002-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el (semantic-speedbar-analysis): Doc fix
+
+	* semantic-ia.el (semantic-ia-complete-symbol): Doc fix
+	(semantic-ia-complete-symbol-menu): Doc fix
+
+	* semantic-cb.el (semantic-cb-new-class-browser): Doc fix
+	(semantic-cb-speedbar-mode): Doc fix
+
+	* semantic.texi (analyzer, Smart Completion, Speedbar Analysis, class browser):
+	New sections.
+	(Speedbar): Added references to new speedbar displays in new nodes.
+
+2002-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el (semantic-ia-sb-key-map): Removed expand/contract
+	(semantic-ia-sb-token-info): fix bug w/ use of `semantic-analyze-token-type'.
+	(semantic-ia-sb-tag-info): New command.
+
+	* semantic-ia-sb.el (semantic-ia-sb-more-buttons):
+	Fixed copy/paste bug.
+
+	* semantic-ia-sb.el (semantic-ia-speedbar): Added in current function.
+	Call method to display specialized speedbar buttons for a given
+	context.
+	(semantic-ia-sb-more-buttons): New method.
+	(semantic-ia-sb-token-info): Replace big icky bits with special call
+	to semantic-analyze function I had forgotten about.
+
+2002-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el: Added requirement for eieio-base.
+
+2002-03-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (Token Queries): Added semantic-equivalent-tokens-p.
+
+	* semantic-ia-sb.el (semantic-ia-sb-easymenu-definition):
+	Added some basic entries
+	(semantic-ia-speedbar): Use new speedbar labels.
+	Use completion functions.
+	Use info speedbar icons.
+	(semantic-ia-sb-token-info): New function
+	(semantic-ia-sb-completion-list): New function
+	(semantic-ia-sb-complete): Delete text and insert new more sanely.
+
+	* semantic-cb.el (initialize-instance:semantic-cb-token):
+	New initializer.
+	(semantic-cb-speedbar-mode): Renamed, autoloaded token.
+
+	* NEWS: Updated with some new news.
+
+2002-03-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-cim.el (wisent-cim-automaton):
+	Generated from new grammar in wisent-cim.wy.
+	(wisent-cim-keywords):  Ditto.
+	(wisent-cim-tokens): Ditto.
+	(wisent-cim-default-setup): Ditto.
+
+	* wisent/wisent-cim.wy: Port of Bison's GNU Simula 87 Compiler grammar.
+
+2002-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ia-sb.el: Add some function overrides for our Analyze mode.
+	(semantic-ia-speedbar): Fix typo.
+	Add functions to our buttons to jump to those tags.
+	(semantic-ia-sb-line-path): New function.
+	(semantic-ia-sb-complete): New function.
+
+	* semantic-ia-sb.el:
+	Speedbar mode for displaying context sensitive information.
+
+2002-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-cb.el: Create a class browser structure.
+	Primitive speedbar hack on the structure.
+
+2002-03-03  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (rule):
+	New rules allowing mid-rule actions anywhere.
+	(element): Ditto.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-nonterminals): Take into account new format of 'rule token.
+
+2002-02-28  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy: More comments ;-)
+	(setupfunction_decl): Use any_symbol instead of SYMBOL.
+	(keywordtable_decl): Ditto.
+	(parsetable_decl): Ditto.
+	(tokentable_decl): Ditto.
+	(token_decl): Ditto.
+	(token_type): Ditto.
+	(start_decl): Ditto.
+	(put_decl): Ditto.
+	(put_names): Ditto.
+	(put_value): Ditto.
+	(any_value): Ditto.
+	(lifo_symbols): Ditto.
+	(nonterminal): Ditto.
+	(item): Ditto.
+	(any_symbol): New rule to allow use of reserved words anywhere.
+	(left_decl): Added token_type_opt to allow <type> in declaration.
+	(right_decl): Ditto.
+	(nonassoc_decl): Ditto.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-tokens): Process <type> in %left, %right and %nonassoc
+	declarations.
+	(wisent-wy-mode-keywords-1): Fixed highlighting of '$' between quotes.
+	(wisent-wy-goto-grammar-indent-anchor): Fixed skipping of C-like char
+	expressions.
+	(wisent-wy-grammar-compute-indentation): No more switch syntax table.
+
+	* wisent/wisent-comp.el (wisent-context-name): New messages format.
+	(wisent-append-to-log-file): Ditto.
+	(wisent-reduce-grammar): Ditto.
+	(wisent-map-goto): Ditto.
+	(wisent-add-lookback-edge): Ditto.
+	(wisent-push-token): Ditto.
+	(wisent-push-var): Ditto.
+	(wisent-parse-nonterminals): Ditto.  Doc string.  Produce a list of
+	rules consistent with Bison's internal format.
+	(wisent-parse-grammar): New messages format.  Use new form of the rule
+	list produced by `wisent-parse-nonterminals'.
+
+	* wisent/wisent-awk.el (wisent-awk-parser-tables):
+	Renamed to `wisent-awk-automaton'.
+	Generated from wisent-awk.wy.
+	(wisent-awk-keywords): Re-generated from wisent-awk.wy.
+	(wisent-awk-tokens): Ditto.
+	(wisent-awk-default-setup): Renamed to `wisent-awk-setup-parser'.
+	Generated from wisent-awk.wy.
+
+	* wisent/wisent-awk.wy: GNU AWK grammar to torture Wisent.
+
+2002-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added semantic-example.el
+
+	* semantic.texi (Example Programs): New section.
+
+	* semantic-example.el: Examples for basic semantic API calls.
+
+2002-02-27  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy (setupcode):
+	Use `semantic-flex-extensions( to handle C-like
+	character literals.  Use `font-lock-type-face' instead of
+	`font-lock-constant-face' in `semantic-face-alist'.
+	(CHARACTER): New token.
+	(left_decl): Use 'items' instead of 'symbols'.  New Semantic token
+	format.
+	(right_decl): Ditto.
+	(nonassoc_decl): Ditto.
+	(level): Use 'item' instead of 'SYMBOL'.
+	(element): Ditto.
+	(items): New nonterminal.
+	(lifo_items): New nonterminal.
+	(item): New nonterminal.  Handle C-like character literal.
+
+	* wisent/wisent-wy.el (wisent-wy-c-char-re): New constant.
+	(wisent-wy-flex-extensions): New constant.
+	(wisent-wy-flex-char): New function.
+	(wisent-wy-automaton): Re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-item-value): New function.
+	(wisent-wy-nonterminals): Use it.
+	(wisent-wy-left): Removed.
+	(wisent-wy-right): Removed.
+	(wisent-wy-nonassoc): Removed.
+	(wisent-wy-assocs): New function.
+	(wisent-wy-grammar): Use it.
+	(wisent-wy-elisp-syntax-table): Removed.
+	(wisent-wy-mode-keywords-1): Highlight %keywords with
+	`font-lock-keyword-face'.  Highlight C-like char literals.
+	(wisent-wy-grammar-compute-indentation): Take into account C-like char
+	literals.
+	(wisent-wy-do-lisp-indent): Use copy of
+	`emacs-lisp-mode-syntax-table' instead of
+	`wisent-wy-elisp-syntax-table'.
+
+	* wisent/wisent-flex.el (wisent-flex-put-default): New function.
+	(wisent-flex-make-token-table): Initialize obarray with 0 instead of
+	nil.  Set up default value of new 'char-literal property.
+	(wisent-flex): Return character value as category of default token if
+	'char-literal property is non-nil.
+
+	* wisent/wisent-comp.el (compile-grammar): Added `ptable' to context.
+	(wisent-escape-sequence-tags): New constant.
+	(wisent-tag): New function.
+	(wisent-put): New function.
+	(wisent-get): New function.
+	(wisent-item-number): Moved. Use `wisent-get'.
+	(wisent-assoc): Ditto.
+	(wisent-prec): Ditto.
+	(wisent-set-item-number): Moved. Use `wisent-put'.
+	(wisent-set-assoc): Ditto.
+	(wisent-set-prec): Ditto.
+	(wisent-reduce-grammar): Use `wisent-tag'.
+	(wisent-print-useless): Ditto.
+	(wisent-print-nullable): Ditto.
+	(wisent-print-fderives): Ditto.
+	(wisent-print-firsts): Ditto.
+	(wisent-log-resolution): Ditto.
+	(wisent-print-grammar): Ditto.
+	(wisent-print-reductions): Ditto.
+	(wisent-print-actions): Ditto.
+	(wisent-print-core): Ditto.
+	(wisent-resolve-sr-conflict): Pass item number to
+	`wisent-log-resolution', instead of symbol.
+	(wisent-ISVALID): Removed.
+	(wisent-ISVALID-VAR): New function.
+	(wisent-push-var): Use it.
+	(wisent-ISVALID-TOKEN): New function.
+	(wisent-push-token): Use it.
+	(wisent-parse-nonterminals): Put symbol between `' in message.  Create
+	new literal character tokens when referenced the first time.
+	(wisent-parse-grammar): Put symbol between `' in messages.
+
+	* wisent/wisent-calc.wy: Use C-like character literals :-)
+
+	* wisent/wisent-calc.el (wisent-calc-automaton): Re-generated.
+	(wisent-calc-tokens): Ditto.
+	(wisent-calc-setup-parser): Ditto.
+
+2002-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Project.ede: Added templates.cpp
+
+	* tests/templates.cpp: Template examples.
+
+	* tests/test.cpp: Added body to fn for testing smart completion.
+
+	* tests/test.make: Added some harsher test cases.
+
+	* Project.ede: Updated version number.
+	Added semantic-ia.el.
+
+	* semantic-ia.el: Interactive access to analysis functions.
+
+2002-02-26  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.el (wisent-wy-tokens):
+	Use a default symbol name for tokens without type.
+	(wisent-wy-mode): Set `font-lock-multiline' to 'undecided, to handle
+	multiline patterns when encountered.
+	(wisent-wy-goto-grammar-indent-anchor): Don't stop at % anchor when
+	it is the first character of %prec keyword (inside rule).
+	(wisent-wy-between-name-and-colon-p): New function.
+	(wisent-wy-grammar-compute-indentation): Use it.
+
+	* wisent/wisent-wy.wy: Removed defaults from setup code.
+	(%tokentable): New definition.
+	(%tokens): Modified <type> for use by `wisent-flex' lexer.
+	(token_decl): New format.
+	(rule): Use 'level' instead of 'prec' which is a reserved keyword.
+	(prec): Renamed to 'level'.
+
+	* wisent/wisent-wy.el (wisent-wy-automaton): WY grammar re-generated.
+	(wisent-wy-keywords): Ditto.
+	(wisent-wy-setup-semantic): Ditto.
+	(wisent-wy-tokens): New constant.
+	(wisent-wy-lex): Removed.
+	(wisent-wy-setupcode): Added missing default setup.
+	(wisent-wy-keywords): Change in semantic token's format.
+	(wisent-wy-tokens): Ditto.
+	(wisent-wy-token-properties): New function.
+	(wisent-wy-terminals): Keep order of declarations.
+	(wisent-wy-keyword-properties): Allow duplicates lexical symbols.
+	(wisent-wy-tokentable-value): Generate call to
+	`wisent-flex-make-token-table'.
+	(wisent-wy-update-setupfunction): Fixed format arguments.
+	(wisent-wy-mode-keywords-1): Minor improvements.
+
+	* wisent/wisent-java.el (wisent-java-parser-tables):
+	Generated from wisent-java.wy.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-tokens): Ditto.
+	(wisent-java-default-setup): Ditto. Moved.
+	(wisent-java-lex): Removed.
+
+	* wisent/wisent-java-tags.el (wisent-java-parser-tables):
+	Generated from wisent-java-tags.wy.
+	(wisent-java-keywords): Ditto.
+	(wisent-java-tokens): Ditto.
+	(wisent-java-default-setup): Ditto.
+	(wisent-java-lex): Removed.
+
+	* wisent/wisent-comp.el (wisent-push-token):
+	Only warns on duplicate terminal symbols.  Put
+	symbol between `' in messages.
+	(wisent-push-var): Put symbol between `' in messages.
+
+	* wisent/wisent-calc.el (wisent-calc-parser-tables):
+	Renamed to `wisent-calc-automaton'.
+	Generated from wisent-calc.wy.
+	(wisent-calc-keywords): Removed.
+	(wisent-calc-tokens): Generated from wisent-calc.wy.
+	(wisent-calc-default-setup): Renamed to
+	`wisent-calc-setup-parser'. Generated from wisent-calc.wy.
+	(wisent-calc-number-regexp): Removed.
+	(wisent-calc-lexer-input-stream): Removed.
+	(wisent-calc-lexer): Removed.
+	(wisent-calc): Use `wisent-flex' via a temporary buffer.
+
+	* wisent/wisent-bovine.el: (require 'wisent-flex)
+	(semantic-flex-token-value): Removed.
+	(semantic-flex-token-key): Removed.
+	(wisent-collect-unmatched-syntax): Moved.
+	(wisent-lexer-function): Moved.
+	(wisent-flex-istream): Moved into wisent-flex.el.
+	(wisent-flex-depth): Removed.
+	(wisent-rebovinate-token): Mo more use it.
+	(wisent-bovinate-toplevel): Ditto.
+
+	* wisent/wisent-java.wy: Java LALR grammar.
+
+	* wisent/wisent-java-tags.wy:
+	Java LALR grammar optimized for Semantic environment.
+
+	* wisent/wisent-flex.el:
+	Lexical analyser for use by Wisent's parser in Semantic environment.
+
+	* wisent/wisent-calc.wy:
+	LALR grammar of the infix notation calculator sample.
+
+2002-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* plan.txt: Plan.
+
+2002-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (Nonterminal sorting): New section.
+
+2002-02-23  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-wy.wy: LALR grammar of Wisent's input grammar.
+
+	* wisent/wisent-wy.el:
+	Major mode for editing Wisent's input grammar (.wy) files.
+
+	* working.el (noninteractive):
+	Define it to avoid byte-compiler warnings.
+	(working-current-message): New function.
+	(working-status-forms): Restore current message when it exits.
+	(working-status-timeout): Ditto.
+
+2002-02-20  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-token):
+	Always provide token location.
+	(wisent-bovinate-nonterminal): Made more robust.
+
+	* wisent/wisent-comp.el (wisent-parse-nonterminals):
+	Accept nil as a mid-rule action.
+	Fixed bad synchronization of RULES, RCODE & RPREC lists.
+
+2002-02-16  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-check-$N): New function.
+	(wisent-semantic-action-expand-body): Use it.
+
+	(wisent-semantic-action): Handle mid-rule actions.
+	(wisent-semantic-actions): Doc string.
+
+	(wisent-default-semantic-action-body): Removed.
+	(wisent-reserved-capitals): New constant.
+	(wisent-ISVALID): Use it. Moved.
+
+	(wisent-parse-nonterminal): Removed.
+	(wisent-parse-nonterminals): New function.  Handle mid-rule actions.
+	(wisent-parse-grammar): Use it.
+
+2002-02-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-set-conflicts):
+	 Implementation consistent with Bison 1.33.
+
+	* semantic-bnf.el (semantic-bnf-matching-to-lalr):
+	Don't discard %prec clause in EMPTY rules.
+
+2002-02-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-print-useless):
+	 Didn't print correct nonterminals.  Minor
+	improvement.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-nonterminal):
+	Removed LEXER and ERROR arguments.
+	(wisent-bovinate-nonterminals): Updated call to above.
+	(wisent-rebovinate-token): Ditto.
+
+2002-02-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (compile-grammar):
+	Added `ruseful' and `rcode' variables to context.
+	Removed `rule-table'.
+
+	(wisent-reduce-grammar-tables): New function.
+	(wisent-nonterminals-reduce): New function.
+	(wisent-reduce-grammar): Call them.
+
+	(wisent-set-derives): Ignore useless rules.
+	(wisent-set-nullable): Ditto.
+
+	(wisent-allocate-itemsets): Allocate room for all the symbols.
+
+	(wisent-print-grammar): Don't print useless rules.  No more use
+	`rule-table'.  'error' token was not in cross reference.
+
+	(wisent-semantic-action): No more use `rule-table'.  Take into account
+	useless rules.  Directly byte-compile function.
+
+	(wisent-byte-compile-semantic-actions): Removed.
+	(wisent-semantic-actions): No more use `rule-table'.
+
+	(wisent-parse-nonterminal): Directly count items and rules.  Collect
+	semantic action bodies in a separate vector.
+
+	(wisent-grammar-production-lhs): Removed.
+	(wisent-grammar-rule-rhs): Removed.
+	(wisent-grammar-production: Removed.
+
+	(wisent-parse-grammar): Follow changes in `wisent-parse-nonterminal'.
+
+2002-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version update.
+	Add speedbar to path.
+
+2002-02-08  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.el (wisent-java-parser-tables):
+	Re-generated from BNF.
+
+	* wisent/wisent-java-tags.bnf (operator): Added missing XOR operator.
+
+	* wisent/wisent-cim.bnf, wisent/wisent-cim.el: Comments.
+
+	* wisent/wisent.texi: no message
+
+	* wisent/wisent.el (wisent-parse): Doc string.
+
+	* wisent/wisent-comp.el (wisent-append-to-log-file):
+	Check that the log buffer is not empty.
+	(compile-grammar): Updated context.
+
+	(wisent-bits-equal): New function.
+	(wisent-nbits): New function.
+	(wisent-bits-size): New function.
+	(wisent-useful-production): New function.
+	(wisent-useless-nonterminals): New function.
+	(wisent-inaccessable-symbols): New function.
+	(wisent-total-useless): New function.
+	(wisent-reduce-grammar): New function.
+	(wisent-print-useless): New function.
+
+	(wisent-log-resolution): Log things if verbose or debug flag set.
+	(wisent-resolve-sr-conflict): Handle item numbers in `rprec'.
+	(wisent-set-conflicts): No more use `any_conflicts'.
+	(wisent-resolve-conflicts): Ditto.
+	(wisent-print-conflicts): Print details if verbose or debug flag set.
+	(wisent-print-results): Ditto.  Also report useless things.
+	(wisent-print-states): New function.
+	(wisent-print-grammar): Print where tokens & nonterminals are used.
+
+	(wisent-parser-automaton): Check for useless stuff.  Doc string.
+	(wisent-parse-grammar): Set `rprec' with item numbers.
+	(wisent-parse-nonterminal): Ditto.  Check level of %prec token.
+	(wisent-compile-grammar): Doc string and comments.
+
+2002-02-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.el, wisent/wisent-java.el (wisent-java-parser-tables):
+	BNF updated.
+
+	* wisent/wisent-java-tags.bnf, wisent/wisent-java.bnf:
+	Added required definition of the default start symbol.
+
+	* wisent/wisent.el (wisent-parse-start):
+	Handle single start symbol like Bison.
+
+	* wisent/wisent-comp.el (wisent-item-number): Moved.
+	(wisent-set-item-number): New function.
+	(wisent-assoc): New function.
+	(wisent-set-assoc): New function.
+	(wisent-prec): New function.
+	(wisent-set-prec): New function.
+
+	(wisent-resolve-sr-conflict): Use above functions.
+	(wisent-parse-nonterminal): Ditto.
+
+	(wisent-count-rr-conflicts): Fixed misplaced close parenthesis.
+	(wisent-print-conflicts): Removed bad extra argument.
+	(wisent-print-reductions): Fixed some nasty bugs.
+
+	(item-numbers [defcontext]): Removed.
+	(wisent-set-token-item-number): Removed.
+	(wisent-set-var-item-number): Removed.
+	(wisent-clear-properties): Removed.
+
+	(wisent-no-xstarts-flag): Renamed to
+	(wisent-single-start-flag): New variable.
+
+	(wisent-push-token): New function.  Push a new symbol in the list of
+	tokens.
+	(wisent-push-var): New function.  Push a new symbol in the list of
+	nonterminals.
+
+	(wisent-parse-grammar): Code improvement & Bison compatibility
+	changes.  No more require to declare tokens used in associativity &
+	precedence rules.  Handle single start symbol like Bison.
+
+	(wisent-compile-grammar): Doc string updated.
+
+	* wisent/wisent-cim.el: Elisp code associated to wisent-cim.bnf.
+
+	* wisent/wisent-cim.bnf:
+	New torture test!  From the GNU Simula 87 Compiler grammar found in
+	Bison 1.32 tests/torture.at.
+
+2002-02-06  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-clear-item-number): Removed.
+	(wisent-set-item-numbers): Removed.  Code moved into
+	`wisent-parse-grammar'.
+
+	(wisent-clear-properties): New function.  Clear all Wisent's symbol
+	properties.
+
+	(wisent-parse-grammar): Redesigned so setting precedence level and
+	associativity of built-in token `error' now works.
+
+2002-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.c: Added bit fields.
+
+	* semantic-util.el (semantic-token-add-extra-spec):
+	Removed unused local variable esl
+	(semantic-token->text-functions): Renamed
+	`semantic-emacs-lisp-nonterminal' to
+	(semantic-prin1-nonterminal): Renamed.
+
+	* semantic-util.el (semantic-token-extra-specs): New fcn
+	(semantic-token-add-extra-spec): New fcn
+	(semantic-token->text-functions): Added `semantic-emacs-lisp-nonterminal'.
+	(semantic-emacs-lisp-nonterminal): New fcn
+
+	* semantic.el (semantic-bovinate-show):
+	Added ?a for abort.  Quit now exits properly.
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf 1.57
+	(semantic-c-reconstitute-template): New fcn
+	(semantic-c-keyword-table): Removed extra TEMPLATE token.
+	(semantic-c-nonterminal-template, semantic-c-nonterminal-template-specifier)
+	(semantic-c-template-string-body, semantic-c-template-string)
+	(semantic-c-concise-prototype-nonterminal): New functions
+	(semantic-default-c-setup): Add `concise-prototype-nonterminal' override.
+
+	* c.bnf (typesimple): Add template specifiers to the extra spec
+	(opt-template-equal): Use template-specifier-type, not the list.
+	(template-type): Concat in the type.  Indentation.
+	(opt-bits): Use new number terminal.
+
+2002-02-05  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Following Eric's patch ;-)
+
+	* wisent/wisent.texi: Applied Eric's patch.
+
+2002-02-04  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-print-grammar):
+	The last rule was not printed.
+
+	(wisent-no-xstarts-flag): New flag.  Non-nil means disable extra start
+	symbols.  That is don't add extra start rules to the grammar.  This is
+	useful to compare the Wisent's generated automaton with the Bison's
+	one.
+
+	(wisent-parse-grammar): Don't add extra start rules to the grammar if
+	`wisent-no-xstarts-flag' is non-nil.
+
+	* wisent/wisent-awk.el: Typo in the one-line summary.
+
+	* wisent/wisent.el (wisent-parse):
+	Made ERROR reporting function optional.  Defaults to
+	standard function `error'.
+
+	* wisent/wisent.texi: Synchronized with latest code changes.
+
+	(Writing a Lexer, Report errors): New nodes.
+
+2002-02-02  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-comp.el (wisent-total-conflicts):
+	No warning when there is no conflict!
+
+2002-02-01  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el:
+	New major version rewrote from scratch based on Bison's 1.28 & 1.31 C
+	sources.  The parser generator in now auto-loaded from file
+	wisent-comp.el.
+
+	* wisent/wisent-awk.el: GNU AWK grammar Elisp code.
+
+	* wisent/wisent-awk.bnf: GNU AWK grammar to torture Wisent.
+
+	* wisent/wisent-comp.el:
+	New implementation of the parser generator based on Bison's 1.28 &
+	1.31 C sources.
+
+2002-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* c.bnf (TEMPLATE): Removed duplicate definition.
+	(opt-symbol): New rule
+	(classsubparts): Use opt-symbol to help QT slot definition thingies.
+	(opt-class-parents): Added optional template specifier
+	(opt-class-protection): New rule
+	(class-protection): Removed `EMPTY'
+	(namespacesubparts): Use opt-class-protection
+	(typesimple): Added template specifier.  Added bodyless class/struct.
+	(template): Reconstitute the template definition.
+	(template-specifier, tempalate-specifier-type-list):
+	(template-var, opt-template-specifier, template-type): Update to
+	return something useful.
+
+	* semantic-bnf.el (semantic-bnf-generate-and-load):
+	Bind `inhibit-modification-hooks'.
+
+2002-01-16  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-pack-grammar):
+	Correctly compute the default precedence level
+	of rule.  That is the precedence level of the last terminal in it.
+
+	(wisent-add-action): Fixed default resolution of shift/reduce
+	conflicts.
+
+2002-01-15  David Ponce  <david@dponce.com>
+
+	* semantic-bnf.el (semantic-bnf-to-lalr-EXPANDTHING):
+	No more bind `$regionI'
+	variables.  Use existing ones instead.
+
+2002-01-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.el (wisent-java-parser-tables): Regenerated.
+
+	* wisent/wisent.texi (@defun wisent-compile-grammar):
+	Removed optional argument STREAM.
+	Doc fixes.
+	(@defun wisent-parse): Doc fixes.
+
+	* wisent/wisent.el:
+	Moved doc from header comments into file wisent.texi.
+
+	(wisent-reduce-action): Explicitly bind `$regionI' variables.
+
+	(wisent-build-tables): Removed optional argument STREAM.
+	(wisent-process-grammar): Ditto.
+	(wisent-compile-grammar): Ditto.
+
+	(wisent-process-grammar, wisent-compile-grammar, wisent-nerrs,
+	wisent-lookahead, wisent-errok, wisent-clearin, wisent-parse): Updated
+	doc string.
+
+2002-01-08  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.texi: Initial revision.
+
+2001-12-19  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el: Synchronized with semantic.el.
+
+	(wisent-collect-unmatched-syntax): Moved.
+
+	(wisent-bovinate-nonterminals): Call `wisent-collect-unmatched-syntax'
+	via `wisent-skip-token-hook'.
+
+	(wisent-bovinate-from-nonterminal-full):  Moved. Doc string fixes.
+	(wisent-bovinate-region-until-error): Ditto.
+
+	(wisent-bovinate-toplevel): Synchronized with latest
+	`semantic-bovinate-toplevel' code.
+
+2001-12-18  Richard Y. Kim <ryk@ap.com>
+
+	* semantic.el:
+	Created semantic-flex-tokens variable to document the token types returend by semantic-flex.
+
+2001-12-18  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el, wisent/wisent-java-tags.el (wisent-java-parser-tables):
+	BNF recompiled.
+
+	* wisent/wisent-java.bnf (goal):
+	`wisent-bovinate-toplevel' requires to return result reversed.
+	(formal_parameter_modifier_opt): new nonterminal.
+	(formal_parameter): Use it.
+
+	* wisent/wisent-java-tags.bnf: More comments.
+	Reordered rules plus small fixes.
+
+	* wisent/wisent.el (Commentary): Fixed STARTS definition.
+
+2001-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp: Added templates.
+	Added const * const example.
+
+	* semantic.el (semantic-bovinate-toplevel):
+	When doing a full reparse, lex the
+	buffer before clearing the cache.  If an error occurs, the cache will
+	be safe.
+
+	* semantic-c.el: New c.bnf supporting templates.
+	(semantic-c-nonterminal-protection): If type type of a type is
+	unknown in a parent, specify an unknown protection.
+
+	* c.bnf (TEMPLATE): New token
+	(declaration): Added template
+	(template, template-specifier, template-specifier-type-list,
+	 template-var, opt-template-equal, template-type,
+	 template-definition): New rules
+	(typeformbase): Added tempalte specified type and class :: types.
+
+	* semantic-make.el: New make.bnf
+
+	* make.bnf: Removed parens and $ from symbol syntax types.
+	Added IFEQ and IFNEQ tokens
+	Added BACKSLASH and DOLLAR tokens
+	Added IFEQ and IFNEQ rule matches
+	Added $(VAR) types to expression.
+	Support backslash terminated lines for variables.
+
+2001-12-15  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java-tags.bnf, wisent/wisent-java-tags.el: New file.
+
+	* wisent/wisent.el (wisent-lookahead):
+	New variable.  Hold the lookahead lexical token
+	after parse error.
+	(wisent-parse): Use the above.
+
+	* wisent/wisent-bovine.el (wisent-lexer-lookahead): New variable.
+	(wisent-lexer-wrapper): Use the above to push the lookahead
+	token back in the lexical input stream.
+
+	(wisent-unmatched-syntax): New variable.
+	(wisent-collect-unmatched-syntax): Use the above.
+	(wisent-bovinate-nonterminals):  Push unmatched lookahead tokens in
+	the unmatched syntax stream.  Minor performance enhancement.
+
+	(wisent-bovinate-from-nonterminal-full):  Use 1 as default depth for
+	`semantic-flex'.  Reverse the result list.
+
+	(wisent-bovinate-region-until-error): Reverse the result list.
+
+	(wisent-bovinate-toplevel): [full parse] Don't clear the unmatched
+	cache after parsing!  Reverse the result list.
+
+	* semantic-bnf.el (semantic-bnf-to-lalr-EXPANDTHING):
+	Fixed missing quote.
+
+2001-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.make: New test for makefile things.
+
+2001-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Small language changes to doc strings suggested by Alex Schroeder <alex@gnu.org>
+
+	* semantic.texi:
+	Small language changes suggested by Alex Schroeder <alex@gnu.org>
+
+2001-12-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-auto-parse-bovinate): Use
+	`semantic-flex-unterminated-syntax-end-function' instead of
+	`semantic-flex-unterminated-syntax-throw-symbol' to throw lexical issues.
+
+	* semantic.el (semantic-flex-unterminated-syntax-end-function):
+	New variable
+	(semantic-flex): Use above var instead of old throw variable.
+
+2001-12-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-bovinate-toplevel): Check if
+	`semantic-before-toplevel-bovination-hook' allow to parse.
+	When doing a full re-parse clear the cache just before setting the new
+	one.  This way, if an error occurs, we can capture it, and leave the
+	old state behind.
+
+	* senator.el (senator-mode-menu-item-format):
+	New option.  Format of menu item
+	labels in the "Modes" menu when displaying through a window system.
+
+	(senator-mode-menu-item-format-tty): New option.  Format of menu item
+	labels in the "Modes" menu when using a text-only terminal.
+
+	(senator-build-mode-menu-items): Use the above options.  On window
+	system minor mode labels as now simple text items.  Emacs displays
+	them as menu titles in bold face.
+
+2001-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table, semantic-c-keyword-table):
+	New c.bnf
+	(semantic-c-reconstitute-token): For functions, add methodconst, and pure-virtual
+
+	* c.bnf (UNDERP, UNDERUNDERP): Fix typo in summary
+	(opt-stars): Add opt-starmod
+	(opt-starmod, STARMOD): New rule
+	(func-decl): Un-splic $7 in  match2
+	(variablearg): Let varname handle stars and refs.
+	(arg-list): Explicit (void) match added
+	(fun-or-proto-end): Add pure-virtual case return.
+
+	* Project.ede: Update version
+
+	* semantic-make.el: New make.bnf
+
+	* make.bnf: Added ifdef, and ifndef tokens.  (Oy)
+
+	* make.bnf: Added ifdef, and ifndef commands.
+
+	* semantic.el (semantic-before-toplevel-bovination-hook):
+	New hook suggested by Klaus Berndl.
+	(semantic-bovinate-toplevel): Do not parse anything if above hook returns nil.
+	When a full reparse is needed, do not clear the cache till after the
+	parse has happened, and everything was successful.
+
+2001-12-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf
+	(semantic-c-nonterminal-children): New override fcn
+	(semantic-default-c-setup): Add above override.
+
+	* c.bnf (extern-c): Add quotes to the "C" string regex.
+
+	* semanticdb.el (semanticdb-default-save-directory): New variable.
+	(semanticdb-project-database): Added `reference-directory' slot.
+	(semanticdb-create-database): Simplified if to existence of the found DB
+	(semantic-get-database): Use `semantic-file-loaded-p'
+	(semantic-file-loaded-p): Moved.  Use eieio call.
+	(semanticdb-file-table): Tables use file name w/out path.
+	(semanticdb-full-filename): Tables use file name w/out path.
+	(semanticdb-write-directory-p): Use new reference directory for tables.
+	(semanticdb-cache-filename): New function to calc filename of a DB.
+	(semanticdb-semantic-init-hook-fcn): use above Fcn for directory name.
+	Always set the reference directory slot in the DB.
+	Specify the file of new tables as the file name sans directory.
+
+	* semantic-util-modes.el (semantic-auto-parse-bovinate):
+	Enable syntax error `throw'ing.  Catch
+	those errors, and do not pester the user who is probably in the
+	middle of thinking important thoughts, and is uninterested in having
+	Emacs complain about such things.
+
+	* semantic.el (semantic-flex-unterminated-syntax-throw-symbol):
+	New variable
+	(semantic-flex): `throw' an error for incomplete syntax when above is non-nil.
+
+	* working.el (working-message):
+	Only display a canned message for the first entry.
+	(working-status-forms): Clear mode line when using modeline mode.
+	(working-status-timeout): Clear mode line when using modeline mode.
+
+2001-12-03  David Ponce  <david@dponce.com>
+
+	* semantic-util-modes.el (semantic-auto-parse-timer):
+	Moved before first use.
+	(semantic-auto-parse-idle-time): Added `:set' clause to re-setup the
+	`semantic-auto-parse-timer' when the idle time value is changed.
+
+2001-12-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Updated version to 1.4 beta 13
+
+2001-11-30  David Ponce  <david@dponce.com>
+
+	* working.el (append global-mode-string):
+	Quoted `working-mode-line-message'.
+
+2001-11-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (global-semantic-show-dirty-mode): Doc fix.
+	(semantic-show-dirty-mode-setup): Doc fix.
+	Use `semantic-make-local-hook' alias.
+	(global-semantic-show-unmatched-syntax-mode): Doc fix
+	(semantic-show-unmatched-syntax-mode-setup):
+	Use `semantic-make-local-hook' alias.
+	(semantic-auto-parse-working-in-modeline-flag): New variable
+	(global-semantic-auto-parse-mode): Doc Fix
+	(semantic-auto-parse-bovinate): Doc fix.
+	Use the mode-line to display working messages when auto-parsing.
+	(semantic-auto-parse-mode-setup): Doc Fix
+	(semantic-auto-parse-mode): Doc Fix
+	(global-semantic-summary-mode): Doc Fix
+	(semantic-summary-mode-setup): Doc Fix
+	(semantic-summary-mode): Doc Fix
+
+	* working.el (working-message):
+	Added sit-for to help force modeline updates.
+
+	* semantic-c.el: New c.bnf fix for include filename.
+
+	* c.bnf (filename): Fixed OLE to get the string from filename prefix.
+
+	* working.el:
+	If `global-mode-string' is available, use it as the location to
+	display mode-line based working messages.
+
+	* senator.el (senator-minor-mode-setup):
+	Use `semantic-make-local-hook' alias.
+
+	* semantic-imenu.el (semantic-create-imenu-index):
+	Use `semantic-make-local-hook' alias.
+
+	* semantic.el (semantic-make-local-hook): New alias
+	(semantic-set-toplevel-bovine-cache): Use this alias.
+
+	* semantic-util-modes.el (semantic-auto-parse-bovinate):
+	Enable quiting during a parse.
+
+	* semantic-load.el: Add .bnf as a speedbar extension.
+	New variable `semantic-load-turn-useful-things-on'.
+	Consider which-func to be non-useful.
+	Consider show-dirty-mode non-useful.
+	Do not load semantic-sb for speedbar.  This already happens.
+
+	* semantic-util.el (semantic-bucketize):
+	Remove ref to speedbar in doc string.
+
+	* semanticdb.el (semanticdb-semantic-init-hook-fcn):
+	When a table isn't valid, do not
+	force a parse.  This will happen in time.
+
+	* semantic-bnf.el:
+	Changed how speedbar support for BNF files were added.
+
+	* semantic-c.el: New c.bnf supporting float.h.
+
+	* c.bnf:
+	Added support for float.h, where `float' was snagged as a keyword.
+
+2001-11-26  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-flex):  Handle broken strings.
+
+	* senator.el (senator-minor-mode-name):
+	Defined as constant.  Moved just before it
+	is first used.
+	(senator-minor-mode-isearch-suffix): Ditto.
+
+	(senator-minor-mode-on-hook): Removed.
+	(senator-minor-mode-off-hook): Removed.
+	(senator-minor-mode): Don't run on/off mode hooks.
+
+	(senator-register-mode-menu-entry["Summaries"]): Added.
+	(senator-register-mode-menu-entry"[Which Function"]): Added when
+	'which-func feature is available.
+
+	* semantic-util-modes.el (semantic-propertize):
+	New function.  Return a copy of STRING with
+	text properties added.
+
+	(semantic-mode-line-prefix): New option.  Prefix added to minor mode
+	indicators in the mode line.  The default value use
+	`semantic-propertize' to have this string displayed in 'bold face on
+	Emacs 21 :-)
+
+	(semantic-mode-line-update): Skip empty strings.  Use
+	`semantic-mode-line-prefix'.
+
+	(semantic-show-dirty-mode-on-hook): Removed.
+	(semantic-show-dirty-mode-off-hook): Removed.
+	(semantic-show-dirty-mode): Don't run on/off mode hooks.
+
+	(semantic-show-unmatched-syntax-mode-on-hook): Removed.
+	(semantic-show-unmatched-syntax-mode-off-hook): Removed.
+	(semantic-show-unmatched-syntax-mode): Don't run on/off mode hooks.
+
+	(semantic-auto-parse-mode-on-hook): Removed.
+	(semantic-auto-parse-mode-off-hook): Removed.
+	(semantic-auto-parse-mode): Don't run on/off mode hooks.
+
+	(global-semantic-summary-mode): New function.  Toggle global use of
+	`semantic-summary-mode'.
+	(global-semantic-summary-mode): New variable.  If non-nil enable
+	global use of summary mode.
+	(semantic-summary-mode-hook): New hook.  Run at the end of function
+	`semantic-summary-mode'.
+	(semantic-summary-mode-map: New variable.  Keymap for summary minor
+	mode.
+	(semantic-summary-mode: New variable.  Non-nil if summary minor mode
+	is enabled.
+	(semantic-summary-mode-setup: New function.  Setup
+	`semantic-summary-mode'.
+	(semantic-summary-mode): New function.  Minor mode to show useful
+	things about tokens in echo area.
+	(semantic-add-minor-mode[semantic-summary-mode]): Added.
+
+	* semantic-load.el: Added autoloads for `semantic-summary-mode'.
+	(when semantic-load-turn-everything-on): Use
+	`global-semantic-summary-mode'.
+
+2001-11-26  Richard Y. Kim <ryk@ap.com>
+
+	* semantic.texi: Added "Lexer Overview" and "Lexer Output" nodes.
+
+2001-11-23  Richard Y. Kim <ryk@ap.com>
+
+	* semantic.texi: Fixed a typo in last checkin.  Sorry.
+
+	* semantic.texi: Created "Overview" and "Semantic Components" chapters.
+
+2001-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el (semantic-fetch-dynamic-bovine):
+	Set out to t when there is no parser available.
+
+2001-11-21  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-minor-mode-name): Use "n" as default value.
+	(senator-minor-mode-isearch-suffix): Use "i" as default value.
+
+	(senator-jump-regexp): Added autoload cookie.
+
+	(senator-register-mode-menu-entry["Senator"]): No more use
+	`senator-mode'.
+
+	(senator-status): Renamed from `senator-mode'.
+
+	(senator-mode-line-update): Renamed from `senator-show-status'.  Use
+	`senator-status'.  Use `semantic-mode-line-update' instead of
+	`force-mode-line-update'.  Removed "Emacs 21 goodies".
+
+	(senator-minor-mode-setup): Removed call to `senator-show-status'.
+
+	(senator-minor-mode): Use `senator-mode-line-update' instead
+	of `force-mode-line-update'.
+	(senator-isearch-toggle-semantic-mode): Ditto.
+	(senator-isearch-mode-hook): Ditto.
+
+	(semantic-add-minor-mode[senator-minor-mode]): Use 'senator-status.
+
+	(semantic-add-minor-mode[senator-isearch-semantic-mode]): Added.
+
+	* semantic-util-modes.el (semantic-update-mode-line):
+	New option.  If non-nil show enabled
+	minor modes in the mode line.
+
+	(semantic-minor-modes-status): New variable.  String displayed in the
+	mode line to show the Semantic minor modes which are locally enabled.
+
+	(semantic-minor-mode-alist): New variable.  Alist saying how to show
+	Semantic minor modes in the mode line.a
+
+	(semantic-mode-line-update): New function.  Update display of Semantic
+	minor modes in the mode line.
+
+	(semantic-add-minor-mode): Update `semantic-minor-mode-alist'.  Lazily
+	install `semantic-minor-modes-status' as a dummy minor mode used to
+	show Semantic minor modes status in the mode line.
+
+	(semantic-show-dirty-mode):  Use `semantic-mode-line-update'.
+	(semantic-show-unmatched-syntax-mode): Ditto.
+	(semantic-auto-parse-mode): Ditto.
+
+	(semantic-add-minor-mode[semantic-show-dirty-mode]): Use "d" to
+	indicate that the minor mode is enabled.
+	(semantic-add-minor-mode[semantic-show-unmatched-syntax-mode]): Use
+	"u" to indicate that the minor mode is enabled.
+	(semantic-add-minor-mode[semantic-auto-parse-mode]): Use "a" to
+	indicate that the minor mode is enabled.
+
+	* semanticdb.el (global-semanticdb-minor-mode):  Fixed bad setting of
+	`semanticdb-global-mode'.
+
+2001-11-19  Richard Y. Kim <ryk@ap.com>
+
+	* semantic.texi:
+	Added comments on semantic-flex and in "document" node.
+	This is only the first of many additions to be made in the future.
+
+2001-11-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp: Added extern "C" samples.
+
+2001-11-17  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-last-local-item-name): Removed.
+	(senator-last-global-item-name): Removed.
+	(senator-new-menu-item-name): Removed.
+
+	(senator-modes-menu-cache): New variable.  Cache the last computed
+	value of the "Modes" sub-menu.
+
+	(senator-register-command-menu): Renamed from
+	`senator-register-mode-menu-item'.  Register and return a command menu
+	specification instead of a pre-build menu item.
+	(senator-register-mode-menu-entry): Clear the cached menu.  Register
+	specifications instead of actual menu items.  Thus the menu building
+	is clearly a separated task.
+
+	(senator-base-local-label): New constant.  Default name of the menu
+	item used to change minor mode buffer local setting.
+	(senator-base-global-label): New constant.  Default name of the menu
+	item used to change minor mode global setting.
+	(senator-uniquify-count): New variable.  Used to generate unique menu
+	item names.
+
+	(senator-build-command-menu-item): New function.  Return a command
+	menu item with an unique name.
+
+	(senator-build-mode-menu-items): With window system display minor mode
+	labels as a disabled menu items to get a consistent look of the
+	"Modes" menu both in Emacs and XEmacs.  On text-only terminal no more
+	use the hard coded strings " (In this buffer)" and " (Globally)" but
+	the corresponding default name constant.
+
+	(senator-build-modes-menu): Compute the value of the menu only if
+	necessary.  Return a cached value when available.
+	Use "--" instead of single "-" for menu separator.  The "Emacs Lisp
+	Reference Manual" says that "separator-type is a string starting with
+	two or more dashes".
+
+	(senator-menu-bar): Use "--" instead of single "-" for menu separator.
+
+	(semantic database menu item): When selected show if the database is
+	persistent (saved on disk) or only available for the current session.
+
+2001-11-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-texi.el (semantic-default-texi-setup): Added autoload
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf
+	(semantic-expand-c-nonterminal): Expand batched extern "c" entries.
+	(semantic-default-c-setup): Added autoload
+
+	* c.bnf (declaration): Added extern-c entry
+	(extern-c-contents, extern-c): new rules
+
+	* semantic-bnf.el (bnf-mode, semantic-bnf-mode): Added autoload
+
+	* semantic-chart.el (semantic-chart-nonterminals-by-token):
+	Added autoload
+	(semantic-chart-database-size): Added autoload
+	(semantic-chart-nonterminal-complexity-token): Added autoload
+
+	* semanticdb.el (global-semanticdb-minor-mode): Added autoload
+
+	* semantic-el.el (semantic-default-elisp-setup): Added autoload
+
+	* semantic-java.el (semantic-default-java-setup): Added autoload
+
+	* semantic-make.el (semantic-default-make-setup): Added autoload
+
+	* semantic-scm.el (semantic-default-scheme-setup): Added autoload
+
+	* semantic-skel.el (semantic-default-skel-setup): Fixed typo in name.
+
+2001-11-14  David Ponce  <david@dponce.com>
+
+	* semantic-sb.el (semantic-fetch-dynamic-bovine):
+	Fixed.  Didn't get the tokens
+	returned by `semantic-bovinate-toplevel'.
+
+	* senator.el (senator-menu-item):  Moved before it is first used.
+
+	(senator-last-local-item-name): New variable.
+	(senator-last-global-item-name): Ditto.
+	(senator-registered-mode-entries): Ditto.
+	(senator-registered-mode-settings): Ditto.
+
+	(senator-new-menu-item-name):  New function.  Return a new unique
+	generated menu item name.
+
+	(senator-register-mode-menu-item):  New function.  Register a minor
+	mode menu item.
+	(senator-register-mode-menu-entry): New function.  Register a minor
+	mode menu entry.
+	(senator-build-mode-menu-items): New function.  Return menu items for
+	a registered minor mode.
+	(senator-build-modes-menu): New function.  Build and return the
+	"Modes" menu.
+
+	(senator-global-mode-options): Removed.
+	(senator-global-mode-options-save): Renamed to
+	`senator-save-registered-mode-settings'.
+
+	(open code): Added registration of Semantic minor modes.
+
+	(senator-menu-bar):  Use `senator-build-modes-menu' to dynamically
+	build the "Modes" sub-menu based on registered minor modes.
+
+2001-11-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (miscellaneous): Renamed
+	(minor modes): Added variable options for all the modes listed.
+
+	* semantic-util-modes.el: (semantic-show-dirty-mode-*hook),
+	(semantic-show-unmatched-syntax-mode-*hook),
+	(semantic-unmatched-syntax-face),
+	(semantic-auto-parse-mode-*hook): Add * as a user option.
+
+2001-11-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util-modes.el (semantic-show-unmatched-syntax):
+	Remove message about no bad syntax.
+
+2001-11-12  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-global-mode-options):
+	New constant.  List of Semantic minor
+	modes which can be enabled globally.
+
+	(senator-global-mode-options-save): New command.  Save current values
+	of `senator-global-mode-options' using Custom."
+
+	(senator-menu-bar):  New menu items in the "Modes" sub-menu to toggle
+	minor modes globally and save these settings via custom.
+
+	* semanticdb.el (global-semanticdb-minor-mode):
+	 Set `semanticdb-global-mode' to the
+	minor mode status.
+
+2001-11-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (miscellaneous):
+	Added `[global-]semantic-auto-parse-mode'.
+
+2001-11-10  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-rebovinate-token):
+	Removed specific error handler.
+
+	(semantic-bovinate-nonterminal): Added general error handler.
+
+2001-11-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-make.el: New make.bnf 1.9
+
+	* make.bnf (Makefile): Handle blank lines
+
+	* Project.ede: Updated the web directory
+
+	* senator.el, semantic-load.el, semantic-imenu.el, semantic.el:
+	Removed all ^M line endings.
+
+	* NEWS: Added new news.
+
+2001-11-07  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-collect-unmatched-syntax):
+	New function.
+	`wisent-skip-token-hook' hook function to add a lexical token to the
+	cache of unmatched tokens.
+
+	(wisent-bovinate-nonterminals): Use it to collect unmatched syntax
+	tokens.
+
+	(wisent-bovinate-toplevel):  Clear the cache of unmatched syntax
+	tokens after a partial re-parse.
+
+	* wisent/wisent.el (wisent-skip-token-hook):
+	New variable.  Hook run when the parser
+	skips a lexical token.
+
+	(wisent-skip-token): Run `wisent-skip-token-hook'.
+	(wisent-skip-block): Ditto.
+	(wisent-parse): Ditto.
+
+	(wisent--maxrhs, wisent-set-max-rhs): Removed.  Unused.
+
+	Checkdoc fixes.
+
+	* semanticdb.el (semanticdb-toggle-global-mode):
+	No more call `semanticdb-kill-hook'.
+	When `semanticdb-write-directory-p' returns nil, that is indicating to
+	not write the DB on disk, overlays were removed from the token cache
+	by `semanticdb-kill-hook' and not recreated.
+
+	* semantic-util-modes.el (semantic-auto-parse-interval): Removed.
+
+	(semantic-auto-parse-idle-time): New variable.  Time in seconds of
+	idle time before auto-reparse.
+
+	(semantic-auto-parse-timer): No more buffer local.  Now an idle timer.
+
+	(semantic-auto-parse-bovinate): Moved.  Does nothing if
+	`semantic-auto-parse-mode' is not enabled.
+
+	(semantic-auto-parse-enabled-p): Moved.  Also check
+	`semantic-auto-parse-mode'.
+
+	(semantic-auto-parse-triggering-delay): Removed.
+	(semantic-auto-parse-change-hook): Removed.
+	(semantic-auto-parse-stop-after-parse): Removed.
+
+	(semantic-auto-parse-setup-timer): New function.  Lazy initialization
+	of the auto parse idle timer.
+	(semantic-auto-parse-mode-setup): Use it.
+
+2001-11-02  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-set-toplevel-bovine-cache):
+	Made `after-change-functions'
+	hook local using `make-local-hook' before using `add-hook' with the
+	LOCAL flag set.
+
+	* semantic-imenu.el (semantic-create-imenu-index): Made
+	`semantic-before-toplevel-cache-flush-hook' and
+	`semantic-clean-token-hooks' locals using `make-local-hook' before
+	using `add-hook' with the LOCAL flag set.
+
+	* senator.el (senator-menu-bar): Added auto parse to "Modes" sub-menu.
+
+	(senator-minor-mode-setup): Made
+	`semantic-before-toplevel-cache-flush-hook' and
+	`semantic-clean-token-hooks' locals using `make-local-hook' before
+	using `add-hook' with the LOCAL flag set.
+
+	* semantic-load.el:
+	Added autoloads for `semantic-auto-parse-mode' minor mode.
+	Turn on `global-semantic-auto-parse-mode' when
+	`semantic-load-turn-everything-on' is non-nil.
+
+	* semantic-util-modes.el:
+	New `semantic-auto-parse-mode' minor mode to auto reparse buffer.
+
+	(semantic-auto-parse-no-working-message): New variable.  Non-nil
+	disable display of working message during auto-parse.
+	(semantic-auto-parse-interval): New variable.  Time in seconds between
+	buffer change and reparse.
+	(semantic-auto-parse-max-buffer-size): New variable.  Maximum size in
+	bytes of buffers automatically reparsed.
+	(semantic-auto-parse-timer): New variable.  Timer used to schedule
+	automatic reparse.
+	(semantic-auto-parse-bovinate): New function.  Reparse the current
+	buffer.
+	(semantic-auto-parse-enabled-p): New function.  Return non-nil if
+	auto-parse is enabled for this buffer.
+	(semantic-auto-parse-triggering-delay): New function.  Return the time
+	in seconds before auto-parse triggering.
+	(semantic-auto-parse-change-hook): New function.  Hook run to schedule
+	the auto-parse task when Semantic detects a change in the current
+	buffer.
+	(semantic-auto-parse-stop-after-parse): New function.  Hook run to
+	stop scheduled auto-parse task after Semantic changed the token cache.
+	(global-semantic-auto-parse-mode): New variable.  If non-nil enable
+	global use of auto-parse mode.
+	(global-semantic-auto-parse-mode): New function.  Toggle global use of
+	`semantic-auto-parse-mode'.
+	(semantic-auto-parse-mode-hook): New variable.  Hook run at the end of
+	function `semantic-show-dirty-mode'.
+	(semantic-auto-parse-mode-on-hook): New variable.  Hook run when
+	auto-parse minor mode is turned on.
+	(semantic-auto-parse-mode-off-hook): New variable.  Hook run when
+	auto-parse minor mode is turned off.
+	(semantic-auto-parse-mode): New variable.  Non-nil if auto-parse minor
+	mode is enabled.
+	(semantic-auto-parse-mode-setup): New function.  Setup
+	`semantic-auto-parse-mode'.
+	(semantic-auto-parse-mode): New function.  Minor mode to auto parse
+	buffer following changes.
+
+2001-10-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-prototype-nonterminal-default):
+	Support reference &
+	(semantic-uml-token-or-string-to-string): Support pointers *, and references &
+
+	* working.el (working-mode-line-update): New compat alias
+	(working-mode-line-message, working-use-echo-area-p): New vars
+	(working-message): Renamed to working-message-echo.
+	New function that obeys working-use-echo-area-p.
+	(working-status-forms): Always reset working-mode-line-message
+	(working-status-timeout): Resest working-mode-line-message
+	(working-verify-mode-line): New test function.
+
+	* semantic-sb.el (semantic-fetch-dynamic-bovine):
+	If a file isn't in semanticdb, load
+	it and bovinate it.
+
+2001-10-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-semantic-init-hook-fcn):
+	For backward compatibility with
+	old cache files, handle the case when the unmatched-syntax slot
+	is not bound.
+
+2001-10-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-table): Add unmatched-syntax slot.
+	(semanticdb-semantic-init-hook-fcn): Set the unmatched syntax cache.
+	(semanticdb-post-bovination-unmatched-syntax): New hook fcn.
+	(semanticdb-hooks): Set our init hook into `semantic-init-db-hooks'.
+
+	* semantic.el (semantic-init-db-hooks):
+	New hook variable for semanticdb.
+	(semantic-new-buffer-fcn): Call semantic-init-db-hooks before other hooks.
+	(semantic-set-unmatched-syntax-cache): New function for semanticdb.
+	(semantic-bovinate-nonterminals): Indent change.
+
+	* semantic-load.el: Enable show-unmatched-syntax-mode by default.
+
+	* tests/test.cpp (class3): Add local var.
+	(method3_for_class3): Added class with parent decl-mods.
+
+	* tests/test.c (dont_show_function): Text if 0 code.
+	(vara4): Test casting in an expression.
+	(funk3): Added interesting conditions to call to fun3
+
+	* semantic.texi (Local Context):
+	Removed old context analysis functions.
+	Added xref to to new context analysis section.
+
+	* semantic-analyze.el (semantic-analyze-token-type):
+	New function extraced from
+	'semantic-analyze-find-nonterminal-sequence'
+	(semantic-analyze-find-nonterminal-sequence): Extracted token type analysis.
+	(semantic-analyze-scoped-nonterminals): Added a comment about getting
+	all parents.
+	(semantic-analyze-scoped-types): Add in scope from functions with
+	parnts.  Add in context scopes (eg. code-wise use clauses)
+	(semantic-analyze-possible-completions): Fixed search to use the
+	completetexttype.
+	Add in search for the local scope.
+
+	* semantic-sb.el (semantic-sb-insert-details):
+	When inserting a type's parts, bucketize
+	them if they appear as tokens.
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf 1.49
+	(semantic-expand-c-nonterminal): Extract default value for vars
+
+	* c.bnf (codeblock): Use codeblock-var-or-fun instead of var-or-fun
+	(class-parents): Add opt-class-declmod to one-parent case.
+	(opt-name): empty name gets "" string instead of nil.
+	(opt-ref): Pass back a 1 for a ref match
+	(codeblock-var-or-fun): New rule. Don't match anon types.
+	(opt-initializers): Add coma prefixed initializer.
+	(variablearg): Pass down a reference
+	(expression): Send back start/end of the expression.
+
+2001-10-26  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-unmatched-syntax-cache):
+	New variable.  Cached copy of
+	unmatched syntax tokens.
+
+	(semantic-unmatched-syntax-cache-check): New variable.  Non nil if the
+	unmatched syntax cache is out of date.
+
+	(semantic-overlay-error-recovery-stack): Removed.
+	(semantic-overlay-stack-add): Removed.
+	(semantic-overlay-stack-clear): Removed.
+
+	(semantic-bovine-umatched-syntax-refresh-needed-p): New function.
+	Return non-nil if the unmatched syntax cache needs a refresh.
+
+	(semantic-clear-unmatched-syntax-cache): New function.  Clear
+	`semantic-unmatched-syntax-cache'.
+
+	(semantic-bovinate-unmatched-syntax): New function.  Return the list
+	of unmatched syntax tokens.
+
+	(semantic-clear-toplevel-cache): Call
+	`semantic-clear-unmatched-syntax-cache'.
+
+	(semantic-bovinate-toplevel): Call
+	`semantic-clear-unmatched-syntax-cache' after partial re-parse.  Use
+	`semantic-overlay-list' to setup token overlays after full re-parse.
+
+	(semantic-set-toplevel-bovine-cache): Set
+	`semantic-unmatched-syntax-cache-check' to nil.  Run hook
+	`semantic-unmatched-syntax-hook' to refresh highlighting of unmatched
+	syntax tokens.
+
+	(semantic-change-function): Set
+	`semantic-unmatched-syntax-cache-check' to t.
+
+	(semantic-raw-to-cooked-token): Replaced token overlay by vector of
+	START END positions.
+
+	(semantic-bovinate-nonterminals): Setup
+	`semantic-unmatched-syntax-cache'.  No more use overlay recovery
+	stack.  No more run `semantic-unmatched-syntax-hook'.
+
+	(semantic-rebovinate-token, semantic-bovinate-nonterminal): No more
+	setup token overlays.
+
+	* semantic-util-modes.el:
+	  (semantic-unmatched-syntax-overlay-p): New function.
+
+	  (semantic-showing-unmatched-syntax-p): Use `semantic-overlays-in'
+	  instead of `semantic-overlay-lists'.  Use
+	  `semantic-unmatched-syntax-overlay-p'.
+
+	  (semantic-clean-unmatched-syntax-in-region):Moved for clarity.
+	  (semantic-clean-token-of-unmatched-syntax): Ditto.
+
+	  (semantic-clean-unmatched-syntax-in-buffer): New function.
+
+	  (semantic-hide-unmatched-syntax): Removed.  Replaced by
+	  `semantic-clean-unmatched-syntax-in-buffer'.
+
+	  (semantic-show-unmatched-syntax): Clear any previous highlighting.
+	  No more use `semantic-overlay-stack-add'.  Comment fixes.
+
+	  (semantic-next-unmatched-syntax):  Use
+	  `semantic-unmatched-syntax-overlay-p'.
+
+	  (semantic-show-unmatched-syntax-mode-setup): Use the function
+	  `semantic-bovinate-unmatched-syntax' to get the list of unmatched
+	  syntax tokens.  Then call `semantic-show-unmatched-syntax' to
+	  highlight them.
+
+2001-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el (document-massage-to-texinfo):
+	When searching for things to wrap
+	in @var, move search start point after each match to avoid
+	double-match for THREE-WORD-SYMBOLS.
+
+	* semantic-ctxt.el (semantic-ctxt-scoped-types, semantic-ctxt-scoped-types-default):
+	New fcn
+
+	* semantic-util.el (semantic-nonterminal-children-default):
+	Handle anonymous types with children.
+
+2001-10-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (Tools): Added a charts section
+	(speedbar): Made note of semantic-load.el
+	(imenu): Made note of semantic-load.el
+	(charts): New section
+
+	* semantic-util-modes.el (global-semantic-show-dirty-mode): Fixed doc.
+
+	* semantic.texi (Bovinating, BNF conversion, Optional Lambda Expression):
+	xref syntax fix
+	(Current Context): Renamed "suggestions" node to "syntax analysis"
+	(Local Variables): Doc update from source
+	(Derived Context): Doc update from source
+	(Context Analysis): New section w/ doc copied from source
+	(senator): xref syntax fix
+	(miscellaneous): Updated from source.  Added show-unmatched-syntax functions.
+
+	* semantic-c.el: Updated for c.bnf
+	(semantic-flex-c-if-0): Optimize #if 0 out of lexical stream.
+	(semantic-flex-c-extensions): Added above.
+
+	* c.bnf: Removed log comments.
+	(unionparts): Fixed names
+	(class-parents): Added opt-class-declmods.
+	(typesimple): Fixed name of union parts
+	(var-or-fun): Split to two sub-rules
+	(opt-initializers): Fixed COMA case.
+	(expression): Added cast info of an expression.
+
+	* semantic-util-modes.el (semantic-show-dirty-mode-on-hook,  semantic-show-dirty-mode-off-hook):
+	Fixed doc strings.
+
+	* INSTALL: Fixed quoting problem with LOADPATH.
+
+	* semanticdb.el (semanticdb-semantic-init-hook-fcn): Added comments.
+
+	* semantic-load.el:
+	Do not enable global-semantic-show-unmatched-syntax-mode when turning
+	everything on until bugs in it are fixed.
+
+2001-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: By Juanma Barranquero <lektu@terra.es>:
+	(which-func-modes): In Emacs 21, it can be t, so don't add
+	semantic-bnf mode.
+
+2001-10-10  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-get-local-variables):
+	New implementation consistent with
+	`semantic-java-get-local-variables'.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-region-until-error):
+	New function. Counterpart of
+	`semantic-bovinate-region-until-error'.
+
+2001-10-09  David Ponce  <david@dponce.com>
+
+	* semantic-ctxt.el (semantic-get-local-variables, semantic-get-local-arguments):
+	Fixed
+	last check in.
+
+	* semantic-ctxt.el (semantic-get-local-variables): For consistency with
+	`semantic-get-local-variables' return tokens without overlay.
+
+	(semantic-get-all-local-variables-default): Always return a cons
+	(LOCAL-ARGUMENTS . LOCAL-VARIABLES).  Removed reversing of the result
+	list because values returned by `semantic-get-local-arguments' and
+	`semantic-get-local-variables' are already in correct order.
+
+2001-10-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede:
+	Added an "example" target with skeletons bnf, and Lisp file.
+
+	* semantic-load.el: Moved charting autoloads together.
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): New c.bnf
+	(semantic-c-classname): New state variable
+	(semantic-c-reconstitute-token): handle constructor via
+	`semantic-c-classname' and new auto-typeing information for implicitly
+	typed functions.
+	(semantic-default-c-built-in-types): Deleted
+	(semantic-default-c-setup): Don't assign
+	 `semantic-default-c-built-in-types'
+
+	* c.bnf (unionpartsparts): new rule; used to be classparts
+	(typesimple): When building a class, store off the classname found.
+	Used to reconstitute functions later.
+	(var-or-fun): Re-enable untyped functions and variables.
+
+	* semantic-analyze.el (semantic-analyze-possible-completions):
+	Fixed typo.
+
+	* semantic-analyze.el (semantic-analyze-current-local-variables):
+	Removed
+	(semantic-analyze-find-nonterminal-sequence): Accept localvariable
+	list, and scoped variable list.
+	(semantic-analyze-type-parts, semantic-analyze-scoped-nonterminals,
+	semantic-analyze-scoped-types): New functions
+	(semantic-analyze-context, semantic-analyze-context-assignment,
+	 semantic-analyze-context-functionarg,
+	 semantic-analyze-context-return): New classes
+	(semantic-analyze-current-context): Use new classes instead of hacking
+	together a list.  Collect new local variable and scoping information
+	into the analysis.
+	(semantic-analyze-type-constraint): New method set for new classes.
+	(semantic-analyze-possible-completions): use new object returned by
+	`semantic-analyze-current-context' to do the same thing.
+	(semantic-analyze-show): New method set for new classes.
+	(semantic-analyze-pop-to-context): Use new method.
+
+	* semantic-util.el (semantic-default-built-in-types): Removed.
+
+	* semantic.texi: Spelling and grammar fixes.  (Thanks Colin Marquardt)
+	Added detail about constructor specifier in tokens.
+
+	* semantic-skel.el:
+	Example on how to start an Emacs Lisp source target for a bnf file.
+
+	* skeleton.bnf: Example on how to start a .bnf project.
+
+2001-10-08  David Ponce  <david@dponce.com>
+
+	* semantic-java.el (semantic-java-get-local-variables):
+	New implementation consistent
+	with `semantic-get-local-variables-default'.
+
+2001-10-05  David Ponce  <david@dponce.com>
+
+	* semantic-bnf.el: Merged wisent branch.
+
+	* semantic.texi: Fixed typo.
+
+2001-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-analyze.el (semantic-analyze-current-local-variables):
+	New var
+	(semantic-analyze-find-nonterminals-by-prefix): New function
+	(semantic-analyze-find-nonterminal-sequence): New arg TYPERETURN.
+	(semantic-analyze-current-context): Get back the types from prefix
+	sequence.  Add them to the return value.
+	(semantic-analyze-possible-completions): New command.
+	(semantic-analyze-pop-to-context): Handle the types of the prefix.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf (var-or-fun):
+	Disable support (for now) of int declarations for vars
+	and funs with unspecified types.  Who does that anymore anyway?
+
+	* semantic-ctxt.el (semantic-up-context):
+	Specify a bounds type (ie, only go up withing
+	the bounds of a specific token type.)  Narrow region to that token.
+	(semantic-up-context-default): Remove old narrowing code.
+	(semantic-get-local-variables-default): Disable working messages.
+	Go up w/in the scope of 'function only. Be sure to append old vars.
+	(semantic-get-all-local-variables-default): Do not loop up contexts.
+	Let the get-local-vars function do that.
+
+	* semantic-util.el (semantic-find-nonterminal-by-type):
+	Do not return built in types.
+	This function is supposed to return non-type tokens which have TYPE
+	as an type.
+
+	* tests/test.c: Fixed typedef_of_anonymous_enum contents.
+
+	* semantic-util-modes.el (semantic-next-unmatched-syntax): New function
+	(semantic-clean-unmatched-syntax-in-region): Implemented.
+	(semantic-clean-token-of-unmatched-syntax): New function for hook.
+	(semantic-show-unmatched-syntax-mode-map): Add binding
+	`semantic-show-unmatched-syntax-next'.
+	(semantic-show-unmatched-syntax-mode-setup): Add pre clean token hook.
+	(semantic-show-unmatched-syntax-next): New command.
+
+	* semantic-ctxt.el (semantic-get-local-variables-default):
+	Disable all hooks associated
+	with unmatched syntax.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf (UNDERP, UNDERUNDERP): New keywords
+	(macro-or-include): Handle optional argument list
+	(opt-define-arglist): New rules
+	(var-or-func-decl): Account for optional _P before arglist.
+	(opt-under-p): New rule
+	(arg-list): Remove check for _P here.  Regex wasn't working.
+	(arg-sub-list): Unused.
+	(expression): Add symbol as valid part.
+
+2001-10-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp: Forgot a semicolon.
+
+	* tests/test.cpp, tests/test.c: A few more bits.
+
+	* Project.ede: Added semantic-analyze.el
+
+	* semantic-bnf.el (semantic-bnf-syntax-help):
+	Added number to list of built ins.
+
+	* semantic-util.el (semantic-current-nonterminal-of-type): New function
+	(semantic-with-buffer-narrowed-to-current-token): New macro
+	(semantic-with-buffer-narrowed-to-token): New macro
+
+	* semantic.el (semantic-number-expression):
+	Use number expression from semantic-java
+	since it looks like the common way of parsing numbers for most
+	langauges.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf (expression): Use newer number token which handles floats.
+
+	* semantic-ctxt.el (semantic-up-context-default):
+	Narrow to current function token first.
+	(semantic-get-local-variables-default): Collect variables from
+	multiple levels.
+	(semantic-ctxt-current-symbol-default): Break at beginning of buffer.
+	(semantic-ctxt-current-argument): doc fix.
+	(semantic-ctxt-current-argument-default): doc fix
+	(semantic-suggest-lookup-item,
+	 semantic-suggest-variable-token-hierarchy,
+	 semantic-suggest-current-type): Deleted functionality moved to
+	semantic-analyze.
+
+	* semantic-analyze.el: Analysis of the current context.
+	Uses semantic-ctxt to determine textual context around point.
+	Uses searches to find the tokens associated with that context.
+
+2001-10-03  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-number-regexp): Removed.  Use
+	`semantic-java-number-regexp' instead.
+
+	(wisent-java-lex): Use `semantic-flex' 'number lexemes.
+
+	(wisent-java-default-setup): BNF update.
+
+	* wisent/wisent-java.bnf:
+	In setup: Added setting of `semantic-number-expression'.
+
+	* wisent/wisent-bovine.el (wisent-rebovinate-token):
+	Call `semantic-pre-clean-token-hooks'.
+
+	* semantic-java.el (semantic-java-number-regexp):
+	New constant.  Regular expression used
+	by the lexer to match Java numbers.
+
+	(semantic-toplevel-java-bovine-table, semantic-default-java-setup):
+	BNF update.
+
+	* java.bnf: In setup: Added setting of `semantic-number-expression'.
+
+	In grammar: Removed 'number nonterminal now directly provided as
+	terminal by the lexer.
+
+	* semantic-c.el:
+	Added (require 'senator) at compilation time to fix byte-compiler
+	warning.
+
+	* senator.el (senator-menu-bar): New "Chart" and "Modes" sub-menus.
+
+	* semantic.el: Added (require 'assoc) to fix byte-compiler warning.
+
+	(semantic-flex): Fixed to handle numbers which are not symbols (that
+	is for example floating point numbers starting with a dot like ".10").
+
+2001-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (Settings): Added number expression doc.
+	(Rules): Added large section about valid syntax tokens.
+
+	* semantic-util-modes.el (global-semantic-show-dirty-mode): Doc Fix
+	(semantic-show-dirty-mode-setup): Doc Fix
+	(semantic-show-dirty-mode): Doc Fix
+	(global-semantic-show-unmatched-syntax-mode): Doc Fix
+	(semantic-clean-unmatched-syntax-in-region): New fn placeholder
+	(semantic-show-unmatched-syntax-mode-map): Doc Fix
+	(semantic-show-unmatched-syntax-mode-setup): Doc Fix
+	(semantic-show-unmatched-syntax-mode): Doc Fix
+
+	* Project.ede: Add semantic-util-modes.
+	Update version number.
+
+	* semantic-c.el: New c.bnf (1.43)
+
+	* c.bnf (INLINE): Fix typo
+	(opt-class-protection): EMPTY is valid match
+	(opt-name): UNION can have class parts.  Fix typedef name.
+	(DECLMOD): Add METADECLMOD
+	(metadeclmod, METADECLMOD): New rules
+	(var-or-fun-decl): Accept metadeclmods in the middle.
+	(fun-or-proto-end): Accept "= 0;" as a valid function end.
+	(opt-expression): Deal with numbers.
+
+	* semantic-chart.el (semantic-chart-database-size): New command.
+	(semantic-chart-nonterminal-complexity-token): Get the Y label from
+	token type name assoc list.
+
+	* semantic-load.el: Added in chart autoloads.
+
+	* semantic-bnf.el (semantic-bnf-mode-keywords):
+	Support the new number keyword.
+
+	* semantic-scm.el: New version of scheme.bnf.
+
+	* scheme.bnf: Disable number matching.
+
+	* semantic-make.el: New version of make.bnf.
+
+	* make.bnf: Disable number matching.
+
+	* semantic.el (semantic-version): Update to 1.4beta 12
+	(semantic-pre-clean-token-hooks): New hook.
+	(semantic-rebovinate-token): Call `semantic-pre-clean-token-hooks'
+	(semantic-number-expression): New flex option
+	(semantic-flex): Create number tokens from symbols if they match
+	above symbol.
+
+2001-10-02  David Ponce  <david@dponce.com>
+
+	* senator.el (global-senator-minor-mode):
+	New variable and function to turn on/off
+	`senator-minor-mode' in every Semantic enabled buffer.
+
+	(senator-minor-mode): Added autoload cookie.  Use
+	`semantic-add-minor-mode' to register the minor mode.
+
+	* semantic-util.el (semantic-show-dirty-mode, semantic-show-unmatched-syntax-mode):
+	All related code moved into semantic-util-modes.el.
+
+	Added (require 'semantic-util-mode).
+
+	* semantic-load.el: Updated minor mode autoloads.
+	Use `global-senator-minor-mode', `global-semantic-show-dirty-mode' and
+	`global-semantic-show-unmatched-syntax-mode' to globally turn on minor
+	modes when `semantic-load-turn-everything-on' is non-nil.
+
+	* semantic-util-modes.el:
+	Initial revision.   Implementation of Semantic minor modes.
+
+2001-09-30  David Ponce  <david@dponce.com>
+
+	* sformat.el (newstr):
+	Local variable declared at compilation time to fix
+	byte-compiler warnings.
+
+	* senator.el (senator-completion-menu-window-offsets):
+	Removed binding of unused
+	local variables.
+
+	(senator-minor-menu): Declared to fix byte-compiler warnings.
+
+	(senator-minor-mode): Moved to fix byte-compiler warnings.
+
+2001-09-29  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-dirty-token-hooks): Fixed doc string typo.
+
+	(semantic-flex-start, semantic-flex-end, semantic-flex-text,
+	semantic-bovine-toplevel-full-reparse-needed-p,
+	semantic-bovine-toplevel-partial-reparse-needed-p): Moved to fix byte
+	compiler warnings.
+
+	(semantic-token-with-position-p): To avoid implementation
+	inconsistencies with `semantic-token-p' call it.
+
+	(semantic-flex): Removed binding of unused local variable.
+
+	* semantic-util.el:
+	Require 'newcomment at compilation time to fix Emacs 21 byte-compiler
+	warnings.
+
+	(semantic-find-nonterminal-by-function): Ignore invalid children
+	tokens when SEARCH-PARTS is not 'positiononly.  Some improvements.
+
+	(semantic-name-nonterminal, semantic-prototype-nonterminal-default,
+	semantic-concise-prototype-nonterminal-default,
+	semantic-uml-token-or-string-to-string,
+	semantic-uml-abbreviate-nonterminal-default,
+	semantic-uml-concise-prototype-nonterminal-default): Removed binding
+	of unused local variables.
+
+	* semantic-texi.el (semantic-texi-recursive-combobulate-list):
+	Removed binding of unused
+	local variables.
+
+	* semantic-sb.el (semantic-sb-one-button):
+	Removed binding of unused local variable.
+
+	* semantic-imenu.el:
+	Require 'imenu at compilation time to fix byte-compiler warnings.
+
+	(semantic-create-imenu-index-1): Removed binding of unused local
+	variable.
+
+	* semantic-el.el:
+	Require 'semantic-imenu at compilation time to fix byte-compiler
+	warnings.
+
+	* semantic-ctxt.el (semantic-ctxt-current-symbol-default, semantic-suggest-variable-token-hierarchy):
+	Removed binding of unused
+	local variable.
+
+	* semantic-c.el:
+	Require 'semantic-imenu at compilation time to fix byte-compiler
+	warnings.
+
+	* document.el (document-comment-start, document-comment-end, document-comment-line-prefix):
+	Moved to document-vars.el to fix
+	byte-compiler warnings.
+
+	Removed extra (require 'document-vars).
+
+	* document-vars.el:
+	Require 'newcomment at compilation time to fix Emacs 21 byte-compiler
+	warnings.
+
+	(document-comment-start, document-comment-end,
+	document-comment-line-prefix): Moved from document.el to fix
+	byte-compiler warnings.
+
+2001-09-27  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-default-setup): BNF update.
+
+	* wisent/wisent-java.bnf:
+	In setup: Removed unnecessary setting of `block-comment-end' which
+	breaks `indent-new-comment-line'.
+
+	* semantic-java.el (semantic-default-java-setup): BNF update.
+
+	* java.bnf:
+	In setup: Removed unnecessary setting of `block-comment-end' which
+	breaks `indent-new-comment-line'.
+
+2001-09-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el: Added `semantic-show-unmatched-syntax-mode'.
+
+	* semantic.el (semantic-unmatched-syntax-hook): New hook.
+	(semantic-bovinate-nonterminals): Track all unmatched syntax elements.
+	Call new hook with the unmatched syntax.
+
+	* semantic-util.el (semantic-find-nonterminal-by-overlay,  semantic-find-nonterminal-by-overlay-in-region,  semantic-find-nonterminal-by-overlay-next,  semantic-find-nonterminal-by-overlay-prev):
+	Make sure the 'semantic
+	part of the overlay is a token to be valid while searching.
+	(semantic-show-unmatched-syntax-mode): New user option.
+	(semantic-unmatched-syntax-face): New face.
+	(semantic-show-unmatched-syntax): New function
+	(semantic-show-unmatched-syntax-mode): New mode.
+
+2001-09-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-toplevel-c-bovine-table): Updated from c.bnf
+
+	* c.bnf (enumsubparts): Account for commas
+	(arg-sub-list): Account for commas
+	(opt-expression): Account for floating point numbers,
+	or struct dereferences.
+
+2001-09-26  David Ponce  <david@dponce.com>
+
+	* semantic-chart.el (semantic-chart-nonterminals-by-token):
+	Changed the call to
+	`semantic-find-nonterminal-by-token' to search in sub-parts of tokens.
+
+	(semantic-chart-nonterminal-complexity-token): Changed call to
+	`semantic-find-nonterminal-by-token' to use 'positiononly instead of
+	t.
+
+	* semantic-util.el (semantic-find-nonterminal-by-function):
+	 Take into account
+	'positiononly value of the SEARCH-PARTS argument.
+
+2001-09-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-chart.el: Added a name to the complexity chart.
+
+	* semantic.el: Update version numbers.
+
+	* Project.ede: Updated version.
+
+2001-09-21  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el: Fixed byte compilation warnings.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-toplevel):
+	Call `garbage-collect' before parsing to
+	optimize memory use.
+
+	* wisent/wisent.el (wisent-noninteractive):
+	New function.  Return non-nil if running
+	without interactive terminal.
+
+	(wisent-log-file): New constant.  The logging file.
+
+	(wisent-append-to-log-file): New function.  Append contents of
+	`wisent-log-buffer' to `wisent-log-file'.
+
+	(wisent-log-conflicts): Display the number of conflicts found in the
+	message log buffer or on console output when running in batch mode.
+
+	(wisent-build-tables): In batch mode append the contents of the log
+	buffer to `wisent-log-file'.
+
+	* semantic.el (semantic-token-name, semantic-token-get, semantic-token-start, semantic-token-end, semantic-token-buffer, semantic-token-p, semantic-bovine-toplevel-full-reparse-needed-p, semantic-bovine-toplevel-partial-reparse-needed-p):
+	Defined as inline
+	functions.
+
+	(semantic-bovinate-toplevel): Garbage collector is run before parsing
+	and suspended during parsing to speed up the parser and optimize
+	memory use.
+
+	* working.el (working-message-emacs, working-message-xemacs):
+	Do nothing if running
+	in batch mode.
+
+	(working-run-with-timer, working-cancel-timer): Default implementation
+	uses `working-message' instead of `message'.  Moved the definitions
+	after definition of `working-message' to avoid byte compiler warnings.
+
+2001-09-20  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-default-setup): BNF update.
+
+	* wisent/wisent-java.bnf:
+	In setup: Renamed `wisent-flex-function' to `wisent-lexer-function'.
+	Added setup of `wisent-flex-depth'.
+
+	* wisent/wisent-bovine.el (wisent-flex-istream):
+	No more buffer local.  Its value is local in
+	function `wisent-bovinate-nonterminal'.
+
+	(wisent-flex-depth): New variable to specify how `semantic-flex' will
+	setup the lexer input stream.
+
+	(wisent-flex-function): Renamed to more appropriate
+	`wisent-lexer-function'.
+
+	(wisent-lexer-wrapper): Minor improvements.
+
+	(wisent-bovinate-nonterminal): Local binding of `gc-cons-threshold'
+	moved into `wisent-bovinate-toplevel'.
+
+	(wisent-rebovinate-token, wisent-bovinate-from-nonterminal-full): Use
+	`wisent-flex-depth'.
+
+	(wisent-bovinate-toplevel): Performance improvement.
+
+2001-09-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-function-argument-separation-character):
+	Fix doc.
+
+2001-09-18  David Ponce  <david@dponce.com>
+
+	* semantic-imenu.el (semantic-create-imenu-subindex):
+	 Use `imenu--split-submenus' to sort
+	and split sub index.
+
+2001-09-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-c-nonterminal-protection):
+	Only check for class/struct if
+	the token is a type.  Otherwise, always default to public.
+
+	* semantic-el.el (semantic-elisp-prototype-nonterminal): Deleted
+	(semantic-default-elisp-setup): Remove reference to above.
+	Set `semantic-function-argument-separator' and
+	`semantic-function-argument-separatiion' to good values.
+
+	* semantic-util.el (semantic-test-all-token->text-functions):
+	New function
+	(semantic-function-argument-separator): New variable
+	(semantic-prototype-nonterminal-default): Use new variable above.
+	(semantic-concise-prototype-nonterminal-default): Use new variable above.
+	(semantic-uml-token-or-string-to-string): Always display argument list.
+	(semantic-uml-arguments-to-string): Use above new variable.
+
+2001-09-18  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-quote-p, wisent-backquote-p, wisent-action-expand):
+	New
+	functions to expand a semantic action expression and return the list
+	of `$i' placeholders it actually uses.
+
+	(wisent-reduce-action): Use `wisent-action-expand' to expand semantic
+	action expression and only bind `$i' placeholders actually used.
+
+2001-09-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.bnf (class_declaration, field_declaration, method_declaration, formal_parameter, constructor_declaration, interface_declaration, abstract_method_declaration):
+	  Use ASSOC built-in instead of direct
+	call to `semantic-bovinate-make-assoc-list' in semantic actions.
+
+2001-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp (class3::method5_for_class3): New testing post-const.
+	(tinitializers1): test initializers.
+
+	* tests/test.c (funk2): Added pointer test.
+	(funk3): Added local variables.
+
+	* Project.ede: Version update.
+	Added semantic-chart.el to tools.
+
+	* semantic-load.el: Added a semantic-chart autoload.
+
+	* semantic-chart.el:
+	Chart some aspects of a file based on what Semantic knows.
+	(Requires eieio 0.17 beta 3 or better)
+
+	* semantic-c.el: Removed broken commentary
+
+2001-09-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el: Header comments: doc fixes.
+
+	(wisent-working-...): Removed.
+
+	(wisent-pack-grammar, wisent-set-derives, wisent-set-nullable,
+	wisent-generate-states, wisent-lalr, wisent-build-states,
+	wisent-compact-action-table, wisent-build-action-table,
+	wisent-build-goto-table, wisent-build-reduction-table,
+	wisent-build-terminal-table, wisent-build-tables,
+	wisent-compile-grammar):  Use the working API instead of
+	wisent-working-... wrappers.
+
+	(wisent-compile-grammar): Doc string fixes.
+
+	* working.el (working-status-dynamic-type):
+	Added `working-text-display' to the
+	list of available functions.
+
+	(working-number-display): Doc string fix.
+
+	(working-text-display): New function to display step strings.
+
+	* semantic-el.el (semantic-expand-elisp-nonterminal):
+	After expanding NONTERM delete
+	the overlay from its buffer.
+
+2001-09-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el: Header comments: Doc improvement.
+
+	(wisent-log-buffer): Separate each compile log in the log buffer.
+
+	(wisent-show, wisent-show-all): Removed.
+
+	(wisent-free-all): Added missing global values.
+
+	(wisent-build-tables): Skip lines after logging.
+
+2001-09-12  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-expr.el: Header comments: Doc fixes.
+
+	(wisent-expr-grammar): Removed.  No more used.
+
+	(wisent-expr-parser-tables): Updated to new format of Wisent's input
+	grammar.  Minor grammar improvements.  Doc string.  Grammar compiled
+	in byte code.
+
+	(wisent-expr-operators): Terminal symbol name changes.  Doc string.
+
+	(wisent-expr-digits): Removed.  No more used.
+
+	(wisent-expr-number-regexp): New constant.  Lexer regexp used to parse
+	the numbers.
+
+	(wisent-expr-lexer-input-stream): Doc string.
+
+	(wisent-expr-lexer): Doc string.  Use `wisent-expr-number-regexp' to
+	parse numbers.  Minor improvements.
+
+	(wisent-expr-error): Removed.  No more used.
+
+	(wisent-expr-test): Renamed to `wisent-expr'.  Minor improvements.
+
+	* semantic.el (find-file-hooks):
+	Replaced `semantic-change-major-mode-hook-function'
+	by `semantic-post-change-major-mode-function'.
+
+	* wisent/wisent.el (wisent-parse):
+	Missing space in parse error message.
+
+2001-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (Extra Specifiers): Fix end of table location.
+
+	* semantic.el: Revert old find-file-hook behavior.
+
+2001-09-12  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el: Header comments: Minor doc fix.
+
+	(wisent-process-nonterminal): Missing declaration of local variable
+	`rule'.
+
+	(wisent-parse): Minor improvement of parse error message.
+
+	* wisent/wisent-calc.bnf, wisent/wisent-calc.el:
+	Initial revision of the infix notation calculator sample program.
+
+2001-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-version): beta10.  Oy.
+	(semantic-token-with-position-p): Make sure trailing array is not a string.
+	(sematic-find-file-function): New hook function.
+	(find-file-hooks): Add above.
+
+	* semantic.texi (Extra Specifiers):
+	Specify dereference spec for C example is a NUMBER.
+	Specify new pionter spec.
+	Specify new prototype flag.
+
+	* semantic-util.el: Doc fixes.
+	(semantic-prototype-nonterminal-default): Use new version of pointer value.
+
+	* semantic-imenu.el (semantic-create-imenu-subindex):
+	Only create submenues if the token
+	being expanded has a position available for jumping and sorting.
+
+	* semantic-el.el (semantic-elisp-use-read):
+	Extract contents of `eval-and-load'.
+	Support autoload as a prototyping mechanism for functions.
+	(semantic-expand-elisp-nonterminal): Expand nested definition lists.
+	(semantic-default-elisp-setup): Use above.
+
+	* semantic-c.el: New c.bnf.
+
+	* c.bnf (var-or-func-decl):
+	Change to host multiple postfix fcn modifiers, and
+	initializers.
+	(opt-reentrant): deleted
+	(opt-initializers, opt-post-fcn-modifiers, post-fcn-modifiers): New rules
+
+2001-09-11  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el:
+	Header comments: New input grammar format. New conflicts handling.
+
+	(wisent--rprec): New variable for rules precedence.
+
+	(wisent-pack-grammar): Setup rules precedence.
+
+	(wisent-add-action): Handle S/R conflicts using terminals
+	associativity and precedence, and rules precedence.
+
+	(wisent-build-tables): Minor improvements.
+
+	(wisent-process-nonterminal, wisent-process-grammar): New input
+	grammar format with terminals associativity and precedence, and rules
+	precedence.
+
+	* wisent/wisent-java.el (wisent-java-parser-tables):
+	New grammar format.
+
+2001-09-06  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent--action-table, wisent--nitems, wisent--nrules, wisent--nvars, wisent--nterms, wisent--nstates):
+	Doc strings.
+
+	(wisent--rules, wisent--conflicts-by-state, wisent--conflicts): New
+	variables.
+
+	(wisent-terminal-symbol, wisent-item-symbol): New functions to get
+	symbol value from respectively a terminal ID and an item number.
+
+	(wisent-log-starts, wisent-log-nullables, wisent-log-rules,
+	wisent-log-conflicts, wisent-log-rr-conflict, wisent-log-sr-conflict):
+	New logging functions.
+
+	(wisent-show-nullable, wisent-show-starts): Removed.  Replaced by
+	respectively `wisent-log-nullables' and `wisent-log-starts'.
+
+	(wisent-add-action): Doc string.  Use `wisent-log-rr-conflict' and
+	`wisent-log-sr-conflict' to log conflicts.
+
+	(wisent-build-states): Doc string.  Initialize `wisent--conflicts' and
+	`wisent--conflicts-by-state'.
+
+	(wisent-build-tables): Setup `wisent--rules'.  Removed call to
+	`wisent-show-nullable' and `wisent-show-starts'.  Log conflicts and
+	grammar stuff after the parser tables have been built.
+
+2001-09-03  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-show-status):
+	Emacs 21.0.105 compatibility change.  Set
+	`senator-mode' local-map property to `mode-line-minor-mode-keymap'.
+	The function `make-mode-line-mouse2-map' no more exists in 21.0.105.
+
+	(senator-mode-line-toggle): Removed because of new mode line design
+	for minor mode in GNU Emacs 21.0.105.
+
+	* wisent/wisent-java.el (wisent-java-parser-tables, wisent-java-default-setup):
+	BNF update.
+
+	(wisent-java-lex): No more raise an error when it finds a
+	`semantic-flex' token not yet used by the parser.  Return a valid
+	lexical token instead and let the parser handle it.
+
+	(wisent-java-get-local-variables): New function.  Java specific
+	'get-local-variables' override that uses the LALR parser.
+
+	* wisent/wisent-java.bnf: In setup:
+
+	Added 'field_declarations_opt' %start nonterminal.
+	'get-local-variables' override: replaced
+	`semantic-java-get-local-variables' by
+	`wisent-java-get-local-variables'.
+
+	In grammar:
+
+	Added 'field_declarations_opt', `field_declarations' and
+	`field_declaration_maybe' nonterminals used to parse method and
+	constructor local variables.
+
+	* wisent/wisent-bovine.el (wisent-bovinate-from-nonterminal-full):
+	New function, counterpart of
+	`semantic-bovinate-from-nonterminal-full' for the LALR parser.
+
+2001-08-31  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-parser-tables): BNF update.
+
+	* wisent/wisent-java.bnf: In grammar:
+
+	Removed all "(identity $1)" semantic actions and "()" ones in EMPTY
+	matches as they are now the defaults.  Moved call to
+	`wisent-java-expand-nonterminal' from 'field_declaration' production
+	in 'class_member_declaration' non terminal to 'field_declaration' non
+	terminal.  So re-parsing at `field_declaration' produces valid
+	Semantic tokens.
+
+	* wisent/wisent-bovine.el (wisent-token):
+	Added 'reparse-symbol property to token.
+
+	(wisent-bovinate-nonterminal): Only keep valid Semantic tokens from
+	data returned by the LALR parser.  When parser fails it returns the
+	top element of its value stack as it is.  This let a chance to get any
+	valid tokens pushed into the stack before the failure.  But at some
+	point the top of stack element can contain a garbage value.  So this
+	fix!
+
+	(wisent-rebovinate-token): New function to re-parse a token.
+
+	(wisent-bovinate-toplevel): Now handle partial re-parse!
+
+	(semantic-bovinate-toplevel): New advice to delegate bovination to
+	`wisent-bovinate-toplevel' if defined in
+	`semantic-bovinate-toplevel-override'.  Currently necessary to let
+	`wisent-bovinate-toplevel' handle partial re-parse because
+	`semantic-bovinate-toplevel' always clears existing tokens before
+	calling `semantic-bovinate-toplevel-override'!
+
+2001-08-30  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-bovine.el (wisent-bovinate-nonterminal, wisent-bovinate-toplevel):
+	Moved overlay
+	setup to `wisent-bovinate-toplevel '.
+
+	* wisent/wisent-java.bnf:
+	In setup, added lexer used by the LALR parser and call to
+	`semantic-java-doc-setup'.
+
+	* wisent/wisent-java.el: Use wisent-bovine.el gateway.
+
+	(semantic-flex-token-value, semantic-flex-token-key): Removed.  Now in
+	wisent-bovine.el.
+
+	(wisent-java-lex-istream): Removed.
+
+	(wisent-java-lex): Use `wisent-flex-istream' instead of
+	`wisent-java-lex-istream'.  Removed `working' stuff now provided in
+	wisent-bovine.el gateway.
+
+	(wisent-java-bovinate-toplevel): Removed.  Replaced by
+	`wisent-bovinate-toplevel' in wisent-bovine.el gateway.
+
+	(wisent-java-default-setup): BNF update.
+
+	(wisent-java-parse, wisent-java-lex-buffer): Removed.
+
+	* wisent/wisent.el (wisent-token): Removed.  Now in wisent-bovine.el.
+
+	* wisent/wisent-bovine.el:
+	Initial revision of the Wisent - Semantic gateway.
+
+	* wisent/wisent-expr.el: Removed version number from header.
+
+2001-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-up-context, semantic-beginning-of-context, semantic-end-of-context, semantic-get-local-variables, semantic-get-local-arguments, semantic-get-all-local-variables, semantic-ctxt-current-symbol, semantic-ctxt-current-assignment, semantic-ctxt-current-function, semantic-ctxt-current-argument):
+	Fixed bug going to (point) instead of `point'.
+	(semantic-get-local-variables): deoverlay the local variables.
+	(semantic-get-local-variables-default): Move to the beginning of the
+	current context before parsing.
+
+2001-08-30  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-default-setup): BNF Update.
+
+	* wisent/wisent-java.bnf: In setup, override `get-local-variables' with
+	`semantic-java-get-local-variables'.
+
+	* semantic-java.el (semantic-java-get-local-variables):
+	New function.  Java specific
+	`get-local-variables' override.
+
+	(semantic-default-java-setup): Override `get-local-variables' with
+	`semantic-java-get-local-variables'.
+
+2001-08-28  David Ponce  <david@dponce.com>
+
+	* semantic.texi: Synchronized with semantic.el doc fixes.
+
+	Added missing documentation for
+	`semantic-after-toplevel-cache-change-hook' and documented new hook:
+	`semantic-after-partial-cache-change-hook'.
+
+	* semantic.el (semantic-after-partial-cache-change-hook):
+	Fixed doc string.
+
+	(semantic-remove-dirty-children-internal): Moved.
+
+	(semantic-remove-dirty-children): Moved.  Now remove all children of
+	dirty tokens from `semantic-dirty-tokens'.
+
+	(semantic-bovinate-toplevel): Call `semantic-remove-dirty-children'
+	before partial reparse.  Pass the list of updated tokens to hooks in
+	`semantic-after-partial-cache-change-hook'.
+
+	(semantic-rebovinate-token): No more need to call
+	`semantic-remove-dirty-children'.
+
+2001-08-27  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-clean-token-hooks, semantic-change-hooks, semantic-after-toplevel-bovinate-hook, semantic-before-toplevel-cache-flush-hook):
+	Fixed doc strings.
+
+	(semantic-after-partial-cache-change-hook): New variable holding hooks
+	run after the buffer token list has been updated after partial reparse
+	completed.
+
+	(semantic-bovinate-toplevel): Run hooks in
+	`semantic-after-partial-cache-change-hook' after partial reparse
+	completed.
+
+	* senator.el (senator-minor-mode-name):
+	Can be set to nil to disable display of the
+	minor mode name in the mode line.
+
+	(senator-minor-mode-isearch-suffix): New option to set up the string
+	appended to the mode name when senator isearch mode is on.
+
+	(senator-minor-mode-hook, senator-minor-mode-on-hook,
+	senator-minor-mode-off-hook): Moved to group minor mode options
+	together.
+
+	(senator-menu-bar): For consistency always use "Senator" for the menu
+	title.
+
+	(senator-show-status): Use `senator-minor-mode-name' and
+	`senator-minor-mode-isearch-suffix' settings.
+
+	(senator-minor-mode-setup): Signal an error when attempting to turn on
+	Senator minor mode in a buffer not set up for parsing.
+
+	(senator-show-status, senator-mode-line-toggle): New GNU Emacs 21
+	goodies to turn off Senator minor mode from the mode line or to turn
+	it on or off from the the minor mode menu in the mode line.
+
+2001-08-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el (semantic-elisp-clos-slot-property-string, semantic-elisp-clos-args-to-semantic):
+	New functions
+	(semantic-elisp-form-to-doc-string): extract class slot details with
+	above.
+	(semantic-elisp-nonterminal-protection): New function.
+	(semantic-default-elisp-setup): Remove old UML overrides, added
+	`nonterminal-protection' override.
+
+2001-08-21  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el: Updated header comments.
+
+	(wisent-default-action, wisent-process-nonterminal): Bison like
+	default action.
+
+	(wisent-compile-grammar, wisent-parse): Updated doc strings.
+
+2001-08-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: New c.bnf 1.40
+	(semantic-expand-c-nonterminal): Handle 'pointer stuff for variables.
+	(semantic-c-reconstitute-token): Handle 'pointer stuff for functions.
+
+	* c.bnf: Fixed the inclusion of * in variables and functions.
+
+2001-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/test.cpp: Added test for protected section in a class.
+
+	* tests/test.c: "register" test.
+	Last fn has situations for testing local context.
+
+	* Project.ede: Version change.
+
+	* semantic.el (semantic-version): Update
+	(semantic-toplevel-bovine-table): Removed main help on this variable,
+	the details are in the texinfo manual now.
+
+	* semantic.texi: Added a section on Extra Specifiers
+
+	* semantic-util.el (semantic-override-table): Doc udpate.
+
+	* semantic-c.el: New c.bnf (1.39)
+	(semantic-c-nonterminal-protection): Fix default protection based on
+	class or struct.
+	(semantic-default-c-setup): Added `semantic-c-nonterminal-protection'
+	to the list of function overrides.
+
+	* c.bnf: Added register.
+	Added template w/ comment, but don't use it.
+
+2001-08-17  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (semantic-java-lex):
+	Reverted back to previous implementation used
+	to find operator lexical tokens.  The regexp based approach is
+	slower.
+
+	(wisent-java-operator-regexp): Removed.
+
+2001-08-16  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el:
+	Reorganized the code to fix byte-compilation problems.
+
+	* wisent/wisent-java.el (wisent-java-number-regexps):
+	Removed.  Replaced by
+	`wisent-java-number-regexp'.
+
+	(wisent-java-number-regexp): New constant.  Regular expression to
+	match Java numbers.
+
+	(wisent-java-operator-regexp): New constant.  Regular expression to
+	match Java operators.
+
+	(wisent-java-lex): Improved lexical analysis of Java numbers and
+	operators.  Use `wisent-java-number-regexp' and
+	`wisent-java-operator-regexp' to do one shot check for a number or
+	operator lexeme.
+
+2001-08-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi:
+	Added a style guide chapter, with lots of details about different
+	tokens, and whats in them.
+
+2001-08-14  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.bnf:
+	Updated %outputfile to wisent-java.el and %parsetable to
+	`wisent-java-parser-tables'.  Added %start tokens for alternate entry
+	point nonterminals.
+
+	* wisent/wisent.el (wisent-compiled-grammar-p):
+	New function to check if grammar is
+	already compiled.
+
+	(wisent-compile-grammar): Use `wisent-compiled-grammar-p' to check if
+	the grammar is already compiled.  If so just return it.
+
+	* wisent/wisent-java.el: Clean byte-compilation.
+
+	(wisent-java-grammar, wisent-java-parens, wisent-java-operators):
+	Removed.  Replaced by respectively `wisent-java-parser-tables' and
+	`wisent-java-tokens'.
+
+	(wisent-java-parser-tables): Generated from wisent-java.bnf.
+
+	(wisent-java-keywords, wisent-java-tokens): New constants for Java
+	keywords and lexical tokens.  Generated from wisent-java.bnf.
+
+	(semantic-flex-token-value, semantic-flex-token-key): New functions to
+	search in the token table.  These two functions should be moved to
+	semantic.el.
+
+	(wisent-java-lex): Use lexical stuff generated from wisent-java.bnf.
+
+	(wisent-java-bovinate-toplevel): Use local value of
+	`semantic-toplevel-bovine-table' instead of
+	`wisent-java-parser-tables'.
+
+	(wisent-java-mode-hook): Removed.  Replaced by
+	`wisent-java-default-setup'.
+
+	(wisent-java-default-setup): New `java-mode' hook to setup the
+	Semantic environment of the LALR parser.  Partly generated from
+	wisent-java.bnf.  It replaces the default
+	`semantic-default-java-setup' hook when wisent-java.el is loaded.
+
+	(wisent-java-parse, wisent-java-lex-buffer): Use local value of
+	`semantic-toplevel-bovine-table' instead of
+	`wisent-java-parser-tables'.
+
+2001-08-13  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el (wisent-java-lex):
+	Fixed (wrong-type-argument integer-or-marker-p nil)
+	when scanning a number at end of input stream.
+
+	(wisent-java-lex-buffer): Fixed error caused by missing `working'
+	stuff.
+
+	* wisent/wisent.el (wisent-starts-nonterm):
+	New constant for secondary entry point
+	productions.
+
+	(wisent-reserved-symbols): Removed '$<name>' nonterminals which are
+	now automatically reserved for internal use.
+
+	(wisent-show-nullable): Insert newline before title.
+
+	(wisent-show-starts): New function to report entry point
+	nonterminals.
+
+	(wisent-valid-nonterminal-p): '$<name>' nonterminals are now
+	automatically reserved for internal use.
+
+	(wisent-valid-terminal-p): Use `wisent-valid-nonterminal-p'.
+
+	(wisent-build-tables): Add the table of defined entry point
+	nonterminals to the parser tables.
+
+	(wisent-process-grammar): New optional argument to specify a list of
+	entry point nonterminals.  Build the table of entry point nonterminals
+	and add the corresponding start productions to the grammar definition.
+
+	(wisent-compile-grammar): New optional argument to specify a list of
+	entry point nonterminals.
+
+	(wisent-parse-start): New function to return the first lexical token
+	to parse.
+
+	(wisent-parse): New argument to specify the nonterminal production
+	used at parser initial state.  So the parser can now use grammar
+	subsets.
+
+	* semantic-bnf.el (semantic-bnf-find-table-destination-old, semantic-bnf-find-table-destination, semantic-bnf-find-keyword-destination):
+	Fixed "def[var|const]" regular
+	expression to ensure that the searched variable or constant name is on
+	word boundaries.
+
+	* wisent/wisent.el:
+	New customization group `wisent'.  Minor code reorganization.
+
+	(wisent-parse-max-stack-size, wisent-parse-max-recover,
+	wisent-state-table-size): Now customizable.
+
+	* wisent/wisent-java.bnf: Fixed %keywordtable variable name.
+	Added install of overloaded functions in setup.
+	Use @tag notation for the javadoc keywords to avoid conflicts with
+	language reserved words.
+
+2001-08-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-ctxt.el (semantic-narrow-to-context, semantic-with-buffer-narrowed-to-context, semantic-point-at-beginning-of-command, semantic-point-at-end-of-command, semantic-narrow-to-command, semantic-with-buffer-narrowed-to-command):
+	New functions.
+	(semantic-end-of-command, semantic-beginning-of-context):
+	Narrow to current context.
+	(semantic-end-of-command-default, semantic-beginning-of-context-default):
+	Use a search, and if that fails go to point-[min/max].
+	(semantic-ctxt-current-assignment-default): Narrow to current statement.
+	Use searching functions for an equals.
+
+2001-08-10  David Ponce  <david@dponce.com>
+
+	* semantic-java.el (semantic-java-keyword-table): Updated BNF grammar.
+
+	(semantic-java-doc-tag, semantic-java-doc-tag-name): New functions to
+	convert to/from javadoc @tag notation.
+
+	(semantic-java-doc-keyword-before-p, semantic-java-doc-keywords-map,
+	semantic-java-doc-setup): Take into account new @tag notation used for
+	javadoc keywords.
+
+	* java.bnf:
+	Use @tag notation for the javadoc keywords to avoid conflicts with
+	language reserved words.
+
+2001-08-09  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.bnf: Initial revision.
+
+2001-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added the ChangeLog
+
+	* NEWS: NEWS
+
+	* tests/test.cpp: Added a reentrant example.
+
+	* tests/test.c: Added typedef which was reported as not working.
+
+	* semantic-sb.el (semantic-sb-button-token->text-function,  semantic-sb-info-token->text-function):
+	New options.
+	(semantic-sb-one-button): Use above to get abbreviation text.
+
+2001-08-04  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-eldoc-print-current-symbol-info-default):
+	Fixed void-variable
+	error on `semanticdb-current-database' when the optional semanticdb
+	feature is not provided.
+
+2001-08-02  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el (wisent-skip-token, wisent-skip-block):
+	Do not clear the lookahead
+	token nor call `wisent-errok' when at end of input to avoid infinite
+	error recovery loop.
+
+	(wisent-parse): Always return the value on top of the stack.  Maybe it
+	is a useful value when the parser returns after error recovery.
+
+	* wisent/wisent-java.el (wisent-java-parse):
+	Fixed missing `working' stuff.
+
+2001-08-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: New c.bnf.
+	(semantic-c-reconstitute-token): Added reentrant support.
+
+	* c.bnf: Support reentrant.
+
+2001-07-21  David Ponce  <david@dponce.com>
+
+	* wisent/wisent-java.el:
+	Removed redefinitions of Semantic Flex functions which are now in
+	semantic.el.
+
+	(wisent-java-bovinate-toplevel): Added "LALR" indicator to
+	`working-status-forms' message to distinguish LALR parsing from
+	default Semantic one.
+
+2001-07-20  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-flex-keyword-p, semantic-flex-buffer, semantic-flex-start, semantic-flex-end, semantic-flex-text, semantic-flex-list):
+	Use
+	`defsubst' instead of `defun' to improve performance of byte compiled
+	code.
+
+2001-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version update.
+
+	* semantic.el: Update version to beta 9
+
+	* semantic.texi:
+	Added bits about getting destructor information, and about
+	semantic-current-nonterminal-parent.
+
+	* semantic-util.el (semantic-name-nonterminal-default):
+	Only get destructor flag if TOKEN
+	 is a function.
+
+	* semanticdb.el (semanticdb-find-nonterminal-by-token):
+	New fn by Jesper Nordenberg
+
+	* semantic-c.el:
+	Return public for the protection on any class part which is unlabeled.
+
+	* semantic-el.el: Support uml prototypes.
+
+2001-07-20  David Ponce  <david@dponce.com>
+
+	* wisent/wisent.el, wisent/wisent-java.el, wisent/wisent-expr.el:
+	New file.
+
+2001-07-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-concise-prototype-nonterminal-default):
+	Add spaces before (,
+	and after ,
+	(semantic-uml-colon-string, semantic-uml-no-protection-string): New Var
+	(semantic-uml-protection-to-string): Return no-protection-string, more
+	doc.
+	(semantic-uml-arguments-to-string): Add some spaces into the text.
+	(semantic-uml-prototype-nonterminal-default,
+	 semantic-uml-concice-prototype-nonterminal-default): Use
+	 -uml-colon-string.
+
+	* semantic.el (semantic-toplevel-bovine-table):
+	Added text for the destructor.
+
+	* semantic-util.el (semantic-token-function-destructor): New function
+	(semantic-current-nonterminal-parent): New function
+	(semantic-name-nonterminal-default): Handle destructor.
+	(semantic-uml-arguments-to-string): Pass arguments into mapconcat.
+	(semantic-uml-prototype-nonterminal-default): Fixed argument display
+	to not use non-uml prototype to string function, and added support
+	for types.
+
+	* semantic-util.el (semantic-token->text-functions):
+	Added uml-concise... funciton.
+	(semantic-uml-protection-to-string): Return nil for unknown protection.
+	(semantic-uml-token-or-string-to-string): Convert a token or string
+	into a UML like string.  Taken from the body of
+	`semantic-uml-abbreviate-nonterminal-default'.
+	(semantic-uml-abbreviate-nonterminal-default): Use the above.
+	(semantic-uml-arguments-to-string): Convert an argument list to a UML
+	string list.  Use in above.
+	(semantic-uml-prototype-nonterminal-default): Use the above two new fns.
+	(semantic-uml-concise-prototype-nonterminal[-default]): New functions
+	(semantic-nonterminal-protection-default): Remove static from list of
+	modifiers that mean private.
+
+2001-07-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-token-modifiers): New function.
+	(semantic-uml-prototype-nonterminal): New function.
+	(semantic-token->text-functions): Added above function.
+	(semantic-face-alist): Added keyword font face, and more doc.
+	(semantic-uml-protection-to-string): New function from
+	  semantic-utml-abbreviate-nonterminal-default.
+	(semantic-abbreviate-nonterminal-default): Use above fn.
+	(semantic-nonterminal-protection): Swap out friend, use protected.
+	(semantic-nonterminal-protection-default): Use
+	  `semantic-token-modifiers' instead of
+	  `semantic-token-type-modifiers'.
+
+	* senator.el (senator-jump): Push the mark before moving.
+
+	* semantic-el.el:
+	Highlight &optional in prototypes with the keyword face.
+
+	* semantic-c.el: Stop using friend, and use protected.
+
+	* semantic.el: Updated version number.
+
+2001-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi (semantic-token-type-parent):
+	Describe the format of the parent list.
+	(semantic-token-type-parent-superclass,
+	semantic-token-type-parent-implement): New function doc.
+
+	* semantic.el (semantic-toplevel-bovine-table): Doc fix.
+
+	* semantic-util.el (semantic-token-type-parent):
+	Describe the format of the parent list.
+	(semantic-token-type-parent-superclass,
+	semantic-token-type-parent-implement): New functions.
+
+2001-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* tests/Project.ede: Project file for the tests directory.
+
+2001-06-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el (semantic-default-c-path, semantic-default-c-built-in-types):
+	Moved
+	(semantic-c-nonterminal-protection): New function
+	(semantic-default-c-setup): Add an override table with above in it.
+
+	* semantic.texi (semantic-override-table): Doc update.
+	(semantic-nonterminal-protection): New doc.
+
+	* semantic-util.el (semantic-override-table): Doc update.
+	(semantic-uml-abbreviate-nonterminal-default): Display protection symbol
+	(semantic-nonterminal-protection, semantic-nonterminal-protection-default):
+	  New functions.
+
+2001-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-toplevel-bovine-cache): Doc fix.
+	(semantic-after-toplevel-bovinate-hook): Doc fix.
+	(semantic-after-toplevel-cache-change-hook): Doc fix.
+
+	* semanticdb.el (semanticdb-post-bovination):
+	Update to take a parameter.
+
+	* Project.ede: Updated version.
+
+	* semanticdb.el (semanticdb-hooks):
+	Use `semantic-after-toplevel-cache-change-hook'
+	instead of `semantic-after-toplevel-bovinate-hook'.
+
+	* semantic.el (semantic-version): New version
+	((semantic-toplevel-bovine-cache): Doc change.
+	(semantic-after-toplevel-cache-change-hook): New hook.
+	(semantic-clear-toplevel-cache): Do not call
+	`semantic-after-toplevel-bovineate-hook' for 1.3 compatibility.
+	Do call `semantic-after-toplevel-cache-change-hook'.
+	(semantic-bovinate-toplevel): Do not call
+	`semantic-after-toplevel-bovinate-hook' after custom parser.
+	Call `semantic-after-toplevel-cache-change-hook' after full parse.
+
+	* tests/test.cpp: Added new features of c.bnf 1.37.
+
+	* semantic-c.el: New c.bnf
+	Add throws to semantic-c-reconstitute-token.
+	Add `throw' keyword.
+
+	* c.bnf: Multi-inheritance for classes.
+	Structs like classes for C++.
+	No ; on name spaces.
+	Throws for methods.
+	(Bugs & patches from "Jesper Nordenberg" <mayhem@home.se>
+	and Norbert Lindlbauer <Norbert_Lindlbauer@betaresearch.de>)
+
+2001-05-29  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-remove-dirty-children, semantic-remove-dirty-children-internal):
+	New functions.
+
+	(semantic-rebovinate-token): Fixed "wrong-type-argument overlayp" bug.
+	Use `semantic-remove-dirty-children' to remove the old token children
+	from the dirty list before deorverlaying it.
+
+2001-05-28  David Ponce  <david@dponce.com>
+
+	* semantic-java.el (semantic-java-skip-spaces-backward, semantic-java-skip-spaces-forward):
+	Changed definition from macro to
+	more appropriate in-line function.
+
+2001-05-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: New c.bnf.
+
+	* c.bnf (expression): Added string.
+
+2001-05-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el:
+	Removed variables to stop message logging from working.*status fns.
+	This was a merge error.
+
+2001-05-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-scm.el: New scheme.bnf
+
+	* scheme.bnf: Fixed type on LOAD token generation.
+
+	* working.el: Updated version number.
+	(working-status-percentage-type, working-status-dynamic-type): added nil option
+	(working-percentage-step): New variable.
+	(working-last-percent): New variable.
+	(working-message): Added `eval-and-compile' around it.
+	(working-status-forms): Added `working-last-percent' to let statement.
+	(working-status): Wrap body of code in an if statement to make sure
+	we only display a message if `working-percentage-step' had passed.
+	Enable nil message type.
+	(working-dynamic-status): Enable nil message type.
+
+	* tests/test.c: Test parsing of C files.
+
+2001-05-23  David Ponce  <david@dponce.com>
+
+	* semantic-java.el: Require 'senator at compile time.
+	(semantic-default-java-setup): Rebuilt from updated java.bnf.
+
+	* java.bnf:
+	Added `senator-step-at-token-ids' useful default value in language
+	settings.
+	Removed in line CVS change log.
+
+	* senator.el (senator-message):
+	Removed. Replaced by new `working-message'
+	function.
+
+	(senator-step-at-parent): Now returns the outermost parent found
+	instead of the innermost one.
+
+	(senator-next-token, senator-previous-token, senator-jump,
+	senator-beginning-of-defun, senator-isearch-toggle-semantic-mode): Use
+	`working-message'.
+
+	* working.el (working-message-emacs, working-message-xemacs, working-message):
+	New
+	functions to display messages without logging.
+
+	(working-status, working-dynamic-status): Use `working-message'.
+
+2001-05-21  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-message): No more logging of messages on XEmacs.
+
+	(senator-find-token-before, senator-find-previous-token,
+	senator-find-last-token, senator-find-next-token): Removed these
+	no more used functions.
+
+	(senator-step-at-parent, senator-previous-token-or-parent): New
+	functions.
+
+	(senator-next-token, senator-previous-token): New implementation
+	based on `semantic-find-nonterminal-by-overlay-next' and
+	`semantic-find-nonterminal-by-overlay-prev'.
+
+	(senator-beginning-of-defun): Fixed the bad
+	`senator-step-at-start-end-token-ids' value.  Ensure that the
+	point is always at the beginning of the previous token found.
+
+	(senator-beginning-of-defun, senator-end-of-defun): Doc string
+	updated to inform that the ARG parameter is not yet handled.
+
+2001-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Fixed name.
+	Added URLs
+
+2001-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el (semantic-find-documentation):
+	Fixed to handle deoverlayed (from db)
+	cases, plus normalized cases of slots in structs without position info.
+
+2001-05-16  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-insert-foreign-token-default, senator-insert-foreign-token, senator-eldoc-print-current-symbol-info-default, senator-eldoc-print-current-symbol-info):
+	Functions moved to avoid
+	compiler warnings.
+
+2001-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Added info about adding speedbar to the load path.
+
+	* semantic.el: Update version number.
+
+2001-05-15  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-completion-flatten-stream):
+	No more add function arguments to
+	the completion stream.
+
+	(senator-completion-function-args): New function to build a string of
+	function argument names.
+
+	(senator-completion-refine-name): New function to refine a token
+	completion name in an incremental way.
+
+	(senator-completion-uniquify-names): New function to uniquify token
+	names in a completion stream.
+
+	(senator-completion-stream): Use `senator-completion-uniquify-names'.
+
+2001-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi:
+	Added new submenus for override functions, with big special detail
+	about token->text functions.
+
+	* semantic-imenu.el:
+	Make sure that semantic-sb is loaded when this is loaded.
+	Not because we needed it, but because speedbar will throw errors
+	with semantic generated imenu tokens.
+
+2001-05-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el (semantic-bovinate-nonterminal):
+	When calculating the results, if
+	there was no match, then the result stream equals the input stream, so
+	remove the non-matching token from the return stream, claiming that
+	nothing matched.  This prevents repetitive parsing.
+	(semantic-flex): If the comment-start-skip is matched, but
+	forward-comment does nothing, then make sure we skip intervening
+	boring characters so we don't loop infinitly.
+
+2001-05-09  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-current-database-list):
+	Fixed `expand-file-name' bug when
+	`root' local variable is nil.
+
+2001-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version & files.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf: Added inline method support.
+	Store protection elements
+	Change enum parts to be integer variables.
+
+2001-05-07  David Ponce  <david@dponce.com>
+
+	* semantic-util.el (semantic-prototype-nonterminal-default):
+	Fixed extra space added
+	before the name of simple tokens like 'include and 'package.
+
+	* semantic-java.el (semantic-java-prototype-function, semantic-java-prototype-variable, semantic-java-prototype-type):
+	Follows `semantic-colorize-text' API
+	change.
+
+	(semantic-java-prototype-include, semantic-java-prototype-package):
+	Removed these unnecessary functions.
+
+2001-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el (semantic-elisp-prototype-nonterminal):
+	Changed with `semantic-colorize-text'.
+
+	* semantic-bnf.el (semantic-bnf-mode):
+	Removed `name-nonterminal' override.
+	Added new values to `semantic-face-alist'
+	(semantic-bnf-name-nonterminal): Removed.
+	(semantic-summarize-nonterminal): Changed with `semantic-colorize-text'.
+
+	* semantic-util.el (semantic-prototype-nonterminal):
+	Pass parent/color to subfunction.
+
+	* semantic-util.el (semantic-colorize-text):
+	Take a token as a face class instead of a face.
+	(semantic-face-alist): New.
+	(semantic-name-nonterminal): Doc fix.
+	(semantic-name-nonterminal-default): Use face-class.
+	(semantic-prototype-nonterminal): Doc fix.
+	(semantic-prototype-nonterminal-default): Use face-class.
+	(semantic-concise-prototype-nonterminal): Doc fix
+	(semantic-concise-prototype-nonterminal-default): Use face-class.
+	(semantic-uml-abbreviate-nonterminal): Doc fix
+	(semantic-uml-abbreviate-nonterminal-default): Use face-class.
+
+2001-05-07  David Ponce  <david@dponce.com>
+
+	* semantic-java.el (semantic-java-prototype-function, semantic-java-prototype-variable, semantic-java-prototype-type):
+	Added implementation for the COLOR
+	parameter.
+
+2001-05-06  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-completion-menu-summary-function): Use
+	`semantic-token->text-custom-list' type instead of function type.
+
+	(senator-completion-menu-insert-function): Added choice between
+	default `senator-completion-menu-insert-default' function or user's
+	specified one.
+
+	(senator-completion-menu-window-offsets): Fixed an Emacs 21 bug w/
+	completion menu.  Returned offsets are now rounded down.
+
+	(senator-eldoc-use-color): New option.
+
+	(senator-eldoc-print-current-symbol-info): Use new
+	`senator-eldoc-use-color' option.
+
+	Minor "checkdoc" fixes.
+
+	* semantic-java.el (semantic-java-prototype-function, semantic-java-prototype-variable, semantic-java-prototype-type, semantic-java-prototype-include, semantic-java-prototype-package, semantic-java-prototype-nonterminal):
+	Added new `semantic-prototype-nonterminal' optional parameters PARENT
+	and COLOR (not yet used).
+
+	(semantic-java-prototype-nonterminal): Replaced default behavior
+	`semantic-abbreviate-nonterminal' by
+	`semantic-prototype-nonterminal-default'. Minor code cleanup.
+
+2001-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el: Be safe about loading the imenu library.
+	(semantic-imenu-summary-function): Use new
+	`semantic-token->text-custom-list' for customization type.
+	(semantic-which-function-use-color): New variable
+	(semantic-default-which-function): Use
+	`semantic-which-function-use-color' to draw the token with colors.
+
+	* semantic-scm.el: Fixed the title comment.
+
+	* semantic-load.el:
+	Do not set up imenu code if the imenu library is not available.
+
+	* semantic-bnf.el (semantic-bnf-mode):
+	Added `semantic-bnf-name-nonterminal' as a new
+	override fcn.
+	(semantic-bnf-name-nonterminal): New fcn
+	(semantic-bnf-abbreviate-nonterminal, semantic-bnf-summarize-nonterminal):
+	Use semantic-name-nonterminal for some things, accept parent/color
+	arguments.  Colorize text when appropriate.
+
+	* semantic-el.el (semantic-elisp-prototype-nonterminal):
+	Take parent/color argument.
+	Use the color argument to colorize the output text.
+
+	* semantic-util.el (semantic-override-table): Doc fix.
+	(semantic-token->text-functions, semantic-token->text-custom-list): New var.
+	(semantic-name-nonterminal, semantic-name-nonterminal-default): New fcn
+	(semantic-abbreviate-nonterminal[-default]): Use semantic-name-nonterminal.
+	Added color parameter.
+	(semantic-summarize-nonterminal[-default]): Added color parameter.
+	(semantic-prototype-nonterminal[-default]): Added color parameter.
+	(semantic-concise-prototype-nonterminal[-default]): Added color parameter.
+	(semantic-uml-abbreviate-nonterminal[-defailt]): New functions
+
+	* semantic.el (semantic-version): Updated
+	(semantic-token-p): nil is a symbol, so make sure that the 'token slot
+	 in a token is not nil.
+
+2001-05-04  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-bovinate-nonterminal-check-obarray):
+	New variable to
+	remember streams already parsed for nonterminal symbols.
+
+	(semantic-set-toplevel-bovine-cache): Cleanup
+	`semantic-bovinate-nonterminal-check-obarray'.
+
+	(semantic-bovinate-nonterminal-check): New function to check if a
+	stream has already been parsed for nonterminal.
+
+	(semantic-bovinate-nonterminal): Use
+	`semantic-bovinate-nonterminal-check' to detect infinite recursion
+	when doing a full reparse and abort parsing.
+
+2001-05-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: New c.bnf
+
+2001-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* c.bnf: Revamped lots of summary strings.
+	Added `type' as a possible expansion in classsubparts.
+
+	* document-vars.el: Checkdoc run.
+
+2001-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-project-roots): New variable
+	(semanticdb-project-root-functions): New variable
+	(semanticdb-current-database-list): New function
+	(semanticdb-find-nonterminal-by-function): Use
+	`semanticdb-current-database-list' to get list of databases if none
+	is specified.
+
+	* semantic-el.el (semantic-elisp-form-to-doc-string):
+	Fixed final cond condition.
+
+2001-04-30  David Ponce  <david@dponce.com>
+
+	* java.bnf, semantic-java.el:
+	Changed "version" javadoc keyword to not optional.
+
+2001-04-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Added new documentation strings to all the reparsing related hooks to
+	be much more descriptive.
+
+	* semantic.texi: Changed the title.
+	Added new section `parser hooks', and moved  the two
+	`..reparse-needed' function doc in there, along with descriptions of
+	all the hooks, sucked from the source.
+
+	* semantic-bnf.el (semantic-bovine-bnf-table):
+	Extract buffer strings without properties.
+	Turn sublists in %put tokens into real tokens (with a symbol identifier)
+	(semantic-bnf-mode): Add `semantic-bnf-nonterminal-children' to
+	overload list.
+	(semantic-bnf-nonterminal-children): New fcn.
+
+2001-04-27  David Ponce  <david@dponce.com>
+
+	* working.el (working-status, working-dynamic-status):
+	No more log progress
+	messages on Xemacs.
+
+2001-04-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el:
+	Fixed reading of doc strings if they are not actually strings.
+
+2001-04-26  David Ponce  <david@dponce.com>
+
+	* semantic-java.el (semantic-java-keyword-table):
+	reflect changes in java.bnf.
+
+	(semantic-java-clean-docstring): removed.
+
+	(semantic-java-find-documentation): use
+	`semantic-find-doc-snarf-comment' instead of
+	`semantic-java-clean-docstring'.
+
+	(semantic-java-doc-line-tags, semantic-java-doc-with-name-tags,
+	semantic-java-doc-with-ref-tags, semantic-java-doc-extra-type-tags,
+	semantic-java-doc-extra-function-tags,
+	semantic-java-doc-extra-variable-tags, semantic-java-doc-type-tags,
+	semantic-java-doc-function-tags, semantic-java-doc-variable-tags): new
+	variables to handle javadoc tags.
+
+	(semantic-java-doc-keyword-before-p, semantic-java-doc-keywords-map,
+	semantic-java-doc-setup): new functions to handle javadoc tags.
+
+	(semantic-default-java-setup): reflect changes in java.bnf. Calls
+	`semantic-java-doc-setup' to setup javadoc elements.
+
+	* java.bnf: Added official javadoc line tag keywords.
+	Provided a value for `block-comment-end'.
+
+	* senator.el (senator-minor-mode, senator-minor-mode-setup): Doc fix.
+
+2001-04-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el (semanticdb-kill-hook):
+	Use semantic-active-p, instead of checking for
+	the semantic table.
+
+2001-04-25  David Ponce  <david@dponce.com>
+
+	* semantic.el (semantic-new-buffer-fcn, semantic-change-major-mode-hook-function, semantic-post-change-major-mode-function):
+	Fixed some problems when
+	initializing Semantic enabled buffers.
+
+	(semantic-changed-major-mode): Renamed to
+	`semantic-changed-mode-buffers'.
+
+2001-04-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi:
+	Added documentation for new functions in semantic-util, and semanticdb.
+
+	* semanticdb.el (semanticdb-current-database): new function.
+	(semanticdb-find-nonterminal-by-property,
+	 semanticdb-find-nonterminal-by-extra-spec,
+	 semanticdb-find-nonterminal-by-extra-spec-value): new functions.
+	(semanticdb-find-nonterminal-by-function): Use
+	 `semanticdb-current-database' as a function, not a variable.
+
+	* semantic-util.el:
+	(semantic-find-nonterminal-by-extra-spec-value) New fcn.
+	(semantic-read-symbol) show the default value, and return it.
+
+2001-04-23  David Ponce  <david@dponce.com>
+
+	* semantic-imenu.el (semantic-imenu-flush-fcn):
+	Added missing `remove-hook' local flags.
+	(semantic-create-imenu-index): Index creation could remove hook just
+	added so moved `add-hook' after index creation.
+
+	* senator.el: semantic-imenu not only required at compile time.
+	(senator-momentary-highlight-face): Fixed typo.
+	(add-log-current-defun): new advice.
+
+2001-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Change name of old find-file-hook to semantic-new-buffer-fcn.
+	Do not call semantic-new-buffer-fcn in find-file-hook, only
+	call it from the change-major-mode-hook stuff.
+
+2001-04-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi:
+	Fixed up some docs, and added the semanticdb-persistent-path var too.
+
+	* semantic.el: Changed the eval-defun function hook to be generic.
+	Changed the change-major-mode sequence to a new function which
+	  will only clear the cache in a semantic buffer.  It then tracks all
+	  buffers changed, and in a post-command-hook, follows the find-file
+	  hook code on every changed buffer.
+
+	* semantic-util.el:
+	When show-dirty-mode is on, add a rebovination into the after-save-hook.
+
+	* semantic-el.el: Fixed problems with defstruct
+
+	* semantic-ctxt.el:
+	Make sure that semantic-case-fold is used for anything that uses
+	regexps with names.
+
+	* semantic-c.el: new c.bnf
+
+	* c.bnf: Spelling error for integer.
+
+	* INSTALL: Fixed instructions for .emacs files.
+
+	* semanticdb.el: Small doc changes.
+	When saving a database, use condition-case to protect against
+	file errors, or file write-protection errors.  This assumes that
+	we aren't going to worry about caches in directories we can't write
+	to.
+
+2001-04-19  David Ponce  <david@dponce.com>
+
+	* senator.el: Added isearch lazy highlighting support for XEmacs 21.4.
+
+2001-04-13  David Ponce  <david@dponce.com>
+
+	* java.bnf: Updated copyrights.
+
+2001-04-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el: Added autoload `semantic-change-function-mark-dirty
+	Add hook `semantic-change-hooks to contain above fcn.
+
+	* semantic-util.el:
+	Remove hokey semantic dependency, and explicitly depend on semantic.
+	Moved several common token access functions back into semantic.el.
+	Moved token overlay/deoverlay functions into semantic.el.
+	Moved `semantic-file-token-stream' into this file.
+	New fn `semantic-change-function-mark-dirty' to be used as
+	  a hook in `semantic-change-hooks'.
+
+	* semantic.el:
+	Stop depending on semantic-util.  Pull in the proper bits needed to
+	operate in from semantic-util.  (This makes undoes some of a previous
+	check in.)  This includes common token access, and deoverlay/overlay a
+	token functions.
+	Removed the after change function body, and call a hook.
+
+	* semantic.texi:
+	Fixed a type originally found in document.el (which created much of
+	this documetnation.)
+
+	* document.el: Fixed a type-o (found by Richard Kim)
+
+2001-04-13  David Ponce  <david@dponce.com>
+
+	* java.bnf: Added keyword summaries.
+
+	* semantic-java.el (semantic-java-keyword-table):
+	Added keyword summaries.
+
+2001-04-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf: Added built in types (void, char, etc) and summaries.
+
+	* semantic-scm.el: New scheme.bnf.
+
+	* scheme.bnf: Added some summaries to tokens.
+
+	* semantic-make.el: New make.bnf
+
+	* make.bnf:
+	Added a keyword table, and several new tokens and summaries.
+	Added support for the include macro.
+
+	* INSTALL: Added makefile tricks to the INSTALL process.
+
+	* semantic.texi: Added semanticdb-mode-hooks.
+
+	* semantic-imenu.el:
+	Added `semantic-imenu-flush-fcn', and add it to the semanticdb-mode-hooks.
+
+	* semanticdb.el:
+	Added `semanticdb-mode-hooks', run when the global semanticdb is
+	turned on and off.
+	Removed imenu reference when toggling semanticdb on and off.
+
+2001-04-12  David Ponce  <david@dponce.com>
+
+	* senator.el: Eliminated lots of compile warnings.
+
+	(senator-minor-mode): No more use Emacs 21 `define-minor-mode' to
+	avoid byte code incompatibilities between Emacs 21 and previous
+	versions.
+
+2001-04-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version, and some naming.
+
+	* semanticdb.el: Added compile time require statements.
+
+	* semantic.el:
+	Removed some compile time requirements.  Accept the errors.
+	Remove autoloads for functions defined locally.
+
+	* semantic-util.el, semantic-texi.el, semantic-scm.el, semantic-java.el, semantic-imenu.el, semantic-ctxt.el, semantic-c.el, semantic-bnf.el:
+	Added compile time require statements.
+
+2001-04-11  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-completion-menu-window-offsets):
+	On Emacs 21 add the window
+	left margin width to XOFFSET.
+
+2001-04-10  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-find-nonterminal-by-function):
+	Search take into account
+	the current buffer local value of `semantic-case-fold'.
+
+	* semantic-util.el (semantic-find-nonterminal-by-name, semantic-find-nonterminal-by-function, semantic-find-nonterminal-by-function-first-match):
+	Search take into
+	account the current buffer local value of `semantic-case-fold'.
+
+2001-04-09  David Ponce  <david@dponce.com>
+
+	* senator.el: Fixed header comments and removed inline CVS change log.
+
+	(senator-completion-menu-window-offsets): New function.
+
+	(senator-completion-menu-point-as-event): When running Emacs, use
+	`senator-completion-menu-window-offsets' to translate a point position
+	in frame coordinates.
+
+2001-04-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: More project updates.
+
+	* semantic.texi:
+	A series of cleanup items submitted by Karl Eichwalder <keichwa@gmx.net>.
+
+	* semantic-el.el: Handle double parent case for quoted toplevel code.
+
+	* semantic-c.el:
+	Added equivalent modes setting from c.bnf w/ new semantic-bnf code.
+
+	* semantic-ctxt.el:
+	Fixed up some documentation that didn't mention the override function.
+
+	* document.el: Added a note about texinfo generation.
+
+	* semantic-bnf.el: Better speedbar support.
+	Creates new local variable `semantic-equivalent-major-modes'.
+
+	* semantic.el: Removed macros to semantic-util.
+	Imported commands that deal specifically with parsing from semantic-util.
+
+	* semantic-util.el:
+	Copied some macros from semantic.el into semantic-util.el.
+	Copied interactive parsing functions out of semantic-util.
+
+	* semantic-imenu.el:
+	Use `semantidb-equivalent-mode' instead of just comparing major modes.
+	This lets C and C++ to show up in the same directory imenu menu.
+
+	* semanticdb.el: Require semantic.
+	When `semanticdb-persistent-path' is `project', and there are no
+	 project predicates, be equivalent to 'always.
+	Added `semanticdb-equivalent-mode' function.  Use it in the find function.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf: Added name spaces, and references.
+
+2001-03-27  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-completion-menu-popup):
+	Fixed error when handling a simple
+	list of menu items returned when the Semantic Database feature is
+	disabled.
+
+2001-03-26  David Ponce  <david@dponce.com>
+
+	* senator.el (senator-find-nonterminal-by-name, senator-find-nonterminal-by-name-regexp, senator-complete-symbol, senator-eldoc-print-current-symbol-info-default):
+	new format of the
+	value returned by `semanticdb-find-nonterminal-by-name' and
+	`semanticdb-find-nonterminal-by-name-regexp'.
+
+	(senator-completion-menu-item, senator-completion-menu-popup): Added
+	sub-menus for each file were tokens were found by Semantic Database
+	search functions.
+
+	* semantic-texi.el (semantic-texi-update-doc-from-texi, semantic-texi-goto-source):
+	new
+	format of the value returned by `semanticdb-find-nonterminal-by-name'.
+
+	* semantic-ctxt.el (semantic-suggest-lookup-item):
+	new format of the value returned by
+	`semanticdb-find-nonterminal-by-name'.
+
+	* semanticdb.el (semanticdb-find-nonterminal-by-name, semanticdb-find-nonterminal-by-name-regexp, semanticdb-find-nonterminal-by-type, semanticdb-find-nonterminal-by-function):
+	return the DB table where
+	tokens were found as the first element of each returned list.
+
+2001-03-21  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-toggle-global-mode):
+	new function. Toggle use of the
+	Semantic Database feature and update the environment of Semantic
+	enabled buffers accordingly.
+
+	* semantic-util.el (semantic-map-buffers):
+	new function.  Run a function for each
+	Semantic enabled buffer found.
+
+	* senator.el (senator-find-nonterminal-by-name, senator-find-nonterminal-by-name-regexp):
+	return the complete list of
+	tokens found instead of the ones from the first semanticdb table.
+
+	(senator-completion-menu-do-complete, senator-completion-menu-item):
+	use a one element array to pass and receive token instead of the token
+	overlay.  Thus can handle tokens without overlay, returned by
+	semanticdb.
+
+	(senator-completion-menu-point-as-event): New function that returns
+	the text cursor position as an event.
+
+	(senator-completion-menu-popup): Now a command.  Uses
+	`senator-completion-menu-point-as-event' to popup the menu at
+	completion point.
+
+	(senator-completion-menu-mouse-popup,
+	senator-completion-menu-keyboard-popup): deleted.  Replaced by
+	`senator-completion-menu-popup'.
+
+	(senator-prefix-map, senator-mode-map): updated to use
+	`senator-completion-menu-popup'.
+
+	(senator-menu-bar): Uses `senator-minor-mode-name' as menu title.
+	Fixed typos.  Replaced `global-semanticdb-minor-mode' by
+	`semanticdb-toggle-global-mode' to enable/disable the Semantic
+	Database feature.
+
+2001-03-14  David Ponce  <david@dponce.com>
+
+	* semanticdb.el (semanticdb-find-nonterminal-by-function):
+	avoid unneeded refreshes
+	while typing with senator-eldoc mode.
+
+	* semantic.el (semantic-read-event): replaced `cond' by `if' to fix a
+	byte-compilation error on FSF Emacs.
+	(semantic-rebovinate-token): delay rebovination if a [maybe temporary]
+	re-parse error occurs.
+	(semantic-flex): fixed the lexer to calm possible errant parsing.
+
+2001-03-12  David Ponce  <david@dponce.com>
+
+	* senator.el: New faster core search engine.
+
+	Fixed `beginning-of-defun' and `end-of-defun' advices to accept
+	optional argument ARG.  Usage of ARG is not yet implemented.
+
+	Fixed `insert-register' and `jump-to-register' advices to use
+	ad-get-arg.
+
+	Added new hippie expand try function `senator-try-expand-semantic'
+	to try Semantic inline completion.  This try function is
+	automatically activated in Semantic enabled buffers.
+
+	Many code cleanup and improvement.
+
+2001-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Fixed indentation after ; bug.
+
+	* semantic-c.el: New c.bnf.
+	Added `semantic-c-reconstitute-token'.
+
+	* c.bnf: Added lots of summaries to %tokens.
+	variables and functions now share declmod and typedecl start
+	match, and then get recombobulated later.  Prevents massive
+	reparsing.
+
+	* semantic.texi: Ran texinfo menu and node updating command.
+	Added section mentioning semantic-java as an example expand function.
+
+	* semantic-util.el:
+	Removed UNTRUSTED from docs of find-nonterminal-by-overlay-[next/prev].
+	Added Nonterminal region splicing section, with two non-working functions.
+	When concatinating arguments for a concise prototype, make sure we
+	can handle many types of argument lists without crashing.
+	Command `bovinate' now checks the cache.
+
+	* semantic-load.el:
+	Senator and which-fun modes are now forced on, as opposed to just
+	toggled on, hoping they were off before.
+
+	* semantic-load.el: Added scm load.
+	Added which-func turn on.
+	Removed load path hacks.
+
+2001-03-08  David Ponce  <david@dponce.com>
+
+	* semantic-util.el: Fixed an infinite loop bug in
+	`semantic-find-nonterminal-by-overlay-next' and
+	`semantic-find-nonterminal-by-overlay-prev' when respectively the last
+	or the first overlay are encountered.
+
+	* semantic-java.el:
+	Fixed `semantic-expand-java-nonterminal' which did not cleanup invalid
+	expanded tokens and overlays.
+
+2001-03-05  David Ponce  <david@dponce.com>
+
+	* semantic.el: Fixed an XEmacs compatibility problem with `read-event'.
+
+2001-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi:
+	Updated the chapter on senator to account for new features.
+
+2001-03-05  David Ponce  <david@dponce.com>
+
+	* semantic-bnf.el:
+	Improved function `semantic-bnf-find-state-position' to handle
+	multiple match listes on the same line.  Also, if a match occurs in a
+	string or comment it is ignored.
+
+	New function `semantic-bnf-skip-string-or-comment' to skip strings and
+	comments.
+
+	Added font-locking for ASSOC, EXPAND and EXPANDFULL builtins.
+
+	* semantic.el:
+	New `semantic-bovinate-nonterminal' with iterative parser.
+	Removed no more needed function `semantic-bovinate-stream'.
+	Fixed some side effect problems when the BNF source debugger
+	is enabled.
+
+	* senator.el: Added new Eldoc suggestion mode feature.
+
+2001-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Added summary support to BNF keywords.
+	Properly use the override table.
+	Added a completion keybinding.
+
+2001-02-28  David Ponce  <david@dponce.com>
+
+	* java.bnf, semantic-java.el:
+	Fixed a bug on 'array_creation_expression' non-terminal which didn't
+	match primitive type arrays.
+
+2001-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Added chapter on debugging.
+
+	* semantic.el: Update doc to `semantic-bovinate-toplevel'.
+	If doing a partial reparse fails, recurse for a full reparse.
+	Renamed variables in the cooking function to be wordier.
+	For the token reparser, do even more checks after cooking for
+	an expansion to additional tokens.  Queue a full reparse if it
+	gets too hairy.
+	Make sure the reparse symbol is attached to the new token.
+
+2001-02-26  David Ponce  <david@dponce.com>
+
+	* semantic-java.el: Regenerated with new version of semantic-bnf.el.
+
+2001-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: Updated c.bnf, and semantic-bnf.el.
+
+	* c.bnf: Added a few optimizations for structure parts.
+	Used some %tokens in a few spots where I wasn't using them before.
+
+	* semantic.el: Added `semantic-toplevel-bovine-table-source' variable.
+	Incorporate David Ponce's reparse fix for compounded tokens.
+	Use table source to do source-level debugging.
+	Use new semantic-bnf API to find the bit of source to highlight.
+
+	* semantic-scm.el: Scheme parser lisp stuff.
+
+	* scheme.bnf: Scheme parser
+
+	* semantic-bnf.el:
+	When making an init file, add in a new variable value identifying
+	the .bnf source file it came from.
+	Added a bunch of debugging routines for moving in the .bnf file.
+
+2001-02-23  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Copied over all the menu items that used to be in semanic-mode.
+	Added the new token cut/paste items into a menu.
+	Added menu items to configure semantic-imenu and enable semantic-db.
+	Added Options sub menu to customize Semantic, Senator, Semantic Imenu
+	and Semantic Database.
+	Fixed some XEmacs compatibility issues.
+	Improved robustness of some functions.
+
+	* semantic-util.el: Fixed some XEmacs compatibility issues.
+	Added function `semantic-token-invisible-p'.
+
+2001-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Added simplified installation instructions.
+
+	* semantic-imenu.el:
+	Moved all customizable items into semantic-imenu group.
+
+	* semanticdb.el: Moved all customizable items into semanticdb group.
+
+	* semantic-util.el:
+	Added semantic-token-intangible-p and semantic-token-read-only-p.
+
+2001-02-22  David Ponce  <david@dponce.com>
+
+	* semantic-el.el:
+	Fixed "args-out-of-range" bugs when doc string is missing (nil)
+	or an empty string ("").
+
+	Minor typo on first line summary.
+
+	* senator.el: Added token Copy, Cut & Paste and Register feature.
+
+	Improvement to the senator-jump completion stuff:
+
+	o The completion list is now cached (buffer local) and reused when
+	  possible.  The cache is refreshed when parsing or partial parsing
+	  occurs.
+
+	o Greatly simplified the way completion name are handled.  Now only
+	  duplicated names are suffixed by parent names :-)
+
+	Some minor `checkdoc' fixes.
+
+	* java.bnf: Moved setup of Semantic variables from semantic-java.el.
+
+	* semantic-java.el: Some code reorganization.
+
+	Moved setup of Semantic variables to java.bnf.
+
+	Added setup of variables `semantic-command-separation-character',
+	`document-comment-start', `document-comment-line-prefix',
+	`document-comment-end'.
+
+	New `semantic-find-documentation' function override
+	`semantic-java-find-documentation' which handles javadoc comments.
+
+2001-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Updated several doc strings.
+
+	* semantic-texi.el: Added `semantic-texi-goto-source'.
+
+	* semantic-ctxt.el:
+	Updated almost all doc strings to include override information.
+
+	* document.el: Added `-' to meta variable name search.
+	Added support to turn "text" to ``text'' in texinfo files.
+
+	* semantic.texi: Updated lots of deffn, defvar, and defuns.
+	Added local context section.
+	Fixed compilation errors by adding the utilities section.
+
+2001-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-load.el: *** empty log message ***
+
+	* Project.ede:
+	Rearranged things.  There is now a languages target, full of the
+	parser .el files.
+
+	* semantic-el.el:
+	Added `user-visible' as an extra spec to variables and fns.
+	Added override fns for `find-documentation', and `insert-foreign-token'.
+
+	* semanticdb.el:
+	Added `semanticdb-set-buffer', and `semanticdb-refresh-table'.
+	Added `find-file-match' param to all search routines.
+	When a token is found in a file, make sure the file gets loaded into
+	Emacs.  Useful when additional work to a token needs to be done.
+	Fixed a search bug related to `diff-mode' parameter.
+
+	* semantic-util.el:
+	Fixed bug in `semantic-summarize-nonterminal' for when a token
+	type doesn't exist in the name list.
+
+	* semantic-imenu.el:
+	Fixed reversing of token problem when making type submenus, but
+	without running through the bucket function.
+
+	* document.el:
+	Moved where newlines were inserted for new function documentation.
+	Support deffn with Command and Option descriptions.
+	Protect against document generation switching buffers on us.
+
+	* semantic-texi.el: Added 'x' version in -name-field-list.
+	Fixed reversing problems in the return value of the texinfo parser.
+	Added `semantic-texi-insert-foreign-token'.
+	Added value for senator-step-at-start-end-token-ids.
+	Added ':' as the relation-separator-character.
+	Added semantic-texi-associate-files, semantic-texi-find-documentation,
+	semantic-texi-update-doc-from-texi, semantic-texi-update-doc-from-source,
+	and semantic-texi-updae-doc.
+
+	* semantic.el: Added `user-visible' to the list of EXTRA-SPECs.
+	Renamed `semantic-toplevel-bovinate-override' to
+	  `semantic-bovinate-toplevel-override'.
+	Added more documentation to `semantic-clear-toplevel-cache'.
+	Added semantic cache/partial reparse logic around foreign
+	  parsers.
+	More doc for `semantic-flex-keyword-p'.
+
+2001-02-21  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	`senator-minor-mode-setup' now uses the `semantic-active-p' function
+	to check if the current buffer is set up for parsing.
+
+	`senator-full-token-name' now append the parent names in reverse order
+	to the token name.  Thus the `senator-jump' completion list is now
+	easy to use.  You can just type a partial token name and press ENTER
+	to jump to it.  If the name is not unique a completion buffer is
+	displayed allowing to choose the right one.
+
+	`senator-beginning-of-defun' and `senator-end-of-defun' now
+	respectively step at start or end of tokens with identifier specified
+	in `senator-step-at-token-ids'.  Thus, adviced `beginning-of-defun'
+	and `end-of-defun' now work with any tokens where you can step at.
+
+	`senator-step-at-start-end-token-ids' can be set to `t' to step at
+	start and end of any token where it is allowed to step.
+
+2001-02-20  David Ponce  <david@dponce.com>
+
+	* semantic.el:
+	Fixed: with `semantic-flex-enable-newlines' on, `semantic-flex' didn't
+	catch newline when there was whitespace characters before it.
+
+2001-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Version change.  Added semantic-texi.
+
+	* semantic-ctxt.el:
+	Fixed up token identifying when in a sequence of dereferences.
+
+	* semantic-texi.el:
+	New File: Parse texinfo files using semantic's parsing override mechanism.
+
+	* semantic-el.el: Added `semantic-elisp-prototype-nonterminal'.
+	Use it as an override for `prototype-nonterminal' and `concise-prototype-nonterminal'.
+
+	* semantic-util.el:
+	Pulled the default body from `semantoc-prototype-nonterminal', and
+	turned it into `semantic-prototype-nonterminal-default'.
+
+	* semantic-c.el: New c.bnf.
+
+	* c.bnf: Removed unused %put calls.
+
+	* semantic.el: Version change.
+	Added `semantic-active-p' function.
+	Use `semantic-active-p' in `semantic-find-file-hook'.
+	Add beef to `semantic-toplevel-bovinate-override' usage.
+	Removed `reparse needed' message.
+
+	* semantic-imenu.el:
+	Added `semantic-imenu-expand-type-parts' variable.  This lets you not
+	  bucketize a file, and still expand nodes.
+	Added `semantic-imenu-expandable-token' variable.  This lets you have
+	  parser that doesn't have type information, but still benifits from
+	  hierarchical tag display.
+	Removed `notypecheck' from `semantic-create-imenu-index'.
+	Use the above variables.
+
+2001-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el:
+	Vectorized %put.  New forms accept a list in either the token name
+	or symbol/value pair.
+
+2001-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Fixed parse bug when a semantic-list was tested with a regex, then
+	used with an EXPAND tag.  Make sure the proper item is
+	sent down.
+
+	* c.bnf: Added ( testing to argument lists.
+
+	* semantic-ctxt.el:
+	Added section to determine the current local context (assignment,
+	argument, etc)
+	Added section for suggestions (incomplete) such as the type
+	someting should be.
+
+2001-02-09  David Ponce  <david@dponce.com>
+
+	* semantic-java.el: Changed `semantic-overlay-delete' by better
+	`semantic-deoverlay-token'.
+
+	* senator.el:
+	New implementation of completion menu to allow customization of menu
+	item text and insert function.
+
+	* semantic-util.el:
+	`semantic-override-table' format changed to obarray.
+	New function `semantic-install-function-overrides' to setup the
+	override table.
+	Updated `semantic-fetch-overload' to use override table format.
+	New functions `semantic-concise-prototype-nonterminal' and
+	`semantic-concise-prototype-nonterminal-default' to get a concise
+	prototype text from a token.
+
+	* java.bnf, semantic-java.el: Honour last changes in semantic-util.el.
+
+2001-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-c.el: c.bnf changes.
+
+	* c.bnf: Added type separation characters.
+	Added all constituents of DECLMOD into their own tokens.
+	Created a rule to create a list of declmods.
+
+	* semantic.el:
+	`semantic-change-function' will now correctly navigate through
+	all tokens hit by a change, and mark the first one found as dirty,
+	and keep it that way.  It used to mark all tokens, including enclosing
+	types.  Now it will only mark the innermost token.
+
+2001-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	`semantic-type-relation-separator-character' is now buffer local.
+	`semantic-find-nonterminal-by-name', get children only if they are
+	valid tokens.
+
+2001-02-05  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Use new `semantic-type-relation-separator-character' format.
+	New completion popup menu.
+
+	* java.bnf, semantic-java.el:
+	Use new `semantic-type-relation-separator-character' format.
+
+2001-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Changed `semantic-type-relation-separator-character' to be a list.
+	Change use of it.
+
+	* semantic-ctxt.el: Added new context function that work ok with C.
+	`semantic-end-of-command'
+	`semantic-beginning-of-command'
+	`semantic-ctxt-current-symbol'
+	`semantic-ctxt-current-assignment'
+	`semantic-ctxt-current-function'
+	`semantic-ctxt-current-argument'
+	and `-default' versions.
+
+2001-02-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Protect against buffers without a parsing table.
+
+	* semantic-c.el: New c.bnf
+
+	* c.bnf: Added c++ to the list of language modes.
+	Added lots of operator symbol tokens.
+	Added DECLMOD symbol w/ complex regexp.
+	Added CLASS, OPERATOR, PUBLIC, PRIVATE, and PROTECTED token keywords.
+	Support parsing of a class.
+	Add class bit parsing for functions.
+	Add destructor bit parsing for functions.
+	Allow operator symbols for methods.
+	Added parent and destructor fields to extra-spec for functions.
+	The function rule now returns a function or prototype.
+
+	* semantic-bnf.el: Added support for multiple language modes in a list.
+	When resetting buffers, reference the language modes as a list.
+	Reset a buffer with the setupfunction when available.
+
+2001-02-01  David Ponce  <david@dponce.com>
+
+	* senator.el: `senator-last-name' removed.
+	`senator-jump-completion-list' new variable.
+	`senator-jump' simpler and more robust!  Save the current
+	completion table in `senator-jump-completion-list', then reuse it
+	to retrieve the token association.  Also, this solves jump
+	conflicts when the same token name is present in different token
+	children.
+	`senator-completion-stream' Store the full token itself in the
+	value part of each association.
+
+2001-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el:
+	`senator-complete-symbol' now checks that it complete the same symbol
+	to reuse `senator-last-completion-stat'.  This is needed when for
+	example completing "set..." and then completing "get..." at the same
+	point.
+
+	* senator.el: Removed compatibility code.
+	Added isearch code, which was in `senator-isearch'.  Made that shorter.
+	`senator-step-at-start-end-p' fixed up.
+	Use `semantic-nonterminal-children' instead of querying for type and
+	then getting the parts.
+	Use semantic's separator character.
+	Added senator-find-nonterminal- .. functions.  Uses semanticdb if loaded.
+	When completing, use `senator-find...'.
+	Also do a little more to track if we are doing the same completion.
+
+	* semantic-util.el:
+	Fixed `semantic-token-variable-default' which was using the wrong index.
+	Fixed `semantic-find-nonterminal-by-name' to pass down new parameters.
+
+	* java.bnf:
+	Parses variables with more than one declaration, such as "int i, k;".
+
+	* semantic-java.el: New java.bnf.
+	Expand java nonterminals so compounded variable declarations are
+	separated into it's own token.
+
+	* semantic.el: Fixed `semantic-token-with-position-p'.
+
+2001-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* java.bnf: Java bnf file developed for JDE.
+
+	* semantic-java.el:
+	Sources originally developed for the JDE for java parsing.
+
+	* semantic-ctxt.el: Local context querying and navigation.
+
+	* Project.ede: Project file.
+
+	* semanticdb.el: Added `semanticdb-global-mode' variable.
+	Changed -find-nonterminal-* to take `search-parts' and
+	`search-includes'.
+	Added new -find- routines.
+
+	* semantic.texi: Added `current context' chapter.
+	Changed all MODIFIER references in token descriptions to EXTRA-SPEC.
+	Documented `semantic-token-extra-spec' and friends.
+
+	* semantic-util.el:
+	Changed -modifiers to -extra-spec, and restored -modifiers to the old behavior.
+	Moved `semantic-find-nonterminal-by-name'.
+	Changed `semantic-find-nonterminal-by-token',
+	`semantic-find-nonterminal-standard', and
+	`semantic-find-nonterminal-by-type' to take `search-parts' and
+	`search-include' parameters, and to use
+	`semantic-find-nonterminal-by-function'.
+	Changed `semantic-find-nonterminal-by-name-regexp',
+	`semantic-find-nonterminal-by-property',
+	`semantic-find-nonterminal-by-modifier',
+	and `semantic-find-nonterminal-by-function' to take `search-parts' and
+	`search-include' parameters.
+	New fn `semantic-find-nonterminal-by-type-regexp'.
+	Added new override methods to documentation string. (see semantic-ctxt.el)
+	Use `semantic-token-extra-spec' where apropriate.
+	Use `semantic-token-with-position-p' when returning token children.
+	Added `semantic-narrow-to-token'.
+	Added `semantic-show-dirty-mode' variable.
+
+	* semantic-sb.el: Change -modifier to -extra-spec.
+
+	* semantic-c.el: Updated with new c.bnf
+	Fixed `semantic-expand-c-nonterminal' to use `-extra-spec'.
+
+	* semantic-bnf.el:
+	Created a token keyword table.  Use keywords in language def.
+	Fixed `semantic-bnf-ASSOC' to add spaces in properly (dponce)
+	Added `scopestart' to `semantic-bnf-to-bovine' fn.  Use it.
+	Tried to fix indentation bug for rules.
+
+	* c.bnf: Added `codeblock' rule and `%scopestart'.
+
+	* semantic.el: Version update.
+	Renamed all MODIFIERS references to EXTRA-SPEC.
+	Added `semantic-token-with-position-p'.
+	Changed `semantic-bovinate-block-until-header' to
+	`semantic-bovinate-region-until-error', and fixed it up.
+
+2001-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Added `major-mode' to the table class.
+	Added `semanticdb-live-p' method to database and table classes.
+	Only save a database if it is live, and if
+	`semanticdb-write-directory-p' returns non-nil.
+	Make `semanticdb-save-all-db' interactive.
+	Do not write a table if it is not live.
+	Added `semanticdb-project-predicates' variable to help control
+	`semanticdb-write-directoryp' when the persistent-path contains
+	'project.
+
+	* semantic-util.el:
+	Split `abbreviate-nonterminal' to the override fn, and a default fn.
+	Change `semantic-nonterminal-children' to take an optional argument
+	to only return children if they have positional data in them.
+
+	* semantic-imenu.el:
+	Only create menus from the database with files of the same mode.
+
+	* semantic-bnf.el: Added token abbreviations.
+
+	* semanticdb.el: Added placeholders for persistence control.
+
+	* semantic.texi: Added many functions added to semantic-util.
+
+	* semantic-imenu.el: Moved semantic-imenu-auto-rebuild-running.
+	Protect against empty files.
+	Added ability to rebuild all imenu menus under a given directory.
+
+2001-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* senator.el: Added some completion functions.
+
+	* senator-isearch.el: *** empty log message ***
+
+	* semantic-util.el:
+	Change token accessors to handle new formats, including new functions
+	`semantic-token-type-modifier', `semantic-token-function-modifier',
+	`semantic-token-variable-modifier', `semantic-token-variable-const',
+	and `semantic-token-modifier'.
+	Updated `find-nonterminal-by-function' to take some control arguments.
+	Added `semantic-find-nonterminal-by-name-regexp' and
+	`semantic-find-nonterminal-by-modifier'.
+	Document finding fn now handles inline strings, or positional
+	arguments.
+	Fixed prototype-nonterminal to use new API fns.
+
+	* semantic-sb.el: Handle new modifiers storage.
+
+	* semantic-make.el: New make.bnf.
+
+	* semantic-imenu.el: Create imenu menus with all info from semanticdb.
+	Added xemancs imenu compatibility func.
+	Fixed the flush function to handle clean-token hook.
+
+	* semantic-el.el: Create tokens for the new token format.
+
+	* semantic-c.el: Fixed for new c.bnf.
+	Fixed `semantic-expand-c-nonterminal' to build the correct format
+	for the changed token types.
+
+	* semantic-bnf.el: Added the new ASSOC keyword for the OLE.
+	Added `semantic-bnf-generate-one-rule' and bind to bnf keymap.
+	Remove parens from the syntax table, inherit from parent
+	Add ; comment highlighting in OLE.
+	Rehashed indentation engine to alow more natural lisp indentation
+	  style in the OLE.
+
+	* make.bnf, c.bnf: Added support for new token formats that use ASSOC.
+
+	* semantic.el: Changed the definition of some tokens.
+	Changed the meaning of MODIFIERS.
+	Added fn `semantic-bovinate-make-assoc-list' for use in bnf files.
+
+2001-01-10  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Fixed undeclared local variable 'slot' in `senator-menu-item'.
+
+2001-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el:
+	Fixed object-write for tables to be very robust to errors when
+	deoverlaying the cache.  (This happens on exit, so it is very
+	important this work.)
+
+	* semantic.el: Removed some comments.
+	Added a version string.
+	Fixed the group description.
+
+	* semantic.texi:
+	Added `semantic-flex-map-keywords' and `semantic-flex-keywords' doc.
+
+2001-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Added `semanticdb-find-nonterminal-by-name' content.
+
+	* semantic.el:
+	Added `semantic-flex-map-keywords' and `semantic-flex-keywords'
+	from David Ponce.  Moved a few bits around.
+
+2001-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el:
+	Enable the use of the imenu splitup routines via `imenu-max-items'.
+
+	* semantic-util.el: Fixed completing read to work with XEmacs
+	Added `semantic-nonterminal-children' function.
+	Added `semantic-type-relation-separator-character'
+	Use the separator character in the abbreviate nonterminal fn.
+	Fixed overlay and deoverlay-token to use `nonterminal-children', and
+	 to accept non-token items.
+
+	* semantic-bnf.el: Added a space after all CR.
+	Added a command to create a table w/out indentation.
+	Bound old indentation command to C-cc
+
+	* semantic-c.el: Updated from c.bnf.
+
+	* c.bnf: Put `type' `t' onto some tokens.
+	Struct and enums now match the braces, and return nil.
+	Enum parts now have a token type of 'enum.
+	Added ... to fuction arg lists.
+	Match parens for arg lists.
+
+	* semantic.el: Added semantic-bovine-toplevel-full-reparse-needed-p and
+	semantic-bovine-toplevel-partial-reparse-needed-p.
+	Used them in semantic-bovinate-toplevel.
+
+	* semantic.texi: Added new functions in Compiling section.
+
+2001-01-03  David Ponce  <david@dponce.com>
+
+	* senator.el: New version 2.1.
+
+	Fixed a nasty typo in `senator-minor-mode'.  `run-hooks' were missing
+	a quotation before their arguments.  Thanks to "Charles Rich"
+	<rich@merl.com> who has reported this bug.
+
+	Added new `senator-jump' command.  Thanks to "Eric M. Ludlam"
+	<zappo@ultranet.com> and "T. V. Raman" <tvraman@almaden.ibm.com> for
+	their help.
+
+	Added new `senator-minor-mode-name' option to customize the name
+	displayed in the modeline when senator minor mode is on.
+
+	When semantic isearch mode is on it now appends "/si" to the senator
+	minor mode name displayed in the modeline.
+
+	Added new keyboard shortcut "\C-," to toggle semantic search in
+	isearch mode.
+
+	Some code improvements.
+
+	* senator-isearch.el: Improved isearch lazy highlighting support.
+
+2000-12-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	When parsing a file, if text is found, and a token is returned, but
+	that token's car is nil, do not save that token.
+	This will let a language author specify characters in a rule that
+	shouldn't be saved, speeding up the parsing process.
+
+2000-12-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el:
+	Dump parsing of the lisp functions, and use a magic read function to
+	pep up the speed of lisp parsing.
+
+	Eric
+
+2000-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Added info about %put in bnf mode.
+	Added stuff about keyword tables in the Lexing chapter.
+	Xref the two.
+
+	* semanticdb.el: Fixed file loading to return an object.
+	Fixed file reader to restore table parent-db slot.
+
+	* semantic.el:
+	Renamed `semantic-flex-is-keyword' to `semantic-flex-keyword-p'.
+
+	* semantic-bnf.el: Added put values of strings and lists.
+
+	* semantic-bnf.el: Added %put to language to values to put on a symbol.
+	`semantic-bnf-generate-and-load' not outputs a propertylist for
+	keyword tables.
+
+	* semantic.el:
+	Added `semantic-flex-keyword-put' and `semantic-flex-keyword-get'.
+	`semantic-flex-make-keyword-table' not takes a property list also.
+
+2000-12-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Added a parent object to tables.
+	Added `semanticdb-full-filename'.
+	Added error correction when loading a database.
+	Removed error protection during a write.
+	Fix `object-write' for tables; get the buffer of `semanticdb-full-filename'.
+	Fix hook running for `semanticdb-semantic-init-hook-overload'.
+	Set the parent of all tables in init hook.
+
+2000-12-12  David Ponce  <david@dponce.com>
+
+	* senator.el: `senator-mark-defun' now work on XEmacs too.
+
+	* senator.el:
+	Fixed a "side effect" bug with latest `beginning-of-defun' and
+	`end-of-defun' advices.  They caused font-lock, which uses
+	beginning/end of defun to force a reparse.  Thanks to "Eric M. Ludlam"
+	<zappo@ultranet.com> for pointing this.
+
+	Improved consistency with standard behaviour of `beginning-of-defun'
+	(go to the beginning of the line where the defun starts) and
+	`end-of-defun' (go to the beginning of the line following the end of
+	the defun).
+
+	Added useful advices for `narrow-to-defun', `mark-defun' and
+	`c-mark-function'.
+
+	Advices are enabled when the functions are called interactively and
+	`senator-minor-mode' is enabled.
+
+2000-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Remove inheritance from eieio-speedbar-*.
+	Added method for the database to get a table based on a filename.
+	Used said method in the init hook.
+	Added `semanticdb-file-stream', to return a stream for a file.
+
+2000-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Fixed semantic-find-token to not expect that the token has a buffer.
+	Use the current buffer if it doesn't have one.  (see comment)
+
+	* semantic-sb.el:
+	Generation of tags will now run through semanticdb if it is active.
+	As such, it is possible to view a file's tags without loading it into
+	a buffer.
+
+2000-12-11  David Ponce  <david@dponce.com>
+
+	* senator.el: Code cleanup and optimization.
+	`senator-next-token' and `senator-previous-token' now correctly work
+	when not binded to keyboard shortcuts.
+	`beginning-of-defun' and `end-of-defun' advices no more need to be
+	called interactively.  So `narrow-to-defun' can use these advices when
+	`senator-minor-mode' is enabled.
+
+	* senator.el:
+	Applied Eric Ludlam's patch.  It adds a special face for senator to
+	use for momentary highlight (requires latest semantic-util.el).  If
+	the user cancels the parse (C-g) when `senator-minor-mode'
+	initializes, it doesn't kill the rest of the configuration.  (Useful
+	on a slow machine.)
+
+2000-12-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Added miscellaneous tool chapter.
+	Added senator text.
+	Added information for all the property functions.
+
+	* semantic-c.el: New c.bnf.
+
+	* c.bnf: Fix spelling errors.
+
+	* semantic-util.el: Added `semantic-find-nonterminal-by-property'.
+	Don't try to remove hooks in `semantic-unhighlight-token'.
+	Fix some quoting in some macros to get hooks removed.
+	Added `semantic-add-label', and `semantic-show-label' user fns.
+	Fix `semantic-show-dirty-mode' to check for the right fcn when toggling.
+
+	* semantic.el: Added `semantic-edits-are-safe' variable.
+	Added PROPERTIES to standard token.
+	Added accessors for PROPERTIES slot in a token.
+	Added semantic-token-put, and -get functions.
+	Put the parser nonterminal into the token when it isn't bovine-toplevel.
+	Put 'dirty t into a token when it is edited.
+	Removed 'dirty flag when it is rebovinated.
+
+	* semantic.el: Made semanticdb-minor-mode and auto-load.
+
+	* semanticdb.el: Fixed write to get point max from the correct place.
+
+2000-12-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semanticdb.el: Require eieio-base for base classes.
+	Added variable semanticdb-save-database-hooks.
+	Added pointmax to the table class.
+	Wrap the save fcn into condition-case to protect against errors.
+	Added messages when saving the table.
+	Track pointmax on save for each file.
+	Reset the table on load if the table is out of date (pointmax /=)
+	Wrap deoverlaying in a condition case, with clear-table as error condition.
+	Added beginnings of utility functions.
+
+	* semantic-util.el:
+	Turn the highlight/unhighlight set into a stack of faces.
+	Added `semantic-momentary-unhighlight-token' for momentary case.
+	Handle the cache which no longer has buffer size in it.
+	Removed `bovinate-nonterminal'
+	`semantic-current-token' returns a token now, in addition to the message.
+
+	* semantic.el: Added a working type tracking variable.
+	Show working messages when reparsing.
+	Change the cache to not have the size at the end. (It isn't used anymore.)
+	Make sure during a reparse the the new overlay gets its token reset.
+
+	* semantic.texi:
+	Added new chapter for tools, and added speedbar, semanticdb, and senator.
+
+2000-12-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Fixed rebovinate-token to handle types.
+
+	* semantic.el:
+	Added variable `semantic-dirty-tokens' to track dirty tokens.
+	Added hooks `semantic-dirty-token-hooks', and `semantic-clean-token-hooks'
+	 which run when a token is marked dirty or clean.
+	Clear dirty tokens during a reparse.
+	Call `semantic-after-toplevel-bovinate-hook' on a clear also.
+	 This lets us track the value of the cache better.
+	In `semantic-bovinate-toplevel', added a new section which cleans
+	 all the dirty tokens, but only if we don't need a full reparse.
+	In our change-function, add dirty tokens to the dirty token list,
+	 and don't bother with the type searching stuff.  Call dirty-token-hooks.
+	New function `semantic-rebovinate-token'.
+
+	* semantic-util.el:
+	Added show-dirty-mode, which highlights dirty tokens.
+	Previous fn bovinate-nonterminal had its guts moved to semantic.el
+	semantic-describe-token forces a reparse upon request.
+
+2000-12-08  David Ponce  <david@dponce.com>
+
+	* senator-isearch.el, senator.el: A bunch of XEmacs compatibility code!
+
+2000-12-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	When re-overlaying a buffer, put the 'semantic property onto the overlay.
+	Added `bovinate-nonterminal' for splicing new data into an old token slot.
+	Added `semantic-describe-token' for seeing what we think is under the cursor.
+
+	* semantic.el: Added `semantic-raw-to-cooked-token' from the guts of
+	`semantic-bovinate-nonterminals'.
+	Added autoload for senator.
+
+2000-12-07  David Ponce  <david@dponce.com>
+
+	* senator.el: Applied Eric Ludlam's doc fix patch.
+
+2000-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el: Fixed `summarize' misspelling.
+
+	* semantic-util.el: Fixed misspelling of summarize.
+	Deoverlayed tokens no longer contain the buffer.
+	Implemented `semantic-deoverlay-cache' and `semantic-overlay-cache'.
+	Added `semantic-deoverlay-list' and `semantic-overlay-list'.
+
+	* semantic.el:
+	Fixed utils that fetch token extents to new vector mode w/out a buffer.
+	Added `semantic-file-token-stream' to get a token stream for a file.
+
+	* semanticdb.el: Add msg to `semanticdb-file-stream'.
+	Add `semanticdb-minor-mode-p' to learn if its active.
+	Fix kill hook to only bovinate if the buffer has a cache to save.
+
+	* semanticdb.el: New file.
+
+2000-12-05  David Ponce  <david@dponce.com>
+
+	* senator.el: Improved consistency with built-in search commands.
+	New search commands like the ones in the Emacs Search menu.
+	Added a menu to senator minor mode.
+	The common prefix key in senator minor mode is now "C-c ,".
+	Updated header comments.
+	Some code cleanup.
+
+	* senator-isearch.el:
+	Initial revision needed by senator.el 1.7 (version 2.0) and above.
+
+	* senator.el:
+	New major version 2.0 with [i]search feature and a senator minor mode.
+	Added compatibility code between GNU Emacs 20.7 and 21.
+
+2000-12-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el: Enable a face for momentary highlighting.
+	Added code to convert a token list to/from overlays.
+
+2000-12-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added a defvar for semantic-init-hooks.
+	Renamed to plural for hooks.
+
+	* semantic.el:
+	Added the ability for a semantic token to contain an overlay, or numbers.
+	Added a fn to get the CONS cell the overlay (or whatever) lives in.
+	Added a find-file-hook, which turns around and calls `semantic-init-hook'
+	  when the table is availble for parsing.
+	Move cache setting into a fcn to be called.  This lets an external
+	  program set the cache (from a file perhaps.)
+
+2000-11-28  David Ponce  <david@dponce.com>
+
+	* senator.el: More performance improvements.
+	New option `senator-highlight-found' to customize token highlighting.
+
+2000-11-27  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Fixed a serious performance problem in `senator-next-token' and
+	`senator-previous-token'.
+
+	Before searching for a next or previous token the point was just moved
+	to respectively the next or previous character. Thus, during
+	navigation, the buffer was explored character by character :-(.  Now
+	`senator-next-token' and `senator-previous-token' skip whole tokens
+	(unless they are 'type tokens which may include sub tokens).
+
+2000-11-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Version number.
+
+2000-11-14  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Minor change to `senator-next-token' and `senator-previous-token' to
+	return the token at point.  Useful when calling these commands
+	non-interactively.
+
+	* senator.el:
+	Improved navigation in semantic token where to step at start and end.
+
+	- `senator-next-token' move the point to the end of token if it was at
+	  beginning or in the middle of the token.
+
+	- `senator-previous-token' move the point to the beginning of token if
+	  it was at end or in the middle of the token.
+
+2000-11-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* make.bnf: Fixed comment.
+
+	* semantic-c.el: Reverted to previous version of keyword regexps.
+
+	* semantic-bnf.el: Force the table to be cleared before a rebuild.
+	Insert `nil' for keyword table if there are no keywords.
+
+	* semantic-imenu.el:
+	Added protection from imenu not existing on older XEmacsen.
+
+	* semantic.el: Fixed XEmacs bug in `semantic-bovinate-nonterminals'.
+
+2000-11-10  David Ponce  <david@dponce.com>
+
+	* senator.el:
+	Fixed a little bug in `senator-previous-token' navigation.
+
+	* senator.el: Initial revision.
+
+2000-10-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added in some XEmacs overlay stuff.
+
+	* c.bnf: Tidied up opt-array stuff.
+
+	* semantic-c.el: Updated for new c.bnf
+
+2000-10-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Fixed overlay aliases for XEmacs.
+	Added `semantic-overlay-live-p' alias.
+	Use `semantic-overlay-live-p' when needed so XEmacs works properly.
+
+	* semantic-util.el: Fixed some byte compiler warnings.
+
+2000-10-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Fixed some calls to overloaded functions to take the correct number
+	of parameters.
+
+2000-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Moved `semantic-after-toplevel-bovinate-hook' call to only happen when
+	a buffer is actually reparsed.
+
+2000-10-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Changed the overlay aliases to check the xemacs feature.
+	Added the hooks `semantic-after-toplevel-bovinate-hook',
+	`semantic-before-toplevel-cache-flush-hook' and
+	`semantic-no-reparse-needed-change-hook'.  Call then in the right
+	spots.
+	Enable reparsing the the change hook to use the additions from
+	semantics reparse not found change hook.
+
+	* semantic-imenu.el:
+	Updated the `semantic-imenu-goto-function' to check for deleted overlays.
+	Added `semantic-imenu-flush-fcn' to be used as a hook.
+	Changed what was `semantic-create-imenu-index' to
+	`semantic-create-imenu-index-1'.  The new `semantic-create-imenu-index'
+	calls `semantic-create-imenu-index-1' after setting the goto fcn,
+	and setting the flush hook to `semantic-imenu-flush-fcn'.
+	Changed calls to `semantic-create-imenu-index' to -1.
+
+2000-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el:
+	Added `comment-start' and `comment-start-skip' values in bnf mode.
+
+	* semantic.el:
+	Make `semantic-ignore-comments' and `semantic-flex-depth' buffer local.
+
+2000-10-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el: Added defsubst support.
+
+2000-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el:
+	Set up to work with older speedbars again. (removing dframe references.)
+
+	* semantic.texi: Added `semantic-find-nonterminal-by-overlay',
+	`semantic-find-nonterminal-by-overlay-in-region', and
+	`semantic-current-nonterminal'.
+
+	* INSTALL: Fixed up a little
+
+	* INSTALL: New file.
+
+2000-10-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Fixed `semantic-token-variable-optsuffix' for overlay stuff.
+
+	* semantic.el: Fixed `semantic-token-docstring' for overlay stuff.
+
+	* semantic-util.el:
+	Fixed throws finding to account for shorter tail of a nonterminal.
+	Added `semantic-current-nonterminal' as a non-list producing short-cut
+	for `semantic-find-nonterminal-by-overlay'.
+
+2000-10-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Updated version number.
+
+2000-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Fixed copyright.
+
+	* semantic.el: Added `semantic-token-buffer'.
+
+	* semantic-sb.el, semantic-el.el, document.el, semantic.texi:
+	Fixed up with some API changes.
+
+	* semantic-util.el:
+	Several override methods find information about tokens, and took both
+	a buffer, and a token.  Tokens' overlay now have the buffer in it,
+	so don't require this parameter anymore.
+
+	* semantic.texi: Fixed up with some API changes.
+
+	* working.el: Indentation and edebug updates.
+
+2000-09-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Updated the version.
+	Made the user options user options.
+	Fixed press a key.
+
+	* semantic-el.el: Specify to only nab 6 flex tokens from sub-lists.
+
+	* semantic-imenu.el, semantic-mode.el, semantic-sb.el, semantic-util.el:
+	Updated calls to `semantic-bovinate-toplevel'.
+
+	* semantic.el:
+	Added `semantic-flex-depth', and `semantic-ignore-comments'.
+	Removed depth/trashcomments from bovinate-toplevel.
+	Removed comment stripping code from the parser.
+	Do not add comments to the flex list, unless the variable is set.
+	Added length parameter to the flexer.  Lets a language only
+	look at the first few tokens in a sublist.
+
+	* semantic-bnf.el: Updated calls to `semantic-bovinate-toplevel'.
+
+	* semantic.texi:
+	Added long section describing some of semantics variables.
+
+	* document.el: Changed use of `semantic-bovinate-toplevel'.
+
+2000-09-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el:
+	Added `working-status-call-process', and `working-verify-sleep'.
+
+	* working.el:
+	Added a special form `working-status-timeout' which uses a timer
+	to display the dynamic message, letting the code run normally.
+	Added timer workarounds.
+	Added `working-wait-for-keypress' as an example.
+
+	* semantic-imenu.el: Made customizable vars of type 'bool in 'boolean.
+
+	* semantic-bnf.el: Quote the expression to eval after load.
+
+	* semantic-bnf.el:
+	Added `semantic-bnf-mode' to `which-func-modes' for later use.
+
+	* semantic-c.el: c.bnf changed.
+
+	* c.bnf:
+	Moved `type' to be before `function' and `variable' in `declaration'.
+
+	* semantic-imenu.el:
+	Changed the default which-function to be a new function which
+	intelligently builds a name.
+
+	* semantic-imenu.el: Fixed default for `semantic-which-function'.
+
+	* semantic-imenu.el: Make imenu config items buffer local.
+
+	* semantic.el:
+	Added type internals check when determining if a change requires a
+	reparse.
+
+	* semantic-util.el: Added interactive bovinate fns from semantic.el.
+
+	* semantic.el: `semantic-toplevel-bovine-cache-check' is now boolean.
+	Moved bovinate fns into semantic-util.
+	Moved all debug stuff to after the parser, and before the lexer.
+	Added new `after-change-hook' entry `semantic-change-function'.
+	This new function will set `semantic-toplevel-bovine-cache-check'
+	to true based on what the user changed.
+
+	* semantic-mode.el: Changed comment, and removed dynamic reparse stuff.
+
+	* semantic-el.el: Added advice into the language.
+
+	* semantic.el: Added some more overlay compatibility aliases.
+	Added `semantic-clear-toplevel-cache' to `change-major-mode-hook'.
+
+	* semantic-util.el:
+	Added `semantic-find-nonterminal-by-overlay-in-region',
+	`semantic-find-nonterminal-by-overlay-next', and
+	`semantic-find-nonterminal-by-overlay-prev'.
+
+	* semantic-imenu.el:
+	Added a `which-function' hack to use with `which-function' mode.
+
+2000-09-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	summerize-nonterminal, prototype-nonterminal, and prototype-file all
+	had incorrect overload function grabbing code.  Set them up correctly.
+
+	* semantic-mode.el: Added a lame menu for imenu soring functions
+
+	* semantic-util.el:
+	Reversed all compares in the semantic-sort functions because they were
+	backwards.
+
+2000-09-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el:
+	nreverse sub-buckets because `semantic-bucketize' now leaves things in
+	the right order.
+
+	* semantic-util.el: Added a filter function to `semantic-bucketize'.
+	Added many sortingfunctions of the form:
+	 `semantic-sort-tokens-by-name/type-in/decreasing[-ci]'
+
+	* semantic-imenu.el:
+	Added `semantic-imenu-sort-bucket-function' variable.
+	Pass this to `semantic-bucketize'.
+
+	* semantic-mode.el: Removed `checkdoc-add-to-list'.
+
+2000-09-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Added spiffy functions for changing properties on a token's overlay.
+
+	* semantic-imenu.el:
+	Added interactive toggle functions for our sorting/binning variables.
+
+	* semantic-mode.el: New file.
+
+	* semantic-imenu.el:
+	Added changes from David Ponce: no double separators, all types have submenus.
+	Added `semantic-imenu-goto-function' which takes overlays for
+	position.  Replaced all explicit numbers with the overlay from the
+	semantic token.
+
+2000-09-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Added symbol->name list to major-mode
+	Added imenu index function to major-mode
+
+	* c.bnf:
+	Fixed up struct/union variable declaration section to use new lexical
+	tokens for struct/union.
+
+	* semantic-c.el:
+	Fixed up struct/union variable declaration section of c.bnf.
+
+	* semantic.texi: Fixed up for use with OVERLAY.
+	Fixed up some descriptions of quoting, and updated the settings
+	section.
+	Broke the BNF converter section into sub-nodes.
+
+	* semantic-el.el: Added support for methods and classes.
+
+2000-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Fixed typo for delete-overlay in debug mode.
+
+	* semantic-c.el:
+	In `semantic-expand-c-nonterminal', copy the overlay, not start/end.
+
+	* semantic.el: Converted to use overlays instead of start/end.
+	Added overlay compatibility section.
+	Changed the doc string for `semantic-toplevel-bovine-table'.
+	Added `semantic-overlay-error-recovery-stack',
+	  `semantic-overlay-stack-add', 'semantic-overlay-stack-clear',
+	  `semantic-delete-overlay-maybe'
+	  `semantic-clear-toplevel-cache' was updated to delete overlays.
+	`semantic-token-extent/start/end' was changed to use the new
+	  `semantic-token-overlay' macro.
+	`semantic-bovinate-toplevel' was updated to include a local scope of
+	  the overlay error stack.
+	`semantic-bovinate-nonterminals' changed to convert START/END from the
+	  lambdas into overlays.  Convert overlays from the return streamed
+	  onto the error recovery stack.
+	Converted old overlay code in debugger to use compatibility layer.
+	In `semantic-bovinate-stream', added an overlay stack to the local
+	  scope.  Track the overlays from recursive parses, clear the error
+	  recovery stack whenever a failed match occurs.  Return a list of
+	  overlays found during this parse as a third list in the return arg.
+	  Deleted ITERATE section.
+	  Return nothing if we have a failed match.
+	In `semantic-bovinate-from-nonterminal', use car-safe.
+
+	* semantic-util.el: Added `semantic-find-nonterminal-by-overlay'.
+
+2000-09-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el: Added `semantic-imenu-bucketize-file' option.
+	Added `semantic-imenu-buckets-to-submenu' option.
+	When bucketize-file is nil, then do not put tokens into a bucket.
+	When buckets-to-submenu is nil, then do not put buckets into menus,
+	but only into sections divided with a separator.
+	David Ponce fixed a reverse order problem.
+
+	* semantic.el:
+	`semantic-flex-make-keyword-table' now returns the table instead of
+	assigning it.
+
+	* c.bnf: Added %keywordtable
+
+	* semantic-bnf.el:
+	Rearranged semantic-bnf-generate-and-load to do keyword table, and
+	setup changes first, and the main table last.
+	Added keywordtable keyword to bnf language.
+	Added keywordtable finding function.
+
+	* semantic-c.el: Updated for new semantic-bnf.
+
+	* semantic-util.el:
+	In semantic-bucketize, return only those buckets with stuff in them.
+
+	* semantic-imenu.el:
+	For types, do not show buckets if there is only one bucket.
+	Added *typedef* to list of a types buckets to go to that class'
+	definition. (David Ponce)
+
+2000-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Added `semantic-flex-keywords-obarray' and `semantic-flex-make-keyword-table'
+	When a symbol is found in `semantic-flex', it is looked up in the
+	obarray, and its symbol is then substituded in place of the symbol.
+
+	* semantic-bnf.el: Tokens that are symbols now generate a keyword list.
+	This list is passed to the flexer, and converted into an obarray.
+
+	* semantic-imenu.el: Fixed reversing of indicies problem.
+	Enable imenu--sort-by-name inside sub-sub menus
+	Added *TypeDef* menu item for jumping to the definition of types, as
+	opposed to their sub-parts.
+	Fixed jumping to the end of a definition, not the beginning.
+
+2000-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-make.el: Fixed spelling mistake.
+
+	* semantic-c.el: Rebuilt table from c.bnf.
+
+	* c.bnf: Updated to use %token to make new tokens for use in RULES.
+
+	* semantic-bnf.el: Added the %token token to the language.
+	This generates smart regexps in the table.
+
+2000-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Removed all indenting commands from code generation.
+	Perform region indentation instead at the very end.
+
+	* semantic-bnf.el:
+	`semantic-bnf-lambda-convert', EXPAND tokens should use the old
+	`lambda' notation, and other code shoud use `semantic-lambda'.
+	This fixes extra start/end data problems.
+
+	* semantic.el:
+	Updated `semantic-bovinate-from-nonterminal' to remove the let statement.
+
+2000-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* c.bnf: Use new BNF settings section.
+
+	* semantic-el.el: Updated for new semantic-lambda macro.
+	Added support for backquote in a single expression.
+
+	* semantic-c.el: Updated for new c.bnf.
+
+2000-09-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Fixed build errors.
+
+	* semantic.texi: Added new section on the setup section and % tokens
+
+	* make.bnf: Use new bnf settings section.
+
+	* semantic-bnf.el:
+	New code generators for settings based on new tokens available in
+	the setup seciton.
+
+	* semantic-make.el: Rebuilt using new semantic-bnf
+
+2000-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el: Updates to handle the new speedbar beta.
+
+	* semantic.el:
+	Working is a part of semantic.  Removed large crufty bits.
+	Added `semantic-case-fold' for modes.  Initialize `case-fold-search'
+	from this when parsing.
+	`semantic-bovinate-symbol-nonterminal-p' is now `defsubst'
+	Added `semantic-lambda' macro for use in tables.
+
+	* semantic-bnf.el: Updated language to include % token things.
+	Updated output to use `semantic-lambda' macro.  Updated language to
+	use them.
+	Updated generator setup code to get the token stream, use %tokens
+	parsed in the input file for file/table/mode detection.
+	Passes token stream down to all the sub-functions.
+	Updated font-lock keywords for % tokens.
+	bnf-mode alias to semantic-bnf-mode
+	Updated indent function to use lisp-indent-function whenever inside %( )%
+	Added `semantic-bnf-in-settings-p' function.
+
+2000-07-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el: Remove any reference to parent part of types.
+	We will just ignore it.
+
+2000-07-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* c.bnf: Support multiple continuous decl modifiers.
+	Added modifiers into variables.
+
+	* semantic-c.el: Updated to new c.bnf.
+	Changed `semantic-expand-c-nonterminal' to use optsuffix for bit
+	fields and arrays.  Use modifiers for actual modifiers like static.
+
+	* semantic-util.el: Added `semantic-token-variable-optsuffix'.
+	Used above in `semantic-prototype-nonterminal'.
+	Also added modifiers support to functions and types.
+
+	* semantic.el:
+	Added OPTSUFFIX to variables for bit fields, or opt arrays.
+
+2000-07-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el:
+	Fix for imenu subindexes when a types PARTS is empty.
+
+2000-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Doc fix for semantic-token-variable-modifiers.
+
+	* semantic-util.el: Fixed doc of type-modifiers.
+	Fixed function-throws macro to be 6 not 5
+
+2000-07-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Fixed left over `semantic-default-c-built-in-types' as
+	`semantic-default-built-in-types'.
+
+	* semantic.texi, semantic-util.el:
+	Added semantic-find-inntermost-nonterminal-by-position.
+
+	* semantic-make.el: Updated with make.bnf.
+
+	* make.bnf, semantic-el.el: Updated for new elements in the tokens.
+
+	* semantic-c.el: Updated with c.bnf.
+
+	* c.bnf: Updated for new elements in the tokens.
+
+	* semantic.texi: Syntax error.
+
+	* semantic.texi: Various documentation updates.
+	Added `semantic-token-type-modifiers', `semantic-token-function-modifiers',
+	`semantic-token-function-throws'.
+
+	* semantic-util.el:
+	Added `semantic-token-type-modifiers', `semantic-token-function-modifiers',
+	`semantic-token-function-throws'.
+
+	* semantic.el: Updated documentation.
+
+2000-06-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Added `semantic-current-token' to call semantic-find-nonterminal-by-position
+	with arguments.
+
+2000-06-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Quick hack to make flex robust to broken lists.
+
+2000-06-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added fn to read nonterminals until it reached an error.
+	Fixed up some doc.
+	Added `with-syntax-table'
+
+2000-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-imenu.el:
+	Use imenu-summary-function for regular items, not just types.
+	Maybe reverse this later.
+
+	* semantic-util.el:
+	Updated summerize to use the symbol->name assoc list.
+
+	* semantic-util.el:
+	Swapped summerize-nonterminal to call prototype-nonterminal,
+	and prototype-nonterminal now some of the old guts of summerize.
+	abbreviate now does some of the same things as the speedbar display.
+
+	* semantic-imenu.el: Updated for new options in display.
+
+2000-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Added optional argument to bovinate to force a cache clear.
+
+	* semantic-util.el:
+	Added semantic-bucketize, and semantic-abbreviate-nonterminal.
+
+	* semantic-sb.el:
+	Removed the bucketizer, and used the new version now in semantic-util.
+
+	* semantic-el.el: Build in imenu support
+
+	* make.bnf: Added special equals and colon NTs
+
+	* c.bnf: The table has moved.
+
+	* semantic-make.el: Added imenu bovinator support.
+
+	* semantic-imenu.el, semantic-c.el: New file.
+
+2000-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Patched with emacs texi functions.
+	Added `semantic-flex-enable-newlines' and `semantic-flex-syntax-modifications'.
+
+	* semantic.el: Added some ITERATE code which doesn't work yet.
+	Added `semantic-symbol->name-assoc-list. (buffer local)
+	Added `semantic-flex-syntax-modifications' (buffer-local)
+	Use syntax-modifications to change the way parsing occurs.
+
+	* semantic-el.el: Renamed to semantic-el.el.
+	Removed all C stuff.
+	Updated mega hook to a setup function.
+
+	* semantic-make.el: Updated from mega-hook lambda to a setup function.
+	Changed table to match new make.bnf
+
+	* semantic-sb.el:
+	Updated to use the new variable `semantic-symbol->name-assoc-list'.
+	This lets languages define their own names for types of tokens.
+	The bucketing code changed.  It now uses a vector.
+
+	* semantic-make.el, make.bnf: New file.
+
+2000-05-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Added text about semantic-token-extents.
+
+	* semantic-util.el:
+	Added a comment for finding some other utils functions in semantic.el
+	Fixe typo.
+
+2000-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added `semantic-token-extent'
+
+	* semantic-sb.el: Added XEmacs invisibility hack stuff.
+
+2000-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Fixed frame-width for XEmacs minibuffer strangeness.
+	fixed up some animation stuff. (Old)
+
+2000-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: Added small EDE reference
+
+	* sformat.el: Added untokenizing regular expression generators.
+
+	* document.el: Added file-header stuff.
+
+	* semantic-el.el: Added updates from c.bnf
+
+	* c.bnf: Use EXPANDFULL for enums, and for argument lists to functions.
+
+2000-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Added semantic-flex-start and semantic-flex-end functions.
+
+	* semantic-util.el: Added flex option to the doc finder.
+
+	* document-vars.el: New file.
+
+	* document.el:
+	Converted all the CPCOMMENT stuff here, and made work with semantic.
+
+	* sformat.el:
+	if no additional args are passed to sformat, then `format' will not be
+	called on the result.
+
+	* semantic.el: Added semantic group for custom.
+
+	* semantic-util.el: Added find-documentation, and a snarf-doc command.
+
+	* semantic-sb.el: Added autoexpand length variable.
+	Moved making of invisible text.
+	semantic-sb-buttons-plain no longer save-excursion/set-buffer.
+	Removed region narrowing in semantic-sb-buttons.
+	Bucket insertion will now skip the bucket if it only contains one item.
+
+	* semantic-el.el: Added defcustom as variables for Emacs Lisp.
+
+2000-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sformat.el: New file.
+
+2000-04-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* document.el: New file.
+
+	* semantic.texi: Added piles o doc about util functions.
+
+	* semantic.el: docstrings are now described as a position.
+	Fixed other doc strings.
+	semantic-bovinate-toplevel takes new CHECKCACHE argument.
+	If buffer is different size from last time, re-parse.
+	Added more info in semantic-flex reguarding END param.
+
+	* semantic-util.el: Updated a bunch of documentation.
+	Added semantic-find-nonterminal-by-position
+	Fixed a bunch of misspelled &optionals
+	Added a set buffer when finding nonterminals.
+	Added semantic-find-documentation to find a doc string.
+	Added semantic-find-doc-snarf-comment to get the actual text from a buffer.
+
+	* semantic-el.el: Fixed Emacs Lisp codes to have doc-string positions.
+
+	* semantic-el.el:
+	Fixed lisp expressions to have correct sizing information.
+
+	* semantic-util.el:
+	Added semantic-prototype-file as an overridable function.
+
+2000-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Working msg now has filename in it.
+	Added `returnonerror' flag to semantic-bovinate-nonterminals.
+	goto (point-min) in `bovinate'
+	Open/close paren matching now matches only one paren at a time.
+
+	* semantic-util.el: Added scanning message to recursive search routine.
+
+	* semantic-el.el: Updated w/ c.bnf.
+	Added elisp override for finding dependencies.
+
+	* c.bnf: Added support for Linux __P items.
+	Added support for "..." fn prototypes.
+
+2000-04-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el:
+	Find dependency now uses EDE to track local includes if needed.
+
+	* semantic.el:
+	Updated doc about include nonterms.  (Added system flag.)
+
+	* semantic-util.el:
+	Added nil t to all parsing routines used for searching.
+	Added new recursive find-by-name function.
+
+	* semantic-sb.el: Added <> after system includes.
+
+	* semantic-el.el: Updated for c.bnf
+
+	* c.bnf: Added system flag to include files.
+
+2000-04-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-util.el: New file.
+
+	* semantic.el: Removed some API functions to semantic-util.
+	Require semantic-util.
+
+	* semantic-sb.el: Fixed token display for misc items.
+
+	* semantic-el.el: Added built-in types stuff.
+
+2000-04-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Fixed first line comment.
+
+	* semantic.el: Reverse the order of full expanded items.
+
+	* semantic-sb.el: Fixed typo (extra parens)
+
+	* semantic.el:
+	Added semantic-dependency-include-path, and semantic-find-dependency.
+	These were in semantic-inc.el, but belong here with the override
+	table.  Fixed up semantic-find-nonterminal to use the new function.
+
+	* semantic-el.el, semantic-sb.el:
+	Removed semantic-inc, use new stuff in semantic.el for same behavior.
+
+	* semantic.texi: Added stuff about EXPAND and EXPANDFULL
+
+	* semantic-bnf.el:
+	Added support for the EXPANDFULL token when expanding semantic lists.
+
+	* semantic-el.el: Change to c.bnf.
+
+	* c.bnf:
+	structparts now uses EXPANDFULL to get positional information for it's
+	sub parts.  This simplified STRUCTSUBPARTS nonterminal
+
+	* semantic.el:
+	Added support for a second type of inline token expantion which
+	includes positional information.
+
+	* semantic-el.el:
+	Fixed up the -c- hook to handle the default include path.
+
+	* semantic-sb.el: Added some smarts about the new semantic-inc file.
+
+	* semantic-inc.el: New file.
+
+2000-04-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el, semantic.el, semantic-el.el, semantic-sb.el:
+	Fixed copyright information.
+
+	* c.bnf: Added copyright information.
+
+	* semantic.texi:
+	Added a package recommendation in Non-Terminals chapter.
+
+	* semantic.el: Added a package recommendation to comments.
+
+	* semantic-el.el: Added package support to Emacs Lisp table.
+
+	* semantic-sb.el: Added support for `package'.
+
+2000-04-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Documented some byte compiler warnings.
+
+2000-04-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el: updated the C bnf to match c.bnf.
+
+	* c.bnf: Macros split from 'variable' nt.
+	Added knr-argument parsing.
+
+	* semantic-bnf.el:
+	Added the ability to also reset all modes (and thereby hooks) for a given mode
+
+2000-04-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el:
+	Turn `semantic-clear-toplevel-cache' into an interactive function.
+
+	* semantic-sb.el: Added a Misc bucket for Speedbar.
+
+	* semantic-el.el: Updated to new c.bnf
+
+	* semantic-bnf.el: Added a .bnf speedbar extension.
+	Make the return list compatible with speedbar.
+
+	* c.bnf: Added `filename' for include rules.
+
+	* semantic.el: Fixed up some documentation.
+
+	* semantic.texi: Added a section on using the nonterminal token stream.
+
+2000-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Fixed typo.
+
+	* semantic.el:
+	Tried to speed up semantic-flex by using a short-circuit and around
+	the -extentions section.
+
+	* semantic-el.el: Fixed a "." punctuation regular expression.
+
+	* semantic.texi:
+	Added some doc about lexing extentions.  Fixed spelling errors.
+
+	* semantic.el:
+	Added big reference/compare cycle code.  To use uncomment a section.
+
+2000-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added parser dumper.
+
+	* semantic.el: Fixed byte compiled table bug.
+
+2000-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added debugging support for backquoted tables.
+
+	* semantic-sb.el:
+	Added support for the new speedbar tagging extentions.
+
+1999-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Use assq instead of assoc for some lookups.
+
+	* c.bnf: Added a splice , for varnamelist.
+
+	* semantic-bnf.el:
+	Output tables now use backquote so that lambda expressions in the
+	list can be byte compiled.
+
+	* semantic-el.el:
+	Converted all tables to use backquote which then inlines lambda expressions.
+
+1999-12-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el: don't concat numbers (for XEmacs).  (by Jan Vroonhof)
+
+1999-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el: Small tweek to cons cells.
+
+1999-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-bnf.el: Moved the doc into the info file.
+
+	* c.bnf: Fixed up some language definitions.
+
+	* semantic-el.el:
+	Added use of the flex extensions to strip out pre-processor symbols.
+
+	* semantic.el:
+	Added extensions to the flexer so that the mode author can cause some
+	syntax elements to be stripped (such as pre-processor symbols.)
+
+1999-05-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.texi: New file.
+
+	* semantic-sb.el: Use the semantic token jump and summerize features.
+
+	* semantic-el.el: Updated C code table and expander.
+
+	* semantic.el: Changed the variable format a little bit.
+	Added bovinate-debug
+	Added overridable functions for jump/summerize.
+
+1999-05-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Added a cache clear function.
+	Fixed working message call.
+
+	* semantic-bnf.el: Auto-clear when bovinating the BNF.
+	Fixed working message call.
+
+	* semantic-el.el: Fixed the C variables some.
+
+	* semantic-sb.el: Fixed up jumping to non-toplevel token things.
+	Added a parent token finder (a parent has a location)
+	Fixed a little bit with centering.
+
+1999-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Added bubble displays.
+
+1999-05-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Fixed up doc strings.
+	Fixed the dotgrowth display to change after growing beyond the edge of
+	the screen.
+	Added a utility fn for getting the frame size.
+	Use utility in dotgrowth and bar-graph.
+
+1999-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el:
+	Fixed the plain bar/percent display.  Updated version to 1.1.
+
+	* semantic.el: Added a simple cache.
+
+	* semantic-el.el: Fixed compile warning.
+
+	* semantic.el: fixed compile warnings.
+
+	* semantic-sb.el: Added support for tag hierarchy methods.
+
+	* semantic.el: Added a type macro.
+	You can now force-fail a match in the debugger.
+
+	* semantic-el.el: changes from c.bnf.
+
+	* c.bnf: Fixed up the returns of some nonterminals.
+
+	* semantic-sb.el:
+	Made it do interesting things for what is returned the C bovinator.
+
+1999-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Larger types now pass down only position.
+
+	* semantic-bnf.el: Fixed lots o bugs.
+
+	* semantic-el.el:
+	Added a variable expander, and improved bnf from c.bnf
+
+	* c.bnf: New file.
+
+1999-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Debugger fix for termianls.
+	Convenience `bovinate' function.
+	Infinite comment fix.
+	Inline comment stripping.
+
+	* semantic-bnf.el: New file.
+
+1999-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el: Added some C rules (still broken though.)
+
+	* semantic.el: Fixed to work in 20.2
+
+1999-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic.el: Doces on the debugger.
+
+	* semantic.el: Added small doc updates.
+	Added a parse-table debugger, and debug entry point.
+
+	* semantic-sb.el: Last of the changes needed for swapping name/tokensym
+
+	* semantic.el: converted all synthetic words to reference nonterminals.
+
+1999-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-sb.el: New file.
+
+	* semantic-el.el: Updated to put name before token symbol.
+
+	* semantic.el:
+	Changed doc to want the NAME first in the synthetic tokens list.
+	Added lots of macros for referencing return tokens.
+	Mucked with working message code.
+
+	* working.el: fixed to be more robust wrt frames again.
+
+1999-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Update copyright.
+	Added celeron-percent-display.
+	Forced incoming precents to integer for status display.
+	Fixed so if the current frame has no minibuffer, the correct frame
+	width is used.
+	Added `working-frame-animation-display' to handle generic animations.
+	Converted the celeron to use the animator display.
+	Added a bounce display.
+
+1999-05-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* semantic-el.el, semantic.el: New file.
+
+1998-12-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el:
+	Added let of working-log-max into the displayers so they do not drop
+	messages into the *Messages* buffer.
+
+1998-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: Removed a typo in ref1 defvar.
+
+	* working.el: Fixed some spelling.  Changed static to dynamic.
+
+	* working.el: Updated backwards compatibility comment section.
+
+	* working.el: Changed the custom variable names to be more consistant.
+
+	* working.el: Fixed up documentation and such.
+	Made to compile clean.
+
+	* working.el: Added celeron, plus static status.
+
+1998-12-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* working.el: New file.
+
diff --git a/site/cedet-1.0pre7/semantic/INSTALL b/site/cedet-1.0pre7/semantic/INSTALL
new file mode 100755
index 0000000..45bba8d
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/INSTALL
@@ -0,0 +1,40 @@
+How to install Semantic
+
+1) Byte compile semantic (optional, but recommended)
+2) Install load hooks into your .emacs file.
+
+   Follow the INSTALL file in the top level of this distribution.
+
+3) If turning everything on is too much:
+
+   There are five levels of support provided in semantic.  The
+   functions you can use are:
+
+   semantic-load-enable-minimum-features
+   semantic-load-enable-code-helpers
+   semantic-load-enable-gaudy-code-helpers
+   semantic-load-enable-excessive-code-helpers
+   semantic-load-enable-semantic-debugging-helpers
+
+   If you do not get the specific combination of features you want
+   you can enable or disable individual features as you wish.
+   Please see the documentation for those features for additional
+   information about what they enable.
+
+   There is also support for Exuberent ctags if it is installed.  Use:
+
+   semantic-load-enable-all-exuberent-ctags-support
+
+3.141) Custom setup
+
+   If you don't want to use one of the default mode enable functions
+   above, you can instead turn on only the parts you want.
+
+   Read the info file in doc/semantic-user.info.  It contains descriptions
+   all the different minor modes.
+
+4) To send bug reports, or participate in discussions about semantic,
+   use the mailing list cedet-semantic@@sourceforge.net via the URL:
+
+   http://lists.sourceforge.net/lists/listinfo/cedet-semantic
+
diff --git a/site/cedet-1.0pre7/semantic/Makefile b/site/cedet-1.0pre7/semantic/Makefile
new file mode 100644
index 0000000..f6c4d7f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/Makefile
@@ -0,0 +1,220 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../common/  ctags/ wisent/ bovine/\
+    symref/  ../speedbar/ ../ede/ ../eieio/\
+    ./
+LOADDEFS=semantic-loaddefs.el
+LOADDIRS=. bovine wisent ctags symref
+init_LISP=semantic-load.el
+semantic_LISP=semantic.el semantic-fw.el semantic-lex.el semantic-lex-spp.el semantic-edit.el semantic-util.el semantic-tag.el semantic-tag-ls.el semantic-find.el semantic-sort.el semantic-tag-file.el semantic-tag-write.el semantic-doc.el semantic-idle.el semantic-custom.el
+utils_LISP=semantic-ast.el semantic-ctxt.el semantic-decorate.el semantic-dep.el semantic-format.el semantic-scope.el
+Database_LISP=semanticdb.el semanticdb-mode.el semanticdb-debug.el semanticdb-ebrowse.el semanticdb-el.el semanticdb-file.el semanticdb-find.el semanticdb-mk.el semanticdb-ref.el semanticdb-search.el semanticdb-typecache.el semanticdb-javascript.el semanticdb-global.el
+ELISPPRELOAD= cedet-compat
+tools_LISP=semantic-adebug.el semantic-chart.el semantic-complete.el semantic-debug.el semantic-decorate-mode.el semantic-decorate-include.el semantic-elp.el semantic-grammar.el semantic-ia-sb.el semantic-ia.el semantic-imenu.el semantic-mru-bookmark.el semantic-sb.el semantic-util-modes.el senator.el
+Analyzer_LISP=semantic-analyze.el semantic-analyze-complete.el semantic-analyze-fcn.el semantic-analyze-debug.el semantic-analyze-refs.el
+Languages_LISP=semantic-texi.el semantic-html.el
+maintenance_LISP=semantic-ede-grammar.el
+metagrammar_SEMANTIC_GRAMMAR=semantic-grammar.wy
+metagrammar_SEMANTIC_GRAMMAR_EL=semantic-grammar-wy.el
+tests_LISP=semantic-regtest.el semantic-ia-utest.el semantic-utest.el semantic-utest-c.el
+example_MISC=semantic-example.el semanticdb-skel.el
+scripts_MISC=semanticdb.sh
+misc_AUX=INSTALL NEWS ChangeLog AUTHORS ONEWS renamelist.txt
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)
+
+
+
+all: autoloads init semantic utils Database tools Analyzer Languages metagrammar tests example scripts wisent Tests Symref Documentation ctags bovinator
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: semantic
+semantic: $(semantic_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: utils
+utils: $(utils_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: Database
+Database: $(Database_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: tools
+tools: $(tools_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: Analyzer
+Analyzer: $(Analyzer_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: Languages
+Languages: $(Languages_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: maintenance
+maintenance: $(maintenance_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: metagrammar
+metagrammar: $(metagrammar_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: tests
+tests: $(tests_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+example: 
+	@
+
+scripts: 
+	@
+
+.PHONY:wisent
+wisent:
+	$(MAKE) -C wisent
+
+.PHONY:Tests
+Tests:
+	$(MAKE) -C tests
+
+.PHONY:Symref
+Symref:
+	$(MAKE) -C symref
+
+.PHONY:Documentation
+Documentation:
+	$(MAKE) -C doc
+
+.PHONY:ctags
+ctags:
+	$(MAKE) -C ctags
+
+.PHONY:bovinator
+bovinator:
+	$(MAKE) -C bovine
+
+tags: 
+	$(MAKE) -C wisent/ $(MFLAGS) $@
+	$(MAKE) -C tests/ $(MFLAGS) $@
+	$(MAKE) -C symref/ $(MFLAGS) $@
+	$(MAKE) -C doc/ $(MFLAGS) $@
+	$(MAKE) -C ctags/ $(MFLAGS) $@
+	$(MAKE) -C bovine/ $(MFLAGS) $@
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist: autoloads $(metagrammar_SEMANTIC_GRAMMAR_EL)
+	mkdir $(DISTDIR)
+	cp semantic-loaddefs.el $(init_LISP) $(semantic_LISP) $(utils_LISP) $(Database_LISP) $(tools_LISP) $(Analyzer_LISP) $(Languages_LISP) $(maintenance_LISP) $(metagrammar_SEMANTIC_GRAMMAR) $(metagrammar_SEMANTIC_GRAMMAR_EL) $(tests_LISP) $(example_MISC) $(scripts_MISC) $(misc_AUX) $(ede_FILES) $(DISTDIR)
+	$(MAKE) -C wisent $(MFLAGS) DISTDIR=$(DISTDIR)/wisent dist
+	$(MAKE) -C tests $(MFLAGS) DISTDIR=$(DISTDIR)/tests dist
+	$(MAKE) -C symref $(MFLAGS) DISTDIR=$(DISTDIR)/symref dist
+	$(MAKE) -C doc $(MFLAGS) DISTDIR=$(DISTDIR)/doc dist
+	$(MAKE) -C ctags $(MFLAGS) DISTDIR=$(DISTDIR)/ctags dist
+	$(MAKE) -C bovine $(MFLAGS) DISTDIR=$(DISTDIR)/bovine dist
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/NEWS b/site/cedet-1.0pre7/semantic/NEWS
new file mode 100644
index 0000000..d807695
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/NEWS
@@ -0,0 +1,558 @@
+Semantic 2.0 is a major new version.  This NEWS file covers changes
+since Semantic 1.4, which was many years ago.  See the ChangeLog for
+differences between various beta and prerelease versions.
+
+* Versioning
+
+Semantic now uses `inversion' to track version numbers of different
+releases.  Semanticdb table files save the version number they are
+created at, and can identify old tables to regenerate them when an
+incompatible upgrade occurs.
+
+* API changes
+
+** Naming Conventions
+
+There is a new naming convention for the things Semantic refers too.
+The list of renamed functions is far to long to list here.  All
+functions that used the old conventions have been changed to use the
+new conventions, and are not explicitly listed here unless there is
+an incompatible change.
+
+*** New conventions
+
+token - Refers to a lexical analyzer production.
+stream - A list of tokens
+tag - Refers to a datastructure created by a grammar to represent
+      something in a language file
+table - A hierarchical list of tags.
+tag-class - A tag may represent a function, data type, or variable.
+parse - Run a source file through a parser.
+
+*** Old conventions
+
+token - Could be a lexical token, or a tag
+nonterminal - Could be a grammar nonterminal, or a tag
+stream - Could be a list of lexical tokens, or a tag table.
+token-type - New represented as tag-class
+bovinate - Run a source file through a parser.
+
+*** Obsoletion stratety
+
+The new framework function `semantic-alias-obsolete' has been used to
+obsolete old functions and allow old code to continue working.  Byte
+compiler warnings will be produced if old functions are used.  The
+old function will be completely removed in a future release.
+
+For variables, the function `semantic-varalias-obsolete' has been
+used.  When available it uses a native alias routine for compatibility
+or displays a warning.
+
+** Lexical analysis.
+
+*** The old `semantic-flex' API is deprecated.
+
+The lexical analysis toolkit has been completely rewritten as a new
+`semantic-lex' API.
+
+*** Lexical token management.
+
+`semantic-lex-token'
+Create a new lexical token.
+
+`semantic-lex-token-class'
+Fetch the class of a lexical token.
+
+`semantic-lex-token-bounds'
+Fetch the start and end locations of a lexical token.
+
+`semantic-lex-token-start' and `semantic-lex-token-end'
+Respectively fetch the start and end position of a lexical token.
+
+`semantic-lex-token-text'
+Fetch the text associated with a lexical token.
+
+*** Macros to easily build custom lexers.
+
+`define-lex'
+Define a new lexer as a set of lexical rules.
+
+`define-lex-analyzer'
+Base macro to create a lexical rule.
+
+A lexical rule associates a PATTERN to an ACTION.
+
+A PATTERN describes how to match data in the input stream, with a
+combination of regular expressions and strings.
+
+An ACTION is a set of arbitrary Emacs Lisp statements executed when
+the input stream matches the corresponding PATTERN, typically to push
+a new token on the lexical stream.
+
+`define-lex-regex-analyzer' and `define-lex-simple-regex-analyzer'
+Create lexical rules that match a regexp.
+
+`define-lex-block-analyzer'
+Create a lexical rule for paired delimiters blocks.
+
+*** A set of useful lexical rules is predefined.
+
+`semantic-lex-beginning-of-line'
+`semantic-lex-newline'
+`semantic-lex-newline-as-whitespace'
+`semantic-lex-ignore-newline'
+`semantic-lex-whitespace'
+`semantic-lex-ignore-whitespace'
+`semantic-lex-number'
+`semantic-lex-symbol-or-keyword'
+`semantic-lex-charquote'
+`semantic-lex-punctuation'
+`semantic-lex-punctuation-type'
+`semantic-lex-paren-or-list'
+`semantic-lex-open-paren'
+`semantic-lex-close-paren'
+`semantic-lex-string'
+`semantic-lex-comments'
+`semantic-lex-comments-as-whitespace'
+`semantic-lex-ignore-comments'
+`semantic-lex-default-action'
+
+*** Some lexers are predefined too.
+
+A comment lexer: `semantic-comment-lexer' that handles comments.
+A `semantic-simple-lexer' that ignores comments and whitespace, and
+returns tokens corresponding to syntax as specified by the syntax
+table.
+
+*** Lexical support for a pre-processor
+
+semantic-lex-spp.el is a new library for handling preprocessor style
+commands at lexical analysis time.  You can create ifdef/else/end
+style blocks which will cut out lexical tokens that aren't to be
+processed, and also substitue named symbols with other lexical values.
+
+*** `semantic-lex' core "overload" function.
+
+Called to lexically analyze text in an area of the current buffer.
+
+*** debugging bad syntax
+
+Using `semantic-lex-debug-analyzers' combined with `debug-on-error'
+allows you to debug analyzers inside usually protected parsing
+routines.
+
+** Parsing
+
+*** API to manage a parse tree state.
+
+`semantic-parse-tree-set-unparseable'
+Indicate that there are lexical issues that prevent parsing.
+
+`semantic-parse-tree-set-unparseable-p'
+Return non-nil if  there are lexical issues that prevent parsing.
+
+`semantic-parse-tree-set-needs-update'
+Indicate that the current parse tree needs to be updated.
+
+`semantic-parse-tree-needs-update-p'
+Return non-nil if the current parse tree needs to be updated.
+
+`semantic-parse-tree-set-needs-rebuild'
+Indicate that the current parse tree needs to be rebuilt.
+
+`semantic-parse-tree-needs-rebuild-p'
+Return non-nil if the current parse tree needs to be rebuilt.
+
+`semantic-parse-tree-set-up-to-date'
+Indicate that the current parse tree is up to date.
+
+`semantic-parse-tree-up-to-date-p'
+Return non-nil if the current parse tree is up to date.
+
+*** Core "overload" functions to abstract call to parsers.
+
+New parsers can be plugged-in easily by overriding the following
+core functions:
+
+`semantic-parse-stream' called to parse a given stream, starting at a
+given nonterminal rule.
+
+`semantic-parse-changes' called to reparse changes in the current
+buffer.
+
+`semantic-parse-region' called to parse a buffer's area.
+
+*** Four core parsers are available.
+
+- Two general parsers
+
+  - The Semantic "bovinator".
+  - A new LALR(1) parser: Wisent, port of Bison 1.3 in Elisp.
+
+- Two specific parsers
+
+  - The Elisp parser based on the Emacs built-in function `read'.
+  - A regexp parser used in `texinfo-mode'.
+
+*** Iterative parser.
+
+Iterative parsers are better than rule-based iterative functions
+in that they can handle obscure errors more cleanly.
+
+The new `semantic-repeat-parse-whole-stream' helper function abstracts
+this action for other parser centric routines.
+
+*** Incremental parser.
+
+In Semantic 1.x, changes were handled in a simplistic manner, where
+tags that changed were reparsed one at a time.  Any other form of
+edit were managed through a full re-parse.
+
+The new `semantic-edits-incremental-parser' attempts to minimize the
+number of times a full re-parse needs to occur.  While overlays and
+tags will continue to be recycled in the simple case, new cases
+where tags are inserted or old tags removed from the original list
+are handled.
+
+*** Lexical Safety feature.
+
+You can protect code from reparsing the buffer if there are lexical
+errors with the `semantic-lex-catch-errors' macro.
+
+*** Deprecated and removed API.
+
+The `semantic-flex' API is deprecated, and replaced by the new
+`semantic-lex' API.  The old API still exists for compatibility with
+Semantic 1.x.
+
+`semantic-parse-region' should be used instead of
+`semantic-bovinate-region-until-error' and
+`semantic-bovinate-from-nonterminal-full' which still exist for
+compatibility with the Semantic 1.x API.
+
+The old incremental parser `semantic-rebovinate-token' and associated
+`semantic-show-dirty-mode' have been removed and replaced respectively
+by new `semantic-edits-incremental-parser' and
+`semantic-highlight-edits-mode'.
+
+`semantic-bovinate-toplevel-override' is replaced by the new core
+parsing "overloads".
+
+`semantic-bovine-toplevel-full-reparse-needed-p' and
+`semantic-bovine-toplevel-partial-reparse-needed-p' are replaced by
+the new parse tree state management API.
+
+`semanticdb-project-predicates' hook is renamed
+`semanticdb-project-predicate-functions'.
+
+* Grammar framework.
+
+Semantic 2.0 introduced a new common grammar framework to simplify
+development of grammars suitable to parser needs.
+
+** New "abstract" major mode: `semantic-grammar-mode'.
+That defines a useful environment to develop grammars (indentation,
+syntax highlighting, parsing, etc.).
+
+By deriving new "concrete" major modes one can provide customized
+generators that convert a grammar parse tree into Elisp forms needed
+by a particular parser.
+
+** New "overloads" are provided to customize Elisp generation.
+
+`grammar-setupcode-builder'
+That returns the setup code form.
+
+`grammar-parsetable-builder'
+That returns the parser table value.
+
+`grammar-keywordtable-builder'
+That returns the keyword table table value.
+
+`grammar-tokentable-builder'
+That returns the token table value.
+
+** New grammar modes derived from `semantic-grammar-mode'.
+
+*** `bovine-grammar-mode'.
+That converts grammar input form into Elisp code to be used by the
+"bovinator".  Such grammars are associated to the .by file extension.
+Old grammars in .bnf files are no longer supported.
+
+*** `wisent-grammar-mode'.
+That converts grammar input form into Elisp code to be used by the
+Wisent LALR parser.  Such grammars are associated to the .wy
+file extension.
+
+** Grammar build process
+
+A new grammar construction process separates generated code from hand
+written code.  An semantic specific EDE extension will generate
+Makefile rules to build these files.
+
+Language specific human written code must call the automatically
+generated setup function.
+
+*** Auto-generation of lexical rules
+
+The new %type statement combined with the use of %token and %keyword
+statements permits the declaration of a lexical type and associates it
+with patterns that define how to match lexical tokens of that type.
+
+The grammar construction process can benefit from the %type, %keyword
+and %token declarations to automatically generate the definition of a
+lexical rule for each explicitly declared lexical type.
+
+Default values are provided for well known types like <keyword>,
+<symbol>, <string>, <number>, <punctuation>, and <block>.  Those types
+assume that the correct patterns are provided by %keyword and %token
+statements, a simple "%type <type>" declaration should generally
+suffice to auto-generate a suitable lexical rule.
+
+It is then easy to put predefined and auto-generated lexical rules
+together to build ad-hoc lexical analyzers.  Examples are available
+among the grammars included in the distribution.
+
+*** Bovine grammar
+
+A file FOO.by will create the file FOO-by.el, and FOO-by.elc
+automatically.
+
+*** Wisent grammar
+
+A file FOO.wy will create the file FOO-wy.el, and FOO-wy.elc
+automatically.
+
+* Decorations.
+
+** secondary overlays
+An API for adding secondary overlays onto a tag has been added.
+This allows you to add/remove arbitrary visual effects onto a tag.
+Uses tag link hooks to make sure the overlays are added/removed
+safely.
+
+** folded tags
+New functions `semantic-set-tag-folded' and `semantic-tag-folded-p'
+allow you to put a tag into a 'folded' state where only the 1st line
+is showing. 
+
+* Database.
+
+** semanticdb.el
+
+*** `semanticdb-abstract-table'
+New base class for all tables of tokens lists.
+
+*** `semantidb-table'
+Inherits from the abstract table.
+
+*** `semanticdb-project-database'
+No longer saves itself to a file.
+
+** semanticdb-file.el
+New routines for databases saved to disk in plain EIEIO save files.
+Depends on `inversion' for save file compatibility tests.
+
+*** `semanticdb-project-database-file'
+File based project database type.
+
+*** `semanticdb-cleanup-cache-files'
+New command to tidy up cache files against directories that no longer
+exist.
+
+** semanticdb-search.el
+All old search routines have been moved into this file.
+All old search routines are now methods on database projects.
+All old search routines have been obsoleted.  Use semanticdb-find.el
+based routines instead.  These functions are still maintained because
+the semanticdb-find based routines do not yet handle all the same
+search paramters as the old routines.
+
+*** `semanticdb-search-results-table'
+Class for any search in a database with no tables of its own.
+
+*** Different search classes
+Searches in databases have been broken into three classes.
+- Basic search - on values as stored directly in a semantic token.
+- Advanced search - complex searches of relationships.  Needed for
+  system databases which cannot support a generic search.
+- Generic search - Takes a predicate.  System databases cannot usually
+  support this style of search.
+
+** semanticdb-find.el
+New prefered search routines which start with `semanticdb-find...'.
+These routines take fewer parameters.  There are more types of search
+routines than before to make up for the missing parameters.
+
+*** Basic search
+Scans the current buffer, and all files included into this buffer.
+Only scans top level tags.
+
+*** Deep search
+A Deep search will "flatten" the tags in a file so they are all
+visible, including parts of structures or classes.
+
+*** Brute searches
+As a basic search, but scans all files in the current project.
+
+*** semanticdb-find-translate-path
+This new routines determines the "path" to scan.  There are two basic
+types of paths.  The default is to examine the specified buffers
+include list, and only scan those files.  Optional "brute" path will
+scan all files in the current project, including system level databases.
+
+*** database Find Results
+Find Results are somewhat more formalized, and have routines to
+deal with them.
+
+semanticdb-find-results-p
+semanticdb-strip-find-results
+semanticdb-find-result-with-nil-p
+semanticdb-find-result-length
+semanticdb-find-result-nth
+
+Find results can be passed into any semanticdb-find routine as the
+path and only those results will be scanned.
+
+*** New types of searches not originally in semanticdb-search.el
+
+**** semanticdb-find-*-by-name-for-completion
+Searches "for completion" use different matching constraints
+equivalent to the regular expression "^chars", which provide a speed
+improvement.
+
+** semanticdb-system.el
+Representation of a database belonging to system libraries.
+These databases may not come from source code, and can represent
+object files, header file libraries and the like.
+
+*** `semanticdb-create-system-database'
+Interactive command to create a system database, and bind it into
+your search space.
+
+*** `semanticdb-project-database-system'
+Baseclass for any system database.
+
+*** `semanticdb-project-database-system-c'
+Class for C libraries of header files.
+
+** semanticdb-el.el
+Special system database representing Emacs' internal state.
+Implements all search routines optimized as much as possible.
+
+*** `semanticdb-table-emacs-lisp'
+Table representing search results for Emacs Lisp symbols.
+
+*** `semanticdb-project-database-emacs-lisp'
+Database representing Emacs' internal symbol obarray.
+
+** semanticdb-ebrowse.el
+Special system database using ebrowse as a backend for providing C/C++
+tagging information.
+
+*** `semanticdb-create-ebrowse-database'
+Interactive command to create an ebrowse database, and bind it into
+your search space.
+
+** semanticdb-mk
+Routines for building semantic.cache files from a command line script.
+
+* Utilities.
+
+** `semantic-find-tag-parent-by-overlay'
+Find the parent of a tag by overlays.
+    
+* Minor modes.
+
+** `semantic-show-parser-state-mode'
+Display the parser state in the modeline.
+
+** `semantic-highlight-edits-mode'
+Highlight areas that a user edits.
+
+** `semantic-stickyfunc-mode'
+Make the current functions header `sticky' to the top of the current
+window.  (Emacs 21 required)
+
+** `semantic-auto-parse-mode' obsolete
+** `semantic-summary-mode' obsolete
+
+** `semantic-idle-scheduler-mode'
+Replaces seman`tic-auto-parse-mode'.  Reparses all buffers.
+Also schedules additional functionality.
+
+** `semantic-idle-summary-mode'
+Replaces seman`tic-summary-mode'.  Uses the new idle scheduler
+to execute itself.
+
+** `semantic-idle-completions-mode'
+New minor mode for automatically going into inline completion
+for symbol prefixes.
+
+** `semantic-decoration-mode'
+New minor mode that manages any form of decoration to be added to
+tags.  It absorbs the duties of:
+
+** `semantic-show-tag-boundaries-mode': obsolete
+** `semantic-highlight-by-attribute-mode': obsolete
+
+** `semantic-mru-bookmark-mode'
+Track tags you've edited, and provide C-x B keybinding to jump back to
+previously edited tags.
+
+* Hooks.
+
+** `semantic-before-auto-parse-hooks'
+Run before option `semantic-auto-parse-mode' begins parsing.
+
+** `semantic-after-auto-parse-hooks'
+Run after option `semantic-auto-parse-mode' has parsed.
+
+* Smart Completion
+
+** `semantic-analyze-current-context'
+This is now an overridable function.
+The objects contain more details on scoping for more accurate
+symbol lookup.
+
+** `semantic-analyze-possible-completions'
+This is now an overridable function.
+
+* Setup.
+
+A lot of things are now auto-loaded on demand.  Setup should now be
+done through the cedet.el initialization file.
+
+* Languages.
+
+** Python parser added.
+The LALR grammar is based on the official grammar with slight
+modifications.  The tokens generated are formatted similar to
+those produced by the Java parser.
+
+** Erlang parser added.
+The grammar was written for semantic 1.4 in BNF format, and converted
+to .by format.
+
+** HTML external parser added.
+The regexp based parser was copied from the texinfo example
+and modified for semantic 2.0.
+
+** Makefile parser improved.
+There is now excellent smart completion support.
+
+** Emacs lisp parser improved.
+The Emacs Lisp parser is now more flexible.  Using the new macros
+`semantic-elisp-setup-form-parser' and
+`semantic-elisp-reuse-form-parser', it is easy to parse all kind of
+Lisp forms to produce semantic tags.
+
+** Texinfo parser improved
+The texinfo parser was updated, and supports the new
+analysis engine.
+
+
+Local variables:
+mode: outline
+paragraph-separate: "[ 	]*$"
+end:
diff --git a/site/cedet-1.0pre7/semantic/ONEWS b/site/cedet-1.0pre7/semantic/ONEWS
new file mode 100644
index 0000000..504a2cd
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ONEWS
@@ -0,0 +1,108 @@
+* Changes for Semantic 1.4
+
+** New Non-recursive parser by David Ponce <david@dponce.com>
+
+** Changed contents of some nonterminals to make them language agnostic
+
+*** Variables no longer contain an explicit constant flag.
+
+*** Modifiers field for variable, function, and types is now an association
+    list.
+
+** Semantic Context Analysis library
+
+*** Analyzizes via type information the local context
+
+*** Provides smart completion information
+
+*** Speedbar mode for using analysis information.
+
+** Semantic Class Browser structure generator
+
+*** Generates objects representing a browsable class structure
+    which links parents and subclasses and externally defined
+    methods into an easilly navigated (programatically) structure.
+
+*** Speedbar interface to browser structure (simple)
+
+** User Visible Features
+
+*** semantic-load.el simplifies installation.
+
+*** Added partial reparseing of buffers where only token contents have changed.
+
+*** Added `semantic-show-dirty-mode'.
+
+*** Added `semantic-show-unmatched-syntax-mode'
+
+*** Added `semantic-auto-reparse-mode'
+
+*** Added new tool, `semanticdb'.
+    Semanticdb caches token lists between sessions with a specific file.
+
+*** Added semantic-texi for parsing texinfo files.
+
+**** Commands for creating @deffn sections from source
+
+**** Commands for updating an entire document with the source.
+
+*** Added semantic-scm for parsing Scheme (guile) scripts
+
+*** semantic-el now has a much faster Emacs Lisp parser.
+    It uses the built in Emacs read command.
+
+*** semantic-c updates
+
+**** Handles most of C++, including templates
+
+**** Faster type parsing
+
+**** Faster function/variable parsing
+
+**** Summary text for keywords for eldoc
+
+*** Added Senator (Semantic Navigator) by David Ponce <david@dponce.com>
+
+**** Provides a minor mode keymap and menu.
+
+**** Search and Isearch in token names.
+
+**** Jump to functions by name
+
+**** Token Completion, and completion menu.
+
+**** eldoc support for languages supported by semantic.
+
+**** hippie expand try function for token names.
+
+*** Added Java.bnf by David Ponce <david@dponce.com>
+
+**** java.bnf from JDE by Paul Kinnucan and David Ponce
+
+**** semantic-java.el derived from JDE.
+
+**** eldoc support in bnf modes.
+
+*** semantic-imenu can now tags for all files that had been loaded in
+    emacs in a directory if semanticdb is active
+
+*** Imenu and speedbar group externally defined methods together.
+
+** bnf-mode: Language Author Features
+
+*** Parsing with `semantic-toplevel-bovinate-override' is better supported.
+
+*** Fixed BNF indentation engine to handle Optional Lambda Expressions
+   in a much cleaner way.
+
+*** Keyword table for a language can be generated using %token specifiers
+    and queried using `semantic-flex-map-keywords'.
+
+*** Source level debugging in the .bnf file
+
+*** skeleton.bnf as a good starting point for new languages.
+
+Local variables:
+mode: outline
+paragraph-separate: "[ 	]*$"
+end:
diff --git a/site/cedet-1.0pre7/semantic/Project.ede b/site/cedet-1.0pre7/semantic/Project.ede
new file mode 100644
index 0000000..ae91083
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/Project.ede
@@ -0,0 +1,100 @@
+;; Object semantic
+;; EDE project file.
+(ede-proj-project "semantic"
+  :name "semantic"
+  :version "2.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "semantic-loaddefs.el"
+    :autoload-dirs '("." "bovine" "wisent" "ctags" "symref")
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("semantic-load.el")
+    )
+   (ede-proj-target-elisp "semantic"
+    :name "semantic"
+    :path ""
+    :source '("semantic.el" "semantic-fw.el" "semantic-lex.el" "semantic-lex-spp.el" "semantic-edit.el" "semantic-util.el" "semantic-tag.el" "semantic-tag-ls.el" "semantic-find.el" "semantic-sort.el" "semantic-tag-file.el" "semantic-tag-write.el" "semantic-doc.el" "semantic-idle.el" "semantic-custom.el")
+    :versionsource '("semantic.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("semantic-bovine" "wisent" "semantic-ectag-util")
+    )
+   (ede-proj-target-elisp "utils"
+    :name "utils"
+    :path ""
+    :source '("semantic-ast.el" "semantic-ctxt.el" "semantic-decorate.el" "semantic-dep.el" "semantic-format.el" "semantic-scope.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-elisp "Database"
+    :name "Database"
+    :path ""
+    :source '("semanticdb.el" "semanticdb-mode.el" "semanticdb-debug.el" "semanticdb-ebrowse.el" "semanticdb-el.el" "semanticdb-file.el" "semanticdb-find.el" "semanticdb-mk.el" "semanticdb-ref.el" "semanticdb-search.el" "semanticdb-typecache.el" "semanticdb-javascript.el" "semanticdb-global.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("semantic-symref")
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-elisp "tools"
+    :name "tools"
+    :path ""
+    :source '("semantic-adebug.el" "semantic-chart.el" "semantic-complete.el" "semantic-debug.el" "semantic-decorate-mode.el" "semantic-decorate-include.el" "semantic-elp.el" "semantic-grammar.el" "semantic-ia-sb.el" "semantic-ia.el" "semantic-imenu.el" "semantic-mru-bookmark.el" "semantic-sb.el" "semantic-util-modes.el" "senator.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "ede" "speedbar" "inversion")
+    )
+   (ede-proj-target-elisp "Analyzer"
+    :name "Analyzer"
+    :path ""
+    :source '("semantic-analyze.el" "semantic-analyze-complete.el" "semantic-analyze-fcn.el" "semantic-analyze-debug.el" "semantic-analyze-refs.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "ede")
+    )
+   (ede-proj-target-elisp "Languages"
+    :name "Languages"
+    :path ""
+    :source '("semantic-texi.el" "semantic-html.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-elisp "maintenance"
+    :name "maintenance"
+    :path ""
+    :source '("semantic-ede-grammar.el")
+    :partofall 'nil
+    :aux-packages '("ede-proj" "eieio")
+    )
+   (semantic-ede-proj-target-grammar "metagrammar"
+    :name "metagrammar"
+    :path ""
+    :source '("semantic-grammar.wy")
+    )
+   (ede-proj-target-elisp "tests"
+    :name "tests"
+    :path ""
+    :source '("semantic-regtest.el" "semantic-ia-utest.el" "semantic-utest.el" "semantic-utest-c.el")
+    )
+   (ede-proj-target-makefile-miscelaneous "example"
+    :name "example"
+    :path ""
+    :source '("semantic-example.el" "semanticdb-skel.el")
+    )
+   (ede-proj-target-makefile-miscelaneous "scripts"
+    :name "scripts"
+    :path ""
+    :source '("semanticdb.sh")
+    )
+   (ede-proj-target-aux "misc"
+    :name "misc"
+    :path ""
+    :source '("INSTALL" "NEWS" "ChangeLog" "AUTHORS" "ONEWS" "renamelist.txt")
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/semantic.shtml"
+  :web-site-directory "~/cedet/www"
+  :web-site-file "semantic.shtml"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :configuration-variables 'nil
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/semantic/bovine/Makefile b/site/cedet-1.0pre7/semantic/bovine/Makefile
new file mode 100644
index 0000000..27b9fb1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/Makefile
@@ -0,0 +1,82 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+by_SEMANTIC_GRAMMAR=c.by make.by scheme.by erlang.by
+ELISPPRELOAD= cedet-compat
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../../ede/ ../../common/ ../ ../../eieio/\
+    ../wisent/ ../../speedbar/
+by_SEMANTIC_GRAMMAR_EL=semantic-c-by.el semantic-make-by.el semantic-scm-by.el semantic-erlang-by.el
+bovinator_LISP=semantic-bovine.el bovine-grammar.el bovine-debug.el bovine-grammar-macros.el
+examples_MISC=semantic-skel.el skeleton.by
+languages_LISP=semantic-c.el semantic-el.el semantic-make.el semantic-scm.el semantic-java.el semantic-erlang.el semantic-gcc.el
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/bovine
+
+
+
+all: by bovinator examples languages
+
+.PHONY: by
+by: $(by_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: bovinator
+bovinator: $(bovinator_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+examples: 
+	@
+
+.PHONY: languages
+languages: $(languages_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist: $(by_SEMANTIC_GRAMMAR_EL)
+	mkdir $(DISTDIR)
+	cp $(by_SEMANTIC_GRAMMAR) $(by_SEMANTIC_GRAMMAR_EL) $(bovinator_LISP) $(examples_MISC) $(languages_LISP) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/bovine/Project.ede b/site/cedet-1.0pre7/semantic/bovine/Project.ede
new file mode 100644
index 0000000..aa1037c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/Project.ede
@@ -0,0 +1,31 @@
+;; Object semantic/bovine
+;; EDE project file.
+(ede-proj-project "semantic/bovine"
+  :name "bovinator"
+  :file "Project.ede"
+  :targets (list 
+   (semantic-ede-proj-target-grammar "by"
+    :name "by"
+    :path ""
+    :source '("c.by" "make.by" "scheme.by" "erlang.by")
+    )
+   (ede-proj-target-elisp "bovinator"
+    :name "bovinator"
+    :path ""
+    :source '("semantic-bovine.el" "bovine-grammar.el" "bovine-debug.el" "bovine-grammar-macros.el")
+    :aux-packages '("semantic" "speedbar" "eieio" "wisent" "inversion")
+    )
+   (ede-proj-target-makefile-miscelaneous "examples"
+    :name "examples"
+    :path ""
+    :source '("semantic-skel.el" "skeleton.by")
+    )
+   (ede-proj-target-elisp "languages"
+    :name "languages"
+    :path ""
+    :source '("semantic-c.el" "semantic-el.el" "semantic-make.el" "semantic-scm.el" "semantic-java.el" "semantic-erlang.el" "semantic-gcc.el")
+    :compiler 'ede-emacs-preload-compiler
+    :pre-load-packages '("cedet-compat")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/semantic/bovine/bovine-debug.el b/site/cedet-1.0pre7/semantic/bovine/bovine-debug.el
new file mode 100644
index 0000000..bd09863
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/bovine-debug.el
@@ -0,0 +1,151 @@
+;;; bovine-debug.el --- Debugger support for bovinator
+
+;;; Copyright (C) 2003 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: bovine-debug.el,v 1.5 2009/09/11 18:55:48 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; Implementation of the semantic debug support framework for the
+;; bovine parser.
+;;
+
+(require 'semantic-debug)
+
+;;; Code:
+
+;;; Support a frame for the Bovinator
+;;
+(defclass semantic-bovine-debug-frame (semantic-debug-frame)
+  ((nonterm :initarg :nonterm
+	    :type symbol
+	    :documentation
+	    "The name of the semantic nonterminal for this frame.")
+   (rule :initarg :rule
+	 :type number
+	 :documentation
+	 "The index into NONTERM's rule list.  0 based.")
+   (match :initarg :match
+	  :type number
+	  :documentation
+	  "The index into NONTERM's RULE's match.  0 based..")
+   (collection :initarg :collection
+	       :type list
+	       :documentation
+	       "List of things matched so far.")
+   (lextoken :initarg :lextoken
+	     :type list
+	     :documentation
+	     "A Token created by `semantic-lex-token'.
+This is the lexical token being matched by the parser.")
+   )
+  "Debugger frame representation for the bovinator.")
+
+;;;###autoload
+(defun semantic-bovine-debug-create-frame (nonterm rule match collection
+						   lextoken)
+  "Create one bovine frame.
+NONTERM is the name of a rule we are currently parsing.
+RULE is the index into the list of rules in NONTERM.
+MATCH is the index into the list of matches in RULE.
+For example:
+  this: that
+      | other thing
+      | here
+      ;
+The NONTERM is THIS.
+The RULE is for \"thing\" is 1.
+The MATCH for \"thing\" is 1.
+COLLECTION is a list of `things' that have been matched so far.
+LEXTOKEN, is a token returned by the lexer which is being matched."
+  (let ((frame (semantic-bovine-debug-frame "frame"
+					    :nonterm nonterm
+					    :rule rule
+					    :match match
+					    :collection collection
+					    :lextoken lextoken)))
+    (semantic-debug-set-frame semantic-debug-current-interface
+			      frame)
+    frame))
+
+(defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame))
+  "Highlight one parser frame."
+  (let* ((nonterm (oref frame nonterm))
+	 (pb (oref semantic-debug-current-interface parser-buffer))
+	 (start (semantic-find-nonterminal-by-token 'start pb))
+	)
+    ;; Make sure we get a good rule name, and that it is a string
+    (if (and (eq nonterm 'bovine-toplevel) start)
+	(setq nonterm (semantic-tag-name (car start)))
+      (setq nonterm (symbol-name nonterm)))
+
+    (semantic-debug-highlight-rule semantic-debug-current-interface
+				   nonterm
+				   (oref frame rule)
+				   (oref frame match))
+    (semantic-debug-highlight-lexical-token semantic-debug-current-interface
+					    (oref frame lextoken))
+    ))
+
+(defmethod semantic-debug-frame-info ((frame semantic-debug-frame))
+  "Display info about this one parser frame."
+  (message "%S" (oref frame collection))
+  )
+
+;;; Lisp error thrown frame.
+;;
+(defclass semantic-bovine-debug-error-frame (semantic-debug-frame)
+  ((condition :initarg :condition
+	      :documentation
+	      "An error condition caught in an action.")
+   )
+  "Debugger frame representaion of a lisp error thrown during parsing.")
+
+(defun semantic-create-bovine-debug-error-frame (condition)
+  "Create an error frame for bovine debugger.
+Argument CONDITION is the thrown error condition."
+  (let ((frame (semantic-bovine-debug-error-frame "frame"
+						  :condition condition)))
+    (semantic-debug-set-frame semantic-debug-current-interface
+			      frame)
+    frame))
+
+(defmethod semantic-debug-frame-highlight ((frame semantic-bovine-debug-error-frame))
+  "Highlight a frame from an action."
+  ;; How do I get the location of the action in the source buffer?
+  )
+
+(defmethod semantic-debug-frame-info ((frame semantic-bovine-debug-error-frame))
+  "Display info about the error thrown."
+  (message "Error: %S" (oref frame condition)))
+
+;;; Parser support for the debugger
+;;
+;;;###autoload
+(defclass semantic-bovine-debug-parser (semantic-debug-parser)
+  (
+   )
+  "Represents a parser and its state.")
+
+
+(provide 'bovine-debug)
+
+;;; bovine-debug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/bovine-grammar-macros.el b/site/cedet-1.0pre7/semantic/bovine/bovine-grammar-macros.el
new file mode 100644
index 0000000..e9fdf34
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/bovine-grammar-macros.el
@@ -0,0 +1,126 @@
+;;; bovine-grammar-macros.el --- Semantic macros for LL grammars
+;;
+;; Copyright (C) 2003, 2005 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 02 Aug 2003
+;; Keywords: syntax
+;; X-RCS: $Id: bovine-grammar-macros.el,v 1.4 2005/09/30 20:21:46 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library defines the default set of Semantic grammar macros
+;; used in bovine (.by) grammars.
+
+;;; History:
+;;
+
+;;; Code:
+
+(defun bovine-grammar-EXPAND (bounds nonterm)
+  "Expand call to EXPAND grammar macro.
+Return the form to parse from within a nonterminal between BOUNDS.
+NONTERM is the nonterminal symbol to start with."
+  `(semantic-bovinate-from-nonterminal
+    (car ,bounds) (cdr ,bounds) ',nonterm))
+
+(defun bovine-grammar-EXPANDFULL (bounds nonterm)
+  "Expand call to EXPANDFULL grammar macro.
+Return the form to recursively parse the area between BOUNDS.
+NONTERM is the nonterminal symbol to start with."
+  `(semantic-parse-region
+    (car ,bounds) (cdr ,bounds) ',nonterm 1))
+
+(defun bovine-grammar-TAG (name class &rest attributes)
+  "Expand call to TAG grammar macro.
+Return the form to create a generic semantic tag.
+See the function `semantic-tag' for the meaning of arguments NAME,
+CLASS and ATTRIBUTES."
+  `(semantic-tag ,name ,class ,@attributes))
+
+(defun bovine-grammar-VARIABLE-TAG (name type default-value &rest attributes)
+  "Expand call to VARIABLE-TAG grammar macro.
+Return the form to create a semantic tag of class variable.
+See the function `semantic-tag-new-variable' for the meaning of
+arguments NAME, TYPE, DEFAULT-VALUE and ATTRIBUTES."
+  `(semantic-tag-new-variable ,name ,type ,default-value ,@attributes))
+
+(defun bovine-grammar-FUNCTION-TAG (name type arg-list &rest attributes)
+  "Expand call to FUNCTION-TAG grammar macro.
+Return the form to create a semantic tag of class function.
+See the function `semantic-tag-new-function' for the meaning of
+arguments NAME, TYPE, ARG-LIST and ATTRIBUTES."
+  `(semantic-tag-new-function ,name ,type ,arg-list ,@attributes))
+
+(defun bovine-grammar-TYPE-TAG (name type members parents &rest attributes)
+  "Expand call to TYPE-TAG grammar macro.
+Return the form to create a semantic tag of class type.
+See the function `semantic-tag-new-type' for the meaning of arguments
+NAME, TYPE, MEMBERS, PARENTS and ATTRIBUTES."
+  `(semantic-tag-new-type ,name ,type ,members ,parents ,@attributes))
+
+(defun bovine-grammar-INCLUDE-TAG (name system-flag &rest attributes)
+  "Expand call to INCLUDE-TAG grammar macro.
+Return the form to create a semantic tag of class include.
+See the function `semantic-tag-new-include' for the meaning of
+arguments NAME, SYSTEM-FLAG and ATTRIBUTES."
+  `(semantic-tag-new-include ,name ,system-flag ,@attributes))
+
+(defun bovine-grammar-PACKAGE-TAG (name detail &rest attributes)
+  "Expand call to PACKAGE-TAG grammar macro.
+Return the form to create a semantic tag of class package.
+See the function `semantic-tag-new-package' for the meaning of
+arguments NAME, DETAIL and ATTRIBUTES."
+  `(semantic-tag-new-package ,name ,detail ,@attributes))
+
+(defun bovine-grammar-CODE-TAG (name detail &rest attributes)
+  "Expand call to CODE-TAG grammar macro.
+Return the form to create a semantic tag of class code.
+See the function `semantic-tag-new-code' for the meaning of arguments
+NAME, DETAIL and ATTRIBUTES."
+  `(semantic-tag-new-code ,name ,detail ,@attributes))
+
+(defun bovine-grammar-ALIAS-TAG (name aliasclass definition &rest attributes)
+  "Expand call to ALIAS-TAG grammar macro.
+Return the form to create a semantic tag of class alias.
+See the function `semantic-tag-new-alias' for the meaning of arguments
+NAME, ALIASCLASS, DEFINITION and ATTRIBUTES."
+  `(semantic-tag-new-alias ,name ,aliasclass ,definition ,@attributes))
+
+(defvar-mode-local bovine-grammar-mode semantic-grammar-macros
+  '(
+    (ASSOC          . semantic-grammar-ASSOC)
+    (EXPAND         . bovine-grammar-EXPAND)
+    (EXPANDFULL     . bovine-grammar-EXPANDFULL)
+    (TAG            . bovine-grammar-TAG)
+    (VARIABLE-TAG   . bovine-grammar-VARIABLE-TAG)
+    (FUNCTION-TAG   . bovine-grammar-FUNCTION-TAG)
+    (TYPE-TAG       . bovine-grammar-TYPE-TAG)
+    (INCLUDE-TAG    . bovine-grammar-INCLUDE-TAG)
+    (PACKAGE-TAG    . bovine-grammar-PACKAGE-TAG)
+    (CODE-TAG       . bovine-grammar-CODE-TAG)
+    (ALIAS-TAG      . bovine-grammar-ALIAS-TAG)
+    )
+  "Semantic grammar macros used in bovine grammars.")
+
+(provide 'bovine-grammar-macros)
+
+;;; bovine-grammar-macros.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/bovine-grammar.el b/site/cedet-1.0pre7/semantic/bovine/bovine-grammar.el
new file mode 100644
index 0000000..ed4be8c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/bovine-grammar.el
@@ -0,0 +1,357 @@
+;;; bovine-grammar.el --- Bovine's input grammar mode
+;;
+;; Copyright (C) 2002, 2003, 2004, 2007, 2009 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 26 Aug 2002
+;; Keywords: syntax
+;; X-RCS: $Id: bovine-grammar.el,v 1.21 2009/01/10 00:16:26 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Major mode for editing Bovine's input grammar (.by) files.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'semantic-grammar)
+(require 'bovine-grammar-macros)
+
+;; Cache of macro definitions currently in use.
+(defvar bovine--grammar-macros nil)
+
+(defun bovine-grammar-expand-form (form quotemode &optional inplace)
+  "Expand FORM into a new one suitable to the bovine parser.
+FORM is a list in which we are substituting.
+Argument QUOTEMODE is non-nil if we are in backquote mode.
+When non-nil, optional argument INPLACE indicates that FORM is being
+expanded from elsewhere."
+  (when (eq (car form) 'quote)
+    (setq form (cdr form))
+    (cond
+     ((and (= (length form) 1) (listp (car form)))
+      (insert "\n(append")
+      (bovine-grammar-expand-form (car form) quotemode nil)
+      (insert ")")
+      (setq form nil inplace nil)
+      )
+     ((and (= (length form) 1) (symbolp (car form)))
+      (insert "\n'" (symbol-name (car form)))
+      (setq form nil inplace nil)
+      )
+     (t
+      (insert "\n(list")
+      (setq inplace t)
+      )))
+  (let ((macro (assq (car form) bovine--grammar-macros))
+        inlist first n q x)
+    (if macro
+        (bovine-grammar-expand-form
+         (apply (cdr macro) (cdr form))
+         quotemode t)
+      (if inplace (insert "\n("))
+      (while form
+        (setq first (car form)
+              form  (cdr form))
+        (cond
+         ((eq first nil)
+          (when (and (not inlist) (not inplace))
+            (insert "\n(list")
+            (setq inlist t))
+          (insert " nil")
+          )
+         ((listp first)
+          ;;(let ((fn (and (symbolp (caar form)) (fboundp (caar form)))))
+          (when (and (not inlist) (not inplace))
+            (insert "\n(list")
+            (setq inlist t))
+          ;;(if (and inplace (not fn) (not (eq (caar form) 'EXPAND)))
+          ;;    (insert " (append"))
+          (bovine-grammar-expand-form
+           first quotemode t) ;;(and fn (not (eq fn 'quote))))
+          ;;(if (and inplace (not fn) (not (eq (caar form) 'EXPAND)))
+          ;;    (insert  ")"))
+          ;;)
+          )
+         ((symbolp first)
+          (setq n (symbol-name first)   ;the name
+                q quotemode             ;implied quote flag
+                x nil)                  ;expand flag
+          (if (eq (aref n 0) ?,)
+              (if quotemode
+                  ;; backquote mode needs the @
+                  (if (eq (aref n 1) ?@)
+                      (setq n (substring n 2)
+                            q nil
+                            x t)
+                    ;; non backquote mode behaves normally.
+                    (setq n (substring n 1)
+                          q nil))
+                (setq n (substring n 1)
+                      x t)))
+          (if (string= n "")
+              (progn
+                ;; We expand only the next item in place (a list?)
+                ;; A regular inline-list...
+                (bovine-grammar-expand-form (car form) quotemode t)
+                (setq form (cdr form)))
+            (if (and (eq (aref n 0) ?$)
+                     ;; Don't expand $ tokens in implied quote mode.
+                     ;; This acts like quoting in other symbols.
+                     (not q))
+                (progn
+                  (cond
+                   ((and (not x) (not inlist) (not inplace))
+                    (insert "\n(list"))
+                   ((and x inlist (not inplace))
+                    (insert ")")
+                    (setq inlist nil)))
+                  (insert "\n(nth " (int-to-string
+                                     (1- (string-to-number
+                                          (substring n 1))))
+                          " vals)")
+                  (and (not x) (not inplace)
+                       (setq inlist t)))
+              
+              (when (and (not inlist) (not inplace))
+                (insert "\n(list")
+                (setq inlist t))
+              (or (char-equal (char-before) ?\()
+                  (insert " "))
+              (insert (if (or inplace (eq first t))
+                          "" "'")
+                      n))) ;; " "
+          )
+         (t
+          (when (and (not inlist) (not inplace))
+            (insert "\n(list")
+            (setq inlist t))
+          (insert (format "\n%S" first))
+          )
+         ))
+      (if inlist (insert ")"))
+      (if inplace (insert ")")))
+    ))
+
+(defun bovine-grammar-expand-action (textform quotemode)
+  "Expand semantic action string TEXTFORM into Lisp code.
+QUOTEMODE is the mode in which quoted symbols are slurred."
+  (if (string= "" textform)
+      nil
+    (let ((sexp (read textform)))
+      ;; We converted the lambda string into a list.  Now write it
+      ;; out as the bovine lambda expression, and do macro-like
+      ;; conversion upon it.
+      (insert "\n")
+      (cond
+       ((eq (car sexp) 'EXPAND)
+        (insert ",(lambda (vals start end)")
+        ;; The EXPAND macro definition is mandatory
+        (bovine-grammar-expand-form
+         (apply (cdr (assq 'EXPAND bovine--grammar-macros)) (cdr sexp))
+         quotemode t)
+        )
+       ((and (listp (car sexp)) (eq (caar sexp) 'EVAL))
+        ;; The user wants to evaluate the following args.
+        ;; Use a simpler expander
+        )
+       (t
+        (insert ",(semantic-lambda")
+        (bovine-grammar-expand-form sexp quotemode)
+        ))
+      (insert ")\n"))))
+
+(defun bovine-grammar-parsetable-builder ()
+  "Return the parser table expression as a string value.
+The format of a bovine parser table is:
+
+ ( ( NONTERMINAL-SYMBOL1 MATCH-LIST1 )
+   ( NONTERMINAL-SYMBOL2 MATCH-LIST2 )
+   ...
+   ( NONTERMINAL-SYMBOLn MATCH-LISTn )
+ 
+Where each NONTERMINAL-SYMBOL is an artificial symbol which can appear
+in any child state.  As a starting place, one of the NONTERMINAL-SYMBOLS
+must be `bovine-toplevel'.
+
+A MATCH-LIST is a list of possible matches of the form:
+
+ ( STATE-LIST1
+   STATE-LIST2
+   ...
+   STATE-LISTN )
+
+where STATE-LIST is of the form:
+  ( TYPE1 [ \"VALUE1\" ] TYPE2 [ \"VALUE2\" ] ... LAMBDA )
+
+where TYPE is one of the returned types of the token stream.
+VALUE is a value, or range of values to match against.  For
+example, a SYMBOL might need to match \"foo\".  Some TYPES will not
+have matching criteria.
+
+LAMBDA is a lambda expression which is evaled with the text of the
+type when it is found.  It is passed the list of all buffer text
+elements found since the last lambda expression.  It should return a
+semantic element (see below.)
+
+For consistency between languages, try to use common return values
+from your parser.  Please reference the chapter \"Writing Parsers\" in
+the \"Language Support Developer's Guide -\" in the semantic texinfo
+manual."
+  (let* ((start      (semantic-grammar-start))
+         (scopestart (semantic-grammar-scopestart))
+         (quotemode  (semantic-grammar-quotemode))
+         (tags       (semantic-find-tags-by-class
+                      'token (current-buffer)))
+         (nterms     (semantic-find-tags-by-class
+                      'nonterminal (current-buffer)))
+         ;; Setup the cache of macro definitions.
+         (bovine--grammar-macros (semantic-grammar-macros))
+         nterm rules items item actn prec tag type regex)
+
+    ;; Check some trivial things
+    (cond
+     ((null nterms)
+      (error "Bad input grammar"))
+     (start
+      (if (cdr start)
+          (message "Extra start symbols %S ignored" (cdr start)))
+      (setq start (symbol-name (car start)))
+      (unless (semantic-find-first-tag-by-name start nterms)
+        (error "start symbol `%s' has no rule" start)))
+     (t
+      ;; Default to the first grammar rule.
+      (setq start (semantic-tag-name (car nterms)))))
+    (when scopestart
+      (setq scopestart (symbol-name scopestart))
+      (unless (semantic-find-first-tag-by-name scopestart nterms)
+        (error "scopestart symbol `%s' has no rule" scopestart)))
+
+    ;; Generate the grammar Lisp form.
+    (with-temp-buffer
+      (erase-buffer)
+      (insert "`(")
+      ;; Insert the start/scopestart rules
+      (insert "\n(bovine-toplevel \n("
+              start
+              ")\n) ;; end bovine-toplevel\n")
+      (when scopestart
+        (insert "\n(bovine-inner-scope \n("
+                scopestart
+                ")\n) ;; end bovine-inner-scope\n"))
+      ;; Process each nonterminal
+      (while nterms
+        (setq nterm  (car nterms)
+              ;; We can't use the override form because the current buffer
+              ;; is not the originator of the tag.
+              rules  (semantic-tag-components-semantic-grammar-mode nterm)
+              nterm  (semantic-tag-name nterm)
+              nterms (cdr nterms))
+        (when (member nterm '("bovine-toplevel" "bovine-inner-scope"))
+          (error "`%s' is a reserved internal name" nterm))
+        (insert "\n(" nterm)
+        ;; Process each rule
+        (while rules
+          (setq items (semantic-tag-get-attribute (car rules) :value)
+                prec  (semantic-tag-get-attribute (car rules) :prec)
+                actn  (semantic-tag-get-attribute (car rules) :expr)
+                rules (cdr rules))
+          ;; Process each item
+          (insert "\n(")
+          (if (null items)
+              ;; EMPTY rule
+              (insert ";;EMPTY" (if actn "" "\n"))
+            ;; Expand items
+            (while items
+              (setq item  (car items)
+                    items (cdr items))
+              (if (consp item) ;; mid-rule action
+                  (message "Mid-rule action %S ignored" item)
+                (or (char-equal (char-before) ?\()
+                    (insert "\n"))
+                (cond
+                 ((member item '("bovine-toplevel" "bovine-inner-scope"))
+                  (error "`%s' is a reserved internal name" item))
+                 ;; Replace ITEM by its %token definition.
+                 ;; If a '%token TYPE ITEM [REGEX]' definition exists
+                 ;; in the grammar, ITEM is replaced by TYPE [REGEX].
+                 ((setq tag (semantic-find-first-tag-by-name
+                             item tags)
+                        type  (semantic-tag-get-attribute tag :type))
+                  (insert type)
+                  (if (setq regex (semantic-tag-get-attribute tag :value))
+                      (insert (format "\n%S" regex))))
+                 ;; Don't change ITEM
+                 (t
+                  (insert (semantic-grammar-item-text item)))
+                 ))))
+          (if prec
+              (message "%%prec %S ignored" prec))
+          (if actn
+              (bovine-grammar-expand-action actn quotemode))
+          (insert ")"))
+        (insert "\n) ;; end " nterm "\n"))
+      (insert ")\n")
+      (buffer-string))))
+
+(defun bovine-grammar-setupcode-builder ()
+  "Return the text of the setup code."
+  (format
+   "(setq semantic--parse-table %s\n\
+          semantic-debug-parser-source %S\n\
+          semantic-debug-parser-class 'semantic-bovine-debug-parser
+          semantic-flex-keywords-obarray %s\n\
+          %s)"
+   (semantic-grammar-parsetable)
+   (buffer-name)
+   (semantic-grammar-keywordtable)
+   (let ((mode (semantic-grammar-languagemode)))
+     ;; Is there more than one major mode?
+     (if (and (listp mode) (> (length mode) 1))
+         (format "semantic-equivalent-major-modes '%S\n" mode)
+       ""))))
+
+(defvar bovine-grammar-menu
+  '("BY Grammar"
+    )
+  "BY mode specific grammar menu.
+Menu items are appended to the common grammar menu.")
+
+;;;###autoload
+(define-derived-mode bovine-grammar-mode semantic-grammar-mode "BY"
+  "Major mode for editing Bovine grammars."
+  (semantic-grammar-setup-menu bovine-grammar-menu)
+  (semantic-install-function-overrides
+   '((grammar-parsetable-builder . bovine-grammar-parsetable-builder)
+     (grammar-setupcode-builder  . bovine-grammar-setupcode-builder)
+     )))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.by$" . bovine-grammar-mode))
+
+;;;###autoload
+(eval-after-load "speedbar"
+  '(speedbar-add-supported-extension ".by"))
+
+(provide 'bovine-grammar)
+
+;;; bovine-grammar.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/c.by b/site/cedet-1.0pre7/semantic/bovine/c.by
new file mode 100644
index 0000000..320d1f1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/c.by
@@ -0,0 +1,1206 @@
+;;; c.by -- LL grammar for C/C++ language specification
+;;
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+;; Copyright (C) 2002, 2003 David Ponce
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;;         David Ponce <david@dponce.com>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;
+;; X-RCS: $Id: c.by,v 1.62 2010/02/19 02:57:10 zappo Exp $
+;;
+;; c.by is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+
+;; TODO:  From Nate Schley
+;; >  * Can't parse signature element: "const char* const rmc_ClrTxt"
+;; >  * Can't parse signature element: "char* const dellog_ClrTxt"
+;; >  * Can't parse signature element: "const char* dellog_SetTxt"
+;; >  * Can't parse signature element: "const RmcCmdSSPADetailedStatus& status"
+;; > 
+;; > And FWIW I have seen the following argument cases not handled, even
+;; > with no leading/trailing spaces in the split:
+;; > 
+;; >  * Can't parse signature element: "const bool currentAlarmStatus"
+;; >  * Can't parse signature element: "unsigned char mode"
+;; >  * Can't parse signature element: "TskTimingTask* tsktimingtask"
+;; >  * Can't parse signature element: "unsigned char htrStatus"
+;; >  * Can't parse signature element: "char trackPower[]"
+;; >  * Can't parse signature element: "const RmcCmdMCDetailedStatus& status"
+;; >  * Can't parse signature element: "RmcBucStatus* rftBucStatus"
+
+%package semantic-c-by
+
+%languagemode  c-mode c++-mode
+%start         declaration
+%scopestart    codeblock
+
+%token <punctuation>   HASH       "\\`[#]\\'"
+%token <punctuation>   PERIOD     "\\`[.]\\'"
+%token <punctuation>   COLON      "\\`[:]\\'"
+%token <punctuation>   SEMICOLON  "\\`[;]\\'"
+%token <punctuation>   STAR       "\\`[*]\\'"
+%token <punctuation>   AMPERSAND  "\\`[&]\\'"
+%token <punctuation>   DIVIDE     "\\`[/]\\'"
+%token <punctuation>   PLUS       "\\`[+]\\'"
+%token <punctuation>   MINUS      "\\`[-]\\'"
+%token <punctuation>   BANG       "\\`[!]\\'"
+%token <punctuation>   EQUAL      "\\`[=]\\'"
+%token <punctuation>   LESS       "\\`[<]\\'"
+%token <punctuation>   GREATER    "\\`[>]\\'"
+%token <punctuation>   COMA       "\\`[,]\\'"
+%token <punctuation>   TILDE      "\\`[~]\\'"
+%token <punctuation>   MOD        "\\`[%]\\'"
+%token <punctuation>   HAT        "\\`\\^\\'"
+%token <punctuation>   OR         "\\`[|]\\'"
+%token <string>        C          "\"C\""
+%token <string>        CPP        "\"C\\+\\+\""
+%token <number>        ZERO       "^0$"
+%token <symbol>        RESTRICT   "\\<\\(__\\)?restrict\\>"
+%token <open-paren>    LPAREN     "("
+%token <close-paren>   RPAREN     ")"
+%token <open-paren>    LBRACE     "{"
+%token <close-paren>   RBRACE     "}"
+%token <semantic-list> BRACK_BLCK "\\[.*\\]$"
+%token <semantic-list> PAREN_BLCK "^("
+%token <semantic-list> BRACE_BLCK "^{"
+%token <semantic-list> VOID_BLCK  "^(void)$"
+%token <semantic-list> PARENS     "()"
+%token <semantic-list> BRACKETS   "\\[\\]"
+
+%token EXTERN "extern"
+%put EXTERN summary "Declaration Modifier: extern <type> <name> ..."
+%token STATIC "static"
+%put STATIC summary "Declaration Modifier: static <type> <name> ..."
+%token CONST "const"
+%put CONST summary "Declaration Modifier: const <type> <name> ..."
+%token VOLATILE "volatile"
+%put VOLATILE summary "Declaration Modifier: volatile <type> <name> ..."
+%token REGISTER "register"
+%put REGISTER summary "Declaration Modifier: register <type> <name> ..."
+%token SIGNED "signed"
+%put SIGNED summary "Numeric Type Modifier: signed <numeric type> <name> ..."
+%token UNSIGNED "unsigned"
+%put UNSIGNED summary "Numeric Type Modifier: unsigned <numeric type> <name> ..."
+
+%token INLINE "inline"
+%put INLINE summary "Function Modifier: inline <return  type> <name>(...) {...};"
+%token VIRTUAL "virtual"
+%put VIRTUAL summary "Method Modifier: virtual <type> <name>(...) ..."
+%token MUTABLE "mutable"
+%put MUTABLE summary "Member Declaration Modifier: mutable <type> <name> ..."
+
+%token STRUCT "struct"
+%put STRUCT summary "Structure Type Declaration: struct [name] { ... };"
+%token UNION "union"
+%put UNION summary "Union Type Declaration: union [name] { ... };"
+%token ENUM "enum"
+%put ENUM summary "Enumeration Type Declaration: enum [name] { ... };"
+%token TYPEDEF "typedef"
+%put TYPEDEF summary "Arbitrary Type Declaration: typedef <typedeclaration> <name>;"
+%token CLASS "class"
+%put CLASS summary "Class Declaration: class <name>[:parents] { ... };"
+%token TYPENAME "typename"
+%put TYPENAME summary "typename is used to handle a qualified name as a typename;"
+%token NAMESPACE "namespace"
+%put NAMESPACE summary "Namespace Declaration: namespace <name> { ... };"
+%token USING "using"
+%put USING summary "using <namespace>;"
+
+%token NEW "new"
+%put NEW summary "new <classname>();"
+%token DELETE "delete"
+%put DELETE summary "delete <object>;"
+
+;; Despite this, this parser can find templates by ignoring the TEMPLATE
+;; keyword, and finding the class/method being templateized.
+%token TEMPLATE "template"
+%put TEMPLATE summary "template <class TYPE ...> TYPE_OR_FUNCTION"
+
+%token THROW "throw"
+%put THROW summary "<type> <methoddef> (<method args>) throw (<exception>) ..."
+%token REENTRANT "reentrant"
+%put REENTRANT summary "<type> <methoddef> (<method args>) reentrant ..."
+%token TRY "try"
+%token CATCH "catch"
+%put { TRY CATCH } summary "try { <body> } catch { <catch code> }"
+
+;; Leave these alone for now.
+%token OPERATOR "operator"
+%token PUBLIC "public"
+%token PRIVATE "private"
+%token PROTECTED "protected"
+%token FRIEND "friend"
+%put FRIEND summary "friend class <CLASSNAME>"
+
+;; These aren't used for parsing, but is a useful place to describe the keywords.
+%token IF "if"
+%token ELSE "else"
+%put {IF ELSE} summary  "if (<condition>) { code } [ else { code } ]"
+
+%token DO "do"
+%token WHILE "while"
+%put DO summary " do { code } while (<condition>);"
+%put WHILE summary "do { code } while (<condition>); or while (<condition>) { code };"
+
+%token FOR "for"
+%put FOR summary "for(<init>; <condition>; <increment>) { code }"
+
+%token SWITCH "switch"
+%token CASE "case"
+%token DEFAULT "default"
+%put {SWITCH CASE DEFAULT} summary
+"switch (<variable>) { case <constvalue>: code; ... default: code; }"
+
+%token RETURN "return"
+%put RETURN summary "return <value>;"
+
+%token BREAK "break"
+%put BREAK summary "Non-local exit within a loop or switch (for, do/while, switch): break;"
+%token CONTINUE "continue"
+%put CONTINUE summary "Non-local continue within a loop (for, do/while): continue;"
+
+%token SIZEOF "sizeof"
+%put SIZEOF summary "Compile time macro: sizeof(<type or variable>) // size in bytes"
+
+;; Types
+%token VOID "void"
+%put VOID summary "Built in typeless type: void"
+%token CHAR "char"
+%put CHAR summary "Integral Character Type: (0 to 256)"
+%token WCHAR "wchar_t"
+%put WCHAR summary "Wide Character Type"
+%token SHORT "short"
+%put SHORT summary "Integral Primitive Type: (-32768 to 32767)"
+%token INT "int"
+%put INT summary "Integral Primitive Type: (-2147483648 to 2147483647)"
+%token LONG "long"
+%put LONG summary "Integral primitive type (-9223372036854775808 to 9223372036854775807)"
+%token FLOAT "float"
+%put FLOAT summary "Primitive floating-point type (single-precision 32-bit IEEE 754)"
+%token DOUBLE "double"
+%put DOUBLE summary "Primitive floating-point type (double-precision 64-bit IEEE 754)"
+%token BOOL "bool"
+%put BOOL summary "Primitive boolean type"
+
+%token UNDERP "_P"
+%token UNDERUNDERP "__P"
+%put UNDERP summary "Common macro to eliminate prototype compatibility on some compilers"
+%put UNDERUNDERP summary "Common macro to eliminate prototype compatibility on some compilers"
+
+%%
+
+declaration
+  : macro
+  | type
+ ;; TODO: Klaus Berndl: Is the define here necessary or even wrong?
+ ;; Is this part not already covered by macro??
+  | define
+  | var-or-fun
+  | extern-c
+  | template
+  | using
+  ;
+
+codeblock
+  : define
+  | codeblock-var-or-fun
+  | type ;; type is less likely to be used here.
+  | using
+  ;
+
+extern-c-contents
+  : open-paren
+    ( nil )
+  | declaration
+  | close-paren
+    ( nil )
+  ;
+
+extern-c
+  : EXTERN C semantic-list
+ ;; Extern C commands which contain a list need to have the
+ ;; entries of the list extracted, and spliced into the main
+ ;; list of entries.  This must be done via the function
+ ;; that expands singular nonterminals, such as int x,y;
+    (TAG "C" 'extern :members (EXPANDFULL $3 extern-c-contents) )
+  | EXTERN CPP semantic-list
+    (TAG "C" 'extern :members (EXPANDFULL $3 extern-c-contents) )
+  | EXTERN C
+ ;; A plain extern "C" call should add something to the token,
+ ;; but just strip it from the buffer here for now.
+    ( nil )
+  | EXTERN CPP
+    ( nil )
+  ;
+
+macro
+  : spp-macro-def
+    (VARIABLE-TAG $1 nil nil :constant-flag t )
+  | spp-system-include
+    (INCLUDE-TAG $1 t)
+  | spp-include
+    (INCLUDE-TAG $1 nil)
+  ;
+
+;; This is used in struct parts.
+define
+  : spp-macro-def
+    (VARIABLE-TAG $1 nil nil :constant-flag t)
+  | spp-macro-undef
+    ( nil )
+  ;
+
+;; In C++, structures can have the same things as classes.
+;; So delete this somday in the figure.
+;;
+;;structparts : semantic-list
+;;            (EXPANDFULL $1 structsubparts)
+;;          ;
+;;
+;;structsubparts : LBRACE
+;;               ( nil )
+;;             | RBRACE
+;;               ( nil )
+;;             | var-or-fun
+;;             | define
+;;             ;; sometimes there are defines in structs.
+;;             ;
+
+unionparts
+  : semantic-list
+    (EXPANDFULL $1 classsubparts)
+  ;
+
+opt-symbol
+  : symbol
+  | ;;EMPTY
+  ;
+
+;; @todo - support 'friend' construct.
+classsubparts
+  : LBRACE
+    ( nil )
+  | RBRACE
+    ( nil )
+  | class-protection opt-symbol COLON
+ ;; For QT, they may put a `slot' keyword between the protection
+ ;; and the COLON.  @todo - Have the QT stuff use macros.
+    (TAG (car $1) 'label)
+  | var-or-fun
+  | FRIEND func-decl
+    (TAG (car $2) 'friend)
+  | FRIEND CLASS symbol
+    (TAG $3 'friend)
+  | type
+  | define
+  | template
+  | ;;EMPTY
+  ;
+
+opt-class-parents
+  : COLON class-parents opt-template-specifier
+    ( $2 )
+  | ;;EMPTY
+    ( )
+  ;
+
+one-class-parent
+  : opt-class-protection opt-class-declmods namespace-symbol
+    (TYPE-TAG (car $3) "class" nil nil :protection (car $1))
+  | opt-class-declmods opt-class-protection namespace-symbol
+    (TYPE-TAG (car $3) "class" nil nil :protection (car $2))
+  ;
+
+class-parents
+  : one-class-parent COMA class-parents
+    ( ,(cons ,$1 $3 ) )
+  | one-class-parent
+    ( $1 )
+  ;
+
+opt-class-declmods
+  : class-declmods opt-class-declmods
+    ( nil )
+  | ;;EMPTY
+  ;
+
+class-declmods
+  : VIRTUAL
+  ;
+
+class-protection
+  : PUBLIC
+  | PRIVATE
+  | PROTECTED
+  ;
+
+opt-class-protection
+  : class-protection
+    ( ,$1 )
+  | ;;EMPTY - Same as private
+    ( "unspecified" )
+  ;
+
+namespaceparts
+  : semantic-list
+    (EXPANDFULL $1 namespacesubparts)
+  ;
+
+namespacesubparts
+  : LBRACE
+    ( nil )
+  | RBRACE
+    ( nil )
+  | type
+  | var-or-fun
+  | define
+  | class-protection COLON
+    (TAG (car $1) 'label)
+ ;; In C++, this label in a classsubpart represents
+ ;; PUBLIC or PRIVATE bits.  Ignore them for now.
+  | template
+  | using
+  | ;;EMPTY
+  ;
+
+enumparts
+  : semantic-list
+    (EXPANDFULL $1 enumsubparts)
+  ;
+
+enumsubparts
+  : symbol opt-assign
+    (VARIABLE-TAG $1 "int" (car $2) :constant-flag t )
+  | LBRACE
+    ( nil )
+  | RBRACE
+    ( nil )
+  | COMA
+    ( nil )
+  ;
+
+opt-name
+  : symbol
+  | ;;EMPTY
+    ( "" )
+  ;
+
+typesimple
+  : struct-or-class opt-class opt-name opt-template-specifier
+    opt-class-parents semantic-list
+    (TYPE-TAG (car $3) (car $1)
+          (let ((semantic-c-classname (cons (car ,$3) (car ,$1))))
+            (EXPANDFULL $6 classsubparts))
+          $5
+          :template-specifier $4
+          :parent (car ,$2))
+  | struct-or-class opt-class opt-name opt-template-specifier
+    opt-class-parents
+    (TYPE-TAG (car $3) (car $1) nil $5
+              :template-specifier $4
+	      :prototype t
+              :parent (car ,$2))
+  | UNION opt-class opt-name unionparts
+    (TYPE-TAG (car $3) $1 $4 nil
+              :parent (car ,$2))
+  | ENUM opt-class opt-name enumparts
+    (TYPE-TAG (car $3) $1 $4 nil
+              :parent (car ,$2))
+ ;; Klaus Berndl: a typedef can be a typeformbase with all this
+ ;; declmods stuff.
+  | TYPEDEF declmods typeformbase cv-declmods typedef-symbol-list
+ ;;;; We put the type this typedef renames into PARENT
+ ;;;; but will move it in the expand function.
+    (TYPE-TAG $5 $1 nil (list $3) )
+  ;
+
+typedef-symbol-list
+  : typedefname COMA typedef-symbol-list
+    ( ,(cons $1 $3) )
+  | typedefname
+    ( $1 )
+  ;
+
+;; TODO: Klaus Berndl: symbol -> namespace-symbol?!  Answer: Probably
+;; symbol is correct here!
+typedefname
+  : opt-stars symbol opt-bits opt-array
+    ( $1 $2 )
+  ;
+
+struct-or-class
+  : STRUCT
+  | CLASS
+  ;
+
+type
+  : typesimple SEMICOLON
+    ( ,$1 )
+ ;; named namespaces like "namespace XXX {"
+  | NAMESPACE symbol namespaceparts
+    (TYPE-TAG $2 $1 $3 nil )
+ ;; unnamed namespaces like "namespace {"
+  | NAMESPACE namespaceparts
+    (TYPE-TAG "unnamed" $1 $2 nil )
+ ;; David Engster: namespace alias like "namespace foo = bar;"
+  | NAMESPACE symbol EQUAL typeformbase SEMICOLON
+    (TYPE-TAG $2 $1 (list (TYPE-TAG (car $4) $1 nil nil)) nil :kind 'alias )
+  ;
+
+;; Klaus Berndl: We must parse "using namespace XXX" too
+
+;; Using is vaguely like an include statement in the named portions
+;; of the code.  We should probably specify a new token type for this.
+
+using
+  : USING usingname SEMICOLON
+    (TAG (car $2) 'using :type ,$2 )
+  ;
+
+;; Jan Moringen: Differentiate between 'using' and 'using namespace'
+;; Adapted to creating type tags by EML.
+usingname
+  : typeformbase
+    (TYPE-TAG (car $1) "class" nil nil :prototype t)
+  | NAMESPACE typeformbase
+    (TYPE-TAG (car $2) "namespace" nil nil :prototype t)
+  ;
+
+template
+  : TEMPLATE template-specifier opt-friend template-definition
+    ( ,(semantic-c-reconstitute-template $4 ,$2) )
+  ;
+
+opt-friend
+  : FRIEND
+  | ;;EMPTY
+  ;
+
+opt-template-specifier
+  : template-specifier
+    ( ,$1 )
+  | ;;EMPTY
+    ()
+  ;
+
+template-specifier
+  : LESS template-specifier-types GREATER
+    ( ,$2 )
+  ;
+
+template-specifier-types
+  : template-var template-specifier-type-list
+    ( ,(cons ,$1 ,$2 ) )
+  | ;;EMPTY
+  ;
+
+template-specifier-type-list
+  : COMA template-specifier-types
+    ( ,$2 )
+  | ;;EMPTY
+    ( )
+  ;
+
+;; template-var
+;;   : template-type opt-stars opt-template-equal
+;;     ( ,(cons (concat (car $1) (make-string (car ,$2) ?*))
+;;              (cdr $1)))
+;;  ;; Klaus Berndl: for template-types the template-var can also be
+;;  ;; literals or constants.  Example: map<ClassX, ClassY, 10>
+;;  ;; map_size10_var; This parses also template<class T, 0> which is
+;;  ;; nonsense but who cares....
+;;   | string
+;;     ( $1 )
+;;   | number
+;;     ( $1 )
+;;   ;
+
+template-var
+  :
+ ;; Klaus Berndl: The following handles all template-vars of
+ ;; template-definitions
+    template-type opt-template-equal
+    ( ,(cons (car $1) (cdr $1)) )
+ ;; Klaus Berndl: for template-types the template-var can also be
+ ;; literals or constants.
+ ;; Example: map<ClassX, ClassY, 10> map_size10_var; This parses also
+ ;; template<class T, 0> which is nonsense but who cares....
+  | string
+    ( $1 )
+  | number
+    ( $1 )
+ ;; Klaus Berndl: In template-types arguments can be any symbols with
+ ;; optional address-operator (&) and optional dereferencing operator
+ ;; (*).  Example map<ClassX, ClassY, *size_var_ptr> sized_map_var.
+  | opt-stars opt-ref namespace-symbol
+    ( ,$3 )
+ ;; Some code can compile down into a number, but starts out as an
+ ;; expression, such as "sizeof(a)", or (sizeof(a)/sizeof(b))
+  | semantic-list
+    ( $1 )
+  | SIZEOF semantic-list
+    ( $2 )
+  ;
+
+opt-template-equal
+  : EQUAL symbol LESS template-specifier-types GREATER
+    ( $2 )
+  | EQUAL symbol
+    ( $2 )
+  | ;;EMPTY
+    ( )
+  ;
+
+template-type
+  : CLASS symbol
+    (TYPE-TAG $2 "class" nil nil )
+  | STRUCT symbol
+    (TYPE-TAG $2 "struct" nil nil )
+ ;; TODO: Klaus Berndl: For the moment is is ok, that we parse the C++
+ ;; keyword typename as a class....
+  | TYPENAME symbol
+    (TYPE-TAG $2 "class" nil nil)
+ ;; Klaus Berndl: template-types can be all flavors of variable-args
+ ;; but here the argument is ignored, only the type stuff is needed.
+  | declmods typeformbase cv-declmods opt-stars
+    opt-ref variablearg-opt-name
+    (TYPE-TAG (car $2) nil nil nil
+              :constant-flag (if (member "const" (append $1 $3)) t nil)
+              :typemodifiers (delete "const" (append $1 $3))
+              :reference (car ,$5)
+              :pointer (car $4)
+              )
+  ;
+
+template-definition
+  : type
+    ( ,$1 )
+  | var-or-fun
+    ( ,$1 )
+  ;
+
+opt-stars
+  : STAR opt-starmod opt-stars
+    ( (1+ (car $3)) )
+  | ;;EMPTY
+    ( 0 )
+  ;
+
+opt-starmod
+  : STARMOD opt-starmod
+    ( ,(cons (,car ,$1) $2) )
+  | ;;EMPTY
+    ()
+  ;
+
+STARMOD
+  : CONST
+  ;
+
+declmods
+  : DECLMOD declmods
+    ( ,(cons ,(car ,$1) $2 ) )
+  | DECLMOD
+    ( ,$1 )
+  | ;;EMPTY
+    ()
+  ;
+
+DECLMOD
+  : EXTERN
+  | STATIC
+  | CVDECLMOD
+ ;; Klaus Berndl: IMHO signed and unsigned are not decl-modes but
+ ;; these are only valid for some buildin-types like short, int
+ ;; etc... whereas "real" declmods are valid for all types, buildin
+ ;; and user-defined!  SIGNED UNSIGNED
+  | INLINE
+  | REGISTER
+  | FRIEND
+ ;; Klaus Berndl: There can be a few cases where TYPENAME is not
+ ;; allowed in C++-syntax but better than not recognizing the allowed
+ ;; situations.
+  | TYPENAME
+  | METADECLMOD
+ ;; This is a hack in case we are in a class.
+  | VIRTUAL
+  ;
+
+metadeclmod
+  : METADECLMOD
+    ()
+  | ;;EMPTY
+    ()
+  ;
+
+CVDECLMOD
+  : CONST
+  | VOLATILE
+  ;
+
+cv-declmods
+  : CVDECLMOD cv-declmods
+    ( ,(cons ,(car ,$1) $2 ) )
+  | CVDECLMOD
+    ( ,$1 )
+  | ;;EMPTY
+    ()
+  ;
+
+METADECLMOD
+  : VIRTUAL
+  | MUTABLE
+  ;
+
+;; C++: A type can be modified into a reference by "&"
+opt-ref
+  : AMPERSAND
+    ( 1 )
+  | ;;EMPTY
+    ( 0 )
+  ;
+
+typeformbase
+  : typesimple
+    ( ,$1 )
+  | STRUCT symbol
+    (TYPE-TAG $2 $1 nil nil )
+  | UNION symbol
+    (TYPE-TAG $2 $1 nil nil )
+  | ENUM symbol
+    (TYPE-TAG $2 $1 nil nil )
+  | builtintype
+    ( ,$1 )
+  | symbol template-specifier
+    (TYPE-TAG $1 "class" nil nil :template-specifier $2)
+ ;;| namespace-symbol opt-stars opt-template-specifier
+ ;;| namespace-symbol opt-template-specifier
+  | namespace-symbol-for-typeformbase opt-template-specifier
+    (TYPE-TAG (car $1) "class" nil nil
+	      :template-specifier $2)
+  | symbol
+    ( $1 )
+  ;
+
+signedmod
+  : UNSIGNED
+  | SIGNED
+  ;
+
+;; Klaus Berndl: builtintype-types was builtintype
+builtintype-types
+  : VOID
+  | CHAR
+ ;; Klaus Berndl: Added WCHAR
+  | WCHAR
+  | SHORT INT
+    ( (concat $1 " " $2) )
+  | SHORT
+  | INT
+  | LONG INT
+    ( (concat $1 " " $2) )
+  | FLOAT
+  | DOUBLE
+  | BOOL
+  | LONG DOUBLE
+    ( (concat $1 " " $2) )
+ ;; TODO: Klaus Berndl: Is there a long long, i think so?!
+  | LONG LONG
+    ( (concat $1 " " $2) )
+  | LONG
+  ;
+
+builtintype
+  : signedmod builtintype-types
+    ( (concat (car $1) " " (car $2)) )
+  | builtintype-types
+    ( ,$1 )
+ ;; Klaus Berndl: unsigned is synonym for unsigned int and signed for
+ ;; signed int. To make this confusing stuff clear we add here the
+ ;; int.
+  | signedmod
+    ( (concat (car $1) " int") )
+  ;
+
+;; Klaus Berndl: This parses also nonsense like "const volatile int
+;; const volatile const const volatile a ..." but IMHO nobody writes
+;; such code. Normaly we shoud define a rule like typeformbase-mode
+;; which exactly defines the different allowed cases and combinations
+;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so
+;; we could recognize more invalid code but IMHO this is not worth the
+;; effort...
+codeblock-var-or-fun
+  : declmods typeformbase declmods
+    opt-ref var-or-func-decl
+    ( ,(semantic-c-reconstitute-token ,$5 $1 $2 ) )
+  ;
+
+var-or-fun
+  : codeblock-var-or-fun
+    ( ,$1 )
+ ;; it is possible for a function to not have a type, and
+ ;; it is then assumed to be an int.  How annoying.
+ ;; In C++, this could be a constructor or a destructor.
+ ;; Even more annoying.  Only ever do this for regular
+ ;; top-level items.  Ignore this problem in code blocks
+ ;; so that we don't have to deal with regular code
+ ;; being erroneously converted into types.
+  | declmods var-or-func-decl
+    ( ,(semantic-c-reconstitute-token ,$2 $1 nil ) )
+  ;
+
+var-or-func-decl
+  : func-decl
+    ( ,$1 )
+  | var-decl
+    ( ,$1 )
+  ;
+
+func-decl
+  : opt-stars opt-class opt-destructor functionname
+    opt-template-specifier
+    opt-under-p
+    arg-list
+    opt-post-fcn-modifiers
+    opt-throw
+    opt-initializers
+    fun-or-proto-end
+    ( ,$4 'function
+          ;; Extra stuff goes in here.
+          ;; Continue with the stuff we found in
+          ;; this definition
+          $2 $3 $7 $9 $8 ,$1 ,$11 ,$5)
+  | opt-stars opt-class opt-destructor functionname
+    opt-template-specifier
+    opt-under-p
+ ;; arg-list   - - ini this case, a try implies a fcn.
+    opt-post-fcn-modifiers
+    opt-throw
+    opt-initializers
+    fun-try-end
+    ( ,$4 'function
+          ;; Extra stuff goes in here.
+          ;; Continue with the stuff we found in
+          ;; this definition
+          $2 $3 nil $8 $7 ,$1 ,$10 ,$5)
+  ;
+
+var-decl
+  : varnamelist SEMICOLON
+    ( $1 'variable )
+  ;
+
+opt-under-p
+  : UNDERP
+    ( nil )
+  | UNDERUNDERP
+    ( nil )
+  | ;;EMPTY
+  ;
+
+;; Klaus Berndl: symbol -> namespace-symbol
+opt-initializers
+  : COLON namespace-symbol semantic-list opt-initializers
+  | COMA namespace-symbol semantic-list opt-initializers
+  | ;;EMPTY
+  ;
+
+opt-post-fcn-modifiers
+  : post-fcn-modifiers opt-post-fcn-modifiers
+    ( ,(cons ,$1 $2) )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+post-fcn-modifiers
+  : REENTRANT
+  | CONST
+  ;
+
+opt-throw
+  : THROW semantic-list
+    ( EXPAND $2 throw-exception-list )
+  | ;;EMPTY
+  ;
+
+;; Is this true?  I don't actually know.
+throw-exception-list
+  : namespace-symbol COMA throw-exception-list
+    ( ,(cons (car $1) $3) )
+  | namespace-symbol RPAREN
+    ( ,$1 )
+  | symbol RPAREN
+    ( $1 )
+  | LPAREN throw-exception-list
+    ( ,$2 )
+  | RPAREN
+    (  )
+  ;
+
+opt-bits
+  : COLON number
+    ( $2 )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+opt-array
+  : BRACK_BLCK opt-array
+ ;; Eventually we want to replace the 1 below with a size
+ ;; (if available)
+    ( (cons 1 (car ,$2) ) )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+opt-assign
+  : EQUAL expression
+    ( $2 )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+opt-restrict
+  : RESTRICT
+  | ;;EMPTY
+  ;
+
+;; Klaus Berndl: symbol -> namespace-symbol?! I think so. Can be that
+;; then also some invalid C++-syntax is parsed but this is better than
+;; not parsing valid syntax.
+varname
+  : opt-stars opt-restrict namespace-symbol opt-bits opt-array 
+    ( ,$3 ,$1 ,$4 ,$5 )
+  ;
+
+;; I should store more in this def, but leave it simple for now.
+;; Klaus Berndl: const and volatile can be written after the type!
+variablearg
+  : declmods typeformbase cv-declmods opt-ref variablearg-opt-name
+    ( VARIABLE-TAG (list $5) $2 nil
+                   :constant-flag (if (member "const" (append $1 $3)) t nil)
+                   :typemodifiers (delete "const" (append $1 $3))
+                   :reference (car ,$4)
+                   )
+  ;
+
+variablearg-opt-name
+  : varname
+    ( ,$1 )
+ ;; Klaus Berndl: This allows variableargs without a arg-name being
+ ;; parsed correct even if there several pointers (*)
+  | opt-stars
+    ( "" ,$1 nil nil nil )
+  ;
+
+varname-opt-initializer
+  : semantic-list
+  | opt-assign
+  | ;; EMPTY
+  ;
+
+varnamelist
+  : opt-ref varname varname-opt-initializer COMA varnamelist
+    ( ,(cons $2 $5) )
+  | opt-ref varname varname-opt-initializer
+    ( $2 )
+  ;
+
+;; Klaus Berndl: Is necessary to parse stuff like
+;;     class list_of_facts : public list<fact>, public entity
+;; and
+;;     list <shared_ptr<item> >::const_iterator l;
+;; Parses also invalid(?) and senseless(?) c++-syntax like
+;;     symbol<template-spec>::symbol1<template-spec1>::test_iterator
+;; but better parsing too much than to less
+namespace-symbol
+  : symbol opt-template-specifier COLON COLON namespace-symbol
+    ( (concat $1 "::" (car $5)) )
+  | symbol opt-template-specifier
+    ( $1 )
+  ;
+
+;; Don't pull an optional template specifier at the end of the
+;; namespace symbol so that it can be picked up by the type.
+namespace-symbol-for-typeformbase
+  : symbol opt-template-specifier COLON COLON namespace-symbol-for-typeformbase
+    ( (concat $1 "::" (car $5)) )
+  | symbol
+    ( $1 )
+  ;
+;; namespace-symbol
+;;   : symbol COLON COLON namespace-symbol
+;;     ( (concat $1 "::" (car $4)) )
+;;   | symbol
+;;     ( $1 )
+;;   ;
+
+namespace-opt-class
+  : symbol COLON COLON namespace-opt-class
+    ( (concat $1 "::" (car $4)) )
+ ;; Klaus Berndl: We must recognize template-specifiers here so we can
+ ;; parse correctly the method-implementations of template-classes
+ ;; outside the template-class-declaration Example:
+ ;; TemplateClass1<T>::method_1(...)
+  | symbol opt-template-specifier COLON COLON
+    ( $1 )
+  ;
+
+;; Klaus Berndl: The opt-class of a func-decl must be able to
+;; recognize opt-classes with namespaces, e.g.
+;; Test1::Test2::classname::
+opt-class
+  : namespace-opt-class
+    ( ,$1 )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+opt-destructor
+  : TILDE
+    ( t )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+arg-list
+  : PAREN_BLCK knr-arguments
+    ( ,$2 )
+  | PAREN_BLCK
+    (EXPANDFULL $1 arg-sub-list)
+  | VOID_BLCK
+    ( )
+  ;
+
+knr-varnamelist
+  : varname COMA knr-varnamelist
+    ( ,(cons $1 $3) )
+  | varname
+    ( $1 )
+  ;
+
+
+knr-one-variable-decl
+  : declmods typeformbase cv-declmods knr-varnamelist
+    ( VARIABLE-TAG (nreverse $4) $2 nil
+                   :constant-flag (if (member "const" (append $3)) t nil)
+                   :typemodifiers (delete "const" $3)
+                   )
+  ;
+
+knr-arguments
+  : knr-one-variable-decl SEMICOLON knr-arguments
+    ( ,(append (semantic-expand-c-tag ,$1) ,$3) )
+  | knr-one-variable-decl SEMICOLON
+    ( ,(semantic-expand-c-tag ,$1) )
+  ;
+
+arg-sub-list
+  : variablearg
+    ( ,$1 )
+  | PERIOD PERIOD PERIOD RPAREN
+    (VARIABLE-TAG "..." "vararg" nil)
+  | COMA
+    ( nil )
+  | LPAREN
+    ( nil )
+  | RPAREN
+    ( nil )
+  ;
+
+operatorsym
+  : LESS LESS EQUAL 
+    ( "<<=" )
+  | GREATER GREATER EQUAL 
+    ( ">>=" )
+  | LESS LESS
+    ( "<<" )
+  | GREATER GREATER
+    ( ">>" )
+  | EQUAL EQUAL
+    ( "==" )
+  | LESS EQUAL
+    ( "<=" )
+  | GREATER EQUAL
+    ( ">=" )
+  | BANG EQUAL
+    ( "!=" )
+  | PLUS EQUAL
+    ( "+=" )
+  | MINUS EQUAL
+    ( "-=" )
+  | STAR EQUAL
+    ( "*=" )
+  | DIVIDE EQUAL
+    ( "/=" )
+  | MOD EQUAL
+    ( "%=" )
+  | AMPERSAND EQUAL
+    ( "&=" )
+  | OR EQUAL
+    ( "|=" )
+  | MINUS GREATER STAR
+    ( "->*" )
+  | MINUS GREATER
+    ( "->" )
+  | PARENS
+    ( "()" )
+  | BRACKETS
+    ( "[]" )
+  | LESS
+  | GREATER
+  | STAR
+  | PLUS PLUS
+    ( "++" )
+  | PLUS
+  | MINUS MINUS
+    ( "--" )
+  | MINUS
+  | AMPERSAND AMPERSAND
+    ( "&&" )
+  | AMPERSAND
+  | OR OR
+    ( "||" )
+  | OR
+  | DIVIDE
+  | EQUAL
+  | BANG
+  | TILDE
+  | MOD
+  | COMA
+ ;; HAT EQUAL seems to have a really unpleasant result and
+ ;; breaks everything after it.  Leave it at the end, though it
+ ;; doesn't seem to work.
+  | HAT EQUAL
+    ( "^=" )
+  | HAT
+  ;
+
+functionname
+  : OPERATOR operatorsym
+    ( ,$2 )
+  | semantic-list
+    ( EXPAND $1 function-pointer )
+  | symbol
+    ( $1 )
+  ;
+
+function-pointer
+  : LPAREN STAR symbol RPAREN
+    ( (concat "*" $3) )
+  ;
+
+fun-or-proto-end
+  : SEMICOLON
+    ( t )
+  | semantic-list
+    ( nil )
+ ;; Here is an anoying feature of C++ pure virtual methods
+  | EQUAL ZERO SEMICOLON
+    ( :pure-virtual-flag )
+  | fun-try-end
+    ( nil )
+  ;
+
+fun-try-end
+  : TRY opt-initializers BRACE_BLCK fun-try-several-catches
+    ( nil )
+  ;
+
+fun-try-several-catches
+  : CATCH PAREN_BLCK BRACE_BLCK fun-try-several-catches
+    ( )
+  | CATCH BRACE_BLCK fun-try-several-catches
+    ( )
+  | ;; EMPTY
+    ( )
+  ;
+
+type-cast
+  : semantic-list
+    ( EXPAND $1 type-cast-list )
+  ;
+
+type-cast-list
+  : open-paren typeformbase close-paren
+  ;
+
+opt-stuff-after-symbol
+  : PAREN_BLCK
+  | BRACK_BLCK
+  | ;; EMPTY 
+  ;
+
+multi-stage-dereference
+  : namespace-symbol opt-stuff-after-symbol PERIOD multi-stage-dereference ;; method call
+  | namespace-symbol opt-stuff-after-symbol MINUS GREATER multi-stage-dereference ;;method call
+  | namespace-symbol opt-stuff-after-symbol
+  ;
+
+string-seq
+  : string string-seq
+    ( (concat $1 (car $2)) )
+  | string
+    ( $1 )
+  ;
+
+expr-start 
+  : MINUS
+  | PLUS
+  | STAR
+  | AMPERSAND
+  ;
+
+expr-binop
+  : MINUS
+  | PLUS
+  | STAR
+  | DIVIDE
+  | AMPERSAND AMPERSAND
+  | AMPERSAND
+  | OR OR
+  | OR
+ ;; There are more.
+  ;
+
+;; Use expression for parsing only.  Don't actually return anything
+;; for now.  Hopefully we can fix this later.
+expression
+  : unaryexpression expr-binop unaryexpression
+    ( (identity start) (identity end) )
+  | unaryexpression
+    ( (identity start) (identity end) )
+  ;
+
+unaryexpression
+  : number
+  | multi-stage-dereference
+  | NEW multi-stage-dereference
+  | NEW builtintype-types semantic-list
+ ;; Klaus Berndl: symbol -> namespace-symbol!
+  | namespace-symbol
+ ;; Klaus Berndl: C/C++ allows sequences of strings which are
+ ;; concatenated by the precompiler to one string
+  | string-seq
+  | type-cast expression  ;; A cast to some other type
+ ;; Casting the results of one expression to something else.
+  | semantic-list expression
+  | semantic-list
+  | expr-start expression
+  ;
+
+;;; c.by ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/erlang.by b/site/cedet-1.0pre7/semantic/bovine/erlang.by
new file mode 100644
index 0000000..157e91a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/erlang.by
@@ -0,0 +1,1080 @@
+;;; erlang.by -- LL grammar for Erlang language specification
+;;
+;; Copyright (C) 2002, 2003 Vladimir G. Sekissov
+;; Copyright (C) 2003 David Ponce
+;;
+;; Author: Vladimir G. Sekissov <svg@surnet.ru>
+;;         David Ponce <david@dponce.com>
+;;
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; $Id: erlang.by,v 1.7 2005/09/30 20:21:53 zappo Exp $
+;;
+
+%package semantic-erlang-by
+
+%start         module-decl
+%languagemode  erlang-mode
+
+;;; Keywords
+;;
+%token BEGIN       "begin"
+%token END         "end"
+%token CASE        "case"
+%token OF          "of"
+%token IF          "if"
+%token WHEN        "when"
+%token TRUE        "true"
+%token RECEIVE     "receive"
+%token AFTER       "after"
+%token OR          "or"
+%token ORELSE      "orelse"
+%token XOR         "xor"
+%token BOR         "bor"
+%token BXOR        "bxor"
+%token BSL         "bsl"
+%token BSR         "bsr"
+%token DIV         "div"
+%token REM         "rem"
+%token BAND        "band"
+%token AND         "and"
+%token ANDALSO     "andalso"
+%token BNOT        "bnot"
+%token NOT         "not"
+%token CATCH       "catch"
+%token FUN         "fun"
+%token QUERY       "query"
+%token LET         "let"
+%token MODULE      "module"
+%token INCLUDE     "include"
+%token INCLUDE_LIB "include_lib"
+%token BEHAVIOUR   "behaviour"
+%token DEFINE      "define"
+%token UNDEF       "undef"
+%token IFDEF       "ifdef"
+%token IFNDEF      "ifndef"
+%token ELSE        "else"
+%token ENDIF       "endif"
+%token EXPORT      "export"
+%token IMPORT      "import"
+%token RECORD      "record"
+%token SIGNED      "signed"
+%token UNSIGNED    "unsigned"
+
+
+;;; Punctuations
+;;
+%token <punctuation> HASH      "\\`[#]\\'"
+%token <punctuation> PERIOD    "\\`[.]\\'"
+%token <punctuation> COLON     "\\`[:]\\'"
+%token <punctuation> SEMICOLON "\\`[;]\\'"
+%token <punctuation> STAR      "\\`[*]\\'"
+%token <punctuation> AMPERSAND "\\`[&]\\'"
+%token <punctuation> DIVIDE    "\\`[/]\\'"
+%token <punctuation> PLUS      "\\`[+]\\'"
+%token <punctuation> MINUS     "\\`[-]\\'"
+%token <punctuation> BANG      "\\`[!]\\'"
+%token <punctuation> WHY       "\\`[?]\\'"
+%token <punctuation> EQUAL     "\\`[=]\\'"
+%token <punctuation> LESS      "\\`[<]\\'"
+%token <punctuation> GREATER   "\\`[>]\\'"
+%token <punctuation> COMA      "\\`[,]\\'"
+%token <punctuation> VDEL      "\\`[|]\\'"
+%token <punctuation> SIGN      "[-+]"
+;; %token <charquote>   DOLLAR    "$"
+
+;;; Symbol literals
+;;
+%token <symbol> ATOM1    "[a-z][a-zA-Z0-9_@]*"
+%token <symbol> ATOM2    "'.+'"
+%token <symbol> DIGITS   "[0-9]+"
+%token <symbol> EE       "[eE]"
+%token <symbol> INT1     "[0-9a-eA-E]+"
+%token <symbol> INT2     "[0-9]\\{1,2\\}"
+%token <symbol> VAR1     "^_[a-zA-Z0-9]+"
+%token <symbol> VAR2     "^[A-Z][_a-zA-Z0-9]*"
+%token <symbol> USCORE   "_"
+;; binary tokens
+%token <symbol> FILE     "file"
+%token <symbol> INTEGER  "integer"
+%token <symbol> FLOAT    "float"
+%token <symbol> BINARY   "binary"
+%token <symbol> BIG      "big"
+%token <symbol> LITTLE   "little"
+%token <symbol> NATIVE   "native"
+%token <symbol> UNIT     "unit"
+
+
+;;; Blocks
+;;
+%token <semantic-list> PAREN_BLCK "^("
+%token <semantic-list> BRACK_BLCK "^\\["
+%token <semantic-list> BRACE_BLCK "^{"
+
+;;; Parenthesis
+;;
+%token <open-paren>    LPAREN "("
+%token <close-paren>   RPAREN ")"
+%token <open-paren>    LBRACE "{"
+%token <close-paren>   RBRACE "}"
+
+%%
+
+add-op
+  : PLUS
+  | MINUS
+  | BOR
+  | BXOR
+  | BSL
+  | BSR
+  ;
+
+list-conc-op
+  : PLUS PLUS
+  | MINUS MINUS
+  ;
+
+comp-op
+  : EQUAL EQUAL
+    ( "==" )
+  | EQUAL COLON EQUAL
+    ( "=:=" )
+  | EQUAL DIVIDE EQUAL
+    ( "=/=" )
+  | DIVIDE EQUAL
+    ( "/=" )
+  | EQUAL LESS
+    ( "=<" )
+  | GREATER EQUAL
+    ( ">=" )
+  | LESS
+  | GREATER
+  | OR
+  | ORELSE
+  | XOR
+  | AND
+  | ANDALSO
+  ;
+
+multi-op
+  : STAR
+  | DIVIDE
+  | DIV
+  | REM
+  | BAND
+  ;
+
+prefix-op
+  : PLUS
+  | MINUS
+  | BNOT
+  | NOT
+  ;
+
+basic-type
+  : float-literal
+  | integer-literal
+  | char-literal
+  | atom
+  | var
+  | string
+  | TRUE
+  ;
+
+atom
+  : ATOM1
+    ( $1 )
+  | ATOM2
+    ( $1 )
+  ;
+
+float-literal
+  : DIGITS PERIOD DIGITS exp-part
+  | PERIOD DIGITS exp-part
+  ;
+
+exp-part
+  : EE SIGN DIGITS
+  | EE DIGITS
+  | ;;EMPTY
+  ;
+
+integer-literal
+  : INT1
+  | INT2 HASH INT1
+  ;
+
+char-literal
+  : CHAR
+  ;
+
+var
+  : VAR1
+ ;;($1 variable nil nil nil nil)
+    (VARIABLE-TAG $1 nil nil)
+  | VAR2
+ ;;($1 variable nil nil nil nil)
+    (VARIABLE-TAG $1 nil nil)
+  ;
+
+uni-pattern
+  : USCORE
+  ;
+
+binary
+  : LESS LESS GREATER GREATER
+ ;;( "<<>>" binary nil nil )
+    (TAG "<<>>" 'binary)
+  | LESS LESS binary-segments GREATER GREATER
+ ;;( "<<Binary>>" binary nil nil)
+    (TAG "<<Binary>>" 'binary)
+  ;
+
+binary-segments
+  : binary-segment binary-segments-rest
+  ;
+
+binary-segments-rest
+  : COMA binary-segments
+    ( ,$2 )
+  | ;;EMPTY
+  ;
+
+binary-segment
+  : basic-type binary-segment-rest
+  | clause-pattern binary-segment-rest
+  ;
+
+;; binary-segment-rest
+;;   : COLON integer-literal DIVIDE basic-type
+;;   | COLON basic-type
+;;   | DIVIDE basic-type
+;;   | ;;EMPTY
+;;   ;
+
+binary-segment-rest
+  : COLON basic-type DIVIDE binary-type-spec-list
+  | COLON basic-type
+  | DIVIDE binary-type-spec-list
+  | ;;EMPTY
+  ;
+
+;; addition by david wallin [david.wallin@ul.ie]
+
+binary-type
+  : INTEGER
+  | FLOAT
+  | BINARY
+  ;
+
+binary-signed
+  : SIGNED
+  | UNSIGNED
+  ;
+
+binary-endian
+  : BIG
+  | LITTLE
+  | NATIVE
+  ;
+
+binary-unit
+  : UNIT COLON basic-type
+  ;
+
+binary-type-spec
+  : binary-type 
+  | binary-signed 
+  | binary-endian 
+  | binary-unit
+  ;
+
+binary-type-spec-list
+  : binary-type-spec MINUS binary-type-spec-list
+  | binary-type-spec
+  ;
+
+;; end addition
+
+module-decl
+  : module-attr
+  | function-decl
+  | header-form
+  | directive
+  | file-attr
+  ;
+
+module-attr
+  : MINUS MODULE PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 module-attr-name)) package nil nil )
+    (PACKAGE-TAG (car (EXPAND $3 module-attr-name)) nil)
+  ;
+
+module-attr-name
+  : LPAREN module-name RPAREN
+    ( (car $2) )
+  ;
+
+module-name
+  : atom module-name-rest
+    ( (concat (car $1) (car $2)) )
+  | module-name-rest
+    ( (car $1) )
+  ;
+
+module-name-rest
+  : PERIOD atom module-name-rest
+    ( (concat $1 (car $2) (car $3)) )
+  | ;;EMPTY
+    ( nil )
+  ;
+
+header-form
+  : header-attr
+  | anywhere-attr
+  ;
+
+header-attr
+  : export-attr
+  | import-attr
+  | compile-attr
+  | whild-attr
+  ;
+
+anywhere-attr
+  : file-attr
+  | macro-def
+  | record-decl
+  ;
+
+export-attr
+  : MINUS EXPORT PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 export-name-list)) export nil nil )
+  ;
+
+export-name-list
+  : open-paren BRACK_BLCK close-paren
+ ;; ( (car (EXPAND $2 function-name-list)) )
+  ;
+
+import-attr
+  : MINUS IMPORT PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 import-name-list)) import nil nil )
+    (TAG (car (EXPAND $3 import-name-list)) 'import)
+  ;
+
+import-name-list
+  : open-paren module-name COMA BRACK_BLCK close-paren
+    ( ,$2 (EXPAND $4 function-name-list))
+  | open-paren module-name close-paren
+    ( ,$2 )
+  ;
+
+function-name-list
+  : open-paren close-paren
+    ( nil )
+  | open-paren function-names close-paren
+    ( $2 )
+  ;
+
+function-names
+  : function-arity COMA function-names
+    ( $1  $3 )
+  | function-arity
+    ( $1 )
+  ;
+
+function-arity
+  : atom DIVIDE integer-literal
+    ( ,$1 $2 ,$3 )
+  ;
+
+compile-attr
+  : MINUS COMPILE PAREN_BLCK full-stop
+ ;;( $3 compile nil nil )
+  ;
+
+file-attr
+  : MINUS FILE PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 file-attr-list)) file nil nil )
+  ;
+
+file-attr-list
+  : open-paren string COMA integer-literal close-paren
+    ( (cons (read $2) ,$4) )
+  ;
+
+whild-attr
+  : MINUS atom PAREN_BLCK full-stop
+ ;; ( $3 (read (car $2)) nil nil )
+  ;
+
+function-decl
+  : function-clauses full-stop
+    ( ,$1 )
+  ;
+
+function-clauses
+  : function-clause function-clauses-rest
+    ( ,$1 )
+  ;
+
+function-clauses-rest
+  : SEMICOLON function-clauses
+  | ;;EMPTY
+  ;
+
+function-clause
+  : atom fun-clause
+ ;;\( (concat (car $1) "/" (number-to-string (length (car $2))))
+ ;;  function nil ,$2 nil nil)
+    (FUNCTION-TAG
+     (concat (car $1) "/" (number-to-string (length (car $2))))
+     nil ,$2)
+  ;
+
+record-decl
+  : MINUS RECORD PAREN_BLCK full-stop
+    ( ,(car (EXPANDFULL $3 record-def)) )
+  ;
+
+record-def
+  : open-paren atom COMA BRACE_BLCK close-paren
+ ;;(,$2 type "record" (EXPANDFULL $4 record-field-decl) nil nil)
+    (TYPE-TAG ,$2 "record" (EXPANDFULL $4 record-field-decl) nil)
+  ;
+
+record-decl-tuple
+  : open-paren record-field-decls close-paren
+    ( $2 )
+  | open-paren close-paren
+    ( nil )
+  ;
+
+record-field-decl
+  : atom record-field-value
+ ;;( ,$1 variable nil "" () nil)
+    (VARIABLE-TAG ,$1 nil "")
+  | atom
+ ;;( ,$1 variable nil "" () nil)
+    (VARIABLE-TAG ,$1 nil "")
+  | LBRACE
+    ( nil )
+  | RBRACE
+    ( nil )
+  | COMA
+    ( nil )
+  ;
+
+pattern
+  : pattern-expr
+    ( ,$1 )
+  | uni-pattern
+  | binary
+  | basic-type
+  | BRACK_BLCK
+ ;;( "List" list nil nil )
+    (TAG "List" 'list)
+ ;; ( (EXPAND $1 list-pattern ) )
+  | BRACE_BLCK
+ ;;( "Tuple" tuple nil nil )
+    (TAG "Tuple" 'list)
+ ;; ( (EXPAND $1 tuple-pattern) )
+  | record-pattern
+    ( ,$1 )
+  ;
+
+pattern-expr
+  : pattern-conc-expr pattern-conc-expr-rest
+    ( ,$1 )
+  ;
+
+pattern-conc-expr
+  : string-literal
+  | var
+  ;
+
+pattern-conc-expr-rest
+  : list-conc-op pattern-expr
+    ( )
+  | ;;EMPTY
+  ;
+
+tuple-pattern
+  : open-paren patterns close-paren
+  | open-paren close-paren
+    ( nil )
+  ;
+
+list-pattern
+  : open-paren patterns list-pattern-tail close-paren
+  | open-paren close-paren
+    ( nil )
+  ;
+
+list-pattern-tail
+  : VDEL pattern
+  | ;;EMPTY
+    ( nil )
+  ;
+
+patterns
+  : pattern patterns-rest
+    ((cons (car $1) (car $2)))
+  ;
+
+patterns-rest
+  : COMA patterns
+    ( ,$2 )
+  | ;;EMPTY
+  ;
+
+record-pattern
+  : HASH atom BRACE_BLCK
+    ( (car $2) )
+ ;; ( (cons $2 (EXPAND $3 record-pattern-tuple) ) )
+  ;
+
+record-pattern-tuple
+  : open-paren record-field-patterns close-paren
+    ( $2 )
+  | open-paren close-paren
+    ( nil )
+  ;
+
+record-field-patterns
+  : record-field-patterns COMA record-field-pattern
+  | record-field-pattern
+  ;
+
+record-field-pattern
+  : atom EQUAL pattern
+  ;
+
+body
+  : exprs
+  ;
+
+exprs
+  : expr exprs-rest
+  ;
+
+exprs-rest
+  : COMA exprs
+  | ;;EMPTY
+  ;
+
+expr
+  : CATCH expr
+  | match-expr
+  ;
+
+match-expr
+  : pattern EQUAL match-expr
+  | send-expr
+  ;
+
+send-expr
+  : compare-expr send-expr-rest
+  ;
+
+send-expr-rest
+  : BANG send-expr
+  | ;;EMPTY
+  ;
+
+compare-expr
+  : list-conc-expr compare-expr-rest
+  ;
+
+compare-expr-rest
+  : comp-op list-conc-expr
+  | ;;EMPTY
+  ;
+
+list-conc-expr
+  : add-expr list-conc-expr-rest
+  ;
+
+list-conc-expr-rest
+  : list-conc-op list-conc-expr
+  | ;;EMPTY
+  ;
+
+add-expr
+  : multi-expr add-expr-rest
+  ;
+
+add-expr-rest
+  : add-op add-expr
+  | ;;EMPTY
+  ;
+
+multi-expr
+  : prefix-expr multi-expr-rest
+  ;
+
+multi-expr-rest
+  : multi-op multi-expr
+  | ;;EMPTY
+  ;
+
+prefix-expr
+  : prefix-op record-expr
+  | record-expr
+  ;
+
+record-expr
+  : HASH record-expr-field
+  | application-expr record-expr-rest
+  ;
+
+record-expr-rest
+  : HASH record-expr-field
+  | ;;EMPTY
+  ;
+
+record-expr-field
+  : atom PERIOD atom
+  | atom BRACE_BLCK
+ ;; ( $1 (EXPAND $3 record-update-tuple) )
+  | record-expr
+  ;
+
+record-update-tuple
+  : open-paren close-paren
+  | open-paren record-field-updates close-paren
+  ;
+
+record-field-updates
+  : record-field-update record-field-updates-rest
+  ;
+
+record-field-updates-rest
+  : COMA record-field-updates
+  | ;;EMPTY
+  ;
+
+record-field-update
+  : atom record-field-value
+  ;
+
+record-field-value
+  : EQUAL expr
+  | ;;EMPTY
+  ;
+
+application-expr
+  : module-name COLON primary-expr PAREN_BLCK
+  | primary-expr application-expr-rest
+  ;
+
+application-expr-rest
+  : PAREN_BLCK
+ ;;( (EXPAND $1 application-expr-list) )
+  | COLON primary-expr PAREN_BLCK
+ ;;( $1 $2 (EXPAND $3 application-expr-list) )
+  | ;;EMPTY
+  ;
+
+application-expr-list
+  : open-paren close-paren
+  | open-paren exprs close-paren
+  ;
+
+primary-expr
+  : binary
+  | string-literal
+  | basic-type
+ ;;| module-name
+  | BRACE_BLCK
+ ;;  ( (EXPAND $1 tuple-skel) )
+  | BRACK_BLCK
+ ;;  ( (EXPAND $1 list-skel) )
+  | BRACK_BLCK
+ ;;  ( (EXPAND $1 list-compr) )
+  | block-expr
+  | if-expr
+  | case-expr
+  | receive-expr
+  | fun-expr
+  | query-expr
+  | paren-expr
+  ;
+
+string-literal
+  : string
+  | macro-app
+  | string string-literal
+  ;
+
+tuple-skel
+  : open-paren close-paren
+  | open-paren exprs close-paren
+  ;
+
+list-skel
+  : open-paren close-paren
+  | open-paren exprs list-skel-tail close-paren
+  ;
+
+list-skel-tail
+  : VDEL expr
+  | ;;EMPTY
+  ;
+
+list-compr
+  : open-paren expr VDEL VDEL list-compr-exprs close-paren
+  ;
+
+list-compr-exprs
+  : list-compr-expr list-compr-exprs-rest
+  ;
+
+list-compr-exprs-rest
+  : COMA list-compr-exprs
+  | ;;EMPTY
+  ;
+
+list-compr-expr
+  : generator
+  | filter
+  ;
+
+generator
+  : pattern LESS MINUS expr
+  ;
+
+filter
+  : expr
+  ;
+
+block-expr
+  : BEGIN body END
+  ;
+
+if-expr
+  : IF if-clauses END
+  ;
+
+if-clauses
+  : if-clause SEMICOLON if-clauses
+  | if-clause
+  ;
+
+if-clause
+  : guard clause-body
+  | expr clause-body
+  ;
+
+clause-body
+  : MINUS GREATER body
+  ;
+
+case-expr
+  : CASE expr OF cr-clauses END
+  ;
+
+cr-clauses
+  : cr-clause SEMICOLON cr-clauses
+  | cr-clause
+  ;
+
+cr-clause
+  : clause-pattern clause-guard clause-body
+  ;
+
+clause-guard
+  : WHEN guard
+  | ;;EMPTY
+  ;
+
+receive-expr
+  : RECEIVE cr-clauses receive-after END
+  | RECEIVE receive-after END
+  | RECEIVE cr-clauses AFTER expr clause-body END
+  ;
+
+receive-after
+  : AFTER expr clause-body
+  | ;;EMPTY
+  ;
+
+fun-expr
+  : FUN function-arity
+  | FUN fun-clauses END
+  ;
+
+fun-clauses
+  : fun-clause fun-clauses-rest
+  ;
+
+fun-clauses-rest
+  : SEMICOLON fun-clauses
+  | ;;EMPTY
+  ;
+
+fun-clause
+  : PAREN_BLCK clause-guard clause-body
+    ( ,(car (EXPAND $1 clause-pattern-list)) )
+  ;
+
+clause-pattern-list
+  : open-paren clause-patterns close-paren
+    ( $2 )
+  ;
+
+clause-patterns
+  : clause-pattern clause-patterns-rest
+    ((cons (car $1) (car $2)))
+  ;
+
+clause-patterns-rest
+  : COMA clause-patterns
+    ( ,$2 )
+  | ;;EMPTY
+  ;
+
+clause-pattern
+  : match-pattern
+  | pattern
+  ;
+
+match-pattern
+  : var EQUAL pattern
+    ( ,$1 )
+  | pattern EQUAL var
+    ( ,$1 )
+  ;
+
+query-expr
+  : QUERY BRACK_BLCK END
+ ;; ( $1 (EXPAND $2 list-compr) $3)
+  ;
+
+paren-expr
+  : PAREN_BLCK
+ ;;  ( ,(EXPAND $1 paren-expr-list) )
+  ;
+
+paren-expr-list
+  : open-paren expr close-paren
+  ;
+
+guard
+  : guard-test guard-rest
+  ;
+
+guard-rest
+  : COMA guard
+  | SEMICOLON guard
+  | ;;EMPTY
+  ;
+
+guard-test
+  : TRUE
+  | guard-record-test
+  | guard-term-cmp
+  | guard-recognizer
+  | PAREN_BLCK
+ ;;  ( (EXPAND $1 paren-guard-test) )
+  ;
+
+guard-record-test
+  : RECORD PAREN_BLCK
+ ;;  ( ,(EXPAND $2 guard-record-test) )
+  | open-paren guard-expr COMA symbol close-paren
+  ;
+
+guard-recognizer
+  : symbol PAREN_BLCK
+ ;;  ( ,(cons $1 ,(EXPAND $2 guard-expr) ) )
+  ;
+
+guard-term-cmp
+  : guard-expr guard-term-op guard-expr
+  ;
+
+guard-term-op
+  : comp-op
+  | EQUAL
+  ;
+
+paren-guard-test
+  : open-paren guard-test close-paren
+  ;
+
+guard-expr
+  : guard-add-expr
+  ;
+
+guard-add-expr
+  : guard-multi-expr guard-add-expr-rest
+  ;
+
+guard-add-expr-rest
+  : add-op guard-add-expr
+  | ;;EMPTY
+  ;
+
+guard-multi-expr
+  : guard-prefix-expr guard-multi-expr-rest
+  ;
+
+guard-multi-expr-rest
+  : multi-op guard-multi-expr
+  | ;;EMPTY
+  ;
+
+guard-prefix-expr
+  : prefix-op guard-application-expr
+  | guard-application-expr
+  ;
+
+guard-application-expr
+  : atom PAREN_BLCK
+ ;;  ( (cons $1 (EXPAND $2 guard-exprs-list) ) )
+  | guard-record-expr
+  | guard-primary-expr
+  ;
+
+guard-exprs-list
+  : open-paren close-paren
+  | open-paren guard-exprs close-paren
+  ;
+
+guard-exprs
+  : guard-expr guard-exprs-rest
+  ;
+
+guard-exprs-rest
+  : COMA guard-exprs
+  | SEMICOLON guard-exprs
+  | ;;EMPTY
+  ;
+
+guard-record-expr
+  : HASH atom PERIOD atom
+  | guard-primary-expr HASH atom PERIOD atom
+  ;
+
+guard-primary-expr
+  : basic-type
+  | macro-app
+  | BRACE_BLCK
+ ;;  ( ,(EXPAND $1 guard-tuple-skel) )
+  | BRACK_BLCK
+ ;;  ( ,(EXPAND $1 guard-list-skel) )
+  | PAREN_BLCK
+ ;;  ( ,(EXPAND $1 guard-paren-expr) )
+  ;
+
+guard-tuple-skel
+  : open-paren close-paren
+  | open-paren guard-exprs close-paren
+  ;
+
+guard-list-skel
+  : open-paren close-paren
+  | open-paren guard-exprs guard-list-skel-tail close-paren
+  ;
+
+guard-list-skel-tail
+  : VDEL guard-expr
+  | ;;EMPTY
+  ;
+
+guard-paren-expr
+  : open-paren guard-expr close-paren
+  ;
+
+directive
+  : macro-def
+  | macro-undef
+  | include-dir
+  | include-lib-dir
+  | ifdef-dir
+  | ifndef-dir
+  | else-dir
+  | endif-dir
+  ;
+
+macro-def
+  : MINUS DEFINE PAREN_BLCK full-stop
+    ( ,(EXPAND $3 macro-def-list) )
+  ;
+
+macro-def-list
+  : open-paren symbol macro-def-opt COMA macro-def-opt close-paren
+ ;;( $2 variable nil $5 (ASSOC const t) nil)
+    (VARIABLE-TAG $2 nil $5 :constant-flag t)
+  ;
+
+macro-def-opt
+  : semantic-list
+  | expr
+  | ;;EMPTY
+  ;
+
+macro-undef
+  : MINUS UNDEF PAREN_BLCK full-stop
+  ;
+
+macro-app
+  : WHY symbol PAREN_BLCK
+  | WHY symbol
+  ;
+
+include-dir
+  : MINUS INCLUDE PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 include-file-name)) include nil nil )
+    (INCLUDE-TAG (car (EXPAND $3 include-file-name)) nil)
+  ;
+
+include-lib-dir
+  : MINUS INCLUDE_LIB PAREN_BLCK full-stop
+ ;;( (car (EXPAND $3 include-file-name)) include nil nil )
+    (INCLUDE-TAG (car (EXPAND $3 include-file-name)) nil)
+  ;
+
+include-file-name
+  : open-paren string close-paren
+    ( (read $2) )
+  ;
+
+ifdef-dir
+  : MINUS IFDEF PAREN_BLCK full-stop
+ ;;( ,(EXPAND $3 macro-name) )
+  ;
+
+ifndef-dir
+  : MINUS IFNDEF PAREN_BLCK full-stop
+ ;;( ,(EXPAND $3 macro-name) )
+  ;
+
+else-dir
+  : MINUS ELSE full-stop
+  ;
+
+endif-dir
+  : MINUS ENDIF full-stop
+  ;
+
+full-stop
+  : PERIOD
+  ;
+
+;;; erlang.by ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/make.by b/site/cedet-1.0pre7/semantic/bovine/make.by
new file mode 100755
index 0000000..1653716
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/make.by
@@ -0,0 +1,168 @@
+;;; make.by -- BY notation for Makefiles.
+;;
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2008 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: make.by,v 1.14 2008/08/28 01:18:33 zappo Exp $
+;;
+;; make.bnf is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+
+%package semantic-make-by
+
+%languagemode  makefile-mode
+%start         Makefile
+
+;; This was always a test case.
+%quotemode     backquote
+
+%token IF      "if"
+%token IFDEF   "ifdef"
+%token IFNDEF  "ifndef"
+%token IFEQ    "ifeq"
+%token IFNEQ   "ifneq"
+%token ELSE    "else"
+%token ENDIF   "endif"
+%token INCLUDE "include"
+
+%put { IF ELSE ENDIF } summary "Conditional: if (expression) ... else ... endif"
+%put IFDEF   summary "Conditional: ifdef (expression) ... else ... endif"
+%put IFNDEF  summary "Conditional: ifndef (expression) ... else ... endif"
+%put IFEQ    summary "Conditional: ifeq (expression) ... else ... endif"
+%put IFNEQ   summary "Conditional: ifneq (expression) ... else ... endif"
+%put INCLUDE summary "Macro: include filename1 filename2 ..."
+
+%token <punctuation> COLON     "\\`[:]\\'"
+%token <punctuation> PLUS      "\\`[+]\\'"
+%token <punctuation> EQUAL     "\\`[=]\\'"
+%token <punctuation> DOLLAR    "\\`[$]\\'"
+%token <punctuation> BACKSLASH "\\`[\\]\\'"
+
+%%
+
+Makefile : bol newline (nil)
+	 | bol variable
+	   ( ,@$2 )
+	 | bol rule
+	   ( ,@$2 )
+	 | bol conditional
+	   ( ,@$2 )
+	 | bol include
+	   ( ,@$2 )
+	 | whitespace ( nil )
+	 | newline ( nil )
+	 ;
+
+variable: symbol opt-whitespace equals opt-whitespace element-list
+	  (VARIABLE-TAG ,$1 nil ,$5)
+	;
+
+rule: targets opt-whitespace colons opt-whitespace element-list commands
+      (FUNCTION-TAG ,$1 nil ,$5)
+    ;
+
+targets: target opt-whitespace targets
+	 ( (car ,$1) (car ,@$3) )
+       | target
+	 ( (car ,$1) )
+       ;
+
+target: sub-target target
+	( (concat (car ,$1) (car ,@$3) ) )
+      | sub-target
+	( (car ,$1) )
+      ;
+
+sub-target: symbol
+	  | string
+	  | varref
+	  ;
+
+conditional: IF some-whitespace symbol newline
+	     ( nil )
+	   | IFDEF some-whitespace symbol newline
+	     ( nil )
+	   | IFNDEF some-whitespace symbol newline
+	     ( nil )
+	   | IFEQ some-whitespace expression newline
+	     ( nil )
+	   | IFNEQ some-whitespace expression newline
+	     ( nil )
+	   | ELSE newline
+	     ( nil )
+	   | ENDIF newline
+	     ( nil )
+	   ;
+
+expression : semantic-list
+	   ;
+
+include: INCLUDE some-whitespace element-list
+	 (INCLUDE-TAG ,$3 nil)
+       ;
+
+equals: COLON EQUAL ()
+      | PLUS EQUAL ()
+      | EQUAL ()
+      ;
+
+colons: COLON COLON ()
+      | COLON ()
+      ;
+
+element-list: elements newline
+	      ( ,@$1 )
+	    ;
+
+elements: element some-whitespace elements
+	  ( ,@$1 ,@$3 )
+	| element
+	  ( ,@$1 )
+	| ;;EMPTY
+	;
+  
+element: sub-element element
+	 ( (concat (car ,$1) (car ,$2)) )
+       | ;;EMPTY
+       ;
+
+sub-element: symbol
+	   | string
+	   | punctuation
+	   | semantic-list
+	     ( (buffer-substring-no-properties
+		 (identity start) (identity end)) )
+	   ;
+
+varref: DOLLAR semantic-list
+	( (buffer-substring-no-properties (identity start) (identity end)) )
+      ;
+
+commands: bol shell-command newline commands
+	  ( ,$1 ,@$2 )
+	| ;;EMPTY
+	  ( )
+	;
+
+opt-whitespace : some-whitespace ( nil )
+	       | ;;EMPTY
+	       ;
+
+some-whitespace : whitespace some-whitespace (nil)
+		| whitespace (nil)
+		;
+
+;;; make.by ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/scheme.by b/site/cedet-1.0pre7/semantic/bovine/scheme.by
new file mode 100644
index 0000000..6aff707
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/scheme.by
@@ -0,0 +1,87 @@
+;;; scheme.by -- Scheme BNF language specification
+;;
+;; Copyright (C) 2001, 2003, 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: scheme.by,v 1.10 2009/05/14 01:39:18 zappo Exp $
+;;
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+%package semantic-scm-by
+
+%languagemode  scheme-mode
+%start         scheme
+
+%token DEFINE        "define"
+%token DEFINE-MODULE "define-module"
+%token LOAD          "load"
+
+%put DEFINE        summary "Function: (define symbol expression)"
+%put DEFINE-MODULE summary "Function: (define-module (name arg1 ...)) "
+%put LOAD          summary "Function: (load \"filename\")"
+
+%token <open-paren> OPENPAREN "("
+%token <close-paren> CLOSEPAREN ")"
+
+%%
+
+scheme : semantic-list
+	 (EXPAND $1 scheme-list)
+       ;
+
+scheme-list : OPENPAREN scheme-in-list CLOSEPAREN
+	      ( ,$2 )
+	    ;
+
+scheme-in-list: DEFINE symbol expression
+		(VARIABLE-TAG $2 nil $3 )
+	      | DEFINE name-args opt-doc sequence
+		(FUNCTION-TAG (car ,$2) nil (cdr ,$2) )
+	      | DEFINE-MODULE name-args
+		(PACKAGE-TAG (nth (length $2) $2 ) nil)
+	      | LOAD string
+		(INCLUDE-TAG (file-name-nondirectory (read $2)) (read $2) )
+	      | symbol
+		(CODE-TAG $1 nil)
+	      ;
+
+name-args: semantic-list
+	   (EXPAND $1 name-arg-expand)
+	 ;
+
+name-arg-expand : open-paren name-arg-expand
+		  ( ,$2 )
+		| symbol name-arg-expand
+		  ( ,(cons $1 ,$2) )
+		| ;; EMPTY
+		  (  )
+		;
+
+opt-doc : string
+	| ;; EMPTY
+	;
+
+sequence : expression sequence
+         | expression
+         ;
+
+expression : symbol
+	   | semantic-list
+	   | string
+	   | number
+	   ;
+
+;;; scheme.by ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-bovine.el b/site/cedet-1.0pre7/semantic/bovine/semantic-bovine.el
new file mode 100644
index 0000000..2cc4986
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-bovine.el
@@ -0,0 +1,286 @@
+;;; semantic-bovine.el --- LL Parser/Analyzer core.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-bovine.el,v 1.15 2009/09/11 18:55:33 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantix 1.x uses an LL parser named the "bovinator".  This parser
+;; had several conveniences in it which made for parsing tags out of
+;; languages with list characters easy.  This parser lives on as one
+;; of many available parsers for semantic the tool.
+;;
+;; This parser should be used when the language is simple, such as
+;; makefiles or other data-declaritive langauges.
+
+;;; Code:
+(require 'semantic)
+(require 'bovine-debug)
+
+;;; Variables
+;;
+;;;###autoload
+(defvar semantic-bovinate-nonterminal-check-obarray nil
+  "Obarray of streams already parsed for nonterminal symbols.
+Use this to detect infinite recursion during a parse.")
+(make-variable-buffer-local 'semantic-bovinate-nonterminal-check-obarray)
+
+
+
+;; These are functions that can be called from within a bovine table.
+;; Most of these have code auto-generated from other construct in the
+;; bovine input grammar.
+;;;###autoload
+(defmacro semantic-lambda (&rest return-val)
+  "Create a lambda expression to return a list including RETURN-VAL.
+The return list is a lambda expression to be used in a bovine table."
+  `(lambda (vals start end)
+     (append ,@return-val (list start end))))
+
+;;; Semantic Bovination
+;;
+;; Take a semantic token stream, and convert it using the bovinator.
+;; The bovinator takes a state table, and converts the token stream
+;; into a new semantic stream defined by the bovination table.
+;;
+(defsubst semantic-bovinate-symbol-nonterminal-p (sym table)
+  "Return non-nil if SYM is in TABLE, indicating it is NONTERMINAL."
+  ;; sym is always a sym, so assq should be ok.
+  (if (assq sym table) t nil))
+
+(defmacro semantic-bovinate-nonterminal-db-nt ()
+  "Return the current nonterminal symbol.
+Part of the grammar source debugger.  Depends on the existing
+environment of `semantic-bovinate-stream'."
+  `(if nt-stack
+       (car (aref (car nt-stack) 2))
+     nonterminal))
+
+(defun semantic-bovinate-nonterminal-check (stream nonterminal)
+  "Check if STREAM not already parsed for NONTERMINAL.
+If so abort because an infinite recursive parse is suspected."
+  (or (vectorp semantic-bovinate-nonterminal-check-obarray)
+      (setq semantic-bovinate-nonterminal-check-obarray
+            (make-vector 13 nil)))
+  (let* ((nt (symbol-name nonterminal))
+         (vs (symbol-value
+              (intern-soft
+               nt semantic-bovinate-nonterminal-check-obarray))))
+    (if (memq stream vs)
+        ;; Always enter debugger to see the backtrace
+        (let ((debug-on-signal t)
+              (debug-on-error  t))
+          (setq semantic-bovinate-nonterminal-check-obarray nil)
+          (error "Infinite recursive parse suspected on %s" nt))
+      (set (intern nt semantic-bovinate-nonterminal-check-obarray)
+           (cons stream vs)))))
+
+;;;###autoload
+(defun semantic-bovinate-stream (stream &optional nonterminal)
+  "Bovinate STREAM, starting at the first NONTERMINAL rule.
+Use `bovine-toplevel' if NONTERMINAL is not provided.
+This is the core routine for converting a stream into a table.
+Return the list (STREAM SEMANTIC-STREAM) where STREAM are those
+elements of STREAM that have not been used.  SEMANTIC-STREAM is the
+list of semantic tokens found."
+  (if (not nonterminal)
+      (setq nonterminal 'bovine-toplevel))
+
+  ;; Try to detect infinite recursive parse when doing a full reparse.
+  (or semantic--buffer-cache
+      (semantic-bovinate-nonterminal-check stream nonterminal))
+
+  (let* ((table semantic--parse-table)
+	 (matchlist (cdr (assq nonterminal table)))
+	 (starting-stream stream)
+	 (nt-loop  t)		  ;non-terminal loop condition
+	 nt-popup                 ;non-nil if return from nt recursion
+	 nt-stack		  ;non-terminal recursion stack
+	 s			  ;Temp Stream Tracker
+	 lse			  ;Local Semantic Element
+	 lte			  ;Local matchlist element
+	 tev			  ;Matchlist entry values from buffer
+	 val			  ;Value found in buffer.
+	 cvl			  ;collected values list.
+	 out			  ;Output
+	 end			  ;End of match
+	 result
+	 )
+    (condition-case debug-condition
+        (while nt-loop
+          (catch 'push-non-terminal
+            (setq nt-popup nil
+                  end (semantic-lex-token-end (car stream)))
+            (while (or nt-loop nt-popup)
+              (setq nt-loop nil
+                    out     nil)
+              (while (or nt-popup matchlist)
+                (if nt-popup
+                    ;; End of a non-terminal recursion
+                    (setq nt-popup nil)
+                  ;; New matching process
+                  (setq s   stream      ;init s from stream.
+                        cvl nil     ;re-init the collected value list.
+                        lte (car matchlist) ;Get the local matchlist entry.
+                        )
+                  (if (or (byte-code-function-p (car lte))
+                          (listp (car lte)))
+                      ;; In this case, we have an EMPTY match!  Make
+                      ;; stuff up.
+                      (setq cvl (list nil))))
+
+                (while (and lte
+                            (not (byte-code-function-p (car lte)))
+                            (not (listp (car lte))))
+
+                  ;; GRAMMAR SOURCE DEBUGGING!
+                  (if semantic-debug-enabled
+                      (let* ((db-nt   (semantic-bovinate-nonterminal-db-nt))
+                             (db-ml   (cdr (assq db-nt table)))
+                             (db-mlen (length db-ml))
+                             (db-midx (- db-mlen (length matchlist)))
+                             (db-tlen (length (nth db-midx db-ml)))
+                             (db-tidx (- db-tlen (length lte)))
+			     (frame (semantic-bovine-debug-create-frame
+				     db-nt db-midx db-tidx cvl (car s)))
+			     (cmd (semantic-debug-break frame))
+			     )
+                        (cond ((eq 'fail cmd) (setq lte '(trash 0 . 0)))
+			      ((eq 'quit cmd) (signal 'quit "Abort"))
+			      ((eq 'abort cmd) (error "Abort"))
+			      ;; support more commands here.
+
+			      )))
+                  ;; END GRAMMAR SOURCE DEBUGGING!
+
+                  (cond
+                   ;; We have a nonterminal symbol.  Recurse inline.
+                   ((setq nt-loop (assq (car lte) table))
+
+                    (setq
+                     ;; push state into the nt-stack
+                     nt-stack (cons (vector matchlist cvl lte stream end
+                                            )
+                                    nt-stack)
+                     ;; new non-terminal matchlist
+                     matchlist   (cdr nt-loop)
+                     ;; new non-terminal stream
+                     stream      s)
+
+                    (throw 'push-non-terminal t)
+
+                    )
+                   ;; Default case
+                   (t
+                    (setq lse (car s)   ;Get the local stream element
+                          s   (cdr s))  ;update stream.
+                    ;; Do the compare
+                    (if (eq (car lte) (semantic-lex-token-class lse)) ;syntactic match
+                        (let ((valdot (semantic-lex-token-bounds lse)))
+                          (setq val (semantic-lex-token-text lse))
+                          (setq lte (cdr lte))
+                          (if (stringp (car lte))
+                              (progn
+                                (setq tev (car lte)
+                                      lte (cdr lte))
+                                (if (string-match tev val)
+                                    (setq cvl (cons
+                                               (if (memq (semantic-lex-token-class lse)
+                                                         '(comment semantic-list))
+                                                   valdot val)
+                                               cvl)) ;append this value
+                                  (setq lte nil cvl nil))) ;clear the entry (exit)
+                            (setq cvl (cons
+                                       (if (memq (semantic-lex-token-class lse)
+                                                 '(comment semantic-list))
+                                           valdot val) cvl))) ;append unchecked value.
+                          (setq end (semantic-lex-token-end lse))
+                          )
+                      (setq lte nil cvl nil)) ;No more matches, exit
+                    )))
+                (if (not cvl)           ;lte=nil;  there was no match.
+                    (setq matchlist (cdr matchlist)) ;Move to next matchlist entry
+                  (let ((start (semantic-lex-token-start (car stream))))
+                    (setq out (cond
+                               ((car lte)
+                                (funcall (car lte) ;call matchlist fn on values
+                                         (nreverse cvl) start end))
+                               ((and (= (length cvl) 1)
+                                     (listp (car cvl))
+                                     (not (numberp (car (car cvl)))))
+                                (append (car cvl) (list start end)))
+                               (t
+                                ;;(append (nreverse cvl) (list start end))))
+                                ;; MAYBE THE FOLLOWING NEEDS LESS CONS
+                                ;; CELLS THAN THE ABOVE?
+                                (nreverse (cons end (cons start cvl)))))
+                          matchlist nil) ;;generate exit condition
+                    (if (not end)
+                        (setq out nil)))
+                  ;; Nothin?
+                  ))
+              (setq result
+                    (if (eq s starting-stream)
+                        (list (cdr s) nil)
+                      (list s out)))
+              (if nt-stack
+                  ;; pop previous state from the nt-stack
+                  (let ((state (car nt-stack)))
+
+                    (setq nt-popup    t
+                          ;; pop actual parser state
+                          matchlist   (aref state 0)
+                          cvl         (aref state 1)
+                          lte         (aref state 2)
+                          stream      (aref state 3)
+                          end         (aref state 4)
+                          ;; update the stack
+                          nt-stack    (cdr nt-stack))
+
+                    (if out
+                        (let ((len (length out))
+                              (strip (nreverse (cdr (cdr (reverse out))))))
+                          (setq end (nth (1- len) out) ;reset end to the end of exp
+                                cvl (cons strip cvl) ;prepend value of exp
+                                lte (cdr lte)) ;update the local table entry
+                          )
+                      ;; No value means that we need to terminate this
+                      ;; match.
+                      (setq lte nil cvl nil)) ;No match, exit
+                    )))))
+      (error
+       ;; On error just move forward the stream of lexical tokens
+       (setq result (list (cdr starting-stream) nil))
+       (if semantic-debug-enabled
+	   (let ((frame (semantic-create-bovine-debug-error-frame
+			 debug-condition)))
+	     (semantic-debug-break frame)
+	     ))
+       ))
+    result))
+
+;; Make it the default parser
+;;;###autoload
+(defalias 'semantic-parse-stream-default 'semantic-bovinate-stream)
+
+(provide 'semantic-bovine)
+
+;;; semantic-bovine.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-c-by.el b/site/cedet-1.0pre7/semantic/bovine/semantic-c-by.el
new file mode 100644
index 0000000..c043f02
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-c-by.el
@@ -0,0 +1,2203 @@
+;;; semantic-c-by.el --- Generated parser support file
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2010-02-20 17:22:46-0500
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file c.by.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst semantic-c-by--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("extern" . EXTERN)
+     ("static" . STATIC)
+     ("const" . CONST)
+     ("volatile" . VOLATILE)
+     ("register" . REGISTER)
+     ("signed" . SIGNED)
+     ("unsigned" . UNSIGNED)
+     ("inline" . INLINE)
+     ("virtual" . VIRTUAL)
+     ("mutable" . MUTABLE)
+     ("struct" . STRUCT)
+     ("union" . UNION)
+     ("enum" . ENUM)
+     ("typedef" . TYPEDEF)
+     ("class" . CLASS)
+     ("typename" . TYPENAME)
+     ("namespace" . NAMESPACE)
+     ("using" . USING)
+     ("new" . NEW)
+     ("delete" . DELETE)
+     ("template" . TEMPLATE)
+     ("throw" . THROW)
+     ("reentrant" . REENTRANT)
+     ("try" . TRY)
+     ("catch" . CATCH)
+     ("operator" . OPERATOR)
+     ("public" . PUBLIC)
+     ("private" . PRIVATE)
+     ("protected" . PROTECTED)
+     ("friend" . FRIEND)
+     ("if" . IF)
+     ("else" . ELSE)
+     ("do" . DO)
+     ("while" . WHILE)
+     ("for" . FOR)
+     ("switch" . SWITCH)
+     ("case" . CASE)
+     ("default" . DEFAULT)
+     ("return" . RETURN)
+     ("break" . BREAK)
+     ("continue" . CONTINUE)
+     ("sizeof" . SIZEOF)
+     ("void" . VOID)
+     ("char" . CHAR)
+     ("wchar_t" . WCHAR)
+     ("short" . SHORT)
+     ("int" . INT)
+     ("long" . LONG)
+     ("float" . FLOAT)
+     ("double" . DOUBLE)
+     ("bool" . BOOL)
+     ("_P" . UNDERP)
+     ("__P" . UNDERUNDERP))
+   '(("__P" summary "Common macro to eliminate prototype compatibility on some compilers")
+     ("_P" summary "Common macro to eliminate prototype compatibility on some compilers")
+     ("bool" summary "Primitive boolean type")
+     ("double" summary "Primitive floating-point type (double-precision 64-bit IEEE 754)")
+     ("float" summary "Primitive floating-point type (single-precision 32-bit IEEE 754)")
+     ("long" summary "Integral primitive type (-9223372036854775808 to 9223372036854775807)")
+     ("int" summary "Integral Primitive Type: (-2147483648 to 2147483647)")
+     ("short" summary "Integral Primitive Type: (-32768 to 32767)")
+     ("wchar_t" summary "Wide Character Type")
+     ("char" summary "Integral Character Type: (0 to 256)")
+     ("void" summary "Built in typeless type: void")
+     ("sizeof" summary "Compile time macro: sizeof(<type or variable>) // size in bytes")
+     ("continue" summary "Non-local continue within a loop (for, do/while): continue;")
+     ("break" summary "Non-local exit within a loop or switch (for, do/while, switch): break;")
+     ("return" summary "return <value>;")
+     ("default" summary "switch (<variable>) { case <constvalue>: code; ... default: code; }")
+     ("case" summary "switch (<variable>) { case <constvalue>: code; ... default: code; }")
+     ("switch" summary "switch (<variable>) { case <constvalue>: code; ... default: code; }")
+     ("for" summary "for(<init>; <condition>; <increment>) { code }")
+     ("while" summary "do { code } while (<condition>); or while (<condition>) { code };")
+     ("do" summary " do { code } while (<condition>);")
+     ("else" summary "if (<condition>) { code } [ else { code } ]")
+     ("if" summary "if (<condition>) { code } [ else { code } ]")
+     ("friend" summary "friend class <CLASSNAME>")
+     ("catch" summary "try { <body> } catch { <catch code> }")
+     ("try" summary "try { <body> } catch { <catch code> }")
+     ("reentrant" summary "<type> <methoddef> (<method args>) reentrant ...")
+     ("throw" summary "<type> <methoddef> (<method args>) throw (<exception>) ...")
+     ("template" summary "template <class TYPE ...> TYPE_OR_FUNCTION")
+     ("delete" summary "delete <object>;")
+     ("new" summary "new <classname>();")
+     ("using" summary "using <namespace>;")
+     ("namespace" summary "Namespace Declaration: namespace <name> { ... };")
+     ("typename" summary "typename is used to handle a qualified name as a typename;")
+     ("class" summary "Class Declaration: class <name>[:parents] { ... };")
+     ("typedef" summary "Arbitrary Type Declaration: typedef <typedeclaration> <name>;")
+     ("enum" summary "Enumeration Type Declaration: enum [name] { ... };")
+     ("union" summary "Union Type Declaration: union [name] { ... };")
+     ("struct" summary "Structure Type Declaration: struct [name] { ... };")
+     ("mutable" summary "Member Declaration Modifier: mutable <type> <name> ...")
+     ("virtual" summary "Method Modifier: virtual <type> <name>(...) ...")
+     ("inline" summary "Function Modifier: inline <return  type> <name>(...) {...};")
+     ("unsigned" summary "Numeric Type Modifier: unsigned <numeric type> <name> ...")
+     ("signed" summary "Numeric Type Modifier: signed <numeric type> <name> ...")
+     ("register" summary "Declaration Modifier: register <type> <name> ...")
+     ("volatile" summary "Declaration Modifier: volatile <type> <name> ...")
+     ("const" summary "Declaration Modifier: const <type> <name> ...")
+     ("static" summary "Declaration Modifier: static <type> <name> ...")
+     ("extern" summary "Declaration Modifier: extern <type> <name> ...")))
+  "Table of language keywords.")
+
+(defconst semantic-c-by--token-table
+  (semantic-lex-make-type-table
+   '(("semantic-list"
+      (BRACKETS . "\\[\\]")
+      (PARENS . "()")
+      (VOID_BLCK . "^(void)$")
+      (BRACE_BLCK . "^{")
+      (PAREN_BLCK . "^(")
+      (BRACK_BLCK . "\\[.*\\]$"))
+     ("close-paren"
+      (RBRACE . "}")
+      (RPAREN . ")"))
+     ("open-paren"
+      (LBRACE . "{")
+      (LPAREN . "("))
+     ("symbol"
+      (RESTRICT . "\\<\\(__\\)?restrict\\>"))
+     ("number"
+      (ZERO . "^0$"))
+     ("string"
+      (CPP . "\"C\\+\\+\"")
+      (C . "\"C\""))
+     ("punctuation"
+      (OR . "\\`[|]\\'")
+      (HAT . "\\`\\^\\'")
+      (MOD . "\\`[%]\\'")
+      (TILDE . "\\`[~]\\'")
+      (COMA . "\\`[,]\\'")
+      (GREATER . "\\`[>]\\'")
+      (LESS . "\\`[<]\\'")
+      (EQUAL . "\\`[=]\\'")
+      (BANG . "\\`[!]\\'")
+      (MINUS . "\\`[-]\\'")
+      (PLUS . "\\`[+]\\'")
+      (DIVIDE . "\\`[/]\\'")
+      (AMPERSAND . "\\`[&]\\'")
+      (STAR . "\\`[*]\\'")
+      (SEMICOLON . "\\`[;]\\'")
+      (COLON . "\\`[:]\\'")
+      (PERIOD . "\\`[.]\\'")
+      (HASH . "\\`[#]\\'")))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst semantic-c-by--parse-table
+  `(
+    (bovine-toplevel 
+     (declaration)
+     ) ;; end bovine-toplevel
+
+    (bovine-inner-scope 
+     (codeblock)
+     ) ;; end bovine-inner-scope
+
+    (declaration
+     (macro)
+     (type)
+     (define)
+     (var-or-fun)
+     (extern-c)
+     (template)
+     (using)
+     ) ;; end declaration
+
+    (codeblock
+     (define)
+     (codeblock-var-or-fun)
+     (type)
+     (using)
+     ) ;; end codeblock
+
+    (extern-c-contents
+     (open-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     (declaration)
+     (close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end extern-c-contents
+
+    (extern-c
+     (EXTERN
+      string
+      "\"C\""
+      semantic-list
+      ,(semantic-lambda
+	(semantic-tag
+	 "C"
+	 'extern :members
+	 (semantic-parse-region
+	  (car
+	   (nth 2 vals))
+	  (cdr
+	   (nth 2 vals))
+	  'extern-c-contents
+	  1)))
+      )
+     (EXTERN
+      string
+      "\"C\\+\\+\""
+      semantic-list
+      ,(semantic-lambda
+	(semantic-tag
+	 "C"
+	 'extern :members
+	 (semantic-parse-region
+	  (car
+	   (nth 2 vals))
+	  (cdr
+	   (nth 2 vals))
+	  'extern-c-contents
+	  1)))
+      )
+     (EXTERN
+      string
+      "\"C\""
+      ,(semantic-lambda
+	(list nil))
+      )
+     (EXTERN
+      string
+      "\"C\\+\\+\""
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end extern-c
+
+    (macro
+     (spp-macro-def
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil nil :constant-flag t))
+      )
+     (spp-system-include
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (nth 0 vals) t))
+      )
+     (spp-include
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (nth 0 vals) nil))
+      )
+     ) ;; end macro
+
+    (define
+      (spp-macro-def
+       ,(semantic-lambda
+	 (semantic-tag-new-variable
+	  (nth 0 vals) nil nil :constant-flag t))
+       )
+      (spp-macro-undef
+       ,(semantic-lambda
+	 (list nil))
+       )
+      ) ;; end define
+
+    (unionparts
+     (semantic-list
+      ,(semantic-lambda
+	(semantic-parse-region
+	 (car
+	  (nth 0 vals))
+	 (cdr
+	  (nth 0 vals))
+	 'classsubparts
+	 1))
+      )
+     ) ;; end unionparts
+
+    (opt-symbol
+     (symbol)
+     ( ;;EMPTY
+      )
+     ) ;; end opt-symbol
+
+    (classsubparts
+     (open-paren
+      "{"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (close-paren
+      "}"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (class-protection
+      opt-symbol
+      punctuation
+      "\\`[:]\\'"
+      ,(semantic-lambda
+	(semantic-tag
+	 (car
+	  (nth 0 vals))
+	 'label))
+      )
+     (var-or-fun)
+     (FRIEND
+      func-decl
+      ,(semantic-lambda
+	(semantic-tag
+	 (car
+	  (nth 1 vals))
+	 'friend))
+      )
+     (FRIEND
+      CLASS
+      symbol
+      ,(semantic-lambda
+	(semantic-tag
+	 (nth 2 vals)
+	 'friend))
+      )
+     (type)
+     (define)
+     (template)
+     ( ;;EMPTY
+      )
+     ) ;; end classsubparts
+
+    (opt-class-parents
+     (punctuation
+      "\\`[:]\\'"
+      class-parents
+      opt-template-specifier
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end opt-class-parents
+
+    (one-class-parent
+     (opt-class-protection
+      opt-class-declmods
+      namespace-symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 "class" nil nil :protection
+	 (car
+	  (nth 0 vals))))
+      )
+     (opt-class-declmods
+      opt-class-protection
+      namespace-symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 "class" nil nil :protection
+	 (car
+	  (nth 1 vals))))
+      )
+     ) ;; end one-class-parent
+
+    (class-parents
+     (one-class-parent
+      punctuation
+      "\\`[,]\\'"
+      class-parents
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 2 vals)))
+      )
+     (one-class-parent
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end class-parents
+
+    (opt-class-declmods
+     (class-declmods
+      opt-class-declmods
+      ,(semantic-lambda
+	(list nil))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end opt-class-declmods
+
+    (class-declmods
+     (VIRTUAL)
+     ) ;; end class-declmods
+
+    (class-protection
+     (PUBLIC)
+     (PRIVATE)
+     (PROTECTED)
+     ) ;; end class-protection
+
+    (opt-class-protection
+     (class-protection
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list
+	 "unspecified"))
+      )
+     ) ;; end opt-class-protection
+
+    (namespaceparts
+     (semantic-list
+      ,(semantic-lambda
+	(semantic-parse-region
+	 (car
+	  (nth 0 vals))
+	 (cdr
+	  (nth 0 vals))
+	 'namespacesubparts
+	 1))
+      )
+     ) ;; end namespaceparts
+
+    (namespacesubparts
+     (open-paren
+      "{"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (close-paren
+      "}"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (type)
+     (var-or-fun)
+     (define)
+     (class-protection
+      punctuation
+      "\\`[:]\\'"
+      ,(semantic-lambda
+	(semantic-tag
+	 (car
+	  (nth 0 vals))
+	 'label))
+      )
+     (template)
+     (using)
+     ( ;;EMPTY
+      )
+     ) ;; end namespacesubparts
+
+    (enumparts
+     (semantic-list
+      ,(semantic-lambda
+	(semantic-parse-region
+	 (car
+	  (nth 0 vals))
+	 (cdr
+	  (nth 0 vals))
+	 'enumsubparts
+	 1))
+      )
+     ) ;; end enumparts
+
+    (enumsubparts
+     (symbol
+      opt-assign
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals)
+	 "int"
+	 (car
+	  (nth 1 vals)) :constant-flag t))
+      )
+     (open-paren
+      "{"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (close-paren
+      "}"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (punctuation
+      "\\`[,]\\'"
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end enumsubparts
+
+    (opt-name
+     (symbol)
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list
+	 ""))
+      )
+     ) ;; end opt-name
+
+    (typesimple
+     (struct-or-class
+      opt-class
+      opt-name
+      opt-template-specifier
+      opt-class-parents
+      semantic-list
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 (car
+	  (nth 0 vals))
+	 (let
+	     (
+	      (semantic-c-classname
+	       (cons
+		(car
+		 (nth 2 vals))
+		(car
+		 (nth 0 vals)))))
+	   (semantic-parse-region
+	    (car
+	     (nth 5 vals))
+	    (cdr
+	     (nth 5 vals))
+	    'classsubparts
+	    1))
+	 (nth 4 vals) :template-specifier
+	 (nth 3 vals) :parent
+	 (car
+	  (nth 1 vals))))
+      )
+     (struct-or-class
+      opt-class
+      opt-name
+      opt-template-specifier
+      opt-class-parents
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 (car
+	  (nth 0 vals)) nil
+	 (nth 4 vals) :template-specifier
+	 (nth 3 vals) :prototype t :parent
+	 (car
+	  (nth 1 vals))))
+      )
+     (UNION
+      opt-class
+      opt-name
+      unionparts
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 (nth 0 vals)
+	 (nth 3 vals) nil :parent
+	 (car
+	  (nth 1 vals))))
+      )
+     (ENUM
+      opt-class
+      opt-name
+      enumparts
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 2 vals))
+	 (nth 0 vals)
+	 (nth 3 vals) nil :parent
+	 (car
+	  (nth 1 vals))))
+      )
+     (TYPEDEF
+      declmods
+      typeformbase
+      cv-declmods
+      typedef-symbol-list
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 4 vals)
+	 (nth 0 vals) nil
+	 (list
+	  (nth 2 vals))))
+      )
+     ) ;; end typesimple
+
+    (typedef-symbol-list
+     (typedefname
+      punctuation
+      "\\`[,]\\'"
+      typedef-symbol-list
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 2 vals)))
+      )
+     (typedefname
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end typedef-symbol-list
+
+    (typedefname
+     (opt-stars
+      symbol
+      opt-bits
+      opt-array
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)
+	 (nth 1 vals)))
+      )
+     ) ;; end typedefname
+
+    (struct-or-class
+     (STRUCT)
+     (CLASS)
+     ) ;; end struct-or-class
+
+    (type
+     (typesimple
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (NAMESPACE
+      symbol
+      namespaceparts
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 (nth 0 vals)
+	 (nth 2 vals) nil))
+      )
+     (NAMESPACE
+      namespaceparts
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 "unnamed"
+	 (nth 0 vals)
+	 (nth 1 vals) nil))
+      )
+     (NAMESPACE
+      symbol
+      punctuation
+      "\\`[=]\\'"
+      typeformbase
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 (nth 0 vals)
+	 (list
+	  (semantic-tag-new-type
+	   (car
+	    (nth 3 vals))
+	   (nth 0 vals) nil nil)) nil :kind
+	 'alias))
+      )
+     ) ;; end type
+
+    (using
+     (USING
+      usingname
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(semantic-tag
+	 (car
+	  (nth 1 vals))
+	 'using :type
+	 (nth 1 vals)))
+      )
+     ) ;; end using
+
+    (usingname
+     (typeformbase
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 0 vals))
+	 "class" nil nil :prototype t))
+      )
+     (NAMESPACE
+      typeformbase
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 1 vals))
+	 "namespace" nil nil :prototype t))
+      )
+     ) ;; end usingname
+
+    (template
+     (TEMPLATE
+      template-specifier
+      opt-friend
+      template-definition
+      ,(semantic-lambda
+	(semantic-c-reconstitute-template
+	 (nth 3 vals)
+	 (nth 1 vals)))
+      )
+     ) ;; end template
+
+    (opt-friend
+     (FRIEND)
+     ( ;;EMPTY
+      )
+     ) ;; end opt-friend
+
+    (opt-template-specifier
+     (template-specifier
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end opt-template-specifier
+
+    (template-specifier
+     (punctuation
+      "\\`[<]\\'"
+      template-specifier-types
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ) ;; end template-specifier
+
+    (template-specifier-types
+     (template-var
+      template-specifier-type-list
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end template-specifier-types
+
+    (template-specifier-type-list
+     (punctuation
+      "\\`[,]\\'"
+      template-specifier-types
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end template-specifier-type-list
+
+    (template-var
+     (template-type
+      opt-template-equal
+      ,(semantic-lambda
+	(cons
+	 (car
+	  (nth 0 vals))
+	 (cdr
+	  (nth 0 vals))))
+      )
+     (string
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     (number
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     (opt-stars
+      opt-ref
+      namespace-symbol
+      ,(semantic-lambda
+	(nth 2 vals))
+      )
+     (semantic-list
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     (SIZEOF
+      semantic-list
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ) ;; end template-var
+
+    (opt-template-equal
+     (punctuation
+      "\\`[=]\\'"
+      symbol
+      punctuation
+      "\\`[<]\\'"
+      template-specifier-types
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      symbol
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end opt-template-equal
+
+    (template-type
+     (CLASS
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 "class" nil nil))
+      )
+     (STRUCT
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 "struct" nil nil))
+      )
+     (TYPENAME
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 "class" nil nil))
+      )
+     (declmods
+      typeformbase
+      cv-declmods
+      opt-stars
+      opt-ref
+      variablearg-opt-name
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 1 vals)) nil nil nil :constant-flag
+	 (if
+	     (member
+	      "const"
+	      (append
+	       (nth 0 vals)
+	       (nth 2 vals))) t nil) :typemodifiers
+	 (delete
+	  "const"
+	  (append
+	   (nth 0 vals)
+	   (nth 2 vals))) :reference
+	 (car
+	  (nth 4 vals)) :pointer
+	 (car
+	  (nth 3 vals))))
+      )
+     ) ;; end template-type
+
+    (template-definition
+     (type
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (var-or-fun
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end template-definition
+
+    (opt-stars
+     (punctuation
+      "\\`[*]\\'"
+      opt-starmod
+      opt-stars
+      ,(semantic-lambda
+	(list
+	 (1+
+	  (car
+	   (nth 2 vals)))))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list
+	 0))
+      )
+     ) ;; end opt-stars
+
+    (opt-starmod
+     (STARMOD
+      opt-starmod
+      ,(semantic-lambda
+	(cons
+	 (car
+	  (nth 0 vals))
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end opt-starmod
+
+    (STARMOD
+     (CONST)
+     ) ;; end STARMOD
+
+    (declmods
+     (DECLMOD
+      declmods
+      ,(semantic-lambda
+	(cons
+	 (car
+	  (nth 0 vals))
+	 (nth 1 vals)))
+      )
+     (DECLMOD
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end declmods
+
+    (DECLMOD
+     (EXTERN)
+     (STATIC)
+     (CVDECLMOD)
+     (INLINE)
+     (REGISTER)
+     (FRIEND)
+     (TYPENAME)
+     (METADECLMOD)
+     (VIRTUAL)
+     ) ;; end DECLMOD
+
+    (metadeclmod
+     (METADECLMOD
+      ,(semantic-lambda)
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end metadeclmod
+
+    (CVDECLMOD
+     (CONST)
+     (VOLATILE)
+     ) ;; end CVDECLMOD
+
+    (cv-declmods
+     (CVDECLMOD
+      cv-declmods
+      ,(semantic-lambda
+	(cons
+	 (car
+	  (nth 0 vals))
+	 (nth 1 vals)))
+      )
+     (CVDECLMOD
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end cv-declmods
+
+    (METADECLMOD
+     (VIRTUAL)
+     (MUTABLE)
+     ) ;; end METADECLMOD
+
+    (opt-ref
+     (punctuation
+      "\\`[&]\\'"
+      ,(semantic-lambda
+	(list
+	 1))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list
+	 0))
+      )
+     ) ;; end opt-ref
+
+    (typeformbase
+     (typesimple
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (STRUCT
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 (nth 0 vals) nil nil))
+      )
+     (UNION
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 (nth 0 vals) nil nil))
+      )
+     (ENUM
+      symbol
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 (nth 0 vals) nil nil))
+      )
+     (builtintype
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (symbol
+      template-specifier
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 0 vals)
+	 "class" nil nil :template-specifier
+	 (nth 1 vals)))
+      )
+     (namespace-symbol-for-typeformbase
+      opt-template-specifier
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (car
+	  (nth 0 vals))
+	 "class" nil nil :template-specifier
+	 (nth 1 vals)))
+      )
+     (symbol
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end typeformbase
+
+    (signedmod
+     (UNSIGNED)
+     (SIGNED)
+     ) ;; end signedmod
+
+    (builtintype-types
+     (VOID)
+     (CHAR)
+     (WCHAR)
+     (SHORT
+      INT
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  " "
+	  (nth 1 vals))))
+      )
+     (SHORT)
+     (INT)
+     (LONG
+      INT
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  " "
+	  (nth 1 vals))))
+      )
+     (FLOAT)
+     (DOUBLE)
+     (BOOL)
+     (LONG
+      DOUBLE
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  " "
+	  (nth 1 vals))))
+      )
+     (LONG
+      LONG
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  " "
+	  (nth 1 vals))))
+      )
+     (LONG)
+     ) ;; end builtintype-types
+
+    (builtintype
+     (signedmod
+      builtintype-types
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  " "
+	  (car
+	   (nth 1 vals)))))
+      )
+     (builtintype-types
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (signedmod
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  " int")))
+      )
+     ) ;; end builtintype
+
+    (codeblock-var-or-fun
+     (declmods
+      typeformbase
+      declmods
+      opt-ref
+      var-or-func-decl
+      ,(semantic-lambda
+	(semantic-c-reconstitute-token
+	 (nth 4 vals)
+	 (nth 0 vals)
+	 (nth 1 vals)))
+      )
+     ) ;; end codeblock-var-or-fun
+
+    (var-or-fun
+     (codeblock-var-or-fun
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (declmods
+      var-or-func-decl
+      ,(semantic-lambda
+	(semantic-c-reconstitute-token
+	 (nth 1 vals)
+	 (nth 0 vals) nil))
+      )
+     ) ;; end var-or-fun
+
+    (var-or-func-decl
+     (func-decl
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (var-decl
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end var-or-func-decl
+
+    (func-decl
+     (opt-stars
+      opt-class
+      opt-destructor
+      functionname
+      opt-template-specifier
+      opt-under-p
+      arg-list
+      opt-post-fcn-modifiers
+      opt-throw
+      opt-initializers
+      fun-or-proto-end
+      ,(semantic-lambda
+	(nth 3 vals)
+	(list
+	 'function
+	 (nth 1 vals)
+	 (nth 2 vals)
+	 (nth 6 vals)
+	 (nth 8 vals)
+	 (nth 7 vals))
+	(nth 0 vals)
+	(nth 10 vals)
+	(nth 4 vals))
+      )
+     (opt-stars
+      opt-class
+      opt-destructor
+      functionname
+      opt-template-specifier
+      opt-under-p
+      opt-post-fcn-modifiers
+      opt-throw
+      opt-initializers
+      fun-try-end
+      ,(semantic-lambda
+	(nth 3 vals)
+	(list
+	 'function
+	 (nth 1 vals)
+	 (nth 2 vals) nil
+	 (nth 7 vals)
+	 (nth 6 vals))
+	(nth 0 vals)
+	(nth 9 vals)
+	(nth 4 vals))
+      )
+     ) ;; end func-decl
+
+    (var-decl
+     (varnamelist
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)
+	 'variable))
+      )
+     ) ;; end var-decl
+
+    (opt-under-p
+     (UNDERP
+      ,(semantic-lambda
+	(list nil))
+      )
+     (UNDERUNDERP
+      ,(semantic-lambda
+	(list nil))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end opt-under-p
+
+    (opt-initializers
+     (punctuation
+      "\\`[:]\\'"
+      namespace-symbol
+      semantic-list
+      opt-initializers)
+     (punctuation
+      "\\`[,]\\'"
+      namespace-symbol
+      semantic-list
+      opt-initializers)
+     ( ;;EMPTY
+      )
+     ) ;; end opt-initializers
+
+    (opt-post-fcn-modifiers
+     (post-fcn-modifiers
+      opt-post-fcn-modifiers
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-post-fcn-modifiers
+
+    (post-fcn-modifiers
+     (REENTRANT)
+     (CONST)
+     ) ;; end post-fcn-modifiers
+
+    (opt-throw
+     (THROW
+      semantic-list
+      ,(lambda (vals start end)
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 1 vals))
+	  (cdr
+	   (nth 1 vals))
+	  'throw-exception-list))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end opt-throw
+
+    (throw-exception-list
+     (namespace-symbol
+      punctuation
+      "\\`[,]\\'"
+      throw-exception-list
+      ,(semantic-lambda
+	(cons
+	 (car
+	  (nth 0 vals))
+	 (nth 2 vals)))
+      )
+     (namespace-symbol
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (symbol
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     (open-paren
+      "("
+      throw-exception-list
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (close-paren
+      ")"
+      ,(semantic-lambda)
+      )
+     ) ;; end throw-exception-list
+
+    (opt-bits
+     (punctuation
+      "\\`[:]\\'"
+      number
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-bits
+
+    (opt-array
+     (semantic-list
+      "\\[.*\\]$"
+      opt-array
+      ,(semantic-lambda
+	(list
+	 (cons
+	  1
+	  (car
+	   (nth 1 vals)))))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-array
+
+    (opt-assign
+     (punctuation
+      "\\`[=]\\'"
+      expression
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-assign
+
+    (opt-restrict
+     (symbol
+      "\\<\\(__\\)?restrict\\>")
+     ( ;;EMPTY
+      )
+     ) ;; end opt-restrict
+
+    (varname
+     (opt-stars
+      opt-restrict
+      namespace-symbol
+      opt-bits
+      opt-array
+      ,(semantic-lambda
+	(nth 2 vals)
+	(nth 0 vals)
+	(nth 3 vals)
+	(nth 4 vals))
+      )
+     ) ;; end varname
+
+    (variablearg
+     (declmods
+      typeformbase
+      cv-declmods
+      opt-ref
+      variablearg-opt-name
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (list
+	  (nth 4 vals))
+	 (nth 1 vals) nil :constant-flag
+	 (if
+	     (member
+	      "const"
+	      (append
+	       (nth 0 vals)
+	       (nth 2 vals))) t nil) :typemodifiers
+	 (delete
+	  "const"
+	  (append
+	   (nth 0 vals)
+	   (nth 2 vals))) :reference
+	 (car
+	  (nth 3 vals))))
+      )
+     ) ;; end variablearg
+
+    (variablearg-opt-name
+     (varname
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (opt-stars
+      ,(semantic-lambda
+	(list
+	 "")
+	(nth 0 vals)
+	(list nil nil nil))
+      )
+     ) ;; end variablearg-opt-name
+
+    (varname-opt-initializer
+     (semantic-list)
+     (opt-assign)
+     ( ;;EMPTY
+      )
+     ) ;; end varname-opt-initializer
+
+    (varnamelist
+     (opt-ref
+      varname
+      varname-opt-initializer
+      punctuation
+      "\\`[,]\\'"
+      varnamelist
+      ,(semantic-lambda
+	(cons
+	 (nth 1 vals)
+	 (nth 4 vals)))
+      )
+     (opt-ref
+      varname
+      varname-opt-initializer
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ) ;; end varnamelist
+
+    (namespace-symbol
+     (symbol
+      opt-template-specifier
+      punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[:]\\'"
+      namespace-symbol
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  "::"
+	  (car
+	   (nth 4 vals)))))
+      )
+     (symbol
+      opt-template-specifier
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end namespace-symbol
+
+    (namespace-symbol-for-typeformbase
+     (symbol
+      opt-template-specifier
+      punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[:]\\'"
+      namespace-symbol-for-typeformbase
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  "::"
+	  (car
+	   (nth 4 vals)))))
+      )
+     (symbol
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end namespace-symbol-for-typeformbase
+
+    (namespace-opt-class
+     (symbol
+      punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[:]\\'"
+      namespace-opt-class
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  "::"
+	  (car
+	   (nth 3 vals)))))
+      )
+     (symbol
+      opt-template-specifier
+      punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[:]\\'"
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end namespace-opt-class
+
+    (opt-class
+     (namespace-opt-class
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-class
+
+    (opt-destructor
+     (punctuation
+      "\\`[~]\\'"
+      ,(semantic-lambda
+	(list t))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end opt-destructor
+
+    (arg-list
+     (semantic-list
+      "^("
+      knr-arguments
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (semantic-list
+      "^("
+      ,(semantic-lambda
+	(semantic-parse-region
+	 (car
+	  (nth 0 vals))
+	 (cdr
+	  (nth 0 vals))
+	 'arg-sub-list
+	 1))
+      )
+     (semantic-list
+      "^(void)$"
+      ,(semantic-lambda)
+      )
+     ) ;; end arg-list
+
+    (knr-varnamelist
+     (varname
+      punctuation
+      "\\`[,]\\'"
+      knr-varnamelist
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 2 vals)))
+      )
+     (varname
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end knr-varnamelist
+
+    (knr-one-variable-decl
+     (declmods
+      typeformbase
+      cv-declmods
+      knr-varnamelist
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nreverse
+	  (nth 3 vals))
+	 (nth 1 vals) nil :constant-flag
+	 (if
+	     (member
+	      "const"
+	      (append
+	       (nth 2 vals))) t nil) :typemodifiers
+	 (delete
+	  "const"
+	  (nth 2 vals))))
+      )
+     ) ;; end knr-one-variable-decl
+
+    (knr-arguments
+     (knr-one-variable-decl
+      punctuation
+      "\\`[;]\\'"
+      knr-arguments
+      ,(semantic-lambda
+	(append
+	 (semantic-expand-c-tag
+	  (nth 0 vals))
+	 (nth 2 vals)))
+      )
+     (knr-one-variable-decl
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(semantic-expand-c-tag
+	 (nth 0 vals)))
+      )
+     ) ;; end knr-arguments
+
+    (arg-sub-list
+     (variablearg
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (punctuation
+      "\\`[.]\\'"
+      punctuation
+      "\\`[.]\\'"
+      punctuation
+      "\\`[.]\\'"
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 "..."
+	 "vararg" nil))
+      )
+     (punctuation
+      "\\`[,]\\'"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (open-paren
+      "("
+      ,(semantic-lambda
+	(list nil))
+      )
+     (close-paren
+      ")"
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end arg-sub-list
+
+    (operatorsym
+     (punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "<<="))
+      )
+     (punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 ">>="))
+      )
+     (punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[<]\\'"
+      ,(semantic-lambda
+	(list
+	 "<<"))
+      )
+     (punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(list
+	 ">>"))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "=="))
+      )
+     (punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "<="))
+      )
+     (punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 ">="))
+      )
+     (punctuation
+      "\\`[!]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "!="))
+      )
+     (punctuation
+      "\\`[+]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "+="))
+      )
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "-="))
+      )
+     (punctuation
+      "\\`[*]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "*="))
+      )
+     (punctuation
+      "\\`[/]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "/="))
+      )
+     (punctuation
+      "\\`[%]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "%="))
+      )
+     (punctuation
+      "\\`[&]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "&="))
+      )
+     (punctuation
+      "\\`[|]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "|="))
+      )
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[*]\\'"
+      ,(semantic-lambda
+	(list
+	 "->*"))
+      )
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(list
+	 "->"))
+      )
+     (semantic-list
+      "()"
+      ,(semantic-lambda
+	(list
+	 "()"))
+      )
+     (semantic-list
+      "\\[\\]"
+      ,(semantic-lambda
+	(list
+	 "[]"))
+      )
+     (punctuation
+      "\\`[<]\\'")
+     (punctuation
+      "\\`[>]\\'")
+     (punctuation
+      "\\`[*]\\'")
+     (punctuation
+      "\\`[+]\\'"
+      punctuation
+      "\\`[+]\\'"
+      ,(semantic-lambda
+	(list
+	 "++"))
+      )
+     (punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[-]\\'"
+      ,(semantic-lambda
+	(list
+	 "--"))
+      )
+     (punctuation
+      "\\`[-]\\'")
+     (punctuation
+      "\\`[&]\\'"
+      punctuation
+      "\\`[&]\\'"
+      ,(semantic-lambda
+	(list
+	 "&&"))
+      )
+     (punctuation
+      "\\`[&]\\'")
+     (punctuation
+      "\\`[|]\\'"
+      punctuation
+      "\\`[|]\\'"
+      ,(semantic-lambda
+	(list
+	 "||"))
+      )
+     (punctuation
+      "\\`[|]\\'")
+     (punctuation
+      "\\`[/]\\'")
+     (punctuation
+      "\\`[=]\\'")
+     (punctuation
+      "\\`[!]\\'")
+     (punctuation
+      "\\`[~]\\'")
+     (punctuation
+      "\\`[%]\\'")
+     (punctuation
+      "\\`[,]\\'")
+     (punctuation
+      "\\`\\^\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "^="))
+      )
+     (punctuation
+      "\\`\\^\\'")
+     ) ;; end operatorsym
+
+    (functionname
+     (OPERATOR
+      operatorsym
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (semantic-list
+      ,(lambda (vals start end)
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 0 vals))
+	  (cdr
+	   (nth 0 vals))
+	  'function-pointer))
+      )
+     (symbol
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end functionname
+
+    (function-pointer
+     (open-paren
+      "("
+      punctuation
+      "\\`[*]\\'"
+      symbol
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(list
+	 (concat
+	  "*"
+	  (nth 2 vals))))
+      )
+     ) ;; end function-pointer
+
+    (fun-or-proto-end
+     (punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(list t))
+      )
+     (semantic-list
+      ,(semantic-lambda
+	(list nil))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      number
+      "^0$"
+      punctuation
+      "\\`[;]\\'"
+      ,(semantic-lambda
+	(list ':pure-virtual-flag))
+      )
+     (fun-try-end
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end fun-or-proto-end
+
+    (fun-try-end
+     (TRY
+      opt-initializers
+      semantic-list
+      "^{"
+      fun-try-several-catches
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end fun-try-end
+
+    (fun-try-several-catches
+     (CATCH
+      semantic-list
+      "^("
+      semantic-list
+      "^{"
+      fun-try-several-catches
+      ,(semantic-lambda)
+      )
+     (CATCH
+      semantic-list
+      "^{"
+      fun-try-several-catches
+      ,(semantic-lambda)
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end fun-try-several-catches
+
+    (type-cast
+     (semantic-list
+      ,(lambda (vals start end)
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 0 vals))
+	  (cdr
+	   (nth 0 vals))
+	  'type-cast-list))
+      )
+     ) ;; end type-cast
+
+    (type-cast-list
+     (open-paren
+      typeformbase
+      close-paren)
+     ) ;; end type-cast-list
+
+    (opt-stuff-after-symbol
+     (semantic-list
+      "^(")
+     (semantic-list
+      "\\[.*\\]$")
+     ( ;;EMPTY
+      )
+     ) ;; end opt-stuff-after-symbol
+
+    (multi-stage-dereference
+     (namespace-symbol
+      opt-stuff-after-symbol
+      punctuation
+      "\\`[.]\\'"
+      multi-stage-dereference)
+     (namespace-symbol
+      opt-stuff-after-symbol
+      punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[>]\\'"
+      multi-stage-dereference)
+     (namespace-symbol
+      opt-stuff-after-symbol)
+     ) ;; end multi-stage-dereference
+
+    (string-seq
+     (string
+      string-seq
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  (car
+	   (nth 1 vals)))))
+      )
+     (string
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end string-seq
+
+    (expr-start
+     (punctuation
+      "\\`[-]\\'")
+     (punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[*]\\'")
+     (punctuation
+      "\\`[&]\\'")
+     ) ;; end expr-start
+
+    (expr-binop
+     (punctuation
+      "\\`[-]\\'")
+     (punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[*]\\'")
+     (punctuation
+      "\\`[/]\\'")
+     (punctuation
+      "\\`[&]\\'"
+      punctuation
+      "\\`[&]\\'")
+     (punctuation
+      "\\`[&]\\'")
+     (punctuation
+      "\\`[|]\\'"
+      punctuation
+      "\\`[|]\\'")
+     (punctuation
+      "\\`[|]\\'")
+     ) ;; end expr-binop
+
+    (expression
+     (unaryexpression
+      expr-binop
+      unaryexpression
+      ,(semantic-lambda
+	(list
+	 (identity start)
+	 (identity end)))
+      )
+     (unaryexpression
+      ,(semantic-lambda
+	(list
+	 (identity start)
+	 (identity end)))
+      )
+     ) ;; end expression
+
+    (unaryexpression
+     (number)
+     (multi-stage-dereference)
+     (NEW
+      multi-stage-dereference)
+     (NEW
+      builtintype-types
+      semantic-list)
+     (namespace-symbol)
+     (string-seq)
+     (type-cast
+      expression)
+     (semantic-list
+      expression)
+     (semantic-list)
+     (expr-start
+      expression)
+     ) ;; end unaryexpression
+    )
+  "Parser table.")
+
+(defun semantic-c-by--install-parser ()
+  "Setup the Semantic Parser."
+  (setq semantic--parse-table semantic-c-by--parse-table
+	semantic-debug-parser-source "c.by"
+	semantic-debug-parser-class 'semantic-bovine-debug-parser
+	semantic-flex-keywords-obarray semantic-c-by--keyword-table
+	semantic-equivalent-major-modes '(c-mode c++-mode)
+	))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+(provide 'semantic-c-by)
+
+;;; semantic-c-by.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-c.el b/site/cedet-1.0pre7/semantic/bovine/semantic-c.el
new file mode 100755
index 0000000..04e944d
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-c.el
@@ -0,0 +1,2018 @@
+;;; semantic-c.el --- Semantic details for C
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-c.el,v 1.139 2010/02/19 02:23:27 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Support for the C/C++ bovine parser for Semantic.
+;;
+;; @todo - can I support c++-font-lock-extra-types ?
+
+(require 'semantic)
+(require 'semantic-lex-spp)
+(require 'semantic-c-by)
+(require 'backquote)
+
+(eval-when-compile
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'semantic-tag-ls)
+  (require 'senator)
+  (require 'cc-mode)
+  )
+
+(require 'hideif)
+
+;;; Compatibility
+;;
+(if (fboundp 'c-end-of-macro)
+    (eval-and-compile
+      (defalias 'semantic-c-end-of-macro 'c-end-of-macro))
+  ;; From cc-mode 5.30
+  (defun semantic-c-end-of-macro ()
+    "Go to the end of a preprocessor directive.
+More accurately, move point to the end of the closest following line
+that doesn't end with a line continuation backslash.
+
+This function does not do any hidden buffer changes."
+    (while (progn
+             (end-of-line)
+             (when (and (eq (char-before) ?\\)
+                        (not (eobp)))
+               (forward-char)
+               t))))
+  )
+
+;;; Code:
+(define-child-mode c++-mode c-mode
+  "`c++-mode' uses the same parser as `c-mode'.")
+
+
+;;; Include Paths
+;;
+(defcustom-mode-local-semantic-dependency-system-include-path
+  c-mode semantic-c-dependency-system-include-path
+  '("/usr/include")
+  "The system include path used by the C langauge.")
+
+(defcustom semantic-default-c-path nil
+  "Default set of include paths for C code.
+Used by `semantic-dep' to define an include path.
+NOTE: In process of obsoleting this."
+  :group 'c
+  :group 'semantic
+  :type '(repeat (string :tag "Path")))
+
+(defvar-mode-local c-mode semantic-dependency-include-path
+  semantic-default-c-path
+  "System path to search for include files.")
+
+;;; Compile Options
+;;
+;; Compiler options need to show up after path setup, but before
+;; the preprocessor section.
+
+(when (member system-type '(gnu gnu/linux darwin cygwin))
+  (semantic-gcc-setup))
+
+;;; Pre-processor maps
+;;
+;;; Lexical analysis
+(defvar semantic-lex-c-preprocessor-symbol-map-builtin
+  '( ("__THROW" . "")
+     ("__const" . "const")
+     ("__restrict" . "")
+     ("__declspec" . ((spp-arg-list ("foo") 1 . 2)))
+     ("__attribute__" . ((spp-arg-list ("foo") 1 . 2)))
+     )
+  "List of symbols to include by default.")
+
+(defvar semantic-c-in-reset-preprocessor-table nil
+  "Non-nil while resetting the preprocessor symbol map.
+Used to prevent a reset while trying to parse files that are
+part of the preprocessor map.")
+
+(defun semantic-c-reset-preprocessor-symbol-map ()
+  "Reset the C preprocessor symbol map based on all input variables."
+  (when (featurep 'semantic-c)
+    (let ((filemap nil)
+	  )
+      (when (and (not semantic-c-in-reset-preprocessor-table)
+		 (featurep 'semanticdb-mode)
+		 (semanticdb-minor-mode-p))
+	(let ( ;; Don't use external parsers.  We need the internal one.
+	      (semanticdb-out-of-buffer-create-table-fcn nil)
+	      ;; Don't recurse while parsing these files the first time.
+	      (semantic-c-in-reset-preprocessor-table t)
+	      )
+	  (dolist (sf semantic-lex-c-preprocessor-symbol-file)
+	    ;; Global map entries
+	    (let* ((table (semanticdb-file-table-object sf t)))
+	      (when table
+		(when (semanticdb-needs-refresh-p table)
+		  (condition-case nil
+		      ;; Call with FORCE, as the file is very likely to
+		      ;; not be in a buffer.
+		      (semanticdb-refresh-table table t)
+		    (error (message "Error updating tables for %S"
+				    (object-name table)))))
+		(setq filemap (append filemap (oref table lexical-table)))
+		)
+	      ))))
+
+      (setq-mode-local c-mode
+		       semantic-lex-spp-macro-symbol-obarray
+		       (semantic-lex-make-spp-table
+			(append semantic-lex-c-preprocessor-symbol-map-builtin
+				semantic-lex-c-preprocessor-symbol-map
+				filemap))
+		       )
+      )))
+
+;;;###autoload
+(defcustom semantic-lex-c-preprocessor-symbol-map nil
+  "Table of C Preprocessor keywords used by the Semantic C lexer.
+Each entry is a cons cell like this:
+  ( \"KEYWORD\" . \"REPLACEMENT\" )
+Where KEYWORD is the macro that gets replaced in the lexical phase,
+and REPLACEMENT is a string that is inserted in its place.  Empty string
+implies that the lexical analyzer will discard KEYWORD when it is encountered.
+
+Alternately, it can be of the form:
+  ( \"KEYWORD\" ( LEXSYM1 \"str\" 1 1 ) ... ( LEXSYMN \"str\" 1 1 ) )
+where LEXSYM is a symbol that would normally be produced by the
+lexical analyzer, such as `symbol' or `string'.  The string in the
+second position is the text that makes up the replacement.  This is
+the way to have multiple lexical symbols in a replacement.  Using the
+first way to specify text like \"foo::bar\" would not work, because :
+is a sepearate lexical symbol.
+
+A quick way to see what you would need to insert is to place a
+definition such as:
+
+#define MYSYM foo::bar
+
+into a C file, and do this:
+  \\[semantic-lex-spp-describe]
+
+The output table will describe the symbols needed."
+  :group 'c
+  :type '(repeat (cons (string :tag "Keyword")
+		       (sexp :tag "Replacement")))
+  :set (lambda (sym value)
+	 (set-default sym value)
+	 (condition-case nil
+	     (semantic-c-reset-preprocessor-symbol-map)
+	   (error nil))
+	 )
+  )
+
+;;;###autoload
+(defcustom semantic-lex-c-preprocessor-symbol-file nil
+  "List of C/C++ files that contain preprocessor macros for the C lexer.
+Each entry is a filename and each file is parsed, and those macros
+are included in every C/C++ file parsed by semantic.
+You can use this variable instead of `semantic-lex-c-preprocessor-symbol-map'
+to store your global macros in a more natural way."
+  :group 'c
+  :type '(repeat (file :tag "File"))
+  :set (lambda (sym value)
+	 (set-default sym value)
+	 (condition-case nil
+	     (semantic-c-reset-preprocessor-symbol-map)
+	   (error nil))
+	 )
+  )
+
+;;;###autoload
+(defcustom semantic-c-member-of-autocast 't
+  "Non-nil means classes with a '->' operator will cast to it's return type.
+
+For Examples:
+
+  class Foo {
+    Bar *operator->();
+  }
+
+  Foo foo;
+
+if `semantic-c-member-of-autocast' is non-nil :
+  foo->[here completion will list method of Bar]
+
+if `semantic-c-member-of-autocast' is nil :
+  foo->[here completion will list method of Foo]"
+  :group 'c
+  :type 'boolean)
+
+(define-lex-spp-macro-declaration-analyzer semantic-lex-cpp-define
+  "A #define of a symbol with some value.
+Record the symbol in the semantic preprocessor.
+Return the the defined symbol as a special spp lex token."
+  "^\\s-*#\\s-*define\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1
+  (goto-char (match-end 0))
+  (skip-chars-forward " \t")
+  (if (eolp)
+      nil
+    (let* ((name (buffer-substring-no-properties
+		  (match-beginning 1) (match-end 1)))
+	   (with-args (save-excursion
+			(goto-char (match-end 0))
+			(looking-at "(")))
+	   (semantic-lex-spp-replacements-enabled nil)
+	   ;; Temporarilly override the lexer to include
+	   ;; special items needed inside a macro
+	   (semantic-lex-analyzer #'semantic-cpp-lexer)
+	   (raw-stream
+	    (semantic-lex-spp-stream-for-macro (save-excursion
+						 (semantic-c-end-of-macro)
+						 (point))))
+	   )
+
+      ;; Only do argument checking if the paren was immediatly after
+      ;; the macro name.
+      (if with-args
+	  (semantic-lex-spp-first-token-arg-list (car raw-stream)))
+
+      ;; Magical spp variable for end point.
+      (setq semantic-lex-end-point (point))
+
+      ;; Handled nested macro streams.
+      (semantic-lex-spp-merge-streams raw-stream)
+      )))
+
+(define-lex-spp-macro-undeclaration-analyzer semantic-lex-cpp-undef
+  "A #undef of a symbol.
+Remove the symbol from the semantic preprocessor.
+Return the the defined symbol as a special spp lex token."
+  "^\\s-*#\\s-*undef\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1)
+
+
+;;; Conditional Skipping
+;;
+(defcustom semantic-c-obey-conditional-section-parsing-flag t
+  "*Non-nil means to interpret preprocessor #if sections.
+This implies that some blocks of code will not be parsed based on the
+values of the conditions in the #if blocks."
+  :group 'c
+  :type 'boolean)
+
+(defun semantic-c-skip-conditional-section ()
+  "Skip one section of a conditional.
+Moves forward to a matching #elif, #else, or #endif.
+Moves completely over balanced #if blocks."
+  (let ((done nil))
+    ;; (if (looking-at "^\\s-*#if")
+    ;; (semantic-lex-spp-push-if (point))
+    (end-of-line)
+    (while (and semantic-c-obey-conditional-section-parsing-flag
+		(and (not done)
+		     (re-search-forward
+		      "^\\s-*#\\s-*\\(if\\(n?def\\)?\\|el\\(if\\|se\\)\\|endif\\)\\>"
+		      nil t)))
+      (goto-char (match-beginning 0))
+      (cond
+       ((looking-at "^\\s-*#\\s-*if")
+	;; We found a nested if.  Skip it.
+	;; @TODO - can we use the new c-scan-conditionals
+	;; - available in Emacs/CVS as of AUG 2009
+	(c-forward-conditional 1))
+       ((looking-at "^\\s-*#\\s-*elif")
+	;; We need to let the preprocessor analize this one.
+	(beginning-of-line)
+	(setq done t)
+	)
+       ((looking-at "^\\s-*#\\s-*\\(endif\\|else\\)\\>")
+	;; We are at the end.  Pop our state.
+	;; (semantic-lex-spp-pop-if)
+	;; Note: We include ELSE and ENDIF the same. If skip some previous
+	;; section, then we should do the else by default, making it much
+	;; like the endif.
+	(end-of-line)
+	(forward-char 1)
+	(setq done t))
+       (t
+	;; We found an elif.  Stop here.
+	(setq done t))))))
+
+;;; HIDEIF USAGE:
+;; NOTE: All hideif using code was contributed by Brian Carlson as
+;;       copies from hideif plus modifications and additions.
+;;       Eric then converted things to use hideif functions directly,
+;;       deleting most of that code, and added the advice.
+
+;;; SPP SYM EVAL
+;;
+;; Convert SPP symbols into values usable by hideif.
+;;
+;; @TODO - can these conversion fcns be a part of semantic-lex-spp.el?
+;;       -- TRY semantic-lex-spp-one-token-to-txt
+(defun semantic-c-convert-spp-value-to-hideif-value (symbol macrovalue)
+  "Convert an spp macro SYMBOL MACROVALUE, to something that hideif can use.
+Take the first interesting thing and convert it."
+  ;; Just warn for complex macros.
+  (when (> (length macrovalue) 1)
+    (semantic-push-parser-warning
+     (format "Complex macro value (%s) may be improperly evaluated. "
+	     symbol) 0 0))
+
+  (let* ((lextoken (car macrovalue))
+	 (key (semantic-lex-token-class lextoken))
+	 (value (semantic-lex-token-text lextoken)))
+    (cond
+     ((eq key 'number) (string-to-number value))
+     ((eq key 'symbol) (semantic-c-evaluate-symbol-for-hideif value))
+     ((eq key 'string)
+      (if (string-match "^[0-9]+L?$" value)
+	  ;; If it matches a number expression, then
+	  ;; convert to a number.
+	  (string-to-number value)
+	value))
+     (t (semantic-push-parser-warning
+	 (format "Unknown macro value. Token class = %s value = %s. " key value)
+	 0 0)
+      nil)
+     )))
+
+(defun semantic-c-evaluate-symbol-for-hideif (spp-symbol)
+  "Lookup the symbol SPP-SYMBOL (a string) to something hideif can use.
+Pulls out the symbol list, and call `semantic-c-convert-spp-value-to-hideif-value'."
+  (interactive "sSymbol name: ")
+  (when (symbolp spp-symbol) (setq spp-symbol (symbol-name spp-symbol)))
+
+  (if (semantic-lex-spp-symbol-p spp-symbol )
+      ;; Convert the symbol into a stream of tokens from the macro which we
+      ;; can then interpret.
+      (let ((stream (semantic-lex-spp-symbol-stream spp-symbol)))
+	(cond
+	 ;; Empyt string means defined, so t.
+	 ((null stream) t)
+	 ;; A list means a parsed macro stream.
+	 ((listp stream)
+	  ;; Convert the macro to something we can return.
+	  (semantic-c-convert-spp-value-to-hideif-value spp-symbol stream))
+
+	 ;; Strings might need to be turned into numbers
+	 ((stringp stream)
+	  (if (string-match "^[0-9]+L?$" stream)
+	      ;; If it matches a number expression, then convert to a
+	      ;; number.
+	      (string-to-number stream)
+	    stream))
+
+	 ;; Just return the stream.  A user might have just stuck some
+	 ;; value in it directly.
+	 (t stream)
+	 ))
+    ;; Else, store an error, return nil.
+    (progn
+      (semantic-push-parser-warning
+       (format "SPP Symbol %s not available" spp-symbol)
+       (point) (point))
+      nil)))
+
+;;; HIDEIF HACK support fcns
+;;
+;; These fcns can replace the impl of some hideif features.
+;;
+;; @TODO - Should hideif and semantic-c merge?
+;;       I picture a grammar just for CPP that expands into
+;;       a second token stream for the parser.
+(defun semantic-c-hideif-lookup (var)
+  "Replacement for `hif-lookup'.
+I think it just gets the value for some CPP variable VAR."
+  (let ((val (semantic-c-evaluate-symbol-for-hideif
+              (cond
+               ((stringp var) var)
+               ((symbolp var) (symbol-name var))
+               (t "Unable to determine var")))))
+    (if val
+	val
+      ;; Real hideif will return the right undefined symbol.
+      nil)))
+
+(defun semantic-c-hideif-defined (var)
+  "Replacement for `hif-defined'.
+I think it just returns t/nil dependent on if VAR has been defined."
+  (let ((var-symbol-name
+          (cond
+           ((symbolp var) (symbol-name var))
+           ((stringp var) var)
+           (t "Not A Symbol"))))
+    (if (not (semantic-lex-spp-symbol-p var-symbol-name))
+        (progn
+          (semantic-push-parser-warning
+	   (format "Skip %s" (buffer-substring-no-properties
+			      (point-at-bol) (point-at-eol)))
+	   (point-at-bol) (point-at-eol))
+          nil)
+      t)))
+
+;;; HIDEIF ADVICE
+;;
+;; Advise hideif functions to use our lexical tables instead.
+(defvar semantic-c-takeover-hideif nil
+  "Non-nil when Semantic is taking over hideif features.")
+
+(defadvice hif-defined (around semantic-c activate)
+  "Is the variable defined?"
+  (if semantic-c-takeover-hideif
+      (setq ad-return-value
+	    (semantic-c-hideif-defined (ad-get-arg 0)))
+    ad-do-it))
+
+(defadvice hif-lookup (around semantic-c activate)
+  "Is the argument defined?  Return true or false."
+  (let ((ans nil))
+    (when semantic-c-takeover-hideif
+      (setq ans (semantic-c-hideif-lookup (ad-get-arg 0))))
+    (if (null ans)
+	ad-do-it
+      (setq ad-return-value ans))))
+
+;;; #if macros
+;;
+;; Support #if macros by evaluating the values via use of hideif
+;; logic.  See above for hacks to make this work.
+(define-lex-regex-analyzer semantic-lex-c-if
+  "Code blocks wrapped up in #if, or #ifdef.
+Uses known macro tables in SPP to determine what block to skip."
+  "^\\s-*#\\s-*\\(if\\|elif\\).*$"
+  (semantic-c-do-lex-if))
+
+(defun semantic-c-do-lex-if ()
+  "Handle lexical CPP if statements.
+Enables a takeover of some hideif functions, then uses hideif to
+evaluate the #if expression and enables us to make decisions on which
+code to parse."
+  ;; Enable our advice, and use hideif to parse.
+  (let* ((semantic-c-takeover-hideif t)
+	 (parsedtokelist
+	  (condition-case nil
+	      ;; This is imperfect, so always assume on error.
+	      (hif-canonicalize)
+	    (error nil))))
+
+    (let ((eval-form (eval parsedtokelist)))
+      (if (or (not eval-form)
+              (and (numberp eval-form)
+                   (equal eval-form 0)));; ifdefline resulted in false
+
+	;; The if indicates to skip this preprocessor section
+	(let ((pt nil))
+	  (semantic-push-parser-warning (format "Skip %s" (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
+					(point-at-bol) (point-at-eol))
+	  (beginning-of-line)
+	  (setq pt (point))
+	  ;; This skips only a section of a conditional.  Once that section
+	  ;; is opened, encountering any new #else or related conditional
+	  ;; should be skipped.
+	  (semantic-c-skip-conditional-section)
+	  (setq semantic-lex-end-point (point))
+	  
+	  ;; @TODO -somewhere around here, we also need to skip
+	  ;; other sections of the conditional.
+
+	  nil)
+      ;; Else, don't ignore it, but do handle the internals.
+      (end-of-line)
+      (setq semantic-lex-end-point (point))
+      nil))))
+
+(define-lex-regex-analyzer semantic-lex-c-ifdef
+  "Code blocks wrapped up in #ifdef.
+Uses known macro tables in SPP to determine what block to skip."
+  "^\\s-*#\\s-*\\(ifndef\\|ifdef\\)\\s-+\\(\\(\\sw\\|\\s_\\)+\\)$"
+  (semantic-c-do-lex-ifdef))
+
+(defun semantic-c-do-lex-ifdef ()
+  "Handle lexical CPP if statements."
+  (let* ((sym (buffer-substring-no-properties
+	       (match-beginning 2) (match-end 2)))
+	 (ift (buffer-substring-no-properties
+	       (match-beginning 1) (match-end 1)))
+	 (ifdef (string= ift "ifdef"))
+	 (ifndef (string= ift "ifndef"))
+	 )
+    (if (or (and ifdef (not (semantic-lex-spp-symbol-p sym)))
+	    (and ifndef (semantic-lex-spp-symbol-p sym)))
+	;; The if indecates to skip this preprocessor section
+	(let ((pt nil))
+	  ;; (message "%s %s yes" ift sym)
+	  (beginning-of-line)
+	  (setq pt (point))
+	  ;;(c-forward-conditional 1)
+	  ;; This skips only a section of a conditional.  Once that section
+	  ;; is opened, encountering any new #else or related conditional
+	  ;; should be skipped.
+	  (semantic-c-skip-conditional-section)
+	  (setq semantic-lex-end-point (point))
+	  (semantic-push-parser-warning (format "Skip #%s %s" ift sym)
+					pt (point))
+	  ;;	  (semantic-lex-push-token
+	  ;;	   (semantic-lex-token 'c-preprocessor-skip pt (point)))
+	  nil)
+      ;; Else, don't ignore it, but do handle the internals.
+      ;;(message "%s %s no" ift sym)
+      (end-of-line)
+      (setq semantic-lex-end-point (point))
+      nil)))
+
+;;; END HIDEIF HACKS
+
+(define-lex-regex-analyzer semantic-lex-c-macro-else
+  "Ignore an #else block.
+We won't see the #else due to the macro skip section block
+unless we are actively parsing an open #if statement.  In that
+case, we must skip it since it is the ELSE part."
+  "^\\s-*#\\s-*\\(else\\)"
+  (let ((pt (point)))
+    (semantic-c-skip-conditional-section)
+    (setq semantic-lex-end-point (point))
+    (semantic-push-parser-warning "Skip #else" pt (point))
+;;    (semantic-lex-push-token
+;;     (semantic-lex-token 'c-preprocessor-skip pt (point)))
+    nil))
+
+(define-lex-regex-analyzer semantic-lex-c-macrobits
+  "Ignore various forms of #if/#else/#endif conditionals."
+  "^\\s-*#\\s-*\\(if\\(n?def\\)?\\|endif\\|elif\\|else\\)"
+  (semantic-c-end-of-macro)
+  (setq semantic-lex-end-point (point))
+  nil)
+
+(define-lex-spp-include-analyzer semantic-lex-c-include-system
+  "Identify include strings, and return special tokens."
+    "^\\s-*#\\s-*include\\s-*<\\([^ \t\n>]+\\)>" 0
+    ;; Hit 1 is the name of the include.
+    (goto-char (match-end 0))
+    (setq semantic-lex-end-point (point))
+    (cons (buffer-substring-no-properties (match-beginning 1)
+					  (match-end 1))
+	  'system))
+
+(define-lex-spp-include-analyzer semantic-lex-c-include
+  "Identify include strings, and return special tokens."
+    "^\\s-*#\\s-*include\\s-*\"\\([^ \t\n>]+\\)\"" 0
+    ;; Hit 1 is the name of the include.
+    (goto-char (match-end 0))
+    (setq semantic-lex-end-point (point))
+    (cons (buffer-substring-no-properties (match-beginning 1)
+					  (match-end 1))
+	  nil))
+
+
+(define-lex-regex-analyzer semantic-lex-c-ignore-ending-backslash
+  "Skip backslash ending a line.
+Go to the next line."
+  "\\\\\\s-*\n"
+  (setq semantic-lex-end-point (match-end 0)))
+
+(define-lex-regex-analyzer semantic-lex-c-namespace-begin-macro
+  "Handle G++'s namespace macros which the pre-processor can't handle."
+  "\\(_GLIBCXX_BEGIN_NAMESPACE\\)(\\s-*\\(\\(?:\\w\\|\\s_\\)+\\)\\s-*)"
+  (let* ((nsend (match-end 1))
+	 (sym-start (match-beginning 2))
+	 (sym-end (match-end 2))
+	 (ms (buffer-substring-no-properties sym-start sym-end)))
+    ;; Push the namespace keyword.
+    (semantic-lex-push-token
+     (semantic-lex-token 'NAMESPACE (match-beginning 0) nsend "namespace"))
+    ;; Push the name.
+    (semantic-lex-push-token
+     (semantic-lex-token 'symbol sym-start sym-end ms))
+    )
+  (goto-char (match-end 0))
+  (let ((start (point))
+	(end 0))
+    ;; If we can't find a matching end, then create the fake list.
+    (when (re-search-forward "_GLIBCXX_END_NAMESPACE" nil t)
+      (setq end (point))
+      (semantic-lex-push-token
+       (semantic-lex-token 'semantic-list start end
+			   (list 'prefix-fake)))))
+  (setq semantic-lex-end-point (point)))
+
+(defcustom semantic-lex-c-nested-namespace-ignore-second t
+  "Should _GLIBCXX_BEGIN_NESTED_NAMESPACE ignore the second namespace?
+It is really there, but if a majority of uses is to squeeze out
+the second namespace in use, then it should not be included.
+
+If you are having problems with smart completion and STL templates,
+it may that this is set incorrectly.  After changing the value
+of this flag, you will need to delete any semanticdb cache files
+that may have been incorrectly parsed."
+  :group 'semantic
+  :type 'boolean)
+
+(define-lex-regex-analyzer semantic-lex-c-VC++-begin-std-namespace
+  "Handle VC++'s definition of the std namespace."
+  "\\(_STD_BEGIN\\)"
+  (semantic-lex-push-token
+   (semantic-lex-token 'NAMESPACE (match-beginning 0) (match-end 0) "namespace"))
+  (semantic-lex-push-token
+   (semantic-lex-token 'symbol (match-beginning 0) (match-end 0) "std"))
+  (goto-char (match-end 0))
+  (let ((start (point))
+	(end 0))
+    (when (re-search-forward "_STD_END" nil t)
+      (setq end (point))
+      (semantic-lex-push-token
+       (semantic-lex-token 'semantic-list start end
+			   (list 'prefix-fake)))))
+  (setq semantic-lex-end-point (point)))
+
+(define-lex-regex-analyzer semantic-lex-c-VC++-end-std-namespace
+  "Handle VC++'s definition of the std namespace."
+  "\\(_STD_END\\)"
+  (goto-char (match-end 0))
+  (setq semantic-lex-end-point (point)))
+
+(define-lex-regex-analyzer semantic-lex-c-namespace-begin-nested-macro
+  "Handle G++'s namespace macros which the pre-processor can't handle."
+  "\\(_GLIBCXX_BEGIN_NESTED_NAMESPACE\\)(\\s-*\\(\\(?:\\w\\|\\s_\\)+\\)\\s-*,\\s-*\\(\\(?:\\w\\|\\s_\\)+\\)\\s-*)"
+  (goto-char (match-end 0))
+  (let* ((nsend (match-end 1))
+	 (sym-start (match-beginning 2))
+	 (sym-end (match-end 2))
+	 (ms (buffer-substring-no-properties sym-start sym-end))
+	 (sym2-start (match-beginning 3))
+	 (sym2-end (match-end 3))
+	 (ms2 (buffer-substring-no-properties sym2-start sym2-end)))
+    ;; Push the namespace keyword.
+    (semantic-lex-push-token
+     (semantic-lex-token 'NAMESPACE (match-beginning 0) nsend "namespace"))
+    ;; Push the name.
+    (semantic-lex-push-token
+     (semantic-lex-token 'symbol sym-start sym-end ms))
+
+    (goto-char (match-end 0))
+    (let ((start (point))
+	  (end 0))
+      ;; If we can't find a matching end, then create the fake list.
+      (when (re-search-forward "_GLIBCXX_END_NESTED_NAMESPACE" nil t)
+	(setq end (point))
+	(if semantic-lex-c-nested-namespace-ignore-second
+	    ;; The same as _GLIBCXX_BEGIN_NAMESPACE
+	    (semantic-lex-push-token
+	     (semantic-lex-token 'semantic-list start end
+				 (list 'prefix-fake)))
+	  ;; Do both the top and second level namespace
+	  (semantic-lex-push-token
+	   (semantic-lex-token 'semantic-list start end
+			       ;; We'll depend on a quick hack
+			       (list 'prefix-fake-plus
+				     (semantic-lex-token 'NAMESPACE
+							 sym-end sym2-start
+							 "namespace")
+				     (semantic-lex-token 'symbol
+							 sym2-start sym2-end
+							 ms2)
+				     (semantic-lex-token 'semantic-list start end
+							 (list 'prefix-fake)))
+			       )))
+	)))
+  (setq semantic-lex-end-point (point)))
+
+(define-lex-regex-analyzer semantic-lex-c-namespace-end-macro
+  "Handle G++'s namespace macros which the pre-processor can't handle."
+  "_GLIBCXX_END_\\(NESTED_\\)?NAMESPACE"
+  (goto-char (match-end 0))
+  (setq semantic-lex-end-point (point)))
+
+(define-lex-regex-analyzer semantic-lex-c-string
+  "Detect and create a C string token."
+  "L?\\(\\s\"\\)"
+  ;; Zing to the end of this string.
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'string (point)
+    (save-excursion
+      ;; Skip L prefix if present.
+      (goto-char (match-beginning 1))
+      (semantic-lex-unterminated-syntax-protection 'string
+	(forward-sexp 1)
+	(point))
+      ))))
+
+(define-lex-regex-analyzer semantic-c-lex-ignore-newline
+  "Detect and ignore newline tokens.
+Use this ONLY if newlines are not whitespace characters (such as when
+they are comment end characters)."
+  ;; Just like semantic-lex-ignore-newline, but also ignores
+  ;; trailing \.
+  "\\s-*\\\\?\\s-*\\(\n\\|\\s>\\)"
+  (setq semantic-lex-end-point (match-end 0)))
+
+
+(define-lex semantic-c-lexer
+  "Lexical Analyzer for C code.
+Use semantic-cpp-lexer for parsing text inside a CPP macro."
+  ;; C preprocessor features
+  semantic-lex-cpp-define
+  semantic-lex-cpp-undef
+  semantic-lex-c-ifdef
+  semantic-lex-c-if
+  semantic-lex-c-macro-else
+  semantic-lex-c-macrobits
+  semantic-lex-c-include
+  semantic-lex-c-include-system
+  semantic-lex-c-ignore-ending-backslash
+  ;; Whitespace handling
+  semantic-lex-ignore-whitespace
+  semantic-c-lex-ignore-newline
+  ;; Non-preprocessor features
+  semantic-lex-number
+  ;; Must detect C strings before symbols because of possible L prefix!
+  semantic-lex-c-string
+  ;; Custom handlers for some macros come before the macro replacement analyzer.
+  semantic-lex-c-namespace-begin-macro
+  semantic-lex-c-namespace-begin-nested-macro
+  semantic-lex-c-namespace-end-macro
+  semantic-lex-c-VC++-begin-std-namespace
+  semantic-lex-c-VC++-end-std-namespace
+  ;; Handle macros, symbols, and keywords
+  semantic-lex-spp-replace-or-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+(define-lex-simple-regex-analyzer semantic-lex-cpp-hashhash
+  "Match ## inside a CPP macro as special."
+  "##" 'spp-concat)
+
+(define-lex semantic-cpp-lexer
+  "Lexical Analyzer for CPP macros in C code."
+  ;; CPP special
+  semantic-lex-cpp-hashhash
+  ;; C preprocessor features
+  semantic-lex-cpp-define
+  semantic-lex-cpp-undef
+  semantic-lex-c-if
+  semantic-lex-c-macro-else
+  semantic-lex-c-macrobits
+  semantic-lex-c-include
+  semantic-lex-c-include-system
+  semantic-lex-c-ignore-ending-backslash
+  ;; Whitespace handling
+  semantic-lex-ignore-whitespace
+  semantic-c-lex-ignore-newline
+  ;; Non-preprocessor features
+  semantic-lex-number
+  ;; Must detect C strings before symbols because of possible L prefix!
+  semantic-lex-c-string
+  ;; Parsing inside a macro means that we don't do macro replacement.
+  ;; semantic-lex-spp-replace-or-symbol-or-keyword
+  semantic-lex-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+(define-mode-local-override semantic-parse-region c-mode
+  (start end &optional nonterminal depth returnonerror)
+  "Calls 'semantic-parse-region-default', except in a macro expansion.
+MACRO expansion mode is handled through the nature of Emacs's non-lexical
+binding of variables.
+START, END, NONTERMINAL, DEPTH, and RETURNONERRORS are the same
+as for the parent."
+  (if (and (boundp 'lse) (or (/= start 1) (/= end (point-max))))
+      (let* ((last-lexical-token lse)
+	     (llt-class (semantic-lex-token-class last-lexical-token))
+	     (llt-fakebits (car (cdr last-lexical-token)))
+	     (macroexpand (stringp (car (cdr last-lexical-token)))))
+	(if macroexpand
+  	    (progn
+	      ;; It is a macro expansion.  Do something special.
+	      ;;(message "MOOSE %S %S, %S : %S" start end nonterminal lse)
+	      (semantic-c-parse-lexical-token
+	       lse nonterminal depth returnonerror)
+	      )
+	  ;; Not a macro expansion, but perhaps a funny semantic-list
+	  ;; is at the start?  Remove the depth if our semantic list is not
+	  ;; made of list tokens.
+	  (if (and depth (= depth 1)
+		   (eq llt-class 'semantic-list)
+		   (not (null llt-fakebits))
+		   (consp llt-fakebits)
+		   (symbolp (car llt-fakebits))
+		   )
+	      (progn
+		(setq depth 0)
+
+		;; This is a copy of semantic-parse-region-default where we
+		;; are doing something special with the lexication of the
+		;; contents of the semantic-list token.  Stuff not used by C
+		;; removed.
+		(let ((tokstream
+		       (if (and (consp llt-fakebits)
+				(eq (car llt-fakebits) 'prefix-fake-plus))
+			   ;; If our semantic-list is special, then only stick in the
+			   ;; fake tokens.
+			   (cdr llt-fakebits)
+			 ;; Lex up the region with a depth of 0
+			 (semantic-lex start end 0))))
+
+		  ;; Do the parse
+		  (nreverse
+		   (semantic-repeat-parse-whole-stream tokstream
+						       nonterminal
+						       returnonerror))
+
+		  ))
+
+	    ;; It was not a macro expansion, nor a special semantic-list.
+	    ;; Do old thing.
+	    (semantic-parse-region-default start end
+					   nonterminal depth
+					   returnonerror)
+	    )))
+    ;; Do the parse
+    (semantic-parse-region-default start end nonterminal
+				   depth returnonerror)
+    ))
+
+(defvar semantic-c-parse-token-hack-depth 0
+  "Current depth of recursive calls to `semantic-c-parse-lexical-token'")
+
+(defun semantic-c-parse-lexical-token (lexicaltoken nonterminal depth
+						    returnonerror)
+  "Do a region parse on the contents of LEXICALTOKEN.
+Presumably, this token has a string in it from a macro.
+The text of the token is inserted into a different buffer, and
+parsed there.
+Argument NONTERMINAL, DEPTH, and RETURNONERROR are passed into
+the regular parser."
+  (let* ((semantic-c-parse-token-hack-depth (1+ semantic-c-parse-token-hack-depth))
+	 (buf (get-buffer-create (format " *C parse hack %d*"
+					 semantic-c-parse-token-hack-depth)))
+	 (mode major-mode)
+	 (spp-syms semantic-lex-spp-dynamic-macro-symbol-obarray)
+	 (stream nil)
+	 (start (semantic-lex-token-start lexicaltoken))
+	 (end (semantic-lex-token-end lexicaltoken))
+	 (symtext (semantic-lex-token-text lexicaltoken))
+	 (macros (get-text-property 0 'macros symtext))
+	 )
+    (if (> semantic-c-parse-token-hack-depth 5)
+	nil
+      (save-excursion
+	(set-buffer buf)
+	(erase-buffer)
+	(when (not (eq major-mode mode))
+	  (save-match-data
+
+	    ;; Protect against user hooks throwing errors.
+	    (condition-case nil
+		(funcall mode)
+	      (error
+	       (if (y-or-n-p
+		    (format "There was an error initializing %s in buffer \"%s\". Debug your hooks? "
+			    mode (buffer-name)))
+		   (semantic-c-debug-mode-init mode)
+		 (message "Macro parsing state may be broken...")
+		 (sit-for 1))))
+	    )				; save match data
+	
+	  ;; Hack in mode-local
+	  (activate-mode-local-bindings)
+	  ;; CHEATER!  The following 3 lines are from
+	  ;; `semantic-new-buffer-fcn', but we don't want to turn
+	  ;; on all the other annoying modes for this little task.
+	  (setq semantic-new-buffer-fcn-was-run t)
+	  (semantic-lex-init)
+	  (semantic-clear-toplevel-cache)
+	  (remove-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook
+		       t)
+	  )
+	;; Get the macro symbol table right.
+	(setq semantic-lex-spp-dynamic-macro-symbol-obarray spp-syms)
+	;; (message "%S" macros)
+	(dolist (sym macros)
+	  (semantic-lex-spp-symbol-set (car sym) (cdr sym)))
+
+	(insert symtext)
+
+	(setq stream
+	      (semantic-parse-region-default
+	       (point-min) (point-max) nonterminal depth returnonerror))
+
+	;; Clean up macro symbols
+	(dolist (sym macros)
+	  (semantic-lex-spp-symbol-remove (car sym)))
+
+	;; Convert the text of the stream.
+	(dolist (tag stream)
+	  ;; Only do two levels here 'cause I'm lazy.
+	  (semantic--tag-set-overlay tag (list start end))
+	  (dolist (stag (semantic-tag-components-with-overlays tag))
+	    (semantic--tag-set-overlay stag (list start end))
+	    ))
+	))
+    stream))
+
+(defvar semantic-c-debug-mode-init-last-mode nil
+  "The most recent mode needing debugging.")
+
+(defun semantic-c-debug-mode-init (mm)
+  "Debug mode init for major mode MM after we're done parsing now."
+  (interactive (list semantic-c-debug-mode-init-last-mode))
+  (if (interactive-p)
+      ;; Do the debug.
+      (progn
+	(switch-to-buffer (get-buffer-create "*MODE HACK TEST*"))
+	(let ((debug-on-error t))
+	  (funcall mm)))
+
+    ;; Notify about the debug
+    (setq semantic-c-debug-mode-init-last-mode mm)
+
+    (add-hook 'post-command-hook 'semantic-c-debug-mode-init-pch)))
+
+(defun semantic-c-debug-mode-init-pch ()
+  "Notify user about needing to debug their major mode hooks."
+  (let ((mm semantic-c-debug-mode-init-last-mode))
+    (switch-to-buffer-other-window
+     (get-buffer-create "*MODE HACK TEST*"))
+    (erase-buffer)
+    (insert "A failure occured while parsing your buffers.
+
+The failure occured while attempting to initialize " (symbol-name mm) " in a
+buffer not associated with a file.  To debug this problem, type
+
+M-x semantic-c-debug-mode-init
+
+now.
+")
+    (remove-hook 'post-command-hook 'semantic-c-debug-mode-init-pch)))
+  
+(defun semantic-expand-c-tag (tag)
+  "Expand TAG into a list of equivalent tags, or nil."
+  (let ((return-list nil)
+	)
+    ;; Expand an EXTERN C first.
+    (when (eq (semantic-tag-class tag) 'extern)
+      (let* ((mb (semantic-tag-get-attribute tag :members))
+	     (ret mb))
+	(while mb
+	  (let ((mods (semantic-tag-get-attribute (car mb) :typemodifiers)))
+	    (setq mods (cons "extern" (cons "\"C\"" mods)))
+	    (semantic-tag-put-attribute (car mb) :typemodifiers mods))
+	  (setq mb (cdr mb)))
+	(setq return-list ret)))
+
+    ;; Function or variables that have a :type that is some complex
+    ;; thing, extract it, and replace it with a reference.
+    ;;
+    ;; Thus, struct A { int a; } B;
+    ;;
+    ;; will create 2 toplevel tags, one is type A, and the other variable B
+    ;; where the :type of B is just a type tag A that is a prototype, and
+    ;; the actual struct info of A is it's own toplevel tag.
+    (when (or (semantic-tag-of-class-p tag 'function)
+	      (semantic-tag-of-class-p tag 'variable))
+      (let* ((basetype (semantic-tag-type tag))
+	     (typeref nil)
+	     (tname (when (consp basetype)
+		      (semantic-tag-name basetype))))
+	;; Make tname be a string.
+	(when (consp tname) (setq tname (car (car tname))))
+	;; Is the basetype a full type with a name of its own?
+	(when (and basetype (semantic-tag-p basetype)
+		   (not (semantic-tag-prototype-p basetype))
+		   tname
+		   (not (string= tname "")))
+	  ;; a type tag referencing the type we are extracting.
+	  (setq typeref (semantic-tag-new-type
+			 (semantic-tag-name basetype)
+			 (semantic-tag-type basetype)
+			 nil nil
+			 :prototype t))
+	  ;; Convert original tag to only have a reference.
+	  (setq tag (semantic-tag-copy tag))
+	  (semantic-tag-put-attribute tag :type typeref)
+	  ;; Convert basetype to have the location information.
+	  (semantic--tag-copy-properties tag basetype)
+	  (semantic--tag-set-overlay basetype
+				     (semantic-tag-overlay tag))
+	  ;; Store the base tag as part of the return list.
+	  (setq return-list (cons basetype return-list)))))
+
+    ;; Name of the tag is a list, so expand it.  Tag lists occur
+    ;; for variables like this: int var1, var2, var3;
+    ;;
+    ;; This will expand that to 3 tags that happen to share the
+    ;; same overlay information.
+    (if (consp (semantic-tag-name tag))
+	(let ((rl (semantic-expand-c-tag-namelist tag)))
+	  (cond
+	   ;; If this returns nothing, then return nil overall
+	   ;; because that will restore the old TAG input.
+	   ((not rl) (setq return-list nil))
+	   ;; If we have a return, append it to the existing list
+	   ;; of returns.
+	   ((consp rl)
+	    (setq return-list (append rl return-list)))
+	   ))
+      ;; If we didn't have a list, but the return-list is non-empty,
+      ;; that means we still need to take our existing tag, and glom
+      ;; it onto our extracted type.
+      (if (consp return-list)
+	  (setq return-list (cons tag return-list)))
+      )
+
+    ;; Default, don't change the tag means returning nil.
+    return-list))
+
+(defun semantic-expand-c-tag-namelist (tag)
+  "Expand TAG whose name is a list into a list of tags, or nil."
+  (cond ((semantic-tag-of-class-p tag 'variable)
+	 ;; The name part comes back in the form of:
+	 ;; ( NAME NUMSTARS BITS ARRAY ASSIGN )
+	 (let ((vl nil)
+	       (basety (semantic-tag-type tag))
+	       (ty "")
+	       (mods (semantic-tag-get-attribute tag :typemodifiers))
+	       (suffix "")
+	       (lst (semantic-tag-name tag))
+	       (default nil)
+	       (cur nil))
+	   ;; Open up each name in the name list.
+	   (while lst
+	     (setq suffix "" ty "")
+	     (setq cur (car lst))
+	     (if (nth 2 cur)
+		 (setq suffix (concat ":" (nth 2 cur))))
+	     (if (= (length basety) 1)
+		 (setq ty (car basety))
+	       (setq ty basety))
+	     (setq default (nth 4 cur))
+	     (setq vl (cons
+		       (semantic-tag-new-variable
+			(car cur)	;name
+			ty		;type
+			(if default
+			    (buffer-substring-no-properties
+			     (car default) (car (cdr default))))
+			:constant-flag (semantic-tag-variable-constant-p tag)
+			:suffix suffix
+			:typemodifiers mods
+			:dereference (length (nth 3 cur))
+			:pointer (nth 1 cur)
+			:reference (semantic-tag-get-attribute tag :reference)
+			:documentation (semantic-tag-docstring tag) ;doc
+			)
+		       vl))
+	     (semantic--tag-copy-properties tag (car vl))
+	     (semantic--tag-set-overlay (car vl)
+					(semantic-tag-overlay tag))
+	     (setq lst (cdr lst)))
+	   ;; Return the list
+	   (nreverse vl)))
+	((semantic-tag-of-class-p tag 'type)
+	 ;; We may someday want to add an extra check for a type
+	 ;; of type "typedef".
+	 ;; Each elt of NAME is ( STARS NAME )
+	 (let ((vl nil)
+	       (names (semantic-tag-name tag))
+	       (super (semantic-tag-get-attribute tag :superclasses))
+	       (addlast nil))
+
+	   (when (and (semantic-tag-of-type-p tag "typedef")
+		      (semantic-tag-of-class-p super 'type)
+		      (semantic-tag-type-members super))
+	     ;; This is a typedef of a real type.  Extract
+	     ;; the super class, and stick it into the tags list.
+	     (setq addlast super)
+
+	     ;; Clone super and remove the members.
+	     (setq super (semantic-tag-clone super))
+	     (semantic-tag-put-attribute super :members nil)
+
+	     ;; Add in props to the full superclass.
+	     (semantic--tag-copy-properties tag addlast)
+	     (semantic--tag-set-overlay addlast (semantic-tag-overlay tag))
+	     )
+
+	   
+	   (while names
+
+	     (setq vl (cons (semantic-tag-new-type
+			     (nth 1 (car names)) ; name
+			     "typedef"
+			     (semantic-tag-type-members tag)
+			     ;; parent is just tbe name of what
+			     ;; is passed down as a tag.
+			     (list
+			      (semantic-tag-name
+			       (semantic-tag-type-superclasses tag)))
+			     :pointer
+			     (let ((stars (car (car (car names)))))
+			       (if (= stars 0) nil stars))
+			     ;; This specifies what the typedef
+			     ;; is expanded out as.  Just the
+			     ;; name shows up as a parent of this
+			     ;; typedef.
+			     :typedef super
+			     ;;(semantic-tag-type-superclasses tag)
+			     :documentation
+			     (semantic-tag-docstring tag))
+			    vl))
+	     (semantic--tag-copy-properties tag (car vl))
+	     (semantic--tag-set-overlay (car vl) (semantic-tag-overlay tag))
+	     (setq names (cdr names)))
+
+	   ;; Add typedef superclass last.
+	   (when addlast (setq vl (cons addlast vl)))
+
+	   vl))
+	((and (listp (car tag))
+	      (semantic-tag-of-class-p (car tag) 'variable))
+	 ;; Argument lists come in this way.  Append all the expansions!
+	 (let ((vl nil))
+	   (while tag
+	     (setq vl (append (semantic-tag-components (car vl))
+			      vl)
+		   tag (cdr tag)))
+	   vl))
+	(t nil)))
+
+(defvar-mode-local c-mode semantic-tag-expand-function 'semantic-expand-c-tag
+  "Function used to expand tags generated in the C bovine parser.")
+
+(defvar semantic-c-classname nil
+  "At parse time, assign a class or struct name text here.
+It is picked up by `semantic-c-reconstitute-token' to determine
+if something is a constructor.  Value should be:
+  ( TYPENAME .  TYPEOFTYPE)
+where typename is the name of the type, and typeoftype is \"class\"
+or \"struct\".")
+
+(defun semantic-c-reconstitute-token (tokenpart declmods typedecl)
+  "Reconstitute a token TOKENPART with DECLMODS and TYPEDECL.
+This is so we don't have to match the same starting text several times.
+Optional argument STAR and REF indicate the number of * and & in the typedef."
+  (when (and (listp typedecl)
+	     (= 1 (length typedecl))
+	     (stringp (car typedecl)))
+    (setq typedecl (car typedecl)))
+  (cond ((eq (nth 1 tokenpart) 'variable)
+	 (semantic-tag-new-variable
+	  (car tokenpart)
+	  (or typedecl "int")	;type
+	  nil			;default value (filled with expand)
+	  :constant-flag (if (member "const" declmods) t nil)
+	  :typemodifiers (delete "const" declmods)
+	  )
+	 )
+	((eq (nth 1 tokenpart) 'function)
+	 ;; We should look at part 4 (the arglist) here, and throw an
+	 ;; error of some sort if it contains parser errors so that we
+	 ;; don't parser function calls, but that is a little beyond what
+	 ;; is available for data here.
+	 (let* ((constructor
+		 (and (or (and semantic-c-classname
+			       (string= (car semantic-c-classname)
+					(car tokenpart)))
+			  (and (stringp (car (nth 2 tokenpart)))
+			       (string= (car (nth 2 tokenpart)) (car tokenpart)))
+			  )
+		      (not (car (nth 3 tokenpart)))))
+		(fcnpointer (string-match "^\\*" (car tokenpart)))
+		(fnname (if fcnpointer
+			    (substring (car tokenpart) 1)
+			  (car tokenpart)))
+		(operator (if (string-match "[a-zA-Z]" fnname)
+			      nil
+			    t))
+		)
+	   (if fcnpointer
+	       ;; Function pointers are really variables.
+	       (semantic-tag-new-variable
+		fnname
+		typedecl
+		nil
+		;; It is a function pointer
+		:functionpointer-flag t
+		)
+	     ;; The function
+	     (semantic-tag-new-function
+	      fnname
+	      (or typedecl		;type
+		  (cond ((car (nth 3 tokenpart) )
+			 "void")	; Destructors have no return?
+			(constructor
+			 ;; Constructors return an object.
+			 (semantic-tag-new-type
+			  ;; name
+			  (or (car semantic-c-classname)
+			      (car (nth 2 tokenpart)))
+			  ;; type
+			  (or (cdr semantic-c-classname)
+			      "class")
+			  ;; members
+			  nil
+			  ;; parents
+			  nil
+			  ))
+			(t "int")))
+	      (nth 4 tokenpart)		;arglist
+	      :constant-flag (if (member "const" declmods) t nil)
+	      :typemodifiers (delete "const" declmods)
+	      :parent (car (nth 2 tokenpart))
+	      :destructor-flag (if (car (nth 3 tokenpart) ) t)
+	      :constructor-flag (if constructor t)
+	      :pointer (nth 7 tokenpart)
+	      :operator-flag operator
+	      ;; Even though it is "throw" in C++, we use
+	      ;; `throws' as a common name for things that toss
+	      ;; exceptions about.
+	      :throws (nth 5 tokenpart)
+	      ;; Reemtrant is a C++ thingy.  Add it here
+	      :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t)
+	      ;; A function post-const is funky.  Try stuff
+	      :methodconst-flag (if (member "const" (nth 6 tokenpart)) t)
+	      ;; prototypes are functions w/ no body
+	      :prototype-flag (if (nth 8 tokenpart) t)
+	      ;; Pure virtual
+	      :pure-virtual-flag (if (eq (nth 8 tokenpart) :pure-virtual-flag) t)
+	      ;; Template specifier.
+	      :template-specifier (nth 9 tokenpart)
+	      )))
+	 )
+	))
+
+(defun semantic-c-reconstitute-template (tag specifier)
+  "Reconstitute the token TAG with the template SPECIFIER."
+  (semantic-tag-put-attribute tag :template (or specifier ""))
+  tag)
+
+
+;;; Override methods & Variables
+;;
+(define-mode-local-override semantic-format-tag-name
+  c-mode (tag &optional parent color)
+  "Convert TAG to a string that is the print name for TAG.
+Optional PARENT and COLOR are ignored."
+  (let ((name (semantic-format-tag-name-default tag parent color))
+	(fnptr (semantic-tag-get-attribute tag :functionpointer-flag))
+	)
+    (if (not fnptr)
+	name
+      (concat "(*" name ")"))
+    ))
+
+(define-mode-local-override semantic-format-tag-canonical-name
+  c-mode (tag &optional parent color)
+  "Create a cannonical name for TAG.
+PARENT specifies a parent class.
+COLOR indicates that the text should be type colorized.
+Enhances the base class to search for the entire parent
+tree to make the name accurate."
+  (semantic-format-tag-canonical-name-default tag parent color)
+  )
+
+(define-mode-local-override semantic-format-tag-type c-mode (tag color)
+  "Convert the data type of TAG to a string usable in tag formatting.
+Adds pointer and reference symbols to the default.
+Argument COLOR adds color to the text."
+  (let* ((type (semantic-tag-type tag))
+	 (defaulttype nil)
+	 (point (semantic-tag-get-attribute tag :pointer))
+	 (ref (semantic-tag-get-attribute tag :reference))
+	 )
+    (if (semantic-tag-p type)
+	(let ((typetype (semantic-tag-type type))
+	      (typename (semantic-tag-name type)))
+	  ;; Create the string that expresses the type
+	  (if (string= typetype "class")
+	      (setq defaulttype typename)
+	    (setq defaulttype (concat typetype " " typename))))
+      (setq defaulttype (semantic-format-tag-type-default tag color)))
+
+    ;; Colorize
+    (when color
+      (setq defaulttype (semantic--format-colorize-text defaulttype 'type)))
+
+    ;; Add refs, ptrs, etc
+    (if ref (setq ref "&"))
+    (if point (setq point (make-string point ?*)) "")
+    (when type
+      (concat defaulttype ref point))
+    ))
+
+(define-mode-local-override semantic-find-tags-by-scope-protection
+  c-mode (scopeprotection parent &optional table)
+  "Override the usual search for protection.
+We can be more effective than the default by scanning through once,
+and collecting tags based on the labels we see along the way."
+  (if (not table) (setq table (semantic-tag-type-members parent)))
+  (if (null scopeprotection)
+      table
+    (let ((ans nil)
+	  (curprot 1)
+	  (targetprot (cond ((eq scopeprotection 'public)
+			     1)
+			    ((eq scopeprotection 'protected)
+			     2)
+			    (t 3)
+			    ))
+	  (alist '(("public" . 1)
+		   ("protected" . 2)
+		   ("private" . 3)))
+	  )
+      (dolist (tag table)
+	(cond
+	 ((semantic-tag-of-class-p tag 'label)
+	  (setq curprot (cdr (assoc (semantic-tag-name tag) alist)))
+	  )
+	 ((>= targetprot curprot)
+	  (setq ans (cons tag ans)))
+	 ))
+      ans)))
+
+(define-mode-local-override semantic-tag-protection
+  c-mode (tag &optional parent)
+  "Return the protection of TAG in PARENT.
+Override function for `semantic-tag-protection'."
+  (let ((mods (semantic-tag-modifiers tag))
+	(prot nil))
+    ;; Check the modifiers for protection if we are not a child
+    ;; of some class type.
+    (when (or (not parent) (not (eq (semantic-tag-class parent) 'type)))
+      (while (and (not prot) mods)
+	(if (stringp (car mods))
+	    (let ((s (car mods)))
+	      ;; A few silly defaults to get things started.
+	      (cond ((or (string= s "extern")
+			 (string= s "export"))
+		     'public)
+		    ((string= s "static")
+		     'private))))
+	(setq mods (cdr mods))))
+    ;; If we have a typed parent, look for :public style labels.
+    (when (and parent (eq (semantic-tag-class parent) 'type))
+      (let ((pp (semantic-tag-type-members parent)))
+	(while (and pp (not (semantic-equivalent-tag-p (car pp) tag)))
+	  (when (eq (semantic-tag-class (car pp)) 'label)
+	    (setq prot
+		  (cond ((string= (semantic-tag-name (car pp)) "public")
+			 'public)
+			((string= (semantic-tag-name (car pp)) "private")
+			 'private)
+			((string= (semantic-tag-name (car pp)) "protected")
+			 'protected)))
+	    )
+	  (setq pp (cdr pp)))))
+    (when (and (not prot) (eq (semantic-tag-class parent) 'type))
+      (setq prot
+	    (cond ((string= (semantic-tag-type parent) "class") 'private)
+		  ((string= (semantic-tag-type parent) "struct") 'public)
+		  (t 'unknown))))
+    (or prot
+	(if (and parent (semantic-tag-of-class-p parent 'type))
+	    'public
+	  nil))))
+
+(define-mode-local-override semantic-tag-components c-mode (tag)
+  "Return components for TAG."
+  (if (and (eq (semantic-tag-class tag) 'type)
+	   (string= (semantic-tag-type tag) "typedef"))
+      ;; A typedef can contain a parent who has positional children,
+      ;; but that parent will not have a position.  Do this funny hack
+      ;; to make sure we can apply overlays properly.
+      (let ((sc (semantic-tag-get-attribute tag :typedef)))
+	(when (semantic-tag-p sc) (semantic-tag-components sc)))
+    (semantic-tag-components-default tag)))
+
+(defun semantic-c-tag-template (tag)
+  "Return the template specification for TAG, or nil."
+  (semantic-tag-get-attribute tag :template))
+
+(defun semantic-c-tag-template-specifier (tag)
+  "Return the template specifier specification for TAG, or nil."
+  (semantic-tag-get-attribute tag :template-specifier))
+
+(defun semantic-c-template-string-body (templatespec)
+  "Convert TEMPLATESPEC into a string.
+This might be a string, or a list of tokens."
+  (cond ((stringp templatespec)
+	 templatespec)
+	((semantic-tag-p templatespec)
+	 (semantic-format-tag-abbreviate templatespec))
+	((listp templatespec)
+	 (mapconcat 'semantic-format-tag-abbreviate templatespec ", "))))
+
+(defun semantic-c-template-string (token &optional parent color)
+  "Return a string representing the TEMPLATE attribute of TOKEN.
+This string is prefixed with a space, or is the empty string.
+Argument PARENT specifies a parent type.
+Argument COLOR specifies that the string should be colorized."
+  (let ((t2 (semantic-c-tag-template-specifier token))
+	(t1 (semantic-c-tag-template token))
+	;; @todo - Need to account for a parent that is a template
+	(pt1 (if parent (semantic-c-tag-template parent)))
+	(pt2 (if parent (semantic-c-tag-template-specifier parent)))
+	)
+    (cond (t2 ;; we have a template with specifier
+	   (concat " <"
+		   ;; Fill in the parts here
+		   (semantic-c-template-string-body t2)
+		   ">"))
+	  (t1 ;; we have a template without specifier
+	   " <>")
+	  (t
+	   ""))))
+
+(define-mode-local-override semantic-format-tag-concise-prototype
+  c-mode (token &optional parent color)
+  "Return an abbreviated string describing TOKEN for C and C++.
+Optional PARENT and COLOR as specified with
+`semantic-format-tag-abbreviate-default'."
+  ;; If we have special template things, append.
+  (concat  (semantic-format-tag-concise-prototype-default token parent color)
+	   (semantic-c-template-string token parent color)))
+
+(define-mode-local-override semantic-format-tag-uml-prototype
+  c-mode (token &optional parent color)
+  "Return an uml string describing TOKEN for C and C++.
+Optional PARENT and COLOR as specified with
+`semantic-abbreviate-tag-default'."
+  ;; If we have special template things, append.
+  (concat  (semantic-format-tag-uml-prototype-default token parent color)
+	   (semantic-c-template-string token parent color)))
+
+(define-mode-local-override semantic-tag-abstract-p
+  c-mode (tag &optional parent)
+  "Return non-nil if TAG is considered abstract.
+PARENT is tag's parent.
+In C, a method is abstract if it is `virtual', which is already
+handled.  A class is abstract iff it's destructor is virtual."
+  (cond
+   ((eq (semantic-tag-class tag) 'type)
+    (or (semantic-brute-find-tag-by-attribute :pure-virtual-flag
+					      (semantic-tag-components tag)
+					      )
+	(let* ((ds (semantic-brute-find-tag-by-attribute
+		    :destructor-flag
+		    (semantic-tag-components tag)
+		    ))
+	       (cs (semantic-brute-find-tag-by-attribute
+		    :constructor-flag
+		    (semantic-tag-components tag)
+		    )))
+	  (and ds (member "virtual" (semantic-tag-modifiers (car ds)))
+	       cs (eq 'protected (semantic-tag-protection (car cs) tag))
+	       )
+	  )))
+   ((eq (semantic-tag-class tag) 'function)
+    (or (semantic-tag-get-attribute tag :pure-virtual-flag)
+        (member "virtual" (semantic-tag-modifiers tag))))
+   (t (semantic-tag-abstract-p-default tag parent))))
+
+(defun semantic-c-dereference-typedef (type scope &optional type-declaration)
+  "If TYPE is a typedef, get TYPE's type by name or tag, and return.
+SCOPE is not used, and TYPE-DECLARATION is used only if TYPE is not a typedef."
+  (if (and (eq (semantic-tag-class type) 'type)
+           (string= (semantic-tag-type type) "typedef"))
+      (let ((dt (semantic-tag-get-attribute type :typedef)))
+        (cond ((and (semantic-tag-p dt)
+                    (not (semantic-analyze-tag-prototype-p dt)))
+	       ;; In this case, DT was declared directly.  We need
+	       ;; to clone DT and apply a filename to it.
+	       (let* ((fname (semantic-tag-file-name type))
+		      (def (semantic-tag-copy dt nil fname)))
+		 (list def def)))
+              ((stringp dt) (list dt (semantic-tag dt 'type)))
+              ((consp dt) (list (car dt) dt))))
+
+    (list type type-declaration)))
+
+(defun semantic-c--instantiate-template (tag def-list spec-list)
+  "Replace TAG name according to template specification.
+DEF-LIST is the template information.
+SPEC-LIST is the template specifier of the datatype instantiated."
+  (when (and (car def-list) (car spec-list))
+
+    (when (and (string= (semantic-tag-type (car def-list)) "class")
+               (string= (semantic-tag-name tag) (semantic-tag-name (car def-list))))
+      (semantic-tag-set-name tag (semantic-tag-name (car spec-list))))
+
+    (semantic-c--instantiate-template tag (cdr def-list) (cdr spec-list))))
+
+(defun semantic-c--template-name-1 (spec-list)
+  "return a string used to compute template class name based on SPEC-LIST
+for ref<Foo,Bar> it will return 'Foo,Bar'."
+  (when (car spec-list)
+    (let* ((endpart (semantic-c--template-name-1 (cdr spec-list)))
+	   (separator (and endpart ",")))
+      (concat (semantic-tag-name (car spec-list)) separator endpart))))
+
+(defun semantic-c--template-name (type spec-list)
+  "Return a template class name for TYPE based on SPEC-LIST.
+For a type `ref' with a template specifier of (Foo Bar) it will
+return 'ref<Foo,Bar>'."
+  (concat (semantic-tag-name type)
+	  "<" (semantic-c--template-name-1 (cdr spec-list)) ">"))
+
+(defun semantic-c-dereference-template (type scope &optional type-declaration)
+  "Dereference any template specifieres in TYPE within SCOPE.
+If TYPE is a template, return a TYPE copy with the templates types
+instantiated as specified in TYPE-DECLARATION."
+  (when (semantic-tag-p type-declaration)
+    (let ((def-list  (semantic-tag-get-attribute type :template))
+          (spec-list (semantic-tag-get-attribute type-declaration :template-specifier)))
+      (when (and def-list spec-list)
+        (setq type (semantic-tag-deep-copy-one-tag
+		    type
+		    (lambda (tag)
+		      (when (semantic-tag-of-class-p tag 'type)
+			(semantic-c--instantiate-template
+			 tag def-list spec-list))
+		      tag)
+		    ))
+        (semantic-tag-set-name type (semantic-c--template-name type spec-list))
+        (semantic-tag-put-attribute type :template nil)
+        (semantic-tag-set-faux type))))
+  (list type type-declaration))
+
+;;; Patch here by "Raf" for instantiating templates.
+(defun semantic-c-dereference-member-of (type scope &optional type-declaration)
+  "Dereference through the `->' operator of TYPE.
+Uses the return type of the '->' operator if it is contained in TYPE.
+SCOPE is the current local scope to perform searches in.
+TYPE-DECLARATION is passed through."
+  (if semantic-c-member-of-autocast
+      (let ((operator (car (semantic-find-tags-by-name "->" (semantic-analyze-scoped-type-parts type)))))
+        (if operator
+            (list (semantic-tag-get-attribute operator :type) (semantic-tag-get-attribute operator :type))
+          (list type type-declaration)))
+    (list type type-declaration)))
+
+;; David Engster: The following three functions deal with namespace
+;; aliases and types which are member of a namespace through a using
+;; statement. For examples, see the file semantic/tests/testusing.cpp,
+;; tests 5 and following.
+
+(defun semantic-c-dereference-namespace (type scope &optional type-declaration)
+  "Dereference namespace which might hold an 'alias' for TYPE.
+Such an alias can be created through 'using' statements in a
+namespace declaration. This function checks the namespaces in
+SCOPE for such statements."
+  (let ((scopetypes (oref scope scopetypes))
+	typename currentns tmp usingname result namespaces)
+    (when (and (semantic-tag-p type-declaration)
+	       (or (null type) (semantic-tag-prototype-p type)))
+      (setq typename (semantic-analyze-split-name (semantic-tag-name type-declaration)))
+      ;; If we already have that TYPE in SCOPE, we do nothing
+      (unless (semantic-deep-find-tags-by-name (or (car-safe typename) typename) scopetypes)
+	(if (stringp typename)
+	    ;; The type isn't fully qualified, so we have to search in all namespaces in SCOPE.
+	    (setq namespaces (semantic-find-tags-by-type "namespace" scopetypes))
+	  ;; This is a fully qualified name, so we only have to search one namespace.
+	  (setq namespaces (semanticdb-typecache-find (car typename)))
+	  ;; Make sure it's really a namespace.
+	  (if (string= (semantic-tag-type namespaces) "namespace")
+	      (setq namespaces (list namespaces))
+	    (setq namespaces nil)))
+	(setq result nil)
+	;; Iterate over all the namespaces we have to check.
+	(while (and namespaces
+		    (null result))
+	  (setq currentns (car namespaces))
+	  ;; Check if this is namespace is an alias and dereference it if necessary.
+	  (setq result (semantic-c-dereference-namespace-alias type-declaration currentns))
+	  (unless result
+	    ;; Otherwise, check if we can reach the type through 'using' statements.
+	    (setq result
+		  (semantic-c-check-type-namespace-using type-declaration currentns)))
+	  (setq namespaces (cdr namespaces)))))
+    (if result
+	;; we have found the original type
+	(list result result)
+      (list type type-declaration))))
+
+(defun semantic-c-dereference-namespace-alias (type namespace)
+  "Dereference TYPE in NAMESPACE, given that NAMESPACE is an alias.
+Checks if NAMESPACE is an alias and if so, returns a new type
+with a fully qualified name in the original namespace.  Returns
+nil if NAMESPACE is not an alias."
+  (when (eq (semantic-tag-get-attribute namespace :kind) 'alias)
+    (let ((typename (semantic-analyze-split-name (semantic-tag-name type)))
+	  ns nstype originaltype newtype)
+      ;; Make typename unqualified
+      (if (listp typename)
+	  (setq typename (last typename))
+	(setq typename (list typename)))
+      (when
+	  (and
+	   ;; Get original namespace and make sure TYPE exists there.
+	   (setq ns (semantic-tag-name
+		     (car (semantic-tag-get-attribute namespace :members))))
+	   (setq nstype (semanticdb-typecache-find ns))
+	   (setq originaltype (semantic-find-tags-by-name
+			       (car typename)
+			       (semantic-tag-get-attribute nstype :members))))
+	;; Construct new type with name in original namespace.
+	(setq ns (semantic-analyze-split-name ns))
+	(setq newtype
+	      (semantic-tag-clone
+	       (car originaltype)
+	       (semantic-analyze-unsplit-name
+		(if (listp ns)
+		    (append ns typename)
+		  (append (list ns) typename)))))))))
+
+;; This searches a type in a namespace, following through all using
+;; statements.
+(defun semantic-c-check-type-namespace-using (type namespace)
+  "Check if TYPE is accessible in NAMESPACE through a using statement.
+Returns the original type from the namespace where it is defined,
+or nil if it cannot be found."
+  (let (usings result usingname usingtype unqualifiedname members shortname tmp)
+    ;; Get all using statements from NAMESPACE.
+    (when (and (setq usings (semantic-tag-get-attribute namespace :members))
+	       (setq usings (semantic-find-tags-by-class 'using usings)))
+      ;; Get unqualified typename.
+      (when (listp (setq unqualifiedname (semantic-analyze-split-name
+					  (semantic-tag-name type))))
+	(setq unqualifiedname (car (last unqualifiedname))))
+      ;; Iterate over all using statements in NAMESPACE.
+      (while (and usings
+		  (null result))
+	(setq usingname (semantic-analyze-split-name
+			 (semantic-tag-name (car usings)))
+	      usingtype (semantic-tag-type (semantic-tag-type (car usings))))
+	(cond
+	 ((or (string= usingtype "namespace")
+	      (stringp usingname))
+	  ;; We are dealing with a 'using [namespace] NAMESPACE;'
+	  ;; Search for TYPE in that namespace
+	  (setq result
+		(semanticdb-typecache-find usingname))
+	  (if (and result
+		   (setq members (semantic-tag-get-attribute result :members))
+		   (setq members (semantic-find-tags-by-name unqualifiedname members)))
+	      ;; TYPE is member of that namespace, so we are finished
+	      (setq result (car members))
+	    ;; otherwise recursively search in that namespace for an alias
+	    (setq result (semantic-c-check-type-namespace-using type result))
+	    (when result
+	      (setq result (semantic-tag-type result)))))
+	 ((and (string= usingtype "class")
+	       (listp usingname))
+	  ;; We are dealing with a 'using TYPE;'
+	  (when (string= unqualifiedname (car (last usingname)))
+	    ;; We have found the correct tag.
+	    (setq result (semantic-tag-type (car usings))))))
+	(setq usings (cdr usings))))
+    result))
+
+
+(define-mode-local-override semantic-analyze-dereference-metatype
+  c-mode (type scope &optional type-declaration)
+  "Dereference TYPE as described in `semantic-analyze-dereference-metatype'.
+Handle typedef, template instantiation, and '->' operator."
+  (let* ((dereferencer-list '(semantic-c-dereference-typedef
+                              semantic-c-dereference-template
+                              semantic-c-dereference-member-of
+			      semantic-c-dereference-namespace))
+         (dereferencer (pop dereferencer-list))
+         (type-tuple)
+         (original-type type))
+    (while dereferencer
+      (setq type-tuple (funcall dereferencer type scope type-declaration)
+            type (car type-tuple)
+            type-declaration (cadr type-tuple))
+      (if (not (eq type original-type))
+          ;; we found a new type so break the dereferencer loop now !
+          ;; (we will be recalled with the new type expanded by
+          ;; semantic-analyze-dereference-metatype-stack).
+          (setq dereferencer nil)
+        ;; no new type found try the next dereferencer :
+        (setq dereferencer (pop dereferencer-list)))))
+    (list type type-declaration))
+
+(define-mode-local-override semantic-analyze-type-constants c-mode (type)
+  "When TYPE is a tag for an enum, return it's parts.
+These are constants which are of type TYPE."
+  (if (and (eq (semantic-tag-class type) 'type)
+	   (string= (semantic-tag-type type) "enum"))
+      (semantic-tag-type-members type)))
+
+(define-mode-local-override semantic-analyze-split-name c-mode (name)
+  "Split up tag names on colon (:) boundaries."
+  (let ((ans (split-string name ":")))
+    (if (= (length ans) 1)
+	name
+      (delete "" ans))))
+
+(define-mode-local-override semantic-analyze-unsplit-name c-mode (namelist)
+  "Assemble the list of names NAMELIST into a namespace name."
+  (mapconcat 'identity namelist "::"))
+
+(define-mode-local-override semantic-ctxt-scoped-types c++-mode (&optional point)
+  "Return a list of tags of CLASS type based on POINT.
+DO NOT return the list of tags encompassing point."
+  (when point (goto-char (point)))
+  (let ((tagsaroundpoint (semantic-find-tag-by-overlay))
+	(tagreturn nil)
+	(tmp nil))
+    ;; In C++, we want to find all the namespaces declared
+    ;; locally and add them to the list.
+    (setq tmp (semantic-find-tags-by-class 'type (current-buffer)))
+    (setq tmp (semantic-find-tags-by-type "namespace" tmp))
+    (setq tmp (semantic-find-tags-by-name "unnamed" tmp))
+    (setq tagreturn tmp)
+    ;; We should also find all "using" type statements and
+    ;; accept those entities in as well.
+    (setq tmp (semanticdb-find-tags-by-class 'using))
+    (let ((idx 0)
+	  (len (semanticdb-find-result-length tmp)))
+      (while (< idx len)
+	(setq tagreturn (cons (semantic-tag-type (car (semanticdb-find-result-nth tmp idx))) tagreturn))
+	(setq idx (1+ idx)))
+      )
+    ;; Use the encompased types around point to also look for using statements.
+    ;;(setq tagreturn (cons "bread_name" tagreturn))
+    (while (cdr tagsaroundpoint)  ; don't search the last one
+      (setq tmp (semantic-find-tags-by-class 'using (semantic-tag-components (car tagsaroundpoint))))
+      (dolist (T tmp)
+	(setq tagreturn (cons (semantic-tag-type T) tagreturn))
+	)
+      (setq tagsaroundpoint (cdr tagsaroundpoint))
+      )
+    ;; If in a function...
+    (when (and (semantic-tag-of-class-p (car tagsaroundpoint) 'function)
+	       ;; ...search for using statements in the local scope...
+	       (setq tmp (semantic-find-tags-by-class
+			  'using
+			  (semantic-get-local-variables))))
+      ;; ... and add them.
+      (setq tagreturn
+	    (append tagreturn
+		    (mapcar 'semantic-tag-type tmp))))
+    ;; Return the stuff
+    tagreturn
+    ))
+
+(define-mode-local-override semanticdb-expand-nested-tag c++-mode (tag)
+  "Expand TAG if it has a fully qualified name.
+For types with a :parent, create faux namespaces to put TAG into."
+  (let ((p (semantic-tag-get-attribute tag :parent)))
+    (if (and p (semantic-tag-of-class-p tag 'type))
+	;; Expand the tag
+	(let ((s (semantic-analyze-split-name p))
+	      (newtag (semantic-tag-copy tag nil t)))
+	  ;; Erase the qualified name.
+	  (semantic-tag-put-attribute newtag :parent nil)
+	  ;; Fixup the namespace name
+	  (setq s (if (stringp s) (list s) (nreverse s)))
+	  ;; Loop over all the parents, creating the nested
+	  ;; namespace.
+	  (dolist (namespace s)
+	    (setq newtag (semanticdb-typecache-faux-namespace
+			  namespace (list newtag)))
+	    )
+	  ;; Return the last created namespace.
+	  newtag)
+      ;; Else, return tag unmodified.
+      tag)))
+
+(define-mode-local-override semantic-get-local-variables c++-mode ()
+  "Do what `semantic-get-local-variables' does, plus add `this' if needed."
+  (let* ((origvar (semantic-get-local-variables-default))
+	 (ct (semantic-current-tag))
+	 (p (semantic-tag-function-parent ct)))
+    ;; If we have a function parent, then that implies we can
+    (if (and p (semantic-tag-of-class-p ct 'function))
+	;; Append a new tag THIS into our space.
+	(cons (semantic-tag-new-variable "this" p nil)
+	      origvar)
+      ;; No parent, just return the usual
+      origvar)
+    ))
+
+(define-mode-local-override semantic-idle-summary-current-symbol-info
+  c-mode ()
+  "Handle the SPP keywords, then use the default mechanism."
+  (let* ((sym (car (semantic-ctxt-current-thing)))
+	 (spp-sym (semantic-lex-spp-symbol sym)))
+    (if spp-sym
+	(let* ((txt (concat "Macro: " sym))
+	       (sv  (symbol-value spp-sym))
+	       (arg (semantic-lex-spp-macro-with-args sv))
+	       )
+	  (when arg
+	    (setq txt (concat txt (format "%S" arg)))
+	    (setq sv (cdr sv)))
+
+	  ;; This is optional, and potentially fraught w/ errors.
+	  (condition-case nil
+	      (dolist (lt sv)
+		(setq txt (concat txt " " (semantic-lex-token-text lt))))
+	    (error (setq txt (concat txt "  #error in summary fcn"))))
+
+	  txt)
+      (semantic-idle-summary-current-symbol-info-default))))
+
+(defvar-mode-local c-mode semantic-orphaned-member-metaparent-type "struct"
+  "When lost memberes are found in the class hierarchy generator, use a struct.")
+
+(defvar-mode-local c-mode semantic-symbol->name-assoc-list
+  '((type     . "Types")
+    (variable . "Variables")
+    (function . "Functions")
+    (include  . "Includes")
+    )
+  "List of tag classes, and strings to describe them.")
+
+(defvar-mode-local c-mode semantic-symbol->name-assoc-list-for-type-parts
+  '((type     . "Types")
+    (variable . "Attributes")
+    (function . "Methods")
+    (label    . "Labels")
+    )
+  "List of tag classes in a datatype decl, and strings to describe them.")
+
+(defvar-mode-local c-mode imenu-create-index-function 'semantic-create-imenu-index
+  "Imenu index function for C.")
+
+(defvar-mode-local c-mode semantic-type-relation-separator-character
+  '("." "->" "::")
+  "Separator characters between something of a given type, and a field.")
+
+(defvar-mode-local c-mode semantic-command-separation-character ";"
+  "Commen separation character for C")
+
+(defvar-mode-local c-mode senator-step-at-tag-classes '(function variable)
+  "Tag classes where senator will stop at the end.")
+
+;;;###autoload
+(defun semantic-default-c-setup ()
+  "Set up a buffer for semantic parsing of the C language."
+  (semantic-c-by--install-parser)
+  (setq semantic-lex-syntax-modifications '((?> ".")
+                                            (?< ".")
+                                            )
+        )
+
+  (setq semantic-lex-analyzer #'semantic-c-lexer)
+  (add-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook nil t)
+  )
+
+;;;###autoload
+(defun semantic-c-add-preprocessor-symbol (sym replacement)
+  "Add a preprocessor symbol SYM with a REPLACEMENT value."
+  (interactive "sSymbol: \nsReplacement: ")
+  (let ((SA (assoc sym semantic-lex-c-preprocessor-symbol-map)))
+    (if SA
+	;; Replace if there is one.
+	(setcdr SA replacement)
+      ;; Otherwise, append
+      (setq semantic-lex-c-preprocessor-symbol-map
+	    (cons  (cons sym replacement)
+		   semantic-lex-c-preprocessor-symbol-map))))
+
+  (semantic-c-reset-preprocessor-symbol-map)
+  )
+
+;;;###autoload
+(add-hook 'c-mode-hook 'semantic-default-c-setup)
+;;;###autoload
+(add-hook 'c++-mode-hook 'semantic-default-c-setup)
+
+;;; SETUP QUERY
+;;
+(defun semantic-c-describe-environment ()
+  "Describe the Semantic features of the current C environment."
+  (interactive)
+  (if (not (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode)))
+      (error "Not useful to query C mode in %s mode" major-mode))
+  (let ((gcc (when (boundp 'semantic-gcc-setup-data)
+	       semantic-gcc-setup-data))
+	)
+    (semantic-fetch-tags)
+
+    (with-output-to-temp-buffer "*Semantic C Environment*"
+      (when gcc
+	(princ "Calculated GCC Parameters:")
+	(dolist (P gcc)
+	  (princ "\n  ")
+	  (princ (car P))
+	  (princ " = ")
+	  (princ (cdr P))
+	  )
+	)
+
+      (princ "\n\nInclude Path Summary:\n")
+      (when ede-object
+	(princ "\n  This file's project include is handled by:\n")
+	(princ "   ")
+	(princ (object-print ede-object))
+	(princ "\n  with the system path:\n")
+	(dolist (dir (ede-system-include-path ede-object))
+	  (princ "    ")
+	  (princ dir)
+	  (princ "\n"))
+	)
+
+      (when semantic-dependency-include-path
+	(princ "\n  This file's generic include path is:\n")
+	(dolist (dir semantic-dependency-include-path)
+	  (princ "    ")
+	  (princ dir)
+	  (princ "\n")))
+
+      (when semantic-dependency-system-include-path
+	(princ "\n  This file's system include path is:\n")
+	(dolist (dir semantic-dependency-system-include-path)
+	  (princ "    ")
+	  (princ dir)
+	  (princ "\n")))
+
+      (princ "\n\nMacro Summary:\n")
+      (when semantic-lex-c-preprocessor-symbol-file
+	(princ "\n  Your CPP table is primed from these files:\n")
+	(dolist (file semantic-lex-c-preprocessor-symbol-file)
+	  (princ "    ")
+	  (princ file)
+	  (princ "\n")
+	  (princ "    in table: ")
+	  (princ (object-print (semanticdb-file-table-object file)))
+	  (princ "\n")
+	  ))
+
+      (when semantic-lex-c-preprocessor-symbol-map-builtin
+	(princ "\n  Built-in symbol map:\n")
+	(dolist (S semantic-lex-c-preprocessor-symbol-map-builtin)
+	  (princ "    ")
+	  (princ (car S))
+	  (princ " = ")
+	  (princ (cdr S))
+	  (princ "\n")
+	  ))
+
+      (when semantic-lex-c-preprocessor-symbol-map
+	(princ "\n  User symbol map:\n")
+	(dolist (S semantic-lex-c-preprocessor-symbol-map)
+	  (princ "    ")
+	  (princ (car S))
+	  (princ " = ")
+	  (princ (cdr S))
+	  (princ "\n")
+	  ))
+
+      (when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
+	(princ "\n  Project symbol map:\n")
+	(princ "      Your project symbol map is derived from the EDE object:\n      ")
+	(princ (object-print ede-object))
+	(princ "\n\n")
+	(let ((macros nil))
+	  (mapatoms
+	   #'(lambda (symbol)
+	       (setq macros (cons symbol macros)))
+	   semantic-lex-spp-project-macro-symbol-obarray)
+	  (dolist (S macros)
+	    (princ "    ")
+	    (princ (symbol-name S))
+	    (princ " = ")
+	    (princ (symbol-value S))
+	    (princ "\n")
+	    )))
+
+      (princ "\n\n  Use: M-x semantic-lex-spp-describe RET\n")
+      (princ "\n  to see the complete macro table.\n")
+
+      )))
+
+(provide 'semantic-c)
+
+(semantic-c-reset-preprocessor-symbol-map)
+
+;;; semantic-c.el ends here
+
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-el.el b/site/cedet-1.0pre7/semantic/bovine/semantic-el.el
new file mode 100755
index 0000000..e39b1d1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-el.el
@@ -0,0 +1,970 @@
+;;; semantic-el.el --- Semantic details for Emacs Lisp
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-el.el,v 1.53 2009/09/11 18:54:32 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic-ex is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Use the Semantic Bovinator for Emacs Lisp
+
+(require 'semantic)
+(require 'semantic-bovine)
+(require 'backquote)
+(require 'find-func)
+(eval-when-compile
+  (require 'semantic-imenu)
+  )
+
+;;; Code:
+
+;;; Lexer
+;;
+(define-lex semantic-emacs-lisp-lexer
+  "A simple lexical analyzer for Emacs Lisp.
+This lexer ignores comments and whitespace, and will return
+syntax as specified by the syntax table."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-number
+  semantic-lex-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-string
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+;;; Parser
+;;
+(defvar semantic--elisp-parse-table
+  `((bovine-toplevel
+     (semantic-list
+      ,(lambda (vals start end)
+         (let ((tag (semantic-elisp-use-read (car vals))))
+	   (cond
+	    ((and (listp tag) (semantic-tag-p (car tag)))
+	     ;; We got a list of tags back.  This list is
+	     ;; returned here in the correct order, but this
+	     ;; list gets reversed later, putting the correctly ordered
+	     ;; items into reverse order later.
+	     (nreverse tag))
+	    ((semantic--tag-expanded-p tag)
+	     ;; At this point, if `semantic-elisp-use-read' returned an
+	     ;; already expanded tag (from definitions parsed inside an
+	     ;; eval and compile wrapper), just pass it!
+	     tag)
+	    (t
+	     ;; We got the basics of a single tag.
+	     (append tag (list start end))))))))
+    )
+  "Top level bovination table for elisp.")
+
+(defun semantic-elisp-desymbolify (arglist)
+  "Convert symbols to strings for ARGLIST."
+  (let ((out nil))
+    (while arglist
+      (setq out
+	    (cons
+	     (if (symbolp (car arglist))
+		 (symbol-name (car arglist))
+	       (if (and (listp (car arglist))
+			(symbolp (car (car arglist))))
+		   (symbol-name (car (car arglist)))
+		 (format "%S" (car arglist))))
+	     out)
+	    arglist (cdr arglist)))
+    (nreverse out)))
+
+(defun semantic-elisp-desymbolify-args (arglist)
+  "Convert symbols to strings for ARGLIST."
+  (let ((in (semantic-elisp-desymbolify arglist))
+	(out nil))
+    (dolist (T in)
+      (when (not (string-match "^&" T))
+	(push T out)))
+    (nreverse out)))
+
+(defun semantic-elisp-clos-slot-property-string (slot property)
+  "For SLOT, a string representing PROPERTY."
+  (let ((p (member property slot)))
+    (if (not p)
+	nil
+      (setq p (cdr p))
+      (cond
+       ((stringp (car p))
+	(car p))
+       ((or (symbolp (car p))
+	    (listp (car p))
+	    (numberp (car p)))
+	(format "%S" (car p)))
+       (t nil)))))
+
+(defun semantic-elisp-clos-args-to-semantic (partlist)
+  "Convert a list of CLOS class slot PARTLIST to `variable' tags."
+  (let (vars part v)
+    (while partlist
+      (setq part (car partlist)
+            partlist (cdr partlist)
+            v (semantic-tag-new-variable
+               (symbol-name (car part))
+               (semantic-elisp-clos-slot-property-string part :type)
+               (semantic-elisp-clos-slot-property-string part :initform)
+               ;; Attributes
+               :protection (semantic-elisp-clos-slot-property-string
+                            part :protection)
+               :static-flag (equal (semantic-elisp-clos-slot-property-string
+                                    part :allocation)
+                                   ":class")
+               :documentation (semantic-elisp-clos-slot-property-string
+                               part :documentation))
+            vars (cons v vars)))
+    (nreverse vars)))
+
+(defun semantic-elisp-form-to-doc-string (form)
+  "After reading a form FORM, covert it to a doc string.
+For Emacs Lisp, sometimes that string is non-existant.
+Sometimes it is a form which is evaluated at compile time, permitting
+compound strings."
+  (cond ((stringp form) form)
+	((and (listp form) (eq (car form) 'concat)
+	      (stringp (nth 1 form)))
+	 (nth 1 form))
+	(t nil)))
+
+(defvar semantic-elisp-store-documentation-in-tag nil
+  "*When non-nil, store documentation strings in the created tags.")
+
+(defun semantic-elisp-do-doc (str)
+  "Return STR as a documentation string IF they are enabled."
+  (when semantic-elisp-store-documentation-in-tag
+    (semantic-elisp-form-to-doc-string str)))
+
+(defmacro semantic-elisp-setup-form-parser (parser &rest symbols)
+  "Install the function PARSER as the form parser for SYMBOLS.
+SYMBOLS is a list of symbols identifying the forms to parse.
+PARSER is called on every forms whose first element (car FORM) is
+found in SYMBOLS.  It is passed the parameters FORM, START, END,
+where:
+
+- FORM is an Elisp form read from the current buffer.
+- START and END are the beginning and end location of the
+  corresponding data in the current buffer."
+  (let ((sym (make-symbol "sym")))
+    `(dolist (,sym ',symbols)
+       (put ,sym 'semantic-elisp-form-parser #',parser))))
+(put 'semantic-elisp-setup-form-parser 'lisp-indent-function 1)
+
+(defmacro semantic-elisp-reuse-form-parser (symbol &rest symbols)
+  "Reuse the form parser of SYMBOL for forms identified by SYMBOLS.
+See also `semantic-elisp-setup-form-parser'."
+  (let ((parser (make-symbol "parser"))
+        (sym (make-symbol "sym")))
+    `(let ((,parser (get ',symbol 'semantic-elisp-form-parser)))
+       (or ,parser
+           (signal 'wrong-type-argument
+                   '(semantic-elisp-form-parser ,symbol)))
+       (dolist (,sym ',symbols)
+         (put ,sym 'semantic-elisp-form-parser ,parser)))))
+
+(defun semantic-elisp-use-read (sl)
+  "Use `read' on the semantic list SL.
+Return a bovination list to use."
+  (let* ((start (car sl))
+         (end   (cdr sl))
+         (form  (read (buffer-substring-no-properties start end))))
+    (cond
+     ;; If the first elt is a list, then it is some arbitrary code.
+     ((listp (car form))
+      (semantic-tag-new-code "anonymous" nil)
+      )
+     ;; A special form parser is provided, use it.
+     ((and (car form) (symbolp (car form))
+           (get (car form) 'semantic-elisp-form-parser))
+      (funcall (get (car form) 'semantic-elisp-form-parser)
+               form start end))
+     ;; Produce a generic code tag by default.
+     (t
+      (semantic-tag-new-code (format "%S" (car form)) nil)
+      ))))
+
+;;; Form parsers
+;;
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-function
+       (symbol-name (nth 2 form))
+       nil
+       '("form" "start" "end")
+       :form-parser t
+       ))
+  semantic-elisp-setup-form-parser)
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((tags
+             (condition-case foo
+                 (semantic-parse-region start end nil 1)
+               (error (message "MUNGE: %S" foo)
+                      nil))))
+        (if (semantic-tag-p (car-safe tags))
+            tags
+          (semantic-tag-new-code (format "%S" (car form)) nil))))
+  eval-and-compile
+  eval-when-compile
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-function
+       (symbol-name (nth 1 form))
+       nil
+       (semantic-elisp-desymbolify-args (nth 2 form))
+       :user-visible-flag (eq (car-safe (nth 4 form)) 'interactive)
+       :documentation (semantic-elisp-do-doc (nth 3 form))
+       :overloadable (or (eq (car form) 'define-overload)
+			 (eq (car form) 'define-overloadable-function))
+       ))
+  defun
+  defun*
+  defsubst
+  defmacro
+  define-overload ;; @todo - remove after cleaning up semantic.
+  define-overloadable-function
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((doc (semantic-elisp-form-to-doc-string (nth 3 form))))
+        (semantic-tag-new-variable
+         (symbol-name (nth 1 form))
+         nil
+         (nth 2 form)
+         :user-visible-flag (and doc
+                                 (> (length doc) 0)
+                                 (= (aref doc 0) ?*))
+         :constant-flag (eq (car form) 'defconst)
+         :documentation (semantic-elisp-do-doc doc)
+         )))
+  defvar
+  defconst
+  defcustom
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((doc (semantic-elisp-form-to-doc-string (nth 3 form))))
+        (semantic-tag-new-variable
+         (symbol-name (nth 1 form))
+         "face"
+         (nth 2 form)
+         :user-visible-flag (and doc
+                                 (> (length doc) 0)
+                                 (= (aref doc 0) ?*))
+         :documentation (semantic-elisp-do-doc doc)
+         )))
+  defface
+  )
+
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((doc (semantic-elisp-form-to-doc-string (nth 3 form))))
+        (semantic-tag-new-variable
+         (symbol-name (nth 1 form))
+         "image"
+         (nth 2 form)
+         :user-visible-flag (and doc
+                                 (> (length doc) 0)
+                                 (= (aref doc 0) ?*))
+         :documentation (semantic-elisp-do-doc doc)
+         )))
+  defimage
+  defezimage
+  )
+
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((doc (semantic-elisp-form-to-doc-string (nth 3 form))))
+        (semantic-tag
+         (symbol-name (nth 1 form))
+         'customgroup
+         :value (nth 2 form)
+         :user-visible-flag t
+         :documentation (semantic-elisp-do-doc doc)
+         )))
+  defgroup
+  )
+
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-function
+       (symbol-name (cadr (cadr form)))
+       nil nil
+       :user-visible-flag (and (nth 4 form)
+                               (not (eq (nth 4 form) 'nil)))
+       :prototype-flag t
+       :documentation (semantic-elisp-do-doc (nth 3 form))))
+  autoload
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let* ((a2 (nth 2 form))
+             (a3 (nth 3 form))
+             (args (if (listp a2) a2 a3))
+             (doc (nth (if (listp a2) 3 4) form)))
+        (semantic-tag-new-function
+         (symbol-name (nth 1 form))
+         nil
+         (if (listp (car args))
+             (cons (symbol-name (caar args))
+                   (semantic-elisp-desymbolify-args (cdr args)))
+           (semantic-elisp-desymbolify-args (cdr args)))
+         :parent (if (listp (car args)) (symbol-name (cadr (car args))) nil)
+         :documentation (semantic-elisp-do-doc doc)
+         )))
+  defmethod
+  defgeneric
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-function
+       (symbol-name (nth 1 form))
+       nil
+       (semantic-elisp-desymbolify (nth 2 form))
+       ))
+  defadvice
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((docpart (nthcdr 4 form)))
+	(semantic-tag-new-type
+	 (symbol-name (nth 1 form))
+         "class"
+	 (semantic-elisp-clos-args-to-semantic (nth 3 form))
+	 (semantic-elisp-desymbolify (nth 2 form))
+	 :typemodifiers (semantic-elisp-desymbolify
+			 (unless (stringp (car docpart)) docpart))
+	 :documentation (semantic-elisp-do-doc
+                         (if (stringp (car docpart))
+                             (car docpart)
+                           (cadr (member :documentation docpart))))
+	 )))
+  defclass
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((slots (nthcdr 2 form)))
+        ;; Skip doc string if present.
+        (and (stringp (car slots))
+             (setq slots (cdr slots)))
+        (semantic-tag-new-type
+         (symbol-name (if (consp (nth 1 form))
+                          (car (nth 1 form))
+                        (nth 1 form)))
+         "struct"
+         (semantic-elisp-desymbolify slots)
+         (cons nil nil)
+         )))
+  defstruct
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-function
+       (symbol-name (nth 1 form))
+       nil nil
+       :lexical-analyzer-flag t
+       :documentation (semantic-elisp-do-doc (nth 2 form))
+       ))
+  define-lex
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((args (nth 3 form)))
+	(semantic-tag-new-function
+	 (symbol-name (nth 1 form))
+         nil
+	 (and (listp args) (semantic-elisp-desymbolify args))
+	 :override-function-flag t
+	 :parent (symbol-name (nth 2 form))
+	 :documentation (semantic-elisp-do-doc (nth 4 form))
+	 )))
+  define-mode-overload-implementation ;; obsoleted
+  define-mode-local-override
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (semantic-tag-new-variable
+       (symbol-name (nth 2 form))
+       nil
+       (nth 3 form)                     ; default value
+       :override-variable-flag t
+       :parent (symbol-name (nth 1 form))
+       :documentation (semantic-elisp-do-doc (nth 4 form))
+       ))
+  defvar-mode-local
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((name (nth 1 form)))
+        (semantic-tag-new-include
+         (symbol-name (if (eq (car-safe name) 'quote)
+                          (nth 1 name)
+                        name))
+         nil
+         :directory (nth 2 form))))
+  require
+  )
+
+(semantic-elisp-setup-form-parser
+    (lambda (form start end)
+      (let ((name (nth 1 form)))
+        (semantic-tag-new-package
+         (symbol-name (if (eq (car-safe name) 'quote)
+                          (nth 1 name)
+                        name))
+         (nth 3 form))))
+  provide
+  )
+
+;;; Mode setup
+;;
+(define-mode-local-override semantic-dependency-tag-file
+  emacs-lisp-mode (tag)
+  "Find the file BUFFER depends on described by TAG."
+  (if (fboundp 'find-library-name)
+      (condition-case nil
+	  ;; Try an Emacs 22 fcn.  This throws errors.
+	  (find-library-name (semantic-tag-name tag))
+	(error
+	 (message "semantic: connot find source file %s"
+		  (semantic-tag-name tag))))
+    ;; No handy function available.  (Older Emacsen)
+    (let* ((lib (locate-library (semantic-tag-name tag)))
+	   (name (if lib (file-name-sans-extension lib) nil))
+	   (nameel (concat name ".el")))
+      (cond
+       ((and name (file-exists-p nameel)) nameel)
+       ((and name (file-exists-p (concat name ".el.gz")))
+	;; This is the linux distro case.
+	(concat name ".el.gz"))
+       ;; source file does not exists
+       (name
+	(message "semantic: cannot find source file %s" (concat name ".el")))
+       (t
+	nil)))))
+
+;;; DOC Strings
+;;
+(defun semantic-emacs-lisp-overridable-doc (tag)
+  "Return the documentation string generated for overloadable functions.
+Fetch the item for TAG.  Only returns info about what symbols can be
+used to perform the override."
+  (if (and (eq (semantic-tag-class tag) 'function)
+	   (semantic-tag-get-attribute tag :overloadable))
+      ;; Calc the doc to use for the overloadable symbols.
+      (overload-docstring-extension (intern (semantic-tag-name tag)))
+    ""))
+
+(defun semantic-emacs-lisp-obsoleted-doc (tag)
+  "Indicate that TAG is a new name that has obsoleted  some old name.
+Unfortunately, this requires that the tag in question has been loaded
+into Emacs Lisp's memory."
+  (let ((obsoletethis (intern-soft (semantic-tag-name tag)))
+	(obsoletor nil))
+    ;; This asks if our tag is available in the Emacs name space for querying.
+    (when obsoletethis
+      (mapatoms (lambda (a)
+		  (let ((oi (get a 'byte-obsolete-info)))
+		    (if (and oi (eq (car oi) obsoletethis))
+			(setq obsoletor a)))))
+      (if obsoletor
+	  (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag))
+	""))))
+
+(define-mode-local-override semantic-documentation-for-tag
+  emacs-lisp-mode (tag &optional nosnarf)
+  "Return the documentation string for TAG.
+Optional argument NOSNARF is ignored."
+  (let ((d (semantic-tag-docstring tag)))
+    (when (not d)
+      (cond ((semantic-tag-with-position-p tag)
+	     ;; Doc isn't in the tag itself.  Lets pull it out of the
+	     ;; sources.
+	     (let ((semantic-elisp-store-documentation-in-tag t))
+	       (setq tag (with-current-buffer (semantic-tag-buffer tag)
+			   (goto-char (semantic-tag-start tag))
+			   (semantic-elisp-use-read
+			    ;; concoct a lexical token.
+			    (cons (semantic-tag-start tag)
+				  (semantic-tag-end tag))))
+		     d (semantic-tag-docstring tag))))
+	    ;; The tag may be the result of a system search.
+	    ((intern-soft (semantic-tag-name tag))
+	     (let ((sym (intern-soft (semantic-tag-name tag))))
+	       ;; Query into the global table o stuff.
+	       (cond ((eq (semantic-tag-class tag) 'function)
+		      (setq d (documentation sym)))
+		     (t
+		      (setq d (documentation-property
+			       sym 'variable-documentation)))))
+	     ;; Label it as system doc.. perhaps just for debugging
+	     ;; purposes.
+	     (if d (setq d (concat "Sytem Doc: \n" d)))
+	     ))
+      )
+
+    (when d
+      (concat
+       (substitute-command-keys
+        (if (and (> (length d) 0) (= (aref d 0) ?*))
+            (substring d 1)
+          d))
+       (semantic-emacs-lisp-overridable-doc tag)
+       (semantic-emacs-lisp-obsoleted-doc tag)))))
+
+;;; Tag Features
+;;
+(define-mode-local-override semantic-tag-include-filename emacs-lisp-mode
+  (tag)
+  "Return the name of the tag with .el appended.
+If there is a detail, prepend that directory."
+  (let ((name (semantic-tag-name tag))
+	(detail (semantic-tag-get-attribute tag :directory)))
+    (concat (expand-file-name name detail) ".el")))
+
+(define-mode-local-override semantic-insert-foreign-tag
+  emacs-lisp-mode (tag)
+  "Insert TAG at point.
+Attempts a simple prototype for calling or using TAG."
+  (cond ((semantic-tag-of-class-p tag 'function)
+	 (insert "(" (semantic-tag-name tag) " )")
+	 (forward-char -1))
+	(t
+	 (insert (semantic-tag-name tag)))))
+
+(define-mode-local-override semantic-tag-protection
+  emacs-lisp-mode (tag &optional parent)
+  "Return the protection of TAG in PARENT.
+Override function for `semantic-tag-protection'."
+  (let ((prot (semantic-tag-get-attribute tag :protection)))
+    (cond
+     ;; If a protection is not specified, AND there is a parent
+     ;; data type, then it is public.
+     ((and (not prot) parent) 'public)
+     ((string= prot ":public") 'public)
+     ((string= prot "public") 'public)
+     ((string= prot ":private") 'private)
+     ((string= prot "private") 'private)
+     ((string= prot ":protected") 'protected)
+     ((string= prot "protected") 'protected))))
+
+(define-mode-local-override semantic-tag-static-p
+  emacs-lisp-mode (tag &optional parent)
+  "Return non-nil if TAG is static in PARENT class.
+Overrides `semantic-nonterminal-static'."
+  ;; This can only be true (theoretically) in a class where it is assigned.
+  (semantic-tag-get-attribute tag :static-flag))
+
+;;; Context parsing
+;;
+;; Emacs lisp is very different from C,C++ which most context parsing
+;; functions are written.  Support them here.
+(define-mode-local-override semantic-up-context emacs-lisp-mode
+  (&optional point bounds-type)
+  "Move up one context in an Emacs Lisp function.
+A Context in many languages is a block with it's own local variables.
+In Emacs, we will move up lists and stop when one starts with one of
+the following context specifiers:
+  `let', `let*', `defun', `with-slots'
+Returns non-nil it is not possible to go up a context."
+  (let ((last-up (semantic-up-context-default)))
+  (while
+      (and (not (looking-at
+		 "(\\(let\\*?\\|def\\(un\\|method\\|generic\\|\
+define-mode-overload\\)\
+\\|with-slots\\)"))
+	   (not last-up))
+    (setq last-up (semantic-up-context-default)))
+  last-up))
+
+
+(define-mode-local-override semantic-get-local-variables emacs-lisp-mode
+  (&optional point)
+  "Return a list of local variables for POINT.
+Scan backwards from point at each successive function.  For all occurances
+of `let' or `let*', grab those variable names."
+  (let* ((vars nil)
+	 (fn nil))
+    (save-excursion
+      (while (setq fn (car (semantic-ctxt-current-function-emacs-lisp-mode
+			    (point) (list t))))
+	(cond
+	 ((eq fn t)
+	  nil)
+	 ((member fn '("let" "let*" "with-slots"))
+	  ;; Snarf variables
+	  (up-list -1)
+	  (forward-char 1)
+	  (forward-symbol 1)
+	  (skip-chars-forward "* \t\n")
+	  (let ((varlst (read (buffer-substring-no-properties
+			       (point)
+			       (save-excursion
+				 (forward-sexp 1)
+				 (point))))))
+	    (while varlst
+	      (let* ((oneelt (car varlst))
+		     (name (if (symbolp oneelt)
+			       oneelt
+			     (car oneelt))))
+		(setq vars (cons (semantic-tag-new-variable
+				  (symbol-name name)
+				  nil nil)
+				 vars)))
+	      (setq varlst (cdr varlst)))
+	    ))
+	 ((string= fn "lambda")
+	  ;; Snart args...
+	  (up-list -1)
+	  (forward-char 1)
+	  (forward-word 1)
+	  (skip-chars-forward "* \t\n")
+	  (let ((arglst (read (buffer-substring-no-properties
+			       (point)
+			       (save-excursion
+				 (forward-sexp 1)
+				 (point))))))
+	    (while arglst
+	      (let* ((name (car arglst)))
+		(when (/= ?& (aref (symbol-name name) 0))
+		  (setq vars (cons (semantic-tag-new-variable
+				    (symbol-name name)
+				    nil nil)
+				   vars))))
+	      (setq arglst (cdr arglst)))
+	    ))
+	 )
+	(up-list -1)))
+    (nreverse vars)))
+
+(define-mode-local-override semantic-end-of-command emacs-lisp-mode
+  ()
+  "Move cursor to the end of the current command.
+In emacs lisp this is easilly defined by parenthisis bounding."
+  (condition-case nil
+      (up-list 1)
+    (error nil)))
+
+(define-mode-local-override semantic-beginning-of-command emacs-lisp-mode
+  ()
+  "Move cursor to the beginning of the current command.
+In emacs lisp this is easilly defined by parenthisis bounding."
+  (condition-case nil
+      (progn
+        (up-list -1)
+        (forward-char 1))
+    (error nil)))
+
+(define-mode-local-override semantic-ctxt-current-symbol emacs-lisp-mode
+  (&optional point)
+  "List the symbol under point."
+  (save-excursion
+    (if point (goto-char point))
+    (require 'thingatpt)
+    (let ((sym (thing-at-point 'symbol)))
+      (if sym (list sym)))
+    ))
+
+(define-mode-local-override semantic-ctxt-current-function emacs-lisp-mode
+  (&optional point same-as-symbol-return)
+  "Return a string which is the current function being called."
+  (save-excursion
+    (if point (goto-char point) (setq point (point)))
+    ;; (semantic-beginning-of-command)
+    (if (condition-case nil
+	    (and (save-excursion
+		   (up-list -2)
+		   (looking-at "(("))
+		 (save-excursion
+		   (up-list -3)
+		   (looking-at "(let")))
+	  (error nil))
+	;; This is really a let statement, not a function.
+	nil
+      (let ((fun (condition-case nil
+		     (save-excursion
+		       (up-list -1)
+		       (forward-char 1)
+		       (buffer-substring-no-properties
+			(point) (progn (forward-sexp 1)
+				       (point))))
+		   (error nil))
+		 ))
+	(when fun
+	  ;; Do not return FUN IFF the cursor is on FUN.
+	  ;; Huh?  Thats because if cursor is on fun, it is
+	  ;; the current symbol, and not the current function.
+	  (if (save-excursion
+		(condition-case nil
+		    (progn (forward-sexp -1)
+			   (and
+			    (looking-at (regexp-quote fun))
+			    (<= point (+ (point) (length fun))))
+			   )
+		  (error t)))
+	      ;; Go up and try again.
+	      same-as-symbol-return
+	    ;; We are ok, so get it.
+	    (list fun))
+	  ))
+      )))
+
+(define-mode-local-override semantic-ctxt-current-assignment emacs-lisp-mode
+  (&optional point)
+  "What is the variable being assigned into at POINT?"
+  (save-excursion
+    (if point (goto-char point))
+    (let ((fn (semantic-ctxt-current-function point))
+	  (point (point)))
+      ;; We should never get lists from here.
+      (if fn (setq fn (car fn)))
+      (cond
+       ;; SETQ
+       ((and fn (or (string= fn "setq") (string= fn "set")))
+	(save-excursion
+	  (condition-case nil
+	      (let ((count 0)
+		    (lastodd nil)
+		    (start nil))
+		(up-list -1)
+		(down-list 1)
+		(forward-sexp 1)
+		;; Skip over sexp until we pass point.
+		(while (< (point) point)
+		  (setq count (1+ count))
+		  (forward-comment 1)
+		  (setq start (point))
+		  (forward-sexp 1)
+		  (if (= (% count 2) 1)
+		      (setq lastodd
+			    (buffer-substring-no-properties start (point))))
+		  )
+		(if lastodd (list lastodd))
+		)
+	    (error nil))))
+       ;; This obscure thing finds let statements.
+       ((condition-case nil
+	    (and
+	     (save-excursion
+	       (up-list -2)
+	       (looking-at "(("))
+	     (save-excursion
+	       (up-list -3)
+	       (looking-at "(let")))
+	  (error nil))
+	(save-excursion
+	  (semantic-beginning-of-command)
+	  ;; Use func finding code, since it is the same format.
+	  (semantic-ctxt-current-symbol)))
+       ;;
+       ;; DEFAULT- nothing
+       (t nil))
+      )))
+
+(define-mode-local-override semantic-ctxt-current-argument emacs-lisp-mode
+  (&optional point)
+  "Return the index into the argument the cursor is in, or nil."
+  (save-excursion
+    (if point (goto-char point))
+    (if (looking-at "\\<\\w")
+	(forward-char 1))
+    (let ((count 0))
+      (while (condition-case nil
+		 (progn
+		   (forward-sexp -1)
+		   t)
+	       (error nil))
+	(setq count (1+ count)))
+      (cond ((= count 0)
+	     0)
+	    (t (1- count))))
+    ))
+
+(define-mode-local-override semantic-ctxt-current-class-list emacs-lisp-mode
+  (&optional point)
+  "Return a list of tag classes allowed at POINT.
+Emacs Lisp knows much more about the class of the tag needed to perform
+completion than some langauges.  We distincly know if we are to be
+a function name, variable name, or any type of symbol.  We could identify
+fields and such to, but that is for some other day."
+  (save-excursion
+    (if point (goto-char point))
+    (setq point (point))
+    (condition-case nil
+	(let ((count 0))
+	  (up-list -1)
+	  (forward-char 1)
+	  (while (< (point) point)
+	    (setq count (1+ count))
+	    (forward-sexp 1))
+	  (if (= count 1)
+	      '(function)
+	    '(variable))
+	  )
+      (error '(variable)))
+    ))
+
+;;; Formatting
+;;
+(define-mode-local-override semantic-format-tag-abbreviate emacs-lisp-mode
+  (tag &optional parent color)
+  "Return an abbreviated string describing tag."
+  (let ((class (semantic-tag-class tag))
+	(name (semantic-format-tag-name tag parent color))
+	)
+    (cond
+     ((eq class 'function)
+      (concat "(" name ")"))
+     (t
+      (semantic-format-tag-abbreviate-default tag parent color)))))
+
+(define-mode-local-override semantic-format-tag-prototype emacs-lisp-mode
+  (tag &optional parent color)
+  "Return a prototype string describing tag.
+In Emacs Lisp, a prototype for something may start (autoload ...).
+This is certainly not expected if this is used to display a summary.
+Make up something else.  When we go to write something that needs
+a real Emacs Lisp protype, we can fix it then."
+  (let ((class (semantic-tag-class tag))
+	(name (semantic-format-tag-name tag parent color))
+	)
+    (cond
+     ((eq class 'function)
+      (let* ((args  (semantic-tag-function-arguments tag))
+	     (argstr (semantic--format-tag-arguments args
+						     #'identity
+						     color)))
+	(concat "(" name (if args " " "")
+		argstr
+		")")))
+     (t
+      (semantic-format-tag-prototype-default tag parent color)))))
+
+(define-mode-local-override semantic-format-tag-concise-prototype emacs-lisp-mode
+  (tag &optional parent color)
+  "Return a concise prototype string describing tag.
+See `semantic-format-tag-prototype' for Emacs Lisp for more details."
+  (semantic-format-tag-prototype tag parent color))
+
+(define-mode-local-override semantic-format-tag-uml-prototype emacs-lisp-mode
+  (tag &optional parent color)
+  "Return a uml prototype string describing tag.
+See `semantic-format-tag-prototype' for Emacs Lisp for more details."
+  (semantic-format-tag-prototype tag parent color))
+
+;;; IA Commands
+;;
+(define-mode-local-override semantic-ia-insert-tag
+  emacs-lisp-mode (tag)
+  "Insert TAG into the current buffer based on completion."
+  ;; This function by David <de_bb@...> is a tweaked version of the original.
+  (insert (semantic-tag-name tag))
+  (let ((tt (semantic-tag-class tag))
+	(args (semantic-tag-function-arguments tag)))
+    (cond ((eq tt 'function)
+	   (if args
+	       (insert " ")
+	     (insert ")")))
+	  (t nil))))
+
+;;; Lexical features and setup
+;;
+(defvar-mode-local emacs-lisp-mode semantic-lex-analyzer
+  'semantic-emacs-lisp-lexer)
+
+(defvar-mode-local emacs-lisp-mode semantic--parse-table
+  semantic--elisp-parse-table)
+
+(defvar-mode-local emacs-lisp-mode semantic-function-argument-separator
+  " ")
+
+(defvar-mode-local emacs-lisp-mode semantic-function-argument-separation-character
+  " ")
+
+(defvar-mode-local emacs-lisp-mode semantic-symbol->name-assoc-list
+  '(
+    (type     . "Types")
+    (variable . "Variables")
+    (function . "Defuns")
+    (include  . "Requires")
+    (package  . "Provides")
+    ))
+
+(defvar-mode-local emacs-lisp-mode imenu-create-index-function
+  'semantic-create-imenu-index)
+
+(defvar-mode-local emacs-lisp-mode semantic-stickyfunc-sticky-classes
+  '(function type variable)
+  "Add variables.
+ELisp variables can be pretty long, so track this one too.")
+
+(define-child-mode lisp-mode emacs-lisp-mode
+  "Make `lisp-mode' inherits mode local behavior from `emacs-lisp-mode'.")
+
+;;;###autoload
+(defun semantic-default-elisp-setup ()
+  "Setup hook function for Emacs Lisp files and Semantic."
+  )
+
+;;;###autoload
+(add-hook 'emacs-lisp-mode-hook 'semantic-default-elisp-setup)
+
+;;; LISP MODE
+;;
+;; @TODO: Lisp supports syntaxes that Emacs Lisp does not.
+;;        Write a Lisp only parser someday.
+;;
+;; See this syntax:
+;; (defun foo () /#A)
+;;
+;;;###autoload
+(add-hook 'lisp-mode-hook 'semantic-default-elisp-setup)
+
+;;;###autoload
+(eval-after-load "semanticdb"
+  '(require 'semanticdb-el)
+  )
+
+(provide 'semantic-el)
+
+;;; semantic-el.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-erlang-by.el b/site/cedet-1.0pre7/semantic/bovine/semantic-erlang-by.el
new file mode 100644
index 0000000..84b24ed
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-erlang-by.el
@@ -0,0 +1,1824 @@
+;;; semantic-erlang-by.el --- Generated parser support file
+
+;; Copyright (C) 2002, 2003 Vladimir G. Sekissov
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:52-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file erlang.by.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst semantic-erlang-by--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("begin" . BEGIN)
+     ("end" . END)
+     ("case" . CASE)
+     ("of" . OF)
+     ("if" . IF)
+     ("when" . WHEN)
+     ("true" . TRUE)
+     ("receive" . RECEIVE)
+     ("after" . AFTER)
+     ("or" . OR)
+     ("orelse" . ORELSE)
+     ("xor" . XOR)
+     ("bor" . BOR)
+     ("bxor" . BXOR)
+     ("bsl" . BSL)
+     ("bsr" . BSR)
+     ("div" . DIV)
+     ("rem" . REM)
+     ("band" . BAND)
+     ("and" . AND)
+     ("andalso" . ANDALSO)
+     ("bnot" . BNOT)
+     ("not" . NOT)
+     ("catch" . CATCH)
+     ("fun" . FUN)
+     ("query" . QUERY)
+     ("let" . LET)
+     ("module" . MODULE)
+     ("include" . INCLUDE)
+     ("include_lib" . INCLUDE_LIB)
+     ("behaviour" . BEHAVIOUR)
+     ("define" . DEFINE)
+     ("undef" . UNDEF)
+     ("ifdef" . IFDEF)
+     ("ifndef" . IFNDEF)
+     ("else" . ELSE)
+     ("endif" . ENDIF)
+     ("export" . EXPORT)
+     ("import" . IMPORT)
+     ("record" . RECORD)
+     ("signed" . SIGNED)
+     ("unsigned" . UNSIGNED))
+   'nil)
+  "Table of language keywords.")
+
+(defconst semantic-erlang-by--token-table
+  (semantic-lex-make-type-table
+   '(("close-paren"
+      (RBRACE . "}")
+      (RPAREN . ")"))
+     ("open-paren"
+      (LBRACE . "{")
+      (LPAREN . "("))
+     ("semantic-list"
+      (BRACE_BLCK . "^{")
+      (BRACK_BLCK . "^\\[")
+      (PAREN_BLCK . "^("))
+     ("symbol"
+      (UNIT . "unit")
+      (NATIVE . "native")
+      (LITTLE . "little")
+      (BIG . "big")
+      (BINARY . "binary")
+      (FLOAT . "float")
+      (INTEGER . "integer")
+      (FILE . "file")
+      (USCORE . "_")
+      (VAR2 . "^[A-Z][_a-zA-Z0-9]*")
+      (VAR1 . "^_[a-zA-Z0-9]+")
+      (INT2 . "[0-9]\\{1,2\\}")
+      (INT1 . "[0-9a-eA-E]+")
+      (EE . "[eE]")
+      (DIGITS . "[0-9]+")
+      (ATOM2 . "'.+'")
+      (ATOM1 . "[a-z][a-zA-Z0-9_@]*"))
+     ("punctuation"
+      (SIGN . "[-+]")
+      (VDEL . "\\`[|]\\'")
+      (COMA . "\\`[,]\\'")
+      (GREATER . "\\`[>]\\'")
+      (LESS . "\\`[<]\\'")
+      (EQUAL . "\\`[=]\\'")
+      (WHY . "\\`[?]\\'")
+      (BANG . "\\`[!]\\'")
+      (MINUS . "\\`[-]\\'")
+      (PLUS . "\\`[+]\\'")
+      (DIVIDE . "\\`[/]\\'")
+      (AMPERSAND . "\\`[&]\\'")
+      (STAR . "\\`[*]\\'")
+      (SEMICOLON . "\\`[;]\\'")
+      (COLON . "\\`[:]\\'")
+      (PERIOD . "\\`[.]\\'")
+      (HASH . "\\`[#]\\'")))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst semantic-erlang-by--parse-table
+  `(
+    (bovine-toplevel 
+     (module-decl)
+     ) ;; end bovine-toplevel
+
+    (add-op
+     (punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[-]\\'")
+     (BOR)
+     (BXOR)
+     (BSL)
+     (BSR)
+     ) ;; end add-op
+
+    (list-conc-op
+     (punctuation
+      "\\`[+]\\'"
+      punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[-]\\'")
+     ) ;; end list-conc-op
+
+    (comp-op
+     (punctuation
+      "\\`[=]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "=="))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "=:="))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      punctuation
+      "\\`[/]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "=/="))
+      )
+     (punctuation
+      "\\`[/]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 "/="))
+      )
+     (punctuation
+      "\\`[=]\\'"
+      punctuation
+      "\\`[<]\\'"
+      ,(semantic-lambda
+	(list
+	 "=<"))
+      )
+     (punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda
+	(list
+	 ">="))
+      )
+     (punctuation
+      "\\`[<]\\'")
+     (punctuation
+      "\\`[>]\\'")
+     (OR)
+     (ORELSE)
+     (XOR)
+     (AND)
+     (ANDALSO)
+     ) ;; end comp-op
+
+    (multi-op
+     (punctuation
+      "\\`[*]\\'")
+     (punctuation
+      "\\`[/]\\'")
+     (DIV)
+     (REM)
+     (BAND)
+     ) ;; end multi-op
+
+    (prefix-op
+     (punctuation
+      "\\`[+]\\'")
+     (punctuation
+      "\\`[-]\\'")
+     (BNOT)
+     (NOT)
+     ) ;; end prefix-op
+
+    (basic-type
+     (float-literal)
+     (integer-literal)
+     (char-literal)
+     (atom)
+     (var)
+     (string)
+     (TRUE)
+     ) ;; end basic-type
+
+    (atom
+     (symbol
+      "[a-z][a-zA-Z0-9_@]*"
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     (symbol
+      "'.+'"
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end atom
+
+    (float-literal
+     (symbol
+      "[0-9]+"
+      punctuation
+      "\\`[.]\\'"
+      symbol
+      "[0-9]+"
+      exp-part)
+     (punctuation
+      "\\`[.]\\'"
+      symbol
+      "[0-9]+"
+      exp-part)
+     ) ;; end float-literal
+
+    (exp-part
+     (symbol
+      "[eE]"
+      punctuation
+      "[-+]"
+      symbol
+      "[0-9]+")
+     (symbol
+      "[eE]"
+      symbol
+      "[0-9]+")
+     ( ;;EMPTY
+      )
+     ) ;; end exp-part
+
+    (integer-literal
+     (symbol
+      "[0-9a-eA-E]+")
+     (symbol
+      "[0-9]\\{1,2\\}"
+      punctuation
+      "\\`[#]\\'"
+      symbol
+      "[0-9a-eA-E]+")
+     ) ;; end integer-literal
+
+    (char-literal
+     (CHAR)
+     ) ;; end char-literal
+
+    (var
+     (symbol
+      "^_[a-zA-Z0-9]+"
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil nil))
+      )
+     (symbol
+      "^[A-Z][_a-zA-Z0-9]*"
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil nil))
+      )
+     ) ;; end var
+
+    (uni-pattern
+     (symbol
+      "_")
+     ) ;; end uni-pattern
+
+    (binary
+     (punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(semantic-tag
+	 "<<>>"
+	 'binary))
+      )
+     (punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[<]\\'"
+      binary-segments
+      punctuation
+      "\\`[>]\\'"
+      punctuation
+      "\\`[>]\\'"
+      ,(semantic-lambda
+	(semantic-tag
+	 "<<Binary>>"
+	 'binary))
+      )
+     ) ;; end binary
+
+    (binary-segments
+     (binary-segment
+      binary-segments-rest)
+     ) ;; end binary-segments
+
+    (binary-segments-rest
+     (punctuation
+      "\\`[,]\\'"
+      binary-segments
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end binary-segments-rest
+
+    (binary-segment
+     (basic-type
+      binary-segment-rest)
+     (clause-pattern
+      binary-segment-rest)
+     ) ;; end binary-segment
+
+    (binary-segment-rest
+     (punctuation
+      "\\`[:]\\'"
+      basic-type
+      punctuation
+      "\\`[/]\\'"
+      binary-type-spec-list)
+     (punctuation
+      "\\`[:]\\'"
+      basic-type)
+     (punctuation
+      "\\`[/]\\'"
+      binary-type-spec-list)
+     ( ;;EMPTY
+      )
+     ) ;; end binary-segment-rest
+
+    (binary-type
+     (symbol
+      "integer")
+     (symbol
+      "float")
+     (symbol
+      "binary")
+     ) ;; end binary-type
+
+    (binary-signed
+     (SIGNED)
+     (UNSIGNED)
+     ) ;; end binary-signed
+
+    (binary-endian
+     (symbol
+      "big")
+     (symbol
+      "little")
+     (symbol
+      "native")
+     ) ;; end binary-endian
+
+    (binary-unit
+     (symbol
+      "unit"
+      punctuation
+      "\\`[:]\\'"
+      basic-type)
+     ) ;; end binary-unit
+
+    (binary-type-spec
+     (binary-type)
+     (binary-signed)
+     (binary-endian)
+     (binary-unit)
+     ) ;; end binary-type-spec
+
+    (binary-type-spec-list
+     (binary-type-spec
+      punctuation
+      "\\`[-]\\'"
+      binary-type-spec-list)
+     (binary-type-spec)
+     ) ;; end binary-type-spec-list
+
+    (module-decl
+     (module-attr)
+     (function-decl)
+     (header-form)
+     (directive)
+     (file-attr)
+     ) ;; end module-decl
+
+    (module-attr
+     (punctuation
+      "\\`[-]\\'"
+      MODULE
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(semantic-tag-new-package
+	 (car
+	  (semantic-bovinate-from-nonterminal
+	   (car
+	    (nth 2 vals))
+	   (cdr
+	    (nth 2 vals))
+	   'module-attr-name)) nil))
+      )
+     ) ;; end module-attr
+
+    (module-attr-name
+     (open-paren
+      "("
+      module-name
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 1 vals))))
+      )
+     ) ;; end module-attr-name
+
+    (module-name
+     (atom
+      module-name-rest
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  (car
+	   (nth 1 vals)))))
+      )
+     (module-name-rest
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 0 vals))))
+      )
+     ) ;; end module-name
+
+    (module-name-rest
+     (punctuation
+      "\\`[.]\\'"
+      atom
+      module-name-rest
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (nth 0 vals)
+	  (car
+	   (nth 1 vals))
+	  (car
+	   (nth 2 vals)))))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end module-name-rest
+
+    (header-form
+     (header-attr)
+     (anywhere-attr)
+     ) ;; end header-form
+
+    (header-attr
+     (export-attr)
+     (import-attr)
+     (compile-attr)
+     (whild-attr)
+     ) ;; end header-attr
+
+    (anywhere-attr
+     (file-attr)
+     (macro-def)
+     (record-decl)
+     ) ;; end anywhere-attr
+
+    (export-attr
+     (punctuation
+      "\\`[-]\\'"
+      EXPORT
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end export-attr
+
+    (export-name-list
+     (open-paren
+      semantic-list
+      "^\\["
+      close-paren)
+     ) ;; end export-name-list
+
+    (import-attr
+     (punctuation
+      "\\`[-]\\'"
+      IMPORT
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(semantic-tag
+	 (car
+	  (semantic-bovinate-from-nonterminal
+	   (car
+	    (nth 2 vals))
+	   (cdr
+	    (nth 2 vals))
+	   'import-name-list))
+	 'import))
+      )
+     ) ;; end import-attr
+
+    (import-name-list
+     (open-paren
+      module-name
+      punctuation
+      "\\`[,]\\'"
+      semantic-list
+      "^\\["
+      close-paren
+      ,(semantic-lambda
+	(nth 1 vals)
+	(list
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 3 vals))
+	  (cdr
+	   (nth 3 vals))
+	  'function-name-list)))
+      )
+     (open-paren
+      module-name
+      close-paren
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ) ;; end import-name-list
+
+    (function-name-list
+     (open-paren
+      close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     (open-paren
+      function-names
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ) ;; end function-name-list
+
+    (function-names
+     (function-arity
+      punctuation
+      "\\`[,]\\'"
+      function-names
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)
+	 (nth 2 vals)))
+      )
+     (function-arity
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals)))
+      )
+     ) ;; end function-names
+
+    (function-arity
+     (atom
+      punctuation
+      "\\`[/]\\'"
+      integer-literal
+      ,(semantic-lambda
+	(nth 0 vals)
+	(list
+	 (nth 1 vals))
+	(nth 2 vals))
+      )
+     ) ;; end function-arity
+
+    (compile-attr
+     (punctuation
+      "\\`[-]\\'"
+      COMPILE
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end compile-attr
+
+    (file-attr
+     (punctuation
+      "\\`[-]\\'"
+      symbol
+      "file"
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end file-attr
+
+    (file-attr-list
+     (open-paren
+      string
+      punctuation
+      "\\`[,]\\'"
+      integer-literal
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (cons
+	  (read
+	   (nth 1 vals))
+	  (nth 3 vals))))
+      )
+     ) ;; end file-attr-list
+
+    (whild-attr
+     (punctuation
+      "\\`[-]\\'"
+      atom
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end whild-attr
+
+    (function-decl
+     (function-clauses
+      full-stop
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end function-decl
+
+    (function-clauses
+     (function-clause
+      function-clauses-rest
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end function-clauses
+
+    (function-clauses-rest
+     (punctuation
+      "\\`[;]\\'"
+      function-clauses)
+     ( ;;EMPTY
+      )
+     ) ;; end function-clauses-rest
+
+    (function-clause
+     (atom
+      fun-clause
+      ,(semantic-lambda
+	(semantic-tag-new-function
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  "/"
+	  (number-to-string
+	   (length
+	    (car
+	     (nth 1 vals))))) nil
+	 (nth 1 vals)))
+      )
+     ) ;; end function-clause
+
+    (record-decl
+     (punctuation
+      "\\`[-]\\'"
+      RECORD
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(car
+	 (semantic-parse-region
+	  (car
+	   (nth 2 vals))
+	  (cdr
+	   (nth 2 vals))
+	  'record-def
+	  1)))
+      )
+     ) ;; end record-decl
+
+    (record-def
+     (open-paren
+      atom
+      punctuation
+      "\\`[,]\\'"
+      semantic-list
+      "^{"
+      close-paren
+      ,(semantic-lambda
+	(semantic-tag-new-type
+	 (nth 1 vals)
+	 "record"
+	 (semantic-parse-region
+	  (car
+	   (nth 3 vals))
+	  (cdr
+	   (nth 3 vals))
+	  'record-field-decl
+	  1) nil))
+      )
+     ) ;; end record-def
+
+    (record-decl-tuple
+     (open-paren
+      record-field-decls
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     (open-paren
+      close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end record-decl-tuple
+
+    (record-field-decl
+     (atom
+      record-field-value
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil
+	 ""))
+      )
+     (atom
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil
+	 ""))
+      )
+     (open-paren
+      "{"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (close-paren
+      "}"
+      ,(semantic-lambda
+	(list nil))
+      )
+     (punctuation
+      "\\`[,]\\'"
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end record-field-decl
+
+    (pattern
+     (pattern-expr
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (uni-pattern)
+     (binary)
+     (basic-type)
+     (semantic-list
+      "^\\["
+      ,(semantic-lambda
+	(semantic-tag
+	 "List"
+	 'list))
+      )
+     (semantic-list
+      "^{"
+      ,(semantic-lambda
+	(semantic-tag
+	 "Tuple"
+	 'list))
+      )
+     (record-pattern
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end pattern
+
+    (pattern-expr
+     (pattern-conc-expr
+      pattern-conc-expr-rest
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end pattern-expr
+
+    (pattern-conc-expr
+     (string-literal)
+     (var)
+     ) ;; end pattern-conc-expr
+
+    (pattern-conc-expr-rest
+     (list-conc-op
+      pattern-expr
+      ,(semantic-lambda)
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end pattern-conc-expr-rest
+
+    (tuple-pattern
+     (open-paren
+      patterns
+      close-paren)
+     (open-paren
+      close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end tuple-pattern
+
+    (list-pattern
+     (open-paren
+      patterns
+      list-pattern-tail
+      close-paren)
+     (open-paren
+      close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end list-pattern
+
+    (list-pattern-tail
+     (punctuation
+      "\\`[|]\\'"
+      pattern)
+     ( ;;EMPTY
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end list-pattern-tail
+
+    (patterns
+     (pattern
+      patterns-rest
+      ,(semantic-lambda
+	(list
+	 (cons
+	  (car
+	   (nth 0 vals))
+	  (car
+	   (nth 1 vals)))))
+      )
+     ) ;; end patterns
+
+    (patterns-rest
+     (punctuation
+      "\\`[,]\\'"
+      patterns
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end patterns-rest
+
+    (record-pattern
+     (punctuation
+      "\\`[#]\\'"
+      atom
+      semantic-list
+      "^{"
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 1 vals))))
+      )
+     ) ;; end record-pattern
+
+    (record-pattern-tuple
+     (open-paren
+      record-field-patterns
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     (open-paren
+      close-paren
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end record-pattern-tuple
+
+    (record-field-patterns
+     (record-field-patterns
+      punctuation
+      "\\`[,]\\'"
+      record-field-pattern)
+     (record-field-pattern)
+     ) ;; end record-field-patterns
+
+    (record-field-pattern
+     (atom
+      punctuation
+      "\\`[=]\\'"
+      pattern)
+     ) ;; end record-field-pattern
+
+    (body
+     (exprs)
+     ) ;; end body
+
+    (exprs
+     (expr
+      exprs-rest)
+     ) ;; end exprs
+
+    (exprs-rest
+     (punctuation
+      "\\`[,]\\'"
+      exprs)
+     ( ;;EMPTY
+      )
+     ) ;; end exprs-rest
+
+    (expr
+     (CATCH
+      expr)
+     (match-expr)
+     ) ;; end expr
+
+    (match-expr
+     (pattern
+      punctuation
+      "\\`[=]\\'"
+      match-expr)
+     (send-expr)
+     ) ;; end match-expr
+
+    (send-expr
+     (compare-expr
+      send-expr-rest)
+     ) ;; end send-expr
+
+    (send-expr-rest
+     (punctuation
+      "\\`[!]\\'"
+      send-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end send-expr-rest
+
+    (compare-expr
+     (list-conc-expr
+      compare-expr-rest)
+     ) ;; end compare-expr
+
+    (compare-expr-rest
+     (comp-op
+      list-conc-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end compare-expr-rest
+
+    (list-conc-expr
+     (add-expr
+      list-conc-expr-rest)
+     ) ;; end list-conc-expr
+
+    (list-conc-expr-rest
+     (list-conc-op
+      list-conc-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end list-conc-expr-rest
+
+    (add-expr
+     (multi-expr
+      add-expr-rest)
+     ) ;; end add-expr
+
+    (add-expr-rest
+     (add-op
+      add-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end add-expr-rest
+
+    (multi-expr
+     (prefix-expr
+      multi-expr-rest)
+     ) ;; end multi-expr
+
+    (multi-expr-rest
+     (multi-op
+      multi-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end multi-expr-rest
+
+    (prefix-expr
+     (prefix-op
+      record-expr)
+     (record-expr)
+     ) ;; end prefix-expr
+
+    (record-expr
+     (punctuation
+      "\\`[#]\\'"
+      record-expr-field)
+     (application-expr
+      record-expr-rest)
+     ) ;; end record-expr
+
+    (record-expr-rest
+     (punctuation
+      "\\`[#]\\'"
+      record-expr-field)
+     ( ;;EMPTY
+      )
+     ) ;; end record-expr-rest
+
+    (record-expr-field
+     (atom
+      punctuation
+      "\\`[.]\\'"
+      atom)
+     (atom
+      semantic-list
+      "^{")
+     (record-expr)
+     ) ;; end record-expr-field
+
+    (record-update-tuple
+     (open-paren
+      close-paren)
+     (open-paren
+      record-field-updates
+      close-paren)
+     ) ;; end record-update-tuple
+
+    (record-field-updates
+     (record-field-update
+      record-field-updates-rest)
+     ) ;; end record-field-updates
+
+    (record-field-updates-rest
+     (punctuation
+      "\\`[,]\\'"
+      record-field-updates)
+     ( ;;EMPTY
+      )
+     ) ;; end record-field-updates-rest
+
+    (record-field-update
+     (atom
+      record-field-value)
+     ) ;; end record-field-update
+
+    (record-field-value
+     (punctuation
+      "\\`[=]\\'"
+      expr)
+     ( ;;EMPTY
+      )
+     ) ;; end record-field-value
+
+    (application-expr
+     (module-name
+      punctuation
+      "\\`[:]\\'"
+      primary-expr
+      semantic-list
+      "^(")
+     (primary-expr
+      application-expr-rest)
+     ) ;; end application-expr
+
+    (application-expr-rest
+     (semantic-list
+      "^(")
+     (punctuation
+      "\\`[:]\\'"
+      primary-expr
+      semantic-list
+      "^(")
+     ( ;;EMPTY
+      )
+     ) ;; end application-expr-rest
+
+    (application-expr-list
+     (open-paren
+      close-paren)
+     (open-paren
+      exprs
+      close-paren)
+     ) ;; end application-expr-list
+
+    (primary-expr
+     (binary)
+     (string-literal)
+     (basic-type)
+     (semantic-list
+      "^{")
+     (semantic-list
+      "^\\[")
+     (semantic-list
+      "^\\[")
+     (block-expr)
+     (if-expr)
+     (case-expr)
+     (receive-expr)
+     (fun-expr)
+     (query-expr)
+     (paren-expr)
+     ) ;; end primary-expr
+
+    (string-literal
+     (string)
+     (macro-app)
+     (string
+      string-literal)
+     ) ;; end string-literal
+
+    (tuple-skel
+     (open-paren
+      close-paren)
+     (open-paren
+      exprs
+      close-paren)
+     ) ;; end tuple-skel
+
+    (list-skel
+     (open-paren
+      close-paren)
+     (open-paren
+      exprs
+      list-skel-tail
+      close-paren)
+     ) ;; end list-skel
+
+    (list-skel-tail
+     (punctuation
+      "\\`[|]\\'"
+      expr)
+     ( ;;EMPTY
+      )
+     ) ;; end list-skel-tail
+
+    (list-compr
+     (open-paren
+      expr
+      punctuation
+      "\\`[|]\\'"
+      punctuation
+      "\\`[|]\\'"
+      list-compr-exprs
+      close-paren)
+     ) ;; end list-compr
+
+    (list-compr-exprs
+     (list-compr-expr
+      list-compr-exprs-rest)
+     ) ;; end list-compr-exprs
+
+    (list-compr-exprs-rest
+     (punctuation
+      "\\`[,]\\'"
+      list-compr-exprs)
+     ( ;;EMPTY
+      )
+     ) ;; end list-compr-exprs-rest
+
+    (list-compr-expr
+     (generator)
+     (filter)
+     ) ;; end list-compr-expr
+
+    (generator
+     (pattern
+      punctuation
+      "\\`[<]\\'"
+      punctuation
+      "\\`[-]\\'"
+      expr)
+     ) ;; end generator
+
+    (filter
+     (expr)
+     ) ;; end filter
+
+    (block-expr
+     (BEGIN
+      body
+      END)
+     ) ;; end block-expr
+
+    (if-expr
+     (IF
+      if-clauses
+      END)
+     ) ;; end if-expr
+
+    (if-clauses
+     (if-clause
+      punctuation
+      "\\`[;]\\'"
+      if-clauses)
+     (if-clause)
+     ) ;; end if-clauses
+
+    (if-clause
+     (guard
+      clause-body)
+     (expr
+      clause-body)
+     ) ;; end if-clause
+
+    (clause-body
+     (punctuation
+      "\\`[-]\\'"
+      punctuation
+      "\\`[>]\\'"
+      body)
+     ) ;; end clause-body
+
+    (case-expr
+     (CASE
+      expr
+      OF
+      cr-clauses
+      END)
+     ) ;; end case-expr
+
+    (cr-clauses
+     (cr-clause
+      punctuation
+      "\\`[;]\\'"
+      cr-clauses)
+     (cr-clause)
+     ) ;; end cr-clauses
+
+    (cr-clause
+     (clause-pattern
+      clause-guard
+      clause-body)
+     ) ;; end cr-clause
+
+    (clause-guard
+     (WHEN
+      guard)
+     ( ;;EMPTY
+      )
+     ) ;; end clause-guard
+
+    (receive-expr
+     (RECEIVE
+      cr-clauses
+      receive-after
+      END)
+     (RECEIVE
+      receive-after
+      END)
+     (RECEIVE
+      cr-clauses
+      AFTER
+      expr
+      clause-body
+      END)
+     ) ;; end receive-expr
+
+    (receive-after
+     (AFTER
+      expr
+      clause-body)
+     ( ;;EMPTY
+      )
+     ) ;; end receive-after
+
+    (fun-expr
+     (FUN
+      function-arity)
+     (FUN
+      fun-clauses
+      END)
+     ) ;; end fun-expr
+
+    (fun-clauses
+     (fun-clause
+      fun-clauses-rest)
+     ) ;; end fun-clauses
+
+    (fun-clauses-rest
+     (punctuation
+      "\\`[;]\\'"
+      fun-clauses)
+     ( ;;EMPTY
+      )
+     ) ;; end fun-clauses-rest
+
+    (fun-clause
+     (semantic-list
+      "^("
+      clause-guard
+      clause-body
+      ,(semantic-lambda
+	(car
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 0 vals))
+	  (cdr
+	   (nth 0 vals))
+	  'clause-pattern-list)))
+      )
+     ) ;; end fun-clause
+
+    (clause-pattern-list
+     (open-paren
+      clause-patterns
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (nth 1 vals)))
+      )
+     ) ;; end clause-pattern-list
+
+    (clause-patterns
+     (clause-pattern
+      clause-patterns-rest
+      ,(semantic-lambda
+	(list
+	 (cons
+	  (car
+	   (nth 0 vals))
+	  (car
+	   (nth 1 vals)))))
+      )
+     ) ;; end clause-patterns
+
+    (clause-patterns-rest
+     (punctuation
+      "\\`[,]\\'"
+      clause-patterns
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end clause-patterns-rest
+
+    (clause-pattern
+     (match-pattern)
+     (pattern)
+     ) ;; end clause-pattern
+
+    (match-pattern
+     (var
+      punctuation
+      "\\`[=]\\'"
+      pattern
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     (pattern
+      punctuation
+      "\\`[=]\\'"
+      var
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end match-pattern
+
+    (query-expr
+     (QUERY
+      semantic-list
+      "^\\["
+      END)
+     ) ;; end query-expr
+
+    (paren-expr
+     (semantic-list
+      "^(")
+     ) ;; end paren-expr
+
+    (paren-expr-list
+     (open-paren
+      expr
+      close-paren)
+     ) ;; end paren-expr-list
+
+    (guard
+     (guard-test
+      guard-rest)
+     ) ;; end guard
+
+    (guard-rest
+     (punctuation
+      "\\`[,]\\'"
+      guard)
+     (punctuation
+      "\\`[;]\\'"
+      guard)
+     ( ;;EMPTY
+      )
+     ) ;; end guard-rest
+
+    (guard-test
+     (TRUE)
+     (guard-record-test)
+     (guard-term-cmp)
+     (guard-recognizer)
+     (semantic-list
+      "^(")
+     ) ;; end guard-test
+
+    (guard-record-test
+     (RECORD
+      semantic-list
+      "^(")
+     (open-paren
+      guard-expr
+      punctuation
+      "\\`[,]\\'"
+      symbol
+      close-paren)
+     ) ;; end guard-record-test
+
+    (guard-recognizer
+     (symbol
+      semantic-list
+      "^(")
+     ) ;; end guard-recognizer
+
+    (guard-term-cmp
+     (guard-expr
+      guard-term-op
+      guard-expr)
+     ) ;; end guard-term-cmp
+
+    (guard-term-op
+     (comp-op)
+     (punctuation
+      "\\`[=]\\'")
+     ) ;; end guard-term-op
+
+    (paren-guard-test
+     (open-paren
+      guard-test
+      close-paren)
+     ) ;; end paren-guard-test
+
+    (guard-expr
+     (guard-add-expr)
+     ) ;; end guard-expr
+
+    (guard-add-expr
+     (guard-multi-expr
+      guard-add-expr-rest)
+     ) ;; end guard-add-expr
+
+    (guard-add-expr-rest
+     (add-op
+      guard-add-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end guard-add-expr-rest
+
+    (guard-multi-expr
+     (guard-prefix-expr
+      guard-multi-expr-rest)
+     ) ;; end guard-multi-expr
+
+    (guard-multi-expr-rest
+     (multi-op
+      guard-multi-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end guard-multi-expr-rest
+
+    (guard-prefix-expr
+     (prefix-op
+      guard-application-expr)
+     (guard-application-expr)
+     ) ;; end guard-prefix-expr
+
+    (guard-application-expr
+     (atom
+      semantic-list
+      "^(")
+     (guard-record-expr)
+     (guard-primary-expr)
+     ) ;; end guard-application-expr
+
+    (guard-exprs-list
+     (open-paren
+      close-paren)
+     (open-paren
+      guard-exprs
+      close-paren)
+     ) ;; end guard-exprs-list
+
+    (guard-exprs
+     (guard-expr
+      guard-exprs-rest)
+     ) ;; end guard-exprs
+
+    (guard-exprs-rest
+     (punctuation
+      "\\`[,]\\'"
+      guard-exprs)
+     (punctuation
+      "\\`[;]\\'"
+      guard-exprs)
+     ( ;;EMPTY
+      )
+     ) ;; end guard-exprs-rest
+
+    (guard-record-expr
+     (punctuation
+      "\\`[#]\\'"
+      atom
+      punctuation
+      "\\`[.]\\'"
+      atom)
+     (guard-primary-expr
+      punctuation
+      "\\`[#]\\'"
+      atom
+      punctuation
+      "\\`[.]\\'"
+      atom)
+     ) ;; end guard-record-expr
+
+    (guard-primary-expr
+     (basic-type)
+     (macro-app)
+     (semantic-list
+      "^{")
+     (semantic-list
+      "^\\[")
+     (semantic-list
+      "^(")
+     ) ;; end guard-primary-expr
+
+    (guard-tuple-skel
+     (open-paren
+      close-paren)
+     (open-paren
+      guard-exprs
+      close-paren)
+     ) ;; end guard-tuple-skel
+
+    (guard-list-skel
+     (open-paren
+      close-paren)
+     (open-paren
+      guard-exprs
+      guard-list-skel-tail
+      close-paren)
+     ) ;; end guard-list-skel
+
+    (guard-list-skel-tail
+     (punctuation
+      "\\`[|]\\'"
+      guard-expr)
+     ( ;;EMPTY
+      )
+     ) ;; end guard-list-skel-tail
+
+    (guard-paren-expr
+     (open-paren
+      guard-expr
+      close-paren)
+     ) ;; end guard-paren-expr
+
+    (directive
+     (macro-def)
+     (macro-undef)
+     (include-dir)
+     (include-lib-dir)
+     (ifdef-dir)
+     (ifndef-dir)
+     (else-dir)
+     (endif-dir)
+     ) ;; end directive
+
+    (macro-def
+     (punctuation
+      "\\`[-]\\'"
+      DEFINE
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(semantic-bovinate-from-nonterminal
+	 (car
+	  (nth 2 vals))
+	 (cdr
+	  (nth 2 vals))
+	 'macro-def-list))
+      )
+     ) ;; end macro-def
+
+    (macro-def-list
+     (open-paren
+      symbol
+      macro-def-opt
+      punctuation
+      "\\`[,]\\'"
+      macro-def-opt
+      close-paren
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 1 vals) nil
+	 (nth 4 vals) :constant-flag t))
+      )
+     ) ;; end macro-def-list
+
+    (macro-def-opt
+     (semantic-list)
+     (expr)
+     ( ;;EMPTY
+      )
+     ) ;; end macro-def-opt
+
+    (macro-undef
+     (punctuation
+      "\\`[-]\\'"
+      UNDEF
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end macro-undef
+
+    (macro-app
+     (punctuation
+      "\\`[?]\\'"
+      symbol
+      semantic-list
+      "^(")
+     (punctuation
+      "\\`[?]\\'"
+      symbol)
+     ) ;; end macro-app
+
+    (include-dir
+     (punctuation
+      "\\`[-]\\'"
+      INCLUDE
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (car
+	  (semantic-bovinate-from-nonterminal
+	   (car
+	    (nth 2 vals))
+	   (cdr
+	    (nth 2 vals))
+	   'include-file-name)) nil))
+      )
+     ) ;; end include-dir
+
+    (include-lib-dir
+     (punctuation
+      "\\`[-]\\'"
+      INCLUDE_LIB
+      semantic-list
+      "^("
+      full-stop
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (car
+	  (semantic-bovinate-from-nonterminal
+	   (car
+	    (nth 2 vals))
+	   (cdr
+	    (nth 2 vals))
+	   'include-file-name)) nil))
+      )
+     ) ;; end include-lib-dir
+
+    (include-file-name
+     (open-paren
+      string
+      close-paren
+      ,(semantic-lambda
+	(list
+	 (read
+	  (nth 1 vals))))
+      )
+     ) ;; end include-file-name
+
+    (ifdef-dir
+     (punctuation
+      "\\`[-]\\'"
+      IFDEF
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end ifdef-dir
+
+    (ifndef-dir
+     (punctuation
+      "\\`[-]\\'"
+      IFNDEF
+      semantic-list
+      "^("
+      full-stop)
+     ) ;; end ifndef-dir
+
+    (else-dir
+     (punctuation
+      "\\`[-]\\'"
+      ELSE
+      full-stop)
+     ) ;; end else-dir
+
+    (endif-dir
+     (punctuation
+      "\\`[-]\\'"
+      ENDIF
+      full-stop)
+     ) ;; end endif-dir
+
+    (full-stop
+     (punctuation
+      "\\`[.]\\'")
+     ) ;; end full-stop
+    )
+  "Parser table.")
+
+(defun semantic-erlang-by--install-parser ()
+  "Setup the Semantic Parser."
+  (setq semantic--parse-table semantic-erlang-by--parse-table
+	semantic-debug-parser-source "erlang.by"
+	semantic-debug-parser-class 'semantic-bovine-debug-parser
+	semantic-flex-keywords-obarray semantic-erlang-by--keyword-table
+	))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+(provide 'semantic-erlang-by)
+
+;;; semantic-erlang-by.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-erlang.el b/site/cedet-1.0pre7/semantic/bovine/semantic-erlang.el
new file mode 100644
index 0000000..c414fbf
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-erlang.el
@@ -0,0 +1,110 @@
+;;; semantic-erlang.el --- Semantic details for Erlang
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+;; Copyright (C) 2003 David Ponce
+;; Copyright (C) 2001, 2002, 2003 Vladimir G. Sekissov
+
+;; Author: Vladimir G. Sekissov <svg@surnet.ru>
+;;         David Ponce <david@dponce.com>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-erlang.el,v 1.7 2009/01/24 04:05:54 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+
+;;; History:
+;;
+
+;;; Code:
+
+(require 'semantic)
+(require 'backquote)
+(require 'semantic-erlang-by)
+;;(require 'erlang-edoc)
+
+;; Depending on what elements you include specialized support for
+(eval-when-compile
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+(define-lex-simple-regex-analyzer semantic-erlang-lex-char
+  "Detect and create Erlang CHAR tokens."
+  "\\s/\\(\\(\\\\[0-9]\\{3\\}\\)\\|[^\\]\\|\\\\\\\\\\)"
+  'CHAR)
+
+(define-lex semantic-erlang-lexer
+  "Lexical Analyzer for Erlang code."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  ;;semantic-lex-number
+  semantic-lex-symbol-or-keyword
+  semantic-erlang-lex-char
+  ;;semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+(defcustom-mode-local-semantic-dependency-system-include-path
+  erlang-mode semantic-erlang-dependency-system-include-path
+  nil
+  "The system include path used by Erlang langauge.")
+
+(defun semantic-erlang-default-setup ()
+  "Set up a buffer for semantic parsing of the Erlang language."
+  (semantic-erlang-by--install-parser)
+  (setq
+   ;; Lexical analysis
+   semantic-lex-number-expression nil
+   semantic-lex-syntax-modifications '((?' "_")
+                                       (?$ "/")
+                                       )
+   semantic-lex-analyzer 'semantic-erlang-lexer
+   ;; Parsing
+   ;; Environment
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ","
+   ;; @TODO - Move out to srecode.
+   ;;document-comment-start "%%**"
+   ;;document-comment-line-prefix "%%"
+   ;;document-comment-end "%%*"
+   ;; speedbar and imenu buckets name
+   semantic-symbol->name-assoc-list-for-type-parts
+   ;; in type parts
+   '((variable . "Definitions")
+     (type     . "Records")
+     (function . "Functions"))
+   semantic-symbol->name-assoc-list
+   ;; everywhere
+   '((variable . "Definitions")
+     (type     . "Records")
+     (function . "Functions")
+     (include  . "Includes")
+     (package  . "Module"))
+   ))
+
+(add-hook 'erlang-mode-hook 'semantic-erlang-default-setup)
+
+(provide 'semantic-erlang)
+
+;;; semantic-erlang.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-gcc.el b/site/cedet-1.0pre7/semantic/bovine/semantic-gcc.el
new file mode 100644
index 0000000..aed8325
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-gcc.el
@@ -0,0 +1,319 @@
+;;; semantic-gcc.el --- gcc querying special code for the C parser
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-gcc.el,v 1.18 2009/08/28 12:29:00 davenar Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; GCC stores things in special places.  These functions will query
+;; GCC, and set up the preprocessor and include paths.
+
+(require 'semantic-dep)
+;;; Code:
+
+(defun semantic-gcc-query (gcc-cmd &rest gcc-options)
+  "Return program output to both standard output and standard error.
+GCC-CMD is the program to execute and GCC-OPTIONS are the options
+to give to the program."
+  ;; $ gcc -v
+  ;;
+  (let ((buff (get-buffer-create " *gcc-query*"))
+        (old-lc-messages (getenv "LC_ALL")))
+    (save-excursion
+      (set-buffer buff)
+      (erase-buffer)
+      (setenv "LC_ALL" "C")
+      (condition-case nil
+          (apply 'call-process gcc-cmd nil (cons buff t) nil gcc-options)
+        (error ;; Some bogus directory for the first time perhaps?
+         (let ((default-directory (expand-file-name "~/")))
+           (condition-case nil
+               (apply 'call-process gcc-cmd nil (cons buff t) nil gcc-options)
+             (error ;; gcc doesn't exist???
+              nil)))))
+      (setenv "LC_ALL" old-lc-messages)
+      (prog1
+          (buffer-string)
+        (kill-buffer buff)
+        )
+      )))
+
+;;(semantic-gcc-get-include-paths "c")
+;;(semantic-gcc-get-include-paths "c++")
+(defun semantic-gcc-get-include-paths (lang)
+  "Return include paths as gcc use them for language LANG."
+  (let* ((gcc-cmd (cond
+                   ((string= lang "c") "gcc")
+                   ((string= lang "c++") "c++")
+                   (t (if (stringp lang)
+                          (error "Unknown lang: %s" lang)
+                        (error "LANG=%S, should be a string" lang)))))
+         (gcc-output (semantic-gcc-query gcc-cmd "-v" "-E" "-x" lang null-device))
+         (lines (split-string gcc-output "\n"))
+         (include-marks 0)
+         (inc-mark "#include ")
+         (inc-mark-len (length "#include "))
+         inc-path)
+    ;;(message "gcc-output=%s" gcc-output)
+    (dolist (line lines)
+      (when (> (length line) 1)
+        (if (= 0 include-marks)
+            (when (and (> (length line) inc-mark-len)
+                       (string= inc-mark (substring line 0 inc-mark-len)))
+              (setq include-marks (1+ include-marks)))
+          (let ((chars (append line nil)))
+            (when (= 32 (nth 0 chars))
+              (let ((path (substring line 1)))
+                (when (file-accessible-directory-p path)
+                  (when (if (memq system-type '(windows-nt))
+                            (/= ?/ (nth 1 chars))
+                          (= ?/ (nth 1 chars)))
+                    (add-to-list 'inc-path
+                                 (expand-file-name (substring line 1))
+                                 t)))))))))
+    inc-path))
+
+
+(defun semantic-cpp-defs (str)
+  "Convert CPP output STR into a list of cons cells with defines for C++."
+  (let ((lines (split-string str "\n"))
+        (lst nil))
+    (dolist (L lines)
+      (let ((dat (split-string L)))
+        (when (= (length dat) 3)
+          (add-to-list 'lst (cons (nth 1 dat) (nth 2 dat))))))
+    lst))
+
+(defun semantic-gcc-fields (str)
+  "Convert GCC output STR into an alist of fields."
+  (let ((fields nil)
+        (lines (split-string str "\n"))
+        )
+    (dolist (L lines)
+      ;; For any line, what do we do with it?
+      (cond ((or (string-match "Configured with\\(:\\)" L)
+                 (string-match "\\(:\\)\\s-*[^ ]*configure " L))
+             (let* ((parts (substring L (match-end 1)))
+                    (opts (cedet-split-string parts " " t))
+                    )
+               (dolist (O (cdr opts))
+                 (let* ((data (split-string O "="))
+                        (sym (intern (car data)))
+                        (val (car (cdr data))))
+                   (push (cons sym val) fields)
+                   ))
+               ))
+            ((string-match "gcc[ -][vV]ersion" L)
+             (let* ((vline (substring L (match-end 0)))
+                    (parts (split-string vline " ")))
+               (push (cons 'version (nth 1 parts)) fields)))
+            ((string-match "Target: " L)
+             (let ((parts (split-string L " ")))
+               (push (cons 'target (nth 1 parts)) fields)))
+            ))
+    fields))
+
+(defvar semantic-gcc-setup-data nil
+  "The GCC setup data.
+This is setup by `semantic-gcc-setup'.
+This is an alist, and should include keys of:
+  'version - The version of gcc
+  '--host  - The host symbol.  (Used in include directories)
+  '--prefix - Where GCC was installed.
+It should also include other symbols GCC was compiled with.")
+
+;;;###autoload
+(defun semantic-gcc-setup ()
+  "Setup Semantic C/C++ parsing based on GCC output."
+  (interactive)
+  (let* ((fields (or semantic-gcc-setup-data
+                     (semantic-gcc-fields (semantic-gcc-query "gcc" "-v"))))
+         (defines (semantic-cpp-defs (semantic-gcc-query "cpp" "-E" "-dM" "-x" "c++" null-device)))
+         (ver (cdr (assoc 'version fields)))
+         (host (or (cdr (assoc 'target fields))
+                   (cdr (assoc '--target fields))
+                   (cdr (assoc '--host fields))))
+         (prefix (cdr (assoc '--prefix fields)))
+         ;; gcc output supplied paths
+         (c-include-path (semantic-gcc-get-include-paths "c"))
+         (c++-include-path (semantic-gcc-get-include-paths "c++")))
+    ;; Remember so we don't have to call GCC twice.
+    (setq semantic-gcc-setup-data fields)
+    (unless c-include-path
+      ;; Fallback to guesses
+      (let* ( ;; gcc include dirs
+             (gcc-exe (locate-file "gcc" exec-path exec-suffixes 'executable))
+             (gcc-root (expand-file-name ".." (file-name-directory gcc-exe)))
+             (gcc-include (expand-file-name "include" gcc-root))
+             (gcc-include-c++ (expand-file-name "c++" gcc-include))
+             (gcc-include-c++-ver (expand-file-name ver gcc-include-c++))
+             (gcc-include-c++-ver-host (expand-file-name host gcc-include-c++-ver)))
+        (setq c-include-path
+              (remove-if-not 'file-accessible-directory-p
+                             (list "/usr/include" gcc-include)))
+        (setq c++-include-path
+              (remove-if-not 'file-accessible-directory-p
+                             (list "/usr/include"
+                                   gcc-include
+                                   gcc-include-c++
+                                   gcc-include-c++-ver
+                                   gcc-include-c++-ver-host)))))
+
+    ;;; Fix-me: I think this part might have been a misunderstanding, but I am not sure.
+    ;; If this option is specified, try it both with and without prefix, and with and without host
+    ;; (if (assoc '--with-gxx-include-dir fields)
+    ;;     (let ((gxx-include-dir (cdr (assoc '--with-gxx-include-dir fields))))
+    ;;       (nconc try-paths (list gxx-include-dir
+    ;;                              (concat prefix gxx-include-dir)
+    ;;                              (concat gxx-include-dir "/" host)
+    ;;                              (concat prefix gxx-include-dir "/" host)))))
+
+    ;; Now setup include paths etc
+    (dolist (D (semantic-gcc-get-include-paths "c"))
+      (semantic-add-system-include D 'c-mode))
+    (dolist (D (semantic-gcc-get-include-paths "c++"))
+      (semantic-add-system-include D 'c++-mode)
+      (let ((cppconfig (concat D "/bits/c++config.h")))
+        ;; Presumably there will be only one of these files in the try-paths list...
+        (when (file-readable-p cppconfig)
+          ;; Add it to the symbol file
+          (if (boundp 'semantic-lex-c-preprocessor-symbol-file)
+              ;; Add to the core macro header list
+              (add-to-list 'semantic-lex-c-preprocessor-symbol-file cppconfig)
+            ;; Setup the core macro header
+            (setq semantic-lex-c-preprocessor-symbol-file (list cppconfig)))
+          )))
+    (if (not (boundp 'semantic-lex-c-preprocessor-symbol-map))
+        (setq semantic-lex-c-preprocessor-symbol-map nil))
+    (dolist (D defines)
+      (add-to-list 'semantic-lex-c-preprocessor-symbol-map D))
+    (when (featurep 'semantic-c)
+      (semantic-c-reset-preprocessor-symbol-map))
+    nil))
+
+;;; TESTING
+;;
+;; Example output of "gcc -v"
+(defvar semantic-gcc-test-strings
+  '(;; My old box:
+    "Reading specs from /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/specs
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --host=i386-redhat-linux
+Thread model: posix
+gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5)"
+    ;; Alex Ott:
+    "Using built-in specs.
+Target: i486-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.1-9ubuntu1' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
+Thread model: posix
+gcc version 4.3.1 (Ubuntu 4.3.1-9ubuntu1)"
+    ;; My debian box:
+    "Using built-in specs.
+Target: x86_64-unknown-linux-gnu
+Configured with: ../../../sources/gcc/configure --prefix=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3 --with-gmp=/usr/local/gcc/gmp --with-mpfr=/usr/local/gcc/mpfr --enable-languages=c,c++,fortran --with-as=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/as --with-ld=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/ld --disable-multilib
+Thread model: posix
+gcc version 4.2.3"
+    ;; My mac:
+    "Using built-in specs.
+Target: i686-apple-darwin8
+Configured with: /private/var/tmp/gcc/gcc-5341.obj~1/src/configure --disable-checking -enable-werror --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib --build=powerpc-apple-darwin8 --with-arch=pentium-m --with-tune=prescott --program-prefix= --host=i686-apple-darwin8 --target=i686-apple-darwin8
+Thread model: posix
+gcc version 4.0.1 (Apple Computer, Inc. build 5341)"
+    ;; Ubuntu Intrepid
+    "Using built-in specs.
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+Thread model: posix
+gcc version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)"
+    ;; Red Hat EL4
+    "Reading specs from /usr/lib/gcc/x86_64-redhat-linux/3.4.6/specs
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=x86_64-redhat-linux
+Thread model: posix
+gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)"
+    ;; Red Hat EL5
+    "Using built-in specs.
+Target: x86_64-redhat-linux
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=x86_64-redhat-linux
+Thread model: posix
+gcc version 4.1.2 20080704 (Red Hat 4.1.2-44)"
+    ;; David Engster's german gcc on ubuntu 4.3
+    "Es werden eingebaute Spezifikationen verwendet.
+Ziel: i486-linux-gnu
+Konfiguriert mit: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
+Thread-Modell: posix
+gcc-Version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)"
+    ;; Damien Deville bsd
+    "Using built-in specs.
+Target: i386-undermydesk-freebsd
+Configured with: FreeBSD/i386 system compiler
+Thread model: posix
+gcc version 4.2.1 20070719  [FreeBSD]"
+    )
+  "A bunch of sample gcc -v outputs from different machines.")
+
+(defvar semantic-gcc-test-strings-fail
+  '(;; A really old solaris box I found
+    "Reading specs from /usr/local/gcc-2.95.2/lib/gcc-lib/sparc-sun-solaris2.6/2.95.2/specs
+gcc version 2.95.2 19991024 (release)"
+    )
+  "A bunch of sample gcc -v outputs that fail to provide the info we want.")
+
+;;;###autoload
+(defun semantic-gcc-test-output-parser ()
+  "Test the output parser against some collected strings."
+  (interactive)
+  (let ((fail nil))
+    (dolist (S semantic-gcc-test-strings)
+      (let* ((fields (semantic-gcc-fields S))
+             (v (cdr (assoc 'version fields)))
+             (h (or (cdr (assoc 'target fields))
+                    (cdr (assoc '--target fields))
+                    (cdr (assoc '--host fields))))
+             (p (cdr (assoc '--prefix fields)))
+             )
+	;; No longer test for prefixes.
+        (when (not (and v h))
+          (let ((strs (split-string S "\n")))
+            (message "Test failed on %S\nV H P:\n%S %S %S" (car strs) v h p))
+          (setq fail t))
+        ))
+    (dolist (S semantic-gcc-test-strings-fail)
+      (let* ((fields (semantic-gcc-fields S))
+             (v (cdr (assoc 'version fields)))
+             (h (or (cdr (assoc '--host fields))
+                    (cdr (assoc 'target fields))))
+             (p (cdr (assoc '--prefix fields)))
+             )
+        (when (and v h p)
+          (message "Negative test failed on %S" S)
+          (setq fail t))
+        ))
+    (if (not fail) (message "Tests passed."))
+    ))
+
+;;;###autoload
+(defun semantic-gcc-test-output-parser-this-machine ()
+  "Test the output parser against the machine currently running Emacs."
+  (interactive)
+  (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v"))))
+    (semantic-gcc-test-output-parser))
+  )
+
+(provide 'semantic-gcc)
+;;; semantic-gcc.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-java.el b/site/cedet-1.0pre7/semantic/bovine/semantic-java.el
new file mode 100644
index 0000000..0fb3838
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-java.el
@@ -0,0 +1,460 @@
+;;; semantic-java.el --- Semantic functions for Java
+
+;;; Copyright (C) 2009 Eric M. Ludlam
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;;   David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: semantic-java.el,v 1.19 2009/09/11 18:54:15 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; semantic-java is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Common function for Java parsers.
+
+;;; Code:
+(require 'semantic)
+(require 'semantic-ctxt)
+(require 'semantic-doc)
+
+;;; Lexical analysis
+;;
+(defconst semantic-java-number-regexp
+  (eval-when-compile
+    (concat "\\("
+            "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][fFdD]\\>"
+            "\\|"
+            "\\<[0-9]+[.]"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+            "\\|"
+            "\\<[0-9]+[lLfFdD]?\\>"
+            "\\)"
+            ))
+  "Lexer regexp to match Java number terminals.
+Following is the specification of Java number literals.
+
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;")
+
+;;; Parsing
+;;
+(defsubst semantic-java-dim (id)
+  "Split ID string into a pair (NAME . DIM).
+NAME is ID without trailing brackets: \"[]\".
+DIM is the dimension of NAME deduced from the number of trailing
+brackets, or 0 if there is no trailing brackets."
+  (let ((dim (string-match "\\(\\[]\\)+\\'" id)))
+    (if dim
+        (cons (substring id 0 dim)
+              (/ (length (match-string 0 id)) 2))
+      (cons id 0))))
+
+(defsubst semantic-java-type (tag)
+  "Return the type of TAG, taking care of array notation."
+  (let ((type (semantic-tag-type tag))
+        (dim  (semantic-tag-get-attribute tag :dereference)))
+    (when dim
+      (while (> dim 0)
+        (setq type (concat type "[]")
+              dim (1- dim))))
+    type))
+
+(defun semantic-java-expand-tag (tag)
+  "Expand compound declarations found in TAG into separate tags.
+TAG contains compound declarations when its class is `variable', and
+its name is a list of elements (NAME START . END), where NAME is a
+compound variable name, and START/END are the bounds of the
+corresponding compound declaration."
+  (let* ((class (semantic-tag-class tag))
+         (elts (semantic-tag-name tag))
+         dim type dim0 elt clone start end xpand)
+    (cond
+     ((and (eq class 'function)
+           (> (cdr (setq dim (semantic-java-dim elts))) 0))
+      (setq clone (semantic-tag-clone tag (car dim))
+            xpand (cons clone xpand))
+      (semantic-tag-put-attribute clone :dereference (cdr dim)))
+     ((eq class 'variable)
+      (or (consp elts) (setq elts (list (list elts))))
+      (setq dim  (semantic-java-dim (semantic-tag-get-attribute tag :type))
+            type (car dim)
+            dim0 (cdr dim))
+      (while elts
+        ;; For each compound element, clone the initial tag with the
+        ;; name and bounds of the compound variable declaration.
+        (setq elt   (car elts)
+              elts  (cdr elts)
+              start (if elts  (cadr elt) (semantic-tag-start tag))
+              end   (if xpand (cddr elt) (semantic-tag-end   tag))
+              dim   (semantic-java-dim (car elt))
+              clone (semantic-tag-clone tag (car dim))
+              xpand (cons clone xpand))
+        (semantic-tag-put-attribute clone :type type)
+        (semantic-tag-put-attribute clone :dereference (+ dim0 (cdr dim)))
+        (semantic-tag-set-bounds clone start end)))
+     )
+    xpand))
+
+;;; Environment
+;;
+(defcustom-mode-local-semantic-dependency-system-include-path
+  java-mode semantic-java-dependency-system-include-path
+  ;; @todo - Use JDEE to get at the include path, or something else?
+  nil
+  "The system include path used by Java langauge.")
+
+;; Local context
+;;
+(define-mode-local-override semantic-ctxt-scoped-types
+  java-mode (&optional point)
+  "Return a list of type names currently in scope at POINT."
+  (mapcar 'semantic-tag-name
+          (semantic-find-tags-by-class
+           'type (semantic-find-tag-by-overlay point))))
+
+;; Prototype handler
+;;
+(defun semantic-java-prototype-function (tag &optional parent color)
+  "Return a function (method) prototype for TAG.
+Optional argument PARENT is a parent (containing) item.
+Optional argument COLOR indicates that color should be mixed in.
+See also `semantic-format-tag-prototype'."
+  (let ((name (semantic-tag-name tag))
+        (type (semantic-java-type tag))
+        (tmpl (semantic-tag-get-attribute tag :template-specifier))
+        (args (semantic-tag-function-arguments tag))
+        (argp "")
+        arg argt)
+    (while args
+      (setq arg  (car args)
+            args (cdr args))
+      (if (semantic-tag-p arg)
+          (setq argt (if color
+                         (semantic--format-colorize-text
+                          (semantic-java-type arg) 'type)
+                       (semantic-java-type arg))
+                argp (concat argp argt (if args "," "")))))
+    (when color
+      (when type
+        (setq type (semantic--format-colorize-text type 'type)))
+      (setq name (semantic--format-colorize-text name 'function)))
+    (concat (or tmpl "") (if tmpl " " "")
+            (or type "") (if type " " "")
+            name "(" argp ")")))
+
+(defun semantic-java-prototype-variable (tag &optional parent color)
+  "Return a variable (field) prototype for TAG.
+Optional argument PARENT is a parent (containing) item.
+Optional argument COLOR indicates that color should be mixed in.
+See also `semantic-format-tag-prototype'."
+  (let ((name (semantic-tag-name tag))
+        (type (semantic-java-type tag)))
+    (concat (if color
+                (semantic--format-colorize-text type 'type)
+              type)
+            " "
+            (if color
+                (semantic--format-colorize-text name 'variable)
+              name))))
+
+(defun semantic-java-prototype-type (tag &optional parent color)
+  "Return a type (class/interface) prototype for TAG.
+Optional argument PARENT is a parent (containing) item.
+Optional argument COLOR indicates that color should be mixed in.
+See also `semantic-format-tag-prototype'."
+  (let ((name (semantic-tag-name tag))
+        (type (semantic-tag-type tag))
+        (tmpl (semantic-tag-get-attribute tag :template-specifier)))
+    (concat type " "
+            (if color
+                (semantic--format-colorize-text name 'type)
+              name)
+            (or tmpl ""))))
+
+(define-mode-local-override semantic-format-tag-prototype
+  java-mode (tag &optional parent color)
+  "Return a prototype for TOKEN.
+Optional argument PARENT is a parent (containing) item.
+Optional argument COLOR indicates that color should be mixed in."
+  (let ((f (intern-soft (format "semantic-java-prototype-%s"
+                                (semantic-tag-class tag)))))
+    (funcall (if (fboundp f)
+                 f
+               'semantic-format-tag-prototype-default)
+             tag parent color)))
+
+(semantic-alias-obsolete 'semantic-java-prototype-nonterminal
+                         'semantic-format-tag-prototype-java-mode)
+
+;; Include Tag Name
+;;
+
+;; Thanks Bruce Stephens
+(define-mode-local-override semantic-tag-include-filename java-mode (tag)
+  "Return a suitable path for (some) Java imports"
+  (let ((name (semantic-tag-name tag)))
+    (concat (mapconcat 'identity (split-string name "\\.") "/") ".java")))
+
+
+;; Documentation handler
+;;
+(defsubst semantic-java-skip-spaces-backward ()
+  "Move point backward, skipping Java whitespaces."
+  (skip-chars-backward " \n\r\t"))
+
+(defsubst semantic-java-skip-spaces-forward ()
+  "Move point forward, skipping Java whitespaces."
+  (skip-chars-forward " \n\r\t"))
+
+(define-mode-local-override semantic-documentation-for-tag
+  java-mode (&optional tag nosnarf)
+  "Find documentation from TAG and return it as a clean string.
+Java have documentation set in a comment preceeding TAG's definition.
+Attempt to strip out comment syntactic sugar, unless optional argument
+NOSNARF is non-nil.
+If NOSNARF is 'lex, then return the semantic lex token."
+  (when (or tag (setq tag (semantic-current-tag)))
+    (with-current-buffer (semantic-tag-buffer tag)
+      (save-excursion
+        ;; Move the point at token start
+        (goto-char (semantic-tag-start tag))
+        (semantic-java-skip-spaces-forward)
+        ;; If the point already at "/**" (this occurs after a doc fix)
+        (if (looking-at "/\\*\\*")
+            nil
+          ;; Skip previous spaces
+          (semantic-java-skip-spaces-backward)
+          ;; Ensure point is after "*/" (javadoc block comment end)
+          (condition-case nil
+              (backward-char 2)
+            (error nil))
+          (when (looking-at "\\*/")
+            ;; Move the point backward across the comment
+            (forward-char 2)              ; return just after "*/"
+            (forward-comment -1)          ; to skip the entire block
+            ))
+        ;; Verify the point is at "/**" (javadoc block comment start)
+        (if (looking-at "/\\*\\*")
+            (let ((p (point))
+                  (c (semantic-doc-snarf-comment-for-tag 'lex)))
+              (when c
+                ;; Verify that the token just following the doc
+                ;; comment is the current one!
+                (goto-char (semantic-lex-token-end c))
+                (semantic-java-skip-spaces-forward)
+                (when (eq tag (semantic-current-tag))
+                  (goto-char p)
+                  (semantic-doc-snarf-comment-for-tag nosnarf)))))
+        ))))
+
+;;; Javadoc facilities
+;;
+
+;; Javadoc elements
+;;
+(defvar semantic-java-doc-line-tags nil
+  "Valid javadoc line tags.
+Ordered following Sun's Tag Convention at
+<http://java.sun.com/products/jdk/javadoc/writingdoccomments/index.html>")
+
+(defvar semantic-java-doc-with-name-tags nil
+  "Javadoc tags which have a name.")
+
+(defvar semantic-java-doc-with-ref-tags nil
+  "Javadoc tags which have a reference.")
+
+;; Optional javadoc tags by classes of semantic tag
+;;
+(defvar semantic-java-doc-extra-type-tags nil
+  "Optional tags used in class/interface documentation.
+Ordered following Sun's Tag Convention.")
+
+(defvar semantic-java-doc-extra-function-tags nil
+  "Optional tags used in method/constructor documentation.
+Ordered following Sun's Tag Convention.")
+
+(defvar semantic-java-doc-extra-variable-tags nil
+  "Optional tags used in field documentation.
+Ordered following Sun's Tag Convention.")
+
+;; All javadoc tags by classes of semantic tag
+;;
+(defvar semantic-java-doc-type-tags nil
+  "Tags allowed in class/interface documentation.
+Ordered following Sun's Tag Convention.")
+
+(defvar semantic-java-doc-function-tags nil
+  "Tags allowed in method/constructor documentation.
+Ordered following Sun's Tag Convention.")
+
+(defvar semantic-java-doc-variable-tags nil
+  "Tags allowed in field documentation.
+Ordered following Sun's Tag Convention.")
+
+;; Access to Javadoc elements
+;;
+(defmacro semantic-java-doc-tag (name)
+  "Return doc tag from NAME.
+That is @NAME."
+  `(concat "@" ,name))
+
+(defsubst semantic-java-doc-tag-name (tag)
+  "Return name of the doc TAG symbol.
+That is TAG `symbol-name' without the leading '@'."
+  (substring (symbol-name tag) 1))
+
+(defun semantic-java-doc-keyword-before-p (k1 k2)
+  "Return non-nil if javadoc keyword K1 is before K2."
+  (let* ((t1   (semantic-java-doc-tag k1))
+         (t2   (semantic-java-doc-tag k2))
+         (seq1 (and (semantic-lex-keyword-p t1)
+                    (plist-get (semantic-lex-keyword-get t1 'javadoc)
+                               'seq)))
+         (seq2 (and (semantic-lex-keyword-p t2)
+                    (plist-get (semantic-lex-keyword-get t2 'javadoc)
+                               'seq))))
+    (if (and (numberp seq1) (numberp seq2))
+        (<= seq1 seq2)
+      ;; Unknown tags (probably custom ones) are always after official
+      ;; ones and are not themselves ordered.
+      (or (numberp seq1)
+          (and (not seq1) (not seq2))))))
+
+(defun semantic-java-doc-keywords-map (fun &optional property)
+  "Run function FUN for each javadoc keyword.
+Return the list of FUN results.  If optional PROPERTY is non nil only
+call FUN for javadoc keyword which have a value for PROPERTY.  FUN
+receives two arguments: the javadoc keyword and its associated
+'javadoc property list.  It can return any value.  Nil values are
+removed from the result list."
+  (delq nil
+        (mapcar
+         #'(lambda (k)
+             (let* ((tag   (semantic-java-doc-tag k))
+                    (plist (semantic-lex-keyword-get tag 'javadoc)))
+               (if (or (not property) (plist-get plist property))
+                   (funcall fun k plist))))
+         semantic-java-doc-line-tags)))
+
+
+;;; Mode setup
+;;
+
+(defun semantic-java-doc-setup ()
+  "Lazy initialization of javadoc elements."
+  (or semantic-java-doc-line-tags
+      (setq semantic-java-doc-line-tags
+            (sort (mapcar #'semantic-java-doc-tag-name
+                          (semantic-lex-keywords 'javadoc))
+                  #'semantic-java-doc-keyword-before-p)))
+
+  (or semantic-java-doc-with-name-tags
+      (setq semantic-java-doc-with-name-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 k)
+             'with-name)))
+
+  (or semantic-java-doc-with-ref-tags
+      (setq semantic-java-doc-with-ref-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 k)
+             'with-ref)))
+
+  (or semantic-java-doc-extra-type-tags
+      (setq semantic-java-doc-extra-type-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'type (plist-get p 'usage))
+                     k))
+             'opt)))
+
+  (or semantic-java-doc-extra-function-tags
+      (setq semantic-java-doc-extra-function-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'function (plist-get p 'usage))
+                     k))
+             'opt)))
+
+  (or semantic-java-doc-extra-variable-tags
+      (setq semantic-java-doc-extra-variable-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'variable (plist-get p 'usage))
+                     k))
+             'opt)))
+
+  (or semantic-java-doc-type-tags
+      (setq semantic-java-doc-type-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'type (plist-get p 'usage))
+                     k)))))
+
+  (or semantic-java-doc-function-tags
+      (setq semantic-java-doc-function-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'function (plist-get p 'usage))
+                     k)))))
+
+  (or semantic-java-doc-variable-tags
+      (setq semantic-java-doc-variable-tags
+            (semantic-java-doc-keywords-map
+             #'(lambda (k p)
+                 (if (memq 'variable (plist-get p 'usage))
+                     k)))))
+
+  )
+
+(provide 'semantic-java)
+
+;;; semantic-java.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-make-by.el b/site/cedet-1.0pre7/semantic/bovine/semantic-make-by.el
new file mode 100644
index 0000000..3d7b083
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-make-by.el
@@ -0,0 +1,398 @@
+;;; semantic-make-by.el --- Generated parser support file
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:52-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file make.by.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst semantic-make-by--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("if" . IF)
+     ("ifdef" . IFDEF)
+     ("ifndef" . IFNDEF)
+     ("ifeq" . IFEQ)
+     ("ifneq" . IFNEQ)
+     ("else" . ELSE)
+     ("endif" . ENDIF)
+     ("include" . INCLUDE))
+   '(("include" summary "Macro: include filename1 filename2 ...")
+     ("ifneq" summary "Conditional: ifneq (expression) ... else ... endif")
+     ("ifeq" summary "Conditional: ifeq (expression) ... else ... endif")
+     ("ifndef" summary "Conditional: ifndef (expression) ... else ... endif")
+     ("ifdef" summary "Conditional: ifdef (expression) ... else ... endif")
+     ("endif" summary "Conditional: if (expression) ... else ... endif")
+     ("else" summary "Conditional: if (expression) ... else ... endif")
+     ("if" summary "Conditional: if (expression) ... else ... endif")))
+  "Table of language keywords.")
+
+(defconst semantic-make-by--token-table
+  (semantic-lex-make-type-table
+   '(("punctuation"
+      (BACKSLASH . "\\`[\\]\\'")
+      (DOLLAR . "\\`[$]\\'")
+      (EQUAL . "\\`[=]\\'")
+      (PLUS . "\\`[+]\\'")
+      (COLON . "\\`[:]\\'")))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst semantic-make-by--parse-table
+  `(
+    (bovine-toplevel 
+     (Makefile)
+     ) ;; end bovine-toplevel
+
+    (Makefile
+     (bol
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (bol
+      variable
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (bol
+      rule
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (bol
+      conditional
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (bol
+      include
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (whitespace
+      ,(semantic-lambda
+	(list nil))
+      )
+     (newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end Makefile
+
+    (variable
+     (symbol
+      opt-whitespace
+      equals
+      opt-whitespace
+      element-list
+      ,(semantic-lambda
+	(semantic-tag-new-variable
+	 (nth 0 vals) nil
+	 (nth 4 vals)))
+      )
+     ) ;; end variable
+
+    (rule
+     (targets
+      opt-whitespace
+      colons
+      opt-whitespace
+      element-list
+      commands
+      ,(semantic-lambda
+	(semantic-tag-new-function
+	 (nth 0 vals) nil
+	 (nth 4 vals)))
+      )
+     ) ;; end rule
+
+    (targets
+     (target
+      opt-whitespace
+      targets
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 0 vals))
+	 (car
+	  (nth 2 vals))))
+      )
+     (target
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 0 vals))))
+      )
+     ) ;; end targets
+
+    (target
+     (sub-target
+      target
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  (car
+	   (nth 2 vals)))))
+      )
+     (sub-target
+      ,(semantic-lambda
+	(list
+	 (car
+	  (nth 0 vals))))
+      )
+     ) ;; end target
+
+    (sub-target
+     (symbol)
+     (string)
+     (varref)
+     ) ;; end sub-target
+
+    (conditional
+     (IF
+      some-whitespace
+      symbol
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (IFDEF
+      some-whitespace
+      symbol
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (IFNDEF
+      some-whitespace
+      symbol
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (IFEQ
+      some-whitespace
+      expression
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (IFNEQ
+      some-whitespace
+      expression
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (ELSE
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     (ENDIF
+      newline
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end conditional
+
+    (expression
+     (semantic-list)
+     ) ;; end expression
+
+    (include
+     (INCLUDE
+      some-whitespace
+      element-list
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (nth 2 vals) nil))
+      )
+     ) ;; end include
+
+    (equals
+     (punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda)
+      )
+     (punctuation
+      "\\`[+]\\'"
+      punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda)
+      )
+     (punctuation
+      "\\`[=]\\'"
+      ,(semantic-lambda)
+      )
+     ) ;; end equals
+
+    (colons
+     (punctuation
+      "\\`[:]\\'"
+      punctuation
+      "\\`[:]\\'"
+      ,(semantic-lambda)
+      )
+     (punctuation
+      "\\`[:]\\'"
+      ,(semantic-lambda)
+      )
+     ) ;; end colons
+
+    (element-list
+     (elements
+      newline
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ) ;; end element-list
+
+    (elements
+     (element
+      some-whitespace
+      elements
+      ,(semantic-lambda
+	(nth 0 vals)
+	(nth 2 vals))
+      )
+     (element
+      ,(semantic-lambda
+	(nth 0 vals))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end elements
+
+    (element
+     (sub-element
+      element
+      ,(semantic-lambda
+	(list
+	 (concat
+	  (car
+	   (nth 0 vals))
+	  (car
+	   (nth 1 vals)))))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end element
+
+    (sub-element
+     (symbol)
+     (string)
+     (punctuation)
+     (semantic-list
+      ,(semantic-lambda
+	(list
+	 (buffer-substring-no-properties
+	  (identity start)
+	  (identity end))))
+      )
+     ) ;; end sub-element
+
+    (varref
+     (punctuation
+      "\\`[$]\\'"
+      semantic-list
+      ,(semantic-lambda
+	(list
+	 (buffer-substring-no-properties
+	  (identity start)
+	  (identity end))))
+      )
+     ) ;; end varref
+
+    (commands
+     (bol
+      shell-command
+      newline
+      commands
+      ,(semantic-lambda
+	(list
+	 (nth 0 vals))
+	(nth 1 vals))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end commands
+
+    (opt-whitespace
+     (some-whitespace
+      ,(semantic-lambda
+	(list nil))
+      )
+     ( ;;EMPTY
+      )
+     ) ;; end opt-whitespace
+
+    (some-whitespace
+     (whitespace
+      some-whitespace
+      ,(semantic-lambda
+	(list nil))
+      )
+     (whitespace
+      ,(semantic-lambda
+	(list nil))
+      )
+     ) ;; end some-whitespace
+    )
+  "Parser table.")
+
+(defun semantic-make-by--install-parser ()
+  "Setup the Semantic Parser."
+  (setq semantic--parse-table semantic-make-by--parse-table
+	semantic-debug-parser-source "make.by"
+	semantic-debug-parser-class 'semantic-bovine-debug-parser
+	semantic-flex-keywords-obarray semantic-make-by--keyword-table
+	))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+(provide 'semantic-make-by)
+
+;;; semantic-make-by.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-make.el b/site/cedet-1.0pre7/semantic/bovine/semantic-make.el
new file mode 100755
index 0000000..7d93ed2
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-make.el
@@ -0,0 +1,239 @@
+;;; semantic-make.el --- Makefile parsing rules.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-make.el,v 1.22 2009/09/11 18:53:55 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic-ex is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Use the Semantic Bovinator to parse Makefiles.
+;; Concocted as an experiment for nonstandard languages.
+
+(require 'semantic)
+(require 'semantic-make-by)
+(require 'backquote)
+
+(eval-when-compile
+  (require 'semantic-format)
+  (require 'semantic-analyze)
+  )
+
+;;; Code:
+(define-lex-analyzer semantic-lex-make-backslash-no-newline
+  "Detect and create a beginning of line token (BOL)."
+  (and (looking-at "\\(\\\\\n\\s-*\\)")
+       ;; We have a \ at eol.  Push it as whitespace, but pretend
+       ;; it never happened so we can skip the BOL tokenizer.
+       (semantic-lex-push-token (semantic-lex-token 'whitespace
+						    (match-beginning 1)
+						    (match-end 1)))
+       (goto-char (match-end 1))
+       nil) ;; CONTINUE
+   ;; We want to skip BOL, so move to the next condition.
+   nil)
+
+(define-lex-regex-analyzer semantic-lex-make-command
+  "A command in a Makefile consists of a line starting with TAB, and ending at the newline."
+  "^\\(\t\\)"
+  (let ((start (match-end 0)))
+    (while (progn (end-of-line)
+		  (save-excursion (forward-char -1) (looking-at "\\\\")))
+      (forward-char 1))
+    (semantic-lex-push-token
+     (semantic-lex-token 'shell-command start (point)))))
+
+(define-lex-regex-analyzer semantic-lex-make-ignore-automake-conditional
+  "An automake conditional seems to really bog down the parser.
+Ignore them."
+  "^@\\(\\w\\|\\s_\\)+@"
+  (setq semantic-lex-end-point (match-end 0)))
+
+(define-lex semantic-make-lexer
+  "Lexical analyzer for Makefiles."
+  semantic-lex-beginning-of-line
+  semantic-lex-make-ignore-automake-conditional
+  semantic-lex-make-command
+  semantic-lex-make-backslash-no-newline
+  semantic-lex-whitespace
+  semantic-lex-newline
+  semantic-lex-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-string
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+(defun semantic-make-expand-tag (tag)
+  "Expand TAG into a list of equivalent tags, or nil."
+  (let ((name (semantic-tag-name tag))
+        xpand)
+    ;(message "Expanding %S" name)
+    ;(goto-char (semantic-tag-start tag))
+    ;(sit-for 0)
+    (if (and (consp name)
+	     (memq (semantic-tag-class tag) '(function include))
+	     (> (length name) 1))
+	(while name
+	  (setq xpand (cons (semantic-tag-clone tag (car name)) xpand)
+		name  (cdr name)))
+      ;; Else, only a single name.
+      (when (consp name)
+	(setcar tag (car name)))
+      (setq xpand (list tag)))
+    xpand))
+
+(define-mode-local-override semantic-get-local-variables
+  makefile-mode (&optional point)
+  "Override `semantic-get-local-variables' so it does not throw an error.
+We never have local variables in Makefiles."
+  nil)
+
+(define-mode-local-override semantic-ctxt-current-class-list
+  makefile-mode (&optional point)
+  "List of classes that are valid to place at point."
+  (let ((tag (semantic-current-tag)))
+    (when tag
+      (cond ((condition-case nil
+		 (save-excursion
+		   (condition-case nil (forward-sexp -1)
+		     (error nil))
+		   (forward-char -2)
+		   (looking-at "\\$\\s("))
+	       (error nil))
+	     ;; We are in a variable reference
+	     '(variable))
+	    ((semantic-tag-of-class-p tag 'function)
+	     ;; Note: variables are handled above.
+	     '(function filename))
+	    ((semantic-tag-of-class-p tag 'variable)
+	     '(function filename))
+	    ))))
+
+(define-mode-local-override semantic-format-tag-abbreviate
+  makefile-mode (tag &optional parent color)
+  "Return an abbreviated string describing tag for Makefiles."
+  (let ((class (semantic-tag-class tag))
+	(name (semantic-format-tag-name tag parent color))
+	)
+    (cond ((eq class 'function)
+	   (concat name ":"))
+	  ((eq class 'filename)
+	   (concat "./" name))
+	  (t
+	   (semantic-format-tag-abbreviate-default tag parent color)))))
+
+(defvar-mode-local makefile-mode semantic-function-argument-separator
+  " "
+  "Separator used between dependencies to rules.")
+
+(define-mode-local-override semantic-format-tag-prototype
+  makefile-mode (tag &optional parent color)
+  "Return a prototype string describing tag for Makefiles."
+  (let* ((class (semantic-tag-class tag))
+	 (name (semantic-format-tag-name tag parent color))
+	 )
+    (cond ((eq class 'function)
+	   (concat name ": "
+		   (semantic--format-tag-arguments
+		    (semantic-tag-function-arguments tag)
+		    #'semantic-format-tag-prototype
+		    color)))
+	  ((eq class 'filename)
+	   (concat "./" name))
+	  (t
+	   (semantic-format-tag-prototype-default tag parent color)))))
+
+(define-mode-local-override semantic-format-tag-concise-prototype
+  makefile-mode (tag &optional parent color)
+  "Return a concise prototype string describing tag for Makefiles.
+This is the same as a regular prototype."
+  (semantic-format-tag-prototype tag parent color))
+
+(define-mode-local-override semantic-format-tag-uml-prototype
+  makefile-mode (tag &optional parent color)
+  "Return a UML prototype string describing tag for Makefiles.
+This is the same as a regular prototype."
+  (semantic-format-tag-prototype tag parent color))
+
+(define-mode-local-override semantic-analyze-possible-completions
+  makefile-mode (context)
+  "Return a list of possible completions in a Makefile.
+Uses default implementation, and also gets a list of filenames."
+  (save-excursion
+    (set-buffer (oref context buffer))
+    (let* ((normal (semantic-analyze-possible-completions-default context))
+	   (classes (oref context :prefixclass))
+	   (filetags nil))
+      (when (memq 'filename classes)
+	(let* ((prefix (car (oref context :prefix)))
+	       (completetext (cond ((semantic-tag-p prefix)
+				    (semantic-tag-name prefix))
+				   ((stringp prefix)
+				    prefix)
+				   ((stringp (car prefix))
+				    (car prefix))))
+	       (files (directory-files default-directory nil
+				       (concat "^" completetext))))
+	  (setq filetags (mapcar (lambda (f) (semantic-tag f 'filename))
+				 files))))
+      ;; Return the normal completions found, plus any filenames
+      ;; that match.
+      (append normal filetags)
+      )))
+
+(defcustom-mode-local-semantic-dependency-system-include-path
+  makefile-mode semantic-makefile-dependency-system-include-path
+  nil
+  "The system include path used by Makefiles langauge.")
+
+;;;###autoload
+(defun semantic-default-make-setup ()
+  "Set up a Makefile buffer for parsing with semantic."
+  (semantic-make-by--install-parser)
+  (setq semantic-symbol->name-assoc-list '((variable . "Variables")
+                                           (function . "Rules")
+                                           (include . "Dependencies")
+					   ;; File is a meta-type created
+					   ;; to represent completions
+					   ;; but not actually parsed.
+					   (file . "File"))
+        semantic-case-fold t
+        semantic-tag-expand-function 'semantic-make-expand-tag
+        semantic-lex-syntax-modifications '((?. "_")
+                                            (?= ".")
+                                            (?/ "_")
+                                            (?$ ".")
+                                            (?+ ".")
+                                            (?\\ ".")
+                                            )
+        imenu-create-index-function 'semantic-create-imenu-index
+        )
+  (setq semantic-lex-analyzer #'semantic-make-lexer)
+  )
+
+;;;###autoload
+(add-hook 'makefile-mode-hook 'semantic-default-make-setup)
+
+(provide 'semantic-make)
+
+;;; semantic-make.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-scm-by.el b/site/cedet-1.0pre7/semantic/bovine/semantic-scm-by.el
new file mode 100644
index 0000000..8911259
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-scm-by.el
@@ -0,0 +1,203 @@
+;;; semantic-scm-by.el --- Generated parser support file
+
+;; Copyright (C) 2001, 2003, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:52-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file scheme.by.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst semantic-scm-by--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("define" . DEFINE)
+     ("define-module" . DEFINE-MODULE)
+     ("load" . LOAD))
+   '(("load" summary "Function: (load \"filename\")")
+     ("define-module" summary "Function: (define-module (name arg1 ...)) ")
+     ("define" summary "Function: (define symbol expression)")))
+  "Table of language keywords.")
+
+(defconst semantic-scm-by--token-table
+  (semantic-lex-make-type-table
+   '(("close-paren"
+      (CLOSEPAREN . ")"))
+     ("open-paren"
+      (OPENPAREN . "(")))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst semantic-scm-by--parse-table
+  `(
+    (bovine-toplevel 
+     (scheme)
+     ) ;; end bovine-toplevel
+
+    (scheme
+     (semantic-list
+      ,(lambda (vals start end)
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 0 vals))
+	  (cdr
+	   (nth 0 vals))
+	  'scheme-list))
+      )
+     ) ;; end scheme
+
+    (scheme-list
+     (open-paren
+      "("
+      scheme-in-list
+      close-paren
+      ")"
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     ) ;; end scheme-list
+
+    (scheme-in-list
+     (DEFINE
+       symbol
+       expression
+       ,(semantic-lambda
+	 (semantic-tag-new-variable
+	  (nth 1 vals) nil
+	  (nth 2 vals)))
+       )
+     (DEFINE
+       name-args
+       opt-doc
+       sequence
+       ,(semantic-lambda
+	 (semantic-tag-new-function
+	  (car
+	   (nth 1 vals)) nil
+	  (cdr
+	   (nth 1 vals))))
+       )
+     (DEFINE-MODULE
+       name-args
+       ,(semantic-lambda
+	 (semantic-tag-new-package
+	  (nth
+	   (length
+	    (nth 1 vals))
+	   (nth 1 vals)) nil))
+       )
+     (LOAD
+      string
+      ,(semantic-lambda
+	(semantic-tag-new-include
+	 (file-name-nondirectory
+	  (read
+	   (nth 1 vals)))
+	 (read
+	  (nth 1 vals))))
+      )
+     (symbol
+      ,(semantic-lambda
+	(semantic-tag-new-code
+	 (nth 0 vals) nil))
+      )
+     ) ;; end scheme-in-list
+
+    (name-args
+     (semantic-list
+      ,(lambda (vals start end)
+	 (semantic-bovinate-from-nonterminal
+	  (car
+	   (nth 0 vals))
+	  (cdr
+	   (nth 0 vals))
+	  'name-arg-expand))
+      )
+     ) ;; end name-args
+
+    (name-arg-expand
+     (open-paren
+      name-arg-expand
+      ,(semantic-lambda
+	(nth 1 vals))
+      )
+     (symbol
+      name-arg-expand
+      ,(semantic-lambda
+	(cons
+	 (nth 0 vals)
+	 (nth 1 vals)))
+      )
+     ( ;;EMPTY
+      ,(semantic-lambda)
+      )
+     ) ;; end name-arg-expand
+
+    (opt-doc
+     (string)
+     ( ;;EMPTY
+      )
+     ) ;; end opt-doc
+
+    (sequence
+     (expression
+      sequence)
+     (expression)
+     ) ;; end sequence
+
+    (expression
+     (symbol)
+     (semantic-list)
+     (string)
+     (number)
+     ) ;; end expression
+    )
+  "Parser table.")
+
+(defun semantic-scm-by--install-parser ()
+  "Setup the Semantic Parser."
+  (setq semantic--parse-table semantic-scm-by--parse-table
+	semantic-debug-parser-source "scheme.by"
+	semantic-debug-parser-class 'semantic-bovine-debug-parser
+	semantic-flex-keywords-obarray semantic-scm-by--keyword-table
+	))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+(provide 'semantic-scm-by)
+
+;;; semantic-scm-by.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-scm.el b/site/cedet-1.0pre7/semantic/bovine/semantic-scm.el
new file mode 100644
index 0000000..1538bd9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-scm.el
@@ -0,0 +1,118 @@
+;;; semantic-scm.el --- Semantic details for Scheme (guile)
+
+;;; Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-scm.el,v 1.17 2009/05/14 01:41:52 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Use the Semantic Bovinator for Scheme (guile)
+
+(require 'semantic)
+(require 'semantic-scm-by)
+(require 'backquote)
+
+(eval-when-compile
+  (require 'semantic-format))
+
+;;; Code:
+
+(defcustom-mode-local-semantic-dependency-system-include-path
+  scheme-mode semantic-default-scheme-path
+  '("/usr/share/guile/")
+  "Default set of include paths for scheme (guile) code.
+This should probably do some sort of search to see what is
+actually on the local machine.")
+
+(define-mode-local-override semantic-format-tag-prototype scheme-mode (tag)
+  "Return a prototype for the Emacs Lisp nonterminal TAG."
+  (let* ((tok (semantic-tag-class tag))
+	 (args (semantic-tag-components tag))
+	 )
+    (if (eq tok 'function)
+	(concat (semantic-tag-name tag) " ("
+		(mapconcat (lambda (a) a) args " ")
+		")")
+      (semantic-format-tag-prototype-default tag))))
+
+(define-mode-local-override semantic-documentation-for-tag scheme-mode (tag &optional nosnarf)
+  "Return the documentation string for TAG.
+Optional argument NOSNARF is ignored."
+  (let ((d (semantic-tag-docstring tag)))
+    (if (and d (> (length d) 0) (= (aref d 0) ?*))
+	(substring d 1)
+      d)))
+
+(define-mode-local-override semantic-insert-foreign-tag scheme-mode (tag tagfile)
+  "Insert TAG from TAGFILE at point.
+Attempts a simple prototype for calling or using TAG."
+  (cond ((eq (semantic-tag-class tag) 'function)
+	 (insert "(" (semantic-tag-name tag) " )")
+	 (forward-char -1))
+	(t
+	 (insert (semantic-tag-name tag)))))
+
+;; Note: Analyzer from Henry S. Thompson
+(define-lex-regex-analyzer semantic-lex-scheme-symbol
+  "Detect and create symbol and keyword tokens."
+  "\\(\\sw\\([:]\\|\\sw\\|\\s_\\)+\\)"
+  ;; (message (format "symbol: %s" (match-string 0)))
+  (semantic-lex-push-token
+   (semantic-lex-token
+    (or (semantic-lex-keyword-p (match-string 0)) 'symbol)
+    (match-beginning 0) (match-end 0))))
+
+
+(define-lex semantic-scheme-lexer
+  "A simple lexical analyzer that handles simple buffers.
+This lexer ignores comments and whitespace, and will return
+syntax as specified by the syntax table."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-scheme-symbol
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-string
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-number
+  semantic-lex-default-action)
+
+;;;###autoload
+(defun semantic-default-scheme-setup ()
+  "Setup hook function for Emacs Lisp files and Semantic."
+  (semantic-scm-by--install-parser)
+  (setq semantic-symbol->name-assoc-list '( (variable . "Variables")
+                                            ;;(type     . "Types")
+                                            (function . "Functions")
+                                            (include  . "Loads")
+                                            (package  . "DefineModule"))
+        imenu-create-index-function 'semantic-create-imenu-index
+        imenu-create-index-function 'semantic-create-imenu-index
+        )
+  (setq semantic-lex-analyzer #'semantic-scheme-lexer)
+  )
+
+;;;###autoload
+(add-hook 'scheme-mode-hook 'semantic-default-scheme-setup)
+
+(provide 'semantic-scm)
+
+;;; semantic-scm.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/semantic-skel.el b/site/cedet-1.0pre7/semantic/bovine/semantic-skel.el
new file mode 100644
index 0000000..1ba7555
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/semantic-skel.el
@@ -0,0 +1,127 @@
+;; NOTE TO USERS OF THIS SKELETON:
+;;
+;; You may want to use the wisent parser generator instead.  It
+;; will generate more efficient parsers.
+
+
+;;; semantic-skel.el --- Semantic details for skel
+
+;;; Copyright (C) 2001, 2003, 2004, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-skel.el,v 1.8 2009/01/24 03:53:52 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+
+;;; History:
+;; 
+
+(require 'semantic)
+(require 'semantic-skeleton-by)
+(require 'backquote)
+
+;; Depending on what elements you include specialized support for
+(eval-when-compile
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+;;; Code:
+
+;; Create a lexical analyzer for your language.  You can use
+;; both the provided analyzers, and your own custom analyzers
+;; that let you take short-cuts in your language.
+
+;; One analyzer
+(define-lex-regex-analyzer semantic-lex-skel-if-0
+  "Block out code matched in an #if 0 condition."
+  "^\\s-*#if\\s-*0$"
+  (beginning-of-line)
+  (c-forward-conditional 1)
+  (setq semantic-lex-end-point (point))
+  nil)
+
+;; Define the lexial analyzer
+(define-lex semantic-skeleton-lexer
+  "Lexical Analyzer for SKELETON code."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-skel-if-0
+  semantic-lex-number
+  semantic-lex-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+;; You do not need to use this function unless you have compound
+;; definitions.  For example, in C, the following is expanded:
+;;  int x, y;
+(defun semantic-skeleton-expand-tag (nonterm)
+  "Expand NONTERM into a list of equivalent nonterminals, or nil."
+  nil)
+
+;;; Override methods & Variables
+;;
+(defcustom-mode-local-semantic-dependency-system-include-path
+  skel-mode semantic-makefile-dependency-system-include-path
+  nil
+  "The system include path used by skel langauge.")
+
+;; Add methods to the override table here.  See
+;; `semantic-install-function-overrides' for more details.
+
+
+;;; Setup function
+;;
+;;;###autoload
+(defun semantic-default-skel-setup ()
+  "Set up a buffer for semantic parsing of the skeleton language."
+  (semantic-skeleton-by--install-parser)
+  ;; Commented out lines below are generally considered optional
+  ;; See the Emacs Doc for the symbols used below
+  (setq semantic-symbol->name-assoc-list '( (variable . "Variables")
+                                            (type     . "Types")
+                                            (function . "Functions")
+                                            (include  . "Includes")
+                                            (package  . "Exports"))
+        ;;semantic-tag-expand-function 'semantic-skeleton-expand-tag
+        ;;semantic-lex-extensions semantic-lex-skeleton-extensions
+        ;;semantic-dependency-include-path semantic-default-skeleton-path
+        imenu-create-index-function 'semantic-create-imenu-index
+        semantic-type-relation-separator-character '(".")
+        semantic-command-separation-character ";"
+        ;; Semantic navigation inside 'type children
+        senator-step-at-tag-classes '(function variable)
+        )
+  )
+
+;; Loading this file will install the parser.  Add this line
+;; to a .emacs file, or other setup file along with an autoload
+;; for the setup function to dynamically install the parser
+;; when a file of that type is read into Emacs.
+(add-hook 'skeleton-mode-hook 'semantic-default-skeleton-setup)
+
+(provide 'semantic-skel)
+
+;;; semantic-skel.el ends here
diff --git a/site/cedet-1.0pre7/semantic/bovine/skeleton.by b/site/cedet-1.0pre7/semantic/bovine/skeleton.by
new file mode 100644
index 0000000..a838055
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/bovine/skeleton.by
@@ -0,0 +1,81 @@
+;;; skeleton.by -- Skeleton for creating BY files.
+;;
+;; Copyright (C) 2001, 2003 Eric M. Ludlam
+;;
+;; Author: 
+;; X-RCS: $Id: skeleton.by,v 1.5 2005/09/30 20:22:41 zappo Exp $
+;;
+;; .bnf is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+
+;; Replace occurance of "skeleton" with the name of your language.
+
+;; Replace start, and scopestart names with something apropriate for
+;; your language.
+
+%package semantic-skeleton-by
+
+%languagemode  skeleton-mode
+%start         starting_rule
+%scopestart    start_scope_rule
+
+;; Make common keywords into tokens returned by the lexer.
+;; This improves accuracy, makes this file more readable.
+;; Use SOMETHING in your rules as a terminal
+%token SOMETHING "something"
+;; Adding a summary help's `eldoc' mode display useful information
+;; in your language.
+%put SOMETHING summary "Describe something"
+
+;; Turn common punctuation elements into tokens.
+;; This does not effect lexical analysis or accuracy,
+;; but does make your file more readable.
+%token <punctuation> PERIOD "\\`[.]\\'"
+%token <punctuation> OPERATORS "[-+*/%^|&]"
+
+%%
+
+starting_rule : something
+	      ;
+
+start_scope_rule : something_else
+		 ;
+
+
+something : SOMETHING
+	  ;
+
+;; Examples from c.by:
+
+opt-expression : expression
+	       | ;; EMPTY
+	       ;
+
+;; This expression parses over expressions, but doesn't return
+;; anything
+expression : number
+	     ( )
+	   | symbol
+	     ( )
+	   | string
+	     ( )
+           | semantic-list
+	     ( )
+	   | OPERATORS expression
+	   ;; ( nil )
+	   ;
+
+;;; skeleton.by ends here
diff --git a/site/cedet-1.0pre7/semantic/ctags/Makefile b/site/cedet-1.0pre7/semantic/ctags/Makefile
new file mode 100644
index 0000000..082a308
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/Makefile
@@ -0,0 +1,51 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+ctags_LISP=semantic-ectag-util.el semantic-ectag-lang.el semantic-ectag-parse.el semanticdb-ectag.el semantic-ectag-lang2.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+LOADPATH= ../bovine/ ../../eieio/ ../ ../../common/
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/ctags
+
+
+
+all: ctags
+
+.PHONY: ctags
+ctags: $(ctags_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(ctags_LISP) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/ctags/Project.ede b/site/cedet-1.0pre7/semantic/ctags/Project.ede
new file mode 100644
index 0000000..2eacf3b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/Project.ede
@@ -0,0 +1,14 @@
+;; Object ctags
+;; EDE project file.
+(ede-proj-project "ctags"
+  :name "ctags"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp "ctags"
+    :name "ctags"
+    :path ""
+    :source '("semantic-ectag-util.el" "semantic-ectag-lang.el" "semantic-ectag-parse.el" "semanticdb-ectag.el" "semantic-ectag-lang2.el")
+    :aux-packages '("mode-local" "semantic-fw" "eieio" "semantic-bovine.el")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang.el b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang.el
new file mode 100644
index 0000000..1e7b945
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang.el
@@ -0,0 +1,106 @@
+;;; semantic-ectag-lang.el --- Exuberent Ctags per-language support
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-ectag-lang.el,v 1.10 2009/07/27 01:37:17 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Support various languages via Exuberent CTags.
+;;
+;; Support requires:
+;;  * Specification of tag 'kind' to get
+;;  * Signature parsing.
+
+(require 'semantic-fw)
+(require 'semantic-ectag-parse)
+
+;;; Code:
+(defun semantic-ectag-simple-setup ()
+  "Default way to add exuberent ctags support in a language hook.
+Any mode that has `semantic-ectag-lang' and `semantic-ectag-lang-kind'
+can be support with this simple setup."
+  (semantic-ectag-setup-parse-table)
+  (setq imenu-create-index-function 'semantic-create-imenu-index))
+
+(defmacro semantic-ectag-add-language-support (mode name kinds)
+  "Add simple language support via exuberent ctags.
+MODE is the mode to support.
+NAME is the exuberent ctags language name.
+KINDS are the kinds of tags to generate from exuberent ctags."
+  `(progn
+       (defvar-mode-local ,mode semantic-ectag-lang ,name
+	 "Language name for Exuberent CTags.")
+       (defvar-mode-local ,mode semantic-ectag-lang-kind ,kinds
+	 "Kinds of Exuberent CTags available.")))
+
+;;; MODE SUPPORT
+;;
+(semantic-ectag-add-language-support sh-mode "sh" "f")
+(semantic-ectag-add-language-support asm-mode "asm" "dlmt")
+;(semantic-ectag-add-language-support asp-mode "asp" "cfsv")
+;(semantic-ectag-add-language-support awk-mode "awk" "f")
+(semantic-ectag-add-language-support basic-mode "basic" "cfltvg")
+;(semantic-ectag-add-language-support cobol-mode "cobol" "dfgpPs")
+;(semantic-ectag-add-language-support eiffel-mode "eiffel" "cfl")
+(semantic-ectag-add-language-support fortran-mode "fortran" "fikpstv") ; L for local variable info.
+;(semantic-ectag-add-language-support lua-mode "lua" "f")
+(semantic-ectag-add-language-support pascal-mode "pascal" "fp")
+(semantic-ectag-add-language-support perl-mode "perl" "cflpsd")
+;(semantic-ectag-add-language-support rexx-mode "rexx" "s")
+;(semantic-ectag-add-language-support sql-mode "sql" "s")
+(semantic-ectag-add-language-support tcl-mode "tcl" "cmp")
+;(semantic-ectag-add-language-support vera-mode "vera" "cdfgmPTv")
+;(semantic-ectag-add-language-support verilog-mode "verilog" "cfm")
+
+;;; BUFFER PARSING HOOKS
+;;
+;; We cannot blindly enable the buffer support for languages that
+;; can only get tags from ctags.  The user must enable them via this
+;; fcn instead.
+
+;;;###autoload
+(defun semantic-load-enable-primary-exuberent-ctags-support ()
+  "Enable all ectag supported parsers for new languages.
+This is support for any langauge that does not have a regular
+semantic parser."
+  (interactive)
+
+  ;; Make sure that the version of ctags installed will work.
+  (semantic-ectag-test-version)
+
+  ;; Mode Hooks for enabling parsing with ectag as the main parser.
+  (add-hook 'sh-mode-hook 'semantic-ectag-simple-setup)
+
+  ;; Support for the following is untested.  Once tested, move up
+  ;; to the tested section.
+  (add-hook 'asm-mode-hook 'semantic-ectag-simple-setup)
+  ;;(add-hook 'basic-mode-hook 'semantic-ectag-simple-setup)
+  (add-hook 'fortran-mode-hook 'semantic-ectag-simple-setup)
+  ;;(add-hook 'lua-mode-hook 'semantic-ectag-simple-setup)
+  (add-hook 'pascal-mode-hook 'semantic-ectag-simple-setup)
+  (add-hook 'perl-mode-hook 'semantic-ectag-simple-setup)
+  ;;(add-hook 'rexx-mode-hook 'semantic-ectag-simple-setup)
+  (add-hook 'tcl-mode-hook 'semantic-ectag-simple-setup)
+  ;;(add-hook 'vera-mode-hook 'semantic-ectag-simple-setup)
+  ;;(add-hook 'verilog-mode-hook 'semantic-ectag-simple-setup)
+  )
+
+(provide 'semantic-ectag-lang)
+;;; semantic-ectag-lang.el ends here
diff --git a/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang2.el b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang2.el
new file mode 100644
index 0000000..73a87a7
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-lang2.el
@@ -0,0 +1,134 @@
+;;; semantic-ectag-lang2.el --- Secondary language support
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-ectag-lang2.el,v 1.1 2009/03/10 00:30:37 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file contains Exuberent CTags support for languages that
+;; already have a regular Semantic parser.  These parsers can be used
+;; on files not in buffers.
+
+(require 'semantic-fw)
+(require 'semantic-ectag-parse)
+
+;;; Code:
+
+;;; C/C++ Mode
+;;
+(defvar-mode-local c-mode semantic-ectag-lang "c"
+  "Language name for Exuberent CTags.")
+
+(defvar-mode-local c++-mode semantic-ectag-lang "c++"
+  "Language name for Exuberent CTags.")
+
+(defvar-mode-local c-mode semantic-ectag-lang-kind "cdegmnpsufvt"
+  "Kinds of Exuberent CTags available.")
+
+(defvar-mode-local c-mode semantic-ectag-lang-extra-flags
+  '("--regex-c=/^[ \t]*#[ \t]*include[ \t]*[<\"]([\\/a-zA-Z0-9_.-]+)[>\"]/\\1/i,include/"
+    "--regex-c++=/^[ \t]*#[ \t]*include[ \t]*[<\"]([\\/a-zA-Z0-9_.-]+)[>\"]/\\1/i,include/")
+  "Add support for include files.
+Support C and C++ when in c-mode, because emacs and ctags sometimes dissagree
+on the major mode.")
+
+(define-mode-local-override
+  semantic-ectag-split-signature-summary c-mode (summary)
+  "Convert the SUMMARY of function arguments into a list of tags.
+These tags can be used as the argument list for a C function."
+  (let* ((split (semantic-ectag-split-signature-summary-default summary))
+	 (arg nil) (args nil))
+    (dolist (S split)
+      (setq arg
+	    (cond
+	     ((string-match
+	       "^\\(struct\\|enum\\|union\\)\\s-+\\(\\w+\\)$" S)
+	      ;; Two words, but first is "CLASS" or something.
+	      (semantic-tag-new-variable
+	       ""
+	       (semantic-tag-new-type 
+		(match-string 2 S)
+		(match-string 1 S) nil nil)))
+	     ((string-match
+	       "^\\(struct\\|enum\\|union\\)\\s-+\\(\\w+\\)\\s-+\\(\\w+\\)$" S)
+	      ;; Three words, first is "CLASS" or something.
+	      (semantic-tag-new-variable
+	       (match-string 3 S)
+	       (semantic-tag-new-type 
+		(match-string 2 S)
+		(match-string 1 S) nil nil)))
+	     ((string-match "^\\(\\w+\\)\\s-+\\(\\w+\\)$" S)
+	      ;; Two words, a simple type and name.
+	      (semantic-tag-new-variable
+	       (match-string 2 S)
+	       (match-string 1 S)))
+	     ((string-match "^\\(\\w+\\)$" S)
+	      ;; Only one word is a simple type.
+	      (semantic-tag-new-variable
+	       "" 
+	       (match-string 1 S)))
+	     ))
+      (setq args (cons arg args))
+      )
+    (nreverse args)))
+
+(define-mode-local-override
+  semantic-ectag-set-language-attributes c-mode (tag parents)
+  "Set some C specific attributs in TAG.
+Uses PARENTS to determine if it is a constructor or destructor."
+  (let ((lastname (car (reverse parents)))
+	(name (semantic-tag-name tag))
+	)
+    (when (string= lastname name)
+      (semantic-tag-put-attribute tag :constructor-flag t))
+    (when (string= (concat "~" lastname) name)
+      (setcar tag lastname)
+      (semantic-tag-put-attribute tag :destructor-flag t))
+    ))
+
+;;; Emacs Lisp Mode
+;;
+(defvar-mode-local emacs-lisp-mode semantic-ectag-lang "lisp"
+  "Language name for Exuberent CTags.")
+
+(defvar-mode-local emacs-lisp-mode semantic-ectag-lang-kind "f"
+  "Kinds of Exuberent CTags available.")
+
+;;; SETUP
+;;
+
+;;;###autoload
+(defun semantic-load-enable-secondary-exuberent-ctags-support ()
+  "Enable exuberent ctags support as a secondary parser.
+This is for semanticdb out-of-buffer parsing support.
+Any mode that has been tested to work will be added to this function."
+  (interactive)
+
+  ;; Make sure that the version of ctags installed will work.
+  (semantic-ectag-test-version)
+
+  (semanticdb-enable-exuberent-ctags 'c-mode)
+  (semanticdb-enable-exuberent-ctags 'emacs-lisp-mode)
+
+  )
+
+
+(provide 'semantic-ectag-lang2)
+;;; semantic-ectag-lang2.el ends here
diff --git a/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-parse.el b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-parse.el
new file mode 100644
index 0000000..605dd8b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-parse.el
@@ -0,0 +1,452 @@
+;;; semantic-ectag-parse.el --- exuberent CTags into Semantic tags
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-ectag-parse.el,v 1.17 2009/08/30 12:32:29 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Converting CTags output tables into Semantic Tag Tables.
+;;
+;; This works by scanning the output of a CTags output buffer,
+;; and instead creating semantic tags for each line.
+;;
+;; Tags that appear as members, or otherwise appear to belong to
+;; other tags in the list will be parented appropriately.
+
+(require 'semantic-ectag-util)
+;;; Code:
+
+;; These variables need to be bound to values on a per-mode basis.
+(defvar semantic-ectag-lang nil
+  "The language name used by Exuberent CTags for the current buffer.")
+(defvar semantic-ectag-lang-kind nil
+  "The kinds of tags fetched by Exuberent CTags for the current language.")
+(defvar semantic-ectag-lang-extra-flags nil
+  "Extra flags to pass to Exuberent CTags for a particular language.")
+
+(defvar semantic-ectag-collect-errors nil
+  "When non-nil, collect errors.")
+
+;;;###autoload
+(defun semantic-ectag-parse-buffer ()
+  "Execute Exuberent CTags on this buffer.
+Convert the output tags into Semantic tags."
+  (interactive)
+  (require 'semantic-ectag-lang)
+  (when (not semantic-ectag-lang)
+    (error "Exuberent CTag support for Semantic not configured for %s"
+           major-mode))
+  (let* ((semantic-ectag-collect-errors (interactive-p))
+         (start (current-time))
+         (tags
+          (semantic-ectag-parse-file-with-mode (buffer-file-name) major-mode))
+         (end (current-time)))
+
+    (when (interactive-p)
+      (message "Parsed %d tags in %d seconds."
+               (length tags)
+               (semantic-elapsed-time start end))
+      (data-debug-new-buffer (concat "*" (buffer-name) " ADEBUG*"))
+      (data-debug-insert-tag-list tags "* ")
+      (when (consp semantic-ectag-collect-errors)
+        (insert "\n\nFound the following ctags config errors:\n")
+        (dolist (E semantic-ectag-collect-errors)
+          (insert "  * " E "\n")))
+      )
+
+    tags)
+  )
+
+(defun semantic-ectag-parse-file-with-mode (filename mode)
+  "Execute Exuberent CTags on FILENAME using major mode MODE settings."
+  (message "CTAGS/%s..." (file-name-nondirectory filename))
+  (let* ((xtra (mode-local-symbol-value 'semantic-ectag-lang-extra-flags
+                                        mode))
+         (lang (mode-local-symbol-value 'semantic-ectag-lang
+                                        mode))
+         (kind (mode-local-symbol-value 'semantic-ectag-lang-kind
+                                        mode))
+         (arg-list (append
+                    xtra
+                    (list
+                     (concat "--language-force=" lang)
+                     "--sort=no"           ;; Don't resort the names.
+                     "--excmd=number" ;; add line numbers
+                     "--fields=aKStsim" ;; Add extra info
+                     (format "--%s-kinds=%s" lang kind)
+                     "-f" "-" ;; Send to standard out.
+                     ;; We have to pass in the file, not buffer text.
+                     filename)))
+         (buff (apply 'semantic-ectag-run arg-list))
+
+         )
+    (save-excursion
+      (set-buffer buff)
+      (condition-case nil
+          ;; Sometimes this might throw an error.  Be safe.
+          (funcall mode)
+        (error (message "Error attempting to use mode settings with CTAGS.")))
+      (semantic-ectag-parse-tags))
+    ))
+
+(defun semantic-ectag-parse-tags ()
+  "Parse the Exuberent CTags output in the current buffer."
+  (goto-char (point-min))
+  (let ((tags nil)
+        (ptag-stack nil) ; parent tag stack.
+        (pname nil)      ; parent names.
+        )
+    (while (not (eobp))
+      (let* ((ptag (semantic-ectag-parse-one-tag
+                    (buffer-substring (point) (point-at-eol))))
+             (tag (car ptag))
+             (parents (cdr ptag))
+             )
+
+        (when ptag
+          ;; Set some language specific attributes.
+          (semantic-ectag-set-language-attributes tag parents)
+
+          ;; At this point, we have to guess if TAG is embedded into one
+          ;; of the parents in the parent stack.  There are three cases:
+          ;;
+          ;; 1) Old Lineage - "parent" matches pname exactly.
+          ;;    --> embed into the end of the parent tag stack.
+          ;; 2) Mixed Lineage - "parent" matches only part of the parent tag stack.
+          ;;    --> Find the partial match, reset to there, and
+          ;;        then embed the tag into the correct parent.
+          ;; 3) New Lineage - "parent" does not match pname at all.
+          ;;    --> Start over.
+          ;;
+          ;; Note that old/mixed/new lineage are a mixture of the same basic
+          ;; algorithm to scan the list of known parents to find the match.
+          ;;
+
+          (if (not parents)
+              (progn
+                ;; Push the tag into our list.
+                (push tag tags)
+
+                (if (semantic-tag-of-class-p tag 'type)
+                    ;; Merge stacks, and also
+                    (setq ptag-stack (list tag)
+                          pname (list (semantic-tag-name tag)))
+                  ;; Flush embedded parantage
+                  (setq ptag-stack nil
+                        pname nil))
+                )
+
+            ;; If we have parents, lets look them up.
+            (let ((oldnames pname)
+                  (newnames parents)
+                  (oldstack ptag-stack)
+                  (newstack nil)
+                  (add-to-this-parent nil)
+                  (pushed-parent-list nil)
+                  )
+              (while (and oldstack (string= (car oldnames) (car newnames)))
+                (setq newstack (cons (car oldstack) newstack)
+                      oldstack (cdr oldstack)
+                      oldnames (cdr oldnames)
+                      newnames (cdr newnames)))
+
+              ;; Push this tag into the last parent we found.
+              (setq add-to-this-parent (car newstack))
+              (setq pushed-parent-list newnames)
+
+              ;; Do special stuff with type tags.
+              (when (semantic-tag-of-class-p tag 'type)
+                ;; Fill in the intermediate stack with NIL.
+                (while newnames
+                  (setq newnames (cdr newnames)
+                        newstack (cons nil newstack)))
+                ;; Add TAG to the end for matching the next tag in
+                ;; the list.
+                (setq newstack (cons tag newstack)))
+
+              ;; Set back into ptag-stack.
+              (setq ptag-stack (nreverse newstack))
+
+              ;; Fix up the name list too
+              (if (semantic-tag-of-class-p tag 'type)
+                  (setq pname (append parents (list (semantic-tag-name tag))))
+                (setq pname parents))
+
+              ;; Set the lineage of the new tag.
+              (if (not add-to-this-parent)
+                  ;; No parent to add to.
+                  (progn
+                    (push tag tags)
+                    (semantic-ectag-add-parent tag parents)
+                    )
+                ;; Add TAG to the correct parent, and save name
+                (semantic-ectag-add-child add-to-this-parent tag)
+                (semantic-ectag-add-parent tag pushed-parent-list)
+                )
+              )
+            ))
+
+        (end-of-line)
+        (condition-case nil (forward-char 1) (error nil))))
+    (nreverse tags)))
+
+(defun semantic-ectag-add-child (parent child)
+  "Add into the PARENT tag a new CHILD tag."
+  (let ((children (semantic-tag-type-members parent))
+        )
+    (add-to-list 'children child t)
+    (semantic-tag-put-attribute parent :members children)
+    ))
+
+(defun semantic-ectag-add-parent (tag parentlist)
+  "Add to TAG the tag name in PARENTLIST."
+  (when parentlist
+    (let ((pstring (semantic-analyze-unsplit-name parentlist)))
+      (semantic-tag-put-attribute tag :parent pstring)
+      )))
+
+(defun semantic-ectag-parse-one-tag (line)
+  "Split the Exuberent Ctag LINE into a new tag.
+Returns the list ( TAG P1 P2 Pn...)
+where TAG is the new tag, P1, P2, and Pn is the list of
+parents running forward, such as namespace/namespace/class"
+  (let* ((elements (split-string line "\t"))
+         (ect-class (nth 3 elements))
+         (class-split (split-string ect-class " " t))
+         (class (intern (car class-split)))
+         (prototype nil)
+         (const nil)
+         (type nil)
+
+         (class-sym (cond
+                     ((member class '(function variable label program value))
+                      class)
+                     ((eq class 'prototype)
+                      (setq prototype t)
+                      'function)
+                     ((member class '(namespace class trait struct union enum typedef))
+                      (setq type (symbol-name class))
+                      'type)
+                     ((eq class 'member)
+                      'variable)
+                     ((member class '(include import))
+                      'include)
+                     ((or (eq class 'macro) (eq class 'define))
+                      (setq const t)
+                      'variable)
+                     ((eq class 'enumerator)
+                      (setq const t)
+                      'variable)
+                     ((eq class 'declaration)
+                      'variable)
+                     ((or (eq class 'subroutine) (eq class 'procedure))
+                      ;; @todo - functions (the plural) for pascal?
+                      'function)
+                     ((eq class 'local)
+                      ;; @TODO - local variables??
+                      ;; These get assigned into other tags, and should
+                      ;; be accessed via semantic-get-local-variables
+                      'variable)
+                     (t
+                      (message "CTAG: Unknown output kind %s" class)
+                      (when semantic-ectag-collect-errors
+                        (let ((msg (format "Unknown class: %S" class)))
+                          (if (eq semantic-ectag-collect-errors t)
+                              (setq semantic-ectag-collect-errors (list msg))
+                            (add-to-list 'semantic-ectag-collect-errors msg ))))
+                      'unknown
+                      )))
+
+         (attr (semantic-ectag-split-fields (nthcdr 4 elements)))
+         (line (string-to-number (nth 2 elements)))
+
+         (tag (semantic-tag (nth 0 elements)
+                            class-sym
+                            ;; Leave filename for some other time
+                            ;; :filename (nth 1 elements)
+                            :line line
+                            :prototype-flag prototype
+                            :constant-flag const
+                            :type (if (eq class-sym 'type) type nil) ;; Nil alows override later
+                            ))
+         (parents nil)
+         )
+    (if (eq class-sym 'unknown)
+        ;; Unknown type.. let it through nicely.
+        nil
+      ;; Else, keep parsing.
+      (while attr
+        ;; Loop over each attribute, adding it into the tag.
+        (cond ((eq (car attr) :parent)
+               (setq parents (semantic-analyze-split-name (car (cdr attr))))
+               (when (stringp parents)
+                 (setq parents (list parents))))
+              (t
+               (semantic-tag-put-attribute tag (car attr) (car (cdr attr)))))
+        (setq attr (cdr (cdr attr)))
+        )
+      ;; Now return the new tag.
+      (cons tag parents)
+      )))
+
+(defun semantic-ectag-split-fields (fields)
+  "Convert FIELDS into a list of Semantic tag attributes."
+  (let ((attr nil))
+    (dolist (F fields)
+      (string-match "\\w+:" F)
+      (let* ((me (match-end 0))
+             (field (substring F 0 (1- me)))
+             (str (substring F me))
+             )
+        (cond ((string= field "type")
+               (push str attr)
+               (push :type attr))
+              ((string= field "line")
+               (push (string-to-number str) attr)
+               (push :line attr))
+              ;; Class and Namespace seem to provide a name similar
+              ;; to our :parent tag, so both should do that.
+              ;; There is something extra here though..  It should
+              ;; be possible to use this info to do a reparenting operation.
+              ((or (string= field "class")
+                   (string= field "struct"))
+               (push str attr)
+               (push :parent attr))
+              ((string= field "namespace")
+               (push str attr)
+               (push :parent attr))
+              ;;((string= field "inheritance")
+              ;;(push str attr)
+              ;;(push :parent attr)
+              ;;)
+              ((string= field "access")
+               (push str attr)
+               (push :protection attr))
+              ((string= field "signature")
+               (let ((sigattr (semantic-ectag-split-signature-summary str)))
+                 (push sigattr attr)
+                 (push :arguments attr)))
+              ((string= field "implementation")
+               (push str attr)
+               (push :typemodifiers attr))
+              (t
+               (message "Unknown ectag field %s" field))))
+      )
+    attr))
+
+(define-overloadable-function semantic-ectag-split-signature-summary (summary)
+  "Split SUMMARY into Semantic tag compatible attributes.
+SUMMARY is part of the output from Exuberent CTags that shows the
+text from a file where the tag was found.")
+
+(defun semantic-ectag-split-signature-summary-default (summary)
+  "Default behavior for splitting a Exuberent CTags SUMMARY.
+Assume comma separated list."
+  (cedet-split-string summary "[(), ]" t))
+
+(define-overloadable-function semantic-ectag-set-language-attributes (tag parents)
+  "Augment TAG with additional attributes based on language.
+PARENTS is the list of parent names for TAG.")
+
+(defun semantic-ectag-set-language-attributes-default (tag parents)
+  "Default behavior does nothing.
+TAG and PARENTS are ignored."
+  nil)
+
+;;; MAIN PARSER SUPPORT
+;;
+;; Tools for using ctags as the main parser for a language.
+
+(defun semantic-ectag-setup-parse-table ()
+  "Setup the current buffer for parsing with Exuberent CTags.
+Unlike basic ECTag setup, this will setup the buffer so the main
+parser is also using CTags to dynamically parse the buffer."
+  (semantic-install-function-overrides
+   '((parse-region . semantic-ectag-parse-region)
+     (parse-changes . semantic-ectag-parse-changes)))
+  (setq semantic-parser-name "CTAGS"
+        ;; Setup a dummy parser table to enable parsing!
+        semantic--parse-table t
+        )
+  )
+
+(defun semantic-ectag-parse-region (&rest ignore)
+  "Parse the current shell script buffer for semantic tags.
+IGNORE any arguments, always parse the whole buffer."
+  (let ((tags (semantic-ectag-parse-buffer))
+        (newtags nil))
+    (while tags
+      (push (semantic-ectag-expand-tag (car tags)
+                                       (car (cdr tags)))
+            newtags)
+      (setq tags (cdr tags)))
+    (nreverse newtags)))
+
+(defun semantic-ectag-parse-changes ()
+  "Parse changes in the current shell script buffer."
+  ;; NOTE: For now, just schedule a full reparse.
+  ;;       To be implemented later.
+  (semantic-parse-tree-set-needs-rebuild))
+
+;;; TAG COOKING
+;;
+;; Tags are 'cooked' when they are bound into a buffer.
+(defun semantic-ectag-expand-tag (tag nexttag)
+  "Expand the Exuberent CTag TAG into the current buffer.
+NEXTTAG provides a clue to the end of TAG.
+CTags start out with a a line number.
+Cooking a tag needs character positions instead.
+NOTE: Currently this only supports a flat-list style tag."
+  (let ((name (semantic-tag-name tag))
+        (class (semantic-tag-class tag))
+        (attr (semantic-tag-attributes tag))
+        (line nil)
+        (newattr nil)
+        start end)
+    (while attr
+      (if (eq (car attr) :line)
+          (setq line (car (cdr attr)))
+        (push (car (cdr attr)) newattr)
+        (push (car attr) newattr))
+      (setq attr (cdr (cdr attr))))
+    (save-excursion
+      (goto-line line)
+      (setq start (point-at-bol)
+            end
+            (progn
+              (if nexttag
+                  (goto-line (semantic-tag-get-attribute nexttag :line))
+                (goto-char (point-max))
+                )
+              (while (forward-comment -1) nil)
+              (point)
+              )))
+    ;; We can safely take the first because ctags
+    ;; doesn't produce compound tags.
+    (let ((ret
+           (car
+            (semantic--tag-expand
+             ;; Uncooked tags are unlike standard tags.
+             (list name class newattr nil nil start end)))
+           ))
+      ret)))
+
+(provide 'semantic-ectag-parse)
+;;; semantic-ectag-parse.el ends here
diff --git a/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-util.el b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-util.el
new file mode 100644
index 0000000..c4f9e84
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/semantic-ectag-util.el
@@ -0,0 +1,194 @@
+;;; semantic-ectag-util.el --- Utilities for Exuberent CTags and Semantic
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-ectag-util.el,v 1.6 2009/05/31 11:19:45 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Utilities for working the Exuberent CTags integration with Semantic.
+;;
+;; * Configuration for ctags.
+;; * Running ctags.
+;; * Decoding ctags output.
+
+(eval-when-compile (require 'inversion))
+
+;;; Code:
+
+(defcustom semantic-ectag-program-list '("ctags-exuberant"
+					 "ectags"
+					 "ctags")
+  "*List of possible exuberent ctags programs that coule be installed."
+  :group 'semantic
+  :type '(repeat file))
+
+(defcustom semantic-ectag-program nil
+  "The Exuberent CTags program to use."
+  :group 'semantic
+  :type 'program)
+
+(defun semantic-ectag-program ()
+  "Return our best guess at an exuberent ctags program."
+  (or semantic-ectag-program
+      (let ((pl semantic-ectag-program-list))
+	(while (and pl (not semantic-ectag-program))
+	  (condition-case nil
+	      (progn
+		(call-process (car pl) nil nil nil "--version")
+		(setq semantic-ectag-program (car pl)))
+	    (error nil))
+	  (setq pl (cdr pl)))
+	(or semantic-ectag-program "ctags"))))
+
+;;; RUN CTAGS
+;;
+(defun semantic-ectag-run (&rest args)
+  "Run Exuberent CTags, and return a buffer with the output.
+ARGS are the arguments to pass to Exuberent CTags.
+The returned buffer will be recycled in future calls to this function."
+  (let ((b (get-buffer-create " *Semantic ECTags*"))
+	(dd default-directory))
+    (save-excursion
+      (set-buffer b)
+      (erase-buffer)
+      (setq default-directory dd)
+      (condition-case nil
+	  (progn
+	    (apply 'call-process (semantic-ectag-program) nil b nil
+		   args)
+	    b)
+	(error nil)))
+    ))
+
+;;; Semi-automatic linguistic configuration
+;;
+;; Ask ctags what languages it supports, and what kinds there are.
+(defun semantic-ectag-lang-and-kinds ()
+  "Get all the langauge and kinds supported by ctags."
+  (interactive)
+  (let* ((b (semantic-ectag-run "--list-kinds=all"))
+	 (lang nil)
+	 (kinds nil))
+    (save-excursion
+      (set-buffer b)
+      (goto-char (point-min))
+      (while (not (eobp))
+	(setq lang (buffer-substring (point) (point-at-eol)))
+	(end-of-line)
+	(forward-char 1)
+	(setq kinds "")
+	(while (looking-at "\\s-+")
+	  (let* ((split (split-string (buffer-substring (point) (point-at-eol))
+				     "  " t))
+		 (letter (car split))
+		 (word (car (cdr split))))
+	    (when (member word
+			  '("function definitions"
+			    "functions"
+			    "variables"
+			    "variable definitions"
+			    "type"
+			    "types"
+			    "classes"
+			    "namespaces"))
+	      (setq kinds (concat kinds letter))))
+	  (end-of-line)
+	  (forward-char 1))
+
+	;; This is where we should auto-configure, but i'm not
+	;; too happy with the mechanism yet.  Just dump messages
+	;; for now.
+	(message "Lang %s kinds= %s"
+		 (downcase lang)
+		 kinds)
+	)
+      )
+    (switch-to-buffer-other-window b)
+    (goto-char (point-min))
+    ))
+
+;;; Revision Test
+;;
+;; Make sure we have an up to date version of ctags.
+
+(defun semantic-ectag-version ()
+  "Get the revision number of ctags."
+  (interactive)
+  (let* ((b (semantic-ectag-run "--version"))
+	 str ropt)
+    (if (not b)
+	(progn
+	  (message "Could not find program %s"
+		   semantic-ectag-program)
+	  nil)
+      (setq str (save-excursion
+		  (set-buffer b)
+		  (goto-char (point-min))
+		  (if (re-search-forward "Exuberant Ctags \\([0-9.]+\\)," nil t)
+		      (match-string 1)
+		    nil)
+		  )
+	    ropt (save-excursion
+		   (set-buffer b)
+		   (goto-char (point-min))
+		   (if (re-search-forward "\\+regex\\>" nil t)
+		       t
+		     nil)))
+      (if (not str)
+	  (let ((whatver
+		 (save-excursion
+		   (set-buffer b)
+		   (goto-char (point-min))
+		   (cond ((looking-at "ctags (?GNU Emacs")
+			  "ctags that comes with Emacs")
+			 (t
+			  "unknown ctags version"))
+		   )))
+	    (message "Exuberent CTags not found.  Found %s" whatver)
+	    nil)
+	(when (interactive-p)
+	  (message "Detected Exuberent CTags version : %s %s"
+		   str
+		   (if ropt
+		       "with regex support"
+		     "WITHOUT regex support")
+		   ))
+	(list str ropt) ))))
+
+(defvar semantic-ectag-min-version "5.7"
+  "Minimum version of Exuberent CTags we need.")
+
+(defun semantic-ectag-test-version ()
+  "Make sure the version of ctags we have is up to date."
+  (let* ((vi (semantic-ectag-version))
+	 (v (car vi))
+	 (r (car (cdr vi))))
+    (require 'inversion)
+    (when (not v)
+      (error "Exuberent CTags not found.  Use M-x semantic-ectag-version RET"))
+    (when (inversion-check-version v nil semantic-ectag-min-version)
+      (error "Version of CTags is %s.  Need at least %s"
+	     v semantic-ectag-min-version))
+    (when (not r)
+      (error "CTags was not compiled with +regex support"))
+    ))
+
+(provide 'semantic-ectag-util)
+;;; semantic-ectag-util.el ends here
diff --git a/site/cedet-1.0pre7/semantic/ctags/semanticdb-ectag.el b/site/cedet-1.0pre7/semantic/ctags/semanticdb-ectag.el
new file mode 100644
index 0000000..b229e43
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/ctags/semanticdb-ectag.el
@@ -0,0 +1,93 @@
+;;; semanticdb-ectag.el --- Database support for Exuberent CTags files.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semanticdb-ectag.el,v 1.4 2009/01/10 00:16:57 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Unlike some database support, The Exuberent CTag support only has
+;; tables.  The standard semanticdb-project-database can contain these
+;; tables.
+;;
+;; The basic idea here is to use a ctag table for supported languages
+;; if the file is never loaded into a buffer.  Once it's in a buffer,
+;; switch to the Emacs internal parser generated table.
+
+(require 'semantic-ectag-lang)
+(require 'semantic-ectag-parse)
+(require 'semantic-ectag-util)
+
+;;; Code:
+
+;;; ENABLE CTAGS SUPPORT
+;;
+;; Off by default, users can use this to enable ctags parsing
+;; if they desire.
+;;;###autoload
+(defun semanticdb-enable-exuberent-ctags (mode)
+  "Enable the use of exuberent ctags for out-of-buffer parsing for MODE.
+MODE is a `major-mode' symbol used.
+Throws an error if `semantic-ectag-program' is not of the correct
+version needed by Semantic ctags support."
+  (interactive
+   (list (completing-read
+          "Mode: " obarray
+          #'(lambda (s) (string-match "-mode$" (symbol-name s)))
+          t (symbol-name major-mode))))
+  ;; First, make sure the version is ok.
+  (semantic-ectag-test-version)
+  ;; Make sure mode is a symbol.
+  (when (stringp mode)
+    (setq mode (intern mode)))
+  ;; Next, enable the table create routine.
+  (eval
+   `(setq-mode-local ,mode
+		     semanticdb-out-of-buffer-create-table-fcn
+		     (lambda (fname)
+		       (semanticdb-ectag-create-table-for-file-not-in-buffer
+			fname (quote ,mode)))))
+  )
+
+;;; PARSE REPLACEMENT
+;;
+;; These functions will substitute in Exuberent CTag parsing
+;; within the Semanticdb framework.
+(defun semanticdb-ectag-create-table-for-file-not-in-buffer (filename mode)
+  "Create a SemanticDB table for the file in FILENAME using ctags.
+The argument MODE specifies the expected major mode to use in Emacs
+if FILENAME were loaded."
+  (let* ((newstuff (semanticdb-create-table-for-file filename))
+	 (table (cdr newstuff))
+	 (tags (semantic-ectag-parse-file-with-mode filename mode))
+	 )
+    ;; We've made the new table, now fill it in with tags determined with
+    ;; ctags.
+    (semanticdb-synchronize table tags)
+
+    ;; Leave the :mode slot empty.  The reset of semanticdb will force
+    ;; :tags to be replaced by the Emacs parser.  nil also allows these tags
+    ;; to be used loosely.
+
+    ;; Return the table
+    table))
+
+
+(provide 'semanticdb-ectag)
+;;; semanticdb-ectag.el ends here
diff --git a/site/cedet-1.0pre7/semantic/doc/Makefile b/site/cedet-1.0pre7/semantic/doc/Makefile
new file mode 100644
index 0000000..a3ce79b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/Makefile
@@ -0,0 +1,71 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+images_MISC=grammar-fw-ov.png grammar-fw-ov.txt
+semantic-grammar_TEXINFOS=grammar-fw.texi
+MAKEINFO=makeinfo
+Documentation_TEXINFOS=semantic.texi glossary.texi overview.texi installation.texi fdl.texi internals.texi semanticheader.texi
+semantic-user_info_TEXINFOS=user-guide.texi minor-modes.texi
+semantic-appdev_info_TEXINFOS=app-dev-guide.texi tags.texi
+semantic-langdev_info_TEXINFOS=lang-support-guide.texi
+bovine_info_TEXINFOS=bovine.texi
+wisent_info_TEXINFOS=wisent.texi
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/doc
+
+
+
+all: images grammar-fw.info semantic.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info
+
+images: 
+	@
+
+grammar-fw.info: $(semantic-grammar_TEXINFOS)
+	$(MAKEINFO) $<
+
+semantic.info: $(Documentation_TEXINFOS)
+	$(MAKEINFO) $<
+
+semantic-user.info: $(semantic-user_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+semantic-appdev.info: $(semantic-appdev_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+semantic-langdev.info: $(semantic-langdev_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+bovine.info: $(bovine_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+wisent.info: $(wisent_info_TEXINFOS)
+	$(MAKEINFO) $<
+
+tags: 
+
+
+clean:
+	rm -f *.html *.info*
+
+.PHONY: dist
+
+dist: grammar-fw.info semantic.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info
+	mkdir $(DISTDIR)
+	cp $(images_MISC) $(semantic-grammar_TEXINFOS) grammar-fw.info* $(Documentation_TEXINFOS) semantic.info* $(semantic-user_info_TEXINFOS) semantic-user.info* $(semantic-appdev_info_TEXINFOS) semantic-appdev.info* $(semantic-langdev_info_TEXINFOS) semantic-langdev.info* $(bovine_info_TEXINFOS) bovine.info* $(wisent_info_TEXINFOS) wisent.info* $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/doc/Project.ede b/site/cedet-1.0pre7/semantic/doc/Project.ede
new file mode 100644
index 0000000..c69ddfe
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/Project.ede
@@ -0,0 +1,49 @@
+;; Object ede-proj-project
+;; EDE project file.
+(ede-proj-project "semantic/doc"
+  :name "Documentation"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "images"
+    :name "images"
+    :path ""
+    :source '("grammar-fw-ov.png" "grammar-fw-ov.txt")
+    )
+   (ede-proj-target-makefile-info "semantic-grammar"
+    :name "semantic-grammar"
+    :path ""
+    :source '("grammar-fw.texi")
+    )
+   (ede-proj-target-makefile-info "Documentation"
+    :name "Documentation"
+    :path ""
+    :source '("semantic.texi" "glossary.texi" "overview.texi" "installation.texi" "fdl.texi" "internals.texi" "semanticheader.texi")
+    :mainmenu "semantic.texi"
+    )
+   (ede-proj-target-makefile-info "semantic-user.info"
+    :name "semantic-user.info"
+    :path ""
+    :source '("user-guide.texi" "minor-modes.texi")
+    )
+   (ede-proj-target-makefile-info "semantic-appdev"
+    :name "semantic-appdev.info"
+    :path ""
+    :source '("app-dev-guide.texi" "tags.texi")
+    )
+   (ede-proj-target-makefile-info "semantic-lagdev.info"
+    :name "semantic-langdev.info"
+    :path ""
+    :source '("lang-support-guide.texi")
+    )
+   (ede-proj-target-makefile-info "bovine.info"
+    :name "bovine.info"
+    :path ""
+    :source '("bovine.texi")
+    )
+   (ede-proj-target-makefile-info "wisent.info"
+    :name "wisent.info"
+    :path ""
+    :source '("wisent.texi")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/semantic/doc/app-dev-guide.texi b/site/cedet-1.0pre7/semantic/doc/app-dev-guide.texi
new file mode 100644
index 0000000..2be40c1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/app-dev-guide.texi
@@ -0,0 +1,2781 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename semantic-appdev.info
+@set TITLE  Semantic Application Development Manual
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents Application Development with Semantic.
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+Copyright @copyright{} 2001, 2002, 2003, 2004 David Ponce
+Copyright @copyright{} 2002, 2003 Richard Y. Kim
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic Application Writer's guide: (semantic-appdev).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents Application Development with Semantic.
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+A @semantic{} application takes the semantic tags generated
+by semantic parsers then provides useful services to the user.
+For a list of such applications,
+@inforef{top, the Semantic User's Guide , semantic-user}.
+
+An application developer needs to know
+@itemize @bullet
+@item when to invoke the parser to generate or regenerate the tag lists.
+@item how to access the tag lists.
+@item how to access information about each tag.
+@end itemize
+
+This chapter describes @semantic{} functions and concepts an application
+developer needs to know to perform all of the tasks just listed.
+
+@menu
+* Semantic Tags::               
+* Searching Tag Tables::        Searching tag tables.
+* Tags at Point::               Finding tags at point.
+* Tag Decoration::              Decorating tags
+* Tag Sorting::                 Reorganizing streams.
+* Tag Completion::              Completing read functions.
+* Override Methods::            Language dependent functions covering
+                                conversion to text strings, language dependent
+                                queries and local context information
+* Parser Features::             Application available parser features.
+* Semantic Database::           Persistent storage of tags.
+* Idle Scheduling::             Scheduling jobs in idle time.
+* Example Programs::            Simple programming examples.
+* Current Context::             Local context analysis.
+* Data Debugger::               Application Debugger
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Semantic Tags
+@chapter Semantic Tags
+
+@include tags.texi
+
+@node Searching Tag Tables
+@chapter Searching Tag Tables
+
+These functions take some key, and return information found in a tag
+table.  Some will return one tag (the first matching item found.)
+Others will return a list of all items matching a given criterion.
+Most of these functions work regardless of a buffer being in memory or
+not.
+
+Any specialty search routine that claims to use a function that is an
+overload method will need to execute in a buffer of the same mode as
+the tags being searched.
+
+If you are looking for a search across multiple files, see
+@ref{Semantic Database}.
+
+@menu
+* Breadth Search::              Searching only one level of tags.
+* Deep Search::                 Deep searches into types or argument lists.
+* Specialty Search::            Specialty Searches.
+* Custom Search::               Write custom search routines.
+@end menu
+
+@node Breadth Search
+@section Breadth Search
+
+Searching the breadth of a list of tags means that only one level of
+the tags will be searched.  If one of the tags is a datatype with
+additional members, those members are not searched.
+
+@defun semantic-find-first-tag-by-name name &optional table
+@anchor{semantic-find-first-tag-by-name}
+Find the first tag with @var{NAME} in @var{TABLE}.
+@var{NAME} is a string.
+@var{TABLE} is a semantic tags table.  See @dfn{semantic-something-to-tag-table}.
+This routine uses @dfn{assoc} to quickly find the first matching entry.
+@end defun
+
+@defun semantic-find-tags-by-name name &optional table
+@anchor{semantic-find-tags-by-name}
+Find all tags with @var{NAME} in @var{TABLE}.
+@var{NAME} is a string.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@defun semantic-find-tags-for-completion prefix &optional table
+@anchor{semantic-find-tags-for-completion}
+Find all tags whos name begins with @var{PREFIX} in @var{TABLE}.
+@var{PREFIX} is a string.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+While it would be nice to use @dfn{try-completion} or @dfn{all-completions},
+those functions do not return the tags, only a string.
+Uses @dfn{compare-strings} for fast comparison.
+@end defun
+
+@defun semantic-find-tags-by-name-regexp regexp &optional table
+@anchor{semantic-find-tags-by-name-regexp}
+Find all tags with name matching @var{REGEXP} in @var{TABLE}.
+@var{REGEXP} is a string containing a regular expression,
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+Consider using @dfn{semantic-find-tags-for-completion} if you are
+attempting to do completions.
+@end defun
+
+@defun semantic-find-tags-by-class class &optional table
+@anchor{semantic-find-tags-by-class}
+Find all tags of class @var{CLASS} in @var{TABLE}.
+@var{CLASS} is a symbol representing the class of the token, such as
+@code{'variable}, of 'function..
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@defun semantic-find-tags-by-type type &optional table
+@anchor{semantic-find-tags-by-type}
+Find all tags of with a type @var{TYPE} in @var{TABLE}.
+@var{TYPE} is a string or tag representing a data type as defined in the
+language the tags were parsed from, such as ``int'', or perhaps
+a tag whose name is that of a struct or class.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@defun semantic-find-tags-included &optional table
+@anchor{semantic-find-tags-included}
+Find all tags in @var{TABLE} that are of the @code{'include} class.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@node Deep Search
+@section Deep Search
+
+@defun semantic-brute-find-first-tag-by-name name streamorbuffer &optional search-parts search-include
+Find a tag @var{NAME} within @var{STREAMORBUFFER}.  @var{NAME} is a string.
+If @var{SEARCH-PARTS} is non-@code{nil}, search children of tags.
+If @var{SEARCH-INCLUDE} is non-@code{nil}, search include files.
+
+Use @dfn{semantic-find-first-tag-by-name} instead.
+
+@obsolete{semantic-find-nonterminal-by-name,semantic-brute-find-first-tag-by-name}
+@end defun
+
+@defun semantic-brute-find-tag-by-property property value streamorbuffer &optional search-parts search-includes
+Find all tags with @var{PROPERTY} equal to @var{VALUE} in @var{STREAMORBUFFER}.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+@obsolete{semantic-find-nonterminal-by-property,semantic-brute-find-tag-by-property}
+@end defun
+
+@defun semantic-brute-find-tag-by-attribute attr streamorbuffer &optional search-parts search-includes
+Find all tags with a given @var{ATTR} in @var{STREAMORBUFFER}.
+@var{ATTR} is a symbol key into the attributes list.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+@obsolete{semantic-find-nonterminal-by-extra-spec,semantic-brute-find-tag-by-attribute}
+@end defun
+
+@defun semantic-brute-find-tag-by-attribute-value attr value streamorbuffer &optional search-parts search-includes
+Find all tags with a given @var{ATTR} equal to @var{VALUE} in @var{STREAMORBUFFER}.
+@var{ATTR} is a symbol key into the attributes list.
+@var{VALUE} is the value that @var{ATTR} should match.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+@obsolete{semantic-find-nonterminal-by-extra-spec-value,semantic-brute-find-tag-by-attribute-value}
+@end defun
+
+@defun semantic-brute-find-tag-by-position position streamorbuffer &optional nomedian
+Find a token covering @var{POSITION} within @var{STREAMORBUFFER}.
+@var{POSITION} is a number, or marker.  If @var{NOMEDIAN} is non-@code{nil}, don't do
+the median calculation, and return nil.
+
+@obsolete{semantic-find-nonterminal-by-position,semantic-brute-find-tag-by-position}
+@end defun
+
+@defun semantic-brute-find-innermost-tag-by-position position streamorbuffer &optional nomedian
+Find a list of tags covering @var{POSITION} within @var{STREAMORBUFFER}.
+@var{POSITION} is a number, or marker.  If @var{NOMEDIAN} is non-@code{nil}, don't do
+the median calculation, and return nil.
+This function will find the topmost item, and recurse until no more
+details are available of findable.
+
+@obsolete{semantic-find-innermost-nonterminal-by-position,semantic-brute-find-innermost-tag-by-position}
+@end defun
+
+@defun semantic-brute-find-tag-by-class class streamorbuffer &optional search-parts search-includes
+Find all tags with a class @var{CLASS} within @var{STREAMORBUFFER}.
+@var{CLASS} is a symbol representing the class of the tags to find.
+See @dfn{semantic-tag-class}.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+Use @code{semantic-find-tag-by-class} instead.
+
+@obsolete{semantic-find-nonterminal-by-token,semantic-brute-find-tag-by-class}
+@end defun
+
+@defun semantic-brute-find-tag-standard streamorbuffer &optional search-parts search-includes
+Find all tags in @var{STREAMORBUFFER} which define simple class types.
+See @dfn{semantic-tag-class}.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+@obsolete{semantic-find-nonterminal-standard,semantic-brute-find-tag-standard}
+@end defun
+
+@defun semantic-brute-find-tag-by-type type streamorbuffer &optional search-parts search-includes
+Find all tags with type @var{TYPE} within @var{STREAMORBUFFER}.
+@var{TYPE} is a string which is the name of the type of the tags returned.
+See @dfn{semantic-tag-type}.
+Optional argument @var{SEARCH-PARTS} and @var{SEARCH-INCLUDES} are passed to
+@dfn{semantic-brute-find-tag-by-function}.
+
+@obsolete{semantic-find-nonterminal-by-type,semantic-brute-find-tag-by-type}
+@end defun
+
+@defun semantic-brute-find-tag-by-function function streamorbuffer &optional search-parts search-includes
+Find all tags for which FUNCTION's value is non-@code{nil} within @var{STREAMORBUFFER}.
+@var{FUNCTION} must return non-@code{nil} if an element of @var{STREAM} will be included
+in the new list.
+
+If optional argument @var{SEARCH-PARTS} is non-@code{nil}, all sub-parts of tags
+are searched.  The overloadable function @code{semantic-tag-componenets} is
+used for the searching child lists.  If @var{SEARCH-PARTS} is the symbol
+@code{'positiononly}, then only children that have positional information are
+searched.
+
+If @var{SEARCH-INCLUDES} is non-@code{nil}, then all include files are also
+searched for matches.  This parameter hasn't be active for a while
+and is obsolete.
+
+@obsolete{semantic-find-nonterminal-by-function,semantic-brute-find-tag-by-function}
+@end defun
+
+@defun semantic-brute-find-first-tag-by-function function streamorbuffer &optional search-parts search-includes
+Find the first tag which @var{FUNCTION} match within @var{STREAMORBUFFER}.
+@var{FUNCTION} must return non-@code{nil} if an element of @var{STREAM} will be included
+in the new list.
+
+The following parameters were never implemented.
+
+If optional argument @var{SEARCH-PARTS}, all sub-parts of tags are searched.
+The overloadable function @dfn{semantic-tag-components} is used for
+searching.
+If @var{SEARCH-INCLUDES} is non-@code{nil}, then all include files are also
+searched for matches.
+
+@obsolete{semantic-find-nonterminal-by-function-first-match,semantic-brute-find-first-tag-by-function}
+@end defun
+
+@node Specialty Search
+@section Specialty Search
+
+There are some specialty searches needed by some semantic tools that
+could prove useful.  These specialty searches often do not match
+against some single attribute as most breadth searches do.
+
+@defun semantic-find-tags-of-compound-type &optional table
+@anchor{semantic-find-tags-of-compound-type}
+Find all tags which are a compound type in @var{TABLE}.
+Compound types are structures, or other data type which
+is not of a primitive nature, such as int or double.
+Used in completion.
+@end defun
+
+@defun semantic-find-tags-by-scope-protection scopeprotection parent &optional table
+@anchor{semantic-find-tags-by-scope-protection}
+Find all tags accessible by @var{SCOPEPROTECTION}.
+@var{SCOPEPROTECTION} is a symbol which can be returned by the method
+@dfn{semantic-tag-protection}.  @var{A} hard-coded order is used to determine a match.
+@var{PARENT} is a tag representing the @var{PARENT} slot needed for
+@dfn{semantic-tag-protection}.
+@var{TABLE} is a list of tags (a subset of @var{PARENT} members) to scan.  If @var{TABLE} is @code{nil},
+the type members of @var{PARENT} are used.
+See @dfn{semantic-tag-protected-p} for details on which tags are returned.
+@end defun
+
+@defun semantic-find-tags-external-children-of-type type &optional table
+@anchor{semantic-find-tags-external-children-of-type}
+Find all tags in whose parent is @var{TYPE} in @var{TABLE}.
+These tags are defined outside the scope of the original @var{TYPE} declaration.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@defun semantic-find-tags-subclasses-of-type type &optional table
+@anchor{semantic-find-tags-subclasses-of-type}
+Find all tags of class type in whose parent is @var{TYPE} in @var{TABLE}.
+These tags are defined outside the scope of the original @var{TYPE} declaration.
+@var{TABLE} is a tag table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@node Custom Search
+@section Custom Search
+
+The searching framework for semantic for tag tables has two basic
+root methods.  One is a function and the other is a macro.  The
+functional version is needed if some sort of macro conflict arises.
+The macro version is useful because it eliminates a level of function
+call, and is faster.
+
+@defun semantic--find-tags-by-function predicate &optional table
+@anchor{semantic--find-tags-by-function}
+Find tags for which @var{PREDICATE} is non-@code{nil} in @var{TABLE}.
+@var{PREDICATE} is a lambda expression which accepts on @var{TAG}.
+@var{TABLE} is a semantic tags table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@defun semantic--find-tags-by-macro form &optional table
+@anchor{semantic--find-tags-by-macro}
+Find tags for which @var{FORM} is non-@code{nil} in @var{TABLE}.
+@var{TABLE} is a semantic tags table.  See @dfn{semantic-something-to-tag-table}.
+@end defun
+
+@c @defun semantic-recursive-find-nonterminal-by-name name buffer
+@c Recursivly find the first occurance of @var{NAME}.
+@c Start search with @var{BUFFER}.  Recurse through all dependencies till
+@c found.  The return item is of the form (@var{BUFFER} @var{TOKEN})
+@c where @var{BUFFER} is the buffer in which @var{TOKEN} (the token found
+@c to match @var{NAME}) was found.
+@c 
+@c @var{THIS} ISN'T @var{USED} @var{IN} @var{SEMANTIC}.  @var{DELETE}
+@c @var{ME} @var{SOON}.
+@c @end defun
+
+@node Tags at Point
+@chapter Tags at Point
+
+When you need to get the tag the cursor is on, there is a more
+efficient mechanism than using
+@code{semantic-brute-find-tag-by-position}.  This mechanism directly
+queries the overlays the parsing step leaves in the buffer.  This
+provides for very rapid retrieval of what function or variable the
+cursor is currently in.
+@refill
+
+These functions query the current buffer's overlay system for tags.
+
+@defun semantic-find-tag-by-overlay &optional positionormarker buffer
+Find all tags covering @var{POSITIONORMARKER} by using overlays.
+If @var{POSITIONORMARKER} is @code{nil}, use the current point.
+Optional @var{BUFFER} is used if @var{POSITIONORMARKER} is a number, otherwise the current
+buffer is used.  This finds all tags covering the specified position
+by checking for all overlays covering the current spot.  They are then sorted
+from largest to smallest via the start location.
+
+@obsolete{semantic-find-nonterminal-by-overlay,semantic-find-tag-by-overlay}
+@end defun
+
+@defun semantic-find-tag-by-overlay-in-region start end &optional buffer
+Find all tags which exist in whole or in part between @var{START} and @var{END}.
+Uses overlays to determine position.
+Optional @var{BUFFER} argument specifies the buffer to use.
+
+@obsolete{semantic-find-nonterminal-by-overlay-in-region,semantic-find-tag-by-overlay-in-region}
+@end defun
+
+@defun semantic-find-tag-by-overlay-next &optional start buffer
+Find the next tag after @var{START} in @var{BUFFER}.
+If @var{START} is in an overlay, find the tag which starts next,
+not the current tag.
+@end defun
+
+@defun semantic-find-tag-by-overlay-prev &optional start buffer
+Find the next tag before @var{START} in @var{BUFFER}.
+If @var{START} is in an overlay, find the tag which starts next,
+not the current tag.
+@end defun
+
+@defun semantic-current-tag
+Return the current tag in the current buffer.
+If there are more than one in the same location, return the
+smallest tag.  Return @code{nil} if there is no tag here.
+
+@obsolete{semantic-current-nonterminal,semantic-current-tag}
+@end defun
+
+@defun semantic-current-tag-parent
+Return the current tags parent in the current buffer.
+@var{A} tag's parent would be a containing structure, such as a type
+containing a field.  Return @code{nil} if there is no parent.
+
+@obsolete{semantic-current-nonterminal-parent,semantic-current-tag-parent}
+@end defun
+
+@node Tag Decoration
+@chapter Tag Decoration
+
+Tags can be decorated in different ways.  One way a user can control
+it is through @code{semantic-decoration-mode}.
+@inforef{semantic-user,,Tag Decoration Mode}
+
+Applications can use the same routines to decorate tags as well.
+
+@menu
+* Tag Highlighting::            Highlighting a tag
+* Tag Visible Properties::      Invisible, intangible and read only
+* Tag Secondary Overlays::      Decorating parts of a tag text
+* Tag Folding::                 Visibly Folding up tags
+@end menu
+
+@node Tag Highlighting
+@section Highlighting
+
+@defun semantic-highlight-tag tag &optional face
+@anchor{semantic-highlight-tag}
+Specify that @var{tag} should be highlighted.
+Optional @var{face} specifies the face to use.
+@obsolete{semantic-highlight-token,semantic-highlight-tag}
+@end defun
+
+@defun semantic-unhighlight-tag tag
+@anchor{semantic-unhighlight-tag}
+Unhighlight @var{tag}, restoring its previous face.
+@obsolete{semantic-unhighlight-token,semantic-unhighlight-tag}
+@end defun
+
+@defun semantic-momentary-highlight-tag tag &optional face
+@anchor{semantic-momentary-highlight-tag}
+Highlight @var{tag}, removing highlighting when the user hits a key.
+Optional argument @var{face} is the face to use for highlighting.
+If @var{face} is not specified, then @code{highlight} will be used.
+@obsolete{semantic-momentary-highlight-token,semantic-momentary-highlight-tag}
+@end defun
+
+The highlighting routines do their work by changing the face property
+of the tag overlay.  The raw routine is:
+
+@defun semantic-set-tag-face tag face
+@anchor{semantic-set-tag-face}
+Specify that @var{tag} should use @var{face} for display.
+@obsolete{semantic-set-token-face,semantic-set-tag-face}
+@end defun
+
+@node Tag Visible Properties
+@section Changing a tag's visible properties
+
+You can give a tag other properties as well, such as making it
+invisible or intangible.  You can control how code is edited
+programatically through these routines.
+
+@defun semantic-set-tag-invisible tag &optional visible
+@anchor{semantic-set-tag-invisible}
+Enable the text in @var{tag} to be made invisible.
+If @var{visible} is non-@code{nil}, make the text visible.
+@obsolete{semantic-set-token-invisible,semantic-set-tag-invisible}
+@end defun
+
+@defun semantic-tag-invisible-p tag
+@anchor{semantic-tag-invisible-p}
+Return non-@code{nil} if @var{tag} is invisible.
+@obsolete{semantic-token-invisible-p,semantic-tag-invisible-p}
+@end defun
+
+@defun semantic-set-tag-intangible tag &optional tangible
+@anchor{semantic-set-tag-intangible}
+Enable the text in @var{tag} to be made intangible.
+If @var{tangible} is non-@code{nil}, make the text visible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist.
+@obsolete{semantic-set-token-intangible,semantic-set-tag-intangible}
+@end defun
+
+@defun semantic-tag-intangible-p tag
+@anchor{semantic-tag-intangible-p}
+Return non-@code{nil} if @var{tag} is intangible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist.
+@obsolete{semantic-token-intangible-p,semantic-tag-intangible-p}
+@end defun
+
+@defun semantic-set-tag-read-only tag &optional writable
+@anchor{semantic-set-tag-read-only}
+Enable the text in @var{tag} to be made read-only.
+Optional argument @var{writable} should be non-@code{nil} to make the text writable
+instead of read-only.
+@obsolete{semantic-set-token-read-only,semantic-set-tag-read-only}
+@end defun
+
+@defun semantic-tag-read-only-p tag
+@anchor{semantic-tag-read-only-p}
+Return non-@code{nil} if the current @var{tag} is marked read only.
+@obsolete{semantic-token-read-only-p,semantic-tag-read-only-p}
+@end defun
+
+@node Tag Secondary Overlays
+@section Secondary Overlays
+
+Each tag which is being visited in a buffer has one overlay.  This
+overlay is used to track where the tag is while a user is editing, and
+can also be used for fast tag identification, and some simple
+decoration techniques.
+
+A secondary overlay associates a new overlay object with a tag which
+does not cover the entire body of a tag.  You can then put visible
+features on that overlay to decorate portions of a tag.  This is how
+tag boundaries are drawn.
+
+@subsection Creation and Deletion
+
+@defun semantic-tag-create-secondary-overlay tag &optional link-hook
+@anchor{semantic-tag-create-secondary-overlay}
+Create a secondary overlay for @var{tag}.
+Returns an overlay.  The overlay is also saved in @var{tag}.
+@var{link-hook} is a function called whenever @var{tag} is to be linked into
+a buffer.  It should take @var{tag} and @var{overlay} as arguments.
+The @var{link-hook} should be used to position and set properties on the
+generated secondary overlay.
+@end defun
+
+@defun semantic-tag-delete-secondary-overlay tag overlay-or-property
+@anchor{semantic-tag-delete-secondary-overlay}
+Delete from @var{tag} the secondary overlay @var{overlay-or-property}.
+If @var{overlay-or-property} is an overlay, delete that overlay.
+If @var{overlay-or-property} is a symbol, find the overlay with that property.
+@end defun
+
+@subsection Queries
+
+@defun semantic-tag-get-secondary-overlay tag property
+@anchor{semantic-tag-get-secondary-overlay}
+Return secondary overlays from @var{tag} with @var{property}.
+@var{property} is a symbol and all overlays with that symbol are returned..
+@end defun
+
+@defun semantic-tag-secondary-overlays tag
+@anchor{semantic-tag-secondary-overlays}
+Return a list of secondary overlays active on @var{tag}.
+@end defun
+
+@subsection Linking and Unlinking
+
+When a tag's file is put in a buffer, that tag is ``linked'' into the
+buffer.  When the buffer is deleted, the tag is ``unlinked''.  This
+process adds and removes the default overlay on the tag.  Secondary
+overlays use @code{semantic-tag-add-hook} and
+@code{semantic-tag-remove-hook} too apply link and unlink hooks.
+
+This allows the secondary overlays to be automatically removed or
+added by the secondary overlay system whenever a tag's file goes in or
+out of a buffeor.
+
+@node Tag Folding
+@section Folding
+
+Using secondary overlays, a set of tag folding routines are made
+available.  These routines are similar to the tag visible properties.
+
+@defun semantic-set-tag-folded tag &optional folded
+@anchor{semantic-set-tag-folded}
+Fold @var{tag}, such that only the first line of text is shown.
+Optional argument @var{folded} should be non-@code{nil} to fold the tag.
+@code{nil} implies the tag should be fully shown.
+@end defun
+
+@defun semantic-tag-folded-p tag
+@anchor{semantic-tag-folded-p}
+Non-@code{nil} if @var{tag} is currently folded.
+@end defun
+
+@node Tag Sorting
+@chapter Tag Sorting
+
+Sometimes it is important to reorganize a tag stream into a form that
+is better for display to a user.  It is important to not use functions
+with side effects that could effect the tag cache.
+
+There are some existing utility functions which will reorganize the
+tag list for you.
+
+@defun semantic-unique-tag-table tags
+@anchor{semantic-unique-tag-table}
+Scan a list of @var{TAGS}, removing duplicates.
+This must first sort the tags by position ascending.
+@var{TAGS} are removed only if they are equivalent, as can happen when
+multiple tag sources are scanned.
+@end defun
+
+@defun semantic-unique-tag-table-by-name tags
+@anchor{semantic-unique-tag-table-by-name}
+Scan a list of @var{TAGS}, removing duplicate names.
+This must first sort the tags by name alphabetically ascending.
+@end defun
+
+@defun semantic-bucketize tags &optional parent filter
+@anchor{semantic-bucketize}
+Sort @var{tags} into a group of buckets based on tag class.
+Unknown classes are placed in a Misc bucket.
+Type bucket names are defined by either @code{semantic-symbol->name-assoc-list}.
+If @var{parent} is specified, then @var{tags} belong to this @var{parent} in some way.
+This will use @code{semantic-symbol->name-assoc-list-for-type-parts} to
+generate bucket names.
+Optional argument @var{filter} is a filter function to be applied to each bucket.
+The filter function will take one argument, which is a list of tokens, and
+may re-organize the list with side-effects.
+@end defun
+
+@defvar semantic-bucketize-tag-class
+@anchor{semantic-bucketize-tag-class}
+Function used to get a symbol describing the class of a tag.
+This function must take one argument of a semantic tag.
+It should return a symbol found in @code{semantic-symbol->name-assoc-list}
+which @dfn{semantic-bucketize} uses to bin up tokens.
+To create new bins for an application augment
+@code{semantic-symbol->name-assoc-list}, and
+@code{semantic-symbol->name-assoc-list-for-type-parts} in addition
+to setting this variable (locally in your function).
+@end defvar
+
+@defun semantic-adopt-external-members tags
+@anchor{semantic-adopt-external-members}
+Rebuild @var{tags} so that externally defined members are regrouped.
+Some languages such as @var{c}++ and @var{clos} permit the declaration of member
+functions outside the definition of the class.  It is easier to study
+the structure of a program when such methods are grouped together
+more logically.
+
+This function uses @dfn{semantic-tag-external-member-p} to
+determine when a potential child is an externally defined member.
+
+Note: Applications which use this function must account for token
+types which do not have a position, but have children which *do*
+have positions.
+
+Applications should use @code{semantic-mark-external-member-function}
+to modify all tags which are found as externally defined to some
+type.  For example, changing the token type for generating extra
+buckets with the bucket function.
+@end defun
+
+@defvar semantic-orphaned-member-metaparent-type
+@anchor{semantic-orphaned-member-metaparent-type}
+In @dfn{semantic-adopt-external-members}, the type of @code{'type} for metaparents.
+A metaparent is a made-up type semantic token used to hold the child list
+of orphaned members of a named type.
+@end defvar
+
+@defvar semantic-mark-external-member-function
+@anchor{semantic-mark-external-member-function}
+Function called when an externally defined orphan is found.
+By default, the token is always marked with the @code{adopted} property.
+This function should be locally bound by a program that needs
+to add additional behaviors into the token list.
+This function is called with two arguments.  The first is @var{token} which is
+a shallow copy of the token to be modified.  The second is the @var{parent}
+which is adopting @var{token}.  This function should return @var{token} (or a copy of it)
+which is then integrated into the revised token list.
+@end defvar
+
+@node Tag Completion
+@chapter Tag Completion
+
+Often time, it is useful to ask the user for the name of some tag.
+This can be as simple as just prompting for a name, but often time,
+the semantics can be quite complex.  If two tags have the same name,
+which do you choose?
+
+Semantic provides a completion engine for prompting for tags by name,
+and providing fancy ways to display completion lists that allow the
+user to choose a tag if several have the same name.
+
+To use a completion function in your interactive function, you can
+augment the @dfn{interactive} command like this:
+
+@example
+(defun my-function (tag)
+   "Do something to TAG."
+   (interactive (list (my-completion-function "Tag: ")))
+   ...)
+@end example
+
+@menu
+* Tag Completion Convenience Functions::  Provided functions
+* Custom Tag Completion Functions::  Build your own completion function
+* Old Tag Completion::          Completion functions from older releases
+@end menu
+
+@node Tag Completion Convenience Functions
+@section Tag Completion Convenience Functions
+
+There are some pre written completion functions that can be used in your
+programs.
+
+@defun semantic-complete-read-tag-buffer-deep prompt &optional default-tag initial-input history
+Ask for a tag by name from the current buffer.
+Available tags are from the current buffer, at any level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+@var{PROMPT} is a string to prompt with.
+@var{DEFAULT-TAG} is a semantic tag or string to use as the default value.
+If @var{INITIAL-INPUT} is non-@code{nil}, insert it in the minibuffer initially.
+@var{HISTORY} is a symbol representing a variable to story the history in.
+@end defun
+
+@defun semantic-complete-read-tag-project prompt &optional default-tag initial-input history
+@anchor{semantic-complete-read-tag-project}
+Ask for a tag by name from the current project.
+Available tags are from the current project, at the top level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+@var{prompt} is a string to prompt with.
+@var{default-tag} is a semantic tag or string to use as the default value.
+If @var{initial-input} is non-@code{nil}, insert it in the minibuffer initially.
+@var{history} is a symbol representing a variable to store the history in.
+@end defun
+
+@defun semantic-complete-read-tag-analyzer prompt &optional context history
+@anchor{semantic-complete-read-tag-analyzer}
+Ask for a tag by name based on the current context.
+The function @dfn{semantic-analyze-current-context} is used to
+calculate the context.  @dfn{semantic-analyze-possible-completions} is used 
+to generate the list of possible completions.
+@var{prompt} is the first part of the prompt.  Additional prompt
+is added based on the contexts full prefix.
+@var{context} is the semantic analyzer context to start with.
+@var{history} is a symbol representing a variable to store the history in.
+usually a default-tag and initial-input are available for completion
+prompts.  these are calculated from the @var{context} variable passed in.
+@end defun
+
+@defun semantic-complete-inline-analyzer context
+@anchor{semantic-complete-inline-analyzer}
+Complete a symbol name by name based on the current context.
+This is similar to @code{semantic-complete-read-tag-analyze}, except
+that the completion interaction is in the buffer where the context
+was calculated from.
+@var{context} is the semantic analyzer context to start with.
+See @code{semantic-complete-inline-tag-engine} for details on how
+completion works.
+@end defun
+
+@node Custom Tag Completion Functions
+@section Custom Tag Completion Functions
+
+There aren't many built in completion functions, but there are many
+parts that can be put together into custom completion functions.
+
+A completion function is built up of three important parts.
+
+@table @asis
+@item Tag Collection
+Something that selects tags, and provides some list of tags
+available, such as all functions, or all classes named ``bob''.
+@item Typing and selecting
+The prompt where you can type in the name of a tag.
+@item Displaying possible completion values
+A mechanism for displaying completion lists.
+@end table
+
+There is one typing and selecting routine that can be used to create
+your custom completion prompt.
+
+@defun semantic-complete-read-tag-engine collector displayor prompt default-tag initial-input history
+@anchor{semantic-complete-read-tag-engine}
+Read a semantic tag, and return a tag for the selection.
+Argument @var{collector} is an object which can be used to to calculate
+a list of possible hits.  See @code{semantic-completion-collector-engine}
+for details on @var{collector}.
+Argumeng @var{displayor} is an object used to display a list of possible
+completions for a given prefix.  See@code{semantic-completion-display-engine}
+for details on @var{displayor}.
+@var{prompt} is a string to prompt with.
+@var{default-tag} is a semantic tag or string to use as the default value.
+If @var{initial-input} is non-@code{nil}, insert it in the minibuffer initially.
+@var{history} is a symbol representing a variable to story the history in.
+@end defun
+
+As you can see, this takes one @dfn{collector}, and one
+@dfn{displayor}.  These are objects created for this prompt at
+runtime.  The completion engine then uses to perform their tasks.
+
+For example:
+
+@example
+(defun semantic-complete-read-tag-buffer-deep (prompt &optional
+						      default-tag initial-input history)
+  "Ask for a tag by name from the current buffer.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to story the history in."
+  (semantic-complete-read-tag-engine
+   (semantic-collector-buffer-deep prompt :buffer (current-buffer))
+   (semantic-displayor-traditional-with-focus-highlight "simple")
+   ;;(semantic-displayor-tooltip "simple")
+   prompt
+   default-tag
+   initial-input
+   history)
+  )
+@end example
+
+@menu
+* Tag Collectors::              
+* Tag Displayors::              
+@end menu
+
+@node Tag Collectors
+@subsection Tag Collectors
+
+A tag collector is an object that inherits from
+@dfn{semantic-collector-abstract}.  A new collector is needed for
+each specialized type of prompt that draws from a different selection
+of tags.
+
+You can have a collector that satisfies multiple purposes using slots
+filled in the initializer for that object.
+
+Collectors inherit from some of the following:
+
+@deffn Type semantic-collector-abstract
+@anchor{semantic-collector-abstract}
+Root class for completion engines.
+The baseclass provides basic functionality for interacting with
+a completion displayor object, and tracking the current progress
+of a completion.
+@end deffn
+
+@deffn Type semantic-collector-buffer-abstract
+@anchor{semantic-collector-buffer-abstract}
+Root class for per-buffer completion engines.
+These collectors track themselves on a per-buffer basis.
+@end deffn
+
+@deffn Type semantic-collector-project-abstract
+@anchor{semantic-collector-project-abstract}
+Root class for project wide completion engines.
+Uses semanticdb for searching all tags in the current project.
+@end deffn
+
+Available instantiable classes are:
+
+@deffn Type semantic-collector-buffer-deep
+@anchor{semantic-collector-buffer-deep}
+Completion engine for tags in the current buffer.
+When searching for a tag, uses semantic  deep search functions.
+Basics search only in the current buffer.
+@end deffn
+
+@deffn Type semantic-collector-project
+@anchor{semantic-collector-project}
+Completion engine for tags in a project.
+@end deffn
+
+@deffn Type semantic-collector-project-brutish
+@anchor{semantic-collector-project-brutish}
+Completion engine for tags in a project.
+@end deffn
+
+@deffn Type semantic-collector-analyze-completions
+@anchor{semantic-collector-analyze-completions}
+Completion engine that uses the context analyzer to provide options.
+The only options available for completion are those which can be logically
+inserted into the current context.
+@end deffn
+
+NOTE: Add sections for writing new collectors.
+
+@c (eieiodoc-class semantic-collector-abstract "cc")
+
+@c END OF COLLECTOR
+
+@node Tag Displayors
+@subsection Tag Displayors
+
+When a user is interacting with the prompt, and requests completion,
+those tags are drawn from the collector.  If the user asks for a list
+of completion by hitting a complete key twice, then the list of
+completions heeds to be displayed in some way.
+
+Displayors can be used to manage the display of all tags currently
+available, AND often needs to be used to @b{focus} one one particular
+tag of many in a visible way.
+
+All displayors inherit from the displayor baseclass that defines the
+default behaviors:
+
+@deffn Type semantic-displayor-abstract
+@anchor{semantic-displayor-abstract}
+Manages the display of some number of tags.
+Provides the basics for a displayor, including interacting with
+a collector, and tracking tables of completion to display.
+@end deffn
+
+@deffn Type semantic-displayor-focus-abstract
+@anchor{semantic-displayor-focus-abstract}
+A displayor which has the ability to focus in on one tag.
+Focusing is a way of differentiationg between multiple tags
+which have the same name.
+@end deffn
+
+Distinct implementations of displayors include:
+
+@deffn Type semantic-displayor-traditional
+@anchor{semantic-displayor-traditional}
+Traditional display mechanism for a list of possible completions.
+Completions are showin in a new buffer and listed with the ability
+to click on the items to aid in completion.
+@end deffn
+
+@deffn Type semantic-displayor-traditional-with-focus-highlight
+@anchor{semantic-displayor-traditional-with-focus-highlight}
+A traditional displayor which can focus on a tag by showing it.
+Same as @code{semantic-displayor-traditional}, but with selection between
+multiple tags with the same name done by 'focusing' on the source
+location of the different tags to differentiate them.
+
+@end deffn
+
+@deffn Type semantic-displayor-tooltip
+@anchor{semantic-displayor-tooltip}
+Display mechanism using tooltip for a list of possible completions.
+@end deffn
+
+NOTE: Add sections for writing new collectors.
+
+@c (eieiodoc-class semantic-displayor-abstract "cd")
+
+@c END OF DISPLAYOR
+
+
+@node Old Tag Completion
+@section Older Tag Completion functions
+
+These are older completion functions.  They may still be useful.
+
+@defun semantic-read-symbol prompt &optional default stream filter
+@anchor{semantic-read-symbol}
+Read a symbol name from the user for the current buffer.
+@var{prompt} is the prompt to use.
+Optional arguments:
+@var{default} is the default choice.  If no default is given, one is read
+from under point.
+@var{stream} is the list of tokens to complete from.
+@var{filter} is provides a filter on the types of things to complete.
+@var{filter} must be a function to call on each element.
+@end defun
+
+@defun semantic-read-variable prompt &optional default stream
+@anchor{semantic-read-variable}
+Read a variable name from the user for the current buffer.
+@var{prompt} is the prompt to use.
+Optional arguments:
+@var{default} is the default choice.  If no default is given, one is read
+from under point.
+@var{stream} is the list of tokens to complete from.
+@end defun
+
+@defun semantic-read-function prompt &optional default stream
+@anchor{semantic-read-function}
+Read a function name from the user for the current buffer.
+@var{prompt} is the prompt to use.
+Optional arguments:
+@var{default} is the default choice.  If no default is given, one is read
+from under point.
+@var{stream} is the list of tags to complete from.
+@end defun
+
+@defun semantic-read-type prompt &optional default stream
+@anchor{semantic-read-type}
+Read a type name from the user for the current buffer.
+@var{prompt} is the prompt to use.
+Optional arguments:
+@var{default} is the default choice.  If no default is given, one is read
+from under point.
+@var{stream} is the list of tags to complete from.
+@end defun
+
+@node Override Methods
+@chapter Override Methods
+
+@dfn{Override methods} provide generic behaviors, which a given
+language can override.  For example, finding a dependency (required
+file) file in Emacs lisp can be done with the @code{locate-library}
+command (which overrides the default behavior.)  In C, a dependency
+(include file) can be found by searching a generic search path which
+can be passed in via a variable.
+
+If you plan to use one of these functions from a buffer that is not
+of the same major-mode as the original tag, you can use this form to
+make sure the correct action takes place:
+
+@defun semantic-with-mode-bindings mode &rest body
+@anchor{semantic-with-mode-bindings}
+Evaluate @var{BODY} with the local bindings of @var{MODE}.
+The current mode bindings are saved, @var{BODY} is evaluated, and the saved
+bindings are restored, even in case of an abnormal exit.
+Value is what @var{BODY} returns.
+@end defun
+
+For more on override methods, @inforef{Semantic Overload Mechanism, , lang-support-guide}.
+
+@menu
+* Format Tag::                  Converting Tokens into text strings
+* Tag Members::                 Tags in tags
+* Tag Details::                 Arbitrary token detail fetching
+* Tag File Reference::	        Files a tag references.
+* Jump to a Tag::	        Go to a tag's location
+* Making New Methods::          How to add your own methods for your own tool
+@end menu
+
+@node Format Tag
+@section Format Tag
+
+Any given tag consists of Meta information which is best viewed in
+some textual form.  This could be as simple as the tag's name, or as
+a prototype to be added to header file in C.  Not only are there
+several default converters from a Tag into text, but there is also
+some convenient variables that can be used with them.  Use these
+variables to allow options on output forms when displaying tags in
+your programs.
+
+@defvar semantic-format-tag-functions
+@anchor{semantic-format-tag-functions}
+List of functions which convert a tag to text.
+Each function must take the parameters @var{tag} &optional @var{parent} @var{color}.
+@var{tag} is the tag to convert.
+@var{parent} is a parent tag or name which refers to the structure
+or class which contains @var{tag}.  @var{parent} is @var{not} a class which a @var{tag}
+would claim as a parent.
+@var{color} indicates that the generated text should be colored using
+@code{font-lock}.
+@end defvar
+
+@defvar semantic-format-tag-custom-list
+@anchor{semantic-format-tag-custom-list}
+A List used by customizable variables to choose a tag to text function.
+Use this variable in the @code{:type} field of a customizable variable.
+@end defvar
+
+Every tag to text conversion function must take the same parameters,
+which are @var{TAG}, the tag to be converted, @var{PARENT}, the
+containing parent (like a structure which contains a variable), and
+@var{COLOR}, which is a flag specifying that color should be applied
+to the returned string.
+
+When creating, or using these strings, particularly with color, use
+@dfn{concat} to build up larger strings instead of @dfn{format}.  This
+will preserve text properties.
+
+@defun semantic-format-tag-name tag &optional parent color
+@anchor{semantic-format-tag-name}
+Return the name string describing @var{tag}.
+The name is the shortest possible representation.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-name-nonterminal,semantic-format-tag-name}
+@end defun
+
+@defun semantic-format-tag-abbreviate tag &optional parent color
+@anchor{semantic-format-tag-abbreviate}
+Return an abbreviated string describing @var{tag}.
+The abbreviation is to be short, with possible symbols indicating
+the type of tag, or other information.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-abbreviate-nonterminal,semantic-format-tag-abbreviate}
+@end defun
+
+@defun semantic-format-tag-summarize tag &optional parent color
+@anchor{semantic-format-tag-summarize}
+Summarize @var{tag} in a reasonable way.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-summerize-nonterminal,semantic-format-tag-summarize}
+@end defun
+
+@defun semantic-format-tag-prototype tag &optional parent color
+@anchor{semantic-format-tag-prototype}
+Return a prototype for @var{tag}.
+This function should be overloaded, though it need not be used.
+This is because it can be used to create code by language independent
+tools.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-prototype-nonterminal,semantic-format-tag-prototype}
+@end defun
+
+@defun semantic-format-tag-concise-prototype tag &optional parent color
+@anchor{semantic-format-tag-concise-prototype}
+Return a concise prototype for @var{tag}.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-concise-prototype-nonterminal,semantic-format-tag-concise-prototype}
+@end defun
+
+@defun semantic-format-tag-uml-abbreviate tag &optional parent color
+@anchor{semantic-format-tag-uml-abbreviate}
+Return a @var{uml} style abbreviation for @var{tag}.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-uml-abbreviate-nonterminal,semantic-format-tag-uml-abbreviate}
+@end defun
+
+@defun semantic-format-tag-uml-prototype tag &optional parent color
+@anchor{semantic-format-tag-uml-prototype}
+Return a @var{uml} style prototype for @var{tag}.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-uml-prototype-nonterminal,semantic-format-tag-uml-prototype}
+@end defun
+
+@defun semantic-format-tag-uml-concise-prototype tag &optional parent color
+@anchor{semantic-format-tag-uml-concise-prototype}
+Return a @var{uml} style concise prototype for @var{tag}.
+Optional argument @var{parent} is the parent type if @var{tag} is a detail.
+Optional argument @var{color} means highlight the prototype with font-lock colors.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-uml-concise-prototype-nonterminal,semantic-format-tag-uml-concise-prototype}
+@end defun
+
+@defun semantic-format-tag-prin1 tag &optional parent color
+@anchor{semantic-format-tag-prin1}
+Convert @var{tag} to a string that is the print name for @var{tag}.
+@var{parent} and @var{color} are ignored.
+@obsolete{semantic-prin1-nonterminal,semantic-format-tag-prin1}
+@end defun
+
+An additional utility will return a string for just the data type of
+a tag.  This function is used in the above routines as well.
+
+@defun semantic-format-tag-type tag color
+@anchor{semantic-format-tag-type}
+Convert the data type of @var{tag} to a string usable in tag formatting.
+It is presumed that @var{type} is a string or semantic tag.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@node Tag Members
+@section Tag Members
+
+Tags are often in a hierarchical form, meaning that a tag found in
+the top-level list may itself contain additional members.
+
+The following overridable functions can fetch those tags.
+
+@defun semantic-tag-components tag
+Return a list of components for @var{tag}.
+A Component is a part of @var{tag} which itself may be a @var{tag}.
+Examples include the elements of a structure in a 
+tag of class `type, or the list of arguments to a
+tag of class @code{'function}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-tag-components-with-overlays tag
+Return the list of top level components belonging to @var{tag}.
+Children are any sub-tags which contain overlays.
+
+Default behavior is to get @dfn{semantic-tag-components} in addition
+to the components of an anonymous types (if applicable.)
+
+Note for language authors:
+  If a mode defines a language tag that has tags in it with overlays
+you should still return them with this function.
+Ignoring this step will prevent several features from working correctly.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+Some languages can define parts of a tag outside the actual scope of
+the parent tag.  You can fetch information about them with these
+overload functions.
+
+
+@defun semantic-tag-external-member-p parent tag
+@anchor{semantic-tag-external-member-p}
+Return non-@code{nil} if @var{parent} is the parent of @var{tag}.
+@var{tag} is an external member of @var{parent} when it is somehow tagged
+as having @var{parent} as its parent.
+@var{parent} and @var{tag} must both be semantic tags.
+
+The default behavior, if not overridden with
+@code{tag-external-member-p} is to match @code{:parent} attribute in
+the name of @var{tag}.
+
+If this function is overridden, use
+@code{semantic-tag-external-member-children-p-default} to also
+include the default behavior, and merely extend your own.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-nonterminal-external-member-p,semantic-tag-external-member-p}
+@end defun
+
+@defun semantic-tag-external-member-children tag &optional usedb
+@anchor{semantic-tag-external-member-children}
+Return the list of children which are not *in* @var{tag}.
+If optional argument @var{usedb} is non-@code{nil}, then also search files in
+the Semantic Database.  If @var{usedb} is a list of databases, search those
+databases.
+
+Children in this case are functions or types which are members of
+@var{tag}, such as the parts of a type, but which are not defined inside
+the class.  @var{c}++ and @var{clos} both permit methods of a class to be defined
+outside the bounds of the class' definition.
+
+The default behavior, if not overridden with
+@code{tag-external-member-children} is to search using
+@dfn{semantic-tag-external-member-p} in all top level definitions
+with a parent of @var{tag}.
+
+If this function is overridden, use
+@dfn{semantic-tag-external-member-children-default} to also
+include the default behavior, and merely extend your own.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-nonterminal-external-member-children,semantic-tag-external-member-children}
+@end defun
+
+@node Tag Details
+@section Tag Details
+
+These functions help derive information about tags that may not
+be obvious for non-traditional languages with their own token types.
+
+@defun semantic-tag-protection tag &optional parent
+@anchor{semantic-tag-protection}
+Return protection information about @var{tag} with optional @var{parent}.
+This function returns on of the following symbols:
+   @code{nil}        - No special protection.  Language dependent.
+   @code{'public}    - Anyone can access this @var{tag}.
+   @code{'private}   - Only methods in the local scope can access @var{tag}.
+   @code{'protected} - Like private for outside scopes, like public for child
+                classes.
+Some languages may choose to provide additional return symbols specific
+to themselves.  Use of this function should allow for this.
+
+The default behavior (if not overridden with @code{tag-protection}
+is to return a symbol based on type modifiers.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+It makes the overload @dfn{semantic-nonterminal-protection} obsolete.
+@obsolete{semantic-nonterminal-protection,semantic-tag-protection}
+@end defun
+
+@defun semantic-tag-protected-p tag protection &optional parent
+@anchor{semantic-tag-protected-p}
+Non-@code{nil} if @var{tag} is is protected.
+@var{protection} is a symbol which can be returned by the method
+@dfn{semantic-tag-protection}.
+@var{parent} is the parent data type which contains @var{tag}.
+
+For these PROTECTIONs, true is returned if @var{tag} is:
+@table @asis
+@item @code{nil}
+  Always true
+@item  private
+  True if @code{nil}.
+@item protected
+  True if private or @code{nil}.
+@item public
+  True if private, protected, or @code{nil}.
+@end table
+@end defun
+
+@defun semantic-tag-abstract-p tag &optional parent
+@anchor{semantic-tag-abstract-p}
+Return non @code{nil} if @var{tag} is abstract.
+Optional @var{parent} is the parent tag of @var{tag}.
+In @var{uml}, abstract methods and classes have special meaning and behavior
+in how methods are overridden.  In @var{uml}, abstract methods are italicized.
+
+The default behavior (if not overridden with @code{tag-abstract-p}
+is to return true if @code{abstract} is in the type modifiers.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+It makes the overload @dfn{semantic-nonterminal-abstract} obsolete.
+@obsolete{semantic-nonterminal-abstract,semantic-tag-abstract-p}
+@end defun
+
+@defun semantic-tag-leaf-p tag &optional parent
+@anchor{semantic-tag-leaf-p}
+Return non @code{nil} if @var{tag} is leaf.
+Optional @var{parent} is the parent tag of @var{tag}.
+In @var{uml}, leaf methods and classes have special meaning and behavior.
+
+The default behavior (if not overridden with @code{tag-leaf-p}
+is to return true if @code{leaf} is in the type modifiers.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+It makes the overload @dfn{semantic-nonterminal-leaf} obsolete.
+@obsolete{semantic-tag-leaf,semantic-tag-leaf-p}
+@end defun
+
+@defun semantic-tag-static-p tag &optional parent
+@anchor{semantic-tag-static-p}
+Return non @code{nil} if @var{tag} is static.
+Optional @var{parent} is the parent tag of @var{tag}.
+In @var{uml}, static methods and attributes mean that they are allocated
+in the parent class, and are not instance specific.
+@var{uml} notation specifies that @var{static} entries are underlined.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@obsolete{semantic-tag-static,semantic-tag-static-p}
+@end defun
+
+@node Tag File Reference
+@section Tag File Reference
+
+Some tags refer to some other file.
+
+For include files, these options help Semantic find those files:
+
+@defvar semantic-dependency-system-include-path
+@anchor{semantic-dependency-system-include-path}
+Defines the system include path.
+This should be set with either @dfn{defvar-mode-local}, or with
+@dfn{semantic-add-system-include}.
+
+When searching for a file associated with a name found in an tag of
+class include, this path will be inspected for includes of type
+@code{system}.  Some include tags are agnostic to this setting and will
+check both the project and system directories.
+@end defvar
+
+@defun semantic-dependency-tag-file &optional tag
+@anchor{semantic-dependency-tag-file}
+Find the filename represented from @var{tag}.
+Depends on @code{semantic-dependency-include-path} for searching.  Always searches
+@code{.} first, then searches additional paths.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+It makes the overload @dfn{semantic-find-dependency} obsolete.
+@obsolete{semantic-find-dependency,semantic-dependency-tag-file}
+@end defun
+
+In languages with prototypes, such as C/C++, you can try to find a
+corresponding file where a prototype to some implementation lives.
+
+@defun semantic-prototype-file buffer
+@anchor{semantic-prototype-file}
+Return a file in which prototypes belonging to @var{buffer} should be placed.
+Default behavior (if not overridden) looks for a token specifying the
+prototype file, or the existence of an @var{ede} variable indicating which
+file prototypes belong in.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+The semantic support for Texinfo lets you find references to functions
+in doc you might be maintaining.
+
+@defun semantic-texi-find-documentation name &optional type
+@anchor{semantic-texi-find-documentation}
+Find the function or variable @var{name} of @var{type} in the texinfo source.
+@var{name} is a string representing some functional symbol.
+@var{type} is a string, such as ``variable`` or ''Command'' used to find
+the correct definition in case @var{name} qualifies as several things.
+When this function exists, @var{point} is at the definition.
+If the doc was not found, an error is thrown.
+Note: @var{type} not yet implemented.
+@end defun
+
+
+@node Jump to a Tag
+@section Jump to a Tag
+
+Each tag has a file from which it came.  If a tag has been managed
+properly, you can jump to it with this function:
+
+@defun semantic-go-to-tag tag &optional parent
+@anchor{semantic-go-to-tag}
+Go to the location of @var{tag}.
+@var{tag} may be a stripped element, in which case @var{parent} specifies a
+parent tag that has position information.
+Different behaviors are provided depending on the type of tag.
+For example, dependencies (includes) will seek out the file that is
+depended on (see @dfn{semantic-dependency-tag-file}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+It makes the overload @dfn{semantic-find-nonterminal} obsolete.
+@obsolete{semantic-find-nonterminal,semantic-go-to-tag}
+@end defun
+
+When extracting tags from a database via search routines, those tags,
+by default, do not have the necessary information in them.  Be sure
+that when the database results are stripped, you use options that
+force that file information to be kept.
+
+@node Making New Methods
+@section Making New Methods
+
+The infrastructure for creating overridable methods base on major mode
+is handled by @file{mode-local.el} which is independent of @semantic{}.
+
+To create your own application specific mode local function, you
+should use @dfn{define-overloadable-function}.  This function creates
+the framework needed for different mode-authors to customize your
+applications.
+
+Once a function has been defined as mode-local, you should use
+@dfn{define-mode-local-override} to add a mode specific feature.
+
+@defun define-overloadable-function name args docstring &rest body
+@anchor{define-overload}
+Define a new function, as with @dfn{defun} which can be overloaded.
+@var{name} is the name of the function to create.
+@var{args} are the arguments to the function.
+@var{docstring} is a documentation string to describe the function.  The
+docstring will automatically had details about its overload symbol
+appended to the end.
+@var{body} is code that would be run when there is no override defined.  The
+default is to call the function @code{NAME-default} with the appropriate
+arguments.
+
+@var{body} can also include an override form that specifies which part of
+@var{body} is specifically overridden.  This permits to specify common code
+run for both default and overridden implementations.
+An override form is one of:
+
+  1. @code{(:override [OVERBODY])}
+  2. @code{(:override-with-args OVERARGS [OVERBODY])}
+
+@var{overbody} is the code that would be run when there is no override
+defined.  The default is to call the function @code{NAME-default} with the
+appropriate arguments deduced from @var{args}.
+@var{overargs} is a list of arguments passed to the override and
+@code{NAME-default} function, in place of those deduced from @var{args}.
+@end defun
+
+@defun define-mode-local-override name mode args docstring &rest body
+@anchor{define-mode-local-override}
+Define a mode specific override of the function overload @var{name}.
+Has meaning only if @var{name} has been created with @dfn{define-overload}.
+@var{mode} is the major mode this override is being defined for.
+@var{args} are the function arguments, which should match those of the same
+named function created with @dfn{define-overload}.
+@var{docstring} is the documentation string.
+@var{body} is the implementation of this function.
+@obsolete{define-mode-overload-implementation,define-mode-local-override}
+@end defun
+
+
+You can also create variable values that are mode local.
+
+@defun defvar-mode-local mode sym val &optional docstring
+@anchor{defvar-mode-local}
+Define @var{mode} local variable @var{sym} with value @var{val}.
+@var{docstring} is optional.
+@end defun
+
+@defun defconst-mode-local mode sym val &optional docstring
+@anchor{defconst-mode-local}
+Define @var{mode} local constant @var{sym} with value @var{val}.
+@var{docstring} is optional.
+@end defun
+
+Mode local variables are implemented as buffer local.  Special hooks
+enable mode-local to set these variables for the mode specified.  To
+set a value as in code, you can use a special setq form.
+
+@defun setq-mode-local mode &rest args
+@anchor{setq-mode-local}
+Assign new values to variables local in @var{mode}.
+@var{mode} must be a major mode symbol.
+@var{args} is a list (@var{sym} @var{val} @var{sym} @var{val} @dots{}).
+The symbols @var{sym} are variables; they are literal (not evaluated).
+The values @var{val} are expressions; they are evaluated.
+Set each @var{sym} to the value of its @var{val}, locally in buffers already in
+@var{mode}, or in buffers switched to that mode.
+Return the value of the last @var{val}.
+@end defun
+
+@node Parser Features
+@chapter Parser Features
+
+If you write a program that uses a tag table in a persistent
+display or database, it is necessary to know when tag tables change so
+that your displays can be updated.  This is especially important as
+tags can be replaced, changed, or deleted, and the associated
+overlays will then throw errors when you try to use them.  Complete
+integration with tag changes can be achieved via several hooks.
+
+If you write an application that frequenly accesses the tags tables,
+it is important to make sure those tags are up to date, and to make
+sure you application does not adversely effect all the other minor
+modes that may be running.
+
+The semantic parser has many features and hooks that applications can
+use to provide a good user experience.
+
+@menu
+* Editing Buffers::             Let the parser know you are changing a buffer.
+* Parser State::                Knowing if the tag table is out of date
+* Parser Hooks::                Knowing when tags change
+* Lexical Safety::              Preventing lexical errors from making a mess
+@end menu
+
+@node Editing Buffers
+@section Editing Buffers
+
+One interesting way to interact with the parser is to let it know that
+changes you are going to make will not require re-parsing.
+
+@defvar semantic-edits-are-safe
+When non-@code{nil}, modifications do not require a reparse.
+This prevents tokens from being marked dirty, and it
+prevents top level edits from causing a cache check.
+Use this when writing programs that could cause a full
+reparse, but will not change the tag structure, such
+as adding or updating top-level comments.
+@end defvar
+
+@node Parser State
+@section Parser State
+
+It is sometimes useful to know what the current parsing state
+is.  These function can let you know what level of re-parsing may be
+needed.  Careful choices on when to reparse can make your program much
+faster.
+
+@defun semantic-parse-tree-needs-update-p
+@anchor{semantic-parse-tree-needs-update-p}
+Return non-@code{nil} if the current parse tree needs to be updated.
+@end defun
+
+@defun semantic-parse-tree-needs-rebuild-p
+@anchor{semantic-parse-tree-needs-rebuild-p}
+Return non-@code{nil} if the current parse tree needs to be rebuilt.
+@end defun
+
+@defun semantic-parse-tree-unparseable-p
+@anchor{semantic-parse-tree-unparseable-p}
+Return non-@code{nil} if the current buffer has been marked unparseable.
+@end defun
+
+@defun semantic-parse-tree-up-to-date-p
+@anchor{semantic-parse-tree-up-to-date-p}
+Return non-@code{nil} if the current parse tree is up to date.
+@end defun
+
+@node Parser Hooks
+@section Parser Hooks
+
+If you just want to know when a buffer changes, use this hook.
+
+@defvar semantic-after-toplevel-cache-change-hook
+@anchor{semantic-after-toplevel-cache-change-hook}
+Hooks run after the buffer tag list has changed.
+This list will change when a buffer is reparsed, or when the tag list
+in a buffer is cleared.  It is *@var{not}* called if the current tag list is
+partially reparsed.
+
+Hook functions must take one argument, which is the new list of tags
+associated with this buffer.
+
+For language specific hooks, make sure you define this as a local hook.
+@end defvar
+
+If you want tighter interaction with how the user is editing
+different tags, you can use this hook instead.
+
+@defvar semantic-after-partial-cache-change-hook
+@anchor{semantic-after-partial-cache-change-hook}
+Hooks run after the buffer cache has been updated.
+
+This hook will run when the cache has been partially reparsed.
+Partial reparses are incurred when a user edits a buffer, and only the
+modified sections are rescanned.
+
+Hook functions must take one argument, which is the list of tokens
+updated in the current buffer.
+
+For language specific hooks, make sure you define this as a local hook.
+@end defvar
+
+It is also useful to clean up any data your application is using when
+semantic flushes its tags table.
+
+@defvar semantic-before-toplevel-cache-flush-hook
+@anchor{semantic-before-toplevel-cache-flush-hook}
+Hooks run before the toplevel tag cache is flushed.
+For language specific hooks, make sure you define this as a local
+hook.  This hook is called before a corresponding
+@code{semantic-after-toplevel-cache-change-hook} which is also called
+during a flush when the cache is given a new value of @code{nil}.
+@end defvar
+
+@node Lexical Safety
+@section Lexical Safety
+
+If you application frequenly requests lists of tags upon user request,
+it may be important to avoid lexical problems that frequenly occur
+when the user has partially written an expression, such as starting a
+string, or argument list.
+
+You can protect your code from lexical problems with this macro:
+
+@defun semantic-lex-catch-errors symbol &rest forms
+@anchor{semantic-lex-catch-errors}
+Using @var{SYMBOL}, execute @var{FORMS} catching lexical errors.
+If @var{FORMS} results in a call to the parser that throws a lexical error,
+the error will be caught here without the buffer's cache being thrown
+out of date.
+If there is an error, the syntax that failed is returned.
+If there is no error, then the last value of @var{FORMS} is returned.
+@end defun
+
+It is important to provide a good @var{SYMBOL} so that these macros
+can nest correctly.
+
+If you want your code to run anyway, even if there is a lexical
+error, using this macro like this:
+
+@example
+(semantic-lex-catch-errors
+   (semantic-fetch-tags))
+@end example
+
+will put the parser into the 'unparseable' state, and allow other
+routines to request the tag table without incurring additional parser
+attempts.
+
+@node Semantic Database
+@chapter Semantic Database
+
+Semanticdb is a database mechanism for storing tags parsed by
+@semantic{}.  The database operates in the background, saving tags as
+they are parsed between sessions.  When a file is read in, and there
+is a previously created set of tags available for it, semanticdb will
+save time by not parsing the file, and using the cached copy.
+
+In applications, semanticdb can provide access to the sum of all tags
+in a project or in the basic system.  This database can then be
+searched using a set of special routines.
+
+@menu
+* Semanticdb in Programs::      Basic usage.
+* Semanticdb Tag Queries::      Searching for tokens in the databases.
+* System Databases::            Special kinds of databases for system tags.
+* Semanticdb references::       Tables can refer to eachother.
+@end menu
+
+@node Semanticdb in Programs
+@section Semanticdb in Programs::
+
+If you write a program using semanticdb, you will probably want to
+make sure it is active in your program.
+
+@defun semanticdb-minor-mode-p
+@anchor{semanticdb-minor-mode-p}
+Return non-@code{nil} if @code{semanticdb-minor-mode} is active.
+@end defun
+
+Since semanticdb is optional, it is best if a program can gracefully
+degrade service when semanticdb is not available, or to throw an
+error letting the user know it is required to be active.
+
+At the simplest level, you can ask if a given file is in the
+database, receiving a tag table.  Semanticdb will give you an
+accurate set of tags just by asking.
+
+@defun semanticdb-file-stream file
+@anchor{semanticdb-file-stream}
+Return a list of tags belonging to @var{file}.
+If file has database tags available in the database, return them.
+If file does not have tags available, then load the file, and create them.
+@end defun
+
+Alternately, you can get the table object for a file by asking for it.
+
+@defun semanticdb-file-table-object file &optional dontload
+@anchor{semanticdb-file-table-object}
+Return a semanticdb table belonging to @var{file}.
+If file has database tags available in the database, return it.
+If file does not have tags available, and @var{dontload} is @code{nil},
+then load the tags for @var{file}, and create a new table object for it.
+@var{dontload} does not affect the creation of new database objects.
+@end defun
+
+@node Semanticdb Tag Queries
+@section Semanticdb Tag Queries
+
+You can search for tags in the semantic database using the
+semanticdb-find API.  It is important to note that database search
+functions do not return a plain list of tags.  This is because some
+tags may not be loaded in a buffer, which means that the found tag
+would not have an overlay, and no way to determine where it came from.
+
+As such, all search functions return a special Database Results list.
+
+There are several types of searches, divided into groups by
+implementation.  While it is possible to add new types of searches,
+or write custom searches, the built in searches are usually the only
+ones available in system backends @ref{System Databases}.
+
+When the term @b{brute} or @b{brutish} is used as a search criteria,
+that is distinguishing between an include-path based search, and a
+search that scans everything available in a project.
+
+Non-brute force searches assume that all symbols available in a given
+buffer are on the search path, or in some file that has been
+included, imported, or otherwise indicated in the source file
+itself.  While not always true for interpreted languages (such as
+Emacs Lisp), it is common among declaritive languages.
+
+Sometimes a brute force approach is needed, scanning every file
+available to the database.  You may want to do this if your
+application is collecting data unrelated to a file currently being
+worked on.
+
+@menu
+* DB Results::                  Accessing the results of a search.
+* DB Search Paths::             The list of tables to search.
+* DB Basic Name Search::        Searches based on name.
+* DB Data Type Search::         Searches for datatypes.
+* DB Basic Brute Search::       Searches on common tag attributes.
+* DB Advanced Search::          Complex searches on associations
+* DB Generic Search::           Do It Yourself search criteria
+@end menu
+
+@node DB Results
+@subsection DB Results
+
+The successful result of a search returns a special list of the
+following form:
+
+@example
+   ( (DATABASE TAG1 TAG2 ...) (DATABASE2 TAG3 TAG4 ...) ...)
+@end example
+
+It should not be necessary to access the results in this way,
+however, as there are several routines that can be used to access
+this list.
+
+To turn a semanticdb search result into a simple tag table, use:
+
+@defun semanticdb-strip-find-results results &optional find-file-match
+@anchor{semanticdb-strip-find-results}
+Strip a semanticdb search @var{results} to exclude objects.
+This makes it appear more like the results of a @code{semantic-find-} call.
+Optional @var{find-file-match} loads all files associated with @var{results}
+into buffers.  This has the side effect of enabling @dfn{semantic-tag-buffer} to
+return a value.
+If the input @var{results} are not going to be used again, and if @var{find-file-match} is @code{nil},
+you can use @dfn{semanticdb-fast-strip-find-results} instead.
+@end defun
+
+@defun semanticdb-fast-strip-find-results results
+@anchor{semanticdb-fast-strip-find-results}
+Destructively strip a semanticdb search @var{results} to exclude objects.
+This makes it appear more like the results of a @code{semantic-find-} call.
+This is like @dfn{semanticdb-strip-find-results}, except the input list @var{results}
+will be changed.
+@end defun
+
+To write a function that accepts a tag table, or a semanticdb search
+result, use this to test if it is a semanticdb search result:
+
+@defun semanticdb-find-results-p resultp
+@anchor{semanticdb-find-results-p}
+Non-@code{nil} if @var{resultp} is in the form of a semanticdb search result.
+This query only really tests the first entry in the list that is @var{resultp},
+but should be good enough for debugging assertions.
+@end defun
+
+@defun semanticdb-find-result-with-nil-p resultp
+@anchor{semanticdb-find-result-with-nil-p}
+Non-@code{nil} of @var{resultp} is in the form of a semanticdb search result.
+@code{nil} is a valid value where a @var{table} usually is, but only if the @var{tag}
+results include overlays.
+This query only really tests the first entry in the list that is @var{resultp},
+but should be good enough for debugging assertions.
+@end defun
+
+To operate on the search results as though it were a simple tags
+table, or plain list, use these routines.
+
+@defun semanticdb-find-result-length result
+@anchor{semanticdb-find-result-length}
+Number of tags found in @var{result}.
+@end defun
+
+@defun semanticdb-find-result-nth result n
+@anchor{semanticdb-find-result-nth}
+In @var{result}, return the Nth search result.
+This is a @var{0} based search result, with the first match being element @var{0}.
+
+The returned value is a cons cell: (@var{tag} . @var{table}) where @var{tag}
+is the tag at the Nth position.  @var{table} is the semanticdb table where
+the @var{tag} was found.  Sometimes @var{table} can be @code{nil}.
+@end defun
+
+@defun semanticdb-find-result-nth-in-buffer result n
+@anchor{semanticdb-find-result-nth-in-buffer}
+In @var{result}, return the Nth search result.
+Like @dfn{semanticdb-find-result-nth}, except that only the @var{tag}
+is returned, and the buffer it is found it will be made current.
+If the result tag has no position information, the originating buffer
+is still made current.
+@end defun
+
+@defun semanticdb-find-result-mapc fcn result
+@anchor{semanticdb-find-result-mapc}
+Apply @var{fcn} to each element of find @var{result} for side-effects only.
+@var{fcn} takes two arguments.  The first is a @var{tag}, and the
+second is a @var{db} from whence @var{tag} originated.
+Returns result.
+@end defun
+
+@node DB Search Paths
+@subsection DB Search Paths
+
+For searches based on an include path (non-brutish) a path of tables
+needs to be generated.  Searching a lot of tables is slow, which is
+why a brutish search is not always recommended.  An include-based
+approach can also generate a lot of tables, so you can control how
+detailed a search is with a throttle variable.
+
+Ideally, each language mode will have a mode-specific value for
+this throttle value.  A user can also specify their own values if the
+default is not good enough.
+
+@defvar semanticdb-find-default-throttle
+@anchor{semanticdb-find-default-throttle}
+The default throttle for @code{semanticdb-find} routines.
+The throttle controls how detailed the list of database
+tables is for a symbol lookup.  The value is a list with
+the following keys:
+
+@table @code
+@item file
+The file the search is being performed from.  This option is here for
+completeness only, and is assumed to always be on.
+@item local
+Tables from the same local directory are included.  This includes
+files directly referenced by a file name which might be in a different
+directory.
+@item project
+Tables from the same local project are included If @code{project} is
+specified, then @code{local} is assumed.
+@item unloaded
+If a table is not in memory, load it.  If it is not cached on disk
+either, get the source, parse it, and create the table.
+@item system
+Tables from system databases.  These are specifically tables
+from system header files, or language equivalent.
+@item recursive
+For include based searches, includes tables referenced by included
+files.
+@item omniscience
+Included system databases which are omniscience, or somehow know
+everything.  Omniscience databases are found in
+@code{semanticdb-project-system-databases}.  The Emacs Lisp system
+@var{db} is an omniscience database.
+@end table
+
+@end defvar
+
+
+You can use the command @code{semanticdb-find-test-translate-path} to
+interactively test out how the path translator is working.  The path
+translation routines are:
+
+@defun semanticdb-find-translate-path path brutish
+@anchor{semanticdb-find-translate-path}
+Translate @var{path} into a list of semantic tables.
+Path translation involves identifying the @var{path} input argument
+in one of the following ways:
+  @code{nil} - Take the current buffer, and use its include list
+  buffer - Use that buffer's include list.
+  filename - Use that file's include list.  If the file is not
+      in a buffer, see of there is a semanticdb table for it.  If
+      not, read that file into a buffer.
+  tag - Get that tag's buffer of file file.  See above.
+  table - Search that table, and its include list.
+  find result - Search the results of a previous find.
+
+In addition, once the base path is found, there is the possibility of
+each added table adding yet more tables to the path, so this routine
+can return a lengthy list.
+
+If argument @var{brutish} is non-@code{nil}, then instead of using the include
+list, use all tables found in the parent project of the table
+identified by translating @var{path}.  Such searches use brute force to
+scan every available table.
+
+The return value is a list of objects of type @dfn{semanticdb-table} or
+its children.  In the case of passing in a find result, the result
+is returned unchanged.
+
+This routine uses @dfn{semanticdb-find-table-for-include} to translate
+specific include tags into a semanticdb table.
+
+Note: When searching using a non-brutish method, the list of
+included files will be cached between runs.  Database-references
+are used to track which files need to have their include lists
+refreshed when things change.  See @dfn{semanticdb-ref-test}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semanticdb-find-table-for-include includetag &optional table
+@anchor{semanticdb-find-table-for-include}
+For a single @var{includetag} found in @var{table}, find a @dfn{semanticdb-table} object
+@var{includetag} is a semantic @var{tag} of class @code{'include}.
+@var{table} as defined by @dfn{semantic-something-to-tag-table} to identify
+where the tag came from.  @var{table} is optional if @var{includetag} has an
+overlay of @code{:filename} attribute.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+
+TODO : Make this next part show up somewhere better.
+
+
+Each major mode should define their local include path with
+@code{defcustom-mode-local-semantic-dependency-system-include-path}.
+This macro builds a customizable variable that is kept in sync with
+the mode-local variable, and any include decorations that are active.
+
+@defun defcustom-mode-local-semantic-dependency-system-include-path mode name value &optional docstring
+@anchor{defcustom-mode-local-semantic-dependency-system-include-path}
+Create a mode-local value of the system-dependency include path.
+@var{mode} is the @code{major-mode} this name/value pairs is for.
+@var{name} is the name of the customizable value users will use.
+@var{value} is the path to add.
+@var{docstring} is a documentation string applied to the variable @var{name}
+users will customize.
+
+Creates a customizable variable users can customize that will
+keep semantic data structures up to date.
+@end defun
+
+
+@node DB Basic Name Search
+@subsection DB Basic Name Search
+
+ These searches scan a database table collection for tags based on
+name.  They are divided into normal and deep searches.  A deep
+search, as with in buffer tag scanning, implies that all entries are
+scanned, including those in type declarations.
+
+Normal Searches:
+
+@defun semanticdb-find-tags-by-name name &optional path find-file-match
+@anchor{semanticdb-find-tags-by-name}
+Search for all tags matching @var{name} on @var{path}.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-find-tags-by-name-regexp regexp &optional path find-file-match
+@anchor{semanticdb-find-tags-by-name-regexp}
+Search for all tags matching @var{regexp} on @var{path}.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-find-tags-for-completion prefix &optional path find-file-match
+@anchor{semanticdb-find-tags-for-completion}
+Search for all tags matching @var{prefix} on @var{path}.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-find-tags-by-class class &optional path find-file-match
+@anchor{semanticdb-find-tags-by-class}
+Search for all tags of @var{class} on @var{path}.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+Deep Searches:
+
+@defun semanticdb-deep-find-tags-by-name name &optional path find-file-match
+@anchor{semanticdb-deep-find-tags-by-name}
+Search for all tags matching @var{name} on @var{path}.
+Search also in all components of top level tags founds.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-deep-find-tags-by-name-regexp regexp &optional path find-file-match
+@anchor{semanticdb-deep-find-tags-by-name-regexp}
+Search for all tags matching @var{regexp} on @var{path}.
+Search also in all components of top level tags founds.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-deep-find-tags-for-completion prefix &optional path find-file-match
+@anchor{semanticdb-deep-find-tags-for-completion}
+Search for all tags matching @var{prefix} on @var{path}.
+Search also in all components of top level tags founds.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@node DB Data Type Search
+@subsection DB Data Type Search
+
+In typed languages, datatypes are looked up frequently in order to
+provide smart completions.  Semantic has a specialized datatype search
+that builds a cache of all datatypes on the include path.  Once this
+is built the first time, datatype lookups become very fast.
+
+Since it takes a long time to make a typecache the first time, you can
+have your tool decide if it wants to do work based on the existence of
+a typecache.
+
+@defun semanticdb-have-typecache-p table
+@anchor{semanticdb-have-typecache-p}
+Return non-@code{nil} (the typecache) if @var{table} has a pre-calculated typecache.
+@end defun
+
+@defun semanticdb-get-typecache table
+@anchor{semanticdb-get-typecache}
+Retrieve the typecache from the semanticdb @var{table}.
+If there is no table, create one, and fill it in.
+@end defun
+
+Searching doesn't require a typecache.  You can just pass in a
+database table, or path, much the way most semantic database searches work.
+
+@defun semanticdb-typecache-find type &optional path
+@anchor{semanticdb-typecache-find}
+Search the typecache for @var{type} in @var{path}.
+If type is a string, split the string, and search for the parts.
+If type is a list, treat the type as a pre-split string.
+@var{path} can be @code{nil} for the current buffer, or a semanticdb table.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+You can debug the typecache with this routine:
+
+@deffn Command semanticdb-typecache-dump
+@anchor{semanticdb-typecache-dump}
+Dump the typecache for the current buffer.
+@end deffn
+
+@node DB Basic Brute Search
+@subsection DB Basic Brute Search
+
+ These searches allow searching on specific attributes of tags,
+ such as name, type, or other attribute.
+
+@defun semanticdb-brute-deep-find-tags-by-name name &optional path find-file-match
+@anchor{semanticdb-brute-deep-find-tags-by-name}
+Search for all tags matching @var{name} on @var{path}.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+The argument @var{brutish} will be set so that searching includes all tables
+in the current project.
+@var{find-file-match} indicates that any time a matchi is found, the file
+associated wit that tag should be loaded into a buffer.
+@end defun
+
+@node DB Advanced Search
+@subsection DB Advanced Search
+
+ These are searches that were needed to accomplish some
+ specialized tasks as discovered in utilities.  Advanced searches
+ include matching methods defined outside some parent class.
+
+ The reason for advanced searches are so that external
+ repositories such as the Emacs obarray, or java @file{.class} files can
+ quickly answer these needed questions without dumping the entire
+ symbol list into Emacs for a regular semanticdb search.
+
+@defun semanticdb-find-tags-external-children-of-type type &optional path find-file-match
+@anchor{semanticdb-find-tags-external-children-of-type}
+Search for all tags defined outside of @var{type} w/ @var{type} as a parent.
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@defun semanticdb-find-tags-subclasses-of-type type &optional path find-file-match
+@anchor{semanticdb-find-tags-subclasses-of-type}
+Search for all tags of class type defined that subclass @var{TYPE}.
+See @dfn{semanticdb-find-translate-path} for details on @var{PATH}.
+@var{FIND-FILE-MATCH} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+@end defun
+
+@node DB Generic Search
+@subsection DB Generic Search
+
+If you would like to write your own search routine, you can the
+generic tag collector.  It will map your function across valid
+semantic databases.
+
+@defun semanticdb-find-tags-collector function &optional path find-file-match brutish
+@anchor{semanticdb-find-tags-collector}
+Collect all tags returned by @var{function} over @var{path}.
+The @var{function} must take two arguments.  The first is @var{table},
+which is a semanticdb table containing tags.  The second argument
+to @var{function} is @var{tags}.  @var{tags} may be a list of tags.  If @var{tags} is non-@code{nil}, then
+@var{function} should search the @var{tag} list, not through @var{table}.
+
+See @dfn{semanticdb-find-translate-path} for details on @var{path}.
+@var{find-file-match} indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+Note: You should leave @var{find-file-match} as @code{nil}.  It is far more
+efficient to take the results from any search and use
+@dfn{semanticdb-strip-find-results} instead.  This argument is here
+for backward compatibility.
+
+If optional argument @var{brutish} is non-@code{nil}, then ignore include statements,
+and search all tables in this project tree.
+@end defun
+
+@node System Databases
+@section System Databases
+
+System Databases are special implementations of the database and
+table API which make some external tag source appear as though it
+were a normal buffer with semantic parsed tags available.
+
+Search routines for these databases return a special type of table
+not associated with a file.  It is important to be aware of this
+possible return value.
+
+
+@deffn Type semanticdb-project-database-emacs-lisp
+@anchor{semanticdb-project-database-emacs-lisp}
+Database representing Emacs core.
+@end deffn
+
+This Emacs database is loaded automatically.
+
+
+@deffn Type semanticdb-project-database-ebrowse
+@anchor{semanticdb-project-database-ebrowse}
+Semantic Database deriving tags using the @var{ebrowse} tool.
+@var{ebrowse} is a C/C++ parser for use with @code{ebrowse} Emacs program.
+@end deffn
+
+To create new EBROWSE project databases, use:
+
+@deffn Command semanticdb-create-ebrowse-database dir
+@anchor{semanticdb-create-ebrowse-database}
+Create an @var{ebrowse} database for directory @var{dir}.
+The database file is stored in ~/.semanticdb, or whichever directory
+is specified by @code{semanticdb-default-system-save-directory}.
+@end deffn
+
+@node Semanticdb references
+@section Semanticdb References
+
+Semantic database can keep references to eachother.  The semanticdb
+search routine @code{semanticdb-find-translate-path} will keep the
+references up-to date whenever you do a semanticdb search.  Whenever a
+buffer is reparsed, all caches are synchronized through the reference
+tables.
+
+The reference mechanism will let you identify references in either
+direction.
+
+This routine will return a list of TAGS that refer to some database.
+Use the routine @code{semanticdb-find-table-for-include} to conver
+these include tags into tables.
+
+@defun semanticdb-includes-in-table dbt
+@anchor{semanticdb-includes-in-table}
+Return a list of direct includes in table @var{dbt}.
+@end defun
+
+To run a function against all @semantic{} tables that refer to the
+current table, use this routine:
+
+@defun semanticdb-notify-references dbt method
+@anchor{semanticdb-notify-references}
+Notify all references of the table @var{dbt} using method.
+@var{method} takes two arguments.
+  (@var{method} @var{table-to-notify} @var{dbt})
+@var{table-to-notify} is a semanticdb-table which is being notified.
+@var{dbt}, the second argument is @var{dbt}.
+@end defun
+
+
+The following routines will help keep things up-to-date:
+
+@defun semanticdb-check-references dbt
+@anchor{semanticdb-check-references}
+Check and cleanup references in the database @var{dbt}.
+Any reference to a file that cannot be found, or whos file no longer
+refers to @var{dbt} will be removed.
+@end defun
+
+To debug references, use this routine:
+
+@deffn Command semanticdb-ref-test refresh
+@anchor{semanticdb-ref-test}
+Dump out the list of references for the current buffer.
+If @var{refresh} is non-@code{nil}, cause the current table to have its references
+refreshed before dumping the result.
+@end deffn
+
+
+
+@node Idle Scheduling
+@chapter Idle Scheduling
+
+The Semantic Idle Scheduler is a minor mode which performs semantic
+specific tasks in idle time.
+See @inforef{Idle Scheduler, , semantic-user.info}.
+
+It performs the following tasks in order:
+
+@enumerate
+@item 
+Reprarse the current buffer if needed
+@item
+Reparse other buffers that need it
+@item
+Execute other scheduled semantic related operations.
+@end enumerate
+
+Care is take in the idle scheduler to exit immediately if user input
+is detected, improving editing performance.
+
+The reason for grouping these tasks together is so that the automatic
+reparsing code executes before other idle services.  This allows
+lexically broken buffers to be detected so that the other
+applications that follow do not accidentally reparse the buffer
+leaving unmatched syntax all over.
+
+You can create new minor modes that are automatically scheduled by
+the semantic idle scheduler.  Create the new minor mode with:
+
+@defun define-semantic-idle-service name doc &rest forms
+@anchor{define-semantic-idle-service}
+Create a new idle services with @var{NAME}.
+@var{DOC} will be a documentation string describing @var{FORMS}.
+@var{FORMS} will be called during idle time after the current buffer's
+semantic tag information has been updated.
+This routines creates the following functions and variables:
+@end defun
+
+@section User Input Handling
+
+When writing an idle service, it is important for tasks that can take
+a long time to correctly exit upon user input.
+
+You can test for user input in your idle handler with the following
+routines:
+
+@defun semantic-throw-on-input from
+@anchor{semantic-throw-on-input}
+Exit with @dfn{throw} when in @dfn{semantic-exit-on-input} on user input.
+@var{FROM} is an indication of where this function is called from as a value
+to pass to @dfn{throw}.  It is recommended to use the name of the function
+calling this one.
+@end defun
+
+If you need to carefully extract from your function, you can wrap
+just a section of your function to exit on user input by wrapping it
+with this macro:
+
+@defun semantic-exit-on-input symbol &rest forms
+@anchor{semantic-exit-on-input}
+Using @var{SYMBOL} as an argument to @dfn{throw}, execute @var{FORMS}.
+If @var{FORMS} includes a call to @code{semantic-thow-on-input}, then
+if a user presses any key during execution, this form macro
+will exit with the value passed to @dfn{semantic-throw-on-input}.
+If @var{FORMS} completes, then the return value is the same as @dfn{progn}.
+@end defun
+
+Upon catching user input, you can try to detect if there was an exit
+from the return argument, and continue throwing with an additional
+call to @code{semantic-throw-on-input}.
+
+@node Example Programs
+@chapter Programming Examples
+
+  *** NOTE ***  This section needs to be written
+
+
+@node Current Context
+@chapter Deriving the Current Context
+
+This chapter deals with how to derive the current context, and also
+how a language maintainer can get the current context API to work
+with their language.
+
+By default, the behavior will function in C like languages.  This
+means languages with parenthetical blocks, and type dereferencing
+which uses a similar form.
+
+@menu
+* Blocks::                      
+* Local Variables::             Getting lists of local variables.
+* Derived Context::             What goes at a given location?
+* Context Analysis::            Analysis information about the local context.
+@end menu
+
+@node Blocks
+@section Blocks and Navigation
+
+Source code is typically built up of control structures, and blocks of
+context, or lexical scope.  Semantic terms these lexical scopes as a
+``context''.  The following functions can be used to navigate contexts.
+Some of them are override functions.  Language authors can override
+a subset of them to make them work for their language.
+
+@defun semantic-up-context &optional point bounds-type
+@anchor{semantic-up-context}
+Move point up one context from @var{point}.
+Return non-@code{nil} if there are no more context levels.
+Overloaded functions using @code{up-context} take no parameters.
+@var{bounds-type} is a symbol representing a tag class to restrict
+movement to.  If this is @code{nil}, @code{'function} is used.
+This will find the smallest tag of that class (function, variable,
+type, etc) and make sure non-@code{nil} is returned if you cannot
+go up past the bounds of that tag.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-beginning-of-context &optional point
+@anchor{semantic-beginning-of-context}
+Move @var{point} to the beginning of the current context.
+Return non-@code{nil} if there is no upper context.
+The default behavior uses @dfn{semantic-up-context}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-end-of-context &optional point
+@anchor{semantic-end-of-context}
+Move @var{point} to the end of the current context.
+Return non-@code{nil} if there is no upper context.
+Be default, this uses @dfn{semantic-up-context}, and assumes parenthetical
+block delimiters.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+These next set of functions can be used to navigate across commands.
+
+@defun semantic-end-of-command
+@anchor{semantic-end-of-command}
+Move to the end of the current command.
+Be default, uses @code{semantic-command-separation-character}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-beginning-of-command
+@anchor{semantic-beginning-of-command}
+Move to the beginning of the current command.
+Be default, uses @code{semantic-command-separation-character}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@node Local Variables
+@section Deriving local variables
+
+Within a given context, or block of code, local variables are often
+defined.  These functions can be used to retrieve lists of locally
+scoped variables.
+
+@defun semantic-get-local-variables &optional point
+@anchor{semantic-get-local-variables}
+Get the local variables based on POINT's context.
+Local variables are returned in Semantic tag format.
+This can be overriden with @code{get-local-variables}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-get-local-arguments &optional point
+@anchor{semantic-get-local-arguments}
+Get arguments (variables) from the current context at @var{point}.
+Parameters are available if the point is in a function or method.
+Return a list of tags unlinked from the originating buffer.
+Arguments are obtained by overriding @code{get-local-arguments}, or by the
+default function @dfn{semantic-get-local-arguments-default}.  This, must
+return a list of tags, or a list of strings that will be converted to
+tags.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-get-all-local-variables &optional point
+@anchor{semantic-get-all-local-variables}
+Get all local variables for this context, and parent contexts.
+Local variables are returned in Semantic tag format.
+Be default, this gets local variables, and local arguments.
+Optional argument @var{point} is the location to start getting the variables from.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@node Derived Context
+@section Deriving the Current Context
+
+While a context has already been used to describe blocks of code,
+other context include more local details, such as the symbol the
+cursor is on, or the fact we are assigning into some other variable.
+
+These context deriving functions can be overridden to provide language
+specific behavior.  By default, it assumes a C like language.
+
+@defun semantic-ctxt-current-symbol &optional point
+@anchor{semantic-ctxt-current-symbol}
+Return the current symbol the cursor is on at @var{point} in a list.
+This will include a list of type/field names when applicable.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-ctxt-current-assignment &optional point
+@anchor{semantic-ctxt-current-assignment}
+Return the current assignment near the cursor at @var{point}.
+Return a list as per @dfn{semantic-ctxt-current-symbol}.
+Return @code{nil} if there is nothing relevant.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-ctxt-current-function &optional point
+@anchor{semantic-ctxt-current-function}
+Return the current function call the cursor is in at @var{point}.
+The function returned is the one accepting the arguments that
+the cursor is currently in.  It will not return function symbol if the
+cursor is on the text representing that function.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-ctxt-current-argument &optional point
+@anchor{semantic-ctxt-current-argument}
+Return the index of the argument position the cursor is on at @var{point}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-ctxt-current-thing
+@anchor{semantic-ctxt-current-thing}
+Calculate a thing identified by the current cursor position.
+Calls previously defined @code{semantic-ctxt-current-@dots{}} calls until something
+gets a match.  See @dfn{semantic-ctxt-current-symbol},
+@dfn{semantic-ctxt-current-function}, and @dfn{semantic-ctxt-current-assignment}
+for details on the return value.
+@end defun
+
+@defun semantic-ctxt-current-class-list &optional point
+@anchor{semantic-ctxt-current-class-list}
+Return a list of tag classes that are allowed at @var{point}.
+If @var{point} is @code{nil}, the current buffer location is used.
+For example, in Emacs Lisp, the symbol after a ( is most likely
+a function.  In a makefile, symbols after a : are rules, and symbols
+after a $( are variables.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-ctxt-scoped-types &optional point
+@anchor{semantic-ctxt-scoped-types}
+Return a list of type names currently in scope at @var{point}.
+The return value can be a mixed list of either strings (names of
+types that are in scope) or actual tags (type declared locally
+that may or may not have a name.)
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@node Context Analysis
+@section Analysis of the current context
+
+The context parsing API is used in a context analysis library.  This
+library provides high level routines for scanning through token
+databases to create lists of token associates.  At its core is a set
+of EIEIO classes defining a context.  The context contains information
+about what was parsed at a given position, such as the strings there,
+and they type of assignment.  The analysis library then searches the
+databases to determine the types and names available.
+
+Two high level functions which can be run interactively are:
+
+@deffn Command semantic-analyze-current-context &optional position
+@anchor{semantic-analyze-current-context}
+Analyze the current context at optional @var{position}.
+If called interactively, display interesting information about @var{position}
+in a separate buffer.
+Returns an object based on symbol @dfn{semantic-analyze-context}.
+
+This function can be overriden with the symbol @code{analyze-context}.
+When overriding this function, your override will be called while
+cursor is at @var{position}.  In addition, your function will not be called
+if a cached copy of the return object is found.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end deffn
+
+
+@deffn Command semantic-analyze-possible-completions context
+@anchor{semantic-analyze-possible-completions}
+Return a list of semantic tags which are possible completions.
+@var{context} is either a position (such as point), or a precalculated
+context.  Passing in a context is useful if the caller also needs
+to access parts of the analysis.
+Completions run through the following filters:
+
+@itemize
+@item
+Elements currently in scope
+@item
+Constants currently in scope
+@item
+Elements match the @code{:prefix} in the @var{context}.
+@item
+Type of the completion matches the type of the context.
+@end itemize
+
+Context type matching can identify the following:
+
+@itemize
+@item
+No specific type
+@item
+Assignment into a variable of some type.
+@item
+Argument to a function with type constraints.
+@end itemize
+
+When called interactively, displays the list of possible completions
+in a buffer.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end deffn
+
+@menu
+* Analysis Overview::           A description of how the analyzer works.
+* Analysis Objects::            What is in the analysis object.
+* Completion Overview::         How completions are calculated.
+@end menu
+
+@node Analysis Overview
+@subsection Analysis Overview
+
+The semantic analysis function @dfn{semantic-analye-current-context}
+creates an Analysis Object.  See @ref{Analysis Objects}.  This object
+contains many useful pieces of information needed to do any other
+kind of intelligent action on the local context.
+
+If you call this function interactively, it will popup a buffer with
+a summary of the return value.  This is useful when debugging.
+
+@example
++--------+   +----------------+      +-----------------+
+| Buffer |---| Context Parser |------|   Scope Object  |
++--------+   +----------------+      +-----------------+
+    |                                        |
++--------+   +-----------+                   |
+| Parser |---| Tag Table |---------------+   |
++--------+   +-----------+               |   |
+                                         |   |
+                                         |   |
+             +-----------+               |   |
+         +-->| Typecache |-----------+   |   |
+         |   +-----------+           |   |   |
+         |                           |   |   |
+         |                           V   V   V
++-------------+                     +-------------------+
+| Semantic DB |-------------------->| Semantic Analyzer |
++-------------+                     +-------------------+
+                                             |
+                                             V
+                                     +-----------------+
+                                     | Analysis Object |
+                                     +-----------------+
+@end example
+
+@node Analysis Objects
+@subsection Analysis Objects
+
+@defindex analyze
+
+@c First, delete text between this comment and END OF ANALYZE OBJECT text.
+@c 
+@c Execute the below line with C-x C-e
+@c
+
+@c (progn (require 'semantic-analyze) (eieiodoc-class semantic-analyze-context "analyze"))
+
+NOTE: Need to regenerate this section
+
+@c END OF ANALZE OBJECT SECTION
+
+@node Completion Overview
+@subsection Completion Overview
+
+NOTE: Need to write this section too.
+
+@node Data Debugger
+@chapter Data structure debugger
+
+The data structures that @semantic{} provides can be complex, and
+figuring out why some level of application API performs incorrectly
+can be difficult.
+
+The data debugger is provided by @file{data-debug.el} which is
+independent of @semantic{}, though @semantic{} extends it for tag
+structures and objects it provides.
+
+The data debugger provides a way to look inside the
+various data structures of Semantic in a structures and complete way
+to help identify what a problem may be.
+
+When using @code{edebug} to interactively debug a function, the key
+@kbd{E} is bound to @code{data-debug-edebug-expr}, which will provide
+a buffer with the evaluated expression shown in it.
+
+@deffn Command data-debug-edebug-expr expr
+@anchor{data-debug-edebug-expr}
+Dump out the context of some expression @var{expr} in edebug with ddebug.
+@end deffn
+
+@section App Debugger Entry Points
+
+There are a few basic functions that enter into the debugger.  For
+historical reasons, the @semantic{} functions use the name
+@code{adebug} to specify functions that use the data debugger.
+
+@deffn Command semantic-adebug-bovinate
+@anchor{semantic-adebug-bovinate}
+The same as @dfn{bovinate}. Display the results in a debug buffer.
+@end deffn
+
+@deffn Command semantic-adebug-searchdb regex
+@anchor{semantic-adebug-searchdb}
+Search the semanticdb for @var{regex} for the current buffer.
+Display the results as a debug list.
+@end deffn
+
+@deffn Command semantic-adebug-analyze
+@anchor{semantic-adebug-analyze}
+Perform @dfn{semantic-analyze-current-context}.
+Display the results as a debug list.
+@end deffn
+
+@section data-debug mode
+
+The semantic adebug API now sits on @code{data-debug} mode, which
+provides a simple user facing UI for looking into the data structures.
+
+@deffn Command data-debug-mode
+@anchor{semantic-adebug-mode}
+Major-mode for the Data Debugging.
+
+Keybindings:
+@table @kbd
+@item spc
+Expand or contract
+@item N
+Next entry, and expand/contract.
+@item P
+Previous entry, and expand/contract.
+@item n
+Next entry
+@item p
+Next entry
+@item <mouse-2>
+Expand/Contract entries.
+@end table
+
+@end deffn
+
+@section Create new debugger entry commands
+
+Creating a new Application debugger entry point is easy.
+First, get a datastructure you need to analyze.
+
+The first function to call is:
+
+@defun data-debug-new-buffer name
+@anchor{semantic-adebug-new-buffer}
+Create a new ddebug buffer with @var{name}.
+@end defun
+
+Next, you need to find the correct function for inserting your
+datastructure.  All adebug insertion functions are of the form
+@code{data-debug-insert-THING}, where @var{thing} is either the word
+@code{thing}, or whatever your object is.  Use Emacs help to pick
+something out.
+
+@defun data-debug-insert-thing thing prefix prebuttontext &optional parent
+@anchor{data-debug-insert-thing}
+Insert @var{thing} with @var{prefix}.
+@var{prebuttontext} is some text to insert between prefix and the thing
+that is not included in the indentation calculation of any children.
+If @var{parent} is non-@code{nil}, it is somehow related as a parent to thing.
+@end defun
+
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
diff --git a/site/cedet-1.0pre7/semantic/doc/bovine.info b/site/cedet-1.0pre7/semantic/doc/bovine.info
new file mode 100644
index 0000000..5e68db1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/bovine.info
@@ -0,0 +1,768 @@
+This is bovine.info, produced by makeinfo version 4.9 from bovine.texi.
+
+   This manual documents Bovine parser development in Semantic
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam
+Copyright (C) 2001, 2002, 2003, 2004 David Ponce Copyright (C) 2002,
+2003 Richard Y. Kim
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic bovine parser development: (bovine).
+END-INFO-DIR-ENTRY
+
+   This file documents parser development with the bovine parser
+generator _Infrastructure for parser based text analysis in Emacs_
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam,
+David Ponce, and Richard Y. Kim
+
+
+File: bovine.info,  Node: Top,  Next: Starting Rules,  Up: (dir)
+
+Bovine parser development
+*************************
+
+The "bovine" parser is the original semantic parser, and is an
+implementation of an LL parser.  It is good for simple languages.  It
+has many conveniences making grammar writing easy.  The conveniences
+make it less powerful than a Bison-like LALR parser.  For more
+information, *note the Wisent Parser Manual: (wisent)top.
+
+Bovine LL grammars are stored in files with a `.by' extension.  When
+compiled, the contents is converted into a file of the form
+`NAME-by.el'.  This, in turn is byte compiled.  *note Grammar Framework
+Manual: (grammar-fw)top.
+
+* Menu:
+
+* Starting Rules::              The starting rules for the grammar.
+* Bovine Grammar Rules::        Rules used to parse a language
+* Optional Lambda Expression::  Actions to take when a rule is matched
+* Bovine Examples::             Simple Samples
+* GNU Free Documentation License::
+* Index::
+
+
+File: bovine.info,  Node: Starting Rules,  Next: Bovine Grammar Rules,  Prev: Top,  Up: Top
+
+1 Starting Rules
+****************
+
+In Bison, one and only one nonterminal is designated as the "start"
+symbol.  In semantic, one or more nonterminals can be designated as the
+"start" symbol.  They are declared following the `%start' keyword
+separated by spaces.  *note (grammar-fw)start Decl::.
+
+If no `%start' keyword is used in a grammar, then the very first is
+used.  Internally the first start nonterminal is targeted by the
+reserved symbol `bovine-toplevel', so it can be found by the parser
+harness.
+
+To find locally defined variables, the local context handler needs to
+parse the body of functional code.  The `scopestart' declaration
+specifies the name of a nonterminal used as the goal to parse a local
+context, *note (grammar-fw)scopestart Decl::.  Internally the
+scopestart nonterminal is targeted by the reserved symbol
+`bovine-inner-scope', so it can be found by the parser harness.
+
+
+File: bovine.info,  Node: Bovine Grammar Rules,  Next: Optional Lambda Expression,  Prev: Starting Rules,  Up: Top
+
+2 Bovine Grammar Rules
+**********************
+
+The rules are what allow the compiler to create tags from a language
+file.  Once the setup is done in the prologue, you can start writing
+rules.  *note (grammar-fw)Grammar Rules::.
+
+     RESULT : COMPONENTS1 OPTIONAL-SEMANTIC-ACTION1)
+            | COMPONENTS2 OPTIONAL-SEMANTIC-ACTION2
+            ;
+
+RESULT is a nonterminal, that is a symbol synthesized in your grammar.
+COMPONENTS is a list of elements that are to be matched if RESULT is to
+be made.  OPTIONAL-SEMANTIC-ACTION is an optional sequence of
+simplified Emacs Lisp expressions for concocting the parse tree.
+
+In bison, each time an element of COMPONENTS is found, it is "shifted"
+onto the parser stack.  (The stack of matched elements.)  When all
+COMPONENTS' elements have been matched, it is "reduced" to RESULT.
+*Note (bison)Algorithm::.
+
+A particular RESULT written into your grammar becomes the parser's
+goal.  It is designated by a `%start' statement (*note Starting
+Rules::).  The value returned by the associated
+OPTIONAL-SEMANTIC-ACTION is the parser's result.  It should be a tree
+of semantic "tags", *note (semantic-appdev)Semantic Tags::.
+
+COMPONENTS is made up of symbols.  A symbol such as `FOO' means that a
+syntactic token of class `FOO' must be matched.
+
+* Menu:
+
+* How Lexical Tokens Match::
+* Grammar-to-Lisp Details::
+* Order of components in rules::
+
+
+File: bovine.info,  Node: How Lexical Tokens Match,  Next: Grammar-to-Lisp Details,  Up: Bovine Grammar Rules
+
+2.1 How Lexical Tokens Match
+============================
+
+A lexical rule must be used to define how to match a lexical token.
+
+For instance:
+
+     %keyword FOO "foo"
+
+Means that `FOO' is a reserved language keyword, matched as such by
+looking up into a keyword table, *note (grammar-fw)keyword Decl::.
+This is because `"foo"' will be converted to `FOO' in the lexical
+analysis stage.  Thus the symbol `FOO' won't be available any other way.
+
+If we specify our token in this way:
+
+     %token <symbol> FOO "foo"
+
+then `FOO' will match the string `"foo"' explicitly, but it won't do so
+at the lexical level, allowing use of the text `"foo"' in other forms
+of regular expressions.
+
+In that case, `FOO' is a `symbol'-type token.  To match, a `symbol'
+must first be encountered, and then it must `string-match "foo"'.
+
+*Caution:*
+     Be especially careful to remember that `"foo"', and more generally
+     the %token's match-value string, is a regular expression!
+
+Non symbol tokens are also allowed.  For example:
+
+     %token <punctuation> PERIOD "[.]"
+
+     filename : symbol PERIOD symbol
+              ;
+
+`PERIOD' is a `punctuation'-type token that will explicitly match one
+period when used in the above rule.
+
+*Please Note:*
+     `symbol', `punctuation', etc., are predefined lexical token types,
+     based on the "syntax class"-character associations currently in
+     effect.
+
+
+File: bovine.info,  Node: Grammar-to-Lisp Details,  Next: Order of components in rules,  Prev: How Lexical Tokens Match,  Up: Bovine Grammar Rules
+
+2.2 Grammar-to-Lisp Details
+===========================
+
+For the bovinator, lexical token matching patterns are _inlined_.  When
+the grammar-to-lisp converter encounters a lexical token declaration of
+the form:
+
+     %token <TYPE> TOKEN-NAME MATCH-VALUE
+
+It substitutes every occurrences of TOKEN-NAME in rules, by its
+expanded form:
+
+     TYPE MATCH-VALUE
+
+For example:
+
+     %token <symbol> MOOSE "moose"
+
+     find_a_moose: MOOSE
+                 ;
+
+Will generate this pseudo equivalent-rule:
+
+     find_a_moose: symbol "moose"   ;; invalid syntax!
+                 ;
+
+Thus, from the bovinator point of view, the COMPONENTS part of a rule
+is made up of symbols and strings.  A string in the mix means that the
+previous symbol must have the additional constraint of exactly matching
+it, as described in *Note How Lexical Tokens Match::.
+
+*Please Note:*
+     For the bovinator, this task was mixed into the language
+     definition to simplify implementation, though Bison's technique is
+     more efficient.
+
+
+File: bovine.info,  Node: Order of components in rules,  Prev: Grammar-to-Lisp Details,  Up: Bovine Grammar Rules
+
+2.3 Order of components in rules
+================================
+
+If a rule has multiple components, order is important, for example
+
+     headerfile : symbol PERIOD symbol
+                | symbol
+                ;
+
+would match `foo.h' or the C++ header `foo'.  The bovine parser will
+first attempt to match the long form, and then the short form.  If they
+were in reverse order, then the long form would never be tested.
+
+
+File: bovine.info,  Node: Optional Lambda Expression,  Next: Bovine Examples,  Prev: Bovine Grammar Rules,  Up: Top
+
+3 Optional Lambda Expressions
+*****************************
+
+The OLE ("Optional Lambda Expression") is converted into a bovine
+lambda.  This lambda has special short-cuts to simplify reading the
+semantic action definition.  An OLE like this:
+
+     ( $1 )
+
+results in a lambda return which consists entirely of the string or
+object found by matching the first (zeroth) element of match.  An OLE
+like this:
+
+     ( ,(foo $1) )
+
+executes `foo' on the first argument, and then splices its return into
+the return list whereas:
+
+     ( (foo $1) )
+
+executes `foo', and that is placed in the return list.
+
+Here are other things that can appear inline:
+
+`$1'
+     The first object matched.
+
+`,$1'
+     The first object spliced into the list (assuming it is a list from
+     a non-terminal).
+
+`'$1'
+     The first object matched, placed in a list.  i.e. `( $1 )'.
+
+`foo'
+     The symbol `foo' (exactly as displayed).
+
+`(foo)'
+     A function call to foo which is stuck into the return list.
+
+`,(foo)'
+     A function call to foo which is spliced into the return list.
+
+`'(foo)'
+     A function call to foo which is stuck into the return list in a
+     list.
+
+`(EXPAND $1 NONTERMINAL DEPTH)'
+     A list starting with `EXPAND' performs a recursive parse on the
+     token passed to it (represented by `$1' above.)  The "semantic
+     list" is a common token to expand, as there are often interesting
+     things in the list.  The NONTERMINAL is a symbol in your table
+     which the bovinator will start with when parsing.  NONTERMINAL's
+     definition is the same as any other nonterminal.  DEPTH should be
+     at least `1' when descending into a semantic list.
+
+`(EXPANDFULL $1 NONTERMINAL DEPTH)'
+     Is like `EXPAND', except that the parser will iterate over
+     NONTERMINAL until there are no more matches.  (The same way the
+     parser iterates over the starting rule (*note Starting Rules::).
+     This lets you have much simpler rules in this specific case, and
+     also lets you have positional information in the returned tokens,
+     and error skipping.
+
+`(ASSOC SYMBOL1 VALUE1 SYMBOL2 VALUE2 ...)'
+     This is used for creating an association list.  Each SYMBOL is
+     included in the list if the associated VALUE is non-`nil'.  While
+     the items are all listed explicitly, the created structure is an
+     association list of the form:
+
+          ((SYMBOL1 . VALUE1) (SYMBOL2 . VALUE2) ...)
+
+`(TAG NAME CLASS [ATTRIBUTES])'
+     This creates one tag in the current buffer.
+
+    NAME
+          Is a string that represents the tag in the language.
+
+    CLASS
+          Is the kind of tag being create, such as `function', or
+          `variable', though any symbol will work.
+
+    ATTRIBUTES
+          Is an optional set of labeled values such as
+          `:constant-flag t :parent "parenttype"'.
+
+`(TAG-VARIABLE NAME TYPE DEFAULT-VALUE [ATTRIBUTES])'
+`(TAG-FUNCTION NAME TYPE ARG-LIST [ATTRIBUTES])'
+`(TAG-TYPE NAME TYPE MEMBERS PARENTS [ATTRIBUTES])'
+`(TAG-INCLUDE NAME SYSTEM-FLAG [ATTRIBUTES])'
+`(TAG-PACKAGE NAME DETAIL [ATTRIBUTES])'
+`(TAG-CODE NAME DETAIL [ATTRIBUTES])'
+     Create a tag with NAME of respectively the class `variable',
+     `function', `type', `include', `package', and `code'.  See *note
+     (semantic-appdev)Creating Tags:: for the lisp functions these
+     translate into.
+
+If the symbol `%quotemode backquote' is specified, then use `,@' to
+splice a list in, and `,' to evaluate the expression.  This lets you
+send `$1' as a symbol into a list instead of having it expanded inline.
+
+
+File: bovine.info,  Node: Bovine Examples,  Next: GNU Free Documentation License,  Prev: Optional Lambda Expression,  Up: Top
+
+4 Examples
+**********
+
+The rule:
+
+     any-symbol: symbol
+               ;
+
+is equivalent to
+
+     any-symbol: symbol
+                 ( $1 )
+               ;
+
+which, if it matched the string `"A"', would return
+
+     ( "A" )
+
+If this rule were used like this:
+
+     %token <punctuation> EQUAL "="
+     ...
+     assign: any-symbol EQUAL any-symbol
+             ( $1 $3 )
+           ;
+
+it would match `"A=B"', and return
+
+     ( ("A") ("B") )
+
+The letters `A' and `B' come back in lists because `any-symbol' is a
+nonterminal, not an actual lexical element.
+
+To get a better result with nonterminals, use , to splice lists in like
+this:
+
+     %token <punctuation> EQUAL "="
+     ...
+     assign: any-symbol EQUAL any-symbol
+             ( ,$1 ,$3 )
+           ;
+
+which would return
+
+     ( "A" "B" )
+
+
+File: bovine.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Bovine Examples,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: bovine.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+
+Tag Table:
+Node: Top1104
+Node: Starting Rules2080
+Node: Bovine Grammar Rules3072
+Node: How Lexical Tokens Match4572
+Node: Grammar-to-Lisp Details6069
+Node: Order of components in rules7230
+Node: Optional Lambda Expression7772
+Node: Bovine Examples11416
+Node: GNU Free Documentation License12344
+Node: Index32081
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/bovine.texi b/site/cedet-1.0pre7/semantic/doc/bovine.texi
new file mode 100644
index 0000000..b24e0e0
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/bovine.texi
@@ -0,0 +1,480 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename bovine.info
+@set TITLE  Bovine parser development
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents Bovine parser development in Semantic
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam
+Copyright @copyright{} 2001, 2002, 2003, 2004 David Ponce
+Copyright @copyright{} 2002, 2003 Richard Y. Kim
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic bovine parser development: (bovine).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents parser development with the bovine parser generator
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+The @dfn{bovine} parser is the original @semantic{} parser, and is an
+implementation of an @acronym{LL} parser.  It is good for simple
+languages.  It has many conveniences making grammar writing easy.  The
+conveniences make it less powerful than a Bison-like @acronym{LALR}
+parser.  For more information, @inforef{top, the Wisent Parser Manual,
+wisent}.
+
+Bovine @acronym{LL} grammars are stored in files with a @file{.by}
+extension.  When compiled, the contents is converted into a file of
+the form @file{NAME-by.el}.  This, in turn is byte compiled.
+@inforef{top, Grammar Framework Manual, grammar-fw}.
+
+@menu
+* Starting Rules::              The starting rules for the grammar.
+* Bovine Grammar Rules::        Rules used to parse a language
+* Optional Lambda Expression::  Actions to take when a rule is matched
+* Bovine Examples::             Simple Samples
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Starting Rules
+@chapter Starting Rules
+
+In Bison, one and only one nonterminal is designated as the ``start''
+symbol.  In @semantic{}, one or more nonterminals can be designated as
+the ``start'' symbol.  They are declared following the @code{%start}
+keyword separated by spaces.  @inforef{start Decl, ,grammar-fw}.
+
+If no @code{%start} keyword is used in a grammar, then the very first
+is used.  Internally the first start nonterminal is targeted by the
+reserved symbol @code{bovine-toplevel}, so it can be found by the
+parser harness.
+
+To find locally defined variables, the local context handler needs to
+parse the body of functional code.  The @code{scopestart} declaration
+specifies the name of a nonterminal used as the goal to parse a local
+context, @inforef{scopestart Decl, ,grammar-fw}.  Internally the
+scopestart nonterminal is targeted by the reserved symbol
+@code{bovine-inner-scope}, so it can be found by the parser harness.
+
+@node Bovine Grammar Rules
+@chapter Bovine Grammar Rules
+
+The rules are what allow the compiler to create tags from a language
+file.  Once the setup is done in the prologue, you can start writing
+rules.  @inforef{Grammar Rules, ,grammar-fw}.
+
+@example
+@var{result} : @var{components1} @var{optional-semantic-action1})
+       | @var{components2} @var{optional-semantic-action2}
+       ;
+@end example
+
+@var{result} is a nonterminal, that is a symbol synthesized in your grammar.
+@var{components} is a list of elements that are to be matched if @var{result}
+is to be made.  @var{optional-semantic-action} is an optional sequence
+of simplified Emacs Lisp expressions for concocting the parse tree.
+
+In bison, each time an element of @var{components} is found, it is
+@dfn{shifted} onto the parser stack.  (The stack of matched elements.)
+When all @var{components}' elements have been matched, it is
+@dfn{reduced} to @var{result}.  @xref{(bison)Algorithm}.
+
+A particular @var{result} written into your grammar becomes
+the parser's goal.  It is designated by a @code{%start} statement
+(@pxref{Starting Rules}).  The value returned by the associated
+@var{optional-semantic-action} is the parser's result.  It should be
+a tree of @semantic{} @dfn{tags}, @inforef{Semantic Tags, ,
+semantic-appdev}.
+
+@var{components} is made up of symbols.  A symbol such as @code{FOO}
+means that a syntactic token of class @code{FOO} must be matched.
+
+@menu
+* How Lexical Tokens Match::    
+* Grammar-to-Lisp Details::     
+* Order of components in rules::  
+@end menu
+
+@node How Lexical Tokens Match
+@section How Lexical Tokens Match
+
+A lexical rule must be used to define how to match a lexical token.
+
+For instance:
+
+@example
+%keyword FOO "foo"
+@end example
+
+Means that @code{FOO} is a reserved language keyword, matched as such
+by looking up into a keyword table, @inforef{keyword Decl,
+,grammar-fw}.  This is because @code{"foo"} will be converted to
+@code{FOO} in the lexical analysis stage.  Thus the symbol @code{FOO}
+won't be available any other way.
+
+If we specify our token in this way:
+
+@example
+%token <symbol> FOO "foo"
+@end example
+
+then @code{FOO} will match the string @code{"foo"} explicitly, but it
+won't do so at the lexical level, allowing use of the text
+@code{"foo"} in other forms of regular expressions.
+
+In that case, @code{FOO} is a @code{symbol}-type token.  To match, a
+@code{symbol} must first be encountered, and then it must
+@code{string-match "foo"}.
+
+@table @strong
+@item Caution:
+Be especially careful to remember that @code{"foo"}, and more
+generally the %token's match-value string, is a regular expression!
+@end table
+
+Non symbol tokens are also allowed.  For example:
+
+@example
+%token <punctuation> PERIOD "[.]"
+
+filename : symbol PERIOD symbol
+         ;
+@end example
+
+@code{PERIOD} is a @code{punctuation}-type token that will explicitly
+match one period when used in the above rule.
+
+@table @strong
+@item Please Note:
+@code{symbol}, @code{punctuation}, etc., are predefined lexical token
+types, based on the @dfn{syntax class}-character associations
+currently in effect.
+@end table
+
+@node Grammar-to-Lisp Details
+@section Grammar-to-Lisp Details
+
+For the bovinator, lexical token matching patterns are @emph{inlined}.
+When the grammar-to-lisp converter encounters a lexical token
+declaration of the form:
+
+@example
+%token <@var{type}> @var{token-name} @var{match-value}
+@end example
+
+It substitutes every occurrences of @var{token-name} in rules, by its
+expanded form:
+
+@example
+@var{type} @var{match-value}
+@end example
+
+For example:
+
+@example
+%token <symbol> MOOSE "moose"
+
+find_a_moose: MOOSE
+            ;
+@end example
+
+Will generate this pseudo equivalent-rule:
+
+@example
+find_a_moose: symbol "moose"   ;; invalid syntax!
+            ;
+@end example
+
+Thus, from the bovinator point of view, the @var{components} part of a
+rule is made up of symbols and strings.  A string in the mix means
+that the previous symbol must have the additional constraint of
+exactly matching it, as described in @ref{How Lexical Tokens Match}.
+
+@table @strong
+@item Please Note:
+For the bovinator, this task was mixed into the language definition to
+simplify implementation, though Bison's technique is more efficient.
+@end table
+
+@node Order of components in rules
+@section Order of components in rules
+
+If a rule has multiple components, order is important, for example
+
+@example
+headerfile : symbol PERIOD symbol
+           | symbol
+           ;
+@end example
+
+would match @samp{foo.h} or the @acronym{C++} header @samp{foo}.
+The bovine parser will first attempt to match the long form, and then
+the short form.  If they were in reverse order, then the long form
+would never be tested.
+
+@c @xref{Default syntactic tokens}.
+
+@node Optional Lambda Expression
+@chapter Optional Lambda Expressions
+
+The @acronym{OLE} (@dfn{Optional Lambda Expression}) is converted into
+a bovine lambda.  This lambda has special short-cuts to simplify
+reading the semantic action definition.  An @acronym{OLE} like this:
+
+@example
+( $1 )
+@end example
+
+results in a lambda return which consists entirely of the string
+or object found by matching the first (zeroth) element of match.
+An @acronym{OLE} like this:
+
+@example
+( ,(foo $1) )
+@end example
+
+executes @code{foo} on the first argument, and then splices its return
+into the return list whereas:
+
+@example
+( (foo $1) )
+@end example
+
+executes @code{foo}, and that is placed in the return list.
+
+Here are other things that can appear inline:
+
+@table @code
+@item $1
+The first object matched.
+
+@item ,$1
+The first object spliced into the list (assuming it is a list from a
+non-terminal).
+
+@item '$1
+The first object matched, placed in a list.  i.e. @code{( $1 )}.
+
+@item foo
+The symbol @code{foo} (exactly as displayed).
+
+@item (foo)
+A function call to foo which is stuck into the return list.
+
+@item ,(foo)
+A function call to foo which is spliced into the return list.
+
+@item '(foo)
+A function call to foo which is stuck into the return list in a list.
+
+@item (EXPAND @var{$1} @var{nonterminal} @var{depth})
+A list starting with @code{EXPAND} performs a recursive parse on the
+token passed to it (represented by @samp{$1} above.)  The
+@dfn{semantic list} is a common token to expand, as there are often
+interesting things in the list.  The @var{nonterminal} is a symbol in
+your table which the bovinator will start with when parsing.
+@var{nonterminal}'s definition is the same as any other nonterminal.
+@var{depth} should be at least @samp{1} when descending into a
+semantic list.
+
+@item (EXPANDFULL @var{$1} @var{nonterminal} @var{depth})
+Is like @code{EXPAND}, except that the parser will iterate over
+@var{nonterminal} until there are no more matches.  (The same way the
+parser iterates over the starting rule (@pxref{Starting Rules}). This
+lets you have much simpler rules in this specific case, and also lets
+you have positional information in the returned tokens, and error
+skipping.
+
+@item (ASSOC @var{symbol1} @var{value1} @var{symbol2} @var{value2} @dots{})
+This is used for creating an association list.  Each @var{symbol} is
+included in the list if the associated @var{value} is non-@code{nil}.
+While the items are all listed explicitly, the created structure is an
+association list of the form:
+
+@example
+((@var{symbol1} . @var{value1}) (@var{symbol2} . @var{value2}) @dots{})
+@end example
+
+@item (TAG @var{name} @var{class} [@var{attributes}])
+This creates one tag in the current buffer.
+
+@table @var
+@item name
+Is a string that represents the tag in the language.
+
+@item class
+Is the kind of tag being create, such as @code{function}, or
+@code{variable}, though any symbol will work.
+
+@item attributes
+Is an optional set of labeled values such as @w{@code{:constant-flag t :parent
+"parenttype"}}.
+@end table
+
+@item  (TAG-VARIABLE @var{name} @var{type} @var{default-value} [@var{attributes}])
+@itemx (TAG-FUNCTION @var{name} @var{type} @var{arg-list} [@var{attributes}])
+@itemx (TAG-TYPE @var{name} @var{type} @var{members} @var{parents} [@var{attributes}])
+@itemx (TAG-INCLUDE @var{name} @var{system-flag} [@var{attributes}])
+@itemx (TAG-PACKAGE @var{name} @var{detail} [@var{attributes}])
+@itemx (TAG-CODE @var{name} @var{detail} [@var{attributes}])
+Create a tag with @var{name} of respectively the class
+@code{variable}, @code{function}, @code{type}, @code{include},
+@code{package}, and @code{code}.
+See @inforef{Creating Tags, , semantic-appdev} for the lisp
+functions these translate into.
+@end table
+
+If the symbol @code{%quotemode backquote} is specified, then use
+@code{,@@} to splice a list in, and @code{,} to evaluate the expression.
+This lets you send @code{$1} as a symbol into a list instead of having
+it expanded inline.
+
+@node Bovine Examples
+@chapter Examples
+
+The rule:
+
+@example
+any-symbol: symbol
+          ;
+@end example
+
+is equivalent to
+
+@example
+any-symbol: symbol
+            ( $1 )
+          ;
+@end example
+
+which, if it matched the string @samp{"A"}, would return
+
+@example
+( "A" )
+@end example
+
+If this rule were used like this:
+
+@example
+%token <punctuation> EQUAL "="
+@dots{}
+assign: any-symbol EQUAL any-symbol
+        ( $1 $3 )
+      ;
+@end example
+
+it would match @samp{"A=B"}, and return
+
+@example
+( ("A") ("B") )
+@end example
+
+The letters @samp{A} and @samp{B} come back in lists because
+@samp{any-symbol} is a nonterminal, not an actual lexical element.
+
+To get a better result with nonterminals, use @asis{,} to splice lists
+in like this:
+
+@example
+%token <punctuation> EQUAL "="
+@dots{}
+assign: any-symbol EQUAL any-symbol
+        ( ,$1 ,$3 )
+      ;
+@end example
+
+which would return
+
+@example
+( "A" "B" )
+@end example
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
+@c  LocalWords:  bovinator inlined
diff --git a/site/cedet-1.0pre7/semantic/doc/fdl.texi b/site/cedet-1.0pre7/semantic/doc/fdl.texi
new file mode 100644
index 0000000..704c31a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/fdl.texi
@@ -0,0 +1,369 @@
+@ignore
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@end ignore
+
+@center Version 1.1, March 2000
+
+@display
+Copyright (C) 2000  Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+@sp 1
+@enumerate 0
+@item
+PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document ``free'' in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially.  Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of ``copyleft'', which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+@sp 1
+@item
+APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License.  The ``Document'', below, refers to any
+such manual or work.  Any member of the public is a licensee, and is
+addressed as ``you''.
+
+A ``Modified Version'' of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A ``Secondary Section'' is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The ``Invariant Sections'' are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The ``Cover Texts'' are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A ``Transparent'' copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent.  A copy that is
+not ``Transparent'' is called ``Opaque''.
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification.  Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The ``Title Page'' means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, ``Title Page'' means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+@sp 1
+@item
+VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+@sp 1
+@item
+COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols.  If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+@sp 1
+@item
+MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.@*
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has less than five).@*
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.@*
+D. Preserve all the copyright notices of the Document.@*
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.@*
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.@*
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.@*
+H. Include an unaltered copy of this License.@*
+I. Preserve the section entitled ``History'', and its title, and add to
+   it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section entitled ``History'' in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.@*
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the ``History'' section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.@*
+K. In any section entitled ``Acknowledgements'' or ``Dedications'',
+   preserve the section's title, and preserve in the section all the
+   substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.@*
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.@*
+M. Delete any section entitled ``Endorsements''.  Such a section
+   may not be included in the Modified Version.@*
+N. Do not retitle any existing section as ``Endorsements''
+   or to conflict in title with any Invariant Section.@*
+@sp 1
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled ``Endorsements'', provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+@sp 1
+@item
+COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled ``History''
+in the various original documents, forming one section entitled
+``History''; likewise combine any sections entitled ``Acknowledgements'',
+and any sections entitled ``Dedications''.  You must delete all sections
+entitled ``Endorsements.''
+@sp 1
+@item
+COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+@sp 1
+@item
+AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation.  Such a compilation is called an ``aggregate'', and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+@sp 1
+@item
+TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License provided that you also include the
+original English version of this License.  In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+@sp 1
+@item
+TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+@sp 1
+@item
+FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+@end enumerate
+
+@unnumberedsec ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+@smallexample
+@group
+
+  Copyright (C)  @var{year}  @var{your name}.
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1
+  or any later version published by the Free Software Foundation;
+  with the Invariant Sections being @var{list their titles}, with the
+  Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
+  A copy of the license is included in the section entitled ``GNU
+  Free Documentation License''.
+@end group
+@end smallexample
+If you have no Invariant Sections, write ``with no Invariant Sections''
+instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write ``no Front-Cover Texts'' instead of
+``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/site/cedet-1.0pre7/semantic/doc/glossary.texi b/site/cedet-1.0pre7/semantic/doc/glossary.texi
new file mode 100644
index 0000000..33b190b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/glossary.texi
@@ -0,0 +1,68 @@
+@ignore
+@node Glossary
+@chapter Glossary
+@c This 'ignore' section fools texinfo-all-menus-update into creating
+@c proper menus for this chapter.
+@end ignore
+
+@table @keyword
+@item BNF
+In semantic 1.4, a BNF file represented ``Bovine Normal Form'', the
+grammar file used for the 1.4 parser generator.  This was a play on
+Backus-Naur Form which proved too confusing.
+
+@item bovinate
+A verb representing what happens when a bovine parser parses a file.
+
+@item bovine lambda
+In a bovine, or LL parser, the bovine lambda is a function to execute
+when a specific set of match rules has succeeded in matching text from
+the buffer.
+
+@item bovine parser
+A parser using the bovine parser generator.  It is an LL parser
+suitible for small simple languages.
+
+@item context
+
+@item LALR
+
+@item lexer
+A program which converts text into a stream of tokens by analyzing
+them lexically.  Lexers will commonly create strings, symbols,
+keywords and punctuation, and strip whitespaces and comments.
+
+@item LL
+
+@item nonterminal
+A nonterminal symbol or simply a nonterminal stands for a class of
+syntactically equivalent groupings. A nonterminal symbol name is used
+in writing grammar rules.
+
+@item overloadable
+Some functions are defined via @code{define-overload}.
+These can be overloaded via ....
+
+@item parser
+A program that converts @b{tokens} to @b{tags}.
+
+@item tag
+A tag is a representation of some entity in a language file, such as a
+function, variable, or include statement.  In semantic, the word tag is
+used the same way it is used for the etags or ctags tools.
+
+A tag is usually bound to a buffer region via overlay, or it just
+specifies character locations in a file.
+
+@item token
+A single atomic item returned from a lexer.  It represents some set
+of characters found in a buffer.
+
+@item token stream
+The output of the lexer as well as the input to the parser.
+
+@item wisent parser
+A parser using the wisent parser generator.  It is a port of bison to
+Emacs Lisp.  It is an LALR parser suitable for complex languages.
+
+@end table
diff --git a/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.png b/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.png
new file mode 100644
index 0000000..39ad076
Binary files /dev/null and b/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.png differ
diff --git a/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.txt b/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.txt
new file mode 100644
index 0000000..2f578de
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/grammar-fw-ov.txt
@@ -0,0 +1,30 @@
+
+
+           `Bovine' parser  !  `Wisent' parser  !  Other parser     
+                            !                   !                   
+   /!    + - - - - - - - - -!- - - - - - - - - -!- - - - - - - - - +
+   ||    !              Common Semantic Grammar Mode               !
+   ||    ! ,,,,,,,,,,,,,,,, ! ,,,,,,,,,,,,,,,,  ! ,,,,,,,,,,,,,,,, !
+Grammar  ! ; `BY' Grammar ; ! ; `WY' Grammar ;  ! ; `??' Grammar ; !
+Framework! ;              ; ! ;              ;  ! ;              ; !
+   ||    ! ;  Elisp Gen.  ; ! ;  Elisp Gen.  ;  ! ;  Elisp Gen.  ; !
+   ||    ! '''''''!'''''''' ! '''''''!''''''''  ! '''''''!'''''''' !
+   !/    + - - - -|- - - - -!- - - - | - - - - -!- - - - | - - - - +
+                  |         !        |          !        |          
+   /!       ,-----V------,  !  ,-----V------,   !  ,-----V------,   
+   ||      .   Language   . ! .   Language   .  ! .   Language   .  
+   ||      ` Support Lib. ' ! ` Support Lib. '  ! ` Support Lib. '  
+   ||       `--!------!--'  !  `--!------!--'   !  `--!------!--'   
+   ||          |      |     !     |      |      !     |      |      
+   ||      +---V---+  |     ! +---V---+  |      ! +---V---+  |      
+   ||      | Lexer |  |     ! | Lexer |  |      ! | Lexer |  |      
+Parser     +-------+  |     ! +-------+  |      ! +-------+  |      
+Framework             |     !            |      !            |      
+   ||      +- -- -- --! --+ ! +- -- -- --V --+  ! +- -- -- --V --+  
+   ||      ! No Compiler  ! ! !LALR Compiler !  ! !Optional Comp.!  
+   ||      +- -- -- --! --+ ! +- -- -- --! --+  ! +- -- -- --! --+  
+   ||                 |     !            |      !            |      
+   ||      +----------V---+ ! +----------V---+  ! +----------V---+  
+   ||      | LL Parser    | ! | LR Parser    |  ! | Parser Engine|  
+   !/      +--------------+ ! +--------------+  ! +--------------+  
+                            !                   !                   
diff --git a/site/cedet-1.0pre7/semantic/doc/grammar-fw.info b/site/cedet-1.0pre7/semantic/doc/grammar-fw.info
new file mode 100644
index 0000000..6c11293
Binary files /dev/null and b/site/cedet-1.0pre7/semantic/doc/grammar-fw.info differ
diff --git a/site/cedet-1.0pre7/semantic/doc/grammar-fw.texi b/site/cedet-1.0pre7/semantic/doc/grammar-fw.texi
new file mode 100644
index 0000000..fd40c8a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/grammar-fw.texi
@@ -0,0 +1,1606 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename grammar-fw.info
+@set TITLE  Semantic Grammar Framework Manual
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents Grammar Development with Semantic.
+
+Copyright @copyright{} 2004, 2009 Eric M. Ludlam
+Copyright @copyright{} 2004 David Ponce
+Copyright @copyright{} 2004 Richard Y. Kim
+
+@c If this document includes aspects of previous documents, we need
+@c the dates to go back in time to include when those were written.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic Grammar Framework: (grammar-fw).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents Grammar Development with Semantic.
+
+Copyright @copyright{} 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+The Semantic Grammar Framework provides a consistent way to write
+rule based grammars for use in Emacs.  This document describes how to
+use the grammar writing environment, and how to write in the rule
+based language.
+
+@menu
+* Overview::                    
+* Grammar File::                
+* Grammar Development Cycle::	
+* Working with grammars::       
+* Adding a new grammar mode::   
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Overview
+@chapter Overview
+
+@semantic{} version 2 introduced a new grammar framework to provide a
+clean and consistent view into parser writing.
+
+All grammars are specified in a common rule based language derived
+from the input grammar language used by the GNU parser generator
+Bison.  The main differences are that:
+
+@itemize @minus
+@item
+The C-like syntax is replaced by Emacs Lisp syntax.
+@item
+Percent declarations are specific to @semantic{}.
+@end itemize
+
+Nevertheless, for those who are familiar with the Bison grammar
+syntax, and have some knowledge of Emacs Lisp, writing @semantic{}
+grammars won't prove too hard.  Moreover, the grammar framework
+provides Emacs goodies (indentation, syntax coloring, etc.) to help
+edit grammars.
+
+Grammars written in the common rule based language
+must be translated into Emacs Lisp code so a @semantic{} parser can
+use it.  The framework defines a reusable and flexible
+@acronym{API} that simplifies the implementation of grammar-to-lisp
+translators.
+
+The @emph{abstract} major mode @code{semantic-grammar-mode} provides
+the core functionalities to edit and translate input grammars.
+
+@emph{Concrete} grammar modes, derived from
+@code{semantic-grammar-mode}, implement the common @acronym{API} that
+translates the input grammar format into Emacs Lisp code
+understandable by a particular parser.  An unique file extension
+associates input grammars to a @emph{concrete} grammar mode, that is
+to a particular translator and parser.
+
+@semantic{} provides these @emph{concrete} grammar modes:
+
+@itemize @minus
+@item @code{bovine-grammar-mode}, @xref{BY grammars}.
+@item @code{wisent-grammar-mode}, @xref{WY grammars}.
+@end itemize
+
+The following diagram presents a global view of the framework:
+
+@flushleft
+@image{grammar-fw-ov}
+@end flushleft
+
+@node Grammar File
+@chapter Grammar File
+
+A @semantic{} grammar file has four main sections, and looks like this:
+
+@example
+  %@{
+    PROLOGUE
+  %@}
+
+  DECLARATIONS
+
+  %%
+  GRAMMAR RULES
+  %%
+
+  EPILOGUE
+@end example
+
+Comments are like Emacs Lisp ones but start with two consecutive
+semicolons (@code{;;}) instead of a single one. The single semicolon
+(@code{;}) is the end of rule delimiter.
+
+@menu
+* Terminal and Nonterminal Symbols::  
+* Prologue::                    
+* Declarations::                
+* Grammar Rules::               
+* Epilogue::                    
+@end menu
+
+@node Terminal and Nonterminal Symbols
+@section Terminal and Nonterminal Symbols
+
+@dfn{Symbols} in @semantic{} grammars represent the grammatical
+classifications of the language.  They are valid Emacs Lisp symbols
+without special punctuations that require escaping.
+
+A @dfn{terminal symbol} (also known as a @dfn{lexical token class})
+represents a class of syntactically equivalent tokens.  You use the
+symbol in grammar rules to mean that a token in that class is allowed.
+Bison's convention recommends it should be all upper case.
+
+Terminal symbols are part of the lexical tokens returned by the
+function @code{semantic-lex-analyzer}.  They indicate what kind of
+token has been read.  For more on lexical analysis, @inforef{Writing
+Lexers, ,semantic-langdev}.
+
+Terminal symbols are declared using @code{%keyword} (@pxref{keyword
+Decl}) or @code{%token} (@pxref{token Decl}) statements.
+
+@table @strong
+@item Please note:
+Terminal symbols can be @dfn{literal characters} which have the same
+syntax used in C for character constants; for example, @code{'+'} is a
+@dfn{literal character token class}.  A character token class doesn't
+need to be declared, and can be used in precedence declarations like
+other terminal symbols (@pxref{precedence Decl}).@*
+For now @semantic{} lexers don't handle literal characters terminals.
+@end table
+
+A @dfn{nonterminal symbol} stands for a class of syntactically
+equivalent groupings.  The symbol name is used in writing grammar
+rules.  Bison's convention recommends it should be all lower case.
+
+The symbol @code{error} is a terminal symbol reserved for error
+recovery; you shouldn't use it for any other purpose.
+
+@node Prologue
+@section Prologue
+
+The @var{prologue} section contains definitions of Emacs Lisp
+variables, function and macros that are used in the actions in the
+grammar rules.
+
+These are copied to the beginning of the generated parser file so that
+they precede the definition of the grammar rules actions.  You can use
+@code{require} to get the declarations from other libraries.  If you
+don't need any Emacs Lisp declarations, you may omit this section.
+
+You may have more than one @var{prologue} section, intermixed with
+other @var{declarations}.  All @var{prologue} sections are copied to
+the generated parser file in the order they appear in the grammar.
+
+@node Declarations
+@section Declarations
+
+The @var{declarations} section contains declarations that define
+terminal symbols, specify precedence, and so on.  In some simple
+grammars you may not need any declarations.
+
+Declarations of terminal symbols defines the symbols used in
+formulating the grammar and the type associated to categories of
+tokens (@pxref{Terminal and Nonterminal Symbols}).
+
+@menu
+* package Decl::                
+* languagemode Decl::           
+* keyword Decl::                
+* put Decl::                    
+* token Decl::                  
+* type Decl::                   
+* precedence Decl::             
+* default-prec Decl::           
+* quotemode Decl::              
+* scopestart Decl::             
+* start Decl::                  
+* use-macros Decl::             
+@end menu
+
+@node package Decl
+@subsection package Decl
+
+@c Perhaps the declaration below could be
+@c %package @var{package-name}
+@c or
+@c %library @var{library-name}
+@c ??
+
+@deffn %-Decl %package library-name
+Declare the Emacs Lisp library created from the grammar.
+
+This will generate an Emacs Lisp file named
+@file{@var{library-name}.el}, and provide the @var{library-name}
+feature at the end of the generated file with:
+
+@lisp
+(provide '@var{library-name})
+@end lisp
+
+All variable and function names generated from the @var{declarations}
+section will be prefixed by @code{@var{library-name}-}, following
+Emacs standard coding conventions.
+
+If there is no @code{%package} statement, a default @var{library-name}
+is used, of the form:
+
+@lisp
+@var{grammar_filename_sans_extention}-@var{grammar_filename_extention}
+@end lisp
+
+For instance, the default library name for the grammar in the
+@file{foo.wy} file is @code{foo-wy}.
+@end deffn
+
+@node languagemode Decl
+@subsection languagemode Decl
+
+@deffn %-Decl %languagemode @var{mode1}...
+Declare in which major modes Emacs edits the sources that @semantic{}
+parses using this grammar.
+
+For instance, the following declares that the grammar will be used to
+parse files edited in @code{c-mode} or @code{c++-mode} by Emacs.
+
+@example
+%languagemode c-mode c++-mode
+@end example
+
+Typically, when a parser file is re-generated from a modified grammar,
+language modes are used to refresh local parser settings in buffers
+currently edited in those major modes.
+@end deffn
+
+@node keyword Decl
+@subsection keyword Decl
+
+@deffn %-Decl %keyword @var{keyword-name} @var{keyword-value}
+Declare a language keyword (a reserved word).
+
+@table @var
+@item keyword-name
+Is the terminal symbol used in grammar rules to represent this
+reserved word.
+@item keyword-value
+Is the actual value of the keyword as a string.
+@end table
+
+Here is how the @code{if}, @code{else}, @code{endif} keywords might be
+declared:
+
+@example
+%keyword IF    "if"
+%keyword ELSE  "else"
+%keyword ENDIF "endif"
+@end example
+
+Keywords have the implicit reserved type @code{keyword}
+(@pxref{type Decl}).
+@end deffn
+
+In the generated library, keyword declarations are defined in the
+constant @code{@var{library-name}--keyword-table}.  The keyword table
+value is an Emacs Lisp obarray, available at run time in the parsed
+buffer, in the buffer local variable
+@code{semantic-flex-keywords-obarray}.
+
+@c Oh dear.  Perhaps it's time to obsolete and rename that variable. 
+
+However you shouldn't use that variable directly.  @semantic{} provides
+the following @acronym{API} to use with language keywords at run
+time.
+
+@defun semantic-lex-keyword-symbol name
+@anchor{semantic-lex-keyword-symbol}
+Return keyword symbol with @var{NAME} or @code{nil} if not found.
+Return @code{nil} otherwise.
+@end defun
+
+@defun semantic-lex-keyword-p name
+@anchor{semantic-lex-keyword-p}
+Return non-@code{nil} if a keyword with @var{NAME} exists in the keyword table.
+Return @code{nil} otherwise.
+@obsolete{semantic-flex-keyword-p,semantic-lex-keyword-p}
+@end defun
+
+@defun semantic-lex-keyword-set name value
+@anchor{semantic-lex-keyword-set}
+Set value of keyword with @var{NAME} to @var{VALUE} and return @var{VALUE}.
+@end defun
+
+@defun semantic-lex-keyword-value name
+@anchor{semantic-lex-keyword-value}
+Return value of keyword with @var{NAME}.
+Signal an error if a keyword with @var{NAME} does not exist.
+@end defun
+
+@defun semantic-lex-map-keywords fun &optional property
+@anchor{semantic-lex-map-keywords}
+Call function @var{FUN} on every semantic keyword.
+If optional @var{PROPERTY} is non-@code{nil}, call @var{FUN} only on every keyword which
+as a @var{PROPERTY} value.  @var{FUN} receives a semantic keyword as argument.
+@obsolete{semantic-flex-map-keywords,semantic-lex-map-keywords}
+@end defun
+
+@defun semantic-lex-keywords &optional property
+@anchor{semantic-lex-keywords}
+Return a list of semantic keywords.
+If optional @var{PROPERTY} is non-@code{nil}, return only keywords which have a
+@var{PROPERTY} set (@pxref{put Decl}).
+@obsolete{semantic-flex-keywords,semantic-lex-keywords}
+@end defun
+
+@node put Decl
+@subsection put Decl
+
+The @code{%put} statement assigns properties to keywords
+(@pxref{keyword Decl}).  For instance, the predefined @code{summary}
+property assigns a help string to a keyword.  The help string is
+used by @code{semantic-idle-summary-mode} for on-the-fly help.
+
+@deffn  %-Decl %put @var{keyword-name} @var{property value}
+@deffnx %-Decl %put @var{keyword-name} @{@var{property1} @var{value1} @dots{}@}
+@deffnx %-Decl %put @{@var{keyword-name1} @dots{}@} @var{property} @var{value}
+@deffnx %-Decl %put @{@var{keyword-name1} @dots{}@} @{@var{property1} @var{value1} @dots{}@}
+Give to @var{keyword-name}, or to several @var{keyword-name}s, a
+single @var{property} with @var{value}, or a set of @var{property}s
+with respective @var{value}s.
+
+@table @var
+@item keyword-name
+Is a terminal symbol defined as a keyword.
+@item property
+Is a property name, which is a valid Emacs Lisp symbol.
+@item value
+Is a property value, a valid Emacs Lisp constant expression.
+@end table
+@end deffn
+
+Keyword properties are stored in the keyword table (@pxref{keyword
+Decl}).  The following @acronym{API} can be used to handle properties
+at run time.
+
+@defun semantic-lex-keyword-put name property value
+@anchor{semantic-lex-keyword-put}
+For keyword with @var{NAME}, set its @var{PROPERTY} to @var{VALUE}.
+@obsolete{semantic-flex-keyword-put,semantic-lex-keyword-put}
+@end defun
+
+@defun semantic-lex-keyword-get name property
+@anchor{semantic-lex-keyword-get}
+For keyword with @var{NAME}, return its @var{PROPERTY} value.
+@obsolete{semantic-flex-keyword-get,semantic-lex-keyword-get}
+@end defun
+
+@node token Decl
+@subsection token Decl
+
+The @code{%token} statement declares a terminal symbol (a @dfn{token})
+which is not a keyword.
+
+@deffn  %-Decl %token [<@var{type-name}>] @var{token-name} @var{match-value}
+@deffnx %-Decl %token [<@var{type-name}>] @var{token-name1} @dots{}
+Respectively declare one token with an optional type, and a match
+value, or several tokens with the optional same type, and no match
+value.
+
+@table @var
+@item type-name
+Is an optional symbol, enclosed between @code{<} and @code{>}, that
+specifies (and implicitly declares) a @dfn{type} for this token
+(@pxref{type Decl}).  If omitted the token has no type.
+@item token-name
+Is the terminal symbol used in grammar rules to represent this token.
+@item match-value
+Is an optional string.  Depending on @var{type-name} properties, it
+will be interpreted as an ordinary string, a regular expression, or
+have a more elaborate meaning.  If omitted the match value will be
+@code{nil}, which means that this token will be considered as the
+default token of its type (@pxref{type Decl} for more information).
+@end table
+@end deffn
+
+@table @strong
+@item Please note:
+For historical compatibility, the form @w{@samp{%token @var{name}
+@var{value}}} actually declares a keyword, and is strictly equivalent
+to @w{@samp{%keyword @var{name} @var{value}}}.  Because the former is
+ambiguous and could be abandoned in future releases of @semantic{}, we
+highly recommend to use the latter to declare keywords!
+@end table
+
+In the generated library, token definitions are stored in the table of
+declared types (@pxref{type Decl}).
+
+@node type Decl
+@subsection type Decl
+
+@deffn %-Decl %type <@var{type-name}> [@var{property1} @var{value1} @dots{}]
+@c ``type'' has a lot of different meanings in semantic, so you may
+@c want to define ``token type'' here.  In tags, we had changed the
+@c name to ``class'' for a similar feature.
+
+Explicitly declare a lexical type, and optionally give it properties.
+
+@table @var
+@item type-name
+Is a symbol that identifies the type.
+@item property
+Is a property name, a valid Emacs Lisp symbol.
+@item value
+Is a property value, a valid Emacs Lisp constant expression.
+@end table
+
+Even if @code{%token}, @code{%keyword}, and precedence declarations can
+implicitly declare types, an explicit declaration is required for
+every type:
+
+@itemize @minus
+@item To assign it properties.
+@item To auto-generate a lexical rule that detects tokens of this type.
+For more information, @ref{Auto-generation of lexical rules}.
+@end itemize
+@end deffn
+
+@table @strong
+@item Please note:
+Because the grammar framework is implemented in Emacs Lisp, which is a
+dynamically typed language, the meaning of @dfn{type} is notably
+different between @semantic{} and Bison.  In Bison grammars,
+@dfn{type} means @dfn{data type}, and associates an internal
+representation to lexical tokens.  In @semantic{} grammars, @dfn{type}
+specifies how lexical analysis will scan tokens of this type.
+@end table
+
+In the generated library, lexical type declarations are defined in the
+constant @code{@var{library-name}--token-table}.  The table
+value is an Emacs Lisp obarray, available at run time in the parsed
+buffer, in the buffer local variable
+@code{semantic-lex-types-obarray}.
+
+However you shouldn't use that variable directly.  @semantic{} provides
+the following @acronym{API} to use with lexical types at run
+time.
+
+@defun semantic-lex-type-symbol type
+@anchor{semantic-lex-type-symbol}
+Return symbol with @var{TYPE} or @code{nil} if not found.
+@end defun
+
+@defun semantic-lex-type-p type
+@anchor{semantic-lex-type-p}
+Return non-@code{nil} if a symbol with @var{TYPE} name exists.
+@end defun
+
+@defun semantic-lex-type-set type value
+@anchor{semantic-lex-type-set}
+Set value of symbol with @var{TYPE} name to @var{VALUE} and return @var{VALUE}.
+@end defun
+
+@defun semantic-lex-type-value type &optional noerror
+@anchor{semantic-lex-type-value}
+Return value of symbol with @var{TYPE} name.
+If optional argument @var{NOERROR} is non-@code{nil} return @code{nil} if a symbol with
+@var{TYPE} name does not exist.  Otherwise signal an error.
+@end defun
+
+@defun semantic-lex-type-put type property value &optional add
+@anchor{semantic-lex-type-put}
+For symbol with @var{TYPE} name, set its @var{PROPERTY} to @var{VALUE}.
+If optional argument @var{ADD} is non-@code{nil}, create a new symbol with @var{TYPE}
+name if it does not already exist.  Otherwise signal an error.
+@end defun
+
+@defun semantic-lex-type-get type property &optional noerror
+@anchor{semantic-lex-type-get}
+For symbol with @var{TYPE} name, return its @var{PROPERTY} value.
+If optional argument @var{NOERROR} is non-@code{nil} return @code{nil} if a symbol with
+@var{TYPE} name does not exist.  Otherwise signal an error.
+@end defun
+
+@defun semantic-lex-map-types fun &optional property
+@anchor{semantic-lex-map-types}
+Call function @var{FUN} on every lexical type.
+If optional @var{PROPERTY} is non-@code{nil}, call @var{FUN} only on every type symbol
+which as a @var{PROPERTY} value.  @var{FUN} receives a type symbol as argument.
+@end defun
+
+@defun semantic-lex-types &optional property
+@anchor{semantic-lex-types}
+Return a list of lexical type symbols.
+If optional @var{PROPERTY} is non-@code{nil}, return only type symbols which have
+@var{PROPERTY} set.
+@end defun
+
+@node precedence Decl
+@subsection precedence Decl
+
+@deffn  %-Decl %left [<@var{type-name}>] @var{token1} @dots{}
+@deffnx %-Decl %right [<@var{type-name}>] @var{token1} @dots{}
+@deffnx %-Decl %nonassoc [<@var{type-name}>] @var{token1} @dots{}
+See also @code{%prec} in @ref{Grammar Rules}.
+
+Specify the precedence and associativity of grammar terminals.
+
+For more details, @inforef{Grammar format, , wisent}, @var{PRECEDENCE}.
+@end deffn
+
+@c is this true?
+@table @strong
+@item Please note:
+This information has meaning only in @acronym{LALR} grammars.
+Defining precedence in a grammar that provides tagging information
+for @semantic{} isn't usually necessary.
+@end table
+
+@node default-prec Decl
+@subsection default-prec Decl
+
+@deffn  %-Decl %default-prec
+@deffnx %-Decl %no-default-prec
+See also @code{%prec} in @ref{Grammar Rules}.
+
+@code{%no-default-prec} declares that you must specify precedence for
+all rules that participate in precedence conflict resolution.  The
+default @code{%default-prec} indicates to use the precedence of the
+last terminal symbol mentioned in the rule.
+
+For more details, @inforef{Grammar format, , wisent}, @var{PRECEDENCE}.
+@end deffn
+
+@table @strong
+@item Please note:
+This information has meaning only in @acronym{LALR} grammars.
+Defining precedence in a grammar that provides tagging information
+for @semantic{} isn't usually necessary.
+@end table
+
+@node quotemode Decl
+@subsection quotemode Decl
+
+@deffn %-Decl %quotemode @var{symbol}
+This is a mechanism used to specify how quoting worked in optional
+lambda expressions.
+@inforef{Optional Lambda Expression, , bovine}.
+@end deffn
+
+@table @strong
+@item Please note:
+This information has meaning only in @dfn{bovine} grammars.
+@end table
+
+@node scopestart Decl
+@subsection scopestart Decl
+
+@deffn %-Decl %scopestart @var{nonterminal}
+The @code{scopestart} declaration specifies the name of a nonterminal
+that is used for parsing the body of functional code.  This is used
+in the local context parser to find locally defined variables.
+@end deffn
+
+@table @strong
+@item Please note:
+This information has meaning only in @dfn{bovine} grammars.
+@end table
+
+@node start Decl
+@subsection start Decl
+
+@deffn %-Decl %start @var{nonterminal1} @dots{}
+Declare the nonterminal symbols that the parser can use as its goal.
+@end deffn
+
+@table @strong
+@item Please note:
+The exact meaning of start symbols depends on the parser.  For more
+information, @inforef{Start nonterminals, , wisent}, and
+@inforef{Starting Rules , , bovine}.
+@end table
+
+@node use-macros Decl
+@subsection use-macros Decl
+
+@deffn %-Decl %use-macros @var{library} @{@var{macro-name1} @dots{}@}
+Declare grammar macros local in this grammar.
+
+@table @var
+@item library
+Is a symbol identifying the Elisp library where to find the macro
+expanders.
+@item macro-name
+Is a symbol identifying a macro.  By convention it should be all
+upper case.
+@end table
+
+For more information on macros, @ref{Grammar Macros}.
+@end deffn
+
+When the Lisp code generator encounters a @code{%use-macros}
+declaration, it automatically loads (@code{require}) the specified
+@var{library} and associates to each @var{macro-name} an expander
+function named @var{library}-@var{macro-name}.
+ 
+For instance:
+
+@example
+%use-macros my-grammar-macros @{MY-MACRO@}
+@end example
+ 
+Tells the Lisp code generator to first @w{@samp{(require
+'my-grammar-macros)}}, then to call the function
+@code{my-grammar-macros-MY-MACRO} to expand calls to the
+@code{MY-MACRO} macro.
+ 
+Typically, the @file{my-grammar-macros.el} library should look like
+this:
+ 
+@lisp
+@dots{}
+
+(defun my-grammar-macros-MY-MACRO (&rest args)
+  "Grammar macro that passes ARGS to `format' and return a string."
+  `(format ,@@args))
+
+@dots{}
+
+;; Don't forget to provide myself!
+(provide 'my-grammar-macros)
+@end lisp
+ 
+@node Grammar Rules
+@section Grammar Rules
+
+A grammar rule has the following general form:
+
+@example
+@var{result}: @var{components} @dots{}
+      ;
+@end example
+
+@var{result} is the nonterminal symbol that this rule describes, and
+@var{components} are the various terminal and nonterminal symbols
+that are put together by this rule
+(@pxref{Terminal and Nonterminal Symbols}).
+
+For example, this rule:
+
+@example
+exp: exp PLUS exp
+   ;
+@end example
+
+Says that two groupings of type @samp{exp}, with a @samp{PLUS} token
+in between, can be combined into a larger grouping of type @samp{exp}.
+
+Multiple rules for the same @var{result} are joined with the
+vertical-bar character @code{|} as follows:
+
+@example
+@var{result}: @var{rule1-components}@dots{}
+      | @var{rule2-components}@dots{}
+        @dots{}
+      ;
+@end example
+
+If @var{components} in a rule is empty, it means that @var{result} can
+match the empty string.  For example, here is how to define a
+comma-separated sequence of zero or more @samp{exp} groupings:
+
+@example
+expseq: ;;Empty
+      | expseq1
+      ;
+     
+expseq1: exp
+       | expseq1 COMMA exp
+       ;
+@end example
+
+It is customary to write a comment @code{;;Empty} in each rule with no
+components.
+
+@table @strong
+@item Please note:
+In @acronym{LALR} grammars, a @code{%prec} modifier can be written
+after the @var{components} of a rule to specify a terminal symbol
+whose precedence should be used for that rule.  The syntax is:
+
+@example
+%prec @var{token}
+@end example
+
+It assigns the rule the precedence of @var{token}, overriding the
+precedence that would be deduced for it in the ordinary way.  For
+more details, @inforef{Grammar format, , wisent}, @var{PRECEDENCE}.
+
+Here is a typical example:
+
+@example
+@dots{}
+%left NEG     ;; negation--unary minus
+@dots{}
+
+%%
+@dots{}
+
+exp: @dots{}
+   | '-' exp %prec NEG
+     (- $2)
+   @dots{}
+   ;
+@end example
+@end table
+
+Scattered among the components can be @var{actions} that determine the
+semantics of the rule.  An action is an Emacs Lisp list form, for
+example:
+
+@lisp
+(cons $1 $2)
+@end lisp
+
+To execute a sequence of forms, you can enclose them between braces
+like this:
+
+@lisp
+@{
+  (message "$2=%s" $2)
+  $2
+ @}
+@end lisp
+
+Usually there is only one action and it follows the rule components.
+
+The code in an action can refer to the semantic values of the
+components matched by the rule with the construct @samp{$N}, which
+stands for the value of the Nth component.
+
+Here is a typical example:
+
+@example
+exp: @dots{}
+   | exp PLUS exp
+     (+ $1 $3)
+   @dots{}
+   ;
+@end example
+
+This rule constructs an @samp{exp} from two smaller @samp{exp}
+groupings connected by a plus-sign token.  In the action, @samp{$1}
+and @samp{$3} refer to the semantic values of the two component
+@samp{exp} groupings, which are the first and third symbols on the
+right hand side of the rule.  The sum becomes the semantic value of
+the addition-expression just recognized by the rule.  If there were a
+useful semantic value associated with the @samp{PLUS} token, it could
+be referred to as @samp{$2}.
+
+Note that the vertical-bar character @code{|} is really a rule separator,
+and actions are attached to a single rule.
+
+By convention, if you don't specify an action for a rule, the value of
+the first symbol in the rule becomes the value of the whole rule:
+@code{(progn $1)}.  The default value of an empty rule is @code{nil}.
+
+The exact default behavior depends on the parser.  For more
+information, @inforef{Wisent, , wisent}, and @inforef{Bovine, ,
+bovine}, manuals.
+
+@table @strong
+@item Please note:
+In @acronym{LALR} grammars, you can have @dfn{mid-rule actions}, that
+is semantic actions put in the middle of a rule.  These actions are
+written just like usual end-of-rule actions, but they are executed
+before the parser even recognizes the following components.
+
+The mid-rule action itself counts as one of the components of the
+rule.  This makes a difference when there is another action later in
+the same rule (and usually there is another at the end): you have to
+count the actions along with the symbols when working out which number
+N to use in @samp{$N}.
+
+The mid-rule action can also have a semantic value, and actions later
+in the rule can refer to the value using @samp{$N}.
+
+There is no way to set the value of the entire rule with a mid-rule
+action.  The only way to set the value for the entire rule is with an
+ordinary action at the end of the rule.
+
+Here is an example taken from the @file{semantic-grammar.wy} grammar
+in the distribution:
+
+@example
+nonterminal:
+    SYMBOL
+    ;; Mid-rule action
+    (setq semantic-grammar-wy--nterm $1
+          semantic-grammar-wy--rindx 0)
+    COLON rules SEMI
+    ;; End-of-rule action
+    (TAG $1 'nonterminal :children $4)
+  ;
+@end example
+@end table
+
+@node Epilogue
+@section Epilogue
+
+The @var{epilogue} section contains arbitrary Emacs Lisp code which is
+copied verbatim to the end of the parser file, just as the
+@var{prologue} is copied to the beginning.  This is the most
+convenient place to put anything that you want to have in the parser
+file.
+
+For example, it could be convenient to put the definition of the lexer
+in the @var{epilogue}, particularly if it includes lexical rules
+auto-generated from declarations in the grammar.
+
+If the @var{epilogue} section is empty, you may omit the @code{%%}
+that separates it from the grammar rules.
+
+@table @strong
+@item Please note:
+You can put a @dfn{footer} comment:
+
+@example
+;;; my-grammar.by ends here
+@end example
+
+At the end of the grammar.  It will not be copied to the parser file
+to avoid confusion with the Emacs Lisp library own footer.
+@end table
+
+
+@node Grammar Development Cycle
+@chapter Grammar Development Cycle
+
+When developing a grammar using the Semantic Grammar mode, the write,
+compile, test cycle takes a few steps.  The following pattern works
+well:
+
+Step 1:
+
+Make changes in the grammar file.
+
+Step 2:
+
+Press @kbd{C-c C-c} to compile the @file{.by} or @file{.wy} grammar
+file into an Emacs Lisp file, such as @file{mylanguage-wy.el}.  The
+cursor will end in this file.
+
+If you have never loaded this language before, then use
+
+@example
+M-x eval-buffer RET
+@end example
+
+to get it running.  If you have loaded a previous revision in, then
+instead use @code{eval-defun} bound to @code{C-M-x} on the changed
+generated variables.
+
+The generated variables are:
+@table @code
+@item LANG--keyword-table
+This table is modified if you changed any %keyword entries.
+@item LANG--token-table
+This table is modified if you changed any %token entries.
+@item LANG--parse-table
+This table is modified if you change the grammar.
+@item define-lex
+The lexer is modified if you change that explicit code in the .wy
+file.
+@end table
+
+Once you have reset the value of the particular part of the grammar
+you changed, switch to a buffer that you use for testing the grammar,
+and reinitialize that buffer.  Usually this is something like
+
+@example
+M-x revert-buffer RET
+@end example
+
+or
+
+@example
+M-x LANG-mode RET
+@end example
+
+Once a buffer has been reparsed, use
+@code{semantic-show-unmatched-syntax} mode, @code{senator-pulse-tag}
+@kbd{C-c , ?}, and @kbd{M-x bovinate RET} to quickly identify success
+or failure of your changes.
+
+@node Working with grammars
+@chapter Working with grammars
+
+@menu
+* Editing grammars::            
+* Auto-generation of lexical rules::  
+* Grammar Macros::              
+* BY grammars::                 
+* WY grammars::                 
+@end menu
+
+@node Editing grammars
+@section Editing grammars
+
+@c Document here the various commands and keyboard shortcuts
+@c available in semantic-grammar-mode. 
+
+@deffn Command semantic-grammar-create-package &optional force
+@anchor{semantic-grammar-create-package}
+Create package Lisp code from grammar in current buffer.
+Does nothing if the Lisp code seems up to date.
+If optional argument @var{FORCE} is non-@code{nil}, unconditionally re-generate the
+Lisp code.
+@end deffn
+
+You can run the command @command{semantic-grammar-create-package} with
+@w{@kbd{C-c C-c}} (or @w{@kbd{C-u C-c C-c}} to unconditionally
+re-generate the Lisp code).
+
+Additionally, when this command is run interactively, all open buffers
+of that mode have their setup functions re-run.  That way after
+compiling your grammar, all relevant buffers will be actively using
+that grammar so you can test what you have done.
+
+@deffn Command semantic-grammar-indent
+@anchor{semantic-grammar-indent}
+Indent the current line.
+Use the Lisp or grammar indenter depending on point location.
+@end deffn
+
+You can run the command @command{semantic-grammar-indent} with
+@kbd{@key{TAB}}.
+
+@deffn Command semantic-grammar-complete
+@anchor{semantic-grammar-complete}
+Attempt to complete the symbol under point.
+Completion is position sensitive.  If the cursor is in a match section of
+a rule, then nonterminals symbols are scanned.  If the cursor is in a Lisp
+expression then Lisp symbols are completed.
+@end deffn
+
+You can run the command @command{semantic-grammar-complete} with
+@w{@kbd{@key{META} @key{TAB}}}.
+
+@deffn Command semantic-grammar-find-macro-expander macro-name library
+@anchor{semantic-grammar-find-macro-expander}
+Visit the Emacs Lisp library where a grammar macro is implemented.
+@var{MACRO-NAME} is a symbol that identifies a grammar macro.
+@var{LIBRARY} is the name (sans extension) of the Emacs Lisp library where
+to start searching the macro implementation.  Lookup in included
+libraries, if necessary.
+Find a function tag (in current tags table) whose name contains @var{MACRO-NAME}.
+Select the buffer containing the tag's definition, and move point there.
+
+@table @strong
+@item Please note:
+Enabling the @code{global-semanticdb-minor-mode} is highly recommended
+because this command uses the @code{semanticdb-find} feature to
+automatically search for a macro expander function into included
+libraries.  For more details, @inforef{Semantic Database, ,
+semantic-appdev}.
+@end table
+@end deffn
+
+You can run the command @command{semantic-grammar-find-macro-expander}
+with @w{@kbd{C-c m}}.
+
+The characters @w{@kbd{| ; % ( ) :}} are @dfn{electric punctuations}.
+Each time you type one, the line is re-indented after the character is
+inserted.
+
+@deffn Command semantic-grammar-insert-keyword name
+@anchor{semantic-grammar-insert-keyword}
+Insert a new @code{%keyword} declaration with @var{name}.
+Assumes it is typed in with the correct casing.
+@end deffn
+
+You can run the command @command{semantic-grammar-insert-keyword}
+with @w{@kbd{C-c i k}}.
+
+@node Auto-generation of lexical rules
+@section Auto-generation of lexical rules
+
+Using a @code{%type} statement, combined with @code{%keyword} and
+@code{%token} ones, permits the declaration of a lexical type and
+associates it with patterns that define how to match lexical tokens of
+that type.
+
+The grammar construction process exploits that information to
+@emph{automagically} generate the definition of a lexical rule (aka a
+@dfn{single analyzer}) for each explicitly declared lexical type.
+
+It is then easy to put predefined and auto-generated lexical rules
+together to build ad-hoc lexical analyzers.
+
+This chapter details the auto-generation process, and how you can
+control it to produce the lexical rules needed to scan your language.
+
+@menu
+* The principle::               
+* Type properties with a special meaning::  
+* Predefined well-known types::  
+@end menu
+
+@node The principle
+@subsection The principle
+
+@node Type properties with a special meaning
+@subsection Type properties with a special meaning
+
+@table @code
+@item syntax
+The value of the @code{syntax} property should be a @dfn{syntactic
+regexp}, that is a regexp that matches buffer data based on the
+current Emacs @dfn{syntax table}.
+
+For instance, to grab constituents of @code{symbol} or @code{keyword}
+types, the @code{syntax} property value will probably be:
+
+@samp{"\\(\\sw\\|\\s_\\)+"}
+
+For well known types, the @code{syntax} property has a predefined
+value that should suit standard needs (@pxref{Predefined well-known
+types}).
+
+@item matchdatatype
+The value of the @code{matchdatatype} property is a symbol that
+specifies which algorithm to use to match the tokens of this type.
+These match algorithms are defined:
+
+@table @code
+@item regexp
+@item string
+@item block
+@item sexp
+@item keyword
+@end table
+
+@end table
+
+@node Predefined well-known types
+@subsection Predefined well-known types
+
+Default values are provided for well known types like <keyword>,
+<symbol>, <string>, <number>, <punctuation>, and <block>.  Those types
+assume that the correct patterns are provided by %keyword and %token
+statements, a simple "%type <type>" declaration should generally
+suffice to auto-generate a suitable lexical rule.
+
+@table @code
+@item keyword
+@item symbol
+@item string
+@item number
+@item punctuation
+@item block
+@end table
+
+@node Grammar Macros
+@section Grammar Macros
+
+To keep grammars relatively independent of contextual implementations
+you can use @dfn{grammar macros} in semantic actions, in place of
+direct calls to Emacs Lisp functions.
+
+The predefined @code{TAG} macro is a good example:
+
+@example
+(TAG $1 'nonterminal :children $4)
+@end example
+
+It offers a common syntax to produce a @semantic{} tag, even if the
+underlying implementation is different between @acronym{LALR} and
+@acronym{LL} grammars.
+
+A grammar macro is defined by a general @dfn{macro name} (for example,
+@code{TAG}) associated to possibly several @dfn{macro expanders}.
+
+A macro expander is an Emacs Lisp function that operates on the
+unevaluated expressions for the arguments, and returns a Lisp
+expression containing these argument expressions or parts of them.
+
+Macro names are used like Lisp function names in call expressions.  To
+help distinguish grammar macro calls from traditional Lisp function
+calls, macro names are automatically highlighted in semantic actions.
+
+For more goodies that might help in the development of macros,
+@xref{Editing grammars}.
+
+Commonly used macros are provided by the current grammar mode.
+@xref{Adding a new grammar mode}.
+
+There are also local macros that only affect the grammar where they
+are declared.  @xref{use-macros Decl}.
+
+@node BY grammars
+@section BY grammars
+
+@acronym{BY} grammars are in files with the @file{.by} extension
+associated to the @code{bovine-grammar-mode} major mode.
+
+In that mode, grammars are converted into an Emacs Lisp form
+understandable by the original @semantic{} @acronym{LL} parser.
+
+For more details on how the @acronym{LL} parser works,
+@inforef{top, the Bovine Parser Manual, bovine}.
+ 
+@node WY grammars
+@section WY grammars
+
+@acronym{WY} grammars are in files with the @file{.wy} extension
+associated to the @code{wisent-grammar-mode} major mode.
+
+In that mode, grammars are converted into an Emacs Lisp form
+understandable by the @semantic{} Bison-like @acronym{LALR} parser.
+
+For more details on how the @acronym{LALR} parser works,
+@inforef{top, the Wisent Parser Manual, wisent}.
+
+@node Adding a new grammar mode
+@chapter Adding a new grammar mode
+
+@menu
+* Specialized Implementation::  
+* Querying grammars::           
+@end menu
+
+@node Specialized Implementation
+@section Specialized Implementation
+
+Each specialized grammar mode is responsible for implementing the
+following @acronym{API}.  Implementations are done with
+@emph{overload methods}.
+@inforef{Semantic Overload Mechanism, , semantic-langdev}.
+
+@itemize
+@item A keyword table builder.
+Can use the default implementation provided.
+
+@defun semantic-grammar-keywordtable-builder
+@anchor{semantic-grammar-keywordtable-builder}
+Return the keyword table table value.
+This function can be overriden in semantic using the
+symbol @code{grammar-keywordtable-builder}.
+@end defun
+
+@item A token table builder.
+Can use the default implementation provided.
+
+@defun semantic-grammar-tokentable-builder
+@anchor{semantic-grammar-tokentable-builder}
+Return the value of the table of lexical tokens.
+This function can be overriden in semantic using the
+symbol @code{grammar-tokentable-builder}.
+@end defun
+
+@item A parser table builder
+Must be provided, there is no default implementation.
+
+@defun semantic-grammar-parsetable-builder
+@anchor{semantic-grammar-parsetable-builder}
+Return the parser table value.
+This function can be overriden in semantic using the
+symbol @code{grammar-parsetable-builder}.
+@end defun
+
+@item A Parser setup code builder.
+Must be provided, there is no default implementation.
+
+@defun semantic-grammar-setupcode-builder
+@anchor{semantic-grammar-setupcode-builder}
+Return the parser setup code form.
+This function can be overriden in semantic using the
+symbol @code{grammar-setupcode-builder}.
+@end defun
+
+@item Common grammar macros.
+@c This refers to ASSOC, EXPANDFULL, TAG, etc..
+A set of predefined macros is provided.
+
+For more information on macros, @ref{Grammar Macros}.
+
+@defvar semantic-grammar-macros
+@anchor{semantic-grammar-macros}
+List of associations (@var{MACRO-NAME} . @var{EXPANDER}).
+@end defvar
+
+@end itemize
+
+@node Querying grammars
+@section Querying grammars
+
+In order to generate the intermediate Emacs Lisp code needed by your
+parser, you have to query the grammar for the code, declarations, and
+rules it contains.
+
+To obtain those information in a @dfn{context free} manner, grammar
+files are parsed by the @semantic{} @acronym{LALR} parser to produce
+tags.
+
+To query a grammar you can use the powerful @acronym{API} provided by
+@semantic{}.  @inforef{top, Application Development Manual,
+semantic-appdev}.
+
+For declarations, the grammar framework provides a specialized high
+level @acronym{API}.
+
+@menu
+* Grammar Tags::                
+* Querying Declarations::       
+@end menu
+
+@node Grammar Tags
+@subsection Grammar Tags
+
+This section describes the available grammar tags.
+@inforef{Semantic Tags, , semantic-appdev}.
+
+Each tag description has the form
+@w{@var{class name optional-attributes}}.
+
+@deffn tag code "prologue"
+Tag produced from a @var{prologue} section (@pxref{Prologue}).
+The prologue code is the text in between tag's bounds.
+@end deffn
+
+@deffn tag code "epilogue"
+Tag produced from the @var{epilogue} section (@pxref{Epilogue}).
+The epilogue code is the text in between tag's bounds.
+@end deffn
+
+@deffn tag start @var{nonterminal1} @var{rest-nonterminals}
+Tag produced from a @code{%start} declaration (@pxref{start Decl}).
+
+@table @var
+@item nonterminal1
+First nonterminal symbol name.
+@item rest-nonterminals
+List of nonterminal symbol names which follow the first one.
+Associated to the attribute @code{:rest}.
+@end table
+@end deffn
+
+@deffn tag languagemode @var{mode1} @var{rest-modes}
+Tag produced from a @code{%languagemode} declaration (@pxref{languagemode Decl}).
+
+@table @var
+@item mode1
+First mode symbol name.
+@item rest-modes
+List of mode symbol names which follow the first one.  Associated to
+the attribute @code{:rest}.
+@end table
+@end deffn
+
+@deffn tag scopestart @var{nonterminal}
+Tag produced from a @code{%scopestart} declaration (@pxref{scopestart Decl}).
+
+@table @var
+@item nonterminal
+Nonterminal symbol name.
+@end table
+@end deffn
+
+@deffn tag quotemode @var{symbol}
+Tag produced from a @code{%quotemode} declaration (@pxref{quotemode Decl}).
+
+@table @var
+@item symbol
+Symbol name, value of quote mode.
+@end table
+@end deffn
+
+@deffn  tag assoc @var{associativity} @var{type-name} @var{tokens}
+Tag produced from a @code{%left}, @code{%right}, or @code{%nonassoc}
+declaration (@pxref{precedence Decl}).
+
+@table @var
+@item associativity
+"left", "right", or "nonassoc".
+@item type-name
+Symbol name of the token type.
+Associated to the attribute @code{:type}.
+@item tokens
+List of terminal symbol names.
+Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn tag assoc "default-prec" @var{FLAG}
+Tag produced from a @code{%default-prec}, or @code{%no-default-prec}
+declaration (@pxref{default-prec Decl}).
+
+@table @var
+@item flag
+@code{(list "t")} or @code{(list "nil")} for respectively
+@code{%default-prec} and @code{%no-default-prec}.
+Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn tag keyword @var{keyword-name} @var{keyword-value}
+Tag produced from a @code{%keyword} declaration (@pxref{keyword Decl}).
+
+@table @var
+@item keyword-value
+Name of the keyword symbol.
+@item keyword-value
+Value of the keyword as a string.
+Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn  tag token @var{token-name1} @var{type-name} @var{match-value}
+@deffnx tag token @var{token-name1} @var{type-name} @var{rest-tokens}
+Tag produced from a @code{%token} declaration (@pxref{token Decl}).
+
+@table @var
+@item token-name1
+First or unique token symbol name.
+@item type-name
+Symbol name of the token type.
+Associated to the attribute @code{:type}.
+@item match-value
+Value of the token as a string.
+Associated to the attribute @code{:value}.
+@item rest-tokens
+List of token symbol names which follow the first one in the
+declaration.  Associated to the attribute @code{:rest}.
+@end table
+@end deffn
+
+@deffn tag type @var{type-name} @var{properties}
+Tag produced from a @code{%type} declaration (@pxref{type Decl}).
+
+@table @var
+@item type-name
+Symbol name of the type.
+@item properties
+List of properties.  Each property is a pair @w{@code{(@var{symbol} . @var{value})}}
+where @var{symbol} is the property symbol name, and @var{value} the
+property value as string which contains a readable Lisp expression.
+Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn tag put @var{keyword-name1} @var{rest-keywords} @var{properties}
+Tag produced from a @code{%put} declaration (@pxref{put Decl}).
+
+@table @var
+@item keyword-name1
+First or unique keyword [or type] symbol name.
+@item rest-keywords
+List of keyword [or type] symbol names which follow the first one in
+the declaration.  Associated to the attribute @code{:rest}.
+@item properties
+List of properties.  Each property is a pair @w{@code{(@var{symbol} . @var{value})}}
+where @var{symbol} is the property symbol name, and @var{value} the
+property value as string which contains a readable Lisp expression.
+Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn tag macro "macro" @var{library} @var{macro-names}
+Tag produced from a @code{%use-macros} declaration (@pxref{use-macros
+Decl}).
+
+@table @var
+@item library
+Library name.  Associated to the attribute @code{:type}.
+@item macro-names
+List of macro names.  Associated to the attribute @code{:value}.
+@end table
+@end deffn
+
+@deffn tag nonterminal @var{nonterminal} @var{rule-tags}
+Tag produced from a nonterminal description (@pxref{Grammar Rules}).
+
+@table @var
+@item nonterminal
+Nonterminal symbol name.
+@item rule-tags
+List rule tags.  Associated to the attribute @code{:children}.
+@end table
+@end deffn
+
+@deffn tag rule @var{rule-name} :value @var{components} :prec @var{terminal} :expr @var{action}
+Tag produced from an individual grammar rule (@pxref{Grammar Rules}).
+
+@table @var
+@item rule-name
+Generated rule name.
+@item components
+List of rule's components.  A component is a nonterminal/terminal
+symbol name, a string that represent a C-like character, or a list of
+one string element which contains the readable Lisp form of a mid-rule
+semantic action.  Associated to the attribute @code{:value}.
+@item prec
+Terminal symbol name or a string that represent a C-like character.
+Associated to the attribute @code{:prec}.
+@item action
+String which contains the readable Lisp form of the main
+semantic action.  Associated to the attribute @code{:expr}.
+@end table
+@end deffn
+
+@node Querying Declarations
+@subsection Querying Declarations
+
+This section describes the high level @acronym{API} to query grammar
+declarations.
+
+@defun semantic-grammar-prologue
+@anchor{semantic-grammar-prologue}
+Return grammar prologue code as a string value.
+@*@xref{Prologue}.
+@end defun
+
+@defun semantic-grammar-epilogue
+@anchor{semantic-grammar-epilogue}
+Return grammar epilogue code as a string value.
+@*@xref{Epilogue}.
+@end defun
+
+@defun semantic-grammar-package
+@anchor{semantic-grammar-package}
+Return the @code{%package} value as a string.
+If there is no @code{%package} statement in the grammar, return a default
+package name derived from the grammar file name.
+@*@xref{package Decl}.
+@end defun
+
+@defun semantic-grammar-languagemode
+@anchor{semantic-grammar-languagemode}
+Return the @code{%languagemode} value as a list of symbols or @code{nil}.
+@*@xref{languagemode Decl}.
+@end defun
+
+@defun semantic-grammar-start
+@anchor{semantic-grammar-start}
+Return the @code{%start} value as a list of symbols or @code{nil}.
+@*@xref{start Decl}.
+@end defun
+
+@defun semantic-grammar-scopestart
+@anchor{semantic-grammar-scopestart}
+Return the @code{%scopestart} value as a symbol or @code{nil}.
+@*@xref{scopestart Decl}.
+@end defun
+
+@defun semantic-grammar-quotemode
+@anchor{semantic-grammar-quotemode}
+Return the @code{%quotemode} value as a symbol or @code{nil}.
+@*@xref{quotemode Decl}.
+@end defun
+
+@defun semantic-grammar-keywords
+@anchor{semantic-grammar-keywords}
+Return the language keywords.
+That is an alist of (@var{VALUE} . @var{TOKEN}) where @var{VALUE} is
+the string value of the keyword and @var{TOKEN} is the terminal symbol
+identifying the keyword.
+@*@xref{keyword Decl}.
+@end defun
+
+@defun semantic-grammar-keyword-properties keywords
+@anchor{semantic-grammar-keyword-properties}
+Return the list of @var{KEYWORDS} properties.
+@*@xref{keyword Decl}, @xref{put Decl}.
+@end defun
+
+@defun semantic-grammar-tokens
+@anchor{semantic-grammar-tokens}
+Return defined lexical tokens.
+That is an alist (@var{TYPE} . @var{DEFS}) where type is a
+@code{%token <type>} symbol and @var{DEFS} is an alist of (@var{TOKEN}
+. @var{VALUE}).  @var{TOKEN} is the terminal symbol identifying the
+token and @var{VALUE} is the string value of the token or @code{nil}.
+@*@xref{token Decl}.
+@end defun
+
+@defun semantic-grammar-token-properties tokens
+@anchor{semantic-grammar-token-properties}
+Return properties of declared types.
+Types are explicitly declared by @code{%type} statements.  Types found
+in @var{TOKENS} are those declared implicitly by @code{%token}
+statements.  Properties can be set by @code{%put} and @code{%type}
+statements.  Properties set by @code{%type} statements take precedence
+over those set by @code{%put} statements.
+@*@xref{token Decl}, @xref{type Decl}, @xref{put Decl}.
+@end defun
+
+@defun semantic-grammar-use-macros
+@anchor{semantic-grammar-use-macros}
+Return macro definitions from @code{%use-macros} statements.
+Also load the specified macro libraries.
+@*@xref{use-macros Decl}.
+@end defun
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
+@c  LocalWords:  bovinator wisent LALR Elisp automagically Decl API
diff --git a/site/cedet-1.0pre7/semantic/doc/installation.texi b/site/cedet-1.0pre7/semantic/doc/installation.texi
new file mode 100644
index 0000000..ec0fffe
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/installation.texi
@@ -0,0 +1,323 @@
+@ignore
+@node Installation
+@chapter Installation and Basic Configuration
+@c This 'ignore' section fools texinfo-all-menus-update into creating
+@c proper menus for this chapter.
+@end ignore
+
+Semantic should be installed as a part of the CEDET distribution.  See
+the cedet/INSTALL file in the cedet distribution for basic
+installation instructions of the CEDET suite, plus canned
+configurations for the entire CEDET suite.
+
+These chapters dig into more detail for configuring @semantic{}
+components beyond the basics of CEDET.
+
+@menu
+* Canned Configuration::
+* Search Optimization::
+* Parsing Optimization::
+@end menu
+
+@node Canned Configuration
+@section Canned Configuration
+
+As described briefly in the cedet/INSTALL file, there are several
+canned configurations you can use.  These configuration files just
+turn different semantic modes on and off, but don't change intrinsic
+semantic parsing behaviors.
+
+You can optionally skip using any of the canned configurations by
+enabling your preferred subset individually in your @file{.emacs} file.
+
+@deffn Command semantic-load-enable-minimum-features
+@anchor{semantic-load-enable-minimum-features}
+Enable the minimum number of semantic features for basic usage.
+
+These minimum features are designed to allow @semantic{} to 
+maintain the parsing data necessary needed by various tools while
+intruding on your typical editing practices as little as possible.
+
+The features enabled are:
+@table @asis
+@item @dfn{semantic-idle-scheduler-mode}
+Keeps a buffer's parse tree up to date.
+(@pxref{(semantic-user)Idle Scheduler}.)
+@item @code{semanticdb-minor-mode}
+Stores tags in when a buffer is not in memory.
+Also stores tags in save files when Emacs is not running.
+(@pxref{(semantic-user)semanticdb}.)
+@item @dfn{semanticdb-load-system-caches}
+Loads any systemdbs created earlier, such as EBrowse databases.
+This loading features makes the database available, but won't spend
+time reading in large database files.
+@item @dfn{semanticdb-load-ebrowse-caches}
+Loads any ebrowse dbs created earlier.
+(@pxref{(semantic-user)Create System Databases}.)
+(@pxref{(semantic-user)semanticdb}.)
+@end table
+@end deffn
+
+@deffn Command semantic-load-enable-all-exuberent-ctags-support
+@anchor{semantic-enable-all-exuberent-ctags-support}
+Enable all ectag supported backend support features.
+This includes:
+@table @asis
+@item semanticdb backend support 
+Using exuberent ctags as a semanticdb backend allows for faster
+first-time parsing of files for supported languages, such as C/C++.
+@item buffer parsing using ectags for some modes.
+Some languages do not have regular all Lisp Semantic parsers.  This
+command enables the use of Exuberent ctags as the main parser for some
+languages, such as for Borne Shell scripts.
+@end table
+
+Any mode that has been tested to work will be added to this function.
+@end deffn
+
+@deffn Command semantic-load-enable-code-helpers
+@anchor{semantic-load-enable-code-helpers}
+Enable some semantic features that provide minimal coding assistance.
+
+This feature set is setup to provide useful features for code writing
+that do not change the typical Emacs editing experience very much.
+
+This includes @dfn{semantic-load-enable-minimum-features} plus:
+@table @dfn
+@item imenu
+Lists Semantic generated tags in the menubar.
+@item semantic-idle-summary-mode
+Show a summary for the tag indicated by code under point.
+Some code editors call this intellisense.
+(@pxref{(semantic-user)Idle Summary Mode}.)
+@item senator-minor-mode
+Semantic Navigator Mode.  This mode provides a keymap and global menu
+for navigation by tags, and modifying a buffer based on tag structure.
+It also provides access to various other minor @semantic{}-enabled
+features that do not have their own minor mode, or their own
+keybindings.  (@pxref{(semantic-user)senator}.)
+@item semantic-mru-bookmark-mode
+Provides a `switch-to-buffer' like keybinding for tag names.  This
+mode automatically creates a bookmark ring as you edit, and allows
+your to navigate back through places you've been.
+(@pxref{(semantic-user)MRU Bookmarks Mode}.)
+@end table
+@end deffn
+
+@deffn Command semantic-load-enable-gaudy-code-helpers
+@anchor{semantic-load-enable-gaudy-code-helpers}
+Enable semantic features that provide gaudy coding assistance.
+
+These features modify the Emacs display of your code, or can change
+your editing experience.
+
+This includes @dfn{semantic-load-enable-code-helpers}.
+@table @dfn
+@item semantic-idle-completions-mode
+Provide smart symbol completion automatically at idle time.
+The default behavior is to cause suggestions to appear next to the
+cursor when the cursor sits idle.
+(@pxref{(semantic-user)Idle Completions Mode}.)
+@item semantic-stickyfunc-mode
+Tracks current function in header-line (when available).
+Requires Emacs 21 or later.
+(@pxref{(semantic-user)Sticky Function Mode}.)
+@item semantic-decoration-mode
+Decorate tags based on various attributes.
+By default, this includes drawing a line in front of functions, and
+highlighting include files.
+(@pxref{(semantic-user)Tag Decoration Mode}.)
+@end table
+
+@obsolete{semantic-load-enable-guady-code-helpers,semantic-load-enable-gaudy-code-helpers}
+@end deffn
+
+@deffn Command semantic-load-enable-excessive-code-helpers
+@anchor{semantic-load-enable-excessive-code-helpers}
+Enable all semantic features that provide coding assistance.
+This includes all features of @dfn{semantic-load-enable-code-helpers} plus:
+@table @dfn
+@item protected/private decoration
+Enables the decoration styles for highlighting struct/class members
+that are either protected, or privately scoped.  Requires that
+@code{semantic-decoration-mode} is enabled.
+@item which-func-mode
+Display the current function in the mode line.
+@end table
+
+
+@end deffn
+
+@deffn Command semantic-load-enable-semantic-debugging-helpers
+@anchor{semantic-load-enable-semantic-debugging-helpers}
+Enable all semantic features that assist with debugging semantic.
+These modes include:
+@table @dfn
+@item semantic-highlight-edits-mode
+Highlight text that has been edited since the last parse step.
+(@pxref{(semantic-user)Highlight Edits Mode}.)
+@item semantic-show-unmatched-syntax-mode
+Highlight lexical tokens which failed to be parsed.
+(@pxref{(semantic-user)Unmatched Syntax Highlighting}.)
+@item semantic-show-parser-state-mode
+Show the current buffer state via small indicators in the mode line.
+(@pxref{(semantic-user)Parser State}.)
+@end table
+
+@end deffn
+
+
+@node Search Optimization
+@section Search Optimization
+
+A common use of @semantic{} is for smart completion and tag browsing.
+These operations involve searching through the tags of your files.
+For complete documentation on configuring your searches,
+@ref{(semantic-user)Semanticdb Search Configuration}.
+
+The default configuration is for the most complete set of searches
+possible.  During idle services, the slowest options are disabled.
+
+@subsection Search Throttle
+
+Searching is controlled with @code{semanticdb-find-default-throttle}.
+If you want to speed up parsing by disabling searches in system
+headers, you might add code like this for C mode.
+
+@example
+(setq-mode-local c-mode
+		 semanticdb-find-default-throttle
+		 '(project unloaded recursive))
+                 ;; Remove 'system from the throttle
+@end example
+
+
+@subsection System Include Paths
+
+If you want @semantic{} to find symbols from system libraries, you
+will need to update the system include path.
+
+You can find headers at a system level by configuring an include path.
+@xref{(semantic-user)Include paths}.
+
+For C/C++ code, @semantic{} will automatically try to setup the system
+include path based on the output of @code{gcc -v} using
+@code{semantic-gcc-setup}.  If you want to use a different version of
+GCC than what is found with ``gcc'', you will need to call the setup
+function in your @file{.emacs} before loading your first @file{.c}
+file.
+
+@example
+(semantic-gcc-setup "mygcc")
+@end example
+
+You can customize your include paths with the function
+@code{semantic-add-system-include}.  For example, if you were to be
+working on a linux kernel, you might opt to configure your search path
+in your @file{.emacs} file with code like this:
+
+@example
+(semantic-reset-system-include 'c-mode)
+(semantic-add-system-include "/usr/src/linux-2.4/include" 'c-mode)
+@end example
+
+It is also useful to find and install extra search engine back-ends,
+such @xref{(semantic-user)Create System Databases}.  Ebrowse is one
+such back-end for C and C++ code.
+
+You might create an ebrowse database for your C include files like
+this:
+
+@example
+M-x semanticdb-create-ebrowse-database RET /usr/include/ RET
+@end example
+
+This will create the database, save it, and add it to the database
+search list for your C and C++ based projects.  These databases will
+be created in your @file{~/.semanticdb} directory to be reloaded in
+future Emacs sessions.
+
+Unfortunately, EBROWSE does not support all the features needed by
+@semantic{}, so you will find that @semantic{} will need to go and
+reparse those files later when they are needed.
+
+@subsection Project Include Path
+
+Finding files included into a program file requires knowing the
+include path.
+
+Finding files within a project path is more complex.  One way is to
+teach @semantic{} about your project, and add an entry to
+@code{semanticdb-project-roots}.  See
+@xref{(semantic-user)Semanticdb Search Configuration}, or 
+@xref{(semantic-user)SemanticDB project roots}.
+@refill
+
+Alternately, setup an EDE project.  Using the 
+@inforef{top, EDE project system, ede} to allow finer grained control
+on how Semantic will find header files.  You can use EDE to create a
+project and create your Makefiles for you, or you can create a simple
+project that allows configuration of just this piece is covered in
+@xref{(ede)Simple projects}.
+@refill
+
+One style of a simple project is the
+@inforef{ede-cpp-root, EDE CPP Root, ede} project.  This is a simple
+way to provide access to a C/C++ project via EDE to Semantic.
+
+@node Parsing Optimization
+@section Parsing Optimization
+
+The @semantic{} parsers generate the tags that form the basis of all the
+semantic based tools, such as browsers and completion.  Keeping those
+tags up to date can have performance implications.
+
+Here are some common tasks you may be interested in:
+
+@subsection Don't parse certain buffers
+
+You can inhibit parsing using the @code{semantic-inhibit-functions}
+variable. 
+
+@defvar semantic-inhibit-functions
+@anchor{semantic-inhibit-functions}
+List of functions to call with no arguments before @semantic{} sets up
+a buffer.
+If any of these functions returns non-@code{nil}, the current buffer is not
+setup to use Semantic.
+@end defvar
+
+You could have this inhibit parsing in very large files, or files
+which cause particular problems to semantic.
+
+
+@subsection Parsing in idle time
+
+Tags are usually kept up to date when Emacs is idle
+@ref{(semantic-user)Idle Scheduler}.  The @semantic{} idle-scheduler
+automatically updates the tags in various buffers before executing
+specific idle modes, such as summary mode.
+
+You might choose to tune the scheduler with some code like this in
+your @file{.emacs} file:
+
+@example
+;; Increase the delay before activation
+(setq semantic-idle-scheduler-idle-time 10)
+;; Don't reparse really big buffers.
+(setq semantic-idle-scheduler-max-buffer-size 100000)
+@end example
+
+There is also a secondary idle services that runs after a longer
+delay.  The secondary idle service will perform large scale parsing of
+any file @semantic{} thinks you may need to reference, and then saves
+all the databases.
+
+You might want to tune the scheduler timer in your @file{.emacs} file
+like this:
+
+@example
+;; Increase the delay before doing slow work to 2 minutes.
+(setq semantic-idle-scheduler-work-idle-time 120)
+@end example
+
diff --git a/site/cedet-1.0pre7/semantic/doc/internals.texi b/site/cedet-1.0pre7/semantic/doc/internals.texi
new file mode 100644
index 0000000..fa128c5
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/internals.texi
@@ -0,0 +1,310 @@
+@ignore
+@node Semantic Internals
+@chapter Semantic Internals
+@c This 'ignore' section fools texinfo-all-menus-update into creating
+@c proper menus for this chapter.
+@end ignore
+
+This chapter provides an overview of the internals of @semantic{}.
+This information would not be needed by neither application developers
+nor grammar developers.
+
+It would be useful mostly for the hackers who would like to learn
+more about how @semantic{} works.
+
+@menu
+* Parser code ::	Code used for the parsers
+* Tag handling ::	Code used for manipulating tags
+* Semanticdb ::         Code used in the semantic database
+* Analyzer ::           Code used in the code analyzer
+* Tools ::              Code used in user tools.
+* Tests ::              Code used for testing.
+@end menu
+
+@node Parser code
+@section Parser code
+
+@semantic{} parsing code is spread across a range of files.
+
+@table @file
+@item semantic.el
+The core infrastructure sets up buffers for parsing, and has all the
+core parsing routines.  Most parsing routines are overloadable, so the
+actual implementation may be somewhere else.
+
+@item semantic-edit.el
+Incremental reparse based on user edits.
+
+@item semantic-grammar.el
+@itemx semantic-grammar.wy
+Parser for the different grammar languages, and a major mode for
+editing grammars in Emacs.
+
+@item semantic-lex.el
+Infrastructure for implementing lexical analyzers.  Provides macros
+for creating individual analyzers for specific features, and a way to
+combine them together.
+
+@item semantic-lex-spp.el
+Infrastructure for a lexical symbolic preprocessor.  This was written
+to implement the C preprocessor, but could be used for other lexical
+preprocessors.
+
+@item bovine/bovine-grammar.el
+@itemx bovine/bovine-grammar-macros.el
+@itemx bovine/semantic-bovine.el
+The ``bovine'' grammar.  This is the first grammar mode written for
+@semantic{} and is useful for simple creating simple parsers.
+
+@item wisent/wisent.el
+@itemx wisent/bison-wisent.el
+@itemx wisent/semantic-wisent.el
+@itemx wisent/semantic-debug-grammar.el
+A port of bison to Emacs.  This infrastructure lets you create LALR
+based parsers for @semantic{}.
+
+@item semantic-ast.el
+Manage Abstract Syntax Trees for parsers.
+
+@item semantic-debug.el
+Infrastructure for debugging grammars.
+
+@item semantic-util.el
+Various utilities for manipulating tags, such as describing the tag
+under point, adding labels, and the all important
+@code{semantic-something-to-tag-table}.
+
+@end table
+
+@node Tag handling
+@section Tag handling
+
+A tag represents an individual item found in a buffer, such as a
+function or variable.  Tag handling is handled in several source
+files.
+
+@table @file
+@item semantic-tag.el
+Basic tag creation, queries, cloning, binding, and unbinding.
+
+@item semantic-tag-write.el
+Write a tag or tag list to a stream.  These routines are used by
+@file{semanticdb-file.el} when saving a list of tags.
+
+@item semantic-tag-file.el
+Files associated with tags.  Goto-tag, file for include, and file for
+a prototype.
+
+@item semantic-tag-ls.el
+Language dependant features of a tag, such as parent calculation, slot
+protection, and other states like abstract, virtual, static, and leaf.
+
+@item semantic-dep.el
+Include file handling.  Contains the include path concepts, and
+routines for looking up file names in the include path.
+
+@item semantic-format.el
+Convert a tag into a nicely formatted and colored string.  Use
+@code{semantic-test-all-format-tag-functions} to test different output
+options.
+
+@item semantic-find.el
+Find tags matching different conditions in a tag table.
+These routines are used by @file{semanticdb-find.el} once the database
+has been converted into a simpler tag table.
+
+@item semantic-sort.el
+Sorting lists of tags in different ways.  Includes sorting a plain
+list of tags forward or backward.  Includes binning tags based on
+attributes (bucketize), and tag adoption for multiple references to
+the same thing.
+
+@item semantic-doc.el
+Capture documentation comments from near a tag.
+
+@end table
+
+@node Semanticdb
+@section Semanticdb
+
+@acronym{Semanticdb} complexity is certainly an issue.  It is a rather
+hairy problem to try and solve.
+
+@table @file
+@item semanticdb.el
+Defines a @dfn{database} and a @dfn{table} base class.  You can
+instantiate these classes, and use them, but they are not persistent.
+
+This file also provides support for @code{semanticdb-minor-mode},
+which automatically associates files with tables in databases so that
+tags are @emph{saved} while a buffer is not in memory.
+
+The database and tables both also provide applicate cache information,
+and cache flushing system.  The semanticdb search routines use caches
+to save datastructures that are complex to calculate.
+
+Lastly, it provides the concept of @dfn{project root}.  It is a system
+by which a file can be associated with the root of a project, so if
+you have a tree of directories and source files, it can find the root,
+and allow a tag-search to span all available databases in that
+directory hierarchy.
+
+@item semanticdb-file.el
+Provides a subclass of the basic table so that it can be saved to
+disk.  Implements all the code needed to unbind/rebind tags to a
+buffer and writing them to a file.
+
+@item semanticdb-el.el
+Implements a special kind of @dfn{system} database that uses Emacs
+internals to perform queries.
+
+@item semanticdb-ebrowse.el
+Implements a system database that uses Ebrowse to parse files into a
+table that can be queried for tag names.  Successful tag hits during a
+find causes @semantic{} to pick up and parse the reference files to
+get the full details.
+
+@item semanticdb-find.el
+Infrastructure for searching groups @semantic{} databases, and dealing
+with the search results format.
+
+@item semanticdb-ref.el
+Tracks crossreferences.   Cross references are needed when buffer is
+reparsed, and must alert other tables that any dependant caches may
+need to be flushed.  References are in the form of include files.
+
+@end table
+
+@node Analyzer
+@section Analyzer
+
+The @semantic{} analyzer is a complex engine which has been broken
+down across several modules.  When the @semantic{} analyzer fails,
+start with @code{semantic-analyze-debug-assist}, then dive into some
+of these files.
+
+@table @file
+@item semantic-analyze.el
+The core analyzer for defining the @dfn{current context}.  The
+current context is an object that contains references to aspects of
+the local context including the current prefix, and a tag list
+defining what the prefix means.
+
+@item semantic-analyze-complete.el
+Provides @code{semantic-analyze-possible-completions}.
+
+@item semantic-analyze-debug.el
+The analyzer debugger.  Useful when attempting to get everything
+configured.
+
+@item semantic-analyze-fcn.el
+Various support functions needed by the analyzer.
+
+@item semantic-ctxt.el
+Local context parser.  Contains overloadable functions used to move
+around through different scopes, get local variables, and collect the
+current prefix used when doing completion.
+
+@item semantic-scope.el
+Calculate @dfn{scope} for a location in a buffer.  The scope includes
+local variables, and tag lists in scope for various reasons, such as
+C++ using statements.
+
+@item semanticdb-typecache.el
+The typecache is part of @code{semanticdb}, but is used primarilly by
+the analyzer to look up datatypes and complex names.  The typecache is
+bound across source files and builds a master lookup table for data
+type names.
+
+@item semantic-ia.el
+Interactive Analyzer functions.  Simple routines that do completion or
+lookups based on the results from the Analyzer.  These routines are
+meant as examples for application writers, but are quite useful as
+they are.
+
+@item semantic-ia-sb.el
+Speedbar support for the analyzer, displaying context info, and
+completion lists.
+
+@end table
+
+@node Tools
+@section Tools
+
+These files contain various tools a user can use.
+
+@table @file
+@item semantic-idle.el
+Idle scheduler for @semantic{}.  Manages reparsing buffers after
+edits, and large work tasks in idle time.  Includes modes for showing
+summary help and pop-up completion.
+
+@item senator.el
+The @semantic{} navigator.  Provides many ways to move through a
+buffer based on the active tag table.
+
+@item semantic-decorate.el
+A minor mode for decorating tags based on details from the parser.
+Includes overlines for functions, or coloring class fields based on
+protection.
+
+@item semantic-decorate-include.el
+A decoration mode for include files, which assists users in setting up
+parsing for their includes.
+
+@item semantic-complete.el
+Advanced completion prompts for reading tag names in the minibuffer, or
+inline in a buffer.
+
+@item semantic-imenu.el
+Imenu support for using @semantic{} tags in imenu.
+
+@item semantic-mru-bookmark.el
+Automatic bookmarking based on tags.  Jump to locations you've been
+before based on tag name.
+
+@item semantic-sb.el
+Support for @semantic{} tag usage in Speedbar.
+
+@item semantic-util-modes.el
+A bunch of small minor-modes that exposes aspects of the semantic
+parser state.  Includes @code{semantic-stickyfunc-mode}.
+
+@item document.el
+@itemx document-vars.el
+Create an update comments for tags.
+
+@item semantic-adebug.el
+Extensions of @file{data-debug.el} for @semantic{}.
+
+@item semantic-chart.el
+Draw some charts from stats generated from parsing.
+
+
+@item semantic-elp.el
+Profiler for helping to optimize the @semantic{} analyzer.
+
+
+@end table
+
+@node Tests
+@section Tests
+
+@table @file
+
+@item semantic-utest.el
+Basic testing of parsing and incremental parsing for most supported
+languages.
+
+@item semantic-ia-utest.el
+Test the semantic analyzer's ability to provide smart completions.
+
+@item semantic-utest-c.el
+Tests for the C parser's lexical pre-processor.
+
+@item semantic-regtest.el
+Regression tests from the older Semantic 1.x API.
+
+@end table
+
+@c  LocalWords:  Cscope JDEE BeanShell JavaScript MySQL Semanticdb
diff --git a/site/cedet-1.0pre7/semantic/doc/lang-support-guide.texi b/site/cedet-1.0pre7/semantic/doc/lang-support-guide.texi
new file mode 100644
index 0000000..f082e25
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/lang-support-guide.texi
@@ -0,0 +1,1610 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename semantic-langdev.info
+@set TITLE  Language Support Developer's Guide
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents Application Development with Semantic.
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Eric M. Ludlam
+Copyright @copyright{} 2001, 2002, 2003, 2004 David Ponce
+Copyright @copyright{} 2002, 2003 Richard Y. Kim
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic Language Writer's guide: (semantic-langdev).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents Language Support Development with Semantic.
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+Semantic is bundled with support for several languages such as
+C, C++, Java, Python, etc.
+However one of the primary goals of semantic is to provide a framework
+in which anyone can add support for other languages easily.
+In order to support a new language, one typically has to provide a
+lexer and a parser along with appropriate semantic actions that
+produce the end result of the parser - the semantic tags.
+
+This chapter first discusses the semantic tag data structure to
+familiarize the reader to the goal.  Then all the components necessary
+for supporting a language is discussed starting with the writing
+lexer, writing the parser, writing semantic rules, etc.
+Finally several parsers bundled with semantic are discussed as case
+studies.
+
+@menu
+* Tag Structure::               
+* Language Support Overview::   
+* Writing Lexers::              
+* Writing Parsers::             
+* Parsing a language file::     
+* Debugging::                   
+* Parser Error Handling::       
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Tag Structure
+@chapter Tag Structure
+@cindex Tag Structure
+
+The end result of the parser for a buffer is a list of @i{tags}.
+Currently each tag is a list with up to five elements:
+@example
+("NAME" CLASS ATTRIBUTES PROPERTIES OVERLAY)
+@end example
+
+@var{CLASS} represents what kind of tag this is.  Common @var{CLASS}
+values include @code{variable}, @code{function}, or @code{type}.
+@inforef{Tag Basics, , semantic-appdev.info}.
+
+@var{ATTRIBUTES} is a slot filled with langauge specific options for
+the tag.  Function arguments, return type, and other flags all are
+stored in attributes.  A language author fills in the ATTRIBUTES with
+the tag constructor, which is parser style dependant.
+
+The @var{PROPERTIES} slot is used to store information in a tag by
+applications using the tag.  The @var{PROPERTIES} slot is generated by
+the semantic parser harness, and need not be provided by a language
+author.  Programmatically access tag properties with
+@code{semantic--tag-put-property},
+@code{semantic--tag-put-property-no-side-effect} and
+@code{semantic--tag-get-property}.
+
+@var{OVERLAY} represents positional information for this tag.  It is
+automatically generated by the semantic parser harness, and need not
+be provided by the language author, unless they provide a tag
+expansion function via @code{semantic-tag-expand-function}.
+
+The @var{OVERLAY} property is accessed via several functions returning
+the beginning, end, and buffer of a token.  Use these functions unless
+the overlay is really needed (see @inforef{Tag Query, , app-dev-guide}).
+
+Depending on the overlay in a program can be dangerous because
+sometimes the overlay is replaced with an integer pair
+@example
+[ START END ]
+@end example
+when the buffer the tag belongs to is not in memory.  This happens
+when a user has activated the Semantic Database 
+@inforef{semanticdb, , semantic-appdev}.
+
+To create tags for a functional or object oriented language, you can
+use s series of tag creation functions.  @inforef{Creating Tags, , semantic-appdev}
+
+@node Language Support Overview
+@chapter Language Support Overview
+@cindex Language Support Overview
+
+@semantic{} provides many ways to add support for a language into the
+@semantic{} framework.
+
+The primary means to customize how @semantic{} works is to implement
+language specific versions of @i{overloadable} functions.  Semantic
+has a specialized mode bound way to do this.
+@ref{Semantic Overload Mechanism}.
+
+The parser has several parts which are all also overloadable.  The
+primary entry point into the parser is
+@code{semantic-fetch-tags} which calls
+@code{semantic-parse-region} which returns a list of semantic tags
+which get set to @code{semantic--buffer-cache}.
+
+@code{semantic-parse-region} is the first ``overloadable'' function.
+The default behavior of this is to simply call @code{semantic-lex},
+then pass the lexical token list to
+@code{semantic-repeat-parse-whole-stream}.  At each stage, another
+more focused layer provides a means of overloading.
+
+The parser is not the only layer that provides overloadable methods.
+Application APIs @inforef{top, , semantic-appdev} provide many
+overload functions as well.
+
+@menu
+* Semantic Overload Mechanism::  
+* Semantic Parser Structure::   
+* Application API Structure::   
+@end menu
+
+@node Semantic Overload Mechanism
+@section Semantic Overload Mechanism
+
+one of @semantic{}'s goals is to provide a framework for supporting a
+wide range of languages.
+writing parsers for some languages are very simple, e.g.,
+any dialect of lisp family such as emacs-lisp and scheme.
+parsers for many languages can be written in context free grammars
+such as c, java, python, etc.
+on the other hand, it is impossible to specify context free grammars
+for other languages such as texinfo.
+Yet @semantic{} already provides parsers for all these languages.
+
+In order to support such wide range of languages,
+a mechanism for customizing the parser engine at many levels
+was needed to maximize the code reuse yet give each programmer
+the flexibility of customizing the parser engine at many levels
+of granularity.
+
+@cindex function overloading
+@cindex overloading, function
+The solution that @semantic{} uses is @i{function overloading}.  This
+is mechanism which allows one to intercept and customize the behavior
+of many of the functions in the parser engine.  First the parser
+engine breaks down the task of parsing a language into several steps.
+Each step is represented by an Emacs-Lisp function.  Some of these are
+@code{semantic-parse-region}, @code{semantic-lex},
+@code{semantic-parse-stream}, and @code{semantic-parse-changes}.
+
+Many built-in @semantic{} functions are declared as being
+@i{over-loadable}, i.e., functions that do reasonable things for most
+languages, but can be customized to suit the particular needs of a
+given language.  All @i{over-loadable} functions then can easily be
+@i{over-ridden} if necessary.  The rest of this section provides
+details on this @i{overloading mechanism}.
+
+Over-loadable functions are created by defining functions with the
+@code{define-overloadable-function} macro rather than the usual
+@code{defun}.  @code{define-overloadable-function} is a thin wrapper
+around @code{defun} that sets up the function so that it can be
+overloaded.  An @i{over-loadable} function then can be @i{over-ridden}
+in one of two ways: @code{define-mode-overload-implementation} and
+@code{semantic-install-function-overrides}.
+
+Let's look at a couple of examples.
+@code{semantic-parse-region} is one of the top level functions
+in the parser engine defined via @code{define-overload}:
+
+@example
+(define-overloadable-function semantic-parse-region
+  (start end &optional nonterminal depth returnonerror)
+  "Parse the area between START and END, and return any tokens found.
+...")
+@end example
+
+The document string was truncated in the middle above since it is not
+relevant here.
+The declaration above defines @code{semantic-parse-region}, an 
+Emacs-Lisp function for parsing a region of code.  This special
+declaration will first check if there is an overloaded
+implementation for this major mode.
+If one is found, then that is called.
+If a mode specific implementation is not found, then the default
+implementation is called which in this case is to call
+@code{semantic-parse-region-default}, i.e.,
+a function with the same name but with the tailing @i{-default}.
+That function needs to be written separately and take the same
+arguments as the entry created with @code{define-overload}.
+
+One way to overload @code{semantic-parse-region} is via
+@code{semantic-install-function-overrides}.
+An example from @file{semantic-texi.el} file is shown below:
+
+@example
+(defun semantic-default-texi-setup ()
+  "Set up a buffer for parsing of Texinfo files."
+  ;; This will use our parser.
+  (semantic-install-function-overrides
+   '((parse-region . semantic-texi-parse-region)
+     (parse-changes . semantic-texi-parse-changes)))
+  ...
+  )
+
+(add-hook 'texinfo-mode-hook 'semantic-default-texi-setup)
+@end example
+
+The above function is from the texinfo parser support.
+
+The call to @code{semantic-install-function-overrides} above indicates
+that @code{semantic-texi-parse-region} is to over-ride the default
+implementation of @code{semantic-parse-region}.  Note the use of
+@code{parse-region} symbol which is @code{semantic-parse-region}
+without the leading @i{semantic-} prefix.
+
+Another way to over-ride a built-in @semantic{} function is via
+@code{define-mode-overload-implementation}.
+An example from @file{wisent-python.el} file is shown below.
+
+@example
+(define-mode-overload-implementation
+  semantic-parse-region python-mode
+  (start end &optional nonterminal depth returnonerror)
+  "Over-ride in order to initialize some variables."
+  (let ((wisent-python-lexer-indent-stack '(0))
+        (wisent-python-explicit-line-continuation nil))
+    (semantic-parse-region-default
+     start end nonterminal depth returnonerror)))
+@end example
+
+The above declaration over-rides @code{semantic-parse-region} so that
+for buffers whose major mode is @code{python-mode}, the code specified
+above is executed rather than the default implementation.
+
+@subsection Why not to use advice
+
+One may wonder why @semantic{} defines an overload mechanism when
+Emacs already has advice.  @xref{(elisp)Advising Functions}.
+
+Advising is generally considered a mechanism of last resort when
+modifying or hooking into an existing package without modifying
+that source file.  Overload files advertise that they @i{should} be
+overloaded, and define syntactic sugar to do so.
+
+@node Semantic Parser Structure
+@section Semantic Parser Structure
+
+NOTE: describe the functions that do parsing, and how to overload each.
+
+@ignore
+semantic-fetch-tags is the top level function that parses the current buffer.
+  semantic-parse-changes
+    semantic-parse-changes-default
+      semantic-edits-incremental-parser
+  semantic-parse-region (overloadable)
+    semantic-parse-region-default
+      semantic-lex (overloadable)
+        *semantic-lex-analyzer
+          semantic-flex
+      semantic-repeat-parse-whole-stream
+        semantic-parse-stream (overloadable)
+          semantic-parse-stream-default
+            semantic-bovinate-stream (bovine)
+          wisent-parse-stream      (wisent)
+    semantic-texi-parse-region
+@end ignore
+
+@example
+
+@ignore
+semantic-post-change-major-mode-function
+semantic-parser-name
+
+semantic-toplevel-bovine-table (see semantic-active-p)
+  semantic-bovinate-stream
+    semantic-toplevel-bovine-table
+      semantic-parse-region
+        semantic-parse-region-default
+          semantic-lex
+          semantic-repeat-parse-whole-stream
+
+semantic-init-db-hooks semanticdb-semantic-init-hook-fcn
+semantic-init-hooks semantic-auto-parse-mode
+
+semantic-flex-keywords-obarray (see semantic-bnf-keyword-table)
+  Used by semantic-lex-keyword-symbol, semantic-lex-keyword-set,
+  semantic-lex-map-keywords, semantic-flex
+semantic-lex-types-obarray
+
+* To support a new language, one must write a set of Emacs-Lisp
+  functions that converts any valid text written in that language
+  into a list of semantic tokens.  Typically this task is divided into two
+  areas: a lexer and a parser.
+* There are many ways of doing this.  However in almost all cases, two
+* Parser converts
+wisent parsers
+bovine parsers
+custom parsers
+@end ignore
+
+
+@end example
+
+@node Application API Structure
+@section Application API Structure
+
+How to program with the Application programming API into the data
+structures created by @semantic are in the Application development
+guide. Read that guide to get a feel for the specifics of what you can
+customize. @inforef{top, , semantic-appdev}
+
+Here are a list of applications, and the specific APIs that you will
+need to overload to make them work properly with your language.
+
+@table @code
+@item imenu
+@itemx speedbar
+@itemx ecb
+These tools requires that the @code{semantic-format} methods create
+correct strings.
+@inforef{Format Tag, ,semantic-addpev}
+@item semantic-analyze
+The analysis tool requires that the @code{semanticdb} tool is active,
+and that the searching methods are overloaded.  In addition,
+@code{semanticdb} system database could be written to provide symbols
+from the global environment of your langauge.
+@inforef{System Databases, , semantic-appdev}
+
+In addition, the analyzer requires that the @code{semantic-ctxt}
+methods are overloaded.  These methods allow the analyzer to look at
+the context of the cursor in your language, and predict the type of
+location of the cursor. @inforef{Derived Context, , semantic-appdev}.
+@item semantic-idle-summary-mode
+@itemx semantic-idle-completions-mode
+These tools use the semantic analysis tool.
+@inforef{Context Analysis. . semantic-appdev}
+@end table
+
+@menu
+* Semantic Analyzer Support::   
+@end menu
+
+@node Semantic Analyzer Support
+@subsection Semantic Analyzer Support
+
+@ignore
+>> From and Email I sent to get David started on supporting the analyzer
+
+  First, context parsing needs to work.  This includes
+`semantic-ctxt-current-symbol', `-function', `-assignment'.  You also
+need `semantic-get-local-arguments' and -local-variables'.
+
+  The next most critical piece is to provide implementations of the
+semanticdb-find search path calculation API.
+`semanticdb-find-table-for-include' is a good start.  That really
+should use `semantic-dependency-tag-file', but that doesn't use
+semanticdb-project-root when looking for files.  Java could be
+trouble here since you can import a *.
+
+  A couple more good ones is `semanticdb-find-translate-path-brutish'
+and `semanticdb-find-translate-path-includes'.  Brutish searches look
+at everything in the current project.  The include path will scan
+only those items explicitly included into your file.
+
+  Last but not least, for Java, we need a semanticdb back end that
+will provide tags out of a jar file.  Since most objects inherit from
+a system library (like Object), you will need this to get the tag
+list including `clone' and the like.
+@end ignore
+
+@node Writing Lexers
+@chapter Writing Lexers
+@cindex Writing Lexers
+
+@ignore
+Are we going to support semantic-flex as well as the new lexer?
+
+Not in the doc - Eric
+@end ignore
+
+In order to reduce a source file into a tag table using either of the
+two parser generators, it must first be converted into a token stream.
+Tokens are syntactic elements such as whitespace, symbols, strings,
+lists, and punctuation.
+
+The lexer uses the major-mode's syntax table for conversion.
+@xref{Syntax Tables,,,elisp}.
+As long as that is set up correctly (along with the important
+@code{comment-start} and @code{comment-start-skip} variable) the lexer
+should already work for your language.
+
+The primary entry point of the lexer is the @dfn{semantic-lex} function
+shown below.
+Normally, you do not need to call this function.
+It is usually called by @emph{semantic-fetch-tags} for you.
+
+@anchor{semantic-lex}
+@defun semantic-lex start end &optional depth length
+Lexically analyze text in the current buffer between @var{START} and @var{END}.
+Optional argument @var{DEPTH} indicates at what level to scan over entire
+lists.  The last argument, @var{LENGTH} specifies that @dfn{semantic-lex}
+should only return @var{LENGTH} tokens.  The return value is a token stream.
+Each element is a list, such of the form
+  (symbol start-expression .  end-expression)
+where @var{SYMBOL} denotes the token type.
+See @code{semantic-lex-tokens} variable for details on token types.  @var{END}
+does not mark the end of the text scanned, only the end of the
+beginning of text scanned.  Thus, if a string extends past @var{END}, the
+end of the return token will be larger than @var{END}.  To truly restrict
+scanning, use @dfn{narrow-to-region}.
+@end defun
+
+@menu
+* Lexer Overview::              What is a Lexer?
+* Lexer Output::                Output of a Lexical Analyzer
+* Lexer Construction::          Constructing your own lexer
+* Lexer Built In Analyzers::    Built in analyzers you can use
+* Lexer Analyzer Construction::  Constructing your own anlyzers
+* Keywords::                    Specialized lexical tokens.
+* Keyword Properties::          
+@end menu
+
+@node Lexer Overview
+@section Lexer Overview
+
+@semantic lexer breaks up the content of an Emacs buffer into a stream of
+tokens.  This process is based mostly on regular expressions which in
+turn depend on the syntax table of the buffer's major mode being setup
+properly.
+@xref{Major Modes,,,emacs}.
+@xref{Syntax Tables,,,elisp}.
+@xref{Regexps,,,emacs}.
+
+The top level lexical function @dfn{semantic-lex}, calls the function
+stored in @dfn{semantic-lex-analyzer}.  The default value is the
+function @dfn{semantic-flex} from version 1.4 of Semantic.  This will
+eventually be deprecated.
+
+In the default lexer, the following regular expressions which rely on syntax
+tables are used:
+
+@table @code
+@item @code{\\s-}
+whitespace characters
+@item @code{\\sw}
+word constituent
+@item @code{\\s_}
+symbol constituent
+@item @code{\\s.}
+punctuation character
+@item @code{\\s<}
+comment starter
+@item @code{\\s>}
+comment ender
+@item @code{\\s\\}
+escape character
+@item @code{\\s)}
+close parenthesis character
+@item @code{\\s$}
+paired delimiter
+@item @code{\\s\"}
+string quote
+@item @code{\\s\'}
+expression prefix
+@end table
+
+In addition, Emacs' built-in features such as
+@code{comment-start-skip},
+@code{forward-comment},
+@code{forward-list},
+and
+@code{forward-sexp}
+are employed.
+
+@node Lexer Output
+@section Lexer Output
+
+The lexer, @ref{semantic-lex}, scans the content of a buffer and
+returns a token list.
+Let's illustrate this using this simple example.
+
+@example
+00: /*
+01:  * Simple program to demonstrate semantic.
+02:  */
+03:
+04: #include <stdio.h>
+05:
+06: int i_1;
+07:
+08: int
+09: main(int argc, char** argv)
+10: @{
+11:     printf("Hello world.\n");
+12: @}
+@end example
+
+Evaluating @code{(semantic-lex (point-min) (point-max))}
+within the buffer with the code above returns the following token list.
+The input line and string that produced each token is shown after
+each semi-colon.
+
+@example
+((punctuation     52 .  53)     ; 04: #
+ (INCLUDE         53 .  60)     ; 04: include
+ (punctuation     61 .  62)     ; 04: <
+ (symbol          62 .  67)     ; 04: stdio
+ (punctuation     67 .  68)     ; 04: .
+ (symbol          68 .  69)     ; 04: h
+ (punctuation     69 .  70)     ; 04: >
+ (INT             72 .  75)     ; 06: int
+ (symbol          76 .  79)     ; 06: i_1
+ (punctuation     79 .  80)     ; 06: ;
+ (INT             82 .  85)     ; 08: int
+ (symbol          86 .  90)     ; 08: main
+ (semantic-list   90 . 113)     ; 08: (int argc, char** argv)
+ (semantic-list  114 . 147)     ; 09-12: body of main function
+ )
+@end example
+
+As shown above, the token list is a list of ``tokens''.
+Each token in turn is a list of the form
+
+@example
+(TOKEN-TYPE BEGINNING-POSITION . ENDING-POSITION)
+@end example
+
+@noindent
+where TOKEN-TYPE is a symbol, and the other two are integers indicating
+the buffer position that delimit the token such that
+
+@lisp
+(buffer-substring BEGINNING-POSITION ENDING-POSITION)
+@end lisp
+
+@noindent
+would return the string form of the token.
+
+Note that one line (line 4 above) can produce seven tokens while
+the whole body of the function produces a single token.
+This is because the @var{depth} parameter of @code{semantic-lex} was
+not specified.
+Let's see the output when @var{depth} is set to 1.
+Evaluate @code{(semantic-lex (point-min) (point-max) 1)} in the same buffer.
+Note the third argument of @code{1}.
+
+@example
+((punctuation    52 .  53)     ; 04: #
+ (INCLUDE        53 .  60)     ; 04: include
+ (punctuation    61 .  62)     ; 04: <
+ (symbol         62 .  67)     ; 04: stdio
+ (punctuation    67 .  68)     ; 04: .
+ (symbol         68 .  69)     ; 04: h
+ (punctuation    69 .  70)     ; 04: >
+ (INT            72 .  75)     ; 06: int
+ (symbol         76 .  79)     ; 06: i_1
+ (punctuation    79 .  80)     ; 06: ;
+ (INT            82 .  85)     ; 08: int
+ (symbol         86 .  90)     ; 08: main
+
+ (open-paren     90 .  91)     ; 08: (
+ (INT            91 .  94)     ; 08: int
+ (symbol         95 .  99)     ; 08: argc
+ (punctuation    99 . 100)     ; 08: ,
+ (CHAR          101 . 105)     ; 08: char
+ (punctuation   105 . 106)     ; 08: *
+ (punctuation   106 . 107)     ; 08: *
+ (symbol        108 . 112)     ; 08: argv
+ (close-paren   112 . 113)     ; 08: )
+
+ (open-paren    114 . 115)     ; 10: @{
+ (symbol        120 . 126)     ; 11: printf
+ (semantic-list 126 . 144)     ; 11: ("Hello world.\n")
+ (punctuation   144 . 145)     ; 11: ;
+ (close-paren   146 . 147)     ; 12: @}
+ )
+@end example
+
+The @var{depth} parameter ``peeled away'' one more level of ``list''
+delimited by matching parenthesis or braces.
+The depth parameter can be specified to be any number.
+However, the parser needs to be able to handle the extra tokens.
+
+This is an interesting benefit of the lexer having the full
+resources of Emacs at its disposal.
+Skipping over matched parenthesis is achieved by simply calling
+the built-in functions @code{forward-list} and @code{forward-sexp}.
+
+@node Lexer Construction
+@section Lexer Construction
+
+While using the default lexer is certainly an option, it is usually
+more efficient to create a custom lexer for your language.
+
+You can create a new lexer with @dfn{define-lex}.
+
+@defun define-lex name doc &rest analyzers
+@anchor{define-lex}
+Create a new lexical analyzer with @var{NAME}.
+@var{DOC} is a documentation string describing this analyzer.
+@var{ANALYZERS} are small code snippets of analyzers to use when
+building the new @var{NAMED} analyzer.  Only use analyzers which
+are written to be used in @dfn{define-lex}.
+Each analyzer should be an analyzer created with @dfn{define-lex-analyzer}.
+Note: The order in which analyzers are listed is important.
+If two analyzers can match the same text, it is important to order the
+analyzers so that the one you want to match first occurs first.  For
+example, it is good to put a number analyzer in front of a symbol
+analyzer which might mistake a number for as a symbol.
+@end defun
+
+The list of @var{analyzers}, needed here can consist of one of
+several built in analyzers, or one of your own construction.  The
+built in analyzers are:
+
+@node Lexer Built In Analyzers
+@section Lexer Built In Analyzers
+
+@defspec semantic-lex-default-action
+The default action when no other lexical actions match text.
+This action will just throw an error.
+@end defspec
+
+@defspec semantic-lex-beginning-of-line
+Detect and create a beginning of line token (BOL).
+@end defspec
+
+@defspec semantic-lex-newline
+Detect and create newline tokens.
+@end defspec
+
+@defspec semantic-lex-newline-as-whitespace
+Detect and create newline tokens.
+Use this ONLY if newlines are not whitespace characters (such as when
+they are comment end characters) AND when you want whitespace tokens.
+@end defspec
+
+@defspec semantic-lex-ignore-newline
+Detect and create newline tokens.
+Use this ONLY if newlines are not whitespace characters (such as when
+they are comment end characters).
+@end defspec
+
+@defspec semantic-lex-whitespace
+Detect and create whitespace tokens.
+@end defspec
+
+@defspec semantic-lex-ignore-whitespace
+Detect and skip over whitespace tokens.
+@end defspec
+
+@defspec semantic-lex-number
+Detect and create number tokens.
+Number tokens are matched via this variable:
+
+@defvar semantic-lex-number-expression
+Regular expression for matching a number.
+If this value is @code{nil}, no number extraction is done during lex.
+This expression tries to match C and Java like numbers.
+
+@example
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;
+@end example
+@end defvar
+
+@end defspec
+
+@defspec semantic-lex-symbol-or-keyword
+Detect and create symbol and keyword tokens.
+@end defspec
+
+@defspec semantic-lex-charquote
+Detect and create charquote tokens.
+@end defspec
+
+@defspec semantic-lex-punctuation
+Detect and create punctuation tokens.
+@end defspec
+
+@defspec semantic-lex-punctuation-type
+Detect and create a punctuation type token.
+Recognized punctuations are defined in the current table of lexical
+types, as the value of the `punctuation' token type.
+@end defspec
+
+@defspec semantic-lex-paren-or-list
+Detect open parenthesis.
+Return either a paren token or a semantic list token depending on
+`semantic-lex-current-depth'.
+@end defspec
+
+@defspec semantic-lex-open-paren
+Detect and create an open parenthesis token.
+@end defspec
+
+@defspec semantic-lex-close-paren
+Detect and create a close paren token.
+@end defspec
+
+@defspec semantic-lex-string
+Detect and create a string token.
+@end defspec
+
+@defspec semantic-lex-comments
+Detect and create a comment token.
+@end defspec
+
+@defspec semantic-lex-comments-as-whitespace
+Detect comments and create a whitespace token.
+@end defspec
+
+@defspec semantic-lex-ignore-comments
+Detect and create a comment token.
+@end defspec
+
+@node Lexer Analyzer Construction
+@section Lexer Analyzer Construction
+
+Each of the previous built in analyzers are constructed using a set
+of analyzer construction macros.  The root construction macro is:
+
+@defun define-lex-analyzer name doc condition &rest forms
+Create a single lexical analyzer @var{NAME} with @var{DOC}.
+When an analyzer is called, the current buffer and point are
+positioned in a buffer at the location to be analyzed.
+@var{CONDITION} is an expression which returns @code{t} if @var{FORMS} should be run.
+Within the bounds of @var{CONDITION} and @var{FORMS}, the use of backquote
+can be used to evaluate expressions at compile time.
+While forms are running, the following variables will be locally bound:
+  @code{semantic-lex-analysis-bounds} - The bounds of the current analysis.
+                  of the form (@var{START} . @var{END})
+  @code{semantic-lex-maximum-depth} - The maximum depth of semantic-list
+                  for the current analysis.
+  @code{semantic-lex-current-depth} - The current depth of @code{semantic-list} that has
+                  been descended.
+  @code{semantic-lex-end-point} - End Point after match.
+                   Analyzers should set this to a buffer location if their
+                   match string does not represent the end of the matched text.
+  @code{semantic-lex-token-stream} - The token list being collected.
+                   Add new lexical tokens to this list.
+Proper action in @var{FORMS} is to move the value of @code{semantic-lex-end-point} to
+after the location of the analyzed entry, and to add any discovered tokens
+at the beginning of @code{semantic-lex-token-stream}.
+This can be done by using @dfn{semantic-lex-push-token}.
+@end defun
+
+Additionally, a simple regular expression based analyzer can be built
+with:
+
+@defun define-lex-regex-analyzer name doc regexp &rest forms
+Create a lexical analyzer with @var{NAME} and @var{DOC} that will match @var{REGEXP}.
+@var{FORMS} are evaluated upon a successful match.
+See @dfn{define-lex-analyzer} for more about analyzers.
+@end defun
+
+@defun define-lex-simple-regex-analyzer name doc regexp toksym &optional index &rest forms
+Create a lexical analyzer with @var{NAME} and @var{DOC} that match @var{REGEXP}.
+@var{TOKSYM} is the symbol to use when creating a semantic lexical token.
+@var{INDEX} is the index into the match that defines the bounds of the token.
+Index should be a plain integer, and not specified in the macro as an
+expression.
+@var{FORMS} are evaluated upon a successful match @var{BEFORE} the new token is
+created.  It is valid to ignore @var{FORMS}.
+See @dfn{define-lex-analyzer} for more about analyzers.
+@end defun
+
+Regular expression analyzers are the simplest to create and manage.
+Often, a majority of your lexer can be built this way.  The analyzer
+for matching punctuation looks like this:
+
+@example
+(define-lex-simple-regex-analyzer semantic-lex-punctuation
+  "Detect and create punctuation tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)" 'punctuation)
+@end example
+
+More complex analyzers for matching larger units of text to optimize
+the speed of parsing and analysis is done by matching blocks.
+
+@defun define-lex-block-analyzer name doc spec1 &rest specs
+Create a lexical analyzer @var{NAME} for paired delimiters blocks.
+It detects a paired delimiters block or the corresponding open or
+close delimiter depending on the value of the variable
+@code{semantic-lex-current-depth}.  @var{DOC} is the documentation string of the lexical
+analyzer.  @var{SPEC1} and @var{SPECS} specify the token symbols and open, close
+delimiters used.  Each @var{SPEC} has the form:
+
+(@var{BLOCK-SYM} (@var{OPEN-DELIM} @var{OPEN-SYM}) (@var{CLOSE-DELIM} @var{CLOSE-SYM}))
+
+where @var{BLOCK-SYM} is the symbol returned in a block token.  @var{OPEN-DELIM}
+and @var{CLOSE-DELIM} are respectively the open and close delimiters
+identifying a block.  @var{OPEN-SYM} and @var{CLOSE-SYM} are respectively the
+symbols returned in open and close tokens.
+@end defun
+
+These blocks is what makes the speed of semantic's Emacs Lisp based
+parsers fast.  For example, by defining all text inside @{ braces @} as
+a block the parser does not need to know the contents of those braces
+while parsing, and can skip them all together.
+
+@node Keywords
+@section Keywords
+
+Another important piece of the lexer is the keyword table (see
+@ref{Writing Parsers}).  Each language will want to set up a keyword
+table for fast conversion of symbol strings to language terminals.
+
+The keywords table can also be used to store additional information
+about those keywords.  The following programming functions can be useful
+when examining text in a language buffer.
+
+@defun semantic-lex-keyword-p name
+Return non-@code{nil} if a keyword with @var{NAME} exists in the keyword table.
+Return @code{nil} otherwise.
+@end defun
+
+@defun semantic-lex-keyword-put name property value
+For keyword with @var{NAME}, set its @var{PROPERTY} to @var{VALUE}.
+@end defun
+
+@defun semantic-lex-keyword-get name property
+For keyword with @var{NAME}, return its @var{PROPERTY} value.
+@end defun
+
+@defun semantic-lex-map-keywords fun &optional property
+Call function @var{FUN} on every semantic keyword.
+If optional @var{PROPERTY} is non-@code{nil}, call @var{FUN} only on every keyword which
+as a @var{PROPERTY} value.  @var{FUN} receives a semantic keyword as argument.
+@end defun
+
+@defun semantic-lex-keywords &optional property
+Return a list of semantic keywords.
+If optional @var{PROPERTY} is non-@code{nil}, return only keywords which have a
+@var{PROPERTY} set.
+@end defun
+
+Keyword properties can be set up in a grammar file for ease of maintenance.
+While examining the text in a language buffer, this can provide an easy
+and quick way of storing details about text in the buffer.
+
+@node Keyword Properties
+@section Standard Keyword Properties
+
+Keywords in a language can have multiple properties.  These
+properties can be used to associate the string that is the keyword
+with additional information.
+
+Currently available properties are:
+
+@table @b
+@item summary
+The summary property is used by semantic-summary-mode as a help
+string for the keyword specified.
+@end table
+
+Notes:
+
+Possible future properties.  This is just me musing:
+
+@table @b
+@item face
+Face used for highlighting this keyword, differentiating it from the
+keyword face.
+@item template
+@itemx skeleton
+Some sort of tempo/skel template for inserting the programatic
+structure associated with this keyword.
+@item abbrev
+As with template.
+@item action
+@itemx menu
+Perhaps the keyword is clickable and some action would be useful.
+@end table
+
+
+@node Writing Parsers
+@chapter Writing Parsers
+@cindex Writing Parsers
+
+@ignore
+For the parser developer, I can think of two extra sections.  One for
+semanticdb extensions,  (If a system database is needed.)  A second
+for the `semantic-ctxt' extensions.  Many of the most interesting
+tools will completely fail to work without local context parsing
+support.
+
+Perhaps even a section on foreign tokens.  For example, putting a
+Java token into a C++ file could auto-gen a native method, just as
+putting a token into a Texinfo file converts it into documentation.
+
+In addition, in the "writing grammars" section should have
+subsections as listed in the examples of the overview section.  It
+might be useful to have a fourth section describing the similarities
+between the two file types (by and wy) and how to use the grammar
+mode.  (I'm not sure if that should be covered elsewhere.)
+@end ignore
+
+When converting a source file into a tag table it is important to
+specify rules to accomplish this.  The rules are stored in the buffer
+local variable @code{semantic--buffer-cache}.
+
+While it is certainly possible to write this table yourself, it is
+most likely you will want to use the @ref{Grammar Programming
+Environment}.
+
+There are three choices for parsing your language.
+
+@table @b
+@item Bovine Parser
+The @dfn{bovine} parser is the original @semantic{} parser, and is an
+implementation of an @acronym{LL} parser.  For more information,
+@inforef{top, the Bovine Parser Manual, bovine}.
+
+@item Wisent Parser
+The @dfn{wisent} parser is a port of the GNU Compiler Compiler Bison
+to Emacs Lisp.  Wisent includes the iterative error handler of the
+bovine parser, and has the same error correction as traditional
+@acronym{LALR} parsers.  For more information,
+@inforef{top, the Wisent Parser Manual, wisent}.
+
+@item External Parser
+External parsers, such as the texinfo parser can be implemented using
+any means.  This allows the use of a regular expression parser for
+non-regular languages, or external programs for speed.
+@end table
+
+@menu
+* External Parsers::            Writing an external parser
+* Grammar Programming Environment::  Using the grammar writing environemt
+* Parser Backend Support::             Lisp needed to support a grammar.
+@end menu
+
+@node External Parsers
+@section External Parsers
+
+The texinfo parser in @file{semantic-texi.el} is an example of an
+external parser.  To make your parser work, you need to have a setup
+function to replace the regular region parsing mechanism.
+
+Another external parser is in the ctags support.  The CTags parser
+overloads the same functions as the texinfo version.  Instead of using
+regular expressions, however, it uses the external program
+@code{ctags}, and converts the output into the @semantic tag format.
+
+@node Grammar Programming Environment
+@section Grammar Programming Environment
+
+Semantic grammar files in @file{.by} or @file{.wy} format have their
+own programming mode.  This mode provides indentation and coloring
+services in those languages.  In addition, the grammar languages are
+also supported by @semantic so tagging information is available to
+tools such as imenu or speedbar.
+
+For more information,
+@inforef{top, the Grammar Framework Manual, grammar-fw}.
+
+@node Parsing a language file
+@chapter Parsing a language file
+
+The best way to call the parser from programs is via
+@code{semantic-fetch-tags}.  This, in turn, uses other internal
+@acronym{API} functions which plug-in parsers can take advantage of.
+
+@defun semantic-fetch-tags
+@anchor{semantic-fetch-tags}
+Fetch semantic tags from the current buffer.
+If the buffer cache is up to date, return that.
+If the buffer cache is out of date, attempt an incremental reparse.
+If the buffer has not been parsed before, or if the incremental reparse
+fails, then parse the entire buffer.
+If a lexical error had been previously discovered and the buffer
+was marked unparseable, then do nothing, and return the cache.
+@end defun
+
+Another approach is to let Emacs call the parser on idle time, when
+needed, then use @code{semantic-fetch-available-tags} to retrieve and
+process only the available tags, provided that the
+@code{semantic-after-*-hook} hooks have been setup to synchronize with
+new tags when they become available.
+
+@defun semantic-fetch-available-tags
+@anchor{semantic-fetch-available-tags}
+Fetch available semantic tags from the current buffer.
+That is, return tags currently in the cache without parsing the
+current buffer.
+
+Parse operations happen asynchronously when needed on Emacs idle time.
+Use the @code{semantic-after-toplevel-cache-change-hook} and
+@code{semantic-after-partial-cache-change-hook} hooks to synchronize with
+new tags when they become available.
+@end defun
+
+@deffn Command semantic-clear-toplevel-cache
+@anchor{semantic-clear-toplevel-cache}
+Clear the toplevel tag cache for the current buffer.
+Clearing the cache will force a complete reparse next time a token
+stream is requested.
+@end deffn
+
+@node Parser Backend Support
+@section Parser Backend Support
+
+Once you have written a grammar file that has been compiled into
+Emacs Lisp code, additional glue needs to be written to finish
+connecting the generated parser into the Emacs framework.
+
+Large portions of this glue is automatically generated, but will
+probably need additional modification to get things to work properly.
+
+Typically, a grammar file @file{foo.wy} will create the file
+@file{foo-wy.el}.  It is then useful to also create a file
+@file{wisent-foo.el} (or @file{semantic-foo.el}) to contain the parser
+back end, or the glue that completes the semantic support for the
+language.
+
+@menu
+* Example Backend File::
+* Tag Expansion::
+@end menu
+
+@node Example Backend File
+@subsection Example Backend File
+
+Typical structure for this file is:
+
+@example
+;;; semantic-foo.el -- parser support for FOO.
+
+;;; Your copyright Notice
+
+(require 'foo-wy.el)  ;; The parser
+(require 'foo) ;; major mode definition for FOO
+
+;;; Code:
+
+;;; Lexical Analyzer
+;;
+;; OPTIONAL
+;; It is possible to define your lexical analyzer completely in your
+;; grammar file.
+
+(define-lex foo-lexical-analyzer
+  "Create a lexical analyzer."
+  ...)
+
+;;; Expand Function
+;;
+;; OPTIONAL
+;; Not all languages are so complex as to need this function.
+;; See `semantic-tag-expand-function' for more details.
+(defun foo-tag-expand-function (tag)
+  "Expand TAG into multiple tags if needed."
+  ...)
+
+;;; Parser Support
+;;
+;; OPTIONAL
+;; If you need some specialty routines inside your grammar file
+;; you can add some here.   The process may be to take diverse info
+;; and reorganize it.
+;;
+;; It is also appropriate to write these functions in the prologue
+;; of the grammar function.
+(defun foo-do-something-hard (...)
+  "...")
+
+;;; Overload methods
+;;
+;; OPTIONAL
+;; To allow your langauge to be fully supported by all the
+;; applications that use semantic, it is important, but not necessary
+;; to create implementations of overload methods.
+(define-mode-overload-implementation some-semantic-function foo-mode (tag)
+  "Implement some-semantic-function for FOO."
+  )
+
+;;;###autoload
+(defun semantic-default-foo-setup ()
+  "Set up a buffer for semantic parsing of the FOO language."
+  (semantic-foo-by--install-parser)
+  (setq semantic-tag-expand-function foo-tag-expand-function
+        ;; Many other language specific settings can be done here
+        ;; as well.
+        )
+  ;; This may be optional
+  (setq semantic-lex-analyzer #'foo-lexical-analyzer)
+  )
+
+;;;###autoload
+(add-hook 'foo-mode-hook 'semantic-default-foo-setup)
+
+(provide 'semantic-c)
+
+;;; semantic-foo.el ends here
+@end example
+
+@node Tag Expansion
+@subsection Tag Expansion
+
+In any language with compound tag types, you will need to implement
+an @emph{expand function}.  Once written, assign it to this variable.
+
+@defvar semantic-tag-expand-function
+@anchor{semantic-tag-expand-function}
+Function used to expand a tag.
+It is passed each tag production, and must return a list of tags
+derived from it, or @code{nil} if it does not need to be expanded.
+
+Languages with compound definitions should use this function to expand
+from one compound symbol into several.  For example, in @var{C} or Java the
+following definition is easily parsed into one tag:
+
+  int a, b;
+
+This function should take this compound tag and turn it into two tags,
+one for @var{A}, and the other for @var{B}.
+@end defvar
+
+Additionally, you can use the expand function in conjunction with your
+language for other types of compound statements.  For example, in
+Common Lisp Object System, you can have a definition:
+
+@example
+(defclass classname nil
+  (slots ...) ...)
+@end example
+
+This will create both the datatype @code{classname} and the functional
+constructor @code{classname}.  Each slot may have a @code{:accessor}
+method as well.
+
+You can create a special compounded tag in your rule, for example:
+
+@example
+classdef: LPAREN DEFCLASS name semantic-list semantic-list RPAREN
+          (TAG "custom" 'compound-class
+               :value (list
+                        (TYPE-TAG $3 "class" ...)
+                        (FUNCTION-TAG $3 ...)
+                        ))
+        ;
+@end example
+
+and in your expand function, you would write:
+
+@example
+(defun my-tag-expand (tag)
+  "Expand tags for my langauge."
+  (when (semantic-tag-of-class-p tag 'compound-class)
+     (remq nil
+        (semantic-tag-get-attribute tag :value))))
+@end example
+
+This will cause the custom tag to be replaced by the tags created in
+the :value attribute of the specially constructed tag.
+
+@node Debugging
+@chapter Debugging
+
+Grammars can be tricky things to debug.  There are several types of
+tools for debugging in Semantic, and the type of problem you have
+requires different types of tools.
+
+@menu
+* Lexical Debugging::           
+* Parser Output tools::         
+* Bovine Parser Debugging::     
+* Wisent Parser Debugging::     
+* Overlay Debugging::           
+* Incremental Parser Debugging::  
+* Semantic 1.4 Doc::            
+@end menu
+
+@node Lexical Debugging
+@section Lexical Debugging
+
+The first major problem you may encounter is with lexical analysis.
+If the text is not transformed into the expected token stream, no
+parser will understand it.
+
+You can step through the lexical analyzer with the following command:
+
+@deffn Command semantic-lex-debug arg
+@anchor{semantic-lex-debug}
+Debug the semantic lexer in the current buffer.
+Argument @var{ARG} specifies of the analyze the whole buffer, or start at point.
+While engaged, each token identified by the lexer will be highlighted
+in the target buffer   @var{A} description of the current token will be
+displayed in the minibuffer.  Press @kbd{SPC} to move to the next lexical token.
+@end deffn
+
+For an example of what the output of the @code{semantic-lex} function
+should return, see @ref{Lexer Output}.
+
+@node Parser Output tools
+@section Parser Output tools
+
+There are several tools which can be used to see what the parser
+output is.  These will work for any type of parser, including the
+Bovine parser, Wisent parser.
+
+The first and easiest is a minor mode which highlights text the
+parser did not understand.
+
+@deffn Command semantic-show-unmatched-syntax-mode &optional arg
+@anchor{semantic-show-unmatched-syntax-mode}
+Minor mode to highlight unmatched lexical syntax tokens.
+When a parser executes, some elements in the buffer may not match any
+parser rules.  These text characters are considered unmatched syntax.
+Often time, the display of unmatched syntax can expose coding
+problems before the compiler is run.
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+
+@table @kbd
+@item key
+binding
+@item C-c ,
+Prefix Command
+@item C-c , `
+semantic-show-unmatched-syntax-next
+@end table
+@end deffn
+
+Another interesting mode will display a line between all the tags in
+the current buffer to make it more obvious where boundaries lie.  You
+can enable this as a minor mode.
+
+@deffn Command semantic-show-tag-boundaries-mode &optional arg
+@anchor{semantic-show-tag-boundaries-mode}
+Minor mode to display a boundary in front of tags.
+The boundary is displayed using an overline in Emacs @var{21}.
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+Another interesting mode helps if you are worred about specific
+attributes, you can se this minor mode to highlight different tokens
+in different ways based on the attributes you are most concerned with.
+
+@deffn Command semantic-highlight-by-attribute-mode &optional arg
+@anchor{semantic-highlight-by-attribute-mode}
+Minor mode to highlight tags based on some attribute.
+By default, the protection of a tag will give it a different
+background color.
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+Another tool that can be used is a dump of the current list of tags.
+This shows the actual Lisp representation of the tags generated in a
+rather bland dump.  This can be useful if text was successfully
+parsed, and you want to be sure that the correct information was
+captured.
+
+@deffn Command bovinate &optional clear
+@anchor{bovinate}
+Bovinate the current buffer.  Show output in a temp buffer.
+Optional argument @var{CLEAR} will clear the cache before bovinating.
+If @var{CLEAR} is negative, it will do a full reparse, and also not display
+the output buffer.
+@end deffn
+
+@node Bovine Parser Debugging
+@section Bovine Parser Debugging
+
+The bovine parser is described in @inforef{top, ,bovine}.
+
+Aside using a traditional Emacs Lisp debugger on functions you
+provide for token expansion, there is one other means of debugging
+which interactively steps over the rules in your grammar file.
+
+@deffn Command semantic-debug
+@anchor{semantic-debug}
+Parse the current buffer and run in debug mode.
+@end deffn
+
+Once the parser is activated in this mode, the current tag cache is
+flushed, and the parser started.  At each stage in the LALR parser,
+the current rule, and match step is highlighted in your parser source
+buffer.  In a second window, the text being parsed is shown, and the
+lexical token found is highlighted.  A clue of the current stack of
+saved data is displayed in the minibuffer.
+
+There is a wide range of keybindings that can be used to execute code
+in your buffer.  (Not all are implemented.)
+
+@table @kbd
+@item n
+@itemx SPC
+Next.
+@item s
+Step.
+@item u
+Up.  (Not implemented yet.)
+@item d
+Down.  (Not implemented yet.)
+@item f
+Fail Match.  Pretend the current match element and the token in the
+buffer is a failed match, even if it is not.
+@item h
+Print information about the current parser state.
+@item s
+Jump to to the source buffer.
+@item p
+Jump to the parser buffer.
+@item q
+Quit.  Exits this debug session and the parser.
+@item a
+Abort.  Aborts one level of the parser, possibly exiting the debugger.
+@item g
+Go.  Stop debugging, and just start parsing.
+@item b
+Set Breakpoint.  (Not implemented yet.)
+@item e
+@code{eval-expression}.  Lets you execute some random Emacs Lisp command.
+@end table
+
+@b{Note:} While the core of @code{semantic-debug} is a generic
+debugger interface for rule based grammars, only the bovine parser has
+a specific backend implementation.  If someone wants to implement a
+debugger backend for wisent, that would be spiff.
+
+@node Wisent Parser Debugging
+@section Wisent Parser Debugging
+
+Wisent does not implement a backend for @code{semantic-debug}, it
+does have some debugging commands the rule actions.  You can read
+about them in the wisent manual.
+
+@inforef{Grammar Debugging, , wisent}
+
+@node Overlay Debugging
+@section Overlay Debugging
+
+Once a buffer has been parsed into a tag table, the next most
+important step is getting those tags activated for a buffer, and
+storable in a @code{semanticdb} backend.
+@inforef{semanticdb, , semantic-appdev}.
+
+These two activities depend on the ability of every tag in the table
+to be linked and unlinked to the current buffer with an overlay.
+@inforef{semantic-appdev, , Tag Overlay}
+@inforef{semantic-appdev, , Tag Hooks}
+
+In this case, the most important function that must be written is:
+
+@defun semantic-tag-components-with-overlays tag
+@anchor{semantic-tag-components-with-overlays}
+Return the list of top level components belonging to @var{TAG}.
+Children are any sub-tags which contain overlays.
+
+Default behavior is to get @dfn{semantic-tag-components} in addition
+to the components of an anonymous types (if applicable.)
+
+Note for language authors:
+  If a mode defines a language tag that has tags in it with overlays
+you should still return them with this function.
+Ignoring this step will prevent several features from working correctly.
+This function can be overridden in semantic using the
+symbol @code{tag-components-with-overlays}.
+@end defun
+
+If your are successfully building a tag table, and errors occur
+saving or restoring tags from semanticdb, this is the most likely
+cause of the problem.
+
+@node Incremental Parser Debugging
+@section Incremental Parser Debugging
+
+The incremental parser is a highly complex engine for quickly
+refreshing the tag table of a buffer after some set of changes have
+been made to that buffer by a user.
+
+There is no debugger or interface to the incremental parser, however
+there are a few minor modes which can help you identify issues if you
+think there are problems while incrementally parsing a buffer.
+
+The first stage of the incremental parser is in tracking the changes
+the user makes to a buffer.  You can visibly track these changes too.
+
+@deffn Command semantic-highlight-edits-mode &optional arg
+@anchor{semantic-highlight-edits-mode}
+Minor mode for highlighting changes made in a buffer.
+Changes are tracked by semantic so that the incremental parser can work
+properly.
+This mode will highlight those changes as they are made, and clear them
+when the incremental parser accounts for those edits.
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+Another important aspect of the incremental parser involves tracking
+the current parser state of the buffer.  You can track this state
+also.
+
+@deffn Command semantic-show-parser-state-mode &optional arg
+@anchor{semantic-show-parser-state-mode}
+Minor mode for displaying parser cache state in the modeline.
+The cache can be in one of three states.  They are
+Up to date, Partial reparse needed, and Full reparse needed.
+The state is indicated in the modeline with the following characters:
+@table @kbd
+@item -
+The cache is up to date.
+@item !
+The cache requires a full update.
+@item ^
+The cache needs to be incrementally parsed.
+@item %
+The cache is not currently parseable.
+@item @@
+Auto-parse in progress (not set here.)
+@end table
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+When the incremental parser starts updating the tags buffer, you can
+also enable a set of messages to help identify how the incremental
+parser is merging changes with the main buffer.
+
+@defvar semantic-edits-verbose-flag
+@anchor{semantic-edits-verbose-flag}
+Non-@code{nil} means the incremental parser is verbose.
+If @code{nil}, errors are still displayed, but informative messages are not.
+@end defvar
+
+@node Semantic 1.4 Doc
+@section Semantic 1.4 Doc
+
+@i{
+In semantic 1.4 the following documentation was written for debugging.
+I'm leaving in here until better doc for 2.0 is done.
+}
+
+Writing language files using BY is significantly easier than writing
+then using regular expressions in a functional manner.  Debugging
+them, however, can still prove challenging.
+
+There are two ways to debug a language definition if it is not
+behaving as expected.  One way is to debug against the source @file{.by}
+file.
+
+If your language definition was written in BNF notation, debugging is
+quite easy.  The command @code{semantic-debug} will start you off.
+
+@deffn Command semantic-debug
+Reparse the current buffer and run in parser debug mode.
+@end deffn
+
+While debugging, two windows are visible.  One window shows the file
+being parsed, and the syntactic token being tested is highlighted.
+The second window shows the table being used (in the BY source) with
+the current rule highlighted.  The cursor will sit on the specific
+match rule being tested against.
+
+In the minibuffer, a brief summary of the current situation is
+listed.  The first element is the syntactic token which is a list of
+the form:
+
+@example
+(TYPE START . END)
+@end example
+
+The rest of the display is a list of all strings collected for the
+currently tested rule.  Each time a new rule is entered, the list is
+restarted.  Upon returning from a rule into a previous match list, the
+previous match list is restored, with the production of the dependent
+rule in the list.
+
+Use @kbd{C-g} to stop debugging.  There are no commands for any
+fancier types of debugging.
+
+NOTE: Semantic 2.0 has more debugging commands.  Use:
+@kbd{C-h m semantic-debug-mode} to view.
+
+@node Parser Error Handling
+@chapter Parser Error Handling
+@cindex Parser Error Handling
+
+NOTE: Write Me
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
diff --git a/site/cedet-1.0pre7/semantic/doc/minor-modes.texi b/site/cedet-1.0pre7/semantic/doc/minor-modes.texi
new file mode 100644
index 0000000..aa45845
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/minor-modes.texi
@@ -0,0 +1,320 @@
+@ignore
+@node Semantic Minor Modes
+@chapter Semantic Minor Modes
+@end ignore
+
+Semantic comes with a wide range of minor-modes which use various
+features of semantic.  These modes vary widely in utility.
+
+There are some core modes that are required for smooth operations.
+Some of these are discussed in other chapters, such as @ref{Idle
+Scheduler}, and @ref{semanticdb}
+
+@menu
+* Code Helpers::        Modes for assisting in authoring code.
+* Development Modes::   Modes for assisting in developing/debugging Semantic.
+@end menu
+
+@node Code Helpers
+@section Code Helpers
+
+Code Helpers are minor modes that augment basic Emacs behavior in ways
+that can assist in programming Semantic supported langauges.
+
+@menu
+* Sticky Function Mode::
+* Highlight Func Mode::	
+* Tag Decoration Mode::
+* MRU Bookmarks Mode::
+@end menu
+
+Senator is another mode which can assist in programming @ref{senator}.
+
+@node Development Modes
+@section Development Modes
+
+@menu
+* Highlight Edits Mode::
+* Parser State::
+* Unmatched Syntax Highlighting::
+@end menu
+
+@node Sticky Function Mode
+@subsection Sticky Function Headers
+
+@deffn Command semantic-stickyfunc-mode &optional arg
+Minor mode to show the title of a tag in the header line.
+Enables/disables making the header line of functions sticky.
+A function (or other tag class specified by
+@code{semantic-stickyfunc-sticky-classes}) has a header line, meaning the
+first line which describes the rest of the construct.  This first
+line is what is displayed in the Emacs @var{21} header line.
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+@defvar semantic-stickyfunc-sticky-classes
+List of tag classes which sticky func will display in the header line.
+@end defvar
+
+@node Highlight Func Mode
+@subsection Highlight Func Mode
+@cindex semantic-highlight-func-mode
+
+Highlight Func mode will put a highlight overlay over the top
+declaration line of the function or tag the point is in.  Enabling
+this feature also puts a context menu onto the declaration line
+providing easy access to some basic commands.
+
+@defun semantic-highlight-func-mode &optional arg
+@anchor{semantic-highlight-func-mode}
+Minor mode to highlight the first line of the current tag.
+Enables/disables making the header line of functions sticky.
+A function (or other tag class specified by
+@code{semantic-stickfunc-sticky-classes}) is highlighted, meaning the
+first line which describes the rest of the construct.
+
+See @code{semantic-stickfunc-mode} for putting a function in the
+header line.  This mode recycles the stickyfunc configuration
+classes list.
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end defun
+
+@defun semantic-highlight-func-current-tag-face
+@anchor{semantic-highlight-func-current-tag-face}
+Face used to show the top of current function.
+@end defun
+
+@node Tag Decoration Mode
+@subsection Tag Decoration Mode
+@cindex semantic-decoration-mode
+
+Decoration mode is a harness that allows any parsed tag to be
+decorated based on some arbitrary feature of that tag.  Decoration
+mode is actually a full harness for providing any kind of decoration
+on a tag based on a prefix function.
+
+@deffn Command semantic-decoration-mode &optional arg
+@anchor{semantic-decoration-mode}
+Minor mode for decorating tags.
+Decorations are specified in @code{semantic-decoration-styles}.
+You can define new decoration styles with
+@dfn{define-semantic-decoration-style}.
+With prefix argument @var{arg}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+To enable or disable specific decorations, you can use this function:
+
+@deffn Command semantic-toggle-decoration-style name &optional arg
+@anchor{semantic-toggle-decoration-style}
+Turn on/off the decoration style with @var{name}.
+Decorations are specified in @code{semantic-decoration-styles}.
+With prefix argument @var{arg}, turn on if positive, otherwise off.
+Return non-@code{nil} if the decoration style is enabled.
+@end deffn
+
+@subsubsection Available decoration modes
+
+There are several decoration modes that comes with semantic.
+
+@defun Command semantic-tag-boundary-mode &optional arg
+Place an overline in front of each long tag.
+
+@deffn Option semantic-tag-boundary-face
+@anchor{semantic-tag-boundary-face}
+Face used to show long tags in.
+Used by decoration style: @code{semantic-tag-boundary}.
+@end deffn
+
+@end defun
+
+
+@defun Command semantic-decoration-on-private-members-mode &optional arg
+Highlight class members that are designated as PRIVATE access.
+
+@deffn Option semantic-decoration-on-private-members-face
+@anchor{semantic-decoration-on-private-members-face}
+Face used to show privately scoped tags in.
+Used by the decoration style: @code{semantic-decoration-on-private-members}.
+@end deffn
+@end defun
+
+@defun Command semantic-decoration-on-protected-members-mode &optional arg
+Highlight class members that are designated as PROTECTED access.
+
+@deffn Option semantic-decoration-on-protected-members-face
+@anchor{semantic-decoration-on-protected-members-face}
+Face used to show protected scoped tags in.
+Used by the decoration style: @code{semantic-decoration-on-protected-members}.
+@end deffn
+@end defun
+
+@deffn Command semantic-decoration-on-includes  &optional arg
+Highlight class members that are includes.
+This mode provides a nice context menu on the include statements.
+Use the menus to ask questions and get help on configuring semantic.
+
+@deffn Option semantic-decoration-on-includes
+@anchor{semantic-decoration-on-includes}
+Overlay Face used on includes that are not in some other state.
+Used by the decoration style: @code{semantic-decoration-on-includes}.
+@end deffn
+
+@deffn Option semantic-decoration-on-unknown-includes
+@anchor{semantic-decoration-on-unknown-includes}
+Face used to show includes that cannot be found.
+Used by the decoration style: @code{semantic-decoration-on-unknown-includes}.
+@end deffn
+
+@deffn Option semantic-decoration-on-unparsed-includes
+@anchor{semantic-decoration-on-unparsed-includes}
+Face used to show includes that have not yet been parsed.
+Used by the decoration style: @code{semantic-decoration-on-unparsed-includes}.
+@end deffn
+
+@end deffn
+
+@subsubsection Create New Decoration Modes
+
+You can create new types of decorations using the following function:
+
+@defun define-semantic-decoration-style name doc &rest flags
+@anchor{define-semantic-decoration-style}
+Define a new decoration style with @var{name}.
+@var{doc} is a documentation string describing the decoration style @var{name}.
+It is appended to auto-generated doc strings.
+An Optional list of @var{flags} can also be specified.  Flags are:
+  @code{:enabled} <value>  - specify the default enabled value for @var{name}.
+
+
+This defines two new overload functions respectively called @code{NAME-p}
+and @code{NAME-highlight}, for which you must provide a default
+implementation in respectively the functions @code{NAME-p-default} and
+@code{NAME-highlight-default}.  Those functions are passed a tag.  @code{NAME-p}
+must return non-@code{nil} to indicate that the tag should be decorated by
+@code{NAME-highlight}.
+
+To put primary decorations on a tag @code{NAME-highlight} must use
+functions like @dfn{semantic-set-tag-face}, @dfn{semantic-set-tag-intangible},
+etc., found in the semantic-decorate library.
+
+To add other kind of decorations on a tag, @code{NAME-highlight} must use
+@dfn{semantic-decorate-tag}, and other functions of the semantic
+decoration @var{api} found in this library.
+@end defun
+
+
+@node MRU Bookmarks Mode
+@subsection MRU Bookmarks Mode
+@cindex semantic-mru-bookmark-mode
+
+MRU stands for Most Recently Used.  Semantic MRU Bookmarks track the
+tags you edit and maintain a ring of things you've been working on.
+You can then switch back to tags you've worked on recently by name.
+
+@deffn Command semantic-mru-bookmark-mode &optional arg
+@anchor{semantic-mru-bookmark-mode}
+Minor mode for tracking tag-based bookmarks automatically.
+Tag based bookmarks a tracked based on editing and viewing habits
+and can then be navigated via the @var{mru} bookmark keymap.
+
+With prefix argument @var{arg}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+Once this mode is enabled, any edit, or mark setting will add the
+current tag to your MRU bookmark ring.
+
+@table @kbd
+@item C-x B
+This keysequence is like @code{switch-to-buffer}, but uses a capital
+@kbd{B} instead of lower case.  This lets you type in a tag name, or
+use @kbd{M-p} and @kbd{M-n} to cycle through the bookmark list in
+MRU order.
+@end table
+
+
+
+@node Highlight Edits Mode
+@subsection Highlight Edits Mode
+
+Highlight edits mode is useful mostly for debugging the incremental
+parser.  As you change text, that effected text is highlighted, and
+you can visual predict what actions the incremental parser will need
+to make.
+
+@deffn Command semantic-highlight-edits-mode &optional arg
+Minor mode for highlighting changes made in a buffer.
+Changes are tracked by semantic so that the incremental parser can work
+properly.
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+@deffn Face semantic-highlight-edits-face
+Face used to show dirty tokens in @code{semantic-highlight-edits-mode}.
+@end deffn
+
+@node Parser State
+@subsection Parser State
+
+@deffn Command semantic-show-parser-state-mode &optional arg
+Minor mode for displaying parser cache state in the modeline.
+The cache can be in one of three states.  They are
+Up to date, Partial reparse needed, and Full reparse needed.
+The state is indicated in the modeline with the following characters:
+@table @code
+@item -
+The cache is up to date.
+@item !
+The cache requires a full update.
+@item ~
+The cache needs to be incrementally parsed.
+@item %
+The buffer is not lexically parseable.
+@item @@
+Auto-parse in progress (not set here.)
+@end table
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+@end deffn
+
+@node Unmatched Syntax Highlighting
+@subsection Unmatched Syntax Highlighting
+
+@deffn Command semantic-show-unmatched-syntax-mode &optional arg
+Minor mode to highlight unmatched syntax tokens.
+When a parser executes, some elements in the buffer may not match any
+parser rules.  These text characters are considered unmatched syntax.
+Often time, the display of unmatched syntax can expose coding
+problems before the compiler is run.
+
+With prefix argument @var{ARG}, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-@code{nil} if the
+minor mode is enabled.
+
+@kbd{C-c , `}		@dfn{semantic-show-unmatched-syntax-next}
+@end deffn
+
+@deffn Option semantic-unmatched-syntax-face
+Face used to show unmatched-syntax in.
+The face is used in  @dfn{semantic-show-unmatched-syntax-mode}.
+@end deffn
+
diff --git a/site/cedet-1.0pre7/semantic/doc/overview.texi b/site/cedet-1.0pre7/semantic/doc/overview.texi
new file mode 100644
index 0000000..70c4c03
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/overview.texi
@@ -0,0 +1,227 @@
+@ignore
+@node Overview
+@chapter Overview
+@c This 'ignore' section fools texinfo-all-menus-update into creating
+@c proper menus for this chapter.
+@end ignore
+
+This chapter gives the overview of @semantic{} and its goals.
+
+With Emacs, regular expressions (and syntax tables) are the basis of
+identifying components in a programming language source for purposes
+such as color highlighting.  This approach has proved is usefulness,
+but have limitations.
+
+@semantic{} provides a new infrastructure that goes far beyond text
+analysis based on regular expressions.
+
+@semantic{} uses @dfn{parsers} to analyze programming language
+sources.  For languages that can be described using a context-free
+grammar, parsers can be based on the grammar of the language.  Or they
+can be @dfn{external parsers} implemented using any means.  This
+allows the use of a regular expression parser for non-regular
+languages, or external programs for speed.
+
+@semantic{} provides extensive tools to help support a new language.
+An original @acronym{LL} parser, and a Bison-like @acronym{LALR}
+parser are included.  So, for a regular language, all that the
+developer needs to do is write a grammar file along with appropriate
+semantic rules.
+
+@semantic{} allows an uniform representation of language components,
+and provides a common @acronym{API} so that programmers can develop
+applications that work for all languages.  The distribution includes
+good set of tools and examples for the application writers, that
+demonstrate the usefulness of @semantic{}.
+
+The following diagram illustrates the benefits of using @semantic{}:
+
+@table @strong
+@item Please Note:
+The words in all-capital are those that @semantic{} itself provides.
+Others are current or future languages or applications that are not
+distributed along with @semantic{}.
+@end table
+
+@example
+                                                             Applications
+                                                                 and
+                                                              Utilities
+                                                                -------
+                                                               /       \
+               +---------------+    +--------+    +--------+
+         C --->| C      PARSER |--->|        |    |        |
+               +---------------+    |        |    |        |
+               +---------------+    | COMMON |    | COMMON |<--- SPEEDBAR
+      Java --->| JAVA   PARSER |--->|        |    |        |
+               +---------------+    | PARSE  |    | PARSE  |<--- SENATOR
+               +---------------+    |        |    |        |
+    Python --->| PYTHON PARSER |--->| TREE   |    | TREE   |<--- DOCUMENT
+               +---------------+    |        |    |        |
+               +---------------+    | FORMAT |    | API    |<--- SEMANTICDB
+    Scheme --->| SCHEME PARSER |--->|        |    |        |
+               +---------------+    |        |    |        |<--- jdee
+               +---------------+    |        |    |        |
+   Texinfo --->| TEXI.  PARSER |--->|        |    |        |<--- ecb
+               +---------------+    |        |    |        |
+
+                    ...                ...           ...         ...
+
+               +---------------+    |        |    |        |<--- app. 1
+   Lang. A --->| A      Parser |--->|        |    |        |
+               +---------------+    |        |    |        |<--- app. 2
+               +---------------+    |        |    |        |
+   Lang. B --->| B      Parser |--->|        |    |        |<--- app. 3
+               +---------------+    |        |    |        |
+
+                     ...        ...     ...          ...       ...
+
+               +---------------+    |        |    |        |
+   Lang. Y --->| Y      Parser |--->|        |    |        |<--- app. ?
+               +---------------+    |        |    |        |
+               +---------------+    |        |    |        |<--- app. ?
+   Lang. Z --->| Z      Parser |--->|        |    |        |
+               +---------------+    +--------+    +--------+
+@end example
+
+@ignore
+This is from the Overview chapter of the original semantic.texi.
+
+Semantic is a tool primarily for the Emacs-Lisp programmer.
+However, it comes with ``applications'' that non-programmer might
+find useful.
+This chapter is mostly for the benefit of these non-programmers
+as it gives brief descriptions of basic concepts such as
+grammars, parsers, compiler-compilers, parse-tree, etc.
+
+@cindex grammar
+The grammar of a natural language defines rules by which valid phrases
+and sentences can be composed using words, the fundamental units with
+which all sentences are created.
+@cindex context-free grammar
+In a similar fashion, a ``context-free grammar'' defines the rules by which
+programs can be composed using the fundamental units of the language,
+i.e., numbers, symbols, punctuations, etc.
+Context-free grammars are often specified in a well-known form called
+@cindex Backus-Naur Form
+@cindex BNF
+Backus-Naur Form, BNF for short.
+This is a systematic way of representing context-free grammars
+such that programs can read files with grammars written in BNF
+and generate code for ``parser'' of that language.
+@cindex yacc
+@cindex compiler-compiler
+YACC (Yet Another Compiler Compiler) is one such program that has been
+part of UNIX operating systems since the 1970's.
+YACC is pronounced the same as ``yak'', the long-haired ox found in Asia.
+The parser generated by YACC is usually a C program.
+@cindex bison
+@uref{http://www.gnu.org/software/bison/bison.html , Bison}
+is also a ``compiler compiler'' that takes BNF grammars and produces
+parsers in C language.
+The difference between YACC and Bison is that Bison is
+@cindex free software
+@uref{http://www.gnu.org/philosophy/free-sw.html , free software}
+and upward-compatible with YACC.
+It also comes with an excellent manual.
+
+Semantic is similar in spirit to YACC and Bison.
+@cindex bovinator
+Semantic, however, is referred to as a @dfn{bovinator} rather than
+as a parser, because it is a lesser cousin of YACC and Bison.
+It is lesser in that it does not perform a full parse
+like YACC or Bison.
+@cindex bovination
+Instead, it @dfn{bovinates}.
+``Bovination'' refers to partial parsing which
+@cindex parse tree
+creates @dfn{parse trees} of only the top most
+expressions rather than parsing every nested expression.
+This is sufficient for the purposes for which semantic was designed.
+Semantic is meant to be used within Emacs for providing
+editor-related features such as code browsers and translators rather
+than for compiling which requires far more complex and complete parsers.
+Semantic is not designed to be able to create full parse trees.
+
+@cindex parser
+One key benefit of semantic is that it creates parse trees
+@cindex bovine tree
+(perhaps the term @dfn{bovine tree} may be more accurate)
+with the same structure regardless of the type of language involved.
+Higher level applications written to work with bovine trees
+will then work with any language for which the grammar is available.
+For example, a code browser written today that supports C, C++, and
+Java may work without any change on other languages that do not even
+exist yet.
+All one has to do is to write the BNF specification for the new language.
+The rest of the work is done by semantic.
+For certain languages, it is hard if not impossible to specify the syntax
+of the language in BNF form, e.g.,
+@uref{http://www.texinfo.org ,texinfo}
+and other document oriented languages.
+Semantic provides a parser for texinfo nevertheless.
+Instead of BNF grammar, texinfo files are ``parsed'' using
+@ref{Regexps,regular-expressions,regular-expressions,emacs}.
+
+Semantic comes with grammars for these languages:
+
+@itemize @bullet
+@item C
+@item Emacs-Lisp
+@item java
+@item makefile
+@item scheme
+@end itemize
+
+Several tools employing semantic that provide user observable features
+are listed in @ref{Tools} section.
+
+@end ignore
+
+@menu
+* Semantic Components::         
+@end menu
+
+@node Semantic Components
+@section Semantic Components
+
+This chapter gives an overview of major components of @semantic{} and
+how they interact with each other to perform its job.
+
+The first step of parsing is to break up the input file into its
+fundamental components.  This step is called lexical analysis.  The
+output of the lexical analyzer is a list of tokens that make up the
+file.
+
+@example
+        syntax table, keywords list, and options
+                         |
+                         |
+                         v
+    input file  ---->  Lexer   ----> token stream
+@end example
+
+The next step is the parsing shown below.
+
+@example
+                    parser tables
+                         |
+                         v
+    token stream --->  Parser  ----> parse tree
+@end example
+
+The end result, the parse tree, is created based on the parser tables,
+which are in the internal representation of the language grammar used by
+@semantic{}.
+
+The @semantic{} database provides caching of the parse trees by saving them
+into files named @file{semantic.cache}, and automatically loading them
+when appropriate instead of re-parsing.  The reason for this is to save the
+time it takes to parse a file which could take several seconds or more
+for large files.
+
+Finally, @semantic{} provides an @acronym{API} for the Emacs Lisp
+programmer to access the information in the parse tree.
+
+
+@c  LocalWords:  API LALR
diff --git a/site/cedet-1.0pre7/semantic/doc/semantic-appdev.info b/site/cedet-1.0pre7/semantic/doc/semantic-appdev.info
new file mode 100644
index 0000000..aca792a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semantic-appdev.info
@@ -0,0 +1,4491 @@
+This is semantic-appdev.info, produced by makeinfo version 4.9 from
+app-dev-guide.texi.
+
+   This manual documents Application Development with Semantic.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+2009 Eric M. Ludlam Copyright (C) 2001, 2002, 2003, 2004 David Ponce
+Copyright (C) 2002, 2003 Richard Y. Kim
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic Application Writer's guide: (semantic-appdev).
+END-INFO-DIR-ENTRY
+
+   This file documents Application Development with Semantic.
+_Infrastructure for parser based text analysis in Emacs_
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam,
+David Ponce, and Richard Y. Kim
+
+
+File: semantic-appdev.info,  Node: Top,  Next: Semantic Tags,  Up: (dir)
+
+Semantic Application Development Manual
+***************************************
+
+A semantic application takes the semantic tags generated by semantic
+parsers then provides useful services to the user.  For a list of such
+applications, *note the Semantic User's Guide: (semantic-user)top.
+
+An application developer needs to know
+   * when to invoke the parser to generate or regenerate the tag lists.
+
+   * how to access the tag lists.
+
+   * how to access information about each tag.
+
+This chapter describes semantic functions and concepts an application
+developer needs to know to perform all of the tasks just listed.
+
+* Menu:
+
+* Semantic Tags::
+* Searching Tag Tables::        Searching tag tables.
+* Tags at Point::               Finding tags at point.
+* Tag Decoration::              Decorating tags
+* Tag Sorting::                 Reorganizing streams.
+* Tag Completion::              Completing read functions.
+* Override Methods::            Language dependent functions covering
+                                conversion to text strings, language dependent
+                                queries and local context information
+* Parser Features::             Application available parser features.
+* Semantic Database::           Persistent storage of tags.
+* Idle Scheduling::             Scheduling jobs in idle time.
+* Example Programs::            Simple programming examples.
+* Current Context::             Local context analysis.
+* Data Debugger::               Application Debugger
+* GNU Free Documentation License::
+* Index::
+
+
+File: semantic-appdev.info,  Node: Semantic Tags,  Next: Searching Tag Tables,  Prev: Top,  Up: Top
+
+1 Semantic Tags
+***************
+
+The end result of a semantic parser is a list of tags per each buffer.
+This chapter discusses the tag data structure and the API provided by
+semantic to query, process, and modify tags.
+
+The tags list for a buffer can be obtained by calling
+`semantic-fetch-tags' which returns a parse tree of tags that represent
+the program structure.
+
+* Menu:
+
+* Tag Basics::
+* Tag Query::
+* Tag Hooks::
+* Tag Overlay::
+* Misc Tag Functions::
+* Tag Internals::
+
+
+File: semantic-appdev.info,  Node: Tag Basics,  Next: Tag Query,  Up: Semantic Tags
+
+1.1 Tag Basics
+==============
+
+Currently each tag is a list with up to five elements:
+     (NAME CLASS ATTRIBUTES PROPERTIES OVERLAY)
+
+Application developers should not rely on this list structure.  Instead
+they should rely on the provided API documented in this chapter.  The
+list structure is explained here primarily to help those reading the
+semantic source code.
+
+   * NAME is a required component for all tags, i.e., every tag must
+     have this component. It is also guaranteed to be a string.  This
+     string represents the name of the tag, usually a named definition
+     which the language will use elsewhere as a reference to the
+     syntactic element found.
+
+   * CLASS is the other required component for all tags.  It is a
+     symbol representing the class of the tag.  Valid CLASSes can be
+     anything, as long is it is an Emacs Lisp symbol.  However
+     following are some of the well-known symbols: `type', `function',
+     `variable', `include', `package', `code'.
+
+   * ATTRIBUTES is a property list that keep information related to the
+     tag parsed from the buffer.
+
+     The symbol names in the property list can be anything, though
+     there is a useful set of predefined attributes.  It is best to use
+     the API functions to access the well-known properties.  *Note Tag
+     Query::.
+
+   * PROPERTIES is generated by the semantic parser harness, and need
+     not be provided by a language author.
+
+     Properties are used to store transient data on a tag unrelated to
+     the source of the original tag, such as hook functions, dynamic
+     overlays, or other data needed by programs.
+
+     The semantic incremental parser will attempt to maintain properties
+     when reparsing the source of a tag.
+
+   * OVERLAY represents positional information for this tag.  It is
+     automatically generated by the semantic parser harness, and need
+     not be provided by the language author.  Depending on the overlay
+     in a program can be dangerous because sometimes the overlay is
+     replaced with an integer pair
+          [ START END ]
+     when the buffer the tag belongs to is not in memory.  This happens
+     when a user has activated the Semantic Database  *note
+     (lang-support-guide)semanticdb::.
+
+ -- Function: semantic-tag-name tag
+     Return the name of TAG.  For functions, variables, classes,
+     typedefs, etc., this is the identifier that is being defined.  For
+     tags without an obvious associated name, this may be the statement
+     type, e.g., this may return `print' for python's print statement.
+
+     *Compatibility*: `semantic-tag-name' introduced in semantic
+     version 2.0 supercedes `semantic-token-name' which is now obsolete.
+
+ -- Function: semantic-tag-class tag
+     Return the class of TAG.  That is, the symbol `'variable',
+     `'function', `'type', or other.  There is no limit to the symbols
+     that may represent the class of a tag.  Each parser generates tags
+     with classes defined by it.
+
+     For functional languages, typical tag classes are:
+
+    `type'
+          Data types, named map for a memory block.
+
+    `function'
+          A function or method, or named execution location.
+
+    `variable'
+          A variable, or named storage for data.
+
+    `include'
+          Statement that represents a file from which more tags can be
+          found.
+
+    `package'
+          Statement that declares this file's package name.
+
+    `code'
+          Code that has not name or binding to any other symbol, such
+          as in a script.
+
+
+     *Compatibility*: `semantic-tag-class' introduced in semantic
+     version 2.0 supercedes `semantic-token-token' which is now
+     obsolete.
+
+Several functions that deal with ATTRIBUTES component are given in
+*Note Tag Attributes Internals: Tag Attributes Internals.  However
+functions listed in *Note Tag Query: Tag Query.  should provide most
+needs of the application developer.
+
+Similarly functions that deal with PROPERTIES component are given in
+*Note Tag Properties Internals: Tag Properties Internals.  The
+application developer should not need to use any of these.
+
+Finally *Note Tag Overlay: Tag Overlay. lists functions dealing with
+the OVERLAY component.
+
+
+File: semantic-appdev.info,  Node: Tag Query,  Next: Tag Hooks,  Prev: Tag Basics,  Up: Semantic Tags
+
+1.2 Tag Query
+=============
+
+This section lists functions that answers simple questions regarding a
+given tag.
+
+1.2.1 Tag Predicates
+--------------------
+
+ -- Function: semantic-tag-p tag
+     Return non-`nil' if TAG is most likely a semantic tag.
+
+     *Compatibility*: `semantic-tag-p' introduced in semantic version
+     2.0 supercedes `semantic-token-p' which is now obsolete.
+
+ -- Function: semantic-equivalent-tag-p tag1 tag2
+     Compare TAG1 and TAG2 and return non-`nil' if they are equivalent.
+     Use "equal" on elements the name, class, and position.  Use this
+     function if tags are being copied and regrouped to test for if two
+     tags represent the same thing, but may be constructed of different
+     cons cells.
+
+     *Compatibility*: `semantic-equivalent-tag-p' introduced in
+     semantic version 2.0 supercedes `semantic-equivalent-tokens-p'
+     which is now obsolete.
+
+ -- Function: semantic-tag-similar-p tag1 tag2
+     Test to see if TAG1 and TAG2 are similar.  Two tags are similar if
+     their name, datatype, and various attributes are the same.
+
+     Similar tags that have sub-tags such as arg lists or type members,
+     are similar w/out checking the sub-list of tags.
+
+ -- Function: semantic-tag-of-class-p tag class
+     Return non-`nil' if class of TAG is CLASS.
+
+ -- Function: semantic-tag-faux-p tag
+     Return non-`nil' if TAG is a FAUX tag.  FAUX tags are created to
+     represent a construct that is not known to exist in the code.
+
+     Example: When the class browser sees methods to a class, but
+     cannot find the class, it will create a faux tag to represent the
+     class to store those methods.
+
+ -- Function: semantic-tag-type-compound-p tag
+     Return non-`nil' the type of TAG is compound.  Compound implies a
+     structure or similar data type.  Returns the list of tag members
+     if it is compound.
+
+1.2.2 Documentation
+-------------------
+
+ -- Function: semantic-tag-docstring tag &optional buffer
+     Return the documentation of TAG.  That is the value defined by the
+     `:documentation' attribute.  Optional argument BUFFER indicates
+     where to get the text from.  If not provided, then only the
+     POSITION can be provided.
+
+     If you want to get documentation for languages that do not store
+     the documentation string in the tag itself, use
+     "semantic-documentation-for-tag" instead.
+
+     *Compatibility*: `semantic-tag-docstring' introduced in semantic
+     version 2.0 supercedes `semantic-token-docstring' which is now
+     obsolete.
+
+1.2.3 Common Flags
+------------------
+
+ -- Function: semantic-tag-variable-constant-p tag
+     Return non-`nil' if the variable that TAG describes is a constant.
+     That is the value of the attribute `:constant-flag'.
+
+     *Compatibility*: `semantic-tag-variable-constant-p' introduced in
+     semantic version 2.0 supercedes `semantic-token-variable-const'
+     which is now obsolete.
+
+ -- Function: semantic-tag-function-destructor-p tag
+     Return non-`nil' if TAG describes a destructor function.  That is
+     the value of the `:destructor-flag' attribute.
+
+     *Compatibility*: `semantic-tag-function-destructor-p' introduced
+     in semantic version 2.0 supercedes
+     `semantic-token-function-destructor' which is now obsolete.
+
+ -- Function: semantic-tag-function-throws tag
+     Return the exceptions the function that TAG describes can throw.
+     That is the value of the `:throws' attribute.
+
+     *Compatibility*: `semantic-tag-function-throws' introduced in
+     semantic version 2.0 supercedes `semantic-token-function-throws'
+     which is now obsolete.
+
+ -- Function: semantic-tag-modifiers tag
+     Return the value of the `:typemodifiers' attribute of TAG.
+
+     *Compatibility*: `semantic-tag-modifiers' introduced in semantic
+     version 2.0 supercedes `semantic-token-type-modifiers' which is
+     now obsolete.
+
+     *Compatibility*: `semantic-tag-modifiers' introduced in semantic
+     version 2.0 supercedes `semantic-token-variable-modifiers' which
+     is now obsolete.
+
+     *Compatibility*: `semantic-tag-modifiers' introduced in semantic
+     version 2.0 supercedes `semantic-token-function-modifiers' which
+     is now obsolete.
+
+1.2.4 Functions
+---------------
+
+ -- Function: semantic-tag-function-arguments tag
+     Return the arguments of the function that TAG describes.  That is
+     the value of the `:arguments' attribute.
+
+     *Compatibility*: `semantic-tag-function-arguments' introduced in
+     semantic version 2.0 supercedes `semantic-token-function-args'
+     which is now obsolete.
+
+1.2.5 Variables
+---------------
+
+ -- Function: semantic-tag-variable-default tag
+     Return the default value of the variable that TAG describes.  That
+     is the value of the attribute `:default-value'.
+
+     *Compatibility*: `semantic-tag-variable-default' introduced in
+     semantic version 2.0 supercedes `semantic-token-variable-default'
+     which is now obsolete.
+
+1.2.6 Data Types
+----------------
+
+ -- Function: semantic-tag-type tag
+     Return the value of the `:type' attribute of TAG.  For a function
+     it would be the data type of the return value.  For a variable, it
+     is the storage type of that variable.  For a data type, the type
+     is the style of datatype, such as struct or union.
+
+     *Compatibility*: `semantic-tag-type' introduced in semantic
+     version 2.0 supercedes `semantic-token-type' which is now obsolete.
+
+ -- Function: semantic-tag-of-type-p tag type
+     Compare TAG's type against TYPE.  Non `nil' if equivalent.  TYPE
+     can be a string, or a tag of class `'type'.  This can be complex
+     since some tags might have a `:type' that is a tag, while other
+     tags might just have a string.  This function will also be return
+     true of TAG's type is compared directly to the declaration of a
+     data type.
+
+1.2.7 Inheritance and Hierarchy
+-------------------------------
+
+ -- Function: semantic-tag-named-parent tag
+     Return the parent of TAG.  That is the value of the `:parent'
+     attribute.  If a definition can occur outside an actual parent
+     structure, but refers to that parent by name, then the `:parent'
+     attribute should be used.
+
+ -- Function: semantic-tag-function-parent tag
+     Return the parent of the function that TAG describes.  That is the
+     value of the `:parent' attribute.  A function has a parent if it
+     is a method of a class, and if the function does not appear in
+     body of its parent class.
+
+     *Compatibility*: `semantic-tag-function-parent' introduced in
+     semantic version 2.0 supercedes `semantic-token-function-parent'
+     which is now obsolete.
+
+ -- Function: semantic-tag-type-superclasses tag
+     Return the list of superclasses of the type that TAG describes.
+
+     *Compatibility*: `semantic-tag-type-superclasses' introduced in
+     semantic version 2.0 supercedes
+     `semantic-token-type-parent-superclass' which is now obsolete.
+
+     *Compatibility*: `semantic-tag-type-superclasses' introduced in
+     semantic version 2.0 supercedes `semantic-token-type-parent' which
+     is now obsolete.
+
+ -- Function: semantic-tag-type-interfaces tag
+     Return the list of interfaces of the type that TAG describes.
+
+     *Compatibility*: `semantic-tag-type-interfaces' introduced in
+     semantic version 2.0 supercedes
+     `semantic-token-type-parent-implement' which is now obsolete.
+
+     *Compatibility*: `semantic-tag-type-interfaces' introduced in
+     semantic version 2.0 supercedes `semantic-token-type-parent' which
+     is now obsolete.
+
+ -- Function: semantic-tag-type-members tag
+     Return the members of the type that TAG describes.  That is the
+     value of the `:members' attribute.
+
+     *Compatibility*: `semantic-tag-type-members' introduced in
+     semantic version 2.0 supercedes `semantic-token-type-parts' which
+     is now obsolete.
+
+1.2.8 Includes
+--------------
+
+ -- Function: semantic-tag-include-system-p tag
+     Return non-`nil' if the include that TAG describes is a system
+     include.  That is the value of the attribute `:system-flag'.
+
+     *Compatibility*: `semantic-tag-include-system-p' introduced in
+     semantic version 2.0 supercedes `semantic-token-include-system'
+     which is now obsolete.
+
+ -- Function: semantic-tag-include-filename tag
+     Return a filename representation of TAG.  The default action is to
+     return the "semantic-tag-name".  Some languages do not use full
+     filenames in their include statements.  Override this method to
+     translate the code represenation into a filename.  (A relative
+     filename if necessary.)
+
+     See "semantic-dependency-tag-file" to expand an include tag to a
+     full file name.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+1.2.9 Code
+----------
+
+ -- Function: semantic-tag-code-detail tag
+     Return detail information from code that TAG describes.  That is
+     the value of the attribute `:detail'.
+
+1.2.10 Tag Children
+-------------------
+
+ -- Function: semantic-tag-components tag
+     Return a list of components for TAG.  A Component is a part of TAG
+     which itself may be a TAG.  Examples include the elements of a
+     structure in a tag of class `type, or the list of arguments to a
+     tag of class `'function'.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-tag-components-default tag
+     Return a list of components for TAG.  Perform the described task
+     in "semantic-tag-components".
+
+ -- Function: semantic-tag-children-compatibility tag &optional
+          positiononly
+     Return children of TAG.  If POSITIONONLY is `nil', use
+     "semantic-tag-components".  If POSITIONONLY is non-`nil', use
+     "semantic-tag-components-with-overlays".  DO NOT use this fcn in
+     new code.  Use one of the above instead.
+
+     *Compatibility*: `semantic-tag-children-compatibility' introduced
+     in semantic version 2.0 supercedes `semantic-nonterminal-children'
+     which is now obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Overlay,  Next: Misc Tag Functions,  Prev: Tag Hooks,  Up: Semantic Tags
+
+1.3 Tag Overlay
+===============
+
+The functions in this answer questions regarding the overly such as the
+buffer in which the tags is located, the start and/or end position of
+the tag, and the overlay itself which spans the tags.
+
+ -- Function: semantic-tag-start tag
+     Return the start location of TAG.
+
+     *Compatibility*: `semantic-tag-start' introduced in semantic
+     version 2.0 supercedes `semantic-token-start' which is now
+     obsolete.
+
+ -- Function: semantic-tag-end tag
+     Return the end location of TAG.
+
+     *Compatibility*: `semantic-tag-end' introduced in semantic version
+     2.0 supercedes `semantic-token-end' which is now obsolete.
+
+ -- Function: semantic-tag-bounds tag
+     Return the location (START END) of data TAG describes.
+
+     *Compatibility*: `semantic-tag-bounds' introduced in semantic
+     version 2.0 supercedes `semantic-token-extent' which is now
+     obsolete.
+
+ -- Function: semantic-tag-in-buffer-p tag
+     Return the buffer TAG resides in IFF tag is already in a buffer.
+     If a tag is not in a buffer, return `nil'.
+
+ -- Function: semantic-tag-buffer tag
+     Return the buffer TAG resides in.  If TAG has an originating file,
+     read that file into a (maybe new) buffer, and return it.  Return
+     `nil' if there is no buffer for this tag.
+
+     *Compatibility*: `semantic-tag-buffer' introduced in semantic
+     version 2.0 supercedes `semantic-token-buffer' which is now
+     obsolete.
+
+ -- Function: semantic-tag-file-name tag
+     Return the name of the file from which TAG originated.  Return
+     `nil' if that information can't be obtained.  If TAG is from a
+     loaded buffer, then that buffer's filename is used.  If TAG is
+     unlinked, but has a `:filename' property, then that is used.
+
+ -- Function: semantic-tag-overlay tag
+     Return the OVERLAY part of TAG.  That is, an overlay or an
+     unloaded buffer representation.  This function can also return an
+     array of the form [ START END ].  This occurs for tags that are
+     not currently linked into a buffer.
+
+     *Compatibility*: `semantic-tag-overlay' introduced in semantic
+     version 2.0 supercedes `semantic-token-overlay' which is now
+     obsolete.
+
+ -- Function: semantic-tag-with-position-p tag
+     Return non-`nil' if TAG has positional information.
+
+     *Compatibility*: `semantic-tag-with-position-p' introduced in
+     semantic version 2.0 supercedes `semantic-token-with-position-p'
+     which is now obsolete.
+
+ -- Function: semantic-tag-components-with-overlays tag
+     Return the list of top level components belonging to TAG.
+     Children are any sub-tags which contain overlays.
+
+     Default behavior is to get "semantic-tag-components" in addition
+     to the components of an anonymous types (if applicable.)
+
+    *Language authors, please note:*
+          If a mode defines a language tag that has tags in it with
+          overlays you should still return them with this function.
+          Ignoring this step will prevent several features from working
+          correctly.  This function can be overloaded (see
+          "define-mode-local-override" for details).
+
+ -- Function: semantic-tag-components-with-overlays-default tag
+     Return the list of top level components belonging to TAG.
+     Children are any sub-tags which contain overlays.  The default
+     action collects regular components of TAG, in addition to any
+     components beloning to an anonymous type.
+
+
+File: semantic-appdev.info,  Node: Tag Hooks,  Next: Tag Overlay,  Prev: Tag Query,  Up: Semantic Tags
+
+1.4 Tag Hooks
+=============
+
+Individual tags can have hooks associated with them.  Hooks are saved
+as properties, but can cause specific tags to have special behaviors
+after a hook is added.
+
+You can manipulate tag hooks with these functions:
+
+ -- Function: semantic-tag-add-hook tag hook function &optional append
+     Onto TAG, add to the value of HOOK the function FUNCTION.
+     FUNCTION is added (if necessary) at the beginning of the hook list
+     unless the optional argument APPEND is non-`nil', in which case
+     FUNCTION is added at the end.  HOOK should be a symbol, and
+     FUNCTION may be any valid function.  See also the function
+     "add-hook".
+
+ -- Function: semantic-tag-remove-hook tag hook function
+     Onto TAG, remove from the value of HOOK the function FUNCTION.
+     HOOK should be a symbol, and FUNCTION may be any valid function.
+     If FUNCTION isn't the value of HOOK, or, if FUNCTION doesn't
+     appear in the list of hooks to run in HOOK, then nothing is done.
+     See also the function "remove-hook".
+
+For a developer, if you have an application for which you want to
+support a special kind of hook on a per tag basis, you can use this to
+run those hooks.
+
+ -- Function: semantic-tag-run-hooks tag hook &rest args
+     Run for TAG all expressions saved on the property HOOK.  Each hook
+     expression must take at least one argument, the TAG.  For any
+     given situation, additional ARGS may be passed.
+
+Semantic supports two TAG specific hooks at this time:
+
+`link-hook'
+     This hook is run whenever a tag is linked into a buffer.  This
+     occurs just after parsing, and whenever a tag is loaded into
+     memory.  This hook also executes after a database save, when all
+     tags are first unlinked from the current buffer before the save.
+
+`unlink-hook'
+     This hook is run whenever a tag is unlinked from a buffer.  This
+     occurs during a database save, or when a tag is modified by the
+     incremental parser.
+
+`unlink-copy-hook'
+     This hook is run whenever a tag is copied.  This occurs in the
+     function `semantic-tag-copy'.  Use this hook to remove properties
+     from the tag that link it to a buffer, as this tag should no longer
+     have direct buffer links.
+
+
+File: semantic-appdev.info,  Node: Misc Tag Functions,  Next: Tag Internals,  Prev: Tag Overlay,  Up: Semantic Tags
+
+1.5 Misc Tag Functions
+======================
+
+ -- Command: semantic-narrow-to-tag &optional tag
+     Narrow to the region specified by the bounds of TAG.  See
+     "semantic-tag-bounds".
+
+     *Compatibility*: `semantic-narrow-to-tag' introduced in semantic
+     version 2.0 supercedes `semantic-narrow-to-token' which is now
+     obsolete.
+
+ -- Function: semantic-with-buffer-narrowed-to-current-tag &rest body
+     Execute BODY with the buffer narrowed to the current tag.
+
+     *Compatibility*: `semantic-with-buffer-narrowed-to-current-tag'
+     introduced in semantic version 2.0 supercedes
+     `semantic-with-buffer-narrowed-to-current-token' which is now
+     obsolete.
+
+ -- Function: semantic-with-buffer-narrowed-to-tag tag &rest body
+     Narrow to TAG, and execute BODY.
+
+     *Compatibility*: `semantic-with-buffer-narrowed-to-tag' introduced
+     in semantic version 2.0 supercedes
+     `semantic-with-buffer-narrowed-to-token' which is now obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Internals,  Prev: Misc Tag Functions,  Up: Semantic Tags
+
+1.6 Tag Internals
+=================
+
+* Menu:
+
+* Tag Attributes Internals::
+* Tag Properties Internals::
+* Tag Overlay Internals::
+* Creating Tags::
+* Copying Tags::
+* Misc Tag Internals::
+
+
+File: semantic-appdev.info,  Node: Tag Attributes Internals,  Next: Tag Properties Internals,  Up: Tag Internals
+
+1.6.1 Tag Attributes Internals
+------------------------------
+
+ -- Function: semantic-tag-attributes tag
+     Return the list of public attributes of TAG.  That is a property
+     list: (ATTRIBUTE-1 VALUE-1 ATTRIBUTE-2 VALUE-2...).
+
+     *Compatibility*: `semantic-tag-attributes' introduced in semantic
+     version 2.0 supercedes `semantic-token-extra-specs' which is now
+     obsolete.
+
+     *Compatibility*: `semantic-tag-attributes' introduced in semantic
+     version 2.0 supercedes `semantic-token-function-extra-specs' which
+     is now obsolete.
+
+     *Compatibility*: `semantic-tag-attributes' introduced in semantic
+     version 2.0 supercedes `semantic-token-variable-extra-specs' which
+     is now obsolete.
+
+     *Compatibility*: `semantic-tag-attributes' introduced in semantic
+     version 2.0 supercedes `semantic-token-type-extra-specs' which is
+     now obsolete.
+
+ -- Function: semantic-tag-get-attribute tag attribute
+     From TAG, return the value of ATTRIBUTE.  ATTRIBUTE is a symbol
+     whose specification value to get.  Return the value found, or
+     `nil' if ATTRIBUTE is not one of the attributes of TAG.
+
+     *Compatibility*: `semantic-tag-get-attribute' introduced in
+     semantic version 2.0 supercedes `semantic-token-extra-spec' which
+     is now obsolete.
+
+     *Compatibility*: `semantic-tag-get-attribute' introduced in
+     semantic version 2.0 supercedes
+     `semantic-token-function-extra-spec' which is now obsolete.
+
+     *Compatibility*: `semantic-tag-get-attribute' introduced in
+     semantic version 2.0 supercedes
+     `semantic-token-variable-extra-spec' which is now obsolete.
+
+ -- Function: semantic-tag-put-attribute tag attribute value
+     Change value in TAG of ATTRIBUTE to VALUE.  If ATTRIBUTE already
+     exists, its value is set to VALUE, otherwise the new ATTRIBUTE
+     VALUE pair is added.  Return TAG.  Use this function in a parser
+     when not all attributes are known at the same time.
+
+     *Compatibility*: `semantic-tag-put-attribute' introduced in
+     semantic version 2.0 supercedes `semantic-token-add-extra-spec'
+     which is now obsolete.
+
+ -- Function: semantic-tag-put-attribute-no-side-effect tag attribute
+          value
+     Change value in TAG of ATTRIBUTE to VALUE without side effects.
+     All cons cells in the attribute list are replicated so that there
+     are no side effects if TAG is in shared lists.  If ATTRIBUTE
+     already exists, its value is set to VALUE, otherwise the new
+     ATTRIBUTE VALUE pair is added.  Return TAG.
+
+
+File: semantic-appdev.info,  Node: Tag Properties Internals,  Next: Tag Overlay Internals,  Prev: Tag Attributes Internals,  Up: Tag Internals
+
+1.6.2 Tag Properties Internals
+------------------------------
+
+ -- Function: semantic-tag-properties tag
+     Return the list of private properties of TAG.  That is a property
+     list: (PROPERTY-1 VALUE-1 PROPERTY-2 VALUE-2...).
+
+     *Compatibility*: `semantic-tag-properties' introduced in semantic
+     version 2.0 supercedes `semantic-token-properties' which is now
+     obsolete.
+
+ -- Function: semantic-tag-put-property tag property value
+     Change value in TAG of PROPERTY to VALUE.  If PROPERTY already
+     exists, its value is set to VALUE, otherwise the new PROPERTY
+     VALUE pair is added.  Return TAG.  That function is for internal
+     use only.
+
+     *Compatibility*: `semantic--tag-put-property' introduced in
+     semantic version 2.0 supercedes `semantic-token-put' which is now
+     obsolete.
+
+ -- Function: semantic-tag-get-property tag property
+     From TAG, extract the value of PROPERTY.  Return the value found,
+     or `nil' if PROPERTY is not one of the properties of TAG.  That
+     function is for internal use only.
+
+     *Compatibility*: `semantic--tag-get-property' introduced in
+     semantic version 2.0 supercedes `semantic-token-get' which is now
+     obsolete.
+
+ -- Function: semantic-tag-put-property-no-side-effect tag property
+          value
+     Change value in TAG of PROPERTY to VALUE without side effects.
+     All cons cells in the property list are replicated so that there
+     are no side effects if TAG is in shared lists.  If PROPERTY
+     already exists, its value is set to VALUE, otherwise the new
+     PROPERTY VALUE pair is added.  Return TAG.  That function is for
+     internal use only.
+
+     *Compatibility*: `semantic--tag-put-property-no-side-effect'
+     introduced in semantic version 2.0 supercedes
+     `semantic-token-put-no-side-effect' which is now obsolete.
+
+ -- Function: semantic-tag-make-plist args
+     Create a property list with ARGS.  Args is a property list of the
+     form (KEY1 VALUE1 ... KEYN VALUEN).  Where KEY is a symbol, and
+     VALUE is the value for that symbol.  The return value will be a
+     new property list, with these KEY/VALUE pairs eliminated:
+
+     - KEY associated to `nil' VALUE.    - KEY associated to an empty
+     string VALUE.    - KEY associated to a zero VALUE.
+
+     *Compatibility*: `semantic-tag-make-plist' introduced in semantic
+     version 2.0 supercedes `semantic-tag-make-assoc-list' which is now
+     obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Overlay Internals,  Next: Creating Tags,  Prev: Tag Properties Internals,  Up: Tag Internals
+
+1.6.3 Tag Overlay Internals
+---------------------------
+
+Many of the overlay related functions were already documented in *Note
+Tag Overlay: Tag Overlay.
+
+ -- Function: semantic-tag-set-bounds tag start end
+     In TAG, set the START and END location of data it describes.
+
+
+File: semantic-appdev.info,  Node: Creating Tags,  Next: Copying Tags,  Prev: Tag Overlay Internals,  Up: Tag Internals
+
+1.6.4 Creating Tags
+-------------------
+
+ -- Function: semantic-tag name class &rest attributes
+     Create a generic semantic tag.  NAME is a string representing the
+     name of this tag.  CLASS is the symbol that represents the class
+     of tag this is, such as `'variable', or `'function'.  ATTRIBUTES
+     is a list of additional attributes belonging to this tag.
+
+     *Compatibility*: `semantic-tag' introduced in semantic version 2.0
+     supercedes `semantic-token' which is now obsolete.
+
+ -- Function: semantic-tag-new-variable name type default-value &rest
+          attributes
+     Create a semantic tag of class `'variable'.  NAME is the name of
+     this variable.  TYPE is a string or semantic tag representing the
+     type of this variable.  DEFAULT-VALUE is a string representing the
+     default value of this variable.  ATTRIBUTES is a list of
+     additional attributes belonging to this tag.
+
+     *Compatibility*: `semantic-tag-new-variable' introduced in
+     semantic version 2.0 supercedes `semantic-token-new-variable'
+     which is now obsolete.
+
+ -- Function: semantic-tag-new-function name type arg-list &rest
+          attributes
+     Create a semantic tag of class `'function'.  NAME is the name of
+     this function.  TYPE is a string or semantic tag representing the
+     type of this function.  ARG-LIST is a list of strings or semantic
+     tags representing the arguments of this function.  ATTRIBUTES is a
+     list of additional attributes belonging to this tag.
+
+     *Compatibility*: `semantic-tag-new-function' introduced in
+     semantic version 2.0 supercedes `semantic-token-new-function'
+     which is now obsolete.
+
+ -- Function: semantic-tag-new-type name type members parents &rest
+          attributes
+     Create a semantic tag of class `'type'.  NAME is the name of this
+     type.  TYPE is a string or semantic tag representing the type of
+     this type.  MEMBERS is a list of strings or semantic tags
+     representing the elements that make up this type if it is a
+     composite type.  PARENTS is a cons cell.  (EXPLICIT-PARENTS .
+     INTERFACE-PARENTS) EXPLICIT-PARENTS can be a single string (Just
+     one parent) or a list of parents (in a multiple inheritance
+     situation).  It can also be `nil'.  INTERFACE-PARENTS is a list of
+     strings representing the names of all INTERFACES, or abstract
+     classes inherited from.  It can also be `nil'.  This slot can be
+     interesting because the form:      ( `nil' "string") is a valid
+     parent where there is no explicit parent, and only an interface.
+     ATTRIBUTES is a list of additional attributes belonging to this
+     tag.
+
+     *Compatibility*: `semantic-tag-new-type' introduced in semantic
+     version 2.0 supercedes `semantic-token-new-type' which is now
+     obsolete.
+
+ -- Function: semantic-tag-new-include name system-flag &rest attributes
+     Create a semantic tag of class `'include'.  NAME is the name of
+     this include.  SYSTEM-FLAG represents that we were able to
+     identify this include as belonging to the system, as opposed to
+     belonging to the local project.  ATTRIBUTES is a list of
+     additional attributes belonging to this tag.
+
+     *Compatibility*: `semantic-tag-new-include' introduced in semantic
+     version 2.0 supercedes `semantic-token-new-include' which is now
+     obsolete.
+
+ -- Function: semantic-tag-new-package name detail &rest attributes
+     Create a semantic tag of class `'package'.  NAME is the name of
+     this package.  DETAIL is extra information about this package,
+     such as a location where it can be found.  ATTRIBUTES is a list of
+     additional attributes belonging to this tag.
+
+     *Compatibility*: `semantic-tag-new-package' introduced in semantic
+     version 2.0 supercedes `semantic-token-new-package' which is now
+     obsolete.
+
+ -- Function: semantic-tag-new-code name detail &rest attributes
+     Create a semantic tag of class `'code'.  NAME is a name for this
+     code.  DETAIL is extra information about the code.  ATTRIBUTES is
+     a list of additional attributes belonging to this tag.
+
+
+File: semantic-appdev.info,  Node: Copying Tags,  Next: Misc Tag Internals,  Prev: Creating Tags,  Up: Tag Internals
+
+1.6.5 Copying Tags
+------------------
+
+There are two sets of tag copying features.  The first set is
+`semantic-tag-clone' and `semantic-tag-copy' which are used to make
+quick copies that share some detailed data with the original.
+
+The second type is `semantic-tag-deep-copy-one-tag', which replicates
+all the tags, and also allows filtering to mutate the tag.  In most
+cases, a clone or copy is sufficient.
+
+ -- Function: semantic-tag-clone tag &optional name
+     Clone TAG, creating a new TAG.  If optional argument NAME is not
+     `nil' it specifies a new name for the cloned tag.
+
+     *Compatibility*: `semantic-tag-clone' introduced in semantic
+     version 2.0 supercedes `semantic-clone-tag' which is now obsolete.
+
+ -- Function: semantic-tag-copy tag &optional name keep-file
+     Return a copy of TAG unlinked from the originating buffer.  If
+     optional argument NAME is non-`nil' it specifies a new name for the
+     copied tag.  If optional argument KEEP-FILE is non-`nil', and TAG
+     was linked to a buffer, the originating buffer file name is kept
+     in the `:filename' property of the copied tag.  This runs the tag
+     hook `unlink-copy-hook`.
+
+ -- Function: semantic-tag-deep-copy-one-tag tag &optional filter
+     Make a deep copy of TAG, applying FILTER to each child-tag.
+     Properties and overlay info are not copied.  FILTER takes TAG as
+     an argument, and should returns a semantic-tag.  It is safe for
+     FILTER to modify the input tag and return it.
+
+
+File: semantic-appdev.info,  Node: Misc Tag Internals,  Prev: Copying Tags,  Up: Tag Internals
+
+1.6.6 Misc Tag Internals
+------------------------
+
+ -- Function: semantic-tag-run-hooks tag hook &rest args
+     Run for TAG all expressions saved on the property HOOK.  Each hook
+     expression must take at least one argument, the TAG.  For any
+     given situation, additional ARGS may be passed.
+
+ -- Function: semantic-tag-unlink-from-buffer tag
+     Convert TAG from using an overlay to using an overlay proxy.  This
+     function is for internal use only.  This runs the tag hook
+     `unlink-hook'.  *Note Tag Hooks::
+
+ -- Function: semantic-tag-link-to-buffer tag
+     Convert TAG from using an overlay proxy to using an overlay.  This
+     function is for internal use only.  This runs the tag hook
+     `link-hook'.  *Note Tag Hooks::
+
+ -- Function: semantic-tag-unlink-list-from-buffer tags
+     Convert TAGS from using an overlay to using an overlay proxy.
+     This function is for internal use only.
+
+ -- Function: semantic-tag-link-list-to-buffer tags
+     Convert TAGS from using an overlay proxy to using an overlay.
+     This function is for internal use only.
+
+ -- Function: semantic-tag-unlink-cache-from-buffer
+     Convert all tags in the current cache to use overlay proxys.  This
+     function is for internal use only.
+
+ -- Function: semantic-tag-link-cache-to-buffer
+     Convert all tags in the current cache to use overlays.  This
+     function is for internal use only.
+
+ -- Function: semantic-tag-expanded-p tag
+     Return non-`nil' if TAG is expanded.  This function is for
+     internal use only.  See also the function `semantic--expand-tag'.
+
+ -- Function: semantic-tag-expand tag
+     Convert TAG from a raw state to a cooked state, and expand it.
+     Returns a list of cooked tags.
+
+     The parser returns raw tags with positional data START END at the
+     end of the tag data structure (a list for now).  We convert it from
+     that to a cooked state that uses an overlay proxy, that is, a
+     vector [START END].
+
+     The raw tag is changed with side effects and maybe expanded in
+     several derived tags when the variable
+     `semantic-tag-expand-function' is set.
+
+     This function is for internal use only.
+
+
+File: semantic-appdev.info,  Node: Searching Tag Tables,  Next: Tags at Point,  Prev: Semantic Tags,  Up: Top
+
+2 Searching Tag Tables
+**********************
+
+These functions take some key, and return information found in a tag
+table.  Some will return one tag (the first matching item found.)
+Others will return a list of all items matching a given criterion.
+Most of these functions work regardless of a buffer being in memory or
+not.
+
+Any specialty search routine that claims to use a function that is an
+overload method will need to execute in a buffer of the same mode as
+the tags being searched.
+
+If you are looking for a search across multiple files, see *Note
+Semantic Database::.
+
+* Menu:
+
+* Breadth Search::              Searching only one level of tags.
+* Deep Search::                 Deep searches into types or argument lists.
+* Specialty Search::            Specialty Searches.
+* Custom Search::               Write custom search routines.
+
+
+File: semantic-appdev.info,  Node: Breadth Search,  Next: Deep Search,  Up: Searching Tag Tables
+
+2.1 Breadth Search
+==================
+
+Searching the breadth of a list of tags means that only one level of
+the tags will be searched.  If one of the tags is a datatype with
+additional members, those members are not searched.
+
+ -- Function: semantic-find-first-tag-by-name name &optional table
+     Find the first tag with NAME in TABLE.  NAME is a string.  TABLE
+     is a semantic tags table.  See "semantic-something-to-tag-table".
+     This routine uses "assoc" to quickly find the first matching entry.
+
+ -- Function: semantic-find-tags-by-name name &optional table
+     Find all tags with NAME in TABLE.  NAME is a string.  TABLE is a
+     tag table.  See "semantic-something-to-tag-table".
+
+ -- Function: semantic-find-tags-for-completion prefix &optional table
+     Find all tags whos name begins with PREFIX in TABLE.  PREFIX is a
+     string.  TABLE is a tag table.  See
+     "semantic-something-to-tag-table".  While it would be nice to use
+     "try-completion" or "all-completions", those functions do not
+     return the tags, only a string.  Uses "compare-strings" for fast
+     comparison.
+
+ -- Function: semantic-find-tags-by-name-regexp regexp &optional table
+     Find all tags with name matching REGEXP in TABLE.  REGEXP is a
+     string containing a regular expression, TABLE is a tag table.  See
+     "semantic-something-to-tag-table".  Consider using
+     "semantic-find-tags-for-completion" if you are attempting to do
+     completions.
+
+ -- Function: semantic-find-tags-by-class class &optional table
+     Find all tags of class CLASS in TABLE.  CLASS is a symbol
+     representing the class of the token, such as `'variable', of
+     'function..  TABLE is a tag table.  See
+     "semantic-something-to-tag-table".
+
+ -- Function: semantic-find-tags-by-type type &optional table
+     Find all tags of with a type TYPE in TABLE.  TYPE is a string or
+     tag representing a data type as defined in the language the tags
+     were parsed from, such as "int", or perhaps a tag whose name is
+     that of a struct or class.  TABLE is a tag table.  See
+     "semantic-something-to-tag-table".
+
+ -- Function: semantic-find-tags-included &optional table
+     Find all tags in TABLE that are of the `'include' class.  TABLE is
+     a tag table.  See "semantic-something-to-tag-table".
+
+
+File: semantic-appdev.info,  Node: Deep Search,  Next: Specialty Search,  Prev: Breadth Search,  Up: Searching Tag Tables
+
+2.2 Deep Search
+===============
+
+ -- Function: semantic-brute-find-first-tag-by-name name streamorbuffer
+          &optional search-parts search-include
+     Find a tag NAME within STREAMORBUFFER.  NAME is a string.  If
+     SEARCH-PARTS is non-`nil', search children of tags.  If
+     SEARCH-INCLUDE is non-`nil', search include files.
+
+     Use "semantic-find-first-tag-by-name" instead.
+
+
+     *Compatibility*: `semantic-brute-find-first-tag-by-name'
+     introduced in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-name' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-by-property property value
+          streamorbuffer &optional search-parts search-includes
+     Find all tags with PROPERTY equal to VALUE in STREAMORBUFFER.
+     Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-property' introduced
+     in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-property' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-by-attribute attr streamorbuffer
+          &optional search-parts search-includes
+     Find all tags with a given ATTR in STREAMORBUFFER.  ATTR is a
+     symbol key into the attributes list.  Optional argument
+     SEARCH-PARTS and SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-attribute' introduced
+     in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-extra-spec' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-by-attribute-value attr value
+          streamorbuffer &optional search-parts search-includes
+     Find all tags with a given ATTR equal to VALUE in STREAMORBUFFER.
+     ATTR is a symbol key into the attributes list.  VALUE is the value
+     that ATTR should match.  Optional argument SEARCH-PARTS and
+     SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-attribute-value'
+     introduced in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-extra-spec-value' which is now
+     obsolete.
+
+ -- Function: semantic-brute-find-tag-by-position position
+          streamorbuffer &optional nomedian
+     Find a token covering POSITION within STREAMORBUFFER.  POSITION is
+     a number, or marker.  If NOMEDIAN is non-`nil', don't do the
+     median calculation, and return nil.
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-position' introduced
+     in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-position' which is now obsolete.
+
+ -- Function: semantic-brute-find-innermost-tag-by-position position
+          streamorbuffer &optional nomedian
+     Find a list of tags covering POSITION within STREAMORBUFFER.
+     POSITION is a number, or marker.  If NOMEDIAN is non-`nil', don't
+     do the median calculation, and return nil.  This function will
+     find the topmost item, and recurse until no more details are
+     available of findable.
+
+
+     *Compatibility*: `semantic-brute-find-innermost-tag-by-position'
+     introduced in semantic version 2.0 supercedes
+     `semantic-find-innermost-nonterminal-by-position' which is now
+     obsolete.
+
+ -- Function: semantic-brute-find-tag-by-class class streamorbuffer
+          &optional search-parts search-includes
+     Find all tags with a class CLASS within STREAMORBUFFER.  CLASS is
+     a symbol representing the class of the tags to find.  See
+     "semantic-tag-class".  Optional argument SEARCH-PARTS and
+     SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+     Use `semantic-find-tag-by-class' instead.
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-class' introduced in
+     semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-token' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-standard streamorbuffer &optional
+          search-parts search-includes
+     Find all tags in STREAMORBUFFER which define simple class types.
+     See "semantic-tag-class".  Optional argument SEARCH-PARTS and
+     SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+
+     *Compatibility*: `semantic-brute-find-tag-standard' introduced in
+     semantic version 2.0 supercedes
+     `semantic-find-nonterminal-standard' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-by-type type streamorbuffer
+          &optional search-parts search-includes
+     Find all tags with type TYPE within STREAMORBUFFER.  TYPE is a
+     string which is the name of the type of the tags returned.  See
+     "semantic-tag-type".  Optional argument SEARCH-PARTS and
+     SEARCH-INCLUDES are passed to
+     "semantic-brute-find-tag-by-function".
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-type' introduced in
+     semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-type' which is now obsolete.
+
+ -- Function: semantic-brute-find-tag-by-function function
+          streamorbuffer &optional search-parts search-includes
+     Find all tags for which FUNCTION's value is non-`nil' within
+     STREAMORBUFFER.  FUNCTION must return non-`nil' if an element of
+     STREAM will be included in the new list.
+
+     If optional argument SEARCH-PARTS is non-`nil', all sub-parts of
+     tags are searched.  The overloadable function
+     `semantic-tag-componenets' is used for the searching child lists.
+     If SEARCH-PARTS is the symbol `'positiononly', then only children
+     that have positional information are searched.
+
+     If SEARCH-INCLUDES is non-`nil', then all include files are also
+     searched for matches.  This parameter hasn't be active for a while
+     and is obsolete.
+
+
+     *Compatibility*: `semantic-brute-find-tag-by-function' introduced
+     in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-function' which is now obsolete.
+
+ -- Function: semantic-brute-find-first-tag-by-function function
+          streamorbuffer &optional search-parts search-includes
+     Find the first tag which FUNCTION match within STREAMORBUFFER.
+     FUNCTION must return non-`nil' if an element of STREAM will be
+     included in the new list.
+
+     The following parameters were never implemented.
+
+     If optional argument SEARCH-PARTS, all sub-parts of tags are
+     searched.  The overloadable function "semantic-tag-components" is
+     used for searching.  If SEARCH-INCLUDES is non-`nil', then all
+     include files are also searched for matches.
+
+
+     *Compatibility*: `semantic-brute-find-first-tag-by-function'
+     introduced in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-function-first-match' which is now
+     obsolete.
+
+
+File: semantic-appdev.info,  Node: Specialty Search,  Next: Custom Search,  Prev: Deep Search,  Up: Searching Tag Tables
+
+2.3 Specialty Search
+====================
+
+There are some specialty searches needed by some semantic tools that
+could prove useful.  These specialty searches often do not match
+against some single attribute as most breadth searches do.
+
+ -- Function: semantic-find-tags-of-compound-type &optional table
+     Find all tags which are a compound type in TABLE.  Compound types
+     are structures, or other data type which is not of a primitive
+     nature, such as int or double.  Used in completion.
+
+ -- Function: semantic-find-tags-by-scope-protection scopeprotection
+          parent &optional table
+     Find all tags accessible by SCOPEPROTECTION.  SCOPEPROTECTION is a
+     symbol which can be returned by the method
+     "semantic-tag-protection".  A hard-coded order is used to
+     determine a match.  PARENT is a tag representing the PARENT slot
+     needed for "semantic-tag-protection".  TABLE is a list of tags (a
+     subset of PARENT members) to scan.  If TABLE is `nil', the type
+     members of PARENT are used.  See "semantic-tag-protected-p" for
+     details on which tags are returned.
+
+ -- Function: semantic-find-tags-external-children-of-type type
+          &optional table
+     Find all tags in whose parent is TYPE in TABLE.  These tags are
+     defined outside the scope of the original TYPE declaration.  TABLE
+     is a tag table.  See "semantic-something-to-tag-table".
+
+ -- Function: semantic-find-tags-subclasses-of-type type &optional table
+     Find all tags of class type in whose parent is TYPE in TABLE.
+     These tags are defined outside the scope of the original TYPE
+     declaration.  TABLE is a tag table.  See
+     "semantic-something-to-tag-table".
+
+
+File: semantic-appdev.info,  Node: Custom Search,  Prev: Specialty Search,  Up: Searching Tag Tables
+
+2.4 Custom Search
+=================
+
+The searching framework for semantic for tag tables has two basic root
+methods.  One is a function and the other is a macro.  The functional
+version is needed if some sort of macro conflict arises.  The macro
+version is useful because it eliminates a level of function call, and
+is faster.
+
+ -- Function: semantic-find-tags-by-function predicate &optional table
+     Find tags for which PREDICATE is non-`nil' in TABLE.  PREDICATE is
+     a lambda expression which accepts on TAG.  TABLE is a semantic
+     tags table.  See "semantic-something-to-tag-table".
+
+ -- Function: semantic-find-tags-by-macro form &optional table
+     Find tags for which FORM is non-`nil' in TABLE.  TABLE is a
+     semantic tags table.  See "semantic-something-to-tag-table".
+
+
+File: semantic-appdev.info,  Node: Tags at Point,  Next: Tag Decoration,  Prev: Searching Tag Tables,  Up: Top
+
+3 Tags at Point
+***************
+
+When you need to get the tag the cursor is on, there is a more
+efficient mechanism than using `semantic-brute-find-tag-by-position'.
+This mechanism directly queries the overlays the parsing step leaves in
+the buffer.  This provides for very rapid retrieval of what function or
+variable the cursor is currently in.
+
+These functions query the current buffer's overlay system for tags.
+
+ -- Function: semantic-find-tag-by-overlay &optional positionormarker
+          buffer
+     Find all tags covering POSITIONORMARKER by using overlays.  If
+     POSITIONORMARKER is `nil', use the current point.  Optional BUFFER
+     is used if POSITIONORMARKER is a number, otherwise the current
+     buffer is used.  This finds all tags covering the specified
+     position by checking for all overlays covering the current spot.
+     They are then sorted from largest to smallest via the start
+     location.
+
+
+     *Compatibility*: `semantic-find-tag-by-overlay' introduced in
+     semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-overlay' which is now obsolete.
+
+ -- Function: semantic-find-tag-by-overlay-in-region start end
+          &optional buffer
+     Find all tags which exist in whole or in part between START and
+     END.  Uses overlays to determine position.  Optional BUFFER
+     argument specifies the buffer to use.
+
+
+     *Compatibility*: `semantic-find-tag-by-overlay-in-region'
+     introduced in semantic version 2.0 supercedes
+     `semantic-find-nonterminal-by-overlay-in-region' which is now
+     obsolete.
+
+ -- Function: semantic-find-tag-by-overlay-next &optional start buffer
+     Find the next tag after START in BUFFER.  If START is in an
+     overlay, find the tag which starts next, not the current tag.
+
+ -- Function: semantic-find-tag-by-overlay-prev &optional start buffer
+     Find the next tag before START in BUFFER.  If START is in an
+     overlay, find the tag which starts next, not the current tag.
+
+ -- Function: semantic-current-tag
+     Return the current tag in the current buffer.  If there are more
+     than one in the same location, return the smallest tag.  Return
+     `nil' if there is no tag here.
+
+
+     *Compatibility*: `semantic-current-tag' introduced in semantic
+     version 2.0 supercedes `semantic-current-nonterminal' which is now
+     obsolete.
+
+ -- Function: semantic-current-tag-parent
+     Return the current tags parent in the current buffer.  A tag's
+     parent would be a containing structure, such as a type containing
+     a field.  Return `nil' if there is no parent.
+
+
+     *Compatibility*: `semantic-current-tag-parent' introduced in
+     semantic version 2.0 supercedes
+     `semantic-current-nonterminal-parent' which is now obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Decoration,  Next: Tag Sorting,  Prev: Tags at Point,  Up: Top
+
+4 Tag Decoration
+****************
+
+Tags can be decorated in different ways.  One way a user can control it
+is through `semantic-decoration-mode'.  *note (Tag Decoration
+Mode)semantic-user::
+
+Applications can use the same routines to decorate tags as well.
+
+* Menu:
+
+* Tag Highlighting::            Highlighting a tag
+* Tag Visible Properties::      Invisible, intangible and read only
+* Tag Secondary Overlays::      Decorating parts of a tag text
+* Tag Folding::                 Visibly Folding up tags
+
+
+File: semantic-appdev.info,  Node: Tag Highlighting,  Next: Tag Visible Properties,  Up: Tag Decoration
+
+4.1 Highlighting
+================
+
+ -- Function: semantic-highlight-tag tag &optional face
+     Specify that TAG should be highlighted.  Optional FACE specifies
+     the face to use.
+
+     *Compatibility*: `semantic-highlight-tag' introduced in semantic
+     version 2.0 supercedes `semantic-highlight-token' which is now
+     obsolete.
+
+ -- Function: semantic-unhighlight-tag tag
+     Unhighlight TAG, restoring its previous face.
+
+     *Compatibility*: `semantic-unhighlight-tag' introduced in semantic
+     version 2.0 supercedes `semantic-unhighlight-token' which is now
+     obsolete.
+
+ -- Function: semantic-momentary-highlight-tag tag &optional face
+     Highlight TAG, removing highlighting when the user hits a key.
+     Optional argument FACE is the face to use for highlighting.  If
+     FACE is not specified, then `highlight' will be used.
+
+     *Compatibility*: `semantic-momentary-highlight-tag' introduced in
+     semantic version 2.0 supercedes
+     `semantic-momentary-highlight-token' which is now obsolete.
+
+The highlighting routines do their work by changing the face property
+of the tag overlay.  The raw routine is:
+
+ -- Function: semantic-set-tag-face tag face
+     Specify that TAG should use FACE for display.
+
+     *Compatibility*: `semantic-set-tag-face' introduced in semantic
+     version 2.0 supercedes `semantic-set-token-face' which is now
+     obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Visible Properties,  Next: Tag Secondary Overlays,  Prev: Tag Highlighting,  Up: Tag Decoration
+
+4.2 Changing a tag's visible properties
+=======================================
+
+You can give a tag other properties as well, such as making it
+invisible or intangible.  You can control how code is edited
+programatically through these routines.
+
+ -- Function: semantic-set-tag-invisible tag &optional visible
+     Enable the text in TAG to be made invisible.  If VISIBLE is
+     non-`nil', make the text visible.
+
+     *Compatibility*: `semantic-set-tag-invisible' introduced in
+     semantic version 2.0 supercedes `semantic-set-token-invisible'
+     which is now obsolete.
+
+ -- Function: semantic-tag-invisible-p tag
+     Return non-`nil' if TAG is invisible.
+
+     *Compatibility*: `semantic-tag-invisible-p' introduced in semantic
+     version 2.0 supercedes `semantic-token-invisible-p' which is now
+     obsolete.
+
+ -- Function: semantic-set-tag-intangible tag &optional tangible
+     Enable the text in TAG to be made intangible.  If TANGIBLE is
+     non-`nil', make the text visible.  This function does not have
+     meaning in XEmacs because it seems that the extent 'intangible'
+     property does not exist.
+
+     *Compatibility*: `semantic-set-tag-intangible' introduced in
+     semantic version 2.0 supercedes `semantic-set-token-intangible'
+     which is now obsolete.
+
+ -- Function: semantic-tag-intangible-p tag
+     Return non-`nil' if TAG is intangible.  This function does not
+     have meaning in XEmacs because it seems that the extent
+     'intangible' property does not exist.
+
+     *Compatibility*: `semantic-tag-intangible-p' introduced in
+     semantic version 2.0 supercedes `semantic-token-intangible-p'
+     which is now obsolete.
+
+ -- Function: semantic-set-tag-read-only tag &optional writable
+     Enable the text in TAG to be made read-only.  Optional argument
+     WRITABLE should be non-`nil' to make the text writable instead of
+     read-only.
+
+     *Compatibility*: `semantic-set-tag-read-only' introduced in
+     semantic version 2.0 supercedes `semantic-set-token-read-only'
+     which is now obsolete.
+
+ -- Function: semantic-tag-read-only-p tag
+     Return non-`nil' if the current TAG is marked read only.
+
+     *Compatibility*: `semantic-tag-read-only-p' introduced in semantic
+     version 2.0 supercedes `semantic-token-read-only-p' which is now
+     obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Secondary Overlays,  Next: Tag Folding,  Prev: Tag Visible Properties,  Up: Tag Decoration
+
+4.3 Secondary Overlays
+======================
+
+Each tag which is being visited in a buffer has one overlay.  This
+overlay is used to track where the tag is while a user is editing, and
+can also be used for fast tag identification, and some simple
+decoration techniques.
+
+A secondary overlay associates a new overlay object with a tag which
+does not cover the entire body of a tag.  You can then put visible
+features on that overlay to decorate portions of a tag.  This is how
+tag boundaries are drawn.
+
+4.3.1 Creation and Deletion
+---------------------------
+
+ -- Function: semantic-tag-create-secondary-overlay tag &optional
+          link-hook
+     Create a secondary overlay for TAG.  Returns an overlay.  The
+     overlay is also saved in TAG.  LINK-HOOK is a function called
+     whenever TAG is to be linked into a buffer.  It should take TAG
+     and OVERLAY as arguments.  The LINK-HOOK should be used to
+     position and set properties on the generated secondary overlay.
+
+ -- Function: semantic-tag-delete-secondary-overlay tag
+          overlay-or-property
+     Delete from TAG the secondary overlay OVERLAY-OR-PROPERTY.  If
+     OVERLAY-OR-PROPERTY is an overlay, delete that overlay.  If
+     OVERLAY-OR-PROPERTY is a symbol, find the overlay with that
+     property.
+
+4.3.2 Queries
+-------------
+
+ -- Function: semantic-tag-get-secondary-overlay tag property
+     Return secondary overlays from TAG with PROPERTY.  PROPERTY is a
+     symbol and all overlays with that symbol are returned..
+
+ -- Function: semantic-tag-secondary-overlays tag
+     Return a list of secondary overlays active on TAG.
+
+4.3.3 Linking and Unlinking
+---------------------------
+
+When a tag's file is put in a buffer, that tag is "linked" into the
+buffer.  When the buffer is deleted, the tag is "unlinked".  This
+process adds and removes the default overlay on the tag.  Secondary
+overlays use `semantic-tag-add-hook' and `semantic-tag-remove-hook' too
+apply link and unlink hooks.
+
+This allows the secondary overlays to be automatically removed or added
+by the secondary overlay system whenever a tag's file goes in or out of
+a buffeor.
+
+
+File: semantic-appdev.info,  Node: Tag Folding,  Prev: Tag Secondary Overlays,  Up: Tag Decoration
+
+4.4 Folding
+===========
+
+Using secondary overlays, a set of tag folding routines are made
+available.  These routines are similar to the tag visible properties.
+
+ -- Function: semantic-set-tag-folded tag &optional folded
+     Fold TAG, such that only the first line of text is shown.
+     Optional argument FOLDED should be non-`nil' to fold the tag.
+     `nil' implies the tag should be fully shown.
+
+ -- Function: semantic-tag-folded-p tag
+     Non-`nil' if TAG is currently folded.
+
+
+File: semantic-appdev.info,  Node: Tag Sorting,  Next: Tag Completion,  Prev: Tag Decoration,  Up: Top
+
+5 Tag Sorting
+*************
+
+Sometimes it is important to reorganize a tag stream into a form that
+is better for display to a user.  It is important to not use functions
+with side effects that could effect the tag cache.
+
+There are some existing utility functions which will reorganize the tag
+list for you.
+
+ -- Function: semantic-unique-tag-table tags
+     Scan a list of TAGS, removing duplicates.  This must first sort
+     the tags by position ascending.  TAGS are removed only if they are
+     equivalent, as can happen when multiple tag sources are scanned.
+
+ -- Function: semantic-unique-tag-table-by-name tags
+     Scan a list of TAGS, removing duplicate names.  This must first
+     sort the tags by name alphabetically ascending.
+
+ -- Function: semantic-bucketize tags &optional parent filter
+     Sort TAGS into a group of buckets based on tag class.  Unknown
+     classes are placed in a Misc bucket.  Type bucket names are
+     defined by either `semantic-symbol->name-assoc-list'.  If PARENT
+     is specified, then TAGS belong to this PARENT in some way.  This
+     will use `semantic-symbol->name-assoc-list-for-type-parts' to
+     generate bucket names.  Optional argument FILTER is a filter
+     function to be applied to each bucket.  The filter function will
+     take one argument, which is a list of tokens, and may re-organize
+     the list with side-effects.
+
+ -- Variable: semantic-bucketize-tag-class
+     Function used to get a symbol describing the class of a tag.  This
+     function must take one argument of a semantic tag.  It should
+     return a symbol found in `semantic-symbol->name-assoc-list' which
+     "semantic-bucketize" uses to bin up tokens.  To create new bins
+     for an application augment `semantic-symbol->name-assoc-list', and
+     `semantic-symbol->name-assoc-list-for-type-parts' in addition to
+     setting this variable (locally in your function).
+
+ -- Function: semantic-adopt-external-members tags
+     Rebuild TAGS so that externally defined members are regrouped.
+     Some languages such as C++ and CLOS permit the declaration of
+     member functions outside the definition of the class.  It is
+     easier to study the structure of a program when such methods are
+     grouped together more logically.
+
+     This function uses "semantic-tag-external-member-p" to determine
+     when a potential child is an externally defined member.
+
+     Note: Applications which use this function must account for token
+     types which do not have a position, but have children which *do*
+     have positions.
+
+     Applications should use `semantic-mark-external-member-function'
+     to modify all tags which are found as externally defined to some
+     type.  For example, changing the token type for generating extra
+     buckets with the bucket function.
+
+ -- Variable: semantic-orphaned-member-metaparent-type
+     In "semantic-adopt-external-members", the type of `'type' for
+     metaparents.  A metaparent is a made-up type semantic token used
+     to hold the child list of orphaned members of a named type.
+
+ -- Variable: semantic-mark-external-member-function
+     Function called when an externally defined orphan is found.  By
+     default, the token is always marked with the `adopted' property.
+     This function should be locally bound by a program that needs to
+     add additional behaviors into the token list.  This function is
+     called with two arguments.  The first is TOKEN which is a shallow
+     copy of the token to be modified.  The second is the PARENT which
+     is adopting TOKEN.  This function should return TOKEN (or a copy
+     of it) which is then integrated into the revised token list.
+
+
+File: semantic-appdev.info,  Node: Tag Completion,  Next: Override Methods,  Prev: Tag Sorting,  Up: Top
+
+6 Tag Completion
+****************
+
+Often time, it is useful to ask the user for the name of some tag.
+This can be as simple as just prompting for a name, but often time, the
+semantics can be quite complex.  If two tags have the same name, which
+do you choose?
+
+Semantic provides a completion engine for prompting for tags by name,
+and providing fancy ways to display completion lists that allow the
+user to choose a tag if several have the same name.
+
+To use a completion function in your interactive function, you can
+augment the "interactive" command like this:
+
+     (defun my-function (tag)
+        "Do something to TAG."
+        (interactive (list (my-completion-function "Tag: ")))
+        ...)
+
+* Menu:
+
+* Tag Completion Convenience Functions::  Provided functions
+* Custom Tag Completion Functions::  Build your own completion function
+* Old Tag Completion::          Completion functions from older releases
+
+
+File: semantic-appdev.info,  Node: Tag Completion Convenience Functions,  Next: Custom Tag Completion Functions,  Up: Tag Completion
+
+6.1 Tag Completion Convenience Functions
+========================================
+
+There are some pre written completion functions that can be used in your
+programs.
+
+ -- Function: semantic-complete-read-tag-buffer-deep prompt &optional
+          default-tag initial-input history
+     Ask for a tag by name from the current buffer.  Available tags are
+     from the current buffer, at any level.  Completion options are
+     presented in a traditional way, with highlighting to resolve
+     same-name collisions.  PROMPT is a string to prompt with.
+     DEFAULT-TAG is a semantic tag or string to use as the default
+     value.  If INITIAL-INPUT is non-`nil', insert it in the minibuffer
+     initially.  HISTORY is a symbol representing a variable to story
+     the history in.
+
+ -- Function: semantic-complete-read-tag-project prompt &optional
+          default-tag initial-input history
+     Ask for a tag by name from the current project.  Available tags
+     are from the current project, at the top level.  Completion
+     options are presented in a traditional way, with highlighting to
+     resolve same-name collisions.  PROMPT is a string to prompt with.
+     DEFAULT-TAG is a semantic tag or string to use as the default
+     value.  If INITIAL-INPUT is non-`nil', insert it in the minibuffer
+     initially.  HISTORY is a symbol representing a variable to store
+     the history in.
+
+ -- Function: semantic-complete-read-tag-analyzer prompt &optional
+          context history
+     Ask for a tag by name based on the current context.  The function
+     "semantic-analyze-current-context" is used to calculate the
+     context.  "semantic-analyze-possible-completions" is used to
+     generate the list of possible completions.  PROMPT is the first
+     part of the prompt.  Additional prompt is added based on the
+     contexts full prefix.  CONTEXT is the semantic analyzer context to
+     start with.  HISTORY is a symbol representing a variable to store
+     the history in.  usually a default-tag and initial-input are
+     available for completion prompts.  these are calculated from the
+     CONTEXT variable passed in.
+
+ -- Function: semantic-complete-inline-analyzer context
+     Complete a symbol name by name based on the current context.  This
+     is similar to `semantic-complete-read-tag-analyze', except that
+     the completion interaction is in the buffer where the context was
+     calculated from.  CONTEXT is the semantic analyzer context to
+     start with.  See `semantic-complete-inline-tag-engine' for details
+     on how completion works.
+
+
+File: semantic-appdev.info,  Node: Custom Tag Completion Functions,  Next: Old Tag Completion,  Prev: Tag Completion Convenience Functions,  Up: Tag Completion
+
+6.2 Custom Tag Completion Functions
+===================================
+
+There aren't many built in completion functions, but there are many
+parts that can be put together into custom completion functions.
+
+A completion function is built up of three important parts.
+
+Tag Collection
+     Something that selects tags, and provides some list of tags
+     available, such as all functions, or all classes named "bob".
+
+Typing and selecting
+     The prompt where you can type in the name of a tag.
+
+Displaying possible completion values
+     A mechanism for displaying completion lists.
+
+There is one typing and selecting routine that can be used to create
+your custom completion prompt.
+
+ -- Function: semantic-complete-read-tag-engine collector displayor
+          prompt default-tag initial-input history
+     Read a semantic tag, and return a tag for the selection.  Argument
+     COLLECTOR is an object which can be used to to calculate a list of
+     possible hits.  See `semantic-completion-collector-engine' for
+     details on COLLECTOR.  Argumeng DISPLAYOR is an object used to
+     display a list of possible completions for a given prefix.
+     See`semantic-completion-display-engine' for details on DISPLAYOR.
+     PROMPT is a string to prompt with.  DEFAULT-TAG is a semantic tag
+     or string to use as the default value.  If INITIAL-INPUT is
+     non-`nil', insert it in the minibuffer initially.  HISTORY is a
+     symbol representing a variable to story the history in.
+
+As you can see, this takes one "collector", and one "displayor".  These
+are objects created for this prompt at runtime.  The completion engine
+then uses to perform their tasks.
+
+For example:
+
+     (defun semantic-complete-read-tag-buffer-deep (prompt &optional
+     						      default-tag initial-input history)
+       "Ask for a tag by name from the current buffer.
+     PROMPT is a string to prompt with.
+     DEFAULT-TAG is a semantic tag or string to use as the default value.
+     If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+     HISTORY is a symbol representing a variable to story the history in."
+       (semantic-complete-read-tag-engine
+        (semantic-collector-buffer-deep prompt :buffer (current-buffer))
+        (semantic-displayor-traditional-with-focus-highlight "simple")
+        ;;(semantic-displayor-tooltip "simple")
+        prompt
+        default-tag
+        initial-input
+        history)
+       )
+
+* Menu:
+
+* Tag Collectors::
+* Tag Displayors::
+
+
+File: semantic-appdev.info,  Node: Tag Collectors,  Next: Tag Displayors,  Up: Custom Tag Completion Functions
+
+6.2.1 Tag Collectors
+--------------------
+
+A tag collector is an object that inherits from
+"semantic-collector-abstract".  A new collector is needed for each
+specialized type of prompt that draws from a different selection of
+tags.
+
+You can have a collector that satisfies multiple purposes using slots
+filled in the initializer for that object.
+
+Collectors inherit from some of the following:
+
+ -- Type: semantic-collector-abstract
+     Root class for completion engines.  The baseclass provides basic
+     functionality for interacting with a completion displayor object,
+     and tracking the current progress of a completion.
+
+ -- Type: semantic-collector-buffer-abstract
+     Root class for per-buffer completion engines.  These collectors
+     track themselves on a per-buffer basis.
+
+ -- Type: semantic-collector-project-abstract
+     Root class for project wide completion engines.  Uses semanticdb
+     for searching all tags in the current project.
+
+Available instantiable classes are:
+
+ -- Type: semantic-collector-buffer-deep
+     Completion engine for tags in the current buffer.  When searching
+     for a tag, uses semantic  deep search functions.  Basics search
+     only in the current buffer.
+
+ -- Type: semantic-collector-project
+     Completion engine for tags in a project.
+
+ -- Type: semantic-collector-project-brutish
+     Completion engine for tags in a project.
+
+ -- Type: semantic-collector-analyze-completions
+     Completion engine that uses the context analyzer to provide
+     options.  The only options available for completion are those
+     which can be logically inserted into the current context.
+
+NOTE: Add sections for writing new collectors.
+
+
+File: semantic-appdev.info,  Node: Tag Displayors,  Prev: Tag Collectors,  Up: Custom Tag Completion Functions
+
+6.2.2 Tag Displayors
+--------------------
+
+When a user is interacting with the prompt, and requests completion,
+those tags are drawn from the collector.  If the user asks for a list
+of completion by hitting a complete key twice, then the list of
+completions heeds to be displayed in some way.
+
+Displayors can be used to manage the display of all tags currently
+available, AND often needs to be used to focus one one particular tag
+of many in a visible way.
+
+All displayors inherit from the displayor baseclass that defines the
+default behaviors:
+
+ -- Type: semantic-displayor-abstract
+     Manages the display of some number of tags.  Provides the basics
+     for a displayor, including interacting with a collector, and
+     tracking tables of completion to display.
+
+ -- Type: semantic-displayor-focus-abstract
+     A displayor which has the ability to focus in on one tag.
+     Focusing is a way of differentiationg between multiple tags which
+     have the same name.
+
+Distinct implementations of displayors include:
+
+ -- Type: semantic-displayor-traditional
+     Traditional display mechanism for a list of possible completions.
+     Completions are showin in a new buffer and listed with the ability
+     to click on the items to aid in completion.
+
+ -- Type: semantic-displayor-traditional-with-focus-highlight
+     A traditional displayor which can focus on a tag by showing it.
+     Same as `semantic-displayor-traditional', but with selection
+     between multiple tags with the same name done by 'focusing' on the
+     source location of the different tags to differentiate them.
+
+
+ -- Type: semantic-displayor-tooltip
+     Display mechanism using tooltip for a list of possible completions.
+
+NOTE: Add sections for writing new collectors.
+
+
+File: semantic-appdev.info,  Node: Old Tag Completion,  Prev: Custom Tag Completion Functions,  Up: Tag Completion
+
+6.3 Older Tag Completion functions
+==================================
+
+These are older completion functions.  They may still be useful.
+
+ -- Function: semantic-read-symbol prompt &optional default stream
+          filter
+     Read a symbol name from the user for the current buffer.  PROMPT
+     is the prompt to use.  Optional arguments: DEFAULT is the default
+     choice.  If no default is given, one is read from under point.
+     STREAM is the list of tokens to complete from.  FILTER is provides
+     a filter on the types of things to complete.  FILTER must be a
+     function to call on each element.
+
+ -- Function: semantic-read-variable prompt &optional default stream
+     Read a variable name from the user for the current buffer.  PROMPT
+     is the prompt to use.  Optional arguments: DEFAULT is the default
+     choice.  If no default is given, one is read from under point.
+     STREAM is the list of tokens to complete from.
+
+ -- Function: semantic-read-function prompt &optional default stream
+     Read a function name from the user for the current buffer.  PROMPT
+     is the prompt to use.  Optional arguments: DEFAULT is the default
+     choice.  If no default is given, one is read from under point.
+     STREAM is the list of tags to complete from.
+
+ -- Function: semantic-read-type prompt &optional default stream
+     Read a type name from the user for the current buffer.  PROMPT is
+     the prompt to use.  Optional arguments: DEFAULT is the default
+     choice.  If no default is given, one is read from under point.
+     STREAM is the list of tags to complete from.
+
+
+File: semantic-appdev.info,  Node: Override Methods,  Next: Parser Features,  Prev: Tag Completion,  Up: Top
+
+7 Override Methods
+******************
+
+"Override methods" provide generic behaviors, which a given language
+can override.  For example, finding a dependency (required file) file
+in Emacs lisp can be done with the `locate-library' command (which
+overrides the default behavior.)  In C, a dependency (include file) can
+be found by searching a generic search path which can be passed in via
+a variable.
+
+If you plan to use one of these functions from a buffer that is not of
+the same major-mode as the original tag, you can use this form to make
+sure the correct action takes place:
+
+ -- Function: semantic-with-mode-bindings mode &rest body
+     Evaluate BODY with the local bindings of MODE.  The current mode
+     bindings are saved, BODY is evaluated, and the saved bindings are
+     restored, even in case of an abnormal exit.  Value is what BODY
+     returns.
+
+For more on override methods, *note (lang-support-guide)Semantic
+Overload Mechanism::.
+
+* Menu:
+
+* Format Tag::                  Converting Tokens into text strings
+* Tag Members::                 Tags in tags
+* Tag Details::                 Arbitrary token detail fetching
+* Tag File Reference::	        Files a tag references.
+* Jump to a Tag::	        Go to a tag's location
+* Making New Methods::          How to add your own methods for your own tool
+
+
+File: semantic-appdev.info,  Node: Format Tag,  Next: Tag Members,  Up: Override Methods
+
+7.1 Format Tag
+==============
+
+Any given tag consists of Meta information which is best viewed in some
+textual form.  This could be as simple as the tag's name, or as a
+prototype to be added to header file in C.  Not only are there several
+default converters from a Tag into text, but there is also some
+convenient variables that can be used with them.  Use these variables
+to allow options on output forms when displaying tags in your programs.
+
+ -- Variable: semantic-format-tag-functions
+     List of functions which convert a tag to text.  Each function must
+     take the parameters TAG &optional PARENT COLOR.  TAG is the tag to
+     convert.  PARENT is a parent tag or name which refers to the
+     structure or class which contains TAG.  PARENT is NOT a class
+     which a TAG would claim as a parent.  COLOR indicates that the
+     generated text should be colored using `font-lock'.
+
+ -- Variable: semantic-format-tag-custom-list
+     A List used by customizable variables to choose a tag to text
+     function.  Use this variable in the `:type' field of a
+     customizable variable.
+
+Every tag to text conversion function must take the same parameters,
+which are TAG, the tag to be converted, PARENT, the containing parent
+(like a structure which contains a variable), and COLOR, which is a
+flag specifying that color should be applied to the returned string.
+
+When creating, or using these strings, particularly with color, use
+"concat" to build up larger strings instead of "format".  This will
+preserve text properties.
+
+ -- Function: semantic-format-tag-name tag &optional parent color
+     Return the name string describing TAG.  The name is the shortest
+     possible representation.  Optional argument PARENT is the parent
+     type if TAG is a detail.  Optional argument COLOR means highlight
+     the prototype with font-lock colors.  This function can be
+     overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-format-tag-name' introduced in semantic
+     version 2.0 supercedes `semantic-name-nonterminal' which is now
+     obsolete.
+
+ -- Function: semantic-format-tag-abbreviate tag &optional parent color
+     Return an abbreviated string describing TAG.  The abbreviation is
+     to be short, with possible symbols indicating the type of tag, or
+     other information.  Optional argument PARENT is the parent type if
+     TAG is a detail.  Optional argument COLOR means highlight the
+     prototype with font-lock colors.  This function can be overloaded
+     (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-format-tag-abbreviate' introduced in
+     semantic version 2.0 supercedes `semantic-abbreviate-nonterminal'
+     which is now obsolete.
+
+ -- Function: semantic-format-tag-summarize tag &optional parent color
+     Summarize TAG in a reasonable way.  Optional argument PARENT is
+     the parent type if TAG is a detail.  Optional argument COLOR means
+     highlight the prototype with font-lock colors.  This function can
+     be overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-format-tag-summarize' introduced in
+     semantic version 2.0 supercedes `semantic-summerize-nonterminal'
+     which is now obsolete.
+
+ -- Function: semantic-format-tag-prototype tag &optional parent color
+     Return a prototype for TAG.  This function should be overloaded,
+     though it need not be used.  This is because it can be used to
+     create code by language independent tools.  Optional argument
+     PARENT is the parent type if TAG is a detail.  Optional argument
+     COLOR means highlight the prototype with font-lock colors.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+     *Compatibility*: `semantic-format-tag-prototype' introduced in
+     semantic version 2.0 supercedes `semantic-prototype-nonterminal'
+     which is now obsolete.
+
+ -- Function: semantic-format-tag-concise-prototype tag &optional
+          parent color
+     Return a concise prototype for TAG.  Optional argument PARENT is
+     the parent type if TAG is a detail.  Optional argument COLOR means
+     highlight the prototype with font-lock colors.  This function can
+     be overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-format-tag-concise-prototype'
+     introduced in semantic version 2.0 supercedes
+     `semantic-concise-prototype-nonterminal' which is now obsolete.
+
+ -- Function: semantic-format-tag-uml-abbreviate tag &optional parent
+          color
+     Return a UML style abbreviation for TAG.  Optional argument PARENT
+     is the parent type if TAG is a detail.  Optional argument COLOR
+     means highlight the prototype with font-lock colors.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+     *Compatibility*: `semantic-format-tag-uml-abbreviate' introduced
+     in semantic version 2.0 supercedes
+     `semantic-uml-abbreviate-nonterminal' which is now obsolete.
+
+ -- Function: semantic-format-tag-uml-prototype tag &optional parent
+          color
+     Return a UML style prototype for TAG.  Optional argument PARENT is
+     the parent type if TAG is a detail.  Optional argument COLOR means
+     highlight the prototype with font-lock colors.  This function can
+     be overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-format-tag-uml-prototype' introduced in
+     semantic version 2.0 supercedes
+     `semantic-uml-prototype-nonterminal' which is now obsolete.
+
+ -- Function: semantic-format-tag-uml-concise-prototype tag &optional
+          parent color
+     Return a UML style concise prototype for TAG.  Optional argument
+     PARENT is the parent type if TAG is a detail.  Optional argument
+     COLOR means highlight the prototype with font-lock colors.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+     *Compatibility*: `semantic-format-tag-uml-concise-prototype'
+     introduced in semantic version 2.0 supercedes
+     `semantic-uml-concise-prototype-nonterminal' which is now obsolete.
+
+ -- Function: semantic-format-tag-prin1 tag &optional parent color
+     Convert TAG to a string that is the print name for TAG.  PARENT
+     and COLOR are ignored.
+
+     *Compatibility*: `semantic-format-tag-prin1' introduced in
+     semantic version 2.0 supercedes `semantic-prin1-nonterminal' which
+     is now obsolete.
+
+An additional utility will return a string for just the data type of a
+tag.  This function is used in the above routines as well.
+
+ -- Function: semantic-format-tag-type tag color
+     Convert the data type of TAG to a string usable in tag formatting.
+     It is presumed that TYPE is a string or semantic tag.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+
+File: semantic-appdev.info,  Node: Tag Members,  Next: Tag Details,  Prev: Format Tag,  Up: Override Methods
+
+7.2 Tag Members
+===============
+
+Tags are often in a hierarchical form, meaning that a tag found in the
+top-level list may itself contain additional members.
+
+The following overridable functions can fetch those tags.
+
+ -- Function: semantic-tag-components tag
+     Return a list of components for TAG.  A Component is a part of TAG
+     which itself may be a TAG.  Examples include the elements of a
+     structure in a tag of class `type, or the list of arguments to a
+     tag of class `'function'.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-tag-components-with-overlays tag
+     Return the list of top level components belonging to TAG.
+     Children are any sub-tags which contain overlays.
+
+     Default behavior is to get "semantic-tag-components" in addition
+     to the components of an anonymous types (if applicable.)
+
+     Note for language authors:   If a mode defines a language tag that
+     has tags in it with overlays you should still return them with
+     this function.  Ignoring this step will prevent several features
+     from working correctly.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+Some languages can define parts of a tag outside the actual scope of
+the parent tag.  You can fetch information about them with these
+overload functions.
+
+ -- Function: semantic-tag-external-member-p parent tag
+     Return non-`nil' if PARENT is the parent of TAG.  TAG is an
+     external member of PARENT when it is somehow tagged as having
+     PARENT as its parent.  PARENT and TAG must both be semantic tags.
+
+     The default behavior, if not overridden with
+     `tag-external-member-p' is to match `:parent' attribute in the
+     name of TAG.
+
+     If this function is overridden, use
+     `semantic-tag-external-member-children-p-default' to also include
+     the default behavior, and merely extend your own.  This function
+     can be overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-tag-external-member-p' introduced in
+     semantic version 2.0 supercedes
+     `semantic-nonterminal-external-member-p' which is now obsolete.
+
+ -- Function: semantic-tag-external-member-children tag &optional usedb
+     Return the list of children which are not *in* TAG.  If optional
+     argument USEDB is non-`nil', then also search files in the
+     Semantic Database.  If USEDB is a list of databases, search those
+     databases.
+
+     Children in this case are functions or types which are members of
+     TAG, such as the parts of a type, but which are not defined inside
+     the class.  C++ and CLOS both permit methods of a class to be
+     defined outside the bounds of the class' definition.
+
+     The default behavior, if not overridden with
+     `tag-external-member-children' is to search using
+     "semantic-tag-external-member-p" in all top level definitions with
+     a parent of TAG.
+
+     If this function is overridden, use
+     "semantic-tag-external-member-children-default" to also include
+     the default behavior, and merely extend your own.  This function
+     can be overloaded (see "define-mode-local-override" for details).
+
+     *Compatibility*: `semantic-tag-external-member-children'
+     introduced in semantic version 2.0 supercedes
+     `semantic-nonterminal-external-member-children' which is now
+     obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag Details,  Next: Tag File Reference,  Prev: Tag Members,  Up: Override Methods
+
+7.3 Tag Details
+===============
+
+These functions help derive information about tags that may not be
+obvious for non-traditional languages with their own token types.
+
+ -- Function: semantic-tag-protection tag &optional parent
+     Return protection information about TAG with optional PARENT.
+     This function returns on of the following symbols:    `nil'
+     - No special protection.  Language dependent.     `'public'    -
+     Anyone can access this TAG.     `'private'   - Only methods in the
+     local scope can access TAG.     `'protected' - Like private for
+     outside scopes, like public for child                 classes.
+     Some languages may choose to provide additional return symbols
+     specific to themselves.  Use of this function should allow for
+     this.
+
+     The default behavior (if not overridden with `tag-protection' is
+     to return a symbol based on type modifiers.  This function can be
+     overloaded (see "define-mode-local-override" for details).  It
+     makes the overload "semantic-nonterminal-protection" obsolete.
+
+     *Compatibility*: `semantic-tag-protection' introduced in semantic
+     version 2.0 supercedes `semantic-nonterminal-protection' which is
+     now obsolete.
+
+ -- Function: semantic-tag-protected-p tag protection &optional parent
+     Non-`nil' if TAG is is protected.  PROTECTION is a symbol which
+     can be returned by the method "semantic-tag-protection".  PARENT
+     is the parent data type which contains TAG.
+
+     For these PROTECTIONs, true is returned if TAG is:
+    `nil'
+          Always true
+
+    private
+          True if `nil'.
+
+    protected
+          True if private or `nil'.
+
+    public
+          True if private, protected, or `nil'.
+
+ -- Function: semantic-tag-abstract-p tag &optional parent
+     Return non `nil' if TAG is abstract.  Optional PARENT is the
+     parent tag of TAG.  In UML, abstract methods and classes have
+     special meaning and behavior in how methods are overridden.  In
+     UML, abstract methods are italicized.
+
+     The default behavior (if not overridden with `tag-abstract-p' is
+     to return true if `abstract' is in the type modifiers.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).  It makes the overload "semantic-nonterminal-abstract"
+     obsolete.
+
+     *Compatibility*: `semantic-tag-abstract-p' introduced in semantic
+     version 2.0 supercedes `semantic-nonterminal-abstract' which is
+     now obsolete.
+
+ -- Function: semantic-tag-leaf-p tag &optional parent
+     Return non `nil' if TAG is leaf.  Optional PARENT is the parent
+     tag of TAG.  In UML, leaf methods and classes have special meaning
+     and behavior.
+
+     The default behavior (if not overridden with `tag-leaf-p' is to
+     return true if `leaf' is in the type modifiers.  This function can
+     be overloaded (see "define-mode-local-override" for details).  It
+     makes the overload "semantic-nonterminal-leaf" obsolete.
+
+     *Compatibility*: `semantic-tag-leaf-p' introduced in semantic
+     version 2.0 supercedes `semantic-tag-leaf' which is now obsolete.
+
+ -- Function: semantic-tag-static-p tag &optional parent
+     Return non `nil' if TAG is static.  Optional PARENT is the parent
+     tag of TAG.  In UML, static methods and attributes mean that they
+     are allocated in the parent class, and are not instance specific.
+     UML notation specifies that STATIC entries are underlined.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+     *Compatibility*: `semantic-tag-static-p' introduced in semantic
+     version 2.0 supercedes `semantic-tag-static' which is now obsolete.
+
+
+File: semantic-appdev.info,  Node: Tag File Reference,  Next: Jump to a Tag,  Prev: Tag Details,  Up: Override Methods
+
+7.4 Tag File Reference
+======================
+
+Some tags refer to some other file.
+
+For include files, these options help Semantic find those files:
+
+ -- Variable: semantic-dependency-system-include-path
+     Defines the system include path.  This should be set with either
+     "defvar-mode-local", or with "semantic-add-system-include".
+
+     When searching for a file associated with a name found in an tag of
+     class include, this path will be inspected for includes of type
+     `system'.  Some include tags are agnostic to this setting and will
+     check both the project and system directories.
+
+ -- Function: semantic-dependency-tag-file &optional tag
+     Find the filename represented from TAG.  Depends on
+     `semantic-dependency-include-path' for searching.  Always searches
+     `.' first, then searches additional paths.  This function can be
+     overloaded (see "define-mode-local-override" for details).  It
+     makes the overload "semantic-find-dependency" obsolete.
+
+     *Compatibility*: `semantic-dependency-tag-file' introduced in
+     semantic version 2.0 supercedes `semantic-find-dependency' which
+     is now obsolete.
+
+In languages with prototypes, such as C/C++, you can try to find a
+corresponding file where a prototype to some implementation lives.
+
+ -- Function: semantic-prototype-file buffer
+     Return a file in which prototypes belonging to BUFFER should be
+     placed.  Default behavior (if not overridden) looks for a token
+     specifying the prototype file, or the existence of an EDE variable
+     indicating which file prototypes belong in.  This function can be
+     overloaded (see "define-mode-local-override" for details).
+
+The semantic support for Texinfo lets you find references to functions
+in doc you might be maintaining.
+
+ -- Function: semantic-texi-find-documentation name &optional type
+     Find the function or variable NAME of TYPE in the texinfo source.
+     NAME is a string representing some functional symbol.  TYPE is a
+     string, such as "variable" or "Command" used to find the correct
+     definition in case NAME qualifies as several things.  When this
+     function exists, POINT is at the definition.  If the doc was not
+     found, an error is thrown.  Note: TYPE not yet implemented.
+
+
+File: semantic-appdev.info,  Node: Jump to a Tag,  Next: Making New Methods,  Prev: Tag File Reference,  Up: Override Methods
+
+7.5 Jump to a Tag
+=================
+
+Each tag has a file from which it came.  If a tag has been managed
+properly, you can jump to it with this function:
+
+ -- Function: semantic-go-to-tag tag &optional parent
+     Go to the location of TAG.  TAG may be a stripped element, in
+     which case PARENT specifies a parent tag that has position
+     information.  Different behaviors are provided depending on the
+     type of tag.  For example, dependencies (includes) will seek out
+     the file that is depended on (see "semantic-dependency-tag-file".
+     This function can be overloaded (see "define-mode-local-override"
+     for details).  It makes the overload "semantic-find-nonterminal"
+     obsolete.
+
+     *Compatibility*: `semantic-go-to-tag' introduced in semantic
+     version 2.0 supercedes `semantic-find-nonterminal' which is now
+     obsolete.
+
+When extracting tags from a database via search routines, those tags,
+by default, do not have the necessary information in them.  Be sure
+that when the database results are stripped, you use options that force
+that file information to be kept.
+
+
+File: semantic-appdev.info,  Node: Making New Methods,  Prev: Jump to a Tag,  Up: Override Methods
+
+7.6 Making New Methods
+======================
+
+The infrastructure for creating overridable methods base on major mode
+is handled by `mode-local.el' which is independent of semantic.
+
+To create your own application specific mode local function, you should
+use "define-overloadable-function".  This function creates the
+framework needed for different mode-authors to customize your
+applications.
+
+Once a function has been defined as mode-local, you should use
+"define-mode-local-override" to add a mode specific feature.
+
+ -- Function: define-overloadable-function name args docstring &rest
+          body
+     Define a new function, as with "defun" which can be overloaded.
+     NAME is the name of the function to create.  ARGS are the
+     arguments to the function.  DOCSTRING is a documentation string to
+     describe the function.  The docstring will automatically had
+     details about its overload symbol appended to the end.  BODY is
+     code that would be run when there is no override defined.  The
+     default is to call the function `NAME-default' with the appropriate
+     arguments.
+
+     BODY can also include an override form that specifies which part of
+     BODY is specifically overridden.  This permits to specify common
+     code run for both default and overridden implementations.  An
+     override form is one of:
+
+     1. `(:override [OVERBODY])'   2. `(:override-with-args OVERARGS
+     [OVERBODY])'
+
+     OVERBODY is the code that would be run when there is no override
+     defined.  The default is to call the function `NAME-default' with
+     the appropriate arguments deduced from ARGS.  OVERARGS is a list
+     of arguments passed to the override and `NAME-default' function,
+     in place of those deduced from ARGS.
+
+ -- Function: define-mode-local-override name mode args docstring &rest
+          body
+     Define a mode specific override of the function overload NAME.
+     Has meaning only if NAME has been created with "define-overload".
+     MODE is the major mode this override is being defined for.  ARGS
+     are the function arguments, which should match those of the same
+     named function created with "define-overload".  DOCSTRING is the
+     documentation string.  BODY is the implementation of this function.
+
+     *Compatibility*: `define-mode-local-override' introduced in
+     semantic version 2.0 supercedes
+     `define-mode-overload-implementation' which is now obsolete.
+
+You can also create variable values that are mode local.
+
+ -- Function: defvar-mode-local mode sym val &optional docstring
+     Define MODE local variable SYM with value VAL.  DOCSTRING is
+     optional.
+
+ -- Function: defconst-mode-local mode sym val &optional docstring
+     Define MODE local constant SYM with value VAL.  DOCSTRING is
+     optional.
+
+Mode local variables are implemented as buffer local.  Special hooks
+enable mode-local to set these variables for the mode specified.  To
+set a value as in code, you can use a special setq form.
+
+ -- Function: setq-mode-local mode &rest args
+     Assign new values to variables local in MODE.  MODE must be a
+     major mode symbol.  ARGS is a list (SYM VAL SYM VAL ...).  The
+     symbols SYM are variables; they are literal (not evaluated).  The
+     values VAL are expressions; they are evaluated.  Set each SYM to
+     the value of its VAL, locally in buffers already in MODE, or in
+     buffers switched to that mode.  Return the value of the last VAL.
+
+
+File: semantic-appdev.info,  Node: Parser Features,  Next: Semantic Database,  Prev: Override Methods,  Up: Top
+
+8 Parser Features
+*****************
+
+If you write a program that uses a tag table in a persistent display or
+database, it is necessary to know when tag tables change so that your
+displays can be updated.  This is especially important as tags can be
+replaced, changed, or deleted, and the associated overlays will then
+throw errors when you try to use them.  Complete integration with tag
+changes can be achieved via several hooks.
+
+If you write an application that frequenly accesses the tags tables, it
+is important to make sure those tags are up to date, and to make sure
+you application does not adversely effect all the other minor modes
+that may be running.
+
+The semantic parser has many features and hooks that applications can
+use to provide a good user experience.
+
+* Menu:
+
+* Editing Buffers::             Let the parser know you are changing a buffer.
+* Parser State::                Knowing if the tag table is out of date
+* Parser Hooks::                Knowing when tags change
+* Lexical Safety::              Preventing lexical errors from making a mess
+
+
+File: semantic-appdev.info,  Node: Editing Buffers,  Next: Parser State,  Up: Parser Features
+
+8.1 Editing Buffers
+===================
+
+One interesting way to interact with the parser is to let it know that
+changes you are going to make will not require re-parsing.
+
+ -- Variable: semantic-edits-are-safe
+     When non-`nil', modifications do not require a reparse.  This
+     prevents tokens from being marked dirty, and it prevents top level
+     edits from causing a cache check.  Use this when writing programs
+     that could cause a full reparse, but will not change the tag
+     structure, such as adding or updating top-level comments.
+
+
+File: semantic-appdev.info,  Node: Parser State,  Next: Parser Hooks,  Prev: Editing Buffers,  Up: Parser Features
+
+8.2 Parser State
+================
+
+It is sometimes useful to know what the current parsing state is.
+These function can let you know what level of re-parsing may be needed.
+Careful choices on when to reparse can make your program much faster.
+
+ -- Function: semantic-parse-tree-needs-update-p
+     Return non-`nil' if the current parse tree needs to be updated.
+
+ -- Function: semantic-parse-tree-needs-rebuild-p
+     Return non-`nil' if the current parse tree needs to be rebuilt.
+
+ -- Function: semantic-parse-tree-unparseable-p
+     Return non-`nil' if the current buffer has been marked unparseable.
+
+ -- Function: semantic-parse-tree-up-to-date-p
+     Return non-`nil' if the current parse tree is up to date.
+
+
+File: semantic-appdev.info,  Node: Parser Hooks,  Next: Lexical Safety,  Prev: Parser State,  Up: Parser Features
+
+8.3 Parser Hooks
+================
+
+If you just want to know when a buffer changes, use this hook.
+
+ -- Variable: semantic-after-toplevel-cache-change-hook
+     Hooks run after the buffer tag list has changed.  This list will
+     change when a buffer is reparsed, or when the tag list in a buffer
+     is cleared.  It is *NOT* called if the current tag list is
+     partially reparsed.
+
+     Hook functions must take one argument, which is the new list of
+     tags associated with this buffer.
+
+     For language specific hooks, make sure you define this as a local
+     hook.
+
+If you want tighter interaction with how the user is editing different
+tags, you can use this hook instead.
+
+ -- Variable: semantic-after-partial-cache-change-hook
+     Hooks run after the buffer cache has been updated.
+
+     This hook will run when the cache has been partially reparsed.
+     Partial reparses are incurred when a user edits a buffer, and only
+     the modified sections are rescanned.
+
+     Hook functions must take one argument, which is the list of tokens
+     updated in the current buffer.
+
+     For language specific hooks, make sure you define this as a local
+     hook.
+
+It is also useful to clean up any data your application is using when
+semantic flushes its tags table.
+
+ -- Variable: semantic-before-toplevel-cache-flush-hook
+     Hooks run before the toplevel tag cache is flushed.  For language
+     specific hooks, make sure you define this as a local hook.  This
+     hook is called before a corresponding
+     `semantic-after-toplevel-cache-change-hook' which is also called
+     during a flush when the cache is given a new value of `nil'.
+
+
+File: semantic-appdev.info,  Node: Lexical Safety,  Prev: Parser Hooks,  Up: Parser Features
+
+8.4 Lexical Safety
+==================
+
+If you application frequenly requests lists of tags upon user request,
+it may be important to avoid lexical problems that frequenly occur when
+the user has partially written an expression, such as starting a
+string, or argument list.
+
+You can protect your code from lexical problems with this macro:
+
+ -- Function: semantic-lex-catch-errors symbol &rest forms
+     Using SYMBOL, execute FORMS catching lexical errors.  If FORMS
+     results in a call to the parser that throws a lexical error, the
+     error will be caught here without the buffer's cache being thrown
+     out of date.  If there is an error, the syntax that failed is
+     returned.  If there is no error, then the last value of FORMS is
+     returned.
+
+It is important to provide a good SYMBOL so that these macros can nest
+correctly.
+
+If you want your code to run anyway, even if there is a lexical error,
+using this macro like this:
+
+     (semantic-lex-catch-errors
+        (semantic-fetch-tags))
+
+will put the parser into the 'unparseable' state, and allow other
+routines to request the tag table without incurring additional parser
+attempts.
+
+
+File: semantic-appdev.info,  Node: Semantic Database,  Next: Idle Scheduling,  Prev: Parser Features,  Up: Top
+
+9 Semantic Database
+*******************
+
+Semanticdb is a database mechanism for storing tags parsed by semantic.
+The database operates in the background, saving tags as they are
+parsed between sessions.  When a file is read in, and there is a
+previously created set of tags available for it, semanticdb will save
+time by not parsing the file, and using the cached copy.
+
+In applications, semanticdb can provide access to the sum of all tags
+in a project or in the basic system.  This database can then be
+searched using a set of special routines.
+
+* Menu:
+
+* Semanticdb in Programs::      Basic usage.
+* Semanticdb Tag Queries::      Searching for tokens in the databases.
+* System Databases::            Special kinds of databases for system tags.
+* Semanticdb references::       Tables can refer to eachother.
+
+
+File: semantic-appdev.info,  Node: Semanticdb in Programs,  Next: Semanticdb Tag Queries,  Up: Semantic Database
+
+9.1 Semanticdb in Programs::
+============================
+
+If you write a program using semanticdb, you will probably want to make
+sure it is active in your program.
+
+ -- Function: semanticdb-minor-mode-p
+     Return non-`nil' if `semanticdb-minor-mode' is active.
+
+Since semanticdb is optional, it is best if a program can gracefully
+degrade service when semanticdb is not available, or to throw an error
+letting the user know it is required to be active.
+
+At the simplest level, you can ask if a given file is in the database,
+receiving a tag table.  Semanticdb will give you an accurate set of
+tags just by asking.
+
+ -- Function: semanticdb-file-stream file
+     Return a list of tags belonging to FILE.  If file has database
+     tags available in the database, return them.  If file does not
+     have tags available, then load the file, and create them.
+
+Alternately, you can get the table object for a file by asking for it.
+
+ -- Function: semanticdb-file-table-object file &optional dontload
+     Return a semanticdb table belonging to FILE.  If file has database
+     tags available in the database, return it.  If file does not have
+     tags available, and DONTLOAD is `nil', then load the tags for
+     FILE, and create a new table object for it.  DONTLOAD does not
+     affect the creation of new database objects.
+
+
+File: semantic-appdev.info,  Node: Semanticdb Tag Queries,  Next: System Databases,  Prev: Semanticdb in Programs,  Up: Semantic Database
+
+9.2 Semanticdb Tag Queries
+==========================
+
+You can search for tags in the semantic database using the
+semanticdb-find API.  It is important to note that database search
+functions do not return a plain list of tags.  This is because some
+tags may not be loaded in a buffer, which means that the found tag
+would not have an overlay, and no way to determine where it came from.
+
+As such, all search functions return a special Database Results list.
+
+There are several types of searches, divided into groups by
+implementation.  While it is possible to add new types of searches, or
+write custom searches, the built in searches are usually the only ones
+available in system backends *Note System Databases::.
+
+When the term brute or brutish is used as a search criteria, that is
+distinguishing between an include-path based search, and a search that
+scans everything available in a project.
+
+Non-brute force searches assume that all symbols available in a given
+buffer are on the search path, or in some file that has been included,
+imported, or otherwise indicated in the source file itself.  While not
+always true for interpreted languages (such as Emacs Lisp), it is
+common among declaritive languages.
+
+Sometimes a brute force approach is needed, scanning every file
+available to the database.  You may want to do this if your application
+is collecting data unrelated to a file currently being worked on.
+
+* Menu:
+
+* DB Results::                  Accessing the results of a search.
+* DB Search Paths::             The list of tables to search.
+* DB Basic Name Search::        Searches based on name.
+* DB Data Type Search::         Searches for datatypes.
+* DB Basic Brute Search::       Searches on common tag attributes.
+* DB Advanced Search::          Complex searches on associations
+* DB Generic Search::           Do It Yourself search criteria
+
+
+File: semantic-appdev.info,  Node: DB Results,  Next: DB Search Paths,  Up: Semanticdb Tag Queries
+
+9.2.1 DB Results
+----------------
+
+The successful result of a search returns a special list of the
+following form:
+
+        ( (DATABASE TAG1 TAG2 ...) (DATABASE2 TAG3 TAG4 ...) ...)
+
+It should not be necessary to access the results in this way, however,
+as there are several routines that can be used to access this list.
+
+To turn a semanticdb search result into a simple tag table, use:
+
+ -- Function: semanticdb-strip-find-results results &optional
+          find-file-match
+     Strip a semanticdb search RESULTS to exclude objects.  This makes
+     it appear more like the results of a `semantic-find-' call.
+     Optional FIND-FILE-MATCH loads all files associated with RESULTS
+     into buffers.  This has the side effect of enabling
+     "semantic-tag-buffer" to return a value.  If the input RESULTS are
+     not going to be used again, and if FIND-FILE-MATCH is `nil', you
+     can use "semanticdb-fast-strip-find-results" instead.
+
+ -- Function: semanticdb-fast-strip-find-results results
+     Destructively strip a semanticdb search RESULTS to exclude objects.
+     This makes it appear more like the results of a `semantic-find-'
+     call.  This is like "semanticdb-strip-find-results", except the
+     input list RESULTS will be changed.
+
+To write a function that accepts a tag table, or a semanticdb search
+result, use this to test if it is a semanticdb search result:
+
+ -- Function: semanticdb-find-results-p resultp
+     Non-`nil' if RESULTP is in the form of a semanticdb search result.
+     This query only really tests the first entry in the list that is
+     RESULTP, but should be good enough for debugging assertions.
+
+ -- Function: semanticdb-find-result-with-nil-p resultp
+     Non-`nil' of RESULTP is in the form of a semanticdb search result.
+     `nil' is a valid value where a TABLE usually is, but only if the
+     TAG results include overlays.  This query only really tests the
+     first entry in the list that is RESULTP, but should be good enough
+     for debugging assertions.
+
+To operate on the search results as though it were a simple tags table,
+or plain list, use these routines.
+
+ -- Function: semanticdb-find-result-length result
+     Number of tags found in RESULT.
+
+ -- Function: semanticdb-find-result-nth result n
+     In RESULT, return the Nth search result.  This is a 0 based search
+     result, with the first match being element 0.
+
+     The returned value is a cons cell: (TAG . TABLE) where TAG is the
+     tag at the Nth position.  TABLE is the semanticdb table where the
+     TAG was found.  Sometimes TABLE can be `nil'.
+
+ -- Function: semanticdb-find-result-nth-in-buffer result n
+     In RESULT, return the Nth search result.  Like
+     "semanticdb-find-result-nth", except that only the TAG is
+     returned, and the buffer it is found it will be made current.  If
+     the result tag has no position information, the originating buffer
+     is still made current.
+
+ -- Function: semanticdb-find-result-mapc fcn result
+     Apply FCN to each element of find RESULT for side-effects only.
+     FCN takes two arguments.  The first is a TAG, and the second is a
+     DB from whence TAG originated.  Returns result.
+
+
+File: semantic-appdev.info,  Node: DB Search Paths,  Next: DB Basic Name Search,  Prev: DB Results,  Up: Semanticdb Tag Queries
+
+9.2.2 DB Search Paths
+---------------------
+
+For searches based on an include path (non-brutish) a path of tables
+needs to be generated.  Searching a lot of tables is slow, which is why
+a brutish search is not always recommended.  An include-based approach
+can also generate a lot of tables, so you can control how detailed a
+search is with a throttle variable.
+
+Ideally, each language mode will have a mode-specific value for this
+throttle value.  A user can also specify their own values if the
+default is not good enough.
+
+ -- Variable: semanticdb-find-default-throttle
+     The default throttle for `semanticdb-find' routines.  The throttle
+     controls how detailed the list of database tables is for a symbol
+     lookup.  The value is a list with the following keys:
+
+    `file'
+          The file the search is being performed from.  This option is
+          here for completeness only, and is assumed to always be on.
+
+    `local'
+          Tables from the same local directory are included.  This
+          includes files directly referenced by a file name which might
+          be in a different directory.
+
+    `project'
+          Tables from the same local project are included If `project'
+          is specified, then `local' is assumed.
+
+    `unloaded'
+          If a table is not in memory, load it.  If it is not cached on
+          disk either, get the source, parse it, and create the table.
+
+    `system'
+          Tables from system databases.  These are specifically tables
+          from system header files, or language equivalent.
+
+    `recursive'
+          For include based searches, includes tables referenced by
+          included files.
+
+    `omniscience'
+          Included system databases which are omniscience, or somehow
+          know everything.  Omniscience databases are found in
+          `semanticdb-project-system-databases'.  The Emacs Lisp system
+          DB is an omniscience database.
+
+
+You can use the command `semanticdb-find-test-translate-path' to
+interactively test out how the path translator is working.  The path
+translation routines are:
+
+ -- Function: semanticdb-find-translate-path path brutish
+     Translate PATH into a list of semantic tables.  Path translation
+     involves identifying the PATH input argument in one of the
+     following ways:   `nil' - Take the current buffer, and use its
+     include list   buffer - Use that buffer's include list.
+     filename - Use that file's include list.  If the file is not
+     in a buffer, see of there is a semanticdb table for it.  If
+     not, read that file into a buffer.    tag - Get that tag's buffer
+     of file file.  See above.    table - Search that table, and its
+     include list.    find result - Search the results of a previous
+     find.
+
+     In addition, once the base path is found, there is the possibility
+     of each added table adding yet more tables to the path, so this
+     routine can return a lengthy list.
+
+     If argument BRUTISH is non-`nil', then instead of using the include
+     list, use all tables found in the parent project of the table
+     identified by translating PATH.  Such searches use brute force to
+     scan every available table.
+
+     The return value is a list of objects of type "semanticdb-table" or
+     its children.  In the case of passing in a find result, the result
+     is returned unchanged.
+
+     This routine uses "semanticdb-find-table-for-include" to translate
+     specific include tags into a semanticdb table.
+
+     Note: When searching using a non-brutish method, the list of
+     included files will be cached between runs.  Database-references
+     are used to track which files need to have their include lists
+     refreshed when things change.  See "semanticdb-ref-test".  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+ -- Function: semanticdb-find-table-for-include includetag &optional
+          table
+     For a single INCLUDETAG found in TABLE, find a "semanticdb-table"
+     object INCLUDETAG is a semantic TAG of class `'include'.  TABLE as
+     defined by "semantic-something-to-tag-table" to identify where the
+     tag came from.  TABLE is optional if INCLUDETAG has an overlay of
+     `:filename' attribute.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+TODO : Make this next part show up somewhere better.
+
+Each major mode should define their local include path with
+`defcustom-mode-local-semantic-dependency-system-include-path'.  This
+macro builds a customizable variable that is kept in sync with the
+mode-local variable, and any include decorations that are active.
+
+ -- Function:
+defcustom-mode-local-semantic-dependency-system-include-path mode name
+          value &optional docstring
+     Create a mode-local value of the system-dependency include path.
+     MODE is the `major-mode' this name/value pairs is for.  NAME is
+     the name of the customizable value users will use.  VALUE is the
+     path to add.  DOCSTRING is a documentation string applied to the
+     variable NAME users will customize.
+
+     Creates a customizable variable users can customize that will keep
+     semantic data structures up to date.
+
+
+File: semantic-appdev.info,  Node: DB Basic Name Search,  Next: DB Data Type Search,  Prev: DB Search Paths,  Up: Semanticdb Tag Queries
+
+9.2.3 DB Basic Name Search
+--------------------------
+
+These searches scan a database table collection for tags based on name.
+They are divided into normal and deep searches.  A deep search, as
+with in buffer tag scanning, implies that all entries are scanned,
+including those in type declarations.
+
+Normal Searches:
+
+ -- Function: semanticdb-find-tags-by-name name &optional path
+          find-file-match
+     Search for all tags matching NAME on PATH.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-find-tags-by-name-regexp regexp &optional path
+          find-file-match
+     Search for all tags matching REGEXP on PATH.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-find-tags-for-completion prefix &optional path
+          find-file-match
+     Search for all tags matching PREFIX on PATH.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-find-tags-by-class class &optional path
+          find-file-match
+     Search for all tags of CLASS on PATH.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+Deep Searches:
+
+ -- Function: semanticdb-deep-find-tags-by-name name &optional path
+          find-file-match
+     Search for all tags matching NAME on PATH.  Search also in all
+     components of top level tags founds.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-deep-find-tags-by-name-regexp regexp &optional
+          path find-file-match
+     Search for all tags matching REGEXP on PATH.  Search also in all
+     components of top level tags founds.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-deep-find-tags-for-completion prefix &optional
+          path find-file-match
+     Search for all tags matching PREFIX on PATH.  Search also in all
+     components of top level tags founds.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+
+File: semantic-appdev.info,  Node: DB Data Type Search,  Next: DB Basic Brute Search,  Prev: DB Basic Name Search,  Up: Semanticdb Tag Queries
+
+9.2.4 DB Data Type Search
+-------------------------
+
+In typed languages, datatypes are looked up frequently in order to
+provide smart completions.  Semantic has a specialized datatype search
+that builds a cache of all datatypes on the include path.  Once this is
+built the first time, datatype lookups become very fast.
+
+Since it takes a long time to make a typecache the first time, you can
+have your tool decide if it wants to do work based on the existence of
+a typecache.
+
+ -- Function: semanticdb-have-typecache-p table
+     Return non-`nil' (the typecache) if TABLE has a pre-calculated
+     typecache.
+
+ -- Function: semanticdb-get-typecache table
+     Retrieve the typecache from the semanticdb TABLE.  If there is no
+     table, create one, and fill it in.
+
+Searching doesn't require a typecache.  You can just pass in a database
+table, or path, much the way most semantic database searches work.
+
+ -- Function: semanticdb-typecache-find type &optional path
+     Search the typecache for TYPE in PATH.  If type is a string, split
+     the string, and search for the parts.  If type is a list, treat
+     the type as a pre-split string.  PATH can be `nil' for the current
+     buffer, or a semanticdb table.  This function can be overloaded
+     (see "define-mode-local-override" for details).
+
+You can debug the typecache with this routine:
+
+ -- Command: semanticdb-typecache-dump
+     Dump the typecache for the current buffer.
+
+
+File: semantic-appdev.info,  Node: DB Basic Brute Search,  Next: DB Advanced Search,  Prev: DB Data Type Search,  Up: Semanticdb Tag Queries
+
+9.2.5 DB Basic Brute Search
+---------------------------
+
+These searches allow searching on specific attributes of tags,  such as
+name, type, or other attribute.
+
+ -- Function: semanticdb-brute-deep-find-tags-by-name name &optional
+          path find-file-match
+     Search for all tags matching NAME on PATH.  See
+     "semanticdb-find-translate-path" for details on PATH.  The
+     argument BRUTISH will be set so that searching includes all tables
+     in the current project.  FIND-FILE-MATCH indicates that any time a
+     matchi is found, the file associated wit that tag should be loaded
+     into a buffer.
+
+
+File: semantic-appdev.info,  Node: DB Advanced Search,  Next: DB Generic Search,  Prev: DB Basic Brute Search,  Up: Semanticdb Tag Queries
+
+9.2.6 DB Advanced Search
+------------------------
+
+These are searches that were needed to accomplish some  specialized
+tasks as discovered in utilities.  Advanced searches  include matching
+methods defined outside some parent class.
+
+The reason for advanced searches are so that external  repositories
+such as the Emacs obarray, or java `.class' files can  quickly answer
+these needed questions without dumping the entire  symbol list into
+Emacs for a regular semanticdb search.
+
+ -- Function: semanticdb-find-tags-external-children-of-type type
+          &optional path find-file-match
+     Search for all tags defined outside of TYPE w/ TYPE as a parent.
+     See "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+ -- Function: semanticdb-find-tags-subclasses-of-type type &optional
+          path find-file-match
+     Search for all tags of class type defined that subclass TYPE.  See
+     "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+
+File: semantic-appdev.info,  Node: DB Generic Search,  Prev: DB Advanced Search,  Up: Semanticdb Tag Queries
+
+9.2.7 DB Generic Search
+-----------------------
+
+If you would like to write your own search routine, you can the generic
+tag collector.  It will map your function across valid semantic
+databases.
+
+ -- Function: semanticdb-find-tags-collector function &optional path
+          find-file-match brutish
+     Collect all tags returned by FUNCTION over PATH.  The FUNCTION
+     must take two arguments.  The first is TABLE, which is a
+     semanticdb table containing tags.  The second argument to FUNCTION
+     is TAGS.  TAGS may be a list of tags.  If TAGS is non-`nil', then
+     FUNCTION should search the TAG list, not through TABLE.
+
+     See "semanticdb-find-translate-path" for details on PATH.
+     FIND-FILE-MATCH indicates that any time a match is found, the file
+     associated with that tag should be loaded into a buffer.
+
+     Note: You should leave FIND-FILE-MATCH as `nil'.  It is far more
+     efficient to take the results from any search and use
+     "semanticdb-strip-find-results" instead.  This argument is here
+     for backward compatibility.
+
+     If optional argument BRUTISH is non-`nil', then ignore include
+     statements, and search all tables in this project tree.
+
+
+File: semantic-appdev.info,  Node: System Databases,  Next: Semanticdb references,  Prev: Semanticdb Tag Queries,  Up: Semantic Database
+
+9.3 System Databases
+====================
+
+System Databases are special implementations of the database and table
+API which make some external tag source appear as though it were a
+normal buffer with semantic parsed tags available.
+
+Search routines for these databases return a special type of table not
+associated with a file.  It is important to be aware of this possible
+return value.
+
+ -- Type: semanticdb-project-database-emacs-lisp
+     Database representing Emacs core.
+
+This Emacs database is loaded automatically.
+
+ -- Type: semanticdb-project-database-ebrowse
+     Semantic Database deriving tags using the EBROWSE tool.  EBROWSE
+     is a C/C++ parser for use with `ebrowse' Emacs program.
+
+To create new EBROWSE project databases, use:
+
+ -- Command: semanticdb-create-ebrowse-database dir
+     Create an EBROWSE database for directory DIR.  The database file
+     is stored in ~/.semanticdb, or whichever directory is specified by
+     `semanticdb-default-system-save-directory'.
+
+
+File: semantic-appdev.info,  Node: Semanticdb references,  Prev: System Databases,  Up: Semantic Database
+
+9.4 Semanticdb References
+=========================
+
+Semantic database can keep references to eachother.  The semanticdb
+search routine `semanticdb-find-translate-path' will keep the
+references up-to date whenever you do a semanticdb search.  Whenever a
+buffer is reparsed, all caches are synchronized through the reference
+tables.
+
+The reference mechanism will let you identify references in either
+direction.
+
+This routine will return a list of TAGS that refer to some database.
+Use the routine `semanticdb-find-table-for-include' to conver these
+include tags into tables.
+
+ -- Function: semanticdb-includes-in-table dbt
+     Return a list of direct includes in table DBT.
+
+To run a function against all semantic tables that refer to the current
+table, use this routine:
+
+ -- Function: semanticdb-notify-references dbt method
+     Notify all references of the table DBT using method.  METHOD takes
+     two arguments.    (METHOD TABLE-TO-NOTIFY DBT) TABLE-TO-NOTIFY is
+     a semanticdb-table which is being notified.  DBT, the second
+     argument is DBT.
+
+The following routines will help keep things up-to-date:
+
+ -- Function: semanticdb-check-references dbt
+     Check and cleanup references in the database DBT.  Any reference
+     to a file that cannot be found, or whos file no longer refers to
+     DBT will be removed.
+
+To debug references, use this routine:
+
+ -- Command: semanticdb-ref-test refresh
+     Dump out the list of references for the current buffer.  If
+     REFRESH is non-`nil', cause the current table to have its
+     references refreshed before dumping the result.
+
+
+File: semantic-appdev.info,  Node: Idle Scheduling,  Next: Example Programs,  Prev: Semantic Database,  Up: Top
+
+10 Idle Scheduling
+******************
+
+The Semantic Idle Scheduler is a minor mode which performs semantic
+specific tasks in idle time.  See *note (semantic-user.info)Idle
+Scheduler::.
+
+It performs the following tasks in order:
+
+  1. Reprarse the current buffer if needed
+
+  2. Reparse other buffers that need it
+
+  3. Execute other scheduled semantic related operations.
+
+Care is take in the idle scheduler to exit immediately if user input is
+detected, improving editing performance.
+
+The reason for grouping these tasks together is so that the automatic
+reparsing code executes before other idle services.  This allows
+lexically broken buffers to be detected so that the other applications
+that follow do not accidentally reparse the buffer leaving unmatched
+syntax all over.
+
+You can create new minor modes that are automatically scheduled by the
+semantic idle scheduler.  Create the new minor mode with:
+
+ -- Function: define-semantic-idle-service name doc &rest forms
+     Create a new idle services with NAME.  DOC will be a documentation
+     string describing FORMS.  FORMS will be called during idle time
+     after the current buffer's semantic tag information has been
+     updated.  This routines creates the following functions and
+     variables:
+
+10.1 User Input Handling
+========================
+
+When writing an idle service, it is important for tasks that can take a
+long time to correctly exit upon user input.
+
+You can test for user input in your idle handler with the following
+routines:
+
+ -- Function: semantic-throw-on-input from
+     Exit with "throw" when in "semantic-exit-on-input" on user input.
+     FROM is an indication of where this function is called from as a
+     value to pass to "throw".  It is recommended to use the name of
+     the function calling this one.
+
+If you need to carefully extract from your function, you can wrap just
+a section of your function to exit on user input by wrapping it with
+this macro:
+
+ -- Function: semantic-exit-on-input symbol &rest forms
+     Using SYMBOL as an argument to "throw", execute FORMS.  If FORMS
+     includes a call to `semantic-thow-on-input', then if a user
+     presses any key during execution, this form macro will exit with
+     the value passed to "semantic-throw-on-input".  If FORMS
+     completes, then the return value is the same as "progn".
+
+Upon catching user input, you can try to detect if there was an exit
+from the return argument, and continue throwing with an additional call
+to `semantic-throw-on-input'.
+
+
+File: semantic-appdev.info,  Node: Example Programs,  Next: Current Context,  Prev: Idle Scheduling,  Up: Top
+
+11 Programming Examples
+***********************
+
+*** NOTE ***  This section needs to be written
+
+
+File: semantic-appdev.info,  Node: Current Context,  Next: Data Debugger,  Prev: Example Programs,  Up: Top
+
+12 Deriving the Current Context
+*******************************
+
+This chapter deals with how to derive the current context, and also how
+a language maintainer can get the current context API to work with
+their language.
+
+By default, the behavior will function in C like languages.  This means
+languages with parenthetical blocks, and type dereferencing which uses
+a similar form.
+
+* Menu:
+
+* Blocks::
+* Local Variables::             Getting lists of local variables.
+* Derived Context::             What goes at a given location?
+* Context Analysis::            Analysis information about the local context.
+
+
+File: semantic-appdev.info,  Node: Blocks,  Next: Local Variables,  Up: Current Context
+
+12.1 Blocks and Navigation
+==========================
+
+Source code is typically built up of control structures, and blocks of
+context, or lexical scope.  Semantic terms these lexical scopes as a
+"context".  The following functions can be used to navigate contexts.
+Some of them are override functions.  Language authors can override a
+subset of them to make them work for their language.
+
+ -- Function: semantic-up-context &optional point bounds-type
+     Move point up one context from POINT.  Return non-`nil' if there
+     are no more context levels.  Overloaded functions using
+     `up-context' take no parameters.  BOUNDS-TYPE is a symbol
+     representing a tag class to restrict movement to.  If this is
+     `nil', `'function' is used.  This will find the smallest tag of
+     that class (function, variable, type, etc) and make sure non-`nil'
+     is returned if you cannot go up past the bounds of that tag.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+ -- Function: semantic-beginning-of-context &optional point
+     Move POINT to the beginning of the current context.  Return
+     non-`nil' if there is no upper context.  The default behavior uses
+     "semantic-up-context".  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-end-of-context &optional point
+     Move POINT to the end of the current context.  Return non-`nil' if
+     there is no upper context.  Be default, this uses
+     "semantic-up-context", and assumes parenthetical block delimiters.
+     This function can be overloaded (see "define-mode-local-override"
+     for details).
+
+These next set of functions can be used to navigate across commands.
+
+ -- Function: semantic-end-of-command
+     Move to the end of the current command.  Be default, uses
+     `semantic-command-separation-character'.  This function can be
+     overloaded (see "define-mode-local-override" for details).
+
+ -- Function: semantic-beginning-of-command
+     Move to the beginning of the current command.  Be default, uses
+     `semantic-command-separation-character'.  This function can be
+     overloaded (see "define-mode-local-override" for details).
+
+
+File: semantic-appdev.info,  Node: Local Variables,  Next: Derived Context,  Prev: Blocks,  Up: Current Context
+
+12.2 Deriving local variables
+=============================
+
+Within a given context, or block of code, local variables are often
+defined.  These functions can be used to retrieve lists of locally
+scoped variables.
+
+ -- Function: semantic-get-local-variables &optional point
+     Get the local variables based on POINT's context.  Local variables
+     are returned in Semantic tag format.  This can be overriden with
+     `get-local-variables'.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-get-local-arguments &optional point
+     Get arguments (variables) from the current context at POINT.
+     Parameters are available if the point is in a function or method.
+     Return a list of tags unlinked from the originating buffer.
+     Arguments are obtained by overriding `get-local-arguments', or by
+     the default function "semantic-get-local-arguments-default".
+     This, must return a list of tags, or a list of strings that will
+     be converted to tags.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-get-all-local-variables &optional point
+     Get all local variables for this context, and parent contexts.
+     Local variables are returned in Semantic tag format.  Be default,
+     this gets local variables, and local arguments.  Optional argument
+     POINT is the location to start getting the variables from.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+
+File: semantic-appdev.info,  Node: Derived Context,  Next: Context Analysis,  Prev: Local Variables,  Up: Current Context
+
+12.3 Deriving the Current Context
+=================================
+
+While a context has already been used to describe blocks of code, other
+context include more local details, such as the symbol the cursor is
+on, or the fact we are assigning into some other variable.
+
+These context deriving functions can be overridden to provide language
+specific behavior.  By default, it assumes a C like language.
+
+ -- Function: semantic-ctxt-current-symbol &optional point
+     Return the current symbol the cursor is on at POINT in a list.
+     This will include a list of type/field names when applicable.
+     This function can be overloaded (see "define-mode-local-override"
+     for details).
+
+ -- Function: semantic-ctxt-current-assignment &optional point
+     Return the current assignment near the cursor at POINT.  Return a
+     list as per "semantic-ctxt-current-symbol".  Return `nil' if there
+     is nothing relevant.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-ctxt-current-function &optional point
+     Return the current function call the cursor is in at POINT.  The
+     function returned is the one accepting the arguments that the
+     cursor is currently in.  It will not return function symbol if the
+     cursor is on the text representing that function.  This function
+     can be overloaded (see "define-mode-local-override" for details).
+
+ -- Function: semantic-ctxt-current-argument &optional point
+     Return the index of the argument position the cursor is on at
+     POINT.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-ctxt-current-thing
+     Calculate a thing identified by the current cursor position.
+     Calls previously defined `semantic-ctxt-current-...' calls until
+     something gets a match.  See "semantic-ctxt-current-symbol",
+     "semantic-ctxt-current-function", and
+     "semantic-ctxt-current-assignment" for details on the return value.
+
+ -- Function: semantic-ctxt-current-class-list &optional point
+     Return a list of tag classes that are allowed at POINT.  If POINT
+     is `nil', the current buffer location is used.  For example, in
+     Emacs Lisp, the symbol after a ( is most likely a function.  In a
+     makefile, symbols after a : are rules, and symbols after a $( are
+     variables.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+ -- Function: semantic-ctxt-scoped-types &optional point
+     Return a list of type names currently in scope at POINT.  The
+     return value can be a mixed list of either strings (names of types
+     that are in scope) or actual tags (type declared locally that may
+     or may not have a name.)  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+
+File: semantic-appdev.info,  Node: Context Analysis,  Prev: Derived Context,  Up: Current Context
+
+12.4 Analysis of the current context
+====================================
+
+The context parsing API is used in a context analysis library.  This
+library provides high level routines for scanning through token
+databases to create lists of token associates.  At its core is a set of
+EIEIO classes defining a context.  The context contains information
+about what was parsed at a given position, such as the strings there,
+and they type of assignment.  The analysis library then searches the
+databases to determine the types and names available.
+
+Two high level functions which can be run interactively are:
+
+ -- Command: semantic-analyze-current-context &optional position
+     Analyze the current context at optional POSITION.  If called
+     interactively, display interesting information about POSITION in a
+     separate buffer.  Returns an object based on symbol
+     "semantic-analyze-context".
+
+     This function can be overriden with the symbol `analyze-context'.
+     When overriding this function, your override will be called while
+     cursor is at POSITION.  In addition, your function will not be
+     called if a cached copy of the return object is found.  This
+     function can be overloaded (see "define-mode-local-override" for
+     details).
+
+ -- Command: semantic-analyze-possible-completions context
+     Return a list of semantic tags which are possible completions.
+     CONTEXT is either a position (such as point), or a precalculated
+     context.  Passing in a context is useful if the caller also needs
+     to access parts of the analysis.  Completions run through the
+     following filters:
+
+        * Elements currently in scope
+
+        * Constants currently in scope
+
+        * Elements match the `:prefix' in the CONTEXT.
+
+        * Type of the completion matches the type of the context.
+
+     Context type matching can identify the following:
+
+        * No specific type
+
+        * Assignment into a variable of some type.
+
+        * Argument to a function with type constraints.
+
+     When called interactively, displays the list of possible
+     completions in a buffer.  This function can be overloaded (see
+     "define-mode-local-override" for details).
+
+* Menu:
+
+* Analysis Overview::           A description of how the analyzer works.
+* Analysis Objects::            What is in the analysis object.
+* Completion Overview::         How completions are calculated.
+
+
+File: semantic-appdev.info,  Node: Analysis Overview,  Next: Analysis Objects,  Up: Context Analysis
+
+12.4.1 Analysis Overview
+------------------------
+
+The semantic analysis function "semantic-analye-current-context"
+creates an Analysis Object.  See *Note Analysis Objects::.  This object
+contains many useful pieces of information needed to do any other kind
+of intelligent action on the local context.
+
+If you call this function interactively, it will popup a buffer with a
+summary of the return value.  This is useful when debugging.
+
+     +--------+   +----------------+      +-----------------+
+     | Buffer |---| Context Parser |------|   Scope Object  |
+     +--------+   +----------------+      +-----------------+
+         |                                        |
+     +--------+   +-----------+                   |
+     | Parser |---| Tag Table |---------------+   |
+     +--------+   +-----------+               |   |
+                                              |   |
+                                              |   |
+                  +-----------+               |   |
+              +-->| Typecache |-----------+   |   |
+              |   +-----------+           |   |   |
+              |                           |   |   |
+              |                           V   V   V
+     +-------------+                     +-------------------+
+     | Semantic DB |-------------------->| Semantic Analyzer |
+     +-------------+                     +-------------------+
+                                                  |
+                                                  V
+                                          +-----------------+
+                                          | Analysis Object |
+                                          +-----------------+
+
+
+File: semantic-appdev.info,  Node: Analysis Objects,  Next: Completion Overview,  Prev: Analysis Overview,  Up: Context Analysis
+
+12.4.2 Analysis Objects
+-----------------------
+
+NOTE: Need to regenerate this section
+
+
+File: semantic-appdev.info,  Node: Completion Overview,  Prev: Analysis Objects,  Up: Context Analysis
+
+12.4.3 Completion Overview
+--------------------------
+
+NOTE: Need to write this section too.
+
+
+File: semantic-appdev.info,  Node: Data Debugger,  Next: GNU Free Documentation License,  Prev: Current Context,  Up: Top
+
+13 Data structure debugger
+**************************
+
+The data structures that semantic provides can be complex, and figuring
+out why some level of application API performs incorrectly can be
+difficult.
+
+The data debugger is provided by `data-debug.el' which is independent
+of semantic, though semantic extends it for tag structures and objects
+it provides.
+
+The data debugger provides a way to look inside the various data
+structures of Semantic in a structures and complete way to help
+identify what a problem may be.
+
+When using `edebug' to interactively debug a function, the key `E' is
+bound to `data-debug-edebug-expr', which will provide a buffer with the
+evaluated expression shown in it.
+
+ -- Command: data-debug-edebug-expr expr
+     Dump out the context of some expression EXPR in edebug with ddebug.
+
+13.1 App Debugger Entry Points
+==============================
+
+There are a few basic functions that enter into the debugger.  For
+historical reasons, the semantic functions use the name `adebug' to
+specify functions that use the data debugger.
+
+ -- Command: semantic-adebug-bovinate
+     The same as "bovinate". Display the results in a debug buffer.
+
+ -- Command: semantic-adebug-searchdb regex
+     Search the semanticdb for REGEX for the current buffer.  Display
+     the results as a debug list.
+
+ -- Command: semantic-adebug-analyze
+     Perform "semantic-analyze-current-context".  Display the results
+     as a debug list.
+
+13.2 data-debug mode
+====================
+
+The semantic adebug API now sits on `data-debug' mode, which provides a
+simple user facing UI for looking into the data structures.
+
+ -- Command: data-debug-mode
+     Major-mode for the Data Debugging.
+
+     Keybindings:
+    `spc'
+          Expand or contract
+
+    `N'
+          Next entry, and expand/contract.
+
+    `P'
+          Previous entry, and expand/contract.
+
+    `n'
+          Next entry
+
+    `p'
+          Next entry
+
+    `<mouse-2>'
+          Expand/Contract entries.
+
+
+13.3 Create new debugger entry commands
+=======================================
+
+Creating a new Application debugger entry point is easy.  First, get a
+datastructure you need to analyze.
+
+The first function to call is:
+
+ -- Function: data-debug-new-buffer name
+     Create a new ddebug buffer with NAME.
+
+Next, you need to find the correct function for inserting your
+datastructure.  All adebug insertion functions are of the form
+`data-debug-insert-THING', where THING is either the word `thing', or
+whatever your object is.  Use Emacs help to pick something out.
+
+ -- Function: data-debug-insert-thing thing prefix prebuttontext
+          &optional parent
+     Insert THING with PREFIX.  PREBUTTONTEXT is some text to insert
+     between prefix and the thing that is not included in the
+     indentation calculation of any children.  If PARENT is non-`nil',
+     it is somehow related as a parent to thing.
+
+
+File: semantic-appdev.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Data Debugger,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: semantic-appdev.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* data-debug-edebug-expr:                Data Debugger.       (line  23)
+* data-debug-insert-thing:               Data Debugger.       (line  90)
+* data-debug-mode:                       Data Debugger.       (line  50)
+* data-debug-new-buffer:                 Data Debugger.       (line  81)
+* defconst-mode-local:                   Making New Methods.  (line  62)
+* defcustom-mode-local-semantic-dependency-system-include-path: DB Search Paths.
+                                                              (line 111)
+* define-mode-local-override:            Making New Methods.  (line  44)
+* define-overloadable-function:          Making New Methods.  (line  19)
+* define-semantic-idle-service:          Idle Scheduling.     (line  31)
+* defvar-mode-local:                     Making New Methods.  (line  58)
+* Misc Tag Functions:                    Misc Tag Functions.  (line   6)
+* semantic--find-tags-by-function:       Custom Search.       (line  13)
+* semantic--find-tags-by-macro:          Custom Search.       (line  18)
+* semantic--tag-expand:                  Misc Tag Internals.  (line  42)
+* semantic--tag-expanded-p:              Misc Tag Internals.  (line  38)
+* semantic--tag-get-property:            Tag Properties Internals.
+                                                              (line  25)
+* semantic--tag-link-cache-to-buffer:    Misc Tag Internals.  (line  34)
+* semantic--tag-link-list-to-buffer:     Misc Tag Internals.  (line  26)
+* semantic--tag-link-to-buffer:          Misc Tag Internals.  (line  17)
+* semantic--tag-put-property:            Tag Properties Internals.
+                                                              (line  15)
+* semantic--tag-put-property-no-side-effect: Tag Properties Internals.
+                                                              (line  35)
+* semantic--tag-run-hooks <1>:           Misc Tag Internals.  (line   7)
+* semantic--tag-run-hooks:               Tag Hooks.           (line  32)
+* semantic--tag-unlink-cache-from-buffer: Misc Tag Internals. (line  30)
+* semantic--tag-unlink-from-buffer:      Misc Tag Internals.  (line  12)
+* semantic--tag-unlink-list-from-buffer: Misc Tag Internals.  (line  22)
+* semantic-adebug-analyze:               Data Debugger.       (line  40)
+* semantic-adebug-bovinate:              Data Debugger.       (line  33)
+* semantic-adebug-searchdb:              Data Debugger.       (line  36)
+* semantic-adopt-external-members:       Tag Sorting.         (line  43)
+* semantic-after-partial-cache-change-hook: Parser Hooks.     (line  24)
+* semantic-after-toplevel-cache-change-hook: Parser Hooks.    (line   9)
+* semantic-analyze-current-context:      Context Analysis.    (line  17)
+* semantic-analyze-possible-completions: Context Analysis.    (line  30)
+* semantic-before-toplevel-cache-flush-hook: Parser Hooks.    (line  40)
+* semantic-beginning-of-command:         Blocks.              (line  44)
+* semantic-beginning-of-context:         Blocks.              (line  24)
+* semantic-brute-find-first-tag-by-function: Deep Search.     (line 144)
+* semantic-brute-find-first-tag-by-name: Deep Search.         (line   8)
+* semantic-brute-find-innermost-tag-by-position: Deep Search. (line  69)
+* semantic-brute-find-tag-by-attribute:  Deep Search.         (line  32)
+* semantic-brute-find-tag-by-attribute-value: Deep Search.    (line  44)
+* semantic-brute-find-tag-by-class:      Deep Search.         (line  83)
+* semantic-brute-find-tag-by-function:   Deep Search.         (line 123)
+* semantic-brute-find-tag-by-position:   Deep Search.         (line  58)
+* semantic-brute-find-tag-by-property:   Deep Search.         (line  21)
+* semantic-brute-find-tag-by-type:       Deep Search.         (line 110)
+* semantic-brute-find-tag-standard:      Deep Search.         (line  98)
+* semantic-bucketize:                    Tag Sorting.         (line  23)
+* semantic-bucketize-tag-class:          Tag Sorting.         (line  34)
+* semantic-collector-abstract:           Tag Collectors.      (line  17)
+* semantic-collector-analyze-completions: Tag Collectors.     (line  43)
+* semantic-collector-buffer-abstract:    Tag Collectors.      (line  22)
+* semantic-collector-buffer-deep:        Tag Collectors.      (line  32)
+* semantic-collector-project:            Tag Collectors.      (line  37)
+* semantic-collector-project-abstract:   Tag Collectors.      (line  26)
+* semantic-collector-project-brutish:    Tag Collectors.      (line  40)
+* semantic-complete-inline-analyzer:     Tag Completion Convenience Functions.
+                                                              (line  45)
+* semantic-complete-read-tag-analyzer:   Tag Completion Convenience Functions.
+                                                              (line  33)
+* semantic-complete-read-tag-buffer-deep: Tag Completion Convenience Functions.
+                                                              (line  11)
+* semantic-complete-read-tag-engine:     Custom Tag Completion Functions.
+                                                              (line  26)
+* semantic-complete-read-tag-project:    Tag Completion Convenience Functions.
+                                                              (line  22)
+* semantic-ctxt-current-argument:        Derived Context.     (line  33)
+* semantic-ctxt-current-assignment:      Derived Context.     (line  20)
+* semantic-ctxt-current-class-list:      Derived Context.     (line  45)
+* semantic-ctxt-current-function:        Derived Context.     (line  26)
+* semantic-ctxt-current-symbol:          Derived Context.     (line  14)
+* semantic-ctxt-current-thing:           Derived Context.     (line  38)
+* semantic-ctxt-scoped-types:            Derived Context.     (line  53)
+* semantic-current-tag:                  Tags at Point.       (line  50)
+* semantic-current-tag-parent:           Tags at Point.       (line  60)
+* semantic-dependency-system-include-path: Tag File Reference.
+                                                              (line  11)
+* semantic-dependency-tag-file:          Tag File Reference.  (line  20)
+* semantic-displayor-abstract:           Tag Displayors.      (line  19)
+* semantic-displayor-focus-abstract:     Tag Displayors.      (line  24)
+* semantic-displayor-tooltip:            Tag Displayors.      (line  43)
+* semantic-displayor-traditional:        Tag Displayors.      (line  31)
+* semantic-displayor-traditional-with-focus-highlight: Tag Displayors.
+                                                              (line  36)
+* semantic-edits-are-safe:               Editing Buffers.     (line  10)
+* semantic-end-of-command:               Blocks.              (line  39)
+* semantic-end-of-context:               Blocks.              (line  30)
+* semantic-equivalent-tag-p:             Tag Query.           (line  19)
+* semantic-exit-on-input:                Idle Scheduling.     (line  57)
+* semantic-find-first-tag-by-name:       Breadth Search.      (line  11)
+* semantic-find-tag-by-overlay:          Tags at Point.       (line  16)
+* semantic-find-tag-by-overlay-in-region: Tags at Point.      (line  31)
+* semantic-find-tag-by-overlay-next:     Tags at Point.       (line  42)
+* semantic-find-tag-by-overlay-prev:     Tags at Point.       (line  46)
+* semantic-find-tags-by-class:           Breadth Search.      (line  35)
+* semantic-find-tags-by-name:            Breadth Search.      (line  16)
+* semantic-find-tags-by-name-regexp:     Breadth Search.      (line  28)
+* semantic-find-tags-by-scope-protection: Specialty Search.   (line  17)
+* semantic-find-tags-by-type:            Breadth Search.      (line  41)
+* semantic-find-tags-external-children-of-type: Specialty Search.
+                                                              (line  28)
+* semantic-find-tags-for-completion:     Breadth Search.      (line  20)
+* semantic-find-tags-included:           Breadth Search.      (line  48)
+* semantic-find-tags-of-compound-type:   Specialty Search.    (line  11)
+* semantic-find-tags-subclasses-of-type: Specialty Search.    (line  33)
+* semantic-format-tag-abbreviate:        Format Tag.          (line  47)
+* semantic-format-tag-concise-prototype: Format Tag.          (line  83)
+* semantic-format-tag-custom-list:       Format Tag.          (line  22)
+* semantic-format-tag-functions:         Format Tag.          (line  14)
+* semantic-format-tag-name:              Format Tag.          (line  36)
+* semantic-format-tag-prin1:             Format Tag.          (line 128)
+* semantic-format-tag-prototype:         Format Tag.          (line  69)
+* semantic-format-tag-summarize:         Format Tag.          (line  59)
+* semantic-format-tag-type:              Format Tag.          (line 139)
+* semantic-format-tag-uml-abbreviate:    Format Tag.          (line  94)
+* semantic-format-tag-uml-concise-prototype: Format Tag.      (line 117)
+* semantic-format-tag-uml-prototype:     Format Tag.          (line 106)
+* semantic-get-all-local-variables:      Local Variables.     (line  27)
+* semantic-get-local-arguments:          Local Variables.     (line  17)
+* semantic-get-local-variables:          Local Variables.     (line  11)
+* semantic-go-to-tag:                    Jump to a Tag.       (line  10)
+* semantic-highlight-tag:                Tag Highlighting.    (line   7)
+* semantic-lex-catch-errors:             Lexical Safety.      (line  14)
+* semantic-mark-external-member-function: Tag Sorting.        (line  67)
+* semantic-momentary-highlight-tag:      Tag Highlighting.    (line  22)
+* semantic-narrow-to-tag:                Misc Tag Functions.  (line   7)
+* semantic-orphaned-member-metaparent-type: Tag Sorting.      (line  62)
+* semantic-parse-tree-needs-rebuild-p:   Parser State.        (line  14)
+* semantic-parse-tree-needs-update-p:    Parser State.        (line  11)
+* semantic-parse-tree-unparseable-p:     Parser State.        (line  17)
+* semantic-parse-tree-up-to-date-p:      Parser State.        (line  20)
+* semantic-prototype-file:               Tag File Reference.  (line  34)
+* semantic-read-function:                Old Tag Completion.  (line  24)
+* semantic-read-symbol:                  Old Tag Completion.  (line  10)
+* semantic-read-type:                    Old Tag Completion.  (line  30)
+* semantic-read-variable:                Old Tag Completion.  (line  18)
+* semantic-set-tag-face:                 Tag Highlighting.    (line  34)
+* semantic-set-tag-folded:               Tag Folding.         (line  10)
+* semantic-set-tag-intangible:           Tag Visible Properties.
+                                                              (line  26)
+* semantic-set-tag-invisible:            Tag Visible Properties.
+                                                              (line  11)
+* semantic-set-tag-read-only:            Tag Visible Properties.
+                                                              (line  45)
+* semantic-tag:                          Creating Tags.       (line   7)
+* semantic-tag-abstract-p:               Tag Details.         (line  48)
+* semantic-tag-add-hook:                 Tag Hooks.           (line  13)
+* semantic-tag-attributes:               Tag Attributes Internals.
+                                                              (line   7)
+* semantic-tag-bounds:                   Tag Overlay.         (line  24)
+* semantic-tag-buffer:                   Tag Overlay.         (line  35)
+* semantic-tag-children-compatibility:   Tag Query.           (line 247)
+* semantic-tag-class:                    Tag Basics.          (line  64)
+* semantic-tag-clone:                    Copying Tags.        (line  15)
+* semantic-tag-code-detail:              Tag Query.           (line 228)
+* semantic-tag-components <1>:           Tag Members.         (line  12)
+* semantic-tag-components:               Tag Query.           (line 235)
+* semantic-tag-components-default:       Tag Query.           (line 242)
+* semantic-tag-components-with-overlays <1>: Tag Members.     (line  19)
+* semantic-tag-components-with-overlays: Tag Overlay.         (line  67)
+* semantic-tag-components-with-overlays-default: Tag Overlay. (line  81)
+* semantic-tag-copy:                     Copying Tags.        (line  22)
+* semantic-tag-create-secondary-overlay: Tag Secondary Overlays.
+                                                              (line  21)
+* semantic-tag-deep-copy-one-tag:        Copying Tags.        (line  30)
+* semantic-tag-delete-secondary-overlay: Tag Secondary Overlays.
+                                                              (line  29)
+* semantic-tag-docstring:                Tag Query.           (line  56)
+* semantic-tag-end:                      Tag Overlay.         (line  18)
+* semantic-tag-external-member-children: Tag Members.         (line  54)
+* semantic-tag-external-member-p:        Tag Members.         (line  36)
+* semantic-tag-faux-p:                   Tag Query.           (line  40)
+* semantic-tag-file-name:                Tag Overlay.         (line  44)
+* semantic-tag-folded-p:                 Tag Folding.         (line  15)
+* semantic-tag-function-arguments:       Tag Query.           (line 115)
+* semantic-tag-function-destructor-p:    Tag Query.           (line  81)
+* semantic-tag-function-parent:          Tag Query.           (line 163)
+* semantic-tag-function-throws:          Tag Query.           (line  89)
+* semantic-tag-get-attribute:            Tag Attributes Internals.
+                                                              (line  27)
+* semantic-tag-get-secondary-overlay:    Tag Secondary Overlays.
+                                                              (line  38)
+* semantic-tag-in-buffer-p:              Tag Overlay.         (line  31)
+* semantic-tag-include-filename:         Tag Query.           (line 214)
+* semantic-tag-include-system-p:         Tag Query.           (line 206)
+* semantic-tag-intangible-p:             Tag Visible Properties.
+                                                              (line  36)
+* semantic-tag-invisible-p:              Tag Visible Properties.
+                                                              (line  19)
+* semantic-tag-leaf-p:                   Tag Details.         (line  64)
+* semantic-tag-make-plist:               Tag Properties Internals.
+                                                              (line  47)
+* semantic-tag-modifiers:                Tag Query.           (line  97)
+* semantic-tag-name:                     Tag Basics.          (line  55)
+* semantic-tag-named-parent:             Tag Query.           (line 157)
+* semantic-tag-new-code:                 Creating Tags.       (line  82)
+* semantic-tag-new-function:             Creating Tags.       (line  29)
+* semantic-tag-new-include:              Creating Tags.       (line  61)
+* semantic-tag-new-package:              Creating Tags.       (line  72)
+* semantic-tag-new-type:                 Creating Tags.       (line  41)
+* semantic-tag-new-variable:             Creating Tags.       (line  17)
+* semantic-tag-of-class-p:               Tag Query.           (line  37)
+* semantic-tag-of-type-p:                Tag Query.           (line 146)
+* semantic-tag-overlay:                  Tag Overlay.         (line  50)
+* semantic-tag-p:                        Tag Query.           (line  13)
+* semantic-tag-properties:               Tag Properties Internals.
+                                                              (line   7)
+* semantic-tag-protected-p:              Tag Details.         (line  30)
+* semantic-tag-protection:               Tag Details.         (line  10)
+* semantic-tag-put-attribute:            Tag Attributes Internals.
+                                                              (line  44)
+* semantic-tag-put-attribute-no-side-effect: Tag Attributes Internals.
+                                                              (line  55)
+* semantic-tag-read-only-p:              Tag Visible Properties.
+                                                              (line  54)
+* semantic-tag-remove-hook:              Tag Hooks.           (line  21)
+* semantic-tag-secondary-overlays:       Tag Secondary Overlays.
+                                                              (line  42)
+* semantic-tag-set-bounds:               Tag Overlay Internals.
+                                                              (line  10)
+* semantic-tag-similar-p:                Tag Query.           (line  30)
+* semantic-tag-start:                    Tag Overlay.         (line  11)
+* semantic-tag-static-p:                 Tag Details.         (line  77)
+* semantic-tag-type:                     Tag Query.           (line 137)
+* semantic-tag-type-compound-p:          Tag Query.           (line  48)
+* semantic-tag-type-interfaces:          Tag Query.           (line 184)
+* semantic-tag-type-members:             Tag Query.           (line 195)
+* semantic-tag-type-superclasses:        Tag Query.           (line 173)
+* semantic-tag-variable-constant-p:      Tag Query.           (line  73)
+* semantic-tag-variable-default:         Tag Query.           (line 126)
+* semantic-tag-with-position-p:          Tag Overlay.         (line  60)
+* semantic-texi-find-documentation:      Tag File Reference.  (line  44)
+* semantic-throw-on-input:               Idle Scheduling.     (line  47)
+* semantic-unhighlight-tag:              Tag Highlighting.    (line  15)
+* semantic-unique-tag-table:             Tag Sorting.         (line  14)
+* semantic-unique-tag-table-by-name:     Tag Sorting.         (line  19)
+* semantic-up-context:                   Blocks.              (line  13)
+* semantic-with-buffer-narrowed-to-current-tag: Misc Tag Functions.
+                                                              (line  15)
+* semantic-with-buffer-narrowed-to-tag:  Misc Tag Functions.  (line  23)
+* semantic-with-mode-bindings:           Override Methods.    (line  18)
+* semanticdb-brute-deep-find-tags-by-name: DB Basic Brute Search.
+                                                              (line  11)
+* semanticdb-check-references:           Semanticdb references.
+                                                              (line  34)
+* semanticdb-create-ebrowse-database:    System Databases.    (line  26)
+* semanticdb-deep-find-tags-by-name:     DB Basic Name Search.
+                                                              (line  45)
+* semanticdb-deep-find-tags-by-name-regexp: DB Basic Name Search.
+                                                              (line  53)
+* semanticdb-deep-find-tags-for-completion: DB Basic Name Search.
+                                                              (line  61)
+* semanticdb-fast-strip-find-results:    DB Results.          (line  27)
+* semanticdb-file-stream:                Semanticdb in Programs.
+                                                              (line  21)
+* semanticdb-file-table-object:          Semanticdb in Programs.
+                                                              (line  28)
+* semanticdb-find-default-throttle:      DB Search Paths.     (line  17)
+* semanticdb-find-result-length:         DB Results.          (line  51)
+* semanticdb-find-result-mapc:           DB Results.          (line  69)
+* semanticdb-find-result-nth:            DB Results.          (line  54)
+* semanticdb-find-result-nth-in-buffer:  DB Results.          (line  62)
+* semanticdb-find-result-with-nil-p:     DB Results.          (line  41)
+* semanticdb-find-results-p:             DB Results.          (line  36)
+* semanticdb-find-table-for-include:     DB Search Paths.     (line  94)
+* semanticdb-find-tags-by-class:         DB Basic Name Search.
+                                                              (line  36)
+* semanticdb-find-tags-by-name:          DB Basic Name Search.
+                                                              (line  15)
+* semanticdb-find-tags-by-name-regexp:   DB Basic Name Search.
+                                                              (line  22)
+* semanticdb-find-tags-collector:        DB Generic Search.   (line  12)
+* semanticdb-find-tags-external-children-of-type: DB Advanced Search.
+                                                              (line  17)
+* semanticdb-find-tags-for-completion:   DB Basic Name Search.
+                                                              (line  29)
+* semanticdb-find-tags-subclasses-of-type: DB Advanced Search.
+                                                              (line  24)
+* semanticdb-find-translate-path:        DB Search Paths.     (line  58)
+* semanticdb-get-typecache:              DB Data Type Search. (line  20)
+* semanticdb-have-typecache-p:           DB Data Type Search. (line  16)
+* semanticdb-includes-in-table:          Semanticdb references.
+                                                              (line  20)
+* semanticdb-minor-mode-p:               Semanticdb in Programs.
+                                                              (line  10)
+* semanticdb-notify-references:          Semanticdb references.
+                                                              (line  26)
+* semanticdb-project-database-ebrowse:   System Databases.    (line  20)
+* semanticdb-project-database-emacs-lisp: System Databases.   (line  15)
+* semanticdb-ref-test:                   Semanticdb references.
+                                                              (line  41)
+* semanticdb-strip-find-results:         DB Results.          (line  18)
+* semanticdb-typecache-dump:             DB Data Type Search. (line  36)
+* semanticdb-typecache-find:             DB Data Type Search. (line  27)
+* setq-mode-local:                       Making New Methods.  (line  70)
+* Tag Basics:                            Tag Basics.          (line   6)
+* Tag Hooks:                             Tag Hooks.           (line   6)
+* Tag Internals:                         Tag Internals.       (line   6)
+* Tag Overlay:                           Tag Overlay.         (line   6)
+* Tag Query:                             Tag Query.           (line   6)
+
+
+
+Tag Table:
+Node: Top1142
+Node: Semantic Tags2763
+Node: Tag Basics3346
+Ref: semantic-tag-name5719
+Ref: semantic-tag-class6176
+Node: Tag Query7638
+Ref: semantic-tag-p7931
+Ref: semantic-equivalent-tag-p8175
+Ref: semantic-tag-similar-p8687
+Ref: semantic-tag-of-class-p8999
+Ref: semantic-tag-faux-p9086
+Ref: semantic-tag-type-compound-p9444
+Ref: semantic-tag-docstring9709
+Ref: semantic-tag-variable-constant-p10362
+Ref: semantic-tag-function-destructor-p10715
+Ref: semantic-tag-function-throws11062
+Ref: semantic-tag-modifiers11391
+Ref: semantic-tag-function-arguments12024
+Ref: semantic-tag-variable-default12390
+Ref: semantic-tag-type12755
+Ref: semantic-tag-of-type-p13210
+Ref: semantic-tag-named-parent13685
+Ref: semantic-tag-function-parent13969
+Ref: semantic-tag-type-superclasses14426
+Ref: semantic-tag-type-interfaces14882
+Ref: semantic-tag-type-members15328
+Ref: semantic-tag-include-system-p15675
+Ref: semantic-tag-include-filename16024
+Ref: semantic-tag-code-detail16576
+Ref: semantic-tag-components16773
+Ref: semantic-tag-components-default17151
+Ref: semantic-tag-children-compatibility17344
+Node: Tag Overlay17760
+Ref: semantic-tag-start18142
+Ref: semantic-tag-end18363
+Ref: semantic-tag-bounds18576
+Ref: semantic-tag-in-buffer-p18828
+Ref: semantic-tag-buffer18985
+Ref: semantic-tag-file-name19364
+Ref: semantic-tag-overlay19674
+Ref: semantic-tag-with-position-p20117
+Ref: semantic-tag-components-with-overlays20397
+Ref: semantic-tag-components-with-overlays-default21071
+Node: Tag Hooks21317
+Ref: semantic-tag-add-hook21738
+Ref: semantic-tag-remove-hook22146
+Ref: semantic--tag-run-hooks22676
+Node: Misc Tag Functions23654
+Ref: semantic-narrow-to-tag23870
+Ref: semantic-with-buffer-narrowed-to-current-tag24186
+Ref: semantic-with-buffer-narrowed-to-tag24519
+Node: Tag Internals24740
+Node: Tag Attributes Internals25028
+Ref: semantic-tag-attributes25249
+Ref: semantic-tag-get-attribute26083
+Ref: semantic-tag-put-attribute26837
+Ref: semantic-tag-put-attribute-no-side-effect27352
+Node: Tag Properties Internals27674
+Ref: semantic-tag-properties27925
+Ref: semantic--tag-put-property28267
+Ref: semantic--tag-get-property28693
+Ref: semantic--tag-put-property-no-side-effect29110
+Ref: semantic-tag-make-plist29699
+Node: Tag Overlay Internals30258
+Ref: semantic-tag-set-bounds30600
+Node: Creating Tags30667
+Ref: semantic-tag30886
+Ref: semantic-tag-new-variable31381
+Ref: semantic-tag-new-function31953
+Ref: semantic-tag-new-type32545
+Ref: semantic-tag-new-include33669
+Ref: semantic-tag-new-package34210
+Ref: semantic-tag-new-code34693
+Node: Copying Tags34895
+Ref: semantic-tag-clone35476
+Ref: semantic-tag-copy35802
+Ref: semantic-tag-deep-copy-one-tag36252
+Node: Misc Tag Internals36508
+Node: Searching Tag Tables38768
+Node: Breadth Search39725
+Ref: semantic-find-first-tag-by-name40119
+Ref: semantic-find-tags-by-name40396
+Ref: semantic-find-tags-for-completion40594
+Ref: semantic-find-tags-by-name-regexp41003
+Ref: semantic-find-tags-by-class41351
+Ref: semantic-find-tags-by-type41628
+Ref: semantic-find-tags-included41996
+Node: Deep Search42127
+Node: Specialty Search49014
+Ref: semantic-find-tags-of-compound-type49441
+Ref: semantic-find-tags-by-scope-protection49740
+Ref: semantic-find-tags-external-children-of-type50334
+Ref: semantic-find-tags-subclasses-of-type50610
+Node: Custom Search50831
+Ref: semantic--find-tags-by-function51334
+Ref: semantic--find-tags-by-macro51595
+Node: Tags at Point51727
+Node: Tag Decoration54589
+Node: Tag Highlighting55199
+Ref: semantic-highlight-tag55397
+Ref: semantic-unhighlight-tag55687
+Ref: semantic-momentary-highlight-tag55963
+Ref: semantic-set-tag-face56491
+Node: Tag Visible Properties56695
+Ref: semantic-set-tag-invisible57142
+Ref: semantic-tag-invisible-p57452
+Ref: semantic-set-tag-intangible57719
+Ref: semantic-tag-intangible-p58162
+Ref: semantic-set-tag-read-only58559
+Ref: semantic-tag-read-only-p58921
+Node: Tag Secondary Overlays59142
+Ref: semantic-tag-create-secondary-overlay59921
+Ref: semantic-tag-delete-secondary-overlay60344
+Ref: semantic-tag-get-secondary-overlay60649
+Ref: semantic-tag-secondary-overlays60831
+Node: Tag Folding61405
+Ref: semantic-set-tag-folded61727
+Ref: semantic-tag-folded-p61948
+Node: Tag Sorting61992
+Ref: semantic-unique-tag-table62452
+Ref: semantic-unique-tag-table-by-name62717
+Ref: semantic-bucketize62902
+Ref: semantic-bucketize-tag-class63526
+Ref: semantic-adopt-external-members64054
+Ref: semantic-orphaned-member-metaparent-type64964
+Ref: semantic-mark-external-member-function65220
+Node: Tag Completion65777
+Node: Tag Completion Convenience Functions66803
+Ref: semantic-complete-read-tag-project67830
+Ref: semantic-complete-read-tag-analyzer68429
+Ref: semantic-complete-inline-analyzer69135
+Node: Custom Tag Completion Functions69517
+Ref: semantic-complete-read-tag-engine70484
+Node: Tag Collectors72162
+Ref: semantic-collector-abstract72709
+Ref: semantic-collector-buffer-abstract72952
+Ref: semantic-collector-project-abstract73113
+Ref: semantic-collector-buffer-deep73314
+Ref: semantic-collector-project73525
+Ref: semantic-collector-project-brutish73617
+Ref: semantic-collector-analyze-completions73713
+Node: Tag Displayors73957
+Ref: semantic-displayor-abstract74656
+Ref: semantic-displayor-focus-abstract74884
+Ref: semantic-displayor-traditional75134
+Ref: semantic-displayor-traditional-with-focus-highlight75389
+Ref: semantic-displayor-tooltip75701
+Node: Old Tag Completion75823
+Ref: semantic-read-symbol76162
+Ref: semantic-read-variable76620
+Ref: semantic-read-function76953
+Ref: semantic-read-type77280
+Node: Override Methods77538
+Ref: semantic-with-mode-bindings78289
+Node: Format Tag78971
+Ref: semantic-format-tag-functions79554
+Ref: semantic-format-tag-custom-list80003
+Ref: semantic-format-tag-name80665
+Ref: semantic-format-tag-abbreviate81234
+Ref: semantic-format-tag-summarize81880
+Ref: semantic-format-tag-prototype82398
+Ref: semantic-format-tag-concise-prototype83085
+Ref: semantic-format-tag-uml-abbreviate83635
+Ref: semantic-format-tag-uml-prototype84188
+Ref: semantic-format-tag-uml-concise-prototype84739
+Ref: semantic-format-tag-prin185293
+Ref: semantic-format-tag-type85730
+Node: Tag Members85953
+Ref: semantic-tag-external-member-p87498
+Ref: semantic-tag-external-member-children88341
+Node: Tag Details89479
+Ref: semantic-tag-protection89825
+Ref: semantic-tag-protected-p90895
+Ref: semantic-tag-abstract-p91381
+Ref: semantic-tag-leaf-p92134
+Ref: semantic-tag-static-p92766
+Node: Tag File Reference93278
+Ref: semantic-dependency-system-include-path93604
+Ref: semantic-dependency-tag-file94064
+Ref: semantic-prototype-file94733
+Ref: semantic-texi-find-documentation95251
+Node: Jump to a Tag95667
+Ref: semantic-go-to-tag96004
+Node: Making New Methods96898
+Ref: define-overload97604
+Ref: define-mode-local-override98841
+Ref: defvar-mode-local99556
+Ref: defconst-mode-local99705
+Ref: setq-mode-local100029
+Node: Parser Features100446
+Node: Editing Buffers101630
+Node: Parser State102277
+Ref: semantic-parse-tree-needs-update-p102688
+Ref: semantic-parse-tree-needs-rebuild-p102808
+Ref: semantic-parse-tree-unparseable-p102926
+Ref: semantic-parse-tree-up-to-date-p103047
+Node: Parser Hooks103111
+Ref: semantic-after-toplevel-cache-change-hook103383
+Ref: semantic-after-partial-cache-change-hook103971
+Ref: semantic-before-toplevel-cache-flush-hook104563
+Node: Lexical Safety104884
+Ref: semantic-lex-catch-errors105379
+Node: Semantic Database106135
+Node: Semanticdb in Programs107062
+Ref: semanticdb-minor-mode-p107383
+Ref: semanticdb-file-stream107839
+Ref: semanticdb-file-table-object108178
+Node: Semanticdb Tag Queries108507
+Node: DB Results110511
+Ref: semanticdb-strip-find-results111090
+Ref: semanticdb-fast-strip-find-results111612
+Ref: semanticdb-find-results-p112046
+Ref: semanticdb-find-result-with-nil-p112311
+Ref: semanticdb-find-result-length112785
+Ref: semanticdb-find-result-nth112873
+Ref: semanticdb-find-result-nth-in-buffer113251
+Ref: semanticdb-find-result-mapc113591
+Node: DB Search Paths113785
+Ref: semanticdb-find-default-throttle114489
+Ref: semanticdb-find-translate-path116071
+Ref: semanticdb-find-table-for-include117856
+Ref: defcustom-mode-local-semantic-dependency-system-include-path118696
+Node: DB Basic Name Search119132
+Ref: semanticdb-find-tags-by-name119679
+Ref: semanticdb-find-tags-by-name-regexp120024
+Ref: semanticdb-find-tags-for-completion120371
+Ref: semanticdb-find-tags-by-class120711
+Ref: semanticdb-deep-find-tags-by-name121063
+Ref: semanticdb-deep-find-tags-by-name-regexp121475
+Ref: semanticdb-deep-find-tags-for-completion121889
+Node: DB Data Type Search122200
+Ref: semanticdb-have-typecache-p122871
+Ref: semanticdb-get-typecache123001
+Ref: semanticdb-typecache-find123313
+Ref: semanticdb-typecache-dump123736
+Node: DB Basic Brute Search123785
+Ref: semanticdb-brute-deep-find-tags-by-name124191
+Node: DB Advanced Search124545
+Ref: semanticdb-find-tags-external-children-of-type125274
+Ref: semanticdb-find-tags-subclasses-of-type125642
+Node: DB Generic Search125908
+Ref: semanticdb-find-tags-collector126320
+Node: System Databases127215
+Ref: semanticdb-project-database-emacs-lisp127793
+Ref: semanticdb-project-database-ebrowse127925
+Ref: semanticdb-create-ebrowse-database128156
+Node: Semanticdb references128348
+Ref: semanticdb-includes-in-table129080
+Ref: semanticdb-notify-references129285
+Ref: semanticdb-check-references129621
+Ref: semanticdb-ref-test129869
+Node: Idle Scheduling130051
+Ref: define-semantic-idle-service131140
+Ref: semantic-throw-on-input131720
+Ref: semantic-exit-on-input132176
+Node: Example Programs132678
+Node: Current Context132888
+Node: Blocks133608
+Ref: semantic-up-context134150
+Ref: semantic-beginning-of-context134770
+Ref: semantic-end-of-context135076
+Ref: semantic-end-of-command135474
+Ref: semantic-beginning-of-command135714
+Node: Local Variables135916
+Ref: semantic-get-local-variables136305
+Ref: semantic-get-local-arguments136621
+Ref: semantic-get-all-local-variables137207
+Node: Derived Context137574
+Ref: semantic-ctxt-current-symbol138162
+Ref: semantic-ctxt-current-assignment138451
+Ref: semantic-ctxt-current-function138768
+Ref: semantic-ctxt-current-argument139180
+Ref: semantic-ctxt-current-thing139388
+Ref: semantic-ctxt-current-class-list139770
+Ref: semantic-ctxt-scoped-types140212
+Node: Context Analysis140539
+Ref: semantic-analyze-current-context141309
+Ref: semantic-analyze-possible-completions141959
+Node: Analysis Overview143045
+Node: Analysis Objects144824
+Node: Completion Overview145044
+Node: Data Debugger145244
+Ref: data-debug-edebug-expr146109
+Ref: semantic-adebug-bovinate146466
+Ref: semantic-adebug-searchdb146579
+Ref: semantic-adebug-analyze146721
+Ref: semantic-adebug-mode147019
+Ref: semantic-adebug-new-buffer147600
+Ref: data-debug-insert-thing147997
+Node: GNU Free Documentation License148249
+Node: Index167993
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/semantic-langdev.info b/site/cedet-1.0pre7/semantic/doc/semantic-langdev.info
new file mode 100644
index 0000000..47c83f9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semantic-langdev.info
@@ -0,0 +1,1931 @@
+This is semantic-langdev.info, produced by makeinfo version 4.9 from
+lang-support-guide.texi.
+
+   This manual documents Application Development with Semantic.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+Eric M. Ludlam Copyright (C) 2001, 2002, 2003, 2004 David Ponce
+Copyright (C) 2002, 2003 Richard Y. Kim
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic Language Writer's guide: (semantic-langdev).
+END-INFO-DIR-ENTRY
+
+   This file documents Language Support Development with Semantic.
+_Infrastructure for parser based text analysis in Emacs_
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam,
+David Ponce, and Richard Y. Kim
+
+
+File: semantic-langdev.info,  Node: Top,  Next: Tag Structure,  Up: (dir)
+
+Language Support Developer's Guide
+**********************************
+
+Semantic is bundled with support for several languages such as C, C++,
+Java, Python, etc.  However one of the primary goals of semantic is to
+provide a framework in which anyone can add support for other languages
+easily.  In order to support a new language, one typically has to
+provide a lexer and a parser along with appropriate semantic actions
+that produce the end result of the parser - the semantic tags.
+
+This chapter first discusses the semantic tag data structure to
+familiarize the reader to the goal.  Then all the components necessary
+for supporting a language is discussed starting with the writing lexer,
+writing the parser, writing semantic rules, etc.  Finally several
+parsers bundled with semantic are discussed as case studies.
+
+* Menu:
+
+* Tag Structure::
+* Language Support Overview::
+* Writing Lexers::
+* Writing Parsers::
+* Parsing a language file::
+* Debugging::
+* Parser Error Handling::
+* GNU Free Documentation License::
+* Index::
+
+
+File: semantic-langdev.info,  Node: Tag Structure,  Next: Language Support Overview,  Prev: Top,  Up: Top
+
+1 Tag Structure
+***************
+
+The end result of the parser for a buffer is a list of tags.  Currently
+each tag is a list with up to five elements:
+     ("NAME" CLASS ATTRIBUTES PROPERTIES OVERLAY)
+
+CLASS represents what kind of tag this is.  Common CLASS values include
+`variable', `function', or `type'.  *note (semantic-appdev.info)Tag
+Basics::.
+
+ATTRIBUTES is a slot filled with langauge specific options for the tag.
+Function arguments, return type, and other flags all are stored in
+attributes.  A language author fills in the ATTRIBUTES with the tag
+constructor, which is parser style dependant.
+
+The PROPERTIES slot is used to store information in a tag by
+applications using the tag.  The PROPERTIES slot is generated by the
+semantic parser harness, and need not be provided by a language author.
+Programmatically access tag properties with
+`semantic--tag-put-property',
+`semantic--tag-put-property-no-side-effect' and
+`semantic--tag-get-property'.
+
+OVERLAY represents positional information for this tag.  It is
+automatically generated by the semantic parser harness, and need not be
+provided by the language author, unless they provide a tag expansion
+function via `semantic-tag-expand-function'.
+
+The OVERLAY property is accessed via several functions returning the
+beginning, end, and buffer of a token.  Use these functions unless the
+overlay is really needed (see *note (app-dev-guide)Tag Query::).
+
+Depending on the overlay in a program can be dangerous because
+sometimes the overlay is replaced with an integer pair
+     [ START END ]
+when the buffer the tag belongs to is not in memory.  This happens when
+a user has activated the Semantic Database *note
+(semantic-appdev)semanticdb::.
+
+To create tags for a functional or object oriented language, you can
+use s series of tag creation functions.  *note
+(semantic-appdev)Creating Tags::
+
+
+File: semantic-langdev.info,  Node: Language Support Overview,  Next: Writing Lexers,  Prev: Tag Structure,  Up: Top
+
+2 Language Support Overview
+***************************
+
+semantic provides many ways to add support for a language into the
+semantic framework.
+
+The primary means to customize how semantic works is to implement
+language specific versions of overloadable functions.  Semantic has a
+specialized mode bound way to do this.  *Note Semantic Overload
+Mechanism::.
+
+The parser has several parts which are all also overloadable.  The
+primary entry point into the parser is `semantic-fetch-tags' which calls
+`semantic-parse-region' which returns a list of semantic tags which get
+set to `semantic--buffer-cache'.
+
+`semantic-parse-region' is the first "overloadable" function.  The
+default behavior of this is to simply call `semantic-lex', then pass
+the lexical token list to `semantic-repeat-parse-whole-stream'.  At
+each stage, another more focused layer provides a means of overloading.
+
+The parser is not the only layer that provides overloadable methods.
+Application APIs *note (semantic-appdev)top:: provide many overload
+functions as well.
+
+* Menu:
+
+* Semantic Overload Mechanism::
+* Semantic Parser Structure::
+* Application API Structure::
+
+
+File: semantic-langdev.info,  Node: Semantic Overload Mechanism,  Next: Semantic Parser Structure,  Up: Language Support Overview
+
+2.1 Semantic Overload Mechanism
+===============================
+
+one of semantic's goals is to provide a framework for supporting a wide
+range of languages.  writing parsers for some languages are very
+simple, e.g., any dialect of lisp family such as emacs-lisp and scheme.
+parsers for many languages can be written in context free grammars such
+as c, java, python, etc.  on the other hand, it is impossible to
+specify context free grammars for other languages such as texinfo.  Yet
+semantic already provides parsers for all these languages.
+
+In order to support such wide range of languages, a mechanism for
+customizing the parser engine at many levels was needed to maximize the
+code reuse yet give each programmer the flexibility of customizing the
+parser engine at many levels of granularity.
+
+The solution that semantic uses is function overloading.  This is
+mechanism which allows one to intercept and customize the behavior of
+many of the functions in the parser engine.  First the parser engine
+breaks down the task of parsing a language into several steps.  Each
+step is represented by an Emacs-Lisp function.  Some of these are
+`semantic-parse-region', `semantic-lex', `semantic-parse-stream', and
+`semantic-parse-changes'.
+
+Many built-in semantic functions are declared as being over-loadable,
+i.e., functions that do reasonable things for most languages, but can
+be customized to suit the particular needs of a given language.  All
+over-loadable functions then can easily be over-ridden if necessary.
+The rest of this section provides details on this overloading mechanism.
+
+Over-loadable functions are created by defining functions with the
+`define-overloadable-function' macro rather than the usual `defun'.
+`define-overloadable-function' is a thin wrapper around `defun' that
+sets up the function so that it can be overloaded.  An over-loadable
+function then can be over-ridden in one of two ways:
+`define-mode-overload-implementation' and
+`semantic-install-function-overrides'.
+
+Let's look at a couple of examples.  `semantic-parse-region' is one of
+the top level functions in the parser engine defined via
+`define-overload':
+
+     (define-overloadable-function semantic-parse-region
+       (start end &optional nonterminal depth returnonerror)
+       "Parse the area between START and END, and return any tokens found.
+     ...")
+
+The document string was truncated in the middle above since it is not
+relevant here.  The declaration above defines `semantic-parse-region',
+an Emacs-Lisp function for parsing a region of code.  This special
+declaration will first check if there is an overloaded implementation
+for this major mode.  If one is found, then that is called.  If a mode
+specific implementation is not found, then the default implementation
+is called which in this case is to call
+`semantic-parse-region-default', i.e., a function with the same name
+but with the tailing -default.  That function needs to be written
+separately and take the same arguments as the entry created with
+`define-overload'.
+
+One way to overload `semantic-parse-region' is via
+`semantic-install-function-overrides'.  An example from
+`semantic-texi.el' file is shown below:
+
+     (defun semantic-default-texi-setup ()
+       "Set up a buffer for parsing of Texinfo files."
+       ;; This will use our parser.
+       (semantic-install-function-overrides
+        '((parse-region . semantic-texi-parse-region)
+          (parse-changes . semantic-texi-parse-changes)))
+       ...
+       )
+
+     (add-hook 'texinfo-mode-hook 'semantic-default-texi-setup)
+
+The above function is from the texinfo parser support.
+
+The call to `semantic-install-function-overrides' above indicates that
+`semantic-texi-parse-region' is to over-ride the default implementation
+of `semantic-parse-region'.  Note the use of `parse-region' symbol
+which is `semantic-parse-region' without the leading semantic- prefix.
+
+Another way to over-ride a built-in semantic function is via
+`define-mode-overload-implementation'.  An example from
+`wisent-python.el' file is shown below.
+
+     (define-mode-overload-implementation
+       semantic-parse-region python-mode
+       (start end &optional nonterminal depth returnonerror)
+       "Over-ride in order to initialize some variables."
+       (let ((wisent-python-lexer-indent-stack '(0))
+             (wisent-python-explicit-line-continuation nil))
+         (semantic-parse-region-default
+          start end nonterminal depth returnonerror)))
+
+The above declaration over-rides `semantic-parse-region' so that for
+buffers whose major mode is `python-mode', the code specified above is
+executed rather than the default implementation.
+
+2.1.1 Why not to use advice
+---------------------------
+
+One may wonder why semantic defines an overload mechanism when Emacs
+already has advice.  *Note (elisp)Advising Functions::.
+
+Advising is generally considered a mechanism of last resort when
+modifying or hooking into an existing package without modifying that
+source file.  Overload files advertise that they should be overloaded,
+and define syntactic sugar to do so.
+
+
+File: semantic-langdev.info,  Node: Semantic Parser Structure,  Next: Application API Structure,  Prev: Semantic Overload Mechanism,  Up: Language Support Overview
+
+2.2 Semantic Parser Structure
+=============================
+
+NOTE: describe the functions that do parsing, and how to overload each.
+
+
+
+File: semantic-langdev.info,  Node: Application API Structure,  Prev: Semantic Parser Structure,  Up: Language Support Overview
+
+2.3 Application API Structure
+=============================
+
+How to program with the Application programming API into the data
+structures created by semantic guide. Read that guide to get a feel for
+the specifics of what you can customize. *note (semantic-appdev)top::
+
+Here are a list of applications, and the specific APIs that you will
+need to overload to make them work properly with your language.
+
+`imenu'
+`speedbar'
+`ecb'
+     These tools requires that the `semantic-format' methods create
+     correct strings.  *note (semantic-addpev)Format Tag::
+
+`semantic-analyze'
+     The analysis tool requires that the `semanticdb' tool is active,
+     and that the searching methods are overloaded.  In addition,
+     `semanticdb' system database could be written to provide symbols
+     from the global environment of your langauge.  *note
+     (semantic-appdev)System Databases::
+
+     In addition, the analyzer requires that the `semantic-ctxt'
+     methods are overloaded.  These methods allow the analyzer to look
+     at the context of the cursor in your language, and predict the
+     type of location of the cursor. *note (semantic-appdev)Derived
+     Context::.
+
+`semantic-idle-summary-mode'
+`semantic-idle-completions-mode'
+     These tools use the semantic analysis tool.  *note ()Context
+     Analysis. . semantic-appdev::
+
+* Menu:
+
+* Semantic Analyzer Support::
+
+
+File: semantic-langdev.info,  Node: Semantic Analyzer Support,  Up: Application API Structure
+
+2.3.1 Semantic Analyzer Support
+-------------------------------
+
+
+File: semantic-langdev.info,  Node: Writing Lexers,  Next: Writing Parsers,  Prev: Language Support Overview,  Up: Top
+
+3 Writing Lexers
+****************
+
+In order to reduce a source file into a tag table using either of the
+two parser generators, it must first be converted into a token stream.
+Tokens are syntactic elements such as whitespace, symbols, strings,
+lists, and punctuation.
+
+The lexer uses the major-mode's syntax table for conversion.  *Note
+Syntax Tables: (elisp)Syntax Tables.  As long as that is set up
+correctly (along with the important `comment-start' and
+`comment-start-skip' variable) the lexer should already work for your
+language.
+
+The primary entry point of the lexer is the "semantic-lex" function
+shown below.  Normally, you do not need to call this function.  It is
+usually called by _semantic-fetch-tags_ for you.
+
+ -- Function: semantic-lex start end &optional depth length
+     Lexically analyze text in the current buffer between START and END.
+     Optional argument DEPTH indicates at what level to scan over entire
+     lists.  The last argument, LENGTH specifies that "semantic-lex"
+     should only return LENGTH tokens.  The return value is a token
+     stream.  Each element is a list, such of the form   (symbol
+     start-expression .  end-expression) where SYMBOL denotes the token
+     type.  See `semantic-lex-tokens' variable for details on token
+     types.  END does not mark the end of the text scanned, only the
+     end of the beginning of text scanned.  Thus, if a string extends
+     past END, the end of the return token will be larger than END.  To
+     truly restrict scanning, use "narrow-to-region".
+
+* Menu:
+
+* Lexer Overview::              What is a Lexer?
+* Lexer Output::                Output of a Lexical Analyzer
+* Lexer Construction::          Constructing your own lexer
+* Lexer Built In Analyzers::    Built in analyzers you can use
+* Lexer Analyzer Construction::  Constructing your own anlyzers
+* Keywords::                    Specialized lexical tokens.
+* Keyword Properties::
+
+
+File: semantic-langdev.info,  Node: Lexer Overview,  Next: Lexer Output,  Up: Writing Lexers
+
+3.1 Lexer Overview
+==================
+
+semantic tokens.  This process is based mostly on regular expressions
+which in turn depend on the syntax table of the buffer's major mode
+being setup properly.  *Note Major Modes: (emacs)Major Modes.  *Note
+Syntax Tables: (elisp)Syntax Tables.  *Note Regexps: (emacs)Regexps.
+
+The top level lexical function "semantic-lex", calls the function
+stored in "semantic-lex-analyzer".  The default value is the function
+"semantic-flex" from version 1.4 of Semantic.  This will eventually be
+deprecated.
+
+In the default lexer, the following regular expressions which rely on
+syntax tables are used:
+
+``\\s-''
+     whitespace characters
+
+``\\sw''
+     word constituent
+
+``\\s_''
+     symbol constituent
+
+``\\s.''
+     punctuation character
+
+``\\s<''
+     comment starter
+
+``\\s>''
+     comment ender
+
+``\\s\\''
+     escape character
+
+``\\s)''
+     close parenthesis character
+
+``\\s$''
+     paired delimiter
+
+``\\s\"''
+     string quote
+
+``\\s\'''
+     expression prefix
+
+In addition, Emacs' built-in features such as `comment-start-skip',
+`forward-comment', `forward-list', and `forward-sexp' are employed.
+
+
+File: semantic-langdev.info,  Node: Lexer Output,  Next: Lexer Construction,  Prev: Lexer Overview,  Up: Writing Lexers
+
+3.2 Lexer Output
+================
+
+The lexer, *Note semantic-lex::, scans the content of a buffer and
+returns a token list.  Let's illustrate this using this simple example.
+
+     00: /*
+     01:  * Simple program to demonstrate semantic.
+     02:  */
+     03:
+     04: #include <stdio.h>
+     05:
+     06: int i_1;
+     07:
+     08: int
+     09: main(int argc, char** argv)
+     10: {
+     11:     printf("Hello world.\n");
+     12: }
+
+Evaluating `(semantic-lex (point-min) (point-max))' within the buffer
+with the code above returns the following token list.  The input line
+and string that produced each token is shown after each semi-colon.
+
+     ((punctuation     52 .  53)     ; 04: #
+      (INCLUDE         53 .  60)     ; 04: include
+      (punctuation     61 .  62)     ; 04: <
+      (symbol          62 .  67)     ; 04: stdio
+      (punctuation     67 .  68)     ; 04: .
+      (symbol          68 .  69)     ; 04: h
+      (punctuation     69 .  70)     ; 04: >
+      (INT             72 .  75)     ; 06: int
+      (symbol          76 .  79)     ; 06: i_1
+      (punctuation     79 .  80)     ; 06: ;
+      (INT             82 .  85)     ; 08: int
+      (symbol          86 .  90)     ; 08: main
+      (semantic-list   90 . 113)     ; 08: (int argc, char** argv)
+      (semantic-list  114 . 147)     ; 09-12: body of main function
+      )
+
+As shown above, the token list is a list of "tokens".  Each token in
+turn is a list of the form
+
+     (TOKEN-TYPE BEGINNING-POSITION . ENDING-POSITION)
+
+where TOKEN-TYPE is a symbol, and the other two are integers indicating
+the buffer position that delimit the token such that
+
+     (buffer-substring BEGINNING-POSITION ENDING-POSITION)
+
+would return the string form of the token.
+
+Note that one line (line 4 above) can produce seven tokens while the
+whole body of the function produces a single token.  This is because
+the DEPTH parameter of `semantic-lex' was not specified.  Let's see the
+output when DEPTH is set to 1.  Evaluate `(semantic-lex (point-min)
+(point-max) 1)' in the same buffer.  Note the third argument of `1'.
+
+     ((punctuation    52 .  53)     ; 04: #
+      (INCLUDE        53 .  60)     ; 04: include
+      (punctuation    61 .  62)     ; 04: <
+      (symbol         62 .  67)     ; 04: stdio
+      (punctuation    67 .  68)     ; 04: .
+      (symbol         68 .  69)     ; 04: h
+      (punctuation    69 .  70)     ; 04: >
+      (INT            72 .  75)     ; 06: int
+      (symbol         76 .  79)     ; 06: i_1
+      (punctuation    79 .  80)     ; 06: ;
+      (INT            82 .  85)     ; 08: int
+      (symbol         86 .  90)     ; 08: main
+
+      (open-paren     90 .  91)     ; 08: (
+      (INT            91 .  94)     ; 08: int
+      (symbol         95 .  99)     ; 08: argc
+      (punctuation    99 . 100)     ; 08: ,
+      (CHAR          101 . 105)     ; 08: char
+      (punctuation   105 . 106)     ; 08: *
+      (punctuation   106 . 107)     ; 08: *
+      (symbol        108 . 112)     ; 08: argv
+      (close-paren   112 . 113)     ; 08: )
+
+      (open-paren    114 . 115)     ; 10: {
+      (symbol        120 . 126)     ; 11: printf
+      (semantic-list 126 . 144)     ; 11: ("Hello world.\n")
+      (punctuation   144 . 145)     ; 11: ;
+      (close-paren   146 . 147)     ; 12: }
+      )
+
+The DEPTH parameter "peeled away" one more level of "list" delimited by
+matching parenthesis or braces.  The depth parameter can be specified
+to be any number.  However, the parser needs to be able to handle the
+extra tokens.
+
+This is an interesting benefit of the lexer having the full resources
+of Emacs at its disposal.  Skipping over matched parenthesis is
+achieved by simply calling the built-in functions `forward-list' and
+`forward-sexp'.
+
+
+File: semantic-langdev.info,  Node: Lexer Construction,  Next: Lexer Built In Analyzers,  Prev: Lexer Output,  Up: Writing Lexers
+
+3.3 Lexer Construction
+======================
+
+While using the default lexer is certainly an option, it is usually
+more efficient to create a custom lexer for your language.
+
+You can create a new lexer with "define-lex".
+
+ -- Function: define-lex name doc &rest analyzers
+     Create a new lexical analyzer with NAME.  DOC is a documentation
+     string describing this analyzer.  ANALYZERS are small code
+     snippets of analyzers to use when building the new NAMED analyzer.
+     Only use analyzers which are written to be used in "define-lex".
+     Each analyzer should be an analyzer created with
+     "define-lex-analyzer".  Note: The order in which analyzers are
+     listed is important.  If two analyzers can match the same text, it
+     is important to order the analyzers so that the one you want to
+     match first occurs first.  For example, it is good to put a number
+     analyzer in front of a symbol analyzer which might mistake a
+     number for as a symbol.
+
+The list of ANALYZERS, needed here can consist of one of several built
+in analyzers, or one of your own construction.  The built in analyzers
+are:
+
+
+File: semantic-langdev.info,  Node: Lexer Built In Analyzers,  Next: Lexer Analyzer Construction,  Prev: Lexer Construction,  Up: Writing Lexers
+
+3.4 Lexer Built In Analyzers
+============================
+
+ -- Special Form: semantic-lex-default-action
+     The default action when no other lexical actions match text.  This
+     action will just throw an error.
+
+ -- Special Form: semantic-lex-beginning-of-line
+     Detect and create a beginning of line token (BOL).
+
+ -- Special Form: semantic-lex-newline
+     Detect and create newline tokens.
+
+ -- Special Form: semantic-lex-newline-as-whitespace
+     Detect and create newline tokens.  Use this ONLY if newlines are
+     not whitespace characters (such as when they are comment end
+     characters) AND when you want whitespace tokens.
+
+ -- Special Form: semantic-lex-ignore-newline
+     Detect and create newline tokens.  Use this ONLY if newlines are
+     not whitespace characters (such as when they are comment end
+     characters).
+
+ -- Special Form: semantic-lex-whitespace
+     Detect and create whitespace tokens.
+
+ -- Special Form: semantic-lex-ignore-whitespace
+     Detect and skip over whitespace tokens.
+
+ -- Special Form: semantic-lex-number
+     Detect and create number tokens.  Number tokens are matched via
+     this variable:
+
+      -- Variable: semantic-lex-number-expression
+          Regular expression for matching a number.  If this value is
+          `nil', no number extraction is done during lex.  This
+          expression tries to match C and Java like numbers.
+
+               DECIMAL_LITERAL:
+                   [1-9][0-9]*
+                 ;
+               HEX_LITERAL:
+                   0[xX][0-9a-fA-F]+
+                 ;
+               OCTAL_LITERAL:
+                   0[0-7]*
+                 ;
+               INTEGER_LITERAL:
+                   <DECIMAL_LITERAL>[lL]?
+                 | <HEX_LITERAL>[lL]?
+                 | <OCTAL_LITERAL>[lL]?
+                 ;
+               EXPONENT:
+                   [eE][+-]?[09]+
+                 ;
+               FLOATING_POINT_LITERAL:
+                   [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+                 | [.][0-9]+<EXPONENT>?[fFdD]?
+                 | [0-9]+<EXPONENT>[fFdD]?
+                 | [0-9]+<EXPONENT>?[fFdD]
+                 ;
+
+
+ -- Special Form: semantic-lex-symbol-or-keyword
+     Detect and create symbol and keyword tokens.
+
+ -- Special Form: semantic-lex-charquote
+     Detect and create charquote tokens.
+
+ -- Special Form: semantic-lex-punctuation
+     Detect and create punctuation tokens.
+
+ -- Special Form: semantic-lex-punctuation-type
+     Detect and create a punctuation type token.  Recognized
+     punctuations are defined in the current table of lexical types, as
+     the value of the `punctuation' token type.
+
+ -- Special Form: semantic-lex-paren-or-list
+     Detect open parenthesis.  Return either a paren token or a
+     semantic list token depending on `semantic-lex-current-depth'.
+
+ -- Special Form: semantic-lex-open-paren
+     Detect and create an open parenthesis token.
+
+ -- Special Form: semantic-lex-close-paren
+     Detect and create a close paren token.
+
+ -- Special Form: semantic-lex-string
+     Detect and create a string token.
+
+ -- Special Form: semantic-lex-comments
+     Detect and create a comment token.
+
+ -- Special Form: semantic-lex-comments-as-whitespace
+     Detect comments and create a whitespace token.
+
+ -- Special Form: semantic-lex-ignore-comments
+     Detect and create a comment token.
+
+
+File: semantic-langdev.info,  Node: Lexer Analyzer Construction,  Next: Keywords,  Prev: Lexer Built In Analyzers,  Up: Writing Lexers
+
+3.5 Lexer Analyzer Construction
+===============================
+
+Each of the previous built in analyzers are constructed using a set of
+analyzer construction macros.  The root construction macro is:
+
+ -- Function: define-lex-analyzer name doc condition &rest forms
+     Create a single lexical analyzer NAME with DOC.  When an analyzer
+     is called, the current buffer and point are positioned in a buffer
+     at the location to be analyzed.  CONDITION is an expression which
+     returns `t' if FORMS should be run.  Within the bounds of
+     CONDITION and FORMS, the use of backquote can be used to evaluate
+     expressions at compile time.  While forms are running, the
+     following variables will be locally bound:
+     `semantic-lex-analysis-bounds' - The bounds of the current
+     analysis.                    of the form (START . END)
+     `semantic-lex-maximum-depth' - The maximum depth of semantic-list
+                     for the current analysis.
+     `semantic-lex-current-depth' - The current depth of
+     `semantic-list' that has                   been descended.
+     `semantic-lex-end-point' - End Point after match.
+       Analyzers should set this to a buffer location if their
+               match string does not represent the end of the matched
+     text.    `semantic-lex-token-stream' - The token list being
+     collected.                     Add new lexical tokens to this list.
+     Proper action in FORMS is to move the value of
+     `semantic-lex-end-point' to after the location of the analyzed
+     entry, and to add any discovered tokens at the beginning of
+     `semantic-lex-token-stream'.  This can be done by using
+     "semantic-lex-push-token".
+
+Additionally, a simple regular expression based analyzer can be built
+with:
+
+ -- Function: define-lex-regex-analyzer name doc regexp &rest forms
+     Create a lexical analyzer with NAME and DOC that will match REGEXP.
+     FORMS are evaluated upon a successful match.  See
+     "define-lex-analyzer" for more about analyzers.
+
+ -- Function: define-lex-simple-regex-analyzer name doc regexp toksym
+          &optional index &rest forms
+     Create a lexical analyzer with NAME and DOC that match REGEXP.
+     TOKSYM is the symbol to use when creating a semantic lexical token.
+     INDEX is the index into the match that defines the bounds of the
+     token.  Index should be a plain integer, and not specified in the
+     macro as an expression.  FORMS are evaluated upon a successful
+     match BEFORE the new token is created.  It is valid to ignore
+     FORMS.  See "define-lex-analyzer" for more about analyzers.
+
+Regular expression analyzers are the simplest to create and manage.
+Often, a majority of your lexer can be built this way.  The analyzer
+for matching punctuation looks like this:
+
+     (define-lex-simple-regex-analyzer semantic-lex-punctuation
+       "Detect and create punctuation tokens."
+       "\\(\\s.\\|\\s$\\|\\s'\\)" 'punctuation)
+
+More complex analyzers for matching larger units of text to optimize
+the speed of parsing and analysis is done by matching blocks.
+
+ -- Function: define-lex-block-analyzer name doc spec1 &rest specs
+     Create a lexical analyzer NAME for paired delimiters blocks.  It
+     detects a paired delimiters block or the corresponding open or
+     close delimiter depending on the value of the variable
+     `semantic-lex-current-depth'.  DOC is the documentation string of
+     the lexical analyzer.  SPEC1 and SPECS specify the token symbols
+     and open, close delimiters used.  Each SPEC has the form:
+
+     (BLOCK-SYM (OPEN-DELIM OPEN-SYM) (CLOSE-DELIM CLOSE-SYM))
+
+     where BLOCK-SYM is the symbol returned in a block token.
+     OPEN-DELIM and CLOSE-DELIM are respectively the open and close
+     delimiters identifying a block.  OPEN-SYM and CLOSE-SYM are
+     respectively the symbols returned in open and close tokens.
+
+These blocks is what makes the speed of semantic's Emacs Lisp based
+parsers fast.  For example, by defining all text inside { braces } as a
+block the parser does not need to know the contents of those braces
+while parsing, and can skip them all together.
+
+
+File: semantic-langdev.info,  Node: Keywords,  Next: Keyword Properties,  Prev: Lexer Analyzer Construction,  Up: Writing Lexers
+
+3.6 Keywords
+============
+
+Another important piece of the lexer is the keyword table (see *Note
+Writing Parsers::).  Each language will want to set up a keyword table
+for fast conversion of symbol strings to language terminals.
+
+The keywords table can also be used to store additional information
+about those keywords.  The following programming functions can be useful
+when examining text in a language buffer.
+
+ -- Function: semantic-lex-keyword-p name
+     Return non-`nil' if a keyword with NAME exists in the keyword
+     table.  Return `nil' otherwise.
+
+ -- Function: semantic-lex-keyword-put name property value
+     For keyword with NAME, set its PROPERTY to VALUE.
+
+ -- Function: semantic-lex-keyword-get name property
+     For keyword with NAME, return its PROPERTY value.
+
+ -- Function: semantic-lex-map-keywords fun &optional property
+     Call function FUN on every semantic keyword.  If optional PROPERTY
+     is non-`nil', call FUN only on every keyword which as a PROPERTY
+     value.  FUN receives a semantic keyword as argument.
+
+ -- Function: semantic-lex-keywords &optional property
+     Return a list of semantic keywords.  If optional PROPERTY is
+     non-`nil', return only keywords which have a PROPERTY set.
+
+Keyword properties can be set up in a grammar file for ease of
+maintenance.  While examining the text in a language buffer, this can
+provide an easy and quick way of storing details about text in the
+buffer.
+
+
+File: semantic-langdev.info,  Node: Keyword Properties,  Prev: Keywords,  Up: Writing Lexers
+
+3.7 Standard Keyword Properties
+===============================
+
+Keywords in a language can have multiple properties.  These properties
+can be used to associate the string that is the keyword with additional
+information.
+
+Currently available properties are:
+
+summary
+     The summary property is used by semantic-summary-mode as a help
+     string for the keyword specified.
+
+Notes:
+
+Possible future properties.  This is just me musing:
+
+face
+     Face used for highlighting this keyword, differentiating it from
+     the keyword face.
+
+template
+skeleton
+     Some sort of tempo/skel template for inserting the programatic
+     structure associated with this keyword.
+
+abbrev
+     As with template.
+
+action
+menu
+     Perhaps the keyword is clickable and some action would be useful.
+
+
+File: semantic-langdev.info,  Node: Writing Parsers,  Next: Parsing a language file,  Prev: Writing Lexers,  Up: Top
+
+4 Writing Parsers
+*****************
+
+When converting a source file into a tag table it is important to
+specify rules to accomplish this.  The rules are stored in the buffer
+local variable `semantic--buffer-cache'.
+
+While it is certainly possible to write this table yourself, it is most
+likely you will want to use the *Note Grammar Programming Environment::.
+
+There are three choices for parsing your language.
+
+Bovine Parser
+     The "bovine" parser is the original semantic parser, and is an
+     implementation of an LL parser.  For more information, *note the
+     Bovine Parser Manual: (bovine)top.
+
+Wisent Parser
+     The "wisent" parser is a port of the GNU Compiler Compiler Bison
+     to Emacs Lisp.  Wisent includes the iterative error handler of the
+     bovine parser, and has the same error correction as traditional
+     LALR parsers.  For more information, *note the Wisent Parser
+     Manual: (wisent)top.
+
+External Parser
+     External parsers, such as the texinfo parser can be implemented
+     using any means.  This allows the use of a regular expression
+     parser for non-regular languages, or external programs for speed.
+
+* Menu:
+
+* External Parsers::            Writing an external parser
+* Grammar Programming Environment::  Using the grammar writing environemt
+* Parser Backend Support::             Lisp needed to support a grammar.
+
+
+File: semantic-langdev.info,  Node: External Parsers,  Next: Grammar Programming Environment,  Up: Writing Parsers
+
+4.1 External Parsers
+====================
+
+The texinfo parser in `semantic-texi.el' is an example of an external
+parser.  To make your parser work, you need to have a setup function to
+replace the regular region parsing mechanism.
+
+Another external parser is in the ctags support.  The CTags parser
+overloads the same functions as the texinfo version.  Instead of using
+regular expressions, however, it uses the external program `ctags', and
+converts the output into the semantic
+
+
+File: semantic-langdev.info,  Node: Grammar Programming Environment,  Next: Parser Backend Support,  Prev: External Parsers,  Up: Writing Parsers
+
+4.2 Grammar Programming Environment
+===================================
+
+Semantic grammar files in `.by' or `.wy' format have their own
+programming mode.  This mode provides indentation and coloring services
+in those languages.  In addition, the grammar languages are also
+supported by semantic tools such as imenu or speedbar.
+
+For more information, *note the Grammar Framework Manual:
+(grammar-fw)top.
+
+
+File: semantic-langdev.info,  Node: Parsing a language file,  Next: Debugging,  Prev: Writing Parsers,  Up: Top
+
+5 Parsing a language file
+*************************
+
+The best way to call the parser from programs is via
+`semantic-fetch-tags'.  This, in turn, uses other internal API
+functions which plug-in parsers can take advantage of.
+
+ -- Function: semantic-fetch-tags
+     Fetch semantic tags from the current buffer.  If the buffer cache
+     is up to date, return that.  If the buffer cache is out of date,
+     attempt an incremental reparse.  If the buffer has not been parsed
+     before, or if the incremental reparse fails, then parse the entire
+     buffer.  If a lexical error had been previously discovered and the
+     buffer was marked unparseable, then do nothing, and return the
+     cache.
+
+Another approach is to let Emacs call the parser on idle time, when
+needed, then use `semantic-fetch-available-tags' to retrieve and
+process only the available tags, provided that the
+`semantic-after-*-hook' hooks have been setup to synchronize with new
+tags when they become available.
+
+ -- Function: semantic-fetch-available-tags
+     Fetch available semantic tags from the current buffer.  That is,
+     return tags currently in the cache without parsing the current
+     buffer.
+
+     Parse operations happen asynchronously when needed on Emacs idle
+     time.  Use the `semantic-after-toplevel-cache-change-hook' and
+     `semantic-after-partial-cache-change-hook' hooks to synchronize
+     with new tags when they become available.
+
+ -- Command: semantic-clear-toplevel-cache
+     Clear the toplevel tag cache for the current buffer.  Clearing the
+     cache will force a complete reparse next time a token stream is
+     requested.
+
+
+File: semantic-langdev.info,  Node: Parser Backend Support,  Prev: Grammar Programming Environment,  Up: Writing Parsers
+
+5.1 Parser Backend Support
+==========================
+
+Once you have written a grammar file that has been compiled into Emacs
+Lisp code, additional glue needs to be written to finish connecting the
+generated parser into the Emacs framework.
+
+Large portions of this glue is automatically generated, but will
+probably need additional modification to get things to work properly.
+
+Typically, a grammar file `foo.wy' will create the file `foo-wy.el'.
+It is then useful to also create a file `wisent-foo.el' (or
+`semantic-foo.el') to contain the parser back end, or the glue that
+completes the semantic support for the language.
+
+* Menu:
+
+* Example Backend File::
+* Tag Expansion::
+
+
+File: semantic-langdev.info,  Node: Example Backend File,  Next: Tag Expansion,  Up: Parser Backend Support
+
+5.1.1 Example Backend File
+--------------------------
+
+Typical structure for this file is:
+
+     ;;; semantic-foo.el -- parser support for FOO.
+
+     ;;; Your copyright Notice
+
+     (require 'foo-wy.el)  ;; The parser
+     (require 'foo) ;; major mode definition for FOO
+
+     ;;; Code:
+
+     ;;; Lexical Analyzer
+     ;;
+     ;; OPTIONAL
+     ;; It is possible to define your lexical analyzer completely in your
+     ;; grammar file.
+
+     (define-lex foo-lexical-analyzer
+       "Create a lexical analyzer."
+       ...)
+
+     ;;; Expand Function
+     ;;
+     ;; OPTIONAL
+     ;; Not all languages are so complex as to need this function.
+     ;; See `semantic-tag-expand-function' for more details.
+     (defun foo-tag-expand-function (tag)
+       "Expand TAG into multiple tags if needed."
+       ...)
+
+     ;;; Parser Support
+     ;;
+     ;; OPTIONAL
+     ;; If you need some specialty routines inside your grammar file
+     ;; you can add some here.   The process may be to take diverse info
+     ;; and reorganize it.
+     ;;
+     ;; It is also appropriate to write these functions in the prologue
+     ;; of the grammar function.
+     (defun foo-do-something-hard (...)
+       "...")
+
+     ;;; Overload methods
+     ;;
+     ;; OPTIONAL
+     ;; To allow your langauge to be fully supported by all the
+     ;; applications that use semantic, it is important, but not necessary
+     ;; to create implementations of overload methods.
+     (define-mode-overload-implementation some-semantic-function foo-mode (tag)
+       "Implement some-semantic-function for FOO."
+       )
+
+     ;;;###autoload
+     (defun semantic-default-foo-setup ()
+       "Set up a buffer for semantic parsing of the FOO language."
+       (semantic-foo-by--install-parser)
+       (setq semantic-tag-expand-function foo-tag-expand-function
+             ;; Many other language specific settings can be done here
+             ;; as well.
+             )
+       ;; This may be optional
+       (setq semantic-lex-analyzer #'foo-lexical-analyzer)
+       )
+
+     ;;;###autoload
+     (add-hook 'foo-mode-hook 'semantic-default-foo-setup)
+
+     (provide 'semantic-c)
+
+     ;;; semantic-foo.el ends here
+
+
+File: semantic-langdev.info,  Node: Tag Expansion,  Prev: Example Backend File,  Up: Parser Backend Support
+
+5.1.2 Tag Expansion
+-------------------
+
+In any language with compound tag types, you will need to implement an
+_expand function_.  Once written, assign it to this variable.
+
+ -- Variable: semantic-tag-expand-function
+     Function used to expand a tag.  It is passed each tag production,
+     and must return a list of tags derived from it, or `nil' if it
+     does not need to be expanded.
+
+     Languages with compound definitions should use this function to
+     expand from one compound symbol into several.  For example, in C
+     or Java the following definition is easily parsed into one tag:
+
+     int a, b;
+
+     This function should take this compound tag and turn it into two
+     tags, one for A, and the other for B.
+
+Additionally, you can use the expand function in conjunction with your
+language for other types of compound statements.  For example, in
+Common Lisp Object System, you can have a definition:
+
+     (defclass classname nil
+       (slots ...) ...)
+
+This will create both the datatype `classname' and the functional
+constructor `classname'.  Each slot may have a `:accessor' method as
+well.
+
+You can create a special compounded tag in your rule, for example:
+
+     classdef: LPAREN DEFCLASS name semantic-list semantic-list RPAREN
+               (TAG "custom" 'compound-class
+                    :value (list
+                             (TYPE-TAG $3 "class" ...)
+                             (FUNCTION-TAG $3 ...)
+                             ))
+             ;
+
+and in your expand function, you would write:
+
+     (defun my-tag-expand (tag)
+       "Expand tags for my langauge."
+       (when (semantic-tag-of-class-p tag 'compound-class)
+          (remq nil
+             (semantic-tag-get-attribute tag :value))))
+
+This will cause the custom tag to be replaced by the tags created in
+the :value attribute of the specially constructed tag.
+
+
+File: semantic-langdev.info,  Node: Debugging,  Next: Parser Error Handling,  Prev: Parsing a language file,  Up: Top
+
+6 Debugging
+***********
+
+Grammars can be tricky things to debug.  There are several types of
+tools for debugging in Semantic, and the type of problem you have
+requires different types of tools.
+
+* Menu:
+
+* Lexical Debugging::
+* Parser Output tools::
+* Bovine Parser Debugging::
+* Wisent Parser Debugging::
+* Overlay Debugging::
+* Incremental Parser Debugging::
+* Semantic 1.4 Doc::
+
+
+File: semantic-langdev.info,  Node: Lexical Debugging,  Next: Parser Output tools,  Up: Debugging
+
+6.1 Lexical Debugging
+=====================
+
+The first major problem you may encounter is with lexical analysis.  If
+the text is not transformed into the expected token stream, no parser
+will understand it.
+
+You can step through the lexical analyzer with the following command:
+
+ -- Command: semantic-lex-debug arg
+     Debug the semantic lexer in the current buffer.  Argument ARG
+     specifies of the analyze the whole buffer, or start at point.
+     While engaged, each token identified by the lexer will be
+     highlighted in the target buffer   A description of the current
+     token will be displayed in the minibuffer.  Press `SPC' to move to
+     the next lexical token.
+
+For an example of what the output of the `semantic-lex' function should
+return, see *Note Lexer Output::.
+
+
+File: semantic-langdev.info,  Node: Parser Output tools,  Next: Bovine Parser Debugging,  Prev: Lexical Debugging,  Up: Debugging
+
+6.2 Parser Output tools
+=======================
+
+There are several tools which can be used to see what the parser output
+is.  These will work for any type of parser, including the Bovine
+parser, Wisent parser.
+
+The first and easiest is a minor mode which highlights text the parser
+did not understand.
+
+ -- Command: semantic-show-unmatched-syntax-mode &optional arg
+     Minor mode to highlight unmatched lexical syntax tokens.  When a
+     parser executes, some elements in the buffer may not match any
+     parser rules.  These text characters are considered unmatched
+     syntax.  Often time, the display of unmatched syntax can expose
+     coding problems before the compiler is run.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+    `key'
+          binding
+
+    `C-c ,'
+          Prefix Command
+
+    `C-c , `'
+          semantic-show-unmatched-syntax-next
+
+Another interesting mode will display a line between all the tags in
+the current buffer to make it more obvious where boundaries lie.  You
+can enable this as a minor mode.
+
+ -- Command: semantic-show-tag-boundaries-mode &optional arg
+     Minor mode to display a boundary in front of tags.  The boundary
+     is displayed using an overline in Emacs 21.  With prefix argument
+     ARG, turn on if positive, otherwise off.  The minor mode can be
+     turned on only if semantic feature is available and the current
+     buffer was set up for parsing.  Return non-`nil' if the minor mode
+     is enabled.
+
+Another interesting mode helps if you are worred about specific
+attributes, you can se this minor mode to highlight different tokens in
+different ways based on the attributes you are most concerned with.
+
+ -- Command: semantic-highlight-by-attribute-mode &optional arg
+     Minor mode to highlight tags based on some attribute.  By default,
+     the protection of a tag will give it a different background color.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+Another tool that can be used is a dump of the current list of tags.
+This shows the actual Lisp representation of the tags generated in a
+rather bland dump.  This can be useful if text was successfully parsed,
+and you want to be sure that the correct information was captured.
+
+ -- Command: bovinate &optional clear
+     Bovinate the current buffer.  Show output in a temp buffer.
+     Optional argument CLEAR will clear the cache before bovinating.
+     If CLEAR is negative, it will do a full reparse, and also not
+     display the output buffer.
+
+
+File: semantic-langdev.info,  Node: Bovine Parser Debugging,  Next: Wisent Parser Debugging,  Prev: Parser Output tools,  Up: Debugging
+
+6.3 Bovine Parser Debugging
+===========================
+
+The bovine parser is described in *note (bovine)top::.
+
+Aside using a traditional Emacs Lisp debugger on functions you provide
+for token expansion, there is one other means of debugging which
+interactively steps over the rules in your grammar file.
+
+ -- Command: semantic-debug
+     Parse the current buffer and run in debug mode.
+
+Once the parser is activated in this mode, the current tag cache is
+flushed, and the parser started.  At each stage in the LALR parser, the
+current rule, and match step is highlighted in your parser source
+buffer.  In a second window, the text being parsed is shown, and the
+lexical token found is highlighted.  A clue of the current stack of
+saved data is displayed in the minibuffer.
+
+There is a wide range of keybindings that can be used to execute code
+in your buffer.  (Not all are implemented.)
+
+`n'
+`SPC'
+     Next.
+
+`s'
+     Step.
+
+`u'
+     Up.  (Not implemented yet.)
+
+`d'
+     Down.  (Not implemented yet.)
+
+`f'
+     Fail Match.  Pretend the current match element and the token in the
+     buffer is a failed match, even if it is not.
+
+`h'
+     Print information about the current parser state.
+
+`s'
+     Jump to to the source buffer.
+
+`p'
+     Jump to the parser buffer.
+
+`q'
+     Quit.  Exits this debug session and the parser.
+
+`a'
+     Abort.  Aborts one level of the parser, possibly exiting the
+     debugger.
+
+`g'
+     Go.  Stop debugging, and just start parsing.
+
+`b'
+     Set Breakpoint.  (Not implemented yet.)
+
+`e'
+     `eval-expression'.  Lets you execute some random Emacs Lisp
+     command.
+
+Note: While the core of `semantic-debug' is a generic debugger
+interface for rule based grammars, only the bovine parser has a
+specific backend implementation.  If someone wants to implement a
+debugger backend for wisent, that would be spiff.
+
+
+File: semantic-langdev.info,  Node: Wisent Parser Debugging,  Next: Overlay Debugging,  Prev: Bovine Parser Debugging,  Up: Debugging
+
+6.4 Wisent Parser Debugging
+===========================
+
+Wisent does not implement a backend for `semantic-debug', it does have
+some debugging commands the rule actions.  You can read about them in
+the wisent manual.
+
+*note (wisent)Grammar Debugging::
+
+
+File: semantic-langdev.info,  Node: Overlay Debugging,  Next: Incremental Parser Debugging,  Prev: Wisent Parser Debugging,  Up: Debugging
+
+6.5 Overlay Debugging
+=====================
+
+Once a buffer has been parsed into a tag table, the next most important
+step is getting those tags activated for a buffer, and storable in a
+`semanticdb' backend.  *note (semantic-appdev)semanticdb::.
+
+These two activities depend on the ability of every tag in the table to
+be linked and unlinked to the current buffer with an overlay.  *note
+(Tag Overlay)semantic-appdev:: *note (Tag Hooks)semantic-appdev::
+
+In this case, the most important function that must be written is:
+
+ -- Function: semantic-tag-components-with-overlays tag
+     Return the list of top level components belonging to TAG.
+     Children are any sub-tags which contain overlays.
+
+     Default behavior is to get "semantic-tag-components" in addition
+     to the components of an anonymous types (if applicable.)
+
+     Note for language authors:   If a mode defines a language tag that
+     has tags in it with overlays you should still return them with
+     this function.  Ignoring this step will prevent several features
+     from working correctly.  This function can be overridden in
+     semantic using the symbol `tag-components-with-overlays'.
+
+If your are successfully building a tag table, and errors occur saving
+or restoring tags from semanticdb, this is the most likely cause of the
+problem.
+
+
+File: semantic-langdev.info,  Node: Incremental Parser Debugging,  Next: Semantic 1.4 Doc,  Prev: Overlay Debugging,  Up: Debugging
+
+6.6 Incremental Parser Debugging
+================================
+
+The incremental parser is a highly complex engine for quickly
+refreshing the tag table of a buffer after some set of changes have
+been made to that buffer by a user.
+
+There is no debugger or interface to the incremental parser, however
+there are a few minor modes which can help you identify issues if you
+think there are problems while incrementally parsing a buffer.
+
+The first stage of the incremental parser is in tracking the changes
+the user makes to a buffer.  You can visibly track these changes too.
+
+ -- Command: semantic-highlight-edits-mode &optional arg
+     Minor mode for highlighting changes made in a buffer.  Changes are
+     tracked by semantic so that the incremental parser can work
+     properly.  This mode will highlight those changes as they are
+     made, and clear them when the incremental parser accounts for
+     those edits.  With prefix argument ARG, turn on if positive,
+     otherwise off.  The minor mode can be turned on only if semantic
+     feature is available and the current buffer was set up for
+     parsing.  Return non-`nil' if the minor mode is enabled.
+
+Another important aspect of the incremental parser involves tracking
+the current parser state of the buffer.  You can track this state also.
+
+ -- Command: semantic-show-parser-state-mode &optional arg
+     Minor mode for displaying parser cache state in the modeline.  The
+     cache can be in one of three states.  They are Up to date, Partial
+     reparse needed, and Full reparse needed.  The state is indicated
+     in the modeline with the following characters:
+    `-'
+          The cache is up to date.
+
+    `!'
+          The cache requires a full update.
+
+    `^'
+          The cache needs to be incrementally parsed.
+
+    `%'
+          The cache is not currently parseable.
+
+    `@'
+          Auto-parse in progress (not set here.)
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+When the incremental parser starts updating the tags buffer, you can
+also enable a set of messages to help identify how the incremental
+parser is merging changes with the main buffer.
+
+ -- Variable: semantic-edits-verbose-flag
+     Non-`nil' means the incremental parser is verbose.  If `nil',
+     errors are still displayed, but informative messages are not.
+
+
+File: semantic-langdev.info,  Node: Semantic 1.4 Doc,  Prev: Incremental Parser Debugging,  Up: Debugging
+
+6.7 Semantic 1.4 Doc
+====================
+
+In semantic 1.4 the following documentation was written for debugging.
+I'm leaving in here until better doc for 2.0 is done.
+
+Writing language files using BY is significantly easier than writing
+then using regular expressions in a functional manner.  Debugging them,
+however, can still prove challenging.
+
+There are two ways to debug a language definition if it is not behaving
+as expected.  One way is to debug against the source `.by' file.
+
+If your language definition was written in BNF notation, debugging is
+quite easy.  The command `semantic-debug' will start you off.
+
+ -- Command: semantic-debug
+     Reparse the current buffer and run in parser debug mode.
+
+While debugging, two windows are visible.  One window shows the file
+being parsed, and the syntactic token being tested is highlighted.  The
+second window shows the table being used (in the BY source) with the
+current rule highlighted.  The cursor will sit on the specific match
+rule being tested against.
+
+In the minibuffer, a brief summary of the current situation is listed.
+The first element is the syntactic token which is a list of the form:
+
+     (TYPE START . END)
+
+The rest of the display is a list of all strings collected for the
+currently tested rule.  Each time a new rule is entered, the list is
+restarted.  Upon returning from a rule into a previous match list, the
+previous match list is restored, with the production of the dependent
+rule in the list.
+
+Use `C-g' to stop debugging.  There are no commands for any fancier
+types of debugging.
+
+NOTE: Semantic 2.0 has more debugging commands.  Use: `C-h m
+semantic-debug-mode' to view.
+
+
+File: semantic-langdev.info,  Node: Parser Error Handling,  Next: GNU Free Documentation License,  Prev: Debugging,  Up: Top
+
+7 Parser Error Handling
+***********************
+
+NOTE: Write Me
+
+
+File: semantic-langdev.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Parser Error Handling,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: semantic-langdev.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* bovinate:                              Parser Output tools. (line  65)
+* define-lex:                            Lexer Construction.  (line  12)
+* define-lex-analyzer:                   Lexer Analyzer Construction.
+                                                              (line  10)
+* define-lex-block-analyzer:             Lexer Analyzer Construction.
+                                                              (line  64)
+* define-lex-regex-analyzer:             Lexer Analyzer Construction.
+                                                              (line  38)
+* define-lex-simple-regex-analyzer:      Lexer Analyzer Construction.
+                                                              (line  44)
+* function overloading:                  Semantic Overload Mechanism.
+                                                              (line  19)
+* Language Support Overview:             Language Support Overview.
+                                                              (line   6)
+* overloading, function:                 Semantic Overload Mechanism.
+                                                              (line  19)
+* Parser Error Handling:                 Parser Error Handling.
+                                                              (line   6)
+* semantic-clear-toplevel-cache:         Parsing a language file.
+                                                              (line  36)
+* semantic-debug <1>:                    Semantic 1.4 Doc.    (line  20)
+* semantic-debug:                        Bovine Parser Debugging.
+                                                              (line  13)
+* semantic-edits-verbose-flag:           Incremental Parser Debugging.
+                                                              (line  60)
+* semantic-fetch-available-tags:         Parsing a language file.
+                                                              (line  26)
+* semantic-fetch-tags:                   Parsing a language file.
+                                                              (line  11)
+* semantic-highlight-by-attribute-mode:  Parser Output tools. (line  51)
+* semantic-highlight-edits-mode:         Incremental Parser Debugging.
+                                                              (line  18)
+* semantic-lex:                          Writing Lexers.      (line  22)
+* semantic-lex-beginning-of-line:        Lexer Built In Analyzers.
+                                                              (line  11)
+* semantic-lex-charquote:                Lexer Built In Analyzers.
+                                                              (line  70)
+* semantic-lex-close-paren:              Lexer Built In Analyzers.
+                                                              (line  88)
+* semantic-lex-comments:                 Lexer Built In Analyzers.
+                                                              (line  94)
+* semantic-lex-comments-as-whitespace:   Lexer Built In Analyzers.
+                                                              (line  97)
+* semantic-lex-debug:                    Lexical Debugging.   (line  13)
+* semantic-lex-default-action:           Lexer Built In Analyzers.
+                                                              (line   7)
+* semantic-lex-ignore-comments:          Lexer Built In Analyzers.
+                                                              (line 100)
+* semantic-lex-ignore-newline:           Lexer Built In Analyzers.
+                                                              (line  22)
+* semantic-lex-ignore-whitespace:        Lexer Built In Analyzers.
+                                                              (line  30)
+* semantic-lex-keyword-get:              Keywords.            (line  22)
+* semantic-lex-keyword-p:                Keywords.            (line  15)
+* semantic-lex-keyword-put:              Keywords.            (line  19)
+* semantic-lex-keywords:                 Keywords.            (line  30)
+* semantic-lex-map-keywords:             Keywords.            (line  25)
+* semantic-lex-newline:                  Lexer Built In Analyzers.
+                                                              (line  14)
+* semantic-lex-newline-as-whitespace:    Lexer Built In Analyzers.
+                                                              (line  17)
+* semantic-lex-number:                   Lexer Built In Analyzers.
+                                                              (line  33)
+* semantic-lex-number-expression:        Lexer Built In Analyzers.
+                                                              (line  37)
+* semantic-lex-open-paren:               Lexer Built In Analyzers.
+                                                              (line  85)
+* semantic-lex-paren-or-list:            Lexer Built In Analyzers.
+                                                              (line  81)
+* semantic-lex-punctuation:              Lexer Built In Analyzers.
+                                                              (line  73)
+* semantic-lex-punctuation-type:         Lexer Built In Analyzers.
+                                                              (line  76)
+* semantic-lex-string:                   Lexer Built In Analyzers.
+                                                              (line  91)
+* semantic-lex-symbol-or-keyword:        Lexer Built In Analyzers.
+                                                              (line  67)
+* semantic-lex-whitespace:               Lexer Built In Analyzers.
+                                                              (line  27)
+* semantic-show-parser-state-mode:       Incremental Parser Debugging.
+                                                              (line  31)
+* semantic-show-tag-boundaries-mode:     Parser Output tools. (line  39)
+* semantic-show-unmatched-syntax-mode:   Parser Output tools. (line  14)
+* semantic-tag-components-with-overlays: Overlay Debugging.   (line  17)
+* semantic-tag-expand-function:          Tag Expansion.       (line  10)
+* Tag Structure:                         Tag Structure.       (line   6)
+* Writing Lexers:                        Writing Lexers.      (line   6)
+* Writing Parsers:                       Writing Parsers.     (line   6)
+
+
+
+Tag Table:
+Node: Top1145
+Node: Tag Structure2251
+Node: Language Support Overview4217
+Node: Semantic Overload Mechanism5478
+Node: Semantic Parser Structure10686
+Node: Application API Structure10988
+Node: Semantic Analyzer Support12494
+Node: Writing Lexers12656
+Ref: semantic-lex13504
+Node: Lexer Overview14708
+Node: Lexer Output15943
+Node: Lexer Construction19800
+Ref: define-lex20205
+Node: Lexer Built In Analyzers21060
+Node: Lexer Analyzer Construction24558
+Node: Keywords28830
+Node: Keyword Properties30405
+Node: Writing Parsers31285
+Node: External Parsers32769
+Node: Grammar Programming Environment33368
+Node: Parsing a language file33922
+Ref: semantic-fetch-tags34296
+Ref: semantic-fetch-available-tags35066
+Ref: semantic-clear-toplevel-cache35516
+Node: Parser Backend Support35674
+Node: Example Backend File36476
+Node: Tag Expansion38756
+Ref: semantic-tag-expand-function39085
+Node: Debugging40736
+Node: Lexical Debugging41240
+Ref: semantic-lex-debug41656
+Node: Parser Output tools42131
+Ref: semantic-show-unmatched-syntax-mode42630
+Ref: semantic-show-tag-boundaries-mode43565
+Ref: semantic-highlight-by-attribute-mode44203
+Ref: bovinate44913
+Node: Bovine Parser Debugging45147
+Ref: semantic-debug45621
+Node: Wisent Parser Debugging47135
+Node: Overlay Debugging47525
+Ref: semantic-tag-components-with-overlays48246
+Node: Incremental Parser Debugging48990
+Ref: semantic-highlight-edits-mode49759
+Ref: semantic-show-parser-state-mode50494
+Ref: semantic-edits-verbose-flag51511
+Node: Semantic 1.4 Doc51646
+Node: Parser Error Handling53417
+Node: GNU Free Documentation License53610
+Node: Index73363
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/semantic-user.info b/site/cedet-1.0pre7/semantic/doc/semantic-user.info
new file mode 100644
index 0000000..11af48e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semantic-user.info
@@ -0,0 +1,2611 @@
+This is semantic-user.info, produced by makeinfo version 4.9 from
+user-guide.texi.
+
+   This is the Semantic User's Manual
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Eric M. Ludlam Copyright (C) 2001, 2002, 2003, 2004 David
+Ponce Copyright (C) 2002, 2003 Richard Y. Kim
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic User's guide: (semantic-user).
+END-INFO-DIR-ENTRY
+
+   This is the Semantic User's Guide _Infrastructure for parser based
+text analysis in Emacs_
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam,
+David Ponce, and Richard Y. Kim
+
+
+File: semantic-user.info,  Node: Top,  Next: speedbar,  Up: (dir)
+
+Semantic User's Guide
+*********************
+
+This chapter describes how to use applications enabled by semantic.
+Many of these come with semantic, but others are distributed apart from
+semantic.
+
+For basics of configuring semantic and the parts that go into it read
+the *note Semantic manual: (semantic.info)Top.
+
+%c TODO - Re-organize this main topic as a set of user-cases
+
+* Menu:
+
+* speedbar::                    How to use Semantic speedbar support
+* ECB::                         Emacs Code Browser
+* imenu::                       Special support for Imenu.
+* senator::                     The Semantic Navigator
+* Analyzer::                    Context sensitive Help & smart completion
+* SymRef::                      Symbol Reference tools. (usages of tags)
+* Document::                    Document generation functions
+* Charts::                      Charting code statistics
+* Idle Scheduler::              The idle Scheduler and related modes
+* Minor Modes::                 Useful minor modes
+* semanticdb::                  Cache your parsed buffers between sessions.
+* Debugging::                   How to debug speed or accuracy issues.
+* GNU Free Documentation License::
+* Index::
+
+
+File: semantic-user.info,  Node: speedbar,  Next: ECB,  Prev: Top,  Up: Top
+
+1 speedbar
+**********
+
+Speedbar supports the display of tags through the Semantic parser.  To
+use this utility, add a line like this to your `.emacs' file:
+
+     (add-hook 'speedbar-load-hook (lambda () (require 'semantic-sb)))
+
+or you can simply add:
+
+     (require 'semantic-sb)
+
+Once installed, speedbar will use semantic to find tags, and will
+display them appropriately.  Tags from semantic will have additional
+details which can be seen, such as return type, or arguments to
+functions.
+
+If you use `semantic-load.el', you do not need to add the above lines
+in your `.emacs' file.
+
+Two additional speedbar modes are described in *Note Speedbar Analysis::
+
+
+File: semantic-user.info,  Node: ECB,  Next: imenu,  Prev: speedbar,  Up: Top
+
+2 ECB
+*****
+
+From the ECB Website: `http://ecb.sourceforge.net':
+
+     ECB is a source code browser for Emacs. It is a global minor-mode
+     which displays a couple of windows that can be used to browse
+     directories, files and file-contents like methods and variables.
+
+
+File: semantic-user.info,  Node: imenu,  Next: senator,  Prev: ECB,  Up: Top
+
+3 imenu
+*******
+
+There is special support for creating Imenu entries using semantic.
+This is a highly customizable tool which can create specialized menu
+systems for navigating your source file.
+
+By default, each language that wants special imenu support will set
+itself up for it.  To setup imenu for your buffers, use this command in
+your `.emacs' file:
+
+     (add-hook 'semantic-init-hooks (lambda ()
+                                    	   (imenu-add-to-menubar "TAGS")))
+
+Also supported is "which-func-mode".  This usually uses imenu tags to
+show the current function.  The semantic support for this function uses
+overlays, which is much faster.
+
+If you use `semantic-load.el', you do not need to add the above lines
+in your `.emacs' file.
+
+You can customize imenu with the following options:
+
+ -- Option: semantic-imenu-summary-function
+     Function to use when creating items in Imenu.  Some useful
+     functions are found in `semantic-format-tag-functions'.
+
+ -- Option: semantic-imenu-bucketize-file
+     Non-`nil' if tags in a file are to be grouped into buckets.
+
+ -- Option: semantic-imenu-buckets-to-submenu
+     Non-`nil' if buckets of tags are to be turned into submenus.  This
+     option is ignored if `semantic-imenu-bucketize-file' is nil.
+
+ -- Option: semantic-imenu-expand-type-members
+     Non-`nil' if types should have submenus with members in them.
+
+ -- Option: semantic-imenu-bucketize-type-members
+     Non-`nil' if members of a type should be grouped into buckets.
+     `nil' means to keep them in the same order.  Overridden to `nil'
+     if `semantic-imenu-bucketize-file' is nil.
+
+ -- Option: semantic-imenu-sort-bucket-function
+     Function to use when sorting tags in the buckets of functions.
+     See "semantic-bucketize" and the FILTER argument for more details
+     on this function.
+
+ -- Option: semantic-imenu-index-directory
+     Non `nil' to index the entire directory for tags.  Doesn't
+     actually parse the entire directory, but displays tags for all
+     files currently listed in the current Semantic database.  This
+     variable has no meaning if semanticdb is not active.
+
+ -- Option: semantic-imenu-auto-rebuild-directory-indexes
+     If non-`nil' automatically rebuild directory index imenus.  That
+     is when a directory index imenu is updated, automatically rebuild
+     other buffer local ones based on the same semanticdb.
+
+When adding support to a language, this variable may need to be set:
+
+ -- Variable: semantic-imenu-expandable-tag-classes
+     List of expandable tag classes.  Tags of those classes will be
+     given submenu with children.  By default, a `type' has interesting
+     children.  In Texinfo, however, a `section' has interesting
+     children.
+
+
+File: semantic-user.info,  Node: senator,  Next: Analyzer,  Prev: imenu,  Up: Top
+
+4 senator
+*********
+
+Senator stands for SEmantic NAvigaTOR and was written by David Ponce.
+
+This library defines commands and a minor mode to navigate and manage
+semantic language tags in the current buffer.
+
+4.1 Commands
+============
+
+The following user level commands are provided by Senator.
+
+4.1.1 Navigation
+----------------
+
+ -- Function: senator-next-tag
+     Navigate to the next Semantic tag.  Return the tag or `nil' if at
+     end of buffer.
+
+ -- Function: senator-previous-tag
+     Navigate to the previous Semantic tag.  Return the tag or `nil' if
+     at beginning of buffer.
+
+ -- Function: senator-jump
+     Jump to the semantic symbol SYM.
+
+     If optional IN-CONTEXT is non-`nil' jump in the local type's
+     context (see function "senator-current-type-context").  If optional
+     NO-DEFAULT is non-`nil' do not provide a default value.
+
+     When called interactively you can combine the IN-CONTEXT and
+     NO-DEFAULT switches like this:
+
+     - `C-u'       IN-CONTEXT.  - `C-u' -     NO-DEFAULT.  - `C-u'
+     `C-u'   IN-CONTEXT + NO-DEFAULT.
+
+ -- Function: senator-go-to-up-reference tag
+     Move up one reference from the current TAG.  A "reference" could
+     be any interesting feature of TAG.  In C++, a function may have a
+     'parent' which is non-local.  If that parent which is only a
+     reference in the function tag is found, we can jump to it.  Some
+     tags such as includes have other reference features.
+
+4.1.2 Searching
+---------------
+
+Searching using senator mode restricts the search only to the
+definition text, such as the name of the functions or variables in a
+given buffer.
+
+ -- Command: senator-isearch-toggle-semantic-mode
+     Toggle semantic searching on or off in isearch mode.  `C-c , i'
+     toggle semantic searching.
+
+ -- Command: senator-search-forward what &optional bound noerror count
+ -- Command: senator-search-backward what &optional bound noerror count
+     Search semantic tags forward or backward from point for string
+     WHAT.  Set point to the end of the occurrence found, and return
+     point.  See "search-forward" for details and the meaning of BOUND
+     NOERROR and COUNT.  COUNT is just ignored in the current
+     implementation.
+
+ -- Command: re-search-forward regex
+ -- Command: re-search-backward regex
+     Search forward and backward for a token matching the regular
+     expression REGEX.
+
+ -- Command: word-search-forward word
+ -- Command: word-search-backward word
+     Search forward and backward for a token whose name matches WORD.
+
+4.1.3 Completion
+----------------
+
+Completion in senator scans all known definitions in the local file,
+and uses that information to provide the completion.
+
+ -- Command: senator-complete-symbol &optional cycle-once
+     Complete the current symbol under point.  If optional argument
+     CYCLE-ONCE is non-`nil', only cycle through the list of
+     completions once, doing nothing where there are no more matches.
+
+ -- Command: senator-completion-menu-popup
+     Popup a completion menu for the symbol at point.  The popup menu
+     displays all of the possible completions for the symbol it was
+     invoked on.  To automatically split large menus this function use
+     "imenu-mouse-menu" to handle the popup menu.
+
+4.1.4 Copy/Paste
+----------------
+
+Token Copy/Paste is a high level form of the typical copy yank used by
+Emacs.  Copying a tag saves the meta-information related to the
+function or item the cursor is currently in.  When that information is
+yanked into a new buffer, the form of the text created is based on the
+current status of the programming buffer.
+
+For example, pasting a function into a different file results in a
+function call template to be inserted.  In a Texinfo file, a @deffn is
+created with documentation for that function or command.
+
+ -- Command: senator-copy-tag
+     Take the current tag, and place it in the tag ring.
+
+ -- Command: senator-kill-tag
+     Take the current tag, place it in the tag ring, and kill it.
+     Killing the tag removes the text for that tag, and places it into
+     the kill ring.  Retrieve that text with `C-y'.
+
+ -- Command: senator-yank-tag
+     Yank a tag from the tag ring.  The form the tag takes is different
+     depending on where it is being yanked to.
+
+ -- Command: senator-copy-tag-to-register register &optional kill-flag
+     Copy the current tag into REGISTER.  Optional argument KILL-FLAG
+     will delete the text of the tag to the kill ring.
+
+For programmers, to provide specialized pasting, created an override
+function for `insert-foreign-tag' (see *note (semantic-langdev)Writing
+Parsers::.)
+
+4.1.5 Minor Mode
+----------------
+
+ -- Command: senator-minor-mode
+     Toggle the SEmantic NAvigaTOR key bindings in the current buffer.
+
+     The following default key bindings are provided when semantic minor
+     mode is enabled:
+
+    <C-c , n>
+          senator-next-tag
+
+    <C-c , p>
+          senator-previous-tag
+
+    <C-c , i>
+          senator-isearch-toggle-semantic-mode
+
+    <C-c , j>
+          (Lower case j) semantic-complete-jump-local
+
+    <C-c , J>
+          (Upper case J) semantic-complete-jump
+
+    <C-c , u>
+          senator-go-to-up-reference
+
+    <C-c , g>
+          semantic-symref
+
+    <C-c , G>
+          semantic-symref-symbol
+
+    <C-c , TAB>
+          senator-complete-symbol
+
+    <C-c , SPC>
+          senator-completion-menu-popup
+
+    <C-c , C-y>
+          senator-yank-tag
+
+    <C-c , C-w>
+          senator-kill-tag
+
+    <C-c , M-w>
+          senator-copy-tag
+
+    <C-c , +>
+          senator-unfold-tag
+
+    <C-c , ->
+          senator-fold-tag
+
+4.2 Customization
+=================
+
+To enable the Senator keymap in all modes that support semantic parsing,
+use this:
+
+     (add-hook 'semantic-init-hooks 'senator-minor-mode)
+
+If you use `semantic-load.el', you do not need to add the above lines
+in your `.emacs' file.
+
+To customize navigation around different types of tokens, use the
+following variables:
+
+ -- Option: senator-step-at-tag-classes
+     List of tag classes where to step.  A tag class is a symbol like
+     `'variable', `'function', `'type', or other.  If `nil' navigation
+     steps at any tag found.  This is a buffer local variable.  It can
+     be set in a mode hook to get a specific langage navigation.
+
+ -- Option: senator-step-at-start-end-tag-classes
+     List of tag classes where to step at start and end.  A tag class
+     is a symbol like `'variable', `'function', `'type', or other.  If
+     `nil', navigation only step at beginning of tags.  If `t', step at
+     start and end of any tag where it is allowed to step.  Also,
+     stepping at start and end of a tag prevent stepping inside its
+     components.  This is a buffer local variable.  It can be set in a
+     mode hook to get a specific langage navigation.
+
+To have a mode specific customization, do something like this in a hook:
+
+     (add-hook 'mode-hook
+               (lambda ()
+                 (setq senator-step-at-tag-classes '(function variable))
+                 (setq senator-step-at-start-end-tag-classes '(function))
+                 ))
+
+This will cause navigation and search commands to stop only between
+functions and variables, and to step at start and end of functions only.
+
+
+File: semantic-user.info,  Node: Analyzer,  Next: SymRef,  Prev: senator,  Up: Top
+
+5 Analyzer
+**********
+
+The semantic analyzer is a library tool that performs context analysis
+and can derive useful information.
+
+ -- Command: semantic-analyze-current-context position
+     Analyze the current context at POSITION.  If called interactively,
+     display interesting information about POSITION in a separate
+     buffer.  Returns an object based on symbol
+     "semantic-analyze-context".
+
+While this can be used as a command, it is mostly useful while
+debugging the analyzer, or tools using the return value.  Use the Emacs
+command "describe-class" to learn more about using
+`semantic-analyze-context'.
+
+Another command that uses the analyzer context can derive a completion
+list.
+
+ -- Command: semantic-analyze-possible-completions context
+     Return a list of semantic tags which are possible completions.
+     CONTEXT is either a position (such as point), or a precalculated
+     context.  Passing in a context is useful if the caller also needs
+     to access parts of the analysis.  Completions run through the
+     following filters:
+    Elements currently in scope
+
+    Constants currently in scope
+
+    Elements match the `:prefix' in the CONTEXT.
+
+    Type of the completion matches the type of the context.
+          Context type matching can identify the following:
+
+    No specific type
+
+    Assignment into a variable of some type.
+
+    Argument to a function with type constraints.
+          When called interactively, displays the list of possible
+          completions in a buffer.
+
+* Menu:
+
+* Smart Completion::       Functions you can bind to keys for completion
+* Smart Summary::          Routines for displaying help on a symbol
+* Smart Jump::             Routines for jumping to tag origins
+* Speedbar Analysis::      Speedbar provided completion
+* Smart Completion Debugging:: How to debug analyzer issues.
+
+
+File: semantic-user.info,  Node: Smart Completion,  Next: Smart Summary,  Up: Analyzer
+
+5.1 Smart Completion
+====================
+
+The file `semantic-ia.el' contains two commands for performing smart
+completion using the analysis library.  Analysis to calculate these
+completions are done through the analyzer and completion mechanism.
+These functions just provide commands that can be bound to key bindings.
+
+ -- Command: semantic-ia-complete-symbol point
+     Complete the current symbol at POINT.  Completion options are
+     calculated with "semantic-analyze-possible-completions".
+
+ -- Command: semantic-ia-complete-symbol-menu point
+     Complete the current symbol via a menu based at POINT.  Completion
+     options are calculated with
+     "semantic-analyze-possible-completions".
+
+ -- Command: semantic-ia-complete-tip point
+     Pop up a tooltip for completion at POINT.
+
+You can get smart completions or summary information to automatically
+popup without explicitly pressing a key or running a function.
+
+This is accomplished through the Idle Scheduler and related features.
+See *Note Idle Scheduler:: for more on the Scheduler.
+
+Completions are provided with `semantic-idle-completions-mode'.  See
+*Note Idle Completions Mode::.
+
+
+File: semantic-user.info,  Node: Smart Summary,  Next: Smart Jump,  Prev: Smart Completion,  Up: Analyzer
+
+5.2 Smart Summary
+=================
+
+Aside from completion, the analyzer can also be used just to show a
+summary of what is under point.  These routines will summarize the
+symbol in question in different ways.
+
+ -- Command: semantic-ia-show-summary point
+     Display a summary for the symbol under POINT.
+
+ -- Command: semantic-ia-show-doc point
+     Display the code-level documentation for the symbol at POINT.
+
+ -- Command: semantic-ia-describe-class typename
+     Display as all known parts for the datatype TYPENAME.  If the type
+     in question is a class, all methods and other accessible parts of
+     the parent classes are displayed.
+
+You can also get summaries to popup in idle time without having to
+press a key to get the information.
+
+This is accomplished through the Idle Scheduler and related features.
+See *Note Idle Scheduler:: for more on the Scheduler.
+
+Summaries are provided with `semantic-idle-summary-mode'.  See *Note
+Idle Summary Mode::.
+
+
+File: semantic-user.info,  Node: Smart Jump,  Next: Speedbar Analysis,  Prev: Smart Summary,  Up: Analyzer
+
+5.3 Smart Jump
+==============
+
+If you are on a symbol in some code, you might want to jump directly to
+it.  You can use `find-tag', but in complex C++ systems, you can spend
+a lot of time pressing `C-h M-.' trying to find the specific instance
+of some function.
+
+The analyzer can pinpoint very closely to where you actually indent
+based on code context.
+
+ -- Command: semantic-ia-fast-jump point
+     Jump to the tag referred to by the code at POINT.  Uses
+     "semantic-analyze-current-context" output to identify an accurate
+     origin of the code at point.
+
+ -- Function: semantic-ia-fast-mouse-jump evt
+     Jump to the tag referred to by the point clicked on.  This command
+     is meant to be bound to a mouse event.
+
+You can use the mouse jump version by adding a configuration like this
+into your `.emacs' file.
+
+     (global-set-key '[(S-mouse-1)] 'mouse-jump)
+
+
+File: semantic-user.info,  Node: Speedbar Analysis,  Next: Smart Completion Debugging,  Prev: Smart Jump,  Up: Analyzer
+
+5.4 Speedbar Analysis
+=====================
+
+The Analyzer output can be used through a speedbar interface.  This
+interface lists details about the analysis, such as the current
+function, local arguments and variables, details on the prefix (the
+symbol the cursor is on), and a list of all possible completions.
+Completions are specified in "semantic-analyze-possible-completions"
+*Note Analyzer::.
+
+Each entry can be jumped to by clicking on the name.  For strongly
+typed languages, this means you will jump to the definition of the
+variable, slot, or type definition.
+
+In addition each entry has an <i> button.  Clicking on this will
+display a summary of everything that is known about the variable or
+type displayed on that line.
+
+If you click on the name of a variable in the "Completions" menu, then
+the text that was recently analyzed will be replaced with the name of
+the token that was clicked on in speedbar.
+
+ -- Command: semantic-speedbar-analysis
+     Start Speedbar in semantic analysis mode.  The analyzer displays
+     information about the current context, plus a smart list of
+     possible completions.
+
+You can also enter speedbar analyzer mode by selecting "Analyze" from
+the "Display" menu item on speedbar's menu.
+
+
+File: semantic-user.info,  Node: Smart Completion Debugging,  Prev: Speedbar Analysis,  Up: Analyzer
+
+5.5 Smart Completion Debugging
+==============================
+
+If you think you've configured your system correctly, but semantic
+still can't find a definition you are looking for, you may have run
+into either a bug in semantic, an incomplete configuration, or somehow
+gotten semantic's set of cached tables into a bad state.
+
+This section was written with C/C++ in mind, but should be relevant for
+any typed language.
+
+5.6 Step 1: Check the context
+=============================
+
+The first thing to do is check the current context.  You can do this
+with `M-x semantic-analyze-current-context'.  If you look at the Prefix
+section, you should see a list of tags based on the text from under
+point.  If it shows only a simple string, the Semantic was unable to
+identify what the data type was.
+
+The first item in the list of the prefix is the first lookup failure in
+the chain, and that is the item to focus debugging effort on.  For more
+on the analyzer, see *Note Analyzer::.
+
+     Context Type: #<semantic-analyze-context context>
+     Bounds: (182 . 185)
+     Prefix: Foo* bar
+             int bbb (const char* y)
+     Prefix Types: class Foo {}
+     --------
+     -> Local Vars: int argc
+                    char** argv
+
+In the above example you can see that the prefix has two fully found
+tags.  In the below example, the symbol "bbb" is incomplete, and could
+not be found.
+
+     Context Type: #<semantic-analyze-context context>
+     Bounds: (182 . 184)
+     Prefix: Foo* bar
+             "bb"
+     Prefix Classes: 'function
+                     'variable
+     Prefix Types: class Foo {}
+     --------
+     -> Local Vars: int argc
+                    char** argv
+
+5.7 Step 2 : Check your include path
+====================================
+
+Once you know what symbol can't be found, the next thing to check is
+your include path.  Is the header or include file that has the
+definitions you need actually in the list of headers semantic is
+searching through?  To get a basic list, you can use `M-x
+semanticdb-find-test-translate-path'.
+
+This will give you a list of database tables (by name) that semantic
+can find.  This list is in ADEBUG mode.  Use `SPC' to expand items to
+see if the tag you are looking for is in there.
+
+For C++, check to make sure that your project level include files are
+in "quotes", and not in <angle brackets>.  Items in angle brackets are
+system includes.
+
+See *Note Semanticdb search debugging commands:: for more commands.
+
+If items should be loaded but aren't, you may need to update the search
+throttle.  See *Note Search Throttle::.
+
+If you see some tables that have 0 tags in them, then you you may have
+an incorrectly set throttle.
+
+     *#<semanticdb-table main.cpp (4 tags DIRTY)>
+     *#<semanticdb-table foo.hh (0 tags DIRTY)>
+
+In the above example, semantic found `foo.hh', but there are 0 tags.
+This may be because the throttle was set to not read in and parse files
+that Emacs has not yet loaded in.  To fix this case, visit the file,
+and let semantic parse and save the tags table.
+
+5.8 Step 3: Check the local scope
+=================================
+
+If your data type is somehow abbreviated based on scope, such as from a
+`using' statement, you will need to make sure that the symbol you want
+is in the local scope.  Examine the scope with `M-x
+semantic-calculate-scope'.  The scope structure is displayed in ADEBUG
+mode, so use `SPC' to expand different elements and looking for your
+symbol.
+
+If your symbol should be in the scope, but you cannot find it, then you
+may have found a language support bug in the local-variable parser, or
+using statement parser.
+
+Calling `M-x bovinte' should force a reset on the scope in case there
+is merely some bad state.
+
+      ] Name: Cache
+      ] Class: #'semantic-scope-cache
+      ] :table #<semanticdb-table testsubclass.cpp (13 tags DIRTY)>
+      ] tag createMoose : class moose
+      ] scopetypes 'nil
+      ] parents #<TAG LIST: 1 entries>
+      ] scope #<TAG LIST: 22 entries>
+      ] fullscope #<TAG LIST: 23 entries>
+      ] localvar #<TAG LIST: 6 entries>
+
+In the above sample output, the `tag' slot specifies where within you
+source this scope is relevant.  `Parents' should contain any in scope
+parents, such as the class a method belongs to.  `Localvar' should
+contain your local variables.  `Scope' should contain datatypes in
+scope due to a `using' statement or the like.
+
+5.9 Step 4: Check the typecache
+===============================
+
+For complex typed languages like C++, semantic creates a typecache, or
+an optimized search table with all the various data types in it.
+Elements in the typecache do not obey local scope.  It only contains
+fully qualified names.  You can examine the typecache with `M-x
+semanticdb-typecache-dump'.
+
+If your data types are not in the typecache, there may be some parsing
+error or other bug.  Calling `M-x bovinte' should force a reset on the
+typecache in case there is merely some bad state.
+
+     ]#<semanticdb-typecache /home/zappo/cedet/semantic/tests/testsubclass.cpp>
+        ] Name: /home/zappo/cedet/semantic/tests/testsubclass.cpp
+        ] Class: #'semanticdb-typecache
+        ] filestream 'nil
+        ] includestream #<TAG LIST: 84 entries>
+        ] stream 'nil
+        ] dependants 'nil
+
+In the above example, the output of `M-x semanticdb-typecache-dump' was
+expanded one level.  The `filestream' slot should contain datatypes in
+the current file.  The `includestream' should contain all the datatypes
+in all included header files.
+
+The `dependants' slot will specify other files that depend on this one.
+
+5.10 Step 5: Check the parser
+=============================
+
+Go to the location where your unfound tag should be.  You can call `M-x
+bovinate', and see a dump of the raw tag structure.  To see a navigable
+tree, use `M-x semantic-adebug-bovinate' instead.  You can then look to
+make sure your tag has been properly parsed.
+
+If it has not, then you may have found a parser bug.  To get a feel how
+semantic treats your file, you can enable `M-x
+global-semantic-show-unmatched-syntax-mode'.  It will underline syntax
+it cannot parse in red.
+
+If your type is not parsable, it could be for several reasons.
+
+  1. Parser Incorrect Perhaps the parser needs to be fixed.
+
+  2. C/C++ MACROs If there is a MACRO keyword used in the definition of
+     the type, then you may need to update the
+     `semantic-lex-c-preprocessor-symbol-map' to account for it.
+
+
+File: semantic-user.info,  Node: SymRef,  Next: Document,  Prev: Analyzer,  Up: Top
+
+6 SymRef - Symbol References
+****************************
+
+semantic can interfaces with external symbol reference tools, like GNU
+Global and IDUtils.  The symref tool interface can use one of these
+external tools to collect locations where different tags or symbols may
+be used.
+
+There are two main command into the symref system.  They are:
+
+ -- Command: semantic-symref
+     Find references to the current tag.  This command uses the
+     currently configured references tool within the current project to
+     find references to the current tag. The references are the
+     organized by file and the name of the function they are used in.
+     Display the references in"semantic-symref-results-mode"
+
+ -- Command: semantic-symref-symbol sym
+     Find references to the symbol SYM.  This command uses the
+     currently configured references tool within the current project to
+     find references to the input SYM. The references are the organized
+     by file and the name of the function they are used in.  Display
+     the references in"semantic-symref-results-mode"
+
+The results are listed by file, then by tag within those files.  You
+can expand tag hits to see the line of code a given match is on.  You
+can jump to the matched file, tag, or line from this mode.
+
+The type of external tool used for finding references determines the
+kind of results found.  Each available tool, such as GNU Global, will
+identify when it can be used.  If no such tool is available, then a
+find/grep combination will be used instead.
+
+For best results, install, and use GNU Global for your project.
+semantic symref does not manage your GNU Global tables for you.  You
+must manage those yourself.  The symref tool is not meant to replace
+the standard grep-like interface available with GNU Global.  It is
+meant to be a starting point for tools that can take advantage of
+reference information.
+
+To add support for a new tool, use semantic-symref-global.el as a
+starting point.  Then update `semantic-symref-tool-alist' to allow the
+new tool to be detected.
+
+ -- Function: semantic-symref-tool-alist
+     Alist of tools usable by "semantic-symref".  Each entry is of the
+     form:    ( PREDICATE . KEY ) Where PREDICATE is a function that
+     takes a directory name for the root of a project, and returns
+     non-`nil' if the tool represented by KEY is supported.
+
+     If no tools are supported, then `'grep' is assumed.
+
+@TODO - This mode is supposed to be the starting point of refactoring
+tools.  Doc those features here once they are written.
+
+
+File: semantic-user.info,  Node: Document,  Next: Charts,  Prev: SymRef,  Up: Top
+
+7 Document
+**********
+
+The document program uses semantic tag tables to aid in the creation of
+texinfo documentation.  For example, the following is a code fragment
+from `document.el' that comes with semantic:
+
+     (defun document (&optional resetfile)
+       "Document the function or variable the cursor is in.
+     Optional argument RESETFILE is provided w/ universal argument.
+     When non-nil, query for a new documentation file."
+       ...
+       )
+
+While visiting `document.el', put the cursor somewhere within the
+function shown above. Then type `M-x document'.  After asking for the
+texinfo file name, which in this case is `semantic.texi', this will
+update the texinfo documentation of the `document' function in that
+file.  The result is that the following texinfo text will be either
+created or updated in `user-guide.texi' file:
+
+     @deffn Command document &optional resetfile
+     Document the function or variable the cursor is in.
+     Optional argument @var{RESETFILE} is provided w/ universal argument.
+     When non-@code{nil}, query for a new documentation file.
+     @end deffn
+
+Note that the function name, arguments and documentation string is put
+in the right place.  Within the doc-string, the function arguments are
+marked with the @var command and the `nil' code fragment is marked with
+@code command.  This example provides just a glimpse of what is
+possible with the syntactic information provided by semantic.
+
+The main entry point for the documentation generator are the following
+commands:
+
+ -- Command: document &optional resetfile
+     Document the function or variable the cursor is in.  Optional
+     argument RESETFILE is provided w/ universal argument.  When
+     non-`nil', query for a new documentation file.
+
+ -- Command: document-inline
+     Document the current function with an inline comment.
+
+ -- Command: document-insert-defun-comment tag buffer
+     Insert mode-comment documentation about TAG from BUFFER.
+
+ -- Command: document-insert-new-file-header header
+     Insert a new header file into this buffer.  Add reference to
+     HEADER.  Used by `prototype' if this file doesn't have an
+     introductory comment.
+
+In addition to these base documentation commands, the texinfo semantic
+parser includes a two convenience functions when working directly with
+texinfo files.
+
+ -- Command: semantic-texi-update-doc &optional tag
+     Update the documentation for TAG.  If the current buffer is a
+     texinfo file, then find the source doc, and update it.  If the
+     current buffer is a source file, then get the documentation for
+     this item, find the existing doc in the associated manual, and
+     update that.
+
+ -- Command: semantic-texi-goto-source &optional tag
+     Jump to the source for the definition in the texinfo file TAG.  If
+     TAG is `nil', it is derived from the deffn under POINT.
+
+
+File: semantic-user.info,  Node: Charts,  Next: Idle Scheduler,  Prev: Document,  Up: Top
+
+8 Charts
+********
+
+Some commands to draw charts of statistics generated from parsing:
+
+ -- Command: semantic-chart-tags-by-class &optional tagtable
+     Create a bar chart representing the number of tags for a given tag
+     class.  Each bar represents how many toplevel tags in TAGTABLE
+     exist with a given class.  See `semantic-symbol->name-assoc-list'
+     for tokens which will be charted.  TAGTABLE is passedto
+     "semantic-something-to-tag-table".
+
+ -- Command: semantic-chart-database-size &optional tagtable
+     Create a bar chart representing the size of each file in
+     semanticdb.  Each bar represents how many toplevel tags in TAGTABLE
+     exist in each database entry.  TAGTABLE is passed to
+     "semantic-something-to-tag-table".
+
+ -- Command: semantic-chart-tag-complexity &optional class tagtable
+     Create a bar chart representing the complexity of some tags.
+     Complexity is calculated for tags of CLASS.  Each bar represents
+     the complexity of some tag in TAGTABLE.  Only the most complex
+     items are charted.  TAGTABLE is passedto
+     "semantic-something-to-tag-table".
+
+
+File: semantic-user.info,  Node: Idle Scheduler,  Next: Minor Modes,  Prev: Charts,  Up: Top
+
+9 Idle Scheduler
+****************
+
+The Idle Scheduler in Semantic 2.0 replaces what was once Auto-Parse
+mode.  The Idle Scheduler now performs multiple duties.
+
+The primary job is to schedule buffer parsing in idle time.  The first
+buffer whose cache is checked is the current buffer.  After this, all
+other buffers are checked.
+
+Once that has been accomplished, scheduled idle processes that use the
+semantic tag tables are run.
+
+ -- Command: global-semantic-idle-scheduler-mode &optional arg
+     Toggle global use of option "semantic-idle-scheduler-mode".  The
+     idle scheduler with automatically reparse buffers in idle time,
+     and then schedule other jobs setup with
+     "semantic-idle-scheduler-add".  If ARG is positive, enable, if it
+     is negative, disable.  If ARG is `nil', then toggle.
+
+     *Compatibility*: `global-semantic-idle-scheduler-mode' introduced
+     in semantic version 2.0 supercedes
+     `global-semantic-auto-parse-mode' which is now obsolete.
+
+
+*Compatibility*: `semantic-idle-scheduler-mode' introduced in semantic
+version 2.0 supercedes `semantic-auto-parse-mode' which is now obsolete.
+
+ -- Option: semantic-idle-scheduler-idle-time
+     Time in seconds of idle before scheduling events.  This time
+     should be short enough to ensure that idle-scheduler will be run
+     as soon as Emacs is idle.
+
+ -- Option: semantic-idle-scheduler-mode-hook
+     Hook run at the end of function "semantic-idle-scheduler-mode".
+
+ -- Option: semantic-idle-scheduler-verbose-flag
+     Non-`nil' means that the idle scheduler should provide debug
+     messages.  Use this setting to debug idle activities.
+
+You can add new functionality to the idle scheduler by reading the
+Application Developers Guide *note (semantic-appdev.info)Idle
+Scheduling::.
+
+* Menu:
+
+* Reparsing Options::           Reparsing the current buffer in idle time
+* Idle Working Options::        Options for extra work done at idle time
+* Debugging Idle Time Issues::  How to produce good bug reports.
+* Idle Summary Mode::           Display prototype of symbol under cursor
+* Idle Completions Mode::       Smart completion pop-up help.
+
+
+File: semantic-user.info,  Node: Reparsing Options,  Next: Idle Working Options,  Up: Idle Scheduler
+
+9.1 Reparsing Options
+=====================
+
+The Idle Scheduler will automatically reparse all buffers that need it.
+User input at any time will cancel the operations and return to normal
+editing.
+
+9.1.1 Reparse Configuration
+---------------------------
+
+ -- Option: semantic-idle-scheduler-max-buffer-size
+     Maximum size in bytes of buffers automatically reparsed.  If this
+     value is less than or equal to 0, buffers are automatically
+     reparsed regardless of their size.
+
+9.1.2 Reparse Messages
+----------------------
+
+ -- Option: semantic-idle-scheduler-no-working-message
+     If non-`nil', disable display of working messages during parse.
+
+ -- Option: semantic-idle-scheduler-working-in-modeline-flag
+     Non-`nil' means show working messages in the mode line.
+     Typically, parsing will show messages in the minibuffer.  This
+     will move the parse message into the modeline.
+
+9.1.3 Reparsing Hooks
+---------------------
+
+ -- Variable: semantic-before-idle-scheduler-reparse-hooks
+     Hooks run before option `semantic-idle-scheduler' begins parsing.
+     If any hook throws an error, this variable is reset to nil.  This
+     hook is not protected from lexical errors.
+
+ -- Variable: semantic-after-idle-scheduler-reparse-hooks
+     Hooks run after option `semantic-idle-scheduler' has parsed.  If
+     any hook throws an error, this variable is reset to nil.  This
+     hook is not protected from lexical errors.
+
+
+File: semantic-user.info,  Node: Idle Working Options,  Next: Debugging Idle Time Issues,  Prev: Reparsing Options,  Up: Idle Scheduler
+
+9.2 Idle Working Options
+========================
+
+Similiar to the reparsing that occurs at short intervals in idle time,
+there is extra work that can be controlled to occur in idle time also.
+
+Idle work occurs after a longer delay, and can be very time consuming.
+The work done includes:
+
+Create Include Path Caches
+     Create the optimized search caches needed for symbol lookup.
+
+Create Type Cache
+     Create the datatype caches needed for intellisense features.
+
+Save Databases
+     All file-based semantic databases are saved to disk.
+
+Parse neighboring files
+     All files in the same directory as the current buffer are
+     speculatively parsed.
+
+These features can be controlled with the following variables:
+
+ -- Option: semantic-idle-scheduler-work-idle-time
+     Time in seconds of idle before scheduling big work.  This time
+     should be long enough that once any big work is started, it is
+     unlikely the user would be ready to type again right away.
+
+ -- Option: semantic-idle-work-parse-neighboring-files-flag
+     Non-`nil' means to parse files in the same dir as the current
+     buffer.  Disable to prevent lots of excessive parsing in idle time.
+
+
+File: semantic-user.info,  Node: Debugging Idle Time Issues,  Next: Idle Summary Mode,  Prev: Idle Working Options,  Up: Idle Scheduler
+
+9.3 Debugging Idle Time Issues
+==============================
+
+If you see errors produced in idle time, it could be an indication of a
+more serious issue elsewhere.  It is not enough to enable
+`debug-on-error', as the idle timer tries to keep errors under wraps.
+
+Instead, there are two commands you can use whenever you see an idle
+error.
+
+ -- Command: semantic-debug-idle-function
+     Run the Semantic idle function with debugging turned on.
+
+ -- Command: semantic-debug-idle-work-function
+     Run the Semantic idle work function with debugging turned on.
+
+Once you identify the general location of the idle error, you can send
+the stack trace to the mailing list, or perhaps find a more focused way
+to reproduce the issue.
+
+
+File: semantic-user.info,  Node: Idle Summary Mode,  Next: Idle Completions Mode,  Prev: Debugging Idle Time Issues,  Up: Idle Scheduler
+
+9.4 Idle Summary Mode
+=====================
+
+Similar to the Emacs Lisp facility eldoc, `semantic-idle-summary-mode'
+will display the prototype, or other helpful doc about the symbol
+currently under point.
+
+ -- semantic-idle-summary-mode: &optional arg
+     Display a tag summary of the lexical token under the cursor.  This
+     means for getting the current tag to display information can be
+     overriden with `idle-summary-current-symbol-info'.  This is a
+     minor mode which performs actions during idle time.  With prefix
+     argument ARG, turn on if positive, otherwise off.  The minor mode
+     can be turned on only if semantic feature is available and the
+     current buffer was set up for parsing.  Return non-nil if the
+     minor mode is enabled
+
+
+*Compatibility*: `semantic-idle-summary-mode' introduced in semantic
+version 2.0 supercedes `semantic-summary-mode' which is now obsolete.
+
+ -- Option: semantic-idle-summary-function
+     Function to use when displaying tag information during idle time.
+     Some useful functions are found in `semantic-format-tag-functions'.
+
+ -- Variable: semantic-idle-summary-out-of-context-faces
+     List of font-lock faces that indicate a useless summary context.
+     Those are generally faces used to highlight comments or strings.
+
+     It might be useful to override this variable to add comment faces
+     specific to a major mode.  For example, in jde mode:
+
+          (defvar-mode-local jde-mode semantic-idle-summary-out-of-context-faces
+             (append (default-value 'semantic-idle-summary-out-of-context-faces)
+          	   '(jde-java-font-lock-doc-tag-face
+          	     jde-java-font-lock-link-face
+          	     jde-java-font-lock-bold-face
+          	     jde-java-font-lock-underline-face
+          	     jde-java-font-lock-pre-face
+          	     jde-java-font-lock-code-face)))
+
+
+
+File: semantic-user.info,  Node: Idle Completions Mode,  Prev: Idle Summary Mode,  Up: Idle Scheduler
+
+9.5 Idle Completions Mode
+=========================
+
+The definition of smart completion is described in the Analyzer section
+*Note Analyzer::.
+
+The Idle Completions mode will calculate the list of possible
+completions in idle time, and display them in a popup list, or other
+inline completion mechanism.
+
+ -- semantic-idle-completions-mode: &optional arg
+     Display a tooltip with a list of possible completions near the
+     cursor.  There is no convenience for performing a completion
+     replacement.  For that you should bind
+     `semantic-ia-complete-symbol'.  This is a minor mode which
+     performs actions during idle time.  With prefix argument ARG, turn
+     on if positive, otherwise off.  The minor mode can be turned on
+     only if semantic feature is available and the current buffer was
+     set up for parsing.  Return non-nil if the minor mode is enabled
+
+This mode operates by using the command
+`semantic-complete-inline-analyzer'.
+
+Idle completion uses the completion function
+`semantic-complete-analyze-inline-idle'.  Changing the behavior of the
+idle completion popups should be done through those utilities.
+
+ -- Command: semantic-complete-analyze-inline-idle
+     Perform prompt completion to do in buffer completion.
+     "semantic-analyze-possible-completions" is used to determine the
+     possible values.  The function returns immediately, leaving the
+     buffer in a mode that will perform the completion.  Configure
+     `semantic-complete-inline-analyzer-idle-displayor-class' to change
+     how completion options are displayed.
+
+ -- Option: semantic-complete-inline-analyzer-idle-displayor-class
+     Class for displayor to use with inline completion at idle time.
+
+     Customize this variable to get a list of options, such as popup
+     tooltips, ghosting text, or traditional completion tools.
+
+
+File: semantic-user.info,  Node: Minor Modes,  Next: semanticdb,  Prev: Idle Scheduler,  Up: Top
+
+10 Minor Modes
+**************
+
+Semantic comes with a wide range of minor-modes which use various
+features of semantic.  These modes vary widely in utility.
+
+There are some core modes that are required for smooth operations.
+Some of these are discussed in other chapters, such as *Note Idle
+Scheduler::, and *Note semanticdb::
+
+* Menu:
+
+* Code Helpers::        Modes for assisting in authoring code.
+* Development Modes::   Modes for assisting in developing/debugging Semantic.
+
+
+File: semantic-user.info,  Node: Code Helpers,  Next: Development Modes,  Up: Minor Modes
+
+10.1 Code Helpers
+=================
+
+Code Helpers are minor modes that augment basic Emacs behavior in ways
+that can assist in programming Semantic supported langauges.
+
+* Menu:
+
+* Sticky Function Mode::
+* Highlight Func Mode::
+* Tag Decoration Mode::
+* MRU Bookmarks Mode::
+
+Senator is another mode which can assist in programming *Note senator::.
+
+
+File: semantic-user.info,  Node: Development Modes,  Prev: Code Helpers,  Up: Minor Modes
+
+10.2 Development Modes
+======================
+
+* Menu:
+
+* Highlight Edits Mode::
+* Parser State::
+* Unmatched Syntax Highlighting::
+
+
+File: semantic-user.info,  Node: Sticky Function Mode,  Next: Highlight Func Mode,  Up: Code Helpers
+
+10.2.1 Sticky Function Headers
+------------------------------
+
+ -- Command: semantic-stickyfunc-mode &optional arg
+     Minor mode to show the title of a tag in the header line.
+     Enables/disables making the header line of functions sticky.  A
+     function (or other tag class specified by
+     `semantic-stickyfunc-sticky-classes') has a header line, meaning
+     the first line which describes the rest of the construct.  This
+     first line is what is displayed in the Emacs 21 header line.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+ -- Variable: semantic-stickyfunc-sticky-classes
+     List of tag classes which sticky func will display in the header
+     line.
+
+
+File: semantic-user.info,  Node: Highlight Func Mode,  Next: Tag Decoration Mode,  Prev: Sticky Function Mode,  Up: Code Helpers
+
+10.2.2 Highlight Func Mode
+--------------------------
+
+Highlight Func mode will put a highlight overlay over the top
+declaration line of the function or tag the point is in.  Enabling this
+feature also puts a context menu onto the declaration line providing
+easy access to some basic commands.
+
+ -- Function: semantic-highlight-func-mode &optional arg
+     Minor mode to highlight the first line of the current tag.
+     Enables/disables making the header line of functions sticky.  A
+     function (or other tag class specified by
+     `semantic-stickfunc-sticky-classes') is highlighted, meaning the
+     first line which describes the rest of the construct.
+
+     See `semantic-stickfunc-mode' for putting a function in the header
+     line.  This mode recycles the stickyfunc configuration classes
+     list.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+ -- Function: semantic-highlight-func-current-tag-face
+     Face used to show the top of current function.
+
+
+File: semantic-user.info,  Node: Tag Decoration Mode,  Next: MRU Bookmarks Mode,  Prev: Highlight Func Mode,  Up: Code Helpers
+
+10.2.3 Tag Decoration Mode
+--------------------------
+
+Decoration mode is a harness that allows any parsed tag to be decorated
+based on some arbitrary feature of that tag.  Decoration mode is
+actually a full harness for providing any kind of decoration on a tag
+based on a prefix function.
+
+ -- Command: semantic-decoration-mode &optional arg
+     Minor mode for decorating tags.  Decorations are specified in
+     `semantic-decoration-styles'.  You can define new decoration
+     styles with "define-semantic-decoration-style".  With prefix
+     argument ARG, turn on if positive, otherwise off.  The minor mode
+     can be turned on only if semantic feature is available and the
+     current buffer was set up for parsing.  Return non-`nil' if the
+     minor mode is enabled.
+
+To enable or disable specific decorations, you can use this function:
+
+ -- Command: semantic-toggle-decoration-style name &optional arg
+     Turn on/off the decoration style with NAME.  Decorations are
+     specified in `semantic-decoration-styles'.  With prefix argument
+     ARG, turn on if positive, otherwise off.  Return non-`nil' if the
+     decoration style is enabled.
+
+10.2.3.1 Available decoration modes
+...................................
+
+There are several decoration modes that comes with semantic.
+
+ -- Function: Command semantic-tag-boundary-mode &optional arg
+     Place an overline in front of each long tag.
+
+      -- Option: semantic-tag-boundary-face
+          Face used to show long tags in.  Used by decoration style:
+          `semantic-tag-boundary'.
+
+
+ -- Function: Command semantic-decoration-on-private-members-mode
+          &optional arg
+     Highlight class members that are designated as PRIVATE access.
+
+      -- Option: semantic-decoration-on-private-members-face
+          Face used to show privately scoped tags in.  Used by the
+          decoration style: `semantic-decoration-on-private-members'.
+
+ -- Function: Command semantic-decoration-on-protected-members-mode
+          &optional arg
+     Highlight class members that are designated as PROTECTED access.
+
+      -- Option: semantic-decoration-on-protected-members-face
+          Face used to show protected scoped tags in.  Used by the
+          decoration style: `semantic-decoration-on-protected-members'.
+
+ -- Command: semantic-decoration-on-includes &optional arg
+     Highlight class members that are includes.  This mode provides a
+     nice context menu on the include statements.  Use the menus to ask
+     questions and get help on configuring semantic.
+
+      -- Option: semantic-decoration-on-includes
+          Overlay Face used on includes that are not in some other
+          state.  Used by the decoration style:
+          `semantic-decoration-on-includes'.
+
+      -- Option: semantic-decoration-on-unknown-includes
+          Face used to show includes that cannot be found.  Used by the
+          decoration style: `semantic-decoration-on-unknown-includes'.
+
+      -- Option: semantic-decoration-on-unparsed-includes
+          Face used to show includes that have not yet been parsed.
+          Used by the decoration style:
+          `semantic-decoration-on-unparsed-includes'.
+
+
+10.2.3.2 Create New Decoration Modes
+....................................
+
+You can create new types of decorations using the following function:
+
+ -- Function: define-semantic-decoration-style name doc &rest flags
+     Define a new decoration style with NAME.  DOC is a documentation
+     string describing the decoration style NAME.  It is appended to
+     auto-generated doc strings.  An Optional list of FLAGS can also be
+     specified.  Flags are:   `:enabled' <value>  - specify the default
+     enabled value for NAME.
+
+     This defines two new overload functions respectively called
+     `NAME-p' and `NAME-highlight', for which you must provide a default
+     implementation in respectively the functions `NAME-p-default' and
+     `NAME-highlight-default'.  Those functions are passed a tag.
+     `NAME-p' must return non-`nil' to indicate that the tag should be
+     decorated by `NAME-highlight'.
+
+     To put primary decorations on a tag `NAME-highlight' must use
+     functions like "semantic-set-tag-face",
+     "semantic-set-tag-intangible", etc., found in the
+     semantic-decorate library.
+
+     To add other kind of decorations on a tag, `NAME-highlight' must
+     use "semantic-decorate-tag", and other functions of the semantic
+     decoration API found in this library.
+
+
+File: semantic-user.info,  Node: MRU Bookmarks Mode,  Prev: Tag Decoration Mode,  Up: Code Helpers
+
+10.2.4 MRU Bookmarks Mode
+-------------------------
+
+MRU stands for Most Recently Used.  Semantic MRU Bookmarks track the
+tags you edit and maintain a ring of things you've been working on.
+You can then switch back to tags you've worked on recently by name.
+
+ -- Command: semantic-mru-bookmark-mode &optional arg
+     Minor mode for tracking tag-based bookmarks automatically.  Tag
+     based bookmarks a tracked based on editing and viewing habits and
+     can then be navigated via the MRU bookmark keymap.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+Once this mode is enabled, any edit, or mark setting will add the
+current tag to your MRU bookmark ring.
+
+`C-x B'
+     This keysequence is like `switch-to-buffer', but uses a capital
+     `B' instead of lower case.  This lets you type in a tag name, or
+     use `M-p' and `M-n' to cycle through the bookmark list in MRU
+     order.
+
+
+File: semantic-user.info,  Node: Highlight Edits Mode,  Next: Parser State,  Up: Development Modes
+
+10.2.5 Highlight Edits Mode
+---------------------------
+
+Highlight edits mode is useful mostly for debugging the incremental
+parser.  As you change text, that effected text is highlighted, and you
+can visual predict what actions the incremental parser will need to
+make.
+
+ -- Command: semantic-highlight-edits-mode &optional arg
+     Minor mode for highlighting changes made in a buffer.  Changes are
+     tracked by semantic so that the incremental parser can work
+     properly.  With prefix argument ARG, turn on if positive,
+     otherwise off.  The minor mode can be turned on only if semantic
+     feature is available and the current buffer was set up for
+     parsing.  Return non-`nil' if the minor mode is enabled.
+
+ -- Face: semantic-highlight-edits-face
+     Face used to show dirty tokens in `semantic-highlight-edits-mode'.
+
+
+File: semantic-user.info,  Node: Parser State,  Next: Unmatched Syntax Highlighting,  Prev: Highlight Edits Mode,  Up: Development Modes
+
+10.2.6 Parser State
+-------------------
+
+ -- Command: semantic-show-parser-state-mode &optional arg
+     Minor mode for displaying parser cache state in the modeline.  The
+     cache can be in one of three states.  They are Up to date, Partial
+     reparse needed, and Full reparse needed.  The state is indicated
+     in the modeline with the following characters:
+    `-'
+          The cache is up to date.
+
+    `!'
+          The cache requires a full update.
+
+    `~'
+          The cache needs to be incrementally parsed.
+
+    `%'
+          The buffer is not lexically parseable.
+
+    `@'
+          Auto-parse in progress (not set here.)
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+
+File: semantic-user.info,  Node: Unmatched Syntax Highlighting,  Prev: Parser State,  Up: Development Modes
+
+10.2.7 Unmatched Syntax Highlighting
+------------------------------------
+
+ -- Command: semantic-show-unmatched-syntax-mode &optional arg
+     Minor mode to highlight unmatched syntax tokens.  When a parser
+     executes, some elements in the buffer may not match any parser
+     rules.  These text characters are considered unmatched syntax.
+     Often time, the display of unmatched syntax can expose coding
+     problems before the compiler is run.
+
+     With prefix argument ARG, turn on if positive, otherwise off.  The
+     minor mode can be turned on only if semantic feature is available
+     and the current buffer was set up for parsing.  Return non-`nil'
+     if the minor mode is enabled.
+
+     `C-c , `'		"semantic-show-unmatched-syntax-next"
+
+ -- Option: semantic-unmatched-syntax-face
+     Face used to show unmatched-syntax in.  The face is used in
+     "semantic-show-unmatched-syntax-mode".
+
+
+File: semantic-user.info,  Node: semanticdb,  Next: Debugging,  Prev: Minor Modes,  Up: Top
+
+11 Semantic Database
+********************
+
+Semanticdb is a utility which tracks your parsed files, and saves the
+parsed information to disk.  When you reload your source files,
+semanticdb automatically associates the file with the cached copy,
+saving time by not re-parsing your buffer.
+
+Semanticdb also provides an API for programs to use to look up
+information about a tag.  These functions can return tag information
+without loading the source file into memory.
+
+Lastly, the semanticdb interface allows programmers to create alternate
+back ends.  Such a back end could allow access to tag information in
+binary files, not normally accessable to semantic.  A back end could
+also be written to store tag information in an alternate form of
+persistent storage.
+
+To use semanticdb, add the following to your `.emacs' file:
+
+     (require 'semanticdb)
+     (global-semanticdb-minor-mode 1)
+
+If you use `semantic-load.el', or the default CEDET install mechanism,
+you do not need to add the above lines in your `.emacs' file.
+
+The Semantic Database has several user level configuration options that
+controls its use.  From the user perspective, it appears to be one
+large application.  Internally it is divided into sections.
+
+Core Tables
+     These core tables for semanticdb are not associated with files, or
+     backends.  They define the basic behavior of a database and table.
+
+Persistent Tables
+     These databases are what are generally used in semantic to store
+     information to disk.
+
+Custom Backends
+     These databases and tables are interfaces to some other source of
+     tagging information, such as the symbols loaded in Emacs Lisp, or
+     perhaps symbols in a Java `.class' file.
+
+You can execute hooks when semanticdb is activated using its mode hook.
+
+ -- Option: semanticdb-mode-hooks
+     Hooks run whenever "global-semanticdb-minor-mode" is run.  Use
+     "semanticdb-minor-mode-p" to determine if the mode has been turned
+     on or off.
+
+* Menu:
+
+* Semanticdb Tag Storage::
+* Semanticdb Search Configuration::
+* Semanticdb System Backends::
+* Changing Backends::
+* Script Generated Cache Files::
+* Create System Databases::
+
+
+File: semantic-user.info,  Node: Semanticdb Tag Storage,  Next: Semanticdb Search Configuration,  Up: semanticdb
+
+11.1 Semanticdb Tag Storage
+===========================
+
+Once you have tables of tags parsed from your files, the default action
+is to save them when Emacs exits.  You can control the file name and
+directories where the caches are stored.
+
+ -- Option: semanticdb-default-file-name
+     File name of the semantic tag cache.
+
+ -- Option: semanticdb-default-save-directory
+     Directory name where semantic cache files are stored.  If this
+     value is `nil', files are saved in the current directory.  If the
+     value is a valid directory, then it overrides
+     `semanticdb-default-file-name' and stores caches in a coded file
+     name in this directory.
+
+ -- Option: semanticdb-persistent-path
+     List of valid paths that semanticdb will cache tags to.  When
+     "global-semanticdb-minor-mode" is active, tag lists will be saved
+     to disk when Emacs exits.  Not all directories will have tags that
+     should be saved.  The value should be a list of valid paths.  A
+     path can be a string, indicating a directory in which to save a
+     variable.  An element in the list can also be a symbol.  Valid
+     symbols are `never', which will disable any saving anywhere,
+     `always', which enables saving everywhere, or `project', which
+     enables saving in any directory that passes a list of predicates
+     in `semanticdb-project-predicate-functions'.
+
+ -- Variable: semanticdb-project-predicate-functions
+     List of predicates to try that indicate a directory belongs to a
+     project.  This list is used when `semanticdb-persistent-path'
+     contains the value `'project'.  If the predicate list is `nil',
+     then presume all paths are valid.
+
+     Project Management software (such as EDE and JDE) should add their
+     own predicates with "add-hook" to this variable, and semanticdb
+     will save tag caches in directories controlled by them.
+
+ -- Option: semanticdb-save-database-hooks
+     Hooks run after a database is saved.  Each function is called with
+     one argument, the object representing the database recently
+     written.
+
+
+File: semantic-user.info,  Node: Semanticdb Search Configuration,  Next: Semanticdb System Backends,  Prev: Semanticdb Tag Storage,  Up: semanticdb
+
+11.2 Semanticdb Search Configuration
+====================================
+
+When different tools such as smart completion or tag jumping needs to
+find a tag, those routines call semanticdb search routines.  Getting
+the search path configured usually takes a little bit of time to get
+right.
+
+The search path includes:
+
+  1. The current file
+
+  2. a table for each #include file
+
+  3. if 'recursive is in the throttle, then all include files included
+     in include files.
+
+Include files or equivalent are found in:
+
+  1. current directory
+
+  2. directories specified by your project.  (such as EDE, or the
+     `semanticdb-project-roots' variable.)
+
+  3. system directories
+
+In C/C++ code, semantic tries to distinguish between project and system
+headers based on `""' or `<>' delimiters.  Each language can
+distinguish using its own rules.
+
+The system directory is set up via the variable
+`semantic-dependency-system-include-path'.  The path is also modified
+by some system database create routines, such as
+`semanticdb-create-ebrowse-database'. *Note Include paths::.
+
+You can use the command:
+
+     M-x semantic-add-system-include RET /some/path
+
+to add more paths interactively into the current mode's path.  This
+will allow semantic to find more files w/out using system databases.
+To customize the system include path for a particular major mode, use
+the command:
+
+     M-x semantic-customize-system-include-path RET
+
+* Menu:
+
+* Semanticdb Roots::    Specifying the root of different projects
+* Include paths::       Add/Remove directories to include search paths
+* Search Throttle::     Controlling how semanticdb searches occur
+* Semanticdb search debugging commands::
+
+
+File: semantic-user.info,  Node: Semanticdb Roots,  Next: Include paths,  Up: Semanticdb Search Configuration
+
+11.2.1 SemanticDB project roots
+-------------------------------
+
+Project roots specify where different code projects start.  Searching
+for files usually stops within a single project, so specifying these
+roots is important if you want semantic to find tags in other related
+directories.
+
+ -- Option: semanticdb-project-roots
+     List of directories, where each directory is the root of some
+     project.  All subdirectories of a root project are considered a
+     part of one project.  Values in this string can be overriden by
+     project management programs via the
+     `semanticdb-project-root-functions' variable.
+
+ -- Variable: semanticdb-project-root-functions
+     List of functions used to determine a given directories project
+     root.  Functions in this variable can override
+     `semanticdb-project-roots'.  Functions set in the variable are
+     given one argument (a directory) and must return a string, (the
+     root directory) or a list of strings (multiple root directories in
+     a more complex system).  This variable should be used by project
+     management programs like EDE or JDE.
+
+Alternately, you can use EDE for project management, and EDE will then
+handle search routines as above.  See the *note EDE Manual: (ede)top
+for more.
+
+
+File: semantic-user.info,  Node: Include paths,  Next: Search Throttle,  Prev: Semanticdb Roots,  Up: Semanticdb Search Configuration
+
+11.2.2 Include Paths
+--------------------
+
+You can add and remove system include paths based on major mode using
+the following commands:
+
+ -- Command: semantic-add-system-include dir &optional mode
+     Add a system include DIR to path for MODE.  Modifies a mode-local
+     version of `semantic-dependency-system-include-path'.
+
+ -- Command: semantic-remove-system-include dir &optional mode
+     Add a system include DIR to path for MODE.  Modifies a mode-local
+     version of `semantic-dependency-system-include-path'.
+
+ -- Command: semantic-customize-system-include-path &optional mode
+     Customize the include path for this `major-mode'.  To create a
+     customizable include path for a major MODE, use the macro
+     "defcustom-mode-local-semantic-dependency-system-include-path".
+
+ -- Function: semanticdb-implied-include-tags
+     Include tags implied for all files of a given mode.  Set this
+     variable with "defvar-mode-local" for a particular mode so that
+     any symbols that exist for all files for that mode are included.
+
+     Note: This could be used as a way to write a file in a langauge to
+     declare all the built-ins for that language.
+
+For a bit more on include paths, see the *note Search Optimization
+section: (semantic)Search Optimization.
+
+Debug your search paths using stiff in *Note Semanticdb search
+debugging commands::.
+
+
+File: semantic-user.info,  Node: Search Throttle,  Next: Semanticdb search debugging commands,  Prev: Include paths,  Up: Semanticdb Search Configuration
+
+11.2.3 SemanticDB Search Throttle
+---------------------------------
+
+The semanticdb find throttle is a configuration variable that may often
+be configured by a language support author.  If you need to customize
+this for yourself, you may need to override the mode values in a mode
+support hook.
+
+ -- Variable: semanticdb-find-default-throttle
+     The default throttle for `semanticdb-find' routines.  The throttle
+     controls how detailed the list of database tables is for a symbol
+     lookup.  The value is a list with the following keys:
+
+    `file'
+          The file the search is being performed from.  This option is
+          here for completeness only, and is assumed to always be on.
+
+    `local'
+          Tables from the same local directory are included.  This
+          includes files directly referenced by a file name which might
+          be in a different directory.
+
+    `project'
+          Tables from the same local project are included If `project'
+          is specified, then `local' is assumed.
+
+    `unloaded'
+          If a table is not in memory, load it.  If it is not cached on
+          disk either, get the source, parse it, and create the table.
+
+    `system'
+          Tables from system databases.  These are specifically tables
+          from system header files, or language equivalent.
+
+    `recursive'
+          For include based searches, includes tables referenced by
+          included files.
+
+    `omniscience'
+          Included system databases which are omniscience, or somehow
+          know everything.  Omniscience databases are found in
+          `semanticdb-project-system-databases'.  The Emacs Lisp system
+          DB is an omniscience database.
+
+
+To set the throttle, use a command like this:
+
+     (setq-mode-local c-mode
+     		 semanticdb-find-default-throttle
+     		 '(project unloaded system recursive))
+
+The default value of the throttle is for maximum accuracy at the
+expense of time taken to perform a particular look-up.  The throttle is
+tweaked by `semantic-idle-summary-mode' to remove 'unloaded, thus
+removing poor speed at unexpected times.
+
+
+File: semantic-user.info,  Node: Semanticdb search debugging commands,  Prev: Search Throttle,  Up: Semanticdb Search Configuration
+
+11.2.4 Semanticdb search debugging commands
+-------------------------------------------
+
+You can use `M-x semanticdb-dump-all-table-summary RET' to see the list
+of databases that will be searched from a given buffer.  It should
+include DBs for the directories you expect.  You can follow up with
+`M-x semanticdb-find-test-translate-path RET' to then make sure
+specific tables from the path are discovered correctly.
+
+Alternately, you can get a list of include files semantic encountered,
+but could not find on disk using `M-x
+semanticdb-find-adebug-lost-includes RET'.
+
+Once you have used the below functions to debug the problem, you may
+need to reconfigure how semantic finds include files.  See *Note
+Semanticdb Search Configuration::.  If the search config is ok, you may
+need to configure the search throttle. See *Note Search Throttle::.
+
+ -- Command: semanticdb-dump-all-table-summary
+     Dump a list of all databases in Emacs memory.
+
+ -- Command: semanticdb-find-test-translate-path &optional arg
+     Call and output results of "semanticdb-find-translate-path" With
+     ARG non-`nil', specify a BRUTISH translation.
+
+ -- Command: semanticdb-find-adebug-lost-includes
+     Translate the current path, then display the lost includes.
+     Examines the variable `semanticdb-find-lost-includes'.
+
+Lastly, you can test an explicit search term using this command:
+
+ -- Command: semantic-adebug-searchdb regex
+     Search the semanticdb for REGEX for the current buffer.  Display
+     the results as a debug list.
+
+
+File: semantic-user.info,  Node: Semanticdb System Backends,  Next: Changing Backends,  Prev: Semanticdb Search Configuration,  Up: semanticdb
+
+11.3 Semanticdb System Backends
+===============================
+
+These variables should be set up automatically when you choose to use
+different system databases.
+
+ -- Variable: semanticdb-project-system-databases
+     List of databases containing system library information.  Mode
+     authors can create their own system databases which know detailed
+     information about the system libraries for querying purposes.  Put
+     those into this variable as a buffer-local, or mode-local value.
+
+These system databases are a part of the `omniscience' throttle value.
+
+While these are enabled with `semanticdb-find-default-throttle', a
+secondary flag is needed for internal controls that prevent recursive
+duplication.
+
+ -- Variable: semanticdb-search-system-databases
+     Non `nil' if search routines are to include a system database.
+
+
+File: semantic-user.info,  Node: Changing Backends,  Next: Script Generated Cache Files,  Prev: Semanticdb System Backends,  Up: semanticdb
+
+11.4 Changing Backends
+======================
+
+If you want to use some other form of backend, you can use this
+variable to choose which back end class to use for your general tag
+storage.
+
+The default is to save databases in flat files.  Alternatively, you
+could write a new database backend that stores tags into a database, or
+other storage system.
+
+ -- Variable: semanticdb-new-database-class
+     The default type of database created for new files.  This can be
+     changed on a per file basis, so that some directories are saved
+     using one mechanism, and some directories via a different
+     mechanism.
+
+
+File: semantic-user.info,  Node: Script Generated Cache Files,  Next: Create System Databases,  Prev: Changing Backends,  Up: semanticdb
+
+11.5 Script Generated Cache Files
+=================================
+
+You can create new semantic databases with the `semanticdb.sh' script
+file.  Give this script the directory you want parsed, and it will
+create a cache file for you.
+
+     $ semanticdb.sh *.el
+
+To use these generated tables, you would likely need to restart Emacs.
+
+
+File: semantic-user.info,  Node: Create System Databases,  Prev: Script Generated Cache Files,  Up: semanticdb
+
+11.6 Create System Databases
+============================
+
+If your supported language stores the system libraries in readily
+available parsable source code, you can pre-generate database files for
+them once, which will be used over and over for tools such as
+summary-mode, or the analyzer.
+
+ -- Command: semanticdb-create-ebrowse-database dir
+     Create an EBROWSE database for directory DIR.  The database file
+     is stored in ~/.semanticdb, or whichever directory is specified by
+     `semanticdb-default-system-save-directory'.
+
+
+File: semantic-user.info,  Node: Debugging,  Next: GNU Free Documentation License,  Prev: semanticdb,  Up: Top
+
+12 Debugging speed and accuracy issues
+**************************************
+
+If aspects of semantic cause your Emacs to slow down or block editing,
+there are several things that may be happening.  The most time
+consuming aspect of semantic is usually the parsing of files for tag
+information, and this action can be triggered from many possible
+sources.
+
+A simple way to determine where the problem lies is to use the command
+`M-x debug-on-quit RET' and then just hit `C-g' next time it gets
+'stuck' somewhere.  It will give you a stack and one of the many
+semantic mode functions will likely show up in that stack trace.
+
+From a simple standpoint, your next action might be to use the the
+Senator menu under `Modes' and just toggle suspected modes on and off.
+
+12.1 Idle function errors
+=========================
+
+If the idle scheduler starts reporting errors, then you can run the
+command `M-x semantic-debug-idle-function RET' to get a stacktrace to
+report.
+
+If this doesn't report an issue, then you may have found a bug in the
+idle work function, where longer tasks are scheduled.  To debug that,
+use the command `M-x semantic-debug-idle-work-function RET'.
+
+12.2 Analyzer debugging
+=======================
+
+When the semantic analyzer provides bad or non-existent completions,
+then you will need to debug the analyzer.  Place the cursor where the
+problem is, and then use the command `M-x semantic-analyze-debug-assist
+RET'.
+
+This will perform an analysis, and then offer suggestions on what might
+be wrong, and how to reconfigure semantic to solve the problem.
+
+12.3 Symbol lookup
+==================
+
+There are many minor modes that have special behaviors tied into the
+current parser state, with the most complex modes being the summary and
+completion modes.  These modes can initiate parsing not only in the
+current buffer, but in other buffers that are referred to in the
+current source by some form of include statement.
+
+If they turn out not to be useful in the language mode you are
+operating in, then it may be best to disable them.
+
+Alternately, you can control how these major modes, and other modes
+like them parse alternate files by adjusting
+`semanticdb-find-default-throttle'. You can read more in *note
+(semantic-appdev.info)DB Search Paths::.
+
+12.4 Interruptibility
+=====================
+
+One of the goals with the semantic based minor modes and auto parse is
+that it should be interruptible.  Thus, a keyboard action should
+interrupt any active parsing or mode activity.  In practice, I've found
+this doesn't always work and I've been a bit stymied as to why.
+
+You can test the interruptibility framework by running `M-x
+semantic-test-throw-on-input RET' and seeing that you can press any key
+to break out of the loop.
+
+12.5 Incremental parsing
+========================
+
+The incremental parser used by semantic will reparse only small
+sections of a file you have edited, which eliminates the need to
+reparse entire files.  This speeds up minor modes that need the local
+buffer to be up to date, such as speedbar or ECB.
+
+If the incremental parsing is not always working for you (meaning it
+will parse the whole file frequently while you edit) then perhaps you
+need to customize `semantic-edits-verbose-flag' to enable some friendly
+debug output.  Additionally using
+`semantic-load-enable-semantic-debugging-helpers' to help identify
+possible problem areas by enabling highlight edits mode and show parser
+state mode *note (semantic-langdev.info)Incremental Parser Debugging::
+
+12.6 Profiling
+==============
+
+To help identify speed issues with the semantic analyzer, you can use
+the `semantic-elp.el' tool.  To use it type:
+
+     M-x semantic-elp-analyze RET
+
+It will do a full run for each stage of analysis keeping profiling
+information.  The analysis will be done at point, so be sure to
+position the cursor at the location where the slowdown occurs.
+
+Once done, it will ask you to save the profiler information.  It will
+then show you the profile information in ADEBUG mode, so you can
+navigate through the results.
+
+Use `SPC' to open sections of the tree.  Use `SPC' on the sort option
+to change sorting of the results table.
+
+Use `M-x semantic-elp-load-old-run' to restore an old run and view it
+again.
+
+
+File: semantic-user.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Debugging,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: semantic-user.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* &optional <1>:                         Idle Completions Mode.
+                                                              (line  14)
+* &optional:                             Idle Summary Mode.   (line  11)
+* Analyzer:                              Analyzer.            (line   6)
+* Charts:                                Charts.              (line   6)
+* Command:                               Tag Decoration Mode. (line  34)
+* define-semantic-decoration-style:      Tag Decoration Mode. (line  83)
+* document:                              Document.            (line  40)
+* Document:                              Document.            (line   6)
+* document-inline:                       Document.            (line  45)
+* document-insert-defun-comment:         Document.            (line  48)
+* document-insert-new-file-header:       Document.            (line  51)
+* ECB:                                   ECB.                 (line   6)
+* global-semantic-idle-scheduler-mode:   Idle Scheduler.      (line  17)
+* Idle Scheduler:                        Idle Scheduler.      (line   6)
+* imenu:                                 imenu.               (line   6)
+* Minor Modes:                           Minor Modes.         (line   6)
+* re-search-backward:                    senator.             (line  68)
+* re-search-forward:                     senator.             (line  67)
+* semantic-add-system-include:           Include paths.       (line  10)
+* semantic-adebug-searchdb:              Semanticdb search debugging commands.
+                                                              (line  35)
+* semantic-after-idle-scheduler-reparse-hooks: Reparsing Options.
+                                                              (line  38)
+* semantic-analyze-current-context:      Analyzer.            (line  10)
+* semantic-analyze-possible-completions: Analyzer.            (line  24)
+* semantic-before-idle-scheduler-reparse-hooks: Reparsing Options.
+                                                              (line  33)
+* semantic-chart-database-size:          Charts.              (line  16)
+* semantic-chart-tag-complexity:         Charts.              (line  22)
+* semantic-chart-tags-by-class:          Charts.              (line   9)
+* semantic-complete-analyze-inline-idle: Idle Completions Mode.
+                                                              (line  31)
+* semantic-complete-inline-analyzer-idle-displayor-class: Idle Completions Mode.
+                                                              (line  39)
+* semantic-customize-system-include-path: Include paths.      (line  18)
+* semantic-debug-idle-function:          Debugging Idle Time Issues.
+                                                              (line  14)
+* semantic-debug-idle-work-function:     Debugging Idle Time Issues.
+                                                              (line  17)
+* semantic-decoration-mode:              Tag Decoration Mode. (line   6)
+* semantic-decoration-on-includes:       Tag Decoration Mode. (line  58)
+* semantic-decoration-on-private-members-face: Tag Decoration Mode.
+                                                              (line  46)
+* semantic-decoration-on-protected-members-face: Tag Decoration Mode.
+                                                              (line  54)
+* semantic-decoration-on-unknown-includes: Tag Decoration Mode.
+                                                              (line  68)
+* semantic-decoration-on-unparsed-includes: Tag Decoration Mode.
+                                                              (line  72)
+* semantic-highlight-edits-face:         Highlight Edits Mode.
+                                                              (line  20)
+* semantic-highlight-edits-mode:         Highlight Edits Mode.
+                                                              (line  12)
+* semantic-highlight-func-current-tag-face: Highlight Func Mode.
+                                                              (line  28)
+* semantic-highlight-func-mode:          Highlight Func Mode. (line   6)
+* semantic-ia-complete-symbol:           Smart Completion.    (line  12)
+* semantic-ia-complete-symbol-menu:      Smart Completion.    (line  16)
+* semantic-ia-complete-tip:              Smart Completion.    (line  21)
+* semantic-ia-describe-class:            Smart Summary.       (line  17)
+* semantic-ia-fast-jump:                 Smart Jump.          (line  15)
+* semantic-ia-fast-mouse-jump:           Smart Jump.          (line  20)
+* semantic-ia-show-doc:                  Smart Summary.       (line  14)
+* semantic-ia-show-summary:              Smart Summary.       (line  11)
+* semantic-idle-scheduler-idle-time:     Idle Scheduler.      (line  32)
+* semantic-idle-scheduler-max-buffer-size: Reparsing Options. (line  14)
+* semantic-idle-scheduler-mode-hook:     Idle Scheduler.      (line  37)
+* semantic-idle-scheduler-no-working-message: Reparsing Options.
+                                                              (line  22)
+* semantic-idle-scheduler-verbose-flag:  Idle Scheduler.      (line  40)
+* semantic-idle-scheduler-work-idle-time: Idle Working Options.
+                                                              (line  28)
+* semantic-idle-scheduler-working-in-modeline-flag: Reparsing Options.
+                                                              (line  25)
+* semantic-idle-summary-function:        Idle Summary Mode.   (line  25)
+* semantic-idle-summary-out-of-context-faces: Idle Summary Mode.
+                                                              (line  29)
+* semantic-idle-work-parse-neighboring-files-flag: Idle Working Options.
+                                                              (line  33)
+* semantic-imenu-auto-rebuild-directory-indexes: imenu.       (line  57)
+* semantic-imenu-bucketize-file:         imenu.               (line  31)
+* semantic-imenu-bucketize-type-members: imenu.               (line  41)
+* semantic-imenu-buckets-to-submenu:     imenu.               (line  34)
+* semantic-imenu-expand-type-members:    imenu.               (line  38)
+* semantic-imenu-expandable-tag-classes: imenu.               (line  64)
+* semantic-imenu-index-directory:        imenu.               (line  51)
+* semantic-imenu-sort-bucket-function:   imenu.               (line  46)
+* semantic-imenu-summary-function:       imenu.               (line  27)
+* semantic-mru-bookmark-mode:            MRU Bookmarks Mode.  (line   6)
+* semantic-remove-system-include:        Include paths.       (line  14)
+* semantic-show-parser-state-mode:       Parser State.        (line   7)
+* semantic-show-unmatched-syntax-mode:   Unmatched Syntax Highlighting.
+                                                              (line   7)
+* semantic-speedbar-analysis:            Speedbar Analysis.   (line  26)
+* semantic-stickyfunc-mode:              Sticky Function Mode.
+                                                              (line   7)
+* semantic-stickyfunc-sticky-classes:    Sticky Function Mode.
+                                                              (line  20)
+* semantic-symref:                       SymRef.              (line  14)
+* semantic-symref-symbol:                SymRef.              (line  21)
+* semantic-symref-tool-alist:            SymRef.              (line  48)
+* semantic-tag-boundary-face:            Tag Decoration Mode. (line  37)
+* semantic-texi-goto-source:             Document.            (line  67)
+* semantic-texi-update-doc:              Document.            (line  60)
+* semantic-toggle-decoration-style:      Tag Decoration Mode. (line  23)
+* semantic-unmatched-syntax-face:        Unmatched Syntax Highlighting.
+                                                              (line  21)
+* semanticdb:                            semanticdb.          (line   6)
+* semanticdb-create-ebrowse-database:    Create System Databases.
+                                                              (line  12)
+* semanticdb-default-file-name:          Semanticdb Tag Storage.
+                                                              (line  11)
+* semanticdb-default-save-directory:     Semanticdb Tag Storage.
+                                                              (line  14)
+* semanticdb-dump-all-table-summary:     Semanticdb search debugging commands.
+                                                              (line  22)
+* semanticdb-find-adebug-lost-includes:  Semanticdb search debugging commands.
+                                                              (line  29)
+* semanticdb-find-default-throttle:      Search Throttle.     (line  12)
+* semanticdb-find-test-translate-path:   Semanticdb search debugging commands.
+                                                              (line  25)
+* semanticdb-implied-include-tags:       Include paths.       (line  23)
+* semanticdb-mode-hooks:                 semanticdb.          (line  49)
+* semanticdb-new-database-class:         Changing Backends.   (line  15)
+* semanticdb-persistent-path:            Semanticdb Tag Storage.
+                                                              (line  21)
+* semanticdb-project-predicate-functions: Semanticdb Tag Storage.
+                                                              (line  33)
+* semanticdb-project-root-functions:     Semanticdb Roots.    (line  19)
+* semanticdb-project-roots:              Semanticdb Roots.    (line  12)
+* semanticdb-project-system-databases:   Semanticdb System Backends.
+                                                              (line  10)
+* semanticdb-save-database-hooks:        Semanticdb Tag Storage.
+                                                              (line  43)
+* semanticdb-search-system-databases:    Semanticdb System Backends.
+                                                              (line  22)
+* senator:                               senator.             (line   6)
+* senator-complete-symbol:               senator.             (line  82)
+* senator-completion-menu-popup:         senator.             (line  87)
+* senator-copy-tag:                      senator.             (line 106)
+* senator-copy-tag-to-register:          senator.             (line 118)
+* senator-go-to-up-reference:            senator.             (line  41)
+* senator-isearch-toggle-semantic-mode:  senator.             (line  55)
+* senator-jump:                          senator.             (line  28)
+* senator-kill-tag:                      senator.             (line 109)
+* senator-minor-mode:                    senator.             (line 129)
+* senator-next-tag:                      senator.             (line  20)
+* senator-previous-tag:                  senator.             (line  24)
+* senator-search-backward:               senator.             (line  60)
+* senator-search-forward:                senator.             (line  59)
+* senator-step-at-start-end-tag-classes: senator.             (line 200)
+* senator-step-at-tag-classes:           senator.             (line 194)
+* senator-yank-tag:                      senator.             (line 114)
+* speedbar:                              speedbar.            (line   6)
+* symref:                                SymRef.              (line   6)
+* word-search-backward:                  senator.             (line  73)
+* word-search-forward:                   senator.             (line  72)
+
+
+
+Tag Table:
+Node: Top1076
+Node: speedbar2343
+Node: ECB3083
+Node: imenu3439
+Ref: semantic-imenu-expandable-tag-classes6027
+Node: senator6248
+Ref: senator-go-to-up-reference7445
+Node: Analyzer13559
+Node: Smart Completion15492
+Ref: semantic-ia-complete-symbol15951
+Ref: semantic-ia-complete-symbol-menu16133
+Ref: semantic-ia-complete-tip16329
+Node: Smart Summary16737
+Ref: semantic-ia-show-summary17101
+Ref: semantic-ia-show-doc17193
+Ref: semantic-ia-describe-class17310
+Node: Smart Jump17813
+Ref: semantic-ia-fast-jump18319
+Ref: semantic-ia-fast-mouse-jump18532
+Node: Speedbar Analysis18796
+Node: Smart Completion Debugging20155
+Node: SymRef26664
+Ref: semantic-symref27123
+Ref: semantic-symref-symbol27495
+Ref: semantic-symref-tool-alist28839
+Node: Document29291
+Node: Charts32234
+Ref: semantic-chart-database-size32849
+Ref: semantic-chart-tag-complexity33151
+Node: Idle Scheduler33442
+Ref: global-semantic-idle-scheduler-mode34032
+Ref: semantic-idle-scheduler-idle-time34712
+Ref: semantic-idle-scheduler-mode-hook34926
+Ref: semantic-idle-scheduler-verbose-flag35045
+Node: Reparsing Options35672
+Ref: semantic-idle-scheduler-max-buffer-size36083
+Ref: semantic-idle-scheduler-no-working-message36362
+Ref: semantic-idle-scheduler-working-in-modeline-flag36493
+Ref: semantic-before-idle-scheduler-reparse-hooks36779
+Ref: semantic-after-idle-scheduler-reparse-hooks37028
+Node: Idle Working Options37215
+Ref: semantic-idle-scheduler-work-idle-time38127
+Ref: semantic-idle-work-parse-neighboring-files-flag38388
+Node: Debugging Idle Time Issues38529
+Ref: semantic-debug-idle-function39051
+Ref: semantic-debug-idle-work-function39161
+Node: Idle Summary Mode39397
+Ref: semantic-idle-summary-mode39789
+Ref: semantic-idle-summary-function40485
+Ref: semantic-idle-summary-out-of-context-faces40687
+Node: Idle Completions Mode41402
+Ref: semantic-idle-completions-mode41862
+Ref: semantic-complete-analyze-inline-idle42695
+Ref: semantic-complete-inline-analyzer-idle-displayor-class43143
+Node: Minor Modes43346
+Node: Code Helpers43924
+Node: Development Modes44367
+Node: Sticky Function Mode44593
+Node: Highlight Func Mode45577
+Ref: semantic-highlight-func-mode46061
+Ref: semantic-highlight-func-current-tag-face46827
+Node: Tag Decoration Mode46880
+Ref: semantic-decoration-mode47353
+Ref: semantic-toggle-decoration-style47925
+Ref: semantic-tag-boundary-face48460
+Ref: semantic-decoration-on-private-members-face48786
+Ref: semantic-decoration-on-protected-members-face49150
+Ref: semantic-decoration-on-includes49594
+Ref: semantic-decoration-on-unknown-includes49812
+Ref: semantic-decoration-on-unparsed-includes50014
+Ref: define-semantic-decoration-style50392
+Node: MRU Bookmarks Mode51472
+Ref: semantic-mru-bookmark-mode51887
+Node: Highlight Edits Mode52666
+Node: Parser State53607
+Node: Unmatched Syntax Highlighting54637
+Node: semanticdb55658
+Ref: semanticdb-mode-hooks57560
+Node: Semanticdb Tag Storage57904
+Ref: semanticdb-default-file-name58301
+Ref: semanticdb-default-save-directory58390
+Ref: semanticdb-persistent-path58719
+Ref: semanticdb-project-predicate-functions59443
+Ref: semanticdb-save-database-hooks59935
+Node: Semanticdb Search Configuration60087
+Node: Semanticdb Roots61916
+Ref: semanticdb-project-roots62354
+Ref: semanticdb-project-root-functions62700
+Node: Include paths63294
+Ref: semantic-add-system-include63629
+Ref: semantic-remove-system-include63823
+Ref: semantic-customize-system-include-path64021
+Ref: semanticdb-implied-include-tags64268
+Node: Search Throttle64792
+Ref: semanticdb-find-default-throttle65292
+Node: Semanticdb search debugging commands67064
+Ref: semanticdb-dump-all-table-summary68091
+Ref: semanticdb-find-test-translate-path68206
+Ref: semanticdb-find-adebug-lost-includes68378
+Ref: semantic-adebug-searchdb68614
+Node: Semanticdb System Backends68719
+Ref: semanticdb-project-system-databases69079
+Ref: semanticdb-search-system-databases69633
+Node: Changing Backends69702
+Ref: semanticdb-new-database-class70241
+Node: Script Generated Cache Files70460
+Node: Create System Databases70935
+Ref: semanticdb-create-ebrowse-database71392
+Node: Debugging71584
+Node: GNU Free Documentation License75931
+Node: Index95669
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/semantic.info b/site/cedet-1.0pre7/semantic/doc/semantic.info
new file mode 100644
index 0000000..b7b1459
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semantic.info
@@ -0,0 +1,1355 @@
+This is semantic.info, produced by makeinfo version 4.9 from
+semantic.texi.
+
+   This manual documents Semantic, a new intrastructure for parser
+based text analysis for Emacs.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 Eric M.
+Ludlam Copyright (C) 2001, 2002, 2003, 2005 David Ponce Copyright (C)
+2002, 2003 Richard Y. Kim
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic: (semantic).	Infrastructure for parser based text analysis.
+END-INFO-DIR-ENTRY
+
+   This file documents Semantic.  _Infrastructure for parser based text
+analysis in Emacs_
+
+   Copyright (C) 2007 Eric M. Ludlam, David Ponce, and Richard Y. Kim
+
+
+File: semantic.info,  Node: Top,  Next: Overview,  Up: (dir)
+
+Semantic Manual
+***************
+
+semantic is a program for Emacs which includes, at its core, a lexer,
+and two compiler compilers (bovinator and wisent).  Additional tools
+include, support for imenu, speedbar, whichfunc, eldoc, hippie-expand,
+and several other build in tools.
+
+The core utility is the parser infrastructure which allows different
+types of parsers to be linked into the system.  Two build in parsers
+include the "bovine" parser, and the "wisent" parser.
+
+To send bug reports, or participate in discussions about semantic, use
+the mailing list cedet-semantic@sourceforge.net via the URL:
+`http://lists.sourceforge.net/lists/listinfo/cedet-semantic'
+
+* Menu:
+
+* Overview::
+* Installation/Basic Configuration::
+* Semantic manuals::
+* Semantic Internals::
+* Glossary::
+* GNU Free Documentation License::
+* Index::
+
+
+File: semantic.info,  Node: Overview,  Next: Installation/Basic Configuration,  Prev: Top,  Up: Top
+
+1 Overview
+**********
+
+This chapter gives the overview of semantic and its goals.
+
+With Emacs, regular expressions (and syntax tables) are the basis of
+identifying components in a programming language source for purposes
+such as color highlighting.  This approach has proved is usefulness,
+but have limitations.
+
+semantic provides a new infrastructure that goes far beyond text
+analysis based on regular expressions.
+
+semantic uses "parsers" to analyze programming language sources.  For
+languages that can be described using a context-free grammar, parsers
+can be based on the grammar of the language.  Or they can be "external
+parsers" implemented using any means.  This allows the use of a regular
+expression parser for non-regular languages, or external programs for
+speed.
+
+semantic provides extensive tools to help support a new language.  An
+original LL parser, and a Bison-like LALR parser are included.  So, for
+a regular language, all that the developer needs to do is write a
+grammar file along with appropriate semantic rules.
+
+semantic allows an uniform representation of language components, and
+provides a common API so that programmers can develop applications that
+work for all languages.  The distribution includes good set of tools
+and examples for the application writers, that demonstrate the
+usefulness of semantic.
+
+The following diagram illustrates the benefits of using semantic:
+
+*Please Note:*
+     The words in all-capital are those that semantic itself provides.
+     Others are current or future languages or applications that are not
+     distributed along with semantic.
+
+                                                                  Applications
+                                                                      and
+                                                                   Utilities
+                                                                     -------
+                                                                    /       \
+                    +---------------+    +--------+    +--------+
+              C --->| C      PARSER |--->|        |    |        |
+                    +---------------+    |        |    |        |
+                    +---------------+    | COMMON |    | COMMON |<--- SPEEDBAR
+           Java --->| JAVA   PARSER |--->|        |    |        |
+                    +---------------+    | PARSE  |    | PARSE  |<--- SENATOR
+                    +---------------+    |        |    |        |
+         Python --->| PYTHON PARSER |--->| TREE   |    | TREE   |<--- DOCUMENT
+                    +---------------+    |        |    |        |
+                    +---------------+    | FORMAT |    | API    |<--- SEMANTICDB
+         Scheme --->| SCHEME PARSER |--->|        |    |        |
+                    +---------------+    |        |    |        |<--- jdee
+                    +---------------+    |        |    |        |
+        Texinfo --->| TEXI.  PARSER |--->|        |    |        |<--- ecb
+                    +---------------+    |        |    |        |
+
+                         ...                ...           ...         ...
+
+                    +---------------+    |        |    |        |<--- app. 1
+        Lang. A --->| A      Parser |--->|        |    |        |
+                    +---------------+    |        |    |        |<--- app. 2
+                    +---------------+    |        |    |        |
+        Lang. B --->| B      Parser |--->|        |    |        |<--- app. 3
+                    +---------------+    |        |    |        |
+
+                          ...        ...     ...          ...       ...
+
+                    +---------------+    |        |    |        |
+        Lang. Y --->| Y      Parser |--->|        |    |        |<--- app. ?
+                    +---------------+    |        |    |        |
+                    +---------------+    |        |    |        |<--- app. ?
+        Lang. Z --->| Z      Parser |--->|        |    |        |
+                    +---------------+    +--------+    +--------+
+
+* Menu:
+
+* Semantic Components::
+
+
+File: semantic.info,  Node: Semantic Components,  Up: Overview
+
+1.1 Semantic Components
+=======================
+
+This chapter gives an overview of major components of semantic and how
+they interact with each other to perform its job.
+
+The first step of parsing is to break up the input file into its
+fundamental components.  This step is called lexical analysis.  The
+output of the lexical analyzer is a list of tokens that make up the
+file.
+
+             syntax table, keywords list, and options
+                              |
+                              |
+                              v
+         input file  ---->  Lexer   ----> token stream
+
+The next step is the parsing shown below.
+
+                         parser tables
+                              |
+                              v
+         token stream --->  Parser  ----> parse tree
+
+The end result, the parse tree, is created based on the parser tables,
+which are in the internal representation of the language grammar used by
+semantic.
+
+The semantic database provides caching of the parse trees by saving them
+into files named `semantic.cache', and automatically loading them when
+appropriate instead of re-parsing.  The reason for this is to save the
+time it takes to parse a file which could take several seconds or more
+for large files.
+
+Finally, semantic provides an API for the Emacs Lisp programmer to
+access the information in the parse tree.
+
+
+File: semantic.info,  Node: Installation/Basic Configuration,  Next: Semantic manuals,  Prev: Overview,  Up: Top
+
+2 Installation and Basic Configuration
+**************************************
+
+Semantic should be installed as a part of the CEDET distribution.  See
+the cedet/INSTALL file in the cedet distribution for basic installation
+instructions of the CEDET suite, plus canned configurations for the
+entire CEDET suite.
+
+These chapters dig into more detail for configuring semantic components
+beyond the basics of CEDET.
+
+* Menu:
+
+* Canned Configuration::
+* Search Optimization::
+* Parsing Optimization::
+
+
+File: semantic.info,  Node: Canned Configuration,  Next: Search Optimization,  Up: Installation/Basic Configuration
+
+2.1 Canned Configuration
+========================
+
+As described briefly in the cedet/INSTALL file, there are several
+canned configurations you can use.  These configuration files just turn
+different semantic modes on and off, but don't change intrinsic
+semantic parsing behaviors.
+
+You can optionally skip using any of the canned configurations by
+enabling your preferred subset individually in your `.emacs' file.
+
+ -- Command: semantic-load-enable-minimum-features
+     Enable the minimum number of semantic features for basic usage.
+
+     These minimum features are designed to allow semantic to maintain
+     the parsing data necessary needed by various tools while intruding
+     on your typical editing practices as little as possible.
+
+     The features enabled are:
+    "semantic-idle-scheduler-mode"
+          Keeps a buffer's parse tree up to date.  (*note
+          (semantic-user)Idle Scheduler::.)
+
+    `semanticdb-minor-mode'
+          Stores tags in when a buffer is not in memory.  Also stores
+          tags in save files when Emacs is not running.  (*note
+          (semantic-user)semanticdb::.)
+
+    "semanticdb-load-system-caches"
+          Loads any systemdbs created earlier, such as EBrowse
+          databases.  This loading features makes the database
+          available, but won't spend time reading in large database
+          files.
+
+    "semanticdb-load-ebrowse-caches"
+          Loads any ebrowse dbs created earlier.  (*note
+          (semantic-user)Create System Databases::.)  (*note
+          (semantic-user)semanticdb::.)
+
+ -- Command: semantic-load-enable-all-exuberent-ctags-support
+     Enable all ectag supported backend support features.  This
+     includes:
+    semanticdb backend support
+          Using exuberent ctags as a semanticdb backend allows for
+          faster first-time parsing of files for supported languages,
+          such as C/C++.
+
+    buffer parsing using ectags for some modes.
+          Some languages do not have regular all Lisp Semantic parsers.
+          This command enables the use of Exuberent ctags as the main
+          parser for some languages, such as for Borne Shell scripts.
+
+     Any mode that has been tested to work will be added to this
+     function.
+
+ -- Command: semantic-load-enable-code-helpers
+     Enable some semantic features that provide minimal coding
+     assistance.
+
+     This feature set is setup to provide useful features for code
+     writing that do not change the typical Emacs editing experience
+     very much.
+
+     This includes "semantic-load-enable-minimum-features" plus:
+    "imenu"
+          Lists Semantic generated tags in the menubar.
+
+    "semantic-idle-summary-mode"
+          Show a summary for the tag indicated by code under point.
+          Some code editors call this intellisense.  (*note
+          (semantic-user)Idle Summary Mode::.)
+
+    "senator-minor-mode"
+          Semantic Navigator Mode.  This mode provides a keymap and
+          global menu for navigation by tags, and modifying a buffer
+          based on tag structure.  It also provides access to various
+          other minor semantic-enabled features that do not have their
+          own minor mode, or their own keybindings.  (*note
+          (semantic-user)senator::.)
+
+    "semantic-mru-bookmark-mode"
+          Provides a `switch-to-buffer' like keybinding for tag names.
+          This mode automatically creates a bookmark ring as you edit,
+          and allows your to navigate back through places you've been.
+          (*note (semantic-user)MRU Bookmarks Mode::.)
+
+ -- Command: semantic-load-enable-gaudy-code-helpers
+     Enable semantic features that provide gaudy coding assistance.
+
+     These features modify the Emacs display of your code, or can change
+     your editing experience.
+
+     This includes "semantic-load-enable-code-helpers".
+    "semantic-idle-completions-mode"
+          Provide smart symbol completion automatically at idle time.
+          The default behavior is to cause suggestions to appear next
+          to the cursor when the cursor sits idle.  (*note
+          (semantic-user)Idle Completions Mode::.)
+
+    "semantic-stickyfunc-mode"
+          Tracks current function in header-line (when available).
+          Requires Emacs 21 or later.  (*note (semantic-user)Sticky
+          Function Mode::.)
+
+    "semantic-decoration-mode"
+          Decorate tags based on various attributes.  By default, this
+          includes drawing a line in front of functions, and
+          highlighting include files.  (*note (semantic-user)Tag
+          Decoration Mode::.)
+
+
+     *Compatibility*: `semantic-load-enable-gaudy-code-helpers'
+     introduced in semantic version 2.0 supercedes
+     `semantic-load-enable-guady-code-helpers' which is now obsolete.
+
+ -- Command: semantic-load-enable-excessive-code-helpers
+     Enable all semantic features that provide coding assistance.  This
+     includes all features of "semantic-load-enable-code-helpers" plus:
+    "protected/private decoration"
+          Enables the decoration styles for highlighting struct/class
+          members that are either protected, or privately scoped.
+          Requires that `semantic-decoration-mode' is enabled.
+
+    "which-func-mode"
+          Display the current function in the mode line.
+
+
+ -- Command: semantic-load-enable-semantic-debugging-helpers
+     Enable all semantic features that assist with debugging semantic.
+     These modes include:
+    "semantic-highlight-edits-mode"
+          Highlight text that has been edited since the last parse step.
+          (*note (semantic-user)Highlight Edits Mode::.)
+
+    "semantic-show-unmatched-syntax-mode"
+          Highlight lexical tokens which failed to be parsed.  (*note
+          (semantic-user)Unmatched Syntax Highlighting::.)
+
+    "semantic-show-parser-state-mode"
+          Show the current buffer state via small indicators in the
+          mode line.  (*note (semantic-user)Parser State::.)
+
+
+
+File: semantic.info,  Node: Search Optimization,  Next: Parsing Optimization,  Prev: Canned Configuration,  Up: Installation/Basic Configuration
+
+2.2 Search Optimization
+=======================
+
+A common use of semantic is for smart completion and tag browsing.
+These operations involve searching through the tags of your files.  For
+complete documentation on configuring your searches, *Note
+(semantic-user)Semanticdb Search Configuration::.
+
+The default configuration is for the most complete set of searches
+possible.  During idle services, the slowest options are disabled.
+
+2.2.1 Search Throttle
+---------------------
+
+Searching is controlled with `semanticdb-find-default-throttle'.  If
+you want to speed up parsing by disabling searches in system headers,
+you might add code like this for C mode.
+
+     (setq-mode-local c-mode
+     		 semanticdb-find-default-throttle
+     		 '(project unloaded recursive))
+                      ;; Remove 'system from the throttle
+
+2.2.2 System Include Paths
+--------------------------
+
+If you want semantic to find symbols from system libraries, you will
+need to update the system include path.
+
+You can find headers at a system level by configuring an include path.
+*Note (semantic-user)Include paths::.
+
+For C/C++ code, semantic will automatically try to setup the system
+include path based on the output of `gcc -v' using
+`semantic-gcc-setup'.  If you want to use a different version of GCC
+than what is found with "gcc", you will need to call the setup function
+in your `.emacs' before loading your first `.c' file.
+
+     (semantic-gcc-setup "mygcc")
+
+You can customize your include paths with the function
+`semantic-add-system-include'.  For example, if you were to be working
+on a linux kernel, you might opt to configure your search path in your
+`.emacs' file with code like this:
+
+     (semantic-reset-system-include 'c-mode)
+     (semantic-add-system-include "/usr/src/linux-2.4/include" 'c-mode)
+
+It is also useful to find and install extra search engine back-ends,
+such *Note (semantic-user)Create System Databases::.  Ebrowse is one
+such back-end for C and C++ code.
+
+You might create an ebrowse database for your C include files like this:
+
+     M-x semanticdb-create-ebrowse-database RET /usr/include/ RET
+
+This will create the database, save it, and add it to the database
+search list for your C and C++ based projects.  These databases will be
+created in your `~/.semanticdb' directory to be reloaded in future
+Emacs sessions.
+
+Unfortunately, EBROWSE does not support all the features needed by
+semantic, so you will find that semantic will need to go and reparse
+those files later when they are needed.
+
+2.2.3 Project Include Path
+--------------------------
+
+Finding files included into a program file requires knowing the include
+path.
+
+Finding files within a project path is more complex.  One way is to
+teach semantic about your project, and add an entry to
+`semanticdb-project-roots'.  See *Note (semantic-user)Semanticdb Search
+Configuration::, or *Note (semantic-user)SemanticDB project roots::.
+
+Alternately, setup an EDE project.  Using the *note EDE project system:
+(ede)top to allow finer grained control on how Semantic will find
+header files.  You can use EDE to create a project and create your
+Makefiles for you, or you can create a simple project that allows
+configuration of just this piece is covered in *Note (ede)Simple
+projects::.
+
+One style of a simple project is the *note EDE CPP Root:
+(ede)ede-cpp-root project.  This is a simple way to provide access to a
+C/C++ project via EDE to Semantic.
+
+
+File: semantic.info,  Node: Parsing Optimization,  Prev: Search Optimization,  Up: Installation/Basic Configuration
+
+2.3 Parsing Optimization
+========================
+
+The semantic parsers generate the tags that form the basis of all the
+semantic based tools, such as browsers and completion.  Keeping those
+tags up to date can have performance implications.
+
+Here are some common tasks you may be interested in:
+
+2.3.1 Don't parse certain buffers
+---------------------------------
+
+You can inhibit parsing using the `semantic-inhibit-functions' variable.
+
+ -- Variable: semantic-inhibit-functions
+     List of functions to call with no arguments before semantic sets up
+     a buffer.  If any of these functions returns non-`nil', the
+     current buffer is not setup to use Semantic.
+
+You could have this inhibit parsing in very large files, or files which
+cause particular problems to semantic.
+
+2.3.2 Parsing in idle time
+--------------------------
+
+Tags are usually kept up to date when Emacs is idle *Note
+(semantic-user)Idle Scheduler::.  The semantic idle-scheduler
+automatically updates the tags in various buffers before executing
+specific idle modes, such as summary mode.
+
+You might choose to tune the scheduler with some code like this in your
+`.emacs' file:
+
+     ;; Increase the delay before activation
+     (setq semantic-idle-scheduler-idle-time 10)
+     ;; Don't reparse really big buffers.
+     (setq semantic-idle-scheduler-max-buffer-size 100000)
+
+There is also a secondary idle services that runs after a longer delay.
+The secondary idle service will perform large scale parsing of any
+file semantic thinks you may need to reference, and then saves all the
+databases.
+
+You might want to tune the scheduler timer in your `.emacs' file like
+this:
+
+     ;; Increase the delay before doing slow work to 2 minutes.
+     (setq semantic-idle-scheduler-work-idle-time 120)
+
+
+File: semantic.info,  Node: Semantic manuals,  Next: Semantic Internals,  Prev: Installation/Basic Configuration,  Up: Top
+
+3 Semantic manuals
+******************
+
+To know how to use applications enabled by semantic, *note the User's
+Guide: (semantic-user)top.
+
+If you are an application developer and need to know the functions and
+concepts, *note the Application Development Manual:
+(semantic-appdev)top.
+
+To support a new language, *note the Language Support Developer's
+Guide: (semantic-langdev)top.
+
+To use the grammar writing environment, and write in the rule based
+language, *note the Grammar Framework Manual: (grammar-fw)top.
+
+For details on the original semantic LL parser, *note the Bovine Parser
+Manual: (bovine)top.
+
+For details on the Bison-like LALR parser, *note the Wisent Parser
+Manual: (wisent)top.
+
+
+File: semantic.info,  Node: Semantic Internals,  Next: Glossary,  Prev: Semantic manuals,  Up: Top
+
+4 Semantic Internals
+********************
+
+This chapter provides an overview of the internals of semantic.  This
+information would not be needed by neither application developers nor
+grammar developers.
+
+It would be useful mostly for the hackers who would like to learn more
+about how semantic works.
+
+* Menu:
+
+* Parser code ::	Code used for the parsers
+* Tag handling ::	Code used for manipulating tags
+* Semanticdb ::         Code used in the semantic database
+* Analyzer ::           Code used in the code analyzer
+* Tools ::              Code used in user tools.
+* Tests ::              Code used for testing.
+
+
+File: semantic.info,  Node: Parser code,  Next: Tag handling,  Up: Semantic Internals
+
+4.1 Parser code
+===============
+
+semantic parsing code is spread across a range of files.
+
+`semantic.el'
+     The core infrastructure sets up buffers for parsing, and has all
+     the core parsing routines.  Most parsing routines are
+     overloadable, so the actual implementation may be somewhere else.
+
+`semantic-edit.el'
+     Incremental reparse based on user edits.
+
+`semantic-grammar.el'
+`semantic-grammar.wy'
+     Parser for the different grammar languages, and a major mode for
+     editing grammars in Emacs.
+
+`semantic-lex.el'
+     Infrastructure for implementing lexical analyzers.  Provides macros
+     for creating individual analyzers for specific features, and a way
+     to combine them together.
+
+`semantic-lex-spp.el'
+     Infrastructure for a lexical symbolic preprocessor.  This was
+     written to implement the C preprocessor, but could be used for
+     other lexical preprocessors.
+
+`bovine/bovine-grammar.el'
+`bovine/bovine-grammar-macros.el'
+`bovine/semantic-bovine.el'
+     The "bovine" grammar.  This is the first grammar mode written for
+     semantic and is useful for simple creating simple parsers.
+
+`wisent/wisent.el'
+`wisent/bison-wisent.el'
+`wisent/semantic-wisent.el'
+`wisent/semantic-debug-grammar.el'
+     A port of bison to Emacs.  This infrastructure lets you create LALR
+     based parsers for semantic.
+
+`semantic-ast.el'
+     Manage Abstract Syntax Trees for parsers.
+
+`semantic-debug.el'
+     Infrastructure for debugging grammars.
+
+`semantic-util.el'
+     Various utilities for manipulating tags, such as describing the tag
+     under point, adding labels, and the all important
+     `semantic-something-to-tag-table'.
+
+
+
+File: semantic.info,  Node: Tag handling,  Next: Semanticdb,  Prev: Parser code,  Up: Semantic Internals
+
+4.2 Tag handling
+================
+
+A tag represents an individual item found in a buffer, such as a
+function or variable.  Tag handling is handled in several source files.
+
+`semantic-tag.el'
+     Basic tag creation, queries, cloning, binding, and unbinding.
+
+`semantic-tag-write.el'
+     Write a tag or tag list to a stream.  These routines are used by
+     `semanticdb-file.el' when saving a list of tags.
+
+`semantic-tag-file.el'
+     Files associated with tags.  Goto-tag, file for include, and file
+     for a prototype.
+
+`semantic-tag-ls.el'
+     Language dependant features of a tag, such as parent calculation,
+     slot protection, and other states like abstract, virtual, static,
+     and leaf.
+
+`semantic-dep.el'
+     Include file handling.  Contains the include path concepts, and
+     routines for looking up file names in the include path.
+
+`semantic-format.el'
+     Convert a tag into a nicely formatted and colored string.  Use
+     `semantic-test-all-format-tag-functions' to test different output
+     options.
+
+`semantic-find.el'
+     Find tags matching different conditions in a tag table.  These
+     routines are used by `semanticdb-find.el' once the database has
+     been converted into a simpler tag table.
+
+`semantic-sort.el'
+     Sorting lists of tags in different ways.  Includes sorting a plain
+     list of tags forward or backward.  Includes binning tags based on
+     attributes (bucketize), and tag adoption for multiple references to
+     the same thing.
+
+`semantic-doc.el'
+     Capture documentation comments from near a tag.
+
+
+
+File: semantic.info,  Node: Semanticdb,  Next: Analyzer,  Prev: Tag handling,  Up: Semantic Internals
+
+4.3 Semanticdb
+==============
+
+Semanticdb complexity is certainly an issue.  It is a rather hairy
+problem to try and solve.
+
+`semanticdb.el'
+     Defines a "database" and a "table" base class.  You can
+     instantiate these classes, and use them, but they are not
+     persistent.
+
+     This file also provides support for `semanticdb-minor-mode', which
+     automatically associates files with tables in databases so that
+     tags are _saved_ while a buffer is not in memory.
+
+     The database and tables both also provide applicate cache
+     information, and cache flushing system.  The semanticdb search
+     routines use caches to save datastructures that are complex to
+     calculate.
+
+     Lastly, it provides the concept of "project root".  It is a system
+     by which a file can be associated with the root of a project, so if
+     you have a tree of directories and source files, it can find the
+     root, and allow a tag-search to span all available databases in
+     that directory hierarchy.
+
+`semanticdb-file.el'
+     Provides a subclass of the basic table so that it can be saved to
+     disk.  Implements all the code needed to unbind/rebind tags to a
+     buffer and writing them to a file.
+
+`semanticdb-el.el'
+     Implements a special kind of "system" database that uses Emacs
+     internals to perform queries.
+
+`semanticdb-ebrowse.el'
+     Implements a system database that uses Ebrowse to parse files into
+     a table that can be queried for tag names.  Successful tag hits
+     during a find causes semantic to pick up and parse the reference
+     files to get the full details.
+
+`semanticdb-find.el'
+     Infrastructure for searching groups semantic databases, and dealing
+     with the search results format.
+
+`semanticdb-ref.el'
+     Tracks crossreferences.   Cross references are needed when buffer
+     is reparsed, and must alert other tables that any dependant caches
+     may need to be flushed.  References are in the form of include
+     files.
+
+
+
+File: semantic.info,  Node: Analyzer,  Next: Tools,  Prev: Semanticdb,  Up: Semantic Internals
+
+4.4 Analyzer
+============
+
+The semantic analyzer is a complex engine which has been broken down
+across several modules.  When the semantic analyzer fails, start with
+`semantic-analyze-debug-assist', then dive into some of these files.
+
+`semantic-analyze.el'
+     The core analyzer for defining the "current context".  The current
+     context is an object that contains references to aspects of the
+     local context including the current prefix, and a tag list
+     defining what the prefix means.
+
+`semantic-analyze-complete.el'
+     Provides `semantic-analyze-possible-completions'.
+
+`semantic-analyze-debug.el'
+     The analyzer debugger.  Useful when attempting to get everything
+     configured.
+
+`semantic-analyze-fcn.el'
+     Various support functions needed by the analyzer.
+
+`semantic-ctxt.el'
+     Local context parser.  Contains overloadable functions used to move
+     around through different scopes, get local variables, and collect
+     the current prefix used when doing completion.
+
+`semantic-scope.el'
+     Calculate "scope" for a location in a buffer.  The scope includes
+     local variables, and tag lists in scope for various reasons, such
+     as C++ using statements.
+
+`semanticdb-typecache.el'
+     The typecache is part of `semanticdb', but is used primarilly by
+     the analyzer to look up datatypes and complex names.  The
+     typecache is bound across source files and builds a master lookup
+     table for data type names.
+
+`semantic-ia.el'
+     Interactive Analyzer functions.  Simple routines that do
+     completion or lookups based on the results from the Analyzer.
+     These routines are meant as examples for application writers, but
+     are quite useful as they are.
+
+`semantic-ia-sb.el'
+     Speedbar support for the analyzer, displaying context info, and
+     completion lists.
+
+
+
+File: semantic.info,  Node: Tools,  Next: Tests,  Prev: Analyzer,  Up: Semantic Internals
+
+4.5 Tools
+=========
+
+These files contain various tools a user can use.
+
+`semantic-idle.el'
+     Idle scheduler for semantic.  Manages reparsing buffers after
+     edits, and large work tasks in idle time.  Includes modes for
+     showing summary help and pop-up completion.
+
+`senator.el'
+     The semantic navigator.  Provides many ways to move through a
+     buffer based on the active tag table.
+
+`semantic-decorate.el'
+     A minor mode for decorating tags based on details from the parser.
+     Includes overlines for functions, or coloring class fields based on
+     protection.
+
+`semantic-decorate-include.el'
+     A decoration mode for include files, which assists users in
+     setting up parsing for their includes.
+
+`semantic-complete.el'
+     Advanced completion prompts for reading tag names in the
+     minibuffer, or inline in a buffer.
+
+`semantic-imenu.el'
+     Imenu support for using semantic tags in imenu.
+
+`semantic-mru-bookmark.el'
+     Automatic bookmarking based on tags.  Jump to locations you've been
+     before based on tag name.
+
+`semantic-sb.el'
+     Support for semantic tag usage in Speedbar.
+
+`semantic-util-modes.el'
+     A bunch of small minor-modes that exposes aspects of the semantic
+     parser state.  Includes `semantic-stickyfunc-mode'.
+
+`document.el'
+`document-vars.el'
+     Create an update comments for tags.
+
+`semantic-adebug.el'
+     Extensions of `data-debug.el' for semantic.
+
+`semantic-chart.el'
+     Draw some charts from stats generated from parsing.
+
+`semantic-elp.el'
+     Profiler for helping to optimize the semantic analyzer.
+
+
+
+File: semantic.info,  Node: Tests,  Prev: Tools,  Up: Semantic Internals
+
+4.6 Tests
+=========
+
+`semantic-utest.el'
+     Basic testing of parsing and incremental parsing for most supported
+     languages.
+
+`semantic-ia-utest.el'
+     Test the semantic analyzer's ability to provide smart completions.
+
+`semantic-utest-c.el'
+     Tests for the C parser's lexical pre-processor.
+
+`semantic-regtest.el'
+     Regression tests from the older Semantic 1.x API.
+
+
+
+File: semantic.info,  Node: Glossary,  Next: GNU Free Documentation License,  Prev: Semantic Internals,  Up: Top
+
+Appendix A Glossary
+*******************
+
+
+     BNF
+     In semantic 1.4, a BNF file represented "Bovine Normal Form", the
+     grammar file used for the 1.4 parser generator.  This was a play on
+     Backus-Naur Form which proved too confusing.
+
+
+     bovinate
+     A verb representing what happens when a bovine parser parses a
+     file.
+
+
+     bovine lambda
+     In a bovine, or LL parser, the bovine lambda is a function to
+     execute when a specific set of match rules has succeeded in
+     matching text from the buffer.
+
+
+     bovine parser
+     A parser using the bovine parser generator.  It is an LL parser
+     suitible for small simple languages.
+
+
+     context
+
+
+     LALR
+
+
+     lexer
+     A program which converts text into a stream of tokens by analyzing
+     them lexically.  Lexers will commonly create strings, symbols,
+     keywords and punctuation, and strip whitespaces and comments.
+
+
+     LL
+
+
+     nonterminal
+     A nonterminal symbol or simply a nonterminal stands for a class of
+     syntactically equivalent groupings. A nonterminal symbol name is
+     used in writing grammar rules.
+
+
+     overloadable
+     Some functions are defined via `define-overload'.  These can be
+     overloaded via ....
+
+
+     parser
+     A program that converts tokens to tags.
+
+
+     tag
+     A tag is a representation of some entity in a language file, such
+     as a function, variable, or include statement.  In semantic, the
+     word tag is used the same way it is used for the etags or ctags
+     tools.
+
+     A tag is usually bound to a buffer region via overlay, or it just
+     specifies character locations in a file.
+
+
+     token
+     A single atomic item returned from a lexer.  It represents some set
+     of characters found in a buffer.
+
+
+     token stream
+     The output of the lexer as well as the input to the parser.
+
+
+     wisent parser
+     A parser using the wisent parser generator.  It is a port of bison
+     to Emacs Lisp.  It is an LALR parser suitable for complex
+     languages.
+
+
+
+File: semantic.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Glossary,  Up: Top
+
+Appendix B GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: semantic.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* semantic-inhibit-functions:            Parsing Optimization.
+                                                              (line  18)
+* semantic-load-enable-all-exuberent-ctags-support: Canned Configuration.
+                                                              (line  43)
+* semantic-load-enable-code-helpers:     Canned Configuration.
+                                                              (line  59)
+* semantic-load-enable-excessive-code-helpers: Canned Configuration.
+                                                              (line 119)
+* semantic-load-enable-gaudy-code-helpers: Canned Configuration.
+                                                              (line  90)
+* semantic-load-enable-minimum-features: Canned Configuration.
+                                                              (line  15)
+* semantic-load-enable-semantic-debugging-helpers: Canned Configuration.
+                                                              (line 131)
+
+
+
+Tag Table:
+Node: Top1107
+Node: Overview1998
+Node: Semantic Components6182
+Node: Installation/Basic Configuration7602
+Node: Canned Configuration8214
+Ref: semantic-load-enable-minimum-features8800
+Ref: semantic-enable-all-exuberent-ctags-support9954
+Ref: semantic-load-enable-code-helpers10616
+Ref: semantic-load-enable-gaudy-code-helpers11949
+Ref: semantic-load-enable-excessive-code-helpers13164
+Ref: semantic-load-enable-semantic-debugging-helpers13685
+Node: Search Optimization14290
+Node: Parsing Optimization17868
+Ref: semantic-inhibit-functions18468
+Node: Semantic manuals19758
+Node: Semantic Internals20579
+Node: Parser code21296
+Node: Tag handling23050
+Node: Semanticdb24719
+Node: Analyzer26811
+Node: Tools28734
+Node: Tests30411
+Node: Glossary30869
+Ref: BNF31026
+Ref: bovinate31231
+Ref: bovine lambda31326
+Ref: bovine parser31515
+Ref: context31647
+Ref: LALR31662
+Ref: lexer31674
+Ref: LL31894
+Ref: nonterminal31904
+Ref: overloadable32101
+Ref: parser32215
+Ref: tag32274
+Ref: token32625
+Ref: token stream32749
+Ref: wisent parser32834
+Node: GNU Free Documentation License33007
+Node: Index52739
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/semantic.texi b/site/cedet-1.0pre7/semantic/doc/semantic.texi
new file mode 100644
index 0000000..ec5377e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semantic.texi
@@ -0,0 +1,195 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename semantic.info
+@set TITLE  Semantic Manual
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents Semantic, a new intrastructure for parser
+based text analysis for Emacs.
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 Eric M. Ludlam
+Copyright @copyright{} 2001, 2002, 2003, 2005 David Ponce
+Copyright @copyright{} 2002, 2003 Richard Y. Kim
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic: (semantic).	Infrastructure for parser based text analysis.
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents Semantic.
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 2007 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+@semantic{} is a program for Emacs which includes, at its core, a
+lexer, and two compiler compilers (bovinator and wisent).  Additional
+tools include, support for imenu, speedbar, whichfunc, eldoc,
+hippie-expand, and several other build in tools.
+
+The core utility is the parser infrastructure which allows different
+types of parsers to be linked into the system.  Two build in parsers
+include the ``bovine'' parser, and the ``wisent'' parser.
+
+To send bug reports, or participate in discussions about semantic,
+use the mailing list cedet-semantic@@sourceforge.net via the URL:
+@url{http://lists.sourceforge.net/lists/listinfo/cedet-semantic}
+
+@menu
+* Overview::                    
+* Installation/Basic Configuration::                
+* Semantic manuals::            
+* Semantic Internals::          
+* Glossary::                    
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Overview
+@chapter Overview
+
+@include overview.texi
+
+@node Installation/Basic Configuration
+@chapter Installation and Basic Configuration
+
+@include installation.texi
+
+@node Semantic manuals
+@chapter Semantic manuals
+
+To know how to use applications enabled by @semantic{},
+@inforef{top, the User's Guide, semantic-user}.
+
+If you are an application developer and need to know the functions and
+concepts, 
+@inforef{top, the Application Development Manual, semantic-appdev}.
+
+To support a new language,
+@inforef{top, the Language Support Developer's Guide, semantic-langdev}.
+
+To use the grammar writing environment, and write in the rule based
+language, 
+@inforef{top, the Grammar Framework Manual, grammar-fw}.
+
+For details on the original @semantic{} @acronym{LL} parser,
+@inforef{top, the Bovine Parser Manual, bovine}.
+ 
+For details on the Bison-like @acronym{LALR} parser,
+@inforef{top, the Wisent Parser Manual, wisent}.
+
+@node Semantic Internals
+@chapter Semantic Internals
+
+@include internals.texi
+
+@node Glossary
+@appendix Glossary
+
+@include glossary.texi
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
+@c LocalWords: alist API APIs arg argc args argv asis assoc autoload Wisent
+@c LocalWords: backquote bnf bovinate bovinates LALR
+@c LocalWords: bovinating bovination bovinator bucketize
+@c LocalWords: cb cdr charquote checkcache cindex CLOS
+@c LocalWords: concat concocting const constantness ctxt Decl defcustom
+@c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir
+@c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum
+@c LocalWords: eq Exp EXPANDFULL expresssion fn foo func funcall
+@c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd
+@c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam
+@c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's
+@c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect
+@c LocalWords: nosnarf obarray OLE OO outputfile paren parsetable POINT's
+@c LocalWords: popup positionalonly positiononly positionormarker pre
+@c LocalWords: printf printindex Programmatically pt punctuations quotemode
+@c LocalWords: ref regex regexp Regexps reparse resetfile samp sb
+@c LocalWords: scopestart SEmantic semanticdb setfilename setq
+@c LocalWords: settitle setupfunction sexp sp SPC speedbar speedbar's
+@c LocalWords: streamorbuffer struct subalist submenu submenus
+@c LocalWords: subsubsection sw sym texi texinfo titlefont titlepage
+@c LocalWords: tok TOKEN's toplevel typemodifiers uml unset untar
+@c LocalWords: uref usedb var vskip xref yak
diff --git a/site/cedet-1.0pre7/semantic/doc/semanticheader.texi b/site/cedet-1.0pre7/semantic/doc/semanticheader.texi
new file mode 100644
index 0000000..f5238a8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/semanticheader.texi
@@ -0,0 +1,36 @@
+@c Headers and Macros for documentation written for Semantic.
+
+@c Originally written and organized by Richard Y. Kim in semantic.texi.
+
+@c *************************************************************************
+@c @ Macros
+@c *************************************************************************
+
+@c The word ``semantic'' is overloaded with two meanings in this manual.
+@c One is the name of this projects, i.e., a noun.
+@c The other is the usual English word, i.e., an adjective.
+@c This macro was created to distinguish between the two meanings.
+@c This macro should be used whenever you are referring to the name of
+@c this project.
+@c For now, this is simply the word ``semantic'' in italic font.
+@c In the future, this may turn into a logo similar to @TeX{}.
+@macro semantic{}
+@i{semantic}
+@end macro
+
+@c To be used within the glossary section.
+@macro keyword{kw}
+@anchor{\kw\}
+@b{\kw\}
+@end macro
+
+@c Simple macro to help document obsoleted functions.
+@macro obsolete{old,new}
+@sp 1
+@strong{Compatibility}:
+@code{\new\} introduced in @semantic{} version 2.0 supercedes
+@code{\old\} which is now obsolete.
+@end macro
+
+@c Common settings
+@paragraphindent none
diff --git a/site/cedet-1.0pre7/semantic/doc/tags.texi b/site/cedet-1.0pre7/semantic/doc/tags.texi
new file mode 100644
index 0000000..fb7c795
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/tags.texi
@@ -0,0 +1,995 @@
+@ignore
+@node Semantic Tags
+@chapter Semantic Tags
+@end ignore
+
+The end result of a @semantic{} parser is a list of tags per each buffer.
+This chapter discusses the tag data structure and the API provided
+by @semantic{} to query, process, and modify tags.
+
+The tags list for a buffer can be obtained by calling
+@code{semantic-fetch-tags} which returns
+a parse tree of tags that represent the program structure.
+
+@ignore
+David said:
+
+Tags are not sorted.  Maybe would it be clearer to say that
+`semantic-fetch-tags returns a parse tree of tags that
+represent the program structure.
+
+From a grammar's developer point of view it could be worth
+highlighting that the parse tree of tags should be consistent with
+buffer's location.
+
+For example, for the following definition:
+
+(defun foo (x y) ...)
+
+The parse tree should look like:
+
+("foo" function
+ (:arguments
+  ("x" "y"))
+  ...)
+
+A bad parse tree is for example:
+
+("foo" function
+ (:arguments
+  ("y" "x"))   <--- Arguments are in the reverse order
+  ...)
+@end ignore
+
+@menu
+* Tag Basics::
+* Tag Query::
+* Tag Hooks::
+* Tag Overlay::
+* Misc Tag Functions::
+* Tag Internals::
+@end menu
+
+@node Tag Basics
+@section Tag Basics
+@cindex Tag Basics
+
+Currently each tag is a list with up to five elements:
+@example
+(@var{name} @var{class} @var{attributes} @var{properties} @var{overlay})
+@end example
+
+Application developers should not rely on this list structure.
+Instead they should rely on the provided API documented in this chapter.
+The list structure is explained here primarily to help those reading
+the @semantic{} source code.
+
+@itemize @bullet
+@c
+@item
+@var{name} is a required component for all tags, i.e., every tag
+must have this component. It is also guaranteed to be a string.  This
+string represents the name of the tag, usually a named definition
+which the language will use elsewhere as a reference to the syntactic
+element found.
+@c
+@item
+@var{class} is the other required component for all tags.
+It is a symbol representing the class of the tag.
+@ignore
+David said:
+I think it would be better to say the category or class of tag
+[rather than ``type''].  Type of tag could be confusing.  The notion
+of tag type represents program data type (see the function
+`semantic-tag-type').
+@end ignore
+Valid @var{class}es can be anything, as long is it is an Emacs Lisp
+symbol.  However following are some of the well-known symbols:
+@code{type}, @code{function}, @code{variable}, @code{include},
+@code{package}, @code{code}.
+@c
+@item
+@var{attributes} is a property list that keep information related
+to the tag parsed from the buffer.
+
+The symbol names in the property list can be anything, though there is
+a useful set of predefined attributes.  It is best to use the API
+functions to access the well-known properties.  @ref{Tag Query}.
+
+@ignore
+
+It could be worth enumerating the commonly used attribute names:
+
+  :type
+  :members
+  :superclasses
+  :interfaces
+  :default-value
+  :documentation
+  :arguments
+  :system-flag
+  :detail
+
+We could recommend to use the above names when that makes sense, and
+more generally to use the Emacs keyword notation (symbol starting with
+':') for attribute names.
+@end ignore
+@c
+@item
+@var{properties} is generated by the semantic parser harness,
+and need not be provided by a language author.
+
+Properties are used to store transient data on a tag unrelated to the
+source of the original tag, such as hook functions, dynamic overlays,
+or other data needed by programs.
+
+The semantic incremental parser will attempt to maintain properties
+when reparsing the source of a tag.
+@c
+@item
+@var{overlay} represents positional information for this tag.  It is
+automatically generated by the semantic parser harness, and need
+not be provided by the language author.
+@c Below is from old semantic manual: unless they provide a
+@c nonterminal expansion function via
+@c @code{semantic-tag-expand-function}.
+Depending on the overlay in a program can be dangerous because
+sometimes the overlay is replaced with an integer pair
+@example
+[ @var{start} @var{end} ]
+@end example
+when the buffer the tag belongs to is not in memory.  This happens
+when a user has activated the Semantic Database
+ @inforef{semanticdb, , lang-support-guide}.
+@c
+@end itemize
+
+@defun semantic-tag-name tag
+@anchor{semantic-tag-name}
+Return the name of @var{tag}.
+For functions, variables, classes, typedefs, etc., this is the identifier
+that is being defined.  For tags without an obvious associated name, this
+may be the statement type, e.g., this may return @code{print} for python's
+print statement.
+@obsolete{semantic-token-name,semantic-tag-name}
+@end defun
+
+@defun semantic-tag-class tag
+@anchor{semantic-tag-class}
+Return the class of @var{tag}.
+That is, the symbol @code{'variable}, @code{'function}, @code{'type}, or other.
+There is no limit to the symbols that may represent the class of a tag.
+Each parser generates tags with classes defined by it.
+
+For functional languages, typical tag classes are:
+
+@table @code
+@item type
+Data types, named map for a memory block.
+@item function
+A function or method, or named execution location.
+@item variable
+A variable, or named storage for data.
+@item include
+Statement that represents a file from which more tags can be found.
+@item package
+Statement that declares this file's package name.
+@item code
+Code that has not name or binding to any other symbol, such as in a script.
+@end table
+
+@obsolete{semantic-token-token,semantic-tag-class}
+@end defun
+
+Several functions that deal with @var{attributes} component are given
+in @ref{Tag Attributes Internals,Tag Attributes Internals}.
+However functions listed in @ref{Tag Query,Tag Query}
+should provide most needs of the application developer.
+@refill
+
+Similarly functions that deal with @var{properties} component are given
+in @ref{Tag Properties Internals,Tag Properties Internals}.
+The application developer should not need to use any of these.
+@refill
+
+Finally @ref{Tag Overlay,Tag Overlay} lists functions dealing with
+the @var{overlay} component.
+@refill
+
+@node Tag Query
+@section Tag Query
+@cindex Tag Query
+
+This section lists functions that answers simple questions
+regarding a given tag.
+
+@subsection Tag Predicates
+
+@defun semantic-tag-p tag
+@anchor{semantic-tag-p}
+Return non-@code{nil} if @var{tag} is most likely a semantic tag.
+@obsolete{semantic-token-p,semantic-tag-p}
+@end defun
+
+@defun semantic-equivalent-tag-p tag1 tag2
+@anchor{semantic-equivalent-tag-p}
+Compare @var{tag1} and @var{tag2} and return non-@code{nil} if they are equivalent.
+Use @dfn{equal} on elements the name, class, and position.
+Use this function if tags are being copied and regrouped to test
+for if two tags represent the same thing, but may be constructed
+of different cons cells.
+@obsolete{semantic-equivalent-tokens-p,semantic-equivalent-tag-p}
+@end defun
+
+@defun semantic-tag-similar-p tag1 tag2
+@anchor{semantic-tag-similar-p}
+Test to see if @var{tag1} and @var{tag2} are similar.
+Two tags are similar if their name, datatype, and various attributes
+are the same.
+
+Similar tags that have sub-tags such as arg lists or type members,
+are similar w/out checking the sub-list of tags.
+@end defun
+
+@defun semantic-tag-of-class-p tag class
+@anchor{semantic-tag-of-class-p}
+Return non-@code{nil} if class of @var{tag} is @var{class}.
+@end defun
+
+@defun semantic-tag-faux-p tag
+@anchor{semantic-tag-faux-p}
+Return non-@code{nil} if @var{tag} is a @var{faux} tag.
+@var{faux} tags are created to represent a construct that is
+not known to exist in the code.
+
+Example: When the class browser sees methods to a class, but
+cannot find the class, it will create a faux tag to represent the
+class to store those methods.
+@end defun
+
+@defun semantic-tag-type-compound-p tag
+@anchor{semantic-tag-type-compound-p}
+Return non-@code{nil} the type of @var{tag} is compound.
+Compound implies a structure or similar data type.
+Returns the list of tag members if it is compound.
+@end defun
+
+@subsection Documentation
+
+@defun semantic-tag-docstring tag &optional buffer
+@anchor{semantic-tag-docstring}
+Return the documentation of @var{tag}.
+That is the value defined by the `:documentation' attribute.
+Optional argument @var{buffer} indicates where to get the text from.
+If not provided, then only the @var{position} can be provided.
+
+If you want to get documentation for languages that do not store
+the documentation string in the tag itself, use
+@dfn{semantic-documentation-for-tag} instead.
+@obsolete{semantic-token-docstring,semantic-tag-docstring}
+@end defun
+
+@subsection Common Flags
+
+@defun semantic-tag-variable-constant-p tag
+@anchor{semantic-tag-variable-constant-p}
+Return non-@code{nil} if the variable that @var{tag} describes is a constant.
+That is the value of the attribute `:constant-flag'.
+@obsolete{semantic-token-variable-const,semantic-tag-variable-constant-p}
+@end defun
+
+@defun semantic-tag-function-destructor-p tag
+@anchor{semantic-tag-function-destructor-p}
+Return non-@code{nil} if @var{tag} describes a destructor function.
+That is the value of the `:destructor-flag' attribute.
+@obsolete{semantic-token-function-destructor,semantic-tag-function-destructor-p}
+@end defun
+
+@defun semantic-tag-function-throws tag
+@anchor{semantic-tag-function-throws}
+Return the exceptions the function that @var{tag} describes can throw.
+That is the value of the `:throws' attribute.
+@obsolete{semantic-token-function-throws,semantic-tag-function-throws}
+@end defun
+
+@defun semantic-tag-modifiers tag
+@anchor{semantic-tag-modifiers}
+Return the value of the `:typemodifiers' attribute of @var{tag}.
+@obsolete{semantic-token-type-modifiers,semantic-tag-modifiers}
+@obsolete{semantic-token-variable-modifiers,semantic-tag-modifiers}
+@obsolete{semantic-token-function-modifiers,semantic-tag-modifiers}
+@end defun
+
+@subsection Functions
+
+@defun semantic-tag-function-arguments tag
+@anchor{semantic-tag-function-arguments}
+Return the arguments of the function that @var{tag} describes.
+That is the value of the `:arguments' attribute.
+@obsolete{semantic-token-function-args,semantic-tag-function-arguments}
+@end defun
+
+@subsection Variables
+
+@defun semantic-tag-variable-default tag
+@anchor{semantic-tag-variable-default}
+Return the default value of the variable that @var{tag} describes.
+That is the value of the attribute `:default-value'.
+@obsolete{semantic-token-variable-default,semantic-tag-variable-default}
+@end defun
+
+@subsection Data Types
+
+@defun semantic-tag-type tag
+@anchor{semantic-tag-type}
+Return the value of the `:type' attribute of @var{tag}.
+For a function it would be the data type of the return value.
+For a variable, it is the storage type of that variable.
+For a data type, the type is the style of datatype, such as
+struct or union.
+@obsolete{semantic-token-type,semantic-tag-type}
+@end defun
+
+@defun semantic-tag-of-type-p tag type
+@anchor{semantic-tag-of-type-p}
+Compare TAG's type against @var{type}.  Non @code{nil} if equivalent.
+@var{type} can be a string, or a tag of class @code{'type}.
+This can be complex since some tags might have a @code{:type} that is a tag,
+while other tags might just have a string.  This function will also be
+return true of TAG's type is compared directly to the declaration of a
+data type.
+@end defun
+
+@subsection Inheritance and Hierarchy
+
+@defun semantic-tag-named-parent tag
+@anchor{semantic-tag-named-parent}
+Return the parent of @var{tag}.
+That is the value of the `:parent' attribute.
+If a definition can occur outside an actual parent structure, but
+refers to that parent by name, then the @code{:parent} attribute should be used.
+@end defun
+
+@defun semantic-tag-function-parent tag
+@anchor{semantic-tag-function-parent}
+Return the parent of the function that @var{tag} describes.
+That is the value of the `:parent' attribute.
+A function has a parent if it is a method of a class, and if the
+function does not appear in body of its parent class.
+@obsolete{semantic-token-function-parent,semantic-tag-function-parent}
+@end defun
+
+@defun semantic-tag-type-superclasses tag
+@anchor{semantic-tag-type-superclasses}
+Return the list of superclasses of the type that @var{tag} describes.
+@obsolete{semantic-token-type-parent-superclass,semantic-tag-type-superclasses}
+@obsolete{semantic-token-type-parent,semantic-tag-type-superclasses}
+@end defun
+
+@defun semantic-tag-type-interfaces tag
+@anchor{semantic-tag-type-interfaces}
+Return the list of interfaces of the type that @var{tag} describes.
+@obsolete{semantic-token-type-parent-implement,semantic-tag-type-interfaces}
+@obsolete{semantic-token-type-parent,semantic-tag-type-interfaces}
+@end defun
+
+@defun semantic-tag-type-members tag
+@anchor{semantic-tag-type-members}
+Return the members of the type that @var{tag} describes.
+That is the value of the `:members' attribute.
+@obsolete{semantic-token-type-parts,semantic-tag-type-members}
+@end defun
+
+@subsection Includes
+
+@defun semantic-tag-include-system-p tag
+@anchor{semantic-tag-include-system-p}
+Return non-@code{nil} if the include that @var{tag} describes is a system include.
+That is the value of the attribute `:system-flag'.
+@obsolete{semantic-token-include-system,semantic-tag-include-system-p}
+@end defun
+
+@defun semantic-tag-include-filename tag
+@anchor{semantic-tag-include-filename}
+Return a filename representation of @var{tag}.
+The default action is to return the @dfn{semantic-tag-name}.
+Some languages do not use full filenames in their include statements.
+Override this method to translate the code represenation
+into a filename.  (A relative filename if necessary.)
+
+See @dfn{semantic-dependency-tag-file} to expand an include
+tag to a full file name.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@subsection Code
+
+@defun semantic-tag-code-detail tag
+@anchor{semantic-tag-code-detail}
+Return detail information from code that @var{tag} describes.
+That is the value of the attribute `:detail'.
+@end defun
+
+@subsection Tag Children
+
+@defun semantic-tag-components tag
+@anchor{semantic-tag-components}
+Return a list of components for @var{tag}.
+A Component is a part of @var{tag} which itself may be a @var{tag}.
+Examples include the elements of a structure in a 
+tag of class `type, or the list of arguments to a
+tag of class @code{'function}.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end defun
+
+@defun semantic-tag-components-default tag
+@anchor{semantic-tag-components-default}
+Return a list of components for @var{tag}.
+Perform the described task in @dfn{semantic-tag-components}.
+@end defun
+
+@defun semantic-tag-children-compatibility tag &optional positiononly
+@anchor{semantic-tag-children-compatibility}
+Return children of @var{tag}.
+If @var{positiononly} is @code{nil}, use @dfn{semantic-tag-components}.
+If @var{positiononly} is non-@code{nil}, use @dfn{semantic-tag-components-with-overlays}.
+@var{do} @var{not} use this fcn in new code.  Use one of the above instead.
+@obsolete{semantic-nonterminal-children,semantic-tag-children-compatibility}
+@end defun
+
+@node Tag Overlay
+@section Tag Overlay
+@cindex Tag Overlay
+
+The functions in this answer questions regarding the overly such as
+the buffer in which the tags is located, the start and/or end position
+of the tag, and the overlay itself which spans the tags.
+
+@defun semantic-tag-start tag
+@anchor{semantic-tag-start}
+Return the start location of @var{tag}.
+@obsolete{semantic-token-start,semantic-tag-start}
+@end defun
+
+@defun semantic-tag-end tag
+@anchor{semantic-tag-end}
+Return the end location of @var{tag}.
+@obsolete{semantic-token-end,semantic-tag-end}
+@end defun
+
+@defun semantic-tag-bounds tag
+@anchor{semantic-tag-bounds}
+Return the location (@var{start} @var{end}) of data @var{tag} describes.
+@obsolete{semantic-token-extent,semantic-tag-bounds}
+@end defun
+
+@defun semantic-tag-in-buffer-p tag
+@anchor{semantic-tag-in-buffer-p}
+Return the buffer @var{tag} resides in @var{iff} tag is already in a buffer.
+If a tag is not in a buffer, return @code{nil}.
+@end defun
+
+@defun semantic-tag-buffer tag
+@anchor{semantic-tag-buffer}
+Return the buffer @var{tag} resides in.
+If @var{tag} has an originating file, read that file into a (maybe new)
+buffer, and return it.
+Return @code{nil} if there is no buffer for this tag.
+@obsolete{semantic-token-buffer,semantic-tag-buffer}
+@end defun
+
+@defun semantic-tag-file-name tag
+@anchor{semantic-tag-file-name}
+Return the name of the file from which @var{tag} originated.
+Return @code{nil} if that information can't be obtained.
+If @var{tag} is from a loaded buffer, then that buffer's filename is used.
+If @var{tag} is unlinked, but has a @code{:filename} property, then that is used.
+@end defun
+
+@defun semantic-tag-overlay tag
+@anchor{semantic-tag-overlay}
+Return the @var{overlay} part of @var{tag}.
+That is, an overlay or an unloaded buffer representation.
+This function can also return an array of the form [ @var{start} @var{end} ].
+This occurs for tags that are not currently linked into a buffer.
+@obsolete{semantic-token-overlay,semantic-tag-overlay}
+@end defun
+
+@defun semantic-tag-with-position-p tag
+@anchor{semantic-tag-with-position-p}
+Return non-@code{nil} if @var{tag} has positional information.
+@obsolete{semantic-token-with-position-p,semantic-tag-with-position-p}
+@end defun
+
+@defun semantic-tag-components-with-overlays tag
+@anchor{semantic-tag-components-with-overlays}
+Return the list of top level components belonging to @var{tag}.
+Children are any sub-tags which contain overlays.
+
+Default behavior is to get @dfn{semantic-tag-components} in addition
+to the components of an anonymous types (if applicable.)
+
+@table @strong
+@item Language authors, please note:
+  If a mode defines a language tag that has tags in it with overlays
+you should still return them with this function.
+Ignoring this step will prevent several features from working correctly.
+This function can be overloaded (see @dfn{define-mode-local-override} for details).
+@end table
+@end defun
+
+@defun semantic-tag-components-with-overlays-default tag
+@anchor{semantic-tag-components-with-overlays-default}
+Return the list of top level components belonging to @var{tag}.
+Children are any sub-tags which contain overlays.
+The default action collects regular components of @var{tag}, in addition
+to any components beloning to an anonymous type.
+@end defun
+
+@node Tag Hooks
+@section Tag Hooks
+@cindex Tag Hooks
+
+Individual tags can have hooks associated with them.  Hooks are saved
+as properties, but can cause specific tags to have special behaviors
+after a hook is added.
+
+You can manipulate tag hooks with these functions:
+
+@defun semantic-tag-add-hook tag hook function &optional append
+@anchor{semantic-tag-add-hook}
+Onto @var{tag}, add to the value of @var{hook} the function @var{function}.
+@var{function} is added (if necessary) at the beginning of the hook list
+unless the optional argument @var{append} is non-@code{nil}, in which case
+@var{function} is added at the end.
+@var{hook} should be a symbol, and @var{function} may be any valid function.
+See also the function @dfn{add-hook}.
+@end defun
+
+@defun semantic-tag-remove-hook tag hook function
+@anchor{semantic-tag-remove-hook}
+Onto @var{tag}, remove from the value of @var{hook} the function @var{function}.
+@var{hook} should be a symbol, and @var{function} may be any valid function.  If
+@var{function} isn't the value of @var{hook}, or, if @var{function} doesn't appear in
+the list of hooks to run in @var{hook}, then nothing is done.
+See also the function @dfn{remove-hook}.
+@end defun
+
+For a developer, if you have an application for which you want to
+support a special kind of hook on a per tag basis, you can use this
+to run those hooks.
+
+@defun semantic--tag-run-hooks tag hook &rest args
+@anchor{semantic--tag-run-hooks}
+Run for @var{tag} all expressions saved on the property @var{hook}.
+Each hook expression must take at least one argument, the @var{tag}.
+For any given situation, additional @var{args} may be passed.
+@end defun
+
+Semantic supports two TAG specific hooks at this time:
+
+@table @code
+@item link-hook
+This hook is run whenever a tag is linked into a buffer.  This occurs
+just after parsing, and whenever a tag is loaded into memory.  This
+hook also executes after a database save, when all tags are first
+unlinked from the current buffer before the save.
+@item unlink-hook
+This hook is run whenever a tag is unlinked from a buffer.  This
+occurs during a database save, or when a tag is modified by the
+incremental parser.
+@item unlink-copy-hook
+This hook is run whenever a tag is copied.  This occurs in the
+function @code{semantic-tag-copy}.  Use this hook to remove properties
+from the tag that link it to a buffer, as this tag should no longer
+have direct buffer links.
+@end table
+
+@node Misc Tag Functions
+@section Misc Tag Functions
+@cindex Misc Tag Functions
+
+@deffn Command semantic-narrow-to-tag &optional tag
+@anchor{semantic-narrow-to-tag}
+Narrow to the region specified by the bounds of @var{tag}.
+See @dfn{semantic-tag-bounds}.
+@obsolete{semantic-narrow-to-token,semantic-narrow-to-tag}
+@end deffn
+
+@defun semantic-with-buffer-narrowed-to-current-tag &rest body
+@anchor{semantic-with-buffer-narrowed-to-current-tag}
+Execute @var{body} with the buffer narrowed to the current tag.
+@obsolete{semantic-with-buffer-narrowed-to-current-token,semantic-with-buffer-narrowed-to-current-tag}
+@end defun
+
+@defun semantic-with-buffer-narrowed-to-tag tag &rest body
+@anchor{semantic-with-buffer-narrowed-to-tag}
+Narrow to @var{tag}, and execute @var{body}.
+@obsolete{semantic-with-buffer-narrowed-to-token,semantic-with-buffer-narrowed-to-tag}
+@end defun
+
+@node Tag Internals
+@section Tag Internals
+@cindex Tag Internals
+
+@menu
+* Tag Attributes Internals::
+* Tag Properties Internals::
+* Tag Overlay Internals::
+* Creating Tags::
+* Copying Tags::	
+* Misc Tag Internals::
+@end menu
+
+@node Tag Attributes Internals
+@subsection Tag Attributes Internals
+
+@ignore
+Attribute Accessor Method          | Property Symbol
+----------------------------------------------------
+semantic-tag-variable-constant-p   | :constant-flag
+semantic-tag-function-destructor-p | :destructor-flag
+semantic-tag-function-parent       | :parent
+semantic-tag-function-throws       | :throws
+semantic-tag-modifiers             | :typemodifiers
+semantic-tag-function-arguments    | :arguments
+semantic-tag-variable-default      | :default-value
+semantic-tag-docstring             | :documentation
+semantic-tag-type-interfaces       | :interfaces
+semantic-tag-type-members          | :members
+semantic-tag-type-superclasses     | :superclasses
+semantic-tag-include-system-p      | :system-flag
+semantic-tag-type                  | :type
+@end ignore
+
+@defun semantic-tag-attributes tag
+@anchor{semantic-tag-attributes}
+Return the list of public attributes of @var{tag}.
+That is a property list: (@var{attribute-1} @var{value-1} @var{attribute-2} @var{value-2}@dots{}).
+@obsolete{semantic-token-extra-specs,semantic-tag-attributes}
+@obsolete{semantic-token-function-extra-specs,semantic-tag-attributes}
+@obsolete{semantic-token-variable-extra-specs,semantic-tag-attributes}
+@obsolete{semantic-token-type-extra-specs,semantic-tag-attributes}
+@end defun
+
+@defun semantic-tag-get-attribute tag attribute
+@anchor{semantic-tag-get-attribute}
+From @var{tag}, return the value of @var{attribute}.
+@var{attribute} is a symbol whose specification value to get.
+Return the value found, or @code{nil} if @var{attribute} is not one of the
+attributes of @var{tag}.
+@obsolete{semantic-token-extra-spec,semantic-tag-get-attribute}
+@obsolete{semantic-token-function-extra-spec,semantic-tag-get-attribute}
+@obsolete{semantic-token-variable-extra-spec,semantic-tag-get-attribute}
+@end defun
+
+@defun semantic-tag-put-attribute tag attribute value
+@anchor{semantic-tag-put-attribute}
+Change value in @var{tag} of @var{attribute} to @var{value}.
+If @var{attribute} already exists, its value is set to @var{value}, otherwise the
+new @var{attribute} @var{value} pair is added.
+Return @var{tag}.
+Use this function in a parser when not all attributes are known at the
+same time.
+@obsolete{semantic-token-add-extra-spec,semantic-tag-put-attribute}
+@end defun
+
+@defun semantic-tag-put-attribute-no-side-effect tag attribute value
+@anchor{semantic-tag-put-attribute-no-side-effect}
+Change value in @var{tag} of @var{attribute} to @var{value} without side effects.
+All cons cells in the attribute list are replicated so that there
+are no side effects if @var{tag} is in shared lists.
+If @var{attribute} already exists, its value is set to @var{value}, otherwise the
+new @var{attribute} @var{value} pair is added.
+Return @var{tag}.
+@end defun
+
+@node Tag Properties Internals
+@subsection Tag Properties Internals
+
+@ignore
+Property symbols:
+  reparse-symbol
+  :filename
+  secondary-overlays
+
+Related functions not yet documented:
+  semantic-brute-find-tag-by-property
+  semantic-tag-add-hook
+  semantic-tag-remove-hook
+  semantic-show-label
+@end ignore
+
+@defun semantic-tag-properties tag
+@anchor{semantic-tag-properties}
+Return the list of private properties of @var{tag}.
+That is a property list: (@var{property-1} @var{value-1} @var{property-2} @var{value-2}@dots{}).
+@obsolete{semantic-token-properties,semantic-tag-properties}
+@end defun
+
+@defun semantic--tag-put-property tag property value
+@anchor{semantic--tag-put-property}
+Change value in @var{tag} of @var{property} to @var{value}.
+If @var{property} already exists, its value is set to @var{value}, otherwise the
+new @var{property} @var{value} pair is added.
+Return @var{tag}.
+That function is for internal use only.
+@obsolete{semantic-token-put,semantic--tag-put-property}
+@end defun
+
+@defun semantic--tag-get-property tag property
+@anchor{semantic--tag-get-property}
+From @var{tag}, extract the value of @var{property}.
+Return the value found, or @code{nil} if @var{property} is not one of the
+properties of @var{tag}.
+That function is for internal use only.
+@obsolete{semantic-token-get,semantic--tag-get-property}
+@end defun
+
+@defun semantic--tag-put-property-no-side-effect tag property value
+@anchor{semantic--tag-put-property-no-side-effect}
+Change value in @var{tag} of @var{property} to @var{value} without side effects.
+All cons cells in the property list are replicated so that there
+are no side effects if @var{tag} is in shared lists.
+If @var{property} already exists, its value is set to @var{value}, otherwise the
+new @var{property} @var{value} pair is added.
+Return @var{tag}.
+That function is for internal use only.
+@obsolete{semantic-token-put-no-side-effect,semantic--tag-put-property-no-side-effect}
+@end defun
+
+@defun semantic-tag-make-plist args
+@anchor{semantic-tag-make-plist}
+Create a property list with @var{args}.
+Args is a property list of the form (@var{key1} @var{value1} @dots{} @var{keyn} @var{valuen}).
+Where @var{key} is a symbol, and @var{value} is the value for that symbol.
+The return value will be a new property list, with these @var{key}/@var{value}
+pairs eliminated:
+
+  - @var{key} associated to @code{nil} @var{value}.
+  - @var{key} associated to an empty string @var{value}.
+  - @var{key} associated to a zero @var{value}.
+@obsolete{semantic-tag-make-assoc-list,semantic-tag-make-plist}
+@end defun
+
+@node Tag Overlay Internals
+@subsection Tag Overlay Internals
+
+Many of the overlay related functions were already documented in
+@ref{Tag Overlay,Tag Overlay}.
+
+@ignore
+Functions not yet documented:
+  semantic--tag-overlay-cdr
+  semantic--tag-set-overlay
+@end ignore
+
+@defun semantic-tag-set-bounds tag start end
+@anchor{semantic-tag-set-bounds}
+In @var{tag}, set the @var{start} and @var{end} location of data it describes.
+@end defun
+
+@node Creating Tags
+@subsection Creating Tags
+
+@defun semantic-tag name class &rest attributes
+@anchor{semantic-tag}
+Create a generic semantic tag.
+@var{name} is a string representing the name of this tag.
+@var{class} is the symbol that represents the class of tag this is,
+such as @code{'variable}, or @code{'function}.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token,semantic-tag}
+@end defun
+
+@defun semantic-tag-new-variable name type default-value &rest attributes
+@anchor{semantic-tag-new-variable}
+Create a semantic tag of class @code{'variable}.
+@var{name} is the name of this variable.
+@var{type} is a string or semantic tag representing the type of this variable.
+@var{default-value} is a string representing the default value of this variable.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token-new-variable,semantic-tag-new-variable}
+@end defun
+
+@defun semantic-tag-new-function name type arg-list &rest attributes
+@anchor{semantic-tag-new-function}
+Create a semantic tag of class @code{'function}.
+@var{name} is the name of this function.
+@var{type} is a string or semantic tag representing the type of this function.
+@var{arg-list} is a list of strings or semantic tags representing the
+arguments of this function.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token-new-function,semantic-tag-new-function}
+@end defun
+
+@defun semantic-tag-new-type name type members parents &rest attributes
+@anchor{semantic-tag-new-type}
+Create a semantic tag of class @code{'type}.
+@var{name} is the name of this type.
+@var{type} is a string or semantic tag representing the type of this type.
+@var{members} is a list of strings or semantic tags representing the
+elements that make up this type if it is a composite type.
+@var{parents} is a cons cell.  (@var{explicit-parents} . @var{interface-parents})
+@var{explicit-parents} can be a single string (Just one parent) or a
+list of parents (in a multiple inheritance situation).  It can also
+be @code{nil}.
+@var{interface-parents} is a list of strings representing the names of
+all @var{interfaces}, or abstract classes inherited from.  It can also be
+@code{nil}.
+This slot can be interesting because the form:
+     ( @code{nil} ``string'')
+is a valid parent where there is no explicit parent, and only an
+interface.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token-new-type,semantic-tag-new-type}
+@end defun
+
+@defun semantic-tag-new-include name system-flag &rest attributes
+@anchor{semantic-tag-new-include}
+Create a semantic tag of class @code{'include}.
+@var{name} is the name of this include.
+@var{system-flag} represents that we were able to identify this include as belonging
+to the system, as opposed to belonging to the local project.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token-new-include,semantic-tag-new-include}
+@end defun
+
+@defun semantic-tag-new-package name detail &rest attributes
+@anchor{semantic-tag-new-package}
+Create a semantic tag of class @code{'package}.
+@var{name} is the name of this package.
+@var{detail} is extra information about this package, such as a location where
+it can be found.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@obsolete{semantic-token-new-package,semantic-tag-new-package}
+@end defun
+
+@defun semantic-tag-new-code name detail &rest attributes
+@anchor{semantic-tag-new-code}
+Create a semantic tag of class @code{'code}.
+@var{name} is a name for this code.
+@var{detail} is extra information about the code.
+@var{attributes} is a list of additional attributes belonging to this tag.
+@end defun
+
+@node Copying Tags
+@subsection Copying Tags
+
+There are two sets of tag copying features.  The first set is
+@code{semantic-tag-clone} and @code{semantic-tag-copy} which are used
+to make quick copies that share some detailed data with the original.
+
+The second type is @code{semantic-tag-deep-copy-one-tag}, which
+replicates all the tags, and also allows filtering to mutate the tag.
+In most cases, a clone or copy is sufficient.
+
+@defun semantic-tag-clone tag &optional name
+@anchor{semantic-tag-clone}
+Clone @var{tag}, creating a new @var{tag}.
+If optional argument @var{name} is not @code{nil} it specifies a new name for the
+cloned tag.
+@obsolete{semantic-clone-tag,semantic-tag-clone}
+@end defun
+
+@defun semantic-tag-copy tag &optional name keep-file
+@anchor{semantic-tag-copy}
+Return a copy of @var{tag} unlinked from the originating buffer.
+If optional argument @var{name} is non-@code{nil} it specifies a new name for the
+copied tag.
+If optional argument @var{keep-file} is non-@code{nil}, and @var{tag} was linked to a
+buffer, the originating buffer file name is kept in the `:filename'
+property of the copied tag.
+This runs the tag hook `unlink-copy-hook`.
+@end defun
+
+@defun semantic-tag-deep-copy-one-tag tag &optional filter
+@anchor{semantic-tag-deep-copy-one-tag}
+Make a deep copy of @var{tag}, applying @var{filter} to each child-tag.
+Properties and overlay info are not copied.
+@var{filter} takes @var{tag} as an argument, and should returns a semantic-tag. 
+It is safe for @var{filter} to modify the input tag and return it.
+@end defun
+
+@node Misc Tag Internals
+@subsection Misc Tag Internals
+
+@defun semantic--tag-run-hooks tag hook &rest args
+Run for @var{tag} all expressions saved on the property @var{hook}.
+Each hook expression must take at least one argument, the @var{tag}.
+For any given situation, additional @var{args} may be passed.
+@end defun
+
+@defun semantic--tag-unlink-from-buffer tag
+Convert @var{tag} from using an overlay to using an overlay proxy.
+This function is for internal use only.  This runs the tag hook
+@code{unlink-hook}.  @ref{Tag Hooks}
+@end defun
+
+@defun semantic--tag-link-to-buffer tag
+Convert @var{tag} from using an overlay proxy to using an overlay.
+This function is for internal use only.  This runs the tag hook
+@code{link-hook}.  @ref{Tag Hooks}
+@end defun
+
+@defun semantic--tag-unlink-list-from-buffer tags
+Convert @var{tags} from using an overlay to using an overlay proxy.
+This function is for internal use only.
+@end defun
+
+@defun semantic--tag-link-list-to-buffer tags
+Convert @var{tags} from using an overlay proxy to using an overlay.
+This function is for internal use only.
+@end defun
+
+@defun semantic--tag-unlink-cache-from-buffer
+Convert all tags in the current cache to use overlay proxys.
+This function is for internal use only.
+@end defun
+
+@defun semantic--tag-link-cache-to-buffer
+Convert all tags in the current cache to use overlays.
+This function is for internal use only.
+@end defun
+
+@defun semantic--tag-expanded-p tag
+Return non-@code{nil} if @var{tag} is expanded.
+This function is for internal use only.
+See also the function @code{semantic--expand-tag}.
+@end defun
+
+@defun semantic--tag-expand tag
+Convert @var{tag} from a raw state to a cooked state, and expand it.
+Returns a list of cooked tags.
+
+The parser returns raw tags with positional data @var{start} @var{end} at the
+end of the tag data structure (a list for now).  We convert it from
+that to a cooked state that uses an overlay proxy, that is, a vector
+[@var{start} @var{end}].
+
+The raw tag is changed with side effects and maybe expanded in
+several derived tags when the variable @code{semantic-tag-expand-function}
+is set.
+
+This function is for internal use only.
+@end defun
+
+@ignore
+@c @node Semantic Functions Called within ECB
+@c @section Semantic Functions Called within ECB
+@c @cindex Semantic Functions Called within ECB
+
+I was curious as to what semantic functions were called by a real
+semantic application such as ECB.  So I searched ECB and listed all
+functions that ECB calls that start with ``semantic-''.  Then as I
+document one by one, I deleted them.  The functions below are ones
+that I have not yet gone through. -ryk8/13/03.
+
+semantic-active-p
+semantic-adopt-external-members
+semantic-after-partial-cache-change-hook
+semantic-after-toplevel-cache-change-hook
+semantic-bucketize
+semantic-c-template-string
+semantic-clear-toplevel-cache
+semantic-colorize-text
+semantic-current-nonterminal
+semantic-find-dependency
+semantic-name-nonterminal
+semantic-nonterminal-children
+semantic-nonterminal-protection
+semantic-overlay-live-p
+semantic-overlay-p
+semantic-prototype-nonterminal
+semantic-require-version
+semantic-token-buffer
+semantic-token-end
+semantic-token-function-parent
+semantic-token-get
+semantic-token-name
+semantic-token-overlay
+semantic-token-put
+semantic-token-start
+semantic-token-token
+semantic-token-type-parent
+@end ignore
diff --git a/site/cedet-1.0pre7/semantic/doc/user-guide.texi b/site/cedet-1.0pre7/semantic/doc/user-guide.texi
new file mode 100644
index 0000000..c8b144e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/user-guide.texi
@@ -0,0 +1,1810 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename semantic-user.info
+@set TITLE  Semantic User's Guide
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This is the Semantic User's Manual
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+Copyright @copyright{} 2001, 2002, 2003, 2004 David Ponce
+Copyright @copyright{} 2002, 2003 Richard Y. Kim
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic User's guide: (semantic-user).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This is the Semantic User's Guide
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+This chapter describes how to use @b{applications} enabled by
+semantic.  Many of these come with @semantic{}, but others are
+distributed apart from @semantic{}.
+
+For basics of configuring @semantic{} and the parts that go into it
+read the @inforef{Top, Semantic manual, semantic.info}.
+
+%c TODO - Re-organize this main topic as a set of user-cases
+
+@menu
+* speedbar::                    How to use Semantic speedbar support
+* ECB::                         Emacs Code Browser
+* imenu::                       Special support for Imenu.
+* senator::                     The Semantic Navigator
+* Analyzer::                    Context sensitive Help & smart completion
+* SymRef::                      Symbol Reference tools. (usages of tags)
+* Document::                    Document generation functions
+* Charts::                      Charting code statistics
+* Idle Scheduler::              The idle Scheduler and related modes
+* Minor Modes::                 Useful minor modes
+* semanticdb::                  Cache your parsed buffers between sessions.
+* Debugging::                   How to debug speed or accuracy issues.
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node speedbar
+@chapter speedbar
+@cindex speedbar
+
+Speedbar supports the display of tags through the Semantic parser.  To
+use this utility, add a line like this to your @file{.emacs} file:
+
+@example
+(add-hook 'speedbar-load-hook (lambda () (require 'semantic-sb)))
+@end example
+
+or you can simply add:
+
+@example
+(require 'semantic-sb)
+@end example
+
+Once installed, speedbar will use semantic to find tags, and will
+display them appropriately.  Tags from semantic will have additional
+details which can be seen, such as return type, or arguments to
+functions.
+
+If you use @file{semantic-load.el}, you do not need to add the above
+lines in your @file{.emacs} file.
+
+Two additional speedbar modes are described in @ref{Speedbar Analysis}
+
+@node ECB
+@chapter ECB
+@cindex ECB
+
+From the ECB Website: @url{http://ecb.sourceforge.net}:
+
+@example
+ECB is a source code browser for Emacs. It is a global minor-mode
+which displays a couple of windows that can be used to browse
+directories, files and file-contents like methods and variables.
+@end example
+
+
+@node imenu
+@chapter imenu
+@cindex imenu
+
+There is special support for creating Imenu entries using semantic.
+This is a highly customizable tool which can create specialized menu
+systems for navigating your source file.
+
+By default, each language that wants special imenu support will set
+itself up for it.  To setup imenu for your buffers, use this command
+in your @file{.emacs} file:
+
+@example
+(add-hook 'semantic-init-hooks (lambda ()
+                               	   (imenu-add-to-menubar "TAGS")))
+@end example
+
+Also supported is @dfn{which-func-mode}.  This usually uses imenu
+tags to show the current function.  The semantic support for this
+function uses overlays, which is much faster.
+
+If you use @file{semantic-load.el}, you do not need to add the above
+lines in your @file{.emacs} file.
+
+You can customize imenu with the following options:
+
+@deffn Option semantic-imenu-summary-function
+Function to use when creating items in Imenu.
+Some useful functions are found in @code{semantic-format-tag-functions}.
+@end deffn
+
+@deffn Option semantic-imenu-bucketize-file
+Non-@code{nil} if tags in a file are to be grouped into buckets.
+@end deffn
+
+@deffn Option semantic-imenu-buckets-to-submenu
+Non-@code{nil} if buckets of tags are to be turned into submenus.
+This option is ignored if @code{semantic-imenu-bucketize-file} is nil.
+@end deffn
+
+@deffn Option semantic-imenu-expand-type-members
+Non-@code{nil} if types should have submenus with members in them.
+@end deffn
+
+@deffn Option semantic-imenu-bucketize-type-members
+Non-@code{nil} if members of a type should be grouped into buckets.
+@code{nil} means to keep them in the same order.
+Overridden to @code{nil} if @code{semantic-imenu-bucketize-file} is nil.
+@end deffn
+
+@deffn Option semantic-imenu-sort-bucket-function
+Function to use when sorting tags in the buckets of functions.
+See @dfn{semantic-bucketize} and the @var{FILTER} argument for more details on this function.
+@end deffn
+
+@deffn Option semantic-imenu-index-directory
+Non @code{nil} to index the entire directory for tags.
+Doesn't actually parse the entire directory, but displays tags for all files
+currently listed in the current Semantic database.
+This variable has no meaning if semanticdb is not active.
+@end deffn
+
+@deffn Option semantic-imenu-auto-rebuild-directory-indexes
+If non-@code{nil} automatically rebuild directory index imenus.
+That is when a directory index imenu is updated, automatically rebuild
+other buffer local ones based on the same semanticdb.
+@end deffn
+
+When adding support to a language, this variable may need to be set:
+
+@defvar semantic-imenu-expandable-tag-classes
+@anchor{semantic-imenu-expandable-tag-classes}
+List of expandable tag classes.
+Tags of those classes will be given submenu with children.
+By default, a @code{type} has interesting children.  In Texinfo, however, a
+@code{section} has interesting children.
+@end defvar
+
+@node senator
+@chapter senator
+@cindex senator
+
+Senator stands for SEmantic NAvigaTOR and was written by David Ponce.
+
+This library defines commands and a minor mode to navigate and manage
+semantic language tags in the current buffer.
+
+@section Commands
+
+The following user level commands are provided by Senator.
+
+@subsection Navigation
+
+@defun senator-next-tag
+Navigate to the next Semantic tag.
+Return the tag or @code{nil} if at end of buffer.
+@end defun
+
+@defun senator-previous-tag
+Navigate to the previous Semantic tag.
+Return the tag or @code{nil} if at beginning of buffer.
+@end defun
+
+@defun senator-jump
+Jump to the semantic symbol @var{SYM}.
+
+If optional @var{IN-CONTEXT} is non-@code{nil} jump in the local type's context
+(see function @dfn{senator-current-type-context}).  If optional
+@var{NO-DEFAULT} is non-@code{nil} do not provide a default value.
+
+When called interactively you can combine the @var{IN-CONTEXT} and
+@var{NO-DEFAULT} switches like this:
+
+- @kbd{C-u}       @var{IN-CONTEXT}.
+- @kbd{C-u} -     @var{NO-DEFAULT}.
+- @kbd{C-u} @kbd{C-u}   @var{IN-CONTEXT} + @var{NO-DEFAULT}.
+@end defun
+
+@defun senator-go-to-up-reference tag
+@anchor{senator-go-to-up-reference}
+Move up one reference from the current @var{TAG}.
+A ``reference'' could be any interesting feature of @var{TAG}.
+In @var{C}++, a function may have a 'parent' which is non-local.
+If that parent which is only a reference in the function tag
+is found, we can jump to it.
+Some tags such as includes have other reference features.
+@end defun
+
+@subsection Searching
+
+Searching using senator mode restricts the search only to the
+definition text, such as the name of the functions or variables in a
+given buffer.
+
+@deffn Command senator-isearch-toggle-semantic-mode
+Toggle semantic searching on or off in isearch mode.
+@kbd{C-c , i} toggle semantic searching.
+@end deffn
+
+@deffn Command senator-search-forward what &optional bound noerror count
+@deffnx Command senator-search-backward what &optional bound noerror count
+Search semantic tags forward or backward from point for string @var{WHAT}.
+Set point to the end of the occurrence found, and return point.  See
+@dfn{search-forward} for details and the meaning of @var{BOUND} @var{NOERROR} and
+@var{COUNT}.  @var{COUNT} is just ignored in the current implementation.
+@end deffn
+
+@deffn Command re-search-forward regex
+@deffnx Command re-search-backward regex
+Search forward and backward for a token matching the regular expression
+@var{regex}.
+@end deffn
+
+@deffn Command word-search-forward word
+@deffnx Command word-search-backward word
+Search forward and backward for a token whose name matches @var{word}.
+@end deffn
+
+@subsection Completion
+
+Completion in senator scans all known definitions in the local file,
+and uses that information to provide the completion.
+
+@deffn Command senator-complete-symbol &optional cycle-once
+Complete the current symbol under point.
+If optional argument @var{CYCLE-ONCE} is non-@code{nil}, only cycle through the list
+of completions once, doing nothing where there are no more matches.
+@end deffn
+
+@deffn Command senator-completion-menu-popup
+Popup a completion menu for the symbol at point.
+The popup menu displays all of the possible completions for the symbol
+it was invoked on.  To automatically split large menus this function
+use @dfn{imenu--mouse-menu} to handle the popup menu.
+@end deffn
+
+@subsection Copy/Paste
+
+Token Copy/Paste is a high level form of the typical copy yank used by
+Emacs.  Copying a tag saves the meta-information related to the
+function or item the cursor is currently in.  When that information is
+yanked into a new buffer, the form of the text created is based on the
+current status of the programming buffer.
+
+For example, pasting a function into a different file results in a
+function call template to be inserted.  In a Texinfo file, a @@deffn
+is created with documentation for that function or command.
+
+@deffn Command senator-copy-tag
+Take the current tag, and place it in the tag ring.
+@end deffn
+
+@deffn Command senator-kill-tag
+Take the current tag, place it in the tag ring, and kill it.
+Killing the tag removes the text for that tag, and places it into
+the kill ring.  Retrieve that text with @kbd{C-y}.
+@end deffn
+
+@deffn Command senator-yank-tag
+Yank a tag from the tag ring.
+The form the tag takes is different depending on where it is being
+yanked to.
+@end deffn
+
+@deffn Command senator-copy-tag-to-register register &optional kill-flag
+Copy the current tag into @var{REGISTER}.
+Optional argument @var{KILL-FLAG} will delete the text of the tag to the
+kill ring.
+@end deffn
+
+For programmers, to provide specialized pasting, created an override
+function for @code{insert-foreign-tag} (see @inforef{Writing Parsers, , semantic-langdev}.)
+
+@subsection Minor Mode
+
+@deffn Command senator-minor-mode
+Toggle the SEmantic NAvigaTOR key bindings in the current buffer.
+
+The following default key bindings are provided when semantic minor
+mode is enabled:
+
+
+@table @key
+@item C-c , n
+senator-next-tag
+@item C-c , p
+senator-previous-tag
+@item C-c , i
+senator-isearch-toggle-semantic-mode
+@item C-c , j
+(Lower case j)
+semantic-complete-jump-local
+@item C-c , J
+(Upper case J)
+semantic-complete-jump
+@item C-c , u
+senator-go-to-up-reference
+@item C-c , g
+semantic-symref
+@item C-c , G
+semantic-symref-symbol
+@item C-c , TAB
+senator-complete-symbol
+@item C-c , SPC
+senator-completion-menu-popup
+@item C-c , C-y
+senator-yank-tag
+@item C-c , C-w
+senator-kill-tag
+@item C-c , M-w
+senator-copy-tag
+@item C-c , +
+senator-unfold-tag
+@item C-c , -
+senator-fold-tag
+@end table
+@end deffn
+
+@section Customization
+
+To enable the Senator keymap in all modes that support semantic parsing,
+use this:
+
+@example
+(add-hook 'semantic-init-hooks 'senator-minor-mode)
+@end example
+
+If you use @file{semantic-load.el}, you do not need to add the above
+lines in your @file{.emacs} file.
+
+To customize navigation around different types of tokens, use the
+following variables:
+
+@deffn Option senator-step-at-tag-classes
+List of tag classes where to step.
+A tag class is a symbol like @code{'variable}, @code{'function}, @code{'type}, or other.
+If @code{nil} navigation steps at any tag found.  This is a buffer local
+variable.  It can be set in a mode hook to get a specific langage
+navigation.
+@end deffn
+
+@deffn Option senator-step-at-start-end-tag-classes
+List of tag classes where to step at start and end.
+A tag class is a symbol like @code{'variable}, @code{'function}, @code{'type}, or other.
+If @code{nil}, navigation only step at beginning of tags.  If @code{t}, step at
+start and end of any tag where it is allowed to step.  Also, stepping
+at start and end of a tag prevent stepping inside its components.
+This is a buffer local variable.  It can be set in a mode hook to get
+a specific langage navigation.
+@end deffn
+
+To have a mode specific customization, do something like this in a hook:
+
+@example
+(add-hook 'mode-hook
+          (lambda ()
+            (setq senator-step-at-tag-classes '(function variable))
+            (setq senator-step-at-start-end-tag-classes '(function))
+            ))
+@end example
+
+This will cause navigation and search commands to stop only between
+functions and variables, and to step at start and end of functions
+only.
+
+@node Analyzer
+@chapter Analyzer
+@cindex Analyzer
+
+The semantic analyzer is a library tool that performs context
+analysis and can derive useful information.
+
+@deffn Command semantic-analyze-current-context position
+Analyze the current context at @var{POSITION}.
+If called interactively, display interesting information about @var{POSITION}
+in a separate buffer.
+Returns an object based on symbol @dfn{semantic-analyze-context}.
+@end deffn
+
+While this can be used as a command, it is mostly useful while
+debugging the analyzer, or tools using the return value.  Use the
+Emacs command @dfn{describe-class} to learn more about using
+@code{semantic-analyze-context}.
+
+Another command that uses the analyzer context can derive a completion
+list.
+
+@deffn Command semantic-analyze-possible-completions context
+Return a list of semantic tags which are possible completions.
+@var{CONTEXT} is either a position (such as point), or a precalculated
+context.  Passing in a context is useful if the caller also needs
+to access parts of the analysis.
+Completions run through the following filters:
+@table @asis
+@item Elements currently in scope
+@item Constants currently in scope
+@item Elements match the @code{:prefix} in the @var{CONTEXT}.
+@item Type of the completion matches the type of the context. 
+Context type matching can identify the following:
+@item No specific type
+@item Assignment into a variable of some type.
+@item Argument to a function with type constraints.
+When called interactively, displays the list of possible completions
+in a buffer.
+@end table
+@end deffn
+
+@menu
+* Smart Completion::       Functions you can bind to keys for completion
+* Smart Summary::          Routines for displaying help on a symbol
+* Smart Jump::             Routines for jumping to tag origins
+* Speedbar Analysis::      Speedbar provided completion
+* Smart Completion Debugging:: How to debug analyzer issues.
+@end menu
+
+@node Smart Completion
+@section Smart Completion
+
+The file @file{semantic-ia.el} contains two commands for performing
+smart completion using the analysis library.  Analysis to calculate
+these completions are done through the analyzer and completion
+mechanism.  These functions just provide commands that can be bound
+to key bindings.
+
+@deffn Command semantic-ia-complete-symbol point
+@anchor{semantic-ia-complete-symbol}
+Complete the current symbol at @var{point}.
+Completion options are calculated with @dfn{semantic-analyze-possible-completions}.
+@end deffn
+
+@deffn Command semantic-ia-complete-symbol-menu point
+@anchor{semantic-ia-complete-symbol-menu}
+Complete the current symbol via a menu based at @var{point}.
+Completion options are calculated with @dfn{semantic-analyze-possible-completions}.
+@end deffn
+
+@deffn Command semantic-ia-complete-tip point
+@anchor{semantic-ia-complete-tip}
+Pop up a tooltip for completion at @var{point}.
+@end deffn
+
+You can get smart completions or summary information to automatically
+popup without explicitly pressing a key or running a function.
+
+This is accomplished through the Idle Scheduler and related features.
+See @ref{Idle Scheduler} for more on the Scheduler.
+
+Completions are provided with @code{semantic-idle-completions-mode}.
+See @ref{Idle Completions Mode}.
+
+@node Smart Summary
+@section Smart Summary
+
+Aside from completion, the analyzer can also be used just to show a
+summary of what is under point.  These routines will summarize the
+symbol in question in different ways.
+
+@deffn Command semantic-ia-show-summary point
+@anchor{semantic-ia-show-summary}
+Display a summary for the symbol under @var{point}.
+@end deffn
+
+@deffn Command semantic-ia-show-doc point
+@anchor{semantic-ia-show-doc}
+Display the code-level documentation for the symbol at @var{point}.
+@end deffn
+
+@deffn Command semantic-ia-describe-class typename
+@anchor{semantic-ia-describe-class}
+Display as all known parts for the datatype @var{typename}.
+If the type in question is a class, all methods and other accessible
+parts of the parent classes are displayed.
+@end deffn
+
+You can also get summaries to popup in idle time without having to
+press a key to get the information.
+
+This is accomplished through the Idle Scheduler and related features.
+See @ref{Idle Scheduler} for more on the Scheduler.
+
+Summaries are provided with @code{semantic-idle-summary-mode}.  See
+@ref{Idle Summary Mode}.
+
+@node Smart Jump
+@section Smart Jump
+
+If you are on a symbol in some code, you might want to jump directly
+to it.  You can use @code{find-tag}, but in complex C++ systems, you
+can spend a lot of time pressing @kbd{C-h M-.} trying to find the
+specific instance of some function.
+
+The analyzer can pinpoint very closely to where you actually indent
+based on code context.
+
+@deffn Command semantic-ia-fast-jump point
+@anchor{semantic-ia-fast-jump}
+Jump to the tag referred to by the code at @var{point}.
+Uses @dfn{semantic-analyze-current-context} output to identify an accurate
+origin of the code at point.
+@end deffn
+
+@defun semantic-ia-fast-mouse-jump evt
+@anchor{semantic-ia-fast-mouse-jump}
+Jump to the tag referred to by the point clicked on.
+This command is meant to be bound to a mouse event.
+@end defun
+
+You can use the mouse jump version by adding a configuration like this
+into your @file{.emacs} file.
+
+@example
+(global-set-key '[(S-mouse-1)] 'mouse-jump)
+@end example
+
+@node Speedbar Analysis
+@section Speedbar Analysis
+
+The Analyzer output can be used through a speedbar interface.
+This interface lists details about the analysis, such as the current
+function, local arguments and variables, details on the prefix (the
+symbol the cursor is on), and a list of all possible completions.
+Completions are specified in
+@dfn{semantic-analyze-possible-completions}
+@ref{Analyzer}.
+
+Each entry can be jumped to by clicking on the name.  For strongly
+typed languages, this means you will jump to the definition of the
+variable, slot, or type definition.
+
+In addition each entry has an <i> button.  Clicking on this will
+display a summary of everything that is known about the variable or
+type displayed on that line.
+
+If you click on the name of a variable in the ``Completions'' menu,
+then the text that was recently analyzed will be replaced with the
+name of the token that was clicked on in speedbar.
+
+@deffn Command semantic-speedbar-analysis
+Start Speedbar in semantic analysis mode.
+The analyzer displays information about the current context, plus a smart
+list of possible completions.
+@end deffn
+
+You can also enter speedbar analyzer mode by selecting ``Analyze''
+from the ``Display'' menu item on speedbar's menu.
+
+@node Smart Completion Debugging
+@section Smart Completion Debugging
+
+If you think you've configured your system correctly, but @semantic{}
+still can't find a definition you are looking for, you may have run
+into either a bug in @semantic{}, an incomplete configuration, or
+somehow gotten @semantic{}'s set of cached tables into a bad state.
+
+This section was written with C/C++ in mind, but should be relevant
+for any typed language.
+
+@section Step 1: Check the context
+
+The first thing to do is check the current context.  You can do this
+with @kbd{M-x semantic-analyze-current-context}.  If you look at the
+Prefix section, you should see a list of tags based on the text from
+under point.  If it shows only a simple string, the Semantic was
+unable to identify what the data type was.
+
+The first item in the list of the prefix is the first lookup failure
+in the chain, and that is the item to focus debugging effort on.
+For more on the analyzer, see @ref{Analyzer}.
+
+
+@example
+Context Type: #<semantic-analyze-context context>
+Bounds: (182 . 185)
+Prefix: Foo* bar
+        int bbb (const char* y)
+Prefix Types: class Foo @{@}
+--------
+-> Local Vars: int argc
+               char** argv
+@end example
+
+In the above example you can see that the prefix has two fully found
+tags.  In the below example, the symbol ``bbb'' is incomplete, and
+could not be found.
+
+@example
+Context Type: #<semantic-analyze-context context>
+Bounds: (182 . 184)
+Prefix: Foo* bar
+        "bb"
+Prefix Classes: 'function
+                'variable
+Prefix Types: class Foo @{@}
+--------
+-> Local Vars: int argc
+               char** argv
+@end example
+
+
+@section Step 2 : Check your include path
+
+Once you know what symbol can't be found, the next thing to check is
+your include path.  Is the header or include file that has the
+definitions you need actually in the list of headers @semantic{} is
+searching through?  To get a basic list, you can use
+@kbd{M-x semanticdb-find-test-translate-path}.
+@refill
+
+This will give you a list of database tables (by name) that semantic
+can find.  This list is in ADEBUG mode.  Use @kbd{SPC} to expand items
+to see if the tag you are looking for is in there.
+
+For C++, check to make sure that your project level include files are
+in ``quotes'', and not in <angle brackets>.  Items in angle brackets
+are system includes.
+
+See @ref{Semanticdb search debugging commands} for more commands.
+
+If items should be loaded but aren't, you may need to update the
+search throttle.  See @ref{Search Throttle}.
+
+If you see some tables that have 0 tags in them, then you you may have
+an incorrectly set throttle.
+
+@example
+*#<semanticdb-table main.cpp (4 tags DIRTY)>
+*#<semanticdb-table foo.hh (0 tags DIRTY)>
+@end example
+
+In the above example, semantic found @file{foo.hh}, but there are 0
+tags.  This may be because the throttle was set to not read in and
+parse files that Emacs has not yet loaded in.  To fix this case, visit
+the file, and let @semantic{} parse and save the tags table.
+
+@section Step 3: Check the local scope
+
+If your data type is somehow abbreviated based on scope, such as from
+a @code{using} statement, you will need to make sure that the symbol
+you want is in the local scope.  Examine the scope with
+@kbd{M-x semantic-calculate-scope}.  The scope structure is displayed
+in ADEBUG mode, so use @kbd{SPC} to expand different elements and
+looking for your symbol.
+
+If your symbol should be in the scope, but you cannot find it, then
+you may have found a language support bug in the local-variable
+parser, or using statement parser.
+
+Calling @kbd{M-x bovinte} should force a reset on the scope in case
+there is merely some bad state.
+
+@example
+ ] Name: Cache
+ ] Class: #'semantic-scope-cache
+ ] :table #<semanticdb-table testsubclass.cpp (13 tags DIRTY)>
+ ] tag createMoose : class moose
+ ] scopetypes 'nil
+ ] parents #<TAG LIST: 1 entries>
+ ] scope #<TAG LIST: 22 entries>
+ ] fullscope #<TAG LIST: 23 entries>
+ ] localvar #<TAG LIST: 6 entries>
+@end example
+
+In the above sample output, the @code{tag} slot specifies where within
+you source this scope is relevant.  @code{Parents} should contain any
+in scope parents, such as the class a method belongs to.
+@code{Localvar} should contain your local variables.  @code{Scope}
+should contain datatypes in scope due to a @code{using} statement or
+the like.
+
+@section Step 4: Check the typecache
+
+For complex typed languages like C++, @semantic{} creates a typecache,
+or an optimized search table with all the various data types in it.
+Elements in the typecache do not obey local scope.  It only contains
+fully qualified names.  You can examine the typecache with
+@kbd{M-x semanticdb-typecache-dump}.
+
+If your data types are not in the typecache, there may be some parsing
+error or other bug.  Calling @kbd{M-x bovinte} should force a reset on
+the typecache in case there is merely some bad state.
+
+@example
+]#<semanticdb-typecache /home/zappo/cedet/semantic/tests/testsubclass.cpp>
+   ] Name: /home/zappo/cedet/semantic/tests/testsubclass.cpp
+   ] Class: #'semanticdb-typecache
+   ] filestream 'nil
+   ] includestream #<TAG LIST: 84 entries>
+   ] stream 'nil
+   ] dependants 'nil
+@end example
+
+In the above example, the output of @kbd{M-x semanticdb-typecache-dump}
+was expanded one level.  The @code{filestream} slot should contain
+datatypes in the current file.  The @code{includestream} should
+contain all the datatypes in all included header files.
+
+The @code{dependants} slot will specify other files that depend on
+this one.
+
+@section Step 5: Check the parser
+
+Go to the location where your unfound tag should be.  You can call
+@kbd{M-x bovinate}, and see a dump of the raw tag structure.  To see a
+navigable tree, use @kbd{M-x semantic-adebug-bovinate} instead.  You
+can then look to make sure your tag has been properly parsed.
+
+If it has not, then you may have found a parser bug.  To get a feel
+how @semantic{} treats your file, you can enable 
+@kbd{M-x global-semantic-show-unmatched-syntax-mode}.  It will
+underline syntax it cannot parse in red.
+
+If your type is not parsable, it could be for several reasons.
+
+@enumerate
+@item Parser Incorrect
+Perhaps the parser needs to be fixed.
+@item C/C++ MACROs
+If there is a MACRO keyword used in the definition of the type, then
+you may need to update the
+@code{semantic-lex-c-preprocessor-symbol-map}
+to account for it.
+@end enumerate
+
+@node SymRef
+@chapter SymRef - Symbol References
+@cindex symref
+
+@semantic{} can interfaces with external symbol reference tools, like
+GNU Global and IDUtils.  The symref tool interface can use one of
+these external tools to collect locations where different tags or
+symbols may be used.
+
+There are two main command into the symref system.  They are:
+
+@deffn Command semantic-symref
+@anchor{semantic-symref}
+Find references to the current tag.
+This command uses the currently configured references tool within the
+current project to find references to the current tag. The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in@dfn{semantic-symref-results-mode}
+@end deffn
+
+@deffn Command semantic-symref-symbol sym
+@anchor{semantic-symref-symbol}
+Find references to the symbol @var{sym}.
+This command uses the currently configured references tool within the
+current project to find references to the input @var{sym}. The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in@dfn{semantic-symref-results-mode}
+@end deffn
+
+The results are listed by file, then by tag within those files.  You
+can expand tag hits to see the line of code a given match is on.  You
+can jump to the matched file, tag, or line from this mode.
+
+The type of external tool used for finding references determines the
+kind of results found.  Each available tool, such as GNU Global, will
+identify when it can be used.  If no such tool is available, then a
+find/grep combination will be used instead.
+
+For best results, install, and use GNU Global for your project.
+@semantic{} symref does not manage your GNU Global tables for you.
+You must manage those yourself.  The symref tool is not meant to
+replace the standard grep-like interface available with GNU Global.
+It is meant to be a starting point for tools that can take advantage
+of reference information.
+
+To add support for a new tool, use semantic-symref-global.el as a
+starting point.  Then update @code{semantic-symref-tool-alist} to
+allow the new tool to be detected.
+
+@defun semantic-symref-tool-alist
+@anchor{semantic-symref-tool-alist}
+Alist of tools usable by @dfn{semantic-symref}.
+Each entry is of the form:
+   ( @var{PREDICATE} . @var{KEY} )
+Where @var{PREDICATE} is a function that takes a directory name for the
+root of a project, and returns non-@code{nil} if the tool represented by @var{KEY}
+is supported.
+
+If no tools are supported, then @code{'grep} is assumed.
+@end defun
+
+@@TODO - This mode is supposed to be the starting point of refactoring
+tools.  Doc those features here once they are written.
+
+@node Document
+@chapter Document
+@cindex Document
+
+The document program uses semantic tag tables to aid in the
+creation of texinfo documentation.
+For example, the following is a code fragment from @file{document.el}
+that comes with semantic:
+
+@lisp
+(defun document (&optional resetfile)
+  "Document the function or variable the cursor is in.
+Optional argument RESETFILE is provided w/ universal argument.
+When non-nil, query for a new documentation file."
+  ...
+  )
+@end lisp
+
+While visiting @file{document.el}, put the cursor somewhere within the
+function shown above. Then type @kbd{M-x document}.
+After asking for the texinfo file name, which in this case is
+@file{semantic.texi}, this will update the texinfo
+documentation of the @code{document} function in that file.
+The result is that the following texinfo text will be either created
+or updated in @file{user-guide.texi} file:
+
+@example
+@@deffn Command document &optional resetfile
+Document the function or variable the cursor is in.
+Optional argument @@var@{RESETFILE@} is provided w/ universal argument.
+When non-@@code@{nil@}, query for a new documentation file.
+@@end deffn
+@end example
+
+Note that the function name, arguments and documentation string
+is put in the right place.
+Within the doc-string, the function arguments are marked with
+the @@var command and the @code{nil} code fragment is marked with
+@@code command.
+This example provides just a glimpse of what is possible with the
+syntactic information provided by semantic.
+@refill
+
+The main entry point for the documentation generator are the following
+commands:
+
+@deffn Command document &optional resetfile
+Document the function or variable the cursor is in.
+Optional argument @var{RESETFILE} is provided w/ universal argument.
+When non-@code{nil}, query for a new documentation file.
+@end deffn
+
+@deffn Command document-inline
+Document the current function with an inline comment.
+@end deffn
+
+@deffn Command document-insert-defun-comment tag buffer
+Insert mode-comment documentation about @var{TAG} from @var{BUFFER}.
+@end deffn
+
+@deffn Command document-insert-new-file-header header
+Insert a new header file into this buffer.  Add reference to @var{HEADER}.
+Used by @code{prototype} if this file doesn't have an introductory comment.
+@end deffn
+
+In addition to these base documentation commands, the texinfo semantic
+parser includes a two convenience functions when working directly with
+texinfo files.
+
+@deffn Command semantic-texi-update-doc &optional tag
+Update the documentation for @var{TAG}.
+If the current buffer is a texinfo file, then find the source doc, and
+update it.  If the current buffer is a source file, then get the
+documentation for this item, find the existing doc in the associated
+manual, and update that.
+@end deffn
+
+@deffn Command semantic-texi-goto-source &optional tag
+Jump to the source for the definition in the texinfo file @var{TAG}.
+If @var{TAG} is @code{nil}, it is derived from the deffn under @var{POINT}.
+@end deffn
+
+@node Charts
+@chapter Charts
+@cindex Charts
+
+Some commands to draw charts of statistics generated from parsing:
+
+@deffn Command semantic-chart-tags-by-class &optional tagtable
+Create a bar chart representing the number of tags for a given tag class.
+Each bar represents how many toplevel tags in @var{TAGTABLE}
+exist with a given class.  See @code{semantic-symbol->name-assoc-list}
+for tokens which will be charted.
+@var{TAGTABLE} is passedto @dfn{semantic-something-to-tag-table}.
+@end deffn
+
+@deffn Command semantic-chart-database-size &optional tagtable
+@anchor{semantic-chart-database-size}
+Create a bar chart representing the size of each file in semanticdb.
+Each bar represents how many toplevel tags in @var{tagtable}
+exist in each database entry.
+@var{tagtable} is passed to @dfn{semantic-something-to-tag-table}.
+@end deffn
+
+@deffn Command semantic-chart-tag-complexity &optional class tagtable
+@anchor{semantic-chart-tag-complexity}
+Create a bar chart representing the complexity of some tags.
+Complexity is calculated for tags of @var{class}.  Each bar represents
+the complexity of some tag in @var{tagtable}.  Only the most complex
+items are charted.  @var{tagtable} is passedto
+@dfn{semantic-something-to-tag-table}.
+@end deffn
+
+@node Idle Scheduler
+@chapter Idle Scheduler
+@cindex Idle Scheduler
+
+The Idle Scheduler in Semantic 2.0 replaces what was once Auto-Parse
+mode.  The Idle Scheduler now performs multiple duties.
+
+The primary job is to schedule buffer parsing in idle time.  The
+first buffer whose cache is checked is the current buffer.  After
+this, all other buffers are checked.
+
+Once that has been accomplished, scheduled idle processes that use the
+semantic tag tables are run.
+
+@deffn Command global-semantic-idle-scheduler-mode &optional arg
+@anchor{global-semantic-idle-scheduler-mode}
+Toggle global use of option @dfn{semantic-idle-scheduler-mode}.
+The idle scheduler with automatically reparse buffers in idle time,
+and then schedule other jobs setup with @dfn{semantic-idle-scheduler-add}.
+If @var{ARG} is positive, enable, if it is negative, disable.
+If @var{ARG} is @code{nil}, then toggle.
+@obsolete{global-semantic-auto-parse-mode,global-semantic-idle-scheduler-mode}
+@end deffn
+
+@obsolete{semantic-auto-parse-mode, semantic-idle-scheduler-mode}
+
+@deffn Option semantic-idle-scheduler-idle-time
+@anchor{semantic-idle-scheduler-idle-time}
+Time in seconds of idle before scheduling events.
+This time should be short enough to ensure that idle-scheduler will be
+run as soon as Emacs is idle.
+@end deffn
+
+@deffn Option semantic-idle-scheduler-mode-hook
+@anchor{semantic-idle-scheduler-mode-hook}
+Hook run at the end of function @dfn{semantic-idle-scheduler-mode}.
+@end deffn
+
+@deffn Option semantic-idle-scheduler-verbose-flag
+@anchor{semantic-idle-scheduler-verbose-flag}
+Non-@code{nil} means that the idle scheduler should provide debug messages.
+Use this setting to debug idle activities.
+@end deffn
+
+You can add new functionality to the idle scheduler by reading the
+Application Developers Guide
+@inforef{Idle Scheduling, , semantic-appdev.info}.
+
+@menu
+* Reparsing Options::           Reparsing the current buffer in idle time
+* Idle Working Options::        Options for extra work done at idle time
+* Debugging Idle Time Issues::  How to produce good bug reports.
+* Idle Summary Mode::           Display prototype of symbol under cursor
+* Idle Completions Mode::       Smart completion pop-up help.
+@end menu
+
+@node Reparsing Options
+@section Reparsing Options
+
+The Idle Scheduler will automatically reparse all buffers that need
+it.  User input at any time will cancel the operations and return to
+normal editing.
+
+@subsection Reparse Configuration
+
+@deffn Option semantic-idle-scheduler-max-buffer-size
+@anchor{semantic-idle-scheduler-max-buffer-size}
+Maximum size in bytes of buffers automatically reparsed.
+If this value is less than or equal to @var{0}, buffers are automatically
+reparsed regardless of their size.
+@end deffn
+
+@subsection Reparse Messages
+
+@deffn Option semantic-idle-scheduler-no-working-message
+@anchor{semantic-idle-scheduler-no-working-message}
+If non-@code{nil}, disable display of working messages during parse.
+@end deffn
+
+@deffn Option semantic-idle-scheduler-working-in-modeline-flag
+@anchor{semantic-idle-scheduler-working-in-modeline-flag}
+Non-@code{nil} means show working messages in the mode line.
+Typically, parsing will show messages in the minibuffer.
+This will move the parse message into the modeline.
+@end deffn
+
+@subsection Reparsing Hooks
+
+@defvar semantic-before-idle-scheduler-reparse-hooks
+@anchor{semantic-before-idle-scheduler-reparse-hooks}
+Hooks run before option @code{semantic-idle-scheduler} begins parsing.
+If any hook throws an error, this variable is reset to nil.
+This hook is not protected from lexical errors.
+@end defvar
+
+@defvar semantic-after-idle-scheduler-reparse-hooks
+@anchor{semantic-after-idle-scheduler-reparse-hooks}
+Hooks run after option @code{semantic-idle-scheduler} has parsed.
+If any hook throws an error, this variable is reset to nil.
+This hook is not protected from lexical errors.
+@end defvar
+
+@node Idle Working Options
+@section Idle Working Options
+
+Similiar to the reparsing that occurs at short intervals in idle
+time, there is extra work that can be controlled to occur in idle time
+also.
+
+Idle work occurs after a longer delay, and can be very time
+consuming.  The work done includes:
+
+@table @asis
+@item Create Include Path Caches
+Create the optimized search caches needed for symbol lookup.
+@item Create Type Cache
+Create the datatype caches needed for intellisense features.
+@item Save Databases
+All file-based @semantic{} databases are saved to disk.
+@item Parse neighboring files
+All files in the same directory as the current buffer are
+speculatively parsed.
+@end table
+
+These features can be controlled with the following variables:
+
+@deffn Option semantic-idle-scheduler-work-idle-time
+@anchor{semantic-idle-scheduler-work-idle-time}
+Time in seconds of idle before scheduling big work.
+This time should be long enough that once any big work is started, it is
+unlikely the user would be ready to type again right away.
+@end deffn
+
+@deffn Option semantic-idle-work-parse-neighboring-files-flag
+@anchor{semantic-idle-work-parse-neighboring-files-flag}
+Non-@code{nil} means to parse files in the same dir as the current buffer.
+Disable to prevent lots of excessive parsing in idle time.
+@end deffn
+
+@node Debugging Idle Time Issues
+@section Debugging Idle Time Issues
+
+If you see errors produced in idle time, it could be an indication of a
+more serious issue elsewhere.  It is not enough to enable
+@code{debug-on-error}, as the idle timer tries to keep errors under
+wraps.
+
+Instead, there are two commands you can use whenever you see an idle
+error.
+
+@deffn Command semantic-debug-idle-function
+@anchor{semantic-debug-idle-function}
+Run the Semantic idle function with debugging turned on.
+@end deffn
+
+@deffn Command semantic-debug-idle-work-function
+@anchor{semantic-debug-idle-work-function}
+Run the Semantic idle work function with debugging turned on.
+@end deffn
+
+Once you identify the general location of the idle error, you can send
+the stack trace to the mailing list, or perhaps find a more focused
+way to reproduce the issue.
+
+@node Idle Summary Mode
+@section Idle Summary Mode
+
+Similar to the Emacs Lisp facility eldoc,
+@code{semantic-idle-summary-mode} will display the prototype, or other
+helpful doc about the symbol currently under point.
+
+
+@deffn semantic-idle-summary-mode &optional arg
+@anchor{semantic-idle-summary-mode}
+Display a tag summary of the lexical token under the cursor.
+This means for getting the current tag to display information can
+be overriden with @code{idle-summary-current-symbol-info}.
+This is a minor mode which performs actions during idle time.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled
+@end deffn
+
+@obsolete{semantic-summary-mode, semantic-idle-summary-mode}
+
+@deffn Option semantic-idle-summary-function
+@anchor{semantic-idle-summary-function}
+Function to use when displaying tag information during idle time.
+Some useful functions are found in @code{semantic-format-tag-functions}.
+@end deffn
+
+@defvar semantic-idle-summary-out-of-context-faces
+@anchor{semantic-idle-summary-out-of-context-faces}
+List of font-lock faces that indicate a useless summary context.
+Those are generally faces used to highlight comments or strings.
+
+It might be useful to override this variable to add comment faces
+specific to a major mode.  For example, in jde mode:
+
+@example
+(defvar-mode-local jde-mode semantic-idle-summary-out-of-context-faces
+   (append (default-value 'semantic-idle-summary-out-of-context-faces)
+	   '(jde-java-font-lock-doc-tag-face
+	     jde-java-font-lock-link-face
+	     jde-java-font-lock-bold-face
+	     jde-java-font-lock-underline-face
+	     jde-java-font-lock-pre-face
+	     jde-java-font-lock-code-face)))
+@end example
+
+@end defvar
+
+@node Idle Completions Mode
+@section Idle Completions Mode
+
+The definition of smart completion is described in the Analyzer
+section @ref{Analyzer}.
+
+The Idle Completions mode will calculate the list of possible
+completions in idle time, and display them in a popup list, or other
+inline completion mechanism.
+
+@deffn semantic-idle-completions-mode &optional arg
+@anchor{semantic-idle-completions-mode}
+Display a tooltip with a list of possible completions near the cursor.
+There is no convenience for performing a completion replacement.  For
+that you should bind @code{semantic-ia-complete-symbol}.
+This is a minor mode which performs actions during idle time.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled
+@end deffn
+
+This mode operates by using the command
+@code{semantic-complete-inline-analyzer}.
+
+Idle completion uses the completion function
+@code{semantic-complete-analyze-inline-idle}.  Changing the behavior of
+the idle completion popups should be done through those utilities.
+
+@deffn Command semantic-complete-analyze-inline-idle
+@anchor{semantic-complete-analyze-inline-idle}
+Perform prompt completion to do in buffer completion.
+@dfn{semantic-analyze-possible-completions} is used to determine the
+possible values.
+The function returns immediately, leaving the buffer in a mode that
+will perform the completion.
+Configure @code{semantic-complete-inline-analyzer-idle-displayor-class}
+to change how completion options are displayed.
+@end deffn
+
+@deffn Option semantic-complete-inline-analyzer-idle-displayor-class
+@anchor{semantic-complete-inline-analyzer-idle-displayor-class}
+Class for displayor to use with inline completion at idle time.
+
+Customize this variable to get a list of options, such as popup
+tooltips, ghosting text, or traditional completion tools.
+@end deffn
+
+@node Minor Modes
+@chapter Minor Modes
+@cindex Minor Modes
+
+@include minor-modes.texi
+
+@node semanticdb
+@chapter Semantic Database
+@cindex semanticdb
+
+Semanticdb is a utility which tracks your parsed files, and saves the
+parsed information to disk.  When you reload your source files,
+semanticdb automatically associates the file with the cached copy,
+saving time by not re-parsing your buffer.
+
+Semanticdb also provides an API for programs to use to look up
+information about a tag.  These functions can return tag
+information without loading the source file into memory.
+
+Lastly, the semanticdb interface allows programmers to create
+alternate back ends.  Such a back end could allow access to tag
+information in binary files, not normally accessable to @semantic{}.  A
+back end could also be written to store tag information in an
+alternate form of persistent storage.
+
+To use semanticdb, add the following to your @file{.emacs} file:
+
+@example
+(require 'semanticdb)
+(global-semanticdb-minor-mode 1)
+@end example
+
+If you use @file{semantic-load.el}, or the default CEDET install
+mechanism, you do not need to add the above lines in your
+@file{.emacs} file.
+
+The Semantic Database has several user level configuration options
+that controls its use.  From the user perspective, it appears to be
+one large application.  Internally it is divided into sections.
+
+@table @asis
+@item Core Tables
+These core tables for semanticdb are not associated with files, or
+backends.  They define the basic behavior of a database and table.
+@item Persistent Tables
+These databases are what are generally used in semantic to store
+information to disk.
+@item Custom Backends
+These databases and tables are interfaces to some other source of
+tagging information, such as the symbols loaded in Emacs Lisp, or
+perhaps symbols in a Java @file{.class} file.
+@end table
+
+You can execute hooks when semanticdb is activated using its mode hook.
+
+@deffn Option semanticdb-mode-hooks
+@anchor{semanticdb-mode-hooks}
+Hooks run whenever @dfn{global-semanticdb-minor-mode} is run.
+Use @dfn{semanticdb-minor-mode-p} to determine if the mode has been turned
+on or off.
+@end deffn
+
+@menu
+* Semanticdb Tag Storage::
+* Semanticdb Search Configuration::
+* Semanticdb System Backends::
+* Changing Backends::
+* Script Generated Cache Files::
+* Create System Databases::
+@end menu
+
+@node Semanticdb Tag Storage
+@section Semanticdb Tag Storage
+
+Once you have tables of tags parsed from your files, the default
+action is to save them when Emacs exits.  You can control the file
+name and directories where the caches are stored.
+
+@deffn Option semanticdb-default-file-name
+@anchor{semanticdb-default-file-name}
+File name of the semantic tag cache.
+@end deffn
+
+@deffn Option semanticdb-default-save-directory
+@anchor{semanticdb-default-save-directory}
+Directory name where semantic cache files are stored.
+If this value is @code{nil}, files are saved in the current directory.  If the value
+is a valid directory, then it overrides @code{semanticdb-default-file-name} and
+stores caches in a coded file name in this directory.
+@end deffn
+
+@deffn Option semanticdb-persistent-path
+@anchor{semanticdb-persistent-path}
+List of valid paths that semanticdb will cache tags to.
+When @dfn{global-semanticdb-minor-mode} is active, tag lists will
+be saved to disk when Emacs exits.  Not all directories will have
+tags that should be saved.
+The value should be a list of valid paths.  @var{a} path can be a string,
+indicating a directory in which to save a variable.  An element in the
+list can also be a symbol.  Valid symbols are @code{never}, which will
+disable any saving anywhere, @code{always}, which enables saving
+everywhere, or @code{project}, which enables saving in any directory that
+passes a list of predicates in @code{semanticdb-project-predicate-functions}.
+@end deffn
+
+@defvar semanticdb-project-predicate-functions
+@anchor{semanticdb-project-predicate-functions}
+List of predicates to try that indicate a directory belongs to a project.
+This list is used when @code{semanticdb-persistent-path} contains the value
+@code{'project}.  If the predicate list is @code{nil}, then presume all paths are valid.
+
+Project Management software (such as @var{ede} and @var{jde}) should add their own
+predicates with @dfn{add-hook} to this variable, and semanticdb will save tag
+caches in directories controlled by them.
+@end defvar
+
+@deffn Option semanticdb-save-database-hooks
+@anchor{semanticdb-save-database-hooks}
+Hooks run after a database is saved.
+Each function is called with one argument, the object representing
+the database recently written.
+@end deffn
+
+@node Semanticdb Search Configuration
+@section Semanticdb Search Configuration
+
+  When different tools such as smart completion or tag jumping needs
+to find a tag, those routines call semanticdb search routines.
+Getting the search path configured usually takes a little bit of time
+to get right.
+
+The search path includes:
+
+@enumerate
+@item
+The current file
+@item
+a table for each #include file
+@item
+if 'recursive is in the throttle, then all include files included in
+include files.
+@end enumerate
+
+Include files or equivalent are found in:
+
+@enumerate
+@item
+current directory
+@item
+directories specified by your project.  (such as EDE, or the
+@code{semanticdb-project-roots} variable.)
+@item
+system directories
+@end enumerate
+
+In C/C++ code, @semantic{} tries to distinguish between project and
+system headers based on @code{""} or @code{<>} delimiters.  Each
+language can distinguish using its own rules.
+
+The system directory is set up via the variable
+@code{semantic-dependency-system-include-path}.  The path is also
+modified by some system database create routines, such as
+@code{semanticdb-create-ebrowse-database}. @xref{Include paths}.
+
+You can use the command:
+
+@example
+M-x semantic-add-system-include RET /some/path
+@end example
+
+  to add more paths interactively into the current mode's path.  This
+will allow semantic to find more files w/out using system databases.
+To customize the system include path for a particular major mode, use
+the command:
+
+@example
+M-x semantic-customize-system-include-path RET
+@end example
+
+@menu
+* Semanticdb Roots::    Specifying the root of different projects
+* Include paths::       Add/Remove directories to include search paths
+* Search Throttle::     Controlling how semanticdb searches occur
+* Semanticdb search debugging commands::
+@end menu
+
+@node Semanticdb Roots
+@subsection SemanticDB project roots
+
+Project roots specify where different code projects start.  Searching
+for files usually stops within a single project, so specifying these
+roots is important if you want semantic to find tags in other related
+directories.
+
+@deffn Option semanticdb-project-roots
+@anchor{semanticdb-project-roots}
+List of directories, where each directory is the root of some project.
+All subdirectories of a root project are considered a part of one project.
+Values in this string can be overriden by project management programs
+via the @code{semanticdb-project-root-functions} variable.
+@end deffn
+
+@defvar semanticdb-project-root-functions
+@anchor{semanticdb-project-root-functions}
+List of functions used to determine a given directories project root.
+Functions in this variable can override @code{semanticdb-project-roots}.
+Functions set in the variable are given one argument (a directory) and
+must return a string, (the root directory) or a list of strings (multiple
+root directories in a more complex system).  This variable should be used
+by project management programs like @var{ede} or @var{jde}.
+@end defvar
+
+Alternately, you can use @i{EDE} for project management, and EDE will
+then handle search routines as above.  See the
+@inforef{top, EDE Manual, ede} for more.
+
+@node Include paths
+@subsection Include Paths
+
+You can add and remove system include paths based on major mode using
+the following commands:
+
+@deffn Command semantic-add-system-include dir &optional mode
+@anchor{semantic-add-system-include}
+Add a system include @var{dir} to path for @var{mode}.
+Modifies a mode-local version of
+@code{semantic-dependency-system-include-path}.
+@end deffn
+
+@deffn Command semantic-remove-system-include dir &optional mode
+@anchor{semantic-remove-system-include}
+Add a system include @var{dir} to path for @var{mode}.
+Modifies a mode-local version of
+@code{semantic-dependency-system-include-path}.
+@end deffn
+
+@deffn Command semantic-customize-system-include-path &optional mode
+@anchor{semantic-customize-system-include-path}
+Customize the include path for this @code{major-mode}.
+To create a customizable include path for a major @var{mode}, use the
+macro @dfn{defcustom-mode-local-semantic-dependency-system-include-path}.
+@end deffn
+
+@defun semanticdb-implied-include-tags
+@anchor{semanticdb-implied-include-tags}
+Include tags implied for all files of a given mode.
+Set this variable with @dfn{defvar-mode-local} for a particular mode so
+that any symbols that exist for all files for that mode are included.
+
+Note: This could be used as a way to write a file in a langauge
+to declare all the built-ins for that language.
+@end defun
+
+For a bit more on include paths, see the
+@inforef{Search Optimization, Search Optimization section, semantic}.
+
+Debug your search paths using stiff in
+@ref{Semanticdb search debugging commands}.
+
+@node Search Throttle
+@subsection SemanticDB Search Throttle
+
+The semanticdb find throttle is a configuration variable that may
+often be configured by a language support author.  If you need to
+customize this for yourself, you may need to override the mode values
+in a mode support hook.
+
+@defvar semanticdb-find-default-throttle
+@anchor{semanticdb-find-default-throttle}
+The default throttle for @code{semanticdb-find} routines.
+The throttle controls how detailed the list of database
+tables is for a symbol lookup.  The value is a list with
+the following keys:
+
+@table @code
+@item file
+The file the search is being performed from.  This option is here for
+completeness only, and is assumed to always be on.
+@item local
+Tables from the same local directory are included.  This includes
+files directly referenced by a file name which might be in a different
+directory.
+@item project
+Tables from the same local project are included If @code{project} is
+specified, then @code{local} is assumed.
+@item unloaded
+If a table is not in memory, load it.  If it is not cached on disk
+either, get the source, parse it, and create the table.
+@item system
+Tables from system databases.  These are specifically tables
+from system header files, or language equivalent.
+@item recursive
+For include based searches, includes tables referenced by included
+files.
+@item omniscience
+Included system databases which are omniscience, or somehow know
+everything.  Omniscience databases are found in
+@code{semanticdb-project-system-databases}.  The Emacs Lisp system
+@var{db} is an omniscience database.
+@end table
+
+@end defvar
+
+To set the throttle, use a command like this:
+
+@example
+(setq-mode-local c-mode
+		 semanticdb-find-default-throttle
+		 '(project unloaded system recursive))
+@end example
+
+The default value of the throttle is for maximum accuracy at the
+expense of time taken to perform a particular look-up.  The throttle
+is tweaked by @code{semantic-idle-summary-mode} to remove 'unloaded,
+thus removing poor speed at unexpected times.
+
+@node Semanticdb search debugging commands
+@subsection Semanticdb search debugging commands
+
+You can use @kbd{M-x semanticdb-dump-all-table-summary RET} to see the
+list of databases that will be searched from a given buffer.  It
+should include DBs for the directories you expect.  You can follow up
+with @kbd{M-x semanticdb-find-test-translate-path RET} to then make
+sure specific tables from the path are discovered correctly. 
+
+Alternately, you can get a list of include files @semantic{}
+encountered, but could not find on disk using
+@kbd{M-x semanticdb-find-adebug-lost-includes RET}.
+
+Once you have used the below functions to debug the problem, you may
+need to reconfigure how @semantic{} finds include files.
+See @ref{Semanticdb Search Configuration}.  If the search config is
+ok, you may need to configure the search throttle. See @ref{Search Throttle}.
+
+@deffn Command semanticdb-dump-all-table-summary
+@anchor{semanticdb-dump-all-table-summary}
+Dump a list of all databases in Emacs memory.
+@end deffn
+
+@deffn Command semanticdb-find-test-translate-path &optional arg
+@anchor{semanticdb-find-test-translate-path}
+Call and output results of @dfn{semanticdb-find-translate-path}
+With @var{arg} non-@code{nil}, specify a @var{brutish} translation.
+@end deffn
+
+@deffn Command semanticdb-find-adebug-lost-includes
+@anchor{semanticdb-find-adebug-lost-includes}
+Translate the current path, then display the lost includes.
+Examines the variable @code{semanticdb-find-lost-includes}.
+@end deffn
+
+Lastly, you can test an explicit search term using this command:
+
+@deffn Command semantic-adebug-searchdb regex
+@anchor{semantic-adebug-searchdb}
+Search the semanticdb for @var{regex} for the current buffer.
+Display the results as a debug list.
+@end deffn
+
+@node Semanticdb System Backends
+@section Semanticdb System Backends
+
+These variables should be set up automatically when you choose to use
+different system databases.
+
+@defvar semanticdb-project-system-databases
+@anchor{semanticdb-project-system-databases}
+List of databases containing system library information.
+Mode authors can create their own system databases which know
+detailed information about the system libraries for querying purposes.
+Put those into this variable as a buffer-local, or mode-local
+value.
+@end defvar
+
+These system databases are a part of the `omniscience' throttle value.
+
+While these are enabled with @code{semanticdb-find-default-throttle},
+a secondary flag is needed for internal controls that prevent
+recursive duplication.
+
+@defvar semanticdb-search-system-databases
+@anchor{semanticdb-search-system-databases}
+Non @code{nil} if search routines are to include a system database.
+@end defvar
+
+
+@node Changing Backends
+@section Changing Backends
+
+If you want to use some other form of backend, you can use this
+variable to choose which back end class to use for your general tag
+storage.
+
+The default is to save databases in flat files.  Alternatively, you
+could write a new database backend that stores tags into a database,
+or other storage system.
+
+@defvar semanticdb-new-database-class
+@anchor{semanticdb-new-database-class}
+The default type of database created for new files.
+This can be changed on a per file basis, so that some directories
+are saved using one mechanism, and some directories via a different
+mechanism.
+@end defvar
+
+@node Script Generated Cache Files
+@section Script Generated Cache Files
+
+You can create new semantic databases with the @file{semanticdb.sh}
+script file.  Give this script the directory you want parsed, and it
+will create a cache file for you.
+
+@example
+$ semanticdb.sh *.el
+@end example
+
+To use these generated tables, you would likely need to restart Emacs.
+
+@node Create System Databases
+@section Create System Databases
+
+If your supported language stores the system libraries in readily
+available parsable source code, you can pre-generate database files
+for them once, which will be used over and over for tools such as
+summary-mode, or the analyzer.
+
+@deffn Command semanticdb-create-ebrowse-database dir
+@anchor{semanticdb-create-ebrowse-database}
+Create an @var{ebrowse} database for directory @var{dir}.
+The database file is stored in ~/.semanticdb, or whichever directory
+is specified by @code{semanticdb-default-system-save-directory}.
+@end deffn
+
+@node Debugging
+@chapter Debugging speed and accuracy issues
+
+If aspects of semantic cause your Emacs to slow down or block
+editing, there are several things that may be happening.  The most
+time consuming aspect of semantic is usually the parsing of files for
+tag information, and this action can be triggered from many possible
+sources.
+
+A simple way to determine where the problem lies is to use the command
+@kbd{M-x debug-on-quit RET} and then just hit @kbd{C-g} next time it
+gets 'stuck' somewhere.  It will give you a stack and one of the many
+semantic mode functions will likely show up in that stack trace.
+
+From a simple standpoint, your next action might be to use the the
+Senator menu under @kbd{Modes} and just toggle suspected modes on and
+off.
+
+@section Idle function errors
+
+If the idle scheduler starts reporting errors, then you can run the
+command @kbd{M-x semantic-debug-idle-function RET} to get a stacktrace
+to report.
+
+If this doesn't report an issue, then you may have found a bug in the
+idle work function, where longer tasks are scheduled.  To debug that,
+use the command @kbd{M-x semantic-debug-idle-work-function RET}.
+
+@section Analyzer debugging
+
+When the semantic analyzer provides bad or non-existent completions,
+then you will need to debug the analyzer.  Place the cursor where the
+problem is, and then use the command
+@kbd{M-x semantic-analyze-debug-assist RET}.
+
+This will perform an analysis, and then offer suggestions on what
+might be wrong, and how to reconfigure @semantic{} to solve the problem.
+
+@section Symbol lookup
+
+There are many minor modes that have special behaviors tied into the
+current parser state, with the most complex modes being the summary
+and completion modes.  These modes can initiate parsing not only in
+the current buffer, but in other buffers that are referred to in the
+current source by some form of include statement.
+
+If they turn out not to be useful in the language mode you are
+operating in, then it may be best to disable them.
+
+Alternately, you can control how these major modes, and other modes
+like them parse alternate files by adjusting
+@code{semanticdb-find-default-throttle}. You can read more
+in @inforef{ DB Search Paths, , semantic-appdev.info}.
+
+@section Interruptibility
+
+  One of the goals with the semantic based minor modes and auto parse
+is that it should be interruptible.  Thus, a keyboard action should
+interrupt any active parsing or mode activity.  In practice, I've
+found this doesn't always work and I've been a bit stymied as to why.
+
+  You can test the interruptibility framework by running
+@kbd{M-x semantic-test-throw-on-input RET} and seeing that you can
+press any key to break out of the loop.
+
+@section Incremental parsing
+
+The incremental parser used by semantic will reparse only small
+sections of a file you have edited, which eliminates the need to
+reparse entire files.  This speeds up minor modes that need the local
+buffer to be up to date, such as speedbar or ECB.
+
+If the incremental parsing is not always working for you (meaning it
+will parse the whole file frequently while you edit) then perhaps you
+need to customize @code{semantic-edits-verbose-flag} to enable some
+friendly debug output.  Additionally using
+@code{semantic-load-enable-semantic-debugging-helpers} to help
+identify possible problem areas by enabling highlight edits mode and
+show parser state mode 
+@inforef{Incremental Parser Debugging, ,semantic-langdev.info}
+
+@section Profiling
+
+To help identify speed issues with the @semantic{} analyzer, you can
+use the @file{semantic-elp.el} tool.  To use it type:
+
+@example
+M-x semantic-elp-analyze RET
+@end example
+
+It will do a full run for each stage of analysis keeping profiling
+information.  The analysis will be done at point, so be sure to
+position the cursor at the location where the slowdown occurs.
+
+Once done, it will ask you to save the profiler information.  It will
+then show you the profile information in ADEBUG mode, so you can
+navigate through the results.
+
+Use @kbd{SPC} to open sections of the tree.  Use @kbd{SPC} on the sort
+option to change sorting of the results table.
+
+Use @kbd{M-x semantic-elp-load-old-run} to restore an old run and view
+it again.
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
diff --git a/site/cedet-1.0pre7/semantic/doc/wisent.info b/site/cedet-1.0pre7/semantic/doc/wisent.info
new file mode 100644
index 0000000..7fc1dcf
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/wisent.info
@@ -0,0 +1,2208 @@
+This is wisent.info, produced by makeinfo version 4.9 from wisent.texi.
+
+   This manual documents the Wisent parser generator.
+
+   Copyright (C) 2001, 2002, 2003, 2004, 2007 David Ponce
+
+   Some texts are borrowed or adapted from the manual of Bison version
+1.35.  The text in section entitled "Understanding the automaton" is
+adapted from the section "Understanding Your Parser" in the manual of
+Bison version 1.49.
+
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 1999,
+2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.1 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being list their titles,
+     with the Front-Cover Texts being list, and with the Back-Cover
+     Texts being list.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License".
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Semantic Wisent parser development: (wisent).
+END-INFO-DIR-ENTRY
+
+   This file documents Application Development with Semantic.
+_Infrastructure for parser based text analysis in Emacs_
+
+   Copyright (C) 2001, 2002, 2003, 2004 Eric M. Ludlam, David Ponce,
+and Richard Y. Kim
+
+
+File: wisent.info,  Node: Top,  Next: Wisent Overview,  Up: (dir)
+
+Wisent Parser Development
+*************************
+
+Wisent (the European Bison ;-) is an Emacs Lisp implementation of the
+GNU Compiler Compiler Bison.
+
+This manual describes how to use Wisent to develop grammars for
+programming languages, and how to use grammars to parse language source
+in Emacs buffers.
+
+It also describes how Wisent is used with the semantic tool set
+described in the *Note Semantic Manual: (semantic)Top.
+
+* Menu:
+
+* Wisent Overview::
+* Wisent Grammar::
+* Wisent Parsing::
+* Wisent Semantic::
+* GNU Free Documentation License::
+* Index::
+
+
+File: wisent.info,  Node: Wisent Overview,  Next: Wisent Grammar,  Prev: Top,  Up: Top
+
+1 Wisent Overview
+*****************
+
+"Wisent" (the European Bison) is an implementation in Emacs Lisp of the
+GNU Compiler Compiler Bison. Its code is a port of the C code of GNU
+Bison 1.28 & 1.31.
+
+For more details on the basic concepts for understanding Wisent, it is
+worthwhile to read the *Note Bison Manual: Top.
+
+Wisent can generate compilers compatible with the semantic tool set.
+See the *Note Semantic Manual: (semantic)Top.
+
+It benefits from these Bison features:
+
+   * It uses a fast but not so space-efficient encoding for the parse
+     tables, described in Corbett's PhD thesis from Berkeley:
+
+          `Static Semantics in Compiler Error Recovery'
+          June 1985, Report No. UCB/CSD 85/251.
+
+   * For generating the lookahead sets, Wisent uses the well-known
+     technique of F. DeRemer and A. Pennello they described in:
+
+          `Efficient Construction of LALR(1) Lookahead Sets'
+          October 1982, ACM TOPLS Vol 4 No 4.
+
+   * Wisent resolves shift/reduce conflicts using operator precedence
+     and associativity.
+
+   * Parser error recovery is accomplished using rules which match the
+     special token `error'.
+
+Nevertheless there are some fundamental differences between Bison and
+Wisent.
+
+   * Wisent is intended to be used in Emacs.  It reads and produces
+     Emacs Lisp data structures.  All the additional code used in
+     grammars is Emacs Lisp code.
+
+   * Contrary to Bison, Wisent does not generate a parser which combines
+     Emacs Lisp code and grammar constructs.  They exist separately.
+     Wisent reads the grammar from a Lisp data structure and then
+     generates grammar constructs as tables.  Afterward, the derived
+     tables can be included and byte-compiled in separate Emacs Lisp
+     files, and be used at a later time by the Wisent's parser engine.
+
+   * Wisent allows multiple start nonterminals and allows a call to the
+     parsing function to be made for a particular start nonterminal.
+     For example, this is particularly useful to parse a region of an
+     Emacs buffer.  semantic heavily depends on the availability of
+     this feature.
+
+
+File: wisent.info,  Node: Wisent Grammar,  Next: Wisent Parsing,  Prev: Wisent Overview,  Up: Top
+
+2 Wisent Grammar
+****************
+
+In order for Wisent to parse a language, it must be described by a
+"context-free grammar".  That is a grammar specified as rules that can
+be applied regardless of context.  For more information, see *Note
+Language and Grammar: (bison)Language and Grammar, in the Bison manual.
+
+The formal grammar is formulated using "terminal" and "nonterminal"
+items.  Terminals can be Emacs Lisp symbols or characters, and
+nonterminals are symbols only.
+
+Terminals (also known as "tokens") represent the lexical elements of
+the language like numbers, strings, etc..
+
+For example `PLUS' can represent the operator `+'.
+
+Nonterminal symbols are described by rules:
+
+     RESULT == COMPONENTS...
+
+`RESULT' is a nonterminal that this rule describes and `COMPONENTS' are
+various terminals and nonterminals that are put together by this rule.
+
+For example, this rule:
+
+     exp == exp PLUS exp
+
+Says that two groupings of type `exp', with a `PLUS' token in between,
+can be combined into a larger grouping of type `exp'.
+
+* Menu:
+
+* Grammar format::
+* Example::
+* Compiling a grammar::
+* Conflicts::
+
+
+File: wisent.info,  Node: Grammar format,  Next: Example,  Prev: Wisent Grammar,  Up: Wisent Grammar
+
+2.1 Grammar format
+==================
+
+To be acceptable by Wisent a context-free grammar must respect a
+particular format.  That is, must be represented as an Emacs Lisp list
+of the form:
+
+`(TERMINALS ASSOCS . NON-TERMINALS)'
+
+TERMINALS
+     Is the list of terminal symbols used in the grammar.
+
+ASSOCS
+     Specify the associativity of TERMINALS.  It is `nil' when there is
+     no associativity defined, or an alist of
+     `(ASSOC-TYPE . ASSOC-VALUE)' elements.
+
+     ASSOC-TYPE must be one of the `default-prec', `nonassoc', `left'
+     or `right' symbols.  When ASSOC-TYPE is `default-prec',
+     ASSOC-VALUE must be `nil' or `t' (the default).  Otherwise it is a
+     list of tokens which must have been previously declared in
+     TERMINALS.
+
+     For details, see *Note Contextual Precedence: (bison)Contextual
+     Precedence, in the Bison manual.
+
+NON-TERMINALS
+     Is the list of nonterminal definitions.  Each definition has the
+     form:
+
+     `(NONTERM . RULES)'
+
+     Where NONTERM is the nonterminal symbol defined and RULES the list
+     of rules that describe this nonterminal.  Each rule is a list:
+
+     `(COMPONENTS [PRECEDENCE] [ACTION])'
+
+     Where:
+
+    COMPONENTS
+          Is a list of various terminals and nonterminals that are put
+          together by this rule.
+
+          For example,
+
+               (exp ((exp ?+ exp))          ;; exp: exp '+' exp
+                    )                       ;;    ;
+
+          Says that two groupings of type `exp', with a `+' token in
+          between, can be combined into a larger grouping of type `exp'.
+
+          By convention, a nonterminal symbol should be in lower case,
+          such as `exp', `stmt' or `declaration'.  Terminal symbols
+          should be upper case to distinguish them from nonterminals:
+          for example, `INTEGER', `IDENTIFIER', `IF' or `RETURN'.  A
+          terminal symbol that represents a particular keyword in the
+          language is conventionally the same as that keyword converted
+          to upper case.  The terminal symbol `error' is reserved for
+          error recovery.
+
+          Scattered among the components can be "middle-rule" actions.
+          Usually only ACTION is provided (*note action::).
+
+          If COMPONENTS in a rule is `nil', it means that the rule can
+          match the empty string.  For example, here is how to define a
+          comma-separated sequence of zero or more `exp' groupings:
+
+               (expseq  (nil)               ;; expseq: ;; empty
+                        ((expseq1))         ;;       | expseq1
+                        )                   ;;       ;
+
+               (expseq1 ((exp))             ;; expseq1: exp
+                        ((expseq1 ?, exp))  ;;        | expseq1 ',' exp
+                        )                   ;;        ;
+
+    PRECEDENCE
+          Assign the rule the precedence of the given terminal item,
+          overriding the precedence that would be deduced for it, that
+          is the one of the last terminal in it.  Notice that only
+          terminals declared in ASSOCS have a precedence level.  The
+          altered rule precedence then affects how conflicts involving
+          that rule are resolved.
+
+          PRECEDENCE is an optional vector of one terminal item.
+
+          Here is how PRECEDENCE solves the problem of unary minus.
+          First, declare a precedence for a fictitious terminal symbol
+          named `UMINUS'.  There are no tokens of this type, but the
+          symbol serves to stand for its precedence:
+
+               ...
+               ((default-prec t) ;; This is the default
+                (left '+' '-')
+                (left '*')
+                (left UMINUS))
+
+          Now the precedence of `UMINUS' can be used in specific rules:
+
+               (exp    ...                  ;; exp:    ...
+                        ((exp ?- exp))      ;;         | exp '-' exp
+                       ...                  ;;         ...
+                        ((?- exp) [UMINUS]) ;;         | '-' exp %prec UMINUS
+                       ...                  ;;         ...
+                       )                    ;;         ;
+
+          If you forget to append `[UMINUS]' to the rule for unary
+          minus, Wisent silently assumes that minus has its usual
+          precedence.  This kind of problem can be tricky to debug,
+          since one typically discovers the mistake only by testing the
+          code.
+
+          Using `(default-prec nil)' declaration makes it easier to
+          discover this kind of problem systematically.  It causes
+          rules that lack a PRECEDENCE modifier to have no precedence,
+          even if the last terminal symbol mentioned in their
+          components has a declared precedence.
+
+          If `(default-prec nil)' is in effect, you must specify
+          PRECEDENCE for all rules that participate in precedence
+          conflict resolution.  Then you will see any shift/reduce
+          conflict until you tell Wisent how to resolve it, either by
+          changing your grammar or by adding an explicit precedence.
+          This will probably add declarations to the grammar, but it
+          helps to protect against incorrect rule precedences.
+
+          The effect of `(default-prec nil)' can be reversed by giving
+          `(default-prec t)', which is the default.
+
+          For more details, see *Note Contextual Precedence:
+          (bison)Contextual Precedence, in the Bison manual.
+
+          It is important to understand that ASSOCS declarations defines
+          associativity but also assign a precedence level to
+          terminals.  All terminals declared in the same `left',
+          `right' or `nonassoc' association get the same precedence
+          level.  The precedence level is increased at each new
+          association.
+
+          On the other hand, PRECEDENCE explicitly assign the precedence
+          level of the given terminal to a rule.
+
+    ACTION
+          An action is an optional Emacs Lisp function call, like this:
+
+          `(identity $1)'
+
+          The result of an action determines the semantic value of a
+          rule.
+
+          From an implementation standpoint, the function call will be
+          embedded in a lambda expression, and several useful local
+          variables will be defined:
+
+         `$N'
+               Where N is a positive integer.  Like in Bison, the value
+               of `$N' is the semantic value of the Nth element of
+               COMPONENTS, starting from 1.  It can be of any Lisp data
+               type.
+
+         `$regionN'
+               Where N is a positive integer.  For each `$N' variable
+               defined there is a corresponding `$regionN' variable.
+               Its value is a pair `(START-POS .  END-POS)' that
+               represent the start and end positions (in the lexical
+               input stream) of the `$N' value.  It can be `nil' when
+               the component positions are not available, like for an
+               empty string component for example.
+
+         `$region'
+               Its value is the leftmost and rightmost positions of
+               input data matched by all COMPONENTS in the rule.  This
+               is a pair `(LEFTMOST-POS .  RIGHTMOST-POS)'.  It can be
+               `nil' when components positions are not available.
+
+         `$nterm'
+               This variable is initialized with the nonterminal symbol
+               (NONTERM) the rule belongs to.  It could be useful to
+               improve error reporting or debugging.  It is also used
+               to automatically provide incremental re-parse entry
+               points for semantic tags (*note Wisent Semantic::).
+
+         `$action'
+               The value of `$action' is the symbolic name of the
+               current semantic action (*note Debugging actions::).
+
+          When an action is not specified a default value is supplied,
+          it is `(identity $1)'.  This means that the default semantic
+          value of a rule is the value of its first component.
+          Excepted for a rule matching the empty string, for which the
+          default action is to return `nil'.
+
+
+File: wisent.info,  Node: Example,  Next: Compiling a grammar,  Prev: Grammar format,  Up: Wisent Grammar
+
+2.2 Example
+===========
+
+Here is an example to parse simple infix arithmetic expressions.  See
+*Note Infix Calc: (bison)Infix Calc, in the Bison manual for details.
+
+     '(
+       ;; Terminals
+       (NUM)
+
+       ;; Terminal associativity & precedence
+       ((nonassoc ?=)
+        (left ?- ?+)
+        (left ?* ?/)
+        (left NEG)
+        (right ?^))
+
+       ;; Rules
+       (input
+        ((line))
+        ((input line)
+         (format "%s %s" $1 $2))
+        )
+
+       (line
+        ((?;)
+         (progn ";"))
+        ((exp ?;)
+         (format "%s;" $1))
+        ((error ?;)
+         (progn "Error;")))
+        )
+
+       (exp
+        ((NUM)
+         (string-to-number $1))
+        ((exp ?= exp)
+         (= $1 $3))
+        ((exp ?+ exp)
+         (+ $1 $3))
+        ((exp ?- exp)
+         (- $1 $3))
+        ((exp ?* exp)
+         (* $1 $3))
+        ((exp ?/ exp)
+         (/ $1 $3))
+        ((?- exp) [NEG]
+         (- $2))
+        ((exp ?^ exp)
+         (expt $1 $3))
+        ((?\( exp ?\))
+         (progn $2))
+        )
+       )
+
+In the bison-like "WY" format (*note Wisent Semantic::) the grammar
+looks like this:
+
+     %token <number> NUM
+
+     %nonassoc '=' ;; comparison
+     %left '-' '+'
+     %left '*' '/'
+     %left NEG     ;; negation--unary minus
+     %right '^'    ;; exponentiation
+
+     %%
+
+     input:
+         line
+       | input line
+         (format "%s %s" $1 $2)
+       ;
+
+     line:
+         ';'
+         {";"}
+       | exp ';'
+         (format "%s;" $1)
+       | error ';'
+         {"Error;"}
+       ;
+
+     exp:
+         NUM
+         (string-to-number $1)
+       | exp '=' exp
+         (= $1 $3)
+       | exp '+' exp
+         (+ $1 $3)
+       | exp '-' exp
+         (- $1 $3)
+       | exp '*' exp
+         (* $1 $3)
+       | exp '/' exp
+         (/ $1 $3)
+       | '-' exp %prec NEG
+         (- $2)
+       | exp '^' exp
+         (expt $1 $3)
+       | '(' exp ')'
+         {$2}
+       ;
+
+     %%
+
+
+File: wisent.info,  Node: Compiling a grammar,  Next: Conflicts,  Prev: Example,  Up: Wisent Grammar
+
+2.3 Compiling a grammar
+=======================
+
+After providing a context-free grammar in a suitable format, it must be
+translated into a set of tables (an "automaton") that will be used to
+derive the parser.  Like Bison, Wisent translates grammars that must be
+"LALR(1)".
+
+A grammar is LALR(1) if it is possible to tell how to parse any portion
+of an input string with just a single token of look-ahead: the
+"look-ahead token".  See *Note Language and Grammar: (bison)Language
+and Grammar, in the Bison manual for more information.
+
+Grammar translation (compilation) is achieved by the function:
+
+ -- Function: wisent-compile-grammar grammar &optional start-list
+     Compile GRAMMAR and return an LALR(1) automaton.
+
+     Optional argument START-LIST is a list of start symbols
+     (nonterminals).  If `nil' the first nonterminal defined in the
+     grammar is the default start symbol.  If START-LIST contains only
+     one element, it defines the start symbol.  If START-LIST contains
+     more than one element, all are defined as potential start symbols,
+     unless `wisent-single-start-flag' is non-`nil'.  In that case the
+     first element of START-LIST defines the start symbol and others
+     are ignored.
+
+     The LALR(1) automaton is a vector of the form:
+
+     `[ACTIONS GOTOS STARTS FUNCTIONS]'
+
+    ACTIONS
+          A state/token matrix telling the parser what to do at every
+          state based on the current look-ahead token.  That is shift,
+          reduce, accept or error.  See also *Note Wisent Parsing::.
+
+    GOTOS
+          A state/nonterminal matrix telling the parser the next state
+          to go to after reducing with each rule.
+
+    STARTS
+          An alist which maps the allowed start symbols (nonterminals)
+          to lexical tokens that will be first shifted into the parser
+          stack.
+
+    FUNCTIONS
+          An obarray of semantic action symbols.  A semantic action is
+          actually an Emacs Lisp function (lambda expression).
+
+
+File: wisent.info,  Node: Conflicts,  Prev: Compiling a grammar,  Up: Wisent Grammar
+
+2.4 Conflicts
+=============
+
+Normally, a grammar should produce an automaton where at each state the
+parser has only one action to do (*note Wisent Parsing::).
+
+In certain cases, a grammar can produce an automaton where, at some
+states, there are more than one action possible.  Such a grammar is
+"ambiguous", and generates "conflicts".
+
+The parser can't be driven by an automaton which isn't completely
+"deterministic", that is which contains conflicts.  It is necessary to
+resolve the conflicts to eliminate them.  Wisent resolves conflicts
+like Bison does.
+
+There are two sorts of conflicts:
+
+"shift/reduce conflicts"
+     When either a shift or a reduction would be valid at the same
+     state.
+
+     Such conflicts are resolved by choosing to shift, unless otherwise
+     directed by operator precedence declarations.  See *Note
+     Shift/Reduce: (bison)Shift/Reduce, in the Bison manual for more
+     information.
+
+"reduce/reduce conflicts"
+     That occurs if there are two or more rules that apply to the same
+     sequence of input.  This usually indicates a serious error in the
+     grammar.
+
+     Such conflicts are resolved by choosing to use the rule that
+     appears first in the grammar, but it is very risky to rely on
+     this.  Every reduce/reduce conflict must be studied and usually
+     eliminated.  See *Note Reduce/Reduce: (bison)Reduce/Reduce, in the
+     Bison manual for more information.
+
+* Menu:
+
+* Grammar Debugging::
+* Understanding the automaton::
+
+
+File: wisent.info,  Node: Grammar Debugging,  Next: Understanding the automaton,  Up: Conflicts
+
+2.4.1 Grammar debugging
+-----------------------
+
+To help writing a new grammar, `wisent-compile-grammar' can produce a
+verbose report containing a detailed description of the grammar and
+parser (equivalent to what Bison reports with the `--verbose' option).
+
+To enable the verbose report you can set to non-`nil' the variable:
+
+ -- Option: wisent-verbose-flag
+     non-`nil' means to report verbose information on generated parser.
+
+Or interactively use the command:
+
+ -- Command: wisent-toggle-verbose-flag
+     Toggle whether to report verbose information on generated parser.
+
+The verbose report is printed in the temporary buffer `*wisent-log*'
+when running interactively, or in file `wisent.output' when running in
+batch mode.  Different reports are separated from each other by a line
+like this:
+
+     *** Wisent SOURCE-FILE - 2002-06-27 17:33
+
+where SOURCE-FILE is the name of the Emacs Lisp file from which the
+grammar was read.  See *Note Understanding the automaton::, for details
+on the verbose report.
+
+*Please Note*
+     To help debugging the grammar compiler itself, you can set this
+     variable to print the content of some internal data structures:
+
+      -- Variable: wisent-debug-flag
+          non-`nil' means enable some debug stuff.
+
+
+File: wisent.info,  Node: Understanding the automaton,  Prev: Grammar Debugging,  Up: Conflicts
+
+2.4.2 Understanding the automaton
+---------------------------------
+
+This section (took from the manual of Bison 1.49) describes how to use
+the verbose report printed by `wisent-compile-grammar' to understand
+the generated automaton, to tune or fix a grammar.
+
+We will use the following example:
+
+     (let ((wisent-verbose-flag t)) ;; Print a verbose report!
+       (wisent-compile-grammar
+        '((NUM STR)                          ; %token NUM STR
+
+          ((left ?+ ?-)                      ; %left '+' '-';
+           (left ?*))                        ; %left '*'
+
+          (exp                               ; exp:
+           ((exp ?+ exp))                    ;    exp '+' exp
+           ((exp ?- exp))                    ;  | exp '-' exp
+           ((exp ?* exp))                    ;  | exp '*' exp
+           ((exp ?/ exp))                    ;  | exp '/' exp
+           ((NUM))                           ;  | NUM
+           )                                 ;  ;
+
+          (useless                           ; useless:
+           ((STR))                           ;    STR
+           )                                 ;  ;
+          )
+        'nil)                                ; no %start declarations
+       )
+
+When evaluating the above expression, grammar compilation first issues
+the following two clear messages:
+
+     Grammar contains 1 useless nonterminals and 1 useless rules
+     Grammar contains 7 shift/reduce conflicts
+
+The `*wisent-log*' buffer details things!
+
+The first section reports conflicts that were solved using precedence
+and/or associativity:
+
+     Conflict in state 7 between rule 1 and token '+' resolved as reduce.
+     Conflict in state 7 between rule 1 and token '-' resolved as reduce.
+     Conflict in state 7 between rule 1 and token '*' resolved as shift.
+     Conflict in state 8 between rule 2 and token '+' resolved as reduce.
+     Conflict in state 8 between rule 2 and token '-' resolved as reduce.
+     Conflict in state 8 between rule 2 and token '*' resolved as shift.
+     Conflict in state 9 between rule 3 and token '+' resolved as reduce.
+     Conflict in state 9 between rule 3 and token '-' resolved as reduce.
+     Conflict in state 9 between rule 3 and token '*' resolved as reduce.
+
+The next section reports useless tokens, nonterminal and rules (note
+that useless tokens might be used by the scanner):
+
+     Useless nonterminals:
+
+        useless
+
+
+     Terminals which are not used:
+
+        STR
+
+
+     Useless rules:
+
+     #6     useless: STR;
+
+The next section lists states that still have conflicts:
+
+     State 7 contains 1 shift/reduce conflict.
+     State 8 contains 1 shift/reduce conflict.
+     State 9 contains 1 shift/reduce conflict.
+     State 10 contains 4 shift/reduce conflicts.
+
+The next section reproduces the grammar used:
+
+     Grammar
+
+       Number, Rule
+       1       exp -> exp '+' exp
+       2       exp -> exp '-' exp
+       3       exp -> exp '*' exp
+       4       exp -> exp '/' exp
+       5       exp -> NUM
+
+And reports the uses of the symbols:
+
+     Terminals, with rules where they appear
+
+     $EOI (-1)
+     error (1)
+     NUM (2) 5
+     STR (3) 6
+     '+' (4) 1
+     '-' (5) 2
+     '*' (6) 3
+     '/' (7) 4
+
+
+     Nonterminals, with rules where they appear
+
+     exp (8)
+         on left: 1 2 3 4 5, on right: 1 2 3 4
+
+The report then details the automaton itself, describing each state
+with it set of "items", also known as "pointed rules".  Each item is a
+production rule together with a point (marked by `.') that the input
+cursor.
+
+     state 0
+
+         NUM	shift, and go to state 1
+
+         exp	go to state 2
+
+State 0 corresponds to being at the very beginning of the parsing, in
+the initial rule, right before the start symbol (`exp').  When the
+parser returns to this state right after having reduced a rule that
+produced an `exp', it jumps to state 2.  If there is no such transition
+on a nonterminal symbol, and the lookahead is a `NUM', then this token
+is shifted on the parse stack, and the control flow jumps to state 1.
+Any other lookahead triggers a parse error.
+
+In the state 1...
+
+     state 1
+
+         exp  ->  NUM .   (rule 5)
+
+         $default	reduce using rule 5 (exp)
+
+the rule 5, `exp: NUM;', is completed.  Whatever the lookahead
+(`$default'), the parser will reduce it.  If it was coming from state
+0, then, after this reduction it will return to state 0, and will jump
+to state 2 (`exp: go to state 2').
+
+     state 2
+
+         exp  ->  exp . '+' exp   (rule 1)
+         exp  ->  exp . '-' exp   (rule 2)
+         exp  ->  exp . '*' exp   (rule 3)
+         exp  ->  exp . '/' exp   (rule 4)
+
+         $EOI	shift, and go to state 11
+         '+'	shift, and go to state 3
+         '-'	shift, and go to state 4
+         '*'	shift, and go to state 5
+         '/'	shift, and go to state 6
+
+In state 2, the automaton can only shift a symbol.  For instance,
+because of the item `exp -> exp . '+' exp', if the lookahead if `+', it
+will be shifted on the parse stack, and the automaton control will jump
+to state 3, corresponding to the item `exp -> exp . '+' exp':
+
+     state 3
+
+         exp  ->  exp '+' . exp   (rule 1)
+
+         NUM	shift, and go to state 1
+
+         exp	go to state 7
+
+Since there is no default action, any other token than those listed
+above will trigger a parse error.
+
+The interpretation of states 4 to 6 is straightforward:
+
+     state 4
+
+         exp  ->  exp '-' . exp   (rule 2)
+
+         NUM	shift, and go to state 1
+
+         exp	go to state 8
+
+
+
+     state 5
+
+         exp  ->  exp '*' . exp   (rule 3)
+
+         NUM	shift, and go to state 1
+
+         exp	go to state 9
+
+
+
+     state 6
+
+         exp  ->  exp '/' . exp   (rule 4)
+
+         NUM	shift, and go to state 1
+
+         exp	go to state 10
+
+As was announced in beginning of the report, `State 7 contains 1
+shift/reduce conflict.':
+
+     state 7
+
+         exp  ->  exp . '+' exp   (rule 1)
+         exp  ->  exp '+' exp .   (rule 1)
+         exp  ->  exp . '-' exp   (rule 2)
+         exp  ->  exp . '*' exp   (rule 3)
+         exp  ->  exp . '/' exp   (rule 4)
+
+         '*'	shift, and go to state 5
+         '/'	shift, and go to state 6
+
+         '/'	[reduce using rule 1 (exp)]
+         $default	reduce using rule 1 (exp)
+
+Indeed, there are two actions associated to the lookahead `/': either
+shifting (and going to state 6), or reducing rule 1.  The conflict
+means that either the grammar is ambiguous, or the parser lacks
+information to make the right decision.  Indeed the grammar is
+ambiguous, as, since we did not specify the precedence of `/', the
+sentence `NUM + NUM / NUM' can be parsed as `NUM + (NUM / NUM)', which
+corresponds to shifting `/', or as `(NUM + NUM) / NUM', which
+corresponds to reducing rule 1.
+
+Because in LALR(1) parsing a single decision can be made, Wisent
+arbitrarily chose to disable the reduction, see *Note Conflicts::.
+Discarded actions are reported in between square brackets.
+
+Note that all the previous states had a single possible action: either
+shifting the next token and going to the corresponding state, or
+reducing a single rule.  In the other cases, i.e., when shifting _and_
+reducing is possible or when _several_ reductions are possible, the
+lookahead is required to select the action.  State 7 is one such state:
+if the lookahead is `*' or `/' then the action is shifting, otherwise
+the action is reducing rule 1.  In other words, the first two items,
+corresponding to rule 1, are not eligible when the lookahead is `*',
+since we specified that `*' has higher precedence that `+'.  More
+generally, some items are eligible only with some set of possible
+lookaheads.
+
+States 8 to 10 are similar:
+
+     state 8
+
+         exp  ->  exp . '+' exp   (rule 1)
+         exp  ->  exp . '-' exp   (rule 2)
+         exp  ->  exp '-' exp .   (rule 2)
+         exp  ->  exp . '*' exp   (rule 3)
+         exp  ->  exp . '/' exp   (rule 4)
+
+         '*'	shift, and go to state 5
+         '/'	shift, and go to state 6
+
+         '/'	[reduce using rule 2 (exp)]
+         $default	reduce using rule 2 (exp)
+
+
+
+     state 9
+
+         exp  ->  exp . '+' exp   (rule 1)
+         exp  ->  exp . '-' exp   (rule 2)
+         exp  ->  exp . '*' exp   (rule 3)
+         exp  ->  exp '*' exp .   (rule 3)
+         exp  ->  exp . '/' exp   (rule 4)
+
+         '/'	shift, and go to state 6
+
+         '/'	[reduce using rule 3 (exp)]
+         $default	reduce using rule 3 (exp)
+
+
+
+     state 10
+
+         exp  ->  exp . '+' exp   (rule 1)
+         exp  ->  exp . '-' exp   (rule 2)
+         exp  ->  exp . '*' exp   (rule 3)
+         exp  ->  exp . '/' exp   (rule 4)
+         exp  ->  exp '/' exp .   (rule 4)
+
+         '+'	shift, and go to state 3
+         '-'	shift, and go to state 4
+         '*'	shift, and go to state 5
+         '/'	shift, and go to state 6
+
+         '+'	[reduce using rule 4 (exp)]
+         '-'	[reduce using rule 4 (exp)]
+         '*'	[reduce using rule 4 (exp)]
+         '/'	[reduce using rule 4 (exp)]
+         $default	reduce using rule 4 (exp)
+
+Observe that state 10 contains conflicts due to the lack of precedence
+of `/' wrt `+', `-', and `*', but also because the associativity of `/'
+is not specified.
+
+Finally, the state 11 (plus 12) is named the "final state", or the
+"accepting state":
+
+     state 11
+
+         $EOI	shift, and go to state 12
+
+
+
+     state 12
+
+         $default	accept
+
+The end of input is shifted `$EOI shift,' and the parser exits
+successfully (`go to state 12', that terminates).
+
+
+File: wisent.info,  Node: Wisent Parsing,  Next: Wisent Semantic,  Prev: Wisent Grammar,  Up: Top
+
+3 Wisent Parsing
+****************
+
+The Wisent's parser is what is called a "bottom-up" or "shift-reduce"
+parser which repeatedly:
+
+"shift"
+     That is pushes the value of the last lexical token read (the
+     look-ahead token) into a value stack, and reads a new one.
+
+"reduce"
+     That is replaces a nonterminal by its semantic value.  The values
+     of the components which form the right hand side of a rule are
+     popped from the value stack and reduced by the semantic action of
+     this rule.  The result is pushed back on top of value stack.
+
+The parser will stop on:
+
+"accept"
+     When all input has been successfully parsed.  The semantic value of
+     the start nonterminal is on top of the value stack.
+
+"error"
+     When a syntax error (an unexpected token in input) has been
+     detected.  At this point the parser issues an error message and
+     either stops or calls a recovery routine to try to resume parsing.
+
+The above elementary actions are driven by the LALR(1) automaton built
+by `wisent-compile-grammar' from a context-free grammar.
+
+The Wisent's parser is entered by calling the function:
+
+ -- Function: wisent-parse automaton lexer &optional error start
+     Parse input using the automaton specified in AUTOMATON.
+
+    AUTOMATON
+          Is an LALR(1) automaton generated by `wisent-compile-grammar'
+          (*note Wisent Grammar::).
+
+    LEXER
+          Is a function with no argument called by the parser to obtain
+          the next terminal (token) in input (*note Writing a lexer::).
+
+    ERROR
+          Is an optional reporting function called when a parse error
+          occurs.  It receives a message string to report.  It defaults
+          to the function `wisent-message' (*note Report errors::).
+
+    START
+          Specify the start symbol (nonterminal) used by the parser as
+          its goal.  It defaults to the start symbol defined in the
+          grammar (*note Wisent Grammar::).
+
+The following two normal hooks permit to do some useful processing
+respectively before to start parsing, and after the parser terminated.
+
+ -- Variable: wisent-pre-parse-hook
+     Normal hook run just before entering the LR parser engine.
+
+ -- Variable: wisent-post-parse-hook
+     Normal hook run just after the LR parser engine terminated.
+
+* Menu:
+
+* Writing a lexer::
+* Actions goodies::
+* Report errors::
+* Error recovery::
+* Debugging actions::
+
+
+File: wisent.info,  Node: Writing a lexer,  Next: Actions goodies,  Up: Wisent Parsing
+
+3.1 What the parser must receive
+================================
+
+It is important to understand that the parser does not parse
+characters, but lexical tokens, and does not know anything about
+characters in text streams!
+
+Reading input data to produce lexical tokens is performed by a lexer
+(also called a scanner) in a lexical analysis step, before the syntax
+analysis step performed by the parser.  The parser automatically calls
+the lexer when it needs the next token to parse.
+
+A Wisent's lexer is an Emacs Lisp function with no argument.  It must
+return a valid lexical token of the form:
+
+`(TOKEN-CLASS VALUE [START . END])'
+
+TOKEN-CLASS
+     Is a category of lexical token identifying a terminal as specified
+     in the grammar (*note Wisent Grammar::).  It can be a symbol or a
+     character literal.
+
+VALUE
+     Is the value of the lexical token.  It can be of any valid Emacs
+     Lisp data type.
+
+START
+END
+     Are the optionals beginning and end positions of VALUE in the
+     input stream.
+
+When there are no more tokens to read the lexer must return the token
+`(list wisent-eoi-term)' to each request.
+
+ -- Variable: wisent-eoi-term
+     Predefined constant, End-Of-Input terminal symbol.
+
+`wisent-lex' is an example of a lexer that reads lexical tokens
+produced by a semantic lexer, and translates them into lexical tokens
+suitable to the Wisent parser.  See also *Note Wisent Lex::.
+
+To call the lexer in a semantic action use the function `wisent-lexer'.
+See also *Note Actions goodies::.
+
+
+File: wisent.info,  Node: Actions goodies,  Next: Report errors,  Prev: Writing a lexer,  Up: Wisent Parsing
+
+3.2 Variables and macros useful in grammar actions.
+===================================================
+
+ -- Variable: wisent-input
+     The last token read.  This variable only has meaning in the scope
+     of `wisent-parse'.
+
+ -- Function: wisent-lexer
+     Obtain the next terminal in input.
+
+ -- Function: wisent-region &rest positions
+     Return the start/end positions of the region including POSITIONS.
+     Each element of POSITIONS is a pair `(START-POS .  END-POS)' or
+     `nil'.  The returned value is the pair
+     `(MIN-START-POS . MAX-END-POS)' or `nil' if no POSITIONS are
+     available.
+
+
+File: wisent.info,  Node: Report errors,  Next: Error recovery,  Prev: Actions goodies,  Up: Wisent Parsing
+
+3.3 The error reporting function
+================================
+
+When the parser encounters a syntax error it calls a user-defined
+function.  It must be an Emacs Lisp function with one argument: a
+string containing the message to report.
+
+By default the parser uses this function to report error messages:
+
+ -- Function: wisent-message string &rest args
+     Print a one-line message if `wisent-parse-verbose-flag' is set.
+     Pass STRING and ARGS arguments to "message".
+
+*Please Note:*
+     `wisent-message' uses the following function to print lexical
+     tokens:
+
+      -- Function: wisent-token-to-string token
+          Return a printed representation of lexical token TOKEN.
+
+     The general printed form of a lexical token is:
+
+     `TOKEN(VALUE)@LOCATION'
+
+To control the verbosity of the parser you can set to non-`nil' this
+variable:
+
+ -- Option: wisent-parse-verbose-flag
+     non-`nil' means to issue more messages while parsing.
+
+Or interactively use the command:
+
+ -- Command: wisent-parse-toggle-verbose-flag
+     Toggle whether to issue more messages while parsing.
+
+When the error reporting function is entered the variable
+`wisent-input' contains the unexpected token as returned by the lexer.
+
+The error reporting function can be called from a semantic action too
+using the special macro `wisent-error'.  When called from a semantic
+action entered by error recovery (*note Error recovery::) the value of
+the variable `wisent-recovering' is non-`nil'.
+
+
+File: wisent.info,  Node: Error recovery,  Next: Debugging actions,  Prev: Report errors,  Up: Wisent Parsing
+
+3.4 Error recovery
+==================
+
+The error recovery mechanism of the Wisent's parser conforms to the one
+Bison uses.  See *Note Error Recovery: (bison)Error Recovery, in the
+Bison manual for details.
+
+To recover from a syntax error you must write rules to recognize the
+special token `error'.  This is a terminal symbol that is automatically
+defined and reserved for error handling.
+
+When the parser encounters a syntax error, it pops the state stack
+until it finds a state that allows shifting the `error' token.  After
+it has been shifted, if the old look-ahead token is not acceptable to
+be shifted next, the parser reads tokens and discards them until it
+finds a token which is acceptable.
+
+Strategies for error recovery depend on the choice of error rules in
+the grammar.  A simple and useful strategy is simply to skip the rest
+of the current statement if an error is detected:
+
+     (stmnt (( error ?; )) ;; on error, skip until ';' is read
+            )
+
+It is also useful to recover to the matching close-delimiter of an
+opening-delimiter that has already been parsed:
+
+     (primary (( ?{ expr  ?} ))
+              (( ?{ error ?} ))
+              ...
+              )
+
+Note that error recovery rules may have actions, just as any other
+rules can.  Here are some predefined hooks, variables, functions or
+macros, useful in such actions:
+
+ -- Variable: wisent-nerrs
+     The number of parse errors encountered so far.
+
+ -- Variable: wisent-recovering
+     non-`nil' means that the parser is recovering.  This variable only
+     has meaning in the scope of `wisent-parse'.
+
+ -- Function: wisent-error msg
+     Call the user supplied error reporting function with message MSG
+     (*note Report errors::).
+
+     For an example of use, *Note wisent-skip-token::.
+
+ -- Function: wisent-errok
+     Resume generating error messages immediately for subsequent syntax
+     errors.
+
+     The parser suppress error message for syntax errors that happens
+     shortly after the first, until three consecutive input tokens have
+     been successfully shifted.
+
+     Calling `wisent-errok' in an action, make error messages resume
+     immediately.  No error messages will be suppressed if you call it
+     in an error rule's action.
+
+     For an example of use, *Note wisent-skip-token::.
+
+ -- Function: wisent-clearin
+     Discard the current lookahead token.  This will cause a new
+     lexical token to be read.
+
+     In an error rule's action the previous lookahead token is
+     reanalyzed immediately.  `wisent-clearin' may be called to clear
+     this token.
+
+     For example, suppose that on a parse error, an error handling
+     routine is called that advances the input stream to some point
+     where parsing should once again commence.  The next symbol
+     returned by the lexical scanner is probably correct.  The previous
+     lookahead token ought to be discarded with `wisent-clearin'.
+
+     For an example of use, *Note wisent-skip-token::.
+
+ -- Function: wisent-abort
+     Abort parsing and save the lookahead token.
+
+ -- Function: wisent-set-region start end
+     Change the region of text matched by the current nonterminal.
+     START and END are respectively the beginning and end positions of
+     the region occupied by the group of components associated to this
+     nonterminal.  If START or END values are not a valid positions the
+     region is set to `nil'.
+
+     For an example of use, *Note wisent-skip-token::.
+
+ -- Variable: wisent-discarding-token-functions
+     List of functions to be called when discarding a lexical token.
+     These functions receive the lexical token discarded.  When the
+     parser encounters unexpected tokens, it can discards them, based
+     on what directed by error recovery rules.  Either when the parser
+     reads tokens until one is found that can be shifted, or when an
+     semantic action calls the function `wisent-skip-token' or
+     `wisent-skip-block'.  For language specific hooks, make sure you
+     define this as a local hook.
+
+     For example, in semantic, this hook is set to the function
+     `wisent-collect-unmatched-syntax' to collect unmatched lexical
+     tokens (*note Useful functions::).
+
+ -- Function: wisent-skip-token
+     Skip the lookahead token in order to resume parsing.  Return nil.
+     Must be used in error recovery semantic actions.
+
+     It typically looks like this:
+
+          (wisent-message "%s: skip %s" $action
+                          (wisent-token-to-string wisent-input))
+          (run-hook-with-args
+           'wisent-discarding-token-functions wisent-input)
+          (wisent-clearin)
+          (wisent-errok)))
+
+ -- Function: wisent-skip-block
+     Safely skip a block in order to resume parsing.  Return nil.  Must
+     be used in error recovery semantic actions.
+
+     A block is data between an open-delimiter (syntax class `(') and a
+     matching close-delimiter (syntax class `)'):
+
+          (a parenthesized block)
+          [a block between brackets]
+          {a block between braces}
+
+     The following example uses `wisent-skip-block' to safely skip a
+     block delimited by `LBRACE' (`{') and `RBRACE' (`}') tokens, when
+     a syntax error occurs in `other-components':
+
+          (block ((LBRACE other-components RBRACE))
+                 ((LBRACE RBRACE))
+                 ((LBRACE error)
+                  (wisent-skip-block))
+                 )
+
+
+File: wisent.info,  Node: Debugging actions,  Prev: Error recovery,  Up: Wisent Parsing
+
+3.5 Debugging semantic actions
+==============================
+
+Each semantic action is represented by a symbol interned in an
+"obarray" that is part of the LALR(1) automaton (*note Compiling a
+grammar::).  `symbol-function' on a semantic action symbol return the
+semantic action lambda expression.
+
+A semantic action symbol name has the form `NONTERMINAL:INDEX', where
+NONTERMINAL is the name of the nonterminal symbol the action belongs
+to, and INDEX is an action sequence number within the scope of
+NONTERMINAL.  For example, this nonterminal definition:
+
+     input:
+        line                     [`input:0']
+      | input line
+        (format "%s %s" $1 $2)   [`input:1']
+      ;
+
+Will produce two semantic actions, and associated symbols:
+
+`input:0'
+     A default action that returns `$1'.
+
+`input:1'
+     That returns `(format "%s %s" $1 $2)'.
+
+Debugging uses the Lisp debugger to investigate what is happening
+during execution of semantic actions.  Three commands are available to
+debug semantic actions.  They receive two arguments:
+
+   * The automaton that contains the semantic action.
+
+   * The semantic action symbol.
+
+ -- Command: wisent-debug-on-entry automaton function
+     Request AUTOMATON's FUNCTION to invoke debugger each time it is
+     called.  FUNCTION must be a semantic action symbol that exists in
+     AUTOMATON.
+
+ -- Command: wisent-cancel-debug-on-entry automaton function
+     Undo effect of `wisent-debug-on-entry' on AUTOMATON's FUNCTION.
+     FUNCTION must be a semantic action symbol that exists in AUTOMATON.
+
+ -- Command: wisent-debug-show-entry automaton function
+     Show the source of AUTOMATON's semantic action FUNCTION.  FUNCTION
+     must be a semantic action symbol that exists in AUTOMATON.
+
+
+File: wisent.info,  Node: Wisent Semantic,  Next: GNU Free Documentation License,  Prev: Wisent Parsing,  Up: Top
+
+4 How to use Wisent with Semantic
+*********************************
+
+This section presents how the Wisent's parser can be used to produce
+"tags" for the semantic tool set.
+
+semantic tags form a hierarchy of Emacs Lisp data structures that
+describes a program in a way independent of programming languages.
+Tags map program declarations, like functions, methods, variables, data
+types, classes, includes, grammar rules, etc..
+
+To use the Wisent parser with semantic you have to define your grammar
+in "WY" form, a grammar format very close to the one used by Bison.
+
+Please *note Semantic Grammar Framework Manual: (grammar-fw)top for
+more information on semantic grammars.
+
+* Menu:
+
+* Grammar styles::
+* Wisent Lex::
+
+
+File: wisent.info,  Node: Grammar styles,  Next: Wisent Lex,  Up: Wisent Semantic
+
+4.1 Grammar styles
+==================
+
+semantic parsing heavily depends on how you wrote the grammar.  There
+are mainly two styles to write a Wisent's grammar intended to be used
+with the semantic tool set: the "Iterative style" and the "Bison
+style".  Each one has pros and cons, and in certain cases it can be
+worth a mix of the two styles!
+
+* Menu:
+
+* Iterative style::
+* Bison style::
+* Mixed style::
+* Start nonterminals::
+* Useful functions::
+
+
+File: wisent.info,  Node: Iterative style,  Next: Bison style,  Prev: Grammar styles,  Up: Grammar styles
+
+4.1.1 Iterative style
+---------------------
+
+The "iterative style" is the preferred style to use with semantic.  It
+relies on an iterative parser back-end mechanism which parses start
+nonterminals one at a time and automagically skips unexpected lexical
+tokens in input.
+
+Compared to rule-based iterative functions (*note Bison style::),
+iterative parsers are better in that they can handle obscure errors
+more cleanly.
+
+Each start nonterminal must produces a "raw tag" by calling a
+`TAG'-like grammar macro with appropriate parameters.  See also *Note
+Start nonterminals::.
+
+Then, each parsing iteration automatically translates a raw tag into
+"expanded tags", updating the raw tag structure with internal
+properties and buffer related data.
+
+After parsing completes, it results in a tree of expanded tags.
+
+The following example is a snippet of the iterative style Java grammar
+provided in the semantic distribution in the file `wisent-java-tags.wy'.
+
+     ...
+     ;; Alternate entry points
+     ;;    - Needed by partial re-parse
+     %start formal_parameter
+     ...
+     ;;    - Needed by EXPANDFULL clauses
+     %start formal_parameters
+     ...
+
+     formal_parameter_list
+       : PAREN_BLOCK
+         (EXPANDFULL $1 formal_parameters)
+       ;
+
+     formal_parameters
+       : LPAREN
+         ()
+       | RPAREN
+         ()
+       | formal_parameter COMMA
+       | formal_parameter RPAREN
+       ;
+
+     formal_parameter
+       : formal_parameter_modifier_opt type variable_declarator_id
+         (VARIABLE-TAG $3 $2 nil :typemodifiers $1)
+       ;
+
+It shows the use of the `EXPANDFULL' grammar macro to parse a
+`PAREN_BLOCK' which contains a `formal_parameter_list'.  `EXPANDFULL'
+tells to recursively parse `formal_parameters' inside `PAREN_BLOCK'.
+The parser iterates until it digested all available input data inside
+the `PAREN_BLOCK', trying to match any of the `formal_parameters' rules:
+
+   * `LPAREN'
+
+   * `RPAREN'
+
+   * `formal_parameter COMMA'
+
+   * `formal_parameter RPAREN'
+
+At each iteration it will return a `formal_parameter' raw tag, or `nil'
+to skip unwanted (single `LPAREN' or `RPAREN' for example) or
+unexpected input data.  Those raw tags will be automatically expanded
+by the iterative back-end parser.
+
+
+File: wisent.info,  Node: Bison style,  Next: Mixed style,  Prev: Iterative style,  Up: Grammar styles
+
+4.1.2 Bison style
+-----------------
+
+What we call the "Bison style" is the traditional style of Bison's
+grammars.  Compared to iterative style, it is not straightforward to
+use grammars written in Bison style in semantic.  Mainly because such
+grammars are designed to parse the whole input data in one pass, and
+don't use the iterative parser back-end mechanism (*note Iterative
+style::).  With Bison style the parser is called once to parse the
+grammar start nonterminal.
+
+The following example is a snippet of the Bison style Java grammar
+provided in the semantic distribution in the file `wisent-java.wy'.
+
+     %start formal_parameter
+     ...
+
+     formal_parameter_list
+       : formal_parameter_list COMMA formal_parameter
+         (cons $3 $1)
+       | formal_parameter
+         (list $1)
+       ;
+
+     formal_parameter
+       : formal_parameter_modifier_opt type variable_declarator_id
+         (EXPANDTAG
+          (VARIABLE-TAG $3 $2 :typemodifiers $1)
+          )
+       ;
+
+The first consequence is that syntax errors are not automatically
+handled by semantic.  Thus, it is necessary to explicitly handle them
+at the grammar level, providing error recovery rules to skip unexpected
+input data.
+
+The second consequence is that the iterative parser can't do automatic
+tag expansion, except for the start nonterminal value.  It is necessary
+to explicitly expand tags from concerned semantic actions by calling
+the grammar macro `EXPANDTAG' with a raw tag as parameter.  See also
+*Note Start nonterminals::, for incremental re-parse considerations.
+
+
+File: wisent.info,  Node: Mixed style,  Next: Start nonterminals,  Prev: Bison style,  Up: Grammar styles
+
+4.1.3 Mixed style
+-----------------
+
+     %start grammar
+     ;; Reparse
+     %start prologue epilogue declaration nonterminal rule
+     ...
+
+     %%
+
+     grammar:
+         prologue
+       | epilogue
+       | declaration
+       | nonterminal
+       | PERCENT_PERCENT
+       ;
+     ...
+
+     nonterminal:
+         SYMBOL COLON rules SEMI
+         (TAG $1 'nonterminal :children $3)
+       ;
+
+     rules:
+         lifo_rules
+         (apply 'nconc (nreverse $1))
+       ;
+
+     lifo_rules:
+         lifo_rules OR rule
+         (cons $3 $1)
+       | rule
+         (list $1)
+       ;
+
+     rule:
+         rhs
+         (let* ((rhs $1)
+                name type comps prec action elt)
+           ...
+           (EXPANDTAG
+            (TAG name 'rule :type type :value comps :prec prec :expr action)
+            ))
+       ;
+
+This example shows how iterative and Bison styles can be combined in
+the same grammar to obtain a good compromise between grammar complexity
+and an efficient parsing strategy in an interactive environment.
+
+`nonterminal' is parsed using iterative style via the main `grammar'
+rule.  The semantic action uses the `TAG' macro to produce a raw tag,
+automagically expanded by semantic.
+
+But `rules' part is parsed in Bison style! Why?
+
+Rule delimiters are the colon (`:'), that follows the nonterminal name,
+and a final semicolon (`;').  Unfortunately these delimiters are not
+`open-paren'/`close-paren' type, and the Emacs' syntactic analyzer
+can't easily isolate data between them to produce a `RULES_PART'
+parenthesis-block-like lexical token.  Consequently it is not possible
+to use `EXPANDFULL' to iterate in `RULES_PART', like this:
+
+     nonterminal:
+         SYMBOL COLON rules SEMI
+         (TAG $1 'nonterminal :children $3)
+       ;
+
+     rules:
+         RULES_PART  ;; *Map a parenthesis-block-like lexical token*
+         (EXPANDFULL $1 'rules)
+       ;
+
+     rules:
+         COLON
+         ()
+         OR
+         ()
+         SEMI
+         ()
+         rhs
+         rhs
+         (let* ((rhs $1)
+                name type comps prec action elt)
+           ...
+           (TAG name 'rule :type type :value comps :prec prec :expr action)
+           )
+       ;
+
+In such cases, when it is difficult for Emacs to obtain
+parenthesis-block-like lexical tokens, the best solution is to use the
+traditional Bison style with error recovery!
+
+In some extreme cases, it can also be convenient to extend the lexer,
+to deliver new lexical tokens, to simplify the grammar.
+
+
+File: wisent.info,  Node: Start nonterminals,  Next: Useful functions,  Prev: Mixed style,  Up: Grammar styles
+
+4.1.4 Start nonterminals
+------------------------
+
+When you write a grammar for semantic, it is important to carefully
+indicate the start nonterminals.  Each one defines an entry point in
+the grammar, and after parsing its semantic value is returned to the
+back-end iterative engine.  Consequently:
+
+*The semantic value of a start nonterminal must be a produced by a TAG
+like grammar macro*.
+
+Start nonterminals are declared by `%start' statements.  When nothing
+is specified the first nonterminal that appears in the grammar is the
+start nonterminal.
+
+Generally, the following nonterminals must be declared as start symbols:
+
+   * The main grammar entry point
+
+          Of course!
+
+   * nonterminals passed to `EXPAND'/`EXPANDFULL'
+
+          These grammar macros recursively parse a part of input data,
+          based on rules of the given nonterminal.
+
+          For example, the following will parse `PAREN_BLOCK' data using
+          the `formal_parameters' rules:
+
+               formal_parameter_list
+                 : PAREN_BLOCK
+                   (EXPANDFULL $1 formal_parameters)
+                 ;
+
+          The semantic value of `formal_parameters' becomes the value of
+          the `EXPANDFULL' expression.  It is a list of semantic tags
+          spliced in the tags tree.
+
+          Because the automaton must know that `formal_parameters' is a
+          start symbol, you must declare it like this:
+
+               %start formal_parameters
+
+The `EXPANDFULL' macro has a side effect it is important to know,
+related to the incremental re-parse mechanism of semantic: the
+nonterminal symbol parameter passed to `EXPANDFULL' also becomes the
+`reparse-symbol' property of the tag returned by the `EXPANDFULL'
+expression.
+
+When buffer's data mapped by a tag is modified, semantic schedules an
+incremental re-parse of that data, using the tag's `reparse-symbol'
+property as start nonterminal.
+
+*The rules associated to such start symbols must be carefully reviewed
+to ensure that the incremental parser will work!*
+
+Things are a little bit different when the grammar is written in Bison
+style.
+
+*The `reparse-symbol' property is set to the nonterminal symbol the
+rule that explicitly uses `EXPANDTAG' belongs to.*
+
+For example:
+
+     rule:
+         rhs
+         (let* ((rhs $1)
+                name type comps prec action elt)
+           ...
+           (EXPANDTAG
+            (TAG name 'rule :type type :value comps :prec prec :expr action)
+            ))
+       ;
+
+Set the `reparse-symbol' property of the expanded tag to `rule'.  A
+important consequence is that:
+
+*Every nonterminal having any rule that calls `EXPANDTAG' in a semantic
+action, should be declared as a start symbol!*
+
+
+File: wisent.info,  Node: Useful functions,  Prev: Start nonterminals,  Up: Grammar styles
+
+4.1.5 Useful functions
+----------------------
+
+Here is a description of some predefined functions it might be useful
+to know when writing new code to use Wisent in semantic:
+
+ -- Function: wisent-collect-unmatched-syntax input
+     Add INPUT lexical token to the cache of unmatched tokens, in
+     variable `semantic-unmatched-syntax-cache'.
+
+     See implementation of the function `wisent-skip-token' in *Note
+     Error recovery::, for an example of use.
+
+
+File: wisent.info,  Node: Wisent Lex,  Prev: Grammar styles,  Up: Wisent Semantic
+
+4.2 The Wisent Lex lexer
+========================
+
+The lexical analysis step of semantic is performed by the general
+function `semantic-lex'.  For more information, *note
+(semantic-langdev)Writing Lexers::.
+
+`semantic-lex' produces lexical tokens of the form:
+
+     `(TOKEN-CLASS START . END)'
+
+TOKEN-CLASS
+     Is a symbol that identifies a lexical token class, like `symbol',
+     `string', `number', or `PAREN_BLOCK'.
+
+START
+END
+     Are the start and end positions of mapped data in the input buffer.
+
+The Wisent's parser doesn't depend on the nature of analyzed input
+stream (buffer, string, etc.), and requires that lexical tokens have a
+different form (*note Writing a lexer::):
+
+     `(TOKEN-CLASS VALUE [START . END])'
+
+`wisent-lex' is the default Wisent's lexer used in semantic.
+
+ -- Function: wisent-lex
+     Return the next available lexical token in Wisent's form.
+
+     The variable `wisent-lex-istream' contains the list of lexical
+     tokens produced by `semantic-lex'.  Pop the next token available
+     and convert it to a form suitable for the Wisent's parser.
+
+Mapping of lexical tokens as produced by `semantic-lex' into equivalent
+Wisent lexical tokens is straightforward:
+
+     (TOKEN-CLASS START . END)
+          => (TOKEN-CLASS VALUE START . END)
+
+VALUE is the input `buffer-substring' from START to END.
+
+
+File: wisent.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Wisent Semantic,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                        Version 1.1, March 2000
+
+     Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+     A. Use in the Title Page (and on the covers, if any) a title
+     distinct    from that of the Document, and from those of previous
+     versions    (which should, if there were any, be listed in the
+     History section    of the Document).  You may use the same title
+     as a previous version    if the original publisher of that version
+     gives permission.
+     B. List on the Title Page, as authors, one or more persons or
+     entities    responsible for authorship of the modifications in the
+     Modified    Version, together with at least five of the principal
+     authors of the    Document (all of its principal authors, if it
+     has less than five).
+     C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+     D. Preserve all the copyright notices of the Document.
+     E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+     F. Include, immediately after the copyright notices, a license
+     notice    giving the public permission to use the Modified Version
+     under the    terms of this License, in the form shown in the
+     Addendum below.
+     G. Preserve in that license notice the full lists of Invariant
+     Sections    and required Cover Texts given in the Document's
+     license notice.
+     H. Include an unaltered copy of this License.
+     I. Preserve the section entitled "History", and its title, and add
+     to    it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.
+     If    there is no section entitled "History" in the Document,
+     create one    stating the title, year, authors, and publisher of
+     the Document as    given on its Title Page, then add an item
+     describing the Modified    Version as stated in the previous
+     sentence.
+     J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and
+     likewise    the network locations given in the Document for
+     previous versions    it was based on.  These may be placed in the
+     "History" section.     You may omit a network location for a work
+     that was published at    least four years before the Document
+     itself, or if the original    publisher of the version it refers
+     to gives permission.
+     K. In any section entitled "Acknowledgements" or "Dedications",
+     preserve the section's title, and preserve in the section all the
+      substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+     L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+     M. Delete any section entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+     N. Do not retitle any existing section as "Endorsements"    or to
+     conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties-for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition
+     of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgements", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     http://www.gnu.org/copyleft/.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+If you have no Invariant Sections, write "with no Invariant
+Sections" instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
+Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+
+
+File: wisent.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* $action:                               Grammar format.      (line 184)
+* $N:                                    Grammar format.      (line 156)
+* $nterm:                                Grammar format.      (line 177)
+* $region:                               Grammar format.      (line 171)
+* $regionN:                              Grammar format.      (line 162)
+* accept:                                Wisent Parsing.      (line  21)
+* ambiguous grammar:                     Conflicts.           (line   9)
+* associativity:                         Grammar format.      (line  15)
+* automaton:                             Compiling a grammar. (line   6)
+* bottom-up parser:                      Wisent Parsing.      (line   6)
+* compiling a grammar:                   Compiling a grammar. (line  18)
+* conflicts resolution:                  Conflicts.           (line  18)
+* context-free grammar:                  Wisent Grammar.      (line   6)
+* debugging semantic actions:            Debugging actions.   (line  30)
+* deterministic automaton:               Conflicts.           (line  13)
+* error recovery:                        Error recovery.      (line   6)
+* error recovery actions:                Error recovery.      (line  35)
+* error recovery strategy:               Error recovery.      (line  20)
+* error reporting:                       Report errors.       (line   6)
+* error token:                           Error recovery.      (line  10)
+* expanded tag:                          Iterative style.     (line  19)
+* EXPANDFULL:                            Iterative style.     (line  56)
+* grammar bison style:                   Bison style.         (line   6)
+* grammar coding conventions:            Grammar format.      (line  54)
+* grammar compilation:                   Compiling a grammar. (line  16)
+* grammar conflicts:                     Conflicts.           (line  18)
+* grammar debugging:                     Grammar Debugging.   (line   6)
+* grammar example:                       Example.             (line   6)
+* grammar format:                        Grammar format.      (line   6)
+* grammar iterative style:               Iterative style.     (line   6)
+* grammar mixed style:                   Mixed style.         (line   6)
+* grammar styles:                        Grammar styles.      (line   6)
+* grammar verbose description:           Grammar Debugging.   (line   6)
+* incremental re-parse:                  Start nonterminals.  (line  46)
+* LALR(1) grammar:                       Compiling a grammar. (line  11)
+* lexer:                                 Writing a lexer.     (line  10)
+* lexical analysis:                      Writing a lexer.     (line  10)
+* lexical token mapping:                 Wisent Lex.          (line  28)
+* lexical tokens:                        Writing a lexer.     (line  15)
+* look-ahead token:                      Compiling a grammar. (line  11)
+* middle-rule actions:                   Grammar format.      (line  63)
+* nonterminal:                           Wisent Grammar.      (line  11)
+* precedence level:                      Grammar format.      (line  78)
+* raw tag:                               Iterative style.     (line  15)
+* reduce:                                Wisent Parsing.      (line  13)
+* reduce/reduce conflicts:               Conflicts.           (line  29)
+* reparse-symbol:                        Start nonterminals.  (line  46)
+* reparse-symbol property:               Start nonterminals.  (line   6)
+* rule:                                  Wisent Grammar.      (line   6)
+* scanner:                               Writing a lexer.     (line  10)
+* semantic action symbols:               Debugging actions.   (line   6)
+* semantic actions:                      Grammar format.      (line 144)
+* semantic-lex:                          Wisent Lex.          (line   6)
+* shift:                                 Wisent Parsing.      (line   9)
+* shift-reduce parser:                   Wisent Parsing.      (line   6)
+* shift/reduce conflicts:                Conflicts.           (line  20)
+* start nonterminals:                    Start nonterminals.  (line   6)
+* syntax error:                          Wisent Parsing.      (line  25)
+* table-driven parser:                   Wisent Parsing.      (line  30)
+* tags:                                  Wisent Semantic.     (line   6)
+* terminal:                              Wisent Grammar.      (line  11)
+* token:                                 Wisent Grammar.      (line  15)
+* understanding the automaton:           Understanding the automaton.
+                                                              (line   6)
+* wisent-abort:                          Error recovery.      (line  82)
+* wisent-cancel-debug-on-entry:          Debugging actions.   (line  43)
+* wisent-clearin:                        Error recovery.      (line  66)
+* wisent-collect-unmatched-syntax:       Useful functions.    (line   9)
+* wisent-compile-grammar:                Compiling a grammar. (line  18)
+* wisent-debug-flag:                     Grammar Debugging.   (line  35)
+* wisent-debug-on-entry:                 Debugging actions.   (line  38)
+* wisent-debug-show-entry:               Debugging actions.   (line  47)
+* wisent-discarding-token-functions:     Error recovery.      (line  94)
+* wisent-eoi-term:                       Writing a lexer.     (line  37)
+* wisent-errok:                          Error recovery.      (line  52)
+* wisent-error:                          Error recovery.      (line  46)
+* wisent-input:                          Actions goodies.     (line   6)
+* wisent-lex:                            Wisent Lex.          (line  30)
+* wisent-lex-istream:                    Wisent Lex.          (line  30)
+* wisent-lexer:                          Actions goodies.     (line  10)
+* wisent-message:                        Report errors.       (line  12)
+* wisent-nerrs:                          Error recovery.      (line  39)
+* wisent-parse:                          Wisent Parsing.      (line  35)
+* wisent-parse-toggle-verbose-flag:      Report errors.       (line  35)
+* wisent-parse-verbose-flag:             Report errors.       (line  30)
+* wisent-post-parse-hook:                Wisent Parsing.      (line  62)
+* wisent-pre-parse-hook:                 Wisent Parsing.      (line  59)
+* wisent-recovering:                     Error recovery.      (line  42)
+* wisent-region:                         Actions goodies.     (line  13)
+* wisent-set-region:                     Error recovery.      (line  85)
+* wisent-single-start-flag:              Compiling a grammar. (line  18)
+* wisent-skip-block:                     Error recovery.      (line 121)
+* wisent-skip-token:                     Error recovery.      (line 108)
+* wisent-toggle-verbose-flag:            Grammar Debugging.   (line  17)
+* wisent-token-to-string:                Report errors.       (line  21)
+* wisent-verbose-flag:                   Grammar Debugging.   (line  12)
+* WY grammar format:                     Wisent Semantic.     (line  14)
+
+
+
+Tag Table:
+Node: Top1335
+Node: Wisent Overview1965
+Node: Wisent Grammar4167
+Node: Grammar format5383
+Ref: action11453
+Node: Example13691
+Node: Compiling a grammar15732
+Node: Conflicts17827
+Node: Grammar Debugging19400
+Node: Understanding the automaton20756
+Node: Wisent Parsing30322
+Node: Writing a lexer32818
+Node: Actions goodies34418
+Node: Report errors35137
+Node: Error recovery36725
+Ref: wisent-skip-token41054
+Node: Debugging actions42228
+Node: Wisent Semantic44062
+Node: Grammar styles44897
+Node: Iterative style45432
+Node: Bison style47778
+Node: Mixed style49443
+Node: Start nonterminals52038
+Node: Useful functions54854
+Node: Wisent Lex55407
+Node: GNU Free Documentation License56825
+Node: Index76562
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/semantic/doc/wisent.texi b/site/cedet-1.0pre7/semantic/doc/wisent.texi
new file mode 100644
index 0000000..e4af26b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/doc/wisent.texi
@@ -0,0 +1,2054 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename wisent.info
+@set TITLE  Wisent Parser Development
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
+@settitle @value{TITLE}
+
+@c *************************************************************************
+@c @ Header
+@c *************************************************************************
+
+@c Merge all indexes into a single index for now.
+@c We can always separate them later into two or more as needed.
+@syncodeindex vr cp
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@c @footnotestyle separate
+@c @paragraphindent 2
+@c @@smallbook
+@c %**end of header
+
+@copying
+This manual documents the Wisent parser generator.
+
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2007 David Ponce
+
+Some texts are borrowed or adapted from the manual of Bison version
+1.35.  The text in section entitled ``Understanding the automaton'' is
+adapted from the section ``Understanding Your Parser'' in the manual
+of Bison version 1.49.
+
+Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
+1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being list their titles, with the Front-Cover Texts
+being list, and with the Back-Cover Texts being list.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+@ifinfo
+@dircategory Emacs
+@direntry
+* Semantic Wisent parser development: (wisent).
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+
+@c @setchapternewpage odd
+@c @setchapternewpage off
+
+@ifinfo
+This file documents Application Development with Semantic.
+@emph{Infrastructure for parser based text analysis in Emacs}
+
+Copyright @copyright{} 2001, 2002, 2003, 2004 @value{AUTHOR}
+@end ifinfo
+
+@titlepage
+@sp 10
+@title @value{TITLE}
+@author by @value{AUTHOR}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2001, 2002, 2003, 2004 @value{AUTHOR}
+@page
+@vskip 0pt plus 1 fill
+@insertcopying
+@end titlepage
+@page
+
+@c MACRO inclusion
+@include semanticheader.texi
+@paragraphindent none
+
+
+@c *************************************************************************
+@c @ Document
+@c *************************************************************************
+@contents
+
+@node top
+@top @value{TITLE}
+
+Wisent (the European Bison ;-) is an Emacs Lisp implementation of the
+GNU Compiler Compiler Bison.
+
+This manual describes how to use Wisent to develop grammars for
+programming languages, and how to use grammars to parse language
+source in Emacs buffers.
+
+It also describes how Wisent is used with the @semantic{} tool set
+described in the @ref{Top, Semantic Manual, Semantic Manual, semantic}.
+
+@menu
+* Wisent Overview::             
+* Wisent Grammar::              
+* Wisent Parsing::              
+* Wisent Semantic::             
+* GNU Free Documentation License::  
+* Index::                       
+@end menu
+
+@node Wisent Overview
+@chapter Wisent Overview
+
+@dfn{Wisent} (the European Bison) is an implementation in Emacs Lisp
+of the GNU Compiler Compiler Bison. Its code is a port of the C code
+of GNU Bison 1.28 & 1.31.
+
+For more details on the basic concepts for understanding Wisent, it is
+worthwhile to read the @ref{Top, Bison Manual, bison}.
+@ifhtml
+@uref{http://www.gnu.org/manual/bison/html_node/index.html}.
+@end ifhtml
+
+Wisent can generate compilers compatible with the @semantic{} tool set.
+See the @ref{Top, Semantic Manual, , semantic}.
+
+It benefits from these Bison features:
+
+@itemize @bullet
+@item 
+It uses a fast but not so space-efficient encoding for the parse
+tables, described in Corbett's PhD thesis from Berkeley:
+@quotation
+@cite{Static Semantics in Compiler Error Recovery}@*
+June 1985, Report No. UCB/CSD 85/251.
+@end quotation
+
+@item 
+For generating the lookahead sets, Wisent uses the well-known
+technique of F. DeRemer and A. Pennello they described in:
+@quotation
+@cite{Efficient Construction of LALR(1) Lookahead Sets}@*
+October 1982, ACM TOPLS Vol 4 No 4.
+@end quotation
+
+@item 
+Wisent resolves shift/reduce conflicts using operator precedence and
+associativity.
+
+@item 
+Parser error recovery is accomplished using rules which match the
+special token @code{error}.
+@end itemize
+
+Nevertheless there are some fundamental differences between Bison and
+Wisent.
+
+@itemize
+@item
+Wisent is intended to be used in Emacs.  It reads and produces Emacs
+Lisp data structures.  All the additional code used in grammars is
+Emacs Lisp code.
+
+@item
+Contrary to Bison, Wisent does not generate a parser which combines
+Emacs Lisp code and grammar constructs.  They exist separately.
+Wisent reads the grammar from a Lisp data structure and then generates
+grammar constructs as tables.  Afterward, the derived tables can be
+included and byte-compiled in separate Emacs Lisp files, and be used
+at a later time by the Wisent's parser engine.
+
+@item
+Wisent allows multiple start nonterminals and allows a call to the
+parsing function to be made for a particular start nonterminal.  For
+example, this is particularly useful to parse a region of an Emacs
+buffer.  @semantic{} heavily depends on the availability of this feature.
+@end itemize
+
+@node Wisent Grammar
+@chapter Wisent Grammar
+
+@cindex context-free grammar
+@cindex rule
+In order for Wisent to parse a language, it must be described by a
+@dfn{context-free grammar}.  That is a grammar specified as rules that
+can be applied regardless of context.  For more information, see
+@ref{Language and Grammar, , , bison}, in the Bison manual.
+
+@cindex terminal
+@cindex nonterminal
+The formal grammar is formulated using @dfn{terminal} and
+@dfn{nonterminal} items.  Terminals can be Emacs Lisp symbols or
+characters, and nonterminals are symbols only.
+
+@cindex token
+Terminals (also known as @dfn{tokens}) represent the lexical
+elements of the language like numbers, strings, etc..
+
+For example @samp{PLUS} can represent the operator @samp{+}.
+
+Nonterminal symbols are described by rules:
+
+@example
+@group
+RESULT @equiv{} COMPONENTS@dots{}
+@end group
+@end example
+
+@samp{RESULT} is a nonterminal that this rule describes and
+@samp{COMPONENTS} are various terminals and nonterminals that are put
+together by this rule.
+
+For example, this rule:
+
+@example
+@group
+exp @equiv{} exp PLUS exp
+@end group
+@end example
+
+Says that two groupings of type @samp{exp}, with a @samp{PLUS} token
+in between, can be combined into a larger grouping of type @samp{exp}.
+ 
+@menu
+* Grammar format::              
+* Example::                     
+* Compiling a grammar::         
+* Conflicts::                   
+@end menu
+
+@node Grammar format, Example, Wisent Grammar, Wisent Grammar
+@comment  node-name,  next,  previous,  up
+@section Grammar format
+
+@cindex grammar format
+To be acceptable by Wisent a context-free grammar must respect a
+particular format.  That is, must be represented as an Emacs Lisp list
+of the form:
+
+@code{(@var{terminals} @var{assocs} . @var{non-terminals})}
+
+@table @var
+@item terminals
+Is the list of terminal symbols used in the grammar.
+
+@cindex associativity
+@item assocs
+Specify the associativity of @var{terminals}.  It is @code{nil} when
+there is no associativity defined, or an alist of
+@w{@code{(@var{assoc-type} . @var{assoc-value})}} elements.
+
+@var{assoc-type} must be one of the @code{default-prec},
+@code{nonassoc}, @code{left} or @code{right} symbols.  When
+@var{assoc-type} is @code{default-prec}, @var{assoc-value} must be
+@code{nil} or @code{t} (the default).  Otherwise it is a list of
+tokens which must have been previously declared in @var{terminals}.
+
+For details, see @ref{Contextual Precedence, , , bison}, in the
+Bison manual.
+
+@item non-terminals
+Is the list of nonterminal definitions.  Each definition has the form:
+
+@code{(@var{nonterm} . @var{rules})}
+
+Where @var{nonterm} is the nonterminal symbol defined and
+@var{rules} the list of rules that describe this nonterminal.  Each
+rule is a list:
+
+@code{(@var{components} [@var{precedence}] [@var{action}])}
+
+Where:
+
+@table @var
+@item components
+Is a list of various terminals and nonterminals that are put together
+by this rule.
+
+For example,
+
+@example
+@group
+(exp ((exp ?+ exp))          ;; exp: exp '+' exp
+     )                       ;;    ;
+@end group
+@end example
+
+Says that two groupings of type @samp{exp}, with a @samp{+} token in
+between, can be combined into a larger grouping of type @samp{exp}.
+ 
+@cindex grammar coding conventions
+By convention, a nonterminal symbol should be in lower case, such as
+@samp{exp}, @samp{stmt} or @samp{declaration}.  Terminal symbols
+should be upper case to distinguish them from nonterminals: for
+example, @samp{INTEGER}, @samp{IDENTIFIER}, @samp{IF} or
+@samp{RETURN}.  A terminal symbol that represents a particular keyword
+in the language is conventionally the same as that keyword converted
+to upper case.  The terminal symbol @code{error} is reserved for error
+recovery.
+
+@cindex middle-rule actions
+Scattered among the components can be @dfn{middle-rule} actions.
+Usually only @var{action} is provided (@pxref{action}).
+
+If @var{components} in a rule is @code{nil}, it means that the rule
+can match the empty string.  For example, here is how to define a
+comma-separated sequence of zero or more @samp{exp} groupings:
+
+@example
+@group
+(expseq  (nil)               ;; expseq: ;; empty
+         ((expseq1))         ;;       | expseq1
+         )                   ;;       ;
+
+(expseq1 ((exp))             ;; expseq1: exp
+         ((expseq1 ?, exp))  ;;        | expseq1 ',' exp
+         )                   ;;        ;
+@end group
+@end example
+
+@cindex precedence level
+@item precedence
+Assign the rule the precedence of the given terminal item, overriding
+the precedence that would be deduced for it, that is the one of the
+last terminal in it.  Notice that only terminals declared in
+@var{assocs} have a precedence level.  The altered rule precedence
+then affects how conflicts involving that rule are resolved.
+
+@var{precedence} is an optional vector of one terminal item.
+
+Here is how @var{precedence} solves the problem of unary minus.
+First, declare a precedence for a fictitious terminal symbol named
+@code{UMINUS}.  There are no tokens of this type, but the symbol
+serves to stand for its precedence:
+
+@example
+@dots{}
+((default-prec t) ;; This is the default
+ (left '+' '-')
+ (left '*')
+ (left UMINUS))
+@end example
+
+Now the precedence of @code{UMINUS} can be used in specific rules:
+
+@example
+@group
+(exp    @dots{}                  ;; exp:    @dots{}
+         ((exp ?- exp))      ;;         | exp '-' exp
+        @dots{}                  ;;         @dots{}
+         ((?- exp) [UMINUS]) ;;         | '-' exp %prec UMINUS
+        @dots{}                  ;;         @dots{}
+        )                    ;;         ;
+@end group
+@end example
+
+If you forget to append @code{[UMINUS]} to the rule for unary minus,
+Wisent silently assumes that minus has its usual precedence.  This
+kind of problem can be tricky to debug, since one typically discovers
+the mistake only by testing the code.
+
+Using @code{(default-prec nil)} declaration makes it easier to
+discover this kind of problem systematically.  It causes rules that
+lack a @var{precedence} modifier to have no precedence, even if the
+last terminal symbol mentioned in their components has a declared
+precedence.
+
+If @code{(default-prec nil)} is in effect, you must specify
+@var{precedence} for all rules that participate in precedence conflict
+resolution.  Then you will see any shift/reduce conflict until you
+tell Wisent how to resolve it, either by changing your grammar or by
+adding an explicit precedence.  This will probably add declarations to
+the grammar, but it helps to protect against incorrect rule
+precedences.
+
+The effect of @code{(default-prec nil)} can be reversed by giving
+@code{(default-prec t)}, which is the default.
+
+For more details, see @ref{Contextual Precedence, , , bison}, in the
+Bison manual.
+
+It is important to understand that @var{assocs} declarations defines
+associativity but also assign a precedence level to terminals.  All
+terminals declared in the same @code{left}, @code{right} or
+@code{nonassoc} association get the same precedence level.  The
+precedence level is increased at each new association.
+
+On the other hand, @var{precedence} explicitly assign the precedence
+level of the given terminal to a rule.
+
+@cindex semantic actions
+@item @anchor{action}action
+An action is an optional Emacs Lisp function call, like this:
+
+@code{(identity $1)}
+
+The result of an action determines the semantic value of a rule.
+
+From an implementation standpoint, the function call will be embedded
+in a lambda expression, and several useful local variables will be
+defined:
+
+@table @code
+@vindex $N
+@item $@var{n}
+Where @var{n} is a positive integer.  Like in Bison, the value of
+@code{$@var{n}} is the semantic value of the @var{n}th element of
+@var{components}, starting from 1.  It can be of any Lisp data
+type.
+
+@vindex $region@var{n}
+@item $regionN
+Where @var{n} is a positive integer.  For each @code{$@var{n}}
+variable defined there is a corresponding @code{$region@var{n}}
+variable.  Its value is a pair @code{(@var{start-pos} .
+@var{end-pos})} that represent the start and end positions (in the
+lexical input stream) of the @code{$@var{n}} value.  It can be
+@code{nil} when the component positions are not available, like for an
+empty string component for example.
+
+@vindex $region
+@item $region
+Its value is the leftmost and rightmost positions of input data
+matched by all @var{components} in the rule.  This is a pair
+@code{(@var{leftmost-pos} .  @var{rightmost-pos})}.  It can be
+@code{nil} when components positions are not available.
+
+@vindex $nterm
+@item $nterm
+This variable is initialized with the nonterminal symbol
+(@var{nonterm}) the rule belongs to.  It could be useful to improve
+error reporting or debugging.  It is also used to automatically
+provide incremental re-parse entry points for @semantic{} tags
+(@pxref{Wisent Semantic}).
+
+@vindex $action
+@item $action
+The value of @code{$action} is the symbolic name of the current
+semantic action (@pxref{Debugging actions}).
+@end table
+
+When an action is not specified a default value is supplied, it is
+@code{(identity $1)}.  This means that the default semantic value of a
+rule is the value of its first component.  Excepted for a rule
+matching the empty string, for which the default action is to return
+@code{nil}.
+@end table
+@end table
+
+@node Example, Compiling a grammar, Grammar format, Wisent Grammar
+@comment  node-name,  next,  previous,  up
+@section Example
+
+@cindex grammar example
+Here is an example to parse simple infix arithmetic expressions.  See
+@ref{Infix Calc, , , bison}, in the Bison manual for details.
+
+@lisp
+@group
+'(
+  ;; Terminals
+  (NUM)
+  
+  ;; Terminal associativity & precedence
+  ((nonassoc ?=)
+   (left ?- ?+)
+   (left ?* ?/)
+   (left NEG)
+   (right ?^))
+  
+  ;; Rules
+  (input
+   ((line))
+   ((input line)
+    (format "%s %s" $1 $2))
+   )
+
+  (line
+   ((?;)
+    (progn ";"))
+   ((exp ?;)
+    (format "%s;" $1))
+   ((error ?;)
+    (progn "Error;")))
+   )
+
+  (exp
+   ((NUM)
+    (string-to-number $1))
+   ((exp ?= exp)
+    (= $1 $3))
+   ((exp ?+ exp)
+    (+ $1 $3))
+   ((exp ?- exp)
+    (- $1 $3))
+   ((exp ?* exp)
+    (* $1 $3))
+   ((exp ?/ exp)
+    (/ $1 $3))
+   ((?- exp) [NEG]
+    (- $2))
+   ((exp ?^ exp)
+    (expt $1 $3))
+   ((?\( exp ?\))
+    (progn $2))
+   )
+  )
+@end group
+@end lisp
+
+In the bison-like @dfn{WY} format (@pxref{Wisent Semantic}) the
+grammar looks like this:
+
+@example
+@group
+%token <number> NUM
+
+%nonassoc '=' ;; comparison
+%left '-' '+'
+%left '*' '/'
+%left NEG     ;; negation--unary minus
+%right '^'    ;; exponentiation
+
+%%
+
+input:
+    line
+  | input line
+    (format "%s %s" $1 $2)
+  ;
+
+line:
+    ';'
+    @{";"@}
+  | exp ';'
+    (format "%s;" $1)
+  | error ';'
+    @{"Error;"@}
+  ;
+
+exp:
+    NUM
+    (string-to-number $1)
+  | exp '=' exp
+    (= $1 $3)
+  | exp '+' exp
+    (+ $1 $3)
+  | exp '-' exp
+    (- $1 $3)
+  | exp '*' exp
+    (* $1 $3)
+  | exp '/' exp
+    (/ $1 $3)
+  | '-' exp %prec NEG
+    (- $2)
+  | exp '^' exp
+    (expt $1 $3)
+  | '(' exp ')'
+    @{$2@}
+  ;
+
+%%
+@end group
+@end example
+
+@node Compiling a grammar, Conflicts, Example, Wisent Grammar
+@comment  node-name,  next,  previous,  up
+@section Compiling a grammar
+
+@cindex automaton
+After providing a context-free grammar in a suitable format, it must
+be translated into a set of tables (an @dfn{automaton}) that will be
+used to derive the parser.  Like Bison, Wisent translates grammars that
+must be @dfn{LALR(1)}.
+
+@cindex LALR(1) grammar
+@cindex look-ahead token
+A grammar is @acronym{LALR(1)} if it is possible to tell how to parse
+any portion of an input string with just a single token of look-ahead:
+the @dfn{look-ahead token}.  See @ref{Language and Grammar, , ,
+bison}, in the Bison manual for more information.
+
+@cindex grammar compilation
+Grammar translation (compilation) is achieved by the function:
+
+@cindex compiling a grammar
+@vindex wisent-single-start-flag
+@findex wisent-compile-grammar
+@defun wisent-compile-grammar grammar &optional start-list
+Compile @var{grammar} and return an @acronym{LALR(1)} automaton.
+
+Optional argument @var{start-list} is a list of start symbols
+(nonterminals).  If @code{nil} the first nonterminal defined in the
+grammar is the default start symbol.  If @var{start-list} contains
+only one element, it defines the start symbol.  If @var{start-list}
+contains more than one element, all are defined as potential start
+symbols, unless @code{wisent-single-start-flag} is non-@code{nil}.  In
+that case the first element of @var{start-list} defines the start
+symbol and others are ignored.
+
+The @acronym{LALR(1)} automaton is a vector of the form:
+
+@code{[@var{actions gotos starts functions}]}
+
+@table @var
+@item actions
+A state/token matrix telling the parser what to do at every state
+based on the current look-ahead token.  That is shift, reduce, accept
+or error.  See also @ref{Wisent Parsing}.
+
+@item gotos
+A state/nonterminal matrix telling the parser the next state to go to
+after reducing with each rule.
+
+@item starts
+An alist which maps the allowed start symbols (nonterminals) to
+lexical tokens that will be first shifted into the parser stack.
+
+@item functions
+An obarray of semantic action symbols.  A semantic action is actually
+an Emacs Lisp function (lambda expression).
+@end table
+@end defun
+
+@node Conflicts, , Compiling a grammar, Wisent Grammar
+@comment  node-name,  next,  previous,  up
+@section Conflicts
+
+Normally, a grammar should produce an automaton where at each state
+the parser has only one action to do (@pxref{Wisent Parsing}).
+
+@cindex ambiguous grammar
+In certain cases, a grammar can produce an automaton where, at some
+states, there are more than one action possible.  Such a grammar is
+@dfn{ambiguous}, and generates @dfn{conflicts}.
+
+@cindex deterministic automaton
+The parser can't be driven by an automaton which isn't completely
+@dfn{deterministic}, that is which contains conflicts.  It is
+necessary to resolve the conflicts to eliminate them.  Wisent resolves
+conflicts like Bison does.
+
+@cindex grammar conflicts
+@cindex conflicts resolution
+There are two sorts of conflicts:
+
+@table @dfn
+@cindex shift/reduce conflicts
+@item shift/reduce conflicts
+When either a shift or a reduction would be valid at the same state.
+
+Such conflicts are resolved by choosing to shift, unless otherwise
+directed by operator precedence declarations.
+See @ref{Shift/Reduce , , , bison}, in the Bison manual for more
+information.
+
+@cindex reduce/reduce conflicts
+@item reduce/reduce conflicts
+That occurs if there are two or more rules that apply to the same
+sequence of input.  This usually indicates a serious error in the
+grammar.
+
+Such conflicts are resolved by choosing to use the rule that appears
+first in the grammar, but it is very risky to rely on this.  Every
+reduce/reduce conflict must be studied and usually eliminated.  See
+@ref{Reduce/Reduce , , , bison}, in the Bison manual for more
+information.
+@end table
+
+@menu
+* Grammar Debugging::           
+* Understanding the automaton::  
+@end menu
+
+@node Grammar Debugging
+@subsection Grammar debugging
+
+@cindex grammar debugging
+@cindex grammar verbose description
+To help writing a new grammar, @code{wisent-compile-grammar} can
+produce a verbose report containing a detailed description of the
+grammar and parser (equivalent to what Bison reports with the
+@option{--verbose} option).
+
+To enable the verbose report you can set to non-@code{nil} the
+variable:
+
+@vindex wisent-verbose-flag
+@deffn Option wisent-verbose-flag
+non-@code{nil} means to report verbose information on generated parser.
+@end deffn
+
+Or interactively use the command:
+
+@findex wisent-toggle-verbose-flag
+@deffn Command wisent-toggle-verbose-flag
+Toggle whether to report verbose information on generated parser.
+@end deffn
+
+The verbose report is printed in the temporary buffer
+@code{*wisent-log*} when running interactively, or in file
+@file{wisent.output} when running in batch mode.  Different
+reports are separated from each other by a line like this:
+
+@example
+@group
+*** Wisent @var{source-file} - 2002-06-27 17:33
+@end group
+@end example
+
+where @var{source-file} is the name of the Emacs Lisp file from which
+the grammar was read.  See @ref{Understanding the automaton}, for
+details on the verbose report.
+
+@table @strong
+@item Please Note
+To help debugging the grammar compiler itself, you can set this
+variable to print the content of some internal data structures:
+
+@vindex wisent-debug-flag
+@defvar wisent-debug-flag
+non-@code{nil} means enable some debug stuff.
+@end defvar
+@end table
+
+@node Understanding the automaton
+@subsection Understanding the automaton
+
+@cindex understanding the automaton
+This section (took from the manual of Bison 1.49) describes how to use
+the verbose report printed by @code{wisent-compile-grammar} to
+understand the generated automaton, to tune or fix a grammar.
+
+We will use the following example:
+
+@example
+@group
+(let ((wisent-verbose-flag t)) ;; Print a verbose report!
+  (wisent-compile-grammar
+   '((NUM STR)                          ; %token NUM STR
+
+     ((left ?+ ?-)                      ; %left '+' '-'; 
+      (left ?*))                        ; %left '*'
+
+     (exp                               ; exp:
+      ((exp ?+ exp))                    ;    exp '+' exp
+      ((exp ?- exp))                    ;  | exp '-' exp
+      ((exp ?* exp))                    ;  | exp '*' exp
+      ((exp ?/ exp))                    ;  | exp '/' exp
+      ((NUM))                           ;  | NUM
+      )                                 ;  ;
+
+     (useless                           ; useless:
+      ((STR))                           ;    STR
+      )                                 ;  ;
+     )
+   'nil)                                ; no %start declarations
+  )
+@end group
+@end example
+
+When evaluating the above expression, grammar compilation first issues
+the following two clear messages:
+
+@example
+@group
+Grammar contains 1 useless nonterminals and 1 useless rules
+Grammar contains 7 shift/reduce conflicts
+@end group
+@end example
+
+The @samp{*wisent-log*} buffer details things!
+
+The first section reports conflicts that were solved using precedence
+and/or associativity:
+
+@example
+@group
+Conflict in state 7 between rule 1 and token '+' resolved as reduce.
+Conflict in state 7 between rule 1 and token '-' resolved as reduce.
+Conflict in state 7 between rule 1 and token '*' resolved as shift.
+Conflict in state 8 between rule 2 and token '+' resolved as reduce.
+Conflict in state 8 between rule 2 and token '-' resolved as reduce.
+Conflict in state 8 between rule 2 and token '*' resolved as shift.
+Conflict in state 9 between rule 3 and token '+' resolved as reduce.
+Conflict in state 9 between rule 3 and token '-' resolved as reduce.
+Conflict in state 9 between rule 3 and token '*' resolved as reduce.
+@end group
+@end example
+
+The next section reports useless tokens, nonterminal and rules (note
+that useless tokens might be used by the scanner):
+
+@example
+@group
+Useless nonterminals:
+
+   useless
+
+
+Terminals which are not used:
+
+   STR
+
+
+Useless rules:
+
+#6     useless: STR;
+@end group
+@end example
+
+The next section lists states that still have conflicts:
+
+@example
+@group
+State 7 contains 1 shift/reduce conflict.
+State 8 contains 1 shift/reduce conflict.
+State 9 contains 1 shift/reduce conflict.
+State 10 contains 4 shift/reduce conflicts.
+@end group
+@end example
+
+The next section reproduces the grammar used:
+
+@example
+@group
+Grammar
+
+  Number, Rule
+  1       exp -> exp '+' exp
+  2       exp -> exp '-' exp
+  3       exp -> exp '*' exp
+  4       exp -> exp '/' exp
+  5       exp -> NUM
+@end group
+@end example
+
+And reports the uses of the symbols:
+
+@example
+@group
+Terminals, with rules where they appear
+
+$EOI (-1)
+error (1)
+NUM (2) 5
+STR (3) 6
+'+' (4) 1
+'-' (5) 2
+'*' (6) 3
+'/' (7) 4
+
+
+Nonterminals, with rules where they appear
+
+exp (8)
+    on left: 1 2 3 4 5, on right: 1 2 3 4
+@end group
+@end example
+
+The report then details the automaton itself, describing each state
+with it set of @dfn{items}, also known as @dfn{pointed rules}.  Each
+item is a production rule together with a point (marked by @samp{.})
+that the input cursor.
+
+@example
+@group
+state 0
+
+    NUM	shift, and go to state 1
+
+    exp	go to state 2
+@end group
+@end example
+
+State 0 corresponds to being at the very beginning of the parsing, in
+the initial rule, right before the start symbol (@samp{exp}).  When
+the parser returns to this state right after having reduced a rule
+that produced an @samp{exp}, it jumps to state 2.  If there is no such
+transition on a nonterminal symbol, and the lookahead is a @samp{NUM},
+then this token is shifted on the parse stack, and the control flow
+jumps to state 1.  Any other lookahead triggers a parse error.
+
+In the state 1...
+
+@example
+@group
+state 1
+
+    exp  ->  NUM .   (rule 5)
+
+    $default	reduce using rule 5 (exp)
+@end group
+@end example
+
+the rule 5, @samp{exp: NUM;}, is completed.  Whatever the lookahead
+(@samp{$default}), the parser will reduce it.  If it was coming from
+state 0, then, after this reduction it will return to state 0, and
+will jump to state 2 (@samp{exp: go to state 2}).
+
+@example
+@group
+state 2
+
+    exp  ->  exp . '+' exp   (rule 1)
+    exp  ->  exp . '-' exp   (rule 2)
+    exp  ->  exp . '*' exp   (rule 3)
+    exp  ->  exp . '/' exp   (rule 4)
+
+    $EOI	shift, and go to state 11
+    '+'	shift, and go to state 3
+    '-'	shift, and go to state 4
+    '*'	shift, and go to state 5
+    '/'	shift, and go to state 6
+@end group
+@end example
+
+In state 2, the automaton can only shift a symbol.  For instance,
+because of the item @samp{exp -> exp . '+' exp}, if the lookahead if
+@samp{+}, it will be shifted on the parse stack, and the automaton
+control will jump to state 3, corresponding to the item
+@samp{exp -> exp . '+' exp}:
+
+@example
+@group
+state 3
+
+    exp  ->  exp '+' . exp   (rule 1)
+
+    NUM	shift, and go to state 1
+
+    exp	go to state 7
+@end group
+@end example
+
+Since there is no default action, any other token than those listed
+above will trigger a parse error.
+
+The interpretation of states 4 to 6 is straightforward:
+
+@example
+@group
+state 4
+
+    exp  ->  exp '-' . exp   (rule 2)
+
+    NUM	shift, and go to state 1
+
+    exp	go to state 8
+
+
+
+state 5
+
+    exp  ->  exp '*' . exp   (rule 3)
+
+    NUM	shift, and go to state 1
+
+    exp	go to state 9
+
+
+
+state 6
+
+    exp  ->  exp '/' . exp   (rule 4)
+
+    NUM	shift, and go to state 1
+
+    exp	go to state 10
+@end group
+@end example
+
+As was announced in beginning of the report, @samp{State 7 contains 1
+shift/reduce conflict.}:
+
+@example
+@group
+state 7
+
+    exp  ->  exp . '+' exp   (rule 1)
+    exp  ->  exp '+' exp .   (rule 1)
+    exp  ->  exp . '-' exp   (rule 2)
+    exp  ->  exp . '*' exp   (rule 3)
+    exp  ->  exp . '/' exp   (rule 4)
+
+    '*'	shift, and go to state 5
+    '/'	shift, and go to state 6
+
+    '/'	[reduce using rule 1 (exp)]
+    $default	reduce using rule 1 (exp)
+@end group
+@end example
+
+Indeed, there are two actions associated to the lookahead @samp{/}:
+either shifting (and going to state 6), or reducing rule 1.  The
+conflict means that either the grammar is ambiguous, or the parser
+lacks information to make the right decision.  Indeed the grammar is
+ambiguous, as, since we did not specify the precedence of @samp{/},
+the sentence @samp{NUM + NUM / NUM} can be parsed as @samp{NUM + (NUM
+/ NUM)}, which corresponds to shifting @samp{/}, or as @samp{(NUM +
+NUM) / NUM}, which corresponds to reducing rule 1.
+
+Because in @acronym{LALR(1)} parsing a single decision can be made,
+Wisent arbitrarily chose to disable the reduction, see
+@ref{Conflicts}.  Discarded actions are reported in between square
+brackets.
+
+Note that all the previous states had a single possible action: either
+shifting the next token and going to the corresponding state, or
+reducing a single rule.  In the other cases, i.e., when shifting
+@emph{and} reducing is possible or when @emph{several} reductions are
+possible, the lookahead is required to select the action.  State 7 is
+one such state: if the lookahead is @samp{*} or @samp{/} then the
+action is shifting, otherwise the action is reducing rule 1.  In other
+words, the first two items, corresponding to rule 1, are not eligible
+when the lookahead is @samp{*}, since we specified that @samp{*} has
+higher precedence that @samp{+}.  More generally, some items are
+eligible only with some set of possible lookaheads.
+
+States 8 to 10 are similar:
+
+@example
+@group
+state 8
+
+    exp  ->  exp . '+' exp   (rule 1)
+    exp  ->  exp . '-' exp   (rule 2)
+    exp  ->  exp '-' exp .   (rule 2)
+    exp  ->  exp . '*' exp   (rule 3)
+    exp  ->  exp . '/' exp   (rule 4)
+
+    '*'	shift, and go to state 5
+    '/'	shift, and go to state 6
+
+    '/'	[reduce using rule 2 (exp)]
+    $default	reduce using rule 2 (exp)
+
+
+
+state 9
+
+    exp  ->  exp . '+' exp   (rule 1)
+    exp  ->  exp . '-' exp   (rule 2)
+    exp  ->  exp . '*' exp   (rule 3)
+    exp  ->  exp '*' exp .   (rule 3)
+    exp  ->  exp . '/' exp   (rule 4)
+
+    '/'	shift, and go to state 6
+
+    '/'	[reduce using rule 3 (exp)]
+    $default	reduce using rule 3 (exp)
+
+
+
+state 10
+
+    exp  ->  exp . '+' exp   (rule 1)
+    exp  ->  exp . '-' exp   (rule 2)
+    exp  ->  exp . '*' exp   (rule 3)
+    exp  ->  exp . '/' exp   (rule 4)
+    exp  ->  exp '/' exp .   (rule 4)
+
+    '+'	shift, and go to state 3
+    '-'	shift, and go to state 4
+    '*'	shift, and go to state 5
+    '/'	shift, and go to state 6
+
+    '+'	[reduce using rule 4 (exp)]
+    '-'	[reduce using rule 4 (exp)]
+    '*'	[reduce using rule 4 (exp)]
+    '/'	[reduce using rule 4 (exp)]
+    $default	reduce using rule 4 (exp)
+@end group
+@end example
+
+Observe that state 10 contains conflicts due to the lack of precedence
+of @samp{/} wrt @samp{+}, @samp{-}, and @samp{*}, but also because the
+associativity of @samp{/} is not specified.
+
+Finally, the state 11 (plus 12) is named the @dfn{final state}, or the
+@dfn{accepting state}:
+
+@example
+@group
+state 11
+
+    $EOI	shift, and go to state 12
+
+
+
+state 12
+
+    $default	accept
+@end group
+@end example
+
+The end of input is shifted @samp{$EOI shift,} and the parser exits
+successfully (@samp{go to state 12}, that terminates).
+
+@node Wisent Parsing
+@chapter Wisent Parsing
+
+@cindex bottom-up parser
+@cindex shift-reduce parser
+The Wisent's parser is what is called a @dfn{bottom-up} or
+@dfn{shift-reduce} parser which repeatedly:
+
+@table @dfn
+@cindex shift
+@item shift
+That is pushes the value of the last lexical token read (the
+look-ahead token) into a value stack, and reads a new one.
+
+@cindex reduce
+@item reduce
+That is replaces a nonterminal by its semantic value.  The values of
+the components which form the right hand side of a rule are popped
+from the value stack and reduced by the semantic action of this rule.
+The result is pushed back on top of value stack.
+@end table
+
+The parser will stop on:
+
+@table @dfn
+@cindex accept
+@item accept
+When all input has been successfully parsed.  The semantic value of
+the start nonterminal is on top of the value stack.
+
+@cindex syntax error
+@item error
+When a syntax error (an unexpected token in input) has been detected.
+At this point the parser issues an error message and either stops or
+calls a recovery routine to try to resume parsing.
+@end table
+
+@cindex table-driven parser
+The above elementary actions are driven by the @acronym{LALR(1)}
+automaton built by @code{wisent-compile-grammar} from a context-free
+grammar.
+
+The Wisent's parser is entered by calling the function:
+
+@findex wisent-parse
+@defun wisent-parse automaton lexer &optional error start
+Parse input using the automaton specified in @var{automaton}.
+
+@table @var
+@item automaton
+Is an @acronym{LALR(1)} automaton generated by
+@code{wisent-compile-grammar} (@pxref{Wisent Grammar}).
+
+@item lexer
+Is a function with no argument called by the parser to obtain the next
+terminal (token) in input (@pxref{Writing a lexer}).
+
+@item error
+Is an optional reporting function called when a parse error occurs.
+It receives a message string to report.  It defaults to the function
+@code{wisent-message} (@pxref{Report errors}).
+
+@item start
+Specify the start symbol (nonterminal) used by the parser as its goal.
+It defaults to the start symbol defined in the grammar
+(@pxref{Wisent Grammar}).
+@end table
+@end defun
+
+The following two normal hooks permit to do some useful processing
+respectively before to start parsing, and after the parser terminated.
+
+@vindex wisent-pre-parse-hook
+@defvar wisent-pre-parse-hook
+Normal hook run just before entering the @var{LR} parser engine.
+@end defvar
+
+@vindex wisent-post-parse-hook
+@defvar wisent-post-parse-hook
+Normal hook run just after the @var{LR} parser engine terminated.
+@end defvar
+
+@menu
+* Writing a lexer::             
+* Actions goodies::             
+* Report errors::               
+* Error recovery::              
+* Debugging actions::           
+@end menu
+
+@node Writing a lexer
+@section What the parser must receive
+
+It is important to understand that the parser does not parse
+characters, but lexical tokens, and does not know anything about
+characters in text streams!
+
+@cindex lexical analysis
+@cindex lexer
+@cindex scanner
+Reading input data to produce lexical tokens is performed by a lexer
+(also called a scanner) in a lexical analysis step, before the syntax
+analysis step performed by the parser.  The parser automatically calls
+the lexer when it needs the next token to parse.
+
+@cindex lexical tokens
+A Wisent's lexer is an Emacs Lisp function with no argument.  It must
+return a valid lexical token of the form:
+
+@code{(@var{token-class value} [@var{start} . @var{end}])}
+
+@table @var
+@item token-class
+Is a category of lexical token identifying a terminal as specified in
+the grammar (@pxref{Wisent Grammar}).  It can be a symbol or a character
+literal.
+
+@item value
+Is the value of the lexical token.  It can be of any valid Emacs Lisp
+data type.
+
+@item start
+@itemx end
+Are the optionals beginning and end positions of @var{value} in the
+input stream.
+@end table
+
+When there are no more tokens to read the lexer must return the token
+@code{(list wisent-eoi-term)} to each request.
+
+@vindex wisent-eoi-term
+@defvar wisent-eoi-term
+Predefined constant, End-Of-Input terminal symbol.
+@end defvar
+
+@code{wisent-lex} is an example of a lexer that reads lexical tokens
+produced by a @semantic{} lexer, and translates them into lexical tokens
+suitable to the Wisent parser.  See also @ref{Wisent Lex}.
+
+To call the lexer in a semantic action use the function
+@code{wisent-lexer}.  See also @ref{Actions goodies}.
+
+@node Actions goodies
+@section Variables and macros useful in grammar actions.
+
+@vindex wisent-input
+@defvar wisent-input
+The last token read.
+This variable only has meaning in the scope of @code{wisent-parse}.
+@end defvar
+
+@findex wisent-lexer
+@defun wisent-lexer
+Obtain the next terminal in input.
+@end defun
+
+@findex wisent-region
+@defun wisent-region &rest positions
+Return the start/end positions of the region including
+@var{positions}.  Each element of @var{positions} is a pair
+@w{@code{(@var{start-pos} .  @var{end-pos})}} or @code{nil}.  The
+returned value is the pair @w{@code{(@var{min-start-pos} .
+@var{max-end-pos})}} or @code{nil} if no @var{positions} are
+available.
+@end defun
+
+@node Report errors
+@section The error reporting function
+
+@cindex error reporting
+When the parser encounters a syntax error it calls a user-defined
+function.  It must be an Emacs Lisp function with one argument: a
+string containing the message to report.
+
+By default the parser uses this function to report error messages:
+
+@findex wisent-message
+@defun wisent-message string &rest args
+Print a one-line message if @code{wisent-parse-verbose-flag} is set.
+Pass @var{string} and @var{args} arguments to @dfn{message}.
+@end defun
+
+@table @strong
+@item Please Note:
+@code{wisent-message} uses the following function to print lexical
+tokens:
+
+@defun wisent-token-to-string token
+Return a printed representation of lexical token @var{token}.
+@end defun
+
+The general printed form of a lexical token is:
+
+@w{@code{@var{token}(@var{value})@@@var{location}}}
+@end table
+
+To control the verbosity of the parser you can set to non-@code{nil}
+this variable:
+
+@vindex wisent-parse-verbose-flag
+@deffn Option wisent-parse-verbose-flag
+non-@code{nil} means to issue more messages while parsing.
+@end deffn
+
+Or interactively use the command:
+
+@findex wisent-parse-toggle-verbose-flag
+@deffn Command wisent-parse-toggle-verbose-flag
+Toggle whether to issue more messages while parsing.
+@end deffn
+
+When the error reporting function is entered the variable
+@code{wisent-input} contains the unexpected token as returned by the
+lexer.
+
+The error reporting function can be called from a semantic action too
+using the special macro @code{wisent-error}.  When called from a
+semantic action entered by error recovery (@pxref{Error recovery}) the
+value of the variable @code{wisent-recovering} is non-@code{nil}.
+
+@node Error recovery
+@section Error recovery
+
+@cindex error recovery
+The error recovery mechanism of the Wisent's parser conforms to the
+one Bison uses.  See @ref{Error Recovery, , , bison}, in the Bison
+manual for details.
+
+@cindex error token
+To recover from a syntax error you must write rules to recognize the
+special token @code{error}.  This is a terminal symbol that is
+automatically defined and reserved for error handling.
+
+When the parser encounters a syntax error, it pops the state stack
+until it finds a state that allows shifting the @code{error} token.
+After it has been shifted, if the old look-ahead token is not
+acceptable to be shifted next, the parser reads tokens and discards
+them until it finds a token which is acceptable.
+
+@cindex error recovery strategy
+Strategies for error recovery depend on the choice of error rules in
+the grammar.  A simple and useful strategy is simply to skip the rest
+of the current statement if an error is detected:
+
+@example
+@group
+(stmnt (( error ?; )) ;; on error, skip until ';' is read
+       )
+@end group
+@end example
+
+It is also useful to recover to the matching close-delimiter of an
+opening-delimiter that has already been parsed:
+
+@example
+@group
+(primary (( ?@{ expr  ?@} ))
+         (( ?@{ error ?@} ))
+         @dots{}
+         )
+@end group
+@end example
+
+@cindex error recovery actions
+Note that error recovery rules may have actions, just as any other
+rules can.  Here are some predefined hooks, variables, functions or
+macros, useful in such actions:
+
+@vindex wisent-nerrs
+@defvar wisent-nerrs
+The number of parse errors encountered so far.
+@end defvar
+
+@vindex wisent-recovering
+@defvar wisent-recovering
+non-@code{nil} means that the parser is recovering.
+This variable only has meaning in the scope of @code{wisent-parse}.
+@end defvar
+
+@findex wisent-error
+@defun wisent-error msg
+Call the user supplied error reporting function with message
+@var{msg} (@pxref{Report errors}).
+
+For an example of use, @xref{wisent-skip-token}.
+@end defun
+
+@findex wisent-errok
+@defun wisent-errok
+Resume generating error messages immediately for subsequent syntax
+errors.
+
+The parser suppress error message for syntax errors that happens
+shortly after the first, until three consecutive input tokens have
+been successfully shifted.
+
+Calling @code{wisent-errok} in an action, make error messages resume
+immediately.  No error messages will be suppressed if you call it in
+an error rule's action.
+
+For an example of use, @xref{wisent-skip-token}.
+@end defun
+
+@findex wisent-clearin
+@defun wisent-clearin
+Discard the current lookahead token.
+This will cause a new lexical token to be read.
+
+In an error rule's action the previous lookahead token is reanalyzed
+immediately.  @code{wisent-clearin} may be called to clear this token.
+
+For example, suppose that on a parse error, an error handling routine
+is called that advances the input stream to some point where parsing
+should once again commence.  The next symbol returned by the lexical
+scanner is probably correct.  The previous lookahead token ought to
+be discarded with @code{wisent-clearin}.
+
+For an example of use, @xref{wisent-skip-token}.
+@end defun
+
+@findex wisent-abort
+@defun wisent-abort
+Abort parsing and save the lookahead token.
+@end defun
+
+@findex wisent-set-region
+@defun wisent-set-region start end
+Change the region of text matched by the current nonterminal.
+@var{start} and @var{end} are respectively the beginning and end
+positions of the region occupied by the group of components associated
+to this nonterminal.  If @var{start} or @var{end} values are not a
+valid positions the region is set to @code{nil}.
+
+For an example of use, @xref{wisent-skip-token}.
+@end defun
+
+@vindex wisent-discarding-token-functions
+@defvar wisent-discarding-token-functions
+List of functions to be called when discarding a lexical token.
+These functions receive the lexical token discarded.
+When the parser encounters unexpected tokens, it can discards them,
+based on what directed by error recovery rules.  Either when the
+parser reads tokens until one is found that can be shifted, or when an
+semantic action calls the function @code{wisent-skip-token} or
+@code{wisent-skip-block}.
+For language specific hooks, make sure you define this as a local
+hook.
+
+For example, in @semantic{}, this hook is set to the function
+@code{wisent-collect-unmatched-syntax} to collect unmatched lexical
+tokens (@pxref{Useful functions}).
+@end defvar
+
+@findex wisent-skip-token
+@defun wisent-skip-token
+@anchor{wisent-skip-token}
+Skip the lookahead token in order to resume parsing.
+Return nil.
+Must be used in error recovery semantic actions.
+
+It typically looks like this:
+
+@lisp
+@group
+(wisent-message "%s: skip %s" $action
+                (wisent-token-to-string wisent-input))
+(run-hook-with-args
+ 'wisent-discarding-token-functions wisent-input)
+(wisent-clearin)
+(wisent-errok)))
+@end group
+@end lisp
+@end defun
+
+@findex wisent-skip-block
+@defun wisent-skip-block
+Safely skip a block in order to resume parsing.
+Return nil.
+Must be used in error recovery semantic actions.
+
+A block is data between an open-delimiter (syntax class @code{(}) and
+a matching close-delimiter (syntax class @code{)}):
+
+@example
+@group
+(a parenthesized block)
+[a block between brackets]
+@{a block between braces@}
+@end group
+@end example
+
+The following example uses @code{wisent-skip-block} to safely skip a
+block delimited by @samp{LBRACE} (@code{@{}) and @samp{RBRACE}
+(@code{@}}) tokens, when a syntax error occurs in
+@samp{other-components}:
+
+@example
+@group
+(block ((LBRACE other-components RBRACE))
+       ((LBRACE RBRACE))
+       ((LBRACE error)
+        (wisent-skip-block))
+       )
+@end group
+@end example
+@end defun
+
+@node Debugging actions
+@section Debugging semantic actions
+
+@cindex semantic action symbols
+Each semantic action is represented by a symbol interned in an
+@dfn{obarray} that is part of the @acronym{LALR(1)} automaton
+(@pxref{Compiling a grammar}).  @code{symbol-function} on a semantic
+action symbol return the semantic action lambda expression.
+
+A semantic action symbol name has the form
+@code{@var{nonterminal}:@var{index}}, where @var{nonterminal} is the
+name of the nonterminal symbol the action belongs to, and @var{index}
+is an action sequence number within the scope of @var{nonterminal}.
+For example, this nonterminal definition:
+
+@example
+@group
+input:
+   line                     [@code{input:0}]
+ | input line
+   (format "%s %s" $1 $2)   [@code{input:1}]
+ ;
+@end group
+@end example
+
+Will produce two semantic actions, and associated symbols:
+
+@table @code
+@item input:0
+A default action that returns @code{$1}.
+
+@item input:1
+That returns @code{(format "%s %s" $1 $2)}.
+@end table
+
+@cindex debugging semantic actions
+Debugging uses the Lisp debugger to investigate what is happening
+during execution of semantic actions.
+Three commands are available to debug semantic actions.  They receive
+two arguments:
+
+@itemize @bullet
+@item The automaton that contains the semantic action.
+
+@item The semantic action symbol.
+@end itemize
+
+@findex wisent-debug-on-entry
+@deffn Command wisent-debug-on-entry automaton function
+Request @var{automaton}'s @var{function} to invoke debugger each time it is called.
+@var{function} must be a semantic action symbol that exists in @var{automaton}.
+@end deffn
+
+@findex wisent-cancel-debug-on-entry
+@deffn Command wisent-cancel-debug-on-entry automaton function
+Undo effect of @code{wisent-debug-on-entry} on @var{automaton}'s @var{function}.
+@var{function} must be a semantic action symbol that exists in @var{automaton}.
+@end deffn
+
+@findex wisent-debug-show-entry
+@deffn Command wisent-debug-show-entry automaton function
+Show the source of @var{automaton}'s semantic action @var{function}.
+@var{function} must be a semantic action symbol that exists in @var{automaton}.
+@end deffn
+
+@node Wisent Semantic
+@chapter How to use Wisent with Semantic
+
+@cindex tags
+This section presents how the Wisent's parser can be used to produce
+@dfn{tags} for the @semantic{} tool set.
+
+@semantic{} tags form a hierarchy of Emacs Lisp data structures that
+describes a program in a way independent of programming languages.
+Tags map program declarations, like functions, methods, variables,
+data types, classes, includes, grammar rules, etc..
+
+@cindex WY grammar format
+To use the Wisent parser with @semantic{} you have to define
+your grammar in @dfn{WY} form, a grammar format very close
+to the one used by Bison.
+
+Please @inforef{top, Semantic Grammar Framework Manual, grammar-fw}
+for more information on @semantic{} grammars.
+
+@menu
+* Grammar styles::              
+* Wisent Lex::                  
+@end menu
+
+@node Grammar styles
+@section Grammar styles
+
+@cindex grammar styles
+@semantic{} parsing heavily depends on how you wrote the grammar.
+There are mainly two styles to write a Wisent's grammar intended to be
+used with the @semantic{} tool set: the @dfn{Iterative style} and the
+@dfn{Bison style}.  Each one has pros and cons, and in certain cases
+it can be worth a mix of the two styles!
+
+@menu
+* Iterative style::             
+* Bison style::                 
+* Mixed style::                 
+* Start nonterminals::          
+* Useful functions::            
+@end menu
+
+@node Iterative style, Bison style, Grammar styles, Grammar styles
+@subsection Iterative style
+
+@cindex grammar iterative style
+The @dfn{iterative style} is the preferred style to use with @semantic{}.
+It relies on an iterative parser back-end mechanism which parses start
+nonterminals one at a time and automagically skips unexpected lexical
+tokens in input.
+
+Compared to rule-based iterative functions (@pxref{Bison style}),
+iterative parsers are better in that they can handle obscure errors
+more cleanly.
+
+@cindex raw tag
+Each start nonterminal must produces a @dfn{raw tag} by calling a
+@code{TAG}-like grammar macro with appropriate parameters.  See also
+@ref{Start nonterminals}.
+
+@cindex expanded tag
+Then, each parsing iteration automatically translates a raw tag into
+@dfn{expanded tags}, updating the raw tag structure with internal
+properties and buffer related data.
+
+After parsing completes, it results in a tree of expanded tags.
+
+The following example is a snippet of the iterative style Java grammar
+provided in the @semantic{} distribution in the file
+@file{wisent-java-tags.wy}.
+
+@example
+@group
+@dots{}
+;; Alternate entry points
+;;    - Needed by partial re-parse
+%start formal_parameter
+@dots{}
+;;    - Needed by EXPANDFULL clauses
+%start formal_parameters
+@dots{}
+
+formal_parameter_list
+  : PAREN_BLOCK
+    (EXPANDFULL $1 formal_parameters)
+  ;
+
+formal_parameters
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | formal_parameter COMMA
+  | formal_parameter RPAREN
+  ;
+
+formal_parameter
+  : formal_parameter_modifier_opt type variable_declarator_id
+    (VARIABLE-TAG $3 $2 nil :typemodifiers $1)
+  ;
+@end group
+@end example
+
+@findex EXPANDFULL
+It shows the use of the @code{EXPANDFULL} grammar macro to parse a
+@samp{PAREN_BLOCK} which contains a @samp{formal_parameter_list}.
+@code{EXPANDFULL} tells to recursively parse @samp{formal_parameters}
+inside @samp{PAREN_BLOCK}.  The parser iterates until it digested all
+available input data inside the @samp{PAREN_BLOCK}, trying to match
+any of the @samp{formal_parameters} rules:
+
+@itemize
+@item @samp{LPAREN}
+
+@item @samp{RPAREN}
+
+@item @samp{formal_parameter COMMA}
+
+@item @samp{formal_parameter RPAREN}
+@end itemize
+
+At each iteration it will return a @samp{formal_parameter} raw tag,
+or @code{nil} to skip unwanted (single @samp{LPAREN} or @samp{RPAREN}
+for example) or unexpected input data.  Those raw tags will be
+automatically expanded by the iterative back-end parser.
+
+@node Bison style
+@subsection Bison style
+
+@cindex grammar bison style
+What we call the @dfn{Bison style} is the traditional style of Bison's
+grammars.  Compared to iterative style, it is not straightforward to
+use grammars written in Bison style in @semantic{}.  Mainly because such
+grammars are designed to parse the whole input data in one pass, and
+don't use the iterative parser back-end mechanism (@pxref{Iterative
+style}).  With Bison style the parser is called once to parse the
+grammar start nonterminal.
+
+The following example is a snippet of the Bison style Java grammar
+provided in the @semantic{} distribution in the file
+@file{wisent-java.wy}.
+
+@example
+@group
+%start formal_parameter
+@dots{}
+
+formal_parameter_list
+  : formal_parameter_list COMMA formal_parameter
+    (cons $3 $1)
+  | formal_parameter
+    (list $1)
+  ;
+
+formal_parameter
+  : formal_parameter_modifier_opt type variable_declarator_id
+    (EXPANDTAG
+     (VARIABLE-TAG $3 $2 :typemodifiers $1)
+     )
+  ;
+@end group
+@end example
+
+The first consequence is that syntax errors are not automatically
+handled by @semantic{}.  Thus, it is necessary to explicitly handle
+them at the grammar level, providing error recovery rules to skip
+unexpected input data.
+
+The second consequence is that the iterative parser can't do automatic
+tag expansion, except for the start nonterminal value.  It is
+necessary to explicitly expand tags from concerned semantic actions by
+calling the grammar macro @code{EXPANDTAG} with a raw tag as
+parameter.  See also @ref{Start nonterminals}, for incremental
+re-parse considerations.
+
+@node Mixed style
+@subsection Mixed style
+
+@cindex grammar mixed style
+@example
+@group
+%start grammar
+;; Reparse
+%start prologue epilogue declaration nonterminal rule
+@dots{}
+
+%%
+
+grammar:
+    prologue
+  | epilogue
+  | declaration
+  | nonterminal
+  | PERCENT_PERCENT
+  ;
+@dots{}
+
+nonterminal:
+    SYMBOL COLON rules SEMI
+    (TAG $1 'nonterminal :children $3)
+  ;
+
+rules:
+    lifo_rules
+    (apply 'nconc (nreverse $1))
+  ;
+
+lifo_rules:
+    lifo_rules OR rule
+    (cons $3 $1)
+  | rule
+    (list $1)
+  ;
+
+rule:
+    rhs
+    (let* ((rhs $1)
+           name type comps prec action elt)
+      @dots{}
+      (EXPANDTAG
+       (TAG name 'rule :type type :value comps :prec prec :expr action)
+       ))
+  ;
+@end group
+@end example
+
+This example shows how iterative and Bison styles can be combined in
+the same grammar to obtain a good compromise between grammar
+complexity and an efficient parsing strategy in an interactive
+environment.
+
+@samp{nonterminal} is parsed using iterative style via the main
+@samp{grammar} rule.  The semantic action uses the @code{TAG} macro to
+produce a raw tag, automagically expanded by @semantic{}.
+
+But @samp{rules} part is parsed in Bison style! Why?
+
+Rule delimiters are the colon (@code{:}), that follows the nonterminal
+name, and a final semicolon (@code{;}).  Unfortunately these
+delimiters are not @code{open-paren}/@code{close-paren} type, and the
+Emacs' syntactic analyzer can't easily isolate data between them to
+produce a @samp{RULES_PART} parenthesis-block-like lexical token.
+Consequently it is not possible to use @code{EXPANDFULL} to iterate in
+@samp{RULES_PART}, like this:
+
+@example
+@group
+nonterminal:
+    SYMBOL COLON rules SEMI
+    (TAG $1 'nonterminal :children $3)
+  ;
+
+rules:
+    RULES_PART  ;; @strong{Map a parenthesis-block-like lexical token}
+    (EXPANDFULL $1 'rules)
+  ;
+
+rules:
+    COLON
+    ()
+    OR
+    ()
+    SEMI
+    ()
+    rhs
+    rhs
+    (let* ((rhs $1)
+           name type comps prec action elt)
+      @dots{}
+      (TAG name 'rule :type type :value comps :prec prec :expr action)
+      )
+  ;
+@end group
+@end example
+
+In such cases, when it is difficult for Emacs to obtain
+parenthesis-block-like lexical tokens, the best solution is to use the
+traditional Bison style with error recovery!
+
+In some extreme cases, it can also be convenient to extend the lexer,
+to deliver new lexical tokens, to simplify the grammar.
+
+@node Start nonterminals
+@subsection Start nonterminals
+
+@cindex start nonterminals
+@cindex @code{reparse-symbol} property
+When you write a grammar for @semantic{}, it is important to carefully
+indicate the start nonterminals.  Each one defines an entry point in
+the grammar, and after parsing its semantic value is returned to the
+back-end iterative engine.  Consequently:
+
+@strong{The semantic value of a start nonterminal must be a produced
+by a TAG like grammar macro}.
+
+Start nonterminals are declared by @code{%start} statements.  When
+nothing is specified the first nonterminal that appears in the grammar
+is the start nonterminal.
+
+Generally, the following nonterminals must be declared as start
+symbols:
+
+@itemize @bullet
+@item The main grammar entry point
+@quotation
+Of course!
+@end quotation
+
+@item nonterminals passed to @code{EXPAND}/@code{EXPANDFULL}
+@quotation
+These grammar macros recursively parse a part of input data, based on
+rules of the given nonterminal.
+
+For example, the following will parse @samp{PAREN_BLOCK} data using
+the @samp{formal_parameters} rules:
+
+@example
+@group
+formal_parameter_list
+  : PAREN_BLOCK
+    (EXPANDFULL $1 formal_parameters)
+  ;
+@end group
+@end example
+
+The semantic value of @samp{formal_parameters} becomes the value of
+the @code{EXPANDFULL} expression.  It is a list of @semantic{} tags
+spliced in the tags tree.
+
+Because the automaton must know that @samp{formal_parameters} is a
+start symbol, you must declare it like this:
+
+@example
+@group
+%start formal_parameters
+@end group
+@end example
+@end quotation
+@end itemize
+
+@cindex incremental re-parse
+@cindex reparse-symbol
+The @code{EXPANDFULL} macro has a side effect it is important to know,
+related to the incremental re-parse mechanism of @semantic{}: the
+nonterminal symbol parameter passed to @code{EXPANDFULL} also becomes
+the @code{reparse-symbol} property of the tag returned by the
+@code{EXPANDFULL} expression.
+
+When buffer's data mapped by a tag is modified, @semantic{}
+schedules an incremental re-parse of that data, using the tag's
+@code{reparse-symbol} property as start nonterminal.
+
+@strong{The rules associated to such start symbols must be carefully
+reviewed to ensure that the incremental parser will work!}
+
+Things are a little bit different when the grammar is written in Bison
+style.  
+
+@strong{The @code{reparse-symbol} property is set to the nonterminal
+symbol the rule that explicitly uses @code{EXPANDTAG} belongs to.}
+
+For example:
+
+@example
+@group
+rule:
+    rhs
+    (let* ((rhs $1)
+           name type comps prec action elt)
+      @dots{}
+      (EXPANDTAG
+       (TAG name 'rule :type type :value comps :prec prec :expr action)
+       ))
+  ;
+@end group
+@end example
+
+Set the @code{reparse-symbol} property of the expanded tag to
+@samp{rule}.  A important consequence is that:
+
+@strong{Every nonterminal having any rule that calls @code{EXPANDTAG}
+in a semantic action, should be declared as a start symbol!}
+
+@node Useful functions
+@subsection Useful functions
+
+Here is a description of some predefined functions it might be useful
+to know when writing new code to use Wisent in @semantic{}:
+
+@findex wisent-collect-unmatched-syntax
+@defun wisent-collect-unmatched-syntax input
+Add @var{input} lexical token to the cache of unmatched tokens, in
+variable @code{semantic-unmatched-syntax-cache}.
+
+See implementation of the function @code{wisent-skip-token} in
+@ref{Error recovery}, for an example of use.
+@end defun
+
+@node Wisent Lex
+@section The Wisent Lex lexer
+
+@findex semantic-lex
+The lexical analysis step of @semantic{} is performed by the general
+function @code{semantic-lex}.  For more information, @inforef{Writing
+Lexers, ,semantic-langdev}.
+
+@code{semantic-lex} produces lexical tokens of the form:
+
+@example
+@group
+@code{(@var{token-class start} . @var{end})}
+@end group
+@end example
+
+@table @var
+@item token-class
+Is a symbol that identifies a lexical token class, like @code{symbol},
+@code{string}, @code{number}, or @code{PAREN_BLOCK}.
+
+@item start
+@itemx end
+Are the start and end positions of mapped data in the input buffer.
+@end table
+ 
+The Wisent's parser doesn't depend on the nature of analyzed input
+stream (buffer, string, etc.), and requires that lexical tokens have a
+different form (@pxref{Writing a lexer}):
+
+@example
+@group
+@code{(@var{token-class value} [@var{start} . @var{end}])}
+@end group
+@end example
+
+@cindex lexical token mapping
+@code{wisent-lex} is the default Wisent's lexer used in @semantic{}.
+
+@vindex wisent-lex-istream
+@findex wisent-lex
+@defun wisent-lex
+Return the next available lexical token in Wisent's form.
+
+The variable @code{wisent-lex-istream} contains the list of lexical
+tokens produced by @code{semantic-lex}.  Pop the next token available
+and convert it to a form suitable for the Wisent's parser.
+@end defun
+
+Mapping of lexical tokens as produced by @code{semantic-lex} into
+equivalent Wisent lexical tokens is straightforward:
+
+@example
+@group
+(@var{token-class start} . @var{end})
+     @result{} (@var{token-class value start} . @var{end})
+@end group
+@end example
+
+@var{value} is the input @code{buffer-substring} from @var{start} to
+@var{end}.
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
+@node Index
+@unnumbered Index
+@printindex cp
+
+@iftex
+@contents
+@summarycontents
+@end iftex
+
+@bye
+
+@c Following comments are for the benefit of ispell.
+
+@c  LocalWords:  Wisent automagically wisent Wisent's LALR obarray
diff --git a/site/cedet-1.0pre7/semantic/renamelist.txt b/site/cedet-1.0pre7/semantic/renamelist.txt
new file mode 100644
index 0000000..ba70fd9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/renamelist.txt
@@ -0,0 +1,186 @@
+## Completely obsolete functions
+semanticdb-find-nonterminal-by-token
+semanticdb-find-nonterminal-by-name
+semanticdb-find-nonterminal-by-name-regexp
+semanticdb-find-nonterminal-by-type
+semanticdb-find-nonterminal-by-property
+semanticdb-find-nonterminal-by-extra-spec
+semanticdb-find-nonterminal-by-extra-spec-value
+
+## Functions and variables that have new named equivalents.
+semantic-highlight-token	semantic-highlight-tag
+semantic-unhighlight-token	semantic-unhighlight-tag
+semantic-momentary-unhighlight-token	semantic-momentary-unhighlight-tag
+semantic-momentary-highlight-token	semantic-momentary-highlight-tag
+semantic-set-token-face	semantic-set-tag-face
+semantic-set-token-invisible	semantic-set-tag-invisible
+semantic-token-invisible-p	semantic-tag-invisible-p
+semantic-set-token-intangible	semantic-set-tag-intangible
+semantic-token-intangible-p	semantic-tag-intangible-p
+semantic-set-token-read-only	semantic-set-tag-read-only
+semantic-token-read-only-p	semantic-tag-read-only-p
+semantic-find-documentation	semantic-documentation-for-tag
+semantic-toplevel-bovine-table	semantic--parse-table
+semantic-toplevel-bovine-cache	semantic--buffer-cache
+semantic-before-toplevel-bovination-hook	semantic--before-fetch-tags-hook
+semantic-bovination-working-type	semantic-working-type
+semantic-bovinate-toplevel	semantic-fetch-tags
+semantic-bovinate-region-until-error	semantic-parse-region
+semantic-bovinate-from-nonterminal-full	semantic-parse-region
+semantic-find-nonterminal-by-overlay	semantic-find-tag-by-overlay
+semantic-find-nonterminal-by-overlay-in-region	semantic-find-tag-by-overlay-in-region
+semantic-find-nonterminal-by-overlay-next	semantic-find-tag-by-overlay-next
+semantic-find-nonterminal-by-overlay-prev	semantic-find-tag-by-overlay-prev
+semantic-find-nonterminal-parent-by-overlay	semantic-find-tag-parent-by-overlay
+semantic-current-nonterminal	semantic-current-tag
+semantic-current-nonterminal-parent	semantic-current-tag-parent
+semantic-current-nonterminal-of-type	semantic-current-tag-of-class
+semantic-find-nonterminal-by-name	semantic-brute-find-first-tag-by-name
+semantic-find-nonterminal-by-token	semantic-brute-find-tag-by-class
+semantic-find-nonterminal-standard	semantic-brute-find-tag-standard
+semantic-find-nonterminal-by-type	semantic-brute-find-tag-by-type
+semantic-find-nonterminal-by-type-regexp	semantic-brute-find-tag-by-type-regexp
+semantic-find-nonterminal-by-name-regexp	semantic-brute-find-tag-by-name-regexp
+semantic-find-nonterminal-by-property	semantic-brute-find-tag-by-property
+semantic-find-nonterminal-by-extra-spec	semantic-brute-find-tag-by-attribute
+semantic-find-nonterminal-by-extra-spec-value	semantic-brute-find-tag-by-attribute-value
+semantic-find-nonterminal-by-function	semantic-brute-find-tag-by-function
+semantic-find-nonterminal-by-function-first-match	semantic-brute-find-first-tag-by-function
+semantic-find-nonterminal-by-position	semantic-brute-find-tag-by-position
+semantic-find-innermost-nonterminal-by-position	semantic-brute-find-innermost-tag-by-position
+semantic-token->text-functions	semantic-format-tag-functions
+semantic-token->text-custom-list	semantic-format-tag-custom-list
+semantic-face-alist	semantic-format-face-alist
+semantic-colorize-text	semantic--format-colorize-text
+semantic-test-all-token->text-functions	semantic-test-all-format-tag-functions
+semantic-prin1-nonterminal	semantic-format-tag-prin1
+semantic-name-nonterminal	semantic-format-tag-name
+semantic-abbreviate-nonterminal	semantic-format-tag-abbreviate
+semantic-summarize-nonterminal	semantic-format-tag-summarize
+semantic-prototype-nonterminal	semantic-format-tag-prototype
+semantic-concise-prototype-nonterminal	semantic-format-tag-concise-prototype
+semantic-uml-abbreviate-nonterminal	semantic-format-tag-uml-abbreviate
+semantic-uml-prototype-nonterminal	semantic-format-tag-uml-prototype
+semantic-uml-concise-prototype-nonterminal	semantic-format-tag-uml-concise-prototype
+semantic-auto-parse-mode	semantic-idle-scheduler-mode
+global-semantic-auto-parse-mode	global-semantic-idle-scheduler-mode
+semantic-summary-mode	semantic-idle-summary-mode
+global-semantic-summary-mode	global-semantic-idle-summary-mode
+semantic-imenu-expand-type-parts	semantic-imenu-expand-type-members
+semantic-imenu-bucketize-type-parts	semantic-imenu-bucketize-type-members
+semantic-imenu-expandable-token	semantic-imenu-expandable-tag-class
+semantic-flex-start	semantic-lex-token-start
+semantic-flex-end	semantic-lex-token-end
+semantic-flex-text	semantic-lex-token-text
+semantic-flex-make-keyword-table	semantic-lex-make-keyword-table
+semantic-flex-keyword-p	semantic-lex-keyword-p
+semantic-flex-keyword-put	semantic-lex-keyword-put
+semantic-flex-keyword-get	semantic-lex-keyword-get
+semantic-flex-map-keywords	semantic-lex-map-keywords
+semantic-flex-keywords	semantic-lex-keywords
+semantic-flex-buffer	semantic-lex-buffer
+semantic-flex-list	semantic-lex-list
+semantic-sort-tokens-by-name-increasing	semantic-sort-tags-by-name-increasing
+semantic-sort-tokens-by-name-decreasing	semantic-sort-tags-by-name-decreasing
+semantic-sort-tokens-by-type-increasing	semantic-sort-tags-by-type-increasing
+semantic-sort-tokens-by-type-decreasing	semantic-sort-tags-by-type-decreasing
+semantic-sort-tokens-by-name-increasing-ci	semantic-sort-tags-by-name-increasing-ci
+semantic-sort-tokens-by-name-decreasing-ci	semantic-sort-tags-by-name-decreasing-ci
+semantic-sort-tokens-by-type-increasing-ci	semantic-sort-tags-by-type-increasing-ci
+semantic-sort-tokens-by-type-decreasing-ci	semantic-sort-tags-by-type-decreasing-ci
+semantic-nonterminal-external-member-parent	semantic-tag-external-member-parent
+semantic-nonterminal-external-member-p	semantic-tag-external-member-p
+semantic-nonterminal-external-member-children	semantic-tag-external-member-children
+semantic-token-name	semantic-tag-name
+semantic-token-token	semantic-tag-class
+semantic-token-extra-specs	semantic-tag-attributes
+semantic-token-properties	semantic-tag-properties
+semantic-token-properties-cdr	semantic--tag-properties-cdr
+semantic-token-overlay	semantic-tag-overlay
+semantic-token-overlay-cdr	semantic--tag-overlay-cdr
+semantic-token-start	semantic-tag-start
+semantic-token-end	semantic-tag-end
+semantic-token-extent	semantic-tag-bounds
+semantic-token-buffer	semantic-tag-buffer
+semantic-token-put	semantic--tag-put-property
+semantic-token-put-no-side-effect	semantic--tag-put-property-no-side-effect
+semantic-token-get	semantic--tag-get-property
+semantic-token-add-extra-spec	semantic-tag-put-attribute
+semantic-token-extra-spec	semantic-tag-get-attribute
+semantic-token-type	semantic-tag-type
+semantic-token-modifiers	semantic-tag-modifiers
+semantic-token-docstring	semantic-tag-docstring
+semantic-token-type-parts	semantic-tag-type-members
+semantic-token-type-parent	->	semantic-tag-type-superclass	and	semantic-tag-type-interfaces
+semantic-token-type-parent-superclass	semantic-tag-type-superclasses
+semantic-token-type-parent-implement	semantic-tag-type-interfaces
+semantic-token-type-extra-specs	semantic-tag-attributes
+semantic-token-type-extra-spec	semantic-tag-get-attribute
+semantic-token-type-modifiers	semantic-tag-modifiers
+semantic-token-function-args	semantic-tag-function-arguments
+semantic-token-function-extra-specs	semantic-tag-attributes
+semantic-token-function-extra-spec	semantic-tag-get-attribute
+semantic-token-function-modifiers	semantic-tag-modifiers
+semantic-token-function-throws	semantic-tag-function-throws
+semantic-token-function-parent	semantic-tag-function-parent
+semantic-token-function-destructor	semantic-tag-function-destructor-p
+semantic-token-variable-default	semantic-tag-variable-default
+semantic-token-variable-extra-specs	semantic-tag-attributes
+semantic-token-variable-extra-spec	semantic-tag-get-attribute
+semantic-token-variable-modifiers	semantic-tag-modifiers
+semantic-token-variable-const	semantic-tag-variable-constant-p
+semantic-token-variable-optsuffix	semantic-tag-variable-optsuffix
+semantic-token-include-system	semantic-tag-include-system-p
+semantic-token-p	semantic-tag-p
+semantic-token-with-position-p	semantic-tag-with-position-p
+semantic-tag-make-assoc-list	semantic-tag-make-plist
+semantic-nonterminal-children	semantic-tag-children-compatibility
+semantic-narrow-to-token	semantic-narrow-to-tag
+semantic-with-buffer-narrowed-to-current-token	semantic-with-buffer-narrowed-to-current-tag
+semantic-with-buffer-narrowed-to-token	semantic-with-buffer-narrowed-to-tag
+semantic-deoverlay-token	semantic--tag-unlink-from-buffer
+semantic-overlay-token	semantic--tag-link-to-buffer
+semantic-deoverlay-list	semantic--tag-unlink-list-from-buffer
+semantic-overlay-list	semantic--tag-link-list-to-buffer
+semantic-deoverlay-cache	semantic--tag-unlink-cache-from-buffer
+semantic-overlay-cache	semantic--tag-link-cache-to-buffer
+semantic-cooked-token-p	semantic--tag-expanded-p
+semantic-raw-to-cooked-token	semantic--tag-expand
+semantic-clone-tag	semantic-tag-clone
+semantic-token	semantic-tag
+semantic-token-new-variable	semantic-tag-new-variable
+semantic-token-new-function	semantic-tag-new-function
+semantic-token-new-type	semantic-tag-new-type
+semantic-token-new-include	semantic-tag-new-include
+semantic-token-new-package	semantic-tag-new-package
+semantic-equivalent-tokens-p	semantic-equivalent-tag-p
+semantic-find-nonterminal	semantic-go-to-tag
+semantic-find-dependency	semantic-dependency-tag-file
+semantic-nonterminal-protection	semantic-tag-protection
+semantic-nonterminal-protection-default	semantic-tag-protection-default
+semantic-nonterminal-abstract	semantic-tag-abstract
+semantic-nonterminal-abstract-default	semantic-tag-abstract-default
+semantic-nonterminal-leaf	semantic-tag-leaf
+semantic-nonterminal-leaf-default	semantic-tag-leaf-default
+semantic-nonterminal-static-default	semantic-tag-static-default
+semantic-nonterminal-full-name	semantic-tag-full-name
+semantic-nonterminal-full-name-default	semantic-tag-full-name-default
+semantic-tag-static	semantic-tag-static-p
+semantic-tag-leaf	semantic-tag-leaf-p
+semantic-tag-abstract	semantic-tag-abstract-p
+semantic-file-token-stream	semantic-file-tag-table
+semantic-something-to-stream	semantic-something-to-tag-table
+semantic-recursive-find-nonterminal-by-name
+semantic-step-at-token-ids	semantic-step-at-tag-classes
+senator-step-at-start-end-token-ids	semantic-step-at-start-end-tag-classes
+senator-current-token	senator-current-tag
+senator-full-token-name	senator-full-tag-name
+senator-next-token	senator-next-tag
+senator-previous-token	senator-previous-tag
+senator-clear-token	senator-clear-tag
+senator-add-log-tokens	senator-add-log-tags
+senator-insert-foreign-token	senator-insert-foreign-tag
+senator-copy-token	senator-copy-tag
+senator-kill-token	senator-kill-tag
+senator-yank-token	senator-yank-tag
+senator-copy-token-to-register	senator-copy-tag-to-register
diff --git a/site/cedet-1.0pre7/semantic/semantic-adebug.el b/site/cedet-1.0pre7/semantic/semantic-adebug.el
new file mode 100644
index 0000000..aad78ab
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-adebug.el
@@ -0,0 +1,409 @@
+;;; semantic-adebug.el --- Semantic Application Debugger
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-adebug.el,v 1.28 2009/09/12 02:32:12 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic datastructure debugger for semantic applications.
+;; Uses data-debug for core implementation.
+;;
+;; Goals:
+;;
+;; Inspect all known details of a TAG in a buffer.
+;;
+;; Analyze the list of active semantic databases, and the tags therin.
+;;
+;; Allow interactive navigation of the analysis process, tags, etc.
+
+(require 'eieio)
+(require 'data-debug)
+(require 'semantic)
+(require 'semantic-tag)
+(require 'semantic-format)
+(eval-when-compile
+  (require 'semanticdb-find))
+
+;;; Code:
+
+;;; SEMANTIC TAG STUFF
+;;
+(defun data-debug-insert-tag-parts (tag prefix &optional parent)
+  "Insert all the parts of TAG.
+PREFIX specifies what to insert at the start of each line.
+PARENT specifires any parent tag."
+  (data-debug-insert-thing (semantic-tag-name tag)
+			   prefix
+			   "Name: "
+			   parent)
+  (insert prefix "Class: '" (format "%S" (semantic-tag-class tag)) "\n")
+  (when (semantic-tag-with-position-p tag)
+    (let ((ol (semantic-tag-overlay tag))
+	  (file (semantic-tag-file-name tag))
+	  (start (semantic-tag-start tag))
+	  (end (semantic-tag-end tag))
+	  )
+      (insert prefix "Position: "
+	      (if (and (numberp start) (numberp end))
+		  (format "%d -> %d in " start end)
+		"")
+	      (if file (file-name-nondirectory file) "unknown-file")
+	      (if (semantic-overlay-p ol)
+		  " <live tag>"
+		"")
+	      "\n")
+      (data-debug-insert-thing ol prefix
+			       "Position Data: "
+			       parent)
+      ))
+  (let ((attrprefix (concat (make-string (length prefix) ? ) "# ")))
+    (insert prefix "Attributes:\n")
+    (data-debug-insert-property-list
+     (semantic-tag-attributes tag) attrprefix tag)
+    (insert prefix "Properties:\n")
+    (data-debug-insert-property-list
+     (semantic-tag-properties tag) attrprefix tag)
+    )
+
+  )
+
+;;;###autoload
+(defun data-debug-insert-tag-parts-from-point (point)
+  "Call `data-debug-insert-tag-parts' based on text properties at POINT."
+  (let ((tag (get-text-property point 'ddebug))
+	(parent (get-text-property point 'ddebug-parent))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-tag-parts tag
+				 (concat (make-string indent ? )
+					 "| ")
+				 parent)
+    (goto-char start)
+    ))
+
+;;;###autoload
+(defun data-debug-insert-tag (tag prefix prebuttontext &optional parent)
+  "Insert TAG into the current buffer at the current point.
+PREFIX specifies text to insert in front of TAG.
+PREBUTTONTEXT is text appearing btewen the prefix and TAG.
+Optional PARENT is the parent tag containing TAG.
+Add text properties needed to allow tag expansion later."
+  (let ((start (point))
+	(end nil)
+	(str (semantic-format-tag-uml-abbreviate tag parent t))
+	(tip (semantic-format-tag-prototype tag parent t))
+	)
+    (insert prefix prebuttontext str "\n")
+    (setq end (point))
+    (put-text-property start end 'ddebug tag)
+    (put-text-property start end 'ddebug-parent parent)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-tag-parts-from-point)
+
+    ))
+
+;;; TAG LISTS
+;;
+;;;###autoload
+(defun data-debug-insert-tag-list (taglist prefix &optional parent)
+  "Insert the tag list TAGLIST with PREFIX.
+Optional argument PARENT specifies the part of TAGLIST."
+  (condition-case nil
+      (while taglist
+	(cond ((and (consp taglist) (semantic-tag-p (car taglist)))
+	       (data-debug-insert-tag (car taglist) prefix "" parent))
+	      ((consp taglist)
+	       (data-debug-insert-thing (car taglist) prefix "" parent))
+	      (t (data-debug-insert-thing taglist prefix "" parent)))
+	(setq taglist (cdr taglist)))
+    (error nil)))
+
+(defun data-debug-insert-taglist-from-point (point)
+  "Insert the taglist found at the taglist button at POINT."
+  (let ((taglist (get-text-property point 'ddebug))
+	(parent (get-text-property point 'ddebug-parent))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-tag-list taglist
+				(concat (make-string indent ? )
+					"* ")
+				parent)
+    (goto-char start)
+
+    ))
+
+;;;###autoload
+(defun data-debug-insert-tag-list-button (taglist prefix prebuttontext &optional parent)
+  "Insert a single summary of a TAGLIST.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between PREFIX and the taglist button.
+PARENT is the tag that represents the parent of all the tags."
+  (let ((start (point))
+	(end nil)
+	(str (format "#<TAG LIST: %d entries>" (safe-length taglist)))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-function-name-face)
+    (put-text-property start end 'ddebug taglist)
+    (put-text-property start end 'ddebug-parent parent)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-taglist-from-point)
+    (insert "\n")
+    ))
+
+;;; SEMANTICDB FIND RESULTS
+;;
+;;;###autoload
+(defun data-debug-insert-find-results (findres prefix)
+  "Insert the find results FINDRES with PREFIX."
+  ;; ( (DBOBJ TAG TAG TAG) (DBOBJ TAG TAG TAG) ... )
+  (let ((cnt 1))
+    (while findres
+      (let* ((dbhit (car findres))
+	     (db (car dbhit))
+	     (tags (cdr dbhit)))
+	(data-debug-insert-thing db prefix (format "DB %d: " cnt))
+	(data-debug-insert-thing tags prefix (format "HITS %d: " cnt))
+	)
+      (setq findres (cdr findres)
+	    cnt (1+ cnt)))))
+
+(defun data-debug-insert-find-results-from-point (point)
+  "Insert the find results found at the find results button at POINT."
+  (let ((findres (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-find-results findres
+				    (concat (make-string indent ? )
+					    "!* ")
+				    )
+    (goto-char start)
+    ))
+
+;;;###autoload
+(defun data-debug-insert-find-results-button (findres prefix prebuttontext)
+  "Insert a single summary of a find results FINDRES.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the find results button."
+  (let ((start (point))
+	(end nil)
+	(str (semanticdb-find-result-prin1-to-string findres))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-function-name-face)
+    (put-text-property start end 'ddebug findres)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-find-results-from-point)
+    (insert "\n")
+    ))
+
+;;;###autoload
+(defun data-debug-insert-db-and-tag-button (dbtag prefix prebuttontext)
+  "Insert a single summary of short list DBTAG of format (DB . TAG).
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the find results button."
+  (let ((start (point))
+	(end nil)
+	(str (concat "(#<db/tag "
+		     (object-name-string (car dbtag))
+		     " / "
+		     (semantic-format-tag-name (cdr dbtag) nil t)
+		     ")"))
+	(tip nil))
+    (insert prefix prebuttontext str)
+    (setq end (point))
+    (put-text-property (- end (length str)) end 'face 'font-lock-function-name-face)
+    (put-text-property start end 'ddebug dbtag)
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-db-and-tag-from-point)
+    (insert "\n")
+    ))
+
+(defun data-debug-insert-db-and-tag-from-point (point)
+  "Insert the find results found at the find results button at POINT."
+  (let ((dbtag (get-text-property point 'ddebug))
+	(indent (get-text-property point 'ddebug-indent))
+	start
+	)
+    (end-of-line)
+    (setq start (point))
+    (forward-char 1)
+    (data-debug-insert-thing (car dbtag) (make-string indent ? )
+			     "| DB ")
+    (data-debug-insert-tag (cdr dbtag) (concat (make-string indent ? )
+					       "| ")
+			   "TAG ")
+    (goto-char start)
+    ))
+
+;;; DEBUG COMMANDS
+;;
+;; Various commands to output aspects of the current semantic environment.
+;;;###autoload
+(defun semantic-adebug-bovinate ()
+  "The same as `bovinate'.  Display the results in a debug buffer."
+  (interactive)
+  (let* ((start (current-time))
+	 (out (semantic-fetch-tags))
+	 (end (current-time)))
+
+    (message "Retrieving tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-new-buffer (concat "*" (buffer-name) " ADEBUG*"))
+    (data-debug-insert-tag-list out "* "))
+  )
+
+;;;###autoload
+(defun semantic-adebug-searchdb (regex)
+  "Search the semanticdb for REGEX for the current buffer.
+Display the results as a debug list."
+  (interactive "sSymbol Regex: ")
+  (let ((start (current-time))
+	(fr (semanticdb-find-tags-by-name-regexp regex))
+	(end (current-time)))
+
+    (data-debug-new-buffer (concat "*SEMANTICDB SEARCH: "
+				   regex
+				   " ADEBUG*"))
+    (message "Search of tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-insert-find-results fr "*")))
+
+;;;###autoload
+(defun semanticdb-debug-file-tag-check (startfile)
+  "Report debug info for checking STARTFILE for up-to-date tags."
+  (interactive "FFile to Check (default = current-buffer): ")
+  (let* ((file (file-truename startfile))
+	 (default-directory (file-name-directory file))
+	 (db (or
+	      ;; This line will pick up system databases.
+	      (semanticdb-directory-loaded-p default-directory)
+	      ;; this line will make a new one if needed.
+	      (semanticdb-get-database default-directory)))
+	 (tab (semanticdb-file-table db file))
+	 )
+    (with-output-to-temp-buffer "*DEBUG STUFF*"
+      (princ "Starting file is: ")
+      (princ startfile)
+      (princ "\nTrueName is: ")
+      (princ file)
+      (when (not (file-exists-p file))
+	(princ "\nFile does not exist!"))
+      (princ "\nDirectory Part is: ")
+      (princ default-directory)
+      (princ "\nFound Database is: ")
+      (princ (object-print db))
+      (princ "\nFound Table is: ")
+      (if tab (princ (object-print tab)) (princ "nil"))
+      (princ "\n\nAction Summary: ")
+      (cond
+       ((and tab
+	     ;; Is this in a buffer?
+	     (find-buffer-visiting (semanticdb-full-filename tab))
+	     )
+	(princ "Found Buffer: ")
+	(prin1 (find-buffer-visiting (semanticdb-full-filename tab)))
+	)
+       ((and tab
+	     ;; Is table fully loaded, or just a proxy?
+	     (number-or-marker-p (oref tab pointmax))
+	     ;; Is this table up to date with the file?
+	     (not (semanticdb-needs-refresh-p tab)))
+	(princ "Found table, no refresh needed.\n   Pointmax is: ")
+	(prin1 (oref tab pointmax))
+	)
+       (t
+	(princ "Found table that needs refresh.")
+	(if (not tab)
+	    (princ "\n   No Saved Point.")
+	  (princ "\n  Saved pointmax: ")
+	  (prin1 (oref tab pointmax))
+	  (princ "  Needs Refresh: ")
+	  (prin1 (semanticdb-needs-refresh-p tab))
+	  )
+	))
+      ;; Buffer isn't loaded.  The only clue we have is if the file
+      ;; is somehow different from our mark in the semanticdb table.
+      (let* ((stats (file-attributes file))
+	     (actualsize (nth 7 stats))
+	     (actualmod (nth 5 stats))
+	     )
+
+	(if (or  (not tab)
+		 (not (slot-boundp tab 'tags))
+		 (not (oref tab tags)))
+	    (princ "\n   No tags in table.")
+	  (princ "\n   Number of known tags: ")
+	  (prin1 (length (oref tab tags))))
+
+	(princ "\n   File Size is: ")
+	(prin1 actualsize)
+	(princ "\n   File Mod Time is: ")
+	(princ (format-time-string "%Y-%m-%d %T" actualmod))
+	(when tab
+	  (princ "\n   Saved file size is: ")
+	  (prin1 (oref tab fsize))
+	  (princ "\n   Saved Mod time is: ")
+	  (princ (format-time-string "%Y-%m-%d %T"
+				     (oref tab lastmodtime)))
+	  )
+	)
+      )
+    ;; Force load
+    (semanticdb-file-table-object file)
+    nil
+    ))
+
+;; (semanticdb-debug-file-tag-check "/usr/lib/gcc/i486-linux-gnu/4.2/include/stddef.h")
+;; (semanticdb-debug-file-tag-check "/usr/include/stdlib.h")
+
+
+
+(provide 'semantic-adebug)
+
+;;; semantic-adebug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-analyze-complete.el b/site/cedet-1.0pre7/semantic/semantic-analyze-complete.el
new file mode 100644
index 0000000..99c1945
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-analyze-complete.el
@@ -0,0 +1,275 @@
+;;; semantic-analyze-complete.el --- Smart Completions
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-analyze-complete.el,v 1.15 2009/09/11 23:43:07 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Caclulate smart completions.
+;;
+;; Uses the analyzer context routine to determine the best possible
+;; list of completions.
+;;
+;;; History:
+;;
+;; Code was moved here from semantic-analyze.el
+
+(require 'semantic-analyze)
+
+;;; Code:
+
+;;; Helper Fcns
+;;
+;;
+;;;###autoload
+(define-overloadable-function semantic-analyze-type-constants (type)
+  "For the tag TYPE, return any constant symbols of TYPE.
+Used as options when completing.")
+
+(defun semantic-analyze-type-constants-default (type)
+  "Do nothing with TYPE."
+  nil)
+
+;; Old impl of the above.  I'm not sure what the issue is
+;  (let ((ans
+;         (:override-with-args
+;             ((semantic-analyze-find-tag (semantic-tag-name type)))
+;           ;; Be default, we don't know.
+;           nil))
+;        (out nil))
+;    (dolist (elt ans)
+;      (cond
+;       ((stringp elt)
+;        (push (semantic-tag-new-variable
+;               elt (semantic-tag-name type) nil)
+;              out))
+;       ((semantic-tag-p elt)
+;        (push elt out))
+;       (t nil)))
+;    (nreverse out)))
+
+;;;###autoload
+(defun semantic-analyze-tags-of-class-list (tags classlist)
+  "Return the tags in TAGS that are of classes in CLASSLIST."
+  (let ((origc tags))
+    ;; Accept only tags that are of the datatype specified by
+    ;; the desired classes.
+    (setq tags (apply 'nconc ;; All input lists are permutable.
+		      (mapcar (lambda (class)
+				(semantic-find-tags-by-class class origc))
+			      classlist)))
+    tags))
+
+;;; MAIN completion calculator
+;;
+;;
+;;;###autoload
+(define-overloadable-function semantic-analyze-possible-completions (context)
+  "Return a list of semantic tags which are possible completions.
+CONTEXT is either a position (such as point), or a precalculated
+context.  Passing in a context is useful if the caller also needs
+to access parts of the analysis.
+Completions run through the following filters:
+  * Elements currently in scope
+  * Constants currently in scope
+  * Elements match the :prefix in the CONTEXT.
+  * Type of the completion matches the type of the context.
+Context type matching can identify the following:
+  * No specific type
+  * Assignment into a variable of some type.
+  * Argument to a function with type constraints.
+When called interactively, displays the list of possible completions
+in a buffer."
+  (interactive "d")
+  ;; In theory, we don't need the below since the context will
+  ;; do it for us.
+  ;;(semantic-refresh-tags-safe)
+  (with-syntax-table semantic-lex-syntax-table
+    (let* ((context (if (semantic-analyze-context-child-p context)
+                        context
+                      (semantic-analyze-current-context context)))
+	   (ans (if (not context)
+		    (error "Nothing to Complete.")
+		  (:override))))
+      ;; If interactive, display them.
+      (when (interactive-p)
+	(with-output-to-temp-buffer "*Possible Completions*"
+	  (semantic-analyze-princ-sequence ans "" (current-buffer)))
+	(shrink-window-if-larger-than-buffer
+	 (get-buffer-window "*Possible Completions*")))
+      ans)))
+
+(defun semantic-analyze-possible-completions-default (context)
+  "Default method for producing smart completions.
+Argument CONTEXT is an object specifying the locally derived context."
+  (let* ((a context)
+	 (desired-type (semantic-analyze-type-constraint a))
+	 (desired-class (oref a prefixclass))
+	 (prefix (oref a prefix))
+	 (prefixtypes (oref a prefixtypes))
+	 (completetext nil)
+	 (completetexttype nil)
+	 (scope (oref a scope))
+	 (localvar (oref scope localvar))
+	 (c nil))
+
+    ;; Calculate what our prefix string is so that we can
+    ;; find all our matching text.
+    (setq completetext (car (reverse prefix)))
+    (if (semantic-tag-p completetext)
+	(setq completetext (semantic-tag-name completetext)))
+
+    (if (and (not completetext) (not desired-type))
+	(error "Nothing to complete"))
+
+    (if (not completetext) (setq completetext ""))
+
+    ;; This better be a reasonable type, or we should fry it.
+    ;; The prefixtypes should always be at least 1 less than
+    ;; the prefix since the type is never looked up for the last
+    ;; item when calculating a sequence.
+    (setq completetexttype (car (reverse prefixtypes)))
+    (when (or (not completetexttype)
+	      (not (and (semantic-tag-p completetexttype)
+			(eq (semantic-tag-class completetexttype) 'type))))
+      ;; What should I do here?  I think this is an error condition.
+      (setq completetexttype nil)
+      ;; If we had something that was a completetexttype but it wasn't
+      ;; valid, then express our dismay!
+      (when (> (length prefix) 1)
+	(let* ((errprefix (car (cdr (reverse prefix)))))
+	  (error "Cannot find types for `%s'"
+		 (cond ((semantic-tag-p errprefix)
+			(semantic-format-tag-prototype errprefix))
+		       (t
+			(format "%S" errprefix)))))
+	))
+
+    ;; There are many places to get our completion stream for.
+    ;; Here we go.
+    (if completetexttype
+
+	(setq c (semantic-find-tags-for-completion
+		 completetext
+		 (semantic-analyze-scoped-type-parts completetexttype scope)
+		 ))
+
+      ;; No type based on the completetext.  This is a free-range
+      ;; var or function.  We need to expand our search beyond this
+      ;; scope into semanticdb, etc.
+      (setq c (nconc
+	       ;; Argument list and local variables
+	       (semantic-find-tags-for-completion completetext localvar)
+	       ;; The current scope
+	       (semantic-find-tags-for-completion completetext (oref scope fullscope))
+	       ;; The world
+	       (semantic-analyze-find-tags-by-prefix completetext))
+	    )
+      )
+
+    (let ((origc c)
+	  (dtname (semantic-tag-name desired-type)))
+
+      ;; Reset c.
+      (setq c nil)
+
+      ;; Loop over all the found matches, and catagorize them
+      ;; as being possible features.
+      (while origc
+
+	(cond
+	 ;; Strip operators
+	 ((semantic-tag-get-attribute (car origc) :operator-flag)
+	  nil
+	  )
+
+	 ;; If we are completing from within some prefix,
+	 ;; then we want to exclude constructors and destructors
+	 ((and completetexttype
+	       (or (semantic-tag-get-attribute (car origc) :constructor-flag)
+		   (semantic-tag-get-attribute (car origc) :destructor-flag)))
+	  nil
+	  )
+
+	 ;; If there is a desired type, we need a pair of restrictions
+	 (desired-type
+
+	  (cond
+	   ;; Ok, we now have a completion list based on the text we found
+	   ;; we want to complete on.  Now filter that stream against the
+	   ;; type we want to search for.
+	   ((string= dtname (semantic-analyze-type-to-name (semantic-tag-type (car origc))))
+	    (setq c (cons (car origc) c))
+	    )
+
+	   ;; Now anything that is a compound type which could contain
+	   ;; additional things which are of the desired type
+	   ((semantic-tag-type (car origc))
+	    (let ((att (semantic-analyze-tag-type (car origc) scope))
+		)
+	      (if (and att (semantic-tag-type-members att))
+		  (setq c (cons (car origc) c))))
+	    )
+
+	   ) ; cond
+	  ); desired type
+
+	 ;; No desired type, no other restrictions.  Just add.
+	 (t
+	  (setq c (cons (car origc) c)))
+
+	 ); cond
+
+	(setq origc (cdr origc)))
+
+      (when desired-type
+	;; Some types, like the enum in C, have special constant values that
+	;; we could complete with.  Thus, if the target is an enum, we can
+	;; find possible symbol values to fill in that value.
+	(let ((constants
+	       (semantic-analyze-type-constants desired-type)))
+	  (if constants
+	      (progn
+		;; Filter
+		(setq constants
+		      (semantic-find-tags-for-completion
+		       completetext constants))
+		;; Add to the list
+		(setq c (nconc c constants)))
+	    )))
+      )
+
+    (when desired-class
+      (setq c (semantic-analyze-tags-of-class-list c desired-class)))
+
+    ;; Pull out trash.
+    ;; NOTE TO SELF: Is this too slow?
+    ;; OTHER NOTE: Do we not want to strip duplicates by name and
+    ;; only by position?  When are duplicate by name but not by tag
+    ;; useful?
+    (setq c (semantic-unique-tag-table-by-name c))
+
+    ;; All done!
+
+    c))
+
+(provide 'semantic-analyze-complete)
+
+;;; semantic-analyze-complete.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-analyze-debug.el b/site/cedet-1.0pre7/semantic/semantic-analyze-debug.el
new file mode 100644
index 0000000..36497da
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-analyze-debug.el
@@ -0,0 +1,615 @@
+;;; semantic-analyze-debug.el --- Debug the analyzer
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-analyze-debug.el,v 1.10 2009/09/11 23:42:52 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide a top-order debugging tool for figuring out what's going on with
+;; smart completion and analyzer mode.
+
+(require 'semantic-analyze)
+(require 'semanticdb-typecache)
+
+;;; Code:
+
+;;;###autoload
+(defun semantic-analyze-debug-assist ()
+  "Debug semantic analysis at the current point."
+  (interactive)
+  (let ((actualfcn (fetch-overload 'semantic-analyze-current-context))
+	(ctxt (semantic-analyze-current-context))
+	)
+    ;; What to show.
+    (if actualfcn
+	(message "Mode %s does not use the default analyzer."
+		 major-mode)
+      ;; Debug our context.
+      )
+    (or (semantic-analyzer-debug-test-local-context)
+	(and ctxt (semantic-analyzer-debug-found-prefix ctxt))
+	)
+
+    ))
+
+(defun semantic-analyzer-debug-found-prefix (ctxt)
+  "Debug the prefix found by the analyzer output CTXT."
+  (let* ((pf (oref ctxt prefix))
+	 (pft (oref ctxt prefixtypes))
+	 (idx 0)
+	 (stop nil)
+	 (comp (condition-case nil
+		   (semantic-analyze-possible-completions ctxt)
+		 (error nil)))
+	 )
+    (while (and (nth idx pf) (not stop))
+      (let ((pentry (nth idx pf))
+	    (ptentry (nth idx pft)))
+	(if (or (stringp pentry) (not ptentry))
+	    ;; Found someting ok.  stop
+	    (setq stop t)
+	  (setq idx (1+ idx)))))
+    ;; We found the first non-tag entry.  What is the situation?
+    (cond
+     ((and (eq idx 0) (stringp (car pf)))
+      ;; First part, we couldn't find it.
+      (semantic-analyzer-debug-global-symbol ctxt (car pf) comp))
+     ((not (nth (1- idx) pft)) ;; idx can't be 0 here.
+      ;; The previous entry failed to have an identifiable data
+      ;; type, which is a global search.
+      (semantic-analyzer-debug-missing-datatype ctxt idx comp))
+     ((and (nth (1- idx) pft) (stringp (nth idx pf)))
+      ;; Non-first search, didn't find string in known data type.
+      (semantic-analyzer-debug-missing-innertype ctxt idx comp))
+     (t
+      ;; Things are ok?
+      (message "Things look ok."))
+    )))
+
+(defun semantic-analyzer-debug-global-symbol (ctxt prefix comp)
+  "Debug why we can't find the first entry in the CTXT PREFIX.
+Argument COMP are possible completions here."
+  (let ((tab semanticdb-current-table)
+	(finderr nil)
+	(origbuf (current-buffer))
+	)
+    (with-output-to-temp-buffer (help-buffer)
+      (with-current-buffer standard-output
+	(princ "Unable to find prefix ")
+	(princ prefix)
+	(princ ".\n\n")
+
+	;; NOTE: This line is copied from semantic-analyze-current-context.
+	;;       You will need to update both places.
+	(condition-case err
+	    (save-excursion
+	      (set-buffer origbuf)
+	      (let* ((position (or (cdr-safe (oref ctxt bounds)) (point)))
+		     (prefixtypes nil) ; Used as type return
+		     (scope (semantic-calculate-scope position))
+		     )
+		(semantic-analyze-find-tag-sequence
+		 (list prefix "") scope 'prefixtypes)
+		)
+	      )
+	  (error (setq finderr err)))
+
+	(if finderr
+	    (progn
+	      (princ "The prefix lookup code threw the following error:\n  ")
+	      (prin1 finderr)
+	      (princ "\n\nTo debug this error you can do this:
+  M-x toggle-debug-on-error RET
+and then re-run the debug analyzer.\n")
+	      )
+	  ;; No find error, just not found
+	  (princ "The prefix ")
+	  (princ prefix)
+	  (princ " could not be found in the local scope,
+nor in any search tables.\n")
+	  )
+	(princ "\n")
+
+	;; Describe local scope, and why we might not be able to
+	;; find it.
+	(semantic-analyzer-debug-describe-scope ctxt)
+
+	(semantic-analyzer-debug-show-completions comp)
+
+	(princ "When Semantic cannot find a symbol, it could be because the include
+path was setup incorrectly.\n")
+
+	(semantic-analyzer-debug-insert-include-summary tab)
+
+	))
+    (semantic-analyzer-debug-add-buttons)
+    ))
+
+(defun semantic-analyzer-debug-missing-datatype (ctxt idx comp)
+  "Debug why we can't find a datatype entry for CTXT prefix at IDX.
+Argument COMP are possible completions here."
+  (let* ((prefixitem (nth idx (oref ctxt prefix)))
+	 (dt (nth (1- idx) (oref ctxt prefixtypes)))
+	 (tt (semantic-tag-type prefixitem))
+	 (tab semanticdb-current-table)
+	 )
+    (when dt (error "Missing Datatype debugger is confused"))
+    (with-output-to-temp-buffer (help-buffer)
+      (with-current-buffer standard-output
+	(princ "Unable to find datatype for: \"")
+	(princ (semantic-format-tag-prototype prefixitem))
+	(princ "\".
+Declared type is: ")
+	(when (semantic-tag-p tt)
+	  (semantic-analyzer-debug-insert-tag tt)
+	  (princ "\nRaw data type is: "))
+	(princ (format "%S" tt))
+	(princ "
+
+Semantic could not find this data type in any of its global tables.
+
+Semantic locates datatypes through either the local scope, or the global
+typecache.
+")
+
+	;; Describe local scope, and why we might not be able to
+	;; find it.
+	(semantic-analyzer-debug-describe-scope ctxt '(type))
+
+	;; Describe the typecache.
+	(princ "\nSemantic creates and maintains a type cache for each buffer.
+If the type is a global type, then it should appear in they typecache.
+To examine the typecache, type:
+
+  M-x semanticdb-typecache-dump RET
+
+Current typecache Statistics:\n")
+	(princ (format "   %4d types global in this file\n   %4d types from includes.\n"
+		       (length (semanticdb-typecache-file-tags tab))
+		       (length (semanticdb-typecache-include-tags tab))))
+
+	(princ "\nIf the datatype is not in the typecache, then your include
+path may be incorrect.  ")
+
+	(semantic-analyzer-debug-insert-include-summary tab)
+
+	;; End with-buffer
+	))
+    (semantic-analyzer-debug-add-buttons)
+    ))
+
+(defun semantic-analyzer-debug-missing-innertype (ctxt idx comp)
+  "Debug why we can't find an entry for CTXT prefix at IDX for known type.
+We need to see if we have possible completions against the entry before
+being too vocal about it.
+Argument COMP are possible completions here."
+  (let* ((prefixitem (nth idx (oref ctxt prefix)))
+	 (prevprefix (nth (1- idx) (oref ctxt prefix)))
+	 (dt (nth (1- idx) (oref ctxt prefixtypes)))
+	 (desired-type (semantic-analyze-type-constraint ctxt))
+	 (orig-buffer (current-buffer))
+	 (ots (semantic-analyze-tag-type prevprefix
+					 (oref ctxt scope)
+					 t ; Don't deref
+					 ))
+	 )
+    (when (not dt) (error "Missing Innertype debugger is confused"))
+    (with-output-to-temp-buffer (help-buffer)
+      (with-current-buffer standard-output
+	(princ "Cannot find prefix \"")
+	(princ prefixitem)
+	(princ "\" in datatype:
+  ")
+	(semantic-analyzer-debug-insert-tag dt)
+	(princ "\n")
+
+	(cond
+	 ;; Any language with a namespace.
+	 ((string= (semantic-tag-type dt) "namespace")
+	  (princ "Semantic may not have found all possible namespaces with
+the name ")
+	  (princ (semantic-tag-name dt))
+	  (princ ".  You can debug the entire typecache, including merged namespaces
+with the command:
+
+  M-x semanticdb-typecache-dump RET")
+	  )
+
+	 ;; @todo - external declarations??
+	 (nil
+	  nil)
+
+	 ;; A generic explanation
+	 (t
+	  (princ "\nSemantic has found the datatype ")
+	  (semantic-analyzer-debug-insert-tag dt)
+	  (if (or (not (semantic-equivalent-tag-p ots dt))
+		  (not (save-excursion
+			 (set-buffer orig-buffer)
+			 (car (semantic-analyze-dereference-metatype
+			  ots (oref ctxt scope))))))
+	      (let ((lasttype ots)
+		    (nexttype (save-excursion
+				(set-buffer orig-buffer)
+				(car (semantic-analyze-dereference-metatype
+				 ots (oref ctxt scope))))))
+		(if (eq nexttype lasttype)
+		    (princ "\n  [ Debugger error trying to help with metatypes ]")
+
+		  (if (eq ots dt)
+		      (princ "\nwhich is a metatype")
+		    (princ "\nwhich is derived from metatype ")
+		    (semantic-analyzer-debug-insert-tag lasttype)))
+
+		(princ ".\nThe Metatype stack is:\n")
+		(princ "   ")
+		(semantic-analyzer-debug-insert-tag lasttype)
+		(princ "\n")
+		(while (and nexttype
+			    (not (eq nexttype lasttype)))
+		  (princ "   ")
+		  (semantic-analyzer-debug-insert-tag nexttype)
+		  (princ "\n")
+		  (setq lasttype nexttype
+			nexttype
+			(save-excursion
+			  (set-buffer orig-buffer)
+			  (car (semantic-analyze-dereference-metatype
+			   nexttype (oref ctxt scope)))))
+		  )
+		(when (not nexttype)
+		  (princ "   nil\n\n")
+		  (princ
+		   "Last metatype is nil.  This means that semantic cannot derive
+the list of members because the type referred to cannot be found.\n")
+		  )
+		)
+	    (princ "\nand its list of members.")
+
+	    (if (not comp)
+		(progn
+		  (princ "  Semantic does not know what
+possible completions there are for \"")
+		  (princ prefixitem)
+		  (princ "\".  Examine the known
+members below for more."))
+	      (princ "  Semantic knows of some
+possible completions for \"")
+	      (princ prefixitem)
+	      (princ "\".")))
+	  )
+	 ;; end cond
+	 )
+
+	(princ "\n")
+	(semantic-analyzer-debug-show-completions comp)
+
+	(princ "\nKnown members of ")
+	(princ (semantic-tag-name dt))
+	(princ ":\n")
+	(dolist (M (semantic-tag-type-members dt))
+	  (princ "  ")
+	  ;;(princ (semantic-format-tag-prototype M))
+	  (semantic-analyzer-debug-insert-tag M)
+	  (princ "\n"))
+
+	;; This doesn't refer to in-type completions.
+	;;(semantic-analyzer-debug-global-miss-text prefixitem)
+
+	;; More explanation
+	(when desired-type
+	  (princ "\nWhen there are known members that would make good completion
+candidates that are not in the completion list, then the most likely
+cause is a type constraint.  Semantic has determined that there is a
+type constraint looking for the type ")
+	  (if (semantic-tag-p desired-type)
+	      (semantic-analyzer-debug-insert-tag desired-type)
+	    (princ (format "%S" desired-type)))
+	  (princ "."))
+	))
+    (semantic-analyzer-debug-add-buttons)
+
+    ))
+
+
+(defun semantic-analyzer-debug-test-local-context ()
+  "Test the local context parsed from the file."
+  (let* ((prefixandbounds (semantic-ctxt-current-symbol-and-bounds (point)))
+	 (prefix (car prefixandbounds))
+	 (bounds (nth 2 prefixandbounds))
+	 )
+    (when (and (or (not prefixandbounds)
+		   (not prefix)
+		   (not bounds))
+	       )
+      (with-output-to-temp-buffer (help-buffer)
+	(with-current-buffer standard-output
+	  (princ "Local Context Parser Failed.
+
+If this is unexpected, then there is likely a bug in the Semantic
+local context parser.
+
+Consider debugging the function ")
+	  (let ((lcf (fetch-overload 'semantic-ctxt-current-symbol-and-bounds)))
+	    (if lcf
+		(princ (symbol-name lcf))
+	      (princ "semantic-ctxt-current-symbol-and-bounds,
+or implementing a version specific to ")
+	      (princ (symbol-name major-mode))
+	      )
+	    (princ ".\n"))
+	  (semantic-analyzer-debug-add-buttons)
+	t)))
+    ))
+
+;;; General Inserters with help
+;;
+(defun semantic-analyzer-debug-show-completions (comp)
+  "Show the completion list COMP."
+  (if (not comp)
+      (princ "\nNo known possible completions.\n")
+
+    (princ "\nPossible completions are:\n")
+    (dolist (C comp)
+      (princ "  ")
+      (cond ((stringp C)
+	     (princ C)
+	     )
+	    ((semantic-tag-p C)
+	     (semantic-analyzer-debug-insert-tag C)))
+      (princ "\n"))
+    (princ "\n")))
+
+(defun semantic-analyzer-debug-insert-include-summary (table)
+  "Display a summary of includes for the semanticdb TABLE."
+  (semantic-fetch-tags)
+  (let ((inc (semantic-find-tags-by-class 'include table))
+	;;(path (semanticdb-find-test-translate-path-no-loading))
+	(unk
+	 (save-excursion
+	   (set-buffer (semanticdb-get-buffer table))
+	   semanticdb-find-lost-includes))
+	(ip
+	 (save-excursion
+	   (set-buffer (semanticdb-get-buffer table))
+	   semantic-dependency-system-include-path))
+	(edeobj
+	 (save-excursion
+	   (set-buffer (semanticdb-get-buffer table))
+	   ede-object))
+	(edeproj
+	 (save-excursion
+	   (set-buffer (semanticdb-get-buffer table))
+	   ede-object-project))
+	)
+
+    (princ "\n\nInclude Path Summary:")
+    (when edeobj
+	(princ "\n\nThis file's project include search is handled by the EDE object:\n")
+	(princ "  Buffer Target:  ")
+	(princ (object-print edeobj))
+	(princ "\n")
+	(when (not (eq edeobj edeproj))
+	  (princ "  Buffer Project: ")
+	  (princ (object-print edeproj))
+	  (princ "\n"))
+	(when edeproj
+	  (let ((loc (ede-get-locator-object edeproj)))
+	    (princ "  Backup Locator: ")
+	    (princ (object-print loc))
+	    (princ "\n")))
+	)
+
+    (princ "\n\nThe system include path is:\n")
+    (dolist (dir ip)
+      (princ "  ")
+      (princ dir)
+      (princ "\n"))
+
+    (princ "\n\nInclude Summary: ")
+    (princ (semanticdb-full-filename table))
+    (princ "\n\n")
+    (princ (format "%s contains %d includes.\n"
+		   (file-name-nondirectory
+		    (semanticdb-full-filename table))
+		   (length inc)))
+    (let ((ok 0)
+	  (unknown 0)
+	  (unparsed 0)
+	  (all 0))
+      (dolist (i inc)
+	(let* ((fileinner (semantic-dependency-tag-file i))
+	       (tableinner (when fileinner
+			     (semanticdb-file-table-object fileinner t))))
+	  (cond ((not fileinner)
+		 (setq unknown (1+ unknown)))
+		((number-or-marker-p (oref tableinner pointmax))
+		 (setq ok (1+ ok)))
+		(t
+		 (setq unparsed (1+ unparsed))))))
+      (setq all (+ ok unknown unparsed))
+      (when (not (= 0 all))
+	(princ (format "   Unknown Includes:  %d\n" unknown))
+	(princ (format "   Unparsed Includes: %d\n" unparsed))
+	(princ (format "   Parsed Includes:   %d\n" ok)))
+      )
+
+    ;; Unknowns...
+    (if unk
+	(progn
+	  (princ "\nA likely cause of an unfound tag is missing include files.")
+	  (semantic-analyzer-debug-insert-tag-list
+	   "The following includes were not found" unk)
+
+	  (princ "\nYou can fix the include path for ")
+	  (princ (symbol-name (oref table major-mode)))
+	  (princ " by using this function:
+
+M-x semantic-customize-system-include-path RET
+
+which customizes the mode specific variable for the mode-local
+variable `semantic-dependency-system-include-path'.")
+	  )
+
+      (princ "\n No unknown includes.\n"))
+    ))
+
+(defun semantic-analyzer-debug-describe-scope (ctxt &optional classconstraint)
+  "Describe the scope in CTXT for finding a global symbol.
+Optional argument CLASSCONSTRAINT says to output to tags of that class."
+  (let* ((scope (oref ctxt :scope))
+	 (parents (oref scope parents))
+	 (cc (or classconstraint (oref ctxt prefixclass)))
+	 )
+    (princ "\nLocal Scope Information:")
+    (princ "\n * Tag Class Constraint against SCOPE: ")
+    (princ (format "%S" classconstraint))
+
+    (if parents
+	(semantic-analyzer-debug-insert-tag-list
+	 " >> Known parent types with possible in scope symbols"
+	 parents)
+      (princ "\n * No known parents in current scope."))
+
+    (let ((si (semantic-analyze-tags-of-class-list
+	       (oref scope scope) cc))
+	  (lv (semantic-analyze-tags-of-class-list
+	       (oref scope localvar) cc))
+	  )
+      (if si
+	  (semantic-analyzer-debug-insert-tag-list
+	   " >> Known symbols within the current scope"
+	   si)
+	(princ "\n * No known symbols currently in scope."))
+
+      (if lv
+	  (semantic-analyzer-debug-insert-tag-list
+	   " >> Known symbols that are declared locally"
+	   lv)
+	(princ "\n * No known symbols declared locally."))
+      )
+    )
+  )
+
+(defun semantic-analyzer-debug-global-miss-text (name-in)
+  "Use 'princ' to show text describing not finding symbol NAME-IN.
+NAME is the name of the unfound symbol."
+  (let ((name (cond ((stringp name-in)
+		     name-in)
+		    ((semantic-tag-p name-in)
+		     (semantic-format-tag-name name-in))
+		    (t (format "%S" name-in)))))
+    (when (not (string= name ""))
+      (princ "\nIf ")
+      (princ name)
+      (princ " is a local variable, argument, or symbol in some
+namespace or class exposed via scoping statements, then it should
+appear in the scope.
+
+Debugging the scope can be done with:
+  M-x semantic-calculate-scope RET
+
+If the prefix is a global symbol, in an included file, then
+your search path may be incomplete.
+"))))
+
+;;; Utils
+;;
+(defun semantic-analyzer-debug-insert-tag-list (text taglist)
+  "Prefixing with TEXT, dump TAGLIST in a help buffer."
+  (princ "\n") (princ text) (princ ":\n")
+
+  (dolist (M taglist)
+    (princ "  ")
+    ;;(princ (semantic-format-tag-prototype M))
+    (semantic-analyzer-debug-insert-tag M)
+    (princ "\n"))
+  )
+
+(defun semantic-analyzer-debug-insert-tag (tag &optional parent)
+  "Display a TAG by name, with possible jumpitude.
+PARENT is a possible parent (by nesting) tag."
+  (let ((str (semantic-format-tag-prototype tag parent)))
+    (if (and (semantic-tag-with-position-p tag)
+	     (semantic-tag-file-name tag))
+	(insert-button str
+		       'mouse-face 'custom-button-pressed-face
+		       'tag tag
+		       'action
+		       `(lambda (button)
+			  (let ((buff nil)
+				(pnt nil))
+			    (save-excursion
+			      (semantic-go-to-tag
+			       (button-get button 'tag))
+			      (setq buff (current-buffer))
+			      (setq pnt (point)))
+			    (if (get-buffer-window buff)
+				(select-window (get-buffer-window buff))
+			      (pop-to-buffer buff t))
+			    (goto-char pnt)
+			    (pulse-line-hook-function)))
+		       )
+      (princ "\"")
+      (princ str)
+      (princ "\""))
+    ))
+
+(defvar semantic-analyzer-debug-orig nil
+  "The originating buffer for a help button.")
+
+(defun semantic-analyzer-debug-add-buttons ()
+  "Add push-buttons to the *Help* buffer.
+Look for key expressions, and add push-buttons near them."
+  (let ((orig-buffer (make-marker)))
+    (set-marker orig-buffer (point) (current-buffer))
+    (save-excursion
+      ;; Get a buffer ready.
+      (set-buffer "*Help*")
+      (toggle-read-only -1)
+      (goto-char (point-min))
+      (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)
+      ;; First, add do-in buttons to recommendations.
+      (while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t)
+	(let ((fcn (match-string 1)))
+	  (when (not (fboundp (intern-soft fcn)))
+	    (error "Help Err: Can't find %s" fcn))
+	  (end-of-line)
+	  (insert "   ")
+	  (insert-button "[ Do It ]"
+			 'mouse-face 'custom-button-pressed-face
+			 'do-fcn fcn
+			 'action `(lambda (arg)
+				    (let ((M semantic-analyzer-debug-orig))
+				      (set-buffer (marker-buffer M))
+				      (goto-char M))
+				    (call-interactively (quote ,(intern-soft fcn))))
+			 )
+	  ))
+      ;; Do something else?
+
+      ;; Clean up the mess
+      (toggle-read-only 1)
+      (set-buffer-modified-p nil)
+      )))
+
+(provide 'semantic-analyze-debug)
+
+;;; semantic-analyze-debug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-analyze-fcn.el b/site/cedet-1.0pre7/semantic/semantic-analyze-fcn.el
new file mode 100644
index 0000000..de4ec01
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-analyze-fcn.el
@@ -0,0 +1,326 @@
+;;; semantic-analyze-fcn.el --- Analyzer support functions.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-analyze-fcn.el,v 1.29 2009/09/11 23:42:33 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Analyzer support functions.
+
+;;; Code:
+
+;;; Small Mode Specific Options
+;;
+;; These queries allow a major mode to help the analyzer make decisions.
+;;
+(define-overloadable-function semantic-analyze-tag-prototype-p (tag)
+  "Non-nil if TAG is a prototype."
+  )
+
+(defun semantic-analyze-tag-prototype-p-default (tag)
+  "Non-nil if TAG is a prototype."
+  (let ((p (semantic-tag-get-attribute tag :prototype-flag)))
+    (cond
+     ;; Trust the parser author.
+     (p p)
+     ;; Empty types might be a prototype.
+     ((eq (semantic-tag-class tag) 'type)
+      (not (semantic-tag-type-members tag)))
+     ;; No other heuristics.
+     (t nil))
+    ))
+
+;;------------------------------------------------------------
+
+(define-overloadable-function semantic-analyze-split-name (name)
+  "Split a tag NAME into a sequence.
+Sometimes NAMES are gathered from the parser that are compounded,
+such as in C++ where foo::bar means:
+  \"The class BAR in the namespace FOO.\"
+Return the string NAME for no change, or a list if it needs to be split.")
+
+(defun semantic-analyze-split-name-default (name)
+  "Don't split up NAME by default."
+  name)
+
+(define-overloadable-function semantic-analyze-unsplit-name (namelist)
+  "Assemble a NAMELIST into a string representing a compound name.
+Return the string representing the compound name.")
+
+(defun semantic-analyze-unsplit-name-default (namelist)
+  "Concatenate the names in NAMELIST with a . between."
+  (mapconcat 'identity namelist "."))
+
+;;; SELECTING
+;;
+;; If you narrow things down to a list of tags that all mean
+;; the same thing, how to you pick one?  Select or merge.
+;;
+
+(defun semantic-analyze-select-best-tag (sequence &optional tagclass)
+  "For a SEQUENCE of tags, all with good names, pick the best one.
+If SEQUENCE is made up of namespaces, merge the namespaces together.
+If SEQUENCE has several prototypes, find the non-prototype.
+If SEQUENCE has some items w/ no type information, find the one with a type.
+If SEQUENCE is all prototypes, or has no prototypes, get the first one.
+Optional TAGCLASS indicates to restrict the return to only
+tags of TAGCLASS."
+
+  ;; If there is a srew up and we get just one tag.. massage over it.
+  (when (semantic-tag-p sequence)
+    (setq sequence (list sequence)))
+
+  ;; Filter out anything not of TAGCLASS
+  (when tagclass
+    (setq sequence (semantic-find-tags-by-class tagclass sequence)))
+
+  (if (< (length sequence) 2)
+      ;; If the remaining sequence is 1 tag or less, just return it
+      ;; and skip the rest of this mumbo-jumbo.
+      (car sequence)
+
+    ;; 1)
+    ;; This step will eliminate a vast majority of the types,
+    ;; in addition to merging namespaces together.
+    ;;
+    ;; 2)
+    ;; It will also remove prototypes.
+    (setq sequence (semanticdb-typecache-merge-streams sequence nil))
+
+    (if (< (length sequence) 2)
+	;; If the remaining sequence after the merge is 1 tag or less,
+	;; just return it and skip the rest of this mumbo-jumbo.
+	(car sequence)
+
+      (let ((best nil)
+	    (notypeinfo nil)
+	    )
+	(while (and (not best) sequence)
+
+	  ;; 3) select a non-prototype.
+	  (if (not (semantic-tag-type (car sequence)))
+	      (setq notypeinfo (car sequence))
+
+	    (setq best (car sequence))
+	    )
+
+	  (setq sequence (cdr sequence)))
+
+	;; Select the best, or at least the prototype.
+	(or best notypeinfo)))))
+
+;;; Tag Finding
+;;
+;; Mechanism for lookup up tags by name.
+;;
+(defun semantic-analyze-find-tags-by-prefix (prefix)
+  ;; @todo - only used in semantic-complete.  Find something better?
+  "Attempt to find a tag with PREFIX.
+This is a wrapper on top of semanticdb, and semantic search functions.
+Almost all searches use the same arguments."
+  (if (and (fboundp 'semanticdb-minor-mode-p)
+           (semanticdb-minor-mode-p))
+      ;; Search the database & concatenate all matches together.
+      (semanticdb-strip-find-results
+       (semanticdb-find-tags-for-completion prefix)
+       'name)
+    ;; Search just this file because there is no DB available.
+    (semantic-find-tags-for-completion
+     prefix (current-buffer))))
+
+;;; Finding Datatypes
+;;
+;; Finding a data type by name within a project.
+;;
+(defun semantic-analyze-type-to-name (type)
+  "Get the name of TAG's type.
+The TYPE field in a tag can be nil (return nil)
+or a string, or a non-positional tag."
+  (cond ((semantic-tag-p type)
+	 (semantic-tag-name type))
+	((stringp type)
+	 type)
+	((listp type)
+	 (car type))
+	(t nil)))
+
+(defun semantic-analyze-tag-type (tag &optional scope nometaderef)
+  "Return the semantic tag for a type within the type of TAG.
+TAG can be a variable, function or other type of tag.
+The behavior of TAG's type is defined by `semantic-analyze-type'.
+Optional SCOPE represents a calculated scope in which the
+types might be found.  This can be nil.
+If NOMETADEREF, then do not dereference metatypes.  This is
+used by the analyzer debugger."
+  (semantic-analyze-type (semantic-tag-type tag) scope nometaderef))
+
+(defun semantic-analyze-type (type-declaration &optional scope nometaderef)
+  "Return the semantic tag for TYPE-DECLARATION.
+TAG can be a variable, function or other type of tag.
+The type of tag (such as a class or struct) is a name.
+Lookup this name in database, and return all slots/fields
+within that types field.  Also handles anonymous types.
+Optional SCOPE represents a calculated scope in which the
+types might be found.  This can be nil.
+If NOMETADEREF, then do not dereference metatypes.  This is
+used by the analyzer debugger."
+  (let ((name nil)
+	(typetag nil)
+	)
+
+    ;; Is it an anonymous type?
+    (if (and type-declaration
+	     (semantic-tag-p type-declaration)
+	     (semantic-tag-of-class-p type-declaration 'type)
+	     (not (semantic-analyze-tag-prototype-p type-declaration))
+	     )
+	;; We have an anonymous type for TAG with children.
+	;; Use this type directly.
+	(if nometaderef
+	    type-declaration
+	  (semantic-analyze-dereference-metatype-stack
+	   type-declaration scope type-declaration))
+
+      ;; Not an anonymous type.  Look up the name of this type
+      ;; elsewhere, and report back.
+      (setq name (semantic-analyze-type-to-name type-declaration))
+
+      (if (and name (not (string= name "")))
+	  (progn
+	    ;; Find a type of that name in scope.
+	    (setq typetag (and scope (semantic-scope-find name 'type scope)))
+	    ;; If no typetag, try the typecache
+	    (when (not typetag)
+	      (setq typetag (semanticdb-typecache-find name))))
+
+	;; No name to look stuff up with.
+	(error "Semantic tag %S has no type information"
+	       (semantic-tag-name type-declaration)))
+
+      ;; Handle lists of tags.
+      (when (and (consp typetag) (semantic-tag-p (car typetag)))
+	(setq typetag (semantic-analyze-select-best-tag typetag 'type))
+	)
+
+      ;; We now have a tag associated with the type.  We need to deref it.
+      ;;
+      ;; If we were asked not to (ie - debugger) push the typecache anyway.
+      (if nometaderef
+	  typetag
+	(unwind-protect
+	    (progn
+	      (semantic-scope-set-typecache
+	       scope (semantic-scope-tag-get-scope typetag))
+	      (semantic-analyze-dereference-metatype-stack typetag scope type-declaration)
+	      )
+	  (semantic-scope-set-typecache scope nil)
+	  )))))
+
+(defun semantic-analyze-dereference-metatype-stack (type scope &optional type-declaration)
+  "Dereference metatypes repeatedly until we hit a real TYPE.
+Uses `semantic-analyze-dereference-metatype'.
+Argument SCOPE is the scope object with additional items in which to search.
+Optional argument TYPE-DECLARATION is how TYPE was found referenced."
+  (let ((lasttype type)
+        (lasttypedeclaration type-declaration)
+	(nexttype (semantic-analyze-dereference-metatype type scope type-declaration))
+	(idx 0))
+    (catch 'metatype-recursion
+      (while (and nexttype (not (eq (car nexttype) lasttype)))
+	(setq lasttype (car nexttype)
+	      lasttypedeclaration (cadr nexttype))
+	(setq nexttype (semantic-analyze-dereference-metatype lasttype scope lasttypedeclaration))
+	(setq idx (1+ idx))
+	(when (> idx 20) (message "Possible metatype recursion for %S"
+				  (semantic-tag-name lasttype))
+	      (throw 'metatype-recursion nil))
+	))
+    lasttype))
+
+(define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration)
+  ;; todo - move into typecahe!!
+  "Return a concrete type tag based on input TYPE tag.
+A concrete type is an actual declaration of a memory description,
+such as a structure, or class.  A meta type is an alias,
+or a typedef in C or C++.  If TYPE is concrete, it
+is returned.  If it is a meta type, it will return the concrete
+type defined by TYPE.
+The default behavior always returns TYPE.
+Override functions need not return a real semantic tag.
+Just a name, or short tag will be ok.  It will be expanded here.
+SCOPE is the scope object with additional items in which to search for names."
+  (catch 'default-behavior
+    (let* ((ans-tuple (:override
+                       ;; Nothing fancy, just return type by default.
+                       (throw 'default-behavior (list type type-declaration))))
+           (ans-type (car ans-tuple))
+           (ans-type-declaration (cadr ans-tuple)))
+       (list (semantic-analyze-dereference-metatype-1 ans-type scope) ans-type-declaration))))
+
+;; @ TODO - the typecache can also return a stack of scope names.
+
+(defun semantic-analyze-dereference-metatype-1 (ans scope)
+  "Do extra work after dereferencing a metatype.
+ANS is the answer from the the language specific query.
+SCOPE is the current scope."
+  ;; If ANS is a string, or if ANS is a short tag, we
+  ;; need to do some more work to look it up.
+  (if (stringp ans)
+      ;; The metatype is just a string... look it up.
+      (or (and scope (car-safe
+		      ;; @todo - should this be `find the best one'?
+		      (semantic-scope-find ans 'type scope)))
+	  (let ((tcsans nil))
+	    (prog1
+		(setq tcsans
+		      (semanticdb-typecache-find ans))
+	      ;; While going through the metatype, if we have
+	      ;; a scope, push our new cache in.
+	      (when scope
+		(semantic-scope-set-typecache
+		 scope (semantic-scope-tag-get-scope tcsans))
+		))
+	    ))
+    (when (and (semantic-tag-p ans)
+	       (eq (semantic-tag-class ans) 'type))
+      ;; We have a tag.
+      (if (semantic-analyze-tag-prototype-p ans)
+	  ;; It is a prototype.. find the real one.
+	  (or (and scope
+		   (car-safe
+		    (semantic-scope-find (semantic-tag-name ans)
+					 'type scope)))
+	      (let ((tcsans nil))
+		(prog1
+		    (setq tcsans
+			  (semanticdb-typecache-find (semantic-tag-name ans)))
+		  ;; While going through the metatype, if we have
+		  ;; a scope, push our new cache in.
+		  (when scope
+		    (semantic-scope-set-typecache
+		     scope (semantic-scope-tag-get-scope tcsans))
+		    ))))
+	;; We have a tag, and it is not a prototype.
+	ans))
+    ))
+
+(provide 'semantic-analyze-fcn)
+
+;;; semantic-analyze-fcn.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-analyze-refs.el b/site/cedet-1.0pre7/semantic/semantic-analyze-refs.el
new file mode 100644
index 0000000..740d2b0
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-analyze-refs.el
@@ -0,0 +1,317 @@
+;;; semantic-analyze-refs.el --- Analysis of the references between tags.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-analyze-refs.el,v 1.7 2009/09/11 23:42:17 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Analyze the references between tags.
+;;
+;; The original purpose of these analysis is to provide a way to jump
+;; between a prototype and implementation.
+;;
+;; Finding all prototype/impl matches is hard because you have to search
+;; through the entire set of allowed databases to capture all possible
+;; refs.  The core analysis class stores basic starting point, and then
+;; entire raw search data, which is expensive to calculate.
+;;
+;; Once the raw data is available, queries for impl, prototype, or
+;; perhaps other things become cheap.
+
+;;; Code:
+(defclass semantic-analyze-references ()
+  ((tag :initarg :tag
+	:type semantic-tag
+	:documentation
+	"The starting TAG we are providing references analysis for.")
+   (tagdb :initarg :tagdb
+	  :documentation
+	  "The database that tag can be found in.")
+   (scope :initarg :scope
+	  :documentation "A Scope object.")
+   (rawsearchdata :initarg :rawsearchdata
+		  :documentation
+		  "The raw search data for TAG's name across all databases.")
+   ;; Note: Should I cache queried data here?  I expect that searching
+   ;; through rawsearchdata will be super-fast, so why bother?
+   )
+  "Class containing data from a semantic analysis.")
+
+;;;###autoload
+(define-overloadable-function semantic-analyze-tag-references (tag &optional db)
+  "Analyze the references for TAG.
+Returns a class with information about TAG.
+
+Optional argument DB is a database.  It will be used to help
+locate TAG.
+
+Use `semantic-analyze-current-tag' to debug this fcn.")
+
+(defun semantic-analyze-tag-references-default (tag &optional db)
+  "Analyze the references for TAG.
+Returns a class with information about TAG.
+
+Optional argument DB is a database.  It will be used to help
+locate TAG.
+
+Use `semantic-analyze-current-tag' to debug this fcn."
+  (when (not (semantic-tag-p tag))  (signal 'wrong-type-argument (list 'semantic-tag-p tag)))
+  (let ((allhits nil)
+	(scope nil)
+	)
+    (save-excursion
+      (semantic-go-to-tag tag db)
+      (setq scope (semantic-calculate-scope))
+
+      (setq allhits (semantic--analyze-refs-full-lookup tag scope))
+
+      (semantic-analyze-references (semantic-tag-name tag)
+				    :tag tag
+				    :tagdb db
+				    :scope scope
+				    :rawsearchdata allhits)
+      )))
+
+;;; METHODS
+;;
+;; These accessor methods will calculate the useful bits from the context, and cache values
+;; into the context.
+(defmethod semantic-analyze-refs-impl ((refs semantic-analyze-references) &optional in-buffer)
+  "Return the implementations derived in the reference analyzer REFS.
+Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer."
+  (let ((allhits (oref refs rawsearchdata))
+	(impl nil)
+	)
+    (semanticdb-find-result-mapc
+     (lambda (T DB)
+       "Examine T in the database DB, and sont it."
+       (let* ((ans (semanticdb-normalize-one-tag DB T))
+	      (aT (cdr ans))
+	      (aDB (car ans))
+	      )
+	 (when (not (semantic-tag-prototype-p aT))
+	   (when in-buffer (save-excursion (semantic-go-to-tag aT aDB)))
+	   (push aT impl))))
+     allhits)
+    impl))
+
+(defmethod semantic-analyze-refs-proto ((refs semantic-analyze-references) &optional in-buffer)
+  "Return the prototypes derived in the reference analyzer REFS.
+Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer."
+  (let ((allhits (oref refs rawsearchdata))
+	(proto nil))
+    (semanticdb-find-result-mapc
+     (lambda (T DB)
+       "Examine T in the database DB, and sort it."
+       (let* ((ans (semanticdb-normalize-one-tag DB T))
+	      (aT (cdr ans))
+	      (aDB (car ans))
+	      )
+	 (when (semantic-tag-prototype-p aT)
+	   (when in-buffer (save-excursion (semantic-go-to-tag aT aDB)))
+	   (push aT proto))))
+     allhits)
+    proto))
+
+;;; LOOKUP
+;;
+(defun semantic--analyze-refs-full-lookup (tag scope)
+  "Perform a full lookup for all occurances of TAG in the current project.
+TAG should be the tag currently under point.
+PARENT is the list of tags that are parents to TAG by
+containment, as opposed to reference."
+  (if (not (oref scope parents))
+      ;; If this tag has some named parent, but is not
+      (semantic--analyze-refs-full-lookup-simple tag)
+
+    ;; We have some sort of lineage we need to consider when we do
+    ;; our side lookup of tags.
+    (semantic--analyze-refs-full-lookup-with-parents tag scope)
+    ))
+
+(defun semantic--analyze-refs-find-child-in-find-results (find-results name class)
+  "Find in FIND-RESULT a tag NAME which is a child of a tag in FIND-RESULTS.
+CLASS is the class of the tag that ought to be returned."
+  (let ((ans nil)
+	(subans nil))
+    ;; Loop over each segment of the find results.
+    (dolist (FDB find-results)
+      (setq subans nil)
+      ;; Loop over each tag in the find results.
+      (dolist (T (cdr FDB))
+	;; For each tag, get the children.
+	(let* ((chil (semantic-tag-type-members T))
+	       (match (semantic-find-tags-by-name name chil)))
+	  ;; Go over the matches, looking for matching tag class.
+	  (dolist (M match)
+	    (when (semantic-tag-of-class-p M class)
+	      (push M subans)))))
+      ;; Store current matches into a new find results.
+      (when subans
+	(push (cons (car FDB) subans) ans))
+      )
+    ans))
+
+(defun semantic--analyze-refs-find-tags-with-parent (find-results parents)
+  "Find in FIND-RESULTS all tags with PARNTS.
+NAME is the name of the tag needing finding.
+PARENTS is a list of names."
+  (let ((ans nil))
+    (semanticdb-find-result-mapc
+     (lambda (tag db)
+       (let* ((p (semantic-tag-named-parent tag))
+	      (ps (when (stringp p)
+		    (semantic-analyze-split-name p))))
+	 (when (stringp ps) (setq ps (list ps)))
+	 (when (and ps (equal ps parents))
+	   ;; We could optimize this, but it seems unlikely.
+	   (push (list db tag) ans))
+	 ))
+     find-results)
+    ans))
+
+(defun semantic--analyze-refs-full-lookup-with-parents (tag scope)
+  "Perform a lookup for all occurances of TAG based on TAG's SCOPE.
+TAG should be the tag currently under point."
+  (let* ((classmatch (semantic-tag-class tag))
+	 (plist (mapcar (lambda (T) (semantic-tag-name T)) (oref scope parents)))
+	 ;; The first item in the parent list
+	 (name (car plist))
+	 ;; Stuff from the simple list.
+	 (simple (semantic--analyze-refs-full-lookup-simple tag t))
+	 ;; Find all hits for the first parent name.
+	 (brute (semanticdb-find-tags-collector
+		 (lambda (table tags)
+		   (semanticdb-find-tags-by-name-method table name tags)
+		   )
+		 nil nil t))
+	 ;; Prime the answer.
+	 (answer (semantic--analyze-refs-find-tags-with-parent simple plist))
+	 )
+    ;; First parent is already search to initialize "brute".
+    (setq plist (cdr plist))
+    ;; Go through the list of parents, and try to find matches.
+    ;; As we cycle through plist, for each level look for NAME,
+    ;; and compare the named-parent, and also dive into the next item of
+    ;; plist.
+    (while (and plist brute)
+
+      ;; Find direct matches
+      (let* ((direct (semantic--analyze-refs-find-child-in-find-results
+		      brute (semantic-tag-name tag) classmatch))
+	     (pdirect (semantic--analyze-refs-find-tags-with-parent
+		       direct plist)))
+	(setq answer (append pdirect answer)))
+
+      ;; The next set of search items.
+      (setq brute (semantic--analyze-refs-find-child-in-find-results
+		   brute (car plist) 'type))
+
+      (setq plist (cdr plist)))
+
+    ;; Brute now has the children from the very last match.
+    (let* ((direct (semantic--analyze-refs-find-child-in-find-results
+		    brute (semantic-tag-name tag) classmatch))
+	   )
+      (setq answer (append direct answer)))
+
+    answer))
+
+(defun semantic--analyze-refs-full-lookup-simple (tag &optional noerror)
+  "Perform a simple  lookup for occurances of TAG in the current project.
+TAG should be the tag currently under point.
+Optional NOERROR means don't throw errors on failure to find something.
+This only compares the tag name, and does not infer any matches in namespaces,
+or parts of some other data structure.
+Only works for tags in the global namespace."
+  (let* ((name (semantic-tag-name tag))
+	 (brute (semanticdb-find-tags-collector
+		 (lambda (table tags)
+		   (semanticdb-find-tags-by-name-method table name tags)
+		   )
+		 nil nil t))
+	 )
+
+	(when (and (not brute) (not noerror))
+	  ;; An error, because tag under point ought to be found.
+	  (error "Cannot find any references to %s in wide search" name))
+
+	(let* ((classmatch (semantic-tag-class tag))
+	       (RES
+		(semanticdb-find-tags-collector
+		 (lambda (table tags)
+		   (semantic-find-tags-by-class classmatch tags)
+		   ;; @todo - Add parent check also.
+		   )
+		 brute nil)))
+
+	  (when (and (not RES) (not noerror))
+	    (error "Cannot find any definitions for %s in wide search"
+		   (semantic-tag-name tag)))
+
+	  ;; Return the matching tags and databases.
+	  RES)))
+
+
+;;; USER COMMANDS
+;;
+;;;###autoload
+(defun semantic-analyze-current-tag ()
+  "Analyze the tag under point."
+  (interactive)
+  (let* ((tag (semantic-current-tag))
+	 (start (current-time))
+	 (sac (semantic-analyze-tag-references tag))
+	 (end (current-time))
+	 )
+    (message "Analysis took %.2f seconds." (semantic-elapsed-time start end))
+    (if sac
+	(progn
+	  (data-debug-new-buffer "*Analyzer Reference ADEBUG*")
+	  (data-debug-insert-object-slots sac "]"))
+      (message "No Context to analyze here."))))
+
+;;;###autoload
+(defun semantic-analyze-proto-impl-toggle ()
+  "Toggle between the implementation, and a prototype of tag under point."
+  (interactive)
+  (semantic-fetch-tags)
+  (let* ((tag (semantic-current-tag))
+	 (sar (if tag
+		  (semantic-analyze-tag-references tag)
+		(error "Point must be in a declaration")))
+	 (target (if (semantic-tag-prototype-p tag)
+		     (car (semantic-analyze-refs-impl sar t))
+		   (car (semantic-analyze-refs-proto sar t))))
+	 )
+
+    (when (not target)
+      (error "Could not find suitable %s"
+	     (if (semantic-tag-prototype-p tag) "implementation" "prototype")))
+
+    (push-mark)
+    (semantic-go-to-tag target)
+    (switch-to-buffer (current-buffer))
+    (semantic-momentary-highlight-tag target))
+  )
+
+(provide 'semantic-analyze-refs)
+
+;;; semantic-analyze-refs.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-analyze.el b/site/cedet-1.0pre7/semantic/semantic-analyze.el
new file mode 100644
index 0000000..fc3f005
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-analyze.el
@@ -0,0 +1,795 @@
+;;; semantic-analyze.el --- Analyze semantic tags against local context
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-analyze.el,v 1.87 2009/09/12 02:32:43 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic, as a tool, provides a nice list of searchable tags.
+;; That information can provide some very accurate answers if the current
+;; context of a position is known.
+;;
+;; Semantic-ctxt provides ways of analyzing, and manipulating the
+;; semantic context of a language in code.
+;;
+;; This library provides routines for finding intelligent answers to
+;; tough problems, such as if an argument to a function has the correct
+;; return type, or all possible tags that fit in a given local context.
+;;
+
+;;; Vocabulary:
+;;
+;; Here are some words used to describe different things in the analyzer:
+;;
+;; tag - A single entity
+;; prefix - The beginning of a symbol, usually used to look up something
+;;       incomplete.
+;; type - The name of a datatype in the langauge.
+;; metatype - If a type is named in a declaration like:
+;;       struct moose somevariable;
+;;       that name "moose" can be turned into a concrete type.
+;; tag sequence - In C code, a list of dereferences, such as:
+;;       this.that.theother();
+;; parent - For a datatype in an OO language, another datatype
+;;       inherited from.  This excludes interfaces.
+;; scope - A list of tags that can be dereferenced that cannot
+;;       be found from the global namespace.
+;; scopetypes - A list of tags which are datatype that contain
+;;       the scope.  The scopetypes need to have the scope extracted
+;;       in a way that honors the type of inheritance.
+;; nest/nested - When one tag is contained entirely in another.
+;;
+;; context - A semantic datatype representing a point in a buffer.
+;;
+;; constriant - If a context specifies a specific datatype is needed,
+;;       that is a constraint.
+;; constants - Some datatypes define elements of themselves as a
+;;       constant.  These need to be returned as there would be no
+;;       other possible completions.
+;;
+(require 'inversion)
+(eval-and-compile
+  (inversion-require 'eieio "1.0"))
+(require 'semantic)
+(require 'semantic-format)
+(require 'semantic-ctxt)
+(require 'semantic-sort)
+(eval-when-compile (require 'semanticdb)
+		   (require 'semanticdb-find))
+
+(require 'semantic-scope)
+(require 'semantic-analyze-fcn)
+
+;;; Code:
+(defvar semantic-analyze-error-stack nil
+  "Collection of any errors thrown during analysis.")
+
+(defun semantic-analyze-push-error (err)
+  "Push the error in ERR-DATA onto the error stack.
+Argument ERR"
+  (push err semantic-analyze-error-stack))
+
+;;; Analysis Classes
+;;
+;; These classes represent what a context is.  Different types
+;; of contexts provide differing amounts of information to help
+;; provide completions.
+;;
+(defclass semantic-analyze-context ()
+  ((bounds :initarg :bounds
+	   :type list
+	   :documentation "The bounds of this context.
+Usually bound to the dimension of a single symbol or command.")
+   (prefix :initarg :prefix
+	   :type list
+	   :documentation "List of tags defining local text.
+This can be nil, or a list where the last element can be a string
+representing text that may be incomplete.  Preceeding elements
+must be semantic tags representing variables or functions
+called in a dereference sequence.")
+   (prefixclass :initarg :prefixclass
+		:type list
+		:documentation "Tag classes expected at this context.
+These are clases for tags, such as 'function, or 'variable.")
+   (prefixtypes :initarg :prefixtypes
+	   :type list
+	   :documentation "List of tags defining types for :prefix.
+This list is one shorter than :prefix.  Each element is a semantic
+tag representing a type matching the semantic tag in the same
+position in PREFIX.")
+   (scope :initarg :scope
+	  :type (or null semantic-scope-cache)
+	  :documentation "List of tags available in scopetype.
+See `semantic-analyze-scoped-tags' for details.")
+   (buffer :initarg :buffer
+	   :type buffer
+	   :documentation "The buffer this context is derived from.")
+   (errors :initarg :errors
+	   :documentation "Any errors thrown an caught during analysis.")
+   )
+  "Base analysis data for a any context.")
+
+(defclass semantic-analyze-context-assignment (semantic-analyze-context)
+  ((assignee :initarg :assignee
+	     :type list
+	     :documentation "A sequence of tags for an assignee.
+This is a variable into which some value is being placed.  The last
+item in the list is the variable accepting the value.  Earlier
+tags represent the variables being derefernece to get to the
+assignee."))
+  "Analysis class for a value in an assignment.")
+
+(defclass semantic-analyze-context-functionarg (semantic-analyze-context)
+  ((function :initarg :function
+	     :type list
+	     :documentation "A sequence of tags for a function.
+This is a function being called.  The cursor will be in the position
+of an argument.
+The last tag in :function is the function being called.  Earlier
+tags represent the variables being dereferenced to get to the
+function.")
+   (index :initarg :index
+	  :type integer
+	  :documentation "The index of the argument for this context.
+If a function takes 4 arguments, this value should be bound to
+the values 1 through 4.")
+   (argument :initarg :argument
+	     :type list
+	     :documentation "A sequence of tags for the :index argument.
+The argument can accept a value of some type, and this contains the
+tag for that definition.  It should be a tag, but might
+be just a string in some circumstances.")
+   )
+  "Analysis class for a value as a function argument.")
+
+(defclass semantic-analyze-context-return (semantic-analyze-context)
+  () ; No extra data.
+  "Analysis class for return data.
+Return data methods identify the requred type by the return value
+of the parent function.")
+
+;;; METHODS
+;;
+;; Simple methods against the context classes.
+;;
+(defmethod semantic-analyze-type-constraint
+  ((context semantic-analyze-context) &optional desired-type)
+  "Return a type constraint for completing :prefix in CONTEXT.
+Optional argument DESIRED-TYPE may be a non-type tag to analyze."
+  (when (semantic-tag-p desired-type)
+    ;; Convert the desired type if needed.
+    (if (not (eq (semantic-tag-class desired-type) 'type))
+	(setq desired-type (semantic-tag-type desired-type)))
+    ;; Protect against plain strings
+    (cond ((stringp desired-type)
+	   (setq desired-type (list desired-type 'type)))
+	  ((and (stringp (car desired-type))
+		(not (semantic-tag-p desired-type)))
+	   (setq desired-type (list (car desired-type) 'type)))
+	  ((semantic-tag-p desired-type)
+	   ;; We have a tag of some sort.  Yay!
+	   nil)
+	  (t (setq desired-type nil))
+	  )
+    desired-type))
+
+(defmethod semantic-analyze-type-constraint
+  ((context semantic-analyze-context-functionarg))
+  "Return a type constraint for completing :prefix in CONTEXT."
+  (call-next-method context (car (oref context argument))))
+
+(defmethod semantic-analyze-type-constraint
+  ((context semantic-analyze-context-assignment))
+  "Return a type constraint for completing :prefix in CONTEXT."
+  (call-next-method context (car (reverse (oref context assignee)))))
+
+(defmethod semantic-analyze-interesting-tag
+  ((context semantic-analyze-context))
+  "Return a tag from CONTEXT that would be most interesting to a user."
+  (let ((prefix (reverse (oref context :prefix))))
+    ;; Go back through the prefix until we find a tag we can return.
+    (while (and prefix (not (semantic-tag-p (car prefix))))
+      (setq prefix (cdr prefix)))
+    ;; Return the found tag, or nil.
+    (car prefix)))
+
+(defmethod semantic-analyze-interesting-tag
+  ((context semantic-analyze-context-functionarg))
+  "Try the base, and if that fails, return what we are assigning into."
+  (or (call-next-method) (car-safe (oref context :function))))
+
+(defmethod semantic-analyze-interesting-tag
+  ((context semantic-analyze-context-assignment))
+  "Try the base, and if that fails, return what we are assigning into."
+  (or (call-next-method) (car-safe (oref context :assignee))))
+
+;;; ANALYSIS
+;;
+;; Start out with routines that will calculate useful parts of
+;; the general analyzer function.  These could be used directly
+;; by an application that doesn't need to calculate the full
+;; context.
+
+(define-overloadable-function semantic-analyze-find-tag-sequence (sequence &optional
+							      scope typereturn throwsym)
+  "Attempt to find all tags in SEQUENCE.
+Optional argument LOCALVAR is the list of local variables to use when
+finding the details on the first element of SEQUENCE in case
+it is not found in the global set of tables.
+Optional argument SCOPE are additional terminals to search which are currently
+scoped.  These are not local variables, but symbols available in a structure
+which doesn't need to be dereferneced.
+Optional argument TYPERETURN is a symbol in which the types of all found
+will be stored.  If nil, that data is thrown away.
+Optional argument THROWSYM specifies a symbol the throw on non-recoverable error.")
+
+(defun semantic-analyze-find-tag-sequence-default (sequence &optional
+							    scope typereturn
+							    throwsym)
+  "Attempt to find all tags in SEQUENCE.
+SCOPE are extra tags which are in scope.
+TYPERETURN is a symbol in which to place a list of tag classes that
+are found in SEQUENCE.
+Optional argument THROWSYM specifies a symbol the throw on non-recoverable error."
+  (let ((s sequence)			; copy of the sequence
+	(tmp nil)			; tmp find variable
+	(tag nil)			; tag return list
+	(tagtype nil)			; tag types return list
+	(fname nil)
+	(miniscope (clone scope))
+	)
+    ;; First order check.  Is this wholely contained in the typecache?
+    (setq tmp (semanticdb-typecache-find sequence))
+
+    (if tmp
+	(progn
+	  ;; We are effectively done...
+	  (setq s nil)
+	  (setq tag (list tmp)))
+
+      ;; For the first entry, it better be a variable, but it might
+      ;; be in the local context too.
+      ;; NOTE: Don't forget c++ namespace foo::bar.
+      (setq tmp (or
+		 ;; Is this tag within our scope.  Scopes can sometimes
+		 ;; shadow other things, so it goes first.
+		 (and scope (semantic-scope-find (car s) nil scope))
+		 ;; Find the tag out there... somewhere, but not in scope
+		 (semantic-analyze-find-tag (car s))
+		 ))
+
+      (if (and (listp tmp) (semantic-tag-p (car tmp)))
+	  (setq tmp (semantic-analyze-select-best-tag tmp)))
+      (if (not (semantic-tag-p tmp))
+	  (if throwsym
+	      (throw throwsym "Cannot find definition")
+	    (error "Cannot find definition for \"%s\"" (car s))))
+      (setq s (cdr s))
+      (setq tag (cons tmp tag)) ; tag is nil here...
+      (setq fname (semantic-tag-file-name tmp))
+      )
+
+    ;; For the middle entries
+    (while s
+      ;; Using the tag found in TMP, lets find the tag
+      ;; representing the full typeographic information of its
+      ;; type, and use that to determine the search context for
+      ;; (car s)
+      (let* ((tmptype
+	      ;; In some cases the found TMP is a type,
+	      ;; and we can use it directly.
+	      (cond ((semantic-tag-of-class-p tmp 'type)
+		     ;; update the miniscope when we need to analyze types directly.
+		     (let ((rawscope
+			    (apply 'append
+				   (mapcar 'semantic-tag-type-members
+					   tagtype))))
+		       (oset miniscope fullscope rawscope))
+		     ;; Now analayze the type to remove metatypes.
+		     (or (semantic-analyze-type tmp miniscope)
+			 tmp))
+		    (t
+		     (semantic-analyze-tag-type tmp scope))))
+	     (typefile
+	      (when tmptype
+		(semantic-tag-file-name tmptype)))
+	     (slots nil))
+
+	;; Get the children
+	(setq slots (semantic-analyze-scoped-type-parts tmptype scope))
+
+	;; find (car s) in the list o slots
+	(setq tmp (semantic-find-tags-by-name (car s) slots))
+
+	;; If we have lots
+	(if (and (listp tmp) (semantic-tag-p (car tmp)))
+	    (setq tmp (semantic-analyze-select-best-tag tmp)))
+
+	;; Make sure we have a tag.
+	(if (not (semantic-tag-p tmp))
+	    (if (cdr s)
+		;; In the middle, we need to keep seeking our types out.
+		(error "Cannot find definition for \"%s\"" (car s))
+	      ;; Else, it's ok to end with a non-tag
+	      (setq tmp (car s))))
+
+	(setq fname (or typefile fname))
+	(when (and fname (semantic-tag-p tmp)
+		   (not (semantic-tag-in-buffer-p tmp)))
+	  (semantic--tag-put-property tmp :filename fname))
+	(setq tag (cons tmp tag))
+	(setq tagtype (cons tmptype tagtype))
+	)
+      (setq s (cdr s)))
+
+    (if typereturn (set typereturn (nreverse tagtype)))
+    ;; Return the mess
+    (nreverse tag)))
+
+(defun semantic-analyze-find-tag (name &optional tagclass scope)
+  "Return the first tag found with NAME or nil if not found.
+Optional argument TAGCLASS specifies the class of tag to return, such
+as 'function or 'variable.
+Optional argument SCOPE specifies a scope object which has
+additional tags which are in SCOPE and do not need prefixing to
+find.
+
+This is a wrapper on top of semanticdb, semanticdb-typecache,
+semantic-scope, and semantic search functions.  Almost all
+searches use the same arguments."
+  (let ((namelst (if (consp name) name ;; test if pre-split.
+		   (semantic-analyze-split-name name))))
+    (cond
+     ;; If the splitter gives us a list, use the sequence finder
+     ;; to get the list.  Since this routine is expected to return
+     ;; only one tag, return the LAST tag found from the sequence
+     ;; which is supposedly the nested reference.
+     ;;
+     ;; Of note, the SEQUENCE function below calls this function
+     ;; (recursively now) so the names that we get from the above
+     ;; fcn better not, in turn, be splittable.
+     ((listp namelst)
+      ;; If we had a split, then this is likely a c++ style namespace::name sequence,
+      ;; so take a short-cut through the typecache.
+      (or (semanticdb-typecache-find namelst)
+	  ;; Ok, not there, try the usual...
+	  (let ((seq (semantic-analyze-find-tag-sequence
+		      namelst scope nil)))
+	    (semantic-analyze-select-best-tag seq tagclass)
+	    )))
+     ;; If NAME is solo, then do our searches for it here.
+     ((stringp namelst)
+      (let ((retlist (and scope (semantic-scope-find name tagclass scope))))
+	(if retlist
+	    (semantic-analyze-select-best-tag
+	     retlist tagclass)
+	  (if (eq tagclass 'type)
+	      (semanticdb-typecache-find name)
+	    ;; Search in the typecache.  First entries in a sequence are
+	    ;; often there.
+	    (setq retlist (semanticdb-typecache-find name))
+	    (if retlist
+		retlist
+	      (semantic-analyze-select-best-tag
+	       (semanticdb-strip-find-results
+		(semanticdb-find-tags-by-name name)
+		'name)
+	       tagclass)
+	      )))))
+     )))
+
+;;; SHORT ANALYSIS
+;;
+;; Create a mini-analysis of just the symbol under point.
+;;
+;;;###autoload
+(define-overloadable-function semantic-analyze-current-symbol
+  (analyzehookfcn &optional position)
+  "Call ANALYZEHOOKFCN after analyzing the symbol under POSITION.
+The ANALYZEHOOKFCN is called with the current symbol bounds, and the
+analyzed prefix.  It should take the arguments (START END PREFIX).
+The ANALYZEHOOKFCN is only called if some sort of prefix with bounds was
+found under POSITION.
+
+The results of ANALYZEHOOKFCN is returned, or nil if there was nothing to
+call it with.
+
+For regular analysis, you should call `semantic-analyze-current-context'
+to calculate the context information.  The purpose for this function is
+to provide a large number of non-cached analysis for filtering symbols."
+  ;; Only do this in a Semantic enabled buffer.
+  (when (not (semantic-active-p))
+    (error "Cannot analyze buffers not supported by Semantic."))
+  ;; Always refresh out tags in a safe way before doing the
+  ;; context.
+  (semantic-refresh-tags-safe)
+  ;; Do the rest of the analysis.
+  (save-match-data
+    (save-excursion
+      (:override)))
+  )
+
+(defun semantic-analyze-current-symbol-default (analyzehookfcn position)
+  "Call ANALYZEHOOKFCN on the analyzed symbol at POSITION."
+  (let* ((semantic-analyze-error-stack nil)
+	 (LLstart (current-time))
+	 (prefixandbounds (semantic-ctxt-current-symbol-and-bounds (or position (point))))
+	 (prefix (car prefixandbounds))
+	 (bounds (nth 2 prefixandbounds))
+	 (scope (semantic-calculate-scope position))
+	 (end nil)
+	 )
+        ;; Only do work if we have bounds (meaning a prefix to complete)
+    (when bounds
+
+      (if debug-on-error
+	  (catch 'unfindable
+	    ;; If debug on error is on, allow debugging in this fcn.
+	    (setq prefix (semantic-analyze-find-tag-sequence
+			  prefix scope 'prefixtypes 'unfindable)))
+	;; Debug on error is off.  Capture errors and move on
+	(condition-case err
+	    ;; NOTE: This line is duplicated in
+	    ;;       semantic-analyzer-debug-global-symbol
+	    ;;       You will need to update both places.
+	    (setq prefix (semantic-analyze-find-tag-sequence
+			  prefix scope 'prefixtypes))
+	  (error (semantic-analyze-push-error err))))
+
+      (setq end (current-time))
+      ;;(message "Analysis took %.2f sec" (semantic-elapsed-time LLstart end))
+
+      )
+    (when prefix
+      (prog1
+	  (funcall analyzehookfcn (car bounds) (cdr bounds) prefix)
+	;;(setq end (current-time))
+	;;(message "hookfcn took %.5f sec" (semantic-elapsed-time LLstart end))
+	)
+
+	)))
+
+;;; MAIN ANALYSIS
+;;
+;; Create a full-up context analysis.
+;;
+;;;###autoload
+(define-overloadable-function semantic-analyze-current-context (&optional position)
+  "Analyze the current context at optional POSITION.
+If called interactively, display interesting information about POSITION
+in a separate buffer.
+Returns an object based on symbol `semantic-analyze-context'.
+
+This function can be overriden with the symbol `analyze-context'.
+When overriding this function, your override will be called while
+cursor is at POSITION.  In addition, your function will not be called
+if a cached copy of the return object is found."
+  (interactive "d")
+  ;; Only do this in a Semantic enabled buffer.
+  (when (not (semantic-active-p))
+    (error "Cannot analyze buffers not supported by Semantic."))
+  ;; Always refresh out tags in a safe way before doing the
+  ;; context.
+  (semantic-refresh-tags-safe)
+  ;; Do the rest of the analysis.
+  (if (not position) (setq position (point)))
+  (save-excursion
+    (goto-char position)
+    (let* ((answer (semantic-get-cache-data 'current-context)))
+      (with-syntax-table semantic-lex-syntax-table
+	(when (not answer)
+	  (setq answer (:override))
+	  (when (and answer (oref answer bounds))
+	    (with-slots (bounds) answer
+	      (semantic-cache-data-to-buffer (current-buffer)
+					     (car bounds)
+					     (cdr bounds)
+					     answer
+					     'current-context
+					     'exit-cache-zone)))
+	  ;; Check for interactivity
+	  (when (interactive-p)
+	    (if answer
+		(semantic-analyze-pop-to-context answer)
+	      (message "No Context."))
+	    ))
+
+	answer))))
+
+(defun semantic-analyze-current-context-default (position)
+  "Analyze the current context at POSITION.
+Returns an object based on symbol `semantic-analyze-context'."
+  (let* ((semantic-analyze-error-stack nil)
+	 (context-return nil)
+	 (prefixandbounds (semantic-ctxt-current-symbol-and-bounds (or position (point))))
+	 (prefix (car prefixandbounds))
+	 (bounds (nth 2 prefixandbounds))
+	 ;; @todo - vv too early to really know this answer! vv
+	 (prefixclass (semantic-ctxt-current-class-list))
+	 (prefixtypes nil)
+	 (scope (semantic-calculate-scope position))
+	 (function nil)
+	 (fntag nil)
+	 arg fntagend argtag
+	 assign asstag
+	 )
+
+    ;; Pattern for Analysis:
+    ;;
+    ;; Step 1: Calculate DataTypes in Scope:
+    ;;
+    ;;  a) Calculate the scope (above)
+    ;;
+    ;; Step 2: Parse context
+    ;;
+    ;; a) Identify function being called, or variable assignment,
+    ;;    and find source tags for those references
+    ;; b) Identify the prefix (text cursor is on) and find the source
+    ;;    tags for those references.
+    ;;
+    ;; Step 3: Assemble an object
+    ;;
+
+    ;; Step 2 a:
+
+    (setq function (semantic-ctxt-current-function))
+
+    (when function
+      ;; Calculate the argument for the function if there is one.
+      (setq arg (semantic-ctxt-current-argument))
+
+      ;; Find a tag related to the function name.
+      (condition-case err
+	  (setq fntag
+		(semantic-analyze-find-tag-sequence function scope))
+	(error (semantic-analyze-push-error err)))
+
+      ;; fntag can have the last entry as just a string, meaning we
+      ;; could not find the core datatype.  In this case, the searches
+      ;; below will not work.
+      (when (stringp (car (last fntag)))
+	;; Take a wild guess!
+	(setcar (last fntag) (semantic-tag (car (last fntag)) 'function))
+	)
+
+      (when fntag
+	(let ((fcn (semantic-find-tags-by-class 'function fntag)))
+	  (when (not fcn)
+	    (let ((ty (semantic-find-tags-by-class 'type fntag)))
+	      (when ty
+		;; We might have a constructor with the same name as
+		;; the found datatype.
+		(setq fcn (semantic-find-tags-by-name
+			   (semantic-tag-name (car ty))
+			   (semantic-tag-type-members (car ty))))
+		(if fcn
+		    (let ((lp fcn))
+		      (while lp
+			(when (semantic-tag-get-attribute (car lp)
+							  :constructor)
+			  (setq fcn (cons (car lp) fcn)))
+			(setq lp (cdr lp))))
+		  ;; Give up, go old school
+		  (setq fcn fntag))
+		)))
+	  (setq fntagend (car (reverse fcn))
+		argtag
+		(when (semantic-tag-p fntagend)
+		  (nth (1- arg) (semantic-tag-function-arguments fntagend)))
+		fntag fcn))))
+
+    ;; Step 2 b:
+
+    ;; Only do work if we have bounds (meaning a prefix to complete)
+    (when bounds
+
+      (if debug-on-error
+	  (catch 'unfindable
+	    ;; If debug on error is on, allow debugging in this fcn.
+	    (setq prefix (semantic-analyze-find-tag-sequence
+			  prefix scope 'prefixtypes 'unfindable)))
+	;; Debug on error is off.  Capture errors and move on
+	(condition-case err
+	    ;; NOTE: This line is duplicated in
+	    ;;       semantic-analyzer-debug-global-symbol
+	    ;;       You will need to update both places.
+	    (setq prefix (semantic-analyze-find-tag-sequence
+			  prefix scope 'prefixtypes))
+	  (error (semantic-analyze-push-error err))))
+      )
+
+    ;; Step 3:
+
+    (cond
+     (fntag
+      ;; If we found a tag for our function, we can go into
+      ;; functional context analysis mode, meaning we have a type
+      ;; for the argument.
+      (setq context-return
+	    (semantic-analyze-context-functionarg
+	     "functionargument"
+	     :buffer (current-buffer)
+	     :function fntag
+	     :index arg
+	     :argument (list argtag)
+	     :scope scope
+	     :prefix prefix
+	     :prefixclass prefixclass
+	     :bounds bounds
+	     :prefixtypes prefixtypes
+	     :errors semantic-analyze-error-stack)))
+
+      ;; No function, try assignment
+     ((and (setq assign (semantic-ctxt-current-assignment))
+	   ;; We have some sort of an assignment
+	   (condition-case err
+	       (setq asstag (semantic-analyze-find-tag-sequence
+			     assign scope))
+	     (error (semantic-analyze-push-error err)
+		    nil)))
+
+      (setq context-return
+	    (semantic-analyze-context-assignment
+	     "assignment"
+	     :buffer (current-buffer)
+	     :assignee asstag
+	     :scope scope
+	     :bounds bounds
+	     :prefix prefix
+	     :prefixclass prefixclass
+	     :prefixtypes prefixtypes
+	     :errors semantic-analyze-error-stack)))
+
+     ;; TODO: Identify return value condition.
+     ;;((setq return .... what to do?)
+     ;;  ...)
+
+     (bounds
+      ;; Nothing in particular
+      (setq context-return
+	    (semantic-analyze-context
+	     "context"
+	     :buffer (current-buffer)
+	     :scope scope
+	     :bounds bounds
+	     :prefix prefix
+	     :prefixclass prefixclass
+	     :prefixtypes prefixtypes
+	     :errors semantic-analyze-error-stack)))
+
+     (t (setq context-return nil))
+     )
+
+    ;; Return our context.
+    context-return))
+
+
+;; Adebug output
+;;;###autoload
+(defun semantic-adebug-analyze (&optional ctxt)
+  "Perform `semantic-analyze-current-context'.
+Display the results as a debug list.
+Optional argument CTXT is the context to show."
+  (interactive)
+  (let ((start (current-time))
+	(ctxt (or ctxt (semantic-analyze-current-context)))
+	(end (current-time)))
+    (if (not ctxt)
+	(message "No Analyzer Results")
+      (message "Analysis  took %.2f seconds."
+	       (semantic-elapsed-time start end))
+      (semantic-analyze-pulse ctxt)
+      (if ctxt
+	  (progn
+	    (data-debug-new-buffer "*Analyzer ADEBUG*")
+	    (data-debug-insert-object-slots ctxt "]"))
+	(message "No Context to analyze here.")))))
+
+
+;;; DEBUG OUTPUT
+;;
+;; Friendly output of a context analysis.
+;;
+(defmethod semantic-analyze-pulse ((context semantic-analyze-context))
+  "Pulse the region that CONTEXT affects."
+  (save-excursion
+    (set-buffer (oref context :buffer))
+    (let ((bounds (oref context :bounds)))
+      (when bounds
+	(pulse-momentary-highlight-region (car bounds) (cdr bounds))))))
+
+(defcustom semantic-analyze-summary-function 'semantic-format-tag-prototype
+  "*Function to use when creating items in Imenu.
+Some useful functions are found in `semantic-format-tag-functions'."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+(defun semantic-analyze-princ-sequence (sequence &optional prefix buff)
+  "Send the tag SEQUENCE to standard out.
+Use PREFIX as a label.
+Use BUFF as a source of override methods."
+  (while sequence
+      (princ prefix)
+      (cond
+       ((semantic-tag-p (car sequence))
+	(princ (funcall semantic-analyze-summary-function
+			(car sequence))))
+       ((stringp (car sequence))
+	(princ "\"")
+	(princ (semantic--format-colorize-text (car sequence) 'variable))
+	(princ "\""))
+       (t
+	(princ (format "'%S" (car sequence)))))
+      (princ "\n")
+      (setq sequence (cdr sequence))
+      (setq prefix (make-string (length prefix) ? ))
+      ))
+
+(defmethod semantic-analyze-show ((context semantic-analyze-context))
+  "Insert CONTEXT into the current buffer in a nice way."
+  (semantic-analyze-princ-sequence (oref context prefix) "Prefix: " )
+  (semantic-analyze-princ-sequence (oref context prefixclass) "Prefix Classes: ")
+  (semantic-analyze-princ-sequence (oref context prefixtypes) "Prefix Types: ")
+  (semantic-analyze-princ-sequence (oref context errors) "Encountered Errors: ")
+  (princ "--------\n")
+  ;(semantic-analyze-princ-sequence (oref context scopetypes) "Scope Types: ")
+  ;(semantic-analyze-princ-sequence (oref context scope) "Scope: ")
+  ;(semantic-analyze-princ-sequence (oref context localvariables) "LocalVars: ")
+  (when (oref context scope)
+    (semantic-analyze-show (oref context scope)))
+  )
+
+(defmethod semantic-analyze-show ((context semantic-analyze-context-assignment))
+  "Insert CONTEXT into the current buffer in a nice way."
+  (semantic-analyze-princ-sequence (oref context assignee) "Assignee: ")
+  (call-next-method))
+
+(defmethod semantic-analyze-show ((context semantic-analyze-context-functionarg))
+  "Insert CONTEXT into the current buffer in a nice way."
+  (semantic-analyze-princ-sequence (oref context function) "Function: ")
+  (princ "Argument Index: ")
+  (princ (oref context index))
+  (princ "\n")
+  (semantic-analyze-princ-sequence (oref context argument) "Argument: ")
+  (call-next-method))
+
+(defun semantic-analyze-pop-to-context (context)
+  "Display CONTEXT in a temporary buffer.
+CONTEXT's content is described in `semantic-analyze-current-context'."
+  (semantic-analyze-pulse context)
+  (with-output-to-temp-buffer "*Semantic Context Analysis*"
+    (princ "Context Type: ")
+    (princ (object-name context))
+    (princ "\n")
+    (princ "Bounds: ")
+    (princ (oref context bounds))
+    (princ "\n")
+    (semantic-analyze-show context)
+    )
+  (shrink-window-if-larger-than-buffer
+   (get-buffer-window "*Semantic Context Analysis*"))
+  )
+
+(provide 'semantic-analyze)
+
+;;; semantic-analyze.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ast.el b/site/cedet-1.0pre7/semantic/semantic-ast.el
new file mode 100644
index 0000000..b0e2b0b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ast.el
@@ -0,0 +1,105 @@
+;;; semantic-ast.el --- Simple Abstract Syntax Trees
+
+;; Copyright (C) 2003 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 25 June 2003
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-ast.el,v 1.2 2005/09/30 20:18:47 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a simple implementation of Abstract Syntax Trees based on
+;; property lists.  Each AST node is defined by a property and its
+;; value.
+;;
+
+;;; History:
+;;
+
+;;; Code:
+(defsubst semantic-ast-get (ast node)
+  "From the abstract syntax tree AST, return NODE value.
+A node value is always a list or nil."
+  (plist-get ast node))
+
+(defsubst semantic-ast-get1 (ast node)
+  "From the abstract syntax tree AST, return NODE first value.
+A node value is always a list or nil."
+  (car (semantic-ast-get ast node)))
+
+(defsubst semantic-ast-get-string (ast node)
+  "From the abstract syntax tree AST, return NODE value as a string.
+Return concatenation of the strings in NODE value separated by a
+space."
+  (mapconcat #'(lambda (o) (format "%s" o))
+             (semantic-ast-get ast node)
+             " "))
+
+(defun semantic-ast-add (ast &rest nodes)
+  "Update the abstract syntax tree AST with NODES.
+NODES must be a sequence of NODE VALUE ..., where NODE is a symbol
+that identifies the node, and VALUE is a Lisp object.
+Add to the current value of NODE the associated new VALUE.
+A node value is always a list or nil.
+Return the updated abstract syntax tree."
+  (let (node value)
+    (while nodes
+      (setq node  (car nodes)
+            nodes (cdr nodes)
+            value (car nodes)
+            nodes (cdr nodes)
+            ast (plist-put ast node
+                           (cons value (plist-get ast node)))))
+    ast))
+
+(defun semantic-ast-put (ast &rest nodes)
+  "Update the abstract syntax tree AST with NODES.
+NODES must be a sequence of NODE VALUE ..., where NODE is a symbol
+that identifies a node, and VALUE is a Lisp object.
+Replace the current value of each NODE with the associated new VALUE.
+A node value is always a list or nil.
+Return the updated abstract syntax tree."
+  (let (node value)
+    (while nodes
+      (setq node  (car nodes)
+            nodes (cdr nodes)
+            value (car nodes)
+            nodes (cdr nodes)
+            ast (plist-put ast node (list value))))
+    ast))
+
+(defun semantic-ast-merge (ast1 ast2)
+  "Merge the abstract syntax trees AST1 and AST2.
+Return the new merged abstract syntax tree."
+  (let ((ast (copy-sequence ast1))
+        node)
+    (while ast2
+      (setq node (car ast2)
+            ast2 (cdr ast2)
+            ast  (plist-put ast node
+                            (append (plist-get ast node) (car ast2)))
+            ast2 (cdr ast2)))
+    ast))
+
+(provide 'semantic-ast)
+
+;;; semantic-ast.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-chart.el b/site/cedet-1.0pre7/semantic/semantic-chart.el
new file mode 100644
index 0000000..e598bf5
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-chart.el
@@ -0,0 +1,174 @@
+;;; semantic-util.el --- Utilities for use with semantic tag tables
+
+;;; Copyright (C) 1999, 2000, 2001, 2003, 2005, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: chart
+;; X-RCS: $Id: semantic-chart.el,v 1.15 2009/09/11 23:41:36 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A set of simple functions for charting details about a file based on
+;; the output of the semantic parser.
+;;
+
+(require 'semantic)
+(require 'chart)
+
+;;; Code:
+
+;;;###autoload
+(defun semantic-chart-tags-by-class (&optional tagtable)
+  "Create a bar chart representing the number of tags for a given tag class.
+Each bar represents how many toplevel tags in TAGTABLE
+exist with a given class.  See `semantic-symbol->name-assoc-list'
+for tokens which will be charted.
+TAGTABLE is passedto `semantic-something-to-tag-table'."
+  (interactive)
+  (let* ((stream (semantic-something-to-tag-table
+		  (or tagtable (current-buffer))))
+	 (names (mapcar 'cdr semantic-symbol->name-assoc-list))
+	 (nums (mapcar
+		(lambda (symname)
+		  (length
+		   (semantic-brute-find-tag-by-class (car symname)
+						     stream)
+		   ))
+		semantic-symbol->name-assoc-list)))
+    (chart-bar-quickie 'vertical
+		       "Semantic Toplevel Tag Volume"
+		       names "Tag Class"
+		       nums "Volume")
+    ))
+
+;;;###autoload
+(defun semantic-chart-database-size (&optional tagtable)
+  "Create a bar chart representing the size of each file in semanticdb.
+Each bar represents how many toplevel tags in TAGTABLE
+exist in each database entry.
+TAGTABLE is passed to `semantic-something-to-tag-table'."
+  (interactive)
+  (unless (and (fboundp 'semanticdb-minor-mode-p)
+	       (semanticdb-minor-mode-p))
+    (error "Semanticdb is not enabled"))
+  (let* ((db semanticdb-current-database)
+	 (dbt (semanticdb-get-database-tables db))
+	 (names (mapcar 'car
+			(object-assoc-list
+			 'file
+			 dbt)))
+	 (numnuts (mapcar (lambda (dba)
+			    (prog1
+				(cons
+				 (if (slot-boundp dba 'tags)
+				     (length (oref dba tags))
+				   1)
+				 (car names))
+			      (setq names (cdr names))))
+			  dbt))
+	 (nums nil)
+	 (fh (/ (- (frame-height) 7) 4)))
+    (setq numnuts (sort numnuts (lambda (a b) (> (car a) (car b)))))
+    (setq names (mapcar 'cdr numnuts)
+	  nums (mapcar 'car numnuts))
+    (if (> (length names) fh)
+	(progn
+	  (setcdr (nthcdr fh names) nil)
+	  (setcdr (nthcdr fh nums) nil)))
+    (chart-bar-quickie 'horizontal
+		       "Semantic DB Toplevel Tag Volume"
+		       names "File"
+		       nums "Volume")
+    ))
+
+(defun semantic-chart-token-complexity (tok)
+  "Calculate the `complexity' of token TOK."
+  (count-lines
+   (semantic-tag-end tok)
+   (semantic-tag-start tok)))
+
+;;;###autoload
+(defun semantic-chart-tag-complexity
+  (&optional class tagtable)
+  "Create a bar chart representing the complexity of some tags.
+Complexity is calculated for tags of CLASS.  Each bar represents
+the complexity of some tag in TAGTABLE.  Only the most complex
+items are charted.  TAGTABLE is passedto
+`semantic-something-to-tag-table'."
+  (interactive)
+  (let* ((sym (if (not class) 'function))
+	 (stream
+	  (semantic-find-tags-by-class
+	   sym (semantic-something-to-tag-table (or tagtable
+						    (current-buffer)))
+	   ))
+	 (name (cond ((semantic-tag-with-position-p (car stream))
+		      (buffer-name (semantic-tag-buffer (car stream))))
+		     (t "")))
+	 (cplx (mapcar (lambda (tok)
+			 (cons tok (semantic-chart-token-complexity tok)))
+		       stream))
+	 (namelabel (cdr (assoc 'function semantic-symbol->name-assoc-list)))
+	 (names nil)
+	 (nums nil))
+    (setq cplx (sort cplx (lambda (a b) (> (cdr a) (cdr b)))))
+    (while (and cplx (<= (length names) (/ (- (frame-height) 7) 4)))
+      (setq names (cons (semantic-tag-name (car (car cplx)))
+			names)
+	    nums (cons (cdr (car cplx)) nums)
+	    cplx (cdr cplx)))
+;; ;;     (setq names (mapcar (lambda (str)
+;; ;; 			  (substring str (- (length str) 10)))
+;; ;; 			names))
+    (chart-bar-quickie 'horizontal
+		       (format "%s Complexity in %s"
+			       (capitalize (symbol-name sym))
+			       name)
+		       names namelabel
+		       nums "Complexity (Lines of code)")
+    ))
+
+;;;###autoload
+(defun semantic-chart-analyzer ()
+  "Chart the extent of the context analysis."
+  (interactive)
+  (let* ((p (semanticdb-find-translate-path nil nil))
+	 (plen (length p))
+	 (tab semanticdb-current-table)
+	 (tc (semanticdb-get-typecache tab))
+	 (tclen (+ (length (oref tc filestream))
+		   (length (oref tc includestream))))
+	 (scope (semantic-calculate-scope))
+	 (fslen (length (oref scope fullscope)))
+	 (lvarlen (length (oref scope localvar)))
+	 )
+    (chart-bar-quickie 'vertical
+		       (format "Analyzer Overhead in %s" (buffer-name))
+		       '("includes" "typecache" "scopelen" "localvar")
+		       "Overhead Entries"
+		       (list plen tclen fslen lvarlen)
+		       "Number of tags")
+    ))
+
+
+
+(provide 'semantic-chart)
+
+;;; semantic-chart.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-complete.el b/site/cedet-1.0pre7/semantic/semantic-complete.el
new file mode 100644
index 0000000..cf5e265
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-complete.el
@@ -0,0 +1,2149 @@
+;;; semantic-complete.el --- Routines for performing tag completion
+
+;;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-complete.el,v 1.65 2009/11/22 13:56:56 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Completion of tags by name using tables of semantic generated tags.
+;;
+;; While it would be a simple matter of flattening all tag known
+;; tables to perform completion across them using `all-completions',
+;; or `try-completion', that process would be slow.  In particular,
+;; when a system database is included in the mix, the potential for a
+;; ludicrous number of options becomes apparent.
+;;
+;; As such, dynamically searching across tables using a prefix,
+;; regular expression, or other feature is needed to help find symbols
+;; quickly without resorting to "show me every possible option now".
+;;
+;; In addition, some symbol names will appear in multiple locations.
+;; If it is important to distinguish, then a way to provide a choice
+;; over these locations is important as well.
+;;
+;; Beyond brute force offers for completion of plain strings,
+;; using the smarts of semantic-analyze to provide reduced lists of
+;; symbols, or fancy tabbing to zoom into files to show multiple hits
+;; of the same name can be provided.
+;;
+;;; How it works:
+;;
+;; There are several parts of any completion engine.  They are:
+;;
+;; A.  Collection of possible hits
+;; B.  Typing or selecting an option
+;; C.  Displaying possible unique completions
+;; D.  Using the result
+;;
+;; Here, we will treat each section separately (excluding D)
+;; They can then be strung together in user-visible commands to
+;; fulfil specific needs.
+;;
+;; COLLECTORS:
+;;
+;; A collector is an object which represents the means by which tags
+;; to complete on are collected.  It's first job is to find all the
+;; tags which are to be completed against.  It can also rename
+;; some tags if needed so long as `semantic-tag-clone' is used.
+;;
+;; Some collectors will gather all tags to complete against first
+;; (for in buffer queries, or other small list situations).  It may
+;; choose to do a broad search on each completion request.  Built in
+;; functionality automatically focuses the cache in as the user types.
+;;
+;; A collector choosing to create and rename tags could choose a
+;; plain name format, a postfix name such as method:class, or a
+;; prefix name such as class.method.
+;;
+;; DISPLAYORS
+;;
+;; A displayor is in charge if showing the user interesting things
+;; about available completions, and can optionally provide a focus.
+;; The simplest display just lists all available names in a separate
+;; window.  It may even choose to show short names when there are
+;; many to choose from, or long names when there are fewer.
+;;
+;; A complex displayor could opt to help the user 'focus' on some
+;; range.  For example, if 4 tags all have the same name, subsequent
+;; calls to the displayor may opt to show each tag one at a time in
+;; the buffer.  When the user likes one, selection would cause the
+;; 'focus' item to be selected.
+;;
+;; CACHE FORMAT
+;;
+;; The format of the tag lists used to perform the completions are in
+;; semanticdb "find" format, like this:
+;;
+;; ( ( DBTABLE1 TAG1 TAG2 ...)
+;;   ( DBTABLE2 TAG1 TAG2 ...)
+;;   ... )
+;;
+;; INLINE vs MINIBUFFER
+;;
+;; Two major ways completion is used in Emacs is either through a
+;; minibuffer query, or via completion in a normal editing buffer,
+;; encompassing some small range of characters.
+;;
+;; Structure for both types of completion are provided here.
+;; `semantic-complete-read-tag-engine' will use the minibuffer.
+;; `semantic-complete-inline-tag-engine' will complete text in
+;; a buffer.
+
+(require 'eieio)
+(require 'semantic-tag)
+(require 'semantic-find)
+(require 'semantic-analyze)
+(require 'semantic-format)
+(require 'semantic-ctxt)
+;; Keep semanticdb optional.
+(eval-when-compile
+  (require 'semanticdb)
+  (require 'semanticdb-find))
+
+(eval-when-compile
+  (condition-case nil
+      ;; Tooltip not available in older emacsen.
+      (require 'tooltip)
+    (error nil))
+  )
+
+;;; Code:
+
+;;; Compatibility
+;;
+(if (fboundp 'minibuffer-contents)
+    (eval-and-compile (defalias 'semantic-minibuffer-contents 'minibuffer-contents))
+  (eval-and-compile (defalias 'semantic-minibuffer-contents 'buffer-string)))
+(if (fboundp 'delete-minibuffer-contents)
+    (eval-and-compile (defalias 'semantic-delete-minibuffer-contents 'delete-minibuffer-contents))
+  (eval-and-compile (defalias 'semantic-delete-minibuffer-contents 'erase-buffer)))
+
+(defvar semantic-complete-inline-overlay nil
+  "The overlay currently active while completing inline.")
+
+;;;###autoload
+(defun semantic-completion-inline-active-p ()
+  "Non-nil if inline completion is active."
+  (when (and semantic-complete-inline-overlay
+	     (not (semantic-overlay-live-p semantic-complete-inline-overlay)))
+    (semantic-overlay-delete semantic-complete-inline-overlay)
+    (setq semantic-complete-inline-overlay nil))
+  semantic-complete-inline-overlay)
+
+;;; ------------------------------------------------------------
+;;; MINIBUFFER or INLINE utils
+;;
+(defun semantic-completion-text ()
+  "Return the text that is currently in the completion buffer.
+For a minibuffer prompt, this is the minibuffer text.
+For inline completion, this is the text wrapped in the inline completion
+overlay."
+  (if semantic-complete-inline-overlay
+      (semantic-complete-inline-text)
+    (semantic-minibuffer-contents)))
+
+(defun semantic-completion-delete-text ()
+  "Delete the text that is actively being completed.
+Presumably if you call this you will insert something new there."
+  (if semantic-complete-inline-overlay
+      (semantic-complete-inline-delete-text)
+    (semantic-delete-minibuffer-contents)))
+
+(defun semantic-completion-message (fmt &rest args)
+  "Display the string FMT formatted with ARGS at the end of the minibuffer."
+  (if semantic-complete-inline-overlay
+      (apply 'message fmt args)
+    (message (concat (buffer-string) (apply 'format fmt args)))))
+
+;;; ------------------------------------------------------------
+;;; MINIBUFFER: Option Selection harnesses
+;;
+(defvar semantic-completion-collector-engine nil
+  "The tag collector for the current completion operation.
+Value should be an object of a subclass of
+`semantic-completion-engine-abstract'.")
+
+(defvar semantic-completion-display-engine nil
+  "The tag display engine for the current completion operation.
+Value should be a ... what?")
+
+(defvar semantic-complete-key-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km " " 'semantic-complete-complete-space)
+    (define-key km "\t" 'semantic-complete-complete-tab)
+    (define-key km "\C-m" 'semantic-complete-done)
+    (define-key km "\C-g" 'abort-recursive-edit)
+    (define-key km "\M-n" 'next-history-element)
+    (define-key km "\M-p" 'previous-history-element)
+    (define-key km "\C-n" 'next-history-element)
+    (define-key km "\C-p" 'previous-history-element)
+    ;; Add history navigation
+    km)
+  "Keymap used while completing across a list of tags.")
+
+(defvar semantic-completion-default-history nil
+  "Default history variable for any unhistoried prompt.
+Keeps STRINGS only in the history.")
+
+
+;;;###autoload
+(defun semantic-complete-read-tag-engine (collector displayor prompt
+						    default-tag initial-input
+						    history)
+  "Read a semantic tag, and return a tag for the selection.
+Argument COLLECTOR is an object which can be used to to calculate
+a list of possible hits.  See `semantic-completion-collector-engine'
+for details on COLLECTOR.
+Argument DISPLAYOR is an object used to display a list of possible
+completions for a given prefix.  See`semantic-completion-display-engine'
+for details on DISPLAYOR.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to story the history in."
+  (let* ((semantic-completion-collector-engine collector)
+	 (semantic-completion-display-engine displayor)
+	 (semantic-complete-active-default nil)
+	 (semantic-complete-current-matched-tag nil)
+	 (default-as-tag (semantic-complete-default-to-tag default-tag))
+	 (default-as-string (when (semantic-tag-p default-as-tag)
+			      (semantic-tag-name default-as-tag)))
+	 )
+
+    (when default-as-string
+      ;; Add this to the prompt.
+      ;;
+      ;; I really want to add a lookup of the symbol in those
+      ;; tags available to the collector and only add it if it
+      ;; is available as a possibility, but I'm too lazy right
+      ;; now.
+      ;;
+
+      ;; @todo - move from () to into the editable area
+      (if (string-match ":" prompt)
+	  (setq prompt (concat
+			(substring prompt 0 (match-beginning 0))
+			" (default " default-as-string ")"
+			(substring prompt (match-beginning 0))))
+	(setq prompt (concat prompt " (" default-as-string "): "))))
+    ;;
+    ;; Perform the Completion
+    ;;
+    (unwind-protect
+	(read-from-minibuffer prompt
+			      initial-input
+			      semantic-complete-key-map
+			      nil
+			      (or history
+				  'semantic-completion-default-history)
+			      default-tag)
+      (semantic-collector-cleanup semantic-completion-collector-engine)
+      (semantic-displayor-cleanup semantic-completion-display-engine)
+      )
+    ;;
+    ;; Extract the tag from the completion machinery.
+    ;;
+    semantic-complete-current-matched-tag
+    ))
+
+
+;;; Util for basic completion prompts
+;;
+
+(defvar semantic-complete-active-default nil
+  "The current default tag calculated for this prompt.")
+
+(defun semantic-complete-default-to-tag (default)
+  "Convert a calculated or passed in DEFAULT into a tag."
+  (if (semantic-tag-p default)
+      ;; Just return what was passed in.
+      (setq semantic-complete-active-default default)
+    ;; If none was passed in, guess.
+    (if (null default)
+	(setq default (semantic-ctxt-current-thing)))
+    (if (null default)
+	;; Do nothing
+	nil
+      ;; Turn default into something useful.
+      (let ((str
+	     (cond
+	      ;; Semantic-ctxt-current-symbol will return a list of
+	      ;; strings.  Technically, we should use the analyzer to
+	      ;; fully extract what we need, but for now, just grab the
+	      ;; first string
+	      ((and (listp default) (stringp (car default)))
+	       (car default))
+	      ((stringp default)
+	       default)
+	      ((symbolp default)
+	       (symbol-name default))
+	      (t
+	       (signal 'wrong-type-argument
+		       (list default 'semantic-tag-p)))))
+	    (tag nil))
+	;; Now that we have that symbol string, look it up using the active
+	;; collector.  If we get a match, use it.
+	(save-excursion
+	  (semantic-collector-calculate-completions
+	   semantic-completion-collector-engine
+	   str nil))
+	;; Do we have the perfect match???
+	(let ((ml (semantic-collector-current-exact-match
+		   semantic-completion-collector-engine)))
+	  (when ml
+	    ;; We don't care about uniqueness.  Just guess for convenience
+	    (setq tag (semanticdb-find-result-nth-in-buffer ml 0))))
+	;; save it
+	(setq semantic-complete-active-default tag)
+	;; Return it.. .whatever it may be
+	tag))))
+
+
+;;; Prompt Return Value
+;;
+;; Getting a return value out of this completion prompt is a bit
+;; challenging.  The read command returns the string typed in.
+;; We need to convert this into a valid tag.  We can exit the minibuffer
+;; for different reasons.  If we purposely exit, we must make sure
+;; the focused tag is calculated... preferably once.
+(defvar semantic-complete-current-matched-tag nil
+  "Variable used to pass the tags being matched to the prompt.")
+
+(defun semantic-complete-current-match ()
+  "Calculate a match from the current completion environment.
+Save this in our completion variable.  Make sure that variable
+is cleared if any other keypress is made.
+Return value can be:
+  tag - a single tag that has been matched.
+  string - a message to show in the minibuffer."
+  ;; Query the environment for an active completion.
+  (let ((collector semantic-completion-collector-engine)
+	(displayor semantic-completion-display-engine)
+	(contents (semantic-completion-text))
+	matchlist
+	answer)
+    (if (string= contents "")
+	;; The user wants the defaults!
+	(setq answer semantic-complete-active-default)
+      ;; This forces a full calculation of completion on CR.
+      (save-excursion
+	(semantic-collector-calculate-completions collector contents nil))
+      (semantic-complete-try-completion)
+      (cond
+       ;; Input match displayor focus entry
+       ((setq answer (semantic-displayor-current-focus displayor))
+	;; We have answer, continue
+	)
+       ;; One match from the collector
+       ((setq matchlist (semantic-collector-current-exact-match collector))
+	(if (= (semanticdb-find-result-length matchlist) 1)
+	    (setq answer (semanticdb-find-result-nth-in-buffer matchlist 0))
+	  (if (semantic-displayor-focus-abstract-child-p displayor)
+	      ;; For focusing displayors, we can claim this is
+	      ;; not unique.  Multiple focuses can choose the correct
+	      ;; one.
+	      (setq answer "Not Unique")
+	    ;; If we don't have a focusing displayor, we need to do something
+	    ;; graceful.  First, see if all the matches have the same name.
+	    (let ((allsame t)
+		  (firstname (semantic-tag-name
+			      (car
+			       (semanticdb-find-result-nth matchlist 0)))
+			     )
+		  (cnt 1)
+		  (max (semanticdb-find-result-length matchlist)))
+	      (while (and allsame (< cnt max))
+		(if (not (string=
+			  firstname
+			  (semantic-tag-name
+			   (car
+			    (semanticdb-find-result-nth matchlist cnt)))))
+		    (setq allsame nil))
+		(setq cnt (1+ cnt))
+		)
+	      ;; Now we know if they are all the same.  If they are, just
+	      ;; accept the first, otherwise complain.
+	      (if allsame
+		  (setq answer (semanticdb-find-result-nth-in-buffer
+				matchlist 0))
+		(setq answer "Not Unique"))
+	      ))))
+       ;; No match
+       (t
+	(setq answer "No Match")))
+      )
+    ;; Set it into our completion target.
+    (when (semantic-tag-p answer)
+      (setq semantic-complete-current-matched-tag answer)
+      ;; Make sure it is up to date by clearing it if the user dares
+      ;; to touch the keyboard.
+      (add-hook 'pre-command-hook
+		(lambda () (setq semantic-complete-current-matched-tag nil)))
+      )
+    ;; Return it
+    answer
+    ))
+
+
+;;; Keybindings
+;;
+;; Keys are bound to to perform completion using our mechanisms.
+;; Do that work here.
+(defun semantic-complete-done ()
+  "Accept the current input."
+  (interactive)
+  (let ((ans (semantic-complete-current-match)))
+    (if (stringp ans)
+	(semantic-completion-message (concat " [" ans "]"))
+      (exit-minibuffer)))
+  )
+
+(defun semantic-complete-complete-space ()
+  "Complete the partial input in the minibuffer."
+  (interactive)
+  (semantic-complete-do-completion t))
+
+(defun semantic-complete-complete-tab ()
+  "Complete the partial input in the minibuffer as far as possible."
+  (interactive)
+  (semantic-complete-do-completion))
+
+;;; Completion Functions
+;;
+;; Thees routines are functional entry points to performing completion.
+;;
+(defun semantic-complete-hack-word-boundaries (original new)
+  "Return a string to use for completion.
+ORIGINAL is the text in the minibuffer.
+NEW is the new text to insert into the minibuffer.
+Within the difference bounds of ORIGINAL and NEW, shorten NEW
+to the nearest word boundary, and return that."
+  (save-match-data
+    (let* ((diff (substring new (length original)))
+	   (end (string-match "\\>" diff))
+	   (start (string-match "\\<" diff)))
+      (cond
+       ((and start (> start 0))
+	;; If start is greater than 0, include only the new
+	;; white-space stuff
+	(concat original (substring diff 0 start)))
+       (end
+	(concat original (substring diff 0 end)))
+       (t new)))))
+
+(defun semantic-complete-try-completion (&optional partial)
+  "Try a completion for the current minibuffer.
+If PARTIAL, do partial completion stopping at spaces."
+  (let ((comp (semantic-collector-try-completion
+               semantic-completion-collector-engine
+	       (semantic-completion-text))))
+    (cond
+     ((null comp)
+      (semantic-completion-message " [No Match]")
+      (ding)
+      )
+     ((stringp comp)
+      (if (string= (semantic-completion-text) comp)
+	  (when partial
+	    ;; Minibuffer isn't changing AND the text is not unique.
+	    ;; Test for partial completion over a word separator character.
+	    ;; If there is one available, use that so that SPC can
+	    ;; act like a SPC insert key.
+	    (let ((newcomp (semantic-collector-current-whitespace-completion
+			    semantic-completion-collector-engine)))
+	      (when newcomp
+		(semantic-completion-delete-text)
+		(insert newcomp))
+	      ))
+	(when partial
+	  (let ((orig (semantic-completion-text)))
+	    ;; For partial completion, we stop and step over
+	    ;; word boundaries.  Use this nifty function to do
+	    ;; that calculation for us.
+	    (setq comp
+		  (semantic-complete-hack-word-boundaries orig comp))))
+	;; Do the replacement.
+	(semantic-completion-delete-text)
+        (insert comp))
+      )
+     ((and (listp comp) (semantic-tag-p (car comp)))
+      (unless (string= (semantic-completion-text)
+		       (semantic-tag-name (car comp)))
+        ;; A fully unique completion was available.
+        (semantic-completion-delete-text)
+        (insert (semantic-tag-name (car comp))))
+      ;; The match is complete
+      (if (= (length comp) 1)
+          (semantic-completion-message " [Complete]")
+        (semantic-completion-message " [Complete, but not unique]"))
+      )
+     (t nil))))
+
+(defun semantic-complete-do-completion (&optional partial inline)
+  "Do a completion for the current minibuffer.
+If PARTIAL, do partial completion stopping at spaces.
+if INLINE, then completion is happening inline in a buffer."
+  (let* ((collector semantic-completion-collector-engine)
+	 (displayor semantic-completion-display-engine)
+	 (contents (semantic-completion-text))
+	 (ans nil))
+
+    (save-excursion
+      (semantic-collector-calculate-completions collector contents partial))
+    (let* ((na (semantic-complete-next-action partial)))
+      (cond
+       ;; We're all done, but only from a very specific
+       ;; area of completion.
+       ((eq na 'done)
+	(semantic-completion-message " [Complete]")
+	(setq ans 'done))
+       ;; Perform completion
+       ((or (eq na 'complete)
+	    (eq na 'complete-whitespace))
+	(semantic-complete-try-completion partial)
+	(setq ans 'complete))
+       ;; We need to display the completions.
+       ;; Set the completions into the display engine
+       ((or (eq na 'display) (eq na 'displayend))
+	(semantic-displayor-set-completions
+	 displayor
+	 (or
+	  ;; For the below - This caused problems for Chong Yidong
+	  ;; when experimenting with the completion engine.  I don't
+	  ;; remember what the problem was though, and I wasn't sure why
+	  ;; the below two lines were there since they obviously added
+	  ;; some odd behavior.  -EML	  
+	  ;(and (not (eq na 'displayend))
+	  ;     (semantic-collector-current-exact-match collector))
+	  (semantic-collector-all-completions collector contents))
+	 contents)
+	;; Ask the displayor to display them.
+	(semantic-displayor-show-request displayor))
+       ((eq na 'scroll)
+	(semantic-displayor-scroll-request displayor)
+	)
+       ((eq na 'focus)
+	(semantic-displayor-focus-next displayor)
+	(semantic-displayor-focus-request displayor)
+	)
+       ((eq na 'empty)
+	(semantic-completion-message " [No Match]"))
+       (t nil)))
+    ans))
+
+
+;;; ------------------------------------------------------------
+;;; INLINE: tag completion harness
+;;
+;; Unlike the minibuffer, there is no mode nor other traditional
+;; means of reading user commands in completion mode.  Instead
+;; we use a pre-command-hook to inset in our commands, and to
+;; push ourselves out of this mode on alternate keypresses.
+(defvar semantic-complete-inline-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-i" 'semantic-complete-inline-TAB)
+    (define-key km "\M-p" 'semantic-complete-inline-up)
+    (define-key km "\M-n" 'semantic-complete-inline-down)
+    (define-key km "\C-m" 'semantic-complete-inline-done)
+    (define-key km "\C-\M-c" 'semantic-complete-inline-exit)
+    (define-key km "\C-g" 'semantic-complete-inline-quit)
+    (define-key km "?"
+      (lambda () (interactive)
+	(describe-variable 'semantic-complete-inline-map)))
+    km)
+  "Keymap used while performing Semantic inline completion.
+\\{semantic-complete-inline-map}")
+
+(defface semantic-complete-inline-face
+  '((((class color) (background dark))
+     (:underline "yellow"))
+    (((class color) (background light))
+     (:underline "brown")))
+  "*Face used to show the region being completed inline.
+The face is used in `semantic-complete-inline-tag-engine'."
+  :group 'semantic-faces)
+
+(defun semantic-complete-inline-text ()
+  "Return the text that is being completed inline.
+Similar to `minibuffer-contents' when completing in the minibuffer."
+  (let ((s (semantic-overlay-start semantic-complete-inline-overlay))
+	(e (semantic-overlay-end semantic-complete-inline-overlay)))
+    (if (= s e)
+	""
+      (buffer-substring-no-properties s e ))))
+
+(defun semantic-complete-inline-delete-text ()
+  "Delete the text currently being completed in the current buffer."
+  (delete-region
+   (semantic-overlay-start semantic-complete-inline-overlay)
+   (semantic-overlay-end semantic-complete-inline-overlay)))
+
+(defun semantic-complete-inline-done ()
+  "This completion thing is DONE, OR, insert a newline."
+  (interactive)
+  (let* ((displayor semantic-completion-display-engine)
+	 (tag (semantic-displayor-current-focus displayor)))
+    (if tag
+	(let ((txt (semantic-completion-text)))
+	  (insert (substring (semantic-tag-name tag)
+			     (length txt)))
+	  (semantic-complete-inline-exit))
+
+      ;; Get whatever binding RET usually has.
+      (let ((fcn
+	     (condition-case nil
+		 (lookup-key (current-active-maps) (this-command-keys))
+	       (error
+		;; I don't know why, but for some reason the above
+		;; throws an error sometimes.
+		(lookup-key (current-global-map) (this-command-keys))
+		))))
+	(when fcn
+	  (funcall fcn)))
+      )))
+
+(defun semantic-complete-inline-quit ()
+  "Quit an inline edit."
+  (interactive)
+  (semantic-complete-inline-exit)
+  (keyboard-quit))
+
+(defun semantic-complete-inline-exit ()
+  "Exit inline completion mode."
+  (interactive)
+  ;; Remove this hook FIRST!
+  (remove-hook 'pre-command-hook 'semantic-complete-pre-command-hook)
+
+  (condition-case nil
+      (progn
+	(when semantic-completion-collector-engine
+	  (semantic-collector-cleanup semantic-completion-collector-engine))
+	(when semantic-completion-display-engine
+	  (semantic-displayor-cleanup semantic-completion-display-engine))
+
+	(when semantic-complete-inline-overlay
+	  (let ((wc (semantic-overlay-get semantic-complete-inline-overlay
+					  'window-config-start))
+		(buf (semantic-overlay-buffer semantic-complete-inline-overlay))
+		)
+	    (semantic-overlay-delete semantic-complete-inline-overlay)
+	    (setq semantic-complete-inline-overlay nil)
+	    ;; DONT restore the window configuration if we just
+	    ;; switched windows!
+	    (when (eq buf (current-buffer))
+	      (set-window-configuration wc))
+	    ))
+
+	(setq semantic-completion-collector-engine nil
+	      semantic-completion-display-engine nil))
+    (error nil))
+
+  ;; Remove this hook LAST!!!
+  ;; This will force us back through this function if there was
+  ;; some sort of error above.
+  (remove-hook 'post-command-hook 'semantic-complete-post-command-hook)
+
+  ;;(message "Exiting inline completion.")
+  )
+
+(defun semantic-complete-pre-command-hook ()
+  "Used to redefine what commands are being run while completing.
+When installed as a `pre-command-hook' the special keymap
+`semantic-complete-inline-map' is queried to replace commands normally run.
+Commands which edit what is in the region of interest operate normally.
+Commands which would take us out of the region of interest, or our
+quit hook, will exit this completion mode."
+  (let ((fcn (lookup-key semantic-complete-inline-map
+			 (this-command-keys) nil)))
+    (cond ((commandp fcn)
+	   (setq this-command fcn))
+	  (t nil)))
+  )
+
+(defun semantic-complete-post-command-hook ()
+  "Used to determine if we need to exit inline completion mode.
+If completion mode is active, check to see if we are within
+the bounds of `semantic-complete-inline-overlay', or within
+a reasonable distance."
+  (condition-case nil
+      ;; Exit if something bad happened.
+      (if (not semantic-complete-inline-overlay)
+	  (progn
+	    ;;(message "Inline Hook installed, but overlay deleted.")
+	    (semantic-complete-inline-exit))
+	;; Exit if commands caused us to exit the area of interest
+	(let ((s (semantic-overlay-start semantic-complete-inline-overlay))
+	      (e (semantic-overlay-end semantic-complete-inline-overlay))
+	      (b (semantic-overlay-buffer semantic-complete-inline-overlay))
+	      (txt nil)
+	      )
+	  (cond
+	   ;; EXIT when we are no longer in a good place.
+	   ((or (not (eq b (current-buffer)))
+		(< (point) s)
+		(> (point) e))
+	    ;;(message "Exit: %S %S %S" s e (point))
+	    (semantic-complete-inline-exit)
+	    )
+	   ;; Exit if the user typed in a character that is not part
+	   ;; of the symbol being completed.
+	   ((and (setq txt (semantic-completion-text))
+		 (not (string= txt ""))
+		 (and (/= (point) s)
+		      (save-excursion
+			(forward-char -1)
+			(not (looking-at "\\(\\w\\|\\s_\\)")))))
+	    ;;(message "Non symbol character.")
+	    (semantic-complete-inline-exit))
+	   ((lookup-key semantic-complete-inline-map
+			(this-command-keys) nil)
+	    ;; If the last command was one of our completion commands,
+	    ;; then do nothing.
+	    nil
+	    )
+	   (t
+	    ;; Else, show completions now
+	    (semantic-complete-inline-force-display)
+
+	    ))))
+    ;; If something goes terribly wrong, clean up after ourselves.
+    (error (semantic-complete-inline-exit))))
+
+;;;###autoload
+(defun semantic-complete-inline-force-display ()
+  "Force the display of whatever the current completions are.
+DO NOT CALL THIS IF THE INLINE COMPLETION ENGINE IS NOT ACTIVE."
+  (condition-case e
+      (save-excursion
+	(let ((collector semantic-completion-collector-engine)
+	      (displayor semantic-completion-display-engine)
+	      (contents (semantic-completion-text)))
+	  (when collector
+	    (semantic-collector-calculate-completions
+	     collector contents nil)
+	    (semantic-displayor-set-completions
+	     displayor
+	     (semantic-collector-all-completions collector contents)
+	     contents)
+	    ;; Ask the displayor to display them.
+	    (semantic-displayor-show-request displayor))
+	  ))
+    (error (message "Bug Showing Completions: %S" e))))
+
+(defun semantic-complete-inline-tag-engine
+  (collector displayor buffer start end)
+  "Perform completion based on semantic tags in a buffer.
+Argument COLLECTOR is an object which can be used to to calculate
+a list of possible hits.  See `semantic-completion-collector-engine'
+for details on COLLECTOR.
+Argument DISPLAYOR is an object used to display a list of possible
+completions for a given prefix.  See`semantic-completion-display-engine'
+for details on DISPLAYOR.
+BUFFER is the buffer in which completion will take place.
+START is a location for the start of the full symbol.
+If the symbol being completed is \"foo.ba\", then START
+is on the \"f\" character.
+END is at the end of the current symbol being completed."
+  ;; Set us up for doing completion
+  (setq semantic-completion-collector-engine collector
+	semantic-completion-display-engine displayor)
+  ;; Create an overlay
+  (setq semantic-complete-inline-overlay
+	(semantic-make-overlay start end buffer nil t))
+  (semantic-overlay-put semantic-complete-inline-overlay
+			'face
+			'semantic-complete-inline-face)
+  (semantic-overlay-put semantic-complete-inline-overlay
+			'window-config-start
+			(current-window-configuration))
+  ;; Install our command hooks
+  (add-hook 'pre-command-hook 'semantic-complete-pre-command-hook)
+  (add-hook 'post-command-hook 'semantic-complete-post-command-hook)
+  ;; Go!
+  (semantic-complete-inline-force-display)
+  )
+
+;;; Inline Completion Keymap Functions
+;;
+(defun semantic-complete-inline-TAB ()
+  "Perform inline completion."
+  (interactive)
+  (let ((cmpl (semantic-complete-do-completion nil t)))
+    (cond
+     ((eq cmpl 'complete)
+      (semantic-complete-inline-force-display))
+     ((eq cmpl 'done)
+      (semantic-complete-inline-done))
+     ))
+  )
+
+(defun semantic-complete-inline-down()
+  "Focus forwards through the displayor."
+  (interactive)
+  (let ((displayor semantic-completion-display-engine))
+    (semantic-displayor-focus-next    displayor)
+    (semantic-displayor-focus-request displayor)
+    ))
+
+(defun semantic-complete-inline-up ()
+  "Focus backwards through the displayor."
+  (interactive)
+  (let ((displayor semantic-completion-display-engine))
+    (semantic-displayor-focus-previous displayor)
+    (semantic-displayor-focus-request  displayor)
+    ))
+
+
+;;; ------------------------------------------------------------
+;;; Interactions between collection and displaying
+;;
+;; Functional routines used to help collectors communicate with
+;; the current displayor, or for the previous section.
+
+(defun semantic-complete-next-action (partial)
+  "Determine what the next completion action should be.
+PARTIAL is non-nil if we are doing partial completion.
+First, the collector can determine if we should perform a completion or not.
+If there is nothing to complete, then the displayor determines if we are
+to show a completion list, scroll, or perhaps do a focus (if it is capable.)
+Expected return values are:
+  done -> We have a singular match
+  empty -> There are no matches to the current text
+  complete -> Perform a completion action
+  complete-whitespace -> Complete next whitespace type character.
+  display -> Show the list of completions
+  scroll -> The completions have been shown, and the user keeps hitting
+            the complete button.  If possible, scroll the completions
+  focus -> The displayor knows how to shift focus among possible completions.
+           Let it do that.
+  displayend -> Whatever options the displayor had for repeating options, there
+           are none left.  Try something new."
+  (let ((ans1 (semantic-collector-next-action
+		semantic-completion-collector-engine
+		partial))
+	(ans2 (semantic-displayor-next-action
+		semantic-completion-display-engine))
+	)
+    (cond
+     ;; No collector answer, use displayor answer.
+     ((not ans1)
+      ans2)
+     ;; Displayor selection of 'scroll, 'display, or 'focus trumps
+     ;; 'done
+     ((and (eq ans1 'done) ans2)
+      ans2)
+     ;; Use ans1 when we have it.
+     (t
+      ans1))))
+
+
+
+;;; ------------------------------------------------------------
+;;; Collection Engines
+;;
+;; Collection engines can scan tags from the current environment and
+;; provide lists of possible completions.
+;;
+;; General features of the abstract collector:
+;; * Cache completion lists between uses
+;; * Cache itself per buffer.  Handle reparse hooks
+;;
+;; Key Interface Functions to implement:
+;; * semantic-collector-next-action
+;; * semantic-collector-calculate-completions
+;; * semantic-collector-try-completion
+;; * semantic-collector-all-completions
+
+(defvar semantic-collector-per-buffer-list nil
+  "List of collectors active in this buffer.")
+(make-variable-buffer-local 'semantic-collector-per-buffer-list)
+
+(defvar semantic-collector-list nil
+  "List of global collectors active this session.")
+
+(defclass semantic-collector-abstract ()
+  ((buffer :initarg :buffer
+	   :type buffer
+	   :documentation "Originating buffer for this collector.
+Some collectors use a given buffer as a starting place while looking up
+tags.")
+   (cache :initform nil
+	  :type (or null semanticdb-find-result-with-nil)
+	  :documentation "Cache of tags.
+These tags are re-used during a completion session.
+Sometimes these tags are cached between completion sessions.")
+   (last-all-completions :initarg nil
+			 :type semanticdb-find-result-with-nil
+			 :documentation "Last result of `all-completions'.
+This result can be used for refined completions as `last-prefix' gets
+closer to a specific result.")
+   (last-prefix :type string
+		:protection :protected
+		:documentation "The last queried prefix.
+This prefix can be used to cache intermediate completion offers.
+making the action of homing in on a token faster.")
+   (last-completion :type (or null string)
+		    :documentation "The last calculated completion.
+This completion is calculated and saved for future use.")
+   (last-whitespace-completion :type (or null string)
+			       :documentation "The last whitespace completion.
+For partial completion, SPC will disabiguate over whitespace type
+characters.  This is the last calculated version.")
+   (current-exact-match :type list
+			:protection :protected
+			:documentation "The list of matched tags.
+When tokens are matched, they are added to this list.")
+   )
+  "Root class for completion engines.
+The baseclass provides basic functionality for interacting with
+a completion displayor object, and tracking the current progress
+of a completion."
+  :abstract t)
+
+(defmethod semantic-collector-cleanup ((obj semantic-collector-abstract))
+  "Clean up any mess this collector may have."
+  nil)
+
+(defmethod semantic-collector-next-action
+  ((obj semantic-collector-abstract) partial)
+  "What should we do next?  OBJ can predict a next good action.
+PARTIAL indicates if we are doing a partial completion."
+  (if (and (slot-boundp obj 'last-completion)
+	   (string= (semantic-completion-text) (oref obj last-completion)))
+      (let* ((cem (semantic-collector-current-exact-match obj))
+	     (cemlen (semanticdb-find-result-length cem))
+	     (cac (semantic-collector-all-completions
+		   obj (semantic-completion-text)))
+	     (caclen (semanticdb-find-result-length cac)))
+	(cond ((and cem (= cemlen 1)
+		    cac (> caclen 1)
+		    (eq last-command this-command))
+	       ;; Defer to the displayor...
+	       nil)
+	      ((and cem (= cemlen 1))
+	       'done)
+	      ((and (not cem) (not cac))
+	       'empty)
+	      ((and partial (semantic-collector-try-completion-whitespace
+			     obj (semantic-completion-text)))
+	       'complete-whitespace)))
+    'complete))
+
+(defmethod semantic-collector-last-prefix= ((obj semantic-collector-abstract)
+					    last-prefix)
+  "Return non-nil if OBJ's prefix matches PREFIX."
+  (and (slot-boundp obj 'last-prefix)
+       (string= (oref obj last-prefix) last-prefix)))
+
+(defmethod semantic-collector-get-cache ((obj semantic-collector-abstract))
+  "Get the raw cache of tags for completion.
+Calculate the cache if there isn't one."
+  (or (oref obj cache)
+      (semantic-collector-calculate-cache obj)))
+
+(defmethod semantic-collector-calculate-completions-raw
+  ((obj semantic-collector-abstract) prefix completionlist)
+  "Calculate the completions for prefix from completionlist.
+Output must be in semanticdb Find result format."
+  ;; Must output in semanticdb format
+  (let ((table (save-excursion
+		 (set-buffer (oref obj buffer))
+		 semanticdb-current-table))
+	(result (semantic-find-tags-for-completion
+		 prefix
+		 ;; To do this kind of search with a pre-built completion
+		 ;; list, we need to strip it first.
+		 (semanticdb-strip-find-results completionlist)))
+	)
+    (if result
+	(list (cons table result)))))
+
+(defmethod semantic-collector-calculate-completions
+  ((obj semantic-collector-abstract) prefix partial)
+  "Calculate completions for prefix as setup for other queries."
+  (let* ((case-fold-search semantic-case-fold)
+	 (same-prefix-p (semantic-collector-last-prefix= obj prefix))
+	 (completionlist
+	  (if (or same-prefix-p
+		  (and (slot-boundp obj 'last-prefix)
+		       (eq (compare-strings (oref obj last-prefix) 0 nil
+					    prefix 0 (length prefix))
+			   t)))
+	      ;; New prefix is subset of old prefix
+	      (oref obj last-all-completions)
+	    (semantic-collector-get-cache obj)))
+	 ;; Get the result
+	 (answer (if same-prefix-p
+		     completionlist
+		   (semantic-collector-calculate-completions-raw
+		    obj prefix completionlist))
+		 )
+	 (completion nil)
+	 (complete-not-uniq nil)
+	 )
+    ;;(semanticdb-find-result-test answer)
+    (when (not same-prefix-p)
+      ;; Save results if it is interesting and beneficial
+      (oset obj last-prefix prefix)
+      (oset obj last-all-completions answer))
+    ;; Now calculate the completion.
+    (setq completion (try-completion
+		      prefix
+		      (semanticdb-strip-find-results answer)))
+    (oset obj last-whitespace-completion nil)
+    (oset obj current-exact-match nil)
+    ;; Only do this if a completion was found.  Letting a nil in
+    ;; could cause a full semanticdb search by accident.
+    (when completion
+      (oset obj last-completion
+	    (cond
+	     ;; Unique match in AC.  Last completion is a match.
+	     ;; Also set the current-exact-match.
+	     ((eq completion t)
+	      (oset obj current-exact-match answer)
+	      prefix)
+	     ;; It may be complete (a symbol) but still not unique.
+	     ;; We can capture a match
+	     ((setq complete-not-uniq
+		    (semanticdb-find-tags-by-name
+		     prefix
+		     answer))
+	      (oset obj current-exact-match
+		    complete-not-uniq)
+	      prefix
+	      )
+	     ;; Non unique match, return the string that handles
+	     ;; completion
+	     (t (or completion prefix))
+	     )))
+    ))
+
+(defmethod semantic-collector-try-completion-whitespace
+  ((obj semantic-collector-abstract) prefix)
+  "For OBJ, do whatepsace completion based on PREFIX.
+This implies that if there are two completions, one matching
+the test \"preifx\\>\", and one not, the one matching the full
+word version of PREFIX will be chosen, and that text returned.
+This function requires that `semantic-collector-calculate-completions'
+has been run first."
+  (let* ((ac (semantic-collector-all-completions obj prefix))
+	 (matchme (concat "^" prefix "\\>"))
+	 (compare (semanticdb-find-tags-by-name-regexp matchme ac))
+	 (numtag (semanticdb-find-result-length compare))
+	 )
+    (if compare
+	(let* ((idx 0)
+	       (cutlen (1+ (length prefix)))
+	       (twws (semanticdb-find-result-nth compare idx)))
+	  ;; Is our tag with whitespace a match that has whitespace
+	  ;; after it, or just an already complete symbol?
+	  (while (and (< idx numtag)
+		      (< (length (semantic-tag-name (car twws))) cutlen))
+	    (setq idx (1+ idx)
+		  twws (semanticdb-find-result-nth compare idx)))
+	  (when (and twws (car-safe twws))
+	    ;; If COMPARE has succeeded, then we should take the very
+	    ;; first match, and extend prefix by one character.
+	    (oset obj last-whitespace-completion
+		  (substring (semantic-tag-name (car twws))
+			     0 cutlen))))
+      )))
+
+
+(defmethod semantic-collector-current-exact-match ((obj semantic-collector-abstract))
+  "Return the active valid MATCH from the semantic collector.
+For now, just return the first element from our list of available
+matches.  For semanticdb based results, make sure the file is loaded
+into a buffer."
+  (when (slot-boundp obj 'current-exact-match)
+    (oref obj current-exact-match)))
+
+(defmethod semantic-collector-current-whitespace-completion ((obj semantic-collector-abstract))
+  "Return the active whitespace completion value."
+  (when (slot-boundp obj 'last-whitespace-completion)
+    (oref obj last-whitespace-completion)))
+
+(defmethod semantic-collector-get-match ((obj semantic-collector-abstract))
+  "Return the active valid MATCH from the semantic collector.
+For now, just return the first element from our list of available
+matches.  For semanticdb based results, make sure the file is loaded
+into a buffer."
+  (when (slot-boundp obj 'current-exact-match)
+    (semanticdb-find-result-nth-in-buffer (oref obj current-exact-match) 0)))
+
+(defmethod semantic-collector-all-completions
+  ((obj semantic-collector-abstract) prefix)
+  "For OBJ, retrieve all completions matching PREFIX.
+The returned list consists of all the tags currently
+matching PREFIX."
+  (when (slot-boundp obj 'last-all-completions)
+    (oref obj last-all-completions)))
+
+(defmethod semantic-collector-try-completion
+  ((obj semantic-collector-abstract) prefix)
+  "For OBJ, attempt to match PREFIX.
+See `try-completion' for details on how this works.
+Return nil for no match.
+Return a string for a partial match.
+For a unique match of PREFIX, return the list of all tags
+with that name."
+  (if (slot-boundp obj 'last-completion)
+      (oref obj last-completion)))
+
+(defmethod semantic-collector-calculate-cache
+  ((obj semantic-collector-abstract))
+  "Calculate the completion cache for OBJ."
+  nil
+  )
+
+(defmethod semantic-collector-flush ((this semantic-collector-abstract))
+  "Flush THIS collector object, clearing any caches and prefix."
+  (oset this cache nil)
+  (slot-makeunbound this 'last-prefix)
+  (slot-makeunbound this 'last-completion)
+  (slot-makeunbound this 'last-all-completions)
+  (slot-makeunbound this 'current-exact-match)
+  )
+
+;;; PER BUFFER
+;;
+(defclass semantic-collector-buffer-abstract (semantic-collector-abstract)
+  ()
+  "Root class for per-buffer completion engines.
+These collectors track themselves on a per-buffer basis."
+  :abstract t)
+
+(defmethod constructor :STATIC ((this semantic-collector-buffer-abstract)
+				newname &rest fields)
+  "Reuse previously created objects of this type in buffer."
+  (let ((old nil)
+	(bl semantic-collector-per-buffer-list))
+    (while (and bl (null old))
+      (if (eq (object-class (car bl)) this)
+	  (setq old (car bl))))
+    (unless old
+      (let ((new (call-next-method)))
+	(add-to-list 'semantic-collector-per-buffer-list new)
+	(setq old new)))
+    (slot-makeunbound old 'last-completion)
+    (slot-makeunbound old 'last-prefix)
+    (slot-makeunbound old 'current-exact-match)
+    old))
+
+;; Buffer specific collectors should flush themselves
+(defun semantic-collector-buffer-flush (newcache)
+  "Flush all buffer collector objects.
+NEWCACHE is the new tag table, but we ignore it."
+  (condition-case nil
+      (let ((l semantic-collector-per-buffer-list))
+	(while l
+	  (if (car l) (semantic-collector-flush (car l)))
+	  (setq l (cdr l))))
+    (error nil)))
+
+(add-hook 'semantic-after-toplevel-cache-change-hook
+	  'semantic-collector-buffer-flush)
+
+;;; DEEP BUFFER SPECIFIC COMPLETION
+;;
+(defclass semantic-collector-buffer-deep
+  (semantic-collector-buffer-abstract)
+  ()
+  "Completion engine for tags in the current buffer.
+When searching for a tag, uses semantic  deep searche functions.
+Basics search only in the current buffer.")
+
+(defmethod semantic-collector-calculate-cache
+  ((obj semantic-collector-buffer-deep))
+  "Calculate the completion cache for OBJ.
+Uses `semantic-flatten-tags-table'"
+  (oset obj cache
+	;; Must create it in SEMANTICDB find format.
+	;; ( ( DBTABLE TAG TAG ... ) ... )
+	(list
+	 (cons semanticdb-current-table
+	       (semantic-flatten-tags-table (oref obj buffer))))))
+
+;;; PROJECT SPECIFIC COMPLETION
+;;
+(defclass semantic-collector-project-abstract (semantic-collector-abstract)
+  ((path :initarg :path
+	 :initform nil
+	 :documentation "List of database tables to search.
+At creation time, it can be anything accepted by
+`semanticdb-find-translate-path' as a PATH argument.")
+   )
+  "Root class for project wide completion engines.
+Uses semanticdb for searching all tags in the current project."
+  :abstract t)
+
+;;; Project Search
+(defclass semantic-collector-project (semantic-collector-project-abstract)
+  ()
+  "Completion engine for tags in a project.")
+
+
+(defmethod semantic-collector-calculate-completions-raw
+  ((obj semantic-collector-project) prefix completionlist)
+  "Calculate the completions for prefix from completionlist."
+  (semanticdb-find-tags-for-completion prefix (oref obj path)))
+
+;;; Brutish Project search
+(defclass semantic-collector-project-brutish (semantic-collector-project-abstract)
+  ()
+  "Completion engine for tags in a project.")
+
+(defmethod semantic-collector-calculate-completions-raw
+  ((obj semantic-collector-project-brutish) prefix completionlist)
+  "Calculate the completions for prefix from completionlist."
+  (semanticdb-brute-deep-find-tags-for-completion prefix (oref obj path)))
+
+(defclass semantic-collector-analyze-completions (semantic-collector-abstract)
+  ((context :initarg :context
+	    :type semantic-analyze-context
+	    :documentation "An analysis context.
+Specifies some context location from whence completion lists will be drawn."
+	    )
+   (first-pass-completions :type list
+			   :documentation "List of valid completion tags.
+This list of tags is generated when completion starts.  All searches
+derive from this list.")
+   )
+  "Completion engine that uses the context analyzer to provide options.
+The only options available for completion are those which can be logically
+inserted into the current context.")
+
+(defmethod semantic-collector-calculate-completions-raw
+  ((obj semantic-collector-analyze-completions) prefix completionlist)
+  "calculate the completions for prefix from completionlist."
+  ;; if there are no completions yet, calculate them.
+  (if (not (slot-boundp obj 'first-pass-completions))
+      (oset obj first-pass-completions
+	    (semantic-analyze-possible-completions (oref obj context))))
+  ;; search our cached completion list.  make it look like a semanticdb
+  ;; results type.
+  (list (cons (save-excursion
+		(set-buffer (oref (oref obj context) buffer))
+		semanticdb-current-table)
+	      (semantic-find-tags-for-completion
+	       prefix
+	       (oref obj first-pass-completions)))))
+
+
+;;; ------------------------------------------------------------
+;;; Tag List Display Engines
+;;
+;; A typical displayor accepts a pre-determined list of completions
+;; generated by a collector.  This format is in semanticdb search
+;; form.  This vaguely standard form is a bit challenging to navigate
+;; because the tags do not contain buffer info, but the file assocated
+;; with the tags preceed the tag in the list.
+;;
+;; Basic displayors don't care, and can strip the results.
+;; Advanced highlighting displayors need to know when they need
+;; to load a file so that the tag in question can be highlighted.
+;;
+;; Key interface methods to a displayor are:
+;; * semantic-displayor-next-action
+;; * semantic-displayor-set-completions
+;; * semantic-displayor-current-focus
+;; * semantic-displayor-show-request
+;; * semantic-displayor-scroll-request
+;; * semantic-displayor-focus-request
+
+(defclass semantic-displayor-abstract ()
+  ((table :type (or null semanticdb-find-result-with-nil)
+	  :initform nil
+	  :protection :protected
+	  :documentation "List of tags this displayor is showing.")
+   (last-prefix :type string
+		:protection :protected
+		:documentation "Prefix associated with slot `table'")
+   )
+  "Abstract displayor baseclass.
+Manages the display of some number of tags.
+Provides the basics for a displayor, including interacting with
+a collector, and tracking tables of completion to display."
+  :abstract t)
+
+(defmethod semantic-displayor-cleanup ((obj semantic-displayor-abstract))
+  "Clean up any mess this displayor may have."
+  nil)
+
+(defmethod semantic-displayor-next-action ((obj semantic-displayor-abstract))
+  "The next action to take on the minibuffer related to display."
+  (if (and (slot-boundp obj 'last-prefix)
+	   (string= (oref obj last-prefix) (semantic-completion-text))
+	   (eq last-command this-command))
+      'scroll
+    'display))
+
+(defmethod semantic-displayor-set-completions ((obj semantic-displayor-abstract)
+					       table prefix)
+  "Set the list of tags to be completed over to TABLE."
+  (oset obj table table)
+  (oset obj last-prefix prefix))
+
+(defmethod semantic-displayor-show-request ((obj semantic-displayor-abstract))
+  "A request to show the current tags table."
+  (ding))
+
+(defmethod semantic-displayor-focus-request ((obj semantic-displayor-abstract))
+  "A request to for the displayor to focus on some tag option."
+  (ding))
+
+(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-abstract))
+  "A request to for the displayor to scroll the completion list (if needed)."
+  (scroll-other-window))
+
+(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-abstract))
+  "Set the current focus to the previous item."
+  nil)
+
+(defmethod semantic-displayor-focus-next ((obj semantic-displayor-abstract))
+  "Set the current focus to the next item."
+  nil)
+
+(defmethod semantic-displayor-current-focus ((obj semantic-displayor-abstract))
+  "Return a single tag currently in focus.
+This object type doesn't do focus, so will never have a focus object."
+  nil)
+
+;; Traditional displayor
+(defcustom semantic-completion-displayor-format-tag-function
+  #'semantic-format-tag-name
+  "*A Tag format function to use when showing completions."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+(defclass semantic-displayor-traditional (semantic-displayor-abstract)
+  ()
+  "Display options in *Completions* buffer.
+Traditional display mechanism for a list of possible completions.
+Completions are showin in a new buffer and listed with the ability
+to click on the items to aid in completion.")
+
+(defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional))
+  "A request to show the current tags table."
+
+  ;; NOTE TO SELF.  Find the character to type next, and emphesize it.
+
+  (with-output-to-temp-buffer "*Completions*"
+    (display-completion-list
+     (mapcar semantic-completion-displayor-format-tag-function
+	     (semanticdb-strip-find-results (oref obj table))))
+    )
+  )
+
+;;; Abstract baseclass for any displayor which supports focus
+(defclass semantic-displayor-focus-abstract (semantic-displayor-abstract)
+  ((focus :type number
+	  :protection :protected
+	  :documentation "A tag index from `table' which has focus.
+Multiple calls to the display function can choose to focus on a
+given tag, by highlighting its location.")
+   (find-file-focus
+    :allocation :class
+    :initform nil
+    :documentation
+    "Non-nil if focusing requires a tag's buffer be in memory.")
+   )
+  "Abstract displayor supporting `focus'.
+A displayor which has the ability to focus in on one tag.
+Focusing is a way of differentiationg between multiple tags
+which have the same name."
+  :abstract t)
+
+(defmethod semantic-displayor-next-action ((obj semantic-displayor-focus-abstract))
+  "The next action to take on the minibuffer related to display."
+  (if (and (slot-boundp obj 'last-prefix)
+	   (string= (oref obj last-prefix) (semantic-completion-text))
+	   (eq last-command this-command))
+      (if (and
+	   (slot-boundp obj 'focus)
+	   (slot-boundp obj 'table)
+	   (<= (semanticdb-find-result-length (oref obj table))
+	       (1+ (oref obj focus))))
+	  ;; We are at the end of the focus road.
+	  'displayend
+	;; Focus on some item.
+	'focus)
+    'display))
+
+(defmethod semantic-displayor-set-completions ((obj semantic-displayor-focus-abstract)
+					       table prefix)
+  "Set the list of tags to be completed over to TABLE."
+  (call-next-method)
+  (slot-makeunbound obj 'focus))
+
+(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-focus-abstract))
+  "Set the current focus to the previous item.
+Not meaningful return value."
+  (when (and (slot-boundp obj 'table) (oref obj table))
+    (with-slots (table) obj
+      (if (or (not (slot-boundp obj 'focus))
+	      (<= (oref obj focus) 0))
+	  (oset obj focus (1- (semanticdb-find-result-length table)))
+	(oset obj focus (1- (oref obj focus)))
+	)
+      )))
+
+(defmethod semantic-displayor-focus-next ((obj semantic-displayor-focus-abstract))
+  "Set the current focus to the next item.
+Not meaningful return value."
+  (when (and (slot-boundp obj 'table) (oref obj table))
+    (with-slots (table) obj
+      (if (not (slot-boundp obj 'focus))
+	  (oset obj focus 0)
+	(oset obj focus (1+ (oref obj focus)))
+	)
+      (if (<= (semanticdb-find-result-length table) (oref obj focus))
+	  (oset obj focus 0))
+      )))
+
+(defmethod semantic-displayor-focus-tag ((obj semantic-displayor-focus-abstract))
+  "Return the next tag OBJ should focus on."
+  (when (and (slot-boundp obj 'table) (oref obj table))
+    (with-slots (table) obj
+      (semanticdb-find-result-nth table (oref obj focus)))))
+
+(defmethod semantic-displayor-current-focus ((obj semantic-displayor-focus-abstract))
+  "Return the tag currently in focus, or call parent method."
+  (if (and (slot-boundp obj 'focus)
+	   (slot-boundp obj 'table)
+	   ;; Only return the current focus IFF the minibuffer reflects
+	   ;; the list this focus was derived from.
+	   (slot-boundp obj 'last-prefix)
+	   (string= (semantic-completion-text) (oref obj last-prefix))
+	   )
+      ;; We need to focus
+      (if (oref obj find-file-focus)
+	  (semanticdb-find-result-nth-in-buffer (oref obj table) (oref obj focus))
+	;; result-nth returns a cons with car being the tag, and cdr the
+	;; database.
+	(car (semanticdb-find-result-nth (oref obj table) (oref obj focus))))
+    ;; Do whatever
+    (call-next-method)))
+
+;;; Simple displayor which performs traditional display completion,
+;; and also focuses with highlighting.
+(defclass semantic-displayor-traditional-with-focus-highlight
+  (semantic-displayor-focus-abstract semantic-displayor-traditional)
+  ((find-file-focus :initform t))
+  "Display completions in *Completions* buffer, with focus highlight.
+A traditional displayor which can focus on a tag by showing it.
+Same as `semantic-displayor-traditional', but with selection between
+multiple tags with the same name done by 'focusing' on the source
+location of the different tags to differentiate them.")
+
+(defmethod semantic-displayor-focus-request
+  ((obj semantic-displayor-traditional-with-focus-highlight))
+  "Focus in on possible tag completions.
+Focus is performed by cycling through the tags and highlighting
+one in the source buffer."
+  (let* ((tablelength (semanticdb-find-result-length (oref obj table)))
+	 (focus (semantic-displayor-focus-tag obj))
+	 ;; Raw tag info.
+	 (rtag (car focus))
+	 (rtable (cdr focus))
+	 ;; Normalize
+	 (nt (semanticdb-normalize-one-tag rtable rtag))
+	 (tag (cdr nt))
+	 (table (car nt))
+	)
+    ;; If we fail to normalize, resete.
+    (when (not tag) (setq table rtable tag rtag))
+    ;; Do the focus.
+    (let ((buf (or (semantic-tag-buffer tag)
+		   (and table (semanticdb-get-buffer table)))))
+      ;; If no buffer is provided, then we can make up a summary buffer.
+      (when (not buf)
+	(save-excursion
+	  (set-buffer (get-buffer-create "*Completion Focus*"))
+	  (erase-buffer)
+	  (insert "Focus on tag: \n")
+	  (insert (semantic-format-tag-summarize tag nil t) "\n\n")
+	  (when table
+	    (insert "From table: \n")
+	    (insert (object-name table) "\n\n"))
+	  (when buf
+	    (insert "In buffer: \n\n")
+	    (insert (format "%S" buf)))
+	  (setq buf (current-buffer))))
+      ;; Show the tag in the buffer.
+      (if (get-buffer-window buf)
+	  (select-window (get-buffer-window buf))
+	(switch-to-buffer-other-window buf t)
+	(select-window (get-buffer-window buf)))
+      ;; Now do some positioning
+      (unwind-protect
+	  (if (semantic-tag-with-position-p tag)
+	      ;; Full tag positional information available
+	      (progn
+		(goto-char (semantic-tag-start tag))
+		;; This avoids a dangerous problem if we just loaded a tag
+		;; from a file, but the original position was not updated
+		;; in the TAG variable we are currently using.
+		(semantic-momentary-highlight-tag (semantic-current-tag))
+		))
+	(select-window (minibuffer-window)))
+      ;; Calculate text difference between contents and the focus item.
+      (let* ((mbc (semantic-completion-text))
+	     (ftn (semantic-tag-name tag))
+	     (diff (substring ftn (length mbc))))
+	(semantic-completion-message
+	 (format "%s [%d of %d matches]" diff (1+ (oref obj focus)) tablelength)))
+      )))
+
+
+;;; Tooltip completion lister
+;;
+;; Written and contributed by Masatake YAMATO <jet@gyve.org>
+;;
+;; Modified by Eric Ludlam for
+;; * Safe compatibility for tooltip free systems.
+;; * Don't use 'avoid package for tooltip positioning.
+
+(defclass semantic-displayor-tooltip (semantic-displayor-traditional)
+  ((max-tags     :type integer
+		 :initarg :max-tags
+		 :initform 5
+		 :custom integer
+		 :documentation
+		 "Max number of tags displayed on tooltip at once.
+If `force-show' is 1,  this value is ignored with typing tab or space twice continuously.
+if `force-show' is 0, this value is always ignored.")
+   (force-show   :type integer
+		 :initarg :force-show
+	         :initform 1
+		 :custom (choice (const
+				  :tag "Show when double typing"
+				  1)
+				 (const
+				  :tag "Show always"
+				  0)
+				 (const
+				  :tag "Show if the number of tags is less than `max-tags'."
+				  -1))
+	         :documentation
+		 "Control the behavior of the number of tags is greater than `max-tags'.
+-1 means tags are never shown.
+0 means the tags are always shown.
+1 means tags are shown if space or tab is typed twice continuously.")
+   (typing-count :type integer
+		 :initform 0
+		 :documentation
+		 "Counter holding how many times the user types space or tab continuously before showing tags.")
+   (shown        :type boolean
+		 :initform nil
+		 :documentation
+		 "Flag representing whether tags is shown once or not.")
+   )
+  "Display completions options in a tooltip.
+Display mechanism using tooltip for a list of possible completions.")
+
+(defmethod initialize-instance :AFTER ((obj semantic-displayor-tooltip) &rest args)
+  "Make sure we have tooltips required."
+  (condition-case nil
+      (require 'tooltip)
+    (error nil))
+  )
+
+(defmethod semantic-displayor-show-request ((obj semantic-displayor-tooltip))
+  "A request to show the current tags table."
+  (if (or (not (featurep 'tooltip)) (not tooltip-mode))
+      ;; If we cannot use tooltips, then go to the normal mode with
+      ;; a traditional completion buffer.
+      (call-next-method)
+    (let* ((tablelong (semanticdb-strip-find-results (oref obj table)))
+	   (table (semantic-unique-tag-table-by-name tablelong))
+	   (l (mapcar semantic-completion-displayor-format-tag-function table))
+	   (ll (length l))
+	   (typing-count (oref obj typing-count))
+	   (force-show (oref obj force-show))
+	   (matchtxt (semantic-completion-text))
+	   msg)
+      (if (or (oref obj shown)
+	      (< ll (oref obj max-tags))
+	      (and (<= 0 force-show)
+		   (< (1- force-show) typing-count)))
+	  (progn
+	    (oset obj typing-count 0)
+	    (oset obj shown t)
+	    (if (eq 1 ll)
+		;; We Have only one possible match.  There could be two cases.
+		;; 1) input text != single match.
+		;;    --> Show it!
+		;; 2) input text == single match.
+		;;   --> Complain about it, but still show the match.
+		(if (string= matchtxt (semantic-tag-name (car table)))
+		    (setq msg (concat "[COMPLETE]\n" (car l)))
+		  (setq msg (car l)))
+	      ;; Create the long message.
+	      (setq msg (mapconcat 'identity l "\n"))
+	      ;; If there is nothing, say so!
+	      (if (eq 0 (length msg))
+		  (setq msg "[NO MATCH]")))
+	    (semantic-displayor-tooltip-show msg))
+	;; The typing count determines if the user REALLY REALLY
+	;; wanted to show that much stuff.  Only increment
+	;; if the current command is a completion command.
+	(if (and (stringp (this-command-keys))
+		 (string= (this-command-keys) "\C-i"))
+	    (oset obj typing-count (1+ typing-count)))
+	;; At this point, we know we have too many items.
+	;; Lets be brave, and truncate l
+	(setcdr (nthcdr (oref obj max-tags) l) nil)
+	(setq msg (mapconcat 'identity l "\n"))
+	(cond
+	 ((= force-show -1)
+	  (semantic-displayor-tooltip-show (concat msg "\n...")))
+	 ((= force-show 1)
+	  (semantic-displayor-tooltip-show (concat msg "\n(TAB for more)")))
+	 )))))
+
+;;; Compatibility
+;;
+(eval-and-compile
+  (if (fboundp 'window-inside-edges)
+      ;; Emacs devel.
+      (defalias 'semantic-displayor-window-edges
+        'window-inside-edges)
+    ;; Emacs 21
+    (defalias 'semantic-displayor-window-edges
+      'window-edges)
+    ))
+
+(defun semantic-displayor-point-position ()
+  "Return the location of POINT as positioned on the selected frame.
+Return a cons cell (X . Y)"
+  (let* ((frame (selected-frame))
+	 (left (frame-parameter frame 'left))
+	 (top (frame-parameter frame 'top))
+	 (point-pix-pos (posn-x-y (posn-at-point)))
+	 (edges (window-inside-pixel-edges (selected-window))))
+    (cons (+ (car point-pix-pos) (car edges) left)
+          (+ (cdr point-pix-pos) (cadr edges) top))))
+
+
+(defun semantic-displayor-tooltip-show (text)
+  "Display a tooltip with TEXT near cursor."
+  (let ((point-pix-pos (semantic-displayor-point-position))
+	(tooltip-frame-parameters
+	 (append tooltip-frame-parameters nil)))
+    (push
+     (cons 'left (+ (car point-pix-pos) (frame-char-width)))
+     tooltip-frame-parameters)
+    (push
+     (cons 'top (+ (cdr point-pix-pos) (frame-char-height)))
+     tooltip-frame-parameters)
+    (tooltip-show text)))
+
+(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-tooltip))
+  "A request to for the displayor to scroll the completion list (if needed)."
+  ;; Do scrolling in the tooltip.
+  (oset obj max-tags 30)
+  (semantic-displayor-show-request obj)
+  )
+
+;; End code contributed by Masatake YAMATO <jet@gyve.org>
+
+
+;;; Ghost Text displayor
+;;
+(defclass semantic-displayor-ghost (semantic-displayor-focus-abstract)
+
+  ((ghostoverlay :type overlay
+		 :documentation
+		 "The overlay the ghost text is displayed in.")
+   (first-show :initform t
+	       :documentation
+	       "Non nil if we have not seen our first show request.")
+   )
+  "Cycle completions inline with ghost text.
+Completion displayor using ghost chars after point for focus options.
+Whichever completion is currently in focus will be displayed as ghost
+text using overlay options.")
+
+(defmethod semantic-displayor-next-action ((obj semantic-displayor-ghost))
+  "The next action to take on the inline completion related to display."
+  (let ((ans (call-next-method))
+	(table (when (slot-boundp obj 'table)
+		       (oref obj table))))
+    (if (and (eq ans 'displayend)
+	     table
+	     (= (semanticdb-find-result-length table) 1)
+	     )
+	nil
+      ans)))
+
+(defmethod semantic-displayor-cleanup ((obj semantic-displayor-ghost))
+  "Clean up any mess this displayor may have."
+  (when (slot-boundp obj 'ghostoverlay)
+    (semantic-overlay-delete (oref obj ghostoverlay)))
+  )
+
+(defmethod semantic-displayor-set-completions ((obj semantic-displayor-ghost)
+					       table prefix)
+  "Set the list of tags to be completed over to TABLE."
+  (call-next-method)
+
+  (semantic-displayor-cleanup obj)
+  )
+
+
+(defmethod semantic-displayor-show-request ((obj semantic-displayor-ghost))
+  "A request to show the current tags table."
+;  (if (oref obj first-show)
+;      (progn
+;	(oset obj first-show nil)
+	(semantic-displayor-focus-next obj)
+	(semantic-displayor-focus-request obj)
+;	)
+    ;; Only do the traditional thing if the first show request
+    ;; has been seen.  Use the first one to start doing the ghost
+    ;; text display.
+;    (call-next-method)
+;    )
+)
+
+(defmethod semantic-displayor-focus-request
+  ((obj semantic-displayor-ghost))
+  "Focus in on possible tag completions.
+Focus is performed by cycling through the tags and showing a possible
+completion text in ghost text."
+  (let* ((tablelength (semanticdb-find-result-length (oref obj table)))
+	 (focus (semantic-displayor-focus-tag obj))
+	 (tag (car focus))
+	 )
+    (if (not tag)
+	(semantic-completion-message "No tags to focus on.")
+      ;; Display the focus completion as ghost text after the current
+      ;; inline text.
+      (when (or (not (slot-boundp obj 'ghostoverlay))
+		(not (semantic-overlay-live-p (oref obj ghostoverlay))))
+	(oset obj ghostoverlay
+	      (semantic-make-overlay (point) (1+ (point)) (current-buffer) t)))
+
+      (let* ((lp (semantic-completion-text))
+	     (os (substring (semantic-tag-name tag) (length lp)))
+	     (ol (oref obj ghostoverlay))
+	     )
+
+	(put-text-property 0 (length os) 'face 'region os)
+
+	(semantic-overlay-put
+	 ol 'display (concat os (buffer-substring (point) (1+ (point)))))
+	)
+      ;; Calculate text difference between contents and the focus item.
+      (let* ((mbc (semantic-completion-text))
+	     (ftn (concat (semantic-tag-name tag)))
+	     )
+	(put-text-property (length mbc) (length ftn) 'face
+			   'bold ftn)
+	(semantic-completion-message
+	 (format "%s [%d of %d matches]" ftn (1+ (oref obj focus)) tablelength)))
+      )))
+
+
+;;; ------------------------------------------------------------
+;;; Specific queries
+;;
+(defvar semantic-complete-inline-custom-type
+  (append '(radio)
+	  (mapcar
+	   (lambda (class)
+	     (let* ((C (intern (car class)))
+		    (doc (documentation-property C 'variable-documentation))
+		    (doc1 (car (split-string doc "\n")))
+		    )
+	       (list 'const
+		     :tag doc1
+		     C)))
+	   (eieio-build-class-alist semantic-displayor-abstract t))
+	  )
+  "Possible options for inline completion displayors.
+Use this to enable custom editing.")
+
+(defcustom semantic-complete-inline-analyzer-displayor-class
+  'semantic-displayor-traditional
+  "*Class for displayor to use with inline completion."
+  :group 'semantic
+  :type semantic-complete-inline-custom-type
+  )
+
+;;;###autoload
+(defun semantic-complete-read-tag-buffer-deep (prompt &optional
+						      default-tag
+						      initial-input
+						      history)
+  "Ask for a tag by name from the current buffer.
+Available tags are from the current buffer, at any level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to store the history in."
+  (semantic-complete-read-tag-engine
+   (semantic-collector-buffer-deep prompt :buffer (current-buffer))
+   (semantic-displayor-traditional-with-focus-highlight "simple")
+   ;;(semantic-displayor-tooltip "simple")
+   prompt
+   default-tag
+   initial-input
+   history)
+  )
+
+;;;###autoload
+(defun semantic-complete-read-tag-project (prompt &optional
+						  default-tag
+						  initial-input
+						  history)
+  "Ask for a tag by name from the current project.
+Available tags are from the current project, at the top level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to store the history in."
+  (semantic-complete-read-tag-engine
+   (semantic-collector-project-brutish prompt
+				       :buffer (current-buffer)
+				       :path (current-buffer)
+				       )
+   (semantic-displayor-traditional-with-focus-highlight "simple")
+   prompt
+   default-tag
+   initial-input
+   history)
+  )
+
+;;;###autoload
+(defun semantic-complete-inline-tag-project ()
+  "Complete a symbol name by name from within the current project.
+This is similar to `semantic-complete-read-tag-project', except
+that the completion interaction is in the buffer where the context
+was calculated from.
+Customize `semantic-complete-inline-analyzer-displayor-class'
+to control how completion options are displayed.
+See `semantic-complete-inline-tag-engine' for details on how
+completion works."
+  (let* ((collector (semantic-collector-project-brutish
+		     "inline"
+		     :buffer (current-buffer)
+		     :path (current-buffer)))
+	 (sbounds (semantic-ctxt-current-symbol-and-bounds))
+	 (syms (car sbounds))
+	 (start (car (nth 2 sbounds)))
+	 (end (cdr (nth 2 sbounds)))
+	 (rsym (reverse syms))
+	 (thissym (nth 1 sbounds))
+	 (nextsym (car-safe (cdr rsym)))
+	 (complst nil))
+    (when (and thissym (or (not (string= thissym ""))
+			   nextsym))
+      ;; Do a quick calcuation of completions.
+      (semantic-collector-calculate-completions
+       collector thissym nil)
+      ;; Get the master list
+      (setq complst (semanticdb-strip-find-results
+		     (semantic-collector-all-completions collector thissym)))
+      ;; Shorten by name
+      (setq complst (semantic-unique-tag-table-by-name complst))
+      (if (or (and (= (length complst) 1)
+		   ;; Check to see if it is the same as what is there.
+		   ;; if so, we can offer to complete.
+		   (let ((compname (semantic-tag-name (car complst))))
+		     (not (string= compname thissym))))
+	      (> (length complst) 1))
+	  ;; There are several options.  Do the completion.
+	  (semantic-complete-inline-tag-engine
+	   collector
+	   (funcall semantic-complete-inline-analyzer-displayor-class
+		    "inline displayor")
+	   ;;(semantic-displayor-tooltip "simple")
+	   (current-buffer)
+	   start end))
+      )))
+
+;;;###autoload
+(defun semantic-complete-read-tag-analyzer (prompt &optional
+						   context
+						   history)
+  "Ask for a tag by name based on the current context.
+The function `semantic-analyze-current-context' is used to
+calculate the context.  `semantic-analyze-possible-completions' is used
+to generate the list of possible completions.
+PROMPT is the first part of the prompt.  Additional prompt
+is added based on the contexts full prefix.
+CONTEXT is the semantic analyzer context to start with.
+HISTORY is a symbol representing a variable to store the history in.
+usually a default-tag and initial-input are available for completion
+prompts.  these are calculated from the CONTEXT variable passed in."
+  (if (not context) (setq context (semantic-analyze-current-context (point))))
+  (let* ((syms (semantic-ctxt-current-symbol (point)))
+	 (inp (car (reverse syms))))
+    (setq syms (nreverse (cdr (nreverse syms))))
+    (semantic-complete-read-tag-engine
+     (semantic-collector-analyze-completions
+      prompt
+      :buffer (oref context buffer)
+      :context context)
+     (semantic-displayor-traditional-with-focus-highlight "simple")
+     (save-excursion
+       (set-buffer (oref context buffer))
+       (goto-char (cdr (oref context bounds)))
+       (concat prompt (mapconcat 'identity syms ".")
+	       (if syms "." "")
+	       ))
+     nil
+     inp
+     history)))
+
+;;;###autoload
+(defun semantic-complete-inline-analyzer (context)
+  "Complete a symbol name by name based on the current context.
+This is similar to `semantic-complete-read-tag-analyze', except
+that the completion interaction is in the buffer where the context
+was calculated from.
+CONTEXT is the semantic analyzer context to start with.
+Customize `semantic-complete-inline-analyzer-displayor-class'
+to control how completion options are displayed.
+
+See `semantic-complete-inline-tag-engine' for details on how
+completion works."
+  (if (not context) (setq context (semantic-analyze-current-context (point))))
+  (if (not context) (error "Nothing to complete on here"))
+  (let* ((collector (semantic-collector-analyze-completions
+		     "inline"
+		     :buffer (oref context buffer)
+		     :context context))
+	 (syms (semantic-ctxt-current-symbol (point)))
+	 (rsym (reverse syms))
+	 (thissym (car rsym))
+	 (nextsym (car-safe (cdr rsym)))
+	 (complst nil))
+    (when (and thissym (or (not (string= thissym ""))
+			   nextsym))
+      ;; Do a quick calcuation of completions.
+      (semantic-collector-calculate-completions
+       collector thissym nil)
+      ;; Get the master list
+      (setq complst (semanticdb-strip-find-results
+		     (semantic-collector-all-completions collector thissym)))
+      ;; Shorten by name
+      (setq complst (semantic-unique-tag-table-by-name complst))
+      (if (or (and (= (length complst) 1)
+		   ;; Check to see if it is the same as what is there.
+		   ;; if so, we can offer to complete.
+		   (let ((compname (semantic-tag-name (car complst))))
+		     (not (string= compname thissym))))
+	      (> (length complst) 1))
+	  ;; There are several options.  Do the completion.
+	  (semantic-complete-inline-tag-engine
+	   collector
+	   (funcall semantic-complete-inline-analyzer-displayor-class
+		    "inline displayor")
+	   ;;(semantic-displayor-tooltip "simple")
+	   (oref context buffer)
+	   (car (oref context bounds))
+	   (cdr (oref context bounds))
+	   ))
+      )))
+
+(defcustom semantic-complete-inline-analyzer-idle-displayor-class
+  'semantic-displayor-ghost
+  "*Class for displayor to use with inline completion at idle time."
+  :group 'semantic
+  :type semantic-complete-inline-custom-type
+  )
+
+;;;###autoload
+(defun semantic-complete-inline-analyzer-idle (context)
+  "Complete a symbol name by name based on the current context for idle time.
+CONTEXT is the semantic analyzer context to start with.
+This function is used from `semantic-idle-completions-mode'.
+
+This is the same as `semantic-complete-inline-analyzer', except that
+it uses `semantic-complete-inline-analyzer-idle-displayor-class'
+to control how completions are displayed.
+
+See `semantic-complete-inline-tag-engine' for details on how
+completion works."
+  (let ((semantic-complete-inline-analyzer-displayor-class
+	 semantic-complete-inline-analyzer-idle-displayor-class))
+    (semantic-complete-inline-analyzer context)
+    ))
+
+
+;;; ------------------------------------------------------------
+;;; Testing/Samples
+;;
+(defun semantic-complete-test ()
+  "Test completion mechanisms."
+  (interactive)
+  (message "%S"
+   (semantic-format-tag-prototype
+    (semantic-complete-read-tag-project "Jump to symbol: ")
+    )))
+
+;;;###autoload
+(defun semantic-complete-jump-local ()
+  "Jump to a semantic symbol."
+  (interactive)
+  (let ((tag (semantic-complete-read-tag-buffer-deep "Jump to symbol: ")))
+    (when (semantic-tag-p tag)
+      (push-mark)
+      (goto-char (semantic-tag-start tag))
+      (semantic-momentary-highlight-tag tag)
+      (working-message "%S: %s "
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)))))
+
+;;;###autoload
+(defun semantic-complete-jump ()
+  "Jump to a semantic symbol."
+  (interactive)
+  (let* ((tag (semantic-complete-read-tag-project "Symbol: ")))
+    (when (semantic-tag-p tag)
+      (push-mark)
+      (semantic-go-to-tag tag)
+      (switch-to-buffer (current-buffer))
+      (semantic-momentary-highlight-tag tag)
+      (working-message "%S: %s "
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)))))
+
+;;;###autoload
+(defun semantic-complete-analyze-and-replace ()
+  "Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The minibuffer is used to perform the completion.
+The result is inserted as a replacement of the text that was there."
+  (interactive)
+  (let* ((c (semantic-analyze-current-context (point)))
+	 (tag (save-excursion (semantic-complete-read-tag-analyzer "" c))))
+    ;; Take tag, and replace context bound with its name.
+    (goto-char (car (oref c bounds)))
+    (delete-region (point) (cdr (oref c bounds)))
+    (insert (semantic-tag-name tag))
+    (message "%S" (semantic-format-tag-summarize tag))))
+
+;;;###autoload
+(defun semantic-complete-analyze-inline ()
+  "Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The function returns immediately, leaving the buffer in a mode that
+will perform the completion.
+Configure `semantic-complete-inline-analyzer-displayor-class' to change
+how completion options are displayed."
+  (interactive)
+  ;; Only do this if we are not already completing something.
+  (if (not (semantic-completion-inline-active-p))
+      (semantic-complete-inline-analyzer
+       (semantic-analyze-current-context (point))))
+  ;; Report a message if things didn't startup.
+  (if (and (interactive-p)
+	   (not (semantic-completion-inline-active-p)))
+      (message "Inline completion not needed.")
+    ;; Since this is most likely bound to something, and not used
+    ;; at idle time, throw in a TAB for good measure.
+    (semantic-complete-inline-TAB)
+    ))
+
+;;;###autoload
+(defun semantic-complete-analyze-inline-idle ()
+  "Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The function returns immediately, leaving the buffer in a mode that
+will perform the completion.
+Configure `semantic-complete-inline-analyzer-idle-displayor-class'
+to change how completion options are displayed."
+  (interactive)
+  ;; Only do this if we are not already completing something.
+  (if (not (semantic-completion-inline-active-p))
+      (semantic-complete-inline-analyzer-idle
+       (semantic-analyze-current-context (point))))
+  ;; Report a message if things didn't startup.
+  (if (and (interactive-p)
+	   (not (semantic-completion-inline-active-p)))
+      (message "Inline completion not needed."))
+  )
+
+;;;###autoload
+(defun semantic-complete-self-insert (arg)
+  "Like `self-insert-command', but does completion afterwards.
+ARG is passed to `self-insert-command'.  If ARG is nil,
+use `semantic-complete-analyze-inline' to complete."
+  (interactive "p")
+  ;; If we are already in a completion scenario, exit now, and then start over.
+  (semantic-complete-inline-exit)
+
+  ;; Insert the key
+  (self-insert-command arg)
+
+  ;; Prepare for doing completion, but exit quickly if there is keyboard
+  ;; input.
+  (when (and (not (semantic-exit-on-input 'csi
+		    (semantic-fetch-tags)
+		    (semantic-throw-on-input 'csi)
+		    nil))
+	     (= arg 1)
+	     (not (semantic-exit-on-input 'csi
+		    (semantic-analyze-current-context)
+		    (semantic-throw-on-input 'csi)
+		    nil)))
+    (condition-case nil
+	(semantic-complete-analyze-inline)
+      ;; Ignore errors.  Seems likely that we'll get some once in a while.
+      (error nil))
+    ))
+
+;; @TODO - I can't  find where this fcn is used.  Delete?
+
+;;;;###autoload
+;(defun semantic-complete-inline-project ()
+;  "Perform inline completion for any symbol in the current project.
+;`semantic-analyze-possible-completions' is used to determine the
+;possible values.
+;The function returns immediately, leaving the buffer in a mode that
+;will perform the completion."
+;  (interactive)
+;  ;; Only do this if we are not already completing something.
+;  (if (not (semantic-completion-inline-active-p))
+;      (semantic-complete-inline-tag-project))
+;  ;; Report a message if things didn't startup.
+;  (if (and (interactive-p)
+;	   (not (semantic-completion-inline-active-p)))
+;      (message "Inline completion not needed."))
+;  )
+
+;; End
+(provide 'semantic-complete)
+
+;;; semantic-complete.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ctxt.el b/site/cedet-1.0pre7/semantic/semantic-ctxt.el
new file mode 100644
index 0000000..2b90d19
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ctxt.el
@@ -0,0 +1,617 @@
+;;; semantic-ctxt.el --- Context calculations for Semantic tools.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-ctxt.el,v 1.56 2009/09/11 23:40:16 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic, as a tool, provides a nice list of searchable tags.
+;; That information can provide some very accurate answers if the current
+;; context of a position is known.
+;;
+;; This library provides the hooks needed for a language to specify how
+;; the current context is calculated.
+;;
+(require 'semantic)
+(eval-when-compile (require 'semanticdb))
+
+;;; Code:
+;;
+;;;###autoload
+(defvar semantic-command-separation-character
+ ";"
+  "String which indicates the end of a command.
+Used for identifying the end of a single command.")
+(make-variable-buffer-local 'semantic-command-separation-character)
+
+(defvar semantic-function-argument-separation-character
+ ","
+  "String which indicates the end of an argument.
+Used for identifying arguments to functions.")
+(make-variable-buffer-local 'semantic-function-argument-separation-character)
+
+;;; Local Contexts
+;;
+;; These context are nested blocks of code, such as code in an
+;; if clause
+(define-overloadable-function semantic-up-context (&optional point bounds-type)
+  "Move point up one context from POINT.
+Return non-nil if there are no more context levels.
+Overloaded functions using `up-context' take no parameters.
+BOUNDS-TYPE is a symbol representing a tag class to restrict
+movement to.  If this is nil, 'function is used.
+This will find the smallest tag of that class (function, variable,
+type, etc) and make sure non-nil is returned if you cannot
+go up past the bounds of that tag."
+  (if point (goto-char point))
+  (let ((nar (semantic-current-tag-of-class (or bounds-type 'function))))
+    (if nar
+	(semantic-with-buffer-narrowed-to-tag nar (:override-with-args ()))
+      (when bounds-type
+        (error "No context of type %s to advance in" bounds-type))
+      (:override-with-args ()))))
+
+(defun semantic-up-context-default ()
+  "Move the point up and out one context level.
+Works with languages that use parenthetical grouping."
+  ;; By default, assume that the language uses some form of parenthetical
+  ;; do dads for their context.
+  (condition-case nil
+      (progn
+	(up-list -1)
+	nil)
+    (error t)))
+
+(define-overloadable-function semantic-beginning-of-context (&optional point)
+  "Move POINT to the beginning of the current context.
+Return non-nil if there is no upper context.
+The default behavior uses `semantic-up-context'.")
+
+(defun semantic-beginning-of-context-default (&optional point)
+  "Move POINT to the beginning of the current context via parenthisis.
+Return non-nil if there is no upper context."
+  (if point (goto-char point))
+  (if (semantic-up-context)
+      t
+    (forward-char 1)
+    nil))
+
+(define-overloadable-function semantic-end-of-context (&optional point)
+  "Move POINT to the end of the current context.
+Return non-nil if there is no upper context.
+Be default, this uses `semantic-up-context', and assumes parenthetical
+block delimiters.")
+
+(defun semantic-end-of-context-default (&optional point)
+  "Move POINT to the end of the current context via parenthisis.
+Return non-nil if there is no upper context."
+  (if point (goto-char point))
+  (let ((start (point)))
+    (if (semantic-up-context)
+	t
+      ;; Go over the list, and back over the end parenthisis.
+      (condition-case nil
+	  (progn
+	    (forward-sexp 1)
+	    (forward-char -1))
+	(error
+	 ;; If an error occurs, get the current tag from the cache,
+	 ;; and just go to the end of that.  Make sure we end up at least
+	 ;; where start was so parse-region type calls work.
+	 (if (semantic-current-tag)
+	     (progn
+	       (goto-char (semantic-tag-end (semantic-current-tag)))
+	       (when (< (point) start)
+		 (goto-char start)))
+	   (goto-char start))
+	 t)))
+    nil))
+
+(defun semantic-narrow-to-context ()
+  "Narrow the buffer to the extent of the current context."
+  (let (b e)
+    (save-excursion
+      (if (semantic-beginning-of-context)
+	  nil
+	(setq b (point))))
+    (save-excursion
+      (if (semantic-end-of-context)
+	  nil
+	(setq e (point))))
+    (if (and b e) (narrow-to-region b e))))
+
+(defmacro semantic-with-buffer-narrowed-to-context (&rest body)
+  "Execute BODY with the buffer narrowed to the current context."
+  `(save-restriction
+     (semantic-narrow-to-context)
+     ,@body))
+(put 'semantic-with-buffer-narrowed-to-context 'lisp-indent-function 0)
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec semantic-with-buffer-narrowed-to-context
+	      (def-body))))
+
+;;; Local Variables
+;;
+;;
+(define-overloadable-function semantic-get-local-variables (&optional point)
+  "Get the local variables based on POINT's context.
+Local variables are returned in Semantic tag format.
+This can be overriden with `get-local-variables'."
+  ;; The working status is to let the parser work properly
+  (working-status-forms
+      (semantic-parser-working-message "Local")
+      "done"
+    (save-excursion
+      (if point (goto-char point))
+      (let* ((semantic-working-type nil)
+             ;; Disable parsing messages
+             (working-status-dynamic-type nil)
+             (case-fold-search semantic-case-fold))
+        (:override-with-args ())))))
+
+(defun semantic-get-local-variables-default ()
+  "Get local values from a specific context.
+Uses the bovinator with the special top-symbol `bovine-inner-scope'
+to collect tags, such as local variables or prototypes."
+  ;; This assumes a bovine parser.  Make sure we don't do
+  ;; anything in that case.
+  (when (and semantic--parse-table (not (eq semantic--parse-table t))
+	     (not (semantic-parse-tree-unparseable-p)))
+    (let ((vars (semantic-get-cache-data 'get-local-variables)))
+      (if vars
+	  (progn
+	    ;;(message "Found cached vars.")
+	    vars)
+	(let ((vars2 nil)
+	      ;; We want nothing to do with funny syntaxing while doing this.
+	      (semantic-unmatched-syntax-hook nil)
+	      (start (point))
+	      (firstusefulstart nil)
+	      )
+	  (while (not (semantic-up-context (point) 'function))
+	    (when (not vars)
+	      (setq firstusefulstart (point)))
+	    (save-excursion
+	      (forward-char 1)
+	      (setq vars
+		    ;; Note to self: semantic-parse-region returns cooked
+		    ;; but unlinked tags.  File information is lost here
+		    ;; and is added next.
+		    (append (semantic-parse-region
+			     (point)
+			     (save-excursion (semantic-end-of-context) (point))
+			     'bovine-inner-scope
+			     nil
+			     t)
+			    vars))))
+	  ;; Modify the tags in place.
+	  (setq vars2 vars)
+	  (while vars2
+	    (semantic--tag-put-property (car vars2) :filename (buffer-file-name))
+	    (setq vars2 (cdr vars2)))
+	  ;; Hash our value into the first context that produced useful results.
+	  (when (and vars firstusefulstart)
+	    (let ((end (save-excursion
+			 (goto-char firstusefulstart)
+			 (save-excursion
+			   (unless (semantic-end-of-context)
+			     (point))))))
+	      ;;(message "Caching values %d->%d." firstusefulstart end)
+	      (semantic-cache-data-to-buffer
+	       (current-buffer) firstusefulstart
+	       (or end
+		   ;; If the end-of-context fails,
+		   ;; just use our cursor starting
+		   ;; position.
+		   start)
+	       vars 'get-local-variables 'exit-cache-zone))
+	    )
+	  ;; Return our list.
+	  vars)))))
+
+(define-overloadable-function semantic-get-local-arguments (&optional point)
+  "Get arguments (variables) from the current context at POINT.
+Parameters are available if the point is in a function or method.
+Return a list of tags unlinked from the originating buffer.
+Arguments are obtained by overriding `get-local-arguments', or by the
+default function `semantic-get-local-arguments-default'.  This, must
+return a list of tags, or a list of strings that will be converted to
+tags."
+  (save-excursion
+    (if point (goto-char point))
+    (let* ((case-fold-search semantic-case-fold)
+           (args (:override-with-args ()))
+           arg tags)
+      ;; Convert unsafe arguments to the right thing.
+      (while args
+        (setq arg  (car args)
+              args (cdr args)
+              tags (cons (cond
+                          ((semantic-tag-p arg)
+                           ;; Return a copy of tag without overlay.
+                           ;; The overlay is preserved.
+                           (semantic-tag-copy arg nil t))
+                          ((stringp arg)
+                           (semantic--tag-put-property
+			    (semantic-tag-new-variable arg nil nil)
+			    :filename (buffer-file-name)))
+                          (t
+                           (error "Unknown parameter element %S" arg)))
+                         tags)))
+      (nreverse tags))))
+
+(defun semantic-get-local-arguments-default ()
+  "Get arguments (variables) from the current context.
+Parameters are available if the point is in a function or method."
+  (let ((tag (semantic-current-tag)))
+    (if (and tag (semantic-tag-of-class-p tag 'function))
+	(semantic-tag-function-arguments tag))))
+
+(define-overloadable-function semantic-get-all-local-variables (&optional point)
+  "Get all local variables for this context, and parent contexts.
+Local variables are returned in Semantic tag format.
+Be default, this gets local variables, and local arguments.
+Optional argument POINT is the location to start getting the variables from.")
+
+(defun semantic-get-all-local-variables-default (&optional point)
+  "Get all local variables for this context.
+Optional argument POINT is the location to start getting the variables from.
+That is a cons (LOCAL-ARGUMENTS . LOCAL-VARIABLES) where:
+
+- LOCAL-ARGUMENTS is collected by `semantic-get-local-arguments'.
+- LOCAL-VARIABLES is collected by `semantic-get-local-variables'."
+  (save-excursion
+    (if point (goto-char point))
+    (let ((case-fold-search semantic-case-fold))
+      (append (semantic-get-local-arguments)
+	      (semantic-get-local-variables)))))
+
+;;; Local context parsing
+;;
+;; Context parsing assumes a series of language independent commonalities.
+;; These terms are used to describe those contexts:
+;;
+;; command      - One command in the language.
+;; symbol       - The symbol the cursor is on.
+;;                This would include a series of type/field when applicable.
+;; assignment   - The variable currently being assigned to
+;; function     - The function call the cursor is on/in
+;; argument     - The index to the argument the cursor is on.
+;;
+;;
+(define-overloadable-function semantic-end-of-command ()
+  "Move to the end of the current command.
+Be default, uses `semantic-command-separation-character'.")
+
+(defun semantic-end-of-command-default ()
+  "Move to the end of the current command.
+Depends on `semantic-command-separation-character' to find the
+beginning and end of a command."
+  (semantic-with-buffer-narrowed-to-context
+    (let ((case-fold-search semantic-case-fold))
+      (with-syntax-table semantic-lex-syntax-table
+
+	(if (re-search-forward (regexp-quote semantic-command-separation-character)
+			       nil t)
+	    (forward-char -1)
+	  ;; If there wasn't a command after this, we are the last
+	  ;; command, and we are incomplete.
+	  (goto-char (point-max)))))))
+
+(define-overloadable-function semantic-beginning-of-command ()
+  "Move to the beginning of the current command.
+Be default, uses `semantic-command-separation-character'.")
+
+(defun semantic-beginning-of-command-default ()
+  "Move to the beginning of the current command.
+Depends on `semantic-command-separation-character' to find the
+beginning and end of a command."
+  (semantic-with-buffer-narrowed-to-context
+    (with-syntax-table semantic-lex-syntax-table
+      (let ((case-fold-search semantic-case-fold))
+	(skip-chars-backward semantic-command-separation-character)
+	(if (re-search-backward (regexp-quote semantic-command-separation-character)
+				nil t)
+	    (goto-char (match-end 0))
+	  ;; If there wasn't a command after this, we are the last
+	  ;; command, and we are incomplete.
+	  (goto-char (point-min)))
+	(skip-chars-forward " \t\n")
+	))))
+
+
+(defsubst semantic-point-at-beginning-of-command ()
+  "Return the point at the beginning of the current command."
+  (save-excursion (semantic-beginning-of-command) (point)))
+
+(defsubst semantic-point-at-end-of-command ()
+  "Return the point at the beginning of the current command."
+  (save-excursion (semantic-end-of-command) (point)))
+
+(defsubst semantic-narrow-to-command ()
+  "Narrow the current buffer to the current command."
+  (narrow-to-region (semantic-point-at-beginning-of-command)
+		    (semantic-point-at-end-of-command)))
+
+(defmacro semantic-with-buffer-narrowed-to-command (&rest body)
+  "Execute BODY with the buffer narrowed to the current command."
+  `(save-restriction
+     (semantic-narrow-to-command)
+     ,@body))
+(put 'semantic-with-buffer-narrowed-to-command 'lisp-indent-function 0)
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec semantic-with-buffer-narrowed-to-command
+	      (def-body))))
+
+
+(define-overloadable-function semantic-ctxt-current-symbol (&optional point)
+  "Return the current symbol the cursor is on at POINT in a list.
+The symbol includes all logical parts of a complex reference.
+For example, in C the statement:
+  this.that().entry
+
+Would be object `this' calling method `that' which returns some structure
+whose field `entry' is being reference.  In this case, this function
+would return the list:
+  ( \"this\" \"that\" \"entry\" )")
+
+(defun semantic-ctxt-current-symbol-default (&optional point)
+  "Return the current symbol the cursor is on at POINT in a list.
+This will include a list of type/field names when applicable.
+Depends on `semantic-type-relation-separator-character'."
+  (save-excursion
+    (if point (goto-char point))
+    (let* ((fieldsep1 (mapconcat (lambda (a) (regexp-quote a))
+				 semantic-type-relation-separator-character
+				 "\\|"))
+	   ;; NOTE: The [ \n] expression below should used \\s-, but that
+	   ;; doesn't work in C since \n means end-of-comment, and isn't
+	   ;; really whitespace.
+	   (fieldsep (concat "[ \t\n\r]*\\(" fieldsep1 "\\)[ \t\n\r]*\\(\\w\\|\\s_\\)"))
+	   (case-fold-search semantic-case-fold)
+	   (symlist nil)
+	   end)
+      (with-syntax-table semantic-lex-syntax-table
+	(save-excursion
+	  (cond ((looking-at "\\w\\|\\s_")
+		 ;; In the middle of a symbol, move to the end.
+		 (forward-sexp 1))
+		((looking-at fieldsep1)
+		 ;; We are in a find spot.. do nothing.
+		 nil
+		 )
+		((save-excursion
+		   (and (condition-case nil
+			    (progn (forward-sexp -1)
+				   (forward-sexp 1)
+				   t)
+			  (error nil))
+			(looking-at fieldsep1)))
+		 (setq symlist (list ""))
+		 (forward-sexp -1)
+		 ;; Skip array expressions.
+		 (while (looking-at "\\s(") (forward-sexp -1))
+		 (forward-sexp 1))
+		)
+	  ;; Set our end point.
+	  (setq end (point))
+
+	  ;; Now that we have gotten started, lets do the rest.
+	  (condition-case nil
+	      (while (save-excursion
+		       (forward-char -1)
+		       (looking-at "\\w\\|\\s_"))
+		;; We have a symbol.. Do symbol things
+		(forward-sexp -1)
+		(setq symlist (cons (buffer-substring-no-properties (point) end)
+				    symlist))
+		;; Skip the next syntactic expression backwards, then go forwards.
+		(let ((cp (point)))
+		  (forward-sexp -1)
+		  (forward-sexp 1)
+		  ;; If we end up at the same place we started, we are at the
+		  ;; beginning of a buffer, or narrowed to a command and
+		  ;; have to stop.
+		  (if (<= cp (point)) (error nil)))
+		(if (looking-at fieldsep)
+		    (progn
+		      (forward-sexp -1)
+		      ;; Skip array expressions.
+		      (while (and (looking-at "\\s(") (not (bobp)))
+			(forward-sexp -1))
+		      (forward-sexp 1)
+		      (setq end (point)))
+		  (error nil))
+		)
+	    (error nil)))
+	symlist))))
+
+
+(define-overloadable-function semantic-ctxt-current-symbol-and-bounds (&optional point)
+  "Return the current symbol and bounds the cursor is on at POINT.
+The symbol should be the same as returned by `semantic-ctxt-current-symbol'.
+Return (PREFIX ENDSYM BOUNDS).")
+
+(defun semantic-ctxt-current-symbol-and-bounds-default (&optional point)
+  "Return the current symbol and bounds the cursor is on at POINT.
+Uses `semantic-ctxt-current-symbol' to calculate the symbol.
+Return (PREFIX ENDSYM BOUNDS)."
+  (save-excursion
+    (when point (goto-char (point)))
+    (let* ((prefix (semantic-ctxt-current-symbol))
+	   (endsym (car (reverse prefix)))
+	   ;; @todo - Can we get this data direct from ctxt-current-symbol?
+	   (bounds (save-excursion
+		     (cond ((string= endsym "")
+			    (cons (point) (point))
+			    )
+			   ((and prefix (looking-at endsym))
+			    (cons (point) (progn
+					    (condition-case nil
+						(forward-sexp 1)
+					      (error nil))
+					    (point))))
+			   (prefix
+			    (condition-case nil
+				(cons (progn (forward-sexp -1) (point))
+				      (progn (forward-sexp 1) (point)))
+			      (error nil)))
+			   (t nil))))
+	   )
+      (list prefix endsym bounds))))
+
+(define-overloadable-function semantic-ctxt-current-assignment (&optional point)
+  "Return the current assignment near the cursor at POINT.
+Return a list as per `semantic-ctxt-current-symbol'.
+Return nil if there is nothing relevant.")
+
+(defun semantic-ctxt-current-assignment-default (&optional point)
+  "Return the current assignment near the cursor at POINT.
+By default, assume that \"=\" indicates an assignment."
+  (if point (goto-char point))
+  (let ((case-fold-search semantic-case-fold))
+    (with-syntax-table semantic-lex-syntax-table
+      (condition-case nil
+	  (semantic-with-buffer-narrowed-to-command
+	    (save-excursion
+	      (skip-chars-forward " \t=")
+	      (condition-case nil (forward-char 1) (error nil))
+	      (re-search-backward "[^=]=\\([^=]\\|$\\)")
+	      ;; We are at an equals sign.  Go backwards a sexp, and
+	      ;; we'll have the variable.  Otherwise we threw an error
+	      (forward-sexp -1)
+	      (semantic-ctxt-current-symbol)))
+	(error nil)))))
+
+(define-overloadable-function semantic-ctxt-current-function (&optional point)
+  "Return the current function call the cursor is in at POINT.
+The function returned is the one accepting the arguments that
+the cursor is currently in.  It will not return function symbol if the
+cursor is on the text representing that function.")
+
+(defun semantic-ctxt-current-function-default (&optional point)
+  "Return the current function call the cursor is in at POINT.
+The call will be identifed for C like langauges with the form
+ NAME ( args ... )"
+  (if point (goto-char point))
+  (let ((case-fold-search semantic-case-fold))
+    (with-syntax-table semantic-lex-syntax-table
+      (save-excursion
+	(semantic-up-context)
+	(when (looking-at "(")
+	  (semantic-ctxt-current-symbol))))
+    ))
+
+(define-overloadable-function semantic-ctxt-current-argument (&optional point)
+  "Return the index of the argument position the cursor is on at POINT.")
+
+(defun semantic-ctxt-current-argument-default (&optional point)
+  "Return the index of the argument the cursor is on at POINT.
+Depends on `semantic-function-argument-separation-character'."
+  (if point (goto-char point))
+  (let ((case-fold-search semantic-case-fold))
+    (with-syntax-table semantic-lex-syntax-table
+      (when (semantic-ctxt-current-function)
+	(save-excursion
+	  ;; Only get the current arg index if we are in function args.
+	  (let ((p (point))
+		(idx 1))
+	    (semantic-up-context)
+	    (while (re-search-forward
+		    (regexp-quote semantic-function-argument-separation-character)
+		    p t)
+	      (setq idx (1+ idx)))
+	    idx))))))
+
+(defun semantic-ctxt-current-thing ()
+  "Calculate a thing identified by the current cursor position.
+Calls previously defined `semantic-ctxt-current-...' calls until something
+gets a match.  See `semantic-ctxt-current-symbol',
+`semantic-ctxt-current-function', and `semantic-ctxt-current-assignment'
+for details on the return value."
+  (or (semantic-ctxt-current-symbol)
+      (semantic-ctxt-current-function)
+      (semantic-ctxt-current-assignment)))
+
+(define-overloadable-function semantic-ctxt-current-class-list (&optional point)
+  "Return a list of tag classes that are allowed at POINT.
+If POINT is nil, the current buffer location is used.
+For example, in Emacs Lisp, the symbol after a ( is most likely
+a function.  In a makefile, symbols after a : are rules, and symbols
+after a $( are variables.")
+
+(defun semantic-ctxt-current-class-list-default (&optional point)
+  "Return a list of tag classes that are allowed at POINT.
+Assume a functional typed language.  Uses very simple rules."
+  (save-excursion
+    (if point (goto-char point))
+
+    (let ((tag (semantic-current-tag)))
+      (if tag
+	  (cond ((semantic-tag-of-class-p tag 'function)
+		 '(function variable type))
+		((or (semantic-tag-of-class-p tag 'type)
+		     (semantic-tag-of-class-p tag 'variable))
+		 '(type))
+		(t nil))
+	'(type)
+	))))
+
+(define-overloadable-function semantic-ctxt-current-mode (&optional point)
+  "Return the major mode active at POINT.
+POINT defaults to the value of point in current buffer.
+You should override this function in multiple mode buffers to
+determine which major mode apply at point.")
+
+(defun semantic-ctxt-current-mode-default (&optional point)
+  "Return the major mode active at POINT.
+POINT defaults to the value of point in current buffer.
+This default implementation returns the current major mode."
+  major-mode)
+
+;;; Scoped Types
+;;
+;; Scoped types are types that the current code would have access to.
+;; The come from the global namespace or from special commands such as "using"
+(define-overloadable-function semantic-ctxt-scoped-types (&optional point)
+  "Return a list of type names currently in scope at POINT.
+The return value can be a mixed list of either strings (names of
+types that are in scope) or actual tags (type declared locally
+that may or may not have a name.)")
+
+(defun semantic-ctxt-scoped-types-default (&optional point)
+  "Return a list of scoped types by name for the current context at POINT.
+This is very different for various languages, and does nothing unless
+overriden."
+  (if point (goto-char point))
+  (let ((case-fold-search semantic-case-fold))
+    ;; We need to look at TYPES within the bounds of locally parse arguments.
+    ;; C needs to find using statements and the like too.  Bleh.
+    nil
+    ))
+
+(provide 'semantic-ctxt)
+
+;;; semantic-ctxt.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-custom.el b/site/cedet-1.0pre7/semantic/semantic-custom.el
new file mode 100644
index 0000000..01468dc
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-custom.el
@@ -0,0 +1,277 @@
+;;; semantic-custom.el --- custom support for semantic tags.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-custom.el,v 1.1 2009/03/17 00:31:59 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide CUSTOM support for Semantic tags.
+;;
+;; Defines new custom widget types of:
+;;
+;;  'tag-edit  - A semantic-tag edited in-place
+;;  'tag       - A semantic-tag that is cloned before editing
+;;
+;; Use of the tag widget currently assumes the user is familiar with
+;; the internal structure of a tag.  This program could use some help.
+
+(require 'widget)
+(require 'wid-edit)
+(require 'semantic-tag)
+
+;;; Code:
+
+;;; TAG-EDIT
+;;
+;; The TAG-EDIT widget type will edit a single tag.  Since TAGS can
+;; have a lot of arbitrary entries, helping the user through adding
+;; such entries can be a challenge.  Provide some conveniences that
+;; get flushed if left nil.
+
+;;;###autoload
+(define-widget 'tag-edit 'group
+  "Abstractly modify a Semantic Tag."
+  :tag "Tag"
+  :format "%v"
+  :convert-widget 'widget-types-convert-widget
+  :value-create 'semantic-tag-widget-value-create
+  :value-get 'semantic-tag-widget-value-get
+  :value-delete 'widget-children-value-delete
+  :validate 'widget-children-validate
+  :match 'semantic-tag-widget-match
+  :clone-object-children nil
+  )
+
+;;;###autoload
+(defun semantic-tag-widget-match (widget value)
+  "Match infor for WIDGET against VALUE."
+  ;; Write me
+  t)
+
+;;;###autoload
+(defun semantic-tag-widget-value-create (widget)
+  "Create the value of WIDGET."
+  (let* ((tag (widget-get widget :value))
+	 (name (semantic-tag-name tag))
+	 (class (semantic-tag-class tag))
+	 (attr (semantic-tag-attributes tag))
+	 (chil nil)
+	 )
+
+    (widget-insert "Summary:\n   ")
+    (widget-insert (semantic-format-tag-prototype tag nil t))
+    (widget-insert "\n\n")
+
+    (push (widget-create-child-and-convert
+	   widget 'string
+	   :tag "Name"
+	   :sample-face 'custom-face-tag
+	   :value name)
+	  chil)
+
+    (push (widget-create-child-and-convert
+	   widget '(choice
+		    :button-face font-lock-variable-name-face
+		    :sample-face 'custom-face-tag
+		    (const function)
+		    (const variable)
+		    (const type)
+		    (const include)
+		    (const provide)
+		    symbol)
+	   :tag "Class"
+	   :sample-face 'custom-face-tag
+	   :value class)
+	  chil)
+
+    (let ((attrs '(:arguments
+		   :type
+		   :constant-flag
+		   :prototype-flag
+		   :constructor-flag
+		   :destructor-flag
+		   :operator-flag
+		   :reentrant-flag
+		   :methodconst-flag
+		   :pure-virtual-flag
+		   :typedef
+		   :typemodifiers
+		   :members
+		   :template-specifier)))
+
+      (push (widget-create-child-and-convert
+	     widget `(plist :key-type
+			    (choice
+			     :sample-face 'custom-face-tag
+			     :button-face font-lock-variable-name-face
+			     ,@(mapcar
+				(lambda (a)
+				  (list 'const a
+					;:sample-face 'font-lock-keyword-face
+					))
+				attrs)
+			     symbol)
+			    :value-type sexp
+			    :sample-face 'custom-face-tag
+			    :tag "Attribute")
+	     :tag "Attributes"
+	     :value attr)
+	    chil))
+    
+    (widget-put widget :children (nreverse chil))
+    ))
+
+;;;###autoload
+(defun semantic-tag-widget-value-get (widget)
+  "Get the value out of WIDGET."
+  (let* ((tag (widget-get widget :value))
+	 (chil (widget-get widget :children))
+	 (name (widget-apply (nth 0 chil) :value-inline))
+	 (class (widget-apply (nth 1 chil) :value-inline))
+	 (attr (widget-apply (nth 2 chil) :value-inline))
+	 )
+    ;; Extract the value from each child, and apply to
+    ;; our tag.
+    (semantic-tag-set-name tag (car name))
+
+    (setcar (nthcdr 1 tag) (car class))
+
+    (setcar (nthcdr 2 tag) (car attr))
+
+    ;; Leave other bits alone.
+
+    ))
+
+;;; TAG
+;;
+;; The TAG widget type can take some tag variable from the environment
+;; and make it editable.  Inheriting from tag-edit, which presumes that
+;; the tag in question is ok.
+
+;;;###autoload
+(define-widget 'tag 'tag-edit
+  "A Semantic Tag."
+  :format "%{%t%}:\n%v"
+  :value-to-internal 'semantic-tag-widget-to-internal
+  :value-to-external 'semantic-tag-widget-to-external
+  :close-object-children t
+  )
+
+;;;###autoload
+(defun semantic-tag-widget-to-internal (widget value)
+  "For WIDGET, convert VALUE to a safe representation."
+  (cond ((semantic-tag-p value)
+	 (semantic-tag-clone value))
+	((null value)
+	 value)
+	(t nil))
+  )
+
+;;;###autoload
+(defun semantic-tag-widget-to-external (widget value)
+  "For WIDGET, convert VALUE from the abstract value."
+  value)
+
+;;; TAG CUSTOMIZE BUFFER
+;;
+;; A special function for customizing a single tag in a UI.
+(defvar semantic-tag-wo nil
+  "Buffer local variable in tag customize buffers for the current widget.")
+(defvar semantic-tag-co nil
+  "Buffer local variable in tag customize buffers for the current tag.")
+
+;;;###autoload
+(defun semantic-tag-customize (&optional tag)
+  "Customize TAG.
+When the user clicks 'ACCEPT', then the location where TAG
+is stored is directly modified.
+If TAG is not provided, then the tag under point is used."
+  (interactive)
+  ;; setup
+  (when (not tag) (setq tag (semantic-current-tag)))
+  ;; Create the buffer for editing.
+  (switch-to-buffer (get-buffer-create "*CUSTOMIZE TAG*"))
+  (toggle-read-only -1)
+  (kill-all-local-variables)
+  (erase-buffer)
+  (let ((all (semantic-overlay-lists)))
+    (mapc 'semantic-overlay-delete (car all))
+    (mapc 'semantic-overlay-delete (cdr all)))
+  ;; Add the apply/reset buttons.
+  (semantic-tag-custom-apply-reset tag)
+  (widget-insert "\n\n")
+  (widget-insert "Edit tag:\n\n")
+  ;; Create the widget editing the tag
+  (make-local-variable 'semantic-tag-wo)
+  (setq semantic-tag-wo (semantic-tag-custom-widget-insert tag))
+  ;; Now create more apply reset buttons
+  (widget-insert "\n")
+  (semantic-tag-custom-apply-reset tag)
+  ;; Initialize the buffer
+  (use-local-map widget-keymap)
+  (widget-setup)
+  (goto-char (point-min))
+  (widget-forward 3)
+  (make-local-variable 'semantic-tag-co)
+  (setq semantic-tag-co tag)
+  )
+
+(defun semantic-tag-custom-apply-reset (tag)
+  "Insert an Apply and Reset button into the tag editor.
+Argument TAG os the tag being customized."
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (widget-apply semantic-tag-wo :value-get)
+			   (bury-buffer))
+		 :button-face 'custom-button
+		 "Accept")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   ;; I think the act of getting it sets
+			   ;; it's value through the get function.
+			   (message "Applying Changes...")
+			   (widget-apply semantic-tag-wo :value-get)
+			   (message "Applying Changes...Done."))
+		 :button-face 'custom-button
+		 "Apply")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (message "Resetting.")
+			   (semantic-tag-customize semantic-tag-co))
+		 :button-face 'custom-button
+		 "Reset")
+  (widget-insert "   ")
+  (widget-create 'push-button
+		 :notify (lambda (&rest ignore)
+			   (bury-buffer))
+		 :button-face 'custom-button
+		 "Cancel"))
+
+(defun semantic-tag-custom-widget-insert (tag &rest flags)
+  "Insert the widget used for editing TAG in the current buffer.
+Arguments FLAGS are widget compatible flags.
+Must return the created widget."
+  (apply 'widget-create 'tag-edit :value tag flags))
+
+
+(provide 'semantic-custom)
+;;; semantic-custom.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-debug.el b/site/cedet-1.0pre7/semantic/semantic-debug.el
new file mode 100644
index 0000000..b270369
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-debug.el
@@ -0,0 +1,576 @@
+;;; semantic-debug.el --- Language Debugger framework
+
+;;; Copyright (C) 2003, 2004, 2005, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-debug.el,v 1.18 2009/09/11 23:40:04 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; To provide better support for debugging parsers, this framework
+;; provides the interface for debugging.  The work of parsing and
+;; controlling and stepping through the parsing work must be implemented
+;; by the parser.
+;;
+;; Fortunatly, the nature of language support files means that the parser
+;; may not need to be instrumented first.
+;;
+;; The debugger uses EIEIO objects.  One object controls the user
+;; interface, including stepping, data-view, queries.  A second
+;; object implemented here represents the parser itself.  A third represents
+;; a parser independent frame which knows how to highlight the parser buffer.
+;; Each parser must implement the interface and override any methods as needed.
+;;
+
+(require 'semantic)
+(require 'inversion)
+(inversion-require 'eieio "0.18beta1")
+
+;;; Code:
+
+;;;###autoload
+(defvar semantic-debug-parser-source nil
+  "For any buffer, the file name (no path) of the parser.
+This would be a parser for a specific language, not the source
+to one of the parser generators.")
+;;;###autoload
+(make-variable-buffer-local 'semantic-debug-parser-source)
+
+;;;###autoload
+(defvar semantic-debug-parser-class nil
+  "Class to create when building a debug parser object.")
+;;;###autoload
+(make-variable-buffer-local 'semantic-debug-parser-class)
+
+;;;###autoload
+(defvar semantic-debug-enabled nil
+  "Non-nil when debugging a parser.")
+
+;;; Variables used during a debug session.
+(defvar semantic-debug-current-interface nil
+  "The debugger interface currently active for this buffer.")
+
+(defvar semantic-debug-current-parser nil
+  "The parser current active for this buffer.")
+
+;;; User Interface Portion
+;;
+(defclass semantic-debug-interface ()
+  ((parser-buffer :initarg :parser-buffer
+		  :type buffer
+		  :documentation
+		  "The buffer containing the parser we are debugging.")
+   (parser-local-map :initarg :parser-local-map
+		     :type keymap
+		     :documentation
+		     "The local keymap originally in the PARSER buffer.")
+   (parser-location :type marker
+		    :documentation
+		    "A marker representing where we are in the parser buffer.")
+   (source-buffer :initarg :source-buffer
+		  :type buffer
+		  :documentation
+		  "The buffer containing the source we are parsing.
+The :parser-buffer defines a parser that can parse the text in the
+:source-buffer.")
+   (source-local-map :initarg :source-local-map
+		     :type keymap
+		     :documentation
+		     "The local keymap originally in the SOURCE buffer.")
+   (source-location :type marker
+		    :documentation
+		    "A marker representing where we are in the parser buffer.")
+   (data-buffer :initarg :data-buffer
+		:type buffer
+		:documentation
+		"Buffer being used to display some useful data.
+These buffers are brought into view when layout occurs.")
+   (current-frame :type semantic-debug-frame
+		  :documentation
+		  "The currently displayed frame.")
+   (overlays :type list
+	     :initarg nil
+	     :documentation
+	     "Any active overlays being used to show the debug position.")
+   )
+  "Controls action when in `semantic-debug-mode'")
+
+;; Methods
+(defmethod semantic-debug-set-frame ((iface semantic-debug-interface) frame)
+  "Set the current frame on IFACE to FRAME."
+  (if frame
+      (oset iface current-frame frame)
+    (slot-makeunbound iface 'current-frame)))
+
+(defmethod semantic-debug-set-parser-location ((iface semantic-debug-interface) point)
+  "Set the parser location in IFACE to POINT."
+  (save-excursion
+    (set-buffer (oref iface parser-buffer))
+    (if (not (slot-boundp iface 'parser-location))
+	(oset iface parser-location (make-marker)))
+    (move-marker (oref iface parser-location) point))
+  )
+
+(defmethod semantic-debug-set-source-location ((iface semantic-debug-interface) point)
+  "Set the source location in IFACE to POINT."
+  (save-excursion
+    (set-buffer (oref iface source-buffer))
+    (if (not (slot-boundp iface 'source-location))
+	(oset iface source-location (make-marker)))
+    (move-marker (oref iface source-location) point))
+  )
+
+(defmethod semantic-debug-interface-layout ((iface semantic-debug-interface))
+  "Layout windows in the current frame to facilitate debugging."
+  (delete-other-windows)
+  ;; Deal with the data buffer
+  (when (slot-boundp iface 'data-buffer)
+    (let ((lines (/ (frame-height (selected-frame)) 3))
+	  (cnt (save-excursion
+		 (set-buffer (oref iface data-buffer))
+		 (count-lines (point-min) (point-max))))
+	  )
+      ;; Set the number of lines to 1/3, or the size of the data buffer.
+      (if (< cnt lines) (setq cnt lines))
+
+      (split-window-vertically cnt)
+      (switch-to-buffer (oref iface data-buffer))
+      )
+    (other-window 1))
+  ;; Parser
+  (switch-to-buffer (oref iface parser-buffer))
+  (when (slot-boundp iface 'parser-location)
+    (goto-char (oref iface parser-location)))
+  (split-window-vertically)
+  (other-window 1)
+  ;; Source
+  (switch-to-buffer (oref iface source-buffer))
+  (when (slot-boundp iface 'source-location)
+    (goto-char (oref iface source-location)))
+  )
+
+(defmethod semantic-debug-highlight-lexical-token ((iface semantic-debug-interface) token)
+  "For IFACE, highlight TOKEN in the source buffer .
+TOKEN is a lexical token."
+  (set-buffer (oref iface :source-buffer))
+
+  (object-add-to-list iface 'overlays
+		      (semantic-lex-highlight-token token))
+
+  (semantic-debug-set-source-location iface (semantic-lex-token-start token))
+  )
+
+(defmethod semantic-debug-highlight-rule ((iface semantic-debug-interface) nonterm &optional rule match)
+  "For IFACE, highlight NONTERM in the parser buffer.
+NONTERM is the name of the rule currently being processed that shows up
+as a nonterminal (or tag) in the source buffer.
+If RULE and MATCH indicies are specified, highlight those also."
+  (set-buffer (oref iface :parser-buffer))
+
+  (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
+	 (nt (semantic-find-first-tag-by-name nonterm rules))
+	 (o nil)
+	 )
+    (when nt
+      ;; I know it is the first symbol appearing in the body of this token.
+      (goto-char (semantic-tag-start nt))
+
+      (setq o (semantic-make-overlay (point) (progn (forward-sexp 1) (point))))
+      (semantic-overlay-put o 'face 'highlight)
+
+      (object-add-to-list iface 'overlays o)
+
+      (semantic-debug-set-parser-location iface (semantic-overlay-start o))
+
+      (when (and rule match)
+
+	;; Rule, an int, is the rule inside the nonterminal we are following.
+	(re-search-forward ":\\s-*")
+	(while (/= 0 rule)
+	  (re-search-forward "^\\s-*|\\s-*")
+	  (setq rule (1- rule)))
+
+	;; Now find the match inside the rule
+	(while (/= 0 match)
+	  (forward-sexp 1)
+	  (skip-chars-forward " \t")
+	  (setq match (1- match)))
+
+	;; Now highlight the thingy we find there.
+	(setq o (semantic-make-overlay (point) (progn (forward-sexp 1) (point))))
+	(semantic-overlay-put o 'face 'highlight)
+
+	(object-add-to-list iface 'overlays o)
+
+	;; If we have a match for a sub-rule, have the parser position
+	;; move so we can see it in the output window for very long rules.
+	(semantic-debug-set-parser-location iface (semantic-overlay-start o))
+
+	))))
+
+(defmethod semantic-debug-unhighlight ((iface semantic-debug-interface))
+  "Remove all debugging overlays."
+  (mapc 'semantic-overlay-delete (oref iface overlays))
+  (oset iface overlays nil))
+
+;; Call from the parser at a breakpoint
+(defvar semantic-debug-user-command nil
+  "The command the user is requesting.")
+
+;;;###autoload
+(defun semantic-debug-break (frame)
+  "Stop parsing now at FRAME.
+FRAME is an object that represents the parser's view of the
+current state of the world.
+This function enters a recursive edit.  It returns
+on an `exit-recursive-edit', or if someone uses one
+of the `semantic-debug-mode' commands.
+It returns the command specified.  Parsers need to take action
+on different types of return values."
+  (save-window-excursion
+    ;; Set up displaying information
+    (semantic-debug-mode t)
+    (unwind-protect
+	(progn
+	  (semantic-debug-frame-highlight frame)
+	  (semantic-debug-interface-layout semantic-debug-current-interface)
+	  (condition-case nil
+	      ;; Enter recursive edit... wait for user command.
+	      (recursive-edit)
+	    (error nil)))
+      (semantic-debug-unhighlight semantic-debug-current-interface)
+      (semantic-debug-mode nil))
+    ;; Find the requested user state.  Do something.
+    (let ((returnstate semantic-debug-user-command))
+      (setq semantic-debug-user-command nil)
+      returnstate)
+    ))
+
+;;; Frame
+;;
+;; A frame can represent the state at a break point.
+(defclass semantic-debug-frame ()
+  (
+   )
+  "One frame representation.")
+
+(defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame))
+  "Highlight one parser frame."
+
+  )
+
+(defmethod semantic-debug-frame-info ((frame semantic-debug-frame))
+  "Display info about this one parser frame."
+
+  )
+
+;;; Major Mode
+;;
+(defvar semantic-debug-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "n" 'semantic-debug-next)
+    (define-key km " " 'semantic-debug-next)
+    (define-key km "s" 'semantic-debug-step)
+    (define-key km "u" 'semantic-debug-up)
+    (define-key km "d" 'semantic-debug-down)
+    (define-key km "f" 'semantic-debug-fail-match)
+    (define-key km "h" 'semantic-debug-print-state)
+    (define-key km "s" 'semantic-debug-jump-to-source)
+    (define-key km "p" 'semantic-debug-jump-to-parser)
+    (define-key km "q" 'semantic-debug-quit)
+    (define-key km "a" 'semantic-debug-abort)
+    (define-key km "g" 'semantic-debug-go)
+    (define-key km "b" 'semantic-debug-set-breakpoint)
+    ;; Some boring bindings.
+    (define-key km "e" 'eval-expression)
+
+    km)
+  "Keymap used when in semantic-debug-node.")
+
+(defun semantic-debug-mode (onoff)
+  "Turn `semantic-debug-mode' on and off.
+Argument ONOFF is non-nil when we are entering debug mode.
+\\{semantic-debug-mode-map}"
+  (let ((iface semantic-debug-current-interface))
+    (if onoff
+	;; Turn it on
+	(save-excursion
+	  (set-buffer (oref iface parser-buffer))
+	  ;; Install our map onto this buffer
+	  (use-local-map semantic-debug-mode-map)
+	  ;; Make the buffer read only
+	  (toggle-read-only 1)
+
+	  (set-buffer (oref iface source-buffer))
+	  ;; Use our map in the source buffer also
+	  (use-local-map semantic-debug-mode-map)
+	  ;; Make the buffer read only
+	  (toggle-read-only 1)
+	  ;; Hooks
+	  (run-hooks 'semantic-debug-mode-hooks)
+	  )
+      ;; Restore old mode information
+      (save-excursion
+	(set-buffer
+	 (oref semantic-debug-current-interface parser-buffer))
+	(use-local-map
+	 (oref semantic-debug-current-interface parser-local-map))
+	)
+      (save-excursion
+	(set-buffer
+	 (oref semantic-debug-current-interface source-buffer))
+	(use-local-map
+	 (oref semantic-debug-current-interface source-local-map))
+	)
+      (run-hooks 'semantic-debug-exit-hooks)
+      )))
+
+;;;###autoload
+(defun semantic-debug ()
+  "Parse the current buffer and run in debug mode."
+  (interactive)
+  (if semantic-debug-current-interface
+      (error "You are already in a debug session"))
+  (if (not semantic-debug-parser-class)
+      (error "This major mode does not support parser debugging"))
+  ;; Clear the cache to force a full reparse.
+  (semantic-clear-toplevel-cache)
+  ;; Do the parse
+  (let ((semantic-debug-enabled t)
+	;; Create an interface
+	(semantic-debug-current-interface
+	 (let ((parserb  (semantic-debug-find-parser-source)))
+	   (semantic-debug-interface
+	    "Debug Interface"
+	    :parser-buffer parserb
+	    :parser-local-map (save-excursion
+				(set-buffer parserb)
+				(current-local-map))
+	    :source-buffer (current-buffer)
+	    :source-local-map (current-local-map)
+	    )))
+	;; Create a parser debug interface
+	(semantic-debug-current-parser
+	 (funcall semantic-debug-parser-class "parser"))
+	)
+    ;; We could recurse into a parser while debugging.
+    ;; Is that a problem?
+    (semantic-fetch-tags)
+    ;; We should turn the auto-parser back on, but don't do it for
+    ;; now until the debugger is working well.
+    ))
+
+(defun semantic-debug-find-parser-source ()
+  "Return a buffer containing the parser source file for the current buffer.
+The parser needs to be on the load path, or this routine returns nil."
+  (if (not semantic-debug-parser-source)
+      (error "No parser is associated with this buffer"))
+  (let ((parser (locate-library semantic-debug-parser-source t)))
+    (if parser
+	(find-file-noselect parser)
+      (error "Cannot find parser source.  It should be on the load-path"))))
+
+;;; Debugger commands
+;;
+(defun semantic-debug-next ()
+  "Perform one parser operation.
+In the recursive parser, this steps past one match rule.
+In other parsers, this may be just like `semantic-debug-step'."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-next parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-step ()
+  "Perform one parser operation."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-step parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-up ()
+  "Move highlighting representation up one level."
+  (interactive)
+  (message "Not implemented yet.")
+  )
+
+(defun semantic-debug-down ()
+  "Move highlighting representation down one level."
+  (interactive)
+  (message "Not implemented yet.")
+  )
+
+(defun semantic-debug-fail-match ()
+  "Artificially fail the current match."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-fail parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-print-state ()
+  "Show interesting parser state."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-print-state parser)
+    )
+  )
+
+(defun semantic-debug-jump-to-source ()
+  "Move cursor to the source code being parsed at the current lexical token."
+  (interactive)
+  (let* ((interface semantic-debug-current-interface)
+	 (buf (oref interface source-buffer)))
+    (if (get-buffer-window buf)
+	(progn
+	  (select-frame (window-frame (get-buffer-window buf)))
+	  (select-window (get-buffer-window buf)))
+      ;; Technically, this should do a window layout operation
+      (switch-to-buffer buf))
+    )
+  )
+
+(defun semantic-debug-jump-to-parser ()
+  "Move cursor to the parser being debugged."
+  (interactive)
+  (let* ((interface semantic-debug-current-interface)
+	 (buf (oref interface parser-buffer)))
+    (if (get-buffer-window buf)
+	(progn
+	  (select-frame (window-frame (get-buffer-window buf)))
+	  (select-window (get-buffer-window buf)))
+      ;; Technically, this should do a window layout operation
+      (switch-to-buffer buf))
+    )
+  )
+
+(defun semantic-debug-quit ()
+  "Exit debug mode, blowing all stack, and leaving the parse incomplete.
+Do not update any tokens already parsed."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-quit parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-abort ()
+  "Abort one level of debug mode, blowing all stack."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-abort parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-go ()
+  "Continue parsing till finish or breakpoint."
+  (interactive)
+  (let ((parser semantic-debug-current-parser))
+    (semantic-debug-parser-go parser)
+    (exit-recursive-edit)
+    )
+  )
+
+(defun semantic-debug-set-breakpoint ()
+  "Set a breakpoint at the current rule location."
+  (interactive)
+  (let ((parser semantic-debug-current-parser)
+	;; Get the location as semantic tokens.
+	(location (semantic-current-tag))
+	)
+    (if location
+	(semantic-debug-parser-break parser location)
+      (error "Not on a rule"))
+    )
+  )
+
+
+;;; Debugger superclass
+;;
+(defclass semantic-debug-parser ()
+  (
+   )
+  "Represents a parser and its state.
+When implementing the debug parser you can add extra functionality
+by overriding one of the command methods.  Be sure to use
+`call-next-method' so that the debug command is saved, and passed
+down to your parser later."
+  :abstract t)
+
+(defmethod semantic-debug-parser-next ((parser semantic-debug-parser))
+  "Execute next for this PARSER."
+  (setq semantic-debug-user-command 'next)
+  )
+
+(defmethod semantic-debug-parser-step ((parser semantic-debug-parser))
+  "Execute a step for this PARSER."
+  (setq semantic-debug-user-command 'step)
+  )
+
+(defmethod semantic-debug-parser-go ((parser semantic-debug-parser))
+  "Continue executiong in this PARSER until the next breakpoint."
+  (setq semantic-debug-user-command 'go)
+  )
+
+(defmethod semantic-debug-parser-fail ((parser semantic-debug-parser))
+  "Continue executiong in this PARSER until the next breakpoint."
+  (setq semantic-debug-user-command 'fail)
+  )
+
+(defmethod semantic-debug-parser-quit ((parser semantic-debug-parser))
+  "Continue executiong in this PARSER until the next breakpoint."
+  (setq semantic-debug-user-command 'quit)
+  )
+
+(defmethod semantic-debug-parser-abort ((parser semantic-debug-parser))
+  "Continue executiong in this PARSER until the next breakpoint."
+  (setq semantic-debug-user-command 'abort)
+  )
+
+(defmethod semantic-debug-parser-print-state ((parser semantic-debug-parser))
+  "Print state for this PARSER at the current breakpoint."
+  (with-slots (current-frame) semantic-debug-current-interface
+    (when current-frame
+      (semantic-debug-frame-info current-frame)
+      )))
+
+(defmethod semantic-debug-parser-break ((parser semantic-debug-parser))
+  "Set a breakpoint for this PARSER."
+  )
+
+;; Stack stuff
+(defmethod semantic-debug-parser-frames ((parser semantic-debug-parser))
+  "Return a list of frames for the current parser.
+A frame is of the form:
+  ( .. .what ? .. )
+"
+  (error "Parser has not implemented frame values")
+  )
+
+
+(provide 'semantic-debug)
+
+;;; semantic-debug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-decorate-include.el b/site/cedet-1.0pre7/semantic/semantic-decorate-include.el
new file mode 100644
index 0000000..1fff014
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-decorate-include.el
@@ -0,0 +1,763 @@
+;;; semantic-decorate-include.el --- Decoration modes for include statements
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-decorate-include.el,v 1.27 2010/01/27 01:38:54 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Highlight any include that is in a state the user may care about.
+;; The basic idea is to have the state be highly visible so users will
+;; as 'what is this?" and get the info they need to fix problems that
+;; are otherwises transparent when trying to get smart completion
+;; working.
+
+(require 'semantic-decorate-mode)
+(require 'semanticdb)
+(require 'semanticdb-ref)
+(require 'semanticdb-find)
+
+;;; Code:
+
+;;; FACES AND KEYMAPS
+(defvar semantic-decoratiton-mouse-3 (if (featurep 'xemacs) [ button3 ] [ mouse-3 ])
+  "The keybinding lisp object to use for binding the right mouse button.")
+
+;;; Includes that that are in a happy state!
+;;
+(defface semantic-decoration-on-includes
+  nil
+  "*Overlay Face used on includes that are not in some other state.
+Used by the decoration style: `semantic-decoration-on-includes'."
+  :group 'semantic-faces)
+
+(defvar semantic-decoration-on-include-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-include-menu)
+    km)
+  "Keymap used on includes.")
+
+
+(defvar semantic-decoration-on-include-menu nil
+  "Menu used for include headers.")
+
+(easy-menu-define
+  semantic-decoration-on-include-menu
+  semantic-decoration-on-include-map
+  "Include Menu"
+  (list
+   "Include"
+   (semantic-menu-item
+    ["What Is This?" semantic-decoration-include-describe
+     :active t
+     :help "Describe why this include has been marked this way." ])
+   (semantic-menu-item
+    ["Visit This Include" semantic-decoration-include-visit
+     :active t
+     :help "Visit this include file." ])
+   "---"
+   (semantic-menu-item
+    ["Summarize includes current buffer" semantic-decoration-all-include-summary
+     :active t
+     :help "Show a summary for the current buffer containing this include." ])
+   (semantic-menu-item
+    ["List found includes (load unparsed)" semanticdb-find-test-translate-path
+     :active t
+     :help "List all includes found for this file, and parse unparsed files." ])
+   (semantic-menu-item
+    ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading
+     :active t
+     :help "List all includes found for this file, do not parse unparsed files." ])
+   (semantic-menu-item
+    ["List all unknown includes" semanticdb-find-adebug-lost-includes
+     :active t
+     :help "Show a list of all includes semantic cannot find for this file." ])
+   "---"
+   (semantic-menu-item
+    ["Customize System Include Path" semantic-customize-system-include-path
+     :active (get 'semantic-dependency-system-include-path major-mode)
+     :help "Run customize for the system include path for this major mode." ])
+   (semantic-menu-item
+    ["Add a System Include Path" semantic-add-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   (semantic-menu-item
+    ["Remove a System Include Path" semantic-remove-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   ;;["" semantic-decoration-include-
+   ;; :active t
+   ;; :help "" ]
+   ))
+
+;;; Unknown Includes!
+;;
+(defface semantic-decoration-on-unknown-includes
+  '((((class color) (background dark))
+     (:background "#900000"))
+    (((class color) (background light))
+     (:background "#fff0f0")))
+  "*Face used to show includes that cannot be found.
+Used by the decoration style: `semantic-decoration-on-unknown-includes'."
+  :group 'semantic-faces)
+
+(defvar semantic-decoration-on-unknown-include-map
+  (let ((km (make-sparse-keymap)))
+    ;(define-key km [ mouse-2 ] 'semantic-decoration-unknown-include-describe)
+    (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-unknown-include-menu)
+    km)
+  "Keymap used on unparsed includes.")
+
+(defvar semantic-decoration-on-unknown-include-menu nil
+  "Menu used for unparsed include headers.")
+
+(easy-menu-define
+  semantic-decoration-on-unknown-include-menu
+  semantic-decoration-on-unknown-include-map
+  "Unknown Include Menu"
+  (list
+   "Unknown Include"
+   (semantic-menu-item
+    ["What Is This?" semantic-decoration-unknown-include-describe
+     :active t
+     :help "Describe why this include has been marked this way." ])
+   (semantic-menu-item
+    ["List all unknown includes" semanticdb-find-adebug-lost-includes
+     :active t
+     :help "Show a list of all includes semantic cannot find for this file." ])
+   "---"
+   (semantic-menu-item
+    ["Summarize includes current buffer" semantic-decoration-all-include-summary
+     :active t
+     :help "Show a summary for the current buffer containing this include." ])
+   (semantic-menu-item
+    ["List found includes (load unparsed)" semanticdb-find-test-translate-path
+     :active t
+     :help "List all includes found for this file, and parse unparsed files." ])
+   (semantic-menu-item
+    ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading
+     :active t
+     :help "List all includes found for this file, do not parse unparsed files." ])
+   "---"
+   (semantic-menu-item
+    ["Customize System Include Path" semantic-customize-system-include-path
+     :active (get 'semantic-dependency-system-include-path major-mode)
+     :help "Run customize for the system include path for this major mode." ])
+   (semantic-menu-item
+    ["Add a System Include Path" semantic-add-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   (semantic-menu-item
+    ["Remove a System Include Path" semantic-remove-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   ))
+
+;;; Includes that need to be parsed.
+;;
+(defface semantic-decoration-on-unparsed-includes
+  '((((class color) (background dark))
+     (:background "#555500"))
+    (((class color) (background light))
+     (:background "#ffff55")))
+  "*Face used to show includes that have not yet been parsed.
+Used by the decoration style: `semantic-decoration-on-unparsed-includes'."
+  :group 'semantic-faces)
+
+(defvar semantic-decoration-on-unparsed-include-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-unparsed-include-menu)
+    km)
+  "Keymap used on unparsed includes.")
+
+
+(defvar semantic-decoration-on-unparsed-include-menu nil
+  "Menu used for unparsed include headers.")
+
+(easy-menu-define
+  semantic-decoration-on-unparsed-include-menu
+  semantic-decoration-on-unparsed-include-map
+  "Unparsed Include Menu"
+  (list
+   "Unparsed Include"
+   (semantic-menu-item
+    ["What Is This?" semantic-decoration-unparsed-include-describe
+     :active t
+     :help "Describe why this include has been marked this way." ])
+   (semantic-menu-item
+    ["Visit This Include" semantic-decoration-include-visit
+     :active t
+     :help "Visit this include file so that header file's tags can be used." ])
+   (semantic-menu-item
+    ["Parse This Include" semantic-decoration-unparsed-include-parse-include
+     :active t
+     :help "Parse this include file so that header file's tags can be used." ])
+   (semantic-menu-item
+    ["Parse All Includes" semantic-decoration-unparsed-include-parse-all-includes
+     :active t
+     :help "Parse all the includes so the contents can be used." ])
+   "---"
+   (semantic-menu-item
+    ["Summarize includes current buffer" semantic-decoration-all-include-summary
+     :active t
+     :help "Show a summary for the current buffer containing this include." ])
+   (semantic-menu-item
+    ["List found includes (load unparsed)" semanticdb-find-test-translate-path
+     :active t
+     :help "List all includes found for this file, and parse unparsed files." ])
+   (semantic-menu-item
+    ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading
+     :active t
+     :help "List all includes found for this file, do not parse unparsed files." ])
+   (semantic-menu-item
+    ["List all unknown includes" semanticdb-find-adebug-lost-includes
+     :active t
+     :help "Show a list of all includes semantic cannot find for this file." ])
+   "---"
+   (semantic-menu-item
+    ["Customize System Include Path" semantic-customize-system-include-path
+     :active (get 'semantic-dependency-system-include-path major-mode)
+     :help "Run customize for the system include path for this major mode." ])
+   (semantic-menu-item
+    ["Add a System Include Path" semantic-add-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   (semantic-menu-item
+    ["Remove a System Include Path" semantic-remove-system-include
+     :active t
+     :help "Add an include path for this session." ])
+   ;;["" semantic-decoration-unparsed-include-
+   ;; :active t
+   ;; :help "" ]
+   ))
+
+
+;;; MODES
+
+;;; Include statement Decorate Mode
+;;
+;; This mode handles the three states of an include statements
+;;
+(define-semantic-decoration-style semantic-decoration-on-includes
+  "Highlight class members that are includes.
+This mode provides a nice context menu on the include statements."
+  :enabled t)
+
+(defun semantic-decoration-on-includes-p-default (tag)
+  "Return non-nil if TAG has is an includes that can't be found."
+  (semantic-tag-of-class-p tag 'include))
+
+(defun semantic-decoration-on-includes-highlight-default (tag)
+  "Highlight the include TAG to show that semantic can't find it."
+  (let* ((file (semantic-dependency-tag-file tag))
+	 (table (when file
+		  (semanticdb-file-table-object file t)))
+	 (face nil)
+	 (map nil)
+	 )
+    (cond
+     ((not file)
+      ;; Cannot find this header.
+      (setq face 'semantic-decoration-on-unknown-includes
+	    map semantic-decoration-on-unknown-include-map)
+      )
+     ((and table (number-or-marker-p (oref table pointmax)))
+      ;; A found and parsed file.
+      (setq face 'semantic-decoration-on-includes
+	    map semantic-decoration-on-include-map)
+      )
+     (t
+      ;; An unparsed file.
+      (setq face 'semantic-decoration-on-unparsed-includes
+	    map semantic-decoration-on-unparsed-include-map)
+      (when table
+	;; Set ourselves up for synchronization
+	(semanticdb-cache-get
+	 table 'semantic-decoration-unparsed-include-cache)
+	;; Add a dependancy.
+	(let ((table semanticdb-current-table))
+	  (semanticdb-add-reference table tag))
+	)
+      ))
+
+    ;; @TODO - if not a tag w/ a position, we need to get one.  How?
+
+    (when (semantic-tag-with-position-p tag)
+      (let ((ol (semantic-decorate-tag tag
+				       (semantic-tag-start tag)
+				       (semantic-tag-end tag)
+				       face))
+	    )
+	(semantic-overlay-put ol 'mouse-face 'highlight)
+	(semantic-overlay-put ol 'keymap map)
+	(semantic-overlay-put ol 'help-echo
+			      "Header File : mouse-3 - Context menu")
+	))))
+
+;;; Regular Include Functions
+;;
+(defun semantic-decoration-include-describe ()
+  "Describe what unparsed includes are in the current buffer.
+Argument EVENT is the mouse clicked event."
+  (interactive)
+  (let* ((tag (or (semantic-current-tag)
+		  (error "No tag under point")))
+	 (file (semantic-dependency-tag-file tag))
+	 (table (when file
+		  (semanticdb-file-table-object file t))))
+    (with-output-to-temp-buffer (help-buffer) ; "*Help*"
+      (help-setup-xref (list #'semantic-decoration-include-describe)
+		       (interactive-p))
+      (princ "Include File: ")
+      (princ (semantic-format-tag-name tag nil t))
+      (princ "\n")
+      (princ "This include file was found at:\n  ")
+      (princ (semantic-dependency-tag-file tag))
+      (princ "\n\n")
+      (princ "Semantic knows where this include file is, and has parsed
+its contents.
+
+")
+      (let ((inc (semantic-find-tags-by-class 'include table))
+	    (ok 0)
+	    (unknown 0)
+	    (unparsed 0)
+	    (all 0))
+	(dolist (i inc)
+	  (let* ((fileinner (semantic-dependency-tag-file i))
+		 )
+	    (cond ((not fileinner)
+		   (setq unknown (1+ unknown)))
+		  ((number-or-marker-p (oref table pointmax))
+		   (setq ok (1+ ok)))
+		  (t
+		   (setq unparsed (1+ unparsed))))))
+	(setq all (+ ok unknown unparsed))
+	(if (= 0 all)
+	    (princ "There are no other includes in this file.\n")
+	  (princ (format "There are %d more includes in this file.\n"
+			 all))
+	  (princ (format "   Unknown Includes:  %d\n" unknown))
+	  (princ (format "   Unparsed Includes: %d\n" unparsed))
+	  (princ (format "   Parsed Includes:   %d\n" ok)))
+	)
+      ;; Get the semanticdb statement, and display it's contents.
+      (princ "\nDetails for header file...\n")
+      (princ "\nMajor Mode:          ")
+      (princ (oref table :major-mode))
+      (princ "\nTags:                ")
+      (princ (format "%s entries" (length (oref table :tags))))
+      (princ "\nFile Size:           ")
+      (princ (format "%s chars" (oref table :pointmax)))
+      (princ "\nSave State:          ")
+      (cond ((oref table dirty)
+	     (princ "Table needs to be saved."))
+	    (t
+	     (princ "Table is saved on disk."))
+	    )
+      (princ "\nExternal References:")
+      (dolist (r (oref table db-refs))
+	(princ "\n    ")
+	(princ (oref r file)))
+      )))
+
+;;;###autoload
+(defun semantic-decoration-include-visit ()
+  "Visit the included file at point."
+  (interactive)
+  (let ((tag  (semantic-current-tag)))
+    (unless (eq (semantic-tag-class tag) 'include)
+      (error "Point is not on an include tag"))
+    (let ((file (semantic-dependency-tag-file tag)))
+      (cond
+       ((or (not file) (not (file-exists-p file)))
+	(error "Could not location include %s"
+	       (semantic-tag-name tag)))
+       ((get-file-buffer file)
+	(switch-to-buffer (get-file-buffer file)))
+       ((stringp file)
+	(find-file file))
+       ))))
+
+(defun semantic-decoration-include-menu (event)
+  "Popup a menu that can help a user understand unparsed includes.
+Argument EVENT describes the event that caused this function to be called."
+  (interactive "e")
+  (let* ((startwin (selected-window))
+	 (win (semantic-event-window event))
+	 )
+    (select-window win t)
+    (save-excursion
+      ;(goto-char (window-start win))
+      (mouse-set-point event)
+      (sit-for 0)
+      (semantic-popup-menu semantic-decoration-on-include-menu)
+      )
+    (select-window startwin)))
+
+
+;;; Unknown Include functions
+;;
+(defun semantic-decoration-unknown-include-describe ()
+  "Describe what unknown includes are in the current buffer.
+Argument EVENT is the mouse clicked event."
+  (interactive)
+  (let ((tag (semantic-current-tag))
+	(mm major-mode))
+    (with-output-to-temp-buffer (help-buffer) ; "*Help*"
+      (help-setup-xref (list #'semantic-decoration-unknown-include-describe)
+		       (interactive-p))
+      (princ "Include File: ")
+      (princ (semantic-format-tag-name tag nil t))
+      (princ "\n\n")
+      (princ "This header file has been marked \"Unknown\".
+This means that Semantic has not been able to locate this file on disk.
+
+When Semantic cannot find an include file, this means that the
+idle summary mode and idle completion modes cannot use the contents of
+that file to provide coding assistance.
+
+If this is a system header and you want it excluded from Semantic's
+searches (which may be desirable for speed reasons) then you can
+safely ignore this state.
+
+If this is a system header, and you want to include it in Semantic's
+searches, then you will need to use:
+
+M-x semantic-add-system-include RET /path/to/includes RET
+
+or, in your .emacs file do:
+
+  (semantic-add-system-include \"/path/to/include\" '")
+      (princ (symbol-name mm))
+      (princ ")
+
+to add the path to Semantic's search.
+
+If this is an include file that belongs to your project, then you may
+need to update `semanticdb-project-roots' or better yet, use `ede'
+to manage your project.  See the ede manual for projects that will
+wrap existing project code for Semantic's benifit.
+")
+
+      (when (or (eq mm 'c++-mode) (eq mm 'c-mode))
+	(princ "
+For C/C++ includes located within a a project, you can use a special
+EDE project that will wrap an existing build system.  You can do that
+like this in your .emacs file:
+
+  (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN)
+
+See the CEDET manual, the EDE manual, or the commentary in
+ede-cpp-root.el for more.
+
+If you think this header tag is marked in error, you may need to do:
+
+C-u M-x bovinate RET
+
+to refresh the tags in this buffer, and recalculate the state."))
+
+      (princ "
+See the Semantic manual node on SemanticDB for more about search paths.")
+      )))
+
+(defun semantic-decoration-unknown-include-menu (event)
+  "Popup a menu that can help a user understand unparsed includes.
+Argument EVENT describes the event that caused this function to be called."
+  (interactive "e")
+  (let* ((startwin (selected-window))
+	 ;; This line has an issue in XEmacs.
+	 (win (semantic-event-window event))
+	 )
+    (select-window win t)
+    (save-excursion
+      ;(goto-char (window-start win))
+      (mouse-set-point event)
+      (sit-for 0)
+      (semantic-popup-menu semantic-decoration-on-unknown-include-menu)
+      )
+    (select-window startwin)))
+
+
+;;; Interactive parts of unparsed includes
+;;
+(defun semantic-decoration-unparsed-include-describe ()
+  "Describe what unparsed includes are in the current buffer.
+Argument EVENT is the mouse clicked event."
+  (interactive)
+  (let ((tag (semantic-current-tag)))
+    (with-output-to-temp-buffer (help-buffer); "*Help*"
+      (help-setup-xref (list #'semantic-decoration-unparsed-include-describe)
+		       (interactive-p))
+
+      (princ "Include File: ")
+      (princ (semantic-format-tag-name tag nil t))
+      (princ "\n")
+      (princ "This include file was found at:\n  ")
+      (princ (semantic-dependency-tag-file tag))
+      (princ "\n\n")
+      (princ "This header file has been marked \"Unparsed\".
+This means that Semantic has located this header file on disk
+but has not yet opened and parsed this file.
+
+So long as this header file is unparsed, idle summary and
+idle completion will not be able to reference the details in this
+header.
+
+To resolve this, use the context menu to parse this include file,
+or all include files referred to in ")
+      (princ (buffer-name))
+      (princ ".
+This can take a while in large projects.
+
+Alternately, you can call:
+
+M-x semanticdb-find-test-translate-path RET
+
+to search path Semantic uses to perform completion.
+
+
+If you think this header tag is marked in error, you may need to do:
+
+C-u M-x bovinate RET
+
+to refresh the tags in this buffer, and recalculate the state.
+If you find a repeatable case where a header is marked in error,
+report it to cedet-devel@lists.sf.net.") )))
+
+
+(defun semantic-decoration-unparsed-include-menu (event)
+  "Popup a menu that can help a user understand unparsed includes.
+Argument EVENT describes the event that caused this function to be called."
+  (interactive "e")
+  (let* ((startwin (selected-window))
+	 (win (semantic-event-window event))
+	 )
+    (select-window win t)
+    (save-excursion
+      ;(goto-char (window-start win))
+      (mouse-set-point event)
+      (sit-for 0)
+      (semantic-popup-menu semantic-decoration-on-unparsed-include-menu)
+      )
+    (select-window startwin)))
+
+(defun semantic-decoration-unparsed-include-parse-include ()
+  "Parse the include file the user menu-selected from."
+  (interactive)
+  (let* ((file (semantic-dependency-tag-file (semantic-current-tag))))
+    (semanticdb-file-table-object file)
+    (semantic-decoration-unparsed-include-do-reset)))
+
+
+(defun semantic-decoration-unparsed-include-parse-all-includes ()
+  "Parse the include file the user menu-selected from."
+  (interactive)
+  (semanticdb-find-translate-path nil nil)
+  )
+
+
+;;; General Includes Information
+;;
+(defun semantic-decoration-all-include-summary ()
+  "Provide a general summary for the state of all includes."
+  (interactive)
+
+  (let* ((table semanticdb-current-table)
+	 (tags (semantic-fetch-tags))
+	 (inc (semantic-find-tags-by-class 'include table))
+	 )
+    (with-output-to-temp-buffer (help-buffer) ;"*Help*"
+      (help-setup-xref (list #'semantic-decoration-all-include-summary)
+		       (interactive-p))
+
+      (princ "Include Summary for File: ")
+      (princ (file-truename (buffer-file-name)))
+      (princ "\n")
+
+      (when (oref table db-refs)
+	(princ "\nExternal Database References to this buffer:")
+	(dolist (r (oref table db-refs))
+	  (princ "\n    ")
+	  (princ (oref r file)))
+	)
+
+      (princ (format "\nThis file contains %d tags, %d of which are includes.\n"
+		     (length tags) (length inc)))
+      (let ((ok 0)
+	    (unknown 0)
+	    (unparsed 0)
+	    (all 0))
+	(dolist (i inc)
+	  (let* ((fileinner (semantic-dependency-tag-file i))
+		 (tableinner (when fileinner
+			       (semanticdb-file-table-object fileinner t))))
+	    (cond ((not fileinner)
+		   (setq unknown (1+ unknown)))
+		  ((number-or-marker-p (oref tableinner pointmax))
+		   (setq ok (1+ ok)))
+		  (t
+		   (setq unparsed (1+ unparsed))))))
+	(setq all (+ ok unknown unparsed))
+	(when (not (= 0 all))
+	  (princ (format "   Unknown Includes:  %d\n" unknown))
+	  (princ (format "   Unparsed Includes: %d\n" unparsed))
+	  (princ (format "   Parsed Includes:   %d\n" ok)))
+	)
+
+      (princ "\nInclude Path Summary:\n\n")
+      (when ede-object
+	(princ "  This file's project include search is handled by the EDE object:\n")
+	(princ "    Buffer Target:  ")
+	(princ (object-print ede-object))
+	(princ "\n")
+	(when (not (eq ede-object ede-object-project))
+	  (princ "    Buffer Project: ")
+	  (princ (object-print ede-object-project))
+	  (princ "\n")
+	  )
+	(when ede-object-project
+	  (let ((loc (ede-get-locator-object ede-object-project)))
+	    (princ "    Backup in-project Locator: ")
+	    (princ (object-print loc))
+	    (princ "\n")))
+	(let ((syspath (ede-system-include-path ede-object-project)))
+	  (if (not syspath)
+	      (princ "    EDE Project system include path: Empty\n")
+	    (princ "    EDE Project system include path:\n")
+	    (dolist (dir syspath)
+	      (princ "        ")
+	      (princ dir)
+	      (princ "\n"))
+	    )))
+
+      (princ "\n  This file's system include path is:\n")
+      (dolist (dir semantic-dependency-system-include-path)
+	(princ "    ")
+	(princ dir)
+	(princ "\n"))
+
+      (let ((unk semanticdb-find-lost-includes))
+	(when unk
+	  (princ "\nAll unknown includes:\n")
+	  (dolist (tag unk)
+	    (princ "  ")
+	    (princ (semantic-tag-name tag))
+	    (princ "\n"))
+	  ))
+
+      (let* ((semanticdb-find-default-throttle
+	      (if (featurep 'semanticdb-find)
+		  (remq 'unloaded semanticdb-find-default-throttle)
+		nil))
+	     (path (semanticdb-find-translate-path nil nil)))
+	(if (<= (length path) (length inc))
+	    (princ "\nThere are currently no includes found recursively.\n")
+	  ;; List the full include list.
+	  (princ "\nSummary of all includes needed by ")
+	  (princ (buffer-name))
+	  (dolist (p path)
+	    (if (slot-boundp p 'tags)
+		(princ (format "\n  %s :\t%d tags, %d are includes. %s"
+			       (object-name-string p)
+			       (length (oref p tags))
+			       (length (semantic-find-tags-by-class
+					'include p))
+			       (cond
+				((condition-case nil
+				     (oref p dirty)
+				   (error nil))
+				 " dirty.")
+				((not (number-or-marker-p (oref table pointmax)))
+				 "  Needs to be parsed.")
+				(t ""))))
+	      (princ (format "\n  %s :\tUnparsed"
+			     (object-name-string p))))
+	    )))
+      )))
+
+
+;;; Unparsed Include Features
+;;
+;; This section handles changing states of unparsed include
+;; decorations base on what happens in other files.
+;;
+
+(defclass semantic-decoration-unparsed-include-cache (semanticdb-abstract-cache)
+  ()
+  "Class used to reset decorated includes.
+When an include's referring file is parsed, we need to undecorate
+any decorated referring includes.")
+
+
+(defmethod semantic-reset ((obj semantic-decoration-unparsed-include-cache))
+  "Reset OBJ back to it's empty settings."
+  (let ((table (oref obj table)))
+    ;; This is a hack.  Add in something better?
+    (semanticdb-notify-references
+     table (lambda (tab me)
+	     (semantic-decoration-unparsed-include-refrence-reset tab)
+	     ))
+    ))
+
+(defmethod semanticdb-partial-synchronize ((cache semantic-decoration-unparsed-include-cache)
+					   new-tags)
+  "Synchronize CACHE with some NEW-TAGS."
+  (if (semantic-find-tags-by-class 'include new-tags)
+      (semantic-reset cache)))
+
+(defmethod semanticdb-synchronize ((cache semantic-decoration-unparsed-include-cache)
+				   new-tags)
+  "Synchronize a CACHE with some NEW-TAGS."
+  (semantic-reset cache))
+
+(defun semantic-decoration-unparsed-include-refrence-reset (table)
+  "Refresh any highlighting in buffers referred to by TABLE.
+If TABLE is not in a buffer, do nothing."
+  ;; This cache removal may seem odd in that we are "creating one", but
+  ;; since we cant get in the fcn unless one exists, this ought to be
+  ;; ok.
+  (let ((c (semanticdb-cache-get
+	    table 'semantic-decoration-unparsed-include-cache)))
+    (semanticdb-cache-remove table c))
+
+  (let ((buf (semanticdb-in-buffer-p table)))
+    (when buf
+      (semantic-decorate-add-pending-decoration
+       'semantic-decoration-unparsed-include-do-reset
+       buf)
+      )))
+
+;;;###autoload
+(defun semantic-decoration-unparsed-include-do-reset ()
+  "Do a reset of unparsed includes in the current buffer."
+  (let* ((style (assoc "semantic-decoration-on-includes"
+		       semantic-decoration-styles)))
+    (when (cdr style)
+      (let ((allinc (semantic-find-tags-included
+		     (semantic-fetch-tags-fast))))
+	;; This will do everything, but it should be speedy since it
+	;; would have been done once already.
+	(semantic-decorate-add-decorations allinc)
+	))))
+
+
+(provide 'semantic-decorate-include)
+
+;;; semantic-decorate-include.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-decorate-mode.el b/site/cedet-1.0pre7/semantic/semantic-decorate-mode.el
new file mode 100644
index 0000000..7844ebb
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-decorate-mode.el
@@ -0,0 +1,568 @@
+;;; semantic-decorate-mode.el --- Minor mode for decorating tags
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-decorate-mode.el,v 1.28 2009/09/29 01:28:29 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.:
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A minor mode for use in decorating tags.
+;;
+;; There are two types of decorations that can be performed on a tag.
+;; You can either highlight the full tag, or you can add an
+;; independent decoration on some part of the tag body.
+;;
+;; For independent decoration in particular, managing them so that they
+;; do not get corrupted is challenging.  This major mode and
+;; corresponding macros will make handling those types of decorations
+;; easier.
+;;
+
+;;; Code:
+(require 'semantic)
+(require 'semantic-decorate)
+(require 'semantic-util-modes)
+(eval-when-compile (require 'cl))
+
+;;; Styles List
+;;
+(defcustom semantic-decoration-styles nil
+  "*List of active decoration styles.
+It is an alist of \(NAME . FLAG) elements, where NAME is a style name
+and FLAG is non-nil if the style is enabled.
+See also `define-semantic-decoration-style' which will automatically
+add items to this list."
+  :group 'semantic
+  :type '(repeat (cons (string :tag "Decoration Name")
+		       (boolean :tag "Enabled")))
+  )
+
+;;; Misc.
+;;
+(defsubst semantic-decorate-style-predicate (style)
+  "Return the STYLE's predicate function."
+  (intern (format "%s-p" style)))
+
+(defsubst semantic-decorate-style-highlighter (style)
+  "Return the STYLE's highlighter function."
+  (intern (format "%s-highlight" style)))
+
+;;; Base decoration API
+;;
+(defsubst semantic-decoration-p (object)
+  "Return non-nil if OBJECT is a tag decoration."
+  (and (semantic-overlay-p object)
+       (semantic-overlay-get object 'semantic-decoration)))
+
+(defsubst semantic-decoration-set-property (deco property value)
+  "Set the DECO decoration's PROPERTY to VALUE.
+Return DECO."
+  (assert (semantic-decoration-p deco))
+  (semantic-overlay-put deco property value)
+  deco)
+
+(defsubst semantic-decoration-get-property (deco property)
+  "Return the DECO decoration's PROPERTY value."
+  (assert (semantic-decoration-p deco))
+  (semantic-overlay-get deco property))
+
+(defsubst semantic-decoration-set-face (deco face)
+  "Set the face of the decoration DECO to FACE.
+Return DECO."
+  (semantic-decoration-set-property deco 'face face))
+
+(defsubst semantic-decoration-face (deco)
+  "Return the face of the decoration DECO."
+  (semantic-decoration-get-property deco 'face))
+
+(defsubst semantic-decoration-set-priority (deco priority)
+  "Set the priority of the decoration DECO to PRIORITY.
+Return DECO."
+  (assert (natnump priority))
+  (semantic-decoration-set-property deco 'priority priority))
+
+(defsubst semantic-decoration-priority (deco)
+  "Return the priority of the decoration DECO."
+  (semantic-decoration-get-property deco 'priority))
+
+(defsubst semantic-decoration-move (deco begin end)
+  "Move the decoration DECO on the region between BEGIN and END.
+Return DECO."
+  (assert (semantic-decoration-p deco))
+  (semantic-overlay-move deco begin end)
+  deco)
+
+;;; Tag decoration
+;;
+(defun semantic-decorate-tag (tag begin end &optional face)
+  "Add a new decoration on TAG on the region between BEGIN and END.
+If optional argument FACE is non-nil, set the decoration's face to
+FACE.
+Return the overlay that makes up the new decoration."
+  (let ((deco (semantic-tag-create-secondary-overlay tag)))
+    ;; We do not use the unlink property because we do not want to
+    ;; save the highlighting information in the DB.
+    (semantic-overlay-put deco 'semantic-decoration t)
+    (semantic-decoration-move deco begin end)
+    (semantic-decoration-set-face deco face)
+    deco))
+
+(defun semantic-decorate-clear-tag (tag &optional deco)
+  "Remove decorations from TAG.
+If optional argument DECO is non-nil, remove only that decoration."
+  (assert (or (null deco) (semantic-decoration-p deco)))
+  ;; Clear primary decorations.
+  ;; For now, just unhighlight the tag.  How to deal with other
+  ;; primary decorations like invisibility, etc. ?  Maybe just
+  ;; restoring default values will suffice?
+  (semantic-unhighlight-tag tag)
+  (semantic-tag-delete-secondary-overlay
+   tag (or deco 'semantic-decoration)))
+
+(defun semantic-decorate-tag-decoration (tag)
+  "Return decoration found on TAG."
+  (semantic-tag-get-secondary-overlay tag 'semantic-decoration))
+
+;;; Global setup of active decorations
+;;
+(defun semantic-decorate-flush-decorations (&optional buffer)
+  "Flush decorations found in BUFFER.
+BUFFER defaults to the current buffer.
+Should be used to flush decorations that might remain in BUFFER, for
+example, after tags have been refreshed."
+  (with-current-buffer (or buffer (current-buffer))
+    (dolist (o (semantic-overlays-in (point-min) (point-max)))
+      (and (semantic-decoration-p o)
+           (semantic-overlay-delete o)))))
+
+(defun semantic-decorate-clear-decorations (tag-list)
+  "Remove decorations found in tags in TAG-LIST."
+  (dolist (tag tag-list)
+    (semantic-decorate-clear-tag tag)
+    ;; recurse over children
+    (semantic-decorate-clear-decorations
+     (semantic-tag-components-with-overlays tag))))
+
+(defun semantic-decorate-add-decorations (tag-list)
+  "Add decorations to tags in TAG-LIST.
+Also make sure old decorations in the area are completely flushed."
+  (dolist (tag tag-list)
+    ;; Cleanup old decorations.
+    (when (semantic-decorate-tag-decoration tag)
+      ;; Note on below comment.   This happens more as decorations are refreshed
+      ;; mid-way through their use.  Remove the message.
+
+      ;; It would be nice if this never happened, but it still does
+      ;; once in a while.  Print a message to help flush these
+      ;; situations
+      ;;(message "Decorations still on %s" (semantic-format-tag-name tag))
+      (semantic-decorate-clear-tag tag))
+    ;; Add new decorations.
+    (dolist (style semantic-decoration-styles)
+      (let ((pred (semantic-decorate-style-predicate   (car style)))
+	    (high (semantic-decorate-style-highlighter (car style))))
+	(and (cdr style)
+	     (fboundp pred)
+	     (funcall pred tag)
+	     (fboundp high)
+	     (funcall high tag))))
+    ;; Recurse on the children of all tags
+    (semantic-decorate-add-decorations
+     (semantic-tag-components-with-overlays tag))))
+
+;;; PENDING DECORATIONS
+;;
+;; Activities in Emacs may cause a decoration to change state.  Any
+;; such identified change ought to be setup as PENDING.  This means
+;; that the next idle step will do the decoration change, but at the
+;; time of the state change, minimal work would be done.
+(defvar semantic-decorate-pending-decoration-hook nil
+  "Normal hook run to perform pending decoration changes.")
+
+(semantic-varalias-obsolete 'semantic-decorate-pending-decoration-hooks
+                          'semantic-decorate-pending-decoration-hook)
+
+(defun semantic-decorate-add-pending-decoration (fcn &optional buffer)
+  "Add a pending decoration change represented by FCN.
+Applies only to the current BUFFER.
+The setting of FCN will be removed after it is run."
+  (save-excursion
+    (when buffer (set-buffer buffer))
+    (semantic-make-local-hook 'semantic-decorate-flush-pending-decorations)
+    (add-hook 'semantic-decorate-pending-decoration-hook fcn nil t)))
+
+;;;###autoload
+(defun semantic-decorate-flush-pending-decorations (&optional buffer)
+  "Flush any pending decorations for BUFFER.
+Flush functions from `semantic-decorate-pending-decoration-hook'."
+  (save-excursion
+    (when buffer (set-buffer buffer))
+    (run-hooks 'semantic-decorate-pending-decoration-hook)
+    ;; Always reset the hooks
+    (setq semantic-decorate-pending-decoration-hook nil)))
+
+
+;;; DECORATION MODE
+;;
+;; Generic mode for handling basic highlighting and decorations.
+;;
+
+;;;###autoload
+(defcustom global-semantic-decoration-mode nil
+  "*If non-nil, enable global use of command `semantic-decoration-mode'.
+When this mode is activated, decorations specified by
+`semantic-decoration-styles'."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-decorate-mode
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-decoration-mode (if val 1 -1))))
+
+;;;###autoload
+(defun global-semantic-decoration-mode (&optional arg)
+  "Toggle global use of option `semantic-decoration-mode'.
+Decoration mode turns on all active decorations as specified
+by `semantic-decoration-styles'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-decoration-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-decoration-mode arg)))
+
+(defcustom semantic-decoration-mode-hook nil
+  "*Hook run at the end of function `semantic-decoration-mode'."
+  :group 'semantic
+  :type 'hook)
+
+;;;###autoload
+(defvar semantic-decoration-mode nil
+  "Non-nil if command `semantic-decoration-mode' is enabled.
+Use the command `semantic-decoration-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-decoration-mode)
+
+(defun semantic-decoration-mode-setup ()
+  "Setup the `semantic-decoration-mode' minor mode.
+The minor mode can be turned on only if the semantic feature is available
+and the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-decoration-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-decoration-mode nil)
+            (error "Buffer %s was not set up for parsing"
+                   (buffer-name)))
+        ;; Add hooks
+        (semantic-make-local-hook 'semantic-after-partial-cache-change-hook)
+        (add-hook 'semantic-after-partial-cache-change-hook
+                  'semantic-decorate-tags-after-partial-reparse nil t)
+        (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook)
+        (add-hook 'semantic-after-toplevel-cache-change-hook
+                  'semantic-decorate-tags-after-full-reparse nil t)
+        ;; Add decorations to available tags.  The above hooks ensure
+        ;; that new tags will be decorated when they become available.
+        (semantic-decorate-add-decorations (semantic-fetch-available-tags))
+        )
+    ;; Remove decorations from available tags.
+    (semantic-decorate-clear-decorations (semantic-fetch-available-tags))
+    ;; Cleanup any leftover crap too.
+    (semantic-decorate-flush-decorations)
+    ;; Remove hooks
+    (remove-hook 'semantic-after-partial-cache-change-hook
+                 'semantic-decorate-tags-after-partial-reparse t)
+    (remove-hook 'semantic-after-toplevel-cache-change-hook
+                 'semantic-decorate-tags-after-full-reparse t)
+    )
+  semantic-decoration-mode)
+
+;;;###autoload
+(defun semantic-decoration-mode (&optional arg)
+  "Minor mode for decorating tags.
+Decorations are specified in `semantic-decoration-styles'.
+You can define new decoration styles with
+`define-semantic-decoration-style'.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+;;
+;;\\{semantic-decoration-map}"
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-decoration-mode 0 1))))
+  (setq semantic-decoration-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-decoration-mode)))
+  (semantic-decoration-mode-setup)
+  (run-hooks 'semantic-decoration-mode-hook)
+  (if (interactive-p)
+      (message "decoration-mode minor mode %sabled"
+               (if semantic-decoration-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-decoration-mode)
+
+(semantic-add-minor-mode 'semantic-decoration-mode
+                         ""
+                         nil)
+
+(defun semantic-decorate-tags-after-full-reparse (tag-list)
+  "Add decorations after a complete reparse of the current buffer.
+TAG-LIST is the list of tags recently parsed.
+Flush all existing decorations and call `semantic-decorate-add-decorations' to
+add decorations.
+Called from `semantic-after-toplevel-cache-change-hook'."
+  ;; Flush everything
+  (semantic-decorate-flush-decorations)
+  ;; Add it back on
+  (semantic-decorate-add-decorations tag-list))
+
+(defun semantic-decorate-tags-after-partial-reparse (tag-list)
+  "Add decorations when new tags are created in the current buffer.
+TAG-LIST is the list of newly created tags.
+Call `semantic-decorate-add-decorations' to add decorations.
+Called from `semantic-after-partial-cache-change-hook'."
+  (semantic-decorate-add-decorations tag-list))
+
+
+;;; Enable/Disable toggling
+;;
+(defun semantic-decoration-style-enabled-p (style)
+  "Return non-nil if STYLE is currently enabled.
+Return nil if the style is disabled, or does not exist."
+  (let ((pair (assoc style semantic-decoration-styles)))
+    (and pair (cdr pair))))
+
+(defun semantic-toggle-decoration-style (name &optional arg)
+  "Turn on/off the decoration style with NAME.
+Decorations are specified in `semantic-decoration-styles'.
+With prefix argument ARG, turn on if positive, otherwise off.
+Return non-nil if the decoration style is enabled."
+  (interactive
+   (list (completing-read "Decoration style: "
+                          semantic-decoration-styles nil t)
+         current-prefix-arg))
+  (setq name (format "%s" name)) ;; Ensure NAME is a string.
+  (unless (equal name "")
+    (let* ((style (assoc name semantic-decoration-styles))
+           (flag  (if arg
+                      (> (prefix-numeric-value arg) 0)
+                    (not (cdr style)))))
+      (unless (eq (cdr style) flag)
+        ;; Store the new flag.
+        (setcdr style flag)
+        ;; Refresh decorations is `semantic-decoration-mode' is on.
+        (when semantic-decoration-mode
+          (semantic-decoration-mode -1)
+          (semantic-decoration-mode 1))
+        (when (interactive-p)
+          (message "Decoration style %s turned %s" (car style)
+                   (if flag "on" "off"))))
+      flag)))
+
+(defvar semantic-decoration-menu-cache nil
+  "Cache of the decoration menu.")
+
+(defun semantic-decoration-build-style-menu (style)
+  "Build a menu item for controlling a specific decoration STYLE."
+  (vector (car style)
+	  `(lambda () (interactive)
+	     (semantic-toggle-decoration-style
+	      ,(car style)))
+	  :style 'toggle
+	  :selected `(semantic-decoration-style-enabled-p ,(car style))
+	  ))
+
+;;;###autoload
+(defun semantic-build-decoration-mode-menu (&rest ignore)
+  "Create a menu listing all the known decorations for toggling.
+IGNORE any input arguments."
+  (or semantic-decoration-menu-cache
+      (setq semantic-decoration-menu-cache
+	    (mapcar 'semantic-decoration-build-style-menu
+		    (reverse semantic-decoration-styles))
+	    )))
+
+
+;;; Defining decoration styles
+;;
+(defmacro define-semantic-decoration-style (name doc &rest flags)
+  "Define a new decoration style with NAME.
+DOC is a documentation string describing the decoration style NAME.
+It is appended to auto-generated doc strings.
+An Optional list of FLAGS can also be specified.  Flags are:
+  :enabled <value>  - specify the default enabled value for NAME.
+
+
+This defines two new overload functions respectively called `NAME-p'
+and `NAME-highlight', for which you must provide a default
+implementation in respectively the functions `NAME-p-default' and
+`NAME-highlight-default'.  Those functions are passed a tag.  `NAME-p'
+must return non-nil to indicate that the tag should be decorated by
+`NAME-highlight'.
+
+To put primary decorations on a tag `NAME-highlight' must use
+functions like `semantic-set-tag-face', `semantic-set-tag-intangible',
+etc., found in the semantic-decorate library.
+
+To add other kind of decorations on a tag, `NAME-highlight' must use
+`semantic-decorate-tag', and other functions of the semantic
+decoration API found in this library."
+  (let ((predicate   (semantic-decorate-style-predicate   name))
+        (highlighter (semantic-decorate-style-highlighter name))
+	(defaultenable (if (plist-member flags :enabled)
+			   (plist-get flags :enabled)
+			 t))
+	)
+    `(progn
+       ;; Clear the menu cache so that new items are added when
+       ;; needed.
+       (setq semantic-decoration-menu-cache nil)
+       ;; Create an override method to specify if a given tag belongs
+       ;; to this type of decoration
+       (define-overloadable-function ,predicate (tag)
+         ,(format "Return non-nil to decorate TAG with `%s' style.\n%s"
+                  name doc))
+       ;; Create an override method that will perform the highlight
+       ;; operation if the -p method returns non-nil.
+       (define-overloadable-function ,highlighter (tag)
+         ,(format "Decorate TAG with `%s' style.\n%s"
+                  name doc))
+       ;; Add this to the list of primary decoration modes.
+       (add-to-list 'semantic-decoration-styles
+                    (cons ',(symbol-name name)
+			  ,defaultenable))
+       )))
+
+;;; Predefined decoration styles
+;;
+
+;;; Tag boundaries highlighting
+;;
+(define-semantic-decoration-style semantic-tag-boundary
+  "Place an overline in front of each long tag.
+Does not provide overlines for prototypes.")
+
+(defface semantic-tag-boundary-face
+  '((((class color) (background dark))
+     (:overline "cyan"))
+    (((class color) (background light))
+     (:overline "blue")))
+  "*Face used to show long tags in.
+Used by decoration style: `semantic-tag-boundary'."
+  :group 'semantic-faces)
+
+(defun semantic-tag-boundary-p-default (tag)
+  "Return non-nil if TAG is a type, or a non-prototype function."
+  (let ((c (semantic-tag-class tag)))
+    (and
+     (or
+      ;; All types get a line?
+      (eq c 'type)
+      ;; Functions which aren't prototypes get a line.
+      (and (eq c 'function)
+           (not (semantic-tag-get-attribute tag :prototype-flag)))
+      )
+     ;; Note: The below restriction confused users.
+     ;;
+     ;; Nothing smaller than a few lines
+     ;;(> (- (semantic-tag-end tag) (semantic-tag-start tag)) 150)
+     ;; Random truth
+     t)
+    ))
+
+(defun semantic-tag-boundary-highlight-default (tag)
+  "Highlight the first line of TAG as a boundary."
+  (when (bufferp (semantic-tag-buffer tag))
+    (with-current-buffer (semantic-tag-buffer tag)
+      (semantic-decorate-tag
+       tag
+       (semantic-tag-start tag)
+       (save-excursion
+	 (goto-char (semantic-tag-start tag))
+	 (end-of-line)
+	 (forward-char 1)
+	 (point))
+       'semantic-tag-boundary-face))
+    ))
+
+;;; Private member highlighting
+;;
+(define-semantic-decoration-style semantic-decoration-on-private-members
+  "Highlight class members that are designated as PRIVATE access."
+  :enabled nil)
+
+(defface semantic-decoration-on-private-members-face
+  '((((class color) (background dark))
+     (:background "#200000"))
+    (((class color) (background light))
+     (:background "#8fffff")))
+  "*Face used to show privately scoped tags in.
+Used by the decoration style: `semantic-decoration-on-private-members'."
+  :group 'semantic-faces)
+
+(defun semantic-decoration-on-private-members-highlight-default (tag)
+  "Highlight TAG as designated to have PRIVATE access.
+Use a primary decoration."
+  (semantic-set-tag-face
+   tag 'semantic-decoration-on-private-members-face))
+
+(defun semantic-decoration-on-private-members-p-default (tag)
+  "Return non-nil if TAG has PRIVATE access."
+  (and (member (semantic-tag-class tag) '(function variable))
+       (eq (semantic-tag-protection tag) 'private)))
+
+;;; Protected member highlighting
+;;
+(defface semantic-decoration-on-protected-members-face
+  '((((class color) (background dark))
+     (:background "#000020"))
+    (((class color) (background light))
+     (:background "#fffff8")))
+  "*Face used to show protected scoped tags in.
+Used by the decoration style: `semantic-decoration-on-protected-members'."
+  :group 'semantic-faces)
+
+(define-semantic-decoration-style semantic-decoration-on-protected-members
+  "Highlight class members that are designated as PROTECTED access."
+  :enabled nil)
+
+(defun semantic-decoration-on-protected-members-p-default (tag)
+  "Return non-nil if TAG has PROTECTED access."
+  (and (member (semantic-tag-class tag) '(function variable))
+       (eq (semantic-tag-protection tag) 'protected)))
+
+(defun semantic-decoration-on-protected-members-highlight-default (tag)
+  "Highlight TAG as designated to have PROTECTED access.
+Use a primary decoration."
+  (semantic-set-tag-face
+   tag 'semantic-decoration-on-protected-members-face))
+
+(provide 'semantic-decorate-mode)
+
+;;; semantic-decorate-mode.el ends here
+
diff --git a/site/cedet-1.0pre7/semantic/semantic-decorate.el b/site/cedet-1.0pre7/semantic/semantic-decorate.el
new file mode 100644
index 0000000..1d0ded0
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-decorate.el
@@ -0,0 +1,352 @@
+;;; semantic-decorate.el --- Utilities for decorating/highlighting tokens.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-decorate.el,v 1.19 2010/01/07 02:22:53 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Text representing a semantic tag is wrapped in an overlay.
+;; This overlay can be used for highlighting, or setting other
+;; editing properties on a tag, such as "read only."
+;;
+
+(require 'semantic)
+(require 'pulse)
+
+;;; Code:
+
+;;; Highlighting Basics
+;;
+;;;###autoload
+(defun semantic-highlight-tag (tag &optional face)
+  "Specify that TAG should be highlighted.
+Optional FACE specifies the face to use."
+  (let ((o (semantic-tag-overlay tag)))
+    (semantic-overlay-put o 'old-face
+			  (cons (semantic-overlay-get o 'face)
+				(semantic-overlay-get o 'old-face)))
+    (semantic-overlay-put o 'face (or face 'semantic-tag-highlight-face))
+    ))
+
+;;;###autoload
+(defun semantic-unhighlight-tag (tag)
+  "Unhighlight TAG, restoring its previous face."
+  (let ((o (semantic-tag-overlay tag)))
+    (semantic-overlay-put o 'face (car (semantic-overlay-get o 'old-face)))
+    (semantic-overlay-put o 'old-face (cdr (semantic-overlay-get o 'old-face)))
+    ))
+
+;;; Momentary Highlighting - One line
+;;
+;;;###autoload
+(defun semantic-momentary-highlight-one-tag-line (tag &optional face)
+  "Highlight the first line of TAG, unhighlighting before next command.
+Optional argument FACE specifies the face to do the highlighting."
+  (save-excursion
+    ;; Go to first line in tag
+    (semantic-go-to-tag tag)
+    (pulse-momentary-highlight-one-line (point))))
+
+;;; Momentary Highlighting - Whole Tag
+;;
+;;;###autoload
+(defun semantic-momentary-highlight-tag (tag &optional face)
+  "Highlight TAG, removing highlighting when the user hits a key.
+Optional argument FACE is the face to use for highlighting.
+If FACE is not specified, then `highlight' will be used."
+  (when (semantic-tag-with-position-p tag)
+    (if (not (semantic-overlay-p (semantic-tag-overlay tag)))
+	;; No overlay, but a position.  Highlight the first line only.
+	(semantic-momentary-highlight-one-tag-line tag face)
+      ;; The tag has an overlay, highlight the whole thing
+      (pulse-momentary-highlight-overlay (semantic-tag-overlay tag)
+					 face)
+      )))
+
+;;;###autoload
+(defun semantic-set-tag-face (tag face)
+  "Specify that TAG should use FACE for display."
+  (semantic-overlay-put (semantic-tag-overlay tag) 'face face))
+
+;;;###autoload
+(defun semantic-set-tag-invisible (tag &optional visible)
+  "Enable the text in TAG to be made invisible.
+If VISIBLE is non-nil, make the text visible."
+  (semantic-overlay-put (semantic-tag-overlay tag) 'invisible
+			(not visible)))
+
+;;;###autoload
+(defun semantic-tag-invisible-p (tag)
+  "Return non-nil if TAG is invisible."
+  (semantic-overlay-get (semantic-tag-overlay tag) 'invisible))
+
+;;;###autoload
+(defun semantic-set-tag-intangible (tag &optional tangible)
+  "Enable the text in TAG to be made intangible.
+If TANGIBLE is non-nil, make the text visible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist."
+  (semantic-overlay-put (semantic-tag-overlay tag) 'intangible
+			(not tangible)))
+
+;;;###autoload
+(defun semantic-tag-intangible-p (tag)
+  "Return non-nil if TAG is intangible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist."
+  (semantic-overlay-get (semantic-tag-overlay tag) 'intangible))
+
+(defun semantic-overlay-signal-read-only
+  (overlay after start end &optional len)
+  "Hook used in modification hooks to prevent modification.
+Allows deletion of the entire text.
+Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system."
+  ;; Stolen blithly from cpp.el in Emacs 21.1
+  (if (and (not after)
+	   (or (< (semantic-overlay-start overlay) start)
+	       (> (semantic-overlay-end overlay) end)))
+      (error "This text is read only")))
+
+;;;###autoload
+(defun semantic-set-tag-read-only (tag &optional writable)
+  "Enable the text in TAG to be made read-only.
+Optional argument WRITABLE should be non-nil to make the text writable
+instead of read-only."
+  (let ((o (semantic-tag-overlay tag))
+	(hook (if writable nil '(semantic-overlay-signal-read-only))))
+    (if (featurep 'xemacs)
+        ;; XEmacs extents have a 'read-only' property.
+        (semantic-overlay-put o 'read-only (not writable))
+      (semantic-overlay-put o 'modification-hooks hook)
+      (semantic-overlay-put o 'insert-in-front-hooks hook)
+      (semantic-overlay-put o 'insert-behind-hooks hook))))
+
+;;;###autoload
+(defun semantic-tag-read-only-p (tag)
+  "Return non-nil if the current TAG is marked read only."
+  (let ((o (semantic-tag-overlay tag)))
+    (if (featurep 'xemacs)
+        ;; XEmacs extents have a 'read-only' property.
+        (semantic-overlay-get o 'read-only)
+      (member 'semantic-overlay-signal-read-only
+              (semantic-overlay-get o 'modification-hooks)))))
+
+;;; backwards compatability
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-highlight-token
+			 'semantic-highlight-tag)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-unhighlight-token
+			 'semantic-unhighlight-tag)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-momentary-highlight-token
+			 'semantic-momentary-highlight-tag)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-set-token-face
+			 'semantic-set-tag-face)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-set-token-invisible
+			 'semantic-set-tag-invisible)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-token-invisible-p
+			 'semantic-tag-invisible-p)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-set-token-intangible
+			 'semantic-set-tag-intangible)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-token-intangible-p
+			 'semantic-tag-intangible-p)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-set-token-read-only
+			 'semantic-set-tag-read-only)
+;;;###autoload
+(semantic-alias-obsolete 'semantic-token-read-only-p
+			 'semantic-tag-read-only-p)
+
+;;; Secondary overlays
+;;
+;; Some types of decoration require a second overlay to be made.
+;; It could be for images, arrows, or whatever.
+;; We need a way to create such an overlay, and make sure it
+;; gets whacked, but doesn't show up in the master list
+;; of overlays used for searching.
+;;;###autoload
+(defun semantic-tag-secondary-overlays (tag)
+  "Return a list of secondary overlays active on TAG."
+  (semantic--tag-get-property tag 'secondary-overlays))
+
+;;;###autoload
+(defun semantic-tag-create-secondary-overlay (tag &optional link-hook)
+  "Create a secondary overlay for TAG.
+Returns an overlay.  The overlay is also saved in TAG.
+LINK-HOOK is a function called whenever TAG is to be linked into
+a buffer.  It should take TAG and OVERLAY as arguments.
+The LINK-HOOK should be used to position and set properties on the
+generated secondary overlay."
+  (if (not (semantic-tag-overlay tag))
+      ;; do nothing if there is no overlay
+      nil
+    (let* ((os (semantic-tag-start tag))
+	   (oe (semantic-tag-end tag))
+	   (o (semantic-make-overlay os oe (semantic-tag-buffer tag) t))
+	   (attr (semantic-tag-secondary-overlays tag))
+	   )
+      (semantic--tag-put-property tag 'secondary-overlays (cons o attr))
+      (semantic-overlay-put o 'semantic-secondary t)
+      (semantic-overlay-put o 'semantic-link-hook link-hook)
+      (semantic-tag-add-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
+      (semantic-tag-add-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
+      (semantic-tag-add-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
+      (run-hook-with-args link-hook tag o)
+      o)))
+
+;;;###autoload
+(defun semantic-tag-get-secondary-overlay (tag property)
+  "Return secondary overlays from TAG with PROPERTY.
+PROPERTY is a symbol and all overlays with that symbol are returned.."
+  (let* ((olsearch (semantic-tag-secondary-overlays tag))
+	 (o nil))
+    (while olsearch
+      (when (semantic-overlay-get (car olsearch) property)
+	(setq o (cons (car olsearch) o)))
+      (setq olsearch (cdr olsearch)))
+    o))
+
+;;;###autoload
+(defun semantic-tag-delete-secondary-overlay (tag overlay-or-property)
+  "Delete from TAG the secondary overlay OVERLAY-OR-PROPERTY.
+If OVERLAY-OR-PROPERTY is an overlay, delete that overlay.
+If OVERLAY-OR-PROPERTY is a symbol, find the overlay with that property."
+  (let* ((o overlay-or-property))
+    (if (semantic-overlay-p o)
+	(setq o (list o))
+      (setq o (semantic-tag-get-secondary-overlay tag overlay-or-property)))
+    (while (semantic-overlay-p (car o))
+      ;; We don't really need to worry about the hooks.
+      ;; They will clean themselves up eventually ??
+      (semantic--tag-put-property
+       tag 'secondary-overlays
+       (delete (car o) (semantic-tag-secondary-overlays tag)))
+      (semantic-overlay-delete (car o))
+      (setq o (cdr o)))))
+
+(defun semantic--tag-unlink-copy-secondary-overlays (tag)
+  "Unlink secondary overlays from TAG which is a copy.
+This means we don't destroy the overlays, only remove reference
+from them in TAG."
+  (let ((ol (semantic-tag-secondary-overlays tag)))
+    (while ol
+      ;; Else, remove all  traces of ourself from the tag
+      ;; Note to self: Does this prevent multiple types of secondary
+      ;; overlays per tag?
+      (semantic-tag-remove-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
+      (semantic-tag-remove-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
+      (semantic-tag-remove-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
+      ;; Next!
+      (setq ol (cdr ol)))
+    (semantic--tag-put-property tag 'secondary-overlays nil)
+    ))
+
+(defun semantic--tag-unlink-secondary-overlays (tag)
+  "Unlink secondary overlays from TAG."
+  (let ((ol (semantic-tag-secondary-overlays tag))
+	(nl nil))
+    (while ol
+      (if (semantic-overlay-get (car ol) 'semantic-link-hook)
+	  ;; Only put in a proxy if there is a link-hook.  If there is no link-hook
+	  ;; the decorating mode must know when tags are unlinked on its own.
+	  (setq nl (cons (semantic-overlay-get (car ol) 'semantic-link-hook)
+			 nl))
+	;; Else, remove all  traces of ourself from the tag
+	;; Note to self: Does this prevent multiple types of secondary
+	;; overlays per tag?
+	(semantic-tag-remove-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
+	(semantic-tag-remove-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
+	(semantic-tag-remove-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
+	)
+      (semantic-overlay-delete (car ol))
+      (setq ol (cdr ol)))
+    (semantic--tag-put-property tag 'secondary-overlays (nreverse nl))
+    ))
+
+(defun semantic--tag-link-secondary-overlays (tag)
+  "Unlink secondary overlays from TAG."
+  (let ((ol (semantic-tag-secondary-overlays tag)))
+    ;; Wipe out old values.
+    (semantic--tag-put-property tag 'secondary-overlays nil)
+    ;; Run all the link hooks.
+    (while ol
+      (semantic-tag-create-secondary-overlay tag (car ol))
+      (setq ol (cdr ol)))
+    ))
+
+;;; Secondary Overlay Uses
+;;
+;; States to put on tags that depend on a secondary overlay.
+;;;###autoload
+(defun semantic-set-tag-folded (tag &optional folded)
+  "Fold TAG, such that only the first line of text is shown.
+Optional argument FOLDED should be non-nil to fold the tag.
+nil implies the tag should be fully shown."
+    ;; If they are different, do the deed.
+    (let ((o (semantic-tag-folded-p tag)))
+      (if (not folded)
+	  ;; We unfold.
+	  (when o
+	    (semantic-tag-delete-secondary-overlay tag 'semantic-folded))
+	(unless o
+	  ;; Add the foldn
+	  (setq o (semantic-tag-create-secondary-overlay tag))
+	  ;; mark as folded
+	  (semantic-overlay-put o 'semantic-folded t)
+	  ;; Move to cover end of tag
+	  (save-excursion
+	    (goto-char (semantic-tag-start tag))
+	    (end-of-line)
+	    (semantic-overlay-move o (point) (semantic-tag-end tag)))
+	  ;; We need to modify the invisibility spec for this to
+	  ;; work.
+	  (if (or (eq buffer-invisibility-spec t)
+		  (not (assoc 'semantic-fold buffer-invisibility-spec)))
+	      (add-to-invisibility-spec '(semantic-fold . t)))
+	  (semantic-overlay-put o 'invisible 'semantic-fold)
+	  (overlay-put o 'isearch-open-invisible
+		       'semantic-set-tag-folded-isearch)))
+	  ))
+
+(defun semantic-set-tag-folded-isearch (overlay)
+  "Called by isearch if it discovers text in the folded region.
+OVERLAY is passed in by isearch."
+  (semantic-set-tag-folded (semantic-current-tag) nil)
+  )
+
+;;;###autoload
+(defun semantic-tag-folded-p (tag)
+  "Non-nil if TAG is currently folded."
+  (semantic-tag-get-secondary-overlay tag 'semantic-folded)
+  )
+
+(provide 'semantic-decorate)
+
+;;; semantic-decorate.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-dep.el b/site/cedet-1.0pre7/semantic/semantic-dep.el
new file mode 100644
index 0000000..e39b141
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-dep.el
@@ -0,0 +1,240 @@
+;;; semantic-dep.el --- Methods for tracking dependencies (include files)
+
+;;; Copyright (C) 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-dep.el,v 1.15 2009/12/19 04:22:04 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Include tags (dependencies for a given source file) usually have
+;; some short name.  The target file that it is dependent on is
+;; generally found on some sort of path controlled by the compiler or
+;; project.
+;;
+;; EDE or even ECB can control our project dependencies, and help us
+;; find file within the setting of a given project.  For system
+;; dependencies, we need to depend on user supplied lists, which can
+;; manifest themselves in the form of system datatabases (from
+;; semanticdb.)
+;;
+;; Provide ways to track these different files here.
+
+(require 'semantic-tag)
+
+;;; Code:
+
+;;;###autoload
+(defvar semantic-dependency-include-path nil
+  "Defines the include path used when searching for files.
+This should be a list of directories to search which is specific
+to the file being included.
+
+If `semantic-dependency-tag-file' is overridden for a given
+language, this path is most likely ignored.
+
+The above function, reguardless of being overriden, caches the
+located dependency file location in the tag property
+`dependency-file'.  If you override this function, you do not
+need to implement your own cache.  Each time the buffer is fully
+reparsed, the cache will be reset.
+
+TODO: use ffap.el to locate such items?
+
+NOTE: Obsolete this, or use as special user")
+(make-variable-buffer-local `semantic-dependency-include-path)
+
+;;;###autoload
+(defvar semantic-dependency-system-include-path nil
+  "Defines the system include path.
+This should be set with either `defvar-mode-local', or with
+`semantic-add-system-include'.
+
+For mode authors, use
+`defcustom-mode-local-semantic-dependency-system-include-path'
+to create a mode-specific variable to control this.
+
+When searching for a file associated with a name found in an tag of
+class include, this path will be inspected for includes of type
+`system'.  Some include tags are agnostic to this setting and will
+check both the project and system directories.")
+(make-variable-buffer-local `semantic-dependency-system-include-path)
+
+;;;###autoload
+(defmacro defcustom-mode-local-semantic-dependency-system-include-path
+  (mode name value &optional docstring)
+  "Create a mode-local value of the system-dependency include path.
+MODE is the `major-mode' this name/value pairs is for.
+NAME is the name of the customizable value users will use.
+VALUE is the path (a list of strings) to add.
+DOCSTRING is a documentation string applied to the variable NAME
+users will customize.
+
+Creates a customizable variable users can customize that will
+keep semantic data structures up to date."
+  `(progn
+     ;; Create a variable users can customize.
+     (defcustom ,name ,value
+       ,docstring
+       :group (quote ,(intern (car (split-string (symbol-name mode) "-"))))
+       :group 'semantic
+       :type '(repeat (directory :tag "Directory"))
+       :set (lambda (sym val)
+	      (set-default sym val)
+	      (setq-mode-local ,mode
+			       semantic-dependency-system-include-path
+			       val)
+	      (when (fboundp
+		     'semantic-decoration-unparsed-include-do-reset)
+		(mode-local-map-mode-buffers
+		 'semantic-decoration-unparsed-include-do-reset
+		 (quote ,mode))))
+       )
+     ;; Set the variable to the default value.
+     (defvar-mode-local ,mode semantic-dependency-system-include-path
+       ,name
+       "System path to search for include files.")
+     ;; Bind NAME onto our variable so tools can customize it
+     ;; without knowing about it.
+     (put 'semantic-dependency-system-include-path
+	  (quote ,mode) (quote ,name))
+     ))
+
+;;; PATH MANAGEMENT
+;;
+;; Some fcns to manage paths for a give mode.
+;;;###autoload
+(defun semantic-add-system-include (dir &optional mode)
+  "Add a system include DIR to path for MODE.
+Modifies a mode-local version of `semantic-dependency-system-include-path'.
+
+Changes made by this function are not persistent."
+  (interactive "DNew Include Directory: ")
+  (if (not mode) (setq mode major-mode))
+  (let ((dirtmp (file-name-as-directory dir))
+	(value
+	 (mode-local-value mode 'semantic-dependency-system-include-path))
+	)
+    (add-to-list 'value dirtmp t)
+    (eval `(setq-mode-local ,mode
+			    semantic-dependency-system-include-path value))
+    ))
+
+;;;###autoload
+(defun semantic-remove-system-include (dir &optional mode)
+  "Add a system include DIR to path for MODE.
+Modifies a mode-local version of`semantic-dependency-system-include-path'.
+
+Changes made by this function are not persistent."
+  (interactive (list
+		 (completing-read
+		  "Include Directory to Remove: "
+		  semantic-dependency-system-include-path))
+	       )
+  (if (not mode) (setq mode major-mode))
+  (let ((dirtmp (file-name-as-directory dir))
+	(value
+	 (mode-local-value mode 'semantic-dependency-system-include-path))
+	)
+    (setq value (delete dirtmp value))
+    (eval `(setq-mode-local ,mode semantic-dependency-system-include-path
+			    value))
+    ))
+
+;;;###autoload
+(defun semantic-reset-system-include (&optional mode)
+  "Reset the system include list to empty for MODE.
+Modifies a mode-local version of
+`semantic-dependency-system-include-path'."
+  (interactive)
+  (if (not mode) (setq mode major-mode))
+  (eval `(setq-mode-local ,mode semantic-dependency-system-include-path
+			  nil))
+  )
+
+;;;###autoload
+(defun semantic-customize-system-include-path (&optional mode)
+  "Customize the include path for this `major-mode'.
+To create a customizable include path for a major MODE, use the
+macro `defcustom-mode-local-semantic-dependency-system-include-path'."
+  (interactive)
+  (let ((ips (get 'semantic-dependency-system-include-path
+		  (or mode major-mode))))
+    ;; Do we have one?
+    (when (not ips)
+      (error "There is no customizable includepath variable for %s"
+	     (or mode major-mode)))
+    ;; Customize it.
+    (customize-variable ips)))
+
+;;; PATH SEARCH
+;;
+;; methods for finding files on a provided path.
+(if (fboundp 'locate-file)
+    (defsubst semantic--dependency-find-file-on-path (file path)
+      "Return an expanded file name for FILE on PATH."
+      (locate-file file path))
+
+  ;; Else, older version of Emacs.
+
+  (defsubst semantic--dependency-find-file-on-path (file path)
+    "Return an expanded file name for FILE on PATH."
+    (let ((p path)
+	  (found nil))
+      (while (and p (not found))
+        (let ((f (expand-file-name file (car p))))
+	  (if (file-exists-p f)
+	      (setq found f)))
+        (setq p (cdr p)))
+      found))
+
+  )
+
+;;;###autoload
+(defun semantic-dependency-find-file-on-path (file systemp &optional mode)
+  "Return an expanded file name for FILE on available paths.
+If SYSTEMP is true, then only search system paths.
+If optional argument MODE is non-nil, then derive paths from the
+provided mode, not from the current major mode."
+  (if (not mode) (setq mode major-mode))
+  (let ((sysp (mode-local-value
+	       mode 'semantic-dependency-system-include-path))
+	(edesys (when (and (featurep 'ede) ede-minor-mode
+			   ede-object)
+		  (ede-system-include-path
+		   (if (listp ede-object) (car ede-object) ede-object))))
+	(locp (mode-local-value
+	       mode 'semantic-dependency-include-path))
+	(found nil))
+    (when (file-exists-p file)
+      (setq found file))
+    (when (and (not found) (not systemp))
+      (setq found (semantic--dependency-find-file-on-path file locp)))
+    (when (and (not found) edesys)
+      (setq found (semantic--dependency-find-file-on-path file edesys)))
+    (when (not found)
+      (setq found (semantic--dependency-find-file-on-path file sysp)))
+    (if found (expand-file-name found))))
+
+
+(provide 'semantic-dep)
+
+;;; semantic-dep.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-doc.el b/site/cedet-1.0pre7/semantic/semantic-doc.el
new file mode 100644
index 0000000..f1e2801
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-doc.el
@@ -0,0 +1,133 @@
+;;; semantic-doc.el --- Routines for documentation strings
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-doc.el,v 1.15 2009/12/28 14:18:52 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; It is good practice to write documenation for your functions and
+;; variables.  These core routines deal with these documentation
+;; comments or strings.  They can exist either as a tag property
+;; (:documentation) or as a comment just before the symbol, or after
+;; the symbol on the same line.
+
+(require 'semantic-tag)
+
+;;; Code:
+
+;;;###autoload
+(define-overloadable-function semantic-documentation-for-tag (&optional tag nosnarf)
+  "Find documentation from TAG and return it as a clean string.
+TAG might have DOCUMENTATION set in it already.  If not, there may be
+some documentation in a comment preceding TAG's definition which we
+can look for.  When appropriate, this can be overridden by a language specific
+enhancement.
+Optional argument NOSNARF means to only return the lexical analyzer token for it.
+If nosnarf if 'lex, then only return the lex token."
+  (if (not tag) (setq tag (semantic-current-tag)))
+  (save-excursion
+    (when (semantic-tag-with-position-p tag)
+      (set-buffer (semantic-tag-buffer tag)))
+    (:override
+     ;; No override.  Try something simple to find documentation nearby
+     (save-excursion
+       (semantic-go-to-tag tag)
+       (let ((doctmp (semantic-tag-docstring tag (current-buffer))))
+	 (or
+	  ;; Is there doc in the tag???
+	  doctmp
+	  ;; Check just before the definition.
+	  (when (semantic-tag-with-position-p tag)
+	    (semantic-documentation-comment-preceeding-tag tag nosnarf))
+	  ;;  Lets look for comments either after the definition, but before code:
+	  ;; Not sure yet.  Fill in something clever later....
+	  nil))))))
+
+;;;###autoload
+(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf)
+  "Find a comment preceeding TAG.
+If TAG is nil.  use the tag under point.
+Searches the space between TAG and the preceeding tag for a comment,
+and converts the comment into clean documentation.
+Optional argument NOSNARF with a value of 'lex means to return
+just the lexical token and not the string."
+  (if (not tag) (setq tag (semantic-current-tag)))
+  (save-excursion
+    ;; Find this tag.
+    (semantic-go-to-tag tag)
+    (let* ((starttag (semantic-find-tag-by-overlay-prev
+		      (semantic-tag-start tag)))
+	   (start (if starttag
+		      (semantic-tag-end starttag)
+		    (point-min))))
+      (when (re-search-backward comment-start-skip start t)
+	;; We found a comment that doesn't belong to the body
+	;; of a function.
+	(semantic-doc-snarf-comment-for-tag nosnarf)))
+    ))
+
+(make-obsolete-overload 'semantic-find-documentation
+                        'semantic-documentation-for-tag)
+
+(defun semantic-doc-snarf-comment-for-tag (nosnarf)
+  "Snarf up the comment at POINT for `semantic-documentation-for-tag'.
+Attempt to strip out comment syntactic sugar.
+Argument NOSNARF means don't modify the found text.
+If NOSNARF is 'lex, then return the lex token."
+  (let* ((semantic-ignore-comments nil)
+	 (semantic-lex-analyzer #'semantic-comment-lexer))
+    (if (memq nosnarf '(lex flex)) ;; keep `flex' for compatibility
+	(car (semantic-lex (point) (1+ (point))))
+      (let ((ct (semantic-lex-token-text
+		 (car (semantic-lex (point) (1+ (point)))))))
+	(if nosnarf
+	    nil
+	  ;; ok, try to clean the text up.
+	  ;; Comment start thingy
+	  (while (string-match (concat "^\\s-*" comment-start-skip) ct)
+	    (setq ct (concat (substring ct 0 (match-beginning 0))
+			     (substring ct (match-end 0)))))
+	  ;; Arbitrary punctuation at the beginning of each line.
+	  (while (string-match "^\\s-*\\s.+\\s-*" ct)
+	    (setq ct (concat (substring ct 0 (match-beginning 0))
+			     (substring ct (match-end 0)))))
+	  ;; End of a block comment.
+	  (if (and (boundp 'block-comment-end)
+		   block-comment-end
+		   (string-match block-comment-end ct))
+	      (setq ct (concat (substring ct 0 (match-beginning 0))
+			       (substring ct (match-end 0)))))
+	  ;; In case it's a real string, STRIPIT.
+	  (while (string-match "\\s-*\\s\"+\\s-*" ct)
+	    (setq ct (concat (substring ct 0 (match-beginning 0))
+			     (substring ct (match-end 0))))))
+	;; Now return the text.
+	ct))))
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-documentation
+                         'semantic-documentation-for-tag)
+
+(provide 'semantic-doc)
+
+;;; semantic-doc.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ede-grammar.el b/site/cedet-1.0pre7/semantic/semantic-ede-grammar.el
new file mode 100644
index 0000000..b49d44d
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ede-grammar.el
@@ -0,0 +1,211 @@
+;;; ede-ede-grammar.el --- EDE support for Semantic Grammar Files
+
+;;;  Copyright (C) 2003, 2004, 2007, 2008, 2009  Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: project, make
+;; RCS: $Id: semantic-ede-grammar.el,v 1.17 2009/03/08 16:31:19 zappo Exp $
+
+;; This software is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle .by or .wy files.
+
+(require 'ede-proj)
+(require 'ede-pmake)
+(require 'ede-pconf)
+(require 'ede-proj-elisp)
+
+;;; Code:
+;;;###autoload
+(defclass semantic-ede-proj-target-grammar (ede-proj-target-makefile)
+  ((menu :initform nil)
+   (keybindings :initform nil)
+   (phony :initform t)
+   (sourcetype :initform
+	       (semantic-ede-source-grammar-wisent
+		semantic-ede-source-grammar-bovine
+		))
+   (availablecompilers :initform
+		       (semantic-ede-grammar-compiler-wisent
+			semantic-ede-grammar-compiler-bovine
+			))
+   )
+  "This target consists of a group of grammar files.
+A grammar target consists of grammar files that build Emacs Lisp programs for
+parsing different languages.")
+
+(defvar semantic-ede-source-grammar-wisent
+  (ede-sourcecode "semantic-ede-grammar-source-wisent"
+		  :name "Wisent Grammar"
+		  :sourcepattern "\\.wy$"
+		  )
+  "Semantic Grammar source code definition for wisent.")
+
+(defclass semantic-ede-grammar-compiler-class (ede-compiler)
+  nil
+  "Specialized compiler for semantic grammars.")
+
+(defvar semantic-ede-grammar-compiler-wisent
+  (semantic-ede-grammar-compiler-class
+   "ede-emacs-wisent-compiler"
+   :name "emacs"
+   :variables '(("EMACS" . "emacs"))
+   :commands
+   '(
+     "@echo \"(add-to-list 'load-path nil)\" > grammar-make-script"
+     "@for loadpath in . ${LOADPATH}; do \\"
+     "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
+     "done;"
+     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
+     "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
+     )
+   ;; :autoconf '("AM_PATH_LISPDIR")
+   :sourcetype '(semantic-ede-source-grammar-wisent)
+   :objectextention "-wy.elc"
+   )
+  "Compile Emacs Lisp programs.")
+
+
+(defvar semantic-ede-source-grammar-bovine
+  (ede-sourcecode "semantic-ede-grammar-source-bovine"
+		  :name "Bovine Grammar"
+		  :sourcepattern "\\.by$"
+		  )
+  "Semantic Grammar source code definition for the bovinator.")
+
+(defvar semantic-ede-grammar-compiler-bovine
+  (semantic-ede-grammar-compiler-class
+   "ede-emacs-wisent-compiler"
+   :name "emacs"
+   :variables '(("EMACS" . "emacs"))
+   :commands
+   '(
+     "@echo \"(add-to-list 'load-path nil)\" > grammar-make-script"
+     "@for loadpath in . ${LOADPATH}; do \\"
+     "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
+     "done;"
+     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
+     "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
+     )
+   ;; :autoconf '("AM_PATH_LISPDIR")
+   :sourcetype '(semantic-ede-source-grammar-bovine)
+   :objectextention "-by.elc"
+   )
+  "Compile Emacs Lisp programs.")
+
+(require 'semantic-grammar)
+
+;;; Target options.
+(defmethod ede-buffer-mine ((this semantic-ede-proj-target-grammar) buffer)
+  "Return t if object THIS lays claim to the file in BUFFER.
+Lays claim to all -by.el, and -wy.el files."
+  ;; We need to be a little more careful than this, but at the moment it
+  ;; is common to have only one target of this class per directory.
+  (if (string-match "-[bw]y\\.elc?$" (buffer-file-name buffer))
+      t
+    (call-next-method) ; The usual thing.
+    ))
+
+(defmethod project-compile-target ((obj semantic-ede-proj-target-grammar))
+  "Compile all sources in a Lisp target OBJ."
+  (let* ((cb (current-buffer))
+	 (proj (ede-target-parent obj))
+	 (default-directory (oref proj directory)))
+    (mapc (lambda (src)
+	    (save-excursion
+	      (set-buffer (find-file-noselect src))
+	      (save-excursion
+		(semantic-grammar-create-package))
+	      (save-buffer)
+	      (let ((cf (concat (semantic-grammar-package) ".el")))
+		(if (or (not (file-exists-p cf))
+			(file-newer-than-file-p src cf))
+		    (byte-compile-file cf)))))
+	    (oref obj source)))
+  (message "All Semantic Grammar sources are up to date in %s" (object-name obj)))
+
+;;; Makefile generation functions
+;;
+(defmethod ede-proj-makefile-sourcevar ((this semantic-ede-proj-target-grammar))
+  "Return the variable name for THIS's sources."
+  (cond ((ede-proj-automake-p)
+	 (error "No Automake support for Semantic Grammars"))
+	(t (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR"))))
+
+(defmethod ede-proj-makefile-insert-variables :AFTER ((this semantic-ede-proj-target-grammar))
+  "Insert variables needed by target THIS."
+  (ede-proj-makefile-insert-loadpath-items
+   (ede-proj-elisp-packages-to-loadpath
+    (list "eieio" "semantic" "inversion" "ede")))
+  ;; eieio for object system needed in ede
+  ;; semantic because it is
+  ;; Inversion for versioning system.
+  ;; ede for project regeneration
+  (ede-pmake-insert-variable-shared
+      (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL")
+    (insert
+     (mapconcat (lambda (src)
+		  (save-excursion
+		    (set-buffer (find-file-noselect src))
+		    (concat (semantic-grammar-package) ".el")))
+		(oref this source)
+		" ")))
+  )
+
+(defmethod ede-proj-makefile-insert-rules ((this semantic-ede-proj-target-grammar))
+  "Insert rules needed by THIS target."
+  ;; Add in some dependencies.
+;;  (mapc (lambda (src)
+;;	  (let ((nm (file-name-sans-extension src)))
+;;	    (insert nm "-wy.el: " src "\n"
+;;		    nm "-wy.elc: " nm "-wy.el\n\n")
+;;	    ))
+;;	(oref this source))
+  ;; Call the normal insertion of rules.
+  (call-next-method)
+  )
+
+(defmethod ede-proj-makefile-insert-dist-dependencies ((this semantic-ede-proj-target-grammar))
+  "Insert dist dependencies, or intermediate targets.
+This makes sure that all grammar lisp files are created before the dist
+runs, so they are always up to date.
+Argument THIS is the target that should insert stuff."
+  (call-next-method)
+  (insert " $(" (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL)")
+  )
+
+;;;###autoload
+(autoload 'ede-proj-target-elisp "semantic-ede-proj-target-grammar"
+  "Target class for Emacs/Semantic grammar files." nil nil)
+
+(ede-proj-register-target "semantic grammar"
+			  semantic-ede-proj-target-grammar)
+
+(provide 'semantic-ede-grammar)
+
+;;;###autoload
+(eval-after-load "ede-proj"
+    (quote
+     (require 'semantic-ede-grammar)
+     ))
+
+;;; semantic-ede-grammar.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-edit.el b/site/cedet-1.0pre7/semantic/semantic-edit.el
new file mode 100644
index 0000000..455b0f1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-edit.el
@@ -0,0 +1,977 @@
+;;; semantic-edit.el --- Edit Management for Semantic
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-edit.el,v 1.42 2010/02/08 23:49:23 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; In Semantic 1.x, changes were handled in a simplistic manner, where
+;; tags that changed were reparsed one at a time.  Any other form of
+;; edit were managed through a full reparse.
+;;
+;; This code attempts to minimize the number of times a full reparse
+;; needs to occur.  While overlays and tags will continue to be
+;; recycled in the simple case, new cases where tags are inserted
+;; or old tags removed  from the original list are handled.
+;;
+
+;;; NOTES FOR IMPROVEMENT
+;;
+;; Work done by the incremental parser could be improved by the
+;; following:
+;;
+;; 1. Tags created could have as a property an overlay marking a region
+;;    of themselves that can be edited w/out affecting the definition of
+;;    that tag.
+;;
+;; 2. Tags w/ positioned children could have a property of an
+;;    overlay marking the region in themselves that contain the
+;;    children.  This could be used to better improve splicing near
+;;    the beginning and end of the child lists.
+;;
+
+;;; BUGS IN INCREMENTAL PARSER
+;;
+;; 1. Changes in the whitespace between tags could extend a
+;;    following tag.  These will be marked as merely unmatched
+;;    syntax instead.
+;;
+;; 2. Incremental parsing while a new function is being typed in
+;;    somtimes gets a chance only when lists are incomplete,
+;;    preventing correct context identification.
+
+;;
+(require 'semantic)
+(require 'working)
+
+;;; Code:
+(defvar semantic-after-partial-cache-change-hook nil
+  "Hooks run after the buffer cache has been updated.
+
+This hook will run when the cache has been partially reparsed.
+Partial reparses are incurred when a user edits a buffer, and only the
+modified sections are rescanned.
+
+Hook functions must take one argument, which is the list of tags
+updated in the current buffer.
+
+For language specific hooks, make sure you define this as a local hook.")
+
+(defvar semantic-change-hooks nil
+  "Hooks run when semantic detects a change in a buffer.
+Each hook function must take three arguments, identical to the
+common hook `after-change-functions'.")
+
+(defvar semantic-reparse-needed-change-hook nil
+  "Hooks run when a user edit is detected as needing a reparse.
+For language specific hooks, make sure you define this as a local
+hook.
+Not used yet; part of the next generation reparse mechanism")
+
+(defvar semantic-no-reparse-needed-change-hook nil
+  "Hooks run when a user edit is detected as not needing a reparse.
+If the hook returns non-nil, then declare that a reparse is needed.
+For language specific hooks, make sure you define this as a local
+hook.
+Not used yet; part of the next generation reparse mechanism.")
+
+(defvar semantic-edits-new-change-hooks nil
+  "Hooks run when a new change is found.
+Functions must take one argument representing an overlay on that change.")
+
+(defvar semantic-edits-delete-change-hooks nil
+  "Hooks run before a change overlay is deleted.
+Deleted changes occur when multiple changes are merged.
+Functions must take one argument representing an overlay being deleted.")
+
+(defvar semantic-edits-move-change-hooks nil
+  "Hooks run after a change overlay is moved.
+Changes move when a new change overlaps an old change.  The old change
+will be moved.
+Functions must take one argument representing an overlay being moved.")
+
+(defvar semantic-edits-reparse-change-hooks nil
+  "Hooks run after a change results in a reparse.
+Functions are called before the overlay is deleted, and after the
+incremental reparse.")
+
+(defvar semantic-edits-incremental-reparse-failed-hook nil
+  "Hook run after the incremental parser fails.
+When this happens, the buffer is marked as needing a full reprase.")
+
+(semantic-varalias-obsolete 'semantic-edits-incremental-reparse-failed-hooks
+                          'semantic-edits-incremental-reparse-failed-hook)
+
+;;;###autoload
+(defcustom semantic-edits-verbose-flag nil
+  "Non-nil means the incremental perser is verbose.
+If nil, errors are still displayed, but informative messages are not."
+  :group 'semantic
+  :type 'boolean)
+
+;;; Change State management
+;;
+;; Manage a series of overlays that define changes recently
+;; made to the current buffer.
+;;;###autoload
+(defun semantic-change-function (start end length)
+  "Provide a mechanism for semantic tag management.
+Argument START, END, and LENGTH specify the bounds of the change."
+   (setq semantic-unmatched-syntax-cache-check t)
+   (let ((inhibit-point-motion-hooks t)
+	 )
+     (run-hook-with-args 'semantic-change-hooks start end length)
+     ))
+
+(defun semantic-changes-in-region (start end &optional buffer)
+  "Find change overlays which exist in whole or in part between START and END.
+Optional argument BUFFER is the buffer to search for changes in."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (let ((ol (semantic-overlays-in (max start (point-min))
+				    (min end (point-max))))
+	  (ret nil))
+      (while ol
+	(when (semantic-overlay-get (car ol) 'semantic-change)
+	  (setq ret (cons (car ol) ret)))
+	(setq ol (cdr ol)))
+      (sort ret #'(lambda (a b) (< (semantic-overlay-start a)
+				   (semantic-overlay-start b)))))))
+
+;;;###autoload
+(defun semantic-edits-change-function-handle-changes  (start end length)
+  "Run whenever a buffer controlled by `semantic-mode' change.
+Tracks when and how the buffer is re-parsed.
+Argument START, END, and LENGTH specify the bounds of the change."
+  ;; We move start/end by one so that we can merge changes that occur
+  ;; just before, or just after.  This lets simple typing capture everything
+  ;; into one overlay.
+  (let ((changes-in-change (semantic-changes-in-region (1- start) (1+ end)))
+	)
+    (semantic-parse-tree-set-needs-update)
+    (if (not changes-in-change)
+	(let ((o (semantic-make-overlay start end)))
+	  (semantic-overlay-put o 'semantic-change t)
+	  ;; Run the hooks safely.  When hooks blow it, our dirty
+	  ;; function will be removed from the list of active change
+	  ;; functions.
+	  (condition-case nil
+	      (run-hook-with-args 'semantic-edits-new-change-hooks o)
+	    (error nil)))
+      (let ((tmp changes-in-change))
+	;; Find greatest bounds of all changes
+	(while tmp
+	  (when (< (semantic-overlay-start (car tmp)) start)
+	    (setq start (semantic-overlay-start (car tmp))))
+	  (when (> (semantic-overlay-end (car tmp)) end)
+	    (setq end (semantic-overlay-end (car tmp))))
+	  (setq tmp (cdr tmp)))
+	;; Move the first found overlay, recycling that overlay.
+	(semantic-overlay-move (car changes-in-change) start end)
+	(condition-case nil
+	    (run-hook-with-args 'semantic-edits-move-change-hooks
+				(car changes-in-change))
+	  (error nil))
+	(setq changes-in-change (cdr changes-in-change))
+	;; Delete other changes.  They are now all bound here.
+	(while changes-in-change
+	  (condition-case nil
+	      (run-hook-with-args 'semantic-edits-delete-change-hooks
+				  (car changes-in-change))
+	    (error nil))
+	  (semantic-overlay-delete (car changes-in-change))
+	  (setq changes-in-change (cdr changes-in-change))))
+      )))
+
+(defsubst semantic-edits-flush-change (change)
+  "Flush the CHANGE overlay."
+  (condition-case nil
+      (run-hook-with-args 'semantic-edits-delete-change-hooks
+			  change)
+    (error nil))
+  (semantic-overlay-delete change))
+
+;;;###autoload
+(defun semantic-edits-flush-changes ()
+  "Flush the changes in the current buffer."
+  (let ((changes (semantic-changes-in-region (point-min) (point-max))))
+    (while changes
+      (semantic-edits-flush-change (car changes))
+      (setq changes (cdr changes))))
+  )
+
+(defun semantic-edits-change-in-one-tag-p (change hits)
+  "Return non-nil of the overlay CHANGE exists solely in one leaf tag.
+HITS is the list of tags that CHANGE is in.  It can have more than
+one tag in it if the leaf tag is within a parent tag."
+  (and (< (semantic-tag-start (car hits))
+	  (semantic-overlay-start change))
+       (> (semantic-tag-end (car hits))
+	  (semantic-overlay-end change))
+       ;; Recurse on the rest.  If this change is inside all
+       ;; of these tags, then they are all leaves or parents
+       ;; of the smallest tag.
+       (or (not (cdr hits))
+	   (semantic-edits-change-in-one-tag-p change (cdr hits))))
+  )
+
+;;; Change/Tag Query functions
+;;
+;; A change (region of space) can effect tags in different ways.
+;; These functions perform queries on a buffer to determine different
+;; ways that a change effects a buffer.
+;;
+;; NOTE: After debugging these, replace below to no longer look
+;;       at point and mark (via comments I assume.)
+(defsubst semantic-edits-os (change)
+  "For testing: Start of CHANGE, or smaller of (point) and (mark)."
+  (if change (semantic-overlay-start change)
+    (if (< (point) (mark)) (point) (mark))))
+
+(defsubst semantic-edits-oe (change)
+  "For testing: End of CHANGE, or larger of (point) and (mark)."
+  (if change (semantic-overlay-end change)
+    (if (> (point) (mark)) (point) (mark))))
+
+(defun semantic-edits-change-leaf-tag (change)
+  "A leaf tag which completely encompasses CHANGE.
+If change overlaps a tag, but is not encompassed in it, return nil.
+Use `semantic-edits-change-overlap-leaf-tag'.
+If CHANGE is completely encompassed in a tag, but overlaps sub-tags,
+return nil."
+  (let* ((start (semantic-edits-os change))
+	 (end (semantic-edits-oe change))
+	 (tags (nreverse
+		  (semantic-find-tag-by-overlay-in-region
+		   start end))))
+    ;; A leaf is always first in this list
+    (if (and tags
+	     (<= (semantic-tag-start (car tags)) start)
+	     (> (semantic-tag-end (car tags)) end))
+	;; Ok, we have a match.  If this tag has children,
+	;; we have to do more tests.
+	(let ((chil (semantic-tag-components (car tags))))
+	  (if (not chil)
+	      ;; Simple leaf.
+	      (car tags)
+	    ;; For this type, we say that we encompass it if the
+	    ;; change occurs outside the range of the children.
+	    (if (or (not (semantic-tag-with-position-p (car chil)))
+		    (> start (semantic-tag-end (nth (1- (length chil)) chil)))
+		    (< end (semantic-tag-start (car chil))))
+		;; We have modifications to the definition of this parent
+		;; so we have to reparse the whole thing.
+		(car tags)
+	      ;; We actually modified an area between some children.
+	      ;; This means we should return nil, as that case is
+	      ;; calculated by someone else.
+	      nil)))
+      nil)))
+
+(defun semantic-edits-change-between-tags (change)
+  "Return a cache list of tags surrounding CHANGE.
+The returned list is the CONS cell in the master list pointing to
+a tag just before CHANGE.  The CDR will have the tag just after CHANGE.
+CHANGE cannot encompass or overlap a leaf tag.
+If CHANGE is fully encompassed in a tag that has children, and
+this change occurs between those children, this returns non-nil.
+See `semantic-edits-change-leaf-tag' for details on parents."
+  (let* ((start (semantic-edits-os change))
+	 (end (semantic-edits-oe change))
+	 (tags (nreverse
+		  (semantic-find-tag-by-overlay-in-region
+		   start end)))
+	 (list-to-search nil)
+         (found nil))
+    (if (not tags)
+	(setq list-to-search semantic--buffer-cache)
+      ;; A leaf is always first in this list
+      (if (and (< (semantic-tag-start (car tags)) start)
+	       (> (semantic-tag-end (car tags)) end))
+	  ;; We are completely encompassed in a tag.
+	  (if (setq list-to-search
+		    (semantic-tag-components (car tags)))
+	      ;; Ok, we are completely encompassed within the first tag
+	      ;; entry, AND that tag has children.  This means that change
+	      ;; occured outside of all children, but inside some tag
+	      ;; with children.
+	      (if (or (not (semantic-tag-with-position-p (car list-to-search)))
+		      (> start (semantic-tag-end
+				(nth (1- (length list-to-search))
+				     list-to-search)))
+		      (< end (semantic-tag-start (car list-to-search))))
+		  ;; We have modifications to the definition of this parent
+		  ;; and not between it's children.  Clear the search list.
+		  (setq list-to-search nil)))
+	;; Search list is nil.
+	))
+    ;; If we have a search list, lets go.  Otherwise nothing.
+    (while (and list-to-search (not found))
+      (if (cdr list-to-search)
+          ;; We end when the start of the CDR is after the end of our
+          ;; asked change.
+          (if (< (semantic-tag-start (cadr list-to-search)) end)
+              (setq list-to-search (cdr list-to-search))
+            (setq found t))
+        (setq list-to-search nil)))
+    ;; Return it.  If it is nil, there is a logic bug, and we need
+    ;; to avoid this bit of logic anyway.
+    list-to-search
+    ))
+
+(defun semantic-edits-change-over-tags (change)
+  "Return a cache list of tags surrounding a CHANGE encompassing tags.
+CHANGE must not only include all overlapped tags (excepting possible
+parent tags) in their entirety.  In this case, the change may be deleting
+or moving whole tags.
+The return value is a vector.
+Cell 0 is a list of all tags completely encompassed in change.
+Cell 1 is the cons cell into a master parser cache starting with
+the cell which occurs BEFORE the first position of CHANGE.
+Cell 2 is the parent of cell 1, or nil for the buffer cache.
+This function returns nil if any tag covered by change is not
+completely encompassed.
+See `semantic-edits-change-leaf-tag' for details on parents."
+  (let* ((start (semantic-edits-os change))
+	 (end (semantic-edits-oe change))
+	 (tags (nreverse
+		  (semantic-find-tag-by-overlay-in-region
+		   start end)))
+	 (parent nil)
+	 (overlapped-tags nil)
+	 inner-start inner-end
+	 (list-to-search nil))
+    ;; By the time this is already called, we know that it is
+    ;; not a leaf change, nor a between tag change.  That leaves
+    ;; an overlap, and this condition.
+
+    ;; A leaf is always first in this list.
+    ;; Is the leaf encompassed in this change?
+    (if (and tags
+	     (>= (semantic-tag-start (car tags)) start)
+	     (<= (semantic-tag-end (car tags)) end))
+	(progn
+	  ;; We encompass one whole change.
+	  (setq overlapped-tags (list (car tags))
+		inner-start (semantic-tag-start (car tags))
+		inner-end (semantic-tag-end (car tags))
+		tags (cdr tags))
+	  ;; Keep looping while tags are inside the change.
+	  (while (and tags
+		      (>= (semantic-tag-start (car tags)) start)
+		      (<= (semantic-tag-end (car tags)) end))
+
+	    ;; Check if this new all-encompassing tag is a parent
+	    ;; of that which went before.  Only check end because
+	    ;; we know that start is less than inner-start since
+	    ;; tags was sorted on that.
+	    (if (> (semantic-tag-end (car tags)) inner-end)
+		;; This is a parent.  Drop the children found
+		;; so far.
+		(setq overlapped-tags (list (car tags))
+		      inner-start (semantic-tag-start (car tags))
+		      inner-end (semantic-tag-end (car tags))
+		      )
+	      ;; It is not a parent encompassing tag
+	      (setq overlapped-tags (cons (car tags)
+					    overlapped-tags)
+		    inner-start (semantic-tag-start (car tags))))
+	    (setq tags (cdr tags)))
+	  (if (not tags)
+	      ;; There are no tags left, and all tags originally
+	      ;; found are encompassed by the change.  Setup our list
+	      ;; from the cache
+	      (setq list-to-search semantic--buffer-cache);; We have a tag ouside the list.  Check for
+	    ;; We know we have a parent because it would
+	    ;; completely cover the change.  A tag can only
+	    ;; do that if it is a parent after we get here.
+	    (when (and tags
+		       (< (semantic-tag-start (car tags)) start)
+		       (> (semantic-tag-end (car tags)) end))
+	      ;; We have a parent.  Stuff in the search list.
+	      (setq parent (car tags)
+		    list-to-search (semantic-tag-components parent))
+	      ;; If the first of TAGS is a parent (see above)
+	      ;; then clear out the list.  All other tags in
+	      ;; here must therefore be parents of the car.
+	      (setq tags nil)
+	      ;; One last check,  If start is before the first
+	      ;; tag or after the last, we may have overlap into
+	      ;; the characters that make up the definition of
+	      ;; the tag we are parsing.
+	      (when (or (semantic-tag-with-position-p (car list-to-search))
+			(< start (semantic-tag-start
+				  (car list-to-search)))
+			(> end (semantic-tag-end
+				(nth (1- (length list-to-search))
+				     list-to-search))))
+		;; We have a problem
+		(setq list-to-search nil
+		      parent nil))))
+
+	  (when list-to-search
+
+	    ;; Ok, return the vector only if all TAGS are
+	    ;; confirmed as the lineage of `overlapped-tags'
+	    ;; which must have a value by now.
+
+	    ;; Loop over the search list to find the preceeding CDR.
+	    ;; Fortunatly, (car overlapped-tags) happens to be
+	    ;; the first tag positionally.
+	    (let ((tokstart (semantic-tag-start (car overlapped-tags))))
+	      (while (and list-to-search
+			  ;; Assume always (car (cdr list-to-search)).
+			  ;; A thrown error will be captured nicely, but
+			  ;; that case shouldn't happen.
+
+			  ;; We end when the start of the CDR is after the
+			  ;; end of our asked change.
+			  (cdr list-to-search)
+			  (< (semantic-tag-start (car (cdr list-to-search)))
+			     tokstart)
+			  (setq list-to-search (cdr list-to-search)))))
+	    ;; Create the return vector
+	    (vector overlapped-tags
+		    list-to-search
+		    parent)
+	    ))
+      nil)))
+
+;;; Default Incremental Parser
+;;
+;; Logic about how to group changes for effective reparsing and splicing.
+
+(defun semantic-parse-changes-failed (&rest args)
+  "Signal that Semantic failed to parse changes.
+That is, display a message by passing all ARGS to `format', then throw
+a 'semantic-parse-changes-failed exception with value t."
+  (when semantic-edits-verbose-flag
+    (working-temp-message "Semantic parse changes failed: %S"
+			  (apply 'format args)))
+  (throw 'semantic-parse-changes-failed t))
+
+(defsubst semantic-edits-incremental-fail ()
+  "When the incremental parser fails, we mark that we need a full reparse."
+  ;;(debug)
+  (semantic-parse-tree-set-needs-rebuild)
+  (when semantic-edits-verbose-flag
+    (working-temp-message "Force full reparse (%s)"
+			  (buffer-name (current-buffer))))
+  (run-hooks 'semantic-edits-incremental-reparse-failed-hook))
+
+;;;###autoload
+(defun semantic-edits-incremental-parser ()
+  "Incrementally reparse the current buffer.
+Incremental parser allows semantic to only reparse those sections of
+the buffer that have changed.  This function depends on
+`semantic-edits-change-function-handle-changes' setting up change
+overlays in the current buffer.  Those overlays are analyzed against
+the semantic cache to see what needs to be changed."
+  (let ((changed-tags
+         ;; Don't use `semantic-safe' here to explicitly catch errors
+         ;; and reset the parse tree.
+         (catch 'semantic-parse-changes-failed
+           (if debug-on-error
+               (semantic-edits-incremental-parser-1)
+             (condition-case err
+                 (semantic-edits-incremental-parser-1)
+               (error
+                (working-temp-message "incremental parser error: %S"
+                                      (error-message-string err))
+                t))))))
+    (when (eq changed-tags t)
+      ;; Force a full reparse.
+      (semantic-edits-incremental-fail)
+      (setq changed-tags nil))
+    changed-tags))
+
+(defmacro semantic-edits-assert-valid-region ()
+  "Assert that parse-start and parse-end are sorted correctly."
+;;;  (if (> parse-start parse-end)
+;;;      (error "Bug is %s !> %d!  Buff min/max = [ %d %d ]"
+;;;	     parse-start parse-end
+;;;	     (point-min) (point-max)))
+  )
+
+(defun semantic-edits-incremental-parser-1 ()
+  "Incrementally reparse the current buffer.
+Return the list of tags that changed.
+If the incremental parse fails, throw a 'semantic-parse-changes-failed
+exception with value t, that can be caught to schedule a full reparse.
+This function is for internal use by `semantic-edits-incremental-parser'."
+  (let* ((changed-tags nil)
+         (debug-on-quit t)            ; try to find this annoying bug!
+         (changes (semantic-changes-in-region
+                   (point-min) (point-max)))
+         (tags nil)                   ;tags found at changes
+         (newf-tags nil)              ;newfound tags in change
+         (parse-start nil)              ;location to start parsing
+         (parse-end nil)                ;location to end parsing
+         (parent-tag nil)             ;parent of the cache list.
+         (cache-list nil)               ;list of children within which
+					;we incrementally reparse.
+         (reparse-symbol nil)           ;The ruled we start at for reparse.
+         (change-group nil)             ;changes grouped in this reparse
+	 (last-cond nil)		;track the last case used.
+					;query this when debugging to find
+					;source of bugs.
+         )
+    (or changes
+        ;; If we were called, and there are no changes, then we
+        ;; don't know what to do.  Force a full reparse.
+        (semantic-parse-changes-failed "Don't know what to do"))
+    ;; Else, we have some changes.  Loop over them attempting to
+    ;; patch things up.
+    (while changes
+      ;; Calculate the reparse boundary.
+      ;; We want to take some set of changes, and group them
+      ;; together into a small change group. One change forces
+      ;; a reparse of a larger region (the size of some set of
+      ;; tags it encompases.)  It may contain several tags.
+      ;; That region may have other changes in it (several small
+      ;; changes in one function, for example.)
+      ;; Optimize for the simple cases here, but try to handle
+      ;; complex ones too.
+
+      (while (and changes               ; we still have changes
+                  (or (not parse-start)
+                      ;; Below, if the change we are looking at
+                      ;; is not the first change for this
+                      ;; iteration, and it starts before the end
+                      ;; of current parse region, then it is
+                      ;; encompased within the bounds of tags
+                      ;; modified by the previous iteration's
+                      ;; change.
+                      (< (semantic-overlay-start (car changes))
+                         parse-end)))
+
+        ;; REMOVE LATER
+        (if (eq (car changes) (car change-group))
+            (semantic-parse-changes-failed
+             "Possible infinite loop detected"))
+
+        ;; Store this change in this change group.
+        (setq change-group (cons (car changes) change-group))
+
+        (cond
+         ;; Is this is a new parse group?
+         ((not parse-start)
+	  (setq last-cond "new group")
+          (let (tmp)
+            (cond
+
+;;;; Are we encompassed all in one tag?
+             ((setq tmp (semantic-edits-change-leaf-tag (car changes)))
+	      (setq last-cond "Encompassed in tag")
+              (setq tags (list tmp)
+                    parse-start (semantic-tag-start tmp)
+                    parse-end (semantic-tag-end tmp)
+                    )
+	      (semantic-edits-assert-valid-region))
+
+;;;; Did the change occur between some tags?
+             ((setq cache-list (semantic-edits-change-between-tags
+                                (car changes)))
+	      (setq last-cond "Between and not overlapping tags")
+              ;; The CAR of cache-list is the tag just before
+              ;; our change, but wasn't modified.  Hmmm.
+              ;; Bound our reparse between these two tags
+              (setq tags nil
+                    parent-tag
+                    (car (semantic-find-tag-by-overlay
+                          parse-start)))
+              (cond
+               ;; A change at the beginning of the buffer.
+	       ;; Feb 06 -
+	       ;; IDed when the first cache-list tag is after
+	       ;; our change, meaning there is nothing before
+	       ;; the chnge.
+               ((> (semantic-tag-start (car cache-list))
+                   (semantic-overlay-end (car changes)))
+		(setq last-cond "Beginning of buffer")
+                (setq parse-start
+                      ;; Don't worry about parents since
+                      ;; there there would be an exact
+                      ;; match in the tag list otherwise
+                      ;; and the routine would fail.
+                      (point-min)
+                      parse-end
+                      (semantic-tag-start (car cache-list)))
+		(semantic-edits-assert-valid-region)
+                )
+               ;; A change stuck on the first surrounding tag.
+               ((= (semantic-tag-end (car cache-list))
+                   (semantic-overlay-start (car changes)))
+		(setq last-cond "Beginning of Tag")
+                ;; Reparse that first tag.
+                (setq parse-start
+                      (semantic-tag-start (car cache-list))
+                      parse-end
+                      (semantic-overlay-end (car changes))
+                      tags
+                      (list (car cache-list)))
+		(semantic-edits-assert-valid-region)
+                )
+               ;; A change at the end of the buffer.
+               ((not (car (cdr cache-list)))
+		(setq last-cond "End of buffer")
+                (setq parse-start (semantic-tag-end
+                                   (car cache-list))
+                      parse-end (point-max))
+		(semantic-edits-assert-valid-region)
+                )
+               (t
+		(setq last-cond "Default")
+                (setq parse-start
+                      (semantic-tag-end (car cache-list))
+                      parse-end
+                      (semantic-tag-start (car (cdr cache-list)))
+                      )
+		(semantic-edits-assert-valid-region))))
+
+;;;; Did the change completely overlap some number of tags?
+             ((setq tmp (semantic-edits-change-over-tags
+                         (car changes)))
+	      (setq last-cond "Overlap multiple tags")
+              ;; Extract the information
+              (setq tags (aref tmp 0)
+                    cache-list (aref tmp 1)
+                    parent-tag (aref tmp 2))
+              ;; We can calculate parse begin/end by checking
+              ;; out what is in TAGS.  The one near start is
+              ;; always first.  Make sure the reprase includes
+              ;; the `whitespace' around the snarfed tags.
+              ;; Since cache-list is positioned properly, use it
+              ;; to find that boundary.
+              (if (eq (car tags) (car cache-list))
+                  ;; Beginning of the buffer!
+                  (let ((end-marker (nth (length tags)
+                                         cache-list)))
+                    (setq parse-start (point-min))
+                    (if end-marker
+                        (setq parse-end
+                              (semantic-tag-start end-marker))
+                      (setq parse-end (semantic-overlay-end
+                                       (car changes))))
+		    (semantic-edits-assert-valid-region)
+		    )
+                ;; Middle of the buffer.
+                (setq parse-start
+                      (semantic-tag-end (car cache-list)))
+                ;; For the end, we need to scoot down some
+                ;; number of tags.  We 1+ the length of tags
+                ;; because we want to skip the first tag
+                ;; (remove 1-) then want the tag after the end
+                ;; of the list (1+)
+                (let ((end-marker (nth (1+ (length tags)) cache-list)))
+                  (if end-marker
+                      (setq parse-end (semantic-tag-start end-marker))
+                    ;; No marker.  It is the last tag in our
+                    ;; list of tags.  Only possible if END
+                    ;; already matches the end of that tag.
+                    (setq parse-end
+                          (semantic-overlay-end (car changes)))))
+		(semantic-edits-assert-valid-region)
+                ))
+
+;;;; Unhandled case.
+             ;; Throw error, and force full reparse.
+             ((semantic-parse-changes-failed "Unhandled change group")))
+            ))
+         ;; Is this change inside the previous parse group?
+         ;; We already checked start.
+         ((< (semantic-overlay-end (car changes)) parse-end)
+	  (setq last-cond "in bounds")
+          nil)
+         ;; This change extends the current parse group.
+         ;; Find any new tags, and see how to append them.
+         ((semantic-parse-changes-failed
+	   (setq last-cond "overlap boundary")
+           "Unhandled secondary change overlapping boundary"))
+         )
+        ;; Prepare for the next iteration.
+        (setq changes (cdr changes)))
+
+      ;; By the time we get here, all TAGS are children of
+      ;; some parent.  They should all have the same start symbol
+      ;; since that is how the multi-tag parser works.  Grab
+      ;; the reparse symbol from the first of the returned tags.
+      ;;
+      ;; Feb '06 - If repase-symbol is nil, then they are top level
+      ;;     tags.  (I'm guessing.)  Is this right?
+      (setq reparse-symbol
+            (semantic--tag-get-property (car (or tags cache-list))
+                                        'reparse-symbol))
+      ;; Find a parent if not provided.
+      (and (not parent-tag) tags
+           (setq parent-tag
+                 (semantic-find-tag-parent-by-overlay
+                  (car tags))))
+      ;; We can do the same trick for our parent and resulting
+      ;; cache list.
+      (unless cache-list
+	(if parent-tag
+	    (setq cache-list
+		  ;; We need to get all children in case we happen
+		  ;; to have a mix of positioned and non-positioned
+		  ;; children.
+		  (semantic-tag-components parent-tag))
+	  ;; Else, all the tags since there is no parent.
+	  ;; It sucks to have to use the full buffer cache in
+	  ;; this case because it can be big.  Failure to provide
+	  ;; however results in a crash.
+	  (setq cache-list semantic--buffer-cache)
+	  ))
+      ;; Use the boundary to calculate the new tags found.
+      (setq newf-tags (semantic-parse-region
+			 parse-start parse-end reparse-symbol))
+      ;; Make sure all these tags are given overlays.
+      ;; They have already been cooked by the parser and just
+      ;; need the overlays.
+      (let ((tmp newf-tags))
+        (while tmp
+          (semantic--tag-link-to-buffer (car tmp))
+          (setq tmp (cdr tmp))))
+
+      ;; See how this change lays out.
+      (cond
+
+;;;; Whitespace change
+       ((and (not tags) (not newf-tags))
+        ;; A change that occured outside of any existing tags
+        ;; and there are no new tags to replace it.
+	(when semantic-edits-verbose-flag
+	  (working-temp-message "White space changes"))
+        nil
+        )
+
+;;;; New tags in old whitespace area.
+       ((and (not tags) newf-tags)
+        ;; A change occured outside existing tags which added
+        ;; a new tag.  We need to splice these tags back
+        ;; into the cache at the right place.
+        (semantic-edits-splice-insert newf-tags parent-tag cache-list)
+
+        (setq changed-tags
+              (append newf-tags changed-tags))
+
+	(when semantic-edits-verbose-flag
+	  (working-temp-message "Inserted tags: (%s)"
+				(semantic-format-tag-name (car newf-tags))))
+        )
+
+;;;; Old tags removed
+       ((and tags (not newf-tags))
+        ;; A change occured where pre-existing tags were
+        ;; deleted!  Remove the tag from the cache.
+        (semantic-edits-splice-remove tags parent-tag cache-list)
+
+        (setq changed-tags
+              (append tags changed-tags))
+
+        (when semantic-edits-verbose-flag
+	  (working-temp-message "Deleted tags: (%s)"
+				(semantic-format-tag-name (car tags))))
+        )
+
+;;;; One tag was updated.
+       ((and (= (length tags) 1) (= (length newf-tags) 1))
+        ;; One old tag was modified, and it is replaced by
+        ;; One newfound tag.  Splice the new tag into the
+        ;; position of the old tag.
+        ;; Do the splice.
+        (semantic-edits-splice-replace (car tags) (car newf-tags))
+        ;; Add this tag to our list of changed toksns
+        (setq changed-tags (cons (car tags) changed-tags))
+        ;; Debug
+        (when semantic-edits-verbose-flag
+	  (working-temp-message "Update Tag Table: %s"
+				(semantic-format-tag-name (car tags) nil t)))
+        ;; Flush change regardless of above if statement.
+        )
+
+;;;; Some unhandled case.
+       ((semantic-parse-changes-failed "Don't know what to do")))
+
+      ;; We got this far, and we didn't flag a full reparse.
+      ;; Clear out this change group.
+      (while change-group
+        (semantic-edits-flush-change (car change-group))
+        (setq change-group (cdr change-group)))
+
+      ;; Don't increment change here because an earlier loop
+      ;; created change-groups.
+      (setq parse-start nil)
+      )
+    ;; Mark that we are done with this glop
+    (semantic-parse-tree-set-up-to-date)
+    ;; Return the list of tags that changed.  The caller will
+    ;; use this information to call hooks which can fix themselves.
+    changed-tags))
+
+;; Make it the default changes parser
+;;;###autoload
+(defalias 'semantic-parse-changes-default
+  'semantic-edits-incremental-parser)
+
+;;; Cache Splicing
+;;
+;; The incremental parser depends on the ability to parse up sections
+;; of the file, and splice the results back into the cache.  There are
+;; three types of splices.  A REPLACE, an ADD, and a REMOVE.  REPLACE
+;; is one of the simpler cases, as the starting cons cell representing
+;; the old tag can be used to auto-splice in.  ADD and REMOVE
+;; require scanning the cache to find the correct location so that the
+;; list can be fiddled.
+(defun semantic-edits-splice-remove (oldtags parent cachelist)
+  "Remove OLDTAGS from PARENT's CACHELIST.
+OLDTAGS are tags in the currenet buffer, preferably linked
+together also in CACHELIST.
+PARENT is the parent tag containing OLDTAGS.
+CACHELIST should be the children from PARENT, but may be
+pre-positioned to a convenient location."
+  (let* ((first (car oldtags))
+	 (last (nth (1- (length oldtags)) oldtags))
+	 (chil (if parent
+		   (semantic-tag-components parent)
+		 semantic--buffer-cache))
+	 (cachestart cachelist)
+	 (cacheend nil)
+	 )
+    ;; First in child list?
+    (if (eq first (car chil))
+	;; First tags in the cache are being deleted.
+	(progn
+	  (when semantic-edits-verbose-flag
+	    (working-temp-message "To Remove First Tag: (%s)"
+				  (semantic-format-tag-name first)))
+	  ;; Find the last tag
+	  (setq cacheend chil)
+	  (while (and cacheend (not (eq last (car cacheend))))
+	    (setq cacheend (cdr cacheend)))
+	  ;; The splicable part is after cacheend.. so move cacheend
+	  ;; one more tag.
+	  (setq cacheend (cdr cacheend))
+	  ;; Splice the found end tag into the cons cell
+	  ;; owned by the current top child.
+	  (setcar chil (car cacheend))
+	  (setcdr chil (cdr cacheend))
+	  (when (not cacheend)
+	    ;; No cacheend.. then the whole system is empty.
+	    ;; The best way to deal with that is to do a full
+	    ;; reparse
+	    (semantic-parse-changes-failed "Splice-remove failed.  Empty buffer?")
+	    ))
+      (working-temp-message "To Remove Middle Tag: (%s)"
+			    (semantic-format-tag-name first)))
+    ;; Find in the cache the preceeding tag
+    (while (and cachestart (not (eq first (car (cdr cachestart)))))
+      (setq cachestart (cdr cachestart)))
+    ;; Find the last tag
+    (setq cacheend cachestart)
+    (while (and cacheend (not (eq last (car cacheend))))
+      (setq cacheend (cdr cacheend)))
+    ;; Splice the end position into the start position.
+    ;; If there is no start, then this whole section is probably
+    ;; gone.
+    (if cachestart
+	(setcdr cachestart (cdr cacheend))
+      (semantic-parse-changes-failed "Splice-remove failed."))
+
+    ;; Remove old overlays of these deleted tags
+    (while oldtags
+      (semantic--tag-unlink-from-buffer (car oldtags))
+      (setq oldtags (cdr oldtags)))
+    ))
+
+(defun semantic-edits-splice-insert (newtags parent cachelist)
+  "Insert NEWTAGS into PARENT using CACHELIST.
+PARENT could be nil, in which case CACHLIST is the buffer cache
+which must be updated.
+CACHELIST must be searched to find where NEWTAGS are to be inserted.
+The positions of NEWTAGS must be synchronized with those in
+CACHELIST for this to work.  Some routines pre-position CACHLIST at a
+convenient location, so use that."
+  (let* ((start (semantic-tag-start (car newtags)))
+	 (newtagendcell (nthcdr (1- (length newtags)) newtags))
+	 (end (semantic-tag-end (car newtagendcell)))
+	 )
+    (if (> (semantic-tag-start (car cachelist)) start)
+	;; We are at the beginning.
+	(let* ((pc (if parent
+		       (semantic-tag-components parent)
+		     semantic--buffer-cache))
+	       (nc (cons (car pc) (cdr pc)))  ; new cons cell.
+	       )
+	  ;; Splice the new cache cons cell onto the end of our list.
+	  (setcdr newtagendcell nc)
+	  ;; Set our list into parent.
+	  (setcar pc (car newtags))
+	  (setcdr pc (cdr newtags)))
+      ;; We are at the end, or in the middle.  Find our match first.
+      (while (and (cdr cachelist)
+		  (> end (semantic-tag-start (car (cdr cachelist)))))
+	(setq cachelist (cdr cachelist)))
+      ;; Now splice into the list!
+      (setcdr newtagendcell (cdr cachelist))
+      (setcdr cachelist newtags))))
+
+(defun semantic-edits-splice-replace (oldtag newtag)
+  "Replace OLDTAG with NEWTAG in the current cache.
+Do this by recycling OLDTAG's first CONS cell.  This effectivly
+causes the new tag to completely replace the old one.
+Make sure that all information in the overlay is transferred.
+It is presumed that OLDTAG and NEWTAG are both cooked.
+When this routine returns, OLDTAG is raw, and the data will be
+lost if not transferred into NEWTAG."
+  (let* ((oo (semantic-tag-overlay oldtag))
+	 (o (semantic-tag-overlay newtag))
+	 (oo-props (semantic-overlay-properties oo)))
+    (while oo-props
+      (semantic-overlay-put o (car oo-props) (car (cdr oo-props)))
+      (setq oo-props (cdr (cdr oo-props)))
+      )
+    ;; Free the old overlay(s)
+    (semantic--tag-unlink-from-buffer oldtag)
+    ;; Recover properties
+    (semantic--tag-copy-properties oldtag newtag)
+    ;; Splice into the main list.
+    (setcdr oldtag (cdr newtag))
+    (setcar oldtag (car newtag))
+    ;; This important bit is because the CONS cell representing
+    ;; OLDTAG is now pointing to NEWTAG, but the NEWTAG
+    ;; cell is about to be abandoned.  Here we update our overlay
+    ;; to point at the updated state of the world.
+    (semantic-overlay-put o 'semantic oldtag)
+    ))
+
+;;; Setup incremental parser
+;;
+;;;###autoload
+(add-hook 'semantic-change-hooks
+          #'semantic-edits-change-function-handle-changes)
+;;;###autoload
+(add-hook 'semantic-before-toplevel-cache-flush-hook
+          #'semantic-edits-flush-changes)
+
+(provide 'semantic-edit)
+
+;;; semantic-edit.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-elp.el b/site/cedet-1.0pre7/semantic/semantic-elp.el
new file mode 100644
index 0000000..1660527
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-elp.el
@@ -0,0 +1,774 @@
+;;; semantic-elp.el --- Bind ELP to measure Semantic
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-elp.el,v 1.17 2009/09/11 23:38:25 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide fast ways to profile various (often slow) Semantic processes.
+
+(require 'elp)
+(require 'data-debug)
+(require 'semantic-adebug)
+(require 'semantic-tag-ls)
+(require 'semantic-tag-file)
+(require 'semanticdb)
+(require 'semanticdb-find)
+(require 'semanticdb-typecache)
+(require 'semantic-scope)
+(require 'semantic-analyze-fcn)
+(require 'semantic-analyze)
+(require 'semantic-analyze-complete)
+
+;;; Code:
+(defvar semantic-elp-emacs-core-list
+  '(
+    append
+    copy-sequence
+    expand-file-name
+    file-exists-p
+    file-name-directory
+    file-name-nondirectory
+    file-attributes
+    file-truename
+    find-buffer-visiting
+    length
+    locate-file
+    nconc
+    nreverse
+    sort
+    string<
+    string=
+    )
+  "List of Emacs functions for profiling.")
+
+(defvar semantic-elp-eieio-core-list
+  '(
+    eieio-generic-call
+    eieio-generic-call-primary-only
+    eieiomt-method-list
+    eieio-generic-form
+    eieio-oref
+    eieio-oset
+    obj-of-class-p
+    )
+  "List of EIEIO functions for profiling.")
+
+(defvar semantic-elp-ede-core-list
+  '(
+    ede-current-project
+    ede-directory-get-open-project
+    ede-expand-filename
+    ede-expand-filename-impl
+    ede-locate-file-in-project
+    ede-locate-file-in-project-impl
+    ede-system-include-path
+    ede-toplevel
+    ede-toplevel-project
+    ede-directory-project-p
+    )
+  "List of EDE functions to watch out for.")
+
+(defvar semantic-elp-semantic-core-list
+  '(
+    semantic-ctxt-current-argument
+    semantic-ctxt-current-assignment
+    semantic-ctxt-current-class-list
+    semantic-ctxt-current-function
+    semantic-ctxt-current-symbol-and-bounds
+    semantic-current-tag
+    semantic-dependency-tag-file
+    semantic-equivalent-tag-p
+    semantic-fetch-tags
+    semantic-fetch-tags-fast
+    semantic-find-tag-by-overlay
+    semantic-sort-tags-by-name-decreasing
+    semantic-sort-tags-by-name-increasing
+    semantic-sort-tags-by-name-then-type-increasing
+    semantic-sort-tags-by-type-decreasing
+    semantic-sort-tags-by-type-increasing
+    semantic-tag-clone
+    semantic-tag-components
+    semantic-tag-copy
+    semantic-tag-external-member-children
+    semantic-tag-file-name
+    semantic-tag-function-arguments
+    semantic-tag-function-parent
+    semantic-tag-get-attribute
+    semantic-tag-in-buffer-p
+    semantic-tag-include-filename
+    ;;semantic-tag-lessp-name-then-type
+    semantic-tag-name
+    semantic-tag-new-type
+    semantic-tag-of-class-p
+    semantic-tag-of-type-p
+    semantic-tag-of-type-p
+    semantic-tag-p
+    semantic-tag-prototype-p
+    semantic-tag-set-faux
+    semantic-tag-type
+    semantic-tag-type-members
+    semantic-tag-type-superclasses
+    semantic-tag-with-position-p
+    )
+  "List of core Semantic functions for profiling.")
+(defvar semantic-elp-semantic-find-core-list
+  '(
+    semantic-find-tags-by-class
+    semantic-find-tags-by-name
+    semantic-find-tags-by-name-regexp
+    semantic-find-tags-by-scope-protection
+    semantic-find-tags-by-type
+    semantic-find-tags-for-completion
+    semantic-find-tags-included
+    semantic-find-tags-of-compound-type
+    )
+  "List of semantic-find routines for profiling.")
+
+(defvar semantic-elp-semanticdb-core-list
+  '(
+    semanticdb-cache-get
+    semanticdb-current-database-list
+    semanticdb-file-table
+    semanticdb-file-table-object
+    semanticdb-full-filename
+    semanticdb-get-buffer
+    semanticdb-get-table-index
+    semanticdb-refresh-references
+    semanticdb-refresh-table
+    semanticdb-needs-refresh-p
+    semanticdb-directory-loaded-p
+    semanticdb-full-filename
+    semanticdb-create-table-for-file
+    )
+  "List of core Semanticdb functions for profiling.")
+
+(defvar semantic-elp-include-path-list
+  '(
+    semanticdb-find-incomplete-cache-entries-p
+    semanticdb-find-load-unloaded
+    semanticdb-find-table-for-include
+    semanticdb-find-throttle-active-p
+    semanticdb-find-translate-path-default
+    semanticdb-find-translate-path-brutish-default
+    semanticdb-find-translate-path-includes--internal
+    semanticdb-find-translate-path-includes-default
+    )
+  "List of include path calculation functions for profiling.")
+
+(defvar semantic-elp-semanticdb-find-list
+  '(
+    semanticdb-fast-strip-find-results
+    semanticdb-find-results-p
+    semanticdb-find-tags-by-class
+    semanticdb-find-tags-by-name
+    semanticdb-find-tags-by-name-regexp
+    semanticdb-find-tags-collector
+    semanticdb-find-tags-external-children-of-type
+    semanticdb-find-tags-for-completion
+    semanticdb-strip-find-results
+    )
+  "List of semanticdb find functions to profile.
+You may also need `semantic-elp-include-path-list'.")
+
+(defun semantic-elp-core-enable ()
+  "Do an ELP reset, and enable profiling of the core system."
+  (elp-reset-all)
+  (elp-instrument-list semantic-elp-emacs-core-list)
+  (elp-instrument-list semantic-elp-eieio-core-list)
+  (elp-instrument-list semantic-elp-ede-core-list)
+  (elp-instrument-list semantic-elp-semantic-core-list)
+  (elp-instrument-list semantic-elp-semanticdb-core-list)
+  (elp-instrument-list semantic-elp-semanticdb-find-list)
+  (elp-instrument-list semantic-elp-include-path-list)
+  )
+
+
+(defun semantic-elp-include-path-enable ()
+  "Enable profiling for `semanticdb-find-translate-path'."
+  (semantic-elp-core-enable)
+  (elp-set-master 'semanticdb-find-translate-path-default)
+  )
+
+(defvar semantic-elp-typecache-list
+  '(
+    semantic-analyze-split-name
+    semanticdb-get-typecache
+    semanticdb-typecache-merge-streams
+    semanticdb-typecache-safe-tag-members
+    semanticdb-typecache-apply-filename
+    semanticdb-typecache-file-tags
+    semanticdb-typecache-include-tags
+    )
+  "List of typecaching functions for profiling.")
+
+(defun semantic-elp-profile-typecache (tab)
+  "Profile the typecache.  Start with table TAB."
+  (let ((tc (semanticdb-get-typecache tab)))
+    (semanticdb-typecache-file-tags tab)
+    (semanticdb-typecache-include-tags tab)
+    tc))
+
+(defun semantic-elp-typecache-enable ()
+  "Enable profiling for `semanticdb-get-typecache'."
+  (semantic-elp-include-path-enable)
+  (elp-instrument-list semantic-elp-typecache-list)
+  (elp-set-master 'semantic-elp-profile-typecache)
+  )
+
+(defvar semantic-elp-scope-list
+  '(
+    semantic-analyze-find-tag
+    semantic-analyze-scope-nested-tags
+    semantic-analyze-scoped-types
+    semantic-analyze-scoped-types
+    semantic-analyze-tag-prototype-p
+    semantic-analyze-scoped-type-parts
+    semantic-calculate-scope
+    semantic-ctxt-scoped-types
+    semantic-get-all-local-variables
+    semantic-scope-find
+    semanticdb-typecache-find
+    semanticdb-typecache-merge-streams
+    )
+  "List of scope calculation functions for profiling.")
+
+(defun semantic-elp-scope-enable ()
+  "Enable profiling for `semanticdb-calculate-scope'."
+  (semantic-elp-core-enable)
+  (elp-instrument-list semantic-elp-typecache-list)
+  (elp-instrument-list semantic-elp-scope-list)
+  (elp-set-master 'semantic-calculate-scope)
+  )
+
+(defvar semantic-elp-analyze-list
+  '(
+    semantic-analyze-current-symbol
+    semantic-analyze-current-context
+    semantic-analyze-dereference-metatype
+    semantic-analyze-find-tag-sequence
+    semantic-analyze-interesting-tag
+    semantic-analyze-pop-to-context
+    semantic-analyze-select-best-tag
+    semantic-analyze-tag-type
+    semantic-analyze-type-to-name
+    semantic-analyze-type-constraint
+    semantic-analyze-scoped-type-parts
+    semantic-cache-data-to-buffer
+    )
+  "List of analyzer calculation functions for profiling.")
+
+(defun semantic-elp-analyze-enable ()
+  "Enable profiling for `semanticdb-analyze-current-context'."
+  (semantic-elp-scope-enable)
+  (elp-instrument-list semantic-elp-analyze-list)
+  (elp-set-master 'semantic-analyze-current-context)
+  )
+
+(defvar semantic-elp-symref-list
+  '(
+    semantic-symref-hits-in-region
+    semantic-symref-test-count-hits-in-tag
+    )
+  "List of symref functions for profiling.")
+
+(defun semantic-elp-analyze-symref-hits ()
+  "Enable profiling for `semanticdb-analyze-current-context'."
+  (semantic-elp-analyze-enable)
+  (elp-instrument-list semantic-elp-symref-list)
+  (elp-set-master 'semantic-symref-test-count-hits-in-tag)
+  )
+
+(defvar semantic-elp-complete-list
+  '(
+    semantic-analyze-possible-completions
+    semantic-analyze-possible-completions-default
+    semantic-analyze-tags-of-class-list
+    semantic-analyze-type-constants
+    semantic-unique-tag-table-by-name
+    )
+  "List of smart completion functions for profiling.")
+
+(defun semantic-elp-complete-enable ()
+  "Enable profiling for `semanticdb-analyze-current-context'."
+  (semantic-elp-analyze-enable)
+  (elp-instrument-list semantic-elp-complete-list)
+  (elp-set-master 'semantic-analyze-possible-completions)
+  )
+
+;;; Storage Classes
+;;
+;;
+(defclass semantic-elp-data ()
+  ((raw :initarg :raw
+	:type list
+	:documentation
+	"The raw ELP data.")
+   (sort :initform time
+	 :documentation
+	 "Which column do we sort our data by during various dumps.")
+   (sorted :initform nil
+	   :documentation
+	   "The sorted and filtered version of this data.")
+   (total :initarg :total
+	  :initform nil
+	  :documentation
+	  "The total time spent in the operation.
+Recorded outside of ELP.")
+   )
+  "Class for managing ELP data.")
+
+(defmethod semantic-elp-change-sort ((data semantic-elp-data) &optional newsort)
+  "Change the sort in DATA object to NEWSORT."
+  (cond ((eq newsort 'rotate)
+	 (let* ((arot '((time . avg)
+			(avg . calls)
+			(calls . name)
+			(name . time)))
+		(next (cdr (assoc (oref data sort) arot)))
+		)
+	   (oset data sort next)))
+	((null newsort)
+	 nil)
+	(t
+	 (oset data sort newsort)))
+  (let ((r (copy-sequence (oref data raw)))
+	(s (oref data sort)))
+    (cond ((eq s 'time)
+	   (oset data sorted (sort r (lambda (a b)
+				       (> (aref a 1) (aref b 1))
+				       )))
+	   )
+	  ((eq s 'avg)
+	   (oset data sorted (sort r (lambda (a b)
+				       (> (aref a 2) (aref b 2))
+				       )))
+	   )
+	  ((eq s 'calls)
+	   (oset data sorted (sort r (lambda (a b)
+				       (> (aref a 0) (aref b 0))
+				       )))
+	   )
+	  ((eq s 'name)
+	   (oset data sorted (sort r (lambda (a b)
+				       (string< (aref a 3) (aref b 3))
+				       )))
+	   )
+	  (t (message "Don't know how to resort with %s" s)
+	     ))))
+
+(defun semantic-elp-goto-function (point)
+  "Goto the function from the ELP data.
+Argument POINT is where to get the data from."
+  (let* ((data (get-text-property point 'ddebug))
+	 )
+    (find-function (intern-soft (aref data 3)))
+    ))
+
+(defmethod semantic-elp-dump-table ((data semantic-elp-data)
+				    prefix)
+  "dump out the current DATA table using PREFIX before each line."
+  (let* ((elpd (oref data sorted))
+	 (spaces (make-string (- (length prefix) 2) ? ))
+	 )
+    (data-debug-insert-simple-thing
+     "Calls\t Total Time\t Avg Time/Call\tName"
+     spaces " " 'underline)
+    (dolist (d elpd)
+      (when (> (aref d 0) 0) ;; We had some calls
+	(let ((start (point))
+	      (end nil))
+	  (data-debug-insert-simple-thing
+	   (format " % 4d\t% 2.7f\t% 2.7f\t%s"
+		   (aref d 0) (aref d 1) (aref d 2) (aref d 3))
+	   spaces " " nil)
+	  (setq end (1- (point)))
+	  (put-text-property start end 'ddebug d)
+	  (put-text-property start end 'ddebug-noexpand t)
+	  (put-text-property start end 'ddebug-function
+			     'semantic-elp-goto-function)
+	  )
+	))
+    )
+  )
+
+(defmethod data-debug/eieio-insert-slots ((data semantic-elp-data)
+					   prefix)
+  "Show the fields of ELP data in an adebug buffer.
+Ignore the usual, and format a nice table."
+  (data-debug-insert-thing (object-name-string data)
+			   prefix
+			   "Name: ")
+  (let* ((cl (object-class data))
+	 (cv (class-v cl)))
+    (data-debug-insert-thing (class-constructor cl)
+			     prefix
+			     "Class: ")
+    )
+
+  (data-debug-insert-thing (oref data :total)
+			   prefix
+			   "Total Time Spent: ")
+
+  (let ((s (oref data sort))
+	)
+    ;; Show how it's sorted:
+    (let ((start (point))
+	  (end nil)
+	  )
+      (insert prefix "Sort Method: " (symbol-name s))
+      (setq end (point))
+      ;; (data-debug-insert-thing s prefix "Sort Method: ")
+      (put-text-property start end 'ddebug data)
+      (put-text-property start end 'ddebug-noexpand t)
+      (put-text-property start end 'ddebug-indent(length prefix))
+      (put-text-property start end 'ddebug-prefix prefix)
+      (put-text-property start end 'ddebug-function
+			 'semantic-elp-change-sort-adebug)
+      (put-text-property start end 'help-echo
+			 "Change the Sort by selecting twice.")
+      (insert "\n"))
+
+    ;; How to sort the raw data
+    (semantic-elp-change-sort data)
+    )
+  ;; Display
+  (semantic-elp-dump-table data prefix)
+  )
+
+(defun semantic-elp-change-sort-adebug (point)
+  "Change the sort function here.  Redisplay.
+Argument POINT is where the text is."
+  (let* ((data (get-text-property point 'ddebug))
+	 (prefix (get-text-property point 'ddebug-prefix))
+	 )
+    ;; Get rid of the old table.
+    (data-debug-contract-current-line)
+    ;; Change it
+    (semantic-elp-change-sort data 'rotate)
+    (end-of-line)
+    (forward-word -1)
+    (delete-region (point) (point-at-eol))
+    (insert (symbol-name (oref data sort)))
+    ;; Redraw it.
+    (save-excursion
+      (end-of-line)
+      (forward-char 1)
+      (semantic-elp-dump-table data prefix))
+    ))
+
+(defclass semantic-elp-object-base (eieio-persistent)
+  ((file-header-line :initform ";; SEMANTIC ELP Profiling Save File")
+   (total :initarg :total
+	  :type number
+	  :documentation
+	  "Amount of time spent during the entire collection.")
+   )
+  "Base elp object.")
+
+(defclass semantic-elp-object (semantic-elp-object-base)
+  ((time :initarg :time
+	 :type semantic-elp-data
+	 :documentation
+	 "Times for calculating something.")
+   (answer :initarg :answer
+	   :documentation
+	   "Any answer that might be useful."))
+  "Simple elp object for remembering one analysis run.")
+
+(defclass semantic-elp-object-analyze (semantic-elp-object-base)
+  ((pathtime :initarg :pathtime
+	     :type semantic-elp-data
+	     :documentation
+	     "Times for calculating the include path.")
+   (typecachetime :initarg :typecachetime
+		  :type semantic-elp-data
+		  :documentation
+		  "Times for calculating the typecache.")
+   (scopetime :initarg :scopetime
+	      :type semantic-elp-data
+	      :documentation
+	      "Times for calculating the typecache")
+   (ctxttime :initarg :ctxttime
+	     :type semantic-elp-data
+	     :documentation
+	     "Times for calculating the context.")
+   (completiontime :initarg :completiontime
+		   :type semantic-elp-data
+		   :documentation
+		   "Times for calculating the completions.")
+   )
+  "Results from a profile run.")
+
+;;; ELP hackery.
+;;
+
+(defvar semantic-elp-last-results nil
+  "Save the last results from an ELP run for more post processing.")
+
+(defun semantic-elp-results (name)
+  "Fetch results from the last run, and display.
+Copied out of elp.el and modified only slightly.
+Argument NAME is the name to give the ELP data object."
+  (let ((resvec
+	 (mapcar
+	  (function
+	   (lambda (funsym)
+	     (let* ((info (get funsym elp-timer-info-property))
+		    (symname (format "%s" funsym))
+		    (cc (aref info 0))
+		    (tt (aref info 1)))
+	       (if (not info)
+		   (insert "No profiling information found for: "
+			   symname)
+		 ;;(setq longest (max longest (length symname)))
+		 (vector cc tt (if (zerop cc)
+				   0.0 ;avoid arithmetic div-by-zero errors
+				 (/ (float tt) (float cc)))
+			 symname)))))
+	  elp-all-instrumented-list))
+	)				; end let
+    (setq semantic-elp-last-results (semantic-elp-data name :raw resvec))
+    (elp-reset-all))
+  )
+
+;;; The big analyze and timer function!
+;;
+;;
+
+(defvar semantic-elp-last-run nil
+  "The results from the last elp run.")
+
+;;;###autoload
+(defun semantic-elp-analyze ()
+  "Run the analyzer, using ELP to measure performance."
+  (interactive)
+  (let ((elp-recycle-buffers-p nil)
+	(totalstart (current-time))
+	(totalstop nil)
+	start stop
+	path pathtime
+	typecache typecachetime
+	scope scopetime
+	ctxt ctxttime
+	completion completiontime)
+    ;; Force tag table to be up to date.
+    (semantic-clear-toplevel-cache)
+    (semantic-fetch-tags)
+    ;; Path translation
+    (semantic-elp-include-path-enable)
+    (progn
+      (setq start (current-time))
+      (setq path (semanticdb-find-translate-path nil nil))
+      (setq stop (current-time)))
+    (semantic-elp-results "translate-path")
+    (setq pathtime semantic-elp-last-results)
+    (oset pathtime :total (semantic-elapsed-time start stop))
+    ;; typecache
+    (let* ((tab semanticdb-current-table)
+	   (idx (semanticdb-get-table-index tab))
+	   (tc nil)
+	   )
+      (semantic-elp-typecache-enable)
+      (progn
+	(setq start (current-time))
+	(setq tc (semantic-elp-profile-typecache tab))
+	(setq stop (current-time)))
+      (setq typecache tc))
+    (semantic-elp-results "typecache")
+    (setq typecachetime semantic-elp-last-results)
+    (oset typecachetime :total (semantic-elapsed-time start stop))
+    ;; Scope
+    (semantic-elp-scope-enable)
+    (progn
+      (setq start (current-time))
+      (setq scope (semantic-calculate-scope))
+      (setq stop (current-time)))
+    (semantic-elp-results "scope")
+    (setq scopetime semantic-elp-last-results)
+    (oset scopetime :total (semantic-elapsed-time start stop))
+    ;; Analyze!
+    (semantic-elp-analyze-enable)
+    (progn
+      (setq start (current-time))
+      (setq ctxt (semantic-analyze-current-context)) ; skip caching
+      (setq stop (current-time)))
+    (semantic-elp-results "analyze")
+    (setq ctxttime semantic-elp-last-results)
+    (oset ctxttime :total (semantic-elapsed-time start stop))
+    ;; Complete!
+    (semantic-elp-complete-enable)
+    (progn
+      (setq start (current-time))
+      (setq completion (semantic-analyze-possible-completions ctxt))
+      (setq stop (current-time)))
+    (semantic-elp-results "complete")
+    (setq completiontime semantic-elp-last-results)
+    (oset completiontime :total (semantic-elapsed-time start stop))
+    ;; Finish it
+    (setq totalstop (current-time))
+    ;; build it
+    (let ((elpobj (semantic-elp-object-analyze
+		   "ELP"
+		   :total          (semantic-elapsed-time totalstart totalstop)
+		   :pathtime	   pathtime
+		   :typecachetime  typecachetime
+		   :scopetime	   scopetime
+		   :ctxttime	   ctxttime
+		   :completiontime completiontime
+		   )))
+      (data-debug-show elpobj)
+      (setq semantic-elp-last-run elpobj)
+      (let ((saveas (read-file-name "Save Profile to: " (expand-file-name "~/")
+				    "semantic.elp" nil "semantic.elp")))
+	(oset elpobj :file saveas)
+	(eieio-persistent-save elpobj)
+	)
+      )))
+
+(defun semantic-elp-idle-work ()
+  "Run the idle work scheduler, using ELP to measure performance."
+  (interactive)
+  (let ((elp-recycle-buffers-p nil)
+	(totalstart nil)
+	(totalstop nil)
+	ans time
+	)
+    ;; Path translation
+    (semantic-elp-core-enable)
+    (setq totalstart (current-time))
+    (semantic-idle-scheduler-work-parse-neighboring-files)
+    (setq totalstop (current-time))
+    (semantic-elp-results "")
+    (setq time semantic-elp-last-results)
+    (oset time :total (semantic-elapsed-time totalstart totalstop))
+    ;; build it
+    (let ((elpobj (semantic-elp-object
+		   "ELP"
+		   :total          (semantic-elapsed-time totalstart totalstop)
+		   :time	   time)))
+      (data-debug-show elpobj)
+      (setq semantic-elp-last-run elpobj)
+      (let ((saveas (read-file-name "Save Profile to: " (expand-file-name "~/")
+				    "semantic.elp" nil "semantic.elp")))
+	(oset elpobj :file saveas)
+	(eieio-persistent-save elpobj)
+	)
+      )))
+
+(defun semantic-elp-searchdb ()
+  "Run a semanticdb search routine with the profiler.
+The expectation is that you will edit this fcn with different
+`semanticdb-find-' routines."
+  (interactive)
+  (let ((elp-recycle-buffers-p nil)
+	(totalstart nil)
+	(totalstop nil)
+	ans time
+	)
+    ;; reset
+    (semantic-clear-toplevel-cache)
+    (semantic-fetch-tags)
+
+    ;; Path translation
+    (semantic-elp-include-path-enable)
+    (setq totalstart (current-time))
+
+    (setq ans (semanticdb-find-tags-by-name-regexp "task" nil))
+
+    (setq totalstop (current-time))
+    (semantic-elp-results "")
+    (setq time semantic-elp-last-results)
+    (oset time :total (semantic-elapsed-time totalstart totalstop))
+    ;; build it
+    (let ((elpobj (semantic-elp-object
+		   "ELP"
+		   :total          (semantic-elapsed-time totalstart totalstop)
+		   :time	   time
+		   :answer         ans)))
+      (data-debug-show elpobj)
+      (setq semantic-elp-last-run elpobj)
+      (let ((saveas (read-file-name "Save Profile to: " (expand-file-name "~/")
+				    "semantic.elp" nil "semantic.elp")))
+	(oset elpobj :file saveas)
+	(eieio-persistent-save elpobj)
+	)
+      )))
+
+(defun semantic-elp-symref-hit-count ()
+  "Run a `semantic-symref-test-count-hits-in-tag' with elp on."
+  (interactive)
+  (let ((elp-recycle-buffers-p nil)
+	(totalstart nil)
+	(totalstop nil)
+	ans time
+	)
+    ;; reset
+    (semantic-clear-toplevel-cache)
+    (semantic-fetch-tags)
+
+    ;; Build up caches so we get user use timings.
+    (semantic-analyze-current-context)
+
+    ;; Enable everything for analysis.
+    (semantic-elp-analyze-symref-hits)
+
+    ;; Do the analysis
+    (setq totalstart (current-time))
+
+    (setq ans (semantic-symref-test-count-hits-in-tag))
+
+    (setq totalstop (current-time))
+
+    (semantic-elp-results "")
+    (setq time semantic-elp-last-results)
+    (oset time :total (semantic-elapsed-time totalstart totalstop))
+    ;; build it
+    (let ((elpobj (semantic-elp-object
+		   "ELP"
+		   :total          (semantic-elapsed-time totalstart totalstop)
+		   :time	   time
+		   :answer         ans)))
+      (data-debug-show elpobj)
+      (setq semantic-elp-last-run elpobj)
+;;(let ((saveas (read-file-name "Save Profile to: " (expand-file-name "~/")
+;;				    "semantic.elp" nil "semantic.elp")))
+;;	(oset elpobj :file saveas)
+;;	(eieio-persistent-save elpobj)
+;;	)
+      )))
+
+(defun semantic-elp-show-last-run ()
+  "Show the last elp run."
+  (interactive)
+  (when (not semantic-elp-last-run)
+    (error "No last run to show"))
+  (data-debug-show semantic-elp-last-run))
+
+;;;###autoload
+(defun semantic-elp-load-old-run (file)
+  "Load an old run from FILE, and show it."
+  (interactive "fLast Run File: ")
+  (setq semantic-elp-last-run
+	(eieio-persistent-read file))
+  (data-debug-show semantic-elp-last-run))
+
+(provide 'semantic-elp)
+;;; semantic-elp.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-example.el b/site/cedet-1.0pre7/semantic/semantic-example.el
new file mode 100644
index 0000000..8700b98
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-example.el
@@ -0,0 +1,149 @@
+;;; semanto-example.el --- Examples using the semantic API
+
+;;; Copyright (C) 2002, 2003, 2004, 2005 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-example.el,v 1.6 2005/09/30 20:20:07 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Simplified example programs that use the semantic API.
+
+;;; Code:
+(defun se-jump (name)
+  "Jump to the token with NAME.
+Shows how to:
+ * Interactivly finding a token name from a stream.
+ * Getting symbols under point.
+ * Getting the main token list
+ * Finding a token by name.
+ * Highlighting a token"
+  (interactive
+   (list
+    ;; Helpful way of interactivly querying for a token name.
+    (semantic-read-symbol
+     "Jump to: "
+     ;; The default can be the text under the cursor.
+     ;; It returns a list such that:
+     ;;  this.that.th
+     ;; is
+     ;; ( "this" "that" "th" )
+     (car (reverse (semantic-ctxt-current-symbol)))
+     ;; The stream is from this buffer
+     (semantic-fetch-tags)
+     ;; We don't need a filter.
+     nil )))
+  (let (tok pos)
+    ;; Search for the token
+    (setq tok (semantic-find-first-tag-by-name
+	       name
+	       ;; Get the stream.  May be a buffer too.
+	       (semantic-fetch-tags)
+	       ;; Look inside structures
+	       t
+	       ;; Don't search include files. Perhaps a later
+	       ;; revision?
+	       nil))
+    (if tok
+	(progn
+	  ;; Get the position of the token.
+	  (setq pos (semantic-tag-start tok))
+	  ;; Jump.
+	  ;; Because we only searched this buffer, we can assume the token is
+	  ;; also in this buffer.
+	  (goto-char pos)
+	  ;; Fancy stuff: Hightlight the token we jumped to.
+	  ;; This will automatically unhighlight the token later.
+	  (semantic-momentary-highlight-token tok)
+	  )
+      (error "No tag %s found" name)
+      )))
+
+(defcustom se-summary-function 'semantic-format-tag-uml-prototype
+  "*Function to use when showing info about a token for Examples.
+Shows how to:
+  * Create a customization variable."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+(defun se-show (name)
+  "Show important information about some token with NAME.
+Shows how to:
+ * Create a variable with `semantic-format-tag-functions'.
+ * Create the colorized text."
+  (interactive (list (semantic-read-symbol "Symbol: ")))
+  (let ((tok (semantic-find-first-tag-by-name name (current-buffer) t))
+	parent
+	msg)
+    (if tok
+	(save-excursion
+	  ;; Token text functions can take a PARENT argument.  To find this
+	  ;; really quickly, jump to TOK, then use the overlay mechanism to
+	  ;; Find it.
+	  (goto-char (semantic-tag-start tok))
+	  (setq parent (semantic-current-tag-parent))
+	  ;; Create a message
+	  (setq msg (funcall se-summary-function tok parent t))
+	  ;; Display it
+	  (message msg)))))
+
+(defun se-db-apropos-show (name)
+  "Show information about several tokens matching NAME using semanticdb.
+Shows how to:
+  * Query the database.
+  * Decode the databases' output."
+  (interactive
+   (list (read-string "Symbol: "
+		      ;; Current symbol is the default
+		      (car (reverse (semantic-ctxt-current-symbol))))))
+  (let ((tok (semanticdb-deep-find-tags-by-name-regexp
+	      name
+	      ;; The current list of active databases for this file.
+	      ;; This is the same as passing `nil'
+	      (semanticdb-current-database-list)
+	      t   ;; When a token is found, make sure it is
+	          ;; an active buffer.
+	      )))
+    ;; Each entry in the database is a list
+    ;; starting with the database a token was found in,
+    ;; followed by the tokens found.
+    (message
+     (mapconcat
+      ;; Outer lambda: Decode the database search format.
+      (lambda (db-list)
+	(mapconcat
+	 ;; Inner lambda: Convert found tokens into text.
+	 (lambda (tok)
+	   (funcall se-summary-function
+		    tok
+		    nil
+		    t))
+	 ;; The first element is the database.  The second is a token.
+	 (cdr db-list)
+	 "\n"))
+      tok
+      "\n"))
+    ))
+
+
+(provide 'semantic-example)
+
+;;; semantic-example.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-find.el b/site/cedet-1.0pre7/semantic/semantic-find.el
new file mode 100644
index 0000000..3a74380
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-find.el
@@ -0,0 +1,853 @@
+;;; semantic-find.el --- Search routines
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-find.el,v 1.28 2009/09/11 23:38:08 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Routines for searching through lists of tags.
+;; There are several groups of tag search routines:
+;;
+;; 1) semantic-brute-find-tag-by-*
+;;    These routines use brute force hierarchical search to scan
+;;    through lists of tags.  They include some parameters
+;;    used for compatibility with the semantic 1.x search routines.
+;;
+;; 1.5) semantic-brute-find-first-tag-by-*
+;;    Like 1, except seraching stops on the first match for the given
+;;    information.
+;;
+;; 2) semantic-find-tag-by-*
+;;    These prefered search routines attempt to scan through lists
+;;    in an intelligent way based on questions asked.
+;;
+;; 3) semantic-find-*-overlay
+;;    These routines use overlays to return tags based on a buffer position.
+;;
+;; 4) ...
+
+(require 'semantic-tag)
+
+;;; Code:
+
+;;; Overlay Search Routines
+;;
+;; These routines provide fast access to tokens based on a buffer that
+;; has parsed tokens in it.  Uses overlays to perform the hard work.
+;;
+;;;###autoload
+(defun semantic-find-tag-by-overlay (&optional positionormarker buffer)
+  "Find all tags covering POSITIONORMARKER by using overlays.
+If POSITIONORMARKER is nil, use the current point.
+Optional BUFFER is used if POSITIONORMARKER is a number, otherwise the current
+buffer is used.  This finds all tags covering the specified position
+by checking for all overlays covering the current spot.  They are then sorted
+from largest to smallest via the start location."
+  (save-excursion
+    (when positionormarker
+      (if (markerp positionormarker)
+	  (set-buffer (marker-buffer positionormarker))
+	(if (bufferp buffer)
+	    (set-buffer buffer))))
+    (let ((ol (semantic-overlays-at (or positionormarker (point))))
+	  (ret nil))
+      (while ol
+	(let ((tmp (semantic-overlay-get (car ol) 'semantic)))
+	  (when (and tmp
+		     ;; We don't need with-position because no tag w/out
+		     ;; a position could exist in an overlay.
+		     (semantic-tag-p tmp))
+	    (setq ret (cons tmp ret))))
+	(setq ol (cdr ol)))
+      (sort ret (lambda (a b) (< (semantic-tag-start a)
+				 (semantic-tag-start b)))))))
+
+;;;###autoload
+(defun semantic-find-tag-by-overlay-in-region (start end &optional buffer)
+  "Find all tags which exist in whole or in part between START and END.
+Uses overlays to determine positin.
+Optional BUFFER argument specifies the buffer to use."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (let ((ol (semantic-overlays-in start end))
+	  (ret nil))
+      (while ol
+	(let ((tmp (semantic-overlay-get (car ol) 'semantic)))
+	  (when (and tmp
+		     ;; See above about position
+		     (semantic-tag-p tmp))
+	    (setq ret (cons tmp ret))))
+	(setq ol (cdr ol)))
+      (sort ret (lambda (a b) (< (semantic-tag-start a)
+				 (semantic-tag-start b)))))))
+
+;;;###autoload
+(defun semantic-find-tag-by-overlay-next (&optional start buffer)
+  "Find the next tag after START in BUFFER.
+If START is in an overlay, find the tag which starts next,
+not the current tag."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (if (not start) (setq start (point)))
+    (let ((os start) (ol nil))
+      (while (and os (< os (point-max)) (not ol))
+	(setq os (semantic-overlay-next-change os))
+	(when os
+	  ;; Get overlays at position
+	  (setq ol (semantic-overlays-at os))
+	  ;; find the overlay that belongs to semantic
+	  ;; and starts at the found position.
+	  (while (and ol (listp ol))
+	    (if (and (semantic-overlay-get (car ol) 'semantic)
+		     (semantic-tag-p
+		      (semantic-overlay-get (car ol) 'semantic))
+		     (= (semantic-overlay-start (car ol)) os))
+		(setq ol (car ol)))
+	    (when (listp ol) (setq ol (cdr ol))))))
+      ;; convert ol to a tag
+      (when (and ol (semantic-tag-p (semantic-overlay-get ol 'semantic)))
+	(semantic-overlay-get ol 'semantic)))))
+
+;;;###autoload
+(defun semantic-find-tag-by-overlay-prev (&optional start buffer)
+  "Find the next tag before START in BUFFER.
+If START is in an overlay, find the tag which starts next,
+not the current tag."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (if (not start) (setq start (point)))
+    (let ((os start) (ol nil))
+      (while (and os (> os (point-min)) (not ol))
+	(setq os (semantic-overlay-previous-change os))
+	(when os
+	  ;; Get overlays at position
+	  (setq ol (semantic-overlays-at (1- os)))
+	  ;; find the overlay that belongs to semantic
+	  ;; and ENDS at the found position.
+	  ;;
+	  ;; Use end because we are going backward.
+	  (while (and ol (listp ol))
+	    (if (and (semantic-overlay-get (car ol) 'semantic)
+		     (semantic-tag-p
+		      (semantic-overlay-get (car ol) 'semantic))
+		     (= (semantic-overlay-end (car ol)) os))
+		(setq ol (car ol)))
+	    (when (listp ol) (setq ol (cdr ol))))))
+      ;; convert ol to a tag
+      (when (and ol
+		 (semantic-tag-p (semantic-overlay-get ol 'semantic)))
+	(semantic-overlay-get ol 'semantic)))))
+
+;;;###autoload
+(defun semantic-find-tag-parent-by-overlay (tag)
+  "Find the parent of TAG by overlays.
+Overlays are a fast way of finding this information for active buffers."
+  (let ((tag (nreverse (semantic-find-tag-by-overlay
+			(semantic-tag-start tag)))))
+    ;; This is a lot like `semantic-current-tag-parent', but
+    ;; it uses a position to do it's work.  Assumes two tags don't share
+    ;; the same start unless they are siblings.
+    (car (cdr tag))))
+
+;;;###autoload
+(defun semantic-current-tag ()
+  "Return the current tag in the current buffer.
+If there are more than one in the same location, return the
+smallest tag.  Return nil if there is no tag here."
+  (car (nreverse (semantic-find-tag-by-overlay))))
+
+;;;###autoload
+(defun semantic-current-tag-parent ()
+  "Return the current tags parent in the current buffer.
+A tag's parent would be a containing structure, such as a type
+containing a field.  Return nil if there is no parent."
+  (car (cdr (nreverse (semantic-find-tag-by-overlay)))))
+
+;;;###autoload
+(defun semantic-current-tag-of-class (class)
+  "Return the current (smallest) tags of CLASS in the current buffer.
+If the smallest tag is not of type CLASS, keep going upwards until one
+is found.
+Uses `semantic-tag-class' for classification."
+  (let ((tags (nreverse (semantic-find-tag-by-overlay))))
+    (while (and tags
+		(not (eq (semantic-tag-class (car tags)) class)))
+      (setq tags (cdr tags)))
+    (car tags)))
+
+;;; Search Routines
+;;
+;; These are routines that search a single tags table.
+;;
+;; The original API (see COMPATIBILITY section below) in semantic 1.4
+;; had these usage statistics:
+;;
+;; semantic-find-nonterminal-by-name 17
+;; semantic-find-nonterminal-by-name-regexp 8  - Most doing completion
+;; semantic-find-nonterminal-by-position 13
+;; semantic-find-nonterminal-by-token 21
+;; semantic-find-nonterminal-by-type 2
+;; semantic-find-nonterminal-standard 1
+;;
+;; semantic-find-nonterminal-by-function (not in other searches)  1
+;;
+;; New API: As above w/out `search-parts' or `search-includes' arguments.
+;; Extra fcn: Specific to completion which is what -name-regexp is
+;;            mostly used for
+;;
+;; As for the sarguments "search-parts" and "search-includes" here
+;; are stats:
+;;
+;; search-parts: 4  - charting x2, find-doc, senator (sans db)
+;;
+;; Implement command to flatten a tag table.  Call new API Fcn w/
+;; flattened table for same results.
+;;
+;; search-include: 2 - analyze x2 (sans db)
+;;
+;; Not used effectively.  Not to be re-implemented here.
+
+(defsubst semantic--find-tags-by-function (predicate &optional table)
+  "Find tags for which PREDICATE is non-nil in TABLE.
+PREDICATE is a lambda expression which accepts on TAG.
+TABLE is a semantic tags table.  See `semantic-something-to-tag-table'."
+  (let ((tags (semantic-something-to-tag-table table))
+	(result nil))
+;    (mapc (lambda (tag) (and (funcall predicate tag)
+;			     (setq result (cons tag result))))
+;	  tags)
+    ;; A while loop is actually faster.  Who knew
+    (while tags
+      (and (funcall predicate (car tags))
+	   (setq result (cons (car tags) result)))
+      (setq tags (cdr tags)))
+    (nreverse result)))
+
+;; I can shave off some time by removing the funcall (see above)
+;; and having the question be inlined in the while loop.
+;; Strangely turning the upper level fcns into macros had a larger
+;; impact.
+(defmacro semantic--find-tags-by-macro (form &optional table)
+  "Find tags for which FORM is non-nil in TABLE.
+TABLE is a semantic tags table.  See `semantic-something-to-tag-table'."
+  `(let ((tags (semantic-something-to-tag-table ,table))
+         (result nil))
+     (while tags
+       (and ,form
+            (setq result (cons (car tags) result)))
+       (setq tags (cdr tags)))
+     (nreverse result)))
+
+;;; Top level Searches
+;;
+;;;###autoload
+(defsubst semantic-find-first-tag-by-name (name &optional table)
+  "Find the first tag with NAME in TABLE.
+NAME is a string.
+TABLE is a semantic tags table.  See `semantic-something-to-tag-table'.
+This routine uses `assoc' to quickly find the first matching entry."
+  (funcall (if semantic-case-fold 'assoc-ignore-case 'assoc)
+           name (semantic-something-to-tag-table table)))
+
+;;;###autoload
+(defmacro semantic-find-tags-by-name (name &optional table)
+  "Find all tags with NAME in TABLE.
+NAME is a string.
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  `(let ((case-fold-search semantic-case-fold))
+     (semantic--find-tags-by-macro
+      (string= ,name (semantic-tag-name (car tags)))
+      ,table)))
+
+;;;###autoload
+(defmacro semantic-find-tags-for-completion (prefix &optional table)
+  "Find all tags whos name begins with PREFIX in TABLE.
+PREFIX is a string.
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+While it would be nice to use `try-completion' or `all-completions',
+those functions do not return the tags, only a string.
+Uses `compare-strings' for fast comparison."
+  `(let ((l (length ,prefix)))
+     (semantic--find-tags-by-macro
+      (eq (compare-strings ,prefix 0 nil
+			   (semantic-tag-name (car tags)) 0 l
+			   semantic-case-fold)
+	  t)
+      ,table)))
+
+;;;###autoload
+(defmacro semantic-find-tags-by-name-regexp (regexp &optional table)
+  "Find all tags with name matching REGEXP in TABLE.
+REGEXP is a string containing a regular expression,
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+Consider using `semantic-find-tags-for-completion' if you are
+attempting to do completions."
+  `(let ((case-fold-search semantic-case-fold))
+     (semantic--find-tags-by-macro
+      (string-match ,regexp (semantic-tag-name (car tags)))
+      ,table)))
+
+;;;###autoload
+(defmacro semantic-find-tags-by-class (class &optional table)
+  "Find all tags of class CLASS in TABLE.
+CLASS is a symbol representing the class of the token, such as
+'variable, of 'function..
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  `(semantic--find-tags-by-macro
+    (eq ,class (semantic-tag-class (car tags)))
+    ,table))
+
+;;;###autoload
+(defmacro semantic-find-tags-by-type (type &optional table)
+  "Find all tags of with a type TYPE in TABLE.
+TYPE is a string or tag representing a data type as defined in the
+language the tags were parsed from, such as \"int\", or perhaps
+a tag whose name is that of a struct or class.
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  `(semantic--find-tags-by-macro
+    (semantic-tag-of-type-p (car tags) ,type)
+    ,table))
+
+;;;###autoload
+(defmacro semantic-find-tags-of-compound-type (&optional table)
+  "Find all tags which are a compound type in TABLE.
+Compound types are structures, or other data type which
+is not of a primitive nature, such as int or double.
+Used in completion."
+  `(semantic--find-tags-by-macro
+    (semantic-tag-type-compound-p (car tags))
+    ,table))
+
+;;;###autoload
+(define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table)
+  "Find all tags accessable by SCOPEPROTECTION.
+SCOPEPROTECTION is a symbol which can be returned by the method
+`semantic-tag-protection'.  A hard-coded order is used to determine a match.
+PARENT is a tag representing the PARENT slot needed for
+`semantic-tag-protection'.
+TABLE is a list of tags (a subset of PARENT members) to scan.  If TABLE is nil,
+the type members of PARENT are used.
+See `semantic-tag-protected-p' for details on which tags are returned."
+  (if (not (eq (semantic-tag-class parent) 'type))
+      (signal 'wrong-type-argument '(semantic-find-tags-by-scope-protection
+				     parent
+				     semantic-tag-class type))
+    (:override)))
+
+(defun semantic-find-tags-by-scope-protection-default
+  (scopeprotection parent &optional table)
+  "Find all tags accessable by SCOPEPROTECTION.
+SCOPEPROTECTION is a symbol which can be returned by the method
+`semantic-tag-protection'.  A hard-coded order is used to determine a match.
+PARENT is a tag representing the PARENT slot needed for
+`semantic-tag-protection'.
+TABLE is a list of tags (a subset of PARENT members) to scan.  If TABLE is nil,
+the type members of PARENT are used.
+See `semantic-tag-protected-p' for details on which tags are returned."
+    (if (not table) (setq table (semantic-tag-type-members parent)))
+    (if (null scopeprotection)
+	table
+      (semantic--find-tags-by-macro
+       (not (semantic-tag-protected-p (car tags) scopeprotection parent))
+       table)))
+
+;;;###autoload
+(defsubst semantic-find-tags-included (&optional table)
+  "Find all tags in TABLE that are of the 'include class.
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  (semantic-find-tags-by-class 'include table))
+
+;;; Deep Searches
+;;
+
+;;;###autoload
+(defmacro semantic-deep-find-tags-by-name (name &optional table)
+  "Find all tags with NAME in TABLE.
+Search in top level tags, and their components, in TABLE.
+NAME is a string.
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-by-name'."
+  `(semantic-find-tags-by-name
+    ,name (semantic-flatten-tags-table ,table)))
+
+;;;###autoload
+(defmacro semantic-deep-find-tags-for-completion (prefix &optional table)
+  "Find all tags whos name begins with PREFIX in TABLE.
+Search in top level tags, and their components, in TABLE.
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-for-completion'."
+  `(semantic-find-tags-for-completion
+    ,prefix (semantic-flatten-tags-table ,table)))
+
+;;;###autoload
+(defmacro semantic-deep-find-tags-by-name-regexp (regexp &optional table)
+  "Find all tags with name matching REGEXP in TABLE.
+Search in top level tags, and their components, in TABLE.
+REGEXP is a string containing a regular expression,
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-by-name-regexp'.
+Consider using `semantic-deep-find-tags-for-completion' if you are
+attempting to do completions."
+  `(semantic-find-tags-by-name-regexp
+    ,regexp (semantic-flatten-tags-table ,table)))
+
+;;; Specialty Searches
+;;
+(defun semantic-find-tags-external-children-of-type (type &optional table)
+  "Find all tags in whose parent is TYPE in TABLE.
+These tags are defined outside the scope of the original TYPE declaration.
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  (semantic--find-tags-by-macro
+   (equal (semantic-tag-external-member-parent (car tags))
+	  type)
+   table))
+
+(defun semantic-find-tags-subclasses-of-type (type &optional table)
+  "Find all tags of class type in whose parent is TYPE in TABLE.
+These tags are defined outside the scope of the original TYPE declaration.
+TABLE is a tag table.  See `semantic-something-to-tag-table'."
+  (semantic--find-tags-by-macro
+   (and (eq (semantic-tag-class (car tags)) 'type)
+	(or (member type (semantic-tag-type-superclasses (car tags)))
+	    (member type (semantic-tag-type-interfaces (car tags)))))
+   table))
+
+;;
+;; ************************** Compatibility ***************************
+;;
+
+;;; Old Style Brute Force Search Routines
+;;
+;; These functions will search through tags lists explicity for
+;; desired information.
+
+;; The -by-name nonterminal search can use the built in fcn
+;; `assoc', which is faster than looping ourselves, so we will
+;; not use `semantic-brute-find-tag-by-function' to do this,
+;; instead erroring on the side of speed.
+
+;;;###autoload
+(defun semantic-brute-find-first-tag-by-name
+  (name streamorbuffer &optional search-parts search-include)
+  "Find a tag NAME within STREAMORBUFFER.  NAME is a string.
+If SEARCH-PARTS is non-nil, search children of tags.
+If SEARCH-INCLUDE was never implemented.
+
+Use `semantic-find-first-tag-by-name' instead."
+  (let* ((stream (semantic-something-to-tag-table streamorbuffer))
+         (assoc-fun (if semantic-case-fold
+                        #'assoc-ignore-case
+                      #'assoc))
+	 (m (funcall assoc-fun name stream)))
+    (if m
+	m
+      (let ((toklst stream)
+	    (children nil))
+	(while (and (not m) toklst)
+	  (if search-parts
+	      (progn
+		(setq children (semantic-tag-components-with-overlays
+				(car toklst)))
+		(if children
+		    (setq m (semantic-brute-find-first-tag-by-name
+			     name children search-parts search-include)))))
+	  (setq toklst (cdr toklst)))
+	(if (not m)
+	    ;; Go to dependencies, and search there.
+	    nil)
+	m))))
+
+;;;###autoload
+(defmacro semantic-brute-find-tag-by-class
+  (class streamorbuffer &optional search-parts search-includes)
+  "Find all tags with a class CLASS within STREAMORBUFFER.
+CLASS is a symbol representing the class of the tags to find.
+See `semantic-tag-class'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+Use `semantic-find-tag-by-class' instead."
+  `(semantic-brute-find-tag-by-function
+    (lambda (tag) (eq ,class (semantic-tag-class tag)))
+    ,streamorbuffer ,search-parts ,search-includes))
+
+;;;###autoload
+(defmacro semantic-brute-find-tag-standard
+  (streamorbuffer &optional search-parts search-includes)
+  "Find all tags in STREAMORBUFFER which define simple class types.
+See `semantic-tag-class'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  `(semantic-brute-find-tag-by-function
+    (lambda (tag) (member (semantic-tag-class tag)
+			  '(function variable type)))
+    ,streamorbuffer ,search-parts ,search-includes))
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-type
+  (type streamorbuffer &optional search-parts search-includes)
+  "Find all tags with type TYPE within STREAMORBUFFER.
+TYPE is a string which is the name of the type of the tags returned.
+See `semantic-tag-type'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag)
+     (let ((ts (semantic-tag-type tag)))
+       (if (and (listp ts)
+		(or (= (length ts) 1)
+		    (eq (semantic-tag-class ts) 'type)))
+	   (setq ts (semantic-tag-name ts)))
+       (equal type ts)))
+   streamorbuffer search-parts search-includes))
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-type-regexp
+  (regexp streamorbuffer &optional search-parts search-includes)
+  "Find all tags with type matching REGEXP within STREAMORBUFFER.
+REGEXP is a regular expression  which matches the  name of the type of the
+tags returned.  See `semantic-tag-type'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag)
+     (let ((ts (semantic-tag-type tag)))
+       (if (listp ts)
+	   (setq ts
+		 (if (eq (semantic-tag-class ts) 'type)
+		     (semantic-tag-name ts)
+		   (car ts))))
+       (and ts (string-match regexp ts))))
+   streamorbuffer search-parts search-includes))
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-name-regexp
+  (regex streamorbuffer &optional search-parts search-includes)
+  "Find all tags whose name match REGEX in STREAMORBUFFER.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag) (string-match regex (semantic-tag-name tag)))
+    streamorbuffer search-parts search-includes)
+  )
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-property
+  (property value streamorbuffer &optional search-parts search-includes)
+  "Find all tags with PROPERTY equal to VALUE in STREAMORBUFFER.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag) (equal (semantic--tag-get-property tag property) value))
+   streamorbuffer search-parts search-includes)
+  )
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-attribute
+  (attr streamorbuffer &optional search-parts search-includes)
+  "Find all tags with a given ATTR in STREAMORBUFFER.
+ATTR is a symbol key into the attributes list.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag) (semantic-tag-get-attribute tag attr))
+   streamorbuffer search-parts search-includes)
+  )
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-attribute-value
+  (attr value streamorbuffer &optional search-parts search-includes)
+  "Find all tags with a given ATTR equal to VALUE in STREAMORBUFFER.
+ATTR is a symbol key into the attributes list.
+VALUE is the value that ATTR should match.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'."
+  (semantic-brute-find-tag-by-function
+   (lambda (tag) (equal (semantic-tag-get-attribute tag attr) value))
+   streamorbuffer search-parts search-includes)
+  )
+
+;;;###autoload
+(defun semantic-brute-find-tag-by-function
+  (function streamorbuffer &optional search-parts search-includes)
+  "Find all tags for which FUNCTION's value is non-nil within STREAMORBUFFER.
+FUNCTION must return non-nil if an element of STREAM will be included
+in the new list.
+
+If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags
+are searched.  The overloadable function `semantic-tag-componenets' is
+used for the searching child lists.  If SEARCH-PARTS is the symbol
+'positiononly, then only children that have positional information are
+searched.
+
+If SEARCH-INCLUDES has not been implemented.
+This parameter hasn't be active for a while and is obsolete."
+  (let ((stream (semantic-something-to-tag-table streamorbuffer))
+	(sl nil)			;list of tag children
+	(nl nil)			;new list
+        (case-fold-search semantic-case-fold))
+    (dolist (tag stream)
+      (if (not (semantic-tag-p tag))
+	  ;; `semantic-tag-components-with-overlays' can return invalid
+	  ;; tags if search-parts is not equal to 'positiononly
+	  nil ;; Ignore them!
+	(if (funcall function tag)
+	    (setq nl (cons tag nl)))
+	(and search-parts
+	     (setq sl (if (eq search-parts 'positiononly)
+			  (semantic-tag-components-with-overlays tag)
+			(semantic-tag-components tag))
+		   )
+	     (setq nl (nconc nl
+			     (semantic-brute-find-tag-by-function
+			      function sl
+			      search-parts))))))
+    (setq nl (nreverse nl))
+    nl))
+
+;;;###autoload
+(defun semantic-brute-find-first-tag-by-function
+  (function streamorbuffer &optional search-parts search-includes)
+  "Find the first tag which FUNCTION match within STREAMORBUFFER.
+FUNCTION must return non-nil if an element of STREAM will be included
+in the new list.
+
+The following parameters were never implemented.
+
+If optional argument SEARCH-PARTS, all sub-parts of tags are searched.
+The overloadable function `semantic-tag-components' is used for
+searching.
+If SEARCH-INCLUDES is non-nil, then all include files are also
+searched for matches."
+  (let ((stream (semantic-something-to-tag-table streamorbuffer))
+	(found nil)
+        (case-fold-search semantic-case-fold))
+    (while (and (not found) stream)
+      (if (funcall function (car stream))
+	  (setq found (car stream)))
+      (setq stream (cdr stream)))
+    found))
+
+
+;;; Old Positional Searches
+;;
+;; Are these useful anymore?
+;;
+;;;###autoload
+(defun semantic-brute-find-tag-by-position (position streamorbuffer
+						     &optional nomedian)
+  "Find a tag covering POSITION within STREAMORBUFFER.
+POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
+the median calculation, and return nil."
+  (save-excursion
+    (if (markerp position) (set-buffer (marker-buffer position)))
+    (let* ((stream (if (bufferp streamorbuffer)
+		       (save-excursion
+			 (set-buffer streamorbuffer)
+			 (semantic-fetch-tags))
+		     streamorbuffer))
+	   (prev nil)
+	   (found nil))
+      (while (and stream (not found))
+	;; perfect fit
+	(if (and (>= position (semantic-tag-start (car stream)))
+		 (<= position (semantic-tag-end (car stream))))
+	    (setq found (car stream))
+	  ;; Median between to objects.
+	  (if (and prev (not nomedian)
+		   (>= position (semantic-tag-end prev))
+		   (<= position (semantic-tag-start (car stream))))
+	      (let ((median (/ (+ (semantic-tag-end prev)
+				  (semantic-tag-start (car stream)))
+			       2)))
+		(setq found
+		      (if (> position median)
+			  (car stream)
+			prev)))))
+	;; Next!!!
+	(setq prev (car stream)
+	      stream (cdr stream)))
+      found)))
+
+;;;###autoload
+(defun semantic-brute-find-innermost-tag-by-position
+  (position streamorbuffer &optional nomedian)
+  "Find a list of tags covering POSITION within STREAMORBUFFER.
+POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
+the median calculation, and return nil.
+This function will find the topmost item, and recurse until no more
+details are available of findable."
+  (let* ((returnme nil)
+	 (current (semantic-brute-find-tag-by-position
+		   position streamorbuffer nomedian))
+	 (nextstream (and current
+			  (if (eq (semantic-tag-class current) 'type)
+			      (semantic-tag-type-members current)
+			    nil))))
+    (while nextstream
+      (setq returnme (cons current returnme))
+      (setq current (semantic-brute-find-tag-by-position
+		     position nextstream nomedian))
+      (setq nextstream (and current
+			    ;; NOTE TO SELF:
+			    ;; Looking at this after several years away,
+			    ;; what does this do???
+			    (if (eq (semantic-tag-class current) 'token)
+				(semantic-tag-type-members current)
+			      nil))))
+    (nreverse (cons current returnme))))
+
+;;; Compatibility Aliases
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay
+			 'semantic-find-tag-by-overlay)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-in-region
+			 'semantic-find-tag-by-overlay-in-region)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-next
+			 'semantic-find-tag-by-overlay-next)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-prev
+			 'semantic-find-tag-by-overlay-prev)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-parent-by-overlay
+			 'semantic-find-tag-parent-by-overlay)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-current-nonterminal
+			 'semantic-current-tag)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-current-nonterminal-parent
+			 'semantic-current-tag-parent)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-current-nonterminal-of-type
+			 'semantic-current-tag-of-class)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-name
+			 'semantic-brute-find-first-tag-by-name)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-token
+			 'semantic-brute-find-tag-by-class)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-standard
+			 'semantic-brute-find-tag-standard)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-type
+			 'semantic-brute-find-tag-by-type)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-type-regexp
+			 'semantic-brute-find-tag-by-type-regexp)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-name-regexp
+			 'semantic-brute-find-tag-by-name-regexp)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-property
+			 'semantic-brute-find-tag-by-property)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-extra-spec
+			 'semantic-brute-find-tag-by-attribute)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-extra-spec-value
+			 'semantic-brute-find-tag-by-attribute-value)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-function
+			 'semantic-brute-find-tag-by-function)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-function-first-match
+			 'semantic-brute-find-first-tag-by-function)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-position
+			 'semantic-brute-find-tag-by-position)
+
+;;;###autoload
+(semantic-alias-obsolete 'semantic-find-innermost-nonterminal-by-position
+			 'semantic-brute-find-innermost-tag-by-position)
+
+;;; TESTING
+;;
+(defun semantic-find-benchmark ()
+  "Run some simple benchmarks to see how we are doing.
+Optional argument ARG is the number of iterations to run."
+  (interactive)
+  (require 'benchmark)
+  (let ((f-name nil)
+	(b-name nil)
+	(f-comp)
+	(b-comp)
+	(f-regex)
+	)
+    (garbage-collect)
+    (setq f-name
+	  (benchmark-run-compiled
+	      1000 (semantic-find-first-tag-by-name "class3"
+						    "test/test.cpp")))
+    (garbage-collect)
+    (setq b-name
+	  (benchmark-run-compiled
+	      1000 (semantic-brute-find-first-tag-by-name "class3"
+							  "test/test.cpp")))
+    (garbage-collect)
+    (setq f-comp
+	  (benchmark-run-compiled
+	      1000 (semantic-find-tags-for-completion "method"
+						      "test/test.cpp")))
+    (garbage-collect)
+    (setq b-comp
+	  (benchmark-run-compiled
+	      1000 (semantic-brute-find-tag-by-name-regexp "^method"
+							   "test/test.cpp")))
+    (garbage-collect)
+    (setq f-regex
+	  (benchmark-run-compiled
+	      1000 (semantic-find-tags-by-name-regexp "^method"
+						      "test/test.cpp")))
+
+    (message "Name [new old] [ %.3f %.3f ] Complete [newc/new old] [ %.3f/%.3f %.3f ]"
+	     (car f-name) (car b-name)
+	     (car f-comp) (car f-regex)
+	     (car b-comp))
+  ))
+
+
+(provide 'semantic-find)
+
+;;; semantic-find.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-format.el b/site/cedet-1.0pre7/semantic/semantic-format.el
new file mode 100644
index 0000000..562f044
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-format.el
@@ -0,0 +1,797 @@
+;;; semantic-format.el --- Routines for formatting tags
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-format.el,v 1.36 2009/09/15 00:18:35 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Once a language file has been parsed into a TAG, it is often useful
+;; then display that tag information in browsers, completion engines, or
+;; help routines.  The functions and setup in this file provide ways
+;; to reformat a tag into different standard output types.
+;;
+;; In addition, macros for setting up customizable variables that let
+;; the user choose their default format type are also provided.
+;;
+
+;;; Code:
+(eval-when-compile (require 'font-lock))
+(require 'semantic-tag)
+(require 'ezimage)
+
+;;; Tag to text overload functions
+;;
+;; abbreviations, prototypes, and coloring support.
+;;;###autoload
+(defvar semantic-format-tag-functions
+  '(semantic-format-tag-name
+    semantic-format-tag-canonical-name
+    semantic-format-tag-abbreviate
+    semantic-format-tag-summarize
+    semantic-format-tag-summarize-with-file
+    semantic-format-tag-short-doc
+    semantic-format-tag-prototype
+    semantic-format-tag-concise-prototype
+    semantic-format-tag-uml-abbreviate
+    semantic-format-tag-uml-prototype
+    semantic-format-tag-uml-concise-prototype
+    semantic-format-tag-prin1
+    )
+  "List of functions which convert a tag to text.
+Each function must take the parameters TAG &optional PARENT COLOR.
+TAG is the tag to convert.
+PARENT is a parent tag or name which refers to the structure
+or class which contains TAG.  PARENT is NOT a class which a TAG
+would claim as a parent.
+COLOR indicates that the generated text should be colored using
+`font-lock'.")
+
+;;;###autoload
+(semantic-varalias-obsolete 'semantic-token->text-functions
+			    'semantic-format-tag-functions)
+;;;###autoload
+(defvar semantic-format-tag-custom-list
+  (append '(radio)
+	  (mapcar (lambda (f) (list 'const f))
+		  semantic-format-tag-functions)
+	  '(function))
+  "A List used by customizeable variables to choose a tag to text function.
+Use this variable in the :type field of a customizable variable.")
+
+(semantic-varalias-obsolete 'semantic-token->text-custom-list
+			    'semantic-format-tag-custom-list)
+
+(defcustom semantic-format-use-images-flag ezimage-use-images
+  "Non-nil means semantic format functions use images.
+Images can be used as icons instead of some types of text strings."
+  :group 'semantic
+  :type 'boolean)
+
+(defvar semantic-function-argument-separator ","
+  "Text used to separate arguments when creating text from tags.")
+(make-variable-buffer-local 'semantic-function-argument-separator)
+
+(defvar semantic-format-parent-separator "::"
+  "Text used to separate names when between namespaces/classes and functions.")
+(make-variable-buffer-local 'semantic-format-parent-separator)
+
+(defvar semantic-format-face-alist
+  `( (function . font-lock-function-name-face)
+     (variable . font-lock-variable-name-face)
+     (type . font-lock-type-face)
+     ;; These are different between Emacsen.
+     (include . ,(if (featurep 'xemacs)
+		     'font-lock-preprocessor-face
+		   'font-lock-constant-face))
+     (package . ,(if (featurep 'xemacs)
+		     'font-lock-preprocessor-face
+		   'font-lock-constant-face))
+     ;; Not a tag, but instead a feature of output
+     (label . font-lock-string-face)
+     (comment . font-lock-comment-face)
+     (keyword . font-lock-keyword-face)
+     (abstract . italic)
+     (static . underline)
+     (documentation . font-lock-doc-face)
+     )
+  "Face used to colorize tags of different types.
+Override the value locally if a language supports other tag types.
+When adding new elements, try to use symbols also returned by the parser.
+The form of an entry in this list is of the form:
+ ( SYMBOL .  FACE )
+where SYMBOL is a tag type symbol used with semantic.  FACE
+is a symbol representing a face.
+Faces used are generated in `font-lock' for consistency, and will not
+be used unless font lock is a feature.")
+
+(semantic-varalias-obsolete 'semantic-face-alist
+			    'semantic-format-face-alist)
+
+
+
+;;; Coloring Functions
+;;
+(defun semantic--format-colorize-text (text face-class)
+  "Apply onto TEXT a color associated with FACE-CLASS.
+FACE-CLASS is a tag type found in `semantic-face-alist'.  See this variable
+for details on adding new types."
+  (if (featurep 'font-lock)
+      (let ((face (cdr-safe (assoc face-class semantic-format-face-alist)))
+	    (newtext (concat text)))
+	(put-text-property 0 (length text) 'face face newtext)
+	newtext)
+    text))
+
+(make-obsolete 'semantic-colorize-text
+	       'semantic--format-colorize-text)
+
+(defun semantic--format-colorize-merge-text (precoloredtext face-class)
+  "Apply onto PRECOLOREDTEXT a color associated with FACE-CLASS.
+FACE-CLASS is a tag type found in 'semantic-face-alist'.  See this
+variable for details on adding new types."
+  (let ((face (cdr-safe (assoc face-class semantic-format-face-alist)))
+	(newtext (concat precoloredtext))
+	)
+    (if (featurep 'xemacs)
+	(add-text-properties 0 (length newtext) (list 'face face) newtext)
+      (alter-text-property 0 (length newtext) 'face
+			   (lambda (current-face)
+			     (let ((cf
+				    (cond ((facep current-face)
+					   (list current-face))
+					  ((listp current-face)
+					   current-face)
+					  (t nil)))
+				   (nf
+				    (cond ((facep face)
+					   (list face))
+					  ((listp face)
+					   face)
+					  (t nil))))
+			       (append cf nf)))
+			   newtext))
+    newtext))
+
+;;; Function Arguments
+;;
+(defun semantic--format-tag-arguments (args formatter color)
+  "Format the argument list ARGS with FORMATTER.
+FORMATTER is a function used to format a tag.
+COLOR specifies if color should be used."
+  (let ((out nil))
+    (while args
+      (push (if (and formatter
+		     (semantic-tag-p (car args))
+		     (not (string= (semantic-tag-name (car args)) ""))
+		     )
+		(funcall formatter (car args) nil color)
+	      (semantic-format-tag-name-from-anything
+	       (car args) nil color 'variable))
+	    out)
+      (setq args (cdr args)))
+    (mapconcat 'identity (nreverse out) semantic-function-argument-separator)
+    ))
+
+;;; Data Type
+;;
+;;;###autoload
+(define-overloadable-function semantic-format-tag-type (tag color)
+  "Convert the data type of TAG to a string usable in tag formatting.
+It is presumed that TYPE is a string or semantic tag.")
+
+(defun semantic-format-tag-type-default (tag color)
+  "Convert the data type of TAG to a string usable in tag formatting.
+Argument COLOR specifies to colorize the text."
+  (let* ((type (semantic-tag-type tag))
+	 (out (cond ((semantic-tag-p type)
+		     (let* ((typetype (semantic-tag-type type))
+			    (name (semantic-tag-name type))
+			    (str (if typetype
+				     (concat typetype " " name)
+				   name)))
+		       (if color
+			   (semantic--format-colorize-text
+			    str
+			    'type)
+			 str)))
+		    ((and (listp type)
+			  (stringp (car type)))
+		     (car type))
+		    ((stringp type)
+		     type)
+		    (t nil))))
+    (if (and color out)
+	(setq out (semantic--format-colorize-text out 'type))
+      out)
+    ))
+
+
+;;; Abstract formatting functions
+;;
+
+;;;###autoload
+(defun semantic-format-tag-prin1 (tag &optional parent color)
+  "Convert TAG to a string that is the print name for TAG.
+PARENT and COLOR are ignored."
+  (format "%S" tag))
+
+(defun semantic-format-tag-name-from-anything (anything &optional
+							parent color
+							colorhint)
+  "Convert just about anything into a name like string.
+Argument ANYTHING is the thing to be converted.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+Optional COLORHINT is the type of color to use if ANYTHING is not a tag
+with a tag class.  See `semantic--format-colorize-text' for a definition
+of FACE-CLASS for which this is used."
+  (cond ((stringp anything)
+	 (semantic--format-colorize-text anything colorhint))
+	((semantic-tag-p anything)
+	 (let ((ans (semantic-format-tag-name anything parent color)))
+	   ;; If ANS is empty string or nil, then the name wasn't
+	   ;; supplied.  The implication is as in C where there is a data
+	   ;; type but no name for a prototype from an include file, or
+	   ;; an argument just wasn't used in the body of the fcn.
+	   (if (or (null ans) (string= ans ""))
+	       (setq ans (semantic-format-tag-type anything color)))
+	   ans))
+	((and (listp anything)
+	      (stringp (car anything)))
+	 (semantic--format-colorize-text (car anything) colorhint))))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-name (tag &optional parent color)
+  "Return the name string describing TAG.
+The name is the shortest possible representation.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-name-default (tag &optional parent color)
+  "Return an abbreviated string describing TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let ((name (semantic-tag-name tag))
+	(destructor
+	 (if (eq (semantic-tag-class tag) 'function)
+	     (semantic-tag-function-destructor-p tag))))
+    (when destructor
+      (setq name (concat "~" name)))
+    (if color
+	(setq name (semantic--format-colorize-text name (semantic-tag-class tag))))
+    name))
+
+(defun semantic--format-tag-parent-tree (tag parent)
+  "Under Consideration.
+
+Return a list of parents for TAG.
+PARENT is the first parent, or nil.  If nil, then an attempt to
+determine PARENT is made.
+Once PARENT is identified, additional parents are looked for.
+The return list first element is the nearest parent, and the last
+item is the first parent which may be a string.  The root parent may
+not be the actual first parent as there may just be a failure to find
+local definitions."
+  ;; First, validate the PARENT argument.
+  (unless parent
+    ;; All mechanisms here must be fast as often parent
+    ;; is nil because there isn't one.
+    (setq parent (or (semantic-tag-function-parent tag)
+		     (save-excursion
+		       (semantic-go-to-tag tag)
+		       (semantic-current-tag-parent)))))
+  (when (stringp parent)
+    (setq parent (semantic-find-first-tag-by-name
+		  parent (current-buffer))))
+  ;; Try and find a trail of parents from PARENT
+  (let ((rlist (list parent))
+	)
+    ;; IMPLELEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    (reverse rlist)))
+
+(define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
+  "Return a canonical name for TAG.
+A canonical name includes the names of any parents or namespaces preceeding
+the tag.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-canonical-name-default (tag &optional parent color)
+  "Return a canonical name for TAG.
+A canonical name includes the names of any parents or namespaces preceeding
+the tag with colons separating them.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let ((parent-input-str
+	 (if (and parent
+		  (semantic-tag-p parent)
+		  (semantic-tag-of-class-p parent 'type))
+	     (concat
+	      ;; Choose a class of 'type as the default parent for something.
+	      ;; Just a guess though.
+	      (semantic-format-tag-name-from-anything parent nil color 'type)
+	      ;; Default separator between class/namespace and others.
+	      semantic-format-parent-separator)
+	   ""))
+	(tag-parent-str
+	 (or (when (and (semantic-tag-of-class-p tag 'function)
+			(semantic-tag-function-parent tag))
+	       (concat (semantic-tag-function-parent tag)
+		       semantic-format-parent-separator))
+	     ""))
+	)
+    (concat parent-input-str
+	    tag-parent-str
+	    (semantic-format-tag-name tag parent color))
+    ))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-abbreviate (tag &optional parent color)
+  "Return an abbreviated string describing TAG.
+The abbreviation is to be short, with possible symbols indicating
+the type of tag, or other information.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-abbreviate-default (tag &optional parent color)
+  "Return an abbreviated string describing TAG.
+Optional argument PARENT is a parent tag in the tag hierarchy.
+In this case PARENT refers to containment, not inheritance.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+This is a simple C like default."
+  ;; Do lots of complex stuff here.
+  (let ((class (semantic-tag-class tag))
+	(name (semantic-format-tag-canonical-name tag parent color))
+	(suffix "")
+	(prefix "")
+	str)
+    (cond ((eq class 'function)
+	   (setq suffix "()"))
+	  ((eq class 'include)
+	   (setq suffix "<>"))
+	  ((eq class 'variable)
+	   (setq suffix (if (semantic-tag-variable-default tag)
+			    "=" "")))
+	  ((eq class 'label)
+	   (setq suffix ":"))
+	  ((eq class 'code)
+	   (setq prefix "{"
+		 suffix "}"))
+	  ((eq class 'type)
+	   (setq suffix "{}"))
+	  )
+    (setq str (concat prefix name suffix))
+    str))
+
+;; Semantic 1.2.x had this misspelling.  Keep it for backwards compatibiity.
+(semantic-alias-obsolete
+ 'semantic-summerize-nonterminal 'semantic-format-tag-summarize)
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-summarize (tag &optional parent color)
+  "Summarize TAG in a reasonable way.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-summarize-default (tag &optional parent color)
+  "Summarize TAG in a reasonable way.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((proto (semantic-format-tag-prototype tag nil color))
+	 (names (if parent
+		    semantic-symbol->name-assoc-list-for-type-parts
+		  semantic-symbol->name-assoc-list))
+	 (tsymb (semantic-tag-class tag))
+	 (label (capitalize (or (cdr-safe (assoc tsymb names))
+				(symbol-name tsymb)))))
+    (if color
+	(setq label (semantic--format-colorize-text label 'label)))
+    (concat label ": " proto)))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-summarize-with-file (tag &optional parent color)
+  "Like `semantic-format-tag-summarize', but with the file name.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-summarize-with-file-default (tag &optional parent color)
+  "Summarize TAG in a reasonable way.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((proto (semantic-format-tag-prototype tag nil color))
+	 (file (semantic-tag-file-name tag))
+	 )
+    ;; Nothing for tag?  Try parent.
+    (when (and (not file) (and parent))
+      (setq file (semantic-tag-file-name parent)))
+    ;; Don't include the file name if we can't find one, or it is the
+    ;; same as the current buffer.
+    (if (or (not file)
+	    (string= file (buffer-file-name (current-buffer))))
+	proto
+      (setq file (file-name-nondirectory file))
+      (when color
+	(setq file (semantic--format-colorize-text file 'label)))
+      (concat file ": " proto))))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-short-doc (tag &optional parent color)
+  "Display a short form of TAG's documentation. (Comments, or docstring.)
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-short-doc-default (tag &optional parent color)
+  "Display a short form of TAG's documentation.  (Comments, or docstring.)
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((fname (or (semantic-tag-file-name tag)
+		    (when parent (semantic-tag-file-name parent))))
+	 (buf (or (semantic-tag-buffer tag)
+		  (when parent (semantic-tag-buffer parent))))
+	 (doc (semantic-tag-docstring tag buf)))
+    (when (and (not doc) (not buf) fname)
+      ;; If there is no doc, and no buffer, but we have a filename,
+      ;; lets try again.
+      (save-match-data
+	(setq buf (find-file-noselect fname)))
+      (setq doc (semantic-tag-docstring tag buf)))
+    (when (not doc)
+      (setq doc (semantic-documentation-for-tag tag))
+      )
+    (setq doc
+	  (if (not doc)
+	      ;; No doc, use summarize.
+	      (semantic-format-tag-summarize tag parent color)
+	    ;; We have doc.  Can we devise a single line?
+	    (if (string-match "$" doc)
+		(substring doc 0 (match-beginning 0))
+	      doc)
+	    ))
+    (when color
+      (setq doc (semantic--format-colorize-text doc 'documentation)))
+    doc
+    ))
+
+;;; Prototype generation
+;;
+;;;###autoload
+(define-overloadable-function semantic-format-tag-prototype (tag &optional parent color)
+  "Return a prototype for TAG.
+This function should be overloaded, though it need not be used.
+This is because it can be used to create code by language independent
+tools.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-prototype-default (tag &optional parent color)
+  "Default method for returning a prototype for TAG.
+This will work for C like languages.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((class (semantic-tag-class tag))
+	 (name (semantic-format-tag-name tag parent color))
+	 (type (if (member class '(function variable type))
+		   (semantic-format-tag-type tag color)))
+	 (args (if (member class '(function type))
+		   (semantic--format-tag-arguments
+		    (if (eq class 'function)
+			(semantic-tag-function-arguments tag)
+		      (list "")
+		      ;;(semantic-tag-type-members tag)
+		      )
+		    #'semantic-format-tag-prototype
+		    color)))
+	 (const (semantic-tag-get-attribute tag :constant-flag))
+	 (tm (semantic-tag-get-attribute tag :typemodifiers))
+	 (mods (append
+		(if const '("const") nil)
+		(cond ((stringp tm) (list tm))
+		      ((consp tm) tm)
+		      (t nil))
+		))
+	 (array (if (eq class 'variable)
+		    (let ((deref
+			   (semantic-tag-get-attribute
+ 			    tag :dereference))
+ 			  (r ""))
+ 		      (while (and deref (/= deref 0))
+ 			(setq r (concat r "[]")
+ 			      deref (1- deref)))
+ 		      r)))
+ 	 )
+    (if args
+	(setq args
+	      (concat " "
+		      (if (eq class 'type) "{" "(")
+		      args
+		      (if (eq class 'type) "}" ")"))))
+    (when mods
+      (setq mods (concat (mapconcat 'identity mods " ") " ")))
+    (concat (or mods "")
+	    (if type (concat type " "))
+	    name
+	    (or args "")
+	    (or array ""))))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-concise-prototype (tag &optional parent color)
+  "Return a concise prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-concise-prototype-default (tag &optional parent color)
+  "Return a concise prototype for TAG.
+This default function will make a cheap concise prototype using C like syntax.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let ((class (semantic-tag-class tag)))
+    (cond
+     ((eq class 'type)
+      (concat (semantic-format-tag-name tag parent color) "{}"))
+     ((eq class 'function)
+      (concat (semantic-format-tag-name tag parent color)
+	      " ("
+	      (semantic--format-tag-arguments
+	       (semantic-tag-function-arguments tag)
+	       'semantic-format-tag-concise-prototype
+	       color)
+	      ")"))
+     ((eq class 'variable)
+      (let* ((deref (semantic-tag-get-attribute
+		     tag :dereference))
+	     (array "")
+	     )
+	(while (and deref (/= deref 0))
+	  (setq array (concat array "[]")
+		deref (1- deref)))
+	(concat (semantic-format-tag-name tag parent color)
+		array)))
+     (t
+      (semantic-format-tag-abbreviate tag parent color)))))
+
+;;; UML display styles
+;;
+(defcustom semantic-uml-colon-string " : "
+  "*String used as a color separator between parts of a UML string.
+In UML, a variable may appear as `varname : type'.
+Change this variable to change the output separator."
+  :group 'semantic
+  :type 'string)
+
+(defcustom semantic-uml-no-protection-string ""
+  "*String used to describe when no protection is specified.
+Used by `semantic-format-tag-uml-protection-to-string'."
+  :group 'semantic
+  :type 'string)
+
+(defun semantic--format-uml-post-colorize (text tag parent)
+  "Add color to TEXT created from TAG and PARENT.
+Adds augmentation for `abstract' and `static' entries."
+  (if (semantic-tag-abstract-p tag parent)
+      (setq text (semantic--format-colorize-merge-text text 'abstract)))
+  (if (semantic-tag-static-p tag parent)
+      (setq text (semantic--format-colorize-merge-text text 'static)))
+  text
+  )
+
+(defun semantic-uml-attribute-string (tag &optional parent)
+  "Return a string for TAG, a child of PARENT representing a UML attribute.
+UML attribute strings are things like {abstract} or {leaf}."
+  (cond ((semantic-tag-abstract-p tag parent)
+	 "{abstract}")
+	((semantic-tag-leaf-p tag parent)
+	 "{leaf}")
+	))
+
+(defvar semantic-format-tag-protection-image-alist
+  '(("+" . ezimage-unlock)
+    ("#" . ezimage-key)
+    ("-" . ezimage-lock)
+    )
+  "Association of protection strings, and images to use.")
+
+(defvar semantic-format-tag-protection-symbol-to-string-assoc-list
+  '((public . "+")
+    (protected . "#")
+    (private . "-")
+    )
+  "Association list of the form (SYMBOL . \"STRING\") for protection symbols.
+This associates a symbol, such as 'public with the st ring \"+\".")
+
+(define-overloadable-function semantic-format-tag-uml-protection-to-string (protection-symbol color)
+  "Convert PROTECTION-SYMBOL to a string for UML.
+By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list'
+to convert.
+By defaul character returns are:
+  public    -- +
+  private   -- -
+  protected -- #.
+If PROTECTION-SYMBOL is unknown, then the return value is
+`semantic-uml-no-protection-string'.
+COLOR indicates if we should use an image on the text.")
+
+(defun semantic-format-tag-uml-protection-to-string-default (protection-symbol color)
+  "Convert PROTECTION-SYMBOL to a string for UML.
+Uses `semantic-format-tag-protection-symbol-to-string-assoc-list' to convert.
+If PROTECTION-SYMBOL is unknown, then the return value is
+`semantic-uml-no-protection-string'.
+COLOR indicates if we should use an image on the text."
+  (let* ((ezimage-use-images (and semantic-format-use-images-flag color))
+	 (key (assoc protection-symbol
+		     semantic-format-tag-protection-symbol-to-string-assoc-list))
+	 (str (or (cdr-safe key) semantic-uml-no-protection-string)))
+    (ezimage-image-over-string
+     (copy-sequence str)  ; make a copy to keep the original pristine.
+     semantic-format-tag-protection-image-alist)))
+
+(defsubst semantic-format-tag-uml-protection (tag parent color)
+  "Retrieve the protection string for TAG with PARENT.
+Argument COLOR specifies that color should be added to the string as
+needed."
+  (semantic-format-tag-uml-protection-to-string
+   (semantic-tag-protection tag parent)
+   color))
+
+(defun semantic--format-tag-uml-type (tag color)
+  "Format the data type of TAG to a string usable for formatting.
+COLOR indicates if it should be colorized."
+  (let ((str (semantic-format-tag-type tag color)))
+    (if str
+	(concat semantic-uml-colon-string str))))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-uml-abbreviate (tag &optional parent color)
+  "Return a UML style abbreviation for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-uml-abbreviate-default (tag &optional parent color)
+  "Return a UML style abbreviation for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((name (semantic-format-tag-name tag parent color))
+	 (type  (semantic--format-tag-uml-type tag color))
+	 (protstr (semantic-format-tag-uml-protection tag parent color))
+	 (text nil))
+    (setq text
+	  (concat
+	   protstr
+	   (if type (concat name type)
+	     name)))
+    (if color
+	(setq text (semantic--format-uml-post-colorize text tag parent)))
+    text))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-uml-prototype (tag &optional parent color)
+  "Return a UML style prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-uml-prototype-default (tag &optional parent color)
+  "Return a UML style prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((class (semantic-tag-class tag))
+	 (cp (semantic-format-tag-name tag parent color))
+	 (type (semantic--format-tag-uml-type tag color))
+	 (prot (semantic-format-tag-uml-protection tag parent color))
+	 (argtext
+	  (cond ((eq class 'function)
+		 (concat
+		  " ("
+		  (semantic--format-tag-arguments
+		   (semantic-tag-function-arguments tag)
+		   #'semantic-format-tag-uml-prototype
+		   color)
+		  ")"))
+		((eq class 'type)
+		 "{}")))
+	 (text nil))
+    (setq text (concat prot cp argtext type))
+    (if color
+	(setq text (semantic--format-uml-post-colorize text tag parent)))
+    text
+    ))
+
+;;;###autoload
+(define-overloadable-function semantic-format-tag-uml-concise-prototype (tag &optional parent color)
+  "Return a UML style concise prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.")
+
+(defun semantic-format-tag-uml-concise-prototype-default (tag &optional parent color)
+  "Return a UML style concise prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors."
+  (let* ((cp (semantic-format-tag-concise-prototype tag parent color))
+	 (type (semantic--format-tag-uml-type tag color))
+	 (prot (semantic-format-tag-uml-protection tag parent color))
+	 (text nil)
+	 )
+    (setq text (concat prot cp type))
+    (if color
+	(setq text (semantic--format-uml-post-colorize text tag parent)))
+    text
+    ))
+
+
+;;; Test routines
+;;
+(defun semantic-test-all-format-tag-functions (&optional arg)
+  "Test all outputs from `semantic-format-tag-functions'.
+Output is generated from the function under `point'.
+Optional argument ARG specifies not to use color."
+  (interactive "P")
+  (semantic-fetch-tags)
+  (let* ((tag (semantic-current-tag))
+	 (par (semantic-current-tag-parent))
+	 (fns semantic-format-tag-functions))
+    (with-output-to-temp-buffer "*format-tag*"
+      (princ "Tag->format function tests:")
+      (while fns
+	(princ "\n")
+	(princ (car fns))
+	(princ ":\n ")
+	(let ((s (funcall (car fns) tag par (not arg))))
+	  (save-excursion
+	    (set-buffer "*format-tag*")
+	    (goto-char (point-max))
+	    (insert s)))
+	(setq fns (cdr fns))))
+      ))
+
+
+;;; Compatibility and aliases
+;;
+(semantic-alias-obsolete 'semantic-prin1-nonterminal
+			 'semantic-format-tag-prin1)
+
+(semantic-alias-obsolete 'semantic-name-nonterminal
+			 'semantic-format-tag-name)
+
+(semantic-alias-obsolete 'semantic-abbreviate-nonterminal
+			 'semantic-format-tag-abbreviate)
+
+(semantic-alias-obsolete 'semantic-summarize-nonterminal
+			 'semantic-format-tag-summarize)
+
+(semantic-alias-obsolete 'semantic-prototype-nonterminal
+			 'semantic-format-tag-prototype)
+
+(semantic-alias-obsolete 'semantic-concise-prototype-nonterminal
+			 'semantic-format-tag-concise-prototype)
+
+(semantic-alias-obsolete 'semantic-uml-abbreviate-nonterminal
+			 'semantic-format-tag-uml-abbreviate)
+
+(semantic-alias-obsolete 'semantic-uml-prototype-nonterminal
+			 'semantic-format-tag-uml-prototype)
+
+(semantic-alias-obsolete 'semantic-uml-concise-prototype-nonterminal
+			 'semantic-format-tag-uml-concise-prototype)
+
+
+(provide 'semantic-format)
+
+;;; semantic-format.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-fw.el b/site/cedet-1.0pre7/semantic/semantic-fw.el
new file mode 100644
index 0000000..0b860eb
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-fw.el
@@ -0,0 +1,574 @@
+;;; semantic-fw.el --- Framework for Semantic
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-fw.el,v 1.82 2009/10/01 01:56:54 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic has several core features shared across it's lex/parse/util
+;; stages.  This used to clutter semantic.el some.  These routines are all
+;; simple things that are not parser specific, but aid in making
+;; semantic flexible and compatible amongst different Emacs platforms.
+
+;;; No Requirements.
+
+;;; Code:
+;;
+(require 'mode-local)
+
+;;; Compatibility
+;;
+(if (featurep 'xemacs)
+    (progn
+      (defalias 'semantic-buffer-local-value 'symbol-value-in-buffer)
+      (defalias 'semantic-overlay-live-p
+        (lambda (o)
+          (and (extent-live-p o)
+               (not (extent-detached-p o))
+               (bufferp (extent-buffer o)))))
+      (defalias 'semantic-make-overlay
+	(lambda (beg end &optional buffer &rest rest)
+	  "Xemacs `make-extent', supporting the front/rear advance options."
+	  (let ((ol (make-extent beg end buffer)))
+	    (when rest
+	      (set-extent-property ol 'start-open (car rest))
+	      (setq rest (cdr rest)))
+	    (when rest
+	      (set-extent-property ol 'end-open (car rest)))
+	    ol)))
+      (defalias 'semantic-overlay-put             'set-extent-property)
+      (defalias 'semantic-overlay-get             'extent-property)
+      (defalias 'semantic-overlay-properties      'extent-properties)
+      (defalias 'semantic-overlay-move            'set-extent-endpoints)
+      (defalias 'semantic-overlay-delete          'delete-extent)
+      (defalias 'semantic-overlays-at
+        (lambda (pos)
+	  (condition-case nil
+	      (extent-list nil pos pos)
+	    (error nil))
+	  ))
+      (defalias 'semantic-overlays-in
+        (lambda (beg end) (extent-list nil beg end)))
+      (defalias 'semantic-overlay-buffer          'extent-buffer)
+      (defalias 'semantic-overlay-start           'extent-start-position)
+      (defalias 'semantic-overlay-end             'extent-end-position)
+      (defalias 'semantic-overlay-size            'extent-length)
+      (defalias 'semantic-overlay-next-change     'next-extent-change)
+      (defalias 'semantic-overlay-previous-change 'previous-extent-change)
+      (defalias 'semantic-overlay-lists
+        (lambda () (list (extent-list))))
+      (defalias 'semantic-overlay-p               'extentp)
+      (defalias 'semantic-event-window        'event-window)
+      (defun semantic-read-event ()
+        (let ((event (next-command-event)))
+          (if (key-press-event-p event)
+              (let ((c (event-to-character event)))
+                (if (char-equal c (quit-char))
+                    (keyboard-quit)
+                  c)))
+          event))
+      (defun semantic-popup-menu (menu)
+	"Blockinig version of `popup-menu'"
+	(popup-menu menu)
+	;; Wait...
+	(while (popup-up-p) (dispatch-event (next-event))))
+      )
+  ;; Emacs Bindings
+  (defalias 'semantic-overlay-live-p          'overlay-buffer)
+  (defalias 'semantic-make-overlay            'make-overlay)
+  (defalias 'semantic-overlay-put             'overlay-put)
+  (defalias 'semantic-overlay-get             'overlay-get)
+  (defalias 'semantic-overlay-properties      'overlay-properties)
+  (defalias 'semantic-overlay-move            'move-overlay)
+  (defalias 'semantic-overlay-delete          'delete-overlay)
+  (defalias 'semantic-overlays-at             'overlays-at)
+  (defalias 'semantic-overlays-in             'overlays-in)
+  (defalias 'semantic-overlay-buffer          'overlay-buffer)
+  (defalias 'semantic-overlay-start           'overlay-start)
+  (defalias 'semantic-overlay-end             'overlay-end)
+  (defalias 'semantic-overlay-size            'overlay-size)
+  (defalias 'semantic-overlay-next-change     'next-overlay-change)
+  (defalias 'semantic-overlay-previous-change 'previous-overlay-change)
+  (defalias 'semantic-overlay-lists           'overlay-lists)
+  (defalias 'semantic-overlay-p               'overlayp)
+  (defalias 'semantic-read-event              'read-event)
+  (defalias 'semantic-popup-menu              'popup-menu)
+  (defun semantic-event-window (event)
+    "Extract the window from EVENT."
+    (car (car (cdr event))))
+
+  (if (> emacs-major-version 21)
+      (defalias 'semantic-buffer-local-value 'buffer-local-value)
+
+    (defun semantic-buffer-local-value (sym &optional buf)
+      "Get the value of SYM from buffer local variable in BUF."
+      (cdr (assoc sym (buffer-local-variables buf)))))
+  )
+
+(if (and (not (featurep 'xemacs))
+	 (>= emacs-major-version 21))
+    (defalias 'semantic-make-local-hook 'identity)
+  (defalias 'semantic-make-local-hook 'make-local-hook)
+  )
+
+(if (featurep 'xemacs)
+    (defalias 'semantic-mode-line-update 'redraw-modeline)
+  (defalias 'semantic-mode-line-update 'force-mode-line-update))
+
+;; Since Emacs 22 major mode functions should use `run-mode-hooks' to
+;; run major mode hooks.
+(defalias 'semantic-run-mode-hooks
+  (if (fboundp 'run-mode-hooks)
+      'run-mode-hooks
+    'run-hooks))
+
+;; Fancy compat useage now handled in cedet-compat
+(defalias 'semantic-subst-char-in-string 'subst-char-in-string)
+
+
+(defun semantic-delete-overlay-maybe (overlay)
+  "Delete OVERLAY if it is a semantic token overlay."
+  (if (semantic-overlay-get overlay 'semantic)
+      (semantic-overlay-delete overlay)))
+
+(defalias 'semantic-compile-warn
+  (eval-when-compile
+    (if (fboundp 'byte-compile-warn)
+	'byte-compile-warn
+      'message)))
+
+(if (not (fboundp 'string-to-number))
+    (defalias 'string-to-number 'string-to-int))
+
+;;; Menu Item compatibility
+;;
+(defun semantic-menu-item (item)
+  "Build an XEmacs compatible menu item from vector ITEM.
+That is remove the unsupported :help stuff."
+  (if (featurep 'xemacs)
+      (let ((n (length item))
+            (i 0)
+            slot l)
+        (while (< i n)
+          (setq slot (aref item i))
+          (if (and (keywordp slot)
+                   (eq slot :help))
+              (setq i (1+ i))
+            (setq l (cons slot l)))
+          (setq i (1+ i)))
+        (apply #'vector (nreverse l)))
+    item))
+
+;;; Positional Data Cache
+;;
+(defvar semantic-cache-data-overlays nil
+  "List of all overlays waiting to be flushed.")
+
+(defun semantic-cache-data-to-buffer (buffer start end value name &optional lifespan)
+  "In BUFFER over the region START END, remember VALUE.
+NAME specifies a special name that can be searched for later to
+recover the cached data with `semantic-get-cache-data'.
+LIFESPAN indicates how long the data cache will be remembered.
+The default LIFESPAN is 'end-of-command.
+Possible Lifespans are:
+  'end-of-command - Remove the cache at the end of the currently
+                    executing command.
+  'exit-cache-zone - Remove when point leaves the overlay at the
+                    end of the currently executing command."
+  ;; Check if LIFESPAN is valid before to create any overlay
+  (or lifespan (setq lifespan 'end-of-command))
+  (or (memq lifespan '(end-of-command exit-cache-zone))
+      (error "semantic-cache-data-to-buffer: Unknown LIFESPAN: %s"
+             lifespan))
+  (let ((o (semantic-make-overlay start end buffer)))
+    (semantic-overlay-put o 'cache-name   name)
+    (semantic-overlay-put o 'cached-value value)
+    (semantic-overlay-put o 'lifespan     lifespan)
+    (setq semantic-cache-data-overlays
+          (cons o semantic-cache-data-overlays))
+    ;;(message "Adding to cache: %s" o)
+    (add-hook 'post-command-hook 'semantic-cache-data-post-command-hook)
+    ))
+
+(defun semantic-cache-data-post-command-hook ()
+  "Flush `semantic-cache-data-overlays' based 'lifespan property.
+Remove self from `post-command-hook' if it is empty."
+  (let ((newcache nil)
+        (oldcache semantic-cache-data-overlays))
+    (while oldcache
+      (let* ((o    (car oldcache))
+             (life (semantic-overlay-get o 'lifespan))
+             )
+        (if (or (eq life 'end-of-command)
+                (and (eq life 'exit-cache-zone)
+                     (not (member o (semantic-overlays-at (point))))))
+            (progn
+              ;;(message "Removing from cache: %s" o)
+              (semantic-overlay-delete o)
+              )
+          (setq newcache (cons o newcache))))
+      (setq oldcache (cdr oldcache)))
+    (setq semantic-cache-data-overlays (nreverse newcache)))
+
+  ;; Remove ourselves if we have removed all overlays.
+  (unless semantic-cache-data-overlays
+    (remove-hook 'post-command-hook
+                 'semantic-cache-data-post-command-hook)))
+
+(defun semantic-get-cache-data (name &optional point)
+  "Get cached data with NAME from optional POINT."
+  (save-excursion
+    (if point (goto-char point))
+    (let ((o (semantic-overlays-at (point)))
+          (ans nil))
+      (while (and (not ans) o)
+        (if (equal (semantic-overlay-get (car o) 'cache-name) name)
+            (setq ans (car o))
+          (setq o (cdr o))))
+      (when ans
+        (semantic-overlay-get ans 'cached-value)))))
+
+(defun semantic-test-data-cache ()
+  "Test the data cache."
+  (interactive)
+  (let ((data '(a b c)))
+    (save-excursion
+      (set-buffer (get-buffer-create " *semantic-test-data-cache*"))
+      (erase-buffer)
+      (insert "The Moose is Loose")
+      (goto-char (point-min))
+      (semantic-cache-data-to-buffer (current-buffer) (point) (+ (point) 5)
+				     data 'moose 'exit-cache-zone)
+      (if (equal (semantic-get-cache-data 'moose) data)
+	  (message "Successfully retrieved cached data.")
+	(error "Failed to retrieve cached data"))
+      )))
+
+;;; Obsoleting various functions & variables
+;;
+(defun semantic-overload-symbol-from-function (name)
+  "Return the symbol for overload used by NAME, the defined symbol."
+  (let ((sym-name (symbol-name name)))
+    (if (string-match "^semantic-" sym-name)
+	(intern (substring sym-name (match-end 0)))
+      name)))
+
+(defun semantic-alias-obsolete (oldfnalias newfn)
+  "Make OLDFNALIAS an alias for NEWFN.
+Mark OLDFNALIAS as obsolete, such that the byte compiler
+will throw a warning when it encounters this symbol."
+  (defalias oldfnalias newfn)
+  (make-obsolete oldfnalias newfn)
+  (when (and (function-overload-p newfn)
+             (not (overload-obsoleted-by newfn))
+             ;; Only throw this warning when byte compiling things.
+             (boundp 'byte-compile-current-file)
+             byte-compile-current-file
+	     (not (string-match "cedet" byte-compile-current-file))
+	     )
+    (make-obsolete-overload oldfnalias newfn)
+    (semantic-compile-warn
+     "%s: `%s' obsoletes overload `%s'"
+     byte-compile-current-file
+     newfn
+     (semantic-overload-symbol-from-function oldfnalias))
+    ))
+
+(defun semantic-varalias-obsolete (oldvaralias newvar)
+  "Make OLDVARALIAS an alias for variable NEWVAR.
+Mark OLDVARALIAS as obsolete, such that the byte compiler
+will throw a warning when it encounters this symbol."
+  (make-obsolete-variable oldvaralias newvar)
+  (condition-case nil
+      (defvaralias oldvaralias newvar)
+    (error
+     ;; Only throw this warning when byte compiling things.
+     (when (and (boundp 'byte-compile-current-file)
+                byte-compile-current-file)
+       (semantic-compile-warn
+        "variable `%s' obsoletes, but isn't alias of `%s'"
+        newvar oldvaralias)
+     ))))
+
+;;; Semantic autoloads
+;;
+;; Load semantic-loaddefs after compatibility code, to allow to use it
+;; in autoloads without infinite recursive load problems.
+(require 'eieio)
+(load "semantic-loaddefs" nil t)
+
+;;; Help debugging
+;;
+(defmacro semantic-safe (format &rest body)
+  "Turn into a FORMAT message any error caught during eval of BODY.
+Return the value of last BODY form or nil if an error occurred.
+FORMAT can have a %s escape which will be replaced with the actual
+error message.
+If `debug-on-error' is set, errors are not caught, so that you can
+debug them.
+Avoid using a large BODY since it is duplicated."
+  ;;(declare (debug t) (indent 1))
+  `(if debug-on-error
+       ;;(let ((inhibit-quit nil)) ,@body)
+       ;; Note to self: Doing the above screws up the wisent parser.
+       (progn ,@body)
+     (condition-case err
+	 (progn ,@body)
+       (error
+        (message ,format (format "%S - %s" (current-buffer)
+                                 (error-message-string err)))
+        nil))))
+(put 'semantic-safe 'lisp-indent-function 1)
+
+;;; Misc utilities
+;;
+(defsubst semantic-map-buffers (function)
+  "Run FUNCTION for each Semantic enabled buffer found.
+FUNCTION does not have arguments.  When FUNCTION is entered
+`current-buffer' is a selected Semantic enabled buffer."
+  (mode-local-map-file-buffers function #'semantic-active-p))
+
+(defalias 'semantic-map-mode-buffers
+  'mode-local-map-mode-buffers)
+
+(semantic-alias-obsolete 'semantic-fetch-overload
+                         'fetch-overload)
+
+(semantic-alias-obsolete 'define-mode-overload-implementation
+                         'define-mode-local-override)
+
+(semantic-alias-obsolete 'semantic-with-mode-bindings
+                         'with-mode-local)
+
+(semantic-alias-obsolete 'define-semantic-child-mode
+                         'define-child-mode)
+
+(defun semantic-install-function-overrides (overrides &optional transient mode)
+  "Install the function OVERRIDES in the specified environment.
+OVERRIDES must be an alist ((OVERLOAD .  FUNCTION) ...) where OVERLOAD
+is a symbol identifying an overloadable entry, and FUNCTION is the
+function to override it with.
+If optional argument TRANSIENT is non-nil, installed overrides can in
+turn be overridden by next installation.
+If optional argument MODE is non-nil, it must be a major mode symbol.
+OVERRIDES will be installed globally for this major mode.  If MODE is
+nil, OVERRIDES will be installed locally in the current buffer.  This
+later installation should be done in MODE hook."
+  (mode-local-bind
+   ;; Add the semantic- prefix to OVERLOAD short names.
+   (mapcar
+    #'(lambda (e)
+        (let ((name (symbol-name (car e))))
+          (if (string-match "^semantic-" name)
+              e
+            (cons (intern (format "semantic-%s" name)) (cdr e)))))
+    overrides)
+   (list 'constant-flag (not transient)
+         'override-flag t)
+   mode))
+
+;;; User Interrupt handling
+;;
+(defvar semantic-current-input-throw-symbol nil
+  "The current throw symbol for `semantic-exit-on-input'.")
+
+(defmacro semantic-exit-on-input (symbol &rest forms)
+  "Using SYMBOL as an argument to `throw', execute FORMS.
+If FORMS includes a call to `semantic-thow-on-input', then
+if a user presses any key during execution, this form macro
+will exit with the value passed to `semantic-throw-on-input'.
+If FORMS completes, then the return value is the same as `progn'."
+  `(let ((semantic-current-input-throw-symbol ,symbol))
+     (catch ,symbol
+       ,@forms)))
+(put 'semantic-exit-on-input 'lisp-indent-function 1)
+
+(defmacro semantic-throw-on-input (from)
+  "Exit with `throw' when in `semantic-exit-on-input' on user input.
+FROM is an indication of where this function is called from as a value
+to pass to `throw'.  It is recommended to use the name of the function
+calling this one."
+  `(when (and semantic-current-input-throw-symbol
+              (or (input-pending-p) (accept-process-output)))
+     (throw semantic-current-input-throw-symbol ,from)))
+
+(defun semantic-test-throw-on-input ()
+  "Test that throw on input will work."
+  (interactive)
+  (semantic-throw-on-input 'done-die)
+  (message "Exit Code: %s"
+	   (semantic-exit-on-input 'testing
+	     (let ((inhibit-quit nil)
+		   (message-log-max nil))
+	       (while t
+		 (message "Looping ... press a key to test")
+		 (semantic-throw-on-input 'test-inner-loop))
+	       'exit)))
+  (when (input-pending-p)
+    (if (fboundp 'read-event)
+	(read-event)
+      (read-char)))
+  )
+
+;;; Special versions of Find File
+;;
+(defun semantic-find-file-noselect (file &optional nowarn rawfile wildcards)
+  "Call `find-file-noselect' with various features turned off.
+Use this when referencing a file that will be soon deleted.
+FILE, NOWARN, RAWFILE, and WILDCARDS are passed into `find-file-noselect'"
+  (let* ((recentf-exclude '( (lambda (f) t) ))
+	 ;; This is a brave statement.  Don't waste time loading in
+	 ;; lots of modes.  Especially decoration mode can waste a lot
+	 ;; of time for a buffer we intend to kill.
+	 (semantic-init-hook nil)
+	 ;; This disables the part of EDE that asks questions
+	 (ede-auto-add-method 'never)
+	 ;; Ask font-lock to not colorize these buffers, nor to
+	 ;; whine about it either.
+	 (font-lock-maximum-size 0)
+	 (font-lock-verbose nil)
+	 ;; Disable revision control
+	 (vc-handled-backends nil)
+	 ;; Don't prompt to insert a template if we visit an empty file
+	 (auto-insert nil)
+	 ;; We don't want emacs to query about unsafe local variables
+	 (enable-local-variables
+	  (if (featurep 'xemacs)
+	      ;; XEmacs only has nil as an option?
+	      nil
+	    ;; Emacs 23 has the spiffy :safe option, nil otherwise.
+	    (if (inversion-check-version emacs-version nil '(full 22 0))
+		nil
+	      :safe)))
+	 ;; ... or eval variables
+	 (enable-local-eval nil)
+	 )
+    (save-match-data
+      (if (featurep 'xemacs)
+	  (find-file-noselect file nowarn rawfile)
+	(find-file-noselect file nowarn rawfile wildcards)))
+    ))
+
+
+;;; Editor goodies ;-)
+;;
+(defconst semantic-fw-font-lock-keywords
+  (eval-when-compile
+    (let* (
+           ;; Variable declarations
+	   (vl nil)
+           (kv (if vl (regexp-opt vl t) ""))
+           ;; Function declarations
+	   (vf '(
+		 "define-lex"
+		 "define-lex-analyzer"
+		 "define-lex-block-analyzer"
+		 "define-lex-regex-analyzer"
+		 "define-lex-spp-macro-declaration-analyzer"
+		 "define-lex-spp-macro-undeclaration-analyzer"
+		 "define-lex-spp-include-analyzer"
+		 "define-lex-simple-regex-analyzer"
+		 "define-lex-keyword-type-analyzer"
+		 "define-lex-sexp-type-analyzer"
+		 "define-lex-regex-type-analyzer"
+		 "define-lex-string-type-analyzer"
+		 "define-lex-block-type-analyzer"
+		 ;;"define-mode-overload-implementation"
+		 ;;"define-semantic-child-mode"
+		 "define-semantic-idle-service"
+		 "define-semantic-decoration-style"
+		 "define-wisent-lexer"
+		 "semantic-alias-obsolete"
+		 "semantic-varalias-obsolete"
+		 "semantic-make-obsolete-overload"
+		 "defcustom-mode-local-semantic-dependency-system-include-path"
+		 ))
+           (kf (if vf (regexp-opt vf t) ""))
+           ;; Regexp depths
+           (kv-depth (if kv (regexp-opt-depth kv) nil))
+           (kf-depth (if kf (regexp-opt-depth kf) nil))
+           )
+      `((,(concat
+           ;; Declarative things
+           "(\\(" kv "\\|" kf "\\)"
+           ;; Whitespaces & names
+           "\\>[ \t]*\\(\\sw+\\)?[ \t]*\\(\\sw+\\)?"
+           )
+         (1 font-lock-keyword-face)
+         (,(+ 1 kv-depth kf-depth 1)
+          (cond ((match-beginning 2)
+                 font-lock-type-face)
+                ((match-beginning ,(+ 1 kv-depth 1))
+                 font-lock-function-name-face)
+                )
+          nil t)
+         (,(+ 1 kv-depth kf-depth 1 1)
+          (cond ((match-beginning 2)
+                 font-lock-variable-name-face)
+                )
+          nil t)))
+      ))
+  "Highlighted Semantic keywords.")
+
+(when (fboundp 'font-lock-add-keywords)
+  (font-lock-add-keywords 'emacs-lisp-mode
+                          semantic-fw-font-lock-keywords)
+  )
+
+;;; Interfacing with edebug
+;;
+(add-hook
+ 'edebug-setup-hook
+ #'(lambda ()
+
+     (def-edebug-spec semantic-exit-on-input
+       (quote def-body)
+       )
+
+     ))
+
+;;; Interfacing with data-debug
+;;
+(eval-after-load "data-debug"
+  '(progn
+;;; Augment data-debug
+     ;;
+     ;; A tag
+     (data-debug-add-specialized-thing #'semantic-tag-p
+				       #'data-debug-insert-tag)
+     ;; A taglist
+     (data-debug-add-specialized-thing (lambda (thing) (and (listp thing) (semantic-tag-p (car thing))))
+				       #'data-debug-insert-tag-list-button)
+     ;; Find results
+     (data-debug-add-specialized-thing #'semanticdb-find-results-p
+				       #'data-debug-insert-find-results-button)
+     ;; Find results elements.
+     (data-debug-add-specialized-thing (lambda (thing) 
+					 (and (listp thing)
+					      (semanticdb-abstract-table-child-p (car thing))
+					      (semantic-tag-p (cdr thing))))
+				       #'data-debug-insert-db-and-tag-button)
+
+     ))
+
+(provide 'semantic-fw)
+
+;;; semantic-fw.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-grammar-wy.el b/site/cedet-1.0pre7/semantic/semantic-grammar-wy.el
new file mode 100644
index 0000000..c2d3fde
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-grammar-wy.el
@@ -0,0 +1,514 @@
+;;; semantic-grammar-wy.el --- Generated parser support file
+
+;; Copyright (C) 2002, 2003, 2004 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Created: 2004-03-20 12:34:58+0100
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-grammar-wy.el,v 1.16 2005/09/30 20:20:31 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file semantic-grammar.wy.
+
+;;; History:
+;;
+
+;;; Code:
+
+;;; Prologue
+;;
+;; Current parsed nonterminal name.
+  (defvar semantic-grammar-wy--nterm nil)
+  ;; Index of rule in a nonterminal clause.
+  (defvar semantic-grammar-wy--rindx nil)
+
+;;; Declarations
+;;
+(defconst semantic-grammar-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("%default-prec" . DEFAULT-PREC)
+     ("%no-default-prec" . NO-DEFAULT-PREC)
+     ("%keyword" . KEYWORD)
+     ("%languagemode" . LANGUAGEMODE)
+     ("%left" . LEFT)
+     ("%nonassoc" . NONASSOC)
+     ("%package" . PACKAGE)
+     ("%prec" . PREC)
+     ("%put" . PUT)
+     ("%quotemode" . QUOTEMODE)
+     ("%right" . RIGHT)
+     ("%scopestart" . SCOPESTART)
+     ("%start" . START)
+     ("%token" . TOKEN)
+     ("%type" . TYPE)
+     ("%use-macros" . USE-MACROS))
+   'nil)
+  "Table of language keywords.")
+
+(defconst semantic-grammar-wy--token-table
+  (semantic-lex-make-type-table
+   '(("punctuation"
+      (GT . ">")
+      (LT . "<")
+      (OR . "|")
+      (SEMI . ";")
+      (COLON . ":"))
+     ("close-paren"
+      (RBRACE . "}")
+      (RPAREN . ")"))
+     ("open-paren"
+      (LBRACE . "{")
+      (LPAREN . "("))
+     ("block"
+      (BRACE_BLOCK . "(LBRACE RBRACE)")
+      (PAREN_BLOCK . "(LPAREN RPAREN)"))
+     ("code"
+      (EPILOGUE . "%%...EOF")
+      (PROLOGUE . "%{...%}"))
+     ("sexp"
+      (SEXP))
+     ("qlist"
+      (PREFIXED_LIST))
+     ("char"
+      (CHARACTER))
+     ("symbol"
+      (PERCENT_PERCENT . "\\`%%\\'")
+      (SYMBOL))
+     ("string"
+      (STRING)))
+   '(("punctuation" :declared t)
+     ("block" :declared t)
+     ("sexp" matchdatatype sexp)
+     ("sexp" syntax "\\=")
+     ("sexp" :declared t)
+     ("qlist" matchdatatype sexp)
+     ("qlist" syntax "\\s'\\s-*(")
+     ("qlist" :declared t)
+     ("char" syntax semantic-grammar-lex-c-char-re)
+     ("char" :declared t)
+     ("symbol" syntax ":?\\(\\sw\\|\\s_\\)+")
+     ("symbol" :declared t)
+     ("string" :declared t)
+     ("keyword" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst semantic-grammar-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((DEFAULT-PREC NO-DEFAULT-PREC KEYWORD LANGUAGEMODE LEFT NONASSOC PACKAGE PREC PUT QUOTEMODE RIGHT SCOPESTART START TOKEN TYPE USE-MACROS STRING SYMBOL PERCENT_PERCENT CHARACTER PREFIXED_LIST SEXP PROLOGUE EPILOGUE PAREN_BLOCK BRACE_BLOCK LPAREN RPAREN LBRACE RBRACE COLON SEMI OR LT GT)
+       nil
+       (grammar
+        ((prologue))
+        ((epilogue))
+        ((declaration))
+        ((nonterminal))
+        ((PERCENT_PERCENT)))
+       (prologue
+        ((PROLOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "prologue" nil))))
+       (epilogue
+        ((EPILOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "epilogue" nil))))
+       (declaration
+        ((decl)
+         (eval $1)))
+       (decl
+        ((default_prec_decl))
+        ((no_default_prec_decl))
+        ((languagemode_decl))
+        ((package_decl))
+        ((precedence_decl))
+        ((put_decl))
+        ((quotemode_decl))
+        ((scopestart_decl))
+        ((start_decl))
+        ((keyword_decl))
+        ((token_decl))
+        ((type_decl))
+        ((use_macros_decl)))
+       (default_prec_decl
+         ((DEFAULT-PREC)
+          `(wisent-raw-tag
+            (semantic-tag "default-prec" 'assoc :value
+                          '("t")))))
+       (no_default_prec_decl
+        ((NO-DEFAULT-PREC)
+         `(wisent-raw-tag
+           (semantic-tag "default-prec" 'assoc :value
+                         '("nil")))))
+       (languagemode_decl
+        ((LANGUAGEMODE symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'languagemode :rest ',(cdr $2)))))
+       (package_decl
+        ((PACKAGE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag-new-package ',$2 nil))))
+       (precedence_decl
+        ((associativity token_type_opt items)
+         `(wisent-raw-tag
+           (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
+       (associativity
+        ((LEFT)
+         (progn "left"))
+        ((RIGHT)
+         (progn "right"))
+        ((NONASSOC)
+         (progn "nonassoc")))
+       (put_decl
+        ((PUT put_name put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',(list $3))))
+        ((PUT put_name put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',$3)))
+        ((PUT put_name_list put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',(list $3))))
+        ((PUT put_name_list put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',$3))))
+       (put_name_list
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_names 1))))
+       (put_names
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_name)
+         (wisent-raw-tag
+          (semantic-tag $1 'put-name))))
+       (put_name
+        ((SYMBOL))
+        ((token_type)))
+       (put_value_list
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-code-detail
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_values 1))))
+       (put_values
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_value)
+         (wisent-raw-tag
+          (semantic-tag-new-code "put-value" $1))))
+       (put_value
+        ((SYMBOL any_value)
+         (cons $1 $2)))
+       (scopestart_decl
+        ((SCOPESTART SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'scopestart))))
+       (quotemode_decl
+        ((QUOTEMODE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'quotemode))))
+       (start_decl
+        ((START symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'start :rest ',(cdr $2)))))
+       (keyword_decl
+        ((KEYWORD SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'keyword :value ',$3))))
+       (token_decl
+        ((TOKEN token_type_opt SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$3 ',(if $2 'token 'keyword)
+                         :type ',$2 :value ',$4)))
+        ((TOKEN token_type_opt symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $3)
+                         'token :type ',$2 :rest ',(cdr $3)))))
+       (token_type_opt
+        (nil)
+        ((token_type)))
+       (token_type
+        ((LT SYMBOL GT)
+         (progn $2)))
+       (type_decl
+        ((TYPE token_type plist_opt)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'type :value ',$3))))
+       (plist_opt
+        (nil)
+        ((plist)))
+       (plist
+        ((plist put_value)
+         (append
+          (list $2)
+          $1))
+        ((put_value)
+         (list $1)))
+       (use_name_list
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'use_names 1))))
+       (use_names
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((SYMBOL)
+         (wisent-raw-tag
+          (semantic-tag $1 'use-name))))
+       (use_macros_decl
+        ((USE-MACROS SYMBOL use_name_list)
+         `(wisent-raw-tag
+           (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
+       (string_value
+        ((STRING)
+         (read $1)))
+       (any_value
+        ((SYMBOL))
+        ((STRING))
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((SEXP)))
+       (symbols
+        ((lifo_symbols)
+         (nreverse $1)))
+       (lifo_symbols
+        ((lifo_symbols SYMBOL)
+         (cons $2 $1))
+        ((SYMBOL)
+         (list $1)))
+       (nonterminal
+        ((SYMBOL
+          (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
+          COLON rules SEMI)
+         (wisent-raw-tag
+          (semantic-tag $1 'nonterminal :children $4))))
+       (rules
+        ((lifo_rules)
+         (apply 'nconc
+                (nreverse $1))))
+       (lifo_rules
+        ((lifo_rules OR rule)
+         (cons $3 $1))
+        ((rule)
+         (list $1)))
+       (rule
+        ((rhs)
+         (let*
+             ((nterm semantic-grammar-wy--nterm)
+              (rindx semantic-grammar-wy--rindx)
+              (rhs $1)
+              comps prec action elt)
+           (setq semantic-grammar-wy--rindx
+                 (1+ semantic-grammar-wy--rindx))
+           (while rhs
+             (setq elt
+                   (car rhs)
+                   rhs
+                   (cdr rhs))
+             (cond
+              ((vectorp elt)
+               (if prec
+                   (error "duplicate %%prec in `%s:%d' rule" nterm rindx))
+               (setq prec
+                     (aref elt 0)))
+              ((consp elt)
+               (if
+                   (or action comps)
+                   (setq comps
+                         (cons elt comps)
+                         semantic-grammar-wy--rindx
+                         (1+ semantic-grammar-wy--rindx))
+                 (setq action
+                       (car elt))))
+              (t
+               (setq comps
+                     (cons elt comps)))))
+           (wisent-cook-tag
+            (wisent-raw-tag
+             (semantic-tag
+              (format "%s:%d" nterm rindx)
+              'rule :type
+              (if comps "group" "empty")
+              :value comps :prec prec :expr action))))))
+       (rhs
+        (nil)
+        ((rhs item)
+         (cons $2 $1))
+        ((rhs action)
+         (cons
+          (list $2)
+          $1))
+        ((rhs PREC item)
+         (cons
+          (vector $3)
+          $1)))
+       (action
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((BRACE_BLOCK)
+         (format "(progn\n%s)"
+                 (let
+                     ((s $1))
+                   (if
+                       (string-match "^{[
\n	 ]*" s)
+                       (setq s
+                             (substring s
+                                        (match-end 0))))
+                   (if
+                       (string-match "[
\n	 ]*}$" s)
+                       (setq s
+                             (substring s 0
+                                        (match-beginning 0))))
+                   s))))
+       (items
+        ((lifo_items)
+         (nreverse $1)))
+       (lifo_items
+        ((lifo_items item)
+         (cons $2 $1))
+        ((item)
+         (list $1)))
+       (item
+        ((SYMBOL))
+        ((CHARACTER))))
+     '(grammar prologue epilogue declaration nonterminal rule put_names put_values use_names)))
+  "Parser table.")
+
+(defun semantic-grammar-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+        semantic--parse-table semantic-grammar-wy--parse-table
+        semantic-debug-parser-source "semantic-grammar.wy"
+        semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
+        semantic-lex-types-obarray semantic-grammar-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+            'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-sexp-type-analyzer semantic-grammar-wy--<sexp>-sexp-analyzer
+  "sexp analyzer for <sexp> tokens."
+  "\\="
+  'SEXP)
+
+(define-lex-sexp-type-analyzer semantic-grammar-wy--<qlist>-sexp-analyzer
+  "sexp analyzer for <qlist> tokens."
+  "\\s'\\s-*("
+  'PREFIXED_LIST)
+
+(define-lex-keyword-type-analyzer semantic-grammar-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-block-type-analyzer semantic-grammar-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" LPAREN PAREN_BLOCK)
+     ("{" LBRACE BRACE_BLOCK))
+    (")" RPAREN)
+    ("}" RBRACE))
+  )
+
+(define-lex-regex-type-analyzer semantic-grammar-wy--<char>-regexp-analyzer
+  "regexp analyzer for <char> tokens."
+  semantic-grammar-lex-c-char-re
+  nil
+  'CHARACTER)
+
+(define-lex-sexp-type-analyzer semantic-grammar-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING)
+
+(define-lex-regex-type-analyzer semantic-grammar-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  ":?\\(\\sw\\|\\s_\\)+"
+  '((PERCENT_PERCENT . "\\`%%\\'"))
+  'SYMBOL)
+
+(define-lex-string-type-analyzer semantic-grammar-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)+"
+  '((GT . ">")
+    (LT . "<")
+    (OR . "|")
+    (SEMI . ";")
+    (COLON . ":"))
+  'punctuation)
+
+
+;;; Epilogue
+;;
+(define-lex semantic-grammar-lexer
+  "Lexical analyzer that handles Semantic grammar buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-whitespace
+  ;; Must detect prologue/epilogue before other symbols/keywords!
+  semantic-grammar-lex-prologue
+  semantic-grammar-lex-epilogue
+  semantic-grammar-wy--<keyword>-keyword-analyzer
+  semantic-grammar-wy--<symbol>-regexp-analyzer
+  semantic-grammar-wy--<char>-regexp-analyzer
+  semantic-grammar-wy--<string>-sexp-analyzer
+  ;; Must detect comments after strings because `comment-start-skip'
+  ;; regexp match semicolons inside strings!
+  semantic-lex-ignore-comments
+  ;; Must detect prefixed list before punctuation because prefix chars
+  ;; are also punctuations!
+  semantic-grammar-wy--<qlist>-sexp-analyzer
+  ;; Must detect punctuations after comments because the semicolon can
+  ;; be a punctuation or a comment start!
+  semantic-grammar-wy--<punctuation>-string-analyzer
+  semantic-grammar-wy--<block>-block-analyzer
+  semantic-grammar-wy--<sexp>-sexp-analyzer
+  )
+
+(provide 'semantic-grammar-wy)
+
+;;; semantic-grammar-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-grammar.el b/site/cedet-1.0pre7/semantic/semantic-grammar.el
new file mode 100644
index 0000000..4d24364
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-grammar.el
@@ -0,0 +1,1899 @@
+;;; semantic-grammar.el --- Major mode framework for Semantic grammars
+;;
+;; Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 15 Aug 2002
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-grammar.el,v 1.78 2009/08/29 20:10:05 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Major mode framework for editing Semantic's input grammar files.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'semantic-wisent)
+(require 'font-lock)
+(require 'pp)
+
+(eval-when-compile
+  (require 'senator)
+  (require 'semantic-edit)
+  (require 'semantic-find)
+  (require 'semantic-format)
+  (require 'semantic-idle))
+
+;;;;
+;;;; Set up lexer
+;;;;
+
+(defconst semantic-grammar-lex-c-char-re "'\\s\\?.'"
+  "Regexp matching C-like character literals.")
+
+;; Most of the analyzers are auto-generated from the grammar, but the
+;; following which need special handling code.
+;;
+(define-lex-regex-analyzer semantic-grammar-lex-prologue
+  "Detect and create a prologue token."
+  "\\<%{"
+  ;; Zing to the end of this brace block.
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'PROLOGUE (point)
+    (save-excursion
+      (semantic-lex-unterminated-syntax-protection 'PROLOGUE
+        (forward-char)
+        (forward-sexp 1)
+        (point))))))
+
+(defsubst semantic-grammar-epilogue-start ()
+  "Return the start position of the grammar epilogue."
+  (save-excursion
+    (goto-char (point-min))
+    (if (re-search-forward "^\\s-*\\<%%\\>\\s-*$" nil t 2)
+        (match-beginning 0)
+      (1+ (point-max)))))
+
+(define-lex-regex-analyzer semantic-grammar-lex-epilogue
+  "Detect and create an epilogue or percent-percent token."
+  "\\<%%\\>"
+  (let ((start (match-beginning 0))
+        (end   (match-end 0))
+        (class 'PERCENT_PERCENT))
+    (when (>= start (semantic-grammar-epilogue-start))
+      (setq class 'EPILOGUE
+            end   (point-max)))
+    (semantic-lex-push-token
+     (semantic-lex-token class start end))))
+
+;; Provide auto-generated analyzers and the lexer.
+(require 'semantic-grammar-wy)
+
+;;; Test the lexer
+;;
+(defun semantic-grammar-lex-buffer ()
+  "Run `semantic-grammar-lex' on current buffer."
+  (interactive)
+  (semantic-lex-init)
+  (setq semantic-lex-analyzer 'semantic-grammar-lexer)
+  (let ((token-stream
+         (semantic-lex (point-min) (point-max))))
+    (with-current-buffer (get-buffer-create "*semantic-grammar-lex*")
+      (erase-buffer)
+      (pp token-stream (current-buffer))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+;;;;
+;;;; Semantic action expansion
+;;;;
+
+(defun semantic-grammar-ASSOC (&rest args)
+  "Return expansion of built-in ASSOC expression.
+ARGS are ASSOC's key value list."
+  (let ((key t))
+    `(semantic-tag-make-assoc-list
+      ,@(mapcar #'(lambda (i)
+                    (prog1
+                        (if key
+                            (list 'quote i)
+                          i)
+                      (setq key (not key))))
+                args))))
+
+(defsubst semantic-grammar-quote-p (sym)
+  "Return non-nil if SYM is bound to the `quote' function."
+  (condition-case nil
+      (eq (indirect-function sym)
+          (indirect-function 'quote))
+    (error nil)))
+
+(defsubst semantic-grammar-backquote-p (sym)
+  "Return non-nil if SYM is bound to the `backquote' function."
+  (condition-case nil
+      (eq (indirect-function sym)
+          (indirect-function 'backquote))
+    (error nil)))
+
+;;;;
+;;;; API to access grammar tags
+;;;;
+
+(defvar-mode-local semantic-grammar-mode
+  senator-add-log-tags '(nonterminal put token keyword)
+  "List of nonterminal tags used with add-log.")
+
+(define-mode-local-override semantic-tag-components
+  semantic-grammar-mode (tag)
+  "Return the children of tag TAG."
+  (semantic-tag-get-attribute tag :children))
+
+(defun semantic-grammar-first-tag-name (class)
+  "Return the name of the first tag of class CLASS found.
+Warn if other tags of class CLASS exist."
+  (let* ((tags (semantic-find-tags-by-class
+                class (current-buffer))))
+    (if tags
+        (prog1
+            (semantic-tag-name (car tags))
+          (if (cdr tags)
+              (message "*** Ignore all but first declared %s"
+                       class))))))
+
+(defun semantic-grammar-tag-symbols (class)
+  "Return the list of symbols defined in tags of class CLASS.
+That is tag names plus names defined in tag attribute `:rest'."
+  (let* ((tags (semantic-find-tags-by-class
+                class (current-buffer))))
+    (apply 'append
+           (mapcar
+            #'(lambda (tag)
+                (mapcar
+                 'intern
+                 (cons (semantic-tag-name tag)
+                       (semantic-tag-get-attribute tag :rest))))
+            tags))))
+
+(defsubst semantic-grammar-item-text (item)
+  "Return the readable string form of ITEM."
+  (if (string-match semantic-grammar-lex-c-char-re item)
+      (concat "?" (substring item 1 -1))
+    item))
+
+(defsubst semantic-grammar-item-value (item)
+  "Return symbol or character value of ITEM string."
+  (if (string-match semantic-grammar-lex-c-char-re item)
+      (let ((c (read (concat "?" (substring item 1 -1)))))
+        (if (featurep 'xemacs)
+            ;; Handle characters as integers in XEmacs like in GNU Emacs.
+            (char-int c)
+          c))
+    (intern item)))
+
+(defun semantic-grammar-prologue ()
+  "Return grammar prologue code as a string value."
+  (let ((tag (semantic-find-first-tag-by-name
+              "prologue"
+              (semantic-find-tags-by-class 'code (current-buffer)))))
+    (if tag
+        (save-excursion
+          (concat
+           (buffer-substring
+            (progn
+              (goto-char (semantic-tag-start tag))
+              (skip-chars-forward "%{\r\n\t ")
+              (point))
+            (progn
+              (goto-char (semantic-tag-end tag))
+              (skip-chars-backward "\r\n\t %}")
+              (point)))
+           "\n"))
+      "")))
+
+(defun semantic-grammar-epilogue ()
+  "Return grammar epilogue code as a string value."
+  (let ((tag (semantic-find-first-tag-by-name
+              "epilogue"
+              (semantic-find-tags-by-class 'code (current-buffer)))))
+    (if tag
+        (save-excursion
+          (concat
+           (buffer-substring
+            (progn
+              (goto-char (semantic-tag-start tag))
+              (skip-chars-forward "%\r\n\t ")
+              (point))
+            (progn
+              (goto-char (semantic-tag-end tag))
+              (skip-chars-backward "\r\n\t")
+              ;; If a grammar footer is found, skip it.
+              (re-search-backward "^;;;\\s-+\\S-+\\s-+ends here"
+                                  (save-excursion
+                                    (beginning-of-line)
+                                    (point))
+                                  t)
+              (skip-chars-backward "\r\n\t")
+              (point)))
+           "\n"))
+      "")))
+
+(defsubst semantic-grammar-buffer-file (&optional buffer)
+  "Return name of file sans directory BUFFER is visiting.
+No argument or nil as argument means use the current buffer."
+  (file-name-nondirectory (buffer-file-name buffer)))
+
+(defun semantic-grammar-package ()
+  "Return the %package value as a string.
+If there is no %package statement in the grammar, return a default
+package name derived from the grammar file name.  For example, the
+default package name for the grammar file foo.wy is foo-wy, and for
+foo.by it is foo-by."
+  (or (semantic-grammar-first-tag-name 'package)
+      (let* ((file (semantic-grammar-buffer-file))
+             (ext  (file-name-extension file))
+             (i    (string-match (format "\\([.]\\)%s\\'" ext) file)))
+        (concat (substring file 0 i) "-" ext))))
+
+(defsubst semantic-grammar-languagemode ()
+  "Return the %languagemode value as a list of symbols or nil."
+  (semantic-grammar-tag-symbols 'languagemode))
+
+(defsubst semantic-grammar-start ()
+  "Return the %start value as a list of symbols or nil."
+  (semantic-grammar-tag-symbols 'start))
+
+(defsubst semantic-grammar-scopestart ()
+  "Return the %scopestart value as a symbol or nil."
+  (intern (or (semantic-grammar-first-tag-name 'scopestart) "nil")))
+
+(defsubst semantic-grammar-quotemode ()
+  "Return the %quotemode value as a symbol or nil."
+  (intern (or (semantic-grammar-first-tag-name 'quotemode) "nil")))
+
+(defsubst semantic-grammar-keywords ()
+  "Return the language keywords.
+That is an alist of (VALUE . TOKEN) where VALUE is the string value of
+the keyword and TOKEN is the terminal symbol identifying the keyword."
+  (mapcar
+   #'(lambda (key)
+       (cons (semantic-tag-get-attribute key :value)
+             (intern (semantic-tag-name key))))
+   (semantic-find-tags-by-class 'keyword (current-buffer))))
+
+(defun semantic-grammar-keyword-properties (keywords)
+  "Return the list of KEYWORDS properties."
+  (let ((puts (semantic-find-tags-by-class
+               'put (current-buffer)))
+        put keys key plist assoc pkey pval props)
+    (while puts
+      (setq put   (car puts)
+            puts  (cdr puts)
+            keys  (mapcar
+                   'intern
+                   (cons (semantic-tag-name put)
+                         (semantic-tag-get-attribute put :rest))))
+      (while keys
+        (setq key   (car keys)
+              keys  (cdr keys)
+              assoc (rassq key keywords))
+        (if (null assoc)
+            nil ;;(message "*** %%put to undefined keyword %s ignored" key)
+          (setq key   (car assoc)
+                plist (semantic-tag-get-attribute put :value))
+          (while plist
+            (setq pkey  (intern (caar plist))
+                  pval  (read (cdar plist))
+                  props (cons (list key pkey pval) props)
+                  plist (cdr plist))))))
+    props))
+
+(defun semantic-grammar-tokens ()
+  "Return defined lexical tokens.
+That is an alist (TYPE . DEFS) where type is a %token <type> symbol
+and DEFS is an alist of (TOKEN . VALUE).  TOKEN is the terminal symbol
+identifying the token and VALUE is the string value of the token or
+nil."
+  (let (tags alist assoc tag type term names value)
+
+    ;; Check for <type> in %left, %right & %nonassoc declarations
+    (setq tags (semantic-find-tags-by-class
+                'assoc (current-buffer)))
+    (while tags
+      (setq tag  (car tags)
+            tags (cdr tags))
+      (when (setq type (semantic-tag-type tag))
+        (setq names (semantic-tag-get-attribute tag :value)
+              assoc (assoc type alist))
+        (or assoc (setq assoc (list type)
+                        alist (cons assoc alist)))
+        (while names
+          (setq term  (car names)
+                names (cdr names))
+          (or (string-match semantic-grammar-lex-c-char-re term)
+              (setcdr assoc (cons (list (intern term))
+                                  (cdr assoc)))))))
+
+    ;; Then process %token declarations so they can override any
+    ;; previous specifications
+    (setq tags (semantic-find-tags-by-class
+                'token (current-buffer)))
+    (while tags
+      (setq tag  (car tags)
+            tags (cdr tags))
+      (setq names (cons (semantic-tag-name tag)
+                        (semantic-tag-get-attribute tag :rest))
+            type  (or (semantic-tag-type tag) "<no-type>")
+            value (semantic-tag-get-attribute tag :value)
+            assoc (assoc type alist))
+      (or assoc (setq assoc (list type)
+                      alist (cons assoc alist)))
+      (while names
+        (setq term  (intern (car names))
+              names (cdr names))
+        (setcdr assoc (cons (cons term value) (cdr assoc)))))
+    alist))
+
+(defun semantic-grammar-token-%type-properties (&optional props)
+  "Return properties set by %type statements.
+This declare a new type if necessary.
+If optional argument PROPS is non-nil, it is an existing list of
+properties where to add new properties."
+  (let (type)
+    (dolist (tag (semantic-find-tags-by-class 'type (current-buffer)))
+      (setq type (semantic-tag-name tag))
+      ;; Indicate to auto-generate the analyzer for this type
+      (push (list type :declared t) props)
+      (dolist (e (semantic-tag-get-attribute tag :value))
+        (push (list type (intern (car e)) (read (or (cdr e) "nil")))
+              props)))
+    props))
+
+(defun semantic-grammar-token-%put-properties (tokens)
+  "For types found in TOKENS, return properties set by %put statements."
+  (let (found props)
+    (dolist (put (semantic-find-tags-by-class 'put (current-buffer)))
+      (dolist (type (cons (semantic-tag-name put)
+                          (semantic-tag-get-attribute put :rest)))
+        (setq found (assoc type tokens))
+        (if (null found)
+            nil ;; %put <type> ignored, no token defined
+          (setq type (car found))
+          (dolist (e (semantic-tag-get-attribute put :value))
+            (push (list type (intern (car e)) (read (or (cdr e) "nil")))
+                  props)))))
+    props))
+
+(defsubst semantic-grammar-token-properties (tokens)
+  "Return properties of declared types.
+Types are explicitly declared by %type statements.  Types found in
+TOKENS are those declared implicitly by %token statements.
+Properties can be set by %put and %type statements.
+Properties set by %type statements take precedence over those set by
+%put statements."
+  (let ((props (semantic-grammar-token-%put-properties tokens)))
+    (semantic-grammar-token-%type-properties props)))
+
+(defun semantic-grammar-use-macros ()
+  "Return macro definitions from %use-macros statements.
+Also load the specified macro libraries."
+  (let (lib defs)
+    (dolist (tag (semantic-find-tags-by-class 'macro (current-buffer)))
+      (setq lib (intern (semantic-tag-type tag)))
+      (condition-case nil
+          ;;(load lib) ;; Be sure to use the latest macro library.
+          (require lib)
+        (error nil))
+      (dolist (mac (semantic-tag-get-attribute tag :value))
+        (push (cons (intern mac)
+                    (intern (format "%s-%s" lib mac)))
+              defs)))
+    (nreverse defs)))
+
+(defvar semantic-grammar-macros nil
+  "List of associations (MACRO-NAME . EXPANDER).")
+(make-variable-buffer-local 'semantic-grammar-macros)
+
+(defun semantic-grammar-macros ()
+  "Build and return the alist of defined macros."
+  (append
+   ;; Definitions found in tags.
+   (semantic-grammar-use-macros)
+   ;; Other pre-installed definitions.
+   semantic-grammar-macros))
+
+;;;;
+;;;; Overloaded functions that build parser data.
+;;;;
+
+;;; Keyword table builder
+;;
+(defun semantic-grammar-keywordtable-builder-default ()
+  "Return the default value of the keyword table."
+  (let ((keywords (semantic-grammar-keywords)))
+    `(semantic-lex-make-keyword-table
+      ',keywords
+      ',(semantic-grammar-keyword-properties keywords))))
+
+(define-overloadable-function semantic-grammar-keywordtable-builder ()
+  "Return the keyword table table value.")
+
+;;; Token table builder
+;;
+(defun semantic-grammar-tokentable-builder-default ()
+  "Return the default value of the table of lexical tokens."
+  (let ((tokens (semantic-grammar-tokens)))
+    `(semantic-lex-make-type-table
+      ',tokens
+      ',(semantic-grammar-token-properties tokens))))
+
+(define-overloadable-function semantic-grammar-tokentable-builder ()
+  "Return the value of the table of lexical tokens.")
+
+;;; Parser table builder
+;;
+(defun semantic-grammar-parsetable-builder-default ()
+  "Return the default value of the parse table."
+  (error "`semantic-grammar-parsetable-builder' not defined"))
+
+(define-overloadable-function semantic-grammar-parsetable-builder ()
+  "Return the parser table value.")
+
+;;; Parser setup code builder
+;;
+(defun semantic-grammar-setupcode-builder-default ()
+  "Return the default value of the setup code form."
+  (error "`semantic-grammar-setupcode-builder' not defined"))
+
+(define-overloadable-function semantic-grammar-setupcode-builder ()
+  "Return the parser setup code form.")
+
+;;;;
+;;;; Lisp code generation
+;;;;
+(defvar semantic--grammar-input-buffer  nil)
+(defvar semantic--grammar-output-buffer nil)
+
+(defsubst semantic-grammar-keywordtable ()
+  "Return the variable name of the keyword table."
+  (concat (file-name-sans-extension
+           (semantic-grammar-buffer-file
+            semantic--grammar-output-buffer))
+          "--keyword-table"))
+
+(defsubst semantic-grammar-tokentable ()
+  "Return the variable name of the token table."
+  (concat (file-name-sans-extension
+           (semantic-grammar-buffer-file
+            semantic--grammar-output-buffer))
+          "--token-table"))
+
+(defsubst semantic-grammar-parsetable ()
+  "Return the variable name of the parse table."
+  (concat (file-name-sans-extension
+           (semantic-grammar-buffer-file
+            semantic--grammar-output-buffer))
+          "--parse-table"))
+
+(defsubst semantic-grammar-setupfunction ()
+  "Return the name of the parser setup function."
+  (concat (file-name-sans-extension
+           (semantic-grammar-buffer-file
+            semantic--grammar-output-buffer))
+          "--install-parser"))
+
+(defmacro semantic-grammar-as-string (object)
+  "Return OBJECT as a string value."
+  `(if (stringp ,object)
+       ,object
+     ;;(require 'pp)
+     (pp-to-string ,object)))
+
+(defun semantic-grammar-insert-defconst (name value docstring)
+  "Insert declaration of constant NAME with VALUE and DOCSTRING."
+  (let ((start (point)))
+    (insert (format "(defconst %s\n%s%S)\n\n" name value docstring))
+    (save-excursion
+      (goto-char start)
+      (indent-sexp))))
+
+(defun semantic-grammar-insert-defun (name body docstring)
+  "Insert declaration of function NAME with BODY and DOCSTRING."
+  (let ((start (point)))
+    (insert (format "(defun %s ()\n%S\n%s)\n\n" name docstring body))
+    (save-excursion
+      (goto-char start)
+      (indent-sexp))))
+
+(defun semantic-grammar-insert-define (define)
+  "Insert the declaration specified by DEFINE expression.
+Typically a DEFINE expression should look like this:
+
+\(define-thing name docstring expression1 ...)"
+  ;;(require 'pp)
+  (let ((start (point)))
+    (insert (format "(%S %S" (car define) (nth 1 define)))
+    (dolist (item (nthcdr 2 define))
+      (insert "\n")
+      (delete-blank-lines)
+      (pp item (current-buffer)))
+    (insert ")\n\n")
+    (save-excursion
+      (goto-char start)
+      (indent-sexp))))
+
+(defconst semantic-grammar-header-template
+  '("\
+;;; " file " --- Generated parser support file
+
+" copy "
+
+;; Author: " user-full-name " <" user-mail-address ">
+;; Created: " date "
+;; Keywords: syntax
+;; X-RCS: " vcid "
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file " gram ".
+
+;;; Code:
+")
+  "Generated header template.
+The symbols in the template are local variables in
+`semantic-grammar-header'")
+
+(defconst semantic-grammar-footer-template
+  '("\
+
+\(provide '" libr ")
+
+;;; " file " ends here
+")
+  "Generated footer template.
+The symbols in the list are local variables in
+`semantic-grammar-footer'.")
+
+(defun semantic-grammar-copyright-line ()
+  "Return the grammar copyright line, or nil if not found."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "^;;+[ \t]+Copyright (C) .*$"
+                             ;; Search only in the four top lines
+                             (save-excursion (forward-line 4) (point))
+                             t)
+      (match-string 0))))
+
+(defun semantic-grammar-header ()
+  "Return text of a generated standard header."
+  (let ((file (semantic-grammar-buffer-file
+               semantic--grammar-output-buffer))
+        (gram (semantic-grammar-buffer-file))
+        (date (format-time-string "%Y-%m-%d %T%z"))
+        (vcid (concat "$" "Id" "$")) ;; Avoid expansion
+        ;; Try to get the copyright from the input grammar, or
+        ;; generate a new one if not found.
+        (copy (or (semantic-grammar-copyright-line)
+                  (concat (format-time-string ";; Copyright (C) %Y ")
+                          user-full-name)))
+	(out ""))
+    (dolist (S semantic-grammar-header-template)
+      (cond ((stringp S)
+	     (setq out (concat out S)))
+	    ((symbolp S)
+	     (setq out (concat out (symbol-value S))))))
+    out))
+
+(defun semantic-grammar-footer ()
+  "Return text of a generated standard footer."
+  (let* ((file (semantic-grammar-buffer-file
+                semantic--grammar-output-buffer))
+         (libr (file-name-sans-extension file))
+	 (out ""))
+    (dolist (S semantic-grammar-footer-template)
+      (cond ((stringp S)
+	     (setq out (concat out S)))
+	    ((symbolp S)
+	     (setq out (concat out (symbol-value S))))))
+    out))
+
+(defun semantic-grammar-token-data ()
+  "Return the string value of the table of lexical tokens."
+  (semantic-grammar-as-string
+   (semantic-grammar-tokentable-builder)))
+
+(defun semantic-grammar-keyword-data ()
+  "Return the string value of the table of keywords."
+  (semantic-grammar-as-string
+   (semantic-grammar-keywordtable-builder)))
+
+(defun semantic-grammar-parser-data ()
+  "Return the parser table as a string value."
+  (semantic-grammar-as-string
+   (semantic-grammar-parsetable-builder)))
+
+(defun semantic-grammar-setup-data ()
+  "Return the parser setup code form as a string value."
+  (semantic-grammar-as-string
+   (semantic-grammar-setupcode-builder)))
+
+;;; Generation of lexical analyzers.
+;;
+(defvar semantic-grammar--lex-block-specs)
+
+(defsubst semantic-grammar--lex-delim-spec (block-spec)
+  "Return delimiters specification from BLOCK-SPEC."
+  (condition-case nil
+      (let* ((standard-input (cdr block-spec))
+             (delim-spec (read)))
+        (if (and (consp delim-spec)
+                 (car delim-spec) (symbolp (car delim-spec))
+                 (cadr delim-spec) (symbolp (cadr delim-spec)))
+            delim-spec
+          (error)))
+    (error
+     (error "Invalid delimiters specification %s in block token %s"
+            (cdr block-spec) (car block-spec)))))
+
+(defun semantic-grammar--lex-block-specs ()
+  "Compute lexical block specifications for the current buffer.
+Block definitions are read from the current table of lexical types."
+  (cond
+   ;; Block specifications have been parsed and are invalid.
+   ((eq semantic-grammar--lex-block-specs 'error)
+    nil
+    )
+   ;; Parse block specifications.
+   ((null semantic-grammar--lex-block-specs)
+    (condition-case err
+        (let* ((blocks       (cdr (semantic-lex-type-value "block" t)))
+               (open-delims  (cdr (semantic-lex-type-value "open-paren" t)))
+               (close-delims (cdr (semantic-lex-type-value "close-paren" t)))
+               olist clist block-spec delim-spec open-spec close-spec)
+          (dolist (block-spec blocks)
+            (setq delim-spec (semantic-grammar--lex-delim-spec block-spec)
+                  open-spec  (assq (car  delim-spec) open-delims)
+                  close-spec (assq (cadr delim-spec) close-delims))
+            (or open-spec
+                (error "Missing open-paren token %s required by block %s"
+                       (car delim-spec) (car block-spec)))
+            (or close-spec
+                (error "Missing close-paren token %s required by block %s"
+                       (cdr delim-spec) (car block-spec)))
+            ;; build alist ((OPEN-DELIM OPEN-SYM BLOCK-SYM) ...)
+            (push (list (cdr open-spec) (car open-spec) (car block-spec))
+                  olist)
+            ;; build alist ((CLOSE-DELIM CLOSE-SYM) ...)
+            (push (list (cdr close-spec) (car close-spec))
+                  clist))
+          (setq semantic-grammar--lex-block-specs (cons olist clist)))
+      (error
+       (setq semantic-grammar--lex-block-specs 'error)
+       (message "%s" (error-message-string err))
+       nil))
+    )
+   ;; Block specifications already parsed.
+   (t
+    semantic-grammar--lex-block-specs)))
+
+(defsubst semantic-grammar-quoted-form (exp)
+  "Return a quoted form of EXP if it isn't a self evaluating form."
+  (if (and (not (null exp))
+           (or (listp exp) (symbolp exp)))
+      (list 'quote exp)
+    exp))
+
+(defun semantic-grammar-insert-defanalyzer (type)
+  "Insert declaration of the lexical analyzer defined with TYPE."
+  (let* ((type-name  (symbol-name type))
+         (type-value (symbol-value type))
+         (syntax     (get type 'syntax))
+         (declared   (get type :declared))
+         spec mtype prefix name doc)
+    ;; Generate an analyzer if the corresponding type has been
+    ;; explicitly declared in a %type statement, and if at least the
+    ;; syntax property has been provided.
+    (when (and declared syntax)
+      (setq prefix (file-name-sans-extension
+                    (semantic-grammar-buffer-file
+                     semantic--grammar-output-buffer))
+            mtype (or (get type 'matchdatatype) 'regexp)
+            name (intern (format "%s--<%s>-%s-analyzer" prefix type mtype))
+            doc (format "%s analyzer for <%s> tokens." mtype type))
+      (cond
+       ;; Regexp match analyzer
+       ((eq mtype 'regexp)
+        (semantic-grammar-insert-define
+         `(define-lex-regex-type-analyzer ,name
+            ,doc ,syntax
+            ,(semantic-grammar-quoted-form (cdr type-value))
+            ',(or (car type-value) (intern type-name))))
+        )
+       ;; String compare analyzer
+       ((eq mtype 'string)
+        (semantic-grammar-insert-define
+         `(define-lex-string-type-analyzer ,name
+            ,doc ,syntax
+            ,(semantic-grammar-quoted-form (cdr type-value))
+            ',(or (car type-value) (intern type-name))))
+        )
+       ;; Block analyzer
+       ((and (eq mtype 'block)
+             (setq spec (semantic-grammar--lex-block-specs)))
+        (semantic-grammar-insert-define
+         `(define-lex-block-type-analyzer ,name
+            ,doc ,syntax
+            ,(semantic-grammar-quoted-form spec)))
+        )
+       ;; Sexp analyzer
+       ((eq mtype 'sexp)
+        (semantic-grammar-insert-define
+         `(define-lex-sexp-type-analyzer ,name
+            ,doc ,syntax
+            ',(or (car type-value) (intern type-name))))
+        )
+       ;; keyword analyzer
+       ((eq mtype 'keyword)
+        (semantic-grammar-insert-define
+         `(define-lex-keyword-type-analyzer ,name
+            ,doc ,syntax))
+        )
+       ))
+    ))
+
+(defun semantic-grammar-insert-defanalyzers ()
+  "Insert declarations of lexical analyzers."
+  (let (tokens props)
+    (with-current-buffer semantic--grammar-input-buffer
+      (setq tokens (semantic-grammar-tokens)
+            props  (semantic-grammar-token-properties tokens)))
+    (insert "(require 'semantic-lex)\n\n")
+    (let ((semantic-lex-types-obarray
+           (semantic-lex-make-type-table tokens props))
+          semantic-grammar--lex-block-specs)
+      (mapatoms 'semantic-grammar-insert-defanalyzer
+                semantic-lex-types-obarray))))
+
+;;; Generation of the grammar support file.
+;;
+(defcustom semantic-grammar-file-regexp "\\.[wb]y$"
+  "Regexp which matches grammar source files."
+  :group 'semantic
+  :type 'regexp)
+
+(defsubst semantic-grammar-noninteractive ()
+  "Return non-nil if running without interactive terminal."
+  (if (featurep 'xemacs)
+      (noninteractive)
+    noninteractive))
+
+(defun semantic-grammar-create-package (&optional force)
+  "Create package Lisp code from grammar in current buffer.
+Does nothing if the Lisp code seems up to date.
+If optional argument FORCE is non-nil, unconditionally re-generate the
+Lisp code."
+  (interactive "P")
+  (setq force (or force current-prefix-arg))
+  (semantic-fetch-tags)
+  (let* (
+         ;; Values of the following local variables are obtained from
+         ;; the grammar parsed tree in current buffer, that is before
+         ;; switching to the output file.
+         (package  (semantic-grammar-package))
+         (output   (concat package ".el"))
+         (semantic--grammar-input-buffer  (current-buffer))
+         (semantic--grammar-output-buffer (find-file-noselect output))
+         (header   (semantic-grammar-header))
+         (prologue (semantic-grammar-prologue))
+         (epilogue (semantic-grammar-epilogue))
+         (footer   (semantic-grammar-footer))
+         )
+    (if (and (not force)
+             (not (buffer-modified-p))
+             (file-newer-than-file-p
+              (buffer-file-name semantic--grammar-output-buffer)
+              (buffer-file-name semantic--grammar-input-buffer)))
+        (message "Package `%s' is up to date." package)
+      ;; Create the package
+      (set-buffer semantic--grammar-output-buffer)
+      ;; Use Unix EOLs, so that the file is portable to all platforms.
+      (setq buffer-file-coding-system 'raw-text-unix)
+      (erase-buffer)
+      (unless (eq major-mode 'emacs-lisp-mode)
+        (emacs-lisp-mode))
+      
+;;;; Header + Prologue
+      
+      (insert header
+              "\n;;; Prologue\n;;\n"
+              prologue
+              )
+      ;; Evaluate the prologue now, because it might provide definition
+      ;; of grammar macro expanders.
+      (eval-region (point-min) (point))
+      
+      (save-excursion
+        
+;;;; Declarations
+        
+        (insert "\n;;; Declarations\n;;\n")
+        
+        ;; `eval-defun' is not necessary to reset `defconst' values.
+        (semantic-grammar-insert-defconst
+         (semantic-grammar-keywordtable)
+         (with-current-buffer semantic--grammar-input-buffer
+           (semantic-grammar-keyword-data))
+         "Table of language keywords.")
+        
+        (semantic-grammar-insert-defconst
+         (semantic-grammar-tokentable)
+         (with-current-buffer semantic--grammar-input-buffer
+           (semantic-grammar-token-data))
+         "Table of lexical tokens.")
+        
+        (semantic-grammar-insert-defconst
+         (semantic-grammar-parsetable)
+         (with-current-buffer semantic--grammar-input-buffer
+           (semantic-grammar-parser-data))
+         "Parser table.")
+        
+        (semantic-grammar-insert-defun
+         (semantic-grammar-setupfunction)
+         (with-current-buffer semantic--grammar-input-buffer
+           (semantic-grammar-setup-data))
+         "Setup the Semantic Parser.")
+
+;;;; Analyzers
+        (insert "\n;;; Analyzers\n;;\n")
+
+        (semantic-grammar-insert-defanalyzers)
+
+;;;; Epilogue & Footer
+        
+        (insert "\n;;; Epilogue\n;;\n"
+                epilogue
+                footer
+                )
+        
+        )
+      
+      (save-buffer 16)
+
+      ;; If running in batch mode, there is nothing more to do.
+      ;; Save the generated file and quit.
+      (if (semantic-grammar-noninteractive)
+          (let ((version-control t)
+                (delete-old-versions t)
+                (make-backup-files t)
+                (vc-make-backup-files t))
+            (kill-buffer (current-buffer)))
+        ;; If running interactively, eval declarations and epilogue
+        ;; code, then pop to the buffer visiting the generated file.
+        (eval-region (point) (point-max))
+        (goto-char (point-min))
+        (pop-to-buffer (current-buffer))
+        ;; The generated code has been evaluated and updated into
+        ;; memory.  Now find all buffers that match the major modes we
+        ;; have created this language for, and force them to call our
+        ;; setup function again, refreshing all semantic data, and
+        ;; enabling them to work with the new code just created.
+;;;; FIXME?
+        ;; At this point, I don't know any user's defined setup code :-(
+        ;; At least, what I can do for now, is to run the generated
+        ;; parser-install function.
+        (semantic-map-mode-buffers
+         (semantic-grammar-setupfunction)
+         (semantic-grammar-languagemode)))
+      )
+    ;; Return the name of the generated package file.
+    output))
+
+(defun semantic-grammar-recreate-package ()
+  "Unconditionnaly create Lisp code from grammar in current buffer.
+Like \\[universal-argument] \\[semantic-grammar-create-package]."
+  (interactive)
+  (semantic-grammar-create-package t))
+
+(defun semantic-grammar-batch-build-one-package (file)
+  "Build a Lisp package from the grammar in FILE.
+That is, generate Lisp code from FILE, and `byte-compile' it.
+Return non-nil if there were no errors, nil if errors."
+  ;; We need this require so that we can find `byte-compile-dest-file'.
+  (require 'bytecomp)
+  (unless (auto-save-file-name-p file)
+    ;; Create the package
+    (let ((packagename
+           (condition-case err
+               (with-current-buffer (find-file-noselect file)
+                 (semantic-grammar-create-package))
+             (error
+              (message "%s" (error-message-string err))
+              nil))))
+      (when packagename
+        ;; Only byte compile if out of date
+        (if (file-newer-than-file-p
+             packagename (byte-compile-dest-file packagename))
+            (let (;; Some complex grammar table expressions need a few
+                  ;; more resources than the default.
+                  (max-specpdl-size    (max 3000 max-specpdl-size))
+                  (max-lisp-eval-depth (max 1000 max-lisp-eval-depth))
+                  )
+              ;; byte compile the resultant file
+              (byte-compile-file packagename))
+          t)))))
+
+;;;###autoload
+(defun semantic-grammar-batch-build-packages ()
+  "Build Lisp packages from grammar files on the command line.
+That is, run `semantic-grammar-batch-build-one-package' for each file.
+Each file is processed even if an error occurred previously.
+Must be used from the command line, with `-batch'.
+For example, to process grammar files in current directory, invoke:
+
+  \"emacs -batch -f semantic-grammar-batch-build-packages .\".
+
+See also the variable `semantic-grammar-file-regexp'."
+  (or (semantic-grammar-noninteractive)
+      (error "\
+`semantic-grammar-batch-build-packages' must be used with -batch"
+             ))
+  (let ((status 0)
+        ;; Remove vc from find-file-hooks.  It causes bad stuff to
+        ;; happen in Emacs 20.
+        (find-file-hooks (delete 'vc-find-file-hook find-file-hooks)))
+    (message "Compiling Grammars from: %s" (locate-library "semantic-grammar"))
+    (dolist (arg command-line-args-left)
+      (unless (and arg (file-exists-p arg))
+        (error "Argument %s is not a valid file name" arg))
+      (setq arg (expand-file-name arg))
+      (if (file-directory-p arg)
+          ;; Directory as argument
+          (dolist (src (condition-case nil
+                           (directory-files
+                            arg nil semantic-grammar-file-regexp)
+                         (error
+                          (error "Unable to read directory files"))))
+            (or (semantic-grammar-batch-build-one-package
+                 (expand-file-name src arg))
+                (setq status 1)))
+        ;; Specific file argument
+        (or (semantic-grammar-batch-build-one-package arg)
+            (setq status 1))))
+    (kill-emacs status)
+    ))
+
+;;;;
+;;;; Macros highlighting
+;;;;
+
+(defvar semantic--grammar-macros-regexp-1 nil)
+(make-variable-buffer-local 'semantic--grammar-macros-regexp-1)
+
+(defun semantic--grammar-macros-regexp-1 ()
+  "Return font-lock keyword regexp for pre-installed macro names."
+  (and semantic-grammar-macros
+       (not semantic--grammar-macros-regexp-1)
+       (condition-case nil
+           (setq semantic--grammar-macros-regexp-1
+                 (concat "(\\s-*"
+                         (regexp-opt
+                          (mapcar #'(lambda (e) (symbol-name (car e)))
+                                  semantic-grammar-macros)
+                          t)
+                         "\\>"))
+         (error nil)))
+  semantic--grammar-macros-regexp-1)
+
+(defconst semantic--grammar-macdecl-re
+  "\\<%use-macros\\>[ \t\r\n]+\\(\\sw\\|\\s_\\)+[ \t\r\n]+{"
+  "Regexp that matches a macro declaration statement.")
+
+(defvar semantic--grammar-macros-regexp-2 nil)
+(make-variable-buffer-local 'semantic--grammar-macros-regexp-2)
+
+(defun semantic--grammar-clear-macros-regexp-2 (&rest ignore)
+  "Clear the cached regexp that match macros local in this grammar.
+IGNORE arguments.
+Added to `before-change-functions' hooks to be run before each text
+change."
+  (setq semantic--grammar-macros-regexp-2 nil))
+
+(defun semantic--grammar-macros-regexp-2 ()
+  "Return the regexp that match macros local in this grammar."
+  (unless semantic--grammar-macros-regexp-2
+    (let (macs)
+      (save-excursion
+        (goto-char (point-min))
+        (while (re-search-forward semantic--grammar-macdecl-re nil t)
+          (condition-case nil
+              (setq macs (nconc macs
+                                (split-string
+                                 (buffer-substring-no-properties
+                                  (point)
+                                  (progn
+                                    (backward-char)
+                                    (forward-list 1)
+                                    (down-list -1)
+                                    (point))))))
+            (error nil)))
+        (when macs
+          (setq semantic--grammar-macros-regexp-2
+                (concat "(\\s-*" (regexp-opt macs t) "\\>"))))))
+  semantic--grammar-macros-regexp-2)
+
+(defun semantic--grammar-macros-matcher (end)
+  "Search for a grammar macro name to highlight.
+END is the limit of the search."
+  (let ((regexp (semantic--grammar-macros-regexp-1)))
+    (or (and regexp (re-search-forward regexp end t))
+        (and (setq regexp (semantic--grammar-macros-regexp-2))
+             (re-search-forward regexp end t)))))
+
+;;;;
+;;;; Define major mode
+;;;;
+
+(defvar semantic-grammar-syntax-table
+  (let ((table (make-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\: "."     table) ;; COLON
+    (modify-syntax-entry ?\> "."     table) ;; GT
+    (modify-syntax-entry ?\< "."     table) ;; LT
+    (modify-syntax-entry ?\| "."     table) ;; OR
+    (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+    (modify-syntax-entry ?\n ">"     table) ;; Comment end
+    (modify-syntax-entry ?\" "\""    table) ;; String
+    (modify-syntax-entry ?\% "w"     table) ;; Word
+    (modify-syntax-entry ?\- "_"     table) ;; Symbol
+    (modify-syntax-entry ?\. "_"     table) ;; Symbol
+    (modify-syntax-entry ?\\ "\\"    table) ;; Quote
+    (modify-syntax-entry ?\` "'"     table) ;; Prefix ` (backquote)
+    (modify-syntax-entry ?\' "'"     table) ;; Prefix ' (quote)
+    (modify-syntax-entry ?\, "'"     table) ;; Prefix , (comma)
+    (modify-syntax-entry ?\# "'"     table) ;; Prefix # (sharp)
+    table)
+  "Syntax table used in a Semantic grammar buffers.")
+
+(defvar semantic-grammar-mode-hook nil
+  "Hook run when starting Semantic grammar mode.")
+
+(defvar semantic-grammar-mode-keywords-1
+  `(("\\(\\<%%\\>\\|\\<%[{}]\\)"
+     0 font-lock-reference-face)
+    ("\\(%\\)\\(\\(\\sw\\|\\s_\\)+\\)"
+     (1 font-lock-reference-face)
+     (2 font-lock-keyword-face))
+    ("\\<error\\>"
+     0 (unless (semantic-grammar-in-lisp-p) 'bold))
+    ("^\\(\\(\\sw\\|\\s_\\)+\\)[ \n\r\t]*:"
+     1 font-lock-function-name-face)
+    (semantic--grammar-macros-matcher
+     1 ,(if (boundp 'font-lock-builtin-face)
+            'font-lock-builtin-face
+          'font-lock-preprocessor-face))
+    ("\\$\\(\\sw\\|\\s_\\)*"
+     0 font-lock-variable-name-face)
+    ("<\\(\\(\\sw\\|\\s_\\)+\\)>"
+     1 font-lock-type-face)
+    (,semantic-grammar-lex-c-char-re
+     0 ,(if (boundp 'font-lock-constant-face)
+            'font-lock-constant-face
+          'font-lock-string-face) t)
+    ;; Must highlight :keyword here, because ':' is a punctuation in
+    ;; grammar mode!
+    ("[\r\n\t ]+:\\sw+\\>"
+     0 font-lock-builtin-face)
+    ;; Append the Semantic keywords
+    ,@semantic-fw-font-lock-keywords
+    )
+  "Font Lock keywords used to highlight Semantic grammar buffers.")
+
+(defvar semantic-grammar-mode-keywords-2
+  (append semantic-grammar-mode-keywords-1
+          lisp-font-lock-keywords-1)
+  "Font Lock keywords used to highlight Semantic grammar buffers.")
+
+(defvar semantic-grammar-mode-keywords-3
+  (append semantic-grammar-mode-keywords-1
+          lisp-font-lock-keywords-2)
+  "Font Lock keywords used to highlight Semantic grammar buffers.")
+
+(defvar semantic-grammar-mode-keywords
+  semantic-grammar-mode-keywords-1
+  "Font Lock keywords used to highlight Semantic grammar buffers.")
+
+(defvar semantic-grammar-map
+  (let ((km (make-sparse-keymap)))
+
+    (define-key km "|" 'semantic-grammar-electric-punctuation)
+    (define-key km ";" 'semantic-grammar-electric-punctuation)
+    (define-key km "%" 'semantic-grammar-electric-punctuation)
+    (define-key km "(" 'semantic-grammar-electric-punctuation)
+    (define-key km ")" 'semantic-grammar-electric-punctuation)
+    (define-key km ":" 'semantic-grammar-electric-punctuation)
+
+    (define-key km "\t"       'semantic-grammar-indent)
+    (define-key km "\M-\t"    'semantic-grammar-complete)
+    (define-key km "\C-c\C-c" 'semantic-grammar-create-package)
+    (define-key km "\C-cm"    'semantic-grammar-find-macro-expander)
+    (define-key km "\C-cik"    'semantic-grammar-insert-keyword)
+;;  (define-key km "\C-cc"    'semantic-grammar-generate-and-load)
+;;  (define-key km "\C-cr"    'semantic-grammar-generate-one-rule)
+
+    km)
+  "Keymap used in `semantic-grammar-mode'.")
+
+(defvar semantic-grammar-menu
+  '("Grammar"
+    ["Indent Line" semantic-grammar-indent]
+    ["Complete Symbol" semantic-grammar-complete]
+    ["Find Macro" semantic-grammar-find-macro-expander]
+    "--"
+    ["Insert %keyword" semantic-grammar-insert-keyword]
+    "--"
+    ["Update Lisp Package" semantic-grammar-create-package]
+    ["Recreate Lisp Package" semantic-grammar-recreate-package]
+    )
+  "Common semantic grammar menu.")
+
+(defun semantic-grammar-setup-menu-emacs (symbol mode-menu)
+  "Setup a GNU Emacs grammar menu in variable SYMBOL.
+MODE-MENU is an optional specific menu whose items are appended to the
+common grammar menu."
+  (let ((items (make-symbol "items")))
+    `(unless (boundp ',symbol)
+       (easy-menu-define ,symbol (current-local-map)
+         "Grammar Menu" semantic-grammar-menu)
+       (let ((,items (cdr ,mode-menu)))
+         (when ,items
+           (easy-menu-add-item ,symbol nil "--")
+           (while ,items
+             (easy-menu-add-item ,symbol nil (car ,items))
+             (setq ,items (cdr ,items))))))
+    ))
+
+(defun semantic-grammar-setup-menu-xemacs (symbol mode-menu)
+  "Setup an XEmacs grammar menu in variable SYMBOL.
+MODE-MENU is an optional specific menu whose items are appended to the
+common grammar menu."
+  (let ((items (make-symbol "items"))
+        (path (make-symbol "path")))
+    `(progn
+       (unless (boundp ',symbol)
+         (easy-menu-define ,symbol nil
+           "Grammar Menu" (copy-sequence semantic-grammar-menu)))
+       (easy-menu-add ,symbol)
+       (let ((,items (cdr ,mode-menu))
+             (,path (list (car ,symbol))))
+         (when ,items
+           (easy-menu-add-item nil ,path "--")
+           (while ,items
+             (easy-menu-add-item nil ,path (car ,items))
+             (setq ,items (cdr ,items))))))
+    ))
+
+(defmacro semantic-grammar-setup-menu (&optional mode-menu)
+  "Setup a mode local grammar menu.
+MODE-MENU is an optional specific menu whose items are appended to the
+common grammar menu."
+  (let ((menu (intern (format "%s-menu" major-mode))))
+    (if (featurep 'xemacs)
+        (semantic-grammar-setup-menu-xemacs menu mode-menu)
+      (semantic-grammar-setup-menu-emacs menu mode-menu))))
+
+(defsubst semantic-grammar-in-lisp-p ()
+  "Return non-nil if point is in Lisp code."
+  (or (>= (point) (semantic-grammar-epilogue-start))
+      (condition-case nil
+          (save-excursion
+            (up-list -1)
+            t)
+        (error nil))))
+
+(defun semantic-grammar-edits-new-change-hook-fcn (overlay)
+  "Function set into `semantic-edits-new-change-hook'.
+Argument OVERLAY is the overlay created to mark the change.
+When OVERLAY marks a change in the scope of a nonterminal tag extend
+the change bounds to encompass the whole nonterminal tag."
+  (let ((outer (car (semantic-find-tag-by-overlay-in-region
+                     (semantic-edits-os overlay)
+                     (semantic-edits-oe overlay)))))
+    (if (semantic-tag-of-class-p outer 'nonterminal)
+        (semantic-overlay-move overlay
+                               (semantic-tag-start outer)
+                               (semantic-tag-end outer)))))
+
+(defun semantic-grammar-mode ()
+  "Initialize a buffer for editing Semantic grammars.
+
+\\{semantic-grammar-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'semantic-grammar-mode
+        mode-name "Semantic Grammar Framework")
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  (set (make-local-variable 'comment-start) ";;")
+  ;; Look within the line for a ; following an even number of backslashes
+  ;; after either a non-backslash or the line beginning.
+  (set (make-local-variable 'comment-start-skip)
+       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
+  (set-syntax-table semantic-grammar-syntax-table)
+  (use-local-map semantic-grammar-map)
+  (set (make-local-variable 'indent-line-function)
+       'semantic-grammar-indent)
+  (set (make-local-variable 'fill-paragraph-function)
+       'lisp-fill-paragraph)
+  (set (make-local-variable 'font-lock-multiline)
+       'undecided)
+  (set (make-local-variable 'font-lock-defaults)
+       '((semantic-grammar-mode-keywords
+          semantic-grammar-mode-keywords-1
+          semantic-grammar-mode-keywords-2
+          semantic-grammar-mode-keywords-3)
+         nil  ;; perform string/comment fontification
+         nil  ;; keywords are case sensitive.
+         ;; This puts _ & - as a word constituant,
+         ;; simplifying our keywords significantly
+         ((?_ . "w") (?- . "w"))))
+  ;; Setup Semantic to parse grammar
+  (semantic-grammar-wy--install-parser)
+  (setq semantic-lex-comment-regex ";;"
+        semantic-lex-analyzer 'semantic-grammar-lexer
+        semantic-type-relation-separator-character '(":")
+        semantic-symbol->name-assoc-list
+        '(
+          (code         . "Setup Code")
+          (keyword      . "Keyword")
+          (token        . "Token")
+          (nonterminal  . "Nonterminal")
+          (rule         . "Rule")
+          ))
+  (set (make-local-variable 'semantic-format-face-alist)
+       '(
+         (code         . default)
+         (keyword      . font-lock-keyword-face)
+         (token        . font-lock-type-face)
+         (nonterminal  . font-lock-function-name-face)
+         (rule         . default)
+         ))
+  (set (make-local-variable 'semantic-stickyfunc-sticky-classes)
+       '(nonterminal))
+  ;; Before each change, clear the cached regexp used to highlight
+  ;; macros local in this grammar.
+  (semantic-make-local-hook 'before-change-functions)
+  (add-hook 'before-change-functions
+            'semantic--grammar-clear-macros-regexp-2 nil t)
+  ;; Handle safe re-parse of grammar rules.
+  (semantic-make-local-hook 'semantic-edits-new-change-hooks)
+  (add-hook 'semantic-edits-new-change-hooks
+            'semantic-grammar-edits-new-change-hook-fcn
+            nil t)
+  (semantic-run-mode-hooks 'semantic-grammar-mode-hook))
+
+;;;;
+;;;; Useful commands
+;;;;
+
+(defvar semantic-grammar-skip-quoted-syntax-table
+  (let ((st (copy-syntax-table semantic-grammar-syntax-table)))
+    (modify-syntax-entry ?\' "$" st)
+    st)
+  "Syntax table to skip a whole quoted expression in grammar code.
+Consider quote as a \"paired delimiter\", so `forward-sexp' will skip
+whole quoted expression.")
+
+(defsubst semantic-grammar-backward-item ()
+  "Move point to beginning of the previous grammar item."
+  (forward-comment (- (point-max)))
+  (if (zerop (skip-syntax-backward "."))
+      (if (eq (char-before) ?\')
+          (with-syntax-table
+              ;; Can't be Lisp code here!  Temporarily consider quote
+              ;; as a "paired delimiter", so `forward-sexp' can skip
+              ;; the whole quoted expression.
+              semantic-grammar-skip-quoted-syntax-table
+            (forward-sexp -1))
+        (forward-sexp -1))))
+
+(defun semantic-grammar-anchored-indentation ()
+  "Return indentation based on previous anchor character found."
+  (let (indent)
+    (save-excursion
+      (while (not indent)
+        (semantic-grammar-backward-item)
+        (cond
+         ((bobp)
+          (setq indent 0))
+         ((looking-at ":\\(\\s-\\|$\\)")
+          (setq indent (current-column))
+          (forward-char)
+          (skip-syntax-forward "-")
+          (if (eolp) (setq indent 2))
+          )
+         ((and (looking-at "[;%]")
+               (not (looking-at "\\<%prec\\>")))
+          (setq indent 0)
+          ))))
+    indent))
+
+(defun semantic-grammar-do-grammar-indent ()
+  "Indent a line of grammar.
+When called the point is not in Lisp code."
+  (let (indent n)
+    (save-excursion
+      (beginning-of-line)
+      (skip-syntax-forward "-")
+      (setq indent (current-column))
+      (cond
+       ((or (bobp)
+            (looking-at "\\(\\w\\|\\s_\\)+\\s-*:")
+            (and (looking-at "%")
+                 (not (looking-at "%prec\\>"))))
+        (setq n 0))
+       ((looking-at ":")
+        (setq n 2))
+       ((and (looking-at ";;")
+             (save-excursion (forward-comment (point-max))
+                             (looking-at ":")))
+        (setq n 1))
+       (t
+        (setq n (semantic-grammar-anchored-indentation))
+        (unless (zerop n)
+          (cond
+           ((looking-at ";;")
+            (setq n (1- n)))
+           ((looking-at "[|;]")
+            )
+           (t
+            (setq n (+ n 2)))))))
+      (when (/= n indent)
+        (beginning-of-line)
+        (delete-horizontal-space)
+        (indent-to n)))))
+
+(defvar semantic-grammar-brackets-as-parens-syntax-table
+  (let ((st (copy-syntax-table emacs-lisp-mode-syntax-table)))
+    (modify-syntax-entry ?\{ "(}  " st)
+    (modify-syntax-entry ?\} "){  " st)
+    st)
+  "Syntax table that consider brackets as parenthesis.
+So `lisp-indent-line' will work inside bracket blocks.")
+
+(defun semantic-grammar-do-lisp-indent ()
+  "Maybe run the Emacs Lisp indenter on a line of code.
+Return nil if not in a Lisp expression."
+    (condition-case nil
+        (save-excursion
+          (beginning-of-line)
+          (skip-chars-forward "\t ")
+          (let ((first (point)))
+            (or (>= first (semantic-grammar-epilogue-start))
+                (up-list -1))
+            (condition-case nil
+                (while t
+                  (up-list -1))
+              (error nil))
+            (beginning-of-line)
+            (save-restriction
+              (narrow-to-region (point) first)
+              (goto-char (point-max))
+              (with-syntax-table
+                  ;; Temporarily consider brackets as parenthesis so
+                  ;; `lisp-indent-line' can indent Lisp code inside
+                  ;; brackets.
+                  semantic-grammar-brackets-as-parens-syntax-table
+                (lisp-indent-line))))
+          t)
+      (error nil)))
+
+(defun semantic-grammar-indent ()
+  "Indent the current line.
+Use the Lisp or grammar indenter depending on point location."
+  (interactive)
+  (let ((orig (point))
+        first)
+    (or (semantic-grammar-do-lisp-indent)
+        (semantic-grammar-do-grammar-indent))
+    (setq first (save-excursion
+                  (beginning-of-line)
+                  (skip-chars-forward "\t ")
+                  (point)))
+    (if (or (< orig first) (/= orig (point)))
+        (goto-char first))))
+
+(defun semantic-grammar-electric-punctuation ()
+  "Insert and reindent for the symbol just typed in."
+  (interactive)
+  (self-insert-command 1)
+  (save-excursion
+    (semantic-grammar-indent)))
+
+(defun semantic-grammar-complete ()
+  "Attempt to complete the symbol under point.
+Completion is position sensitive.  If the cursor is in a match section of
+a rule, then nonterminals symbols are scanned.  If the cursor is in a Lisp
+expression then Lisp symbols are completed."
+  (interactive)
+  (if (semantic-grammar-in-lisp-p)
+      ;; We are in lisp code.  Do lisp completion.
+      (lisp-complete-symbol)
+    ;; We are not in lisp code.  Do rule completion.
+    (let* ((nonterms (semantic-find-tags-by-class 'nonterminal (current-buffer)))
+           (sym (car (semantic-ctxt-current-symbol)))
+           (ans (try-completion sym nonterms)))
+      (cond ((eq ans t)
+             ;; All done
+             (message "Symbols is already complete"))
+            ((and (stringp ans) (string= ans sym))
+             ;; Max matchable.  Show completions.
+	     (with-output-to-temp-buffer "*Completions*"
+	       (display-completion-list (all-completions sym nonterms)))
+	     )
+            ((stringp ans)
+             ;; Expand the completions
+             (forward-sexp -1)
+             (delete-region (point) (progn (forward-sexp 1) (point)))
+             (insert ans))
+            (t (message "No Completions."))
+            ))
+    ))
+
+(defun semantic-grammar-insert-keyword (name)
+  "Insert a new %keyword declaration with NAME.
+Assumes it is typed in with the correct casing."
+  (interactive "sKeyword: ")
+  (if (not (bolp)) (insert "\n"))
+  (insert "%keyword " (upcase name) "        \"" name "\"
+%put     " (upcase name) " summary
+\"\"\n")
+  (forward-char -2))
+
+;;; Macro facilities
+;;
+
+(defsubst semantic--grammar-macro-function-tag (name)
+  "Search for a function tag for the grammar macro with name NAME.
+Return the tag found or nil if not found."
+  (car (semantic-find-tags-by-class
+        'function
+        (or (semantic-find-tags-by-name name (current-buffer))
+            (and (featurep 'semanticdb)
+                 semanticdb-current-database
+                 (cdar (semanticdb-find-tags-by-name name nil t)))))))
+
+(defsubst semantic--grammar-macro-lib-part (def)
+  "Return the library part of the grammar macro defined by DEF."
+  (let ((suf (format "-%s\\'" (regexp-quote (symbol-name (car def)))))
+        (fun (symbol-name (cdr def))))
+    (substring fun 0 (string-match suf fun))))
+
+(defun semantic--grammar-macro-compl-elt (def &optional full)
+  "Return a completion entry for the grammar macro defined by DEF.
+If optional argument FULL is non-nil qualify the macro name with the
+library found in DEF."
+  (let ((mac (car def))
+        (lib (semantic--grammar-macro-lib-part def)))
+    (cons (if full
+              (format "%s/%s" mac lib)
+            (symbol-name mac))
+          (list mac lib))))
+
+(defun semantic--grammar-macro-compl-dict ()
+  "Return a completion dictionnary of macro definitions."
+  (let ((defs (semantic-grammar-macros))
+        def dups dict)
+    (while defs
+      (setq def  (car defs)
+            defs (cdr defs))
+      (if (or (assoc (car def) defs) (assoc (car def) dups))
+          (push def dups)
+        (push (semantic--grammar-macro-compl-elt def) dict)))
+    (while dups
+      (setq def  (car dups)
+            dups (cdr dups))
+      (push (semantic--grammar-macro-compl-elt def t) dict))
+    dict))
+
+(defun semantic-grammar-find-macro-expander (macro-name library)
+  "Visit the Emacs Lisp library where a grammar macro is implemented.
+MACRO-NAME is a symbol that identifies a grammar macro.
+LIBRARY is the name (sans extension) of the Emacs Lisp library where
+to start searching the macro implementation.  Lookup in included
+libraries, if necessary.
+Find a function tag (in current tags table) whose name contains MACRO-NAME.
+Select the buffer containing the tag's definition, and move point there."
+  (interactive
+   (let* ((dic (semantic--grammar-macro-compl-dict))
+          (def (assoc (completing-read "Macro: " dic nil 1) dic)))
+     (or (cdr def) '(nil nil))))
+  (when (and macro-name library)
+    (let* ((lib (format "%s.el" library))
+           (buf (find-file-noselect (or (locate-library lib t) lib)))
+           (tag (with-current-buffer buf
+                  (semantic--grammar-macro-function-tag
+                   (format "%s-%s" library macro-name)))))
+      (if tag
+          (progn
+            (pop-to-buffer (semantic-tag-buffer tag))
+            (goto-char (semantic-tag-start tag))
+            (semantic-momentary-highlight-tag tag))
+        (pop-to-buffer buf)
+        (message "No expander found in library %s for macro %s"
+                 library macro-name)))))
+
+;;; Additional help
+;;
+
+(defvar semantic-grammar-syntax-help
+  `(
+    ;; Lexical Symbols
+    ("symbol" . "Syntax: A symbol of alpha numeric and symbol characters")
+    ("number" . "Syntax: Numeric characters.")
+    ("punctuation" . "Syntax: Punctuation character.")
+    ("semantic-list" . "Syntax: A list delimited by any valid list characters")
+    ("open-paren" . "Syntax: Open Parenthesis character")
+    ("close-paren" . "Syntax: Close Parenthesis character")
+    ("string" . "Syntax: String character delimited text")
+    ("comment" . "Syntax: Comment character delimited text")
+    ;; Special Macros
+    ("EMPTY" . "Syntax: Match empty text")
+    ("ASSOC" . "Lambda Key: (ASSOC key1 value1 key2 value2 ...)")
+    ("EXPAND" . "Lambda Key: (EXPAND <list id> <rule>)")
+    ("EXPANDFULL" . "Lambda Key: (EXPANDFULL <list id> <rule>)")
+    ;; Tag Generator Macros
+    ("TAG" . "Generic Tag Generation: (TAG <name> <tag-class> [ :key value ]*)")
+    ("VARIABLE-TAG" . "(VARIABLE-TAG <name> <lang-type> <default-value> [ :key value ]*)")
+    ("FUNCTION-TAG" . "(FUNCTION-TAG <name> <lang-type> <arg-list> [ :key value ]*)")
+    ("TYPE-TAG" . "(TYPE-TAG <name> <lang-type> <part-list> <parents> [ :key value ]*)")
+    ("INCLUDE-TAG" . "(INCLUDE-TAG <name> <system-flag> [ :key value ]*)")
+    ("PACKAGE-TAG" . "(PACKAGE-TAG <name> <detail> [ :key value ]*)")
+    ("CODE-TAG" . "(CODE-TAG <name> <detail> [ :key value ]*)")
+    ("ALIAS-TAG" . "(ALIAS-TAG <name> <aliasclass> <definition> [:key value]*)")
+    ;; Special value macros
+    ("$1" . "Match Value: Value from match list in slot 1")
+    ("$2" . "Match Value: Value from match list in slot 2")
+    ("$3" . "Match Value: Value from match list in slot 3")
+    ("$4" . "Match Value: Value from match list in slot 4")
+    ("$5" . "Match Value: Value from match list in slot 5")
+    ("$6" . "Match Value: Value from match list in slot 6")
+    ("$7" . "Match Value: Value from match list in slot 7")
+    ("$8" . "Match Value: Value from match list in slot 8")
+    ("$9" . "Match Value: Value from match list in slot 9")
+    ;; Same, but with annoying , in front.
+    (",$1" . "Match Value: Value from match list in slot 1")
+    (",$2" . "Match Value: Value from match list in slot 2")
+    (",$3" . "Match Value: Value from match list in slot 3")
+    (",$4" . "Match Value: Value from match list in slot 4")
+    (",$5" . "Match Value: Value from match list in slot 5")
+    (",$6" . "Match Value: Value from match list in slot 6")
+    (",$7" . "Match Value: Value from match list in slot 7")
+    (",$8" . "Match Value: Value from match list in slot 8")
+    (",$9" . "Match Value: Value from match list in slot 9")
+    )
+  "Association of syntax elements, and the corresponding help.")
+
+(eval-when-compile
+  (require 'eldoc)
+  (require 'semantic-ctxt)
+  (cond
+   ((fboundp 'eldoc-function-argstring-from-docstring)
+    (defalias 'semantic-grammar-function-argstring-from-docstring
+      'eldoc-function-argstring-from-docstring)
+    )
+   ((fboundp 'help-split-fundoc)
+    (defsubst semantic-grammar-function-argstring-from-docstring (fun)
+      (help-split-fundoc (documentation fun t) fun))
+    )
+   (t
+    (defalias 'semantic-grammar-function-argstring-from-docstring
+      'ignore)
+    )
+   ))
+
+(defun semantic-grammar-eldoc-get-macro-docstring (macro expander)
+  "Return a one-line docstring for the given grammar MACRO.
+EXPANDER is the name of the function that expands MACRO."
+  (if (and (eq expander (aref eldoc-last-data 0))
+           (eq 'function (aref eldoc-last-data 2)))
+      (aref eldoc-last-data 1)
+    (let ((doc (semantic-grammar-function-argstring-from-docstring expander)))
+      (cond
+       (doc
+        (setq doc (car doc))
+        (string-match "\\`[^ )]* ?" doc)
+        (setq doc (concat "(" (substring doc (match-end 0)))))
+       (t
+        (setq doc (eldoc-function-argstring expander))))
+      (when doc
+        (setq doc
+	      (condition-case nil
+		  (eldoc-docstring-format-sym-doc
+                   macro (format "==> %s %s" expander doc)
+		   'default)
+		;; Older emacsen w/out the third arg here.
+		(error
+		 (eldoc-docstring-format-sym-doc
+		  macro (format "==> %s %s" expander doc)))))
+		
+        (eldoc-last-data-store expander doc 'function))
+      doc)))
+
+(define-mode-local-override semantic-idle-summary-current-symbol-info
+  semantic-grammar-mode ()
+  "Display additional eldoc information about grammar syntax elements.
+Syntax element is the current symbol at point.
+If it is associated a help string in `semantic-grammar-syntax-help',
+return that string.
+If it is a macro name, return a description of the associated expander
+function parameter list.
+If it is a function name, return a description of this function
+parameter list.
+It it is a variable name, return a brief (one-line) documentation
+string for the variable.
+If a default description of the current context can be obtained,
+return it.
+Otherwise return nil."
+  (let* ((elt (car (semantic-ctxt-current-symbol)))
+         (val (and elt (cdr (assoc elt semantic-grammar-syntax-help)))))
+    (when (and (not val) elt (semantic-grammar-in-lisp-p))
+      ;; Ensure to load macro definitions before doing `intern-soft'.
+      (setq val (semantic-grammar-macros)
+            elt (intern-soft elt)
+            val (and elt (cdr (assq elt val))))
+      (cond
+       ;; Grammar macro
+       ((and val (fboundp val))
+        (setq val (semantic-grammar-eldoc-get-macro-docstring elt val)))
+       ;; Function
+       ((and elt (fboundp elt))
+        (setq val (eldoc-get-fnsym-args-string elt)))
+       ;; Variable
+       ((and elt (boundp elt))
+        (setq val (eldoc-get-var-docstring elt)))
+       (t nil)))
+    (or val (semantic-idle-summary-current-symbol-info-default))))
+
+(define-mode-local-override semantic-tag-boundary-p
+  semantic-grammar-mode (tag)
+  "Return non-nil for tags that should have a boundary drawn.
+Only tags of type 'nonterminal will be so marked."
+  (let ((c (semantic-tag-class tag)))
+    (eq c 'nonterminal)))
+
+(define-mode-local-override semantic-ctxt-current-function
+  semantic-grammar-mode (&optional point)
+  "Determine the name of the current function at POINT."
+  (save-excursion
+    (and point (goto-char point))
+    (when (semantic-grammar-in-lisp-p)
+      (with-mode-local emacs-lisp-mode
+        (semantic-ctxt-current-function)))))
+
+(define-mode-local-override semantic-ctxt-current-argument
+  semantic-grammar-mode (&optional point)
+  "Determine the argument index of the called function at POINT."
+  (save-excursion
+    (and point (goto-char point))
+    (when (semantic-grammar-in-lisp-p)
+      (with-mode-local emacs-lisp-mode
+        (semantic-ctxt-current-argument)))))
+
+(define-mode-local-override semantic-ctxt-current-assignment
+  semantic-grammar-mode (&optional point)
+  "Determine the tag being assigned into at POINT."
+  (save-excursion
+    (and point (goto-char point))
+    (when (semantic-grammar-in-lisp-p)
+      (with-mode-local emacs-lisp-mode
+        (semantic-ctxt-current-assignment)))))
+
+(define-mode-local-override semantic-ctxt-current-class-list
+  semantic-grammar-mode (&optional point)
+  "Determine the class of tags that can be used at POINT."
+  (save-excursion
+    (and point (goto-char point))
+    (if (semantic-grammar-in-lisp-p)
+        (with-mode-local emacs-lisp-mode
+          (semantic-ctxt-current-class-list))
+      '(nonterminal keyword))))
+
+(define-mode-local-override semantic-ctxt-current-mode
+  semantic-grammar-mode (&optional point)
+  "Return the major mode active at POINT.
+POINT defaults to the value of point in current buffer.
+Return `emacs-lisp-mode' is POINT is within Lisp code, otherwise
+return the current major mode."
+  (save-excursion
+    (and point (goto-char point))
+    (if (semantic-grammar-in-lisp-p)
+        'emacs-lisp-mode
+      (semantic-ctxt-current-mode-default))))
+
+(define-mode-local-override semantic-format-tag-abbreviate
+  semantic-grammar-mode (tag &optional parent color)
+  "Return a string abbreviation of TAG.
+Optional PARENT is not used.
+Optional COLOR is used to flag if color is added to the text."
+  (let ((class (semantic-tag-class tag))
+        (name (semantic-format-tag-name tag parent color)))
+    (cond
+     ((eq class 'nonterminal)
+      (concat name ":"))
+     ((eq class 'setting)
+      "%settings%")
+     ((memq class '(rule keyword))
+      name)
+     (t
+      (concat "%" (symbol-name class) " " name)))))
+
+(define-mode-local-override semantic-format-tag-summarize
+  semantic-grammar-mode (tag &optional parent color)
+  "Return a string summarizing TAG.
+Optional PARENT is not used.
+Optional argument COLOR determines if color is added to the text."
+  (let ((class (semantic-tag-class tag))
+        (name (semantic-format-tag-name tag parent color))
+        (label nil)
+        (desc nil))
+    (cond
+     ((eq class 'nonterminal)
+      (setq label "Nonterminal: "
+            desc (format
+                  " with %d match lists."
+                  (length (semantic-tag-components tag)))))
+     ((eq class 'keyword)
+      (setq label "Keyword: ")
+      (let (summary)
+        (semantic--find-tags-by-function
+         #'(lambda (put)
+             (unless summary
+               (setq summary (cdr (assoc "summary"
+                                         (semantic-tag-get-attribute
+                                          put :value))))))
+         ;; Get `put' tag with TAG name.
+         (semantic-find-tags-by-name-regexp
+          (regexp-quote (semantic-tag-name tag))
+          (semantic-find-tags-by-class 'put (current-buffer))))
+        (setq desc (concat " = "
+                           (semantic-tag-get-attribute tag :value)
+                           (if summary
+                               (concat " - " (read summary))
+                             "")))))
+     ((eq class 'token)
+      (setq label "Token: ")
+      (let ((val   (semantic-tag-get-attribute tag :value))
+            (names (semantic-tag-get-attribute tag :rest))
+            (type  (semantic-tag-type tag)))
+        (if names
+            (setq name (mapconcat 'identity (cons name names) " ")))
+        (setq desc (concat
+                    (if type
+                        (format " <%s>" type)
+                      "")
+                    (if val
+                        (format "%s%S" val (if type " " ""))
+                      "")))))
+     ((eq class 'assoc)
+      (setq label "Assoc: ")
+      (let ((val   (semantic-tag-get-attribute tag :value))
+            (type  (semantic-tag-type tag)))
+        (setq desc (concat
+                    (if type
+                        (format " <%s>" type)
+                      "")
+                    (if val
+                        (concat " " (mapconcat 'identity val " "))
+                      "")))))
+     (t
+      (setq desc (semantic-format-tag-abbreviate tag parent color))))
+    (if (and color label)
+        (setq label (semantic--format-colorize-text label 'label)))
+    (if (and color label desc)
+        (setq desc (semantic--format-colorize-text desc 'comment)))
+    (if label
+        (concat label name desc)
+      ;; Just a description is the abbreviated version
+      desc)))
+
+;;; Semantic Analysis
+;;
+(eval-when-compile
+  (require 'semantic-analyze))
+
+(define-mode-local-override semantic-analyze-current-context
+  semantic-grammar-mode (point)
+  "Provide a semantic analysis object describing a context in a grammar."
+  (if (semantic-grammar-in-lisp-p)
+      (with-mode-local emacs-lisp-mode
+	(semantic-analyze-current-context point))
+
+    (let* ((context-return nil)
+	   (prefixandbounds (semantic-ctxt-current-symbol-and-bounds))
+	   (prefix (car prefixandbounds))
+	   (bounds (nth 2 prefixandbounds))
+	   (prefixsym nil)
+	   (prefixclass (semantic-ctxt-current-class-list))
+	   )
+
+      ;; Do context for rules when in a match list.
+      (setq prefixsym
+	    (semantic-find-first-tag-by-name
+	     (car prefix)
+	     (current-buffer)))
+
+      (setq context-return
+	    (semantic-analyze-context
+	     "context-for-semantic-grammar"
+	     :buffer (current-buffer)
+	     :scope nil
+	     :bounds bounds
+	     :prefix (if prefixsym
+			 (list prefixsym)
+		       prefix)
+	     :prefixtypes nil
+	     :prefixclass prefixclass
+	     ))
+
+      context-return)))
+
+(define-mode-local-override semantic-analyze-possible-completions
+  semantic-grammar-mode (context)
+  "Return a list of possible completions based on CONTEXT."
+  (if (semantic-grammar-in-lisp-p)
+      (with-mode-local emacs-lisp-mode
+	(semantic-analyze-possible-completions context))
+    (save-excursion
+      (set-buffer (oref context buffer))
+      (let* ((prefix (car (oref context :prefix)))
+	     (completetext (cond ((semantic-tag-p prefix)
+				  (semantic-tag-name prefix))
+				 ((stringp prefix)
+				  prefix)
+				 ((stringp (car prefix))
+				  (car prefix))))
+	     (tags (semantic-find-tags-for-completion completetext
+						      (current-buffer))))
+	(semantic-analyze-tags-of-class-list
+	 tags (oref context prefixclass)))
+      )))
+
+(provide 'semantic-grammar)
+
+;;; semantic-grammar.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-grammar.wy b/site/cedet-1.0pre7/semantic/semantic-grammar.wy
new file mode 100644
index 0000000..81f1f99
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-grammar.wy
@@ -0,0 +1,460 @@
+;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
+;;
+;; Copyright (C) 2002, 2003, 2004 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 26 Aug 2002
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+%{
+  ;; Current parsed nonterminal name.
+  (defvar semantic-grammar-wy--nterm nil)
+  ;; Index of rule in a nonterminal clause.
+  (defvar semantic-grammar-wy--rindx nil)
+  }
+
+;;%package semantic-grammar-wy
+
+%languagemode wy-mode
+
+;; Main
+%start grammar
+;; Reparse
+%start prologue epilogue declaration nonterminal rule
+;; EXPANDFULL
+%start put_names put_values use_names
+
+;; Keywords
+%type    <keyword>
+%keyword DEFAULT-PREC    "%default-prec"
+%keyword NO-DEFAULT-PREC "%no-default-prec"
+%keyword KEYWORD         "%keyword"
+%keyword LANGUAGEMODE    "%languagemode"
+%keyword LEFT            "%left"
+%keyword NONASSOC        "%nonassoc"
+%keyword PACKAGE         "%package"
+%keyword PREC            "%prec"
+%keyword PUT             "%put"
+%keyword QUOTEMODE       "%quotemode"
+%keyword RIGHT           "%right"
+%keyword SCOPESTART      "%scopestart"
+%keyword START           "%start"
+%keyword TOKEN           "%token"
+%keyword TYPE            "%type"
+%keyword USE-MACROS      "%use-macros"
+
+;; Literals
+%type  <string>
+%token <string>      STRING
+
+%type  <symbol>      syntax ":?\\(\\sw\\|\\s_\\)+"
+%token <symbol>      SYMBOL
+%token <symbol>      PERCENT_PERCENT "\\`%%\\'"
+
+%type  <char>        syntax semantic-grammar-lex-c-char-re
+%token <char>        CHARACTER
+
+%type  <qlist>       matchdatatype sexp syntax "\\s'\\s-*("
+%token <qlist>       PREFIXED_LIST
+
+%type  <sexp>        matchdatatype sexp syntax "\\="
+%token <sexp>        SEXP
+
+;; Don't generate these analyzers which needs special handling code.
+%token <code>        PROLOGUE "%{...%}"
+%token <code>        EPILOGUE "%%...EOF"
+
+;; Blocks & Parenthesis
+%type  <block>
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+
+;; Punctuations
+%type  <punctuation>
+%token <punctuation> COLON       ":"
+%token <punctuation> SEMI        ";"
+%token <punctuation> OR          "|"
+%token <punctuation> LT          "<"
+%token <punctuation> GT          ">"
+
+%%
+
+grammar:
+    prologue
+  | epilogue
+  | declaration
+  | nonterminal
+  | PERCENT_PERCENT
+  ;
+
+;;; Prologue/Epilogue
+;;
+prologue:
+    PROLOGUE
+    (CODE-TAG "prologue" nil)
+  ;
+
+epilogue:
+    EPILOGUE
+    (CODE-TAG "epilogue" nil)
+  ;
+
+;;; Declarations
+;;
+declaration:
+    decl
+    (eval $1)
+  ;
+
+decl:
+    default_prec_decl
+  | no_default_prec_decl
+  | languagemode_decl
+  | package_decl
+  | precedence_decl
+  | put_decl
+  | quotemode_decl
+  | scopestart_decl
+  | start_decl
+  | keyword_decl
+  | token_decl
+  | type_decl
+  | use_macros_decl
+  ;
+
+default_prec_decl:
+    DEFAULT-PREC
+    `(TAG "default-prec" 'assoc :value '("t"))
+  ;
+
+no_default_prec_decl:
+    NO-DEFAULT-PREC
+    `(TAG "default-prec" 'assoc :value '("nil"))
+  ;
+
+languagemode_decl:
+    LANGUAGEMODE symbols
+    `(TAG ',(car $2) 'languagemode :rest ',(cdr $2))
+  ;
+
+package_decl:
+    PACKAGE SYMBOL
+    `(PACKAGE-TAG ',$2 nil)
+  ;
+
+precedence_decl:
+    associativity token_type_opt items
+    `(TAG ',$1 'assoc :type ',$2 :value ',$3)
+  ;
+
+associativity:
+    LEFT
+    (progn "left")
+  | RIGHT
+    (progn "right")
+  | NONASSOC
+    (progn "nonassoc")
+  ;
+
+put_decl:
+    PUT put_name put_value
+    `(TAG ',$2 'put :value ',(list $3))
+  | PUT put_name put_value_list
+    `(TAG ',$2 'put :value ',$3)
+  | PUT put_name_list put_value
+    `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',(list $3))
+  | PUT put_name_list put_value_list
+    `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',$3)
+  ;
+
+put_name_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 put_names))
+  ;
+
+put_names:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | put_name
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (TAG $1 'put-name)
+  ;
+
+put_name:
+    SYMBOL
+  | token_type
+  ;
+
+put_value_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-code-detail (EXPANDFULL $1 put_values))
+  ;
+
+put_values:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | put_value
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (CODE-TAG "put-value" $1)
+  ;
+
+put_value:
+    SYMBOL any_value
+    (cons $1 $2)
+  ;
+
+scopestart_decl:
+    SCOPESTART SYMBOL
+    `(TAG ',$2 'scopestart)
+  ;
+
+quotemode_decl:
+    QUOTEMODE SYMBOL
+    `(TAG ',$2 'quotemode)
+  ;
+
+start_decl:
+    START symbols
+    `(TAG ',(car $2) 'start :rest ',(cdr $2))
+  ;
+
+keyword_decl:
+    KEYWORD SYMBOL string_value
+    `(TAG ',$2 'keyword :value ',$3)
+  ;
+
+token_decl:
+    TOKEN token_type_opt SYMBOL string_value
+    `(TAG ',$3 ',(if $2 'token 'keyword) :type ',$2 :value ',$4)
+  | TOKEN token_type_opt symbols
+    `(TAG ',(car $3) 'token :type ',$2 :rest ',(cdr $3))
+  ;
+
+token_type_opt:
+ ;; EMPTY
+  | token_type
+  ;
+
+token_type:
+    LT SYMBOL GT
+    (progn $2)
+  ;
+
+type_decl:
+    TYPE token_type plist_opt
+    `(TAG ',$2 'type :value ',$3)
+  ;
+
+plist_opt:
+ ;;EMPTY
+  | plist
+  ;
+
+plist:
+    plist put_value
+    (append (list $2) $1)
+  | put_value
+    (list $1)
+  ;
+
+use_name_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 use_names))
+  ;
+
+use_names:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | SYMBOL
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (TAG $1 'use-name)
+  ;
+
+use_macros_decl:
+    USE-MACROS SYMBOL use_name_list
+    `(TAG "macro" 'macro :type ',$2 :value ',$3)
+  ;
+
+string_value:
+    STRING
+    (read $1)
+  ;
+
+;; Return a Lisp readable form
+any_value:
+    SYMBOL
+  | STRING
+  | PAREN_BLOCK
+  | PREFIXED_LIST
+  | SEXP
+  ;
+
+symbols:
+    lifo_symbols
+    (nreverse $1)
+  ;
+
+lifo_symbols:
+    lifo_symbols SYMBOL
+    (cons $2 $1)
+  | SYMBOL
+    (list $1)
+  ;
+
+;;; Grammar rules
+;;
+nonterminal:
+    SYMBOL
+    (setq semantic-grammar-wy--nterm $1
+          semantic-grammar-wy--rindx 0)
+    COLON rules SEMI
+    (TAG $1 'nonterminal :children $4)
+  ;
+
+rules:
+    lifo_rules
+    (apply 'nconc (nreverse $1))
+  ;
+
+lifo_rules:
+    lifo_rules OR rule
+    (cons $3 $1)
+  | rule
+    (list $1)
+  ;
+
+rule:
+    rhs
+    (let* ((nterm semantic-grammar-wy--nterm)
+           (rindx semantic-grammar-wy--rindx)
+           (rhs   $1)
+           comps prec action elt)
+      (setq semantic-grammar-wy--rindx (1+ semantic-grammar-wy--rindx))
+      (while rhs
+        (setq elt (car rhs)
+              rhs (cdr rhs))
+        (cond
+         ;; precedence level
+         ((vectorp elt)
+          (if prec
+              (error "duplicate %%prec in `%s:%d' rule" nterm rindx))
+          (setq prec (aref elt 0)))
+         ;; action
+         ((consp elt)
+          ;; don't forget that rhs items are in reverse order, so
+          ;; the end-of-rule semantic action is the first item.
+          (if (or action comps)
+              ;; a mid-rule action
+              (setq comps (cons elt comps)
+                    ;; keep rule and action index synchronized
+                    semantic-grammar-wy--rindx
+                    (1+ semantic-grammar-wy--rindx))
+            ;; the end-of-rule action
+            (setq action (car elt))))
+         ;; item
+         (t
+          (setq comps (cons elt comps)))))
+      (EXPANDTAG
+       (TAG (format "%s:%d" nterm rindx) 'rule
+            :type (if comps "group" "empty")
+            :value comps :prec prec :expr action)))
+  ;
+
+rhs:
+ ;; EMPTY
+  | rhs item
+    (cons $2 $1)
+  | rhs action
+    (cons (list $2) $1)
+  | rhs PREC item
+    (cons (vector $3) $1)
+  ;
+
+action:
+    PAREN_BLOCK
+  | PREFIXED_LIST
+  | BRACE_BLOCK
+    (format "(progn\n%s)"
+            (let ((s $1))
+              (if (string-match "^{[\r\n\t ]*" s)
+                  (setq s (substring s (match-end 0))))
+              (if (string-match "[\r\n\t ]*}$" s)
+                  (setq s (substring s 0 (match-beginning 0))))
+              s))
+  ;
+
+items:
+    lifo_items
+    (nreverse $1)
+  ;
+
+lifo_items:
+    lifo_items item
+    (cons $2 $1)
+  | item
+    (list $1)
+  ;
+
+item:
+    SYMBOL
+  | CHARACTER
+  ;
+
+%%
+
+(define-lex semantic-grammar-lexer
+  "Lexical analyzer that handles Semantic grammar buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-whitespace
+  ;; Must detect prologue/epilogue before other symbols/keywords!
+  semantic-grammar-lex-prologue
+  semantic-grammar-lex-epilogue
+  semantic-grammar-wy--<keyword>-keyword-analyzer
+  semantic-grammar-wy--<symbol>-regexp-analyzer
+  semantic-grammar-wy--<char>-regexp-analyzer
+  semantic-grammar-wy--<string>-sexp-analyzer
+  ;; Must detect comments after strings because `comment-start-skip'
+  ;; regexp match semicolons inside strings!
+  semantic-lex-ignore-comments
+  ;; Must detect prefixed list before punctuation because prefix chars
+  ;; are also punctuations!
+  semantic-grammar-wy--<qlist>-sexp-analyzer
+  ;; Must detect punctuations after comments because the semicolon can
+  ;; be a punctuation or a comment start!
+  semantic-grammar-wy--<punctuation>-string-analyzer
+  semantic-grammar-wy--<block>-block-analyzer
+  semantic-grammar-wy--<sexp>-sexp-analyzer
+  )
+
+;;; semantic-grammar.wy ends here
+
diff --git a/site/cedet-1.0pre7/semantic/semantic-html.el b/site/cedet-1.0pre7/semantic/semantic-html.el
new file mode 100644
index 0000000..770774e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-html.el
@@ -0,0 +1,262 @@
+;;; semantic-html.el --- Semantic details for html files
+
+;;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-html.el,v 1.14 2010/02/20 20:52:11 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parse HTML files and organize them in a nice way.
+;; Pay attention to anchors, including them in the tag list.
+;;
+;; Copied from the original semantic-texi.el.
+;;
+;; ToDo: Find <script> tags, and parse the contents in other
+;; parsers, such as javascript, php, shtml, or others.
+
+(require 'semantic)
+(require 'semantic-format)
+(condition-case nil
+    ;; This is not installed in all versions of Emacs.
+    (require 'sgml-mode) ;; html-mode is in here.
+  (error
+   (require 'psgml-mode) ;; XEmacs uses psgml, and html-mode is in here.
+   ))
+
+;;; Code:
+(eval-when-compile
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+(defvar semantic-html-super-regex
+  "<\\(h[1-9]\\|title\\|script\\|body\\|a +href\\)\\>"
+  "Regular expression used to find special sections in an HTML file.")
+
+(defvar semantic-html-section-list
+  '(("title" 1)
+    ("script" 1)
+    ("body" 1)
+    ("a" 11)
+    ("h1" 2)
+    ("h2" 3)
+    ("h3" 4)
+    ("h4" 5)
+    ("h5" 6)
+    ("h6" 7)
+    ("h7" 8)
+    ("h8" 9)
+    ("h9" 10)
+    )
+  "Alist of sectioning commands and their relative level.")
+
+(define-mode-local-override semantic-parse-region
+  html-mode (&rest ignore)
+  "Parse the current html buffer for semantic tags.
+INGNORE any arguments.  Always parse the whole buffer.
+Each tag returned is of the form:
+ (\"NAME\" section (:members CHILDREN))
+or
+ (\"NAME\" anchor)"
+  (mapcar 'semantic-html-expand-tag
+	  (semantic-html-parse-headings)))
+
+(define-mode-local-override semantic-parse-changes
+  html-mode ()
+  "We can't parse changes for HTML mode right now."
+  (semantic-parse-tree-set-needs-rebuild))
+
+(defun semantic-html-expand-tag (tag)
+  "Expand the HTML tag TAG."
+  (let ((chil (semantic-html-components tag)))
+    (if chil
+        (semantic-tag-put-attribute
+         tag :members (mapcar 'semantic-html-expand-tag chil)))
+    (car (semantic--tag-expand tag))))
+
+(defun semantic-html-components (tag)
+  "Return components belonging to TAG."
+  (semantic-tag-get-attribute tag :members))
+
+(defun semantic-html-parse-headings ()
+  "Parse the current html buffer for all semantic tags."
+  (let ((pass1 nil))
+    ;; First search and snarf.
+    (save-excursion
+      (goto-char (point-min))
+      (working-status-forms (file-name-nondirectory buffer-file-name) "done"
+	(while (re-search-forward semantic-html-super-regex nil t)
+	  (setq pass1 (cons (match-beginning 0) pass1))
+	  (working-status)
+	  )
+	(working-status t)))
+    (setq pass1 (nreverse pass1))
+    ;; Now, make some tags while creating a set of children.
+    (car (semantic-html-recursive-combobulate-list pass1 0))
+    ))
+
+(defun semantic-html-set-endpoint (metataglist pnt)
+  "Set the end point of the first section tag in METATAGLIST to PNT.
+METATAGLIST is a list of tags in the intermediate tag format used by the
+html parser.  PNT is the new point to set."
+  (let ((metatag nil))
+    (while (and metataglist
+		(not (eq (semantic-tag-class (car metataglist)) 'section)))
+      (setq metataglist (cdr metataglist)))
+    (setq metatag (car metataglist))
+    (when metatag
+      (setcar (nthcdr (1- (length metatag)) metatag) pnt)
+      metatag)))
+
+(defsubst semantic-html-new-section-tag (name members level start end)
+  "Create a semantic tag of class section.
+NAME is the name of this section.
+MEMBERS is a list of semantic tags representing the elements that make
+up this section.
+LEVEL is the levelling level.
+START and END define the location of data described by the tag."
+  (let ((anchorp (eq level 11)))
+    (append (semantic-tag name
+			  (cond (anchorp 'anchor)
+				(t 'section))
+			  :members members)
+	    (list start (if anchorp (point) end)) )))
+
+(defun semantic-html-extract-section-name ()
+  "Extract a section name from the current buffer and point.
+Assume the cursor is in the tag representing the section we
+need the name from."
+  (save-excursion
+    ; Skip over the HTML tag.
+    (forward-sexp -1)
+    (forward-char -1)
+    (forward-sexp 1)
+    (skip-chars-forward "\n\t ")
+    (while (looking-at "<")
+      (forward-sexp 1)
+      (skip-chars-forward "\n\t ")
+      )
+    (let ((start (point))
+	  (end nil))
+      (if (re-search-forward "</" nil t)
+	  (progn
+	    (goto-char (match-beginning 0))
+	    (skip-chars-backward " \n\t")
+	    (setq end (point))
+	    (buffer-substring-no-properties start end))
+	""))
+    ))
+
+(defun semantic-html-recursive-combobulate-list (sectionlist level)
+  "Rearrange SECTIONLIST to be a hierarchical tag list starting at LEVEL.
+Return the rearranged new list, with all remaining tags from
+SECTIONLIST starting at ELT 2.  Sections not are not dealt with as soon as a
+tag with greater section value than LEVEL is found."
+  (let ((newl nil)
+	(oldl sectionlist)
+	(case-fold-search t)
+        tag
+	)
+    (save-excursion
+      (catch 'level-jump
+	(while oldl
+	  (goto-char (car oldl))
+	  (if (looking-at "<\\(\\w+\\)")
+	      (let* ((word (match-string 1))
+		     (levelmatch (assoc-ignore-case
+                                  word semantic-html-section-list))
+		     text begin tmp
+		     )
+		(when (not levelmatch)
+		  (error "Tag %s matched in regexp but is not in list"
+			 word))
+		;; Set begin to the right location
+		(setq begin (point))
+		;; Get out of here if there if we made it that far.
+		(if (and levelmatch (<= (car (cdr levelmatch)) level))
+		    (progn
+		      (when newl
+			(semantic-html-set-endpoint newl begin))
+		      (throw 'level-jump t)))
+		;; When there is a match, the descriptive text
+		;; consists of the rest of the line.
+		(goto-char (match-end 1))
+		(skip-chars-forward " \t")
+		(setq text (semantic-html-extract-section-name))
+		;; Next, recurse into the body to find the end.
+		(setq tmp (semantic-html-recursive-combobulate-list
+			   (cdr oldl) (car (cdr levelmatch))))
+		;; Build a tag
+		(setq tag (semantic-html-new-section-tag
+			   text (car tmp) (car (cdr levelmatch)) begin (point-max)))
+		;; Before appending the newtag, update the previous tag
+		;; if it is a section tag.
+		(when newl
+		  (semantic-html-set-endpoint newl begin))
+		;; Append new tag to our master list.
+		(setq newl (cons tag newl))
+		;; continue
+		(setq oldl (cdr tmp))
+		)
+	    (error "Problem finding section in semantic/html parser"))
+	  ;; (setq oldl (cdr oldl))
+	  )))
+    ;; Return the list
+    (cons (nreverse newl) oldl)))
+
+(define-mode-local-override semantic-sb-tag-children-to-expand
+  html-mode (tag)
+  "The children TAG expands to."
+  (semantic-html-components tag))
+
+;;;###autoload
+(defun semantic-default-html-setup ()
+  "Set up a buffer for parsing of HTML files."
+  ;; This will use our parser.
+  (setq semantic-parser-name "HTML"
+        semantic--parse-table t
+        imenu-create-index-function 'semantic-create-imenu-index
+	semantic-command-separation-character ">"
+	semantic-type-relation-separator-character '(":")
+	semantic-symbol->name-assoc-list '((section . "Section")
+					   )
+	semantic-imenu-expandable-tag-classes '(section)
+	semantic-imenu-bucketize-file nil
+	semantic-imenu-bucketize-type-members nil
+	senator-step-at-start-end-tag-classes '(section)
+	senator-step-at-tag-classes '(section)
+	semantic-stickyfunc-sticky-classes '(section)
+	)
+  (semantic-install-function-overrides
+   '((tag-components . semantic-html-components)
+     )
+   t)
+  )
+
+;;;###autoload
+(add-hook 'html-mode-hook 'semantic-default-html-setup)
+
+(define-child-mode html-helper-mode html-mode
+  "`html-helper-mode' needs the same semantic support as `html-mode'.")
+
+(provide 'semantic-html)
+
+;;; semantic-html.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ia-sb.el b/site/cedet-1.0pre7/semantic/semantic-ia-sb.el
new file mode 100644
index 0000000..cc61c1c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ia-sb.el
@@ -0,0 +1,370 @@
+;;; semantic-ia-sb.el --- Speedbar analysis display interactor
+
+;;; Copyright (C) 2002, 2003, 2004, 2006, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-ia-sb.el,v 1.25 2009/09/11 23:36:33 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Speedbar node for displaying derived context information.
+;;
+
+(require 'semantic-analyze)
+(require 'speedbar)
+
+;;; Code:
+(defvar semantic-ia-sb-key-map nil
+  "Keymap used when in semantic analysis display mode.")
+
+(if semantic-ia-sb-key-map
+    nil
+  (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap))
+
+  ;; Basic featuers.
+  (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line)
+  (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info)
+  )
+
+(defvar semantic-ia-sb-easymenu-definition
+  '( "---"
+;     [ "Expand" speedbar-expand-line nil ]
+;     [ "Contract" speedbar-contract-line nil ]
+     [ "Tag Information" semantic-ia-sb-show-tag-info t ]
+     [ "Jump to Tag" speedbar-edit-line t ]
+     [ "Complete" speedbar-edit-line t ]
+     )
+  "Extra menu items Analysis mode.")
+
+;; Make sure our special speedbar major mode is loaded
+(speedbar-add-expansion-list '("Analyze"
+			       semantic-ia-sb-easymenu-definition
+			       semantic-ia-sb-key-map
+			       semantic-ia-speedbar))
+
+(speedbar-add-mode-functions-list
+ (list "Analyze"
+       ;;'(speedbar-item-info . eieio-speedbar-item-info)
+       '(speedbar-line-directory . semantic-ia-sb-line-path)))
+
+;;;###autoload
+(defun semantic-speedbar-analysis ()
+  "Start Speedbar in semantic analysis mode.
+The analyzer displays information about the current context, plus a smart
+list of possible completions."
+  (interactive)
+  ;; Make sure that speedbar is active
+  (speedbar-frame-mode 1)
+  ;; Now, throw us into Analyze  mode on speedbar.
+  (speedbar-change-initial-expansion-list "Analyze")
+  )
+
+(defun semantic-ia-speedbar (directory zero)
+  "Create buttons in speedbar which define the current analysis at POINT.
+DIRECTORY is the current directory, which is ignored, and ZERO is 0."
+  (let ((analysis nil)
+	(scope nil)
+	(buffer nil)
+	(completions nil)
+	(cf (selected-frame))
+	(cnt nil)
+	(mode-local-active-mode nil)
+	)
+    ;; Try and get some sort of analysis
+    (condition-case nil
+	(progn
+	  (speedbar-select-attached-frame)
+	  (setq buffer (current-buffer))
+	  (setq mode-local-active-mode major-mode)
+	  (save-excursion
+	    ;; Get the current scope
+	    (setq scope (semantic-calculate-scope (point)))
+	    ;; Get the analysis
+	    (setq analysis (semantic-analyze-current-context (point)))
+	    (setq cnt (semantic-find-tag-by-overlay))
+	    (when analysis
+	      (setq completions (semantic-analyze-possible-completions analysis))
+	      )
+	    ))
+      (error nil))
+    (select-frame cf)
+    (save-excursion
+      (set-buffer speedbar-buffer)
+      ;; If we have something, do something spiff with it.
+      (erase-buffer)
+      (speedbar-insert-separator "Buffer/Function")
+      ;; Note to self: Turn this into an expandable file name.
+      (speedbar-make-tag-line 'bracket ?  nil nil
+			      (buffer-name buffer)
+			      nil nil 'speedbar-file-face 0)
+
+      (when cnt
+	(semantic-ia-sb-string-list cnt
+				    'speedbar-tag-face
+				    'semantic-sb-token-jump))
+      (when analysis
+	;; If this analyzer happens to point at a complete symbol, then
+	;; see if we can dig up some documentation for it.
+	(semantic-ia-sb-show-doc analysis))
+
+      (when analysis
+	;; Let different classes draw more buttons.
+	(semantic-ia-sb-more-buttons analysis)
+	(when completions
+	  (speedbar-insert-separator "Completions")
+	  (semantic-ia-sb-completion-list completions
+					  'speedbar-tag-face
+					  'semantic-ia-sb-complete))
+	)
+
+      ;; Show local variables
+      (when scope
+	(semantic-ia-sb-show-scope scope))
+
+      )))
+
+(defmethod semantic-ia-sb-show-doc ((context semantic-analyze-context))
+  "Show documentation about CONTEXT iff CONTEXT points at a complete symbol."
+  (let ((sym (car (reverse (oref context prefix))))
+	(doc nil))
+    (when (semantic-tag-p sym)
+      (setq doc (semantic-documentation-for-tag sym))
+      (when doc
+	(speedbar-insert-separator "Documentation")
+	(insert doc)
+	(insert "\n")
+	))
+    ))
+
+(defun semantic-ia-sb-show-scope (scope)
+  "Show SCOPE information."
+  (let ((localvars (when scope
+		     (oref scope localvar)))
+	)
+    (when localvars
+      (speedbar-insert-separator "Local Variables")
+      (semantic-ia-sb-string-list localvars
+				  'speedbar-tag-face
+				  ;; This is from semantic-sb
+				  'semantic-sb-token-jump))))
+
+(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context))
+  "Show a set of speedbar buttons specific to CONTEXT."
+  (let ((prefix (oref context prefix)))
+    (when prefix
+      (speedbar-insert-separator "Prefix")
+      (semantic-ia-sb-string-list prefix
+				  'speedbar-tag-face
+				  'semantic-sb-token-jump))
+    ))
+
+(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-assignment))
+  "Show a set of speedbar buttons specific to CONTEXT."
+  (call-next-method)
+  (let ((assignee (oref context assignee)))
+    (when assignee
+      (speedbar-insert-separator "Assignee")
+      (semantic-ia-sb-string-list assignee
+				  'speedbar-tag-face
+				  'semantic-sb-token-jump))))
+
+(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-functionarg))
+  "Show a set of speedbar buttons specific to CONTEXT."
+  (call-next-method)
+  (let ((func (oref context function)))
+    (when func
+      (speedbar-insert-separator "Function")
+      (semantic-ia-sb-string-list func
+				  'speedbar-tag-face
+				  'semantic-sb-token-jump)
+      ;; An index for the argument the prefix is in:
+      (let ((arg (oref context argument))
+	    (args (semantic-tag-function-arguments (car func)))
+	    (idx 0)
+	    )
+	(speedbar-insert-separator
+	 (format "Argument #%d" (oref context index)))
+	(if args
+	    (semantic-ia-sb-string-list args
+					'speedbar-tag-face
+					'semantic-sb-token-jump
+					(oref context index)
+					'speedbar-selected-face)
+	  ;; Else, no args list, so use what the context had.
+	  (semantic-ia-sb-string-list arg
+				      'speedbar-tag-face
+				      'semantic-sb-token-jump))
+	))))
+
+(defun semantic-ia-sb-string-list (list face function &optional idx idxface)
+  "Create some speedbar buttons from LIST.
+Each button will use FACE, and be activated with FUNCTION.
+Optional IDX is an index into LIST to apply IDXFACE instead."
+  (let ((count 1))
+    (while list
+      (let* ((usefn nil)
+	     (string (cond ((stringp (car list))
+			    (car list))
+			   ((semantic-tag-p (car list))
+			    (setq usefn (semantic-tag-with-position-p (car list)))
+			    (semantic-format-tag-uml-concise-prototype (car list)))
+			   (t "<No Tag>")))
+	     (localface (if (or (not idx) (/= idx count))
+			    face
+			  idxface))
+	     )
+	(if (semantic-tag-p (car list))
+	    (speedbar-make-tag-line 'angle ?i
+				    'semantic-ia-sb-tag-info (car list)
+				    string (if usefn function) (car list) localface
+				    0)
+	  (speedbar-make-tag-line 'statictag ??
+				  nil nil
+				  string (if usefn function) (car list) localface
+				  0))
+	(setq list (cdr list)
+	      count (1+ count)))
+      )))
+
+(defun semantic-ia-sb-completion-list (list face function)
+  "Create some speedbar buttons from LIST.
+Each button will use FACE, and be activated with FUNCTION."
+  (while list
+    (let* ((documentable nil)
+	   (string (cond ((stringp (car list))
+			  (car list))
+			 ((semantic-tag-p (car list))
+			  (setq documentable t)
+			  (semantic-format-tag-uml-concise-prototype (car list)))
+			(t "foo"))))
+      (if documentable
+	  (speedbar-make-tag-line 'angle ?i
+				  'semantic-ia-sb-tag-info
+				  (car list)
+				  string function (car list) face
+				  0)
+	(speedbar-make-tag-line 'statictag ?  nil nil
+				string function (car list) face
+				0))
+      (setq list (cdr list)))))
+
+(defun semantic-ia-sb-show-tag-info ()
+  "Display information about the tag on the current line.
+Same as clicking on the <i> button.
+See `semantic-ia-sb-tag-info' for more."
+  (interactive)
+  (let ((tok nil))
+    (save-excursion
+      (end-of-line)
+      (forward-char -1)
+      (setq tok (get-text-property (point) 'speedbar-token)))
+    (semantic-ia-sb-tag-info nil tok 0)))
+
+(defun semantic-ia-sb-tag-info (text tag indent)
+  "Display as much information as we can about tag.
+Show the information in a shrunk split-buffer and expand
+out as many details as possible.
+TEXT, TAG, and INDENT are speedbar function arguments."
+  (when (semantic-tag-p tag)
+    (unwind-protect
+	(let ((ob nil))
+	  (speedbar-select-attached-frame)
+	  (setq ob (current-buffer))
+	  (with-output-to-temp-buffer "*Tag Information*"
+	    ;; Output something about this tag:
+	    (save-excursion
+	      (set-buffer "*Tag Information*")
+	      (goto-char (point-max))
+	      (insert
+	       (semantic-format-tag-prototype tag nil t)
+	       "\n")
+	      (let ((typetok
+		     (condition-case nil
+			 (save-excursion
+			   (set-buffer ob)
+			   ;; @todo - We need a context to derive a scope from.
+			   (semantic-analyze-tag-type tag nil))
+		       (error nil))))
+		(if typetok
+		    (insert (semantic-format-tag-prototype
+			     typetok nil t))
+		  ;; No type found by the analyzer
+		  ;; The below used to try and select the buffer from the last
+		  ;; analysis, but since we are already in the correct buffer, I
+		  ;; don't think that is needed.
+		  (let ((type (semantic-tag-type tag)))
+		    (cond ((semantic-tag-p type)
+			   (setq type (semantic-tag-name type)))
+			  ((listp type)
+			   (setq type (car type))))
+		    (if (semantic-lex-keyword-p type)
+			(setq typetok
+			      (semantic-lex-keyword-get type 'summary))))
+		  (if typetok
+		      (insert typetok))
+		  ))
+	      ))
+	  ;; Make it small
+	  (shrink-window-if-larger-than-buffer
+	   (get-buffer-window "*Tag Information*")))
+      (select-frame speedbar-frame))))
+
+(defun semantic-ia-sb-line-path (&optional depth)
+  "Return the file name associated with DEPTH."
+  (save-match-data
+    (let* ((tok (speedbar-line-token))
+	   (buff (if (semantic-tag-buffer tok)
+		     (semantic-tag-buffer tok)
+		   (current-buffer))))
+      (buffer-file-name buff))))
+
+(defun semantic-ia-sb-complete (text tag indent)
+  "At point in the attached buffer, complete the symbol clicked on.
+TEXT TAG and INDENT are the details."
+  ;; Find the specified bounds from the current analysis.
+  (speedbar-select-attached-frame)
+  (unwind-protect
+      (let* ((a (semantic-analyze-current-context (point)))
+	     (bounds (oref a bounds))
+	     (movepoint nil)
+	     )
+	(save-excursion
+	  (if (and (<= (point) (cdr bounds)) (>= (point) (car bounds)))
+	      (setq movepoint t))
+	  (goto-char (car bounds))
+	  (delete-region (car bounds) (cdr bounds))
+	  (insert (semantic-tag-name tag))
+	  (if movepoint (setq movepoint (point)))
+	  ;; I'd like to use this to add fancy () or what not at the end
+	  ;; but we need the parent file whih requires an upgrade to the
+	  ;; analysis tool.
+	  ;;(semantic-insert-foreign-tag tag ??))
+	  )
+	(if movepoint
+	    (let ((cf (selected-frame)))
+	      (speedbar-select-attached-frame)
+	      (goto-char movepoint)
+	      (select-frame cf))))
+    (select-frame speedbar-frame)))
+
+(provide 'semantic-ia-sb)
+
+;;; semantic-ia-sb.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ia-utest.el b/site/cedet-1.0pre7/semantic/semantic-ia-utest.el
new file mode 100644
index 0000000..aa6f163
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ia-utest.el
@@ -0,0 +1,537 @@
+;;; semantic-ia-utest.el --- Analyzer unit tests
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-ia-utest.el,v 1.31 2009/09/13 11:43:53 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Use marked-up files in the test directory and run the analyzer
+;; on them.  Make sure the answers are correct.
+;;
+;; Each file has cursor keys in them of the form:
+;;   // -#- ("ans1" "ans2" )
+;; where # is 1, 2, 3, etc, and some sort of answer list.
+
+;;; Code:
+(require 'cedet-utests)
+(require 'semantic)
+(require 'semantic-analyze)
+(require 'semantic-analyze-refs)
+(require 'semantic-symref)
+(require 'semantic-symref-filter)
+
+(defvar semantic-ia-utest-file-list
+  '(
+    "tests/testdoublens.cpp"
+    "tests/testsubclass.cpp"
+    "tests/testtypedefs.cpp"
+    "tests/teststruct.cpp"
+    "tests/testtemplates.cpp"
+    "tests/testfriends.cpp"
+    "tests/testusing.cpp"
+    "tests/testnsp.cpp"
+    "tests/testsppcomplete.c"
+    "tests/testvarnames.c"
+    "tests/testjavacomp.java"
+    )
+  "List of files with analyzer completion test points.")
+
+(defvar semantic-ia-utest-error-log-list nil
+  "List of errors occuring during a run.")
+
+;;;###autoload
+(defun semantic-ia-utest (&optional arg)
+  "Run the semantic ia unit test against stored sources.
+Argument ARG specifies which set of tests to run.
+ 1 - ia utests
+ 2 - regs utests
+ 3 - symrefs utests
+ 4 - symref count utests"
+  (interactive "P")
+  (save-excursion
+
+    (let ((fl semantic-ia-utest-file-list)
+	  (semantic-ia-utest-error-log-list nil)
+	  )
+
+      (cedet-utest-log-setup "ANALYZER")
+
+      (set-buffer (semantic-find-file-noselect
+		   (locate-library "semantic-ia-utest.el")))
+
+      (while fl
+
+	;; Make sure we have the files we think we have.
+	(when (not (file-exists-p (car fl)))
+	  (error "Cannot find unit test file: %s" (car fl)))
+
+	;; Run the tests.
+	(let ((fb (find-buffer-visiting (car fl)))
+	      (b (semantic-ia-utest-ffns (car fl))))
+
+	  (when b
+	    ;; Run the test on it.
+	    (save-excursion
+	      (set-buffer b)
+
+	      ;; This line will also force the include, scope, and typecache.
+	      (semantic-clear-toplevel-cache)
+	      ;; Force tags to be parsed.
+	      (semantic-fetch-tags)
+
+	      (semantic-ia-utest-log "  ** Starting tests in %s"
+				     (buffer-name))
+
+	      (when (or (not arg) (= arg 1))
+		(semantic-ia-utest-buffer))
+
+	      (when (or (not arg) (= arg 2))
+		(set-buffer b)
+		(semantic-ia-utest-buffer-refs))
+
+	      (when (or (not arg) (= arg 3))
+		(set-buffer b)
+		(semantic-sr-utest-buffer-refs))
+
+	      (when (or (not arg) (= arg 4))
+		(set-buffer b)
+		(semantic-src-utest-buffer-refs))
+
+	      (semantic-ia-utest-log "  ** Completed tests in %s\n"
+				     (buffer-name))
+	      ))
+
+	  ;; If it wasn't already in memory, whack it.
+	  (when (and b (not fb))
+	    (kill-buffer b))
+	  )
+	(setq fl (cdr fl)))
+
+      (cedet-utest-log-shutdown
+       "ANALYZER"
+       (when semantic-ia-utest-error-log-list
+	 (format "%s Failures found."
+		 (length semantic-ia-utest-error-log-list))))
+      (when semantic-ia-utest-error-log-list
+	(error "Failures found during analyzer unit tests"))
+      ))
+  )
+
+(defun semantic-ia-utest-ffns (file)
+  "Call `semantic-find-file-noselect' on FILE safely.
+Be robust to non CC modes throwing errors.
+Return a buffer if successful, or nil if error.
+If the error occurs w/ a C or C++ file, rethrow the error."
+  (condition-case e
+      (let ((buff (semantic-find-file-noselect file t)))
+	;; Make current for tests...
+	(save-excursion
+	  (set-buffer buff)
+	  ;; Was semantic initialized?
+	  (if (semantic-active-p)
+	      buff
+	    ;; No support?
+	    (error "No semantic support."))
+	  ))
+    (error
+     (let ((fe (file-name-extension file)))
+       (cond ((or (string= fe ".c") (string= fe ".cpp"))
+	      ;; Rethrow for C, no tolerance for error.
+	      (error e))
+	     (t
+	      (message
+	       "Skipping tests for %s due to missing underlying mode support."
+	       file)
+	      nil))))
+    ))
+
+(defun semantic-ia-utest-buffer ()
+  "Run analyzer completion unit-test pass in the current buffer."
+
+  (let* ((idx 1)
+	 (regex-p nil)
+	 (regex-a nil)
+	 (p nil)
+	 (a nil)
+	 (pass nil)
+	 (fail nil)
+	 (actual nil)
+	 (desired nil)
+	 ;; Exclude unpredictable system files in the
+	 ;; header include list.
+	 (semanticdb-find-default-throttle
+	  (remq 'system semanticdb-find-default-throttle))
+	 )
+    ;; Keep looking for test points until we run out.
+    (while (save-excursion
+	     (setq regex-p (concat "//\\s-*-" (number-to-string idx) "-" )
+		   regex-a (concat "//\\s-*#" (number-to-string idx) "#" ))
+	     (goto-char (point-min))
+	     (save-match-data
+	       (when (re-search-forward regex-p nil t)
+		 (setq p (match-beginning 0))))
+	     (save-match-data
+	       (when (re-search-forward regex-a nil t)
+		 (setq a (match-end 0))))
+	     (and p a))
+
+      (save-excursion
+
+	(goto-char p)
+
+	(let* ((ctxt (semantic-analyze-current-context))
+	       (acomp
+		(condition-case nil
+		    (semantic-analyze-possible-completions ctxt)
+		  (error nil))))
+	  (setq actual (mapcar 'semantic-tag-name acomp)))
+
+	(goto-char a)
+
+	(let ((bss (buffer-substring-no-properties (point) (point-at-eol))))
+	  (condition-case nil
+	      (setq desired (read bss))
+	    (error (setq desired (format "  FAILED TO PARSE: %S"
+					 bss)))))
+
+	(if (equal actual desired)
+	    (setq pass (cons idx pass))
+	  (setq fail (cons idx fail))
+	  (semantic-ia-utest-log
+	   "    Failed %d.  Desired: %S Actual %S"
+	   idx desired actual)
+	  (add-to-list 'semantic-ia-utest-error-log-list
+		       (list (buffer-name) idx desired actual)
+		       )
+
+	  )
+	)
+
+      (setq p nil a nil)
+      (setq idx (1+ idx)))
+
+    (if fail
+	(progn
+	  (semantic-ia-utest-log
+	   "    Unit tests (completions) failed tests %S"
+	   (reverse fail))
+	  )
+      (semantic-ia-utest-log "    Unit tests (completions) passed (%d total)"
+			     (- idx 1)))
+
+    ))
+
+(defun semantic-ia-utest-buffer-refs ()
+  "Run a analyze-refs unit-test pass in the current buffer."
+
+  (let* ((idx 1)
+	 (regex-p nil)
+	 (p nil)
+	 (pass nil)
+	 (fail nil)
+	 ;; Exclude unpredictable system files in the
+	 ;; header include list.
+	 (semanticdb-find-default-throttle
+	  (remq 'system semanticdb-find-default-throttle))
+	 )
+    ;; Keep looking for test points until we run out.
+    (while (save-excursion
+	     (setq regex-p (concat "//\\s-*\\^" (number-to-string idx) "^" )
+		   )
+	     (goto-char (point-min))
+	     (save-match-data
+	       (when (re-search-forward regex-p nil t)
+		 (setq p (match-beginning 0))))
+	     p)
+
+      (save-excursion
+
+	(goto-char p)
+	(forward-char -1)
+
+	(let* ((ct (semantic-current-tag))
+	       (refs (semantic-analyze-tag-references ct))
+	       (impl (semantic-analyze-refs-impl refs t))
+	       (proto (semantic-analyze-refs-proto refs t))
+	       (pf nil)
+	       )
+	  (setq
+	   pf
+	   (catch 'failed
+	     (if (and impl proto (car impl) (car proto))
+		 (let (ct2 ref2 impl2 proto2
+			   newstart)
+		   (cond
+		    ((semantic-equivalent-tag-p (car impl) ct)
+		     ;; We are on an IMPL.  Go To the proto, and find matches.
+		     (semantic-go-to-tag (car proto))
+		     (setq newstart (car proto))
+		     )
+		    ((semantic-equivalent-tag-p (car proto) ct)
+		     ;; We are on a PROTO.  Go to the imple, and find matches
+		     (semantic-go-to-tag (car impl))
+		     (setq newstart (car impl))
+		     )
+		    (t
+		     ;; No matches is a fail.
+		     (throw 'failed t)
+		     ))
+		   ;; Get the new tag, does it match?
+		   (setq ct2 (semantic-current-tag))
+
+		   ;; Does it match?
+		   (when (not (semantic-equivalent-tag-p ct2 newstart))
+		     (throw 'failed t))
+
+		   ;; Can we double-jump?
+		   (setq ref2 (semantic-analyze-tag-references ct)
+			 impl2 (semantic-analyze-refs-impl ref2 t)
+			 proto2 (semantic-analyze-refs-proto ref2 t))
+
+		   (when (or (not (and impl2 proto2))
+			     (not
+			      (and (semantic-equivalent-tag-p
+				    (car impl) (car impl2))
+				   (semantic-equivalent-tag-p
+				    (car proto) (car proto2)))))
+		     (throw 'failed t))
+		   )
+
+	       ;; Else, no matches at all, so another fail.
+	       (throw 'failed t)
+	       )))
+
+	   (if (not pf)
+	      ;; We passed
+	      (setq pass (cons idx pass))
+	    ;; We failed.
+	    (setq fail (cons idx fail))
+	    (semantic-ia-utest-log
+	     "    Failed %d.  For %s (Num impls %d) (Num protos %d)"
+	     idx (if ct (semantic-tag-name ct) "<No tag found>")
+	     (length impl) (length proto))
+	    (add-to-list 'semantic-ia-utest-error-log-list
+			 (list (buffer-name) idx)
+			 )
+	    ))
+
+	(setq p nil)
+	(setq idx (1+ idx))
+
+	))
+
+    (if fail
+	(progn
+	  (semantic-ia-utest-log
+	   "    Unit tests (refs) failed tests")
+	  )
+      (semantic-ia-utest-log "    Unit tests (refs) passed (%d total)"
+			     (- idx 1)))
+
+    ))
+
+(defun semantic-sr-utest-buffer-refs ()
+  "Run a symref unit-test pass in the current buffer."
+
+  ;; This line will also force the include, scope, and typecache.
+  (semantic-clear-toplevel-cache)
+  ;; Force tags to be parsed.
+  (semantic-fetch-tags)
+
+  (let* ((idx 1)
+	 (tag nil)
+	 (regex-p nil)
+	 (desired nil)
+	 (actual-result nil)
+	 (actual nil)
+	 (pass nil)
+	 (fail nil)
+	 (symref-tool-used nil)
+	 ;; Exclude unpredictable system files in the
+	 ;; header include list.
+	 (semanticdb-find-default-throttle
+	  (remq 'system semanticdb-find-default-throttle))
+	 )
+    ;; Keep looking for test points until we run out.
+    (while (save-excursion
+	     (setq regex-p (concat "//\\s-*\\%" (number-to-string idx) "%" )
+		   )
+	     (goto-char (point-min))
+	     (save-match-data
+	       (when (re-search-forward regex-p nil t)
+		 (setq tag (semantic-current-tag))
+		 (goto-char (match-end 0))
+		 (setq desired (read (buffer-substring (point) (point-at-eol))))
+		 ))
+	     tag)
+
+      (setq actual-result (semantic-symref-find-references-by-name
+			   (semantic-tag-name tag) 'target
+			   'symref-tool-used))
+
+      (if (not actual-result)
+	  (progn
+	    (setq fail (cons idx fail))
+	    (semantic-ia-utest-log
+	     "  Failed FNames %d: No results." idx)
+	    (semantic-ia-utest-log
+	     "  Failed Tool: %s" (object-name symref-tool-used))
+
+	    (add-to-list 'semantic-ia-utest-error-log-list
+			 (list (buffer-name) idx)
+			 )
+	    )
+
+	(setq actual (list (sort (mapcar
+				  'file-name-nondirectory
+				  (semantic-symref-result-get-files actual-result))
+				 'string<)
+			   (sort
+			    (mapcar
+			     'semantic-format-tag-canonical-name
+			     (semantic-symref-result-get-tags actual-result))
+			    'string<)))
+
+
+	(if (equal desired actual)
+	    ;; We passed
+	    (setq pass (cons idx pass))
+	  ;; We failed.
+	  (setq fail (cons idx fail))
+	  (when (not (equal (car actual) (car desired)))
+	    (semantic-ia-utest-log
+	     "  Failed FNames %d: Actual: %S Desired: %S"
+	     idx (car actual) (car desired))
+	    (semantic-ia-utest-log
+	     "  Failed Tool: %s" (object-name symref-tool-used))
+	    )
+	  (when (not (equal (car (cdr actual)) (car (cdr desired))))
+	    (semantic-ia-utest-log
+	     "  Failed TNames %d: Actual: %S Desired: %S"
+	     idx (car (cdr actual)) (car (cdr desired)))
+	    (semantic-ia-utest-log
+	     "  Failed Tool: %s" (object-name symref-tool-used))
+	    )
+	  (add-to-list 'semantic-ia-utest-error-log-list
+		       (list (buffer-name) idx)
+		       )
+	  ))
+
+      (setq idx (1+ idx))
+      (setq tag nil))
+
+    (if fail
+	(progn
+	  (semantic-ia-utest-log
+	   "    Unit tests (symrefs) failed tests")
+	  )
+      (semantic-ia-utest-log "    Unit tests (symrefs) passed (%d total)"
+			     (- idx 1)))
+
+    ))
+
+(defun semantic-src-utest-buffer-refs ()
+  "Run a sym-ref counting unit-test pass in the current buffer."
+
+  ;; This line will also force the include, scope, and typecache.
+  (semantic-clear-toplevel-cache)
+  ;; Force tags to be parsed.
+  (semantic-fetch-tags)
+
+  (let* ((idx 1)
+	 (start nil)
+	 (regex-p nil)
+	 (desired nil)
+	 (actual nil)
+	 (pass nil)
+	 (fail nil)
+	 ;; Exclude unpredictable system files in the
+	 ;; header include list.
+	 (semanticdb-find-default-throttle
+	  (remq 'system semanticdb-find-default-throttle))
+	 )
+    ;; Keep looking for test points until we run out.
+    (while (save-excursion
+	     (setq regex-p (concat "//\\s-*@"
+				   (number-to-string idx)
+				   "@\\s-+\\(\\w+\\)" ))
+	     (goto-char (point-min))
+	     (save-match-data
+	       (when (re-search-forward regex-p nil t)
+		 (goto-char (match-beginning 1))
+		 (setq desired (read (buffer-substring (point) (point-at-eol))))
+		 (setq start (match-beginning 0))
+		 (goto-char start)
+		 (setq actual (semantic-symref-test-count-hits-in-tag))
+		 start)))
+
+      (if (not actual)
+	  (progn
+	    (setq fail (cons idx fail))
+	    (semantic-ia-utest-log
+	     "  Failed symref count %d: No results." idx)
+
+	    (add-to-list 'semantic-ia-utest-error-log-list
+			 (list (buffer-name) idx)
+			 )
+	    )
+
+	(if (equal desired actual)
+	    ;; We passed
+	    (setq pass (cons idx pass))
+	  ;; We failed.
+	  (setq fail (cons idx fail))
+	  (when (not (equal actual desired))
+	    (semantic-ia-utest-log
+	     "  Failed symref count %d: Actual: %S Desired: %S"
+	     idx actual desired)
+	    )
+
+	  (add-to-list 'semantic-ia-utest-error-log-list
+		       (list (buffer-name) idx)
+		       )
+	  ))
+
+      (setq idx (1+ idx))
+      )
+
+    (if fail
+	(progn
+	  (semantic-ia-utest-log
+	   "    Unit tests (symrefs counter) failed tests")
+	  )
+      (semantic-ia-utest-log "    Unit tests (symrefs counter) passed (%d total)"
+			     (- idx 1)))
+
+    ))
+
+(defun semantic-ia-utest-start-log ()
+  "Start up a testlog for a run."
+  ;; Redo w/ CEDET utest framework.
+  (cedet-utest-log-start "semantic: analyzer tests"))
+
+(defun semantic-ia-utest-log (&rest args)
+  "Log some test results.
+Pass ARGS to format to create the log message."
+  ;; Forward to CEDET utest framework.
+  (apply 'cedet-utest-log args))
+
+(provide 'semantic-ia-utest)
+;;; semantic-ia-utest.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-ia.el b/site/cedet-1.0pre7/semantic/semantic-ia.el
new file mode 100644
index 0000000..572f5ea
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-ia.el
@@ -0,0 +1,438 @@
+;;; semantic-ia.el --- Interactive Analysis functions
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-ia.el,v 1.33.2.1 2010/02/26 01:59:24 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Interactive access to `semantic-analyze'.
+;;
+;; These routines are fairly simple, and show how to use the Semantic
+;; analyzer to provide things such as completion lists, summaries,
+;; locations, or documentation.
+;;
+
+;;; TODO
+;;
+;; fast-jump.  For a virtual method, offer some of the possible
+;; implementations in various sub-classes.
+
+(require 'senator)
+(require 'semantic-analyze)
+(require 'pulse)
+(eval-when-compile
+  (require 'semantic-analyze)
+  (require 'semantic-analyze-refs))
+
+;;; Code:
+
+;;; COMPLETION
+;;
+;; This set of routines provides some simplisting completion
+;; functions.
+
+(defcustom semantic-ia-completion-format-tag-function
+  'semantic-prototype-nonterminal
+  "*Function used to convert a tag to a string during completion."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+;;; COMPLETION HELPER
+;;
+;; This overload function handles inserting a tag
+;; into a buffer for these local completion routines.
+;;
+;; By creating the functions as overloadable, it can be
+;; customized.  For example, the default will put a paren "("
+;; character after function names.  For Lisp, it might check
+;; to put a "(" in front of a function name.
+
+(define-overloadable-function semantic-ia-insert-tag (tag)
+  "Insert TAG into the current buffer based on completion.")
+
+(defun semantic-ia-insert-tag-default (tag)
+  "Insert TAG into the current buffer based on completion."
+  (insert (semantic-tag-name tag))
+  (let ((tt (semantic-tag-class tag)))
+    (cond ((eq tt 'function)
+	   (insert "("))
+	  (t nil))))
+
+(defalias 'semantic-ia-get-completions 'semantic-ia-get-completions-deprecated
+  "`Semantic-ia-get-completions' is obsolete.
+Use `semantic-analyze-possible-completions' instead.")
+
+(defun semantic-ia-get-completions-deprecated (context point)
+  "A function to help transition away from `semantic-ia-get-completions'.
+Return completions based on CONTEXT at POINT.
+You should not use this, nor the aliased version.
+Use `semantic-analyze-possible-completions' instead."
+    (semantic-analyze-possible-completions context))
+
+;;;###autoload
+(defun semantic-ia-complete-symbol (point)
+  "Complete the current symbol at POINT.
+Completion options are calculated with `semantic-analyze-possible-completions'."
+  (interactive "d")
+  ;; Calculating completions is a two step process.
+  ;;
+  ;; The first analyzer the current context, which finds tags
+  ;; for all the stuff that may be references by the code around
+  ;; POINT.
+  ;;
+  ;; The second step derives completions from that context.
+  (let* ((a (semantic-analyze-current-context point))
+	 (syms (semantic-analyze-possible-completions a))
+	 (pre (car (reverse (oref a prefix))))
+	 )
+    ;; If PRE was actually an already completed symbol, it doesn't
+    ;; come in as a string, but as a tag instead.
+    (if (semantic-tag-p pre)
+	;; We will try completions on it anyway.
+	(setq pre (semantic-tag-name pre)))
+    ;; Complete this symbol.
+    (if (null syms)
+	(progn
+	  ;(message "No smart completions found.  Trying senator-complete-symbol.")
+	  (if (semantic-analyze-context-p a)
+	      ;; This is a clever hack.  If we were unable to find any
+	      ;; smart completions, lets divert to how senator derives
+	      ;; completions.
+	      ;;
+	      ;; This is a way of making this fcn more useful since the
+	      ;; smart completion engine sometimes failes.
+	      (senator-complete-symbol)
+	      ))
+      ;; Use try completion to seek a common substring.
+      (let ((tc (try-completion (or pre "")  syms)))
+	(if (and (stringp tc) (not (string= tc (or pre ""))))
+	    (let ((tok (semantic-find-first-tag-by-name
+			tc syms)))
+	      ;; Delete what came before...
+	      (when (and (car (oref a bounds)) (cdr (oref a bounds)))
+		(delete-region (car (oref a bounds))
+			       (cdr (oref a bounds)))
+		(goto-char (car (oref a bounds))))
+	      ;; We have some new text.  Stick it in.
+	      (if tok
+		  (semantic-ia-insert-tag tok)
+		(insert tc)))
+	  ;; We don't have new text.  Show all completions.
+	  (when (cdr (oref a bounds))
+	    (goto-char (cdr (oref a bounds))))
+	  (with-output-to-temp-buffer "*Completions*"
+	    (display-completion-list
+	     (mapcar semantic-ia-completion-format-tag-function syms))
+	    ))))))
+
+(defcustom semantic-ia-completion-menu-format-tag-function
+  'semantic-uml-concise-prototype-nonterminal
+  "*Function used to convert a tag to a string during completion."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+;;;###autoload
+(defun semantic-ia-complete-symbol-menu (point)
+  "Complete the current symbol via a menu based at POINT.
+Completion options are calculated with `semantic-analyze-possible-completions'."
+  (interactive "d")
+  (require 'imenu)
+  (let* ((a (semantic-analyze-current-context point))
+	 (syms (semantic-analyze-possible-completions a))
+	 )
+    ;; Complete this symbol.
+    (if (not syms)
+	(progn
+	  (message "No smart completions found.  Trying Senator.")
+	  (when (semantic-analyze-context-p a)
+	    ;; This is a quick way of getting a nice completion list
+	    ;; in the menu if the regular context mechanism fails.
+	    (senator-completion-menu-popup)))
+
+      (let* ((menu
+	      (mapcar
+	       (lambda (tag)
+		 (cons
+		  (funcall semantic-ia-completion-menu-format-tag-function tag)
+		  (vector tag)))
+	       syms))
+	     (ans
+	      (imenu--mouse-menu
+	       ;; XEmacs needs that the menu has at least 2 items.  So,
+	       ;; include a nil item that will be ignored by imenu.
+	       (cons nil menu)
+	       (senator-completion-menu-point-as-event)
+	       "Completions")))
+	(when ans
+	  (if (not (semantic-tag-p ans))
+	      (setq ans (aref (cdr ans) 0)))
+	  (delete-region (car (oref a bounds)) (cdr (oref a bounds)))
+	  (semantic-ia-insert-tag ans))
+	))))
+
+;;; Completions Tip
+;;
+;; This functions shows how to get the list of completions,
+;; to place in a tooltip.  It doesn't actually do any completion.
+
+;;;###autoload
+(defun semantic-ia-complete-tip (point)
+  "Pop up a tooltip for completion at POINT."
+  (interactive "d")
+  (let* ((a (semantic-analyze-current-context point))
+	 (syms (semantic-analyze-possible-completions a))
+         (x (mod (- (current-column) (window-hscroll))
+                 (window-width)))
+         (y (save-excursion
+              (save-restriction
+                (widen)
+                (narrow-to-region (window-start) (point))
+                (goto-char (point-min))
+                (1+ (vertical-motion (buffer-size))))))
+	 (str (mapconcat #'semantic-tag-name
+			 syms
+			 "\n"))
+	 )
+    (cond ((fboundp 'x-show-tip)
+	   (x-show-tip str
+		       (selected-frame)
+		       nil
+		       nil
+		       x y)
+	   )
+	  (t (message str))
+	  )))
+
+;;; Summary
+;;
+;; Like idle-summary-mode, this shows how to get something to
+;; show a summary on.
+
+;;;###autoload
+(defun semantic-ia-show-summary (point)
+  "Display a summary for the symbol under POINT."
+  (interactive "P")
+  (let* ((ctxt (semantic-analyze-current-context point))
+	 (pf (when ctxt
+	       ;; The CTXT is an EIEIO object.  The below
+	       ;; method will attempt to pick the most interesting
+	       ;; tag associated with the current context.
+	       (semantic-analyze-interesting-tag ctxt)))
+	)
+    (when pf
+      (message "%s" (semantic-format-tag-summarize pf nil t)))))
+
+;;; FAST Jump
+;;
+;; Jump to a destination based on the local context.
+;;
+;; This shows how to use the analyzer context, and the
+;; analyer references objects to choose a good destination.
+
+(defun semantic-ia--fast-jump-helper (dest)
+  "Jump to DEST, a Semantic tag.
+This helper manages the mark, buffer switching, and pulsing."
+  ;; We have a tag, but in C++, we usually get a prototype instead
+  ;; because of header files.  Lets try to find the actual
+  ;; implementaion instead.
+  (when (semantic-tag-prototype-p dest)
+    (let* ((refs (semantic-analyze-tag-references dest))
+	   (impl (semantic-analyze-refs-impl refs t))
+	   )
+      (when impl (setq dest (car impl)))))
+
+  ;; Make sure we have a place to go...
+  (if (not (and (or (semantic-tag-with-position-p dest)
+		    (semantic-tag-get-attribute dest :line))
+		(semantic-tag-file-name dest)))
+      (error "Tag %s has no buffer information"
+	     (semantic-format-tag-name dest)))
+
+  ;; Once we have the tag, we can jump to it.  Here
+  ;; are the key bits to the jump:
+
+  ;; 1) Push the mark, so you can pop global mark back, or
+  ;;    use semantic-mru-bookmark mode to do so.
+  (push-mark)
+  (when (fboundp 'push-tag-mark)
+    (push-tag-mark))
+  ;; 2) Visits the tag.
+  (semantic-go-to-tag dest)
+  ;; 3) go-to-tag doesn't switch the buffer in the current window,
+  ;;    so it is like find-file-noselect.  Bring it forward.
+  (switch-to-buffer (current-buffer))
+  ;; 4) Fancy pulsing.
+  (pulse-momentary-highlight-one-line (point))
+  )
+
+;;;###autoload
+(defun semantic-ia-fast-jump (point)
+  "Jump to the tag referred to by the code at POINT.
+Uses `semantic-analyze-current-context' output to identify an accurate
+origin of the code at point."
+  (interactive "d")
+  (let* ((ctxt (semantic-analyze-current-context point))
+	 (pf (and ctxt (reverse (oref ctxt prefix))))
+	 ;; In the analyzer context, the PREFIX is the list of items
+	 ;; that makes up the code context at point.  Thus the c++ code
+	 ;; this.that().theothe
+	 ;; would make a list:
+	 ;; ( ("this" variable ..) ("that" function ...) "theothe")
+	 ;; Where the first two elements are the semantic tags of the prefix.
+	 ;;
+	 ;; PF is the reverse of this list.  If the first item is a string,
+	 ;; then it is an incomplete symbol, thus we pick the second.
+	 ;; The second cannot be a string, as that would have been an error.
+	 (first (car pf))
+	 (second (nth 1 pf))
+	 )
+    (cond
+     ((semantic-tag-p first)
+      ;; We have a match.  Just go there.
+      (semantic-ia--fast-jump-helper first))
+
+     ((semantic-tag-p second)
+      ;; Because FIRST failed, we should visit our second tag.
+      ;; HOWEVER, the tag we actually want that was only an unfound
+      ;; string may be related to some take in the datatype that belongs
+      ;; to SECOND.  Thus, instead of visiting second directly, we
+      ;; can offer to find the type of SECOND, and go there.
+      (let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
+	(cond
+	 ((and (semantic-tag-with-position-p secondclass)
+	       (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
+				 first (semantic-tag-name secondclass))))
+	  (semantic-ia--fast-jump-helper secondclass)
+	  )
+	 ;; If we missed out on the class of the second item, then
+	 ;; just visit SECOND.
+	 ((and (semantic-tag-p second)
+	       (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
+				 first (semantic-tag-name second))))
+	  (semantic-ia--fast-jump-helper second)
+	  ))))
+
+     ((semantic-tag-of-class-p (semantic-current-tag) 'include)
+      ;; Just borrow this cool fcn.
+      (semantic-decoration-include-visit)
+      )
+
+     (t
+      (error "Could not find suitable jump point for %s"
+	     first))
+     )))
+
+;;;###autoload
+(defun semantic-ia-fast-mouse-jump (evt)
+  "Jump to the tag referred to by the point clicked on.
+See `semantic-ia-fast-jump' for details on how it works.
+ This command is meant to be bound to a mouse event."
+  (interactive "e")
+  (semantic-ia-fast-jump
+   (save-excursion
+     (posn-set-point (event-end evt))
+     (point))))
+
+;;; DOC/DESCRIBE
+;;
+;; These routines show how to get additional information about a tag
+;; for purposes of describing or showing documentation about them.
+;;;###autoload
+(defun semantic-ia-show-doc (point)
+  "Display the code-level documentation for the symbol at POINT."
+  (interactive "d")
+  (let* ((ctxt (semantic-analyze-current-context point))
+	 (pf (reverse (oref ctxt prefix)))
+	 )
+    ;; If PF, the prefix is non-nil, then the last element is either
+    ;; a string (incomplete type), or a semantic TAG.  If it is a TAG
+    ;; then we should be able to find DOC for it.
+    (cond
+     ((stringp (car pf))
+      (message "Incomplete symbol name."))
+     ((semantic-tag-p (car pf))
+      ;; The `semantic-documentation-for-tag' fcn is language
+      ;; specific.  If it doesn't return what you expect, you may
+      ;; need to implement something for your language.
+      ;;
+      ;; The default tries to find a comment in front of the tag
+      ;; and then strings off comment prefixes.
+      (let ((doc (semantic-documentation-for-tag (car pf))))
+	(with-output-to-temp-buffer "*TAG DOCUMENTATION*"
+	  (princ "Tag: ")
+	  (princ (semantic-format-tag-prototype (car pf)))
+	  (princ "\n")
+	  (princ "\n")
+	  (princ "Snarfed Documentation: ")
+	  (princ "\n")
+	  (princ "\n")
+	  (if doc
+	      (princ doc)
+	    (princ "  Documentation unavailable."))
+	  )))
+     (t
+      (message "Unknown tag.")))
+    ))
+
+;;;###autoload
+(defun semantic-ia-describe-class (typename)
+  "Display all known parts for the datatype TYPENAME.
+If the type in question is a class, all methods and other accessible
+parts of the parent classes are displayed."
+  ;; @todo - use a fancy completing reader.
+  (interactive "sType Name: ")
+
+  ;; When looking for a tag of any name there are a couple ways to do
+  ;; it.  The simple `semanticdb-find-tag-by-...' are simple, and
+  ;; you need to pass it the exact name you want.
+  ;;
+  ;; The analyzer function `semantic-analyze-tag-name' will take
+  ;; more complex names, such as the cpp symbol foo::bar::baz,
+  ;; and break it up, and dive through the namespaces.
+  (let ((class (semantic-analyze-find-tag typename)))
+
+    (when (not (semantic-tag-p class))
+      (error "Cannot find class %s" class))
+    (with-output-to-temp-buffer "*TAG DOCUMENTATION*"
+      ;; There are many semantic-format-tag-* fcns.
+      ;; The summarize routine is a fairly generic one.
+      (princ (semantic-format-tag-summarize class))
+      (princ "\n")
+      (princ "  Type Members:\n")
+      ;; The type tag contains all the parts of the type.
+      ;; In complex languages with inheritance, not all the
+      ;; parts are in the tag.  This analyzer fcn will traverse
+      ;; the inheritance tree, and find all the pieces that
+      ;; are inherited.
+      (let ((parts (semantic-analyze-scoped-type-parts class)))
+	(while parts
+	  (princ "    ")
+	  (princ (semantic-format-tag-summarize (car parts)))
+	  (princ "\n")
+	  (setq parts (cdr parts)))
+	)
+      )))
+
+(provide 'semantic-ia)
+
+;;; semantic-ia.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-idle.el b/site/cedet-1.0pre7/semantic/semantic-idle.el
new file mode 100644
index 0000000..2ff71db
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-idle.el
@@ -0,0 +1,975 @@
+;; semantic-idle.el --- Schedule parsing tasks in idle time
+
+;;; Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-idle.el,v 1.61 2010/02/05 02:58:04 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Originally, `semantic-auto-parse-mode' handled refreshing the
+;; tags in a buffer in idle time.  Other activities can be scheduled
+;; in idle time, all of which require up-to-date tag tables.
+;; Having a specialized idle time scheduler that first refreshes
+;; the tags buffer, and then enables other idle time tasks reduces
+;; the amount of work needed.  Any specialized idle tasks need not
+;; ask for a fresh tags list.
+;;
+;; NOTE ON SEMANTIC_ANALYZE
+;;
+;; Some of the idle modes use the semantic analyzer.  The analyzer
+;; automatically caches the created context, so it is shared amongst
+;; all idle modes that will need it.
+
+(require 'semantic-ctxt)
+(require 'semantic-util-modes)
+(require 'timer)
+
+;;; Code:
+
+;;; TIMER RELATED FUNCTIONS
+;;
+(defvar semantic-idle-scheduler-timer nil
+  "Timer used to schedule tasks in idle time.")
+
+(defvar semantic-idle-scheduler-work-timer nil
+  "Timer used to schedule tasks in idle time that may take a while.")
+
+(defcustom semantic-idle-scheduler-verbose-flag nil
+  "*Non-nil means that the idle scheduler should provide debug messages.
+Use this setting to debug idle activities."
+  :group 'semantic
+  :type 'boolean)
+
+(defcustom semantic-idle-scheduler-idle-time 2
+  "*Time in seconds of idle before scheduling events.
+This time should be short enough to ensure that idle-scheduler will be
+run as soon as Emacs is idle."
+  :group 'semantic
+  :type 'number
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (timerp semantic-idle-scheduler-timer)
+           (cancel-timer semantic-idle-scheduler-timer)
+           (setq semantic-idle-scheduler-timer nil)
+           (semantic-idle-scheduler-setup-timers))))
+
+(defcustom semantic-idle-scheduler-work-idle-time 60
+  "*Time in seconds of idle before scheduling big work.
+This time should be long enough that once any big work is started, it is
+unlikely the user would be ready to type again right away."
+  :group 'semantic
+  :type 'number
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when (timerp semantic-idle-scheduler-timer)
+           (cancel-timer semantic-idle-scheduler-timer)
+           (setq semantic-idle-scheduler-timer nil)
+           (semantic-idle-scheduler-setup-timers))))
+
+(defun semantic-idle-scheduler-setup-timers ()
+  "Lazy initialization of the auto parse idle timer."
+  ;; REFRESH THIS FUNCTION for XEMACS FOIBLES
+  (or (timerp semantic-idle-scheduler-timer)
+      (setq semantic-idle-scheduler-timer
+            (run-with-idle-timer
+             semantic-idle-scheduler-idle-time t
+             #'semantic-idle-scheduler-function)))
+  (or (timerp semantic-idle-scheduler-work-timer)
+      (setq semantic-idle-scheduler-work-timer
+            (run-with-idle-timer
+             semantic-idle-scheduler-work-idle-time t
+             #'semantic-idle-scheduler-work-function)))
+  )
+
+(defun semantic-idle-scheduler-kill-timer ()
+  "Kill the auto parse idle timer."
+  (if (timerp semantic-idle-scheduler-timer)
+      (cancel-timer semantic-idle-scheduler-timer))
+  (setq semantic-idle-scheduler-timer nil))
+
+
+;;; MINOR MODE
+;;
+;; The minor mode portion of this code just sets up the minor mode
+;; which does the initial scheduling of the idle timers.
+;;
+;;;###autoload
+(defcustom global-semantic-idle-scheduler-mode nil
+  "*If non-nil, enable global use of idle-scheduler mode."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-idle
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-idle-scheduler-mode (if val 1 -1))))
+
+;;;###autoload
+(defun global-semantic-idle-scheduler-mode (&optional arg)
+  "Toggle global use of option `semantic-idle-scheduler-mode'.
+The idle scheduler with automatically reparse buffers in idle time,
+and then schedule other jobs setup with `semantic-idle-scheduler-add'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-idle-scheduler-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-idle-scheduler-mode arg)))
+
+(defcustom semantic-idle-scheduler-mode-hook nil
+  "*Hook run at the end of function `semantic-idle-scheduler-mode'."
+  :group 'semantic
+  :type 'hook)
+
+;;;###autoload
+(defvar semantic-idle-scheduler-mode nil
+  "Non-nil if idle-scheduler minor mode is enabled.
+Use the command `semantic-idle-scheduler-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-idle-scheduler-mode)
+
+(defcustom semantic-idle-scheduler-max-buffer-size 0
+  "*Maximum size in bytes of buffers where idle-scheduler is enabled.
+If this value is less than or equal to 0, idle-scheduler is enabled in
+all buffers regardless of their size."
+  :group 'semantic
+  :type 'number)
+
+(defsubst semantic-idle-scheduler-enabled-p ()
+  "Return non-nil if idle-scheduler is enabled for this buffer.
+idle-scheduler is disabled when debugging or if the buffer size
+exceeds the `semantic-idle-scheduler-max-buffer-size' threshold."
+  (and semantic-idle-scheduler-mode
+       (not semantic-debug-enabled)
+       (not semantic-lex-debug)
+       (or (<= semantic-idle-scheduler-max-buffer-size 0)
+	   (< (buffer-size) semantic-idle-scheduler-max-buffer-size))))
+
+(defun semantic-idle-scheduler-mode-setup ()
+  "Setup option `semantic-idle-scheduler-mode'.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-idle-scheduler-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-idle-scheduler-mode nil)
+            (error "Buffer %s was not set up idle time scheduling"
+                   (buffer-name)))
+        (semantic-idle-scheduler-setup-timers)))
+  semantic-idle-scheduler-mode)
+
+;;;###autoload
+(defun semantic-idle-scheduler-mode (&optional arg)
+  "Minor mode to auto parse buffer following a change.
+When this mode is off, a buffer is only rescanned for tokens when
+some command requests the list of available tokens.  When idle-scheduler
+is enabled, Emacs periodically checks to see if the buffer is out of
+date, and reparses while the user is idle (not typing.)
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-idle-scheduler-mode 0 1))))
+  (setq semantic-idle-scheduler-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-idle-scheduler-mode)))
+  (semantic-idle-scheduler-mode-setup)
+  (run-hooks 'semantic-idle-scheduler-mode-hook)
+  (if (interactive-p)
+      (message "idle-scheduler minor mode %sabled"
+               (if semantic-idle-scheduler-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-idle-scheduler-mode)
+
+(semantic-add-minor-mode 'semantic-idle-scheduler-mode
+                         "ARP"
+                         nil)
+
+(semantic-alias-obsolete 'semantic-auto-parse-mode
+			 'semantic-idle-scheduler-mode)
+(semantic-alias-obsolete 'global-semantic-auto-parse-mode
+			 'global-semantic-idle-scheduler-mode)
+
+
+;;; SERVICES services
+;;
+;; These are services for managing idle services.
+;;
+(defvar semantic-idle-scheduler-queue nil
+  "List of functions to execute during idle time.
+These functions will be called in the current buffer after that
+buffer has had its tags made up to date.  These functions
+will not be called if there are errors parsing the
+current buffer.")
+
+;;;###autoload
+(defun semantic-idle-scheduler-add (function)
+  "Schedule FUNCTION to occur during idle time."
+  (add-to-list 'semantic-idle-scheduler-queue function))
+
+;;;###autoload
+(defun semantic-idle-scheduler-remove (function)
+  "Unschedule FUNCTION to occur during idle time."
+  (setq semantic-idle-scheduler-queue
+	(delete function semantic-idle-scheduler-queue)))
+
+;;; IDLE Function
+;;
+(defun semantic-idle-core-handler ()
+  "Core idle function that handles reparsing.
+And also manages services that depend on tag values."
+  (when semantic-idle-scheduler-verbose-flag
+    (working-temp-message "IDLE: Core handler..."))
+  (semantic-exit-on-input 'idle-timer
+    (let* ((inhibit-quit nil)
+           (buffers (delq (current-buffer)
+                          (delq nil
+                                (mapcar #'(lambda (b)
+                                            (and (buffer-file-name b)
+                                                 b))
+                                        (buffer-list)))))
+	   safe ;; This safe is not used, but could be.
+           others
+	   mode)
+      (when (semantic-idle-scheduler-enabled-p)
+        (save-excursion
+          ;; First, reparse the current buffer.
+          (setq mode major-mode
+                safe (semantic-safe "Idle Parse Error: %S"
+		       ;(error "Goofy error 1")
+		       (semantic-idle-scheduler-refresh-tags)
+		       )
+		)
+          ;; Now loop over other buffers with same major mode, trying to
+          ;; update them as well.  Stop on keypress.
+          (dolist (b buffers)
+            (semantic-throw-on-input 'parsing-mode-buffers)
+            (with-current-buffer b
+              (if (eq major-mode mode)
+                  (and (semantic-idle-scheduler-enabled-p)
+		       (semantic-safe "Idle Parse Error: %S"
+			 ;(error "Goofy error")
+			 (semantic-idle-scheduler-refresh-tags)))
+                (push (current-buffer) others))))
+          (setq buffers others))
+        ;; If re-parse of current buffer completed, evaluate all other
+        ;; services.  Stop on keypress.
+
+	;; NOTE ON COMMENTED SAFE HERE
+	;; We used to not execute the services if the buffer wsa
+	;; unparseable.  We now assume that they are lexically
+	;; safe to do, because we have marked the buffer unparseable
+	;; if there was a problem.
+	;;(when safe
+	(dolist (service semantic-idle-scheduler-queue)
+	  (save-excursion
+	    (semantic-throw-on-input 'idle-queue)
+	    (when semantic-idle-scheduler-verbose-flag
+	      (working-temp-message "IDLE: execture service %s..." service))
+	    (semantic-safe (format "Idle Service Error %s: %%S" service)
+	      (funcall service))
+	    (when semantic-idle-scheduler-verbose-flag
+	      (working-temp-message "IDLE: execture service %s...done" service))
+	    )))
+	;;)
+      ;; Finally loop over remaining buffers, trying to update them as
+      ;; well.  Stop on keypress.
+      (save-excursion
+        (dolist (b buffers)
+          (semantic-throw-on-input 'parsing-other-buffers)
+          (with-current-buffer b
+            (and (semantic-idle-scheduler-enabled-p)
+                 (semantic-idle-scheduler-refresh-tags)))))
+      ))
+  (when semantic-idle-scheduler-verbose-flag
+    (working-temp-message "IDLE: Core handler...done")))
+
+(defun semantic-debug-idle-function ()
+  "Run the Semantic idle function with debugging turned on."
+  (interactive)
+  (let ((debug-on-error t))
+    (semantic-idle-core-handler)
+    ))
+
+(defun semantic-idle-scheduler-function ()
+  "Function run when after `semantic-idle-scheduler-idle-time'.
+This function will reparse the current buffer, and if successful,
+call additional functions registered with the timer calls."
+  (when (zerop (recursion-depth))
+    (let ((debug-on-error nil))
+      (save-match-data (semantic-idle-core-handler))
+      )))
+
+
+;;; WORK FUNCTION
+;;
+;; Unlike the shorter timer, the WORK timer will kick of tasks that
+;; may take a long time to complete.
+(defcustom semantic-idle-work-parse-neighboring-files-flag nil
+  "*Non-nil means to parse files in the same dir as the current buffer.
+Disable to prevent lots of excessive parsing in idle time."
+  :group 'semantic
+  :type 'boolean)
+
+(defcustom semantic-idle-work-update-headers-flag nil
+  "*Non-nil means to parse through header files in idle time.
+Disable to prevent idle time parsing of many files.  If completion
+is called that work will be done then instead."
+  :group 'semantic
+  :type 'boolean)
+
+(defun semantic-idle-work-for-one-buffer (buffer)
+  "Do long-processing work for for BUFFER.
+Uses `semantic-safe' and returns the output.
+Returns t of all processing succeeded."
+  (save-excursion
+    (set-buffer buffer)
+    (not (and
+	  ;; Just in case
+	  (semantic-safe "Idle Work Parse Error: %S"
+	    (semantic-idle-scheduler-refresh-tags)
+	    t)
+
+	  ;; Option to disable this work.
+	  semantic-idle-work-update-headers-flag
+
+	  ;; Force all our include files to get read in so we
+	  ;; are ready to provide good smart completion and idle
+	  ;; summary information
+	  (semantic-safe "Idle Work Including Error: %S"
+	    ;; Get the include related path.
+	    (when (and (featurep 'semanticdb)
+		       (semanticdb-minor-mode-p))
+	      (require 'semanticdb-find)
+	      (semanticdb-find-translate-path buffer nil)
+	      )
+	    t)
+
+	  ;; Pre-build the typecaches as needed.
+	  (semantic-safe "Idle Work Typecaching Error: %S"
+	    (when (featurep 'semanticdb-typecache)
+	      (semanticdb-typecache-refresh-for-buffer buffer))
+	    t)
+	  ))
+    ))
+
+(defun semantic-idle-work-core-handler ()
+  "Core handler for idle work processing of long running tasks.
+Visits semantic controlled buffers, and makes sure all needed
+include files have been parsed, and that the typecache is up to date.
+Uses `semantic-idle-work-for-on-buffer' to do the work."
+  (let ((errbuf nil)
+	(interrupted
+	 (semantic-exit-on-input 'idle-work-timer
+	   (let* ((inhibit-quit nil)
+		  (cb (current-buffer))
+		  (buffers (delq (current-buffer)
+				 (delq nil
+				       (mapcar #'(lambda (b)
+						   (and (buffer-file-name b)
+							b))
+					       (buffer-list)))))
+		  safe errbuf)
+	     ;; First, handle long tasks in the current buffer.
+	     (when (semantic-idle-scheduler-enabled-p)
+	       (save-excursion
+		 (setq safe (semantic-idle-work-for-one-buffer (current-buffer))
+		       )))
+	     (when (not safe) (push (current-buffer) errbuf))
+
+	     ;; Now loop over other buffers with same major mode, trying to
+	     ;; update them as well.  Stop on keypress.
+	     (dolist (b buffers)
+	       (semantic-throw-on-input 'parsing-mode-buffers)
+	       (with-current-buffer b
+		 (when (semantic-idle-scheduler-enabled-p)
+		   (and (semantic-idle-scheduler-enabled-p)
+			(unless (semantic-idle-work-for-one-buffer (current-buffer))
+			  (push (current-buffer) errbuf)))
+		   ))
+	       )
+
+	     (when (and (featurep 'semanticdb)
+			(semanticdb-minor-mode-p))
+	       ;; Save everything.
+	       (semanticdb-save-all-db-idle)
+
+	       ;; Parse up files near our active buffer
+	       (when semantic-idle-work-parse-neighboring-files-flag
+		 (semantic-safe "Idle Work Parse Neighboring Files: %S"
+		   (set-buffer cb)
+		   (semantic-idle-scheduler-work-parse-neighboring-files))
+		 t)
+
+	       ;; Save everything... again
+	       (semanticdb-save-all-db-idle)
+	       )
+
+	     ;; Done w/ processing
+	     nil))))
+
+    ;; Done
+    (if interrupted
+	"Interrupted"
+      (cond ((not errbuf)
+	     "done")
+	    ((not (cdr errbuf))
+	     (format "done with 1 error in %s" (car errbuf)))
+	    (t
+	     (format "done with errors in %d buffers."
+		     (length errbuf)))))))
+
+(defun semantic-debug-idle-work-function ()
+  "Run the Semantic idle work function with debugging turned on."
+  (interactive)
+  (let ((debug-on-error t))
+    (semantic-idle-work-core-handler)
+    ))
+
+(defun semantic-idle-scheduler-work-function ()
+  "Function run when after `semantic-idle-scheduler-work-idle-time'.
+This routine handles difficult tasks that require a lot of parsing, such as
+parsing all the header files used by our active sources, or building up complex
+datasets."
+  (when semantic-idle-scheduler-verbose-flag
+    (message "Long Work Idle Timer..."))
+  (let ((exit-type (save-match-data
+		     (semantic-idle-work-core-handler))))
+    (when semantic-idle-scheduler-verbose-flag
+      (message "Long Work Idle Timer...%s" exit-type)))
+  )
+
+(defun semantic-idle-scheduler-work-parse-neighboring-files ()
+  "Parse all the files in similar directories to buffers being edited."
+  ;; Lets check to see if EDE matters.
+  (let ((ede-auto-add-method 'never))
+    (dolist (a auto-mode-alist)
+      (when (eq (cdr a) major-mode)
+	(dolist (file (directory-files default-directory t (car a) t))
+	  (semantic-throw-on-input 'parsing-mode-buffers)
+	  (save-excursion
+	    (semanticdb-file-table-object file)
+	    ))))
+    ))
+
+(defun semantic-idle-pnf-test ()
+  "Test `semantic-idle-scheduler-work-parse-neighboring-files' and time it."
+  (interactive)
+  (let ((start (current-time))
+	(junk (semantic-idle-scheduler-work-parse-neighboring-files))
+	(end (current-time)))
+    (message "Work took %.2f seconds." (semantic-elapsed-time start end)))
+  )
+
+
+;;; REPARSING
+;;
+;; Reparsing is installed as semantic idle service.
+;; This part ALWAYS happens, and other services occur
+;; afterwards.
+
+(defcustom semantic-idle-scheduler-no-working-message t
+  "*If non-nil, disable display of working messages during parse."
+  :group 'semantic
+  :type 'boolean)
+
+(defcustom semantic-idle-scheduler-working-in-modeline-flag nil
+  "*Non-nil means show working messages in the mode line.
+Typically, parsing will show messages in the minibuffer.
+This will move the parse message into the modeline."
+  :group 'semantic
+  :type 'boolean)
+
+(defvar semantic-before-idle-scheduler-reparse-hook nil
+  "Hook run before option `semantic-idle-scheduler' begins parsing.
+If any hook throws an error, this variable is reset to nil.
+This hook is not protected from lexical errors.")
+
+(defvar semantic-after-idle-scheduler-reparse-hook nil
+  "Hook run after option `semantic-idle-scheduler' has parsed.
+If any hook throws an error, this variable is reset to nil.
+This hook is not protected from lexical errors.")
+
+(semantic-varalias-obsolete 'semantic-before-idle-scheduler-reparse-hooks
+                          'semantic-before-idle-scheduler-reparse-hook)
+(semantic-varalias-obsolete 'semantic-after-idle-scheduler-reparse-hooks
+                          'semantic-after-idle-scheduler-reparse-hook)
+
+(defun semantic-idle-scheduler-refresh-tags ()
+  "Refreshes the current buffer's tags.
+This is called by `semantic-idle-scheduler-function' to update the
+tags in the current buffer.
+
+Return non-nil if the refresh was successful.
+Return nil if there is some sort of syntax error preventing a full
+reparse.
+
+Does nothing if the current buffer doesn't need reparsing."
+
+  (prog1
+      ;; These checks actually occur in `semantic-fetch-tags', but if we
+      ;; do them here, then all the bovination hooks are not run, and
+      ;; we save lots of time.
+      (cond
+       ;; If the buffer was previously marked unparseable,
+       ;; then don't waste our time.
+       ((semantic-parse-tree-unparseable-p)
+	nil)
+       ;; The parse tree is already ok.
+       ((semantic-parse-tree-up-to-date-p)
+	t)
+       (t
+	;; If the buffer might need a reparse and it is safe to do so,
+	;; give it a try.
+	(let* ((semantic-working-type nil)
+	       (inhibit-quit nil)
+	       (working-use-echo-area-p
+		(not semantic-idle-scheduler-working-in-modeline-flag))
+	       (working-status-dynamic-type
+		(if semantic-idle-scheduler-no-working-message
+		    nil
+		  working-status-dynamic-type))
+	       (working-status-percentage-type
+		(if semantic-idle-scheduler-no-working-message
+		    nil
+		  working-status-percentage-type))
+	       (lexically-safe t)
+	       )
+	  ;; Let people hook into this, but don't let them hose
+	  ;; us over!
+	  (condition-case nil
+	      (run-hooks 'semantic-before-idle-scheduler-reparse-hook)
+	    (error (setq semantic-before-idle-scheduler-reparse-hook nil)))
+
+	  (unwind-protect
+	      ;; Perform the parsing.
+	      (progn
+		(when semantic-idle-scheduler-verbose-flag
+		  (working-temp-message "IDLE: reparse %s..." (buffer-name)))
+		(when (semantic-lex-catch-errors idle-scheduler
+			(save-excursion (semantic-fetch-tags))
+			nil)
+		  ;; If we are here, it is because the lexical step failed,
+		  ;; proably due to unterminated lists or something like that.
+
+		  ;; We do nothing, and just wait for the next idle timer
+		  ;; to go off.  In the meantime, remember this, and make sure
+		  ;; no other idle services can get executed.
+		  (setq lexically-safe nil))
+		(when semantic-idle-scheduler-verbose-flag
+		  (working-temp-message "IDLE: reparse %s...done" (buffer-name))))
+	    ;; Let people hook into this, but don't let them hose
+	    ;; us over!
+	    (condition-case nil
+		(run-hooks 'semantic-after-idle-scheduler-reparse-hook)
+	      (error (setq semantic-after-idle-scheduler-reparse-hook nil))))
+	  ;; Return if we are lexically safe (from prog1)
+	  lexically-safe)))
+
+    ;; After updating the tags, handle any pending decorations for this
+    ;; buffer.
+    (semantic-decorate-flush-pending-decorations (current-buffer))
+    ))
+
+
+;;; IDLE SERVICES
+;;
+;; Idle Services are minor modes which enable or disable a services in
+;; the idle scheduler.  Creating a new services only requires calling
+;; `semantic-create-idle-services' which does all the setup
+;; needed to create the minor mode that will enable or disable
+;; a services.  The services must provide a single function.
+
+(defmacro define-semantic-idle-service (name doc &rest forms)
+  "Create a new idle services with NAME.
+DOC will be a documentation string describing FORMS.
+FORMS will be called during idle time after the current buffer's
+semantic tag information has been updated.
+This routines creates the following functions and variables:"
+  (let ((global (intern (concat "global-" (symbol-name name) "-mode")))
+	(mode 	(intern (concat (symbol-name name) "-mode")))
+	(hook 	(intern (concat (symbol-name name) "-mode-hook")))
+	(map  	(intern (concat (symbol-name name) "-mode-map")))
+	(setup 	(intern (concat (symbol-name name) "-mode-setup")))
+	(func 	(intern (concat (symbol-name name) "-idle-function")))
+	)
+
+    `(eval-and-compile
+       (defun ,global (&optional arg)
+	 ,(concat "Toggle global use of option `" (symbol-name mode) "'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.")
+	 (interactive "P")
+	 (setq ,global
+	       (semantic-toggle-minor-mode-globally
+		',mode arg)))
+
+       (defcustom ,global nil
+	 (concat "*If non-nil, enable global use of `" (symbol-name ',mode) "'.
+" ,doc)
+	 :group 'semantic
+	 :group 'semantic-modes
+	 :type 'boolean
+	 :require 'semantic-idle
+	 :initialize 'custom-initialize-default
+	 :set (lambda (sym val)
+		(,global (if val 1 -1))))
+
+       (defcustom ,hook nil
+	 (concat "*Hook run at the end of function `" (symbol-name ',mode) "'.")
+	 :group 'semantic
+	 :type 'hook)
+
+       (defvar ,map
+	 (let ((km (make-sparse-keymap)))
+	   km)
+	 (concat "Keymap for `" (symbol-name ',mode) "'."))
+
+       (defvar ,mode nil
+	 (concat "Non-nil if summary minor mode is enabled.
+Use the command `" (symbol-name ',mode) "' to change this variable."))
+       (make-variable-buffer-local ',mode)
+
+       (defun ,setup ()
+	 ,(concat "Setup option `" (symbol-name mode) "'.
+The minor mode can be turned on only if semantic feature is available
+and the idle scheduler is active.
+Return non-nil if the minor mode is enabled.")
+	 (if ,mode
+	     (if (not (and (featurep 'semantic) (semantic-active-p)))
+		 (progn
+		   ;; Disable minor mode if semantic stuff not available
+		   (setq ,mode nil)
+		   (error "Buffer %s was not set up for parsing"
+			  (buffer-name)))
+	       ;; Enable the mode mode
+	       (semantic-idle-scheduler-add #',func)
+	       )
+	   ;; Disable the mode mode
+	   (semantic-idle-scheduler-remove #',func)
+	   )
+	 ,mode)
+
+;;;###autoload
+       (defun ,mode (&optional arg)
+	 ,(concat doc "
+This is a minor mode which performs actions during idle time.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.")
+	 (interactive
+	  (list (or current-prefix-arg
+		    (if ,mode 0 1))))
+	 (setq ,mode
+	       (if arg
+		   (>
+		    (prefix-numeric-value arg)
+		    0)
+		 (not ,mode)))
+	 (,setup)
+	 (run-hooks ,hook)
+	 (if (interactive-p)
+	     (message "%s %sabled"
+		      (symbol-name ',mode)
+		      (if ,mode "en" "dis")))
+	 (semantic-mode-line-update)
+	 ,mode)
+
+       (semantic-add-minor-mode ',mode
+				""	; idle schedulers are quiet?
+				,map)
+
+       (defun ,func ()
+	 ,doc
+	 ,@forms)
+
+       )))
+(put 'define-semantic-idle-service 'lisp-indent-function 1)
+
+
+;;; SUMMARY MODE
+;;
+;; A mode similar to eldoc using semantic
+
+(defcustom semantic-idle-summary-function
+  'semantic-format-tag-summarize-with-file
+  "*Function to use when displaying tag information during idle time.
+Some useful functions are found in `semantic-format-tag-functions'."
+  :group 'semantic
+  :type semantic-format-tag-custom-list)
+
+(defsubst semantic-idle-summary-find-current-symbol-tag (sym)
+  "Search for a semantic tag with name SYM in database tables.
+Return the tag found or nil if not found.
+If semanticdb is not in use, use the current buffer only."
+  (car (if (and (featurep 'semanticdb) semanticdb-current-database)
+           (cdar (semanticdb-deep-find-tags-by-name sym))
+         (semantic-deep-find-tags-by-name sym (current-buffer)))))
+
+(defun semantic-idle-summary-current-symbol-info-brutish ()
+  "Return a string message describing the current context.
+Gets a symbol with `semantic-ctxt-current-thing' and then
+trys to find it with a deep targetted search."
+  ;; Try the current "thing".
+  (let ((sym (car (semantic-ctxt-current-thing))))
+    (when sym
+      (semantic-idle-summary-find-current-symbol-tag sym))))
+
+(defun semantic-idle-summary-current-symbol-keyword ()
+  "Return a string message describing the current symbol.
+Returns a value only if it is a keyword."
+  ;; Try the current "thing".
+  (let ((sym (car (semantic-ctxt-current-thing))))
+    (if (and sym (semantic-lex-keyword-p sym))
+	(semantic-lex-keyword-get sym 'summary))))
+
+(defun semantic-idle-summary-current-symbol-info-context ()
+  "Return a string message describing the current context.
+Use the semantic analyzer to find the symbol information."
+  (let ((analysis (condition-case nil
+		      (semantic-analyze-current-context (point))
+		    (error nil))))
+    (when analysis
+      (semantic-analyze-interesting-tag analysis))))
+
+(defun semantic-idle-summary-current-symbol-info-default ()
+  "Return a string message describing the current context.
+This functin will disable loading of previously unloaded files
+by semanticdb as a time-saving measure."
+  (let (
+	(semanticdb-find-default-throttle
+	 (if (featurep 'semanticdb-find)
+	     (remq 'unloaded semanticdb-find-default-throttle)
+	   nil))
+	)
+    (save-excursion
+      ;; use whicever has success first.
+      (or
+       (semantic-idle-summary-current-symbol-keyword)
+
+       (semantic-idle-summary-current-symbol-info-context)
+
+       (semantic-idle-summary-current-symbol-info-brutish)
+       ))))
+
+(defvar semantic-idle-summary-out-of-context-faces
+  '(
+    font-lock-comment-face
+    font-lock-string-face
+    font-lock-doc-string-face           ; XEmacs.
+    font-lock-doc-face                  ; Emacs 21 and later.
+    )
+  "List of font-lock faces that indicate a useless summary context.
+Those are generally faces used to highlight comments.
+
+It might be useful to override this variable to add comment faces
+specific to a major mode.  For example, in jde mode:
+
+\(defvar-mode-local jde-mode semantic-idle-summary-out-of-context-faces
+   (append (default-value 'semantic-idle-summary-out-of-context-faces)
+	   '(jde-java-font-lock-doc-tag-face
+	     jde-java-font-lock-link-face
+	     jde-java-font-lock-bold-face
+	     jde-java-font-lock-underline-face
+	     jde-java-font-lock-pre-face
+	     jde-java-font-lock-code-face)))")
+
+(defun semantic-idle-summary-useful-context-p ()
+  "Non-nil of we should show a summary based on context."
+  (if (and (boundp 'font-lock-mode)
+	   font-lock-mode
+	   (memq (get-text-property (point) 'face)
+		 semantic-idle-summary-out-of-context-faces))
+      ;; The best I can think of at the moment is to disable
+      ;; in comments by detecting with font-lock.
+      nil
+    t))
+
+(define-overloadable-function semantic-idle-summary-current-symbol-info ()
+  "Return a string message describing the current context.")
+
+(make-obsolete-overload 'semantic-eldoc-current-symbol-info
+                        'semantic-idle-summary-current-symbol-info)
+
+(define-semantic-idle-service semantic-idle-summary
+  "Display a tag summary of the lexical token under the cursor.
+Call `semantic-idle-summary-current-symbol-info' for getting the
+current tag to display information."
+  (or (eq major-mode 'emacs-lisp-mode)
+      (not (semantic-idle-summary-useful-context-p))
+      (let* ((found (semantic-idle-summary-current-symbol-info))
+             (str (cond ((stringp found) found)
+                        ((semantic-tag-p found)
+                         (funcall semantic-idle-summary-function
+                                  found nil t))))
+	     )
+	;; Show the message with eldoc functions
+        (require 'eldoc)
+        (unless (and str (boundp 'eldoc-echo-area-use-multiline-p)
+                     eldoc-echo-area-use-multiline-p)
+          (let ((w (1- (window-width (minibuffer-window)))))
+            (if (> (length str) w)
+                (setq str (substring str 0 w)))))
+        (eldoc-message str))))
+
+(semantic-alias-obsolete 'semantic-summary-mode
+			 'semantic-idle-summary-mode)
+(semantic-alias-obsolete 'global-semantic-summary-mode
+			 'global-semantic-idle-summary-mode)
+
+;;; Current symbol highlight
+;;
+;; This mode will use context analysis to perform highlighting
+;; of all uses of the symbol that is under the cursor.
+;;
+;; This is to mimic the Eclipse tool of a similar nature.
+(defvar semantic-idle-summary-highlight-face 'region
+  "Face used for the summary highlight.")
+
+(defun semantic-idle-summary-maybe-highlight (tag)
+  "Perhaps add highlighting onto TAG.
+TAG was found as the thing under point.  If it happens to be
+visible, then highlight it."
+  (let* ((region (when (and (semantic-tag-p tag)
+			    (semantic-tag-with-position-p tag))
+		   (semantic-tag-overlay tag)))
+	 (file (when (and (semantic-tag-p tag)
+			  (semantic-tag-with-position-p tag))
+		 (semantic-tag-file-name tag)))
+	 (buffer (when file (get-file-buffer file)))
+	 ;; We use pulse, but we don't want the flashy version,
+	 ;; just the stable version.
+	 (pulse-flag nil)
+	 )
+    (cond ((semantic-overlay-p region)
+	   (save-excursion
+	     (set-buffer (semantic-overlay-buffer region))
+	     (goto-char (semantic-overlay-start region))
+	     (when (pos-visible-in-window-p
+		    (point) (get-buffer-window (current-buffer) 'visible))
+	       (if (< (semantic-overlay-end region) (point-at-eol))
+		   (pulse-momentary-highlight-overlay
+		    region semantic-idle-summary-highlight-face)
+		 ;; Not the same
+		 (pulse-momentary-highlight-region
+		  (semantic-overlay-start region)
+		  (point-at-eol)
+		  semantic-idle-summary-highlight-face)))
+	     ))
+	  ((vectorp region)
+	   (let ((start (aref region 0))
+		 (end (aref region 1)))
+	     (save-excursion
+	       (when buffer (set-buffer buffer))
+	       ;; As a vector, we have no filename.  Perhaps it is a
+	       ;; local variable?
+	       (when (and (<= end (point-max))
+			  (pos-visible-in-window-p
+			   start (get-buffer-window (current-buffer) 'visible)))
+		 (goto-char start)
+		 (when (re-search-forward
+			(regexp-quote (semantic-tag-name tag))
+			end t)
+		   ;; This is likely it, give it a try.
+		   (pulse-momentary-highlight-region
+		    start (if (<= end (point-at-eol)) end
+			    (point-at-eol))
+		    semantic-idle-summary-highlight-face)))
+	       ))))
+    nil))
+
+
+(define-semantic-idle-service semantic-idle-tag-highlight
+  "Highlight the tag, and references of the symbol under point.
+Call `semantic-analyze-current-context' to find the refer ence tag.
+Call `semantic-symref-hits-in-region' to identify local references."
+  (when (semantic-idle-summary-useful-context-p)
+    (let* ((ctxt (semantic-analyze-current-context))
+	   (Hbounds (when ctxt (oref ctxt bounds)))
+	   (target (when ctxt (car (reverse (oref ctxt prefix)))))
+	   (tag (semantic-current-tag))
+	   ;; We use pulse, but we don't want the flashy version,
+	   ;; just the stable version.
+	   (pulse-flag nil))
+      (when ctxt
+	;; Highlight the original tag?  Protect against problems.
+	(condition-case nil
+	    (semantic-idle-summary-maybe-highlight target)
+	  (error nil))
+	;; Identify all hits in this current tag.
+	(when (semantic-tag-p target)
+	  (semantic-symref-hits-in-region
+	   target (lambda (start end prefix)
+		    (when (/= start (car Hbounds))
+		      (pulse-momentary-highlight-region
+		       start end semantic-idle-summary-highlight-face))
+		    (semantic-throw-on-input 'symref-highlight)
+		    )
+	   (semantic-tag-start tag)
+	   (semantic-tag-end tag)))
+	))))
+
+
+;;; Completion Popup Mode
+;;
+;; This mode uses tooltips to display a (hopefully) short list of possible
+;; completions available for the text under point.  It provides
+;; NO provision for actually filling in the values from those completions.
+
+(defun semantic-idle-completion-list-default ()
+  "Calculate and display a list of completions."
+  (when (semantic-idle-summary-useful-context-p)
+    ;; This mode can be fragile.  Ignore problems.
+    ;; If something doesn't do what you expect, run
+    ;; the below command by hand instead.
+    (condition-case nil
+	(let (
+	      ;; Don't go loading in oodles of header libraries in
+	      ;; IDLE time.
+	      (semanticdb-find-default-throttle
+	       (if (featurep 'semanticdb-find)
+		   (remq 'unloaded semanticdb-find-default-throttle)
+		 nil))
+	      )
+	  ;; Use idle version.
+	  (semantic-complete-analyze-inline-idle)
+	  )
+      (error nil))
+    ))
+
+(define-semantic-idle-service semantic-idle-completions
+  "Display a list of possible completions in a tooltip."
+  ;; Add the ability to override sometime.
+  (semantic-idle-completion-list-default))
+
+(provide 'semantic-idle)
+
+;;; semantic-idle.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-imenu.el b/site/cedet-1.0pre7/semantic/semantic-imenu.el
new file mode 100755
index 0000000..e16008e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-imenu.el
@@ -0,0 +1,554 @@
+;;; semantic-imenu.el --- Use Semantic as an imenu tag generator
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Paul Kinnucan & Eric Ludlam
+;;; Copyright (C) 2001, 2002, 2003 Eric Ludlam
+
+;; Created By: Paul Kinnucan
+;; Maintainer: Eric Ludlam
+;; X-RCS: $Id: semantic-imenu.el,v 1.60 2010/02/18 02:26:25 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic-imenu is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This support function can be used in any buffer which supports
+;; the bovinator to create the imenu index.
+;;
+;; To use this in a buffer, do this in a hook.
+;;
+;; (add-hook 'mode-hook
+;;           (lambda ()
+;;             (setq imenu-create-index-function 'semantic-create-imenu-index)
+;;             ))
+
+(require 'semantic)
+(require 'semantic-format)
+(require 'working)
+(eval-when-compile
+  (condition-case nil
+      (require 'imenu)
+    (error nil))
+  (require 'semanticdb)
+  )
+(condition-case nil
+    (progn
+      (require 'imenu)
+      (if (featurep 'xemacs)
+	  ;; From David Ponce <david@dponce.com>
+	  ;; Advice the XEmacs imenu function `imenu--create-menu-1' to
+	  ;; handle menu separators.
+	  (defadvice imenu--create-menu-1 (around semantic activate)
+	    ;; Create a menu separator item if first argument (title)
+	    ;; contains only hyphens and the second argument (list) is nil.
+	    (if (and (null (ad-get-arg 1))
+		     (not (string-match "[^-]" (ad-get-arg 0))))
+		(setq ad-return-value "-")
+	      ad-do-it)))
+      )
+  (error nil))
+
+;; Because semantic imenu tags will hose the current imenu handling
+;; code in speedbar, force semantic-sb in.
+(if (featurep 'speedbar)
+    (require 'semantic-sb)
+  (add-hook 'speedbar-load-hook (lambda () (require 'semantic-sb))))
+
+(defgroup semantic-imenu nil
+  "Parser Generator Imenu interface."
+  :group 'semantic
+  :group 'imenu
+  )
+
+;;;###autoload
+(defcustom semantic-imenu-summary-function 'semantic-format-tag-abbreviate
+  "*Function to use when creating items in Imenu.
+Some useful functions are found in `semantic-format-tag-functions'."
+  :group 'semantic-imenu
+  :type semantic-format-tag-custom-list)
+(make-variable-buffer-local 'semantic-imenu-summary-function)
+
+;;;###autoload
+(defcustom semantic-imenu-bucketize-file t
+  "*Non-nil if tags in a file are to be grouped into buckets."
+  :group 'semantic-imenu
+  :type 'boolean)
+(make-variable-buffer-local 'semantic-imenu-bucketize-file)
+
+(defcustom semantic-imenu-adopt-external-members t
+  "*Non-nil if types in a file should adopt externally defined members.
+C++ and CLOS can define methods that are not in the body of a class
+definition."
+  :group 'semantic-imenu
+  :type 'boolean)
+
+(defcustom semantic-imenu-buckets-to-submenu t
+  "*Non-nil if buckets of tags are to be turned into submenus.
+This option is ignored if `semantic-imenu-bucketize-file' is nil."
+  :group 'semantic-imenu
+  :type 'boolean)
+(make-variable-buffer-local 'semantic-imenu-buckets-to-submenu)
+
+;;;###autoload
+(defcustom semantic-imenu-expand-type-members t
+  "*Non-nil if types should have submenus with members in them."
+  :group 'semantic-imenu
+  :type 'boolean)
+(make-variable-buffer-local 'semantic-imenu-expand-type-members)
+(semantic-varalias-obsolete 'semantic-imenu-expand-type-parts
+                            'semantic-imenu-expand-type-members)
+
+(defcustom semantic-imenu-bucketize-type-members t
+  "*Non-nil if members of a type should be grouped into buckets.
+nil means to keep them in the same order.
+Overriden to nil if `semantic-imenu-bucketize-file' is nil."
+  :group 'semantic-imenu
+  :type 'boolean)
+(make-variable-buffer-local 'semantic-imenu-bucketize-type-parts)
+(semantic-varalias-obsolete 'semantic-imenu-bucketize-type-parts
+                            'semantic-imenu-bucketize-type-members)
+
+(defcustom semantic-imenu-sort-bucket-function nil
+  "*Function to use when sorting tags in the buckets of functions.
+See `semantic-bucketize' and the FILTER argument for more details on this function."
+  :group 'semantic-imenu
+  :type '(radio (const :tag "No Sorting" nil)
+		(const semantic-sort-tags-by-name-increasing)
+		(const semantic-sort-tags-by-name-decreasing)
+		(const semantic-sort-tags-by-type-increasing)
+		(const semantic-sort-tags-by-type-decreasing)
+		(const semantic-sort-tags-by-name-increasing-ci)
+		(const semantic-sort-tags-by-name-decreasing-ci)
+		(const semantic-sort-tags-by-type-increasing-ci)
+		(const semantic-sort-tags-by-type-decreasing-ci)
+		(function)))
+(make-variable-buffer-local 'semantic-imenu-sort-bucket-function)
+
+(defcustom semantic-imenu-index-directory nil
+  "*Non nil to index the entire directory for tags.
+Doesn't actually parse the entire directory, but displays tags for all files
+currently listed in the current Semantic database.
+This variable has no meaning if semanticdb is not active."
+  :group 'semantic-imenu
+  :type 'boolean)
+
+(defcustom semantic-imenu-auto-rebuild-directory-indexes nil
+  "*If non-nil automatically rebuild directory index imenus.
+That is when a directory index imenu is updated, automatically rebuild
+other buffer local ones based on the same semanticdb."
+  :group 'semantic-imenu
+  :type 'boolean)
+
+(defvar semantic-imenu-directory-current-file nil
+  "When building a file index, this is the file name currently being built.")
+
+(defvar semantic-imenu-auto-rebuild-running nil
+  "Non-nil if `semantic-imenu-rebuild-directory-indexes' is running.")
+
+;;;###autoload
+(defvar semantic-imenu-expandable-tag-classes '(type)
+  "List of expandable tag classes.
+Tags of those classes will be given submenu with children.
+By default, a `type' has interesting children.  In Texinfo, however, a
+`section' has interesting children.")
+(make-variable-buffer-local 'semantic-imenu-expandable-tag-classes)
+(semantic-varalias-obsolete 'semantic-imenu-expandable-token
+                            'semantic-imenu-expandable-tag-classes)
+
+;;; Code:
+(defun semantic-imenu-tag-overlay (tag)
+  "Return the overlay belonging to tag.
+If TAG doesn't have an overlay, and instead as a vector of positions,
+concoct a combination of file name, and position."
+  (let ((o (semantic-tag-overlay tag)))
+    (if (not (semantic-overlay-p o))
+	(let ((v (make-vector 3 nil)))
+	  (aset v 0 semantic-imenu-directory-current-file)
+	  (aset v 1 (aref o 0))
+	  (aset v 2 (aref o 1))
+	  v)
+      o)))
+
+(defun semantic-imenu-goto-function (name position &optional rest)
+  "Move point associated with NAME to POSITION.
+Used to override function `imenu-default-goto-function' so that we can continue
+to use overlays to maintain the current position.
+Optional argument REST is some extra stuff."
+  (if (semantic-overlay-p position)
+      (let ((os (semantic-overlay-start position))
+	    (ob (semantic-overlay-buffer position)))
+	(if os
+	    (progn
+	      (if (not (eq ob (current-buffer)))
+		  (switch-to-buffer ob))
+	      (imenu-default-goto-function name os rest)
+	      (pulse-momentary-highlight-one-line (point))
+	      )
+	  ;; This should never happen, but check anyway.
+	  (message "Imenu is out of date, try again. (internal bug)")
+	  (setq imenu--index-alist nil)))
+    ;; When the POSITION is actually a pair of numbers in an array, then
+    ;; the file isn't loaded into the current buffer.
+    (if (vectorp position)
+	(let ((file (aref position 0))
+	      (pos (aref position 1)))
+	  (and file (find-file file))
+	  (imenu-default-goto-function name pos rest)
+	  (pulse-momentary-highlight-one-line (point))
+	  )
+      ;; When the POSITION is the symbol 'file-only' it means that this
+      ;; is a directory index entry and there is no tags in this
+      ;; file. So just jump to the beginning of the file.
+      (if (eq position 'file-only)
+	  (progn
+	    (find-file name)
+	    (imenu-default-goto-function name (point-min) rest)
+	    (pulse-momentary-highlight-one-line (point))
+	    )
+        ;; Probably POSITION don't came from a semantic imenu.  Try
+        ;; the default imenu goto function.
+        (condition-case nil
+	    (progn
+	      (imenu-default-goto-function name position rest)
+	      (pulse-momentary-highlight-one-line (point))
+	      )
+          (error
+           (message "Semantic Imenu override problem. (Internal bug)")
+           (setq imenu--index-alist nil)))))
+    ))
+
+(defun semantic-imenu-flush-fcn (&optional ignore)
+  "This function is called as a hook to clear the imenu cache.
+It is cleared after any parsing.
+IGNORE arguments."
+  (if (eq imenu-create-index-function 'semantic-create-imenu-index)
+      (setq imenu--index-alist nil
+            imenu-menubar-modified-tick 0))
+  (remove-hook 'semantic-after-toplevel-cache-change-hook
+               'semantic-imenu-flush-fcn t)
+  (remove-hook 'semantic-after-partial-cache-change-hook
+               'semantic-imenu-flush-fcn t)
+  )
+
+;;;###autoload
+(defun semantic-create-imenu-index (&optional stream)
+  "Create an imenu index for any buffer which supports Semantic.
+Uses the output of the Semantic parser to create the index.
+Optional argument STREAM is an optional stream of tags used to create menus."
+  (setq imenu-default-goto-function 'semantic-imenu-goto-function)
+  (prog1
+      (if (and semantic-imenu-index-directory
+               (featurep 'semanticdb)
+               (semanticdb-minor-mode-p))
+          (semantic-create-imenu-directory-index
+	   (or stream (semantic-fetch-tags-fast)))
+        (semantic-create-imenu-index-1
+	 (or stream (semantic-fetch-tags-fast)) nil))
+    (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook)
+    (add-hook 'semantic-after-toplevel-cache-change-hook
+              'semantic-imenu-flush-fcn nil t)
+    (semantic-make-local-hook 'semantic-after-partial-cache-change-hook)
+    (add-hook 'semantic-after-partial-cache-change-hook
+              'semantic-imenu-flush-fcn nil t)))
+
+(defun semantic-create-imenu-directory-index (&optional stream)
+  "Create an IMENU tag index based on all files active in semanticdb.
+Optional argument STREAM is the stream of tags for the current buffer."
+  (if (not semanticdb-current-database)
+      (semantic-create-imenu-index-1 stream nil)
+    ;; We have a database, list all files, with the current file on top.
+    (let ((index (list
+		  (cons (oref semanticdb-current-table file)
+			(or (semantic-create-imenu-index-1 stream nil)
+			    ;; No tags in this file
+			    'file-only))))
+	  (tables (semanticdb-get-database-tables semanticdb-current-database)))
+      (working-status-forms "Imenu Directory Index" "done"
+	(while tables
+	  (let ((semantic-imenu-directory-current-file
+		 (oref (car tables) file))
+		tags)
+	    (when (and (not (eq (car tables) semanticdb-current-table))
+		       (semanticdb-live-p (car tables))
+		       (semanticdb-equivalent-mode (car tables))
+		       )
+	      (setq tags (oref (car tables) tags)
+		    index (cons (cons semantic-imenu-directory-current-file
+				      (or (and tags
+					       ;; don't pass nil stream because
+					       ;; it will use the current
+					       ;; buffer
+					       (semantic-create-imenu-index-1
+						(oref (car tables) tags)
+						nil))
+					  ;; no tags in the file
+					  'file-only))
+				index)))
+	    (setq tables (cdr tables)))
+	  (working-dynamic-status))
+	(working-dynamic-status t))
+      
+      ;; If enabled automatically rebuild other imenu directory
+      ;; indexes based on the same Semantic database
+      (or (not semantic-imenu-auto-rebuild-directory-indexes)
+          ;; If auto rebuild already in progress does nothing
+          semantic-imenu-auto-rebuild-running
+          (unwind-protect
+              (progn
+                (setq semantic-imenu-auto-rebuild-running t)
+                (semantic-imenu-rebuild-directory-indexes
+                 semanticdb-current-database))
+            (setq semantic-imenu-auto-rebuild-running nil)))
+      
+      (nreverse index))))
+
+(defun semantic-create-imenu-index-1 (stream &optional parent)
+  "Create an imenu index for any buffer which supports Semantic.
+Uses the output of the Semantic parser to create the index.
+STREAM is a stream of tags used to create menus.
+Optional argument PARENT is a tag parent of STREAM."
+  (let ((tags stream)
+	(semantic-imenu-adopt-external-members
+	 semantic-imenu-adopt-external-members))
+    ;; If we should regroup, do so.
+    (if semantic-imenu-adopt-external-members
+ 	(setq tags (semantic-adopt-external-members tags)
+	      ;; Don't allow recursion here.
+	      semantic-imenu-adopt-external-members nil))
+    ;; Test for bucketing vs not.
+    (if semantic-imenu-bucketize-file
+	(let ((buckets (semantic-bucketize
+			tags parent
+			semantic-imenu-sort-bucket-function))
+	      item name
+	      index)
+	  (cond
+	   ((null buckets)
+	    nil)
+	   ((or (cdr-safe buckets) ;; if buckets has more than one item in it.
+                (not semantic-imenu-buckets-to-submenu)) ;; to force separators between buckets
+	    (while buckets
+	      (setq name (car (car buckets))
+		    item (cdr (car buckets)))
+	      (if semantic-imenu-buckets-to-submenu
+		  (progn
+		    ;; Make submenus
+		    (if item
+			(setq index
+			      (cons (cons name
+					  (semantic-create-imenu-subindex item))
+				    index))))
+		;; Glom everything together with "---" between
+		(if item
+		    (setq index
+			  (append index
+				  ;; do not create a menu separator in the parent menu
+				  ;; when creating a sub-menu
+				  (if (memq (semantic-tag-class (car item))
+                                            semantic-imenu-expandable-tag-classes)
+				      (semantic-create-imenu-subindex item)
+				    (cons
+				     '("---")
+				     (semantic-create-imenu-subindex item)))))
+		  ))
+	      (setq buckets (cdr buckets)))
+	    (if semantic-imenu-buckets-to-submenu
+		(nreverse index)
+	      index))
+	   (t
+	    (setq name (car (car buckets))
+		  item (cdr (car buckets)))
+	    (semantic-create-imenu-subindex item))))
+      ;; Else, group everything together
+      (semantic-create-imenu-subindex tags))))
+
+(defun semantic-create-imenu-subindex (tags)
+  "From TAGS, create an imenu index of interesting things."
+  (let ((notypecheck (not semantic-imenu-expand-type-members))
+	children index tag parts)
+    (while tags
+      (setq tag (car tags)
+	    children (semantic-tag-components-with-overlays tag))
+      (if (and (not notypecheck)
+               (memq (semantic-tag-class tag)
+                     semantic-imenu-expandable-tag-classes)
+	       children
+               )
+          ;; to keep an homogeneous menu organisation, type menu items
+          ;; always have a sub-menu with at least the *definition*
+          ;; item (even if the tag has no type components)
+	  (progn
+	    (setq parts children)
+	    ;; There is options which create the submenu
+	    ;;  * Type has an overlay, but children do.
+	    ;; The type doesn't have to have it's own overlay,
+	    ;; but a type with no overlay and no children should be
+	    ;; invalid.
+	    (setq index
+		  (cons
+		   (cons
+		    (funcall semantic-imenu-summary-function tag)
+		    ;; Add a menu for getting at the type definitions
+		    (if (and parts
+			     ;; Note to self: enable menu items for
+			     ;; sub parts even if they are not proper
+			     ;; tags.
+			     (semantic-tag-p (car parts)))
+			(let ((submenu
+			       (if (and semantic-imenu-bucketize-type-members
+					semantic-imenu-bucketize-file)
+				   (semantic-create-imenu-index-1 parts tag)
+				 (semantic-create-imenu-subindex parts))))
+			  ;; Only add a *definition* if we have a postion
+			  ;; in that type tag.
+			  (if (semantic-tag-with-position-p tag)
+			      (cons
+			       (cons "*definition*"
+				     (semantic-imenu-tag-overlay tag))
+			       submenu)
+			    submenu))
+		      ;; There were no parts, or something like that, so
+		      ;; instead just put the definition here.
+		      (if (semantic-tag-with-position-p tag)
+			  (semantic-imenu-tag-overlay tag)
+			nil)
+		      ))
+		   index)))
+	(if (semantic-tag-with-position-p tag)
+	    (setq index (cons
+			 (cons
+			  (funcall semantic-imenu-summary-function tag)
+			  (semantic-imenu-tag-overlay tag))
+			 index))))
+      (setq tags (cdr tags)))
+    ;; `imenu--split-submenus' sort submenus according to
+    ;; `imenu-sort-function' setting and split them up if they are
+    ;; longer than `imenu-max-items'.
+    (imenu--split-submenus (nreverse index))))
+
+;;; directory imenu rebuilding.
+;;
+(defun semantic-imenu-rebuild-directory-indexes (db)
+  "Rebuild directory index imenus based on Semantic database DB."
+  (let ((l (buffer-list))
+        b)
+    (while l
+      (setq b (car l)
+            l (cdr l))
+      (if (and (not (eq b (current-buffer)))
+               (buffer-live-p b))
+          (with-current-buffer b
+            ;; If there is a buffer local Semantic index directory
+            ;; imenu
+            (when (and (eq imenu-create-index-function
+                           'semantic-create-imenu-index)
+                       semanticdb-current-database
+                       (eq semanticdb-current-database db))
+              (working-temp-message
+               "Building %s Semantic directory index imenu"
+               (buffer-name b))
+              ;; Rebuild the imenu
+              (imenu--cleanup)
+              (setq imenu--index-alist nil)
+              (funcall
+               (if (fboundp 'imenu-menu-filter)
+                   ;; XEmacs imenu
+                   'imenu-menu-filter
+                 ;; Emacs imenu
+                 'imenu-update-menubar))))))))
+
+(defun semantic-imenu-semanticdb-hook ()
+  "Function to be called from `semanticdb-mode-hook'.
+Clears all imenu menus that may be depending on the database."
+  (semantic-map-buffers
+   #'(lambda ()
+       ;; Set up semanticdb environment if enabled.
+       (if (semanticdb-minor-mode-p)
+           (semanticdb-semantic-init-hook-fcn))
+       ;; Clear imenu cache to redraw the imenu.
+       (semantic-imenu-flush-fcn))))
+
+(add-hook 'semanticdb-mode-hook 'semantic-imenu-semanticdb-hook)
+
+;;; Interactive Utilities
+;;
+(defun semantic-imenu-toggle-bucketize-file ()
+  "Toggle the ability of imenu to bucketize the current file."
+  (interactive)
+  (setq semantic-imenu-bucketize-file (not semantic-imenu-bucketize-file))
+  ;; Force a rescan
+  (setq imenu--index-alist nil))
+
+(defun semantic-imenu-toggle-buckets-to-submenu ()
+  "Toggle the ability of imenu to turn buckets into submenus."
+  (interactive)
+  (setq semantic-imenu-buckets-to-submenu (not semantic-imenu-buckets-to-submenu))
+  ;; Force a rescan
+  (setq imenu--index-alist nil))
+
+(defun semantic-imenu-toggle-bucketize-type-parts ()
+  "Toggle the ability of imenu to bucketize the current file."
+  (interactive)
+  (setq semantic-imenu-bucketize-type-members (not semantic-imenu-bucketize-type-members))
+  ;; Force a rescan
+  (setq imenu--index-alist nil))
+
+;;; Which function support
+;;
+;; The which-function library will display the current function in the
+;; mode line.  It tries do do this through imenu.  With a semantic parsed
+;; buffer, there is a much more efficient way of doing this.
+;; Advise `which-function' so that we optionally use semantic tags
+;; instead, and get better stuff.
+(require 'advice)
+
+(defvar semantic-which-function 'semantic-default-which-function
+  "Function to convert semantic tags into `which-function' text.")
+
+(defcustom semantic-which-function-use-color nil
+  "*Use color when displaying the current function with `which-function'."
+  :group 'semantic-imenu
+  :type 'boolean)
+
+(defun semantic-default-which-function (taglist)
+  "Convert TAGLIST into a string usable by `which-function'.
+Returns the first tag name in the list, unless it is a type,
+in which case it concatenates them together."
+  (cond ((eq (length taglist) 1)
+	 (semantic-format-tag-abbreviate
+          (car taglist) nil semantic-which-function-use-color))
+	((memq (semantic-tag-class (car taglist))
+               semantic-imenu-expandable-tag-classes)
+	 (concat (semantic-format-tag-name
+                  (car taglist) nil semantic-which-function-use-color)
+		 (car semantic-type-relation-separator-character)
+		 ;; recurse until we no longer have a type
+		 ;; or any tags left.
+		 (semantic-default-which-function (cdr taglist))))
+	(t (semantic-format-tag-abbreviate
+            (car taglist) nil semantic-which-function-use-color))))
+
+(defadvice which-function (around semantic-which activate)
+  "Choose the function to display via semantic if it is currently active."
+  (if (and (featurep 'semantic) semantic--buffer-cache)
+      (let ((ol (semantic-find-tag-by-overlay)))
+	(setq ad-return-value (funcall semantic-which-function ol)))
+    ad-do-it))
+
+(provide 'semantic-imenu)
+
+;;; semantic-imenu.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-lex-spp.el b/site/cedet-1.0pre7/semantic/semantic-lex-spp.el
new file mode 100644
index 0000000..e1932ae
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-lex-spp.el
@@ -0,0 +1,1227 @@
+;;; semantic-lex-spp.el --- Semantic Lexical Pre-processor
+
+;;; Copyright (C) 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-lex-spp.el,v 1.51 2010/01/17 16:21:56 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; The Semantic Preprocessor works with semantic-lex to provide a phase
+;; during lexical analysis to do the work of a pre-processor.
+;;
+;; A pre-processor identifies lexical syntax mixed in with another language
+;; and replaces some keyword tokens with streams of alternate tokens.
+;;
+;; If you use SPP in your language, be sure to specify this in your
+;; semantic language setup function:
+;;
+;; (add-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook nil t)
+;;
+;;
+;; Special Lexical Tokens:
+;;
+;; There are several special lexical tokens that are used by the
+;; Semantic PreProcessor lexer.  They are:
+;;
+;; Declarations:
+;;   spp-macro-def - A definition of a lexical macro.
+;;   spp-macro-undef - A removal of a definition of a lexical macro.
+;;   spp-system-include - A system level include file
+;;   spp-include - An include file
+;;   spp-concat - A lexical token representing textual concatenation
+;;           of symbol parts.
+;;
+;; Operational tokens:
+;;   spp-arg-list - Represents an argument list to a macro.
+;;   spp-symbol-merge - A request for multiple symbols to be textually merged.
+;;
+;;; TODO:
+;;
+;; Use `semantic-push-parser-warning' for situations where there are likely
+;; macros that are undefined unexpectedly, or other problem.
+;;
+;; TODO:
+;;
+;; Try to handle the case of:
+;;
+;; #define NN namespace nn {
+;; #define NN_END }
+;;
+;; NN
+;;   int mydecl() {}
+;; NN_END
+;;
+
+(require 'semantic-lex)
+
+;;; Code:
+(defvar semantic-lex-spp-macro-symbol-obarray nil
+  "Table of macro keywords used by the Semantic Preprocessor.
+These symbols will be used in addition to those in
+`semantic-lex-spp-dynamic-macro-symbol-obarray'.")
+(make-variable-buffer-local 'semantic-lex-spp-macro-symbol-obarray)
+
+(defvar semantic-lex-spp-project-macro-symbol-obarray nil
+  "Table of macro keywords for this project.
+These symbols will be used in addition to those in
+`semantic-lex-spp-dynamic-macro-symbol-obarray'.")
+(make-variable-buffer-local 'semantic-lex-spp-project-macro-symbol-obarray)
+
+(defvar semantic-lex-spp-dynamic-macro-symbol-obarray nil
+  "Table of macro keywords used during lexical analysis.
+Macros are lexical symbols which are replaced by other lexical
+tokens during lexical analysis.  During analysis symbols can be
+added and removed from this symbol table.")
+(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray)
+
+(defvar semantic-lex-spp-dynamic-macro-symbol-obarray-stack nil
+  "A stack of obarrays for temporarilly scoped macro values.")
+(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray-stack)
+
+(defvar semantic-lex-spp-expanded-macro-stack nil
+  "The stack of lexical SPP macros we have expanded.")
+;; The above is not buffer local.  Some macro expansions need to be
+;; dumped into a secondary buffer for re-lexing.
+
+;;; NON-RECURSIVE MACRO STACK
+;; C Pre-processor does not allow recursive macros.  Here are some utils
+;; for managing the symbol stack of where we've been.
+
+(defmacro semantic-lex-with-macro-used (name &rest body)
+  "With the macro NAME currently being expanded, execute BODY.
+Pushes NAME into the macro stack.  The above stack is checked
+by `semantic-lex-spp-symbol' to not return true for any symbol
+currently being expanded."
+  `(unwind-protect
+       (progn
+	 (push ,name semantic-lex-spp-expanded-macro-stack)
+	 ,@body)
+     (pop semantic-lex-spp-expanded-macro-stack)))
+(put 'semantic-lex-with-macro-used 'lisp-indent-function 1)
+
+(add-hook
+ 'edebug-setup-hook
+ #'(lambda ()
+
+     (def-edebug-spec semantic-lex-with-macro-used
+       (symbolp def-body)
+       )
+
+     ))
+
+;;; MACRO TABLE UTILS
+;;
+;; The dynamic macro table is a buffer local variable that is modified
+;; during the analysis.  OBARRAYs are used, so the language must
+;; have symbols that are compatible with Emacs Lisp symbols.
+;;
+(defsubst semantic-lex-spp-symbol (name)
+  "Return spp symbol with NAME or nil if not found.
+The searcy priority is:
+  1. DYNAMIC symbols
+  2. PROJECT specified symbols.
+  3. SYSTEM specified symbols."
+  (and
+   ;; Only strings...
+   (stringp name)
+   ;; Make sure we don't recurse.
+   (not (member name semantic-lex-spp-expanded-macro-stack))
+   ;; Do the check of the various tables.
+   (or
+    ;; DYNAMIC
+    (and (arrayp semantic-lex-spp-dynamic-macro-symbol-obarray)
+	 (intern-soft name semantic-lex-spp-dynamic-macro-symbol-obarray))
+    ;; PROJECT
+    (and (arrayp semantic-lex-spp-project-macro-symbol-obarray)
+	 (intern-soft name semantic-lex-spp-project-macro-symbol-obarray))
+    ;; SYSTEM
+    (and (arrayp semantic-lex-spp-macro-symbol-obarray)
+	 (intern-soft name semantic-lex-spp-macro-symbol-obarray))
+    ;; ...
+    )))
+
+(defsubst semantic-lex-spp-symbol-p (name)
+  "Return non-nil if a keyword with NAME exists in any keyword table."
+  (if (semantic-lex-spp-symbol name)
+      t))
+
+(defsubst semantic-lex-spp-dynamic-map ()
+  "Return the dynamic macro map for the current buffer."
+  (or semantic-lex-spp-dynamic-macro-symbol-obarray
+      (setq semantic-lex-spp-dynamic-macro-symbol-obarray
+	    (make-vector 13 0))))
+
+(defsubst semantic-lex-spp-dynamic-map-stack ()
+  "Return the dynamic macro map for the current buffer."
+  (or semantic-lex-spp-dynamic-macro-symbol-obarray-stack
+      (setq semantic-lex-spp-dynamic-macro-symbol-obarray-stack
+	    (make-vector 13 0))))
+
+(defun semantic-lex-spp-symbol-set (name value &optional obarray-in)
+  "Set value of spp symbol with NAME to VALUE and return VALUE.
+If optional OBARRAY-IN is non-nil, then use that obarray instead of
+the dynamic map."
+  (if (and (stringp value) (string= value "")) (setq value nil))
+  (set (intern name (or obarray-in
+			(semantic-lex-spp-dynamic-map)))
+       value))
+
+(defsubst semantic-lex-spp-symbol-remove (name &optional obarray)
+  "Remove the spp symbol with NAME.
+If optional OBARRAY is non-nil, then use that obarray instead of
+the dynamic map."
+  (unintern name (or obarray
+		     (semantic-lex-spp-dynamic-map))))
+
+(defun semantic-lex-spp-symbol-push (name value)
+  "Push macro NAME with VALUE into the map.
+Reverse with `semantic-lex-spp-symbol-pop'."
+  (let* ((map (semantic-lex-spp-dynamic-map))
+	 (stack (semantic-lex-spp-dynamic-map-stack))
+	 (mapsym (intern name map))
+	 (stacksym (intern name stack))
+	 (mapvalue (when (boundp mapsym) (symbol-value mapsym)))
+	 )
+    (when (boundp mapsym)
+      ;; Make sure there is a stack
+      (if (not (boundp stacksym)) (set stacksym nil))
+      ;; If there is a value to push, then push it.
+      (set stacksym (cons mapvalue (symbol-value stacksym)))
+      )
+    ;; Set our new value here.
+    (set mapsym value)
+    ))
+
+(defun semantic-lex-spp-symbol-pop (name)
+  "Pop macro NAME from the stackmap into the orig map.
+Reverse with `semantic-lex-spp-symbol-pop'."
+  (let* ((map (semantic-lex-spp-dynamic-map))
+	 (stack (semantic-lex-spp-dynamic-map-stack))
+	 (mapsym (intern name map))
+	 (stacksym (intern name stack))
+	 (oldvalue nil)
+	 )
+    (if (or (not (boundp stacksym) )
+	    (= (length (symbol-value stacksym)) 0))
+	;; Nothing to pop, remove it.
+	(unintern name map)
+      ;; If there is a value to pop, then add it to the map.
+      (set mapsym (car (symbol-value stacksym)))
+      (set stacksym (cdr (symbol-value stacksym)))
+      )))
+
+(defsubst semantic-lex-spp-symbol-stream (name)
+  "Return replacement stream of macro with NAME."
+  (let ((spp (semantic-lex-spp-symbol name)))
+    (if spp
+        (symbol-value spp))))
+
+(defun semantic-lex-make-spp-table (specs)
+  "Convert spp macro list SPECS into an obarray and return it.
+SPECS must be a list of (NAME . REPLACEMENT) elements, where:
+
+NAME is the name of the spp macro symbol to define.
+REPLACEMENT a string that would be substituted in for NAME."
+
+  ;; Create the symbol hash table
+  (let ((semantic-lex-spp-macro-symbol-obarray (make-vector 13 0))
+        spec)
+    ;; fill it with stuff
+    (while specs
+      (setq spec  (car specs)
+            specs (cdr specs))
+      (semantic-lex-spp-symbol-set
+       (car spec)
+       (cdr spec)
+       semantic-lex-spp-macro-symbol-obarray))
+    semantic-lex-spp-macro-symbol-obarray))
+
+(defun semantic-lex-spp-save-table ()
+  "Return a list of spp macros and values.
+The return list is meant to be saved in a semanticdb table."
+  (let (macros)
+    (when (arrayp semantic-lex-spp-dynamic-macro-symbol-obarray)
+      (mapatoms
+       #'(lambda (symbol)
+	   (setq macros (cons (cons (symbol-name symbol)
+				    (symbol-value symbol))
+			      macros)))
+       semantic-lex-spp-dynamic-macro-symbol-obarray))
+    macros))
+
+(defun semantic-lex-spp-macros ()
+  "Return a list of spp macros as Lisp symbols.
+The value of each symbol is the replacement stream."
+  (let (macros)
+    (when (arrayp semantic-lex-spp-macro-symbol-obarray)
+      (mapatoms
+       #'(lambda (symbol)
+	   (setq macros (cons symbol macros)))
+       semantic-lex-spp-macro-symbol-obarray))
+    (when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
+      (mapatoms
+       #'(lambda (symbol)
+	   (setq macros (cons symbol macros)))
+       semantic-lex-spp-project-macro-symbol-obarray))
+    (when (arrayp semantic-lex-spp-dynamic-macro-symbol-obarray)
+      (mapatoms
+       #'(lambda (symbol)
+	   (setq macros (cons symbol macros)))
+       semantic-lex-spp-dynamic-macro-symbol-obarray))
+    macros))
+
+(defun semantic-lex-spp-set-dynamic-table (new-entries)
+  "Set the dynamic symbol table to NEW-ENTRIES.
+For use with semanticdb restoration of state."
+  (dolist (e new-entries)
+    ;; Default obarray for below is the dynamic map.
+    (semantic-lex-spp-symbol-set (car e) (cdr e))))
+
+(defun semantic-lex-spp-reset-hook (start end)
+  "Reset anything needed by SPP for parsing.
+In this case, reset the dynamic macro symbol table if
+START is (point-min).
+END is not used."
+  (when (= start (point-min))
+    (setq semantic-lex-spp-dynamic-macro-symbol-obarray nil
+	  semantic-lex-spp-dynamic-macro-symbol-obarray-stack nil
+	  ;; This shouldn't not be nil, but reset just in case.
+	  semantic-lex-spp-expanded-macro-stack nil)
+    ))
+
+;;; MACRO EXPANSION: Simple cases
+;;
+;; If a user fills in the table with simple strings, we can
+;; support that by converting them into tokens with the
+;; various analyzers that are available.
+
+(defun semantic-lex-spp-extract-regex-and-compare (analyzer value)
+  "Extract a regexp from an ANALYZER and use to match VALUE.
+Return non-nil if it matches"
+  (let* ((condition (car analyzer))
+	 (regex (cond ((eq (car condition) 'looking-at)
+		       (nth 1 condition))
+		      (t
+		       nil))))
+    (when regex
+      (string-match regex value))
+    ))
+
+(defun semantic-lex-spp-simple-macro-to-macro-stream (val beg end argvalues)
+  "Convert lexical macro contents VAL into a macro expansion stream.
+These are for simple macro expansions that a user may have typed in directly.
+As such, we need to analyze the input text, to figure out what kind of real
+lexical token we should be inserting in its place.
+
+Argument VAL is the value of some macro to be converted into a stream.
+BEG and END are the token bounds of the macro to be expanded
+that will somehow gain a much longer token stream.
+ARGVALUES are values for any arg list, or nil."
+  (cond
+   ;; We perform a replacement.  Technically, this should
+   ;; be a full lexical step over the "val" string, but take
+   ;; a guess that its just a keyword or existing symbol.
+   ;;
+   ;; Probably a really bad idea.  See how it goes.
+   ((semantic-lex-spp-extract-regex-and-compare
+     semantic-lex-symbol-or-keyword val)
+    (semantic-lex-push-token
+     (semantic-lex-token (or (semantic-lex-keyword-p val) 'symbol)
+			 beg end
+			 val)))
+
+   ;; Ok, the rest of these are various types of syntax.
+   ;; Conveniences for users that type in their symbol table.
+   ((semantic-lex-spp-extract-regex-and-compare
+     semantic-lex-punctuation val)
+    (semantic-lex-token 'punctuation beg end val))
+   ((semantic-lex-spp-extract-regex-and-compare
+     semantic-lex-number val)
+    (semantic-lex-token 'number beg end val))
+   ((semantic-lex-spp-extract-regex-and-compare
+     semantic-lex-paren-or-list val)
+    (semantic-lex-token 'semantic-list beg end val))
+   ((semantic-lex-spp-extract-regex-and-compare
+     semantic-lex-string val)
+    (semantic-lex-token 'string beg end val))
+   (t nil)
+   ))
+
+;;; MACRO EXPANSION : Lexical token replacement
+;;
+;; When substituting in a macro from a token stream of formatted
+;; semantic lex tokens, things can be much more complicated.
+;;
+;; Some macros have arguments that get set into the dynamic macro
+;; table during replacement.
+;;
+;; In general, the macro tokens are substituted into the regular
+;; token stream, but placed under the characters of the original
+;; macro symbol.
+;;
+;; Argument lists are saved as a lexical token at the beginning
+;; of a replacement value.
+
+(defun semantic-lex-spp-one-token-to-txt (tok &optional blocktok)
+  "Convert the token TOK into a string.
+If TOK is made of multiple tokens, convert those to text.  This
+conversion is needed if a macro has a merge symbol in it that
+combines the text of two previously distinct symbols.  For
+exampe, in c:
+
+#define (a,b) a ## b;
+
+If optional string BLOCKTOK matches the expanded value, then do not
+continue processing recursively."
+  (let ((txt (semantic-lex-token-text tok))
+	(sym nil)
+	)
+    (cond
+     ;; Recursion prevention
+     ((and (stringp blocktok) (string= txt blocktok))
+      blocktok)
+     ;; A complex symbol
+     ((and (eq (car tok) 'symbol)
+	   (setq sym (semantic-lex-spp-symbol txt))
+	   (not (semantic-lex-spp-macro-with-args (symbol-value sym)))
+	   )
+      ;; Now that we have a symbol,
+      (let ((val (symbol-value sym)))
+	(cond
+	 ;; This is another lexical token.
+	 ((and (consp val)
+	       (symbolp (car val)))
+	  (semantic-lex-spp-one-token-to-txt val txt))
+	 ;; This is a list of tokens.
+	 ((and (consp val)
+	       (consp (car val))
+	       (symbolp (car (car val))))
+	  (mapconcat (lambda (subtok)
+		       (semantic-lex-spp-one-token-to-txt subtok))
+		     val
+		     ""))
+	 ;; If val is nil, that's probably wrong.
+	 ;; Found a system header case where this was true.
+	 ((null val) "")
+	 ;; Debug wierd stuff.
+	 (t (debug)))
+	))
+     ((stringp txt)
+      txt)
+     (t nil))
+    ))
+
+(defun semantic-lex-spp-macro-with-args (val)
+  "If the macro value VAL has an argument list, return the arglist."
+  (when (and val (consp val) (consp (car val))
+	     (eq 'spp-arg-list (car (car val))))
+    (car (cdr (car val)))))
+
+(defun semantic-lex-spp-token-macro-to-macro-stream (val beg end argvalues)
+  "Convert lexical macro contents VAL into a macro expansion stream.
+Argument VAL is the value of some macro to be converted into a stream.
+BEG and END are the token bounds of the macro to be expanded
+that will somehow gain a much longer token stream.
+ARGVALUES are values for any arg list, or nil.
+See comments in code for information about how token streams are processed
+and what valid VAL values are."
+
+  ;; A typical VAL value might be either a stream of tokens.
+  ;; Tokens saved into a macro stream always includes the text from the
+  ;; buffer, since the locations specified probably don't represent
+  ;; that text anymore, or even the same buffer.
+  ;;
+  ;; CASE 1: Simple token stream
+  ;;
+  ;; #define SUPER mysuper::
+  ;;  ==>
+  ;;((symbol "mysuper" 480 . 487)
+  ;; (punctuation ":" 487 . 488)
+  ;; (punctuation ":" 488 . 489))
+  ;;
+  ;; CASE 2: Token stream with argument list
+  ;;
+  ;; #define INT_FCN(name) int name (int in)
+  ;;  ==>
+  ;; ((spp-arg-list ("name") 558 . 564)
+  ;;  (INT "int" 565 . 568)
+  ;;  (symbol "name" 569 . 573)
+  ;;  (semantic-list "(int in)" 574 . 582))
+  ;;
+  ;; In the second case, a macro with an argument list as the a rgs as the
+  ;; first entry.
+  ;;
+  ;; CASE 3: Symbol text merge
+  ;;
+  ;; #define TMP(a) foo_ ## a
+  ;;   ==>
+  ;; ((spp-arg-list ("a") 20 . 23)
+  ;;  (spp-symbol-merge ((symbol "foo_" 24 . 28) (symbol "a" 32 . 33))
+  ;; 		          24 . 33))
+  ;;
+  ;; Usually in conjunction with a macro with an argument, merging symbol
+  ;; parts is a way of fabricating new symbols from pieces inside the macro.
+  ;; These macros use `spp-symbol-merge' tokens whose TEXT part is another
+  ;; token stream.  This sub-stream ought to consist of only 2 SYMBOL pieces,
+  ;; though I suppose keywords might be ok.  The end result of this example
+  ;; merge symbol would be (symbol "foo_A" 24 . 33) where A is the symbol
+  ;; passed in from the arg list "a".
+  ;;
+  ;; CASE 4: Nested token streams
+  ;;
+  ;; #define FOO(f) f
+  ;; #define BLA bla FOO(foo)
+  ;;  ==>
+  ;; ((INT "int" 82 . 85)
+  ;;  (symbol "FOO" 86 . 89)
+  ;;  (semantic-list "(foo)" 89 . 94))
+  ;;
+  ;; Nested token FOO shows up in the table of macros, and gets replace
+  ;; inline.  This is the same as case 2.
+
+  (let ((arglist (semantic-lex-spp-macro-with-args val))
+	(argalist nil)
+	(val-tmp nil)
+	(v nil)
+	)
+    ;; CASE 2: Dealing with the arg list.
+    (when arglist
+      ;;  Skip the arg list.
+      (setq val (cdr val))
+
+      ;; Push args into the replacement list.
+      (let ((AV argvalues))
+	(dolist (A arglist)
+	  (let* ((argval (car AV)))
+
+	    (semantic-lex-spp-symbol-push A argval)
+	    (setq argalist (cons (cons A argval) argalist))
+	    (setq AV (cdr AV)))))
+      )
+
+    ;; Set val-tmp after stripping arguments.
+    (setq val-tmp val)
+
+    ;; CASE 1: Push everything else onto the list.
+    ;;   Once the arg list is stripped off, CASE 2 is the same
+    ;;   as CASE 1.
+    (while val-tmp
+      (setq v (car val-tmp))
+      (setq val-tmp (cdr val-tmp))
+
+      (let* (;; The text of the current lexical token.
+	     (txt (car (cdr v)))
+	     ;; Try to convert txt into a macro declaration.  If it is
+	     ;; not a macro, use nil.
+	     (txt-macro-or-nil (semantic-lex-spp-symbol txt))
+	     ;; If our current token is a macro, then pull off the argument
+	     ;; list.
+	     (macro-and-args
+	      (when txt-macro-or-nil
+		(semantic-lex-spp-macro-with-args (symbol-value txt-macro-or-nil)))
+	      )
+	     ;; We need to peek at the next token when testing for
+	     ;; used macros with arg lists.
+	     (next-tok-class (semantic-lex-token-class (car val-tmp)))
+	     )
+
+	(cond
+	 ;; CASE 3: Merge symbols together.
+	 ((eq (semantic-lex-token-class v) 'spp-symbol-merge)
+	  ;; We need to merge the tokens in the 'text segement together,
+	  ;; and produce a single symbol from it.
+	  (let ((newsym
+		 (mapconcat (lambda (tok)
+			      (semantic-lex-spp-one-token-to-txt tok))
+			    txt
+			    "")))
+	    (semantic-lex-push-token
+	     (semantic-lex-token 'symbol beg end newsym))
+	    ))
+
+	 ;; CASE 2: Argument replacement.   If a discovered symbol is in
+	 ;;    the active list of arguments, then we need to substitute
+	 ;;    in the new value.
+	 ((and (eq (semantic-lex-token-class v) 'symbol) txt-macro-or-nil
+	       (or (and macro-and-args (eq next-tok-class 'semantic-list))
+		   (not macro-and-args))
+	       )
+	  (let ((AV nil))
+	    (when macro-and-args
+	      (setq AV
+		    (semantic-lex-spp-stream-for-arglist (car val-tmp)))
+	      ;; We used up these args.  Pull from the stream.
+	      (setq val-tmp (cdr val-tmp))
+	      )
+
+	    (semantic-lex-with-macro-used txt
+	      ;; Don't recurse directly into this same fcn, because it is
+	      ;; convenient to have plain string replacements too.
+	      (semantic-lex-spp-macro-to-macro-stream
+	       (symbol-value txt-macro-or-nil)
+	       beg end AV))
+	    ))
+
+	 ;; This is a HACK for the C parser.  The 'macros text
+	 ;; property is some storage so that the parser can do
+	 ;; some C specific text manipulations.
+	 ((eq (semantic-lex-token-class v) 'semantic-list)
+	  ;; Push our arg list onto the semantic list.
+	  (when argalist
+	    (setq txt (concat txt)) ; Copy the text.
+	    (put-text-property 0 1 'macros argalist txt))
+	  (semantic-lex-push-token
+	   (semantic-lex-token (semantic-lex-token-class v) beg end txt))
+	  )
+
+	 ;; CASE 1: Just another token in the stream.
+	 (t
+	  ;; Nothing new.
+	  (semantic-lex-push-token
+	   (semantic-lex-token (semantic-lex-token-class v) beg end txt))
+	  )
+	 )))
+
+    ;; CASE 2: The arg list we pushed onto the symbol table
+    ;;         must now be removed.
+    (dolist (A arglist)
+      (semantic-lex-spp-symbol-pop A))
+    ))
+
+;;; Macro Merging
+;;
+;; Used when token streams from different macros include eachother.
+;; Merged macro streams perform in place replacements.
+
+(defun semantic-lex-spp-merge-streams (raw-stream)
+  "Merge elements from the RAW-STREAM together.
+Handle spp-concat symbol concatenation.
+Handle Nested macro replacements.
+Return the cooked stream."
+  (let ((cooked-stream nil))
+    ;; Merge the stream
+    (while raw-stream
+      (cond ((eq (semantic-lex-token-class (car raw-stream)) 'spp-concat)
+	     ;; handle hashhash, by skipping it.
+	     (setq raw-stream (cdr raw-stream))
+	     ;; Now merge the symbols.
+	     (let ((prev-tok (car cooked-stream))
+		   (next-tok (car raw-stream)))
+	       (setq cooked-stream (cdr cooked-stream))
+	       (push (semantic-lex-token
+		      'spp-symbol-merge
+		      (semantic-lex-token-start prev-tok)
+		      (semantic-lex-token-end next-tok)
+		      (list prev-tok next-tok))
+		     cooked-stream)
+	       ))
+	    (t
+	     (push (car raw-stream) cooked-stream))
+	    )
+      (setq raw-stream (cdr raw-stream))
+      )
+
+    (nreverse cooked-stream))
+  )
+
+;;; MACRO EXPANSION
+;;
+;; There are two types of expansion.
+;;
+;; 1. Expansion using a value made up of lexical tokens.
+;; 2. User input replacement from a plain string.
+
+(defun semantic-lex-spp-macro-to-macro-stream (val beg end argvalues)
+  "Convert lexical macro contents VAL into a macro expansion stream.
+Argument VAL is the value of some macro to be converted into a stream.
+BEG and END are the token bounds of the macro to be expanded
+that will somehow gain a much longer token stream.
+ARGVALUES are values for any arg list, or nil."
+  (cond
+   ;; If val is nil, then just skip it.
+   ((null val) t)
+   ;; If it is a token, then return that token rebuilt.
+   ((and (consp val) (car val) (symbolp (car val)))
+    (semantic-lex-push-token
+     (semantic-lex-token (car val) beg end (semantic-lex-token-text val))))
+   ;; Test for a token list.
+   ((and (consp val) (consp (car val)) (car (car val))
+	 (symbolp (car (car val))))
+    (semantic-lex-spp-token-macro-to-macro-stream val beg end argvalues))
+   ;; Test for miscellaneous strings.
+   ((stringp val)
+    (semantic-lex-spp-simple-macro-to-macro-stream val beg end argvalues))
+   ))
+
+;;; --------------------------------------------------------
+;;;
+;;; ANALYZERS:
+;;;
+
+;;; Symbol Is Macro
+;;
+;; An analyser that will push tokens from a macro in place
+;; of the macro symbol.
+;;
+(defun semantic-lex-spp-anlyzer-do-replace (sym val beg end)
+  "Do the lexical replacement for SYM with VAL.
+Argument BEG and END specify the bounds of SYM in the buffer."
+  (if (not val)
+      (setq semantic-lex-end-point end)
+    (let ((arg-in nil)
+	  (arg-parsed nil)
+	  (arg-split nil)
+	  )
+
+      ;; Check for arguments.
+      (setq arg-in (semantic-lex-spp-macro-with-args val))
+
+      (when arg-in
+	(save-excursion
+	  (goto-char end)
+	  (setq arg-parsed
+		(semantic-lex-spp-one-token-and-move-for-macro
+		 ;; NOTE: This used to be (point-at-eol), but
+		 ;;       that was too close for multi-line arguments
+		 ;;       to a macro.  Point max may be too far if there
+		 ;;       is a typo in the buffer.
+		 ;;
+		 ;; Look here for performance issues while a user is typing
+		 ;; incomplete code.
+		 (point-max)))
+	  (setq end (semantic-lex-token-end arg-parsed))
+
+	  (when (and (listp arg-parsed) (eq (car arg-parsed) 'semantic-list))
+	    (setq arg-split
+		  ;; Use lex to split up the contents of the argument list.
+		  (semantic-lex-spp-stream-for-arglist arg-parsed)
+		  ))
+	  ))
+
+      ;; if we have something to sub in, then do it.
+      (semantic-lex-spp-macro-to-macro-stream val beg end arg-split)
+      (setq semantic-lex-end-point end)
+      )
+    ))
+
+(defvar semantic-lex-spp-replacements-enabled t
+  "Non-nil means do replacements when finding keywords.
+Disable this only to prevent recursive expansion issues.")
+
+(defun semantic-lex-spp-analyzer-push-tokens-for-symbol (str beg end)
+  "Push lexical tokens for the symbol or keyword STR.
+STR occurs in the current buffer between BEG and END."
+  (let (sym val count)
+    (cond
+     ;;
+     ;; It is a macro.  Prepare for a replacement.
+     ((and semantic-lex-spp-replacements-enabled
+	   (semantic-lex-spp-symbol-p str))
+      (setq sym (semantic-lex-spp-symbol str)
+	    val (symbol-value sym)
+	    count 0)
+
+      (let ((semantic-lex-spp-expanded-macro-stack
+	     semantic-lex-spp-expanded-macro-stack))
+
+	(semantic-lex-with-macro-used str
+	  ;; Do direct replacements of single value macros of macros.
+	  ;; This solves issues with a macro containing one symbol that
+	  ;; is another macro, and get arg lists passed around.
+	  (while (and val (consp val)
+		      (semantic-lex-token-p (car val))
+		      (eq (length val) 1)
+		      (eq (semantic-lex-token-class (car val)) 'symbol)
+		      (semantic-lex-spp-symbol-p (semantic-lex-token-text (car val)))
+		      (< count 10)
+		      )
+	    (setq str (semantic-lex-token-text (car val)))
+	    (setq sym (semantic-lex-spp-symbol str)
+		  val (symbol-value sym))
+	    ;; Prevent recursion
+	    (setq count (1+ count))
+	    ;; This prevents a different kind of recursion.
+	    (push str semantic-lex-spp-expanded-macro-stack)
+	    )
+
+	  (semantic-lex-spp-anlyzer-do-replace sym val beg end))
+
+	))
+     ;; Anything else.
+     (t
+      ;; A regular keyword.
+      (semantic-lex-push-token
+       (semantic-lex-token (or (semantic-lex-keyword-p str) 'symbol)
+			   beg end))))
+    ))
+
+(define-lex-regex-analyzer semantic-lex-spp-replace-or-symbol-or-keyword
+  "Like 'semantic-lex-symbol-or-keyword' plus preprocessor macro replacement."
+  "\\(\\sw\\|\\s_\\)+"
+  (let ((str (match-string 0))
+	(beg (match-beginning 0))
+	(end (match-end 0)))
+    (semantic-lex-spp-analyzer-push-tokens-for-symbol str beg end)))
+
+;;; ANALYZERS FOR NEW MACROS
+;;
+;; These utilities and analyzer declaration function are for
+;; creating an analyzer which produces new macros in the macro table.
+;;
+;; There are two analyzers.  One for new macros, and one for removing
+;; a macro.
+
+(defun semantic-lex-spp-first-token-arg-list (token)
+  "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST."
+  (when (and (consp token)
+	     (symbolp (car token))
+	     (eq 'semantic-list (car token)))
+    ;; Convert TOKEN in place.
+    (let ((argsplit (cedet-split-string (semantic-lex-token-text token)
+					"[(), ]" t)))
+      (setcar token 'spp-arg-list)
+      (setcar (nthcdr 1 token) argsplit))
+    ))
+
+(defun semantic-lex-spp-one-token-and-move-for-macro (max)
+  "Lex up one token, and move to end of that token.
+Don't go past MAX."
+  (let ((ans (semantic-lex (point) max 0 0)))
+    (if (not ans)
+	(progn (goto-char max)
+	       nil)
+      (when (> (semantic-lex-token-end (car ans)) max)
+	(let ((bounds (semantic-lex-token-bounds (car ans))))
+	  (setcdr bounds max)))
+      (goto-char (semantic-lex-token-end (car ans)))
+      (car ans))
+    ))
+
+(defun semantic-lex-spp-stream-for-arglist (token)
+  "Lex up the contents of the arglist TOKEN.
+Parsing starts inside the parens, and ends at the end of TOKEN."
+  (let ((end (semantic-lex-token-end token))
+	(fresh-toks nil)
+	(toks nil))
+    (save-excursion
+
+      (if (stringp (nth 1 token))
+	  ;; If the 2nd part of the token is a string, then we have
+	  ;; a token specifically extracted from a buffer.  Possibly
+	  ;; a different buffer.  This means we need to do something
+	  ;; nice to parse its contents.
+	  (let ((txt (semantic-lex-token-text token)))
+	    (semantic-lex-spp-lex-text-string
+	     (substring txt 1 (1- (length txt)))))
+
+	;; This part is like the original
+	(goto-char (semantic-lex-token-start token))
+	;; A cheat for going into the semantic list.
+	(forward-char 1)
+	(setq fresh-toks (semantic-lex-spp-stream-for-macro (1- end)))
+	(dolist (tok fresh-toks)
+	  (when (memq (semantic-lex-token-class tok) '(symbol semantic-list))
+	    (setq toks (cons tok toks))))
+
+	(nreverse toks)))))
+
+(defvar semantic-lex-spp-hack-depth 0
+  "Current depth of recursive calls to `semantic-lex-spp-lex-text-string'.")
+
+(defun semantic-lex-spp-lex-text-string (text)
+  "Lex the text string TEXT using the current buffer's state.
+Use this to parse text extracted from a macro as if it came from
+the current buffer.  Since the lexer is designed to only work in
+a buffer, we need to create a new buffer, and populate it with rules
+and variable state from the current buffer."
+  (let* ((semantic-lex-spp-hack-depth (1+ semantic-lex-spp-hack-depth))
+	 (buf (get-buffer-create (format " *SPP parse hack %d*"
+					 semantic-lex-spp-hack-depth)))
+	 (mode major-mode)
+	 (fresh-toks nil)
+	 (toks nil)
+	 (origbuff (current-buffer))
+	 (important-vars '(semantic-lex-spp-macro-symbol-obarray
+			   semantic-lex-spp-project-macro-symbol-obarray
+			   semantic-lex-spp-dynamic-macro-symbol-obarray
+			   semantic-lex-spp-dynamic-macro-symbol-obarray-stack
+			   semantic-lex-spp-expanded-macro-stack
+			   ))
+	 )
+    (if (> semantic-lex-spp-hack-depth 5)
+	nil
+      (save-excursion
+	(set-buffer buf)
+	(erase-buffer)
+	;; Below is a painful hack to make sure everything is setup correctly.
+	(when (not (eq major-mode mode))
+	  (save-match-data
+
+	    ;; Protect against user-hooks that throw errors.
+	    (condition-case nil
+		(funcall mode)
+	      (error nil))
+
+	    ;; Hack in mode-local
+	    (activate-mode-local-bindings)
+
+	    ;; CHEATER!  The following 3 lines are from
+	    ;; `semantic-new-buffer-fcn', but we don't want to turn
+	    ;; on all the other annoying modes for this little task.
+	    (setq semantic-new-buffer-fcn-was-run t)
+	    (semantic-lex-init)
+	    (semantic-clear-toplevel-cache)
+	    (remove-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook
+			 t)
+	    ))
+
+	;; Second Cheat: copy key variables regarding macro state from the
+	;; the originating buffer we are parsing.  We need to do this every time
+	;; since the state changes.
+	(dolist (V important-vars)
+	  (set V (semantic-buffer-local-value V origbuff)))
+	(insert text)
+	(goto-char (point-min))
+
+	(setq fresh-toks (semantic-lex-spp-stream-for-macro (point-max))))
+
+      (dolist (tok fresh-toks)
+	(when (memq (semantic-lex-token-class tok) '(symbol semantic-list))
+	  (setq toks (cons tok toks)))))
+
+    (nreverse toks)))
+
+;;;; FIRST DRAFT
+;; This is the fist version of semantic-lex-spp-stream-for-arglist
+;; that worked pretty well.  It doesn't work if the TOKEN was derived
+;; from some other buffer, in which case it can get the wrong answer
+;; or throw an error if the token location in the originating buffer is
+;; larger than the current buffer.
+;;(defun semantic-lex-spp-stream-for-arglist-orig (token)
+;;  "Lex up the contents of the arglist TOKEN.
+;; Parsing starts inside the parens, and ends at the end of TOKEN."
+;;  (save-excursion
+;;    (let ((end (semantic-lex-token-end token))
+;;	  (fresh-toks nil)
+;;	  (toks nil))
+;;      (goto-char (semantic-lex-token-start token))
+;;      ;; A cheat for going into the semantic list.
+;;      (forward-char 1)
+;;      (setq fresh-toks (semantic-lex-spp-stream-for-macro (1- end)))
+;;      (dolist (tok fresh-toks)
+;;	(when (memq (semantic-lex-token-class tok) '(symbol semantic-list))
+;;	  (setq toks (cons tok toks))))
+;;      (nreverse toks))
+;;    ))
+
+;;;; USING SPLIT
+;; This doesn't work, because some arguments passed into a macro
+;; might contain non-simple symbol words, which this doesn't handle.
+;;
+;; Thus, you need a full lex to occur.
+;; (defun semantic-lex-spp-stream-for-arglist-split (token)
+;;   "Lex up the contents of the arglist TOKEN.
+;; Parsing starts inside the parens, and ends at the end of TOKEN."
+;;   (let* ((txt (semantic-lex-token-text token))
+;; 	 (split (split-string (substring txt 1 (1- (length txt)))
+;; 			      "(), " t))
+;; 	 ;; Hack for lexing.
+;; 	 (semantic-lex-spp-analyzer-push-tokens-for-symbol nil))
+;;     (dolist (S split)
+;;       (semantic-lex-spp-analyzer-push-tokens-for-symbol S 0 1))
+;;     (reverse semantic-lex-spp-analyzer-push-tokens-for-symbol)))
+
+
+(defun semantic-lex-spp-stream-for-macro (eos)
+  "Lex up a stream of tokens for a #define statement.
+Parsing starts at the current point location.
+EOS is the end of the stream to lex for this macro."
+  (let ((stream nil))
+    (while (< (point) eos)
+      (let* ((tok (semantic-lex-spp-one-token-and-move-for-macro eos))
+	     (str (when tok
+		    (semantic-lex-token-text tok)))
+	     )
+	(if str
+	    (push (semantic-lex-token (semantic-lex-token-class tok)
+				      (semantic-lex-token-start tok)
+				      (semantic-lex-token-end tok)
+				      str)
+		  stream)
+	  ;; Nothing to push.
+	  nil)))
+    (goto-char eos)
+    ;; Fix the order
+    (nreverse stream)
+    ))
+
+(defmacro define-lex-spp-macro-declaration-analyzer (name doc regexp tokidx
+							  &rest valform)
+  "Define a lexical analyzer for defining new MACROS.
+NAME is the name of the analyzer.
+DOC is the documentation for the analyzer.
+REGEXP is a regular expression for the analyzer to match.
+See `define-lex-regex-analyzer' for more on regexp.
+TOKIDX is an index into REGEXP for which a new lexical token
+of type `spp-macro-def' is to be created.
+VALFORM are forms that return the value to be saved for this macro, or nil.
+When implementing a macro, you can use `semantic-lex-spp-stream-for-macro'
+to convert text into a lexical stream for storage in the macro."
+  (let ((start (make-symbol "start"))
+	(end (make-symbol "end"))
+	(val (make-symbol "val"))
+	(startpnt (make-symbol "startpnt"))
+	(endpnt (make-symbol "endpnt")))
+    `(define-lex-regex-analyzer ,name
+       ,doc
+       ,regexp
+       (let ((,start (match-beginning ,tokidx))
+	     (,end (match-end ,tokidx))
+	     (,startpnt semantic-lex-end-point)
+	     (,val (save-match-data ,@valform))
+	     (,endpnt semantic-lex-end-point))
+	 (semantic-lex-spp-symbol-set
+	  (buffer-substring-no-properties ,start ,end)
+	  ,val)
+	 (semantic-lex-push-token
+	  (semantic-lex-token 'spp-macro-def
+			      ,start ,end))
+	 ;; Preserve setting of the end point from the calling macro.
+	 (when (and (/= ,startpnt ,endpnt)
+		    (/= ,endpnt semantic-lex-end-point))
+	   (setq semantic-lex-end-point ,endpnt))
+	 ))))
+
+(defmacro define-lex-spp-macro-undeclaration-analyzer (name doc regexp tokidx)
+  "Undefine a lexical analyzer for defining new MACROS.
+NAME is the name of the analyzer.
+DOC is the documentation for the analyzer.
+REGEXP is a regular expression for the analyzer to match.
+See `define-lex-regex-analyzer' for more on regexp.
+TOKIDX is an index into REGEXP for which a new lexical token
+of type `spp-macro-undef' is to be created."
+  (let ((start (make-symbol "start"))
+	(end (make-symbol "end")))
+    `(define-lex-regex-analyzer ,name
+       ,doc
+       ,regexp
+       (let ((,start (match-beginning ,tokidx))
+	     (,end (match-end ,tokidx))
+	     )
+	 (semantic-lex-spp-symbol-remove
+	  (buffer-substring-no-properties ,start ,end))
+	 (semantic-lex-push-token
+	  (semantic-lex-token 'spp-macro-undef
+			      ,start ,end))
+	 ))))
+
+;;; INCLUDES
+;;
+;; These analyzers help a language define how include files
+;; are identified.  These are ONLY for languages that perform
+;; an actual textual includesion, and not for imports.
+;;
+;; This section is supposed to allow the macros from the headers to be
+;; added to the local dynamic macro table, but that hasn't been
+;; written yet.
+;;
+(defcustom semantic-lex-spp-use-headers-flag nil
+  "*Non-nil means to pre-parse headers as we go.
+For languages that use the Semantic pre-processor, this can
+improve the accuracy of parsed files where include files
+can change the state of what's parsed in the current file.
+
+Note: Note implemented yet"
+  :group 'semantic
+  :type 'boolean)
+
+(defun semantic-lex-spp-merge-header (name)
+  "Extract and merge any macros from the header with NAME.
+Finds the header file belonging to NAME, gets the macros
+from that file, and then merge the macros with our current
+symbol table."
+  (when semantic-lex-spp-use-headers-flag
+    ;; @todo - do this someday, ok?
+    ))
+
+(defmacro define-lex-spp-include-analyzer (name doc regexp tokidx
+						&rest valform)
+  "Define a lexical analyzer for defining a new INCLUDE lexical token.
+Macros defined in the found include will be added to our running table
+at the time the include statement is found.
+NAME is the name of the analyzer.
+DOC is the documentation for the analyzer.
+REGEXP is a regular expression for the analyzer to match.
+See `define-lex-regex-analyzer' for more on regexp.
+TOKIDX is an index into REGEXP for which a new lexical token
+of type `spp-macro-include' is to be created.
+VALFORM are forms that return the name of the thing being included, and the
+type of include.  The return value should be of the form:
+  (NAME . TYPE)
+where NAME is the name of the include, and TYPE is the type of the include,
+where a valid symbol is 'system, or nil."
+  (let ((start (make-symbol "start"))
+	(end (make-symbol "end"))
+	(val (make-symbol "val"))
+	(startpnt (make-symbol "startpnt"))
+	(endpnt (make-symbol "endpnt")))
+    `(define-lex-regex-analyzer ,name
+       ,doc
+       ,regexp
+       (let ((,start (match-beginning ,tokidx))
+	     (,end (match-end ,tokidx))
+	     (,startpnt semantic-lex-end-point)
+	     (,val (save-match-data ,@valform))
+	     (,endpnt semantic-lex-end-point))
+	 ;;(message "(car ,val) -> %S" (car ,val))
+	 (semantic-lex-spp-merge-header (car ,val))
+	 (semantic-lex-push-token
+	  (semantic-lex-token (if (eq (cdr ,val) 'system)
+				  'spp-system-include
+				'spp-include)
+			      ,start ,end
+			      (car ,val)))
+	 ;; Preserve setting of the end point from the calling macro.
+	 (when (and (/= ,startpnt ,endpnt)
+		    (/= ,endpnt semantic-lex-end-point))
+	   (setq semantic-lex-end-point ,endpnt))
+	 ))))
+
+;;; EIEIO USAGE
+;;
+;; Semanticdb can save off macro tables for quick lookup later.
+;;
+;; These routines are for saving macro lists into an EIEIO persistent
+;; file.
+(defvar semantic-lex-spp-macro-max-length-to-save 200
+  "*Maximum length of an SPP macro before we opt to not save it.")
+
+;;;###autoload
+(defun semantic-lex-spp-table-write-slot-value (value)
+  "Write out the VALUE of a slot for EIEIO.
+The VALUE is a spp lexical table."
+  (if (not value)
+      (princ "nil")
+    (princ "\n        '(")
+    ;(princ value)
+    (dolist (sym value)
+      (princ "(")
+      (prin1 (car sym))
+      (let* ((first (car (cdr sym)))
+	     (rest (cdr sym)))
+	(when (not (listp first))
+	  (error "Error in macro \"%s\"" (car sym)))
+	(when (eq (car first) 'spp-arg-list)
+	  (princ " ")
+	  (prin1 first)
+	  (setq rest (cdr rest))
+	  )
+
+	(when rest
+	  (princ " . ")
+	  (let ((len (length (cdr rest))))
+	    (cond ((< len 2)
+		   (condition-case nil
+		       (prin1 rest)
+		     (error
+		      (princ "nil ;; Error writing macro\n"))))
+		  ((< len semantic-lex-spp-macro-max-length-to-save)
+		   (princ "\n              ")
+		   (condition-case nil
+		       (prin1 rest)
+		     (error
+		      (princ "nil ;; Error writing macro\n          ")))
+		   )
+		  (t ;; Too Long!
+		   (princ "nil ;; Too Long!\n          ")
+		   ))))
+	)
+      (princ ")\n          ")
+      )
+    (princ ")\n"))
+)
+
+;;; TESTS
+;;
+(defun semantic-lex-spp-write-test ()
+  "Test the semantic tag writer against the current buffer."
+  (interactive)
+  (with-output-to-temp-buffer "*SPP Write Test*"
+    (semantic-lex-spp-table-write-slot-value
+     (semantic-lex-spp-save-table))))
+
+;;;###autoload
+(defun semantic-lex-spp-write-utest ()
+  "Unit test using the test spp file to test the slot write fcn."
+  (interactive)
+  (let* ((sem (locate-library "semantic-lex-spp.el"))
+	 (dir (file-name-directory sem)))
+    (save-excursion
+      (set-buffer (find-file-noselect
+		   (expand-file-name "tests/testsppreplace.c"
+				     dir)))
+      (semantic-lex-spp-write-test))))
+
+;;; MACRO TABLE DEBUG
+;;
+(defun semantic-lex-spp-describe (&optional buffer)
+  "Describe the current list of spp macros for BUFFER.
+If BUFFER is not provided, use the current buffer."
+  (interactive)
+  (let ((syms (save-excursion
+		(if buffer (set-buffer buffer))
+		(semantic-lex-spp-macros)))
+	(sym nil))
+    (with-output-to-temp-buffer "*SPP MACROS*"
+      (princ "Macro\t\tValue\n")
+      (while syms
+	(setq sym (car syms)
+	      syms (cdr syms))
+	(princ (symbol-name sym))
+	(princ "\t")
+	(if (< (length (symbol-name sym)) 8)
+	    (princ "\t"))
+	(prin1 (symbol-value sym))
+	(princ "\n")
+	))))
+
+;;; EDEBUG Handlers
+;;
+(add-hook
+ 'edebug-setup-hook
+ #'(lambda ()
+
+     (def-edebug-spec define-lex-spp-macro-declaration-analyzer
+       (&define name stringp stringp form def-body)
+       )
+
+     (def-edebug-spec define-lex-spp-macro-undeclaration-analyzer
+       (&define name stringp stringp form)
+       )
+
+     (def-edebug-spec define-lex-spp-include-analyzer
+       (&define name stringp stringp form def-body)
+       )
+     ))
+
+
+(provide 'semantic-lex-spp)
+
+;;; semantic-lex-spp.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-lex.el b/site/cedet-1.0pre7/semantic/semantic-lex.el
new file mode 100644
index 0000000..3228eec
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-lex.el
@@ -0,0 +1,2100 @@
+;;; semantic-lex.el --- Lexical Analyzer builder
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-lex.el,v 1.55 2009/09/11 23:33:45 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file handles the creation of lexical analyzers for different
+;; languages in Emacs Lisp.  The purpose of a lexical analyzer is to
+;; convert a buffer into a list of lexical tokens.  Each token
+;; contains the token class (such as 'number, 'symbol, 'IF, etc) and
+;; the location in the buffer it was found.  Optionally, a token also
+;; contains a string representing what is at the designated buffer
+;; location.
+;;
+;; Tokens are pushed onto a token stream, which is basically a list of
+;; all the lexical tokens from the analyzed region.  The token stream
+;; is then handed to the grammar which parsers the file.
+;;
+;;; How it works
+;;
+;; Each analyzer specifies a condition and forms.  These conditions
+;; and forms are assembled into a function by `define-lex' that does
+;; the lexical analysis.
+;;
+;; In the lexical analyzer created with `define-lex', each condition
+;; is tested for a given point.  When the conditin is true, the forms
+;; run.
+;;
+;; The forms can push a lexical token onto the token stream.  The
+;; analyzer forms also must move the current analyzer point.  If the
+;; analyzer point is moved without pushing a token, then tne matched
+;; syntax is effectively ignored, or skipped.
+;;
+;; Thus, starting at the beginning of a region to be analyzed, each
+;; condition is tested.  One will match, and a lexical token might be
+;; pushed, and the point is moved to the end of the lexical token
+;; identified.  At the new position, the process occurs again until
+;; the end of the specified region is reached.
+;;
+;;; How to use semantic-lex
+;;
+;; To create a lexer for a language, use the `define-lex' macro.
+;;
+;; The `define-lex' macro accepts a list of lexical analyzers.  Each
+;; analyzer is created with `define-lex-analyzer', or one of the
+;; derivitive macros.  A single analyzer defines a regular expression
+;; to match text in a buffer, and a short segment of code to create
+;; one lexical token.
+;;
+;; Each analyzer has a NAME, DOC, a CONDITION, and possibly some
+;; FORMS.  The NAME is the name used in `define-lex'.  The DOC
+;; describes what the analyzer should do.
+;;
+;; The CONDITION evaluates the text at the current point in the
+;; current buffer.  If CONDITION is true, then the FORMS will be
+;; executed.
+;;
+;; The purpose of the FORMS is to push new lexical tokens onto the
+;; list of tokens for the current buffer, and to move point after the
+;; matched text.
+;;
+;; Some macros for creating one analyzer are:
+;;
+;;   define-lex-analyzer - A generic analyzer associating any style of
+;;              condition to forms.
+;;   define-lex-regex-analyzer - Matches a regular expression.
+;;   define-lex-simple-regex-analyzer - Matches a regular expressions,
+;;              and pushes the match.
+;;   define-lex-block-analyzer - Matches list syntax, and defines
+;;              handles open/close delimiters.
+;;
+;; These macros are used by the grammar compiler when lexical
+;; information is specified in a grammar:
+;;   define-lex- * -type-analyzer - Matches syntax specified in
+;;              a grammar, and pushes one token for it.  The * would
+;;              be `sexp' for things like lists or strings, and
+;;              `string' for things that need to match some special
+;;              string, such as "\\." where a literal match is needed.
+;;
+;;; Lexical Tables
+;;
+;; There are tables of different symbols managed in semantic-lex.el.
+;; They are:
+;;
+;;   Lexical keyword table - A Table of symbols declared in a grammar
+;;           file with the %keyword declaration.
+;;           Keywords are used by `semantic-lex-symbol-or-keyword'
+;;           to create lexical tokens based on the keyword.
+;;
+;;   Lexical type table - A table of symbols declared in a grammer
+;;           file with the %type declaration.
+;;           The grammar compiler uses the type table to create new
+;;           lexical analyzers.  These analyzers are then used to when
+;;           a new lexical analyzer is made for a language.
+;;
+;;; Lexical Types
+;;
+;; A lexical type defines a kind of lexical analyzer that will be
+;; automatically generated from a grammar file based on some
+;; predetermined attributes. For now these two attributes are
+;; recognized :
+;;
+;; * matchdatatype : define the kind of lexical analyzer. That is :
+;;
+;;   - regexp : define a regexp analyzer (see
+;;     `define-lex-regex-type-analyzer')
+;;
+;;   - string : define a string analyzer (see
+;;     `define-lex-string-type-analyzer')
+;;
+;;   - block : define a block type analyzer (see
+;;     `define-lex-block-type-analyzer')
+;;
+;;   - sexp : define a sexp analyzer (see
+;;     `define-lex-sexp-type-analyzer')
+;;
+;;   - keyword : define a keyword analyzer (see
+;;     `define-lex-keyword-type-analyzer')
+;;
+;; * syntax : define the syntax that matches a syntactic
+;;   expression. When syntax is matched the corresponding type
+;;   analyzer is entered and the resulting match data will be
+;;   interpreted based on the kind of analyzer (see matchdatatype
+;;   above).
+;;
+;; The following lexical types are predefined :
+;;
+;; +-------------+---------------+--------------------------------+
+;; | type        | matchdatatype | syntax                         |
+;; +-------------+---------------+--------------------------------+
+;; | punctuation | string        | "\\(\\s.\\|\\s$\\|\\s'\\)+"    |
+;; | keyword     | keyword       | "\\(\\sw\\|\\s_\\)+"           |
+;; | symbol      | regexp        | "\\(\\sw\\|\\s_\\)+"           |
+;; | string      | sexp          | "\\s\""                        |
+;; | number      | regexp        | semantic-lex-number-expression |
+;; | block       | block         | "\\s(\\|\\s)"                  |
+;; +-------------+---------------+--------------------------------+
+;;
+;; In a grammar you must use a %type expression to automatically generate
+;; the corresponding analyzers of that type.
+;;
+;; Here is an example to auto-generate punctuation analyzers
+;; with 'matchdatatype and 'syntax predefined (see table above)
+;;
+;; %type <punctuation> ;; will auto-generate this kind of analyzers
+;;
+;; It is equivalent to write :
+;;
+;; %type  <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+;;
+;; ;; Some punctuations based on the type defines above
+;;
+;; %token <punctuation> NOT         "!"
+;; %token <punctuation> NOTEQ       "!="
+;; %token <punctuation> MOD         "%"
+;; %token <punctuation> MODEQ       "%="
+;;
+
+;;; On the Semantic 1.x lexer
+;;
+;; In semantic 1.x, the lexical analyzer was an all purpose routine.
+;; To boost efficiency, the analyzer is now a series of routines that
+;; are constructed at build time into a single routine.  This will
+;; eliminate unneeded if statements to speed the lexer.
+
+(require 'semantic-fw)
+;;; Code:
+
+;;; Compatibility
+;;
+(eval-and-compile
+  (if (not (fboundp 'with-syntax-table))
+
+;; Copied from Emacs 21 for compatibility with released Emacses.
+(defmacro with-syntax-table (table &rest body)
+  "With syntax table of current buffer set to a copy of TABLE, evaluate BODY.
+The syntax table of the current buffer is saved, BODY is evaluated, and the
+saved table is restored, even in case of an abnormal exit.
+Value is what BODY returns."
+  (let ((old-table (make-symbol "table"))
+	(old-buffer (make-symbol "buffer")))
+    `(let ((,old-table (syntax-table))
+	   (,old-buffer (current-buffer)))
+       (unwind-protect
+	   (progn
+	     (set-syntax-table (copy-syntax-table ,table))
+	     ,@body)
+	 (save-current-buffer
+	   (set-buffer ,old-buffer)
+	   (set-syntax-table ,old-table))))))
+
+))
+
+;;; Semantic 2.x lexical analysis
+;;
+(defun semantic-lex-map-symbols (fun table &optional property)
+  "Call function FUN on every symbol in TABLE.
+If optional PROPERTY is non-nil, call FUN only on every symbol which
+as a PROPERTY value.  FUN receives a symbol as argument."
+  (if (arrayp table)
+      (mapatoms
+       #'(lambda (symbol)
+           (if (or (null property) (get symbol property))
+               (funcall fun symbol)))
+       table)))
+
+;;; Lexical keyword table handling.
+;;
+;; These keywords are keywords defined for using in a grammar with the
+;; %keyword declaration, and are not keywords used in Emacs Lisp.
+
+(defvar semantic-flex-keywords-obarray nil
+  "Buffer local keyword obarray for the lexical analyzer.
+These keywords are matched explicitly, and converted into special symbols.")
+(make-variable-buffer-local 'semantic-flex-keywords-obarray)
+
+(defmacro semantic-lex-keyword-invalid (name)
+  "Signal that NAME is an invalid keyword name."
+  `(signal 'wrong-type-argument '(semantic-lex-keyword-p ,name)))
+
+(defsubst semantic-lex-keyword-symbol (name)
+  "Return keyword symbol with NAME or nil if not found."
+  (and (arrayp semantic-flex-keywords-obarray)
+       (stringp name)
+       (intern-soft name semantic-flex-keywords-obarray)))
+
+(defsubst semantic-lex-keyword-p (name)
+  "Return non-nil if a keyword with NAME exists in the keyword table.
+Return nil otherwise."
+  (and (setq name (semantic-lex-keyword-symbol name))
+       (symbol-value name)))
+
+(defsubst semantic-lex-keyword-set (name value)
+  "Set value of keyword with NAME to VALUE and return VALUE."
+  (set (intern name semantic-flex-keywords-obarray) value))
+
+(defsubst semantic-lex-keyword-value (name)
+  "Return value of keyword with NAME.
+Signal an error if a keyword with NAME does not exist."
+  (let ((keyword (semantic-lex-keyword-symbol name)))
+    (if keyword
+        (symbol-value keyword)
+      (semantic-lex-keyword-invalid name))))
+
+(defsubst semantic-lex-keyword-put (name property value)
+  "For keyword with NAME, set its PROPERTY to VALUE."
+  (let ((keyword (semantic-lex-keyword-symbol name)))
+    (if keyword
+        (put keyword property value)
+      (semantic-lex-keyword-invalid name))))
+
+(defsubst semantic-lex-keyword-get (name property)
+  "For keyword with NAME, return its PROPERTY value."
+  (let ((keyword (semantic-lex-keyword-symbol name)))
+    (if keyword
+        (get keyword property)
+      (semantic-lex-keyword-invalid name))))
+
+(defun semantic-lex-make-keyword-table (specs &optional propspecs)
+  "Convert keyword SPECS into an obarray and return it.
+SPECS must be a list of (NAME . TOKSYM) elements, where:
+
+  NAME is the name of the keyword symbol to define.
+  TOKSYM is the lexical token symbol of that keyword.
+
+If optional argument PROPSPECS is non nil, then interpret it, and
+apply those properties.
+PROPSPECS must be a list of (NAME PROPERTY VALUE) elements."
+  ;; Create the symbol hash table
+  (let ((semantic-flex-keywords-obarray (make-vector 13 0))
+        spec)
+    ;; fill it with stuff
+    (while specs
+      (setq spec  (car specs)
+            specs (cdr specs))
+      (semantic-lex-keyword-set (car spec) (cdr spec)))
+    ;; Apply all properties
+    (while propspecs
+      (setq spec (car propspecs)
+            propspecs (cdr propspecs))
+      (semantic-lex-keyword-put (car spec) (nth 1 spec) (nth 2 spec)))
+    semantic-flex-keywords-obarray))
+
+(defsubst semantic-lex-map-keywords (fun &optional property)
+  "Call function FUN on every lexical keyword.
+If optional PROPERTY is non-nil, call FUN only on every keyword which
+as a PROPERTY value.  FUN receives a lexical keyword as argument."
+  (semantic-lex-map-symbols
+   fun semantic-flex-keywords-obarray property))
+
+(defun semantic-lex-keywords (&optional property)
+  "Return a list of lexical keywords.
+If optional PROPERTY is non-nil, return only keywords which have a
+PROPERTY set."
+  (let (keywords)
+    (semantic-lex-map-keywords
+     #'(lambda (symbol) (setq keywords (cons symbol keywords)))
+     property)
+    keywords))
+
+;;; Inline functions:
+
+(defsubst semantic-lex-token-bounds (token)
+  "Fetch the start and end locations of the lexical token TOKEN.
+Return a pair (START . END)."
+  (if (not (numberp (car (cdr token))))
+      (cdr (cdr token))
+    (cdr token)))
+
+(defsubst semantic-lex-token-start (token)
+  "Fetch the start position of the lexical token TOKEN.
+See also the function `semantic-lex-token'."
+  (car (semantic-lex-token-bounds token)))
+
+(defsubst semantic-lex-token-end (token)
+  "Fetch the end position of the lexical token TOKEN.
+See also the function `semantic-lex-token'."
+  (cdr (semantic-lex-token-bounds token)))
+
+(defsubst semantic-lex-unterminated-syntax-detected (syntax)
+  "Inside a lexical analyzer, use this when unterminated syntax was found.
+Argument SYNTAX indicates the type of syntax that is unterminated.
+The job of this function is to move (point) to a new logical location
+so that analysis can continue, if possible."
+  (goto-char
+   (funcall semantic-lex-unterminated-syntax-end-function
+	    syntax
+	    (car semantic-lex-analysis-bounds)
+	    (cdr semantic-lex-analysis-bounds)
+	    ))
+  (setq semantic-lex-end-point (point)))
+
+;;; Type table handling.
+;;
+;; The lexical type table manages types that occur in a grammar file
+;; with the %type declaration.  Types represent different syntaxes.
+;; See code for `semantic-lex-preset-default-types' for the classic
+;; types of syntax.
+(defvar semantic-lex-types-obarray nil
+  "Buffer local types obarray for the lexical analyzer.")
+(make-variable-buffer-local 'semantic-lex-types-obarray)
+
+(defmacro semantic-lex-type-invalid (type)
+  "Signal that TYPE is an invalid lexical type name."
+  `(signal 'wrong-type-argument '(semantic-lex-type-p ,type)))
+
+(defsubst semantic-lex-type-symbol (type)
+  "Return symbol with TYPE or nil if not found."
+  (and (arrayp semantic-lex-types-obarray)
+       (stringp type)
+       (intern-soft type semantic-lex-types-obarray)))
+
+(defsubst semantic-lex-type-p (type)
+  "Return non-nil if a symbol with TYPE name exists."
+  (and (setq type (semantic-lex-type-symbol type))
+       (symbol-value type)))
+
+(defsubst semantic-lex-type-set (type value)
+  "Set value of symbol with TYPE name to VALUE and return VALUE."
+  (set (intern type semantic-lex-types-obarray) value))
+
+(defsubst semantic-lex-type-value (type &optional noerror)
+  "Return value of symbol with TYPE name.
+If optional argument NOERROR is non-nil return nil if a symbol with
+TYPE name does not exist.  Otherwise signal an error."
+  (let ((sym (semantic-lex-type-symbol type)))
+    (if sym
+        (symbol-value sym)
+      (unless noerror
+        (semantic-lex-type-invalid type)))))
+
+(defsubst semantic-lex-type-put (type property value &optional add)
+  "For symbol with TYPE name, set its PROPERTY to VALUE.
+If optional argument ADD is non-nil, create a new symbol with TYPE
+name if it does not already exist.  Otherwise signal an error."
+  (let ((sym (semantic-lex-type-symbol type)))
+    (unless sym
+      (or add (semantic-lex-type-invalid type))
+      (semantic-lex-type-set type nil)
+      (setq sym (semantic-lex-type-symbol type)))
+    (put sym property value)))
+
+(defsubst semantic-lex-type-get (type property &optional noerror)
+  "For symbol with TYPE name, return its PROPERTY value.
+If optional argument NOERROR is non-nil return nil if a symbol with
+TYPE name does not exist.  Otherwise signal an error."
+  (let ((sym (semantic-lex-type-symbol type)))
+    (if sym
+        (get sym property)
+      (unless noerror
+        (semantic-lex-type-invalid type)))))
+
+(defun semantic-lex-preset-default-types ()
+  "Install useful default properties for well known types."
+  (semantic-lex-type-put "punctuation" 'matchdatatype 'string t)
+  (semantic-lex-type-put "punctuation" 'syntax "\\(\\s.\\|\\s$\\|\\s'\\)+")
+  (semantic-lex-type-put "keyword" 'matchdatatype 'keyword t)
+  (semantic-lex-type-put "keyword" 'syntax "\\(\\sw\\|\\s_\\)+")
+  (semantic-lex-type-put "symbol"  'matchdatatype 'regexp t)
+  (semantic-lex-type-put "symbol"  'syntax "\\(\\sw\\|\\s_\\)+")
+  (semantic-lex-type-put "string"  'matchdatatype 'sexp t)
+  (semantic-lex-type-put "string"  'syntax "\\s\"")
+  (semantic-lex-type-put "number"  'matchdatatype 'regexp t)
+  (semantic-lex-type-put "number"  'syntax 'semantic-lex-number-expression)
+  (semantic-lex-type-put "block"   'matchdatatype 'block t)
+  (semantic-lex-type-put "block"   'syntax "\\s(\\|\\s)")
+  )
+
+(defun semantic-lex-make-type-table (specs &optional propspecs)
+  "Convert type SPECS into an obarray and return it.
+SPECS must be a list of (TYPE . TOKENS) elements, where:
+
+  TYPE is the name of the type symbol to define.
+  TOKENS is an list of (TOKSYM . MATCHER) elements, where:
+
+    TOKSYM is any lexical token symbol.
+    MATCHER is a string or regexp a text must match to be a such
+    lexical token.
+
+If optional argument PROPSPECS is non nil, then interpret it, and
+apply those properties.
+PROPSPECS must be a list of (TYPE PROPERTY VALUE)."
+  ;; Create the symbol hash table
+  (let* ((semantic-lex-types-obarray (make-vector 13 0))
+         spec type tokens token alist default)
+    ;; fill it with stuff
+    (while specs
+      (setq spec   (car specs)
+            specs  (cdr specs)
+            type   (car spec)
+            tokens (cdr spec)
+            default nil
+            alist   nil)
+      (while tokens
+        (setq token  (car tokens)
+              tokens (cdr tokens))
+        (if (cdr token)
+            (setq alist (cons token alist))
+          (setq token (car token))
+          (if default
+              (message
+               "*Warning* default value of <%s> tokens changed to %S, was %S"
+               type default token))
+          (setq default token)))
+      ;; Ensure the default matching spec is the first one.
+      (semantic-lex-type-set type (cons default (nreverse alist))))
+    ;; Install useful default types & properties
+    (semantic-lex-preset-default-types)
+    ;; Apply all properties
+    (while propspecs
+      (setq spec (car propspecs)
+            propspecs (cdr propspecs))
+      ;; Create the type if necessary.
+      (semantic-lex-type-put (car spec) (nth 1 spec) (nth 2 spec) t))
+    semantic-lex-types-obarray))
+
+(defsubst semantic-lex-map-types (fun &optional property)
+  "Call function FUN on every lexical type.
+If optional PROPERTY is non-nil, call FUN only on every type symbol
+which as a PROPERTY value.  FUN receives a type symbol as argument."
+  (semantic-lex-map-symbols
+   fun semantic-lex-types-obarray property))
+
+(defun semantic-lex-types (&optional property)
+  "Return a list of lexical type symbols.
+If optional PROPERTY is non-nil, return only type symbols which have
+PROPERTY set."
+  (let (types)
+    (semantic-lex-map-types
+     #'(lambda (symbol) (setq types (cons symbol types)))
+     property)
+    types))
+
+;;; Lexical Analyzer framework settings
+;;
+
+;;;###autoload
+(defvar semantic-lex-analyzer 'semantic-flex
+  "The lexical analyzer used for a given buffer.
+See `semantic-lex' for documentation.
+For compatibility with Semantic 1.x it defaults to `semantic-flex'.")
+(make-variable-buffer-local 'semantic-lex-analyzer)
+
+(defvar semantic-lex-tokens
+  '(
+    (bol)
+    (charquote)
+    (close-paren)
+    (comment)
+    (newline)
+    (open-paren)
+    (punctuation)
+    (semantic-list)
+    (string)
+    (symbol)
+    (whitespace)
+    )
+  "An alist of of semantic token types.
+As of December 2001 (semantic 1.4beta13), this variable is not used in
+any code.  The only use is to refer to the doc-string from elsewhere.
+
+The key to this alist is the symbol representing token type that
+\\[semantic-flex] returns.  These are
+
+  - bol:           Empty string matching a beginning of line.
+                   This token is produced with
+                   `semantic-lex-beginning-of-line'.
+
+  - charquote:     String sequences that match `\\s\\+' regexp.
+                   This token is produced with `semantic-lex-charquote'.
+
+  - close-paren:   Characters that match `\\s)' regexp.
+                   These are typically `)', `}', `]', etc.
+                   This token is produced with
+                   `semantic-lex-close-paren'.
+
+  - comment:       A comment chunk.  These token types are not
+                   produced by default.
+                   This token is produced with `semantic-lex-comments'.
+                   Comments are ignored with `semantic-lex-ignore-comments'.
+                   Comments are treated as whitespace with
+                   `semantic-lex-comments-as-whitespace'.
+
+  - newline        Characters matching `\\s-*\\(\n\\|\\s>\\)' regexp.
+                   This token is produced with `semantic-lex-newline'.
+
+  - open-paren:    Characters that match `\\s(' regexp.
+                   These are typically `(', `{', `[', etc.
+                   If `semantic-lex-paren-or-list' is used,
+                   then `open-paren' is not usually generated unless
+                   the `depth' argument to \\[semantic-lex] is
+                   greater than 0.
+                   This token is always produced if the analyzer
+                   `semantic-lex-open-paren' is used.
+
+  - punctuation:   Characters matching `{\\(\\s.\\|\\s$\\|\\s'\\)'
+                   regexp.
+                   This token is produced with `semantic-lex-punctuation'.
+                   Always specify this analyzer after the comment
+                   analyzer.
+
+  - semantic-list: String delimited by matching parenthesis, braces,
+                   etc.  that the lexer skipped over, because the
+                   `depth' parameter to \\[semantic-flex] was not high
+                   enough.
+                   This token is produced with `semantic-lex-paren-or-list'.
+
+  - string:        Quoted strings, i.e., string sequences that start
+                   and end with characters matching `\\s\"'
+                   regexp.  The lexer relies on @code{forward-sexp} to
+                   find the matching end.
+                   This token is produced with `semantic-lex-string'.
+
+  - symbol:        String sequences that match `\\(\\sw\\|\\s_\\)+'
+                   regexp.
+                   This token is produced with
+                   `semantic-lex-symbol-or-keyword'.  Always add this analyzer
+                   after `semantic-lex-number', or other analyzers that
+                   match its regular expression.
+
+  - whitespace:    Characters that match `\\s-+' regexp.
+                   This token is produced with `semantic-lex-whitespace'.")
+
+(defvar semantic-lex-syntax-modifications nil
+  "Changes to the syntax table for this buffer.
+These changes are active only while the buffer is being flexed.
+This is a list where each element has the form:
+  (CHAR CLASS)
+CHAR is the char passed to `modify-syntax-entry',
+and CLASS is the string also passed to `modify-syntax-entry' to define
+what syntax class CHAR has.")
+(make-variable-buffer-local 'semantic-lex-syntax-modifications)
+
+(defvar semantic-lex-syntax-table nil
+  "Syntax table used by lexical analysis.
+See also `semantic-lex-syntax-modifications'.")
+(make-variable-buffer-local 'semantic-lex-syntax-table)
+
+(defvar semantic-lex-comment-regex nil
+  "Regular expression for identifying comment start during lexical analysis.
+This may be automatically set when semantic initializes in a mode, but
+may need to be overriden for some special languages.")
+(make-variable-buffer-local 'semantic-lex-comment-regex)
+
+(defvar semantic-lex-number-expression
+  ;; This expression was written by David Ponce for Java, and copied
+  ;; here for C and any other similar language.
+  (eval-when-compile
+    (concat "\\("
+            "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[.][fFdD]\\>"
+            "\\|"
+            "\\<[0-9]+[.]"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+            "\\|"
+            "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+            "\\|"
+            "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+            "\\|"
+            "\\<[0-9]+[lLfFdD]?\\>"
+            "\\)"
+            ))
+  "Regular expression for matching a number.
+If this value is nil, no number extraction is done during lex.
+This expression tries to match C and Java like numbers.
+
+DECIMAL_LITERAL:
+    [1-9][0-9]*
+  ;
+HEX_LITERAL:
+    0[xX][0-9a-fA-F]+
+  ;
+OCTAL_LITERAL:
+    0[0-7]*
+  ;
+INTEGER_LITERAL:
+    <DECIMAL_LITERAL>[lL]?
+  | <HEX_LITERAL>[lL]?
+  | <OCTAL_LITERAL>[lL]?
+  ;
+EXPONENT:
+    [eE][+-]?[09]+
+  ;
+FLOATING_POINT_LITERAL:
+    [0-9]+[.][0-9]*<EXPONENT>?[fFdD]?
+  | [.][0-9]+<EXPONENT>?[fFdD]?
+  | [0-9]+<EXPONENT>[fFdD]?
+  | [0-9]+<EXPONENT>?[fFdD]
+  ;")
+(make-variable-buffer-local 'semantic-lex-number-expression)
+
+(defvar semantic-lex-depth 0
+  "Default lexing depth.
+This specifies how many lists to create tokens in.")
+(make-variable-buffer-local 'semantic-lex-depth)
+
+(defvar semantic-lex-unterminated-syntax-end-function
+  (lambda (syntax syntax-start lex-end) lex-end)
+  "Function called when unterminated syntax is encountered.
+This should be set to one function.  That function should take three
+parameters.  The SYNTAX, or type of syntax which is unterminated.
+SYNTAX-START where the broken syntax begins.
+LEX-END is where the lexical analysis was asked to end.
+This function can be used for languages that can intelligently fix up
+broken syntax, or the exit lexical analysis via `throw' or `signal'
+when finding unterminated syntax.")
+
+;;; Interactive testing commands
+
+(defun semantic-lex-test (arg)
+  "Test the semantic lexer in the current buffer.
+If universal argument ARG, then try the whole buffer."
+  (interactive "P")
+  (let* ((start (current-time))
+	 (result (semantic-lex
+		  (if arg (point-min) (point))
+		  (point-max)))
+	 (end (current-time)))
+    (message "Elapsed Time: %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (pop-to-buffer "*Lexer Output*")
+    (require 'pp)
+    (erase-buffer)
+    (insert (pp-to-string result))
+    (goto-char (point-min))
+    ))
+
+(defun semantic-lex-test-full-depth (arg)
+  "Test the semantic lexer in the current buffer parsing through lists.
+Usually the lexer parses
+If universal argument ARG, then try the whole buffer."
+  (interactive "P")
+  (let* ((start (current-time))
+	 (result (semantic-lex
+		  (if arg (point-min) (point))
+		  (point-max)
+		  100))
+	 (end (current-time)))
+    (message "Elapsed Time: %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (pop-to-buffer "*Lexer Output*")
+    (require 'pp)
+    (erase-buffer)
+    (insert (pp-to-string result))
+    (goto-char (point-min))
+    ))
+
+(defun semantic-lex-test-region (beg end)
+  "Test the semantic lexer in the current buffer.
+Analyze the area between BEG and END."
+  (interactive "r")
+  (let ((result (semantic-lex beg end)))
+    (pop-to-buffer "*Lexer Output*")
+    (require 'pp)
+    (erase-buffer)
+    (insert (pp-to-string result))
+    (goto-char (point-min))
+    ))
+
+(defvar semantic-lex-debug nil
+  "When non-nil, debug the local lexical analyzer.")
+
+(defun semantic-lex-debug (arg)
+  "Debug the semantic lexer in the current buffer.
+Argument ARG specifies of the analyze the whole buffer, or start at point.
+While engaged, each token identified by the lexer will be highlighted
+in the target buffer   A description of the current token will be
+displayed in the minibuffer.  Press SPC to move to the next lexical token."
+  (interactive "P")
+  (require 'semantic-debug)
+  (let ((semantic-lex-debug t))
+    (semantic-lex-test arg)))
+
+(defun semantic-lex-highlight-token (token)
+  "Highlight the lexical TOKEN.
+TOKEN is a lexical token with a START And END position.
+Return the overlay."
+  (let ((o (semantic-make-overlay (semantic-lex-token-start token)
+				  (semantic-lex-token-end token))))
+    (semantic-overlay-put o 'face 'highlight)
+    o))
+
+(defsubst semantic-lex-debug-break (token)
+  "Break during lexical analysis at TOKEN."
+  (when semantic-lex-debug
+    (let ((o nil))
+      (unwind-protect
+	  (progn
+	    (when token
+	      (setq o (semantic-lex-highlight-token token)))
+	    (semantic-read-event
+	     (format "%S :: SPC - continue" token))
+	    )
+	(when o
+	  (semantic-overlay-delete o))))))
+
+;;; Lexical analyzer creation
+;;
+;; Code for creating a lex function from lists of analyzers.
+;;
+;; A lexical analyzer is created from a list of individual analyzers.
+;; Each individual analyzer specifies a single match, and code that
+;; goes with it.
+;;
+;; Creation of an analyzer assembles these analyzers into a new function
+;; with the behaviors of all the individual analyzers.
+;;
+(defmacro semantic-lex-one-token (analyzers)
+  "Calculate one token from the current buffer at point.
+Uses locally bound variables from `define-lex'.
+Argument ANALYZERS is the list of analyzers being used."
+  (cons 'cond (mapcar #'symbol-value analyzers)))
+
+(defvar semantic-lex-end-point nil
+  "The end point as tracked through lexical functions.")
+
+(defvar semantic-lex-current-depth nil
+  "The current depth as tracked through lexical functions.")
+
+(defvar semantic-lex-maximum-depth nil
+  "The maximum depth of parenthisis as tracked through lexical functions.")
+
+(defvar semantic-lex-token-stream nil
+  "The current token stream we are collecting.")
+
+(defvar semantic-lex-analysis-bounds nil
+  "The bounds of the current analysis.")
+
+(defvar semantic-lex-block-streams nil
+  "Streams of tokens inside collapsed blocks.
+This is an alist of (ANCHOR . STREAM) elements where ANCHOR is the
+start position of the block, and STREAM is the list of tokens in that
+block.")
+
+(defvar semantic-lex-reset-hooks nil
+  "List of hooks major-modes use to reset lexical analyzers.
+Hooks are called with START and END values for the current lexical pass.
+Should be set with `add-hook'specifying a LOCAL option.")
+
+;; Stack of nested blocks.
+(defvar semantic-lex-block-stack nil)
+;;(defvar semantic-lex-timeout 5
+;;  "*Number of sections of lexing before giving up.")
+
+;;;###autoload
+(defmacro define-lex (name doc &rest analyzers)
+  "Create a new lexical analyzer with NAME.
+DOC is a documentation string describing this analyzer.
+ANALYZERS are small code snippets of analyzers to use when
+building the new NAMED analyzer.  Only use analyzers which
+are written to be used in `define-lex'.
+Each analyzer should be an analyzer created with `define-lex-analyzer'.
+Note: The order in which analyzers are listed is important.
+If two analyzers can match the same text, it is important to order the
+analyzers so that the one you want to match first occurs first.  For
+example, it is good to put a numbe analyzer in front of a symbol
+analyzer which might mistake a number for as a symbol."
+  `(defun ,name  (start end &optional depth length)
+     ,(concat doc "\nSee `semantic-lex' for more information.")
+     ;; Make sure the state of block parsing starts over.
+     (setq semantic-lex-block-streams nil)
+     ;; Allow specialty reset items.
+     (run-hook-with-args 'semantic-lex-reset-hooks start end)
+     ;; Lexing state.
+     (let* (;(starttime (current-time))
+	    (starting-position (point))
+            (semantic-lex-token-stream nil)
+            (semantic-lex-block-stack nil)
+	    (tmp-start start)
+            (semantic-lex-end-point start)
+            (semantic-lex-current-depth 0)
+            ;; Use the default depth when not specified.
+            (semantic-lex-maximum-depth
+	     (or depth semantic-lex-depth))
+	    ;; Bounds needed for unterminated syntax
+	    (semantic-lex-analysis-bounds (cons start end))
+	    ;; This entry prevents text properties from
+	    ;; confusing our lexical analysis.  See Emacs 22 (CVS)
+	    ;; version of C++ mode with template hack text properties.
+	    (parse-sexp-lookup-properties nil)
+	    )
+       ;; Maybe REMOVE THIS LATER.
+       ;; Trying to find incremental parser bug.
+       (when (> end (point-max))
+         (error ,(format "%s: end (%%d) > point-max (%%d)" name)
+                end (point-max)))
+       (with-syntax-table semantic-lex-syntax-table
+         (goto-char start)
+         (while (and (< (point) end)
+                     (or (not length)
+			 (<= (length semantic-lex-token-stream) length)))
+           (semantic-lex-one-token ,analyzers)
+	   (when (eq semantic-lex-end-point tmp-start)
+	     (error ,(format "%s: endless loop at %%d, after %%S" name)
+                    tmp-start (car semantic-lex-token-stream)))
+	   (setq tmp-start semantic-lex-end-point)
+           (goto-char semantic-lex-end-point)
+	   ;;(when (> (semantic-elapsed-time starttime (current-time))
+	   ;;	    semantic-lex-timeout)
+	   ;;  (error "Timeout during lex at char %d" (point)))
+	   (semantic-throw-on-input 'lex)
+	   (semantic-lex-debug-break (car semantic-lex-token-stream))
+	   ))
+       ;; Check that there is no unterminated block.
+       (when semantic-lex-block-stack
+         (let* ((last (pop semantic-lex-block-stack))
+                (blk last))
+           (while blk
+             (message
+              ,(format "%s: `%%s' block from %%S is unterminated" name)
+              (car blk) (cadr blk))
+             (setq blk (pop semantic-lex-block-stack)))
+           (semantic-lex-unterminated-syntax-detected (car last))))
+       ;; Return to where we started.
+       ;; Do not wrap in protective stuff so that if there is an error
+       ;; thrown, the user knows where.
+       (goto-char starting-position)
+       ;; Return the token stream
+       (nreverse semantic-lex-token-stream))))
+
+;;; Collapsed block tokens delimited by any tokens.
+;;
+(defun semantic-lex-start-block (syntax)
+  "Mark the last read token as the beginning of a SYNTAX block."
+  (if (or (not semantic-lex-maximum-depth)
+          (< semantic-lex-current-depth semantic-lex-maximum-depth))
+      (setq semantic-lex-current-depth (1+ semantic-lex-current-depth))
+    (push (list syntax (car semantic-lex-token-stream))
+          semantic-lex-block-stack)))
+
+(defun semantic-lex-end-block (syntax)
+  "Process the end of a previously marked SYNTAX block.
+That is, collapse the tokens inside that block, including the
+beginning and end of block tokens, into a high level block token of
+class SYNTAX.
+The token at beginning of block is the one marked by a previous call
+to `semantic-lex-start-block'.  The current token is the end of block.
+The collapsed tokens are saved in `semantic-lex-block-streams'."
+  (if (null semantic-lex-block-stack)
+      (setq semantic-lex-current-depth (1- semantic-lex-current-depth))
+    (let* ((stream semantic-lex-token-stream)
+           (blk (pop semantic-lex-block-stack))
+           (bstream (cdr blk))
+           (first (car bstream))
+           (last (pop stream)) ;; The current token mark the EOBLK
+           tok)
+      (if (not (eq (car blk) syntax))
+          ;; SYNTAX doesn't match the syntax of the current block in
+          ;; the stack. So we encountered the end of the SYNTAX block
+          ;; before the end of the current one in the stack which is
+          ;; signaled unterminated.
+          (semantic-lex-unterminated-syntax-detected (car blk))
+        ;; Move tokens found inside the block from the main stream
+        ;; into a separate block stream.
+        (while (and stream (not (eq (setq tok (pop stream)) first)))
+          (push tok bstream))
+        ;; The token marked as beginning of block was not encountered.
+        ;; This should not happen!
+        (or (eq tok first)
+            (error "Token %S not found at beginning of block `%s'"
+                   first syntax))
+        ;; Save the block stream for future reuse, to avoid to redo
+        ;; the lexical analysis of the block content!
+        ;; Anchor the block stream with its start position, so we can
+        ;; use: (cdr (assq start semantic-lex-block-streams)) to
+        ;; quickly retrieve the lexical stream associated to a block.
+        (setcar blk (semantic-lex-token-start first))
+        (setcdr blk (nreverse bstream))
+        (push blk semantic-lex-block-streams)
+        ;; In the main stream, replace the tokens inside the block by
+        ;; a high level block token of class SYNTAX.
+        (setq semantic-lex-token-stream stream)
+        (semantic-lex-push-token
+         (semantic-lex-token
+          syntax (car blk) (semantic-lex-token-end last)))
+        ))))
+
+;;; Lexical token API
+;;
+;; Functions for accessing parts of a token.  Use these functions
+;; instead of accessing the list structure directly because the
+;; contents of the lexical may change.
+;;
+(defmacro semantic-lex-token (symbol start end &optional str)
+  "Create a lexical token.
+SYMBOL is a symbol representing the class of syntax found.
+START and END define the bounds of the token in the current buffer.
+Optional STR is the string for the token iff the the bounds
+in the buffer do not cover the string they represent.  (As from
+macro expansion.)"
+  ;; This if statement checks the existance of a STR argument at
+  ;; compile time, where STR is some symbol or constant.  If the
+  ;; variable STr (runtime) is nil, this will make an incorrect decision.
+  ;;
+  ;; It is like this to maintain the original speed of the compiled
+  ;; code.
+  (if str
+      `(cons ,symbol (cons ,str (cons ,start ,end)))
+    `(cons ,symbol (cons ,start ,end))))
+
+(defun semantic-lex-token-p (thing)
+  "Return non-nil if THING is a semantic lex token.
+This is an exhaustively robust check."
+  (and (consp thing)
+       (symbolp (car thing))
+       (or (and (numberp (nth 1 thing))
+		(numberp (nthcdr 2 thing)))
+	   (and (stringp (nth 1 thing))
+		(numberp (nth 2 thing))
+		(numberp (nthcdr 3 thing)))
+	   ))
+  )
+
+(defun semantic-lex-token-with-text-p (thing)
+  "Return non-nil if THING is a semantic lex token.
+This is an exhaustively robust check."
+  (and (consp thing)
+       (symbolp (car thing))
+       (= (length thing) 4)
+       (stringp (nth 1 thing))
+       (numberp (nth 2 thing))
+       (numberp (nth 3 thing)))
+  )
+
+(defun semantic-lex-token-without-text-p (thing)
+  "Return non-nil if THING is a semantic lex token.
+This is an exhaustively robust check."
+  (and (consp thing)
+       (symbolp (car thing))
+       (= (length thing) 3)
+       (numberp (nth 1 thing))
+       (numberp (nth 2 thing)))
+  )
+
+(defun semantic-lex-expand-block-specs (specs)
+  "Expand block specifications SPECS into a Lisp form.
+SPECS is a list of (BLOCK BEGIN END) elements where BLOCK, BEGIN, and
+END are token class symbols that indicate to produce one collapsed
+BLOCK token from tokens found between BEGIN and END ones.
+BLOCK must be a non-nil symbol, and at least one of the BEGIN or END
+symbols must be non-nil too.
+When BEGIN is non-nil, generate a call to `semantic-lex-start-block'
+when a BEGIN token class is encountered.
+When END is non-nil, generate a call to `semantic-lex-end-block' when
+an END token class is encountered."
+  (let ((class (make-symbol "class"))
+        (form nil))
+    (dolist (spec specs)
+      (when (car spec)
+        (when (nth 1 spec)
+          (push `((eq ',(nth 1 spec) ,class)
+                  (semantic-lex-start-block ',(car spec)))
+                form))
+        (when (nth 2 spec)
+          (push `((eq ',(nth 2 spec) ,class)
+                  (semantic-lex-end-block ',(car spec)))
+                form))))
+    (when form
+      `((let ((,class (semantic-lex-token-class
+                       (car semantic-lex-token-stream))))
+          (cond ,@(nreverse form))))
+      )))
+
+(defmacro semantic-lex-push-token (token &rest blockspecs)
+  "Push TOKEN in the lexical analyzer token stream.
+Return the lexical analysis current end point.
+If optional arguments BLOCKSPECS is non-nil, it specifies to process
+collapsed block tokens.  See `semantic-lex-expand-block-specs' for
+more details.
+This macro should only be called within the bounds of
+`define-lex-analyzer'.  It changes the values of the lexical analyzer
+variables `token-stream' and `semantic-lex-end-point'.  If you need to
+move `semantic-lex-end-point' somewhere else, just modify this
+variable after calling `semantic-lex-push-token'."
+  `(progn
+     (push ,token semantic-lex-token-stream)
+     ,@(semantic-lex-expand-block-specs blockspecs)
+     (setq semantic-lex-end-point
+           (semantic-lex-token-end (car semantic-lex-token-stream)))
+     ))
+
+(defsubst semantic-lex-token-class (token)
+  "Fetch the class of the lexical token TOKEN.
+See also the function `semantic-lex-token'."
+  (car token))
+
+(defsubst semantic-lex-token-text (token)
+  "Fetch the text associated with the lexical token TOKEN.
+See also the function `semantic-lex-token'."
+  (if (stringp (car (cdr token)))
+      (car (cdr token))
+    (buffer-substring-no-properties
+     (semantic-lex-token-start token)
+     (semantic-lex-token-end   token))))
+
+;;;###autoload
+(defun semantic-lex-init ()
+  "Initialize any lexical state for this buffer."
+  (unless semantic-lex-comment-regex
+    (setq semantic-lex-comment-regex
+	  (if comment-start-skip
+	      (concat "\\(\\s<\\|" comment-start-skip "\\)")
+	    "\\(\\s<\\)")))
+  ;; Setup the lexer syntax-table
+  (setq semantic-lex-syntax-table (copy-syntax-table (syntax-table)))
+  (dolist (mod semantic-lex-syntax-modifications)
+    (modify-syntax-entry
+     (car mod) (nth 1 mod) semantic-lex-syntax-table)))
+
+;;;###autoload
+(define-overloadable-function semantic-lex (start end &optional depth length)
+  "Lexically analyze text in the current buffer between START and END.
+Optional argument DEPTH indicates at what level to scan over entire
+lists.  The last argument, LENGTH specifies that `semantic-lex'
+should only return LENGTH tokens.  The return value is a token stream.
+Each element is a list, such of the form
+  (symbol start-expression .  end-expression)
+where SYMBOL denotes the token type.
+See `semantic-lex-tokens' variable for details on token types.  END
+does not mark the end of the text scanned, only the end of the
+beginning of text scanned.  Thus, if a string extends past END, the
+end of the return token will be larger than END.  To truly restrict
+scanning, use `narrow-to-region'."
+  (funcall semantic-lex-analyzer start end depth length))
+
+(defsubst semantic-lex-buffer (&optional depth)
+  "Lex the current buffer.
+Optional argument DEPTH is the depth to scan into lists."
+  (semantic-lex (point-min) (point-max) depth))
+
+(defsubst semantic-lex-list (semlist depth)
+  "Lex the body of SEMLIST to DEPTH."
+  (semantic-lex (semantic-lex-token-start semlist)
+                (semantic-lex-token-end   semlist)
+                depth))
+
+;;; Analyzer creation macros
+;;
+;; An individual analyzer is a condition and code that goes with it.
+;;
+;; Created analyzers become variables with the code associated with them
+;; as the symbol value.  These analyzers are assembled into a lexer
+;; to create new lexical analyzers.
+;;
+(defcustom semantic-lex-debug-analyzers nil
+  "Non nil means to debug analyzers with syntax protection.
+Only in effect if `debug-on-error' is also non-nil."
+  :group 'semantic
+  :type 'boolean)
+
+(defmacro semantic-lex-unterminated-syntax-protection (syntax &rest forms)
+  "For SYNTAX, execute FORMS with protection for unterminated syntax.
+If FORMS throws an error, treat this as a syntax problem, and
+execute the unterminated syntax code.  FORMS should return a position.
+Irreguardless of an error, the cursor should be moved to the end of
+the desired syntax, and a position returned.
+If `debug-on-error' is set, errors are not caught, so that you can
+debug them.
+Avoid using a large FORMS since it is duplicated."
+  `(if (and debug-on-error semantic-lex-debug-analyzers)
+       (progn ,@forms)
+     (condition-case nil
+         (progn ,@forms)
+       (error
+        (semantic-lex-unterminated-syntax-detected ,syntax)))))
+(put 'semantic-lex-unterminated-syntax-protection
+     'lisp-indent-function 1)
+
+;;;###autoload
+(defmacro define-lex-analyzer (name doc condition &rest forms)
+  "Create a single lexical analyzer NAME with DOC.
+When an analyzer is called, the current buffer and point are
+positioned in a buffer at the location to be analyzed.
+CONDITION is an expression which returns t if FORMS should be run.
+Within the bounds of CONDITION and FORMS, the use of backquote
+can be used to evaluate expressions at compile time.
+While forms are running, the following variables will be locally bound:
+  `semantic-lex-analysis-bounds' - The bounds of the current analysis.
+                  of the form (START . END)
+  `semantic-lex-maximum-depth' - The maximum depth of semantic-list
+                  for the current analysis.
+  `semantic-lex-current-depth' - The current depth of `semantic-list' that has
+                  been decended.
+  `semantic-lex-end-point' - End Point after match.
+                   Analyzers should set this to a buffer location if their
+                   match string does not represent the end of the matched text.
+  `semantic-lex-token-stream' - The token list being collected.
+                   Add new lexical tokens to this list.
+Proper action in FORMS is to move the value of `semantic-lex-end-point' to
+after the location of the analyzed entry, and to add any discovered tokens
+at the beginning of `semantic-lex-token-stream'.
+This can be done by using `semantic-lex-push-token'."
+  `(eval-and-compile
+     (defvar ,name nil ,doc)
+     (defun ,name nil)
+     ;; Do this part separately so that re-evaluation rebuilds this code.
+     (setq ,name '(,condition ,@forms))
+     ;; Build a single lexical analyzer function, so the doc for
+     ;; function help is automatically provided, and perhaps the
+     ;; function could be useful for testing and debugging one
+     ;; analyzer.
+     (fset ',name (lambda () ,doc
+		    (let ((semantic-lex-token-stream nil)
+			  (semantic-lex-end-point (point))
+			  (semantic-lex-analysis-bounds
+			   (cons (point) (point-max)))
+			  (semantic-lex-current-depth 0)
+			  (semantic-lex-maximum-depth
+			   semantic-lex-depth)
+			  )
+		      (when ,condition ,@forms)
+		      semantic-lex-token-stream)))
+     ))
+
+;;;###autoload
+(defmacro define-lex-regex-analyzer (name doc regexp &rest forms)
+  "Create a lexical analyzer with NAME and DOC that will match REGEXP.
+FORMS are evaluated upon a successful match.
+See `define-lex-analyzer' for more about analyzers."
+  `(define-lex-analyzer ,name
+     ,doc
+     (looking-at ,regexp)
+     ,@forms
+     ))
+
+;;;###autoload
+(defmacro define-lex-simple-regex-analyzer (name doc regexp toksym
+						 &optional index
+						 &rest forms)
+  "Create a lexical analyzer with NAME and DOC that match REGEXP.
+TOKSYM is the symbol to use when creating a semantic lexical token.
+INDEX is the index into the match that defines the bounds of the token.
+Index should be a plain integer, and not specified in the macro as an
+expression.
+FORMS are evaluated upon a successful match BEFORE the new token is
+created.  It is valid to ignore FORMS.
+See `define-lex-analyzer' for more about analyzers."
+  `(define-lex-analyzer ,name
+     ,doc
+     (looking-at ,regexp)
+     ,@forms
+     (semantic-lex-push-token
+      (semantic-lex-token ,toksym
+			  (match-beginning ,(or index 0))
+			  (match-end ,(or index 0))))
+     ))
+
+;;;###autoload
+(defmacro define-lex-block-analyzer (name doc spec1 &rest specs)
+  "Create a lexical analyzer NAME for paired delimiters blocks.
+It detects a paired delimiters block or the corresponding open or
+close delimiter depending on the value of the variable
+`semantic-lex-current-depth'.  DOC is the documentation string of the lexical
+analyzer.  SPEC1 and SPECS specify the token symbols and open, close
+delimiters used.  Each SPEC has the form:
+
+\(BLOCK-SYM (OPEN-DELIM OPEN-SYM) (CLOSE-DELIM CLOSE-SYM))
+
+where BLOCK-SYM is the symbol returned in a block token.  OPEN-DELIM
+and CLOSE-DELIM are respectively the open and close delimiters
+identifying a block.  OPEN-SYM and CLOSE-SYM are respectively the
+symbols returned in open and close tokens."
+  (let ((specs (cons spec1 specs))
+        spec open olist clist)
+    (while specs
+      (setq spec  (car specs)
+            specs (cdr specs)
+            open  (nth 1 spec)
+            ;; build alist ((OPEN-DELIM OPEN-SYM BLOCK-SYM) ...)
+            olist (cons (list (car open) (cadr open) (car spec)) olist)
+            ;; build alist ((CLOSE-DELIM CLOSE-SYM) ...)
+            clist (cons (nth 2 spec) clist)))
+    `(define-lex-analyzer ,name
+       ,doc
+       (and
+        (looking-at "\\(\\s(\\|\\s)\\)")
+        (let ((text (match-string 0)) match)
+          (cond
+           ((setq match (assoc text ',olist))
+            (if (or (not semantic-lex-maximum-depth)
+		    (< semantic-lex-current-depth semantic-lex-maximum-depth))
+                (progn
+                  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth))
+		  (semantic-lex-push-token
+		   (semantic-lex-token
+		    (nth 1 match)
+		    (match-beginning 0) (match-end 0))))
+	      (semantic-lex-push-token
+	       (semantic-lex-token
+		(nth 2 match)
+		(match-beginning 0)
+		(save-excursion
+		  (semantic-lex-unterminated-syntax-protection (nth 2 match)
+		    (forward-list 1)
+		    (point)))
+		))
+	      ))
+           ((setq match (assoc text ',clist))
+            (setq semantic-lex-current-depth (1- semantic-lex-current-depth))
+	    (semantic-lex-push-token
+	     (semantic-lex-token
+	      (nth 1 match)
+	      (match-beginning 0) (match-end 0)))))))
+       )))
+
+;;; Analyzers
+;;
+;; Pre-defined common analyzers.
+;;
+(define-lex-analyzer semantic-lex-default-action
+  "The default action when no other lexical actions match text.
+This action will just throw an error."
+  t
+  (error "Unmatched Text during Lexical Analysis"))
+
+(define-lex-analyzer semantic-lex-beginning-of-line
+  "Detect and create a beginning of line token (BOL)."
+  (and (bolp)
+       ;; Just insert a (bol N . N) token in the token stream,
+       ;; without moving the point.  N is the point at the
+       ;; beginning of line.
+       (semantic-lex-push-token (semantic-lex-token 'bol (point) (point)))
+       nil) ;; CONTINUE
+  ;; We identify and add the BOL token onto the stream, but since
+  ;; semantic-lex-end-point doesn't move, we always fail CONDITION, and have no
+  ;; FORMS body.
+  nil)
+
+(define-lex-simple-regex-analyzer semantic-lex-newline
+  "Detect and create newline tokens."
+  "\\s-*\\(\n\\|\\s>\\)"  'newline 1)
+
+(define-lex-regex-analyzer semantic-lex-newline-as-whitespace
+  "Detect and create newline tokens.
+Use this ONLY if newlines are not whitespace characters (such as when
+they are comment end characters) AND when you want whitespace tokens."
+  "\\s-*\\(\n\\|\\s>\\)"
+  ;; Language wants whitespaces.  Create a token for it.
+  (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
+	  'whitespace)
+      ;; Merge whitespace tokens together if they are adjacent.  Two
+      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; the token stream.
+      (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
+              (match-end 0))
+    (semantic-lex-push-token
+     (semantic-lex-token
+      'whitespace (match-beginning 0) (match-end 0)))))
+
+(define-lex-regex-analyzer semantic-lex-ignore-newline
+  "Detect and ignore newline tokens.
+Use this ONLY if newlines are not whitespace characters (such as when
+they are comment end characters)."
+  "\\s-*\\(\n\\|\\s>\\)"
+  (setq semantic-lex-end-point (match-end 0)))
+
+(define-lex-regex-analyzer semantic-lex-whitespace
+  "Detect and create whitespace tokens."
+  ;; catch whitespace when needed
+  "\\s-+"
+  ;; Language wants whitespaces.  Create a token for it.
+  (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
+	  'whitespace)
+      ;; Merge whitespace tokens together if they are adjacent.  Two
+      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; the token stream.
+      (progn
+        (setq semantic-lex-end-point (match-end 0))
+        (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
+                semantic-lex-end-point))
+    (semantic-lex-push-token
+     (semantic-lex-token
+      'whitespace (match-beginning 0) (match-end 0)))))
+
+(define-lex-regex-analyzer semantic-lex-ignore-whitespace
+  "Detect and skip over whitespace tokens."
+  ;; catch whitespace when needed
+  "\\s-+"
+  ;; Skip over the detected whitespace, do not create a token for it.
+  (setq semantic-lex-end-point (match-end 0)))
+
+(define-lex-simple-regex-analyzer semantic-lex-number
+  "Detect and create number tokens.
+See `semantic-lex-number-expression' for details on matching numbers,
+and number formats."
+  semantic-lex-number-expression 'number)
+
+(define-lex-regex-analyzer semantic-lex-symbol-or-keyword
+  "Detect and create symbol and keyword tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  (semantic-lex-push-token
+   (semantic-lex-token
+    (or (semantic-lex-keyword-p (match-string 0)) 'symbol)
+    (match-beginning 0) (match-end 0))))
+
+(define-lex-simple-regex-analyzer semantic-lex-charquote
+  "Detect and create charquote tokens."
+  ;; Character quoting characters (ie, \n as newline)
+  "\\s\\+" 'charquote)
+
+(define-lex-simple-regex-analyzer semantic-lex-punctuation
+  "Detect and create punctuation tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)" 'punctuation)
+
+(define-lex-analyzer semantic-lex-punctuation-type
+  "Detect and create a punctuation type token.
+Recognized punctuations are defined in the current table of lexical
+types, as the value of the `punctuation' token type."
+  (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
+       (let* ((key (match-string 0))
+              (pos (match-beginning 0))
+              (end (match-end 0))
+              (len (- end pos))
+              (lst (semantic-lex-type-value "punctuation" t))
+              (def (car lst)) ;; default lexical symbol or nil
+              (lst (cdr lst)) ;; alist of (LEX-SYM . PUNCT-STRING)
+              (elt nil))
+         (if lst
+             ;; Starting with the longest one, search if the
+             ;; punctuation string is defined for this language.
+             (while (and (> len 0) (not (setq elt (rassoc key lst))))
+               (setq len (1- len)
+                     key (substring key 0 len))))
+         (if elt ;; Return the punctuation token found
+             (semantic-lex-push-token
+	      (semantic-lex-token (car elt) pos (+ pos len)))
+           (if def ;; Return a default generic token
+               (semantic-lex-push-token
+		(semantic-lex-token def pos end))
+             ;; Nothing match
+             )))))
+
+(define-lex-regex-analyzer semantic-lex-paren-or-list
+  "Detect open parenthesis.
+Return either a paren token or a semantic list token depending on
+`semantic-lex-current-depth'."
+  "\\s("
+  (if (or (not semantic-lex-maximum-depth)
+	  (< semantic-lex-current-depth semantic-lex-maximum-depth))
+      (progn
+	(setq semantic-lex-current-depth (1+ semantic-lex-current-depth))
+	(semantic-lex-push-token
+	 (semantic-lex-token
+	  'open-paren (match-beginning 0) (match-end 0))))
+    (semantic-lex-push-token
+     (semantic-lex-token
+      'semantic-list (match-beginning 0)
+      (save-excursion
+	(semantic-lex-unterminated-syntax-protection 'semantic-list
+	  (forward-list 1)
+	  (point))
+	)))
+    ))
+
+(define-lex-simple-regex-analyzer semantic-lex-open-paren
+  "Detect and create an open parenthisis token."
+  "\\s(" 'open-paren 0  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth)))
+
+(define-lex-simple-regex-analyzer semantic-lex-close-paren
+  "Detect and create a close paren token."
+  "\\s)" 'close-paren 0 (setq semantic-lex-current-depth (1- semantic-lex-current-depth)))
+
+(define-lex-regex-analyzer semantic-lex-string
+  "Detect and create a string token."
+  "\\s\""
+  ;; Zing to the end of this string.
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'string (point)
+    (save-excursion
+      (semantic-lex-unterminated-syntax-protection 'string
+	(forward-sexp 1)
+	(point))
+      ))))
+
+(define-lex-regex-analyzer semantic-lex-comments
+  "Detect and create a comment token."
+  semantic-lex-comment-regex
+  (save-excursion
+    (forward-comment 1)
+    ;; Generate newline token if enabled
+    (if (bolp) (backward-char 1))
+    (setq semantic-lex-end-point (point))
+    ;; Language wants comments or want them as whitespaces,
+    ;; link them together.
+    (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 'comment)
+	(setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
+		semantic-lex-end-point)
+      (semantic-lex-push-token
+       (semantic-lex-token
+	'comment (match-beginning 0) semantic-lex-end-point)))))
+
+(define-lex-regex-analyzer semantic-lex-comments-as-whitespace
+  "Detect comments and create a whitespace token."
+  semantic-lex-comment-regex
+  (save-excursion
+    (forward-comment 1)
+    ;; Generate newline token if enabled
+    (if (bolp) (backward-char 1))
+    (setq semantic-lex-end-point (point))
+    ;; Language wants comments or want them as whitespaces,
+    ;; link them together.
+    (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 'whitespace)
+	(setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
+		semantic-lex-end-point)
+      (semantic-lex-push-token
+       (semantic-lex-token
+	'whitespace (match-beginning 0) semantic-lex-end-point)))))
+
+(define-lex-regex-analyzer semantic-lex-ignore-comments
+  "Detect and create a comment token."
+  semantic-lex-comment-regex
+  (let ((comment-start-point (point)))
+    (forward-comment 1)
+    (if (eq (point) comment-start-point)
+	;; In this case our start-skip string failed
+	;; to work properly.  Lets try and move over
+	;; whatever white space we matched to begin
+	;; with.
+	(skip-syntax-forward "-.'"
+			     (save-excursion
+			       (end-of-line)
+			       (point)))
+      ;; We may need to back up so newlines or whitespace is generated.
+      (if (bolp)
+	  (backward-char 1)))
+    (if (eq (point) comment-start-point)
+	(error "Strange comment syntax prevents lexical analysis"))
+    (setq semantic-lex-end-point (point))))
+
+;;; Comment lexer
+;;
+;; Predefined lexers that could be used instead of creating new
+;; analyers.
+
+(define-lex semantic-comment-lexer
+  "A simple lexical analyzer that handles comments.
+This lexer will only return comment tokens.  It is the default lexer
+used by `semantic-find-doc-snarf-comment' to snarf up the comment at
+point."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-comments
+  semantic-lex-default-action)
+
+;;; Test Lexer
+;;
+(define-lex semantic-simple-lexer
+  "A simple lexical analyzer that handles simple buffers.
+This lexer ignores comments and whitespace, and will return
+syntax as specified by the syntax table."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-number
+  semantic-lex-symbol-or-keyword
+  semantic-lex-charquote
+  semantic-lex-paren-or-list
+  semantic-lex-close-paren
+  semantic-lex-string
+  semantic-lex-ignore-comments
+  semantic-lex-punctuation
+  semantic-lex-default-action)
+
+;;; Analyzers generated from grammar.
+;;
+;; Some analyzers are hand written.  Analyzers created with these
+;; functions are generated from the grammar files.
+
+(defmacro define-lex-keyword-type-analyzer (name doc syntax)
+  "Define a keyword type analyzer NAME with DOC string.
+SYNTAX is the regexp that matches a keyword syntactic expression."
+  (let ((key (make-symbol "key")))
+    `(define-lex-analyzer ,name
+       ,doc
+       (and (looking-at ,syntax)
+            (let ((,key (semantic-lex-keyword-p (match-string 0))))
+              (when ,key
+                (semantic-lex-push-token
+                 (semantic-lex-token
+                  ,key (match-beginning 0) (match-end 0)))))))
+    ))
+
+(defmacro define-lex-sexp-type-analyzer (name doc syntax token)
+  "Define a sexp type analyzer NAME with DOC string.
+SYNTAX is the regexp that matches the beginning of the s-expression.
+TOKEN is the lexical token returned when SYNTAX matches."
+  `(define-lex-regex-analyzer ,name
+     ,doc
+     ,syntax
+     (semantic-lex-push-token
+      (semantic-lex-token
+       ,token (point)
+       (save-excursion
+         (semantic-lex-unterminated-syntax-protection ,token
+           (forward-sexp 1)
+           (point))))))
+  )
+
+(defmacro define-lex-regex-type-analyzer (name doc syntax matches default)
+  "Define a regexp type analyzer NAME with DOC string.
+SYNTAX is the regexp that matches a syntactic expression.
+MATCHES is an alist of lexical elements used to refine the syntactic
+expression.
+DEFAULT is the default lexical token returned when no MATCHES."
+  (if matches
+      (let* ((val (make-symbol "val"))
+             (lst (make-symbol "lst"))
+             (elt (make-symbol "elt"))
+             (pos (make-symbol "pos"))
+             (end (make-symbol "end")))
+        `(define-lex-analyzer ,name
+           ,doc
+           (and (looking-at ,syntax)
+                (let* ((,val (match-string 0))
+                       (,pos (match-beginning 0))
+                       (,end (match-end 0))
+                       (,lst ,matches)
+                       ,elt)
+                  (while (and ,lst (not ,elt))
+                    (if (string-match (cdar ,lst) ,val)
+                        (setq ,elt (caar ,lst))
+                      (setq ,lst (cdr ,lst))))
+                  (semantic-lex-push-token
+                   (semantic-lex-token (or ,elt ,default) ,pos ,end))))
+           ))
+    `(define-lex-simple-regex-analyzer ,name
+       ,doc
+       ,syntax ,default)
+    ))
+
+(defmacro define-lex-string-type-analyzer (name doc syntax matches default)
+  "Define a string type analyzer NAME with DOC string.
+SYNTAX is the regexp that matches a syntactic expression.
+MATCHES is an alist of lexical elements used to refine the syntactic
+expression.
+DEFAULT is the default lexical token returned when no MATCHES."
+  (if matches
+      (let* ((val (make-symbol "val"))
+             (lst (make-symbol "lst"))
+             (elt (make-symbol "elt"))
+             (pos (make-symbol "pos"))
+             (end (make-symbol "end"))
+             (len (make-symbol "len")))
+        `(define-lex-analyzer ,name
+           ,doc
+           (and (looking-at ,syntax)
+                (let* ((,val (match-string 0))
+                       (,pos (match-beginning 0))
+                       (,end (match-end 0))
+                       (,len (- ,end ,pos))
+                       (,lst ,matches)
+                       ,elt)
+               ;; Starting with the longest one, search if a lexical
+               ;; value match a token defined for this language.
+               (while (and (> ,len 0) (not (setq ,elt (rassoc ,val ,lst))))
+                 (setq ,len (1- ,len)
+                       ,val (substring ,val 0 ,len)))
+               (when ,elt ;; Adjust token end position.
+                 (setq ,elt (car ,elt)
+                       ,end (+ ,pos ,len)))
+               (semantic-lex-push-token
+                (semantic-lex-token (or ,elt ,default) ,pos ,end))))
+           ))
+    `(define-lex-simple-regex-analyzer ,name
+       ,doc
+       ,syntax ,default)
+    ))
+
+(defmacro define-lex-block-type-analyzer (name doc syntax matches)
+  "Define a block type analyzer NAME with DOC string.
+
+SYNTAX is the regexp that matches block delimiters,  typically the
+open (`\\\\s(') and close (`\\\\s)') parenthesis syntax classes.
+
+MATCHES is a pair (OPEN-SPECS . CLOSE-SPECS) that defines blocks.
+
+  OPEN-SPECS is a list of (OPEN-DELIM OPEN-TOKEN BLOCK-TOKEN) elements
+  where:
+
+    OPEN-DELIM is a string: the block open delimiter character.
+
+    OPEN-TOKEN is the lexical token class associated to the OPEN-DELIM
+    delimiter.
+
+    BLOCK-TOKEN is the lexical token class associated to the block
+    that starts at the OPEN-DELIM delimiter.
+
+  CLOSE-SPECS is a list of (CLOSE-DELIM CLOSE-TOKEN) elements where:
+
+    CLOSE-DELIM is a string: the block end delimiter character.
+
+    CLOSE-TOKEN is the lexical token class associated to the
+    CLOSE-DELIM delimiter.
+
+Each element in OPEN-SPECS must have a corresponding element in
+CLOSE-SPECS.
+
+The lexer will return a BLOCK-TOKEN token when the value of
+`semantic-lex-current-depth' is greater than or equal to the maximum
+depth of parenthesis tracking (see also the function `semantic-lex').
+Otherwise it will return OPEN-TOKEN and CLOSE-TOKEN tokens.
+
+TO DO: Put the following in the developer's guide and just put a
+reference here.
+
+In the grammar:
+
+The value of a block token must be a string that contains a readable
+sexp of the form:
+
+  \"(OPEN-TOKEN CLOSE-TOKEN)\"
+
+OPEN-TOKEN and CLOSE-TOKEN represent the block delimiters, and must be
+lexical tokens of respectively `open-paren' and `close-paren' types.
+Their value is the corresponding delimiter character as a string.
+
+Here is a small example to analyze a parenthesis block:
+
+  %token <block>       PAREN_BLOCK \"(LPAREN RPAREN)\"
+  %token <open-paren>  LPAREN      \"(\"
+  %token <close-paren> RPAREN      \")\"
+
+When the lexer encounters the open-paren delimiter \"(\":
+
+ - If the maximum depth of parenthesis tracking is not reached (that
+   is, current depth < max depth), it returns a (LPAREN start .  end)
+   token, then continue analysis inside the block.  Later, when the
+   corresponding close-paren delimiter \")\" will be encountered, it
+   will return a (RPAREN start . end) token.
+
+ - If the maximum depth of parenthesis tracking is reached (current
+   depth >= max depth), it returns the whole parenthesis block as
+   a (PAREN_BLOCK start . end) token."
+  (let* ((val (make-symbol "val"))
+         (lst (make-symbol "lst"))
+         (elt (make-symbol "elt")))
+    `(define-lex-analyzer ,name
+       ,doc
+       (and
+        (looking-at ,syntax) ;; "\\(\\s(\\|\\s)\\)"
+        (let ((,val (match-string 0))
+              (,lst ,matches)
+              ,elt)
+          (cond
+           ((setq ,elt (assoc ,val (car ,lst)))
+            (if (or (not semantic-lex-maximum-depth)
+                    (< semantic-lex-current-depth semantic-lex-maximum-depth))
+                (progn
+                  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth))
+                  (semantic-lex-push-token
+                   (semantic-lex-token
+                    (nth 1 ,elt)
+                    (match-beginning 0) (match-end 0))))
+              (semantic-lex-push-token
+               (semantic-lex-token
+                (nth 2 ,elt)
+                (match-beginning 0)
+                (save-excursion
+                  (semantic-lex-unterminated-syntax-protection (nth 2 ,elt)
+                    (forward-list 1)
+                    (point)))))))
+           ((setq ,elt (assoc ,val (cdr ,lst)))
+            (setq semantic-lex-current-depth (1- semantic-lex-current-depth))
+            (semantic-lex-push-token
+             (semantic-lex-token
+              (nth 1 ,elt)
+              (match-beginning 0) (match-end 0))))
+           ))))
+    ))
+
+;;; Lexical Safety
+;;
+;; The semantic lexers, unlike other lexers, can throw errors on
+;; unbalanced syntax.  Since editing is all about changeging test
+;; we need to provide a convenient way to protect against syntactic
+;; inequalities.
+
+(defmacro semantic-lex-catch-errors (symbol &rest forms)
+  "Using SYMBOL, execute FORMS catching lexical errors.
+If FORMS results in a call to the parser that throws a lexical error,
+the error will be caught here without the buffer's cache being thrown
+out of date.
+If there is an error, the syntax that failed is returned.
+If there is no error, then the last value of FORMS is returned."
+  (let ((ret (make-symbol "ret"))
+        (syntax (make-symbol "syntax"))
+        (start (make-symbol "start"))
+        (end (make-symbol "end")))
+    `(let* ((semantic-lex-unterminated-syntax-end-function
+             (lambda (,syntax ,start ,end)
+               (throw ',symbol ,syntax)))
+            ;; Delete the below when semantic-flex is fully retired.
+            (semantic-flex-unterminated-syntax-end-function
+             semantic-lex-unterminated-syntax-end-function)
+            (,ret (catch ',symbol
+                    (save-excursion
+                      ,@forms
+                      nil))))
+       ;; Great Sadness.  Assume that FORMS execute within the
+       ;; confines of the current buffer only!  Mark this thing
+       ;; unparseable iff the special symbol was thrown.  This
+       ;; will prevent future calls from parsing, but will allow
+       ;; then to still return the cache.
+       (when ,ret
+	 ;; Leave this message off.  If an APP using this fcn wants
+	 ;; a message, they can do it themselves.  This cleans up
+	 ;; problems with the idle scheduler obscuring useful data.
+         ;;(message "Buffer not currently parsable (%S)." ,ret)
+         (semantic-parse-tree-unparseable))
+       ,ret)))
+(put 'semantic-lex-catch-errors 'lisp-indent-function 1)
+
+
+;;; Interfacing with edebug
+;;
+(add-hook
+ 'edebug-setup-hook
+ #'(lambda ()
+
+     (def-edebug-spec define-lex
+       (&define name stringp (&rest symbolp))
+       )
+     (def-edebug-spec define-lex-analyzer
+       (&define name stringp form def-body)
+       )
+     (def-edebug-spec define-lex-regex-analyzer
+       (&define name stringp form def-body)
+       )
+     (def-edebug-spec define-lex-simple-regex-analyzer
+       (&define name stringp form symbolp [ &optional form ] def-body)
+       )
+     (def-edebug-spec define-lex-block-analyzer
+       (&define name stringp form (&rest form))
+       )
+     (def-edebug-spec semantic-lex-catch-errors
+       (symbolp def-body)
+       )
+
+     ))
+
+;;; Compatibility with Semantic 1.x lexical analysis
+;;
+;; NOTE: DELETE THIS SOMEDAY SOON
+
+(semantic-alias-obsolete 'semantic-flex-start 'semantic-lex-token-start)
+(semantic-alias-obsolete 'semantic-flex-end 'semantic-lex-token-end)
+(semantic-alias-obsolete 'semantic-flex-text 'semantic-lex-token-text)
+(semantic-alias-obsolete 'semantic-flex-make-keyword-table 'semantic-lex-make-keyword-table)
+(semantic-alias-obsolete 'semantic-flex-keyword-p 'semantic-lex-keyword-p)
+(semantic-alias-obsolete 'semantic-flex-keyword-put 'semantic-lex-keyword-put)
+(semantic-alias-obsolete 'semantic-flex-keyword-get 'semantic-lex-keyword-get)
+(semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords)
+(semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords)
+(semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer)
+(semantic-alias-obsolete 'semantic-flex-list   'semantic-lex-list)
+
+;; This simple scanner uses the syntax table to generate a stream of
+;; simple tokens of the form:
+;;
+;;  (SYMBOL START . END)
+;;
+;; Where symbol is the type of thing it is.  START and END mark that
+;; objects boundary.
+
+(defvar semantic-flex-tokens semantic-lex-tokens
+  "An alist of of semantic token types.
+See variable `semantic-lex-tokens'.")
+
+(defvar semantic-flex-unterminated-syntax-end-function
+  (lambda (syntax syntax-start flex-end) flex-end)
+  "Function called when unterminated syntax is encountered.
+This should be set to one function.  That function should take three
+parameters.  The SYNTAX, or type of syntax which is unterminated.
+SYNTAX-START where the broken syntax begins.
+FLEX-END is where the lexical analysis was asked to end.
+This function can be used for languages that can intelligently fix up
+broken syntax, or the exit lexical analysis via `throw' or `signal'
+when finding unterminated syntax.")
+
+(defvar semantic-flex-extensions nil
+  "Buffer local extensions to the lexical analyzer.
+This should contain an alist with a key of a regex and a data element of
+a function.  The function should both move point, and return a lexical
+token of the form:
+  ( TYPE START .  END)
+nil is also a valid return value.
+TYPE can be any type of symbol, as long as it doesn't occur as a
+nonterminal in the language definition.")
+(make-variable-buffer-local 'semantic-flex-extensions)
+
+(defvar semantic-flex-syntax-modifications nil
+  "Changes to the syntax table for this buffer.
+These changes are active only while the buffer is being flexed.
+This is a list where each element has the form:
+  (CHAR CLASS)
+CHAR is the char passed to `modify-syntax-entry',
+and CLASS is the string also passed to `modify-syntax-entry' to define
+what syntax class CHAR has.")
+(make-variable-buffer-local 'semantic-flex-syntax-modifications)
+
+(defvar semantic-ignore-comments t
+  "Default comment handling.
+t means to strip comments when flexing.  Nil means to keep comments
+as part of the token stream.")
+(make-variable-buffer-local 'semantic-ignore-comments)
+
+(defvar semantic-flex-enable-newlines nil
+  "When flexing, report 'newlines as syntactic elements.
+Useful for languages where the newline is a special case terminator.
+Only set this on a per mode basis, not globally.")
+(make-variable-buffer-local 'semantic-flex-enable-newlines)
+
+(defvar semantic-flex-enable-whitespace nil
+  "When flexing, report 'whitespace as syntactic elements.
+Useful for languages where the syntax is whitespace dependent.
+Only set this on a per mode basis, not globally.")
+(make-variable-buffer-local 'semantic-flex-enable-whitespace)
+
+(defvar semantic-flex-enable-bol nil
+  "When flexing, report beginning of lines as syntactic elements.
+Useful for languages like python which are indentation sensitive.
+Only set this on a per mode basis, not globally.")
+(make-variable-buffer-local 'semantic-flex-enable-bol)
+
+(defvar semantic-number-expression semantic-lex-number-expression
+  "See variable `semantic-lex-number-expression'.")
+(make-variable-buffer-local 'semantic-number-expression)
+
+(defvar semantic-flex-depth 0
+  "Default flexing depth.
+This specifies how many lists to create tokens in.")
+(make-variable-buffer-local 'semantic-flex-depth)
+
+(defun semantic-flex (start end &optional depth length)
+  "Using the syntax table, do something roughly equivalent to flex.
+Semantically check between START and END.  Optional argument DEPTH
+indicates at what level to scan over entire lists.
+The return value is a token stream.  Each element is a list, such of
+the form (symbol start-expression .  end-expression) where SYMBOL
+denotes the token type.
+See `semantic-flex-tokens' variable for details on token types.
+END does not mark the end of the text scanned, only the end of the
+beginning of text scanned.  Thus, if a string extends past END, the
+end of the return token will be larger than END.  To truly restrict
+scanning, use `narrow-to-region'.
+The last argument, LENGTH specifies that `semantic-flex' should only
+return LENGTH tokens."
+  (message "`semantic-flex' is an obsolete function.  Use `define-lex' to create lexers.")
+  (if (not semantic-flex-keywords-obarray)
+      (setq semantic-flex-keywords-obarray [ nil ]))
+  (let ((ts nil)
+        (pos (point))
+        (ep nil)
+        (curdepth 0)
+        (cs (if comment-start-skip
+                (concat "\\(\\s<\\|" comment-start-skip "\\)")
+              (concat "\\(\\s<\\)")))
+        (newsyntax (copy-syntax-table (syntax-table)))
+        (mods semantic-flex-syntax-modifications)
+        ;; Use the default depth if it is not specified.
+        (depth (or depth semantic-flex-depth)))
+    ;; Update the syntax table
+    (while mods
+      (modify-syntax-entry (car (car mods)) (car (cdr (car mods))) newsyntax)
+      (setq mods (cdr mods)))
+    (with-syntax-table newsyntax
+      (goto-char start)
+      (while (and (< (point) end) (or (not length) (<= (length ts) length)))
+        (cond
+         ;; catch beginning of lines when needed.
+         ;; Must be done before catching any other tokens!
+         ((and semantic-flex-enable-bol
+               (bolp)
+               ;; Just insert a (bol N . N) token in the token stream,
+               ;; without moving the point.  N is the point at the
+               ;; beginning of line.
+               (setq ts (cons (cons 'bol (cons (point) (point))) ts))
+               nil)) ;; CONTINUE
+         ;; special extensions, includes whitespace, nl, etc.
+         ((and semantic-flex-extensions
+               (let ((fe semantic-flex-extensions)
+                     (r nil))
+                 (while fe
+                   (if (looking-at (car (car fe)))
+                       (setq ts (cons (funcall (cdr (car fe))) ts)
+                             r t
+                             fe nil
+                             ep (point)))
+                   (setq fe (cdr fe)))
+                 (if (and r (not (car ts))) (setq ts (cdr ts)))
+                 r)))
+         ;; catch newlines when needed
+         ((looking-at "\\s-*\\(\n\\|\\s>\\)")
+          (if semantic-flex-enable-newlines
+              (setq ep (match-end 1)
+                    ts (cons (cons 'newline
+                                   (cons (match-beginning 1) ep))
+                             ts))))
+         ;; catch whitespace when needed
+         ((looking-at "\\s-+")
+          (if semantic-flex-enable-whitespace
+              ;; Language wants whitespaces, link them together.
+              (if (eq (car (car ts)) 'whitespace)
+                  (setcdr (cdr (car ts)) (match-end 0))
+                (setq ts (cons (cons 'whitespace
+                                     (cons (match-beginning 0)
+                                           (match-end 0)))
+                               ts)))))
+         ;; numbers
+         ((and semantic-number-expression
+               (looking-at semantic-number-expression))
+          (setq ts (cons (cons 'number
+                               (cons (match-beginning 0)
+                                     (match-end 0)))
+                         ts)))
+         ;; symbols
+         ((looking-at "\\(\\sw\\|\\s_\\)+")
+          (setq ts (cons (cons
+                          ;; Get info on if this is a keyword or not
+                          (or (semantic-flex-keyword-p (match-string 0))
+                              'symbol)
+                          (cons (match-beginning 0) (match-end 0)))
+                         ts)))
+         ;; Character quoting characters (ie, \n as newline)
+         ((looking-at "\\s\\+")
+          (setq ts (cons (cons 'charquote
+                               (cons (match-beginning 0) (match-end 0)))
+                         ts)))
+         ;; Open parens, or semantic-lists.
+         ((looking-at "\\s(")
+          (if (or (not depth) (< curdepth depth))
+              (progn
+                (setq curdepth (1+ curdepth))
+                (setq ts (cons (cons 'open-paren
+                                     (cons (match-beginning 0) (match-end 0)))
+                               ts)))
+            (setq ts (cons
+                      (cons 'semantic-list
+                            (cons (match-beginning 0)
+                                  (save-excursion
+                                    (condition-case nil
+                                        (forward-list 1)
+                                      ;; This case makes flex robust
+                                      ;; to broken lists.
+                                      (error
+                                       (goto-char
+                                        (funcall
+                                         semantic-flex-unterminated-syntax-end-function
+                                         'semantic-list
+                                         start end))))
+                                    (setq ep (point)))))
+                      ts))))
+         ;; Close parens
+         ((looking-at "\\s)")
+          (setq ts (cons (cons 'close-paren
+                               (cons (match-beginning 0) (match-end 0)))
+                         ts))
+          (setq curdepth (1- curdepth)))
+         ;; String initiators
+         ((looking-at "\\s\"")
+          ;; Zing to the end of this string.
+          (setq ts (cons (cons 'string
+                               (cons (match-beginning 0)
+                                     (save-excursion
+                                       (condition-case nil
+                                           (forward-sexp 1)
+                                         ;; This case makes flex
+                                         ;; robust to broken strings.
+                                         (error
+                                          (goto-char
+                                           (funcall
+                                            semantic-flex-unterminated-syntax-end-function
+                                            'string
+                                            start end))))
+                                       (setq ep (point)))))
+                         ts)))
+         ;; comments
+         ((looking-at cs)
+          (if (and semantic-ignore-comments
+                   (not semantic-flex-enable-whitespace))
+              ;; If the language doesn't deal with comments nor
+              ;; whitespaces, ignore them here.
+              (let ((comment-start-point (point)))
+                (forward-comment 1)
+                (if (eq (point) comment-start-point)
+                    ;; In this case our start-skip string failed
+                    ;; to work properly.  Lets try and move over
+                    ;; whatever white space we matched to begin
+                    ;; with.
+                    (skip-syntax-forward "-.'"
+                                         (save-excursion
+                                           (end-of-line)
+                                           (point)))
+                  ;;(forward-comment 1)
+                  ;; Generate newline token if enabled
+                  (if (and semantic-flex-enable-newlines
+                           (bolp))
+                      (backward-char 1)))
+                (if (eq (point) comment-start-point)
+                    (error "Strange comment syntax prevents lexical analysis"))
+                (setq ep (point)))
+            (let ((tk (if semantic-ignore-comments 'whitespace 'comment)))
+              (save-excursion
+                (forward-comment 1)
+                ;; Generate newline token if enabled
+                (if (and semantic-flex-enable-newlines
+                         (bolp))
+                    (backward-char 1))
+                (setq ep (point)))
+              ;; Language wants comments or want them as whitespaces,
+              ;; link them together.
+              (if (eq (car (car ts)) tk)
+                  (setcdr (cdr (car ts)) ep)
+                (setq ts (cons (cons tk (cons (match-beginning 0) ep))
+                               ts))))))
+         ;; punctuation
+         ((looking-at "\\(\\s.\\|\\s$\\|\\s'\\)")
+          (setq ts (cons (cons 'punctuation
+                               (cons (match-beginning 0) (match-end 0)))
+                         ts)))
+         ;; unknown token
+         (t
+          (error "What is that?")))
+        (goto-char (or ep (match-end 0)))
+        (setq ep nil)))
+    ;; maybe catch the last beginning of line when needed
+    (and semantic-flex-enable-bol
+         (= (point) end)
+         (bolp)
+         (setq ts (cons (cons 'bol (cons (point) (point))) ts)))
+    (goto-char pos)
+    ;;(message "Flexing muscles...done")
+    (nreverse ts)))
+
+(provide 'semantic-lex)
+
+;;; semantic-lex.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-load.el b/site/cedet-1.0pre7/semantic/semantic-load.el
new file mode 100644
index 0000000..075192a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-load.el
@@ -0,0 +1,244 @@
+;;; semantic-load.el --- Autoload definitions for Semantic
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-load.el,v 1.71 2010/02/05 02:57:28 zappo Exp $
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize semantic for all supported conditions.
+
+;;; Code:
+;;
+
+(require 'semantic-fw)
+
+;;; Add parser and doc directories
+;;
+(let ((dir (file-name-directory (locate-library "semantic"))))
+  (add-to-list 'load-path (expand-file-name "bovine" dir))
+  (add-to-list 'load-path (expand-file-name "wisent" dir))
+  (add-to-list 'load-path (expand-file-name "symref" dir))
+  (add-to-list 'load-path (expand-file-name "ctags" dir))
+  (add-to-list 'Info-default-directory-list (expand-file-name "doc" dir))
+  )
+
+;;; Some speedbar major modes
+(eval-after-load "speedbar"
+  '(progn
+     (require 'semantic-ia-sb)))
+
+;;; Useful predefined setup
+;;
+(defvar semantic-load-imenu-string "TAGS"
+  "String used in `semantic-load' startup for the Imenu menu item.")
+
+(defvar semantic-load-turn-everything-on nil
+  "Non-nil means turn on all features in the semantic package.")
+
+(defvar semantic-load-turn-useful-things-on nil
+  "Non-nil means turn on all `useful' features.
+Sadly `useful' here means things Eric wants on as opposed to some
+other criteria.")
+
+(defvar semantic-load-system-cache-loaded nil
+  "Non nil when the system caches have been loaded.
+Prevent this load system from loading files in twice.")
+
+(defun semantic-load-enable-minimum-features ()
+  "Enable the minimum number of semantic features for basic usage.
+This includes:
+ `semantic-idle-scheduler-mode' - Keeps a buffer's parse tree up to date.
+ `semanticdb-minor-mode' - Stores tags when a buffer is not in memory.
+ `semanticdb-load-ebrowse-caches' - Loads any ebrowse dbs created earlier."
+  (interactive)
+
+  (global-semantic-idle-scheduler-mode 1)
+
+  (global-semanticdb-minor-mode 1)
+
+  ;; @todo - Enable this
+  ;; (semanticdb-cleanup-cache-files t)
+
+  ;; Don't do the loads from semantic-load twice.
+  (when (null semantic-load-system-cache-loaded)
+
+    ;; This loads any created system databases which get linked into
+    ;; any searches performed.
+    (setq semantic-load-system-cache-loaded t)
+
+    ;; This loads any created ebrowse databases which get linked into
+    ;; any searches performed.
+    (when (and (not (featurep 'xemacs))
+	       (boundp 'semanticdb-default-system-save-directory)
+	       (stringp semanticdb-default-system-save-directory)
+	       (file-exists-p semanticdb-default-system-save-directory))
+      (semanticdb-load-ebrowse-caches))
+    )
+  )
+
+(defun semantic-load-enable-code-helpers ()
+  "Enable some semantic features that provide basic coding assistance.
+This includes `semantic-load-enable-minimum-features' plus:
+  `imenu' - Lists Semantic generated tags in the menubar.
+  `semantic-idle-summary-mode' - Show a summary for the tag indicated by
+                                 code under point.  (intellisense)
+  `senator-minor-mode' - Semantic Navigator, and global menu for all
+                         features Semantic.
+  `semantic-mru-bookmark-mode' - Provides a `switch-to-buffer' like
+                       keybinding for tag names.
+
+This also sets `semantic-idle-work-update-headers-flag' to t to
+pre-build your database of header files in idle time for features
+such as idle summary mode."
+  (interactive)
+
+  (semantic-load-enable-minimum-features)
+
+  ;; This enables parsing of header files.
+  (setq semantic-idle-work-update-headers-flag t)
+
+  (when (and (eq window-system 'x)
+	     (locate-library "imenu"))
+    (add-hook 'semantic-init-hook (lambda ()
+				    (condition-case nil
+					(imenu-add-to-menubar
+					 semantic-load-imenu-string)
+				      (error nil)))))
+
+  (global-semantic-idle-summary-mode 1)
+
+  (global-semantic-mru-bookmark-mode 1)
+
+  ;; Do this last.  This allows other minor modes to get loaded
+  ;; in so they appear in the menu properly.
+  (global-senator-minor-mode 1)
+
+  )
+
+(defun semantic-load-enable-gaudy-code-helpers ()
+  "Enable semantic features that provide gaudy coding assistance.
+This includes `semantic-load-enable-code-helpers'.
+  `semantic-stickyfunc-mode' - Tracks current function in header-line
+                               (when available).
+  `semantic-decoration-mode' - Decorate tags based on various attributes.
+  `semantic-decoration-on-includes' - Decoration style for include files.
+  `semantic-idle-completions-mode' - Provide smart symbol completion
+                                 automatically at idle time.
+
+This also sets `semantic-idle-work-parse-neighboring-files-flag' to t
+to pre-build your databases in idle time."
+  (interactive)
+
+  (semantic-load-enable-code-helpers)
+
+  (global-semantic-decoration-mode 1)
+  (require 'semantic-decorate-include)
+
+  (when (boundp 'header-line-format)
+    (global-semantic-stickyfunc-mode 1))
+
+  (condition-case nil
+      (progn
+	(global-semantic-idle-completions-mode 1)
+	;; Enable preparsing many neighboring files.
+	(setq semantic-idle-work-parse-neighboring-files-flag t)
+	)
+    (error nil))
+  )
+
+(semantic-alias-obsolete 'semantic-load-enable-guady-code-helpers
+                         'semantic-load-enable-gaudy-code-helpers)
+
+(defun semantic-load-enable-excessive-code-helpers ()
+  "Enable all semantic features that provide coding assistance.
+This includes all features of `semantic-load-enable-gaudy-code-helpers' plus:
+  `semantic-highlight-func-mode' - Highlight the current tag.
+  `semantic-idle-tag-highlight-mode' - Highlight the tag for symbol at pt.
+  `semantic-decoration-on-*-members' - Two decoration modes that
+                    color the background of private and protected methods.
+  `which-func-mode' - Display the current function in the mode line."
+  (interactive)
+
+  (semantic-load-enable-gaudy-code-helpers)
+
+  (global-semantic-highlight-func-mode 1)
+
+  (global-semantic-idle-tag-highlight-mode 1)
+
+  (semantic-toggle-decoration-style "semantic-decoration-on-private-members" t)
+  (semantic-toggle-decoration-style "semantic-decoration-on-protected-members" t)
+
+  (if (fboundp #'which-func-mode)
+      (add-hook 'semantic-init-hook (lambda ()
+				      (which-func-mode 1))))
+  )
+
+(defun semantic-load-enable-semantic-debugging-helpers ()
+  "Enable all semantic features that assist with debugging semantic.
+It does not include `semantic-load-enable-minimum-features'.
+These modes include:
+  `semantic-highlight-edits-mode' - Highlight text that has been edited
+                            since the last parse step.
+  `semantic-show-unmatched-syntax-mode' - Highlight lexical tokens which
+                            failed to be parsed.
+  `semantic-show-parser-state-mode' - Show the current buffer state via
+                            small indicators in the mode line."
+  (interactive)
+
+  (global-semantic-highlight-edits-mode 1)
+
+  ;; This ought to be a code helper, but it is still
+  ;; a bit on the lame side.  Opinions?
+  (global-semantic-show-unmatched-syntax-mode 1)
+
+  (global-semantic-show-parser-state-mode 1)
+
+  ;; This enables debug output from the incremental parser.
+  ;; Perhaps a mode for that dumps stuff in a `messages' like buffer
+  ;; would be better?
+  (setq semantic-edits-verbose-flag t)
+
+  )
+
+;;;###autoload
+(defun semantic-load-enable-all-exuberent-ctags-support ()
+  "Enable all exuberent ctags extensions.
+See the functions:
+   `semantic-load-enable-primary-exuberent-ctags-support'
+   `semantic-load-enable-secondary-exuberent-ctags-support'
+If you just want to add new languages, use
+   `semantic-load-enable-primary-exuberent-ctags-support'."
+  (interactive)
+  (semantic-load-enable-primary-exuberent-ctags-support)
+  (semantic-load-enable-secondary-exuberent-ctags-support)
+  )
+
+;; Old style variables.  Use only if we are not in batch mode.
+(when (not noninteractive)
+  (cond
+   (semantic-load-turn-everything-on
+    (semantic-load-enable-excessive-code-helpers))
+   (semantic-load-turn-useful-things-on
+    (semantic-load-enable-code-helpers))
+   ))
+
+(provide 'semantic-load)
+
+;;; semantic-load.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-loaddefs.el b/site/cedet-1.0pre7/semantic/semantic-loaddefs.el
new file mode 100644
index 0000000..747c943
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-loaddefs.el
@@ -0,0 +1,4027 @@
+;;; semantic-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (bison->wisent) "bison-wisent" "wisent/bison-wisent.el"
+;;;;;;  (17213 40596))
+;;; Generated autoloads from wisent/bison-wisent.el
+
+(autoload 'bison->wisent "bison-wisent" "\
+Treat the current buffer as a YACC or BISON file, and translate to wisent.
+Replaces all comments with wisent compatible comments.
+Finds % commands that wisent cannot handle, and comments them out.
+Deletes all actions, replacing them with small comments.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-bovine-debug-create-frame) "bovine-debug"
+;;;;;;  "bovine/bovine-debug.el" (19122 48399))
+;;; Generated autoloads from bovine/bovine-debug.el
+
+(autoload 'semantic-bovine-debug-create-frame "bovine-debug" "\
+Create one bovine frame.
+NONTERM is the name of a rule we are currently parsing.
+RULE is the index into the list of rules in NONTERM.
+MATCH is the index into the list of matches in RULE.
+For example:
+  this: that
+      | other thing
+      | here
+      ;
+The NONTERM is THIS.
+The RULE is for \"thing\" is 1.
+The MATCH for \"thing\" is 1.
+COLLECTION is a list of `things' that have been matched so far.
+LEXTOKEN, is a token returned by the lexer which is being matched.
+
+\(fn NONTERM RULE MATCH COLLECTION LEXTOKEN)" nil nil)
+
+(eieio-defclass-autoload 'semantic-bovine-debug-parser '(semantic-debug-parser) "bovine-debug" "Represents a parser and its state.")
+
+;;;***
+
+;;;### (autoloads (bovine-grammar-mode) "bovine-grammar" "bovine/bovine-grammar.el"
+;;;;;;  (18791 59610))
+;;; Generated autoloads from bovine/bovine-grammar.el
+
+(autoload 'bovine-grammar-mode "bovine-grammar" "\
+Major mode for editing Bovine grammars.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.by$" . bovine-grammar-mode))
+
+(eval-after-load "speedbar" '(speedbar-add-supported-extension ".by"))
+
+;;;***
+
+;;;### (autoloads (semantic-bovinate-toplevel semantic-refresh-tags-safe
+;;;;;;  semantic-fetch-tags semantic-parse-region-default) "semantic"
+;;;;;;  "semantic.el" (19137 27664))
+;;; Generated autoloads from semantic.el
+
+(autoload 'semantic-parse-region-default "semantic" "\
+Parse the area between START and END, and return any tags found.
+If END needs to be extended due to a lexical token being too large, it
+will be silently ignored.
+Optional arguments:
+NONTERMINAL is the rule to start parsing at if it is known.
+DEPTH specifies the lexical depth to scan.
+RETURNONERROR specifies that parsing should end when encountering
+unterminated syntax.
+
+\(fn START END &optional NONTERMINAL DEPTH RETURNONERROR)" nil nil)
+
+(autoload 'semantic-fetch-tags "semantic" "\
+Fetch semantic tags from the current buffer.
+If the buffer cache is up to date, return that.
+If the buffer cache is out of date, attempt an incremental reparse.
+If the buffer has not been parsed before, or if the incremental reparse
+fails, then parse the entire buffer.
+If a lexcial error had been previously discovered and the buffer
+was marked unparseable, then do nothing, and return the cache.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-refresh-tags-safe "semantic" "\
+Refreshes the current buffer's tags safely.
+
+Return non-nil if the refresh was successful.
+Return nil if there is some sort of syntax error preventing a reparse.
+
+Does nothing if the current buffer doesn't need reparsing.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-bovinate-toplevel "semantic" "\
+Backward Compatibility Function.
+
+\(fn &optional IGNORED)" nil nil)
+
+(make-obsolete 'semantic-bovinate-toplevel 'semantic-fetch-tags)
+
+(defsubst semantic-fetch-available-tags nil "\
+Fetch available semantic tags from the current buffer.
+That is, return tags currently in the cache without parsing the
+current buffer.
+Parse operations happen asynchronously when needed on Emacs idle time.
+Use the `semantic-after-toplevel-cache-change-hook' and
+`semantic-after-partial-cache-change-hook' hooks to synchronize with
+new tags when they become available." semantic--buffer-cache)
+
+;;;***
+
+;;;### (autoloads (semanticdb-debug-file-tag-check semantic-adebug-searchdb
+;;;;;;  semantic-adebug-bovinate data-debug-insert-db-and-tag-button
+;;;;;;  data-debug-insert-find-results-button data-debug-insert-find-results
+;;;;;;  data-debug-insert-tag-list-button data-debug-insert-tag-list
+;;;;;;  data-debug-insert-tag data-debug-insert-tag-parts-from-point)
+;;;;;;  "semantic-adebug" "semantic-adebug.el" (19122 48399))
+;;; Generated autoloads from semantic-adebug.el
+
+(autoload 'data-debug-insert-tag-parts-from-point "semantic-adebug" "\
+Call `data-debug-insert-tag-parts' based on text properties at POINT.
+
+\(fn POINT)" nil nil)
+
+(autoload 'data-debug-insert-tag "semantic-adebug" "\
+Insert TAG into the current buffer at the current point.
+PREFIX specifies text to insert in front of TAG.
+PREBUTTONTEXT is text appearing btewen the prefix and TAG.
+Optional PARENT is the parent tag containing TAG.
+Add text properties needed to allow tag expansion later.
+
+\(fn TAG PREFIX PREBUTTONTEXT &optional PARENT)" nil nil)
+
+(autoload 'data-debug-insert-tag-list "semantic-adebug" "\
+Insert the tag list TAGLIST with PREFIX.
+Optional argument PARENT specifies the part of TAGLIST.
+
+\(fn TAGLIST PREFIX &optional PARENT)" nil nil)
+
+(autoload 'data-debug-insert-tag-list-button "semantic-adebug" "\
+Insert a single summary of a TAGLIST.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between PREFIX and the taglist button.
+PARENT is the tag that represents the parent of all the tags.
+
+\(fn TAGLIST PREFIX PREBUTTONTEXT &optional PARENT)" nil nil)
+
+(autoload 'data-debug-insert-find-results "semantic-adebug" "\
+Insert the find results FINDRES with PREFIX.
+
+\(fn FINDRES PREFIX)" nil nil)
+
+(autoload 'data-debug-insert-find-results-button "semantic-adebug" "\
+Insert a single summary of a find results FINDRES.
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the find results button.
+
+\(fn FINDRES PREFIX PREBUTTONTEXT)" nil nil)
+
+(autoload 'data-debug-insert-db-and-tag-button "semantic-adebug" "\
+Insert a single summary of short list DBTAG of format (DB . TAG).
+PREFIX is the text that preceeds the button.
+PREBUTTONTEXT is some text between prefix and the find results button.
+
+\(fn DBTAG PREFIX PREBUTTONTEXT)" nil nil)
+
+(autoload 'semantic-adebug-bovinate "semantic-adebug" "\
+The same as `bovinate'.  Display the results in a debug buffer.
+
+\(fn)" t nil)
+
+(autoload 'semantic-adebug-searchdb "semantic-adebug" "\
+Search the semanticdb for REGEX for the current buffer.
+Display the results as a debug list.
+
+\(fn REGEX)" t nil)
+
+(autoload 'semanticdb-debug-file-tag-check "semantic-adebug" "\
+Report debug info for checking STARTFILE for up-to-date tags.
+
+\(fn STARTFILE)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-adebug-analyze semantic-analyze-current-context
+;;;;;;  semantic-analyze-current-symbol) "semantic-analyze" "semantic-analyze.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semantic-analyze.el
+
+(autoload 'semantic-analyze-current-symbol "semantic-analyze" "\
+Call ANALYZEHOOKFCN after analyzing the symbol under POSITION.
+The ANALYZEHOOKFCN is called with the current symbol bounds, and the
+analyzed prefix.  It should take the arguments (START END PREFIX).
+The ANALYZEHOOKFCN is only called if some sort of prefix with bounds was
+found under POSITION.
+
+The results of ANALYZEHOOKFCN is returned, or nil if there was nothing to
+call it with.
+
+For regular analysis, you should call `semantic-analyze-current-context'
+to calculate the context information.  The purpose for this function is
+to provide a large number of non-cached analysis for filtering symbols.
+
+\(fn ANALYZEHOOKFCN &optional POSITION)" nil nil)
+
+(autoload 'semantic-analyze-current-context "semantic-analyze" "\
+Analyze the current context at optional POSITION.
+If called interactively, display interesting information about POSITION
+in a separate buffer.
+Returns an object based on symbol `semantic-analyze-context'.
+
+This function can be overriden with the symbol `analyze-context'.
+When overriding this function, your override will be called while
+cursor is at POSITION.  In addition, your function will not be called
+if a cached copy of the return object is found.
+
+\(fn &optional POSITION)" t nil)
+
+(autoload 'semantic-adebug-analyze "semantic-analyze" "\
+Perform `semantic-analyze-current-context'.
+Display the results as a debug list.
+Optional argument CTXT is the context to show.
+
+\(fn &optional CTXT)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-analyze-possible-completions semantic-analyze-tags-of-class-list
+;;;;;;  semantic-analyze-type-constants) "semantic-analyze-complete"
+;;;;;;  "semantic-analyze-complete.el" (19122 48399))
+;;; Generated autoloads from semantic-analyze-complete.el
+
+(autoload 'semantic-analyze-type-constants "semantic-analyze-complete" "\
+For the tag TYPE, return any constant symbols of TYPE.
+Used as options when completing.
+
+\(fn TYPE)" nil nil)
+
+(autoload 'semantic-analyze-tags-of-class-list "semantic-analyze-complete" "\
+Return the tags in TAGS that are of classes in CLASSLIST.
+
+\(fn TAGS CLASSLIST)" nil nil)
+
+(autoload 'semantic-analyze-possible-completions "semantic-analyze-complete" "\
+Return a list of semantic tags which are possible completions.
+CONTEXT is either a position (such as point), or a precalculated
+context.  Passing in a context is useful if the caller also needs
+to access parts of the analysis.
+Completions run through the following filters:
+  * Elements currently in scope
+  * Constants currently in scope
+  * Elements match the :prefix in the CONTEXT.
+  * Type of the completion matches the type of the context.
+Context type matching can identify the following:
+  * No specific type
+  * Assignment into a variable of some type.
+  * Argument to a function with type constraints.
+When called interactively, displays the list of possible completions
+in a buffer.
+
+\(fn CONTEXT)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-analyze-debug-assist) "semantic-analyze-debug"
+;;;;;;  "semantic-analyze-debug.el" (19122 48399))
+;;; Generated autoloads from semantic-analyze-debug.el
+
+(autoload 'semantic-analyze-debug-assist "semantic-analyze-debug" "\
+Debug semantic analysis at the current point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-analyze-proto-impl-toggle semantic-analyze-current-tag
+;;;;;;  semantic-analyze-tag-references) "semantic-analyze-refs"
+;;;;;;  "semantic-analyze-refs.el" (19122 48399))
+;;; Generated autoloads from semantic-analyze-refs.el
+
+(autoload 'semantic-analyze-tag-references "semantic-analyze-refs" "\
+Analyze the references for TAG.
+Returns a class with information about TAG.
+
+Optional argument DB is a database.  It will be used to help
+locate TAG.
+
+Use `semantic-analyze-current-tag' to debug this fcn.
+
+\(fn TAG &optional DB)" nil nil)
+
+(autoload 'semantic-analyze-current-tag "semantic-analyze-refs" "\
+Analyze the tag under point.
+
+\(fn)" t nil)
+
+(autoload 'semantic-analyze-proto-impl-toggle "semantic-analyze-refs" "\
+Toggle between the implementation, and a prototype of tag under point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-bovinate-stream semantic-lambda) "semantic-bovine"
+;;;;;;  "bovine/semantic-bovine.el" (19122 48399))
+;;; Generated autoloads from bovine/semantic-bovine.el
+
+(defvar semantic-bovinate-nonterminal-check-obarray nil "\
+Obarray of streams already parsed for nonterminal symbols.
+Use this to detect infinite recursion during a parse.")
+
+(autoload 'semantic-lambda "semantic-bovine" "\
+Create a lambda expression to return a list including RETURN-VAL.
+The return list is a lambda expression to be used in a bovine table.
+
+\(fn &rest RETURN-VAL)" nil (quote macro))
+
+(autoload 'semantic-bovinate-stream "semantic-bovine" "\
+Bovinate STREAM, starting at the first NONTERMINAL rule.
+Use `bovine-toplevel' if NONTERMINAL is not provided.
+This is the core routine for converting a stream into a table.
+Return the list (STREAM SEMANTIC-STREAM) where STREAM are those
+elements of STREAM that have not been used.  SEMANTIC-STREAM is the
+list of semantic tokens found.
+
+\(fn STREAM &optional NONTERMINAL)" nil nil)
+
+(defalias 'semantic-parse-stream-default 'semantic-bovinate-stream)
+
+;;;***
+
+;;;### (autoloads (semantic-c-add-preprocessor-symbol semantic-default-c-setup
+;;;;;;  semantic-c-member-of-autocast semantic-lex-c-preprocessor-symbol-file
+;;;;;;  semantic-lex-c-preprocessor-symbol-map) "semantic-c" "bovine/semantic-c.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from bovine/semantic-c.el
+
+(defvar semantic-lex-c-preprocessor-symbol-map nil "\
+Table of C Preprocessor keywords used by the Semantic C lexer.
+Each entry is a cons cell like this:
+  ( \"KEYWORD\" . \"REPLACEMENT\" )
+Where KEYWORD is the macro that gets replaced in the lexical phase,
+and REPLACEMENT is a string that is inserted in its place.  Empty string
+implies that the lexical analyzer will discard KEYWORD when it is encountered.
+
+Alternately, it can be of the form:
+  ( \"KEYWORD\" ( LEXSYM1 \"str\" 1 1 ) ... ( LEXSYMN \"str\" 1 1 ) )
+where LEXSYM is a symbol that would normally be produced by the
+lexical analyzer, such as `symbol' or `string'.  The string in the
+second position is the text that makes up the replacement.  This is
+the way to have multiple lexical symbols in a replacement.  Using the
+first way to specify text like \"foo::bar\" would not work, because :
+is a sepearate lexical symbol.
+
+A quick way to see what you would need to insert is to place a
+definition such as:
+
+#define MYSYM foo::bar
+
+into a C file, and do this:
+  \\[semantic-lex-spp-describe]
+
+The output table will describe the symbols needed.")
+
+(custom-autoload 'semantic-lex-c-preprocessor-symbol-map "semantic-c" nil)
+
+(defvar semantic-lex-c-preprocessor-symbol-file nil "\
+List of C/C++ files that contain preprocessor macros for the C lexer.
+Each entry is a filename and each file is parsed, and those macros
+are included in every C/C++ file parsed by semantic.
+You can use this variable instead of `semantic-lex-c-preprocessor-symbol-map'
+to store your global macros in a more natural way.")
+
+(custom-autoload 'semantic-lex-c-preprocessor-symbol-file "semantic-c" nil)
+
+(defvar semantic-c-member-of-autocast 't "\
+Non-nil means classes with a '->' operator will cast to it's return type.
+
+For Examples:
+
+  class Foo {
+    Bar *operator->();
+  }
+
+  Foo foo;
+
+if `semantic-c-member-of-autocast' is non-nil :
+  foo->[here completion will list method of Bar]
+
+if `semantic-c-member-of-autocast' is nil :
+  foo->[here completion will list method of Foo]")
+
+(custom-autoload 'semantic-c-member-of-autocast "semantic-c" t)
+
+(autoload 'semantic-default-c-setup "semantic-c" "\
+Set up a buffer for semantic parsing of the C language.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-c-add-preprocessor-symbol "semantic-c" "\
+Add a preprocessor symbol SYM with a REPLACEMENT value.
+
+\(fn SYM REPLACEMENT)" t nil)
+
+(add-hook 'c-mode-hook 'semantic-default-c-setup)
+
+(add-hook 'c++-mode-hook 'semantic-default-c-setup)
+
+;;;***
+
+;;;### (autoloads (semantic-chart-analyzer semantic-chart-tag-complexity
+;;;;;;  semantic-chart-database-size semantic-chart-tags-by-class)
+;;;;;;  "semantic-chart" "semantic-chart.el" (19122 48399))
+;;; Generated autoloads from semantic-chart.el
+
+(autoload 'semantic-chart-tags-by-class "semantic-chart" "\
+Create a bar chart representing the number of tags for a given tag class.
+Each bar represents how many toplevel tags in TAGTABLE
+exist with a given class.  See `semantic-symbol->name-assoc-list'
+for tokens which will be charted.
+TAGTABLE is passedto `semantic-something-to-tag-table'.
+
+\(fn &optional TAGTABLE)" t nil)
+
+(autoload 'semantic-chart-database-size "semantic-chart" "\
+Create a bar chart representing the size of each file in semanticdb.
+Each bar represents how many toplevel tags in TAGTABLE
+exist in each database entry.
+TAGTABLE is passed to `semantic-something-to-tag-table'.
+
+\(fn &optional TAGTABLE)" t nil)
+
+(autoload 'semantic-chart-tag-complexity "semantic-chart" "\
+Create a bar chart representing the complexity of some tags.
+Complexity is calculated for tags of CLASS.  Each bar represents
+the complexity of some tag in TAGTABLE.  Only the most complex
+items are charted.  TAGTABLE is passedto
+`semantic-something-to-tag-table'.
+
+\(fn &optional CLASS TAGTABLE)" t nil)
+
+(autoload 'semantic-chart-analyzer "semantic-chart" "\
+Chart the extent of the context analysis.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-complete-self-insert semantic-complete-analyze-inline-idle
+;;;;;;  semantic-complete-analyze-inline semantic-complete-analyze-and-replace
+;;;;;;  semantic-complete-jump semantic-complete-jump-local semantic-complete-inline-analyzer-idle
+;;;;;;  semantic-complete-inline-analyzer semantic-complete-read-tag-analyzer
+;;;;;;  semantic-complete-inline-tag-project semantic-complete-read-tag-project
+;;;;;;  semantic-complete-read-tag-buffer-deep semantic-complete-inline-force-display
+;;;;;;  semantic-complete-read-tag-engine semantic-completion-inline-active-p)
+;;;;;;  "semantic-complete" "semantic-complete.el" (19326 59186))
+;;; Generated autoloads from semantic-complete.el
+
+(autoload 'semantic-completion-inline-active-p "semantic-complete" "\
+Non-nil if inline completion is active.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-complete-read-tag-engine "semantic-complete" "\
+Read a semantic tag, and return a tag for the selection.
+Argument COLLECTOR is an object which can be used to to calculate
+a list of possible hits.  See `semantic-completion-collector-engine'
+for details on COLLECTOR.
+Argument DISPLAYOR is an object used to display a list of possible
+completions for a given prefix.  See`semantic-completion-display-engine'
+for details on DISPLAYOR.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to story the history in.
+
+\(fn COLLECTOR DISPLAYOR PROMPT DEFAULT-TAG INITIAL-INPUT HISTORY)" nil nil)
+
+(autoload 'semantic-complete-inline-force-display "semantic-complete" "\
+Force the display of whatever the current completions are.
+DO NOT CALL THIS IF THE INLINE COMPLETION ENGINE IS NOT ACTIVE.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-complete-read-tag-buffer-deep "semantic-complete" "\
+Ask for a tag by name from the current buffer.
+Available tags are from the current buffer, at any level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to store the history in.
+
+\(fn PROMPT &optional DEFAULT-TAG INITIAL-INPUT HISTORY)" nil nil)
+
+(autoload 'semantic-complete-read-tag-project "semantic-complete" "\
+Ask for a tag by name from the current project.
+Available tags are from the current project, at the top level.
+Completion options are presented in a traditional way, with highlighting
+to resolve same-name collisions.
+PROMPT is a string to prompt with.
+DEFAULT-TAG is a semantic tag or string to use as the default value.
+If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
+HISTORY is a symbol representing a variable to store the history in.
+
+\(fn PROMPT &optional DEFAULT-TAG INITIAL-INPUT HISTORY)" nil nil)
+
+(autoload 'semantic-complete-inline-tag-project "semantic-complete" "\
+Complete a symbol name by name from within the current project.
+This is similar to `semantic-complete-read-tag-project', except
+that the completion interaction is in the buffer where the context
+was calculated from.
+Customize `semantic-complete-inline-analyzer-displayor-class'
+to control how completion options are displayed.
+See `semantic-complete-inline-tag-engine' for details on how
+completion works.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-complete-read-tag-analyzer "semantic-complete" "\
+Ask for a tag by name based on the current context.
+The function `semantic-analyze-current-context' is used to
+calculate the context.  `semantic-analyze-possible-completions' is used
+to generate the list of possible completions.
+PROMPT is the first part of the prompt.  Additional prompt
+is added based on the contexts full prefix.
+CONTEXT is the semantic analyzer context to start with.
+HISTORY is a symbol representing a variable to store the history in.
+usually a default-tag and initial-input are available for completion
+prompts.  these are calculated from the CONTEXT variable passed in.
+
+\(fn PROMPT &optional CONTEXT HISTORY)" nil nil)
+
+(autoload 'semantic-complete-inline-analyzer "semantic-complete" "\
+Complete a symbol name by name based on the current context.
+This is similar to `semantic-complete-read-tag-analyze', except
+that the completion interaction is in the buffer where the context
+was calculated from.
+CONTEXT is the semantic analyzer context to start with.
+Customize `semantic-complete-inline-analyzer-displayor-class'
+to control how completion options are displayed.
+
+See `semantic-complete-inline-tag-engine' for details on how
+completion works.
+
+\(fn CONTEXT)" nil nil)
+
+(autoload 'semantic-complete-inline-analyzer-idle "semantic-complete" "\
+Complete a symbol name by name based on the current context for idle time.
+CONTEXT is the semantic analyzer context to start with.
+This function is used from `semantic-idle-completions-mode'.
+
+This is the same as `semantic-complete-inline-analyzer', except that
+it uses `semantic-complete-inline-analyzer-idle-displayor-class'
+to control how completions are displayed.
+
+See `semantic-complete-inline-tag-engine' for details on how
+completion works.
+
+\(fn CONTEXT)" nil nil)
+
+(autoload 'semantic-complete-jump-local "semantic-complete" "\
+Jump to a semantic symbol.
+
+\(fn)" t nil)
+
+(autoload 'semantic-complete-jump "semantic-complete" "\
+Jump to a semantic symbol.
+
+\(fn)" t nil)
+
+(autoload 'semantic-complete-analyze-and-replace "semantic-complete" "\
+Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The minibuffer is used to perform the completion.
+The result is inserted as a replacement of the text that was there.
+
+\(fn)" t nil)
+
+(autoload 'semantic-complete-analyze-inline "semantic-complete" "\
+Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The function returns immediately, leaving the buffer in a mode that
+will perform the completion.
+Configure `semantic-complete-inline-analyzer-displayor-class' to change
+how completion options are displayed.
+
+\(fn)" t nil)
+
+(autoload 'semantic-complete-analyze-inline-idle "semantic-complete" "\
+Perform prompt completion to do in buffer completion.
+`semantic-analyze-possible-completions' is used to determine the
+possible values.
+The function returns immediately, leaving the buffer in a mode that
+will perform the completion.
+Configure `semantic-complete-inline-analyzer-idle-displayor-class'
+to change how completion options are displayed.
+
+\(fn)" t nil)
+
+(autoload 'semantic-complete-self-insert "semantic-complete" "\
+Like `self-insert-command', but does completion afterwards.
+ARG is passed to `self-insert-command'.  If ARG is nil,
+use `semantic-complete-analyze-inline' to complete.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "semantic-ctxt" "semantic-ctxt.el" (19122 48399))
+;;; Generated autoloads from semantic-ctxt.el
+
+(defvar semantic-command-separation-character ";" "\
+String which indicates the end of a command.
+Used for identifying the end of a single command.")
+
+;;;***
+
+;;;### (autoloads (semantic-tag-customize semantic-tag-widget-to-external
+;;;;;;  semantic-tag-widget-to-internal semantic-tag-widget-value-get
+;;;;;;  semantic-tag-widget-value-create semantic-tag-widget-match)
+;;;;;;  "semantic-custom" "semantic-custom.el" (18878 61311))
+;;; Generated autoloads from semantic-custom.el
+
+(define-widget 'tag-edit 'group "\
+Abstractly modify a Semantic Tag." :tag "Tag" :format "%v" :convert-widget (quote widget-types-convert-widget) :value-create (quote semantic-tag-widget-value-create) :value-get (quote semantic-tag-widget-value-get) :value-delete (quote widget-children-value-delete) :validate (quote widget-children-validate) :match (quote semantic-tag-widget-match) :clone-object-children nil)
+
+(autoload 'semantic-tag-widget-match "semantic-custom" "\
+Match infor for WIDGET against VALUE.
+
+\(fn WIDGET VALUE)" nil nil)
+
+(autoload 'semantic-tag-widget-value-create "semantic-custom" "\
+Create the value of WIDGET.
+
+\(fn WIDGET)" nil nil)
+
+(autoload 'semantic-tag-widget-value-get "semantic-custom" "\
+Get the value out of WIDGET.
+
+\(fn WIDGET)" nil nil)
+
+(define-widget 'tag 'tag-edit "\
+A Semantic Tag." :format "%{%t%}:
+%v" :value-to-internal (quote semantic-tag-widget-to-internal) :value-to-external (quote semantic-tag-widget-to-external) :close-object-children t)
+
+(autoload 'semantic-tag-widget-to-internal "semantic-custom" "\
+For WIDGET, convert VALUE to a safe representation.
+
+\(fn WIDGET VALUE)" nil nil)
+
+(autoload 'semantic-tag-widget-to-external "semantic-custom" "\
+For WIDGET, convert VALUE from the abstract value.
+
+\(fn WIDGET VALUE)" nil nil)
+
+(autoload 'semantic-tag-customize "semantic-custom" "\
+Customize TAG.
+When the user clicks 'ACCEPT', then the location where TAG
+is stored is directly modified.
+If TAG is not provided, then the tag under point is used.
+
+\(fn &optional TAG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-debug semantic-debug-break) "semantic-debug"
+;;;;;;  "semantic-debug.el" (19122 48399))
+;;; Generated autoloads from semantic-debug.el
+
+(defvar semantic-debug-parser-source nil "\
+For any buffer, the file name (no path) of the parser.
+This would be a parser for a specific language, not the source
+to one of the parser generators.")
+
+(make-variable-buffer-local 'semantic-debug-parser-source)
+
+(defvar semantic-debug-parser-class nil "\
+Class to create when building a debug parser object.")
+
+(make-variable-buffer-local 'semantic-debug-parser-class)
+
+(defvar semantic-debug-enabled nil "\
+Non-nil when debugging a parser.")
+
+(autoload 'semantic-debug-break "semantic-debug" "\
+Stop parsing now at FRAME.
+FRAME is an object that represents the parser's view of the
+current state of the world.
+This function enters a recursive edit.  It returns
+on an `exit-recursive-edit', or if someone uses one
+of the `semantic-debug-mode' commands.
+It returns the command specified.  Parsers need to take action
+on different types of return values.
+
+\(fn FRAME)" nil nil)
+
+(autoload 'semantic-debug "semantic-debug" "\
+Parse the current buffer and run in debug mode.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-tag-folded-p semantic-set-tag-folded
+;;;;;;  semantic-tag-delete-secondary-overlay semantic-tag-get-secondary-overlay
+;;;;;;  semantic-tag-create-secondary-overlay semantic-tag-secondary-overlays
+;;;;;;  semantic-tag-read-only-p semantic-set-tag-read-only semantic-tag-intangible-p
+;;;;;;  semantic-set-tag-intangible semantic-tag-invisible-p semantic-set-tag-invisible
+;;;;;;  semantic-set-tag-face semantic-momentary-highlight-tag semantic-momentary-highlight-one-tag-line
+;;;;;;  semantic-unhighlight-tag semantic-highlight-tag) "semantic-decorate"
+;;;;;;  "semantic-decorate.el" (19326 59187))
+;;; Generated autoloads from semantic-decorate.el
+
+(autoload 'semantic-highlight-tag "semantic-decorate" "\
+Specify that TAG should be highlighted.
+Optional FACE specifies the face to use.
+
+\(fn TAG &optional FACE)" nil nil)
+
+(autoload 'semantic-unhighlight-tag "semantic-decorate" "\
+Unhighlight TAG, restoring its previous face.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-momentary-highlight-one-tag-line "semantic-decorate" "\
+Highlight the first line of TAG, unhighlighting before next command.
+Optional argument FACE specifies the face to do the highlighting.
+
+\(fn TAG &optional FACE)" nil nil)
+
+(autoload 'semantic-momentary-highlight-tag "semantic-decorate" "\
+Highlight TAG, removing highlighting when the user hits a key.
+Optional argument FACE is the face to use for highlighting.
+If FACE is not specified, then `highlight' will be used.
+
+\(fn TAG &optional FACE)" nil nil)
+
+(autoload 'semantic-set-tag-face "semantic-decorate" "\
+Specify that TAG should use FACE for display.
+
+\(fn TAG FACE)" nil nil)
+
+(autoload 'semantic-set-tag-invisible "semantic-decorate" "\
+Enable the text in TAG to be made invisible.
+If VISIBLE is non-nil, make the text visible.
+
+\(fn TAG &optional VISIBLE)" nil nil)
+
+(autoload 'semantic-tag-invisible-p "semantic-decorate" "\
+Return non-nil if TAG is invisible.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-set-tag-intangible "semantic-decorate" "\
+Enable the text in TAG to be made intangible.
+If TANGIBLE is non-nil, make the text visible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist.
+
+\(fn TAG &optional TANGIBLE)" nil nil)
+
+(autoload 'semantic-tag-intangible-p "semantic-decorate" "\
+Return non-nil if TAG is intangible.
+This function does not have meaning in XEmacs because it seems that
+the extent 'intangible' property does not exist.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-set-tag-read-only "semantic-decorate" "\
+Enable the text in TAG to be made read-only.
+Optional argument WRITABLE should be non-nil to make the text writable
+instead of read-only.
+
+\(fn TAG &optional WRITABLE)" nil nil)
+
+(autoload 'semantic-tag-read-only-p "semantic-decorate" "\
+Return non-nil if the current TAG is marked read only.
+
+\(fn TAG)" nil nil)
+
+(semantic-alias-obsolete 'semantic-highlight-token 'semantic-highlight-tag)
+
+(semantic-alias-obsolete 'semantic-unhighlight-token 'semantic-unhighlight-tag)
+
+(semantic-alias-obsolete 'semantic-momentary-highlight-token 'semantic-momentary-highlight-tag)
+
+(semantic-alias-obsolete 'semantic-set-token-face 'semantic-set-tag-face)
+
+(semantic-alias-obsolete 'semantic-set-token-invisible 'semantic-set-tag-invisible)
+
+(semantic-alias-obsolete 'semantic-token-invisible-p 'semantic-tag-invisible-p)
+
+(semantic-alias-obsolete 'semantic-set-token-intangible 'semantic-set-tag-intangible)
+
+(semantic-alias-obsolete 'semantic-token-intangible-p 'semantic-tag-intangible-p)
+
+(semantic-alias-obsolete 'semantic-set-token-read-only 'semantic-set-tag-read-only)
+
+(semantic-alias-obsolete 'semantic-token-read-only-p 'semantic-tag-read-only-p)
+
+(autoload 'semantic-tag-secondary-overlays "semantic-decorate" "\
+Return a list of secondary overlays active on TAG.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-create-secondary-overlay "semantic-decorate" "\
+Create a secondary overlay for TAG.
+Returns an overlay.  The overlay is also saved in TAG.
+LINK-HOOK is a function called whenever TAG is to be linked into
+a buffer.  It should take TAG and OVERLAY as arguments.
+The LINK-HOOK should be used to position and set properties on the
+generated secondary overlay.
+
+\(fn TAG &optional LINK-HOOK)" nil nil)
+
+(autoload 'semantic-tag-get-secondary-overlay "semantic-decorate" "\
+Return secondary overlays from TAG with PROPERTY.
+PROPERTY is a symbol and all overlays with that symbol are returned..
+
+\(fn TAG PROPERTY)" nil nil)
+
+(autoload 'semantic-tag-delete-secondary-overlay "semantic-decorate" "\
+Delete from TAG the secondary overlay OVERLAY-OR-PROPERTY.
+If OVERLAY-OR-PROPERTY is an overlay, delete that overlay.
+If OVERLAY-OR-PROPERTY is a symbol, find the overlay with that property.
+
+\(fn TAG OVERLAY-OR-PROPERTY)" nil nil)
+
+(autoload 'semantic-set-tag-folded "semantic-decorate" "\
+Fold TAG, such that only the first line of text is shown.
+Optional argument FOLDED should be non-nil to fold the tag.
+nil implies the tag should be fully shown.
+
+\(fn TAG &optional FOLDED)" nil nil)
+
+(autoload 'semantic-tag-folded-p "semantic-decorate" "\
+Non-nil if TAG is currently folded.
+
+\(fn TAG)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-decoration-unparsed-include-do-reset
+;;;;;;  semantic-decoration-include-visit) "semantic-decorate-include"
+;;;;;;  "semantic-decorate-include.el" (19326 59186))
+;;; Generated autoloads from semantic-decorate-include.el
+
+(autoload 'semantic-decoration-include-visit "semantic-decorate-include" "\
+Visit the included file at point.
+
+\(fn)" t nil)
+
+(autoload 'semantic-decoration-unparsed-include-do-reset "semantic-decorate-include" "\
+Do a reset of unparsed includes in the current buffer.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-build-decoration-mode-menu semantic-decoration-mode
+;;;;;;  global-semantic-decoration-mode global-semantic-decoration-mode
+;;;;;;  semantic-decorate-flush-pending-decorations) "semantic-decorate-mode"
+;;;;;;  "semantic-decorate-mode.el" (19137 27664))
+;;; Generated autoloads from semantic-decorate-mode.el
+
+(autoload 'semantic-decorate-flush-pending-decorations "semantic-decorate-mode" "\
+Flush any pending decorations for BUFFER.
+Flush functions from `semantic-decorate-pending-decoration-hook'.
+
+\(fn &optional BUFFER)" nil nil)
+
+(defvar global-semantic-decoration-mode nil "\
+*If non-nil, enable global use of command `semantic-decoration-mode'.
+When this mode is activated, decorations specified by
+`semantic-decoration-styles'.")
+
+(custom-autoload 'global-semantic-decoration-mode "semantic-decorate-mode" nil)
+
+(autoload 'global-semantic-decoration-mode "semantic-decorate-mode" "\
+Toggle global use of option `semantic-decoration-mode'.
+Decoration mode turns on all active decorations as specified
+by `semantic-decoration-styles'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar semantic-decoration-mode nil "\
+Non-nil if command `semantic-decoration-mode' is enabled.
+Use the command `semantic-decoration-mode' to change this variable.")
+
+(autoload 'semantic-decoration-mode "semantic-decorate-mode" "\
+Minor mode for decorating tags.
+Decorations are specified in `semantic-decoration-styles'.
+You can define new decoration styles with
+`define-semantic-decoration-style'.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'semantic-build-decoration-mode-menu "semantic-decorate-mode" "\
+Create a menu listing all the known decorations for toggling.
+IGNORE any input arguments.
+
+\(fn &rest IGNORE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-dependency-find-file-on-path semantic-customize-system-include-path
+;;;;;;  semantic-reset-system-include semantic-remove-system-include
+;;;;;;  semantic-add-system-include defcustom-mode-local-semantic-dependency-system-include-path)
+;;;;;;  "semantic-dep" "semantic-dep.el" (19326 59187))
+;;; Generated autoloads from semantic-dep.el
+
+(defvar semantic-dependency-include-path nil "\
+Defines the include path used when searching for files.
+This should be a list of directories to search which is specific
+to the file being included.
+
+If `semantic-dependency-tag-file' is overridden for a given
+language, this path is most likely ignored.
+
+The above function, reguardless of being overriden, caches the
+located dependency file location in the tag property
+`dependency-file'.  If you override this function, you do not
+need to implement your own cache.  Each time the buffer is fully
+reparsed, the cache will be reset.
+
+TODO: use ffap.el to locate such items?
+
+NOTE: Obsolete this, or use as special user")
+
+(defvar semantic-dependency-system-include-path nil "\
+Defines the system include path.
+This should be set with either `defvar-mode-local', or with
+`semantic-add-system-include'.
+
+For mode authors, use
+`defcustom-mode-local-semantic-dependency-system-include-path'
+to create a mode-specific variable to control this.
+
+When searching for a file associated with a name found in an tag of
+class include, this path will be inspected for includes of type
+`system'.  Some include tags are agnostic to this setting and will
+check both the project and system directories.")
+
+(autoload 'defcustom-mode-local-semantic-dependency-system-include-path "semantic-dep" "\
+Create a mode-local value of the system-dependency include path.
+MODE is the `major-mode' this name/value pairs is for.
+NAME is the name of the customizable value users will use.
+VALUE is the path (a list of strings) to add.
+DOCSTRING is a documentation string applied to the variable NAME
+users will customize.
+
+Creates a customizable variable users can customize that will
+keep semantic data structures up to date.
+
+\(fn MODE NAME VALUE &optional DOCSTRING)" nil (quote macro))
+
+(autoload 'semantic-add-system-include "semantic-dep" "\
+Add a system include DIR to path for MODE.
+Modifies a mode-local version of `semantic-dependency-system-include-path'.
+
+Changes made by this function are not persistent.
+
+\(fn DIR &optional MODE)" t nil)
+
+(autoload 'semantic-remove-system-include "semantic-dep" "\
+Add a system include DIR to path for MODE.
+Modifies a mode-local version of`semantic-dependency-system-include-path'.
+
+Changes made by this function are not persistent.
+
+\(fn DIR &optional MODE)" t nil)
+
+(autoload 'semantic-reset-system-include "semantic-dep" "\
+Reset the system include list to empty for MODE.
+Modifies a mode-local version of
+`semantic-dependency-system-include-path'.
+
+\(fn &optional MODE)" t nil)
+
+(autoload 'semantic-customize-system-include-path "semantic-dep" "\
+Customize the include path for this `major-mode'.
+To create a customizable include path for a major MODE, use the
+macro `defcustom-mode-local-semantic-dependency-system-include-path'.
+
+\(fn &optional MODE)" t nil)
+
+(autoload 'semantic-dependency-find-file-on-path "semantic-dep" "\
+Return an expanded file name for FILE on available paths.
+If SYSTEMP is true, then only search system paths.
+If optional argument MODE is non-nil, then derive paths from the
+provided mode, not from the current major mode.
+
+\(fn FILE SYSTEMP &optional MODE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-documentation-comment-preceeding-tag
+;;;;;;  semantic-documentation-for-tag) "semantic-doc" "semantic-doc.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-doc.el
+
+(autoload 'semantic-documentation-for-tag "semantic-doc" "\
+Find documentation from TAG and return it as a clean string.
+TAG might have DOCUMENTATION set in it already.  If not, there may be
+some documentation in a comment preceding TAG's definition which we
+can look for.  When appropriate, this can be overridden by a language specific
+enhancement.
+Optional argument NOSNARF means to only return the lexical analyzer token for it.
+If nosnarf if 'lex, then only return the lex token.
+
+\(fn &optional TAG NOSNARF)" nil nil)
+
+(autoload 'semantic-documentation-comment-preceeding-tag "semantic-doc" "\
+Find a comment preceeding TAG.
+If TAG is nil.  use the tag under point.
+Searches the space between TAG and the preceeding tag for a comment,
+and converts the comment into clean documentation.
+Optional argument NOSNARF with a value of 'lex means to return
+just the lexical token and not the string.
+
+\(fn &optional TAG NOSNARF)" nil nil)
+
+(semantic-alias-obsolete 'semantic-find-documentation 'semantic-documentation-for-tag)
+
+;;;***
+
+;;;### (autoloads (semantic-load-enable-primary-exuberent-ctags-support)
+;;;;;;  "semantic-ectag-lang" "ctags/semantic-ectag-lang.el" (19053
+;;;;;;  1229))
+;;; Generated autoloads from ctags/semantic-ectag-lang.el
+
+(autoload 'semantic-load-enable-primary-exuberent-ctags-support "semantic-ectag-lang" "\
+Enable all ectag supported parsers for new languages.
+This is support for any langauge that does not have a regular
+semantic parser.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-load-enable-secondary-exuberent-ctags-support)
+;;;;;;  "semantic-ectag-lang2" "ctags/semantic-ectag-lang2.el" (18869
+;;;;;;  46253))
+;;; Generated autoloads from ctags/semantic-ectag-lang2.el
+
+(autoload 'semantic-load-enable-secondary-exuberent-ctags-support "semantic-ectag-lang2" "\
+Enable exuberent ctags support as a secondary parser.
+This is for semanticdb out-of-buffer parsing support.
+Any mode that has been tested to work will be added to this function.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-ectag-parse-buffer) "semantic-ectag-parse"
+;;;;;;  "ctags/semantic-ectag-parse.el" (19098 29021))
+;;; Generated autoloads from ctags/semantic-ectag-parse.el
+
+(autoload 'semantic-ectag-parse-buffer "semantic-ectag-parse" "\
+Execute Exuberent CTags on this buffer.
+Convert the output tags into Semantic tags.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "semantic-ede-grammar" "semantic-ede-grammar.el"
+;;;;;;  (18867 62167))
+;;; Generated autoloads from semantic-ede-grammar.el
+
+(eieio-defclass-autoload 'semantic-ede-proj-target-grammar '(ede-proj-target-makefile) "semantic-ede-grammar" "This target consists of a group of grammar files.\nA grammar target consists of grammar files that build Emacs Lisp programs for\nparsing different languages.")
+
+(autoload 'ede-proj-target-elisp "semantic-ede-proj-target-grammar" "\
+Target class for Emacs/Semantic grammar files." nil nil)
+
+(eval-after-load "ede-proj" '(require 'semantic-ede-grammar))
+
+;;;***
+
+;;;### (autoloads (semantic-edits-incremental-parser semantic-edits-flush-changes
+;;;;;;  semantic-edits-change-function-handle-changes semantic-change-function
+;;;;;;  semantic-edits-verbose-flag) "semantic-edit" "semantic-edit.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-edit.el
+
+(defvar semantic-edits-verbose-flag nil "\
+Non-nil means the incremental perser is verbose.
+If nil, errors are still displayed, but informative messages are not.")
+
+(custom-autoload 'semantic-edits-verbose-flag "semantic-edit" t)
+
+(autoload 'semantic-change-function "semantic-edit" "\
+Provide a mechanism for semantic tag management.
+Argument START, END, and LENGTH specify the bounds of the change.
+
+\(fn START END LENGTH)" nil nil)
+
+(autoload 'semantic-edits-change-function-handle-changes "semantic-edit" "\
+Run whenever a buffer controlled by `semantic-mode' change.
+Tracks when and how the buffer is re-parsed.
+Argument START, END, and LENGTH specify the bounds of the change.
+
+\(fn START END LENGTH)" nil nil)
+
+(autoload 'semantic-edits-flush-changes "semantic-edit" "\
+Flush the changes in the current buffer.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-edits-incremental-parser "semantic-edit" "\
+Incrementally reparse the current buffer.
+Incremental parser allows semantic to only reparse those sections of
+the buffer that have changed.  This function depends on
+`semantic-edits-change-function-handle-changes' setting up change
+overlays in the current buffer.  Those overlays are analyzed against
+the semantic cache to see what needs to be changed.
+
+\(fn)" nil nil)
+
+(defalias 'semantic-parse-changes-default 'semantic-edits-incremental-parser)
+
+(add-hook 'semantic-change-hooks #'semantic-edits-change-function-handle-changes)
+
+(add-hook 'semantic-before-toplevel-cache-flush-hook #'semantic-edits-flush-changes)
+
+;;;***
+
+;;;### (autoloads (semantic-default-elisp-setup) "semantic-el" "bovine/semantic-el.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from bovine/semantic-el.el
+
+(autoload 'semantic-default-elisp-setup "semantic-el" "\
+Setup hook function for Emacs Lisp files and Semantic.
+
+\(fn)" nil nil)
+
+(add-hook 'emacs-lisp-mode-hook 'semantic-default-elisp-setup)
+
+(add-hook 'lisp-mode-hook 'semantic-default-elisp-setup)
+
+(eval-after-load "semanticdb" '(require 'semanticdb-el))
+
+;;;***
+
+;;;### (autoloads (semantic-elp-load-old-run semantic-elp-analyze)
+;;;;;;  "semantic-elp" "semantic-elp.el" (19122 48399))
+;;; Generated autoloads from semantic-elp.el
+
+(autoload 'semantic-elp-analyze "semantic-elp" "\
+Run the analyzer, using ELP to measure performance.
+
+\(fn)" t nil)
+
+(autoload 'semantic-elp-load-old-run "semantic-elp" "\
+Load an old run from FILE, and show it.
+
+\(fn FILE)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-brute-find-innermost-tag-by-position
+;;;;;;  semantic-brute-find-tag-by-position semantic-brute-find-first-tag-by-function
+;;;;;;  semantic-brute-find-tag-by-function semantic-brute-find-tag-by-attribute-value
+;;;;;;  semantic-brute-find-tag-by-attribute semantic-brute-find-tag-by-property
+;;;;;;  semantic-brute-find-tag-by-name-regexp semantic-brute-find-tag-by-type-regexp
+;;;;;;  semantic-brute-find-tag-by-type semantic-brute-find-tag-standard
+;;;;;;  semantic-brute-find-tag-by-class semantic-brute-find-first-tag-by-name
+;;;;;;  semantic-deep-find-tags-by-name-regexp semantic-deep-find-tags-for-completion
+;;;;;;  semantic-deep-find-tags-by-name semantic-find-tags-by-scope-protection
+;;;;;;  semantic-find-tags-of-compound-type semantic-find-tags-by-type
+;;;;;;  semantic-find-tags-by-class semantic-find-tags-by-name-regexp
+;;;;;;  semantic-find-tags-for-completion semantic-find-tags-by-name
+;;;;;;  semantic-current-tag-of-class semantic-current-tag-parent
+;;;;;;  semantic-current-tag semantic-find-tag-parent-by-overlay
+;;;;;;  semantic-find-tag-by-overlay-prev semantic-find-tag-by-overlay-next
+;;;;;;  semantic-find-tag-by-overlay-in-region semantic-find-tag-by-overlay)
+;;;;;;  "semantic-find" "semantic-find.el" (19122 48399))
+;;; Generated autoloads from semantic-find.el
+
+(autoload 'semantic-find-tag-by-overlay "semantic-find" "\
+Find all tags covering POSITIONORMARKER by using overlays.
+If POSITIONORMARKER is nil, use the current point.
+Optional BUFFER is used if POSITIONORMARKER is a number, otherwise the current
+buffer is used.  This finds all tags covering the specified position
+by checking for all overlays covering the current spot.  They are then sorted
+from largest to smallest via the start location.
+
+\(fn &optional POSITIONORMARKER BUFFER)" nil nil)
+
+(autoload 'semantic-find-tag-by-overlay-in-region "semantic-find" "\
+Find all tags which exist in whole or in part between START and END.
+Uses overlays to determine positin.
+Optional BUFFER argument specifies the buffer to use.
+
+\(fn START END &optional BUFFER)" nil nil)
+
+(autoload 'semantic-find-tag-by-overlay-next "semantic-find" "\
+Find the next tag after START in BUFFER.
+If START is in an overlay, find the tag which starts next,
+not the current tag.
+
+\(fn &optional START BUFFER)" nil nil)
+
+(autoload 'semantic-find-tag-by-overlay-prev "semantic-find" "\
+Find the next tag before START in BUFFER.
+If START is in an overlay, find the tag which starts next,
+not the current tag.
+
+\(fn &optional START BUFFER)" nil nil)
+
+(autoload 'semantic-find-tag-parent-by-overlay "semantic-find" "\
+Find the parent of TAG by overlays.
+Overlays are a fast way of finding this information for active buffers.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-current-tag "semantic-find" "\
+Return the current tag in the current buffer.
+If there are more than one in the same location, return the
+smallest tag.  Return nil if there is no tag here.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-current-tag-parent "semantic-find" "\
+Return the current tags parent in the current buffer.
+A tag's parent would be a containing structure, such as a type
+containing a field.  Return nil if there is no parent.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-current-tag-of-class "semantic-find" "\
+Return the current (smallest) tags of CLASS in the current buffer.
+If the smallest tag is not of type CLASS, keep going upwards until one
+is found.
+Uses `semantic-tag-class' for classification.
+
+\(fn CLASS)" nil nil)
+
+(defsubst semantic-find-first-tag-by-name (name &optional table) "\
+Find the first tag with NAME in TABLE.
+NAME is a string.
+TABLE is a semantic tags table.  See `semantic-something-to-tag-table'.
+This routine uses `assoc' to quickly find the first matching entry." (funcall (if semantic-case-fold (quote assoc-ignore-case) (quote assoc)) name (semantic-something-to-tag-table table)))
+
+(autoload 'semantic-find-tags-by-name "semantic-find" "\
+Find all tags with NAME in TABLE.
+NAME is a string.
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+
+\(fn NAME &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-for-completion "semantic-find" "\
+Find all tags whos name begins with PREFIX in TABLE.
+PREFIX is a string.
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+While it would be nice to use `try-completion' or `all-completions',
+those functions do not return the tags, only a string.
+Uses `compare-strings' for fast comparison.
+
+\(fn PREFIX &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-by-name-regexp "semantic-find" "\
+Find all tags with name matching REGEXP in TABLE.
+REGEXP is a string containing a regular expression,
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+Consider using `semantic-find-tags-for-completion' if you are
+attempting to do completions.
+
+\(fn REGEXP &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-by-class "semantic-find" "\
+Find all tags of class CLASS in TABLE.
+CLASS is a symbol representing the class of the token, such as
+'variable, of 'function..
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+
+\(fn CLASS &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-by-type "semantic-find" "\
+Find all tags of with a type TYPE in TABLE.
+TYPE is a string or tag representing a data type as defined in the
+language the tags were parsed from, such as \"int\", or perhaps
+a tag whose name is that of a struct or class.
+TABLE is a tag table.  See `semantic-something-to-tag-table'.
+
+\(fn TYPE &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-of-compound-type "semantic-find" "\
+Find all tags which are a compound type in TABLE.
+Compound types are structures, or other data type which
+is not of a primitive nature, such as int or double.
+Used in completion.
+
+\(fn &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-find-tags-by-scope-protection "semantic-find" "\
+Find all tags accessable by SCOPEPROTECTION.
+SCOPEPROTECTION is a symbol which can be returned by the method
+`semantic-tag-protection'.  A hard-coded order is used to determine a match.
+PARENT is a tag representing the PARENT slot needed for
+`semantic-tag-protection'.
+TABLE is a list of tags (a subset of PARENT members) to scan.  If TABLE is nil,
+the type members of PARENT are used.
+See `semantic-tag-protected-p' for details on which tags are returned.
+
+\(fn SCOPEPROTECTION PARENT &optional TABLE)" nil nil)
+
+(defsubst semantic-find-tags-included (&optional table) "\
+Find all tags in TABLE that are of the 'include class.
+TABLE is a tag table.  See `semantic-something-to-tag-table'." (semantic-find-tags-by-class (quote include) table))
+
+(autoload 'semantic-deep-find-tags-by-name "semantic-find" "\
+Find all tags with NAME in TABLE.
+Search in top level tags, and their components, in TABLE.
+NAME is a string.
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-by-name'.
+
+\(fn NAME &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-deep-find-tags-for-completion "semantic-find" "\
+Find all tags whos name begins with PREFIX in TABLE.
+Search in top level tags, and their components, in TABLE.
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-for-completion'.
+
+\(fn PREFIX &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-deep-find-tags-by-name-regexp "semantic-find" "\
+Find all tags with name matching REGEXP in TABLE.
+Search in top level tags, and their components, in TABLE.
+REGEXP is a string containing a regular expression,
+TABLE is a tag table.  See `semantic-flatten-tags-table'.
+See also `semantic-find-tags-by-name-regexp'.
+Consider using `semantic-deep-find-tags-for-completion' if you are
+attempting to do completions.
+
+\(fn REGEXP &optional TABLE)" nil (quote macro))
+
+(autoload 'semantic-brute-find-first-tag-by-name "semantic-find" "\
+Find a tag NAME within STREAMORBUFFER.  NAME is a string.
+If SEARCH-PARTS is non-nil, search children of tags.
+If SEARCH-INCLUDE was never implemented.
+
+Use `semantic-find-first-tag-by-name' instead.
+
+\(fn NAME STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDE)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-class "semantic-find" "\
+Find all tags with a class CLASS within STREAMORBUFFER.
+CLASS is a symbol representing the class of the tags to find.
+See `semantic-tag-class'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+Use `semantic-find-tag-by-class' instead.
+
+\(fn CLASS STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil (quote macro))
+
+(autoload 'semantic-brute-find-tag-standard "semantic-find" "\
+Find all tags in STREAMORBUFFER which define simple class types.
+See `semantic-tag-class'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil (quote macro))
+
+(autoload 'semantic-brute-find-tag-by-type "semantic-find" "\
+Find all tags with type TYPE within STREAMORBUFFER.
+TYPE is a string which is the name of the type of the tags returned.
+See `semantic-tag-type'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn TYPE STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-type-regexp "semantic-find" "\
+Find all tags with type matching REGEXP within STREAMORBUFFER.
+REGEXP is a regular expression  which matches the  name of the type of the
+tags returned.  See `semantic-tag-type'.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn REGEXP STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-name-regexp "semantic-find" "\
+Find all tags whose name match REGEX in STREAMORBUFFER.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn REGEX STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-property "semantic-find" "\
+Find all tags with PROPERTY equal to VALUE in STREAMORBUFFER.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn PROPERTY VALUE STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-attribute "semantic-find" "\
+Find all tags with a given ATTR in STREAMORBUFFER.
+ATTR is a symbol key into the attributes list.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn ATTR STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-attribute-value "semantic-find" "\
+Find all tags with a given ATTR equal to VALUE in STREAMORBUFFER.
+ATTR is a symbol key into the attributes list.
+VALUE is the value that ATTR should match.
+Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
+`semantic-brute-find-tag-by-function'.
+
+\(fn ATTR VALUE STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-function "semantic-find" "\
+Find all tags for which FUNCTION's value is non-nil within STREAMORBUFFER.
+FUNCTION must return non-nil if an element of STREAM will be included
+in the new list.
+
+If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags
+are searched.  The overloadable function `semantic-tag-componenets' is
+used for the searching child lists.  If SEARCH-PARTS is the symbol
+'positiononly, then only children that have positional information are
+searched.
+
+If SEARCH-INCLUDES has not been implemented.
+This parameter hasn't be active for a while and is obsolete.
+
+\(fn FUNCTION STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-first-tag-by-function "semantic-find" "\
+Find the first tag which FUNCTION match within STREAMORBUFFER.
+FUNCTION must return non-nil if an element of STREAM will be included
+in the new list.
+
+The following parameters were never implemented.
+
+If optional argument SEARCH-PARTS, all sub-parts of tags are searched.
+The overloadable function `semantic-tag-components' is used for
+searching.
+If SEARCH-INCLUDES is non-nil, then all include files are also
+searched for matches.
+
+\(fn FUNCTION STREAMORBUFFER &optional SEARCH-PARTS SEARCH-INCLUDES)" nil nil)
+
+(autoload 'semantic-brute-find-tag-by-position "semantic-find" "\
+Find a tag covering POSITION within STREAMORBUFFER.
+POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
+the median calculation, and return nil.
+
+\(fn POSITION STREAMORBUFFER &optional NOMEDIAN)" nil nil)
+
+(autoload 'semantic-brute-find-innermost-tag-by-position "semantic-find" "\
+Find a list of tags covering POSITION within STREAMORBUFFER.
+POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
+the median calculation, and return nil.
+This function will find the topmost item, and recurse until no more
+details are available of findable.
+
+\(fn POSITION STREAMORBUFFER &optional NOMEDIAN)" nil nil)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay 'semantic-find-tag-by-overlay)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-in-region 'semantic-find-tag-by-overlay-in-region)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-next 'semantic-find-tag-by-overlay-next)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-overlay-prev 'semantic-find-tag-by-overlay-prev)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-parent-by-overlay 'semantic-find-tag-parent-by-overlay)
+
+(semantic-alias-obsolete 'semantic-current-nonterminal 'semantic-current-tag)
+
+(semantic-alias-obsolete 'semantic-current-nonterminal-parent 'semantic-current-tag-parent)
+
+(semantic-alias-obsolete 'semantic-current-nonterminal-of-type 'semantic-current-tag-of-class)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-name 'semantic-brute-find-first-tag-by-name)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-token 'semantic-brute-find-tag-by-class)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-standard 'semantic-brute-find-tag-standard)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-type 'semantic-brute-find-tag-by-type)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-type-regexp 'semantic-brute-find-tag-by-type-regexp)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-name-regexp 'semantic-brute-find-tag-by-name-regexp)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-property 'semantic-brute-find-tag-by-property)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-extra-spec 'semantic-brute-find-tag-by-attribute)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-extra-spec-value 'semantic-brute-find-tag-by-attribute-value)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-function 'semantic-brute-find-tag-by-function)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-function-first-match 'semantic-brute-find-first-tag-by-function)
+
+(semantic-alias-obsolete 'semantic-find-nonterminal-by-position 'semantic-brute-find-tag-by-position)
+
+(semantic-alias-obsolete 'semantic-find-innermost-nonterminal-by-position 'semantic-brute-find-innermost-tag-by-position)
+
+;;;***
+
+;;;### (autoloads (semantic-folding-mode global-semantic-folding-mode
+;;;;;;  global-semantic-folding-mode) "semantic-fold" "semantic-fold.el"
+;;;;;;  (17213 40445))
+;;; Generated autoloads from semantic-fold.el
+
+(autoload 'global-semantic-folding-mode "semantic-fold" "\
+Toggle global use of option `semantic-folding-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-folding-mode nil "\
+*If non-nil enable global use of variable `semantic-folding-mode'.
+With this mode enabled, a new folding decoration mode is added.
+Clicking on a + or - in the fringe will fold that tag.")
+
+(custom-autoload 'global-semantic-folding-mode "semantic-fold" nil)
+
+(autoload 'semantic-folding-mode "semantic-fold" "\
+Minor mode for highlighting changes made in a buffer.
+Changes are tracked by semantic so that the incremental parser can work
+properly.
+This mode will display +/- icons in the fringe.  Clicking on them
+will fold the current tag.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-format-tag-uml-concise-prototype semantic-format-tag-uml-prototype
+;;;;;;  semantic-format-tag-uml-abbreviate semantic-format-tag-concise-prototype
+;;;;;;  semantic-format-tag-prototype semantic-format-tag-short-doc
+;;;;;;  semantic-format-tag-summarize-with-file semantic-format-tag-summarize
+;;;;;;  semantic-format-tag-abbreviate semantic-format-tag-name semantic-format-tag-prin1
+;;;;;;  semantic-format-tag-type) "semantic-format" "semantic-format.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semantic-format.el
+
+(defvar semantic-format-tag-functions '(semantic-format-tag-name semantic-format-tag-canonical-name semantic-format-tag-abbreviate semantic-format-tag-summarize semantic-format-tag-summarize-with-file semantic-format-tag-short-doc semantic-format-tag-prototype semantic-format-tag-concise-prototype semantic-format-tag-uml-abbreviate semantic-format-tag-uml-prototype semantic-format-tag-uml-concise-prototype semantic-format-tag-prin1) "\
+List of functions which convert a tag to text.
+Each function must take the parameters TAG &optional PARENT COLOR.
+TAG is the tag to convert.
+PARENT is a parent tag or name which refers to the structure
+or class which contains TAG.  PARENT is NOT a class which a TAG
+would claim as a parent.
+COLOR indicates that the generated text should be colored using
+`font-lock'.")
+
+(semantic-varalias-obsolete 'semantic-token->text-functions 'semantic-format-tag-functions)
+
+(defvar semantic-format-tag-custom-list (append '(radio) (mapcar (lambda (f) (list 'const f)) semantic-format-tag-functions) '(function)) "\
+A List used by customizeable variables to choose a tag to text function.
+Use this variable in the :type field of a customizable variable.")
+
+(autoload 'semantic-format-tag-type "semantic-format" "\
+Convert the data type of TAG to a string usable in tag formatting.
+It is presumed that TYPE is a string or semantic tag.
+
+\(fn TAG COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-prin1 "semantic-format" "\
+Convert TAG to a string that is the print name for TAG.
+PARENT and COLOR are ignored.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-name "semantic-format" "\
+Return the name string describing TAG.
+The name is the shortest possible representation.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-abbreviate "semantic-format" "\
+Return an abbreviated string describing TAG.
+The abbreviation is to be short, with possible symbols indicating
+the type of tag, or other information.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-summarize "semantic-format" "\
+Summarize TAG in a reasonable way.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-summarize-with-file "semantic-format" "\
+Like `semantic-format-tag-summarize', but with the file name.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-short-doc "semantic-format" "\
+Display a short form of TAG's documentation. (Comments, or docstring.)
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-prototype "semantic-format" "\
+Return a prototype for TAG.
+This function should be overloaded, though it need not be used.
+This is because it can be used to create code by language independent
+tools.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-concise-prototype "semantic-format" "\
+Return a concise prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-uml-abbreviate "semantic-format" "\
+Return a UML style abbreviation for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-uml-prototype "semantic-format" "\
+Return a UML style prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+(autoload 'semantic-format-tag-uml-concise-prototype "semantic-format" "\
+Return a UML style concise prototype for TAG.
+Optional argument PARENT is the parent type if TAG is a detail.
+Optional argument COLOR means highlight the prototype with font-lock colors.
+
+\(fn TAG &optional PARENT COLOR)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-gcc-test-output-parser-this-machine semantic-gcc-test-output-parser
+;;;;;;  semantic-gcc-setup) "semantic-gcc" "bovine/semantic-gcc.el"
+;;;;;;  (19095 52620))
+;;; Generated autoloads from bovine/semantic-gcc.el
+
+(autoload 'semantic-gcc-setup "semantic-gcc" "\
+Setup Semantic C/C++ parsing based on GCC output.
+
+\(fn)" t nil)
+
+(autoload 'semantic-gcc-test-output-parser "semantic-gcc" "\
+Test the output parser against some collected strings.
+
+\(fn)" t nil)
+
+(autoload 'semantic-gcc-test-output-parser-this-machine "semantic-gcc" "\
+Test the output parser against the machine currently running Emacs.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-grammar-batch-build-packages) "semantic-grammar"
+;;;;;;  "semantic-grammar.el" (19097 35613))
+;;; Generated autoloads from semantic-grammar.el
+
+(autoload 'semantic-grammar-batch-build-packages "semantic-grammar" "\
+Build Lisp packages from grammar files on the command line.
+That is, run `semantic-grammar-batch-build-one-package' for each file.
+Each file is processed even if an error occurred previously.
+Must be used from the command line, with `-batch'.
+For example, to process grammar files in current directory, invoke:
+
+  \"emacs -batch -f semantic-grammar-batch-build-packages .\".
+
+See also the variable `semantic-grammar-file-regexp'.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-default-html-setup) "semantic-html" "semantic-html.el"
+;;;;;;  (19328 21693))
+;;; Generated autoloads from semantic-html.el
+
+(autoload 'semantic-default-html-setup "semantic-html" "\
+Set up a buffer for parsing of HTML files.
+
+\(fn)" nil nil)
+
+(add-hook 'html-mode-hook 'semantic-default-html-setup)
+
+;;;***
+
+;;;### (autoloads (semantic-ia-describe-class semantic-ia-show-doc
+;;;;;;  semantic-ia-fast-mouse-jump semantic-ia-fast-jump semantic-ia-show-summary
+;;;;;;  semantic-ia-complete-tip semantic-ia-complete-symbol-menu
+;;;;;;  semantic-ia-complete-symbol) "semantic-ia" "semantic-ia.el"
+;;;;;;  (19335 11004))
+;;; Generated autoloads from semantic-ia.el
+
+(autoload 'semantic-ia-complete-symbol "semantic-ia" "\
+Complete the current symbol at POINT.
+Completion options are calculated with `semantic-analyze-possible-completions'.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-complete-symbol-menu "semantic-ia" "\
+Complete the current symbol via a menu based at POINT.
+Completion options are calculated with `semantic-analyze-possible-completions'.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-complete-tip "semantic-ia" "\
+Pop up a tooltip for completion at POINT.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-show-summary "semantic-ia" "\
+Display a summary for the symbol under POINT.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-fast-jump "semantic-ia" "\
+Jump to the tag referred to by the code at POINT.
+Uses `semantic-analyze-current-context' output to identify an accurate
+origin of the code at point.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-fast-mouse-jump "semantic-ia" "\
+Jump to the tag referred to by the point clicked on.
+See `semantic-ia-fast-jump' for details on how it works.
+ This command is meant to be bound to a mouse event.
+
+\(fn EVT)" t nil)
+
+(autoload 'semantic-ia-show-doc "semantic-ia" "\
+Display the code-level documentation for the symbol at POINT.
+
+\(fn POINT)" t nil)
+
+(autoload 'semantic-ia-describe-class "semantic-ia" "\
+Display all known parts for the datatype TYPENAME.
+If the type in question is a class, all methods and other accessible
+parts of the parent classes are displayed.
+
+\(fn TYPENAME)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-speedbar-analysis) "semantic-ia-sb" "semantic-ia-sb.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semantic-ia-sb.el
+
+(autoload 'semantic-speedbar-analysis "semantic-ia-sb" "\
+Start Speedbar in semantic analysis mode.
+The analyzer displays information about the current context, plus a smart
+list of possible completions.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-ia-utest) "semantic-ia-utest" "semantic-ia-utest.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semantic-ia-utest.el
+
+(autoload 'semantic-ia-utest "semantic-ia-utest" "\
+Run the semantic ia unit test against stored sources.
+Argument ARG specifies which set of tests to run.
+ 1 - ia utests
+ 2 - regs utests
+ 3 - symrefs utests
+ 4 - symref count utests
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-idle-scheduler-remove semantic-idle-scheduler-add
+;;;;;;  semantic-idle-scheduler-mode global-semantic-idle-scheduler-mode
+;;;;;;  global-semantic-idle-scheduler-mode) "semantic-idle" "semantic-idle.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-idle.el
+
+(defvar global-semantic-idle-scheduler-mode nil "\
+*If non-nil, enable global use of idle-scheduler mode.")
+
+(custom-autoload 'global-semantic-idle-scheduler-mode "semantic-idle" nil)
+
+(autoload 'global-semantic-idle-scheduler-mode "semantic-idle" "\
+Toggle global use of option `semantic-idle-scheduler-mode'.
+The idle scheduler with automatically reparse buffers in idle time,
+and then schedule other jobs setup with `semantic-idle-scheduler-add'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar semantic-idle-scheduler-mode nil "\
+Non-nil if idle-scheduler minor mode is enabled.
+Use the command `semantic-idle-scheduler-mode' to change this variable.")
+
+(autoload 'semantic-idle-scheduler-mode "semantic-idle" "\
+Minor mode to auto parse buffer following a change.
+When this mode is off, a buffer is only rescanned for tokens when
+some command requests the list of available tokens.  When idle-scheduler
+is enabled, Emacs periodically checks to see if the buffer is out of
+date, and reparses while the user is idle (not typing.)
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'semantic-idle-scheduler-add "semantic-idle" "\
+Schedule FUNCTION to occur during idle time.
+
+\(fn FUNCTION)" nil nil)
+
+(autoload 'semantic-idle-scheduler-remove "semantic-idle" "\
+Unschedule FUNCTION to occur during idle time.
+
+\(fn FUNCTION)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-create-imenu-index semantic-imenu-expand-type-members
+;;;;;;  semantic-imenu-bucketize-file semantic-imenu-summary-function)
+;;;;;;  "semantic-imenu" "semantic-imenu.el" (19326 59187))
+;;; Generated autoloads from semantic-imenu.el
+
+(defvar semantic-imenu-summary-function 'semantic-format-tag-abbreviate "\
+*Function to use when creating items in Imenu.
+Some useful functions are found in `semantic-format-tag-functions'.")
+
+(custom-autoload 'semantic-imenu-summary-function "semantic-imenu" t)
+
+(defvar semantic-imenu-bucketize-file t "\
+*Non-nil if tags in a file are to be grouped into buckets.")
+
+(custom-autoload 'semantic-imenu-bucketize-file "semantic-imenu" t)
+
+(defvar semantic-imenu-expand-type-members t "\
+*Non-nil if types should have submenus with members in them.")
+
+(custom-autoload 'semantic-imenu-expand-type-members "semantic-imenu" t)
+
+(defvar semantic-imenu-expandable-tag-classes '(type) "\
+List of expandable tag classes.
+Tags of those classes will be given submenu with children.
+By default, a `type' has interesting children.  In Texinfo, however, a
+`section' has interesting children.")
+
+(autoload 'semantic-create-imenu-index "semantic-imenu" "\
+Create an imenu index for any buffer which supports Semantic.
+Uses the output of the Semantic parser to create the index.
+Optional argument STREAM is an optional stream of tags used to create menus.
+
+\(fn &optional STREAM)" nil nil)
+
+;;;***
+
+;;;### (autoloads (define-lex-block-analyzer define-lex-simple-regex-analyzer
+;;;;;;  define-lex-regex-analyzer define-lex-analyzer semantic-lex
+;;;;;;  semantic-lex-init define-lex) "semantic-lex" "semantic-lex.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semantic-lex.el
+
+(defvar semantic-lex-analyzer 'semantic-flex "\
+The lexical analyzer used for a given buffer.
+See `semantic-lex' for documentation.
+For compatibility with Semantic 1.x it defaults to `semantic-flex'.")
+
+(autoload 'define-lex "semantic-lex" "\
+Create a new lexical analyzer with NAME.
+DOC is a documentation string describing this analyzer.
+ANALYZERS are small code snippets of analyzers to use when
+building the new NAMED analyzer.  Only use analyzers which
+are written to be used in `define-lex'.
+Each analyzer should be an analyzer created with `define-lex-analyzer'.
+Note: The order in which analyzers are listed is important.
+If two analyzers can match the same text, it is important to order the
+analyzers so that the one you want to match first occurs first.  For
+example, it is good to put a numbe analyzer in front of a symbol
+analyzer which might mistake a number for as a symbol.
+
+\(fn NAME DOC &rest ANALYZERS)" nil (quote macro))
+
+(autoload 'semantic-lex-init "semantic-lex" "\
+Initialize any lexical state for this buffer.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-lex "semantic-lex" "\
+Lexically analyze text in the current buffer between START and END.
+Optional argument DEPTH indicates at what level to scan over entire
+lists.  The last argument, LENGTH specifies that `semantic-lex'
+should only return LENGTH tokens.  The return value is a token stream.
+Each element is a list, such of the form
+  (symbol start-expression .  end-expression)
+where SYMBOL denotes the token type.
+See `semantic-lex-tokens' variable for details on token types.  END
+does not mark the end of the text scanned, only the end of the
+beginning of text scanned.  Thus, if a string extends past END, the
+end of the return token will be larger than END.  To truly restrict
+scanning, use `narrow-to-region'.
+
+\(fn START END &optional DEPTH LENGTH)" nil nil)
+
+(autoload 'define-lex-analyzer "semantic-lex" "\
+Create a single lexical analyzer NAME with DOC.
+When an analyzer is called, the current buffer and point are
+positioned in a buffer at the location to be analyzed.
+CONDITION is an expression which returns t if FORMS should be run.
+Within the bounds of CONDITION and FORMS, the use of backquote
+can be used to evaluate expressions at compile time.
+While forms are running, the following variables will be locally bound:
+  `semantic-lex-analysis-bounds' - The bounds of the current analysis.
+                  of the form (START . END)
+  `semantic-lex-maximum-depth' - The maximum depth of semantic-list
+                  for the current analysis.
+  `semantic-lex-current-depth' - The current depth of `semantic-list' that has
+                  been decended.
+  `semantic-lex-end-point' - End Point after match.
+                   Analyzers should set this to a buffer location if their
+                   match string does not represent the end of the matched text.
+  `semantic-lex-token-stream' - The token list being collected.
+                   Add new lexical tokens to this list.
+Proper action in FORMS is to move the value of `semantic-lex-end-point' to
+after the location of the analyzed entry, and to add any discovered tokens
+at the beginning of `semantic-lex-token-stream'.
+This can be done by using `semantic-lex-push-token'.
+
+\(fn NAME DOC CONDITION &rest FORMS)" nil (quote macro))
+
+(autoload 'define-lex-regex-analyzer "semantic-lex" "\
+Create a lexical analyzer with NAME and DOC that will match REGEXP.
+FORMS are evaluated upon a successful match.
+See `define-lex-analyzer' for more about analyzers.
+
+\(fn NAME DOC REGEXP &rest FORMS)" nil (quote macro))
+
+(autoload 'define-lex-simple-regex-analyzer "semantic-lex" "\
+Create a lexical analyzer with NAME and DOC that match REGEXP.
+TOKSYM is the symbol to use when creating a semantic lexical token.
+INDEX is the index into the match that defines the bounds of the token.
+Index should be a plain integer, and not specified in the macro as an
+expression.
+FORMS are evaluated upon a successful match BEFORE the new token is
+created.  It is valid to ignore FORMS.
+See `define-lex-analyzer' for more about analyzers.
+
+\(fn NAME DOC REGEXP TOKSYM &optional INDEX &rest FORMS)" nil (quote macro))
+
+(autoload 'define-lex-block-analyzer "semantic-lex" "\
+Create a lexical analyzer NAME for paired delimiters blocks.
+It detects a paired delimiters block or the corresponding open or
+close delimiter depending on the value of the variable
+`semantic-lex-current-depth'.  DOC is the documentation string of the lexical
+analyzer.  SPEC1 and SPECS specify the token symbols and open, close
+delimiters used.  Each SPEC has the form:
+
+\(BLOCK-SYM (OPEN-DELIM OPEN-SYM) (CLOSE-DELIM CLOSE-SYM))
+
+where BLOCK-SYM is the symbol returned in a block token.  OPEN-DELIM
+and CLOSE-DELIM are respectively the open and close delimiters
+identifying a block.  OPEN-SYM and CLOSE-SYM are respectively the
+symbols returned in open and close tokens.
+
+\(fn NAME DOC SPEC1 &rest SPECS)" nil (quote macro))
+
+;;;***
+
+;;;### (autoloads (semantic-lex-spp-write-utest semantic-lex-spp-table-write-slot-value)
+;;;;;;  "semantic-lex-spp" "semantic-lex-spp.el" (19326 59187))
+;;; Generated autoloads from semantic-lex-spp.el
+
+(autoload 'semantic-lex-spp-table-write-slot-value "semantic-lex-spp" "\
+Write out the VALUE of a slot for EIEIO.
+The VALUE is a spp lexical table.
+
+\(fn VALUE)" nil nil)
+
+(autoload 'semantic-lex-spp-write-utest "semantic-lex-spp" "\
+Unit test using the test spp file to test the slot write fcn.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-load-enable-all-exuberent-ctags-support)
+;;;;;;  "semantic-load" "semantic-load.el" (19326 59187))
+;;; Generated autoloads from semantic-load.el
+
+(autoload 'semantic-load-enable-all-exuberent-ctags-support "semantic-load" "\
+Enable all exuberent ctags extensions.
+See the functions:
+   `semantic-load-enable-primary-exuberent-ctags-support'
+   `semantic-load-enable-secondary-exuberent-ctags-support'
+If you just want to add new languages, use
+   `semantic-load-enable-primary-exuberent-ctags-support'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-default-make-setup) "semantic-make" "bovine/semantic-make.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from bovine/semantic-make.el
+
+(autoload 'semantic-default-make-setup "semantic-make" "\
+Set up a Makefile buffer for parsing with semantic.
+
+\(fn)" nil nil)
+
+(add-hook 'makefile-mode-hook 'semantic-default-make-setup)
+
+;;;***
+
+;;;### (autoloads (semantic-mru-bookmark-mode global-semantic-mru-bookmark-mode
+;;;;;;  global-semantic-mru-bookmark-mode) "semantic-mru-bookmark"
+;;;;;;  "semantic-mru-bookmark.el" (18792 41763))
+;;; Generated autoloads from semantic-mru-bookmark.el
+
+(autoload 'global-semantic-mru-bookmark-mode "semantic-mru-bookmark" "\
+Toggle global use of option `semantic-mru-bookmark-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-mru-bookmark-mode nil "\
+*If non-nil enable global use of variable `semantic-mru-bookmark-mode'.
+When this mode is enabled, changes made to a buffer are highlighted
+until the buffer is reparsed.")
+
+(custom-autoload 'global-semantic-mru-bookmark-mode "semantic-mru-bookmark" nil)
+
+(autoload 'semantic-mru-bookmark-mode "semantic-mru-bookmark" "\
+Minor mode for tracking tag-based bookmarks automatically.
+Tag based bookmarks a tracked based on editing and viewing habits
+and can then be navigated via the MRU bookmark keymap.
+
+\\{semantic-mru-bookmark-mode-map}
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-regtest-cmp-results semantic-regtest-create-output
+;;;;;;  semantic-regtest-run-test) "semantic-regtest" "semantic-regtest.el"
+;;;;;;  (17213 40495))
+;;; Generated autoloads from semantic-regtest.el
+
+(autoload 'semantic-regtest-run-test "semantic-regtest" "\
+Not documented
+
+\(fn)" t nil)
+
+(autoload 'semantic-regtest-create-output "semantic-regtest" "\
+Creates the test-output for the current buffer.
+The user will be asked for the file-name of the created test-output-file (see
+`semantic-regtest-create-output--internal').
+
+\(fn)" t nil)
+
+(autoload 'semantic-regtest-cmp-results "semantic-regtest" "\
+Compare two test-outputs and create a suitable formatted result-file.
+
+The user will be asked for four file-names:
+
+   SOURCE-FILE: The underlying source-file for which the test-outputs have
+   been created. If current buffer is a semantic-supported buffer then the
+   file-name of the current buffer is offered as default.
+
+   TEST-FILE: The regression-testoutput for SOURCE-FILE. It must be an already
+   existing file which has been created by `semantic-regtest-create-output' or
+   the function `semantic-regtest-create-output--internal'. If a file
+   SOURCE-FILE.to exists already in current directory then this file is
+   offered as default.
+
+   REF-FILE: The reference testoutput for SOURCE-FILE. TEST-FILE will be
+   compared against this file. It must be an already existing file which has
+   been created by the command `semantic-regtest-create-output' or the
+   function `semantic-regtest-create-output--internal'. If a file
+   SOURCE-FILE.ro exists already in current directory then this file is
+   offered as default.
+
+   RESULT-FILE: That file will contain the comparisson-result generated by
+   `semantic-regtest-cmp-results--internal'. Per default the filename
+   SOURCE-FILE.res is offered.
+
+This command calls `semantic-regtest-cmp-results--internal' with that four
+file-names. See this function for details about the optional argument
+`use-full-path-name' and a description of the format of RESULT-FILE.
+
+\(fn &optional USE-FULL-PATH-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-default-scheme-setup) "semantic-scm"
+;;;;;;  "bovine/semantic-scm.el" (18955 30432))
+;;; Generated autoloads from bovine/semantic-scm.el
+
+(autoload 'semantic-default-scheme-setup "semantic-scm" "\
+Setup hook function for Emacs Lisp files and Semantic.
+
+\(fn)" nil nil)
+
+(add-hook 'scheme-mode-hook 'semantic-default-scheme-setup)
+
+;;;***
+
+;;;### (autoloads (semantic-calculate-scope semantic-scope-tag-clone-with-scope
+;;;;;;  semantic-scope-reset-cache) "semantic-scope" "semantic-scope.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-scope.el
+
+(autoload 'semantic-scope-reset-cache "semantic-scope" "\
+Get the current cached scope, and reset it.
+
+\(fn)" nil nil)
+
+(autoload 'semantic-scope-tag-clone-with-scope "semantic-scope" "\
+Close TAG, and return it.  Add SCOPETAGS as a tag-local scope.
+Stores the SCOPETAGS as a set of tag properties on the cloned tag.
+
+\(fn TAG SCOPETAGS)" nil nil)
+
+(autoload 'semantic-calculate-scope "semantic-scope" "\
+Calculate the scope at POINT.
+If POINT is not provided, then use the current location of point.
+The class returned from the scope calculation is variable
+`semantic-scope-cache'.
+
+\(fn &optional POINT)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-default-skel-setup) "semantic-skel" "bovine/semantic-skel.el"
+;;;;;;  (18810 37072))
+;;; Generated autoloads from bovine/semantic-skel.el
+
+(autoload 'semantic-default-skel-setup "semantic-skel" "\
+Set up a buffer for semantic parsing of the skeleton language.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-tag-external-class semantic-tag-external-member-children
+;;;;;;  semantic-tag-external-member-p semantic-tag-external-member-parent
+;;;;;;  semantic-adopt-external-members semantic-bucketize semantic-flatten-tags-table
+;;;;;;  semantic-unique-tag-table semantic-unique-tag-table-by-name
+;;;;;;  semantic-sort-tags-by-name-then-type-decreasing semantic-sort-tags-by-name-then-type-increasing
+;;;;;;  semantic-sort-tags-by-type-decreasing-ci semantic-sort-tags-by-type-increasing-ci
+;;;;;;  semantic-sort-tags-by-name-decreasing-ci semantic-sort-tags-by-name-increasing-ci
+;;;;;;  semantic-sort-tags-by-type-decreasing semantic-sort-tags-by-type-increasing
+;;;;;;  semantic-sort-tags-by-name-decreasing semantic-sort-tags-by-name-increasing)
+;;;;;;  "semantic-sort" "semantic-sort.el" (19326 59187))
+;;; Generated autoloads from semantic-sort.el
+
+(autoload 'semantic-sort-tags-by-name-increasing "semantic-sort" "\
+Sort TAGS by name in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-name-decreasing "semantic-sort" "\
+Sort TAGS by name in decreasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-type-increasing "semantic-sort" "\
+Sort TAGS by type in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-type-decreasing "semantic-sort" "\
+Sort TAGS by type in decreasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-name-increasing-ci "semantic-sort" "\
+Sort TAGS by name in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-name-decreasing-ci "semantic-sort" "\
+Sort TAGS by name in decreasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-type-increasing-ci "semantic-sort" "\
+Sort TAGS by type in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-type-decreasing-ci "semantic-sort" "\
+Sort TAGS by type in decreasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-name-then-type-increasing "semantic-sort" "\
+Sort TAGS by name, then type in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-sort-tags-by-name-then-type-decreasing "semantic-sort" "\
+Sort TAGS by name, then type in increasing order with side effects.
+Return the sorted list.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-unique-tag-table-by-name "semantic-sort" "\
+Scan a list of TAGS, removing duplicate names.
+This must first sort the tags by name alphabetically ascending.
+For more complex uniqueness testing used by the semanticdb
+typecaching system, see `semanticdb-typecache-merge-streams'.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-unique-tag-table "semantic-sort" "\
+Scan a list of TAGS, removing duplicates.
+This must first sort the tags by position ascending.
+TAGS are removed only if they are equivalent, as can happen when
+multiple tag sources are scanned.
+For more complex uniqueness testing used by the semanticdb
+typecaching system, see `semanticdb-typecache-merge-streams'.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-flatten-tags-table "semantic-sort" "\
+Flatten the tags table TABLE.
+All tags in TABLE, and all components of top level tags
+in TABLE will appear at the top level of list.
+Tags promoted to the top of the list will still appear
+unmodified as components of their parent tags.
+
+\(fn &optional TABLE)" nil nil)
+
+(autoload 'semantic-bucketize "semantic-sort" "\
+Sort TAGS into a group of buckets based on tag class.
+Unknown classes are placed in a Misc bucket.
+Type bucket names are defined by either `semantic-symbol->name-assoc-list'.
+If PARENT is specified, then TAGS belong to this PARENT in some way.
+This will use `semantic-symbol->name-assoc-list-for-type-parts' to
+generate bucket names.
+Optional argument FILTER is a filter function to be applied to each bucket.
+The filter function will take one argument, which is a list of tokens, and
+may re-organize the list with side-effects.
+
+\(fn TAGS &optional PARENT FILTER)" nil nil)
+
+(defvar semantic-orphaned-member-metaparent-type "class" "\
+In `semantic-adopt-external-members', the type of 'type for metaparents.
+A metaparent is a made-up type semantic token used to hold the child list
+of orphaned members of a named type.")
+
+(autoload 'semantic-adopt-external-members "semantic-sort" "\
+Rebuild TAGS so that externally defined members are regrouped.
+Some languages such as C++ and CLOS permit the declaration of member
+functions outside the definition of the class.  It is easier to study
+the structure of a program when such methods are grouped together
+more logically.
+
+This function uses `semantic-tag-external-member-p' to
+determine when a potential child is an externally defined member.
+
+Note: Applications which use this function must account for token
+types which do not have a position, but have children which *do*
+have positions.
+
+Applications should use `semantic-mark-external-member-function'
+to modify all tags which are found as externally defined to some
+type.  For example, changing the token type for generating extra
+buckets with the bucket function.
+
+\(fn TAGS)" nil nil)
+
+(autoload 'semantic-tag-external-member-parent "semantic-sort" "\
+Return a parent for TAG when TAG is an external member.
+TAG is an external member if it is defined at a toplevel and
+has some sort of label defining a parent.  The parent return will
+be a string.
+
+The default behavior, if not overridden with
+`tag-member-parent' gets the 'parent extra
+specifier of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-parent-default' to also
+include the default behavior, and merely extend your own.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-external-member-p "semantic-sort" "\
+Return non-nil if PARENT is the parent of TAG.
+TAG is an external member of PARENT when it is somehow tagged
+as having PARENT as its parent.
+PARENT and TAG must both be semantic tags.
+
+The default behavior, if not overridden with
+`tag-external-member-p' is to match :parent attribute in
+the name of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-children-p-default' to also
+include the default behavior, and merely extend your own.
+
+\(fn PARENT TAG)" nil nil)
+
+(autoload 'semantic-tag-external-member-children "semantic-sort" "\
+Return the list of children which are not *in* TAG.
+If optional argument USEDB is non-nil, then also search files in
+the Semantic Database.  If USEDB is a list of databases, search those
+databases.
+
+Children in this case are functions or types which are members of
+TAG, such as the parts of a type, but which are not defined inside
+the class.  C++ and CLOS both permit methods of a class to be defined
+outside the bounds of the class' definition.
+
+The default behavior, if not overridden with
+`tag-external-member-children' is to search using
+`semantic-tag-external-member-p' in all top level definitions
+with a parent of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-children-default' to also
+include the default behavior, and merely extend your own.
+
+\(fn TAG &optional USEDB)" nil nil)
+
+(autoload 'semantic-tag-external-class "semantic-sort" "\
+Return a list of real tags that faux TAG might represent.
+
+In some languages, a method can be defined on an object which is
+not in the same file.  In this case,
+`semantic-adopt-external-members' will create a faux-tag.  If it
+is necessary to get the tag from which for faux TAG was most
+likely derived, then this function is needed.
+
+\(fn TAG)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-symref-find-text semantic-symref-find-file-references-by-name
+;;;;;;  semantic-symref-find-tags-by-completion semantic-symref-find-tags-by-regexp
+;;;;;;  semantic-symref-find-tags-by-name semantic-symref-find-references-by-name)
+;;;;;;  "semantic-symref" "symref/semantic-symref.el" (19122 48399))
+;;; Generated autoloads from symref/semantic-symref.el
+
+(autoload 'semantic-symref-find-references-by-name "semantic-symref" "\
+Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+TOOL-RETURN is an optional symbol, which will be assigned the tool used
+to perform the search.  This was added for use by a test harness.
+
+\(fn NAME &optional SCOPE TOOL-RETURN)" t nil)
+
+(autoload 'semantic-symref-find-tags-by-name "semantic-symref" "\
+Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+
+\(fn NAME &optional SCOPE)" t nil)
+
+(autoload 'semantic-symref-find-tags-by-regexp "semantic-symref" "\
+Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+
+\(fn NAME &optional SCOPE)" t nil)
+
+(autoload 'semantic-symref-find-tags-by-completion "semantic-symref" "\
+Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+
+\(fn NAME &optional SCOPE)" t nil)
+
+(autoload 'semantic-symref-find-file-references-by-name "semantic-symref" "\
+Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+
+\(fn NAME &optional SCOPE)" t nil)
+
+(autoload 'semantic-symref-find-text "semantic-symref" "\
+Find a list of occurances of TEXT in the current project.
+TEXT is a regexp formatted for use with egrep.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+
+\(fn TEXT &optional SCOPE)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "semantic-symref-cscope" "symref/semantic-symref-cscope.el"
+;;;;;;  (18855 29150))
+;;; Generated autoloads from symref/semantic-symref-cscope.el
+
+(eieio-defclass-autoload 'semantic-symref-tool-cscope '(semantic-symref-tool-baseclass) "semantic-symref-cscope" "A symref tool implementation using CScope.\nThe CScope command can be used to generate lists of tags in a way\nsimilar to that of `grep'.  This tool will parse the output to generate\nthe hit list.\n\nSee the function `cedet-cscope-search' for more details.")
+
+;;;***
+
+;;;### (autoloads (semantic-symref-rename-local-variable semantic-symref-test-count-hits-in-tag
+;;;;;;  semantic-symref-hits-in-region) "semantic-symref-filter"
+;;;;;;  "symref/semantic-symref-filter.el" (19122 48399))
+;;; Generated autoloads from symref/semantic-symref-filter.el
+
+(autoload 'semantic-symref-hits-in-region "semantic-symref-filter" "\
+Find all occurances of the symbol TARGET that match TARGET the tag.
+For each match, call HOOKFCN.
+HOOKFCN takes three arguments that match
+`semantic-analyze-current-symbol's use of HOOKfCN.
+  ( START END PREFIX )
+
+Search occurs in the current buffer between START and END.
+
+\(fn TARGET HOOKFCN START END)" nil nil)
+
+(autoload 'semantic-symref-test-count-hits-in-tag "semantic-symref-filter" "\
+Lookup in the current tag the symbol under point.
+the count all the other references to the same symbol within the
+tag that contains point, and return that.
+
+\(fn)" t nil)
+
+(autoload 'semantic-symref-rename-local-variable "semantic-symref-filter" "\
+Fancy way to rename the local variable under point.
+Depends on the SRecode Field editing API.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "semantic-symref-global" "symref/semantic-symref-global.el"
+;;;;;;  (18855 29540))
+;;; Generated autoloads from symref/semantic-symref-global.el
+
+(eieio-defclass-autoload 'semantic-symref-tool-global '(semantic-symref-tool-baseclass) "semantic-symref-global" "A symref tool implementation using GNU Global.\nThe GNU Global command can be used to generate lists of tags in a way\nsimilar to that of `grep'.  This tool will parse the output to generate\nthe hit list.\n\nSee the function `cedet-gnu-global-search' for more details.")
+
+;;;***
+
+;;;### (autoloads nil "semantic-symref-grep" "symref/semantic-symref-grep.el"
+;;;;;;  (19010 45860))
+;;; Generated autoloads from symref/semantic-symref-grep.el
+
+(eieio-defclass-autoload 'semantic-symref-tool-grep '(semantic-symref-tool-baseclass) "semantic-symref-grep" "A symref tool implementation using grep.\nThis tool uses EDE to find he root of the project, then executes\nfind-grep in the project.  The output is parsed for hits\nand those hits returned.")
+
+;;;***
+
+;;;### (autoloads nil "semantic-symref-idutils" "symref/semantic-symref-idutils.el"
+;;;;;;  (18852 3236))
+;;; Generated autoloads from symref/semantic-symref-idutils.el
+
+(eieio-defclass-autoload 'semantic-symref-tool-idutils '(semantic-symref-tool-baseclass) "semantic-symref-idutils" "A symref tool implementation using ID Utils.\nThe udutils command set can be used to generate lists of tags in a way\nsimilar to that of `grep'.  This tool will parse the output to generate\nthe hit list.\n\nSee the function `cedet-idutils-search' for more details.")
+
+;;;***
+
+;;;### (autoloads (semantic-symref-results-mode semantic-symref-symbol
+;;;;;;  semantic-symref) "semantic-symref-list" "symref/semantic-symref-list.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from symref/semantic-symref-list.el
+
+(autoload 'semantic-symref "semantic-symref-list" "\
+Find references to the current tag.
+This command uses the currently configured references tool within the
+current project to find references to the current tag. The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in`semantic-symref-results-mode'
+
+\(fn)" t nil)
+
+(autoload 'semantic-symref-symbol "semantic-symref-list" "\
+Find references to the symbol SYM.
+This command uses the currently configured references tool within the
+current project to find references to the input SYM.  The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in`semantic-symref-results-mode'
+
+\(fn SYM)" t nil)
+
+(autoload 'semantic-symref-results-mode "semantic-symref-list" "\
+Major-mode for displaying Semantic Symbol Reference RESULTS.
+RESULTS is an object of class `semantic-symref-results'.
+
+\(fn RESULTS)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-insert-foreign-tag semantic-obtain-foreign-tag
+;;;;;;  semantic-tag-components-with-overlays semantic-tag-components
+;;;;;;  semantic-tag-alias-definition) "semantic-tag" "semantic-tag.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-tag.el
+
+(defsubst semantic-tag-p (tag) "\
+Return non-nil if TAG is most likely a semantic tag." (condition-case nil (and (consp tag) (stringp (car tag)) (symbolp (nth 1 tag)) (nth 1 tag) (listp (nth 2 tag)) (listp (nth 3 tag))) (error nil)))
+
+(autoload 'semantic-tag-alias-definition "semantic-tag" "\
+Return the definition TAG is an alias.
+The returned value is a tag of the class that
+`semantic-tag-alias-class' returns for TAG.
+The default is to return the value of the :definition attribute.
+Return nil if TAG is not of class 'alias.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-components "semantic-tag" "\
+Return a list of components for TAG.
+A Component is a part of TAG which itself may be a TAG.
+Examples include the elements of a structure in a
+tag of class `type, or the list of arguments to a
+tag of class 'function.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-components-with-overlays "semantic-tag" "\
+Return the list of top level components belonging to TAG.
+Children are any sub-tags which contain overlays.
+
+Default behavior is to get `semantic-tag-components' in addition
+to the components of an anonymous types (if applicable.)
+
+Note for language authors:
+  If a mode defines a language tag that has tags in it with overlays
+you should still return them with this function.
+Ignoring this step will prevent several features from working correctly.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-obtain-foreign-tag "semantic-tag" "\
+Obtain a foreign tag from TAG.
+TAG defaults to the tag at point in current buffer.
+Return the obtained foreign tag or nil if failed.
+
+\(fn &optional TAG)" nil nil)
+
+(autoload 'semantic-insert-foreign-tag "semantic-tag" "\
+Insert FOREIGN-TAG into the current buffer.
+Signal an error if FOREIGN-TAG is not a valid foreign tag.
+This function is overridable with the symbol `insert-foreign-tag'.
+
+\(fn FOREIGN-TAG)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-prototype-file semantic-dependency-tag-file
+;;;;;;  semantic-go-to-tag) "semantic-tag-file" "semantic-tag-file.el"
+;;;;;;  (19122 48735))
+;;; Generated autoloads from semantic-tag-file.el
+
+(autoload 'semantic-go-to-tag "semantic-tag-file" "\
+Go to the location of TAG.
+TAG may be a stripped element, in which case PARENT specifies a
+parent tag that has position information.
+PARENT can also be a `semanticdb-table' object.
+
+\(fn TAG &optional PARENT)" nil nil)
+
+(autoload 'semantic-dependency-tag-file "semantic-tag-file" "\
+Find the filename represented from TAG.
+Depends on `semantic-dependency-include-path' for searching.  Always searches
+`.' first, then searches additional paths.
+
+\(fn &optional TAG)" nil nil)
+
+(autoload 'semantic-prototype-file "semantic-tag-file" "\
+Return a file in which prototypes belonging to BUFFER should be placed.
+Default behavior (if not overridden) looks for a token specifying the
+prototype file, or the existence of an EDE variable indicating which
+file prototypes belong in.
+
+\(fn BUFFER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-tag-full-name semantic-tag-prototype-p
+;;;;;;  semantic-tag-static-p semantic-tag-leaf-p semantic-tag-abstract-p
+;;;;;;  semantic-tag-protected-p semantic-tag-protection semantic-tag-calculate-parent)
+;;;;;;  "semantic-tag-ls" "semantic-tag-ls.el" (18509 52795))
+;;; Generated autoloads from semantic-tag-ls.el
+
+(autoload 'semantic-tag-calculate-parent "semantic-tag-ls" "\
+Attempt to calculate the parent of TAG.
+The default behavior (if not overriden with `tag-calculate-parent')
+is to search a buffer found with TAG, and if externally defined,
+search locally, then semanticdb for that tag (when enabled.)
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-protection "semantic-tag-ls" "\
+Return protection information about TAG with optional PARENT.
+This function returns on of the following symbols:
+   nil        - No special protection.  Language dependent.
+   'public    - Anyone can access this TAG.
+   'private   - Only methods in the local scope can access TAG.
+   'protected - Like private for outside scopes, like public for child
+                classes.
+Some languages may choose to provide additional return symbols specific
+to themselves.  Use of this function should allow for this.
+
+The default behavior (if not overridden with `tag-protection'
+is to return a symbol based on type modifiers.
+
+\(fn TAG &optional PARENT)" nil nil)
+
+(autoload 'semantic-tag-protected-p "semantic-tag-ls" "\
+Non-nil if TAG is is protected.
+PROTECTION is a symbol which can be returned by the method
+`semantic-tag-protection'.
+PARENT is the parent data type which contains TAG.
+
+For these PROTECTIONs, true is returned if TAG is:
+@table @asis
+@item nil
+  Always true
+@item  private
+  True if nil.
+@item protected
+  True if private or nil.
+@item public
+  True if private, protected, or nil.
+@end table
+
+\(fn TAG PROTECTION &optional PARENT)" nil nil)
+
+(autoload 'semantic-tag-abstract-p "semantic-tag-ls" "\
+Return non nil if TAG is abstract.
+Optional PARENT is the parent tag of TAG.
+In UML, abstract methods and classes have special meaning and behavior
+in how methods are overridden.  In UML, abstract methods are italicized.
+
+The default behavior (if not overridden with `tag-abstract-p'
+is to return true if `abstract' is in the type modifiers.
+
+\(fn TAG &optional PARENT)" nil nil)
+
+(autoload 'semantic-tag-leaf-p "semantic-tag-ls" "\
+Return non nil if TAG is leaf.
+Optional PARENT is the parent tag of TAG.
+In UML, leaf methods and classes have special meaning and behavior.
+
+The default behavior (if not overridden with `tag-leaf-p'
+is to return true if `leaf' is in the type modifiers.
+
+\(fn TAG &optional PARENT)" nil nil)
+
+(autoload 'semantic-tag-static-p "semantic-tag-ls" "\
+Return non nil if TAG is static.
+Optional PARENT is the parent tag of TAG.
+In UML, static methods and attributes mean that they are allocated
+in the parent class, and are not instance specific.
+UML notation specifies that STATIC entries are underlined.
+
+\(fn TAG &optional PARENT)" nil nil)
+
+(autoload 'semantic-tag-prototype-p "semantic-tag-ls" "\
+Return non nil if TAG is a prototype.
+For some laguages, such as C, a prototype is a declaration of
+something without an implementation.
+
+\(fn TAG)" nil nil)
+
+(autoload 'semantic-tag-full-name "semantic-tag-ls" "\
+Return the fully qualified name of TAG in the package hierarchy.
+STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream',
+but must be a toplevel semantic tag stream that contains TAG.
+A Package Hierarchy is defined in UML by the way classes and methods
+are organized on disk.  Some language use this concept such that a
+class can be accessed via it's fully qualified name, (such as Java.)
+Other languages qualify names within a Namespace (such as C++) which
+result in a different package like structure.  Languages which do not
+override this function with `tag-full-name' will use
+`semantic-tag-name'.  Override functions only need to handle
+STREAM-OR-BUFFER with a tag stream value, or nil.
+
+\(fn TAG &optional STREAM-OR-BUFFER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-tag-write-list-slot-value semantic-tag-write-tag-list)
+;;;;;;  "semantic-tag-write" "semantic-tag-write.el" (19122 48399))
+;;; Generated autoloads from semantic-tag-write.el
+
+(autoload 'semantic-tag-write-tag-list "semantic-tag-write" "\
+Write the tag list TLIST to the current stream.
+INDENT indicates the current indentation level.
+If optional DONTADDNEWLINE is non-nil, then don't add a newline.
+
+\(fn TLIST &optional INDENT DONTADDNEWLINE)" nil nil)
+
+(autoload 'semantic-tag-write-list-slot-value "semantic-tag-write" "\
+Write out the VALUE of a slot for EIEIO.
+The VALUE is a list of tags.
+
+\(fn VALUE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semantic-default-texi-setup) "semantic-texi" "semantic-texi.el"
+;;;;;;  (19329 62050))
+;;; Generated autoloads from semantic-texi.el
+
+(autoload 'semantic-default-texi-setup "semantic-texi" "\
+Set up a buffer for parsing of Texinfo files.
+
+\(fn)" nil nil)
+
+(add-hook 'texinfo-mode-hook 'semantic-default-texi-setup)
+
+;;;***
+
+;;;### (autoloads (semantic-utest-main) "semantic-utest" "semantic-utest.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semantic-utest.el
+
+(autoload 'semantic-utest-main "semantic-utest" "\
+Not documented
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-utest-c) "semantic-utest-c" "semantic-utest-c.el"
+;;;;;;  (19328 24664))
+;;; Generated autoloads from semantic-utest-c.el
+
+(autoload 'semantic-utest-c "semantic-utest-c" "\
+Run parsing test for C from the test directory.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semantic-highlight-func-mode global-semantic-highlight-func-mode
+;;;;;;  global-semantic-highlight-func-mode semantic-stickyfunc-mode
+;;;;;;  global-semantic-stickyfunc-mode global-semantic-stickyfunc-mode
+;;;;;;  semantic-show-parser-state-mode global-semantic-show-parser-state-mode
+;;;;;;  global-semantic-show-parser-state-mode semantic-show-unmatched-syntax-mode
+;;;;;;  global-semantic-show-unmatched-syntax-mode global-semantic-show-unmatched-syntax-mode
+;;;;;;  semantic-highlight-edits-mode global-semantic-highlight-edits-mode
+;;;;;;  global-semantic-highlight-edits-mode) "semantic-util-modes"
+;;;;;;  "semantic-util-modes.el" (19326 59187))
+;;; Generated autoloads from semantic-util-modes.el
+
+(autoload 'global-semantic-highlight-edits-mode "semantic-util-modes" "\
+Toggle global use of option `semantic-highlight-edits-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-highlight-edits-mode nil "\
+*If non-nil enable global use of variable `semantic-highlight-edits-mode'.
+When this mode is enabled, changes made to a buffer are highlighted
+until the buffer is reparsed.")
+
+(custom-autoload 'global-semantic-highlight-edits-mode "semantic-util-modes" nil)
+
+(autoload 'semantic-highlight-edits-mode "semantic-util-modes" "\
+Minor mode for highlighting changes made in a buffer.
+Changes are tracked by semantic so that the incremental parser can work
+properly.
+This mode will highlight those changes as they are made, and clear them
+when the incremental parser accounts for those edits.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-semantic-show-unmatched-syntax-mode "semantic-util-modes" "\
+Toggle global use of option `semantic-show-unmatched-syntax-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-show-unmatched-syntax-mode nil "\
+*If non-nil, enable global use of `semantic-show-unmatched-syntax-mode'.
+When this mode is enabled, syntax in the current buffer which the
+semantic parser cannot match is highlighted with a red underline.")
+
+(custom-autoload 'global-semantic-show-unmatched-syntax-mode "semantic-util-modes" nil)
+
+(autoload 'semantic-show-unmatched-syntax-mode "semantic-util-modes" "\
+Minor mode to highlight unmatched lexical syntax tokens.
+When a parser executes, some elements in the buffer may not match any
+parser rules.  These text characters are considered unmatched syntax.
+Often time, the display of unmatched syntax can expose coding
+problems before the compiler is run.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{semantic-show-unmatched-syntax-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-show-parser-state-mode nil "\
+*If non-nil enable global use of `semantic-show-parser-state-mode'.
+When enabled, the current parse state of the current buffer is displayed
+in the mode line. See `semantic-show-parser-state-marker' for details
+on what is displayed.")
+
+(custom-autoload 'global-semantic-show-parser-state-mode "semantic-util-modes" nil)
+
+(autoload 'global-semantic-show-parser-state-mode "semantic-util-modes" "\
+Toggle global use of option `semantic-show-parser-state-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'semantic-show-parser-state-mode "semantic-util-modes" "\
+Minor mode for displaying parser cache state in the modeline.
+The cache can be in one of three states.  They are
+Up to date, Partial reprase needed, and Full reparse needed.
+The state is indicated in the modeline with the following characters:
+ `-'  ->  The cache is up to date.
+ `!'  ->  The cache requires a full update.
+ `~'  ->  The cache needs to be incrementally parsed.
+ `%'  ->  The cache is not currently parseable.
+ `@'  ->  Auto-parse in progress (not set here.)
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-semantic-stickyfunc-mode "semantic-util-modes" "\
+Toggle global use of option `semantic-stickyfunc-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-stickyfunc-mode nil "\
+*If non-nil, enable global use of `semantic-stickyfunc-mode'.
+This minor mode only works for Emacs 21 or later.
+When enabled, the header line is enabled, and the first line
+of the current function or method is displayed in it.
+This makes it appear that the first line of that tag is
+`sticky' to the top of the window.")
+
+(custom-autoload 'global-semantic-stickyfunc-mode "semantic-util-modes" nil)
+
+(autoload 'semantic-stickyfunc-mode "semantic-util-modes" "\
+Minor mode to show the title of a tag in the header line.
+Enables/disables making the header line of functions sticky.
+A function (or other tag class specified by
+`semantic-stickyfunc-sticky-classes') has a header line, meaning the
+first line which describes the rest of the construct.  This first
+line is what is displayed in the Emacs 21 header line.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-semantic-highlight-func-mode "semantic-util-modes" "\
+Toggle global use of option `semantic-highlight-func-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-semantic-highlight-func-mode nil "\
+*If non-nil, enable global use of `semantic-highlight-func-mode'.
+When enabled, the first line of the current tag is highlighted.")
+
+(custom-autoload 'global-semantic-highlight-func-mode "semantic-util-modes" nil)
+
+(autoload 'semantic-highlight-func-mode "semantic-util-modes" "\
+Minor mode to highlight the first line of the current tag.
+Enables/disables making current function firstline light up.
+A function (or other tag class specified by
+`semantic-stickyfunc-sticky-classes') is highlighted, meaning the
+first line which describes the rest of the construct.
+
+See `semantic-stickyfunc-mode' for putting a function in the
+header line.  This mode recycles the stickyfunc configuration
+classes list.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-file-stream semanticdb-file-table-object
+;;;;;;  semanticdb-current-database) "semanticdb" "semanticdb.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semanticdb.el
+
+(autoload 'semanticdb-current-database "semanticdb" "\
+Return the currently active database.
+
+\(fn)" nil nil)
+
+(autoload 'semanticdb-file-table-object "semanticdb" "\
+Return a semanticdb table belonging to FILE, make it up to date.
+If file has database tags available in the database, return it.
+If file does not have tags available, and DONTLOAD is nil,
+then load the tags for FILE, and create a new table object for it.
+DONTLOAD does not affect the creation of new database objects.
+
+\(fn FILE &optional DONTLOAD)" nil nil)
+
+(autoload 'semanticdb-file-stream "semanticdb" "\
+Return a list of tags belonging to FILE.
+If file has database tags available in the database, return them.
+If file does not have tags available, then load the file, and create them.
+
+\(fn FILE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-cscope-load-helper semanticdb-load-cscope-caches
+;;;;;;  semanticdb-create-cscope-database) "semanticdb-cscope" "semanticdb-cscope.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semanticdb-cscope.el
+
+(autoload 'semanticdb-create-cscope-database "semanticdb-cscope" "\
+Create an cscope database for directory DIR.
+The database file is stored in ~/.semanticdb, or whichever directory
+is specified by `semanticdb-default-system-save-directory'.
+
+\(fn DIR)" t nil)
+
+(autoload 'semanticdb-load-cscope-caches "semanticdb-cscope" "\
+Load all semanticdb controlled cscope caches.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-cscope-load-helper "semanticdb-cscope" "\
+Create the semanticdb database object via cscope for scope DB.
+If SCOPEFILE is found to be defunct, it won't load the DB, and will
+warn instead.
+
+\(fn SCOPEFILE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-database-sanity-check semanticdb-table-sanity-check
+;;;;;;  semanticdb-table-oob-sanity-check semanticdb-adebug-project-database-list
+;;;;;;  semanticdb-adebug-current-table semanticdb-adebug-current-database
+;;;;;;  semanticdb-dump-all-table-summary) "semanticdb-debug" "semanticdb-debug.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from semanticdb-debug.el
+
+(autoload 'semanticdb-dump-all-table-summary "semanticdb-debug" "\
+Dump a list of all databases in Emacs memory.
+
+\(fn)" t nil)
+
+(defalias 'semanticdb-adebug-database-list 'semanticdb-dump-all-table-summary)
+
+(autoload 'semanticdb-adebug-current-database "semanticdb-debug" "\
+Run ADEBUG on the current database.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-adebug-current-table "semanticdb-debug" "\
+Run ADEBUG on the current database.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-adebug-project-database-list "semanticdb-debug" "\
+Run ADEBUG on the current database.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-table-oob-sanity-check "semanticdb-debug" "\
+Validate that CACHE tags do not have any overlays in them.
+
+\(fn CACHE)" nil nil)
+
+(autoload 'semanticdb-table-sanity-check "semanticdb-debug" "\
+Validate the current semanticdb TABLE.
+
+\(fn &optional TABLE)" t nil)
+
+(autoload 'semanticdb-database-sanity-check "semanticdb-debug" "\
+Validate the current semantic database.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-ebrowse-load-helper semanticdb-load-ebrowse-caches
+;;;;;;  semanticdb-create-ebrowse-database) "semanticdb-ebrowse"
+;;;;;;  "semanticdb-ebrowse.el" (19122 48399))
+;;; Generated autoloads from semanticdb-ebrowse.el
+
+(autoload 'semanticdb-create-ebrowse-database "semanticdb-ebrowse" "\
+Create an EBROSE database for directory DIR.
+The database file is stored in ~/.semanticdb, or whichever directory
+is specified by `semanticdb-default-save-directory'.
+
+\(fn DIR)" t nil)
+
+(autoload 'semanticdb-load-ebrowse-caches "semanticdb-ebrowse" "\
+Load all semanticdb controlled EBROWSE caches.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-ebrowse-load-helper "semanticdb-ebrowse" "\
+Create the semanticdb database via ebrowse for directory.
+If DIRECTORY is found to be defunct, it won't load the DB, and will
+warn instead.
+
+\(fn DIRECTORY)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-enable-exuberent-ctags) "semanticdb-ectag"
+;;;;;;  "ctags/semanticdb-ectag.el" (18791 59641))
+;;; Generated autoloads from ctags/semanticdb-ectag.el
+
+(autoload 'semanticdb-enable-exuberent-ctags "semanticdb-ectag" "\
+Enable the use of exuberent ctags for out-of-buffer parsing for MODE.
+MODE is a `major-mode' symbol used.
+Throws an error if `semantic-ectag-program' is not of the correct
+version needed by Semantic ctags support.
+
+\(fn MODE)" t nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-full-filename semanticdb-live-p semanticdb-file-loaded-p
+;;;;;;  semanticdb-persistent-path semanticdb-default-save-directory
+;;;;;;  semanticdb-default-file-name) "semanticdb-file" "semanticdb-file.el"
+;;;;;;  (19137 27664))
+;;; Generated autoloads from semanticdb-file.el
+
+(defvar semanticdb-default-file-name "semantic.cache" "\
+*File name of the semantic tag cache.")
+
+(custom-autoload 'semanticdb-default-file-name "semanticdb-file" t)
+
+(defvar semanticdb-default-save-directory (expand-file-name "~/.semanticdb") "\
+*Directory name where semantic cache files are stored.
+If this value is nil, files are saved in the current directory.  If the value
+is a valid directory, then it overrides `semanticdb-default-file-name' and
+stores caches in a coded file name in this directory.")
+
+(custom-autoload 'semanticdb-default-save-directory "semanticdb-file" t)
+
+(defvar semanticdb-persistent-path '(always) "\
+*List of valid paths that semanticdb will cache tags to.
+When `global-semanticdb-minor-mode' is active, tag lists will
+be saved to disk when Emacs exits.  Not all directories will have
+tags that should be saved.
+The value should be a list of valid paths.  A path can be a string,
+indicating a directory in which to save a variable.  An element in the
+list can also be a symbol.  Valid symbols are `never', which will
+disable any saving anywhere, `always', which enables saving
+everywhere, or `project', which enables saving in any directory that
+passes a list of predicates in `semanticdb-project-predicate-functions'.")
+
+(custom-autoload 'semanticdb-persistent-path "semanticdb-file" t)
+
+(eieio-defclass-autoload 'semanticdb-project-database-file '(semanticdb-project-database eieio-persistent) "semanticdb-file" "Database of file tables saved to disk.")
+
+(autoload 'semanticdb-file-loaded-p "semanticdb-file" "\
+Return the project belonging to FILENAME if it was already loaded.
+
+\(fn FILENAME)" nil nil)
+
+(autoload 'semanticdb-live-p "semanticdb-file" "\
+Return non-nil if the file associated with OBJ is live.
+Live databases are objects associated with existing directories.
+
+\(fn (OBJ semanticdb-project-database))" nil nil)
+
+(autoload 'semanticdb-full-filename "semanticdb-file" "\
+Fetch the full filename that OBJ refers to.
+
+\(fn (OBJ semanticdb-project-database-file))" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-find-tags-subclasses-of-type semanticdb-find-tags-external-children-of-type
+;;;;;;  semanticdb-brute-find-tags-by-class semanticdb-brute-deep-find-tags-for-completion
+;;;;;;  semanticdb-brute-deep-find-tags-by-name semanticdb-deep-find-tags-for-completion
+;;;;;;  semanticdb-deep-find-tags-by-name-regexp semanticdb-deep-find-tags-by-name
+;;;;;;  semanticdb-find-tags-by-class semanticdb-find-tags-for-completion
+;;;;;;  semanticdb-find-tags-by-name-regexp semanticdb-find-tags-by-name
+;;;;;;  semanticdb-find-tags-collector semanticdb-find-result-mapc
+;;;;;;  semanticdb-find-result-nth-in-buffer semanticdb-find-result-nth
+;;;;;;  semanticdb-find-result-with-nil-p semanticdb-find-results-p
+;;;;;;  semanticdb-fast-strip-find-results semanticdb-strip-find-results
+;;;;;;  semanticdb-find-adebug-scanned-includes semanticdb-find-test-translate-path
+;;;;;;  semanticdb-find-table-for-include semanticdb-find-translate-path-default
+;;;;;;  semanticdb-find-default-throttle) "semanticdb-find" "semanticdb-find.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semanticdb-find.el
+
+(defvar semanticdb-find-throttle-custom-list '(repeat (radio (const 'local) (const 'project) (const 'unloaded) (const 'system) (const 'recursive) (const 'omniscience))) "\
+Customization values for semanticdb find throttle.
+See `semanticdb-find-throttle' for details.")
+
+(defvar semanticdb-find-default-throttle '(local project unloaded system recursive) "\
+The default throttle for `semanticdb-find' routines.
+The throttle controls how detailed the list of database
+tables is for a symbol lookup.  The value is a list with
+the following keys:
+  `file'       - The file the search is being performed from.
+                 This option is here for completeness only, and
+                 is assumed to always be on.
+  `local'      - Tables from the same local directory are included.
+                 This includes files directly referenced by a file name
+                 which might be in a different directory.
+  `project'    - Tables from the same local project are included
+                 If `project' is specified, then `local' is assumed.
+  `unloaded'   - If a table is not in memory, load it.  If it is not cached
+                 on disk either, get the source, parse it, and create
+                 the table.
+  `system'     - Tables from system databases.  These are specifically
+                 tables from system header files, or language equivalent.
+  `recursive'  - For include based searches, includes tables referenced
+                 by included files.
+  `omniscience' - Included system databases which are omniscience, or
+                 somehow know everything.  Omniscience databases are found
+                 in `semanticdb-project-system-databases'.
+                 The Emacs Lisp system DB is an omniscience database.")
+
+(custom-autoload 'semanticdb-find-default-throttle "semanticdb-find" t)
+
+(autoload 'semanticdb-find-translate-path-default "semanticdb-find" "\
+Translate PATH into a list of semantic tables.
+If BRUTISH is non nil, return all tables associated with PATH.
+Default action as described in `semanticdb-find-translate-path'.
+
+\(fn PATH BRUTISH)" nil nil)
+
+(autoload 'semanticdb-find-table-for-include "semanticdb-find" "\
+For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object
+INCLUDETAG is a semantic TAG of class 'include.
+TABLE is a semanticdb table that identifies where INCLUDETAG came from.
+TABLE is optional if INCLUDETAG has an overlay of :filename attribute.
+
+\(fn INCLUDETAG &optional TABLE)" nil nil)
+
+(autoload 'semanticdb-find-test-translate-path "semanticdb-find" "\
+Call and output results of `semanticdb-find-translate-path'.
+With ARG non-nil, specify a BRUTISH translation.
+See `semanticdb-find-default-throttle' and `semanticdb-project-roots'
+for details on how this list is derived.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'semanticdb-find-adebug-scanned-includes "semanticdb-find" "\
+Translate the current path, then display the lost includes.
+Examines the variable `semanticdb-find-lost-includes'.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-strip-find-results "semanticdb-find" "\
+Strip a semanticdb search RESULTS to exclude objects.
+This makes it appear more like the results of a `semantic-find-' call.
+Optional FIND-FILE-MATCH loads all files associated with RESULTS
+into buffers.  This has the side effect of enabling `semantic-tag-buffer' to
+return a value.
+If FIND-FILE-MATCH is 'name, then only the filename is stored
+in each tag instead of loading each file into a buffer.
+If the input RESULTS are not going to be used again, and if
+FIND-FILE-MATCH is nil, you can use `semanticdb-fast-strip-find-results'
+instead.
+
+\(fn RESULTS &optional FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-fast-strip-find-results "semanticdb-find" "\
+Destructively strip a semanticdb search RESULTS to exclude objects.
+This makes it appear more like the results of a `semantic-find-' call.
+This is like `semanticdb-strip-find-results', except the input list RESULTS
+will be changed.
+
+\(fn RESULTS)" nil nil)
+
+(autoload 'semanticdb-find-results-p "semanticdb-find" "\
+Non-nil if RESULTP is in the form of a semanticdb search result.
+This query only really tests the first entry in the list that is RESULTP,
+but should be good enough for debugging assertions.
+
+\(fn RESULTP)" nil nil)
+
+(autoload 'semanticdb-find-result-with-nil-p "semanticdb-find" "\
+Non-nil of RESULTP is in the form of a semanticdb search result.
+nil is a valid value where a TABLE usually is, but only if the TAG
+results include overlays.
+This query only really tests the first entry in the list that is RESULTP,
+but should be good enough for debugging assertions.
+
+\(fn RESULTP)" nil nil)
+
+(autoload 'semanticdb-find-result-nth "semanticdb-find" "\
+In RESULT, return the Nth search result.
+This is a 0 based search result, with the first match being element 0.
+
+The returned value is a cons cell: (TAG . TABLE) where TAG
+is the tag at the Nth position.  TABLE is the semanticdb table where
+the TAG was found.  Sometimes TABLE can be nil.
+
+\(fn RESULT N)" nil nil)
+
+(autoload 'semanticdb-find-result-nth-in-buffer "semanticdb-find" "\
+In RESULT, return the Nth search result.
+Like `semanticdb-find-result-nth', except that only the TAG
+is returned, and the buffer it is found it will be made current.
+If the result tag has no position information, the originating buffer
+is still made current.
+
+\(fn RESULT N)" nil nil)
+
+(autoload 'semanticdb-find-result-mapc "semanticdb-find" "\
+Apply FCN to each element of find RESULT for side-effects only.
+FCN takes two arguments.  The first is a TAG, and the
+second is a DB from whence TAG originated.
+Returns result.
+
+\(fn FCN RESULT)" nil nil)
+
+(autoload 'semanticdb-find-tags-collector "semanticdb-find" "\
+Collect all tags returned by FUNCTION over PATH.
+The FUNCTION must take two arguments.  The first is TABLE,
+which is a semanticdb table containing tags.  The second argument
+to FUNCTION is TAGS.  TAGS may be a list of tags.  If TAGS is non-nil, then
+FUNCTION should search the TAG list, not through TABLE.
+
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+Note: You should leave FIND-FILE-MATCH as nil.  It is far more
+efficient to take the results from any search and use
+`semanticdb-strip-find-results' instead.  This argument is here
+for backward compatibility.
+
+If optional argument BRUTISH is non-nil, then ignore include statements,
+and search all tables in this project tree.
+
+\(fn FUNCTION &optional PATH FIND-FILE-MATCH BRUTISH)" nil nil)
+
+(autoload 'semanticdb-find-tags-by-name "semanticdb-find" "\
+Search for all tags matching NAME on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn NAME &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-find-tags-by-name-regexp "semanticdb-find" "\
+Search for all tags matching REGEXP on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn REGEXP &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-find-tags-for-completion "semanticdb-find" "\
+Search for all tags matching PREFIX on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn PREFIX &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-find-tags-by-class "semanticdb-find" "\
+Search for all tags of CLASS on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn CLASS &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-deep-find-tags-by-name "semanticdb-find" "\
+Search for all tags matching NAME on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn NAME &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-deep-find-tags-by-name-regexp "semanticdb-find" "\
+Search for all tags matching REGEXP on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn REGEXP &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-deep-find-tags-for-completion "semanticdb-find" "\
+Search for all tags matching PREFIX on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn PREFIX &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-brute-deep-find-tags-by-name "semanticdb-find" "\
+Search for all tags matching NAME on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated wit that tag should be loaded into a buffer.
+
+\(fn NAME &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-brute-deep-find-tags-for-completion "semanticdb-find" "\
+Search for all tags matching PREFIX on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated wit that tag should be loaded into a buffer.
+
+\(fn PREFIX &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-brute-find-tags-by-class "semanticdb-find" "\
+Search for all tags of CLASS on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn CLASS &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-find-tags-external-children-of-type "semanticdb-find" "\
+Search for all tags defined outside of TYPE w/ TYPE as a parent.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn TYPE &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-find-tags-subclasses-of-type "semanticdb-find" "\
+Search for all tags of class type defined that subclass TYPE.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+\(fn TYPE &optional PATH FIND-FILE-MATCH)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-enable-gnu-global-databases) "semanticdb-global"
+;;;;;;  "semanticdb-global.el" (19137 27664))
+;;; Generated autoloads from semanticdb-global.el
+
+(autoload 'semanticdb-enable-gnu-global-databases "semanticdb-global" "\
+Enable the use of the GNU Global SemanticDB back end for all files of MODE.
+This will add an instance of a GNU Global database to each buffer
+in a GNU Global supported hierarchy.
+
+\(fn MODE)" t nil)
+
+;;;***
+
+;;;### (autoloads (global-semanticdb-minor-mode semanticdb-minor-mode-p
+;;;;;;  semanticdb-global-mode) "semanticdb-mode" "semanticdb-mode.el"
+;;;;;;  (19137 27664))
+;;; Generated autoloads from semanticdb-mode.el
+
+(defvar semanticdb-current-database nil "\
+For a given buffer, this is the currently active database.")
+
+(defvar semanticdb-current-table nil "\
+For a given buffer, this is the currently active database table.")
+
+(defvar semanticdb-global-mode nil "\
+*If non-nil enable the use of `semanticdb-minor-mode'.")
+
+(custom-autoload 'semanticdb-global-mode "semanticdb-mode" nil)
+
+(autoload 'semanticdb-minor-mode-p "semanticdb-mode" "\
+Return non-nil if `semanticdb-minor-mode' is active.
+
+\(fn)" nil nil)
+
+(autoload 'global-semanticdb-minor-mode "semanticdb-mode" "\
+Toggle the use of `semanticdb-minor-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-add-reference) "semanticdb-ref" "semanticdb-ref.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from semanticdb-ref.el
+
+(autoload 'semanticdb-add-reference "semanticdb-ref" "\
+Add a reference for the database table DBT based on INCLUDE-TAG.
+DBT is the database table that owns the INCLUDE-TAG.  The reference
+will be added to the database that INCLUDE-TAG refers to.
+
+\(fn (DBT semanticdb-abstract-table) INCLUDE-TAG)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-find-nonterminal-by-function semanticdb-find-nonterminal-by-extra-spec-value
+;;;;;;  semanticdb-find-nonterminal-by-extra-spec semanticdb-find-nonterminal-by-property
+;;;;;;  semanticdb-find-nonterminal-by-type semanticdb-find-nonterminal-by-name-regexp
+;;;;;;  semanticdb-find-nonterminal-by-name semanticdb-find-nonterminal-by-token)
+;;;;;;  "semanticdb-search" "semanticdb-search.el" (19122 48399))
+;;; Generated autoloads from semanticdb-search.el
+
+(autoload 'semanticdb-find-nonterminal-by-token "semanticdb-search" "\
+OBSOLETE:
+Find all occurances of nonterminals with token TOKEN in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn TOKEN &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-name "semanticdb-search" "\
+OBSOLETE:
+Find all occurances of nonterminals with name NAME in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN) ...).
+
+\(fn NAME &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-name-regexp "semanticdb-search" "\
+OBSOLETE:
+Find all occurances of nonterminals with name matching REGEX in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn REGEX &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-type "semanticdb-search" "\
+OBSOLETE:
+Find all nonterminals with a type of TYPE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn TYPE &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-property "semanticdb-search" "\
+OBSOLETE:
+Find all nonterminals with a PROPERTY equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn PROPERTY VALUE &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-extra-spec "semanticdb-search" "\
+OBSOLETE:
+Find all nonterminals with a SPEC in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn SPEC &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-extra-spec-value "semanticdb-search" "\
+OBSOLETE:
+Find all nonterminals with a SPEC equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...).
+
+\(fn SPEC VALUE &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+(autoload 'semanticdb-find-nonterminal-by-function "semanticdb-search" "\
+OBSOLETE:
+Find all occurances of nonterminals which match FUNCTION.
+Search in all DATABASES.  If DATABASES is nil, search a range of
+associated databases calculated `semanticdb-current-database-list' and
+DATABASES is a list of variable `semanticdb-project-database' objects.
+When SEARCH-PARTS is non-nil the search will include children of tags.
+When SEARCH-INCLUDES is non-nil, the search will include dependency files.
+When DIFF-MODE is non-nil, search databases which are of a different mode.
+A Mode is the `major-mode' that file was in when it was last parsed.
+When FIND-FILE-MATCH is non-nil, the make sure any found token's file is
+in an Emacs buffer.
+When IGNORE-SYSTEM is non-nil, system libraries are not searched.
+Return a list ((DB-TABLE . TOKEN-OR-TOKEN-LIST) ...).
+
+\(fn FUNCTION &optional DATABASES SEARCH-PARTS SEARCH-INCLUDES DIFF-MODE FIND-FILE-MATCH IGNORE-SYSTEM)" nil nil)
+
+;;;***
+
+;;;### (autoloads (semanticdb-db-typecache-dump semanticdb-typecache-dump
+;;;;;;  semanticdb-typecache-refresh-for-buffer semanticdb-typecache-find
+;;;;;;  semanticdb-typecache-merge-streams semanticdb-get-typecache
+;;;;;;  semanticdb-get-typecache semanticdb-typecache-add-dependant
+;;;;;;  semanticdb-typecache-notify-reset) "semanticdb-typecache"
+;;;;;;  "semanticdb-typecache.el" (19326 59187))
+;;; Generated autoloads from semanticdb-typecache.el
+
+(eieio-defclass-autoload 'semanticdb-typecache 'nil "semanticdb-typecache" "Structure for maintaining a typecache.")
+
+(autoload 'semanticdb-typecache-notify-reset "semanticdb-typecache" "\
+Do a reset from a notify from a table we depend on.
+
+\(fn (TC semanticdb-typecache))" nil nil)
+
+(autoload 'semanticdb-typecache-add-dependant "semanticdb-typecache" "\
+Add into the local typecache a dependant DEP.
+
+\(fn DEP)" nil nil)
+
+(autoload 'semanticdb-get-typecache "semanticdb-typecache" "\
+Retrieve the typecache from the semanticdb TABLE.
+If there is no table, create one, and fill it in.
+
+\(fn (TABLE semanticdb-abstract-table))" nil nil)
+
+(eieio-defclass-autoload 'semanticdb-database-typecache '(semanticdb-abstract-db-cache) "semanticdb-typecache" "Structure for maintaining a typecache.")
+
+(autoload 'semanticdb-get-typecache "semanticdb-typecache" "\
+Retrieve the typecache from the semantic database DB.
+If there is no table, create one, and fill it in.
+
+\(fn (DB semanticdb-project-database))" nil nil)
+
+(autoload 'semanticdb-typecache-merge-streams "semanticdb-typecache" "\
+Merge into CACHE1 and CACHE2 together.  The Caches will be merged in place.
+
+\(fn CACHE1 CACHE2)" nil nil)
+
+(autoload 'semanticdb-typecache-find "semanticdb-typecache" "\
+Search the typecache for TYPE in PATH.
+If type is a string, split the string, and search for the parts.
+If type is a list, treat the type as a pre-split string.
+PATH can be nil for the current buffer, or a semanticdb table.
+FIND-FILE-MATCH is non-nil to force all found tags to be loaded into a buffer.
+
+\(fn TYPE &optional PATH FIND-FILE-MATCH)" nil nil)
+
+(autoload 'semanticdb-typecache-refresh-for-buffer "semanticdb-typecache" "\
+Refresh the typecache for BUFFER.
+
+\(fn BUFFER)" nil nil)
+
+(autoload 'semanticdb-typecache-dump "semanticdb-typecache" "\
+Dump the typecache for the current buffer.
+
+\(fn)" t nil)
+
+(autoload 'semanticdb-db-typecache-dump "semanticdb-typecache" "\
+Dump the typecache for the current buffer's database.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (senator-try-expand-semantic global-senator-minor-mode
+;;;;;;  senator-minor-mode senator-word-search-backward senator-re-search-backward
+;;;;;;  senator-search-backward senator-word-search-forward senator-re-search-forward
+;;;;;;  senator-search-forward senator-completion-menu-popup senator-complete-symbol
+;;;;;;  senator-jump-regexp senator-jump senator-previous-tag senator-next-tag
+;;;;;;  senator-step-at-start-end-tag-classes senator-step-at-tag-classes
+;;;;;;  global-senator-minor-mode) "senator" "senator.el" (19326
+;;;;;;  59187))
+;;; Generated autoloads from senator.el
+
+(defvar global-senator-minor-mode nil "\
+*If non-nil enable global use of senator minor mode.")
+
+(custom-autoload 'global-senator-minor-mode "senator" nil)
+
+(defvar senator-step-at-tag-classes nil "\
+*List of tag classes where to step.
+A tag class is a symbol like 'variable, 'function, 'type, or other.
+If nil navigation steps at any tag found.  This is a buffer local
+variable.  It can be set in a mode hook to get a specific langage
+navigation.")
+
+(custom-autoload 'senator-step-at-tag-classes "senator" t)
+
+(defvar senator-step-at-start-end-tag-classes '(function) "\
+*List of tag classes where to step at start and end.
+A tag class is a symbol like 'variable, 'function, 'type, or other.
+If nil, navigation only step at beginning of tags.  If t, step at
+start and end of any tag where it is allowed to step.  Also, stepping
+at start and end of a tag prevent stepping inside its components.
+This is a buffer local variable.  It can be set in a mode hook to get
+a specific langage navigation.")
+
+(custom-autoload 'senator-step-at-start-end-tag-classes "senator" t)
+
+(autoload 'senator-next-tag "senator" "\
+Navigate to the next Semantic tag.
+Return the tag or nil if at end of buffer.
+
+\(fn)" t nil)
+
+(autoload 'senator-previous-tag "senator" "\
+Navigate to the previous Semantic tag.
+Return the tag or nil if at beginning of buffer.
+
+\(fn)" t nil)
+
+(autoload 'senator-jump "senator" "\
+Jump to the semantic symbol SYM.
+
+If optional IN-CONTEXT is non-nil jump in the local type's context
+\(see function `senator-current-type-context').  If optional
+NO-DEFAULT is non-nil do not provide a default value.
+
+When called interactively you can combine the IN-CONTEXT and
+NO-DEFAULT switches like this:
+
+- \\[universal-argument]       IN-CONTEXT.
+- \\[universal-argument] -     NO-DEFAULT.
+- \\[universal-argument] \\[universal-argument]   IN-CONTEXT + NO-DEFAULT.
+
+\(fn SYM &optional IN-CONTEXT NO-DEFAULT)" t nil)
+
+(autoload 'senator-jump-regexp "senator" "\
+Jump to the semantic symbol SYMREGEX.
+SYMREGEX is treated as a regular expression.
+
+If optional IN-CONTEXT is non-nil jump in the local type's context
+\(see function `senator-current-type-context').  If optional
+NO-DEFAULT is non-nil do not provide a default value and move to the
+next match of SYMREGEX.  NOTE: Doesn't actually work yet.
+
+When called interactively you can combine the IN-CONTEXT and
+NO-DEFAULT switches like this:
+
+- \\[universal-argument]       IN-CONTEXT.
+- \\[universal-argument] -     NO-DEFAULT.
+- \\[universal-argument] \\[universal-argument]   IN-CONTEXT + NO-DEFAULT.
+
+\(fn SYMREGEX &optional IN-CONTEXT NO-DEFAULT)" t nil)
+
+(autoload 'senator-complete-symbol "senator" "\
+Complete the current symbol under point.
+If optional argument CYCLE-ONCE is non-nil, only cycle through the list
+of completions once, doing nothing where there are no more matches.
+
+\(fn &optional CYCLE-ONCE)" t nil)
+
+(autoload 'senator-completion-menu-popup "senator" "\
+Popup a completion menu for the symbol at point.
+The popup menu displays all of the possible completions for the symbol
+it was invoked on.  To automatically split large menus this function
+use `imenu--mouse-menu' to handle the popup menu.
+
+\(fn)" t nil)
+
+(autoload 'senator-search-forward "senator" "\
+Search in tag names forward from point for STRING.
+Set point to the end of the occurrence found, and return point.
+See also the function `search-forward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn STRING &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-re-search-forward "senator" "\
+Search in tag names forward from point for regular expression REGEXP.
+Set point to the end of the occurrence found, and return point.
+See also the function `re-search-forward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn REGEXP &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-word-search-forward "senator" "\
+Search in tag names forward from point for WORD.
+Set point to the end of the occurrence found, and return point.
+See also the function `word-search-forward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn WORD &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-search-backward "senator" "\
+Search in tag names backward from point for STRING.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `search-backward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn STRING &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-re-search-backward "senator" "\
+Search in tag names backward from point for regular expression REGEXP.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `re-search-backward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn REGEXP &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-word-search-backward "senator" "\
+Search in tag names backward from point for WORD.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `word-search-backward' for details on the BOUND,
+NOERROR and COUNT arguments.
+
+\(fn WORD &optional BOUND NOERROR COUNT)" t nil)
+
+(autoload 'senator-minor-mode "senator" "\
+Toggle senator minor mode.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{senator-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-senator-minor-mode "senator" "\
+Toggle global use of senator minor mode.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'senator-try-expand-semantic "senator" "\
+Attempt inline completion at the cursor.
+Use Semantic, or the semantic database to look up possible
+completions.  The argument OLD has to be nil the first call of this
+function.  It returns t if a unique, possibly partial, completion is
+found, nil otherwise.
+
+\(fn OLD)" nil nil)
+
+;;;***
+
+;;;### (autoloads (wisent-parse-toggle-verbose-flag) "wisent" "wisent/wisent.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from wisent/wisent.el
+
+(defvar wisent-parse-verbose-flag nil "\
+*Non-nil means to issue more messages while parsing.")
+
+(autoload 'wisent-parse-toggle-verbose-flag "wisent" "\
+Toggle whether to issue more messages while parsing.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (wisent-c-default-setup) "wisent-c" "wisent/wisent-c.el"
+;;;;;;  (19070 11963))
+;;; Generated autoloads from wisent/wisent-c.el
+
+(autoload 'wisent-c-default-setup "wisent-c" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (wisent-calc-utest wisent-calc) "wisent-calc" "wisent/wisent-calc.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from wisent/wisent-calc.el
+
+(autoload 'wisent-calc "wisent-calc" "\
+Infix desktop calculator.
+Parse INPUT string and output the result of computation.
+
+\(fn INPUT)" t nil)
+
+(autoload 'wisent-calc-utest "wisent-calc" "\
+Test the wisent calculator.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (wisent-byte-compile-grammar wisent-compile-grammar
+;;;;;;  wisent-toggle-verbose-flag) "wisent-comp" "wisent/wisent-comp.el"
+;;;;;;  (19122 48399))
+;;; Generated autoloads from wisent/wisent-comp.el
+
+(defvar wisent-verbose-flag nil "\
+*Non-nil means to report verbose information on generated parser.")
+
+(autoload 'wisent-toggle-verbose-flag "wisent-comp" "\
+Toggle whether to report verbose information on generated parser.
+
+\(fn)" t nil)
+
+(autoload 'wisent-compile-grammar "wisent-comp" "\
+Compile the LALR(1) GRAMMAR.
+
+GRAMMAR is a list (TOKENS ASSOCS . NONTERMS) where:
+
+- TOKENS is a list of terminal symbols (tokens).
+
+- ASSOCS is nil, or an alist of (ASSOC-TYPE . ASSOC-VALUE) elements
+  describing the associativity of TOKENS.  ASSOC-TYPE must be one of
+  the `default-prec' `nonassoc', `left' or `right' symbols.  When
+  ASSOC-TYPE is `default-prec', ASSOC-VALUE must be nil or t (the
+  default).  Otherwise it is a list of tokens which must have been
+  previously declared in TOKENS.
+
+- NONTERMS is a list of nonterminal definitions.
+
+Optional argument START-LIST specify the possible grammar start
+symbols.  This is a list of nonterminals which must have been
+previously declared in GRAMMAR's NONTERMS form.  By default, the start
+symbol is the first nonterminal defined.  When START-LIST contains
+only one element, it is the start symbol.  Otherwise, all elements are
+possible start symbols, unless `wisent-single-start-flag' is non-nil.
+In that case, the first element is the start symbol, and others are
+ignored.
+
+Return an automaton as a vector: [ACTIONS GOTOS STARTS FUNCTIONS]
+where:
+
+- ACTIONS is a state/token matrix telling the parser what to do at
+  every state based on the current lookahead token.  That is shift,
+  reduce, accept or error.
+
+- GOTOS is a state/nonterminal matrix telling the parser the next
+  state to go to after reducing with each rule.
+
+- STARTS is an alist which maps the allowed start nonterminal symbols
+  to tokens that will be first shifted into the parser stack.
+
+- FUNCTIONS is an obarray of semantic action symbols.  Each symbol's
+  function definition is the semantic action lambda expression.
+
+\(fn GRAMMAR &optional START-LIST)" nil nil)
+
+(autoload 'wisent-byte-compile-grammar "wisent-comp" "\
+Byte compile the `wisent-compile-grammar' FORM.
+Automatically called by the Emacs Lisp byte compiler as a
+`byte-compile' handler.
+
+\(fn FORM)" nil nil)
+
+(put 'wisent-compile-grammar 'byte-compile 'wisent-byte-compile-grammar)
+
+;;;***
+
+;;;### (autoloads (wisent-debug-show-entry wisent-cancel-debug-on-entry
+;;;;;;  wisent-debug-on-entry) "wisent-debug" "wisent/wisent-debug.el"
+;;;;;;  (17881 43106))
+;;; Generated autoloads from wisent/wisent-debug.el
+
+(autoload 'wisent-debug-on-entry "wisent-debug" "\
+Request AUTOMATON's FUNCTION to invoke debugger each time it is called.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON.
+
+\(fn AUTOMATON FUNCTION)" t nil)
+
+(autoload 'wisent-cancel-debug-on-entry "wisent-debug" "\
+Undo effect of \\[wisent-debug-on-entry] on AUTOMATON's FUNCTION.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON.
+
+\(fn AUTOMATON FUNCTION)" t nil)
+
+(autoload 'wisent-debug-show-entry "wisent-debug" "\
+Show the source of AUTOMATON's semantic action FUNCTION.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON.
+
+\(fn AUTOMATON FUNCTION)" t nil)
+
+;;;***
+
+;;;### (autoloads (wisent-grammar-mode) "wisent-grammar" "wisent/wisent-grammar.el"
+;;;;;;  (17213 40639))
+;;; Generated autoloads from wisent/wisent-grammar.el
+
+(autoload 'wisent-grammar-mode "wisent-grammar" "\
+Major mode for editing Wisent grammars.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.wy$" . wisent-grammar-mode))
+
+(eval-after-load "speedbar" '(speedbar-add-supported-extension ".wy"))
+
+;;;***
+
+;;;### (autoloads (wisent-java-default-setup) "wisent-java-tags"
+;;;;;;  "wisent/wisent-java-tags.el" (18810 36662))
+;;; Generated autoloads from wisent/wisent-java-tags.el
+
+(autoload 'wisent-java-default-setup "wisent-java-tags" "\
+Hook run to setup Semantic in `java-mode'.
+Use the alternate LALR(1) parser.
+
+\(fn)" nil nil)
+
+(add-hook 'java-mode-hook 'wisent-java-default-setup)
+
+;;;***
+
+;;;### (autoloads (wisent-javascript-setup-parser) "wisent-javascript"
+;;;;;;  "wisent/wisent-javascript.el" (19122 48399))
+;;; Generated autoloads from wisent/wisent-javascript.el
+
+(autoload 'wisent-javascript-setup-parser "wisent-javascript" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+(add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser)
+
+(add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
+
+;;;***
+
+;;;### (autoloads (wisent-python-default-setup) "wisent-python" "wisent/wisent-python.el"
+;;;;;;  (18816 33466))
+;;; Generated autoloads from wisent/wisent-python.el
+
+(autoload 'wisent-python-default-setup "wisent-python" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+(add-hook 'python-mode-hook 'wisent-python-default-setup)
+
+;;;***
+
+;;;### (autoloads nil nil ("bovine/bovine-grammar-macros.el" "bovine/erlang-edoc.el"
+;;;;;;  "bovine/semantic-c-by.el" "bovine/semantic-erlang-by.el"
+;;;;;;  "bovine/semantic-erlang.el" "bovine/semantic-java.el" "bovine/semantic-make-by.el"
+;;;;;;  "bovine/semantic-scm-by.el" "bovine/semantic-skeleton-by.el"
+;;;;;;  "ctags/semantic-ectag-util.el" "semantic-analyze-fcn.el"
+;;;;;;  "semantic-ast.el" "semantic-example.el" "semantic-fw.el"
+;;;;;;  "semantic-grammar-wy.el" "semantic-inc.el" "semantic-sb.el"
+;;;;;;  "semantic-util.el" "semanticdb-el.el" "semanticdb-java.el"
+;;;;;;  "semanticdb-javascript.el" "semanticdb-mk.el" "semanticdb-skel.el"
+;;;;;;  "semanticdb-system.el" "wisent/semantic-wisent.el" "wisent/wisent-awk-wy.el"
+;;;;;;  "wisent/wisent-calc-wy.el" "wisent/wisent-cim-wy.el" "wisent/wisent-expr.el"
+;;;;;;  "wisent/wisent-grammar-macros.el" "wisent/wisent-java-tags-wy.el"
+;;;;;;  "wisent/wisent-java-wy.el" "wisent/wisent-java.el" "wisent/wisent-javascript-jv-wy.el"
+;;;;;;  "wisent/wisent-python-wy.el") (19335 11024 723455))
+
+;;;***
+
+(provide 'semantic-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; semantic-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-mru-bookmark.el b/site/cedet-1.0pre7/semantic/semantic-mru-bookmark.el
new file mode 100644
index 0000000..937e979
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-mru-bookmark.el
@@ -0,0 +1,456 @@
+;;; semantic-mru-bookmark.el --- Automatic bookmark tracking
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-mru-bookmark.el,v 1.18 2009/01/10 13:31:15 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Using editing hooks, track the most recently visited or poked tags,
+;; and keep a list of them, with the current point in from, and sorted
+;; by most recently used.
+;;
+;; I envision this would be used in place of switch-buffers once
+;; someone got the hang of it.
+;;
+;; I'd also like to see this used to provide some nice defaults for
+;; other programs where logical destinations or targets are the tags
+;; that have been recently edited.
+;;
+;; Quick Start:
+;;
+;; M-x global-semantic-mru-bookmark-mode RET
+;;
+;; < edit some code >
+;;
+;; C-x B  <select a tag name> RET
+;;
+;; In the above, the history is pre-filled with the tags you recenetly
+;; edited in the order you edited them.
+
+
+;;; Code:
+
+;;; COMPATABILITY
+(eval-and-compile
+  (if (fboundp 'ring-size)
+      (defalias 'semantic-ring-size 'ring-size)
+    ;; Else, we need to add one
+    (defun semantic-ring-size (ring)
+      "Return the size of RING, the maximum number of elements it can contain."
+      (length (cddr ring))))
+  )
+
+;;; TRACKING CORE
+;;
+;; Data structure for tracking MRU tag locations
+
+(defclass semantic-bookmark (eieio-named)
+  ((tag :initarg :tag
+	:type semantic-tag
+	:documentation "The TAG this bookmark belongs to.")
+   (parent :type (or semantic-tag null)
+	   :documentation "The tag that is the parent of :tag.")
+   (offset :type number
+	 :documentation "The offset from `tag' start that is
+somehow interesting.")
+   (filename :type string
+	     :documentation "String the tag belongs to.
+Set this when the tag gets unlinked from the buffer it belongs to.")
+   (frequency :type number
+	      :initform 0
+	      :documentation "Track the frequency this tag is visited.")
+   (reason :type symbol
+	   :initform t
+	   :documentation
+	   "The reason this tag is interesting.
+Nice values are 'edit, 'read, 'jump, and 'mark.
+ edit - created because the tag text was edited.
+ read - created because point lingered in tag text.
+ jump - jumped to another tag from this tag.
+ mark - created a regular mark in this tag.")
+   )
+  "A single bookmark.")
+
+(defmethod initialize-instance :AFTER ((sbm semantic-bookmark) &rest fields)
+  "Initialize the bookmark SBM with details about :tag."
+  (condition-case nil
+      (save-excursion
+	(oset sbm filename (semantic-tag-file-name (oref sbm tag)))
+	(semantic-go-to-tag (oref sbm tag))
+	(oset sbm parent (semantic-current-tag-parent)))
+    (error (message "Error bookmarking tag.")))
+  )
+
+(defmethod semantic-mrub-visit ((sbm semantic-bookmark))
+  "Visit the semantic tag bookmark SBM.
+Uses `semantic-go-to-tag' and highlighting."
+  (with-slots (tag filename) sbm
+    ;; Go to the tag
+    (when (not (semantic-tag-in-buffer-p tag))
+      (let ((fn (or (semantic-tag-file-name tag)
+ 		    filename)))
+ 	(set-buffer (find-file-noselect fn))))
+    (semantic-go-to-tag (oref sbm tag) (oref sbm parent))
+    ;; Go back to the offset.
+    (condition-case nil
+	(let ((o (oref sbm offset)))
+	  (forward-char o))
+      (error nil))
+    ;; make it visible
+    (switch-to-buffer (current-buffer))
+    (semantic-momentary-highlight-tag tag)
+    ))
+
+(defmethod semantic-mrub-update ((sbm semantic-bookmark) point reason)
+  "Update the existing bookmark SBM.
+POINT is some important location.
+REASON is a symbol.  See slot `reason' on `semantic-bookmark'."
+  (condition-case nil
+      (progn
+	(with-slots (tag offset frequency) sbm
+	  (setq offset (- point (semantic-tag-start tag)))
+	  (setq frequency (1+ frequency))
+	  )
+	(oset sbm reason reason))
+    ;; This can fail on XEmacs at miscelaneous times.
+    (error nil))
+  )
+
+(defmethod semantic-mrub-preflush ((sbm semantic-bookmark))
+  "Method called on a tag before the current buffer list of tags is flushed.
+If there is a buffer match, unlink the tag."
+  (let ((tag (oref sbm tag))
+	(parent (when (slot-boundp sbm 'parent)
+		  (oref sbm parent))))
+    (let ((b (semantic-tag-in-buffer-p tag)))
+      (when (and b (eq b (current-buffer)))
+	(semantic--tag-unlink-from-buffer tag)))
+
+    (when parent
+      (let ((b (semantic-tag-in-buffer-p parent)))
+	(when (and b (eq b (current-buffer)))
+	  (semantic--tag-unlink-from-buffer parent))))))
+
+(defclass semantic-bookmark-ring ()
+  ((ring :initarg :ring
+	 :type ring
+	 :documentation
+	 "List of `semantic-bookmark' objects.
+This list is maintained as a list with the first item
+being the current location, and the rest being a list of
+items that were recently visited.")
+   (current-index :initform 0
+		  :type number
+		  :documentation
+		  "The current index into RING for some operation.
+User commands use this to move through the ring, or reset.")
+   )
+  "Track the current MRU stack of bookmarks.
+We can't use the built-in ring data structure because we need
+to delete some items from the ring when we don't have the data.")
+
+(defvar semantic-mru-bookmark-ring (semantic-bookmark-ring
+				    "Ring"
+				    :ring (make-ring 20))
+  "The MRU bookmark ring.
+This ring tracks the most recent active tags of interest.")
+
+(defun semantic-mrub-find-nearby-tag (point)
+  "Find a nearby tag to be pushed for this current location.
+Argument POINT is where to find the tag near."
+  ;; I thought this was a good idea, but it is not!
+  ;;(semantic-fetch-tags) ;; Make sure everything is up-to-date.
+  (let ((tag (semantic-current-tag)))
+    (when (or (not tag) (semantic-tag-of-class-p tag 'type))
+      (let ((nearby (or (semantic-find-tag-by-overlay-next point)
+			(semantic-find-tag-by-overlay-prev point))))
+	(when nearby (setq tag nearby))))
+    tag))
+
+(defmethod semantic-mrub-push ((sbr semantic-bookmark-ring) point
+			       &optional reason)
+  "Add a bookmark to the ring SBR from POINT.
+REASON is why it is being pushed.  See doc for `semantic-bookmark'
+for possible reasons.
+The resulting bookmark is then sorted within the ring."
+  (let* ((ring (oref sbr ring))
+	 (tag (semantic-mrub-find-nearby-tag (point)))
+	 (idx 0))
+    (when tag
+      (while (and (not (ring-empty-p ring)) (< idx (semantic-ring-size ring)))
+	(if (semantic-tag-similar-p (oref (ring-ref ring idx) tag)
+				    tag)
+	    (ring-remove ring idx))
+	(setq idx (1+ idx)))
+      ;; Create a new mark
+      (let ((sbm (semantic-bookmark (semantic-tag-name tag)
+				    :tag tag)))
+	;; Take the mark, and update it for the current state.
+	(ring-insert ring sbm)
+	(semantic-mrub-update sbm point reason))
+      )))
+
+(defun semantic-mrub-cache-flush-fcn ()
+  "Function called in the `semantic-before-toplevel-cache-flush-hook`.
+Cause tags in the ring to become unlinked."
+  (let* ((ring (oref semantic-mru-bookmark-ring ring))
+	 (len (ring-length ring))
+	 (idx 0)
+	 )
+    (while (< idx len)
+      (semantic-mrub-preflush (ring-ref ring idx))
+      (setq idx (1+ idx)))))
+
+(add-hook 'semantic-before-toplevel-cache-flush-hook
+	  'semantic-mrub-cache-flush-fcn)
+
+;;; EDIT tracker
+;;
+(defvar semantic-mrub-last-overlay nil
+  "The last overlay bumped by `semantic-mru-bookmark-change-hook-fcn'.")
+
+(defun semantic-mru-bookmark-change-hook-fcn (overlay)
+  "Function set into `semantic-edits-new/move-change-hook's.
+Argument OVERLAY is the overlay created to mark the change.
+This function pushes tags onto the tag ring."
+  ;; Dup?
+  (when (not (eq overlay semantic-mrub-last-overlay))
+    (setq semantic-mrub-last-overlay overlay)
+    (semantic-mrub-push semantic-mru-bookmark-ring
+			(point)
+			'edit)))
+
+;;; MINOR MODE
+;;
+;; Tracking minor mode.
+
+;;;###autoload
+(defun global-semantic-mru-bookmark-mode (&optional arg)
+  "Toggle global use of option `semantic-mru-bookmark-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-mru-bookmark-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-mru-bookmark-mode arg)))
+
+;;;###autoload
+(defcustom global-semantic-mru-bookmark-mode nil
+  "*If non-nil enable global use of variable `semantic-mru-bookmark-mode'.
+When this mode is enabled, changes made to a buffer are highlighted
+until the buffer is reparsed."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-mru-bookmark-mode (if val 1 -1))))
+
+(defcustom semantic-mru-bookmark-mode-hook nil
+  "*Hook run at the end of function `semantic-mru-bookmark-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defvar semantic-mru-bookmark-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-xB" 'semantic-mrub-switch-tags)
+    km)
+  "Keymap for mru-bookmark minor mode.")
+
+(defvar semantic-mru-bookmark-mode nil
+  "Non-nil if mru-bookmark minor mode is enabled.
+Use the command `semantic-mru-bookmark-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-mru-bookmark-mode)
+
+(defun semantic-mru-bookmark-mode-setup ()
+  "Setup option `semantic-mru-bookmark-mode'.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-mru-bookmark-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+	  (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-mru-bookmark-mode nil)
+            (error "Buffer %s was not set up for parsing"
+                   (buffer-name)))
+        (semantic-make-local-hook 'semantic-edits-new-change-hooks)
+        (add-hook 'semantic-edits-new-change-hooks
+                  'semantic-mru-bookmark-change-hook-fcn nil t)
+        (add-hook 'semantic-edits-move-change-hooks
+                  'semantic-mru-bookmark-change-hook-fcn nil t)
+        )
+    ;; Remove hooks
+    (remove-hook 'semantic-edits-new-change-hooks
+		 'semantic-mru-bookmark-change-hook-fcn t)
+    (remove-hook 'semantic-edits-move-change-hooks
+		 'semantic-mru-bookmark-change-hook-fcn t)
+    )
+  semantic-mru-bookmark-mode)
+
+;;;###autoload
+(defun semantic-mru-bookmark-mode (&optional arg)
+  "Minor mode for tracking tag-based bookmarks automatically.
+Tag based bookmarks a tracked based on editing and viewing habits
+and can then be navigated via the MRU bookmark keymap.
+
+\\{semantic-mru-bookmark-mode-map}
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-mru-bookmark-mode 0 1))))
+  (setq semantic-mru-bookmark-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-mru-bookmark-mode)))
+  (semantic-mru-bookmark-mode-setup)
+  (run-hooks 'semantic-mru-bookmark-mode-hook)
+  (if (interactive-p)
+      (message "mru-bookmark minor mode %sabled"
+               (if semantic-mru-bookmark-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-mru-bookmark-mode)
+
+(semantic-add-minor-mode 'semantic-mru-bookmark-mode
+                         "k"
+                         semantic-mru-bookmark-mode-map)
+
+;;; COMPLETING READ
+;;
+;; Ask the user for a tag in MRU order.
+(defun semantic-mrub-read-history nil
+  "History of `semantic-mrub-completing-read'.")
+
+(defun semantic-mrub-ring-to-assoc-list (ring)
+  "Convert RING into an association list for completion."
+  (let ((idx 0)
+	(len (ring-length ring))
+	(al nil))
+    (while (< idx len)
+      (let ((r (ring-ref ring idx)))
+	(setq al (cons (cons (oref r :object-name) r)
+		       al)))
+      (setq idx (1+ idx)))
+    (nreverse al)))
+
+(defun semantic-mrub-completing-read (prompt)
+  "Do a `completing-read' on elements from the mru bookmark ring.
+Argument PROMPT is the promot to use when reading."
+  (if (ring-empty-p (oref semantic-mru-bookmark-ring ring))
+      (error "Semantic Bookmark ring is currently empty"))
+  (let* ((ring (oref semantic-mru-bookmark-ring ring))
+	 (ans nil)
+	 (alist (semantic-mrub-ring-to-assoc-list ring))
+	 (first (cdr (car alist)))
+	 (semantic-mrub-read-history nil)
+	 )
+    ;; Don't include the current tag.. only those that come after.
+    (if (semantic-equivalent-tag-p (oref first tag)
+				   (semantic-current-tag))
+	(setq first (cdr (car (cdr alist)))))
+    ;; Create a fake history list so we don't have to bind
+    ;; M-p and M-n to our special cause.
+    (let ((elts (reverse alist)))
+      (while elts
+	(setq semantic-mrub-read-history
+	      (cons (car (car elts)) semantic-mrub-read-history))
+	(setq elts (cdr elts))))
+    (setq semantic-mrub-read-history (nreverse semantic-mrub-read-history))
+
+    ;; Do the read/prompt
+    (let ((prompt (if first (format "%s (%s): " prompt
+				    (semantic-format-tag-name
+				     (oref first tag) t)
+				    )
+		    (concat prompt ": ")))
+	  )
+      (setq ans
+	    (completing-read prompt alist nil nil nil 'semantic-mrub-read-history)))
+    ;; Calculate the return tag.
+    (if (string= ans "")
+	(setq ans first)
+      ;; Return the bookmark object.
+      (setq ans (assoc ans alist))
+      (if ans
+	  (cdr ans)
+	;; no match.  Custom word.  Look it up somwhere?
+	nil)
+      )))
+
+(defun semantic-mrub-switch-tags (tagmark)
+  "Switch tags to TAGMARK.
+Selects a new tag via promt through the mru tag ring.
+Jumps to the tag and highlights it briefly."
+  (interactive (list (semantic-mrub-completing-read "Switch to tag")))
+  (if (not (semantic-bookmark-p tagmark))
+      (signal 'wrong-type-argument tagmark))
+  
+  (semantic-mrub-push semantic-mru-bookmark-ring
+		      (point)
+		      'jump)
+  (semantic-mrub-visit tagmark)
+  )
+
+;;; ADVICE
+;;
+;; Advise some commands to help set tag marks.
+(defadvice push-mark (around semantic-mru-bookmark activate)
+  "Push a mark at LOCATION with NOMSG and ACTIVATE passed to `push-mark'.
+If `semantic-mru-bookmark-mode' is active, also push a tag onto
+the mru bookmark stack."
+  (semantic-mrub-push semantic-mru-bookmark-ring
+		      (point)
+		      'mark)
+  ad-do-it)
+
+;(defadvice set-mark-command (around semantic-mru-bookmark activate)
+;  "Set this buffer's mark to POS.
+;If `semantic-mru-bookmark-mode' is active, also push a tag onto
+;the mru bookmark stack."
+;  (when (and semantic-mru-bookmark-mode (interactive-p))
+;    (semantic-mrub-push semantic-mru-bookmark-ring
+;			(point)
+;			'mark))
+;  ad-do-it)
+
+
+;;; Debugging
+;;
+(defun semantic-adebug-mrub ()
+  "Display a list of items in the MRU bookmarks list.
+Useful for debugging mrub problems."
+  (interactive)
+  (let* ((out semantic-mru-bookmark-ring))
+    (data-debug-new-buffer "*TAG RING ADEBUG*")
+    (data-debug-insert-object-slots out "]")
+    ))
+
+
+(provide 'semantic-mru-bookmark)
+
+;;; semantic-mru-bookmark.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-regtest.el b/site/cedet-1.0pre7/semantic/semantic-regtest.el
new file mode 100644
index 0000000..fc9f024
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-regtest.el
@@ -0,0 +1,915 @@
+;;; semantic-regtest.el --- Perform regression tests for grammars
+
+;;; Copyright (C) 2003 Klaus Berndl
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: syntax test
+;; X-RCS: $Id: semantic-regtest.el,v 1.6 2005/09/30 20:21:03 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library implements regression-tests for testing grammars and parsers
+;; of semantic.
+;;
+;; This library offers:
+;;
+;; 1. Commands to run regression tests for grammar/parser tests. See the
+;;    commands
+;;    - `semantic-regtest-run-test'
+;;    - `semantic-regtest-create-output'
+;;    - `semantic-regtest-cmp-results'
+;;    for a first description what this library can do with this respect.
+;;
+;;    Because for each of these three commands a function *--internal exists
+;;    (which is meant to be used from within elisp) it should not be hard to
+;;    run these functions from within a Makefile to run all regression-tests
+;;    in batch-mode - e.g. before releasing a new release.
+;;
+;; 2. A new major-mode `semantic-regtest-mode' which is added to the
+;;    `auto-mode-alist' for files ending with "*.res' (e.g. the command
+;;    `semantic-regtest-run-test' creates autom. a result-file with such an
+;;    extension). This new major-mode makes a lot of stuff in the result-file
+;;    clickable - for details and keybindings see `semantic-regtest-mode'.
+;;
+;;
+;; Currently this code is tested with GNU Emacs 21.X and the current CVS
+;; cedet-suite
+
+;;; TODO:
+;;
+;;  - testing with XEmacs
+;;  - defining some constants, e.g. for the separtor-string " |###| " and some
+;;    other currently hard coded stuff.
+;;  - maybe using another parent-major-mode instead of `view-mode'?
+;;  - testing when driven by a Makefile
+;;  - testing with other code than c++, e.g. java, elisp....
+
+;;; Code
+
+(require 'semantic)
+
+(defgroup semantic-regtest nil
+  "Settings for semantic grammar/parser regression-tests."
+  :group 'semantic
+  :prefix "semantic-regtest-")
+
+(defcustom semantic-regtest-functions
+  '(semantic-regtest-prin1)
+  "*Functions used for the grammar/parser regression-test.
+Every element must be a function which gets one tag-argument and must return
+a string which is the printed information about this tag. The function must
+take into accout the value of `semantic-regtest-print-tag-boundaries'.
+
+If nil then always `semantic-format-tag-prin1' is used; then of course the
+value of `semantic-regtest-print-tag-boundaries' is automatically considered."
+  :group 'semantic-regtest
+  :type '(repeat (function :tag "Regression-test function")))
+
+(defcustom semantic-regtest-print-tag-boundaries nil
+  "*The generic regression-tag-format contains tag-boundaries.
+
+The default-value is nil because normally it is not senseful to include
+tag-boundaries into the printed generic tag-format because it prevents the
+parsing check being independent from changing whitespace or comments in the
+testfiles - which would not changing the tag-data itself but the
+data-locations. But if this option is not nil then for each tag the
+tag-boundaries are included in the output - if the tag is not positionless."
+  :group 'semantic-regtest
+  :type 'boolean)  
+
+(defcustom semantic-regtest-highlight-tag t
+  "*Highlight tag in the source-file.
+This highlights the tag jumped to by `semantic-regtest-open-source-file' or
+`semantic-regtest-mouse-open-source-file'."
+  :group 'semantic-regtest
+  :type 'boolean)
+
+(defcustom semantic-regtest-find-file-function 'find-file-other-window
+  "*Displayfunction for the files of `semantic-regtest-mode'.
+This function is used to display a file in a window if one of the commands of
+`semantic-regtest-mode' is used. The function gets one argument - a filename -
+and has to display this file in a window.
+
+Default is `find-file-other-window'."
+  :group 'semantic-regtest
+  :type 'function)
+
+(defface semantic-regtest-test-button-face
+  '((((class color) (background dark))
+     (:forground "blue" :bold t))
+    (((class color) (background light))
+     (:foreground "blue" :bold t)))
+  "*Face used to show clickable buttons for the test files.
+This can be the source-file and the test output file."
+  :group 'semantic-regtest)
+
+(defface semantic-regtest-reference-button-face
+  '((((class color) (background dark))
+     (:forground "ForestGreen" :bold t))
+    (((class color) (background light))
+     (:foreground "ForestGreen" :bold t)))
+  "*Face used to show clickable buttons for the reference file."
+  :group 'semantic-regtest)
+
+;;;###autoload
+(defun semantic-regtest-run-test ()
+  (interactive)
+  "Run a regression-test for a semantic-supported source-file.
+The user will be asked for the file-name of that file for which the test
+should be performed. If the current buffer is a semantic-supported buffer then
+its file-name will be offered as default. For more details see the function
+`semantic-regtest-run-test--internal'."
+  (let* ((source-file (if (semantic-active-p) (buffer-file-name)))
+         (file (read-file-name "Source-file: " nil source-file nil
+                               (and source-file
+                                    (file-name-nondirectory source-file)))))
+    (if (semantic-regtest-run-test--internal file)
+        (message "Regressiontest fails - see the generated result-file for the diff!")
+      (message "Regressiontest succeeds - no differences to the reference-file!"))))
+
+(defun semantic-regtest-run-test--internal (test-source-file)
+  "Run a regression test for TEST-SOURCE-FILE.
+If the regression-tests fails - i.e. if there are differences to the
+reference-file - then the generated result-file will be displayed in another
+window with active `semantic-regtest-mode'.
+
+`semantic-regtest-run-test' is a regression test function which uses all the
+utility functions of this library to run a regression test for a source-file.
+The function assumes the following dir- and file-structure:
+- all files reside in the same subdir
+- Name of the reference output-file: TEST-SOURCE-FILE.ro
+  \(Must already be generated with `semantic-regtest-create-output'!)
+- Name of the test output-file: TEST-SOURCE-FILE.to
+  \(Will be generated with `semantic-regtest-create-output')
+- Name of the result file of the test: TEST-SOURCE-FILE.res \(Will be
+  generated with `semantic-regtest-cmp-results' by comparing
+  TEST-SOURCE-FILE.to with TEST-SOURCE-FILE.ro.
+
+Example for test.cpp:
+- Reference output-file: test.cpp.ro
+- Test output-file: test.cpp.to
+- Result file of the regression-test: test.cpp.res
+
+Return nil if the are no differences in the test-outputs, i.e. if the test
+succeeds. If the test fails \(i.e. there are differences between the
+test-outputs) then the name of the generated result-file is returned.
+
+The format of the file TEST-SOURCE-FILE.res is described at the command
+`semantic-regtest-cmp-results'. Also how to interpret and use the file
+TEST-SOURCE-FILE.res."  
+  (let* ((test-file (expand-file-name test-source-file))
+         (ref-output-file (concat test-file ".ro"))
+         (test-output-file (concat test-file ".to"))
+         (result-file (concat test-file ".res")))
+    ;; opening the test source-file
+    (save-excursion
+      (set-buffer (find-file-noselect test-file))
+      ;; generating the output of the grammar/parser test
+      (semantic-regtest-create-output--internal test-output-file))
+    ;; comparing with the reference output and writing a result-file.
+    (when (semantic-regtest-cmp-results--internal test-file test-output-file
+                                                  ref-output-file result-file)
+        ;; now opening the result file in `semantic-regtest-mode'
+      (find-file-other-window result-file)
+      result-file)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: These pure utility-function should
+;; be placed elsewhere!
+(defun semantic-regtest-excessive-trim (str)
+  "Return a string where all double-and-more whitespaces in STR are replaced
+with a single space-character."
+  (let ((s str))
+    (save-match-data
+      (while (string-match "[ \t][ \t]+" s)
+        (setq s (concat (substring s 0 (match-beginning 0))
+                        " "
+                        (substring s (match-end 0))))))
+    s))
+
+(defun semantic-regtest-normalize-whitespace (text)
+  "Replace all newlines with one single space and run the function
+`semantic-regtest-excessive-trim' onto the result."
+  (semantic-regtest-excessive-trim (subst-char-in-string ?\n 32 text)))
+
+
+;;;###autoload
+(defun semantic-regtest-create-output ()
+  "Creates the test-output for the current buffer.
+The user will be asked for the file-name of the created test-output-file \(see
+`semantic-regtest-create-output--internal')."
+  (interactive)
+  (let ((file (if (file-exists-p (concat (buffer-file-name) ".ro"))
+                  (concat (buffer-file-name) ".to")
+                (concat (buffer-file-name) ".ro"))))
+    (setq file (read-file-name "Test-output: " nil file nil
+                               (file-name-nondirectory file)))
+    (semantic-regtest-create-output--internal file)))
+  
+
+(defun semantic-regtest-create-output--internal (test-output-file)
+  "Runs the functions in `semantic-regtest-functions' on every tag in current
+buffer and writes the output to TEST-OUTPUT-FILE. This gives a regression-able
+test of a grammar/parser because this function can run on a testfile F before
+grammar-changes and after grammar-changes and after that the two output-files
+can be compared with a tool like diff \(but recommended is to use
+`semantic-regtest-cmp-results').
+
+IMPORTANT: ALL information about a tag is written in ONE line. This is for
+better comparsion with line-oriented tools like diff. The format of a line is:
+
+  <tag-name> |###| <tag-type> |###| <full tag-text> |###|
+     <output of print-function-1> |###| <output of print-function-2> |###|
+     ... |###|
+
+whereas <tag-name>, <full tag-text> and <output of print-function-X> are
+normalized concerning whitespace \(`semantic-regtest-normalize-whitespace'),
+<output of print-function-1> is \"<print-function-1>: <print-text>\" whereas
+<print-function-X> is part of `semantic-regtest-functions'.
+
+Return the number of tags."
+  (goto-char (point-min))
+  (let ((buf (get-buffer-create "*Semantic regression test*"))
+        (test-functions (or semantic-regtest-functions
+                            '(semantic-format-tag-prin1)))
+        (tag-counter 0)
+        tag tag-extend tag-text output-str)
+
+    (unless (semantic-active-p)
+      (error "Sorry, regression-test are only possible for semantic supported sources!"))
+    
+    ;; clean the output buffer
+    (save-excursion
+      (set-buffer buf)
+      (erase-buffer))
+    
+    ;; reparse the whole source-buffer so we have fresh-parsed tags
+    (semantic-fetch-tags)
+
+    ;; print out the tag informations of all tags. IMPORTANT: ALL
+    ;; information about a tag is written in ONE line. This is for better
+    ;; comparsion with line-oriented tools like diff.
+    ;; The format of a line is:
+    ;; <tag-name> |###| <full tag-text> |###| <output of print-function-1>
+    ;;    |###| <output of print-function-2> |###| ... |###|
+    ;; whereas <output of print-function-1> is "<print-function-1>: <print-text>"
+    ;; (all in one single line without linebreaks!)
+    
+    (while (setq tag (semantic-find-tag-by-overlay-next))
+      (setq tag-counter (1+ tag-counter))
+      (if (not (semantic-tag-with-position-p tag))
+          (setq tag-text "This is a positionless tag")
+        (setq tag-extend (semantic-tag-bounds tag))
+        (setq tag-text (buffer-substring-no-properties (nth 0 tag-extend)
+                                                       (nth 1 tag-extend))))
+      (setq output-str (format "%s |###| %s |###| %s |###|"
+                               ;; we have to normalize also the whitespace of
+                               ;; a tag-name because because there is nowhere
+                               ;; forbidden that a tag-name can contain spaces
+                               ;; or newlines (e.g. the python-parser produces
+                               ;; such tag-names)
+                               (semantic-regtest-normalize-whitespace
+                                (semantic-tag-name tag))
+                               (symbol-name (semantic-tag-class tag))
+                               ;; to make testresults whitespace-independend
+                               ;; we remove all newlines and then we trim all
+                               ;; spaces to exactly one space
+                               (semantic-regtest-normalize-whitespace tag-text)))
+
+      (dolist (fnc test-functions)
+        (setq output-str
+              (concat output-str (format " %s: %s |###|"
+                                         (symbol-name fnc)
+                                         ;; we normalize the whitespace of the
+                                         ;; returned string because there can
+                                         ;; be tags with a tagname which
+                                         ;; contains spaces or newlines (e.g.
+                                         ;; with python)
+                                         (semantic-regtest-normalize-whitespace
+                                          (funcall fnc tag))))))
+        (save-excursion
+        (set-buffer buf)
+        (goto-char (point-max))
+        (insert output-str)
+        (insert "\n"))
+      (goto-char (semantic-tag-start tag)))
+
+    ;; write the generated tag-informations into TEST-OUTPUT-FILE
+    (save-excursion
+      (set-buffer buf)
+      ;; maybe removing the overlay-positions
+      (goto-char (point-min))
+      (if semantic-regtest-print-tag-boundaries
+          (while (re-search-forward
+                  "#<overlay from \\([0-9]+\\) to \\([0-9]+\\) in [^>]+>"
+                  nil t)
+            (replace-match "[\\1 \\2]"))
+        (while (re-search-forward "#<overlay from [0-9]+ to [0-9]+ in [^>]+>"
+                                  nil t)
+          (replace-match "[Location info filtered out]")))
+      (write-region (point-min) (point-max) test-output-file))
+
+    ;; clean up
+    (kill-buffer buf)
+    (goto-char (point-min))
+
+    ;; return number of printed tags
+    tag-counter))
+
+(defun semantic-regtest-convert-difference (buffer start end)
+  "Parse the diff-difference located in BUFFER between START and END. Cause of
+the facts that each line in the output of `semantic-regtest-create-output'
+represents exactly one tag and \[START, END] always define a
+set of complete lines of BUFFER \(and therefore a set of tag-outputs) the
+text between START and END can be splitted in lines and each of these lines is
+splitted by the separator \" |###| \".
+
+Result is either nil \(if START = END) or a list of sublists whereas each
+sublist represents one line resp. tag between START and END and consist
+therefore of the following elements:
+0. tag-number of tag in the test-file (= line-number in the test-file)
+1. name of the tag
+2. type of the tag \(function, variable, type, include etc...)
+3. the complete tag text
+4. the tag-string of the first tag-print-function. This string looks like
+   \"<print-function>: <print-output>\", e.g. \"semantic-format-tag-prin1:
+   \(\\\"c++-test.hh\\\" include nil nil nil \[Location info filtered out])\"
+   \(all output of a tag is in one line - no linebreaks!)
+5. the tag-string of the second tag-print-function
+6. ...
+If a list then every sublist contains at least 5 elements \(0. to 4.)."
+  (and (not (= start end))
+       (save-excursion
+         (set-buffer buffer)
+         (let ((line-list (split-string (buffer-substring-no-properties start
+                                                                        end)
+                                        "\n"))
+               (line-counter (1+ (count-lines (point-min) start)))
+               result)
+           (dolist (line line-list)
+             (setq result
+                   (cons
+                    (append (list line-counter)
+                            (split-string line " |###| ?"))
+                    result))
+             (setq line-counter (1+ line-counter)))
+           (nreverse result)))))
+
+;; The following two function are examples how to print the data of one
+;; diff-difference (can contain data for more than 1 line (resp. tag)!).
+(defun semantic-regtest-1-diffdata2str (diff-data file &optional prefix)
+  "Convert the data of DIFF-DATA into a suitable string-representation where
+each element of DIFF-DATA is separated by a newline within this string. PREFIX
+is the prefix for each line if a string."
+  (let ((output-str nil))
+    (dolist (elem diff-data output-str)
+      (setq output-str
+            (concat output-str
+                    (format "%s%s (tag-type: %s, [%d. tag of %s file])\n"
+                            (or prefix
+                                "")
+                            (nth 1 elem) (nth 2 elem) (nth 0 elem) file))))))
+
+(defun semantic-regtest-2-diffdata2str (a-diff-data b-diff-data
+                                                    &optional prefix)
+  "Convert the data of A-DIFF-DATA into a suitable string-representation by
+comparing each elem of A-DIFF-DATA with the related elem of B-DIFF-DATA where
+each element of A-DIFF-DATA is printed by two lines whereas the first line
+contains the tag-name of the A-DIFF-DATA-elem and the tag-numbers and the
+second line contains the kind of difference between the two elements \(
+different tag-name, tag-type, tag-text and/or tag-output). PREFIX is
+the prefix for the first line of such a two-line-block - the second line gets
+a prefix with same length as PREFIX but filled with spaces.
+
+If the length of A-DIFF-DATA and B-DIFF-DATA is unequal then an error is
+reported."
+  (if (not (= (length a-diff-data) (length b-diff-data)))
+      (error "Can not compare diff-lists with unequal length!")
+    (let ((b-diff-data-copy b-diff-data)
+          str)
+      (dolist (elem a-diff-data str)
+        (setq str
+              (concat str
+                      (format "%s%s (type: %s, [%d. tag of test file], [%d. tag of reference file])\n"
+                              (or prefix
+                                  "")
+                              (nth 1 elem)
+                              (nth 2 elem)
+                              (nth 0 elem)
+                              (nth 0 (car b-diff-data-copy)))
+                      (format "%s%s%s%s%s\n"
+                              (make-string (length prefix) 32)
+                              (if (not (string= (nth 1 elem)
+                                                (nth 1 (car b-diff-data-copy))))
+                                  "Different tag-name, "
+                                "")
+                              (if (not (string= (nth 2 elem)
+                                                (nth 2 (car b-diff-data-copy))))
+                                  "Different tag-type, "
+                                "")
+                              (if (not (string= (nth 3 elem)
+                                                (nth 3 (car b-diff-data-copy))))
+                                  "Different tag-text, "
+                                "")
+                              (if (not (string= (nth 4 elem)
+                                                (nth 4 (car b-diff-data-copy))))
+                                  "Different tag-output"
+                                ""))))
+        (setq b-diff-data-copy (cdr b-diff-data-copy))))))
+
+;; this is the only function where ediff-stuff is used!
+(defun semantic-regtest-ediff (file-a file-b)
+  "Run ediff noninteractively to compare FILE-A and FILE-B. The result
+is is list with contains for every difference between FILE-A and FILE-B a
+vector: \[a-start a-end b-start b-end nil nil nil nil nil nil nil]
+
+What is the \"semantic\" of such a difference-result-vector:
+
+If \(a-start = a-end) Then lines \(= tags) between b-start and b-end of
+                          FILE-B are missed in FILE-A
+ElseIf \(b-start = b-end) Then lines \(= tags between a-start and a-end are
+                              new in FILE-A (missed in the FILE-B) 
+Else lines \(= tags between a-start and a-end are parsed differently.
+
+If there are no differences between FILE-A and FILE-B then nil is returned."      
+  (require 'ediff)
+  ;; we must set ediff-buffer-A, ediff-buffer-B and ediff-buffer-C because
+  ;; these buffers are needed by ediff to work
+  (let ((ediff-buffer-A (find-file-noselect (expand-file-name file-a)))
+        (ediff-buffer-B (find-file-noselect (expand-file-name file-b)))
+        (ediff-buffer-C nil))
+
+    (if (string-match "c" ediff-diff-options)
+        (error "Option `-c' is not allowed in `ediff-diff-options'"))
+
+    ;; use some ediff stuff to produce correct differences between test-file
+    ;; and ref-file
+    (or (and ediff-diff-buffer (buffer-live-p ediff-diff-buffer))
+        (setq ediff-diff-buffer
+              (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
+    (ediff-make-diff2-buffer ediff-diff-buffer file-a file-b)
+    (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer)
+    (cdr (ediff-extract-diffs ediff-diff-buffer nil nil))))
+
+
+;;;###autoload
+(defun semantic-regtest-cmp-results (&optional use-full-path-name)
+  "Compare two test-outputs and create a suitable formatted result-file.
+
+The user will be asked for four file-names:
+
+   SOURCE-FILE: The underlying source-file for which the test-outputs have
+   been created. If current buffer is a semantic-supported buffer then the
+   file-name of the current buffer is offered as default.
+
+   TEST-FILE: The regression-testoutput for SOURCE-FILE. It must be an already
+   existing file which has been created by `semantic-regtest-create-output' or
+   the function `semantic-regtest-create-output--internal'. If a file
+   SOURCE-FILE.to exists already in current directory then this file is
+   offered as default.
+
+   REF-FILE: The reference testoutput for SOURCE-FILE. TEST-FILE will be
+   compared against this file. It must be an already existing file which has
+   been created by the command `semantic-regtest-create-output' or the
+   function `semantic-regtest-create-output--internal'. If a file
+   SOURCE-FILE.ro exists already in current directory then this file is
+   offered as default.
+
+   RESULT-FILE: That file will contain the comparisson-result generated by
+   `semantic-regtest-cmp-results--internal'. Per default the filename
+   SOURCE-FILE.res is offered.
+
+This command calls `semantic-regtest-cmp-results--internal' with that four
+file-names. See this function for details about the optional argument
+`use-full-path-name' and a description of the format of RESULT-FILE."
+  (interactive "P")
+  (let* ((source-file (if (semantic-active-p) (buffer-file-name)))
+         (test-file (and source-file
+                         (file-exists-p (concat source-file ".to"))
+                         (concat source-file ".to")))
+         (ref-file (and source-file
+                        (file-exists-p (concat source-file ".ro"))
+                        (concat source-file ".ro")))
+         (result-file (and source-file (concat source-file ".res"))))
+    (setq source-file (read-file-name "Source-file: " nil source-file nil
+                                      (and source-file
+                                           (file-name-nondirectory source-file))))
+    (setq test-file (read-file-name "Test-output: " nil test-file nil
+                                    (and test-file
+                                         (file-name-nondirectory test-file))))
+    (setq ref-file (read-file-name "Reference-output: " nil ref-file nil
+                                   (and ref-file
+                                        (file-name-nondirectory ref-file))))
+    (setq result-file (read-file-name "Test-result: " nil result-file nil
+                                      (and result-file
+                                           (file-name-nondirectory result-file))))
+    (semantic-regtest-cmp-results--internal source-file test-file ref-file
+                                            result-file use-full-path-name)))
+    
+
+(defun semantic-regtest-cmp-results--internal (source-file
+                                               test-file
+                                               ref-file
+                                               result-file
+                                               &optional use-full-path-name)
+  "Compare TEST-FILE and REF-FILE and write the results to RESULT-FILE.
+
+SOURCE-FILE is only used to write the file-name into RESULT-FILE.
+
+Return nil if there are no differences between TEST-FILE and REF-FILE
+otherwise return not nil.
+
+Format of RESULT-FILE is:
+
+------------------------------------------------------------------------
+Semantic grammar/parser regression-test
+
+Source file: SOURCE-FILE
+Test output file: TEST-FILE
+Reference file: REF-FILE
+
+<Here are listed all tag-parsing differences: This can be missed tags
+\(i.e. tag which are only in REF-FILE), new tags \(tag which are only in
+TEST-FILE) and differently parsed tags. Each type can occur multiple times
+and the sequence follows the original sequence of the differences detected by
+the ediff-comparison>
+------------------------------------------------------------------------
+
+If USE-FULL-PATH-NAME is nil then these three filesnames are without
+path-informations because normally all four files \(SOURCE-FILE TEST-FILE
+REF-FILE and RESULT-FILE) should reside in the same directory so the path-info
+is not needed to open these files from within `semantic-regtest-mode'. If
+USE-FULL-PATH-NAME is not nil \(called with a prefix arg) filenames include
+full path-info.
+
+How to interpret and use the created RESULT-FILE:
+  
+For all differences reported in RESULT-FILE the number N of the each missed,
+new or differently parsed tag is printed out. With this number you can
+- use `semantic-regtest-goto-tag' to jump to the N-th tag in the
+  source-file for which TEST-FILE is generated to check the tag in the
+  source-code
+- use `goto-line' to go to the N-th line in either TEST-FILE or REF-FILE to
+  check the output of `semantic-regtest-create-output' for this tag.
+- Open the file in `semantic-regtest-mode' and use the offered buttons and
+  keybindings."
+  (let ((diff-result (semantic-regtest-ediff test-file ref-file))
+        (test-buffer (find-file-noselect (expand-file-name test-file)))
+        (ref-buffer (find-file-noselect (expand-file-name ref-file)))
+        a-start a-end a-diff-data b-start b-end b-diff-data output-str)
+    
+    (with-temp-file (expand-file-name result-file)
+      (erase-buffer)
+      (insert "Semantic grammar/parser regression-test\n\n")
+      (insert (format "Source file: [%s]\n"
+                      (if use-full-path-name
+                          source-file
+                        (file-name-nondirectory source-file))))
+      (insert (format "Test output file: [%s]\n"
+                      (if use-full-path-name
+                          test-file
+                        (file-name-nondirectory test-file))))
+      (insert (format "Reference file: [%s]\n"
+                      (if use-full-path-name
+                          ref-file
+                        (file-name-nondirectory ref-file))))
+      (insert "\n\n")
+      
+      (if (null diff-result)
+          (insert "No differences!\n")
+        ;; evaluating the ediff-result
+        (dolist (diff-elem diff-result)
+          (setq a-start (aref diff-elem 0)
+                a-end (aref diff-elem 1)                
+                a-diff-data (semantic-regtest-convert-difference
+                             test-buffer a-start a-end)
+                
+                b-start (aref diff-elem 2)
+                b-end (aref diff-elem 3)
+                b-diff-data (semantic-regtest-convert-difference
+                             ref-buffer b-start b-end))
+          
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: The following is just a
+          ;; first example how the output of the test-result could look. Maybe
+          ;; it would be useful to print out more data about differences - but
+          ;; this is not a problem, because we have all data we need in the
+          ;; a-diff-data resp. b-diff-data.
+          
+          (cond ((null a-diff-data) ;; tags are missed
+                 (setq output-str
+                       (concat "These tags are only in the reference file:\n"
+                               (semantic-regtest-1-diffdata2str b-diff-data
+                                                                "reference"
+                                                                "- "))))
+                ((null b-diff-data) ;; tags are new
+                 (setq output-str
+                       (concat "These tags are only in the test file:\n"
+                               (semantic-regtest-1-diffdata2str a-diff-data
+                                                                "test"
+                                                                "+ "))))
+                (t ;; tag are parsed differently
+                 ;; if a-diff-data and b-diff-data contain the same number of
+                 ;; elements then we can compare the tags of a-diff-data and
+                 ;; b-diff-data on a pair-basis. Otherwise we simply list the
+                 ;; tags of a-diff-data and then the tags of b-diff-data.
+                 (if (= (length a-diff-data) (length b-diff-data))
+                     (setq output-str
+                           (concat "These tags are parsed differently:\n"
+                                   (semantic-regtest-2-diffdata2str a-diff-data
+                                                                    b-diff-data
+                                                                    "* ")))
+                   (setq output-str
+                         (concat "These tag of a the test- and the reference-file are parsed differently:\n"
+                                 (semantic-regtest-1-diffdata2str a-diff-data
+                                                                  "test"
+                                                                  "-t- ")
+                                 (semantic-regtest-1-diffdata2str b-diff-data
+                                                                  "reference"
+                                                                  "-r- "))))))
+          
+          (insert output-str)
+          (insert "\n\n"))))
+
+    ;; clean up
+    (kill-buffer test-buffer)
+    (kill-buffer ref-buffer)
+    diff-result))
+
+(defun semantic-regtest-goto-tag (tag-number)
+  "Jump to the tag with number TAG-NUMBER in current buffer.
+Counting starts always at the beginning of current buffer.
+
+This function can be used for fast and easy jumping to the differences
+reported by `semantic-regtest-cmp-results'."
+  (interactive "nNumber of tag to jump: ")
+  (goto-char (point-min))
+  (let ((tag-counter 0)
+        tag)
+    (while (and (< tag-counter tag-number)
+                (setq tag (semantic-find-tag-by-overlay-next)))
+      (setq tag-counter (1+ tag-counter))
+      (goto-char (semantic-tag-start tag)))))
+
+
+;; ------ code for the new major-mode semantic-regtest-mode -----------------
+
+(defun semantic-regtest-mouse-open-source-file (e)
+  "See `semantic-regtest-open-source-file'"
+  (interactive "e")
+  (mouse-set-point e)
+  (semantic-regtest-goto-file 'source))
+
+(defun semantic-regtest-mouse-open-output-file (e)
+  "See `semantic-regtest-open-output-file'"
+  (interactive "e")
+  (mouse-set-point e)
+  (semantic-regtest-goto-file 'output))
+      
+(defun semantic-regtest-open-source-file ()
+  "Open the source-file of this button in another window. If the button is a
+tag-number then jump also to this tag."
+  (interactive)
+  (semantic-regtest-goto-file 'source))
+
+(defun semantic-regtest-open-output-file ()
+  "Open the output-file of this button in another window. If the button is a
+tag-number then jump also to this line in the output-file."
+  (interactive)
+  (semantic-regtest-goto-file 'output))
+      
+    
+(defun semantic-regtest-goto-file (type)
+  "Action function for all clickable buttons in `semantic-regtest-mode'.
+TYPE can be one of the symbols `output' or `source'. In case of the former one
+it tries to open the right output-file in the other-window and tries to jump
+to the right line. In case of the latter one it opens the source-file in the
+other window and tries to jump to the right tag."
+  (let ((file (if (equal type 'output)
+                  (or (get-text-property (point)
+                                         'semantic-regtest-mode-test-file)
+                      (get-text-property (point)
+                                         'semantic-regtest-mode-ref-file))
+                (get-text-property (point)
+                                   'semantic-regtest-mode-source-file)))
+        (tag-number (ignore-errors
+                        (string-to-number
+                         (get-text-property
+                          (point)
+                          'semantic-regtest-mode-tag-number)))))
+    (when file
+      (message "Opening file: %s" (file-name-nondirectory file))
+      (funcall semantic-regtest-find-file-function file)
+      (when tag-number
+        (if (equal type 'output)
+            (goto-line tag-number)
+          (semantic-regtest-goto-tag tag-number)
+          (if semantic-regtest-highlight-tag
+              (semantic-momentary-highlight-tag
+               (semantic-current-tag))))))))
+
+
+(defun semantic-regtest-mode-init ()
+  "Initializes `semantic-regtest-mode'. This means making all tag-numbers
+and the source-file, the test output file and the reference file clickable."
+  (let ((buffer-read-only nil)
+        regtest-mode-source-file
+        regtest-mode-test-file
+        regtest-mode-ref-file)
+    (goto-char (point-min))
+
+    ;; make the 3 files clickable
+
+    (if (re-search-forward "^Source file: \\[\\(.+\\)\\]$" nil t)
+        (progn
+          (setq regtest-mode-source-file (match-string 1))
+          (add-text-properties (1- (match-beginning 1))
+                               (1+ (match-end 1))
+                               `(mouse-face
+                                 highlight
+                                 help-echo
+                                 ,(format "Mouse-2 opens the file %s"
+                                          regtest-mode-source-file)
+                                 face
+                                 semantic-regtest-test-button-face
+                                 semantic-regtest-mode-source-file
+                                 ,regtest-mode-source-file)))
+      (error "No source file found in the regtest result!"))
+    (goto-char (point-min))
+    (if (re-search-forward "^Test output file: \\[\\(.+\\)\\]$" nil t)
+        (progn
+          (setq regtest-mode-test-file (match-string 1))
+          (add-text-properties (1- (match-beginning 1))
+                               (1+ (match-end 1))
+                               `(mouse-face
+                                 highlight
+                                 help-echo
+                                 ,(format "Mouse-1 opens the file %s"
+                                          regtest-mode-test-file)
+                                 face
+                                 semantic-regtest-test-button-face
+                                 semantic-regtest-mode-test-file
+                                 ,regtest-mode-test-file)))
+      (error "No test ouput file found in the regtest result!"))
+    (goto-char (point-min))
+    (if (re-search-forward "^Reference file: \\[\\(.+\\)\\]$" nil t)
+        (progn
+          (setq regtest-mode-ref-file (match-string 1))
+          (add-text-properties (1- (match-beginning 1))
+                               (1+ (match-end 1))
+                               `(mouse-face
+                                 highlight
+                                 help-echo
+                                 ,(format "Mouse-1 opens the file %s"
+                                          regtest-mode-ref-file)
+                                 face
+                                 semantic-regtest-reference-button-face
+                                 semantic-regtest-mode-ref-file
+                                 ,regtest-mode-ref-file)))
+      (error "No reference-file file found in the regtest result!"))
+
+    ;; now make all tag-numbers clickable
+    
+    (goto-char (point-min))
+    (while (re-search-forward "\\([0-9]+\\)\\. tag of test file" nil t)
+      (add-text-properties (1- (match-beginning 0))
+                           (1+ (match-end 0))
+                           `(mouse-face
+                             highlight
+                             help-echo
+                             ,(format "Mouse-1 jumps to line %s in %s, mouse-2 jumps to this tag in %s"
+                                      (match-string 1) regtest-mode-test-file
+                                      regtest-mode-source-file)
+                             face
+                             semantic-regtest-test-button-face
+                             semantic-regtest-mode-tag-number
+                             ,(match-string 1)
+                             semantic-regtest-mode-source-file
+                             ,regtest-mode-source-file
+                             semantic-regtest-mode-test-file
+                             ,regtest-mode-test-file))
+      )
+    (goto-char (point-min))
+    (while (re-search-forward "\\([0-9]+\\)\\. tag of reference file" nil t)
+      (add-text-properties (1- (match-beginning 0))
+                           (1+ (match-end 0))
+                           `(mouse-face
+                             highlight
+                             help-echo
+                             ,(format "Mouse-1 jumps to line %s in %s"
+                                      (match-string 1) regtest-mode-ref-file)
+                             face
+                             semantic-regtest-reference-button-face
+                             semantic-regtest-mode-tag-number
+                             ,(match-string 1)
+                             semantic-regtest-mode-ref-file
+                             ,regtest-mode-ref-file))
+      )
+    (set-buffer-modified-p nil)
+    (goto-char (point-min))))
+  
+
+(define-derived-mode semantic-regtest-mode
+  view-mode "se-re-te"
+  "Major mode for viewing result files of semantic regression tests. The main
+purpose of this mode is to make all tag-numbers and the source-file, the
+test output file and the reference file clickable.
+\\{semantic-regtest-mode-map}"
+  (semantic-regtest-mode-init))
+
+;; mouse-bindings
+(define-key semantic-regtest-mode-map
+  (if (featurep 'xemacs) '(button1) [mouse-1])
+  'semantic-regtest-mouse-open-output-file)
+
+(define-key semantic-regtest-mode-map
+  (if (featurep 'xemacs) '(button2) [mouse-2])
+  'semantic-regtest-mouse-open-source-file)
+
+;; keyboard bindings:
+(define-key semantic-regtest-mode-map
+  (kbd "O")
+  'semantic-regtest-open-output-file)
+
+(define-key semantic-regtest-mode-map
+  (kbd "S")
+  'semantic-regtest-open-source-file)
+
+
+;; adding reference- and regtest-output- and result-files to the
+;; auto-mode-alist. We open the *.to and *.ro-files in text-mode to avoid
+;; parsing this files by semantic.
+(setq auto-mode-alist (append '(("\\.res\\'" . semantic-regtest-mode))
+                              auto-mode-alist))
+(setq auto-mode-alist (append '(("\\.to\\'" . text-mode)) auto-mode-alist))
+(setq auto-mode-alist (append '(("\\.ro\\'" . text-mode)) auto-mode-alist))
+
+
+;;; Generic format
+
+(defun semantic-regtest-convert-tag-table (table)
+  "Convert the tag table TABLE to a generic format."
+  (mapcar #'semantic-regtest-convert-tag table))
+
+(defun semantic-regtest--convert-tag (tag)
+  "Default tag-conversion of TAG into a generic format.
+Recurses over children when they are found. If the value of the option
+`semantic-regtest-print-tag-boundaries' is not nil then the tag-boundaries are
+added at the beginning of the generic tag-format."
+    (let* ((name (semantic-tag-name tag))
+           (class (semantic-tag-class tag))
+           (bounds (if (and semantic-regtest-print-tag-boundaries
+                            (semantic-tag-with-position-p tag))
+                       (semantic-tag-bounds tag)))
+           (attr (semantic-tag-attributes tag))
+           (generic nil))
+      (while attr
+        (let ((sym (car attr))
+              (val (car (cdr attr))))
+          (cond ((semantic-tag-p val)
+                 ;; This attribute is a tag (ie, a type perhaps?)
+                 (setq val (semantic-regtest-convert-tag val)))
+                ((and (listp val) (semantic-tag-p (car val)))
+                 ;; List of more tags in this property.  Children/members
+                 (setq val (semantic-regtest-convert-tag-table val)))
+                (t nil))
+          (setq generic (cons (list sym val) generic))
+          (setq attr (cdr (cdr attr)))))
+      ;; At this point, generic is an ALIST, not a PROPERTY LIST.
+      ;; We need to sort it so that order changes do not effect the
+      ;; test.
+      (setq generic (sort generic (lambda (a b)
+                                    (string< (symbol-name (car a))
+                                             (symbol-name (car b))))))
+      (append (delq nil (list bounds name class))
+              (apply 'append generic))
+      ))
+
+(define-overload semantic-regtest-convert-tag (tag)
+  "Convert TAG into a generic format.
+Recurses over children when they are found."
+  (semantic-regtest--convert-tag tag))
+
+(defun semantic-regtest-prin1 (tag)
+  "Dump TAG to a string and return this string."
+  (prin1-to-string (semantic-regtest-convert-tag tag)))
+
+
+(provide 'semantic-regtest)
+
+;;; semantic-regtest.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-sb.el b/site/cedet-1.0pre7/semantic/semantic-sb.el
new file mode 100755
index 0000000..f08ef4c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-sb.el
@@ -0,0 +1,420 @@
+;;; semantic-sb.el --- Semantic tag display for speedbar
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-sb.el,v 1.61 2009/09/11 23:34:40 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic-sb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Convert a tag table into speedbar buttons.
+
+;;; TODO:
+;;
+;; Use semanticdb to find which semanticdb-table is being used for each
+;; file/tag.  Replace `semantic-sb-with-tag-buffer' to instead call
+;; children with the new `with-mode-local' instead.
+
+(require 'semantic)
+(require 'semantic-util)
+(require 'inversion)
+(eval-and-compile
+  (inversion-require 'speedbar "0.15beta1"))
+
+(defcustom semantic-sb-autoexpand-length 1
+  "*Length of a semantic bucket to autoexpand in place.
+This will replace the named bucket that would have usually occured here."
+  :group 'speedbar
+  :type 'integer)
+
+(defcustom semantic-sb-button-format-tag-function 'semantic-format-tag-abbreviate
+  "*Function called to create the text for a but from a token."
+  :group 'speedbar
+  :type semantic-format-tag-custom-list)
+
+(defcustom semantic-sb-info-format-tag-function 'semantic-format-tag-summarize
+  "*Function called to create the text for info display from a token."
+  :group 'speedbar
+  :type semantic-format-tag-custom-list)
+
+;;; Code:
+;;
+
+;;; Buffer setting for correct mode manipulation.
+(defun semantic-sb-tag-set-buffer (tag)
+  "Set the current buffer to something associated with TAG.
+use the `speedbar-line-file' to get this info if needed."
+  (if (semantic-tag-buffer tag)
+      (set-buffer (semantic-tag-buffer tag))
+    (let ((f (speedbar-line-file)))
+      (set-buffer (find-file-noselect f)))))
+
+(defmacro semantic-sb-with-tag-buffer (tag &rest forms)
+  "Set the current buffer to the origin of TAG and execute FORMS.
+Restore the old current buffer when completed."
+  `(save-excursion
+     (semantic-sb-tag-set-buffer ,tag)
+     ,@forms))
+(put 'semantic-sb-with-tag-buffer 'lisp-indent-function 1)
+
+;;; Button Generation
+;;
+;;  Here are some button groups:
+;;
+;;  +> Function ()
+;;     @ return_type
+;;    +( arg1
+;;    +| arg2
+;;    +) arg3
+;;
+;;  +> Variable[1] =
+;;    @ type
+;;    = default value
+;;
+;;  +> keywrd Type
+;;   +> type part
+;;
+;;  +>  -> click to see additional information
+
+(define-overloadable-function semantic-sb-tag-children-to-expand (tag)
+  "For TAG, return a list of children that TAG expands to.
+If this returns a value, then a +> icon is created.
+If it returns nil, then a => icon is created.")
+
+(defun semantic-sb-tag-children-to-expand-default (tag)
+  "For TAG, the children for type, variable, and function classes."
+  (semantic-sb-with-tag-buffer tag
+    (semantic-tag-components tag)))
+
+(defun semantic-sb-one-button (tag depth &optional prefix)
+  "Insert TAG as a speedbar button at DEPTH.
+Optional PREFIX is used to specify special marker characters."
+  (let* ((class (semantic-tag-class tag))
+	 (edata (semantic-sb-tag-children-to-expand tag))
+	 (type (semantic-tag-type tag))
+	 (abbrev (semantic-sb-with-tag-buffer tag
+		   (funcall semantic-sb-button-format-tag-function tag)))
+	 (start (point))
+	 (end (progn
+		(insert (int-to-string depth) ":")
+		(point))))
+    (insert-char ?  (1- depth) nil)
+    (put-text-property end (point) 'invisible nil)
+    ;; take care of edata = (nil) -- a yucky but hard to clean case
+    (if (and edata (listp edata) (and (<= (length edata) 1) (not (car edata))))
+	(setq edata nil))
+    (if (and (not edata)
+	     (member class '(variable function))
+	     type)
+	(setq edata t))
+    ;; types are a bit unique.  Variable types can have special meaning.
+    (if edata
+	(speedbar-insert-button (if prefix (concat " +" prefix) " +>")
+				'speedbar-button-face
+				'speedbar-highlight-face
+				'semantic-sb-show-extra
+				tag t)
+      (speedbar-insert-button (if prefix (concat "  " prefix) " =>")
+			      nil nil nil nil t))
+    (speedbar-insert-button abbrev
+			    'speedbar-tag-face
+			    'speedbar-highlight-face
+			    'semantic-sb-token-jump
+			    tag t)
+    ;; This is very bizarre.  When this was just after the insertion
+    ;; of the depth: text, the : would get erased, but only for the
+    ;; auto-expanded short- buckets.  Move back for a later version
+    ;; version of Emacs 21 CVS
+    (put-text-property start end 'invisible t)
+    ))
+
+(defun semantic-sb-speedbar-data-line (depth button text &optional
+					     text-fun text-data)
+  "Insert a semantic token data element.
+DEPTH is the current depth.  BUTTON is the text for the button.
+TEXT is the actual info with TEXT-FUN to occur when it happens.
+Argument TEXT-DATA is the token data to pass to TEXT-FUN."
+  (let ((start (point))
+	(end (progn
+	       (insert (int-to-string depth) ":")
+	       (point))))
+    (put-text-property start end 'invisible t)
+    (insert-char ?  depth nil)
+    (put-text-property end (point) 'invisible nil)
+    (speedbar-insert-button button nil nil nil nil t)
+    (speedbar-insert-button text
+			    'speedbar-tag-face
+			    (if text-fun 'speedbar-highlight-face)
+			    text-fun text-data t)
+    ))
+
+(defun semantic-sb-maybe-token-to-button (obj indent &optional
+					      prefix modifiers)
+  "Convert OBJ, which was returned from the semantic parser, into a button.
+This OBJ might be a plain string (simple type or untyped variable)
+or a complete tag.
+Argument INDENT is the indentation used when making the button.
+Optional PREFIX is the character to use when marking the line.
+Optional MODIFIERS is additional text needed for variables."
+  (let ((myprefix (or prefix ">")))
+    (if (stringp obj)
+	(semantic-sb-speedbar-data-line indent myprefix obj)
+      (if (listp obj)
+	  (progn
+	    (if (and (stringp (car obj))
+		     (= (length obj) 1))
+		(semantic-sb-speedbar-data-line indent myprefix
+						(concat
+						 (car obj)
+						 (or modifiers "")))
+	      (semantic-sb-one-button obj indent prefix)))))))
+
+(defun semantic-sb-insert-details (tag indent)
+  "Insert details about TAG at level INDENT."
+  (let ((tt (semantic-tag-class tag))
+	(type (semantic-tag-type tag)))
+    (cond ((eq tt 'type)
+	   (let ((parts (semantic-tag-type-members tag))
+		 (newparts nil))
+	     ;; Lets expect PARTS to be a list of either strings,
+	     ;; or variable tokens.
+	     (when (semantic-tag-p (car parts))
+	       ;; Bucketize into groups
+	       (semantic-sb-with-tag-buffer (car parts)
+		 (setq newparts (semantic-bucketize parts)))
+	       (when (> (length newparts) semantic-sb-autoexpand-length)
+		 ;; More than one bucket, insert inline
+		 (semantic-sb-insert-tag-table (1- indent) newparts)
+		 (setq parts nil))
+	       ;; Dump the strings in.
+	       (while parts
+		 (semantic-sb-maybe-token-to-button (car parts) indent)
+		 (setq parts (cdr parts))))))
+	  ((eq tt 'variable)
+	   (if type
+	       (semantic-sb-maybe-token-to-button type indent "@"))
+	   (let ((default (semantic-tag-variable-default tag)))
+	     (if default
+		 (semantic-sb-maybe-token-to-button default indent "=")))
+	   )
+	  ((eq tt 'function)
+	   (if type
+	       (semantic-sb-speedbar-data-line
+		indent "@"
+		(if (stringp type) type
+		  (semantic-tag-name type))))
+	   ;; Arguments to the function
+	   (let ((args (semantic-tag-function-arguments tag)))
+	     (if (and args (car args))
+		 (progn
+		   (semantic-sb-maybe-token-to-button (car args) indent "(")
+		   (setq args (cdr args))
+		   (while (> (length args) 1)
+		     (semantic-sb-maybe-token-to-button (car args)
+							indent
+							"|")
+		     (setq args (cdr args)))
+		   (if args
+		       (semantic-sb-maybe-token-to-button
+			(car args) indent ")"))
+		   ))))
+	  (t
+	   (let ((components
+		  (save-excursion
+		    (when (and (semantic-tag-overlay tag)
+			       (semantic-tag-buffer tag))
+		      (set-buffer (semantic-tag-buffer tag)))
+		    (semantic-sb-tag-children-to-expand tag))))
+	     ;; Well, it wasn't one of the many things we expect.
+	     ;; Lets just insert them in with no decoration.
+	     (while components
+	       (semantic-sb-one-button (car components) indent)
+	       (setq components (cdr components)))
+	     ))
+	  )
+    ))
+
+(defun semantic-sb-detail-parent ()
+  "Return the first parent token of the current line that includes a location."
+  (save-excursion
+    (beginning-of-line)
+    (let ((dep (if (looking-at "[0-9]+:")
+		   (1- (string-to-number (match-string 0)))
+		 0)))
+      (re-search-backward (concat "^"
+				  (int-to-string dep)
+				  ":")
+			  nil t))
+    (beginning-of-line)
+    (if (looking-at "[0-9]+: +[-+][>()@|] \\([^\n]+\\)$")
+	(let ((prop nil))
+	  (goto-char (match-beginning 1))
+	  (setq prop (get-text-property (point) 'speedbar-token))
+	  (if (semantic-tag-with-position-p prop)
+	      prop
+	    (semantic-sb-detail-parent)))
+      nil)))
+
+(defun semantic-sb-show-extra (text token indent)
+  "Display additional information about the token as an expansion.
+TEXT TOKEN and INDENT are the details."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (save-restriction
+	       (narrow-to-region (point) (point))
+	       ;; Add in stuff specific to this type of token.
+	       (semantic-sb-insert-details token (1+ indent))))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defun semantic-sb-token-jump (text token indent)
+  "Jump to the location specified in token.
+TEXT TOKEN and INDENT are the details."
+  (let ((file
+	 (or
+	  (cond ((fboundp 'speedbar-line-path)
+		 (speedbar-line-directory indent))
+		((fboundp 'speedbar-line-directory)
+		 (speedbar-line-directory indent)))
+	  ;; If speedbar cannot figure this out, extract the filename from
+	  ;; the token.  True for Analysis mode.
+	  (semantic-tag-file-name token)))
+	(parent (semantic-sb-detail-parent)))
+    (let ((f (selected-frame)))
+      (dframe-select-attached-frame speedbar-frame)
+      (run-hooks 'speedbar-before-visiting-tag-hook)
+      (select-frame f))
+    ;; Sometimes FILE may be nil here.  If you are debugging a problem
+    ;; when this happens, go back and figure out why FILE is nil and try
+    ;; and fix the source.
+    (speedbar-find-file-in-frame file)
+    (save-excursion (speedbar-stealthy-updates))
+    (semantic-go-to-tag token parent)
+    (switch-to-buffer (current-buffer))
+    ;; Reset the timer with a new timeout when cliking a file
+    ;; in case the user was navigating directories, we can cancel
+    ;; that other timer.
+    ;; (speedbar-set-timer dframe-update-speed)
+    ;;(recenter)
+    (speedbar-maybee-jump-to-attached-frame)
+    (run-hooks 'speedbar-visiting-tag-hook)))
+
+(defun semantic-sb-expand-group (text token indent)
+  "Expand a group which has semantic tokens.
+TEXT TOKEN and INDENT are the details."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (save-restriction
+	       (narrow-to-region (point-min) (point))
+	       (semantic-sb-buttons-plain (1+ indent) token)))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defun semantic-sb-buttons-plain (level tokens)
+  "Create buttons at LEVEL using TOKENS."
+  (let ((sordid (speedbar-create-tag-hierarchy tokens)))
+    (while sordid
+      (cond ((null (car-safe sordid)) nil)
+	    ((consp (car-safe (cdr-safe (car-safe sordid))))
+	     ;; A group!
+	     (speedbar-make-tag-line 'curly ?+ 'semantic-sb-expand-group
+				     (cdr (car sordid))
+				     (car (car sordid))
+				     nil nil 'speedbar-tag-face
+				     level))
+	    (t ;; Assume that this is a token.
+	     (semantic-sb-one-button (car sordid) level)))
+      (setq sordid (cdr sordid)))))
+
+(defun semantic-sb-insert-tag-table (level table)
+  "At LEVEL, insert the tag table TABLE.
+Use arcane knowledge about the semantic tokens in the tagged elements
+to create much wiser decisions about how to sort and group these items."
+  (semantic-sb-buttons level table))
+
+(defun semantic-sb-buttons (level lst)
+  "Create buttons at LEVEL using LST sorting into type buckets."
+  (save-restriction
+    (narrow-to-region (point-min) (point))
+    (let (tmp)
+      (while lst
+	(setq tmp (car lst))
+	(if (cdr tmp)
+	    (if (<= (length (cdr tmp)) semantic-sb-autoexpand-length)
+		(semantic-sb-buttons-plain (1+ level) (cdr tmp))
+	      (speedbar-make-tag-line 'curly ?+ 'semantic-sb-expand-group
+				      (cdr tmp)
+				      (car (car lst))
+				      nil nil 'speedbar-tag-face
+				      (1+ level))))
+	(setq lst (cdr lst))))))
+
+(defun semantic-sb-fetch-tag-table (file)
+  "Load FILE into a buffer, and generate tags using the Semantic parser.
+Returns the tag list, or t for an error."
+  (let ((out nil))
+    (if (and (featurep 'semanticdb) (semanticdb-minor-mode-p)
+	     (not speedbar-power-click)
+	     ;; If the database is loaded and running, try to get
+	     ;; tokens from it.
+	     (setq out (semanticdb-file-stream file)))
+	;; Successful DB query.
+	nil
+      ;; No database, do it the old way.
+      (save-excursion
+	(set-buffer (find-file-noselect file))
+	(if (or (not (featurep 'semantic))
+		(not semantic--parse-table))
+	    (setq out t)
+	  (if speedbar-power-click (semantic-clear-toplevel-cache))
+	  (setq out (semantic-fetch-tags)))))
+    (if (listp out)
+	(condition-case nil
+	    (progn
+	      ;; This brings externally defind methods into
+	      ;; their classes, and creates meta classes for
+	      ;; orphans.
+	      (setq out (semantic-adopt-external-members out))
+	      ;; Dump all the tokens into buckets.
+	      (semantic-sb-with-tag-buffer (car out)
+		(semantic-bucketize out)))
+	  (error t))
+      t)))
+
+;; Link ourselves into the tagging process.
+(add-to-list 'speedbar-dynamic-tags-function-list
+	     '(semantic-sb-fetch-tag-table  . semantic-sb-insert-tag-table))
+
+(provide 'semantic-sb)
+
+;;; semantic-sb.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-scope.el b/site/cedet-1.0pre7/semantic/semantic-scope.el
new file mode 100644
index 0000000..e4adb76
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-scope.el
@@ -0,0 +1,805 @@
+;;; semantic-scope.el --- Analyzer Scope Calculations
+
+;; Copyright (C) 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-scope.el,v 1.36 2010/02/19 02:23:59 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Calculate information about the current scope.
+;;
+;; Manages the current scope as a structure that can be cached on a
+;; per-file basis and recycled between different occurances of
+;; analysis on different parts of a file.
+;;
+;; Pattern for Scope Calculation
+;;
+;; Step 1: Calculate DataTypes in Scope:
+;;
+;; a) What is in scope via using statements or local namespaces
+;; b) Lineage of current context.  Some names drawn from step 1.
+;;
+;; Step 2: Convert type names into lists of concrete tags
+;;
+;; a) Convert each datatype into the real datatype tag
+;; b) Convert namespaces into the list of contents of the namespace.
+;; c) Merge all existing scopes together into one search list.
+;;
+;; Step 3: Local variables
+;;
+;; a) Local variables are in the master search list.
+;;
+
+(require 'semanticdb)
+(require 'semantic-analyze-fcn)
+(require 'semantic-ctxt)
+
+
+;;; Code:
+
+(defclass semantic-scope-cache (semanticdb-abstract-cache)
+  ((tag :initform nil
+	:documentation
+	"The tag this scope was calculated for.")
+   (scopetypes :initform nil
+	       :documentation
+	       "The list of types currently in scope.
+For C++, this would contain anonymous namespaces known, and
+anything labled by a `using' statement.")
+   (parents :initform nil
+	    :documentation
+	    "List of parents in scope w/in the body of this function.
+Presumably, the members of these parent classes are available for access
+based on private:, or public: style statements.")
+   (parentinheritance :initform nil
+		      :documentation "Alist of parents by inheritance.
+Each entry is ( PARENT . PROTECTION ), where PARENT is a type, and
+PROTECTION is a symbol representing the level of inheritance, such as 'private, or 'protected.")
+   (scope :initform nil
+	  :documentation
+	  "Items in scope due to the scopetypes or parents.")
+   (fullscope :initform nil
+	      :documentation
+	      "All the other stuff on one master list you can search.")
+   (localargs :initform nil
+	      :documentation
+	      "The arguments to the function tag.")
+   (localvar :initform nil
+	     :documentation
+	     "The local variables.")
+   (typescope :initform nil
+	      :documentation
+	      "Slot to save intermediate scope while metatypes are dereferenced.")
+   )
+  "Cache used for storage of the current scope by the Semantic Analyzer.
+Saves scoping information between runs of the analyzer.")
+
+;;; METHODS
+;;
+;; Methods for basic management of the structure in semanticdb.
+;;
+(defmethod semantic-reset ((obj semantic-scope-cache))
+  "Reset OBJ back to it's empty settings."
+  (oset obj tag nil)
+  (oset obj scopetypes nil)
+  (oset obj parents nil)
+  (oset obj parentinheritance nil)
+  (oset obj scope nil)
+  (oset obj fullscope nil)
+  (oset obj localargs nil)
+  (oset obj localvar nil)
+  (oset obj typescope nil)
+  )
+
+(defmethod semanticdb-synchronize ((cache semantic-scope-cache)
+				   new-tags)
+  "Synchronize a CACHE with some NEW-TAGS."
+  (semantic-reset cache))
+
+
+(defmethod semanticdb-partial-synchronize ((cache semantic-scope-cache)
+					   new-tags)
+  "Synchronize a CACHE with some changed NEW-TAGS."
+  ;; If there are any includes or datatypes changed, then clear.
+  (if (or (semantic-find-tags-by-class 'include new-tags)
+	  (semantic-find-tags-by-class 'type new-tags)
+	  (semantic-find-tags-by-class 'using new-tags))
+      (semantic-reset cache))
+  )
+
+;;;###autoload
+(defun semantic-scope-reset-cache ()
+  "Get the current cached scope, and reset it."
+  (when semanticdb-current-table
+    (let ((co (semanticdb-cache-get semanticdb-current-table
+				    semantic-scope-cache)))
+      (semantic-reset co))))
+
+(defmethod semantic-scope-set-typecache ((cache semantic-scope-cache)
+					 types-in-scope)
+  "Set the :typescope property on CACHE to some types.
+TYPES-IN-SCOPE is a list of type tags whos members are
+currently in scope.  For each type in TYPES-IN-SCOPE,
+add those members to the types list.
+If nil, then the typescope is reset."
+  (let ((newts nil)) ;; New Type Scope
+    (dolist (onetype types-in-scope)
+      (setq newts (append (semantic-tag-type-members onetype)
+			  newts))
+      )
+    (oset cache typescope newts)))
+
+;;; TAG SCOPES
+;;
+;; These fcns should be used by search routines that return a single
+;; tag which, in turn, may have come from a deep scope.  The scope
+;; will be attached to the tag.  Thus, in future scope based calls, a
+;; tag can be passed in and a scope derived from it.
+
+;;;###autoload
+(defun semantic-scope-tag-clone-with-scope (tag scopetags)
+  "Close TAG, and return it.  Add SCOPETAGS as a tag-local scope.
+Stores the SCOPETAGS as a set of tag properties on the cloned tag."
+  (let ((clone (semantic-tag-clone tag))
+	)
+    (semantic--tag-put-property clone 'scope scopetags)
+    ))
+
+(defun semantic-scope-tag-get-scope (tag)
+  "Get from TAG the list of tags comprising the scope from TAG."
+  (semantic--tag-get-property tag 'scope))
+
+;;; SCOPE UTILITIES
+;;
+;; Functions that do the main scope calculations
+
+
+(define-overloadable-function semantic-analyze-scoped-types (position)
+  "Return a list of types currently in scope at POSITION.
+This is based on what tags exist at POSITION, and any associated
+types available.")
+
+(defun semantic-analyze-scoped-types-default (position)
+  "Return a list of types currently in scope at POSITION.
+Use `semantic-ctxt-scoped-types' to find types."
+  (save-excursion
+    (goto-char position)
+    (let ((code-scoped-types nil))
+      ;; Lets ask if any types are currently scoped.  Scoped
+      ;; classes and types provide their public methods and types
+      ;; in source code, but are unrelated hierarchically.
+      (let ((sp (semantic-ctxt-scoped-types)))
+	(while sp
+	  ;; Get this thing as a tag
+	  (let ((tmp (cond
+		      ((stringp (car sp))
+		       (semanticdb-typecache-find (car sp)))
+		       ;(semantic-analyze-find-tag (car sp) 'type))
+		      ((semantic-tag-p (car sp))
+		       (if (semantic-analyze-tag-prototype-p (car sp))
+			   (semanticdb-typecache-find (semantic-tag-name (car sp)))
+			   ;;(semantic-analyze-find-tag (semantic-tag-name (car sp)) 'type)
+			 (car sp)))
+		      (t nil))))
+	    (when tmp
+	      (setq code-scoped-types
+		    (cons tmp code-scoped-types))))
+	  (setq  sp (cdr sp))))
+      (setq code-scoped-types (nreverse code-scoped-types))
+
+      (when code-scoped-types
+	(semanticdb-typecache-merge-streams code-scoped-types nil))
+
+      )))
+
+;;------------------------------------------------------------
+(define-overloadable-function semantic-analyze-scope-nested-tags (position scopedtypes)
+  "Return a list of types in order of nesting for the context of POSITION.
+If POSITION is in a method with a named parent, find that parent, and
+identify it's scope via overlay instead.
+Optional SCOPETYPES are additional scoped entities in which our parent might
+be found.")
+
+(defun semantic-analyze-scope-nested-tags-default (position scopetypes)
+  "Return a list of types in order of nesting for the context of POSITION.
+If POSITION is in a method with a named parent, find that parent, and
+identify it's scope via overlay instead.
+Optional SCOPETYPES are additional scoped entities in which our parent might
+be found.
+This only finds ONE immediate parent by name.  All other parents returned
+are from nesting data types."
+  (save-excursion
+    (if position (goto-char position))
+    (let* ((stack (reverse (semantic-find-tag-by-overlay (point))))
+	   (tag (car stack))
+	   (pparent (car (cdr stack)))
+	   (returnlist nil)
+	   )
+      ;; In case of arg lists or some-such, throw out non-types.
+      (while (and stack (not (semantic-tag-of-class-p pparent 'type)))
+	(setq stack (cdr stack) pparent (car (cdr stack))))
+
+      ;; Remove duplicates
+      (while (member pparent scopetypes)
+	(setq stack (cdr stack) pparent (car (cdr stack))))
+
+      ;; Step 1:
+      ;;    Analyze the stack of tags we are nested in as parents.
+      ;;
+
+      ;; If we have a pparent tag, lets go there
+      ;; an analyze that stack of tags.
+      (when (and pparent (semantic-tag-with-position-p pparent))
+	(semantic-go-to-tag pparent)
+	(setq stack (semantic-find-tag-by-overlay (point)))
+	;; Step one, find the merged version of stack in the typecache.
+	(let* ((stacknames (reverse (mapcar 'semantic-tag-name stack)))
+	       (tc nil)
+	       )
+	  ;; @todo - can we use the typecache ability to
+	  ;;         put a scope into a tag to do this?
+	  (while (and stacknames
+		      (setq tc (semanticdb-typecache-find
+				(reverse stacknames))))
+	    (setq returnlist (cons tc returnlist)
+		  stacknames (cdr stacknames)))
+	  (when (not returnlist)
+	    ;; When there was nothing from the typecache, then just
+	    ;; use what's right here.
+	    (setq stack (reverse stack))
+	    ;; Add things to STACK until we cease finding tags of class type.
+	    (while (and stack (eq (semantic-tag-class (car stack)) 'type))
+	      ;; Otherwise, just add this to the returnlist.
+	      (setq returnlist (cons (car stack) returnlist))
+	      (setq stack (cdr stack)))
+
+	    (setq returnlist (nreverse returnlist))
+	    ))
+	)
+
+      ;; Only do this level of analysis for functions.
+      (when (eq (semantic-tag-class tag) 'function)
+	;; Step 2:
+	;;   If the function tag itself has a "parent" by name, then that
+	;;   parent will exist in the scope we just calculated, so look it
+	;;   up now.
+	;;
+	(let ((p (semantic-tag-function-parent tag)))
+	  (when p
+	    ;; We have a parent, search for it.
+	    (let* ((searchnameraw (cond ((stringp p) p)
+					((semantic-tag-p p)
+					 (semantic-tag-name p))
+					((and (listp p) (stringp (car p)))
+					 (car p))))
+		   (searchname (semantic-analyze-split-name searchnameraw))
+		   (snlist (if (consp searchname)
+			       searchname
+			     (list searchname)))
+		   (fullsearchname nil)
+
+		   (miniscope (semantic-scope-cache "mini"))
+		   ptag)
+
+	      ;; Find the next entry in the refereneced type for
+	      ;; our function, and append to return list till our
+	      ;; returnlist is empty.
+	      (while snlist
+		(setq fullsearchname
+		      (append (mapcar 'semantic-tag-name returnlist)
+			      (list (car snlist)))) ;; Next one
+		(setq ptag
+		      (semanticdb-typecache-find fullsearchname))
+
+		(when (or (not ptag)
+			  (not (semantic-tag-of-class-p ptag 'type)))
+		  (let ((rawscope
+			 (apply 'append
+				(mapcar 'semantic-tag-type-members
+					(cons (car returnlist) scopetypes)
+					)))
+			)
+		    (oset miniscope parents returnlist) ;; Not really accurate, but close
+		    (oset miniscope scope rawscope)
+		    (oset miniscope fullscope rawscope)
+		    (setq ptag
+			  (semantic-analyze-find-tag searchnameraw
+						     'type
+						     miniscope
+						     ))
+		    ))
+
+		(when ptag
+		  (when (and (not (semantic-tag-p ptag))
+			     (semantic-tag-p (car ptag)))
+		    (setq ptag (car ptag)))
+		  (setq returnlist (append returnlist (list ptag)))
+		  )
+
+		(setq snlist (cdr snlist)))
+	      (setq returnlist returnlist)
+	      )))
+	)
+      returnlist
+      )))
+
+(define-overloadable-function semantic-analyze-scope-lineage-tags (parents scopedtypes)
+  "Return the full lineage of tags from PARENTS.
+The return list is of the form ( TAG . PROTECTION ), where TAG is a tag,
+and PROTECTION is the level of protection offered by the relationship.
+Optional SCOPETYPES are additional scoped entities in which our parent might
+be found.")
+
+(defun semantic-analyze-scope-lineage-tags-default (parents scopetypes)
+  "Return the full lineage of tags from PARENTS.
+The return list is of the form ( TAG . PROTECTION ), where TAG is a tag,
+and PROTECTION is the level of protection offered by the relationship.
+Optional SCOPETYPES are additional scoped entities in which our parent might
+be found."
+  (let ((lineage nil)
+	(miniscope (semantic-scope-cache "mini"))
+	)
+    (oset miniscope parents parents)
+    (oset miniscope scope scopetypes)
+    (oset miniscope fullscope scopetypes)
+
+    (dolist (slp parents)
+      (semantic-analyze-scoped-inherited-tag-map
+       slp (lambda (newparent)
+	     (let* ((pname (semantic-tag-name newparent))
+		    (prot (semantic-tag-type-superclass-protection slp pname))
+		    (effectiveprot (cond ((eq prot 'public)
+					  ;; doesn't provide access to private slots?
+					  'protected)
+					 (t prot))))
+	       (push (cons newparent effectiveprot) lineage)
+	       ))
+       miniscope))
+
+    lineage))
+
+
+;;------------------------------------------------------------
+
+(define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist)
+  "Return accessable tags when TYPELIST and PARENTLIST is in scope.
+Tags returned are not in the global name space, but are instead
+scoped inside a class or namespace.  Such items can be referenced
+without use of \"object.function()\" style syntax due to an
+implicit \"object\".")
+
+(defun semantic-analyze-scoped-tags-default (typelist halfscope)
+  "Return accessable tags when TYPELIST and HALFSCOPE is in scope.
+HALFSCOPE is the current scope partially initialized.
+Tags returned are not in the global name space, but are instead
+scoped inside a class or namespace.  Such items can be referenced
+without use of \"object.function()\" style syntax due to an
+implicit \"object\"."
+  (let ((typelist2 nil)
+	(currentscope nil)
+	(parentlist (oref halfscope parents))
+	(miniscope halfscope)
+	)
+    ;; Loop over typelist, and find and merge all namespaces matching
+    ;; the names in typelist.
+    (while typelist
+      (let ((tt (semantic-tag-type (car typelist))))
+	(when (and (stringp tt) (string= tt "namespace"))
+	  ;; By using the typecache, our namespaces are pre-merged.
+	  (setq typelist2 (cons (car typelist) typelist2))
+	  ))
+      (setq typelist (cdr typelist)))
+
+    ;; Loop over the types (which should be sorted by postion
+    ;; adding to the scopelist as we go, and using the scopelist
+    ;; for additional searching!
+    (while typelist2
+      (oset miniscope scope currentscope)
+      (oset miniscope fullscope currentscope)
+      (setq currentscope (append
+			  (semantic-analyze-scoped-type-parts (car typelist2)
+							      miniscope)
+			  currentscope))
+      (setq typelist2 (cdr typelist2)))
+
+    ;; Collect all the types (class, etc) that are in our heratage.
+    ;; These are types that we can extract members from, not those
+    ;; delclared in using statements, or the like.
+    ;; Get the PARENTS including nesting scope for this location.
+    (while parentlist
+      (oset miniscope scope currentscope)
+      (oset miniscope fullscope currentscope)
+      (setq currentscope (append
+			  (semantic-analyze-scoped-type-parts (car parentlist)
+							      miniscope)
+			  currentscope))
+      (setq parentlist (cdr parentlist)))
+
+    ;; Loop over all the items, and collect any type constants.
+    (let ((constants nil))
+      (dolist (T currentscope)
+	(setq constants (append constants
+				(semantic-analyze-type-constants T)))
+	)
+
+      (setq currentscope (append currentscope constants)))
+
+    currentscope))
+
+;;------------------------------------------------------------
+(define-overloadable-function  semantic-analyze-scope-calculate-access (type scope)
+  "Calculate the access class for TYPE as defined by the current SCOPE.
+Access is related to the :parents in SCOPE.  If type is a member of SCOPE
+then access would be 'private.  If TYPE is inherited by a member of SCOPE,
+the access would be 'protected.  Otherwise, access is 'public")
+
+(defun semantic-analyze-scope-calculate-access-default (type scope)
+  "Calculate the access class for TYPE as defined by the current SCOPE."
+  (cond ((semantic-scope-cache-p scope)
+	 (let ((parents (oref scope parents))
+	       (parentsi (oref scope parentinheritance))
+	       )
+	   (catch 'moose
+	     ;; Investigate the parent, and see how it relates to type.
+	     ;; If these tags are basically the same, then we have full access.
+	     (dolist (p parents)
+	       (when (semantic-tag-similar-p type p)
+		 (throw 'moose 'private))
+	       )
+	     ;; Look to see if type is in our list of inherited parents.
+	     (dolist (pi parentsi)
+	       ;; pi is a cons cell ( PARENT . protection)
+	       (let ((pip (car pi))
+		     (piprot (cdr pi)))
+		 (when (semantic-tag-similar-p type pip)
+		   (throw 'moose
+			  ;; protection via inheritance means to pull out different
+			  ;; bits based on protection labels in an opposite way.
+			  (cdr (assoc piprot
+				      '((public . private)
+					(protected . protected)
+					(private . public))))
+			  )))
+	       )
+	     ;; Not in our parentage.  Is type a FRIEND?
+	     (let ((friends (semantic-find-tags-by-class 'friend (semantic-tag-type-members type))))
+	       (dolist (F friends)
+		 (dolist (pi parents)
+		   (if (string= (semantic-tag-name F) (semantic-tag-name pi))
+		       (throw 'moose 'private))
+		   )))
+	     ;; Found nothing, return public
+	     'public)
+	   ))
+	(t 'public)))
+
+(defun semantic-completable-tags-from-type (type)
+  "Return a list of slots that are valid completions from the list of SLOTS.
+If a tag in SLOTS has a named parent, then that implies that the
+tag is not something you can complete from within TYPE."
+  (let ((allslots (semantic-tag-components type))
+	(leftover nil)
+	)
+    (dolist (S allslots)
+      (when (or (not (semantic-tag-of-class-p S 'function))
+		(not (semantic-tag-function-parent S)))
+	(setq leftover (cons S leftover)))
+      )
+    (nreverse leftover)))
+
+(defun semantic-analyze-scoped-type-parts (type &optional scope noinherit protection)
+  "Return all parts of TYPE, a tag representing a TYPE declaration.
+SCOPE is the scope object.
+NOINHERIT turns off searching of inherited tags.
+PROTECTION specifies the type of access requested, such as 'public or 'private."
+  (if (not type)
+      nil
+    (let* ((access (semantic-analyze-scope-calculate-access type scope))
+	   ;; SLOTS are the slots directly a part of TYPE.
+	   (allslots (semantic-completable-tags-from-type type))
+	   (slots (semantic-find-tags-by-scope-protection
+		   access
+		   type allslots))
+	   (fname (semantic-tag-file-name type))
+	   ;; EXTMETH are externally defined methods that are still
+	   ;; a part of this class.
+
+	   ;; @TODO - is this line needed??  Try w/out for a while
+	   ;; @note - I think C++ says no.  elisp might, but methods
+	   ;;         look like defuns, so it makes no difference.
+	   (extmeth nil) ; (semantic-tag-external-member-children type t))
+
+	   ;; INHERITED are tags found in classes that our TYPE tag
+	   ;; inherits from.  Do not do this if it was not requested.
+	   (inherited (when (not noinherit)
+			(semantic-analyze-scoped-inherited-tags type scope
+								access)))
+	   )
+      (when (not (semantic-tag-in-buffer-p type))
+	(let ((copyslots nil))
+	  (dolist (TAG slots)
+	    ;;(semantic--tag-put-property TAG :filename fname)
+	    (if (semantic-tag-file-name TAG)
+		;; If it has a filename, just go with it...
+		(setq copyslots (cons TAG copyslots))
+	      ;; Otherwise, copy the tag w/ the guessed filename.
+	      (setq copyslots (cons (semantic-tag-copy TAG nil fname)
+				    copyslots)))
+	    )
+	  (setq slots (nreverse copyslots))
+	  ))
+      ;; Flatten the database output.
+      (append slots extmeth inherited)
+      )))
+
+(defun semantic-analyze-scoped-inherited-tags (type scope access)
+  "Return all tags that TYPE inherits from.
+Argument SCOPE specify additional tags that are in scope
+whose tags can be searched when needed, OR it may be a scope object.
+ACCESS is the level of access we filter on child supplied tags.
+For langauges with protection on specific methods or slots,
+it should strip out those not accessable by methods of TYPE.
+An ACCESS of 'public means not in a method of a subclass of type.
+A value of 'private means we can access private parts of the originating
+type."
+  (let ((ret nil))
+    (semantic-analyze-scoped-inherited-tag-map
+     type (lambda (p)
+	    (let* ((pname (semantic-tag-name p))
+		   (protection (semantic-tag-type-superclass-protection
+				type pname))
+		   )
+	      (if (and (eq access 'public) (not (eq protection 'public)))
+		  nil ;; Don't do it.
+
+		;; We can get some parts of this type.
+		(setq ret (nconc ret
+				 ;; Do not pull in inherited parts here.  Those
+				 ;; will come via the inherited-tag-map fcn
+				 (semantic-analyze-scoped-type-parts
+				  p scope t protection))
+		      ))))
+     scope)
+    ret))
+
+(defun semantic-analyze-scoped-inherited-tag-map (type fcn scope)
+  "Map all parents of TYPE to FCN.  Return tags of all the types.
+Argument SCOPE specify additional tags that are in scope
+whose tags can be searched when needed, OR it may be a scope object."
+  (let* (;; PARENTS specifies only the superclasses and not
+	 ;; interfaces.  Inheriting from an interfaces implies
+	 ;; you have a copy of all methods locally.  I think.
+	 (parents (semantic-tag-type-superclasses type))
+	 ps pt
+	 (tmpscope scope)
+	 )
+    (save-excursion
+
+      ;; Create a SCOPE just for looking up the parent based on where
+      ;; the parent came from.
+      ;;
+      ;; @TODO - Should we cache these mini-scopes around in Emacs
+      ;;         for recycling later?  Should this become a helpful
+      ;;         extra routine?
+      (when (and parents (semantic-tag-with-position-p type))
+	;; @NOTE - Does this save-excursion prevent the calculated
+	;; scope from working properly in any cases?
+	(save-excursion
+	  ;; If TYPE has a position, go there and get the scope.
+	  (semantic-go-to-tag type)
+
+	  ;; We need to make a mini scope, and only include the misc bits
+	  ;; that will help in finding the parent.  We don't really need
+	  ;; to do any of the stuff related to variables and what-not.
+	  (setq tmpscope (semantic-scope-cache "mini"))
+	  (let* ( ;; Step 1:
+		 (scopetypes (cons type (semantic-analyze-scoped-types (point))))
+		 (parents (semantic-analyze-scope-nested-tags (point) scopetypes))
+		 ;;(parentinherited (semantic-analyze-scope-lineage-tags parents scopetypes))
+		 (lscope nil)
+		 )
+	    (oset tmpscope scopetypes scopetypes)
+	    (oset tmpscope parents parents)
+	    ;;(oset tmpscope parentinheritance parentinherited)
+
+	    (when (or scopetypes parents)
+	      (setq lscope (semantic-analyze-scoped-tags scopetypes tmpscope))
+	      (oset tmpscope scope lscope))
+	    (oset tmpscope fullscope (append scopetypes lscope parents))
+	    )))
+      ;; END creating tmpscope
+
+      ;; Look up each parent one at a time.
+      (dolist (p parents)
+	(setq ps (cond ((stringp p) p)
+		       ((and (semantic-tag-p p) (semantic-tag-prototype-p p))
+			(semantic-tag-name p))
+		       ((and (listp p) (stringp (car p)))
+			p))
+	      pt (condition-case nil
+		     (or (semantic-analyze-find-tag ps 'type tmpscope)
+			 ;; A backup hack.
+			 (semantic-analyze-find-tag ps 'type scope))
+		   (error nil)))
+
+	(when pt
+	  (funcall fcn pt)
+	  ;; Note that we pass the original SCOPE in while recursing.
+	  ;; so that the correct inheritance model is passed along.
+	  (semantic-analyze-scoped-inherited-tag-map pt fcn scope)
+	  )))
+    nil))
+
+;;; ANALYZER
+;;
+;; Create the scope structure for use in the Analyzer.
+;;
+;;;###autoload
+(defun semantic-calculate-scope (&optional point)
+  "Calculate the scope at POINT.
+If POINT is not provided, then use the current location of point.
+The class returned from the scope calculation is variable
+`semantic-scope-cache'."
+  (interactive)
+  (if (not (and (featurep 'semanticdb) semanticdb-current-database))
+      nil ;; Don't do anything...
+    (if (not point) (setq point (point)))
+    (when (interactive-p)
+      (semantic-fetch-tags)
+      (semantic-scope-reset-cache)
+      )
+    (save-excursion
+      (goto-char point)
+      (let* ((TAG  (semantic-current-tag))
+	     (scopecache
+	      (semanticdb-cache-get semanticdb-current-table
+				    semantic-scope-cache))
+	     )
+	(when (not (semantic-equivalent-tag-p TAG (oref scopecache tag)))
+	  (semantic-reset scopecache))
+	(if (oref scopecache tag)
+	    ;; Even though we can recycle most of the scope, we
+	    ;; need to redo the local variables since those change
+	    ;; as you move about the tag.
+	    (condition-case nil
+		(oset scopecache localvar (semantic-get-all-local-variables))
+	      (error nil))
+
+	  (let* (;; Step 1:
+		 (scopetypes (semantic-analyze-scoped-types point))
+		 (parents (semantic-analyze-scope-nested-tags point scopetypes))
+		 (parentinherited (semantic-analyze-scope-lineage-tags
+				   parents scopetypes))
+		 )
+	    (oset scopecache tag TAG)
+	    (oset scopecache scopetypes scopetypes)
+	    (oset scopecache parents parents)
+	    (oset scopecache parentinheritance parentinherited)
+
+	    (let* (;; Step 2:
+		   (scope (when (or scopetypes parents)
+			    (semantic-analyze-scoped-tags scopetypes scopecache))
+			  )
+		   ;; Step 3:
+		   (localargs (semantic-get-local-arguments))
+		   (localvar (condition-case nil
+				 (semantic-get-all-local-variables)
+			       (error nil)))
+		   )
+
+	      ;; Try looking for parents again.
+	      (when (not parentinherited)
+		(setq parentinherited (semantic-analyze-scope-lineage-tags
+				       parents (append scopetypes scope)))
+		(when parentinherited
+		  (oset scopecache parentinheritance parentinherited)
+		  ;; Try calculating the scope again with the new inherited parent list.
+		  (setq scope (when (or scopetypes parents)
+				(semantic-analyze-scoped-tags scopetypes scopecache))
+			)))
+
+	      ;; Fill out the scope.
+	      (oset scopecache scope scope)
+	      (oset scopecache fullscope (append scopetypes scope parents))
+	      (oset scopecache localargs localargs)
+	      (oset scopecache localvar localvar)
+	      )))
+	;; Make sure we become dependant on the typecache.
+	(semanticdb-typecache-add-dependant scopecache)
+	;; Handy debug output.
+	(when (interactive-p)
+	  (data-debug-show scopecache)
+	  )
+	;; Return ourselves
+	scopecache))))
+
+(defun semantic-scope-find (name &optional class scope-in)
+  "Find the tag with NAME, and optinal CLASS in the current SCOPE-IN.
+Searches various elements of the scope for NAME.  Return ALL the
+hits in order, with the first tag being in the closest scope."
+  (let ((scope (or scope-in (semantic-calculate-scope)))
+	(ans nil))
+    ;; Is the passed in scope really a scope?  if so, look through
+    ;; the options in that scope.
+    (if (semantic-scope-cache-p scope)
+	(let* ((la
+		;; This should be first, but bugs in the
+		;; C parser will turn function calls into
+		;; assumed int return function prototypes.  Yuck!
+		(semantic-find-tags-by-name name (oref scope localargs)))
+	       (lv
+		(semantic-find-tags-by-name name (oref scope localvar)))
+	       (fullscoperaw (oref scope fullscope))
+	       (sc (semantic-find-tags-by-name name fullscoperaw))
+	       (typescoperaw  (oref scope typescope))
+	       (tsc (semantic-find-tags-by-name name typescoperaw))
+	       )
+	  (setq ans
+		(if class
+		    ;; Scan out things not of the right class.
+		    (semantic-find-tags-by-class class (append la lv sc tsc))
+		  (append la lv sc tsc))
+		)
+
+	  (when (and (not ans) (or typescoperaw fullscoperaw))
+	    (let ((namesplit (semantic-analyze-split-name name)))
+	      (when (consp namesplit)
+		;; It may be we need to hack our way through type typescope.
+		(while namesplit
+		  (setq ans (append
+			     (semantic-find-tags-by-name (car namesplit)
+							 typescoperaw)
+			     (semantic-find-tags-by-name (car namesplit)
+							 fullscoperaw)
+			     ))
+		  (if (not ans)
+		      (setq typescoperaw nil)
+		    (when (cdr namesplit)
+		      (setq typescoperaw (semantic-tag-type-members
+					  (car ans)))))
+
+		  (setq namesplit (cdr namesplit)))
+		;; Once done, store the current typecache lookup
+		(oset scope typescope
+		      (append typescoperaw (oref scope typescope)))
+		)))
+	  ;; Return it.
+	  ans)
+      ;; Not a real scope.  Our scope calculation analyze parts of
+      ;; what it finds, and needs to pass lists through to do it's work.
+      ;; Tread that list as a singly entry.
+      (if class
+	  (semantic-find-tags-by-class class scope)
+	scope)
+      )))
+
+;;; DUMP
+;;
+(defmethod semantic-analyze-show ((context semantic-scope-cache))
+  "Insert CONTEXT into the current buffer in a nice way."
+  (semantic-analyze-princ-sequence (oref context scopetypes) "-> ScopeTypes: " )
+  (semantic-analyze-princ-sequence (oref context parents) "-> Parents: " )
+  (semantic-analyze-princ-sequence (oref context scope) "-> Scope: " )
+  ;;(semantic-analyze-princ-sequence (oref context fullscope) "Fullscope:  " )
+  (semantic-analyze-princ-sequence (oref context localargs) "-> Local Args: " )
+  (semantic-analyze-princ-sequence (oref context localvar) "-> Local Vars: " )
+  )
+
+(provide 'semantic-scope)
+;;; semantic-scope.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-sort.el b/site/cedet-1.0pre7/semantic/semantic-sort.el
new file mode 100644
index 0000000..3602b35
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-sort.el
@@ -0,0 +1,614 @@
+;;; semantic-sort.el --- Utilities for sorting and re-arranging tag tables.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-sort.el,v 1.29 2010/01/07 02:23:15 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Tag tables originate in the order they appear in a buffer, or source file.
+;; It is often useful to re-arrange them is some predictable way for browsing
+;; purposes.  Re-organization may be alphabetical, or even a complete
+;; reorganization of parents and children.
+;;
+;; Originally written in semantic-util.el
+;;
+
+(require 'assoc)
+(require 'semantic)
+(require 'semanticdb)
+(eval-when-compile
+  (require 'semantic-find)
+  (require 'semanticdb-find))
+
+;;; Alphanumeric sorting
+;;
+;; Takes a list of tags, and sorts them in a case-insensitive way
+;; at a single level.
+
+;;; Code:
+(defun semantic-string-lessp-ci (s1 s2)
+  "Case insensitive version of `string-lessp'.
+Argument S1 and S2 are the strings to compare."
+  ;; Use downcase instead of upcase because an average name
+  ;; has more lower case characters.
+  (if (fboundp 'compare-strings)
+      (eq (compare-strings s1 0 nil s2 0 nil t) -1)
+    (string-lessp (downcase s1) (downcase s2))))
+
+(defun semantic-sort-tag-type (tag)
+  "Return a type string for TAG guaranteed to be a string."
+  (let ((ty (semantic-tag-type tag)))
+    (cond ((stringp ty)
+	   ty)
+	  ((listp ty)
+	   (or (car ty) ""))
+	  (t ""))))
+
+(defun semantic-tag-lessp-name-then-type (A B)
+  "Return t if tag A is < tag B.
+First sorts on name, then sorts on the name of the :type of
+each tag."
+  (let ((na (semantic-tag-name A))
+	(nb (semantic-tag-name B))
+	)
+    (if (string-lessp na nb)
+	t ; a sure thing.
+      (if (string= na nb)
+	  ;; If equal, test the :type which might be different.
+	  (let* ((ta (semantic-tag-type A))
+		 (tb (semantic-tag-type B))
+		 (tas (cond ((stringp ta)
+			     ta)
+			    ((semantic-tag-p ta)
+			     (semantic-tag-name ta))
+			    (t nil)))
+		 (tbs (cond ((stringp tb)
+			     tb)
+			    ((semantic-tag-p tb)
+			     (semantic-tag-name tb))
+			    (t nil))))
+	    (if (and (stringp tas) (stringp tbs))
+		(string< tas tbs)
+	      ;; This is if A == B, and no types in A or B
+	      nil))
+	;; This nil is if A > B, but not =
+	nil))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-increasing (tags)
+  "Sort TAGS by name in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (string-lessp (semantic-tag-name a)
+			     (semantic-tag-name b)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-decreasing (tags)
+  "Sort TAGS by name in decreasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (string-lessp (semantic-tag-name b)
+			     (semantic-tag-name a)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-type-increasing (tags)
+  "Sort TAGS by type in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (string-lessp (semantic-sort-tag-type a)
+			     (semantic-sort-tag-type b)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-type-decreasing (tags)
+  "Sort TAGS by type in decreasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (string-lessp (semantic-sort-tag-type b)
+			     (semantic-sort-tag-type a)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-increasing-ci (tags)
+  "Sort TAGS by name in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (semantic-string-lessp-ci (semantic-tag-name a)
+					 (semantic-tag-name b)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-decreasing-ci (tags)
+  "Sort TAGS by name in decreasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (semantic-string-lessp-ci (semantic-tag-name b)
+					 (semantic-tag-name a)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-type-increasing-ci (tags)
+  "Sort TAGS by type in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (semantic-string-lessp-ci (semantic-sort-tag-type a)
+					 (semantic-sort-tag-type b)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-type-decreasing-ci (tags)
+  "Sort TAGS by type in decreasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b)
+	       (semantic-string-lessp-ci (semantic-sort-tag-type b)
+					 (semantic-sort-tag-type a)))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-then-type-increasing (tags)
+  "Sort TAGS by name, then type in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b) (semantic-tag-lessp-name-then-type a b))))
+
+;;;###autoload
+(defun semantic-sort-tags-by-name-then-type-decreasing (tags)
+  "Sort TAGS by name, then type in increasing order with side effects.
+Return the sorted list."
+  (sort tags (lambda (a b) (semantic-tag-lessp-name-then-type b a))))
+
+
+(semantic-alias-obsolete 'semantic-sort-tokens-by-name-increasing
+			 'semantic-sort-tags-by-name-increasing)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-name-decreasing
+			 'semantic-sort-tags-by-name-decreasing)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-type-increasing
+			 'semantic-sort-tags-by-type-increasing)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-type-decreasing
+			 'semantic-sort-tags-by-type-decreasing)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-name-increasing-ci
+			 'semantic-sort-tags-by-name-increasing-ci)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-name-decreasing-ci
+			 'semantic-sort-tags-by-name-decreasing-ci)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-type-increasing-ci
+			 'semantic-sort-tags-by-type-increasing-ci)
+(semantic-alias-obsolete 'semantic-sort-tokens-by-type-decreasing-ci
+			 'semantic-sort-tags-by-type-decreasing-ci)
+
+
+;;; Unique
+;;
+;; Scan a list of tags, removing duplicates.
+;; This must first sort the tags by name alphabetically ascending.
+;;
+;; Useful for completion lists, or other situations where the
+;; other data isn't as useful.
+
+;;;###autoload
+(defun semantic-unique-tag-table-by-name (tags)
+  "Scan a list of TAGS, removing duplicate names.
+This must first sort the tags by name alphabetically ascending.
+For more complex uniqueness testing used by the semanticdb
+typecaching system, see `semanticdb-typecache-merge-streams'."
+  (let ((sorted (semantic-sort-tags-by-name-increasing
+		 (copy-sequence tags)))
+	(uniq nil))
+    (while sorted
+      (if (or (not uniq)
+	      (not (string= (semantic-tag-name (car sorted))
+			    (semantic-tag-name (car uniq)))))
+	  (setq uniq (cons (car sorted) uniq)))
+      (setq sorted (cdr sorted))
+      )
+    (nreverse uniq)))
+
+;;;###autoload
+(defun semantic-unique-tag-table (tags)
+  "Scan a list of TAGS, removing duplicates.
+This must first sort the tags by position ascending.
+TAGS are removed only if they are equivalent, as can happen when
+multiple tag sources are scanned.
+For more complex uniqueness testing used by the semanticdb
+typecaching system, see `semanticdb-typecache-merge-streams'."
+  (let ((sorted (sort (copy-sequence tags)
+		      (lambda (a b)
+			(cond ((not (semantic-tag-with-position-p a))
+			       t)
+			      ((not (semantic-tag-with-position-p b))
+			       nil)
+			      (t
+			       (< (semantic-tag-start a)
+				  (semantic-tag-start b)))))))
+	(uniq nil))
+    (while sorted
+      (if (or (not uniq)
+	      (not (semantic-equivalent-tag-p (car sorted) (car uniq))))
+	  (setq uniq (cons (car sorted) uniq)))
+      (setq sorted (cdr sorted))
+      )
+    (nreverse uniq)))
+
+
+;;; Tag Table Flattening
+;;
+;; In the 1.4 search API, there was a parameter "search-parts" which
+;; was used to find tags inside other tags.  This was used
+;; infrequently, mostly for completion/jump routines.  These types
+;; of commands would be better off with a flattened list, where all
+;; tags appear at the top level.
+
+;;;###autoload
+(defun semantic-flatten-tags-table (&optional table)
+  "Flatten the tags table TABLE.
+All tags in TABLE, and all components of top level tags
+in TABLE will appear at the top level of list.
+Tags promoted to the top of the list will still appear
+unmodified as components of their parent tags."
+  (let* ((table (semantic-something-to-tag-table table))
+	 ;; Initialize the starting list with our table.
+	 (lists (list table)))
+    (mapc (lambda (tag)
+	    (let ((components (semantic-tag-components tag)))
+	      (if (and components
+		       ;; unpositined tags can be hazardous to
+		       ;; completion.  Do we need any type of tag
+		       ;; here?  - EL
+		       (semantic-tag-with-position-p (car components)))
+		  (setq lists (cons
+			       (semantic-flatten-tags-table components)
+			       lists)))))
+	  table)
+    (apply 'append (nreverse lists))
+    ))
+
+
+;;; Buckets:
+;;
+;; A list of tags can be grouped into buckets based on the tag class.
+;; Bucketize means to take a list of tags at a given level in a tag
+;; table, and reorganize them into buckets based on class.
+;;
+(defvar semantic-bucketize-tag-class
+  ;; Must use lambda because `semantic-tag-class' is a macro.
+  (lambda (tok) (semantic-tag-class tok))
+  "Function used to get a symbol describing the class of a tag.
+This function must take one argument of a semantic tag.
+It should return a symbol found in `semantic-symbol->name-assoc-list'
+which `semantic-bucketize' uses to bin up tokens.
+To create new bins for an application augment
+`semantic-symbol->name-assoc-list', and
+`semantic-symbol->name-assoc-list-for-type-parts' in addition
+to setting this variable (locally in your function).")
+
+;;;###autoload
+(defun semantic-bucketize (tags &optional parent filter)
+  "Sort TAGS into a group of buckets based on tag class.
+Unknown classes are placed in a Misc bucket.
+Type bucket names are defined by either `semantic-symbol->name-assoc-list'.
+If PARENT is specified, then TAGS belong to this PARENT in some way.
+This will use `semantic-symbol->name-assoc-list-for-type-parts' to
+generate bucket names.
+Optional argument FILTER is a filter function to be applied to each bucket.
+The filter function will take one argument, which is a list of tokens, and
+may re-organize the list with side-effects."
+  (let* ((name-list (if parent
+			semantic-symbol->name-assoc-list-for-type-parts
+		      semantic-symbol->name-assoc-list))
+	 (sn name-list)
+	 (bins (make-vector (1+ (length sn)) nil))
+	 ask tagtype
+	 (nsn nil)
+	 (num 1)
+	 (out nil))
+    ;; Build up the bucket vector
+    (while sn
+      (setq nsn (cons (cons (car (car sn)) num) nsn)
+	    sn (cdr sn)
+	    num (1+ num)))
+    ;; Place into buckets
+    (while tags
+      (setq tagtype (funcall semantic-bucketize-tag-class (car tags))
+	    ask (assq tagtype nsn)
+	    num (or (cdr ask) 0))
+      (aset bins num (cons (car tags) (aref bins num)))
+      (setq tags (cdr tags)))
+    ;; Remove from buckets into a list.
+    (setq num 1)
+    (while (< num (length bins))
+      (when (aref bins num)
+	(setq out
+	      (cons (cons
+		     (cdr (nth (1- num) name-list))
+		     ;; Filtering, First hacked by David Ponce david@dponce.com
+		     (funcall (or filter 'nreverse) (aref bins num)))
+		    out)))
+      (setq num (1+ num)))
+    (if (aref bins 0)
+	(setq out (cons (cons "Misc"
+			      (funcall (or filter 'nreverse) (aref bins 0)))
+			out)))
+    (nreverse out)))
+
+;;; Adoption
+;;
+;; Some languages allow children of a type to be defined outside
+;; the syntactic scope of that class.  These routines will find those
+;; external members, and bring them together in a cloned copy of the
+;; class tag.
+;;
+;;;###autoload
+(defvar semantic-orphaned-member-metaparent-type "class"
+  "In `semantic-adopt-external-members', the type of 'type for metaparents.
+A metaparent is a made-up type semantic token used to hold the child list
+of orphaned members of a named type.")
+(make-variable-buffer-local 'semantic-orphaned-member-metaparent-type)
+
+(defvar semantic-mark-external-member-function nil
+  "Function called when an externally defined orphan is found.
+By default, the token is always marked with the `adopted' property.
+This function should be locally bound by a program that needs
+to add additional behaviors into the token list.
+This function is called with two arguments.  The first is TOKEN which is
+a shallow copy of the token to be modified.  The second is the PARENT
+which is adopting TOKEN.  This function should return TOKEN (or a copy of it)
+which is then integrated into the revised token list.")
+
+;;;###autoload
+(defun semantic-adopt-external-members (tags)
+  "Rebuild TAGS so that externally defined members are regrouped.
+Some languages such as C++ and CLOS permit the declaration of member
+functions outside the definition of the class.  It is easier to study
+the structure of a program when such methods are grouped together
+more logically.
+
+This function uses `semantic-tag-external-member-p' to
+determine when a potential child is an externally defined member.
+
+Note: Applications which use this function must account for token
+types which do not have a position, but have children which *do*
+have positions.
+
+Applications should use `semantic-mark-external-member-function'
+to modify all tags which are found as externally defined to some
+type.  For example, changing the token type for generating extra
+buckets with the bucket function."
+  (let ((parent-buckets nil)
+	(decent-list nil)
+	(out nil)
+	(tmp nil)
+	)
+    ;; Rebuild the output list, stripping out all parented
+    ;; external entries
+    (while tags
+      (cond
+       ((setq tmp (semantic-tag-external-member-parent (car tags)))
+	(let ((tagcopy (semantic-tag-clone (car tags)))
+	      (a (assoc tmp parent-buckets)))
+	  (semantic--tag-put-property-no-side-effect tagcopy 'adopted t)
+	  (if a
+	      ;; If this parent is already in the list, append.
+	      (setcdr (nthcdr (1- (length a)) a) (list tagcopy))
+	    ;; If not, prepend this new parent bucket into our list
+	    (setq parent-buckets
+		  (cons (cons tmp (list tagcopy)) parent-buckets)))
+	  ))
+       ((eq (semantic-tag-class (car tags)) 'type)
+	;; Types need to be rebuilt from scratch so we can add in new
+	;; children to the child list.  Only the top-level cons
+	;; cells need to be duplicated so we can hack out the
+	;; child list later.
+	(setq out (cons (semantic-tag-clone (car tags)) out))
+	(setq decent-list (cons (car out) decent-list))
+	)
+       (t
+	;; Otherwise, append this tag to our new output list.
+	(setq out (cons (car tags) out)))
+       )
+      (setq tags (cdr tags)))
+    ;; Rescan out, by descending into all types and finding parents
+    ;; for all entries moved into the parent-buckets.
+    (while decent-list
+      (let* ((bucket (assoc (semantic-tag-name (car decent-list))
+			    parent-buckets))
+	     (bucketkids (cdr bucket)))
+	(when bucket
+	  ;; Run our secondary marking function on the children
+	  (if semantic-mark-external-member-function
+	      (setq bucketkids
+		    (mapcar (lambda (tok)
+			      (funcall semantic-mark-external-member-function
+				       tok (car decent-list)))
+			    bucketkids)))
+	  ;; We have some extra kids.  Merge.
+	  (semantic-tag-put-attribute
+	   (car decent-list) :members
+	   (append (semantic-tag-type-members (car decent-list))
+		   bucketkids))
+	  ;; Nuke the bucket label so it is not found again.
+	  (setcar bucket nil))
+	(setq decent-list
+	      (append (cdr decent-list)
+		      ;; get embedded types to scan and make copies
+		      ;; of them.
+		      (mapcar
+		       (lambda (tok) (semantic-tag-clone tok))
+		       (semantic-find-tags-by-class 'type
+			(semantic-tag-type-members (car decent-list)))))
+	      )))
+    ;; Scan over all remaining lost external methods, and tack them
+    ;; onto the end.
+    (while parent-buckets
+      (if (car (car parent-buckets))
+	  (let* ((tmp (car parent-buckets))
+		 (fauxtag (semantic-tag-new-type
+			   (car tmp)
+			   semantic-orphaned-member-metaparent-type
+			   nil ;; Part list
+			   nil ;; parents (unknown)
+			   ))
+		 (bucketkids (cdr tmp)))
+	    (semantic-tag-set-faux fauxtag) ;; properties
+	    (if semantic-mark-external-member-function
+		(setq bucketkids
+		      (mapcar (lambda (tok)
+				(funcall semantic-mark-external-member-function
+					 tok fauxtag))
+			      bucketkids)))
+	    (semantic-tag-put-attribute fauxtag :members bucketkids)
+	    ;; We have a bunch of methods with no parent in this file.
+	    ;; Create a meta-type to hold it.
+	    (setq out (cons fauxtag out))
+	    ))
+      (setq parent-buckets (cdr parent-buckets)))
+    ;; Return the new list.
+    (nreverse out)))
+
+
+;;; External children
+;;
+;; In order to adopt external children, we need a few overload methods
+;; to enable the feature.
+;;
+;;;###autoload
+(define-overloadable-function semantic-tag-external-member-parent (tag)
+  "Return a parent for TAG when TAG is an external member.
+TAG is an external member if it is defined at a toplevel and
+has some sort of label defining a parent.  The parent return will
+be a string.
+
+The default behavior, if not overridden with
+`tag-member-parent' gets the 'parent extra
+specifier of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-parent-default' to also
+include the default behavior, and merely extend your own."
+  )
+
+(defun semantic-tag-external-member-parent-default (tag)
+  "Return the name of TAGs parent only if TAG is not defined in it's parent."
+  ;; Use only the extra spec because a type has a parent which
+  ;; means something completely different.
+  (let ((tp (semantic-tag-get-attribute tag :parent)))
+    (when (stringp tp)
+      tp)
+    ))
+
+(semantic-alias-obsolete 'semantic-nonterminal-external-member-parent
+			 'semantic-tag-external-member-parent)
+
+;;;###autoload
+(define-overloadable-function semantic-tag-external-member-p (parent tag)
+  "Return non-nil if PARENT is the parent of TAG.
+TAG is an external member of PARENT when it is somehow tagged
+as having PARENT as its parent.
+PARENT and TAG must both be semantic tags.
+
+The default behavior, if not overridden with
+`tag-external-member-p' is to match :parent attribute in
+the name of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-children-p-default' to also
+include the default behavior, and merely extend your own."
+  )
+
+(defun semantic-tag-external-member-p-default (parent tag)
+  "Return non-nil if PARENT is the parent of TAG."
+  ;; Use only the extra spec because a type has a parent which
+  ;; means something completely different.
+  (let ((tp (semantic-tag-external-member-parent tag)))
+    (and (stringp tp)
+	 (string= (semantic-tag-name parent) tp))
+    ))
+
+(semantic-alias-obsolete 'semantic-nonterminal-external-member-p
+			 'semantic-tag-external-member-p)
+
+;;;###autoload
+(define-overloadable-function semantic-tag-external-member-children (tag &optional usedb)
+  "Return the list of children which are not *in* TAG.
+If optional argument USEDB is non-nil, then also search files in
+the Semantic Database.  If USEDB is a list of databases, search those
+databases.
+
+Children in this case are functions or types which are members of
+TAG, such as the parts of a type, but which are not defined inside
+the class.  C++ and CLOS both permit methods of a class to be defined
+outside the bounds of the class' definition.
+
+The default behavior, if not overridden with
+`tag-external-member-children' is to search using
+`semantic-tag-external-member-p' in all top level definitions
+with a parent of TAG.
+
+If this function is overridden, use
+`semantic-tag-external-member-children-default' to also
+include the default behavior, and merely extend your own."
+  )
+
+(defun semantic-tag-external-member-children-default (tag &optional usedb)
+  "Return list of external children for TAG.
+Optional argument USEDB specifies if the semantic database is used.
+See `semantic-tag-external-member-children' for details."
+  (if (and usedb
+	   (fboundp 'semanticdb-minor-mode-p)
+	   (semanticdb-minor-mode-p))
+      (let ((m (semanticdb-find-tags-external-children-of-type
+		(semantic-tag-name tag))))
+	(if m (apply #'append (mapcar #'cdr m))))
+    (semantic--find-tags-by-function
+     `(lambda (tok)
+	;; This bit of annoying backquote forces the contents of
+	;; tag into the generated lambda.
+       (semantic-tag-external-member-p ',tag tok))
+     (current-buffer))
+    ))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-external-class (tag)
+  "Return a list of real tags that faux TAG might represent.
+
+In some languages, a method can be defined on an object which is
+not in the same file.  In this case,
+`semantic-adopt-external-members' will create a faux-tag.  If it
+is necessary to get the tag from which for faux TAG was most
+likely derived, then this function is needed."
+  (unless (semantic-tag-faux-p tag)
+    (signal 'wrong-type-argument (list tag 'semantic-tag-faux-p)))
+  (:override)
+  )
+
+(defun semantic-tag-external-class-default (tag)
+  "Return a list of real tags that faux TAG might represent.
+See `semantic-tag-external-class' for details."
+  (if (and (fboundp 'semanticdb-minor-mode-p)
+	   (semanticdb-minor-mode-p))
+      (let* ((semanticdb-search-system-databases nil)
+	     (m (semanticdb-find-tags-by-class
+		 (semantic-tag-class tag)
+		 (semanticdb-find-tags-by-name (semantic-tag-name tag)))))
+	(semanticdb-strip-find-results m 'name))
+    ;; Presumably, if the tag is faux, it is not local.
+    nil
+    ))
+
+(semantic-alias-obsolete 'semantic-nonterminal-external-member-children
+			 'semantic-tag-external-member-children)
+
+(provide 'semantic-sort)
+
+;;; semantic-sort.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-tag-file.el b/site/cedet-1.0pre7/semantic/semantic-tag-file.el
new file mode 100644
index 0000000..e8fb8f6
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-tag-file.el
@@ -0,0 +1,208 @@
+;;; semantic-tag-file.el --- Routines that find files based on tags.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-tag-file.el,v 1.34 2009/09/17 22:53:36 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; A tag, by itself, can have representations in several files.
+;; These routines will find those files.
+
+(require 'semantic-tag)
+
+;;; Code:
+
+;;; Location a TAG came from.
+;;
+;;;###autoload
+(define-overloadable-function semantic-go-to-tag (tag &optional parent)
+  "Go to the location of TAG.
+TAG may be a stripped element, in which case PARENT specifies a
+parent tag that has position information.
+PARENT can also be a `semanticdb-table' object."
+  (:override
+   (save-match-data
+     (cond ((semantic-tag-in-buffer-p tag)
+	    ;; We have a linked tag, go to that buffer.
+	    (set-buffer (semantic-tag-buffer tag)))
+	   ((semantic-tag-file-name tag)
+	    ;; If it didn't have a buffer, but does have a file
+	    ;; name, then we need to get to that file so the tag
+	    ;; location is made accurate.
+	    (set-buffer (find-file-noselect (semantic-tag-file-name tag))))
+	   ((and parent (semantic-tag-p parent) (semantic-tag-in-buffer-p parent))
+	    ;; The tag had nothing useful, but we have a parent with
+	    ;; a buffer, then go there.
+	    (set-buffer (semantic-tag-buffer parent)))
+	   ((and parent (semantic-tag-p parent) (semantic-tag-file-name parent))
+	    ;; Tag had nothing, and the parent only has a file-name, then
+	    ;; find that file, and switch to that buffer.
+	    (set-buffer (find-file-noselect (semantic-tag-file-name parent))))
+	   ((and parent (semanticdb-table-child-p parent))
+	    (set-buffer (semanticdb-get-buffer parent)))
+	   (t
+	    ;; Well, just assume things are in the current buffer.
+	    nil
+	    )))
+   ;; We should be in the correct buffer now, try and figure out
+   ;; where the tag is.
+   (cond ((semantic-tag-with-position-p tag)
+	  ;; If it's a number, go there
+	  (goto-char (semantic-tag-start tag)))
+	 ((semantic-tag-with-position-p parent)
+	  ;; Otherwise, it's a trimmed vector, such as a parameter,
+	  ;; or a structure part.  If there is a parent, we can use it
+	  ;; as a bounds for searching.
+	  (goto-char (semantic-tag-start parent))
+	  ;; Here we make an assumption that the text returned by
+	  ;; the parser and concocted by us actually exists
+	  ;; in the buffer.
+	  (re-search-forward (semantic-tag-name tag)
+			     (semantic-tag-end parent)
+			     t))
+	 ((semantic-tag-get-attribute tag :line)
+	  ;; The tag has a line number in it.  Go there.
+	  (goto-line (semantic-tag-get-attribute tag :line)))
+	 ((and (semantic-tag-p parent) (semantic-tag-get-attribute parent :line))
+	  ;; The tag has a line number in it.  Go there.
+	  (goto-line (semantic-tag-get-attribute parent :line))
+	  (re-search-forward (semantic-tag-name tag) nil t)
+	  )
+	 (t
+	  ;; Take a guess that the tag has a unique name, and just
+	  ;; search for it from the beginning of the buffer.
+	  (goto-char (point-min))
+	  (re-search-forward (semantic-tag-name tag) nil t)))
+   )
+  )
+
+(make-obsolete-overload 'semantic-find-nonterminal
+                        'semantic-go-to-tag)
+
+;;; Dependencies
+;;
+;; A tag which is of type 'include specifies a dependency.
+;; Dependencies usually represent a file of some sort.
+;; Find the file described by a dependency.
+
+;;;###autoload
+(define-overloadable-function semantic-dependency-tag-file (&optional tag)
+  "Find the filename represented from TAG.
+Depends on `semantic-dependency-include-path' for searching.  Always searches
+`.' first, then searches additional paths."
+  (or tag (setq tag (car (semantic-find-tag-by-overlay nil))))
+  (unless (semantic-tag-of-class-p tag 'include)
+    (signal 'wrong-type-argument (list tag 'include)))
+  (save-excursion
+    (let ((result nil)
+	  (default-directory default-directory)
+	  (edefind nil)
+	  (tag-fname nil))
+      (cond ((semantic-tag-in-buffer-p tag)
+	     ;; If the tag has an overlay and buffer associated with it,
+	     ;; switch to that buffer so that we get the right override metohds.
+	     (set-buffer (semantic-tag-buffer tag)))
+	    ((semantic-tag-file-name tag)
+	     ;; If it didn't have a buffer, but does have a file
+	     ;; name, then we need to get to that file so the tag
+	     ;; location is made accurate.
+	     ;;(set-buffer (find-file-noselect (semantic-tag-file-name tag)))
+	     ;;
+	     ;; 2/3/08
+	     ;; The above causes unnecessary buffer loads all over the place. Ick!
+	     ;; All we really need is for 'default-directory' to be set correctly.
+	     (setq default-directory (file-name-directory (semantic-tag-file-name tag)))
+	     ))
+      ;; Setup the filename represented by this include
+      (setq tag-fname (semantic-tag-include-filename tag))
+
+      ;; First, see if this file exists in the current EDE project
+      (if (and (fboundp 'ede-expand-filename) ede-minor-mode
+	       (setq edefind
+		     (condition-case nil
+			 (let ((proj  (ede-toplevel)))
+			   (when proj
+			     (ede-expand-filename proj tag-fname)))
+		       (error nil))))
+	  (setq result edefind))
+      (if (not result)
+	  (setq result
+		;; I don't have a plan for refreshing tags with a dependency
+		;; stuck on them somehow.  I'm thinking that putting a cache
+		;; onto the dependancy finding with a hash table might be best.
+		;;(if (semantic--tag-get-property tag 'dependency-file)
+		;;  (semantic--tag-get-property tag 'dependency-file)
+		(:override
+		 (save-excursion
+		   (semantic-dependency-find-file-on-path
+		    tag-fname (semantic-tag-include-system-p tag))))
+		;; )
+		))
+      (if (stringp result)
+	  (progn
+	    (semantic--tag-put-property tag 'dependency-file result)
+	    result)
+	;; @todo: Do something to make this get flushed w/
+	;;        when the path is changed.
+	;; @undo: Just eliminate
+	;; (semantic--tag-put-property tag 'dependency-file 'none)
+	nil)
+      )))
+
+(make-obsolete-overload 'semantic-find-dependency
+                        'semantic-dependency-tag-file)
+
+;;; PROTOTYPE FILE
+;;
+;; In C, a function in the .c file often has a representation in a
+;; corresponding .h file.  This routine attempts to find the
+;; prototype file a given source file would be associated with.
+;; This can be used by prototype manager programs.
+;;;###autoload
+(define-overloadable-function semantic-prototype-file (buffer)
+  "Return a file in which prototypes belonging to BUFFER should be placed.
+Default behavior (if not overridden) looks for a token specifying the
+prototype file, or the existence of an EDE variable indicating which
+file prototypes belong in."
+  (:override
+   ;; Perform some default behaviors
+   (if (and (fboundp 'ede-header-file) ede-minor-mode)
+       (save-excursion
+         (set-buffer buffer)
+         (ede-header-file))
+     ;; No EDE options for a quick answer.  Search.
+     (save-excursion
+       (set-buffer buffer)
+       (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
+           (match-string 1))))))
+
+(semantic-alias-obsolete 'semantic-find-nonterminal
+                         'semantic-go-to-tag)
+
+(semantic-alias-obsolete 'semantic-find-dependency
+                         'semantic-dependency-tag-file)
+
+
+(provide 'semantic-tag-file)
+
+;;; semantic-tag-file.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-tag-ls.el b/site/cedet-1.0pre7/semantic/semantic-tag-ls.el
new file mode 100644
index 0000000..4e496b0
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-tag-ls.el
@@ -0,0 +1,285 @@
+;;; semantic-tag-ls.el --- Language Specific override functions for tags
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-tag-ls.el,v 1.15 2008/06/10 00:43:39 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; There are some features of tags that are too langauge dependent to
+;; put in the core `semantic-tag' functionality.  For instance, the
+;; protection of a tag (as specified by UML) could be almost anything.
+;; In Java, it is a type specifier.  In C, there is a label.  This
+;; informatin can be derived, and thus should not be stored in the tag
+;; itself.  These are the functions that languages can use to derive
+;; the information.
+
+(require 'semantic-tag)
+
+;;; Code:
+
+;;; UML features:
+;;
+;; UML can represent several types of features of a tag
+;; such as the `protection' of a symbol, or if it is abstract,
+;; leaf, etc.  Learn about UML to catch onto the lingo.
+
+;;;###autoload
+(define-overloadable-function semantic-tag-calculate-parent (tag)
+  "Attempt to calculate the parent of TAG.
+The default behavior (if not overriden with `tag-calculate-parent')
+is to search a buffer found with TAG, and if externally defined,
+search locally, then semanticdb for that tag (when enabled.)")
+
+(defun semantic-tag-calculate-parent-default (tag)
+  "Attempt to calculate the parent of TAG."
+  (when (semantic-tag-in-buffer-p tag)
+    (save-excursion
+      (set-buffer (semantic-tag-buffer tag))
+      (save-excursion
+	(goto-char (semantic-tag-start tag))
+	(semantic-current-tag-parent))
+      )))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-protection (tag &optional parent)
+  "Return protection information about TAG with optional PARENT.
+This function returns on of the following symbols:
+   nil        - No special protection.  Language dependent.
+   'public    - Anyone can access this TAG.
+   'private   - Only methods in the local scope can access TAG.
+   'protected - Like private for outside scopes, like public for child
+                classes.
+Some languages may choose to provide additional return symbols specific
+to themselves.  Use of this function should allow for this.
+
+The default behavior (if not overridden with `tag-protection'
+is to return a symbol based on type modifiers."
+  (and (not parent)
+       (semantic-tag-overlay tag)
+       (semantic-tag-in-buffer-p tag)
+       (setq parent (semantic-tag-calculate-parent tag)))
+  (:override))
+
+(make-obsolete-overload 'semantic-nonterminal-protection
+                        'semantic-tag-protection)
+
+(defun semantic-tag-protection-default (tag &optional parent)
+  "Return the protection of TAG as a child of PARENT default action.
+See `semantic-tag-protection'."
+  (let ((mods (semantic-tag-modifiers tag))
+	(prot nil))
+    (while (and (not prot) mods)
+      (if (stringp (car mods))
+	  (let ((s (car mods)))
+	    (setq prot
+		  ;; A few silly defaults to get things started.
+		  (cond ((or (string= s "public")
+			     (string= s "extern")
+			     (string= s "export"))
+			 'public)
+			((string= s "private")
+			 'private)
+			((string= s "protected")
+			 'protected)))))
+      (setq mods (cdr mods)))
+    prot))
+
+;;;###autoload
+(defun semantic-tag-protected-p (tag protection &optional parent)
+  "Non-nil if TAG is is protected.
+PROTECTION is a symbol which can be returned by the method
+`semantic-tag-protection'.
+PARENT is the parent data type which contains TAG.
+
+For these PROTECTIONs, true is returned if TAG is:
+@table @asis
+@item nil
+  Always true
+@item  private
+  True if nil.
+@item protected
+  True if private or nil.
+@item public
+  True if private, protected, or nil.
+@end table"
+  (if (null protection)
+      t
+    (let ((tagpro (semantic-tag-protection tag parent)))
+      (or (and (eq protection 'private)
+	       (null tagpro))
+	  (and (eq protection 'protected)
+	       (or (null tagpro)
+		   (eq tagpro 'private)))
+	  (and (eq protection 'public)
+	       (not (eq tagpro 'public)))))
+    ))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-abstract-p (tag &optional parent)
+  "Return non nil if TAG is abstract.
+Optional PARENT is the parent tag of TAG.
+In UML, abstract methods and classes have special meaning and behavior
+in how methods are overridden.  In UML, abstract methods are italicized.
+
+The default behavior (if not overridden with `tag-abstract-p'
+is to return true if `abstract' is in the type modifiers.")
+
+(make-obsolete-overload 'semantic-nonterminal-abstract
+                        'semantic-tag-abstract-p)
+
+(defun semantic-tag-abstract-p-default (tag &optional parent)
+  "Return non-nil if TAG is abstract as a child of PARENT default action.
+See `semantic-tag-abstract-p'."
+  (let ((mods (semantic-tag-modifiers tag))
+	(abs nil))
+    (while (and (not abs) mods)
+      (if (stringp (car mods))
+	  (setq abs (or (string= (car mods) "abstract")
+			(string= (car mods) "virtual"))))
+      (setq mods (cdr mods)))
+    abs))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-leaf-p (tag &optional parent)
+  "Return non nil if TAG is leaf.
+Optional PARENT is the parent tag of TAG.
+In UML, leaf methods and classes have special meaning and behavior.
+
+The default behavior (if not overridden with `tag-leaf-p'
+is to return true if `leaf' is in the type modifiers.")
+
+(make-obsolete-overload 'semantic-nonterminal-leaf
+                        'semantic-tag-leaf-p)
+
+(defun semantic-tag-leaf-p-default (tag &optional parent)
+  "Return non-nil if TAG is leaf as a child of PARENT default action.
+See `semantic-tag-leaf-p'."
+  (let ((mods (semantic-tag-modifiers tag))
+	(leaf nil))
+    (while (and (not leaf) mods)
+      (if (stringp (car mods))
+	  ;; Use java FINAL as example default.  There is none
+	  ;; for C/C++
+	  (setq leaf (string= (car mods) "final")))
+      (setq mods (cdr mods)))
+    leaf))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-static-p (tag &optional parent)
+  "Return non nil if TAG is static.
+Optional PARENT is the parent tag of TAG.
+In UML, static methods and attributes mean that they are allocated
+in the parent class, and are not instance specific.
+UML notation specifies that STATIC entries are underlined.")
+
+(defun semantic-tag-static-p-default (tag &optional parent)
+  "Return non-nil if TAG is static as a child of PARENT default action.
+See `semantic-tag-static-p'."
+  (let ((mods (semantic-tag-modifiers tag))
+	(static nil))
+    (while (and (not static) mods)
+      (if (stringp (car mods))
+	  (setq static (string= (car mods) "static")))
+      (setq mods (cdr mods)))
+    static))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-prototype-p (tag)
+  "Return non nil if TAG is a prototype.
+For some laguages, such as C, a prototype is a declaration of
+something without an implementation."
+  )
+
+(defun semantic-tag-prototype-p-default (tag)
+  "Non-nil if TAG is a prototype."
+  (let ((p (semantic-tag-get-attribute tag :prototype-flag)))
+    (cond
+     ;; Trust the parser author.
+     (p p)
+     ;; Empty types might be a prototype.
+     ;; @todo - make this better.
+     ((eq (semantic-tag-class tag) 'type)
+      (not (semantic-tag-type-members tag)))
+     ;; No other heuristics.
+     (t nil))
+    ))
+
+;;; FULL NAMES
+;;
+;; For programmer convenience, a full name is not specified in source
+;; code.  Instead some abbreviation is made, and the local environment
+;; will contain the info needed to determine the full name.
+
+;;;###autoload
+(define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer)
+  "Return the fully qualified name of TAG in the package hierarchy.
+STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream',
+but must be a toplevel semantic tag stream that contains TAG.
+A Package Hierarchy is defined in UML by the way classes and methods
+are organized on disk.  Some language use this concept such that a
+class can be accessed via it's fully qualified name, (such as Java.)
+Other languages qualify names within a Namespace (such as C++) which
+result in a different package like structure.  Languages which do not
+override this function with `tag-full-name' will use
+`semantic-tag-name'.  Override functions only need to handle
+STREAM-OR-BUFFER with a tag stream value, or nil."
+  (let ((stream (semantic-something-to-tag-table
+                 (or stream-or-buffer tag))))
+    (:override-with-args (tag stream))))
+
+(make-obsolete-overload 'semantic-nonterminal-full-name
+                        'semantic-tag-full-name)
+
+(defun semantic-tag-full-name-default (tag stream)
+  "Default method for `semantic-tag-full-name'.
+Return the name of TAG found in the toplevel STREAM."
+  (semantic-tag-name tag))
+
+;;; Compatibility aliases.
+;;
+(semantic-alias-obsolete 'semantic-nonterminal-protection
+			 'semantic-tag-protection)
+(semantic-alias-obsolete 'semantic-nonterminal-protection-default
+			 'semantic-tag-protection-default)
+(semantic-alias-obsolete 'semantic-nonterminal-abstract
+			 'semantic-tag-abstract-p)
+(semantic-alias-obsolete 'semantic-nonterminal-abstract-default
+			 'semantic-tag-abstract-p-default)
+(semantic-alias-obsolete 'semantic-nonterminal-leaf
+			 'semantic-tag-leaf-p)
+(semantic-alias-obsolete 'semantic-nonterminal-leaf-default
+			 'semantic-tag-leaf-p-default)
+(semantic-alias-obsolete 'semantic-nonterminal-static-default
+			 'semantic-tag-static-p-default)
+(semantic-alias-obsolete 'semantic-nonterminal-full-name
+			 'semantic-tag-full-name)
+(semantic-alias-obsolete 'semantic-nonterminal-full-name-default
+			 'semantic-tag-full-name-default)
+
+;; TEMPORARY within betas of CEDET 1.0
+(semantic-alias-obsolete 'semantic-tag-static 'semantic-tag-static-p)
+(semantic-alias-obsolete 'semantic-tag-leaf 'semantic-tag-leaf-p)
+(semantic-alias-obsolete 'semantic-tag-abstract 'semantic-tag-abstract-p)
+
+
+(provide 'semantic-tag-ls)
+
+;;; semantic-tag-ls.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-tag-write.el b/site/cedet-1.0pre7/semantic/semantic-tag-write.el
new file mode 100644
index 0000000..4d0d1a3
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-tag-write.el
@@ -0,0 +1,189 @@
+;;; semantic-tag-write.el --- Write tags to a text stream
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-tag-write.el,v 1.5 2009/09/11 23:34:08 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Routine for writing out a list of tags to a text stream.
+;;
+;; These routines will be used by semanticdb to output a tag list into
+;; a text stream to be saved to a file.  Ideally, you could use tag streams
+;; to share tags between processes as well.
+;;
+;; As a bonus, these routines will also validate the tag structure, and make sure
+;; that they conform to good semantic tag hygene.
+;;
+
+(require 'semantic-tag)
+
+;;; Code:
+(defun semantic-tag-write-one-tag (tag &optional indent)
+  "Write a single tag TAG to standard out.
+INDENT is the amount of indentation to use for this tag."
+  (when (not (semantic-tag-p tag))
+    (signal 'wrong-type-argument (list tag 'semantic-tag-p)))
+  (when (not indent) (setq indent 0))
+  ;(princ (make-string indent ? ))
+  (princ "(\"")
+  ;; Base parts
+  (let ((name (semantic-tag-name tag))
+	(class (semantic-tag-class tag)))
+    (princ name)
+    (princ "\" ")
+    (princ (symbol-name class))
+    )
+  (let ((attr (semantic-tag-attributes tag))
+	)
+    ;; Attributes
+    (cond ((not attr)
+	   (princ " nil"))
+
+	  ((= (length attr) 2) ;; One item
+	   (princ " (")
+	   (semantic-tag-write-one-attribute attr indent)
+	   (princ ")")
+	   )
+	  (t
+	   ;; More than one tag.
+	   (princ "\n")
+	   (princ (make-string (+ indent 3) ? ))
+	   (princ "(")
+	   (while attr
+	     (semantic-tag-write-one-attribute attr (+ indent 4))
+	     (setq attr (cdr (cdr attr)))
+	     (when attr
+	       (princ "\n")
+	       (princ (make-string (+ indent 4) ? )))
+	     )
+	   (princ ")\n")
+	   (princ (make-string (+ indent 3) ? ))
+	   ))
+    ;; Properties - for now, always nil.
+    (let ((rs (semantic--tag-get-property tag 'reparse-symbol)))
+      (if (not rs)
+	  (princ " nil")
+	;; Else, put in the property list.
+	(princ " (reparse-symbol ")
+	(princ (symbol-name rs))
+	(princ ")"))
+      ))
+  ;; Overlay
+  (if (semantic-tag-with-position-p tag)
+      (let ((bounds (semantic-tag-bounds tag)))
+	(princ " ")
+	(prin1 (apply 'vector bounds))
+	)
+    (princ " nil"))
+  ;; End it.
+  (princ ")")
+  )
+
+;;;###autoload
+(defun semantic-tag-write-tag-list (tlist &optional indent dontaddnewline)
+  "Write the tag list TLIST to the current stream.
+INDENT indicates the current indentation level.
+If optional DONTADDNEWLINE is non-nil, then don't add a newline."
+  (if (not indent)
+      (setq indent 0)
+    (unless dontaddnewline
+      ;; Assume cursor at end of current line.  Add a CR, and make the list.
+      (princ "\n")
+      (princ (make-string indent ? ))))
+  (princ "( ")
+  (while tlist
+    (if (semantic-tag-p (car tlist))
+	(semantic-tag-write-one-tag (car tlist) (+ indent 2))
+      ;; If we don't have a tag in the tag list, use the below hack, and hope
+      ;; it doesn't contain anything bad.  If we find something bad, go back here
+      ;; and start extending what's expected here.
+      (princ (format "%S" (car tlist))))
+    (setq tlist (cdr tlist))
+    (when tlist
+      (princ "\n")
+      (princ (make-string (+ indent 2) ? )))
+    )
+  (princ ")")
+  (princ (make-string indent ? ))
+  )
+
+
+;; Writing out random stuff.
+(defun semantic-tag-write-one-attribute (attrs indent)
+  "Write out one attribute from the head of the list of attributes ATTRS.
+INDENT is the current amount of indentation."
+  (when (not attrs) (signal 'wrong-type-argument (list 'listp attrs)))
+  (when (not (symbolp (car attrs))) (error "Bad Attribute List in tag"))
+
+  (princ (symbol-name (car attrs)))
+  (princ " ")
+  (semantic-tag-write-one-value (car (cdr attrs)) indent)
+  )
+
+(defun semantic-tag-write-one-value (value indent)
+  "Write out a VALUE for something in a tag.
+INDENT is the current tag indentation.
+Items that are long lists of tags may need their own line."
+  (cond
+   ;; Another tag.
+   ((semantic-tag-p value)
+    (semantic-tag-write-one-tag value (+ indent 2)))
+   ;; A list of more tags
+   ((and (listp value) (semantic-tag-p (car value)))
+    (semantic-tag-write-tag-list value (+ indent 2))
+    )
+   ;; Some arbitrary data.
+   (t
+    (let ((str (format "%S" value)))
+      ;; Protect against odd data types in tags.
+      (if (= (aref str 0) ?#)
+	  (progn
+	    (princ "nil")
+	    (message "Warning: Value %s not writable in tag." str))
+	(princ str)))))
+  )
+;;; EIEIO USAGE
+;;;###autoload
+(defun semantic-tag-write-list-slot-value (value)
+  "Write out the VALUE of a slot for EIEIO.
+The VALUE is a list of tags."
+  (if (not value)
+      (princ "nil")
+    (princ "\n        '")
+    (semantic-tag-write-tag-list value 10 t)
+    ))
+
+;;; TESTING.
+
+(defun semantic-tag-write-test ()
+  "Test the semantic tag writer against the tag under point."
+  (interactive)
+  (with-output-to-temp-buffer "*Tag Write Test*"
+    (semantic-tag-write-one-tag (semantic-current-tag))))
+
+(defun semantic-tag-write-list-test ()
+  "Test the semantic tag writer against the tag under point."
+  (interactive)
+  (with-output-to-temp-buffer "*Tag Write Test*"
+    (semantic-tag-write-tag-list (semantic-fetch-tags))))
+
+
+(provide 'semantic-tag-write)
+;;; semantic-tag-write.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-tag.el b/site/cedet-1.0pre7/semantic/semantic-tag.el
new file mode 100644
index 0000000..60a7ef4
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-tag.el
@@ -0,0 +1,1564 @@
+;;; semantic-tag.el --- tag creation and access
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; X-CVS: $Id: semantic-tag.el,v 1.73 2010/01/07 02:23:40 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; I.  The core production of semantic is the list of tags produced by the
+;;    different parsers.  This file provides 3 APIs related to tag access:
+;;
+;;    1) Primitive Tag Access
+;;       There is a set of common features to all tags.  These access
+;;       functions can get these values.
+;;    2) Standard Tag Access
+;;       A Standard Tag should be produced by most traditional languages
+;;       with standard styles common to typed object oriented languages.
+;;       These functions can access these data elements from a tag.
+;;    3) Generic Tag Access
+;;       Access to tag structure in a more direct way.
+;;         ** May not be forward compatible.
+;;
+;; II.  There is also an API for tag creation.  Use `semantic-tag' to create
+;;     a new tag.
+;;
+;; III.  Tag Comparison.  Allows explicit or comparitive tests to see
+;;      if two tags are the same.
+
+;;; Code:
+;;
+
+;; Keep this only so long as we have obsolete fcns.
+(require 'semantic-fw)
+
+(defconst semantic-tag-version semantic-version
+  "Version string of semantic tags made with this code.")
+
+(defconst semantic-tag-incompatible-version "1.0"
+  "Version string of semantic tags which are not currently compatible.
+These old style tags may be loaded from a file with semantic db.
+In this case, we must flush the old tags and start over.")
+
+;;; Primitive Tag access system:
+;;
+;; Raw tags in semantic are lists of 5 elements:
+;;
+;;   (NAME CLASS ATTRIBUTES PROPERTIES OVERLAY)
+;;
+;; Where:
+;;
+;;   - NAME is a string that represents the tag name.
+;;
+;;   - CLASS is a symbol that represent the class of the tag (for
+;;     example, usual classes are `type', `function', `variable',
+;;     `include', `package', `code').
+;;
+;;   - ATTRIBUTES is a public list of attributes that describes
+;;     language data represented by the tag (for example, a variable
+;;     can have a `:constant-flag' attribute, a function an `:arguments'
+;;     attribute, etc.).
+;;
+;;   - PROPERTIES is a private list of properties used internally.
+;;
+;;   - OVERLAY represent the location of data described by the tag.
+;;
+
+(defsubst semantic-tag-name (tag)
+  "Return the name of TAG.
+For functions, variables, classes, typedefs, etc., this is the identifier
+that is being defined.  For tags without an obvious associated name, this
+may be the statement type, e.g., this may return @code{print} for python's
+print statement."
+  (car tag))
+
+(defsubst semantic-tag-class (tag)
+  "Return the class of TAG.
+That is, the symbol 'variable, 'function, 'type, or other.
+There is no limit to the symbols that may represent the class of a tag.
+Each parser generates tags with classes defined by it.
+
+For functional languages, typical tag classes are:
+
+@table @code
+@item type
+Data types, named map for a memory block.
+@item function
+A function or method, or named execution location.
+@item variable
+A variable, or named storage for data.
+@item include
+Statement that represents a file from which more tags can be found.
+@item package
+Statement that declairs this file's package name.
+@item code
+Code that has not name or binding to any other symbol, such as in a script.
+@end table
+"
+  (nth 1 tag))
+
+(defsubst semantic-tag-attributes (tag)
+  "Return the list of public attributes of TAG.
+That is a property list: (ATTRIBUTE-1 VALUE-1 ATTRIBUTE-2 VALUE-2...)."
+  (nth 2 tag))
+
+(defsubst semantic-tag-properties (tag)
+  "Return the list of private properties of TAG.
+That is a property list: (PROPERTY-1 VALUE-1 PROPERTY-2 VALUE-2...)."
+  (nth 3 tag))
+
+(defsubst semantic-tag-overlay (tag)
+  "Return the OVERLAY part of TAG.
+That is, an overlay or an unloaded buffer representation.
+This function can also return an array of the form [ START END ].
+This occurs for tags that are not currently linked into a buffer."
+  (nth 4 tag))
+
+(defsubst semantic--tag-overlay-cdr (tag)
+  "Return the cons cell whose car is the OVERLAY part of TAG.
+That function is for internal use only."
+  (nthcdr 4 tag))
+
+(defsubst semantic--tag-set-overlay (tag overlay)
+  "Set the overlay part of TAG with OVERLAY.
+That function is for internal use only."
+  (setcar (semantic--tag-overlay-cdr tag) overlay))
+
+(defsubst semantic-tag-start (tag)
+  "Return the start location of TAG."
+  (let ((o (semantic-tag-overlay tag)))
+    (if (semantic-overlay-p o)
+        (semantic-overlay-start o)
+      (aref o 0))))
+
+(defsubst semantic-tag-end (tag)
+  "Return the end location of TAG."
+  (let ((o (semantic-tag-overlay tag)))
+    (if (semantic-overlay-p o)
+        (semantic-overlay-end o)
+      (aref o 1))))
+
+(defsubst semantic-tag-bounds (tag)
+  "Return the location (START END) of data TAG describes."
+  (list (semantic-tag-start tag)
+        (semantic-tag-end tag)))
+
+(defun semantic-tag-set-bounds (tag start end)
+  "In TAG, set the START and END location of data it describes."
+  (let ((o (semantic-tag-overlay tag)))
+    (if (semantic-overlay-p o)
+        (semantic-overlay-move o start end)
+      (semantic--tag-set-overlay tag (vector start end)))))
+
+(defun semantic-tag-in-buffer-p (tag)
+  "Return the buffer TAG resides in IFF tag is already in a buffer.
+If a tag is not in a buffer, return nil."
+  (let ((o (semantic-tag-overlay tag)))
+     ;; TAG is currently linked to a buffer, return it.
+    (when (and (semantic-overlay-p o)
+	       (semantic-overlay-live-p o))
+      (semantic-overlay-buffer o))))
+
+(defsubst semantic--tag-get-property (tag property)
+  "From TAG, extract the value of PROPERTY.
+Return the value found, or nil if PROPERTY is not one of the
+properties of TAG.
+That function is for internal use only."
+  (plist-get (semantic-tag-properties tag) property))
+
+(defun semantic-tag-buffer (tag)
+  "Return the buffer TAG resides in.
+If TAG has an originating file, read that file into a (maybe new)
+buffer, and return it.
+Return nil if there is no buffer for this tag."
+  (let ((buff (semantic-tag-in-buffer-p tag)))
+    (if buff
+	buff
+      ;; TAG has an originating file, read that file into a buffer, and
+      ;; return it.
+     (if (semantic--tag-get-property tag :filename)
+	 (save-match-data
+	   (find-file-noselect (semantic--tag-get-property tag :filename)))
+       ;; TAG is not in Emacs right now, no buffer is available.
+       ))))
+
+(defun semantic-tag-mode (&optional tag)
+  "Return the major mode active for TAG.
+TAG defaults to the tag at point in current buffer.
+If TAG has a :mode property return it.
+If point is inside TAG bounds, return the major mode active at point.
+Return the major mode active at beginning of TAG otherwise.
+See also the function `semantic-ctxt-current-mode'."
+  (or tag (setq tag (semantic-current-tag)))
+  (or (semantic--tag-get-property tag :mode)
+      (let ((buffer (semantic-tag-buffer tag))
+            (start (semantic-tag-start tag))
+            (end   (semantic-tag-end tag)))
+        (save-excursion
+          (and buffer (set-buffer buffer))
+          ;; Unless point is inside TAG bounds, move it to the
+          ;; beginning of TAG.
+          (or (and (>= (point) start) (< (point) end))
+              (goto-char start))
+          (require 'semantic-ctxt)
+          (semantic-ctxt-current-mode)))))
+
+(defsubst semantic--tag-attributes-cdr (tag)
+  "Return the cons cell whose car is the ATTRIBUTES part of TAG.
+That function is for internal use only."
+  (nthcdr 2 tag))
+
+(defsubst semantic-tag-put-attribute (tag attribute value)
+  "Change value in TAG of ATTRIBUTE to VALUE.
+If ATTRIBUTE already exists, its value is set to VALUE, otherwise the
+new ATTRIBUTE VALUE pair is added.
+Return TAG.
+Use this function in a parser when not all attributes are known at the
+same time."
+  (let* ((plist-cdr (semantic--tag-attributes-cdr tag)))
+    (when (consp plist-cdr)
+      (setcar plist-cdr
+              (semantic-tag-make-plist
+               (plist-put (car plist-cdr) attribute value))))
+    tag))
+
+(defun semantic-tag-put-attribute-no-side-effect (tag attribute value)
+  "Change value in TAG of ATTRIBUTE to VALUE without side effects.
+All cons cells in the attribute list are replicated so that there
+are no side effects if TAG is in shared lists.
+If ATTRIBUTE already exists, its value is set to VALUE, otherwise the
+new ATTRIBUTE VALUE pair is added.
+Return TAG."
+  (let* ((plist-cdr (semantic--tag-attributes-cdr tag)))
+    (when (consp plist-cdr)
+      (setcar plist-cdr
+              (semantic-tag-make-plist
+               (plist-put (copy-sequence (car plist-cdr))
+                          attribute value))))
+    tag))
+
+(defsubst semantic-tag-get-attribute (tag attribute)
+  "From TAG, return the value of ATTRIBUTE.
+ATTRIBUTE is a symbol whose specification value to get.
+Return the value found, or nil if ATTRIBUTE is not one of the
+attributes of TAG."
+  (plist-get (semantic-tag-attributes tag) attribute))
+
+;; These functions are for internal use only!
+(defsubst semantic--tag-properties-cdr (tag)
+  "Return the cons cell whose car is the PROPERTIES part of TAG.
+That function is for internal use only."
+  (nthcdr 3 tag))
+
+(defun semantic--tag-put-property (tag property value)
+  "Change value in TAG of PROPERTY to VALUE.
+If PROPERTY already exists, its value is set to VALUE, otherwise the
+new PROPERTY VALUE pair is added.
+Return TAG.
+That function is for internal use only."
+  (let* ((plist-cdr (semantic--tag-properties-cdr tag)))
+    (when (consp plist-cdr)
+      (setcar plist-cdr
+              (semantic-tag-make-plist
+               (plist-put (car plist-cdr) property value))))
+    tag))
+
+(defun semantic--tag-put-property-no-side-effect (tag property value)
+  "Change value in TAG of PROPERTY to VALUE without side effects.
+All cons cells in the property list are replicated so that there
+are no side effects if TAG is in shared lists.
+If PROPERTY already exists, its value is set to VALUE, otherwise the
+new PROPERTY VALUE pair is added.
+Return TAG.
+That function is for internal use only."
+  (let* ((plist-cdr (semantic--tag-properties-cdr tag)))
+    (when (consp plist-cdr)
+      (setcar plist-cdr
+              (semantic-tag-make-plist
+               (plist-put (copy-sequence (car plist-cdr))
+                          property value))))
+    tag))
+
+(defun semantic-tag-file-name (tag)
+  "Return the name of the file from which TAG originated.
+Return nil if that information can't be obtained.
+If TAG is from a loaded buffer, then that buffer's filename is used.
+If TAG is unlinked, but has a :filename property, then that is used."
+  (let ((buffer (semantic-tag-in-buffer-p tag)))
+    (if buffer
+        (buffer-file-name buffer)
+      (semantic--tag-get-property tag :filename))))
+
+;;; Tag tests and comparisons.
+;;
+;;;###autoload
+(defsubst semantic-tag-p (tag)
+  "Return non-nil if TAG is most likely a semantic tag."
+  (condition-case nil
+      (and (consp tag)
+	   (stringp (car tag))                ; NAME
+	   (symbolp (nth 1 tag)) (nth 1 tag)  ; TAG-CLASS
+	   (listp (nth 2 tag))                ; ATTRIBUTES
+	   (listp (nth 3 tag))                ; PROPERTIES
+	   )
+    ;; If an error occurs, then it most certainly is not a tag.
+    (error nil)))
+
+(defsubst semantic-tag-of-class-p (tag class)
+  "Return non-nil if class of TAG is CLASS."
+  (eq (semantic-tag-class tag) class))
+
+(defsubst semantic-tag-type-members (tag)
+  "Return the members of the type that TAG describes.
+That is the value of the `:members' attribute."
+  (semantic-tag-get-attribute tag :members))
+
+(defsubst semantic-tag-type (tag)
+  "Return the value of the `:type' attribute of TAG.
+For a function it would be the data type of the return value.
+For a variable, it is the storage type of that variable.
+For a data type, the type is the style of datatype, such as
+struct or union."
+  (semantic-tag-get-attribute tag :type))
+
+(defun semantic-tag-with-position-p (tag)
+  "Return non-nil if TAG has positional information."
+  (and (semantic-tag-p tag)
+       (let ((o (semantic-tag-overlay tag)))
+	 (or (and (semantic-overlay-p o)
+		  (semantic-overlay-live-p o))
+             (arrayp o)))))
+
+(defun semantic-equivalent-tag-p (tag1 tag2)
+  "Compare TAG1 and TAG2 and return non-nil if they are equivalent.
+Use `equal' on elements the name, class, and position.
+Use this function if tags are being copied and regrouped to test
+for if two tags represent the same thing, but may be constructed
+of different cons cells."
+  (and (equal (semantic-tag-name tag1) (semantic-tag-name tag2))
+       (semantic-tag-of-class-p tag1 (semantic-tag-class tag2))
+       (or (and (not (semantic-tag-overlay tag1))
+		(not (semantic-tag-overlay tag2)))
+	   (and (semantic-tag-overlay tag1)
+		(semantic-tag-overlay tag2)
+		(equal (semantic-tag-bounds tag1)
+		       (semantic-tag-bounds tag2))))))
+
+(defun semantic-tag-similar-p (tag1 tag2 &rest ignorable-attributes)
+  "Test to see if TAG1 and TAG2 are similar.
+Two tags are similar if their name, datatype, and various attributes
+are the same.
+
+Similar tags that have sub-tags such as arg lists or type members,
+are similar w/out checking the sub-list of tags.
+Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity."
+  (let* ((A1 (and (equal (semantic-tag-name tag1) (semantic-tag-name tag2))
+		  (semantic-tag-of-class-p tag1 (semantic-tag-class tag2))
+		  (semantic-tag-of-type-p tag1 (semantic-tag-type tag2))))
+	 (attr1 (semantic-tag-attributes tag1))
+	 (A2 (= (length attr1) (length (semantic-tag-attributes tag2))))
+	 (A3 t)
+	 )
+    (when (and (not A2) ignorable-attributes)
+      (setq A2 t))
+    (while (and A2 attr1 A3)
+      (let ((a (car attr1))
+	    (v (car (cdr attr1))))
+
+	(cond ((or (eq a :type) ;; already tested above.
+		   (memq a ignorable-attributes)) ;; Ignore them...
+	       nil)
+
+	      ;; Don't test sublists of tags
+	      ((and (listp v) (semantic-tag-p (car v)))
+	       nil)
+
+	      ;; The attributes are not the same?
+	      ((not (equal v (semantic-tag-get-attribute tag2 a)))
+	       (setq A3 nil))
+	      (t
+	       nil))
+	)
+      (setq attr1 (cdr (cdr attr1))))
+
+    (and A1 A2 A3)
+    ))
+
+(defun semantic-tag-similar-with-subtags-p (tag1 tag2 &rest ignorable-attributes)
+  "Test to see if TAG1 and TAG2 are similar.
+Uses `semantic-tag-similar-p' but also recurses through sub-tags, such
+as argument lists and type members.
+Optional argument IGNORABLE-ATTRIBUTES is passed down to
+`semantic-tag-similar-p'."
+  (let ((C1 (semantic-tag-components tag1))
+	(C2 (semantic-tag-components tag2))
+	)
+    (if (or (/= (length C1) (length C2))
+	    (not (semantic-tag-similar-p tag1 tag2 ignorable-attributes))
+	    )
+	;; Basic test fails.
+	nil
+      ;; Else, check component lists.
+      (catch 'component-dissimilar
+	(while C1
+
+	  (if (not (semantic-tag-similar-with-subtags-p
+		    (car C1) (car C2) ignorable-attributes))
+	      (throw 'component-dissimilar nil))
+
+	  (setq C1 (cdr C1))
+	  (setq C2 (cdr C2))
+	  )
+	;; If we made it this far, we are ok.
+	t) )))
+
+
+(defun semantic-tag-of-type-p (tag type)
+  "Compare TAG's type against TYPE.  Non nil if equivalent.
+TYPE can be a string, or a tag of class 'type.
+This can be complex since some tags might have a :type that is a tag,
+while other tags might just have a string.  This function will also be
+return true of TAG's type is compared directly to the declaration of a
+data type."
+  (let* ((tagtype (semantic-tag-type tag))
+	 (tagtypestring (cond ((stringp tagtype)
+			       tagtype)
+			      ((and (semantic-tag-p tagtype)
+				    (semantic-tag-of-class-p tagtype 'type))
+			       (semantic-tag-name tagtype))
+			      (t "")))
+	 (typestring (cond ((stringp type)
+			    type)
+			   ((and (semantic-tag-p type)
+				 (semantic-tag-of-class-p type 'type))
+			    (semantic-tag-name type))
+			   (t "")))
+	 )
+    (and
+     tagtypestring
+     (or
+      ;; Matching strings (input type is string)
+      (and (stringp type)
+	   (string= tagtypestring type))
+      ;; Matching strings (tag type is string)
+      (and (stringp tagtype)
+	   (string= tagtype typestring))
+      ;; Matching tokens, and the type of the type is the same.
+      (and (string= tagtypestring typestring)
+	   (if (and (semantic-tag-type tagtype) (semantic-tag-type type))
+	       (equal (semantic-tag-type tagtype) (semantic-tag-type type))
+	     t))
+      ))
+    ))
+
+(defun semantic-tag-type-compound-p (tag)
+  "Return non-nil the type of TAG is compound.
+Compound implies a structure or similar data type.
+Returns the list of tag members if it is compound."
+  (let* ((tagtype (semantic-tag-type tag))
+	 )
+    (when (and (semantic-tag-p tagtype)
+	       (semantic-tag-of-class-p tagtype 'type))
+      ;; We have the potential of this being a nifty compound type.
+      (semantic-tag-type-members tagtype)
+      )))
+
+(defun semantic-tag-faux-p (tag)
+  "Return non-nil if TAG is a FAUX tag.
+FAUX tags are created to represent a construct that is
+not known to exist in the code.
+
+Example: When the class browser sees methods to a class, but
+cannot find the class, it will create a faux tag to represent the
+class to store those methods."
+  (semantic--tag-get-property tag :faux-flag))
+
+;;; Tag creation
+;;
+
+;; Is this function still necessary?
+(defun semantic-tag-make-plist (args)
+  "Create a property list with ARGS.
+Args is a property list of the form (KEY1 VALUE1 ... KEYN VALUEN).
+Where KEY is a symbol, and VALUE is the value for that symbol.
+The return value will be a new property list, with these KEY/VALUE
+pairs eliminated:
+
+  - KEY associated to nil VALUE.
+  - KEY associated to an empty string VALUE.
+  - KEY associated to a zero VALUE."
+  (let (plist key val)
+    (while args
+      (setq key  (car args)
+            val  (nth 1 args)
+            args (nthcdr 2 args))
+      (or (member val '("" nil))
+          (and (numberp val) (zerop val))
+          (setq plist (cons key (cons val plist)))))
+    ;; It is not useful to reverse the new plist.
+    plist))
+
+(defsubst semantic-tag (name class &rest attributes)
+  "Create a generic semantic tag.
+NAME is a string representing the name of this tag.
+CLASS is the symbol that represents the class of tag this is,
+such as 'variable, or 'function.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (list name class (semantic-tag-make-plist attributes) nil nil))
+
+(defsubst semantic-tag-new-variable (name type &optional default-value &rest attributes)
+  "Create a semantic tag of class 'variable.
+NAME is the name of this variable.
+TYPE is a string or semantic tag representing the type of this variable.
+Optional DEFAULT-VALUE is a string representing the default value of this variable.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'variable
+         :type type
+         :default-value default-value
+         attributes))
+
+(defsubst semantic-tag-new-function (name type arg-list &rest attributes)
+  "Create a semantic tag of class 'function.
+NAME is the name of this function.
+TYPE is a string or semantic tag representing the type of this function.
+ARG-LIST is a list of strings or semantic tags representing the
+arguments of this function.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'function
+         :type type
+         :arguments arg-list
+         attributes))
+
+(defsubst semantic-tag-new-type (name type members parents &rest attributes)
+  "Create a semantic tag of class 'type.
+NAME is the name of this type.
+TYPE is a string or semantic tag representing the type of this type.
+MEMBERS is a list of strings or semantic tags representing the
+elements that make up this type if it is a composite type.
+PARENTS is a cons cell.  (EXPLICIT-PARENTS . INTERFACE-PARENTS)
+EXPLICIT-PARENTS can be a single string (Just one parent) or a
+list of parents (in a multiple inheritance situation).  It can also
+be nil.
+INTERFACE-PARENTS is a list of strings representing the names of
+all INTERFACES, or abstract classes inherited from.  It can also be
+nil.
+This slot can be interesting because the form:
+     ( nil \"string\")
+is a valid parent where there is no explicit parent, and only an
+interface.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'type
+         :type type
+         :members members
+         :superclasses (car parents)
+         :interfaces (cdr parents)
+         attributes))
+
+(defsubst semantic-tag-new-include (name system-flag &rest attributes)
+  "Create a semantic tag of class 'include.
+NAME is the name of this include.
+SYSTEM-FLAG represents that we were able to identify this include as belonging
+to the system, as opposed to belonging to the local project.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'include
+         :system-flag system-flag
+         attributes))
+
+(defsubst semantic-tag-new-package (name detail &rest attributes)
+  "Create a semantic tag of class 'package.
+NAME is the name of this package.
+DETAIL is extra information about this package, such as a location where
+it can be found.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'package
+         :detail detail
+         attributes))
+
+(defsubst semantic-tag-new-code (name detail &rest attributes)
+  "Create a semantic tag of class 'code.
+NAME is a name for this code.
+DETAIL is extra information about the code.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'code
+         :detail detail
+         attributes))
+
+(defsubst semantic-tag-set-faux (tag)
+  "Set TAG to be a new FAUX tag.
+FAUX tags represent constructs not found in the source code.
+You can identify a faux tag with `semantic-tag-faux-p'"
+  (semantic--tag-put-property tag :faux-flag t))
+
+(defsubst semantic-tag-set-name (tag name)
+  "Set TAG name to NAME."
+  (setcar tag name))
+
+;;; Copying and cloning tags.
+;;
+(defsubst semantic-tag-clone (tag &optional name)
+  "Clone TAG, creating a new TAG.
+If optional argument NAME is not nil it specifies a new name for the
+cloned tag."
+  ;; Right now, TAG is a list.
+  (list (or name (semantic-tag-name tag))
+        (semantic-tag-class tag)
+        (copy-sequence (semantic-tag-attributes tag))
+        (copy-sequence (semantic-tag-properties tag))
+        (semantic-tag-overlay tag)))
+
+(defun semantic-tag-copy (tag &optional name keep-file)
+  "Return a copy of TAG unlinked from the originating buffer.
+If optional argument NAME is non-nil it specifies a new name for the
+copied tag.
+If optional argument KEEP-FILE is non-nil, and TAG was linked to a
+buffer, the originating buffer file name is kept in the `:filename'
+property of the copied tag.
+If KEEP-FILE is a string, and the orginating buffer is NOT available,
+then KEEP-FILE is stored on the `:filename' property.
+This runs the tag hook `unlink-copy-hook`."
+  ;; Right now, TAG is a list.
+  (let ((copy (semantic-tag-clone tag name)))
+
+    ;; Keep the filename if needed.
+    (when keep-file
+      (semantic--tag-put-property
+       copy :filename (or (semantic-tag-file-name copy)
+			  (and (stringp keep-file)
+			       keep-file)
+			  )))
+
+    (when (semantic-tag-with-position-p tag)
+      ;; Convert the overlay to a vector, effectively 'unlinking' the tag.
+      (semantic--tag-set-overlay
+       copy (vector (semantic-tag-start copy) (semantic-tag-end copy)))
+
+      ;; Force the children to be copied also.
+      ;;(let ((chil (semantic--tag-copy-list
+      ;;	     (semantic-tag-components-with-overlays tag)
+      ;;	     keep-file)))
+      ;;;; Put the list into TAG.
+      ;;)
+
+      ;; Call the unlink-copy hook.  This should tell tools that
+      ;; this tag is not part of any buffer.
+      (when (semantic-overlay-p (semantic-tag-overlay tag))
+	(semantic--tag-run-hooks copy 'unlink-copy-hook))
+      )
+    copy))
+
+;;(defun semantic--tag-copy-list (tags &optional keep-file)
+;;  "Make copies of TAGS and return the list of TAGS."
+;;  (let ((out nil))
+;;    (dolist (tag tags out)
+;;      (setq out (cons (semantic-tag-copy tag nil keep-file)
+;;		      out))
+;;      )))
+
+(defun semantic--tag-copy-properties (tag1 tag2)
+  "Copy private properties from TAG1 to TAG2.
+Return TAG2.
+This function is for internal use only."
+  (let ((plist (semantic-tag-properties tag1)))
+    (while plist
+      (semantic--tag-put-property tag2 (car plist) (nth 1 plist))
+      (setq plist (nthcdr 2 plist)))
+    tag2))
+
+;;; DEEP COPIES
+;;
+(defun semantic-tag-deep-copy-one-tag (tag &optional filter)
+  "Make a deep copy of TAG, applying FILTER to each child-tag.
+Properties and overlay info are not copied.
+FILTER takes TAG as an argument, and should returns a semantic-tag.
+It is safe for FILTER to modify the input tag and return it."
+  (when (not filter) (setq filter 'identity))
+  (when (not (semantic-tag-p tag))
+    (signal 'wrong-type-argument (list tag 'semantic-tag-p)))
+  (funcall filter (list (semantic-tag-name tag)
+                        (semantic-tag-class tag)
+                        (semantic--tag-deep-copy-attributes
+			 (semantic-tag-attributes tag) filter)
+                        nil
+                        nil)))
+
+(defun semantic--tag-deep-copy-attributes (attrs &optional filter)
+  "Make a deep copy of ATTRS, applying FILTER to each child-tag.
+
+It is safe to modify ATTR, and return a permutaion of that list.
+
+FILTER takes TAG as an argument, and should returns a semantic-tag.
+It is safe for FILTER to modify the input tag and return it."
+  (when (car attrs)
+    (when (not (symbolp (car attrs))) (error "Bad Attribute List in tag"))
+    (cons (car attrs)
+          (cons (semantic--tag-deep-copy-value (nth 1 attrs) filter)
+                (semantic--tag-deep-copy-attributes (nthcdr 2 attrs) filter)))))
+
+(defun semantic--tag-deep-copy-value (value &optional filter)
+  "Make a deep copy of VALUE, applying FILTER to each child-tag.
+
+It is safe to  modify VALUE, and return a permutaion of that list.
+
+FILTER takes TAG as an argument, and should returns a semantic-tag.
+It is safe for FILTER to modify the input tag and return it."
+  (cond
+   ;; Another tag.
+   ((semantic-tag-p value)
+    (semantic-tag-deep-copy-one-tag value filter))
+
+   ;; A list of more tags
+   ((and (listp value) (semantic-tag-p (car value)))
+    (semantic--tag-deep-copy-tag-list value filter))
+
+   ;; Some arbitrary data.
+   (t value)))
+
+(defun semantic--tag-deep-copy-tag-list (tags &optional filter)
+  "Make a deep copy of TAGS, applying FILTER to each child-tag.
+
+It is safe to modify the TAGS list, and return a permutaion of that list.
+
+FILTER takes TAG as an argument, and should returns a semantic-tag.
+It is safe for FILTER to modify the input tag and return it."
+  (when (car tags)
+    (if (semantic-tag-p (car tags))
+        (cons (semantic-tag-deep-copy-one-tag (car tags) filter)
+              (semantic--tag-deep-copy-tag-list (cdr tags) filter))
+      (cons (car tags) (semantic--tag-deep-copy-tag-list (cdr tags) filter)))))
+
+
+;;; Standard Tag Access
+;;
+
+;;; Common
+;;
+(defsubst semantic-tag-modifiers (tag)
+  "Return the value of the `:typemodifiers' attribute of TAG."
+  (semantic-tag-get-attribute tag :typemodifiers))
+
+(defun semantic-tag-docstring (tag &optional buffer)
+  "Return the documentation of TAG.
+That is the value defined by the `:documentation' attribute.
+Optional argument BUFFER indicates where to get the text from.
+If not provided, then only the POSITION can be provided.
+
+If you want to get documentation for languages that do not store
+the documentation string in the tag itself, use
+`semantic-documentation-for-tag' instead."
+  (let ((p (semantic-tag-get-attribute tag :documentation)))
+    (cond
+     ((stringp p) p) ;; it is the doc string.
+
+     ((semantic-lex-token-with-text-p p)
+      (semantic-lex-token-text p))
+
+     ((and (semantic-lex-token-without-text-p p)
+	   buffer)
+      (with-current-buffer buffer
+	(semantic-lex-token-text (car (semantic-lex p (1+ p))))))
+
+     (t nil))))
+
+;;; Generic attributes for tags of any class.
+;;
+(defsubst semantic-tag-named-parent (tag)
+  "Return the parent of TAG.
+That is the value of the `:parent' attribute.
+If a definition can occur outside an actual parent structure, but
+refers to that parent by name, then the :parent attribute should be used."
+  (semantic-tag-get-attribute tag :parent))
+
+;;; Tags of class `type'
+
+(defun semantic-tag-type-superclasses (tag)
+  "Return the list of superclass names of the type that TAG describes."
+  (let ((supers (semantic-tag-get-attribute tag :superclasses)))
+    (cond ((stringp supers)
+	   ;; If we have a string, make it a list.
+	   (list supers))
+	  ((semantic-tag-p supers)
+	   ;; If we have one tag, return just the name.
+	   (list (semantic-tag-name supers)))
+	  ((and (consp supers) (semantic-tag-p (car supers)))
+	   ;; If we have a tag list, then return the names.
+	   (mapcar (lambda (s) (semantic-tag-name s))
+		   supers))
+	  ((consp supers)
+	   ;; A list of something, return it.
+	   supers))))
+
+(defun semantic--tag-find-parent-by-name (name supers)
+  "Find the superclass NAME in the list of SUPERS.
+If a simple search doesn't do it, try splitting up the names
+in SUPERS."
+  (let ((stag nil))
+    (setq stag (semantic-find-first-tag-by-name name supers))
+
+    (when (not stag)
+      (dolist (S supers)
+	(let* ((sname (semantic-tag-name S))
+	       (splitparts (semantic-analyze-split-name sname))
+	       (parts (if (stringp splitparts)
+			  (list splitparts)
+			(nreverse splitparts))))
+	  (when (string= name (car parts))
+	    (setq stag S))
+	  )))
+
+    stag))
+
+(defun semantic-tag-type-superclass-protection (tag parentstring)
+  "Return the inheritance protection in TAG from PARENTSTRING.
+PARENTSTRING is the name of the parent being inherited.
+The return protection is a symbol, 'public, 'protection, and 'private."
+  (let ((supers (semantic-tag-get-attribute tag :superclasses)))
+    (cond ((stringp supers)
+	   'public)
+	  ((semantic-tag-p supers)
+	   (let ((prot (semantic-tag-get-attribute supers :protection)))
+	     (or (cdr (assoc prot '(("public" . public)
+				    ("protected" . protected)
+				    ("private" . private))))
+		 'public)))
+	  ((and (consp supers) (stringp (car supers)))
+	   'public)
+	  ((and (consp supers) (semantic-tag-p (car supers)))
+	   (let* ((stag (semantic--tag-find-parent-by-name parentstring supers))
+		  (prot (when stag
+			  (semantic-tag-get-attribute stag :protection))))
+	     (or (cdr (assoc prot '(("public" . public)
+				    ("protected" . protected)
+				    ("private" . private))))
+		 (when (equal prot "unspecified")
+		   (if (semantic-tag-of-type-p tag "class")
+		       'private
+		     'public))
+		 'public))))
+    ))
+
+(defsubst semantic-tag-type-interfaces (tag)
+  "Return the list of interfaces of the type that TAG describes."
+  ;; @todo - make this as robust as the above.
+  (semantic-tag-get-attribute tag :interfaces))
+
+;;; Tags of class `function'
+;;
+(defsubst semantic-tag-function-arguments (tag)
+  "Return the arguments of the function that TAG describes.
+That is the value of the `:arguments' attribute."
+  (semantic-tag-get-attribute tag :arguments))
+
+(defsubst semantic-tag-function-throws (tag)
+  "Return the exceptions the function that TAG describes can throw.
+That is the value of the `:throws' attribute."
+  (semantic-tag-get-attribute tag :throws))
+
+(defsubst semantic-tag-function-parent (tag)
+  "Return the parent of the function that TAG describes.
+That is the value of the `:parent' attribute.
+A function has a parent if it is a method of a class, and if the
+function does not appear in body of its parent class."
+  (semantic-tag-named-parent tag))
+
+(defsubst semantic-tag-function-destructor-p (tag)
+  "Return non-nil if TAG describes a destructor function.
+That is the value of the `:destructor-flag' attribute."
+  (semantic-tag-get-attribute tag :destructor-flag))
+
+(defsubst semantic-tag-function-constructor-p (tag)
+  "Return non-nil if TAG describes a constructor function.
+That is the value of the `:constructor-flag' attribute."
+  (semantic-tag-get-attribute tag :constructor-flag))
+
+;;; Tags of class `variable'
+;;
+(defsubst semantic-tag-variable-default (tag)
+  "Return the default value of the variable that TAG describes.
+That is the value of the attribute `:default-value'."
+  (semantic-tag-get-attribute tag :default-value))
+
+(defsubst semantic-tag-variable-constant-p (tag)
+  "Return non-nil if the variable that TAG describes is a constant.
+That is the value of the attribute `:constant-flag'."
+  (semantic-tag-get-attribute tag :constant-flag))
+
+;;; Tags of class `include'
+;;
+(defsubst semantic-tag-include-system-p (tag)
+  "Return non-nil if the include that TAG describes is a system include.
+That is the value of the attribute `:system-flag'."
+  (semantic-tag-get-attribute tag :system-flag))
+
+(define-overloadable-function semantic-tag-include-filename (tag)
+  "Return a filename representation of TAG.
+The default action is to return the `semantic-tag-name'.
+Some languages do not use full filenames in their include statements.
+Override this method to translate the code represenation
+into a filename.  (A relative filename if necessary.)
+
+See `semantic-dependency-tag-file' to expand an include
+tag to a full file name.")
+
+(defun semantic-tag-include-filename-default (tag)
+  "Return a filename representation of TAG.
+Returns `semantic-tag-name'."
+  (semantic-tag-name tag))
+
+;;; Tags of class `code'
+;;
+(defsubst semantic-tag-code-detail (tag)
+  "Return detail information from code that TAG describes.
+That is the value of the attribute `:detail'."
+  (semantic-tag-get-attribute tag :detail))
+
+;;; Tags of class `alias'
+;;
+(defsubst semantic-tag-new-alias (name meta-tag-class value &rest attributes)
+  "Create a semantic tag of class alias.
+NAME is a name for this alias.
+META-TAG-CLASS is the class of the tag this tag is an alias.
+VALUE is the aliased definition.
+ATTRIBUTES is a list of additional attributes belonging to this tag."
+  (apply 'semantic-tag name 'alias
+         :aliasclass meta-tag-class
+         :definition value
+         attributes))
+
+(defsubst semantic-tag-alias-class (tag)
+  "Return the class of tag TAG is an alias."
+  (semantic-tag-get-attribute tag :aliasclass))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-alias-definition (tag)
+  "Return the definition TAG is an alias.
+The returned value is a tag of the class that
+`semantic-tag-alias-class' returns for TAG.
+The default is to return the value of the :definition attribute.
+Return nil if TAG is not of class 'alias."
+  (when (semantic-tag-of-class-p tag 'alias)
+    (:override
+     (semantic-tag-get-attribute tag :definition))))
+
+;;; Language Specific Tag access via overload
+;;
+;;;###autoload
+(define-overloadable-function semantic-tag-components (tag)
+  "Return a list of components for TAG.
+A Component is a part of TAG which itself may be a TAG.
+Examples include the elements of a structure in a
+tag of class `type, or the list of arguments to a
+tag of class 'function."
+  )
+
+(defun semantic-tag-components-default (tag)
+  "Return a list of components for TAG.
+Perform the described task in `semantic-tag-components'."
+  (cond ((semantic-tag-of-class-p tag 'type)
+	 (semantic-tag-type-members tag))
+	((semantic-tag-of-class-p tag 'function)
+	 (semantic-tag-function-arguments tag))
+	(t nil)))
+
+;;;###autoload
+(define-overloadable-function semantic-tag-components-with-overlays (tag)
+  "Return the list of top level components belonging to TAG.
+Children are any sub-tags which contain overlays.
+
+Default behavior is to get `semantic-tag-components' in addition
+to the components of an anonymous types (if applicable.)
+
+Note for language authors:
+  If a mode defines a language tag that has tags in it with overlays
+you should still return them with this function.
+Ignoring this step will prevent several features from working correctly."
+  )
+
+(defun semantic-tag-components-with-overlays-default (tag)
+  "Return the list of top level components belonging to TAG.
+Children are any sub-tags which contain overlays.
+The default action collects regular components of TAG, in addition
+to any components beloning to an anonymous type."
+  (let ((explicit-children (semantic-tag-components tag))
+	(type (semantic-tag-type tag))
+	(anon-type-children nil)
+	(all-children nil))
+    ;; Identify if this tag has an anonymous structure as
+    ;; its type.  This implies it may have children with overlays.
+    (when (and type (semantic-tag-p type))
+      (setq anon-type-children (semantic-tag-components type))
+      ;; Add anonymous children
+      (while anon-type-children
+	(when (semantic-tag-with-position-p (car anon-type-children))
+	  (setq all-children (cons (car anon-type-children) all-children)))
+	(setq anon-type-children (cdr anon-type-children))))
+    ;; Add explicit children
+    (while explicit-children
+      (when (semantic-tag-with-position-p (car explicit-children))
+	(setq all-children (cons (car explicit-children) all-children)))
+      (setq explicit-children (cdr explicit-children)))
+    ;; Return
+    (nreverse all-children)))
+
+(defun semantic-tag-children-compatibility (tag &optional positiononly)
+  "Return children of TAG.
+If POSITIONONLY is nil, use `semantic-tag-components'.
+If POSITIONONLY is non-nil, use `semantic-tag-components-with-overlays'.
+DO NOT use this fcn in new code.  Use one of the above instead."
+  (if positiononly
+      (semantic-tag-components-with-overlays tag)
+    (semantic-tag-components tag)))
+
+;;; Tag Region
+;;
+;; A Tag represents a region in a buffer.  You can narrow to that tag.
+;;
+(defun semantic-narrow-to-tag (&optional tag)
+  "Narrow to the region specified by the bounds of TAG.
+See `semantic-tag-bounds'."
+  (interactive)
+  (if (not tag) (setq tag (semantic-current-tag)))
+  (narrow-to-region (semantic-tag-start tag)
+		    (semantic-tag-end tag)))
+
+(defmacro semantic-with-buffer-narrowed-to-current-tag (&rest body)
+  "Execute BODY with the buffer narrowed to the current tag."
+  `(save-restriction
+     (semantic-narrow-to-tag (semantic-current-tag))
+     ,@body))
+(put 'semantic-with-buffer-narrowed-to-current-tag 'lisp-indent-function 0)
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec semantic-with-buffer-narrowed-to-current-tag
+	      (def-body))))
+
+(defmacro semantic-with-buffer-narrowed-to-tag (tag &rest body)
+  "Narrow to TAG, and execute BODY."
+  `(save-restriction
+     (semantic-narrow-to-tag ,tag)
+     ,@body))
+(put 'semantic-with-buffer-narrowed-to-tag 'lisp-indent-function 1)
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec semantic-with-buffer-narrowed-to-tag
+	      (def-body))))
+
+;;; Tag Hooks
+;;
+;; Semantic may want to provide special hooks when specific operations
+;; are about to happen on a given tag.  These routines allow for hook
+;; maintenance on a tag.
+
+;; Internal global variable used to manage tag hooks.  For example,
+;; some implementation of `remove-hook' checks that the hook variable
+;; is `default-boundp'.
+(defvar semantic--tag-hook-value)
+
+(defun semantic-tag-add-hook (tag hook function &optional append)
+  "Onto TAG, add to the value of HOOK the function FUNCTION.
+FUNCTION is added (if necessary) at the beginning of the hook list
+unless the optional argument APPEND is non-nil, in which case
+FUNCTION is added at the end.
+HOOK should be a symbol, and FUNCTION may be any valid function.
+See also the function `add-hook'."
+  (let ((semantic--tag-hook-value (semantic--tag-get-property tag hook)))
+    (add-hook 'semantic--tag-hook-value function append)
+    (semantic--tag-put-property tag hook semantic--tag-hook-value)
+    semantic--tag-hook-value))
+
+(defun semantic-tag-remove-hook (tag hook function)
+  "Onto TAG, remove from the value of HOOK the function FUNCTION.
+HOOK should be a symbol, and FUNCTION may be any valid function.  If
+FUNCTION isn't the value of HOOK, or, if FUNCTION doesn't appear in
+the list of hooks to run in HOOK, then nothing is done.
+See also the function `remove-hook'."
+  (let ((semantic--tag-hook-value (semantic--tag-get-property tag hook)))
+    (remove-hook 'semantic--tag-hook-value function)
+    (semantic--tag-put-property tag hook semantic--tag-hook-value)
+    semantic--tag-hook-value))
+
+(defun semantic--tag-run-hooks (tag hook &rest args)
+  "Run for TAG all expressions saved on the property HOOK.
+Each hook expression must take at least one argument, the TAG.
+For any given situation, additional ARGS may be passed."
+  (let ((semantic--tag-hook-value (semantic--tag-get-property tag hook))
+	(arglist (cons tag args)))
+    (condition-case err
+	;; If a hook bombs, ignore it!  Usually this is tied into
+	;; some sort of critical system.
+	(apply 'run-hook-with-args 'semantic--tag-hook-value arglist)
+      (error (message "Error: %S" err)))))
+
+;;; Tags and Overlays
+;;
+;; Overlays are used so that we can quickly identify tags from
+;; buffer positions and regions using built in Emacs commands.
+;;
+(defsubst semantic--tag-unlink-list-from-buffer (tags)
+  "Convert TAGS from using an overlay to using an overlay proxy.
+This function is for internal use only."
+  (mapcar 'semantic--tag-unlink-from-buffer tags))
+
+(defun semantic--tag-unlink-from-buffer (tag)
+  "Convert TAG from using an overlay to using an overlay proxy.
+This function is for internal use only."
+  (when (semantic-tag-p tag)
+    (let ((o (semantic-tag-overlay tag)))
+      (when (semantic-overlay-p o)
+        (semantic--tag-set-overlay
+         tag (vector (semantic-overlay-start o)
+                     (semantic-overlay-end o)))
+        (semantic-overlay-delete o))
+      ;; Look for a link hook on TAG.
+      (semantic--tag-run-hooks tag 'unlink-hook)
+      ;; Fix the sub-tags which contain overlays.
+      (semantic--tag-unlink-list-from-buffer
+       (semantic-tag-components-with-overlays tag)))))
+
+(defsubst semantic--tag-link-list-to-buffer (tags)
+  "Convert TAGS from using an overlay proxy to using an overlay.
+This function is for internal use only."
+  (mapcar 'semantic--tag-link-to-buffer tags))
+
+(defun semantic--tag-link-to-buffer (tag)
+  "Convert TAG from using an overlay proxy to using an overlay.
+This function is for internal use only."
+  (when (semantic-tag-p tag)
+    (let ((o (semantic-tag-overlay tag)))
+      (when (and (vectorp o) (= (length o) 2))
+        (setq o (semantic-make-overlay (aref o 0) (aref o 1)
+                                       (current-buffer)))
+        (semantic--tag-set-overlay tag o)
+        (semantic-overlay-put o 'semantic tag)
+        ;; Clear the :filename property
+        (semantic--tag-put-property tag :filename nil))
+      ;; Look for a link hook on TAG.
+      (semantic--tag-run-hooks tag 'link-hook)
+      ;; Fix the sub-tags which contain overlays.
+      (semantic--tag-link-list-to-buffer
+       (semantic-tag-components-with-overlays tag)))))
+
+(defun semantic--tag-unlink-cache-from-buffer ()
+  "Convert all tags in the current cache to use overlay proxys.
+This function is for internal use only."
+  (semantic--tag-unlink-list-from-buffer
+   ;; @todo- use fetch-tags-fast?
+   (semantic-fetch-tags)))
+
+(defun semantic--tag-link-cache-to-buffer ()
+  "Convert all tags in the current cache to use overlays.
+This function is for internal use only."
+  (condition-case nil
+      ;; In this unique case, we cannot call the usual toplevel fn.
+      ;; because we don't want a reparse, we want the old overlays.
+      (semantic--tag-link-list-to-buffer
+       semantic--buffer-cache)
+    ;; Recover when there is an error restoring the cache.
+    (error (message "Error recovering tag list")
+           (semantic-clear-toplevel-cache)
+           nil)))
+
+;;; Tag Cooking
+;;
+;; Raw tags from a parser follow a different positional format than
+;; those used in the buffer cache.  Raw tags need to be cooked into
+;; semantic cache friendly tags for use by the masses.
+;;
+(defsubst semantic--tag-expanded-p (tag)
+  "Return non-nil if TAG is expanded.
+This function is for internal use only.
+See also the function `semantic--expand-tag'."
+  ;; In fact a cooked tag is actually a list of cooked tags
+  ;; because a raw tag can be expanded in several cooked ones!
+  (when (consp tag)
+    (while (and (semantic-tag-p (car tag))
+                (vectorp (semantic-tag-overlay (car tag))))
+      (setq tag (cdr tag)))
+    (null tag)))
+
+(defvar semantic-tag-expand-function nil
+  "Function used to expand a tag.
+It is passed each tag production, and must return a list of tags
+derived from it, or nil if it does not need to be expanded.
+
+Languages with compound definitions should use this function to expand
+from one compound symbol into several.  For example, in C or Java the
+following definition is easily parsed into one tag:
+
+  int a, b;
+
+This function should take this compound tag and turn it into two tags,
+one for A, and the other for B.")
+(make-variable-buffer-local 'semantic-tag-expand-function)
+
+(defun semantic--tag-expand (tag)
+  "Convert TAG from a raw state to a cooked state, and expand it.
+Returns a list of cooked tags.
+
+  The parser returns raw tags with positional data START END at the
+end of the tag data structure (a list for now).  We convert it from
+that to a cooked state that uses an overlay proxy, that is, a vector
+\[START END].
+
+  The raw tag is changed with side effects and maybe expanded in
+several derived tags when the variable `semantic-tag-expand-function'
+is set.
+
+This function is for internal use only."
+  (if (semantic--tag-expanded-p tag)
+      ;; Just return TAG if it is already expanded (by a grammar
+      ;; semantic action), or if it isn't recognized as a valid
+      ;; semantic tag.
+      tag
+
+    ;; Try to cook the tag.  This code will be removed when tag will
+    ;; be directly created with the right format.
+    (condition-case nil
+        (let ((ocdr (semantic--tag-overlay-cdr tag)))
+          ;; OCDR contains the sub-list of TAG whose car is the
+          ;; OVERLAY part of TAG. That is, a list (OVERLAY START END).
+          ;; Convert it into an overlay proxy ([START END]).
+          (semantic--tag-set-overlay
+           tag (vector (nth 1 ocdr) (nth 2 ocdr)))
+          ;; Remove START END positions at end of tag.
+          (setcdr ocdr nil)
+          ;; At this point (length TAG) must be 5!
+          ;;(unless (= (length tag) 5)
+          ;;  (error "Tag expansion failed"))
+          )
+      (error
+       (message "A Rule must return a single tag-line list!")
+       (debug tag)
+       nil))
+
+;;    @todo - I think we've waited long enough.  Lets find out.
+;;
+;;    ;; Compatibility code to be removed in future versions.
+;;    (unless semantic-tag-expand-function
+;;      ;; This line throws a byte compiler warning.
+;;      (setq semantic-tag-expand-function semantic-expand-nonterminal)
+;;      )
+
+    ;; Expand based on local configuration
+    (if semantic-tag-expand-function
+        (or (funcall semantic-tag-expand-function tag)
+            (list tag))
+      (list tag))))
+
+;; Foreign tags
+;;
+(defmacro semantic-foreign-tag-invalid (tag)
+  "Signal that TAG is an invalid foreign tag."
+  `(signal 'wrong-type-argument '(semantic-foreign-tag-p ,tag)))
+
+(defsubst semantic-foreign-tag-p (tag)
+  "Return non-nil if TAG is a foreign tag.
+That is, a tag unlinked from the originating buffer, which carries the
+originating buffer file name, and major mode."
+  (and (semantic-tag-p tag)
+       (semantic--tag-get-property tag :foreign-flag)))
+
+(defsubst semantic-foreign-tag-check (tag)
+  "Check that TAG is a valid foreign tag.
+Signal an error if not."
+  (or (semantic-foreign-tag-p tag)
+      (semantic-foreign-tag-invalid tag)))
+
+(defun semantic-foreign-tag (&optional tag)
+  "Return a copy of TAG as a foreign tag, or nil if it can't be done.
+TAG defaults to the tag at point in current buffer.
+See also `semantic-foreign-tag-p'."
+  (or tag (setq tag (semantic-current-tag)))
+  (when (semantic-tag-p tag)
+    (let ((ftag (semantic-tag-copy tag nil t))
+	  ;; Do extra work for the doc strings, since this is a
+	  ;; common use case.
+	  (doc (condition-case nil
+		   (semantic-documentation-for-tag tag)
+		 (error nil))))
+      ;; A foreign tag must carry its originating buffer file name!
+      (when (semantic--tag-get-property ftag :filename)
+        (semantic--tag-put-property ftag :mode (semantic-tag-mode tag))
+	(semantic--tag-put-property ftag :documentation doc)
+        (semantic--tag-put-property ftag :foreign-flag t)
+        ftag))))
+
+;; High level obtain/insert foreign tag overloads
+;;
+;;;###autoload
+(define-overloadable-function semantic-obtain-foreign-tag (&optional tag)
+  "Obtain a foreign tag from TAG.
+TAG defaults to the tag at point in current buffer.
+Return the obtained foreign tag or nil if failed."
+  (semantic-foreign-tag tag))
+
+(defun semantic-insert-foreign-tag-default (foreign-tag)
+  "Insert FOREIGN-TAG into the current buffer.
+The default behavior assumes the current buffer is a language file,
+and attempts to insert a prototype/function call."
+  ;; Long term goal: Have a mechanism for a tempo-like template insert
+  ;; for the given tag.
+  (insert (semantic-format-tag-prototype foreign-tag)))
+
+;;;###autoload
+(define-overloadable-function semantic-insert-foreign-tag (foreign-tag)
+  "Insert FOREIGN-TAG into the current buffer.
+Signal an error if FOREIGN-TAG is not a valid foreign tag.
+This function is overridable with the symbol `insert-foreign-tag'."
+  (semantic-foreign-tag-check foreign-tag)
+  (:override)
+  (message (semantic-format-tag-summarize foreign-tag)))
+
+;;; Support log modes here
+(define-mode-local-override semantic-insert-foreign-tag
+  log-edit-mode (foreign-tag)
+  "Insert foreign tags into log-edit mode."
+  (insert (concat "(" (semantic-format-tag-name foreign-tag) "): ")))
+
+(define-mode-local-override semantic-insert-foreign-tag
+  change-log-mode (foreign-tag)
+  "Insert foreign tags into log-edit mode."
+  (insert (concat "(" (semantic-format-tag-name foreign-tag) "): ")))
+
+
+;;; EDEBUG display support
+;;
+(eval-after-load "cedet-edebug"
+  '(progn
+     (cedet-edebug-add-print-override
+      '(semantic-tag-p object)
+      '(concat "#<TAG " (semantic-format-tag-name object) ">"))
+     (cedet-edebug-add-print-override
+      '(and (listp object) (semantic-tag-p (car object)))
+      '(cedet-edebug-prin1-recurse object))
+     ))
+
+;;; Compatibility
+;;
+(defconst semantic-token-version
+  semantic-tag-version)
+(defconst semantic-token-incompatible-version
+  semantic-tag-incompatible-version)
+
+(semantic-alias-obsolete 'semantic-token-name
+                         'semantic-tag-name)
+
+(semantic-alias-obsolete 'semantic-token-token
+                         'semantic-tag-class)
+
+(semantic-alias-obsolete 'semantic-token-extra-specs
+                         'semantic-tag-attributes)
+
+(semantic-alias-obsolete 'semantic-token-properties
+                         'semantic-tag-properties)
+
+(semantic-alias-obsolete 'semantic-token-properties-cdr
+                         'semantic--tag-properties-cdr)
+
+(semantic-alias-obsolete 'semantic-token-overlay
+                         'semantic-tag-overlay)
+
+(semantic-alias-obsolete 'semantic-token-overlay-cdr
+                         'semantic--tag-overlay-cdr)
+
+(semantic-alias-obsolete 'semantic-token-start
+                         'semantic-tag-start)
+
+(semantic-alias-obsolete 'semantic-token-end
+                         'semantic-tag-end)
+
+(semantic-alias-obsolete 'semantic-token-extent
+                         'semantic-tag-bounds)
+
+(semantic-alias-obsolete 'semantic-token-buffer
+                         'semantic-tag-buffer)
+
+(semantic-alias-obsolete 'semantic-token-put
+                         'semantic--tag-put-property)
+
+(semantic-alias-obsolete 'semantic-token-put-no-side-effect
+                         'semantic--tag-put-property-no-side-effect)
+
+(semantic-alias-obsolete 'semantic-token-get
+                         'semantic--tag-get-property)
+
+(semantic-alias-obsolete 'semantic-token-add-extra-spec
+                         'semantic-tag-put-attribute)
+
+(semantic-alias-obsolete 'semantic-token-extra-spec
+                         'semantic-tag-get-attribute)
+
+(semantic-alias-obsolete 'semantic-token-type
+                         'semantic-tag-type)
+
+(semantic-alias-obsolete 'semantic-token-modifiers
+                         'semantic-tag-modifiers)
+
+(semantic-alias-obsolete 'semantic-token-docstring
+                         'semantic-tag-docstring)
+
+(semantic-alias-obsolete 'semantic-token-type-parts
+                         'semantic-tag-type-members)
+
+(defsubst semantic-token-type-parent (tag)
+  "Return the parent of the type that TAG describes.
+The return value is a list.  A value of nil means no parents.
+The `car' of the list is either the parent class, or a list
+of parent classes.  The `cdr' of the list is the list of
+interfaces, or abstract classes which are parents of TAG."
+  (cons (semantic-tag-get-attribute tag :superclasses)
+        (semantic-tag-type-interfaces tag)))
+(make-obsolete 'semantic-token-type-parent
+	       "\
+use `semantic-tag-type-superclass' \
+and `semantic-tag-type-interfaces' instead")
+
+(semantic-alias-obsolete 'semantic-token-type-parent-superclass
+                         'semantic-tag-type-superclasses)
+
+(semantic-alias-obsolete 'semantic-token-type-parent-implement
+                         'semantic-tag-type-interfaces)
+
+(semantic-alias-obsolete 'semantic-token-type-extra-specs
+                         'semantic-tag-attributes)
+
+(semantic-alias-obsolete 'semantic-token-type-extra-spec
+                         'semantic-tag-get-attribute)
+
+(semantic-alias-obsolete 'semantic-token-type-modifiers
+                         'semantic-tag-modifiers)
+
+(semantic-alias-obsolete 'semantic-token-function-args
+                         'semantic-tag-function-arguments)
+
+(semantic-alias-obsolete 'semantic-token-function-extra-specs
+                         'semantic-tag-attributes)
+
+(semantic-alias-obsolete 'semantic-token-function-extra-spec
+                         'semantic-tag-get-attribute)
+
+(semantic-alias-obsolete 'semantic-token-function-modifiers
+                         'semantic-tag-modifiers)
+
+(semantic-alias-obsolete 'semantic-token-function-throws
+                         'semantic-tag-function-throws)
+
+(semantic-alias-obsolete 'semantic-token-function-parent
+                         'semantic-tag-function-parent)
+
+(semantic-alias-obsolete 'semantic-token-function-destructor
+                         'semantic-tag-function-destructor-p)
+
+(semantic-alias-obsolete 'semantic-token-variable-default
+			 'semantic-tag-variable-default)
+
+(semantic-alias-obsolete 'semantic-token-variable-extra-specs
+                         'semantic-tag-attributes)
+
+(semantic-alias-obsolete 'semantic-token-variable-extra-spec
+                         'semantic-tag-get-attribute)
+
+(semantic-alias-obsolete 'semantic-token-variable-modifiers
+                         'semantic-tag-modifiers)
+
+(semantic-alias-obsolete 'semantic-token-variable-const
+                         'semantic-tag-variable-constant-p)
+
+(semantic-alias-obsolete 'semantic-token-variable-optsuffix
+                         'semantic-tag-variable-optsuffix)
+
+(semantic-alias-obsolete 'semantic-token-include-system
+                         'semantic-tag-include-system-p)
+
+(semantic-alias-obsolete 'semantic-token-p
+                         'semantic-tag-p)
+
+(semantic-alias-obsolete 'semantic-token-with-position-p
+                         'semantic-tag-with-position-p)
+
+(semantic-alias-obsolete 'semantic-tag-make-assoc-list
+                         'semantic-tag-make-plist)
+
+(semantic-alias-obsolete 'semantic-nonterminal-children
+			 'semantic-tag-children-compatibility)
+
+(semantic-alias-obsolete 'semantic-narrow-to-token
+			 'semantic-narrow-to-tag)
+
+(semantic-alias-obsolete 'semantic-with-buffer-narrowed-to-current-token
+			 'semantic-with-buffer-narrowed-to-current-tag)
+
+(semantic-alias-obsolete 'semantic-with-buffer-narrowed-to-token
+			 'semantic-with-buffer-narrowed-to-tag)
+
+(semantic-alias-obsolete 'semantic-deoverlay-token
+                         'semantic--tag-unlink-from-buffer)
+
+(semantic-alias-obsolete 'semantic-overlay-token
+                         'semantic--tag-link-to-buffer)
+
+(semantic-alias-obsolete 'semantic-deoverlay-list
+                         'semantic--tag-unlink-list-from-buffer)
+
+(semantic-alias-obsolete 'semantic-overlay-list
+                         'semantic--tag-link-list-to-buffer)
+
+(semantic-alias-obsolete 'semantic-deoverlay-cache
+                         'semantic--tag-unlink-cache-from-buffer)
+
+(semantic-alias-obsolete 'semantic-overlay-cache
+                         'semantic--tag-link-cache-to-buffer)
+
+(semantic-alias-obsolete 'semantic-cooked-token-p
+                         'semantic--tag-expanded-p)
+
+(semantic-varalias-obsolete 'semantic-expand-nonterminal
+                            'semantic-tag-expand-function)
+
+(semantic-alias-obsolete 'semantic-raw-to-cooked-token
+                         'semantic--tag-expand)
+
+;; Lets test this out during this short transition.
+(semantic-alias-obsolete 'semantic-clone-tag
+                         'semantic-tag-clone)
+
+(semantic-alias-obsolete 'semantic-token
+                         'semantic-tag)
+
+(semantic-alias-obsolete 'semantic-token-new-variable
+                         'semantic-tag-new-variable)
+
+(semantic-alias-obsolete 'semantic-token-new-function
+                         'semantic-tag-new-function)
+
+(semantic-alias-obsolete 'semantic-token-new-type
+                         'semantic-tag-new-type)
+
+(semantic-alias-obsolete 'semantic-token-new-include
+                         'semantic-tag-new-include)
+
+(semantic-alias-obsolete 'semantic-token-new-package
+                         'semantic-tag-new-package)
+
+(semantic-alias-obsolete 'semantic-equivalent-tokens-p
+                         'semantic-equivalent-tag-p)
+
+(provide 'semantic-tag)
+
+;;; semantic-tag.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-texi.el b/site/cedet-1.0pre7/semantic/semantic-texi.el
new file mode 100644
index 0000000..aab636f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-texi.el
@@ -0,0 +1,687 @@
+;;; semantic-texi.el --- Semantic details for Texinfo files
+
+;;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-texi.el,v 1.45.2.1 2010/02/22 02:56:34 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parse Texinfo buffers using regular expressions.  The core parser
+;; engine is the function `semantic-texi-parse-headings'.  The
+;; parser plug-in is the function `semantic-texi-parse-region' that
+;; overrides `semantic-parse-region'.
+
+(require 'semantic)
+(require 'semantic-format)
+(require 'texinfo)
+
+(eval-when-compile
+  (require 'semanticdb)
+  (require 'semanticdb-find)
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'semantic-doc)
+  (require 'senator))
+
+(defvar semantic-texi-super-regex
+  "^@\\(top\\|chapter\\|\\(sub\\)*section\\|unnumbered\\(\\(sub\\)*sec\\)?\\|\
+\\(chap\\|\\(sub\\)+\\|major\\)?heading\\|appendix\\(\\(sub\\)*sec\\)?\\|\
+centerchap\\|def\\(var\\|un\\|fn\\|opt\\)x?\\)"
+  "Regular expression used to find special sections in a Texinfo file.")
+
+(defvar semantic-texi-name-field-list
+  '( ("defvar" . 1)
+     ("defvarx" . 1)
+     ("defun" . 1)
+     ("defunx" . 1)
+     ("defopt" . 1)
+     ("deffn" . 2)
+     ("deffnx" . 2)
+     )
+  "List of definition commands, and the field position.
+The field position is the field number (based at 1) where the
+name of this section is.")
+
+;;; Code:
+(defun semantic-texi-parse-region (&rest ignore)
+  "Parse the current texinfo buffer for semantic tags.
+IGNORE any arguments, always parse the whole buffer.
+Each tag returned is of the form:
+ (\"NAME\" section (:members CHILDREN))
+or
+ (\"NAME\" def)
+
+It is an override of 'parse-region and must be installed by the
+function `semantic-install-function-overrides'."
+  (mapcar 'semantic-texi-expand-tag
+          (semantic-texi-parse-headings)))
+
+(defun semantic-texi-parse-changes ()
+  "Parse changes in the current texinfo buffer."
+  ;; NOTE: For now, just schedule a full reparse.
+  ;;       To be implemented later.
+  (semantic-parse-tree-set-needs-rebuild))
+
+(defun semantic-texi-expand-tag (tag)
+  "Expand the texinfo tag TAG."
+  (let ((chil (semantic-tag-components tag)))
+    (if chil
+        (semantic-tag-put-attribute
+         tag :members (mapcar 'semantic-texi-expand-tag chil)))
+    (car (semantic--tag-expand tag))))
+
+(defun semantic-texi-parse-headings ()
+  "Parse the current texinfo buffer for all semantic tags now."
+  (let ((pass1 nil))
+    ;; First search and snarf.
+    (save-excursion
+      (goto-char (point-min))
+      (working-status-forms (file-name-nondirectory buffer-file-name) "done"
+	(while (re-search-forward semantic-texi-super-regex nil t)
+	  (setq pass1 (cons (match-beginning 0) pass1))
+	  (working-status)
+	  )
+	(working-status t)))
+    (setq pass1 (nreverse pass1))
+    ;; Now, make some tags while creating a set of children.
+    (car (semantic-texi-recursive-combobulate-list pass1 0))
+    ))
+
+(defsubst semantic-texi-new-section-tag (name members start end)
+  "Create a semantic tag of class section.
+NAME is the name of this section.
+MEMBERS is a list of semantic tags representing the elements that make
+up this section.
+START and END define the location of data described by the tag."
+  (append (semantic-tag name 'section :members members)
+          (list start end)))
+
+(defsubst semantic-texi-new-def-tag (name start end)
+  "Create a semantic tag of class def.
+NAME is the name of this definition.
+START and END define the location of data described by the tag."
+  (append (semantic-tag name 'def)
+          (list start end)))
+
+(defun semantic-texi-set-endpoint (metataglist pnt)
+  "Set the end point of the first section tag in METATAGLIST to PNT.
+METATAGLIST is a list of tags in the intermediate tag format used by the
+texinfo parser.  PNT is the new point to set."
+  (let ((metatag nil))
+    (while (and metataglist
+		(not (eq (semantic-tag-class (car metataglist)) 'section)))
+      (setq metataglist (cdr metataglist)))
+    (setq metatag (car metataglist))
+    (when metatag
+      (setcar (nthcdr (1- (length metatag)) metatag) pnt)
+      metatag)))
+
+(defun semantic-texi-recursive-combobulate-list (sectionlist level)
+  "Rearrange SECTIONLIST to be a hierarchical tag list starting at LEVEL.
+Return the rearranged new list, with all remaining tags from
+SECTIONLIST starting at ELT 2.  Sections not are not dealt with as soon as a
+tag with greater section value than LEVEL is found."
+  (let ((newl nil)
+	(oldl sectionlist)
+        tag
+	)
+    (save-excursion
+      (catch 'level-jump
+	(while oldl
+	  (goto-char (car oldl))
+	  (if (looking-at "@\\(\\w+\\)")
+	      (let* ((word (match-string 1))
+		     (levelmatch (assoc word texinfo-section-list))
+		     text begin tmp
+		     )
+		;; Set begin to the right location
+		(setq begin (point))
+		;; Get out of here if there if we made it that far.
+		(if (and levelmatch (<= (car (cdr levelmatch)) level))
+		    (progn
+		      (when newl
+			(semantic-texi-set-endpoint newl begin))
+		      (throw 'level-jump t)))
+		;; Recombobulate
+		(if levelmatch
+		    (let ((end (match-end 1)))
+		      ;; Levels sometimes have a @node just in front.
+		      ;; That node statement should be included in the space
+		      ;; for this entry.
+		      (save-excursion
+			(skip-chars-backward "\n \t")
+			(beginning-of-line)
+			(when (looking-at "@node\\>")
+			  (setq begin (point))))
+		      ;; When there is a match, the descriptive text
+		      ;; consists of the rest of the line.
+		      (goto-char end)
+		      (skip-chars-forward " \t")
+		      (setq text (buffer-substring-no-properties
+				  (point)
+				  (progn (end-of-line) (point))))
+		      ;; Next, recurse into the body to find the end.
+		      (setq tmp (semantic-texi-recursive-combobulate-list
+				 (cdr oldl) (car (cdr levelmatch))))
+		      ;; Build a tag
+                      (setq tag (semantic-texi-new-section-tag
+                                 text (car tmp) begin (point)))
+		      ;; Before appending the newtag, update the previous tag
+		      ;; if it is a section tag.
+		      (when newl
+			(semantic-texi-set-endpoint newl begin))
+		      ;; Append new tag to our master list.
+		      (setq newl (cons tag newl))
+		      ;; continue
+		      (setq oldl (cdr tmp))
+		      )
+		  ;; No match means we have a def*, so get the name from
+		  ;; it based on the type of thingy we found.
+		  (setq levelmatch (assoc word semantic-texi-name-field-list)
+			tmp (or (cdr levelmatch) 1))
+		  (forward-sexp tmp)
+		  (skip-chars-forward " \t")
+		  (setq text (buffer-substring-no-properties
+			      (point)
+			      (progn (forward-sexp 1) (point))))
+		  ;; Seek the end of this definition
+		  (goto-char begin)
+		  (semantic-texi-forward-deffn)
+                  (setq tag (semantic-texi-new-def-tag text begin (point))
+                        newl (cons tag newl))
+		  ;; continue
+		  (setq oldl (cdr oldl)))
+		)
+	    (error "Problem finding section in semantic/texi parser"))
+	  ;; (setq oldl (cdr oldl))
+	  )
+	;; When oldl runs out, force a new endpoint as point-max
+	(when (not oldl)
+	  (semantic-texi-set-endpoint newl (point-max)))
+	))
+    (cons (nreverse newl) oldl)))
+
+(defun semantic-texi-forward-deffn ()
+  "Move forward over one deffn type definition.
+The cursor should be on the @ sign."
+  (when (looking-at "@\\(\\w+\\)")
+    (let* ((type (match-string 1))
+	   (seek (concat "^@end\\s-+" (regexp-quote type))))
+      (re-search-forward seek nil t))))
+
+(define-mode-local-override semantic-tag-components
+  texinfo-mode (tag)
+  "Return components belonging to TAG."
+  (semantic-tag-get-attribute tag :members))
+
+
+;;; Overrides: Context Parsing
+;;
+;; How to treat texi as a language?
+;;
+(defvar semantic-texi-environment-regexp
+  (if (string-match texinfo-environment-regexp "@menu")
+      ;; Make sure our Emacs has menus in it.
+      texinfo-environment-regexp
+    ;; If no menus, then merge in the menu concept.
+    (when (string-match "cartouche" texinfo-environment-regexp)
+      (concat (substring texinfo-environment-regexp
+			 0 (match-beginning 0))
+	      "menu\\|"
+	       (substring texinfo-environment-regexp
+			 (match-beginning 0)))))
+  "Regular expression for matching texinfo enviroments.
+uses `texinfo-environment-regexp', but makes sure that it
+can handle the @menu environment.")
+
+(define-mode-local-override semantic-up-context texinfo-mode ()
+  "Handle texinfo constructs which do not use parenthetical nesting."
+  (let ((done nil))
+    (save-excursion
+      (let ((parenthetical (semantic-up-context-default))
+	    )
+	(when (not parenthetical)
+	  ;; We are in parenthises.  Are they the types of parens
+	  ;; belonging to a texinfo construct?
+	  (forward-word -1)
+	  (when (looking-at "@\\w+{")
+	    (setq done (point))))))
+    ;; If we are not in a parenthetical node, then find a block instead.
+    ;; Use the texinfo support to find block start/end constructs.
+    (save-excursion
+      (while (and (not done)
+		  (re-search-backward  semantic-texi-environment-regexp nil t))
+	;; For any hit, if we find an @end foo, then jump to the
+	;; matching @foo.  If it is not an end, then we win!
+	(if (not (looking-at "@end\\s-+\\(\\w+\\)"))
+	    (setq done (point))
+	  ;; Skip over this block
+	  (let ((env (match-string 1)))
+	    (re-search-backward (concat "@" env))))
+	))
+    ;; All over, post what we find.
+    (if done
+	;; We found something, so use it.
+	(progn (goto-char done)
+	       nil)
+      t)))
+
+(define-mode-local-override semantic-beginning-of-context texinfo-mode (&optional point)
+  "Move to the beginning of the context surrounding POINT."
+  (if (semantic-up-context point)
+      ;; If we can't go up, we can't do this either.
+      t
+    ;; We moved, so now we need to skip into whatever this thing is.
+    (forward-word 1) ;; skip the command
+    (if (looking-at "\\s-*{")
+	;; In a short command.  Go in.
+	(down-list 1)
+      ;; An environment.  Go to the next line.
+      (end-of-line)
+      (forward-char 1))
+    nil))
+
+(define-mode-local-override semantic-ctxt-current-class-list
+  texinfo-mode (&optional point)
+  "Determine the class of tags that can be used at POINT.
+For texinfo, there two possibilities returned.
+1) 'function - for a call to a texinfo function
+2) 'word     - indicates an english word.
+It would be nice to know function arguments too, but not today."
+  (let ((sym (semantic-ctxt-current-symbol)))
+    (if (and sym (= (aref (car sym) 0) ?@))
+	'(function)
+      '(word))))
+
+
+;;; Overrides : Formatting
+;;
+;; Various override to better format texi tags.
+;;
+
+(define-mode-local-override semantic-format-tag-abbreviate
+  texinfo-mode  (tag &optional parent color)
+  "Texinfo tags abbreviation."
+  (let ((class (semantic-tag-class tag))
+	(name (semantic-format-tag-name tag parent color))
+	)
+    (cond ((eq class 'function)
+	   (concat name "{ }"))
+	  (t (semantic-format-tag-abbreviate-default tag parent color)))
+    ))
+
+(define-mode-local-override semantic-format-tag-prototype
+  texinfo-mode  (tag &optional parent color)
+  "Texinfo tags abbreviation."
+  (semantic-format-tag-abbreviate tag parent color))
+
+
+;;; Texi Unique Features
+;;
+(defun semantic-tag-texi-section-text-bounds (tag)
+  "Get the bounds to the text of TAG.
+The text bounds is the text belonging to this node excluding
+the text of any child nodes, but including any defuns."
+  (let ((memb (semantic-tag-components tag)))
+    ;; Members.. if one is a section, check it out.
+    (while (and memb (not (semantic-tag-of-class-p (car memb) 'section)))
+      (setq memb (cdr memb)))
+    ;; No members? ... then a simple problem!
+    (if (not memb)
+	(semantic-tag-bounds tag)
+      ;; Our end is their beginning...
+      (list (semantic-tag-start tag) (semantic-tag-start (car memb))))))
+
+(defun semantic-texi-current-environment (&optional point)
+  "Return as a string the type of the current environment.
+Optional argument POINT is where to look for the environment."
+  (save-excursion
+    (when point (goto-char (point)))
+    (while (and (or (not (looking-at  semantic-texi-environment-regexp))
+		    (looking-at "@end"))
+		(not (semantic-up-context)))
+      )
+    (when (looking-at  semantic-texi-environment-regexp)
+      (match-string 1))))
+
+
+;;; Analyzer
+;;
+(eval-when-compile
+  (require 'semantic-analyze))
+
+(define-mode-local-override semantic-analyze-current-context
+  texinfo-mode (point)
+  "Analysis context makes no sense for texinfo.  Return nil."
+  (let* ((prefixandbounds (semantic-ctxt-current-symbol-and-bounds (point)))
+	 (prefix (car prefixandbounds))
+	 (bounds (nth 2 prefixandbounds))
+	 (prefixclass (semantic-ctxt-current-class-list))
+	 )
+    (when prefix
+      (require 'semantic-analyze)
+      (semantic-analyze-context
+       "Context-for-texinfo"
+       :buffer (current-buffer)
+       :scope nil
+       :bounds bounds
+       :prefix prefix
+       :prefixtypes nil
+       :prefixclass prefixclass)
+      )
+    ))
+
+(defvar semantic-texi-command-completion-list
+  (append (mapcar (lambda (a) (car a)) texinfo-section-list)
+	  (condition-case nil
+	      texinfo-environments
+	    (error
+	     ;; XEmacs doesn't use the above.  Split up its regexp
+	     (split-string texinfo-environment-regexp "\\\\|\\|\\^@\\\\(\\|\\\\)")
+	     ))
+	  ;; Is there a better list somewhere?  Here are few
+	  ;; of the top of my head.
+	  "anchor" "asis"
+	  "bullet"
+	  "code" "copyright"
+	  "defun" "deffn" "defoption" "defvar" "dfn"
+	  "emph" "end"
+	  "ifinfo" "iftex" "inforef" "item" "itemx"
+	  "kdb"
+	  "node"
+	  "ref"
+	  "set" "setfilename" "settitle"
+	  "value" "var"
+	  "xref"
+	  )
+  "List of commands that we might bother completing.")
+
+(define-mode-local-override semantic-analyze-possible-completions
+  texinfo-mode (context)
+  "List smart completions at point.
+Since texinfo is not a programming language the default version is not
+useful.  Insted, look at the current symbol.  If it is a command
+do primitive texinfo built ins.  If not, use ispell to lookup words
+that start with that symbol."
+  (let ((prefix (car (oref context :prefix)))
+	)
+    (cond ((member 'function (oref context :prefixclass))
+	   ;; Do completion for texinfo commands
+	   (let* ((cmd (substring prefix 1))
+		  (lst (all-completions
+			cmd semantic-texi-command-completion-list)))
+	     (mapcar (lambda (f) (semantic-tag (concat "@" f) 'function))
+		     lst))
+	   )
+	  ((member 'word (oref context :prefixclass))
+	   ;; Do completion for words via ispell.
+	   (require 'ispell)
+	   (let ((word-list (lookup-words prefix)))
+	     (mapcar (lambda (f) (semantic-tag f 'word)) word-list))
+	   )
+	  (t nil))
+    ))
+
+
+;;; Parser Setup
+;;
+;;;###autoload
+(defun semantic-default-texi-setup ()
+  "Set up a buffer for parsing of Texinfo files."
+  ;; This will use our parser.
+  (semantic-install-function-overrides
+   '((parse-region . semantic-texi-parse-region)
+     (parse-changes . semantic-texi-parse-changes)))
+  (setq semantic-parser-name "TEXI"
+        ;; Setup a dummy parser table to enable parsing!
+        semantic--parse-table t
+        imenu-create-index-function 'semantic-create-imenu-index
+	semantic-command-separation-character "@"
+	semantic-type-relation-separator-character '(":")
+	semantic-symbol->name-assoc-list '((section . "Section")
+					   (def . "Definition")
+					   )
+	semantic-imenu-expandable-tag-classes '(section)
+	semantic-imenu-bucketize-file nil
+	semantic-imenu-bucketize-type-members nil
+	senator-step-at-start-end-tag-classes '(section)
+	senator-step-at-tag-classes '(section)
+	semantic-stickyfunc-sticky-classes '(section)
+	)
+  (local-set-key [(f9)] 'semantic-texi-update-doc-from-texi)
+  )
+
+;;;###autoload
+(add-hook 'texinfo-mode-hook 'semantic-default-texi-setup)
+
+
+;;; Special features of Texinfo tag streams
+;;
+;; This section provides specialized access into texinfo files.
+;; Because texinfo files often directly refer to functions and programs
+;; it is useful to access the texinfo file from the C code for document
+;; maintainance.
+(defun semantic-texi-associated-files (&optional buffer)
+  "Find texinfo files associated with BUFFER."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (cond ((and (fboundp 'ede-documentation-files)
+                ede-minor-mode (ede-current-project))
+	   ;; When EDE is active, ask it.
+	   (ede-documentation-files)
+	   )
+	  ((and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+	   ;; See what texinfo files we have loaded in the database
+	   (let ((tabs (semanticdb-get-database-tables
+			semanticdb-current-database))
+		 (r nil))
+	     (while tabs
+	       (if (eq (oref (car tabs) major-mode) 'texinfo-mode)
+		   (setq r (cons (oref (car tabs) file) r)))
+	       (setq tabs (cdr tabs)))
+	     r))
+	  (t
+	   (directory-files default-directory nil "\\.texi$"))
+	  )))
+
+;; Turns out this might not be useful.
+;; Delete later if that is true.
+(defun semantic-texi-find-documentation (name &optional type)
+  "Find the function or variable NAME of TYPE in the texinfo source.
+NAME is a string representing some functional symbol.
+TYPE is a string, such as \"variable\" or \"Command\" used to find
+the correct definition in case NAME qualifies as several things.
+When this function exists, POINT is at the definition.
+If the doc was not found, an error is thrown.
+Note: TYPE not yet implemented."
+  (let ((f (semantic-texi-associated-files))
+	stream match)
+    (while (and f (not match))
+      (unless stream
+	(with-current-buffer (find-file-noselect (car f))
+	  (setq stream (semantic-fetch-tags))))
+      (setq match (semantic-find-first-tag-by-name name stream))
+      (when match
+	(set-buffer (semantic-tag-buffer match))
+	(goto-char (semantic-tag-start match)))
+      (setq f (cdr f)))))
+
+(defun semantic-texi-update-doc-from-texi (&optional tag)
+  "Update the documentation in the texinfo deffn class tag TAG.
+The current buffer must be a texinfo file containing TAG.
+If TAG is nil, determine a tag based on the current position."
+  (interactive)
+  (unless (or (featurep 'semanticdb) (semanticdb-minor-mode-p))
+    (error "Texinfo updating only works when `semanticdb' is being used"))
+  (semantic-fetch-tags)
+  (unless tag
+    (beginning-of-line)
+    (setq tag (semantic-current-tag)))
+  (unless (semantic-tag-of-class-p tag 'def)
+    (error "Only deffns (or defun or defvar) can be updated"))
+  (let* ((name (semantic-tag-name tag))
+	 (tags (semanticdb-strip-find-results
+		(semanticdb-with-match-any-mode
+		  (semanticdb-brute-deep-find-tags-by-name name))
+		'name))
+	 (docstring nil)
+	 (docstringproto nil)
+	 (docstringvar nil)
+	 (doctag nil)
+	 (doctagproto nil)
+	 (doctagvar nil)
+	 )
+    (save-excursion
+      (while (and tags (not docstring))
+	(let ((sourcetag (car tags)))
+	  ;; There could be more than one!  Come up with a better
+	  ;; solution someday.
+	  (when (semantic-tag-buffer sourcetag)
+	    (set-buffer (semantic-tag-buffer sourcetag))
+	    (unless (eq major-mode 'texinfo-mode)
+	    (cond ((semantic-tag-get-attribute sourcetag :prototype-flag)
+		   ;; If we found a match with doc that is a prototype, then store
+		   ;; that, but don't exit till we find the real deal.
+		   (setq docstringproto (semantic-documentation-for-tag sourcetag)
+			 doctagproto sourcetag))
+		  ((eq (semantic-tag-class sourcetag) 'variable)
+		   (setq docstringvar (semantic-documentation-for-tag sourcetag)
+			 doctagvar sourcetag))
+		  ((semantic-tag-get-attribute sourcetag :override-function-flag)
+		   nil)
+		  (t
+		   (setq docstring (semantic-documentation-for-tag sourcetag))))
+	    (setq doctag (if docstring sourcetag nil))))
+	  (setq tags (cdr tags)))))
+    ;; If we found a prototype of the function that has some doc, but not the
+    ;; actual function, lets make due with that.
+    (if (not docstring)
+	(cond ((stringp docstringvar)
+	       (setq docstring docstringvar
+		     doctag doctagvar))
+	      ((stringp docstringproto)
+	       (setq docstring docstringproto
+		     doctag doctagproto))))
+    ;; Test for doc string
+    (unless docstring
+      (error "Could not find documentation for %s" (semantic-tag-name tag)))
+
+    (require 'srecode)
+    (require 'srecode-texi)
+
+    ;; If we have a string, do the replacement.
+    (delete-region (semantic-tag-start tag)
+		   (semantic-tag-end tag))
+    ;; Use useful functions from the docaument library.
+    (srecode-texi-insert-tag-as-doc doctag)
+    ;(semantic-insert-foreign-tag doctag)
+    ))
+
+(defun semantic-texi-update-doc-from-source (&optional tag)
+  "Update the documentation for the source TAG.
+The current buffer must be a non-texinfo source file containing TAG.
+If TAG is nil, determine the tag based on the current position.
+The current buffer must include TAG."
+  (interactive)
+  (when (eq major-mode 'texinfo-mode)
+    (error "Not a source file"))
+  (semantic-fetch-tags)
+  (unless tag
+    (setq tag (semantic-current-tag)))
+  (unless (semantic-documentation-for-tag tag)
+    (error "Cannot find interesting documentation to use for %s"
+	   (semantic-tag-name tag)))
+  (let* ((name (semantic-tag-name tag))
+	 (texi (semantic-texi-associated-files))
+	 (doctag nil)
+	 (docbuff nil))
+    (while (and texi (not doctag))
+      (set-buffer (find-file-noselect (car texi)))
+      (setq doctag (car (semantic-deep-find-tags-by-name
+			 name (semantic-fetch-tags)))
+	    docbuff (if doctag (current-buffer) nil))
+      (setq texi (cdr texi)))
+    (unless doctag
+      (error "Tag %s is not yet documented.  Use the `document' command"
+             name))
+    ;; Ok, we should have everything we need.  Do the deed.
+    (if (get-buffer-window docbuff)
+	(set-buffer docbuff)
+      (switch-to-buffer docbuff))
+    (goto-char (semantic-tag-start doctag))
+
+    (require 'srecode)
+    (require 'srecode-texi)
+
+    (delete-region (semantic-tag-start doctag)
+		   (semantic-tag-end doctag))
+    ;; Use useful functions from the document library.
+    (srecode-texi-insert-tag-as-doc doctag)
+    ;(semantic-insert-foreign-tag doctag)
+    ))
+
+(defun semantic-texi-update-doc (&optional tag)
+  "Update the documentation for TAG.
+If the current buffer is a texinfo file, then find the source doc, and
+update it.  If the current buffer is a source file, then get the
+documentation for this item, find the existing doc in the associated
+manual, and update that."
+  (interactive)
+  (cond ((eq major-mode 'texinfo-mode)
+	 (semantic-texi-update-doc-from-texi tag))
+	(t
+	 (semantic-texi-update-doc-from-source tag))))
+
+(defun semantic-texi-goto-source (&optional tag)
+  "Jump to the source for the definition in the texinfo file TAG.
+If TAG is nil, it is derived from the deffn under POINT."
+  (interactive)
+  (unless (or (featurep 'semanticdb) (semanticdb-minor-mode-p))
+    (error "Texinfo updating only works when `semanticdb' is being used"))
+  (semantic-fetch-tags)
+  (unless tag
+    (beginning-of-line)
+    (setq tag (semantic-current-tag)))
+  (unless (semantic-tag-of-class-p tag 'def)
+    (error "Only deffns (or defun or defvar) can be updated"))
+  (let* ((name (semantic-tag-name tag))
+	 (tags (semanticdb-fast-strip-find-results
+		(semanticdb-with-match-any-mode
+		  (semanticdb-brute-deep-find-tags-by-name name nil 'name))
+		))
+
+	 (done nil)
+	 )
+    (save-excursion
+      (while (and tags (not done))
+	(set-buffer (semantic-tag-buffer (car tags)))
+	(unless (eq major-mode 'texinfo-mode)
+	  (switch-to-buffer (semantic-tag-buffer (car tags)))
+	  (goto-char (semantic-tag-start (car tags)))
+	  (setq done t))
+	(setq tags (cdr tags)))
+      (if (not done)
+	  (error "Could not find tag for %s" (semantic-tag-name tag)))
+      )))
+
+(provide 'semantic-texi)
+
+;;; semantic-texi.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-utest-c.el b/site/cedet-1.0pre7/semantic/semantic-utest-c.el
new file mode 100644
index 0000000..c37dcd6
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-utest-c.el
@@ -0,0 +1,114 @@
+;;; semantic-utest-c.el --- C based parsing tests.
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-utest-c.el,v 1.7 2010/02/20 22:21:26 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Run some C based parsing tests.
+
+(defvar semantic-utest-c-comparisons
+  '( ("testsppreplace.c" . "testsppreplaced.c")
+     )
+  "List of files to parse and compare against eachother.")
+
+(defvar semantic-utest-c-conditionals
+  '( "testsppcond.cpp" )
+  "List of files for testing conditionals.")
+
+;;; Code:
+;;;###autoload
+(defun semantic-utest-c ()
+  "Run parsing test for C from the test directory."
+  (interactive)
+  (semantic-utest-c-compare)
+  (semantic-utest-c-conditionals)
+  ;; Passed?
+  (message "PASSED!")
+  )
+
+(defun semantic-utest-c-compare ()
+  "Run parsing test for C which compares two files.
+The first file is full of SPP macros.
+The second file is full of raw code that the macros should
+expand to."
+  (dolist (fp semantic-utest-c-comparisons)
+    (let* ((sem (locate-library "semantic"))
+	   (sdir (file-name-directory sem))
+	   (semantic-lex-c-nested-namespace-ignore-second nil)
+	   (tags-actual
+	    (save-excursion
+	      (set-buffer (find-file-noselect (expand-file-name (concat "tests/" (car fp)) sdir)))
+	      (semantic-clear-toplevel-cache)
+	      (semantic-fetch-tags)))
+	   (tags-expected
+	    (save-excursion
+	      (set-buffer (find-file-noselect (expand-file-name (concat "tests/" (cdr fp)) sdir)))
+	      (semantic-clear-toplevel-cache)
+	      (semantic-fetch-tags))))
+      ;; Now that we have the tags, compare them for SPP accuracy.
+      (dolist (tag tags-actual)
+	(if (and (semantic-tag-of-class-p tag 'variable)
+		 (semantic-tag-variable-constant-p tag))
+	    nil				; skip the macros.
+	  (if (semantic-tag-similar-with-subtags-p tag (car tags-expected))
+	      (setq tags-expected (cdr tags-expected))
+	    (with-mode-local c-mode
+	      (error "Found: >> %s << Expected: >>  %s <<"
+		     (semantic-format-tag-prototype tag nil t)
+		     (semantic-format-tag-prototype (car tags-expected) nil t)
+		     )))
+	  ))
+      )))
+
+(defun semantic-utest-c-conditionals ()
+  "Run parsing test for C which is full of conditional statements.
+Functions parsed with FAIL in the name will fail the tests, while
+those with PASS in the name will pass."
+  (if (featurep 'xemacs)
+      (message "\nNOTICE: XEmacs 21 doesn't support a recent enough version of hideif to run C contional tests.\n")
+
+    (dolist (fp semantic-utest-c-conditionals)
+      (let* ((sem (locate-library "semantic"))
+	     (sdir (file-name-directory sem))
+	     (semantic-lex-c-nested-namespace-ignore-second nil)
+	     (tags-actual
+	      (save-excursion
+		(set-buffer (find-file-noselect (expand-file-name (concat "tests/" fp) sdir)))
+		(semantic-clear-toplevel-cache)
+		(semantic-fetch-tags)))
+	     )
+	(dolist (tag tags-actual)
+	  (let ((name (semantic-tag-name tag)))
+	    (cond ((string-match "fail" name)
+		   (error "Found: >> %s << which should not have been found"
+			  name))
+		  ((string-match "pass" name)
+		   nil) ;; that's ok
+		  ((and (semantic-tag-of-class-p tag 'variable)
+			(semantic-tag-variable-constant-p tag))
+		   nil) ;; Our macro definitions
+		  (t
+		   (error "Found: >> %s << which is not expected" name)))
+	    )))))
+  )
+
+(provide 'semantic-utest-c)
+;;; semantic-utest-c.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-utest.el b/site/cedet-1.0pre7/semantic/semantic-utest.el
new file mode 100644
index 0000000..2e034de
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-utest.el
@@ -0,0 +1,1065 @@
+;;; semantic-utest.el --- Tests for semantic's parsing system.
+
+;;; Copyright (C) 2003, 2004, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: semantic-utest.el,v 1.15 2010/02/09 00:21:12 scymtym Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic's parsing and partial parsing system is pretty complex.
+;; These unit tests attempt to emulate semantic's partial reparsing
+;; and full reparsing system, and anything else I may feel the urge
+;; to write a test for.
+
+(require 'cedet-utests)
+(require 'semantic)
+
+(defvar semantic-utest-temp-directory (if (fboundp 'temp-directory)
+					  (temp-directory)
+					temporary-file-directory)
+  "Temporary directory to use when creating files.")
+
+(defun semantic-utest-fname (name)
+  "Create a filename for NAME in /tmp."
+  (expand-file-name name semantic-utest-temp-directory))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for C tests
+
+(defvar semantic-utest-C-buffer-contents
+  "/* Test file for C language for Unit Tests */
+
+#include <stdio.h>
+#include \"sutest.h\"
+
+struct mystruct1 {
+  int slot11;
+  char slot12;
+  float slot13;
+};
+
+int var1;
+
+float funp1(char arg11, char arg12);
+
+char fun2(int arg_21, int arg_22) /*1*/
+{
+  struct mystruct1 *ms1 = malloc(sizeof(struct mystruct1));
+
+  char sv = calc_sv(var1);
+
+  if (var1 == 0) {
+     sv = 1;
+  } else if (arg_21 == 0) {
+     sv = 2;
+  } else if (arg_22 == 0) {
+     sv = 3;
+  } else {
+     sv = 4;
+  }
+
+  printf(\"SV = %d\\n\", sv);
+
+  /* Memory Leak */
+  ms1.slot1 = sv;
+
+  return 'A' + sv;
+}
+"
+  "Contents of a C buffer initialized by this unit test.
+Be sure to change `semantic-utest-C-name-contents' when you
+change this variable.")
+
+(defvar semantic-utest-C-h-buffer-contents
+  "/* Test file for C language header file for Unit Tests */
+
+int calc_sv(int);
+
+"
+  "Contents of a C header file buffer initialized by this unit test.")
+
+(defvar semantic-utest-C-filename (semantic-utest-fname "sutest.c")
+  "File to open and erase during this test for C.")
+
+(defvar semantic-utest-C-filename-h
+  (concat (file-name-sans-extension semantic-utest-C-filename)
+	  ".h")
+  "Header file filename for C")
+
+
+(defvar semantic-utest-C-name-contents
+  '(("stdio.h" include
+     (:system-flag t)
+     nil (overlay 48 66 "sutest.c"))
+    ("sutest.h" include nil nil (overlay 67 86 "sutest.c"))
+    ("mystruct1" type
+     (:members
+      (("slot11" variable
+	(:type "int")
+	(reparse-symbol classsubparts)
+	(overlay 109 120 "sutest.c"))
+       ("slot12" variable
+	(:type "char")
+	(reparse-symbol classsubparts)
+	(overlay 123 135 "sutest.c"))
+       ("slot13" variable
+	(:type "float")
+	(reparse-symbol classsubparts)
+	(overlay 138 151 "sutest.c")))
+      :type "struct")
+     nil (overlay 88 154 "sutest.c"))
+    ("var1" variable
+     (:type "int")
+     nil (overlay 156 165 "sutest.c"))
+    ("funp1" function
+     (:prototype-flag t :arguments
+		      (("arg11" variable
+			(:type "char")
+			(reparse-symbol arg-sub-list)
+			(overlay 179 190 "sutest.c"))
+		       ("arg12" variable
+			(:type "char")
+			(reparse-symbol arg-sub-list)
+			(overlay 191 202 "sutest.c")))
+		      :type "float")
+     nil (overlay 167 203 "sutest.c"))
+    ("fun2" function
+     (:arguments
+      (("arg_21" variable
+	(:type "int")
+	(reparse-symbol arg-sub-list)
+	(overlay 215 226 "sutest.c"))
+       ("arg_22" variable
+	(:type "int")
+	(reparse-symbol arg-sub-list)
+	(overlay 227 238 "sutest.c")))
+      :type "char")
+     nil (overlay 205 566 "sutest.c")))
+  "List of expected tag names for C.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Python tests
+
+(defvar semantic-utest-Python-buffer-contents
+"
+# Comment
+
+# Import statements
+import foo
+import q.foo
+import bar as baz
+import q.bar as baz
+from blah import *
+from q.blah import *
+from blah import a, b, c, d
+from q.blah import a, b, c, d
+
+# Classes
+class Empty:
+  pass
+
+# Simple class compound statement with blank lines sprinkled.
+class Foo(Bar):
+
+    x = 1
+
+    y = 2
+
+class DocString:
+  \"\"\"Documentation string\"\"\"
+
+class MultipleInheritance(Parent1, Parent2):
+  pass
+
+class Methods:
+  def method(this):
+    pass
+
+  def method2(self):
+    pass
+
+  def method3(self, a, b, c):
+    \"\"\"Documentation string\"\"\"
+
+class longclasslist(xx.yyy,
+                    zz.aa):
+  foo=1
+
+# Functions
+def simple():
+    pass
+
+def args(a, b):
+    return 1, 2
+
+def rest(a, b, *args):
+    len(args)
+
+def kw(**kwargs):
+    pass
+
+def longarglist(a,
+                b,
+                c,
+                d):
+    a=1;
+    b=1;
+    c=1;
+    d=1;
+
+def fun1(a,b,c):
+  return a
+
+def fun2(a,b,c): #1
+  return b
+
+# Statements
+for x in y:
+    print x
+
+for (x, (y, z)) in a:
+    pass
+
+while y > 0:
+    y = y - 1
+
+a=b=c=d=e=f=i=j=k=l=m=n=o=p=q=r=s=t=x=y=1
+
+if x:
+    x = 2
+    y = 3
+
+x = 2
+y = 3
+r, s, t = 1, 2, '3'
+"
+
+
+)
+;  "pyhon test case. notice that python is indentation sensitive
+
+
+(defvar semantic-utest-Python-name-contents
+  '(;; Imports
+    ("foo"    include nil nil (overlay  33  43 "tst.py"))
+    ("q.foo"  include nil nil (overlay  44  56 "tst.py"))
+    ("bar"    include nil nil (overlay  57  74 "tst.py"))
+    ("q.bar"  include nil nil (overlay  75  94 "tst.py"))
+    ("blah"   include nil nil (overlay  95 113 "tst.py"))
+    ("q.blah" include nil nil (overlay 114 134 "tst.py"))
+    ("blah"   include nil nil (overlay 135 162 "tst.py"))
+    ("q.blah" include nil nil (overlay 163 192 "tst.py"))
+
+    ;; Class
+    ("Empty" type
+     (:members
+      (("pass" code nil (reparse-symbol indented_block_body) nil nil))
+      :type "class")
+     nil nil)
+    ("Foo" type
+     (:superclasses ("Bar")
+      :members
+      (("x" variable nil (reparse-symbol indented_block_body) nil) ;; value is 1
+       ("y" variable nil (reparse-symbol indented_block_body) nil)) ;; value is 2
+      :type "class")
+     nil nil)
+    ("DocString" type
+     (:members
+      (("\"\"\"Documentation string\"\"\"" code
+	nil (reparse-symbol indented_block_body) nil))
+      :type "class")
+     nil nil) ;; doc "Documentation string"
+    ("MultipleInheritance" type
+     (:superclasses ("Parent1" "Parent2")
+      :members
+      (("pass" code nil (reparse-symbol indented_block_body) nil nil))
+      :type "class")
+     nil nil)
+    ("Methods" type
+     (:members
+      (("method" function
+	(:arguments
+	 (("this" variable
+	   nil (reparse-symbol function_parameters) nil)))
+	(reparse-symbol indented_block_body) nil)
+       ("method2" function
+	(:arguments
+	 (("self" variable
+	   nil (reparse-symbol function_parameters) nil)))
+	(reparse-symbol indented_block_body) nil)
+       ("method3" function
+	(:arguments
+	 (("self" variable
+	   nil (reparse-symbol function_parameters) nil)
+	  ("a" variable
+	   nil (reparse-symbol function_parameters) nil)
+	  ("b" variable
+	   nil (reparse-symbol function_parameters) nil)
+	  ("c" variable
+	   nil (reparse-symbol function_parameters) nil)))
+	(reparse-symbol indented_block_body) nil))
+      :type "class")
+     nil nil) ;; doc "Documentation string"
+    ("longclasslist" type
+     (:superclasses ("xx.yyy" "zz.aa")
+      :members
+      (("foo" variable
+	nil (reparse-symbol function_parameters) nil)) ;; TODO value is 1
+      :type "class")
+     nil nil)
+
+    ;; Functions
+    ("simple" function
+     nil nil nil) ;; pass
+    ("args" function
+     (:arguments
+      (("a" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("b" variable
+	nil (reparse-symbol function_parameters) nil)))
+     nil nil)
+    ("rest" function
+     (:arguments
+      (("a" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("b" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("args" variable
+	nil (reparse-symbol function_parameters) nil))) ;; TODO actually *args
+     ) ;; len(args)
+    ("kw" function
+     (:arguments
+      (("kwargs" variable
+	nil (reparse-symbol function_parameters) nil))) ;; TODO actually **kwargs
+     nil nil)
+    ("longarglist" function
+     (:arguments
+      (("a" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("b" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("c" variable
+	nil (reparse-symbol function_parameters) nil)
+       ("d" variable
+	nil (reparse-symbol function_parameters) nil)))
+     nil nil)
+    ("fun1" function
+     (:arguments
+      (("a" variable nil
+        (reparse-symbol function_parameters)
+	(overlay 10 11 "tst.py"))
+       ("b" variable nil
+        (reparse-symbol function_parameters)
+        (overlay 12 13 "tst.py"))
+       ("c" variable nil
+        (reparse-symbol function_parameters)
+        (overlay 14 15 "tst.py"))))
+     nil (overlay 1 31 "tst.py"))
+    ("fun2" function
+     (:arguments
+      (("a" variable nil
+        (reparse-symbol function_parameters)
+        (overlay 41 42 "tst.py"))
+       ("b" variable nil
+        (reparse-symbol function_parameters)
+        (overlay 43 44 "tst.py"))
+       ("c" variable nil
+        (reparse-symbol function_parameters)
+        (overlay 45 46 "tst.py"))))
+     nil (overlay 32 65 "tst.py"))
+
+    ;; Statements
+    ("for"     code     nil nil nil)
+    ("for"     code     nil nil nil)
+    ("while"   code     nil nil nil)
+    ("a"       variable nil nil nil) ;; TODO there are multiple variables in this
+    ("if"      code     nil nil nil)
+    ("x"       variable nil nil nil)
+    ("y"       variable nil nil nil)
+    ("r, s, t" code     nil nil nil) ;; TODO should be multiple variable tags
+    )
+  "List of expected tag names for Python.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Java tests
+
+(defvar semantic-utest-Java-buffer-contents
+"
+class JavaTest{
+  void fun1(int a,int b){
+    return a;
+  }
+
+  void fun2(int a,int b){ //1
+    return b;
+  }
+
+}
+"
+)
+
+(defvar semantic-utest-Java-name-contents
+  '(("JavaTest" type
+     (:members
+      (("fun1" function
+        (:arguments
+         (("a" variable
+           (:type "int")
+           (reparse-symbol formal_parameters)
+           (overlay 30 35 "JavaTest.java"))
+	  ("b" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 36 41 "JavaTest.java")))
+         :type "void")
+        (reparse-symbol class_member_declaration)
+        (overlay 20 61 "JavaTest.java"))
+       ("fun2" function
+	(:arguments
+	 (("a" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 75 80 "JavaTest.java"))
+	  ("b" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 81 86 "JavaTest.java")))
+	 :type "void")
+	(reparse-symbol class_member_declaration)
+	(overlay 65 110 "JavaTest.java")))
+      :type "class")
+     nil (overlay 2 113 "JavaTest.java")))
+  "List of expected tag names for Java."
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Javascript tests
+
+(defvar semantic-utest-Javascript-buffer-contents
+"
+function fun1(a, b){
+    return a;
+  }
+
+function fun2(a,b){ //1
+    return b;
+  }
+"
+)
+
+
+(defvar semantic-utest-Javascript-name-contents
+  '(("fun1" function
+     (:arguments
+      (("a" variable nil
+	(reparse-symbol FormalParameterList)
+	(overlay 15 16 "tst.js"))
+       ("b" variable nil
+	(reparse-symbol FormalParameterList)
+	(overlay 18 19 "tst.js"))))
+     nil (overlay 1 39 "tst.js"))
+    ("fun2" function
+     (:arguments
+      (("a" variable nil
+	(reparse-symbol FormalParameterList)
+	(overlay 55 56 "tst.js"))
+       ("b" variable nil
+	(reparse-symbol FormalParameterList)
+	(overlay 57 58 "tst.js"))))
+     nil (overlay 41 82 "tst.js")))
+
+  "List of expected tag names for Javascript.")
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Makefile tests
+
+(defvar semantic-utest-Makefile-buffer-contents
+"
+t1:
+\techo t1
+
+t2:t1 #1
+\techo t2
+
+
+"
+)
+
+
+(defvar semantic-utest-Makefile-name-contents
+  '(("t1" function nil nil (overlay 1 9 "Makefile"))
+    ("t2" function
+     (:arguments
+      ("t1"))
+     nil (overlay 18 28 "Makefile")))
+  "List of expected tag names for Makefile.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Scheme tests
+
+(defvar semantic-utest-Scheme-buffer-contents
+  "
+ (define fun1 2)
+
+ (define fun2 3  ;1
+              )
+")
+
+(defvar semantic-utest-Scheme-name-contents
+  '(("fun1" variable
+     (:default-value ("2"))
+     nil (overlay 3 18 "tst.scm"))
+    ("fun2" variable
+     (:default-value ("3"))
+     nil (overlay 21 55 "tst.scm")))
+  )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Html tests
+
+(defvar semantic-utest-Html-buffer-contents
+  "
+<html>
+  <body>
+    <h1>hello</h1>
+  </body><!--1-->
+</html>
+"
+  )
+
+(defvar semantic-utest-Html-name-contents
+  '(("hello" section
+     (:members
+      (("hello" section nil nil (overlay 21 24 "tst.html"))))
+     nil (overlay 10 15 "tst.html")))
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for PHP tests
+
+(defvar semantic-utest-PHP-buffer-contents
+  "<?php
+
+function fun1(){
+   return \"fun1\";
+}
+
+function fun2($arg1){
+   $output = \"argument to fun2: \" . $arg1;
+   return $output;
+}
+
+class aClass {
+   public function fun1($a, $b){
+      return $a;
+   }
+
+   public function fun2($a, $b){
+      return $b;
+   }
+}
+?> "
+  )
+
+(defvar semantic-utest-PHP-name-contents
+  '(("fun1" function nil
+     nil (overlay 9 45 "phptest.php"))
+    ("fun2" function
+     (:arguments (("$arg1" variable nil (reparse-symbol formal_parameters) (overlay 61 66 "phptest.php"))))
+     nil
+     (overlay 47 132 "phptest.php"))
+    ("aClass" type
+     (:members (("fun1" function
+		 (:typemodifiers ("public") :arguments
+				 (("$a" variable nil (reparse-symbol formal_parameters) (overlay 174 176 "phptest.php"))
+				  ("$b" variable nil (reparse-symbol formal_parameters) (overlay 178 180 "phptest.php"))))
+
+		 nil
+		 (overlay 153 204 "phptest.php"))
+
+		("fun2" function
+		 (:typemodifiers ("public") :arguments
+				 (("$a" variable nil (reparse-symbol formal_parameters) (overlay 230 232 "phptest.php"))
+				  ("$b" variable nil (reparse-symbol formal_parameters) (overlay 234 236 "phptest.php"))
+				  ))
+		 nil
+		 (overlay 209 260 "phptest.php"))) :type "class")
+     nil
+     (overlay 135 262 "phptest.php"))
+    )
+  "Expected results from the PHP Unit test"
+  )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Data for Csharp C# tests
+
+(defvar semantic-utest-Csharp-buffer-contents
+"
+class someClass {
+  int fun1(int a, int b) {
+    return a; }
+  int fun2(int a, int b) {
+    return b; }
+}
+")
+
+(defvar semantic-utest-Csharp-name-contents
+  '(("someClass" type
+     (:members
+      (("fun1" function
+	(:arguments
+	 (("a" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 30 35 "tst.cs"))
+	  ("b" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 37 42 "tst.cs")))
+	 :type "int")
+	(reparse-symbol class_member_declaration)
+	(overlay 21 61 "tst.cs"))
+       ("fun2" function
+	(:arguments
+	 (("a" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 73 78 "tst.cs"))
+	  ("b" variable
+	   (:type "int")
+	   (reparse-symbol formal_parameters)
+	   (overlay 80 85 "tst.cs")))
+	 :type "int")
+	(reparse-symbol class_member_declaration)
+	(overlay 64 104 "tst.cs")))
+      :type "class")
+     nil (overlay 1 106 "tst.cs")))
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+(defun semantic-utest-makebuffer (filename contents)
+  "Create a buffer for FILENAME for use in a unit test.
+Pre-fill the buffer with CONTENTS."
+  (let ((buff (semantic-find-file-noselect filename)))
+    (set-buffer buff)
+    (setq buffer-offer-save nil)
+    (font-lock-mode -1) ;; Font lock has issues in Emacs 23
+    (toggle-read-only -1) ;; In case /tmp doesn't exist.
+    (erase-buffer)
+    (insert contents)
+    ;(semantic-fetch-tags) ;JAVE could this go here?
+    (set-buffer-modified-p nil)
+    buff
+    )
+  )
+
+(defun semantic-utest-C ()
+  "Run semantic's C unit test."
+  (interactive)
+  (save-excursion
+    (let ((buff  (semantic-utest-makebuffer semantic-utest-C-filename   semantic-utest-C-buffer-contents))
+	  (buff2 (semantic-utest-makebuffer semantic-utest-C-filename-h semantic-utest-C-h-buffer-contents))
+	  )
+      (semantic-fetch-tags)
+      (set-buffer buff)
+
+      ;; Turn off a range of modes
+      (semantic-idle-scheduler-mode -1)
+
+      ;; Turn on some modes
+      (semantic-highlight-edits-mode 1)
+
+      ;; Update tags, and show it.
+      (semantic-fetch-tags)
+
+      (switch-to-buffer buff)
+      (sit-for 0)
+
+      ;; Run the tests.
+      ;;(message "First parsing test.")
+      (semantic-utest-verify-names semantic-utest-C-name-contents)
+
+      ;;(message "Invalid tag test.")
+      (semantic-utest-last-invalid semantic-utest-C-name-contents '("fun2") "/\\*1\\*/" "/* Deleted this line */")
+      (semantic-utest-verify-names semantic-utest-C-name-contents)
+
+      (set-buffer-modified-p nil)
+      ;; Clean up
+      ;; (kill-buffer buff)
+      ;; (kill-buffer buff2)
+      ))
+  (message "All C tests passed.")
+  )
+
+
+
+
+(defun semantic-utest-generic (testname filename contents name-contents names-removed killme insertme)
+  "Generic unit test according to template.
+Should work for languages withouth .h files, python javascript java.
+TESTNAME is the name of the test.
+FILENAME is the name of the file to create.
+CONTENTS is the contents of the file to test.
+NAME-CONTENTS is the list of names that should be in the contents.
+NAMES-REMOVED is the list of names that gets removed in the removal step.
+KILLME is the name of items to be killed.
+INSERTME is the text to be inserted after the deletion."
+  (save-excursion
+    (let ((buff  (semantic-utest-makebuffer filename  contents))
+	  )
+      ;; Turn off a range of modes
+      (semantic-idle-scheduler-mode -1)
+
+      ;; Turn on some modes
+      (semantic-highlight-edits-mode 1)
+
+      ;; Update tags, and show it.
+      (semantic-fetch-tags)
+      (switch-to-buffer buff)
+      (sit-for 0)
+
+      ;; Run the tests.
+      ;;(message "First parsing test %s." testname)
+      (semantic-utest-verify-names name-contents)
+
+      ;;(message "Invalid tag test %s." testname)
+      (semantic-utest-last-invalid name-contents names-removed killme insertme)
+      (semantic-utest-verify-names name-contents)
+
+      (set-buffer-modified-p nil)
+      ;; Clean up
+      ;; (kill-buffer buff)
+      ))
+  (message "All %s tests passed." testname)
+  )
+
+(defun semantic-utest-Python()
+  (interactive)
+  (if (fboundp 'python-mode)
+      (semantic-utest-generic
+       "Python"
+       (semantic-utest-fname "pytest.py")
+       semantic-utest-Python-buffer-contents
+       semantic-utest-Python-name-contents
+       '("fun2") "#1" "#deleted line")
+    (message "Skilling Python test: NO major mode."))
+  )
+
+
+(defun semantic-utest-Javascript()
+  (interactive)
+  (if (fboundp 'javascript-mode)
+      (semantic-utest-generic "Javascript" (semantic-utest-fname "javascripttest.js") semantic-utest-Javascript-buffer-contents  semantic-utest-Javascript-name-contents   '("fun2") "//1" "//deleted line")
+    (message "Skipping JavaScript test: NO major mode."))
+  )
+
+(defun semantic-utest-Java()
+  (interactive)
+  ;; If JDE is installed, it might mess things up depending on the version
+  ;; that was installed.
+  (let ((auto-mode-alist  '(("\\.java\\'" . java-mode))))
+    (semantic-utest-generic "Java" (semantic-utest-fname "JavaTest.java") semantic-utest-Java-buffer-contents  semantic-utest-Java-name-contents   '("fun2") "//1" "//deleted line")
+    ))
+
+(defun semantic-utest-Makefile()
+  (interactive)
+  (semantic-utest-generic "Makefile" (semantic-utest-fname "Makefile") semantic-utest-Makefile-buffer-contents  semantic-utest-Makefile-name-contents   '("fun2") "#1" "#deleted line")
+  )
+
+(defun semantic-utest-Scheme()
+  (interactive)
+  (semantic-utest-generic "Scheme" (semantic-utest-fname "tst.scm") semantic-utest-Scheme-buffer-contents  semantic-utest-Scheme-name-contents   '("fun2") ";1" ";deleted line")
+  )
+
+
+(defun semantic-utest-Html()
+  (interactive)
+  ;; Disable html-helper auto-fill-in mode.
+  (let ((html-helper-build-new-buffer nil))
+    (semantic-utest-generic "HTML" (semantic-utest-fname "tst.html") semantic-utest-Html-buffer-contents  semantic-utest-Html-name-contents   '("fun2") "<!--1-->" "<!--deleted line-->")
+    ))
+
+(defun semantic-utest-PHP()
+  (interactive)
+  (if (fboundp 'php-mode)
+      (semantic-utest-generic "PHP" (semantic-utest-fname "phptest.php") semantic-utest-PHP-buffer-contents semantic-utest-PHP-name-contents '("fun1") "fun2" "%^@")
+    (message "Skipping PHP Test.  No php-mode loaded."))
+  )
+
+;look at http://mfgames.com/linux/csharp-mode
+(defun semantic-utest-Csharp() ;; hmm i dont even know how to edit a scharp file. need a csharp mode implementation i suppose
+  (interactive)
+  (if (fboundp 'csharp-mode)
+      (semantic-utest-generic "C#" (semantic-utest-fname "csharptest.cs") semantic-utest-Csharp-buffer-contents  semantic-utest-Csharp-name-contents   '("fun2") "//1" "//deleted line")
+    (message "Skipping C# test.  No csharp-mode loaded."))
+  )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; stubs
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; stuff for Erlang
+;;-module(hello).
+;-export([hello_world/0]).
+;
+;hello_world()->
+;    io:format("Hello World ~n").
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;(defun semantic-utest-Erlang()
+;  (interactive)
+;  (semantic-utest-generic "Erlang" (semantic-utest-fname "tst.erl") semantic-utest-Erlang-buffer-contents  semantic-utest-Erlang-name-contents   '("fun2") "//1" "//deleted line")
+;  )
+;
+;;texi is also supported
+;(defun semantic-utest-Texi()
+;  (interactive)
+;  (semantic-utest-generic "texi" (semantic-utest-fname "tst.texi") semantic-utest-Texi-buffer-contents  semantic-utest-Texi-name-contents   '("fun2") "//1" "//deleted line")
+;  )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun semantic-utest-main()
+  (interactive)
+  "call all utests"
+  (cedet-utest-log-start "multi-lang parsing")
+  (cedet-utest-log " * C tests...")
+  (semantic-utest-C)
+  (cedet-utest-log " * Python tests...")
+  (semantic-utest-Python)
+  (cedet-utest-log " * Java tests...")
+  (semantic-utest-Java)
+  (cedet-utest-log " * Javascript tests...")
+  (semantic-utest-Javascript)
+  (cedet-utest-log " * Makefile tests...")
+  (semantic-utest-Makefile)
+  (cedet-utest-log " * Scheme tests...")
+  (semantic-utest-Scheme)
+  (cedet-utest-log " * Html tests...")
+  (semantic-utest-Html)
+  (cedet-utest-log " * PHP tests...")
+  (semantic-utest-PHP)
+  (cedet-utest-log " * Csharp tests...")
+  (semantic-utest-Csharp)
+
+  (cedet-utest-log-shutdown "multi-lang parsing")
+  )
+
+;;; Buffer contents validation
+;;
+(defun semantic-utest-match-attributes (attr1 attr2 skipnames)
+  "Compare attribute lists ATTR1 and ATTR2.
+Argument SKIPNAMES is a list of names that may be child nodes to skip."
+  (let ((res t))
+    (while (and res attr1 attr2)
+
+      ;; Compare
+      (setq res
+	    (cond ((and (listp (car attr1))
+			(semantic-tag-p (car (car attr1))))
+		   ;; Compare the list of tags...
+		   (semantic-utest-taglists-equivalent-p
+		    (car attr2) (car attr1) skipnames)
+		   )
+		  (t
+		   (equal (car attr1) (car attr2)))))
+
+      (if (not res)
+	  (error "TAG INTERNAL DIFF: %S %S"
+		 (car attr1) (car attr2)))
+
+      (setq attr1 (cdr attr1)
+	    attr2 (cdr attr2)))
+    res))
+
+(defun semantic-utest-equivalent-tag-p (tag1 tag2 skipnames)
+  "Determine if TAG1 and TAG2 are the same.
+SKIPNAMES includes lists of possible child nodes that should be missing."
+  (and (equal (semantic-tag-name tag1) (semantic-tag-name tag2))
+       (semantic-tag-of-class-p tag1 (semantic-tag-class tag2))
+       (semantic-utest-match-attributes
+	(semantic-tag-attributes tag1) (semantic-tag-attributes tag2)
+	skipnames)
+       ))
+
+(defun semantic-utest-taglists-equivalent-p (table names skipnames)
+  "Compare TABLE and NAMES, where skipnames allow list1 to be different.
+SKIPNAMES is a list of names that should be skipped in the NAMES list."
+  (let ((SN skipnames))
+    (while SN
+      (setq names (remove (car SN) names))
+      (setq SN (cdr SN))))
+  (while (and names table)
+    (if (not (semantic-utest-equivalent-tag-p (car names)
+					      (car table)
+					      skipnames))
+	(error "Expected %s, found %s"
+	       (semantic-format-tag-prototype (car names))
+	       (semantic-format-tag-prototype (car table))))
+    (setq names (cdr names)
+	  table (cdr table)))
+  (when names (error "Items forgotten: %S"
+		     (mapcar 'semantic-tag-name names)
+		     ))
+  (when table (error "Items extra: %S"
+		     (mapcar 'semantic-tag-name table)))
+  t)
+
+(defun semantic-utest-verify-names (name-contents &optional skipnames)
+  "Verify the names of the test buffer from NAME-CONTENTS.
+Argument SKIPNAMES is a list of names that should be skipped
+when analyzing the file.
+
+JAVE this thing would need to be recursive to handle java and csharp"
+  (let ((names name-contents)
+	(table (semantic-fetch-tags))
+	)
+    (semantic-utest-taglists-equivalent-p table names skipnames)
+    ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;
+; JAVE redefine a  new validation function
+; is not quite as good as the old one yet
+(defun semantic-utest-verify-names-jave (name-contents &optional skipnames)
+  "JAVE version of `semantic-utest-verify-names'.
+NAME-CONTENTS is a sample of the tags buffer to test against.
+SKIPNAMES is a list of names to remove from NAME-CONTENTS"
+ (assert (semantic-utest-verify-names-2 name-contents (semantic-fetch-tags))
+	 nil "failed test")
+)
+
+(defun semantic-utest-verify-names-2 (l1 l2)
+  (cond   ( (and (consp l1) (equal (car l1) 'overlay))
+            (overlayp l2))
+          ((not (consp l1))
+           (equal l1 l2))
+          ((consp l1)
+           (and (semantic-utest-verify-names-2 (car l1) (car l2)) (semantic-utest-verify-names-2 (cdr l1) (cdr l2))))
+          (t (error "internal error"))))
+
+
+
+
+
+;;; Kill indicator line
+;;
+(defvar semantic-utest-last-kill-text nil
+  "The text from the last kill.")
+
+(defvar semantic-utest-last-kill-pos nil
+  "The position of the last kill.")
+
+(defun semantic-utest-kill-indicator ( killme insertme)
+  "Kill the line with KILLME on it and insert INSERTME in its place."
+  (goto-char (point-min))
+;  (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isnt generic enough for different languages
+  (re-search-forward killme)
+  (beginning-of-line)
+  (setq semantic-utest-last-kill-pos (point))
+  (setq semantic-utest-last-kill-text
+	(buffer-substring (point) (point-at-eol)))
+  (delete-region (point) (point-at-eol))
+  (insert insertme)
+  (sit-for 0)
+)
+
+(defun semantic-utest-unkill-indicator ()
+  "Unkill the last indicator."
+  (goto-char semantic-utest-last-kill-pos)
+  (delete-region (point) (point-at-eol))
+  (insert semantic-utest-last-kill-text)
+  (sit-for 0)
+  )
+
+;;;  EDITING TESTS
+;;
+
+(defun semantic-utest-last-invalid (name-contents names-removed killme insertme)
+  "Make the last fcn invalid."
+  (semantic-utest-kill-indicator killme insertme)
+;  (semantic-utest-verify-names name-contents names-removed); verify its gone ;new validator doesnt handle skipnames yet
+  (semantic-utest-unkill-indicator);put back killed stuff
+  )
+
+
+
+
+;"#<overlay from \\([0-9]+\\) to \\([0-9]+\\) in \\([^>]*\\)>"
+;#<overlay from \([0-9]+\) to \([0-9]+\) in \([^>]*\)>
+;(overlay \1 \2 "\3")
+
+
+;; JAVE
+;; these are some unit tests for cedet that I got from Eric and modified a bit for:
+;;   python
+;;   javascript
+;;   java
+;; I tried to generalize the structure of the tests a bit to make it easier to add languages
+
+;; Mail from Eric:
+;; Many items in the checklist look like:
+
+;;       M-x global-semantic-highlight-edits-mode RET
+;;       - Edit a file.  See the highlight of newly inserted text.
+;;       - Customize `semantic-edits-verbose-flag' to be non-nil.
+;;       - Wait for the idle scheduler, it should clean up the edits.
+;;         - observe messages from incremental parser.  Do they relate
+;; 	  to the edits?
+;;       - M-x bovinate RET - verify your changes are reflected.
+
+;; It's all about watching the behavior.  Timers go off, things get
+;; cleaned up, you type in new changes, etc.  An example I tried to
+;; do is below, but covers only 1 language, and not very well at that.
+;; I seem to remember seeing a unit test framework going by one of the
+;; lists.  I'm not sure if that would help.
+
+;; Another that might be automatable:
+
+;;       M-x semantic-analyze-current-context RET
+;;        - Do this in different contexts in your language
+;;          files.   Verify that reasonable results are returned
+;;          such as identification of assignments, function arguments, etc.
+
+;; Anyway, those are some ideas.  Any effort you put it will be helpful!
+
+;; Thanks
+;; Eric
+
+;; -----------
diff --git a/site/cedet-1.0pre7/semantic/semantic-util-modes.el b/site/cedet-1.0pre7/semantic/semantic-util-modes.el
new file mode 100644
index 0000000..8e07556
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-util-modes.el
@@ -0,0 +1,1250 @@
+;;; semantic-util-modes.el --- Semantic minor modes
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;; Copyright (C) 2001 David Ponce
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Author: David Ponce <david@dponce.com>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-util-modes.el,v 1.73 2009/10/01 02:28:49 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.:
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;;  Semantic utility minor modes.
+;;
+
+;;; Code:
+(require 'working)
+(require 'semantic)
+
+(eval-when-compile
+  (require 'semantic-decorate)
+  )
+
+;;; Compatibility
+(if (fboundp 'propertize)
+    (defalias 'semantic-propertize 'propertize)
+  (defsubst semantic-propertize (string &rest properties)
+    "Return a copy of STRING with text properties added.
+Dummy implementation for compatibility which just return STRING and
+ignore PROPERTIES."
+    string)
+  )
+
+;;; Group for all semantic enhancing modes
+(defgroup semantic-modes nil
+  "Minor modes associated with the Semantic architecture."
+  :group 'semantic)
+
+;;;;
+;;;; Semantic minor modes stuff
+;;;;
+(defcustom semantic-update-mode-line t
+  "*If non-nil, show enabled minor modes in the mode line.
+Only minor modes that are not turned on globally are shown in the mode
+line."
+  :group 'semantic
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (set-default sym val)
+         ;; Update status of all Semantic enabled buffers
+         (semantic-map-buffers
+          #'semantic-mode-line-update)))
+
+(defcustom semantic-mode-line-prefix
+  (semantic-propertize "S" 'face 'bold)
+  "*Prefix added to minor mode indicators in the mode line."
+  :group 'semantic
+  :type 'string
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default)
+
+(defvar semantic-minor-modes-status nil
+  "String showing Semantic minor modes which are locally enabled.
+It is displayed in the mode line.")
+(make-variable-buffer-local 'semantic-minor-modes-status)
+
+(defvar semantic-minor-mode-alist nil
+  "Alist saying how to show Semantic minor modes in the mode line.
+Like variable `minor-mode-alist'.")
+
+(defun semantic-mode-line-update ()
+  "Update display of Semantic minor modes in the mode line.
+Only minor modes that are locally enabled are shown in the mode line."
+  (setq semantic-minor-modes-status nil)
+  (if semantic-update-mode-line
+      (let ((ml semantic-minor-mode-alist)
+            mm ms see)
+        (while ml
+          (setq mm (car ml)
+                ms (cadr mm)
+                mm (car mm)
+                ml (cdr ml))
+          (when (and (symbol-value mm)
+                     ;; Only show local minor mode status
+                     (not (memq mm semantic-init-hook)))
+            (and ms
+                 (symbolp ms)
+                 (setq ms (symbol-value ms)))
+            (and (stringp ms)
+                 (not (member ms see)) ;; Don't duplicate same status
+                 (setq see (cons ms see)
+                       ms (if (string-match "^[ ]*\\(.+\\)" ms)
+                              (match-string 1 ms)))
+                 (setq semantic-minor-modes-status
+                       (if semantic-minor-modes-status
+                           (concat semantic-minor-modes-status "/" ms)
+                         ms)))))
+        (if semantic-minor-modes-status
+            (setq semantic-minor-modes-status
+                  (concat
+                   " "
+                   (if (string-match "^[ ]*\\(.+\\)"
+                                     semantic-mode-line-prefix)
+                       (match-string 1 semantic-mode-line-prefix)
+                     "S")
+                   "/"
+                   semantic-minor-modes-status)))))
+  (working-mode-line-update))
+
+(defun semantic-desktop-ignore-this-minor-mode (buffer)
+  "Installed as a minor-mode initializer for Desktop mode.
+BUFFER is the buffer to not initialize a Semantic minor mode in."
+  nil)
+
+(defun semantic-add-minor-mode (toggle name &optional keymap)
+  "Register a new Semantic minor mode.
+TOGGLE is a symbol which is the name of a buffer-local variable that
+is toggled on or off to say whether the minor mode is active or not.
+It is also an interactive function to toggle the mode.
+
+NAME specifies what will appear in the mode line when the minor mode
+is active.  NAME should be either a string starting with a space, or a
+symbol whose value is such a string.
+
+Optional KEYMAP is the keymap for the minor mode that will be added to
+`minor-mode-map-alist'."
+  ;; Add a dymmy semantic minor mode to display the status
+  (or (assq 'semantic-minor-modes-status minor-mode-alist)
+      (setq minor-mode-alist (cons (list 'semantic-minor-modes-status
+                                         'semantic-minor-modes-status)
+                                   minor-mode-alist)))
+  (if (fboundp 'add-minor-mode)
+      ;; Emacs 21 & XEmacs
+      (add-minor-mode toggle "" keymap)
+    ;; Emacs 20
+    (or (assq toggle minor-mode-alist)
+        (setq minor-mode-alist (cons (list toggle "") minor-mode-alist)))
+    (or (not keymap)
+        (assq toggle minor-mode-map-alist)
+        (setq minor-mode-map-alist (cons (cons toggle keymap)
+                                         minor-mode-map-alist))))
+  ;; Record how to display this minor mode in the mode line
+  (let ((mm (assq toggle semantic-minor-mode-alist)))
+    (if mm
+        (setcdr mm (list name))
+      (setq semantic-minor-mode-alist (cons (list toggle name)
+                                       semantic-minor-mode-alist))))
+
+  ;; Semantic minor modes don't work w/ Desktop restore.
+  ;; This line will disable this minor mode from being restored
+  ;; by Desktop.
+  (when (boundp 'desktop-minor-mode-handlers)
+    (add-to-list 'desktop-minor-mode-handlers
+		 (cons toggle 'semantic-desktop-ignore-this-minor-mode)))
+  )
+
+(defun semantic-toggle-minor-mode-globally (mode &optional arg)
+  "Toggle minor mode MODE in every Semantic enabled buffer.
+Return non-nil if MODE is turned on in every Semantic enabled buffer.
+If ARG is positive, enable, if it is negative, disable.  If ARG is
+nil, then toggle.  Otherwise do nothing.  MODE must be a valid minor
+mode defined in `minor-mode-alist' and must be too an interactive
+function used to toggle the mode."
+  (or (and (fboundp mode) (assq mode minor-mode-alist))
+      (error "Semantic minor mode %s not found" mode))
+  (if (not arg)
+      (if (memq mode semantic-init-hook)
+	  (setq arg -1)
+	(setq arg 1)))
+  ;; Add or remove the MODE toggle function from
+  ;; `semantic-init-hook'.  Then turn MODE on or off in every
+  ;; Semantic enabled buffer.
+  (cond
+   ;; Turn off if ARG < 0
+   ((< arg 0)
+    (remove-hook 'semantic-init-hook mode)
+    (semantic-map-buffers #'(lambda () (funcall mode -1)))
+    nil)
+   ;; Turn on if ARG > 0
+   ((> arg 0)
+    (add-hook 'semantic-init-hook mode)
+    (semantic-map-buffers #'(lambda () (funcall mode 1)))
+    t)
+   ;; Otherwise just check MODE state
+   (t
+    (memq mode semantic-init-hook))
+   ))
+
+;;;;
+;;;; Minor mode to highlight areas that a user edits.
+;;;;
+
+;;;###autoload
+(defun global-semantic-highlight-edits-mode (&optional arg)
+  "Toggle global use of option `semantic-highlight-edits-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-highlight-edits-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-highlight-edits-mode arg)))
+
+;;;###autoload
+(defcustom global-semantic-highlight-edits-mode nil
+  "*If non-nil enable global use of variable `semantic-highlight-edits-mode'.
+When this mode is enabled, changes made to a buffer are highlighted
+until the buffer is reparsed."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-highlight-edits-mode (if val 1 -1))))
+
+(defcustom semantic-highlight-edits-mode-hook nil
+  "*Hook run at the end of function `semantic-highlight-edits-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defface semantic-highlight-edits-face
+  '((((class color) (background dark))
+     ;; Put this back to something closer to black later.
+     (:background "gray20"))
+    (((class color) (background light))
+     (:background "gray90")))
+  "*Face used to show dirty tokens in `semantic-highlight-edits-mode'."
+  :group 'semantic-faces)
+
+(defun semantic-highlight-edits-new-change-hook-fcn (overlay)
+  "Function set into `semantic-edits-new-change-hook'.
+Argument OVERLAY is the overlay created to mark the change.
+This function will set the face property on this overlay."
+  (semantic-overlay-put overlay 'face 'semantic-highlight-edits-face))
+
+(defvar semantic-highlight-edits-mode-map
+  (let ((km (make-sparse-keymap)))
+    km)
+  "Keymap for highlight-edits minor mode.")
+
+(defvar semantic-highlight-edits-mode nil
+  "Non-nil if highlight-edits minor mode is enabled.
+Use the command `semantic-highlight-edits-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-highlight-edits-mode)
+
+(defun semantic-highlight-edits-mode-setup ()
+  "Setup option `semantic-highlight-edits-mode'.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-highlight-edits-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+	  (progn
+	    ;; Disable minor mode if semantic stuff not available
+	    (setq semantic-highlight-edits-mode nil)
+	    (error "Buffer %s was not set up for parsing"
+		   (buffer-name)))
+	(semantic-make-local-hook 'semantic-edits-new-change-hooks)
+	(add-hook 'semantic-edits-new-change-hooks
+		  'semantic-highlight-edits-new-change-hook-fcn nil t)
+	)
+    ;; Remove hooks
+    (remove-hook 'semantic-edits-new-change-hooks
+		 'semantic-highlight-edits-new-change-hook-fcn t)
+    )
+  semantic-highlight-edits-mode)
+
+;;;###autoload
+(defun semantic-highlight-edits-mode (&optional arg)
+  "Minor mode for highlighting changes made in a buffer.
+Changes are tracked by semantic so that the incremental parser can work
+properly.
+This mode will highlight those changes as they are made, and clear them
+when the incremental parser accounts for those edits.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-highlight-edits-mode 0 1))))
+  (setq semantic-highlight-edits-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-highlight-edits-mode)))
+  (semantic-highlight-edits-mode-setup)
+  (run-hooks 'semantic-highlight-edits-mode-hook)
+  (if (interactive-p)
+      (message "highlight-edits minor mode %sabled"
+               (if semantic-highlight-edits-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-highlight-edits-mode)
+
+(semantic-add-minor-mode 'semantic-highlight-edits-mode
+                         "e"
+                         semantic-highlight-edits-mode-map)
+
+
+;;;;
+;;;; Minor mode to show unmatched-syntax elements
+;;;;
+
+;;;###autoload
+(defun global-semantic-show-unmatched-syntax-mode (&optional arg)
+  "Toggle global use of option `semantic-show-unmatched-syntax-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-show-unmatched-syntax-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-show-unmatched-syntax-mode arg)))
+
+;;;###autoload
+(defcustom global-semantic-show-unmatched-syntax-mode nil
+  "*If non-nil, enable global use of `semantic-show-unmatched-syntax-mode'.
+When this mode is enabled, syntax in the current buffer which the
+semantic parser cannot match is highlighted with a red underline."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-show-unmatched-syntax-mode (if val 1 -1))))
+
+(defcustom semantic-show-unmatched-syntax-mode-hook nil
+  "*Hook run at the end of function `semantic-show-unmatched-syntax-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defface semantic-unmatched-syntax-face
+  '((((class color) (background dark))
+     (:underline "red"))
+    (((class color) (background light))
+     (:underline "red")))
+  "*Face used to show unmatched syntax in.
+The face is used in  `semantic-show-unmatched-syntax-mode'."
+  :group 'semantic-faces)
+
+(defsubst semantic-unmatched-syntax-overlay-p (overlay)
+  "Return non-nil if OVERLAY is an unmatched syntax one."
+  (eq (semantic-overlay-get overlay 'semantic) 'unmatched))
+
+(defun semantic-showing-unmatched-syntax-p ()
+  "Return non-nil if an unmatched syntax overlay was found in buffer."
+  (let ((ol (semantic-overlays-in (point-min) (point-max)))
+        found)
+    (while (and ol (not found))
+      (setq found (semantic-unmatched-syntax-overlay-p (car ol))
+            ol    (cdr ol)))
+    found))
+
+(defun semantic-show-unmatched-lex-tokens-fetch ()
+  "Fetch a list of unmatched lexical tokens from the current buffer.
+Uses the overlays which have accurate bounds, and rebuilds what was
+originally passed in."
+  (let ((ol (semantic-overlays-in (point-min) (point-max)))
+	(ustc nil))
+    (while ol
+      (if (semantic-unmatched-syntax-overlay-p (car ol))
+	  (setq ustc (cons (cons 'thing
+				 (cons (semantic-overlay-start (car ol))
+				       (semantic-overlay-end (car ol))))
+			   ustc)))
+      (setq ol (cdr ol)))
+    (nreverse ustc))
+  )
+
+(defun semantic-clean-unmatched-syntax-in-region (beg end)
+  "Remove all unmatched syntax overlays between BEG and END."
+  (let ((ol (semantic-overlays-in beg end)))
+    (while ol
+      (if (semantic-unmatched-syntax-overlay-p (car ol))
+	  (semantic-overlay-delete (car ol)))
+      (setq ol (cdr ol)))))
+
+(defsubst semantic-clean-unmatched-syntax-in-buffer ()
+  "Remove all unmatched syntax overlays found in current buffer."
+  (semantic-clean-unmatched-syntax-in-region
+   (point-min) (point-max)))
+
+(defsubst semantic-clean-token-of-unmatched-syntax (token)
+  "Clean the area covered by TOKEN of unmatched syntax markers."
+  (semantic-clean-unmatched-syntax-in-region
+   (semantic-tag-start token) (semantic-tag-end token)))
+
+(defun semantic-show-unmatched-syntax (syntax)
+  "Function set into `semantic-unmatched-syntax-hook'.
+This will highlight elements in SYNTAX as unmatched syntax."
+  ;; This is called when `semantic-show-unmatched-syntax-mode' is
+  ;; enabled.  Highlight the unmatched syntax, and then add a semantic
+  ;; property to that overlay so we can add it to the official list of
+  ;; semantic supported overlays.  This gets it cleaned up for errors,
+  ;; buffer cleaning, and the like.
+  (semantic-clean-unmatched-syntax-in-buffer) ;Clear previous highlighting
+  (if syntax
+      (let (o)
+        (while syntax
+          (setq o (semantic-make-overlay (semantic-lex-token-start (car syntax))
+                                         (semantic-lex-token-end (car syntax))))
+          (semantic-overlay-put o 'semantic 'unmatched)
+          (semantic-overlay-put o 'face 'semantic-unmatched-syntax-face)
+          (setq syntax (cdr syntax))))
+    ))
+
+(defun semantic-next-unmatched-syntax (point &optional bound)
+  "Find the next overlay for unmatched syntax after POINT.
+Do not search past BOUND if non-nil."
+  (save-excursion
+    (goto-char point)
+    (let ((os point) (ol nil))
+      (while (and os (< os (or bound (point-max))) (not ol))
+	(setq os (semantic-overlay-next-change os))
+	(when os
+	  ;; Get overlays at position
+	  (setq ol (semantic-overlays-at os))
+	  ;; find the overlay that belongs to semantic
+	  ;; and starts at the found position.
+	  (while (and ol (listp ol))
+	    (and (semantic-unmatched-syntax-overlay-p (car ol))
+                 (setq ol (car ol)))
+	    (if (listp ol)
+                (setq ol (cdr ol))))))
+      ol)))
+
+(defvar semantic-show-unmatched-syntax-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-c,`" 'semantic-show-unmatched-syntax-next)
+    km)
+  "Keymap for command `semantic-show-unmatched-syntax-mode'.")
+
+(defvar semantic-show-unmatched-syntax-mode nil
+  "Non-nil if show-unmatched-syntax minor mode is enabled.
+Use the command `semantic-show-unmatched-syntax-mode' to change this
+variable.")
+(make-variable-buffer-local 'semantic-show-unmatched-syntax-mode)
+
+(defun semantic-show-unmatched-syntax-mode-setup ()
+  "Setup the `semantic-show-unmatched-syntax' minor mode.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-show-unmatched-syntax-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-show-unmatched-syntax-mode nil)
+            (error "Buffer %s was not set up for parsing"
+                   (buffer-name)))
+        ;; Add hooks
+        (semantic-make-local-hook 'semantic-unmatched-syntax-hook)
+        (add-hook 'semantic-unmatched-syntax-hook
+                  'semantic-show-unmatched-syntax nil t)
+	(semantic-make-local-hook 'semantic-pre-clean-token-hooks)
+	(add-hook 'semantic-pre-clean-token-hooks
+		  'semantic-clean-token-of-unmatched-syntax nil t)
+        ;; Show unmatched syntax elements
+	(if (not (semantic--umatched-syntax-needs-refresh-p))
+	    (semantic-show-unmatched-syntax
+	     (semantic-unmatched-syntax-tokens))))
+    ;; Remove hooks
+    (remove-hook 'semantic-unmatched-syntax-hook
+                 'semantic-show-unmatched-syntax t)
+    (remove-hook 'semantic-pre-clean-token-hooks
+		 'semantic-clean-token-of-unmatched-syntax t)
+    ;; Cleanup unmatched-syntax highlighting
+    (semantic-clean-unmatched-syntax-in-buffer))
+  semantic-show-unmatched-syntax-mode)
+
+;;;###autoload
+(defun semantic-show-unmatched-syntax-mode (&optional arg)
+  "Minor mode to highlight unmatched lexical syntax tokens.
+When a parser executes, some elements in the buffer may not match any
+parser rules.  These text characters are considered unmatched syntax.
+Often time, the display of unmatched syntax can expose coding
+problems before the compiler is run.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{semantic-show-unmatched-syntax-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-show-unmatched-syntax-mode 0 1))))
+  (setq semantic-show-unmatched-syntax-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-show-unmatched-syntax-mode)))
+  (semantic-show-unmatched-syntax-mode-setup)
+  (run-hooks 'semantic-show-unmatched-syntax-mode-hook)
+  (if (interactive-p)
+      (message "show-unmatched-syntax minor mode %sabled"
+               (if semantic-show-unmatched-syntax-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-show-unmatched-syntax-mode)
+
+(semantic-add-minor-mode 'semantic-show-unmatched-syntax-mode
+                         "u"
+                         semantic-show-unmatched-syntax-mode-map)
+
+(defun semantic-show-unmatched-syntax-next ()
+  "Move forward to the next occurrence of unmatched syntax."
+  (interactive)
+  (let ((o (semantic-next-unmatched-syntax (point))))
+    (if o
+	(goto-char (semantic-overlay-start o)))))
+
+
+;;;;
+;;;; Minor mode to display the parser state in the modeline.
+;;;;
+
+;;;###autoload
+(defcustom global-semantic-show-parser-state-mode nil
+  "*If non-nil enable global use of `semantic-show-parser-state-mode'.
+When enabled, the current parse state of the current buffer is displayed
+in the mode line. See `semantic-show-parser-state-marker' for details
+on what is displayed."
+  :group 'semantic
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-show-parser-state-mode (if val 1 -1))))
+
+;;;###autoload
+(defun global-semantic-show-parser-state-mode (&optional arg)
+  "Toggle global use of option `semantic-show-parser-state-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-show-parser-state-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-show-parser-state-mode arg)))
+
+(defcustom semantic-show-parser-state-mode-hook nil
+  "*Hook run at the end of function `semantic-show-parser-state-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defvar semantic-show-parser-state-mode-map
+  (let ((km (make-sparse-keymap)))
+    km)
+  "Keymap for show-parser-state minor mode.")
+
+(defvar semantic-show-parser-state-mode nil
+  "Non-nil if show-parser-state minor mode is enabled.
+Use the command `semantic-show-parser-state-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-show-parser-state-mode)
+
+(defun semantic-show-parser-state-mode-setup ()
+  "Setup option `semantic-show-parser-state-mode'.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if semantic-show-parser-state-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq semantic-show-parser-state-mode nil)
+            (error "Buffer %s was not set up for parsing"
+                   (buffer-name)))
+	;; Set up mode line
+
+	(when (not
+	       (memq 'semantic-show-parser-state-string mode-line-modified))
+	  (setq mode-line-modified
+		(append mode-line-modified
+			'(semantic-show-parser-state-string))))
+	;; Add hooks
+        (semantic-make-local-hook 'semantic-edits-new-change-hooks)
+        (add-hook 'semantic-edits-new-change-hooks
+                  'semantic-show-parser-state-marker nil t)
+	(semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook)
+	(add-hook 'semantic-edits-incremental-reparse-failed-hook
+		  'semantic-show-parser-state-marker nil t)
+	(semantic-make-local-hook 'semantic-after-partial-cache-change-hook)
+	(add-hook 'semantic-after-partial-cache-change-hook
+		  'semantic-show-parser-state-marker nil t)
+	(semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook)
+	(add-hook 'semantic-after-toplevel-cache-change-hook
+		  'semantic-show-parser-state-marker nil t)
+	(semantic-show-parser-state-marker)
+
+	(semantic-make-local-hook 'semantic-before-auto-parse-hooks)
+	(add-hook 'semantic-before-auto-parse-hooks
+		  'semantic-show-parser-state-auto-marker nil t)
+	(semantic-make-local-hook 'semantic-after-auto-parse-hooks)
+	(add-hook 'semantic-after-auto-parse-hooks
+		  'semantic-show-parser-state-marker nil t)
+
+	(semantic-make-local-hook 'semantic-before-idle-scheduler-reparse-hook)
+	(add-hook 'semantic-before-idle-scheduler-reparse-hook
+		  'semantic-show-parser-state-auto-marker nil t)
+	(semantic-make-local-hook 'semantic-after-idle-scheduler-reparse-hook)
+	(add-hook 'semantic-after-idle-scheduler-reparse-hook
+		  'semantic-show-parser-state-marker nil t)
+        )
+    ;; Remove parts of mode line
+    (setq mode-line-modified
+	  (delq 'semantic-show-parser-state-string mode-line-modified))
+    ;; Remove hooks
+    (remove-hook 'semantic-edits-new-change-hooks
+		 'semantic-show-parser-state-marker t)
+    (remove-hook 'semantic-edits-incremental-reparse-failed-hook
+		 'semantic-show-parser-state-marker t)
+    (remove-hook 'semantic-after-partial-cache-change-hook
+		 'semantic-show-parser-state-marker t)
+    (remove-hook 'semantic-after-toplevel-cache-change-hook
+		 'semantic-show-parser-state-marker t)
+
+    (remove-hook 'semantic-before-auto-parse-hooks
+		 'semantic-show-parser-state-auto-marker t)
+    (remove-hook 'semantic-after-auto-parse-hooks
+		 'semantic-show-parser-state-marker t)
+
+    (remove-hook 'semantic-before-idle-scheduler-reparse-hook
+		 'semantic-show-parser-state-auto-marker t)
+    (remove-hook 'semantic-after-idle-scheduler-reparse-hook
+		 'semantic-show-parser-state-marker t)
+    )
+  semantic-show-parser-state-mode)
+
+;;;###autoload
+(defun semantic-show-parser-state-mode (&optional arg)
+  "Minor mode for displaying parser cache state in the modeline.
+The cache can be in one of three states.  They are
+Up to date, Partial reprase needed, and Full reparse needed.
+The state is indicated in the modeline with the following characters:
+ `-'  ->  The cache is up to date.
+ `!'  ->  The cache requires a full update.
+ `~'  ->  The cache needs to be incrementally parsed.
+ `%'  ->  The cache is not currently parseable.
+ `@'  ->  Auto-parse in progress (not set here.)
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-show-parser-state-mode 0 1))))
+  (setq semantic-show-parser-state-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-show-parser-state-mode)))
+  (semantic-show-parser-state-mode-setup)
+  (run-hooks 'semantic-show-parser-state-mode-hook)
+  (if (interactive-p)
+      (message "show-parser-state minor mode %sabled"
+               (if semantic-show-parser-state-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-show-parser-state-mode)
+
+(semantic-add-minor-mode 'semantic-show-parser-state-mode
+                         ""
+                         semantic-show-parser-state-mode-map)
+
+(defvar semantic-show-parser-state-string nil
+  "String showing the parser state for this buffer.
+See `semantic-show-parser-state-marker' for details.")
+(make-variable-buffer-local 'semantic-show-parser-state-string)
+
+(defun semantic-show-parser-state-marker (&rest ignore)
+  "Set `semantic-show-parser-state-string' to indicate parser state.
+This marker is one of the following:
+ `-'  ->  The cache is up to date.
+ `!'  ->  The cache requires a full update.
+ `~'  ->  The cache needs to be incrementally parsed.
+ `%'  ->  The cache is not currently parseable.
+ `@'  ->  Auto-parse in progress (not set here.)
+Arguments IGNORE are ignored, and accepted so this can be used as a hook
+in many situations."
+  (setq semantic-show-parser-state-string
+	(cond ((semantic-parse-tree-needs-rebuild-p)
+	       "!")
+	      ((semantic-parse-tree-needs-update-p)
+	       "^")
+	      ((semantic-parse-tree-unparseable-p)
+	       "%")
+	      (t
+               "-")))
+  ;;(message "Setup mode line indicator to [%s]" semantic-show-parser-state-string)
+  (semantic-mode-line-update))
+
+(defun semantic-show-parser-state-auto-marker ()
+  "Hook function run before an autoparse.
+Set up `semantic-show-parser-state-marker' to show `@'
+to indicate a parse in progress."
+  (unless (semantic-parse-tree-up-to-date-p)
+    (setq semantic-show-parser-state-string "@")
+    (semantic-mode-line-update)
+    ;; For testing.
+    ;;(sit-for 1)
+    ))
+
+
+;;;;
+;;;; Minor mode to make function decls sticky.
+;;;;
+
+;;;###autoload
+(defun global-semantic-stickyfunc-mode (&optional arg)
+  "Toggle global use of option `semantic-stickyfunc-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-stickyfunc-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-stickyfunc-mode arg)))
+
+;;;###autoload
+(defcustom global-semantic-stickyfunc-mode nil
+  "*If non-nil, enable global use of `semantic-stickyfunc-mode'.
+This minor mode only works for Emacs 21 or later.
+When enabled, the header line is enabled, and the first line
+of the current function or method is displayed in it.
+This makes it appear that the first line of that tag is
+`sticky' to the top of the window."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-stickyfunc-mode (if val 1 -1))))
+
+(defcustom semantic-stickyfunc-mode-hook nil
+  "*Hook run at the end of function `semantic-stickyfunc-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defvar semantic-stickyfunc-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km [ header-line down-mouse-1 ] 'semantic-stickyfunc-menu)
+    km)
+  "Keymap for stickyfunc minor mode.")
+
+(defvar semantic-stickyfunc-popup-menu nil
+  "Menu used if the user clicks on the header line used by stickyfunc mode.")
+
+(easy-menu-define
+  semantic-stickyfunc-popup-menu
+  semantic-stickyfunc-mode-map
+  "Stickyfunc Menu"
+  '("Stickyfunc Mode"  :visible (progn nil)
+    [ "Copy Headerline Tag" senator-copy-tag
+      :active (semantic-current-tag)
+      :help "Copy the current tag to the tag ring"]
+    [ "Kill Headerline Tag" senator-kill-tag
+      :active (semantic-current-tag)
+      :help "Kill tag text to the kill ring, and copy the tag to the tag ring"
+      ]
+    [ "Copy Headerline Tag to Register" senator-copy-tag-to-register
+      :active (semantic-current-tag)
+      :help "Copy the current tag to a register"
+      ]
+    [ "Narrow To Headerline Tag" senator-narrow-to-defun
+      :active (semantic-current-tag)
+      :help "Narrow to the bounds of the current tag."]
+    [ "Fold Headerline Tag" senator-fold-tag-toggle
+      :active (semantic-current-tag)
+      :style toggle
+      :selected (let ((tag (semantic-current-tag)))
+		  (and tag (semantic-tag-folded-p tag)))
+      :help "Fold the current tag to one line"
+      ]
+    "---"
+    [ "About This Header Line"
+      (lambda () (interactive)
+	(describe-function 'semantic-stickyfunc-mode)) t])
+  )
+
+(defvar semantic-stickyfunc-mode nil
+  "Non-nil if stickyfunc minor mode is enabled.
+Use the command `semantic-stickyfunc-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-stickyfunc-mode)
+
+(defcustom semantic-stickyfunc-indent-string
+  (if (and window-system (not (featurep 'xemacs)))
+      (concat
+       (condition-case nil
+	   ;; Test scroll bar location
+	   (let ((charwidth (frame-char-width))
+		 (scrollpos (frame-parameter (selected-frame)
+					     'vertical-scroll-bars))
+		 )
+	     (if (or (eq scrollpos 'left)
+		     ;; Now wait a minute.  If you turn scroll-bar-mode
+		     ;; on, then off, the new value is t, not left.
+		     ;; Will this mess up older emacs where the default
+		     ;; was on the right?  I don't think so since they don't
+		     ;; support a header line.
+		     (eq scrollpos t))
+		 (let ((w (when (boundp 'scroll-bar-width)
+			    (symbol-value 'scroll-bar-width))))
+
+		   (if (not w)
+		       (setq w (frame-parameter (selected-frame)
+						'scroll-bar-width)))
+
+		   ;; in 21.2, the frame parameter is sometimes empty
+		   ;; so we need to get the value here.
+		   (if (not w)
+		       (setq w (+ (get 'scroll-bar-width 'x-frame-parameter)
+				  ;; In 21.4, or perhaps 22.1 the x-frame
+				  ;; parameter is different from the frame
+				  ;; parameter by only 1 pixel.
+				  1)))
+
+		   (if (not w)
+		       "  "
+		     (setq w (+ 2 w))   ; Some sort of border around
+					; the scrollbar.
+		     (make-string (/ w charwidth) ? )))
+	       ""))
+	 (error ""))
+       (condition-case nil
+	   ;; Test fringe size.
+	   (let* ((f (window-fringes))
+		  (fw (car f))
+		  (numspace (/ fw (frame-char-width)))
+		  )
+	     (make-string numspace ? ))
+	 (error
+	  ;; Well, the fancy new Emacs functions failed.  Try older
+	  ;; tricks.
+	  (condition-case nil
+	      ;; I'm not so sure what's up with the 21.1-21.3 fringe.
+	      ;; It looks to be about 1 space wide.
+	      (if (get 'fringe 'face)
+		  " "
+		"")
+	    (error ""))))
+       )
+    ;; Not Emacs or a window system means no scrollbar or fringe,
+    ;; and perhaps not even a header line to worry about.
+    "")
+  "*String used to indent the stickyfunc header.
+Customize this string to match the space used by scrollbars and
+fringe so it does not appear that the code is moving left/right
+when it lands in the sticky line."
+  :group 'semantic
+  :type 'string)
+
+(defvar semantic-stickyfunc-old-hlf nil
+  "Value of the header line when entering sticky func mode.")
+
+(defconst semantic-stickyfunc-header-line-format
+  (cond ((featurep 'xemacs)
+	 nil)
+	((>= emacs-major-version 22)
+	 '(:eval (list
+		  ;; Magic bit I found on emacswiki.
+		  (propertize " " 'display '((space :align-to 0)))
+		  (semantic-stickyfunc-fetch-stickyline))))
+	((= emacs-major-version 21)
+	 '(:eval (list semantic-stickyfunc-indent-string
+		       (semantic-stickyfunc-fetch-stickyline))))
+	(t nil))
+  "The header line format used by sticky func mode.")
+
+(defun semantic-stickyfunc-mode-setup ()
+  "Setup option `semantic-stickyfunc-mode'.
+For semantic enabled buffers, make the function declaration for the top most
+function \"sticky\".  This is accomplished by putting the first line of
+text for that function in Emacs 21's header line."
+  (if semantic-stickyfunc-mode
+      (progn
+	(unless (and (featurep 'semantic) (semantic-active-p))
+	  ;; Disable minor mode if semantic stuff not available
+	  (setq semantic-stickyfunc-mode nil)
+	  (error "Buffer %s was not set up for parsing" (buffer-name)))
+	(unless (boundp 'default-header-line-format)
+	  ;; Disable if there are no header lines to use.
+	  (setq semantic-stickyfunc-mode nil)
+	  (error "Sticky Function mode requires Emacs 21"))
+	;; Enable the mode
+	;; Save previous buffer local value of header line format.
+	(when (and (local-variable-p 'header-line-format (current-buffer))
+		   (not (eq header-line-format
+			    semantic-stickyfunc-header-line-format)))
+	  (set (make-local-variable 'semantic-stickyfunc-old-hlf)
+	       header-line-format))
+	(setq header-line-format semantic-stickyfunc-header-line-format)
+	)
+    ;; Disable sticky func mode
+    ;; Restore previous buffer local value of header line format if
+    ;; the current one is the sticky func one.
+    (when (eq header-line-format semantic-stickyfunc-header-line-format)
+      (kill-local-variable 'header-line-format)
+      (when (local-variable-p 'semantic-stickyfunc-old-hlf (current-buffer))
+	(setq header-line-format semantic-stickyfunc-old-hlf)
+	(kill-local-variable 'semantic-stickyfunc-old-hlf))))
+  semantic-stickyfunc-mode)
+
+;;;###autoload
+(defun semantic-stickyfunc-mode (&optional arg)
+  "Minor mode to show the title of a tag in the header line.
+Enables/disables making the header line of functions sticky.
+A function (or other tag class specified by
+`semantic-stickyfunc-sticky-classes') has a header line, meaning the
+first line which describes the rest of the construct.  This first
+line is what is displayed in the Emacs 21 header line.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-stickyfunc-mode 0 1))))
+  (setq semantic-stickyfunc-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-stickyfunc-mode)))
+  (semantic-stickyfunc-mode-setup)
+  (run-hooks 'semantic-stickyfunc-mode-hook)
+  (if (interactive-p)
+      (message "Stickyfunc minor mode %sabled"
+               (if semantic-stickyfunc-mode "en" "dis")))
+  (semantic-mode-line-update)
+  semantic-stickyfunc-mode)
+
+(defvar semantic-stickyfunc-sticky-classes
+  '(function type)
+  "List of tag classes which sticky func will display in the header line.")
+(make-variable-buffer-local 'semantic-stickyfunc-sticky-classes)
+
+(defun semantic-stickyfunc-tag-to-stick ()
+  "Return the tag to stick at the current point."
+  (let ((tags (nreverse (semantic-find-tag-by-overlay (point)))))
+    ;; Get rid of non-matching tags.
+    (while (and tags
+		(not (member
+		      (semantic-tag-class (car tags))
+		      semantic-stickyfunc-sticky-classes))
+		)
+      (setq tags (cdr tags)))
+    (car tags)))
+
+(defun semantic-stickyfunc-fetch-stickyline ()
+  "Make the function at the top of the current window sticky.
+Capture it's function declaration, and place it in the header line.
+If there is no function, disable the header line."
+  (let ((str
+	 (save-excursion
+	   (goto-char (window-start (selected-window)))
+	   (forward-line -1)
+	   (end-of-line)
+	   ;; Capture this function
+	   (let* ((tag (semantic-stickyfunc-tag-to-stick)))
+	     ;; TAG is nil if there was nothing of the apropriate type there.
+	     (if (not tag)
+		 ;; Set it to be the text under the header line
+		 (buffer-substring (point-at-bol) (point-at-eol))
+	       ;; Get it
+	       (goto-char (semantic-tag-start tag))
+               ;; Klaus Berndl <klaus.berndl@sdm.de>:
+               ;; goto the tag name; this is especially needed for languages
+               ;; like c++ where a often used style is like:
+               ;;     void
+               ;;     ClassX::methodM(arg1...)
+               ;;     {
+               ;;       ...
+               ;;     }
+               ;; Without going to the tag-name we would get"void" in the
+               ;; header line which is IMHO not really useful
+               (search-forward (semantic-tag-name tag) nil t)
+	       (buffer-substring (point-at-bol) (point-at-eol))
+	       ))))
+	(start 0))
+    (while (string-match "%" str start)
+      (setq str (replace-match "%%" t t str 0)
+	    start (1+ (match-end 0)))
+      )
+    ;; In 21.4 (or 22.1) the heder doesn't expand tabs.  Hmmmm.
+    ;; We should replace them here.
+    ;;
+    ;; This hack assumes that tabs are kept smartly at tab boundaries
+    ;; instead of in a tab boundary where it might only represent 4 spaces.
+    (while (string-match "\t" str start)
+      (setq str (replace-match "        " t t str 0)))
+    str))
+
+(defun semantic-stickyfunc-menu (event)
+  "Popup a menu that can help a user understand stickyfunc-mode.
+Argument EVENT describes the event that caused this function to be called."
+  (interactive "e")
+  (let* ((startwin (selected-window))
+	 (win (car (car (cdr event))))
+	 )
+    (select-window win t)
+    (save-excursion
+      (goto-char (window-start win))
+      (sit-for 0)
+      (popup-menu semantic-stickyfunc-popup-menu event)
+      )
+    (select-window startwin)))
+
+
+(semantic-add-minor-mode 'semantic-stickyfunc-mode
+                         "" ;; Don't need indicator.  It's quite visible
+                         semantic-stickyfunc-mode-map)
+
+
+
+;;;;
+;;;; Minor mode to make highlight the current function
+;;;;
+
+;; Highlight the first like of the function we are in if it is different
+;; from the the tag going off the top of the screen.
+
+;;;###autoload
+(defun global-semantic-highlight-func-mode (&optional arg)
+  "Toggle global use of option `semantic-highlight-func-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-semantic-highlight-func-mode
+        (semantic-toggle-minor-mode-globally
+         'semantic-highlight-func-mode arg)))
+
+;;;###autoload
+(defcustom global-semantic-highlight-func-mode nil
+  "*If non-nil, enable global use of `semantic-highlight-func-mode'.
+When enabled, the first line of the current tag is highlighted."
+  :group 'semantic
+  :group 'semantic-modes
+  :type 'boolean
+  :require 'semantic-util-modes
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semantic-highlight-func-mode (if val 1 -1))))
+
+(defcustom semantic-highlight-func-mode-hook nil
+  "*Hook run at the end of function `semantic-highlight-func-mode'."
+  :group 'semantic
+  :type 'hook)
+
+(defvar semantic-highlight-func-mode-map
+  (let ((km (make-sparse-keymap))
+	(m3  (if (featurep 'xemacs) [ button3 ] [ mouse-3 ]))
+	)
+    (define-key km m3 'semantic-highlight-func-menu)
+    km)
+  "Keymap for highlight-func minor mode.")
+
+(defvar semantic-highlight-func-popup-menu nil
+  "Menu used if the user clicks on the header line used by `semantic-highlight-func-mode'.")
+
+(easy-menu-define
+  semantic-highlight-func-popup-menu
+  semantic-highlight-func-mode-map
+  "Highlight-Func Menu"
+  '("Highlight-Func Mode"  :visible (progn nil)
+    [ "Copy Tag" senator-copy-tag
+      :active (semantic-current-tag)
+      :help "Copy the current tag to the tag ring"]
+    [ "Kill Tag" senator-kill-tag
+      :active (semantic-current-tag)
+      :help "Kill tag text to the kill ring, and copy the tag to the tag ring"
+      ]
+    [ "Copy Tag to Register" senator-copy-tag-to-register
+      :active (semantic-current-tag)
+      :help "Copy the current tag to a register"
+      ]
+    [ "Narrow To Tag" senator-narrow-to-defun
+      :active (semantic-current-tag)
+      :help "Narrow to the bounds of the current tag."]
+    [ "Fold Tag" senator-fold-tag-toggle
+      :active (semantic-current-tag)
+      :style toggle
+      :selected (let ((tag (semantic-stickyfunc-tag-to-stick)))
+		  (and tag (semantic-tag-folded-p tag)))
+      :help "Fold the current tag to one line"
+      ]
+    "---"
+    [ "About This Tag" semantic-describe-tag t])
+  )
+
+(defun semantic-highlight-func-menu (event)
+  "Popup a menu that displays things to do to the current tag.
+Argument EVENT describes the event that caused this function to be called."
+  (interactive "e")
+  (let* ((startwin (selected-window))
+	 (win (semantic-event-window event))
+	 )
+    (select-window win t)
+    (save-excursion
+      ;(goto-char (window-start win))
+      (mouse-set-point event)
+      (sit-for 0)
+      (semantic-popup-menu semantic-highlight-func-popup-menu)
+      )
+    (select-window startwin)))
+
+(defvar semantic-highlight-func-mode nil
+  "Non-nil if highlight-func minor mode is enabled.
+Use the command `semantic-highlight-func-mode' to change this variable.")
+(make-variable-buffer-local 'semantic-highlight-func-mode)
+
+(defvar semantic-highlight-func-ct-overlay nil
+  "Overlay used to highlight the tag the cursor is in.")
+(make-variable-buffer-local 'semantic-highlight-func-ct-overlay)
+
+(defface semantic-highlight-func-current-tag-face
+  '((((class color) (background dark))
+     ;; Put this back to something closer to black later.
+     (:background "gray20"))
+    (((class color) (background light))
+     (:background "gray90")))
+  "Face used to show the top of current function."
+  :group 'semantic-faces)
+
+
+(defun semantic-highlight-func-mode-setup ()
+  "Setup option `semantic-highlight-func-mode'.
+For semantic enabled buffers, highlight the first line of the
+current tag declaration."
+  (if semantic-highlight-func-mode
+      (progn
+	(unless (and (featurep 'semantic) (semantic-active-p))
+	  ;; Disable minor mode if semantic stuff not available
+	  (setq semantic-highlight-func-mode nil)
+	  (error "Buffer %s was not set up for parsing" (buffer-name)))
+	;; Setup our hook
+	(add-hook 'post-command-hook 'semantic-highlight-func-highlight-current-tag nil t)
+	)
+    ;; Disable highlight func mode
+    (remove-hook 'post-command-hook 'semantic-highlight-func-highlight-current-tag t)
+    (semantic-highlight-func-highlight-current-tag t)
+    )
+  semantic-highlight-func-mode)
+
+;;;###autoload
+(defun semantic-highlight-func-mode (&optional arg)
+  "Minor mode to highlight the first line of the current tag.
+Enables/disables making current function firstline light up.
+A function (or other tag class specified by
+`semantic-stickyfunc-sticky-classes') is highlighted, meaning the
+first line which describes the rest of the construct.
+
+See `semantic-stickyfunc-mode' for putting a function in the
+header line.  This mode recycles the stickyfunc configuration
+classes list.
+
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled."
+  (interactive
+   (list (or current-prefix-arg
+             (if semantic-highlight-func-mode 0 1))))
+  (setq semantic-highlight-func-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not semantic-highlight-func-mode)))
+  (semantic-highlight-func-mode-setup)
+  (run-hooks 'semantic-highlight-func-mode-hook)
+  (if (interactive-p)
+      (message "Highlight-Func minor mode %sabled"
+               (if semantic-highlight-func-mode "en" "dis")))
+  semantic-highlight-func-mode)
+
+(defun semantic-highlight-func-highlight-current-tag (&optional disable)
+  "Highlight the current tag under point.
+Optional argument DISABLE will turn off any active highlight.
+If the current tag for this buffer is different from the last time this
+function was called, move the overlay."
+  (when (and (not (minibufferp))
+	     (or (not semantic-highlight-func-ct-overlay)
+		 (eq (semantic-overlay-buffer
+		      semantic-highlight-func-ct-overlay)
+		     (current-buffer))))
+    (let* ((tag (semantic-stickyfunc-tag-to-stick))
+	   (ol semantic-highlight-func-ct-overlay))
+      (when (not ol)
+	;; No overlay in this buffer.  Make one.
+	(setq ol (semantic-make-overlay (point-min) (point-min)
+					(current-buffer) t nil))
+	(semantic-overlay-put ol 'highlight-func t)
+	(semantic-overlay-put ol 'face 'semantic-highlight-func-current-tag-face)
+	(semantic-overlay-put ol 'keymap semantic-highlight-func-mode-map)
+	(semantic-overlay-put ol 'help-echo
+			      "Current Function : mouse-3 - Context menu")
+	(setq semantic-highlight-func-ct-overlay ol)
+	)
+
+      ;; TAG is nil if there was nothing of the apropriate type there.
+      (if (or (not tag) disable)
+	  ;; No tag, make the overlay go away.
+	  (progn
+	    (semantic-overlay-put ol 'tag nil)
+	    (semantic-overlay-move ol (point-min) (point-min) (current-buffer))
+	    )
+
+	;; We have a tag, if it is the same, do nothing.
+	(unless (eq (semantic-overlay-get ol 'tag) tag)
+	  (save-excursion
+	    (goto-char (semantic-tag-start tag))
+	    (search-forward (semantic-tag-name tag) nil t)
+	    (semantic-overlay-put ol 'tag tag)
+	    (semantic-overlay-move ol (point-at-bol) (point-at-eol))
+	    )
+	  )
+	)))
+  nil)
+
+(semantic-add-minor-mode 'semantic-highlight-func-mode
+                         "" ;; Don't need indicator.  It's quite visible
+                         nil)
+
+(provide 'semantic-util-modes)
+
+;;; semantic-util-modes.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic-util.el b/site/cedet-1.0pre7/semantic/semantic-util.el
new file mode 100755
index 0000000..7352e7c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic-util.el
@@ -0,0 +1,440 @@
+;;; semantic-util.el --- Utilities for use with semantic tag tables
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-util.el,v 1.142 2009/09/29 01:31:49 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic utility API for use with semantic tag tables.
+;;
+
+(require 'assoc)
+(require 'semantic)
+(eval-when-compile
+  ;; Emacs 21
+  (condition-case nil
+      (require 'newcomment)
+    (error nil))
+  ;; Semanticdb calls
+  (require 'semanticdb)
+  )
+
+;;; Code:
+
+(defvar semantic-type-relation-separator-character '(".")
+  "Character strings used to separate a parent/child relationship.
+This list of strings are used for displaying or finding separators
+in variable field dereferencing.  The first character will be used for
+display.  In C, a type field is separated like this: \"type.field\"
+thus, the character is a \".\".  In C, and additional value of \"->\"
+would be in the list, so that \"type->field\" could be found.")
+(make-variable-buffer-local 'semantic-type-relation-separator-character)
+
+(defvar semantic-equivalent-major-modes nil
+  "List of major modes which are considered equivalent.
+Equivalent modes share a parser, and a set of override methods.
+A value of nil means that the current major mode is the only one.")
+(make-variable-buffer-local 'semantic-equivalent-major-modes)
+
+;; These semanticdb calls will throw warnings in the byte compiler.
+;; Doing the right thing to make them available at compile time
+;; really messes up the compilation sequence.
+(defun semantic-file-tag-table (file)
+  "Return a tag table for FILE.
+If it is loaded, return the stream after making sure it's ok.
+If FILE is not loaded, check to see if `semanticdb' feature exists,
+   and use it to get tags from files not in memory.
+If FILE is not loaded, and semanticdb is not available, find the file
+   and parse it."
+  (save-match-data
+    (if (find-buffer-visiting file)
+	(save-excursion
+	  (set-buffer (find-buffer-visiting file))
+	  (semantic-fetch-tags))
+      ;; File not loaded
+      (if (and (fboundp 'semanticdb-minor-mode-p)
+	       (semanticdb-minor-mode-p))
+	  ;; semanticdb is around, use it.
+	  (semanticdb-file-stream file)
+	;; Get the stream ourselves.
+	(save-excursion
+	  (set-buffer (find-file-noselect file))
+	  (semantic-fetch-tags))))))
+
+(semantic-alias-obsolete 'semantic-file-token-stream
+			 'semantic-file-tag-table)
+
+(defun semantic-something-to-tag-table (something)
+  "Convert SOMETHING into a semantic tag table.
+Something can be a tag with a valid BUFFER property, a tag table, a
+buffer, or a filename.  If SOMETHING is nil return nil."
+  (cond
+   ;; A list of tags
+   ((and (listp something)
+	 (semantic-tag-p (car something)))
+    something)
+   ;; A buffer
+   ((bufferp something)
+    (save-excursion
+      (set-buffer something)
+      (semantic-fetch-tags)))
+   ;; A Tag: Get that tag's buffer
+   ((and (semantic-tag-with-position-p something)
+	 (semantic-tag-in-buffer-p something))
+    (save-excursion
+      (set-buffer (semantic-tag-buffer something))
+      (semantic-fetch-tags)))
+   ;; Tag with a file name in it
+   ((and (semantic-tag-p something)
+	 (semantic-tag-file-name something)
+	 (file-exists-p (semantic-tag-file-name something)))
+    (semantic-file-tag-table
+     (semantic-tag-file-name something)))
+   ;; A file name
+   ((and (stringp something)
+	 (file-exists-p something))
+    (semantic-file-tag-table something))
+   ;; A Semanticdb table
+   ((and (featurep 'semanticdb)
+	 (semanticdb-minor-mode-p)
+	 (semanticdb-abstract-table-child-p something))
+    (semanticdb-refresh-table something)
+    (semanticdb-get-tags something))
+   ;; Semanticdb find-results
+   ((and (featurep 'semanticdb)
+	 (semanticdb-minor-mode-p)
+	 (semanticdb-find-results-p something))
+    (semanticdb-strip-find-results something))
+   ;; NOTE: This commented out since if a search result returns
+   ;;       empty, that empty would turn into everything on the next search.
+   ;; Use the current buffer for nil
+;;   ((null something)
+;;    (semantic-fetch-tags))
+   ;; don't know what it is
+   (t nil)))
+
+(semantic-alias-obsolete 'semantic-something-to-stream
+			 'semantic-something-to-tag-table)
+
+;;; Recursive searching through dependency trees
+;;
+;; This will depend on the general searching APIS defined above.
+;; but will add full recursion through the dependencies list per
+;; stream.
+(defun semantic-recursive-find-nonterminal-by-name (name buffer)
+  "Recursively find the first occurrence of NAME.
+Start search with BUFFER.  Recurse through all dependencies till found.
+The return item is of the form (BUFFER TOKEN) where BUFFER is the buffer
+in which TOKEN (the token found to match NAME) was found.
+
+THIS ISN'T USED IN SEMANTIC.  DELETE ME SOON."
+  (save-excursion
+    (set-buffer buffer)
+    (let* ((stream (semantic-fetch-tags))
+	   (includelist (or (semantic-find-tags-by-class 'include stream)
+			    "empty.silly.thing"))
+	   (found (semantic-find-first-tag-by-name name stream))
+	   (unfound nil))
+      (while (and (not found) includelist)
+	(let ((fn (semantic-dependency-tag-file (car includelist))))
+	  (if (and fn (not (member fn unfound)))
+	      (save-excursion
+		(save-match-data
+		  (set-buffer (find-file-noselect fn)))
+		(message "Scanning %s" (buffer-file-name))
+		(setq stream (semantic-fetch-tags))
+		(setq found (semantic-find-first-tag-by-name name stream))
+		(if found
+		    (setq found (cons (current-buffer) (list found)))
+		  (setq includelist
+			(append includelist
+				(semantic-find-tags-by-class
+				 'include stream))))
+		(setq unfound (cons fn unfound)))))
+	(setq includelist (cdr includelist)))
+      found)))
+(make-obsolete 'semantic-recursive-find-nonterminal-by-name
+	       "Do not use this function.")
+
+;;; Completion APIs
+;;
+;; These functions provide minibuffer reading/completion for lists of
+;; nonterminals.
+(defvar semantic-read-symbol-history nil
+  "History for a symbol read.")
+
+(defun semantic-read-symbol (prompt &optional default stream filter)
+  "Read a symbol name from the user for the current buffer.
+PROMPT is the prompt to use.
+Optional arguments:
+DEFAULT is the default choice.  If no default is given, one is read
+from under point.
+STREAM is the list of tokens to complete from.
+FILTER is provides a filter on the types of things to complete.
+FILTER must be a function to call on each element."
+  (if (not default) (setq default (thing-at-point 'symbol)))
+  (if (not stream) (setq stream (semantic-fetch-tags)))
+  (setq stream
+	(if filter
+	    (semantic--find-tags-by-function filter stream)
+	  (semantic-brute-find-tag-standard stream)))
+  (if (and default (string-match ":" prompt))
+      (setq prompt
+	    (concat (substring prompt 0 (match-end 0))
+		    " (default: " default ") ")))
+  (completing-read prompt stream nil t ""
+		   'semantic-read-symbol-history
+		   default))
+
+(defun semantic-read-variable (prompt &optional default stream)
+  "Read a variable name from the user for the current buffer.
+PROMPT is the prompt to use.
+Optional arguments:
+DEFAULT is the default choice.  If no default is given, one is read
+from under point.
+STREAM is the list of tokens to complete from."
+  (semantic-read-symbol
+   prompt default
+   (or (semantic-find-tags-by-class
+	'variable (or stream (current-buffer)))
+       (error "No local variables"))))
+
+(defun semantic-read-function (prompt &optional default stream)
+  "Read a function name from the user for the current buffer.
+PROMPT is the prompt to use.
+Optional arguments:
+DEFAULT is the default choice.  If no default is given, one is read
+from under point.
+STREAM is the list of tags to complete from."
+  (semantic-read-symbol
+   prompt default
+   (or (semantic-find-tags-by-class
+	'function (or stream (current-buffer)))
+       (error "No local functions"))))
+
+(defun semantic-read-type (prompt &optional default stream)
+  "Read a type name from the user for the current buffer.
+PROMPT is the prompt to use.
+Optional arguments:
+DEFAULT is the default choice.  If no default is given, one is read
+from under point.
+STREAM is the list of tags to complete from."
+  (semantic-read-symbol
+   prompt default
+   (or (semantic-find-tags-by-class
+	'type (or stream (current-buffer)))
+       (error "No local types"))))
+
+
+;;; Interactive Functions for
+;;
+(defun semantic-describe-tag (&optional tag)
+  "Describe TAG in the minibuffer.
+If TAG is nil, describe the tag under the cursor."
+  (interactive)
+  (if (not tag) (setq tag (semantic-current-tag)))
+  (semantic-fetch-tags)
+  (if tag (message (semantic-format-tag-summarize tag))))
+
+
+;;; Putting keys on tags.
+;;
+(defun semantic-add-label (label value &optional tag)
+  "Add a LABEL with VALUE on TAG.
+If TAG is not specified, use the tag at point."
+  (interactive "sLabel: \nXValue (eval): ")
+  (if (not tag)
+      (progn
+	(semantic-fetch-tags)
+	(setq tag (semantic-current-tag))))
+  (semantic--tag-put-property tag (intern label) value)
+  (message "Added label %s with value %S" label value))
+
+(defun semantic-show-label (label &optional tag)
+  "Show the value of LABEL on TAG.
+If TAG is not specified, use the tag at point."
+  (interactive "sLabel: ")
+  (if (not tag)
+      (progn
+	(semantic-fetch-tags)
+	(setq tag (semantic-current-tag))))
+  (message "%s: %S" label (semantic--tag-get-property tag (intern label))))
+
+
+;;; Hacks
+;;
+;; Some hacks to help me test these functions
+(defun semantic-describe-buffer-var-helper (varsym buffer)
+  "Display to standard out the value of VARSYM in BUFFER."
+  (let ((value (save-excursion
+		 (set-buffer buffer)
+		 (symbol-value varsym))))
+    (cond
+     ((and (consp value)
+	   (< (length value) 10))
+      ;; Draw the list of things in the list.
+      (princ (format "  %s:  #<list of %d items>\n"
+		     varsym (length value)))
+      (data-debug-insert-stuff-list
+       value "    " )
+      )
+     (t
+      ;; Else do a one-liner.
+      (data-debug-insert-thing
+       value " " (concat " " (symbol-name varsym) ": "))
+      ))))
+
+(defun semantic-describe-buffer ()
+  "Describe the semantic environment for the current buffer."
+  (interactive)
+  (let ((buff (current-buffer))
+	)
+
+    (with-output-to-temp-buffer (help-buffer)
+      (help-setup-xref (list #'semantic-describe-buffer) (interactive-p))
+      (with-current-buffer standard-output
+	(princ "Semantic Configuration in ")
+	(princ (buffer-name buff))
+	(princ "\n\n")
+
+	(princ "Buffer specific configuration items:\n")
+	(let ((vars '(major-mode
+		      semantic-case-fold
+		      semantic-expand-nonterminal
+		      semantic-parser-name
+		      semantic-parse-tree-state
+		      semantic-lex-analyzer
+		      semantic-lex-reset-hooks
+		      )))
+	  (dolist (V vars)
+	    (semantic-describe-buffer-var-helper V buff)))
+
+	(princ "\nGeneral configuration items:\n")
+	(let ((vars '(semantic-inhibit-functions
+		      semantic-init-hook
+		      semantic-init-db-hook
+		      semantic-unmatched-syntax-hook
+		      semantic--before-fetch-tags-hook
+		      semantic-after-toplevel-bovinate-hook
+		      semantic-after-toplevel-cache-change-hook
+		      semantic-before-toplevel-cache-flush-hook
+		      semantic-dump-parse
+
+		      )))
+	  (dolist (V vars)
+	    (semantic-describe-buffer-var-helper V buff)))
+
+	(princ "\n\n")
+	(mode-local-describe-bindings-2 buff)
+	)))
+  )
+
+(defun semantic-current-tag-interactive (p)
+  "Display the current token.
+Argument P is the point to search from in the current buffer."
+  (interactive "d")
+  (let ((tok (semantic-brute-find-innermost-tag-by-position
+	      p (current-buffer))))
+    (message (mapconcat 'semantic-abbreviate-nonterminal tok ","))
+    (car tok))
+  )
+
+(defun semantic-hack-search ()
+  "Display info about something under the cursor using generic methods."
+  (interactive)
+  (let (
+	;(name (thing-at-point 'symbol))
+	(strm (cdr (semantic-fetch-tags)))
+	(res nil))
+;    (if name
+	(setq res
+;	      (semantic-find-nonterminal-by-name name strm)
+;	      (semantic-find-nonterminal-by-type name strm)
+;	      (semantic-recursive-find-nonterminal-by-name name (current-buffer))
+	      (semantic-brute-find-tag-by-position (point) strm)
+
+	      )
+;	)
+    (if res
+	(progn
+	  (pop-to-buffer "*SEMANTIC HACK RESULTS*")
+	  (require 'pp)
+	  (erase-buffer)
+	  (insert (pp-to-string res) "\n")
+	  (goto-char (point-min))
+	  (shrink-window-if-larger-than-buffer))
+      (message "nil"))))
+
+(defun semantic-assert-valid-token (tok)
+  "Assert that TOK is a valid token."
+  (if (semantic-tag-p tok)
+      (if (semantic-tag-with-position-p tok)
+	  (let ((o  (semantic-tag-overlay tok)))
+	    (if (and (semantic-overlay-p o)
+		     (not (semantic-overlay-live-p o)))
+		(let ((debug-on-error t))
+		  (error "Tag %s is invalid!" (semantic-tag-name tok)))
+	      ;; else, tag is OK.
+	      ))
+	;; Positionless tags are also ok.
+	)
+    (let ((debug-on-error t))
+      (error "Not a semantic tag: %S" tok))))
+
+(defun semantic-sanity-check (&optional cache over notfirst)
+  "Perform a sanity check on the current buffer.
+The buffer's set of overlays, and those overlays found via the cache
+are verified against each other.
+CACHE, and OVER are the semantic cache, and the overlay list.
+NOTFIRST indicates that this was not the first call in the recursive use."
+  (interactive)
+  (if (and (not cache) (not over) (not notfirst))
+      (setq cache semantic--buffer-cache
+	    over (semantic-overlays-in (point-min) (point-max))))
+  (while cache
+    (let ((chil (semantic-tag-components-with-overlays (car cache))))
+      (if (not (memq (semantic-tag-overlay (car cache)) over))
+	  (message "Tag %s not in buffer overlay list."
+		   (semantic-format-tag-concise-prototype (car cache))))
+      (setq over (delq (semantic-tag-overlay (car cache)) over))
+      (setq over (semantic-sanity-check chil over t))
+      (setq cache (cdr cache))))
+  (if (not notfirst)
+      ;; Strip out all overlays which aren't semantic overlays
+      (let ((o nil))
+	(while over
+	  (when (and (semantic-overlay-get (car over) 'semantic)
+		     (not (eq (semantic-overlay-get (car over) 'semantic)
+			      'unmatched)))
+	    (setq o (cons (car over) o)))
+	  (setq over (cdr over)))
+	(message "Remaining overlays: %S" o)))
+  over)
+
+(provide 'semantic-util)
+
+;;; Minor modes
+;;
+(require 'semantic-util-modes)
+
+;;; semantic-util.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semantic.el b/site/cedet-1.0pre7/semantic/semantic.el
new file mode 100755
index 0000000..c5d1bf8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semantic.el
@@ -0,0 +1,838 @@
+;;; semantic.el --- Semantic buffer evaluator.
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: semantic.el,v 1.215 2009/09/29 01:32:16 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; API for providing the semantic content of a buffer.
+;;
+;; The semantic API provides an interface to a series of different parser
+;; implementations.  Each parser outputs a parse tree in a similar format
+;; designed to handle typical functional and object oriented languages.
+
+(eval-and-compile
+  ;; Other package depend on this value at compile time via inversion.
+  (defvar semantic-version "2.0pre7"
+    "Current version of Semantic."))
+
+(require 'working)
+(require 'assoc)
+(require 'semantic-tag)
+(require 'semantic-lex)
+(require 'inversion)
+
+(defun semantic-require-version (major minor &optional beta)
+  "Non-nil if this version of semantic does not satisfy a specific version.
+Arguments can be:
+
+  (MAJOR MINOR &optional BETA)
+
+  Values MAJOR and MINOR must be integers.  BETA can be an integer, or
+excluded if a released version is required.
+
+It is assumed that if the current version is newer than that specified,
+everything passes.  Exceptions occur when known incompatibilities are
+introduced."
+  (inversion-test 'semantic
+		  (concat major "." minor
+			  (when beta (concat "beta" beta)))))
+
+(defgroup semantic nil
+  "Parser Generator and parser framework."
+  :group 'lisp)
+
+(defgroup semantic-faces nil
+  "Faces used for Semantic enabled tools."
+  :group 'semantic)
+
+(require 'semantic-fw)
+
+;;; Code:
+;;
+
+;;; Variables and Configuration
+;;
+(defvar semantic--parse-table nil
+  "Variable that defines how to parse top level items in a buffer.
+This variable is for internal use only, and its content depends on the
+external parser used.")
+(make-variable-buffer-local 'semantic--parse-table)
+(semantic-varalias-obsolete 'semantic-toplevel-bovine-table
+			    'semantic--parse-table)
+
+(defvar semantic-symbol->name-assoc-list
+  '((type     . "Types")
+    (variable . "Variables")
+    (function . "Functions")
+    (include  . "Dependencies")
+    (package  . "Provides"))
+  "Association between symbols returned, and a string.
+The string is used to represent a group of objects of the given type.
+It is sometimes useful for a language to use a different string
+in place of the default, even though that language will still
+return a symbol.  For example, Java return's includes, but the
+string can be replaced with `Imports'.")
+(make-variable-buffer-local 'semantic-symbol->name-assoc-list)
+
+(defvar semantic-symbol->name-assoc-list-for-type-parts nil
+  "Like `semantic-symbol->name-assoc-list' for type parts.
+Some tags that have children (see `semantic-tag-children-compatibility')
+will want to define the names of classes of tags differently than at
+the top level.  For example, in C++, a Function may be called a
+Method.  In addition, there may be new types of tags that exist only
+in classes, such as protection labels.")
+(make-variable-buffer-local 'semantic-symbol->name-assoc-list-for-type-parts)
+
+(defvar semantic-case-fold nil
+  "Value for `case-fold-search' when parsing.")
+(make-variable-buffer-local 'semantic-case-fold)
+
+(defvar semantic-expand-nonterminal nil
+  "Function to call for each nonterminal production.
+Return a list of non-terminals derived from the first argument, or nil
+if it does not need to be expanded.
+Languages with compound definitions should use this function to expand
+from one compound symbol into several.  For example, in C the definition
+  int a, b;
+is easily parsed into one tag.  This function should take this
+compound tag and turn it into two tags, one for A, and the other for B.")
+(make-variable-buffer-local 'semantic-expand-nonterminal)
+
+(defvar semantic--buffer-cache nil
+  "A cache of the fully parsed buffer.
+If no significant changes have been made (based on the state) then
+this is returned instead of re-parsing the buffer.
+
+  DO NOT USE THIS VARIABLE IN PROGRAMS.
+
+If you need a tag list, use `semantic-fetch-tags'.  If you need the
+cached values for some reason, chances are you can, add a hook to
+`semantic-after-toplevel-cache-change-hook'.")
+(make-variable-buffer-local 'semantic--buffer-cache)
+(semantic-varalias-obsolete 'semantic-toplevel-bovine-cache
+			    'semantic--buffer-cache)
+
+(defvar semantic-unmatched-syntax-cache nil
+  "A cached copy of unmatched syntax tokens.")
+(make-variable-buffer-local 'semantic-unmatched-syntax-cache)
+
+(defvar semantic-unmatched-syntax-cache-check nil
+  "Non nil if the unmatched syntax cache is out of date.
+This is tracked with `semantic-change-function'.")
+(make-variable-buffer-local 'semantic-unmatched-syntax-cache-check)
+
+(defvar semantic-edits-are-safe nil
+  "When non-nil, modifications do not require a reparse.
+This prevents tags from being marked dirty, and it prevents top level
+edits from causing a cache check.
+Use this when writing programs that could cause a full reparse, but
+will not change the tag structure, such as adding or updating
+`top-level' comments.")
+
+(defvar semantic-unmatched-syntax-hook nil
+  "Hooks run when semantic detects syntax not matched in a grammar.
+Each individual piece of syntax (such as a symbol or punctuation
+character) is called with this hook when it doesn't match in the
+grammar, and multiple unmatched syntax elements are not grouped
+together.  Each hook is called with one argument, which is a list of
+syntax tokens created by the semantic lexer.  Use the functions
+`semantic-lex-token-start', `semantic-lex-token-end' and
+`semantic-lex-token-text' to get information about these tokens.  The
+current buffer is the buffer these tokens are derived from.")
+
+(defvar semantic--before-fetch-tags-hook nil
+  "Hooks run before a buffer is parses for tags.
+It is called before any request for tags is made via the function
+`semantic-fetch-tags' by an application.
+If any hook returns a nil value, the cached value is returned
+immediately, even if it is empty.")
+(semantic-varalias-obsolete 'semantic-before-toplevel-bovination-hook
+			    'semantic--before-fetch-tags-hook)
+
+(defvar semantic-after-toplevel-bovinate-hook nil
+  "Hooks run after a toplevel parse.
+It is not run if the toplevel parse command is called, and buffer does
+not need to be fully reparsed.
+For language specific hooks, make sure you define this as a local hook.
+
+This hook should not be used any more.
+Use `semantic-after-toplevel-cache-change-hook' instead.")
+(make-obsolete-variable 'semantic-after-toplevel-bovinate-hook nil)
+
+(defvar semantic-after-toplevel-cache-change-hook nil
+  "Hooks run after the buffer tag list has changed.
+This list will change when a buffer is reparsed, or when the tag list
+in a buffer is cleared.  It is *NOT* called if the current tag list is
+partially reparsed.
+
+Hook functions must take one argument, which is the new list of tags
+associated with this buffer.
+
+For language specific hooks, make sure you define this as a local hook.")
+
+(defvar semantic-before-toplevel-cache-flush-hook nil
+  "Hooks run before the toplevel tag cache is flushed.
+For language specific hooks, make sure you define this as a local
+hook.  This hook is called before a corresponding
+`semantic-after-toplevel-cache-change-hook' which is also called
+during a flush when the cache is given a new value of nil.")
+
+(defcustom semantic-dump-parse nil
+  "When non-nil, dump parsing information."
+  :group 'semantic
+  :type 'boolean)
+
+(defvar semantic-parser-name "LL"
+  "Optional name of the parser used to parse input stream.")
+(make-variable-buffer-local 'semantic-parser-name)
+
+;;; Parse tree state management API
+;;
+(defvar semantic-parse-tree-state 'needs-rebuild
+  "State of the current parse tree.")
+(make-variable-buffer-local 'semantic-parse-tree-state)
+
+(defmacro semantic-parse-tree-unparseable ()
+  "Indicate that the current buffer is unparseable.
+It is also true that the parse tree will need either updating or
+a rebuild.  This state will be changed when the user edits the buffer."
+  `(setq semantic-parse-tree-state 'unparseable))
+
+(defmacro semantic-parse-tree-unparseable-p ()
+  "Return non-nil if the current buffer has been marked unparseable."
+  `(eq semantic-parse-tree-state 'unparseable))
+
+(defmacro semantic-parse-tree-set-needs-update ()
+  "Indicate that the current parse tree needs to be updated.
+The parse tree can be updated by `semantic-parse-changes'."
+  `(setq semantic-parse-tree-state 'needs-update))
+
+(defmacro semantic-parse-tree-needs-update-p ()
+  "Return non-nil if the current parse tree needs to be updated."
+  `(eq semantic-parse-tree-state 'needs-update))
+
+(defmacro semantic-parse-tree-set-needs-rebuild ()
+  "Indicate that the current parse tree needs to be rebuilt.
+The parse tree must be rebuilt by `semantic-parse-region'."
+  `(setq semantic-parse-tree-state 'needs-rebuild))
+
+(defmacro semantic-parse-tree-needs-rebuild-p ()
+  "Return non-nil if the current parse tree needs to be rebuilt."
+  `(eq semantic-parse-tree-state 'needs-rebuild))
+
+(defmacro semantic-parse-tree-set-up-to-date ()
+  "Indicate that the current parse tree is up to date."
+  `(setq semantic-parse-tree-state nil))
+
+(defmacro semantic-parse-tree-up-to-date-p ()
+  "Return non-nil if the current parse tree is up to date."
+  `(null semantic-parse-tree-state))
+
+;;; Interfacing with the system
+;;
+(defcustom semantic-inhibit-functions nil
+  "List of functions to call with no arguments before Semantic is setup.
+If any of these functions returns non-nil, the current buffer is not
+setup to use Semantic."
+  :group 'semantic
+  :type 'hook)
+
+(defvar semantic-init-hook nil
+  "Hook run when a buffer is initialized with a parsing table.")
+
+(defvar semantic-init-mode-hook nil
+  "Hook run when a buffer of a particular mode is initialized.")
+(make-variable-buffer-local 'semantic-init-mode-hook)
+
+(defvar semantic-init-db-hook nil
+  "Hook run when a buffer is initialized with a parsing table for DBs.
+This hook is for database functions which intend to swap in a tag table.
+This guarantees that the DB will go before other modes that require
+a parse of the buffer.")
+
+(semantic-varalias-obsolete 'semantic-init-hooks
+                          'semantic-init-hook)
+(semantic-varalias-obsolete 'semantic-init-mode-hooks
+                          'semantic-init-mode-hook)
+(semantic-varalias-obsolete 'semantic-init-db-hooks
+                          'semantic-init-db-hook)
+
+(defvar semantic-new-buffer-fcn-was-run nil
+  "Non nil after `semantic-new-buffer-fcn' has been executed.")
+(make-variable-buffer-local 'semantic-new-buffer-fcn-was-run)
+
+(defsubst semantic-active-p ()
+  "Return non-nil if the current buffer was set up for parsing."
+  semantic-new-buffer-fcn-was-run)
+
+(defsubst semantic--umatched-syntax-needs-refresh-p  ()
+  "Return non-nil if the unmatched syntax cache needs a refresh.
+That is if it is dirty or if the current parse tree isn't up to date."
+  (or semantic-unmatched-syntax-cache-check
+      (not (semantic-parse-tree-up-to-date-p))))
+
+(defun semantic-new-buffer-fcn ()
+  "Setup the current buffer to use Semantic.
+If the major mode is ready for Semantic, and no
+`semantic-inhibit-functions' disabled it, the current buffer is setup
+to use Semantic, and `semantic-init-hook' is run."
+  ;; Do stuff if semantic was activated by a mode hook in this buffer,
+  ;; and not afterwards disabled.
+  (when (and semantic--parse-table
+             (not (semantic-active-p))
+             (not (run-hook-with-args-until-success
+                   'semantic-inhibit-functions)))
+    ;; Make sure that if this buffer is cloned, our tags and overlays
+    ;; don't go along for the ride.
+    (add-hook 'clone-indirect-buffer-hook 'semantic-clear-toplevel-cache
+	      nil t)
+    ;; Specify that this function has done it's work.  At this point
+    ;; we can consider that semantic is active in this buffer.
+    (setq semantic-new-buffer-fcn-was-run t)
+    ;; Here are some buffer local variables we can initialize ourselves
+    ;; of a mode does not choose to do so.
+    (semantic-lex-init)
+    ;; Force this buffer to have its cache refreshed.
+    (semantic-clear-toplevel-cache)
+    ;; Call DB hooks before regular init hooks
+    (run-hooks 'semantic-init-db-hook)
+    ;; Set up semantic modes
+    (run-hooks 'semantic-init-hook)
+    ;; Set up major-mode specific semantic modes
+    (run-hooks 'semantic-init-mode-hook)
+    ))
+
+(add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
+
+;; Test the above hook.
+;;(add-hook 'semantic-init-hook (lambda () (message "init for semantic")))
+
+(defun semantic-fetch-tags-fast ()
+  "For use in a hook.  When only a partial reparse is needed, reparse."
+  (condition-case nil
+      (if (semantic-parse-tree-needs-update-p)
+	  (semantic-fetch-tags))
+    (error nil))
+  semantic--buffer-cache)
+
+(if (boundp 'eval-defun-hooks)
+    (add-hook 'eval-defun-hooks 'semantic-fetch-tags-fast))
+
+;;; Parsing Commands
+;;
+(eval-when-compile
+  (condition-case nil (require 'pp) (error nil)))
+
+(defvar semantic-edebug nil
+  "When non-nil, activate the interactive parsing debugger.
+Do not set this yourself.  Call `semantic-debug'.")
+
+(defun semantic-elapsed-time (start end)
+  "Copied from elp.el.  Was elp-elapsed-time.
+Argument START and END bound the time being calculated."
+  (+ (* (- (car end) (car start)) 65536.0)
+     (- (car (cdr end)) (car (cdr start)))
+     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+
+(defun bovinate (&optional clear)
+  "Parse the current buffer.  Show output in a temp buffer.
+Optional argument CLEAR will clear the cache before parsing.
+If CLEAR is negative, it will do a full reparse, and also not display
+the output buffer."
+  (interactive "P")
+  (if clear (semantic-clear-toplevel-cache))
+  (if (eq clear '-) (setq clear -1))
+  (let* ((start (current-time))
+	 (out (semantic-fetch-tags))
+	 (end (current-time)))
+    (message "Retrieving tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (when (or (null clear) (not (listp clear)))
+      (pop-to-buffer "*Parser Output*")
+      (require 'pp)
+      (erase-buffer)
+      (insert (pp-to-string out))
+      (goto-char (point-min)))))
+
+;;; Functions of the parser plug-in API
+;;
+;; Overload these functions to create new types of parsers.
+;;
+(define-overloadable-function semantic-parse-stream (stream nonterminal)
+  "Parse STREAM, starting at the first NONTERMINAL rule.
+For bovine and wisent based parsers, STREAM is from the output of
+`semantic-lex', and NONTERMINAL is a rule in the apropriate language
+specific rules file.
+The default parser table used for bovine or wisent based parsers is
+`semantic--parse-table'.
+
+Must return a list: (STREAM TAGS) where STREAM is the unused elements
+from STREAM, and TAGS is the list of semantic tags found, usually only
+one tag is returned with the exception of compound statements")
+
+(define-overloadable-function semantic-parse-changes ()
+  "Reparse changes in the current buffer.
+The list of changes are tracked as a series of overlays in the buffer.
+When overloading this function, use `semantic-changes-in-region' to
+analyze.")
+
+(define-overloadable-function semantic-parse-region
+  (start end &optional nonterminal depth returnonerror)
+  "Parse the area between START and END, and return any tags found.
+If END needs to be extended due to a lexical token being too large, it
+will be silently ignored.
+
+Optional arguments:
+NONTERMINAL is the rule to start parsing at.
+DEPTH specifies the lexical depth to decend for parser that use
+lexical analysis as their first step.
+RETURNONERROR specifies that parsing should stop on the first
+unmatched syntax encountered.  When nil, parsing skips the syntax,
+adding it to the unmatched syntax cache.
+
+Must return a list of semantic tags wich have been cooked
+\(repositioned properly) but which DO NOT HAVE OVERLAYS associated
+with them.  When overloading this function, use `semantic--tag-expand'
+to cook raw tags.")
+
+;;;###autoload
+(defun semantic-parse-region-default
+  (start end &optional nonterminal depth returnonerror)
+  "Parse the area between START and END, and return any tags found.
+If END needs to be extended due to a lexical token being too large, it
+will be silently ignored.
+Optional arguments:
+NONTERMINAL is the rule to start parsing at if it is known.
+DEPTH specifies the lexical depth to scan.
+RETURNONERROR specifies that parsing should end when encountering
+unterminated syntax."
+  (when (or (null semantic--parse-table) (eq semantic--parse-table t))
+    ;; If there is no table, or it was set to t, then we are here by
+    ;; some other mistake.  Do not throw an error deep in the parser.
+    (error "No support found to parse buffer %S" (buffer-name)))
+  (save-restriction
+    (widen)
+    (when (or (< end start) (> end (point-max)))
+      (error "Invalid parse region bounds %S, %S" start end))
+    (nreverse
+     (semantic-repeat-parse-whole-stream
+      (or (cdr (assq start semantic-lex-block-streams))
+	  (semantic-lex start end depth))
+      nonterminal returnonerror))))
+
+;;; Parsing functions
+;;
+(defun semantic-set-unmatched-syntax-cache (unmatched-syntax)
+  "Set the unmatched syntax cache.
+Argument UNMATCHED-SYNTAX is the syntax to set into the cache."
+  ;; This function is not actually called by the main parse loop.
+  ;; This is intended for use by semanticdb.
+  (setq semantic-unmatched-syntax-cache unmatched-syntax
+	semantic-unmatched-syntax-cache-check nil)
+    ;; Refresh the display of unmatched syntax tokens if enabled
+  (run-hook-with-args 'semantic-unmatched-syntax-hook
+                      semantic-unmatched-syntax-cache))
+
+(defun semantic-clear-unmatched-syntax-cache ()
+  "Clear the cache of unmatched syntax tokens."
+  (setq semantic-unmatched-syntax-cache nil
+        semantic-unmatched-syntax-cache-check t))
+
+(defun semantic-unmatched-syntax-tokens ()
+  "Return the list of unmatched syntax tokens."
+  ;; If the cache need refresh then do a full re-parse.
+  (if (semantic--umatched-syntax-needs-refresh-p)
+      ;; To avoid a recursive call, temporarily disable
+      ;; `semantic-unmatched-syntax-hook'.
+      (let (semantic-unmatched-syntax-hook)
+        (condition-case nil
+            (progn
+              (semantic-clear-toplevel-cache)
+              (semantic-fetch-tags))
+          (quit
+           (message "semantic-unmatched-syntax-tokens:\
+ parsing of buffer canceled"))
+          )))
+    semantic-unmatched-syntax-cache)
+
+(defun semantic-clear-toplevel-cache ()
+  "Clear the toplevel tag cache for the current buffer.
+Clearing the cache will force a complete reparse next time a tag list
+is requested."
+  (interactive)
+  (run-hooks 'semantic-before-toplevel-cache-flush-hook)
+  (setq semantic--buffer-cache nil)
+  (semantic-clear-unmatched-syntax-cache)
+  (semantic-clear-parser-warnings)
+  ;; Nuke all semantic overlays.  This is faster than deleting based
+  ;; on our data structure.
+  (let ((l (semantic-overlay-lists)))
+    (mapc 'semantic-delete-overlay-maybe (car l))
+    (mapc 'semantic-delete-overlay-maybe (cdr l))
+    )
+  (semantic-parse-tree-set-needs-rebuild)
+  ;; Remove this hook which tracks if a buffer is up to date or not.
+  (remove-hook 'after-change-functions 'semantic-change-function t)
+  ;; Old model.  Delete someday.
+  ;;(run-hooks 'semantic-after-toplevel-bovinate-hook)
+
+  (run-hook-with-args 'semantic-after-toplevel-cache-change-hook
+		      semantic--buffer-cache)
+  )
+
+(defun semantic--set-buffer-cache (tagtable)
+  "Set the toplevel cache cache to TAGTABLE."
+  (setq semantic--buffer-cache tagtable
+        semantic-unmatched-syntax-cache-check nil
+	;; This is specific to the bovine parser.
+        semantic-bovinate-nonterminal-check-obarray nil)
+  (semantic-parse-tree-set-up-to-date)
+  (semantic-make-local-hook 'after-change-functions)
+  (add-hook 'after-change-functions 'semantic-change-function nil t)
+  (run-hook-with-args 'semantic-after-toplevel-cache-change-hook
+		      semantic--buffer-cache)
+  ;; Refresh the display of unmatched syntax tokens if enabled
+  (run-hook-with-args 'semantic-unmatched-syntax-hook
+                      semantic-unmatched-syntax-cache)
+  ;; Old Semantic 1.3 hook API.  Maybe useful forever?
+  (run-hooks 'semantic-after-toplevel-bovinate-hook)
+  )
+
+(defvar semantic-working-type 'percent
+  "*The type of working message to use when parsing.
+'percent means we are doing a linear parse through the buffer.
+'dynamic means we are reparsing specific tags.")
+(semantic-varalias-obsolete 'semantic-bovination-working-type
+			    'semantic-working-type)
+
+(defvar semantic-minimum-working-buffer-size (* 1024 5)
+  "*The minimum size of a buffer before working messages are displayed.
+Buffers smaller than will parse silently.
+Bufferse larger than this will display the working progress bar.")
+
+(defsubst semantic-parser-working-message (&optional arg)
+  "Return the message string displayed while parsing.
+If optional argument ARG is non-nil it is appended to the message
+string.  See also the function `working-status-forms'."
+  (if semantic-parser-name
+      (format "%s/%s" semantic-parser-name (or arg ""))
+    (format "%s" (or arg ""))))
+
+;;; Application Parser Entry Points
+;;
+;; The best way to call the parser from programs is via
+;; `semantic-fetch-tags'.  This, in turn, uses other internal
+;; API functions which plug-in parsers can take advantage of.
+
+;;;###autoload
+(defun semantic-fetch-tags ()
+  "Fetch semantic tags from the current buffer.
+If the buffer cache is up to date, return that.
+If the buffer cache is out of date, attempt an incremental reparse.
+If the buffer has not been parsed before, or if the incremental reparse
+fails, then parse the entire buffer.
+If a lexcial error had been previously discovered and the buffer
+was marked unparseable, then do nothing, and return the cache."
+  (and
+   ;; Is this a semantic enabled buffer?
+   (semantic-active-p)
+   ;; Application hooks say the buffer is safe for parsing
+   (run-hook-with-args-until-failure
+    'semantic-before-toplevel-bovination-hook)
+   (run-hook-with-args-until-failure
+    'semantic--before-fetch-tags-hook)
+   ;; If the buffer was previously marked unparseable,
+   ;; then don't waste our time.
+   (not (semantic-parse-tree-unparseable-p))
+   ;; The parse tree actually needs to be refreshed
+   (not (semantic-parse-tree-up-to-date-p))
+   ;; So do it!
+   (let* ((gc-cons-threshold (max gc-cons-threshold 10000000))
+          (semantic-lex-block-streams nil)
+          (res nil))
+     (garbage-collect)
+     (cond
+
+;;;; Try the incremental parser to do a fast update.
+     ((semantic-parse-tree-needs-update-p)
+      (setq res (semantic-parse-changes))
+      (if (semantic-parse-tree-needs-rebuild-p)
+          ;; If the partial reparse fails, jump to a full reparse.
+          (semantic-fetch-tags)
+        ;; Clear the cache of unmatched syntax tokens
+        ;;
+        ;; NOTE TO SELF:
+        ;;
+        ;; Move this into the incremental parser.  This is a bug.
+        ;;
+        (semantic-clear-unmatched-syntax-cache)
+        (run-hook-with-args ;; Let hooks know the updated tags
+         'semantic-after-partial-cache-change-hook res))
+      )
+
+;;;; Parse the whole system.
+     ((semantic-parse-tree-needs-rebuild-p)
+      (let ((working-status-dynamic-type
+	     (if (< (point-max) semantic-minimum-working-buffer-size)
+		 nil
+	       working-status-dynamic-type))
+	    (working-status-percentage-type
+	     (if (< (point-max) semantic-minimum-working-buffer-size)
+		 nil
+	       working-status-percentage-type))
+	    )
+	(working-status-forms
+	    (semantic-parser-working-message (buffer-name)) "done"
+	  (setq res (semantic-parse-region (point-min) (point-max)))
+	  (working-status t)))
+      ;; Clear the caches when we see there were no errors.
+      ;; But preserve the unmatched syntax cache and warnings!
+      (let (semantic-unmatched-syntax-cache
+	    semantic-unmatched-syntax-cache-check
+	    semantic-parser-warnings)
+	(semantic-clear-toplevel-cache))
+      ;; Set up the new overlays
+      (semantic--tag-link-list-to-buffer res)
+      ;; Set up the cache with the new results
+      (semantic--set-buffer-cache res)
+      ))))
+
+  ;; Always return the current parse tree.
+  semantic--buffer-cache)
+
+;;;###autoload
+(defun semantic-refresh-tags-safe ()
+  "Refreshes the current buffer's tags safely.
+
+Return non-nil if the refresh was successful.
+Return nil if there is some sort of syntax error preventing a reparse.
+
+Does nothing if the current buffer doesn't need reparsing."
+
+  ;; These checks actually occur in `semantic-fetch-tags', but if we
+  ;; do them here, then all the bovination hooks are not run, and
+  ;; we save lots of time.
+  (cond
+   ;; If the buffer was previously marked unparseable,
+   ;; then don't waste our time.
+   ((semantic-parse-tree-unparseable-p)
+    nil)
+   ;; The parse tree is already ok.
+   ((semantic-parse-tree-up-to-date-p)
+    t)
+   (t
+    (let* ((inhibit-quit nil)
+	   (lexically-safe t)
+	   )
+
+      (unwind-protect
+	  ;; Perform the parsing.
+	  (progn
+	    (when (semantic-lex-catch-errors safe-refresh
+		    (save-excursion (semantic-fetch-tags))
+		    nil)
+	      ;; If we are here, it is because the lexical step failed,
+	      ;; proably due to unterminated lists or something like that.
+
+	      ;; We do nothing, and just wait for the next idle timer
+	      ;; to go off.  In the meantime, remember this, and make sure
+	      ;; no other idle services can get executed.
+	      (setq lexically-safe nil))
+	    )
+	)
+      ;; Return if we are lexically safe
+      lexically-safe))))
+
+;;;###autoload
+(defun semantic-bovinate-toplevel (&optional ignored)
+  "Backward Compatibility Function."
+  (semantic-fetch-tags))
+;;;###autoload
+(make-obsolete 'semantic-bovinate-toplevel 'semantic-fetch-tags)
+
+;; Another approach is to let Emacs call the parser on idle time, when
+;; needed, use `semantic-fetch-available-tags' to only retrieve
+;; available tags, and setup the `semantic-after-*-hook' hooks to
+;; synchronize with new tags when they become available.
+
+;;;###autoload
+(defsubst semantic-fetch-available-tags ()
+  "Fetch available semantic tags from the current buffer.
+That is, return tags currently in the cache without parsing the
+current buffer.
+Parse operations happen asynchronously when needed on Emacs idle time.
+Use the `semantic-after-toplevel-cache-change-hook' and
+`semantic-after-partial-cache-change-hook' hooks to synchronize with
+new tags when they become available."
+  semantic--buffer-cache)
+
+;;; Iterative parser helper function
+;;
+;; Iterative parsers are better than rule-based iterative functions
+;; in that they can handle obscure errors more cleanly.
+;;
+;; `semantic-repeat-parse-whole-stream' abstracts this action for
+;; other parser centric routines.
+;;
+(defun semantic-repeat-parse-whole-stream
+  (stream nonterm &optional returnonerror)
+  "Iteratively parse the entire stream STREAM starting with NONTERM.
+Optional argument RETURNONERROR indicates that the parser should exit
+with the current results on a parse error.
+This function returns semantic tags without overlays."
+  (let ((result nil)
+        (case-fold-search semantic-case-fold)
+        nontermsym tag)
+    (while stream
+      (setq nontermsym (semantic-parse-stream stream nonterm)
+            tag (car (cdr nontermsym)))
+      (if (not nontermsym)
+          (error "Parse error @ %d" (car (cdr (car stream)))))
+      (if (eq (car nontermsym) stream)
+	  (error "Parser error: Infinite loop?"))
+      (if tag
+          (if (car tag)
+              (setq tag (mapcar
+                         #'(lambda (tag)
+                             ;; Set the 'reparse-symbol property to
+                             ;; NONTERM unless it was already setup
+                             ;; by a tag expander
+                             (or (semantic--tag-get-property
+                                  tag 'reparse-symbol)
+                                 (semantic--tag-put-property
+                                  tag 'reparse-symbol nonterm))
+                             tag)
+                         (semantic--tag-expand tag))
+                    result (append tag result))
+            ;; No error in this case, a purposeful nil means don't
+            ;; store anything.
+            )
+        (if returnonerror
+            (setq stream nil)
+          ;; The current item in the stream didn't match, so add it to
+          ;; the list of syntax items which didn't match.
+          (setq semantic-unmatched-syntax-cache
+                (cons (car stream) semantic-unmatched-syntax-cache))
+          ))
+      ;; Designated to ignore.
+      (setq stream (car nontermsym))
+      (if stream
+          (if (eq semantic-working-type 'percent)
+              (working-status
+               (/ (* 100 (semantic-lex-token-start (car stream)))
+                  (point-max)))
+            (working-dynamic-status))))
+    result))
+
+;;; Parsing Warnings:
+;;
+;; Parsing a buffer may result in non-critical things that we should
+;; alert the user to without interrupting the normal flow.
+;;
+;; Any parser can use this API to provide a list of warnings during a
+;; parse which a user may want to investigate.
+(defvar semantic-parser-warnings nil
+  "A list of parser warnings since the last full reparse.")
+(make-variable-buffer-local 'semantic-parser-warnings)
+
+(defun semantic-clear-parser-warnings ()
+  "Clear the current list of parser warnings for this buffer."
+  (setq semantic-parser-warnings nil))
+
+(defun semantic-push-parser-warning (warning start end)
+  "Add a parser WARNING that covers text from START to END."
+  (setq semantic-parser-warnings
+	(cons (cons warning (cons start end))
+	      semantic-parser-warnings)))
+
+(defun semantic-dump-parser-warnings ()
+  "Dump any parser warnings."
+  (interactive)
+  (if semantic-parser-warnings
+      (let ((pw semantic-parser-warnings))
+	(pop-to-buffer "*Parser Warnings*")
+	(require 'pp)
+	(erase-buffer)
+	(insert (pp-to-string pw))
+	(goto-char (point-min)))
+    (message "No parser warnings.")))
+
+
+
+;;; Compatibility:
+;;
+;; Semantic 1.x parser action helper functions, used by some parsers.
+;; Please move away from these functions, and try using semantic 2.x
+;; interfaces instead.
+;;
+(defsubst semantic-bovinate-region-until-error
+  (start end nonterm &optional depth)
+  "NOTE: Use `semantic-parse-region' instead.
+
+Bovinate between START and END starting with NONTERM.
+Optional DEPTH specifies how many levels of parenthesis to enter.
+This command will parse until an error is encountered, and return
+the list of everything found until that moment.
+This is meant for finding variable definitions at the beginning of
+code blocks in methods.  If `bovine-inner-scope' can also support
+commands, use `semantic-bovinate-from-nonterminal-full'."
+  (semantic-parse-region start end nonterm depth t))
+(make-obsolete 'semantic-bovinate-region-until-error
+               'semantic-parse-region)
+
+(defsubst semantic-bovinate-from-nonterminal
+  (start end nonterm &optional depth length)
+  "Bovinate from within a nonterminal lambda from START to END.
+Argument NONTERM is the nonterminal symbol to start with.
+Optional argument DEPTH is the depth of lists to dive into.  When used
+in a `lambda' of a MATCH-LIST, there is no need to include a START and
+END part.
+Optional argument LENGTH specifies we are only interested in LENGTH
+tokens."
+  (car-safe (cdr (semantic-parse-stream
+		  (semantic-lex start end (or depth 1) length)
+		  nonterm))))
+
+(defsubst semantic-bovinate-from-nonterminal-full
+  (start end nonterm &optional depth)
+  "NOTE: Use `semantic-parse-region' instead.
+
+Bovinate from within a nonterminal lambda from START to END.
+Iterates until all the space between START and END is exhausted.
+Argument NONTERM is the nonterminal symbol to start with.
+If NONTERM is nil, use `bovine-block-toplevel'.
+Optional argument DEPTH is the depth of lists to dive into.
+When used in a `lambda' of a MATCH-LIST, there is no need to include
+a START and END part."
+  (semantic-parse-region start end nonterm (or depth 1)))
+(make-obsolete 'semantic-bovinate-from-nonterminal-full
+               'semantic-parse-region)
+
+(provide 'semantic)
+
+;; Semantic-util is a part of the semantic API.  Include it last
+;; because it depends on semantic.
+(require 'semantic-util)
+
+;;; semantic.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-debug.el b/site/cedet-1.0pre7/semantic/semanticdb-debug.el
new file mode 100644
index 0000000..a43a677
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-debug.el
@@ -0,0 +1,117 @@
+;;; semanticdb-debug.el --- Extra level debugging routines
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semanticdb-debug.el,v 1.8 2009/09/11 19:00:35 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Various routines for debugging SemanticDB issues, or viewing
+;; semanticdb state.
+
+(require 'semanticdb)
+
+;;; Code:
+;;
+;;;###autoload
+(defun semanticdb-dump-all-table-summary ()
+  "Dump a list of all databases in Emacs memory."
+  (interactive)
+  (require 'data-debug)
+  (let ((db semanticdb-database-list))
+    (data-debug-new-buffer "*SEMANTICDB*")
+    (data-debug-insert-stuff-list db "*")))
+
+;;;###autoload
+(defalias 'semanticdb-adebug-database-list 'semanticdb-dump-all-table-summary)
+
+;;;###autoload
+(defun semanticdb-adebug-current-database ()
+  "Run ADEBUG on the current database."
+  (interactive)
+  (require 'data-debug)
+  (let ((p semanticdb-current-database)
+	)
+    (data-debug-new-buffer "*SEMANTICDB ADEBUG*")
+    (data-debug-insert-stuff-list p "*")))
+
+;;;###autoload
+(defun semanticdb-adebug-current-table ()
+  "Run ADEBUG on the current database."
+  (interactive)
+  (require 'data-debug)
+  (let ((p semanticdb-current-table))
+    (data-debug-new-buffer "*SEMANTICDB ADEBUG*")
+    (data-debug-insert-stuff-list p "*")))
+
+
+;;;###autoload
+(defun semanticdb-adebug-project-database-list ()
+  "Run ADEBUG on the current database."
+  (interactive)
+  (require 'data-debug)
+  (let ((p (semanticdb-current-database-list)))
+    (data-debug-new-buffer "*SEMANTICDB ADEBUG*")
+    (data-debug-insert-stuff-list p "*")))
+
+
+
+;;; Sanity Checks
+;;
+
+;;;###autoload
+(defun semanticdb-table-oob-sanity-check (cache)
+  "Validate that CACHE tags do not have any overlays in them."
+  (while cache
+    (when (semantic-overlay-p (semantic-tag-overlay cache))
+      (message "Tag %s has an erroneous overlay!"
+	       (semantic-format-tag-summarize (car cache))))
+    (semanticdb-table-oob-sanity-check
+     (semantic-tag-components-with-overlays (car cache)))
+    (setq cache (cdr cache))))
+
+;;;###autoload
+(defun semanticdb-table-sanity-check (&optional table)
+  "Validate the current semanticdb TABLE."
+  (interactive)
+  (if (not table) (setq table semanticdb-current-table))
+  (let* ((full-filename (semanticdb-full-filename table))
+	 (buff (find-buffer-visiting full-filename)))
+    (if buff
+	(save-excursion
+	  (set-buffer buff)
+	  (semantic-sanity-check))
+      ;; We can't use the usual semantic validity check, so hack our own.
+      (semanticdb-table-oob-sanity-check (semanticdb-get-tags table)))))
+
+;;;###autoload
+(defun semanticdb-database-sanity-check ()
+  "Validate the current semantic database."
+  (interactive)
+  (let ((tables (semanticdb-get-database-tables
+		 semanticdb-current-database)))
+    (while tables
+      (semanticdb-table-sanity-check (car tables))
+      (setq tables (cdr tables)))
+    ))
+
+
+
+(provide 'semanticdb-debug)
+;;; semanticdb-debug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-ebrowse.el b/site/cedet-1.0pre7/semantic/semanticdb-ebrowse.el
new file mode 100644
index 0000000..b45dde3
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-ebrowse.el
@@ -0,0 +1,712 @@
+;;; semanticdb-ebrowse.el --- Semanticdb backend using ebrowse.
+
+;;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>, Joakim Verona
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-ebrowse.el,v 1.23 2009/09/11 19:00:04 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; This program was started by Eric Ludlam, and Joakim Verona finished
+;; the implementation by adding searches and fixing bugs.
+;;
+;; Read in custom-created ebrowse BROWSE files into a semanticdb back
+;; end.
+;;
+;; Add these databases to the 'system' search.
+;; Possibly use ebrowse for local parsing too.
+;;
+;; When real details are needed out of the tag system from ebrowse,
+;; we will need to delve into the originating source and parse those
+;; files the usual way.
+;;
+;; COMMANDS:
+;; `semanticdb-create-ebrowse-database' - Call EBROWSE to create a
+;;       system database for some directory.  In general, use this for
+;;       system libraries, such as /usr/include, or include directories
+;;       large software projects.
+;;       Customize `semanticdb-ebrowse-file-match' to make sure the correct
+;;       file extensions are matched.
+;;
+;; `semanticdb-load-ebrowse-caches' - Load all the EBROWSE caches from
+;;       your semanticdb system database directory.  Once they are
+;;       loaded, they become searchable as omnipotent databases for
+;;       all C++ files.  This is called automatically by semantic-load.
+;;       Call it a second time to refresh the Emacs DB with the file.
+;;
+
+(eval-when-compile
+  ;; For generic function searching.
+  (require 'eieio)
+  (require 'eieio-opt)
+  )
+(require 'semanticdb-file)
+
+(eval-and-compile
+  ;; Hopefully, this will allow semanticdb-ebrowse to compile under
+  ;; XEmacs, it just won't run if a user attempts to use it.
+  (condition-case nil
+      (require 'ebrowse)
+    (error nil)))
+
+;;; Code:
+(defvar semanticdb-ebrowse-default-file-name "BROWSE"
+  "The EBROWSE file name used for system caches.")
+
+(defcustom semanticdb-ebrowse-file-match "\\.\\(hh?\\|HH?\\|hpp\\)"
+  "Regular expression matching file names for ebrowse to parse.
+This expression should exclude C++ headers that have no extension.
+By default, include only headers since the semantic use of EBrowse
+is only for searching via semanticdb, and thus only headers would
+be searched."
+  :group 'semanticdb
+  :type 'string)
+
+;;; SEMANTIC Database related Code
+;;; Classes:
+(defclass semanticdb-table-ebrowse (semanticdb-table)
+  ((major-mode :initform c++-mode)
+   (ebrowse-tree :initform nil
+		 :initarg :ebrowse-tree
+		 :documentation
+		 "The raw ebrowse tree for this file."
+		 )
+   (global-extract :initform nil
+		   :initarg :global-extract
+		   :documentation
+		   "Table of ebrowse tags specific to this file.
+This table is compisited from the ebrowse *Globals* section.")
+   )
+  "A table for returning search results from ebrowse.")
+
+(defclass semanticdb-project-database-ebrowse
+  (semanticdb-project-database)
+  ((new-table-class :initform semanticdb-table-ebrowse
+		    :type class
+		    :documentation
+		    "New tables created for this database are of this class.")
+   (system-include-p :initform nil
+		     :initarg :system-include
+		     :documentation
+		     "Flag indicating this database represents a system include directory.")
+   (ebrowse-struct :initform nil
+		   :initarg :ebrowse-struct
+		   )
+   )
+  "Semantic Database deriving tags using the EBROWSE tool.
+EBROWSE is a C/C++ parser for use with `ebrowse' Emacs program.")
+
+(defun semanticdb-ebrowse-C-file-p (file)
+  "Is FILE a C or C++ file?"
+  (or (string-match semanticdb-ebrowse-file-match file)
+      (and (string-match "/\\w+$" file)
+	   (not (file-directory-p file))
+	   (let ((tmp (get-buffer-create "*semanticdb-ebrowse-tmp*")))
+	     (save-excursion
+	       (set-buffer tmp)
+	       (condition-case nil
+		   (insert-file-contents file nil 0 100 t)
+		 (error (insert-file-contents file nil nil nil t)))
+	       (goto-char (point-min))
+	       (looking-at "\\s-*/\\(\\*\\|/\\)")
+	       ))
+	   )))
+
+;;;###autoload
+(defun semanticdb-create-ebrowse-database (dir)
+  "Create an EBROSE database for directory DIR.
+The database file is stored in ~/.semanticdb, or whichever directory
+is specified by `semanticdb-default-save-directory'."
+  (interactive "DDirectory: ")
+  (setq dir (file-name-as-directory dir)) ;; for / on end
+  (let* ((savein (semanticdb-ebrowse-file-for-directory dir))
+	 (filebuff (get-buffer-create "*SEMANTICDB EBROWSE TMP*"))
+	 (files (directory-files (expand-file-name dir) t))
+	 (mma auto-mode-alist)
+	 (regexp nil)
+	 )
+    ;; Create the input to the ebrowse command
+    (save-excursion
+      (set-buffer filebuff)
+      (buffer-disable-undo filebuff)
+      (setq default-directory (expand-file-name dir))
+
+      ;;; @TODO - convert to use semanticdb-collect-matching-filenames
+      ;; to get the file names.
+
+
+      (mapc (lambda (f)
+	      (when (semanticdb-ebrowse-C-file-p f)
+		(insert f)
+		(insert "\n")))
+	    files)
+      ;; Cleanup the ebrowse output buffer.
+      (save-excursion
+	(set-buffer (get-buffer-create "*EBROWSE OUTPUT*"))
+	(erase-buffer))
+      ;; Call the EBROWSE command.
+      (message "Creating ebrowse file: %s ..." savein)
+      (call-process-region (point-min) (point-max)
+			   "ebrowse" nil "*EBROWSE OUTPUT*" nil
+			   (concat "--output-file=" savein)
+			   "--very-verbose")
+      )
+    ;; Create a short LOADER program for loading in this database.
+    (let* ((lfn (concat savein "-load.el"))
+	   (lf (find-file-noselect lfn)))
+      (save-excursion
+	(set-buffer lf)
+	(erase-buffer)
+	(insert "(semanticdb-ebrowse-load-helper \""
+		(expand-file-name dir)
+		"\")\n")
+	(save-buffer)
+	(kill-buffer (current-buffer)))
+      (message "Creating ebrowse file: %s ... done" savein)
+      ;; Reload that database
+      (load lfn nil t)
+      )))
+
+;;;###autoload
+(defun semanticdb-load-ebrowse-caches ()
+  "Load all semanticdb controlled EBROWSE caches."
+  (interactive)
+  (let ((f (directory-files semanticdb-default-save-directory
+			    t (concat semanticdb-ebrowse-default-file-name "-load.el$") t)))
+    (while f
+      (load (car f) nil t)
+      (setq f (cdr f)))
+    ))
+
+;;;###autoload
+(defun semanticdb-ebrowse-load-helper (directory)
+  "Create the semanticdb database via ebrowse for directory.
+If DIRECTORY is found to be defunct, it won't load the DB, and will
+warn instead."
+  (if (file-directory-p directory)
+      (semanticdb-create-database semanticdb-project-database-ebrowse
+				  directory)
+    (let* ((BF (semanticdb-ebrowse-file-for-directory directory))
+	   (BFL (concat BF "-load.el"))
+	   (BFLB (concat BF "-load.el~")))
+      (save-window-excursion
+	(with-output-to-temp-buffer "*FILES TO DELETE*"
+	  (princ "The following BROWSE files are obsolete.\n\n")
+	  (princ BF)
+	  (princ "\n")
+	  (princ BFL)
+	  (princ "\n")
+	  (when (file-exists-p BFLB)
+	    (princ BFLB)
+	    (princ "\n"))
+	  )
+	(when (y-or-n-p (format
+			 "Warning: Obsolete BROWSE file for: %s\nDelete? "
+			 directory))
+	  (delete-file BF)
+	  (delete-file BFL)
+	  (when (file-exists-p BFLB)
+	    (delete-file BFLB))
+	  )))))
+
+;JAVE this just instantiates a default empty ebrowse struct?
+; how would new instances wind up here?
+; the ebrowse class isnt singleton, unlike the emacs lisp one
+(defvar-mode-local c++-mode semanticdb-project-system-databases
+  ()
+  "Search Ebrowse for symbols.")
+
+(defmethod semanticdb-needs-refresh-p ((table semanticdb-table-ebrowse))
+  "EBROWSE database do not need to be refreshed.
+
+JAVE: stub for needs-refresh, because, how do we know if BROWSE files
+      are out of date?
+
+EML: Our database should probably remember the timestamp/checksum of
+     the most recently read EBROWSE file, and use that."
+  nil
+)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+;;; EBROWSE code
+;;
+;; These routines deal with part of the ebrowse interface.
+(defun semanticdb-ebrowse-file-for-directory (dir)
+  "Return the file name for DIR where the ebrowse BROWSE file is.
+This file should reside in `semanticdb-default-save-directory'."
+  (let* ((semanticdb-default-save-directory
+	  semanticdb-default-save-directory)
+	 (B (semanticdb-file-name-directory
+	     'semanticdb-project-database-file
+	     (concat (expand-file-name dir)
+		     semanticdb-ebrowse-default-file-name)))
+	 )
+    B))
+
+(defun semanticdb-ebrowse-get-ebrowse-structure (dir)
+  "Return the ebrowse structure for directory DIR.
+This assumes semantic manages the BROWSE files, so they are assumed to live
+where semantic cache files live, depending on your settings.
+
+For instance: /home/<username>/.semanticdb/!usr!include!BROWSE"
+  (let* ((B (semanticdb-ebrowse-file-for-directory dir))
+	 (buf (get-buffer-create "*semanticdb ebrowse*")))
+    (message "semanticdb-ebrowse %s" B)
+    (when (file-exists-p B)
+      (set-buffer buf)
+      (buffer-disable-undo buf)
+      (erase-buffer)
+      (insert-file-contents B)
+      (let ((ans nil)
+	    (efcn (symbol-function 'ebrowse-show-progress)))
+	(fset 'ebrowse-show-progress #'(lambda (&rest junk) nil))
+	(unwind-protect ;; Protect against errors w/ ebrowse
+	    (setq ans (list B (ebrowse-read)))
+	  ;; These items must always happen
+	  (erase-buffer)
+	  (fset 'ebrowse-show-fcn efcn)
+	  )
+	ans))))
+
+;;; Methods for creating a database or tables
+;;
+(defmethod semanticdb-create-database :STATIC ((dbeC semanticdb-project-database-ebrowse)
+					       directory)
+  "Create a new semantic database for DIRECTORY based on ebrowse.
+If there is no database for DIRECTORY available, then
+{not implemented yet} create one.  Return nil if that is not possible."
+  ;; MAKE SURE THAT THE FILE LOADED DOESN'T ALREADY EXIST.
+  (let ((dbs semanticdb-database-list)
+	(found nil))
+    (while (and (not found) dbs)
+      (when (semanticdb-project-database-ebrowse-p (car dbs))
+	(when (string= (oref (car dbs) reference-directory) directory)
+	  (setq found (car dbs))))
+      (setq dbs (cdr dbs)))
+    ;;STATIC means DBE cant be used as object, only as a class
+    (let* ((ebrowse-data (semanticdb-ebrowse-get-ebrowse-structure directory))
+	   (dat (car (cdr ebrowse-data)))
+	   (ebd (car dat))
+	   (db nil)
+	   (default-directory directory)
+	   )
+      (if found
+	  (setq db found)
+	(setq db (make-instance
+		  dbeC
+		  directory
+		  :ebrowse-struct ebd
+		  ))
+	(oset db reference-directory directory))
+
+      ;; Once we recycle or make a new DB, refresh the
+      ;; contents from the BROWSE file.
+      (oset db tables nil)
+      ;; only possible after object creation, tables inited to nil.
+      (semanticdb-ebrowse-strip-trees db dat)
+
+      ;; Once our database is loaded, if we are a system DB, we
+      ;; add ourselves to the include list for C++.
+      (semantic-add-system-include directory 'c++-mode)
+      (semantic-add-system-include directory 'c-mode)
+
+      db)))
+
+(defmethod semanticdb-ebrowse-strip-trees  ((dbe semanticdb-project-database-ebrowse)
+						    data)
+  "For the ebrowse database DBE, strip all tables from DATA."
+;JAVE what it actually seems to do is split the original tree in "tables" associated with files
+; im not sure it actually works:
+;   the filename slot sometimes gets to be nil,
+;      apparently for classes which definition cant be found, yet needs to be included in the tree
+;      like library baseclasses
+;   a file can define several classes
+  (let ((T (car (cdr data))));1st comes a header, then the tree
+    (while T
+
+      (let* ((tree (car T))
+	     (class (ebrowse-ts-class tree)); root class of tree
+	     ;; Something funny going on with this file thing...
+             (filename (or (ebrowse-cs-source-file class)
+			   (ebrowse-cs-file class)))
+	     )
+	(cond
+	 ((ebrowse-globals-tree-p tree)
+	  ;; We have the globals tree.. save this special.
+	  (semanticdb-ebrowse-add-globals-to-table dbe tree)
+	  )
+	 (t
+	  ;; ebrowse will collect all the info from multiple files
+	  ;; into one tree.  Semantic wants all the bits to be tied
+	  ;; into different files.  We need to do a full dissociation
+	  ;; into semantic parsable tables.
+	  (semanticdb-ebrowse-add-tree-to-table dbe tree)
+	  ))
+      (setq T (cdr T))))
+    ))
+
+;;; Filename based methods
+;;
+(defun semanticdb-ebrowse-add-globals-to-table (dbe tree)
+  "For database DBE, add the ebrowse TREE into the table."
+  (if (or (not (ebrowse-ts-p tree))
+	  (not (ebrowse-globals-tree-p tree)))
+      (signal 'wrong-type-argument (list 'ebrowse-ts-p tree)))
+
+  (let* ((class (ebrowse-ts-class tree))
+	 (fname (or (ebrowse-cs-source-file class)
+		    (ebrowse-cs-file class)
+		    ;; Not def'd here, assume our current
+		    ;; file
+		    (concat default-directory "/unknown-proxy.hh")))
+	 (vars (ebrowse-ts-member-functions tree))
+	 (fns (ebrowse-ts-member-variables tree))
+	 (toks nil)
+	 )
+    (while vars
+      (let ((nt (semantic-tag (ebrowse-ms-name (car vars))
+			      'variable))
+	    (defpoint (ebrowse-bs-point class)))
+	(when defpoint
+	  (semantic--tag-set-overlay nt
+				     (vector defpoint defpoint)))
+	(setq toks (cons nt toks)))
+      (setq vars (cdr vars)))
+    (while fns
+      (let ((nt (semantic-tag (ebrowse-ms-name (car fns))
+			      'function))
+	    (defpoint (ebrowse-bs-point class)))
+	(when defpoint
+	  (semantic--tag-set-overlay nt
+				     (vector defpoint defpoint)))
+	(setq toks (cons nt toks)))
+      (setq fns (cdr fns)))
+
+    ))
+
+(defun semanticdb-ebrowse-add-tree-to-table (dbe tree &optional fname baseclasses)
+  "For database DBE, add the ebrowse TREE into the table for FNAME.
+Optional argument BASECLASSES specifyies a baseclass to the tree being provided."
+  (if (not (ebrowse-ts-p tree))
+      (signal 'wrong-type-argument (list 'ebrowse-ts-p tree)))
+
+  ;; Strategy overview:
+  ;; 1) Calculate the filename for this tree.
+  ;; 2) Find a matching namespace in TAB, or create a new one.
+  ;; 3) Fabricate a tag proxy for CLASS
+  ;; 4) Add it to the namespace
+  ;; 5) Add subclasses
+
+  ;; 1 - Find the filename
+  (if (not fname)
+      (setq fname (or (ebrowse-cs-source-file (ebrowse-ts-class tree))
+		      (ebrowse-cs-file (ebrowse-ts-class tree))
+		      ;; Not def'd here, assume our current
+		      ;; file
+		      (concat default-directory "/unknown-proxy.hh"))))
+
+  (let* ((tab (or (semanticdb-file-table dbe fname)
+		  (semanticdb-create-table dbe fname)))
+	 (class (ebrowse-ts-class tree))
+	 (scope (ebrowse-cs-scope class))
+	 (ns (when scope (cedet-split-string scope ":" t)))
+	 (nst nil)
+	 (cls nil)
+	 )
+
+    ;; 2 - Get the namespace tag
+    (when ns
+      (let ((taglst (if (slot-boundp tab 'tags) (oref tab tags) nil)))
+	(setq nst (semantic-find-first-tag-by-name (car ns) taglst))
+	(when (not nst)
+	  (setq nst (semantic-tag (car ns) 'type :type "namespace"))
+	  (oset tab tags (cons nst taglst))
+	  )))
+
+    ;; 3 - Create a proxy tg.
+    (setq cls (semantic-tag (ebrowse-cs-name class)
+			    'type
+			    :type "class"
+			    :superclasses baseclasses
+			    :faux t
+			    :filename fname
+			    ))
+    (let ((defpoint (ebrowse-bs-point class)))
+      (when defpoint
+	(semantic--tag-set-overlay cls
+				   (vector defpoint defpoint))))
+
+    ;; 4 - add to namespace
+    (if nst
+	(semantic-tag-put-attribute
+	 nst :members (cons cls (semantic-tag-get-attribute nst :members)))
+      (oset tab tags (cons cls (when (slot-boundp tab 'tags)
+				 (oref tab tags)))))
+
+    ;; 5 - Subclasses
+    (let* ((subclass (ebrowse-ts-subclasses tree))
+	   (pname (ebrowse-cs-name class)))
+      (when (ebrowse-cs-scope class)
+	(setq pname (concat (mapconcat (lambda (a) a) (cdr ns) "::") "::" pname)))
+
+      (while subclass
+	(let* ((scc (ebrowse-ts-class (car subclass)))
+	       (fname (or (ebrowse-cs-source-file scc)
+			  (ebrowse-cs-file scc)
+			  ;; Not def'd here, assume our current
+			  ;; file
+			  fname
+			  )))
+	  (when fname
+	    (semanticdb-ebrowse-add-tree-to-table
+	     dbe (car subclass) fname pname)))
+	(setq subclass (cdr subclass))))
+    ))
+
+;;;
+;; Overload for converting the simple faux tag into something better.
+;;
+(defmethod semanticdb-normalize-tags ((obj semanticdb-table-ebrowse) tags)
+  "Convert in Ebrowse database OBJ a list of TAGS into a complete tag.
+The default tag provided by searches exclude many features of a
+semantic parsed tag.  Look up the file for OBJ, and match TAGS
+against a semantic parsed tag that has all the info needed, and
+return that."
+  (let ((tagret nil)
+	)
+    ;; SemanticDB will automatically create a regular database
+    ;; on top of the file just loaded by ebrowse during the set
+    ;; buffer.  Fetch that table, and use it's tag list to look
+    ;; up the tag we just got, and thus turn it into a full semantic
+    ;; tag.
+    (while tags
+      (let ((tag (car tags)))
+	(save-excursion
+	  (semanticdb-set-buffer obj)
+	  (let ((ans nil))
+	    ;; Gee, it would be nice to do this, but ebrowse LIES.  Oi.
+	    (when (semantic-tag-with-position-p tag)
+	      (goto-char (semantic-tag-start tag))
+	      (let ((foundtag (semantic-current-tag)))
+		;; Make sure the discovered tag is the same as what we started with.
+		(when (string= (semantic-tag-name tag)
+			       (semantic-tag-name foundtag))
+		  ;; We have a winner!
+		  (setq ans foundtag))))
+	    ;; Sometimes ebrowse lies.  Do a generic search
+	    ;; to find it within this file.
+	    (when (not ans)
+	      ;; We might find multiple hits for this tag, and we have no way
+	      ;; of knowing which one the user wanted.  Return the first one.
+	      (setq ans (semantic-deep-find-tags-by-name
+			 (semantic-tag-name tag)
+			 (semantic-fetch-tags))))
+	    (if (semantic-tag-p ans)
+		(setq tagret (cons ans tagret))
+	      (setq tagret (append ans tagret)))
+	    ))
+	(setq tags (cdr tags))))
+    tagret))
+
+(defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-ebrowse) tag)
+  "Convert in Ebrowse database OBJ one TAG into a complete tag.
+The default tag provided by searches exclude many features of a
+semantic parsed tag.  Look up the file for OBJ, and match TAG
+against a semantic parsed tag that has all the info needed, and
+return that."
+  (let ((tagret nil)
+	(objret nil))
+    ;; SemanticDB will automatically create a regular database
+    ;; on top of the file just loaded by ebrowse during the set
+    ;; buffer.  Fetch that table, and use it's tag list to look
+    ;; up the tag we just got, and thus turn it into a full semantic
+    ;; tag.
+    (save-excursion
+      (semanticdb-set-buffer obj)
+      (setq objret semanticdb-current-table)
+      (when (not objret)
+	;; What to do??
+	(debug))
+      (let ((ans nil))
+	;; Gee, it would be nice to do this, but ebrowse LIES.  Oi.
+	(when (semantic-tag-with-position-p tag)
+	  (goto-char (semantic-tag-start tag))
+	  (let ((foundtag (semantic-current-tag)))
+	    ;; Make sure the discovered tag is the same as what we started with.
+	    (when (string= (semantic-tag-name tag)
+			   (semantic-tag-name foundtag))
+	      ;; We have a winner!
+	      (setq ans foundtag))))
+	;; Sometimes ebrowse lies.  Do a generic search
+	;; to find it within this file.
+	(when (not ans)
+	  ;; We might find multiple hits for this tag, and we have no way
+	  ;; of knowing which one the user wanted.  Return the first one.
+	  (setq ans (semantic-deep-find-tags-by-name
+		     (semantic-tag-name tag)
+		     (semantic-fetch-tags))))
+	(if (semantic-tag-p ans)
+	    (setq tagret ans)
+	  (setq tagret (car ans)))
+	))
+    (cons objret tagret)))
+
+;;; Search Overrides
+;;
+;; NOTE WHEN IMPLEMENTING: Be sure to add doc-string updates explaining
+;; how your new search routines are implemented.
+;;
+(defmethod semanticdb-find-tags-by-name-method
+  ((table semanticdb-table-ebrowse) name &optional tags)
+  "Find all tags named NAME in TABLE.
+Return a list of tags."
+  ;;(message "semanticdb-find-tags-by-name-method name -- %s" name)
+  (if tags
+      ;; If TAGS are passed in, then we don't need to do work here.
+      (call-next-method)
+    ;; If we ever need to do something special, add here.
+    ;; Since ebrowse tags are converted into semantic tags, we can
+    ;; get away with this sort of thing.
+    (call-next-method)
+    )
+  )
+
+(defmethod semanticdb-find-tags-by-name-regexp-method
+  ((table semanticdb-table-ebrowse) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    (call-next-method)
+    ))
+
+(defmethod semanticdb-find-tags-for-completion-method
+  ((table semanticdb-table-ebrowse) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    (call-next-method)
+    ))
+
+(defmethod semanticdb-find-tags-by-class-method
+  ((table semanticdb-table-ebrowse) class &optional tags)
+  "In TABLE, find all occurances of tags of CLASS.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    (call-next-method)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; Deep Searches
+;;
+;; If your language does not have a `deep' concept, these can be left
+;; alone, otherwise replace with implementations similar to those
+;; above.
+;;
+
+(defmethod semanticdb-deep-find-tags-by-name-method
+  ((table semanticdb-table-ebrowse) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Optional argument TAGS is a list of tags t
+Like `semanticdb-find-tags-by-name-method' for ebrowse."
+  ;;(semanticdb-find-tags-by-name-method table name tags)
+  (call-next-method))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method
+  ((table semanticdb-table-ebrowse) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for ebrowse."
+  ;;(semanticdb-find-tags-by-name-regexp-method table regex tags)
+  (call-next-method))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method
+  ((table semanticdb-table-ebrowse) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-for-completion-method' for ebrowse."
+  ;;(semanticdb-find-tags-for-completion-method table prefix tags)
+  (call-next-method))
+
+;;; Advanced Searches
+;;
+(defmethod semanticdb-find-tags-external-children-of-type-method
+  ((table semanticdb-table-ebrowse) type &optional tags)
+  "Find all nonterminals which are child elements of TYPE
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; Ebrowse collects all this type of stuff together for us.
+    ;; but we can't use it.... yet.
+    nil
+    ))
+
+;;; TESTING
+;;
+;; This is a complex bit of stuff.  Here are some tests for the
+;; system.
+
+(defun semanticdb-ebrowse-run-tests ()
+  "Run some tests of the semanticdb-ebrowse system.
+All systems are different.  Ask questions along the way."
+  (interactive)
+  (let ((doload nil))
+    (when (y-or-n-p "Create a system database to test with? ")
+      (call-interactively 'semanticdb-create-ebrowse-database)
+      (setq doload t))
+    ;;  Should we load in caches
+    (when (if doload
+	      (y-or-n-p "New database created.  Reload system databases? ")
+	    (y-or-n-p "Load in all system databases? "))
+      (semanticdb-load-ebrowse-caches)))
+  ;; Ok, databases were creatd.  Lets try some searching.
+  (when (not (or (eq major-mode 'c-mode)
+		 (eq major-mode 'c++-mode)))
+    (error "Please make your default buffer be a C or C++ file, then
+run the test again..")
+    )
+
+  )
+
+(defun semanticdb-ebrowse-dump ()
+  "Find the first loaded ebrowse table, and dump out the contents."
+  (interactive)
+  (let ((db semanticdb-database-list)
+	(ab nil))
+    (while db
+      (when (semanticdb-project-database-ebrowse-p (car db))
+	(setq ab (data-debug-new-buffer "*EBROWSE Database*"))
+	(data-debug-insert-thing (car db) "*" "")
+	(setq db nil)
+	)
+      (setq db (cdr db)))))
+
+(provide 'semanticdb-ebrowse)
+
+;;; semanticdb-ebrowse.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-el.el b/site/cedet-1.0pre7/semantic/semanticdb-el.el
new file mode 100644
index 0000000..e119849
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-el.el
@@ -0,0 +1,344 @@
+;;; semanticdb-el.el --- Semantic database extensions for Emacs Lisp
+
+;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-el.el,v 1.35 2009/09/11 18:59:19 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; There are a lot of Emacs Lisp functions and variables available for
+;; the asking.  This adds on to the semanticdb programming interface to
+;; allow all loaded Emacs Lisp functions to be queried via semanticdb.
+;;
+;; This allows you to use programs written for Semantic using the database
+;; to also work in Emacs Lisp with no compromises.
+;;
+
+(eval-when-compile
+  ;; For generic function searching.
+  (require 'eieio)
+  (require 'eieio-opt)
+  (require 'eieio-base))
+
+;;; Code:
+
+;;; Classes:
+(defclass semanticdb-table-emacs-lisp (semanticdb-abstract-table)
+  ((major-mode :initform emacs-lisp-mode)
+   )
+  "A table for returning search results from Emacs.")
+
+(defmethod semanticdb-refresh-table ((obj semanticdb-table-emacs-lisp) &optional force)
+  "Do not refresh Emacs Lisp table.
+It does not need refreshing."
+  nil)
+
+(defmethod semanticdb-needs-refresh-p ((obj semanticdb-table-emacs-lisp))
+  "Return nil, we never need a refresh."
+  nil)
+
+(defclass semanticdb-project-database-emacs-lisp
+  (semanticdb-project-database eieio-singleton)
+  ((new-table-class :initform semanticdb-table-emacs-lisp
+		    :type class
+		    :documentation
+		    "New tables created for this database are of this class.")
+   )
+  "Database representing Emacs core.")
+
+;; Create the database, and add it to searchable databases for Emacs Lisp mode.
+(defvar-mode-local emacs-lisp-mode semanticdb-project-system-databases
+  (list
+   (semanticdb-project-database-emacs-lisp "Emacs"))
+  "Search Emacs core for symbols.")
+
+(defvar-mode-local emacs-lisp-mode semanticdb-find-default-throttle
+  '(project omniscience)
+  "Search project files, then search this omniscience database.
+It is not necessary to to system or recursive searching because of
+the omniscience database.")
+
+;;; Filename based methods
+;;
+(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-emacs-lisp))
+  "For an Emacs Lisp database, there are no explicit tables.
+Create one of our special tables that can act as an intermediary."
+  ;; We need to return something since there is always the "master table"
+  ;; The table can then answer file name type questions.
+  (when (not (slot-boundp obj 'tables))
+    (let ((newtable (semanticdb-table-emacs-lisp "Emacs System Table")))
+      (oset obj tables (list newtable))
+      (oset newtable parent-db obj)
+      (oset newtable tags nil)
+      ))
+  (call-next-method))
+
+(defmethod semanticdb-file-table ((obj semanticdb-project-database-emacs-lisp) filename)
+  "From OBJ, return FILENAME's associated table object.
+For Emacs Lisp, creates a specialized table."
+  (car (semanticdb-get-database-tables obj))
+  )
+
+(defmethod semanticdb-get-tags ((table semanticdb-table-emacs-lisp ))
+  "Return the list of tags belonging to TABLE."
+  ;; specialty table ?  Probably derive tags at request time.
+  nil)
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  (save-excursion
+    (set-buffer buffer)
+    (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode)))
+
+(defmethod semanticdb-full-filename ((obj semanticdb-table-emacs-lisp))
+  "Fetch the full filename that OBJ refers to.
+For Emacs Lisp system DB, there isn't one."
+  nil)
+
+;;; Conversion
+;;
+(defmethod semanticdb-normalize-tags ((obj semanticdb-table-emacs-lisp) tags)
+  "Convert tags, originating from Emacs OBJ, into standardized form."
+  (let ((newtags nil))
+    (dolist (T tags)
+      (let* ((ot (semanticdb-normalize-one-tag obj T))
+	     (tag (cdr ot)))
+	(setq newtags (cons tag newtags))))
+    ;; There is no promise to have files associated.
+    (nreverse newtags)))
+
+(defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-emacs-lisp) tag)
+  "Convert one TAG, originating from Emacs OBJ, into standardized form.
+If Emacs cannot resolve this symbol to a particular file, then return nil."
+  ;; Here's the idea.  For each tag, get the name, then use
+  ;; Emacs' `symbol-file' to get the source.  Once we have that,
+  ;; we can use more typical semantic searching techniques to
+  ;; get a regularly parsed tag.
+  (let* ((type (cond ((semantic-tag-of-class-p tag 'function)
+		      'defun)
+		     ((semantic-tag-of-class-p tag 'variable)
+		      'defvar)
+		     ))
+	 (sym (intern (semantic-tag-name tag)))
+	 (file (condition-case err
+		   (symbol-file sym type)
+		 ;; Older [X]Emacs don't have a 2nd argument.
+		 (error (symbol-file sym))))
+	 )
+    (if (or (not file) (not (file-exists-p file)))
+	;; The file didn't exist.  Return nil.
+	;; We can't normalize this tag.  Fake it out.
+	(cons obj tag)
+      (when (string-match "\\.elc" file)
+	(setq file (concat (file-name-sans-extension file)
+			   ".el"))
+	(when (and (not (file-exists-p file))
+		   (file-exists-p (concat file ".gz")))
+	  ;; Is it a .gz file?
+	  (setq file (concat file ".gz"))))
+
+      (let* ((tab (semanticdb-file-table-object file))
+	     (alltags (semanticdb-get-tags tab))
+	     (newtags (semanticdb-find-tags-by-name-method
+		       tab (semantic-tag-name tag)))
+	     (match nil))
+	;; Find the best match.
+	(dolist (T newtags)
+	  (when (semantic-tag-similar-p T tag)
+	    (setq match T)))
+	;; Backup system.
+	(when (not match)
+	    (setq match (car newtags)))
+	;; Return it.
+	(cons tab match)))))
+
+(defun semanticdb-elisp-sym-function-arglist (sym)
+  "Get the argument list for SYM.
+Deal with all different forms of function.
+This was snarfed out of eldoc."
+  (let* ((prelim-def
+	  (let ((sd (and (fboundp sym)
+			 (symbol-function sym))))
+	    (and (symbolp sd)
+		 (condition-case err
+		     (setq sd (indirect-function sym))
+		   (error (setq sd nil))))
+	    sd))
+         (def (if (eq (car-safe prelim-def) 'macro)
+                  (cdr prelim-def)
+                prelim-def))
+         (arglist (cond ((null def) nil)
+			((byte-code-function-p def)
+			 ;; This is an eieio compatibility function.
+			 ;; We depend on EIEIO, so use this.
+			 (eieio-compiled-function-arglist def))
+                        ((eq (car-safe def) 'lambda)
+                         (nth 1 def))
+                        (t nil))))
+    arglist))
+
+(defun semanticdb-elisp-sym->tag (sym &optional toktype)
+  "Convert SYM into a semantic tag.
+TOKTYPE is a hint to the type of tag desired."
+  (if (stringp sym)
+      (setq sym (intern-soft sym)))
+  (when sym
+    (cond ((and (eq toktype 'function) (fboundp sym))
+	   (semantic-tag-new-function
+	    (symbol-name sym)
+	    nil	;; return type
+	    (semantic-elisp-desymbolify
+	     (semanticdb-elisp-sym-function-arglist sym)) ;; arg-list
+	    :user-visible-flag (condition-case nil
+				   (interactive-form sym)
+				 (error nil))
+	    ))
+	  ((and (eq toktype 'variable) (boundp sym))
+	   (semantic-tag-new-variable
+	    (symbol-name sym)
+	    nil	;; type
+	    nil	;; value - ignore for now
+	    ))
+	  ((and (eq toktype 'type) (class-p sym))
+	   (semantic-tag-new-type
+	    (symbol-name sym)
+	    "class"
+	    (semantic-elisp-desymbolify
+	     (aref (class-v semanticdb-project-database)
+		   class-public-a)) ;; slots
+	    (semantic-elisp-desymbolify (class-parents sym)) ;; parents
+	    ))
+	  ((not toktype)
+	   ;; Figure it out on our own.
+	   (cond ((class-p sym)
+		  (semanticdb-elisp-sym->tag sym 'type))
+		 ((fboundp sym)
+		  (semanticdb-elisp-sym->tag sym 'function))
+		 ((boundp sym)
+		  (semanticdb-elisp-sym->tag sym 'variable))
+		 (t nil))
+	   )
+	  (t nil))))
+
+;;; Search Overrides
+;;
+(defvar semanticdb-elisp-mapatom-collector nil
+  "Variable used to collect mapatoms output.")
+
+(defmethod semanticdb-find-tags-by-name-method
+  ((table semanticdb-table-emacs-lisp) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Uses `inter-soft' to match NAME to emacs symbols.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; No need to search.  Use `intern-soft' which does the same thing for us.
+    (let* ((sym (intern-soft name))
+	   (fun (semanticdb-elisp-sym->tag sym 'function))
+	   (var (semanticdb-elisp-sym->tag sym 'variable))
+	   (typ (semanticdb-elisp-sym->tag sym 'type))
+	   (taglst nil)
+	   )
+      (when (or fun var typ)
+	;; If the symbol is any of these things, build the search table.
+	(when var	(setq taglst (cons var taglst)))
+	(when typ	(setq taglst (cons typ taglst)))
+	(when fun	(setq taglst (cons fun taglst)))
+	taglst
+	))))
+
+(defmethod semanticdb-find-tags-by-name-regexp-method
+  ((table semanticdb-table-emacs-lisp) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Uses `apropos-internal' to find matches.
+Return a list of tags."
+  (if tags (call-next-method)
+    (delq nil (mapcar 'semanticdb-elisp-sym->tag
+		      (apropos-internal regex)))))
+
+(defmethod semanticdb-find-tags-for-completion-method
+  ((table semanticdb-table-emacs-lisp) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    (delq nil (mapcar 'semanticdb-elisp-sym->tag
+		      (all-completions prefix obarray)))))
+
+(defmethod semanticdb-find-tags-by-class-method
+  ((table semanticdb-table-emacs-lisp) class &optional tags)
+  "In TABLE, find all occurances of tags of CLASS.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; We could implement this, but it could be messy.
+    nil))
+
+;;; Deep Searches
+;;
+;; For Emacs Lisp deep searches are like top level searches.
+(defmethod semanticdb-deep-find-tags-by-name-method
+  ((table semanticdb-table-emacs-lisp) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for Emacs Lisp."
+  (semanticdb-find-tags-by-name-method table name tags))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method
+  ((table semanticdb-table-emacs-lisp) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for Emacs Lisp."
+  (semanticdb-find-tags-by-name-regexp-method table regex tags))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method
+  ((table semanticdb-table-emacs-lisp) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-for-completion-method' for Emacs Lisp."
+  (semanticdb-find-tags-for-completion-method table prefix tags))
+
+;;; Advanced Searches
+;;
+(defmethod semanticdb-find-tags-external-children-of-type-method
+  ((table semanticdb-table-emacs-lisp) type &optional tags)
+  "Find all nonterminals which are child elements of TYPE
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; EIEIO is the only time this matters
+    (when (featurep 'eieio)
+      (let* ((class (intern-soft type))
+	     (taglst (when class
+		       (delq nil
+			     (mapcar 'semanticdb-elisp-sym->tag
+				     ;; Fancy eieio function that knows all about
+				     ;; built in methods belonging to CLASS.
+				     (eieio-all-generic-functions class)))))
+	     )
+	taglst))))
+
+(provide 'semanticdb-el)
+
+;;; semanticdb-el.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-file.el b/site/cedet-1.0pre7/semantic/semanticdb-file.el
new file mode 100644
index 0000000..5b769b8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-file.el
@@ -0,0 +1,451 @@
+;;; semanticdb-file.el --- Save a semanticdb to a cache file.
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-file.el,v 1.47 2009/09/23 01:33:02 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; A set of semanticdb classes for persistently saving caches on disk.
+;;
+
+(require 'inversion)
+(require 'semantic)
+(require 'semanticdb)
+(require 'cedet-files)
+
+(defvar semanticdb-file-version semantic-version
+  "Version of semanticdb we are writing files to disk with.")
+(defvar semanticdb-file-incompatible-version "1.4"
+  "Version of semanticdb we are not reverse compatible with.")
+
+;;; Settings
+;;
+;;;###autoload
+(defcustom semanticdb-default-file-name "semantic.cache"
+  "*File name of the semantic tag cache."
+  :group 'semanticdb
+  :type 'string)
+
+;;;###autoload
+(defcustom semanticdb-default-save-directory (expand-file-name "~/.semanticdb")
+  "*Directory name where semantic cache files are stored.
+If this value is nil, files are saved in the current directory.  If the value
+is a valid directory, then it overrides `semanticdb-default-file-name' and
+stores caches in a coded file name in this directory."
+  :group 'semanticdb
+  :type '(choice :tag "Default-Directory"
+                 :menu-tag "Default-Directory"
+                 (const :tag "Use current directory" :value nil)
+                 (directory)))
+
+;;;###autoload
+(defcustom semanticdb-persistent-path '(always)
+  "*List of valid paths that semanticdb will cache tags to.
+When `global-semanticdb-minor-mode' is active, tag lists will
+be saved to disk when Emacs exits.  Not all directories will have
+tags that should be saved.
+The value should be a list of valid paths.  A path can be a string,
+indicating a directory in which to save a variable.  An element in the
+list can also be a symbol.  Valid symbols are `never', which will
+disable any saving anywhere, `always', which enables saving
+everywhere, or `project', which enables saving in any directory that
+passes a list of predicates in `semanticdb-project-predicate-functions'."
+  :group 'semanticdb
+  :type nil)
+
+(defcustom semanticdb-save-database-hooks nil
+  "*Hooks run after a database is saved.
+Each function is called with one argument, the object representing
+the database recently written."
+  :group 'semanticdb
+  :type 'hook)
+
+(defvar semanticdb-dir-sep-char (if (boundp 'directory-sep-char)
+				    (symbol-value 'directory-sep-char)
+				  ?/)
+  "Character used for directory separation.
+Obsoleted in some versions of Emacs.  Needed in others.
+NOTE: This should get deleted from semantic soon.")
+
+(defun semanticdb-fix-pathname (dir)
+  "If DIR is broken, fix it.
+Force DIR to end with a /.
+Note: Same as `file-name-as-directory'.
+NOTE: This should get deleted from semantic soon."
+  (file-name-as-directory dir))
+;; I didn't initially know about the above fcn.  Keep the below as a
+;; reference.  Delete it someday once I've proven everything is the same.
+;;  (if (not (= semanticdb-dir-sep-char (aref path (1- (length path)))))
+;;      (concat path (list semanticdb-dir-sep-char))
+;;    path))
+
+;;; Classes
+;;
+;;;###autoload
+(defclass semanticdb-project-database-file (semanticdb-project-database
+					    eieio-persistent)
+  ((file-header-line :initform ";; SEMANTICDB Tags save file")
+   (do-backups :initform nil)
+   (semantic-tag-version :initarg :semantic-tag-version
+			 :initform "1.4"
+			 :documentation
+			 "The version of the tags saved.
+The default value is 1.4.  In semantic 1.4 there was no versioning, so
+when those files are loaded, this becomes the version number.
+To save the version number, we must hand-set this version string.")
+   (semanticdb-version :initarg :semanticdb-version
+		       :initform "1.4"
+		       :documentation
+		       "The version of the object system saved.
+The default value is 1.4.  In semantic 1.4, there was no versioning,
+so when those files are loaded, this becomes the version number.
+To save the version number, we must hand-set this version string.")
+   )
+  "Database of file tables saved to disk.")
+
+;;; Code:
+;;
+(defmethod semanticdb-create-database :STATIC ((dbc semanticdb-project-database-file)
+					       directory)
+  "Create a new semantic database for DIRECTORY and return it.
+If a database for DIRECTORY has already been loaded, return it.
+If a database for DIRECTORY exists, then load that database, and return it.
+If DIRECTORY doesn't exist, create a new one."
+  ;; Make sure this is fully expanded so we don't get duplicates.
+  (setq directory (file-truename directory))
+  (let* ((fn (semanticdb-cache-filename dbc directory))
+	 (db (or (semanticdb-file-loaded-p fn)
+		 (if (file-exists-p fn)
+		     (progn
+		       (semanticdb-load-database fn))))))
+    (unless db
+      (setq db (make-instance
+		dbc  ; Create the database requested.  Perhaps
+		(concat (file-name-nondirectory
+			 (directory-file-name
+			  directory))
+			"/")
+		:file fn :tables nil
+		:semantic-tag-version semantic-version
+		:semanticdb-version semanticdb-file-version)))
+    ;; Set this up here.   We can't put it in the constructor because it
+    ;; would be saved, and we want DB files to be portable.
+    (oset db reference-directory directory)
+    db))
+
+;;; File IO
+(defun semanticdb-load-database (filename)
+  "Load the database FILENAME."
+  (condition-case foo
+      (let* ((r (eieio-persistent-read filename))
+	     (c (semanticdb-get-database-tables r))
+	     (tv (oref r semantic-tag-version))
+	     (fv (oref r semanticdb-version))
+	     )
+	;; Restore the parent-db connection
+	(while c
+	  (oset (car c) parent-db r)
+	  (setq c (cdr c)))
+	(if (not (inversion-test 'semanticdb-file fv))
+	    (when (inversion-test 'semantic-tag tv)
+	      ;; Incompatible version.  Flush tables.
+	      (semanticdb-flush-database-tables r)
+	      ;; Reset the version to new version.
+	      (oset r semantic-tag-version semantic-tag-version)
+	      ;; Warn user
+	      (message "Semanticdb file is old.  Starting over for %s"
+		       filename)
+	      )
+	  ;; Version is not ok.  Flush whole system
+	  (message "semanticdb file is old.  Starting over for %s"
+		   filename)
+	  ;; This database is so old, we need to replace it.
+	  ;; We also need to delete it from the instance tracker.
+	  (delete-instance r)
+	  (setq r nil))
+	r)
+    (error (message "Cache Error: [%s] %s, Restart"
+		    filename foo)
+	   nil)))
+
+;;;###autoload
+(defun semanticdb-file-loaded-p (filename)
+  "Return the project belonging to FILENAME if it was already loaded."
+  (eieio-instance-tracker-find filename 'file 'semanticdb-database-list))
+
+(defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file)
+					       &optional supress-questions)
+  "Does the directory the database DB needs to write to exist?
+If SUPRESS-QUESTIONS, then do not ask to create the directory."
+  (let ((dest (file-name-directory (oref DB file)))
+	)
+    (cond ((null dest)
+	   ;; @TODO - If it was never set up... what should we do ?
+	   nil)
+	  ((file-exists-p dest) t)
+	  ((or supress-questions
+	       (and (boundp 'semanticdb--inhibit-make-directory)
+		    semanticdb--inhibit-make-directory))
+	   nil)
+	  ((y-or-n-p (format "Create directory %s for SemanticDB? " dest))
+	   (make-directory dest t)
+	   t)
+	  (t 
+	   (if (boundp 'semanticdb--inhibit-make-directory)
+               (setq semanticdb--inhibit-make-directory t))
+	   nil))
+    ))
+
+(defmethod semanticdb-save-db ((DB semanticdb-project-database-file)
+			       &optional
+			       supress-questions)
+  "Write out the database DB to its file.
+If DB is not specified, then use the current database."
+  (let ((objname (oref DB file)))
+    (when (and (semanticdb-dirty-p DB)
+	       (semanticdb-live-p DB)
+	       (semanticdb-file-directory-exists-p DB supress-questions)
+	       (semanticdb-write-directory-p DB)
+	       )
+      ;;(message "Saving tag summary for %s..." objname)
+      (condition-case foo
+	  (eieio-persistent-save (or DB semanticdb-current-database))
+	(file-error		    ; System error saving?  Ignore it.
+	 (message "%S: %s" foo objname))
+	(error
+	 (cond
+	  ((and (listp foo)
+		(stringp (nth 1 foo))
+		(string-match "write[- ]protected" (nth 1 foo)))
+	   (message (nth 1 foo)))
+	  ((and (listp foo)
+		(stringp (nth 1 foo))
+		(string-match "no such directory" (nth 1 foo)))
+	   (message (nth 1 foo)))
+	  (t
+	   ;; @todo - It should ask if we are not called from a hook.
+	   ;;         How?
+	   (if (or supress-questions
+		   (y-or-n-p (format "Skip Error: %S ?" (car (cdr foo)))))
+	       (message "Save Error: %S: %s" (car (cdr foo))
+			objname)
+	     (error "%S" (car (cdr foo))))))))
+      (run-hook-with-args 'semanticdb-save-database-hooks
+			  (or DB semanticdb-current-database))
+      ;;(message "Saving tag summary for %s...done" objname)
+      )
+    ))
+
+;;;###autoload
+(defmethod semanticdb-live-p ((obj semanticdb-project-database))
+  "Return non-nil if the file associated with OBJ is live.
+Live databases are objects associated with existing directories."
+  (and (slot-boundp obj 'reference-directory)
+       (file-exists-p (oref obj reference-directory))))
+
+(defmethod semanticdb-live-p ((obj semanticdb-table))
+  "Return non-nil if the file associated with OBJ is live.
+Live files are either buffers in Emacs, or files existing on the filesystem."
+  (let ((full-filename (semanticdb-full-filename obj)))
+    (or (find-buffer-visiting full-filename)
+	(file-exists-p full-filename))))
+
+(defvar semanticdb-data-debug-on-write-error nil
+  "Run the data debugger on tables that issue errors.
+This variable is set to nil after the first error is encountered
+to prevent overload.")
+
+(defmethod object-write ((obj semanticdb-table))
+  "When writing a table, we have to make sure we deoverlay it first.
+Restore the overlays after writting.
+Argument OBJ is the object to write."
+  (when (semanticdb-live-p obj)
+    (when (semanticdb-in-buffer-p obj)
+      (save-excursion
+	(set-buffer (semanticdb-in-buffer-p obj))
+
+	;; Make sure all our tag lists are up to date.
+	(semantic-fetch-tags)
+
+	;; Try to get an accurate unmatched syntax table.
+	(when (and (boundp semantic-show-unmatched-syntax-mode)
+		   semantic-show-unmatched-syntax-mode)
+	  ;; Only do this if the user runs unmatched syntax
+	  ;; mode display enties.
+	  (oset obj unmatched-syntax
+		(semantic-show-unmatched-lex-tokens-fetch))
+	  )
+
+	;; Make sure pointmax is up to date
+	(oset obj pointmax (point-max))
+	))
+
+    ;; Make sure that the file size and other attributes are
+    ;; up to date.
+    (let ((fattr (file-attributes (semanticdb-full-filename obj))))
+      (oset obj fsize (nth 7 fattr))
+      (oset obj lastmodtime (nth 5 fattr))
+      )
+
+    ;; Do it!
+    (condition-case tableerror
+	(call-next-method)
+      (error
+       (when semanticdb-data-debug-on-write-error
+	 (data-debug-new-buffer (concat "*SEMANTICDB ERROR*"))
+	 (data-debug-insert-thing obj "*" "")
+	 (setq semanticdb-data-debug-on-write-error nil))
+       (message "Error Writing Table: %s" (object-name obj))
+       (error "%S" (car (cdr tableerror)))))
+
+    ;; Clear the dirty bit.
+    (oset obj dirty nil)
+    ))
+
+;;; State queries
+;;
+(defmethod semanticdb-write-directory-p ((obj semanticdb-project-database-file))
+  "Return non-nil if OBJ should be written to disk.
+Uses `semanticdb-persistent-path' to determine the return value."
+  (let ((path semanticdb-persistent-path))
+    (catch 'found
+      (while path
+	(cond ((stringp (car path))
+	       (if (string= (oref obj reference-directory) (car path))
+		   (throw 'found t)))
+	      ((eq (car path) 'project)
+	       ;; @TODO - EDE causes us to go in here and disable
+	       ;; the old default 'always save' setting.
+	       ;;
+	       ;; With new default 'always' should I care?
+	       (if semanticdb-project-predicate-functions
+		   (if (run-hook-with-args-until-success
+			'semanticdb-project-predicate-functions
+			(oref obj reference-directory))
+		       (throw 'found t))
+		 ;; If the mode is 'project, and there are no project
+		 ;; modes, then just always save the file.  If users
+		 ;; wish to restrict the search, modify
+		 ;; `semanticdb-persistent-path' to include desired paths.
+		 (if (= (length semanticdb-persistent-path) 1)
+		     (throw 'found t))
+		 ))
+	      ((eq (car path) 'never)
+	       (throw 'found nil))
+	      ((eq (car path) 'always)
+	       (throw 'found t))
+	      (t (error "Invalid path %S" (car path))))
+	(setq path (cdr path)))
+      (call-next-method))
+    ))
+
+;;; Filename manipulation
+;;
+(defmethod semanticdb-file-table ((obj semanticdb-project-database-file) filename)
+  "From OBJ, return FILENAME's associated table object."
+  ;; Cheater option.  In this case, we always have files directly
+  ;; under ourselves.  The main project type may not.
+  (object-assoc (file-name-nondirectory filename) 'file (oref obj tables)))
+
+(defmethod semanticdb-file-name-non-directory :STATIC
+  ((dbclass semanticdb-project-database-file))
+  "Return the file name DBCLASS will use.
+File name excludes any directory part."
+  semanticdb-default-file-name)
+
+(defmethod semanticdb-file-name-directory :STATIC
+  ((dbclass semanticdb-project-database-file) directory)
+  "Return the relative directory to where DBCLASS will save its cache file.
+The returned path is related to DIRECTORY."
+  (if semanticdb-default-save-directory
+      (let ((file (cedet-directory-name-to-file-name directory)))
+        ;; Now create a filename for the cache file in
+        ;; ;`semanticdb-default-save-directory'.
+	(expand-file-name
+	 file (file-name-as-directory semanticdb-default-save-directory)))
+    directory))
+
+(defmethod semanticdb-cache-filename :STATIC
+  ((dbclass semanticdb-project-database-file) path)
+  "For DBCLASS, return a file to a cache file belonging to PATH.
+This could be a cache file in the current directory, or an encoded file
+name in a secondary directory."
+  ;; Use concat and not expand-file-name, because the dir part
+  ;; may include some of the file name.
+  (concat (semanticdb-file-name-directory dbclass path)
+	  (semanticdb-file-name-non-directory dbclass)))
+
+;;;###autoload
+(defmethod semanticdb-full-filename ((obj semanticdb-project-database-file))
+  "Fetch the full filename that OBJ refers to."
+  (oref obj file))
+
+;;; FLUSH OLD FILES
+;;
+(defun semanticdb-cleanup-cache-files (&optional noerror)
+  "Cleanup any cache files associated with directories that no longer exist.
+Optional NOERROR prevents errors from being displayed."
+  (interactive)
+  (when (and (not semanticdb-default-save-directory)
+	     (not noerror))
+    (error "No default save directory for semantic-save files"))
+
+  (when semanticdb-default-save-directory
+
+    ;; Calculate all the cache files we have.
+    (let* ((regexp (regexp-quote semanticdb-default-file-name))
+	   (files (directory-files semanticdb-default-save-directory
+				   t regexp))
+	   (orig nil)
+	   (to-delete nil))
+      (dolist (F files)
+	(setq orig (cedet-file-name-to-directory-name
+		    (file-name-nondirectory F)))
+	(when (not (file-exists-p (file-name-directory orig)))
+	  (setq to-delete (cons F to-delete))
+	  ))
+      (if to-delete
+	(save-window-excursion
+	  (let ((buff (get-buffer-create "*Semanticdb Delete*")))
+	    (with-current-buffer buff
+	      (erase-buffer)
+	      (insert "The following Cache files appear to be obsolete.\n\n")
+	      (dolist (F to-delete)
+		(insert F "\n")))
+	    (pop-to-buffer buff t t)
+	    (fit-window-to-buffer (get-buffer-window buff) nil 1)
+	    (when (y-or-n-p "Delete Old Cache Files? ")
+	      (mapc (lambda (F)
+		      (message "Deleting to %s..." F)
+		      (delete-file F))
+		    to-delete)
+	      (message "done."))
+	    ))
+	;; No files to delete
+	(when (not noerror)
+	  (message "No obsolete semanticdb.cache files."))
+	))))
+
+(provide 'semanticdb-file)
+
+;;; semanticdb-file.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-find.el b/site/cedet-1.0pre7/semantic/semanticdb-find.el
new file mode 100644
index 0000000..8e3d482
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-find.el
@@ -0,0 +1,1386 @@
+;;; semanticdb-find.el --- Searching through semantic databases.
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-find.el,v 1.85 2010/01/07 02:24:28 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; Databases of various forms can all be searched.
+;; There are a few types of searches that can be done:
+;;
+;;   Basic Name Search:
+;;    These searches scan a database table  collection for tags based
+;;    on name.
+;;
+;;   Basic Attribute Search:
+;;    These searches allow searching on specific attributes of tags,
+;;    such as name, type, or other attribute.
+;;
+;;   Advanced Search:
+;;    These are searches that were needed to accomplish some
+;;    specialized tasks as discovered in utilities.  Advanced searches
+;;    include matching methods defined outside some parent class.
+;;
+;;    The reason for advanced searches are so that external
+;;    repositories such as the Emacs obarray, or java .class files can
+;;    quickly answer these needed questions without dumping the entire
+;;    symbol list into Emacs for additional refinement searches via
+;;    regular semanticdb search.
+;;
+;; How databases are decided upon is another important aspect of a
+;; database search.  When it comes to searching for a name, there are
+;; these types of searches:
+;;
+;;   Basic Search:
+;;    Basic search means that tags looking for a given name start
+;;    with a specific search path.  Names are sought on that path
+;;    until it is empty or items on the path can no longer be found.
+;;    Use `semanticdb-dump-all-table-summary' to test this list.
+;;    Use `semanticdb-find-throttle-custom-list' to refine this list.
+;;
+;;   Deep Search:
+;;    A deep search will search more than just the global namespace.
+;;    It will recurse into tags that contain more tags, and search
+;;    those too.
+;;
+;;   Brute Search:
+;;    Brute search means that all tables in all databases in a given
+;;    project are searched.  Brute searches are the search style as
+;;    written for semantic version 1.x.
+;;
+;; How does the search path work?
+;;
+;;  A basic search starts with three parameters:
+;;
+;;     (FINDME &optional PATH FIND-FILE-MATCH)
+;;
+;;  FINDME is key to be searched for dependent on the type of search.
+;;  PATH is an indicator of which tables are to be searched.
+;;  FIND-FILE-MATCH indicates that any time a match is found, the
+;;  file associated with the tag should be read into a file.
+;;
+;;  The PATH argument is then the most interesting argument.  It can
+;;  have these values:
+;;
+;;    nil - Take the current buffer, and use its include list
+;;    buffer - Use that buffer's include list.
+;;    filename - Use that file's include list.  If the file is not
+;;        in a buffer, see of there is a semanticdb table for it.  If
+;;        not, read that file into a buffer.
+;;    tag - Get that tag's buffer of file file.  See above.
+;;    table - Search that table, and its include list.
+;;
+;; Search Results:
+;;
+;;   Semanticdb returns the results in a specific format.  There are a
+;;   series of routines for using those results, and results can be
+;;   passed in as a search-path for refinement searches with
+;;   semanticdb.  Apropos for semanticdb.*find-result for more.
+;;
+;; Application:
+;;
+;; Here are applications where different searches are needed which
+;; exist as of semantic 1.4.x
+;;
+;; eldoc - popup help
+;;   => Requires basic search using default path.  (Header files ok)
+;; tag jump - jump to a named tag
+;;   => Requires a brute search using whole project.  (Source files only)
+;; completion - Completing symbol names in a smart way
+;;   => Basic search (headers ok)
+;; type analysis - finding type definitions for variables & fcns
+;;   => Basic search (headers ok)
+;; Class browser - organize types into some structure
+;;   => Brute search, or custom navigation.
+
+;; TODO:
+;;  During a search, load any unloaded DB files based on paths in the
+;;  current project.
+
+(require 'semanticdb)
+(require 'semanticdb-ref)
+(eval-when-compile
+  (require 'semantic-find)
+  (require 'eieio)
+  )
+
+;;; Code:
+;;;###autoload
+(defvar semanticdb-find-throttle-custom-list
+  '(repeat (radio (const 'local)
+		  (const 'project)
+		  (const 'unloaded)
+		  (const 'system)
+		  (const 'recursive)
+		  (const 'omniscience)))
+  "Customization values for semanticdb find throttle.
+See `semanticdb-find-throttle' for details.")
+
+;;;###autoload
+(defcustom semanticdb-find-default-throttle
+  '(local project unloaded system recursive)
+  "The default throttle for `semanticdb-find' routines.
+The throttle controls how detailed the list of database
+tables is for a symbol lookup.  The value is a list with
+the following keys:
+  `file'       - The file the search is being performed from.
+                 This option is here for completeness only, and
+                 is assumed to always be on.
+  `local'      - Tables from the same local directory are included.
+                 This includes files directly referenced by a file name
+                 which might be in a different directory.
+  `project'    - Tables from the same local project are included
+                 If `project' is specified, then `local' is assumed.
+  `unloaded'   - If a table is not in memory, load it.  If it is not cached
+                 on disk either, get the source, parse it, and create
+                 the table.
+  `system'     - Tables from system databases.  These are specifically
+                 tables from system header files, or language equivalent.
+  `recursive'  - For include based searches, includes tables referenced
+                 by included files.
+  `omniscience' - Included system databases which are omniscience, or
+                 somehow know everything.  Omniscience databases are found
+                 in `semanticdb-project-system-databases'.
+                 The Emacs Lisp system DB is an omniscience database."
+  :group 'semanticdb
+  :type semanticdb-find-throttle-custom-list)
+
+(defun semanticdb-find-throttle-active-p (access-type)
+  "Non-nil if ACCESS-TYPE is an active throttle type."
+  (or (memq access-type semanticdb-find-default-throttle)
+      (eq access-type 'file)
+      (and (eq access-type 'local)
+	   (memq 'project semanticdb-find-default-throttle))
+      ))
+
+;;; Index Class
+;;
+;; The find routines spend a lot of time looking stuff up.
+;; Use this handy search index to cache data between searches.
+;; This should allow searches to start running faster.
+(defclass semanticdb-find-search-index (semanticdb-abstract-search-index)
+  ((include-path :initform nil
+		 :documentation
+		 "List of semanticdb tables from the include path.")
+   (type-cache :initform nil
+	       :documentation
+	       "Cache of all the data types accessible from this file.
+Includes all types from all included files, merged namespaces, and
+expunge duplicates.")
+   )
+  "Concrete search index for `semanticdb-find'.
+This class will cache data derived during various searches.")
+
+(defmethod semantic-reset ((idx semanticdb-find-search-index))
+  "Reset the object IDX."
+  ;; Clear the include path.
+  (oset idx include-path nil)
+  (when (oref idx type-cache)
+    (semantic-reset (oref idx type-cache)))
+  ;; Clear the scope.  Scope doesn't have the data it needs to track
+  ;; its own reset.
+  (semantic-scope-reset-cache)
+  )
+
+(defmethod semanticdb-synchronize ((idx semanticdb-find-search-index)
+				   new-tags)
+  "Synchronize the search index IDX with some NEW-TAGS."
+  ;; Reset our parts.
+  (semantic-reset idx)
+  ;; Notify dependants by clearning their indicies.
+  (semanticdb-notify-references
+   (oref idx table)
+   (lambda (tab me)
+     (semantic-reset (semanticdb-get-table-index tab))))
+  )
+
+(defmethod semanticdb-partial-synchronize ((idx semanticdb-find-search-index)
+					   new-tags)
+  "Synchronize the search index IDX with some changed NEW-TAGS."
+  ;; Only reset if include statements changed.
+  (if (semantic-find-tags-by-class 'include new-tags)
+      (progn
+	(semantic-reset idx)
+	;; Notify dependants by clearning their indicies.
+	(semanticdb-notify-references
+	 (oref idx table)
+	 (lambda (tab me)
+	   (semantic-reset (semanticdb-get-table-index tab))))
+	)
+    ;; Else, not an include, by just a type.
+    (when (oref idx type-cache)
+      (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags)
+	;; If the synchronize returns true, we need to notify.
+	;; Notify dependants by clearning their indicies.
+	(semanticdb-notify-references
+	 (oref idx table)
+	 (lambda (tab me)
+	   (let ((tab-idx (semanticdb-get-table-index tab)))
+	     ;; Not a full reset?
+	     (when (oref tab-idx type-cache)
+	       (semanticdb-typecache-notify-reset
+		(oref tab-idx type-cache)))
+	     )))
+	))
+  ))
+
+
+;;; Path Translations
+;;
+;;; OVERLOAD Functions
+;;
+;; These routines needed to be overloaded by specific language modes.
+;; They are needed for translating an INCLUDE tag into a semanticdb
+;; TABLE object.
+(define-overloadable-function semanticdb-find-translate-path (path brutish)
+  "Translate PATH into a list of semantic tables.
+Path translation involves identifying the PATH input argument
+in one of the following ways:
+  nil - Take the current buffer, and use its include list
+  buffer - Use that buffer's include list.
+  filename - Use that file's include list.  If the file is not
+      in a buffer, see of there is a semanticdb table for it.  If
+      not, read that file into a buffer.
+  tag - Get that tag's buffer of file file.  See above.
+  table - Search that table, and its include list.
+  find result - Search the results of a previous find.
+
+In addition, once the base path is found, there is the possibility of
+each added table adding yet more tables to the path, so this routine
+can return a lengthy list.
+
+If argument BRUTISH is non-nil, then instead of using the include
+list, use all tables found in the parent project of the table
+identified by translating PATH.  Such searches use brute force to
+scan every available table.
+
+The return value is a list of objects of type `semanticdb-table' or
+its children.  In the case of passing in a find result, the result
+is returned unchanged.
+
+This routine uses `semanticdb-find-table-for-include' to translate
+specific include tags into a semanticdb table.
+
+Note: When searching using a non-brutish method, the list of
+included files will be cached between runs.  Database-references
+are used to track which files need to have their include lists
+refreshed when things change.  See `semanticdb-ref-test'.
+
+Note for overloading:  If you opt to overload this function for your
+major mode, and your routine takes a long time, be sure to call
+
+ (semantic-throw-on-input 'your-symbol-here)
+
+so that it can be called from the idle work handler."
+  )
+
+;;;###autoload
+(defun semanticdb-find-translate-path-default (path brutish)
+  "Translate PATH into a list of semantic tables.
+If BRUTISH is non nil, return all tables associated with PATH.
+Default action as described in `semanticdb-find-translate-path'."
+  (if (semanticdb-find-results-p path)
+      ;; nil means perform the search over these results.
+      nil
+    (if brutish
+	(semanticdb-find-translate-path-brutish-default path)
+      (semanticdb-find-translate-path-includes-default path))))
+
+;;;###autoload
+(define-overloadable-function semanticdb-find-table-for-include (includetag &optional table)
+  "For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object
+INCLUDETAG is a semantic TAG of class 'include.
+TABLE is a semanticdb table that identifies where INCLUDETAG came from.
+TABLE is optional if INCLUDETAG has an overlay of :filename attribute."
+  )
+
+(defun semanticdb-find-translate-path-brutish-default (path)
+  "Translate PATH into a list of semantic tables.
+Default action as described in `semanticdb-find-translate-path'."
+  (let ((basedb
+	 (cond ((null path) semanticdb-current-database)
+	       ((semanticdb-table-p path) (oref path parent-db))
+	       (t (let ((tt (semantic-something-to-tag-table path)))
+		    (save-excursion
+		      ;; @todo - What does this DO ??!?!
+		      (set-buffer (semantic-tag-buffer (car tt)))
+		      semanticdb-current-database))))))
+    (apply
+     #'nconc
+     (mapcar
+      (lambda (db)
+	(let ((tabs (semanticdb-get-database-tables db))
+	      (ret nil))
+	  ;; Only return tables of the same language (major-mode)
+	  ;; as the current search environment.
+	  (while tabs
+
+	    (semantic-throw-on-input 'translate-path-brutish)
+
+	    (if (semanticdb-equivalent-mode-for-search (car tabs)
+						       (current-buffer))
+		(setq ret (cons (car tabs) ret)))
+	    (setq tabs (cdr tabs)))
+	  ret))
+      ;; FIXME:
+      ;; This should scan the current project directory list for all
+      ;; semanticdb files, perhaps handling proxies for them.
+      (semanticdb-current-database-list
+       (if basedb (oref basedb reference-directory)
+	 default-directory))))
+    ))
+
+(defun semanticdb-find-incomplete-cache-entries-p (cache)
+  "Are there any incomplete entries in CACHE?"
+  (let ((ans nil))
+    (dolist (tab cache)
+      (when (and (semanticdb-table-child-p tab)
+		 (not (number-or-marker-p (oref tab pointmax))))
+	(setq ans t))
+      )
+    ans))
+
+(defun semanticdb-find-need-cache-update-p (table)
+  "Non nil if the semanticdb TABLE cache needs to be updated."
+  ;; If we were passed in something related to a TABLE,
+  ;; do a caching lookup.
+  (let* ((index (semanticdb-get-table-index table))
+	 (cache (when index (oref index include-path)))
+	 (incom (semanticdb-find-incomplete-cache-entries-p cache))
+	 (unl (semanticdb-find-throttle-active-p 'unloaded))
+	 )
+    (if (and
+	 cache ;; Must have a cache
+	 (or
+	  ;; If all entries are "full", or if 'unloaded
+	  ;; OR
+	  ;; is not in the throttle, it is ok to use the cache.
+	  (not incom) (not unl)
+	  ))
+	nil
+      ;;cache
+      ;; ELSE
+      ;;
+      ;; We need an update.
+      t))
+  )
+
+(defun semanticdb-find-translate-path-includes-default (path)
+  "Translate PATH into a list of semantic tables.
+Default action as described in `semanticdb-find-translate-path'."
+  (let ((table (cond ((null path)
+		      semanticdb-current-table)
+		     ((bufferp path)
+		      (semantic-buffer-local-value 'semanticdb-current-table path))
+		     ((and (stringp path) (file-exists-p path))
+		      (semanticdb-file-table-object path t))
+		     ((semanticdb-abstract-table-child-p path)
+		      path)
+		     (t nil))))
+    (if table
+	;; If we were passed in something related to a TABLE,
+	;; do a caching lookup.
+	(let ((index (semanticdb-get-table-index table)))
+	  (if (semanticdb-find-need-cache-update-p table)
+	      ;; Lets go look up our indicies
+	      (let ((ans (semanticdb-find-translate-path-includes--internal path)))
+		(oset index include-path ans)
+		;; Once we have our new indicies set up, notify those
+		;; who depend on us if we found something for them to
+		;; depend on.
+		(when ans (semanticdb-refresh-references table))
+		ans)
+	    ;; ELSE
+	    ;;
+	    ;; Just return the cache.
+	    (oref index include-path)))
+      ;; If we were passed in something like a tag list, or other boring
+      ;; searchable item, then instead do the regular thing without caching.
+      (semanticdb-find-translate-path-includes--internal path))))
+
+(defvar semanticdb-find-lost-includes nil
+  "Include files that we cannot find associated with this buffer.")
+(make-variable-buffer-local 'semanticdb-find-lost-includes)
+
+(defvar semanticdb-find-scanned-include-tags nil
+  "All include tags scanned, plus action taken on the tag.
+Each entry is an alist:
+  (ACTION . TAG)
+where ACTION is one of 'scanned, 'duplicate, 'lost.
+and TAG is a clone of the include tag that was found.")
+(make-variable-buffer-local 'semanticdb-find-scanned-include-tags)
+
+(defvar semanticdb-implied-include-tags nil
+  "Include tags implied for all files of a given mode.
+Set this variable with `defvar-mode-local' for a particular mode so
+that any symbols that exist for all files for that mode are included.
+
+Note: This could be used as a way to write a file in a language
+to declare all the built-ins for that language.")
+
+(defun semanticdb-find-translate-path-includes--internal (path)
+  "Internal implementation of `semanticdb-find-translate-path-includes-default'.
+This routine does not depend on the cache, but will always derive
+a new path from the provided PATH."
+  (let ((includetags nil)
+	(curtable nil)
+	(matchedtables (list semanticdb-current-table))
+	(matchedincludes nil)
+	(lostincludes nil)
+	(scannedincludes nil)
+	(incfname nil)
+	nexttable)
+    (cond ((null path)
+	   (semantic-refresh-tags-safe)
+	   (setq includetags (append
+			      (semantic-find-tags-included (current-buffer))
+			      semanticdb-implied-include-tags)
+		 curtable semanticdb-current-table
+		 incfname (buffer-file-name))
+	   )
+	  ((semanticdb-table-p path)
+	   (setq includetags (semantic-find-tags-included path)
+		 curtable path
+		 incfname (semanticdb-full-filename path))
+	   )
+	  ((bufferp path)
+	   (save-excursion
+	     (set-buffer path)
+	     (semantic-refresh-tags-safe))
+	   (setq includetags (semantic-find-tags-included path)
+		 curtable (save-excursion (set-buffer path)
+					  semanticdb-current-table)
+		 incfname (buffer-file-name path)))
+	  (t
+	   (setq includetags (semantic-find-tags-included path))
+	   (when includetags
+	     ;; If we have some tags, derive a table from them.
+	     ;; else we will do nothing, so the table is useless.
+
+	     ;; @todo - derive some tables
+	     (message "Need to derive tables for %S in translate-path-includes--default."
+		      path)
+	   )))
+
+    ;; Make sure each found include tag has an originating file name associated
+    ;; with it.
+    (when incfname
+      (dolist (it includetags)
+	(semantic--tag-put-property it :filename incfname)))
+
+    ;; Loop over all include tags adding to matchedtables
+    (while includetags
+      (semantic-throw-on-input 'semantic-find-translate-path-includes-default)
+
+      ;; If we've seen this include string before, lets skip it.
+      (if (member (semantic-tag-name (car includetags)) matchedincludes)
+	  (progn
+	    (setq nexttable nil)
+	    (push (cons 'duplicate (semantic-tag-clone (car includetags)))
+		  scannedincludes)
+	    )
+	(setq nexttable (semanticdb-find-table-for-include (car includetags) curtable))
+	(when (not nexttable)
+	  ;; Save the lost include.
+	  (push (car includetags) lostincludes)
+	  (push (cons 'lost (semantic-tag-clone (car includetags)))
+		scannedincludes)
+	  )
+	)
+
+      ;; Push the include file, so if we can't find it, we only
+      ;; can't find it once.
+      (push (semantic-tag-name (car includetags)) matchedincludes)
+
+      ;; (message "Scanning %s" (semantic-tag-name (car includetags)))
+      (when (and nexttable
+		 (not (memq nexttable matchedtables))
+		 (semanticdb-equivalent-mode-for-search nexttable
+							(current-buffer))
+		 )
+	;; Add to list of tables
+	(push nexttable matchedtables)
+
+	;; Queue new includes to list
+	(if (semanticdb-find-throttle-active-p 'recursive)
+	    ;; @todo - recursive includes need to have the originating
+	    ;;         buffer's location added to the path.
+	    (let ((newtags
+		   (cond
+		    ((semanticdb-table-p nexttable)
+		     (semanticdb-refresh-table nexttable)
+		     ;; Use the method directly, or we will recurse
+		     ;; into ourselves here.
+		     (semanticdb-find-tags-by-class-method
+		      nexttable 'include))
+		    (t ;; @todo - is this ever possible???
+		     (message "semanticdb-ftp - how did you do that?")
+		     (semantic-find-tags-included
+		      (semanticdb-get-tags nexttable)))
+		    ))
+		  (newincfname (semanticdb-full-filename nexttable))
+		  )
+
+	      (push (cons 'scanned (semantic-tag-clone (car includetags)))
+		    scannedincludes)
+
+	      ;; Setup new tags so we know where they are.
+	      (dolist (it newtags)
+		(semantic--tag-put-property it :filename
+					    newincfname))
+
+	      (setq includetags (nconc includetags newtags)))
+	  ;; ELSE - not recursive throttle
+	  (push (cons 'scanned-no-recurse
+		      (semantic-tag-clone (car includetags)))
+		scannedincludes)
+	  )
+	)
+      (setq includetags (cdr includetags)))
+
+    (setq semanticdb-find-lost-includes lostincludes)
+    (setq semanticdb-find-scanned-include-tags (reverse scannedincludes))
+
+    ;; Find all the omniscient databases for this major mode, and
+    ;; add them if needed
+    (when (and (semanticdb-find-throttle-active-p 'omniscience)
+	       semanticdb-search-system-databases)
+      ;; We can append any mode-specific omniscience databases into
+      ;; our search list here.
+      (let ((systemdb semanticdb-project-system-databases)
+	    (ans nil))
+	(while systemdb
+	  (setq ans (semanticdb-file-table
+		     (car systemdb)
+		     ;; I would expect most omniscient to return the same
+		     ;; thing reguardless of filename, but we may have
+		     ;; one that can return a table of all things the
+		     ;; current file needs.
+		     (buffer-file-name (current-buffer))))
+	  (when (not (memq ans matchedtables))
+	    (setq matchedtables (cons ans matchedtables)))
+	  (setq systemdb (cdr systemdb))))
+      )
+    (nreverse matchedtables)))
+
+(define-overloadable-function semanticdb-find-load-unloaded (filename)
+  "Create a database table for FILENAME if it hasn't been parsed yet.
+Assumes that FILENAME exists as a source file.
+Assumes that a preexisting table does not exist, even if it
+isn't in memory yet."
+  (if (semanticdb-find-throttle-active-p 'unloaded)
+      (:override)
+    (semanticdb-file-table-object filename t)))
+
+(defun semanticdb-find-load-unloaded-default (filename)
+  "Load an unloaded file in FILENAME using the default semanticdb loader."
+  (semanticdb-file-table-object filename))
+
+;; The creation of the overload occurs above.
+(defun semanticdb-find-table-for-include-default (includetag &optional table)
+  "Default implementation of `semanticdb-find-table-for-include'.
+Uses `semanticdb-current-database-list' as the search path.
+INCLUDETAG and TABLE are documented in `semanticdb-find-table-for-include'.
+Included databases are filtered based on `semanticdb-find-default-throttle'."
+  (if (not (eq (semantic-tag-class includetag) 'include))
+      (signal 'wrong-type-argument (list includetag 'include)))
+
+  (let ((name
+	 ;; Note, some languages (like Emacs or Java) use include tag names
+	 ;; that don't represent files!  We want to have file names.
+	 (semantic-tag-include-filename includetag))
+	(originfiledir nil)
+	(roots nil)
+	(tmp nil)
+	(ans nil))
+
+    ;; INCLUDETAG should have some way to reference where it came
+    ;; from!  If not, TABLE should provide the way.  Each time we
+    ;; look up a tag, we may need to find it in some relative way
+    ;; and must set our current buffer eto the origin of includetag
+    ;; or nothing may work.
+    (setq originfiledir
+	  (cond ((semantic-tag-file-name includetag)
+		 ;; A tag may have a buffer, or a :filename property.
+		 (file-name-directory (semantic-tag-file-name includetag)))
+		(table
+		 (file-name-directory (semanticdb-full-filename table)))
+		(t
+		 ;; @todo - what to do here?  Throw an error maybe
+		 ;; and fix usage bugs?
+		 default-directory)))
+
+    (cond
+     ;; Step 1: Relative path name
+     ;;
+     ;; If the name is relative, then it should be findable as relative
+     ;; to the source file that this tag originated in, and be fast.
+     ;;
+     ((and (semanticdb-find-throttle-active-p 'local)
+	   (file-exists-p (expand-file-name name originfiledir)))
+
+      (setq ans (semanticdb-find-load-unloaded
+		 (expand-file-name name originfiledir)))
+      )
+     ;; Step 2: System or Project level includes
+     ;;
+     ((or
+       ;; First, if it a system include, we can investigate that tags
+       ;; dependency file
+       (and (semanticdb-find-throttle-active-p 'system)
+
+	    ;; Sadly, not all languages make this distinction.
+	    ;;(semantic-tag-include-system-p includetag)
+
+	    ;; Here, we get local and system files.
+	    (setq tmp (semantic-dependency-tag-file includetag))
+	    )
+       ;; Second, project files are active, we and we have EDE,
+       ;; we can find it using the same tool.
+       (and (semanticdb-find-throttle-active-p 'project)
+	    ;; Make sure EDE is available, and we have a project
+	    (featurep 'ede) (ede-current-project originfiledir)
+	    ;; The EDE query is hidden in this call.
+	    (setq tmp (semantic-dependency-tag-file includetag))
+	    )
+       )
+      (setq ans (semanticdb-find-load-unloaded tmp))
+      )
+     ;; Somewhere in our project hierarchy
+     ;;
+     ;; Remember: Roots includes system databases which can create
+     ;; specialized tables we can search.
+     ;;
+     ;; NOTE: Not used if EDE is active!
+     ((and (semanticdb-find-throttle-active-p 'project)
+	   ;; And dont do this if it is a system include.  Not supported by all languages,
+	   ;; but when it is, this is a nice fast way to skip this step.
+	   (not (semantic-tag-include-system-p includetag))
+	   ;; Don't do this if we have an EDE project.
+	   (not (and (featurep 'ede)
+		     ;; Note: We don't use originfiledir here because
+		     ;; we want to know about the source file we are
+		     ;; starting from.
+		     (ede-current-project)))
+	   )
+
+      (setq roots (semanticdb-current-database-list))
+
+      (while (and (not ans) roots)
+	(let* ((ref (if (slot-boundp (car roots) 'reference-directory)
+			(oref (car roots) reference-directory)))
+	       (fname (cond ((null ref) nil)
+			    ((file-exists-p (expand-file-name name ref))
+			     (expand-file-name name ref))
+			    ((file-exists-p (expand-file-name (file-name-nondirectory name) ref))
+			     (expand-file-name (file-name-nondirectory name) ref)))))
+	  (when (and ref fname)
+	    ;; There is an actual file.  Grab it.
+	    (setq ans (semanticdb-find-load-unloaded fname)))
+
+	  ;; ELSE
+	  ;;
+	  ;; NOTE: We used to look up omniscient databases here, but that
+	  ;; is now handled one layer up.
+	  ;;
+	  ;; Missing: a database that knows where missing files are.  Hmm.
+	  ;; perhaps I need an override function for that?
+
+	  )
+
+	(setq roots (cdr roots))))
+     )
+    ans))
+
+
+;;; Perform interactive tests on the path/search mechanisms.
+;;
+;;;###autoload
+(defun semanticdb-find-test-translate-path (&optional arg)
+  "Call and output results of `semanticdb-find-translate-path'.
+With ARG non-nil, specify a BRUTISH translation.
+See `semanticdb-find-default-throttle' and `semanticdb-project-roots'
+for details on how this list is derived."
+  (interactive "P")
+  (semantic-fetch-tags)
+  (require 'data-debug)
+  (let ((start (current-time))
+	(p (semanticdb-find-translate-path nil arg))
+	(end (current-time))
+	)
+    (data-debug-new-buffer "*SEMANTICDB FTP ADEBUG*")
+    (message "Search of tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-insert-stuff-list p "*")))
+
+(defun semanticdb-find-test-translate-path-no-loading (&optional arg)
+  "Call and output results of `semanticdb-find-translate-path'.
+With ARG non-nil, specify a BRUTISH translation.
+See `semanticdb-find-default-throttle' and `semanticdb-project-roots'
+for details on how this list is derived."
+  (interactive "P")
+  (semantic-fetch-tags)
+  (require 'data-debug)
+  (let* ((semanticdb-find-default-throttle
+	  (if (featurep 'semanticdb-find)
+	      (remq 'unloaded semanticdb-find-default-throttle)
+	    nil))
+	 (start (current-time))
+	 (p (semanticdb-find-translate-path nil arg))
+	 (end (current-time))
+	 )
+    (data-debug-new-buffer "*SEMANTICDB FTP ADEBUG*")
+    (message "Search of tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-insert-stuff-list p "*")))
+
+(defun semanticdb-find-adebug-lost-includes ()
+  "Translate the current path, then display the lost includes.
+Examines the variable `semanticdb-find-lost-includes'."
+  (interactive)
+  (require 'data-debug)
+  (semanticdb-find-translate-path nil nil)
+  (let ((lost semanticdb-find-lost-includes)
+	)
+
+    (if (not lost)
+	(message "There are no unknown includes for %s"
+		 (buffer-name))
+
+      (data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*")
+      (data-debug-insert-tag-list lost "*")
+      )))
+
+(defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext)
+  "Insert a button representing scanned include CONSDATA.
+PREFIX is the text that precedes the button.
+PREBUTTONTEXT is some text between prefix and the overlay button."
+  (let* ((start (point))
+	 (end nil)
+	 (mode (car consdata))
+	 (tag (cdr consdata))
+	 (name (semantic-tag-name tag))
+	 (file (semantic-tag-file-name tag))
+	 (str1 (format "%S %s" mode name))
+	 (str2 (format " : %s" file))
+	 (tip nil))
+    (insert prefix prebuttontext str1)
+    (setq end (point))
+    (insert str2)
+    (put-text-property start end 'face
+		       (cond ((eq mode 'scanned)
+			      'font-lock-function-name-face)
+			     ((eq mode 'duplicate)
+			      'font-lock-comment-face)
+			     ((eq mode 'lost)
+			      'font-lock-variable-name-face)
+			     ((eq mode 'scanned-no-recurse)
+			      'font-lock-type-face)))
+    (put-text-property start end 'ddebug (cdr consdata))
+    (put-text-property start end 'ddebug-indent(length prefix))
+    (put-text-property start end 'ddebug-prefix prefix)
+    (put-text-property start end 'help-echo tip)
+    (put-text-property start end 'ddebug-function
+		       'data-debug-insert-tag-parts-from-point)
+    (insert "\n")
+    )
+  )
+
+;;;###autoload
+(defun semanticdb-find-adebug-scanned-includes ()
+  "Translate the current path, then display the lost includes.
+Examines the variable `semanticdb-find-lost-includes'."
+  (interactive)
+  (require 'data-debug)
+  (semanticdb-find-translate-path nil nil)
+  (let ((scanned semanticdb-find-scanned-include-tags)
+	(data-debug-thing-alist
+	 (cons
+	  '((lambda (thing) (and (consp thing)
+				 (symbolp (car thing))
+				 (memq (car thing)
+				       '(scanned scanned-no-recurse
+						 lost duplicate))))
+	    . semanticdb-find-adebug-insert-scanned-tag-cons)
+	  data-debug-thing-alist))
+	)
+
+    (if (not scanned)
+	(message "There are no includes scanned %s"
+		 (buffer-name))
+
+      (data-debug-new-buffer "*SEMANTICDB scanned-includes ADEBUG*")
+      (data-debug-insert-stuff-list scanned "*")
+      )))
+
+;;; FIND results and edebug
+;;
+(eval-after-load "cedet-edebug"
+  '(progn
+     (cedet-edebug-add-print-override
+      '(semanticdb-find-results-p object)
+      '(semanticdb-find-result-prin1-to-string object) )
+     ))
+
+
+
+;;; API Functions
+;;
+;; Once you have a search result, use these routines to operate
+;; on the search results at a higher level
+
+;;;###autoload
+(defun semanticdb-strip-find-results (results &optional find-file-match)
+  "Strip a semanticdb search RESULTS to exclude objects.
+This makes it appear more like the results of a `semantic-find-' call.
+Optional FIND-FILE-MATCH loads all files associated with RESULTS
+into buffers.  This has the side effect of enabling `semantic-tag-buffer' to
+return a value.
+If FIND-FILE-MATCH is 'name, then only the filename is stored
+in each tag instead of loading each file into a buffer.
+If the input RESULTS are not going to be used again, and if
+FIND-FILE-MATCH is nil, you can use `semanticdb-fast-strip-find-results'
+instead."
+  (if find-file-match
+      ;; Load all files associated with RESULTS.
+      (let ((tmp results)
+	    (output nil))
+	(while tmp
+	  (let ((tab (car (car tmp)))
+		(tags (cdr (car tmp))))
+	    (dolist (T tags)
+	      ;; Normilzation gives specialty database tables a chance
+	      ;; to convert into a more stable tag format.
+	      (let* ((norm (semanticdb-normalize-one-tag tab T))
+		     (ntab (car norm))
+		     (ntag (cdr norm))
+		     (nametable ntab))
+
+		;; If it didn't normalize, use what we had.
+		(if (not norm)
+		    (setq nametable tab)
+		  (setq output (append output (list ntag))))
+
+		;; Find-file-match allows a tool to make sure the tag is
+		;; 'live', somewhere in a buffer.
+		(cond ((eq find-file-match 'name)
+		       (let ((f (semanticdb-full-filename nametable)))
+			 (semantic--tag-put-property ntag :filename f)))
+		      ((and find-file-match ntab)
+		       (semanticdb-get-buffer ntab))
+		      )
+		))
+	    )
+	  (setq tmp (cdr tmp)))
+	output)
+    ;; @todo - I could use nconc, but I don't know what the caller may do with
+    ;;         RESULTS after this is called.  Right now semantic-complete will
+    ;;         recycling the input after calling this routine.
+    (apply #'append (mapcar #'cdr results))))
+
+;;;###autoload
+(defun semanticdb-fast-strip-find-results (results)
+  "Destructively strip a semanticdb search RESULTS to exclude objects.
+This makes it appear more like the results of a `semantic-find-' call.
+This is like `semanticdb-strip-find-results', except the input list RESULTS
+will be changed."
+  (apply #'nconc (mapcar #'cdr results)))
+
+;;;###autoload
+(defun semanticdb-find-results-p (resultp)
+  "Non-nil if RESULTP is in the form of a semanticdb search result.
+This query only really tests the first entry in the list that is RESULTP,
+but should be good enough for debugging assertions."
+  (and (listp resultp)
+       (listp (car resultp))
+       (semanticdb-abstract-table-child-p (car (car resultp)))
+       (or (semantic-tag-p (car (cdr (car resultp))))
+	   (null (car (cdr (car resultp)))))))
+
+(defun semanticdb-find-result-prin1-to-string (result)
+  "Presuming RESULT satisfies `semanticdb-find-results-p', provide a short PRIN1 output."
+  (if (< (length result) 2)
+      (concat "#<FIND RESULT "
+	      (mapconcat (lambda (a)
+			   (concat "(" (object-name (car a) ) " . "
+				   "#<TAG LIST " (number-to-string (length (cdr a))) ">)"))
+			 result
+			 " ")
+	      ">")
+    ;; Longer results should have an abreviated form.
+    (format "#<FIND RESULT %d TAGS in %d FILES>"
+	    (semanticdb-find-result-length result)
+	    (length result))))
+
+;;;###autoload
+(defun semanticdb-find-result-with-nil-p (resultp)
+  "Non-nil of RESULTP is in the form of a semanticdb search result.
+nil is a valid value where a TABLE usually is, but only if the TAG
+results include overlays.
+This query only really tests the first entry in the list that is RESULTP,
+but should be good enough for debugging assertions."
+  (and (listp resultp)
+       (listp (car resultp))
+       (let ((tag-to-test (car-safe (cdr (car resultp)))))
+	 (or (and (semanticdb-abstract-table-child-p (car (car resultp)))
+		  (or (semantic-tag-p tag-to-test)
+		      (null tag-to-test)))
+	     (and (null (car (car resultp)))
+		  (or (semantic-tag-with-position-p tag-to-test)
+		      (null tag-to-test))))
+	 )))
+
+(defun semanticdb-find-result-length (result)
+  "Number of tags found in RESULT."
+  (let ((count 0))
+    (mapc (lambda (onetable)
+	    (setq count (+ count (1- (length onetable)))))
+	  result)
+    count))
+
+;;;###autoload
+(defun semanticdb-find-result-nth (result n)
+  "In RESULT, return the Nth search result.
+This is a 0 based search result, with the first match being element 0.
+
+The returned value is a cons cell: (TAG . TABLE) where TAG
+is the tag at the Nth position.  TABLE is the semanticdb table where
+the TAG was found.  Sometimes TABLE can be nil."
+  (let ((ans nil)
+	(anstable nil))
+    ;; Loop over each single table hit.
+    (while (and (not ans) result)
+      ;; For each table result, get local length, and modify
+      ;; N to be that much less.
+      (let ((ll (length (cdr (car result))))) ;; local length
+	(if (> ll n)
+	    ;; We have a local match.
+	    (setq ans (nth n (cdr (car result)))
+		  anstable (car (car result)))
+	  ;; More to go.  Decrement N.
+	  (setq n (- n ll))))
+      ;; Keep moving.
+      (setq result (cdr result)))
+    (cons ans anstable)))
+
+(defun semanticdb-find-result-test (result)
+  "Test RESULT by accessing all the tags in the list."
+  (if (not (semanticdb-find-results-p result))
+      (error "Does not pass `semanticdb-find-results-p.\n"))
+  (let ((len (semanticdb-find-result-length result))
+	(i 0))
+    (while (< i len)
+      (let ((tag (semanticdb-find-result-nth result i)))
+	(if (not (semantic-tag-p (car tag)))
+	    (error "%d entry is not a tag" i)))
+      (setq i (1+ i)))))
+
+;;;###autoload
+(defun semanticdb-find-result-nth-in-buffer (result n)
+  "In RESULT, return the Nth search result.
+Like `semanticdb-find-result-nth', except that only the TAG
+is returned, and the buffer it is found it will be made current.
+If the result tag has no position information, the originating buffer
+is still made current."
+  (let* ((ret (semanticdb-find-result-nth result n))
+	 (ans (car ret))
+	 (anstable (cdr ret)))
+    ;; If we have a hit, double-check the find-file
+    ;; entry.  If the file must be loaded, then gat that table's
+    ;; source file into a buffer.
+
+    (if anstable
+	(let ((norm (semanticdb-normalize-one-tag anstable ans)))
+	  (when norm
+	    ;; The normalized tags can now be found based on that
+	    ;; tags table.
+	    (semanticdb-set-buffer (car norm))
+	    ;; Now reset ans
+	    (setq ans (cdr norm))
+	    ))
+      )
+    ;; Return the tag.
+    ans))
+
+;;;###autoload
+(defun semanticdb-find-result-mapc (fcn result)
+  "Apply FCN to each element of find RESULT for side-effects only.
+FCN takes two arguments.  The first is a TAG, and the
+second is a DB from whence TAG originated.
+Returns result."
+  (mapc (lambda (sublst)
+	  (mapc (lambda (tag)
+		  (funcall fcn tag (car sublst)))
+		(cdr sublst)))
+	result)
+  result)
+
+;;; Search Logging
+;;
+;; Basic logging to see what the search routines are doing.
+(defvar semanticdb-find-log-flag nil
+  "Non-nil means log the process of searches.")
+
+(defvar semanticdb-find-log-buffer-name "*SemanticDB Find Log*"
+  "The name of the logging buffer.")
+
+(defun semanticdb-find-toggle-logging ()
+  "Toggle semanticdb logging."
+  (interactive)
+  (setq semanticdb-find-log-flag (null semanticdb-find-log-flag))
+  (message "Semanticdb find logging is %sabled"
+	   (if semanticdb-find-log-flag "en" "dis")))
+
+(defun semanticdb-reset-log ()
+  "Reset the log buffer."
+  (interactive)
+  (when semanticdb-find-log-flag
+    (save-excursion
+      (set-buffer (get-buffer-create semanticdb-find-log-buffer-name))
+      (erase-buffer)
+      )))
+
+(defun semanticdb-find-log-move-to-end ()
+  "Move to the end of the semantic log."
+  (let ((cb (current-buffer))
+	(cw (selected-window)))
+    (unwind-protect
+	(progn
+	  (set-buffer semanticdb-find-log-buffer-name)
+	  (if (get-buffer-window (current-buffer) 'visible)
+	      (select-window (get-buffer-window (current-buffer) 'visible)))
+	  (goto-char (point-max)))
+      (if cw (select-window cw))
+      (set-buffer cb))))
+
+(defun semanticdb-find-log-new-search (forwhat)
+  "Start a new search FORWHAT."
+  (when semanticdb-find-log-flag
+    (save-excursion
+      (set-buffer (get-buffer-create semanticdb-find-log-buffer-name))
+      (insert (format "New Search: %S\n" forwhat))
+      )
+    (semanticdb-find-log-move-to-end)))
+
+(defun semanticdb-find-log-activity (table result)
+  "Log that TABLE has been searched and RESULT was found."
+  (when semanticdb-find-log-flag
+    (save-excursion
+      (set-buffer semanticdb-find-log-buffer-name)
+      (insert "Table: " (object-print table)
+	      " Result: " (int-to-string (length result)) " tags"
+	      "\n")
+      )
+    (semanticdb-find-log-move-to-end)))
+
+;;; Semanticdb find API functions
+;;
+;; These are the routines actually used to perform searches.
+;;
+;;;###autoload
+(defun semanticdb-find-tags-collector (function &optional path find-file-match
+						brutish)
+  "Collect all tags returned by FUNCTION over PATH.
+The FUNCTION must take two arguments.  The first is TABLE,
+which is a semanticdb table containing tags.  The second argument
+to FUNCTION is TAGS.  TAGS may be a list of tags.  If TAGS is non-nil, then
+FUNCTION should search the TAG list, not through TABLE.
+
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer.
+
+Note: You should leave FIND-FILE-MATCH as nil.  It is far more
+efficient to take the results from any search and use
+`semanticdb-strip-find-results' instead.  This argument is here
+for backward compatibility.
+
+If optional argument BRUTISH is non-nil, then ignore include statements,
+and search all tables in this project tree."
+  (let (found match)
+    (save-excursion
+      ;; If path is a buffer, set ourselves up in that buffer
+      ;; so that the override methods work correctly.
+      (when (bufferp path) (set-buffer path))
+      (if (semanticdb-find-results-p path)
+	  ;; When we get find results, loop over that.
+	  (dolist (tableandtags path)
+	    (semantic-throw-on-input 'semantic-find-translate-path)
+	    ;; If FIND-FILE-MATCH is non-nil, skip tables of class
+	    ;; `semanticdb-search-results-table', since those are system
+	    ;; databases and not associated with a file.
+	    (unless (and find-file-match
+			 (obj-of-class-p
+			  (car tableandtags) semanticdb-search-results-table))
+	      (when (setq match (funcall function
+					 (car tableandtags) (cdr tableandtags)))
+		(when find-file-match
+		  (save-excursion (semanticdb-set-buffer (car tableandtags))))
+		(push (cons (car tableandtags) match) found)))
+    	    )
+	;; Only log searches across data bases.
+	(semanticdb-find-log-new-search nil)
+	;; If we get something else, scan the list of tables resulting
+	;; from translating it into a list of objects.
+	(dolist (table (semanticdb-find-translate-path path brutish))
+	  (semantic-throw-on-input 'semantic-find-translate-path)
+	  ;; If FIND-FILE-MATCH is non-nil, skip tables of class
+	  ;; `semanticdb-search-results-table', since those are system
+	  ;; databases and not associated with a file.
+	  (unless (and find-file-match
+		       (obj-of-class-p table semanticdb-search-results-table))
+	    (when (and table (setq match (funcall function table nil)))
+	      (semanticdb-find-log-activity table match)
+	      (when find-file-match
+		(save-excursion (semanticdb-set-buffer table)))
+	      (push (cons table match) found))))))
+    ;; At this point, FOUND has had items pushed onto it.
+    ;; This means items are being returned in REVERSE order
+    ;; of the tables searched, so if you just get th CAR, then
+    ;; too-bad, you may have some system-tag that has no
+    ;; buffer associated with it.
+
+    ;; It must be reversed.
+    (nreverse found)))
+
+;;;###autoload
+(defun semanticdb-find-tags-by-name (name &optional path find-file-match)
+  "Search for all tags matching NAME on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-by-name-method table name tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-find-tags-by-name-regexp (regexp &optional path find-file-match)
+  "Search for all tags matching REGEXP on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-by-name-regexp-method table regexp tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-find-tags-for-completion (prefix &optional path find-file-match)
+  "Search for all tags matching PREFIX on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-for-completion-method table prefix tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-find-tags-by-class (class &optional path find-file-match)
+  "Search for all tags of CLASS on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-by-class-method table class tags))
+   path find-file-match))
+
+;;; Deep Searches
+;;
+;;;###autoload
+(defun semanticdb-deep-find-tags-by-name (name &optional path find-file-match)
+  "Search for all tags matching NAME on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-deep-find-tags-by-name-method table name tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-deep-find-tags-by-name-regexp (regexp &optional path find-file-match)
+  "Search for all tags matching REGEXP on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-deep-find-tags-by-name-regexp-method table regexp tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-deep-find-tags-for-completion (prefix &optional path find-file-match)
+  "Search for all tags matching PREFIX on PATH.
+Search also in all components of top level tags founds.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-deep-find-tags-for-completion-method table prefix tags))
+   path find-file-match))
+
+;;; Brutish Search Routines
+;;
+;;;###autoload
+(defun semanticdb-brute-deep-find-tags-by-name (name &optional path find-file-match)
+  "Search for all tags matching NAME on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated wit that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-deep-find-tags-by-name-method table name tags))
+   path find-file-match t))
+
+;;;###autoload
+(defun semanticdb-brute-deep-find-tags-for-completion (prefix &optional path find-file-match)
+  "Search for all tags matching PREFIX on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated wit that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-deep-find-tags-for-completion-method table prefix tags))
+   path find-file-match t))
+
+;;;###autoload
+(defun semanticdb-brute-find-tags-by-class (class &optional path find-file-match)
+  "Search for all tags of CLASS on PATH.
+See `semanticdb-find-translate-path' for details on PATH.
+The argument BRUTISH will be set so that searching includes all tables
+in the current project.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-by-class-method table class tags))
+   path find-file-match t))
+
+;;; Specialty Search Routines
+;;
+;;;###autoload
+(defun semanticdb-find-tags-external-children-of-type
+  (type &optional path find-file-match)
+  "Search for all tags defined outside of TYPE w/ TYPE as a parent.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-external-children-of-type-method table type tags))
+   path find-file-match))
+
+;;;###autoload
+(defun semanticdb-find-tags-subclasses-of-type
+  (type &optional path find-file-match)
+  "Search for all tags of class type defined that subclass TYPE.
+See `semanticdb-find-translate-path' for details on PATH.
+FIND-FILE-MATCH indicates that any time a match is found, the file
+associated with that tag should be loaded into a buffer."
+  (semanticdb-find-tags-collector
+   (lambda (table tags)
+     (semanticdb-find-tags-subclasses-of-type-method table type tags))
+   path find-file-match t))
+
+;;; METHODS
+;;
+;; Default methods for semanticdb database and table objects.
+;; Override these with system databases to as new types of back ends.
+
+;;; Top level Searches
+(defmethod semanticdb-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags)
+  "In TABLE, find all occurances of tags with NAME.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (semantic-find-tags-by-name name (or tags (semanticdb-get-tags table))))
+
+(defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags)
+  "In TABLE, find all occurances of tags matching REGEXP.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (semantic-find-tags-by-name-regexp regexp (or tags (semanticdb-get-tags table))))
+
+(defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (semantic-find-tags-for-completion prefix (or tags (semanticdb-get-tags table))))
+
+(defmethod semanticdb-find-tags-by-class-method ((table semanticdb-abstract-table) class &optional tags)
+  "In TABLE, find all occurances of tags of CLASS.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (semantic-find-tags-by-class class (or tags (semanticdb-get-tags table))))
+
+(defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-abstract-table) parent &optional tags)
+   "In TABLE, find all occurances of tags whose parent is the PARENT type.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+   (semantic-find-tags-external-children-of-type parent (or tags (semanticdb-get-tags table))))
+
+(defmethod semanticdb-find-tags-subclasses-of-type-method ((table semanticdb-abstract-table) parent &optional tags)
+   "In TABLE, find all occurances of tags whose parent is the PARENT type.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+   (semantic-find-tags-subclasses-of-type parent (or tags (semanticdb-get-tags table))))
+
+;;; Deep Searches
+(defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags)
+  "In TABLE, find all occurances of tags with NAME.
+Search in all tags in TABLE, and all components of top level tags in
+TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a table of all matching tags."
+  (semantic-find-tags-by-name name (semantic-flatten-tags-table (or tags (semanticdb-get-tags table)))))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags)
+  "In TABLE, find all occurances of tags matching REGEXP.
+Search in all tags in TABLE, and all components of top level tags in
+TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a table of all matching tags."
+  (semantic-find-tags-by-name-regexp regexp (semantic-flatten-tags-table (or tags (semanticdb-get-tags table)))))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Search in all tags in TABLE, and all components of top level tags in
+TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a table of all matching tags."
+  (semantic-find-tags-for-completion prefix (semantic-flatten-tags-table (or tags (semanticdb-get-tags table)))))
+
+(provide 'semanticdb-find)
+
+;;; semanticdb-find.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-global.el b/site/cedet-1.0pre7/semantic/semanticdb-global.el
new file mode 100644
index 0000000..79d53ec
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-global.el
@@ -0,0 +1,249 @@
+;;; semanticdb-global.el --- Semantic database extensions for GLOBAL
+
+;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-global.el,v 1.10 2009/09/29 01:32:34 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; Use GNU Global for by-name database searches.
+;;
+;; This will work as an "omniscient" database for a given project.
+;;
+
+(require 'semantic-symref-global)
+
+(eval-when-compile
+  ;; For generic function searching.
+  (require 'eieio)
+  (require 'eieio-opt)
+  )
+;;; Code:
+;;;###autoload
+(defun semanticdb-enable-gnu-global-databases (mode)
+  "Enable the use of the GNU Global SemanticDB back end for all files of MODE.
+This will add an instance of a GNU Global database to each buffer
+in a GNU Global supported hierarchy."
+  (interactive
+   (list (completing-read
+          "Emable in Mode: " obarray
+          #'(lambda (s) (get s 'mode-local-symbol-table))
+          t (symbol-name major-mode))))
+
+  ;; First, make sure the version is ok.
+  (cedet-gnu-global-version-check)
+
+  ;; Make sure mode is a symbol.
+  (when (stringp mode)
+    (setq mode (intern mode)))
+
+  (let ((ih (mode-local-value mode 'semantic-init-mode-hook)))
+    (eval `(setq-mode-local
+	    ,mode semantic-init-mode-hook
+	    (cons 'semanticdb-enable-gnu-global-hook ih))))
+
+  )
+
+(defun semanticdb-enable-gnu-global-hook ()
+  "Add support for GNU Global in the current buffer via semantic-init-hook.
+MODE is the major mode to support."
+  (semanticdb-enable-gnu-global-in-buffer t))
+
+(defclass semanticdb-project-database-global
+  ;; @todo - convert to one DB per directory.
+  (semanticdb-project-database eieio-instance-tracker)
+  ()
+  "Database representing a GNU Global tags file.")
+
+(defun semanticdb-enable-gnu-global-in-buffer (&optional dont-err-if-not-available)
+  "Enable a GNU Global database in the current buffer.
+Argument DONT-ERR-IF-NOT-AVAILABLE will throw an error if GNU Global
+is not available for this directory."
+  (interactive "P")
+  (if (cedet-gnu-global-root)
+      (setq
+       ;; Add to the system database list.
+       semanticdb-project-system-databases
+       (cons (semanticdb-project-database-global "global")
+	     semanticdb-project-system-databases)
+       ;; Apply the throttle.
+       semanticdb-find-default-throttle
+       (append semanticdb-find-default-throttle
+	       '(omniscience))
+       )
+    (if dont-err-if-not-available
+	(message "No Global support in %s" default-directory)
+      (error "No Global support in %s" default-directory))
+    ))
+
+;;; Classes:
+(defclass semanticdb-table-global (semanticdb-search-results-table)
+  ((major-mode :initform nil)
+   )
+  "A table for returning search results from GNU Global.")
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer)
+  "Return t, pretend that this table's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  ;; @todo - hack alert!
+  t)
+
+;;; Filename based methods
+;;
+(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-global))
+  "For a global database, there are no explicit tables.
+For each file hit, get the traditional semantic table from that file."
+  ;; We need to return something since there is always the "master table"
+  ;; The table can then answer file name type questions.
+  (when (not (slot-boundp obj 'tables))
+    (let ((newtable (semanticdb-table-global "GNU Global Search Table")))
+      (oset obj tables (list newtable))
+      (oset newtable parent-db obj)
+      (oset newtable tags nil)
+      ))
+
+  (call-next-method))
+
+(defmethod semanticdb-file-table ((obj semanticdb-project-database-global) filename)
+  "From OBJ, return FILENAME's associated table object."
+  ;; We pass in "don't load".  I wonder if we need to avoid that or not?
+  (car (semanticdb-get-database-tables obj))
+  )
+
+;;; Search Overrides
+;;
+;; Only NAME based searches work with GLOBAL as that is all it tracks.
+;;
+(defmethod semanticdb-find-tags-by-name-method
+  ((table semanticdb-table-global) name &optional tags)
+  "Find all tags named NAME in TABLE.
+Return a list of tags."
+  (if tags
+      ;; If TAGS are passed in, then we don't need to do work here.
+      (call-next-method)
+    ;; Call out to GNU Global for some results.
+    (let* ((semantic-symref-tool 'global)
+	   (result (semantic-symref-find-tags-by-name name 'project))
+	   )
+      (when result
+	;; We could ask to keep the buffer open, but that annoys
+	;; people.
+	(semantic-symref-result-get-tags result))
+      )))
+
+(defmethod semanticdb-find-tags-by-name-regexp-method
+  ((table semanticdb-table-global) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    (let* ((semantic-symref-tool 'global)
+	   (result (semantic-symref-find-tags-by-regexp regex 'project))
+	   )
+      (when result
+	(semantic-symref-result-get-tags result))
+      )))
+
+(defmethod semanticdb-find-tags-for-completion-method
+  ((table semanticdb-table-global) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    (let* ((semantic-symref-tool 'global)
+	   (result (semantic-symref-find-tags-by-completion prefix 'project))
+	   (faketags nil)
+	   )
+      (when result
+	(dolist (T (oref result :hit-text))
+	  ;; We should look up each tag one at a time, but I'm lazy!
+	  ;; Doing this may be good enough.
+	  (setq faketags (cons
+			  (semantic-tag T 'function :faux t)
+			  faketags))
+	  )
+	faketags))))
+
+;;; Deep Searches
+;;
+;; If your language does not have a `deep' concept, these can be left
+;; alone, otherwise replace with implementations similar to those
+;; above.
+;;
+(defmethod semanticdb-deep-find-tags-by-name-method
+  ((table semanticdb-table-global) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Optional argument TAGS is a list of tags t
+Like `semanticdb-find-tags-by-name-method' for global."
+  (semanticdb-find-tags-by-name-method table name tags))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method
+  ((table semanticdb-table-global) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for global."
+  (semanticdb-find-tags-by-name-regexp-method table regex tags))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method
+  ((table semanticdb-table-global) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-for-completion-method' for global."
+  (semanticdb-find-tags-for-completion-method table prefix tags))
+
+;;; TEST
+;;
+;; Here is a testing fcn to try out searches via the GNU Global database.
+(defvar semanticdb-test-gnu-global-startfile "~/src/global-5.7.3/global/global.c"
+  "File to use for testing.")
+
+(defun semanticdb-test-gnu-global (searchfor &optional standardfile)
+  "Test the GNU Global semanticdb.
+Argument SEARCHFOR is the text to search for.
+If optional arg STANDARDFILE is non nil, use a standard file w/ global enabled."
+  (interactive "sSearch For Tag: \nP")
+
+  (save-excursion
+    (when standardfile
+      (save-match-data
+	(set-buffer (find-file-noselect semanticdb-test-gnu-global-startfile))))
+
+    (condition-case err
+	(semanticdb-enable-gnu-global-in-buffer)
+      (error (if standardfile
+		 (error err)
+	       (save-match-data
+		 (set-buffer (find-file-noselect semanticdb-test-gnu-global-startfile)))
+	       (semanticdb-enable-gnu-global-in-buffer))))
+
+    (let* ((db (semanticdb-project-database-global "global"))
+	   (tab (semanticdb-file-table db (buffer-file-name)))
+	   (result (semanticdb-deep-find-tags-for-completion-method tab searchfor))
+	   )
+      (data-debug-new-buffer "*SemanticDB Gnu Global Result*")
+      (data-debug-insert-thing result "?" "")
+      )))
+
+(provide 'semanticdb-global)
+
+;;; semanticdb-global.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-javascript.el b/site/cedet-1.0pre7/semantic/semanticdb-javascript.el
new file mode 100644
index 0000000..06c1d94
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-javascript.el
@@ -0,0 +1,314 @@
+;;; semanticdb-javascript.el --- Semantic database extensions for javascript
+
+;;; Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 Eric M. Ludlam
+;;; Copyright (C) 2006 Joakim Verona
+
+;; Author: Joakim Verona
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-javascript.el,v 1.4 2009/09/11 18:56:45 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; Semanticdb database for Javascript.
+;;
+;; This is an omniscient database with a hard-coded list of symbols for
+;; Javascript.  See the doc at the end of this file for adding or modifying
+;; the list of tags.
+;;
+
+(eval-when-compile
+  ;; For generic function searching.
+  (require 'eieio)
+  (require 'eieio-opt)
+  )
+;;; Code:
+(defvar semanticdb-javascript-tags
+  '(("eval" function
+     (:arguments
+      (("x" variable nil nil nil)))
+     nil nil)
+    ("parseInt" function
+     (:arguments
+      (("string" variable nil nil nil)
+       ("radix" variable nil nil nil)))
+     nil nil)
+    ("parseFloat" function
+     (:arguments
+      (("string" variable nil nil nil)))
+     nil nil)
+    ("isNaN" function
+     (:arguments
+      (("number" variable nil nil nil)))
+     nil nil)
+    ("isFinite" function
+     (:arguments
+      (("number" variable nil nil nil)))
+     nil nil)
+    ("decodeURI" function
+     (:arguments
+      (("encodedURI" variable nil nil nil)))
+     nil nil)
+    ("decodeURIComponent" function
+     (:arguments
+      (("encodedURIComponent" variable nil nil nil)))
+     nil nil)
+    ("encodeURI" function
+     (:arguments
+      (("uri" variable nil nil nil)))
+     nil nil)
+    ("encodeURIComponent" function
+     (:arguments
+      (("uriComponent" variable nil nil nil)))
+     nil nil))
+  "Hard-coded list of javascript tags for semanticdb.
+See bottom of this file for instruction on managing this list.")
+
+;;; Classes:
+(defclass semanticdb-table-javascript (semanticdb-search-results-table)
+  ((major-mode :initform javascript-mode)
+   )
+  "A table for returning search results from javascript.")
+
+(defclass semanticdb-project-database-javascript
+  (semanticdb-project-database
+   eieio-singleton ;this db is for js globals, so singleton is apropriate
+   )
+  ((new-table-class :initform semanticdb-table-javascript
+		    :type class
+		    :documentation
+		    "New tables created for this database are of this class.")
+   )
+  "Database representing javascript.")
+
+;; Create the database, and add it to searchable databases for javascript mode.
+(defvar-mode-local javascript-mode semanticdb-project-system-databases
+  (list
+   (semanticdb-project-database-javascript "Javascript"))
+  "Search javascript for symbols.")
+
+;; NOTE: Be sure to modify this to the best advantage of your
+;;       language.
+(defvar-mode-local javascript-mode semanticdb-find-default-throttle
+  '(project omniscience)
+  "Search project files, then search this omniscience database.
+It is not necessary to to system or recursive searching because of
+the omniscience database.")
+
+;;; Filename based methods
+;;
+(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-javascript))
+  "For a javascript database, there are no explicit tables.
+Create one of our special tables that can act as an intermediary."
+  ;; NOTE: This method overrides an accessor for the `tables' slot in
+  ;;       a database.  You can either construct your own (like tmp here
+  ;;       or you can manage any number of tables.
+
+  ;; We need to return something since there is always the "master table"
+  ;; The table can then answer file name type questions.
+  (when (not (slot-boundp obj 'tables))
+    (let ((newtable (semanticdb-table-javascript "tmp")))
+      (oset obj tables (list newtable))
+      (oset newtable parent-db obj)
+      (oset newtable tags nil)
+      ))
+  (call-next-method)
+  )
+
+(defmethod semanticdb-file-table ((obj semanticdb-project-database-javascript) filename)
+  "From OBJ, return FILENAME's associated table object."
+  ;; NOTE: See not for `semanticdb-get-database-tables'.
+  (car (semanticdb-get-database-tables obj))
+  )
+
+(defmethod semanticdb-get-tags ((table semanticdb-table-javascript ))
+  "Return the list of tags belonging to TABLE."
+  ;; NOTE: Omniscient databases probably don't want to keep large tabes
+  ;;       lolly-gagging about.  Keep internal Emacs tables empty and
+  ;;       refer to alternate databases when you need something.
+  semanticdb-javascript-tags)
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  (save-excursion
+    (set-buffer buffer)
+    (eq (or mode-local-active-mode major-mode) 'javascript-mode)))
+
+;;; Usage
+;;
+;; Unlike other tables, an omniscent database does not need to
+;; be associated with a path.  Use this routine to always add ourselves
+;; to a search list.
+(define-mode-local-override semanticdb-find-translate-path javascript-mode
+  (path brutish)
+  "Return a list of semanticdb tables asociated with PATH.
+If brutish, do the default action.
+If not brutish, do the default action, and append the system
+database (if available.)"
+  (let ((default
+	  ;; When we recurse, disable searching of system databases
+	  ;; so that our Javascript database only shows up once when
+	  ;; we append it in this iteration.
+	  (let ((semanticdb-search-system-databases nil)
+		)
+	    (semanticdb-find-translate-path-default path brutish))))
+    ;; Don't add anything if BRUTISH is on (it will be added in that fcn)
+    ;; or if we aren't supposed to search the system.
+    (if (or brutish (not semanticdb-search-system-databases))
+	default
+      (let ((tables (apply #'append
+			   (mapcar
+			    (lambda (db) (semanticdb-get-database-tables db))
+			    semanticdb-project-system-databases))))
+	(append default tables)))))
+
+;;; Search Overrides
+;;
+;; NOTE WHEN IMPLEMENTING: Be sure to add doc-string updates explaining
+;; how your new search routines are implemented.
+;;
+(defun semanticdb-javascript-regexp-search (regexp)
+  "Search for REGEXP in our fixed list of javascript tags."
+  (let* ((tags semanticdb-javascript-tags)
+	 (result nil))
+    (while tags
+      (if (string-match regexp (caar tags))
+	  (setq result (cons (car tags) result)))
+      (setq tags (cdr tags)))
+    result))
+
+(defmethod semanticdb-find-tags-by-name-method
+  ((table semanticdb-table-javascript) name &optional tags)
+  "Find all tags named NAME in TABLE.
+Return a list of tags."
+  (if tags
+      ;; If TAGS are passed in, then we don't need to do work here.
+      (call-next-method)
+    (assoc-string name  semanticdb-javascript-tags)
+    ))
+
+(defmethod semanticdb-find-tags-by-name-regexp-method
+  ((table semanticdb-table-javascript) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    (semanticdb-javascript-regexp-search regex)
+
+    ))
+
+(defmethod semanticdb-find-tags-for-completion-method
+  ((table semanticdb-table-javascript) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    (semanticdb-javascript-regexp-search (concat "^" prefix ".*"))
+    ))
+
+(defmethod semanticdb-find-tags-by-class-method
+  ((table semanticdb-table-javascript) class &optional tags)
+  "In TABLE, find all occurances of tags of CLASS.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ;;
+    ;; Note: This search method could be considered optional in an
+    ;;       omniscient database.  It may be unwise to return all tags
+    ;;       that exist for a language that are a variable or function.
+    ;;
+    ;; If it is optional, you can just delete this method.
+    nil))
+
+;;; Deep Searches
+;;
+;; If your language does not have a `deep' concept, these can be left
+;; alone, otherwise replace with implementations similar to those
+;; above.
+;;
+(defmethod semanticdb-deep-find-tags-by-name-method
+  ((table semanticdb-table-javascript) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Optional argument TAGS is a list of tags t
+Like `semanticdb-find-tags-by-name-method' for javascript."
+  (semanticdb-find-tags-by-name-method table name tags))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method
+  ((table semanticdb-table-javascript) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for javascript."
+  (semanticdb-find-tags-by-name-regexp-method table regex tags))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method
+  ((table semanticdb-table-javascript) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-for-completion-method' for javascript."
+  (semanticdb-find-tags-for-completion-method table prefix tags))
+
+;;; Advanced Searches
+;;
+(defmethod semanticdb-find-tags-external-children-of-type-method
+  ((table semanticdb-table-javascript) type &optional tags)
+  "Find all nonterminals which are child elements of TYPE
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ;;
+    ;; OPTIONAL: This could be considered an optional function.  It is
+    ;;       used for `semantic-adopt-external-members' and may not
+    ;;       be possible to do in your language.
+    ;;
+    ;; If it is optional, you can just delete this method.
+    ))
+
+(provide 'semanticdb-javascript)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun semanticdb-javascript-strip-tags (tags)
+  "Strip TAGS from overlays and reparse symbols."
+  (cond ((and (consp tags) (eq 'reparse-symbol (car tags)))
+	 nil)
+	((overlayp tags) nil)
+	((atom tags) tags)
+	(t (cons (semanticdb-javascript-strip-tags
+		  (car tags)) (semanticdb-javascript-strip-tags
+			       (cdr tags))))))
+
+;this list was made from a javascript file, and the above function
+;; function eval(x){}
+;; function parseInt(string,radix){}
+;; function parseFloat(string){}
+;; function isNaN(number){}
+;; function isFinite(number){}
+;; function decodeURI(encodedURI){}
+;; function decodeURIComponent (encodedURIComponent){}
+;; function encodeURI (uri){}
+;; function encodeURIComponent (uriComponent){}
+
+
+;;; semanticdb-el.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-mk.el b/site/cedet-1.0pre7/semantic/semanticdb-mk.el
new file mode 100644
index 0000000..4e8c5f4
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-mk.el
@@ -0,0 +1,79 @@
+;;; semanticdb-mk.el --- Command line database builder
+
+;;; Copyright (C) 2002, 2004, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-mk.el,v 1.6 2009/06/24 23:12:12 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;; 
+;;; Commentary:
+;;
+;; For use by semanticdb.sh for building tag files.
+;;
+;; @todo - support loading configurations from the users .emacs file.
+
+;;; Code
+;;
+(if (not noninteractive)
+    (error "You should not load semanticdb-mk interactivly."))
+
+;; Find our source directory
+(let (fname semanticdir cedetdir loadfile)
+
+  (setq fname load-file-name)
+  (setq semanticdir (file-name-directory fname))
+  (setq cedetdir (expand-file-name (concat semanticdir "../common/")))
+  (setq loadfile (concat cedetdir "cedet.el"))
+
+  (load-file loadfile))
+
+;; Turn on semanticdb
+(global-semanticdb-minor-mode 1)
+
+;; Process loaded buffers from the command line.
+(let ((args command-line-args))
+  ;; Move past this load file being loaded.
+  (while (and args
+	      (not
+	       (progn
+		 ;(message "Compare %s to %s" (car args) "-l")
+		 (string= (car args) "-l"))))
+    (setq args (cdr args)))
+  (when args
+    (setq args (cdr (cdr args)))
+    ;; Grab the rest of the file names.
+    ;; For each file, load it in, let semantic evaluate it for tags.
+    (while args
+      (princ (concat "Loading " (car args) "... "))
+      (save-window-excursion
+	;; @TODO - RE-WRITE THIS with code from the idle-work process.
+	(let* ((buffer (find-file-noselect (car args)))
+	       (tags nil))
+	  (set-buffer buffer)
+	  (setq tags (semantic-fetch-tags))
+	  (princ (length tags))
+	  (princ " tags found .\n"))
+	(setq args (cdr args))))
+    ))
+
+;; Save the databases.
+(semanticdb-save-all-db)
+
+;; Done
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-mode.el b/site/cedet-1.0pre7/semantic/semanticdb-mode.el
new file mode 100644
index 0000000..bf3e086
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-mode.el
@@ -0,0 +1,247 @@
+;;; semanticdb-mode.el --- Semanticdb Minor Mode
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semanticdb-mode.el,v 1.6 2009/09/29 01:33:06 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Major mode for managing Semantic Databases automatically.
+
+(require 'semanticdb)
+;;; Code:
+;;;###autoload
+(defvar semanticdb-current-database nil
+  "For a given buffer, this is the currently active database.")
+(make-variable-buffer-local 'semanticdb-current-database)
+
+;;;###autoload
+(defvar semanticdb-current-table nil
+  "For a given buffer, this is the currently active database table.")
+(make-variable-buffer-local 'semanticdb-current-table)
+
+;;;###autoload
+(defcustom semanticdb-global-mode nil
+  "*If non-nil enable the use of `semanticdb-minor-mode'."
+  :group 'semantic
+  :type 'boolean
+  :require 'semanticdb
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-semanticdb-minor-mode (if val 1 -1))
+         (custom-set-default sym val)))
+
+(defcustom semanticdb-mode-hook nil
+  "Hook run whenever `global-semanticdb-minor-mode' is run.
+Use `semanticdb-minor-mode-p' to determine if the mode has been turned
+on or off."
+  :group 'semanticdb
+  :type 'hook)
+
+(semantic-varalias-obsolete 'semanticdb-mode-hooks
+                          'semanticdb-mode-hook)
+
+;;; Start/Stop database use
+;;
+(defvar semanticdb-hooks
+  '((semanticdb-semantic-init-hook-fcn semantic-init-db-hook)
+    (semanticdb-synchronize-table semantic-after-toplevel-cache-change-hook)
+    (semanticdb-partial-synchronize-table semantic-after-partial-cache-change-hook)
+    (semanticdb-revert-hook before-revert-hook)
+    (semanticdb-kill-hook kill-buffer-hook)
+    (semanticdb-kill-hook change-major-mode-hook) ;; Not really a kill, but we need the same effect.
+    (semanticdb-kill-emacs-hook kill-emacs-hook)
+    (semanticdb-save-all-db-idle auto-save-hook)
+    )
+  "List of hooks and values to add/remove when configuring semanticdb.")
+
+;;; SEMANTICDB-MODE
+;;
+;;;###autoload
+(defun semanticdb-minor-mode-p ()
+  "Return non-nil if `semanticdb-minor-mode' is active."
+  (member (car (car semanticdb-hooks))
+	  (symbol-value (car (cdr (car semanticdb-hooks))))))
+
+;;;###autoload
+(defun global-semanticdb-minor-mode (&optional arg)
+  "Toggle the use of `semanticdb-minor-mode'.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (if (not arg)
+      (if (semanticdb-minor-mode-p)
+	  (setq arg -1)
+	(setq arg 1)))
+  (let ((fn 'add-hook)
+	(h semanticdb-hooks)
+	(changed nil))
+    (if (< arg 0)
+	(setq changed semanticdb-global-mode
+	      semanticdb-global-mode nil
+              fn 'remove-hook)
+      (setq changed (not semanticdb-global-mode)
+	    semanticdb-global-mode t))
+    ;(message "ARG = %d" arg)
+    (when changed
+      (while h
+	(funcall fn (car (cdr (car h))) (car (car h)))
+	(setq h (cdr h)))
+      ;; Call a hook
+      (run-hooks 'semanticdb-mode-hook))
+    ))
+
+(defun semanticdb-toggle-global-mode ()
+  "Toggle use of the Semantic Database feature.
+Update the environment of Semantic enabled buffers accordingly."
+  (interactive)
+  (if (semanticdb-minor-mode-p)
+      ;; Save databases before disabling semanticdb.
+      (semanticdb-save-all-db))
+  ;; Toggle semanticdb minor mode.
+  (global-semanticdb-minor-mode))
+
+;;; Hook Functions:
+;;
+;; Functions used in hooks to keep SemanticDB operating.
+;;
+(defun semanticdb-semantic-init-hook-fcn ()
+  "Function saved in `semantic-init-db-hook'.
+Sets up the semanticdb environment."
+  ;; Only initialize semanticdb if we have a file name.
+  ;; There is no reason to cache a tag table if there is no
+  ;; way to load it back in later.
+  (when (buffer-file-name)
+    (let* ((ans (semanticdb-create-table-for-file (buffer-file-name)))
+	   (cdb (car ans))
+	   (ctbl (cdr ans))
+	   )
+      ;; Get the current DB for this directory
+      (setq semanticdb-current-database cdb)
+      ;; We set the major mode because we know what it is.
+      (oset ctbl major-mode major-mode)
+      ;; Local state
+      (setq semanticdb-current-table ctbl)
+      ;; Try to swap in saved tags
+      (if (or (not (slot-boundp ctbl 'tags)) (not (oref ctbl tags))
+	      (/= (or (oref ctbl pointmax) 0) (point-max))
+	      )
+	  (semantic-clear-toplevel-cache)
+	;; Unmatched syntax
+	(condition-case nil
+	    (semantic-set-unmatched-syntax-cache
+	     (oref ctbl unmatched-syntax))
+	  (unbound-slot
+	   ;; Old version of the semanticdb table can miss the unmatched
+	   ;; syntax slot.  If so, just clear the unmatched syntax cache.
+	   (semantic-clear-unmatched-syntax-cache)
+	   ;; Make sure it has a value.
+	   (oset ctbl unmatched-syntax nil)
+	   ))
+	;; Keep lexical tables up to date.  Don't load
+	;; semantic-spp if it isn't needed.
+	(let ((lt (oref ctbl lexical-table)))
+	  (when lt
+	    (require 'semantic-lex-spp)
+	    (semantic-lex-spp-set-dynamic-table lt)))
+	;; Set the main tag cache.
+	;; This must happen after setting up buffer local variables
+	;; since this will turn around and re-save those variables.
+	(semantic--set-buffer-cache (oref ctbl tags))
+	;; Don't need it to be dirty.  Set dirty due to hooks from above.
+	(oset ctbl dirty nil) ;; Special case here.
+	(oset ctbl buffer (current-buffer))
+	;; Bind into the buffer.
+	(semantic--tag-link-cache-to-buffer)
+	)
+      )))
+
+(defun semanticdb-revert-hook ()
+  "Hook run before a revert buffer.
+We can't track incremental changes due to a revert, so just clear the cache.
+This will prevent the next batch of hooks from wasting time parsing things
+that don't need to be parsed."
+  (if (and (semantic-active-p)
+	   semantic--buffer-cache
+	   semanticdb-current-table)
+      (semantic-clear-toplevel-cache)))
+
+(defun semanticdb-kill-hook ()
+  "Function run when a buffer is killed.
+If there is a semantic cache, slurp out the overlays, and store
+it in our database.  If that buffer has no cache, ignore it, we'll
+handle it later if need be."
+  (when (and (semantic-active-p)
+	     semantic--buffer-cache
+	     semanticdb-current-table)
+
+    ;; Try to get a fast update.
+    (semantic-fetch-tags-fast)
+
+    ;; If the buffer is in a bad state, don't save anything...
+    (if (semantic-parse-tree-needs-rebuild-p)
+	;; If this is the case, don't save anything.
+	(progn
+	  (semantic-clear-toplevel-cache)
+	  (oset semanticdb-current-table pointmax 0)
+	  (oset semanticdb-current-table fsize 0)
+	  (oset semanticdb-current-table lastmodtime nil)
+	  )
+      ;; We have a clean buffer, save it off.
+      (condition-case nil
+	  (progn
+	    (semantic--tag-unlink-cache-from-buffer)
+	    ;; Set pointmax only if we had some success in the unlink.
+	    (oset semanticdb-current-table pointmax (point-max))
+	    (let ((fattr (file-attributes
+			  (semanticdb-full-filename
+			   semanticdb-current-table))))
+	      (oset semanticdb-current-table fsize (nth 7 fattr))
+	      (oset semanticdb-current-table lastmodtime (nth 5 fattr))
+	      (oset semanticdb-current-table buffer nil)
+	      ))
+	;; If this messes up, just clear the system
+	(error
+	 (semantic-clear-toplevel-cache)
+	 (message "semanticdb: Failed to deoverlay tag cache.")))
+      )
+    ))
+
+(defun semanticdb-kill-emacs-hook ()
+  "Function called when Emacs is killed.
+Save all the databases."
+  (semanticdb-save-all-db))
+
+;;; SYNCHRONIZATION HOOKS
+;;
+(defun semanticdb-synchronize-table (new-table)
+  "Function run after parsing.
+Argument NEW-TABLE is the new table of tags."
+  (when semanticdb-current-table
+    (semanticdb-synchronize semanticdb-current-table new-table)))
+
+(defun semanticdb-partial-synchronize-table (new-table)
+  "Function run after parsing.
+Argument NEW-TABLE is the new table of tags."
+  (when semanticdb-current-table
+    (semanticdb-partial-synchronize semanticdb-current-table new-table)))
+
+
+(provide 'semanticdb-mode)
+;;; semanticdb-mode.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-ref.el b/site/cedet-1.0pre7/semantic/semanticdb-ref.el
new file mode 100644
index 0000000..f8ef2d6
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-ref.el
@@ -0,0 +1,163 @@
+;;; semanticdb-ref.el --- Handle cross-db file references
+
+;; Copyright (C) 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semanticdb-ref.el,v 1.12 2010/01/07 02:24:52 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Handle cross-database file references.
+;;
+;; Any given database may be referred to by some other database.  For
+;; example, if a .cpp file has a #include in a header, then that
+;; header file should have a reference to the .cpp file that included
+;; it.
+;;
+;; This is critical for purposes where a file (such as a .cpp file)
+;; needs to have its caches flushed because of changes in the
+;; header.  Changing a header may cause a referring file to be
+;; reparsed due to account for changes in defined macros, or perhaps
+;; a change to files the header includes.
+
+
+;;; Code:
+;;;###autoload
+(defmethod semanticdb-add-reference ((dbt semanticdb-abstract-table)
+				     include-tag)
+  "Add a reference for the database table DBT based on INCLUDE-TAG.
+DBT is the database table that owns the INCLUDE-TAG.  The reference
+will be added to the database that INCLUDE-TAG refers to."
+  ;; NOTE: I should add a check to make sure include-tag is in DB.
+  ;;       but I'm too lazy.
+  (let* ((semanticdb-find-default-throttle
+	       (if (featurep 'semanticdb-find)
+		   (remq 'unloaded semanticdb-find-default-throttle)
+		 nil))
+	 (refdbt (semanticdb-find-table-for-include include-tag dbt))
+	 ;;(fullfile (semanticdb-full-filename dbt))
+	 )
+    (when refdbt
+      ;; Add our filename (full path)
+      ;; (object-add-to-list refdbt 'file-refs fullfile)
+
+      ;; Add our database.
+      (object-add-to-list refdbt 'db-refs dbt)
+      t)))
+
+(defmethod semanticdb-check-references ((dbt semanticdb-abstract-table))
+  "Check and cleanup references in the database DBT.
+Abstract tables would be difficult to reference."
+  ;; Not sure how an abstract table can have references.
+  nil)
+
+(defmethod semanticdb-includes-in-table ((dbt semanticdb-abstract-table))
+  "Return a list of direct includes in table DBT."
+  (semantic-find-tags-by-class 'include (semanticdb-get-tags dbt)))
+
+
+(defmethod semanticdb-check-references ((dbt semanticdb-table))
+  "Check and cleanup references in the database DBT.
+Any reference to a file that cannot be found, or whos file no longer
+refers to DBT will be removed."
+  (let ((refs (oref dbt db-refs))
+	(myexpr (concat "\\<" (oref dbt file)))
+	)
+    (while refs
+      (let* ((ok t)
+	     (db (car refs))
+	     (f (when (semanticdb-table-child-p db)
+		  (semanticdb-full-filename db)))
+	     )
+
+	;; The file was deleted
+	(when (and f (not (file-exists-p f)))
+	  (setq ok nil))
+
+	;; The reference no longer includes the textual reference?
+	(let* ((refs (semanticdb-includes-in-table db))
+	       (inc (semantic-find-tags-by-name-regexp
+		     myexpr refs)))
+	  (when (not inc)
+	    (setq ok nil)))
+
+	;; Remove not-ok databases from the list.
+	(when (not ok)
+	  (object-remove-from-list dbt 'db-refs db)
+	  ))
+      (setq refs (cdr refs)))))
+
+(defmethod semanticdb-refresh-references ((dbt semanticdb-abstract-table))
+  "Refresh references to DBT in other files."
+  ;; alternate tables can't be edited, so can't be changed.
+  nil
+  )
+
+(defmethod semanticdb-refresh-references ((dbt semanticdb-table))
+  "Refresh references to DBT in other files."
+  (let ((refs (semanticdb-includes-in-table dbt))
+	)
+    (while refs
+      (if (semanticdb-add-reference dbt (car refs))
+	  nil
+	;; If we succeeded, then do... nothing?
+	nil
+	)
+      (setq refs (cdr refs)))
+    ))
+
+(defmethod semanticdb-notify-references ((dbt semanticdb-table)
+					 method)
+  "Notify all references of the table DBT using method.
+METHOD takes two arguments.
+  (METHOD TABLE-TO-NOTIFY DBT)
+TABLE-TO-NOTIFY is a semanticdb-table which is being notified.
+DBT, the second argument is DBT."
+  (mapc (lambda (R) (funcall method R dbt))
+	  (oref dbt db-refs)))
+
+;;; DEBUG
+;;
+(defclass semanticdb-ref-adebug ()
+  ((i-depend-on :initarg :i-depend-on)
+   (local-table :initarg :local-table)
+   (i-include :initarg :i-include))
+  "Simple class to allow ADEBUG to show a nice list.")
+
+(defun semanticdb-ref-test (refresh)
+  "Dump out the list of references for the current buffer.
+If REFRESH is non-nil, cause the current table to have its references
+refreshed before dumping the result."
+  (interactive "p")
+  ;; If we need to refresh... then do so.
+  (when refresh
+    (semanticdb-refresh-references semanticdb-current-table))
+  ;; Do the debug system
+  (let* ((tab semanticdb-current-table)
+	 (myrefs (oref tab db-refs))
+	 (myinc (semanticdb-includes-in-table tab))
+	 (adbc (semanticdb-ref-adebug "DEBUG"
+				      :i-depend-on myrefs
+				      :local-table tab
+				      :i-include myinc)))
+    (data-debug-new-buffer "*References ADEBUG*")
+    (data-debug-insert-object-slots adbc "!"))
+  )
+
+(provide 'semanticdb-ref)
+;;; semanticdb-ref.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-search.el b/site/cedet-1.0pre7/semantic/semanticdb-search.el
new file mode 100644
index 0000000..5d99101
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-search.el
@@ -0,0 +1,448 @@
+;;; semanticdb-search.el --- Searching through semantic databases.
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-search.el,v 1.18 2009/08/31 01:46:03 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;; 
+;;; Commentary:
+;;
+;; NOTE: THESE APIs ARE OBSOLETE:
+;;
+;; Databases of various forms can all be searched.  These routines
+;; cover many common forms of searching.
+;;
+;; There are three types of searches that can be implemented:
+;;
+;; Basic Search:
+;;  These searches allow searching on specific attributes of tags,
+;;  such as name or type.
+;;
+;; Advanced Search:
+;;  These are searches that were needed to accomplish some tasks
+;;  during in utilities.  Advanced searches include matching methods
+;;  defined outside some parent class.
+;;
+;;  The reason for advanced searches are so that external
+;;  repositories such as the Emacs obarray, or java .class files can
+;;  quickly answer these needed questions without dumping the entire
+;;  symbol list into Emacs for a regular semanticdb search.
+;;
+;; Generic Search:
+;;  The generic search, `semanticdb-find-nonterminal-by-function'
+;;  accepts a Emacs Lisp predicate that tests tags in Semantic
+;;  format.  Most external searches cannot perform this search.
+
+(require 'semanticdb)
+(require 'semantic-find)
+
+;;; Code:
+;;
+
+;;; Utils
+;;
+;; Convenience routines for searches
+(defun semanticdb-collect-find-results (result-in-databases
+					result-finding-function
+					ignore-system
+					find-file-on-match)
+  "OBSOLETE:
+Collect results across RESULT-IN-DATABASES for RESULT-FINDING-FUNCTION.
+If RESULT-IN-DATABASES is nil, search a range of associated databases
+calculated by `semanticdb-current-database-list'.
+RESULT-IN-DATABASES is a list of variable `semanticdb-project-database'
+objects.
+RESULT-FINDING-FUNCTION should accept one argument, the database being searched.
+Argument IGNORE-SYSTEM specifies if any available system databases should
+be ignored, or searched.
+Argument FIND-FILE-ON-MATCH indicates that the found databases
+should be capable of doing so."
+  (if (not (listp result-in-databases))
+      (signal 'wrong-type-argument (list 'listp result-in-databases)))
+  (let* ((semanticdb-search-system-databases
+	  (if ignore-system
+	      nil
+	    semanticdb-search-system-databases))
+	 (dbs (or result-in-databases
+		  ;; Calculate what database to use.
+		  ;; Something simple and dumb for now.
+		  (or (semanticdb-current-database-list)
+		      (list (semanticdb-current-database)))))
+	 (case-fold-search semantic-case-fold)
+	 (res (mapcar
+	       (lambda (db)
+		 (if (or (not find-file-on-match)
+			 (not (child-of-class-p
+			       (oref db new-table-class)
+			       semanticdb-search-results-table)))
+		     (funcall result-finding-function db)))
+	       dbs))
+	 out)
+    ;; Flatten the list.  The DB is unimportant at this stage.
+    (setq res (apply 'append res))
+    (setq out nil)
+    ;; Move across results, and throw out empties.
+    (while res
+      (if (car res)
+	  (setq out (cons (car res) out)))
+      (setq res (cdr res)))
+    ;; Results
+    out))
+
+;;; Programatic interfaces
+;;
+;; These routines all perform different types of searches, and are
+;; interfaces to the database methods used to also perform those searches.
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-token
+  (token &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all occurances of nonterminals with token TOKEN in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-token-method
+      db token search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-token
+	       "Please don't use this function")
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-name
+  (name &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all occurances of nonterminals with name NAME in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-name-method
+      db name search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-name
+	       "Please don't use this function")
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-name-regexp
+  (regex &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all occurances of nonterminals with name matching REGEX in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-name-regexp-method
+      db regex search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-name-regexp
+	       "Please don't use this function")
+
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-type
+  (type &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all nonterminals with a type of TYPE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-type-method
+      db type search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-type
+	       "Please don't use this function")
+
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-property
+  (property value &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all nonterminals with a PROPERTY equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-property-method
+      db property value search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-property
+	       "Please don't use this function")
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-extra-spec
+  (spec &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all nonterminals with a SPEC in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-extra-spec-method
+      db spec search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-extra-spec
+	       "Please don't use this function")
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-extra-spec-value
+  (spec value &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all nonterminals with a SPEC equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-extra-spec-value-method
+      db spec value search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+(make-obsolete 'semanticdb-find-nonterminal-by-extra-spec-value
+	       "Please don't use this function")
+
+;;; Advanced Search Routines
+;;
+(defun semanticdb-find-nonterminal-external-children-of-type
+  (type &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all nonterminals which are child elements of TYPE.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-external-children-of-type-method
+      db type search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+
+;;; Generic Search routine
+;;
+
+;;;###autoload
+(defun semanticdb-find-nonterminal-by-function
+  (function &optional databases search-parts search-includes diff-mode find-file-match ignore-system)
+  "OBSOLETE:
+Find all occurances of nonterminals which match FUNCTION.
+Search in all DATABASES.  If DATABASES is nil, search a range of
+associated databases calculated `semanticdb-current-database-list' and
+DATABASES is a list of variable `semanticdb-project-database' objects.
+When SEARCH-PARTS is non-nil the search will include children of tags.
+When SEARCH-INCLUDES is non-nil, the search will include dependency files.
+When DIFF-MODE is non-nil, search databases which are of a different mode.
+A Mode is the `major-mode' that file was in when it was last parsed.
+When FIND-FILE-MATCH is non-nil, the make sure any found token's file is
+in an Emacs buffer.
+When IGNORE-SYSTEM is non-nil, system libraries are not searched.
+Return a list ((DB-TABLE . TOKEN-OR-TOKEN-LIST) ...)."
+  (semanticdb-collect-find-results
+   databases
+   (lambda (db)
+     (semanticdb-find-nonterminal-by-function-method
+      db function search-parts search-includes diff-mode find-file-match))
+   ignore-system
+   find-file-match))
+
+;;; Search Methods
+;;
+;; These are the base routines for searching semantic databases.
+;; Overload these with your subclasses to participate in the searching
+;; mechanism.
+(defmethod semanticdb-find-nonterminal-by-token-method
+  ((database semanticdb-project-database) token search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+In DB, find all occurances of nonterminals with token TOKEN in databases.
+See `semanticdb-find-nonterminal-by-function-method' for details on,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (let ((goofy-token-name token))
+    (semanticdb-find-nonterminal-by-function-method
+     database (lambda (stream sp si)
+		(semantic-brute-find-tag-by-class goofy-token-name stream sp si))
+     search-parts search-includes diff-mode find-file-match)))
+
+(defmethod semanticdb-find-nonterminal-by-name-method
+  ((database semanticdb-project-database) name search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all occurances of nonterminals with name NAME in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES, DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-first-tag-by-name name stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+(defmethod semanticdb-find-nonterminal-by-name-regexp-method
+  ((database semanticdb-project-database) regex search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all occurances of nonterminals with name matching REGEX in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-tag-by-name-regexp regex stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+(defmethod semanticdb-find-nonterminal-by-type-method
+  ((database semanticdb-project-database) type search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all nonterminals with a type of TYPE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-tag-by-type type stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+(defmethod semanticdb-find-nonterminal-by-property-method
+  ((database semanticdb-project-database) property value search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all nonterminals with a PROPERTY equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-tag-by-property property value stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+(defmethod semanticdb-find-nonterminal-by-extra-spec-method
+  ((database semanticdb-project-database) spec search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all nonterminals with a SPEC in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-tag-by-attribute spec stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+(defmethod semanticdb-find-nonterminal-by-extra-spec-value-method
+  ((database semanticdb-project-database) spec value search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all nonterminals with a SPEC equal to VALUE in databases.
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, and FIND-FILE-MATCH.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   (lambda (stream sp si)
+     (semantic-brute-find-tag-by-attribute-value spec value stream sp si))
+   search-parts search-includes diff-mode find-file-match))
+
+;;; Advanced Searches
+;;
+(defmethod semanticdb-find-nonterminal-external-children-of-type-method
+  ((database semanticdb-project-database) type search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+Find all nonterminals which are child elements of TYPE
+See `semanticdb-find-nonterminal-by-function' for details on DATABASES,
+SEARCH-PARTS, SEARCH-INCLUDES DIFF-MODE, FIND-FILE-MATCH and IGNORE-SYSTEM.
+Return a list ((DB-TABLE . TOKEN-LIST) ...)."
+  (semanticdb-find-nonterminal-by-function-method
+   database
+   `(lambda (stream sp si)
+      (semantic-brute-find-tag-by-function
+       (lambda (tok)
+	 (let ((p (semantic-nonterminal-external-member-parent tok)))
+	   (and (stringp p) (string= ,type p)))
+	 )
+       stream sp si))
+   nil nil t))
+
+;;; Generic Search
+;;
+(defmethod semanticdb-find-nonterminal-by-function-method
+  ((database semanticdb-project-database)
+   function &optional search-parts search-includes diff-mode find-file-match)
+  "OBSOLETE:
+In DATABASE, find all occurances of nonterminals which match FUNCTION.
+When SEARCH-PARTS is non-nil the search will include children of tags.
+When SEARCH-INCLUDES is non-nil, the search will include dependency files.
+When DIFF-MODE is non-nil, search databases which are of a different mode.
+A mode is the `major-mode' that file was in when it was last parsed.
+When FIND-FILE-MATCH is non-nil, the make sure any found token's file is
+in an Emacs buffer.
+Return a list of matches."
+  (let* ((ret nil)
+	 (files (semanticdb-get-database-tables database))
+	 (found nil)
+	 (orig-buffer (current-buffer)))
+    (while files
+      (when (or diff-mode
+		(semanticdb-equivalent-mode (car files) orig-buffer))
+	;; This can cause unneeded refreshes while typing with
+	;; senator-eldoc mode.
+	;;(semanticdb-refresh-table (car files))
+	(setq found (funcall function
+			     (semanticdb-get-tags (car files))
+			     search-parts
+			     search-includes
+			     )))
+      (if found
+	  (progn
+	    ;; When something is found, make sure we read in that buffer if it
+	    ;; had not already been loaded.
+	    (if find-file-match
+		(save-excursion (semanticdb-set-buffer (car files))))
+	    ;; In theory, the database is up-to-date with what is in the file, and
+	    ;; these tags are ready to go.
+	    ;; There is a bug lurking here I don't have time to fix.
+	    (setq ret (cons (cons (car files) found) ret))
+	    (setq found nil)))
+      (setq files (cdr files)))
+    (nreverse ret)))
+
+(provide 'semanticdb-search)
+
+;;; semanticdb-search.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-skel.el b/site/cedet-1.0pre7/semantic/semanticdb-skel.el
new file mode 100644
index 0000000..42e47e8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-skel.el
@@ -0,0 +1,235 @@
+;;; semanticdb-skel.el --- Semantic database extensions for SKEL
+
+;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb-skel.el,v 1.4 2009/08/31 01:53:38 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;; 
+;;; Commentary:
+;;
+;; If you want to make an omniscient semanticdb database, start with
+;; this skeleton.  Replace `SKEL' with your language.  Implement those
+;; areas described by comments.
+;;
+
+(eval-when-compile
+  ;; For generic function searching.
+  (require 'eieio)
+  (require 'eieio-opt)
+  )
+;;; Code:
+
+;;; Classes:
+(defclass semanticdb-table-SKEL (semanticdb-search-results-table)
+  ((major-mode :initform SKEL-mode)
+   )
+  "A table for returning search results from SKEL.")
+
+(defclass semanticdb-project-database-SKEL
+  (semanticdb-project-database
+   ;; Use SINGLETON if there should be only one copy of this database.
+   ;; Do not use this if you need a different copy for different projects.
+   ;; eieio-singleton
+   )
+  ((new-table-class :initform semanticdb-table-SKEL
+		    :type class
+		    :documentation
+		    "New tables created for this database are of this class.")
+   )
+  "Database representing SKEL.")
+
+;; Create the database, and add it to searchable databases for SKEL mode.
+(defvar-mode-local YOUR-MAJOR-mode semanticdb-project-system-databases
+  (list 
+   (semanticdb-project-database-SKEL "SKEL"))
+  "Search SKEL for symbols.")
+
+;; NOTE: Be sure to modify this to the best advantage of your
+;;       language.
+(defvar-mode-local YOUR-MAJOR-mode semanticdb-find-default-throttle
+  '(project omniscience)
+  "Search project files, then search this omniscience database.
+It is not necessary to to system or recursive searching because of
+the omniscience database.")
+
+;;; Filename based methods
+;;
+(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-SKEL))
+  "For a SKEL database, there are no explicit tables.
+Create one of our special tables that can act as an intermediary."
+  ;; NOTE: This method overrides an accessor for the `tables' slot in 
+  ;;       a database.  You can either construct your own (like tmp here
+  ;;       or you can manage any number of tables.
+
+  ;; We need to return something since there is always the "master table"
+  ;; The table can then answer file name type questions.
+  (when (not (slot-boundp obj 'tables))
+    (let ((newtable (semanticdb-table-emacs-lisp "tmp")))
+      (oset obj tables (list newtable))
+      (oset newtable parent-db obj)
+      (oset newtable tags nil)
+      ))
+  (call-next-method))
+
+(defmethod semanticdb-file-table ((obj semanticdb-project-database-SKEL) filename)
+  "From OBJ, return FILENAME's associated table object."
+  ;; NOTE: See not for `semanticdb-get-database-tables'.
+  (car (semanticdb-get-database-tables obj))
+  )
+
+(defmethod semanticdb-get-tags ((table semanticdb-table-SKEL ))
+  "Return the list of tags belonging to TABLE."
+  ;; NOTE: Omniscient databases probably don't want to keep large tabes
+  ;;       lolly-gagging about.  Keep internal Emacs tables empty and
+  ;;       refer to alternate databases when you need something.
+  nil)
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-table-SKEL) &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  (save-excursion
+    (set-buffer buffer)
+    (eq (or mode-local-active-mode major-mode) 'SKEL-mode)))
+
+;;; Usage
+;;
+;; Unlike other tables, an omniscent database does not need to
+;; be associated with a path.  Use this routine to always add ourselves
+;; to a search list.
+(define-mode-local-override semanticdb-find-translate-path SKEL-mode
+  (path brutish)
+  "Return a list of semanticdb tables asociated with PATH.
+If brutish, do the default action.
+If not brutish, do the default action, and append the system
+database (if available.)"
+  (let ((default
+	  ;; When we recurse, disable searching of system databases
+	  ;; so that our ELisp database only shows up once when
+	  ;; we append it in this iteration.
+	  (let ((semanticdb-search-system-databases nil)
+		)
+	    (semanticdb-find-translate-path-default path brutish))))
+    ;; Don't add anything if BRUTISH is on (it will be added in that fcn)
+    ;; or if we aren't supposed to search the system.
+    (if (or brutish (not semanticdb-search-system-databases))
+	default
+      (let ((tables (apply #'append
+			   (mapcar
+			    (lambda (db) (semanticdb-get-database-tables db))
+			    semanticdb-project-system-databases))))
+	(append default tables)))))
+
+;;; Search Overrides
+;;
+;; NOTE WHEN IMPLEMENTING: Be sure to add doc-string updates explaining
+;; how your new search routines are implemented.
+;;
+(defmethod semanticdb-find-tags-by-name-method
+  ((table semanticdb-table-SKEL) name &optional tags)
+  "Find all tags named NAME in TABLE.
+Return a list of tags."
+  (if tags
+      ;; If TAGS are passed in, then we don't need to do work here.
+      (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ))
+
+(defmethod semanticdb-find-tags-by-name-regexp-method
+  ((table semanticdb-table-SKEL) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE    
+    ))
+
+(defmethod semanticdb-find-tags-for-completion-method
+  ((table semanticdb-table-SKEL) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ))
+
+(defmethod semanticdb-find-tags-by-class-method
+  ((table semanticdb-table-SKEL) class &optional tags)
+  "In TABLE, find all occurances of tags of CLASS.
+Optional argument TAGS is a list of tags to search.
+Returns a table of all matching tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ;;
+    ;; Note: This search method could be considered optional in an
+    ;;       omniscient database.  It may be unwise to return all tags
+    ;;       that exist for a language that are a variable or function.
+    ;;
+    ;; If it is optional, you can just delete this method.
+    nil))
+
+;;; Deep Searches
+;;
+;; If your language does not have a `deep' concept, these can be left
+;; alone, otherwise replace with implementations similar to those
+;; above. 
+;;
+(defmethod semanticdb-deep-find-tags-by-name-method
+  ((table semanticdb-table-SKEL) name &optional tags)
+  "Find all tags name NAME in TABLE.
+Optional argument TAGS is a list of tags t
+Like `semanticdb-find-tags-by-name-method' for SKEL."
+  (semanticdb-find-tags-by-name-method table name tags))
+
+(defmethod semanticdb-deep-find-tags-by-name-regexp-method
+  ((table semanticdb-table-SKEL) regex &optional tags)
+  "Find all tags with name matching REGEX in TABLE.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-by-name-method' for SKEL."
+  (semanticdb-find-tags-by-name-regexp-method table regex tags))
+
+(defmethod semanticdb-deep-find-tags-for-completion-method
+  ((table semanticdb-table-SKEL) prefix &optional tags)
+  "In TABLE, find all occurances of tags matching PREFIX.
+Optional argument TAGS is a list of tags to search.
+Like `semanticdb-find-tags-for-completion-method' for SKEL."
+  (semanticdb-find-tags-for-completion-method table prefix tags))
+
+;;; Advanced Searches
+;;
+(defmethod semanticdb-find-tags-external-children-of-type-method
+  ((table semanticdb-table-SKEL) type &optional tags)
+  "Find all nonterminals which are child elements of TYPE
+Optional argument TAGS is a list of tags to search.
+Return a list of tags."
+  (if tags (call-next-method)
+    ;; YOUR IMPLEMENTATION HERE
+    ;;
+    ;; OPTIONAL: This could be considered an optional function.  It is
+    ;;       used for `semantic-adopt-external-members' and may not
+    ;;       be possible to do in your language.
+    ;;
+    ;; If it is optional, you can just delete this method.
+    ))
+
+(provide 'semanticdb-el)
+
+;;; semanticdb-el.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb-typecache.el b/site/cedet-1.0pre7/semantic/semanticdb-typecache.el
new file mode 100644
index 0000000..067252c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb-typecache.el
@@ -0,0 +1,611 @@
+;;; semanticdb-typecache.el --- Manage Datatypes
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semanticdb-typecache.el,v 1.41 2010/01/29 03:12:11 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Manage a datatype cache.
+;;
+;; For typed languages like C++ collect all known types from various
+;; headers, merge namespaces, and expunge duplicates.
+;;
+;; It is likely this feature will only be needed for C/C++.
+
+(require 'semanticdb)
+(require 'semanticdb-find)
+
+;;; Code:
+
+
+;;; TABLE TYPECACHE
+;;;###autoload
+(defclass semanticdb-typecache ()
+  ((filestream :initform nil
+	       :documentation
+	       "Fully sorted/merged list of tags within this buffer.")
+   (includestream :initform nil
+		  :documentation
+		  "Fully sorted/merged list of tags from this file's includes list.")
+   (stream :initform nil
+	   :documentation
+	   "The searchable tag stream for this cache.
+NOTE: Can I get rid of this?  Use a hashtable instead?")
+   (dependants :initform nil
+	       :documentation
+	       "Any other object that is dependent on typecache results.
+Said object must support `semantic-reset' methods.")
+   ;; @todo - add some sort of fast-hash.
+   ;; @note - Rebuilds in large projects already take a while, and the
+   ;;     actual searches are pretty fast.  Really needed?
+   )
+  "Structure for maintaining a typecache.")
+
+(defmethod semantic-reset ((tc semanticdb-typecache))
+  "Reset the object IDX."
+  (oset tc filestream nil)
+  (oset tc includestream nil)
+
+  (oset tc stream nil)
+
+  (mapc 'semantic-reset (oref tc dependants))
+  (oset tc dependants nil)
+  )
+
+;;;###autoload
+(defmethod semanticdb-typecache-notify-reset ((tc semanticdb-typecache))
+  "Do a reset from a notify from a table we depend on."
+  (oset tc includestream nil)
+  (mapc 'semantic-reset (oref tc dependants))
+  (oset tc dependants nil)
+  )
+
+(defmethod semanticdb-partial-synchronize ((tc semanticdb-typecache)
+					   new-tags)
+  "Reset the typecache based on a partial reparse."
+  (when (semantic-find-tags-by-class 'include new-tags)
+    (oset tc includestream nil)
+    (mapc 'semantic-reset (oref tc dependants))
+    (oset tc dependants nil)
+    )
+
+  (when (semantic-find-tags-by-class 'type new-tags)
+    ;; Reset our index
+    (oset tc filestream nil)
+    t ;; Return true, our core file tags have changed in a relavant way.
+    )
+
+  ;; NO CODE HERE
+  )
+
+;;;###autoload
+(defun semanticdb-typecache-add-dependant (dep)
+  "Add into the local typecache a dependant DEP."
+  (let* ((table semanticdb-current-table)
+	 ;;(idx (semanticdb-get-table-index table))
+	 (cache (semanticdb-get-typecache table))
+	 )
+    (object-add-to-list cache 'dependants dep)))
+
+(defun semanticdb-typecache-length(thing)
+  "How long is THING?
+Debugging function."
+  (cond ((semanticdb-typecache-child-p thing)
+	 (length (oref thing stream)))
+	((semantic-tag-p thing)
+	 (length (semantic-tag-type-members thing)))
+	((and (listp thing) (semantic-tag-p (car thing)))
+	 (length thing))
+	((null thing)
+	 0)
+	(t -1)	))
+
+
+;;;###autoload
+(defmethod semanticdb-get-typecache ((table semanticdb-abstract-table))
+  "Retrieve the typecache from the semanticdb TABLE.
+If there is no table, create one, and fill it in."
+  (semanticdb-refresh-table table)
+  (let* ((idx (semanticdb-get-table-index table))
+	 (cache (oref idx type-cache))
+	 )
+
+    ;; Make sure we have a cache object in the DB index.
+    (when (not cache)
+      ;; The object won't change as we fill it with stuff.
+      (setq cache (semanticdb-typecache (semanticdb-full-filename table)))
+      (oset idx type-cache cache))
+
+    cache))
+
+(defmethod semanticdb-have-typecache-p ((table semanticdb-abstract-table))
+  "Return non-nil (the typecache) if TABLE has a pre-calculated typecache."
+  (let* ((idx (semanticdb-get-table-index table)))
+    (oref idx type-cache)))
+
+
+;;; DATABASE TYPECACHE
+;;
+;; A full database can cache the types across its files.
+;;
+;; Unlike file based caches, this one is a bit simpler, and just needs
+;; to get reset when a table gets updated.
+
+;;;###autoload
+(defclass semanticdb-database-typecache (semanticdb-abstract-db-cache)
+  ((stream :initform nil
+	   :documentation
+	   "The searchable tag stream for this cache.")
+   )
+  "Structure for maintaining a typecache.")
+
+(defmethod semantic-reset ((tc semanticdb-database-typecache))
+  "Reset the object IDX."
+  (oset tc stream nil)
+  )
+
+(defmethod semanticdb-synchronize ((cache semanticdb-database-typecache)
+				   new-tags)
+  "Synchronize a CACHE with some NEW-TAGS."
+  )
+
+(defmethod semanticdb-partial-synchronize ((cache semanticdb-database-typecache)
+					   new-tags)
+  "Synchronize a CACHE with some changed NEW-TAGS."
+  )
+
+;;;###autoload
+(defmethod semanticdb-get-typecache ((db semanticdb-project-database))
+  "Retrieve the typecache from the semantic database DB.
+If there is no table, create one, and fill it in."
+  (semanticdb-cache-get db semanticdb-database-typecache)
+  )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; MERGING
+;;
+;; Managing long streams of tags representing data types.
+;;
+(defun semanticdb-typecache-apply-filename (file stream)
+  "Apply the filename FILE to all tags in STREAM."
+  (let ((new nil))
+    (while stream
+      (setq new (cons (semantic-tag-copy (car stream) nil file)
+		      new))
+      ;The below is handled by the tag-copy fcn.
+      ;(semantic--tag-put-property (car new) :filename file)
+      (setq stream (cdr stream)))
+    (nreverse new)))
+
+
+(defsubst semanticdb-typecache-safe-tag-members (tag)
+  "Return a list of members for TAG that are safe to permute."
+  (let ((mem (semantic-tag-type-members tag))
+	(fname (semantic-tag-file-name tag)))
+    (if fname
+	(setq mem (semanticdb-typecache-apply-filename fname mem))
+      (copy-sequence mem))))
+
+(defsubst semanticdb-typecache-safe-tag-list (tags table)
+  "Make the tag list TAGS found in TABLE safe for the typecache.
+Adds a filename and copies the tags."
+  (semanticdb-typecache-apply-filename
+   (semanticdb-full-filename table)
+   tags))
+
+(defun semanticdb-typecache-faux-namespace (name members)
+  "Create a new namespace tag with NAME and a set of MEMBERS.
+The new tag will be a faux tag, used as a placeholder in a typecache."
+  (let ((tag (semantic-tag-new-type name "namespace" members nil)))
+    ;; Make sure we mark this as a fake tag.
+    (semantic-tag-set-faux tag)
+    tag))
+
+;;;###autoload
+(defun semanticdb-typecache-merge-streams (cache1 cache2)
+  "Merge into CACHE1 and CACHE2 together.  The Caches will be merged in place."
+  (if (or (and (not cache1) (not cache2))
+	  (and (not (cdr cache1)) (not cache2))
+	  (and (not cache1) (not (cdr cache2))))
+      ;; If all caches are empty OR
+      ;; cache1 is length 1 and no cache2 OR
+      ;; no cache1 and length 1 cache2
+      ;;
+      ;; then just return the cache, and skip all this merging stuff.
+      (or cache1 cache2)
+
+    ;; Assume we always have datatypes, as this typecache isn't really
+    ;; useful without a typed language.
+    (let ((S (semantic-sort-tags-by-name-then-type-increasing
+	      ;; I used to use append, but it copied cache1 but not cache2.
+	      ;; Since sort was permuting cache2, I already had to make sure
+	      ;; the caches were permute-safe.  Might as well use nconc here.
+	      (nconc cache1 cache2)))
+	  (ans nil)
+	  (next nil)
+	  (prev nil)
+	  (type nil))
+      ;; With all the tags in order, we can loop over them, and when
+      ;; two have the same name, we can either throw one away, or construct
+      ;; a fresh new tag merging the items together.
+      (while S
+	(setq prev (car ans))
+	(setq next (car S))
+	(if (or
+	     ;; CASE 1 - First item
+	     (null prev)
+	     ;; CASE 2 - New name
+	     (not (string= (semantic-tag-name next)
+			   (semantic-tag-name prev))))
+	    (setq ans (cons next ans))
+	  ;; ELSE - We have a NAME match.
+	  (setq type (semantic-tag-type next))
+	  (if (or (semantic-tag-of-type-p prev type) ; Are they the same datatype
+		  (semantic-tag-faux-p prev)
+		  (semantic-tag-faux-p next) ; or either a faux tag?
+		  )
+	      ;; Same Class, we can do a merge.
+	      (cond
+	       ((and (semantic-tag-of-class-p next 'type)
+		     (string= type "namespace"))
+		;; Namespaces - merge the children together.
+		(setcar ans
+			(semanticdb-typecache-faux-namespace
+			 (semantic-tag-name prev) ; - they are the same
+			 (semanticdb-typecache-merge-streams
+			  (semanticdb-typecache-safe-tag-members prev)
+			  (semanticdb-typecache-safe-tag-members next))
+			 ))
+		)
+	       ((semantic-tag-prototype-p next)
+		;; NEXT is a prototype... so keep previous.
+		nil			; - keep prev, do nothing
+		)
+	       ((semantic-tag-prototype-p prev)
+		;; PREV is a prototype, but not next.. so keep NEXT.
+		;; setcar - set by side-effect on top of prev
+		(setcar ans next)
+		)
+	       (t
+		;;(message "Don't know how to merge %s.  Keeping first entry." (semantic-tag-name next))
+		))
+	    ;; Not same class... but same name
+					;(message "Same name, different type: %s, %s!=%s"
+					;	   (semantic-tag-name next)
+					;	   (semantic-tag-type next)
+					;        (semantic-tag-type prev))
+	    (setq ans (cons next ans))
+	    ))
+	(setq S (cdr S)))
+      (nreverse ans))))
+
+;;; Refresh / Query API
+;;
+;; Queries that can be made for the typecache.
+(define-overloadable-function semanticdb-expand-nested-tag (tag)
+  "Expand TAG from fully qualified names.
+If TAG has fully qualified names, expand it to a series of nested
+namespaces instead."
+  tag)
+
+(defmethod semanticdb-typecache-file-tags ((table semanticdb-abstract-table))
+  "No tags available from non-file based tables."
+  nil)
+
+(defmethod semanticdb-typecache-file-tags ((table semanticdb-table))
+  "Update the typecache for TABLE, and return the file-tags.
+File-tags are those that belong to this file only, and excludes
+all included files."
+  (let* (;(idx (semanticdb-get-table-index table))
+	 (cache (semanticdb-get-typecache table))
+	 )
+
+    ;; Make sure our file-tags list is up to date.
+    (when (not (oref cache filestream))
+      (let ((tags  (semantic-find-tags-by-class 'type table))
+	    (exptags nil))
+	(when tags
+	  (setq tags (semanticdb-typecache-safe-tag-list tags table))
+	  (dolist (T tags)
+	    (push (semanticdb-expand-nested-tag T) exptags))
+	  (oset cache filestream (semanticdb-typecache-merge-streams exptags nil)))))
+
+    ;; Return our cache.
+    (oref cache filestream)
+    ))
+
+(defmethod semanticdb-typecache-include-tags ((table semanticdb-abstract-table))
+  "No tags available from non-file based tables."
+  nil)
+
+(defmethod semanticdb-typecache-include-tags ((table semanticdb-table))
+  "Update the typecache for TABLE, and return the merged types from the include tags.
+Include-tags are the tags brought in via includes, all merged together into
+a master list."
+  (let* ((cache (semanticdb-get-typecache table))
+	 )
+
+    ;; Make sure our file-tags list is up to date.
+    (when (not (oref cache includestream))
+      (let (;; Calc the path first.  This will have a nice side -effect of
+	    ;; getting the cache refreshed if a refresh is needed.  Most of the
+	    ;; time this value is itself cached, so the query is fast.
+	    (incpath (semanticdb-find-translate-path table nil))
+	    (incstream nil))
+	;; Get the translated path, and extract all the type tags, then merge
+	;; them all together.
+	(dolist (i incpath)
+	  ;; don't include ourselves in this crazy list.
+	  (when (and i (not (eq i table))
+		     ;; @todo - This eieio fcn can be slow!  Do I need it?
+		     ;; (semanticdb-table-child-p i)
+		     )
+	    (setq incstream
+		  (semanticdb-typecache-merge-streams
+		   incstream
+		   ;; Getting the cache from this table will also cause this
+		   ;; file to update it's cache from it's decendants.
+		   ;;
+		   ;; In theory, caches are only built for most includes
+		   ;; only once (in the loop before this one), so this ends
+		   ;; up being super fast as we edit our file.
+		   (copy-sequence
+		    (semanticdb-typecache-file-tags i))))
+	    ))
+
+	;; Save...
+	(oset cache includestream incstream)))
+
+    ;; Return our cache.
+    (oref cache includestream)
+    ))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; Search Routines
+;;
+;;;###autoload
+(define-overloadable-function semanticdb-typecache-find (type &optional path find-file-match)
+  "Search the typecache for TYPE in PATH.
+If type is a string, split the string, and search for the parts.
+If type is a list, treat the type as a pre-split string.
+PATH can be nil for the current buffer, or a semanticdb table.
+FIND-FILE-MATCH is non-nil to force all found tags to be loaded into a buffer.")
+
+(defun semanticdb-typecache-find-default (type &optional path find-file-match)
+  "Default implementation of `semanticdb-typecache-find'.
+TYPE is the datatype to find.
+PATH is the search path.. which should be one table object.
+If FIND-FILE-MATCH is non-nil, then force the file belonging to the
+found tag to be loaded."
+  (semanticdb-typecache-find-method (or path semanticdb-current-table)
+				    type find-file-match))
+
+(defun semanticdb-typecache-find-by-name-helper (name table)
+  "Find the tag with NAME in TABLE, which is from a typecache.
+If more than one tag has NAME in TABLE, we will prefer the tag that
+is of class 'type."
+  (let* ((names (semantic-find-tags-by-name name table))
+	 (types (semantic-find-tags-by-class 'type names)))
+    (or (car-safe types) (car-safe names))))
+
+(defmethod semanticdb-typecache-find-method ((table semanticdb-abstract-table)
+					     type find-file-match)
+  "Search the typecache in TABLE for the datatype TYPE.
+If type is a string, split the string, and search for the parts.
+If type is a list, treat the type as a pre-split string.
+If FIND-FILE-MATCH is non-nil, then force the file belonging to the
+found tag to be loaded."
+  ;; convert string to a list.
+  (when (stringp type) (setq type (semantic-analyze-split-name type)))
+  (when (stringp type) (setq type (list type)))
+
+  ;; Search for the list in our typecache.
+  (let* ((file (semanticdb-typecache-file-tags table))
+	 (inc (semanticdb-typecache-include-tags table))
+	 (stream nil)
+	 (f-ans nil)
+	 (i-ans nil)
+	 (ans nil)
+	 (notdone t)
+	 (lastfile nil)
+	 (thisfile nil)
+	 (lastans nil)
+	 (calculated-scope nil)
+	 )
+    ;; 1) Find first symbol in the two master lists and then merge
+    ;;    the found streams.
+
+    ;; We stripped duplicates, so these will be super-fast!
+    (setq f-ans (semantic-find-first-tag-by-name (car type) file))
+    (setq i-ans (semantic-find-first-tag-by-name (car type) inc))
+    (if (and f-ans i-ans)
+	(progn
+	  ;; This trick merges the two identified tags, making sure our lists are
+	  ;; complete.  The second find then gets the new 'master' from the list of 2.
+	  (setq ans (semanticdb-typecache-merge-streams (list f-ans) (list i-ans)))
+	  (setq ans (semantic-find-first-tag-by-name (car type) ans))
+	  )
+
+      ;; The answers are already sorted and merged, so if one misses,
+      ;; no need to do any special work.
+      (setq ans (or f-ans i-ans)))
+
+    ;; 2) Loop over the remaining parts.
+    (while (and type notdone)
+
+      ;; For pass > 1, stream will be non-nil, so do a search, otherwise
+      ;; ans is from outside the loop.
+      (when stream
+	(setq ans (semanticdb-typecache-find-by-name-helper (car type) stream))
+
+	;; NOTE: The below test to make sure we get a type is only relevant
+	;;       for the SECOND pass or later.  The first pass can only ever
+	;;       find a type/namespace because everything else is excluded.
+
+	;; If this is not the last entry from the list, then it
+	;; must be a type or a namespace.  Lets double check.
+	(when (cdr type)
+
+	  ;; From above, there is only one tag in ans, and we prefer
+	  ;; types.
+	  (when (not (semantic-tag-of-class-p ans 'type))
+
+	    (setq ans nil)))
+	)
+
+      (push ans calculated-scope)
+
+      ;; Track most recent file.
+      (setq thisfile (semantic-tag-file-name ans))
+      (when (and thisfile (stringp thisfile))
+	(setq lastfile thisfile))
+
+      ;; If we have a miss, exit, otherwise, update the stream to
+      ;; the next set of members.
+      (if (not ans)
+	  (setq notdone nil)
+	(setq stream (semantic-tag-type-members ans)))
+
+      (setq lastans ans
+	    ans nil
+	    type (cdr type)))
+
+    (if (or type (not notdone))
+	;; If there is stuff left over, then we failed.  Just return
+	;; nothing.
+	nil
+
+      ;; We finished, so return everything.
+
+      (if (and find-file-match lastfile)
+	  ;; This won't liven up the tag since we have a copy, but
+	  ;; we ought to be able to get there and go to the right line.
+	  (find-file-noselect lastfile)
+	;; We don't want to find-file match, so instead lets
+	;; push the filename onto the return tag.
+	(when lastans
+	  (setq lastans (semantic-tag-copy lastans nil lastfile))
+	  ;; We used to do the below, but we would erroneously be putting
+	  ;; attributes on tags being shred with other lists.
+	  ;;(semantic--tag-put-property lastans :filename lastfile)
+	  )
+	)
+
+      (if (and lastans calculated-scope)
+
+	  ;; Put our discovered scope into the tag if we have a tag
+	  (semantic-scope-tag-clone-with-scope
+	   lastans (reverse (cdr calculated-scope)))
+
+	;; Else, just return
+	lastans
+	))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; BRUTISH Typecache
+;;
+;; Routines for a typecache that crosses all tables in a given database
+;; for a matching major-mode.
+(defmethod semanticdb-typecache-for-database ((db semanticdb-project-database)
+					      &optional mode)
+  "Return the typecache for the project database DB.
+If there isn't one, create it.
+"
+  (let ((lmode (or mode major-mode))
+	(cache (semanticdb-get-typecache db))
+	(stream nil)
+	)
+    (dolist (table (semanticdb-get-database-tables db))
+      (when (eq lmode (oref table :major-mode))
+	(setq stream
+	      (semanticdb-typecache-merge-streams
+	       stream
+	       (copy-sequence
+		(semanticdb-typecache-file-tags table))))
+	))
+    (oset cache stream stream)
+    cache))
+
+;;;###autoload
+(defun semanticdb-typecache-refresh-for-buffer (buffer)
+  "Refresh the typecache for BUFFER."
+  (save-excursion
+    (set-buffer buffer)
+    (let* ((tab semanticdb-current-table)
+	   ;(idx (semanticdb-get-table-index tab))
+	   (tc (semanticdb-get-typecache tab)))
+      (semanticdb-typecache-file-tags tab)
+      (semanticdb-typecache-include-tags tab)
+      tc)))
+
+
+;;; DEBUG
+;;
+(defun semanticdb-typecache-complete-flush ()
+  "Flush all typecaches referenced by the current buffer."
+  (interactive)
+  (let* ((path (semanticdb-find-translate-path nil nil)))
+    (dolist (P path)
+      (oset P pointmax nil)
+      (semantic-reset (semanticdb-get-typecache P)))))
+
+;;;###autoload
+(defun semanticdb-typecache-dump ()
+  "Dump the typecache for the current buffer."
+  (interactive)
+  (let* ((start (current-time))
+	 (tc (semanticdb-typecache-refresh-for-buffer (current-buffer)))
+	 (end (current-time))
+	 )
+    (data-debug-new-buffer "*TypeCache ADEBUG*")
+    (message "Calculating Cache took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-insert-thing tc "]" "")
+
+    ))
+
+;;;###autoload
+(defun semanticdb-db-typecache-dump ()
+  "Dump the typecache for the current buffer's database."
+  (interactive)
+  (let* ((tab semanticdb-current-table)
+	 (idx (semanticdb-get-table-index tab))
+	 (junk (oset idx type-cache nil)) ;; flush!
+	 (start (current-time))
+	 (tc (semanticdb-typecache-for-database (oref tab parent-db)))
+	 (end (current-time))
+	 )
+    (data-debug-new-buffer "*TypeCache ADEBUG*")
+    (message "Calculating Cache took %.2f seconds."
+	     (semantic-elapsed-time start end))
+
+    (data-debug-insert-thing tc "]" "")
+
+    ))
+
+
+(provide 'semanticdb-typecache)
+;;; semanticdb-typecache.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb.el b/site/cedet-1.0pre7/semantic/semanticdb.el
new file mode 100755
index 0000000..f48314c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb.el
@@ -0,0 +1,1032 @@
+;;; semanticdb.el --- Semantic tag database manager
+
+;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: tags
+;; X-RCS: $Id: semanticdb.el,v 1.139 2010/01/05 02:34:05 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; Semanticdb is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;; 
+;;; Commentary:
+;;
+;; Maintain a database of tags for a group of files and enable
+;; queries into the database.
+;;
+;; By default, assume one database per directory.
+;;
+
+(require 'inversion)
+(eval-and-compile
+  (inversion-require 'eieio "1.0"))
+(require 'eieio-base)
+(require 'semantic)
+(eval-when-compile
+  (require 'semantic-lex-spp))
+
+;;; Variables:
+(defgroup semanticdb nil
+  "Parser Generator Persistent Database interface."
+  :group 'semantic
+  )
+;;; Code:
+(defvar semanticdb-database-list nil
+  "List of all active databases.")
+
+(defvar semanticdb-new-database-class 'semanticdb-project-database-file
+  "The default type of database created for new files.
+This can be changed on a per file basis, so that some directories
+are saved using one mechanism, and some directories via a different
+mechanism.")
+(make-variable-buffer-local 'semanticdb-new-database-class)
+
+(defvar semanticdb-default-find-index-class 'semanticdb-find-search-index
+  "The default type of search index to use for a `semanticdb-table's.
+This can be changed to try out new types of search indicies.")
+(make-variable-buffer-local 'semanticdb-default-find=index-class)
+
+
+;;; ABSTRACT CLASSES
+;;
+(defclass semanticdb-abstract-table ()
+  ((parent-db ;; :initarg :parent-db
+    ;; Do not set an initarg, or you get circular writes to disk.
+	      :documentation "Database Object containing this table.")
+   (major-mode :initarg :major-mode
+	       :initform nil
+	       :documentation "Major mode this table belongs to.
+Sometimes it is important for a program to know if a given table has the
+same major mode as the current buffer.")
+   (tags :initarg :tags
+	 :accessor semanticdb-get-tags
+	 :printer semantic-tag-write-list-slot-value
+	 :documentation "The tags belonging to this table.")
+   (index :type semanticdb-abstract-search-index
+	  :documentation "The search index.
+Used by semanticdb-find to store additional information about
+this table for searching purposes.
+
+Note: This index will not be saved in a persistent file.")
+   (cache :type list
+	  :initform nil
+	  :documentation "List of cache information for tools.
+Any particular tool can cache data to a database at runtime
+with `semanticdb-cache-get'.
+
+Using a semanticdb cache does not save any information to a file,
+so your cache will need to be recalculated at runtime.  Caches can be
+referenced even when the file is not in a buffer.
+
+Note: This index will not be saved in a persistent file.")
+   )
+  "A simple table for semantic tags.
+This table is the root of tables, and contains the minimum needed
+for a new table not associated with a buffer."
+  :abstract t)
+
+(defmethod semanticdb-in-buffer-p ((obj semanticdb-abstract-table))
+  "Return a nil, meaning abstract table OBJ is not in a buffer."
+  nil)
+
+(defmethod semanticdb-get-buffer ((obj semanticdb-abstract-table))
+  "Return a buffer associated with OBJ.
+If the buffer is not in memory, load it with `find-file-noselect'."
+  nil)
+
+(defmethod semanticdb-full-filename ((obj semanticdb-abstract-table))
+  "Fetch the full filename that OBJ refers to.
+Abstract tables do not have file names associated with them."
+  nil)
+
+(defmethod semanticdb-dirty-p ((obj semanticdb-abstract-table))
+  "Return non-nil if OBJ is 'dirty'."
+  nil)
+
+(defmethod semanticdb-set-dirty ((obj semanticdb-abstract-table))
+  "Mark the abstract table OBJ dirty.
+Abstract tables can not be marked dirty, as there is nothing
+for them to synchronize against."
+  ;; The abstract table can not be dirty.
+  nil)
+
+(defmethod semanticdb-normalize-tags ((obj semanticdb-abstract-table) tags)
+  "For the table OBJ, convert a list of TAGS, into standardized form.
+The default is to return TAGS.
+Some databases may default to searching and providing simplified tags
+based on whichever technique used.  This method provides a hook for
+them to convert TAG into a more complete form."
+  tags)
+
+(defmethod semanticdb-normalize-one-tag ((obj semanticdb-abstract-table) tag)
+  "For the table OBJ, convert a TAG, into standardized form.
+This method returns a list of the form (DATABASE . NEWTAG).
+
+The default is to just return (OBJ TAG).
+
+Some databases may default to searching and providing simplified tags
+based on whichever technique used.  This method provides a hook for
+them to convert TAG into a more complete form."
+  (cons obj tag))
+
+(defmethod object-print ((obj semanticdb-abstract-table) &rest strings)
+  "Pretty printer extension for `semanticdb-table'.
+Adds the number of tags in this file to the object print name."
+  (apply 'call-next-method obj
+	 (cons (format " (%d tags)"
+		       (length (semanticdb-get-tags obj))
+		       )
+	       strings)))
+
+;;; Index Cache
+;;
+(defclass semanticdb-abstract-search-index ()
+  ((table :initarg :table
+	  :type semanticdb-abstract-table
+	  :documentation "XRef to the table this belongs to.")
+   )
+  "A place where semanticdb-find can store search index information.
+The search index will store data about which other tables might be
+needed, or perhaps create hash or index tables for the current buffer."
+  :abstract t)
+
+(defmethod semanticdb-get-table-index ((obj semanticdb-abstract-table))
+  "Return the search index for the table OBJ.
+If one doesn't exist, create it."
+  (if (slot-boundp obj 'index)
+      (oref obj index)
+    (let ((idx nil))
+      (setq idx (funcall semanticdb-default-find-index-class
+			 (concat (object-name obj) " index")
+			 ;; Fill in the defaults
+		         :table obj
+			 ))
+      (oset obj index idx)
+      idx)))
+
+(defmethod semanticdb-synchronize ((idx semanticdb-abstract-search-index)
+				   new-tags)
+  "Synchronize the search index IDX with some NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+(defmethod semanticdb-partial-synchronize ((idx semanticdb-abstract-search-index)
+					   new-tags)
+  "Synchronize the search index IDX with some changed NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+
+;;; SEARCH RESULTS TABLE
+;;
+;; Needed for system databases that may not provide
+;; a semanticdb-table associated with a file.
+;;
+(defclass semanticdb-search-results-table (semanticdb-abstract-table)
+  (
+   )
+  "Table used for search results when there is no file or table association.
+Examples include search results from external sources such as from
+Emacs' own symbol table, or from external libraries.")
+
+(defmethod semanticdb-refresh-table ((obj semanticdb-search-results-table) &optional force)
+  "If the tag list associated with OBJ is loaded, refresh it.
+This will call `semantic-fetch-tags' if that file is in memory."
+  nil)
+
+;;; CONCRETE TABLE CLASSES
+;;
+(defclass semanticdb-table (semanticdb-abstract-table)
+  ((file :initarg :file
+	 :documentation "File name relative to the parent database.
+This is for the file whose tags are stored in this TABLE object.")
+   (buffer :initform nil
+	   :documentation "The buffer associated with this table.
+If nil, the table's buffer is no in Emacs.  If it has a value, then
+it is in Emacs.")
+   (dirty :initform nil
+	  :documentation
+	  "Non nil if this table needs to be `Saved'.")
+   (db-refs :initform nil
+	    :documentation
+	    "List of `semanticdb-table' objects refering to this one.
+These aren't saved, but are instead recalculated after load.
+See the file semanticdb-ref.el for how this slot is used.")
+   (pointmax :initarg :pointmax
+	     :initform nil
+	     :documentation "Size of buffer when written to disk.
+Checked on retrieval to make sure the file is the same.")
+   (fsize :initarg :fsize
+	  :initform nil
+	  :documentation "Size of the file when it was last referenced.
+Checked when deciding if a loaded table needs updating from changes
+outside of Semantic's control.")
+   (lastmodtime :initarg :lastmodtime
+		:initform nil
+		:documentation "Last modification time of the file referenced.
+Checked when deciding if a loaded table needs updating from changes outside of
+Semantic's control.")
+   ;; @todo - need to add `last parsed time', so we can also have
+   ;; refresh checks if spp tables or the parser gets rebuilt.
+   (unmatched-syntax :initarg :unmatched-syntax
+		     :documentation
+		     "List of vectors specifying unmatched syntax.")
+
+   (lexical-table :initarg :lexical-table
+		  :initform nil
+		  :printer semantic-lex-spp-table-write-slot-value
+		  :documentation
+		  "Table that might be needed by the lexical analyzer.
+For C/C++, the C preprocessor macros can be saved here.")
+   )
+  "A single table of tags derived from file.")
+
+(defmethod semanticdb-in-buffer-p ((obj semanticdb-table))
+  "Return a buffer associated with OBJ.
+If the buffer is in memory, return that buffer."
+  (let ((buff (oref obj buffer)))
+    (if (buffer-live-p buff)
+	buff
+      (oset obj buffer nil))))
+
+(defmethod semanticdb-get-buffer ((obj semanticdb-table))
+  "Return a buffer associated with OBJ.
+If the buffer is in memory, return that buffer.
+If the buffer is not in memory, load it with `find-file-noselect'."
+  (or (semanticdb-in-buffer-p obj)
+      ;; Save match data to protect against odd stuff in mode hooks.
+      (save-match-data
+	(find-file-noselect (semanticdb-full-filename obj) t))))
+
+(defmethod semanticdb-set-buffer ((obj semanticdb-table))
+  "Set the current buffer to be a buffer owned by OBJ.
+If OBJ's file is not loaded, read it in first."
+  (set-buffer (semanticdb-get-buffer obj)))
+
+(defmethod semanticdb-full-filename ((obj semanticdb-table))
+  "Fetch the full filename that OBJ refers to."
+  (expand-file-name (oref obj file)
+		    (oref (oref obj parent-db) reference-directory)))
+
+(defmethod semanticdb-dirty-p ((obj semanticdb-table))
+  "Return non-nil if OBJ is 'dirty'."
+  (oref obj dirty))
+
+(defmethod semanticdb-set-dirty ((obj semanticdb-table))
+  "Mark the abstract table OBJ dirty."
+  (oset obj dirty t)
+  )
+
+(defmethod object-print ((obj semanticdb-table) &rest strings)
+  "Pretty printer extension for `semanticdb-table'.
+Adds the number of tags in this file to the object print name."
+  (apply 'call-next-method obj
+	 (cons (if (oref obj dirty) ", DIRTY" "") strings)))
+
+;;; DATABASE BASE CLASS
+;;
+(defclass semanticdb-project-database (eieio-instance-tracker)
+  ((tracking-symbol :initform semanticdb-database-list)
+   (reference-directory :type string
+			:documentation "Directory this database refers to.
+When a cache directory is specified, then this refers to the directory
+this database contains symbols for.")
+   (new-table-class :initform semanticdb-table
+		    :type class
+		    :documentation
+		    "New tables created for this database are of this class.")
+   (cache :type list
+	  :initform nil
+	  :documentation "List of cache information for tools.
+Any particular tool can cache data to a database at runtime
+with `semanticdb-cache-get'.
+
+Using a semanticdb cache does not save any information to a file,
+so your cache will need to be recalculated at runtime.
+
+Note: This index will not be saved in a persistent file.")
+   (tables :initarg :tables
+	   :type list
+	   ;; Need this protection so apps don't try to access
+	   ;; the tables without using the accessor.
+	   :accessor semanticdb-get-database-tables
+	   :protection :protected
+	   :documentation "List of `semantic-db-table' objects."))
+  "Database of file tables.")
+
+(defmethod semanticdb-full-filename ((obj semanticdb-project-database))
+  "Fetch the full filename that OBJ refers to.
+Abstract tables do not have file names associated with them."
+  nil)
+
+(defmethod semanticdb-dirty-p ((DB semanticdb-project-database))
+  "Return non-nil if DB is 'dirty'.
+A database is dirty if the state of the database changed in a way
+where it may need to resynchronize with some persistent storage."
+  (let ((dirty nil)
+	(tabs (oref DB tables)))
+    (while (and (not dirty) tabs)
+      (setq dirty (semanticdb-dirty-p (car tabs)))
+      (setq tabs (cdr tabs)))
+    dirty))
+
+(defmethod object-print ((obj semanticdb-project-database) &rest strings)
+  "Pretty printer extension for `semanticdb-project-database'.
+Adds the number of tables in this file to the object print name."
+  (apply 'call-next-method obj
+	 (cons (format " (%d tables%s)"
+		       (length (semanticdb-get-database-tables obj))
+		       (if (semanticdb-dirty-p obj)
+			   " DIRTY" "")
+		       )
+	       strings)))
+
+(defmethod semanticdb-create-database :STATIC ((dbc semanticdb-project-database) directory)
+  "Create a new semantic database of class DBC for DIRECTORY and return it.
+If a database for DIRECTORY has already been created, return it.
+If DIRECTORY doesn't exist, create a new one."
+  (let ((db (semanticdb-directory-loaded-p directory)))
+    (unless db
+      (setq db (semanticdb-project-database
+		(file-name-nondirectory directory)
+		:tables nil))
+      ;; Set this up here.   We can't put it in the constructor because it
+      ;; would be saved, and we want DB files to be portable.
+      (oset db reference-directory (file-truename directory)))
+    db))
+
+(defmethod semanticdb-flush-database-tables ((db semanticdb-project-database))
+  "Reset the tables in DB to be empty."
+  (oset db tables nil))
+
+(defmethod semanticdb-create-table ((db semanticdb-project-database) file)
+  "Create a new table in DB for FILE and return it.
+The class of DB contains the class name for the type of table to create.
+If the table for FILE exists, return it.
+If the table for FILE does not exist, create one."
+  (let ((newtab (semanticdb-file-table db file)))
+    (unless newtab
+      ;; This implementation will satisfy autoloaded classes
+      ;; for tables.
+      (setq newtab (funcall (oref db new-table-class)
+			    (file-name-nondirectory file)
+			    :file (file-name-nondirectory file)
+			    ))
+      (oset newtab parent-db db)
+      (object-add-to-list db 'tables newtab t))
+    newtab))
+
+(defmethod semanticdb-file-table ((obj semanticdb-project-database) filename)
+  "From OBJ, return FILENAME's associated table object."
+  (object-assoc (file-relative-name (file-truename filename)
+  				    (oref obj reference-directory))
+		'file (oref obj tables)))
+
+;; DATABASE FUNCTIONS
+(defun semanticdb-get-database (filename)
+  "Get a database for FILENAME.
+If one isn't found, create one."
+  (semanticdb-create-database semanticdb-new-database-class (file-truename filename)))
+
+(defun semanticdb-directory-loaded-p (path)
+  "Return the project belonging to PATH if it was already loaded."
+  (eieio-instance-tracker-find path 'reference-directory 'semanticdb-database-list))
+
+(defun semanticdb-create-table-for-file (filename)
+  "Initialize a database table for FILENAME, and return it.
+If FILENAME exists in the database already, return that.
+If there is no database for the table to live in, create one."
+  (let ((cdb nil)
+	(tbl nil)
+	(dd (file-name-directory filename))
+	)
+    ;; Allow a database override function
+    (setq cdb (semanticdb-create-database semanticdb-new-database-class
+					  dd))
+    ;; Get a table for this file.
+    (setq tbl (semanticdb-create-table cdb filename))
+
+    ;; Return the pair.
+    (cons cdb tbl)
+    ))
+
+;;; Cache Cache.
+;;
+(defclass semanticdb-abstract-cache ()
+  ((table :initarg :table
+	  :type semanticdb-abstract-table
+	  :documentation
+	  "Cross reference to the table this belongs to.")
+   )
+  "Abstract baseclass for tools to use to cache information in semanticdb.
+Tools needing a per-file cache must subclass this, and then get one as
+needed.  Cache objects are identified in semanticdb by subclass.
+In order to keep your cache up to date, be sure to implement
+`semanticdb-synchronize', and `semanticdb-partial-synchronize'.
+See the file semantic-scope.el for an example."
+  :abstract t)
+
+(defmethod semanticdb-cache-get ((table semanticdb-abstract-table)
+				 desired-class)
+  "Get a cache object on TABLE of class DESIRED-CLASS.
+This method will create one if none exists with no init arguments
+other than :table."
+  (assert (child-of-class-p desired-class 'semanticdb-abstract-cache))
+  (let ((cache (oref table cache))
+	(obj nil))
+    (while (and (not obj) cache)
+      (if (eq (object-class-fast (car cache)) desired-class)
+	  (setq obj (car cache)))
+      (setq cache (cdr cache)))
+    (if obj
+	obj ;; Just return it.
+      ;; No object, lets create a new one and return that.
+      (setq obj (funcall desired-class "Cache" :table table))
+      (object-add-to-list table 'cache obj)
+      obj)))
+
+(defmethod semanticdb-cache-remove ((table semanticdb-abstract-table)
+				    cache)
+  "Remove from TABLE the cache object CACHE."
+  (object-remove-from-list table 'cache cache))
+
+(defmethod semanticdb-synchronize ((cache semanticdb-abstract-cache)
+				   new-tags)
+  "Synchronize a CACHE with some NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+(defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-cache)
+					   new-tags)
+  "Synchronize a CACHE with some changed NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+(defclass semanticdb-abstract-db-cache ()
+  ((db :initarg :db
+       :type semanticdb-project-database
+       :documentation
+       "Cross reference to the database this belongs to.")
+   )
+  "Abstract baseclass for tools to use to cache information in semanticdb.
+Tools needing a database cache must subclass this, and then get one as
+needed.  Cache objects are identified in semanticdb by subclass.
+In order to keep your cache up to date, be sure to implement
+`semanticdb-synchronize', and `semanticdb-partial-synchronize'.
+See the file semantic-scope.el for an example."
+  :abstract t)
+
+(defmethod semanticdb-cache-get ((db semanticdb-project-database)
+				 desired-class)
+  "Get a cache object on DB of class DESIRED-CLASS.
+This method will create one if none exists with no init arguments
+other than :table."
+  (assert (child-of-class-p desired-class 'semanticdb-abstract-db-cache))
+  (let ((cache (oref db cache))
+	(obj nil))
+    (while (and (not obj) cache)
+      (if (eq (object-class-fast (car cache)) desired-class)
+	  (setq obj (car cache)))
+      (setq cache (cdr cache)))
+    (if obj
+	obj ;; Just return it.
+      ;; No object, lets create a new one and return that.
+      (setq obj (funcall desired-class "Cache" :db db))
+      (object-add-to-list db 'cache obj)
+      obj)))
+
+(defmethod semanticdb-cache-remove ((db semanticdb-project-database)
+				    cache)
+  "Remove from TABLE the cache object CACHE."
+  (object-remove-from-list db 'cache cache))
+
+
+(defmethod semanticdb-synchronize ((cache semanticdb-abstract-db-cache)
+				   new-tags)
+  "Synchronize a CACHE with some NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+(defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-db-cache)
+					   new-tags)
+  "Synchronize a CACHE with some changed NEW-TAGS."
+  ;; The abstract class will do... NOTHING!
+  )
+
+;;; REFRESH
+
+(defmethod semanticdb-refresh-table ((obj semanticdb-table) &optional force)
+  "If the tag list associated with OBJ is loaded, refresh it.
+Optional argument FORCE will force a refresh even if the file in question
+is not in a buffer.  Avoid using FORCE for most uses, as an old cache
+may be sufficient for the general case.  Forced updates can be slow.
+This will call `semantic-fetch-tags' if that file is in memory."
+  (cond
+   ;;
+   ;; Already in a buffer, just do it.
+   ((semanticdb-in-buffer-p obj)
+    (semanticdb-set-buffer obj)
+    (semantic-fetch-tags))
+   ;;
+   ;; Not in a buffer.  Forcing a load.  
+   (force
+    ;; Patch from Iain Nicol. -- 
+    ;; @TODO: I wonder if there is a way to recycle 
+    ;;        semanticdb-create-table-for-file-not-in-buffer
+    (save-excursion
+      (let ((buff (semantic-find-file-noselect 
+		   (semanticdb-full-filename obj))))
+	(set-buffer buff)
+	(semantic-fetch-tags)
+	;; Kill off the buffer if it didn't exist when we were called.
+	(kill-buffer buff))))))
+
+(defmethod semanticdb-needs-refresh-p ((obj semanticdb-table))
+  "Return non-nil of OBJ's tag list is out of date.
+The file associated with OBJ does not need to be in a buffer."
+  (let* ((ff (semanticdb-full-filename obj))
+	 (buff (semanticdb-in-buffer-p obj))
+	 )
+    (if buff
+	(save-excursion
+	  (set-buffer buff)
+	  ;; Use semantic's magic tracker to determine of the buffer is up
+	  ;; to date or not.
+	  (not (semantic-parse-tree-up-to-date-p))
+	  ;; We assume that semanticdb is keeping itself up to date.
+	  ;; via all the clever hooks
+	  )
+      ;; Buffer isn't loaded.  The only clue we have is if the file
+      ;; is somehow different from our mark in the semanticdb table.
+      (let* ((stats (file-attributes ff))
+	     (actualsize (nth 7 stats))
+	     (actualmod (nth 5 stats))
+	     )
+
+	(or (not (slot-boundp obj 'tags))
+	    ;; (not (oref obj tags)) -->  not needed anymore?
+	    (/= (or (oref obj fsize) 0) actualsize)
+	    (not (equal (oref obj lastmodtime) actualmod))
+	    )
+	))))
+
+
+;;; Synchronization
+;;
+(defmethod semanticdb-synchronize ((table semanticdb-abstract-table)
+				   new-tags)
+  "Synchronize the table TABLE with some NEW-TAGS."
+  (oset table tags new-tags)
+  (oset table pointmax (point-max))
+  (let ((fattr (file-attributes (semanticdb-full-filename table))))
+    (oset table fsize (nth 7 fattr))
+    (oset table lastmodtime (nth 5 fattr))
+    )
+  ;; Assume it is now up to date.
+  (oset table unmatched-syntax semantic-unmatched-syntax-cache)
+  ;; The lexical table should be good too.
+  (when (featurep 'semantic-lex-spp)
+    (oset table lexical-table (semantic-lex-spp-save-table)))
+  ;; this implies dirtyness
+  (semanticdb-set-dirty table)
+
+  ;; Synchronize the index
+  (when (slot-boundp table 'index)
+    (let ((idx (oref table index)))
+      (when idx (semanticdb-synchronize idx new-tags))))
+
+  ;; Synchronize application caches.
+  (dolist (C (oref table cache))
+    (semanticdb-synchronize C new-tags)
+    )
+
+  ;; Update cross references
+  ;; (semanticdb-refresh-references table)
+  )
+
+(defmethod semanticdb-partial-synchronize ((table semanticdb-abstract-table)
+					   new-tags)
+  "Synchronize the table TABLE where some NEW-TAGS changed."
+  ;; You might think we need to reset the tags, but since the partial
+  ;; parser splices the lists, we don't need to do anything
+  ;;(oset table tags new-tags)
+  ;; We do need to mark ourselves dirty.
+  (semanticdb-set-dirty table)
+
+  ;; The lexical table may be modified.
+  (when (featurep 'semantic-lex-spp)
+    (oset table lexical-table (semantic-lex-spp-save-table)))
+
+  ;; Incremental parser doesn't mokey around with this.
+  (oset table unmatched-syntax semantic-unmatched-syntax-cache)
+
+  ;; Synchronize the index
+  (when (slot-boundp table 'index)
+    (let ((idx (oref table index)))
+      (when idx (semanticdb-partial-synchronize idx new-tags))))
+
+  ;; Synchronize application caches.
+  (dolist (C (oref table cache))
+    (semanticdb-synchronize C new-tags)
+    )
+
+  ;; Update cross references
+  ;;(when (semantic-find-tags-by-class 'include new-tags)
+  ;;  (semanticdb-refresh-references table))
+  )
+
+;;; SAVE/LOAD
+;;
+(defmethod semanticdb-save-db ((DB semanticdb-project-database)
+			       &optional supress-questions)
+  "Cause a database to save itself.
+The database base class does not save itself persistently.
+Subclasses could save themselves to a file, or to a database, or other
+form."
+  nil)
+
+(defun semanticdb-save-current-db ()
+  "Save the current tag database."
+  (interactive)
+  (message "Saving current tag summaries...")
+  (semanticdb-save-db semanticdb-current-database)
+  (message "Saving current tag summaries...done"))
+
+;; This prevents Semanticdb from querying multiple times if the users
+;; answers "no" to creating the Semanticdb directory.
+(defvar semanticdb--inhibit-create-file-directory)
+
+(defun semanticdb-save-all-db ()
+  "Save all semantic tag databases."
+  (interactive)
+  (message "Saving tag summaries...")
+  (let ((semanticdb--inhibit-make-directory nil))
+    (mapc 'semanticdb-save-db semanticdb-database-list))
+  (message "Saving tag summaries...done"))
+
+(defun semanticdb-save-all-db-idle ()
+  "Save all semantic tag databases from idle time.
+Exit the save between databases if there is user input."
+  (semantic-safe "Auto-DB Save: %S"
+    (semantic-exit-on-input 'semanticdb-idle-save
+      (mapc (lambda (db)
+	      (semantic-throw-on-input 'semanticdb-idle-save)
+	      (semanticdb-save-db db t))
+	    semanticdb-database-list))
+    ))
+
+;;; Directory Project support
+;;
+(defvar semanticdb-project-predicate-functions nil
+  "List of predicates to try that indicate a directory belongs to a project.
+This list is used when `semanticdb-persistent-path' contains the value
+'project.  If the predicate list is nil, then presume all paths are valid.
+
+Project Management software (such as EDE and JDE) should add their own
+predicates with `add-hook' to this variable, and semanticdb will save tag
+caches in directories controlled by them.")
+
+(defmethod semanticdb-write-directory-p ((obj semanticdb-project-database))
+  "Return non-nil if OBJ should be written to disk.
+Uses `semanticdb-persistent-path' to determine the return value."
+  nil)
+
+;;; Utilities
+;;
+;; What is the current database, are two tables of an equivalent mode,
+;; and what databases are a part of the same project.
+;;;###autoload
+(defun semanticdb-current-database ()
+  "Return the currently active database."
+  (or semanticdb-current-database
+      (and default-directory
+	   (semanticdb-create-database semanticdb-new-database-class
+				       default-directory)
+	   )
+      nil))
+
+(defvar semanticdb-match-any-mode nil
+  "Non-nil to temporarilly search any major mode for a tag.
+If a particular major mode wants to search any mode, put the
+`semantic-match-any-mode' symbol onto the symbol of that major mode.
+Do not set the value of this variable permanently.")
+
+(defmacro semanticdb-with-match-any-mode (&rest body)
+  "A Semanticdb search occuring withing BODY will search tags in all modes.
+This temporarilly sets `semanticdb-match-any-mode' while executing BODY."
+  `(let ((semanticdb-match-any-mode t))
+     ,@body))
+(put 'semanticdb-with-match-any-mode 'lisp-indent-function 0)
+
+(defmethod semanticdb-equivalent-mode-for-search (table &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+See `semanticdb-equivalent-mode' for details.
+This version is used during searches.  Major-modes that opt
+to set the `semantic-match-any-mode' property will be able to search
+all files of any type."
+  (or (get major-mode 'semantic-match-any-mode)
+      semanticdb-match-any-mode
+      (semanticdb-equivalent-mode table buffer))
+  )
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  nil)
+
+(defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer)
+  "Return non-nil if TABLE's mode is equivalent to BUFFER.
+Equivalent modes are specified by by `semantic-equivalent-major-modes'
+local variable."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (or
+     ;; nil major mode in table means we don't know yet.  Assume yes for now?
+     (null (oref table major-mode))
+     ;; nil means the same as major-mode
+     (and (not semantic-equivalent-major-modes)
+	  (mode-local-use-bindings-p major-mode (oref table major-mode)))
+     (and semantic-equivalent-major-modes
+	  (member (oref table major-mode) semantic-equivalent-major-modes))
+     )
+    ))
+
+
+;;; Associations
+;;
+;; These routines determine associations between a file, and multiple
+;; associated databases.
+
+(defcustom semanticdb-project-roots nil
+  "*List of directories, where each directory is the root of some project.
+All subdirectories of a root project are considered a part of one project.
+Values in this string can be overriden by project management programs
+via the `semanticdb-project-root-functions' variable."
+  :group 'semanticdb
+  :type '(repeat string))
+
+(defvar semanticdb-project-root-functions nil
+  "List of functions used to determine a given directories project root.
+Functions in this variable can override `semanticdb-project-roots'.
+Functions set in the variable are given one argument (a directory) and
+must return a string, (the root directory) or a list of strings (multiple
+root directories in a more complex system).  This variable should be used
+by project management programs like EDE or JDE.")
+
+(defvar semanticdb-project-system-databases nil
+  "List of databases containing system library information.
+Mode authors can create their own system databases which know
+detailed information about the system libraries for querying purposes.
+Put those into this variable as a buffer-local, or mode-local
+value.")
+(make-variable-buffer-local 'semanticdb-project-system-databases)
+
+(defvar semanticdb-search-system-databases t
+  "Non nil if search routines are to include a system database.")
+
+(defun semanticdb-current-database-list (&optional dir)
+  "Return a list of databases associated with the current buffer.
+If optional argument DIR is non-nil, then use DIR as the starting directory.
+If this buffer has a database, but doesn't have a project associated
+with it, return nil.
+First, it checks `semanticdb-project-root-functions', and if that
+has no results, it checks `semanticdb-project-roots'.  If that fails,
+it returns the results of function `semanticdb-current-database'.
+Always append `semanticdb-project-system-databases' if
+`semanticdb-search-system' is non-nil."
+  (let ((root nil)			; found root directory
+	(dbs nil)			; collected databases
+	(roots semanticdb-project-roots) ;all user roots
+	(dir (file-truename (or dir default-directory)))
+	)
+    ;; Find the root based on project functions.
+    (setq root (run-hook-with-args-until-success
+		'semanticdb-project-root-functions
+		dir))
+    ;; Find roots based on strings
+    (while (and roots (not root))
+      (let ((r (file-truename (car roots))))
+	(if (string-match (concat "^" (regexp-quote r)) dir)
+	    (setq root r)))
+      (setq roots (cdr roots)))
+
+    ;; If no roots are found, use this directory.
+    (unless root (setq root dir))
+
+    ;; Find databases based on the root directory.
+    (when root
+      ;; The rootlist allows the root functions to possibly
+      ;; return several roots which are in different areas but
+      ;; all apart of the same system.
+      (let ((regexp (concat "^" (regexp-quote root)))
+	    (adb semanticdb-database-list) ; all databases
+	    )
+	(while adb
+	  ;; I don't like this part, but close enough.
+	  (if (and (slot-boundp (car adb) 'reference-directory)
+		   (string-match regexp (oref (car adb) reference-directory)))
+	      (setq dbs (cons (car adb) dbs)))
+	  (setq adb (cdr adb))))
+      )
+    ;; Add in system databases
+    (when semanticdb-search-system-databases
+      (setq dbs (nconc dbs semanticdb-project-system-databases)))
+    ;; Return
+    dbs))
+
+
+;;; Generic Accessor Routines
+;;
+;; These routines can be used to get at tags in files w/out
+;; having to know a lot about semanticDB.
+(defvar semanticdb-file-table-hash (make-hash-table :test 'equal)
+  "Hash table mapping file names to database tables.")
+
+(defun semanticdb-file-table-object-from-hash (file)
+  "Retrieve a DB table from the hash for FILE.
+Does not use `file-truename'."
+  (gethash file semanticdb-file-table-hash 'no-hit))
+
+(defun semanticdb-file-table-object-put-hash (file dbtable)
+  "For FILE, associate DBTABLE in the hash table."
+  (puthash file dbtable semanticdb-file-table-hash))
+
+;;;###autoload
+(defun semanticdb-file-table-object (file &optional dontload)
+  "Return a semanticdb table belonging to FILE, make it up to date.
+If file has database tags available in the database, return it.
+If file does not have tags available, and DONTLOAD is nil,
+then load the tags for FILE, and create a new table object for it.
+DONTLOAD does not affect the creation of new database objects."
+  ;; (message "Object Translate: %s" file)
+  (when (file-exists-p file)
+    (let* ((default-directory (file-name-directory file))
+	   (tab (semanticdb-file-table-object-from-hash file))
+	   (fullfile nil))
+
+      ;; If it is not in the cache, then extract the more traditional
+      ;; way by getting the database, and finding a table in that database.
+      ;; Once we have a table, add it to the hash.
+      (when (eq tab 'no-hit)
+	(setq fullfile (file-truename file))
+	(let ((db (or ;; This line will pick up system databases.
+		   (semanticdb-directory-loaded-p default-directory)
+		   ;; this line will make a new one if needed.
+		   (semanticdb-get-database default-directory))))
+	  (setq tab (semanticdb-file-table db fullfile))
+	  (when tab
+	    (semanticdb-file-table-object-put-hash file tab)
+	    (when (not (string= fullfile file))
+	      (semanticdb-file-table-object-put-hash fullfile tab)
+	    ))
+	  ))
+
+      (cond
+       ((and tab
+	     ;; Is this in a buffer?
+	     ;;(find-buffer-visiting (semanticdb-full-filename tab))
+	     (semanticdb-in-buffer-p tab)
+	     )
+	(save-excursion
+	  ;;(set-buffer (find-buffer-visiting (semanticdb-full-filename tab)))
+	  (semanticdb-set-buffer tab)
+	  (semantic-fetch-tags)
+	  ;; Return the table.
+	  tab))
+       ((and tab dontload)
+	;; If we have table, and we don't want to load it, just return it.
+	tab)
+       ((and tab
+	     ;; Is table fully loaded, or just a proxy?
+	     (number-or-marker-p (oref tab pointmax))
+	     ;; Is this table up to date with the file?
+	     (not (semanticdb-needs-refresh-p tab)))
+	;; A-ok!
+	tab)
+       ((or (and fullfile (get-file-buffer fullfile))
+	    (get-file-buffer file))
+	;; are these two calls this faster than `find-buffer-visiting'?
+
+	;; If FILE is being visited, but none of the above state is
+	;; true (meaning, there is no table object associated with it)
+	;; then it is a file not supported by Semantic, and can be safely
+	;; ignored.
+	nil)
+       ((not dontload) ;; We must load the file.
+	;; Full file should have been set by now.  Debug why not?
+	(when (and (not tab) (not fullfile))
+	  ;; This case is if a 'nil is erroneously put into the hash table.  This
+	  ;; would need fixing
+	  (setq fullfile (file-truename file))
+	  )
+	
+	;; If we have a table, but no fullfile, that's ok.  Lets get the filename
+	;; from the table which is pre-truenamed.
+	(when (and (not fullfile) tab)
+	  (setq fullfile (semanticdb-full-filename tab)))
+
+	(setq tab (semanticdb-create-table-for-file-not-in-buffer fullfile))
+
+	;; Save the new table.
+	(semanticdb-file-table-object-put-hash file tab)
+	(when (not (string= fullfile file))
+	  (semanticdb-file-table-object-put-hash fullfile tab)
+	  )
+	;; Done!
+	tab)
+       (t
+	;; Full file should have been set by now.  Debug why not?
+	;; One person found this.  Is it a file that failed to parse
+	;; in the past?
+	(when (not fullfile)
+	  (setq fullfile (file-truename file)))
+
+	;; We were asked not to load the file in and parse it.
+	;; Instead just create a database table with no tags
+	;; and a claim of being empty.
+	;;
+	;; This will give us a starting point for storing
+	;; database cross-references so when it is loaded,
+	;; the cross-references will fire and caches will
+	;; be cleaned.
+	(let ((ans (semanticdb-create-table-for-file file)))
+	  (setq tab (cdr ans))
+
+	  ;; Save the new table.
+	  (semanticdb-file-table-object-put-hash file tab)
+	  (when (not (string= fullfile file))
+	    (semanticdb-file-table-object-put-hash fullfile tab)
+	    )
+	  ;; Done!
+	  tab))
+       )
+      )))
+
+(defvar semanticdb-out-of-buffer-create-table-fcn nil
+  "When non-nil, a function for creating a semanticdb table.
+This should take a filename to be parsed.")
+(make-variable-buffer-local 'semanticdb-out-of-buffer-create-table-fcn)
+
+(defun semanticdb-create-table-for-file-not-in-buffer (filename)
+  "Create a table for the file FILENAME.
+If there are no language specific configurations, this
+function will read in the buffer, parse it, and kill the buffer."
+  (if (and semanticdb-out-of-buffer-create-table-fcn
+	   (not (file-remote-p filename)))
+      ;; Use external parser only of the file is accessible to the
+      ;; local file system.
+      (funcall semanticdb-out-of-buffer-create-table-fcn filename)
+    (save-excursion
+      (let* ( ;; Remember the buffer to kill
+	     (kill-buffer-flag (find-buffer-visiting filename))
+	     (buffer-to-kill (or kill-buffer-flag
+				 (semantic-find-file-noselect filename t))))
+
+	;; This shouldn't ever be set.  Debug some issue here?
+	;; (when kill-buffer-flag (debug))
+
+	(set-buffer buffer-to-kill)
+	;; Find file should automatically do this for us.
+	;; Sometimes the DB table doesn't contains tags and needs
+	;; a refresh.  For example, when the file is loaded for
+	;; the first time, and the idle scheduler didn't get a
+	;; chance to trigger a parse before the file buffer is
+	;; killed.
+	(when semanticdb-current-table
+	  (semantic-fetch-tags))
+	(prog1
+	    semanticdb-current-table
+	  (when (not kill-buffer-flag)
+	    ;; If we had to find the file, then we should kill it
+	    ;; to keep the master buffer list clean.
+	    (kill-buffer buffer-to-kill)
+	    )))))
+  )
+
+;;;###autoload
+(defun semanticdb-file-stream (file)
+  "Return a list of tags belonging to FILE.
+If file has database tags available in the database, return them.
+If file does not have tags available, then load the file, and create them."
+  (let ((table (semanticdb-file-table-object file)))
+    (when table
+      (semanticdb-get-tags table))))
+
+(provide 'semanticdb)
+
+;;; semanticdb.el ends here
diff --git a/site/cedet-1.0pre7/semantic/semanticdb.sh b/site/cedet-1.0pre7/semantic/semanticdb.sh
new file mode 100755
index 0000000..98fc1ab
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/semanticdb.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+# semanticdb.sh --- Build a semantic cache for input arguments
+#
+# Copyright (C) 2002, 2004 Eric M. Ludlam
+#
+# Author: Eric M. Ludlam <zappo@gnu.org>
+# Keywords: tags
+# X-RCS: $Id: semanticdb.sh,v 1.3 2005/09/30 20:19:32 zappo Exp $
+#
+# This file is not part of GNU Emacs.
+#
+# Semanticdb is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+# 
+# Commentary:
+#
+# Emacs usually builds a semantic cache on the fly.  If you want to use
+# a tool that accesses database files without having to visit all the files, 
+# however, you should use this script BEFORE starting Emacs.
+#
+
+if [ -z "$SEMANTIC_PATH" ]; then
+    # Use reverse sort to sneakilly get the most recent version number.
+    shopt -s nullglob
+    # The extra * allow the shell to strip out junk
+    files=`ls -d ~/lisp/cedet/semantic*/ ~/lisp/cedet-*/semantic/ ~/cedet/semantic*/ ~/cedet-*/semantic/`
+    for i in $files; do
+        if [ -d $i ]; then
+          loadpath=$i
+        fi
+    done
+else
+    loadpath="$SEMANTIC_PATH"
+fi
+
+if [ -z "$SEMANTIC_EMACS" ]; then
+    emacs="emacs"
+else
+    emacs="$SEMANTIC_EMACS"
+fi
+
+files=$*
+
+exec $emacs -batch -l "${loadpath}/semanticdb-mk.el" $files
+
+#end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/semantic/senator.el b/site/cedet-1.0pre7/semantic/senator.el
new file mode 100755
index 0000000..390e62a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/senator.el
@@ -0,0 +1,3003 @@
+;;; senator.el --- SEmantic NAvigaTOR
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 10 Nov 2000
+;; Keywords: syntax
+;; X-RCS: $Id: senator.el,v 1.144 2010/01/23 16:16:14 zappo Exp $
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library defines commands and a minor mode to navigate between
+;; semantic language tags in the current buffer.
+;;
+;; The commands `senator-next-tag' and `senator-previous-tag'
+;; navigate respectively to the tag after or before the point.  The
+;; command `senator-jump' directly jumps to a particular semantic
+;; symbol.
+;;
+;; Also, for each built-in search command `search-forward',
+;; `search-backward', `re-search-forward', `re-search-backward',
+;; `word-search-forward' and `word-search-backward', there is an
+;; equivalent `senator-<search-command>' defined which searches only
+;; in semantic tag names.
+;;
+;; The command `senator-isearch-toggle-semantic-mode' toggles semantic
+;; search in isearch mode.  When semantic search is enabled, isearch
+;; is restricted to tag names.
+;;
+;; Finally, the library provides a `senator-minor-mode' to easily
+;; enable or disable the SEmantic NAvigaTOR stuff for the current
+;; buffer.
+;;
+;; The best way to use navigation commands is to bind them to keyboard
+;; shortcuts.  Senator minor mode uses the common prefix key "C-c ,".
+;; The following default key bindings are provided when semantic minor
+;; mode is enabled:
+;;
+;;    key             binding
+;;    ---             -------
+;;    C-c , n         `senator-next-tag'
+;;    C-c , p         `senator-previous-tag'
+;;    C-c , j         `senator-jump'
+;;    C-c , i         `senator-isearch-toggle-semantic-mode'
+;;    C-c , TAB       `senator-complete-symbol'
+;;    C-c , SPC       `senator-completion-menu-popup'
+;;    S-mouse-3       `senator-completion-menu-popup'
+;;    C-c , C-y       `senator-yank-tag'
+;;    C-c , C-w       `senator-kill-tag'
+;;    C-c , M-w       `senator-copy-tag'
+;;    C-c , r         `senator-copy-tag-to-register'
+;;    C-c , t         `senator-transpose-tags-up'
+;;
+;; You can customize the `senator-step-at-tag-classes' to navigate (and
+;; search) only between tags of a particular class.  (Such as
+;; functions and variables.)
+;;
+;; Customize `senator-step-at-start-end-tag-classes' to stop at the
+;; start and end of the specified tag classes.
+;;
+;; To have a mode specific customization, do something like this in a
+;; hook:
+;;
+;; (add-hook 'mode-hook
+;;           (lambda ()
+;;             (setq senator-step-at-tag-classes '(function variable))
+;;             (setq senator-step-at-start-end-tag-classes '(function))
+;;             ))
+;;
+;; The above example specifies to navigate (and search) only between
+;; functions and variables, and to step at start and end of functions
+;; only.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'semantic)
+(require 'semantic-ctxt)
+(require 'semantic-imenu)
+(eval-when-compile
+  (require 'semanticdb)
+  (require 'semanticdb-find)
+  (require 'cl)
+  )
+
+;;; Customization
+(defgroup senator nil
+  "SEmantic NAvigaTOR."
+  :group 'semantic)
+
+;;;###autoload
+(defcustom global-senator-minor-mode nil
+  "*If non-nil enable global use of senator minor mode."
+  :group 'senator
+  :type 'boolean
+  :require 'senator
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-senator-minor-mode (if val 1 -1))))
+
+(defcustom senator-minor-mode-hook nil
+  "Hook run at the end of function `senator-minor-mode'."
+  :group 'senator
+  :type 'hook)
+
+;;;###autoload
+(defcustom senator-step-at-tag-classes nil
+  "*List of tag classes where to step.
+A tag class is a symbol like 'variable, 'function, 'type, or other.
+If nil navigation steps at any tag found.  This is a buffer local
+variable.  It can be set in a mode hook to get a specific langage
+navigation."
+  :group 'senator
+  :type '(repeat (symbol)))
+(make-variable-buffer-local 'senator-step-at-tag-classes)
+(semantic-varalias-obsolete 'semantic-step-at-token-ids
+                            'semantic-step-at-tag-classes)
+
+;;;###autoload
+(defcustom senator-step-at-start-end-tag-classes '(function)
+  "*List of tag classes where to step at start and end.
+A tag class is a symbol like 'variable, 'function, 'type, or other.
+If nil, navigation only step at beginning of tags.  If t, step at
+start and end of any tag where it is allowed to step.  Also, stepping
+at start and end of a tag prevent stepping inside its components.
+This is a buffer local variable.  It can be set in a mode hook to get
+a specific langage navigation."
+  :group 'senator
+  :type '(choice :tag "Identifiers"
+                 (repeat :menu-tag "Symbols" (symbol))
+                 (const  :tag "All" t)))
+(make-variable-buffer-local 'senator-step-at-start-end-tag-classes)
+(semantic-varalias-obsolete 'senator-step-at-start-end-token-ids
+                            'senator-step-at-start-end-tag-classes)
+
+(defcustom senator-highlight-found t
+  "*If non-nil highlight tags found.
+This option requires semantic 1.3 and above.  This is a buffer
+local variable.  It can be set in a mode hook to get a specific
+langage behaviour."
+  :group 'senator
+  :type 'boolean)
+(make-variable-buffer-local 'senator-highlight-found)
+
+;;; Faces
+(defface senator-momentary-highlight-face
+  '((((class color) (background dark))
+     (:background "gray30"))
+    (((class color) (background light))
+     (:background "gray70")))
+  "Face used to momentarily highlight tags."
+  :group 'semantic-faces)
+
+(defface senator-intangible-face
+  '((((class color) (background light))
+     (:foreground "gray25"))
+    (((class color) (background dark))
+     (:foreground "gray75")))
+  "Face placed on intangible text."
+  :group 'semantic-faces)
+
+(defface senator-read-only-face
+  '((((class color) (background dark))
+     (:background "#664444"))
+    (((class color) (background light))
+     (:background "#CCBBBB")))
+  "Face placed on read-only text."
+  :group 'semantic-faces)
+
+;;;;
+;;;; Common functions
+;;;;
+
+(defsubst senator-parse ()
+  "Parse the current buffer and return the tags where to navigate."
+  (semantic-fetch-tags))
+
+(defun senator-force-refresh ()
+  "Force a full refresh of the current buffer's tags.
+Throws away all the old tags, and recreates the tag database for
+this buffer."
+  (interactive)
+  (semantic-clear-toplevel-cache)
+  (senator-parse))
+
+(defsubst senator-current-tag ()
+  "Return the current tag in the current buffer.
+Raise an error is there is no tag here."
+  (or (semantic-current-tag)
+      (error "No semantic tag here")))
+(semantic-alias-obsolete 'senator-current-token 'senator-current-tag)
+
+(defun senator-momentary-highlight-tag (tag)
+  "Momentary highlight TAG.
+Does nothing if `senator-highlight-found' is nil."
+  (and senator-highlight-found
+       (semantic-momentary-highlight-tag
+        tag 'senator-momentary-highlight-face)))
+
+(defun senator-step-at-start-end-p (tag)
+  "Return non-nil if must step at start and end of TAG."
+  (and tag
+       (or (eq senator-step-at-start-end-tag-classes t)
+           (memq (semantic-tag-class tag)
+                 senator-step-at-start-end-tag-classes))))
+
+(defun senator-skip-p (tag)
+  "Return non-nil if must skip TAG."
+  (and tag
+       senator-step-at-tag-classes
+       (not (memq (semantic-tag-class tag)
+                  senator-step-at-tag-classes))))
+
+(defun senator-middle-of-tag-p (pos tag)
+  "Return non-nil if POS is between start and end of TAG."
+  (and (> pos (semantic-tag-start tag))
+       (< pos (semantic-tag-end   tag))))
+
+(defun senator-step-at-parent (tag)
+  "Return TAG's outermost parent if must step at start/end of it.
+Return nil otherwise."
+  (if tag
+      (let (parent parents)
+        (setq parents (semantic-find-tag-by-overlay
+                       (semantic-tag-start tag)))
+        (while (and parents (not parent))
+          (setq parent  (car parents)
+                parents (cdr parents))
+          (if (or (eq tag parent)
+                  (senator-skip-p parent)
+                  (not (senator-step-at-start-end-p parent)))
+              (setq parent nil)))
+        parent)))
+
+(defun senator-previous-tag-or-parent (pos)
+  "Return the tag before POS or one of its parent where to step."
+  (let (ol tag)
+    (while (and pos (> pos (point-min)) (not tag))
+      (setq pos (semantic-overlay-previous-change pos))
+      (when pos
+        ;; Get overlays at position
+        (setq ol (semantic-overlays-at pos))
+        ;; find the overlay that belongs to semantic
+        ;; and STARTS or ENDS at the found position.
+        (while (and ol (not tag))
+          (setq tag (semantic-overlay-get (car ol) 'semantic))
+          (unless (and tag (semantic-tag-p tag)
+                       (or (= (semantic-tag-start tag) pos)
+                           (= (semantic-tag-end   tag) pos)))
+            (setq tag nil
+                  ol (cdr ol))))))
+    (or (senator-step-at-parent tag) tag)))
+
+(defun senator-full-tag-name (tag parent)
+  "Compose a full name from TAG name and PARENT names.
+That is append to TAG name PARENT names each one separated by
+`semantic-type-relation-separator-character'.  The PARENT list is in
+reverse order."
+  (let ((sep  (car semantic-type-relation-separator-character))
+        (name ""))
+    (while parent
+      (setq name (concat name sep
+                         (semantic-tag-name (car parent)))
+            parent (cdr parent)))
+    (concat (semantic-tag-name tag) name)))
+(semantic-alias-obsolete 'senator-full-token-name
+                         'senator-full-tag-name)
+
+(defvar senator-completion-cache nil
+  "The latest full completion list is cached here.")
+(make-variable-buffer-local 'senator-completion-cache)
+
+(defun senator-completion-cache-flush-fcn (&optional ignore)
+  "Hook run to clear the completion list cache.
+It is called each time the semantic cache is changed.
+IGNORE arguments."
+  (setq senator-completion-cache nil))
+
+(defun senator-completion-flatten-stream (stream parents &optional top-level)
+  "Return a flat list of all tags available in STREAM.
+PARENTS is the list of parent tags.  Each element of the list is a
+pair (TAG . PARENTS) where PARENTS is the list of TAG parent
+tags or nil.  If TOP-LEVEL is non-nil the completion list will
+contain only tags at top level.  Otherwise all component tags are
+included too."
+  (let (fs e tag components)
+    (while stream
+      (setq tag  (car stream)
+            stream (cdr stream)
+            e      (cons tag parents)
+            fs     (cons e fs))
+      (and (not top-level)
+           ;; Not include function arguments
+           (not (semantic-tag-of-class-p tag 'function))
+           (setq components (semantic-tag-components tag))
+           (setq fs (append fs (senator-completion-flatten-stream
+                                components e)))))
+    fs))
+
+(defun senator-completion-function-args (tag)
+  "Return a string of argument names from function TAG."
+  (mapconcat #'(lambda (arg)
+                 (if (semantic-tag-p arg)
+                     (semantic-tag-name arg)
+                   (format "%s" arg)))
+             (semantic-tag-function-arguments tag)
+             semantic-function-argument-separation-character))
+
+(defun senator-completion-refine-name (elt)
+  "Refine the name part of ELT.
+ELT has the form (NAME . (TAG . PARENTS)).  The NAME refinement is
+done in the following incremental way:
+
+- If TAG is a function, append the list of argument names to NAME.
+
+- If TAG is a type, append \"{}\" to NAME.
+
+- If TAG is an include, append \"#\" to NAME.
+
+- If TAG is a package, append \"=\" to NAME.
+
+- If TAG has PARENTS append to NAME, the first separator in
+  `semantic-type-relation-separator-character', followed by the next
+  parent name.
+
+- Otherwise NAME is set to \"tag-name@tag-start-position\"."
+  (let* ((sep     (car semantic-type-relation-separator-character))
+         (name    (car elt))
+         (tag     (car (cdr elt)))
+         (parents (cdr (cdr elt)))
+         (oname   (semantic-tag-name tag))
+         (class   (semantic-tag-class tag)))
+    (cond
+     ((and (eq class 'function) (string-equal name oname))
+      (setq name (format "%s(%s)" name
+                         (senator-completion-function-args tag))))
+     ((and (eq class 'type) (string-equal name oname))
+      (setq name (format "%s{}" name)))
+     ((and (eq class 'include) (string-equal name oname))
+      (setq name (format "%s#" name)))
+     ((and (eq class 'package) (string-equal name oname))
+      (setq name (format "%s=" name)))
+     (parents
+      (setq name (format "%s%s%s" name
+                         (if (semantic-tag-of-class-p
+                              (car parents) 'function)
+                             ")" sep)
+                         (semantic-tag-name (car parents)))
+            parents (cdr parents)))
+     (t
+      (setq name (format "%s@%d" oname
+                         (semantic-tag-start tag)))))
+    (setcar elt name)
+    (setcdr elt (cons tag parents))))
+
+(defun senator-completion-uniquify-names (completion-stream)
+  "Uniquify names in COMPLETION-STREAM.
+That is refine the name part of each COMPLETION-STREAM element until
+there is no duplicated names.  Each element of COMPLETION-STREAM has
+the form (NAME . (TAG . PARENTS)).  See also the function
+`senator-completion-refine-name'."
+  (let ((completion-stream (sort completion-stream
+                                 #'(lambda (e1 e2)
+                                     (string-lessp (car e1)
+                                                   (car e2)))))
+        (dupp t)
+        clst elt dup name)
+    (while dupp
+      (setq dupp nil
+            clst completion-stream)
+      (while clst
+        (setq elt  (car clst)
+              name (car elt)
+              clst (cdr clst)
+              dup  (and clst
+                        (string-equal name (car (car clst)))
+                        elt)
+              dupp (or dupp dup))
+        (while dup
+          (senator-completion-refine-name dup)
+          (setq elt (car clst)
+                dup (and elt (string-equal name (car elt)) elt))
+          (and dup (setq clst (cdr clst))))))
+    ;; Return a usable completion alist where each element has the
+    ;; form (NAME . TAG).
+    (setq clst completion-stream)
+    (while clst
+      (setq elt  (car clst)
+            clst (cdr clst))
+      (setcdr elt (car (cdr elt))))
+    completion-stream))
+
+(defun senator-completion-stream (stream &optional top-level)
+  "Return a useful completion list from tags in STREAM.
+That is an alist of all (COMPLETION-NAME . TAG) available.
+COMPLETION-NAME is an unique tag name (see also the function
+`senator-completion-uniquify-names').  If TOP-LEVEL is non-nil the
+completion list will contain only tags at top level.  Otherwise all
+sub tags are included too."
+  (let* ((fs (senator-completion-flatten-stream stream nil top-level))
+         cs elt tag)
+    ;; Transform each FS element from (TAG . PARENTS)
+    ;; to (NAME . (TAG . PARENT)).
+    (while fs
+      (setq elt (car fs)
+            tag (car elt)
+            fs  (cdr fs)
+            cs  (cons (cons (semantic-tag-name tag) elt) cs)))
+    ;; Return a completion list with unique COMPLETION-NAMEs.
+    (senator-completion-uniquify-names cs)))
+
+(defun senator-current-type-context ()
+  "Return tags in the type context at point or nil if not found."
+  (let ((context (semantic-find-tags-by-class
+                  'type (semantic-find-tag-by-overlay))))
+    (if context
+        (semantic-tag-type-members
+         (nth (1- (length context)) context)))))
+
+(defun senator-completion-list (&optional in-context)
+  "Return a useful completion list from tags in current buffer.
+If IN-CONTEXT is non-nil return only the top level tags in the type
+context at point or the top level tags in the current buffer if no
+type context exists at point."
+  (let (stream)
+    (if in-context
+        (setq stream (senator-current-type-context)))
+    (or stream (setq stream (senator-parse)))
+    ;; IN-CONTEXT completion doesn't use nor set the cache.
+    (or (and (not in-context) senator-completion-cache)
+        (let ((clst (senator-completion-stream stream in-context)))
+          (or in-context
+              (setq senator-completion-cache clst))
+          clst))))
+
+(defun senator-find-tag-for-completion (prefix)
+  "Find all tags with a name starting with PREFIX.
+Uses `semanticdb' when available."
+  (let ((tagsa nil))
+    (when (and (featurep 'semantic-analyze))
+      (let ((ctxt (semantic-analyze-current-context)))
+        (when ctxt
+          (condition-case nil
+              (setq tagsa (semantic-analyze-possible-completions
+                           ctxt))
+            (error nil)))))
+    
+    (if tagsa
+        tagsa
+      ;; If the analyzer fails, then go into boring completion
+      (if (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+	  (semanticdb-fast-strip-find-results
+	   ;; semanticdb version returns a list of (DB-TABLE . TAG-LIST)
+	   (semanticdb-deep-find-tags-for-completion prefix))
+	;; semantic version returns a TAG-LIST
+	(semantic-deep-find-tags-for-completion prefix (current-buffer))))))
+
+;;; Senator stream searching functions: no more supported.
+;;
+(defun senator-find-nonterminal-by-name (&rest ignore)
+  (error "Use the semantic and semanticdb find API instead"))
+
+(defun senator-find-nonterminal-by-name-regexp (&rest ignore)
+  (error "Use the semantic and semanticdb find API instead"))
+
+;;;;
+;;;; Search functions
+;;;;
+
+(defun senator-search-tag-name (tag)
+  "Search for TAG name in current buffer.
+Limit the search to TAG bounds.
+If found, set point to the end of the name, and return point.  The
+beginning of the name is at (match-beginning 0).
+Return nil if not found, that is if TAG name doesn't come from the
+source."
+  (let ((name (semantic-tag-name tag)))
+    (setq name (if (string-match "\\`\\([^[]+\\)[[]" name)
+                   (match-string 1 name)
+                 name))
+    (goto-char (semantic-tag-start tag))
+    (when (re-search-forward (concat
+                              ;; The tag name is expected to be
+                              ;; between word delimiters, whitespaces,
+                              ;; or punctuations.
+                              "\\(\\<\\|\\s-+\\|\\s.\\)"
+                              (regexp-quote name)
+                              "\\(\\>\\|\\s-+\\|\\s.\\)")
+                             (semantic-tag-end tag)
+                             t)
+      (goto-char (match-beginning 0))
+      (search-forward name))))
+
+(defcustom senator-search-ignore-tag-classes
+  '(code block)
+  "*List of ignored tag classes.
+Tags of those classes are excluded from search."
+  :group 'senator
+  :type '(repeat (symbol :tag "class")))
+
+(defun senator-search-default-tag-filter (tag)
+  "Default function that filters searched tags.
+Ignore tags of classes in `senator-search-ignore-tag-classes'"
+  (not (memq (semantic-tag-class tag)
+             senator-search-ignore-tag-classes)))
+
+(defvar senator-search-tag-filter-functions
+  '(senator-search-default-tag-filter)
+  "List of functions to be called to filter searched tags.
+Each function is passed a tag. If one of them returns nil, the tag is
+excluded from the search.")
+
+(defun senator-search (searcher text &optional bound noerror count)
+  "Use the SEARCHER function to search from point for TEXT in a tag name.
+SEARCHER is typically the function `search-forward', `search-backward',
+`word-search-forward', `word-search-backward', `re-search-forward', or
+`re-search-backward'.  See one of the above function to see how the
+TEXT, BOUND, NOERROR, and COUNT arguments are interpreted."
+  (let* ((origin (point))
+         (count  (or count 1))
+         (step   (cond ((> count 0) 1)
+                       ((< count 0) (setq count (- count)) -1)
+                       (0)))
+         found next sstart send tag tstart tend)
+    (or (zerop step)
+        (while (and (not found)
+                    (setq next (funcall searcher text bound t step)))
+          (setq sstart (match-beginning 0)
+                send   (match-end 0))
+          (if (= sstart send)
+              (setq found t)
+            (and (setq tag (semantic-current-tag))
+                 (run-hook-with-args-until-failure
+                  'senator-search-tag-filter-functions tag)
+                 (setq tend   (senator-search-tag-name tag))
+                 (setq tstart (match-beginning 0)
+                       found  (and (>= sstart tstart)
+                                   (<= send tend)
+                                   (zerop (setq count (1- count))))))
+            (goto-char next))))
+    (cond ((null found)
+           (setq next origin
+                 send origin))
+          ((= next sstart)
+           (setq next send
+                 send sstart))
+          (t
+           (setq next sstart)))
+    (goto-char next)
+    ;; Setup the returned value and the `match-data' or maybe fail!
+    (funcall searcher text send noerror step)))
+
+;;;;
+;;;; Navigation commands
+;;;;
+
+;;;###autoload
+(defun senator-next-tag ()
+  "Navigate to the next Semantic tag.
+Return the tag or nil if at end of buffer."
+  (interactive)
+  (let ((pos (point))
+        (tag (semantic-current-tag))
+        where)
+    (if (and tag
+             (not (senator-skip-p tag))
+             (senator-step-at-start-end-p tag)
+             (or (= pos (semantic-tag-start tag))
+                 (senator-middle-of-tag-p pos tag)))
+        nil
+      (if (setq tag (senator-step-at-parent tag))
+          nil
+        (setq tag (semantic-find-tag-by-overlay-next pos))
+        (while (and tag (senator-skip-p tag))
+          (setq tag (semantic-find-tag-by-overlay-next
+                       (semantic-tag-start tag))))))
+    (if (not tag)
+        (progn
+          (goto-char (point-max))
+          (working-message "End of buffer"))
+      (cond ((and (senator-step-at-start-end-p tag)
+                  (or (= pos (semantic-tag-start tag))
+                      (senator-middle-of-tag-p pos tag)))
+             (setq where "end")
+             (goto-char (semantic-tag-end tag)))
+            (t
+             (setq where "start")
+             (goto-char (semantic-tag-start tag))))
+      (senator-momentary-highlight-tag tag)
+      (working-message "%S: %s (%s)"
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)
+                       where))
+    tag))
+(semantic-alias-obsolete 'senator-next-token 'senator-next-tag)
+
+;;;###autoload
+(defun senator-previous-tag ()
+  "Navigate to the previous Semantic tag.
+Return the tag or nil if at beginning of buffer."
+  (interactive)
+  (let ((pos (point))
+        (tag (semantic-current-tag))
+        where)
+    (if (and tag
+             (not (senator-skip-p tag))
+             (senator-step-at-start-end-p tag)
+             (or (= pos (semantic-tag-end tag))
+                 (senator-middle-of-tag-p pos tag)))
+        nil
+      (if (setq tag (senator-step-at-parent tag))
+          nil
+        (setq tag (senator-previous-tag-or-parent pos))
+        (while (and tag (senator-skip-p tag))
+          (setq tag (senator-previous-tag-or-parent
+                       (semantic-tag-start tag))))))
+    (if (not tag)
+        (progn
+          (goto-char (point-min))
+          (working-message "Beginning of buffer"))
+      (cond ((or (not (senator-step-at-start-end-p tag))
+                 (= pos (semantic-tag-end tag))
+                 (senator-middle-of-tag-p pos tag))
+             (setq where "start")
+             (goto-char (semantic-tag-start tag)))
+            (t
+             (setq where "end")
+             (goto-char (semantic-tag-end tag))))
+      (senator-momentary-highlight-tag tag)
+      (working-message "%S: %s (%s)"
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)
+                       where))
+    tag))
+(semantic-alias-obsolete 'senator-previous-token 'senator-previous-tag)
+
+(defvar senator-jump-completion-list nil
+  "`senator-jump' stores here its current completion list.
+Then use `assoc' to retrieve the tag associated to a symbol.")
+
+(defun senator-jump-interactive (prompt &optional in-context no-default require-match)
+  "Called interactively to provide completion on some tag name.
+
+Use PROMPT.  If optional IN-CONTEXT is non-nil jump in the local
+type's context \(see function `senator-current-type-context').  If
+optional NO-DEFAULT is non-nil do not provide a default value.  If
+optional REQUIRE-MATCH is non-nil an explicit match must be made.
+
+The IN-CONTEXT and NO-DEFAULT switches are combined using the
+following prefix arguments:
+
+- \\[universal-argument]       IN-CONTEXT.
+- \\[universal-argument] -     NO-DEFAULT.
+- \\[universal-argument] \\[universal-argument]   IN-CONTEXT + NO-DEFAULT."
+  (let* ((arg (prefix-numeric-value current-prefix-arg))
+         (no-default
+          (or no-default
+              ;; The `completing-read' function provided by XEmacs
+              ;; (21.1) don't allow a default value argument :-(
+              (featurep 'xemacs)
+              (= arg -1)                ; C-u -
+              (= arg 16)))              ; C-u C-u
+         (in-context
+          (or in-context
+              (= arg 4)                 ; C-u
+              (= arg 16)))              ; C-u C-u
+         (context
+          (and (not no-default)
+               (or (semantic-ctxt-current-symbol)
+                   (semantic-ctxt-current-function))))
+         (completing-read-args
+          (list (if (and context (car context))
+                    (format "%s(default: %s) " prompt (car context))
+                  prompt)
+                (setq senator-jump-completion-list
+                      (senator-completion-list in-context))
+                nil
+                require-match
+                ""
+                'semantic-read-symbol-history)))
+    (list
+     (apply #'completing-read
+            (if (and context (car context))
+                (append completing-read-args context)
+              completing-read-args))
+     in-context no-default)))
+
+(defun senator-jump-noselect (sym &optional next-p regexp-p)
+  "Jump to the semantic symbol SYM.
+If NEXT-P is non-nil, then move the the next tag in the search
+assuming there was already one jump for the given symbol.
+If REGEXP-P is non nil, then treat SYM as a regular expression.
+Return the tag jumped to.
+Note: REGEXP-P doesn't work yet.  This needs to be added to get
+the etags override to be fully functional."
+  (let ((tag (cdr (assoc sym senator-jump-completion-list))))
+    (when tag
+      (set-buffer (semantic-tag-buffer tag))
+      (goto-char (semantic-tag-start tag))
+      tag)))
+
+;;;###autoload
+(defun senator-jump (sym &optional in-context no-default)
+  "Jump to the semantic symbol SYM.
+
+If optional IN-CONTEXT is non-nil jump in the local type's context
+\(see function `senator-current-type-context').  If optional
+NO-DEFAULT is non-nil do not provide a default value.
+
+When called interactively you can combine the IN-CONTEXT and
+NO-DEFAULT switches like this:
+
+- \\[universal-argument]       IN-CONTEXT.
+- \\[universal-argument] -     NO-DEFAULT.
+- \\[universal-argument] \\[universal-argument]   IN-CONTEXT + NO-DEFAULT."
+  (interactive (senator-jump-interactive "Jump to: " nil nil t))
+  (push-mark)
+  (let ((tag (senator-jump-noselect sym no-default)))
+    (when tag
+      (switch-to-buffer (semantic-tag-buffer tag))
+      (senator-momentary-highlight-tag tag)
+      (working-message "%S: %s "
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)))))
+
+;;;###autoload
+(defun senator-jump-regexp (symregex &optional in-context no-default)
+  "Jump to the semantic symbol SYMREGEX.
+SYMREGEX is treated as a regular expression.
+
+If optional IN-CONTEXT is non-nil jump in the local type's context
+\(see function `senator-current-type-context').  If optional
+NO-DEFAULT is non-nil do not provide a default value and move to the
+next match of SYMREGEX.  NOTE: Doesn't actually work yet.
+
+When called interactively you can combine the IN-CONTEXT and
+NO-DEFAULT switches like this:
+
+- \\[universal-argument]       IN-CONTEXT.
+- \\[universal-argument] -     NO-DEFAULT.
+- \\[universal-argument] \\[universal-argument]   IN-CONTEXT + NO-DEFAULT."
+  (interactive (senator-jump-interactive "Jump to: "))
+  (let ((tag (senator-jump-noselect symregex no-default)))
+    (when tag
+      (switch-to-buffer (semantic-tag-buffer tag))
+      (senator-momentary-highlight-tag tag)
+      (working-message "%S: %s "
+                       (semantic-tag-class tag)
+                       (semantic-tag-name  tag)))))
+
+(defvar senator-last-completion-stats nil
+  "The last senator completion was here.
+Of the form (BUFFER STARTPOS INDEX REGEX COMPLIST...)")
+
+(defsubst senator-current-symbol-start ()
+  "Return position of start of the current symbol under point or nil."
+  (let* ((sb (semantic-ctxt-current-symbol-and-bounds (point)))
+         (bounds (nth 2 sb)))
+    (car bounds)))
+
+;;  (condition-case nil
+;;      (save-excursion (forward-sexp -1) (point))
+;;    (error nil)))
+
+;;;###autoload
+(defun senator-complete-symbol (&optional cycle-once)
+  "Complete the current symbol under point.
+If optional argument CYCLE-ONCE is non-nil, only cycle through the list
+of completions once, doing nothing where there are no more matches."
+  (interactive)
+  (let ((symstart (senator-current-symbol-start))
+        regex complst)
+    (if symstart
+        ;; Get old stats if apropriate.
+        (if (and senator-last-completion-stats
+                 ;; Check if completing in the same buffer
+                 (eq (car senator-last-completion-stats) (current-buffer))
+                 ;; Check if completing from the same point
+                 (= (nth 1 senator-last-completion-stats) symstart)
+                 ;; Check if completing the same symbol
+                 (save-excursion
+                   (goto-char symstart)
+                   (looking-at (nth 3 senator-last-completion-stats))))
+
+            (setq complst (nthcdr 4 senator-last-completion-stats))
+
+          (setq regex (regexp-quote (buffer-substring symstart (point)))
+                complst (senator-find-tag-for-completion regex)
+                senator-last-completion-stats (append (list (current-buffer)
+                                                            symstart
+                                                            0
+                                                            regex)
+                                                      complst))))
+    ;; Do the completion if appropriate.
+    (if complst
+        (let ((ret   t)
+              (index (nth 2 senator-last-completion-stats))
+              newtok)
+          (if (= index (length complst))
+              ;; Cycle to the first completion tag.
+              (setq index  0
+                    ;; Stop completion if CYCLE-ONCE is non-nil.
+                    ret (not cycle-once)))
+          ;; Get the new completion tag.
+          (setq newtok (nth index complst))
+          (when ret
+            ;; Move index to the next completion tag.
+            (setq index (1+ index)
+                  ;; Return the completion string (useful to hippie
+                  ;; expand for example)
+                  ret   (semantic-tag-name newtok))
+            ;; Replace the string.
+            (delete-region symstart (point))
+            (insert ret))
+          ;; Update the completion index.
+          (setcar (nthcdr 2 senator-last-completion-stats) index)
+          ret))))
+
+;;;;
+;;;; Completion menu
+;;;;
+
+(defcustom senator-completion-menu-summary-function
+  'semantic-format-tag-concise-prototype
+  "*Function to use when creating items in completion menu.
+Some useful functions are in `semantic-format-tag-functions'."
+  :group 'senator
+  :type semantic-format-tag-custom-list)
+(make-variable-buffer-local 'senator-completion-menu-summary-function)
+
+(defcustom senator-completion-menu-insert-function
+  'senator-completion-menu-insert-default
+  "*Function to use to insert an item from completion menu.
+It will receive a Semantic tag as argument."
+  :group 'senator
+  :type '(radio (const senator-completion-menu-insert-default)
+                (function)))
+(make-variable-buffer-local 'senator-completion-menu-insert-function)
+
+(defun senator-completion-menu-insert-default (tag)
+  "Insert a text representation of TAG at point."
+  (insert (semantic-tag-name tag)))
+
+(defun senator-completion-menu-do-complete (tag-array)
+  "Replace the current syntactic expression with a chosen completion.
+Argument TAG-ARRAY is an array of one element containting the tag
+choosen from the completion menu."
+  (let ((tag (aref tag-array 0))
+        (symstart (senator-current-symbol-start))
+        (finsert (if (fboundp senator-completion-menu-insert-function)
+                     senator-completion-menu-insert-function
+                   #'senator-completion-menu-insert-default)))
+    (if symstart
+        (progn
+          (delete-region symstart (point))
+          (funcall finsert tag)))))
+
+(defun senator-completion-menu-item (tag)
+  "Return a completion menu item from TAG.
+That is a pair (MENU-ITEM-TEXT . TAG-ARRAY).  TAG-ARRAY is an
+array of one element containing TAG.  Can return nil to discard a
+menu item."
+  (cons (funcall (if (fboundp senator-completion-menu-summary-function)
+                     senator-completion-menu-summary-function
+                   #'semantic-format-tag-prototype) tag)
+        (vector tag)))
+
+(defun senator-completion-menu-window-offsets (&optional window)
+  "Return offsets of WINDOW relative to WINDOW's frame.
+Return a cons cell (XOFFSET . YOFFSET) so the position (X . Y) in
+WINDOW is equal to the position ((+ X XOFFSET) .  (+ Y YOFFSET)) in
+WINDOW'S frame."
+  (let* ((window  (or window (selected-window)))
+         (e       (window-edges window))
+         (left    (nth 0 e))
+         (top     (nth 1 e))
+         (right   (nth 2 e))
+         (bottom  (nth 3 e))
+         (x       (+ left (/ (- right left) 2)))
+         (y       (+ top  (/ (- bottom top) 2)))
+         (wpos    (coordinates-in-window-p (cons x y) window))
+         (xoffset 0)
+         (yoffset 0))
+    (if (consp wpos)
+        (let* ((f  (window-frame window))
+               (cy (/ 1.0 (float (frame-char-height f)))))
+          (setq xoffset (- x (car wpos))
+                yoffset (float (- y (cdr wpos))))
+          ;; If Emacs 21 add to:
+          ;; - XOFFSET the WINDOW left margin width.
+          ;; - YOFFSET the height of header lines above WINDOW.
+          (if (> emacs-major-version 20)
+              (progn
+                (setq wpos    (cons (+ left xoffset) 0.0)
+                      bottom  (float bottom))
+                (while (< (cdr wpos) bottom)
+                  (if (eq (coordinates-in-window-p wpos window)
+                          'header-line)
+                      (setq yoffset (+ yoffset cy)))
+                  (setcdr wpos (+ (cdr wpos) cy)))
+                (setq xoffset (floor (+ xoffset
+                                        (or (car (window-margins window))
+                                            0))))))
+          (setq yoffset (floor yoffset))))
+    (cons xoffset yoffset)))
+
+(defun senator-completion-menu-point-as-event()
+  "Returns the text cursor position as an event.
+Also move the mouse pointer to the cursor position."
+  (let* ((w (get-buffer-window (current-buffer)))
+         (x (mod (- (current-column) (window-hscroll))
+                 (window-width)))
+         (y (save-excursion
+              (save-restriction
+                (widen)
+                (narrow-to-region (window-start) (point))
+                (goto-char (point-min))
+                (1+ (vertical-motion (buffer-size))))))
+         )
+    (if (featurep 'xemacs)
+        (let* ((at (progn (set-mouse-position w x (1- y))
+                          (cdr (mouse-pixel-position))))
+               (x  (car at))
+               (y  (cdr at)))
+          (make-event 'button-press
+                      (list 'button 3
+                            'modifiers nil
+                            'x x
+                            'y y)))
+      ;; Emacs
+      (let ((offsets (senator-completion-menu-window-offsets w)))
+        ;; Convert window position (x,y) to the equivalent frame
+        ;; position and move the mouse pointer to it.
+        (set-mouse-position (window-frame w)
+                            (+ x (car offsets))
+                            (+ y (cdr offsets)))
+        t))))
+
+;;;###autoload
+(defun senator-completion-menu-popup ()
+  "Popup a completion menu for the symbol at point.
+The popup menu displays all of the possible completions for the symbol
+it was invoked on.  To automatically split large menus this function
+use `imenu--mouse-menu' to handle the popup menu."
+  (interactive)
+  (let ((symstart (senator-current-symbol-start))
+        symbol regexp complst
+        ;; Turn off tag jumping for this menu.
+        (imenu-default-goto-function (lambda (name pos &optional rest) pos)))
+    (if symstart
+        (setq symbol  (buffer-substring-no-properties symstart (point))
+              regexp  (regexp-quote symbol)
+              complst (senator-find-tag-for-completion regexp)))
+    (if (not complst)
+        (error "No completions available"))
+    ;; We have a completion list, build a menu
+    (let ((index (delq nil
+                       (mapcar #'senator-completion-menu-item
+                               complst)))
+          title item)
+      (cond ;; Here index is a menu structure like:
+
+       ;; -1- (("menu-item1" . [tag1]) ...)
+       ((vectorp (cdr (car index)))
+        ;; There are more than one item, setup the popup title.
+        (if (cdr index)
+            (setq title (format "%S completion" symbol))
+          ;; Only one item , no need to popup the menu.
+          (setq item (car index))))
+
+       ;; -2- (("menu-title1" ("menu-item1" . [tag1]) ...) ...)
+       (t
+        ;; There are sub-menus.
+        (if (cdr index)
+            ;; Several sub-menus, setup the popup title.
+            (setq title (format "%S completion" symbol))
+          ;; Only one sub-menu, convert it to a main menu and add the
+          ;; sub-menu title (filename) to the popup title.
+          (setq title (format "%S completion (%s)"
+                              symbol (car (car index)))
+                index (cdr (car index)))
+          ;; But...
+          (or (cdr index)
+              ;; ... If only one menu item, no need to popup the menu.
+              (setq item (car index))))))
+      (or item
+          ;; `imenu--mouse-menu' automagically splits large menu into
+          ;; several submenus, displays the popup menu, and returns
+          ;; the selected item :-)
+          (setq item (imenu--mouse-menu
+                      index
+                      ;; popup at point
+                      (senator-completion-menu-point-as-event)
+                      title)))
+      (if item
+          (senator-completion-menu-do-complete (cdr item))))))
+
+;;;;
+;;;; Search commands
+;;;;
+
+;;;###autoload
+(defun senator-search-forward (string &optional bound noerror count)
+  "Search in tag names forward from point for STRING.
+Set point to the end of the occurrence found, and return point.
+See also the function `search-forward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic search: ")
+  (senator-search 'search-forward string bound noerror count))
+
+;;;###autoload
+(defun senator-re-search-forward (regexp &optional bound noerror count)
+  "Search in tag names forward from point for regular expression REGEXP.
+Set point to the end of the occurrence found, and return point.
+See also the function `re-search-forward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic regexp search: ")
+  (senator-search 're-search-forward regexp bound noerror count))
+
+;;;###autoload
+(defun senator-word-search-forward (word &optional bound noerror count)
+  "Search in tag names forward from point for WORD.
+Set point to the end of the occurrence found, and return point.
+See also the function `word-search-forward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic word search: ")
+  (senator-search 'word-search-forward word bound noerror count))
+
+;;;###autoload
+(defun senator-search-backward (string &optional bound noerror count)
+  "Search in tag names backward from point for STRING.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `search-backward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic backward search: ")
+  (senator-search 'search-backward string bound noerror count))
+
+;;;###autoload
+(defun senator-re-search-backward (regexp &optional bound noerror count)
+  "Search in tag names backward from point for regular expression REGEXP.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `re-search-backward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic backward regexp search: ")
+  (senator-search 're-search-backward regexp bound noerror count))
+
+;;;###autoload
+(defun senator-word-search-backward (word &optional bound noerror count)
+  "Search in tag names backward from point for WORD.
+Set point to the beginning of the occurrence found, and return point.
+See also the function `word-search-backward' for details on the BOUND,
+NOERROR and COUNT arguments."
+  (interactive "sSemantic backward word search: ")
+  (senator-search 'word-search-backward word bound noerror count))
+
+;;;;
+;;;; Others useful search commands (minor mode menu)
+;;;;
+
+;;; Compatibility
+(or (not (featurep 'xemacs))
+    (fboundp 'isearch-update-ring)
+
+    ;; Provide `isearch-update-ring' function.
+    ;; (from XEmacs 21.1.9 isearch-mode.el)
+    (defun isearch-update-ring (string &optional regexp)
+      "Add STRING to the beginning of the search ring.
+REGEXP says which ring to use."
+      (if (> (length string) 0)
+          ;; Update the ring data.
+          (if regexp
+              (if (not (setq regexp-search-ring-yank-pointer
+                             (member string regexp-search-ring)))
+                  (progn
+                    (setq regexp-search-ring
+                          (cons string regexp-search-ring)
+                          regexp-search-ring-yank-pointer regexp-search-ring)
+                    (if (> (length regexp-search-ring) regexp-search-ring-max)
+                        (setcdr (nthcdr (1- regexp-search-ring-max) regexp-search-ring)
+                                nil))))
+            (if (not (setq search-ring-yank-pointer
+                           ;; really need equal test instead of eq.
+                           (member string search-ring)))
+                (progn
+                  (setq search-ring (cons string search-ring)
+                        search-ring-yank-pointer search-ring)
+                  (if (> (length search-ring) search-ring-max)
+                      (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))))
+
+    )
+
+(defvar senator-last-search-type nil
+  "Type of last non-incremental search command called.")
+
+(defun senator-nonincremental-repeat-search-forward ()
+  "Search forward for the previous search string or regexp."
+  (interactive)
+  (cond
+   ((and (eq senator-last-search-type 'string)
+         search-ring)
+    (senator-search-forward (car search-ring)))
+   ((and (eq senator-last-search-type 'regexp)
+         regexp-search-ring)
+    (senator-re-search-forward (car regexp-search-ring)))
+   (t
+    (error "No previous search"))))
+
+(defun senator-nonincremental-repeat-search-backward ()
+  "Search backward for the previous search string or regexp."
+  (interactive)
+  (cond
+   ((and (eq senator-last-search-type 'string)
+         search-ring)
+    (senator-search-backward (car search-ring)))
+   ((and (eq senator-last-search-type 'regexp)
+         regexp-search-ring)
+    (senator-re-search-backward (car regexp-search-ring)))
+   (t
+    (error "No previous search"))))
+
+(defun senator-nonincremental-search-forward (string)
+  "Search for STRING  nonincrementally."
+  (interactive "sSemantic search for string: ")
+  (setq senator-last-search-type 'string)
+  (if (equal string "")
+      (senator-search-forward (car search-ring))
+    (isearch-update-ring string nil)
+    (senator-search-forward string)))
+
+(defun senator-nonincremental-search-backward (string)
+  "Search backward for STRING nonincrementally."
+  (interactive "sSemantic search for string: ")
+  (setq senator-last-search-type 'string)
+  (if (equal string "")
+      (senator-search-backward (car search-ring))
+    (isearch-update-ring string nil)
+    (senator-search-backward string)))
+
+(defun senator-nonincremental-re-search-forward (string)
+  "Search for the regular expression STRING nonincrementally."
+  (interactive "sSemantic search for regexp: ")
+  (setq senator-last-search-type 'regexp)
+  (if (equal string "")
+      (senator-re-search-forward (car regexp-search-ring))
+    (isearch-update-ring string t)
+    (senator-re-search-forward string)))
+
+(defun senator-nonincremental-re-search-backward (string)
+  "Search backward for the regular expression STRING nonincrementally."
+  (interactive "sSemantic search for regexp: ")
+  (setq senator-last-search-type 'regexp)
+  (if (equal string "")
+      (senator-re-search-backward (car regexp-search-ring))
+    (isearch-update-ring string t)
+    (senator-re-search-backward string)))
+
+(defvar senator--search-filter nil)
+
+(defun senator-search-set-tag-class-filter (&optional classes)
+  "In current buffer, limit search scope to tag CLASSES.
+CLASSES is a list of tag class symbols or nil.  If nil only global
+filters in `senator-search-tag-filter-functions' remain active."
+  (interactive "sClasses: ")
+  (setq classes
+        (cond
+         ((null classes)
+          nil)
+         ((symbolp classes)
+          (list classes))
+         ((stringp classes)
+          (mapcar 'read (split-string classes)))
+         (t
+          (signal 'wrong-type-argument (list classes)))
+         ))
+  ;; Clear previous filter.
+  (remove-hook 'senator-search-tag-filter-functions
+               senator--search-filter t)
+  (kill-local-variable 'senator--search-filter)
+  (if classes
+      (let ((tag   (make-symbol "tag"))
+            (names (mapconcat 'symbol-name classes "', `")))
+        (set (make-local-variable 'senator--search-filter)
+             `(lambda (,tag)
+                (memq (semantic-tag-class ,tag) ',classes)))
+        (semantic-make-local-hook
+         'senator-search-tag-filter-functions)
+        (add-hook 'senator-search-tag-filter-functions
+                  senator--search-filter nil t)
+        (message "Limit search to `%s' tags" names))
+    (message "Default search filter restored")))
+
+;;;;
+;;;; Tag Properties
+;;;;
+
+(defun senator-toggle-read-only (&optional tag)
+  "Toggle the read-only status of the current TAG."
+  (interactive)
+  (let* ((tag  (or tag (senator-current-tag)))
+         (read (semantic-tag-read-only-p tag)))
+    (semantic-set-tag-read-only tag read)
+    (semantic-set-tag-face
+     tag
+     (if read nil 'senator-read-only-face))))
+
+(defun senator-toggle-intangible (&optional tag)
+  "Toggle the tangibility of the current TAG."
+  (interactive)
+  (let* ((tag (or tag (senator-current-tag)))
+         (tang (semantic-tag-intangible-p tag)))
+    (semantic-set-tag-intangible tag tang)
+    (semantic-set-tag-face
+     tag
+     (if tang nil 'senator-intangible-face))))
+
+(defun senator-set-face (face &optional tag)
+  "Set the foreground FACE of the current TAG."
+  (interactive (list (read-face-name
+                      (if (featurep 'xemacs)
+                          "Face: "
+                        ;; GNU Emacs already append ": "
+                        "Face"))))
+  (let ((tag (or tag (senator-current-tag))))
+    (semantic-set-tag-face tag face)))
+
+(defun senator-set-foreground (color &optional tag)
+  "Set the foreground COLOR of the current TAG."
+  (interactive (list (facemenu-read-color "Foreground color: ")))
+  (let ((face (intern (concat "fg:" color))))
+    (when (not (facep face))
+      (make-face face)
+;;      (set-face-attribute face nil :foreground color)
+      )
+    (senator-set-face face)))
+
+(defun senator-set-background (color &optional tag)
+  "Set the background COLOR of the current TAG."
+  (interactive (list (facemenu-read-color "Background color: ")))
+  (let ((face (intern (concat "bg:" color))))
+    (when (not (facep face))
+      (make-face face)
+      ;;(set-face-attribute face nil :background color)
+      )
+    (senator-set-face face)))
+
+(defun senator-clear-tag (&optional tag)
+  "Clear all properties from TAG."
+  (interactive)
+  (let ((tag (or tag (senator-current-tag))))
+    (semantic-set-tag-read-only  tag t)
+    (semantic-set-tag-intangible tag t)
+    (semantic-set-tag-face       tag nil)))
+(semantic-alias-obsolete 'senator-clear-token 'senator-clear-tag)
+
+;;; Folding
+;;
+;; Use new folding state.  It might be wise to extend the idea
+;; of folding for hiding all but this, or show all children, etc.
+
+(defun senator-fold-tag (&optional tag)
+  "Fold the current TAG."
+  (interactive)
+  (semantic-set-tag-folded (or tag (semantic-current-tag)) t))
+
+(defun senator-unfold-tag (&optional tag)
+  "Fold the current TAG."
+  (interactive)
+  (semantic-set-tag-folded (or tag (semantic-current-tag)) nil))
+
+(defun senator-fold-tag-toggle (&optional tag)
+  "Fold the current TAG."
+  (interactive)
+  (let ((tag (or tag (semantic-current-tag))))
+    (if (semantic-tag-folded-p tag)
+        (senator-unfold-tag tag)
+      (senator-fold-tag tag))))
+
+;;; Pulsing
+;;
+;; Useful for debugging parsing state.
+;;
+(defun senator-pulse-tag (&optional tag)
+  "Pulse the current TAG."
+  (interactive)
+  (senator-force-refresh)
+  (let ((tag (semantic-current-tag)))
+    (when tag
+      (message "%s" (semantic-format-tag-summarize tag))
+      (pulse-momentary-highlight-overlay (semantic-tag-overlay tag)))
+    ))
+
+(defun senator-adebug-tag (&optional tag)
+  "Pulse the current TAG."
+  (interactive)
+  (senator-force-refresh)
+  (let ((tag (semantic-current-tag))
+        (w (selected-window)))
+    (when tag
+      (message "%s" (semantic-format-tag-summarize tag))
+      (data-debug-new-buffer "*Senator Tag ADEBUG*")
+      (data-debug-insert-tag tag "* " "")
+      (forward-line -1)
+      (data-debug-insert-tag-parts-from-point (point))
+      (select-window w t)
+      (pulse-momentary-highlight-overlay (semantic-tag-overlay tag))
+      )
+    ))
+
+;;;;
+;;;;
+;;;;
+(defun senator-go-to-up-reference (&optional tag)
+  "Move up one reference from the current TAG.
+A \"reference\" could be any interesting feature of TAG.
+In C++, a function may have a 'parent' which is non-local.
+If that parent which is only a reference in the function tag
+is found, we can jump to it.
+Some tags such as includes have other reference features."
+  (interactive)
+  (let ((result (semantic-up-reference (or tag (semantic-current-tag)))))
+    (if (not result)
+        (error "No up reference found")
+      (push-mark)
+      (cond
+       ;; A tag
+       ((semantic-tag-p result)
+	(semantic-go-to-tag result)
+	(switch-to-buffer (current-buffer))
+	(semantic-momentary-highlight-tag result))
+       ;; Buffers
+       ((bufferp result)
+	(switch-to-buffer result)
+	(pulse-momentary-highlight-one-line (point)))
+       ;; Files
+       ((and (stringp result) (file-exists-p result))
+	(find-file result)
+	(pulse-momentary-highlight-one-line (point)))
+       (t
+	(error "Unknown result type from `semantic-up-reference'"))))))
+
+;; @TODO - move this to some analyzer / refs tool
+(define-overloadable-function semantic-up-reference (tag)
+  "Return a tag that is referredto by TAG.
+A \"reference\" could be any interesting feature of TAG.
+In C++, a function may have a 'parent' which is non-local.
+If that parent which is only a reference in the function tag
+is found, we can jump to it.
+Some tags such as includes have other reference features.")
+
+(defun semantic-up-reference-default (tag)
+  "Return a tag that is referredto by TAG.
+Makes C/C++ language like assumptions."
+  (cond ((semantic-tag-faux-p tag)
+         ;; Faux tags should have a real tag in some other location.
+         (let ((options (semantic-tag-external-class tag)))
+           ;; I should do something a little better than
+           ;; this.  Oy!
+           (car options)
+           ))
+
+	;; Include always point to another file.
+        ((eq (semantic-tag-class tag) 'include)
+	 (let ((file (semantic-dependency-tag-file tag)))
+	   (cond
+	    ((or (not file) (not (file-exists-p file)))
+	     (error "Could not location include %s"
+		    (semantic-tag-name tag)))
+	    ((get-file-buffer file)
+	     (get-file-buffer file))
+	    ((stringp file)
+	     file)
+	    )))
+
+	;; Is there a parent of the function to jump to?
+        ((and (semantic-tag-of-class-p tag 'function)
+              (semantic-tag-function-parent tag))
+         (let* ((scope (semantic-calculate-scope (point))))
+	   ;; @todo - it would be cool to ask the user which one if
+	   ;; more than one.
+	   (car (oref scope parents))
+	   ))
+
+	;; Is there a non-prototype version of the tag to jump to?
+        ((semantic-tag-get-attribute tag :prototype-flag)
+	 (let* ((sar (semantic-analyze-tag-references tag)))
+	   (car (semantic-analyze-refs-impl sar t)))
+	 )
+
+	;; If this is a datatype, and we have superclasses
+	((and (semantic-tag-of-class-p tag 'type)
+	      (semantic-tag-type-superclasses tag))
+	 (let ((scope (semantic-calculate-scope (point)))
+	       (parents (semantic-tag-type-superclasses tag)))
+	   (semantic-analyze-find-tag (car parents) 'type scope)))
+
+	;; Get the data type, and try to find that.
+        ((semantic-tag-type tag)
+	 (let ((scope (semantic-calculate-scope (point))))
+	   (semantic-analyze-tag-type tag scope))
+	 )
+        (t nil)))
+
+;;;;
+;;;; Misc. menu stuff.
+;;;;
+
+(defalias 'senator-menu-item 'semantic-menu-item)
+
+;;;;
+;;;; The dynamic sub-menu of Semantic minor modes.
+;;;;
+(defvar senator-registered-mode-entries  nil)
+(defvar senator-registered-mode-settings nil)
+(defvar senator-modes-menu-cache nil)
+
+(defun senator-register-command-menu (spec global)
+  "Register the minor mode menu item specified by SPEC.
+Return a menu item allowing to change the corresponding minor mode
+setting.  If GLOBAL is non-nil SPEC defines a global setting else a
+local setting.
+
+SPEC must be a list of the form:
+
+\(CALLBACK [ KEYWORD ARG ] ... )
+
+Where KEYWORD is one of those recognized by `easy-menu-define' plus:
+
+:save VARIABLE
+
+VARIABLE is a variable that will be saved by Custom when using the
+\"Modes/Save global settings\" menu item.  This keyword is ignored if
+GLOBAL is nil.
+
+By default the returned menu item is setup with:
+
+:active t :style toggle :selected CALLBACK.
+
+So when :selected is not specified the function assumes that CALLBACK
+is a symbol which refer to a bound variable too."
+  (and (consp spec)
+       (symbolp (car spec))
+       (fboundp (car spec))
+       (let* ((callback (car spec))     ; callback function
+              (props    (cdr spec))     ; properties
+              (selected callback)       ; selected default to callback
+              (active   t)              ; active by default
+              (style    'toggle)        ; toggle style by default
+              (save     nil)            ; what to save via custom
+              item key val)
+         (while props
+           (setq key   (car  props)
+                 val   (cadr props)
+                 props (cddr props))
+           (cond
+            ((eq key :save)
+             (setq save val))
+            ((eq key :active)
+             (setq active val))
+            ((eq key :style)
+             (setq style val))
+            ((eq key :selected)
+             (setq selected val))
+            (t
+             (setq item (cons key (cons val item))))))
+         (if (and global save (symbolp save) (boundp save))
+             (add-to-list 'senator-registered-mode-settings save))
+         (setq item (cons :selected (cons selected item))
+               item (cons :active   (cons active   item))
+               item (cons :style    (cons style    item))
+               item (cons callback  item)))))
+
+(defun senator-register-custom-menu (spec)
+  "Register SPEC as a menu item entry for customizing some aspect of a mode.
+SPEC can either be one entry, or a list of SPEC entries.  A SPEC is of
+the form
+
+\(SYMBOL [ :KEYWORD ARG ] ...)
+
+Valid keywords include:
+
+  :name - ARG represents the string used in the menu item.
+
+  :style - ARG represents the style of menu item this is.  Values for ARG
+           include:
+     :group  - SYMBOL is a group that `customize-group' will be called on.
+     :variable - SYMBOL is a variable that `customize-variable' will be called on.
+     :face - SYMBOL is a face that `customize-face' will be called on.
+     :toggle - SYMBOL is a variable that will be toggled on and off.
+
+     If :style is not specified, the symbol is queried to try and
+     predict the correct style to use.
+
+  :option-symbol - SYMBOL is a variable that contains a value that is from
+            a list of symbols.  ARG should be a list of symbols that can assign
+            to the variable SYMBOL."
+  (if (and (not (null spec)) (not (consp spec)))
+      (signal 'wrong-type-argument (list spec)))
+  ;; Turn spec into a list of specs if it is not so already.
+  (if (and spec (not (consp (car spec)))) (setq spec (list spec)))
+  (let ((menulist nil)
+        )
+    (while spec
+      (let* ((sym (car (car spec)))
+             (pl (cdr (car spec)))
+             (name (car-safe (cdr-safe (member :name pl))))
+             (style (car-safe (cdr-safe (member :style pl)))))
+        (if (not style)
+            (setq style
+                  (cond
+                   ((get sym 'custom-group)
+                    :group)
+                   ((facep sym)
+                    :face)
+                   ((boundp sym)
+                    :variable))))
+        (if (not name)
+            (setq name (symbol-name sym)))
+        (setq menulist
+              (cons
+               (cond
+                ((eq style :group)
+                 (senator-menu-item
+                  (vector (concat "Customize Group " name)
+                          `(lambda (ARG) (interactive "p")
+                             (customize-group (quote ,sym)))
+                          :help (format "Customize Group %s" name)))
+                 )
+                ((eq style :variable)
+                 (senator-menu-item
+                  (vector (concat "Customize " name)
+                          `(lambda (ARG) (interactive "p")
+                             (customize-variable (quote ,sym)))
+                          :help (format "Customize Variable %s" name)))
+                 )
+                ((eq style :face)
+                 (senator-menu-item
+                  (vector (concat "Customize " name)
+                          `(lambda (ARG) (interactive "p")
+                             (customize-face (quote ,sym)))
+                          :help (format "Customize Face %s" name)))
+                 )
+                ((eq style :toggle)
+                 ))
+               menulist))
+        )
+      (setq spec (cdr spec)))
+    menulist))
+
+(defun senator-register-mode-menu-entry (name local global &optional custom)
+  "Register a minor mode menu entry.
+This will add menu items to the \"Modes\" menu allowing to change the
+minor mode settings.  NAME is the name displayed in the menu.  LOCAL
+and GLOBAL define command menu items to respectively change the minor
+mode local and global settings.  nil means to omit the corresponding
+menu item.  See the function `senator-register-command-menu' for the
+command menu specification.  If NAME is already registered the
+corresponding entry will be updated with the given LOCAL and GLOBAL
+definitions.  If LOCAL and GLOBAL are both nil the NAME entry is
+unregistered if present.
+Optional fourth argument CUSTOM represents a menu item, or submenu
+item that will customize something about the mode being registered.
+See the function `senator-register-custom-menu' for the details on
+what this menu looks like."
+  ;; Clear the cached menu to rebuild it.
+  (setq senator-modes-menu-cache nil)
+  (let* ((entry (assoc name senator-registered-mode-entries))
+         (local-item  (senator-register-command-menu local nil))
+         (global-item (senator-register-command-menu global t))
+         (custom-item (senator-register-custom-menu custom))
+         (entry-construct (append (list local-item global-item)
+                                  custom-item))
+         )
+
+    (if (not (or local-item global-item))
+        (setq senator-registered-mode-entries
+              (delq entry senator-registered-mode-entries))
+      (if entry
+          (setcdr entry entry-construct)
+        (setq entry (cons name entry-construct)
+              senator-registered-mode-entries
+              (nconc senator-registered-mode-entries (list entry))))
+      entry)))
+
+(defsubst senator-build-command-menu-item (label props)
+  "Return a command menu item with an unique name based on LABEL.
+PROPS is the list of properties of this menu item."
+  (if props
+      (senator-menu-item (apply #'vector (cons label props)))))
+
+(defcustom senator-mode-menu-local-toggle-label  "In this buffer"
+  "*Label of menu item that toggles a Semantic minor mode locally."
+  :group 'senator
+  :type 'string
+  :set (lambda (sym val)
+         (set-default sym val)
+         (setq senator-modes-menu-cache nil)))
+
+(defcustom senator-mode-menu-global-toggle-label "Globally"
+  "*Label of menu item that toggles a Semantic minor mode globally."
+  :group 'senator
+  :type 'string
+  :set (lambda (sym val)
+         (set-default sym val)
+         (setq senator-modes-menu-cache nil)))
+
+(defun senator-build-mode-sub-menu (entry)
+  "Return a sub-menu for the registered minor mode ENTRY.
+The sub-menu displayed in the Senator/Modes menu looks like this:
+
+  Entry-Name
+            [x] In this buffer
+            [x] Globally
+            Custom1
+            Custom2
+            ...
+
+The menu item \"In this buffer\" toggles the minor mode locally.
+The menu item \"Globally\" toggles the minor mode globally."
+  (let ((mode (nth 1  entry))
+        (global (nth 2 entry))
+        (customs (nthcdr 3 entry)))
+    (delq nil
+          (append
+           (list (car entry)
+                 (senator-build-command-menu-item
+                  senator-mode-menu-local-toggle-label mode)
+                 (senator-build-command-menu-item
+                  senator-mode-menu-global-toggle-label global))
+           (if (and (symbolp customs) (fboundp customs))
+               (funcall customs)
+             customs)))))
+
+(defun senator-build-modes-menu (&rest ignore)
+  "Build and return the \"Modes\" menu.
+It is dynamically build from registered minor mode entries.  See also
+the function `senator-register-mode-menu-entry'.
+IGNORE any arguments.
+This function is a menu :filter."
+  (or senator-modes-menu-cache
+      (setq senator-modes-menu-cache
+            (nconc (mapcar 'senator-build-mode-sub-menu
+                           senator-registered-mode-entries)
+                   (list "--"
+                         (senator-menu-item
+                          [ "Save global settings"
+                            senator-save-registered-mode-settings
+                            :help "\
+Save global settings of Semantic minor modes in your init file."
+                            ]))))))
+
+(defun senator-save-registered-mode-settings ()
+  "Save current value of registered minor modes global setting.
+The setting is saved by Custom.  See the function
+`senator-register-mode-menu-entry' for details on how to register a
+minor mode entry."
+  (interactive)
+  (dolist (opt senator-registered-mode-settings)
+    (condition-case nil
+        (customize-save-variable opt (default-value opt))
+      (error nil))))
+
+;; Register the various minor modes settings used by Semantic.
+(senator-register-mode-menu-entry
+ "Senator"
+ '(senator-minor-mode
+   :help "Turn off Senator minor mode."
+   )
+ '(global-senator-minor-mode
+   :help "Automatically turn on Senator on all Semantic buffers."
+   :save global-senator-minor-mode
+   )
+ '(senator)
+ )
+
+(senator-register-mode-menu-entry
+ "Highlight changes"
+ '(semantic-highlight-edits-mode
+   :help "Highlight changes tracked by Semantic."
+   )
+ '(global-semantic-highlight-edits-mode
+   :help "Automatically highlight changes in all Semantic buffers."
+   :save global-semantic-highlight-edits-mode
+   )
+ '(semantic-highlight-edits-face)
+ )
+
+(senator-register-mode-menu-entry
+ "Show parser state"
+ '(semantic-show-parser-state-mode
+   :help "`-': OK, `!': will parse all, `~': will parse part, `@': running."
+   )
+ '(global-semantic-show-parser-state-mode
+   :help "Automatically show parser state in all Semantic buffers."
+   :save global-semantic-show-parser-state-mode
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Highlight Unmatched Syntax"
+ '(semantic-show-unmatched-syntax-mode
+   :help "Highlight syntax which is not recognized valid syntax."
+   )
+ '(global-semantic-show-unmatched-syntax-mode
+   :help "Automatically highlight unmatched syntax in all Semantic buffers."
+   :save global-semantic-show-unmatched-syntax-mode
+   )
+ '(semantic-unmatched-syntax-face)
+ )
+
+(senator-register-mode-menu-entry
+ "Idle Scheduler"
+ '(semantic-idle-scheduler-mode
+   :help "Schedule idle time to automatically parse buffer following changes."
+   )
+ '(global-semantic-idle-scheduler-mode
+   :help "Schedule idle time to automatically parse all Semantic buffer following changes."
+   :save global-semantic-idle-scheduler-mode
+   )
+ '((semantic-idle-scheduler-idle-time)
+   (semantic-idle-scheduler-max-buffer-size)
+   (semantic-idle-scheduler-verbose-flag)
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Idle Summaries"
+ '(semantic-idle-summary-mode
+   :help "Show tag summaries in idle time."
+   )
+ '(global-semantic-idle-summary-mode
+   :help "Show tag summaries in idle time in all buffers."
+   :save global-semantic-idle-summary-mode
+   )
+ '((semantic-idle-summary-function)
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Idle Symbol Highlight"
+ '(semantic-idle-tag-highlight-mode
+   :help "Highlight symbols matching symbol under point in idle time."
+   )
+ '(global-semantic-idle-tag-highlight-mode
+   :help "Highlight symbols matching symbol under point in idle time in all buffers."
+   :save global-semantic-idle-tag-highlight-mode
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Idle Completion"
+ '(semantic-idle-completions-mode
+   :help "Show completion tips in idle time."
+   )
+ '(global-semantic-idle-completions-mode
+   :help "Show completion tips in idle time in all buffers."
+   :save global-semantic-idle-completions-mode
+   )
+ '((semantic-complete-inline-analyzer-displayor-class)
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Sticky Func"
+ '(semantic-stickyfunc-mode
+   :help "Cause function declaration to become stuck to the header line."
+   )
+ '(global-semantic-stickyfunc-mode
+   :help "Automatically enable sticky function mode in all Semantic buffers."
+   :save global-semantic-stickyfunc-mode
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Highlight Func"
+ '(semantic-highlight-func-mode
+   :help "Cause function declaration the cursor is in be highlighted."
+   )
+ '(global-semantic-highlight-func-mode
+   :help "Automatically enable highlight function mode in all Semantic buffers."
+   :save global-semantic-highlight-func-mode
+   )
+ )
+
+(senator-register-mode-menu-entry
+ "Tag Decoration"
+ '(semantic-decoration-mode
+   :help "Decorate Tags."
+   )
+ '(global-semantic-decoration-mode
+   :help "Automatically enable decoration mode in all Semantic buffers."
+   :save global-semantic-decoration-mode
+   )
+  )
+
+(senator-register-mode-menu-entry
+ "MRU Bookmark"
+ nil
+ '(global-semantic-mru-bookmark-mode
+   :help "Automatically enable MRU bookmark tracking at a tag level."
+   :save global-semantic-mru-bookmark-mode
+   )
+  )
+
+
+;;;;
+;;;; Global minor mode to show tag names in the mode line
+;;;;
+
+(condition-case nil
+    (require 'which-func)
+  (error nil))
+
+(let ((select (cond
+               ;; Emacs 21
+               ((boundp 'which-function-mode)
+                'which-function-mode)
+               ;; Emacs < 21
+               ((boundp 'which-func-mode-global)
+                'which-func-mode-global)
+               (t nil))))
+  (if (and (fboundp 'which-func-mode) select)
+      (senator-register-mode-menu-entry
+       "Which Function"
+       nil
+       (list 'which-func-mode
+             :select select
+             :help "Enable `which-func-mode' and use it in Semantic buffers."
+             :save select
+             ))
+    ))
+
+(senator-register-mode-menu-entry
+ "Semantic Database"
+ nil
+ '(semanticdb-toggle-global-mode
+   :active (featurep 'semanticdb)
+   :selected (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+   :suffix (if (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+               (if (semanticdb-write-directory-p
+                    semanticdb-current-database)
+                   "[persist]"
+                 "[session]")
+             "")
+   :help "Cache tags for killed buffers and between sessions."
+   :save semanticdb-global-mode
+   )
+ )
+
+;;;;
+;;;; Senator minor mode
+;;;;
+
+(defvar senator-status nil
+  "Minor mode status displayed in the mode line.")
+(make-variable-buffer-local 'senator-status)
+
+(defvar senator-isearch-semantic-mode nil
+  "Non-nil if isearch does semantic search.
+This is a buffer local variable.")
+(make-variable-buffer-local 'senator-isearch-semantic-mode)
+
+(defvar senator-prefix-key [(control ?c) ?,]
+  "The common prefix key in senator minor mode.")
+
+(defvar senator-prefix-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "f"    'senator-search-set-tag-class-filter)
+    (define-key km "i"    'senator-isearch-toggle-semantic-mode)
+    (define-key km "j"    'semantic-complete-jump-local) ;senator-jump)
+    (define-key km "J"    'semantic-complete-jump)
+    (define-key km "g"    'semantic-symref-symbol) ; g for "grep" like behavior.
+    (define-key km "G"    'semantic-symref)
+    (define-key km "p"    'senator-previous-tag)
+    (define-key km "n"    'senator-next-tag)
+    (define-key km "u"    'senator-go-to-up-reference)
+    (define-key km "\t"   'senator-complete-symbol)
+    (define-key km " "    'senator-completion-menu-popup)
+    (define-key km "\C-w" 'senator-kill-tag)
+    (define-key km "\M-w" 'senator-copy-tag)
+    (define-key km "\C-y" 'senator-yank-tag)
+    (define-key km "r"    'senator-copy-tag-to-register)
+    (define-key km "t"    'senator-transpose-tags-up)
+    (define-key km "-"    'senator-fold-tag)
+    (define-key km "+"    'senator-unfold-tag)
+    (define-key km "?"    'senator-pulse-tag)
+    (define-key km "/"    'senator-adebug-tag)
+
+    (define-key km ","    'senator-force-refresh)
+
+    km)
+  "Default key bindings in senator minor mode.")
+
+(defvar senator-menu-bar
+  (list
+   "Senator"
+   (senator-menu-item
+    ["Force Tag Refresh"
+     senator-force-refresh
+     :active t
+     :help "Force a full reparse of the current buffer."])
+   (list
+    "Navigate"
+    (senator-menu-item
+     ["Next"
+      senator-next-tag
+      :active t
+      :help "Go to the next tag found"
+      ])
+    (senator-menu-item
+     ["Previous"
+      senator-previous-tag
+      :active t
+      :help "Go to the previous tag found"
+      ])
+    (senator-menu-item
+     ["Up Reference"
+      senator-go-to-up-reference
+      :active t
+      :help "Navigate up one reference by tag."
+      ])
+    (senator-menu-item
+     ["Jump in this file..."
+      semantic-complete-jump-local
+      :active t
+      :help "Jump to a semantic symbol"
+      ])
+    (senator-menu-item
+     ["Jump to any tag..."
+      semantic-complete-jump
+      :active t
+      :help "Jump to any semantic symbol in this project"
+      ])
+    (senator-menu-item
+     ["Narrow to tag"
+      senator-narrow-to-defun
+      :active (semantic-current-tag)
+      :help "Narrow to the bounds of the current tag."
+      ])
+    )
+   (list
+    "Search"
+    (senator-menu-item
+     ["String Forward..."
+      senator-nonincremental-search-forward
+      :active t
+      :help "Search forward for a string"
+      ])
+    (senator-menu-item
+     ["String Backwards..."
+      senator-nonincremental-search-backward
+      :active t
+      :help "Search backwards for a string"
+      ])
+    (senator-menu-item
+     ["Regexp Forward..."
+      senator-nonincremental-re-search-forward
+      :active t
+      :help "Search forward for a regular expression"
+      ])
+    (senator-menu-item
+     ["Regexp Backwards..."
+      senator-nonincremental-re-search-backward
+      :active t
+      :help "Search backwards for a regular expression"
+      ])
+    "--"
+    (senator-menu-item
+     ["Repeat Forward"
+      senator-nonincremental-repeat-search-forward
+      :active (or (and (eq senator-last-search-type 'string)
+                       search-ring)
+                  (and (eq senator-last-search-type 'regexp)
+                       regexp-search-ring))
+      :help "Repeat last search forward"
+      ])
+    (senator-menu-item
+     ["Repeat Backwards"
+      senator-nonincremental-repeat-search-backward
+      :active (or (and (eq senator-last-search-type 'string)
+                       search-ring)
+                  (and (eq senator-last-search-type 'regexp)
+                       regexp-search-ring))
+      :help "Repeat last search backwards"
+      ])
+    "--"
+    (senator-menu-item
+     ["Limit search..."
+      senator-search-set-tag-class-filter
+      :active t
+      :help "In current buffer, limit search to certain classes of tag"
+      ])
+    (senator-menu-item
+     ["Semantic isearch mode"
+      senator-isearch-toggle-semantic-mode
+      :active t
+      :style toggle :selected senator-isearch-semantic-mode
+      :help "Toggle semantic search in isearch mode"
+      ])
+    )
+   (list
+    "Tag Copy/Paste"
+    (senator-menu-item
+     [ "Copy Tag"
+       senator-copy-tag
+       :active (semantic-current-tag)
+       :help "Copy the current tag to the tag ring"
+       ])
+    (senator-menu-item
+     [ "Kill Tag"
+       senator-kill-tag
+       :active (semantic-current-tag)
+       :help "Kill tag text to the kill ring, and copy the tag to the tag ring"
+       ])
+    (senator-menu-item
+     [ "Yank Tag"
+       senator-yank-tag
+       :active (not (ring-empty-p senator-tag-ring))
+       :help "Yank a tag from the tag ring, inserting a summary/prototype"
+       ])
+    (senator-menu-item
+     [ "Copy Tag to Register"
+       senator-copy-tag-to-register
+       :active (semantic-current-tag)
+       :help "Copy the current tag to a register"
+       ])
+    (senator-menu-item
+     [ "Transpose Tag Up"
+       senator-transpose-tags-up
+       :active (semantic-current-tag)
+       :help "Transpose the current tag up"
+       ])
+    (senator-menu-item
+     [ "Transpose Tag Down"
+       senator-transpose-tags-down
+       :active (semantic-current-tag)
+       :help "Transpose the current tag down"
+       ])
+
+    )
+   (list
+    "Tag Properties"
+    (senator-menu-item
+     [ "Fold Tag"
+       senator-fold-tag-toggle
+       :active (semantic-current-tag)
+       :style toggle
+       :selected (let ((tag (semantic-current-tag)))
+                   (and tag (semantic-tag-folded-p tag)))
+       :help "Fold the current tag to one line"
+       ])
+    (senator-menu-item
+     [ "Read Only"
+       senator-toggle-read-only
+       :active (semantic-current-tag)
+       :style toggle
+       :selected (let ((tag (semantic-current-tag)))
+                   (and tag (semantic-tag-read-only-p tag)))
+       :help "Make the current tag read-only"
+       ])
+    (senator-menu-item
+     [ "Intangible"
+       senator-toggle-intangible
+       ;; XEmacs extent `intangible' property seems to not exists.
+       :active (and (not (featurep 'xemacs))
+                    (semantic-current-tag))
+       :style toggle
+       :selected (and (not (featurep 'xemacs))
+                      (let ((tag (semantic-current-tag)))
+                        (and tag (semantic-tag-intangible-p tag))))
+       :help "Make the current tag intangible"
+       ])
+    (senator-menu-item
+     [ "Set Tag Face"
+       senator-set-face
+       :active (semantic-current-tag)
+       :help "Set the face on the current tag"
+       ])
+    (senator-menu-item
+     [ "Set Tag Foreground"
+       senator-set-foreground
+       :active (semantic-current-tag)
+       :help "Set the foreground color on the current tag"
+       ])
+    (senator-menu-item
+     [ "Set Tag Background"
+       senator-set-background
+       :active (semantic-current-tag)
+       :help "Set the background color on the current tag"
+       ])
+    (senator-menu-item
+     [ "Remove all properties"
+       senator-clear-tag
+       :active (semantic-current-tag)
+       :help "Remove all special face properties on the current tag "
+       ] )
+    )
+   (if (or (featurep 'xemacs) (> emacs-major-version 20))
+       (list "Tag Decorations" :filter 'semantic-build-decoration-mode-menu)
+     ;; The :filter feature seems broken in GNU Emacs versions before
+     ;; 21.1.  So dont delay the menu creation.  This also means that
+     ;; new registered decoration entries will not be added "on the
+     ;; fly" to the menu :-(
+     (cons "Tag Decorations" (semantic-build-decoration-mode-menu)))
+   "--"
+   (list
+    "Analyze"
+    (senator-menu-item
+     [ "Inline Smart completion"
+       semantic-complete-analyze-inline
+       :active t
+       :help "Complete the symbol in the current buffer."
+       ])
+    (senator-menu-item
+     [ "Speedbar Analyzer Mode"
+       semantic-speedbar-analysis
+       :active t
+       :help "Start speedbar in Context Analysis/Completion mode."
+       ])
+    (senator-menu-item
+     [ "Context Analysis Dump"
+       semantic-analyze-current-context
+       :active t
+       :help "Show a dump of an analysis of the current local context"
+       ])
+    (senator-menu-item
+     [ "Smart Completion Dump"
+       semantic-analyze-possible-completions
+       :active t
+       :help "Show a dump of the semantic analyzer's guess at possible completions"
+       ])
+    (senator-menu-item
+     [ "Analyzer Debug Assitant"
+       semantic-analyze-debug-assist
+       :active t
+       :help "Debug why the analyzer may not be working for you."
+       ])
+   (senator-menu-item
+    [ "Summarize includes current buffer"
+      semantic-decoration-all-include-summary
+     :active t
+     :help "Show a summary of what Semantic has done with your includes for this buffer." ])
+   )
+   (list
+    "Find References"
+    (senator-menu-item
+     ["Find This Tag"
+      semantic-symref
+      :active (semantic-current-tag)
+      :help "Find uses of the tag the cursor is in."])
+    (senator-menu-item
+     ["Find This Symbol..."
+      semantic-symref-symbol
+      :active t
+      :help "Find uses of any arbitrary symbol."])
+    )
+   (list
+    "UML"
+    (senator-menu-item
+     [ "Create new UML Graph."
+       cogre
+       :active t
+       :help "Create a new UML graph using COGRE."
+       ])
+    (senator-menu-item
+     [ "Autogenerate UML Graph for Class"
+       cogre-uml-quick-class
+       :active t
+       :help "Autogenerate a small UML graph from a class in your code."
+       ])
+    )
+   (list
+    "Chart"
+    (senator-menu-item
+     [ "Chart Tags by Class"
+       semantic-chart-tags-by-class
+       :active t
+       :help "Catagorize all tags by class, and chart the volume for each class"
+       ])
+    (senator-menu-item
+     [ "Chart Tags by Complexity"
+       semantic-chart-tag-complexity
+       :active t
+       :help "Choose the most complex tags, and chart them by complexity"
+       ])
+    (senator-menu-item
+     [ "Chart File Complexity"
+       semantic-chart-database-size
+       :active (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+       :help "Choose the files with the most tags, and chart them by volume"
+       ])
+    (senator-menu-item
+     [ "Chart Analyzer Overhead"
+       semantic-chart-analyzer
+       :active t
+       :help "Calculate the overhead of running the analyzer, and chart it out."
+       ])
+    )
+   (if (or (featurep 'xemacs) (> emacs-major-version 20))
+       (list "Modes" :filter 'senator-build-modes-menu)
+     ;; The :filter feature seems broken in GNU Emacs versions before
+     ;; 21.1.  So dont delay the menu creation.  This also means that
+     ;; new registered minor mode entries will not be added "on the
+     ;; fly" to the menu :-(
+     (cons "Modes" (senator-build-modes-menu)))
+   "--"
+   (list
+    "Imenu Config"
+    (list
+     "Tag Sorting Function"
+     (senator-menu-item
+      [ "Do not sort"
+        (setq semantic-imenu-sort-bucket-function nil)
+        :active t
+        :style radio
+        :selected (eq semantic-imenu-sort-bucket-function nil)
+        :help "Do not sort imenu items"
+        ])
+     (senator-menu-item
+      [ "Increasing by name"
+        (setq semantic-imenu-sort-bucket-function
+              'semantic-sort-tags-by-name-increasing)
+        :active t
+        :style radio
+        :selected (eq semantic-imenu-sort-bucket-function
+                      'semantic-sort-tags-by-name-increasing)
+        :help "Sort tags by name increasing"
+        ])
+     (senator-menu-item
+      [ "Decreasing by name"
+        (setq semantic-imenu-sort-bucket-function
+              'semantic-sort-tags-by-name-decreasing)
+        :active t
+        :style radio
+        :selected (eq semantic-imenu-sort-bucket-function
+                      'semantic-sort-tags-by-name-decreasing)
+        :help "Sort tags by name decreasing"
+        ])
+     (senator-menu-item
+      [ "Increasing Case Insensitive by Name"
+        (setq semantic-imenu-sort-bucket-function
+              'semantic-sort-tags-by-name-increasing-ci)
+        :active t
+        :style radio
+        :selected (eq semantic-imenu-sort-bucket-function
+                      'semantic-sort-tags-by-name-increasing-ci)
+        :help "Sort tags by name increasing and case insensitive"
+        ])
+     (senator-menu-item
+      [ "Decreasing Case Insensitive by Name"
+        (setq semantic-imenu-sort-bucket-function
+              'semantic-sort-tags-by-name-decreasing-ci)
+        :active t
+        :style radio
+        :selected (eq semantic-imenu-sort-bucket-function
+                      'semantic-sort-tags-by-name-decreasing-ci)
+        :help "Sort tags by name decreasing and case insensitive"
+        ])
+     )
+    (senator-menu-item
+     [ "Bin tags by class"
+       (setq semantic-imenu-bucketize-file
+             (not semantic-imenu-bucketize-file))
+       :active t
+       :style toggle
+       :selected semantic-imenu-bucketize-file
+       :help "Organize tags in bins by class of tag"
+       ])
+    (senator-menu-item
+     [ "Bins are submenus"
+       (setq semantic-imenu-buckets-to-submenu
+             (not semantic-imenu-buckets-to-submenu))
+       :active t
+       :style toggle
+       :selected semantic-imenu-buckets-to-submenu
+       :help "Organize tags into submenus by class of tag"
+       ])
+    (senator-menu-item
+     [ "Bin tags in components"
+       (setq semantic-imenu-bucketize-type-members
+             (not semantic-imenu-bucketize-type-members))
+       :active t
+       :style toggle
+       :selected semantic-imenu-bucketize-type-members
+       :help "When listing tags inside another tag; bin by tag class"
+       ])
+    (senator-menu-item
+     [ "List other files"
+       (setq semantic-imenu-index-directory (not semantic-imenu-index-directory))
+       :active (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+       :style toggle
+       :selected semantic-imenu-index-directory
+       :help "List all files in the current database in the Imenu menu"
+       ])
+    (senator-menu-item
+     [ "Auto-rebuild other buffers"
+       (setq semantic-imenu-auto-rebuild-directory-indexes
+             (not semantic-imenu-auto-rebuild-directory-indexes))
+       :active (and (featurep 'semanticdb) (semanticdb-minor-mode-p))
+       :style toggle
+       :selected semantic-imenu-auto-rebuild-directory-indexes
+       :help "If listing other buffers, update all buffer menus after a parse"
+       ])
+    )
+   (list
+    "Options"
+    (senator-menu-item
+     ["Semantic..."
+      (customize-group "semantic")
+      :active t
+      :help "Customize Semantic options"
+      ])
+    (senator-menu-item
+     ["Senator..."
+      (customize-group "senator")
+      :active t
+      :help "Customize SEmantic NAvigaTOR options"
+      ])
+    (senator-menu-item
+     ["Semantic Imenu..."
+      (customize-group "semantic-imenu")
+      :active t
+      :help "Customize Semantic Imenu options"
+      ])
+    (senator-menu-item
+     ["Semantic Database..."
+      (customize-group "semanticdb")
+      :active t
+      :help "Customize Semantic Database options"
+      ])
+    )
+   )
+  "Menu for senator minor mode.")
+
+(defvar senator-minor-menu nil
+  "Menu keymap build from `senator-menu-bar'.")
+
+(defvar senator-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km senator-prefix-key senator-prefix-map)
+    (define-key km [(shift mouse-3)] 'senator-completion-menu-popup)
+    (easy-menu-define senator-minor-menu km "Senator Minor Mode Menu"
+                      senator-menu-bar)
+    km)
+  "Keymap for senator minor mode.")
+
+(defvar senator-minor-mode nil
+  "Non-nil if Senator minor mode is enabled.
+Use the command `senator-minor-mode' to change this variable.")
+(make-variable-buffer-local 'senator-minor-mode)
+
+(defconst senator-minor-mode-name "n"
+  "Name shown in the mode line when senator minor mode is on.
+Not displayed if the minor mode is globally enabled.")
+
+(defconst senator-minor-mode-isearch-suffix "i"
+  "String appended to the mode name when senator isearch mode is on.")
+
+(defun senator-mode-line-update ()
+  "Update the modeline to show the senator minor mode state.
+If `senator-isearch-semantic-mode' is non-nil append
+`senator-minor-mode-isearch-suffix' to the value of the variable
+`senator-minor-mode-name'."
+  (if (not (and senator-minor-mode senator-minor-mode-name))
+      (setq senator-status "")
+    (setq senator-status
+          (format "%s%s" senator-minor-mode-name
+                  (if senator-isearch-semantic-mode
+                      (or senator-minor-mode-isearch-suffix "")
+                    ""))))
+  (semantic-mode-line-update))
+
+(defun senator-minor-mode-setup ()
+  "Actually setup the senator minor mode.
+The minor mode can be turned on only if semantic feature is available
+and the current buffer was set up for parsing.  When minor mode is
+enabled parse the current buffer if needed.  Return non-nil if the
+minor mode is enabled."
+  (if senator-minor-mode
+      (if (not (and (featurep 'semantic) (semantic-active-p)))
+          (progn
+            ;; Disable minor mode if semantic stuff not available
+            (setq senator-minor-mode nil)
+            (error "Buffer %s was not set up for parsing"
+                   (buffer-name)))
+        ;; XEmacs needs this
+        (if (featurep 'xemacs)
+            (easy-menu-add senator-minor-menu senator-mode-map))
+        ;; Add completion hooks
+        (semantic-make-local-hook
+         'semantic-after-toplevel-cache-change-hook)
+        (add-hook 'semantic-after-toplevel-cache-change-hook
+                  'senator-completion-cache-flush-fcn nil t)
+        (semantic-make-local-hook
+         'semantic-after-partial-cache-change-hook)
+        (add-hook 'semantic-after-partial-cache-change-hook
+                  'senator-completion-cache-flush-fcn nil t))
+    ;; XEmacs needs this
+    (if (featurep 'xemacs)
+        (easy-menu-remove senator-minor-menu))
+    ;; Remove completion hooks
+    (remove-hook 'semantic-after-toplevel-cache-change-hook
+                 'senator-completion-cache-flush-fcn t)
+    (remove-hook 'semantic-after-partial-cache-change-hook
+                 'senator-completion-cache-flush-fcn t)
+    ;; Disable semantic isearch
+    (setq senator-isearch-semantic-mode nil))
+  senator-minor-mode)
+
+;;;###autoload
+(defun senator-minor-mode (&optional arg)
+  "Toggle senator minor mode.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{senator-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+             (if senator-minor-mode 0 1))))
+  (setq senator-minor-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not senator-minor-mode)))
+  (senator-minor-mode-setup)
+  (run-hooks 'senator-minor-mode-hook)
+  (if (interactive-p)
+      (message "Senator minor mode %sabled"
+               (if senator-minor-mode "en" "dis")))
+  (senator-mode-line-update)
+  senator-minor-mode)
+
+(semantic-add-minor-mode 'senator-minor-mode
+                         'senator-status
+                         senator-mode-map)
+
+;; To show senator isearch mode in the mode line
+(semantic-add-minor-mode 'senator-isearch-semantic-mode
+                         'senator-status
+                         nil)
+;;; Emacs 21 goodies
+(and (not (featurep 'xemacs))
+     (> emacs-major-version 20)
+     (progn
+
+       ;; Add Senator to the the minor mode menu in the mode line
+       (define-key mode-line-mode-menu [senator-minor-mode]
+         `(menu-item "Senator" senator-minor-mode
+                     :button  (:toggle . senator-minor-mode)
+                     :visible (and (featurep 'semantic)
+                                   (semantic-active-p))))
+
+       ))
+
+;;;###autoload
+(defun global-senator-minor-mode (&optional arg)
+  "Toggle global use of senator minor mode.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-senator-minor-mode
+        (semantic-toggle-minor-mode-globally
+         'senator-minor-mode arg)))
+
+;;;;
+;;;; Useful advices
+;;;;
+
+(defun senator-beginning-of-defun (&optional arg)
+  "Move backward to the beginning of a defun.
+Use semantic tags to navigate.
+ARG is the number of tags to navigate (not yet implemented)."
+  (senator-parse)
+  (let* ((senator-highlight-found nil)
+         ;; Step at beginning of next tag with class specified in
+         ;; `senator-step-at-tag-classes'.
+         (senator-step-at-start-end-tag-classes t)
+         (tag (senator-previous-tag)))
+    (when tag
+      (if (= (point) (semantic-tag-end tag))
+          (goto-char (semantic-tag-start tag)))
+      (beginning-of-line))
+    (working-message nil)))
+
+(defun senator-end-of-defun (&optional arg)
+  "Move forward to next end of defun.
+Use semantic tags to navigate.
+ARG is the number of tags to navigate (not yet implemented)."
+  (senator-parse)
+  (let* ((senator-highlight-found nil)
+         ;; Step at end of next tag with class specified in
+         ;; `senator-step-at-tag-classes'.
+         (senator-step-at-start-end-tag-classes t)
+         (tag (senator-next-tag)))
+    (when tag
+      (if (= (point) (semantic-tag-start tag))
+          (goto-char (semantic-tag-end tag)))
+      (skip-chars-forward " \t")
+      (if (looking-at "\\s<\\|\n")
+          (forward-line 1)))
+    (working-message nil)))
+
+(defun senator-narrow-to-defun ()
+  "Make text outside current defun invisible.
+The defun visible is the one that contains point or follows point.
+Use semantic tags to navigate."
+  (interactive)
+  (senator-parse)
+  (save-excursion
+    (widen)
+    (senator-end-of-defun)
+    (let ((end (point)))
+      (senator-beginning-of-defun)
+      (narrow-to-region (point) end))))
+
+(defun senator-mark-defun ()
+  "Put mark at end of this defun, point at beginning.
+The defun marked is the one that contains point or follows point.
+Use semantic tags to navigate."
+  (interactive)
+  (let ((origin (point))
+        (end    (progn (senator-end-of-defun) (point)))
+        (start  (progn (senator-beginning-of-defun) (point))))
+    (goto-char origin)
+    (push-mark (point))
+    (goto-char end) ;; end-of-defun
+    (push-mark (point) nil t)
+    (goto-char start) ;; beginning-of-defun
+    (re-search-backward "^\n" (- (point) 1) t)))
+
+(defadvice beginning-of-defun (around senator activate)
+  "Move backward to the beginning of a defun.
+If semantic tags are available, use them to navigate."
+  (if (and senator-minor-mode (interactive-p))
+      (senator-beginning-of-defun (ad-get-arg 0))
+    ad-do-it))
+
+(defadvice end-of-defun (around senator activate)
+  "Move forward to next end of defun.
+If semantic tags are available, use them to navigate."
+  (if (and senator-minor-mode (interactive-p))
+      (senator-end-of-defun (ad-get-arg 0))
+    ad-do-it))
+
+(defadvice narrow-to-defun (around senator activate)
+  "Make text outside current defun invisible.
+The defun visible is the one that contains point or follows point.
+If semantic tags are available, use them to navigate."
+  (if (and senator-minor-mode (interactive-p))
+      (senator-narrow-to-defun)
+    ad-do-it))
+
+(defadvice mark-defun (around senator activate)
+  "Put mark at end of this defun, point at beginning.
+The defun marked is the one that contains point or follows point.
+If semantic tags are available, use them to navigate."
+  (if (and senator-minor-mode (interactive-p))
+      (senator-mark-defun)
+    ad-do-it))
+
+(defadvice c-mark-function (around senator activate)
+  "Put mark at end of this defun, point at beginning.
+The defun marked is the one that contains point or follows point.
+If semantic tags are available, use them to navigate."
+  (if (and senator-minor-mode (interactive-p))
+      (senator-mark-defun)
+    ad-do-it))
+
+(defvar senator-add-log-tags '(function variable type)
+  "When advising `add-log-current-defun', tag classes used.
+Semantic tags that are of these classes will be used to find the name
+used by add log.")
+(semantic-varalias-obsolete 'senator-add-log-tokens
+                            'senator-add-log-tags)
+
+(defadvice add-log-current-defun (around senator activate)
+  "Return name of function definition point is in, or nil."
+  (if senator-minor-mode
+      (let ((tag (semantic-current-tag))
+            (name nil))
+        (if (and tag (memq (semantic-tag-class tag)
+                           senator-add-log-tags))
+            (progn
+              (setq name
+                    (semantic-format-tag-canonical-name
+                     tag (semantic-current-tag-parent)))
+              (setq ad-return-value name))
+          ad-do-it))
+    ad-do-it))
+
+;;;;
+;;;; Tag Cut & Paste
+;;;;
+
+;; To copy a tag, means to put a tag definition into the tag
+;; ring.  To kill a tag, put the tag into the tag ring AND put
+;; the body of the tag into the kill-ring.
+;;
+;; To retrieve a killed tag's text, use C-y (yank), but to retrieve
+;; the tag as a reference of some sort, use senator-yank-tag.
+
+(defvar senator-tag-ring (make-ring 20)
+  "Ring of tags for use with cut and paste.")
+
+(make-obsolete-overload 'semantic-insert-foreign-token
+                        'semantic-insert-foreign-tag)
+
+(semantic-alias-obsolete 'senator-insert-foreign-token
+                         'semantic-insert-foreign-tag)
+
+(defun senator-copy-tag ()
+  "Take the current tag, and place it in the tag ring."
+  (interactive)
+  (senator-parse)
+  (let ((ft (semantic-obtain-foreign-tag)))
+    (when ft
+      (ring-insert senator-tag-ring ft)
+      (kill-ring-save (semantic-tag-start ft) (semantic-tag-end ft))
+      (when (interactive-p)
+        (message "Use C-y to yank text.  Use `senator-yank-tag' for prototype insert."))
+      )
+    ft))
+(semantic-alias-obsolete 'senator-copy-token 'senator-copy-tag)
+
+(defun senator-kill-tag ()
+  "Take the current tag, place it in the tag ring, and kill it.
+Killing the tag removes the text for that tag, and places it into
+the kill ring.  Retrieve that text with \\[yank]."
+  (interactive)
+  (let ((ct (senator-copy-tag))) ;; this handles the reparse for us.
+    (kill-region (semantic-tag-start ct)
+                 (semantic-tag-end ct))
+    (when (interactive-p)
+      (message "Use C-y to yank text.  Use `senator-yank-tag' for prototype insert."))
+    ))
+(semantic-alias-obsolete 'senator-kill-token 'senator-kill-tag)
+
+(defun senator-yank-tag ()
+  "Yank a tag from the tag ring.
+The form the tag takes is differnet depending on where it is being
+yanked to."
+  (interactive)
+  (or (ring-empty-p senator-tag-ring)
+      (let ((ft (ring-ref senator-tag-ring 0)))
+          (semantic-foreign-tag-check ft)
+          (semantic-insert-foreign-tag ft)
+          (when (interactive-p)
+            (message "Use C-y to recover the yank the text of %s."
+                     (semantic-tag-name ft)))
+          )))
+(semantic-alias-obsolete 'senator-yank-token 'senator-yank-tag)
+
+(defun senator-copy-tag-to-register (register &optional kill-flag)
+  "Copy the current tag into REGISTER.
+Optional argument KILL-FLAG will delete the text of the tag to the
+kill ring."
+  (interactive "cTag to register: \nP")
+  (senator-parse)
+  (let ((ft (semantic-obtain-foreign-tag)))
+    (when ft
+      (set-register register ft)
+      (if kill-flag
+          (kill-region (semantic-tag-start ft)
+                       (semantic-tag-end ft))))))
+(semantic-alias-obsolete 'senator-copy-token-to-register
+                         'senator-copy-tag-to-register)
+
+(defadvice insert-register (around senator activate)
+  "Insert contents of register REGISTER as a tag.
+If senator is not active, use the original mechanism."
+  (let ((val (get-register (ad-get-arg 0))))
+    (if (and senator-minor-mode (interactive-p)
+             (semantic-foreign-tag-p val))
+        (semantic-insert-foreign-tag val)
+      ad-do-it)))
+
+(defadvice jump-to-register (around senator activate)
+  "Insert contents of register REGISTER as a tag.
+If senator is not active, use the original mechanism."
+  (let ((val (get-register (ad-get-arg 0))))
+    (if (and senator-minor-mode (interactive-p)
+             (semantic-foreign-tag-p val))
+        (progn
+          (switch-to-buffer (semantic-tag-buffer val))
+          (goto-char (semantic-tag-start val)))
+      ad-do-it)))
+
+(defun senator-transpose-tags-up ()
+  "Transpose the current tag, and the preceeding tag."
+  (interactive)
+  (senator-parse)
+  (let* ((current-tag (semantic-current-tag))
+         (prev-tag (save-excursion
+                     (goto-char (semantic-tag-start current-tag))
+                     (semantic-find-tag-by-overlay-prev)))
+         (ct-parent (semantic-find-tag-parent-by-overlay current-tag))
+         (pt-parent (semantic-find-tag-parent-by-overlay prev-tag)))
+    (if (not (eq ct-parent pt-parent))
+        (error "Cannot transpose tags"))
+    (let ((txt (buffer-substring (semantic-tag-start current-tag)
+                                 (semantic-tag-end current-tag)))
+          (line (count-lines (semantic-tag-start current-tag)
+                             (point)))
+          (insert-point nil)
+          )
+      (delete-region (semantic-tag-start current-tag)
+                     (semantic-tag-end current-tag))
+      (delete-blank-lines)
+      (goto-char (semantic-tag-start prev-tag))
+      (setq insert-point (point))
+      (insert txt)
+      (if (/= (current-column) 0)
+          (insert "\n"))
+      (insert "\n")
+      (goto-char insert-point)
+      (forward-line line)
+      )))
+
+(defun senator-transpose-tags-down ()
+  "Transpose the current tag, and the following tag."
+  (interactive)
+  (senator-parse)
+  (let* ((current-tag (semantic-current-tag))
+         (next-tag (save-excursion
+                     (goto-char (semantic-tag-end current-tag))
+                     (semantic-find-tag-by-overlay-next)))
+         (end-pt (point-marker))
+         )
+    (goto-char (semantic-tag-start next-tag))
+    (forward-char 1)
+    (senator-transpose-tags-up)
+    ;; I know that the above fcn deletes the next tag, so our pt marker
+    ;; will be stable.
+    (goto-char end-pt)))
+
+;;; HIPPIE EXPAND
+;;
+;; Senator has a nice completion mechanism.  Use it to add a new
+;; hippie expand try method.
+
+(eval-when-compile (require 'hippie-exp))
+
+(defvar senator-try-function-already-enabled nil
+  "Non-nil if `hippie-expand' semantic completion was already enabled.
+This flag remember `senator-hippie-expand-hook' to not remove
+`senator-try-expand-semantic' from `hippie-expand-try-functions-list'
+if it was previously put here by any sort of user's customization.")
+
+(defun senator-hippie-expand-hook ()
+  "Enable or disable use of semantic completion with `hippie-expand'.
+Depending on the value of the variable `senator-minor-mode'.
+Run as `senator-minor-mode-hook'."
+  (make-local-variable 'hippie-expand-try-functions-list)
+  (make-local-variable 'senator-try-function-already-enabled)
+  (if senator-minor-mode
+      (progn
+        ;; Does nothing if semantic completion is already enabled (via
+        ;; customization for example).
+        (setq senator-try-function-already-enabled
+              (memq 'senator-try-expand-semantic
+                    hippie-expand-try-functions-list))
+        (or senator-try-function-already-enabled
+            (setq hippie-expand-try-functions-list
+                  (cons 'senator-try-expand-semantic
+                        hippie-expand-try-functions-list))))
+    ;; Does nothing if semantic completion wasn't enabled here.
+    (or senator-try-function-already-enabled
+        (setq hippie-expand-try-functions-list
+              (delq 'senator-try-expand-semantic
+                    hippie-expand-try-functions-list)))))
+
+(add-hook 'senator-minor-mode-hook 'senator-hippie-expand-hook)
+
+;;;###autoload
+(defun senator-try-expand-semantic (old)
+  "Attempt inline completion at the cursor.
+Use Semantic, or the semantic database to look up possible
+completions.  The argument OLD has to be nil the first call of this
+function.  It returns t if a unique, possibly partial, completion is
+found, nil otherwise."
+
+  ;;@TODO - Can I support smart completion in here?
+
+  (if (semantic-active-p)
+      (let (symstart)
+        ;; If the hippie says so, start over.
+        (if (not old)
+            (if (setq symstart (senator-current-symbol-start))
+                (progn
+                  (he-init-string symstart (point))
+                  (setq senator-last-completion-stats nil))))
+        ;; do completion with senator's mechanism.
+        (when (or old symstart)
+          ;; This bit will turn off parsing on lexical errors.
+          (semantic-lex-catch-errors senator-hippie-expand
+            (semantic-fetch-tags))
+          ;; Do the completion
+          (let ((ret (senator-complete-symbol t)))
+            (cond (ret
+                   ;; Found a new completion, update the end marker.
+                   (set-marker he-string-end (point))
+                   ;; Update the tried table so other hippie expand
+                   ;; try functions can see whether an expansion has
+                   ;; already been tried.
+                   (setq he-tried-table (cons ret he-tried-table)))
+                  ;; No more completion
+                  (old
+                   ;; Reset the initial completed string for other
+                   ;; hippie-expand try functions.
+                   (he-reset-string)))
+            ret)))))
+
+;;;;
+;;;; Using semantic search in isearch mode
+;;;;
+
+;;; Compatibility
+(cond
+ ( ;; GNU Emacs 21.0 lazy highlighting
+  (fboundp 'isearch-lazy-highlight-cleanup)
+
+  ;; Provide this function used by senator
+  (defun senator-lazy-highlight-update ()
+    "Force lazy highlight update."
+    (funcall 'isearch-lazy-highlight-cleanup t)
+    (set 'isearch-lazy-highlight-last-string nil)
+    (setq isearch-adjusted t)
+    (isearch-update))
+
+  ) ;; End of GNU Emacs 21 lazy highlighting
+
+ ( ;; XEmacs 21.4 lazy highlighting
+  (fboundp 'isearch-highlight-all-cleanup)
+
+  ;; Provide this function used by senator
+  (defun senator-lazy-highlight-update ()
+    "Force lazy highlight update."
+    (funcall 'isearch-highlight-all-cleanup)
+    (set 'isearch-highlight-last-string nil)
+    (setq isearch-adjusted t)
+    (isearch-update))
+
+  ) ;; End of XEmacs 21.4 lazy highlighting
+
+ ( ;; GNU Emacs 20 lazy highlighting via ishl
+  (fboundp 'ishl-cleanup)
+
+  ;; Provide this function used by senator
+  (defun senator-lazy-highlight-update ()
+    "Force lazy highlight update."
+    (funcall 'ishl-cleanup t)
+    (set 'ishl-last-string nil)
+    (setq isearch-adjusted t)
+    (isearch-update))
+
+  ) ;; End of GNU Emacs 20 lazy highlighting
+
+ (t ;; No lazy highlighting
+
+  ;; Ignore this function used by senator
+  (defalias 'senator-lazy-highlight-update 'ignore)
+
+  ))
+
+(defmacro senator-define-search-advice (searcher)
+  "Advice the built-in SEARCHER function to do semantic search.
+That is to call the Senator counterpart searcher when variables
+`isearch-mode' and `senator-isearch-semantic-mode' are non-nil."
+  (let ((senator-searcher (intern (format "senator-%s" searcher))))
+    `(defadvice ,searcher (around senator activate)
+       (if (and isearch-mode senator-isearch-semantic-mode
+                ;; The following condition ensure to do a senator
+                ;; semantic search on the `isearch-string' only!
+                (string-equal (ad-get-arg 0) isearch-string))
+           (unwind-protect
+               (progn
+                 ;; Temporarily set `senator-isearch-semantic-mode' to
+                 ;; nil to avoid an infinite recursive call of the
+                 ;; senator semantic search function!
+                 (setq senator-isearch-semantic-mode nil)
+                 (setq ad-return-value
+                       (funcall ',senator-searcher
+                                (ad-get-arg 0)     ; string
+                                (ad-get-arg 1)     ; bound
+                                (ad-get-arg 2)     ; no-error
+                                (ad-get-arg 3)     ; count
+                                )))
+             (setq senator-isearch-semantic-mode t))
+         ad-do-it))))
+
+;; Recent versions of GNU Emacs allow to override the isearch search
+;; function for special needs, and avoid to advice the built-in search
+;; function :-)
+(defun senator-isearch-search-fun ()
+  "Return the function to use for the search.
+Use a senator search function when semantic isearch mode is enabled."
+  (intern
+   (concat (if senator-isearch-semantic-mode
+               "senator-"
+             "")
+           (cond (isearch-word "word-")
+                 (isearch-regexp "re-")
+                 (t ""))
+           "search-"
+           (if isearch-forward
+               "forward"
+             "backward"))))
+
+(unless (boundp 'isearch-search-fun-function)
+  ;; Advice the built-in search functions to do semantic search when
+  ;; `isearch-mode' and `senator-isearch-semantic-mode' are on.
+  (senator-define-search-advice search-forward)
+  (senator-define-search-advice re-search-forward)
+  (senator-define-search-advice word-search-forward)
+  (senator-define-search-advice search-backward)
+  (senator-define-search-advice re-search-backward)
+  (senator-define-search-advice word-search-backward)
+  )
+;;; End of compatibility stuff
+
+(defun senator-isearch-toggle-semantic-mode ()
+  "Toggle semantic searching on or off in isearch mode.
+\\<senator-mode-map>\\[senator-isearch-toggle-semantic-mode] toggle semantic searching."
+  (interactive)
+  (when senator-minor-mode
+    (setq senator-isearch-semantic-mode
+          (not senator-isearch-semantic-mode))
+    (senator-mode-line-update)
+    (if isearch-mode
+        ;; force lazy highlight update
+        (senator-lazy-highlight-update)
+      (working-message "Isearch semantic mode %s"
+                       (if senator-isearch-semantic-mode
+                           "enabled"
+                         "disabled")))))
+
+;; Needed by XEmacs isearch to not terminate isearch mode when
+;; toggling semantic search.
+(put 'senator-isearch-toggle-semantic-mode 'isearch-command t)
+
+;; Keyboard shortcut to toggle semantic search in isearch mode.
+(define-key isearch-mode-map
+  [(control ?,)]
+  'senator-isearch-toggle-semantic-mode)
+
+(defvar senator-old-isearch-search-fun nil
+  "Hold previous value of `isearch-search-fun-function'.")
+
+(defun senator-isearch-mode-hook ()
+  "Isearch mode hook to setup semantic searching."
+  (or senator-minor-mode
+      (setq senator-isearch-semantic-mode nil))
+  (when (boundp 'isearch-search-fun-function)
+    (if (and isearch-mode senator-isearch-semantic-mode)
+        (progn
+          ;; When `senator-isearch-semantic-mode' is on save the
+          ;; previous `isearch-search-fun-function' and install the
+          ;; senator one.
+          (when (and (local-variable-p 'isearch-search-fun-function)
+                     (not (local-variable-p 'senator-old-isearch-search-fun)))
+            (set (make-local-variable 'senator-old-isearch-search-fun)
+                 isearch-search-fun-function))
+          (set (make-local-variable 'isearch-search-fun-function)
+               'senator-isearch-search-fun))
+      ;; When `senator-isearch-semantic-mode' is off restore the
+      ;; previous `isearch-search-fun-function'.
+      (when (eq isearch-search-fun-function 'senator-isearch-search-fun)
+        (if (local-variable-p 'senator-old-isearch-search-fun)
+            (progn
+              (set (make-local-variable 'isearch-search-fun-function)
+                   senator-old-isearch-search-fun)
+              (kill-local-variable 'senator-old-isearch-search-fun))
+          (kill-local-variable 'isearch-search-fun-function)))))
+  (senator-mode-line-update))
+
+
+(add-hook 'isearch-mode-hook     'senator-isearch-mode-hook)
+(add-hook 'isearch-mode-end-hook 'senator-isearch-mode-hook)
+
+(provide 'senator)
+
+;;; senator.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/Makefile b/site/cedet-1.0pre7/semantic/symref/Makefile
new file mode 100644
index 0000000..e3ab0a5
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/Makefile
@@ -0,0 +1,55 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+symref_LISP=semantic-symref.el semantic-symref-global.el semantic-symref-grep.el semantic-symref-list.el semantic-symref-idutils.el semantic-symref-cscope.el semantic-symref-filter.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+LOADPATH= ../../srecode/ ../../speedbar/ ../../ede/ ../../common/ ../bovine/ ../ ../../eieio/
+ELISPPRELOAD= cedet-compat
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/symref
+
+
+
+all: symref
+
+.PHONY: symref
+symref: $(symref_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(symref_LISP) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/symref/Project.ede b/site/cedet-1.0pre7/semantic/symref/Project.ede
new file mode 100644
index 0000000..1ad2456
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/Project.ede
@@ -0,0 +1,16 @@
+;; Object Symref
+;; EDE project file.
+(ede-proj-project "Symref"
+  :name "Symref"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp "symref"
+    :name "symref"
+    :path ""
+    :source '("semantic-symref.el" "semantic-symref-global.el" "semantic-symref-grep.el" "semantic-symref-list.el" "semantic-symref-idutils.el" "semantic-symref-cscope.el" "semantic-symref-filter.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("eieio" "semantic" "semantic-el" "mode-local" "ede" "speedbar" "srecode")
+    :pre-load-packages '("cedet-compat")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-cscope.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-cscope.el
new file mode 100644
index 0000000..a8a1322
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-cscope.el
@@ -0,0 +1,85 @@
+;;; semantic-symref-cscope.el --- Semantic-symref support via cscope.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-symref-cscope.el,v 1.1 2009/02/27 04:53:50 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic symref support via cscope.
+
+(require 'cedet-cscope)
+(require 'semantic-symref)
+
+;;; Code:
+;;;###autoload
+(defclass semantic-symref-tool-cscope (semantic-symref-tool-baseclass)
+  (
+   )
+  "A symref tool implementation using CScope.
+The CScope command can be used to generate lists of tags in a way
+similar to that of `grep'.  This tool will parse the output to generate
+the hit list.
+
+See the function `cedet-cscope-search' for more details.")
+
+(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-cscope))
+  "Perform a search with GNU Global."
+  (let* ((rootproj (when (and (featurep 'ede) ede-minor-mode)
+		     (ede-toplevel)))
+	 (default-directory (if rootproj
+				(ede-project-root-directory rootproj)
+			      default-directory))
+	 ;; CScope has to be run from the project root where
+	 ;; cscope.out is.
+	 (b (cedet-cscope-search (oref tool :searchfor)
+				 (oref tool :searchtype)
+				 (oref tool :resulttype)
+				 (oref tool :searchscope)
+				 ))
+	)
+    (semantic-symref-parse-tool-output tool b)
+    ))
+
+(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-cscope))
+  "Parse one line of grep output, and return it as a match list.
+Moves cursor to end of the match."
+  (cond ((eq (oref tool :resulttype) 'file)
+	 ;; Search for files
+	 (when (re-search-forward "^\\([^\n]+\\)$" nil t)
+	   (match-string 1)))
+	((eq (oref tool :searchtype) 'tagcompletions)
+	 ;; Search for files
+	 (when (re-search-forward "^[^ ]+ [^ ]+ [^ ]+ \\(.*\\)$" nil t)
+	   (let ((subtxt (match-string 1))
+		 (searchtxt (oref tool :searchfor)))
+	     (if (string-match (concat "\\<" searchtxt "\\(\\w\\|\\s_\\)*\\>")
+			       subtxt)
+		 (match-string 0 subtxt)
+	       ;; We have to return something at this point.
+	       subtxt)))
+	 )
+	(t
+	 (when (re-search-forward "^\\([^ ]+\\) [^ ]+ \\([0-9]+\\) " nil t)
+	   (cons (string-to-number (match-string 2))
+		 (expand-file-name (match-string 1)))
+	   ))))
+
+(provide 'semantic-symref-cscope)
+;;; semantic-symref-cscope.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-filter.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-filter.el
new file mode 100644
index 0000000..c8c03a8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-filter.el
@@ -0,0 +1,157 @@
+;;; semantic-symref-filter.el --- Filter symbol reference hits for accuracy.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-symref-filter.el,v 1.5 2009/09/11 18:53:39 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Filter symbol reference hits for accuracy.
+;;
+;; Most symbol referencing tools, such as find/grep only find matching
+;; strings, but cannot determine the difference between an actual use,
+;; and something else with a similar name, or even a string in a comment.
+;;
+;; This file provides utilities for filtering down to accurate matches
+;; starting at a basic filter level that doesn't use symref, up to filters
+;; across symref results.
+
+(eval-when-compile
+  (require 'srecode-fields))
+
+;;; Code:
+
+;;; FILTERS
+;;
+(defun semantic-symref-filter-hit (target &optional position)
+  "Determine if the tag TARGET is used at POSITION in the current buffer.
+Return non-nil for a match."
+  (semantic-analyze-current-symbol
+   (lambda (start end prefix)
+     (let ((tag (car (nreverse prefix))))
+       (and (semantic-tag-p tag)
+	    (semantic-equivalent-tag-p target tag))))
+   position))
+
+;;; IN-BUFFER FILTERING
+;;
+;; The following does filtering in-buffer only, and not against
+;; a symref results object.
+;;
+;;;###autoload
+(defun semantic-symref-hits-in-region (target hookfcn start end)
+  "Find all occurances of the symbol TARGET that match TARGET the tag.
+For each match, call HOOKFCN.
+HOOKFCN takes three arguments that match
+`semantic-analyze-current-symbol's use of HOOKfCN.
+  ( START END PREFIX )
+
+Search occurs in the current buffer between START and END."
+  (save-excursion
+    (goto-char start)
+    (let* ((str (semantic-tag-name target))
+	   (case-fold-search semantic-case-fold)
+	   (regexp (concat "\\<" (regexp-quote str) "\\>")))
+      (while (re-search-forward regexp end t)
+	(when (semantic-idle-summary-useful-context-p)
+	  (semantic-analyze-current-symbol
+	   (lambda (start end prefix)
+	     (let ((tag (car (nreverse prefix))))
+	       ;; check for semantic match on the text match.
+	       (when (and (semantic-tag-p tag)
+			  (semantic-equivalent-tag-p target tag))
+		 (save-excursion
+		   (funcall hookfcn start end prefix)))))
+	   (point)))))))
+
+;;;###autoload
+(defun semantic-symref-test-count-hits-in-tag ()
+  "Lookup in the current tag the symbol under point.
+the count all the other references to the same symbol within the
+tag that contains point, and return that."
+  (interactive)
+  (let* ((ctxt (semantic-analyze-current-context))
+	 (target (car (reverse (oref ctxt prefix))))
+	 (tag (semantic-current-tag))
+	 (start (current-time))
+	 (Lcount 0))
+    (when (semantic-tag-p target)
+      (semantic-symref-hits-in-region
+       target (lambda (start end prefix) (setq Lcount (1+ Lcount)))
+       (semantic-tag-start tag)
+       (semantic-tag-end tag))
+      (when (interactive-p)
+	(message "Found %d occurances of %s in %.2f seconds"
+		 Lcount (semantic-tag-name target)
+		 (semantic-elapsed-time start (current-time))))
+      Lcount)))
+
+;;;###autoload
+(defun semantic-symref-rename-local-variable ()
+  "Fancy way to rename the local variable under point.
+Depends on the SRecode Field editing API."
+  (interactive)
+  ;; Do the replacement as needed.
+  (let* ((ctxt (semantic-analyze-current-context))
+	 (target (car (reverse (oref ctxt prefix))))
+	 (tag (semantic-current-tag))
+	 )
+
+    (when (or (not target)
+	      (not (semantic-tag-with-position-p target)))
+      (error "Cannot identify symbol under point"))
+
+    (when (not (semantic-tag-of-class-p target 'variable))
+      (error "Can only rename variables"))
+
+    (when (or (< (semantic-tag-start target) (semantic-tag-start tag))
+	      (> (semantic-tag-end target) (semantic-tag-end tag)))
+      (error "Can only rename variables declared in %s"
+	     (semantic-tag-name tag)))
+
+    ;; I think we're good for this example.  Give it a go through
+    ;; our fancy interface from SRecode.
+    (require 'srecode-fields)
+
+    ;; Make sure there is nothing active.
+    (let ((ar (srecode-active-template-region)))
+      (when ar (srecode-delete ar)))
+
+    (let ((srecode-field-archive nil)
+	  (region nil)
+	  )
+      (semantic-symref-hits-in-region
+       target (lambda (start end prefix)
+		;; For every valid hit, create one field.
+		(srecode-field "LOCAL" :name "LOCAL" :start start :end end))
+       (semantic-tag-start tag) (semantic-tag-end tag))
+
+      ;; Now that the fields are setup, create the region.
+      (setq region (srecode-template-inserted-region
+		    "REGION" :start (semantic-tag-start tag)
+		    :end (semantic-tag-end tag)))
+
+      ;; Activate the region.
+      (srecode-overlaid-activate region)
+
+      )
+    ))
+
+(provide 'semantic-symref-filter)
+;;; semantic-symref-filter.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-global.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-global.el
new file mode 100644
index 0000000..17b3eae
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-global.el
@@ -0,0 +1,68 @@
+;;; semantic-symref-global.el --- Use GNU Global for symbol references
+
+;; Copyright (C) 2008, 2009 Eric Ludlam
+
+;; Author: Eric Ludlam <eludlam@mathworks.com>
+;; X-RCS: $Id: semantic-symref-global.el,v 1.7 2009/02/27 05:00:20 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; GNU Global use with the semantic-symref system.
+
+(require 'cedet-global)
+(require 'semantic-symref)
+
+;;; Code:
+;;;###autoload
+(defclass semantic-symref-tool-global (semantic-symref-tool-baseclass)
+  (
+   )
+  "A symref tool implementation using GNU Global.
+The GNU Global command can be used to generate lists of tags in a way
+similar to that of `grep'.  This tool will parse the output to generate
+the hit list.
+
+See the function `cedet-gnu-global-search' for more details.")
+
+(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global))
+  "Perform a search with GNU Global."
+  (let ((b (cedet-gnu-global-search (oref tool :searchfor)
+				    (oref tool :searchtype)
+				    (oref tool :resulttype)
+				    (oref tool :searchscope)
+				    ))
+	)
+    (semantic-symref-parse-tool-output tool b)
+    ))
+
+(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global))
+  "Parse one line of grep output, and return it as a match list.
+Moves cursor to end of the match."
+  (cond ((or (eq (oref tool :resulttype) 'file)
+	     (eq (oref tool :searchtype) 'tagcompletions))
+	 ;; Search for files
+	 (when (re-search-forward "^\\([^\n]+\\)$" nil t)
+	   (match-string 1)))
+	(t
+	 (when (re-search-forward "^\\([^ ]+\\) +\\([0-9]+\\) \\([^ ]+\\) " nil t)
+	   (cons (string-to-number (match-string 2))
+		 (match-string 3))
+	   ))))
+
+(provide 'semantic-symref-global)
+;;; semantic-symref-global.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-grep.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-grep.el
new file mode 100644
index 0000000..5514e86
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-grep.el
@@ -0,0 +1,197 @@
+;;; semantic-symref-grep.el --- Symref implementation using find/grep
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-symref-grep.el,v 1.7 2009/06/24 23:13:40 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Implement the symref tool API using the external tools find/grep.
+;;
+;; The symref GREP tool uses grep in a project to find symbol references.
+;; This is a lowest-common-denominator tool with sucky performance that
+;; can be used in small projects to find symbol references.
+
+(require 'semantic-symref)
+(condition-case nil
+    (require 'grep)
+  (error nil))
+
+;;; Code:
+
+;;; GREP
+;;
+;;;###autoload
+(defclass semantic-symref-tool-grep (semantic-symref-tool-baseclass)
+  (
+   )
+  "A symref tool implementation using grep.
+This tool uses EDE to find he root of the project, then executes
+find-grep in the project.  The output is parsed for hits
+and those hits returned.")
+
+(eval-when-compile (require 'ede))
+
+(defvar semantic-symref-filepattern-alist
+  '((c-mode "*.[ch]")
+    (c++-mode "*.[chCH]" "*.[ch]pp" "*.cc" "*.hh")
+    (html-mode "*.s?html" "*.php")
+    )
+  "List of major modes and file extension pattern regexp.
+See find -regex man page for format.")
+
+(defun semantic-symref-derive-find-filepatterns (&optional mode)
+  "Derive a list of file patterns for the current buffer.
+Looks first in `semantic-symref-filepattern-alist'.  If it is not
+there, it then looks in `auto-mode-alist', and attempts to derive something
+from that.
+Optional argument MODE specifies the `major-mode' to test."
+  ;; First, try the filepattern alist.
+  (let* ((mode (or mode major-mode))
+	 (pat (cdr (assoc mode semantic-symref-filepattern-alist))))
+    (when (not pat)
+      ;; No hit, try auto-mode-alist.
+      (dolist (X auto-mode-alist)
+	(when (eq (cdr X) mode)
+	  ;; Only take in simple patterns, so try to convert this one.
+	  (let ((Xp
+		 (cond ((string-match "\\\\\\.\\([^\\'>]+\\)\\\\'" (car X))
+			(concat "*." (match-string 1 (car X))))
+		       (t nil))))
+	    (when Xp
+	      (setq pat (cons Xp pat))))
+	  )))
+    ;; Convert the list into some find-flags.
+    (cond ((= (length pat) 1)
+	   (concat "-name \"" (car pat) "\""))
+	  ((consp pat)
+	   (concat "\\( "
+		   (mapconcat (lambda (s)
+				(concat "-name \"" s "\""))
+			      pat
+			      " -o ")
+		   " \\)"))
+	  (t
+	   (error "Configuration for `semantic-symref-tool-grep' needed for %s" major-mode))
+	  )))
+
+(defvar semantic-symref-grep-expand-keywords
+  (condition-case nil
+      (let* ((kw (copy-alist grep-expand-keywords))
+	     (C (assoc "<C>" kw))
+	     (R (assoc "<R>" kw)))
+	(setcdr C 'grepflags)
+	(setcdr R 'greppattern)
+	kw)
+    (error nil))
+  "Grep expand keywords used when expanding templates for symref.")
+
+(defun semantic-symref-grep-use-template (rootdir filepattern grepflags greppattern)
+  "Use the grep template expand feature to create a grep command.
+ROOTDIR is the root location to run the `find' from.
+FILEPATTERN is a string represeting find flags for searching file patterns.
+GREPFLAGS are flags passed to grep, such as -n or -l.
+GREPPATTERN is the pattren used by grep."
+  ;; We have grep-compute-defaults.  Lets use it.
+  (grep-compute-defaults)
+  (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords)
+	 (cmd (grep-expand-template grep-find-template
+				    greppattern
+				    filepattern
+				    rootdir)))
+    ;; For some reason, my default has no <D> in it.
+    (when (string-match "find \\(\\.\\)" cmd)
+      (setq cmd (replace-match rootdir t t cmd 1)))
+    ;;(message "New command: %s" cmd)
+    cmd))
+
+(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-grep))
+  "Perform a search with Grep."
+  ;; Grep doesn't support some types of searches.
+  (let ((st (oref tool :searchtype)))
+    (when (not (eq st 'symbol))
+      (error "Symref impl GREP does not support searchtype of %s" st))
+    )
+  ;; Find the root of the project, and do a find-grep...
+  (let* (;; Find the file patterns to use.
+	 (pat (cdr (assoc major-mode semantic-symref-filepattern-alist)))
+	 (rootdir (cond 
+		   ;; Project root via EDE.
+		   ((eq (oref tool :searchscope) 'project)
+		    (let ((rootproj (when (and (featurep 'ede) ede-minor-mode)
+				      (ede-toplevel))))
+		      (if rootproj
+			  (ede-project-root-directory rootproj)
+			default-directory)))
+		   ;; Calculate the target files as just in
+		   ;; this directory... cause I'm lazy.
+		   ((eq (oref tool :searchscope) 'target)
+		    default-directory)
+		   ))
+	 (filepattern (semantic-symref-derive-find-filepatterns))
+	 ;; Grep based flags.
+	 (grepflags (cond ((eq (oref tool :resulttype) 'file)
+			  "-l ")
+			 (t "-n ")))
+	 (greppat (cond ((eq (oref tool :searchtype) 'regexp)
+			 (oref tool searchfor))
+			(t
+			 (concat "'\\<" (oref tool searchfor) "\\>'"))))
+	 ;; Misc
+	 (b (get-buffer-create "*Semantic SymRef*"))
+	 (ans nil)
+	 )
+    
+    (save-excursion
+      (set-buffer b)
+      (erase-buffer)
+      (setq default-directory rootdir)
+
+      (if (not (fboundp 'grep-compute-defaults))
+
+	  ;; find . -type f -print0 | xargs -0 -e grep -nH -e 
+	  ;; Note : I removed -e as it is not posix, nor necessary it seems.
+
+	  (let ((cmd (concat "find " default-directory " -type f " filepattern " -print0 "
+			     "| xargs -0 grep -H " grepflags "-e " greppat)))
+	    ;;(message "Old command: %s" cmd)
+	    (call-process "sh" nil b nil "-c" cmd)
+	    )
+	(let ((cmd (semantic-symref-grep-use-template rootdir filepattern grepflags greppat)))
+	  (call-process "sh" nil b nil "-c" cmd))
+	))
+    (setq ans (semantic-symref-parse-tool-output tool b))
+    ;; Return the answer
+    ans))
+
+(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-grep))
+  "Parse one line of grep output, and return it as a match list.
+Moves cursor to end of the match."
+  (cond ((eq (oref tool :resulttype) 'file)
+	 ;; Search for files
+	 (when (re-search-forward "^\\([^\n]+\\)$" nil t)
+	   (match-string 1)))
+	(t
+	 (when (re-search-forward  "^\\(\\(?:[a-zA-Z]:\\)?[^:\n]+\\):\\([0-9]+\\):" nil t)
+	   (cons (string-to-number (match-string 2))
+		 (match-string 1))
+	   ))))
+
+(provide 'semantic-symref-grep)
+;;; semantic-symref-grep.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-idutils.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-idutils.el
new file mode 100644
index 0000000..40dc821
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-idutils.el
@@ -0,0 +1,70 @@
+;;; semantic-symref-idutils.el --- Symref implementation for idutils
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-symref-idutils.el,v 1.2 2009/02/24 15:05:08 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Support IDUtils use in the Semantic Symref tool.
+
+(require 'cedet-idutils)
+(require 'semantic-symref)
+
+;;; Code:
+;;;###autoload
+(defclass semantic-symref-tool-idutils (semantic-symref-tool-baseclass)
+  (
+   )
+  "A symref tool implementation using ID Utils.
+The udutils command set can be used to generate lists of tags in a way
+similar to that of `grep'.  This tool will parse the output to generate
+the hit list.
+
+See the function `cedet-idutils-search' for more details.")
+
+(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-idutils))
+  "Perform a search with IDUtils."
+  (let ((b (cedet-idutils-search (oref tool :searchfor)
+				 (oref tool :searchtype)
+				 (oref tool :resulttype)
+				 (oref tool :searchscope)
+				 ))
+	)
+    (semantic-symref-parse-tool-output tool b)
+    ))
+
+(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-idutils))
+  "Parse one line of grep output, and return it as a match list.
+Moves cursor to end of the match."
+  (cond ((eq (oref tool :resulttype) 'file)
+	 ;; Search for files
+	 (when (re-search-forward "^\\([^\n]+\\)$" nil t)
+	   (match-string 1)))
+	((eq (oref tool :searchtype) 'tagcompletions)
+	 (when (re-search-forward "^\\([^ ]+\\) " nil t)
+	   (match-string 1)))
+	(t
+	 (when (re-search-forward "^\\([^ :]+\\):+\\([0-9]+\\):" nil t)
+	   (cons (string-to-number (match-string 2))
+		 (expand-file-name (match-string 1) default-directory))
+	   ))))
+
+(provide 'semantic-symref-idutils)
+;;; semantic-symref-idutils.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref-list.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref-list.el
new file mode 100644
index 0000000..4dd0bd8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref-list.el
@@ -0,0 +1,329 @@
+;;; semantic-symref-list.el --- Symref Output List UI.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: semantic-symref-list.el,v 1.8 2009/09/11 18:53:27 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Provide a simple user facing API to finding symbol references.
+;;
+;; This UI will is the base of some refactoring tools.  For any
+;; refactor, the user will execture `semantic-symref' in a tag.  Once
+;; that data is collected, the output will be listed in a buffer.  In
+;; the output buffer, the user can then initiate different refactoring
+;; operations.
+;;
+;; NOTE: Need to add some refactoring tools.
+
+(require 'semantic-symref)
+(require 'pulse)
+
+;;; Code:
+
+;;;###autoload
+(defun semantic-symref ()
+  "Find references to the current tag.
+This command uses the currently configured references tool within the
+current project to find references to the current tag. The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in`semantic-symref-results-mode'"
+  (interactive)
+  (semantic-fetch-tags)
+  (let ((ct (semantic-current-tag))
+	(res nil)
+	)
+    ;; Must have a tag...
+    (when (not ct) (error "Place cursor inside tag to be searched for"))
+    ;; Check w/ user.
+    (when (not (y-or-n-p (format "Find references for %s? " (semantic-tag-name ct))))
+      (error "Quit"))
+    ;; Gather results and tags
+    (message "Gathering References...")
+    (setq res (semantic-symref-find-references-by-name (semantic-tag-name ct)))
+    (semantic-symref-produce-list-on-results res (semantic-tag-name ct))))
+
+;;;###autoload
+(defun semantic-symref-symbol (sym)
+  "Find references to the symbol SYM.
+This command uses the currently configured references tool within the
+current project to find references to the input SYM.  The
+references are the organized by file and the name of the function
+they are used in.
+Display the references in`semantic-symref-results-mode'"
+  (interactive (list (car (senator-jump-interactive "Symrefs for: " nil nil t)))
+	       )
+  (semantic-fetch-tags)
+  (let ((res nil)
+	)
+    ;; Gather results and tags
+    (message "Gathering References...")
+    (setq res (semantic-symref-find-references-by-name sym))
+    (semantic-symref-produce-list-on-results res sym)))
+
+
+(defun semantic-symref-produce-list-on-results (res str)
+  "Produce a symref list mode buffer on the results RES."
+    (when (not res) (error "No references found"))
+    (semantic-symref-result-get-tags res t)
+    (message "Gathering References...done")
+    ;; Build a refrences buffer.
+    (let ((buff (get-buffer-create
+		 (format "*Symref %s" str)))
+	  )
+      (switch-to-buffer-other-window buff)
+      (set-buffer buff)
+      (semantic-symref-results-mode res))
+    )
+
+;;; RESULTS MODE
+;;
+(defgroup semantic-symref-results-mode nil
+  "Symref Results group."
+  :group 'semantic)
+
+(defvar semantic-symref-results-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-i" 'forward-button)
+    (define-key km "\M-C-i" 'backward-button)
+    (define-key km " " 'push-button)
+    (define-key km "-" 'semantic-symref-list-toggle-showing)
+    (define-key km "=" 'semantic-symref-list-toggle-showing)
+    (define-key km "+" 'semantic-symref-list-toggle-showing)
+    (define-key km "n" 'semantic-symref-list-next-line)
+    (define-key km "p" 'semantic-symref-list-prev-line)
+    (define-key km "q" 'semantic-symref-hide-buffer)
+    km)
+  "Keymap used in `semantic-symref-results-mode'.")
+
+(defcustom semantic-symref-results-mode-hook nil
+  "*Hook run when `semantic-symref-results-mode' starts."
+  :group 'semantic-symref
+  :type 'hook)
+
+(defvar semantic-symref-current-results nil
+  "The current results in a results mode buffer.")
+
+;;;###autoload
+(defun semantic-symref-results-mode (results)
+  "Major-mode for displaying Semantic Symbol Reference RESULTS.
+RESULTS is an object of class `semantic-symref-results'."
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'semantic-symref-results-mode
+        mode-name "Symref"
+	)
+  (use-local-map semantic-symref-results-mode-map)
+  (set (make-local-variable 'semantic-symref-current-results)
+       results)
+  (semantic-symref-results-dump results)
+  (goto-char (point-min))
+  (buffer-disable-undo)
+  (set (make-local-variable 'font-lock-global-modes) nil)
+  (font-lock-mode -1)
+  (run-hooks 'semantic-symref-results-mode-hook)
+  )
+
+(defun semantic-symref-hide-buffer ()
+  "Hide buffer with sematinc-symref results"
+  (interactive)
+  (bury-buffer))
+
+(defcustom semantic-symref-results-summary-function 'semantic-format-tag-prototype
+  "*Function to use when creating items in Imenu.
+Some useful functions are found in `semantic-format-tag-functions'."
+  :group 'semantic-symref
+  :type semantic-format-tag-custom-list)
+
+(defun semantic-symref-results-dump (results)
+  "Dump the RESULTS into the current buffer."
+  ;; Get ready for the insert.
+  (toggle-read-only -1)
+  (erase-buffer)
+
+  ;; Insert the contents.
+  (let ((lastfile nil)
+	)
+    (dolist (T (oref results :hit-tags))
+
+      (when (not (equal lastfile (semantic-tag-file-name T)))
+	(setq lastfile (semantic-tag-file-name T))
+	(insert-button lastfile
+		       'mouse-face 'custom-button-pressed-face
+		       'action 'semantic-symref-rb-goto-file
+		       'tag T
+		       )
+	(insert "\n"))
+
+      (insert "  ")
+      (insert-button "[+]"
+		     'mouse-face 'highlight
+		     'face nil
+		     'action 'semantic-symref-rb-toggle-expand-tag
+		     'tag T
+		     'state 'closed)
+      (insert " ")
+      (insert-button (funcall semantic-symref-results-summary-function
+			      T nil t)
+		     'mouse-face 'custom-button-pressed-face
+		     'face nil
+		     'action 'semantic-symref-rb-goto-tag
+		     'tag T)
+      (insert "\n")
+
+      ))
+
+  ;; Clean up the mess
+  (toggle-read-only 1)
+  (set-buffer-modified-p nil)
+  )
+
+;;; Commands for semantic-symref-results
+;;
+(defun semantic-symref-list-toggle-showing ()
+  "Toggle showing the contents below the current line."
+  (interactive)
+  (beginning-of-line)
+  (when (re-search-forward "\\[[-+]\\]" (point-at-eol) t)
+    (forward-char -1)
+    (push-button)))
+
+(defun semantic-symref-rb-toggle-expand-tag (&optional button)
+  "Go to the file specified in the symref results buffer.
+BUTTON is the button that was clicked."
+  (interactive)
+  (let* ((tag (button-get button 'tag))
+	 (buff (semantic-tag-buffer tag))
+	 (hits (semantic--tag-get-property tag :hit))
+	 (state (button-get button 'state))
+	 (text nil)
+	 )
+    (cond
+     ((eq state 'closed)
+      (toggle-read-only -1)
+      (save-excursion
+	(set-buffer buff)
+	(dolist (H hits)
+	  (goto-char (point-min))
+	  (forward-line (1- H))
+	  (beginning-of-line)
+	  (back-to-indentation)
+	  (setq text (cons (buffer-substring (point) (point-at-eol)) text)))
+	(setq text (nreverse text))
+	)
+      (goto-char (button-start button))
+      (forward-char 1)
+      (delete-char 1)
+      (insert "-")
+      (button-put button 'state 'open)
+      (save-excursion
+	(end-of-line)
+	(while text
+	(insert "\n")
+	  (insert "    ")
+	  (insert-button (car text)
+			 'mouse-face 'highlight
+			 'face nil
+			 'action 'semantic-symref-rb-goto-match
+			 'tag tag
+			 'line (car hits))
+	  (setq text (cdr text)
+		hits (cdr hits))))
+      (toggle-read-only 1)
+      )
+     ((eq state 'open)
+      (toggle-read-only -1)
+      (button-put button 'state 'closed)
+      ;; Delete the various bits.
+      (goto-char (button-start button))
+      (forward-char 1)
+      (delete-char 1)
+      (insert "+")
+      (save-excursion
+	(end-of-line)
+	(forward-char 1)
+	(delete-region (point)
+		       (save-excursion
+			 (forward-char 1)
+			 (forward-line (length hits))
+			 (point))))
+      (toggle-read-only 1)
+      )
+     ))
+  )
+
+(defun semantic-symref-rb-goto-file (&optional button)
+  "Go to the file specified in the symref results buffer.
+BUTTON is the button that was clicked."
+  (let* ((tag (button-get button 'tag))
+	 (buff (semantic-tag-buffer tag))
+	 (win (selected-window))
+	 )
+    (switch-to-buffer-other-window buff)
+    (pulse-momentary-highlight-one-line (point))
+    (when (eq last-command-char ? ) (select-window win))
+    ))
+
+
+(defun semantic-symref-rb-goto-tag (&optional button)
+  "Go to the file specified in the symref results buffer.
+BUTTON is the button that was clicked."
+  (interactive)
+  (let* ((tag (button-get button 'tag))
+	 (buff (semantic-tag-buffer tag))
+	 (win (selected-window))
+	 )
+    (switch-to-buffer-other-window buff)
+    (semantic-go-to-tag tag)
+    (pulse-momentary-highlight-one-line (point))
+    (when (eq last-command-char ? ) (select-window win))
+    )
+  )
+
+(defun semantic-symref-rb-goto-match (&optional button)
+  "Go to the file specified in the symref results buffer.
+BUTTON is the button that was clicked."
+  (interactive)
+  (let* ((tag (button-get button 'tag))
+	 (line (button-get button 'line))
+	 (buff (semantic-tag-buffer tag))
+	 (win (selected-window))
+	 )
+    (switch-to-buffer-other-window buff)
+    (goto-line line)
+    (pulse-momentary-highlight-one-line (point))
+    (when (eq last-command-char ? ) (select-window win))
+    )
+  )
+
+(defun semantic-symref-list-next-line ()
+  "Next line in `semantic-symref-results-mode'."
+  (interactive)
+  (forward-line 1)
+  (back-to-indentation))
+
+(defun semantic-symref-list-prev-line ()
+  "Next line in `semantic-symref-results-mode'."
+  (interactive)
+  (forward-line -1)
+  (back-to-indentation))
+
+(provide 'semantic-symref-list)
+;;; semantic-symref-list.el ends here
diff --git a/site/cedet-1.0pre7/semantic/symref/semantic-symref.el b/site/cedet-1.0pre7/semantic/symref/semantic-symref.el
new file mode 100644
index 0000000..2c2cb42
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/symref/semantic-symref.el
@@ -0,0 +1,490 @@
+;;; semantic-symref.el --- Symbol Reference API
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic Symbol Reference API.
+;;
+;; Semantic's native parsing tools do not handle symbol references.
+;; Tracking such information is a task that requires a huge amount of
+;; space and processing not apropriate for an Emacs Lisp program.
+;;
+;; Many desired tools used in refactoring, however, need to have
+;; such references available to them.  This API aims to provide a
+;; range of functions that can be used to identify references.  The
+;; API is backed by an OO system that is used to allow multiple
+;; external tools to provide the information.
+;;
+;; The default implementation uses a find/grep combination to do a
+;; search.  This works ok in small projects.  For larger projects, it
+;; is important to find an alternate tool to use as a back-end to
+;; symref.
+;;
+;; See the command: `semantic-symref' for an example app using this api.
+;;
+;; TO USE THIS TOOL
+;;
+;; The following functions can be used to find different kinds of
+;; references.
+;;
+;;  `semantic-symref-find-references-by-name'
+;;  `semantic-symref-find-file-references-by-name'
+;;  `semantic-symref-find-text'
+;;
+;; All the search routines return a class of type
+;; `semantic-symref-result'.  You can reference the various slots, but
+;; you will need the following methods to get extended information.
+;;
+;;  `semantic-symref-result-get-files'
+;;  `semantic-symref-result-get-tags'
+;;
+;; ADD A NEW EXTERNAL TOOL
+;;
+;; To support a new external tool, sublcass `semantic-symref-tool-baseclass'
+;; and implement the methods.  The baseclass provides support for
+;; managing external processes that produce parsable output.
+;;
+;; Your tool should then create an instance of `semantic-symref-result'.
+
+(require 'semantic-fw)
+(require 'ede)
+(eval-when-compile (require 'data-debug)
+		   (require 'eieio-datadebug))
+
+;;; Code:
+(defvar semantic-symref-tool 'detect
+  "*The active symbol reference tool name.
+The tool symbol can be 'detect, or a symbol that is the name of
+a tool that can be used for symbol referencing.")
+(make-variable-buffer-local 'semantic-symref-tool)
+
+;;; TOOL SETUP
+;;
+(defvar semantic-symref-tool-alist
+  '( ( (lambda (rootdir) (file-exists-p (expand-file-name "GPATH" rootdir))) .
+       global)
+     ( (lambda (rootdir) (file-exists-p (expand-file-name "ID" rootdir))) .
+       idutils)
+     ( (lambda (rootdir) (file-exists-p (expand-file-name "cscope.out" rootdir))) .
+       cscope )
+    )
+  "Alist of tools usable by `semantic-symref'.
+Each entry is of the form:
+   ( PREDICATE . KEY )
+Where PREDICATE is a function that takes a directory name for the
+root of a project, and returns non-nil if the tool represented by KEY
+is supported.
+
+If no tools are supported, then 'grep is assumed.")
+
+(defun semantic-symref-detect-symref-tool ()
+  "Detect the symref tool to use for the current buffer."
+  (if (not (eq semantic-symref-tool 'detect))
+      semantic-symref-tool
+    ;; We are to perform a detection for the right tool to use.
+    (let* ((rootproj (when (and (featurep 'ede) ede-minor-mode)
+		       (ede-toplevel)))
+	   (rootdir (if rootproj
+			(ede-project-root-directory rootproj)
+		      default-directory))
+	   (tools semantic-symref-tool-alist))
+      (while (and tools (eq semantic-symref-tool 'detect))
+	(when (funcall (car (car tools)) rootdir)
+	  (setq semantic-symref-tool (cdr (car tools))))
+	(setq tools (cdr tools)))
+
+      (when (eq semantic-symref-tool 'detect)
+	(setq semantic-symref-tool 'grep))
+
+      semantic-symref-tool)))
+
+(defun semantic-symref-instantiate (&rest args)
+  "Instantiate a new symref search object.
+ARGS are the initialization arguments to pass to the created class."
+  (let* ((srt (symbol-name (semantic-symref-detect-symref-tool)))
+	 (class (intern-soft (concat "semantic-symref-tool-" srt)))
+	 (inst nil)
+	 )
+    (when (not (class-p class))
+      (error "Unknown symref tool %s" semantic-symref-tool))
+    (setq inst (apply 'make-instance class args))
+    inst))
+
+(defvar semantic-symref-last-result nil
+  "The last calculated symref result.")
+
+(defun semantic-symref-data-debug-last-result ()
+  "Run the last symref data result in Data Debug."
+  (interactive)
+  (if semantic-symref-last-result
+      (progn
+	(data-debug-new-buffer "*Symbol Reference ADEBUG*")
+	(data-debug-insert-object-slots semantic-symref-last-result "]"))
+    (message "Empty results.")))
+
+;;; EXTERNAL API
+;;
+
+;;;###autoload
+(defun semantic-symref-find-references-by-name (name &optional scope tool-return)
+  "Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'.
+TOOL-RETURN is an optional symbol, which will be assigned the tool used
+to perform the search.  This was added for use by a test harness."
+  (interactive "sName: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor name
+		:searchtype 'symbol
+		:searchscope (or scope 'project)
+		:resulttype 'line))
+	 (result (semantic-symref-get-result inst)))
+    (when tool-return
+      (set tool-return inst))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;;###autoload
+(defun semantic-symref-find-tags-by-name (name &optional scope)
+  "Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'."
+  (interactive "sName: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor name
+		:searchtype 'tagname
+		:searchscope (or scope 'project)
+		:resulttype 'line))
+	 (result (semantic-symref-get-result inst)))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;;###autoload
+(defun semantic-symref-find-tags-by-regexp (name &optional scope)
+  "Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'."
+  (interactive "sName: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor name
+		:searchtype 'tagregexp
+		:searchscope (or scope 'project)
+		:resulttype 'line))
+	 (result (semantic-symref-get-result inst)))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;;###autoload
+(defun semantic-symref-find-tags-by-completion (name &optional scope)
+  "Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'."
+  (interactive "sName: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor name
+		:searchtype 'tagcompletions
+		:searchscope (or scope 'project)
+		:resulttype 'line))
+	 (result (semantic-symref-get-result inst)))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;;###autoload
+(defun semantic-symref-find-file-references-by-name (name &optional scope)
+  "Find a list of references to NAME in the current project.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'."
+  (interactive "sName: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor name
+		:searchtype 'regexp
+		:searchscope (or scope 'project)
+		:resulttype 'file))
+	 (result (semantic-symref-get-result inst)))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;;###autoload
+(defun semantic-symref-find-text (text &optional scope)
+  "Find a list of occurances of TEXT in the current project.
+TEXT is a regexp formatted for use with egrep.
+Optional SCOPE specifies which file set to search.  Defaults to 'project.
+Refers to `semantic-symref-tool', to determine the reference tool to use
+for the current buffer.
+Returns an object of class `semantic-symref-result'."
+  (interactive "sEgrep style Regexp: ")
+  (let* ((inst (semantic-symref-instantiate
+		:searchfor text
+		:searchtype 'regexp
+		:searchscope (or scope 'project)
+		:resulttype 'line))
+	 (result (semantic-symref-get-result inst)))
+    (prog1
+	(setq semantic-symref-last-result result)
+      (when (interactive-p)
+	(semantic-symref-data-debug-last-result))))
+  )
+
+;;; RESULTS
+;;
+;; The results class and methods provide features for accessing hits.
+(defclass semantic-symref-result ()
+  ((created-by :initarg :created-by
+	       :type semantic-symref-tool-baseclass
+	       :documentation
+	       "Back-pointer to the symref tool creating these results.")
+   (hit-files :initarg :hit-files
+	      :type list
+	      :documentation
+	      "The list of files hit.")
+   (hit-text :initarg :hit-text
+	     :type list
+	     :documentation
+	     "If the result doesn't provide full lines, then fill in hit-text.
+GNU Global does completion search this way.")
+   (hit-lines :initarg :hit-lines
+	      :type list
+	      :documentation
+	      "The list of line hits.
+Each element is a cons cell of the form (LINE . FILENAME).")
+   (hit-tags :initarg :hit-tags
+	     :type list
+	     :documentation
+	     "The list of tags with hits in them.
+Use the  `semantic-symref-hit-tags' method to get this list.")
+   )
+  "The results from a symbol reference search.")
+
+(defmethod semantic-symref-result-get-files ((result semantic-symref-result))
+  "Get the list of files from the symref result RESULT."
+  (if (slot-boundp result :hit-files)
+      (oref result hit-files)
+    (let* ((lines  (oref result :hit-lines))
+	   (files (mapcar (lambda (a) (cdr a)) lines))
+	   (ans nil))
+      (setq ans (list (car files))
+	    files (cdr files))
+      (dolist (F files)
+	;; This algorithm for uniqing the file list depends on the
+	;; tool in question providing all the hits in the same file
+	;; grouped together.
+	(when (not (string= F (car ans)))
+	  (setq ans (cons F ans))))
+      (oset result hit-files (nreverse ans))
+      )
+    ))
+
+(defmethod semantic-symref-result-get-tags ((result semantic-symref-result)
+					    &optional open-buffers)
+  "Get the list of tags from the symref result RESULT.
+Optional OPEN-BUFFERS indicates that the buffers that the hits are
+in should remain open after scanning.
+Note: This can be quite slow if most of the hits are not in buffers
+already."
+  (if (and (slot-boundp result :hit-tags) (oref result hit-tags))
+      (oref result hit-tags)
+    ;; Calculate the tags.
+    (let ((lines (oref result :hit-lines))
+	  (txt (oref (oref result :created-by) :searchfor))
+	  (searchtype (oref (oref result :created-by) :searchtype))
+	  (ans nil)
+	  (out nil)
+	  (buffs-to-kill nil))
+      (save-excursion
+	(setq
+	 ans
+	 (mapcar
+	  (lambda (hit)
+	    (let* ((line (car hit))
+		   (file (cdr hit))
+		   (buff (get-file-buffer file))
+		   (tag nil)
+		   )
+	      (cond
+	       ;; We have a buffer already.  Check it out.
+	       (buff
+		(set-buffer buff))
+
+	       ;; We have a table, but it needs a refresh.
+	       ;; This means we should load in that buffer.
+	       (t
+		(let ((kbuff
+		       (if open-buffers
+			   ;; Even if we keep the buffers open, don't
+			   ;; let EDE ask lots of questions.
+			   (let ((ede-auto-add-method 'never))
+			     (find-file-noselect file t))
+			 ;; When not keeping the buffers open, then
+			 ;; don't setup all the fancy froo-froo features
+			 ;; either.
+			 (semantic-find-file-noselect file t))))
+		  (set-buffer kbuff)
+		  (setq buffs-to-kill (cons kbuff buffs-to-kill))
+		  (semantic-fetch-tags)
+		  ))
+	       )
+
+	      ;; Too much baggage in goto-line
+	      ;; (goto-line line)
+	      (goto-char (point-min))
+	      (forward-line (1- line))
+
+	      ;; Search forward for the matching text
+	      (re-search-forward (regexp-quote txt)
+				 (point-at-eol)
+				 t)
+
+	      (setq tag (semantic-current-tag))
+
+	      ;; If we are searching for a tag, but bound the tag we are looking
+	      ;; for, see if it resides in some other parent tag.
+	      ;;
+	      ;; If there is no parent tag, then we still need to hang the originator
+	      ;; in our list.
+	      (when (and (eq searchtype 'symbol)
+			 (string= (semantic-tag-name tag) txt))
+		(setq tag (or (semantic-current-tag-parent) tag)))
+
+	      ;; Copy the tag, which adds a :filename property.
+	      (when tag
+		(setq tag (semantic-tag-copy tag nil t))
+		;; Ad this hit to the tag.
+		(semantic--tag-put-property tag :hit (list line)))
+	      tag))
+	  lines)))
+      ;; Kill off dead buffers, unless we were requested to leave them open.
+      (when (not open-buffers)
+	(mapc 'kill-buffer buffs-to-kill))
+      ;; Strip out duplicates.
+      (dolist (T ans)
+	(if (and T (not (semantic-equivalent-tag-p (car out) T)))
+	    (setq out (cons T out))
+	  (when T
+	    ;; Else, add this line into the existing list of lines.
+	    (let ((lines (append (semantic--tag-get-property (car out) :hit)
+				 (semantic--tag-get-property T :hit))))
+	      (semantic--tag-put-property (car out) :hit lines)))
+	  ))
+      ;; Out is reversed... twice
+      (oset result :hit-tags (nreverse out)))))
+
+;;; SYMREF TOOLS
+;;
+;; The base symref tool provides something to hang new tools off of
+;; for finding symbol references.
+(defclass semantic-symref-tool-baseclass ()
+  ((searchfor :initarg :searchfor
+	      :type string
+	      :documentation "The thing to search for.")
+   (searchtype :initarg :searchtype
+		:type symbol
+		:documentation "The type of search to do.
+Values could be `symbol, `regexp, 'tagname, or 'completion.")
+   (searchscope :initarg :searchscope
+		:type symbol
+		:documentation
+		"The scope to search for.
+Can be 'project, 'target, or 'file.")
+   (resulttype :initarg :resulttype
+	       :type symbol
+	       :documentation
+	       "The kind of search results desired.
+Can be 'line, 'file, or 'tag.
+The type of result can be converted from 'line to 'file, or 'line to 'tag,
+but not from 'file to 'line or 'tag.")
+   )
+  "Baseclass for all symbol references tools.
+A symbol reference tool supplies functionality to identify the locations of
+where different symbols are used.
+
+Subclasses should be named `semantic-symref-tool-NAME', where
+NAME is the name of the tool used in the configuration variable
+`semantic-symref-tool'"
+  :abstract t)
+
+(defmethod semantic-symref-get-result ((tool semantic-symref-tool-baseclass))
+  "Calculate the results of a search based on TOOL.
+The symref TOOL should already contain the search criteria."
+  (let ((answer (semantic-symref-perform-search tool))
+	)
+    (when answer
+      (let ((answersym (if (eq (oref tool :resulttype) 'file)
+			   :hit-files
+			 (if (stringp (car answer))
+			     :hit-text
+			   :hit-lines))))
+	(semantic-symref-result (oref tool searchfor)
+				answersym
+				answer
+				:created-by tool))
+      )
+    ))
+
+(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-baseclass))
+  "Base search for symref tools should throw an error."
+  (error "Symref tool objects must implement `semantic-symref-perform-search'"))
+
+(defmethod semantic-symref-parse-tool-output ((tool semantic-symref-tool-baseclass)
+					      outputbuffer)
+  "Parse the entire OUTPUTBUFFER of a symref tool.
+Calls the method `semantic-symref-parse-tool-output-one-line' over and
+over until it returns nil."
+  (save-excursion
+    (set-buffer outputbuffer)
+    (goto-char (point-min))
+    (let ((result nil)
+	  (hit nil))
+      (while (setq hit (semantic-symref-parse-tool-output-one-line tool))
+	(setq result (cons hit result)))
+      (nreverse result)))
+  )
+
+(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-baseclass))
+  "Base tool output parser is not implemented."
+  (error "Symref tool objects must implement `semantic-symref-parse-tool-output-one-line'"))
+
+(provide 'semantic-symref)
+;;; semantic-symref.el ends here
diff --git a/site/cedet-1.0pre7/semantic/tests/Makefile b/site/cedet-1.0pre7/semantic/tests/Makefile
new file mode 100644
index 0000000..e783405
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/Makefile
@@ -0,0 +1,38 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+Tests_MISC=test.c test.cpp templates.cpp test.make scopetest.cpp scopetest.java testdoublens.cpp testdoublens.hpp testsubclass.cpp testsubclass.hh testspp.c testsppreplace.c testsppreplaced.c testtypedefs.cpp testfriends.cpp testusing.hh testusing.cpp testtemplates.cpp testjavacomp.java testsppcomplete.c teststruct.cpp testvarnames.c testnsp.cpp testsppcond.cpp
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/tests
+
+
+
+all: Tests
+
+Tests: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(Tests_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/tests/Project.ede b/site/cedet-1.0pre7/semantic/tests/Project.ede
new file mode 100644
index 0000000..f9c9ab8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/Project.ede
@@ -0,0 +1,13 @@
+;; Object semantic/tests
+;; EDE project file.
+(ede-proj-project "semantic/tests"
+  :name "Tests"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "Tests"
+    :name "Tests"
+    :path ""
+    :source '("test.c" "test.cpp" "templates.cpp" "test.make" "scopetest.cpp" "scopetest.java" "testdoublens.cpp" "testdoublens.hpp" "testsubclass.cpp" "testsubclass.hh" "testspp.c" "testsppreplace.c" "testsppreplaced.c" "testtypedefs.cpp" "testfriends.cpp" "testusing.hh" "testusing.cpp" "testtemplates.cpp" "testjavacomp.java" "testsppcomplete.c" "teststruct.cpp" "testvarnames.c" "testnsp.cpp" "testsppcond.cpp")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/semantic/tests/scopetest.cpp b/site/cedet-1.0pre7/semantic/tests/scopetest.cpp
new file mode 100644
index 0000000..e84dd0d
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/scopetest.cpp
@@ -0,0 +1,47 @@
+/* Test scoping rules for c++ in the analyzer. */
+
+namespace {
+
+  class aclass2;  // Forward reference.
+
+  class aclass1 {
+  private:
+    int attrp1;
+    int amethodp1(int argp1);
+    aclass2 areference;
+  protected:
+    int attrpr1;
+  public:
+    int attr1;
+    int amethod1(int arg1);
+  };
+}
+
+namespace {
+  class aclass2 : public aclass1
+  {
+  private:
+    int attrp2;
+    int amethodp2(int argp1);
+  public:
+    aclass2(int aninitvalue);
+    ~aclass2();
+    int attr2;
+    int amethod2(int arg2);
+  };
+}
+
+aclass2::aclass2(init aninitvalue)
+{
+  /* This is a comment that talks about aclass1 */
+  aclass1;
+}
+
+int aclass2::amethod2(int arg2)
+{
+  int alocalvar;
+  float q;
+
+  ac;
+}
+
diff --git a/site/cedet-1.0pre7/semantic/tests/scopetest.java b/site/cedet-1.0pre7/semantic/tests/scopetest.java
new file mode 100644
index 0000000..0182589
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/scopetest.java
@@ -0,0 +1,25 @@
+class Foo {
+
+   public void a1() {}
+
+   class Bar {
+
+     public int a2() {}
+
+     public void b() {
+	 a   // -1-
+     }
+
+     class Baz {
+
+       public int a3() {}
+
+       public Baz(int a4) {
+	   a  // -2-
+       }
+
+     }
+
+   }
+
+}
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/semantic/tests/templates.cpp b/site/cedet-1.0pre7/semantic/tests/templates.cpp
new file mode 100644
index 0000000..5ddee82
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/templates.cpp
@@ -0,0 +1,129 @@
+// C++ examples and requests from Klaus Berndl
+
+// template in a unnamed namespace
+namespace
+{
+  template<typename Target, typename Source>
+  Target lexical_cast(Source arg)
+  {
+    std::stringstream interpreter;
+    Target result;
+
+    if(!(interpreter << arg) || !(interpreter >> result) ||
+       !(interpreter >> std::ws).eof())
+      throw bad_lexical_cast();
+    
+    return result;
+  }
+}
+
+
+template <class T, FOO> class Vector
+{
+private:
+  static T* v;
+  int sz;
+
+public:
+  T& elem(int i) {return v[i];}
+  virtual ~Vector ();
+
+protected:
+  Vector ();
+};
+
+template <> class Vector <void*>
+{
+private:
+  void** v;
+  int sz;
+
+public:
+  Vector ();
+  virtual int func1(int i);
+  virtual int func2(int i) = 0;
+  static virtual int func3(int i) = 0;
+  void*& elem(int i) {return v[i];}
+  //...
+};
+
+// template contains namespace
+typedef vector<CzkUtilities::Action*> ActionList;
+
+// declaration of some template-types
+map<XXX, Test::YYY>** map_var;
+
+map_with_size<XXX, Test::YYY, size> map_size_var;
+typedef map_with_size<XXX, Test::YYY, size> SizedMap;
+
+map_with_10_size<XXX, Test::YYY, 10>* pMap_size10_var;
+typedef map_with_10_size<XXX, Test::YYY, 10> Size10Map;
+
+// a function which such a template-argument
+void* test_function(map<ClassX, Test::ClassY, 10>* pMap);
+
+
+template <class T> class Vector <T*> : private Vector <void*>
+{
+public:
+	typedef Vector <void*> Base;
+
+	Vector () : Base() {}
+
+	T*& elem(int i) {return static_cast<T*&>(Base::elem(i));}
+	//...
+};
+
+// outside method implementation of a template-class
+template<class T> T& Vector<T*>::elem(int i)
+{
+  return C;
+}
+
+// same but qualified with a namespace Testnamespace
+template<class T> T& Testnamespace::Vector<T*>::elem(int i)
+{
+  return C;
+}
+
+// function templates with keyword typename
+template<typename Target, typename Source>
+Target lexical_cast(Source arg)
+{
+  std::stringstream interpreter;
+  Target result;
+
+  if(!(interpreter << arg) || !(interpreter >> result) ||
+     !(interpreter >> std::ws).eof())
+    throw bad_lexical_cast();
+    
+  return result;
+}
+
+template<class T>
+static
+typename T::_ptr_type
+getService(const std::string& pServiceName, const int pRetries=20)
+{
+  return T::_narrow(getServiceObject(pServiceName, pRetries));
+}
+
+// function template declaration
+template<class T> void sort(vector<T>&);
+// complex function template definition
+template<class T, class S, const NamespaceY::ClassX<TestClass, &s> volatile ***&i>
+map<ClassY, ClassX, 10>
+sort(const vector<T>& v)
+{
+  return;
+}
+
+// variable declarations of template-types
+foo<TClass, Testnamespace::XClass, i> *bar1;
+foo<TClass, Testnamespace::XClass, **&i> *bar2;
+foo<TClass, Testnamespace::XClass, *Namespace::ClassX::i> bar3;
+foo<0> bar0;
+
+class SomeName;
+class OtherName;
+
diff --git a/site/cedet-1.0pre7/semantic/tests/test.c b/site/cedet-1.0pre7/semantic/tests/test.c
new file mode 100644
index 0000000..e81d79a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/test.c
@@ -0,0 +1,222 @@
+/* Test file for C language.
+ * Attempt to include as many aspects of the C language as possible.
+ *
+ * $Id: test.c,v 1.12 2008/05/17 20:16:03 zappo Exp $
+ *
+ */
+/* types of include files */
+#include "includeme1.h"
+#include <includeme2.h>
+#include <subdir/includeme3.h>
+#include <includeme.notanhfile>
+#include <stdlib.h>
+#include <cmath>
+
+#if 0
+int dont_show_function()
+{
+}
+#endif
+
+/* Global types */
+struct mystruct1 {
+  int slot11;
+  char slot12;
+  float slot13;
+};
+
+struct mystruct2 {
+  int slot21;
+  char slot22;
+  float slot23;
+} var_of_type_mystruct2;
+
+struct {
+  int slot31;
+  char slot32;
+  float slot33;
+} var_of_anonymous_struct;  
+
+typedef struct mystruct1 typedef_of_mystruct1;
+typedef struct mystruct1 *typedef_of_pointer_mystruct1;
+typedef struct { int slot_a; } typedef_of_anonymous_struct;
+typedef struct A {
+} B;
+
+typedef struct mystruct1 td1, td2;
+
+union myunion1 {
+  int slot41;
+  char slot42;
+  float slot43;
+};
+
+union myunion2 {
+  int slot51;
+  char slot52;
+  float slot53;
+} var_of_type_myunion2;
+
+struct {
+  int slot61;
+  char slot72;
+  float slot83;
+} var_of_anonymous_union;  
+
+typedef union myunion1 typedef_of_myunion1;
+typedef union myunion1 *typedef_of_pointer_myunion1;
+typedef union { int slot_a; } typedef_of_anonymous_union;
+
+enum myenum1 { enum11 = 1, enum12 };
+enum myenum2 { enum21, enum22 = 2 } var_of_type_myenum2;
+enum { enum31, enum32 } var_of_anonymous_enum;
+
+typedef enum myenum1 typedef_of_myenum1;
+typedef enum myenum1 *typedef_of_pointer_myenum1;
+typedef enum { enum_a = 3, enum_b } typedef_of_anonymous_enum;
+
+typedef int typedef_of_int;
+
+/* Here are some simpler variable types */
+int var1;
+int varbit1:1;
+char var2;
+float var3;
+mystruct1 var3;
+struct mystruct1 var4;
+union myunion1 var5;
+enum myenum1 var6;
+
+char *varp1;
+char **varp2;
+char varv1[1];
+char varv2[1][2];
+
+char *varpa1 = "moose";
+struct mystruct2 vara2 = { 1, 'a', 0.0 };
+enum myenum1 vara3 = enum11;
+int vara4 = (int)0.0;
+int vara5 = funcall();
+
+int mvar1, mvar2, mvar3;
+char *mvarp1, *mvarp2, *mvarp3;
+char *mvarpa1 = 'a', *mvarpa2 = 'b', *mvarpa3 = 'c';
+char mvaras1[10], mvaras2[12][13], *mvaras3 = 'd';
+
+static register const unsigned int tmvar1;
+
+#define MACRO1 1
+#define MACRO2(foo) (1+foo)
+
+/* Here are some function prototypes */
+
+/* This is legal, but I decided not to support inferred integer
+ * types on functions and variables.
+ */
+fun0();
+int funp1();
+char funp2(int arg11);
+float funp3(char arg21, char arg22);
+struct mystrct1 funp4(struct mystruct2 arg31, union myunion2 arg32);
+enum myenum1 funp5(char *arg41, union myunion1 *arg42);
+
+char funpp1 __P(char argp1, struct mystruct2 argp2, char *arg4p);
+
+int fun1();
+
+/* Here is a function pointer */
+int (*funcptr)(int a, int b);
+
+/* Function Definitions */
+
+/* This is legal, but I decided not to support inferred integer
+ * types on functions and variables.
+ */
+fun0()
+{
+  int sv = 0;
+}
+
+int fun1 ()
+{
+  int sv = 1;
+}
+
+int fun1p1 (void)
+{
+  int sv = 1;
+}
+
+char fun2(int arg_11)
+{
+  char sv = 2;
+}
+
+float fun3(char arg_21, char arg_22)
+{
+  char sv = 3;
+}
+
+struct mystrct1 fun4(struct mystruct2 arg31, union myunion2 arg32)
+{
+  sv = 4;
+}
+
+enum myenum1 fun5(char *arg41, union myunion1 *arg42)
+{
+  sv = 5;
+}
+
+/* Functions with K&R syntax. */
+struct mystrct1 funk1(arg_31, arg_32)
+     struct mystruct2 arg_31;
+     union myunion2 arg32;
+{
+  sv = 4;
+}
+
+enum myenum1 *funk2(arg_41, arg_42)
+     char *arg_41;
+     union myunion1 *arg_42;
+{
+  sv = 5;
+
+  if(foo) {
+  }
+}
+
+int funk3(arg_51, arg_53)
+     int arg_51;
+     char arg_53;
+{
+  char q = 'a';
+  int sv = 6;
+  td1 ms1;
+  enum myenum1 testconst;
+
+  /* Function argument analysis */
+  funk3(ms1.slot11, arg_53 );
+  sv = 7;
+
+  /* Slot deref on assignee */
+  ms1.slot11 = s;
+
+  /* Enum/const completion */
+  testconst = e;
+
+  /* Bad var/slot and param */
+  blah.notafunction(moose);
+
+  /* Print something. */
+  printf("Moose", );
+
+  tan();
+}
+
+int funk4_fixme(arg_61, arg_62)
+     int arg_61, arg_62;
+{
+  
+}
+
+/* End of C tests */
diff --git a/site/cedet-1.0pre7/semantic/tests/test.cpp b/site/cedet-1.0pre7/semantic/tests/test.cpp
new file mode 100644
index 0000000..3bc1f39
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/test.cpp
@@ -0,0 +1,593 @@
+/* Test file for C++ language.
+ * Attempt to include as many aspects of the C++ language as possible.
+ * Do not include things tested in test.c since that shares the
+ * same language.
+ *
+ * $Id: test.cpp,v 1.22 2008/05/17 20:12:55 zappo Exp $
+ *
+ */
+
+/* An include test */
+#include <stdio.h>
+
+#include <cmath>
+
+#include "c++-test.hh"
+
+#include <c++-test.hh>
+
+double var1 = 1.2;
+
+int simple1(int a) {
+
+}
+
+struct foo1 {
+  int test;
+};
+
+struct foo2 : public foo1 {
+  const int foo21(int a, int b);
+  const int foo22(int a, int b) { return 1 }
+};
+
+/* Classes */
+class class1 {
+private:
+  int var11;
+  struct foo1 var12;
+public:
+  int p_var11;
+  struct foo p_var12;
+};
+
+class i_class1 : public class1 {
+private:
+  int var11;
+  struct foo var12;
+public:
+  int p_var11;
+  struct foo p_var12;
+};
+
+class class2 {
+private:
+  int var21;
+  struct foo var22;
+public:
+  int p_var21;
+  struct foo p_var22;
+};
+
+class i_class2 : public class1, public class2 {
+private:
+  int var21;
+  struct foo var22;
+protected:
+  int pt_var21;
+public:
+  int p_var21;
+  struct foo p_var22;
+};
+
+class class3 {
+  /* A class with strange things in it */
+public:
+  class3(); /* A constructor */
+  enum embedded_foo_enum {
+    a, b, c
+  } embed1;
+  struct embedded_bar_struct {
+    int a;
+    int b;
+  } embed2;
+  class embedded_baz_class {
+    embedded_baz_class();
+    ~embedded_baz_class();
+  } embed3;
+  ~class3(); /* destructor */
+  
+  /* Methods */
+  int method_for_class3(int a, char b);
+
+  int inline_method(int c) { return c; }
+
+  /* Operators */
+  class3& operator^= (const class3& something);
+
+  /* Funny declmods */
+  const class3 * const method_const_ptr_ptr(const int * const argconst) const = 0;
+};
+
+class3::class3()
+{
+  /* Constructor outside the definition. */
+}
+
+int class3::method_for_class3(int a, char b)
+{
+}
+
+int class3::method1_for_class3( int a, int &b)
+{
+  int cvariablename;
+  class3 fooy[];
+  class3 moose = new class3;
+
+  // Complktion testing line should find external members.
+  a = fooy[1].me ;
+  b = cv ;
+
+  if (fooy.emb) {
+    simple1(c);
+  }
+
+  cos(10);
+  abs(10);
+
+  return 1;
+}
+
+char class3::method2_for_class3( int a, int b) throw ( exception1 )
+{
+  return 'a';
+}
+
+void *class3::method3_for_class3( int a, int b) throw ( exception1, exception2 )
+{
+  int q = a;
+  return "Moose";
+}
+
+void *class3::method31_for_class3( int a, int b) throw ( )
+{
+  int q = a;
+  return "Moose";
+}
+
+void *class3::method4_for_class3( int a, int b) reentrant
+{
+  class3 ct;
+
+  ct.method5_for_class3(1,a);
+
+  pritf();
+}
+
+/*
+ * A method on class3.
+ */
+void *class3::method5_for_class3( int a, int b) const
+{
+}
+
+/*
+ * Namespace parsing tests
+ */
+namespace NS {
+  class class_in_namespace {
+    int equiv(const NS::class_in_namespace *) const;
+  };
+}
+
+int NS::class_in_namespace::equiv(const NS::class_in_namespace *cin) const
+{
+  return 0;
+}
+
+// Stuff Klaus found.
+// Inheritance w/out a specifying for public.
+class class4 : class1 {
+  // Pure virtual methods.
+  void virtual print () const = 0;
+
+public:
+  // The whacky constructor type
+  class4()
+    try : class1(args)
+  {
+    // constructor body	
+  }
+  catch ()
+    {
+      
+    }
+  
+
+};
+
+class class5 : public virtual class4 {
+  // Virtual inheritance
+};
+
+class class6 : class1 {
+  // Mutable
+  mutable int i;
+};
+
+/* Namespaces */
+namespace namespace1 {
+  void ns_method1() { }
+
+  class n_class1 {
+  public:
+    void method11(int a) { }
+  };
+
+  /* This shouldn't parse due to missing semicolon. */
+  class _n_class2 : public n_class1 {
+    void n_c2_method1(int a, int b) { }
+  };
+
+  // Macros in the namespace
+#define NSMACRO 1
+
+  // Template in the namespace
+  template<class T> T nsti1(const Foo& foo);
+  template<> int nsti1<int>(const Foo& foo);
+    
+}
+
+namespace namespace2 {
+
+  using namespace1::n_class1;
+
+}
+
+/* Initializers */
+void tinitializers1(): inita1(False),
+		       inita2(False)
+{
+  inita1= 1;
+}
+
+/* How about Extern C type things. */
+int funny_prototype(int ,int b,float c)
+{
+
+}
+
+extern "C"
+int extern_c_1(int a, int b)
+{
+
+  funny_prototype(1,2,3.4);
+
+  printf("Moose", );
+
+  return 1;
+}
+
+extern "C" {
+
+  int extern_c_2(int a, int b)
+  {
+    return 1;
+  }
+
+}
+
+// Some operator stuff
+class Action
+{
+  // Problems!! operator() and operator[] can not be parsed with semantic
+  // 1.4.2 but with latest c.by
+  virtual void operator()(int i, char *p ) = 0;
+  virtual String& operator[]() = 0;
+  virtual void operator!() = 0;
+  virtual void operator->() = 0;
+  virtual T& operator+=();
+  virtual T& operator*();
+  virtual T& operator*=();
+};
+
+// class with namespace qualified parents
+class Multiinherit : public virtual POA::Parent,
+                     public virtual POA::Parent1,
+                     Parent
+{
+private:
+  int i;
+
+public:
+  Multiinherit();
+  ~Multiinherit();
+
+  // method with a list of qualified exceptions
+  void* throwtest()
+    throw(Exception0,
+          Testnamespace::Exception1,
+          Testnamespace::Excpetion2,
+          Testnamespace::testnamespace1::Exception3);
+  
+};
+
+void*
+Multiinherit::throwtest()
+  throw (Exception0,
+         Testnamespace::Exception1,
+         Testnamespace::Excpetion2,
+         Testnamespace::testnamespace1::Exception3)
+{
+  return;
+}
+
+// Jens Rock <jens.rock@asamnet.de>: Nested classes or structs defined
+// outside of the containing class/struct.
+class container
+{
+ public:
+  struct contained;
+  container();
+  ~container();
+};
+
+struct container::contained
+{
+  public:
+  contained();
+  ~contained();
+};
+
+/*
+ * Ok, how about some template stuff.
+ */
+template <class CT, class container = vector<CT> >
+const CT& max (const CT& a, const CT& b)
+{
+  return a < b ? b : a;
+}
+
+// Arne Schmitz found this one
+std::vector<int> &a, &b, &c;
+
+class TemplateUsingClass
+{
+  typedef TestClassMap::iterator iterator;
+  typedef map<long, long> TestClassMap;
+
+  // typedefs with const and volatile
+  typedef const map<long, long> const_TestClassMap;
+  typedef TestClassMap<string>::iterator volatile volatile_iterator;
+
+  map<int, int> mapclassvarthingy;
+};
+
+template<class T> T ti1(const Foo& foo);
+template<> int ti1<int>(const Foo& foo);
+
+
+// -----------------------------------
+// Now some namespace and related stuff
+// -----------------------------------
+
+using CORBA::LEX::get_token;
+using Namespace1;
+
+using namespace POA::std;
+using namespace Test;
+
+
+
+namespace Parser
+{
+  namespace
+  {
+    using Lexer::get_test;
+    string str = "";
+  }
+  
+  namespace XXX
+  {
+    
+    class Foobar : public virtual POA::Parent,
+                   public virtual POA::Parent1,
+                   private POA::list<fact>,
+                   private map<string>
+    {
+      ini i;
+      list <shared_ptr<item> >::const_iterator l;
+    public:
+      
+      Foobar();
+      ~Foobar();
+    };
+  }
+  
+
+  void test_function(int i);
+    
+};
+
+// unnamed namespaces - even nested
+namespace
+{
+  namespace
+  {
+    using Lexer::get_test;
+    string str = "";
+  }
+
+  // some builtin types
+  long long ll = 0;
+  long double d = 0.0;
+  unsigned test;
+  unsigned long int **uli = 0;
+  signed si = 0;
+  signed short ss = 0;
+  short int i = 0;
+  long int li = 0;
+  
+  // expressions with namespace/class-qualifyiers
+  ORB_var cGlobalOrb = ORB::_nil();
+  ORB_var1 cGlobalOrb1 = ORB::_test;
+
+  class Testclass
+  {
+    #define TEST 0
+    ini i;
+
+  public:
+
+    Testclass();
+    ~Testclass();
+  };
+
+  static void test_function(unsigned int i);
+
+};
+
+
+// outside method implementations which should be grouped to type Test
+XXX&
+Test::waiting()
+{
+  return;
+}
+
+void
+Test::print()
+{
+  return;
+}
+
+// outside method implementations with namespaces which should be grouped to
+// their complete (incl. namespace) types
+void*
+Parser::XXX::Foobar::wait(int i, const char const * const * p)
+{
+  return;
+}
+
+void*
+Namespace1::Test::wait1(int i)
+{
+  return;
+}
+
+int
+Namespace1::Test::waiting(int i)
+{
+  return;
+}
+
+// a class with some outside implementations which should all be grouped to
+// this class declaration
+class ClassWithExternals
+{
+private:
+  int i;
+
+public:
+  ClassWithExternals();
+  ~ClassWithExternals();
+  void non_nil();
+};
+
+
+// Foobar is not displayed; seems that semantic tries to add this to the class
+// Foobar but can not find/display it, because contained in the namespace above.
+void
+Foobar::non_nil()
+{
+  return;
+}
+
+// are correctly grouped to the ClassWithExternals class
+void
+ClassWithExternals::non_nil()
+{
+  String s = "lödfjg dlfgkdlfkgjdl";
+  return;
+}
+
+ClassWithExternals::ClassWithExternals()
+{
+  return;
+}
+
+void
+ClassWithExternals::~ClassWithExternals()
+{
+  return;
+}
+
+
+// -------------------------------
+// Now some macro and define stuff
+// -------------------------------
+
+#define TEST 0
+#define TEST1 "String"
+
+// The first backslash makes this macro unmatched syntax with semantic 1.4.2!
+// With flexing \+newline as nothing all is working fine!
+#define MZK_ENTER(METHOD) \
+{ \
+  CzkMethodLog lMethodLog(METHOD,"Framework");\
+}
+
+#define ZK_ASSERTM(METHOD,ASSERTION,MESSAGE) \
+   { if(!(ASSERTION))\
+      {\
+	std::ostringstream lMesgStream; \
+        lMesgStream << "Assertion failed: " \
+	<< MESSAGE; \
+        CzkLogManager::doLog(CzkLogManager::FATAL,"",METHOD, \
+        "Assert",lMesgStream); \
+        assert(ASSERTION);\
+      }\
+   }
+
+// Test if not newline-backslashes are handled correctly
+string s = "My \"quoted\" string";
+
+// parsed fine as macro
+#define FOO (arg) method(arg, "foo");
+
+// With semantic 1.4.2 this parsed as macro BAR *and* function method.
+// With latest c.bnf at least one-liner macros can be parsed correctly.
+#define BAR (arg) CzkMessageLog method(arg, "bar");
+
+// some const and volatile stuff
+char * p1 = "Hello"; // 1. variable Pointer, variable Data
+const char * p2 = "Hello"; // 2. variable pointer, constant data
+char * const p3 = "Hello"; // 3. constant pointer, variable data
+const char * const p4 = "Hello"; // 4. constant pointer, constant data
+
+// Case 2 and 4 can exchange first "const" and "char"
+char const * p21 = "Hello"; // variable pointer, constant data
+char const * const p41 = "Hello"; // constant pointer, constant data
+
+char volatile a = 0; // a volatile char
+void foo(bar const &arg); // a reference to a const bar
+int foobar(bar const * const p); // a const pointer to a const bar
+int foobar(bar const volatile * const p); // a const pointer to a const bar
+int foobar3(char* p); // a const pointer to a const bar
+
+// Should not be parsed because this is invalid code
+int const & const r3 = i;
+
+boolean i = 0;
+boolean & r1 = i;
+boolean const & r2 = i;
+
+// const * sequences can be very long in C++ ;-)
+char const * const * const * const * ppp;
+
+// complex function declarationen with named pointer-arguments
+const char** foobar1(volatile char const * const **p);
+const char** foobar11(volatile Test::Namespace::Char<char*> const * const **p);
+
+// complex function declarationen with unnamed pointer-arguments
+const char* foobar2(const char***);
+const char* foobar21(const Test::Namespace::Char<char>***);
+
+// string literal parsing even with wchar_t
+char const *p = "string1";
+char const *q = "string1" "str\"ing2" "string3";
+wchar_t testc = L'a';
+
+wchar_t const *wp = L"string with a \" in it";
+wchar_t const *wq = L"string \n\t\"test" L"string2";
+wchar_t const *wr = L"string L";
diff --git a/site/cedet-1.0pre7/semantic/tests/test.make b/site/cedet-1.0pre7/semantic/tests/test.make
new file mode 100644
index 0000000..6f1a4a3
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/test.make
@@ -0,0 +1,60 @@
+# Test makefile -*- makefile -*-
+
+top=
+ede_FILES=Project.ede Makefile
+
+example_MISC=semantic-skel.el skeleton.bnf
+init_LISP=semantic-load.el
+DISTDIR=$(top)semantic-$(VERSION)
+
+# really goofy & variables tabs
+A=      B
+A       =B
+A=B     C
+A=B\
+        C
+
+A=	http://${B} \
+	ftp://${B}
+B=	test
+
+all: example semantic Languages tools senator semantic.info
+
+test ${B}: foo bar
+	@echo ${A}
+
+example: 
+	@
+
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	@if test ! -z "${LOADPATH}" ; then\
+	   for loadpath in ${LOADPATH}; do \
+	      echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	    done;\
+	fi
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
+
+include tesset.mk tusset.mk
+include oneset.mk
+
+ifdef SOME_SYMBOL
+  VAR1 = foo
+else
+  VAR1 = bar
+endif
+
+ifndef SOME_OTHER_SYMBOL
+  VAR1 = baz
+endif
+
+ifeq ($(VAR1), foo)
+  VAR2 = gleep
+else
+  ifneq ($(VAR1), foo)
+    VAR2 = glop
+  endif
+endif
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/tests/testdoublens.cpp b/site/cedet-1.0pre7/semantic/tests/testdoublens.cpp
new file mode 100644
index 0000000..1cf4876
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testdoublens.cpp
@@ -0,0 +1,148 @@
+//
+// CPP file for semantic-ia-utest
+// completion engine unit tests.
+//
+#include "testdoublens.hpp"
+
+namespace Name1 {
+  namespace Name2 {
+
+    Foo::Foo()
+    {
+      p// -1-
+	// #1# ( "pMumble" "publishStuff" )
+	;
+    }
+
+    int Foo::get() // ^1^
+    {
+      p// -2-
+	// #2# ( "pMumble" "publishStuff" )
+	;
+      return 0;
+    }
+
+    void Foo::publishStuff(int /* a */, int /* b */) // ^2^
+    {
+    }
+
+    void Foo::sendStuff(int /* a */, int /* b */) // ^3^
+    {
+    }
+    
+  } // namespace Name2
+} // namespace Name1
+
+// Test multiple levels of metatype expansion
+int test_fcn () {
+  stage3_Foo MyFoo;
+
+  MyFoo.// -3-
+    // #3# ( "Mumble" "get" )
+    ;
+
+  Name1::Name2::F//-4-
+    // #4# ( "Foo" )
+    ;
+  
+  // @TODO - get this working...
+  Name1::stage2_Foo::M//-5-
+    /// #5# ( "Mumble" )
+    ;
+}
+
+stage3_Foo foo_fcn() {
+  // Can we go "up" to foo with senator-go-to-up-reference?
+}
+
+
+// Second test from Ravikiran Rajagopal
+
+namespace A { 
+  class foo {
+  public:
+    void aa();
+    void bb();
+  };
+}
+namespace A { 
+  class bar { 
+  public:
+    void xx();
+  public:
+    foo myFoo;
+  };
+
+  void bar::xx()
+  {
+    myFoo.// -6- <--- cursor is here after the dot
+      // #6# ( "aa" "bb" )
+      ;
+  }
+}
+
+// Double namespace example from Hannu Koivisto
+//
+// This is tricky because the parent class "Foo" is found within the
+// scope of B, so the scope calculation needs to put that together
+// before searching for parents in scope.
+namespace a {
+  namespace b {
+
+    class Bar : public Foo
+    {
+      int baz();
+    };
+
+    int Bar::baz()
+    {
+      return dum// -7- 
+	// #7# ( "dumdum" )
+	;
+    }
+
+  } // namespace b
+} // namespace a
+
+// Three namespace example from Hannu Koivisto
+//
+// This one is special in that the name e::Foo, where "e" is in
+// the scope, and not referenced from the global namespace.  This
+// wasn't previously handled, so the fullscope needed to be added
+// to the list of things searched when in split-name decent search mode
+// for scopes.
+
+namespace d {
+  namespace e {
+
+    class Foo
+    {
+    public:
+      int write();
+    };
+
+  } // namespace d
+} // namespace e
+
+
+namespace d {
+  namespace f {
+
+    class Bar
+    {
+    public:
+      int baz();
+
+    private:
+      e::Foo &foo;
+    };
+
+    int Bar::baz()
+    {
+      return foo.w// -8-
+	// #8# ( "write" )
+	;
+    }
+
+  } // namespace f
+} // namespace d
diff --git a/site/cedet-1.0pre7/semantic/tests/testdoublens.hpp b/site/cedet-1.0pre7/semantic/tests/testdoublens.hpp
new file mode 100644
index 0000000..3f9a8a2
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testdoublens.hpp
@@ -0,0 +1,51 @@
+//
+// Header file used in one of the ia-utest tests.
+//
+namespace Name1 {
+  namespace Name2 {
+
+    class Foo
+    {
+      typedef unsigned int Mumble;
+    public:
+      Foo();
+      ~Foo();
+      int get();
+
+    private:
+      void publishStuff(int a, int b);
+
+      void sendStuff(int a, int b);
+    
+      Mumble* pMumble;
+    };
+
+    typedef Foo stage1_Foo;
+
+  } // namespace Name2
+
+  typedef Name2::stage1_Foo stage2_Foo;
+
+  typedef Name2::Foo decl_stage1_Foo;
+
+} // namespace Name1
+
+typedef Name1::stage2_Foo stage3_Foo;
+
+
+// Double namespace from Hannu Koivisto
+namespace a {
+  namespace b {
+
+    class Foo
+    {
+      struct Dum {
+        int diDum;
+      };
+
+    protected:
+      mutable a::b::Foo::Dum dumdum;
+    };
+
+  } // namespace b
+} // namespace a
diff --git a/site/cedet-1.0pre7/semantic/tests/testfriends.cpp b/site/cedet-1.0pre7/semantic/tests/testfriends.cpp
new file mode 100644
index 0000000..f84ed5a
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testfriends.cpp
@@ -0,0 +1,37 @@
+// Test parsing of friends and how they are used in completion.
+/*
+  >>  Thanks Damien Profeta for the nice example.
+  >
+  >  I paste a small example.
+  >  It would be great if friend can be well parsed and even greater if
+  >  class B can access to all the members of A.
+*/
+
+class Af // %2% ( ( "testfriends.cpp" ) ( "Af" "B::testB" ) )
+{
+public:
+  int pubVar;
+private:
+  int privateVar;
+
+  friend class B;
+
+};
+
+class B
+{
+public:
+  int testB();
+  int testAB();
+
+};
+
+
+int B::testB() {
+  Af classA;
+  classA.//-1-
+    ; //#1# ( "privateVar" "pubVar" )
+}
+
+int B::testAB() { // %1% ( ( "testfriends.cpp" ) ( "B" "B::testAB" ) )
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testjavacomp.java b/site/cedet-1.0pre7/semantic/tests/testjavacomp.java
new file mode 100644
index 0000000..cdb28d7
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testjavacomp.java
@@ -0,0 +1,69 @@
+/** testjavacomp.java --- 
+ *
+ * Copyright (C) 2009 Eric M. Ludlam
+ *
+ * Author: Eric M. Ludlam <eric@siege-engine.com>
+ * X-RCS: $Id: testjavacomp.java,v 1.1 2009/02/01 16:28:25 zappo Exp $
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+package tests.testjavacomp;
+
+class secondClass {
+    private void scFuncOne() {    }
+    public void scFuncOne() {    }
+}
+
+
+public class testjavacomp {
+
+    private int funcOne() {    }
+    private int funcTwo() {    }
+    private char funcThree() {    }
+
+    class nestedClass {
+	private void ncFuncOne() {	}
+	public void ncFuncOne() {	}
+    }
+
+    public void publicFunc() {
+
+	int i;
+
+	i = fu// -1-
+	    // #1# ( "funcOne" "funcTwo" )
+	    ;
+
+	fu// -2-
+	    // #2# ( "funcOne" "funcThree" "funcTwo" )
+	    ;
+
+	secondClass SC;
+
+	SC.//-3-
+	    // #3# ( "scFuncOne" )
+	    ;
+
+	nestedClass NC;
+
+	// @todo - need to fix this?  I don't know if  this is legal java.
+	NC.// - 4-
+	    // #4# ( "ncFuncOne" )
+	    ;
+    }
+
+} // testjavacomp
diff --git a/site/cedet-1.0pre7/semantic/tests/testnsp.cpp b/site/cedet-1.0pre7/semantic/tests/testnsp.cpp
new file mode 100644
index 0000000..42cc332
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testnsp.cpp
@@ -0,0 +1,59 @@
+// Test NSP (Name space parent)
+//
+// Test dereferencing parents based on local parent scope.
+//
+// Derived from data David Engster provided.
+
+namespace nsp {
+
+  class rootclass {
+  public:
+    int fromroot() {};
+  };
+
+}
+
+namespace nsp {
+  class childclass : public rootclass {
+  public:
+    int fromchild() {};
+  };
+}
+
+void myfcn_not_in_ns (void) {
+  nsp::childclass test;
+
+  test.// -1-
+    ; // #1# ( "fromchild" "fromroot" )
+}
+
+// Test a class declared in a class, where the contents
+// are in a qualified name.
+//
+// Thanks Michael Reiher for the concise example.
+
+class AAA
+{
+public:
+  AAA();
+
+  void aaa();
+
+private:
+    class Private;
+    Private * const d;
+};
+
+class AAA::Private
+{
+    Private() : bbb(0) {
+    }    
+    
+    BBB* bbb;
+};
+
+void AAA::aaa()
+{
+  d->// -2-
+    ; // #2# ( "bbb" )
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testspp.c b/site/cedet-1.0pre7/semantic/tests/testspp.c
new file mode 100644
index 0000000..c7ff762
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testspp.c
@@ -0,0 +1,84 @@
+/* Attempt to test the C preprocessor
+ *
+ */
+
+int some_fcn (){}
+
+
+#ifndef MOOSE
+int pre_show_moose(){}
+#endif
+
+#ifdef MOOSE
+int pre_dont_show_moose(){}
+#endif
+
+#if !defined(MOOSE)
+int pre_show_moose_if(){}
+#endif
+
+#if defined(MOOSE)
+int pre_dont_show_moose_if(){}
+#endif
+
+#define MOOSE
+
+#if 0
+int dont_show_function_if_0(){}
+#endif
+
+#if 1
+int show_function_if_1(){}
+#endif
+
+#ifdef MOOSE
+int moose_function(){}
+#endif
+
+#ifndef MOOSE
+int dont_show_moose(){}
+#endif
+
+#if defined(MOOSE)
+int moose_function_if(){}
+#endif
+
+#if !defined(MOOSE)
+int dont_show_moose_if() {}
+#endif
+
+#undef MOOSE
+
+#ifdef MOOSE
+int no_handy_moose(){}
+#endif
+
+#ifndef MOOSE
+int show_moose_else() {}
+#else
+int no_show_moose_else(){}
+#endif
+
+
+#ifdef MOOSE
+int no_show_moose_else_2() {}
+#else
+int show_moose_else_2() {}
+#endif
+
+#if defined(MOOSE)
+int no_show_moose_elif() {}
+#elif !defined(MOOSE)
+int show_moose_elif() {}
+#else
+int no_show_moose_elif_else() {}
+#endif
+
+#if defined(MOOSE)
+int no_show_moose_if_elif_2() {}
+#elif defined(COW)
+int no_show_moose_elif_2() {}
+#else
+int show_moose_elif_else() {}
+#endif
+
diff --git a/site/cedet-1.0pre7/semantic/tests/testsppcomplete.c b/site/cedet-1.0pre7/semantic/tests/testsppcomplete.c
new file mode 100644
index 0000000..4a37e88
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsppcomplete.c
@@ -0,0 +1,29 @@
+/* Example provided by Hannes Janetzek */
+
+struct Test { int test; };
+
+#define BLA(_type) \
+  _type *bla = (_type*) malloc(sizeof(_type));
+
+#define BLUB(_type)				\
+  (_type*)malloc(sizeof(_type));
+
+#define FOO(_type)				\
+  _type *foo = BLUB(_type);
+
+#define BAR(_type)				\
+  _type *bar = (*_type)BLUB(_type);
+
+int main(int argc, char *argv[]) {
+  BLA(Test);
+  bla->// -1-
+    ; // #1# ( "test" )
+
+  FOO(Test);
+  foo->// -2-
+    ; // #2# ( "test" )
+
+  BAR(Test);
+  bar->// -3-
+    ; // #3# ( "test" )
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testsppcond.cpp b/site/cedet-1.0pre7/semantic/tests/testsppcond.cpp
new file mode 100644
index 0000000..6569b00
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsppcond.cpp
@@ -0,0 +1,227 @@
+/** testsppcond.cpp --- Test CPP Conditional handling via hideif
+ *
+ * Copyright (C) 2010 Eric M. Ludlam
+ *
+ * Author: Eric M. Ludlam <eric@siege-engine.com>
+ * X-RCS: $Id: testsppcond.cpp,v 1.1 2010/01/23 02:36:28 zappo Exp $
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * DEVELOPER NOTES:
+ *
+ * When working in this file, enable semantic-decoration-mode, and
+ * always create small functions.  In this case, it will overline
+ * everything labeled PASS, and nothing labeled FAIL.  This makes it
+ * easy to see what the result will be without running the unit test.
+ */
+
+#define TRUE 1
+#define FALSE 0
+#define TRUE1 TRUE
+#define FALSE1 FALSE
+#define TRUE2 TRUE1
+
+#define THREE 3
+
+#define JUSTDEFINED
+#define UNDEFINED
+#undef UNDEFINED
+
+#undef UNDEFUNDEFINED
+
+// *** TEST SOME IFDEFS
+
+// This could fail if FALSE was interpreted as false, not defined.
+#ifdef FALSE
+int pass_ifdef1() {}
+#else
+int fail_ifdef1() {}
+#endif
+
+#ifdef TRUE
+int pass_ifdef2() {}
+#else
+int fail_ifdef2() {}
+#endif
+
+// This fails if JUSTDEFINED was interpreted as false
+#ifdef JUSTDEFINED
+int pass_ifdef3() {}
+#else
+int fail_ifdef3() {}
+#endif
+
+#ifdef NOTDEFINED
+int fail_ifdef4() {}
+#else
+int pass_ifdef4() {}
+#endif
+
+#ifdef UNDEFINED
+int fail_ifdef5() {}
+#else
+int pass_ifdef5() {}
+#endif
+
+// *** TEST SOME if defined() cases.
+#if defined(FALSE)
+int pass_if_def1() {}
+#else
+int fail_if_def1() {}
+#endif
+
+#if defined(TRUE)
+int pass_if_def2() {}
+#else
+int fail_if_def2() {}
+#endif
+
+#if defined(JUSTDEFINED)
+int pass_if_def3() {}
+#else
+int fail_if_def3() {}
+#endif
+
+#if defined(NOTDEFINED)
+int fail_if_def4() {}
+#else
+int pass_if_def4() {}
+#endif
+
+#if defined(UNDEFINED)
+int fail_if_def5() {}
+#else
+int pass_if_def5() {}
+#endif
+
+// *** TEST if evaluations to 0/1
+
+#if TRUE
+int pass_true() {}
+#else
+int fail_true() {}
+#endif
+
+#if TRUE1
+int pass_true1() {}
+#else
+int fail_true1() {}
+#endif
+
+#if TRUE2
+int pass_true2() {}
+#else
+int fail_true2() {}
+#endif
+
+#if FALSE
+int fail_false() {}
+#else
+int pass_false() {}
+#endif
+
+#if FALSE1
+int fail_false1() {}
+#else
+int pass_false1() {}
+#endif
+
+// *** TEST some if comparisons.
+#if TRUE == TRUE1
+int pass_eq_true1() {}
+#else
+int fail_eq_true1() {}
+#endif
+
+#if TRUE == TRUE2
+int pass_eq_true2() {}
+#else
+int fail_eq_true2() {}
+#endif
+
+#if FALSE == FALSE1
+int pass_eq_false1() {}
+#else
+int fail_eq_false1() {}
+#endif
+
+#if TRUE != FALSE
+int pass_neq() {}
+#else
+int fail_neq() {}
+#endif
+
+// *** TEST simple math.
+#if TRUE+TRUE==2
+int pass_true_2() {}
+#else
+int fail_true_2() {}
+#endif
+
+#if TRUE+TRUE-FALSE==2
+int pass_true_false_2() {}
+#else
+int fail_true_false_2() {}
+#endif
+
+#if TRUE+TRUE==3
+int fail_true_n3() {}
+#else
+int pass_true_n3() {}
+#endif
+
+// *** TEST boolean &&
+#if defined(FALSE) && TRUE
+int pass_and1() {}
+#else
+int fail_and1() {}
+#endif
+
+#if defined(FALSE) && TRUE && TRUE+FALSE==1
+int pass_and2() {}
+#else
+int fail_and2() {}
+#endif
+
+#if defined(TRUE) && FALSE && TRUE+FALSE==1
+int fail_and3() {}
+#else
+int pass_and3() {}
+#endif
+
+// *** TEST boolean ||
+#if defined(FALSE) || TRUE
+int pass_or1() {}
+#else
+int fail_or1() {}
+#endif
+
+#if defined(FALSE) || TRUE || TRUE+FALSE==1
+int pass_or2() {}
+#else
+int fail_or2() {}
+#endif
+
+#if defined(TRUE) || FALSE || TRUE+FALSE==1
+int pass_or3() {}
+#else
+int fail_or3() {}
+#endif
+
+
+/* END */
diff --git a/site/cedet-1.0pre7/semantic/tests/testsppreplace.c b/site/cedet-1.0pre7/semantic/tests/testsppreplace.c
new file mode 100644
index 0000000..016dde4
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsppreplace.c
@@ -0,0 +1,161 @@
+/* Test CPP/SPP Replacement
+ */
+
+/* TEST: The EMU keyword doesn't screw up the function defn. */
+#define EMU
+#define EMU2 /*comment*/
+char EMU parse_around_emu EMU2 (EMU)
+{
+}
+
+/* TEST: A simple word can be replaced in a definition. */
+#define SUBFLOAT /* Some Float */ float
+SUBFLOAT returnanfloat()
+{
+}
+
+/* TEST: Punctuation an be replaced in a definition. */
+#define COLON :
+int foo COLON COLON bar ()
+{
+}
+
+/* TEST: Multiple lexical characters in a definition */
+#define SUPER mysuper::
+int SUPER baz ()
+{
+}
+
+/* TEST: Macro replacement. */
+#define INT_FCN(name) int name (int in)
+
+INT_FCN(increment) {
+  return in+1;
+}
+
+/* TEST: Macro replacement with complex args */
+#define P_(proto) ()
+
+int myFcn1 P_((a,b));
+
+#define P__(proto) proto
+
+int myFcn2 P__((int a, int b));
+int myFcn3 (int a, int b);
+
+/* TEST: Macro replacement for very long argument lists. (See xdisp.c in Emacs) */
+int myFcn4 P__((int a,
+		int b,
+		int c,
+		int d,
+		int e,
+		int f));
+
+/* TEST: Multiple args to a macro. */
+#define MULTI_ARGS(name, field1, field2, field3) struct name { int field1; int field2; int field3; }
+
+MULTI_ARGS(ma_struct, moose, penguin, emu);
+
+/* TEST: Macro w/ args, but no body. */
+#define NO_BODY(name)
+
+NO_BODY(Moose);
+
+/* TEST: Not a macro with args, but close. */
+#define NOT_WITH_ARGS     (moose)
+
+int not_with_args_fcn NOT_WITH_ARGS
+{
+}
+
+/* TEST: macro w/ continuation. */
+#define WITH_CONT \
+  continuation_symbol
+
+int WITH_CONT () { };
+
+/* TEST: macros in a macro - tail processing */
+#define tail_with_args_and_long_name(a) (int a)
+#define int_arg tail_with_args_and_long_name
+
+int tail int_arg(q) {}
+
+/* TEST: macros used improperly. */
+#define tail_fail tail_with_args_and_long_name(q)
+
+int tail_fcn tail_fail(q);
+
+/* TEST: feature of CPP from LSD <lsdsgster@...> */
+#define __gthrw_(name) __gthrw_ ## name
+
+int __gthrw_(foo) (int arg1) { }
+
+/* TEST: macros using macros */
+#define macro_foo foo
+#define mf_declare int macro_foo
+
+mf_declare;
+
+/* TEST: macros with args using macros */
+#define Amacro(A) (int A)
+#define mf_Amacro(B) int B Amacro(B)
+
+mf_Amacro(noodle);
+
+/* TEST: Double macro using the argument stack. */
+#define MACRO0(name) int that_ ## name(int i);
+#define MACRO1(name) int this_ ## name(int i);
+#define MACRO2(name) MACRO0(name) MACRO1(name)
+
+MACRO2(foo)
+
+/* TEST: The G++ namespace macro hack.  Not really part of SPP. */
+_GLIBCXX_BEGIN_NAMESPACE(baz)
+
+  int bazfnc(int b) { }
+
+_GLIBCXX_END_NAMESPACE;
+
+_GLIBCXX_BEGIN_NESTED_NAMESPACE(foo,bar)
+
+  int foo_bar_func(int a) { }
+
+_GLIBCXX_END_NESTED_NAMESPACE;
+
+
+/* TEST: The VC++ macro hack. */
+_STD_BEGIN
+
+  int inside_std_namespace(int a) { }
+
+_STD_END
+
+/* TEST: Recursion prevention.  CPP doesn't allow even 1 level of recursion. */
+#define STARTMACRO MACROA
+#define MACROA MACROB
+#define MACROB MACROA
+
+int STARTMACRO () {
+
+}
+
+/* TEST: Fancy concat/recursive macros */
+#define CONCAT(x,y)     x##y
+#define PASTE(x,y)      CONCAT(x,y)
+#define OBJ(fn)         PASTE(PREFIX, fn)
+#define PREFIX          PASTE(A,B)
+
+int 
+OBJ(test)     /* expands to ABtest */
+  ;
+
+/* TEST: Macro Recursion limits in arguments to a macro. 
+ * This code is from ALSA (with names changed to moose), noticed by Yupeng. */
+#define mr_moose(n) list_entry(n, struct mr_moose, list)
+
+struct mr_moose_ops {
+  int (*mr_moose_disconnect)(struct mr_moose *dev);
+};
+
+
+/* END */
diff --git a/site/cedet-1.0pre7/semantic/tests/testsppreplaced.c b/site/cedet-1.0pre7/semantic/tests/testsppreplaced.c
new file mode 100644
index 0000000..658eeaf
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsppreplaced.c
@@ -0,0 +1,109 @@
+/* What the SPP replace file would looklike with MACROS replaced.
+ */
+
+/* TEST: The EMU keyword doesn't screw up the function defn. */
+char parse_around_emu ()
+{
+}
+
+/* TEST: A simple word can be replaced in a definition. */
+float returnanfloat()
+{
+}
+
+/* TEST: Punctuation an be replaced in a definition. */
+int foo::bar ()
+{
+}
+
+/* TEST: Multiple lexical characters in a definition */
+int mysuper::baz ()
+{
+}
+
+/* TEST: Macro replacement. */
+int increment (int in) {
+  return in+1;
+}
+
+/* TEST: Macro replacement with complex args */
+int myFcn1 ();
+
+int myFcn2 (int a, int b);
+int myFcn3 (int a, int b);
+
+/* TEST: Macro replacement for very long argument lists. (See xdisp.c in Emacs) */
+int myFcn4 (int a, int b, int c, int d, int e, int f);
+
+/* TEST: Multiple args to a macro. */
+struct ma_struct { int moose; int penguin; int emu; };
+
+/* TEST: Macro w/ args, but no body. */
+
+/* TEST: Not a macro with args, but close. */
+int not_with_args_fcn (moose)
+{
+}
+
+/* TEST: macro w/ continuation. */
+int continuation_symbol () { };
+
+/* TEST: macros in a macro - tail processing */
+
+int tail (int q) {}
+
+/* TEST: macros used impropertly. */
+
+int tail_fcn(int q);
+
+/* TEST: feature of CPP from LSD <lsdsgster@...> */
+
+int __gthrw_foo (int arg1) { }
+
+/* TEST: macros using macros */
+int foo;
+
+/* TEST: macros with args using macros */
+int noodle(int noodle);
+
+/* TEST: Double macro using the argument stack. */
+int that_foo(int i);
+int this_foo(int i);
+
+/* TEST: The G++ namespace macro hack.  Not really part of SPP. */
+namespace baz {
+
+  int bazfnc(int b) { }
+
+}
+
+namespace foo { namespace bar {
+
+    int foo_bar_func(int a) { }
+
+  } 
+}
+
+/* TEST: The VC++ macro hack. */
+namespace std {
+
+  int inside_std_namespace(int a) { }
+
+}
+
+/* TEST: Recursion prevention.  CPP doesn't allow even 1 level of recursion. */
+int MACROA () {
+
+}
+
+/* TEST: Fancy concat/recursive macros */
+int ABtest;
+
+/* TEST: Macro Recursion limits in arguments to a macro. 
+ * This code is from ALSA, noticed by Yupeng. */
+struct mr_moose_ops {
+  int (*mr_moose_disconnect)(struct mr_moose *dev);
+};
+
+
+/* End */
diff --git a/site/cedet-1.0pre7/semantic/tests/teststruct.cpp b/site/cedet-1.0pre7/semantic/tests/teststruct.cpp
new file mode 100644
index 0000000..6bc27b9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/teststruct.cpp
@@ -0,0 +1,66 @@
+// Combinations of templates and structure inheritance.
+//
+// Created by Alex Ott.
+
+template <typename DerivedT>
+struct grammar {
+public:
+  typedef grammar<DerivedT> self_t;
+  typedef DerivedT const& embed_t;
+  grammar() {}
+  ~grammar() { }
+  void use_parser() const { }
+  void test1() { }
+};
+
+struct PDFbool_parser : public grammar<PDFbool_parser> {
+  PDFbool_parser() {}
+  template <typename scannerT> struct definition {
+    typedef typename scannerT::iterator_t iterator_t;
+    int top;
+    definition(const PDFbool_parser& /*self*/) {
+      return ;
+    }
+    const int start() const {
+      return top;
+    }
+  };
+};
+
+int main(void) {
+  PDFbool_parser PDFbool_p = PDFbool_parser();
+  PDFbool_p.//-1-
+    ;
+  // #1# ("definition" "embed_t" "self_t" "test1" "use_parser")
+}
+
+// ----------------------------------------------------------------------
+
+template <class Derived> struct Base {
+public:
+  void interface()
+  {
+    // ...
+    static_cast<Derived*>(this)->implementation();
+    // ...
+  }
+
+  static void static_func()
+  {
+    // ...
+    Derived::static_sub_func();
+    // ...
+  }
+};
+
+struct Derived : Base<Derived> {
+  void implementation() { }
+  static void static_sub_func() { }
+};
+
+int foo () {
+  Derived d;
+  d.//-2-
+    ;
+  // #2# ("implementation" "interface" "static_func" "static_sub_func")
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testsubclass.cpp b/site/cedet-1.0pre7/semantic/tests/testsubclass.cpp
new file mode 100644
index 0000000..30da4a8
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsubclass.cpp
@@ -0,0 +1,231 @@
+/* Special test file for Semantic Analyzer and complex C++ inheritance.
+ */
+
+//#include <iostream>
+#include "testsubclass.hh"
+
+void animal::moose::setFeet(int numfeet) //^1^
+{
+  if (numfeet > 4) {
+    std::cerr << "Why would a moose have more than 4 feet?" << std::endl;
+    return;
+  }
+
+  fFeet = numfeet;
+}
+
+int animal::moose::getFeet() //^2^
+{
+  return fFeet;
+}
+
+void animal::moose::doNothing() //^3^
+{
+  animal::moose foo();
+
+  fFeet = N// -15-
+    ; // #15# ( "NAME1" "NAME2" "NAME3" )
+}
+
+
+void deer::moose::setAntlers(bool have_antlers) //^4^
+{
+  fAntlers = have_antlers;
+}
+
+bool deer::moose::getAntlers() //^5^
+// %1% ( ( "testsubclass.cpp" "testsubclass.hh" ) ( "deer::moose::doSomething" "deer::moose::getAntlers" "moose" ) )
+{
+  return fAntlers;
+}
+
+bool i_dont_have_symrefs()
+// %2% ( ("testsubclass.cpp" ) ("i_dont_have_symrefs"))
+{
+}
+
+void deer::moose::doSomething() //^6^
+{
+  // All these functions should be identified by semantic analyzer.
+  getAntlers();
+  setAntlers(true);
+
+  getFeet();
+  setFeet(true);
+
+  doNothing();
+
+  fSomeField = true;
+
+  fIsValid = true;
+}
+
+void deer::alces::setLatin(bool l) {
+  fLatin = l;
+}
+
+bool deer::alces::getLatin() {
+  return fLatin;
+}
+
+void deer::alces::doLatinStuff(moose moosein) {
+  // All these functions should be identified by semantic analyzer.
+  getFeet();
+  setFeet(true);
+
+  getLatin();
+  setLatin(true);
+
+  doNothing();
+
+  deer::moose foo();
+
+
+}
+
+moose deer::alces::createMoose()
+{
+  moose MooseVariableName;
+  bool tmp;
+  int itmp;
+  bool fool;
+  int fast;
+
+  MooseVariableName = createMoose();
+
+  doLatinStuff(MooseVariableName);
+  
+  tmp = this.f// -1-
+    // #1# ( "fAlcesBool" "fIsValid" "fLatin" )
+    ;
+
+  itmp = this.f// -2-
+    // #2# ( "fAlcesInt" "fGreek" "fIsProtectedInt" )
+    ;
+
+  tmp = f// -3-
+    // #3# ( "fAlcesBool" "fIsValid" "fLatin" "fool" )
+    ;
+
+  itmp = f// -4-
+    // #4# ( "fAlcesInt" "fGreek" "fIsProtectedInt" "fast" )
+    ;
+
+  MooseVariableName = m// -5-
+    // #5# ( "moose" )
+
+  return MooseVariableName;
+}
+
+/** Test Scope Changes
+ *
+ * This function is rigged to make sure the scope changes to account
+ * for different locations in local variable parsing.
+ */
+int someFunction(int mPickle)
+{
+  moose mMoose = deer::alces::createMoose();
+  
+  if (mPickle == 1) {
+
+    int mOption1 = 2;
+
+    m// -5-
+      // #5# ( "mMoose" "mOption1" "mPickle" )
+      ;
+
+  } else {
+
+    int mOption2 = 2;
+
+    m// -6-
+      // #6# ( "mMoose" "mOption2" "mPickle" )
+      ;
+  }
+
+}
+
+// Thanks Ming-Wei Chang for this next example.
+
+namespace pub_priv {
+
+  class A{
+  private:
+    void private_a(){}
+  public: 
+    void public_a();
+  };
+
+  void A::public_a() {
+    A other_a;
+
+    other_a.p// -7-
+      // #7# ( "private_a" "public_a" )
+      ;
+  }
+
+  int some_regular_function(){
+    A a;
+    a.p// -8-
+      // #8# ( "public_a" )
+      ;
+    return 0;
+  }
+
+}
+
+
+/** Test Scope w/in a function (non-method) with classes using
+ * different levels of inheritance.
+ */
+int otherFunction()
+{
+  sneaky::antelope Antelope(1);
+  sneaky::jackalope Jackalope(1);
+  sneaky::bugalope Bugalope(1);
+
+  Antelope.// -9-
+    // #9# ( "fAntyPublic" "fQuadPublic" "testAccess")
+    ;
+
+  Jackalope.// -10-
+    // #10# ( "fBunnyPublic" "testAccess")
+    ;
+
+  Jackalope// @1@ 6
+    ;
+  Jackalope;
+  Jackalope;
+  Jackalope;
+
+  Bugalope.// -11-
+    // #11# ( "fBugPublic" "testAccess")
+    ;
+  Bugalope// @2@ 3
+    ;
+}
+
+/** Test methods within each class for types of access to the baseclass.
+ */
+
+bool sneaky::antelope::testAccess() //^7^
+{
+  this.// -12-
+    // #12# ( "fAntyPrivate" "fAntyProtected" "fAntyPublic" "fQuadProtected" "fQuadPublic" "testAccess" )
+    ;
+}
+
+bool sneaky::jackalope::testAccess() //^8^
+{
+  this.// -13-
+    // #13# ( "fBunnyPrivate" "fBunnyProtected" "fBunnyPublic" "fQuadProtected" "fQuadPublic" "testAccess" )
+    ;
+}
+
+bool sneaky::bugalope::testAccess() //^9^
+{
+  this.// -14-
+    // #14# ( "fBugPrivate" "fBugProtected" "fBugPublic" "fQuadPublic" "testAccess" )
+    ;
+}
+
diff --git a/site/cedet-1.0pre7/semantic/tests/testsubclass.hh b/site/cedet-1.0pre7/semantic/tests/testsubclass.hh
new file mode 100644
index 0000000..8c9886d
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testsubclass.hh
@@ -0,0 +1,175 @@
+/* Special test file for Semantic Analyzer and complex C++ inheritance.
+ *
+ * Header file for testsubclass.cpp with class defns but no
+ * implementations.
+ */
+
+//#include <cmath>
+// #include <stdio.h>
+
+#ifndef TESTSUBCLASS_HH
+#define TESTSUBCLASS_HH
+
+namespace animal {
+
+  class moose {
+  public:
+    moose() : fFeet(0),
+	      fIsValid(false)
+    { }
+
+    virtual void setFeet(int);
+    int getFeet();
+
+    void doNothing();
+
+    enum moose_enum {
+      NAME1, NAME2, NAME3 };
+      
+
+  protected:
+
+    bool fIsValid;
+    int fIsProtectedInt;
+
+  private:
+    int fFeet; // Usually 2 or 4.
+    bool fIsPrivateBool;
+    
+  }; // moose
+
+  int two_prototypes();
+  int two_prototypes();
+
+  class quadruped {
+  public:
+    quadruped(int a) : fQuadPrivate(a)
+    { }
+
+    int fQuadPublic;
+
+  protected:
+    int fQuadProtected;
+
+  private:
+    int fQuadPrivate;
+
+  };
+
+}
+
+
+namespace deer {
+
+  class moose : public animal::moose {
+  public:
+    moose() : fAntlers(false)
+    { }
+
+    void setAntlers(bool);
+    bool getAntlers();
+
+    void doSomething();
+
+  protected:
+
+    bool fSomeField;
+
+  private:
+    bool fAntlers;
+
+  };
+
+} // deer
+
+// A second namespace of the same name will test the
+// namespace merging needed to resolve deer::alces
+namespace deer {
+
+  class alces : public animal::moose {
+  public:
+    alces(int lat) : fLatin(lat)
+    { }
+
+    void setLatin(bool);
+    bool getLatin();
+
+    void doLatinStuff(moose moosein); // for completion testing
+
+    moose createMoose(); // for completion testing.
+
+  protected:
+    bool fAlcesBool;
+    int fAlcesInt;
+
+  private:
+    bool fLatin;
+    int fGreek;
+  };
+
+};
+
+// A third namespace with classes that does protected and private inheritance.
+namespace sneaky {
+
+  class antelope : public animal::quadruped {
+
+  public:
+    antelope(int a) : animal::quadruped(),
+		      fAntyProtected(a)
+    {}
+
+    int fAntyPublic;
+
+    bool testAccess();
+
+  protected:
+    int fAntyProtected;
+
+  private :
+    int fAntyPrivate;
+
+  };
+
+  class jackalope : protected animal::quadruped {
+
+  public:
+    jackalope(int a) : animal::quadruped(),
+		       fBunny(a)
+    {}
+
+    int fBunnyPublic;
+
+    bool testAccess();
+
+  protected:
+    bool fBunnyProtected;
+
+  private :
+    bool fBunnyPrivate;
+
+  };
+
+  // Nothing specified means private.
+  class bugalope : /* private*/  animal::quadruped {
+
+  public:
+    bugalope(int a) : animal::quadruped(),
+		       fBug(a)
+    {}
+
+    int fBugPublic;
+
+    bool testAccess();
+  protected:
+    bool fBugProtected;
+
+  private :
+    bool fBugPrivate;
+
+  };
+
+
+};
+
+#endif
diff --git a/site/cedet-1.0pre7/semantic/tests/testtemplates.cpp b/site/cedet-1.0pre7/semantic/tests/testtemplates.cpp
new file mode 100644
index 0000000..4ffb71c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testtemplates.cpp
@@ -0,0 +1,90 @@
+// Templates Test file:
+// Written by 'Raf'
+
+template <class T, int U, class V>
+class read_ref {
+public:
+  const T* read_ref_member_one( T);
+  const V* read_ref_member_two();
+};
+
+namespace NS {
+  template <class T, int U, class V>
+  class ref {
+  public:  
+    read_ref<T,10,V> operator->() {
+      m_// -1-
+	;
+      // #1# ( "m_datas" )
+    }  
+
+  private:
+    T m_datas[U];
+  };
+
+}
+
+class FooOne {
+public:
+  int fooOneMember();
+};
+
+class FooTwo {
+public:
+  int fooTwoMember();
+};
+
+class FooThree {
+public:
+  int fooThreeMember();
+
+  FooOne * operator->();
+};
+
+typedef ref<FooOne, 10,FooTwo> Test;
+
+using NS;
+
+void
+main(void) {
+  ref<FooOne, 10, FooTwo> v;
+  
+  v->read_ref_member_one()-> // -2-
+    ;
+  // #2# ( "fooOneMember" )
+
+  v->read_ref_member_two()-> // -3-
+    ;
+  // #3# ( "fooTwoMember" )
+
+  v-> // -4-
+    ;
+  // #4# ( "read_ref_member_one" "read_ref_member_two" )
+
+  Test t;
+
+  t->read_ref_member_two()-> // -5-
+    ;
+  // #5# ( "fooTwoMember" )
+
+  ref<FooOne, 10, FooThree> v2;
+  
+  v2->read_ref_member_two()-> // -6- 
+    ;
+  // #6# ( "fooOneMember" )
+
+  /* Try all these things by also specifying the namespace in the name. */
+  NS::ref<FooOne, 10, FooTwo> v3;
+  
+  v3->read_ref_member_one()-> // -7-
+    ;
+  // #7# ( "fooOneMember" )
+
+  v3->read_ref_member_two()-> // -8-
+    ;
+  // #8# ( "fooTwoMember" )
+
+  v3->read_ref_member_two// @1@ 5
+    ;
+
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testtypedefs.cpp b/site/cedet-1.0pre7/semantic/tests/testtypedefs.cpp
new file mode 100644
index 0000000..d772750
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testtypedefs.cpp
@@ -0,0 +1,94 @@
+// Sample with some fake bits out of std::string
+//
+// Thanks Ming-Wei Chang for these examples.
+
+namespace std {
+
+  template <T>class basic_string {
+
+  public:
+    void resize(int);
+  
+  };
+
+}
+
+typedef std::basic_string<char> mstring;
+
+using namespace std;
+typedef basic_string<char> bstring;
+
+
+int main(){
+  mstring a;
+
+  a.// -1-
+    ;
+  // #1# ( "resize" )
+  
+  bstring b;
+  // It doesn't work here.
+  b.// -2-
+    ;
+  // #2# ( "resize" )
+  
+  return 0;
+}
+
+
+// ------------------
+
+class Bar 
+{
+public:
+     void someFunc() {}
+
+};
+
+typedef Bar new_Bar;
+
+template <class mytype>
+class TBar 
+{
+public:
+     void otherFunc() {}
+
+};
+
+typedef TBar<char> new_TBar;
+
+int main()
+{
+  new_Bar nb;
+  new_TBar ntb;
+
+  nb.// -3-
+    ;
+  // #3# ("someFunc")
+
+  ntb.// -4-
+    ;
+  // #4# ("otherFunc")
+
+  return 0;
+}
+
+// ------------------
+// Example from Yupeng.
+
+typedef struct epd_info {
+     int a;
+} epd_info_t;
+
+static int epd_probe(struct platform_device *pdev)
+{
+     struct epd_info *db;
+     epd_info_t db1;
+
+     db.// -5-
+       ; // #5# ("a")
+     db1.// -6-
+       ;// #6# ("a")
+
+     return 1;
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testusing.cpp b/site/cedet-1.0pre7/semantic/tests/testusing.cpp
new file mode 100644
index 0000000..e6f46dd
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testusing.cpp
@@ -0,0 +1,157 @@
+// Test using statements in C++
+
+#include <adstdio.h>
+
+#include <testusing.hh>
+
+namespace moose {
+  
+  class MyClass;
+  class Point;
+
+  typedef MyClass snerk;
+}
+
+namespace moose {
+
+  class Point;
+  class MyClass;
+
+}
+
+namespace {
+  
+  int global_variable = 0;
+
+};
+
+using moose::MyClass;
+
+void someFcn() {
+
+  MyClass f;
+
+  f.//-1-
+    ; //#1# ( "getVal" "setVal" )
+
+}
+
+// Code from Zhiqiu Kong
+
+namespace panda {
+
+  using namespace bread_name;
+
+  int func()
+  {
+    bread test;
+    test.//-2-
+      ;// #2# ( "geta" )
+    return 0;
+  }
+}
+
+// Local using statements and aliased types
+// Code from David Engster
+
+void func2()
+{
+  using namespace somestuff;
+  OneClass f;
+  f.//-3-
+    ; //#3# ( "aFunc" "anInt" )
+}
+
+void func3()
+{
+  using somestuff::OneClass;
+  OneClass f;
+  f.//-4-
+    ; //#4# ( "aFunc" "anInt" )
+}
+
+// Dereferencing alias types created through 'using' statements
+
+// Alias with fully qualified name
+void func4()
+{
+  otherstuff::OneClass f;
+  f. //-5-
+    ; //#5# ( "aFunc" "anInt" )
+}
+
+// Alias through namespace directive
+void func5()
+{
+  using namespace otherstuff;
+  OneClass f;
+  f. //-6-
+    ; //#6# ( "aFunc" "anInt" )
+}
+
+// Check name hiding
+void func6()
+{
+  using namespace morestuff;
+  OneClass f;		// Alias for somestuff::OneClass
+  f.  //-7-
+    ; //#7# ( "aFunc" "anInt" )
+  aStruct g;	// This however is morestuff::aStruct !
+  g. //-8-
+    ; //#8# ( "anotherBar" "anotherFoo" )
+}
+
+// Alias of an alias
+// Currently doesn't work interactively for some reason.
+void func6()
+{
+  using namespace evenmorestuff;
+  OneClass f;
+  f. //-7-
+    ; //#7# ( "aFunc" "anInt" )
+}
+
+// Alias for struct in nested namespace, fully qualified
+void func7()
+{
+  outer::StructNested f;
+  f.//-8-
+    ; //#8# ( "one" "two" )
+}
+
+// Alias for nested namespace
+void func8()
+{
+  using namespace outerinner;
+  StructNested f;
+  AnotherStruct g;
+  f.//-9-
+    ; //#9# ( "one" "two" )
+  g.//-10-
+    ; //#10# ( "four" "three" )
+}
+
+// Check convetional namespace aliases
+// - fully qualified -
+void func9()
+{
+  alias_for_somestuff::OneClass c;
+  c.//-11-
+    ; //#11# ( "aFunc" "anInt" )
+  alias_for_outerinner::AnotherStruct s;
+  s. //-12-
+    ; //#12# ( "four" "three" )
+}
+
+// - unqualified -
+void func10()
+{
+  using namespace alias_for_somestuff;
+  OneClass c2;
+  c2.//-13-
+    ; //#13# ( "aFunc" "anInt" )
+  using namespace alias_for_outerinner;
+  AnotherStruct s2;
+  s2.//-14-
+    ; //#14# ( "four" "three" )
+}
diff --git a/site/cedet-1.0pre7/semantic/tests/testusing.hh b/site/cedet-1.0pre7/semantic/tests/testusing.hh
new file mode 100644
index 0000000..f6f7245
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testusing.hh
@@ -0,0 +1,130 @@
+// test usings header file.
+
+namespace moose {
+
+  class Point;
+
+  class MyClass;
+
+}
+
+
+namespace moose {
+
+  class Point;
+
+  class MyClass {
+  public:
+    MyClass() : fVal(0) {
+    }
+
+    ~MyClass() {};
+
+    /**
+     * fVal Accessors
+     * @{
+     */
+    int getVal() const {
+      return fVal;
+    }
+    void setVal(int Val) const {
+      fVal = Val;
+    }
+    /**
+     * @}
+     */
+  private:
+    int fVal;
+  };
+
+}
+
+namespace deer {
+
+  class Pickle;
+
+};
+
+// Code from Zhiqiu Kong
+
+#ifndef BREAD_H
+#define BREAD_H
+
+namespace bread_name {
+  class bread
+  {
+  public:
+    void geta();
+  private:
+    int m_a;
+    int m_b;
+  };
+}
+
+#endif
+
+// Code from David Engster
+// Creating alias types through 'using' trickery
+
+namespace somestuff {
+  class OneClass {
+  public:
+    void aFunc();
+    int anInt;
+  };
+  struct aStruct {
+    int foo;
+    int bar;
+  };
+}
+
+namespace otherstuff {
+  // make otherstuff::OneClass an alias for somestuff::OneClass
+  using somestuff::OneClass;
+}
+
+namespace morestuff {
+  // make morestuff an alias namespace for somestuff
+  using namespace somestuff;
+  // but hide aStruct with own type
+  struct aStruct {
+    int anotherFoo;
+    int anotherBar;
+  };
+}
+
+// We can also create an alias for an alias
+namespace evenmorestuff {
+  using otherstuff::OneClass;
+}
+
+// Now with nested namespaces
+namespace outer {
+  namespace inner {
+    struct StructNested {
+      int one;
+      int two;
+    };
+    struct AnotherStruct {
+      int three;
+      int four;
+    };
+  }
+}
+
+// Elevate the first struct into 'outer'
+// so that we can access it via 'outer::StructNested'
+namespace outer {
+  using outer::inner::StructNested;
+}
+
+// Create an alias for a nested namespace
+namespace outerinner {
+  // equivalent to 'namespace outerinner = outer::inner;'
+  using namespace outer::inner;
+}
+
+// Create namespace alias
+namespace alias_for_somestuff = somestuff;
+// Same for nested namespace
+namespace alias_for_outerinner = outer::inner;
diff --git a/site/cedet-1.0pre7/semantic/tests/testvarnames.c b/site/cedet-1.0pre7/semantic/tests/testvarnames.c
new file mode 100644
index 0000000..5e576fd
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/tests/testvarnames.c
@@ -0,0 +1,71 @@
+/*
+ * Test variable and function names, lists of variables on one line, etc.
+ */
+
+struct independent {
+  int indep_1;
+  int indep_2;
+};
+
+struct independent var_indep_struct;
+
+struct {
+  int unnamed_1;
+  int unnamed_2;
+} var_unamed_struct;
+
+struct {
+  int unnamed_3;
+  int unnamed_4;
+} var_un_2, var_un_3;
+
+struct inlinestruct {
+  int named_1;
+  int named_2;
+} var_named_struct;
+
+struct inline2struct {
+  int named_3;
+  int named_4;
+} var_n_2, var_n_3;
+
+/* Structures with names that then declare variables
+ * should also be completable.
+ *
+ * Getting this to work is the bugfix in semantic-c.el CVS v 1.122
+ */
+struct inlinestruct in_var1;
+struct inline2struct in_var2;
+
+int test_1(int var_arg1) {
+
+  var_// -1-
+    ; // #1# ("var_arg1" "var_indep_struct" "var_n_2" "var_n_3" "var_named_struct" "var_un_2" "var_un_3" "var_unamed_struct")
+
+  var_indep_struct.// -2-
+    ; // #2# ( "indep_1" "indep_2" )
+
+  var_unamed_struct.// -3-
+    ; // #3# ( "unnamed_1" "unnamed_2" )
+
+  var_named_struct.// -4-
+    ; // #4# ( "named_1" "named_2" )
+
+  var_un_2.// -5-
+    ; // #5# ( "unnamed_3" "unnamed_4" )
+  var_un_3.// -6-
+    ; // #6# ( "unnamed_3" "unnamed_4" )
+
+  var_n_2.// -7-
+    ; // #7# ( "named_3" "named_4" )
+  var_n_3.// -8-
+    ; // #8# ( "named_3" "named_4" )
+
+  in_// -9-
+    ; // #9# ( "in_var1" "in_var2" )
+
+  in_var1.// -10-
+    ; // #10# ( "named_1" "named_2")
+  in_var2.// -11-
+    ; // #11# ( "named_3" "named_4")
+}
diff --git a/site/cedet-1.0pre7/semantic/wisent/Makefile b/site/cedet-1.0pre7/semantic/wisent/Makefile
new file mode 100644
index 0000000..a84b217
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/Makefile
@@ -0,0 +1,84 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+tools_LISP=bison-wisent.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+wisent_LISP=wisent.el semantic-wisent.el wisent-comp.el wisent-expr.el wisent-grammar.el wisent-debug.el wisent-grammar-macros.el
+LOADPATH= ../../speedbar/ ../../common/ ../bovine/ ../\
+    ../../ede/ ../../eieio/
+wy_SEMANTIC_GRAMMAR=wisent-java-tags.wy wisent-awk.wy wisent-calc.wy wisent-cim.wy wisent-java.wy wisent-python.wy wisent-javascript-jv.wy
+wy_SEMANTIC_GRAMMAR_EL=wisent-java-tags-wy.el wisent-awk-wy.el wisent-calc-wy.el wisent-cim-wy.el wisent-java-wy.el wisent-python-wy.el wisent-javascript-jv-wy.el
+languages_LISP=wisent-calc.el wisent-java.el wisent-java-tags.el wisent-python.el wisent-javascript.el
+VERSION=2.0pre7
+DISTDIR=$(top)semantic-$(VERSION)/wisent
+
+
+
+all: tools wisent wy languages
+
+.PHONY: tools
+tools: $(tools_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: wisent
+wisent: $(wisent_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: wy
+wy: $(wy_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: languages
+languages: $(languages_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist: $(wy_SEMANTIC_GRAMMAR_EL)
+	mkdir $(DISTDIR)
+	cp $(tools_LISP) $(wisent_LISP) $(wy_SEMANTIC_GRAMMAR) $(wy_SEMANTIC_GRAMMAR_EL) $(languages_LISP) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/semantic/wisent/Project.ede b/site/cedet-1.0pre7/semantic/wisent/Project.ede
new file mode 100644
index 0000000..8f83f4b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/Project.ede
@@ -0,0 +1,30 @@
+;; Object semantic/wisent
+;; EDE project file.
+(ede-proj-project "semantic/wisent"
+  :name "wisent"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp "tools"
+    :name "tools"
+    :path ""
+    :source '("bison-wisent.el")
+    )
+   (ede-proj-target-elisp "wisent"
+    :name "wisent"
+    :path ""
+    :source '("wisent.el" "semantic-wisent.el" "wisent-comp.el" "wisent-expr.el" "wisent-grammar.el" "wisent-debug.el" "wisent-grammar-macros.el")
+    :aux-packages '("semantic" "semantic-java" "inversion" "speedbar")
+    )
+   (semantic-ede-proj-target-grammar "wy"
+    :name "wy"
+    :path ""
+    :source '("wisent-java-tags.wy" "wisent-awk.wy" "wisent-calc.wy" "wisent-cim.wy" "wisent-java.wy" "wisent-python.wy" "wisent-javascript-jv.wy")
+    )
+   (ede-proj-target-elisp "languages"
+    :name "languages"
+    :path ""
+    :source '("wisent-calc.el" "wisent-java.el" "wisent-java-tags.el" "wisent-python.el" "wisent-javascript.el")
+    )
+   )
+  :configuration-variables 'nil
+  )
diff --git a/site/cedet-1.0pre7/semantic/wisent/bison-wisent.el b/site/cedet-1.0pre7/semantic/wisent/bison-wisent.el
new file mode 100644
index 0000000..9dd0c1b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/bison-wisent.el
@@ -0,0 +1,161 @@
+;;; bison-wisent.el --- Translate Yacc/Bison files to wisent
+
+;;; Copyright (C) 2002 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: bison-wisent.el,v 1.3 2005/09/30 20:22:44 zappo Exp $
+
+;; Semantic is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Wisent is a port of Bison to Emacs Lisp.  As such, existing
+;; grammars as found in GNU tools such as GCC can be used almost in
+;; tact.  This program will translate existing yacc/bison grammars
+;; into a form wisent can handle.  It is then up to the programmer to
+;; add the actions needed to tag a file, or do something else useful.
+
+;;; Code:
+(defalias 'yacc->wisent 'bison->wisent)
+(require 'cc-mode)
+
+;;;###autoload
+(defun bison->wisent ()
+  "Treat the current buffer as a YACC or BISON file, and translate to wisent.
+Replaces all comments with wisent compatible comments.
+Finds % commands that wisent cannot handle, and comments them out.
+Deletes all actions, replacing them with small comments."
+  (interactive)
+  (with-syntax-table c-mode-syntax-table
+    (bison->wisent-program-delete)
+    (bison->wisent-action-replace)
+    (bison->wisent-comment-replace)
+    (bison->wisent-command-replace)
+    ))
+
+(defun bison->wisent-program-delete ()
+  "Delete the C program section of a yacc/bison gramar."
+  (goto-char (point-min))
+  (re-search-forward "^%%" nil nil 2)
+  (beginning-of-line)
+  (delete-region (point) (point-max)))
+
+(defun bison->wisent-in-c-action ()
+  "Return non-nil if point is in a C style yacc/bison action."
+  (condition-case nil
+      (save-excursion
+	(up-list -1)
+	(and (looking-at "{")
+	     (not (eq (preceding-char) ?'))
+	     (not (eq (preceding-char) ?%))
+	     ))
+    (error nil)))
+
+(defun bison->wisent-action-replace-once ()
+  "Replace one C action with a amall wisent comment.
+Return t on success."
+  (while (and (re-search-forward "{" nil t)
+	      (not (bison->wisent-in-c-action))))
+  (if (not (bison->wisent-in-c-action))
+     nil
+    ;; Replace this action with a small comment
+    (up-list -1)
+    (delete-region (point) (progn
+			     (forward-sexp 1)
+			     (point)))
+    (delete-horizontal-space)
+    (if (not (looking-at "$"))
+	(save-excursion
+	  (newline)
+	  (indent-for-tab-command)))
+    (insert ";; ")
+    t))
+
+(defun bison->wisent-action-replace  ()
+  "Find all yacc actions and remove, replace with small comments."
+  (goto-char (point-min))
+  (re-search-forward "^%%" nil t)
+  (while (bison->wisent-action-replace-once)))
+
+
+(defun bison->wisent-comment-replace-once ()
+  "Replace one C comment with a wisent comment.
+Return t on success."
+ (if (not (re-search-forward "/\\*" nil t))
+     nil
+   (let ((s (match-beginning 0))
+	 (e nil)
+	 (c nil))
+     (if (not (re-search-forward "\\*/" nil t))
+	 (error "Unterminated comment!"))
+     (setq e (match-end 0))
+     (goto-char (match-beginning 0))
+     (delete-char 2)
+     (delete-horizontal-space)
+     (setq e (point))
+     (if (not (looking-at "$"))
+	 (progn (insert "\n")
+		(indent-for-tab-command)))
+     (goto-char s)
+     (delete-char 2)
+     (setq c (current-column))
+     (insert ";;")
+     (forward-line 1)
+     (beginning-of-line-text)
+     (while (< (point) e)
+       (if (or (looking-at "\\s-\\*")
+	       (looking-at "\\*\\s-"))
+	   (progn (replace-match ";;")
+		  (goto-char (match-end 0))
+		  )
+	 (beginning-of-line-text)
+	 (delete-horizontal-space)
+	 (indent-to-column c)
+	 (insert ";; "))
+       (forward-line 1)
+       (beginning-of-line))
+     (goto-char e)
+     t)))
+
+(defun bison->wisent-comment-replace ()
+  "Find all the C comments in this buffer and convert them to .wy comments."
+  (goto-char (point-min))
+  (while (bison->wisent-comment-replace-once)))
+
+(defun bison->wisent-command-replace ()
+  "Find all commands not supported by wisent, and delete them."
+  (goto-char (point-min))
+  (while (re-search-forward "%\\({\\|union\\|type\\)" nil t)
+    (goto-char (match-beginning 0))
+    (let ((txt (match-string 0))
+	  (s (point))
+	  (e (cond
+	      ((looking-at "%{")
+	       (forward-sexp 1)
+	       (point))
+	      ((looking-at "%union")
+	       (forward-sexp 2)
+	       (point))
+	      (t
+	       (point-at-eol))
+	      )))
+      (delete-region s e)
+      (insert ";; Deleted a " txt " here"))
+    ))
+
+(provide 'bison-wisent)
+
+;;; bison-wisent.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/semantic-wisent.el b/site/cedet-1.0pre7/semantic/wisent/semantic-wisent.el
new file mode 100644
index 0000000..164b5b9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/semantic-wisent.el
@@ -0,0 +1,346 @@
+;;; semantic-wisent.el --- Wisent - Semantic gateway
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 30 Aug 2001
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-wisent.el,v 1.4 2007/01/23 15:41:09 ponced Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Here are functions necessary to use the Wisent LALR parser from
+;; Semantic environment.
+
+;;; History:
+;;
+
+;;; Code:
+
+(require 'semantic)
+(require 'wisent)
+
+;;; Lexical analysis
+;;
+(defvar wisent-lex-istream nil
+  "Input stream of `semantic-lex' syntactic tokens.")
+
+(defvar wisent-lex-lookahead nil
+  "Extra lookahead token.
+When non-nil it is directly returned by `wisent-lex-function'.")
+
+;; Maintain this alias for compatibility until all WY grammars have
+;; been translated again to Elisp code.
+(semantic-alias-obsolete 'wisent-lex-make-token-table
+                         'semantic-lex-make-type-table)
+
+(defmacro wisent-lex-eoi ()
+  "Return an End-Of-Input lexical token.
+The EOI token is like this: ($EOI "" POINT-MAX . POINT-MAX)."
+  `(cons ',wisent-eoi-term
+         (cons ""
+               (cons (point-max) (point-max)))))
+
+(defmacro define-wisent-lexer (name doc &rest body)
+  "Create a new lexical analyzer with NAME.
+DOC is a documentation string describing this analyzer.
+When a token is available in `wisent-lex-istream', eval BODY forms
+sequentially.  BODY must return a lexical token for the LALR parser.
+
+Each token in input was produced by `semantic-lex', it is a list:
+
+  (TOKSYM START . END)
+
+TOKSYM is a terminal symbol used in the grammar.
+START and END mark boundary in the current buffer of that token's
+value.
+
+Returned tokens must have the form:
+
+  (TOKSYM VALUE START . END)
+
+where VALUE is the buffer substring between START and END positions."
+  `(defun
+     ,name () ,doc
+     (cond
+      (wisent-lex-lookahead
+       (prog1 wisent-lex-lookahead
+         (setq wisent-lex-lookahead nil)))
+      (wisent-lex-istream
+       ,@body)
+      ((wisent-lex-eoi)))))
+
+(define-wisent-lexer wisent-lex
+  "Return the next available lexical token in Wisent's form.
+The variable `wisent-lex-istream' contains the list of lexical tokens
+produced by `semantic-lex'.  Pop the next token available and convert
+it to a form suitable for the Wisent's parser."
+  (let* ((tk (car wisent-lex-istream)))
+    ;; Eat input stream
+    (setq wisent-lex-istream (cdr wisent-lex-istream))
+    (cons (semantic-lex-token-class tk)
+          (cons (semantic-lex-token-text tk)
+                (semantic-lex-token-bounds tk)))))
+
+;;; Syntax analysis
+;;
+(defvar wisent-error-function nil
+  "Function used to report parse error.
+By default use the function `wisent-message'.")
+(make-variable-buffer-local 'wisent-error-function)
+
+(defvar wisent-lexer-function 'wisent-lex
+  "Function used to obtain the next lexical token in input.
+Should be a lexical analyzer created with `define-wisent-lexer'.")
+(make-variable-buffer-local 'wisent-lexer-function)
+
+;; Tag production
+;;
+(defsubst wisent-raw-tag (semantic-tag)
+  "Return raw form of given Semantic tag SEMANTIC-TAG.
+Should be used in semantic actions, in grammars, to build a Semantic
+parse tree."
+  (nconc semantic-tag
+         (if (or $region
+                 (setq $region (nthcdr 2 wisent-input)))
+             (list (car $region) (cdr $region))
+           (list (point-max) (point-max)))))
+
+(defsubst wisent-cook-tag (raw-tag)
+  "From raw form of Semantic tag RAW-TAG, return a list of cooked tags.
+Should be used in semantic actions, in grammars, to build a Semantic
+parse tree."
+  (let* ((cooked (semantic--tag-expand raw-tag))
+         (l cooked))
+    (while l
+      (semantic--tag-put-property (car l) 'reparse-symbol $nterm)
+      (setq l (cdr l)))
+    cooked))
+
+;; Unmatched syntax collector
+;;
+(defun wisent-collect-unmatched-syntax (nomatch)
+  "Add lexical token NOMATCH to the cache of unmatched tokens.
+See also the variable `semantic-unmatched-syntax-cache'.
+
+NOMATCH is in Wisent's form: (SYMBOL VALUE START . END)
+and will be collected in `semantic-lex' form: (SYMBOL START . END)."
+  (let ((region (cddr nomatch)))
+    (and (number-or-marker-p (car region))
+         (number-or-marker-p (cdr region))
+         (setq semantic-unmatched-syntax-cache
+               (cons (cons (car nomatch) region)
+                     semantic-unmatched-syntax-cache)))))
+
+;; Parser plug-ins
+;;
+;; The following functions permit to plug the Wisent LALR parser in
+;; Semantic toolkit.  They use the standard API provided by Semantic
+;; to plug parsers in.
+;;
+;; Two plug-ins are available, BUT ONLY ONE MUST BE USED AT A TIME:
+;;
+;; - `wisent-parse-stream' designed to override the standard function
+;;   `semantic-parse-stream'.
+;;
+;; - `wisent-parse-region' designed to override the standard function
+;;   `semantic-parse-region'.
+;;
+;; Maybe the latter is faster because it eliminates a lot of function
+;; call.
+;;
+(defun wisent-parse-stream (stream goal)
+  "Parse STREAM using the Wisent LALR parser.
+GOAL is a nonterminal symbol to start parsing at.
+Return the list (STREAM SEMANTIC-STREAM) where STREAM are those
+elements of STREAM that have not been used.  SEMANTIC-STREAM is the
+list of semantic tags found.
+The LALR parser automaton must be available in buffer local variable
+`semantic--parse-table'.
+
+Must be installed by `semantic-install-function-overrides' to override
+the standard function `semantic-parse-stream'."
+  (let (wisent-lex-istream wisent-lex-lookahead la-elt cache)
+
+    ;; IMPLEMENTATION NOTES:
+    ;; `wisent-parse' returns a lookahead token when it stopped
+    ;; parsing before encountering the end of input.  To re-enter the
+    ;; parser it is necessary to push back in the lexical input stream
+    ;; the last lookahead token issued.  Because the format of
+    ;; lookahead tokens and tokens in STREAM can be different the
+    ;; lookahead token is put in the variable `wisent-lex-lookahead'
+    ;; before calling `wisent-parse'.  Wisent's lexers always pop the
+    ;; next lexical token from that variable when non nil, then from
+    ;; the lexical input stream.
+    ;;
+    ;; The first element of STREAM is used to keep lookahead tokens
+    ;; across successive calls to `wisent-parse-stream'.  In fact
+    ;; what is kept is a stack of lookaheads encountered so far.  It
+    ;; is cleared when `wisent-parse' returns a valid semantic tag,
+    ;; or twice the same lookahead token!  The latter indicates that
+    ;; there is a syntax error on that token.  If so, tokens currently
+    ;; in the lookahead stack have not been used, and are moved into
+    ;; `semantic-unmatched-syntax-cache'.  When the parser will be
+    ;; re-entered, a new lexical token will be read from STREAM.
+    ;;
+    ;; The first element of STREAM that contains the lookahead stack
+    ;; has this format (compatible with the format of `semantic-lex'
+    ;; tokens):
+    ;;
+    ;; (LOOKAHEAD-STACK START . END)
+    ;;
+    ;; where LOOKAHEAD-STACK is a list of lookahead tokens.  And
+    ;; START/END are the bounds of the lookahead at top of stack.
+
+    ;; Retrieve lookahead token from stack
+    (setq la-elt (car stream))
+    (if (consp (car la-elt))
+        ;; The first elt of STREAM contains a lookahead stack
+        (setq wisent-lex-lookahead (caar la-elt)
+              stream (cdr stream))
+      (setq la-elt nil))
+    ;; Parse
+    (setq wisent-lex-istream stream
+          cache (semantic-safe "wisent-parse-stream: %s"
+                  (condition-case error-to-filter
+                      (wisent-parse semantic--parse-table
+                                    wisent-lexer-function
+                                    wisent-error-function
+                                    goal)
+                    (args-out-of-range
+                     (if (and (not debug-on-error)
+                              (= wisent-parse-max-stack-size
+                                 (nth 2 error-to-filter)))
+                         (progn
+                           (message "wisent-parse-stream: %s"
+                                    (error-message-string error-to-filter))
+                           (message "wisent-parse-max-stack-size \
+might need to be increased"))
+                       (apply 'signal error-to-filter))))))
+    ;; Manage returned lookahead token
+    (if wisent-lookahead
+        (if (eq (caar la-elt) wisent-lookahead)
+            ;; It is already at top of lookahead stack
+            (progn
+              (setq cache nil
+                    la-elt (car la-elt))
+              (while la-elt
+                ;; Collect unmatched tokens from the stack
+                (run-hook-with-args
+                 'wisent-discarding-token-functions (car la-elt))
+                (setq la-elt (cdr la-elt))))
+          ;; New lookahead token
+          (if (or (consp cache) ;; Clear the stack if parse succeeded
+                  (null la-elt))
+              (setq la-elt (cons nil nil)))
+          ;; Push it into the stack
+          (setcar la-elt (cons wisent-lookahead (car la-elt)))
+          ;; Update START/END
+          (setcdr la-elt (cddr wisent-lookahead))
+          ;; Push (LOOKAHEAD-STACK START . END) in STREAM
+          (setq wisent-lex-istream (cons la-elt wisent-lex-istream))))
+    ;; Return (STREAM SEMANTIC-STREAM)
+    (list wisent-lex-istream
+          (if (consp cache) cache '(nil))
+          )))
+
+(defun wisent-parse-region (start end &optional goal depth returnonerror)
+  "Parse the area between START and END using the Wisent LALR parser.
+Return the list of semantic tags found.
+Optional arguments GOAL is a nonterminal symbol to start parsing at,
+DEPTH is the lexical depth to scan, and RETURNONERROR is a flag to
+stop parsing on syntax error, when non-nil.
+The LALR parser automaton must be available in buffer local variable
+`semantic--parse-table'.
+
+Must be installed by `semantic-install-function-overrides' to override
+the standard function `semantic-parse-region'."
+  (if (or (< start (point-min)) (> end (point-max)) (< end start))
+      (error "Invalid bounds [%s %s] passed to `wisent-parse-region'"
+             start end))
+  (let* ((case-fold-search semantic-case-fold)
+         (wisent-lex-istream (semantic-lex start end depth))
+         ptree tag cooked lstack wisent-lex-lookahead)
+    ;; Loop while there are lexical tokens available
+    (while wisent-lex-istream
+      ;; Parse
+      (setq wisent-lex-lookahead (car lstack)
+            tag (semantic-safe "wisent-parse-region: %s"
+                    (wisent-parse semantic--parse-table
+                                  wisent-lexer-function
+                                  wisent-error-function
+                                  goal)))
+      ;; Manage returned lookahead token
+      (if wisent-lookahead
+          (if (eq (car lstack) wisent-lookahead)
+              ;; It is already at top of lookahead stack
+              (progn
+                (setq tag nil)
+                (while lstack
+                  ;; Collect unmatched tokens from lookahead stack
+                  (run-hook-with-args
+                   'wisent-discarding-token-functions (car lstack))
+                  (setq lstack (cdr lstack))))
+            ;; Push new lookahead token into the stack
+            (setq lstack (cons wisent-lookahead lstack))))
+      ;; Manage the parser result
+      (cond
+       ;; Parse succeeded, cook result
+       ((consp tag)
+        (setq lstack nil ;; Clear the lookahead stack
+              cooked (semantic--tag-expand tag)
+              ptree (append cooked ptree))
+        (while cooked
+          (setq tag    (car cooked)
+                cooked (cdr cooked))
+          (or (semantic--tag-get-property tag 'reparse-symbol)
+              (semantic--tag-put-property tag 'reparse-symbol goal)))
+        )
+       ;; Return on error if requested
+       (returnonerror
+        (setq wisent-lex-istream nil)
+        ))
+      ;; Work in progress...
+      (if wisent-lex-istream
+	  (if (eq semantic-working-type 'percent)
+	      (working-status
+               (/ (* 100 (semantic-lex-token-start
+                          (car wisent-lex-istream)))
+                  (point-max)))
+	    (working-dynamic-status))))
+    ;; Return parse tree
+    (nreverse ptree)))
+
+;;; Interfacing with edebug
+;;
+(add-hook
+ 'edebug-setup-hook
+ #'(lambda ()
+
+     (def-edebug-spec define-wisent-lexer
+       (&define name stringp def-body)
+       )
+
+     ))
+
+(provide 'semantic-wisent)
+
+;;; semantic-wisent.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-awk-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-awk-wy.el
new file mode 100644
index 0000000..b3f7d01
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-awk-wy.el
@@ -0,0 +1,357 @@
+;;; wisent-awk-wy.el --- Generated parser support file
+
+;; Copyright (C) 2002 David Ponce
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:45-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-awk.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-awk-wy--keyword-table
+  (semantic-lex-make-keyword-table 'nil 'nil)
+  "Table of language keywords.")
+
+(defconst wisent-awk-wy--token-table
+  (semantic-lex-make-type-table
+   '(("<no-type>"
+      (LEX_LENGTH)
+      (LEX_BUILTIN)
+      (DECREMENT)
+      (INCREMENT)
+      (LEX_OR)
+      (LEX_AND)
+      (LEX_IN)
+      (LEX_NEXTFILE)
+      (LEX_GETLINE)
+      (LEX_FUNCTION)
+      (LEX_EXIT)
+      (LEX_NEXT)
+      (LEX_PRINTF)
+      (LEX_PRINT)
+      (LEX_CONTINUE)
+      (LEX_BREAK)
+      (LEX_FOR)
+      (LEX_DO)
+      (LEX_WHILE)
+      (LEX_DELETE)
+      (LEX_RETURN)
+      (LEX_ELSE)
+      (LEX_IF)
+      (LEX_END)
+      (LEX_BEGIN)
+      (CONCAT_OP)
+      (NEWLINE)
+      (MATCHOP)
+      (ASSIGNOP)
+      (APPEND_OP)
+      (RELOP)
+      (YSTRING)
+      (YNUMBER)
+      (ERROR)
+      (REGEXP)
+      (NAME)
+      (FUNC_CALL)))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst wisent-awk-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((FUNC_CALL NAME REGEXP ERROR YNUMBER YSTRING RELOP APPEND_OP ASSIGNOP MATCHOP NEWLINE CONCAT_OP LEX_BEGIN LEX_END LEX_IF LEX_ELSE LEX_RETURN LEX_DELETE LEX_WHILE LEX_DO LEX_FOR LEX_BREAK LEX_CONTINUE LEX_PRINT LEX_PRINTF LEX_NEXT LEX_EXIT LEX_FUNCTION LEX_GETLINE LEX_NEXTFILE LEX_IN LEX_AND LEX_OR INCREMENT DECREMENT LEX_BUILTIN LEX_LENGTH)
+       ((right ASSIGNOP)
+	(right 63 58)
+	(left LEX_OR)
+	(left LEX_AND)
+	(left LEX_GETLINE)
+	(nonassoc LEX_IN)
+	(left FUNC_CALL LEX_BUILTIN LEX_LENGTH)
+	(nonassoc 44)
+	(nonassoc MATCHOP)
+	(nonassoc RELOP 60 62 124 APPEND_OP TWOWAYIO)
+	(left CONCAT_OP)
+	(left YSTRING YNUMBER)
+	(left 43 45)
+	(left 42 47 37)
+	(right 33 UNARY)
+	(right 94)
+	(left INCREMENT DECREMENT)
+	(left 36)
+	(left 40 41))
+       (start_
+	((opt_nls program opt_nls)))
+       (program
+	((rule))
+	((program rule))
+	((error))
+	((program error))
+	(nil))
+       (rule
+	((LEX_BEGIN
+	  (progn)
+	  action))
+	((LEX_END
+	  (progn)
+	  action))
+	((LEX_BEGIN statement_term))
+	((LEX_END statement_term))
+	((pattern action))
+	((action))
+	((pattern statement_term))
+	((function_prologue function_body)))
+       (func_name
+	((NAME))
+	((FUNC_CALL))
+	((lex_builtin)))
+       (lex_builtin
+	((LEX_BUILTIN))
+	((LEX_LENGTH)))
+       (function_prologue
+	((LEX_FUNCTION
+	  (progn)
+	  func_name 40 opt_param_list r_paren opt_nls)))
+       (function_body
+	((l_brace statements r_brace opt_semi opt_nls))
+	((l_brace r_brace opt_semi opt_nls)))
+       (pattern
+	((exp))
+	((exp 44 exp)))
+       (regexp
+	((47
+	  (progn)
+	  REGEXP 47)))
+       (action
+	((l_brace statements r_brace opt_semi opt_nls))
+	((l_brace r_brace opt_semi opt_nls)))
+       (statements
+	((statement))
+	((statements statement))
+	((error))
+	((statements error)))
+       (statement_term
+	((nls))
+	((semi opt_nls)))
+       (statement
+	((semi opt_nls))
+	((l_brace r_brace))
+	((l_brace statements r_brace))
+	((if_statement))
+	((LEX_WHILE 40 exp r_paren opt_nls statement))
+	((LEX_DO opt_nls statement LEX_WHILE 40 exp r_paren opt_nls))
+	((LEX_FOR 40 NAME LEX_IN NAME r_paren opt_nls statement))
+	((LEX_FOR 40 opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement))
+	((LEX_FOR 40 opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement))
+	((LEX_BREAK statement_term))
+	((LEX_CONTINUE statement_term))
+	((print 40 expression_list r_paren output_redir statement_term))
+	((print opt_rexpression_list output_redir statement_term))
+	((LEX_NEXT statement_term))
+	((LEX_NEXTFILE statement_term))
+	((LEX_EXIT opt_exp statement_term))
+	((LEX_RETURN
+	  (progn)
+	  opt_exp statement_term))
+	((LEX_DELETE NAME 91 expression_list 93 statement_term))
+	((LEX_DELETE NAME statement_term))
+	((exp statement_term)))
+       (print
+	((LEX_PRINT))
+	((LEX_PRINTF)))
+       (if_statement
+	((LEX_IF 40 exp r_paren opt_nls statement))
+	((LEX_IF 40 exp r_paren opt_nls statement LEX_ELSE opt_nls statement)))
+       (nls
+	((NEWLINE))
+	((nls NEWLINE)))
+       (opt_nls
+	(nil)
+	((nls)))
+       (input_redir
+	(nil)
+	((60 simp_exp)))
+       (output_redir
+	(nil)
+	((62 exp))
+	((APPEND_OP exp))
+	((124 exp))
+	((TWOWAYIO exp)))
+       (opt_param_list
+	(nil)
+	((param_list)))
+       (param_list
+	((NAME))
+	((param_list comma NAME))
+	((error))
+	((param_list error))
+	((param_list comma error)))
+       (opt_exp
+	(nil)
+	((exp)))
+       (opt_rexpression_list
+	(nil)
+	((rexpression_list)))
+       (rexpression_list
+	((rexp))
+	((rexpression_list comma rexp))
+	((error))
+	((rexpression_list error))
+	((rexpression_list error rexp))
+	((rexpression_list comma error)))
+       (opt_expression_list
+	(nil)
+	((expression_list)))
+       (expression_list
+	((exp))
+	((expression_list comma exp))
+	((error))
+	((expression_list error))
+	((expression_list error exp))
+	((expression_list comma error)))
+       (exp
+	((variable ASSIGNOP
+		   (progn)
+		   exp))
+	((40 expression_list r_paren LEX_IN NAME))
+	((exp 124 LEX_GETLINE opt_variable))
+	((exp TWOWAYIO LEX_GETLINE opt_variable))
+	((LEX_GETLINE opt_variable input_redir))
+	((exp LEX_AND exp))
+	((exp LEX_OR exp))
+	((exp MATCHOP exp))
+	((regexp))
+	((33 regexp)
+	 [UNARY])
+	((exp LEX_IN NAME))
+	((exp RELOP exp))
+	((exp 60 exp))
+	((exp 62 exp))
+	((exp 63 exp 58 exp))
+	((simp_exp))
+	((exp simp_exp)
+	 [CONCAT_OP]))
+       (rexp
+	((variable ASSIGNOP
+		   (progn)
+		   rexp))
+	((rexp LEX_AND rexp))
+	((rexp LEX_OR rexp))
+	((LEX_GETLINE opt_variable input_redir))
+	((regexp))
+	((33 regexp)
+	 [UNARY])
+	((rexp MATCHOP rexp))
+	((rexp LEX_IN NAME))
+	((rexp RELOP rexp))
+	((rexp 63 rexp 58 rexp))
+	((simp_exp))
+	((rexp simp_exp)
+	 [CONCAT_OP]))
+       (simp_exp
+	((non_post_simp_exp))
+	((simp_exp 94 simp_exp))
+	((simp_exp 42 simp_exp))
+	((simp_exp 47 simp_exp))
+	((simp_exp 37 simp_exp))
+	((simp_exp 43 simp_exp))
+	((simp_exp 45 simp_exp))
+	((variable INCREMENT))
+	((variable DECREMENT)))
+       (non_post_simp_exp
+	((33 simp_exp)
+	 [UNARY])
+	((40 exp r_paren))
+	((LEX_BUILTIN 40 opt_expression_list r_paren))
+	((LEX_LENGTH 40 opt_expression_list r_paren))
+	((LEX_LENGTH))
+	((FUNC_CALL 40 opt_expression_list r_paren))
+	((variable))
+	((INCREMENT variable))
+	((DECREMENT variable))
+	((YNUMBER))
+	((YSTRING))
+	((45 simp_exp)
+	 [UNARY])
+	((43 simp_exp)
+	 [UNARY]))
+       (opt_variable
+	(nil)
+	((variable)))
+       (variable
+	((NAME))
+	((NAME 91 expression_list 93))
+	((36 non_post_simp_exp)))
+       (l_brace
+	((123 opt_nls)))
+       (r_brace
+	((125 opt_nls)))
+       (r_paren
+	((41)))
+       (opt_semi
+	(nil)
+	((semi)))
+       (semi
+	((59)))
+       (comma
+	((44 opt_nls))))
+     'nil))
+  "Parser table.")
+
+(defun wisent-awk-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-awk-wy--parse-table
+	semantic-debug-parser-source "wisent-awk.wy"
+	semantic-flex-keywords-obarray wisent-awk-wy--keyword-table
+	semantic-lex-types-obarray wisent-awk-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+
+
+
+(provide 'wisent-awk-wy)
+
+;;; wisent-awk-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-awk.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-awk.wy
new file mode 100644
index 0000000..6817c9c
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-awk.wy
@@ -0,0 +1,356 @@
+;;; wisent-awk.wy --- GNU AWK Grammar
+
+;; Copyright (C) 2002 David Ponce
+;; Copyright 2001 Free Software Foundation, Inc.
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 27 Feb 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-awk.wy,v 1.3 2005/09/30 20:22:50 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a port of the Bison 1.31 GNU awk grammar found in file
+;; tests/torture.at.  It is good to torture Wisent too ;-).
+;; It should report 65 SR conflicts.
+;; Implementation is in the file wisent-awk.el.
+
+;;; History:
+;; 
+
+;;%package wisent-awk-wy
+
+%token FUNC_CALL NAME REGEXP
+%token ERROR
+%token YNUMBER YSTRING
+%token RELOP APPEND_OP
+%token ASSIGNOP MATCHOP NEWLINE CONCAT_OP
+%token LEX_BEGIN LEX_END LEX_IF LEX_ELSE LEX_RETURN LEX_DELETE
+%token LEX_WHILE LEX_DO LEX_FOR LEX_BREAK LEX_CONTINUE
+%token LEX_PRINT LEX_PRINTF LEX_NEXT LEX_EXIT LEX_FUNCTION
+%token LEX_GETLINE LEX_NEXTFILE
+%token LEX_IN
+%token LEX_AND LEX_OR INCREMENT DECREMENT
+%token LEX_BUILTIN LEX_LENGTH
+
+;; Lowest to highest
+%right ASSIGNOP
+%right '?' ':'
+%left LEX_OR
+%left LEX_AND
+%left LEX_GETLINE
+%nonassoc LEX_IN
+%left FUNC_CALL LEX_BUILTIN LEX_LENGTH
+%nonassoc ','
+%nonassoc MATCHOP
+%nonassoc RELOP '<' '>' '|' APPEND_OP TWOWAYIO
+%left CONCAT_OP
+%left YSTRING YNUMBER
+%left '+' '-'
+%left '*' '/' '%'
+%right '!' UNARY
+%right '^'
+%left INCREMENT DECREMENT
+%left '$'
+%left '(' ')'
+%%
+
+start_
+  : opt_nls program opt_nls
+  ;
+
+program
+  : rule
+  | program rule
+  | error
+  | program error
+  | ;; empty
+  ;
+
+rule
+  : LEX_BEGIN {} action
+  | LEX_END {}   action
+  | LEX_BEGIN statement_term
+  | LEX_END statement_term
+  | pattern action
+  | action
+  | pattern statement_term
+  | function_prologue function_body
+  ;
+
+func_name
+  : NAME
+  | FUNC_CALL
+  | lex_builtin
+  ;
+
+lex_builtin
+  : LEX_BUILTIN
+  | LEX_LENGTH
+  ;
+
+function_prologue
+  : LEX_FUNCTION {} func_name '\(' opt_param_list r_paren opt_nls
+  ;
+
+function_body
+  : l_brace statements r_brace opt_semi opt_nls
+  | l_brace r_brace opt_semi opt_nls
+  ;
+
+
+pattern
+  : exp
+  | exp ',' exp
+  ;
+
+regexp
+  :
+ ;; In this rule, want_regexp tells yylex that the next thing is a
+ ;; regexp so it should read up to the closing slash.
+    '/' {} REGEXP '/'
+  ;
+
+action
+  : l_brace statements r_brace opt_semi opt_nls
+  | l_brace r_brace opt_semi opt_nls
+  ;
+
+statements
+  : statement
+  | statements statement
+  | error
+  | statements error
+  ;
+
+statement_term
+  : nls
+  | semi opt_nls
+  ;
+
+statement
+  : semi opt_nls
+  | l_brace r_brace
+  | l_brace statements r_brace
+  | if_statement
+  | LEX_WHILE '\(' exp r_paren opt_nls statement
+  | LEX_DO opt_nls statement LEX_WHILE '\(' exp r_paren opt_nls
+  | LEX_FOR '\(' NAME LEX_IN NAME r_paren opt_nls statement
+  | LEX_FOR '\(' opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement
+  | LEX_FOR '\(' opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement
+  | LEX_BREAK statement_term
+  | LEX_CONTINUE statement_term
+  | print '\(' expression_list r_paren output_redir statement_term
+  | print opt_rexpression_list output_redir statement_term
+  | LEX_NEXT statement_term
+  | LEX_NEXTFILE statement_term
+  | LEX_EXIT opt_exp statement_term
+  | LEX_RETURN {} opt_exp statement_term
+  | LEX_DELETE NAME '[' expression_list ']' statement_term
+  | LEX_DELETE NAME  statement_term
+  | exp statement_term
+  ;
+
+print
+  : LEX_PRINT
+  | LEX_PRINTF
+  ;
+
+if_statement
+  : LEX_IF '\(' exp r_paren opt_nls statement
+  | LEX_IF '\(' exp r_paren opt_nls statement
+    LEX_ELSE opt_nls statement
+  ;
+
+nls
+  : NEWLINE
+  | nls NEWLINE
+  ;
+
+opt_nls
+  : ;; empty
+  | nls
+  ;
+
+input_redir
+  : ;; empty
+  | '<' simp_exp
+  ;
+
+output_redir
+  : ;; empty
+  | '>' exp
+  | APPEND_OP exp
+  | '|' exp
+  | TWOWAYIO exp
+  ;
+
+opt_param_list
+  : ;; empty
+  | param_list
+  ;
+
+param_list
+  : NAME
+  | param_list comma NAME
+  | error
+  | param_list error
+  | param_list comma error
+  ;
+
+;; optional expression, as in for loop
+opt_exp
+  : ;; empty
+  | exp
+  ;
+
+opt_rexpression_list
+  : ;; empty
+  | rexpression_list
+  ;
+
+rexpression_list
+  : rexp
+  | rexpression_list comma rexp
+  | error
+  | rexpression_list error
+  | rexpression_list error rexp
+  | rexpression_list comma error
+  ;
+
+opt_expression_list
+  : ;; empty
+  | expression_list
+  ;
+
+expression_list
+  : exp
+  | expression_list comma exp
+  | error
+  | expression_list error
+  | expression_list error exp
+  | expression_list comma error
+  ;
+
+;; Expressions, not including the comma operator.
+exp	: variable ASSIGNOP {} exp
+	| '\(' expression_list r_paren LEX_IN NAME
+        | exp '|' LEX_GETLINE opt_variable
+	| exp TWOWAYIO LEX_GETLINE opt_variable
+	| LEX_GETLINE opt_variable input_redir
+	| exp LEX_AND exp
+	| exp LEX_OR exp
+	| exp MATCHOP exp
+	| regexp
+	| '!' regexp %prec UNARY
+	| exp LEX_IN NAME
+	| exp RELOP exp
+	| exp '<' exp
+	| exp '>' exp
+	| exp '?' exp ':' exp
+	| simp_exp
+	| exp simp_exp %prec CONCAT_OP
+	;
+
+rexp
+  : variable ASSIGNOP {} rexp
+  | rexp LEX_AND rexp
+  | rexp LEX_OR rexp
+  | LEX_GETLINE opt_variable input_redir
+  | regexp
+  | '!' regexp %prec UNARY
+  | rexp MATCHOP rexp
+  | rexp LEX_IN NAME
+  | rexp RELOP rexp
+  | rexp '?' rexp ':' rexp
+  | simp_exp
+  | rexp simp_exp %prec CONCAT_OP
+  ;
+
+simp_exp
+  : non_post_simp_exp
+ ;; Binary operators in order of decreasing precedence.
+  | simp_exp '^' simp_exp
+  | simp_exp '*' simp_exp
+  | simp_exp '/' simp_exp
+  | simp_exp '%' simp_exp
+  | simp_exp '+' simp_exp
+  | simp_exp '-' simp_exp
+  | variable INCREMENT
+  | variable DECREMENT
+  ;
+
+non_post_simp_exp
+  : '!' simp_exp %prec UNARY
+  | '\(' exp r_paren
+  | LEX_BUILTIN
+    '\(' opt_expression_list r_paren
+  | LEX_LENGTH '\(' opt_expression_list r_paren
+  | LEX_LENGTH
+  | FUNC_CALL '\(' opt_expression_list r_paren
+  | variable
+  | INCREMENT variable
+  | DECREMENT variable
+  | YNUMBER
+  | YSTRING
+  | '-' simp_exp    %prec UNARY
+  | '+' simp_exp    %prec UNARY
+  ;
+
+opt_variable
+  : ;; empty
+  | variable
+  ;
+
+variable
+  : NAME
+  | NAME '[' expression_list ']'
+  | '$' non_post_simp_exp
+  ;
+
+l_brace
+  : '\{' opt_nls
+  ;
+
+r_brace
+  : '\}' opt_nls
+  ;
+
+r_paren
+  : '\)'
+  ;
+
+opt_semi
+  : ;; empty
+  | semi
+  ;
+
+semi
+  : ';'
+  ;
+
+comma
+  : ',' opt_nls
+  ;
+
+%%
+
+;;; wisent-awk.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-calc-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-calc-wy.el
new file mode 100644
index 0000000..f31e5eb
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-calc-wy.el
@@ -0,0 +1,144 @@
+;;; wisent-calc-wy.el --- Generated parser support file
+
+;; Copyright (C) 2002, 2003, 2009 David Ponce
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2010-02-20 17:22:44-0500
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-calc.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-calc-wy--keyword-table
+  (semantic-lex-make-keyword-table 'nil 'nil)
+  "Table of language keywords.")
+
+(defconst wisent-calc-wy--token-table
+  (semantic-lex-make-type-table
+   '(("number"
+      (NUM)))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst wisent-calc-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((NUM)
+       ((nonassoc 61)
+	(left 45 43)
+	(left 42 47)
+	(left NEG)
+	(left FACT)
+	(left NOT)
+	(right 94))
+       (input
+	((line))
+	((input line)
+	 (format "%s %s" $1 $2)))
+       (line
+	((59)
+	 (progn ";"))
+	((exp 59)
+	 (format "%s;" $1))
+	((error 59)
+	 (progn "Error;")))
+       (exp
+	((NUM)
+	 (string-to-number $1))
+	((exp 61 exp)
+	 (wisent-calc-= $1 $3))
+	((126 exp)
+	 [NOT]
+	 (wisent-calc-not $2))
+	((exp 43 exp)
+	 (+ $1 $3))
+	((exp 45 exp)
+	 (- $1 $3))
+	((exp 42 exp)
+	 (* $1 $3))
+	((exp 47 exp)
+	 (/ $1 $3))
+	((45 exp)
+	 [NEG]
+	 (- $2))
+	((33 exp)
+	 [FACT]
+	 (wisent-calc-factorial $2))
+	((exp 94 exp)
+	 (expt $1 $3))
+	((40 exp 41)
+	 (progn $2))))
+     'nil))
+  "Parser table.")
+
+(defun wisent-calc-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-calc-wy--parse-table
+	semantic-debug-parser-source "wisent-calc.wy"
+	semantic-flex-keywords-obarray wisent-calc-wy--keyword-table
+	semantic-lex-types-obarray wisent-calc-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+(defun wisent-calc-setup-parser ()
+  "Setup buffer for parse."
+  (wisent-calc-wy--install-parser)
+  (setq semantic-number-expression
+        (concat "\\([0-9]+\\([.][0-9]*\\)?\\([eE][-+]?[0-9]+\\)?"
+                "\\|[.][0-9]+\\([eE][-+]?[0-9]+\\)?\\)")
+        semantic-lex-analyzer 'wisent-calc-lexer
+        semantic-lex-depth nil
+        semantic-lex-syntax-modifications
+        '((?\; ".") (?\= ".") (?\+ ".")
+          (?\- ".") (?\* ".") (?\/ ".")
+          (?^ ".") (?\( ".") (?\) ".")
+	  (?! ".") (?~ ".")
+          )
+        )
+  )
+
+(provide 'wisent-calc-wy)
+
+;;; wisent-calc-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-calc.el b/site/cedet-1.0pre7/semantic/wisent/wisent-calc.el
new file mode 100644
index 0000000..a94171e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-calc.el
@@ -0,0 +1,140 @@
+;;; wisent-calc.el --- Infix notation calculator
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2009 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 11 Sep 2001
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-calc.el,v 1.20 2009/12/26 21:38:46 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a port of the Bison 1.28d Infix Calc sample program to the
+;; elisp LALR parser Wisent.  It illustrates usage of operator
+;; precedence and contextual precedence.  The grammar is generated
+;; from the WY file wisent-calc.wy.
+;;
+;; To run the calculator use M-x wisent-calc and at "calc:" prompt
+;; enter expressions separated by semicolons.  Here is a sample run of
+;; `wisent-calc':
+;;
+;;   calc: 4 + 4.5 - (34.0/(8*3+-3));
+;;   -> 6.880952380952381;
+;;   calc: -56 + 2;
+;;   -> -54;
+;;   calc: 3 ^ 2;
+;;   -> 9;
+;;   calc: 2*2*2 = 2^3;
+;;   -> t;
+;;   calc: 2*2*2; 2^3;
+;;   -> 8; 8;
+
+;;; History:
+;; 
+
+;;; Code:
+(require 'semantic-wisent)
+(require 'wisent-calc-wy)
+
+(define-lex-simple-regex-analyzer wisent-calc-lex-number
+  "Detect and create number tokens."
+  semantic-lex-number-expression 'NUM)
+
+(define-lex-simple-regex-analyzer wisent-calc-lex-punctuation
+  "Detect and create punctuation tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)" (char-after))
+
+(define-lex wisent-calc-lexer
+  "Calc lexical analyzer."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  wisent-calc-lex-number
+  wisent-calc-lex-punctuation
+  semantic-lex-default-action)
+
+;;;###autoload
+(defun wisent-calc (input)
+  "Infix desktop calculator.
+Parse INPUT string and output the result of computation."
+  (interactive "scalc: ")
+  (or (string-match ";\\s-*$" input)
+      (setq input (concat input ";")))
+  (with-temp-buffer
+    (wisent-calc-setup-parser)
+    (semantic-lex-init)
+    (insert input)
+    (let* ((wisent-lex-istream (semantic-lex-buffer))
+	   (answer (wisent-parse semantic--parse-table 'wisent-lex)))
+      (if (interactive-p)
+	  (message "%s -> %s" input answer))
+      answer)))
+
+;; Misc handy fcns
+(defun wisent-calc-factorial (integer)
+  "Compute factorial of an INTEGER.
+Borrowed from the Emacs manual."
+  (if (= 1 integer) 1
+    (* integer (wisent-calc-factorial (1- integer)))))
+
+(defun wisent-calc-not (num)
+  "Compute a NOT operation of an NUMber.
+If NUM is 0, return 1. If NUM is not 0, return 0."
+  (if (= 0 num) 1 0))
+
+(defun wisent-calc-= (num1 num2)
+  "Compute a if NUM1 equal NUM2.
+Return 1 if equal, 0 if not equal."
+  (if (= num1 num2) 1 0))
+
+;;; TEST SUITE:
+(defvar wisent-calc-test-expressions
+  '(
+    ;; Basic
+    ("1+1" . 2) ("2*2" . 4) ("12/3" . 4) ("3-2" . 1)
+    ("2^3" . 8) ("!4" . 24) ("2=3" . 0)  ("2=2" . 1)
+    ("~0" . 1)  ("~1" . 0)
+    ;; Precidence
+    ("1+2*3" . 7) ("1+2-1" . 2) ("6/2+1" . 4) ("2^2+1" . 5)
+    ("-3+2" . -1) ("-3*2" . -6) ("!3*2" . 12) ("2+2=4" . 1)
+    ("~2=0" . 1)
+    ;; grouping
+    ("(2+3)*2" . 10) ("2*(4-3)" . 2) ("1+2^(2+1)" . 9) ("~(2=0)" . 1)
+    ;; Misc goofy
+    ("1+2*4-7/4^3" . 9)
+    )
+  "List of expressions and answers to test all the features.")
+
+;;;###autoload
+(defun wisent-calc-utest ()
+  "Test the wisent calculator."
+  (interactive)
+  (dolist (X wisent-calc-test-expressions)
+    (let* ((exp (car X))
+	   (ans (cdr X))
+	   (act  (string-to-number (wisent-calc exp))))
+      (when (not (eq act ans))
+	(error "Failed: %S == %d, but should be %d"
+	       exp act ans))))
+  )
+
+(provide 'wisent-calc)
+
+;;; wisent-calc.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-calc.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-calc.wy
new file mode 100644
index 0000000..4b11933
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-calc.wy
@@ -0,0 +1,111 @@
+;;; wisent-calc.wy --- Grammar of the infix notation calculator
+
+;; Copyright (C) 2002, 2003, 2009 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 19 Feb 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-calc.wy,v 1.10 2009/12/26 21:34:20 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a port of the Bison 1.28d Infix Calc sample program to the
+;; Elisp LALR parser Wisent.  It illustrates usage of operator
+;; precedence and contextual precedence.  Implementation is in the
+;; file wisent-calc.el.
+
+;;; History:
+;; 
+
+;;%package wisent-calc-wy
+
+%token <number> NUM
+
+%nonassoc '=' ;; comparison
+%left '-' '+'
+%left '*' '/'
+%left NEG     ;; negation--unary minus
+%left FACT    ;; Factorial
+%left NOT
+%right '^'    ;; exponentiation
+
+%%
+
+input:
+    line
+  | input line
+    (format "%s %s" $1 $2)
+  ;
+
+line:
+    ';'
+    {";"}
+  | exp ';'
+    (format "%s;" $1)
+  | error ';'
+    {"Error;"}
+  ;
+
+exp:
+    NUM
+    (string-to-number $1)
+  | exp '=' exp
+    (wisent-calc-= $1 $3)
+  | '~' exp %prec NOT
+    (wisent-calc-not $2)
+  | exp '+' exp
+    (+ $1 $3)
+  | exp '-' exp
+    (- $1 $3)
+  | exp '*' exp
+    (* $1 $3)
+  | exp '/' exp
+    (/ $1 $3)
+  | '-' exp %prec NEG
+    (- $2)
+  | '!' exp %prec FACT
+    (wisent-calc-factorial $2)
+  | exp '^' exp
+    (expt $1 $3)
+  | '(' exp ')'
+    {$2}
+  ;
+
+%%
+
+(defun wisent-calc-setup-parser ()
+  "Setup buffer for parse."
+  (wisent-calc-wy--install-parser)
+  (setq semantic-number-expression
+        (concat "\\([0-9]+\\([.][0-9]*\\)?\\([eE][-+]?[0-9]+\\)?"
+                "\\|[.][0-9]+\\([eE][-+]?[0-9]+\\)?\\)")
+        semantic-lex-analyzer 'wisent-calc-lexer
+        semantic-lex-depth nil
+        semantic-lex-syntax-modifications
+        '((?\; ".") (?\= ".") (?\+ ".")
+          (?\- ".") (?\* ".") (?\/ ".")
+          (?^ ".") (?\( ".") (?\) ".")
+	  (?! ".") (?~ ".")
+          )
+        )
+  )
+
+;;; wisent-calc.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-cim-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-cim-wy.el
new file mode 100644
index 0000000..3c4938e
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-cim-wy.el
@@ -0,0 +1,711 @@
+;;; wisent-cim-wy.el --- Generated parser support file
+
+;; Copyright (C) 2002 David Ponce
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:45-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-cim.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-cim-wy--keyword-table
+  (semantic-lex-make-keyword-table 'nil 'nil)
+  "Table of language keywords.")
+
+(defconst wisent-cim-wy--token-table
+  (semantic-lex-make-type-table
+   '(("tval"
+      (HTEXTKONST))
+     ("rval"
+      (HREALKONST))
+     ("ival"
+      (HCHARACTERKONST)
+      (HINTEGERKONST)
+      (HBOOLEANKONST))
+     ("ident"
+      (HIDENTIFIER))
+     ("<no-type>"
+      (HDOTDOTDOT)
+      (HEXP)
+      (HINTDIV)
+      (HDIV)
+      (HMUL)
+      (HSUB)
+      (HADD)
+      (HNER)
+      (HEQR)
+      (HENDPAR)
+      (HBEGPAR)
+      (HSTATEMENTSEPARATOR)
+      (HLABELSEPARATOR)
+      (HPAREXPSEPARATOR)
+      (HASSIGNREF)
+      (HASSIGNVALUE)
+      (HWHILE)
+      (HWHEN)
+      (HVIRTUAL)
+      (HVAR)
+      (HVALUE)
+      (HUNTIL)
+      (HTO)
+      (HTHIS)
+      (HTHEN)
+      (HTEXT)
+      (HSWITCH)
+      (HSTEP)
+      (HSHORT)
+      (HREF)
+      (HREAL)
+      (HREACTIVATE)
+      (HQUA)
+      (HPROTECTED)
+      (HPROCEDURE)
+      (HPRIOR)
+      (HOTHERWISE)
+      (HNOTEXT)
+      (HNONE)
+      (HNEW)
+      (HNE)
+      (HNAME)
+      (HLT)
+      (HLONG)
+      (HLE)
+      (HLABEL)
+      (HIS)
+      (HINTEGER)
+      (HINSPECT)
+      (HINNER)
+      (HIN)
+      (HIF)
+      (HHIDDEN)
+      (HGT)
+      (HGOTO)
+      (HGO)
+      (HGE)
+      (HFOR)
+      (HEXTERNAL)
+      (HEQ)
+      (HEND)
+      (HELSE)
+      (HDO)
+      (HDELAY)
+      (HCONC)
+      (HCLASS)
+      (HCHARACTER)
+      (HBOOLEAN)
+      (HBEGIN)
+      (HBEFORE)
+      (HAT)
+      (HARRAY)
+      (HAFTER)
+      (HACTIVATE))
+     ("token"
+      (HFACTOROPERATOR)
+      (UNEAR)
+      (HTERMOPERATOR)
+      (HOBJRELOPERATOR)
+      (HREFRELOPERATOR)
+      (HVALRELOPERATOR)
+      (HASSIGN)))
+   'nil)
+  "Table of lexical tokens.")
+
+(defconst wisent-cim-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((HACTIVATE HAFTER HARRAY HAT HBEFORE HBEGIN HBOOLEAN HCHARACTER HCLASS HCONC HDELAY HDO HELSE HEND HEQ HEXTERNAL HFOR HGE HGO HGOTO HGT HHIDDEN HIF HIN HINNER HINSPECT HINTEGER HIS HLABEL HLE HLONG HLT HNAME HNE HNEW HNONE HNOTEXT HOTHERWISE HPRIOR HPROCEDURE HPROTECTED HQUA HREACTIVATE HREAL HREF HSHORT HSTEP HSWITCH HTEXT HTHEN HTHIS HTO HUNTIL HVALUE HVAR HVIRTUAL HWHEN HWHILE HASSIGNVALUE HASSIGNREF HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR HBEGPAR HENDPAR HEQR HNER HADD HSUB HMUL HDIV HINTDIV HEXP HDOTDOTDOT HIDENTIFIER HBOOLEANKONST HINTEGERKONST HCHARACTERKONST HREALKONST HTEXTKONST)
+       ((right HASSIGN)
+	(left HORELSE)
+	(left HANDTHEN)
+	(left HEQV)
+	(left HIMP)
+	(left HOR)
+	(left HAND)
+	(left HNOT)
+	(left HVALRELOPERATOR HREFRELOPERATOR HOBJRELOPERATOR)
+	(left HCONC)
+	(left HTERMOPERATOR)
+	(left UNEAR)
+	(left HFACTOROPERATOR)
+	(left HPRIMARYOPERATOR)
+	(left HQUA)
+	(left HDOT))
+       (MAIN_MODULE
+	(((progn)
+	  MODULS)
+	 (progn))
+	((error HSTATEMENTSEPARATOR MBEE_DECLSTMS)))
+       (EXT_DECLARATION
+	((HEXTERNAL MBEE_TYPE HPROCEDURE
+		    (progn)
+		    EXT_LIST))
+	((HEXTERNAL HIDENTIFIER HPROCEDURE
+		    (progn)
+		    HIDENTIFIER
+		    (progn)
+		    EXTERNAL_KIND_ITEM)
+	 (progn))
+	((HEXTERNAL HCLASS
+		    (progn)
+		    EXT_LIST)))
+       (EXTERNAL_KIND_ITEM
+	((EXT_IDENT HOBJRELOPERATOR
+		    (progn)
+		    MBEE_TYPE HPROCEDURE HIDENTIFIER
+		    (progn)
+		    HEADING EMPTY_BLOCK)
+	 (progn)))
+       (EMPTY_BLOCK
+	(nil)
+	((HBEGIN HEND)))
+       (EXT_LIST
+	((EXT_ITEM))
+	((EXT_LIST HPAREXPSEPARATOR EXT_ITEM)))
+       (EXT_ITEM
+	((HIDENTIFIER EXT_IDENT)
+	 (progn)))
+       (EXT_IDENT
+	(nil
+	 (progn))
+	((HVALRELOPERATOR
+	  (progn)
+	  HTEXTKONST)
+	 (progn)))
+       (NO_TYPE
+	(nil
+	 (progn)))
+       (MBEE_TYPE
+	((NO_TYPE))
+	((TYPE)))
+       (TYPE
+	((HREF HBEGPAR HIDENTIFIER
+	       (progn)
+	       HENDPAR))
+	((HTEXT)
+	 (progn))
+	((HBOOLEAN)
+	 (progn))
+	((HCHARACTER)
+	 (progn))
+	((HSHORT HINTEGER)
+	 (progn))
+	((HINTEGER)
+	 (progn))
+	((HREAL)
+	 (progn))
+	((HLONG HREAL)
+	 (progn)))
+       (MBEE_ELSE_PART
+	(nil)
+	((HELSE
+	  (progn)
+	  BLOCK)
+	 (progn)))
+       (FOR_LIST
+	((FOR_LIST_ELEMENT)
+	 (progn))
+	((FOR_LIST_ELEMENT HPAREXPSEPARATOR FOR_LIST)
+	 (progn)))
+       (FOR_LIST_ELEMENT
+	((EXPRESSION MBEE_F_L_EL_R_PT)))
+       (MBEE_F_L_EL_R_PT
+	(nil)
+	((HWHILE EXPRESSION)
+	 (progn))
+	((HSTEP EXPRESSION HUNTIL EXPRESSION)
+	 (progn)))
+       (GOTO
+	((HGO HTO))
+	((HGOTO)))
+       (CONN_STATE_R_PT
+	((WHEN_CLAUSE_LIST))
+	((HDO
+	  (progn)
+	  BLOCK)
+	 (progn)))
+       (WHEN_CLAUSE_LIST
+	((HWHEN HIDENTIFIER HDO
+		(progn)
+		BLOCK)
+	 (progn))
+	((WHEN_CLAUSE_LIST HWHEN HIDENTIFIER HDO
+			   (progn)
+			   BLOCK)
+	 (progn)))
+       (MBEE_OTWI_CLAUS
+	(nil)
+	((HOTHERWISE
+	  (progn)
+	  BLOCK)
+	 (progn)))
+       (ACTIVATOR
+	((HACTIVATE)
+	 (progn))
+	((HREACTIVATE)
+	 (progn)))
+       (SCHEDULE
+	(nil
+	 (progn))
+	((ATDELAY EXPRESSION
+		  (progn)
+		  PRIOR))
+	((BEFOREAFTER
+	  (progn)
+	  EXPRESSION)
+	 (progn)))
+       (ATDELAY
+	((HAT)
+	 (progn))
+	((HDELAY)
+	 (progn)))
+       (BEFOREAFTER
+	((HBEFORE)
+	 (progn))
+	((HAFTER)
+	 (progn)))
+       (PRIOR
+	(nil
+	 (progn))
+	((HPRIOR)
+	 (progn)))
+       (MODULSTATEMENT
+	((HWHILE EXPRESSION HDO
+		 (progn)
+		 BLOCK)
+	 (progn))
+	((HIF EXPRESSION HTHEN
+	      (progn)
+	      BLOCK
+	      (progn)
+	      MBEE_ELSE_PART)
+	 (progn))
+	((HFOR HIDENTIFIER HASSIGN
+	       (progn)
+	       FOR_LIST HDO
+	       (progn)
+	       BLOCK)
+	 (progn))
+	((GOTO EXPRESSION)
+	 (progn))
+	((HINSPECT EXPRESSION
+		   (progn)
+		   CONN_STATE_R_PT
+		   (progn)
+		   MBEE_OTWI_CLAUS)
+	 (progn))
+	((HINNER)
+	 (progn))
+	((HIDENTIFIER HLABELSEPARATOR
+		      (progn)
+		      DECLSTATEMENT)
+	 (progn))
+	((EXPRESSION_SIMP HBEGIN
+			  (progn)
+			  IMPORT_SPEC_MODULE
+			  (progn)
+			  MBEE_DECLSTMS HEND)
+	 (progn))
+	((EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND)
+	 (progn))
+	((EXPRESSION_SIMP HBEGIN error HEND)
+	 (progn))
+	((EXPRESSION_SIMP)
+	 (progn))
+	((ACTIVATOR EXPRESSION SCHEDULE)
+	 (progn))
+	((HBEGIN
+	  (progn)
+	  MBEE_DECLSTMS HEND)
+	 (progn))
+	((MBEE_TYPE HPROCEDURE HIDENTIFIER
+		    (progn)
+		    HEADING BLOCK)
+	 (progn))
+	((HIDENTIFIER HCLASS NO_TYPE
+		      (progn)
+		      IMPORT_SPEC_MODULE HIDENTIFIER
+		      (progn)
+		      HEADING BLOCK)
+	 (progn))
+	((HCLASS NO_TYPE HIDENTIFIER
+		 (progn)
+		 HEADING BLOCK)
+	 (progn))
+	((EXT_DECLARATION)
+	 (progn))
+	(nil
+	 (progn)))
+       (IMPORT_SPEC_MODULE
+	(nil
+	 (progn)))
+       (DECLSTATEMENT
+	((MODULSTATEMENT))
+	((TYPE HIDENTIFIER MBEE_CONSTANT HPAREXPSEPARATOR
+	       (progn)
+	       IDENTIFIER_LISTC)
+	 (progn))
+	((TYPE HIDENTIFIER MBEE_CONSTANT)
+	 (progn))
+	((MBEE_TYPE HARRAY
+		    (progn)
+		    ARR_SEGMENT_LIST)
+	 (progn))
+	((HSWITCH HIDENTIFIER HASSIGN
+		  (progn)
+		  SWITCH_LIST)
+	 (progn)))
+       (BLOCK
+	((DECLSTATEMENT)
+	 (progn))
+	((HBEGIN MBEE_DECLSTMS HEND))
+	((HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND))
+	((HBEGIN error HEND)))
+       (MBEE_DECLSTMS
+	((MBEE_DECLSTMSU)
+	 (progn)))
+       (MBEE_DECLSTMSU
+	((DECLSTATEMENT)
+	 (progn))
+	((MBEE_DECLSTMSU HSTATEMENTSEPARATOR DECLSTATEMENT)
+	 (progn)))
+       (MODULS
+	((MODULSTATEMENT)
+	 (progn))
+	((MODULS HSTATEMENTSEPARATOR MODULSTATEMENT)
+	 (progn)))
+       (ARR_SEGMENT_LIST
+	((ARR_SEGMENT))
+	((ARR_SEGMENT_LIST HPAREXPSEPARATOR ARR_SEGMENT)))
+       (ARR_SEGMENT
+	((ARRAY_SEGMENT HBEGPAR BAUND_PAIR_LIST HENDPAR)
+	 (progn)))
+       (ARRAY_SEGMENT
+	((ARRAY_SEGMENT_EL)
+	 (progn))
+	((ARRAY_SEGMENT_EL HPAREXPSEPARATOR ARRAY_SEGMENT)
+	 (progn)))
+       (ARRAY_SEGMENT_EL
+	((HIDENTIFIER)
+	 (progn)))
+       (BAUND_PAIR_LIST
+	((BAUND_PAIR)
+	 (progn))
+	((BAUND_PAIR HPAREXPSEPARATOR BAUND_PAIR_LIST)
+	 (progn)))
+       (BAUND_PAIR
+	((EXPRESSION HLABELSEPARATOR EXPRESSION)
+	 (progn)))
+       (SWITCH_LIST
+	((EXPRESSION)
+	 (progn))
+	((EXPRESSION HPAREXPSEPARATOR SWITCH_LIST)
+	 (progn)))
+       (HEADING
+	((MBEE_FMAL_PAR_P HSTATEMENTSEPARATOR
+			  (progn)
+			  MBEE_MODE_PART
+			  (progn)
+			  MBEE_SPEC_PART
+			  (progn)
+			  MBEE_PROT_PART
+			  (progn)
+			  MBEE_VIRT_PART)
+	 (progn)))
+       (MBEE_FMAL_PAR_P
+	(nil)
+	((FMAL_PAR_PART)))
+       (FMAL_PAR_PART
+	((HBEGPAR NO_TYPE MBEE_LISTV HENDPAR)))
+       (MBEE_LISTV
+	(nil)
+	((LISTV)))
+       (LISTV
+	((HIDENTIFIER)
+	 (progn))
+	((FPP_CATEG HDOTDOTDOT)
+	 (progn))
+	((HIDENTIFIER
+	  (progn)
+	  HPAREXPSEPARATOR LISTV))
+	((FPP_SPEC))
+	((FPP_SPEC HPAREXPSEPARATOR LISTV)))
+       (FPP_HEADING
+	((HBEGPAR NO_TYPE FPP_MBEE_LISTV HENDPAR)))
+       (FPP_MBEE_LISTV
+	(nil)
+	((FPP_LISTV)))
+       (FPP_LISTV
+	((FPP_CATEG HDOTDOTDOT)
+	 (progn))
+	((FPP_SPEC))
+	((FPP_SPEC HPAREXPSEPARATOR LISTV)))
+       (FPP_SPEC
+	((FPP_CATEG SPECIFIER HIDENTIFIER)
+	 (progn))
+	((FPP_CATEG FPP_PROC_DECL_IN_SPEC)))
+       (FPP_CATEG
+	((HNAME HLABELSEPARATOR)
+	 (progn))
+	((HVALUE HLABELSEPARATOR)
+	 (progn))
+	((HVAR HLABELSEPARATOR)
+	 (progn))
+	(nil))
+       (FPP_PROC_DECL_IN_SPEC
+	((MBEE_TYPE HPROCEDURE HIDENTIFIER
+		    (progn)
+		    FPP_HEADING
+		    (progn))
+	 (progn)))
+       (IDENTIFIER_LISTV
+	((HIDENTIFIER)
+	 (progn))
+	((HDOTDOTDOT)
+	 (progn))
+	((HIDENTIFIER
+	  (progn)
+	  HPAREXPSEPARATOR IDENTIFIER_LISTV)))
+       (MBEE_MODE_PART
+	(nil)
+	((MODE_PART)))
+       (MODE_PART
+	((NAME_PART))
+	((VALUE_PART))
+	((VAR_PART))
+	((NAME_PART VALUE_PART))
+	((VALUE_PART NAME_PART))
+	((NAME_PART VAR_PART))
+	((VAR_PART NAME_PART))
+	((VALUE_PART VAR_PART))
+	((VAR_PART VALUE_PART))
+	((VAR_PART NAME_PART VALUE_PART))
+	((NAME_PART VAR_PART VALUE_PART))
+	((NAME_PART VALUE_PART VAR_PART))
+	((VAR_PART VALUE_PART NAME_PART))
+	((VALUE_PART VAR_PART NAME_PART))
+	((VALUE_PART NAME_PART VAR_PART)))
+       (NAME_PART
+	((HNAME
+	  (progn)
+	  IDENTIFIER_LISTV HSTATEMENTSEPARATOR)))
+       (VAR_PART
+	((HVAR
+	  (progn)
+	  IDENTIFIER_LISTV HSTATEMENTSEPARATOR)))
+       (VALUE_PART
+	((HVALUE
+	  (progn)
+	  IDENTIFIER_LISTV HSTATEMENTSEPARATOR)))
+       (MBEE_SPEC_PART
+	(nil)
+	((SPEC_PART)))
+       (SPEC_PART
+	((ONE_SPEC))
+	((SPEC_PART ONE_SPEC)))
+       (ONE_SPEC
+	((SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR))
+	((NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
+		  (progn)
+		  PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR))
+	((FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR))
+	((MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR)
+	 (progn))
+	((MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR IDENTIFIER_LIST HSTATEMENTSEPARATOR)
+	 (progn)))
+       (SPECIFIER
+	((TYPE)
+	 (progn))
+	((MBEE_TYPE HARRAY)
+	 (progn))
+	((HLABEL)
+	 (progn))
+	((HSWITCH)
+	 (progn)))
+       (PROC_DECL_IN_SPEC
+	((MBEE_TYPE HPROCEDURE HIDENTIFIER
+		    (progn)
+		    HEADING
+		    (progn)
+		    MBEE_BEGIN_END)
+	 (progn)))
+       (MBEE_BEGIN_END
+	(nil)
+	((HBEGIN HEND)))
+       (MBEE_PROT_PART
+	(nil)
+	((PROTECTION_PART)))
+       (PROTECTION_PART
+	((PROT_SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR))
+	((PROTECTION_PART PROT_SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR)))
+       (PROT_SPECIFIER
+	((HHIDDEN)
+	 (progn))
+	((HPROTECTED)
+	 (progn))
+	((HHIDDEN HPROTECTED)
+	 (progn))
+	((HPROTECTED HHIDDEN)
+	 (progn)))
+       (MBEE_VIRT_PART
+	(nil)
+	((VIRTUAL_PART)))
+       (VIRTUAL_PART
+	((HVIRTUAL HLABELSEPARATOR MBEE_SPEC_PART)))
+       (IDENTIFIER_LIST
+	((HIDENTIFIER)
+	 (progn))
+	((IDENTIFIER_LIST HPAREXPSEPARATOR HIDENTIFIER)
+	 (progn)))
+       (IDENTIFIER_LISTC
+	((HIDENTIFIER MBEE_CONSTANT)
+	 (progn))
+	((IDENTIFIER_LISTC HPAREXPSEPARATOR HIDENTIFIER MBEE_CONSTANT)
+	 (progn)))
+       (MBEE_CONSTANT
+	(nil)
+	((HVALRELOPERATOR
+	  (progn)
+	  EXPRESSION)
+	 (progn)))
+       (EXPRESSION
+	((EXPRESSION_SIMP)
+	 (progn))
+	((HIF EXPRESSION HTHEN EXPRESSION HELSE EXPRESSION)
+	 (progn)))
+       (EXPRESSION_SIMP
+	((EXPRESSION_SIMP HASSIGN EXPRESSION)
+	 (progn))
+	((EXPRESSION_SIMP HCONC EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HOR HELSE EXPRESSION_SIMP)
+	 [HORELSE]
+	 (progn))
+	((EXPRESSION_SIMP HAND HTHEN EXPRESSION_SIMP)
+	 [HANDTHEN]
+	 (progn))
+	((EXPRESSION_SIMP HEQV EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HIMP EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HOR EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HAND EXPRESSION_SIMP)
+	 (progn))
+	((HNOT EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HVALRELOPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HREFRELOPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HOBJRELOPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((HTERMOPERATOR EXPRESSION_SIMP)
+	 [UNEAR]
+	 (progn))
+	((EXPRESSION_SIMP HTERMOPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HFACTOROPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HPRIMARYOPERATOR EXPRESSION_SIMP)
+	 (progn))
+	((HBEGPAR EXPRESSION HENDPAR)
+	 (progn))
+	((HTEXTKONST)
+	 (progn))
+	((HCHARACTERKONST)
+	 (progn))
+	((HREALKONST)
+	 (progn))
+	((HINTEGERKONST)
+	 (progn))
+	((HBOOLEANKONST)
+	 (progn))
+	((HNONE)
+	 (progn))
+	((HIDENTIFIER
+	  (progn)
+	  MBEE_ARG_R_PT))
+	((HTHIS HIDENTIFIER)
+	 (progn))
+	((HNEW HIDENTIFIER ARG_R_PT)
+	 (progn))
+	((EXPRESSION_SIMP HDOT EXPRESSION_SIMP)
+	 (progn))
+	((EXPRESSION_SIMP HQUA HIDENTIFIER)
+	 (progn)))
+       (ARG_R_PT
+	(nil
+	 (progn))
+	((HBEGPAR ARGUMENT_LIST HENDPAR)))
+       (MBEE_ARG_R_PT
+	(nil
+	 (progn))
+	((HBEGPAR ARGUMENT_LIST HENDPAR)
+	 (progn)))
+       (ARGUMENT_LIST
+	((EXPRESSION)
+	 (progn))
+	((EXPRESSION HPAREXPSEPARATOR ARGUMENT_LIST)
+	 (progn))))
+     '(MAIN_MODULE)))
+  "Parser table.")
+
+(defun wisent-cim-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-cim-wy--parse-table
+	semantic-debug-parser-source "wisent-cim.wy"
+	semantic-flex-keywords-obarray wisent-cim-wy--keyword-table
+	semantic-lex-types-obarray wisent-cim-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+
+;;; Epilogue
+;;
+
+
+
+
+(provide 'wisent-cim-wy)
+
+;;; wisent-cim-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-cim.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-cim.wy
new file mode 100644
index 0000000..da764f6
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-cim.wy
@@ -0,0 +1,661 @@
+;;; wisent-cim.wy --- GNU Cim Grammar
+
+;; Copyright (C) 2002 David Ponce
+;; Copyright 2001 Free Software Foundation, Inc.
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 03 Mar 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-cim.wy,v 1.4 2005/09/30 20:23:07 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is a port of the Bison 1.31 GNU Cim, the GNU Simula 87
+;; Compiler, grammar found in file tests/torture.at.  It is good to
+;; torture Wisent too ;-).  It should report 78 shift/reduce conflicts
+;; and 10 reduce/reduce conflicts.
+;;
+;; Implementation is in the file wisent-cim.el.
+
+;;; History:
+;; 
+
+;;%package wisent-cim-wy
+
+%token
+HACTIVATE HAFTER ;;/*HAND*/
+HARRAY HAT
+HBEFORE HBEGIN HBOOLEAN
+HCHARACTER HCLASS ;;/*HCOMMENT*/
+HCONC
+HDELAY HDO
+HELSE HEND HEQ ;;/*HEQV*/
+HEXTERNAL
+HFOR
+HGE HGO HGOTO HGT
+HHIDDEN
+HIF ;;/*HIMP*/
+HIN HINNER HINSPECT HINTEGER HIS
+HLABEL HLE HLONG HLT
+HNAME HNE HNEW HNONE ;;/*HNOT*/
+HNOTEXT
+;;/*HOR*/
+HOTHERWISE
+HPRIOR HPROCEDURE HPROTECTED
+HQUA
+HREACTIVATE HREAL HREF
+HSHORT HSTEP HSWITCH
+HTEXT HTHEN HTHIS HTO
+HUNTIL
+HVALUE HVAR HVIRTUAL
+HWHEN HWHILE
+
+HASSIGNVALUE HASSIGNREF
+;;/*HDOT*/
+HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR
+HBEGPAR HENDPAR
+HEQR HNER
+HADD HSUB HMUL HDIV HINTDIV HEXP
+HDOTDOTDOT
+
+%token <ident> HIDENTIFIER
+%token <ival> HBOOLEANKONST HINTEGERKONST HCHARACTERKONST
+%token <rval> HREALKONST
+%token <tval> HTEXTKONST
+
+%right <token> HASSIGN
+%left   HORELSE
+%left   HANDTHEN
+%left   HEQV
+%left   HIMP
+%left   HOR
+%left   HAND
+
+%left   HNOT
+
+%left <token> HVALRELOPERATOR HREFRELOPERATOR HOBJRELOPERATOR
+
+%left	HCONC
+
+%left <token> HTERMOPERATOR
+%left <token> UNEAR
+%left <token> HFACTOROPERATOR
+%left         HPRIMARYOPERATOR
+
+%left   HQUA
+
+%left   HDOT
+
+%start  MAIN_MODULE
+%%
+;;/* GRAMATIKK FOR PROGRAM MODULES */
+MAIN_MODULE     :       {}
+			MODULS	{}
+  		|	error HSTATEMENTSEPARATOR MBEE_DECLSTMS
+		;
+EXT_DECLARATION	:	HEXTERNAL
+			MBEE_TYPE
+			HPROCEDURE
+				{}
+			EXT_LIST
+		|
+			HEXTERNAL
+			HIDENTIFIER
+			HPROCEDURE
+				{}
+			HIDENTIFIER {}
+			EXTERNAL_KIND_ITEM
+			        {}
+		|	HEXTERNAL
+			HCLASS
+				{}
+			EXT_LIST
+
+		;
+EXTERNAL_KIND_ITEM:	EXT_IDENT
+			HOBJRELOPERATOR
+				{}
+		        MBEE_TYPE HPROCEDURE
+			HIDENTIFIER
+				{}
+                        HEADING EMPTY_BLOCK
+				{}
+;; /*		|
+;; 			EXT_IDENT
+;; 				{}
+;; 			MBEE_REST_EXT_LIST
+;; 				{}
+;; 		;
+;; MBEE_REST_EXT_LIST:	/* EMPTY
+;; 		|	HPAREXPSEPARATOR EXT_KIND_LIST
+;; 		;
+;; EXT_KIND_LIST	:	EXT_KIND_ITEM
+;; 		|	EXT_KIND_LIST HPAREXPSEPARATOR EXT_KIND_ITEM
+;; 		;
+;; EXT_KIND_ITEM	:	HIDENTIFIER
+;; 			EXT_IDENT
+;; 				{}*/
+		;
+EMPTY_BLOCK	:	;;/*EMPT*/
+		|	HBEGIN HEND
+		;
+EXT_LIST	:	EXT_ITEM
+		|	EXT_LIST HPAREXPSEPARATOR EXT_ITEM
+		;
+EXT_ITEM	:	HIDENTIFIER
+			EXT_IDENT
+				{}
+		;
+EXT_IDENT	:	;;/* EMPTY */
+                  {}
+		|	HVALRELOPERATOR {}
+			HTEXTKONST {}
+		;
+;;/* GRAMATIKK FOR TYPER */
+NO_TYPE         :       ;;/*EMPT*/
+                  {}
+                ;
+MBEE_TYPE       :       NO_TYPE
+                |       TYPE
+                ;
+TYPE            :       HREF HBEGPAR
+                        HIDENTIFIER
+                                {}
+                        HENDPAR
+                |       HTEXT           {}
+                |       HBOOLEAN        {}
+                |       HCHARACTER      {}
+                |       HSHORT HINTEGER {}
+                |       HINTEGER        {}
+                |       HREAL           {}
+                |       HLONG HREAL     {}
+                ;
+
+;;/* GRAMATIKK FOR DEL AV SETNINGER */
+MBEE_ELSE_PART  :       ;;/*EMPT*/
+;; /*		|	HELSE
+;; 			HIF
+;;                         EXPRESSION
+;;                         HTHEN   {}
+;;                         BLOCK   {}
+;;                         MBEE_ELSE_PART          {}*/
+                |       HELSE   {}
+                        BLOCK   {}
+                ;
+FOR_LIST        :       FOR_LIST_ELEMENT        {}
+                |       FOR_LIST_ELEMENT
+                        HPAREXPSEPARATOR
+                        FOR_LIST                {}
+                ;
+FOR_LIST_ELEMENT:       EXPRESSION
+                        MBEE_F_L_EL_R_PT
+                ;
+MBEE_F_L_EL_R_PT:       ;;/*EMPT*/
+                |       HWHILE
+                        EXPRESSION              {}
+                |       HSTEP
+                        EXPRESSION
+                        HUNTIL
+                        EXPRESSION              {}
+                ;
+GOTO            :       HGO
+                        HTO
+                |       HGOTO
+                ;
+CONN_STATE_R_PT :       WHEN_CLAUSE_LIST
+                |       HDO   {}
+                        BLOCK {}
+                ;
+WHEN_CLAUSE_LIST:       HWHEN
+                        HIDENTIFIER
+                        HDO    {}
+                        BLOCK  {}
+                |       WHEN_CLAUSE_LIST
+                        HWHEN
+                        HIDENTIFIER
+                        HDO    {}
+                        BLOCK  {}
+                ;
+MBEE_OTWI_CLAUS :       ;;/*EMPT*/
+                |       HOTHERWISE {}
+
+                        BLOCK      {}
+                ;
+ACTIVATOR	:	HACTIVATE		{}
+		|	HREACTIVATE		{}
+		;
+SCHEDULE	:	;;/*EMPT*/
+                  {}
+		|	ATDELAY EXPRESSION	{}
+			PRIOR
+		|	BEFOREAFTER		{}
+			EXPRESSION		{}
+		;
+ATDELAY		:	HAT			{}
+		|	HDELAY			{}
+		;
+BEFOREAFTER	:	HBEFORE			{}
+		|	HAFTER			{}
+		;
+PRIOR		:	;;/*EMPT*/
+                  {}
+		|	HPRIOR			{}
+		;
+;;/* GRAMATIKK FOR SETNINGER OG DEKLARASJONER */
+MODULSTATEMENT  :       HWHILE
+                        EXPRESSION
+                        HDO     {}
+                        BLOCK   {}
+	    	|       HIF
+                        EXPRESSION
+                        HTHEN   {}
+                        BLOCK   {}
+                        MBEE_ELSE_PART          {}
+		|       HFOR
+                        HIDENTIFIER
+                        HASSIGN {}
+                        FOR_LIST
+                        HDO     {}
+                        BLOCK   {}
+		|       GOTO
+                        EXPRESSION              {}
+		|       HINSPECT
+                        EXPRESSION              {}
+                        CONN_STATE_R_PT
+                                {}
+                        MBEE_OTWI_CLAUS         {}
+		|       HINNER  {}
+                |       HIDENTIFIER
+                        HLABELSEPARATOR
+                                {}
+                        DECLSTATEMENT   {}
+                |       EXPRESSION_SIMP
+                        HBEGIN
+                                {}
+			IMPORT_SPEC_MODULE
+				{}
+                        MBEE_DECLSTMS
+                        HEND    {}
+		|	EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR
+                        MBEE_DECLSTMS HEND              {}
+		|	EXPRESSION_SIMP HBEGIN error HEND
+						        {}
+
+                |       EXPRESSION_SIMP
+                                {}
+		|	ACTIVATOR EXPRESSION SCHEDULE
+						{}
+                |       HBEGIN
+                                {}
+                        MBEE_DECLSTMS
+                        HEND    {}
+		|       MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                {}
+                        HEADING BLOCK   {}
+		|       HIDENTIFIER
+			HCLASS
+                        NO_TYPE
+				{}
+			IMPORT_SPEC_MODULE
+                        HIDENTIFIER
+				{}
+                        HEADING
+                        BLOCK           {}
+                |       HCLASS
+                        NO_TYPE
+                        HIDENTIFIER
+                                {}
+                        HEADING
+                        BLOCK           {}
+                |       EXT_DECLARATION			{}
+		|       ;;/*EMPT*/
+                  {}
+                ;
+IMPORT_SPEC_MODULE:		{}
+		;
+DECLSTATEMENT	:	MODULSTATEMENT
+		|       TYPE
+                        HIDENTIFIER
+			MBEE_CONSTANT
+                        HPAREXPSEPARATOR
+                                {}
+                        IDENTIFIER_LISTC                {}
+                |       TYPE
+                        HIDENTIFIER
+			MBEE_CONSTANT
+                                {}
+                |       MBEE_TYPE
+                        HARRAY  {}
+                        ARR_SEGMENT_LIST                {}
+                |       HSWITCH
+                        HIDENTIFIER
+                        HASSIGN {}
+                        SWITCH_LIST                     {}
+                ;
+BLOCK           :       DECLSTATEMENT   {}
+                |       HBEGIN MBEE_DECLSTMS HEND
+		|	HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND
+		|	HBEGIN error HEND
+		;
+MBEE_DECLSTMS   :       MBEE_DECLSTMSU  {}
+                ;
+MBEE_DECLSTMSU  :       DECLSTATEMENT   {}
+                |       MBEE_DECLSTMSU
+                        HSTATEMENTSEPARATOR
+                        DECLSTATEMENT   {}
+                ;
+MODULS		:	MODULSTATEMENT	{}
+  		|	MODULS HSTATEMENTSEPARATOR MODULSTATEMENT
+					{}
+		;
+;;/* GRAMATIKK FOR DEL AV DEKLARASJONER */
+ARR_SEGMENT_LIST:       ARR_SEGMENT
+                |       ARR_SEGMENT_LIST
+                        HPAREXPSEPARATOR
+                        ARR_SEGMENT
+                ;
+ARR_SEGMENT	:       ARRAY_SEGMENT
+                        HBEGPAR
+                        BAUND_PAIR_LIST HENDPAR {}
+                ;
+ARRAY_SEGMENT   :       ARRAY_SEGMENT_EL        {}
+
+                |       ARRAY_SEGMENT_EL
+                        HPAREXPSEPARATOR
+                        ARRAY_SEGMENT           {}
+                ;
+ARRAY_SEGMENT_EL:       HIDENTIFIER             {}
+                ;
+BAUND_PAIR_LIST :       BAUND_PAIR              {}
+                |       BAUND_PAIR
+                        HPAREXPSEPARATOR
+                        BAUND_PAIR_LIST         {}
+                ;
+BAUND_PAIR      :       EXPRESSION
+                        HLABELSEPARATOR
+                        EXPRESSION              {}
+                ;
+SWITCH_LIST     :       EXPRESSION              {}
+                |       EXPRESSION
+                        HPAREXPSEPARATOR
+                        SWITCH_LIST             {}
+                ;
+HEADING         :       MBEE_FMAL_PAR_P HSTATEMENTSEPARATOR {}
+                        MBEE_MODE_PART  {}
+                        MBEE_SPEC_PART  {}
+                        MBEE_PROT_PART  {}
+                        MBEE_VIRT_PART
+                                        {}
+                ;
+MBEE_FMAL_PAR_P :       ;;/*EMPT*/
+                |       FMAL_PAR_PART
+                ;
+FMAL_PAR_PART   :       HBEGPAR NO_TYPE
+                        MBEE_LISTV HENDPAR
+                ;
+MBEE_LISTV      :       ;;/*EMPT*/
+                |       LISTV
+                ;
+LISTV           :       HIDENTIFIER     {}
+                |	FPP_CATEG HDOTDOTDOT      {}
+                |       HIDENTIFIER     {}
+                        HPAREXPSEPARATOR LISTV
+                |       FPP_SPEC
+                |       FPP_SPEC
+                        HPAREXPSEPARATOR LISTV
+                ;
+FPP_HEADING     :       HBEGPAR NO_TYPE
+                        FPP_MBEE_LISTV HENDPAR
+                ;
+FPP_MBEE_LISTV  :       ;;/*EMPT*/
+                |       FPP_LISTV
+                ;
+FPP_LISTV       :	FPP_CATEG HDOTDOTDOT      {}
+                |       FPP_SPEC
+                |       FPP_SPEC
+                        HPAREXPSEPARATOR LISTV
+                ;
+FPP_SPEC        :       FPP_CATEG SPECIFIER HIDENTIFIER
+                                       {}
+		|	FPP_CATEG FPP_PROC_DECL_IN_SPEC
+		;
+FPP_CATEG       :       HNAME HLABELSEPARATOR
+                                       {}
+                |       HVALUE HLABELSEPARATOR
+                                       {}
+                |       HVAR HLABELSEPARATOR
+                                       {}
+                |       ;;/*EMPT*/       {}
+                ;
+FPP_PROC_DECL_IN_SPEC:	MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                	{}
+                        FPP_HEADING
+					{}
+                       {}
+		;
+IDENTIFIER_LISTV:       HIDENTIFIER     {}
+                |	HDOTDOTDOT {}
+                |       HIDENTIFIER     {}
+                        HPAREXPSEPARATOR IDENTIFIER_LISTV
+                ;
+MBEE_MODE_PART  :       ;;/*EMPT*/
+                |       MODE_PART
+                ;
+MODE_PART       :       NAME_PART
+                |       VALUE_PART
+                |       VAR_PART
+                |       NAME_PART VALUE_PART
+                |       VALUE_PART NAME_PART
+                |       NAME_PART VAR_PART
+                |       VAR_PART NAME_PART
+                |       VALUE_PART VAR_PART
+                |       VAR_PART VALUE_PART
+                |       VAR_PART NAME_PART VALUE_PART
+                |       NAME_PART VAR_PART VALUE_PART
+                |       NAME_PART VALUE_PART VAR_PART
+                |       VAR_PART VALUE_PART NAME_PART
+                |       VALUE_PART VAR_PART NAME_PART
+                |       VALUE_PART NAME_PART VAR_PART
+                ;
+NAME_PART       :       HNAME           {}
+                        IDENTIFIER_LISTV
+                        HSTATEMENTSEPARATOR
+                ;
+VAR_PART        :       HVAR            {}
+                        IDENTIFIER_LISTV
+                        HSTATEMENTSEPARATOR
+                ;
+VALUE_PART      :       HVALUE          {}
+                        IDENTIFIER_LISTV HSTATEMENTSEPARATOR
+                ;
+MBEE_SPEC_PART  :       ;;/*EMPT*/
+                |       SPEC_PART
+                ;
+SPEC_PART       :       ONE_SPEC
+                |       SPEC_PART ONE_SPEC
+                ;
+ONE_SPEC	:	SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR
+		|	NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
+			  {}
+			PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+                |       FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+                |       MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR
+					{}
+                |       MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR
+                        IDENTIFIER_LIST HSTATEMENTSEPARATOR
+					{}
+		;
+SPECIFIER       :       TYPE            {}
+                |       MBEE_TYPE
+                        HARRAY          {}
+                |       HLABEL          {}
+                |       HSWITCH         {}
+                ;
+PROC_DECL_IN_SPEC:	MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                	{}
+                        HEADING
+					{}
+			MBEE_BEGIN_END
+				{}
+		;
+MBEE_BEGIN_END	:	;;/* EMPTY */
+		|	HBEGIN HEND
+		;
+MBEE_PROT_PART  :       ;;/*EMPT*/
+                |       PROTECTION_PART
+                ;
+PROTECTION_PART :       PROT_SPECIFIER IDENTIFIER_LIST
+                        HSTATEMENTSEPARATOR
+                |       PROTECTION_PART  PROT_SPECIFIER
+                        IDENTIFIER_LIST HSTATEMENTSEPARATOR
+                ;
+PROT_SPECIFIER  :       HHIDDEN         {}
+                |       HPROTECTED      {}
+                |       HHIDDEN
+                        HPROTECTED      {}
+                |       HPROTECTED
+                        HHIDDEN         {}
+                ;
+MBEE_VIRT_PART  :       ;;/*EMPT*/
+                |       VIRTUAL_PART
+                ;
+VIRTUAL_PART    :       HVIRTUAL
+                        HLABELSEPARATOR
+                        MBEE_SPEC_PART
+                ;
+IDENTIFIER_LIST :       HIDENTIFIER     {}
+                |       IDENTIFIER_LIST HPAREXPSEPARATOR
+                        HIDENTIFIER     {}
+                ;
+IDENTIFIER_LISTC:       HIDENTIFIER
+			MBEE_CONSTANT   {}
+                |       IDENTIFIER_LISTC HPAREXPSEPARATOR
+                        HIDENTIFIER
+			MBEE_CONSTANT   {}
+                ;
+MBEE_CONSTANT	:	;;/* EMPTY */
+		|	HVALRELOPERATOR
+				{}
+			EXPRESSION		{}
+		;
+
+;;/* GRAMATIKK FOR UTTRYKK */
+EXPRESSION      :       EXPRESSION_SIMP {}
+                |       HIF
+                        EXPRESSION
+                        HTHEN
+                        EXPRESSION
+                        HELSE
+                        EXPRESSION              {}
+                ;
+EXPRESSION_SIMP :	EXPRESSION_SIMP
+			HASSIGN
+			EXPRESSION {}
+		|
+
+			EXPRESSION_SIMP
+                        HCONC
+                        EXPRESSION_SIMP         {}
+                |       EXPRESSION_SIMP HOR
+                        HELSE
+                        EXPRESSION_SIMP
+                        %prec HORELSE           {}
+                |       EXPRESSION_SIMP HAND
+                        HTHEN
+                        EXPRESSION_SIMP
+                        %prec HANDTHEN          {}
+                |       EXPRESSION_SIMP
+                        HEQV EXPRESSION_SIMP    {}
+                |       EXPRESSION_SIMP
+                        HIMP EXPRESSION_SIMP    {}
+                |       EXPRESSION_SIMP
+                        HOR EXPRESSION_SIMP     {}
+                |       EXPRESSION_SIMP
+                        HAND EXPRESSION_SIMP    {}
+                |       HNOT EXPRESSION_SIMP    {}
+                |       EXPRESSION_SIMP
+                        HVALRELOPERATOR
+                        EXPRESSION_SIMP
+                                {}
+                |       EXPRESSION_SIMP
+                        HREFRELOPERATOR
+                        EXPRESSION_SIMP
+                                {}
+                |       EXPRESSION_SIMP
+                        HOBJRELOPERATOR
+                        EXPRESSION_SIMP
+                                {}
+                |       HTERMOPERATOR
+                        EXPRESSION_SIMP %prec UNEAR
+                                {}
+                |       EXPRESSION_SIMP
+                        HTERMOPERATOR
+                        EXPRESSION_SIMP
+                                {}
+                |       EXPRESSION_SIMP
+                        HFACTOROPERATOR
+                        EXPRESSION_SIMP
+                                {}
+                |       EXPRESSION_SIMP
+                        HPRIMARYOPERATOR
+                        EXPRESSION_SIMP         {}
+                |       HBEGPAR
+                        EXPRESSION HENDPAR      {}
+                |       HTEXTKONST              {}
+                |       HCHARACTERKONST         {}
+                |       HREALKONST              {}
+                |       HINTEGERKONST           {}
+                |       HBOOLEANKONST           {}
+                |       HNONE                   {}
+                |       HIDENTIFIER
+                                {}
+                        MBEE_ARG_R_PT
+                |       HTHIS HIDENTIFIER       {}
+                |       HNEW
+                        HIDENTIFIER
+                        ARG_R_PT                {}
+                |       EXPRESSION_SIMP
+                        HDOT
+                        EXPRESSION_SIMP         {}
+                |       EXPRESSION_SIMP
+                        HQUA HIDENTIFIER        {}
+                ;
+ARG_R_PT        :       ;;/*EMPTY*/
+                  {}
+                |       HBEGPAR
+                        ARGUMENT_LIST HENDPAR
+                ;
+MBEE_ARG_R_PT   :       ;;/*EMPTY*/
+                  {}
+                |       HBEGPAR
+                        ARGUMENT_LIST HENDPAR   {}
+                ;
+ARGUMENT_LIST   :       EXPRESSION              {}
+                |       EXPRESSION
+                        HPAREXPSEPARATOR
+                        ARGUMENT_LIST           {}
+                ;
+%%
+
+;;; wisent-cim.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-comp.el b/site/cedet-1.0pre7/semantic/wisent/wisent-comp.el
new file mode 100644
index 0000000..477a821
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-comp.el
@@ -0,0 +1,3558 @@
+;;; wisent-comp.el --- GNU Bison for Emacs - Grammar compiler
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 David Ponce
+;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001
+;; Free Software Foundation, Inc. (Bison)
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 30 January 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-comp.el,v 1.28 2009/09/11 18:52:52 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Grammar compiler that produces Wisent's LALR automatons.
+;;
+;; Wisent (the European Bison ;-) is an Elisp implementation of the
+;; GNU Compiler Compiler Bison.  The Elisp code is a port of the C
+;; code of GNU Bison 1.28 & 1.31.
+;;
+;; For more details on the basic concepts for understanding Wisent,
+;; read the Bison manual ;)
+;;
+;; For more details on Wisent itself read the Wisent manual.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'wisent)
+(require 'working)
+
+;;;; -------------------
+;;;; Misc. useful things
+;;;; -------------------
+
+;; As much as possible I would like to keep the name of global
+;; variables used in Bison without polluting too much the Elisp global
+;; name space.  Elisp dynamic binding allows that ;-)
+
+;; Here are simple macros to easily define and use set of variables
+;; binded locally, without all these "reference to free variable"
+;; compiler warnings!
+
+(defmacro wisent-context-name (name)
+  "Return the context name from NAME."
+  `(if (and ,name (symbolp ,name))
+       (intern (format "wisent-context-%s" ,name))
+     (error "Invalid context name: %S" ,name)))
+
+(defmacro wisent-context-bindings (name)
+  "Return the variables in context NAME."
+  `(symbol-value (wisent-context-name ,name)))
+
+(defmacro wisent-defcontext (name &rest vars)
+  "Define a context NAME that will bind variables VARS."
+  (let* ((context (wisent-context-name name))
+         (bindings (mapcar #'(lambda (v) (list 'defvar v)) vars)))
+    `(eval-when-compile
+       ,@bindings
+       (defvar ,context ',vars))))
+(put 'wisent-defcontext 'lisp-indent-function 1)
+
+(defmacro wisent-with-context (name &rest body)
+  "Bind variables in context NAME then eval BODY."
+  `(let* ,(wisent-context-bindings name)
+     ,@body))
+(put 'wisent-with-context 'lisp-indent-function 1)
+
+;; A naive implementation of data structures!  But it suffice here ;-)
+
+(defmacro wisent-struct (name &rest fields)
+  "Define a simple data structure called NAME.
+Which contains data stored in FIELDS.  FIELDS is a list of symbols
+which are field names or pairs (FIELD INITIAL-VALUE) where
+INITIAL-VALUE is a constant used as the initial value of FIELD when
+the data structure is created.  INITIAL-VALUE defaults to nil.
+
+This defines a `make-NAME' constructor, get-able `NAME-FIELD' and
+set-able `set-NAME-FIELD' accessors."
+  (let ((size (length fields))
+        (i    0)
+        accors field sufx fun ivals)
+    (while (< i size)
+      (setq field  (car fields)
+            fields (cdr fields))
+      (if (consp field)
+          (setq ivals (cons (cadr field) ivals)
+                field (car field))
+        (setq ivals (cons nil ivals)))
+      (setq sufx   (format "%s-%s" name field)
+            fun    (intern (format "%s" sufx))
+            accors (cons `(defmacro ,fun (s)
+                            (list 'aref s ,i))
+                         accors)
+            fun    (intern (format "set-%s" sufx))
+            accors (cons `(defmacro ,fun (s v)
+                            (list 'aset s ,i v))
+                         accors)
+            i      (1+ i)))
+    `(progn
+      (defmacro ,(intern (format "make-%s" name)) ()
+        (cons 'vector ',(nreverse ivals)))
+      ,@accors)))
+(put 'wisent-struct 'lisp-indent-function 1)
+
+;; Other utilities
+
+(defsubst wisent-pad-string (s n &optional left)
+  "Fill string S with spaces.
+Return a new string of at least N characters.  Insert spaces on right.
+If optional LEFT is non-nil insert spaces on left."
+  (let ((i (length s)))
+    (if (< i n)
+        (if left
+            (concat (make-string (- n i) ?\ ) s)
+          (concat s (make-string (- n i) ?\ )))
+      s)))
+
+;;;; ------------------------
+;;;; Environment dependencies
+;;;; ------------------------
+
+(defconst wisent-BITS-PER-WORD
+  (let ((i 1))
+    (while (not (zerop (lsh 1 i)))
+      (setq i (1+ i)))
+    i))
+
+(defsubst wisent-WORDSIZE (n)
+  "(N + BITS-PER-WORD - 1) / BITS-PER-WORD."
+  (/ (1- (+ n wisent-BITS-PER-WORD)) wisent-BITS-PER-WORD))
+
+(defsubst wisent-SETBIT (x i)
+  "X[I/BITS-PER-WORD] |= 1 << (I % BITS-PER-WORD)."
+  (let ((k (/ i wisent-BITS-PER-WORD)))
+    (aset x k (logior (aref x k)
+                      (lsh 1 (% i wisent-BITS-PER-WORD))))))
+
+(defsubst wisent-RESETBIT (x i)
+  "X[I/BITS-PER-WORD] &= ~(1 << (I % BITS-PER-WORD))."
+  (let ((k (/ i wisent-BITS-PER-WORD)))
+    (aset x k (logand (aref x k)
+                      (lognot (lsh 1 (% i wisent-BITS-PER-WORD)))))))
+
+(defsubst wisent-BITISSET (x i)
+  "(X[I/BITS-PER-WORD] & (1 << (I % BITS-PER-WORD))) != 0."
+  (not (zerop (logand (aref x (/ i wisent-BITS-PER-WORD))
+                      (lsh 1 (% i wisent-BITS-PER-WORD))))))
+
+(eval-when-compile
+  (or (fboundp 'noninteractive)
+      ;; Silence the Emacs byte compiler
+      (defun noninteractive nil))
+  )
+
+(defsubst wisent-noninteractive ()
+  "Return non-nil if running without interactive terminal."
+  (if (featurep 'xemacs)
+      (noninteractive)
+    noninteractive))
+
+(defvar wisent-debug-flag nil
+  "Non-nil means enable some debug stuff.")
+
+;;;; --------------
+;;;; Logging/Output
+;;;; --------------
+(defconst wisent-log-buffer-name "*wisent-log*"
+  "Name of the log buffer.")
+
+(defvar wisent-new-log-flag nil
+  "Non-nil means to start a new report.")
+
+;;;###autoload
+(defvar wisent-verbose-flag nil
+  "*Non-nil means to report verbose information on generated parser.")
+
+;;;###autoload
+(defun wisent-toggle-verbose-flag ()
+  "Toggle whether to report verbose information on generated parser."
+  (interactive)
+  (setq wisent-verbose-flag (not wisent-verbose-flag))
+  (when (interactive-p)
+    (message "Verbose report %sabled"
+             (if wisent-verbose-flag "en" "dis"))))
+
+(defmacro wisent-log-buffer ()
+  "Return the log buffer.
+Its name is defined in constant `wisent-log-buffer-name'."
+  `(get-buffer-create wisent-log-buffer-name))
+
+(defmacro wisent-clear-log ()
+  "Delete the entire contents of the log buffer."
+  `(with-current-buffer (wisent-log-buffer)
+     (erase-buffer)))
+
+(eval-when-compile (defvar byte-compile-current-file))
+
+(defun wisent-source ()
+  "Return the current source file name or nil."
+  (let ((source (or (and (boundp 'byte-compile-current-file)
+                         byte-compile-current-file)
+                    load-file-name (buffer-file-name))))
+    (if source
+        (file-relative-name source))))
+
+(defun wisent-new-log ()
+  "Start a new entry into the log buffer."
+  (setq wisent-new-log-flag nil)
+  (let ((text (format "\n\n*** Wisent %s - %s\n\n"
+                      (or (wisent-source) (buffer-name))
+                      (format-time-string "%Y-%m-%d %R"))))
+    (with-current-buffer (wisent-log-buffer)
+      (goto-char (point-max))
+      (insert text))))
+
+(defsubst wisent-log (&rest args)
+  "Insert text into the log buffer.
+`format' is applied to ARGS and the result string is inserted into the
+log buffer returned by the function `wisent-log-buffer'."
+  (and wisent-new-log-flag (wisent-new-log))
+  (with-current-buffer (wisent-log-buffer)
+    (insert (apply 'format args))))
+
+(defconst wisent-log-file "wisent.output"
+  "The log file.
+Used when running without interactive terminal.")
+
+(defun wisent-append-to-log-file ()
+  "Append contents of logging buffer to `wisent-log-file'."
+  (if (get-buffer wisent-log-buffer-name)
+      (condition-case err
+          (with-current-buffer (wisent-log-buffer)
+            (widen)
+            (if (> (point-max) (point-min))
+                (write-region (point-min) (point-max)
+                              wisent-log-file t)))
+        (error
+         (message "*** %s" (error-message-string err))))))
+
+;;;; -----------------------------------
+;;;; Representation of the grammar rules
+;;;; -----------------------------------
+
+;; ntokens is the number of tokens, and nvars is the number of
+;; variables (nonterminals).  nsyms is the total number, ntokens +
+;; nvars.
+
+;; Each symbol (either token or variable) receives a symbol number.
+;; Numbers 0 to ntokens-1 are for tokens, and ntokens to nsyms-1 are
+;; for variables.  Symbol number zero is the end-of-input token.  This
+;; token is counted in ntokens.
+
+;; The rules receive rule numbers 1 to nrules in the order they are
+;; written.  Actions and guards are accessed via the rule number.
+
+;; The rules themselves are described by three arrays: rrhs, rlhs and
+;; ritem.  rlhs[R] is the symbol number of the left hand side of rule
+;; R.  The right hand side is stored as symbol numbers in a portion of
+;; ritem.  rrhs[R] contains the index in ritem of the beginning of the
+;; portion for rule R.
+
+;; The length of the portion is one greater than the number of symbols
+;; in the rule's right hand side.  The last element in the portion
+;; contains minus R, which identifies it as the end of a portion and
+;; says which rule it is for.
+
+;; The portions of ritem come in order of increasing rule number and
+;; are followed by an element which is nil to mark the end.  nitems is
+;; the total length of ritem, not counting the final nil.  Each
+;; element of ritem is called an "item" and its index in ritem is an
+;; item number.
+
+;; Item numbers are used in the finite state machine to represent
+;; places that parsing can get to.
+
+;; The vector rprec contains for each rule, the item number of the
+;; symbol giving its precedence level to this rule.  The precedence
+;; level and associativity of each symbol is recorded in respectively
+;; the properties 'wisent--prec and 'wisent--assoc.
+
+;; Precedence levels are assigned in increasing order starting with 1
+;; so that numerically higher precedence values mean tighter binding
+;; as they ought to.  nil as a symbol or rule's precedence means none
+;; is assigned.
+
+(defcustom wisent-state-table-size 1009
+  "The size of the state table."
+  :type 'integer
+  :group 'wisent)
+
+;; These variables only exist locally in the function
+;; `wisent-compile-grammar' and are shared by all other nested
+;; callees.
+(wisent-defcontext compile-grammar
+  F LA LAruleno accessing-symbol conflicts consistent default-prec
+  derives err-table fderives final-state first-reduction first-shift
+  first-state firsts from-state goto-map includes itemset nitemset
+  kernel-base kernel-end kernel-items last-reduction last-shift
+  last-state lookaheads lookaheadset lookback maxrhs ngotos nitems
+  nrules nshifts nstates nsyms ntokens nullable nvars rassoc redset
+  reduction-table ritem rlhs rprec rrc-count rrc-total rrhs ruseful
+  rcode ruleset rulesetsize shift-symbol shift-table shiftset
+  src-count src-total start-table state-table tags this-state to-state
+  tokensetsize ;; nb of words req. to hold a bit for each rule
+  varsetsize ;; nb of words req. to hold a bit for each variable
+  error-token-number start-symbol token-list var-list
+  N P V V1 nuseless-nonterminals nuseless-productions
+  ptable ;; symbols & characters properties
+  )
+
+(defmacro wisent-ISTOKEN (s)
+  "Return non-nil if item number S defines a token (terminal).
+That is if S < `ntokens'."
+  `(< ,s ntokens))
+
+(defmacro wisent-ISVAR(s)
+  "Return non-nil if item number S defines a nonterminal.
+That is if S >= `ntokens'."
+  `(>= ,s ntokens))
+
+(defsubst wisent-tag (s)
+  "Return printable form of item number S."
+  (wisent-item-to-string (aref tags s)))
+
+;; Symbol and character properties
+
+(defsubst wisent-put (object propname value)
+  "Store OBJECT's PROPNAME property with value VALUE.
+Use `eq' to locate OBJECT."
+  (let ((entry (assq object ptable)))
+    (or entry (setq entry (list object) ptable (cons entry ptable)))
+    (setcdr entry (plist-put (cdr entry) propname value))))
+
+(defsubst wisent-get (object propname)
+  "Return the value of OBJECT's PROPNAME property.
+Use `eq' to locate OBJECT."
+  (plist-get (cdr (assq object ptable)) propname))
+
+(defsubst wisent-item-number (x)
+  "Return the item number of symbol X."
+  (wisent-get x 'wisent--item-no))
+
+(defsubst wisent-set-item-number (x n)
+  "Set the item number of symbol X to N."
+  (wisent-put x 'wisent--item-no n))
+
+(defsubst wisent-assoc (x)
+  "Return the associativity of symbol X."
+  (wisent-get x 'wisent--assoc))
+
+(defsubst wisent-set-assoc (x a)
+  "Set the associativity of symbol X to A."
+  (wisent-put x 'wisent--assoc a))
+
+(defsubst wisent-prec (x)
+  "Return the precedence level of symbol X."
+  (wisent-get x 'wisent--prec))
+
+(defsubst wisent-set-prec (x p)
+  "Set the precedence level of symbol X to P."
+  (wisent-put x 'wisent--prec p))
+
+;;;; ----------------------------------------------------------
+;;;; Type definitions for nondeterministic finite state machine
+;;;; ----------------------------------------------------------
+
+;; These type definitions are used to represent a nondeterministic
+;; finite state machine that parses the specified grammar.  This
+;; information is generated by the function `wisent-generate-states'.
+
+;; Each state of the machine is described by a set of items --
+;; particular positions in particular rules -- that are the possible
+;; places where parsing could continue when the machine is in this
+;; state.  These symbols at these items are the allowable inputs that
+;; can follow now.
+
+;; A core represents one state.  States are numbered in the number
+;; field.  When `wisent-generate-states' is finished, the starting
+;; state is state 0 and `nstates' is the number of states.  (A
+;; transition to a state whose state number is `nstates' indicates
+;; termination.)  All the cores are chained together and `first-state'
+;; points to the first one (state 0).
+
+;; For each state there is a particular symbol which must have been
+;; the last thing accepted to reach that state.  It is the
+;; accessing-symbol of the core.
+
+;; Each core contains a vector of `nitems' items which are the indices
+;; in the `ritems' vector of the items that are selected in this
+;; state.
+
+;; The link field is used for chaining buckets that hash states by
+;; their itemsets.  This is for recognizing equivalent states and
+;; combining them when the states are generated.
+
+;; The two types of transitions are shifts (push the lookahead token
+;; and read another) and reductions (combine the last n things on the
+;; stack via a rule, replace them with the symbol that the rule
+;; derives, and leave the lookahead token alone).  When the states are
+;; generated, these transitions are represented in two other lists.
+
+;; Each shifts structure describes the possible shift transitions out
+;; of one state, the state whose number is in the number field.  The
+;; shifts structures are linked through next and first-shift points to
+;; them.  Each contains a vector of numbers of the states that shift
+;; transitions can go to.  The accessing-symbol fields of those
+;; states' cores say what kind of input leads to them.
+
+;; A shift to state zero should be ignored.  Conflict resolution
+;; deletes shifts by changing them to zero.
+
+;; Each reductions structure describes the possible reductions at the
+;; state whose number is in the number field.  The data is a list of
+;; nreds rules, represented by their rule numbers.  `first-reduction'
+;; points to the list of these structures.
+
+;; Conflict resolution can decide that certain tokens in certain
+;; states should explicitly be errors (for implementing %nonassoc).
+;; For each state, the tokens that are errors for this reason are
+;; recorded in an errs structure, which has the state number in its
+;; number field.  The rest of the errs structure is full of token
+;; numbers.
+
+;; There is at least one shift transition present in state zero.  It
+;; leads to a next-to-final state whose accessing-symbol is the
+;; grammar's start symbol.  The next-to-final state has one shift to
+;; the final state, whose accessing-symbol is zero (end of input).
+;; The final state has one shift, which goes to the termination state
+;; (whose number is `nstates'-1).
+;; The reason for the extra state at the end is to placate the
+;; parser's strategy of making all decisions one token ahead of its
+;; actions.
+
+(wisent-struct core
+  next                                  ; -> core
+  link                                  ; -> core
+  (number 0)
+  (accessing-symbol 0)
+  (nitems 0)
+  (items [0]))
+
+(wisent-struct shifts
+  next                                  ; -> shifts
+  (number 0)
+  (nshifts 0)
+  (shifts [0]))
+
+(wisent-struct reductions
+  next                                  ; -> reductions
+  (number 0)
+  (nreds 0)
+  (rules [0]))
+
+(wisent-struct errs
+  (nerrs 0)
+  (errs [0]))
+
+;;;; --------------------------------------------------------
+;;;; Find unreachable terminals, nonterminals and productions
+;;;; --------------------------------------------------------
+
+(defun wisent-bits-equal (L R n)
+  "Visit L and R and return non-nil if their first N elements are `='.
+L and R must be vectors of integers."
+  (let* ((i    (1- n))
+         (iseq t))
+    (while (and iseq (natnump i))
+      (setq iseq (= (aref L i) (aref R i))
+            i (1- i)))
+    iseq))
+
+(defun wisent-nbits (i)
+  "Return number of bits set in integer I."
+  (let ((count 0))
+    (while (not (zerop i))
+      ;; i ^= (i & ((unsigned) (-(int) i)))
+      (setq i (logxor i (logand i (- i)))
+            count (1+ count)))
+    count))
+
+(defun wisent-bits-size (S n)
+  "In vector S count the total of bits set in first N elements.
+S must be a vector of integers."
+  (let* ((i (1- n))
+         (count 0))
+    (while (natnump i)
+      (setq count (+ count (wisent-nbits (aref S i)))
+            i (1- i)))
+    count))
+
+(defun wisent-useful-production (i N0)
+  "Return non-nil if production I is in useful set N0."
+  (let* ((useful t)
+         (r (aref rrhs i))
+         n)
+    (while (and useful (> (setq n (aref ritem r)) 0))
+      (if (wisent-ISVAR n)
+          (setq useful (wisent-BITISSET N0 (- n ntokens))))
+      (setq r (1+ r)))
+    useful))
+
+(defun wisent-useless-nonterminals ()
+  "Find out which nonterminals are used."
+  (let (Np Ns i n break)
+    ;; N is set as built.  Np is set being built this iteration. P is
+    ;; set of all productions which have a RHS all in N.
+    (setq n  (wisent-WORDSIZE nvars)
+          Np (make-vector n 0))
+
+    ;; The set being computed is a set of nonterminals which can
+    ;; derive the empty string or strings consisting of all
+    ;; terminals. At each iteration a nonterminal is added to the set
+    ;; if there is a production with that nonterminal as its LHS for
+    ;; which all the nonterminals in its RHS are already in the set.
+    ;; Iterate until the set being computed remains unchanged.  Any
+    ;; nonterminals not in the set at that point are useless in that
+    ;; they will never be used in deriving a sentence of the language.
+
+    ;; This iteration doesn't use any special traversal over the
+    ;; productions.  A set is kept of all productions for which all
+    ;; the nonterminals in the RHS are in useful.  Only productions
+    ;; not in this set are scanned on each iteration.  At the end,
+    ;; this set is saved to be used when finding useful productions:
+    ;; only productions in this set will appear in the final grammar.
+
+    (while (not break)
+      (setq i (1- n))
+      (while (natnump i)
+        ;; Np[i] = N[i]
+        (aset Np i (aref N i))
+        (setq i (1- i)))
+
+      (setq i 1)
+      (while (<= i nrules)
+        (if (not (wisent-BITISSET P i))
+            (when (wisent-useful-production i N)
+              (wisent-SETBIT Np (- (aref rlhs i) ntokens))
+              (wisent-SETBIT P i)))
+        (setq i (1+ i)))
+      (if (wisent-bits-equal N Np n)
+          (setq break t)
+        (setq Ns Np
+              Np N
+              N  Ns)))
+    (setq N Np)))
+
+(defun wisent-inaccessable-symbols ()
+  "Find out which productions are reachable and which symbols are used."
+  ;; Starting with an empty set of productions and a set of symbols
+  ;; which only has the start symbol in it, iterate over all
+  ;; productions until the set of productions remains unchanged for an
+  ;; iteration.  For each production which has a LHS in the set of
+  ;; reachable symbols, add the production to the set of reachable
+  ;; productions, and add all of the nonterminals in the RHS of the
+  ;; production to the set of reachable symbols.
+
+  ;; Consider only the (partially) reduced grammar which has only
+  ;; nonterminals in N and productions in P.
+
+  ;; The result is the set P of productions in the reduced grammar,
+  ;; and the set V of symbols in the reduced grammar.
+
+  ;; Although this algorithm also computes the set of terminals which
+  ;; are reachable, no terminal will be deleted from the grammar. Some
+  ;; terminals might not be in the grammar but might be generated by
+  ;; semantic routines, and so the user might want them available with
+  ;; specified numbers.  (Is this true?)  However, the non reachable
+  ;; terminals are printed (if running in verbose mode) so that the
+  ;; user can know.
+  (let (Vp Vs Pp i tt r n m break)
+    (setq n  (wisent-WORDSIZE nsyms)
+          m  (wisent-WORDSIZE (1+ nrules))
+          Vp (make-vector n 0)
+          Pp (make-vector m 0))
+
+    ;; If the start symbol isn't useful, then nothing will be useful.
+    (when (wisent-BITISSET N (- start-symbol ntokens))
+      (wisent-SETBIT V start-symbol)
+      (while (not break)
+        (setq i (1- n))
+        (while (natnump i)
+          (aset Vp i (aref V i))
+          (setq i (1- i)))
+        (setq i 1)
+        (while (<= i nrules)
+          (when (and (not (wisent-BITISSET Pp i))
+                     (wisent-BITISSET P i)
+                     (wisent-BITISSET V (aref rlhs i)))
+            (setq r (aref rrhs i))
+            (while (natnump (setq tt (aref ritem r)))
+              (if (or (wisent-ISTOKEN tt)
+                      (wisent-BITISSET N (- tt ntokens)))
+                  (wisent-SETBIT Vp tt))
+              (setq r (1+ r)))
+            (wisent-SETBIT Pp i))
+          (setq i (1+ i)))
+        (if (wisent-bits-equal V Vp n)
+            (setq break t)
+          (setq Vs Vp
+                Vp V
+                V  Vs))))
+    (setq V Vp)
+
+    ;; Tokens 0, 1 are internal to Wisent.  Consider them useful.
+    (wisent-SETBIT V 0) ;; end-of-input token
+    (wisent-SETBIT V 1) ;; error token
+    (setq P Pp)
+
+    (setq nuseless-productions  (- nrules (wisent-bits-size P m))
+          nuseless-nonterminals nvars
+          i ntokens)
+    (while (< i nsyms)
+      (if (wisent-BITISSET V i)
+          (setq nuseless-nonterminals (1- nuseless-nonterminals)))
+      (setq i (1+ i)))
+
+    ;; A token that was used in %prec should not be warned about.
+    (setq i 1)
+    (while (<= i nrules)
+      (if (aref rprec i)
+          (wisent-SETBIT V1 (aref rprec i)))
+      (setq i (1+ i)))
+    ))
+
+(defun wisent-reduce-grammar-tables ()
+  "Disable useless productions."
+  (if (> nuseless-productions 0)
+      (let ((pn 1))
+        (while (<= pn nrules)
+          (aset ruseful pn (wisent-BITISSET P pn))
+          (setq pn (1+ pn))))))
+
+(defun wisent-nonterminals-reduce ()
+  "Remove useless nonterminals."
+  (let (i n r item nontermmap tags-sorted)
+    ;; Map the nonterminals to their new index: useful first, useless
+    ;; afterwards.  Kept for later report.
+    (setq nontermmap (make-vector nvars 0)
+          n ntokens
+          i ntokens)
+    (while (< i nsyms)
+      (when (wisent-BITISSET V i)
+        (aset nontermmap (- i ntokens) n)
+        (setq n (1+ n)))
+      (setq i (1+ i)))
+    (setq i ntokens)
+    (while (< i nsyms)
+      (unless (wisent-BITISSET V i)
+        (aset nontermmap (- i ntokens) n)
+        (setq n (1+ n)))
+      (setq i (1+ i)))
+    ;; Shuffle elements of tables indexed by symbol number
+    (setq tags-sorted (make-vector nvars nil)
+          i ntokens)
+    (while (< i nsyms)
+      (setq n (aref nontermmap (- i ntokens)))
+      (aset tags-sorted (- n ntokens) (aref tags i))
+      (setq i (1+ i)))
+    (setq i ntokens)
+    (while (< i nsyms)
+      (aset tags i (aref tags-sorted (- i ntokens)))
+      (setq i (1+ i)))
+    ;; Replace all symbol numbers in valid data structures.
+    (setq i 1)
+    (while (<= i nrules)
+      (aset rlhs i (aref nontermmap (- (aref rlhs i) ntokens)))
+      (setq i (1+ i)))
+    (setq r 0)
+    (while (setq item (aref ritem r))
+      (if (wisent-ISVAR item)
+          (aset ritem r (aref nontermmap (- item ntokens))))
+      (setq r (1+ r)))
+    (setq start-symbol (aref nontermmap (- start-symbol ntokens))
+          nsyms (- nsyms nuseless-nonterminals)
+          nvars (- nvars nuseless-nonterminals))
+    ))
+
+(defun wisent-total-useless ()
+  "Report number of useless nonterminals and productions."
+  (let* ((src (wisent-source))
+         (src (if src (concat " in " src) ""))
+         (msg (format "Grammar%s contains" src)))
+    (if (> nuseless-nonterminals 0)
+        (setq msg (format "%s %d useless nonterminal%s"
+                          msg nuseless-nonterminals
+                          (if (> nuseless-nonterminals 0) "s" ""))))
+    (if (and (> nuseless-nonterminals 0) (> nuseless-productions 0))
+        (setq msg (format "%s and" msg)))
+    (if (> nuseless-productions 0)
+        (setq msg (format "%s %d useless rule%s"
+                          msg nuseless-productions
+                          (if (> nuseless-productions 0) "s" ""))))
+    (message msg)))
+
+(defun wisent-reduce-grammar ()
+  "Find unreachable terminals, nonterminals and productions."
+  ;; Allocate the global sets used to compute the reduced grammar
+  (setq N  (make-vector (wisent-WORDSIZE nvars) 0)
+        P  (make-vector (wisent-WORDSIZE (1+ nrules)) 0)
+        V  (make-vector (wisent-WORDSIZE nsyms) 0)
+        V1 (make-vector (wisent-WORDSIZE nsyms) 0)
+        nuseless-nonterminals 0
+        nuseless-productions  0)
+
+  (wisent-useless-nonterminals)
+  (wisent-inaccessable-symbols)
+
+  (when (> (+ nuseless-nonterminals nuseless-productions) 0)
+    (wisent-total-useless)
+    (or (wisent-BITISSET N (- start-symbol ntokens))
+        (error "Start symbol `%s' does not derive any sentence"
+               (wisent-tag start-symbol)))
+    (wisent-reduce-grammar-tables)
+    (if (> nuseless-nonterminals 0)
+        (wisent-nonterminals-reduce))))
+
+(defun wisent-print-useless ()
+  "Output the detailed results of the reductions."
+  (let (i b r)
+    (when (> nuseless-nonterminals 0)
+      ;; Useless nonterminals have been moved after useful ones.
+      (wisent-log "\n\nUseless nonterminals:\n\n")
+      (setq i 0)
+      (while (< i nuseless-nonterminals)
+        (wisent-log "   %s\n" (wisent-tag (+ nsyms i)))
+        (setq i (1+ i))))
+    (setq b nil
+          i 0)
+    (while (< i ntokens)
+      (unless (or (wisent-BITISSET V i) (wisent-BITISSET V1 i))
+        (or b
+            (wisent-log "\n\nTerminals which are not used:\n\n"))
+        (setq b t)
+        (wisent-log "   %s\n" (wisent-tag i)))
+      (setq i (1+ i)))
+    (when (> nuseless-productions 0)
+      (wisent-log "\n\nUseless rules:\n\n")
+      (setq i 1)
+      (while (<= i nrules)
+        (unless (aref ruseful i)
+          (wisent-log "#%s  " (wisent-pad-string (format "%d" i) 4))
+          (wisent-log "%s:" (wisent-tag (aref rlhs i)))
+          (setq r (aref rrhs i))
+          (while (natnump (aref ritem r))
+            (wisent-log " %s" (wisent-tag (aref ritem r)))
+            (setq r (1+ r)))
+          (wisent-log ";\n"))
+        (setq i (1+ i))))
+    (if (or b (> nuseless-nonterminals 0) (> nuseless-productions 0))
+        (wisent-log "\n\n"))
+    ))
+
+;;;; -----------------------------
+;;;; Match rules with nonterminals
+;;;; -----------------------------
+
+(defun wisent-set-derives ()
+  "Find, for each variable (nonterminal), which rules can derive it.
+It sets up the value of DERIVES so that DERIVES[i - NTOKENS] points to
+a list of rule numbers, terminated with -1."
+  (let (i lhs p q dset delts)
+    (setq dset (make-vector nvars nil)
+          delts (make-vector (1+ nrules) 0))
+    (setq p 0 ;; p = delts
+          i nrules)
+    (while (> i 0)
+      (when (aref ruseful i)
+        (setq lhs (aref rlhs i))
+        ;; p->next = dset[lhs];
+        ;; p->value = i;
+        (aset delts p (cons i (aref dset (- lhs ntokens)))) ;; (value . next)
+        (aset dset (- lhs ntokens) p) ;; dset[lhs] = p
+        (setq p (1+ p)) ;; p++
+        )
+      (setq i (1- i)))
+
+    (setq derives (make-vector nvars nil)
+          i       ntokens)
+
+    (while (< i nsyms)
+      (setq q nil
+            p (aref dset (- i ntokens))) ;; p = dset[i]
+
+      (while p
+        (setq p (aref delts p)
+              q (cons (car p) q) ;;q++ = p->value
+              p (cdr p))) ;; p = p->next
+      (setq q (nreverse (cons -1 q))) ;; *q++ = -1
+      (aset derives (- i ntokens) q) ;; derives[i] = q
+      (setq i (1+ i)))
+    ))
+
+;;;; --------------------------------------------------------
+;;;; Find which nonterminals can expand into the null string.
+;;;; --------------------------------------------------------
+
+(defun wisent-print-nullable ()
+  "Print NULLABLE."
+  (let (i)
+    (wisent-log "NULLABLE\n")
+    (setq i ntokens)
+    (while (< i nsyms)
+      (wisent-log "\t%s: %s\n" (wisent-tag i)
+                  (if (aref nullable (- i ntokens))
+                      "yes" : "no"))
+      (setq i (1+ i)))
+    (wisent-log "\n\n")))
+
+(defun wisent-set-nullable ()
+  "Set up NULLABLE.
+A vector saying which nonterminals can expand into the null string.
+NULLABLE[i - NTOKENS] is nil if symbol I can do so."
+  (let (ruleno s1 s2 p r squeue rcount rsets relts item any-tokens)
+    (setq squeue (make-vector nvars 0)
+          rcount (make-vector (1+ nrules) 0)
+          rsets  (make-vector nvars nil) ;; - ntokens
+          relts  (make-vector (+ nitems nvars 1) nil)
+          nullable (make-vector nvars nil)) ;; - ntokens
+    (setq s1 0 s2 0 ;; s1 = s2 = squeue
+          p 0 ;; p = relts
+          ruleno 1)
+    (while (<= ruleno nrules)
+      (when (aref ruseful ruleno)
+        (if (> (aref ritem (aref rrhs ruleno)) 0)
+            (progn
+              ;; This rule has a non empty RHS.
+              (setq any-tokens nil
+                    r (aref rrhs ruleno))
+              (while (> (aref ritem r) 0)
+                (if (wisent-ISTOKEN (aref ritem r))
+                    (setq any-tokens t))
+                (setq r (1+ r)))
+
+              ;; This rule has only nonterminals: schedule it for the
+              ;; second pass.
+              (unless any-tokens
+                (setq r (aref rrhs ruleno))
+                (while (> (setq item (aref ritem r)) 0)
+                  (aset rcount ruleno (1+ (aref rcount ruleno)))
+                  ;; p->next = rsets[item];
+                  ;; p->value = ruleno;
+                  (aset relts p (cons ruleno (aref rsets (- item ntokens))))
+                  ;; rsets[item] = p;
+                  (aset rsets (- item ntokens) p)
+                  (setq p (1+ p)
+                        r (1+ r)))))
+          ;; This rule has an empty RHS.
+          ;; assert (ritem[rrhs[ruleno]] == -ruleno)
+          (when (and (aref ruseful ruleno)
+                     (setq item (aref rlhs ruleno))
+                     (not (aref nullable (- item ntokens))))
+            (aset nullable (- item ntokens) t)
+            (aset squeue s2 item)
+            (setq s2 (1+ s2)))
+          )
+        )
+      (setq ruleno (1+ ruleno)))
+
+    (while (< s1 s2)
+      ;; p = rsets[*s1++]
+      (setq p (aref rsets (- (aref squeue s1) ntokens))
+            s1 (1+ s1))
+      (while p
+        (setq p (aref relts p)
+              ruleno (car p)
+              p (cdr p)) ;; p = p->next
+        ;; if (--rcount[ruleno] == 0)
+        (when (zerop (aset rcount ruleno (1- (aref rcount ruleno))))
+          (setq item (aref rlhs ruleno))
+          (aset nullable (- item ntokens) t)
+          (aset squeue s2 item)
+          (setq s2 (1+ s2)))))
+
+    (if wisent-debug-flag
+        (wisent-print-nullable))
+    ))
+
+;;;; -----------
+;;;; Subroutines
+;;;; -----------
+
+(defun wisent-print-fderives ()
+  "Print FDERIVES."
+  (let (i j rp)
+    (wisent-log "\n\n\nFDERIVES\n")
+    (setq i ntokens)
+    (while (< i nsyms)
+      (wisent-log "\n\n%s derives\n\n" (wisent-tag i))
+      (setq rp (aref fderives (- i ntokens))
+            j  0)
+      (while (<= j nrules)
+        (if (wisent-BITISSET rp j)
+            (wisent-log "   %d\n" j))
+        (setq j (1+ j)))
+      (setq i (1+ i)))))
+
+(defun wisent-set-fderives ()
+  "Set up FDERIVES.
+An NVARS by NRULES matrix of bits indicating which rules can help
+derive the beginning of the data for each nonterminal.  For example,
+if symbol 5 can be derived as the sequence of symbols 8 3 20, and one
+of the rules for deriving symbol 8 is rule 4, then the
+\[5 - NTOKENS, 4] bit in FDERIVES is set."
+  (let (i j k)
+    (setq fderives (make-vector nvars nil))
+    (setq i 0)
+    (while (< i nvars)
+      (aset fderives i (make-vector rulesetsize 0))
+      (setq i (1+ i)))
+
+    (wisent-set-firsts)
+
+    (setq i ntokens)
+    (while (< i nsyms)
+      (setq j ntokens)
+      (while (< j nsyms)
+        ;; if (BITISSET (FIRSTS (i), j - ntokens))
+        (when (wisent-BITISSET (aref firsts (- i ntokens)) (- j ntokens))
+          (setq k (aref derives (- j ntokens)))
+          (while (> (car k) 0) ;; derives[j][k] > 0
+            ;; SETBIT (FDERIVES (i), derives[j][k]);
+            (wisent-SETBIT (aref fderives (- i ntokens)) (car k))
+            (setq k (cdr k))))
+        (setq j (1+ j)))
+      (setq i (1+ i)))
+
+    (if wisent-debug-flag
+        (wisent-print-fderives))
+    ))
+
+(defun wisent-print-firsts ()
+  "Print FIRSTS."
+  (let (i j v)
+    (wisent-log "\n\n\nFIRSTS\n\n")
+    (setq i ntokens)
+    (while (< i nsyms)
+      (wisent-log "\n\n%s firsts\n\n" (wisent-tag i))
+      (setq v (aref firsts (- i ntokens))
+            j 0)
+      (while (< j nvars)
+        (if (wisent-BITISSET v j)
+            (wisent-log "\t\t%d (%s)\n"
+                        (+ j ntokens) (wisent-tag (+ j ntokens))))
+        (setq j (1+ j)))
+      (setq i (1+ i)))))
+
+(defun wisent-TC (R n)
+  "Transitive closure.
+Given R an N by N matrix of bits, modify its contents to be the
+transitive closure of what was given."
+  (let (i j k)
+    ;; R (J, I) && R (I, K) => R (J, K).
+    ;; I *must* be the outer loop.
+    (setq i 0)
+    (while (< i n)
+      (setq j 0)
+      (while (< j n)
+        (when (wisent-BITISSET (aref R j) i)
+          (setq k 0)
+          (while (< k n)
+            (if (wisent-BITISSET (aref R i) k)
+                (wisent-SETBIT (aref R j) k))
+            (setq k (1+ k))))
+        (setq j (1+ j)))
+      (setq i (1+ i)))))
+
+(defun wisent-RTC (R n)
+  "Reflexive Transitive Closure.
+Same as `wisent-TC' and then set all the bits on the diagonal of R, an
+N by N matrix of bits."
+  (let (i)
+    (wisent-TC R n)
+    (setq i 0)
+    (while (< i n)
+      (wisent-SETBIT (aref R i) i)
+      (setq i (1+ i)))))
+
+(defun wisent-set-firsts ()
+  "Set up FIRSTS.
+An NVARS by NVARS bit matrix indicating which items can represent the
+beginning of the input corresponding to which other items.  For
+example, if some rule expands symbol 5 into the sequence of symbols 8
+3 20, the symbol 8 can be the beginning of the data for symbol 5, so
+the bit [8 - NTOKENS, 5 - NTOKENS] in FIRSTS is set."
+  (let (row symbol sp rowsize i)
+    (setq rowsize (wisent-WORDSIZE nvars)
+          varsetsize rowsize
+          firsts (make-vector nvars nil)
+          i 0)
+    (while (< i nvars)
+      (aset firsts i (make-vector rowsize 0))
+      (setq i (1+ i)))
+
+    (setq row 0 ;; row = firsts
+          i ntokens)
+    (while (< i nsyms)
+      (setq sp (aref derives (- i ntokens)))
+      (while (>= (car sp) 0)
+        (setq symbol (aref ritem (aref rrhs (car sp)))
+              sp (cdr sp))
+        (when (wisent-ISVAR symbol)
+          (setq symbol (- symbol ntokens))
+          (wisent-SETBIT (aref firsts row) symbol)
+          ))
+      (setq row (1+ row)
+            i   (1+ i)))
+
+    (wisent-RTC firsts nvars)
+
+    (if wisent-debug-flag
+        (wisent-print-firsts))
+    ))
+
+(defun wisent-initialize-closure (n)
+  "Allocate the ITEMSET and RULESET vectors.
+And precompute useful data so that `wisent-closure' can be called.
+N is the number of elements to allocate for ITEMSET."
+  (setq itemset (make-vector n 0)
+        rulesetsize (wisent-WORDSIZE (1+ nrules))
+        ruleset (make-vector rulesetsize 0))
+
+  (wisent-set-fderives))
+
+(defun wisent-print-closure ()
+  "Print ITEMSET."
+  (let (i)
+    (wisent-log "\n\nclosure n = %d\n\n" nitemset)
+    (setq i 0) ;; isp = itemset
+    (while (< i nitemset)
+      (wisent-log "   %d\n" (aref itemset i))
+      (setq i (1+ i)))))
+
+(defun wisent-closure (core n)
+  "Set up RULESET and ITEMSET for the transitions out of CORE state.
+Given a vector of item numbers items, of length N, set up RULESET and
+ITEMSET to indicate what rules could be run and which items could be
+accepted when those items are the active ones.
+
+RULESET contains a bit for each rule.  `wisent-closure' sets the bits
+for all rules which could potentially describe the next input to be
+read.
+
+ITEMSET is a vector of item numbers; NITEMSET is the number of items
+in ITEMSET.  `wisent-closure' places there the indices of all items
+which represent units of input that could arrive next."
+  (let (c r v symbol ruleno itemno)
+    (if (zerop n)
+        (progn
+          (setq r 0
+                v (aref fderives (- start-symbol ntokens)))
+          (while (< r rulesetsize)
+            ;; ruleset[r] = FDERIVES (start-symbol)[r];
+            (aset ruleset r (aref v r))
+            (setq r (1+ r)))
+          )
+      (fillarray ruleset 0)
+      (setq c 0)
+      (while (< c n)
+        (setq symbol (aref ritem (aref core c)))
+        (when (wisent-ISVAR symbol)
+          (setq r 0
+                v (aref fderives (- symbol ntokens)))
+          (while (< r rulesetsize)
+            ;; ruleset[r] |= FDERIVES (ritem[core[c]])[r];
+            (aset ruleset r (logior (aref ruleset r) (aref v r)))
+            (setq r (1+ r))))
+        (setq c (1+ c)))
+      )
+    (setq nitemset 0
+          c 0
+          ruleno 0
+          r (* rulesetsize wisent-BITS-PER-WORD))
+    (while (< ruleno r)
+      (when (wisent-BITISSET ruleset ruleno)
+        (setq itemno (aref rrhs ruleno))
+        (while (and (< c n) (< (aref core c) itemno))
+          (aset itemset nitemset (aref core c))
+          (setq nitemset (1+ nitemset)
+                c (1+ c)))
+        (aset itemset nitemset itemno)
+        (setq nitemset (1+ nitemset)))
+      (setq ruleno (1+ ruleno)))
+
+    (while (< c n)
+      (aset itemset nitemset (aref core c))
+      (setq nitemset (1+ nitemset)
+            c (1+ c)))
+
+    (if wisent-debug-flag
+        (wisent-print-closure))
+    ))
+
+;;;; --------------------------------------------------
+;;;; Generate the nondeterministic finite state machine
+;;;; --------------------------------------------------
+
+(defun wisent-allocate-itemsets ()
+  "Allocate storage for itemsets."
+  (let (symbol i count symbol-count)
+    ;; Count the number of occurrences of all the symbols in RITEMS.
+    ;; Note that useless productions (hence useless nonterminals) are
+    ;; browsed too, hence we need to allocate room for _all_ the
+    ;; symbols.
+    (setq count 0
+          symbol-count (make-vector (+ nsyms nuseless-nonterminals) 0)
+          i 0)
+    (while (setq symbol (aref ritem i))
+      (when (> symbol 0)
+        (setq count (1+ count))
+        (aset symbol-count symbol (1+ (aref symbol-count symbol))))
+      (setq i (1+ i)))
+    ;; See comments before `wisent-new-itemsets'.  All the vectors of
+    ;; items live inside kernel-items.  The number of active items
+    ;; after some symbol cannot be more than the number of times that
+    ;; symbol appears as an item, which is symbol-count[symbol].  We
+    ;; allocate that much space for each symbol.
+    (setq kernel-base (make-vector nsyms nil)
+          kernel-items (make-vector count 0)
+          count 0
+          i 0)
+    (while (< i nsyms)
+      (aset kernel-base i count)
+      (setq count (+ count (aref symbol-count i))
+            i (1+ i)))
+    (setq shift-symbol symbol-count
+          kernel-end (make-vector nsyms nil))
+    ))
+
+(defun wisent-allocate-storage ()
+  "Allocate storage for the state machine."
+  (wisent-allocate-itemsets)
+  (setq shiftset (make-vector nsyms 0)
+        redset (make-vector (1+ nrules) 0)
+        state-table (make-vector wisent-state-table-size nil)))
+
+(defun wisent-new-itemsets ()
+  "Find which symbols can be shifted in the current state.
+And for each one record which items would be active after that shift.
+Uses the contents of ITEMSET.  SHIFT-SYMBOL is set to a vector of the
+symbols that can be shifted.  For each symbol in the grammar,
+KERNEL-BASE[symbol] points to a vector of item numbers activated if
+that symbol is shifted, and KERNEL-END[symbol] points after the end of
+that vector."
+  (let (i shiftcount isp ksp symbol)
+    (fillarray kernel-end nil)
+    (setq shiftcount 0
+          isp 0)
+    (while (< isp nitemset)
+      (setq i (aref itemset isp)
+            isp (1+ isp)
+            symbol (aref ritem i))
+      (when (> symbol 0)
+        (setq ksp (aref kernel-end symbol))
+        (when (not ksp)
+          ;; shift-symbol[shiftcount++] = symbol;
+          (aset shift-symbol shiftcount symbol)
+          (setq shiftcount (1+ shiftcount)
+                ksp (aref kernel-base symbol)))
+        ;; *ksp++ = i + 1;
+        (aset kernel-items ksp (1+ i))
+        (setq ksp (1+ ksp))
+        (aset kernel-end symbol ksp)))
+    (setq nshifts shiftcount)))
+
+(defun wisent-new-state (symbol)
+  "Create a new state for those items, if necessary.
+SYMBOL is the core accessing-symbol.
+Subroutine of `wisent-get-state'."
+  (let (n p isp1 isp2 iend items)
+    (setq isp1  (aref kernel-base symbol)
+          iend  (aref kernel-end symbol)
+          n     (- iend isp1)
+          p     (make-core)
+          items (make-vector n 0))
+    (set-core-accessing-symbol p symbol)
+    (set-core-number p nstates)
+    (set-core-nitems p n)
+    (set-core-items  p items)
+    (setq isp2 0) ;; isp2 = p->items
+    (while (< isp1 iend)
+      ;; *isp2++ = *isp1++;
+      (aset items isp2 (aref kernel-items isp1))
+      (setq isp1 (1+ isp1)
+            isp2 (1+ isp2)))
+    (set-core-next last-state p)
+    (setq last-state p
+          nstates (1+ nstates))
+    p))
+
+(defun wisent-get-state (symbol)
+  "Find the state we would get to by shifting SYMBOL.
+Return the state number for the state we would get to (from the
+current state) by shifting SYMBOL.  Create a new state if no
+equivalent one exists already.  Used by `wisent-append-states'."
+  (let (key isp1 isp2 iend sp sp2 found n)
+    (setq isp1 (aref kernel-base symbol)
+          iend (aref kernel-end symbol)
+          n    (- iend isp1)
+          key  0)
+    ;; Add up the target state's active item numbers to get a hash key
+    (while (< isp1 iend)
+      (setq key (+ key (aref kernel-items isp1))
+            isp1 (1+ isp1)))
+    (setq key (% key wisent-state-table-size)
+          sp (aref state-table key))
+    (if sp
+        (progn
+          (setq found nil)
+          (while (not found)
+            (when (= (core-nitems sp) n)
+              (setq found t
+                    isp1 (aref kernel-base symbol)
+                    ;; isp2 = sp->items;
+                    sp2  (core-items sp)
+                    isp2 0)
+
+              (while (and found (< isp1 iend))
+                ;; if (*isp1++ != *isp2++)
+                (if (not (= (aref kernel-items isp1)
+                            (aref sp2 isp2)))
+                    (setq found nil))
+                (setq isp1 (1+ isp1)
+                      isp2 (1+ isp2))))
+            (if (not found)
+                (if (core-link sp)
+                    (setq sp (core-link sp))
+                  ;; sp = sp->link = new-state(symbol)
+                  (setq sp (set-core-link sp (wisent-new-state symbol))
+                        found t)))))
+      ;; bucket is empty
+      ;; state-table[key] = sp = new-state(symbol)
+      (setq sp (wisent-new-state symbol))
+      (aset state-table key sp))
+    ;; return (sp->number);
+    (core-number sp)))
+
+(defun wisent-append-states ()
+  "Find or create the core structures for states.
+Use the information computed by `wisent-new-itemsets' to find the
+state numbers reached by each shift transition from the current state.
+SHIFTSET is set up as a vector of state numbers of those states."
+  (let (i j symbol)
+    ;; First sort shift-symbol into increasing order
+    (setq i 1)
+    (while (< i nshifts)
+      (setq symbol (aref shift-symbol i)
+            j i)
+      (while (and (> j 0) (> (aref shift-symbol (1- j)) symbol))
+        (aset shift-symbol j (aref shift-symbol (1- j)))
+        (setq j (1- j)))
+      (aset shift-symbol j symbol)
+      (setq i (1+ i)))
+    (setq i 0)
+    (while (< i nshifts)
+      (setq symbol (aref shift-symbol i))
+      (aset shiftset i (wisent-get-state symbol))
+      (setq i (1+ i)))
+    ))
+
+(defun wisent-initialize-states ()
+  "Initialize states."
+  (let ((p (make-core)))
+    (setq first-state p
+          last-state  p
+          this-state  p
+          nstates     1)))
+
+(defun wisent-save-shifts ()
+  "Save the NSHIFTS of SHIFTSET into the current linked list."
+  (let (p i shifts)
+    (setq p      (make-shifts)
+          shifts (make-vector nshifts 0)
+          i 0)
+    (set-shifts-number p (core-number this-state))
+    (set-shifts-nshifts p nshifts)
+    (set-shifts-shifts  p shifts)
+    (while (< i nshifts)
+      ;; (p->shifts)[i] = shiftset[i];
+      (aset shifts i (aref shiftset i))
+      (setq i (1+ i)))
+
+    (if last-shift
+        (set-shifts-next last-shift p)
+      (setq first-shift p))
+    (setq last-shift p)))
+
+(defun wisent-insert-start-shift ()
+  "Create the next-to-final state.
+That is the state to which a shift has already been made in the
+initial state.  Subroutine of `wisent-augment-automaton'."
+  (let (statep sp)
+    (setq statep (make-core))
+    (set-core-number statep nstates)
+    (set-core-accessing-symbol statep start-symbol)
+    (set-core-next last-state statep)
+    (setq last-state statep)
+    ;; Make a shift from this state to (what will be) the final state.
+    (setq sp (make-shifts))
+    (set-shifts-number sp nstates)
+    (setq nstates (1+ nstates))
+    (set-shifts-nshifts sp 1)
+    (set-shifts-shifts sp (vector nstates))
+    (set-shifts-next last-shift sp)
+    (setq last-shift sp)))
+
+(defun wisent-augment-automaton ()
+  "Set up initial and final states as parser wants them.
+Make sure that the initial state has a shift that accepts the
+grammar's start symbol and goes to the next-to-final state, which has
+a shift going to the final state, which has a shift to the termination
+state.  Create such states and shifts if they don't happen to exist
+already."
+  (let (i k statep sp sp2 sp1 shifts)
+    (setq sp first-shift)
+    (if sp
+        (progn
+          (if (zerop (shifts-number sp))
+              (progn
+                (setq k (shifts-nshifts sp)
+                      statep (core-next first-state))
+                ;; The states reached by shifts from first-state are
+                ;; numbered 1...K.  Look for one reached by
+                ;; START-SYMBOL.
+                (while (and (< (core-accessing-symbol statep) start-symbol)
+                            (< (core-number statep) k))
+                  (setq statep (core-next statep)))
+                (if (= (core-accessing-symbol statep) start-symbol)
+                    (progn
+                      ;; We already have a next-to-final state.  Make
+                      ;; sure it has a shift to what will be the final
+                      ;; state.
+                      (setq k (core-number statep))
+                      (while (and sp (< (shifts-number sp) k))
+                        (setq sp1 sp
+                              sp (shifts-next sp)))
+                      (if (and sp (= (shifts-number sp) k))
+                          (progn
+                            (setq i (shifts-nshifts sp)
+                                  sp2 (make-shifts)
+                                  shifts (make-vector (1+ i) 0))
+                            (set-shifts-number sp2 k)
+                            (set-shifts-nshifts sp2 (1+ i))
+                            (set-shifts-shifts sp2 shifts)
+                            (aset shifts 0 nstates)
+                            (while (> i 0)
+                              ;; sp2->shifts[i] = sp->shifts[i - 1];
+                              (aset shifts i (aref (shifts-shifts sp) (1- i)))
+                              (setq i (1- i)))
+                            ;; Patch sp2 into the chain of shifts in
+                            ;; place of sp, following sp1.
+                            (set-shifts-next sp2 (shifts-next sp))
+                            (set-shifts-next sp1 sp2)
+                            (if (eq sp last-shift)
+                                (setq last-shift sp2))
+                            )
+                        (setq sp2 (make-shifts))
+                        (set-shifts-number sp2 k)
+                        (set-shifts-nshifts sp2 1)
+                        (set-shifts-shifts sp2 (vector nstates))
+                        ;; Patch sp2 into the chain of shifts between
+                        ;; sp1 and sp.
+                        (set-shifts-next sp2 sp)
+                        (set-shifts-next sp1 sp2)
+                        (if (not sp)
+                            (setq last-shift sp2))
+                        )
+                      )
+                  ;; There is no next-to-final state as yet.
+                  ;; Add one more shift in FIRST-SHIFT, going to the
+                  ;; next-to-final state (yet to be made).
+                  (setq sp first-shift
+                        sp2 (make-shifts)
+                        i   (shifts-nshifts sp)
+                        shifts (make-vector (1+ i) 0))
+                  (set-shifts-nshifts sp2 (1+ i))
+                  (set-shifts-shifts sp2 shifts)
+                  ;; Stick this shift into the vector at the proper place.
+                  (setq statep (core-next first-state)
+                        k 0
+                        i 0)
+                  (while (< i (shifts-nshifts sp))
+                    (when (and (> (core-accessing-symbol statep) start-symbol)
+                               (= i k))
+                      (aset shifts k nstates)
+                      (setq k (1+ k)))
+                    (aset shifts k (aref (shifts-shifts sp) i))
+                    (setq statep (core-next statep))
+                    (setq i (1+ i)
+                          k (1+ k)))
+                  (when (= i k)
+                    (aset shifts k nstates)
+                    (setq k (1+ k)))
+                  ;; Patch sp2 into the chain of shifts in place of
+                  ;; sp, at the beginning.
+                  (set-shifts-next sp2 (shifts-next sp))
+                  (setq first-shift sp2)
+                  (if (eq last-shift sp)
+                      (setq last-shift sp2))
+                  ;; Create the next-to-final state, with shift to
+                  ;; what will be the final state.
+                  (wisent-insert-start-shift)))
+            ;; The initial state didn't even have any shifts.  Give it
+            ;; one shift, to the next-to-final state.
+            (setq sp (make-shifts))
+            (set-shifts-nshifts sp 1)
+            (set-shifts-shifts sp (vector nstates))
+            ;; Patch sp into the chain of shifts at the beginning.
+            (set-shifts-next sp first-shift)
+            (setq first-shift sp)
+            ;; Create the next-to-final state, with shift to what will
+            ;; be the final state.
+            (wisent-insert-start-shift)))
+      ;; There are no shifts for any state.  Make one shift, from the
+      ;; initial state to the next-to-final state.
+      (setq sp (make-shifts))
+      (set-shifts-nshifts sp 1)
+      (set-shifts-shifts sp (vector nstates))
+      ;; Initialize the chain of shifts with sp.
+      (setq first-shift sp
+            last-shift sp)
+      ;; Create the next-to-final state, with shift to what will be
+      ;; the final state.
+      (wisent-insert-start-shift))
+    ;; Make the final state--the one that follows a shift from the
+    ;; next-to-final state.  The symbol for that shift is 0
+    ;; (end-of-file).
+    (setq statep (make-core))
+    (set-core-number statep nstates)
+    (set-core-next last-state statep)
+    (setq last-state statep)
+    ;; Make the shift from the final state to the termination state.
+    (setq sp (make-shifts))
+    (set-shifts-number sp nstates)
+    (setq nstates (1+ nstates))
+    (set-shifts-nshifts sp 1)
+    (set-shifts-shifts sp (vector nstates))
+    (set-shifts-next last-shift sp)
+    (setq last-shift sp)
+    ;; Note that the variable FINAL-STATE refers to what we sometimes
+    ;; call the termination state.
+    (setq final-state nstates)
+    ;; Make the termination state.
+    (setq statep (make-core))
+    (set-core-number statep nstates)
+    (setq nstates (1+ nstates))
+    (set-core-next last-state statep)
+    (setq last-state statep)))
+
+(defun wisent-save-reductions ()
+  "Make a reductions structure.
+Find which rules can be used for reduction transitions from the
+current state and make a reductions structure for the state to record
+their rule numbers."
+  (let (i item count p rules)
+    ;; Find and count the active items that represent ends of rules.
+    (setq count 0
+          i 0)
+    (while (< i nitemset)
+      (setq item (aref ritem (aref itemset i)))
+      (when (< item 0)
+        (aset redset count (- item))
+        (setq count (1+ count)))
+      (setq i (1+ i)))
+    ;; Make a reductions structure and copy the data into it.
+    (when (> count 0)
+      (setq p (make-reductions)
+            rules (make-vector count 0))
+      (set-reductions-number p (core-number this-state))
+      (set-reductions-nreds  p count)
+      (set-reductions-rules  p rules)
+      (setq i 0)
+      (while (< i count)
+        ;; (p->rules)[i] = redset[i]
+        (aset rules i (aref redset i))
+        (setq i (1+ i)))
+      (if last-reduction
+          (set-reductions-next last-reduction p)
+        (setq first-reduction p))
+      (setq last-reduction p))))
+
+(defun wisent-generate-states ()
+  "Compute the nondeterministic finite state machine from the grammar."
+  (working-dynamic-status "(compute nondeterministic finite state machine)")
+  (wisent-allocate-storage)
+  (wisent-initialize-closure nitems)
+  (wisent-initialize-states)
+  (while this-state
+    ;; Set up RULESET and ITEMSET for the transitions out of this
+    ;; state.  RULESET gets a 1 bit for each rule that could reduce
+    ;; now.  ITEMSET gets a vector of all the items that could be
+    ;; accepted next.
+    (wisent-closure (core-items this-state) (core-nitems this-state))
+    ;; Record the reductions allowed out of this state.
+    (wisent-save-reductions)
+    ;; Find the itemsets of the states that shifts can reach.
+    (wisent-new-itemsets)
+    ;; Find or create the core structures for those states.
+    (wisent-append-states)
+    ;; Create the shifts structures for the shifts to those states,
+    ;; now that the state numbers transitioning to are known.
+    (if (> nshifts 0)
+        (wisent-save-shifts))
+    ;; States are queued when they are created; process them all.
+    (setq this-state (core-next this-state)))
+  ;; Set up initial and final states as parser wants them.
+  (wisent-augment-automaton))
+
+;;;; ---------------------------
+;;;; Compute look-ahead criteria
+;;;; ---------------------------
+
+;; Compute how to make the finite state machine deterministic; find
+;; which rules need lookahead in each state, and which lookahead
+;; tokens they accept.
+
+;; `wisent-lalr', the entry point, builds these data structures:
+
+;; GOTO-MAP, FROM-STATE and TO-STATE record each shift transition
+;; which accepts a variable (a nonterminal).  NGOTOS is the number of
+;; such transitions.
+;; FROM-STATE[t] is the state number which a transition leads from and
+;; TO-STATE[t] is the state number it leads to.
+;; All the transitions that accept a particular variable are grouped
+;; together and GOTO-MAP[i - NTOKENS] is the index in FROM-STATE and
+;; TO-STATE of the first of them.
+
+;; CONSISTENT[s] is non-nil if no lookahead is needed to decide what
+;; to do in state s.
+
+;; LARULENO is a vector which records the rules that need lookahead in
+;; various states.  The elements of LARULENO that apply to state s are
+;; those from LOOKAHEADS[s] through LOOKAHEADS[s+1]-1.  Each element
+;; of LARULENO is a rule number.
+
+;; If LR is the length of LARULENO, then a number from 0 to LR-1 can
+;; specify both a rule and a state where the rule might be applied.
+;; LA is a LR by NTOKENS matrix of bits.
+;; LA[l, i] is 1 if the rule LARULENO[l] is applicable in the
+;; appropriate state when the next token is symbol i.
+;; If LA[l, i] and LA[l, j] are both 1 for i != j, it is a conflict.
+
+(wisent-defcontext digraph
+  INDEX R VERTICES
+  infinity top)
+
+(defun wisent-traverse (i)
+  "Traverse I."
+  (let (j k height Ri Fi break)
+    (setq top (1+ top)
+          height top)
+    (aset VERTICES top i) ;; VERTICES[++top] = i
+    (aset INDEX i top) ;; INDEX[i] = height = top
+
+    (setq Ri (aref R i))
+    (when Ri
+      (setq j 0)
+      (while (>= (aref Ri j) 0)
+        (if (zerop (aref INDEX (aref Ri j)))
+            (wisent-traverse (aref Ri j)))
+        ;; if (INDEX[i] > INDEX[R[i][j]])
+        (if (> (aref INDEX i) (aref INDEX (aref Ri j)))
+            ;; INDEX[i] = INDEX[R[i][j]];
+            (aset INDEX i (aref INDEX (aref Ri j))))
+        (setq Fi (aref F i)
+              k 0)
+        (while (< k tokensetsize)
+          ;; F (i)[k] |= F (R[i][j])[k];
+          (aset Fi k (logior (aref Fi k)
+                             (aref (aref F (aref Ri j)) k)))
+           (setq k (1+ k)))
+        (setq j (1+ j))))
+
+    (when (= (aref INDEX i) height)
+      (setq break nil)
+      (while (not break)
+        (setq j (aref VERTICES top) ;; j = VERTICES[top--]
+              top (1- top))
+        (aset INDEX j infinity)
+        (if (= i j)
+            (setq break t)
+          (setq k 0)
+          (while (< k tokensetsize)
+            ;; F (j)[k] = F (i)[k];
+            (aset (aref F j) k (aref (aref F i) k))
+            (setq k (1+ k))))))
+    ))
+
+(defun wisent-digraph (relation)
+  "Digraph RELATION."
+  (wisent-with-context digraph
+    (setq infinity (+ ngotos 2)
+          INDEX    (make-vector (1+ ngotos) 0)
+          VERTICES (make-vector (1+ ngotos) 0)
+          top      0
+          R        relation)
+    (let ((i 0))
+      (while (< i ngotos)
+        (if (and (= (aref INDEX i) 0) (aref R i))
+            (wisent-traverse i))
+        (setq i (1+ i))))))
+
+(defun wisent-set-state-table ()
+  "Build state table."
+  (let (sp)
+    (setq state-table (make-vector nstates nil)
+          sp first-state)
+    (while sp
+      (aset state-table (core-number sp) sp)
+      (setq sp (core-next sp)))))
+
+(defun wisent-set-accessing-symbol ()
+  "Build accessing symbol table."
+  (let (sp)
+    (setq accessing-symbol (make-vector nstates 0)
+          sp first-state)
+    (while sp
+      (aset accessing-symbol (core-number sp) (core-accessing-symbol sp))
+      (setq sp (core-next sp)))))
+
+(defun wisent-set-shift-table ()
+  "Build shift table."
+  (let (sp)
+    (setq shift-table (make-vector nstates nil)
+          sp first-shift)
+    (while sp
+      (aset shift-table (shifts-number sp) sp)
+      (setq sp (shifts-next sp)))))
+
+(defun wisent-set-reduction-table ()
+  "Build reduction table."
+  (let (rp)
+    (setq reduction-table (make-vector nstates nil)
+          rp first-reduction)
+    (while rp
+      (aset reduction-table (reductions-number rp) rp)
+      (setq rp (reductions-next rp)))))
+
+(defun wisent-set-maxrhs ()
+  "Setup MAXRHS length."
+  (let (i len max)
+    (setq len 0
+          max 0
+          i   0)
+    (while (aref ritem i)
+      (if (> (aref ritem i) 0)
+          (setq len (1+ len))
+        (if (> len max)
+            (setq max len))
+        (setq len 0))
+      (setq i (1+ i)))
+    (setq maxrhs max)))
+
+(defun wisent-initialize-LA ()
+  "Set up LA."
+  (let (i j k count rp sp np v)
+    (setq consistent (make-vector nstates nil)
+          lookaheads (make-vector (1+ nstates) 0)
+          count 0
+          i 0)
+    (while (< i nstates)
+      (aset lookaheads i count)
+      (setq rp (aref reduction-table i)
+            sp (aref shift-table i))
+      ;; if (rp &&
+      ;;     (rp->nreds > 1
+      ;;      || (sp && ! ISVAR(accessing-symbol[sp->shifts[0]]))))
+      (if (and rp
+               (or (> (reductions-nreds rp) 1)
+                   (and sp
+                        (not (wisent-ISVAR
+                              (aref accessing-symbol
+                                    (aref (shifts-shifts sp) 0)))))))
+          (setq count (+ count (reductions-nreds rp)))
+        (aset consistent i t))
+
+      (when sp
+        (setq k 0
+              j (shifts-nshifts sp)
+              v (shifts-shifts sp))
+        (while (< k j)
+          (when (= (aref accessing-symbol (aref v k))
+                   error-token-number)
+            (aset consistent i nil)
+            (setq k j)) ;; break
+          (setq k (1+ k))))
+      (setq i (1+ i)))
+
+    (aset lookaheads nstates count)
+
+    (if (zerop count)
+        (progn
+          (setq LA (make-vector 1 nil)
+                LAruleno (make-vector 1 0)
+                lookback (make-vector 1 nil)))
+      (setq LA (make-vector count nil)
+            LAruleno (make-vector count 0)
+            lookback (make-vector count nil)))
+    (setq i 0 j (length LA))
+    (while (< i j)
+      (aset LA i (make-vector tokensetsize 0))
+      (setq i (1+ i)))
+
+    (setq np 0
+          i  0)
+    (while (< i nstates)
+      (when (not (aref consistent i))
+        (setq rp (aref reduction-table i))
+        (when rp
+          (setq j 0
+                k (reductions-nreds rp)
+                v (reductions-rules rp))
+          (while (< j k)
+            (aset LAruleno np (aref v j))
+            (setq np (1+ np)
+                  j  (1+ j)))))
+      (setq i (1+ i)))))
+
+(defun wisent-set-goto-map ()
+  "Set up GOTO-MAP."
+  (let (sp i j symbol k temp-map state1 state2 v)
+    (setq goto-map (make-vector (1+ nvars) 0)
+          temp-map (make-vector (1+ nvars) 0))
+
+    (setq ngotos 0
+          sp first-shift)
+    (while sp
+      (setq i (1- (shifts-nshifts sp))
+            v (shifts-shifts sp))
+      (while (>= i 0)
+        (setq symbol (aref accessing-symbol (aref v i)))
+        (if (wisent-ISTOKEN symbol)
+            (setq i 0) ;; break
+          (setq ngotos (1+ ngotos))
+          ;; goto-map[symbol]++;
+          (aset goto-map (- symbol ntokens)
+                (1+ (aref goto-map (- symbol ntokens)))))
+        (setq i (1- i)))
+      (setq sp (shifts-next sp)))
+
+    (setq k 0
+          i ntokens
+          j 0)
+    (while (< i nsyms)
+      (aset temp-map j k)
+      (setq k (+ k (aref goto-map j))
+            i (1+ i)
+            j (1+ j)))
+    (setq i ntokens
+          j 0)
+    (while (< i nsyms)
+      (aset goto-map j (aref temp-map j))
+      (setq i (1+ i)
+            j (1+ j)))
+    ;; goto-map[nsyms] = ngotos;
+    ;; temp-map[nsyms] = ngotos;
+    (aset goto-map j ngotos)
+    (aset temp-map j ngotos)
+
+    (setq from-state (make-vector ngotos 0)
+          to-state   (make-vector ngotos 0)
+          sp first-shift)
+    (while sp
+      (setq state1 (shifts-number sp)
+            v      (shifts-shifts sp)
+            i      (1- (shifts-nshifts sp)))
+      (while (>= i 0)
+        (setq state2 (aref v i)
+              symbol (aref accessing-symbol state2))
+        (if (wisent-ISTOKEN symbol)
+            (setq i 0) ;; break
+          ;; k = temp-map[symbol]++;
+          (setq k (aref temp-map (- symbol ntokens)))
+          (aset temp-map (- symbol ntokens) (1+ k))
+          (aset from-state k state1)
+          (aset to-state k state2))
+        (setq i (1- i)))
+      (setq sp (shifts-next sp)))
+  ))
+
+(defun wisent-map-goto (state symbol)
+  "Map a STATE/SYMBOL pair into its numeric representation."
+  (let (high low middle s result)
+    ;; low = goto-map[symbol];
+    ;; high = goto-map[symbol + 1] - 1;
+    (setq low (aref goto-map (- symbol ntokens))
+          high (1- (aref goto-map (- (1+ symbol) ntokens))))
+    (while (and (not result) (<= low high))
+      (setq middle (/ (+ low high) 2)
+            s (aref from-state middle))
+      (cond
+       ((= s state)
+        (setq result middle))
+       ((< s state)
+        (setq low (1+ middle)))
+       (t
+        (setq high (1- middle)))))
+    (or result
+        (error "Internal error in `wisent-map-goto'"))
+    ))
+
+(defun wisent-initialize-F ()
+  "Set up F."
+  (let (i j k sp edge rowp rp reads nedges stateno symbol v break)
+    (setq F (make-vector ngotos nil)
+          i 0)
+    (while (< i ngotos)
+      (aset F i (make-vector tokensetsize 0))
+      (setq i (1+ i)))
+
+    (setq reads (make-vector ngotos nil)
+          edge  (make-vector (1+ ngotos) 0)
+          nedges 0
+          rowp 0 ;; rowp = F
+          i 0)
+    (while (< i ngotos)
+      (setq stateno (aref to-state i)
+            sp (aref shift-table stateno))
+      (when sp
+        (setq k (shifts-nshifts sp)
+              v (shifts-shifts sp)
+              j 0
+              break nil)
+        (while (and (not break) (< j k))
+          ;; symbol = accessing-symbol[sp->shifts[j]];
+          (setq symbol (aref accessing-symbol (aref v j)))
+          (if (wisent-ISVAR symbol)
+              (setq break t) ;; break
+            (wisent-SETBIT (aref F rowp) symbol)
+            (setq j (1+ j))))
+
+        (while (< j k)
+          ;; symbol = accessing-symbol[sp->shifts[j]];
+          (setq symbol (aref accessing-symbol (aref v j)))
+          (when (aref nullable (- symbol ntokens))
+            (aset edge nedges (wisent-map-goto stateno symbol))
+            (setq nedges (1+ nedges)))
+          (setq j (1+ j)))
+
+        (when (> nedges 0)
+          ;; reads[i] = rp = NEW2(nedges + 1, short);
+          (setq rp (make-vector (1+ nedges) 0)
+                j 0)
+          (aset reads i rp)
+          (while (< j nedges)
+            ;; rp[j] = edge[j];
+            (aset rp j (aref edge j))
+            (setq j (1+ j)))
+          (aset rp nedges -1)
+          (setq nedges 0)))
+      (setq rowp (1+ rowp))
+      (setq i (1+ i)))
+    (wisent-digraph reads)
+    ))
+
+(defun wisent-add-lookback-edge (stateno ruleno gotono)
+  "Add a lookback edge.
+STATENO, RULENO, GOTONO are self-explanatory."
+  (let (i k found)
+    (setq i (aref lookaheads stateno)
+          k (aref lookaheads (1+ stateno))
+          found nil)
+    (while (and (not found) (< i k))
+      (if (= (aref LAruleno i) ruleno)
+          (setq found t)
+        (setq i (1+ i))))
+
+    (or found
+        (error "Internal error in `wisent-add-lookback-edge'"))
+
+    ;;                value  . next
+    ;; lookback[i] = (gotono . lookback[i])
+    (aset lookback i (cons gotono (aref lookback i)))))
+
+(defun wisent-transpose (R-arg n)
+  "Return the transpose of R-ARG, of size N.
+Destroy R-ARG, as it is replaced with the result.  R-ARG[I] is nil or
+a -1 terminated list of numbers.  RESULT[NUM] is nil or the -1
+terminated list of the I such as NUM is in R-ARG[I]."
+  (let (i j new-R end-R nedges v sp)
+    (setq new-R  (make-vector n nil)
+          end-R  (make-vector n nil)
+          nedges (make-vector n 0))
+
+    ;; Count.
+    (setq i 0)
+    (while (< i n)
+      (setq v (aref R-arg i))
+      (when v
+        (setq j 0)
+        (while (>= (aref v j) 0)
+          (aset nedges (aref v j) (1+ (aref nedges (aref v j))))
+          (setq j (1+ j))))
+      (setq i (1+ i)))
+
+    ;; Allocate.
+    (setq i 0)
+    (while (< i n)
+      (when (> (aref nedges i) 0)
+        (setq sp (make-vector (1+ (aref nedges i)) 0))
+        (aset sp (aref nedges i) -1)
+        (aset new-R i sp)
+        (aset end-R i 0))
+      (setq i (1+ i)))
+
+    ;; Store.
+    (setq i 0)
+    (while (< i n)
+      (setq v (aref R-arg i))
+      (when v
+        (setq j 0)
+        (while (>= (aref v j) 0)
+          (aset (aref new-R (aref v j)) (aref end-R (aref v j)) i)
+          (aset end-R (aref v j) (1+ (aref end-R (aref v j))))
+          (setq j (1+ j))))
+      (setq i (1+ i)))
+
+    new-R))
+
+(defun wisent-build-relations ()
+  "Build relations."
+  (let (i j k rulep rp sp length nedges done state1 stateno
+          symbol1 symbol2 edge states v)
+    (setq includes (make-vector ngotos nil)
+          edge (make-vector (1+ ngotos) 0)
+          states (make-vector (1+ maxrhs) 0)
+          i 0)
+
+    (while (< i ngotos)
+      (setq nedges 0
+            state1 (aref from-state i)
+            symbol1 (aref accessing-symbol (aref to-state i))
+            rulep (aref derives (- symbol1 ntokens)))
+
+      (while (> (car rulep) 0)
+        (aset states 0 state1)
+        (setq length 1
+              stateno state1
+              rp (aref rrhs (car rulep))) ;; rp = ritem + rrhs[*rulep]
+        (while (> (aref ritem rp) 0) ;; *rp > 0
+          (setq symbol2 (aref ritem rp)
+                sp (aref shift-table stateno)
+                k  (shifts-nshifts sp)
+                v  (shifts-shifts sp)
+                j  0)
+          (while (< j k)
+            (setq stateno (aref v j))
+            (if (= (aref accessing-symbol stateno) symbol2)
+                (setq j k) ;; break
+              (setq j (1+ j))))
+          ;; states[length++] = stateno;
+          (aset states length stateno)
+          (setq length (1+ length))
+          (setq rp (1+ rp)))
+
+        (if (not (aref consistent stateno))
+            (wisent-add-lookback-edge stateno (car rulep) i))
+
+        (setq length (1- length)
+              done nil)
+        (while (not done)
+          (setq done t
+                rp (1- rp))
+          (when (and (>= rp 0) (wisent-ISVAR (aref ritem rp)))
+            ;; stateno = states[--length];
+            (setq length (1- length)
+                  stateno (aref states length))
+            (aset edge nedges (wisent-map-goto stateno (aref ritem rp)))
+            (setq nedges (1+ nedges))
+            (if (aref nullable (- (aref ritem rp) ntokens))
+                (setq done nil))))
+        (setq rulep (cdr rulep)))
+
+      (when (> nedges 0)
+        (setq v (make-vector (1+ nedges) 0)
+              j 0)
+        (aset includes i v)
+        (while (< j nedges)
+          (aset v j (aref edge j))
+          (setq j (1+ j)))
+        (aset v nedges -1))
+      (setq i (1+ i)))
+
+    (setq includes (wisent-transpose includes ngotos))
+    ))
+
+(defun wisent-compute-FOLLOWS ()
+  "Compute follows."
+  (wisent-digraph includes))
+
+(defun wisent-compute-lookaheads ()
+  "Compute lookaheads."
+  (let (i j n v1 v2 sp)
+    (setq n (aref lookaheads nstates)
+          i 0)
+    (while (< i n)
+      (setq sp (aref lookback i))
+      (while sp
+        (setq v1 (aref LA i)
+              v2 (aref F (car sp))
+              j  0)
+        (while (< j tokensetsize)
+          ;; LA (i)[j] |= F (sp->value)[j]
+          (aset v1 j (logior (aref v1 j) (aref v2 j)))
+          (setq j (1+ j)))
+        (setq sp (cdr sp)))
+      (setq i (1+ i)))))
+
+(defun wisent-lalr ()
+  "Make the nondeterministic finite state machine deterministic."
+  (working-dynamic-status "(make finite state machine deterministic)")
+  (setq tokensetsize (wisent-WORDSIZE ntokens))
+  (wisent-set-state-table)
+  (wisent-set-accessing-symbol)
+  (wisent-set-shift-table)
+  (wisent-set-reduction-table)
+  (wisent-set-maxrhs)
+  (wisent-initialize-LA)
+  (wisent-set-goto-map)
+  (wisent-initialize-F)
+  (wisent-build-relations)
+  (wisent-compute-FOLLOWS)
+  (wisent-compute-lookaheads))
+
+;;;; -----------------------------------------------
+;;;; Find and resolve or report look-ahead conflicts
+;;;; -----------------------------------------------
+
+(defsubst wisent-log-resolution (state LAno token resolution)
+  "Log a shift-reduce conflict resolution.
+In specified STATE between rule pointed by lookahead number LANO and
+TOKEN, resolved as RESOLUTION."
+  (if (or wisent-verbose-flag wisent-debug-flag)
+      (wisent-log
+       "Conflict in state %d between rule %d and token %s resolved as %s.\n"
+       state (aref LAruleno LAno) (wisent-tag token) resolution)))
+
+(defun wisent-flush-shift (state token)
+  "Turn off the shift recorded in the specified STATE for TOKEN.
+Used when we resolve a shift-reduce conflict in favor of the reduction."
+  (let (shiftp i k v)
+    (when (setq shiftp (aref shift-table state))
+      (setq k (shifts-nshifts shiftp)
+            v (shifts-shifts shiftp)
+            i 0)
+      (while (< i k)
+        (if (and (not (zerop (aref v i)))
+                 (= token (aref accessing-symbol (aref v i))))
+            (aset v i 0))
+        (setq i (1+ i))))))
+
+(defun wisent-resolve-sr-conflict (state lookaheadnum)
+  "Attempt to resolve shift-reduce conflict for one rule.
+Resolve by means of precedence declarations.  The conflict occurred in
+specified STATE for the rule pointed by the lookahead symbol
+LOOKAHEADNUM.  It has already been checked that the rule has a
+precedence.  A conflict is resolved by modifying the shift or reduce
+tables so that there is no longer a conflict."
+  (let (i redprec errp errs nerrs token sprec sassoc)
+    ;; Find the rule to reduce by to get precedence of reduction
+    (setq token (aref tags (aref rprec (aref LAruleno lookaheadnum)))
+          redprec (wisent-prec token)
+          errp  (make-errs)
+          errs  (make-vector ntokens 0)
+          nerrs 0
+          i 0)
+    (set-errs-errs errp errs)
+    (while (< i ntokens)
+      (setq token (aref tags i))
+      (when (and (wisent-BITISSET (aref LA lookaheadnum) i)
+                 (wisent-BITISSET lookaheadset i)
+                 (setq sprec (wisent-prec token)))
+        ;; Shift-reduce conflict occurs for token number I and it has
+        ;; a precedence.  The precedence of shifting is that of token
+        ;; I.
+        (cond
+         ((< sprec redprec)
+          (wisent-log-resolution state lookaheadnum i "reduce")
+          ;;  Flush the shift for this token
+          (wisent-RESETBIT lookaheadset i)
+          (wisent-flush-shift state i)
+          )
+         ((> sprec redprec)
+          (wisent-log-resolution state lookaheadnum i "shift")
+          ;; Flush the reduce for this token
+          (wisent-RESETBIT (aref LA lookaheadnum) i)
+          )
+         (t
+          ;; Matching precedence levels.
+          ;; For left association, keep only the reduction.
+          ;; For right association, keep only the shift.
+          ;; For nonassociation, keep neither.
+          (setq sassoc (wisent-assoc token))
+          (cond
+           ((eq sassoc 'right)
+            (wisent-log-resolution state lookaheadnum i "shift"))
+           ((eq sassoc 'left)
+            (wisent-log-resolution state lookaheadnum i "reduce"))
+           ((eq sassoc 'nonassoc)
+            (wisent-log-resolution state lookaheadnum i "an error"))
+           )
+          (when (not (eq sassoc 'right))
+            ;; Flush the shift for this token
+            (wisent-RESETBIT lookaheadset i)
+            (wisent-flush-shift state i))
+          (when (not (eq sassoc 'left))
+            ;; Flush the reduce for this token
+            (wisent-RESETBIT (aref LA lookaheadnum) i))
+          (when (eq sassoc 'nonassoc)
+            ;; Record an explicit error for this token
+            (aset errs nerrs i)
+            (setq nerrs (1+ nerrs)))
+          )))
+      (setq i (1+ i)))
+    (when (> nerrs 0)
+      (set-errs-nerrs errp nerrs)
+      (aset err-table state errp))
+    ))
+
+(defun wisent-set-conflicts (state)
+  "Find and attempt to resolve conflicts in specified STATE."
+  (let (i j k v shiftp symbol)
+    (unless (aref consistent state)
+      (fillarray lookaheadset 0)
+
+      (when (setq shiftp (aref shift-table state))
+        (setq k (shifts-nshifts shiftp)
+              v (shifts-shifts shiftp)
+              i 0)
+        (while (and (< i k)
+                    (wisent-ISTOKEN
+                     (setq symbol (aref accessing-symbol (aref v i)))))
+          (or (zerop (aref v i))
+              (wisent-SETBIT lookaheadset symbol))
+          (setq i (1+ i))))
+
+      ;; Loop over all rules which require lookahead in this state
+      ;; first check for shift-reduce conflict, and try to resolve
+      ;; using precedence
+      (setq i (aref lookaheads state)
+            k (aref lookaheads (1+ state)))
+      (while (< i k)
+        (when (aref rprec (aref LAruleno i))
+          (setq v (aref LA i)
+                j 0)
+          (while (< j tokensetsize)
+            (if (zerop (logand (aref v j) (aref lookaheadset j)))
+                (setq j (1+ j))
+              ;; if (LA (i)[j] & lookaheadset[j])
+              (wisent-resolve-sr-conflict state i)
+              (setq j tokensetsize)))) ;; break
+        (setq i (1+ i)))
+
+      ;; Loop over all rules which require lookahead in this state
+      ;; Check for conflicts not resolved above.
+      (setq i (aref lookaheads state))
+      (while (< i k)
+        (setq v (aref LA i)
+              j 0)
+        (while (< j tokensetsize)
+          ;; if (LA (i)[j] & lookaheadset[j])
+          (if (not (zerop (logand (aref v j) (aref lookaheadset j))))
+              (aset conflicts state t))
+          (setq j (1+ j)))
+        (setq j 0)
+        (while (< j tokensetsize)
+          ;; lookaheadset[j] |= LA (i)[j];
+          (aset lookaheadset j (logior (aref lookaheadset j)
+                                       (aref v j)))
+          (setq j (1+ j)))
+        (setq i (1+ i)))
+      )))
+
+(defun wisent-resolve-conflicts ()
+  "Find and resolve conflicts."
+  (working-dynamic-status "(resolve conflicts)")
+  (let (i)
+    (setq conflicts    (make-vector nstates nil)
+          shiftset     (make-vector tokensetsize 0)
+          lookaheadset (make-vector tokensetsize 0)
+          err-table    (make-vector nstates nil)
+          i 0)
+    (while (< i nstates)
+      (wisent-set-conflicts i)
+      (setq i (1+ i)))))
+
+(defun wisent-count-sr-conflicts (state)
+  "Count the number of shift/reduce conflicts in specified STATE."
+  (let (i j k shiftp symbol v)
+    (setq src-count 0
+          shiftp (aref shift-table state))
+    (when shiftp
+      (fillarray shiftset 0)
+      (fillarray lookaheadset 0)
+      (setq k (shifts-nshifts shiftp)
+            v (shifts-shifts shiftp)
+            i 0)
+      (while (< i k)
+        (when (not (zerop (aref v i)))
+          (setq symbol (aref accessing-symbol (aref v i)))
+          (if (wisent-ISVAR symbol)
+              (setq i k) ;; break
+            (wisent-SETBIT shiftset symbol)))
+        (setq i (1+ i)))
+
+      (setq k (aref lookaheads (1+ state))
+            i (aref lookaheads state))
+      (while (< i k)
+        (setq v (aref LA i)
+              j 0)
+        (while (< j tokensetsize)
+          ;; lookaheadset[j] |= LA (i)[j]
+          (aset lookaheadset j (logior (aref lookaheadset j)
+                                       (aref v j)))
+          (setq j (1+ j)))
+        (setq i (1+ i)))
+
+      (setq k 0)
+      (while (< k tokensetsize)
+        ;; lookaheadset[k] &= shiftset[k];
+        (aset lookaheadset k (logand (aref lookaheadset k)
+                                     (aref shiftset k)))
+        (setq k (1+ k)))
+
+      (setq i 0)
+      (while (< i ntokens)
+        (if (wisent-BITISSET lookaheadset i)
+            (setq src-count (1+ src-count)))
+        (setq i (1+ i))))
+    src-count))
+
+(defun wisent-count-rr-conflicts (state)
+  "Count the number of reduce/reduce conflicts in specified STATE."
+  (let (i j count n m)
+    (setq rrc-count 0
+          m (aref lookaheads state)
+          n (aref lookaheads (1+ state)))
+    (when (>= (- n m) 2)
+      (setq i 0)
+      (while (< i ntokens)
+        (setq count 0
+              j m)
+        (while (< j n)
+          (if (wisent-BITISSET (aref LA j) i)
+              (setq count (1+ count)))
+          (setq j (1+ j)))
+
+        (if (>= count 2)
+            (setq rrc-count (1+ rrc-count)))
+        (setq i (1+ i))))
+    rrc-count))
+
+(defvar wisent-expected-conflicts nil
+  "*If non-nil suppress the warning about shift/reduce conflicts.
+It is a decimal integer N that says there should be no warning if
+there are N shift/reduce conflicts and no reduce/reduce conflicts.  A
+warning is given if there are either more or fewer conflicts, or if
+there are any reduce/reduce conflicts.")
+
+(defun wisent-total-conflicts ()
+  "Report the total number of conflicts."
+  (unless (and (zerop rrc-total)
+               (or (zerop src-total)
+                   (= src-total (or wisent-expected-conflicts 0))))
+    (let* ((src (wisent-source))
+           (src (if src (concat " in " src) ""))
+           (msg (format "Grammar%s contains" src)))
+      (if (> src-total 0)
+          (setq msg (format "%s %d shift/reduce conflict%s"
+                            msg src-total (if (> src-total 1)
+                                              "s" ""))))
+      (if (and (> src-total 0) (> rrc-total 0))
+          (setq msg (format "%s and" msg)))
+      (if (> rrc-total 0)
+        (setq msg (format "%s %d reduce/reduce conflict%s"
+                          msg rrc-total (if (> rrc-total 1)
+                                            "s" ""))))
+      (message msg))))
+
+(defun wisent-print-conflicts ()
+  "Report conflicts."
+  (let (i)
+    (setq  src-total 0
+           rrc-total 0
+           i 0)
+    (while (< i nstates)
+      (when (aref conflicts i)
+        (wisent-count-sr-conflicts i)
+        (wisent-count-rr-conflicts i)
+        (setq src-total (+ src-total src-count)
+              rrc-total (+ rrc-total rrc-count))
+        (when (or wisent-verbose-flag wisent-debug-flag)
+          (wisent-log "State %d contains" i)
+          (if (> src-count 0)
+              (wisent-log " %d shift/reduce conflict%s"
+                          src-count (if (> src-count 1) "s" "")))
+
+          (if (and (> src-count 0) (> rrc-count 0))
+              (wisent-log " and"))
+
+          (if (> rrc-count 0)
+              (wisent-log " %d reduce/reduce conflict%s"
+                          rrc-count (if (> rrc-count 1) "s" "")))
+
+          (wisent-log ".\n")))
+      (setq i (1+ i)))
+    (wisent-total-conflicts)))
+
+;;;; --------------------------------------
+;;;; Report information on generated parser
+;;;; --------------------------------------
+(defun wisent-print-grammar ()
+  "Print grammar."
+  (let (i j r break left-count right-count)
+
+    (wisent-log "\n\nGrammar\n\n  Number, Rule\n")
+    (setq i 1)
+    (while (<= i nrules)
+      ;; Don't print rules disabled in `wisent-reduce-grammar-tables'.
+      (when (aref ruseful i)
+        (wisent-log "  %s  %s ->"
+                    (wisent-pad-string (number-to-string i) 6)
+                    (wisent-tag (aref rlhs i)))
+        (setq r (aref rrhs i))
+        (if (> (aref ritem r) 0)
+            (while (> (aref ritem r) 0)
+              (wisent-log " %s" (wisent-tag (aref ritem r)))
+              (setq r (1+ r)))
+          (wisent-log " /* empty */"))
+        (wisent-log "\n"))
+      (setq i (1+ i)))
+
+    (wisent-log "\n\nTerminals, with rules where they appear\n\n")
+    (wisent-log "%s (-1)\n" (wisent-tag 0))
+    (setq i 1)
+    (while (< i ntokens)
+      (wisent-log "%s (%d)" (wisent-tag i) i)
+      (setq j 1)
+      (while (<= j nrules)
+        (setq r (aref rrhs j)
+              break nil)
+        (while (and (not break) (> (aref ritem r) 0))
+          (if (setq break (= (aref ritem r) i))
+              (wisent-log " %d" j)
+            (setq r (1+ r))))
+        (setq j (1+ j)))
+      (wisent-log "\n")
+      (setq i (1+ i)))
+
+    (wisent-log "\n\nNonterminals, with rules where they appear\n\n")
+    (setq i ntokens)
+    (while (< i nsyms)
+      (setq left-count 0
+            right-count 0
+            j 1)
+      (while (<= j nrules)
+        (if (= (aref rlhs j) i)
+            (setq left-count (1+ left-count)))
+        (setq r (aref rrhs j)
+              break nil)
+        (while (and (not break) (> (aref ritem r) 0))
+          (if (= (aref ritem r) i)
+              (setq right-count (1+ right-count)
+                    break t)
+            (setq r (1+ r))))
+        (setq j (1+ j)))
+      (wisent-log "%s (%d)\n   " (wisent-tag i) i)
+      (when (> left-count 0)
+        (wisent-log " on left:")
+        (setq j 1)
+        (while (<= j nrules)
+          (if (= (aref rlhs j) i)
+              (wisent-log " %d" j))
+          (setq j (1+ j))))
+      (when (> right-count 0)
+        (if (> left-count 0)
+            (wisent-log ","))
+        (wisent-log " on right:")
+        (setq j 1)
+        (while (<= j nrules)
+          (setq r (aref rrhs j)
+                break nil)
+          (while (and (not break) (> (aref ritem r) 0))
+            (if (setq break (= (aref ritem r) i))
+                (wisent-log " %d" j)
+              (setq r (1+ r))))
+          (setq j (1+ j))))
+      (wisent-log "\n")
+      (setq i (1+ i)))
+    ))
+
+(defun wisent-print-reductions (state)
+  "Print reductions on STATE."
+  (let (i j k v symbol m n defaulted
+          default-LA default-rule cmax count shiftp errp nodefault)
+    (setq nodefault nil
+          i 0)
+    (fillarray shiftset 0)
+
+    (setq shiftp (aref shift-table state))
+    (when shiftp
+      (setq k (shifts-nshifts shiftp)
+            v (shifts-shifts  shiftp)
+            i 0)
+      (while (< i k)
+        (when (not (zerop (aref v i)))
+          (setq symbol (aref accessing-symbol (aref v i)))
+          (if (wisent-ISVAR symbol)
+              (setq i k) ;; break
+            ;; If this state has a shift for the error token, don't
+            ;; use a default rule.
+            (if (= symbol error-token-number)
+                (setq nodefault t))
+            (wisent-SETBIT shiftset symbol)))
+        (setq i (1+ i))))
+
+    (setq errp (aref err-table state))
+    (when errp
+      (setq k (errs-nerrs errp)
+            v (errs-errs errp)
+            i 0)
+      (while (< i k)
+        (if (not (zerop (setq symbol (aref v i))))
+            (wisent-SETBIT shiftset symbol))
+        (setq i (1+ i))))
+
+    (setq m (aref lookaheads state)
+          n (aref lookaheads (1+ state)))
+
+    (cond
+     ((and (= (- n m) 1) (not nodefault))
+      (setq default-rule (aref LAruleno m)
+            v (aref LA m)
+            k 0)
+      (while (< k tokensetsize)
+        (aset lookaheadset k (logand (aref v k)
+                                     (aref shiftset k)))
+        (setq k (1+ k)))
+
+      (setq i 0)
+      (while (< i ntokens)
+        (if (wisent-BITISSET lookaheadset i)
+            (wisent-log "    %s\t[reduce using rule %d (%s)]\n"
+                        (wisent-tag i) default-rule
+                        (wisent-tag (aref rlhs default-rule))))
+        (setq i (1+ i)))
+      (wisent-log "    $default\treduce using rule %d (%s)\n\n"
+                  default-rule
+                  (wisent-tag (aref rlhs default-rule)))
+      )
+     ((>= (- n m) 1)
+      (setq cmax 0
+            default-LA -1
+            default-rule 0)
+      (when (not nodefault)
+        (setq i m)
+        (while (< i n)
+          (setq v (aref LA i)
+                count 0
+                k 0)
+          (while (< k tokensetsize)
+            ;; lookaheadset[k] = LA (i)[k] & ~shiftset[k]
+            (aset lookaheadset k
+                  (logand (aref v k)
+                          (lognot (aref shiftset k))))
+            (setq k (1+ k)))
+          (setq j 0)
+          (while (< j ntokens)
+            (if (wisent-BITISSET lookaheadset j)
+                (setq count (1+ count)))
+            (setq j (1+ j)))
+          (if (> count cmax)
+              (setq cmax count
+                    default-LA i
+                    default-rule (aref LAruleno i)))
+          (setq k 0)
+          (while (< k tokensetsize)
+            (aset shiftset k (logior (aref shiftset k)
+                                     (aref lookaheadset k)))
+            (setq k (1+ k)))
+          (setq i (1+ i))))
+
+      (fillarray shiftset 0)
+
+      (when shiftp
+        (setq k (shifts-nshifts shiftp)
+              v (shifts-shifts  shiftp)
+              i 0)
+        (while (< i k)
+          (when (not (zerop (aref v i)))
+            (setq symbol (aref accessing-symbol (aref v i)))
+            (if (wisent-ISVAR symbol)
+                (setq i k) ;; break
+              (wisent-SETBIT shiftset symbol)))
+          (setq i (1+ i))))
+
+      (setq i 0)
+      (while (< i ntokens)
+        (setq defaulted nil
+              count (if (wisent-BITISSET shiftset i) 1 0)
+              j m)
+        (while (< j n)
+          (when (wisent-BITISSET (aref LA j) i)
+            (if (zerop count)
+                (progn
+                  (if (not (= j default-LA))
+                      (wisent-log
+                       "    %s\treduce using rule %d (%s)\n"
+                       (wisent-tag i) (aref LAruleno j)
+                       (wisent-tag (aref rlhs (aref LAruleno j))))
+                    (setq defaulted t))
+                  (setq count (1+ count)))
+              (if defaulted
+                  (wisent-log
+                   "    %s\treduce using rule %d (%s)\n"
+                   (wisent-tag i) (aref LAruleno default-LA)
+                   (wisent-tag (aref rlhs (aref LAruleno default-LA)))))
+              (setq defaulted nil)
+              (wisent-log
+               "    %s\t[reduce using rule %d (%s)]\n"
+               (wisent-tag i) (aref LAruleno j)
+               (wisent-tag (aref rlhs (aref LAruleno j))))))
+          (setq j (1+ j)))
+        (setq i (1+ i)))
+
+      (if (>= default-LA 0)
+          (wisent-log
+           "    $default\treduce using rule %d (%s)\n"
+           default-rule
+           (wisent-tag (aref rlhs default-rule))))
+      ))))
+
+(defun wisent-print-actions (state)
+  "Print actions on STATE."
+  (let (i j k v state1 symbol shiftp errp redp rule nerrs break)
+    (setq shiftp (aref shift-table state)
+          redp   (aref reduction-table state)
+          errp   (aref err-table state))
+    (if (and (not shiftp) (not redp))
+        (if (= final-state state)
+            (wisent-log "    $default\taccept\n")
+          (wisent-log "    NO ACTIONS\n"))
+     (if (not shiftp)
+         (setq i 0
+               k 0)
+      (setq k (shifts-nshifts shiftp)
+            v (shifts-shifts shiftp)
+            i 0
+            break nil)
+      (while (and (not break) (< i k))
+        (if (zerop (setq state1 (aref v i)))
+            (setq i (1+ i))
+          (setq symbol (aref accessing-symbol state1))
+          ;;  The following line used to be turned off.
+          (if (wisent-ISVAR symbol)
+              (setq break t) ;; break
+            (wisent-log "    %s\tshift, and go to state %d\n"
+                        (wisent-tag symbol) state1)
+            (setq i (1+ i)))))
+      (if (> i 0)
+          (wisent-log "\n")))
+
+     (when errp
+       (setq nerrs (errs-nerrs errp)
+             v (errs-errs errp)
+             j 0)
+       (while (< j nerrs)
+         (if (aref v j)
+             (wisent-log "    %s\terror (nonassociative)\n"
+                         (wisent-tag (aref v j))))
+         (setq j (1+ j)))
+       (if (> j 0)
+           (wisent-log "\n")))
+
+     (cond
+      ((and (aref consistent state) redp)
+       (setq rule (aref (reductions-rules redp) 0)
+             symbol (aref rlhs rule))
+       (wisent-log "    $default\treduce using rule %d (%s)\n\n"
+                   rule (wisent-tag symbol))
+       )
+      (redp
+       (wisent-print-reductions state)
+       ))
+
+     (when (< i k)
+       (setq v (shifts-shifts shiftp))
+       (while (< i k)
+         (when (setq state1 (aref v i))
+           (setq symbol (aref accessing-symbol state1))
+           (wisent-log "    %s\tgo to state %d\n"
+                       (wisent-tag symbol) state1))
+         (setq i (1+ i)))
+       (wisent-log "\n"))
+     )))
+
+(defun wisent-print-core (state)
+  "Print STATE core."
+  (let (i k rule statep sp sp1)
+    (setq statep (aref state-table state)
+          k (core-nitems statep))
+    (when (> k 0)
+      (setq i 0)
+      (while (< i k)
+        ;; sp1 = sp = ritem + statep->items[i];
+        (setq sp1 (aref (core-items statep) i)
+              sp  sp1)
+        (while (> (aref ritem sp) 0)
+          (setq sp (1+ sp)))
+
+        (setq rule (- (aref ritem sp)))
+        (wisent-log "    %s  ->  " (wisent-tag (aref rlhs rule)))
+
+        (setq sp (aref rrhs rule))
+        (while (< sp sp1)
+          (wisent-log "%s " (wisent-tag (aref ritem sp)))
+          (setq sp (1+ sp)))
+        (wisent-log ".")
+        (while (> (aref ritem sp) 0)
+          (wisent-log " %s" (wisent-tag (aref ritem sp)))
+          (setq sp (1+ sp)))
+        (wisent-log "   (rule %d)\n" rule)
+        (setq i (1+ i)))
+      (wisent-log "\n"))))
+
+(defun wisent-print-state (state)
+  "Print information on STATE."
+  (wisent-log "\n\nstate %d\n\n" state)
+  (wisent-print-core state)
+  (wisent-print-actions state))
+
+(defun wisent-print-states ()
+  "Print information on states."
+  (let ((i 0))
+    (while (< i nstates)
+      (wisent-print-state i)
+      (setq i (1+ i)))))
+
+(defun wisent-print-results ()
+  "Print information on generated parser.
+Report detailed informations if `wisent-verbose-flag' or
+`wisent-debug-flag' are non-nil."
+  (when (or wisent-verbose-flag wisent-debug-flag)
+    (wisent-print-useless))
+  (wisent-print-conflicts)
+  (when (or wisent-verbose-flag wisent-debug-flag)
+    (wisent-print-grammar)
+    (wisent-print-states))
+  ;; Append output to log file when running in batch mode
+  (when (wisent-noninteractive)
+    (wisent-append-to-log-file)
+    (wisent-clear-log)))
+
+;;;; ---------------------------------
+;;;; Build the generated parser tables
+;;;; ---------------------------------
+
+(defun wisent-action-row (state actrow)
+  "Figure out the actions for the specified STATE.
+Decide what to do for each type of token if seen as the lookahead
+token in specified state.  The value returned is used as the default
+action for the state.  In addition, ACTROW is filled with what to do
+for each kind of token, index by symbol number, with nil meaning do
+the default action.  The value 'error, means this situation is an
+error.  The parser recognizes this value specially.
+
+This is where conflicts are resolved.  The loop over lookahead rules
+considered lower-numbered rules last, and the last rule considered
+that likes a token gets to handle it."
+  (let (i j k m n v default-rule nreds rule max count
+          shift-state symbol redp shiftp errp nodefault)
+
+    (fillarray actrow nil)
+
+    (setq default-rule 0
+          nodefault nil ;; nil inhibit having any default reduction
+          nreds 0
+          m 0
+          n 0
+          redp (aref reduction-table state))
+
+    (when redp
+      (setq nreds (reductions-nreds redp))
+      (when (>= nreds 1)
+        ;; loop over all the rules available here which require
+        ;; lookahead
+        (setq m (aref lookaheads state)
+              n (aref lookaheads (1+ state))
+              i (1- n))
+        (while (>= i m)
+          ;; and find each token which the rule finds acceptable to
+          ;; come next
+          (setq j 0)
+          (while (< j ntokens)
+            ;; and record this rule as the rule to use if that token
+            ;; follows.
+            (if (wisent-BITISSET (aref LA i) j)
+                (aset actrow j (- (aref LAruleno i)))
+              )
+            (setq j (1+ j)))
+          (setq i (1- i)))))
+
+    ;; Now see which tokens are allowed for shifts in this state.  For
+    ;; them, record the shift as the thing to do.  So shift is
+    ;; preferred to reduce.
+    (setq shiftp (aref shift-table state))
+    (when shiftp
+      (setq k (shifts-nshifts shiftp)
+            v (shifts-shifts shiftp)
+            i 0)
+      (while (< i k)
+        (setq shift-state (aref v i))
+        (if (zerop shift-state)
+            nil ;; continue
+          (setq symbol (aref accessing-symbol shift-state))
+          (if (wisent-ISVAR symbol)
+              (setq i k) ;; break
+            (aset actrow symbol shift-state)
+            ;; Do not use any default reduction if there is a shift
+            ;; for error
+            (if (= symbol error-token-number)
+                (setq nodefault t))))
+        (setq i (1+ i))))
+
+    ;; See which tokens are an explicit error in this state (due to
+    ;; %nonassoc).  For them, record error as the action.
+    (setq errp (aref err-table state))
+    (when errp
+      (setq k (errs-nerrs errp)
+            v (errs-errs errp)
+            i 0)
+      (while (< i k)
+        (aset actrow (aref v i) wisent-error-tag)
+        (setq i (1+ i))))
+
+    ;; Now find the most common reduction and make it the default
+    ;; action for this state.
+    (when (and (>= nreds 1) (not nodefault))
+      (if (aref consistent state)
+          (setq default-rule (- (aref (reductions-rules redp) 0)))
+        (setq max 0
+              i m)
+        (while (< i n)
+          (setq count 0
+                rule (- (aref LAruleno i))
+                j 0)
+          (while (< j ntokens)
+            (if (and (numberp (aref actrow j))
+                     (= (aref actrow j) rule))
+                (setq count (1+ count)))
+            (setq j (1+ j)))
+          (if (> count max)
+              (setq max count
+                    default-rule rule))
+          (setq i (1+ i)))
+        ;; actions which match the default are replaced with zero,
+        ;; which means "use the default"
+        (when (> max 0)
+          (setq j 0)
+          (while (< j ntokens)
+            (if (and (numberp (aref actrow j))
+                     (= (aref actrow j) default-rule))
+                (aset actrow j nil))
+            (setq j (1+ j)))
+          )))
+
+    ;; If have no default rule, if this is the final state the default
+    ;; is accept else it is an error.  So replace any action which
+    ;; says "error" with "use default".
+    (when (zerop default-rule)
+      (if (= final-state state)
+          (setq default-rule wisent-accept-tag)
+        (setq j 0)
+        (while (< j ntokens)
+          (if (eq (aref actrow j) wisent-error-tag)
+              (aset actrow j nil))
+          (setq j (1+ j)))
+        (setq default-rule wisent-error-tag)))
+    default-rule))
+
+(defconst wisent-default-tag 'default
+  "Tag used in an action table to indicate a default action.")
+
+;; These variables only exist locally in the function
+;; `wisent-state-actions' and are shared by all other nested callees.
+(wisent-defcontext semantic-actions
+  ;; Uninterned symbols used in code generation.
+  stack sp gotos state
+  ;; Name of the current semantic action
+  NAME)
+
+(defun wisent-state-actions ()
+  "Figure out the actions for every state.
+Return the action table."
+  (working-dynamic-status "(build state actions)")
+  ;; Store the semantic action obarray in (unused) RCODE[0].
+  (aset rcode 0 (make-vector 13 0))
+  (let (i j action-table actrow action)
+    (setq action-table (make-vector nstates nil)
+          actrow (make-vector ntokens nil)
+          i 0)
+    (wisent-with-context semantic-actions
+      (setq stack (make-symbol "stack")
+            sp    (make-symbol "sp")
+            gotos (make-symbol "gotos")
+            state (make-symbol "state"))
+      (while (< i nstates)
+        (setq action (wisent-action-row i actrow))
+        ;; Translate a reduction into semantic action
+        (and (integerp action) (< action 0)
+             (setq action (wisent-semantic-action (- action))))
+        (aset action-table i (list (cons wisent-default-tag action)))
+        (setq j 0)
+        (while (< j ntokens)
+          (when (setq action (aref actrow j))
+            ;; Translate a reduction into semantic action
+            (and (integerp action) (< action 0)
+                 (setq action (wisent-semantic-action (- action))))
+            (aset action-table i (cons (cons (aref tags j) action)
+                                       (aref action-table i)))
+            )
+          (setq j (1+ j)))
+        (aset action-table i (nreverse (aref action-table i)))
+        (setq i (1+ i)))
+      action-table)))
+
+(defun wisent-goto-actions ()
+  "Figure out what to do after reducing with each rule.
+Depending on the saved state from before the beginning of parsing the
+data that matched this rule.  Return the goto table."
+  (working-dynamic-status "(build goto actions)")
+  (let (i j m n symbol state goto-table)
+    (setq goto-table (make-vector nstates nil)
+          i ntokens)
+    (while (< i nsyms)
+      (setq symbol (- i ntokens)
+            m (aref goto-map symbol)
+            n (aref goto-map (1+ symbol))
+            j m)
+      (while (< j n)
+        (setq state (aref from-state j))
+        (aset goto-table state
+              (cons (cons (aref tags i) (aref to-state j))
+                    (aref goto-table state)))
+        (setq j (1+ j)))
+      (setq i (1+ i)))
+    goto-table))
+
+(defsubst wisent-quote-p (sym)
+  "Return non-nil if SYM is bound to the `quote' function."
+  (condition-case nil
+      (eq (indirect-function sym)
+          (indirect-function 'quote))
+    (error nil)))
+
+(defsubst wisent-backquote-p (sym)
+  "Return non-nil if SYM is bound to the `backquote' function."
+  (condition-case nil
+      (eq (indirect-function sym)
+          (indirect-function 'backquote))
+    (error nil)))
+
+(defun wisent-check-$N (x m)
+  "Return non-nil if X is a valid $N or $regionN symbol.
+That is if X is a $N or $regionN symbol with N >= 1 and N <= M.
+Also warn if X is a $N or $regionN symbol with N < 1 or N > M."
+  (when (symbolp x)
+    (let* ((n (symbol-name x))
+           (i (and (string-match "\\`\\$\\(region\\)?\\([0-9]+\\)\\'" n)
+                   (string-to-number (match-string 2 n)))))
+      (when i
+        (if (and (>= i 1) (<= i m))
+            t
+          (message
+           "*** In %s, %s might be a free variable (rule has %s)"
+           NAME x (format (cond ((< m 1) "no component")
+                                ((= m 1) "%d component")
+                                ("%d components"))
+                          m))
+          nil)))))
+
+(defun wisent-semantic-action-expand-body (body n &optional found)
+  "Parse BODY of semantic action.
+N is the maximum number of $N variables that can be referenced in
+BODY.  Warn on references out of permitted range.
+Optional argument FOUND is the accumulated list of '$N' references
+encountered so far.
+Return a cons (FOUND . XBODY), where FOUND is the list of $N
+references found in BODY, and XBODY is BODY expression with
+`backquote' forms expanded."
+  (if (not (listp body))
+      ;; BODY is an atom, no expansion needed
+      (progn
+        (if (wisent-check-$N body n)
+            ;; Accumulate $i symbol
+            (add-to-list 'found body))
+        (cons found body))
+    ;; BODY is a list, expand inside it
+    (let (xbody sexpr)
+      ;; If backquote expand it first
+      (if (wisent-backquote-p (car body))
+          (setq body (macroexpand body)))
+      (while body
+        (setq sexpr (car body)
+              body  (cdr body))
+        (cond
+         ;; Function call excepted quote expression
+         ((and (consp sexpr)
+               (not (wisent-quote-p (car sexpr))))
+          (setq sexpr (wisent-semantic-action-expand-body sexpr n found)
+                found (car sexpr)
+                sexpr (cdr sexpr)))
+         ;; $i symbol
+         ((wisent-check-$N sexpr n)
+          ;; Accumulate $i symbol
+          (add-to-list 'found sexpr))
+         )
+        ;; Accumulate expanded forms
+        (setq xbody (nconc xbody (list sexpr))))
+      (cons found xbody))))
+
+(defun wisent-semantic-action (r)
+  "Set up the Elisp function for semantic action at rule R.
+On entry RCODE[R] contains a vector [BODY N (NTERM I)] where BODY is the
+body of the semantic action, N is the maximum number of values
+available in the parser's stack, NTERM is the nonterminal the semantic
+action belongs to, and I is the index of the semantic action inside
+NTERM definition.  Return the semantic action symbol.
+The semantic action function accepts three arguments:
+
+- the state/value stack
+- the top-of-stack index
+- the goto table
+
+And returns the updated top-of-stack index."
+  (if (not (aref ruseful r))
+      (aset rcode r nil)
+    (let* ((actn (aref rcode r))
+           (n    (aref actn 1))         ; nb of val avail. in stack
+           (NAME (apply 'format "%s:%d" (aref actn 2)))
+           (form (wisent-semantic-action-expand-body (aref actn 0) n))
+           ($l   (car form))            ; list of $vars used in body
+           (form (cdr form))            ; expanded form of body
+           (nt   (aref rlhs r))         ; nonterminal item no.
+           (bl   nil)                   ; `let*' binding list
+           $v i j)
+
+      ;; Compute $N and $regionN bindings
+      (setq i n)
+      (while (> i 0)
+        (setq j (1+ (* 2 (- n i))))
+        ;; Only bind $regionI if used in action
+        (setq $v (intern (format "$region%d" i)))
+        (if (memq $v $l)
+            (setq bl (cons `(,$v (cdr (aref ,stack (- ,sp ,j)))) bl)))
+        ;; Only bind $I if used in action
+        (setq $v (intern (format "$%d" i)))
+        (if (memq $v $l)
+            (setq bl (cons `(,$v (car (aref ,stack (- ,sp ,j)))) bl)))
+        (setq i (1- i)))
+
+      ;; Compute J, the length of rule's RHS.  It will give the
+      ;; current parser state at STACK[SP - 2*J], and where to push
+      ;; the new semantic value and the next state, respectively at:
+      ;; STACK[SP - 2*J + 1] and STACK[SP - 2*J + 2].  Generally N,
+      ;; the maximum number of values available in the stack, is equal
+      ;; to J.  But, for mid-rule actions, N is the number of rule
+      ;; elements before the action and J is always 0 (empty rule).
+      (setq i (aref rrhs r)
+            j 0)
+      (while (> (aref ritem i) 0)
+        (setq j (1+ j)
+              i (1+ i)))
+
+      ;; Create the semantic action symbol.
+      (setq actn (intern NAME (aref rcode 0)))
+
+      ;; Store source code in function cell of the semantic action
+      ;; symbol.  It will be byte-compiled at automaton's compilation
+      ;; time.  Using a byte-compiled automaton can significantly
+      ;; speed up parsing!
+      (fset actn
+            `(lambda (,stack ,sp ,gotos)
+               (let* (,@bl
+                      ($region
+                       ,(cond
+                         ((= n 1)
+                          (if (assq '$region1 bl)
+                              '$region1
+                            `(cdr (aref ,stack (1- ,sp)))))
+                         ((> n 1)
+                          `(wisent-production-bounds
+                            ,stack (- ,sp ,(1- (* 2 n))) (1- ,sp)))))
+                      ($action ,NAME)
+                      ($nterm  ',(aref tags nt))
+                      ,@(and (> j 0) `((,sp (- ,sp ,(* j 2)))))
+                      (,state (cdr (assq $nterm
+                                         (aref ,gotos
+                                               (aref ,stack ,sp))))))
+                 (setq ,sp (+ ,sp 2))
+                 ;; push semantic value
+                 (aset ,stack (1- ,sp) (cons ,form $region))
+                 ;; push next state
+                 (aset ,stack ,sp ,state)
+                 ;; return new top of stack
+                 ,sp)))
+
+      ;; Return the semantic action symbol
+      actn)))
+
+;;;; ----------------------------
+;;;; Build parser LALR automaton.
+;;;; ----------------------------
+
+(defun wisent-parser-automaton ()
+  "Compute and return LALR(1) automaton from GRAMMAR.
+GRAMMAR is in internal format.  GRAM/ACTS are grammar rules
+in internal format.  STARTS defines the start symbols."
+  ;; Check for useless stuff
+  (wisent-reduce-grammar)
+
+  (wisent-set-derives)
+  (wisent-set-nullable)
+  ;; convert to nondeterministic finite state machine.
+  (wisent-generate-states)
+  ;; make it deterministic.
+  (wisent-lalr)
+  ;; Find and record any conflicts: places where one token of
+  ;; lookahead is not enough to disambiguate the parsing.  Also
+  ;; resolve s/r conflicts based on precedence declarations.
+  (wisent-resolve-conflicts)
+  (wisent-print-results)
+
+  (vector (wisent-state-actions)        ; action table
+          (wisent-goto-actions)         ; goto table
+          start-table                   ; start symbols
+          (aref rcode 0)                ; sem. action symbol obarray
+          )
+  )
+
+;;;; -------------------
+;;;; Parse input grammar
+;;;; -------------------
+
+(defconst wisent-reserved-symbols (list wisent-error-term)
+  "The list of reserved symbols.
+Also all symbols starting with a character defined in
+`wisent-reserved-capitals' are reserved for internal use.")
+
+(defconst wisent-reserved-capitals '(?\$ ?\@)
+  "The list of reserved capital letters.
+All symbol starting with one of these letters are reserved for
+internal use.")
+
+(defconst wisent-starts-nonterm '$STARTS
+  "Main start symbol.
+It gives the rules for start symbols.")
+
+(defvar wisent-single-start-flag nil
+  "Non-nil means allows only one start symbol like in Bison.
+That is don't add extra start rules to the grammar.  This is
+useful to compare the Wisent's generated automaton with the Bison's
+one.")
+
+(defsubst wisent-ISVALID-VAR (x)
+  "Return non-nil if X is a character or an allowed symbol."
+  (and x (symbolp x)
+       (not (memq (aref (symbol-name x) 0) wisent-reserved-capitals))
+       (not (memq x wisent-reserved-symbols))))
+
+(defsubst wisent-ISVALID-TOKEN (x)
+  "Return non-nil if X is a character or an allowed symbol."
+  (or (wisent-char-p x)
+      (wisent-ISVALID-VAR x)))
+
+(defun wisent-push-token (symbol &optional nocheck)
+  "Push a new SYMBOL in the list of tokens.
+Bypass checking if NOCHECK is non-nil."
+  ;; Check
+  (or nocheck (wisent-ISVALID-TOKEN symbol)
+      (error "Invalid terminal symbol: %S" symbol))
+  (if (memq symbol token-list)
+      (message "*** duplicate terminal `%s' ignored" symbol)
+    ;; Set up properties
+    (wisent-set-prec        symbol nil)
+    (wisent-set-assoc       symbol nil)
+    (wisent-set-item-number symbol ntokens)
+    ;; Add
+    (setq ntokens (1+ ntokens)
+          token-list (cons symbol token-list))))
+
+(defun wisent-push-var (symbol &optional nocheck)
+  "Push a new SYMBOL in the list of nonterminals.
+Bypass checking if NOCHECK is non-nil."
+  ;; Check
+  (unless nocheck
+    (or (wisent-ISVALID-VAR symbol)
+        (error "Invalid nonterminal symbol: %S" symbol))
+    (if (memq symbol var-list)
+        (error "Nonterminal `%s' already defined" symbol)))
+  ;; Set up properties
+  (wisent-set-item-number symbol nvars)
+  ;; Add
+  (setq nvars (1+ nvars)
+        var-list (cons symbol var-list)))
+
+(defun wisent-parse-nonterminals (defs)
+  "Parse nonterminal definitions in DEFS.
+Fill in each element of the global arrays RPREC, RCODE, RUSEFUL with
+respectively rule precedence level, semantic action code and
+usefulness flag.  Return a list of rules of the form (LHS . RHS) where
+LHS and RHS are respectively the Left Hand Side and Right Hand Side of
+the rule."
+  (setq rprec  nil
+        rcode  nil
+        nitems 0
+        nrules 0)
+  (let (def nonterm rlist rule rules rhs rest item items
+            rhl plevel semact @n @count iactn)
+    (setq @count 0)
+    (while defs
+      (setq def     (car defs)
+            defs    (cdr defs)
+            nonterm (car def)
+            rlist   (cdr def)
+            iactn   0)
+      (or (consp rlist)
+          (error "Invalid nonterminal definition syntax: %S" def))
+      (while rlist
+        (setq rule  (car rlist)
+              rlist (cdr rlist)
+              items (car rule)
+              rest  (cdr rule)
+              rhl   0
+              rhs   nil)
+
+        ;; Check & count items
+        (setq nitems (1+ nitems)) ;; LHS item
+        (while items
+          (setq item (car items)
+                items (cdr items)
+                nitems (1+ nitems)) ;; RHS items
+          (if (listp item)
+              ;; Mid-rule action
+              (progn
+                (setq @count (1+ @count)
+                      @n (intern (format "@%d" @count)))
+                (wisent-push-var @n t)
+                ;; Push a new empty rule with the mid-rule action
+                (setq semact (vector item rhl (list nonterm iactn))
+                      iactn  (1+ iactn)
+                      plevel nil
+                      rcode  (cons semact rcode)
+                      rprec  (cons plevel rprec)
+                      item   @n ;; Replace action by @N nonterminal
+                      rules  (cons (list item) rules)
+                      nitems (1+ nitems)
+                      nrules (1+ nrules)))
+            ;; Check terminal or nonterminal symbol
+            (cond
+             ((or (memq item token-list) (memq item var-list)))
+             ;; Create new literal character token
+             ((wisent-char-p item) (wisent-push-token item t))
+             ((error "Symbol `%s' is used, but is not defined as a token and has no rules"
+                     item))))
+          (setq rhl (1+ rhl)
+                rhs (cons item rhs)))
+
+        ;; Check & collect rule precedence level
+        (setq plevel (when (vectorp (car rest))
+                       (setq item (car rest)
+                             rest (cdr rest))
+                       (if (and (= (length item) 1)
+                                (memq (aref item 0) token-list)
+                                (wisent-prec (aref item 0)))
+                           (wisent-item-number (aref item 0))
+                         (error "Invalid rule precedence level syntax: %S" item)))
+              rprec (cons plevel rprec))
+
+        ;; Check & collect semantic action body
+        (setq semact (vector
+                      (if rest
+                          (if (cdr rest)
+                              (error "Invalid semantic action syntax: %S" rest)
+                            (car rest))
+                        ;; Give a default semantic action body: nil
+                        ;; for an empty rule or $1, the value of the
+                        ;; first symbol in the rule, otherwise.
+                        (if (> rhl 0) '$1 '()))
+                      rhl
+                      (list nonterm iactn))
+              iactn  (1+ iactn)
+              rcode  (cons semact rcode))
+        (setq rules  (cons (cons nonterm (nreverse rhs)) rules)
+              nrules (1+ nrules))))
+
+    (setq ruseful (make-vector (1+ nrules) t)
+          rprec   (vconcat (cons nil (nreverse rprec)))
+          rcode   (vconcat (cons nil (nreverse rcode))))
+    (nreverse rules)
+    ))
+
+(defun wisent-parse-grammar (grammar &optional start-list)
+  "Parse GRAMMAR and build a suitable internal representation.
+Optional argument START-LIST defines the start symbols.
+GRAMMAR is a list of form: (TOKENS ASSOCS . NONTERMS)
+
+TOKENS is a list of terminal symbols (tokens).
+
+ASSOCS is nil or an alist of (ASSOC-TYPE . ASSOC-VALUE) elements
+describing the associativity of TOKENS.  ASSOC-TYPE must be one of the
+`default-prec' `nonassoc', `left' or `right' symbols.  When ASSOC-TYPE
+is `default-prec', ASSOC-VALUE must be nil or t (the default).
+Otherwise it is a list of tokens which must have been previously
+declared in TOKENS.
+
+NONTERMS is the list of non terminal definitions (see function
+`wisent-parse-nonterminals')."
+  (working-dynamic-status "(parse input grammar)")
+  (or (and (consp grammar) (> (length grammar) 2))
+      (error "Bad input grammar"))
+
+  (let (i r rhs pre dpre lst start-var assoc rules item
+          token var def tokens defs ep-token ep-var ep-def)
+
+    ;; Built-in tokens
+    (setq ntokens 0 nvars 0)
+    (wisent-push-token wisent-eoi-term t)
+    (wisent-push-token wisent-error-term t)
+
+    ;; Check/collect terminals
+    (setq lst (car grammar))
+    (while lst
+      (wisent-push-token (car lst))
+      (setq lst (cdr lst)))
+
+    ;; Check/Set up tokens precedence & associativity
+    (setq lst  (nth 1 grammar)
+          pre  0
+          defs nil
+          dpre nil
+          default-prec t)
+    (while lst
+      (setq def    (car lst)
+            assoc  (car def)
+            tokens (cdr def)
+            lst    (cdr lst))
+      (if (eq assoc 'default-prec)
+          (progn
+            (or (null (cdr tokens))
+                (memq (car tokens) '(t nil))
+                (error "Invalid default-prec value: %S" tokens))
+            (setq default-prec (car tokens))
+            (if dpre
+                (message "*** redefining default-prec to %s"
+                         default-prec))
+            (setq dpre t))
+        (or (memq assoc '(left right nonassoc))
+            (error "Invalid associativity syntax: %S" assoc))
+        (setq pre (1+ pre))
+        (while tokens
+          (setq token  (car tokens)
+                tokens (cdr tokens))
+          (if (memq token defs)
+              (message "*** redefining precedence of `%s'" token))
+          (or (memq token token-list)
+              ;; Define token not previously declared.
+              (wisent-push-token token))
+          (setq defs (cons token defs))
+          ;; Record the precedence and associativity of the terminal.
+          (wisent-set-prec  token pre)
+          (wisent-set-assoc token assoc))))
+
+    ;; Check/Collect nonterminals
+    (setq lst  (nthcdr 2 grammar)
+          defs nil)
+    (while lst
+      (setq def (car lst)
+            lst (cdr lst))
+      (or (consp def)
+          (error "Invalid nonterminal definition: %S" def))
+      (if (memq (car def) token-list)
+          (error "Nonterminal `%s' already defined as token" (car def)))
+      (wisent-push-var (car def))
+      (setq defs (cons def defs)))
+    (or defs
+        (error "No input grammar"))
+    (setq defs (nreverse defs))
+
+    ;; Set up the start symbol.
+    (setq start-table nil)
+    (cond
+
+     ;; 1. START-LIST is nil, the start symbol is the first
+     ;;    nonterminal defined in the grammar (Bison like).
+     ((null start-list)
+      (setq start-var (caar defs)))
+
+     ;; 2. START-LIST contains only one element, it is the start
+     ;;    symbol (Bison like).
+     ((or wisent-single-start-flag (null (cdr start-list)))
+      (setq start-var  (car start-list))
+      (or (assq start-var defs)
+          (error "Start symbol `%s' has no rule" start-var)))
+
+     ;; 3. START-LIST contains more than one element.  All defines
+     ;;    potential start symbols.  One of them (the first one by
+     ;;    default) will be given at parse time to be the parser goal.
+     ;;    If `wisent-single-start-flag' is non-nil that feature is
+     ;;    disabled and the first nonterminal in START-LIST defines
+     ;;    the start symbol, like in case 2 above.
+     ((not wisent-single-start-flag)
+
+      ;; START-LIST is a list of nonterminals '(nt0 ... ntN).
+      ;; Build and push ad hoc start rules in the grammar:
+
+      ;; ($STARTS ((nt0) $1) ((nt1) $1) ... ((ntN) $1))
+      ;; ($nt1    (($$nt1 nt1) $2))
+      ;; ...
+      ;; ($ntN    (($$ntN ntN) $2))
+
+      ;; Where internal symbols $ntI and $$ntI are respectively
+      ;; nonterminals and terminals.
+
+      ;; The internal start symbol $STARTS is used to build the
+      ;; LALR(1) automaton.  The true default start symbol used by the
+      ;; parser is the first nonterminal in START-LIST (nt0).
+      (setq start-var wisent-starts-nonterm
+            lst       (nreverse start-list))
+      (while lst
+        (setq var (car lst)
+              lst (cdr lst))
+        (or (memq var var-list)
+            (error "Start symbol `%s' has no rule" var))
+        (unless (assq var start-table) ;; Ignore duplicates
+          ;; For each nt start symbol
+          (setq ep-var   (intern (format "$%s"  var))
+                ep-token (intern (format "$$%s" var)))
+          (wisent-push-token ep-token t)
+          (wisent-push-var   ep-var   t)
+          (setq
+           ;; Add entry (nt . $$nt) to start-table
+           start-table (cons (cons var ep-token) start-table)
+           ;; Add rule ($nt (($$nt nt) $2))
+           defs (cons (list ep-var (list (list ep-token var) '$2)) defs)
+           ;; Add start rule (($nt) $1)
+           ep-def (cons (list (list ep-var) '$1) ep-def))
+          ))
+      (wisent-push-var start-var t)
+      (setq defs (cons (cons start-var ep-def) defs))))
+
+    ;; Set up rules main data structure & RPREC, RCODE, RUSEFUL
+    (setq rules (wisent-parse-nonterminals defs))
+
+    ;; Set up the terminal & nonterminal lists.
+    (setq nsyms      (+ ntokens nvars)
+          token-list (nreverse token-list)
+          lst        var-list
+          var-list   nil)
+    (while lst
+      (setq var (car lst)
+            lst (cdr lst)
+            var-list (cons var var-list))
+      (wisent-set-item-number ;; adjust nonterminal item number to
+       var (+ ntokens (wisent-item-number var)))) ;; I += NTOKENS
+
+    ;; Store special item numbers
+    (setq error-token-number (wisent-item-number wisent-error-term)
+          start-symbol       (wisent-item-number start-var))
+
+    ;; Keep symbols in the TAGS vector so that TAGS[I] is the symbol
+    ;; associated to item number I.
+    (setq tags (vconcat token-list var-list))
+    ;; Set up RLHS RRHS & RITEM data structures from list of rules
+    ;; (LHS . RHS) received from `wisent-parse-nonterminals'.
+    (setq rlhs    (make-vector (1+ nrules) nil)
+          rrhs    (make-vector (1+ nrules) nil)
+          ritem   (make-vector (1+ nitems) nil)
+          i 0
+          r 1)
+    (while rules
+      (aset rlhs r (wisent-item-number (caar rules)))
+      (aset rrhs r i)
+      (setq rhs (cdar rules)
+            pre nil)
+      (while rhs
+        (setq item (wisent-item-number (car rhs)))
+        ;; Get default precedence level of rule, that is the
+        ;; precedence of the last terminal in it.
+        (and (wisent-ISTOKEN item)
+             default-prec
+             (setq pre item))
+
+        (aset ritem i item)
+        (setq i (1+ i)
+              rhs (cdr rhs)))
+      ;; Setup the precedence level of the rule, that is the one
+      ;; specified by %prec or the default one.
+      (and (not (aref rprec r)) ;; Already set by %prec
+           pre
+           (wisent-prec (aref tags pre))
+           (aset rprec r pre))
+      (aset ritem i (- r))
+      (setq i (1+ i)
+            r (1+ r))
+      (setq rules (cdr rules)))
+    ))
+
+;;;; ---------------------
+;;;; Compile input grammar
+;;;; ---------------------
+
+;;;###autoload
+(defun wisent-compile-grammar (grammar &optional start-list)
+  "Compile the LALR(1) GRAMMAR.
+
+GRAMMAR is a list (TOKENS ASSOCS . NONTERMS) where:
+
+- TOKENS is a list of terminal symbols (tokens).
+
+- ASSOCS is nil, or an alist of (ASSOC-TYPE . ASSOC-VALUE) elements
+  describing the associativity of TOKENS.  ASSOC-TYPE must be one of
+  the `default-prec' `nonassoc', `left' or `right' symbols.  When
+  ASSOC-TYPE is `default-prec', ASSOC-VALUE must be nil or t (the
+  default).  Otherwise it is a list of tokens which must have been
+  previously declared in TOKENS.
+
+- NONTERMS is a list of nonterminal definitions.
+
+Optional argument START-LIST specify the possible grammar start
+symbols.  This is a list of nonterminals which must have been
+previously declared in GRAMMAR's NONTERMS form.  By default, the start
+symbol is the first nonterminal defined.  When START-LIST contains
+only one element, it is the start symbol.  Otherwise, all elements are
+possible start symbols, unless `wisent-single-start-flag' is non-nil.
+In that case, the first element is the start symbol, and others are
+ignored.
+
+Return an automaton as a vector: [ACTIONS GOTOS STARTS FUNCTIONS]
+where:
+
+- ACTIONS is a state/token matrix telling the parser what to do at
+  every state based on the current lookahead token.  That is shift,
+  reduce, accept or error.
+
+- GOTOS is a state/nonterminal matrix telling the parser the next
+  state to go to after reducing with each rule.
+
+- STARTS is an alist which maps the allowed start nonterminal symbols
+  to tokens that will be first shifted into the parser stack.
+
+- FUNCTIONS is an obarray of semantic action symbols.  Each symbol's
+  function definition is the semantic action lambda expression."
+  (if (wisent-automaton-p grammar)
+      grammar ;; Grammar already compiled just return it
+    (wisent-with-context compile-grammar
+      (let* ((working-status-dynamic-type 'working-text-display)
+             (gc-cons-threshold 1000000)
+             automaton)
+        (garbage-collect)
+        (working-status-forms "Compiling grammar" "done"
+          (setq wisent-new-log-flag t)
+          ;; Parse input grammar
+          (wisent-parse-grammar grammar start-list)
+          ;; Generate the LALR(1) automaton
+          (setq automaton (wisent-parser-automaton))
+          (working-dynamic-status t)
+          automaton)))))
+
+;;;; --------------------------
+;;;; Byte compile input grammar
+;;;; --------------------------
+
+(require 'bytecomp)
+
+;;;###autoload
+(defun wisent-byte-compile-grammar (form)
+  "Byte compile the `wisent-compile-grammar' FORM.
+Automatically called by the Emacs Lisp byte compiler as a
+`byte-compile' handler."
+  ;; Eval the `wisent-compile-grammar' form to obtain an LALR
+  ;; automaton internal data structure.  Then, because the internal
+  ;; data structure contains an obarray, convert it to a lisp form so
+  ;; it can be byte-compiled.
+  (byte-compile-form (wisent-automaton-lisp-form (eval form))))
+
+;;;###autoload
+(put 'wisent-compile-grammar 'byte-compile 'wisent-byte-compile-grammar)
+
+(defun wisent-automaton-lisp-form (automaton)
+  "Return a Lisp form that produces AUTOMATON.
+See also `wisent-compile-grammar' for more details on AUTOMATON."
+  (or (wisent-automaton-p automaton)
+      (signal 'wrong-type-argument
+              (list 'wisent-automaton-p automaton)))
+  (let ((obn (make-symbol "ob"))        ; Generated obarray name
+        (obv (aref automaton 3))        ; Semantic actions obarray
+        )
+    `(let ((,obn (make-vector 13 0)))
+       ;; Generate code to initialize the semantic actions obarray,
+       ;; in local variable OBN.
+       ,@(let (obcode)
+           (mapatoms
+            #'(lambda (s)
+                (setq obcode
+                      (cons `(fset (intern ,(symbol-name s) ,obn)
+                                   #',(symbol-function s))
+                            obcode)))
+            obv)
+           obcode)
+       ;; Generate code to create the automaton.
+       (vector
+        ;; In code generated to initialize the action table, take
+        ;; care of symbols that are interned in the semantic actions
+        ;; obarray.
+        (vector
+         ,@(mapcar
+            #'(lambda (state) ;; for each state
+                `(list
+                  ,@(mapcar
+                     #'(lambda (tr) ;; for each transition
+                         (let ((k (car tr))  ; token
+                               (a (cdr tr))) ; action
+                           (if (and (symbolp a)
+                                    (intern-soft (symbol-name a) obv))
+                               `(cons ,(if (symbolp k) `(quote ,k) k)
+                                      (intern-soft ,(symbol-name a) ,obn))
+                             `(quote ,tr))))
+                     state)))
+            (aref automaton 0)))
+        ;; The code of the goto table is unchanged.
+        ,(aref automaton 1)
+        ;; The code of the alist of start symbols is unchanged.
+        ',(aref automaton 2)
+        ;; The semantic actions obarray is in the local variable OBN.
+        ,obn))))
+
+(provide 'wisent-comp)
+
+;;; wisent-comp.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-debug.el b/site/cedet-1.0pre7/semantic/wisent/wisent-debug.el
new file mode 100644
index 0000000..b061c9f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-debug.el
@@ -0,0 +1,156 @@
+;;; wisent-debug.el --- GNU Bison for Emacs - Debugging
+
+;; Copyright (C) 2003, 2007 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 11 February 2003
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-debug.el,v 1.4 2007/02/19 13:38:42 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Investigating what is happening during execution of the Wisent parser.
+;;
+;; Wisent (the European Bison ;-) is an Elisp implementation of the
+;; GNU Compiler Compiler Bison.
+;;
+;; For more details on the basic concepts for understanding Wisent,
+;; read the Bison manual ;)
+;;
+;; For more details on Wisent itself read the Wisent manual.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'wisent)
+(require 'debug)
+
+(defsubst wisent-debug-on-entry-p (function)
+  "Return t if FUNCTION invoke debugger each time it is called.
+FUNCTION must be a semantic action symbol."
+  (if (memq function debug-function-list)
+      t))
+
+(defun wisent-debug-on-automaton-p (automaton)
+  "Return t if there is a debug-enabled function in AUTOMATON."
+  (catch 'found
+    (mapatoms
+     #'(lambda (function)
+         (if (wisent-debug-on-entry-p function)
+             (throw 'found t)))
+     (aref automaton 3))))
+
+(defsubst wisent-debug-semantic-action-source (function)
+  "Return source expression of semantic action FUNCTION.
+FUNCTION must be a semantic action symbol."
+  (symbol-function function))
+
+(defun wisent-debug-read-entry (flag)
+  "Read a semantic action symbol from the minibuffer.
+Return a list (AUTOMATON FUNCTION) suitable for an `interactive' spec.
+AUTOMATON is a LALR automaton variable.  FUNCTION is a semantic action
+symbol defined in AUTOMATON.  If FLAG is t, only consider
+debug-enabled actions.  If nil, only consider not debug-enabled
+actions.  If 'any consider all available semantic action symbols."
+  (let ((vn (completing-read
+             "LALR automaton name: " obarray
+             (if (eq flag t)
+                 #'(lambda (e)
+                     (and (wisent-automaton-p e)
+                          (wisent-debug-on-automaton-p
+                           (symbol-value e))))
+               'wisent-automaton-p)
+             t))
+        ob am sy)
+    (unless (string-equal "" vn)
+      (setq am (intern-soft vn)
+            ob (aref (symbol-value am) 3)
+            vn (completing-read
+                (format "Semantic action symbol in `%s': " am)
+                ob
+                (unless (eq flag 'any)
+                  #'(lambda (e)
+                      (eq (wisent-debug-on-entry-p e) flag)))
+                t))
+      (unless (string-equal "" vn)
+        (setq sy (intern-soft vn ob))))
+    (list am sy)))
+
+(defun wisent-debug-check-entry (automaton function)
+  "Check that AUTOMATON owns symbol FUNCTION.
+Always return a symbol FUNCTION interned in the semantic action symbol
+table of AUTOMATON."
+  (and (wisent-automaton-p automaton)
+       function (symbolp function)
+       (intern-soft (symbol-name function)
+                    (aref (symbol-value automaton) 3))))
+
+;;;###autoload
+(defun wisent-debug-on-entry (automaton function)
+  "Request AUTOMATON's FUNCTION to invoke debugger each time it is called.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON."
+  (interactive (wisent-debug-read-entry nil))
+  (when (setq function (wisent-debug-check-entry automaton function))
+    (debug-on-entry function)))
+
+;;;###autoload
+(defun wisent-cancel-debug-on-entry (automaton function)
+  "Undo effect of \\[wisent-debug-on-entry] on AUTOMATON's FUNCTION.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON."
+  (interactive (wisent-debug-read-entry t))
+  (when (setq function (wisent-debug-check-entry automaton function))
+    (cancel-debug-on-entry function)))
+
+(condition-case nil
+    (require 'pprint)
+  (error
+   (require 'pp)))
+
+(if (fboundp 'pprint-to-string)
+    (eval-and-compile
+      (defalias 'wisent-debug-pp-to-string 'pprint-to-string))
+  (eval-and-compile
+    (defalias 'wisent-debug-pp-to-string 'pp-to-string)))
+
+;;;###autoload
+(defun wisent-debug-show-entry (automaton function)
+  "Show the source of AUTOMATON's semantic action FUNCTION.
+FUNCTION must be a semantic action symbol that exists in AUTOMATON."
+  (interactive (wisent-debug-read-entry 'any))
+  (when (setq function (wisent-debug-check-entry automaton function))
+    (with-current-buffer
+        (get-buffer-create (format "*%s/%s*" automaton function))
+      (erase-buffer)
+      (kill-all-local-variables)
+      (erase-buffer)
+      (setq buffer-undo-list t
+            buffer-read-only nil)
+      (emacs-lisp-mode)
+      (insert
+       (wisent-debug-pp-to-string
+        (wisent-debug-semantic-action-source function)))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+(provide 'wisent-debug)
+
+;;; wisent-debug.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-expr.el b/site/cedet-1.0pre7/semantic/wisent/wisent-expr.el
new file mode 100644
index 0000000..b02581f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-expr.el
@@ -0,0 +1,141 @@
+;;; wisent-expr.el --- Infix to prefix expression converter
+
+;; Copyright (C) 2001 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 19 June 2001
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-expr.el,v 1.4 2005/09/30 20:23:24 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Sample program using the elisp LALR parser Wisent. It just converts
+;; expressions from infix (C like) to prefix notation (Lisp like).
+
+;;; History:
+;; 
+
+;;; Code:
+
+(require 'wisent)
+
+(defconst wisent-expr-parser-tables
+  (eval-when-compile
+    (wisent-compile-grammar
+     '(
+       ;; terminals
+       (NUMBER MINUS PLUS DIV MULT LPAREN RPAREN SEMI)
+       ;; no operator precedence
+       nil
+       ;; non terminals
+       (grammar ((grammar expr)
+                 (format "%s %s" $1 $2))
+                ((expr)
+                 (format "%s" $1))
+                )
+       (expr    ((add SEMI)
+                 (format "%s%s" $1 $2))
+                ((SEMI)
+                 ";")
+                ((error SEMI) ;; on parse error skip tokens until
+                 "\"error\";") ;; next semicolon and return "error";
+                )
+       (add     ((add MINUS mult)
+                 (list '- $1 $3))
+                ((add PLUS mult)
+                 (list '+ $1 $3))
+                ((mult))
+                )
+       (mult    ((mult DIV final)
+                 (list '/ $1 $3))
+                ((mult MULT final)
+                 (list '* $1 $3))
+                ((final))
+                )
+       (final   ((LPAREN add RPAREN)
+                 $2)
+                ((NUMBER))
+                )
+       )))
+  "Expression converter parser tables.")
+
+(defconst wisent-expr-operators
+  '((?\; . SEMI)
+    (?\( . LPAREN)
+    (?\) . RPAREN)
+    (?\+ . PLUS)
+    (?\- . MINUS)
+    (?\* . MULT)
+    (?\/ . DIV))
+  "Expression converter operator terminals.")
+
+(defconst wisent-expr-number-regexp
+  (eval-when-compile
+    (concat "^\\("
+            "[0-9]+\\([.][0-9]*\\)?\\([eE][-+]?[0-9]+\\)?"
+            "\\|"
+            "[.][0-9]+\\([eE][-+]?[0-9]+\\)?"
+            "\\)"
+            ))
+  "Regexp to match the expression converter number terminals.")
+
+(defvar wisent-expr-lexer-input-stream nil
+  "The expression converter lexer input stream.")
+
+(defun wisent-expr-lexer ()
+  "The expression converter lexer."
+  (let* ((is  (or wisent-expr-lexer-input-stream ""))
+         (k   (string-match "\\S-" is)) ;; skip spaces
+         (lex (list wisent-eoi-term)))
+    (if (not k)
+        nil
+      (setq is (substring is k))
+      (cond
+       ;; Number
+       ((string-match wisent-expr-number-regexp is)
+        (setq lex (list 'NUMBER (read (match-string 0 is)))
+              is  (substring is (match-end 0))))
+       ;; Operator
+       ((setq k (assq (aref is 0) wisent-expr-operators))
+        (setq lex (list (cdr k) (string (aref is 0)))
+              is  (substring is 1)))
+       ;; Invalid input
+       (t
+        (error "Invalid input character '%c'" (aref is 0))))
+      (setq wisent-expr-lexer-input-stream is))
+    lex))
+
+(defun wisent-expr (input)
+  "Infix to prefix expression converter.
+Parse INPUT string and output the result of computation."
+  (interactive "sexpr: ")
+  (or (string-match ";\\s-*$" input)
+      (setq input (concat input ";")))
+  (let ((wisent-expr-lexer-input-stream input))
+    (message "%s -> %s"
+             input
+             (wisent-parse wisent-expr-parser-tables
+                           #'wisent-expr-lexer
+                           #'message))))
+
+(provide 'wisent-expr)
+
+;;; wisent-expr.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-grammar-macros.el b/site/cedet-1.0pre7/semantic/wisent/wisent-grammar-macros.el
new file mode 100644
index 0000000..d2da590
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-grammar-macros.el
@@ -0,0 +1,228 @@
+;;; wisent-grammar-macros.el --- Semantic macros for LALR grammars
+;;
+;; Copyright (C) 2003 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 02 Aug 2003
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-grammar-macros.el,v 1.6 2006/05/31 12:46:17 ponced Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library defines the default set of Semantic grammar macros
+;; used in wisent (.wy) grammars.
+
+;;; History:
+;;
+
+;;; Code:
+
+(defsubst wisent-grammar-region-placeholder (symb)
+  "Given a $N placeholder symbol in SYMB, return a $regionN symbol.
+Return nil if $N is not a valid placeholder symbol."
+  (let ((n (symbol-name symb)))
+    (if (string-match "^[$]\\([1-9][0-9]*\\)$" n)
+        (intern (concat "$region" (match-string 1 n))))))
+
+(defun wisent-grammar-EXPAND (symb nonterm)
+  "Expand call to EXPAND grammar macro.
+Return the form to parse from within a nonterminal.
+SYMB is a $I placeholder symbol that gives the bounds of the area to
+parse.
+NONTERM is the nonterminal symbol to start with."
+  (unless (member nonterm (semantic-grammar-start))
+    (error "EXPANDFULL macro called with %s, but not used with %%start"
+           nonterm))
+  (let (($ri (wisent-grammar-region-placeholder symb)))
+    (if $ri
+        `(semantic-bovinate-from-nonterminal
+          (car ,$ri) (cdr ,$ri) ',nonterm)
+      (error "Invalid form (EXPAND %s %s)" symb nonterm))))
+
+(defun wisent-grammar-EXPANDFULL (symb nonterm)
+  "Expand call to EXPANDFULL grammar macro.
+Return the form to recursively parse an area.
+SYMB is a $I placeholder symbol that gives the bounds of the area.
+NONTERM is the nonterminal symbol to start with."
+  (unless (member nonterm (semantic-grammar-start))
+    (error "EXPANDFULL macro called with %s, but not used with %%start"
+           nonterm))
+  (let (($ri (wisent-grammar-region-placeholder symb)))
+    (if $ri
+        `(semantic-parse-region
+          (car ,$ri) (cdr ,$ri) ',nonterm 1)
+      (error "Invalid form (EXPANDFULL %s %s)" symb nonterm))))
+
+(defun wisent-grammar-TAG (name class &rest attributes)
+  "Expand call to TAG grammar macro.
+Return the form to create a generic semantic tag.
+See the function `semantic-tag' for the meaning of arguments NAME,
+CLASS and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag ,name ,class ,@attributes)))
+
+(defun wisent-grammar-VARIABLE-TAG (name type default-value &rest attributes)
+  "Expand call to VARIABLE-TAG grammar macro.
+Return the form to create a semantic tag of class variable.
+See the function `semantic-tag-new-variable' for the meaning of
+arguments NAME, TYPE, DEFAULT-VALUE and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-variable ,name ,type ,default-value ,@attributes)))
+
+(defun wisent-grammar-FUNCTION-TAG (name type arg-list &rest attributes)
+  "Expand call to FUNCTION-TAG grammar macro.
+Return the form to create a semantic tag of class function.
+See the function `semantic-tag-new-function' for the meaning of
+arguments NAME, TYPE, ARG-LIST and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-function ,name ,type ,arg-list ,@attributes)))
+
+(defun wisent-grammar-TYPE-TAG (name type members parents &rest attributes)
+  "Expand call to TYPE-TAG grammar macro.
+Return the form to create a semantic tag of class type.
+See the function `semantic-tag-new-type' for the meaning of arguments
+NAME, TYPE, MEMBERS, PARENTS and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-type ,name ,type ,members ,parents ,@attributes)))
+
+(defun wisent-grammar-INCLUDE-TAG (name system-flag &rest attributes)
+  "Expand call to INCLUDE-TAG grammar macro.
+Return the form to create a semantic tag of class include.
+See the function `semantic-tag-new-include' for the meaning of
+arguments NAME, SYSTEM-FLAG and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-include ,name ,system-flag ,@attributes)))
+
+(defun wisent-grammar-PACKAGE-TAG (name detail &rest attributes)
+  "Expand call to PACKAGE-TAG grammar macro.
+Return the form to create a semantic tag of class package.
+See the function `semantic-tag-new-package' for the meaning of
+arguments NAME, DETAIL and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-package ,name ,detail ,@attributes)))
+
+(defun wisent-grammar-CODE-TAG (name detail &rest attributes)
+  "Expand call to CODE-TAG grammar macro.
+Return the form to create a semantic tag of class code.
+See the function `semantic-tag-new-code' for the meaning of arguments
+NAME, DETAIL and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-code ,name ,detail ,@attributes)))
+
+(defun wisent-grammar-ALIAS-TAG (name aliasclass definition &rest attributes)
+  "Expand call to ALIAS-TAG grammar macro.
+Return the form to create a semantic tag of class alias.
+See the function `semantic-tag-new-alias' for the meaning of arguments
+NAME, ALIASCLASS, DEFINITION and ATTRIBUTES."
+  `(wisent-raw-tag
+    (semantic-tag-new-alias ,name ,aliasclass ,definition ,@attributes)))
+
+(defun wisent-grammar-EXPANDTAG (raw-tag)
+  "Expand call to EXPANDTAG grammar macro.
+Return the form to produce a list of cooked tags from raw form of
+Semantic tag RAW-TAG."
+  `(wisent-cook-tag ,raw-tag))
+
+(defun wisent-grammar-AST-ADD (ast &rest nodes)
+  "Expand call to AST-ADD grammar macro.
+Return the form to update the abstract syntax tree AST with NODES.
+See also the function `semantic-ast-add'."
+  `(semantic-ast-add ,ast ,@nodes))
+
+(defun wisent-grammar-AST-PUT (ast &rest nodes)
+  "Expand call to AST-PUT grammar macro.
+Return the form to update the abstract syntax tree AST with NODES.
+See also the function `semantic-ast-put'."
+  `(semantic-ast-put ,ast ,@nodes))
+
+(defun wisent-grammar-AST-GET (ast node)
+  "Expand call to AST-GET grammar macro.
+Return the form to get, from the abstract syntax tree AST, the value
+of NODE.
+See also the function `semantic-ast-get'."
+  `(semantic-ast-get ,ast ,node))
+
+(defun wisent-grammar-AST-GET1 (ast node)
+  "Expand call to AST-GET1 grammar macro.
+Return the form to get, from the abstract syntax tree AST, the first
+value of NODE.
+See also the function `semantic-ast-get1'."
+  `(semantic-ast-get1 ,ast ,node))
+
+(defun wisent-grammar-AST-GET-STRING (ast node)
+  "Expand call to AST-GET-STRING grammar macro.
+Return the form to get, from the abstract syntax tree AST, the value
+of NODE as a string.
+See also the function `semantic-ast-get-string'."
+  `(semantic-ast-get-string ,ast ,node))
+
+(defun wisent-grammar-AST-MERGE (ast1 ast2)
+  "Expand call to AST-MERGE grammar macro.
+Return the form to merge the abstract syntax trees AST1 and AST2.
+See also the function `semantic-ast-merge'."
+  `(semantic-ast-merge ,ast1 ,ast2))
+
+(defun wisent-grammar-SKIP-BLOCK (&optional symb)
+  "Expand call to SKIP-BLOCK grammar macro.
+Return the form to skip a parenthesized block.
+Optional argument SYMB is a $I placeholder symbol that gives the
+bounds of the block to skip.  By default, skip the block at `$1'.
+See also the function `wisent-skip-block'."
+  (let ($ri)
+    (when symb
+      (unless (setq $ri (wisent-grammar-region-placeholder symb))
+        (error "Invalid form (SKIP-BLOCK %s)" symb)))
+    `(wisent-skip-block ,$ri)))
+
+(defun wisent-grammar-SKIP-TOKEN ()
+  "Expand call to SKIP-TOKEN grammar macro.
+Return the form to skip the lookahead token.
+See also the function `wisent-skip-token'."
+  `(wisent-skip-token))
+
+(defvar-mode-local wisent-grammar-mode semantic-grammar-macros
+  '(
+    (ASSOC          . semantic-grammar-ASSOC)
+    (EXPAND         . wisent-grammar-EXPAND)
+    (EXPANDFULL     . wisent-grammar-EXPANDFULL)
+    (TAG            . wisent-grammar-TAG)
+    (VARIABLE-TAG   . wisent-grammar-VARIABLE-TAG)
+    (FUNCTION-TAG   . wisent-grammar-FUNCTION-TAG)
+    (TYPE-TAG       . wisent-grammar-TYPE-TAG)
+    (INCLUDE-TAG    . wisent-grammar-INCLUDE-TAG)
+    (PACKAGE-TAG    . wisent-grammar-PACKAGE-TAG)
+    (EXPANDTAG      . wisent-grammar-EXPANDTAG)
+    (CODE-TAG       . wisent-grammar-CODE-TAG)
+    (ALIAS-TAG      . wisent-grammar-ALIAS-TAG)
+    (AST-ADD        . wisent-grammar-AST-ADD)
+    (AST-PUT        . wisent-grammar-AST-PUT)
+    (AST-GET        . wisent-grammar-AST-GET)
+    (AST-GET1       . wisent-grammar-AST-GET1)
+    (AST-GET-STRING . wisent-grammar-AST-GET-STRING)
+    (AST-MERGE      . wisent-grammar-AST-MERGE)
+    (SKIP-BLOCK     . wisent-grammar-SKIP-BLOCK)
+    (SKIP-TOKEN     . wisent-grammar-SKIP-TOKEN)
+    )
+  "Semantic grammar macros used in wisent grammars.")
+
+(provide 'wisent-grammar-macros)
+
+;;; wisent-grammar-macros.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-grammar.el b/site/cedet-1.0pre7/semantic/wisent/wisent-grammar.el
new file mode 100644
index 0000000..495acea
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-grammar.el
@@ -0,0 +1,186 @@
+;;; wisent-grammar.el --- Wisent's input grammar mode
+;;
+;; Copyright (C) 2002, 2003, 2004 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 26 Aug 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-grammar.el,v 1.19 2005/09/30 20:23:27 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Major mode for editing Wisent's input grammar (.wy) files.
+
+;;; History:
+;;
+
+;;; Code:
+(require 'semantic-grammar)
+(require 'wisent-grammar-macros)
+(eval-when-compile
+  (require 'semantic-find))
+
+(defun wisent-grammar-assocs ()
+  "Return associativity and precedence level definitions."
+  (mapcar
+   #'(lambda (tag)
+       (cons (intern (semantic-tag-name tag))
+             (mapcar #'semantic-grammar-item-value
+                     (semantic-tag-get-attribute tag :value))))
+   (semantic-find-tags-by-class 'assoc (current-buffer))))
+
+(defun wisent-grammar-terminals ()
+  "Return the list of terminal symbols.
+Keep order of declaration in the WY file without duplicates."
+  (let (terms)
+    (mapcar
+     #'(lambda (tag)
+         (mapcar #'(lambda (name)
+                     (add-to-list 'terms (intern name)))
+                 (cons (semantic-tag-name tag)
+                       (semantic-tag-get-attribute tag :rest))))
+     (semantic--find-tags-by-function
+      #'(lambda (tag)
+          (memq (semantic-tag-class tag) '(token keyword)))
+      (current-buffer)))
+    (nreverse terms)))
+
+;; Cache of macro definitions currently in use.
+(defvar wisent--grammar-macros nil)
+
+(defun wisent-grammar-expand-macros (expr)
+  "Expand expression EXPR into a form without grammar macros.
+Return the expanded expression."
+  (if (or (atom expr) (semantic-grammar-quote-p (car expr)))
+      expr ;; Just return atom or quoted expression.
+    (let* ((expr  (mapcar 'wisent-grammar-expand-macros expr))
+           (macro (assq (car expr) wisent--grammar-macros)))
+      (if macro ;; Expand Semantic built-in.
+          (apply (cdr macro) (cdr expr))
+        expr))))
+
+(defun wisent-grammar-nonterminals ()
+  "Return the list form of nonterminal definitions."
+  (let ((nttags (semantic-find-tags-by-class
+                 'nonterminal (current-buffer)))
+        ;; Setup the cache of macro definitions.
+        (wisent--grammar-macros (semantic-grammar-macros))
+        rltags nterms rules rule elems elem actn sexp prec)
+    (while nttags
+      (setq rltags (semantic-tag-components (car nttags))
+            rules  nil)
+      (while rltags
+        (setq elems (semantic-tag-get-attribute (car rltags) :value)
+              prec  (semantic-tag-get-attribute (car rltags) :prec)
+              actn  (semantic-tag-get-attribute (car rltags) :expr)
+              rule  nil)
+        (when elems ;; not an EMPTY rule
+          (while elems
+            (setq elem  (car elems)
+                  elems (cdr elems))
+            (setq elem (if (consp elem) ;; mid-rule action
+                           (wisent-grammar-expand-macros (read (car elem)))
+                         (semantic-grammar-item-value elem)) ;; item
+                  rule (cons elem rule)))
+          (setq rule (nreverse rule)))
+        (if prec
+            (setq prec (vector (semantic-grammar-item-value prec))))
+        (if actn
+            (setq sexp (wisent-grammar-expand-macros (read actn))))
+        (setq rule (if actn
+                       (if prec
+                           (list rule prec sexp)
+                         (list rule sexp))
+                     (if prec
+                         (list rule prec)
+                       (list rule))))
+        (setq rules (cons rule rules)
+              rltags (cdr rltags)))
+      (setq nterms (cons (cons (intern (semantic-tag-name (car nttags)))
+                               (nreverse rules))
+                         nterms)
+            nttags (cdr nttags)))
+    (nreverse nterms)))
+
+(defun wisent-grammar-grammar ()
+  "Return Elisp form of the grammar."
+  (let* ((terminals    (wisent-grammar-terminals))
+         (nonterminals (wisent-grammar-nonterminals))
+         (assocs       (wisent-grammar-assocs)))
+    (cons terminals (cons assocs nonterminals))))
+
+(defun wisent-grammar-parsetable-builder ()
+  "Return the value of the parser table."
+  `(progn
+     ;; Ensure that the grammar [byte-]compiler is available.
+     (eval-when-compile (require 'wisent-comp))
+     (wisent-compile-grammar
+      ',(wisent-grammar-grammar)
+      ',(semantic-grammar-start))))
+
+(defun wisent-grammar-setupcode-builder ()
+  "Return the parser setup code."
+  (format
+   "(semantic-install-function-overrides\n\
+      '((parse-stream . wisent-parse-stream)))\n\
+    (setq semantic-parser-name \"LALR\"\n\
+          semantic--parse-table %s\n\
+          semantic-debug-parser-source %S\n\
+          semantic-flex-keywords-obarray %s\n\
+          semantic-lex-types-obarray %s)\n\
+    ;; Collect unmatched syntax lexical tokens\n\
+    (semantic-make-local-hook 'wisent-discarding-token-functions)\n\
+    (add-hook 'wisent-discarding-token-functions\n\
+              'wisent-collect-unmatched-syntax nil t)"
+   (semantic-grammar-parsetable)
+   (buffer-name)
+   (semantic-grammar-keywordtable)
+   (semantic-grammar-tokentable)))
+
+(defvar wisent-grammar-menu
+  '("WY Grammar"
+    ["LALR Compiler Verbose" wisent-toggle-verbose-flag
+     :style toggle :active (boundp 'wisent-verbose-flag)
+     :selected (and (boundp 'wisent-verbose-flag)
+                    wisent-verbose-flag)]
+    )
+  "WY mode specific grammar menu.
+Menu items are appended to the common grammar menu.")
+
+;;;###autoload
+(define-derived-mode wisent-grammar-mode semantic-grammar-mode "WY"
+  "Major mode for editing Wisent grammars."
+  (semantic-grammar-setup-menu wisent-grammar-menu)
+  (semantic-install-function-overrides
+   '((grammar-parsetable-builder . wisent-grammar-parsetable-builder)
+     (grammar-setupcode-builder  . wisent-grammar-setupcode-builder)
+     )))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.wy$" . wisent-grammar-mode))
+
+;;;###autoload
+(eval-after-load "speedbar"
+  '(speedbar-add-supported-extension ".wy"))
+
+(provide 'wisent-grammar)
+
+;;; wisent-grammar.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags-wy.el
new file mode 100644
index 0000000..da3eb92
Binary files /dev/null and b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags-wy.el differ
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.el b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.el
new file mode 100644
index 0000000..b20f1ca
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.el
@@ -0,0 +1,127 @@
+;;; wisent-java-tags.el --- Java LALR parser for Emacs
+
+;; Copyright (C) 2009 Eric M. Ludlam
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 15 Dec 2001
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-java-tags.el,v 1.33 2009/01/24 03:47:02 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+
+;;; History:
+;; 
+
+;;; Code:
+
+(require 'semantic-wisent)
+(require 'wisent-java-tags-wy)
+(require 'semantic-java)
+(eval-when-compile
+  (require 'semantic-util)
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+;;;;
+;;;; Simple parser error reporting function
+;;;;
+
+(defun wisent-java-parse-error (msg)
+  "Error reporting function called when a parse error occurs.
+MSG is the message string to report."
+;;   (let ((error-start (nth 2 wisent-input)))
+;;     (if (number-or-marker-p error-start)
+;;         (goto-char error-start)))
+  (message msg)
+  ;;(debug)
+  )
+
+;;;;
+;;;; Local context
+;;;;
+
+(define-mode-local-override semantic-get-local-variables
+  java-mode ()
+  "Get local values from a specific context.
+Parse the current context for `field_declaration' nonterminals to
+collect tags, such as local variables or prototypes.
+This function override `get-local-variables'."
+  (let ((vars nil)
+        ;; We want nothing to do with funny syntaxing while doing this.
+        (semantic-unmatched-syntax-hook nil))
+    (while (not (semantic-up-context (point) 'function))
+      (save-excursion
+        (forward-char 1)
+        (setq vars
+              (append (semantic-parse-region
+                       (point)
+                       (save-excursion (semantic-end-of-context) (point))
+                       'field_declaration
+                       0 t)
+                      vars))))
+    vars))
+
+;;;;
+;;;; Semantic integration of the Java LALR parser
+;;;;
+
+;;;###autoload
+(defun wisent-java-default-setup ()
+  "Hook run to setup Semantic in `java-mode'.
+Use the alternate LALR(1) parser."
+  (wisent-java-tags-wy--install-parser)
+  (setq
+   ;; Lexical analysis
+   semantic-lex-number-expression semantic-java-number-regexp
+   semantic-lex-analyzer 'wisent-java-tags-lexer
+   ;; Parsing
+   semantic-tag-expand-function 'semantic-java-expand-tag
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-prototype
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ";"
+   ;; speedbar and imenu buckets name
+   semantic-symbol->name-assoc-list-for-type-parts
+   ;; in type parts
+   '((type     . "Classes")
+     (variable . "Variables")
+     (function . "Methods"))
+   semantic-symbol->name-assoc-list
+   ;; everywhere
+   (append semantic-symbol->name-assoc-list-for-type-parts
+           '((include  . "Imports")
+             (package  . "Package")))
+   ;; navigation inside 'type children
+   senator-step-at-tag-classes '(function variable)
+   )
+  ;; Setup javadoc stuff
+  (semantic-java-doc-setup))
+
+;;;###autoload
+(add-hook 'java-mode-hook 'wisent-java-default-setup)
+
+(provide 'wisent-java-tags)
+
+;;; wisent-java-tags.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.wy
new file mode 100644
index 0000000..31139eb
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-java-tags.wy
@@ -0,0 +1,754 @@
+;;; wisent-java-tags.wy -- Semantic LALR grammar for Java
+;;
+;; Copyright (C) 2002, 2007 David Ponce
+;; Copyright (C) 2007 Eric Ludlam
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 25 Feb 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-java-tags.wy,v 1.20 2007/02/08 12:10:43 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;%package wisent-java-tags-wy
+
+%languagemode  java-mode
+
+;; The default start symbol
+%start compilation_unit
+;; Alternate entry points
+;;    - Needed by partial re-parse
+%start package_declaration
+%start import_declaration
+%start class_declaration
+%start field_declaration
+%start method_declaration
+%start formal_parameter
+%start constructor_declaration
+%start interface_declaration
+;;    - Needed by EXPANDFULL clauses
+%start class_member_declaration
+%start interface_member_declaration
+%start formal_parameters
+
+;; -----------------------------
+;; Block & Parenthesis terminals
+;; -----------------------------
+%type  <block>       ;;syntax "\\s(\\|\\s)" matchdatatype block
+
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <block>       BRACK_BLOCK "(LBRACK RBRACK)"
+
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+%token <open-paren>  LBRACK      "["
+%token <close-paren> RBRACK      "]"
+
+;; ------------------
+;; Operator terminals
+;; ------------------
+%type  <punctuation> ;;syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+
+%token <punctuation> NOT         "!"
+%token <punctuation> NOTEQ       "!="
+%token <punctuation> MOD         "%"
+%token <punctuation> MODEQ       "%="
+%token <punctuation> AND         "&"
+%token <punctuation> ANDAND      "&&"
+%token <punctuation> ANDEQ       "&="
+%token <punctuation> MULT        "*"
+%token <punctuation> MULTEQ      "*="
+%token <punctuation> PLUS        "+"
+%token <punctuation> PLUSPLUS    "++"
+%token <punctuation> PLUSEQ      "+="
+%token <punctuation> COMMA       ","
+%token <punctuation> MINUS       "-"
+%token <punctuation> MINUSMINUS  "--"
+%token <punctuation> MINUSEQ     "-="
+%token <punctuation> DOT         "."
+%token <punctuation> DIV         "/"
+%token <punctuation> DIVEQ       "/="
+%token <punctuation> COLON       ":"
+%token <punctuation> SEMICOLON   ";"
+%token <punctuation> LT          "<"
+%token <punctuation> LSHIFT      "<<"
+%token <punctuation> LSHIFTEQ    "<<="
+%token <punctuation> LTEQ        "<="
+%token <punctuation> EQ          "="
+%token <punctuation> EQEQ        "=="
+%token <punctuation> GT          ">"
+%token <punctuation> GTEQ        ">="
+%token <punctuation> RSHIFT      ">>"
+%token <punctuation> RSHIFTEQ    ">>="
+%token <punctuation> URSHIFT     ">>>"
+%token <punctuation> URSHIFTEQ   ">>>="
+%token <punctuation> QUESTION    "?"
+%token <punctuation> XOR         "^"
+%token <punctuation> XOREQ       "^="
+%token <punctuation> OR          "|"
+%token <punctuation> OREQ        "|="
+%token <punctuation> OROR        "||"
+%token <punctuation> COMP        "~"
+
+;; -----------------
+;; Literal terminals
+;; -----------------
+%type  <symbol>      ;;syntax "\\(\\sw\\|\\s_\\)+"
+%token <symbol>      IDENTIFIER
+
+%type  <string>      ;;syntax "\\s\"" matchdatatype sexp
+%token <string>      STRING_LITERAL
+
+%type  <number>      ;;syntax semantic-lex-number-expression
+%token <number>      NUMBER_LITERAL
+
+%type <unicode>      syntax "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
+%token <unicode>     unicodecharacter
+
+;; -----------------
+;; Keyword terminals
+;; -----------------
+
+;; Generate a keyword analyzer
+%type  <keyword> ;;syntax "\\(\\sw\\|\\s_\\)+" matchdatatype keyword
+
+%keyword ABSTRACT     "abstract"
+%put     ABSTRACT summary
+"Class|Method declaration modifier: abstract {class|<type>} <name> ..."
+
+%keyword BOOLEAN      "boolean"
+%put     BOOLEAN summary
+"Primitive logical quantity type (true or false)"
+
+%keyword BREAK        "break"
+%put     BREAK summary
+"break [<label>] ;"
+
+%keyword BYTE         "byte"
+%put     BYTE summary
+"Integral primitive type (-128 to 127)"
+
+%keyword CASE         "case"
+%put     CASE summary
+"switch(<expr>) {case <const-expr>: <stmts> ... }"
+
+%keyword CATCH        "catch"
+%put     CATCH summary
+"try {<stmts>} catch(<parm>) {<stmts>} ... "
+
+%keyword CHAR         "char"
+%put     CHAR summary
+"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+
+%keyword CLASS        "class"
+%put     CLASS summary
+"Class declaration: class <name>"
+
+%keyword CONST        "const"
+%put     CONST summary
+"Unused reserved word"
+
+%keyword CONTINUE     "continue"
+%put     CONTINUE summary
+"continue [<label>] ;"
+
+%keyword DEFAULT      "default"
+%put     DEFAULT summary
+"switch(<expr>) { ... default: <stmts>}"
+
+%keyword DO           "do"
+%put     DO summary
+"do <stmt> while (<expr>);"
+
+%keyword DOUBLE       "double"
+%put     DOUBLE summary
+"Primitive floating-point type (double-precision 64-bit IEEE 754)"
+
+%keyword ELSE         "else"
+%put     ELSE summary
+"if (<expr>) <stmt> else <stmt>"
+
+%keyword EXTENDS      "extends"
+%put     EXTENDS summary
+"SuperClass|SuperInterfaces declaration: extends <name> [, ...]"
+
+%keyword FINAL        "final"
+%put     FINAL summary
+"Class|Member declaration modifier: final {class|<type>} <name> ..."
+
+%keyword FINALLY      "finally"
+%put     FINALLY summary
+"try {<stmts>} ... finally {<stmts>}"
+
+%keyword FLOAT        "float"
+%put     FLOAT summary
+"Primitive floating-point type (single-precision 32-bit IEEE 754)"
+
+%keyword FOR          "for"
+%put     FOR summary
+"for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>"
+
+%keyword GOTO         "goto"
+%put     GOTO summary
+"Unused reserved word"
+
+%keyword IF           "if"
+%put     IF summary
+"if (<expr>) <stmt> [else <stmt>]"
+
+%keyword IMPLEMENTS   "implements"
+%put     IMPLEMENTS summary
+"Class SuperInterfaces declaration: implements <name> [, ...]"
+
+%keyword IMPORT       "import"
+%put     IMPORT summary
+"Import package declarations: import <package>"
+
+%keyword INSTANCEOF   "instanceof"
+
+%keyword INT          "int"
+%put     INT summary
+"Integral primitive type (-2147483648 to 2147483647)"
+
+%keyword INTERFACE    "interface"
+%put     INTERFACE summary
+"Interface declaration: interface <name>"
+
+%keyword LONG         "long"
+%put     LONG summary
+"Integral primitive type (-9223372036854775808 to 9223372036854775807)"
+
+%keyword NATIVE       "native"
+%put     NATIVE summary
+"Method declaration modifier: native <type> <name> ..."
+
+%keyword NEW          "new"
+
+%keyword PACKAGE      "package"
+%put     PACKAGE summary
+"Package declaration: package <name>"
+
+%keyword PRIVATE      "private"
+%put     PRIVATE summary
+"Access level modifier: private {class|interface|<type>} <name> ..."
+
+%keyword PROTECTED    "protected"
+%put     PROTECTED summary
+"Access level modifier: protected {class|interface|<type>} <name> ..."
+
+%keyword PUBLIC       "public"
+%put     PUBLIC summary
+"Access level modifier: public {class|interface|<type>} <name> ..."
+
+%keyword RETURN       "return"
+%put     RETURN summary
+"return [<expr>] ;"
+
+%keyword SHORT        "short"
+%put     SHORT summary
+"Integral primitive type (-32768 to 32767)"
+
+%keyword STATIC       "static"
+%put     STATIC summary
+"Declaration modifier: static {class|interface|<type>} <name> ..."
+
+%keyword STRICTFP     "strictfp"
+%put     STRICTFP summary
+"Declaration modifier: strictfp {class|interface|<type>} <name> ..."
+
+%keyword SUPER        "super"
+
+%keyword SWITCH       "switch"
+%put     SWITCH summary
+"switch(<expr>) {[case <const-expr>: <stmts> ...] [default: <stmts>]}"
+
+
+%keyword SYNCHRONIZED "synchronized"
+%put     SYNCHRONIZED summary
+"synchronized (<expr>) ... | Method decl. modifier: synchronized <type> <name> ..."
+
+%keyword THIS         "this"
+
+%keyword THROW        "throw"
+%put     THROW summary
+"throw <expr> ;"
+
+%keyword THROWS       "throws"
+%put     THROWS summary
+"Method|Constructor declaration: throws <classType>, ..."
+
+%keyword TRANSIENT    "transient"
+%put     TRANSIENT summary
+"Field declaration modifier: transient <type> <name> ..."
+
+%keyword TRY          "try"
+%put     TRY summary
+"try {<stmts>} [catch(<parm>) {<stmts>} ...] [finally {<stmts>}]"
+
+%keyword VOID         "void"
+%put     VOID summary
+"Method return type: void <name> ..."
+
+%keyword VOLATILE     "volatile"
+%put     VOLATILE summary
+"Field declaration modifier: volatile <type> <name> ..."
+
+%keyword WHILE        "while"
+%put     WHILE summary
+"while (<expr>) <stmt> | do <stmt> while (<expr>);"
+  
+;; --------------------------
+;; Official javadoc line tags
+;; --------------------------
+
+;; Javadoc tags are identified by a 'javadoc' keyword property.  The
+;; value of this property must be itself a property list where the
+;; following properties are recognized:
+;;
+;; - `seq' (mandatory) is the tag sequence number used to check if tags
+;;   are correctly ordered in a javadoc comment block.
+;;
+;; - `usage' (mandatory) is the list of token categories for which this
+;;   documentation tag is allowed.
+;;
+;; - `opt' (optional) if non-nil indicates this is an optional tag.
+;;   By default tags are mandatory.
+;;
+;; - `with-name' (optional) if non-nil indicates that this tag is
+;;   followed by an identifier like in "@param <var-name> description"
+;;   or "@exception <class-name> description".
+;;
+;; - `with-ref' (optional) if non-nil indicates that the tag is
+;;   followed by a reference like in "@see <reference>".
+
+%keyword _AUTHOR      "@author"
+%put     _AUTHOR      javadoc (seq 1 usage (type))
+%keyword _VERSION     "@version"
+%put     _VERSION     javadoc (seq 2 usage (type)) 
+%keyword _PARAM       "@param"
+%put     _PARAM       javadoc (seq 3 usage (function) with-name t) 
+%keyword _RETURN      "@return"
+%put     _RETURN      javadoc (seq 4 usage (function)) 
+%keyword _EXCEPTION   "@exception"
+%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t) 
+%keyword _THROWS      "@throws"
+%put     _THROWS      javadoc (seq 6 usage (function) with-name t) 
+%keyword _SEE         "@see"
+%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t) 
+%keyword _SINCE       "@since"
+%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t) 
+%keyword _SERIAL      "@serial"
+%put     _SERIAL      javadoc (seq 9 usage (variable) opt t) 
+%keyword _SERIALDATA  "@serialData"
+%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t) 
+%keyword _SERIALFIELD "@serialField"
+%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t) 
+%keyword _DEPRECATED  "@deprecated"
+%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t) 
+
+%%
+
+;; ------------
+;; LALR Grammar
+;; ------------
+
+;; This grammar is not designed to fully parse correct Java syntax.  It
+;; is optimized to work in an interactive environment to extract tokens
+;; (tags) needed by Semantic.  In some cases a syntax not allowed by
+;; the Java Language Specification will be accepted by this grammar.
+
+compilation_unit
+  : package_declaration
+  | import_declaration
+  | type_declaration
+  ;
+
+;;; Package statement token
+;; ("NAME" package DETAIL "DOCSTRING")
+package_declaration
+  : PACKAGE qualified_name SEMICOLON
+    (PACKAGE-TAG $2 nil)
+  ;
+
+;;; Include file token
+;; ("FILE" include SYSTEM "DOCSTRING") 
+import_declaration
+  : IMPORT qualified_name SEMICOLON
+    (INCLUDE-TAG $2 nil)
+  | IMPORT qualified_name DOT MULT SEMICOLON
+    (INCLUDE-TAG (concat $2 $3 $4) nil)
+  ;
+
+type_declaration
+  : SEMICOLON
+    ()
+  | class_declaration
+  | interface_declaration
+  ;
+
+;;; Type Declaration token
+;; ("NAME" type "TYPE" ( PART-LIST ) ( PARENTS ) EXTRA-SPEC "DOCSTRING")
+class_declaration
+  : modifiers_opt CLASS qualified_name superc_opt interfaces_opt class_body
+    (TYPE-TAG $3 $2 $6 (if (or $4 $5) (cons $4 $5)) :typemodifiers $1)
+  ;
+
+superc_opt
+  : ;;EMPTY
+  | EXTENDS qualified_name
+    (identity $2)
+  ;
+
+interfaces_opt
+  : ;;EMPTY
+  | IMPLEMENTS qualified_name_list
+    (nreverse $2)
+  ;
+
+class_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 class_member_declaration)
+  ;
+
+class_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | block
+    ()
+  | static_initializer
+    ()
+  | constructor_declaration
+  | interface_declaration
+  | class_declaration
+  | method_declaration
+  | field_declaration
+  ;
+
+;;; Type Declaration token
+;; ("NAME" type "TYPE" ( PART-LIST ) ( PARENTS ) EXTRA-SPEC "DOCSTRING")
+interface_declaration
+  : modifiers_opt INTERFACE IDENTIFIER extends_interfaces_opt interface_body
+    (TYPE-TAG $3 $2 $5 (if $4 (cons nil $4)) :typemodifiers $1)
+  ;
+
+extends_interfaces_opt
+  : ;;EMPTY
+  | EXTENDS qualified_name_list
+    (identity $2)
+  ;
+
+interface_body
+  : BRACE_BLOCK
+    (EXPANDFULL $1 interface_member_declaration)
+  ;
+
+interface_member_declaration
+  : LBRACE
+    ()
+  | RBRACE
+    ()
+  | interface_declaration
+  | class_declaration
+  | method_declaration
+  | field_declaration
+  ;
+
+static_initializer
+  : STATIC block
+  ;
+
+;;; Function token
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+constructor_declaration
+  : modifiers_opt constructor_declarator throwsc_opt constructor_body
+    (FUNCTION-TAG (car $2) nil (cdr $2)
+                  :typemodifiers $1
+                  :throws $3
+                  :constructor-flag t)
+  ;
+
+constructor_declarator
+  : IDENTIFIER formal_parameter_list
+    (cons $1 $2)
+  ;
+
+constructor_body
+  : block 
+  ;
+
+;;; Function token
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+method_declaration
+  : modifiers_opt VOID method_declarator throwsc_opt method_body
+    (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)
+  | modifiers_opt type method_declarator throwsc_opt method_body
+    (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)
+  ;
+
+method_declarator
+  : IDENTIFIER formal_parameter_list dims_opt
+    (cons (concat $1 $3) $2)
+  ;
+
+throwsc_opt
+  : ;;EMPTY
+  | THROWS qualified_name_list
+    (nreverse $2)
+  ;
+
+qualified_name_list
+  : qualified_name_list COMMA qualified_name
+    (cons $3 $1)
+  | qualified_name
+    (list $1)
+  ;
+
+method_body
+  : SEMICOLON
+  | block
+  ;
+
+;; Just eat {...} block!
+block
+  : BRACE_BLOCK
+  ;
+
+formal_parameter_list
+  : PAREN_BLOCK
+    (EXPANDFULL $1 formal_parameters)
+  ;
+
+formal_parameters
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | formal_parameter COMMA
+  | formal_parameter RPAREN
+  ;
+
+;;; Variable token
+;; ("NAME" variable "TYPE" DEFAULT-VALUE EXTRA-SPEC "DOCSTRING")
+formal_parameter
+  : formal_parameter_modifier_opt type variable_declarator_id
+    (VARIABLE-TAG $3 $2 nil :typemodifiers $1)
+  ;
+
+formal_parameter_modifier_opt
+  : ;;EMPTY
+  | FINAL
+    (list $1)
+  ;
+
+;;; Variable token
+;; ("NAME" variable "TYPE" DEFAULT-VALUE EXTRA-SPEC "DOCSTRING")
+field_declaration
+  : modifiers_opt type variable_declarators SEMICOLON
+    (VARIABLE-TAG $3 $2 nil :typemodifiers $1)
+  ;
+
+variable_declarators
+  : variable_declarators COMMA variable_declarator
+    (progn
+      ;; Set the end of the compound declaration to the end of the
+      ;; COMMA delimiter.
+      (setcdr (cdr (car $1)) (cdr $region2))
+      (cons $3 $1))
+  | variable_declarator
+    (list $1)
+  ;
+
+variable_declarator
+  : variable_declarator_id EQ variable_initializer
+    (cons $1 $region)
+  | variable_declarator_id
+    (cons $1 $region)
+  ;
+
+variable_declarator_id
+  : IDENTIFIER dims_opt
+    (concat $1 $2)
+  ;
+
+variable_initializer
+  : expression
+  ;
+
+;; Just eat expression!
+expression
+  : expression term
+  | term
+  ;
+
+term
+  : literal
+  | operator
+  | primitive_type
+  | IDENTIFIER
+  | BRACK_BLOCK
+  | PAREN_BLOCK
+  | BRACE_BLOCK
+  | NEW
+  | CLASS
+  | THIS
+  | SUPER
+  ;
+
+literal
+;;   : NULL_LITERAL
+;;   | BOOLEAN_LITERAL
+  : STRING_LITERAL
+  | NUMBER_LITERAL
+  ;
+
+operator
+  : NOT
+  | PLUS
+  | PLUSPLUS
+  | MINUS
+  | MINUSMINUS
+  | NOTEQ
+  | MOD
+  | MODEQ
+  | AND
+  | ANDAND
+  | ANDEQ
+  | MULT
+  | MULTEQ
+  | PLUSEQ
+  | MINUSEQ
+  | DOT
+  | DIV
+  | DIVEQ
+  | COLON
+  | LT
+  | LSHIFT
+  | LSHIFTEQ
+  | LTEQ
+  | EQ
+  | EQEQ
+  | GT
+  | GTEQ
+  | RSHIFT
+  | RSHIFTEQ
+  | URSHIFT
+  | URSHIFTEQ
+  | QUESTION
+  | XOR
+  | XOREQ
+  | OR
+  | OREQ
+  | OROR
+  | COMP
+  | INSTANCEOF
+  ;
+
+primitive_type
+  : BOOLEAN
+  | CHAR
+  | LONG
+  | INT
+  | SHORT
+  | BYTE
+  | DOUBLE
+  | FLOAT
+  ;
+
+modifiers_opt
+  : ;;EMPTY
+  | modifiers
+    (nreverse $1)
+  ;
+
+modifiers
+  : modifiers modifier
+    (cons $2 $1)
+  | modifier
+    (list $1)
+  ;
+
+modifier
+  : STRICTFP
+  | VOLATILE
+  | TRANSIENT
+  | SYNCHRONIZED
+  | NATIVE
+  | FINAL
+  | ABSTRACT
+  | STATIC
+  | PRIVATE
+  | PROTECTED
+  | PUBLIC
+  ;
+
+type
+  : qualified_name dims_opt
+    (concat $1 $2)
+  | primitive_type dims_opt
+    (concat $1 $2)
+  ;
+
+qualified_name
+  : qualified_name DOT IDENTIFIER
+    (concat $1 $2 $3)
+  | IDENTIFIER
+  ;
+
+dims_opt
+  : ;;EMPTY
+    (identity "")
+  | dims
+  ;
+
+dims
+  : dims BRACK_BLOCK
+    (concat $1 "[]")
+  | BRACK_BLOCK
+    (identity "[]")
+  ;
+
+%%
+;; Define the lexer for this grammar
+(define-lex wisent-java-tags-lexer
+  "Lexical analyzer that handles Java buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  ;;;; Auto-generated analyzers.
+  wisent-java-tags-wy--<number>-regexp-analyzer
+  wisent-java-tags-wy--<string>-sexp-analyzer
+  ;; Must detect keywords before other symbols
+  wisent-java-tags-wy--<keyword>-keyword-analyzer
+  wisent-java-tags-wy--<symbol>-regexp-analyzer
+  wisent-java-tags-wy--<punctuation>-string-analyzer
+  wisent-java-tags-wy--<block>-block-analyzer
+  ;; In theory, unicode chars should be turned into normal chars
+  ;; and then combined into regular ascii keywords and text.  This
+  ;; analyzer just keeps these things from making the lexer go boom.
+  wisent-java-tags-wy--<unicode>-regexp-analyzer
+  ;;;;
+  semantic-lex-default-action)
+
+;;; wisent-java-tags.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-java-wy.el
new file mode 100644
index 0000000..664a9dc
Binary files /dev/null and b/site/cedet-1.0pre7/semantic/wisent/wisent-java-wy.el differ
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java.el b/site/cedet-1.0pre7/semantic/wisent/wisent-java.el
new file mode 100644
index 0000000..5b1ee58
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-java.el
@@ -0,0 +1,119 @@
+;;; wisent-java.el --- Java LALR parser for Emacs
+
+;; Copyright (C) 2009 Eric M. Ludlam
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 19 June 2001
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-java.el,v 1.51 2009/09/11 18:52:16 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'semantic-wisent)
+(require 'wisent-java-wy)
+(require 'semantic-java)
+(eval-when-compile
+  (require 'semantic-util)
+  (require 'semantic-ctxt)
+  (require 'semantic-imenu)
+  (require 'senator))
+
+;;; Enable Semantic in `java-mode'.
+;;
+(defun wisent-java-init-parser-context ()
+  "Initialize context of the LR parser engine.
+Used as a local `wisent-pre-parse-hook' to cleanup the stack of enum
+names in scope."
+  (setq wisent-java-wy--enums nil))
+
+(defun wisent-java-default-setup ()
+  "Hook run to setup Semantic in `java-mode'."
+  ;; Use the Wisent LALR(1) parser to analyze Java sources.
+  (wisent-java-wy--install-parser)
+  (semantic-make-local-hook 'wisent-pre-parse-hook)
+  (add-hook 'wisent-pre-parse-hook
+            'wisent-java-init-parser-context nil t)
+  (setq
+   ;; Lexical analysis
+   semantic-lex-number-expression semantic-java-number-regexp
+   semantic-lex-depth nil
+   semantic-lex-analyzer 'wisent-java-lexer
+   ;; Parsing
+   semantic-tag-expand-function 'semantic-java-expand-tag
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-prototype
+   semantic-imenu-expandable-tag-classes '(type variable)
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ";"
+   ;; speedbar and imenu buckets name
+   semantic-symbol->name-assoc-list-for-type-parts
+   ;; in type parts
+   '((type     . "Classes")
+     (variable . "Variables")
+     (function . "Methods"))
+   semantic-symbol->name-assoc-list
+   ;; everywhere
+   (append semantic-symbol->name-assoc-list-for-type-parts
+           '((include  . "Imports")
+             (package  . "Package")))
+   ;; navigation inside 'type children
+   senator-step-at-tag-classes '(function variable)
+   )
+  ;; Setup javadoc stuff
+  (semantic-java-doc-setup))
+
+(add-hook 'java-mode-hook 'wisent-java-default-setup)
+
+;;; Overridden Semantic API.
+;;
+(define-mode-local-override semantic-tag-components java-mode (tag)
+  "Return a list of components for TAG."
+  (if (semantic-tag-of-class-p tag 'function)
+      (semantic-tag-function-arguments tag)
+    ;; Simply return the value of the :members attribute.
+    (semantic-tag-get-attribute tag :members)))
+
+(define-mode-local-override semantic-get-local-variables
+  java-mode ()
+  "Get local variable declarations from the current context."
+  (let (result
+        ;; Ignore funny syntax while doing this.
+        semantic-unmatched-syntax-hook)
+    (while (not (semantic-up-context (point) 'function))
+      (save-excursion
+        (forward-char 1)
+        (push (semantic-parse-region
+               (point)
+               (save-excursion (semantic-end-of-context) (point))
+               ;; See this production in wisent-java.wy.
+               'block_statement
+               nil t)
+              result)))
+    (apply 'append result)))
+
+(provide 'wisent-java)
+
+;;; wisent-java.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-java.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-java.wy
new file mode 100644
index 0000000..f6cddb3
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-java.wy
@@ -0,0 +1,2151 @@
+;;; wisent-java.wy -- LALR grammar for Java
+;;
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 David Ponce
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 19 Feb 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-java.wy,v 1.29 2006/05/31 12:49:05 ponced Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;; This grammar fully parses correct Java 1.5 syntax.
+;;
+;; It is based on the GPLed CUP Grammar for Java version 1.5, plus:
+;;
+;;   - JSR-175 "Program Annotation Facility" productions.
+;;   - Additional rules to extract tags needed by Semantic.
+;;   - Error recovery rules to work as safely as possible in an
+;;     interactive environment.
+;;
+;; The CUP parser home page is at
+;; <http://www.cs.princeton.edu/~appel/modern/java/CUP/>.
+;;
+;; TODO:
+;;  - Finalize production of tags from inside `block_statements'.
+;;  - Finalize production of `:template-specifier' attribute according
+;;    to what is done in the C grammar.
+;;  - Finalize production of tags from annotations?
+;;  - Review error recovery rules.
+;;
+
+%{
+  ;; Stack of enum names in scope.
+  (defvar wisent-java-wy--enums nil)
+  ;; Stack of anonymous class declarations found in an expression.
+  (defvar wisent-java-wy--anons nil)
+  }
+
+%package wisent-java-wy
+
+%languagemode java-mode
+
+;; The default goal.
+%start goal
+;; Alternate goals needed for re-parse.
+%start package_declaration
+%start import_declaration
+%start class_declaration
+%start enum_declaration
+%start enum_constant
+%start field_declaration
+%start method_declaration
+%start formal_parameter
+%start constructor_declaration
+%start interface_declaration
+%start abstract_method_declaration
+;; Re-parse inside blocks (not yet finished).
+%start block_statements
+%start local_variable_declaration
+;; Goal used for `semantic-get-local-variables'.
+%start block_statement
+
+;; -----------------------------
+;; Block & Parenthesis terminals
+;; -----------------------------
+%type  <block>       ;;syntax "\\s(\\|\\s)" matchdatatype block
+
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <block>       BRACK_BLOCK "(LBRACK RBRACK)"
+
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+%token <open-paren>  LBRACK      "["
+%token <close-paren> RBRACK      "]"
+
+;; ------------------
+;; Operator terminals
+;; ------------------
+%type  <punctuation> ;;syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+
+%token <punctuation> NOT         "!"
+%token <punctuation> NOTEQ       "!="
+%token <punctuation> MOD         "%"
+%token <punctuation> MODEQ       "%="
+%token <punctuation> AND         "&"
+%token <punctuation> ANDAND      "&&"
+%token <punctuation> ANDEQ       "&="
+%token <punctuation> MULT        "*"
+%token <punctuation> MULTEQ      "*="
+%token <punctuation> PLUS        "+"
+%token <punctuation> PLUSPLUS    "++"
+%token <punctuation> PLUSEQ      "+="
+%token <punctuation> COMMA       ","
+%token <punctuation> MINUS       "-"
+%token <punctuation> MINUSMINUS  "--"
+%token <punctuation> MINUSEQ     "-="
+%token <punctuation> DOT         "."
+%token <punctuation> DIV         "/"
+%token <punctuation> DIVEQ       "/="
+%token <punctuation> COLON       ":"
+%token <punctuation> SEMICOLON   ";"
+%token <punctuation> LT          "<"
+%token <punctuation> LSHIFT      "<<"
+%token <punctuation> LSHIFTEQ    "<<="
+%token <punctuation> LTEQ        "<="
+%token <punctuation> EQ          "="
+%token <punctuation> EQEQ        "=="
+%token <punctuation> GT          ">"
+%token <punctuation> GTEQ        ">="
+%token <punctuation> RSHIFT      ">>"
+%token <punctuation> RSHIFTEQ    ">>="
+%token <punctuation> URSHIFT     ">>>"
+%token <punctuation> URSHIFTEQ   ">>>="
+%token <punctuation> QUESTION    "?"
+%token <punctuation> XOR         "^"
+%token <punctuation> XOREQ       "^="
+%token <punctuation> OR          "|"
+%token <punctuation> OREQ        "|="
+%token <punctuation> OROR        "||"
+%token <punctuation> COMP        "~"
+%token <punctuation> ELLIPSIS    "..."
+%token <punctuation> AT          "@"
+
+;; -----------------
+;; Literal terminals
+;; -----------------
+%type  <symbol>      ;;syntax "\\(\\sw\\|\\s_\\)+"
+%token <symbol>      NULL_LITERAL    "\\`null\\'"
+%token <symbol>      BOOLEAN_LITERAL "\\`false\\'"
+%token <symbol>      BOOLEAN_LITERAL "\\`true\\'"
+%token <symbol>      IDENTIFIER
+
+%type  <string>      ;;syntax "\\s\"" matchdatatype sexp
+%token <string>      STRING_LITERAL
+
+%type  <number>      ;;syntax semantic-lex-number-expression
+%token <number>      NUMBER_LITERAL
+
+;; -----------------
+;; Keyword terminals
+;; -----------------
+;; Generate a keyword analyzer
+%type  <keyword> ;;syntax "\\(\\sw\\|\\s_\\)+" matchdatatype keyword
+
+%keyword ABSTRACT     "abstract"
+%put     ABSTRACT summary
+"Class|Method declaration modifier: abstract {class|<type>} <name> ..."
+
+%keyword ASSERT       "assert"
+%put     ASSERT summary
+"Assertion statement: assert <expr> [,<expr> ...];"
+
+%keyword BOOLEAN      "boolean"
+%put     BOOLEAN summary
+"Primitive logical quantity type (true or false)"
+
+%keyword BREAK        "break"
+%put     BREAK summary
+"break [<label>] ;"
+
+%keyword BYTE         "byte"
+%put     BYTE summary
+"Integral primitive type (-128 to 127)"
+
+%keyword CASE         "case"
+%put     CASE summary
+"switch(<expr>) {case <const-expr>: <stmts> ... }"
+
+%keyword CATCH        "catch"
+%put     CATCH summary
+"try {<stmts>} catch(<parm>) {<stmts>} ... "
+
+%keyword CHAR         "char"
+%put     CHAR summary
+"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+
+%keyword CLASS        "class"
+%put     CLASS summary
+"Class declaration: class <name>"
+
+%keyword CONST        "const"
+%put     CONST summary
+"Unused reserved word"
+
+%keyword CONTINUE     "continue"
+%put     CONTINUE summary
+"continue [<label>] ;"
+
+%keyword DEFAULT      "default"
+%put     DEFAULT summary
+"switch(<expr>) { ... default: <stmts>}"
+
+%keyword DO           "do"
+%put     DO summary
+"do <stmt> while (<expr>);"
+
+%keyword DOUBLE       "double"
+%put     DOUBLE summary
+"Primitive floating-point type (double-precision 64-bit IEEE 754)"
+
+%keyword ELSE         "else"
+%put     ELSE summary
+"if (<expr>) <stmt> else <stmt>"
+
+%keyword ENUM         "enum"
+%put     ENUM summary
+"Enum declaration"
+
+%keyword EXTENDS      "extends"
+%put     EXTENDS summary
+"SuperClass|SuperInterfaces declaration: extends <name> [, ...]"
+
+%keyword FINAL        "final"
+%put     FINAL summary
+"Class|Member declaration modifier: final {class|<type>} <name> ..."
+
+%keyword FINALLY      "finally"
+%put     FINALLY summary
+"try {<stmts>} ... finally {<stmts>}"
+
+%keyword FLOAT        "float"
+%put     FLOAT summary
+"Primitive floating-point type (single-precision 32-bit IEEE 754)"
+
+%keyword FOR          "for"
+%put     FOR summary
+"for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>"
+
+%keyword GOTO         "goto"
+%put     GOTO summary
+"Unused reserved word"
+
+%keyword IF           "if"
+%put     IF summary
+"if (<expr>) <stmt> [else <stmt>]"
+
+%keyword IMPLEMENTS   "implements"
+%put     IMPLEMENTS summary
+"Class SuperInterfaces declaration: implements <name> [, ...]"
+
+%keyword IMPORT       "import"
+%put     IMPORT summary
+"Import package declarations: import <package>"
+
+%keyword INSTANCEOF   "instanceof"
+
+%keyword INT          "int"
+%put     INT summary
+"Integral primitive type (-2147483648 to 2147483647)"
+
+%keyword INTERFACE    "interface"
+%put     INTERFACE summary
+"Interface declaration: interface <name>"
+
+%keyword LONG         "long"
+%put     LONG summary
+"Integral primitive type (-9223372036854775808 to 9223372036854775807)"
+
+%keyword NATIVE       "native"
+%put     NATIVE summary
+"Method declaration modifier: native <type> <name> ..."
+
+%keyword NEW          "new"
+
+%keyword PACKAGE      "package"
+%put     PACKAGE summary
+"Package declaration: package <name>"
+
+%keyword PRIVATE      "private"
+%put     PRIVATE summary
+"Access level modifier: private {class|interface|<type>} <name> ..."
+
+%keyword PROTECTED    "protected"
+%put     PROTECTED summary
+"Access level modifier: protected {class|interface|<type>} <name> ..."
+
+%keyword PUBLIC       "public"
+%put     PUBLIC summary
+"Access level modifier: public {class|interface|<type>} <name> ..."
+
+%keyword RETURN       "return"
+%put     RETURN summary
+"return [<expr>] ;"
+
+%keyword SHORT        "short"
+%put     SHORT summary
+"Integral primitive type (-32768 to 32767)"
+
+%keyword STATIC       "static"
+%put     STATIC summary
+"Declaration modifier: static {class|interface|<type>} <name> ..."
+
+%keyword STRICTFP     "strictfp"
+%put     STRICTFP summary
+"Declaration modifier: strictfp {class|interface|<type>} <name> ..."
+
+%keyword SUPER        "super"
+
+%keyword SWITCH       "switch"
+%put     SWITCH summary
+"switch(<expr>) {[case <const-expr>: <stmts> ...] [default: <stmts>]}"
+
+%keyword SYNCHRONIZED "synchronized"
+%put     SYNCHRONIZED summary
+"synchronized (<expr>) ... | Method decl. modifier: synchronized <type> <name> ..."
+
+%keyword THIS         "this"
+
+%keyword THROW        "throw"
+%put     THROW summary
+"throw <expr> ;"
+
+%keyword THROWS       "throws"
+%put     THROWS summary
+"Method|Constructor declaration: throws <classType>, ..."
+
+%keyword TRANSIENT    "transient"
+%put     TRANSIENT summary
+"Field declaration modifier: transient <type> <name> ..."
+
+%keyword TRY          "try"
+%put     TRY summary
+"try {<stmts>} [catch(<parm>) {<stmts>} ...] [finally {<stmts>}]"
+
+%keyword VOID         "void"
+%put     VOID summary
+"Method return type: void <name> ..."
+
+%keyword VOLATILE     "volatile"
+%put     VOLATILE summary
+"Field declaration modifier: volatile <type> <name> ..."
+
+%keyword WHILE        "while"
+%put     WHILE summary
+"while (<expr>) <stmt> | do <stmt> while (<expr>);"
+  
+;; --------------------------
+;; Official javadoc line tags
+;; --------------------------
+
+;; Javadoc tags are identified by a `javadoc' keyword property.  The
+;; value of this property must be itself a property list where the
+;; following properties are recognized:
+;;
+;; - `seq' (mandatory) is the tag sequence number used to check if
+;;   tags are correctly ordered in a javadoc comment block.
+;;
+;; - `usage' (mandatory) is the list of tag classes for which this
+;;   documentation tag is allowed.
+;;
+;; - `opt' (optional) if non-nil indicates this is an optional tag.
+;;   By default tags are mandatory.
+;;
+;; - `with-name' (optional) if non-nil indicates that this tag is
+;;   followed by an identifier like in "@param <var-name> description"
+;;   or "@exception <class-name> description".
+;;
+;; - `with-ref' (optional) if non-nil indicates that the tag is
+;;   followed by a reference like in "@see <reference>".
+
+%keyword _AUTHOR      "@author"
+%put     _AUTHOR      javadoc (seq 1 usage (type))
+%keyword _VERSION     "@version"
+%put     _VERSION     javadoc (seq 2 usage (type)) 
+%keyword _PARAM       "@param"
+%put     _PARAM       javadoc (seq 3 usage (function) with-name t) 
+%keyword _RETURN      "@return"
+%put     _RETURN      javadoc (seq 4 usage (function)) 
+%keyword _EXCEPTION   "@exception"
+%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t) 
+%keyword _THROWS      "@throws"
+%put     _THROWS      javadoc (seq 6 usage (function) with-name t) 
+%keyword _SEE         "@see"
+%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t) 
+%keyword _SINCE       "@since"
+%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t) 
+%keyword _SERIAL      "@serial"
+%put     _SERIAL      javadoc (seq 9 usage (variable) opt t) 
+%keyword _SERIALDATA  "@serialData"
+%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t) 
+%keyword _SERIALFIELD "@serialField"
+%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t) 
+%keyword _DEPRECATED  "@deprecated"
+%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t) 
+
+%%
+
+;; ------------
+;; LALR Grammar
+;; ------------
+
+goal
+  : compilation_unit
+  ;
+
+;;; 19.3) Lexical Structure.
+;;
+literal
+  : NUMBER_LITERAL
+  | BOOLEAN_LITERAL
+  | STRING_LITERAL
+  | NULL_LITERAL
+  ;
+
+;;; 19.4) Types, Values, and Variables
+;;
+type
+  : primitive_type
+  | reference_type
+  ;
+
+primitive_type
+  : numeric_type
+  | BOOLEAN
+  ;
+
+numeric_type
+  : integral_type
+  | floating_point_type
+  ;
+
+integral_type
+  : BYTE 
+  | SHORT 
+  | INT 
+  | LONG 
+  | CHAR 
+  ;
+
+floating_point_type
+  : FLOAT 
+  | DOUBLE
+  ;
+
+reference_type
+  : class_or_interface_type
+ ;; Must check whether this is a class name or a type variable.
+  | array_type
+  ;
+
+type_variable
+  : IDENTIFIER
+  ;
+
+class_or_interface
+  : name
+  | class_or_interface LT type_argument_list_1 DOT name
+    (concat $1 $2 $3 $4 $5)
+  ;
+
+class_or_interface_type
+  : class_or_interface
+  | class_or_interface LT type_argument_list_1
+    (concat $1 $2 $3)
+  ;
+
+class_type
+  : class_or_interface_type
+  ;
+
+interface_type
+  : class_or_interface_type
+  ;		
+
+array_type
+  : primitive_type dims
+    (concat $1 $2)
+  | name dims
+    (concat $1 $2)
+  | class_or_interface LT type_argument_list_1 DOT name dims
+    (concat $1 $2 $3 $4 $5 $6)
+  | class_or_interface LT type_argument_list_1 dims
+    (concat $1 $2 $3 $4)
+  ;
+
+type_arguments_opt
+  : type_arguments
+  | ;;EMPTY
+    (progn "")
+  ;
+
+type_arguments
+  : LT type_argument_list_1
+    (concat $1 $2)
+  ;
+
+wildcard
+  : QUESTION
+  | QUESTION EXTENDS reference_type
+    (concat $1 " " $2 " " $3)
+  | QUESTION SUPER reference_type
+    (concat $1 " " $2 " " $3)
+  ;
+
+wildcard_1
+  : QUESTION GT
+    (concat $1 $2)
+  | QUESTION EXTENDS reference_type_1
+    (concat $1 " " $2 " " $3)
+  | QUESTION SUPER reference_type_1
+    (concat $1 " " $2 " " $3)
+  ;
+
+wildcard_2
+  : QUESTION RSHIFT
+    (concat $1 $2)
+  | QUESTION EXTENDS reference_type_2
+    (concat $1 " " $2 " " $3)
+  | QUESTION SUPER reference_type_2
+    (concat $1 " " $2 " " $3)
+  ;
+
+wildcard_3
+  : QUESTION URSHIFT
+    (concat $1 $2)
+  | QUESTION EXTENDS reference_type_3
+    (concat $1 " " $2 " " $3)
+  | QUESTION SUPER reference_type_3
+    (concat $1 " " $2 " " $3)
+  ;
+
+reference_type_1
+  : reference_type GT
+    (concat $1 $2)
+  | class_or_interface LT type_argument_list_2
+    (concat $1 $2 $3)
+  ;
+
+reference_type_2
+  : reference_type RSHIFT
+    (concat $1 $2)
+  | class_or_interface LT type_argument_list_3
+    (concat $1 $2 $3)
+  ;
+
+reference_type_3
+  : reference_type URSHIFT
+    (concat $1 $2)
+  ;
+
+type_argument_list
+  : type_argument
+  | type_argument_list COMMA type_argument
+    (concat $1 $2 $3)
+  ;
+
+type_argument_list_1
+  : type_argument_1
+  | type_argument_list COMMA type_argument_1
+    (concat $1 $2 $3)
+  ;
+
+type_argument_list_2
+  : type_argument_2
+  | type_argument_list COMMA type_argument_2
+    (concat $1 $2 $3)
+  ;
+
+type_argument_list_3
+  : type_argument_3
+  | type_argument_list COMMA type_argument_3
+    (concat $1 $2 $3)
+  ;
+
+type_argument
+  : reference_type
+  | wildcard
+  ;
+
+type_argument_1
+  : reference_type_1
+  | wildcard_1
+  ;
+
+type_argument_2
+  : reference_type_2
+  | wildcard_2
+  ;
+
+type_argument_3
+  : reference_type_3
+  | wildcard_3
+  ;
+
+;;; 19.5) Names
+;;
+name
+  : simple_name
+  | qualified_name
+  ;
+
+simple_name
+  : IDENTIFIER
+  ;
+
+qualified_name
+  : name DOT IDENTIFIER
+    (concat $1 $2 $3)
+  ;
+
+;;; 19.6) Packages
+;;
+
+;; compilation_unit
+;;   package_declarations_opt
+;;   import_declarations_opt
+;;   type_declarations_opt
+;;
+;; Rewritten to benefit from the Semantic's iterative parser backend.
+;; Must check for order of package, import, and type declarations.
+compilation_unit
+  : package_declaration
+  | import_declaration
+  | type_declaration
+  ;
+
+package_declaration
+  : modifiers_opt PACKAGE name SEMICOLON
+    (EXPANDTAG
+     (PACKAGE-TAG $3 nil :typemodifiers $1)
+     )
+  ;
+
+;; Import_Declaration
+;;     SingleTypeImportDeclaration
+;;     TypeImportOnDemandDeclaration
+;;     StaticSingleTypeImportDeclaration
+;;     StaticTypeImportOnDemandDeclaration
+import_declaration
+  : IMPORT name SEMICOLON
+    (EXPANDTAG
+     (INCLUDE-TAG $2 nil)
+     )
+  | IMPORT name DOT MULT SEMICOLON
+    (EXPANDTAG
+     (INCLUDE-TAG (concat $2 $3 $4) nil)
+     )
+  | IMPORT STATIC name SEMICOLON
+    (EXPANDTAG
+     (INCLUDE-TAG $3 nil
+                  :static-flag t)
+     )
+  | IMPORT STATIC name DOT MULT SEMICOLON
+    (EXPANDTAG
+     (INCLUDE-TAG (concat $3 $4 $5) nil
+                  :static-flag t)
+     )
+  ;
+
+type_declaration
+  : class_declaration
+  | interface_declaration
+  | enum_declaration
+  | annotation_type_declaration
+    ()
+  | SEMICOLON
+    ()
+  ;
+
+;;; 19.7) Productions used only in the LALR(1) grammar
+;;
+modifiers_opt
+  : ;;EMPTY
+  | modifiers
+  ;
+
+modifiers
+  : modifier
+    (list $1)
+  | modifiers modifier
+    (append $1 (list $2))
+  ;
+
+modifier
+  : PUBLIC
+  | PROTECTED
+  | PRIVATE
+  | STATIC
+  | ABSTRACT
+  | FINAL
+  | NATIVE
+  | SYNCHRONIZED
+  | TRANSIENT
+  | VOLATILE
+  | STRICTFP
+  | annotation
+  ;
+
+;;; 19.8) Classes
+;;
+
+;;; 19.8.1) Class Declaration
+;;
+class_declaration
+  : modifiers_opt CLASS IDENTIFIER type_parameters_opt
+    super_opt interfaces_opt class_body
+    (EXPANDTAG
+     (TYPE-TAG $3 $2 $7 (if (or $5 $6) (cons $5 $6))
+               :typemodifiers $1
+               :template-specifier $4)
+     )
+  ;
+
+super
+  : EXTENDS class_type
+    (progn $2)
+  ;
+
+super_opt
+  : ;;EMPTY
+  | super
+  ;
+
+interfaces
+  : IMPLEMENTS interface_type_list
+    (progn $2)
+  ;
+
+interfaces_opt
+  : ;;EMPTY
+  | interfaces 
+    (nreverse $1)
+  ;
+
+interface_type_list
+  : interface_type
+    (list $1)
+  | interface_type_list COMMA interface_type
+    (cons $3 $1)
+  ;
+
+class_body
+  : LBRACE class_body_declarations_opt RBRACE 
+    (progn $2)
+  ;
+
+class_body_opt
+  : ;;EMPTY
+  | class_body
+  ;
+
+class_body_declarations_opt
+  : ;;EMPTY
+  | class_body_declarations
+    (apply 'nconc (nreverse $1))
+  ;
+
+class_body_declarations
+  : class_body_declaration
+    (list $1)
+  | class_body_declarations class_body_declaration
+    (cons $2 $1)
+  ;
+
+class_body_declaration
+  : class_member_declaration
+  | static_initializer
+  | constructor_declaration
+  | block
+  | error
+ ;; On error, skip token and try to continue.
+    (SKIP-TOKEN)
+  ;
+
+class_member_declaration
+  : field_declaration
+  | method_declaration
+  | class_declaration
+  | enum_declaration
+  | interface_declaration
+  | SEMICOLON
+    ()
+  ;
+
+;;; JSR-201) Enum Declaration
+;;
+enum_declaration
+  : modifiers_opt ENUM IDENTIFIER interfaces_opt
+ ;; Mid-rule action that stores the current enum name in scope for
+ ;; later use when producing tags from `enum_constants' compound
+ ;; declaration.
+    (push $3 wisent-java-wy--enums)
+    enum_body
+    (progn
+      ;; Don't forget to remove the current enum name when leaving the
+      ;; enum scope!  Should be error recovery safe.
+      (pop wisent-java-wy--enums)
+      (EXPANDTAG
+       (TYPE-TAG $3 $2 $6 (if $4 (cons nil $4))
+                 :typemodifiers $1))
+      )
+  ;
+
+enum_body
+  : LBRACE enum_constants_opt enum_body_declarations_opt RBRACE
+    (nconc $2 $3)
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+enum_constants_opt
+  : ;; EMPTY
+  | enum_constants
+    (apply 'nconc (nreverse $1))
+  ;
+
+enum_constants
+  : enum_constant
+    (list $1)
+  | enum_constants COMMA enum_constant
+    (cons $3 $1)
+  ;
+
+enum_constant
+  : IDENTIFIER enum_arguments_opt
+    (EXPANDTAG
+     (TYPE-TAG $1 (car wisent-java-wy--enums) nil nil
+               :enum-constant-flag t)
+     )
+  | IDENTIFIER enum_arguments_opt class_body
+    (EXPANDTAG
+     (TYPE-TAG $1 (car wisent-java-wy--enums) $3 nil
+               :enum-constant-flag t)
+     )
+  ;
+
+enum_arguments_opt
+  : ;;EMPTY
+  | LPAREN argument_list_opt RPAREN
+  | LPAREN error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+enum_body_declarations_opt
+  : ;;EMPTY
+  | SEMICOLON class_body_declarations_opt
+    (progn $2)
+  ;
+
+;;; 19.8.2) Field Declarations
+;;
+field_declaration
+  : modifiers_opt type variable_declarators SEMICOLON
+    (let* ((decls (mapcar 'car $3))
+           (anons (apply 'nconc (nreverse (mapcar 'cdr $3)))))
+      (EXPANDTAG
+       (VARIABLE-TAG decls $2 nil
+                     :typemodifiers $1
+                     :members anons)
+       ))
+  ;
+
+variable_declarators
+  : variable_declarator
+    (list $1)
+  | variable_declarators COMMA variable_declarator
+    (progn
+      ;; Set the end of the compound declaration to the end of the
+      ;; COMMA delimiter.
+      (setcdr (cdar (car $1)) (cdr $region2))
+      (cons $3 $1))
+  ;
+
+variable_declarator
+  : variable_declarator_id
+    (cons (cons $1 $region) nil)
+  | variable_declarator_id
+ ;; Clean-up the stack of anonymous class declarations
+    (setq wisent-java-wy--anons nil)
+    EQ variable_initializer
+    (cons (cons $1 $region) wisent-java-wy--anons)
+  ;
+
+variable_declarator_id
+  : IDENTIFIER
+  | variable_declarator_id LBRACK RBRACK
+    (concat $1 $2 $3)
+  ;
+
+variable_initializer
+  : expression
+  | array_initializer
+  ;
+
+;;; 19.8.3) Method Declarations
+;;
+method_declaration
+  : method_header method_body
+    (let ((tag (eval $1)))
+      ;; Don't store the :body attribute in function tag as this
+      ;; information is not (yet) used by Semantic.  This will save
+      ;; space in the DB.
+      ;;(semantic-tag-put-attribute tag :body $2)
+      (EXPANDTAG tag)
+      )
+  ;
+
+;; Have to expand `type_parameters_opt' here so that we don't force an
+;; early decision of whether this is a `field_declaration' or a
+;; `method_declaration' (the `type_parameters_opt' would have to be
+;; reduced when we see the `type' if this was a method declaration,
+;; but it might still turn out to be a field declaration).
+method_header
+  : modifiers_opt type method_declarator throws_opt
+    `(FUNCTION-TAG ',(car $3) ',$2 ',(cdr $3)
+                   :typemodifiers ',$1
+                   :throws ',$4)
+  | modifiers_opt LT type_parameter_list_1 type method_declarator throws_opt
+    `(FUNCTION-TAG ',(car $5) ',$4 ',(cdr $5)
+                   :typemodifiers ',$1
+                   :template-specifier ',(concat $2 $3)
+                   :throws ',$6)
+  | modifiers_opt VOID method_declarator throws_opt
+    `(FUNCTION-TAG ',(car $3) ',$2 ',(cdr $3)
+                   :typemodifiers ',$1
+                   :throws ',$4)
+  | modifiers_opt LT type_parameter_list_1 VOID method_declarator throws_opt
+    `(FUNCTION-TAG ',(car $5) ',$4 ',(cdr $5)
+                   :typemodifiers ',$1
+                   :template-specifier ',(concat $2 $3)
+                   :throws ',$6)
+  ;
+
+method_declarator
+  : IDENTIFIER LPAREN formal_parameter_list_opt RPAREN
+    (cons $1 $3)
+  | IDENTIFIER LPAREN error
+ ;; On error, skip current block and try to continue.
+    (prog1
+        (list $1)
+      (SKIP-BLOCK $2))
+  | method_declarator LBRACK RBRACK ;; deprecated
+ ;; The above production also allows `void foo() []'.
+    (cons (concat (car $1) $2 $3) (cdr $1))
+  ;
+
+formal_parameter_list_opt
+  : ;;EMPTY
+  | formal_parameter_list
+    (apply 'nconc (nreverse $1))
+  ;
+
+formal_parameter_list
+  : formal_parameter
+    (list $1)
+  | formal_parameter_list COMMA formal_parameter
+    (cons $3 $1)
+  ;
+
+formal_parameter
+  : type variable_declarator_id
+    (EXPANDTAG
+     (VARIABLE-TAG $2 $1 nil)
+     )
+  | modifiers type variable_declarator_id
+    (EXPANDTAG
+     (VARIABLE-TAG $3 $2 nil
+                   :typemodifiers $1)
+     )
+ ;; Productions below allow varargs in non-final positions.
+  | type ELLIPSIS IDENTIFIER
+    (EXPANDTAG
+     (VARIABLE-TAG $3 $1 nil
+                   :vararg-flag t)
+     )
+  | modifiers type ELLIPSIS IDENTIFIER
+    (EXPANDTAG
+     (VARIABLE-TAG $4 $2 nil
+                   :typemodifiers $1
+                   :vararg-flag t)
+     )
+  ;
+
+throws_opt
+  : ;;EMPTY
+  | throws
+  ;
+
+throws
+  : THROWS class_type_list
+    (nreverse $2)
+  ;
+
+class_type_list
+  : class_type
+    (list $1)
+  | class_type_list COMMA class_type
+    (cons $3 $1)
+  ;
+
+method_body
+  : block
+  | SEMICOLON
+    ()
+  ;
+
+;;; 19.8.4) Static Initializers
+;;
+static_initializer
+  : STATIC block
+    (when $2
+      (semantic-tag-put-attribute $2 :typemodifiers (list $1))
+      $2)
+  ;
+
+;;; 19.8.5) Constructor Declarations
+;;
+constructor_declaration
+  : modifiers_opt constructor_declarator throws_opt constructor_body
+    (EXPANDTAG
+     (FUNCTION-TAG (car $2) nil (cdr $2)
+                   :typemodifiers $1
+                   :throws $3
+                   :constructor-flag t
+                   ;; Don't store the :body attribute in function tag
+                   ;; as this information is not (yet) used by
+                   ;; Semantic.  This will save space in the DB.
+                   ;;:body $4
+                   ))
+  | modifiers_opt LT type_parameter_list_1 constructor_declarator
+    throws_opt constructor_body
+    (EXPANDTAG
+     (FUNCTION-TAG (car $4) nil (cdr $4)
+                   :typemodifiers $1
+                   :template-specifier (concat $2 $3)
+                   :throws $5
+                   :constructor-flag t
+                   ;; Don't store the :body attribute in function tag
+                   ;; as this information is not (yet) used by
+                   ;; Semantic.  This will save space in the DB.
+                   ;;:body $6
+                   ))
+  ;
+
+constructor_declarator
+  : simple_name LPAREN formal_parameter_list_opt RPAREN
+    (cons $1 $3)
+  | simple_name LPAREN error
+ ;; On error, skip current block and try to continue.
+    (prog1
+        (list $1)
+      (SKIP-BLOCK $2))
+  ;
+
+constructor_body
+  : LBRACE explicit_constructor_invocation block_statements RBRACE
+    (progn $3)
+  | LBRACE explicit_constructor_invocation RBRACE
+    ()
+  | LBRACE block_statements RBRACE
+    (progn $2)
+  | LBRACE RBRACE
+    ()
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+explicit_constructor_invocation
+  : THIS LPAREN argument_list_opt RPAREN SEMICOLON
+  | type_arguments THIS LPAREN argument_list_opt RPAREN SEMICOLON
+  | SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  | type_arguments SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  | primary DOT SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  | primary DOT type_arguments SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  | name DOT SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  | name DOT type_arguments SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+  ;
+
+;;; 19.9) Interfaces
+;;
+
+;;; 19.9.1) Interface Declarations
+;;
+interface_declaration
+  : modifiers_opt INTERFACE IDENTIFIER type_parameters_opt
+    extends_interfaces_opt interface_body
+    (EXPANDTAG
+     (TYPE-TAG $3 $2 $6 (if $5 (cons nil $5))
+               :template-specifier $4
+               :typemodifiers $1)
+     )
+  ;
+
+extends_interfaces_opt
+  : ;;EMPTY
+  | extends_interfaces
+    (nreverse $1)
+  ;
+
+extends_interfaces
+  : EXTENDS interface_type
+    (list $2)
+  | extends_interfaces COMMA interface_type
+    (cons $3 $1)
+  ;
+
+interface_body
+  : LBRACE interface_member_declarations_opt RBRACE
+    (progn $2)
+  ;
+
+interface_member_declarations_opt
+  : ;;EMPTY
+  | interface_member_declarations
+    (apply 'nconc (nreverse $1))
+  ;
+
+interface_member_declarations
+  : interface_member_declaration
+    (list $1)
+  | interface_member_declarations interface_member_declaration
+    (cons $2 $1)
+  ;
+
+interface_member_declaration
+  : constant_declaration
+  | abstract_method_declaration
+  | class_declaration
+  | enum_declaration
+  | interface_declaration
+  | SEMICOLON
+    ()
+  | error
+ ;; On error, skip token and try to continue.
+    (SKIP-TOKEN)
+  ;
+
+;; Must check that modifiers include only PUBLIC, STATIC, or FINAL.
+constant_declaration
+  : field_declaration
+  ;
+
+abstract_method_declaration
+  : method_header SEMICOLON
+    (let ((tag (eval $1)))
+      (EXPANDTAG tag)
+      )
+  ;
+
+;;; 19.10) Arrays
+;;
+array_initializer
+  : LBRACE variable_initializers COMMA RBRACE
+  | LBRACE variable_initializers RBRACE
+  | LBRACE COMMA RBRACE
+  | LBRACE RBRACE
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+variable_initializers
+  : variable_initializer
+  | variable_initializers COMMA variable_initializer
+  ;
+
+;;; 19.11) Blocks and Statements
+;;
+block
+  : LBRACE block_statements_opt RBRACE
+    (progn $2)
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+block_statements_opt
+  : ;;EMPTY
+  | block_statements
+  ;
+
+;; Use `block_statements_reverse' for TAG production.
+block_statements
+  : block_statements_reverse
+    (EXPANDTAG
+     (TAG "block" 'block
+          :members (apply 'nconc (nreverse $1)))
+     )
+  ;
+
+;; Renamed from original `block_statements' for TAG production.
+block_statements_reverse
+  : block_statement
+    (list $1)
+  | block_statements_reverse block_statement
+    (cons $2 $1)
+  ;
+
+;; This production is used for `semantic-get-local-variables'.
+block_statement
+  : local_variable_declaration_statement
+  | statement
+    () ;; TODO
+  | class_declaration
+  | enum_declaration
+  | interface_declaration
+  ;
+
+local_variable_declaration_statement
+  : local_variable_declaration SEMICOLON
+  ;
+
+local_variable_declaration
+  : type variable_declarators
+    (let* ((decls (mapcar 'car $2))
+           (anons (apply 'nconc (nreverse (mapcar 'cdr $2)))))
+      (EXPANDTAG
+       (VARIABLE-TAG decls $1 nil
+                     :members anons)
+       ))
+  | modifiers type variable_declarators
+    (let* ((decls (mapcar 'car $3))
+           (anons (apply 'nconc (nreverse (mapcar 'cdr $3)))))
+      (EXPANDTAG
+       (VARIABLE-TAG decls $2 nil
+                     :typemodifiers $1
+                     :members anons)
+       ))
+  ;
+
+statement
+  : statement_without_trailing_substatement
+  | labeled_statement
+  | if_then_statement
+  | if_then_else_statement
+  | while_statement
+  | for_statement
+  | foreach_statement
+  ;
+
+statement_no_short_if
+  : statement_without_trailing_substatement
+  | labeled_statement_no_short_if
+  | if_then_else_statement_no_short_if
+  | while_statement_no_short_if
+  | for_statement_no_short_if
+  | foreach_statement_no_short_if
+  ;
+
+statement_without_trailing_substatement
+  : block
+  | empty_statement
+  | expression_statement
+  | switch_statement
+  | do_statement
+  | break_statement
+  | continue_statement
+  | return_statement
+  | synchronized_statement
+  | throw_statement
+  | try_statement
+  | assert_statement
+  ;
+
+empty_statement
+  : SEMICOLON
+  ;
+
+labeled_statement
+  : IDENTIFIER COLON statement
+  ;
+
+labeled_statement_no_short_if
+  : IDENTIFIER COLON statement_no_short_if
+  ;
+
+expression_statement
+  : statement_expression SEMICOLON
+  ;
+
+statement_expression
+  : assignment
+  | preincrement_expression
+  | predecrement_expression
+  | postincrement_expression
+  | postdecrement_expression
+  | method_invocation
+  | class_instance_creation_expression
+  ;
+
+if_then_statement
+  : IF LPAREN expression RPAREN statement
+  ;
+
+if_then_else_statement
+  : IF LPAREN expression RPAREN statement_no_short_if 
+    ELSE statement
+  ;
+
+if_then_else_statement_no_short_if
+  : IF LPAREN expression RPAREN statement_no_short_if
+    ELSE statement_no_short_if
+  ;
+
+switch_statement
+  : SWITCH LPAREN expression RPAREN switch_block
+  ;
+
+switch_block
+  : LBRACE switch_block_statement_groups switch_labels RBRACE
+  | LBRACE switch_block_statement_groups RBRACE
+  | LBRACE switch_labels RBRACE
+  | LBRACE RBRACE
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+switch_block_statement_groups
+  : switch_block_statement_group
+  | switch_block_statement_groups switch_block_statement_group
+  ;
+
+switch_block_statement_group
+  : switch_labels block_statements
+  ;
+
+switch_labels
+  : switch_label
+  | switch_labels switch_label
+  ;
+
+switch_label
+  : CASE constant_expression COLON
+  | DEFAULT COLON
+  ;
+
+while_statement
+  : WHILE LPAREN expression RPAREN statement
+  ;
+
+while_statement_no_short_if
+  : WHILE LPAREN expression RPAREN statement_no_short_if
+  ;
+
+do_statement
+  : DO statement WHILE LPAREN expression RPAREN SEMICOLON
+  ;
+
+foreach_statement
+  : FOR LPAREN type variable_declarator_id
+    COLON expression RPAREN statement
+    () ;; TODO: local declaration
+  | FOR LPAREN modifiers type variable_declarator_id
+    COLON expression RPAREN statement
+    () ;; TODO: local declaration
+ ;; Must check that first IDENTIFIER is `each' and second one is `in'.
+  | FOR IDENTIFIER LPAREN type variable_declarator_id
+    IDENTIFIER expression RPAREN statement
+    () ;; TODO: local declaration
+ ;; Must check that first IDENTIFIER is `each' and second one is `in'.
+  | FOR IDENTIFIER LPAREN modifiers type variable_declarator_id
+    IDENTIFIER expression RPAREN statement
+    () ;; TODO: local declaration
+  ;
+
+foreach_statement_no_short_if
+  : FOR LPAREN type variable_declarator_id
+    COLON expression RPAREN statement_no_short_if
+    () ;; TODO: local declaration
+  | FOR LPAREN modifiers type variable_declarator_id
+    COLON expression RPAREN statement_no_short_if
+    () ;; TODO: local declaration
+ ;; Must check that first IDENTIFIER is `each' and second one is `in'.
+  | FOR IDENTIFIER LPAREN type variable_declarator_id
+    IDENTIFIER expression RPAREN statement_no_short_if
+    () ;; TODO: local declaration
+ ;; Must check that first IDENTIFIER is `each' and second one is `in'.
+  | FOR IDENTIFIER LPAREN modifiers type variable_declarator_id
+    IDENTIFIER expression RPAREN statement_no_short_if
+    () ;; TODO: local declaration
+  ;
+
+for_statement
+  : FOR LPAREN for_init_opt SEMICOLON expression_opt SEMICOLON
+    for_update_opt RPAREN statement
+    (progn $3) ;; Local declarations
+  ;
+
+for_statement_no_short_if
+  : FOR LPAREN for_init_opt SEMICOLON expression_opt SEMICOLON
+    for_update_opt RPAREN statement_no_short_if
+    (progn $3) ;; Local declarations
+  ;
+
+for_init_opt
+  : ;;EMPTY
+  | for_init
+  ;
+
+for_init
+  : statement_expression_list
+    ()
+  | local_variable_declaration
+  ;
+
+for_update_opt
+  : ;;EMPTY
+  | for_update
+  ;
+
+for_update
+  : statement_expression_list
+  ;
+
+statement_expression_list
+  : statement_expression
+  | statement_expression_list COMMA statement_expression
+  ;
+
+identifier_opt
+  : ;;EMPTY
+  | IDENTIFIER
+  ;
+
+break_statement
+  : BREAK identifier_opt SEMICOLON
+  ;
+
+continue_statement
+  : CONTINUE identifier_opt SEMICOLON
+  ;
+
+return_statement
+  : RETURN expression_opt SEMICOLON
+  ;
+
+throw_statement
+  : THROW expression SEMICOLON
+  ;
+
+synchronized_statement
+  : SYNCHRONIZED LPAREN expression RPAREN block
+  ;
+
+try_statement
+  : TRY block catches
+  | TRY block catches_opt finally
+  ;
+
+catches_opt
+  : ;;EMPTY
+  | catches
+  ;
+
+catches
+  : catch_clause
+  | catches catch_clause
+  ;
+
+catch_clause
+  : CATCH LPAREN formal_parameter RPAREN block
+  ;
+
+finally
+  : FINALLY block
+  ;
+
+assert_statement
+  : ASSERT expression SEMICOLON
+  | ASSERT expression COLON expression SEMICOLON
+  ;
+
+;;; 19.12) Expressions
+;;
+primary
+  : primary_no_new_array
+  | array_creation_init
+  | array_creation_uninit
+  ;
+
+primary_no_new_array
+  : literal
+  | THIS
+  | LPAREN name RPAREN
+  | LPAREN expression_no_name RPAREN
+  | class_instance_creation_expression
+  | field_access
+  | method_invocation
+  | array_access
+  | name DOT THIS
+  | VOID DOT CLASS
+ ;; "Type DOT CLASS", but expanded.
+  | primitive_type DOT CLASS
+  | primitive_type dims DOT CLASS
+  | name DOT CLASS
+  | name dims DOT CLASS
+ ;; The following two productions are part of the expansion of `type
+ ;; DOT CLASS' but are not actually allowed, as they involve params.
+ ;;  | class_or_interface type_arguments DOT name dims DOT CLASS
+ ;;  | class_or_interface LT type_argument_list_1 dims DOT CLASS
+  ;
+
+class_instance_creation_expression
+  : NEW class_or_interface_type
+    LPAREN argument_list_opt RPAREN class_body_opt
+    (when $6
+      (setq wisent-java-wy--anons
+            (nconc wisent-java-wy--anons
+                   (EXPANDTAG
+                    (TYPE-TAG (concat $2 "$") "class" $6 nil))))
+      )
+  | NEW type_arguments class_or_interface_type
+    LPAREN argument_list_opt RPAREN class_body_opt
+    (when $7
+      (setq wisent-java-wy--anons
+            (nconc wisent-java-wy--anons
+                   (EXPANDTAG
+                    (TYPE-TAG (concat $3 "$") "class" $7 nil))))
+      )
+  | primary DOT NEW type_arguments_opt IDENTIFIER type_arguments_opt
+    LPAREN argument_list_opt RPAREN class_body_opt
+    (when $10
+      (setq wisent-java-wy--anons
+            (nconc wisent-java-wy--anons
+                   (EXPANDTAG
+                    (TYPE-TAG (concat $5 "$") "class" $10 nil))))
+      )
+  | name DOT NEW type_arguments_opt IDENTIFIER type_arguments_opt
+    LPAREN argument_list_opt RPAREN class_body_opt
+    (when $10
+      (setq wisent-java-wy--anons
+            (nconc wisent-java-wy--anons
+                   (EXPANDTAG
+                    (TYPE-TAG (concat $5 "$") "class" $10 nil))))
+      )
+  ;
+
+argument_list_opt
+  : ;;EMPTY
+  | argument_list
+  ;
+
+argument_list
+  : expression
+  | argument_list COMMA expression
+  ;
+
+array_creation_uninit
+  : NEW primitive_type dim_exprs dims_opt
+  | NEW class_or_interface_type dim_exprs dims_opt
+  ;
+
+array_creation_init
+  : NEW primitive_type dims array_initializer
+  | NEW class_or_interface_type dims array_initializer
+  ;
+
+dim_exprs
+  : dim_expr
+  | dim_exprs dim_expr
+  ;
+
+dim_expr
+  : LBRACK expression RBRACK
+  | LBRACK error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+dims_opt
+  : ;;EMPTY
+    (progn "")
+  | dims
+  ;
+
+dims
+  : LBRACK RBRACK
+    (concat $1 $2)
+  | dims LBRACK RBRACK
+    (concat $1 $2 $3)
+  ;
+
+field_access
+  : primary DOT IDENTIFIER
+  | SUPER DOT IDENTIFIER
+  | name DOT SUPER DOT IDENTIFIER
+  ;
+
+method_invocation
+  : name LPAREN argument_list_opt RPAREN
+ ;; It looks that this production should be removed
+ ;; from the grammar:
+ ;;  | type_arguments name LPAREN argument_list_opt RPAREN
+ ;; It introduces ambiguities in the grammar for expressions like:
+ ;; `A((B)<C,D>E());', which could be either an invocation on E or two
+ ;; boolean comparisons.
+  | primary DOT IDENTIFIER LPAREN argument_list_opt RPAREN
+  | primary DOT type_arguments IDENTIFIER LPAREN argument_list_opt RPAREN
+  | name DOT type_arguments IDENTIFIER LPAREN argument_list_opt RPAREN
+  | SUPER DOT IDENTIFIER LPAREN argument_list_opt RPAREN
+  | SUPER DOT type_arguments IDENTIFIER LPAREN argument_list_opt RPAREN
+  | name DOT SUPER DOT IDENTIFIER LPAREN argument_list_opt RPAREN
+  | name DOT SUPER DOT type_arguments IDENTIFIER LPAREN argument_list_opt RPAREN
+  ;
+
+array_access
+  : name LBRACK expression RBRACK
+  | primary_no_new_array LBRACK expression RBRACK
+  | array_creation_init LBRACK expression RBRACK
+  ;
+
+postfix_expression
+  : primary
+  | name
+  | postincrement_expression
+  | postdecrement_expression
+  ;
+
+postincrement_expression
+  : postfix_expression PLUSPLUS
+  ;
+
+postdecrement_expression
+  : postfix_expression MINUSMINUS
+  ;
+
+unary_expression
+  : preincrement_expression
+  | predecrement_expression
+  | PLUS unary_expression
+  | MINUS unary_expression
+  | unary_expression_not_plus_minus
+  ;
+
+preincrement_expression
+  : PLUSPLUS unary_expression
+  ;
+
+predecrement_expression
+  : MINUSMINUS unary_expression
+  ;
+
+unary_expression_not_plus_minus
+  : postfix_expression
+  | COMP unary_expression
+  | NOT unary_expression
+  | cast_expression
+  ;
+
+;; cast_expression
+;;  : LPAREN type RPAREN unary_expression_not_plus_minus
+;; Introduces ambiguities between parenthesized LT relational
+;; operations and type casts, like in `LPAREN name LT name ...'.
+;; The following `cast_expression' production solves that.  
+cast_expression
+  : LPAREN primitive_type dims_opt RPAREN unary_expression
+  | LPAREN name RPAREN unary_expression_not_plus_minus
+  | LPAREN name dims RPAREN unary_expression_not_plus_minus
+  | LPAREN name LT type_argument_list_1 dims_opt RPAREN
+    unary_expression_not_plus_minus
+  | LPAREN name LT type_argument_list_1 DOT
+    class_or_interface_type dims_opt RPAREN
+    unary_expression_not_plus_minus
+  ;
+
+multiplicative_expression
+  : unary_expression
+  | multiplicative_expression MULT unary_expression
+  | multiplicative_expression DIV unary_expression
+  | multiplicative_expression MOD unary_expression
+  ;
+
+additive_expression
+  : multiplicative_expression
+  | additive_expression PLUS multiplicative_expression
+  | additive_expression MINUS multiplicative_expression
+  ;
+
+shift_expression
+  : additive_expression
+  | shift_expression LSHIFT additive_expression
+  | shift_expression RSHIFT additive_expression
+  | shift_expression URSHIFT additive_expression
+  ;
+
+relational_expression
+  : shift_expression
+  | relational_expression LT shift_expression
+  | relational_expression GT shift_expression
+  | relational_expression LTEQ shift_expression
+  | relational_expression GTEQ shift_expression
+  ;
+
+;; Lower the precendence of instanceof to resolve a grammar ambiguity.
+;; Semantics are unchanged, since relational expressions do not
+;; operate on boolean.
+instanceof_expression
+  : relational_expression
+  | instanceof_expression INSTANCEOF reference_type
+  ;
+
+equality_expression
+  : instanceof_expression
+  | equality_expression EQEQ instanceof_expression
+  | equality_expression NOTEQ instanceof_expression
+  ;
+
+and_expression
+  : equality_expression
+  | and_expression AND equality_expression
+  ;
+
+exclusive_or_expression
+  : and_expression
+  | exclusive_or_expression XOR and_expression
+  ;
+
+inclusive_or_expression
+  : exclusive_or_expression
+  | inclusive_or_expression OR exclusive_or_expression
+  ;
+
+conditional_and_expression
+  : inclusive_or_expression
+  | conditional_and_expression ANDAND inclusive_or_expression
+  ;
+
+conditional_or_expression
+  : conditional_and_expression
+  | conditional_or_expression OROR conditional_and_expression
+  ;
+
+conditional_expression
+  : conditional_or_expression
+  | conditional_or_expression QUESTION expression 
+    COLON conditional_expression
+  ;
+
+assignment_expression
+  : conditional_expression
+  | assignment
+  ;
+
+;; Must check that only a parenthesized variable is valid on the LHS.
+assignment
+  : postfix_expression assignment_operator assignment_expression
+  ;
+
+assignment_operator
+  : EQ
+  | MULTEQ
+  | DIVEQ
+  | MODEQ
+  | PLUSEQ
+  | MINUSEQ
+  | LSHIFTEQ
+  | RSHIFTEQ
+  | URSHIFTEQ
+  | ANDEQ
+  | XOREQ
+  | OREQ
+  ;
+
+expression_opt
+  : ;;EMPTY
+  | expression
+  ;
+
+expression
+  : assignment_expression
+  ;
+
+;; Must check that `expression' is constant, including enum constants.
+constant_expression
+  : expression
+  ;
+
+;;; JSR-14) Generics
+;;
+type_parameters_opt
+  : type_parameters
+  | ;;EMPTY
+  ;
+
+type_parameters
+  : LT type_parameter_list_1
+    (concat $1 $2)
+  ;
+
+type_parameter_list
+  : type_parameter_list COMMA type_parameter
+    (concat $1 $2 $3)
+  | type_parameter
+  ;
+
+type_parameter_list_1
+  : type_parameter_1
+  | type_parameter_list COMMA type_parameter_1
+    (concat $1 $2 $3)
+  ;
+
+type_parameter
+  : type_variable type_bound_opt
+    (concat $1 $2)
+  ;
+
+type_parameter_1
+  : type_variable GT
+    (concat $1 $2)
+  | type_variable type_bound_1
+    (concat $1 $2)
+  ;
+
+type_bound_opt
+  : type_bound
+  | ;;EMPTY
+    (progn "")
+  ;
+
+type_bound
+  : EXTENDS reference_type additional_bound_list_opt
+    (concat $1 " " $2 " " $3)
+  ;
+
+type_bound_1
+  : EXTENDS reference_type_1
+    (concat $1 " " $2)
+  | EXTENDS reference_type additional_bound_list_1
+    (concat $1 " " $2 " " $3)
+  ;
+
+additional_bound_list_opt
+  : additional_bound_list
+  | ;;EMPTY
+    (progn "")
+  ;
+
+additional_bound_list
+  : additional_bound additional_bound_list
+    (concat $1 $2)
+  | additional_bound
+  ;
+
+additional_bound_list_1
+  : additional_bound additional_bound_list_1
+    (concat $1 $2)
+  | additional_bound_1
+  ;
+
+additional_bound
+  : AND interface_type
+    (concat $1 " " $2)
+  ;
+
+additional_bound_1
+  : AND reference_type_1
+    (concat $1 " " $2)
+  ;
+
+;; Duplicate `_no_name' rules to remove ambiguity between `(x)' as an
+;; expression or a type cast.
+postfix_expression_no_name
+  : primary
+ ;; The `name' production was removed here.
+  | postincrement_expression
+  | postdecrement_expression
+  ;
+
+unary_expression_no_name
+  : preincrement_expression
+  | predecrement_expression
+  | PLUS unary_expression
+  | MINUS unary_expression
+  | unary_expression_not_plus_minus_no_name
+  ;
+
+unary_expression_not_plus_minus_no_name
+  : postfix_expression_no_name
+  | COMP unary_expression
+  | NOT unary_expression
+  | cast_expression
+  ;
+
+multiplicative_expression_no_name
+  : unary_expression_no_name
+  | name MULT unary_expression
+  | multiplicative_expression_no_name MULT unary_expression
+  | name DIV unary_expression
+  | multiplicative_expression_no_name DIV unary_expression
+  | name MOD unary_expression
+  | multiplicative_expression_no_name MOD unary_expression
+  ;
+
+additive_expression_no_name
+  : multiplicative_expression_no_name
+  | name PLUS multiplicative_expression
+  | additive_expression_no_name PLUS multiplicative_expression
+  | name MINUS multiplicative_expression
+  | additive_expression_no_name MINUS multiplicative_expression
+  ;
+
+shift_expression_no_name
+  : additive_expression_no_name
+  | name LSHIFT additive_expression
+  | shift_expression_no_name LSHIFT additive_expression
+  | name RSHIFT additive_expression
+  | shift_expression_no_name RSHIFT additive_expression
+  | name URSHIFT additive_expression
+  | shift_expression_no_name URSHIFT additive_expression
+  ;
+
+relational_expression_no_name
+  : shift_expression_no_name
+ ;; These productions for LT/GT disallow a<b<c as a valid expression
+ ;; to avoid ambiguity with parameterized types in casts.
+  | name LT shift_expression
+  | shift_expression_no_name LT shift_expression
+  | name GT shift_expression
+  | shift_expression_no_name GT shift_expression
+  | name LTEQ shift_expression
+  | relational_expression_no_name LTEQ shift_expression
+  | name GTEQ shift_expression
+  | relational_expression_no_name GTEQ shift_expression
+  ;
+
+instanceof_expression_no_name
+  : relational_expression_no_name
+  | name INSTANCEOF reference_type
+  | instanceof_expression_no_name INSTANCEOF reference_type
+  ;
+
+equality_expression_no_name
+  : instanceof_expression_no_name
+  | name EQEQ instanceof_expression
+  | equality_expression_no_name EQEQ instanceof_expression
+  | name NOTEQ instanceof_expression
+  | equality_expression_no_name NOTEQ instanceof_expression
+  ;
+
+and_expression_no_name
+  : equality_expression_no_name
+  | name AND equality_expression
+  | and_expression_no_name AND equality_expression
+  ;
+
+exclusive_or_expression_no_name
+  : and_expression_no_name
+  | name XOR and_expression
+  | exclusive_or_expression_no_name XOR and_expression
+  ;
+
+inclusive_or_expression_no_name
+  : exclusive_or_expression_no_name
+  | name OR exclusive_or_expression
+  | inclusive_or_expression_no_name OR exclusive_or_expression
+  ;
+
+conditional_and_expression_no_name
+  : inclusive_or_expression_no_name
+  | name ANDAND inclusive_or_expression
+  | conditional_and_expression_no_name ANDAND inclusive_or_expression
+  ;
+
+conditional_or_expression_no_name
+  : conditional_and_expression_no_name
+  | name OROR conditional_and_expression
+  | conditional_or_expression_no_name OROR conditional_and_expression
+  ;
+
+conditional_expression_no_name
+  : conditional_or_expression_no_name
+  | name QUESTION expression COLON conditional_expression
+  | conditional_or_expression_no_name QUESTION expression 
+    COLON conditional_expression
+  ;
+
+assignment_expression_no_name
+  : conditional_expression_no_name
+  | assignment
+  ;
+
+expression_no_name
+  : assignment_expression_no_name
+  ;
+ 
+;;; JSR-175) Annotation
+;;
+
+;; AnnotationTypeDeclaration:
+;;     InterfaceModifiersopt @ interface Identifier AnnotationTypeBody
+annotation_type_declaration
+  : modifiers AT INTERFACE IDENTIFIER annotation_type_body
+  | AT INTERFACE IDENTIFIER annotation_type_body
+  ;
+
+;; AnnotationTypeBody:
+;;     { AnnotationTypeMemberDeclarationsopt }
+annotation_type_body
+  : LBRACE annotation_type_member_declarations_opt RBRACE
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+annotation_type_member_declarations_opt
+  : ;;EMPTY
+  | annotation_type_member_declarations
+  ;
+
+;; AnnotationTypeMemberDeclarations:
+;;     AnnotationTypeMemberDeclaration
+;;     AnnotationTypeMemberDeclarations AnnotationTypeMemberDeclaration
+annotation_type_member_declarations
+  : annotation_type_member_declaration
+  | annotation_type_member_declarations annotation_type_member_declaration
+  ;
+
+;; AnnotationTypeMemberDeclaration:
+;;     AbstractMethodModifiersopt Type Identifier ( ) DefaultValueopt ;
+;;     ConstantDeclaration
+;;     ClassDeclaration
+;;     InterfaceDeclaration
+;;     EnumDeclaration
+;;     AnnotationTypeDeclaration
+;;     ;
+annotation_type_member_declaration
+  : modifiers_opt type IDENTIFIER LPAREN RPAREN default_value_opt SEMICOLON
+  | constant_declaration
+  | class_declaration
+  | interface_declaration
+  | enum_declaration
+  | annotation_type_declaration
+  | SEMICOLON
+  ;
+
+default_value_opt
+  : ;;EMPTY
+  | default_value
+  ;
+
+;; DefaultValue:
+;;     default MemberValue
+default_value
+  : DEFAULT member_value
+  ;
+
+;; Annotation:
+;;     NormalAnnotation
+;;     MarkerAnnotation
+;;     SingleMemberAnnotation
+;; NormalAnnotation:
+;;     @ TypeName ( MemberValuePairsopt )
+;; MarkerAnnotation:
+;;     @ TypeName
+;; SingleMemberAnnotation:
+;;     @ TypeName ( MemberValue )
+annotation
+  : AT name
+    (concat $1 $2)
+  | AT name LPAREN member_value RPAREN
+    (concat $1 $2)
+  | AT name LPAREN member_value_pairs RPAREN
+    (concat $1 $2)
+  | AT name LPAREN RPAREN
+    (concat $1 $2)
+  | AT name LPAREN error
+    (prog1 (concat $1 $2)
+      ;; On error, skip current block and try to continue.
+      (SKIP-BLOCK $3))
+  ;
+
+;; MemberValuePairs:
+;;     MemberValuePair
+;;     MemberValuePairs , MemberValuePair
+member_value_pairs
+  : member_value_pair
+  | member_value_pairs COMMA member_value_pair
+  ;
+
+;; MemberValuePair:
+;;     SimpleName = MemberValue
+member_value_pair
+  : simple_name EQ member_value
+  ;
+
+;; MemberValue:
+;;     ConditionalExpression
+;;     Annotation
+;;     MemberValueArrayInitializer
+member_value
+  : conditional_expression
+  | annotation
+  | member_value_array_initializer
+  ;
+
+;; MemberValueArrayInitializer:
+;;     { MemberValuesopt ,opt }
+member_value_array_initializer
+  : LBRACE member_values COMMA RBRACE
+  | LBRACE member_values RBRACE
+  | LBRACE COMMA RBRACE
+  | LBRACE RBRACE
+  | LBRACE error
+ ;; On error, skip current block and try to continue.
+    (SKIP-BLOCK)
+  ;
+
+;; MemberValues:
+;;     MemberValue
+;;     MemberValues , MemberValue
+member_values
+  : member_value
+  | member_values COMMA member_value
+  ;
+
+%%
+
+;; Define the lexer for this grammar
+(define-lex wisent-java-lexer
+  "Lexical analyzer that handles Java buffers.
+It ignores whitespaces, newlines and comments."
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  ;;;; Auto-generated analyzers.
+  wisent-java-wy--<number>-regexp-analyzer
+  wisent-java-wy--<string>-sexp-analyzer
+  ;; Must detect keywords before other symbols
+  wisent-java-wy--<keyword>-keyword-analyzer
+  wisent-java-wy--<symbol>-regexp-analyzer
+  wisent-java-wy--<punctuation>-string-analyzer
+  wisent-java-wy--<block>-block-analyzer
+  ;;;;
+  semantic-lex-default-action)
+
+;;; wisent-java.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv-wy.el
new file mode 100644
index 0000000..fe0c88f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv-wy.el
@@ -0,0 +1,499 @@
+;;; wisent-javascript-jv-wy.el --- Generated parser support file
+
+;; Copyright (C) 2005 Joakim Verona, Eric Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:50-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-javascript-jv.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-javascript-jv-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("if" . IF)
+     ("break" . BREAK)
+     ("continue" . CONTINUE)
+     ("else" . ELSE)
+     ("for" . FOR)
+     ("function" . FUNCTION)
+     ("this" . THIS)
+     ("return" . RETURN)
+     ("while" . WHILE)
+     ("void" . VOID_SYMBOL)
+     ("new" . NEW)
+     ("delete" . DELETE)
+     ("var" . VAR)
+     ("with" . WITH)
+     ("typeof" . TYPEOF)
+     ("in" . IN))
+   '(("in" summary "in something")
+     ("typeof" summary "typeof ")
+     ("with" summary "with ")
+     ("var" summary "var <variablename> [= value];")
+     ("delete" summary "delete(<objectreference>) - Deletes the object.")
+     ("new" summary "new <objecttype> - Creates a new object.")
+     ("void" summary "Method return type: void <name> ...")
+     ("while" summary "while (<expr>) <stmt> | do <stmt> while (<expr>);")
+     ("return" summary "return [<expr>] ;")
+     ("this" summary "this")
+     ("function" summary "function declaration blah blah")
+     ("for" summary "for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>")
+     ("else" summary "if (<expr>) <stmt> else <stmt>")
+     ("continue" summary "continue [<label>] ;")
+     ("break" summary "break [<label>] ;")
+     ("if" summary "if (<expr>) <stmt> [else <stmt>] (jv)")))
+  "Table of language keywords.")
+
+(defconst wisent-javascript-jv-wy--token-table
+  (semantic-lex-make-type-table
+   '(("<no-type>"
+      (NULL_TOKEN)
+      (QUERY)
+      (TRUE)
+      (FALSE))
+     ("number"
+      (NUMBER))
+     ("string"
+      (STRING))
+     ("symbol"
+      (VARIABLE))
+     ("close-paren"
+      (CLOSE_SQ_BRACKETS . "]")
+      (END_BLOCK . "}")
+      (CLOSE_PARENTHESIS . ")"))
+     ("open-paren"
+      (OPEN_SQ_BRACKETS . "[")
+      (START_BLOCK . "{")
+      (OPEN_PARENTHESIS . "("))
+     ("block"
+      (BRACK_BLOCK . "(OPEN_SQ_BRACKETS CLOSE_SQ_BRACKETS)")
+      (BRACE_BLOCK . "(START_BLOCK END_BLOCK)")
+      (PAREN_BLOCK . "(OPEN_PARENTHESIS CLOSE_PARENTHESIS)"))
+     ("punctuation"
+      (ONES_COMPLIMENT . "~")
+      (SEMICOLON . ";")
+      (LINE_TERMINATOR . "\n")
+      (LESS_THAN . "<")
+      (DOT . ".")
+      (COMMA . ",")
+      (COLON . ":")
+      (DIV . "/")
+      (DECREMENT . "--")
+      (INCREMENT . "++")
+      (PLUS_EQUALS . "+=")
+      (PLUS . "+")
+      (MULTIPLY_EQUALS . "*=")
+      (MULTIPLY . "*")
+      (MOD_EQUALS . "%=")
+      (MOD . "%")
+      (MINUS_EQUALS . "-=")
+      (MINUS . "-")
+      (LS_EQUAL . "<=")
+      (LOGICAL_NOT . "!!")
+      (LOGICAL_OR . "||")
+      (LOGICAL_AND . "&&")
+      (GT_EQUAL . ">=")
+      (GREATER_THAN . ">")
+      (EQUALS . "==")
+      (DIV_EQUALS . "/=")
+      (NOT_EQUAL . "!=")
+      (BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS . ">>>=")
+      (BITWISE_SHIFT_RIGHT_ZERO_FILL . ">>>")
+      (BITWISE_SHIFT_RIGHT_EQUALS . ">>=")
+      (BITWISE_SHIFT_RIGHT . ">>")
+      (BITWISE_SHIFT_LEFT_EQUALS . "<<=")
+      (BITWISE_SHIFT_LEFT . "<<")
+      (BITWISE_OR_EQUALS . "|=")
+      (BITWISE_OR . "|")
+      (BITWISE_EXCLUSIVE_OR_EQUALS . "^=")
+      (BITWISE_EXCLUSIVE_OR . "^")
+      (BITWISE_AND_EQUALS . "&=")
+      (BITWISE_AND . "&")
+      (ASSIGN_SYMBOL . "=")))
+   '(("number" :declared t)
+     ("string" :declared t)
+     ("symbol" :declared t)
+     ("keyword" :declared t)
+     ("block" :declared t)
+     ("punctuation" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst wisent-javascript-jv-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((ASSIGN_SYMBOL BITWISE_AND BITWISE_AND_EQUALS BITWISE_EXCLUSIVE_OR BITWISE_EXCLUSIVE_OR_EQUALS BITWISE_OR BITWISE_OR_EQUALS BITWISE_SHIFT_LEFT BITWISE_SHIFT_LEFT_EQUALS BITWISE_SHIFT_RIGHT BITWISE_SHIFT_RIGHT_EQUALS BITWISE_SHIFT_RIGHT_ZERO_FILL BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS NOT_EQUAL DIV_EQUALS EQUALS GREATER_THAN GT_EQUAL LOGICAL_AND LOGICAL_OR LOGICAL_NOT LS_EQUAL MINUS MINUS_EQUALS MOD MOD_EQUALS MULTIPLY MULTIPLY_EQUALS PLUS PLUS_EQUALS INCREMENT DECREMENT DIV COLON COMMA DOT LESS_THAN LINE_TERMINATOR SEMICOLON ONES_COMPLIMENT PAREN_BLOCK BRACE_BLOCK BRACK_BLOCK OPEN_PARENTHESIS CLOSE_PARENTHESIS START_BLOCK END_BLOCK OPEN_SQ_BRACKETS CLOSE_SQ_BRACKETS IF BREAK CONTINUE ELSE FOR FUNCTION THIS RETURN WHILE VOID_SYMBOL NEW DELETE VAR WITH TYPEOF IN VARIABLE STRING NUMBER FALSE TRUE QUERY NULL_TOKEN)
+       ((left PLUS MINUS)
+	(left MULTIPLY DIV MOD)
+	(nonassoc FALSE)
+	(nonassoc HIGHER_THAN_FALSE)
+	(nonassoc ELSE)
+	(nonassoc LOWER_THAN_CLOSE_PARENTHESIS)
+	(nonassoc CLOSE_PARENTHESIS))
+       (Program
+	((SourceElement)))
+       (SourceElement
+	((Statement))
+	((FunctionDeclaration)))
+       (Statement
+	((Block))
+	((VariableStatement))
+	((EmptyStatement))
+	((ExpressionStatement))
+	((IfStatement))
+	((IterationExpression))
+	((ContinueStatement))
+	((BreakStatement))
+	((ReturnStatement))
+	((WithStatement)))
+       (FunctionDeclaration
+	((FUNCTION VARIABLE FormalParameterListBlock Block)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function $2 nil $3))))
+       (FormalParameterListBlock
+	((PAREN_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'FormalParameterList 1)))
+       (FormalParameterList
+	((OPEN_PARENTHESIS)
+	 nil)
+	((VARIABLE)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil)))
+	((CLOSE_PARENTHESIS)
+	 nil)
+	((COMMA)
+	 nil))
+       (StatementList
+	((Statement))
+	((StatementList Statement)))
+       (Block
+	((BRACE_BLOCK)))
+       (BlockExpand
+	((START_BLOCK StatementList END_BLOCK))
+	((START_BLOCK END_BLOCK)))
+       (VariableStatement
+	((VAR VariableDeclarationList SEMICOLON)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil nil))))
+       (VariableDeclarationList
+	((VariableDeclaration)
+	 (list $1))
+	((VariableDeclarationList COMMA VariableDeclaration)
+	 (append $1
+		 (list $3))))
+       (VariableDeclaration
+	((VARIABLE)
+	 (append
+	  (list $1 nil)
+	  $region))
+	((VARIABLE Initializer)
+	 (append
+	  (cons $1 $2)
+	  $region)))
+       (Initializer
+	((ASSIGN_SYMBOL AssignmentExpression)
+	 (list $2)))
+       (EmptyStatement
+	((SEMICOLON)))
+       (ExpressionStatement
+	((Expression SEMICOLON)))
+       (IfStatement
+	((IF OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement)
+	 [HIGHER_THAN_FALSE])
+	((IF OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement ELSE Statement))
+	((IF OPEN_PARENTHESIS FALSE CLOSE_PARENTHESIS Statement))
+	((IF OPEN_PARENTHESIS LeftHandSideExpression AssignmentOperator AssignmentExpression CLOSE_PARENTHESIS Statement)))
+       (IterationExpression
+	((WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement)
+	 [HIGHER_THAN_FALSE])
+	((WHILE OPEN_PARENTHESIS FALSE CLOSE_PARENTHESIS Statement))
+	((WHILE OPEN_PARENTHESIS LeftHandSideExpression AssignmentOperator AssignmentExpression CLOSE_PARENTHESIS Statement))
+	((FOR OPEN_PARENTHESIS OptionalExpression SEMICOLON OptionalExpression SEMICOLON OptionalExpression CLOSE_PARENTHESIS Statement))
+	((FOR OPEN_PARENTHESIS VAR VariableDeclarationList SEMICOLON OptionalExpression SEMICOLON OptionalExpression CLOSE_PARENTHESIS Statement))
+	((FOR OPEN_PARENTHESIS LeftHandSideExpression IN Expression CLOSE_PARENTHESIS Statement))
+	((FOR OPEN_PARENTHESIS VAR VARIABLE OptionalInitializer IN Expression CLOSE_PARENTHESIS Statement)))
+       (ContinueStatement
+	((CONTINUE SEMICOLON)))
+       (BreakStatement
+	((BREAK SEMICOLON)))
+       (ReturnStatement
+	((RETURN Expression SEMICOLON))
+	((RETURN SEMICOLON)))
+       (WithStatement
+	((WITH OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement)))
+       (OptionalInitializer
+	((Initializer))
+	(nil))
+       (PrimaryExpression
+	((THIS))
+	((VARIABLE))
+	((NUMBER))
+	((STRING))
+	((NULL_TOKEN))
+	((TRUE))
+	((FALSE))
+	((OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS)))
+       (MemberExpression
+	((PrimaryExpression))
+	((MemberExpression OPEN_SQ_BRACKETS Expression CLOSE_SQ_BRACKETS))
+	((MemberExpression DOT VARIABLE))
+	((NEW MemberExpression Arguments)))
+       (NewExpression
+	((MemberExpression))
+	((NEW NewExpression)))
+       (CallExpression
+	((MemberExpression Arguments))
+	((CallExpression Arguments))
+	((CallExpression OPEN_SQ_BRACKETS Expression CLOSE_SQ_BRACKETS))
+	((CallExpression DOT VARIABLE)))
+       (Arguments
+	((OPEN_PARENTHESIS CLOSE_PARENTHESIS))
+	((OPEN_PARENTHESIS ArgumentList CLOSE_PARENTHESIS)))
+       (ArgumentList
+	((AssignmentExpression))
+	((ArgumentList COMMA AssignmentExpression)))
+       (LeftHandSideExpression
+	((NewExpression))
+	((CallExpression)))
+       (PostfixExpression
+	((LeftHandSideExpression))
+	((LeftHandSideExpression INCREMENT))
+	((LeftHandSideExpression DECREMENT)))
+       (UnaryExpression
+	((PostfixExpression))
+	((DELETE UnaryExpression))
+	((VOID_SYMBOL UnaryExpression))
+	((TYPEOF UnaryExpression))
+	((INCREMENT UnaryExpression))
+	((DECREMENT UnaryExpression))
+	((PLUS UnaryExpression))
+	((MINUS UnaryExpression))
+	((ONES_COMPLIMENT UnaryExpression))
+	((LOGICAL_NOT UnaryExpression)))
+       (MultiplicativeExpression
+	((UnaryExpression))
+	((MultiplicativeExpression MULTIPLY UnaryExpression))
+	((MultiplicativeExpression DIV UnaryExpression))
+	((MultiplicativeExpression MOD UnaryExpression)))
+       (AdditiveExpression
+	((MultiplicativeExpression))
+	((AdditiveExpression PLUS MultiplicativeExpression))
+	((AdditiveExpression MINUS MultiplicativeExpression)))
+       (ShiftExpression
+	((AdditiveExpression))
+	((ShiftExpression BITWISE_SHIFT_LEFT AdditiveExpression))
+	((ShiftExpression BITWISE_SHIFT_RIGHT AdditiveExpression))
+	((ShiftExpression BITWISE_SHIFT_RIGHT_ZERO_FILL AdditiveExpression)))
+       (RelationalExpression
+	((ShiftExpression))
+	((RelationalExpression LESS_THAN ShiftExpression))
+	((RelationalExpression GREATER_THAN ShiftExpression))
+	((RelationalExpression LS_EQUAL ShiftExpression))
+	((RelationalExpression GT_EQUAL ShiftExpression)))
+       (EqualityExpression
+	((RelationalExpression))
+	((EqualityExpression EQUALS RelationalExpression))
+	((EqualityExpression NOT_EQUAL RelationalExpression)))
+       (BitwiseANDExpression
+	((EqualityExpression))
+	((BitwiseANDExpression BITWISE_AND EqualityExpression)))
+       (BitwiseXORExpression
+	((BitwiseANDExpression))
+	((BitwiseXORExpression BITWISE_EXCLUSIVE_OR BitwiseANDExpression)))
+       (BitwiseORExpression
+	((BitwiseXORExpression))
+	((BitwiseORExpression BITWISE_OR BitwiseXORExpression)))
+       (LogicalANDExpression
+	((BitwiseORExpression))
+	((LogicalANDExpression LOGICAL_AND BitwiseORExpression)))
+       (LogicalORExpression
+	((LogicalANDExpression))
+	((LogicalORExpression LOGICAL_OR LogicalANDExpression)))
+       (ConditionalExpression
+	((LogicalORExpression))
+	((LogicalORExpression QUERY AssignmentExpression COLON AssignmentExpression)))
+       (AssignmentExpression
+	((ConditionalExpression))
+	((LeftHandSideExpression AssignmentOperator AssignmentExpression)
+	 [LOWER_THAN_CLOSE_PARENTHESIS]))
+       (AssignmentOperator
+	((ASSIGN_SYMBOL))
+	((MULTIPLY_EQUALS))
+	((DIV_EQUALS))
+	((MOD_EQUALS))
+	((PLUS_EQUALS))
+	((MINUS_EQUALS))
+	((BITWISE_SHIFT_LEFT_EQUALS))
+	((BITWISE_SHIFT_RIGHT_EQUALS))
+	((BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS))
+	((BITWISE_AND_EQUALS))
+	((BITWISE_EXCLUSIVE_OR_EQUALS))
+	((BITWISE_OR_EQUALS)))
+       (Expression
+	((AssignmentExpression))
+	((Expression COMMA AssignmentExpression)))
+       (OptionalExpression
+	((Expression))
+	(nil)))
+     '(Program FormalParameterList)))
+  "Parser table.")
+
+(defun wisent-javascript-jv-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-javascript-jv-wy--parse-table
+	semantic-debug-parser-source "wisent-javascript-jv.wy"
+	semantic-flex-keywords-obarray wisent-javascript-jv-wy--keyword-table
+	semantic-lex-types-obarray wisent-javascript-jv-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
+     ("{" START_BLOCK BRACE_BLOCK)
+     ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
+    (")" CLOSE_PARENTHESIS)
+    ("}" END_BLOCK)
+    ("]" CLOSE_SQ_BRACKETS))
+  )
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'VARIABLE)
+
+(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING)
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER)
+
+(define-lex-string-type-analyzer wisent-javascript-jv-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)+"
+  '((ONES_COMPLIMENT . "~")
+    (SEMICOLON . ";")
+    (LINE_TERMINATOR . "\n")
+    (LESS_THAN . "<")
+    (DOT . ".")
+    (COMMA . ",")
+    (COLON . ":")
+    (DIV . "/")
+    (DECREMENT . "--")
+    (INCREMENT . "++")
+    (PLUS_EQUALS . "+=")
+    (PLUS . "+")
+    (MULTIPLY_EQUALS . "*=")
+    (MULTIPLY . "*")
+    (MOD_EQUALS . "%=")
+    (MOD . "%")
+    (MINUS_EQUALS . "-=")
+    (MINUS . "-")
+    (LS_EQUAL . "<=")
+    (LOGICAL_NOT . "!!")
+    (LOGICAL_OR . "||")
+    (LOGICAL_AND . "&&")
+    (GT_EQUAL . ">=")
+    (GREATER_THAN . ">")
+    (EQUALS . "==")
+    (DIV_EQUALS . "/=")
+    (NOT_EQUAL . "!=")
+    (BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS . ">>>=")
+    (BITWISE_SHIFT_RIGHT_ZERO_FILL . ">>>")
+    (BITWISE_SHIFT_RIGHT_EQUALS . ">>=")
+    (BITWISE_SHIFT_RIGHT . ">>")
+    (BITWISE_SHIFT_LEFT_EQUALS . "<<=")
+    (BITWISE_SHIFT_LEFT . "<<")
+    (BITWISE_OR_EQUALS . "|=")
+    (BITWISE_OR . "|")
+    (BITWISE_EXCLUSIVE_OR_EQUALS . "^=")
+    (BITWISE_EXCLUSIVE_OR . "^")
+    (BITWISE_AND_EQUALS . "&=")
+    (BITWISE_AND . "&")
+    (ASSIGN_SYMBOL . "="))
+  'punctuation)
+
+
+;;; Epilogue
+;;
+;;here something like:
+;;(define-lex wisent-java-tags-lexer
+;; should go
+(define-lex javascript-lexer-jv
+"javascript thingy"
+;;std stuff
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+
+  ;;stuff generated from the wy file(one for each "type" declaration)
+  wisent-javascript-jv-wy--<number>-regexp-analyzer
+  wisent-javascript-jv-wy--<string>-sexp-analyzer
+
+  wisent-javascript-jv-wy--<keyword>-keyword-analyzer
+
+  wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  wisent-javascript-jv-wy--<punctuation>-string-analyzer
+  wisent-javascript-jv-wy--<block>-block-analyzer
+
+
+  ;;;;more std stuff
+  semantic-lex-default-action
+  )
+
+(provide 'wisent-javascript-jv-wy)
+
+;;; wisent-javascript-jv-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv.wy
new file mode 100644
index 0000000..77c0ce9
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript-jv.wy
@@ -0,0 +1,502 @@
+;;; wisent-javascript-jv.wy -- LALR grammar for Javascript
+;;
+;; Copyright (C) 2005 Joakim Verona, Eric Ludlam
+;; JAVE Copyright (C) Alex Walker
+;;
+;; Author: Joakim Verona
+;; Maintainer: 
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-javascript-jv.wy,v 1.1 2008/09/04 01:58:56 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;;; Commentary:
+;;
+;;JAVE converted from a bison javascript definition at:
+;;  http://www.soton.net/jssyntaxchecker/FinalReport.pdf
+;;by Alex Walker
+;;and from wisent-javascrypt.wy by Eric Ludlam
+;;
+;;...and then further modified by Joakim Verona
+;;and its more of an experiment than anything useful
+
+%package wisent-javascript-jv-wy
+;; JAVE I prefere ecmascript-mode
+%languagemode ecmascript-mode javascript-mode
+
+;; The default goal
+%start Program
+;; Other Goals
+%start FormalParameterList
+
+;; with the terminals stuff, I used the javacript.y names,
+;; but the wisent-java-tags.wy types
+;; when possible
+;; ------------------
+;; Operator terminals
+;; ------------------
+
+;;define-lex-string-type-analyzer gets called with the "syntax" comment
+%type <punctuation> ;;syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+
+%token <punctuation> ASSIGN_SYMBOL            "="
+%token <punctuation> BITWISE_AND              "&"
+%token <punctuation> BITWISE_AND_EQUALS       "&="
+%token <punctuation> BITWISE_EXCLUSIVE_OR     "^"
+%token <punctuation> BITWISE_EXCLUSIVE_OR_EQUALS "^="
+%token <punctuation> BITWISE_OR               "|"
+%token <punctuation> BITWISE_OR_EQUALS        "|="
+%token <punctuation> BITWISE_SHIFT_LEFT       "<<"
+%token <punctuation> BITWISE_SHIFT_LEFT_EQUALS "<<="
+%token <punctuation> BITWISE_SHIFT_RIGHT      ">>"
+%token <punctuation> BITWISE_SHIFT_RIGHT_EQUALS ">>="
+%token <punctuation> BITWISE_SHIFT_RIGHT_ZERO_FILL ">>>"
+%token <punctuation> BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS ">>>="
+%token <punctuation> NOT_EQUAL "!="
+%token <punctuation> DIV_EQUALS "/="
+%token <punctuation> EQUALS "=="
+%token <punctuation> GREATER_THAN ">"
+%token <punctuation> GT_EQUAL ">="
+%token <punctuation> LOGICAL_AND "&&"
+%token <punctuation> LOGICAL_OR "||"
+%token <punctuation> LOGICAL_NOT "!!"
+%token <punctuation> LS_EQUAL "<="
+%token <punctuation> MINUS "-"
+%token <punctuation> MINUS_EQUALS "-="
+%token <punctuation> MOD "%"
+%token <punctuation> MOD_EQUALS "%="
+%token <punctuation> MULTIPLY "*"
+%token <punctuation> MULTIPLY_EQUALS "*="
+%token <punctuation> PLUS "+"
+%token <punctuation> PLUS_EQUALS "+="
+%token <punctuation> INCREMENT "++"
+%token <punctuation> DECREMENT "--"
+%token <punctuation> DIV "/"
+%token <punctuation> COLON ":"
+%token <punctuation> COMMA ","
+%token <punctuation> DOT "."
+%token <punctuation> LESS_THAN "<"
+%token <punctuation> LINE_TERMINATOR "\n"
+%token <punctuation> SEMICOLON ";"
+%token <punctuation> ONES_COMPLIMENT "~"
+
+
+;; -----------------------------
+;; Block & Parenthesis terminals
+;; -----------------------------
+%type  <block>       ;;syntax "\\s(\\|\\s)" matchdatatype block
+%token <block>       PAREN_BLOCK "(OPEN_PARENTHESIS CLOSE_PARENTHESIS)"
+%token <block>       BRACE_BLOCK "(START_BLOCK END_BLOCK)"
+%token <block>       BRACK_BLOCK "(OPEN_SQ_BRACKETS CLOSE_SQ_BRACKETS)"
+
+%token <open-paren>  OPEN_PARENTHESIS  "("
+%token <close-paren>  CLOSE_PARENTHESIS ")"
+
+%token <open-paren>  START_BLOCK       "{"
+%token <close-paren>  END_BLOCK         "}"
+
+%token <open-paren>  OPEN_SQ_BRACKETS  "["
+%token <close-paren>  CLOSE_SQ_BRACKETS "]"
+
+
+;; -----------------
+;; Keyword terminals
+;; -----------------
+
+;; Generate a keyword analyzer
+%type  <keyword> ;;syntax "\\(\\sw\\|\\s_\\)+" matchdatatype keyword
+
+%keyword IF           "if"
+%put     IF summary
+"if (<expr>) <stmt> [else <stmt>] (jv)"
+
+%keyword BREAK        "break"
+%put     BREAK summary
+"break [<label>] ;"
+
+%keyword CONTINUE     "continue"
+%put     CONTINUE summary
+"continue [<label>] ;"
+
+%keyword ELSE         "else"
+%put     ELSE summary
+"if (<expr>) <stmt> else <stmt>"
+
+
+%keyword FOR          "for"
+%put     FOR summary
+"for ([<init-expr>]; [<expr>]; [<update-expr>]) <stmt>"
+
+
+%keyword FUNCTION  "function"
+%put     FUNCTION summary
+"function declaration blah blah"
+
+%keyword THIS         "this"
+%put THIS summary
+"this"
+
+
+%keyword RETURN       "return"
+%put     RETURN summary
+"return [<expr>] ;"
+
+%keyword WHILE        "while"
+%put     WHILE summary
+"while (<expr>) <stmt> | do <stmt> while (<expr>);"
+
+%keyword VOID_SYMBOL         "void"
+%put     VOID_SYMBOL summary
+"Method return type: void <name> ..."
+
+
+
+%keyword NEW          "new"
+%put NEW summary
+"new <objecttype> - Creates a new object."
+
+%keyword DELETE "delete"
+%put DELETE summary
+"delete(<objectreference>) - Deletes the object."
+
+%keyword VAR "var"
+%put VAR  summary
+"var <variablename> [= value];"
+
+%keyword WITH "with"
+%put WITH summary
+"with "
+
+%keyword TYPEOF "typeof"
+%put TYPEOF summary
+"typeof "
+
+%keyword IN "in"
+%put IN  summary
+"in something"
+
+
+;; -----------------
+;; Literal terminals
+;; -----------------
+
+;;the .y file uses VARIABLE as IDENTIFIER, which seems a bit evil
+;; it think the normal .wy convention is better than this
+%type  <symbol>      ;;syntax "\\(\\sw\\|\\s_\\)+"
+%token <symbol>      VARIABLE
+
+%type  <string>      ;;syntax "\\s\"" matchdatatype sexp
+%token <string>      STRING
+
+%type  <number>      ;;syntax semantic-lex-number-expression
+%token <number>      NUMBER
+
+
+%token FALSE
+%token TRUE
+%token QUERY
+
+
+%token NULL_TOKEN
+
+;;%token UNDEFINED_TOKEN
+;;%token INFINITY
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; associativity and stuff
+%left PLUS MINUS
+%left MULTIPLY DIV MOD
+
+%nonassoc FALSE
+%nonassoc HIGHER_THAN_FALSE
+%nonassoc ELSE
+%nonassoc LOWER_THAN_CLOSE_PARENTHESIS
+%nonassoc CLOSE_PARENTHESIS
+
+%%
+
+Program : SourceElement
+        ;
+
+SourceElement : Statement
+              | FunctionDeclaration
+              ;
+
+Statement : Block
+          | VariableStatement
+          | EmptyStatement
+          | ExpressionStatement
+          | IfStatement
+          | IterationExpression
+          | ContinueStatement
+          | BreakStatement
+          | ReturnStatement
+          | WithStatement
+          ;   
+      
+FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block
+		      (FUNCTION-TAG $2 nil $3)
+                    ;
+
+FormalParameterListBlock : PAREN_BLOCK
+			   (EXPANDFULL $1 FormalParameterList)
+			;
+
+FormalParameterList: OPEN_PARENTHESIS
+		     ()
+		   | VARIABLE
+		     (VARIABLE-TAG $1 nil nil)
+		   | CLOSE_PARENTHESIS
+		     ()
+		   | COMMA
+		     ()
+		   ;
+
+StatementList : Statement
+              | StatementList Statement
+              ;
+
+Block : BRACE_BLOCK
+     ;; If you want to parse the body of the function
+     ;; ( EXPANDFULL $1 BlockExpand )
+      ;
+
+BlockExpand: START_BLOCK StatementList END_BLOCK
+	   | START_BLOCK END_BLOCK
+	   ;
+
+VariableStatement : VAR VariableDeclarationList SEMICOLON
+		    (VARIABLE-TAG $2 nil nil)
+                  ;
+
+VariableDeclarationList : VariableDeclaration
+			  (list $1)
+                        | VariableDeclarationList COMMA VariableDeclaration
+			  (append $1 (list $3))
+                        ;
+
+VariableDeclaration : VARIABLE
+		      (append (list $1 nil) $region)
+                    | VARIABLE Initializer
+		      (append (cons $1 $2) $region)
+                    ;
+
+Initializer : ASSIGN_SYMBOL AssignmentExpression
+	      (list $2)
+            ;
+
+EmptyStatement : SEMICOLON
+               ;
+
+ExpressionStatement : Expression SEMICOLON
+                    ;
+
+IfStatement : IF OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement  %prec HIGHER_THAN_FALSE
+            | IF OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement ELSE Statement
+            | IF OPEN_PARENTHESIS FALSE CLOSE_PARENTHESIS Statement
+            | IF OPEN_PARENTHESIS LeftHandSideExpression AssignmentOperator AssignmentExpression CLOSE_PARENTHESIS Statement
+            ;
+
+IterationExpression : WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statement %prec HIGHER_THAN_FALSE
+                    | WHILE OPEN_PARENTHESIS FALSE CLOSE_PARENTHESIS Statement
+                    | WHILE OPEN_PARENTHESIS LeftHandSideExpression AssignmentOperator AssignmentExpression CLOSE_PARENTHESIS Statement
+                    | FOR OPEN_PARENTHESIS OptionalExpression SEMICOLON OptionalExpression SEMICOLON OptionalExpression CLOSE_PARENTHESIS Statement
+                    | FOR OPEN_PARENTHESIS VAR VariableDeclarationList SEMICOLON OptionalExpression SEMICOLON OptionalExpression CLOSE_PARENTHESIS Statement
+                    | FOR OPEN_PARENTHESIS LeftHandSideExpression IN Expression CLOSE_PARENTHESIS Statement
+                    | FOR OPEN_PARENTHESIS VAR VARIABLE OptionalInitializer IN Expression CLOSE_PARENTHESIS Statement
+                    ;
+
+ContinueStatement : CONTINUE SEMICOLON
+                  ;
+
+;;JAVE break needs labels 
+BreakStatement : BREAK SEMICOLON
+              ;;               | BREAK identifier SEMICOLON
+               ;
+
+ReturnStatement : RETURN Expression SEMICOLON
+                | RETURN SEMICOLON
+                ;
+
+WithStatement : WITH OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS   Statement
+              ;
+
+OptionalInitializer : Initializer
+                    |
+                    ;
+
+PrimaryExpression : THIS
+                  | VARIABLE
+                  | NUMBER
+                  | STRING
+                  | NULL_TOKEN
+                  | TRUE
+                  | FALSE
+                  | OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS
+                  ;
+
+MemberExpression : PrimaryExpression
+                 | MemberExpression OPEN_SQ_BRACKETS Expression  CLOSE_SQ_BRACKETS
+                 | MemberExpression DOT VARIABLE
+                 | NEW MemberExpression Arguments
+                 ;
+
+NewExpression : MemberExpression
+              | NEW NewExpression
+              ;
+
+CallExpression : MemberExpression Arguments
+               | CallExpression Arguments
+               | CallExpression OPEN_SQ_BRACKETS Expression  CLOSE_SQ_BRACKETS
+               | CallExpression DOT VARIABLE
+               ;
+
+Arguments : OPEN_PARENTHESIS CLOSE_PARENTHESIS
+          | OPEN_PARENTHESIS ArgumentList CLOSE_PARENTHESIS
+          ;
+
+ArgumentList : AssignmentExpression
+             | ArgumentList COMMA AssignmentExpression
+             ;
+
+LeftHandSideExpression : NewExpression
+                       | CallExpression
+                       ;
+
+PostfixExpression : LeftHandSideExpression
+                  | LeftHandSideExpression INCREMENT
+                  | LeftHandSideExpression DECREMENT
+                  ;
+
+UnaryExpression : PostfixExpression
+                | DELETE UnaryExpression
+                | VOID_SYMBOL UnaryExpression
+                | TYPEOF UnaryExpression
+                | INCREMENT UnaryExpression
+                | DECREMENT UnaryExpression
+                | PLUS UnaryExpression
+                | MINUS UnaryExpression
+                | ONES_COMPLIMENT UnaryExpression
+                | LOGICAL_NOT UnaryExpression
+                ;
+
+MultiplicativeExpression : UnaryExpression
+                         | MultiplicativeExpression MULTIPLY UnaryExpression
+                         | MultiplicativeExpression DIV UnaryExpression
+                         | MultiplicativeExpression MOD UnaryExpression
+                         ;
+
+AdditiveExpression : MultiplicativeExpression
+                   | AdditiveExpression PLUS MultiplicativeExpression
+                   | AdditiveExpression MINUS MultiplicativeExpression
+                   ;
+
+ShiftExpression : AdditiveExpression
+                | ShiftExpression BITWISE_SHIFT_LEFT AdditiveExpression
+                | ShiftExpression BITWISE_SHIFT_RIGHT AdditiveExpression
+                | ShiftExpression BITWISE_SHIFT_RIGHT_ZERO_FILL  AdditiveExpression
+                ;
+
+RelationalExpression : ShiftExpression
+                     | RelationalExpression LESS_THAN ShiftExpression
+                     | RelationalExpression GREATER_THAN ShiftExpression
+                     | RelationalExpression LS_EQUAL ShiftExpression
+                     | RelationalExpression GT_EQUAL ShiftExpression
+                     ;
+
+EqualityExpression : RelationalExpression
+                   | EqualityExpression EQUALS RelationalExpression
+                   | EqualityExpression NOT_EQUAL RelationalExpression
+                   ;
+
+BitwiseANDExpression : EqualityExpression
+                     | BitwiseANDExpression BITWISE_AND EqualityExpression
+                     ;
+
+BitwiseXORExpression : BitwiseANDExpression
+                     | BitwiseXORExpression BITWISE_EXCLUSIVE_OR     BitwiseANDExpression
+                     ;
+
+BitwiseORExpression : BitwiseXORExpression
+                    | BitwiseORExpression BITWISE_OR BitwiseXORExpression
+                    ;
+
+LogicalANDExpression : BitwiseORExpression
+                     | LogicalANDExpression LOGICAL_AND BitwiseORExpression
+                     ;
+
+LogicalORExpression : LogicalANDExpression
+                    | LogicalORExpression LOGICAL_OR LogicalANDExpression
+                    ;
+
+ConditionalExpression : LogicalORExpression
+                      | LogicalORExpression QUERY AssignmentExpression COLON    AssignmentExpression
+                      ;
+
+AssignmentExpression : ConditionalExpression
+                     | LeftHandSideExpression AssignmentOperator  AssignmentExpression %prec LOWER_THAN_CLOSE_PARENTHESIS
+                     ;
+
+AssignmentOperator : ASSIGN_SYMBOL
+                   | MULTIPLY_EQUALS
+                   | DIV_EQUALS
+                   | MOD_EQUALS
+                   | PLUS_EQUALS
+                   | MINUS_EQUALS
+                   | BITWISE_SHIFT_LEFT_EQUALS
+                   | BITWISE_SHIFT_RIGHT_EQUALS
+                   | BITWISE_SHIFT_RIGHT_ZERO_FILL_EQUALS
+                   | BITWISE_AND_EQUALS
+                   | BITWISE_EXCLUSIVE_OR_EQUALS
+                   | BITWISE_OR_EQUALS
+                   ;
+
+Expression : AssignmentExpression
+           | Expression COMMA AssignmentExpression
+           ;
+
+OptionalExpression : Expression
+                   |
+                   ;
+
+%%
+
+;;here something like:
+;;(define-lex wisent-java-tags-lexer
+;; should go
+(define-lex javascript-lexer-jv
+"javascript thingy"
+;;std stuff
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+
+  ;;stuff generated from the wy file(one for each "type" declaration)
+  wisent-javascript-jv-wy--<number>-regexp-analyzer
+  wisent-javascript-jv-wy--<string>-sexp-analyzer
+
+  wisent-javascript-jv-wy--<keyword>-keyword-analyzer
+
+  wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  wisent-javascript-jv-wy--<punctuation>-string-analyzer
+  wisent-javascript-jv-wy--<block>-block-analyzer
+
+
+  ;;;;more std stuff
+  semantic-lex-default-action
+  )
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-javascript.el b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript.el
new file mode 100644
index 0000000..da53890
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-javascript.el
@@ -0,0 +1,105 @@
+;;; wisent-javascript.el --- javascript parser support
+
+;; Copyright (C) 2005 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-javascript.el,v 1.2 2009/09/11 18:51:55 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser support for javascript language.
+
+
+;;; Code:
+(require 'semantic-java)
+(require 'semantic-wisent)
+(require 'wisent-javascript-jv-wy)
+
+(defun wisent-javascript-jv-expand-tag (tag)
+  "Expand TAG into a list of equivalent tags, or nil.
+Expand multiple variable declarations in the same statement, that is
+tags of class `variable' whose name is equal to a list of elements of
+the form (NAME VALUE START . END).  NAME is a variable name.  VALUE is
+an initializer START and END are the bounds in the declaration, related
+to this variable NAME."
+  (let (elts elt value clone start end xpand)
+    (when (and (eq 'variable (semantic-tag-class tag))
+               (consp (setq elts (semantic-tag-name tag))))
+      ;; There are multiple names in the same variable declaration.
+      (while elts
+        ;; For each name element, clone the initial tag and give it
+        ;; the name of the element.
+        (setq elt   (car elts)
+              elts  (cdr elts)
+              clone (semantic-tag-clone tag (car elt))
+	      value (car (cdr elt))
+              start (if elts  (caddr elt) (semantic-tag-start tag))
+              end   (if xpand (cdddr elt) (semantic-tag-end   tag))
+              xpand (cons clone xpand))
+	;; Set the definition of the cloned tag
+	(semantic-tag-put-attribute clone :default-value value)
+        ;; Set the bounds of the cloned tag with those of the name
+        ;; element.
+        (semantic-tag-set-bounds clone start end))
+      xpand)))
+
+;;; Override Methods
+;;
+;; These methods override aspects of how semantic-tools can access
+;; the tags created by the javascript parser.
+;; Local context
+(define-mode-overload-implementation semantic-get-local-variables
+  javascript-mode ()
+  "Get local values from a specific context.
+This function overrides `get-local-variables'."
+  ;; Does javascript have identifiable local variables?
+  nil)
+
+
+;;; Setup Function
+;;
+;; This sets up the javascript parser
+
+;;;###autoload
+(defun wisent-javascript-setup-parser ()
+  "Setup buffer for parse."
+  (wisent-javascript-jv-wy--install-parser)
+  (setq
+   ;; Lexical Analysis
+   semantic-lex-analyzer 'javascript-lexer-jv
+   semantic-lex-number-expression semantic-java-number-regexp
+   ;; semantic-lex-depth nil ;; Full lexical analysis
+   ;; Parsing
+   semantic-tag-expand-function 'wisent-javascript-jv-expand-tag
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-name
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-command-separation-character ";"
+   ))
+
+;;;###autoload
+(add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser)
+;;;###autoload
+(add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
+
+(provide 'wisent-javascript-jv)
+
+;;; wisent-javascript-jv.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-python-wy.el b/site/cedet-1.0pre7/semantic/wisent/wisent-python-wy.el
new file mode 100644
index 0000000..43bce8b
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-python-wy.el
@@ -0,0 +1,755 @@
+;;; wisent-python-wy.el --- Generated parser support file
+
+;; Copyright (C) 2002, 2003, 2004, 2007 Richard Kim
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:49-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file wisent-python.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst wisent-python-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("and" . AND)
+     ("assert" . ASSERT)
+     ("break" . BREAK)
+     ("class" . CLASS)
+     ("continue" . CONTINUE)
+     ("def" . DEF)
+     ("del" . DEL)
+     ("elif" . ELIF)
+     ("else" . ELSE)
+     ("except" . EXCEPT)
+     ("exec" . EXEC)
+     ("finally" . FINALLY)
+     ("for" . FOR)
+     ("from" . FROM)
+     ("global" . GLOBAL)
+     ("if" . IF)
+     ("import" . IMPORT)
+     ("in" . IN)
+     ("is" . IS)
+     ("lambda" . LAMBDA)
+     ("not" . NOT)
+     ("or" . OR)
+     ("pass" . PASS)
+     ("print" . PRINT)
+     ("raise" . RAISE)
+     ("return" . RETURN)
+     ("try" . TRY)
+     ("while" . WHILE)
+     ("yield" . YIELD))
+   '(("yield" summary "Create a generator function")
+     ("while" summary "Start a 'while' loop")
+     ("try" summary "Start of statements protected by exception handlers")
+     ("return" summary "Return from a function")
+     ("raise" summary "Raise an exception")
+     ("print" summary "Print each argument to standard output")
+     ("pass" summary "Statement that does nothing")
+     ("or" summary "Binary logical 'or' operator")
+     ("not" summary "Unary boolean negation operator")
+     ("is" summary "Binary operator that tests for object equality")
+     ("in" summary "Part of 'for' statement ")
+     ("import" summary "Load specified modules")
+     ("if" summary "Start 'if' conditional statement")
+     ("global" summary "Declare one or more symbols as global symbols")
+     ("from" summary "Modify behavior of 'import' statement")
+     ("for" summary "Start a 'for' loop")
+     ("finally" summary "Specify code to be executed after 'try' statements whether or not an exception occured")
+     ("exec" summary "Dynamically execute python code")
+     ("except" summary "Specify exception handlers along with 'try' keyword")
+     ("else" summary "Start the 'else' clause following an 'if' statement")
+     ("elif" summary "Shorthand for 'else if' following an 'if' statement")
+     ("del" summary "Delete specified objects, i.e., undo what assignment did")
+     ("def" summary "Define a new function")
+     ("continue" summary "Skip to the next interation of enclosing for or whilte loop")
+     ("class" summary "Define a new class")
+     ("break" summary "Terminate 'for' or 'while loop")
+     ("assert" summary "Raise AssertionError exception if <expr> is false")
+     ("and" summary "Logical AND binary operator ... ")))
+  "Table of language keywords.")
+
+(defconst wisent-python-wy--token-table
+  (semantic-lex-make-type-table
+   '(("symbol"
+      (NAME))
+     ("number"
+      (NUMBER_LITERAL))
+     ("string"
+      (STRING_LITERAL))
+     ("punctuation"
+      (BACKQUOTE . "`")
+      (ASSIGN . "=")
+      (COMMA . ",")
+      (SEMICOLON . ";")
+      (COLON . ":")
+      (BAR . "|")
+      (TILDE . "~")
+      (PERIOD . ".")
+      (MINUS . "-")
+      (PLUS . "+")
+      (MOD . "%")
+      (DIV . "/")
+      (MULT . "*")
+      (AMP . "&")
+      (GT . ">")
+      (LT . "<")
+      (HAT . "^")
+      (NE . "!=")
+      (LTGT . "<>")
+      (HATEQ . "^=")
+      (OREQ . "|=")
+      (AMPEQ . "&=")
+      (MODEQ . "%=")
+      (DIVEQ . "/=")
+      (MULTEQ . "*=")
+      (MINUSEQ . "-=")
+      (PLUSEQ . "+=")
+      (LE . "<=")
+      (GE . ">=")
+      (EQ . "==")
+      (EXPONENT . "**")
+      (GTGT . ">>")
+      (LTLT . "<<")
+      (DIVDIV . "//")
+      (DIVDIVEQ . "//=")
+      (EXPEQ . "**=")
+      (GTGTEQ . ">>=")
+      (LTLTEQ . "<<="))
+     ("close-paren"
+      (RBRACK . "]")
+      (RBRACE . "}")
+      (RPAREN . ")"))
+     ("open-paren"
+      (LBRACK . "[")
+      (LBRACE . "{")
+      (LPAREN . "("))
+     ("block"
+      (BRACK_BLOCK . "(LBRACK RBRACK)")
+      (BRACE_BLOCK . "(LBRACE RBRACE)")
+      (PAREN_BLOCK . "(LPAREN RPAREN)"))
+     ("indentation"
+      (INDENT_BLOCK . "(INDENT DEDENT)")
+      (DEDENT . "[^:INDENT:]")
+      (INDENT . "^\\s-+"))
+     ("newline"
+      (NEWLINE . "\n"))
+     ("charquote"
+      (BACKSLASH . "\\")))
+   '(("keyword" :declared t)
+     ("symbol" :declared t)
+     ("number" :declared t)
+     ("punctuation" :declared t)
+     ("block" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst wisent-python-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((BACKSLASH NEWLINE INDENT DEDENT INDENT_BLOCK PAREN_BLOCK BRACE_BLOCK BRACK_BLOCK LPAREN RPAREN LBRACE RBRACE LBRACK RBRACK LTLTEQ GTGTEQ EXPEQ DIVDIVEQ DIVDIV LTLT GTGT EXPONENT EQ GE LE PLUSEQ MINUSEQ MULTEQ DIVEQ MODEQ AMPEQ OREQ HATEQ LTGT NE HAT LT GT AMP MULT DIV MOD PLUS MINUS PERIOD TILDE BAR COLON SEMICOLON COMMA ASSIGN BACKQUOTE STRING_LITERAL NUMBER_LITERAL NAME AND ASSERT BREAK CLASS CONTINUE DEF DEL ELIF ELSE EXCEPT EXEC FINALLY FOR FROM GLOBAL IF IMPORT IN IS LAMBDA NOT OR PASS PRINT RAISE RETURN TRY WHILE YIELD)
+       nil
+       (goal
+	((NEWLINE))
+	((simple_stmt))
+	((compound_stmt)))
+       (simple_stmt
+	((small_stmt_list semicolon_opt NEWLINE)))
+       (small_stmt_list
+	((small_stmt))
+	((small_stmt_list SEMICOLON small_stmt)))
+       (small_stmt
+	((expr_stmt))
+	((print_stmt))
+	((del_stmt))
+	((pass_stmt))
+	((flow_stmt))
+	((import_stmt))
+	((global_stmt))
+	((exec_stmt))
+	((assert_stmt)))
+       (print_stmt
+	((PRINT print_stmt_trailer)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (print_stmt_trailer
+	((test_list_opt)
+	 nil)
+	((GTGT test trailing_test_list_with_opt_comma_opt)
+	 nil))
+       (trailing_test_list_with_opt_comma_opt
+	(nil)
+	((trailing_test_list comma_opt)
+	 nil))
+       (trailing_test_list
+	((COMMA test)
+	 nil)
+	((trailing_test_list COMMA test)
+	 nil))
+       (expr_stmt
+	((testlist expr_stmt_trailer)
+	 (if
+	     (and $2
+		  (stringp $1)
+		  (string-match "^\\(\\sw\\|\\s_\\)+$" $1))
+	     (wisent-raw-tag
+	      (semantic-tag-new-variable $1 nil nil))
+	   (wisent-raw-tag
+	    (semantic-tag-new-code $1 nil)))))
+       (expr_stmt_trailer
+	((augassign testlist))
+	((eq_testlist_zom)))
+       (eq_testlist_zom
+	(nil)
+	((eq_testlist_zom ASSIGN testlist)
+	 (identity $3)))
+       (augassign
+	((PLUSEQ))
+	((MINUSEQ))
+	((MULTEQ))
+	((DIVEQ))
+	((MODEQ))
+	((AMPEQ))
+	((OREQ))
+	((HATEQ))
+	((LTLTEQ))
+	((GTGTEQ))
+	((EXPEQ))
+	((DIVDIVEQ)))
+       (del_stmt
+	((DEL exprlist)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (exprlist
+	((expr_list comma_opt)
+	 nil))
+       (expr_list
+	((expr)
+	 nil)
+	((expr_list COMMA expr)
+	 nil))
+       (pass_stmt
+	((PASS)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (flow_stmt
+	((break_stmt))
+	((continue_stmt))
+	((return_stmt))
+	((raise_stmt))
+	((yield_stmt)))
+       (break_stmt
+	((BREAK)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (continue_stmt
+	((CONTINUE)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (return_stmt
+	((RETURN testlist_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (testlist_opt
+	(nil)
+	((testlist)
+	 nil))
+       (yield_stmt
+	((YIELD testlist)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (raise_stmt
+	((RAISE zero_one_two_or_three_tests)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (zero_one_two_or_three_tests
+	(nil)
+	((test zero_one_or_two_tests)
+	 nil))
+       (zero_one_or_two_tests
+	(nil)
+	((COMMA test zero_or_one_comma_test)
+	 nil))
+       (zero_or_one_comma_test
+	(nil)
+	((COMMA test)
+	 nil))
+       (import_stmt
+	((IMPORT dotted_as_name_list)
+	 (wisent-raw-tag
+	  (semantic-tag-new-include $2 nil)))
+	((FROM dotted_name IMPORT star_or_import_as_name_list)
+	 (wisent-raw-tag
+	  (semantic-tag-new-include $2 nil))))
+       (dotted_as_name_list
+	((dotted_as_name))
+	((dotted_as_name_list COMMA dotted_as_name)))
+       (star_or_import_as_name_list
+	((MULT)
+	 nil)
+	((import_as_name_list)
+	 nil))
+       (import_as_name_list
+	((import_as_name)
+	 nil)
+	((import_as_name_list COMMA import_as_name)
+	 nil))
+       (import_as_name
+	((NAME name_name_opt)
+	 nil))
+       (dotted_as_name
+	((dotted_name name_name_opt)))
+       (name_name_opt
+	(nil)
+	((NAME NAME)
+	 nil))
+       (dotted_name
+	((NAME))
+	((dotted_name PERIOD NAME)
+	 (format "%s.%s" $1 $3)))
+       (global_stmt
+	((GLOBAL comma_sep_name_list)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (comma_sep_name_list
+	((NAME))
+	((comma_sep_name_list COMMA NAME)))
+       (exec_stmt
+	((EXEC expr exec_trailer)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (exec_trailer
+	(nil)
+	((IN test comma_test_opt)
+	 nil))
+       (comma_test_opt
+	(nil)
+	((COMMA test)
+	 nil))
+       (assert_stmt
+	((ASSERT test comma_test_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (compound_stmt
+	((if_stmt))
+	((while_stmt))
+	((for_stmt))
+	((try_stmt))
+	((funcdef))
+	((class_declaration)))
+       (if_stmt
+	((IF test COLON suite elif_suite_pair_list else_suite_pair_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (elif_suite_pair_list
+	(nil)
+	((elif_suite_pair_list ELIF test COLON suite)
+	 nil))
+       (else_suite_pair_opt
+	(nil)
+	((ELSE COLON suite)
+	 nil))
+       (suite
+	((simple_stmt)
+	 (list $1))
+	((NEWLINE indented_block)
+	 (progn $2)))
+       (indented_block
+	((INDENT_BLOCK)
+	 (semantic-parse-region
+	  (car $region1)
+	  (cdr $region1)
+	  'indented_block_body 1)))
+       (indented_block_body
+	((INDENT)
+	 nil)
+	((DEDENT)
+	 nil)
+	((simple_stmt))
+	((compound_stmt)))
+       (while_stmt
+	((WHILE test COLON suite else_suite_pair_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (for_stmt
+	((FOR exprlist IN testlist COLON suite else_suite_pair_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (try_stmt
+	((TRY COLON suite except_clause_suite_pair_list else_suite_pair_opt)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil)))
+	((TRY COLON suite FINALLY COLON suite)
+	 (wisent-raw-tag
+	  (semantic-tag-new-code $1 nil))))
+       (except_clause_suite_pair_list
+	((except_clause COLON suite)
+	 nil)
+	((except_clause_suite_pair_list except_clause COLON suite)
+	 nil))
+       (except_clause
+	((EXCEPT zero_one_or_two_test)
+	 nil))
+       (zero_one_or_two_test
+	(nil)
+	((test zero_or_one_comma_test)
+	 nil))
+       (funcdef
+	((DEF NAME function_parameter_list COLON suite)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function $2 nil $3))))
+       (function_parameter_list
+	((PAREN_BLOCK)
+	 (let
+	     ((wisent-python-EXPANDING-block t))
+	   (semantic-parse-region
+	    (car $region1)
+	    (cdr $region1)
+	    'function_parameters 1))))
+       (function_parameters
+	((LPAREN)
+	 nil)
+	((RPAREN)
+	 nil)
+	((function_parameter COMMA))
+	((function_parameter RPAREN)))
+       (function_parameter
+	((fpdef_opt_test))
+	((MULT NAME)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil nil)))
+	((EXPONENT NAME)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil nil))))
+       (class_declaration
+	((CLASS NAME paren_class_list_opt COLON suite)
+	 (wisent-raw-tag
+	  (semantic-tag-new-type $2 $1 $5
+				 (cons $3 nil)))))
+       (paren_class_list_opt
+	(nil)
+	((paren_class_list)))
+       (paren_class_list
+	((PAREN_BLOCK)
+	 (let
+	     ((wisent-python-EXPANDING-block t))
+	   (mapcar 'semantic-tag-name
+		   (semantic-parse-region
+		    (car $region1)
+		    (cdr $region1)
+		    'paren_classes 1)))))
+       (paren_classes
+	((LPAREN)
+	 nil)
+	((RPAREN)
+	 nil)
+	((paren_class COMMA)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil)))
+	((paren_class RPAREN)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil))))
+       (paren_class
+	((dotted_name)))
+       (test
+	((test_test))
+	((lambdef)))
+       (test_test
+	((and_test))
+	((test_test OR and_test)
+	 nil))
+       (and_test
+	((not_test))
+	((and_test AND not_test)
+	 nil))
+       (not_test
+	((NOT not_test)
+	 nil)
+	((comparison)))
+       (comparison
+	((expr))
+	((comparison comp_op expr)
+	 nil))
+       (comp_op
+	((LT))
+	((GT))
+	((EQ))
+	((GE))
+	((LE))
+	((LTGT))
+	((NE))
+	((IN))
+	((NOT IN))
+	((IS))
+	((IS NOT)))
+       (expr
+	((xor_expr))
+	((expr BAR xor_expr)
+	 nil))
+       (xor_expr
+	((and_expr))
+	((xor_expr HAT and_expr)
+	 nil))
+       (and_expr
+	((shift_expr))
+	((and_expr AMP shift_expr)
+	 nil))
+       (shift_expr
+	((arith_expr))
+	((shift_expr shift_expr_operators arith_expr)
+	 nil))
+       (shift_expr_operators
+	((LTLT))
+	((GTGT)))
+       (arith_expr
+	((term))
+	((arith_expr plus_or_minus term)
+	 nil))
+       (plus_or_minus
+	((PLUS))
+	((MINUS)))
+       (term
+	((factor))
+	((term term_operator factor)
+	 nil))
+       (term_operator
+	((MULT))
+	((DIV))
+	((MOD))
+	((DIVDIV)))
+       (factor
+	((prefix_operators factor)
+	 nil)
+	((power)))
+       (prefix_operators
+	((PLUS))
+	((MINUS))
+	((TILDE)))
+       (power
+	((atom trailer_zom exponent_zom)
+	 (concat $1
+		 (if $2
+		     (concat " " $2 " ")
+		   "")
+		 (if $3
+		     (concat " " $3)
+		   ""))))
+       (trailer_zom
+	(nil)
+	((trailer_zom trailer)
+	 nil))
+       (exponent_zom
+	(nil)
+	((exponent_zom EXPONENT factor)
+	 nil))
+       (trailer
+	((PAREN_BLOCK)
+	 nil)
+	((BRACK_BLOCK)
+	 nil)
+	((PERIOD NAME)
+	 nil))
+       (atom
+	((PAREN_BLOCK)
+	 nil)
+	((BRACK_BLOCK)
+	 nil)
+	((BRACE_BLOCK)
+	 nil)
+	((BACKQUOTE testlist BACKQUOTE)
+	 nil)
+	((NAME))
+	((NUMBER_LITERAL))
+	((one_or_more_string)))
+       (test_list_opt
+	(nil)
+	((testlist)
+	 nil))
+       (testlist
+	((comma_sep_test_list comma_opt)))
+       (comma_sep_test_list
+	((test))
+	((comma_sep_test_list COMMA test)
+	 (format "%s, %s" $1 $3)))
+       (one_or_more_string
+	((STRING_LITERAL))
+	((one_or_more_string STRING_LITERAL)
+	 (concat $1 $2)))
+       (lambdef
+	((LAMBDA varargslist_opt COLON test)
+	 (format "%s %s" $1
+		 (or $2 ""))))
+       (varargslist_opt
+	(nil)
+	((varargslist)))
+       (varargslist
+	((fpdef_opt_test_list_comma_zom rest_args)
+	 (nconc $2 $1))
+	((fpdef_opt_test_list comma_opt)))
+       (rest_args
+	((MULT NAME multmult_name_opt)
+	 nil)
+	((EXPONENT NAME)
+	 nil))
+       (multmult_name_opt
+	(nil)
+	((COMMA EXPONENT NAME)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $3 nil nil))))
+       (fpdef_opt_test_list_comma_zom
+	(nil)
+	((fpdef_opt_test_list_comma_zom fpdef_opt_test COMMA)
+	 (nconc $2 $1)))
+       (fpdef_opt_test_list
+	((fpdef_opt_test))
+	((fpdef_opt_test_list COMMA fpdef_opt_test)
+	 (nconc $3 $1)))
+       (fpdef_opt_test
+	((fpdef eq_test_opt)))
+       (fpdef
+	((NAME)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $1 nil nil))))
+       (fplist
+	((fpdef_list comma_opt)))
+       (fpdef_list
+	((fpdef))
+	((fpdef_list COMMA fpdef)))
+       (eq_test_opt
+	(nil)
+	((ASSIGN test)
+	 nil))
+       (comma_opt
+	(nil)
+	((COMMA)))
+       (semicolon_opt
+	(nil)
+	((SEMICOLON))))
+     '(goal function_parameter paren_class indented_block function_parameters paren_classes indented_block_body)))
+  "Parser table.")
+
+(defun wisent-python-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table wisent-python-wy--parse-table
+	semantic-debug-parser-source "wisent-python.wy"
+	semantic-flex-keywords-obarray wisent-python-wy--keyword-table
+	semantic-lex-types-obarray wisent-python-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-block-type-analyzer wisent-python-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" LPAREN PAREN_BLOCK)
+     ("{" LBRACE BRACE_BLOCK)
+     ("[" LBRACK BRACK_BLOCK))
+    (")" RPAREN)
+    ("}" RBRACE)
+    ("]" RBRACK))
+  )
+
+(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'NAME)
+
+(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-string-type-analyzer wisent-python-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\(\\s.\\|\\s$\\|\\s'\\)+"
+  '((BACKQUOTE . "`")
+    (ASSIGN . "=")
+    (COMMA . ",")
+    (SEMICOLON . ";")
+    (COLON . ":")
+    (BAR . "|")
+    (TILDE . "~")
+    (PERIOD . ".")
+    (MINUS . "-")
+    (PLUS . "+")
+    (MOD . "%")
+    (DIV . "/")
+    (MULT . "*")
+    (AMP . "&")
+    (GT . ">")
+    (LT . "<")
+    (HAT . "^")
+    (NE . "!=")
+    (LTGT . "<>")
+    (HATEQ . "^=")
+    (OREQ . "|=")
+    (AMPEQ . "&=")
+    (MODEQ . "%=")
+    (DIVEQ . "/=")
+    (MULTEQ . "*=")
+    (MINUSEQ . "-=")
+    (PLUSEQ . "+=")
+    (LE . "<=")
+    (GE . ">=")
+    (EQ . "==")
+    (EXPONENT . "**")
+    (GTGT . ">>")
+    (LTLT . "<<")
+    (DIVDIV . "//")
+    (DIVDIVEQ . "//=")
+    (EXPEQ . "**=")
+    (GTGTEQ . ">>=")
+    (LTLTEQ . "<<="))
+  'punctuation)
+
+
+;;; Epilogue
+;;
+
+(provide 'wisent-python-wy)
+
+;;; wisent-python-wy.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-python.el b/site/cedet-1.0pre7/semantic/wisent/wisent-python.el
new file mode 100644
index 0000000..23a7cad
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-python.el
@@ -0,0 +1,348 @@
+;;; wisent-python.el --- Semantic support for Python
+;;
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+;; Copyright (C) 2002, 2004, 2006 Richard Kim
+;;
+;; Author: Richard Kim <ryk@dspwiz.com>
+;; Maintainer: Richard Kim <ryk@dspwiz.com>
+;; Created: June 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-python.el,v 1.54 2009/01/28 16:07:22 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library contains Semantic support code for the Python
+;; programming language.  The LALR grammar used to parse Python
+;; sources is in the wisent-python.wy file.
+;;
+;; The official website for the Python language is at
+;; <http://python.org/>.
+;;
+;; An X/Emacs major mode for editing Python source code is available
+;; at <http://sourceforge.net/projects/python-mode/>.
+;;
+;;; Code:
+
+(require 'semantic-wisent)
+(require 'wisent-python-wy)
+
+;;; Lexical analysis
+;;
+
+;; Python strings are delimited by either single quotes or double
+;; quotes, e.g., "I'm a string" and 'I too am s string'.
+;; In addition a string can have either a 'r' and/or 'u' prefix.
+;; The 'r' prefix means raw, i.e., normal backslash substitutions are
+;; to be suppressed.  For example, r"01\n34" is a string with six
+;; characters 0, 1, \, n, 3 and 4.  The 'u' prefix means the following
+;; string is a unicode.
+(defconst wisent-python-string-re
+  (concat (regexp-opt '("r" "u" "ur" "R" "U" "UR" "Ur" "uR") t)
+          "?['\"]")
+  "Regexp matching beginning of a python string.")
+
+(defvar wisent-python-EXPANDING-block nil
+  "Non-nil when expanding a paren block for Python lexical analyzer.")
+
+(defun wisent-python-implicit-line-joining-p ()
+  "Return non-nil if implicit line joining is active.
+That is, if inside an expressions in parentheses, square brackets or
+curly braces."
+  wisent-python-EXPANDING-block)
+
+(defsubst wisent-python-forward-string ()
+  "Move point at the end of the python string at point."
+  (when (looking-at wisent-python-string-re)
+     ;; skip the prefix
+    (and (match-end 1) (goto-char (match-end 1)))
+    ;; skip the quoted part
+    (cond
+     ((looking-at "\"\"\"[^\"]")
+      (search-forward "\"\"\"" nil nil 2))
+     ((looking-at "'''[^']")
+      (search-forward "'''" nil nil 2))
+     ((forward-sexp 1)))))
+
+(defun wisent-python-forward-line ()
+  "Move point to the beginning of the next logical line.
+Usually this is simply the next physical line unless strings,
+implicit/explicit line continuation, blank lines, or comment lines are
+encountered.  This function skips over such items so that the point is
+at the beginning of the next logical line.  If the current logical
+line ends at the end of the buffer, leave the point there."
+  (while (not (eolp))
+    (when (= (point)
+             (progn
+               (cond
+                ;; Skip over python strings.
+                ((looking-at wisent-python-string-re)
+                 (wisent-python-forward-string))
+                ;; At a comment start just goto end of line.
+                ((looking-at "\\s<")
+                 (end-of-line))
+                ;; Skip over generic lists and strings.
+                ((looking-at "\\(\\s(\\|\\s\"\\)")
+                 (forward-sexp 1))
+                ;; At the explicit line continuation character
+                ;; (backslash) move to next line.
+                ((looking-at "\\s\\")
+                 (forward-line 1))
+                ;; Skip over white space, word, symbol, punctuation,
+                ;; and paired delimiter (backquote) characters.
+                ((skip-syntax-forward "-w_.$)")))
+               (point)))
+      (error "python-forward-line endless loop detected")))
+  ;; The point is at eol, skip blank and comment lines.
+  (forward-comment (point-max))
+  ;; Goto the beginning of the next line.
+  (or (eobp) (beginning-of-line)))
+
+(defun wisent-python-forward-line-skip-indented ()
+  "Move point to the next logical line, skipping indented lines.
+That is the next line whose indentation is less than or equal to the
+identation of the current line."
+  (let ((indent (current-indentation)))
+    (while (progn (wisent-python-forward-line)
+                  (and (not (eobp))
+                       (> (current-indentation) indent))))))
+
+(defun wisent-python-end-of-block ()
+  "Move point to the end of the current block."
+  (let ((indent (current-indentation)))
+    (while (and (not (eobp)) (>= (current-indentation) indent))
+      (wisent-python-forward-line-skip-indented))
+    ;; Don't include final comments in current block bounds
+    (forward-comment (- (point-max)))
+    (or (bolp) (forward-line 1))
+    ))
+
+;; Indentation stack, what the Python (2.3) language spec. says:
+;;
+;; The indentation levels of consecutive lines are used to generate
+;; INDENT and DEDENT tokens, using a stack, as follows.
+;;
+;; Before the first line of the file is read, a single zero is pushed
+;; on the stack; this will never be popped off again. The numbers
+;; pushed on the stack will always be strictly increasing from bottom
+;; to top. At the beginning of each logical line, the line's
+;; indentation level is compared to the top of the stack. If it is
+;; equal, nothing happens. If it is larger, it is pushed on the stack,
+;; and one INDENT token is generated. If it is smaller, it must be one
+;; of the numbers occurring on the stack; all numbers on the stack
+;; that are larger are popped off, and for each number popped off a
+;; DEDENT token is generated. At the end of the file, a DEDENT token
+;; is generated for each number remaining on the stack that is larger
+;; than zero.
+(defvar wisent-python-indent-stack)
+
+(define-lex-analyzer wisent-python-lex-beginning-of-line
+  "Detect and create python indentation tokens at beginning of line."
+  (and
+   (bolp) (not (wisent-python-implicit-line-joining-p))
+   (let ((last-indent (car wisent-python-indent-stack))
+         (last-pos (point))
+         (curr-indent (current-indentation)))
+     (skip-syntax-forward "-")
+     (cond
+      ;; Skip comments and blank lines. No change in indentation.
+      ((or (eolp) (looking-at semantic-lex-comment-regex))
+       (forward-comment (point-max))
+       (or (eobp) (beginning-of-line))
+       (setq semantic-lex-end-point (point))
+       ;; Loop lexer to handle the next line.
+       t)
+      ;; No change in indentation.
+      ((= curr-indent last-indent)
+       (setq semantic-lex-end-point (point))
+       ;; Try next analyzers.
+       nil)
+      ;; Indentation increased
+      ((> curr-indent last-indent)
+       (if (or (not semantic-lex-maximum-depth)
+               (< semantic-lex-current-depth semantic-lex-maximum-depth))
+           (progn
+             ;; Return an INDENT lexical token
+             (setq semantic-lex-current-depth (1+ semantic-lex-current-depth))
+             (push curr-indent wisent-python-indent-stack)
+             (semantic-lex-push-token
+              (semantic-lex-token 'INDENT last-pos (point))))
+         ;; Add an INDENT_BLOCK token
+         (semantic-lex-push-token
+          (semantic-lex-token
+           'INDENT_BLOCK
+           (progn (beginning-of-line) (point))
+           (semantic-lex-unterminated-syntax-protection 'INDENT_BLOCK
+             (wisent-python-end-of-block)
+             (point)))))
+       ;; Loop lexer to handle tokens in current line.
+       t)
+      ;; Indentation decreased
+      (t
+       ;; Pop items from indentation stack
+       (while (< curr-indent last-indent)
+         (pop wisent-python-indent-stack)
+         (setq semantic-lex-current-depth (1- semantic-lex-current-depth)
+               last-indent (car wisent-python-indent-stack))
+         (semantic-lex-push-token
+          (semantic-lex-token 'DEDENT last-pos (point))))
+       ;; If pos did not change, then we must return nil so that
+       ;; other lexical analyzers can be run.
+       (/= last-pos (point)))
+      )))
+  ;; All the work was done in the above analyzer matching condition.
+  )
+
+(define-lex-regex-analyzer wisent-python-lex-end-of-line
+  "Detect and create python newline tokens.
+Just skip the newline character if the following line is an implicit
+continuation of current line."
+  "\\(\n\\|\\s>\\)"
+  (if (wisent-python-implicit-line-joining-p)
+      (setq semantic-lex-end-point (match-end 0))
+    (semantic-lex-push-token
+     (semantic-lex-token 'NEWLINE (point) (match-end 0)))))
+
+(define-lex-regex-analyzer wisent-python-lex-string
+  "Detect and create python string tokens."
+  wisent-python-string-re
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'STRING_LITERAL
+    (point)
+    (semantic-lex-unterminated-syntax-protection 'STRING_LITERAL
+      (wisent-python-forward-string)
+      (point)))))
+
+(define-lex-regex-analyzer wisent-python-lex-ignore-backslash
+  "Detect and skip over backslash (explicit line joining) tokens.
+A backslash must be the last token of a physical line, it is illegal
+elsewhere on a line outside a string literal."
+  "\\s\\\\s-*$"
+  ;; Skip over the detected backslash and go to the first
+  ;; non-whitespace character in the next physical line.
+  (forward-line)
+  (skip-syntax-forward "-")
+  (setq semantic-lex-end-point (point)))
+
+(define-lex wisent-python-lexer
+  "Lexical Analyzer for Python code."
+  ;; Must analyze beginning of line first to handle indentation.
+  wisent-python-lex-beginning-of-line
+  wisent-python-lex-end-of-line
+  ;; Must analyze string before symbol to handle string prefix.
+  wisent-python-lex-string
+  ;; Analyzers auto-generated from grammar.
+  wisent-python-wy--<number>-regexp-analyzer
+  wisent-python-wy--<keyword>-keyword-analyzer
+  wisent-python-wy--<symbol>-regexp-analyzer
+  wisent-python-wy--<block>-block-analyzer
+  wisent-python-wy--<punctuation>-string-analyzer
+  ;; Ignored things.
+  wisent-python-lex-ignore-backslash
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-comments
+  ;; Signal error on unhandled syntax.
+  semantic-lex-default-action)
+
+;;; Overridden Semantic API.
+;;
+(define-mode-local-override semantic-lex python-mode
+  (start end &optional depth length)
+  "Lexically analyze python code in current buffer.
+See the function `semantic-lex' for the meaning of the START, END,
+DEPTH and LENGTH arguments.
+This function calls `wisent-python-lexer' to actually perform the
+lexical analysis, then emits the necessary python DEDENT tokens from
+what remains in the `wisent-python-indent-stack'."
+  (let* ((wisent-python-indent-stack (list 0))
+         (stream (wisent-python-lexer start end depth length))
+         (semantic-lex-token-stream nil))
+    ;; Emit DEDENT tokens if something remains in the INDENT stack.
+    (while (> (pop wisent-python-indent-stack) 0)
+      (semantic-lex-push-token (semantic-lex-token 'DEDENT end end)))
+    (nconc stream (nreverse semantic-lex-token-stream))))
+
+(define-mode-local-override semantic-get-local-variables python-mode ()
+  "Get the local variables based on point's context.
+To be implemented for python!  For now just return nil."
+  nil)
+
+(defcustom-mode-local-semantic-dependency-system-include-path
+  python-mode semantic-python-dependency-system-include-path
+  nil
+  "The system include path used by Python langauge.")
+
+;;; Enable Semantic in `python-mode'.
+;;
+
+;;;###autoload
+(defun wisent-python-default-setup ()
+  "Setup buffer for parse."
+  (wisent-python-wy--install-parser)
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  (setq
+   ;; Character used to separation a parent/child relationship
+   semantic-type-relation-separator-character '(".")
+   semantic-command-separation-character ";"
+   ;; The following is no more necessary as semantic-lex is overriden
+   ;; in python-mode.
+   ;; semantic-lex-analyzer 'wisent-python-lexer
+
+   ;; Semantic to take over from the one provided by python.
+   ;; The python one, if it uses the senator advice, will hang
+   ;; Emacs unrecoverably.
+   imenu-create-index-function 'semantic-create-imenu-index
+
+   ;; I need a python guru to update this list:
+   semantic-symbol->name-assoc-list-for-type-parts '((variable . "Variables")
+						     (function . "Methods"))
+   semantic-symbol->name-assoc-list '((type . "Classes")
+				      (variable . "Variables")
+				      (function . "Functions")
+				      (include  . "Imports")
+				      (package  . "Package")
+				      (code . "Code")))
+   )
+
+;;;###autoload
+(add-hook 'python-mode-hook 'wisent-python-default-setup)
+
+;; Make sure the newer python modes pull in the same python
+;; mode overrides.
+(define-child-mode python-2-mode python-mode "Python 2 mode")
+(define-child-mode python-3-mode python-mode "Python 3 mode")
+
+
+;;; Test
+;;
+(defun wisent-python-lex-buffer ()
+  "Run `wisent-python-lexer' on current buffer."
+  (interactive)
+  (semantic-lex-init)
+  (let ((token-stream (semantic-lex (point-min) (point-max) 0)))
+    (with-current-buffer (get-buffer-create "*wisent-python-lexer*")
+      (erase-buffer)
+      (pp token-stream (current-buffer))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+(provide 'wisent-python)
+
+;;; wisent-python.el ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent-python.wy b/site/cedet-1.0pre7/semantic/wisent/wisent-python.wy
new file mode 100644
index 0000000..7e88c0f
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent-python.wy
@@ -0,0 +1,1078 @@
+;;; wisent-python.wy -- LALR grammar for Python
+;;
+;; Copyright (C) 2002, 2003, 2004, 2007 Richard Kim
+;;
+;; Author: Richard Kim <ryk@dspwiz.com>
+;; Maintainer: Richard Kim <ryk@dspwiz.com>
+;; Created: June 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent-python.wy,v 1.35 2007/03/08 02:12:07 zappo Exp $
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This is an LALR python parser that follows the official python
+;; grammar closely with very few exceptions.
+;;
+;;; To do:
+;;
+;; * Verify that semantic-lex-python-number regexp is correct.
+
+;; --------
+;; Settings
+;; --------
+
+;;%package wisent-python-wy
+
+%languagemode python-mode
+
+;; The default start symbol
+%start goal
+;; Alternate entry points
+;;    - Needed by partial re-parse
+%start function_parameter
+%start paren_class
+%start indented_block
+;;    - Needed by EXPANDFULL clauses
+%start function_parameters
+%start paren_classes
+%start indented_block_body
+
+;; -------------------------------
+;; Misc. Python specific terminals
+;; -------------------------------
+;; The value of these tokens are for documentation only, they are not
+;; used by the lexer.
+%token <charquote>   BACKSLASH 	  "\\"
+%token <newline>     NEWLINE      "\n"
+%token <indentation> INDENT       "^\\s-+"
+%token <indentation> DEDENT       "[^:INDENT:]" 
+%token <indentation> INDENT_BLOCK "(INDENT DEDENT)"
+
+;; -----------------------------
+;; Block & Parenthesis terminals
+;; -----------------------------
+%type  <block>       ;;syntax "\\s(\\|\\s)" matchdatatype block
+
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <block>       BRACK_BLOCK "(LBRACK RBRACK)"
+
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+%token <open-paren>  LBRACK      "["
+%token <close-paren> RBRACK      "]"
+
+;; ------------------
+;; Operator terminals
+;; ------------------
+%type  <punctuation> ;;syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
+
+%token <punctuation> LTLTEQ 	"<<="
+%token <punctuation> GTGTEQ 	">>="
+%token <punctuation> EXPEQ	"**="
+%token <punctuation> DIVDIVEQ 	"//="
+%token <punctuation> DIVDIV 	"//"
+%token <punctuation> LTLT 	"<<"
+%token <punctuation> GTGT 	">>"
+%token <punctuation> EXPONENT 	"**"
+%token <punctuation> EQ 	"=="
+%token <punctuation> GE 	">="
+%token <punctuation> LE 	"<="
+%token <punctuation> PLUSEQ 	"+="
+%token <punctuation> MINUSEQ 	"-="
+%token <punctuation> MULTEQ 	"*="
+%token <punctuation> DIVEQ 	"/="
+%token <punctuation> MODEQ 	"%="
+%token <punctuation> AMPEQ 	"&="
+%token <punctuation> OREQ 	"|="
+%token <punctuation> HATEQ 	"^="
+%token <punctuation> LTGT 	"<>"
+%token <punctuation> NE 	"!="
+%token <punctuation> HAT 	"^"
+%token <punctuation> LT 	"<"
+%token <punctuation> GT 	">"
+%token <punctuation> AMP 	"&"
+%token <punctuation> MULT 	"*"
+%token <punctuation> DIV 	"/"
+%token <punctuation> MOD 	"%"
+%token <punctuation> PLUS 	"+"
+%token <punctuation> MINUS 	"-"
+%token <punctuation> PERIOD 	"."
+%token <punctuation> TILDE 	"~"
+%token <punctuation> BAR 	"|"
+%token <punctuation> COLON 	":"
+%token <punctuation> SEMICOLON	";"
+%token <punctuation> COMMA 	","
+%token <punctuation> ASSIGN 	"="
+%token <punctuation> BACKQUOTE	"`"
+
+
+;; -----------------
+;; Literal terminals
+;; -----------------
+%token <string>      STRING_LITERAL
+
+%type  <number>      ;;syntax semantic-lex-number-expression
+%token <number>      NUMBER_LITERAL
+
+%type  <symbol>      ;;syntax "\\(\\sw\\|\\s_\\)+"
+%token <symbol>      NAME
+
+;; -----------------
+;; Keyword terminals
+;; -----------------
+%type  <keyword> ;;syntax "\\(\\sw\\|\\s_\\)+" matchdatatype keyword
+
+%keyword AND	     "and"
+%put     AND summary
+"Logical AND binary operator ... "
+
+%keyword ASSERT	     "assert"
+%put     ASSERT summary
+"Raise AssertionError exception if <expr> is false"
+
+%keyword BREAK	     "break"
+%put     BREAK summary
+"Terminate 'for' or 'while loop"
+
+%keyword CLASS	     "class"
+%put     CLASS summary
+"Define a new class"
+
+%keyword CONTINUE	     "continue"
+%put     CONTINUE summary
+"Skip to the next interation of enclosing for or whilte loop"
+
+%keyword DEF	     "def"
+%put     DEF summary
+"Define a new function"
+
+%keyword DEL	     "del"
+%put     DEL summary
+"Delete specified objects, i.e., undo what assignment did"
+
+%keyword ELIF	     "elif"
+%put     ELIF summary
+"Shorthand for 'else if' following an 'if' statement"
+
+%keyword ELSE	     "else"
+%put     ELSE summary
+"Start the 'else' clause following an 'if' statement"
+
+%keyword EXCEPT	     "except"
+%put     EXCEPT summary
+"Specify exception handlers along with 'try' keyword"
+
+%keyword EXEC	     "exec"
+%put     EXEC summary
+"Dynamically execute python code"
+
+%keyword FINALLY	     "finally"
+%put     FINALLY summary
+"Specify code to be executed after 'try' statements whether or not an exception occured"
+
+%keyword FOR	     "for"
+%put     FOR summary
+"Start a 'for' loop"
+
+%keyword FROM	     "from"
+%put     FROM summary
+"Modify behavior of 'import' statement"
+
+%keyword GLOBAL	     "global"
+%put     GLOBAL summary
+"Declare one or more symbols as global symbols"
+
+%keyword IF	     "if"
+%put     IF summary
+"Start 'if' conditional statement"
+
+%keyword IMPORT	     "import"
+%put     IMPORT summary
+"Load specified modules"
+
+%keyword IN	     "in"
+%put     IN summary
+"Part of 'for' statement "
+
+%keyword IS	     "is"
+%put     IS summary
+"Binary operator that tests for object equality"
+
+%keyword LAMBDA	     "lambda"
+%put     LAMDA summary
+"Create anonymous function"
+
+%keyword NOT	     "not"
+%put     NOT summary
+"Unary boolean negation operator"
+
+%keyword OR	     "or"
+%put     OR summary
+"Binary logical 'or' operator"
+
+%keyword PASS	     "pass"
+%put     PASS summary
+"Statement that does nothing"
+
+%keyword PRINT	     "print"
+%put     PRINT summary
+"Print each argument to standard output"
+
+%keyword RAISE	     "raise"
+%put     RAISE summary
+"Raise an exception"
+
+%keyword RETURN	     "return"
+%put     RETURN summary
+"Return from a function"
+
+%keyword TRY	     "try"
+%put     TRY summary
+"Start of statements protected by exception handlers"
+
+%keyword WHILE	     "while"
+%put     WHILE summary
+"Start a 'while' loop"
+
+%keyword YIELD	     "yield"
+%put     YIELD summary
+"Create a generator function"
+
+%%
+
+;;;****************************************************************************
+;;;@ goal
+;;;****************************************************************************
+
+;; simple_stmt are statements that do not involve INDENT tokens
+;; compound_stmt are statements that involve INDENT tokens
+goal
+  : NEWLINE
+  | simple_stmt
+  | compound_stmt
+  ;
+
+;;;****************************************************************************
+;;;@ simple_stmt
+;;;****************************************************************************
+
+;; simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
+simple_stmt
+  : small_stmt_list semicolon_opt NEWLINE
+  ;
+
+;; small_stmt (';' small_stmt)*
+small_stmt_list
+  : small_stmt
+  | small_stmt_list SEMICOLON small_stmt
+  ;
+
+small_stmt
+  : expr_stmt
+  | print_stmt
+  | del_stmt
+  | pass_stmt
+  | flow_stmt
+  | import_stmt
+  | global_stmt
+  | exec_stmt
+  | assert_stmt
+  ;
+
+;;;============================================================================
+;;;@@ print_stmt
+;;;============================================================================
+
+;; print_stmt: 'print' [ test (',' test)* [','] ]
+;;           | '>>' test [ (',' test)+ [','] ]
+print_stmt
+  : PRINT print_stmt_trailer
+    (CODE-TAG $1 nil)
+  ;
+
+;; [ test (',' test)* [','] ] | '>>' test [ (',' test)+ [','] ]
+print_stmt_trailer
+  : test_list_opt
+    ()
+  | GTGT test trailing_test_list_with_opt_comma_opt
+    ()
+  ;
+
+;; [ (',' test)+ [','] ]
+trailing_test_list_with_opt_comma_opt
+  : ;;EMPTY
+  | trailing_test_list comma_opt
+    ()
+  ;
+
+;; (',' test)+
+trailing_test_list
+  : COMMA test
+    ()
+  | trailing_test_list COMMA test
+    ()
+  ;
+
+;;;============================================================================
+;;;@@ expr_stmt
+;;;============================================================================
+
+;; expr_stmt: testlist (augassign testlist | ('=' testlist)*)
+expr_stmt
+  : testlist expr_stmt_trailer
+    (if (and $2 (stringp $1) (string-match "^\\(\\sw\\|\\s_\\)+$" $1))
+	;; If this is an assignment statement and left side is a symbol,
+	;; then generate a 'variable token, else return 'code token.
+	(VARIABLE-TAG $1 nil nil)
+      (CODE-TAG $1 nil))
+  ;
+
+;; Could be EMPTY because of eq_testlist_zom.
+;; (augassign testlist | ('=' testlist)*)
+expr_stmt_trailer
+  : augassign testlist
+  | eq_testlist_zom
+  ;
+
+;; Could be EMPTY!
+;; ('=' testlist)*
+eq_testlist_zom
+  : ;;EMPTY
+  | eq_testlist_zom ASSIGN testlist
+    (identity $3)
+  ;
+
+;; augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^='
+;;          | '<<=' | '>>=' | '**=' | '//='
+augassign
+  : PLUSEQ | MINUSEQ | MULTEQ | DIVEQ | MODEQ
+  | AMPEQ  | OREQ    | HATEQ  | LTLTEQ
+  | GTGTEQ | EXPEQ   | DIVDIVEQ
+  ;
+
+;;;============================================================================
+;;;@@ del_stmt
+;;;============================================================================
+
+;; del_stmt: 'del' exprlist
+del_stmt
+  : DEL exprlist
+    (CODE-TAG $1 nil)
+  ;
+
+;; exprlist: expr (',' expr)* [',']
+exprlist
+  : expr_list comma_opt
+    ()
+  ;
+
+;; expr (',' expr)*
+expr_list
+  : expr
+    ()
+  | expr_list COMMA expr
+    ()
+  ;
+
+;;;============================================================================
+;;;@@ pass_stmt
+;;;============================================================================
+
+;; pass_stmt: 'pass'
+pass_stmt
+  : PASS
+    (CODE-TAG $1 nil)
+  ;
+
+;;;============================================================================
+;;;@@ flow_stmt
+;;;============================================================================
+
+flow_stmt
+  : break_stmt
+  | continue_stmt
+  | return_stmt
+  | raise_stmt
+  | yield_stmt
+  ;
+
+;; break_stmt: 'break'
+break_stmt
+  : BREAK
+    (CODE-TAG $1 nil)
+  ;
+
+;; continue_stmt: 'continue'
+continue_stmt
+  : CONTINUE
+    (CODE-TAG $1 nil)
+  ;
+
+;; return_stmt: 'return' [testlist]
+return_stmt
+  : RETURN testlist_opt
+    (CODE-TAG $1 nil)
+  ;
+
+;; [testlist]
+testlist_opt
+  : ;;EMPTY
+  | testlist
+    ()
+  ;
+
+;; yield_stmt: 'yield' testlist
+yield_stmt
+  : YIELD testlist
+    (CODE-TAG $1 nil)
+  ;
+
+;; raise_stmt: 'raise' [test [',' test [',' test]]]
+raise_stmt
+  : RAISE zero_one_two_or_three_tests
+    (CODE-TAG $1 nil)
+  ;
+
+;; [test [',' test [',' test]]]
+zero_one_two_or_three_tests
+  : ;;EMPTY
+  | test zero_one_or_two_tests
+    ()
+  ;
+
+;; [',' test [',' test]]
+zero_one_or_two_tests
+  : ;;EMPTY
+  | COMMA test zero_or_one_comma_test
+    ()
+  ;
+
+;; [',' test]
+zero_or_one_comma_test
+  : ;;EMPTY
+  | COMMA test
+    ()
+  ;
+
+;;;============================================================================
+;;;@@ import_stmt
+;;;============================================================================
+
+;; import_stmt : 'import' dotted_as_name (',' dotted_as_name)*
+;;             | 'from' dotted_name 'import'
+;;               ('*' | import_as_name (',' import_as_name)*)
+import_stmt
+  : IMPORT dotted_as_name_list
+    (INCLUDE-TAG $2 nil)
+  | FROM dotted_name IMPORT star_or_import_as_name_list
+    (INCLUDE-TAG $2 nil)
+  ;
+
+;; dotted_as_name (',' dotted_as_name)*
+dotted_as_name_list
+  : dotted_as_name
+  | dotted_as_name_list COMMA dotted_as_name
+  ;
+
+;; ('*' | import_as_name (',' import_as_name)*)
+star_or_import_as_name_list
+  : MULT
+    ()
+  | import_as_name_list
+    ()
+  ;
+
+;; import_as_name (',' import_as_name)*
+import_as_name_list
+  : import_as_name
+    ()
+  | import_as_name_list COMMA import_as_name
+    ()
+  ;
+
+;; import_as_name: NAME [NAME NAME]
+import_as_name
+  : NAME name_name_opt
+    ()
+  ;
+
+;; dotted_as_name: dotted_name [NAME NAME]
+dotted_as_name
+  : dotted_name name_name_opt
+  ;
+
+;; [NAME NAME]
+name_name_opt
+  : ;;EMPTY
+  | NAME NAME
+    ()
+  ;
+
+;; dotted_name: NAME ('.' NAME)*
+dotted_name
+  : NAME
+  | dotted_name PERIOD NAME
+    (format "%s.%s" $1 $3)
+  ;
+
+;;;============================================================================
+;;;@@ global_stmt
+;;;============================================================================
+
+;; global_stmt: 'global' NAME (',' NAME)*
+global_stmt
+  : GLOBAL comma_sep_name_list
+    (CODE-TAG $1 nil)
+  ;
+
+;; NAME (',' NAME)*
+comma_sep_name_list
+  : NAME
+  | comma_sep_name_list COMMA NAME
+  ;
+
+;;;============================================================================
+;;;@@ exec_stmt
+;;;============================================================================
+
+;; exec_stmt: 'exec' expr ['in' test [',' test]]
+exec_stmt
+  : EXEC expr exec_trailer
+    (CODE-TAG $1 nil)
+  ;
+
+;; ['in' test [',' test]]
+exec_trailer
+  : ;;EMPTY
+  | IN test comma_test_opt
+    ()
+  ;
+
+;; [',' test]
+comma_test_opt
+  : ;;EMPTY
+  | COMMA test
+    ()
+  ;
+
+;;;============================================================================
+;;;@@ assert_stmt
+;;;============================================================================
+
+;; assert_stmt: 'assert' test [',' test]
+assert_stmt
+  : ASSERT test comma_test_opt
+    (CODE-TAG $1 nil)
+  ;
+
+;;;****************************************************************************
+;;;@ compound_stmt
+;;;****************************************************************************
+
+compound_stmt
+  : if_stmt
+  | while_stmt
+  | for_stmt
+  | try_stmt
+  | funcdef
+  | class_declaration
+  ;
+
+;;;============================================================================
+;;;@@ if_stmt
+;;;============================================================================
+
+;; if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
+if_stmt
+  : IF test COLON suite elif_suite_pair_list else_suite_pair_opt
+    (CODE-TAG $1 nil)
+  ;
+
+;; ('elif' test ':' suite)*
+elif_suite_pair_list
+  : ;;EMPTY
+  | elif_suite_pair_list ELIF test COLON suite
+    ()
+  ;
+
+;; ['else' ':' suite]
+else_suite_pair_opt
+  : ;;EMPTY
+  | ELSE COLON suite
+    ()
+  ;
+
+;; This NT follows the COLON token for most compound statements.
+;; suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT
+suite
+  : simple_stmt
+    (list $1)
+  | NEWLINE indented_block
+    (progn $2)
+  ;
+
+indented_block
+  : INDENT_BLOCK
+    (EXPANDFULL $1 indented_block_body)
+  ;
+
+indented_block_body
+  : INDENT
+    ()
+  | DEDENT
+    ()
+  | simple_stmt
+  | compound_stmt
+  ;
+
+;;;============================================================================
+;;;@@ while_stmt
+;;;============================================================================
+
+;; while_stmt: 'while' test ':' suite ['else' ':' suite]
+while_stmt
+  : WHILE test COLON suite else_suite_pair_opt
+    (CODE-TAG $1 nil)
+  ;
+
+;;;============================================================================
+;;;@@ for_stmt
+;;;============================================================================
+
+;; for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
+for_stmt
+  : FOR exprlist IN testlist COLON suite else_suite_pair_opt
+    (CODE-TAG $1 nil)
+  ;
+
+;;;============================================================================
+;;;@@ try_stmt
+;;;============================================================================
+
+;; try_stmt: ('try' ':' suite (except_clause ':' suite)+ #diagram:break
+;;            ['else' ':' suite] | 'try' ':' suite 'finally' ':' suite)
+try_stmt
+  : TRY COLON suite except_clause_suite_pair_list else_suite_pair_opt
+    (CODE-TAG $1 nil)
+  | TRY COLON suite FINALLY COLON suite
+    (CODE-TAG $1 nil)
+  ;
+
+;; (except_clause ':' suite)+
+except_clause_suite_pair_list
+  : except_clause COLON suite
+    ()
+  | except_clause_suite_pair_list except_clause COLON suite
+    ()
+  ;
+
+;; # NB compile.c makes sure that the default except clause is last
+;; except_clause: 'except' [test [',' test]]
+except_clause
+  : EXCEPT zero_one_or_two_test
+    ()
+  ;
+
+;; [test [',' test]]
+zero_one_or_two_test
+  : ;;EMPTY
+  | test zero_or_one_comma_test
+    ()
+  ;
+
+;;;============================================================================
+;;;@@ funcdef
+;;;============================================================================
+
+;; funcdef: 'def' NAME parameters ':' suite
+funcdef
+  : DEF NAME function_parameter_list COLON suite
+    (FUNCTION-TAG $2 nil $3)
+  ;
+
+function_parameter_list
+  : PAREN_BLOCK
+    (let ((wisent-python-EXPANDING-block t))
+      (EXPANDFULL $1 function_parameters))
+  ;
+
+;; parameters: '(' [varargslist] ')'
+function_parameters
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | function_parameter COMMA
+  | function_parameter RPAREN
+  ;
+
+function_parameter
+  : fpdef_opt_test
+ ;;  : NAME
+ ;;    (VARIABLE-TAG $1 nil nil)
+  | MULT NAME
+    (VARIABLE-TAG $2 nil nil)
+  | EXPONENT NAME
+    (VARIABLE-TAG $2 nil nil)
+  ;
+
+;;;============================================================================
+;;;@@ class_declaration
+;;;============================================================================
+
+;; classdef: 'class' NAME ['(' testlist ')'] ':' suite
+class_declaration
+  : CLASS NAME paren_class_list_opt COLON suite
+    (TYPE-TAG $2 $1             ;; Name "class"
+              $5                ;; Members
+              (cons $3 nil)     ;; (SUPERCLASSES . INTERFACES)
+              )
+  ;
+
+;; ['(' testlist ')']
+paren_class_list_opt
+  : ;;EMPTY
+  | paren_class_list
+  ;
+
+paren_class_list
+  : PAREN_BLOCK
+    (let ((wisent-python-EXPANDING-block t))
+      (mapcar 'semantic-tag-name (EXPANDFULL $1 paren_classes)))
+  ;
+
+;; parameters: '(' [varargslist] ')'
+paren_classes
+  : LPAREN
+    ()
+  | RPAREN
+    ()
+  | paren_class COMMA
+    (VARIABLE-TAG $1 nil nil)
+  | paren_class RPAREN
+    (VARIABLE-TAG $1 nil nil)
+  ;
+
+;; In general, the base class can be specified by a general expression
+;; which evalue to a class object, i.e., base classes are not just names!
+;; However base classes are names in most cases.  Thus the
+;; non-terminals below work only with simple names.  Even if the
+;; parser can parse general expressions, I don't see much benefit in
+;; generating a string of expression as base class "name".
+paren_class
+  : dotted_name
+  ;
+
+;;;****************************************************************************
+;;;@ test
+;;;****************************************************************************
+
+;; test: and_test ('or' and_test)* | lambdef
+test
+  : test_test
+  | lambdef
+  ;
+
+;; and_test ('or' and_test)*
+test_test
+  : and_test
+  | test_test OR and_test
+    ()
+  ;
+
+;; and_test: not_test ('and' not_test)*
+and_test
+  : not_test
+  | and_test AND not_test
+    ()
+  ;
+
+;; not_test: 'not' not_test | comparison
+not_test
+  : NOT not_test
+    ()
+  | comparison
+  ;
+
+;; comparison: expr (comp_op expr)*
+comparison
+  : expr
+  | comparison comp_op expr
+    ()
+  ;
+
+;; comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
+comp_op
+  : LT | GT | EQ | GE | LE | LTGT | NE | IN | NOT IN | IS | IS NOT
+  ;
+
+;; expr: xor_expr ('|' xor_expr)*
+expr
+  : xor_expr
+  | expr BAR xor_expr
+    ()
+  ;
+
+;; xor_expr: and_expr ('^' and_expr)*
+xor_expr
+  : and_expr
+  | xor_expr HAT and_expr
+    ()
+  ;
+
+;; and_expr: shift_expr ('&' shift_expr)*
+and_expr
+  : shift_expr
+  | and_expr AMP shift_expr
+    ()
+  ;
+
+;; shift_expr: arith_expr (('<<'|'>>') arith_expr)*
+shift_expr
+  : arith_expr
+  | shift_expr shift_expr_operators arith_expr
+    ()
+  ;
+
+;; ('<<'|'>>')
+shift_expr_operators
+  : LTLT
+  | GTGT
+  ;
+
+;; arith_expr: term (('+'|'-') term)*
+arith_expr
+  : term
+  | arith_expr plus_or_minus term
+    ()
+  ;
+
+;; ('+'|'-')
+plus_or_minus
+  : PLUS
+  | MINUS
+  ;
+
+;; term: factor (('*'|'/'|'%'|'//') factor)*
+term
+  : factor
+  | term term_operator factor
+    ()
+  ;
+
+term_operator
+  : MULT
+  | DIV
+  | MOD
+  | DIVDIV
+  ;
+
+;; factor: ('+'|'-'|'~') factor | power
+factor
+  : prefix_operators factor
+    ()
+  | power
+  ;
+
+;; ('+'|'-'|'~')
+prefix_operators
+  : PLUS
+  | MINUS
+  | TILDE
+  ;
+
+;; power: atom trailer* ('**' factor)*
+power
+  : atom trailer_zom exponent_zom
+    (concat $1
+	    (if $2 (concat " " $2 " ") "")
+	    (if $3 (concat " " $3) "")
+	    )
+  ;
+
+trailer_zom
+  : ;;EMPTY
+  | trailer_zom trailer
+    ()
+  ;
+
+exponent_zom
+  : ;;EMPTY
+  | exponent_zom EXPONENT factor
+    ()
+  ;
+
+;; trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+trailer
+  : PAREN_BLOCK
+    ()
+  | BRACK_BLOCK
+    ()
+  | PERIOD NAME
+    ()
+  ;
+
+;; atom: '(' [testlist] ')' | '[' [listmaker] ']' | '{' [dictmaker] '}'
+;;     | '`' testlist '`'   | NAME | NUMBER | STRING+
+atom
+  : PAREN_BLOCK
+    ()
+  | BRACK_BLOCK
+    ()
+  | BRACE_BLOCK
+    ()
+  | BACKQUOTE testlist BACKQUOTE
+    ()
+  | NAME
+  | NUMBER_LITERAL
+  | one_or_more_string
+  ;
+
+test_list_opt
+  : ;;EMPTY
+  | testlist
+    ()
+  ;
+
+;; testlist: test (',' test)* [',']
+testlist
+  : comma_sep_test_list comma_opt
+  ;
+
+;; test (',' test)*
+comma_sep_test_list
+  : test
+  | comma_sep_test_list COMMA test
+    (format "%s, %s" $1 $3)
+  ;
+
+;; (read $1) and (read $2) were done before to peel away the double quotes.
+;; However that does not work for single quotes, so it was taken out.
+one_or_more_string
+  : STRING_LITERAL
+  | one_or_more_string STRING_LITERAL
+    (concat $1 $2)
+  ;
+
+;;;****************************************************************************
+;;;@ lambdef
+;;;****************************************************************************
+
+;; lambdef: 'lambda' [varargslist] ':' test
+lambdef
+  : LAMBDA varargslist_opt COLON test
+    (format "%s %s" $1 (or $2 ""))
+  ;
+
+;; [varargslist]
+varargslist_opt
+  : ;;EMPTY
+  | varargslist
+  ;
+
+;; varargslist: (fpdef ['=' test] ',')* ('*' NAME [',' '**' NAME] | '**' NAME)
+;;             | fpdef ['=' test] (',' fpdef ['=' test])* [',']
+varargslist
+  : fpdef_opt_test_list_comma_zom rest_args
+    (nconc $2 $1)
+  | fpdef_opt_test_list comma_opt
+  ;
+
+;; ('*' NAME [',' '**' NAME] | '**' NAME)
+rest_args
+  : MULT NAME multmult_name_opt
+    () ;;(VARIABLE-TAG $2 nil nil)
+  | EXPONENT NAME
+    () ;;(VARIABLE-TAG $2 nil nil)
+  ;
+
+;; [',' '**' NAME]
+multmult_name_opt
+  : ;;EMPTY
+  | COMMA EXPONENT NAME
+    (VARIABLE-TAG $3 nil nil)
+  ;
+
+fpdef_opt_test_list_comma_zom
+  : ;;EMPTY
+  | fpdef_opt_test_list_comma_zom fpdef_opt_test COMMA
+    (nconc $2 $1)
+  ;
+
+;; fpdef ['=' test] (',' fpdef ['=' test])*
+fpdef_opt_test_list
+  : fpdef_opt_test
+  | fpdef_opt_test_list COMMA fpdef_opt_test
+    (nconc $3 $1)
+  ;
+
+;; fpdef ['=' test]
+fpdef_opt_test
+  : fpdef eq_test_opt
+  ;
+
+;; fpdef: NAME | '(' fplist ')'
+fpdef
+  : NAME
+    (VARIABLE-TAG $1 nil nil)
+ ;; Below breaks the parser.  Don't know why, but my guess is that
+ ;; LPAREN/RPAREN clashes with the ones in function_parameters.
+ ;;  | LPAREN fplist RPAREN
+ ;;    (identity $2)
+  ;
+
+;; fplist: fpdef (',' fpdef)* [',']
+fplist
+  : fpdef_list comma_opt
+  ;
+
+;; fpdef (',' fpdef)*
+fpdef_list
+  : fpdef
+  | fpdef_list COMMA fpdef
+  ;
+
+;; ['=' test]
+eq_test_opt
+  : ;;EMPTY
+  | ASSIGN test
+    ()
+  ;
+
+;;;****************************************************************************
+;;;@ Misc
+;;;****************************************************************************
+
+;; [',']
+comma_opt
+  : ;;EMPTY
+  | COMMA
+  ;
+
+;; [';']
+semicolon_opt
+  : ;;EMPTY
+  | SEMICOLON
+  ;
+
+;;; wisent-python.wy ends here
diff --git a/site/cedet-1.0pre7/semantic/wisent/wisent.el b/site/cedet-1.0pre7/semantic/wisent/wisent.el
new file mode 100644
index 0000000..6b9fbb1
--- /dev/null
+++ b/site/cedet-1.0pre7/semantic/wisent/wisent.el
@@ -0,0 +1,483 @@
+;;; wisent.el --- GNU Bison for Emacs - Runtime
+
+;; Copyright (C) 2009 Eric M. Ludlam
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 30 January 2002
+;; Keywords: syntax
+;; X-RCS: $Id: wisent.el,v 1.40 2009/09/11 18:51:36 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser engine and runtime of Wisent.
+;;
+;; Wisent (the European Bison ;-) is an Elisp implementation of the
+;; GNU Compiler Compiler Bison.  The Elisp code is a port of the C
+;; code of GNU Bison 1.28 & 1.31.
+;;
+;; For more details on the basic concepts for understanding Wisent,
+;; read the Bison manual ;)
+;;
+;; For more details on Wisent itself read the Wisent manual.
+
+;;; History:
+;;
+
+;;; Code:
+(provide 'wisent)
+
+(defgroup wisent nil
+  "
+           /\\_.-^^^-._/\\     The GNU
+           \\_         _/
+            (     `o  `      (European ;-) Bison
+             \\      ` /
+             (   D  ,Ø       for Emacs!
+              ` ~ ,Ø
+               `\"\""
+  :group 'semantic)
+
+
+;;;; -------------
+;;;; Runtime stuff
+;;;; -------------
+
+;;; Compatibility
+(eval-and-compile
+  (if (fboundp 'char-valid-p)
+      (defalias 'wisent-char-p 'char-valid-p)
+    (defalias 'wisent-char-p 'char-or-char-int-p)))
+
+;;; Printed representation of terminals and nonterminals
+(defconst wisent-escape-sequence-strings
+  '(
+    (?\a . "'\\a'")                     ; C-g
+    (?\b . "'\\b'")                     ; backspace, BS, C-h
+    (?\t . "'\\t'")                     ; tab, TAB, C-i
+    (?\n  . "'\\n'")                    ; newline, C-j
+    (?\v . "'\\v'")                     ; vertical tab, C-k
+    (?\f . "'\\f'")                     ; formfeed character, C-l
+    (?\r . "'\\r'")                     ; carriage return, RET, C-m
+    (?\e . "'\\e'")                     ; escape character, ESC, C-[
+    (?\\ . "'\\'")                      ; backslash character, \
+    (?\d . "'\\d'")                     ; delete character, DEL
+    )
+  "Printed representation of usual escape sequences.")
+
+(defsubst wisent-item-to-string (item)
+  "Return a printed representation of ITEM.
+ITEM can be a nonterminal or terminal symbol, or a character literal."
+  (if (wisent-char-p item)
+        (or (cdr (assq item wisent-escape-sequence-strings))
+            (format "'%c'" item))
+    (symbol-name item)))
+
+(defsubst wisent-token-to-string (token)
+  "Return a printed representation of lexical token TOKEN."
+  (format "%s%s(%S)" (wisent-item-to-string (car token))
+          (if (nth 2 token) (format "@%s" (nth 2 token)) "")
+          (nth 1 token)))
+
+;;; Special symbols
+(defconst wisent-eoi-term '$EOI
+  "End Of Input token.")
+
+(defconst wisent-error-term 'error
+  "Error recovery token.")
+
+(defconst wisent-accept-tag 'accept
+  "Accept result after input successfully parsed.")
+
+(defconst wisent-error-tag 'error
+  "Process a syntax error.")
+
+;;; Special functions
+(defun wisent-automaton-p (obj)
+  "Return non-nil if OBJ is a LALR automaton.
+If OBJ is a symbol check its value."
+  (and obj (symbolp obj) (boundp obj)
+       (setq obj (symbol-value obj)))
+  (and (vectorp obj) (= 4 (length obj))
+       (vectorp (aref obj 0)) (vectorp (aref obj 1))
+       (= (length (aref obj 0)) (length (aref obj 1)))
+       (listp (aref obj 2)) (vectorp (aref obj 3))))
+
+(defsubst wisent-region (&rest positions)
+  "Return the start/end positions of the region including POSITIONS.
+Each element of POSITIONS is a pair (START-POS . END-POS) or nil.  The
+returned value is the pair (MIN-START-POS . MAX-END-POS) or nil if no
+POSITIONS are available."
+  (let ((pl (delq nil positions)))
+    (if pl
+        (cons (apply #'min (mapcar #'car pl))
+              (apply #'max (mapcar #'cdr pl))))))
+
+;;; Reporting
+;;;###autoload
+(defvar wisent-parse-verbose-flag nil
+  "*Non-nil means to issue more messages while parsing.")
+
+;;;###autoload
+(defun wisent-parse-toggle-verbose-flag ()
+  "Toggle whether to issue more messages while parsing."
+  (interactive)
+  (setq wisent-parse-verbose-flag (not wisent-parse-verbose-flag))
+  (when (interactive-p)
+    (message "More messages while parsing %sabled"
+             (if wisent-parse-verbose-flag "en" "dis"))))
+
+(defsubst wisent-message (string &rest args)
+  "Print a one-line message if `wisent-parse-verbose-flag' is set.
+Pass STRING and ARGS arguments to `message'."
+  (and wisent-parse-verbose-flag
+       (apply 'message string args)))
+
+;;;; --------------------
+;;;; The LR parser engine
+;;;; --------------------
+
+(defcustom wisent-parse-max-stack-size 500
+  "The parser stack size."
+  :type 'integer
+  :group 'wisent)
+
+(defcustom wisent-parse-max-recover 3
+  "Number of tokens to shift before turning off error status."
+  :type 'integer
+  :group 'wisent)
+
+(defvar wisent-discarding-token-functions nil
+  "List of functions to be called when discarding a lexical token.
+These functions receive the lexical token discarded.
+When the parser encounters unexpected tokens, it can discards them,
+based on what directed by error recovery rules.  Either when the
+parser reads tokens until one is found that can be shifted, or when an
+semantic action calls the function `wisent-skip-token' or
+`wisent-skip-block'.
+For language specific hooks, make sure you define this as a local
+hook.")
+
+(defvar wisent-pre-parse-hook nil
+  "Normal hook run just before entering the LR parser engine.")
+
+(defvar wisent-post-parse-hook nil
+  "Normal hook run just after the LR parser engine terminated.")
+
+(defvar wisent-loop nil
+  "The current parser action.
+Stop parsing when set to nil.
+This variable only has meaning in the scope of `wisent-parse'.")
+
+(defvar wisent-nerrs nil
+  "The number of parse errors encountered so far.")
+
+(defvar wisent-lookahead nil
+  "The lookahead lexical token.
+This value is non-nil if the parser terminated because of an
+unrecoverable error.")
+
+;; Variables and macros that are useful in semantic actions.
+(defvar wisent-parse-lexer-function nil
+  "The user supplied lexer function.
+This function don't have arguments.
+This variable only has meaning in the scope of `wisent-parse'.")
+
+(defvar wisent-parse-error-function nil
+  "The user supplied error function.
+This function must accept one argument, a message string.
+This variable only has meaning in the scope of `wisent-parse'.")
+
+(defvar wisent-input nil
+  "The last token read.
+This variable only has meaning in the scope of `wisent-parse'.")
+
+(defvar wisent-recovering nil
+  "Non-nil means that the parser is recovering.
+This variable only has meaning in the scope of `wisent-parse'.")
+
+;; Variables that only have meaning in the scope of a semantic action.
+;; These global definitions avoid byte-compiler warnings.
+(defvar $region nil)
+(defvar $nterm  nil)
+(defvar $action nil)
+
+(defmacro wisent-lexer ()
+  "Obtain the next terminal in input."
+  '(funcall wisent-parse-lexer-function))
+
+(defmacro wisent-error (msg)
+  "Call the user supplied error reporting function with message MSG."
+  `(funcall wisent-parse-error-function ,msg))
+
+(defmacro wisent-errok ()
+  "Resume generating error messages immediately for subsequent syntax errors.
+This is useful primarily in error recovery semantic actions."
+  '(setq wisent-recovering nil))
+
+(defmacro wisent-clearin ()
+  "Discard the current lookahead token.
+This will cause a new lexical token to be read.
+This is useful primarily in error recovery semantic actions."
+  '(setq wisent-input nil))
+
+(defmacro wisent-abort ()
+  "Abort parsing and save the lookahead token.
+This is useful primarily in error recovery semantic actions."
+  '(setq wisent-lookahead wisent-input
+         wisent-loop nil))
+
+(defmacro wisent-set-region (start end)
+  "Change the region of text matched by the current nonterminal.
+START and END are respectively the beginning and end positions of the
+region.  If START or END values are not a valid positions the region
+is set to nil."
+  `(setq $region (and (number-or-marker-p ,start)
+                      (number-or-marker-p ,end)
+                      (cons ,start ,end))))
+
+(defun wisent-skip-token ()
+  "Skip the lookahead token in order to resume parsing.
+Return nil.
+Must be used in error recovery semantic actions."
+  (if (eq (car wisent-input) wisent-eoi-term)
+      ;; Does nothing at EOI to avoid infinite recovery loop.
+      nil
+    (wisent-message "%s: skip %s" $action
+                    (wisent-token-to-string wisent-input))
+    (run-hook-with-args
+     'wisent-discarding-token-functions wisent-input)
+    (wisent-clearin)
+    (wisent-errok)))
+
+(defun wisent-skip-block (&optional bounds)
+  "Safely skip a parenthesized block in order to resume parsing.
+Return nil.
+Must be used in error recovery semantic actions.
+Optional argument BOUNDS is a pair (START . END) which indicates where
+the parenthesized block starts.  Typically the value of a `$regionN'
+variable, where `N' is the the Nth element of the current rule
+components that match the block beginning.  It defaults to the value
+of the `$region' variable."
+  (let ((start (car (or bounds $region)))
+        end input)
+    (if (not (number-or-marker-p start))
+        ;; No nonterminal region available, skip the lookahead token.
+        (wisent-skip-token)
+      ;; Try to skip a block.
+      (if (not (setq end (save-excursion
+                           (goto-char start)
+                           (and (looking-at "\\s(")
+                                (condition-case nil
+                                    (1- (scan-lists (point) 1 0))
+                                  (error nil))))))
+          ;; Not actually a block, skip the lookahead token.
+          (wisent-skip-token)
+        ;; OK to safely skip the block, so read input until a matching
+        ;; close paren or EOI is encountered.
+        (setq input wisent-input)
+        (while (and (not (eq (car input) wisent-eoi-term))
+                    (< (nth 2 input) end))
+          (run-hook-with-args
+           'wisent-discarding-token-functions input)
+          (setq input (wisent-lexer)))
+        (wisent-message "%s: in enclosing block, skip from %s to %s"
+                        $action
+                        (wisent-token-to-string wisent-input)
+                        (wisent-token-to-string input))
+        (if (eq (car wisent-input) wisent-eoi-term)
+            ;; Does nothing at EOI to avoid infinite recovery loop.
+            nil
+          (wisent-clearin)
+          (wisent-errok))
+        ;; Set end of $region to end of block.
+        (wisent-set-region (car $region) (1+ end))
+        nil))))
+
+;;; Core parser engine
+(defsubst wisent-production-bounds (stack i j)
+  "Determine the start and end locations of a production value.
+Return a pair (START . END), where START is the first available start
+location, and END the last available end location, in components
+values of the rule currently reduced.
+Return nil when no component location is available.
+STACK is the parser stack.
+I and J are the indices in STACK of respectively the value of the
+first and last components of the current rule.
+This function is for internal use by semantic actions' generated
+lambda-expression."
+  (let ((f (cadr (aref stack i)))
+        (l (cddr (aref stack j))))
+    (while (/= i j)
+      (cond
+       ((not f) (setq f (cadr (aref stack (setq i (+ i 2))))))
+       ((not l) (setq l (cddr (aref stack (setq j (- j 2))))))
+       ((setq i j))))
+    (and f l (cons f l))))
+
+(defmacro wisent-parse-action (i al)
+  "Return the next parser action.
+I is a token item number and AL is the list of (item . action)
+available at current state.  The first element of AL contains the
+default action for this state."
+  `(cdr (or (assq ,i ,al) (car ,al))))
+
+(defsubst wisent-parse-start (start starts)
+  "Return the first lexical token to shift for START symbol.
+STARTS is the table of allowed start symbols or nil if the LALR
+automaton has only one entry point."
+  (if (null starts)
+      ;; Only one entry point, return the first lexical token
+      ;; available in input.
+      (wisent-lexer)
+    ;; Multiple start symbols defined, return the internal lexical
+    ;; token associated to START.  By default START is the first
+    ;; nonterminal defined in STARTS.
+    (let ((token (cdr (if start (assq start starts) (car starts)))))
+      (if token
+          (list token (symbol-name token))
+        (error "Invalid start symbol %s" start)))))
+
+(defun wisent-parse (automaton lexer &optional error start)
+  "Parse input using the automaton specified in AUTOMATON.
+
+- AUTOMATON is an LALR(1) automaton generated by
+  `wisent-compile-grammar'.
+
+- LEXER is a function with no argument called by the parser to obtain
+  the next terminal (token) in input.
+
+- ERROR is an optional reporting function called when a parse error
+  occurs.  It receives a message string to report.  It defaults to the
+  function `wisent-message'.
+
+- START specify the start symbol (nonterminal) used by the parser as
+  its goal.  It defaults to the start symbol defined in the grammar
+  \(see also `wisent-compile-grammar')."
+  (run-hooks 'wisent-pre-parse-hook)
+  (let* ((actions (aref automaton 0))
+         (gotos   (aref automaton 1))
+         (starts  (aref automaton 2))
+         (stack (make-vector wisent-parse-max-stack-size nil))
+         (sp 0)
+         (wisent-loop t)
+         (wisent-parse-error-function (or error 'wisent-message))
+         (wisent-parse-lexer-function lexer)
+         (wisent-recovering nil)
+         (wisent-input (wisent-parse-start start starts))
+         state tokid choices choice)
+    (setq wisent-nerrs     0 ;; Reset parse error counter
+          wisent-lookahead nil) ;; and lookahead token
+    (aset stack 0 0) ;; Initial state
+    (while wisent-loop
+      (setq state (aref stack sp)
+            tokid (car wisent-input)
+            wisent-loop (wisent-parse-action tokid (aref actions state)))
+      (cond
+
+       ;; Input successfully parsed
+       ;; -------------------------
+       ((eq wisent-loop wisent-accept-tag)
+        (setq wisent-loop nil))
+
+       ;; Syntax error in input
+       ;; ---------------------
+       ((eq wisent-loop wisent-error-tag)
+        ;; Report this error if not already recovering from an error.
+        (setq choices (aref actions state))
+        (or wisent-recovering
+            (wisent-error
+             (format "Syntax error, unexpected %s, expecting %s"
+                     (wisent-token-to-string wisent-input)
+                     (mapconcat 'wisent-item-to-string
+                                (delq wisent-error-term
+                                      (mapcar 'car (cdr choices)))
+                                ", "))))
+        ;; Increment the error counter
+        (setq wisent-nerrs (1+ wisent-nerrs))
+        ;; If just tried and failed to reuse lookahead token after an
+        ;; error, discard it.
+        (if (eq wisent-recovering wisent-parse-max-recover)
+            (if (eq tokid wisent-eoi-term)
+                (wisent-abort) ;; Terminate if at end of input.
+              (wisent-message "Error recovery: skip %s"
+                              (wisent-token-to-string wisent-input))
+              (run-hook-with-args
+               'wisent-discarding-token-functions wisent-input)
+              (setq wisent-input (wisent-lexer)))
+
+          ;; Else will try to reuse lookahead token after shifting the
+          ;; error token.
+
+          ;; Each real token shifted decrements this.
+          (setq wisent-recovering wisent-parse-max-recover)
+          ;; Pop the value/state stack to see if an action associated
+          ;; to special terminal symbol 'error exists.
+          (while (and (>= sp 0)
+                      (not (and (setq state   (aref stack sp)
+                                      choices (aref actions state)
+                                      choice  (assq wisent-error-term choices))
+                                (natnump (cdr choice)))))
+            (setq sp (- sp 2)))
+
+          (if (not choice)
+              ;; No 'error terminal was found.  Just terminate.
+              (wisent-abort)
+            ;; Try to recover and continue parsing.
+            ;; Shift the error terminal.
+            (setq state (cdr choice)    ; new state
+                  sp    (+ sp 2))
+            (aset stack (1- sp) nil)    ; push value
+            (aset stack sp state)       ; push new state
+            ;; Adjust input to error recovery state.  Unless 'error
+            ;; triggers a reduction, eat the input stream until an
+            ;; expected terminal symbol is found, or EOI is reached.
+            (if (cdr (setq choices (aref actions state)))
+                (while (not (or (eq (car wisent-input) wisent-eoi-term)
+                                (assq (car wisent-input) choices)))
+                  (wisent-message "Error recovery: skip %s"
+                                  (wisent-token-to-string wisent-input))
+                  (run-hook-with-args
+                   'wisent-discarding-token-functions wisent-input)
+                  (setq wisent-input (wisent-lexer)))))))
+
+       ;; Shift current token on top of the stack
+       ;; ---------------------------------------
+       ((natnump wisent-loop)
+        ;; Count tokens shifted since error; after
+        ;; `wisent-parse-max-recover', turn off error status.
+        (setq wisent-recovering (and (natnump wisent-recovering)
+                                     (> wisent-recovering 1)
+                                     (1- wisent-recovering)))
+        (setq sp (+ sp 2))
+        (aset stack (1- sp) (cdr wisent-input))
+        (aset stack sp wisent-loop)
+        (setq wisent-input (wisent-lexer)))
+
+       ;; Reduce by rule (call semantic action)
+       ;; -------------------------------------
+       (t
+        (setq sp (funcall wisent-loop stack sp gotos))
+        (or wisent-input (setq wisent-input (wisent-lexer))))))
+    (run-hooks 'wisent-post-parse-hook)
+    (car (aref stack 1))))
+
+;;; wisent.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/ChangeLog b/site/cedet-1.0pre7/speedbar/ChangeLog
new file mode 100644
index 0000000..3f14785
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/ChangeLog
@@ -0,0 +1,2084 @@
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede, speedbar.el (speedbar-version):
+	Update version.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-info.el (Info-speedbar-buttons): Solve recentering problem.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSFLAGS): New variable.
+	(init,speedbar,opt): Use above.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Update to 1.0.2
+
+	* speedbar.el (speedbar-update-current-file):
+	Make sure we have a frame to select.
+
+2008-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-directory-buttons):
+	Make sure ~ is at the beginning of the
+	directory name when shortening.  Protects against tramp issues.
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (define-obsolete-function-alias): Make usage optional.
+
+	* speedbar.el (define-obsolete-variable-alias): Make usage optional.
+
+2008-01-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("speedbar"): Update version number.
+
+2008-01-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Summary of Change: rename "path" to "directory" obsoletions.
+	and adopt diffs from Emacs 23.
+	(speedbar-version): Update.
+	(speedbar-show-unknown-files): Doc fix
+	(speedbar-frame-parameters): Add better custom type
+	(speedbar-dynamic-tags-function-list): Doc fix.
+	(speedbar-after-create-hook): Doc fix.
+	(speedbar-file-regexp): Moved
+	(speedbar-supported-extension-expressions): Improved custom :set
+	(speedbar-make-specialized-keymap): doc fix.
+	(speedbar-file-key-map): Name change: "contract-line"
+	(speedbar-frame-mode): doc fix
+	(speedbar-frame-width): Use defsubst.  Doc fix.
+	(speedbar-set-mode-line-format): Don't show warnings.
+	(speedbar-reconfigure-keymaps): Special local binding setup for
+	easymenu definition.
+	(speedbar-item-info-file-helper): doc fix.
+	(speedbar-item-info-tag-helper): doc fix.  Hide semantic warnings.
+	(speedbar-generic-list-tag-p): doc fix.
+	(speedbar-try-completion): consp to test alist.
+	(speedbar-update-contents): same
+	(speedbar-update-localized-contents): Use dolist
+	(speedbar-update-directory-contents): use dolist
+	(speedbar-update-special-contents): Use dolist
+	(speedbar-timer-fn): use consp
+	(speedbar-check-read-only): GUD specialization
+	(speedbar-check-vc): Try to eliminate warnings
+	(speedbar-line-directory): doc fix.
+	(speedbar-buffer-easymenu-definition): Add spacer
+	(end of file): Add obsolete variable aliases.
+
+2007-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-highlight-one-tag-line):
+	Use pulse when available, otherwise
+	use below.
+	(speedbar-highlight-one-tag-line-internal): Old fcn, new name.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Strip out duplicates
+
+2007-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-line-file): Fix 'cond' bug.
+
+2007-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-line-file):
+	It some cases, speedbar-line-directory returns a
+	file.  Be robust to this condition.
+
+2006-06-23  David Ponce  <david@dponce.com>
+
+	* sb-info.el:
+	Put (provide 'sb-info) before (eval-after-load "info") to fix
+	recursive (require 'sb-info) error on Emacs 22.
+
+2005-12-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-dynamic-tags-function-list): Doc fix.
+	(speedbar-default-position): New user option.
+	(speedbar-frame-reposition-smartly): Pass new option when positioning
+	the speedbar frame.
+
+	* dframe.el (dframe-reposition-frame-emacs):
+	Fix left-only position case.
+
+2005-10-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi (Top): Merge from Emacs 22.
+	(Basic Key Bindings): Remove keybindings no longer active.
+	(Hidden Files): fix
+	(Major Display Modes): Discuss stealthy functions
+	(Generic Tag Lists): New section.
+	(Expand Buttons): New section.
+
+2005-10-13  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generate.
+
+	* speedbar.el (speedbar-version): Update to 1.0.1.
+
+	* Project.ede (ede-proj-project): Update :version.
+
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi, speedbar-load.el, speedbar.el, sb-w3.el, sb-texinfo.el, sb-image.el, sb-html.el, sb-ant.el, rpm.el, fsum.el, dframe.el, bigclock.el:
+	Update all GPL headers with script from savannah.gnu.org.
+
+2005-09-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Updated to 1.0
+
+	* Project.ede ("speedbar"): Version changed to 1.0 (same as default.)
+
+2005-09-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Updated to 1.0.
+
+2005-07-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* fsum.el: Frame Summary Mode
+
+2005-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Updated.
+
+	* Project.ede (:version): Updated.
+
+	* Makefile (VERSION): Updated.
+
+	* sb-info.el (Info-speedbar-image-button-alist): Use ezimage.
+	(toplevel): Added eval-after-load with autoload cookie to load in this
+	file whenever Info is initialized.
+
+2005-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-require-version):
+	Replace with an inversion implementation.
+
+2005-04-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Update version number
+
+	* Makefile (VERSION): Updated.
+
+	* Project.ede ("speedbar"): update
+
+2005-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-select-frame-method):
+	Change default to 'attached, which is
+	what a typical single-frame user would get.  Also prevents unexpected
+	frame switching.
+
+2005-02-06  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* dframe.el:
+	* dframe-after-select-attached-frame-hook: New hook, defcustom
+	* dframe-select-attached-frame: Use the new hook
+	* Replaced most (select-frame dframe-attached-frame) by
+	  `dframe-select-attached-frame'
+
+2005-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Update version number.
+	(Makefile): updated from new ede code.
+
+	* speedbar.el (speedbar-version): Update version number
+	(speedbar-find-file-in-frame): Comment.
+
+	* Project.ede ("speedbar"): update version number
+
+2004-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: (dframe-handle-make-frame-visible)
+	(dframe-handle-iconify-frame)
+	(dframe-handle-delete-frame): Remove message.
+
+2004-10-05  Klaus Berndl <klaus.berndl@sdm.de>
+
+	* speedbar.el:
+	speedbar-vc-check-dir-p: uses now run-hook-with-args-until-success instead of
+	run-hook-with-args.
+
+2004-04-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (autoloads, init, speedbar, opt):
+	Compile with --no-site-file.
+	(clean): all info files.
+	(dist): Distribute the autoload file
+
+2004-03-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-item-info-tag-helper):
+	Use new names of semantic 2.0
+	(speedbar-contract-line-descendants): Fix compile warning.
+	(speedbar-buffer-buttons-engine): Stop displaying hidden buffers.
+
+2004-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-power-click): Fix bug getting last event frame.
+
+2004-02-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Revamped. We are a part of a CEDET install now.
+
+2004-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-power-click):
+	Attempt to fix a button problem by selecting
+	the frame the event must have come in on.  No verification yet
+	from user.
+
+	* speedbar.el (speedbar-line-text, speedbar-line-token):
+	Support expand buttons with no text
+
+2004-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-refresh): Make argument optional.
+
+	* speedbar.el (speedbar-refresh):
+	Allow universal argument to act as "power click".
+
+2004-02-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Update
+	(speedbar-update-localized-contents): New fcn.
+	(speedbar-timer-fn): Remove some logic from here up into new fcn above.
+
+2004-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-fetch-dynamic-tags):
+	If a buffer is in Emacs, switch to
+	that buffer to get variable values.
+
+2004-01-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-edit-line):
+	Handle single-character file/directory names.
+
+2003-11-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi (Version Control):
+	Fix name of speedbar-vc-directory-enable-hook.
+
+2003-10-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-incompatible-version): Doc fix.
+
+	* Project.ede: Now a meta-subproject.
+
+	* Makefile (dist): Remove local creation of tar file.
+
+2003-09-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-this-file-in-vc):
+	If VC state is nil, then it is not
+	checked out.
+
+2003-09-18  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+	* Project.ede (init): New target.
+
+2003-09-17  David Ponce  <david@dponce.com>
+
+	* sb-gud.el (gud-speedbar-buttons): Fix typo.
+
+	* Makefile: Re-generated.
+
+	* Project.ede (autoloads):
+	Change speedbar-defs.el by speedbar-loaddefs.el.
+
+	* speedbar-load.el: New file.
+
+2003-09-16  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+2003-09-10  David Ponce  <david@dponce.com>
+
+	* Makefile: Re-generated.
+
+2003-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Updated.
+
+	* Makefile: Makefile for speedbar.
+
+	* Project.ede ("autoloads"): New
+
+2003-08-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede ("speedbar"): Add ezimage as a dependency.
+
+	* sb-image.el (ezimage): New requirement.
+	(speedbar-use-images): New default value from ezimage.
+	(defimage-speedbar): New value from ezimage.
+	(speedbar-find-image-on-load-path)
+	(speedbar-convert-emacs21-imagespec-to-xemacs)
+	(defimage-speedbar)
+	(speedbar-directory-plus)
+	(speedbar-directory-minus)
+	(speedbar-page-minus)
+	(speedbar-page)
+	(speedbar-tag)
+	(speedbar-tag-plus)
+	(speedbar-tag-minus)
+	(speedbar-tag-gt)
+	(speedbar-tag-v)
+	(speedbar-tag-type)
+	(speedbar-box-plus)
+	(speedbar-box-minus)
+	(speedbar-mail)
+	(speedbar-checkout)
+	(speedbar-object)
+	(speedbar-object-out-of-date)
+	(speedbar-label)
+	(speedbar-read-only)
+	(speedbar-document-tag)
+	(speedbar-document-plus)
+	(speedbar-document-minus)
+	(speedbar-info-tag): Removed
+	(speedbar-expand-image-button-alist): New default value (from ezimage.)
+
+2003-08-06  David Ponce  <david@dponce.com>
+
+	* speedbar.el (speedbar-frame-mode): Fix XEmacs frame plist passed to
+	`dframe-frame-mode'.
+
+2003-07-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-frame-parameters): Set left-fringe to be empty.
+	(speedbar-frame-plist): Remove gutter visibility.
+	(speedbar-file-key-map): Add [ and ] for full expand/close.
+	(speedbar-frame-mode): For XEmacs, specify parent frame for group iconification.
+	(speedbar-item-info-tag-helper): Handle new semantic method names.
+	(speedbar-expand-line-descendants)
+	speedbar-contract-line-descendants): New commands
+
+2003-07-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-mouse-set-point):
+	Set the point when clicking on a glyph.
+
+2003-06-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-ant.el (speedbar-fetch-dynamic-ant-project):
+	Allow white space around = sign.
+
+2003-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-version): Updated
+	(speedbar-incompatible-version): New
+	(speedbar-mode-functions-list): Changed path to directory
+	(speedbar-vc-indicator): Changed path to directory
+	(speedbar-ignored-directory-regexp): Changed path to directory
+	(speedbar-ignored-path-regexp): Deleted
+	(speedbar-add-ignored-directory-regexp): Changed path to directory
+	(speedbar-add-ignored-path-regexp): deleted
+	(speedbar-mode): Changed path to directory
+	(speedbar-item-info-tag-helper): Changed path to directory
+	(speedbar-directory-buttons): Changed path to directory
+	(speedbar-create-tag-hierarchy): Changed path to directory
+	(speedbar-insert-generic-list): Changed path to directory
+	(speedbar-update-directory-contents): Changed path to directory
+	(speedbar-timer-fn): Changed path to directory
+	(speedbar-find-selected-file): Changed path to directory
+	(speedbar-check-vc): Changed path to directory
+	(speedbar-check-vc-this-line): Changed path to directory
+	(speedbar-vc-check-dir-p): Changed path to directory
+	(speedbar-this-file-in-vc): Changed path to directory
+	(speedbar-check-obj-this-line): Changed path to directory
+	(speedbar-line-file): Changed path to directory
+	(speedbar-line-directory): Changed path to directory
+	(speedbar-line-path): deleted
+	(speedbar-files-line-directory): Changed path to directory
+	(speedbar-directory-line): Changed path to directory
+	(speedbar-path-line): deleted
+	(speedbar-find-file): Changed path to directory
+	(speedbar-dir-follow): Changed path to directory
+	(speedbar-dired): Changed path to directory
+	(speedbar-tag-file): Changed path to directory
+	(speedbar-tag-find): Changed path to directory
+	(speedbar-buffer-buttons): Changed path to directory
+	(speedbar-buffers-line-directory): Changed path to directory
+	(speedbar-buffers-line-path): deleted
+
+	* sb-rmail.el (rmail-speedbar-match-folder-regexp): doc fix
+
+	* sb-image.el (speedbar-use-images): doc fix
+	(defimage-speedbar): doc fix
+	(speedbar-convert-emacs21-imagespec-to-xemacs): doc fix
+
+	* dframe.el (dframe-update-keymap): doc fix
+	(dframe-frame-mode): doc fix
+	(dframe-set-timer): doc fix
+	(dframe-xemacsp): doc fix
+	(dframe-mouse-hscroll): doc fix
+
+	* speedbar.el (speedbar-special-mode-key-map): doc fix
+	(speedbar-dynamic-tags-function-list): doc fix
+	(speedbar-tag-hierarchy-method): doc fix
+	(speedbar-vc-do-check): doc fix
+	(speedbar-obj-do-check): doc fix
+	(speedbar-add-supported-extension): Fix interactive line
+	(speedbar-make-specialized-keymap): doc fix
+	(speedbar-desired-buffer): doc fix
+	(speedbar-mode): doc fix
+	(speedbar-up-directory): doc fix
+	(speedbar-refresh): doc fix
+	(speedbar-generic-item-info): doc fix
+	(speedbar-item-info): doc fix
+	(speedbar-insert-button): doc fix
+	(speedbar-file-lists): doc fix
+	(speedbar-make-tag-line): doc fix
+	(speedbar-insert-files-at-point): doc fix
+	(speedbar-update-special-contents): doc fix
+	(speedbar-set-timer): doc fix
+	(speedbar-find-selected-file): doc fix
+	(speedbar-add-indicator): doc fix
+	(speedbar-do-function-pointer): doc fix
+	(speedbar-line-file): doc fix
+	(speedbar-goto-this-file): doc fix
+	(speedbar-line-path): doc fix
+	(speedbar-dir-follow): doc fix
+	(speedbar-tag-find): doc fix
+	(speedbar-fetch-etags-command): doc fix
+	(speedbar-toggle-etags): doc fix
+	(speedbar-extract-one-symbol): doc fix
+	(speedbar-parse-c-or-c++tag): doc fix
+	(speedbar-unhighlight-one-tag-line): doc fix
+	(speedbar-directory-face): doc fix
+
+	* speedbar.el (speedbar-before-visiting-file-hook): Added a value
+	(speedbar-visiting-tag-hook): New hook with value
+	(speedbar-find-file): Select speedbar's attached frame.
+	(speedbar-tag-find): Call `speedbar-visiting-tag-hook'.
+
+	* speedbar.el: Updated Commentary.
+	(speedbar group): Added the groups we add to.
+	(speedbar-before-visiting-file-hook): New hook.
+	(speedbar-find-file): Call `speedbar-before-visiting-file-hook'
+	before visiting a file.
+	(speedbar-directory-buttons-follow): Do not use `directory-sep-char'.
+
+2003-02-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-frame-width):
+	Use window-width instead of frame-width.
+
+2003-02-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-add-indicator): Account for readonly indicator.
+	Thanks: "Wittmann, Ralph"
+
+2002-11-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-center-buffer-smartly): Center other frame.
+
+	* dframe.el: * dframe.el: Pass event to poup-mode-menu if accepted.
+	(dframe-pass-event-to-popup-mode-menu): New flag.
+	(dframe-xemacs-popup-kludge): Use it.
+
+2002-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-file-regexp): Fix doc.
+
+2002-09-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-frame-mode):
+	Added support for double-clicking in XEmacs.
+	Found by Barnabas Wolf and restored from old speedbar.el into dframe.el.
+
+2002-08-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* rpm.el (rpm-speedbar-key-map):
+	Fixed to bind keys into the correct key map.
+
+2002-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-mode): Make sure case is obeyed.
+	(speedbar-files-line-path): Use `speedbar-line-text' instead
+	of `buffer-substring'.
+
+2002-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-default-directory-list):
+	Made robust against deleted directories.
+
+2002-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-image.el (speedbar-use-images):
+	Test to see if xpm is available too.
+
+	* sb-dir-minus.xpm: It now opens.
+
+2002-03-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-require-version): New function
+
+2002-03-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added box images.
+
+	* speedbar.el (speedbar-buffer-easymenu-definition):
+	Better enable for kill/revert
+	(speedbar-buffer-kill-buffer): Use `speedbar-get-line-text'.
+
+	* sb-image.el (speedbar-directory, speedbar-box-plus, speedbar-directory-box-minus):
+	New images.
+	(speedbar-expand-image-button-alist): Added boxes, and empty directory.
+
+	* sb-box-plus.xpm, sb-box.xpm, sb-box-minus.xpm: Box icon.
+
+	* sb-html.el (speedbar-fetch-dynamic-html): Support html-mode too.
+
+	* sb-html.el (speedbar-insert-html-list):
+	Always pass 0 to format-html-list.
+
+	* speedbar.el (speedbar-check-read-only):
+	Support directories, and hidden files.
+	(speedbar-check-vc): Support hidden files.
+
+	* sb-texinfo.el (speedbar-texinfo-section-regexp): Added doc string
+	(speedbar-format-texinfo-list-recursive): Doc string.
+	(speedbar-insert-texinfo-list): Always pass 0 into the list reorganizer.
+
+	* Project.ede: Version change.
+	Lots of new images.
+
+	* speedbar.el (speedbar-check-read-only):
+	Get the correct file name during test.
+
+2002-03-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Add info about optional packages.
+
+	* sb-rmail.el (rmail-speedbar-buttons): Use new speedbar separator.
+
+	* sb-info.el (Info-speedbar-image-button-alist): New variable
+	(Info-speedbar-hierarchy-buttons): Use above variable for images
+	(Info-speedbar-expand-node): Use new variable for images.
+
+	* sb-info.xpm: Courier lowercase i in a blue circle
+
+	* sb-pg.xpm, sb-pg-plus.xpm, sb-pg-minus.xpm: Made the corner gray.
+
+	* sb-label.xpm: Made slightly larger.
+
+	* sb-image.el (speedbar-label, speedbar-read-only, speedbar-document-tag, speedbar-document-plus, speedbar-document-minus, speedbar-info-tag):
+	New images.
+	(speedbar-expand-image-button-alist): Added above new images.
+	(speedbar-image-dump): New test command.
+
+	* sb-gud.el: Use the speedbar separator for labels.
+
+	* sb-doc.xpm: Book.
+
+	* sb-doc-plus.xpm: Book with plus.
+
+	* sb-doc-minus.xpm: Book with minus.
+
+	* sb-dir.xpm, sb-dir-plus.xpm, sb-dir-minus.xpm: added darker area.
+
+	* rpm.el: Added "=" binding for expand.
+
+	* speedbar.el (speedbar-version): New beta
+	(speedbar-separator-face): Added gray overline.
+
+2002-03-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-stealthy-function-list):
+	Added new "locked files" stealthy function
+	(speedbar-ro-to-do-point, speedbar-object-read-only-indicator): New variables
+	(speedbar-indicator-regex): Added new ro indicator
+	(speedbar-insert-separator): New function
+	(speedbar-reset-scanners): Reset ro indicator
+	(speedbar-check-read-only): New function
+	(speedbar-buffer-buttons-engine): Use new separator function
+	(speedbar-buffers-tail-notes): New function
+	(speedbar-separator-face): New face.
+
+	* sb-ro.xpm: Image to show a locked thing.
+
+	* sb-label.xpm: Bitmap prefixing labes to make them look cool.
+
+2002-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede, speedbar.el: Update version number
+
+2002-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added ChangeLog to the project.
+
+2002-02-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi (Hidden Files):
+	Updated doc near `speedbar-supported-extension-expressions'.
+
+	* sb-w3.el: Require speedbar, and w3-menu if available.
+
+	* sb-info.el: Require speedbar.
+
+	* sb-image.el (speedbar-find-image-on-load-path):
+	Add support for XEmacs data directories.
+
+	* sb-gud.el: Require speedbar.
+
+	* speedbar.el (speedbar-use-tool-tips-flag): New flag.
+	(speedbar-track-mouse-flag): Use above to initialize.
+	(speedbar-supported-extension-expressions): Updated doc.
+	(speedbar-make-button): Do not add help echo if tool-tips are disabled.
+
+2002-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-frame-plist): Remove XEmacs gutter
+	(speedbar-supported-extension-expressions): Added .ma?k Makefiles
+	(speedbar-check-vc): Different thes of efs regexp.
+	(speedbar-buffer-buttons-engine): Ignore case search.
+
+	* speedbar.el (speedbar-reconfigure-keymaps):
+	Only add XEmacs menubar if menubar enabled.
+	(speedbar-make-button): Add `speedbar-text property to buttons.
+	(speedbar-update-contents): Add spaces for clarity
+	(speedbar-update-directory-contents): Wrap update in `save-excursion'
+	(speedbar-find-selected-file): Set current buffer to the speedbar buffer.
+	(speedbar-update-current-file): Do not center the buffer smartly.
+	(speedbar-line-text): Use new `speedbar-text -property instead of
+	using the match of a regular expression.  More robust to spaces.
+	(speedbar-center-buffer-smartly): Wrap in `save-selected-window',
+	make sure we are in speedbar's buffer.  Specify argument to
+	`window-height'.
+
+2002-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-w3.el (w3-speedbar-buttons): Added ###autoload tag.
+
+	* sb-rmail.el (rmail-speedbar-buttons): Added ###autoload tag.
+
+	* sb-info.el (Info-speedbar-buttons): Added ###autoload tag.
+
+	* sb-gud.el: Added autoload.
+
+	* rpm.el: Added autoload tag.
+
+	* INSTALL: Added property quoting for `eval-after-load' example.
+
+2001-12-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-frame-mode):
+	Select the speedar frame when using a terminal.
+
+2001-10-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Project.ede: Added web information.
+
+	* speedbar.texi: Merged in changes made in Emacs 21.
+
+	* Project.ede: Update version.
+	Added sb-ant.el
+
+	* sb-ant.el: ANT support
+
+2001-10-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* rpm.el (rpm-speedbar, rpm-tag-expand):
+	Use proper sort hierarchy method.
+	(
+
+	* sb-info.el (Info-install-speedbar-variables):
+	Add space keybinding to toggle expand.
+
+	* dframe.el (dframe-frame-mode):
+	Disable setting the default minibuffer frame
+	(dframe-y-or-n-p): Don't compare against the default-minibuffer-frame
+
+2001-10-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-frame-mode):
+	Add function to `dframe-delete-frame-function
+	(speedbar-handle-delete-frame): New function
+	(speedbar-line-file, speedbar-line-path): Widen any current restrictions
+	(
+
+	* dframe.el (dframe-version): (dframe-make-frame-visible-function,
+	 dframe-iconify-frame-function,
+	 dframe-delete-frame-function): New functions
+	(dframe-handle-make-frame-visible,
+	 dframe-handle-iconify-frame,
+	 dframe-handle-delete-frame): New Commands bound to special events.
+
+2001-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-key-map):
+	Removed old SPC and DEL page up/down keys
+	(speedbar-file-key-map): Added SPC to toggle expansion of a node
+	(speedbar-toggle-line-expansion): New command.
+	(speedbar-buffers-key-map): Added SPC to toggle expansion of a node
+
+2001-10-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el (dframe-click):
+	Do not call `dframe-mouse-click-function' if it has
+	no value.
+
+2001-10-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-try-completion): New function
+	(speedbar-prefix-group-tag-hierarchy, speedbar-trim-words-tag-hierarchy,
+	speedbar-center-buffer-smartly): Use `speedbar-try-completion' instead
+	of 'try-completion.
+
+	* speedbar.el (speedbar-obj-alist): Added cxx.
+	(speedbar-toggle-images, speedbar-toggle-sorting): Fix doc.
+	(speedbar-fetch-egags-parse-list): Add cxx.
+
+2001-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Update version
+	(speedbar-find-file-in-frame): fixed `other-frame' typo.
+
+2001-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-item-info-tag-helper):
+	Use two new features of `semantic-sb'.
+	speedbar.el will now require semantic beta9 or later, or no semantic
+	at all.
+
+2001-07-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-select-frame-method): New variable
+	(speedbar-find-file-in-frame): Use above.
+
+2001-05-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-find-selected-file):
+	Regexp quote the file before finding it.
+
+2001-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-objod.xpm, sb-obj.xpm, sb-chk.xpm: *** empty log message ***
+
+	* Project.ede: Version, sb-html, and more images.
+
+	* sb-image.el (speedbar-checkout, speedbar-object, speedbar-object-out-of-date):
+	New images.
+	(speedbar-expand-image-button-alist): Added above vars.
+
+	* speedbar.el (speedbar-version): Update to 0.14beta1
+	(speedbar-add-indicator): Call image display fcn when inserting indicators.
+
+2001-05-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-vc-check-dir-p):
+	Use vc-state if available for CVS.
+	(speedbar-this-file-in-vc): Use vc-state if available.
+
+	* dframe.el (dframe-switch-buffer-attached-frame):
+	Fix arg to `other-frame'.
+
+	* speedbar.el (speedbar-buffers-line-path):
+	Fixed to used `default-directory'
+	instead of buffer-file-name since some buffers do not have file names.
+
+2001-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-query-confirmation-method): new option.
+	(speedbar-visiting-file-hook, speedbar-visiting-tag-hook,
+	 speedbar-load-hook, speedbar-reconfigure-keymaps-hook): added * to doc.
+	(speedbar-ignored-modes): Added fundamental-mode.
+	(speedbar-directory-unshown-regexp): Added . directories.
+	(speedbar-y-or-n-p): Pay attention to `speedbar-query-confirmation-method'
+	and added a `deleting' parameter.
+	General: Use `summarize' instead of `summerize'
+	         Added true to deleting flag to speedbar-y-or-n-p where needed.
+
+2001-04-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: Added info about sb-html.
+
+	* sb-html.el: *** empty log message ***
+
+	* speedbar.el (speedbar-sort-tags): Added forward in obsolete variable.
+	(speedbar-tag-hierarchy-method): Swapped two items in custom list.
+	(speedbar-frame-reposition-smartly): Handle explicit setting of pos in
+	frame properties.
+	(speedbar-line-text): Fixed regexp to handle more first button cases.
+	(speedbar-dired): Do no flush last-selected-file at end.
+	(speedbar-center-buffer-smartly): Better line counting for variable
+	height lines.
+	(speedbar-buffers-line-path): Work better for buffers.
+	(end): Added section to remove speedbar from global font lock modes.
+
+	* sb-image.el:
+	Switched to check for the XEmacs feature, instead of the function presense.
+
+	* dframe.el (dframe-reposition-frame-emacs): More docs.
+	Handle top-bottom position case.
+	Handle CONS cell position case.
+	(dframe-set-timer-internal): For timeouts, XEmacs version change on itimer.
+	(dframe-track-mouse): Fixed for XEmacs.
+	(dframe-mouse-hscroll): Fixed to work better (submitted by someone I
+	 forgot, sorry.)
+
+2001-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-dir-minus.xpm, sb-dir-plus.xpm, sb-dir.xpm, sb-mail.xpm, sb-pg-minus.xpm, sb-pg-plus.xpm, sb-pg.xpm, sb-tag-gt.xpm, sb-tag-minus.xpm, sb-tag-plus.xpm, sb-tag-type.xpm, sb-tag-v.xpm, sb-tag.xpm:
+	*** empty log message ***
+
+	* Project.ede: Project file for Speedbar
+
+2001-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Hacked out many comments.
+	Tried to fix accidentaly reversal of tags when alpha binning.
+
+2000-12-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added `speedbar-create-directory', bound in keymap and menu for file mode.
+	Removed "SPEEDBAR" word from modeline.  Replaced with mode name.
+	Turn list of display modes to radio buttons.
+
+2000-12-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el:
+	Find the file before tagging due to changes in speedbar.
+
+	* speedbar.texi: Merged changes from Emacs made by Dave Love.
+	Added info about changes to dynamic tag finders.
+
+	* dframe.el: Fixed quoting problem.
+
+	* sb-image.el: Fixed comments.
+
+	* speedbar.el: Update version.
+	Added .g to list of extensions.
+	Removed some overlay commands not being used.
+	Updated help for make-tag-line.
+	Updated `speedbar-generic-list-group-p' based on internet msg.
+	Do not load a file to get it's tags.  Depend on the method.
+	Pass file down to method getting tags, do not use the buffer name.
+	Load a file for imenu support.
+
+2000-10-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Always call the speedbar timer during a get-focus to get things
+	updated right away.
+	Deleted extra `speedbar-current-frame' function. (XEmacs byte compiler)
+	In the vc and object checks, set the buffer to the speedbar buffer if
+	that variable has a value. (The no value is during a detatched speedbar.)
+
+	* dframe.el:
+	In `dframe-get-focus', call the hook after the frame is created and selected.
+
+	* speedbar.texi: Updated the copyright.
+	Vast changes by Eli.
+
+2000-10-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Overlay compatibility updated for xemacs fsf compatibility hack workaround.
+
+2000-10-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: 2000-10-07  Dave Love  <fx@gnu.org>
+
+		* speedbar.el (speedbar-mode): Set dframe-track-mouse-function
+		conditionally.
+		(speedbar-frame-mode): Set automatic-hscrolling locally.
+
+2000-10-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed `detatched' word.  Fixed `speedbar-detatch' but by protecting
+	the frame, and making local variables.  Removed `set-buffer...' calls
+	from all stealthy functions.  (The buffer should always be the speedbar
+	buffer at that point.)
+
+	* dframe.el: Fixed the one detatched frame case.
+
+	* speedbar.el: Fixed the version number.
+
+	* speedbar.texi:
+	Proof read the doc, and fixed many simple english things.
+
+2000-10-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Bring doc back to speedbar-power-click.
+	Make sure C-u + command sets speedbar-power-click.
+
+2000-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Do not display Emacs 21 toolbar in the speedbar frame.
+
+2000-09-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Removed toggle-updates.
+
+	* speedbar.el: Moved toggle-updates into speedbar keymap.
+	Made check for generic list types more reliable.
+
+2000-09-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Added xemacs frame repositioning function.
+	Pass event down on XEmacs for mouse click.
+
+	* speedbar.el:
+	Tweeked the event handling for XEmacs so we only need one function.
+
+	* sb-info.el:
+	Updated regexps for node finding based in info from Richard Kim <ryk@dspwiz.com>
+
+2000-09-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Stop running through timeouts if there is user input.
+
+	* speedbar.el: Added backward compatible speed variables.
+
+2000-09-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Fixed up timers to restart properly.
+
+	* dframe.el: Fixed typo
+
+	* INSTALL: Added details about programs that use speedbar.
+
+2000-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	re-enabled speedbar-power-click via let statement in speedbar-click.
+	Added `speedbar-current-frame'.
+
+2000-09-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bigclock.el: Added in some function quotes.
+	Fixed comma typo.
+
+	* dframe.el: Fixed typo in comments.
+	Make the four application function variables buffer local.
+	Don't call help-echo function if there isn't one.
+
+	* speedbar.el: Removed some stuff from the header.
+	For `expandtag' button type, make sure it is three characters long,
+	otherwise the expand/contract code can get a little confused when
+	working with images.
+
+	* speedbar.texi: Reworked the intro a little.
+
+	* INSTALL: Updated for next version of speedbar.
+
+2000-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Checkdoc updates.
+	Reindent dframe-help-echo
+
+	* bigclock.el: Checkdoc.
+
+2000-09-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Removed all the image handling code.
+
+	* sb-image.el: New file.
+
+2000-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* dframe.el: Added a version variable.
+	Fixed defgroup up.
+
+	* speedbar.el: Fixed up -message, and -y-or-n-p to be backquoted in.
+	Added aliases for `speedbar-select-attached-frame', and
+	-with-attached-buffer, and -maybe-jump-to-attached-frame
+	for compatibility.
+	Removed `speedbar-show-info-under-mouse' call from timer.
+
+2000-08-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* bigclock.el: New file.
+
+2000-08-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added a version variable, added it near top, removed version slot from lm.
+
+	* rpm.el, sb-info.el: Updates for speedbar's use of dframe.
+
+	* rpm.el: Use dframe-power-click, instead of speedbar-power-click.
+
+	* speedbar.el: speedbar-update-flag; set to dframe-have-timer-flag.
+
+	* dframe.el: Updated doc.
+	Added variable specifying if we should use timers.
+
+2000-08-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Stripped out all frame management stuff, including timer, and mouse
+	click specifics.
+	Use new dframe API for that same behaviors.
+
+	* dframe.el: New file.
+
+2000-08-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el: Added provide.
+
+2000-07-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added `speedbar-current-frame', and use this in place of
+	`speedbar-frame' variable.  This should help make detatched frames
+	more reliable.
+
+2000-07-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* INSTALL: New file.
+
+	* speedbar.el: Version update.
+
+	* sb-texinfo.el: Few comment updates.
+
+	* speedbar.el: Fixed auto update menu item to work with XEmacs.
+	Fixed detached frame mouse-3 menu popup.
+	Fixed up new code for specialized tag/group buttons.
+
+2000-07-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el:
+	speedbar-insert-texinfo-list no longer sets sthm to nil.
+	speedbar-format-texinfo-list uses new positioned group for
+	any chapter w/ sections (etc)  Also set new
+	speedbar-generic-list-{group-expand|tag}-button-list to
+	nice values.
+
+	* speedbar.texi:
+	Updated doc for `speedbar-make-tag-line', `speedbar-tag-hierarchy-method',
+	and `speedbar-insert-generic-list'.
+
+	* speedbar.el:
+	Added two new button types to `speedbar-make-tag-line' of `expandtag'
+	and `statictag'.  Make sure statictag doesn't get a face.
+	In `speedbar-change-expand-button-char', insert new char first, then
+	delete the old.  Good for two character buttons.
+	In `speedbar-create-tag-hierarchy', force a get of the file name
+	no matter what kind of line we are on.
+	New variables `speedbar-generic-list-group-expand-button-type' and
+	`speedbar-generic-list-tag-button-type'.
+	In `speedbar-insert-generic-list', use the above new variables to
+	determine the type of button to make.  Get the values from buffer
+	local values if possible.
+
+	* speedbar.el: Removed :visible from Auto Update menu item.
+	Added Generic List comment section, plus these functions:
+	  `speedbar-generic-list-group-p',
+	  `speedbar-generic-list-positioned-group-p'
+	  `speedbar-generic-list-tag-p'
+	Replaced old queries for these things with the new functions.
+	When inserting generic list buttons, added a new type which is a group
+	that also contains a position.
+	(Generic list stuff for new texinfo tagger.)
+
+2000-07-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el: 1.5 - speedbar-tag-hierarchy-method is set to nil by
+	      speedbar-insert-texinfo-list as well as
+	      speedbar-fetch-dynamic-texinfo.  This is needed in order to
+	      have the texinfo nodes displayed in correct order.
+
+2000-07-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el: From Richard Y. Kim on version 1.4
+	speedbar-tag-hierarchy-method is now set to nil by
+	speedbar-fetch-dynamic-texinfo after making it buffer local
+	first. I thought this was buffer-local variable already, but it is
+	not. Also added installation instruction.
+
+2000-06-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-texinfo.el: New file.
+
+2000-06-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed terminal mode loading of EDE which used to need a frame.
+	Changed order so SORT is last, which lets it work.
+
+2000-06-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-info.el: Fixed up let statements w/ searches.
+
+2000-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added `speedbar-detatch' so we can have multiple speedbars.
+	Fixed `speedbar-trim-words-tag-hierarchy' to work w/ semantic.
+
+2000-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi:
+	Added bit about universal argument for flushing tag caches.
+
+	* speedbar.el: Integrate changes from Eli about display-graphic-p.
+
+2000-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed list problem with splicing Enable Image in the menu.
+	Fixed XEmacs invisible text property problems.
+
+2000-05-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-recenter): Typo, and fix logic.
+	(speedbar-expand-line): Make arg optional.
+	(speedbar-mode): Avoid a compiler warning.
+
+2000-05-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Require 'defimage in a safe way.
+	Added menu item for toggling image use, and for flush & expand.
+	Added `speedbar-toggle-images' and `speedbar-flush-expand-line'.
+	`speedbar-expand-line' now takes a universal argument.
+	Use explicit call to bufer-file-name instead of a variable for accuracy.
+	Eval-when-compile defimage macro stuff.
+	Use :ascent center for all images.
+
+2000-04-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Do not use images on terminals.
+
+2000-04-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed up documentation with checkdoc.
+
+	* speedbar.el: Added in more images.
+
+2000-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Make our defimage safe in XEmacs.
+
+2000-04-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Hacked out problems with older emacs (19.34 and 20.5)
+
+	* speedbar.el: Added support for Images:
+	  Variable `speedbar-use-images'.
+	  `defimage' for XEmacs which doesn't define it.
+	  XEmacs image insertion.
+	  Copied Emacs21 image code from old speedbar21 file.
+	  XEmacs glyph event support.
+	  All `buttons' inserted are now compared.  Specialized packages can
+	  extend the image list.
+
+2000-04-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed up previous depthsize checkin.
+
+2000-03-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: update xemacs20p to handle versions > 20
+	Fix some documentation.
+	Turned "hide-button-brackets-flag' into a defcustom.
+	Added `speedbar-indentation-width' of 1.  Affects depth of indentation.
+	Added support to image button calls.
+	Catch search errors in expand/contract line.
+
+2000-02-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi: Fixed typo.
+
+2000-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	(speedbar-buffer-buttons-engine) Strip the directory name from the
+	buffer file name when putting a token onto the [+] button.
+
+2000-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed doc on speedbar-dynamic-tags-function-list.
+
+	* speedbar.texi:
+	Added a chapter on tagging extentions, and fixed some compile problems.
+
+	* speedbar.el (speedbar-use-bovinator-flag): Removed
+	(speedbar-dynamic-tags-function-list): New variable.
+	(speedbar-create-tag-hierarchy): Don't use copy-tree if it isn't
+	available.
+	(speedbar-insert-bovine-list): Removed
+	(speedbar-insert-imenu-list, speedbar-insert-etags-list): New.
+	(speedbar-fetch-dynamic-tags): New
+	(speedbar-tag-file): Use `speedbar-fetch-dynamic-tags' instead of
+	checking all known methods of tagging individually.
+	(speedbar-fetch-dynamic-imenu): Don't bother setting buffer anymore.
+
+1999-11-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	The tag highlighting face is now the speedbar-highlight-face.
+
+	* speedbar.el:
+	Converted all regexps to use [/\\] insead of just / when breaking up
+	directories.
+
+	* speedbar.el:
+	Added a hook to speedbar-visiting-tag-hook to force a recenter.
+	Added several new functions to choose from also.
+
+1999-10-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Converted hierarchy methods into a hook.
+	Added predefined hooks for visiting-tag-hook.
+	Fixed some documentation.
+
+1999-09-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added new keymap reconfigure hook.
+	Added perl .pm to known extensions.
+
+	* speedbar.texi:
+	Used many of RMS's comments such as passive-voice, and queue->cue.
+	Only modified user chapters, now programmer chapters.
+
+1999-09-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi: Fixed spelling, and title.
+
+	* speedbar.texi: Added giant copyright notice.
+
+	* speedbar.texi: Added concept and function indices.
+
+	* speedbar.texi:
+	Proofread, fixed random stuff, and made work with makinfo 3.12f.
+
+1999-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.texi: New file.
+
+1999-05-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Use the new semantic summerize feature.
+
+1999-05-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed center-smartly to not depend on the old formats quite so much.
+
+1999-05-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Enabled specialized detail display for bovinated items.
+
+1999-05-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added power-click support to bovinator.
+
+	* speedbar.el:
+	Added special case in the hierarcy function for being clear w/ lists.
+	Condition case when bovinating.
+
+1999-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-use-bovinator-flag): New flag.
+	(speedbar-use-imenu-flag): Change custom tag.
+	(speedbar-insert-bovine-list): New function.
+	(speedbar-syntax-table): Add { and } to table.
+	(speedbar-tag-file): If a bovine table is available, use it.
+	(speedbar-fetch-dynamic-bovine): New function
+
+1999-04-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-file-key-map, speedbar-buffers-key-map):
+	 Added keybinding "=" same as "+" so you don't have to hit shift.
+	 (speedbar-fetch-dynamic-etags): Set buffer to the tmp buffer when
+	 extracting expressions. (Newer XEmacs exposed this.)
+
+1999-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added speedbar-y-or-n-p.  Make use of it in all fns.
+
+1999-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: New function speedbar-message
+	changed message to speedbar-message where apropriate.
+
+	* rpm.el, sb-rmail.el: changed messge to speedbar-message
+
+1999-02-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed tag info function.
+
+1999-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added {} support in speedbar-line-text and speedbar-line-token.
+
+1999-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Updated commentary on specialized modes.
+
+1999-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-item-info-file-helper): Add optional arg
+	of the file whose info we want to display.
+	(speedbar-easymenu-definition-trailer) Fix list issue w/ customize.
+	(speedbar-add-mode-functions-list) Improve doc.
+	(speedbar-line-token) New function.
+	(speedbar-dired) Fix order of directories in -shown-directories.
+
+1999-01-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Version update
+
+	* speedbar.el (speedbar-line-path): Default return is default-directory
+	(speedbar-buffers-line-path): Return is dir name only.
+
+1999-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Updated Version & copyright
+	(speedbar-mode-functions-list): New variable.
+	(speedbar-mouse-item-info): Rewrote to be a replaceable fn.
+	(speedbar-item-info-file-helper, speedbar-item-info-tag-helper
+	speedbar-files-item-info speedbar-buffers-item-info): New functions.
+	(speedbar-fetch-replacement-function,speedbar-add-mode-functions-list):
+	New functions.
+	(speedbar-line-file): Broke out part that fetches file from a line.
+	(speedbar-line-text): New function extracted from speedbar-line-file.
+	(speedbar-line-path): Converted into a replaceable function.
+	(speedbar-files-line-path, speedbar-buffers-line-path): New functions.
+
+1998-12-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed up cfx divination to handle lists from originating frame correctly.
+	Brought over some changes from speedbar.el from emacs 20.3 sources.
+
+1998-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Rehash attempt for geometries with lists.
+
+1998-11-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Update SCCS checks from p. to s. since that is in the spirit of what
+	we want.
+
+1998-11-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: More sort/bin problem correction when organizing tags.
+
+1998-10-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Update version number
+	(speedbar-tag-group-name-minimum-length): New variable.
+	(speedbar-frame-parameter): New compatibility function.
+	(speedbar-frame-mode): Updated to use speedbar-frame-parameter.
+	(speedbar-apply-one-tag-hierarchy-method): Fixed up taging sub
+	groups to keep things in the right order, and to help with some
+	naming conventions.
+	(speedbar-create-tag-hierarchy): Enable buffer local version of
+	`speedbar-tag-hierarchy-method' in the buffer we are tagging.
+	(speedbar-line-path): Permit depth to be optional.  When this is
+	the case, derive it from the cursor location in speedbar.
+
+1998-10-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-initial-expansion-list-name):
+	Remove customization since it
+	is not useful in this case.
+	(speedbar-frame-mode): Check if cfx or cfy is a list, and make sure it
+	gets evalled to a number.  Also verify that set-frame-name fn exists
+	before calling it.
+
+1998-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Do not set frame pos on terminals
+
+1998-08-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Changed version number
+
+1998-08-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	When running stealthy functions, make sure the buffer is writeable.
+
+	* speedbar.el:
+	Fixed problem w/ newest emacs and the temp-buffer-show-hook.
+
+	* speedbar.el: Made the speedbar buffer read only.
+
+1998-08-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed a typo
+
+1998-08-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Hide lock files.
+	Position frame at startup.
+	Don't update when iconified, or from minibuffer.
+
+1998-08-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Removed scrollbar width from the frame params for emacs.
+
+1998-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el (speedbar-edit-line, speedbar-buffer-kill-buffer, speedbar-buffer-revert-buffer):
+	Updated buffer finding regex to
+	handle the [?] tag.
+	(speedbar-find-selected-file): New function.
+	(speedbar-clear-current-file): Uses `speedbar-find-selected-file'
+	(speedbar-update-current-file): Uses `speedbar-find-selected-file',
+	and now `speedbar-last-selected-file' is defined as the path name
+	to the file, not just the file itself.
+	(speedbar-center-buffer-smartly): Fixed center error to handle
+	the whole buffer.
+	(speedbar-delete-subblock): Rewrote to be more robust, less clever.
+	(speedbar-timer-fn): Removed short display time for messages.
+
+1998-08-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Removed extra code from speedbar-refresh dealing with messages.
+	Added said code to the timer so that minibuffer's aren't overwritten
+	for very long.
+
+1998-08-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Removed a paren.
+
+	* sb-gud.el:
+	Updated to new speedbar system loading.  Fixed a no stack error.
+
+	* speedbar.el:
+	Removed silly if statement stuff from around emacs/xemacs frame param
+	stuff.  This is irrelevant since the symbols are different.
+
+	* sb-rmail.el: Updated to new speedbar init file technique.
+
+	* speedbar.el:
+	Fixed a bug where ctrl-down-mouse1 could be used to change buffers,
+	but caused an error.  I now use a hack to get around it.
+	Also, fixed the current file selection to center smartly.
+
+	* sb-info.el: Fixed comment from when I copied from RPM mode.
+	Updated the completions that are retrieved to include more stuff.
+
+1998-07-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	When overriding defcustom things, make sure the various symbols do not
+	exist.
+	Fixed tag for setting the frame parameters.
+	Added various pc checks when setting up frames related to pointers.
+	Added new RCS valid pattern
+	Fixed the "root" pattern for finding a: on the pc.
+
+1998-06-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: XEmacs fixes, removal of history to ChangeLog
+
+1998-06-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Small fix for PC dir path.
+
+1998-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Version number
+
+1998-06-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-w3.el: Fixed keymap copy/paste error
+
+	* sb-w3.el: Version number
+
+	* rpm.el: Upgraded to use the new keymap stuff
+
+	* sb-gud.el: Added : to symbol names for c++ GDB
+
+	* sb-info.el: Added new type of menu item that is findable to fix bugs
+
+	* sb-rmail.el: Made the REGEX for finding folders configurable
+
+1998-06-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added a `speedbar-item-object-delete' to delete associated object
+	files.  This function will reset scanners.  The byte-compile item will
+	also reset the scanners.
+
+1998-06-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Made speedbar-stealthy-function-list have name tags to match those
+	found in speedbar-initial-expansion-mode-alist.  Thus, the buffers
+	menu won't get tagged by the file functions.
+
+1998-06-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Many checkdoc changes from new tests.
+	Track mouse is once again buffer local.
+	Added kill/revert buffer keys to buffer speedbar display.
+
+1998-05-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-w3.el: Added new keymap support.
+
+	* sb-rmail.el: Fixed doc.
+
+	* sb-rmail.el: Changed to handle new keymap feature
+
+	* sb-info.el: Changed to handle new keymap feature.
+	Updated to have new loading construct that will port to info.el
+	easier.
+
+	* sb-gud.el: Changed to handle keymap feature.
+
+	* speedbar.el: A bunch of XEmacs fixes.
+
+1998-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added mega-commentary on speedbar special modes
+
+	* speedbar.el: Fixed the set for track-mouse
+
+	* speedbar.el:
+	Added a generic info finder function so it should work ok for all
+	modes.
+
+1998-05-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-info.el: Whatever.
+
+	* speedbar.el, sb-info.el: Fixed compile bug.
+
+	* speedbar.el: Enabled mouse tracking for Emacs.
+	Fixed info to always print something, even if it's just the text under
+	the mouse.
+	Wrote a mouse motion handler that calls the speedbar info function.
+
+1998-05-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Completely revamped the speedbar keymap.  Each display mode can now
+	define their own keymap (inheriting from the default speedbar keymap
+	with a special function).  This turns off silly file specific keys in
+	non file modes.
+	Also, added some fixes from Bob Weiner.  Including
+	temp-buffer-show-function fix, tripple spell check, EFS support,
+	and infodoc support.
+
+1998-05-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Version
+
+	* speedbar.el:
+	Fixed bug where clicking on a dir name that was shown in an expanded
+	sub-directory caused an error. (caused by the smart-expand stuff)
+
+	* sb-info.el:
+	Completely re-wrote the display engine to support expandable nodes in a tree
+	hierarchy.  Turned that into a major mode.
+
+1998-05-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-info.el: Added an info major mode for speedbar.
+
+1998-05-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added html as a supported extension.
+
+	* speedbar.el: Version update.
+
+	* sb-w3.el: Added T.V.Raman's w3 stuff.
+
+1998-05-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Duh
+
+	* rpm.el: Made buffer read only.
+
+	* speedbar.el:
+	Added keymap to the list of things in a default expansion list.
+
+	* rpm.el: New file.
+
+1998-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	`speedbar-add-supported-extension' and `speedbar-add-ignored-path-regexp'
+	are now interactive
+
+1998-04-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	The path finder and speedbar tagging functions are now compatible with
+	arbitrary speedbar displays.  You can now tag-exand from the buffer
+	display.
+
+	* speedbar.el: Ok, really fixed the XEmacs 19.16 problem.  Phew..
+
+	* speedbar.el: Fixed compile problem, and some checkdoc fixes.
+
+1998-04-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Custom workaround for XEmacs changes.
+
+	* speedbar.el: Added a buffer dynamic as an optional display.
+	Added a menu item for all available speedbar displays.
+	Added python.
+	Added regrouping while splitting into groups to represent ranges of
+	symbols.
+	Updated comments.
+
+1998-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed up custom for tag-hierarchy-method
+
+	* speedbar.el: Junk tags are now appended after grouped tags.
+	Word trimming is not done to lists of length 1.
+
+	* speedbar.el:
+	Made the initial expansion list be a group of expansion "modes",
+	and the current mode is defined in a string for normal buffers.
+	Special modes are still special.
+	Added special tag list mutating code.  Only takes effect if the lists
+	are really long.
+
+1998-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed irritating bug in my regex from the fortran change.
+
+	* speedbar.el: Added case-fold-search stuff
+
+	* speedbar.el: Added fortran support.
+
+1998-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added override function for `switch-to-buffer' in speedbar.
+	Added `speedbar-directory-unshown-regexp' which will hide VC
+	  directories from the main list.
+	Added `speedbar-[forward|backward]-list' and bound them to
+	  C-M-[f|p].  This lets you quickly navigate over the directory
+	  list to the file list, and vice-versa.
+
+	* speedbar.el: Added Perl5 support (.pm)
+
+1998-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added hide-button-brackets-flag and fixed current file positioning
+	bug.
+
+1998-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed menu problem left over from the merger with speedbspec
+
+	* speedbar.el:
+	Fixed problem where the current file wasn't always highlighted, and fixed
+	problems with smart expander, and the cache stuff.  They were failing
+	searches because the indicator regex was not optional.
+
+	* speedbar.el:
+	Merged speedbspec in.  This simplifies the whole management of
+	speedbar extensions for special modes greatly.
+
+	* sb-w3.el, sb-info.el, sb-rmail.el: Added comment about the autoload
+
+	* sb-gud.el: Removed dependency on speedbspec
+	Added comment about the autoload
+
+	* sb-rmail.el, sb-info.el, sb-w3.el: Removed dependency on speedbspec
+
+	* speedbar.el: speedbar-update-flag defaults to off on terminals.
+	The update function is called w/ update flag on by speedbar-get-focus
+	when the update flag is off.
+
+	* speedbar.el: Enabled object tagging in depths > 0
+
+1998-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	It is now possible to update states of indicators and they correctly
+	remove themselves from the list of indicators.
+
+	* speedbar.el:
+	Will now work in a non-windowing environment (a terminal)
+	Added new restricted navigation functions (only jumps between items at
+	the same level.
+
+	* speedbar.el:
+	Updated indicator methods to provide multiple types of indicators.
+	Then added a new indicator to pring a # by each file that has an
+	associated binary file in that directory with it.  I'd like to also
+	indicate when a given object goes out of date, but that is a change
+	for later.
+
+1998-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el, sb-rmail.el, sb-info.el, sb-gud.el: Part of emacs
+
+	* speedbar.el: Moved speedbar-get-focus, and added autoload tag.
+
+1997-12-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: fixed button-3 menu for emacs 20.
+
+1997-12-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Simple documentation changes. XEmacs double click stuff.
+
+1997-12-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed up lots of XEmacs specific stuff surrounding frames.
+	Removed emacs menubar.  Added menu to button 3.
+	Now use repeating timer instead of restarting it myself.
+
+1997-11-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Few last hacks to make it work in XEmacs, and a checkdoc pass.
+
+	* speedbar.el:
+	Added some comments, and merged a patch from Hrvoje Niksic for XEmacs
+	fixes
+
+1997-11-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added comments.
+
+	* speedbar.el: Fixed so that there can be no ignored paths
+	Added .l & .lsp as lisp, suggested by: sshteingold@cctrading.com
+	You can now adjust height in `speedbar-frame-parameters'
+	XEmacs fix for use of `local-variable-p'
+
+1997-11-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed more problems for Emacs 20 so speedbar loads correctly.
+	Updated some documentation strings.
+	Added customization menu item, and customized some more variables.
+
+1997-11-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed bad problem w/ ignored paths
+	Removed condition-case from main timer fcn
+	Changed speedbar-edit-line so that if we are not on a file-line, we
+	"edit" the item the cursor is on.  This is more intuitive.
+
+	* sb-gud.el: Checkdoc passed
+
+	* sb-gud.el: New file.
+
+1997-11-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* sb-rmail.el, sb-info.el, sb-w3.el: New file.
+
+1997-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added custom support.  We loose the great face generator for older emacsen
+	though.  Still need to figure this one out without making speedbar too big.
+	Added double-click mouse-1 to do the same thing as middle click.
+	XEmacs pointershape cutout
+
+1997-09-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Emacs 20 char= support
+
+1997-08-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed problem when going going to a file in an open subdirectory
+	by using the text-cache.  The default directory was the subdirectlry,
+	resulting in bad file name extraction.
+
+	* speedbar.el:
+	Added -visiting- hooks for when a tag or file is visited.
+	Added a hook called just before the speedbar frame is "popped up"
+	Fixed if statement around imenu use to bebased on imenu, not xemacs.
+	Added extra levels of finding in etags/TeX
+
+1997-08-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added speedbar-smart-directory-expand-flag which lets the user control
+	if directories are intelligently added to an existing list or not.
+
+	* speedbar.el: Fixed ange-ftp require compile time problem.
+	Fixed XEmacs menu bar bug.
+	Added `speedbar-activity-change-focus-flag' to control if the focus changes
+	  w/ mouse events.
+	Added `speedbar-sort-tags' toggle to the menubar.
+
+1997-06-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: xemacs feature around ange-ftp
+
+1997-06-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added advice from ptype:
+	  post-command-idle-hook for old emacsen
+	  speedbar-sort-tags now sorts imenu listings
+	added hooks for VC types and scanner resetting
+	added revert hook to reset scanners which might affect VC displays
+
+1997-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Renamed speedbar-do-updates to speedbar-update-flag and fixed checkdoc stuff
+
+1997-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed a couple doc-strings
+
+1997-06-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added select-frame during quit.
+	Spell-checked all the doc-strings.
+
+1997-05-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added java to etags supported extensions
+
+1997-05-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added a few doc changes based on new checkdoc checks
+
+1997-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed use of easymenu w/ toggles
+
+	* speedbar.el: Added some comments.  Made menu creation more flexible.
+
+1997-05-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Made item info and edit more robust
+
+1997-04-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added new mode-specific contents control and convenience functions
+
+1997-04-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added todo item, and fixed more documentation strings
+
+1997-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Version update
+
+	* speedbar.el: checkdoc autofixes.
+	byte compiler warnings
+
+1997-04-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: fixed comments based on checkdoc.
+
+1997-03-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Updated all doc strings to conform to standards.  Checked with checkdoc.
+
+1997-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Gobs of doc-string fixes based on checkdoc.
+
+1997-03-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed for people who run MBFs (Minibuffer frames) where
+	default-minibuffer-frame was being set incorrectly.
+
+1997-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Comment & code management (Moving things around)
+
+	* speedbar.el: XEmacs bugfixes & new window title.
+
+1997-03-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Made one small xemacs change dealing with eval-when-compile.
+
+1997-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Updated comments & doc.  Added power-click to the file list generator.
+
+	* speedbar.el:
+	New fn `speedbar-find-file-in-frame' which will put clicked file in
+	attached frame or pop up an existing frame that has that file in it.
+	Using new `speedbar-power-click' the file will always be poped up in a
+	new frame.  When opening tags, the power click will force imenu to
+	rescan.
+
+	* speedbar.el: Fixed bad bugs in `speedbar-add-*-regexp' causing hangs.
+
+	* speedbar.el:
+	Quitting does not delete speedbar buffer.  Buffer name starts with a space.
+	Moved some stuff around.
+
+1997-02-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Removed leftover messages
+
+1997-02-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: List of directories never to enter now allowed.
+	Fixed cursor not moving to line with selected file bug.
+
+1997-02-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed text-cache.  It is now enable to handle switch-backs into open
+	subdirectories.   Added a new function to clear the current selected
+	file.
+
+1997-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Doc updates.  Stopped using wholenump (breaks xemacs)
+
+1997-02-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	New UP directory keybinding.  Rebound g to what was once r.  New doc
+	strings.  New focus following (frame raising stuff).  Fixed span and
+	trim on directory button for more diverse widths.  refresh now
+	refreshes all directories that were open before.  (Called when g is pressed)
+	Copy/rename/delete use new refresh, and position cursor in a good
+	spot.
+
+1997-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed line-number-mode check in mode-line creator
+	Fixed extention-list-to-regexp for when no non-extension files available
+
+	* speedbar.el: Fixed imenu load bug (only happened during compile)
+	Added XEmacs stuff, etag sorting fix, quit key
+	Modeline updates itself on timer
+	Frame is cached when closed to speed up re-creation
+	Speedbar window is marked dedicated (no splits or whatever)
+	Added bindings for n, p, SPC, DEL, and RET to be like dired
+	Fixed up speedbar-position-cursor-on-line to be more robust.
+	Added directory-button-trim-method for ways of trimming the directory button.
+
+1997-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Added smarts to byte-compile, and fixed background color guesser which
+	died on XEmacs.
+
+1997-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed the kill-buffer hook
+
+	* speedbar.el:
+	Added hook so if the user kills the speedbar buffer, the frame will be
+	removed.
+
+	* speedbar.el: Added new vc check function which can be overloaded
+	added `speedbar-line-file' to get file full path from the current line
+	Added gobs of new file manipulation routines for delete, copy, rename,
+	byte-compile, and load.  Also added new keystroke to get info about a
+	file in the speedbar buffer.
+
+1997-01-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed documentation strings to conform to standards
+	Added condition-case around the timer so it can reset itself.
+	Added save-match-data around the entire timer so that any calls from
+	within doesn't mutate any running applications.
+	Added Checks for ange-ftp directories to turn off the vc thingie.
+
+1997-01-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	The auto-refresher failed in info buffers in XEmacs.  Added smarts so
+	it would never fail in either emacsen.
+
+1997-01-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Fixed another vc error.  All places where update-current-file was once
+	called has been replaced with stealthy-updates
+
+	* speedbar.el:
+	Fixed vc stuff to work with the multi-layer stuff (Oops) and so that
+	it is easier to add new version control systems.
+
+	* speedbar.el:
+	Added `speedbar-stealthy-function-list' which is a list of visual
+	effects for the speedbar which we do not want to do every time.  (This
+	slows down editing.)  Updating the current file is not a member of
+	this list.  New function `speedbar-check-vc' is also a part of this
+	list.  This function marks with a `*' all files currently checked out
+	of RCS.  Other VC systems will follow in the future.
+
+	* speedbar.el: Fixed update bug when speedbar frame is selected.
+	Setup so temp buffers appear in the selected frame.
+	Setup so that if editing a file not in speedbar frame, speedbar will
+	refresh the cache (which is obviously out of date...)
+
+1997-01-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Added comment about AUC-TEX
+
+1997-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed compile trouble on XEmacs relating to imenu.
+	Tried to add special help in other frame but failed.
+
+	* speedbar.el:
+	Moved config dialog stuff to it's own file.  Fixed XEmacs frame
+	selecting bug.  Added list of extensions that speedbar can tag.  Fixed
+	list closing code.
+
+1996-10-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed up comment
+
+	* speedbar.el: Fixed a type in the color part
+
+	* speedbar.el:
+	Fixed some broken documentation, and improved other doc strings.
+	Added some mode hooks.  Fixed color selection improvements
+	Fixed speedbar-frame-mode so that no argument will toggle it's
+	existence.
+
+1996-10-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el:
+	Changed comments and doc strings, and several small bugs.
+
+1996-10-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Made major revisions listed under 0.3 in comments.
+
+1996-10-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Fixed some comments, and changed a color value.
+
+	* speedbar.el:
+	Fixed many bugs: x-pointer messing up new frames, speedbar-buffer
+	accidentally settings itself as default, taging problems.
+	Added new stuff: imenu use, directory stuff upgrade.
+	See docs in file.
+
+1996-09-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* speedbar.el: Moved a definition
+
+	* speedbar.el: New file.
+
diff --git a/site/cedet-1.0pre7/speedbar/INSTALL b/site/cedet-1.0pre7/speedbar/INSTALL
new file mode 100755
index 0000000..1f1036f
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/INSTALL
@@ -0,0 +1,68 @@
+Installation instructions for Speedbar
+
+The following updates to your .emacs file will help you get the most out
+of this update of speedbar.
+
+1) Build speedbar
+2) Add speedbar's directory to your load path.
+
+   Follow the INSTALL file in the top level of this distribution.
+
+3) Add bindings to make it easier to use speedbar.
+
+   If you want to choose it from a menu, such as "Tools", and it doesn't
+   already exist in your version of Emacs:
+
+   Emacs:
+   (define-key-after (lookup-key global-map [menu-bar tools])
+      [speedbar] '("Speedbar" . speedbar-frame-mode) [calendar])
+
+   XEmacs:
+   (add-menu-button '("Tools")
+		      ["Speedbar" speedbar-frame-mode
+		       :style toggle
+		       :selected (and (boundp 'speedbar-frame)
+				      (frame-live-p speedbar-frame)
+				      (frame-visible-p speedbar-frame))]
+		      "--")
+
+   Note: New versions of Emacs already have this in the menu.
+
+   If you want to access speedbar using only the keyboard, do this:
+
+   (global-set-key [(f4)] 'speedbar-get-focus)
+
+   Using F4, you can now toggle between the speedbar frame, and the
+   frame speedbar was started from.
+
+4) Add auto loads for the auxiliary packages.
+
+   For any version of emacs:
+
+   ;; Texinfo fancy chapter tags
+   (add-hook 'texinfo-mode-hook (lambda () (require 'sb-texinfo)))
+
+   ;; HTML fancy chapter tags
+   (add-hook 'html-mode-hook (lambda () (require 'sb-html)))
+
+   For any verison of emacs on a linux RPM based system:
+   (autoload 'rpm "sb-rpm" "Rpm package listing in speedbar.")
+
+   For any version of emacs where w3 is installed:
+
+   ;; w3 link listings
+   (autoload 'w3-speedbar-buttons "sb-w3" "s3 specific speedbar button generator.")
+
+   For XEmacs, or Emacs earlier than 20.2:
+
+   ;; chapter listings
+   (autoload 'Info-speedbar-buttons "sb-info" "Info specific speedbar button generator.")
+   ;; folder listings
+   (autoload 'rmail-speedbar-buttons "sb-rmail" "Rmail specific speedbar button generator.")
+   ;; current stack display
+   (autoload 'gud-speedbar-buttons "sb-gud" "GUD specific speedbar button generator.")
+
+   For an info mode in Emacs 20.x and XEmacs, it may be necessary to
+   do this instead:
+
+   (eval-after-load "info" '(require 'sb-info))
diff --git a/site/cedet-1.0pre7/speedbar/Makefile b/site/cedet-1.0pre7/speedbar/Makefile
new file mode 100644
index 0000000..2706f02
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/Makefile
@@ -0,0 +1,93 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+EMACS=emacs
+LOADPATH= ../common/ 
+LOADDEFS=speedbar-loaddefs.el
+LOADDIRS=.
+init_LISP=speedbar-load.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+speedbar_LISP=dframe.el speedbar.el
+info_TEXINFOS=speedbar.texi
+MAKEINFO=makeinfo
+opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el sb-html.el sb-ant.el
+aux_AUX=INSTALL ChangeLog
+images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el sb-obj.xpm sb-chk.xpm sb-objod.xpm sb-label.xpm sb-ro.xpm sb-doc.xpm sb-info.xpm sb-doc-plus.xpm sb-doc-minus.xpm sb-box.xpm sb-box-plus.xpm sb-box-minus.xpm
+VERSION=1.0.3
+DISTDIR=$(top)speedbar-$(VERSION)
+
+
+
+all: autoloads init speedbar speedbar.info
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: init
+init: $(init_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: speedbar
+speedbar: $(speedbar_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+speedbar.info: $(info_TEXINFOS)
+	$(MAKEINFO) $<
+
+.PHONY: opt
+opt: $(opt_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+images: 
+	@
+
+tags: 
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: autoloads speedbar.info
+	mkdir $(DISTDIR)
+	cp speedbar-loaddefs.el $(init_LISP) $(speedbar_LISP) $(info_TEXINFOS) speedbar.info* $(opt_LISP) $(aux_AUX) $(images_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/speedbar/Project.ede b/site/cedet-1.0pre7/speedbar/Project.ede
new file mode 100644
index 0000000..5c8c48b
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/Project.ede
@@ -0,0 +1,54 @@
+;; Object speedbar
+;; EDE project file.
+(ede-proj-project "speedbar"
+  :name "speedbar"
+  :version "1.0.3"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "speedbar-loaddefs.el"
+    )
+   (ede-proj-target-elisp "init"
+    :name "init"
+    :path ""
+    :source '("speedbar-load.el")
+    )
+   (ede-proj-target-elisp "speedbar"
+    :name "speedbar"
+    :path ""
+    :source '("dframe.el" "speedbar.el")
+    :versionsource '("speedbar.el")
+    :aux-packages '("ezimage")
+    )
+   (ede-proj-target-makefile-info "info"
+    :name "info"
+    :path ""
+    :source '("speedbar.texi")
+    )
+   (ede-proj-target-elisp "opt"
+    :name "opt"
+    :path ""
+    :source '("rpm.el" "sb-gud.el" "sb-info.el" "sb-rmail.el" "sb-w3.el" "sb-texinfo.el" "bigclock.el" "sb-html.el" "sb-ant.el")
+    :partofall 'nil
+    )
+   (ede-proj-target-aux "aux"
+    :name "aux"
+    :path ""
+    :source '("INSTALL" "ChangeLog")
+    )
+   (ede-proj-target-makefile-miscelaneous "images"
+    :name "images"
+    :path ""
+    :source '("sb-dir-plus.xpm" "sb-dir-minus.xpm" "sb-dir.xpm" "sb-pg-plus.xpm" "sb-pg-minus.xpm" "sb-pg.xpm" "sb-mail.xpm" "sb-tag-plus.xpm" "sb-tag-minus.xpm" "sb-tag.xpm" "sb-tag-gt.xpm" "sb-tag-v.xpm" "sb-tag-type.xpm" "sb-image.el" "sb-obj.xpm" "sb-chk.xpm" "sb-objod.xpm" "sb-label.xpm" "sb-ro.xpm" "sb-doc.xpm" "sb-info.xpm" "sb-doc-plus.xpm" "sb-doc-minus.xpm" "sb-box.xpm" "sb-box-plus.xpm" "sb-box-minus.xpm")
+    :partofall 'nil
+    )
+   )
+  :web-site-url "http://cedet.sourceforge.net/speedbar.shtml"
+  :web-site-directory "~/cedet/www"
+  :web-site-file "speedbar.shtml"
+  :ftp-upload-site "/ftp@upload.sourceforge.net:/incoming"
+  :configuration-variables 'nil
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/speedbar/bigclock.el b/site/cedet-1.0pre7/speedbar/bigclock.el
new file mode 100755
index 0000000..139b242
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/bigclock.el
@@ -0,0 +1,164 @@
+;;; bigclock --- A great big clock
+
+;;; Copyright (C) 2000 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: amusement
+;; X-RCS: $Id: bigclock.el,v 1.4 2005/09/30 20:25:35 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Display a big clock in a special frame.
+
+(require 'dframe)
+
+;;; Code:
+(defgroup bigclock nil
+  "Faces used in dframe."
+  :prefix "bigclock-"
+  :group 'bigclock)
+
+(defcustom bigclock-frame-parameters
+  '((minibuffer . nil)
+    (width . 9)
+    (height . 2)
+    (border-width . 0)
+    (menu-bar-lines . 0)
+    (unsplittable . t)
+    (font . "-*-courier-medium-r-normal-*-*-320-*-*-m-*-iso8859-1"))
+  "Frame parameters for the big clock."
+  :group 'bigclock
+  :type '(repeat (sexp :tag "Parameter:")))
+
+(defcustom bigclock-update-flag dframe-have-timer-flag
+  "Non-nil means the clock will be able to update."
+  :group 'bigclock
+  :type 'boolean)
+
+(defvar bigclock-key-map
+  (let ((km (make-sparse-keymap)))
+    (dframe-update-keymap km)
+    km)
+  "Keymap used in the big clock.")
+  
+(defvar bigclock-buffer nil
+  "Bigclocks buffer.")
+
+(defvar bigclock-frame nil
+  "Bigclock's frame.")
+
+(defvar bigclock-cached-frame nil
+  "Bigclock's cached frame.")
+
+(defcustom bigclock-before-delete-hook nil
+  "Hooks called before bigclock is deleted."
+  :group 'bigclock
+  :type 'hook)
+
+(defcustom bigclock-before-popup-hook nil
+  "Hooks called before poping up the bigclock frame."
+  :group 'bigclock
+  :type 'hook)
+
+(defcustom bigclock-after-create-hook nil
+  "Hooks called after creating the bigclock frame."
+  :group 'bigclock
+  :type 'hook)
+
+(defcustom bigclock-mode-hook nil
+  "Hook run when a bigclock buffer is created."
+  :group 'bigclock
+  :type 'hook)
+
+(defalias 'bigclock 'bigclock-frame-mode)
+(defun bigclock-frame-mode (&optional arg)
+  "Enable or disable bigclock.
+Optional argument ARG enables or disables the bigclock frame."
+  (interactive "P")
+  ;; Get the buffer to play with
+  (if (not (buffer-live-p bigclock-buffer))
+      (save-excursion
+	(setq bigclock-buffer (get-buffer-create " BIGCLOCK"))
+	(set-buffer bigclock-buffer)
+	(bigclock-mode)))
+  ;; Do the frame thing
+  (dframe-frame-mode arg
+		     'bigclock-frame
+		     'bigclock-cached-frame
+		     'bigclock-buffer
+		     "Bigclock"
+		     #'bigclock-frame-mode
+		     (if dframe-xemacsp
+			 bigclock-frame-plist
+		       bigclock-frame-parameters)
+		     bigclock-before-delete-hook
+		     bigclock-before-popup-hook
+		     bigclock-after-create-hook)
+  ;; Start up the timer
+  (if (not bigclock-frame)
+      (dframe-set-timer nil #'bigclock-timer-fn 'bigclock-update-flag)
+    (dframe-set-timer 60 #'bigclock-timer-fn 'bigclock-update-flag)
+    ))
+
+(defun bigclock-get-focus ()
+  "Change frame focus to or from the bigclock frame.
+If the selected frame is not bigclock, then bigclock frame is
+selected.  If the bigclock frame is active, then select the attached frame."
+  (interactive)
+  (dframe-get-focus 'bigclock-frame 'bigclock-frame-mode))
+
+(defun bigclock-mode ()
+  "Set the current buffer to be in BIGCLOCK mode.
+\\{bigclock-key-map}"
+  ;; NOT interactive
+  (save-excursion
+    (kill-all-local-variables)
+    (setq major-mode 'bigclock-mode)
+    (setq mode-name "BigClock")
+    (setq font-lock-keywords nil) ;; no font-locking please
+    (setq truncate-lines t)
+    (use-local-map bigclock-key-map)
+    (make-local-variable 'frame-title-format)
+    (setq frame-title-format "Bigclock "))
+    (toggle-read-only 1)
+    (setq mode-line-format "")
+    ;; Add in our dframe hooks.
+    (setq dframe-track-mouse-function nil
+	  dframe-help-echo-function nil
+	  dframe-mouse-click-function nil
+	  dframe-mouse-position-function nil)
+    ;;no auto-show for Emacs
+    (run-hooks 'bigclock-mode-hook))
+
+(defun bigclock-timer-fn ()
+  "Run whenever Emacs is idle to update bigclock."
+  (if (or (not bigclock-frame)
+	  (not (frame-live-p bigclock-frame)))
+      (dframe-set-timer nil 'bigclock-timer-fn 'bigclock-update-flag)
+    (save-excursion
+      (set-buffer bigclock-buffer)
+      (toggle-read-only -1)
+      (erase-buffer)
+      (insert (format-time-string "%2I:%M %p" (current-time))))))
+
+
+(provide 'bigclock)
+
+;;; bigclock.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/dframe.el b/site/cedet-1.0pre7/speedbar/dframe.el
new file mode 100755
index 0000000..bbaa7d3
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/dframe.el
@@ -0,0 +1,1062 @@
+;;; dframe --- dedicate frame support modes
+
+;;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02, 03, 04, 05 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: dframe.el,v 1.29 2005/12/07 16:52:51 zappo Exp $
+
+(defvar dframe-version "1.3"
+  "The current version of the dedicated frame library.")
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This code was developed and maintained as a part of speedbar since 1996.
+;; It became its own support utility in Aug 2000.
+;;
+;; Dedicated frame mode is an Emacs independent library for supporting
+;; a program/buffer combination that resides in a dedicated frame.
+;; Support of this nature requires several complex interactions with the
+;; user which this library will provide, including:
+;;
+;; * Creation of a frame.  Positioned relatively.
+;;   Includes a frame cache for User position caching.
+;; * Switching between frames.
+;; * Timed activities using idle-timers
+;; * Frame/buffer killing hooks
+;; * Mouse-3 position relative menu
+;; * Mouse motion, help-echo hacks
+;; * Mouse clicking, double clicking, & Xemacs image clicking hack
+;; * Mode line hacking
+;; * Utilities for use in a program covering:
+;;    o keymap massage for some actions
+;;    o working with an associated buffer
+;;    o shift-click
+;;    o detaching a frame
+;;    o focus-shifting & optional frame jumping
+;;    o currently active frame.
+;;    o message/y-or-n-p
+;;    o mouse set point
+;;
+;; To Use:
+;; 1) (require 'dframe)
+;; 2) Variable Setup:
+;;   -frame-parameters -- Frame parameters for Emacs.
+;;   -frame-plist -- Frame parameters for XEmacs.
+;;   -- Not on parameter lists: They can optionally include width
+;;      and height.  If width or height is not included, then it will
+;;      be provided to match the originating frame.  In general,
+;;      turning off the menu bar, mode line, and minibuffer can
+;;      provide a smaller window, or more display area.
+;;   -track-mouse-flag -- mouse tracking on/off specific to your tool.
+;;   -update-flag -- app toggle for timer use.  Init from
+;;     `dframe-have-timer-flag'.  This is nil for terminals, since
+;;     updating a frame in a terminal is not useful to the user.
+;;   -key-map -- Your keymap.  Call `dframe-update-keymap' on it.
+;;   -buffer, -frame, -cached-frame -- Variables used to track your
+;;     applications buffer, frame, or frame cache (when hidden).  See
+;;     `dframe-frame-mode' for details.
+;;   -before-delete-hook, -before-popup-hook, -after-create-hook --
+;;     Hooks to have called.  The `-after-create-hook' probably wants
+;;     to call a function which calls `dframe-reposition-frame' in an
+;;     appropriate manner.
+;; 3) Function Setup:
+;;   your-frame-mode -- function to toggle your app frame on and off.
+;;     its tasks are:
+;;       a) create a buffer
+;;       b) Call `dframe-frame-mode'.  (See its doc)
+;;       c) If successful (your -frame variable has a value), call
+;;          timer setup if applicable.
+;;   your-frame-reposition- -- Function to call from after-create-hook to
+;;     reposition your frame with `dframe-repsoition-frame'.
+;;   your-mode -- Set up the major mode of the buffer for your app.
+;;     Set these variables: dframe-track-mouse-function,
+;;                          dframe-help-echo-function,
+;;                          dframe-mouse-click-function,
+;;                          dframe-mouse-position-function.
+;;   See speedbar's implementation of these functions.
+;;    `speedbar-current-frame', `speedbar-get-focus', `speedbar-message',
+;;    `speedbar-y-or-n-p', `speedbar-set-timer', `speedbar-click',
+;;    `speedbar-position-cursor-on-line'
+;; 4) Handling mouse clicks, and help text:
+;;   dframe-track-mouse, dframe-help-echo-function --
+;;    These variables need to be set to functions that display info
+;;    based on the mouse's position.
+;;   Text propert 'help-echo, set to `dframe-help-echo', which will
+;;    call `dframe-help-echo-function'.
+;;   Have a `-click' function, it can call `dframe-quick-mouse' for
+;;    positioning.  If the variable `dframe-power-click' is non-nil,
+;;    then `shift' was held down during the click.
+
+;;; Bugs
+;;
+;;  * The timer managers doesn't handle multiple different timeouts.
+;;  * You can't specify continuous timouts (as opposed to just lidle timers.)
+
+;;; Code:
+(defvar dframe-xemacsp (string-match "XEmacs" emacs-version)
+  "Non-nil if we are running in the XEmacs environment.")
+(defvar dframe-xemacs20p (and dframe-xemacsp
+			      (>= emacs-major-version 20)))
+
+;; From custom web page for compatibility between versions of custom
+;; with help from ptype@dera.gov.uk (Proto Type)
+(eval-and-compile
+  (condition-case ()
+      (require 'custom)
+    (error nil))
+  (if (and (featurep 'custom) (fboundp 'custom-declare-variable)
+	   ;; Some XEmacsen w/ custom don't have :set keyword.
+	   ;; This protects them against custom.
+	   (fboundp 'custom-initialize-set))
+      nil ;; We've got what we needed
+    ;; We have the old custom-library, hack around it!
+    (if (boundp 'defgroup)
+	nil
+      (defmacro defgroup (&rest args)
+	nil))
+    (if (boundp 'defface)
+	nil
+      (defmacro defface (var values doc &rest args)
+	(` (progn
+	     (defvar (, var) (quote (, var)))
+	     ;; To make colors for your faces you need to set your .Xdefaults
+	     ;; or set them up ahead of time in your .emacs file.
+	     (make-face (, var))
+	     ))))
+    (if (boundp 'defcustom)
+	nil
+      (defmacro defcustom (var value doc &rest args)
+	(` (defvar (, var) (, value) (, doc)))))))
+
+
+;;; Compatibility functions
+;;
+(if (fboundp 'frame-parameter)
+
+    (defalias 'dframe-frame-parameter 'frame-parameter)
+  
+  (defun dframe-frame-parameter (frame parameter)
+    "Return FRAME's PARAMETER value."
+    (cdr (assoc parameter (frame-parameters frame)))))
+
+
+;;; Variables
+;;
+(defgroup dframe nil
+  "Faces used in dframe."
+  :prefix "dframe-"
+  :group 'dframe)
+
+(defvar dframe-have-timer-flag
+  (and (or (fboundp 'run-with-idle-timer)
+	   (fboundp 'start-itimer)
+	   (boundp 'post-command-idle-hook))
+       (if (fboundp 'display-graphic-p)
+	   (display-graphic-p)
+	 window-system))
+  "Non-nil means that timers are available for this Emacs.")
+
+(defcustom dframe-update-speed
+  (if dframe-xemacsp
+      (if dframe-xemacs20p
+	  2				; 1 is too obrusive in XEmacs
+	5)				; when no idleness, need long delay
+    1)
+  "*Idle time in seconds needed before dframe will update itself.
+Updates occur to allow dframe to display directory information
+relevant to the buffer you are currently editing."
+  :group 'dframe
+  :type 'integer)
+
+(defcustom dframe-activity-change-focus-flag nil
+  "*Non-nil means the selected frame will change based on activity.
+Thus, if a file is selected for edit, the buffer will appear in the
+selected frame and the focus will change to that frame."
+  :group 'dframe
+  :type 'boolean)
+
+(defcustom dframe-after-select-attached-frame-hook nil
+  "*Hook run after dframe has selected the attached frame."
+  :group 'dframe
+  :type 'hook)
+
+(defvar dframe-track-mouse-function nil
+  "*A function to call when the mouse is moved in the given frame.
+Typically used to display info about the line under the mouse.")
+(make-variable-buffer-local 'dframe-track-mouse-function)
+
+(defvar dframe-help-echo-function nil
+  "*A function to call when help-echo is used in newer versions of Emacs.
+Typically used to display info about the line under the mouse.")
+(make-variable-buffer-local 'dframe-help-echo-function)
+
+(defvar dframe-mouse-click-function nil
+  "*A function to call when the mouse is clicked.
+Valid clicks are mouse 2, our double mouse 1.")
+(make-variable-buffer-local 'dframe-mouse-click-function)
+
+(defvar dframe-mouse-position-function nil
+  "*A function to called to position the cursor for a mouse click.")
+(make-variable-buffer-local 'dframe-mouse-position-function)
+
+(defvar dframe-power-click nil
+  "Never set this by hand.  Value is t when S-mouse activity occurs.")
+
+(defvar dframe-timer nil
+  "The dframe timer used for updating the buffer.")
+
+(defvar dframe-attached-frame nil
+  "The frame which started a frame mode.
+This is the frame from which all interesting activities will go
+for the mode using dframe.")
+
+(defvar dframe-controlled nil
+  "Is this buffer controlled by a dedicated frame.
+Local to those buffers, as a function called that created it.")
+(make-variable-buffer-local 'dframe-controlled)
+
+(defun dframe-update-keymap (map)
+  "Update the keymap MAP for dframe default bindings."
+  ;; Frame control
+  (define-key map "q" 'dframe-close-frame)
+  (define-key map "Q" 'delete-frame)
+
+  ;; Override switch to buffer to never hack our frame.
+  (substitute-key-definition 'switch-to-buffer
+			     'dframe-switch-buffer-attached-frame
+			     map global-map)
+
+  (if dframe-xemacsp
+      (progn
+	;; mouse bindings so we can manipulate the items on each line
+	(define-key map 'button2 'dframe-click)
+	(define-key map '(shift button2) 'dframe-power-click)
+	;; Info doc fix from Bob Weiner
+	(if (featurep 'infodoc)
+	    nil
+	  (define-key map 'button3 'dframe-xemacs-popup-kludge))
+	)
+
+    ;; mouse bindings so we can manipulate the items on each line
+    (define-key map [down-mouse-1] 'dframe-double-click)
+    (define-key map [mouse-2] 'dframe-click)
+    ;; This is the power click for new frames, or refreshing a cache
+    (define-key map [S-mouse-2] 'dframe-power-click)
+    ;; This adds a small unecessary visual effect
+    ;;(define-key map [down-mouse-2] 'dframe-quick-mouse)
+
+    (define-key map [down-mouse-3] 'dframe-emacs-popup-kludge)
+
+    ;; This lets the user scroll as if we had a scrollbar... well maybe not
+    (define-key map [mode-line mouse-2] 'dframe-mouse-hscroll)
+    ;; another handy place users might click to get our menu.
+    (define-key map [mode-line down-mouse-1]
+      'dframe-emacs-popup-kludge)
+
+    ;; We can't switch buffers with the buffer mouse menu.  Lets hack it.
+    (define-key map [C-down-mouse-1] 'dframe-hack-buffer-menu)
+
+    ;; Lastly, we want to track the mouse.  Play here
+    (define-key map [mouse-movement] 'dframe-track-mouse)
+    ))
+
+(defun dframe-live-p (frame)
+  "Return non-nil if FRAME is currently available."
+  (and frame (frame-live-p frame) (frame-visible-p frame)))
+
+(defun dframe-frame-mode (arg frame-var cache-var buffer-var frame-name
+			      local-mode-fn
+			      &optional
+			      parameters
+			      delete-hook popup-hook create-hook
+			      )
+  "Manage a frame for an application, enabling it when ARG is positive.
+FRAME-VAR is a variable used to cache the frame being used.
+This frame is either resurrected, hidden, killed, etc based on
+the value.
+CACHE-VAR is a variable used to cache a cached frame.
+BUFFER-VAR is a variable used to cache the buffer being used in dframe.
+This buffer will have `dframe-mode' run on it.
+FRAME-NAME is the name of the frame to create.
+LOCAL-MODE-FN is the function used to call this one.
+PARAMETERS are frame parameters to apply to this dframe.
+DELETE-HOOK are hooks to run when deleting a frame.
+POPUP-HOOK are hooks to run before showing a frame.
+CREATE-HOOK are hooks to run after creating a frame."
+  ;; toggle frame on and off.
+  (if (not arg) (if (dframe-live-p (symbol-value frame-var))
+		    (setq arg -1) (setq arg 1)))
+  ;; Make sure the current buffer is set.
+  (set-buffer (symbol-value buffer-var))
+  ;; turn the frame off on neg number
+  (if (and (numberp arg) (< arg 0))
+      (progn
+	(run-hooks 'delete-hook)
+	(if (and (symbol-value frame-var)
+		 (frame-live-p (symbol-value frame-var)))
+	    (progn
+	      (set cache-var (symbol-value frame-var))
+	      (make-frame-invisible (symbol-value frame-var))))
+	(set frame-var nil)
+	(make-variable-buffer-local 'dframe-timer)
+	)
+    ;; Set this as our currently attached frame
+    (make-variable-buffer-local 'dframe-attached-frame)
+    (setq dframe-attached-frame (selected-frame))
+    (run-hooks 'popup-hook)
+    ;; Updated the buffer passed in to contain all the hacks needed
+    ;; to make it work well in a dedicated window.
+    (save-excursion
+      (set-buffer (symbol-value buffer-var))
+      ;; Declare this buffer a dedicated frame
+      (setq dframe-controlled local-mode-fn)
+
+      (if dframe-xemacsp
+	  ;; Hack the XEmacs mouse-motion handler
+	  (progn
+	    ;; Hack the XEmacs mouse-motion handler
+	    (set (make-local-variable 'mouse-motion-handler)
+		 'dframe-track-mouse-xemacs)
+	    ;; Hack the double click handler
+	    (make-local-variable 'mouse-track-click-hook)
+	    (add-hook 'mouse-track-click-hook
+		      (lambda (event count)
+			(if (/= (event-button event) 1)
+			    nil		; Do normal operations.
+			  (cond ((eq count 1)
+				 (dframe-quick-mouse event))
+				((or (eq count 2)
+				     (eq count 3))
+				 (dframe-click event)
+				 (dframe-quick-mouse event)))
+			  ;; Don't do normal operations.
+			  t))))
+	;; Enable mouse tracking in emacs
+	(if dframe-track-mouse-function
+	    (set (make-local-variable 'track-mouse) t))	;this could be messy.
+	;; disable auto-show-mode for Emacs
+	(setq auto-show-mode nil))
+;;;; DISABLED: This causes problems for users with multiple frames.
+;;;;       ;; Set this up special just for the passed in buffer
+;;;;       ;; Terminal minibuffer stuff does not require this.
+;;;;       (if (and (or (assoc 'minibuffer parameters)
+;;;; 		   ;; XEmacs plist is not an association list
+;;;; 		   (member 'minibuffer parameters))
+;;;; 	       window-system (not (eq window-system 'pc))
+;;;; 	       (null default-minibuffer-frame))
+;;;; 	  (progn
+;;;; 	    (make-local-variable 'default-minibuffer-frame)
+;;;; 	    (setq default-minibuffer-frame dframe-attached-frame))
+;;;; 	)
+      ;; Override `temp-buffer-show-hook' so that help and such
+      ;; put their stuff into a frame other than our own.
+      ;; Correct use of `temp-buffer-show-function': Bob Weiner
+      (if (and (boundp 'temp-buffer-show-hook)
+	       (boundp 'temp-buffer-show-function))
+	  (progn (make-local-variable 'temp-buffer-show-hook)
+		 (setq temp-buffer-show-hook temp-buffer-show-function)))
+      (make-local-variable 'temp-buffer-show-function)
+      (setq temp-buffer-show-function 'dframe-temp-buffer-show-function)
+      ;; If this buffer is killed, we must make sure that we destroy
+      ;; the frame the dedicated window is in.
+      (add-hook 'kill-buffer-hook `(lambda ()
+				     (let ((skilling (boundp 'skilling)))
+				       (if skilling
+					   nil
+					 (if dframe-controlled
+					     (progn
+					       (funcall dframe-controlled -1)
+					       (setq ,buffer-var nil)
+					       )))))
+		t t)
+      )
+    ;; Get the frame to work in
+    (if (frame-live-p (symbol-value cache-var))
+	(progn
+	  (set frame-var (symbol-value cache-var))
+	  (make-frame-visible (symbol-value frame-var))
+	  (select-frame (symbol-value frame-var))
+	  (set-window-dedicated-p (selected-window) nil)
+	  (if (not (eq (current-buffer) (symbol-value buffer-var)))
+	      (switch-to-buffer (symbol-value buffer-var)))
+	  (set-window-dedicated-p (selected-window) t)
+	  (raise-frame (symbol-value frame-var))
+	  )
+      (if (frame-live-p (symbol-value frame-var))
+	  (raise-frame (symbol-value frame-var))
+	(set frame-var
+	      (if dframe-xemacsp
+		  ;; Only guess height if it is not specified.
+		  (if (member 'height parameters)
+		      (make-frame parameters)
+		    (make-frame (nconc (list 'height
+					     (dframe-needed-height))
+				       parameters)))
+		(let* ((mh (dframe-frame-parameter dframe-attached-frame
+						   'menu-bar-lines))
+		       (paramsa
+			;; Only add a guessed height if one is not specified
+			;; in the input parameters.
+			(if (assoc 'height parameters)
+			    parameters
+			  (append
+			   parameters
+			   (list (cons 'height (+ mh (frame-height)))))))
+		       (params
+			;; Only add a guessed width if one is not specified
+			;; in the input parameters.
+			(if (assoc 'width parameters)
+			    paramsa
+			  (append
+			   paramsa
+			   (list (cons 'width (frame-width))))))
+		       (frame
+			(if (or (< emacs-major-version 20)
+				(not (eq window-system 'x)))
+			    (make-frame params)
+			  (let ((x-pointer-shape x-pointer-top-left-arrow)
+				(x-sensitive-text-pointer-shape
+				 x-pointer-hand2))
+			    (make-frame params)))))
+		  frame)))
+	;; Put the buffer into the frame
+	(save-excursion
+	  (select-frame (symbol-value frame-var))
+	  (switch-to-buffer (symbol-value buffer-var))
+	  (set-window-dedicated-p (selected-window) t))
+	;; Run hooks (like reposition)
+	(run-hooks 'create-hook)
+	;; Frame name
+	(if (and (or (null window-system) (eq window-system 'pc))
+		 (fboundp 'set-frame-name))
+	    (save-window-excursion
+	      (select-frame (symbol-value frame-var))
+	      (set-frame-name frame-name)))
+	;; On a terminal, raise the frame or the user will
+	;; be confused.
+	(if (not window-system)
+	    (select-frame (symbol-value frame-var)))
+	))) )
+
+(defun dframe-reposition-frame (new-frame parent-frame location)
+  "Move NEW-FRAME to be relative to PARENT-FRAME.
+LOCATION can be one of 'random, 'left, 'right, 'left-right, or 'top-bottom."
+  (if dframe-xemacsp
+      (dframe-reposition-frame-xemacs new-frame parent-frame location)
+    (dframe-reposition-frame-emacs new-frame parent-frame location)))
+
+(defun dframe-reposition-frame-emacs (new-frame parent-frame location)
+  "Move NEW-FRAME to be relative to PARENT-FRAME.
+LOCATION can be one of 'random, 'left-right, 'top-bottom, or
+a cons cell indicationg a position of the form (LEFT . TOP)."
+  (let* ((pfx (dframe-frame-parameter parent-frame 'left))
+	 (pfy (dframe-frame-parameter parent-frame 'top))
+	 (pfw (frame-pixel-width parent-frame))
+	 (pfh (frame-pixel-height parent-frame))
+	 (nfw (frame-pixel-width new-frame))
+	 (nfh (frame-pixel-height new-frame))
+	 newleft newtop
+	 )
+    ;; Position dframe.
+    (if (or (not window-system) (eq window-system 'pc))
+	;; Do no positioning if not on a windowing system,
+	nil
+      ;; Rebuild pfx,pfy to be absolute positions.
+      (setq pfx (if (not (consp pfx))
+		    pfx
+		  ;; If pfx is a list, that means we grow
+		  ;; from a specific edge of the display.
+		  ;; Convert that to the distance from the
+		  ;; left side of the display.
+		  (if (eq (car pfx) '-)
+		      ;; A - means distance from the right edge
+		      ;; of the display, or DW - pfx - framewidth
+		      (- (x-display-pixel-width) (car (cdr pfx)) pfw)
+		    (car (cdr pfx))))
+	    pfy (if (not (consp pfy))
+		    pfy
+		  ;; If pfy is a list, that means we grow
+		  ;; from a specific edge of the display.
+		  ;; Convert that to the distance from the
+		  ;; left side of the display.
+		  (if (eq (car pfy) '-)
+		      ;; A - means distance from the right edge
+		      ;; of the display, or DW - pfx - framewidth
+		      (- (x-display-pixel-height) (car (cdr pfy)) pfh)
+		    (car (cdr pfy))))
+	    )
+      (cond ((eq location 'right)
+	     (setq newleft (+ pfx pfw 5)
+		   newtop pfy))
+	    ((eq location 'left)
+	     (setq newleft (- pfx 10 nfw)
+		   newtop pfy))
+	    ((eq location 'left-right)
+	     (setq newleft
+		   ;; Decide which side to put it on.  200 is just a
+		   ;; buffer for the left edge of the screen.  The
+		   ;; extra 10 is just dressings for window
+		   ;; decorations.
+		   (let* ((left-guess (- pfx 10 nfw))
+			  (right-guess (+ pfx pfw 5))
+			  (left-margin left-guess)
+			  (right-margin (- (x-display-pixel-width)
+					   right-guess 5 nfw)))
+		     (cond ((>= left-margin 0) left-guess)
+			   ((>= right-margin 0) right-guess)
+			   ;; otherwise choose side we overlap less
+			   ((> left-margin right-margin) 0)
+			   (t (- (x-display-pixel-width) nfw 5))))
+		   newtop pfy
+		   ))
+	    ((eq location 'top-bottom)
+	     (setq newleft pfx
+		   newtop
+		   ;; Try and guess if we should be on the top or bottom.
+		   (let* ((top-guess (- pfy 15 nfh))
+			  (bottom-guess (+ pfy 5 pfh))
+			  (top-margin top-guess)
+			  (bottom-margin (- (x-display-pixel-height)
+					    bottom-guess 5 nfh)))
+		     (cond ((>= top-margin 0) top-guess)
+			   ((>= bottom-margin 0) bottom-guess)
+			   ;; Choose a side to overlap the least.
+			   ((> left-margin right-margin) 0)
+			   (t (- (x-display-height) nfh 5)))))
+	     )
+	    ((consp location)
+	     (setq newleft (or (car location) 0)
+		   newtop (or (cdr location) 0)))
+	    (t nil))
+      (modify-frame-parameters new-frame
+       (list (cons 'left newleft)
+	     (cons 'top newtop))))))
+
+(defun dframe-reposition-frame-xemacs (new-frame parent-frame location)
+  "Move NEW-FRAME to be relative to PARENT-FRAME.
+LOCATION can be one of 'random, 'left-right, or 'top-bottom."
+  ;; Not yet implemented
+  )
+
+;; XEmacs function only.
+(defun dframe-needed-height (&optional frame)
+  "The needed height for the tool bar FRAME (in characters)."
+  (or frame (setq frame (selected-frame)))
+  ;; The 1 is the missing modeline/minibuffer
+  (+ 1 (/ (frame-pixel-height frame)
+	  (face-height 'default frame))))
+
+(defun dframe-detach (frame-var cache-var buffer-var)
+  "Detatch the frame in symbol FRAME-VAR.
+CACHE-VAR and BUFFER-VAR are symbols as in `dframe-frame-mode'"
+  (save-excursion
+    (set-buffer (symbol-value buffer-var))
+    (rename-buffer (buffer-name) t)
+    (let ((oldframe (symbol-value frame-var)))
+      (set buffer-var nil)
+      (set frame-var nil)
+      (set cache-var nil)
+      (make-variable-buffer-local frame-var)
+      (set frame-var oldframe)
+      )))
+
+;;; Special frame event proxies
+;;
+(if (boundp 'special-event-map)
+    (progn
+      (define-key special-event-map [make-frame-visible]
+	'dframe-handle-make-frame-visible)
+      (define-key special-event-map [iconify-frame]
+	'dframe-handle-iconify-frame)
+      (define-key special-event-map [delete-frame]
+	'dframe-handle-delete-frame))
+  )
+
+(defvar dframe-make-frame-visible-function nil
+  "Function used when a dframe controlled frame is de-iconified.
+The function must take an EVENT.")
+(defvar dframe-iconify-frame-function nil
+  "Function used when a dframe controlled frame is iconified.
+The function must take an EVENT.")
+(defvar dframe-delete-frame-function nil
+  "Function used when a frame attached to a dframe frame is deleted.
+The function must take an EVENT.")
+
+(defun dframe-handle-make-frame-visible (e)
+  "Handle a `make-frame-visible' event.
+Should enables auto-updating if the last state was also enabled.
+Argument E is the event making the frame visible."
+  (interactive "e")
+  (let ((f last-event-frame))
+    (if (and (dframe-attached-frame f)
+	     dframe-make-frame-visible-function)
+	(funcall dframe-make-frame-visible-function e)
+      )))
+
+(defun dframe-handle-iconify-frame (e)
+  "Handle a `iconify-frame' event.
+Should disables auto-updating if the last state was also enabled.
+Argument E is the event iconifying the frame."
+  (interactive "e")
+  (let ((f last-event-frame))
+    (if (and (dframe-attached-frame f)
+	     dframe-iconify-frame-function e)
+	(funcall dframe-iconify-frame-function)
+      )))
+
+(defun dframe-handle-delete-frame (e)
+  "Handle `delete-frame' event.
+Argument E is the event deleting the frame."
+  (interactive "e")
+  (let ((fl (frame-list))
+	(sf (selected-frame)))
+    ;; Loop over all frames.  If dframe-delete-frame-function is
+    ;; non-nil, call it.
+    (while fl
+      (select-frame (car fl))
+      (if dframe-delete-frame-function
+	  (funcall dframe-delete-frame-function e))
+      (setq fl (cdr fl)))
+    (if (frame-live-p sf)
+	(select-frame sf))
+    (handle-delete-frame e)))
+
+
+;;; Utilities
+;;
+(defun dframe-get-focus (frame-var activator &optional hook)
+  "Change frame focus to or from a dedicated frame.
+If the selected frame is not in the symbol FRAME-VAR, then FRAME-VAR
+frame is selected.  If the FRAME-VAR is active, then select the
+attached frame.  If FRAME-VAR is nil, ACTIVATOR is called to
+created it.  HOOK is an optional argument of hooks to run when
+selecting FRAME."
+  (interactive)
+  (if (eq (selected-frame) (symbol-value frame-var))
+      (if (frame-live-p dframe-attached-frame)
+	  (dframe-select-attached-frame))
+    ;; make sure we have a frame
+    (if (not (frame-live-p (symbol-value frame-var)))
+	(funcall activator 1))
+    ;; go there
+    (select-frame (symbol-value frame-var))
+    )
+  (other-frame 0)
+  ;; If updates are off, then refresh the frame (they want it now...)
+  (run-hooks 'hook))
+
+
+(defun dframe-close-frame ()
+  "Close the current frame if it is dedicated."
+  (interactive)
+  (if dframe-controlled
+      (let ((b (current-buffer)))
+	(funcall dframe-controlled -1)
+	(kill-buffer b))))
+
+(defun dframe-current-frame (frame-var desired-major-mode)
+  "Return the existing dedicated frame to use.
+FRAME-VAR is the variable storing the currently active dedicated frame.
+If the current frame's buffer uses DESIRED-MAJOR-MODE, then use that frame."
+  (if (not (eq (selected-frame) (symbol-value frame-var)))
+      (if (and (eq major-mode 'desired-major-mode)
+	       (get-buffer-window (current-buffer))
+	       (window-frame (get-buffer-window (current-buffer))))
+	  (window-frame (get-buffer-window (current-buffer)))
+	(symbol-value frame-var))
+    (symbol-value frame-var)))
+
+(defun dframe-attached-frame (&optional frame)
+  "Return the attached frame belonging to the dframe controlled frame FRAME.
+If optional arg FRAME is nil just return `dframe-attached-frame'."
+  (save-excursion
+    (if frame (select-frame frame))
+    dframe-attached-frame))
+
+(defun dframe-select-attached-frame (&optional frame)
+  "Switch to the frame the dframe controlled frame FRAME was started from. If
+optional arg FRAME is nil assume the attached frame is already selected and
+just run the hooks `dframe-after-select-attached-frame-hook'. Return the
+attached frame."
+  (let ((frame (dframe-attached-frame frame)))
+    (if frame (select-frame frame))
+    (prog1 frame
+      (run-hooks 'dframe-after-select-attached-frame-hook))))
+
+(defmacro dframe-with-attached-buffer (&rest forms)
+  "Execute FORMS in the attached frame's special buffer.
+Optionally select that frame if necessary."
+  `(save-selected-window
+     ;;(speedbar-set-timer speedbar-update-speed)
+     (dframe-select-attached-frame)
+     ,@forms
+     (dframe-maybee-jump-to-attached-frame)))
+
+(defun dframe-maybee-jump-to-attached-frame ()
+  "Jump to the attached frame ONLY if this was not a mouse event."
+  (when (or (not (dframe-mouse-event-p last-input-event))
+            dframe-activity-change-focus-flag)
+    (dframe-select-attached-frame)
+    ;; KB: For what is this - raising the frame?? 
+    (other-frame 0)))
+
+
+(defvar dframe-suppress-message-flag nil
+  "Non-nil means that `dframe-message' should just return a string.")
+
+(defun dframe-message (fmt &rest args)
+  "Like message, but for use in a dedicated frame.
+Argument FMT is the format string, and ARGS are the arguments for message."
+  (save-selected-window
+    (if dframe-suppress-message-flag
+	(apply 'format fmt args)
+      (if dframe-attached-frame
+          ;; KB: Here we do not need calling `dframe-select-attached-frame'
+	  (select-frame dframe-attached-frame))
+      (apply 'message fmt args))))
+
+(defun dframe-y-or-n-p (prompt)
+  "Like `y-or-n-p', but for use in a dedicated frame.
+Argument PROMPT is the prompt to use."
+  (save-selected-window
+    (if (and ;;default-minibuffer-frame
+	     dframe-attached-frame
+	     ;;(not (eq default-minibuffer-frame dframe-attached-frame))
+	     )
+        ;; KB: Here we do not need calling `dframe-select-attached-frame'
+	(select-frame dframe-attached-frame))
+    (y-or-n-p prompt)))
+
+;;; timer management
+;;
+;; Unlike speedbar with a dedicated set of routines, dframe has one master
+;; timer, and all dframe users will use it.  At least until I figure out a way
+;; around that problem.
+;;
+;; Advantage 1: Two apps with timer/frames can munge the master list
+;;              to make sure they occur in order.
+;; Advantage 2: If a user hits a key between timer functions, we can
+;;	        interrupt them safely.
+(defvar dframe-client-functions nil
+  "List of client functions using the dframe timer.")
+
+(defun dframe-set-timer (timeout fn &optional null-on-error)
+  "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
+TIMEOUT is the number of seconds until the dframe controled program
+timer is called again.  When TIMEOUT is nil, turn off all timeouts.
+This function must be called from the buffer belonging to the program
+who requested the timer.
+If NULL-ON-ERROR is a symbol, set it to nil if we cannot create a timer."
+  ;; First, fix up our list of client functions
+  (if timeout
+      (add-to-list 'dframe-client-functions fn)
+    (setq dframe-client-functions (delete fn dframe-client-functions)))
+  ;; Now decided what to do about the timout.
+  (if (or
+       ;; We have a timer, restart the timer with the new time.
+       timeout
+       ;; We have a timer, an off is requested, and no client
+       ;; functions are left, shut er down.
+       (and dframe-timer (not timeout) dframe-client-functions))
+      ;; Only call the low level function if we are changing the state.
+      (dframe-set-timer-internal timeout null-on-error)))
+
+(defun dframe-set-timer-internal (timeout &optional null-on-error)
+  "Apply a timer with TIMEOUT to call the dframe timer manager.
+If NULL-ON-ERROR is a symbol, set it to nil if we cannot create a timer."
+  (cond
+   ;; XEmacs
+   (dframe-xemacsp
+    (if dframe-timer
+	(progn (delete-itimer dframe-timer)
+	       (setq dframe-timer nil)))
+    (if timeout
+	(if (and dframe-xemacsp
+		 (or (>= emacs-major-version 21)
+		     (and (= emacs-major-version 20)
+			  (> emacs-minor-version 0))
+		     (and (= emacs-major-version 19)
+			  (>= emacs-minor-version 15))))
+	    (setq dframe-timer (start-itimer "dframe"
+					     'dframe-timer-fn
+					     timeout
+					     timeout
+					     t))
+	  (setq dframe-timer (start-itimer "dframe"
+					   'dframe-timer-fn
+					   timeout
+					   nil)))))
+   ;; Post 19.31 Emacs
+   ((fboundp 'run-with-idle-timer)
+    (if dframe-timer
+	(progn (cancel-timer dframe-timer)
+	       (setq dframe-timer nil)))
+    (if timeout
+	(setq dframe-timer
+	      (run-with-idle-timer timeout t 'dframe-timer-fn))))
+   ;; Emacs 19.30 (Thanks twice: ptype@dra.hmg.gb)
+   ((fboundp 'post-command-idle-hook)
+    (if timeout
+	(add-hook 'post-command-idle-hook 'dframe-timer-fn)
+      (remove-hook 'post-command-idle-hook 'dframe-timer-fn)))
+   ;; Older or other Emacsen with no timers.  Set up so that its
+   ;; obvious this emacs can't handle the updates
+   ((symbolp null-on-error)
+    (set null-on-error nil)))
+  )
+
+(defun dframe-timer-fn ()
+  "Called due to the dframe timer.
+Evaluates all cached timer functions in sequence."
+  (let ((l dframe-client-functions))
+    (while (and l (sit-for 0))
+      (condition-case er
+	  (funcall (car l))
+	(error (message "DFRAME TIMER ERROR: %S" er)))
+      (setq l (cdr l)))))
+
+;;; Menu hacking for mouse-3
+;;
+(defconst dframe-pass-event-to-popup-mode-menu
+  (let (max-args)
+    (and (fboundp 'popup-mode-menu)
+         (fboundp 'function-max-args)
+         (setq max-args (function-max-args 'popup-mode-menu))
+         (not (zerop max-args))))
+  "The EVENT arg to 'popup-mode-menu' was introduced in XEmacs 21.4.0.")
+
+;; In XEmacs, we make popup menus work on the item over mouse (as
+;; opposed to where the point happens to be.)  We attain this by
+;; temporarily moving the point to that place.
+;;    Hrvoje Niksic <hniksic@srce.hr>
+(defun dframe-xemacs-popup-kludge (event)
+  "Pop up a menu related to the clicked on item.
+Must be bound to EVENT."
+  (interactive "e")
+  (save-excursion
+    (if dframe-pass-event-to-popup-mode-menu
+        (popup-mode-menu event)
+      (goto-char (event-closest-point event))
+      (beginning-of-line)
+      (forward-char (min 5 (- (save-excursion (end-of-line) (point))
+                              (save-excursion (beginning-of-line) (point)))))
+      (popup-mode-menu))
+    ;; Wait for menu to bail out.  `popup-mode-menu' (and other popup
+    ;; menu functions) return immediately.
+    (let (new)
+      (while (not (misc-user-event-p (setq new (next-event))))
+        (dispatch-event new))
+      (dispatch-event new))))
+
+(defun dframe-emacs-popup-kludge (e)
+  "Pop up a menu related to the clicked on item.
+Must be bound to event E."
+  (interactive "e")
+  (save-excursion
+    (mouse-set-point e)
+    ;; This gets the cursor where the user can see it.
+    (if (not (bolp)) (forward-char -1))
+    (sit-for 0)
+    (if (< emacs-major-version 20)
+	(mouse-major-mode-menu e)
+      (mouse-major-mode-menu e nil))))
+
+;;; Interactive user functions for the mouse
+;;
+(if dframe-xemacsp
+    (defalias 'dframe-mouse-event-p 'button-press-event-p)
+  (defun dframe-mouse-event-p (event)
+    "Return t if the event is a mouse related event."
+    (if (and (listp event)
+	     (member (event-basic-type event)
+		     '(mouse-1 mouse-2 mouse-3)))
+	t
+      nil)))
+
+(defun dframe-track-mouse (event)
+  "For motion EVENT, display info about the current line."
+  (interactive "e")
+  (when (and dframe-track-mouse-function
+	     (or dframe-xemacsp ;; XEmacs always safe?
+		 (windowp (posn-window (event-end event))) ; Sometimes
+					; there is no window to jump into.
+		 ))
+	     
+    (funcall dframe-track-mouse-function event)))
+
+(defun dframe-track-mouse-xemacs (event)
+  "For motion EVENT, display info about the current line."
+  (if (functionp (default-value 'mouse-motion-handler))
+      (funcall (default-value 'mouse-motion-handler) event))
+  (if dframe-track-mouse-function
+      (funcall dframe-track-mouse-function event)))
+
+(defun dframe-help-echo (window &optional buffer position)
+  "Display help based context.
+The context is in WINDOW, viewing BUFFER, at POSITION.
+BUFFER and POSITION are optional because XEmacs doesn't use them."
+  (when (and (not dframe-track-mouse-function)
+	     (bufferp buffer)
+	     dframe-help-echo-function)
+    (let ((dframe-suppress-message-flag t))
+      (with-current-buffer buffer
+	(if position (goto-char position))
+	(funcall dframe-help-echo-function)))))
+
+(defun dframe-mouse-set-point (e)
+  "Set POINT based on event E.
+Handles clicking on images in XEmacs."
+  (if (save-excursion
+	(save-window-excursion
+	  (mouse-set-point e)
+	  (and (fboundp 'event-over-glyph-p) (event-over-glyph-p e))))
+      ;; We are in XEmacs, and clicked on a picture
+      (let ((ext (event-glyph-extent e)))
+	;; This position is back inside the extent where the
+	;; junk we pushed into the property list lives.
+	(if (extent-end-position ext)
+	    (goto-char (1- (extent-end-position ext)))
+	  (mouse-set-point e)))
+    ;; We are not in XEmacs, OR we didn't click on a picture.
+    (mouse-set-point e)))
+
+(defun dframe-quick-mouse (e)
+  "Since mouse events are strange, this will keep the mouse nicely positioned.
+This should be bound to mouse event E."
+  (interactive "e")
+  (dframe-mouse-set-point e)
+  (if dframe-mouse-position-function
+      (funcall dframe-mouse-position-function)))
+
+(defun dframe-power-click (e)
+  "Activate any `dframe' mouse click as a power click.
+A power click will dispose of cached data (if available) or bring a buffer
+up into a different window.
+This should be bound to mouse event E."
+  (interactive "e")
+  (let ((dframe-power-click t))
+    (select-frame last-event-frame)
+    (dframe-click e)))
+
+(defun dframe-click (e)
+  "Call our clients click function on a user click.
+E is the event causing the click."
+  (interactive "e")
+  (dframe-mouse-set-point e)
+  (when dframe-mouse-click-function
+    ;; On the off chance of buffer switch, or something incorrectly
+    ;; configured.
+    (funcall dframe-mouse-click-function e)))
+
+(defun dframe-double-click (e)
+  "Activate the registered click function on a double click.
+This must be bound to a mouse event.
+This should be bound to mouse event E."
+  (interactive "e")
+  ;; Emacs only.  XEmacs handles this via `mouse-track-click-hook'.
+  (cond ((eq (car e) 'down-mouse-1)
+	 (dframe-mouse-set-point e))
+	((eq (car e) 'mouse-1)
+	 (dframe-quick-mouse e))
+	((or (eq (car e) 'double-down-mouse-1)
+	     (eq (car e) 'triple-down-mouse-1))
+	 (dframe-click e))))
+
+;;; Hacks of normal things.
+;;
+;; Some normal things that happen in one of these dedicated frames
+;; must be handled specially, so that our dedicated frame isn't
+;; messed up.
+(defun dframe-temp-buffer-show-function (buffer)
+  "Placed in the variable `temp-buffer-show-function' in dedicated frames.
+If a user requests help using \\[help-command] <Key> the temp BUFFER will be
+redirected into a window on the attached frame."
+  (if dframe-attached-frame (dframe-select-attached-frame))
+  (pop-to-buffer buffer nil)
+  (other-window -1)
+  ;; Fix for using this hook on some platforms: Bob Weiner
+  (cond ((not dframe-xemacsp)
+	 (run-hooks 'temp-buffer-show-hook))
+	((fboundp 'run-hook-with-args)
+	 (run-hook-with-args 'temp-buffer-show-hook buffer))
+	((and (boundp 'temp-buffer-show-hook)
+	      (listp temp-buffer-show-hook))
+	 (mapcar (function (lambda (hook) (funcall hook buffer)))
+		 temp-buffer-show-hook))))
+
+(defun dframe-hack-buffer-menu (e)
+  "Control mouse 1 is buffer menu.
+This hack overrides it so that the right thing happens in the main
+Emacs frame, not in the dedicated frame.
+Argument E is the event causing this activity."
+  (interactive "e")
+  (let ((fn (lookup-key global-map (if dframe-xemacsp
+				              '(control button1)
+				     [C-down-mouse-1])))
+	(oldbuff (current-buffer))
+	(newbuff nil))
+    (unwind-protect
+	(save-excursion
+	  (set-window-dedicated-p (selected-window) nil)
+	  (call-interactively fn)
+	  (setq newbuff (current-buffer)))
+      (switch-to-buffer oldbuff)
+      (set-window-dedicated-p (selected-window) t))
+    (if (not (eq newbuff oldbuff))
+	(dframe-with-attached-buffer
+	 (switch-to-buffer newbuff)))))
+
+(defun dframe-switch-buffer-attached-frame (&optional buffer)
+  "Switch to BUFFER in the attached frame, and raise that frame.
+This overrides the default behavior of `switch-to-buffer' which is
+broken because of the dedicated frame."
+  (interactive)
+  ;; Assume we are in the dedicated frame.
+  (other-frame 1)
+  ;; Now switch buffers
+  (if buffer
+      (switch-to-buffer buffer)
+    (call-interactively 'switch-to-buffer nil nil)))
+
+;; XEmacs: this can be implemented using modeline keymaps, but there
+;; is no use, as we have horizontal scrollbar (as the docstring
+;; hints.)
+(defun dframe-mouse-hscroll (e)
+  "Read a mouse event E from the mode line, and horizontally scroll.
+If the mouse is being clicked on the far left, or far right of the
+mode-line.  This is only useful for non-XEmacs."
+  (interactive "e")
+  (let* ((x-point (car (nth 2 (car (cdr e)))))
+	 (pixels-per-10-col (/ (* 10 (frame-pixel-width))
+			       (frame-width)))
+	 (click-col (1+ (/ (* 10 x-point) pixels-per-10-col)))
+	 )
+    (cond ((< click-col 3)
+	   (scroll-left 2))
+	  ((> click-col (- (window-width) 5))
+	   (scroll-right 2))
+	  (t (dframe-message
+	      "Click on the edge of the modeline to scroll left/right")))
+    ))
+
+(provide 'dframe)
+
+;;; dframe.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/rpm.el b/site/cedet-1.0pre7/speedbar/rpm.el
new file mode 100755
index 0000000..d541740
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/rpm.el
@@ -0,0 +1,198 @@
+;;; rpm.el --- Manage Red Hat packages in emacs
+
+;;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 1.0
+;; Keywords: speedbar, rpm
+;; X-RCS: $Id: rpm.el,v 1.11 2005/09/30 20:25:46 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Manage Red Hat system packages in emacs.  Uses speedbar to display
+;; the package higherarchy, and defines an `rpm-mode' which is useful
+;; for managing and viewing a specific package.
+;;
+;;  This tool depends on speedbar version 0.7 or higher.
+;;
+
+;;; History:
+;;
+;; 1.0  Initial revision
+
+(require 'speedbar)
+;;; Code:
+
+(defvar rpm-system nil
+  "This represents the current system.")
+
+(defvar rpm-speedbar-key-map nil
+  "Keymap used when working with RPMs in speedbar.")
+
+(if rpm-speedbar-key-map
+    nil
+  (setq rpm-speedbar-key-map (speedbar-make-specialized-keymap))
+
+  ;; General viewing pleasure...
+  (define-key rpm-speedbar-key-map "\C-m" 'speedbar-edit-line)
+  (define-key rpm-speedbar-key-map "+" 'speedbar-expand-line)
+  (define-key rpm-speedbar-key-map "=" 'speedbar-expand-line)
+  (define-key rpm-speedbar-key-map "-" 'speedbar-contract-line)
+
+  )
+
+(defvar rpm-speedbar-menu
+  ()
+  "Menu part in easymenu format that is used in speedbar while in rpm mode.")
+
+(defvar rpm-font-lock-keywords
+  '(
+    ;; file names
+    ("^\\(/[^ \n]+\\)$" 1 font-lock-reference-face)
+    ;; Tags
+    ("\\(Name\\|Version\\|Release\\|Install date\\|Group\\|Size\\|Packager\\|\
+Summary\\|Description\\|Distribution\\|Vendor\\|Build Date\\|Build Host\\|\
+Source RPM\\|URL\\) *:" 0 font-lock-variable-name-face)
+    ("^Name +: \\([^ \t]+\\)" 1 font-lock-function-name-face)
+    ;; Everything else is from the description.
+    ;; This is a clever font lock hack since it wont double color items
+    ("^\\([^\n]+\\)$" 1 font-lock-comment-face)
+    )
+  "Keywords used to highlight an RPM info buffer.")
+
+(defun rpm-info (package)
+  "View RPM PACKAGE information in the current buffer."
+  (interactive "sPackage: ")
+  (toggle-read-only -1)
+  (call-process "rpm" nil t nil "-qil" package)
+  (goto-char (point-min))
+  (rpm-mode)
+  (set-buffer-modified-p nil)
+  (toggle-read-only 1))
+
+(defun rpm-mode ()
+  "Major mode for viewing package information."
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'rpm-mode
+	mode-name "RPM")
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '((rpm-font-lock-keywords)
+			     t t
+			     ((?_ . "w") (?/ . "w"))))
+  (run-hooks 'rpm-info-hook))
+
+;;;###autoload
+(defun rpm ()
+  "Red Hat Package Management in Emacs."
+  (interactive)
+  ;; Make sure that speedbar is active
+  (speedbar-frame-mode 1)
+  ;; Make sure our special speedbar major mode is loaded
+  (speedbar-add-expansion-list '("rpm" rpm-speedbar-menu rpm-speedbar-key-map
+				 rpm-speedbar))
+  ;; Now, throw us into RPM mode on speedbar.
+  (speedbar-change-initial-expansion-list "rpm")
+  )
+
+(defun rpm-speedbar (directory zero)
+  "Create buttons in speedbar that represents the current rpm system.
+Takes DIRECTORY and ZERO, which are both ignored."
+  (rpm-fetch-system)
+  (let ((speedbar-tag-hierarchy-method '(speedbar-sort-tag-hierarchy)))
+    (speedbar-insert-generic-list -1 rpm-system 'rpm-tag-expand 'rpm-tag-find)))
+
+(defun rpm-tag-expand (text token indent)
+  "Expand a tag sublist.  Imenu will return sub-lists of specialized tag types.
+Etags does not support this feature.  TEXT will be the button
+string.  TOKEN will be the list, and INDENT is the current indentation
+level."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (let ((speedbar-tag-hierarchy-method '(speedbar-sort-tag-hierarchy)))
+	       (speedbar-insert-generic-list indent
+					     token
+					     'rpm-tag-expand
+					     'rpm-tag-find)))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops... not sure what to do.")))
+  (speedbar-center-buffer-smartly))
+
+(defun rpm-tag-find (text token indent)
+  "When clicking on a found tag, open that RPM file up.
+TEXT is the name of the package.  TOKEN and INDENT are ignored."
+  (let* ((buff (get-buffer-create text))
+	 (bwin (get-buffer-window buff 0)))
+    (if bwin
+	(progn
+	  (select-window bwin)
+	  (raise-frame (window-frame bwin)))
+      (if dframe-power-click
+	  (let ((pop-up-frames t)) (select-window (display-buffer buff)))
+	(dframe-select-attached-frame speedbar-frame)
+	(switch-to-buffer buff)))
+    (erase-buffer)
+    (rpm-info text)))
+
+(defun rpm-fetch-system ()
+  "Fetch the system by executing rpm."
+  (if rpm-system
+      nil
+    (save-excursion
+      (set-buffer (get-buffer-create "*rpm output*"))
+      ;; Get the database information here
+      (if (= (point-min) (point-max))
+	  (progn
+	    (speedbar-message "Running rpm -qa")
+	    (call-process "rpm" nil t nil "-qa" "--queryformat"
+			  "%{name}-%{version}-%{release} %{group}\n")))
+      ;; Convert it into a giant list
+      (speedbar-message "Parsing output ... ")
+      (goto-char (point-min))
+      (while (re-search-forward "^\\([^ ]+\\) \\([^\n]+\\)$" nil t)
+	(let* ((n (match-string 1))
+	       (p (match-string 2))
+	       (sl nil))
+	  ;; Start the directory listing
+	  (string-match "^\\([^/]+\\)\\(/\\|$\\)" p)
+	  (setq sl (assoc (match-string 1 p) rpm-system))
+	  (if (not sl) (setq rpm-system
+			     (cons (setq sl (list (match-string 1 p)))
+				   rpm-system)))
+	  (setq p (substring p (match-end 0)))
+	  ;; Loop to the end of the directory listing
+	  (while (string-match "^\\([^/]+\\)\\(/\\|$\\)" p)
+	    (let ((ssl (assoc (match-string 1 p) sl)))
+	      (if (not ssl)
+		  (setcdr sl (cons (setq ssl (list (match-string 1 p)))
+				   (cdr sl))))
+	      (setq sl ssl))
+	    (setq p (substring p (match-end 0))))
+	  ;; We are at the end.  Append our new element to the end
+	  (while (cdr sl) (setq sl (cdr sl)))
+	  (setcdr sl (cons (cons n 1) nil)))))))
+
+(provide 'rpm)
+;;; rpm.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-ant.el b/site/cedet-1.0pre7/speedbar/sb-ant.el
new file mode 100644
index 0000000..51418c3
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-ant.el
@@ -0,0 +1,110 @@
+;;; sb-ant.el --- provide speedbar menus for ANT Project files
+
+;; Copyright (c) 2001, 2003 Ole Arndt
+;; Author: Ole Arndt <arndt@tivano.com>
+;; based on sb-html.el by:
+;; Created: Tue Sep 09 09:45:00 2001
+
+;; Copyright (c) 2001 Richard Y. Kim
+;; Author: Richard Y. Kim, <ryk@dspwiz.com>
+;; Maintainer: Richard Y. Kim, <ryk@dspwiz.com>
+;; Created: Mon Apr 09 09:44:06 2001
+;; Version: $Id: sb-ant.el,v 1.3 2005/09/30 20:25:50 zappo Exp $
+;; Keywords: speedbar, html
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
+
+;; This small add-on to speedbar provides an alternate way to view ANT
+;; project files. It simply lists all the available targets.
+;;
+;; This code is a simple modification of sb-html.el which comes
+;; with speedbar.
+
+;; Installation procedure:
+;;
+;;   Install speedbar 0.12 or later.
+;;   Add the following to your ~/.emacs file:
+;;   (eval-after-load "speedbar" '(load-library "sb-ant"))
+;;
+
+;;; Code:
+
+(require 'speedbar)
+(require 'sb-texinfo)	; for speedbar-format-texinfo-list
+
+;; Attach these new functions to handle texinfo-mode.
+(add-to-list 'speedbar-dynamic-tags-function-list
+	     '(speedbar-fetch-dynamic-ant-project . speedbar-insert-ant-project-list))
+
+;; This returns t if the major mode of the current buffer is not
+;; 'xml-mode. If it is 'xml-mode, then this returns a
+;; list where each element is (LEVEL TARGETNAME . MARKER). 
+;; LEVLE is always 0,  NAME is the name of the target. MARKER is
+;; emacs marker that points to the beginning of the section. The
+;; elements in the list returned are in ascending order of the
+;; MARKER. This function along with it's parter,
+;; speedbar-insert-ant-project-list, are designed to be added to the
+;; speedbar-dynamic-tags-function-list list.
+;;
+;; This function is based on `speedbar-fetch-dynamic-html'.
+(defun speedbar-fetch-dynamic-ant-project ( filename )
+  (set-buffer (find-file-noselect filename))
+  (if (not (or (eq major-mode 'xml-mode)
+	       (eq major-mode 'sgml-mode)
+	       (eq major-mode 'ant-mode)))
+      t
+    (condition-case nil
+	(save-excursion
+
+	  ;; Set speedbar-tag-hierarchy-method to nil so that
+	  ;; speedbar-create-tag-hierarchy won't reorder the list.
+	  ;; Make it buffer local so that the global value is not touched.
+	  (make-local-variable 'speedbar-tag-hierarchy-method)
+	  (setq speedbar-tag-hierarchy-method nil)
+
+	  (set (make-local-variable
+		'speedbar-generic-list-group-expand-button-type)
+	       'expandtag)
+	  (set (make-local-variable
+		'speedbar-generic-list-tag-button-type)
+	       'statictag)
+
+	  (let ((case-fold-search t)	; ant tags are case insensitive
+		pos-beg title level alist beg)
+	    (goto-char (point-min))
+	    ;; regexp below will not work if `>' appears within an attribute
+	    ;; value, e.g., <h1 foo="I'm a weird value >"> ... </h1>
+	    (while (re-search-forward "<target[^>]*name\\s-*=\\s-*\"\\([^\"]*\\)\"[^>]*>" nil t)
+	      (setq beg (match-end 0))
+	      (goto-char (match-beginning 0))
+	      (setq pos-beg (point-marker))
+	      (setq level 0)
+	      (setq title (match-string 1))
+	      (re-search-forward (concat "</target" ""))
+	      (setq alist (cons (cons level (cons title pos-beg)) alist)))
+	    (nreverse alist)))
+      (error t))))
+
+(fset 'speedbar-format-ant-project-list 'speedbar-format-texinfo-list)
+
+(defun speedbar-insert-ant-project-list (indent lst)
+  (speedbar-insert-generic-list indent (speedbar-format-ant-project-list lst indent)
+				'speedbar-tag-expand
+				'speedbar-tag-find))
+
+(provide 'sb-ant)
+
+;;; sb-ant.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-box-minus.xpm b/site/cedet-1.0pre7/speedbar/sb-box-minus.xpm
new file mode 100644
index 0000000..a24583c
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-box-minus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_minus_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #000000",
+"+	c #828282",
+"@	c #D19200",
+"...+           +..+ ",
+".@@.+          +.@.+",
+"+.@@.+        +.@@@.",
+"+.@@@.+++++++++.@@..",
+" +..@............@.+",
+" +.@..@@@@@@@@@@@..+",
+" +.@@..............+",
+" +.@@.@@@@@@@@@@@@.+",
+" +.@@.@@@@@@@@@@@@.+",
+" +.@@.@@@......@@@.+",
+" +.@@.@@@......@@@.+",
+"  +.@.@@@@@@@@@@@@.+",
+"   +..@@@@@@@@@@@@.+",
+"    +..............+",
+"     ++++++++++++++ "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-box-plus.xpm b/site/cedet-1.0pre7/speedbar/sb-box-plus.xpm
new file mode 100644
index 0000000..5f70fef
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-box-plus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_plus_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #D19200",
+"                    ",
+"  ..............    ",
+" .++++++++++++++.   ",
+" .++@@@@@@+@@@@@+.  ",
+" .+@+@@@@@@+@@@@@+. ",
+" .+@@++++++++++++++.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@++@@@@@+.",
+" .+@@+@@@@@++@@@@@+.",
+" .+@@+@@@++++++@@@+.",
+" .+@@+@@@++++++@@@+.",
+"  .+@+@@@@@++@@@@@+.",
+"   .++@@@@@++@@@@@+.",
+"    .++++++++++++++.",
+"     .............. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-box.xpm b/site/cedet-1.0pre7/speedbar/sb-box.xpm
new file mode 100644
index 0000000..f569715
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-box.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_box_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+" ...............    ",
+" .++++++++++++++.   ",
+" .++@@@@@@+@@@@@+.  ",
+" .+@+@@@@@@+@@@@@+. ",
+" .+@@++++++++++++++.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+" .+@@+@@@@@@@@@@@@+.",
+"  .+@+@@@@@@@@@@@@+.",
+".  .++@@@@@@@@@@@@+.",
+"    .++++++++++++++.",
+"     .............. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-chk.xpm b/site/cedet-1.0pre7/speedbar/sb-chk.xpm
new file mode 100644
index 0000000..ad4078b
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-chk.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * sb_chk_xpm[] = {
+"15 15 2 1",
+" 	c None",
+".	c #FF0000",
+"               ",
+" . .  ..       ",
+" . . .         ",
+" . . .       . ",
+"  .   ..    .  ",
+"           ..  ",
+"          ..   ",
+" ...     ..    ",
+" ...    ..     ",
+" ....  ..      ",
+"  ... ..       ",
+"   ....        ",
+"    ...        ",
+"     .         ",
+"               "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-dir-minus.xpm b/site/cedet-1.0pre7/speedbar/sb-dir-minus.xpm
new file mode 100644
index 0000000..2edd33e
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-dir-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_minus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.........  ",
+".+@@@@@@@++++++++.  ",
+".+@@@@@@@@@@@@@@+...",
+".+@@++++++++++++++++",
+".+@@+##############+",
+".+@+##############+.",
+".+@+####++++++####+.",
+".+@+####++++++####+.",
+".+@+##############+.",
+".++##############+..",
+".++##############+. ",
+".+++++++++++++++++. ",
+" .................  "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-dir-plus.xpm b/site/cedet-1.0pre7/speedbar/sb-dir-plus.xpm
new file mode 100644
index 0000000..93154af
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-dir-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_plus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.......... ",
+".+@@@@@@@++++++++++.",
+".+@@@@@@@@@@@@@@@@+.",
+".+#######++#####@@+.",
+".+#######++######@+.",
+".+#####++++++####@+.",
+".+#####++++++####@+.",
+".+#######++######@+.",
+".+#######++######@+.",
+".+###############@+.",
+".+###############@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-dir.xpm b/site/cedet-1.0pre7/speedbar/sb-dir.xpm
new file mode 100644
index 0000000..de1d3fd
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-dir.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_dir_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #DBDB00",
+"#	c #FFF993",
+" .......            ",
+".+++++++.           ",
+".+@@@@@@+.......... ",
+".+@@@@@@@++++++++++.",
+".+@@@@@@@@@@@@@@@@+.",
+".+##############@@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".+###############@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-doc-minus.xpm b/site/cedet-1.0pre7/speedbar/sb-doc-minus.xpm
new file mode 100644
index 0000000..2480e4b
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-doc-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_minus_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@@@@@+#. ",
+"   .+@@@@@@+#+.",
+"  .+@####@+##+.",
+" .+@@@@@@@+#+. ",
+" .+@@@@@@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".++#######+.   ",
+" ..++++##+.    ",
+"   ....+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-doc-plus.xpm b/site/cedet-1.0pre7/speedbar/sb-doc-plus.xpm
new file mode 100644
index 0000000..eb7ebe1
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-doc-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_plus_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@#@@@+#. ",
+"   .+@@#@@@+#+.",
+"  .+@#####+##+.",
+" .+@@@@#@@+#+. ",
+" .+@@@@#@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".++#######+.   ",
+" ..++++##+.    ",
+"   ....+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-doc.xpm b/site/cedet-1.0pre7/speedbar/sb-doc.xpm
new file mode 100644
index 0000000..3ed8eee
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-doc.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_doc_xpm[] = {
+"15 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #5A818B",
+"#	c #FFFFFF",
+"      .......  ",
+"     .+++++++. ",
+"    .+@@@@@@+. ",
+"   .+@@@@@@+#. ",
+"   .+@@@@@@+#+.",
+"  .+@@@@@@+##+.",
+" .+@@@@@@@+#+. ",
+" .+@@@@@@+##+. ",
+".++++@@@@+#+.  ",
+".+###++++##+.  ",
+".+########+.   ",
+".+########+.   ",
+".++++++##+.    ",
+" ......+++.    ",
+"       ...     "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-gud.el b/site/cedet-1.0pre7/speedbar/sb-gud.el
new file mode 100755
index 0000000..ed917c8
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-gud.el
@@ -0,0 +1,243 @@
+;;; sb-gud --- Speedbar support for the Grand Unified Debugger
+
+;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.ai.mit.edu>
+;; Version: 0.1
+;; Keywords: tools, gud
+;; X-RCS: $Id: sb-gud.el,v 1.11 2003/09/17 16:58:28 ponced Exp $
+;;
+;; This file is part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, you can either send email to this
+;; program's author (see below) or write to:
+;;
+;;              The Free Software Foundation, Inc.
+;;              675 Mass Ave.
+;;              Cambridge, MA 02139, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.ai.mit.edu.
+;;
+
+;;; Commentary:
+;;
+;;   Speedbar provides a frame in which files, and locations in
+;; files are displayed.  These functions provide gud specific support,
+;; showing stacks, files, and the like in the side-bar.
+;;
+;;   To enable in emacs 20.2 or earlier, add this to your .emacs file.
+;;   (autoload 'gud-speedbar-buttons "sb-gud"
+;;             "GUD specific speedbar button generator.")
+;;
+;;   This file requires speedbar.
+
+;;; Change log:
+;; 0.1   - First revision
+;; 0.1.1 - Removed dependency on speedbspec.
+;; 0.1.2 - Changed to handle keymap feature.
+
+(require 'speedbar)
+
+;;; Code:
+(defvar gud-last-speedbar-buffer nil
+  "The last GUD buffer used.")
+
+(defvar gud-last-speedbar-stackframe nil
+  "Description of the currently displayed GUD stack.
+t means that there is no stack, and we are in display-file mode.")
+
+(defvar gud-speedbar-key-map nil
+  "Keymap used when in the buffers display mode.")
+
+(defun gud-install-speedbar-variables ()
+  "Install those variables used by speedbar to enhance gud/gdb."
+  (if gud-speedbar-key-map
+      nil
+    (setq gud-speedbar-key-map (speedbar-make-specialized-keymap))
+
+    (define-key gud-speedbar-key-map "j" 'speedbar-edit-line)
+    (define-key gud-speedbar-key-map "e" 'speedbar-edit-line)
+    (define-key gud-speedbar-key-map "\C-m" 'speedbar-edit-line)))
+
+(defvar gud-speedbar-menu-items
+  ;; Note to self.  Add expand, and turn off items when not available.
+  '(["Jump to stack frame" speedbar-edit-line t])
+  "Additional menu items to add the the speedbar frame.")
+
+;; Make sure our special speedbar mode is loaded
+(if (featurep 'speedbar)
+    (gud-install-speedbar-variables)
+  (add-hook 'speedbar-load-hook 'gud-install-speedbar-variables))
+
+;;;###autoload
+(defun gud-speedbar-buttons (buffer)
+  "Create a speedbar display based on the current state of GUD.
+If the GUD BUFFER is not running a supported debugger, then turn
+off the specialized speedbar mode."
+  (if (and (save-excursion (goto-char (point-min))
+			   (looking-at "\\(//\\)?Current Stack"))
+	   (equal gud-last-last-frame gud-last-speedbar-stackframe))
+      nil
+    (setq gud-last-speedbar-buffer buffer)
+    (let* ((ff (save-excursion (set-buffer buffer) gud-find-file))
+	   ;;(lf (save-excursion (set-buffer buffer) gud-last-last-frame))
+	   (frames
+	    (cond ((eq ff 'gud-gdb-find-file)
+		   (gud-gdb-get-stackframe buffer)
+		   )
+		  ;; Add more debuggers here!
+		  (t
+		   (speedbar-remove-localized-speedbar-support buffer)
+		   nil))))
+      (erase-buffer)
+      (if (not frames)
+	  (speedbar-insert-label "No Stack frames")
+	(speedbar-insert-label "Current Stack:"))
+      (while frames
+	(insert (nth 1 (car frames)) ":\n")
+	(if (= (length (car frames)) 2)
+	    (progn
+;	      (speedbar-insert-button "[?]"
+;				      'speedbar-button-face
+;				      nil nil nil t)
+	      (speedbar-insert-button (car (car frames))
+				      'speedbar-directory-face
+				      nil nil nil t))
+;	  (speedbar-insert-button "[+]"
+;				  'speedbar-button-face
+;				  'speedbar-highlight-face
+;				  'gud-gdb-get-scope-data
+;				  (car frames) t)
+	  (speedbar-insert-button (car (car frames))
+				  'speedbar-file-face
+				  'speedbar-highlight-face
+				  (cond ((eq ff 'gud-gdb-find-file)
+					 'gud-gdb-goto-stackframe)
+					(t (error "Should never be here")))
+				  (car frames) t))
+	(setq frames (cdr frames)))
+      (let ((selected-frame
+	     (cond ((eq ff 'gud-gdb-find-file)
+		    (gud-gdb-selected-frame-info buffer))
+		   (t (error "Should never be here")))))))
+    (setq gud-last-speedbar-stackframe gud-last-last-frame)))
+
+(defun gud-gdb-goto-stackframe (text token indent)
+  "Goto the stackframe described by TEXT, TOKEN, and INDENT."
+  (speedbar-with-attached-buffer
+   (gud-basic-call (concat "frame " (nth 1 token)))
+   (sit-for 1)))
+
+(defvar gud-gdb-fetched-stack-frame nil
+  "Stack frames we are fetching from GDB.")
+
+(defvar gud-gdb-fetched-stack-frame-list nil
+  "List of stack frames we are fetching from GDB.")
+
+;(defun gud-gdb-get-scope-data (text token indent)
+;  ;; checkdoc-params: (indent)
+;  "Fetch data associated with a stack frame, and expand/contract it.
+;Data to do this is retrieved from TEXT and TOKEN."
+;  (let ((args nil) (scope nil))
+;    (gud-gdb-run-command-fetch-lines "info args")
+;
+;    (gud-gdb-run-command-fetch-lines "info local")
+;
+;    ))
+
+(defun gud-gdb-get-stackframe (buffer)
+  "Extract the current stack frame out of the GUD GDB BUFFER."
+  (let ((newlst nil)
+	(gud-gdb-fetched-stack-frame-list nil))
+    (gud-gdb-run-command-fetch-lines "backtrace" buffer)
+    (if (and (car gud-gdb-fetched-stack-frame-list)
+	     (string-match "No stack" (car gud-gdb-fetched-stack-frame-list)))
+	;; Go into some other mode???
+	nil
+      (while gud-gdb-fetched-stack-frame-list
+	(let ((e (car gud-gdb-fetched-stack-frame-list))
+	      (name nil) (num nil))
+	  (if (not (or
+		    (string-match "^#\\([0-9]+\\) +[0-9a-fx]+ in \\([:0-9a-zA-Z_]+\\) (" e)
+		    (string-match "^#\\([0-9]+\\) +\\([:0-9a-zA-Z_]+\\) (" e)))
+	      (if (not (string-match
+			"at \\([-0-9a-zA-Z_.]+\\):\\([0-9]+\\)$" e))
+		  nil
+		(setcar newlst
+			(list (nth 0 (car newlst))
+			      (nth 1 (car newlst))
+			      (match-string 1 e)
+			      (match-string 2 e))))
+	    (setq num (match-string 1 e)
+		  name (match-string 2 e))
+	    (setq newlst
+		  (cons
+		   (if (string-match
+			"at \\([-0-9a-zA-Z_.]+\\):\\([0-9]+\\)$" e)
+		       (list name num (match-string 1 e)
+			     (match-string 2 e))
+		     (list name num))
+		   newlst))))
+	(setq gud-gdb-fetched-stack-frame-list
+	      (cdr gud-gdb-fetched-stack-frame-list)))
+      (nreverse newlst))))
+
+;(defun gud-gdb-selected-frame-info (buffer)
+;  "Learn GDB information for the currently selected stack frame in BUFFER."
+;  )
+
+(defun gud-gdb-run-command-fetch-lines (command buffer)
+  "Run COMMAND, and return when `gud-gdb-fetched-stack-frame-list' is full.
+BUFFER is the GUD buffer in which to run the command."
+  (save-excursion
+    (set-buffer buffer)
+    (if (save-excursion
+	  (goto-char (point-max))
+	  (beginning-of-line)
+	  (not (looking-at comint-prompt-regexp)))
+	nil
+      ;; Much of this copied from GDB complete, but I'm grabbing the stack
+      ;; frame instead.
+      (let ((gud-marker-filter 'gud-gdb-speedbar-stack-filter))
+	;; Issue the command to GDB.
+	(gud-basic-call command)
+	(setq gud-gdb-complete-in-progress t ;; use this flag for our purposes.
+	      gud-gdb-complete-string nil
+	      gud-gdb-complete-list nil)
+	;; Slurp the output.
+	(while gud-gdb-complete-in-progress
+	  (accept-process-output (get-buffer-process gud-comint-buffer)))
+	(setq gud-gdb-fetched-stack-frame nil
+	      gud-gdb-fetched-stack-frame-list
+	      (nreverse gud-gdb-fetched-stack-frame-list))))))
+  
+(defun gud-gdb-speedbar-stack-filter (string)
+  ;; checkdoc-params: (string)
+  "Filter used to read in the current GDB stack."
+  (setq string (concat gud-gdb-fetched-stack-frame string))
+  (while (string-match "\n" string)
+    (setq gud-gdb-fetched-stack-frame-list
+	  (cons (substring string 0 (match-beginning 0))
+		gud-gdb-fetched-stack-frame-list))
+    (setq string (substring string (match-end 0))))
+  (if (string-match comint-prompt-regexp string)
+      (progn
+	(setq gud-gdb-complete-in-progress nil)
+	string)
+    (progn
+      (setq gud-gdb-complete-string string)
+      "")))
+
+(provide 'sb-gud)
+;;; sb-gud.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-html.el b/site/cedet-1.0pre7/speedbar/sb-html.el
new file mode 100644
index 0000000..6fd4765
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-html.el
@@ -0,0 +1,118 @@
+;;; sb-html.el --- provide hierarchical speedbar menu's for HTML files
+
+;; Copyright (c) 2001, 2002 Richard Y. Kim
+
+;; Author: Richard Y. Kim, <ryk@dspwiz.com>
+;; Maintainer: Richard Y. Kim, <ryk@dspwiz.com>
+;; Created: Mon Apr 09 09:44:06 2001
+;; Version: $Id: sb-html.el,v 1.4 2005/09/30 20:25:56 zappo Exp $
+;; Keywords: speedbar, html
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
+
+;;; Commentary:
+;;
+;; This small add-on to speedbar provides an alternate way to view HTML
+;; documents which shows the natural hierarchy of the document based
+;; on H1, H2, ... H6 tags.
+;;
+;; This code is a simple modification of sb-texinfo.el which comes
+;; with speedbar.
+
+;; Installation procedure:
+;;
+;;   Install speedbar 0.12 or later.
+;;   Add the following to your ~/.emacs file:
+;;   (eval-after-load "speedbar" '(load-library "sb-html"))
+;;
+;; Known Problems:
+;;
+;;   Perhaps <HEAD> and <BODY> should be treated as H0 tag?
+
+;;; Change Log:
+;;;
+;;; 1.1 - modified regexp based on Eric's suggestion.
+;;;
+;;; 1.0 - sent to Eric Ludlam.
+
+;;; Code:
+
+(require 'speedbar)
+(require 'sb-texinfo)	; for speedbar-format-texinfo-list
+
+;; Attach these new functions to handle texinfo-mode.
+(add-to-list 'speedbar-dynamic-tags-function-list
+	     '(speedbar-fetch-dynamic-html . speedbar-insert-html-list))
+
+;; This returns t if the major mode of the current buffer is not
+;; 'html-helper-mode. If it is 'html-helper-mode, then this returns a
+;; list where each element is (LEVEL NAME . MARKER). LEVEL is 0, 1, 2,
+;; 3, 4, or 5 corresponding to H1, H2, H3, H4, H5 an H6
+;; tags. respectively. NAME is the name of the section. MARKER is
+;; emacs marker that points to the beginning of the section. The
+;; elements in the list returned are in ascending order of the
+;; MARKER. This function along with it's parter,
+;; speedbar-insert-html-list, are designed to be added to the
+;; speedbar-dynamic-tags-function-list list.
+;;
+;; This function is based on `speedbar-fetch-dynamic-texinfo'.
+(defun speedbar-fetch-dynamic-html ( filename )
+  (set-buffer (find-file-noselect filename))
+  (if (not (or (eq major-mode 'html-helper-mode)
+	       (eq major-mode 'html-mode)))
+      t
+    (condition-case nil
+	(save-excursion
+
+	  ;; Set speedbar-tag-hierarchy-method to nil so that
+	  ;; speedbar-create-tag-hierarchy won't reorder the list.
+	  ;; Make it buffer local so that the global value is not touched.
+	  (make-local-variable 'speedbar-tag-hierarchy-method)
+	  (setq speedbar-tag-hierarchy-method nil)
+
+	  (set (make-local-variable
+		'speedbar-generic-list-group-expand-button-type)
+	       'expandtag)
+	  (set (make-local-variable
+		'speedbar-generic-list-tag-button-type)
+	       'statictag)
+
+	  (let ((case-fold-search t)	; HTML tags are case insensitive
+		pos-beg title level alist beg)
+	    (goto-char (point-min))
+	    ;; regexp below will not work if `>' appears within an attribute
+	    ;; value, e.g., <h1 foo="I'm a weird value >"> ... </h1>
+	    (while (re-search-forward "<h\\([1-6]\\)\\b[^>]*>\\s-*" nil t)
+	      (setq beg (match-end 0))
+	      (goto-char (match-beginning 0))
+	      (setq pos-beg (point-marker))
+	      (setq level (1- (read (match-string 1))))
+	      (re-search-forward (concat "\\s-*</h" (match-string 1) "\\b"))
+	      (setq title (buffer-substring beg (match-beginning 0)))
+	      (setq alist (cons (cons level (cons title pos-beg)) alist)))
+	    (nreverse alist)))
+      (error t))))
+
+(fset 'speedbar-format-html-list 'speedbar-format-texinfo-list)
+
+(defun speedbar-insert-html-list (indent lst)
+  (speedbar-insert-generic-list indent (speedbar-format-html-list lst 0)
+				'speedbar-tag-expand
+				'speedbar-tag-find))
+
+(provide 'sb-html)
+
+;;; sb-html.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-image.el b/site/cedet-1.0pre7/speedbar/sb-image.el
new file mode 100755
index 0000000..0b64a61
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-image.el
@@ -0,0 +1,111 @@
+;;; sb-image --- Image management for speedbar
+
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: sb-image.el,v 1.11 2005/09/30 20:25:59 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Supporting Image display for Emacs 20 and less, Emacs 21, and XEmacs,
+;; is a challenging task, which doesn't take kindly to being byte compiled.
+;; When sharing speedbar.elc between these three applications, the Image
+;; support can get lost.
+;;
+;; By splitting out that hard part into this file, and avoiding byte
+;; compilation, one copy speedbar can support all these platforms together.
+;;
+;; This file requires the `image' package if it is available.
+
+(require 'ezimage)
+
+;;; Code:
+(defcustom speedbar-use-images ezimage-use-images
+  "*Non-nil if speedbar should display icons."
+  :group 'speedbar
+  :version "21.1"
+  :type 'boolean)
+
+(defalias 'defimage-speedbar 'defezimage)
+
+(defvar speedbar-expand-image-button-alist
+  '(("<+>" . ezimage-directory-plus)
+    ("<->" . ezimage-directory-minus)
+    ("< >" . ezimage-directory)
+    ("[+]" . ezimage-page-plus)
+    ("[-]" . ezimage-page-minus)
+    ("[?]" . ezimage-page)
+    ("[ ]" . ezimage-page)
+    ("{+}" . ezimage-box-plus)
+    ("{-}" . ezimage-box-minus)
+    ("<M>" . ezimage-mail)
+    ("<d>" . ezimage-document-tag)
+    ("<i>" . ezimage-info-tag)
+    (" =>" . ezimage-tag)
+    (" +>" . ezimage-tag-gt)
+    (" ->" . ezimage-tag-v)
+    (">"   . ezimage-tag)
+    ("@"   . ezimage-tag-type)
+    ("  @" . ezimage-tag-type)
+    ("*"   . ezimage-checkout)
+    ("#"   . ezimage-object)
+    ("!"   . ezimage-object-out-of-date)
+    ("//"  . ezimage-label)
+    ("%"   . ezimage-lock)
+    )
+  "List of text and image associations.")
+
+(defun speedbar-insert-image-button-maybe (start length)
+  "Insert an image button based on text starting at START for LENGTH chars.
+If buttontext is unknown, just insert that text.
+If we have an image associated with it, use that image."
+  (when speedbar-use-images
+    (let ((ezimage-expand-image-button-alist
+	   speedbar-expand-image-button-alist))
+      (ezimage-insert-image-button-maybe start length))))
+
+(defun speedbar-image-dump ()
+  "Dump out the current state of the Speedbar image alist.
+See `speedbar-expand-image-button-alist' for details."
+  (interactive)
+  (with-output-to-temp-buffer "*Speedbar Images*"
+    (save-excursion
+      (set-buffer "*Speedbar Images*")
+      (goto-char (point-max))
+      (insert "Speedbar image cache.\n\n")
+      (let ((start (point)) (end nil))
+	(insert "Image\tText\tImage Name")
+	(setq end (point))
+	(insert "\n")
+	(put-text-property start end 'face 'underline))
+      (let ((ia speedbar-expand-image-button-alist))
+	(while ia
+	  (let ((start (point)))
+	    (insert (car (car ia)))
+	    (insert "\t")
+	    (speedbar-insert-image-button-maybe start
+						(length (car (car ia))))
+	    (insert (car (car ia)) "\t" (format "%s" (cdr (car ia))) "\n"))
+	  (setq ia (cdr ia)))))))
+
+(provide 'sb-image)
+
+;;; sb-image.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-info.el b/site/cedet-1.0pre7/speedbar/sb-info.el
new file mode 100755
index 0000000..989522e
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-info.el
@@ -0,0 +1,256 @@
+;;; sb-info --- Speedbar support for Info
+
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2005, 2009 Free Software Foundation
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.ai.mit.edu>
+;; Version: 0.3
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: sb-info.el,v 1.21 2009/03/12 22:48:07 zappo Exp $
+;;
+;; This file is patch of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, you can either send email to this
+;; program's author (see below) or write to:
+;;
+;;              The Free Software Foundation, Inc.
+;;              675 Mass Ave.
+;;              Cambridge, MA 02139, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+;;
+
+;;; Commentary:
+;;
+;;   Speedbar provides a frame in which files, and locations in
+;; files are displayed.  These functions provide Info specific support,
+;; showing links and addresses in the side-bar.
+;;
+;;   To enable in Emacs 20.2 or earlier, add this to your .emacs file.
+;;   (autoload 'Info-speedbar-buttons "sb-info"
+;;             "Info specific speedbar button generator.")
+;;
+;;   This file requires speedbar and Info.
+
+;;; Change log:
+;; 0.1   - first revision copied from speedbspec.el V 0.1.1
+;; 0.1.1 - No longer require speedbspec
+;; 0.2   - Added a speedbar major mode for displaying Info nodes, and modeled
+;;         the minor mode after it.  Completely replaced the old info display
+;;         with the major mode, and mixed them to move nicely from major to
+;;         minor mode effortlessly.
+;; 0.2.1   Added section adding major display mode at load time.
+
+(require 'speedbar)
+(require 'info)
+
+;;; Code:
+(defvar Info-speedbar-key-map nil
+  "Keymap used when in the info display mode.")
+
+(defun Info-install-speedbar-variables ()
+  "Install those variables used by speedbar to enhance Info."
+  (if Info-speedbar-key-map
+      nil
+    (setq Info-speedbar-key-map (speedbar-make-specialized-keymap))
+
+    ;; Basic tree features
+    (define-key Info-speedbar-key-map "e" 'speedbar-edit-line)
+    (define-key Info-speedbar-key-map "\C-m" 'speedbar-edit-line)
+    (define-key Info-speedbar-key-map "+" 'speedbar-expand-line)
+    (define-key Info-speedbar-key-map "=" 'speedbar-expand-line)
+    (define-key Info-speedbar-key-map "-" 'speedbar-contract-line)
+    (define-key Info-speedbar-key-map " " 'speedbar-toggle-line-expansion)
+    )
+
+  (speedbar-add-expansion-list '("Info" Info-speedbar-menu-items
+				 Info-speedbar-key-map
+				 Info-speedbar-hierarchy-buttons)))
+
+(defvar Info-speedbar-menu-items
+  '(["Browse Node" speedbar-edit-line t]
+    ["Expand Node" speedbar-expand-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. "))]
+    ["Contract Node" speedbar-contract-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.-. "))]
+    )
+  "Additional menu-items to add to speedbar frame.")
+
+;; Make sure our special speedbar major mode is loaded
+(if (featurep 'speedbar)
+    (Info-install-speedbar-variables)
+  (add-hook 'speedbar-load-hook 'Info-install-speedbar-variables))
+
+;;; Info hierarchy display method
+;;;###autoload
+(defun Info-speedbar-browser ()
+  "Initialize speedbar to display an info node browser.
+This will add a speedbar major display mode."
+  (interactive)
+  (require 'speedbar)
+  ;; Make sure that speedbar is active
+  (speedbar-frame-mode 1)
+  ;; Now, throw us into Info mode on speedbar.
+  (speedbar-change-initial-expansion-list "Info")
+  )
+
+(defvar Info-speedbar-image-button-alist
+  '(("<+>" . ezimage-document-plus)
+    ("<->" . ezimage-document-minus)
+    ("[+]" . ezimage-page-plus)
+    ("[-]" . ezimage-page-minus)
+    ("[?]" . ezimage-page)
+    ("[ ]" . ezimage-page)
+    )
+  "Image buttons used for Info mode.")
+
+(defun Info-speedbar-hierarchy-buttons (directory depth &optional node)
+  "Display an Info directory hierarchy in speedbar.
+DIRECTORY is the current directory in the attached frame.
+DEPTH is the current indentation depth.
+NODE is an optional argument that is used to represent the
+specific node to expand."
+  (if (and (not node)
+	   (save-excursion (goto-char (point-min))
+			   (looking-at "Info Nodes:")))
+      ;; Update our "current node" maybe?
+      nil
+    ;; We cannot use the generic list code, that depends on all leaves
+    ;; being known at creation time.
+    (if (not node)
+	(speedbar-with-writable (insert "Info Nodes:\n")))
+    (let ((completions nil)
+	  (speedbar-expand-image-button-alist
+	   Info-speedbar-image-button-alist))
+      (dframe-select-attached-frame speedbar-frame)
+      (save-window-excursion
+	(setq completions
+	      (Info-speedbar-fetch-file-nodes (or node '"(dir)top"))))
+      (select-frame speedbar-frame)
+      (if completions
+	  (speedbar-with-writable
+	   (while completions
+	     (speedbar-make-tag-line (if (= depth 0)
+					 'angle
+				       'bracket)
+				     ?+ 'Info-speedbar-expand-node
+				     (cdr (car completions))
+				     (car (car completions))
+				     'Info-speedbar-goto-node
+				     (cdr (car completions))
+				     'info-xref depth)
+	     (setq completions (cdr completions)))
+	   t)
+	nil))))
+  
+(defun Info-speedbar-goto-node (text node indent)
+  "When user clicks on TEXT, goto an info NODE.
+The INDENT level is ignored."
+  (dframe-select-attached-frame speedbar-frame)
+  (let* ((buff (or (get-buffer "*info*")
+		   (progn (info) (get-buffer "*info*"))))
+	 (bwin (get-buffer-window buff 0)))
+    (if bwin
+	(progn
+	  (select-window bwin)
+	  (raise-frame (window-frame bwin)))
+      (if dframe-power-click
+	  (let ((pop-up-frames t)) (select-window (display-buffer buff)))
+	(dframe-select-attached-frame speedbar-frame)
+	(switch-to-buffer buff)))
+    (if (string-match "^(\\([^)]+\\))\\([^,:]+\\)$" node)
+	(let ((file (match-string 1 node))
+	      (node (match-string 2 node)))
+	  (Info-find-node file node)
+	  ;; If we do a find-node, and we were in info mode, restore
+	  ;; the old default method.  Once we are in info mode, it makes
+	  ;; sense to return to whatever method the user was using before.
+	  (if (string= speedbar-initial-expansion-list-name "Info")
+	      (speedbar-change-initial-expansion-list
+	       speedbar-previously-used-expansion-list-name))))))
+
+(defun Info-speedbar-expand-node (text token indent)
+  "Expand the node the user clicked on.
+TEXT is the text of the button we clicked on, a + or - item.
+TOKEN is data related to this node (NAME . FILE).
+INDENT is the current indentation depth."
+  (let ((speedbar-expand-image-button-alist Info-speedbar-image-button-alist))
+    (cond ((string-match "+" text)	;we have to expand this file
+	   (speedbar-change-expand-button-char ?-)
+	   (if (speedbar-with-writable
+		 (save-excursion
+		   (end-of-line) (forward-char 1)
+		   (Info-speedbar-hierarchy-buttons nil (1+ indent) token)))
+	       (speedbar-change-expand-button-char ?-)
+	     (speedbar-change-expand-button-char ??)))
+	  ((string-match "-" text)	;we have to contract this node
+	   (speedbar-change-expand-button-char ?+)
+	   (speedbar-delete-subblock indent))
+	  (t (error "Ooops... not sure what to do")))
+    (speedbar-center-buffer-smartly)))
+  
+(defun Info-speedbar-fetch-file-nodes (nodespec)
+  "Fetch the subnodes from the info NODESPEC.
+NODESPEC is a string of the form: (file)node.
+Optional THISFILE represends the filename of"
+  (save-excursion
+    ;; Set up a buffer we can use to fake-out Info.
+    (set-buffer (get-buffer-create "*info-browse-tmp*"))
+    (if (not (equal major-mode 'Info-mode))
+	(Info-mode))
+    ;; Get the node into this buffer
+    (if (string-match "^(\\([^)]+\\))\\([^,:]+\\)$" nodespec)
+	(let ((file (match-string 1 nodespec))
+	      (node (match-string 2 nodespec)))
+	  (Info-find-node file node))
+      (error "Node %s not found!" nodespec))
+    ;; Scan the created buffer
+    (goto-char (point-min))
+    (let ((completions nil)
+	  (thisfile (progn (string-match "^(\\([^)]+\\))" nodespec)
+			   (match-string 1 nodespec))))
+      ;; Always skip the first one...
+      (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t)
+      (while (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t)
+	(let ((name (match-string 1)))
+	  (if (looking-at " *\\(([^)]+)[^.\n]+\\)\\.")
+	      (setq name (cons name (match-string 1)))
+	    (if (looking-at "[ \t]*\\(([^)]+)\\)\\.")
+		(setq name (cons name (concat (match-string 1) "Top")))
+	      (if (looking-at " \\([^.]+\\).")
+		  (setq name
+			(cons name (concat "(" thisfile ")" (match-string 1))))
+		(setq name (cons name (concat "(" thisfile ")" name))))))
+	  (setq completions (cons name completions))))
+      (nreverse completions))))
+
+;;; Info mode node listing
+;;;###autoload
+(defun Info-speedbar-buttons (buffer)
+  "Create a speedbar display to help navigation in an Info file.
+BUFFER is the buffer speedbar is requesting buttons for."
+  (if (save-excursion (goto-char (point-min))
+		      (not (looking-at "Info Nodes:")))
+      (erase-buffer))
+  (Info-speedbar-hierarchy-buttons nil 0)
+  (goto-char (point-min))
+  )
+
+(provide 'sb-info)
+
+;;; Overriding preinstalled code.
+;;;###autoload
+(eval-after-load "info" '(require 'sb-info))
+;;; sb-info.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-info.xpm b/site/cedet-1.0pre7/speedbar/sb-info.xpm
new file mode 100644
index 0000000..0027252
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-info.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_info_xpm[] = {
+"10 15 4 1",
+" 	c None",
+".	c #BEBEBE",
+"+	c #0000FF",
+"@	c #FFFFFF",
+"    ..    ",
+"  ..+++.  ",
+" .+++@++. ",
+" .+++++++ ",
+" .+++++++ ",
+".++@@@++++",
+".++++@++++",
+".++++@++++",
+".++++@++++",
+" .+++@++++",
+" .+++@+++ ",
+" .+@@@@@+ ",
+" .+++++++ ",
+"  .+++++  ",
+"    ++    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-label.xpm b/site/cedet-1.0pre7/speedbar/sb-label.xpm
new file mode 100644
index 0000000..715cc2c
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-label.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_label_xpm[] = {
+"10 16 3 1",
+" 	c None",
+".	c gray",
+"+	c blue",
+"     .....",
+"   ..+++++",
+"  .+++++++",
+" .++++++++",
+" .++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++",
+".+++++++++"};
diff --git a/site/cedet-1.0pre7/speedbar/sb-mail.xpm b/site/cedet-1.0pre7/speedbar/sb-mail.xpm
new file mode 100644
index 0000000..5716eeb
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-mail.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_mail_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"................... ",
+".++++++++++++++++++.",
+".++@@@@@@@@@@@@@@++.",
+".+@++@@@@@@@@@@++@+.",
+".+@@@++@@@@@@++@@@+.",
+".+@@@@@++@@++@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@+@@@@@@+@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@+@@@@@@@@@@+@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++@@@@@@@@@@@@@@++.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-obj.xpm b/site/cedet-1.0pre7/speedbar/sb-obj.xpm
new file mode 100644
index 0000000..b291fcf
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-obj.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * sb_obj_xpm[] = {
+"15 15 2 1",
+" 	c None",
+".	c #000CFF",
+" ..  .  ..  .  ",
+".  . . .  . .  ",
+".  . . .  . .  ",
+".  . . .  . .  ",
+" ..  .  ..  .  ",
+"               ",
+".  ..  .  ..   ",
+". .  . . .  .  ",
+". .  . . .  .  ",
+". .  . . .  .  ",
+".  ..  .  ..   ",
+"               ",
+" ..  .  ..  .  ",
+".  . . .  . .  ",
+".  . . .  . .  "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-objod.xpm b/site/cedet-1.0pre7/speedbar/sb-objod.xpm
new file mode 100644
index 0000000..cd49e83
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-objod.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * sb_objod_xpm[] = {
+"15 15 3 1",
+" 	c None",
+".	c #000CFF",
+"+	c #FFFA00",
+" ..  .  ..  .  ",
+".  .++ .  . .  ",
+".  .++ .  . .  ",
+".  . ++.  . .  ",
+" ..  ++ ..  .  ",
+"     ++        ",
+".  ..++.  ..   ",
+". .  .++ .  .  ",
+". .  .++ .  .  ",
+". .  .++ .  .  ",
+".  ..  .  ..   ",
+"       ++      ",
+" ..  . ++.  .  ",
+".  . . .  . .  ",
+".  . . .  . .  "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-pg-minus.xpm b/site/cedet-1.0pre7/speedbar/sb-pg-minus.xpm
new file mode 100644
index 0000000..2e54243
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-pg-minus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_minus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@@@@@@@@+.",
+" .+####+@@@@@@@@@@+.",
+".+++++++@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-pg-plus.xpm b/site/cedet-1.0pre7/speedbar/sb-pg-plus.xpm
new file mode 100644
index 0000000..aa5d38f
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-pg-plus.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_plus_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@++@@@@@+.",
+" .+####+@@@++@@@@@+.",
+".+++++++@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-pg.xpm b/site/cedet-1.0pre7/speedbar/sb-pg.xpm
new file mode 100644
index 0000000..75c6a6e
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-pg.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * sb_pg_xpm[] = {
+"20 15 5 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #ADADAD",
+"       ............ ",
+"      .++++++++++++.",
+"     .++@@@@@@@@@@+.",
+"    .+#+@@@@@@@@@@+.",
+"   .+##+@@@@@@@@@@+.",
+"  .+###+@@@@@@@@@@+.",
+" .+####+@@@@@@@@@@+.",
+".+++++++@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".++++++++++++++++++.",
+" .................. "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-rmail.el b/site/cedet-1.0pre7/speedbar/sb-rmail.el
new file mode 100755
index 0000000..c3512fd
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-rmail.el
@@ -0,0 +1,157 @@
+;;; sb-rmail --- Speedbar support for rmail
+
+;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.ai.mit.edu>
+;; Version: 0.1
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: sb-rmail.el,v 1.12 2003/02/21 18:04:30 zappo Exp $
+;;
+;; This file is part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, you can either send email to this
+;; program's author (see below) or write to:
+;;
+;;              The Free Software Foundation, Inc.
+;;              675 Mass Ave.
+;;              Cambridge, MA 02139, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.ai.mit.edu.
+;;
+
+;;; Commentary:
+;;
+;;   Speedbar provides a frame in which files, and locations in
+;; files are displayed.  These functions provide rmail specific support,
+;; showing links and addresses in the side-bar.
+;;
+;;   To enable in emacs 20.2 or earlier, add this to your .emacs file.
+;;   (autoload 'rmail-speedbar-buttons "sb-rmail"
+;;             "Rmail specific speedbar button generator.")
+;;
+;;   This file requires speedbar.
+
+;;; Change log:
+;; 0.1   - first revision copied from speedbspec.el V 0.1.1
+;; 0.1.1 - removed require speedbspec.
+;; 0.1.2 - Changed to handle new keymap feature.
+
+;;; Code:
+(defvar rmail-speedbar-match-folder-regexp "^[A-Z0-9]+\\(\\.[A-Z0-9]+\\)?$"
+  "*This regex is used to match folder names to be displayed in speedbar.
+Enabling this will permit speedbar to display your folders for easy
+browsing, and moving of messages.")
+
+(defvar rmail-speedbar-last-user nil
+  "The last user to be displayed in the speedbar.")
+
+(defvar rmail-speedbar-key-map nil
+  "Keymap used when in rmail display mode.")
+
+(defun rmail-install-speedbar-variables ()
+  "Install those variables used by speedbar to enhance rmail."
+  (if rmail-speedbar-key-map
+      nil
+    (setq rmail-speedbar-key-map (speedbar-make-specialized-keymap))
+
+    (define-key rmail-speedbar-key-map "e" 'speedbar-edit-line)
+    (define-key rmail-speedbar-key-map "r" 'speedbar-edit-line)
+    (define-key rmail-speedbar-key-map "\C-m" 'speedbar-edit-line)
+    (define-key rmail-speedbar-key-map "M"
+      'rmail-speedbar-move-message-to-folder-on-line)))
+
+(defvar rmail-speedbar-menu-items
+  '(["Read Folder" speedbar-edit-line t]
+    ["Move message to folder" rmail-speedbar-move-message-to-folder-on-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "<M> "))])
+  "Additional menu-items to add to speedbar frame.")
+
+;; Make sure our special speedbar major mode is loaded
+(if (featurep 'speedbar)
+    (rmail-install-speedbar-variables)
+  (add-hook 'speedbar-load-hook 'rmail-install-speedbar-variables))
+
+;;;###autoload
+(defun rmail-speedbar-buttons (buffer)
+  "Create buttons for BUFFER containing rmail messages.
+Click on the address under Reply to: to reply to this person.
+Under Folders: Click a name to read it, or on the <M> to move the
+current message into that RMAIL folder."
+  (let ((from nil))
+    (save-excursion
+      (set-buffer buffer)
+      (goto-char (point-min))
+      (if (not (re-search-forward "^Reply-To: " nil t))
+	  (if (not (re-search-forward "^From:? " nil t))
+	      (setq from t)))
+      (if from
+	  nil
+	(setq from (buffer-substring (point) (save-excursion
+					       (end-of-line)
+					       (point))))))
+    (goto-char (point-min))
+    (if (and (looking-at "\\(//\\)?Reply to:")
+	     (equal from rmail-speedbar-last-user))
+	nil
+      (setq rmail-speedbar-last-user from)
+      (erase-buffer)
+      (speedbar-insert-separator "Reply To")
+      (if (stringp from)
+	  (speedbar-insert-button from 'speedbar-directory-face 'highlight
+				  'rmail-speedbar-button 'rmail-reply))
+      (speedbar-insert-separator "Folders")
+      (let* ((case-fold-search nil)
+	     (df (directory-files (save-excursion (set-buffer buffer)
+						  default-directory)
+				  nil rmail-speedbar-match-folder-regexp)))
+	(while df
+	  (speedbar-insert-button "<M>" 'speedbar-button-face 'highlight
+				  'rmail-speedbar-move-message (car df))
+	  (speedbar-insert-button (car df) 'speedbar-file-face 'highlight
+				  'rmail-speedbar-find-file nil t)
+	  (setq df (cdr df)))))))
+
+(defun rmail-speedbar-button (text token indent)
+  "Execute an rmail command specified by TEXT.
+The command used is TOKEN.  INDENT is not used."
+  (speedbar-with-attached-buffer
+   (funcall token t)))
+
+(defun rmail-speedbar-find-file (text token indent)
+  "Load in the rmail file TEXT.
+TOKEN and INDENT are not used."
+  (speedbar-with-attached-buffer
+   (speedbar-message "Loading in RMAIL file %s..." text)
+   (find-file text)))
+
+(defun rmail-speedbar-move-message-to-folder-on-line ()
+  "If the current line is a folder, move current message to it."
+  (interactive)
+  (save-excursion
+    (beginning-of-line)
+    (if (re-search-forward "<M> " (save-excursion (end-of-line) (point)) t)
+	(progn
+	  (forward-char -2)
+	  (speedbar-do-function-pointer)))))
+
+(defun rmail-speedbar-move-message (text token indent)
+  "From button TEXT, copy current message to the rmail file specified by TOKEN.
+TEXT and INDENT are not used."
+  (speedbar-with-attached-buffer
+   (message "Moving message to %s" token)
+   (rmail-output-to-rmail-file token)))
+
+(provide 'sb-rmail)
+;;; sb-rmail.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/sb-ro.xpm b/site/cedet-1.0pre7/speedbar/sb-ro.xpm
new file mode 100644
index 0000000..3703232
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-ro.xpm
@@ -0,0 +1,17 @@
+/* XPM */
+static char * sb_ro_xpm[] = {
+"10 10 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"  .++++.  ",
+" .++..++. ",
+" .++..++. ",
+".++++++++.",
+".+@@@@@@+.",
+".+@@++@@+.",
+".+@@++@@+.",
+".+@@@@@@+.",
+".++++++++.",
+".........."};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag-gt.xpm b/site/cedet-1.0pre7/speedbar/sb-tag-gt.xpm
new file mode 100644
index 0000000..49b8b72
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag-gt.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_gt_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@++@@@@@@@+.",
+" .+@@@@@@+++@@@@@@+.",
+".+@@@@@@@++++@@@@@+.",
+".+@++@@@@+++++@@@@+.",
+".+@++@@@@+++++.@@@+.",
+".+@@@@@@@++++.@@@@+.",
+" .+@@@@@@+++.@@@@@+.",
+"  .+@@@@@++.@@@@@@+.",
+".  .++++++.++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag-minus.xpm b/site/cedet-1.0pre7/speedbar/sb-tag-minus.xpm
new file mode 100644
index 0000000..f006c4e
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag-minus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag__xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag-plus.xpm b/site/cedet-1.0pre7/speedbar/sb-tag-plus.xpm
new file mode 100644
index 0000000..cf32fef
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag-plus.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag+_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@++@@@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@++@@++++++@@@@@+.",
+".+@@@@@@@++@@@@@@@+.",
+" .+@@@@@@++@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag-type.xpm b/site/cedet-1.0pre7/speedbar/sb-tag-type.xpm
new file mode 100644
index 0000000..6588698
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag-type.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_type_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@++++++@@@+.",
+".+@@@@@@@++++++@@@+.",
+".+@++@@@@@@++@@@@@+.",
+".+@++@@@@@@++@@@@@+.",
+".+@@@@@@@@@++@@@@@+.",
+" .+@@@@@@@@++@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag-v.xpm b/site/cedet-1.0pre7/speedbar/sb-tag-v.xpm
new file mode 100644
index 0000000..7431e4c
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag-v.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_v_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@++++++++++.@+.",
+".+@@@@@++++++++.@@+.",
+".+@++@@@++++++.@@@+.",
+".+@++@@@@++++.@@@@+.",
+".+@@@@@@@@++.@@@@@+.",
+" .+@@@@@@@@.@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-tag.xpm b/site/cedet-1.0pre7/speedbar/sb-tag.xpm
new file mode 100644
index 0000000..4c6f1c5
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-tag.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sb_tag_xpm[] = {
+"20 15 4 1",
+" 	c None",
+".	c #828282",
+"+	c #000000",
+"@	c #FFF993",
+"                    ",
+"                    ",
+"    ............... ",
+"   .+++++++++++++++.",
+"  .+@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+".+@++@@@@@@@@@@@@@+.",
+".+@++@@@@@@@@@@@@@+.",
+".+@@@@@@@@@@@@@@@@+.",
+" .+@@@@@@@@@@@@@@@+.",
+"  .+@@@@@@@@@@@@@@+.",
+".  .+++++++++++++++.",
+"    ............... ",
+"                    "};
diff --git a/site/cedet-1.0pre7/speedbar/sb-texinfo.el b/site/cedet-1.0pre7/speedbar/sb-texinfo.el
new file mode 100755
index 0000000..0995902
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-texinfo.el
@@ -0,0 +1,219 @@
+;;; sb-texinfo.el --- provide hierarchical speedbar menu's for texinfo files
+
+;; Copyright (c) 2000, 2002 Richard Y. Kim
+
+;; Author: Richard Y. Kim, <ryk@ap.com>
+;; Maintainer: Richard Y. Kim, <ryk@ap.com>
+;; Created: Fri Jun 16 17:23:11 2000
+;; Version: $Id: sb-texinfo.el,v 1.9 2005/09/30 20:26:09 zappo Exp $
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
+
+;;; Commentary:
+;;
+;; The speedbar mode provides support for texinfo files by creating
+;; tags using imenu.  This presentation do not reflect the natural
+;; hierarchy of the texinfo document.
+;;
+;; This small add-on to speedbar provides an alternate way to view the
+;; document which shows the natural hierarchy of the document.  This
+;; shows the same information that `M-x texinfo-show-structure'
+;; displays, but in the speedbar frame with the speedbar user
+;; interface.
+
+;; Installtation procedure:
+;;   Install speedbar 0.12 or later.
+;;   Add the following to your ~/.emacs file:
+;;   (eval-after-load "speedbar" '(load-library "sb-texinfo"))
+
+;; Known Problems:
+;;   Does not look inside files included via @include directive.
+;;
+;;   The indentations of nodes with and without subnodes could be better.
+;;
+;;   Clicking on nodes with subnodes only shows subnodes rather than
+;;   displaying the node content on the target frame.  Instead the first
+;;   subnode on the speedbar has to be clicked.  I believe this can be
+;;   fixed if a custom speedbar button display routine is written rather
+;;   than using the built-in function speedbar-insert-generic-list.
+;;   If I learn to do this, I will, but I make no promises.
+;;
+;;   Potential problem with auctex 9.9p users.  Auctex provides it's
+;;   own texinfo mode which does not use texinfo-mode-hook.  Make sure
+;;   you do not use texinfo mode provided by auctex!
+
+;;; Change Log:
+;;;
+;;; 1.7 - By Eric Ludlam <zappo@gnu.org>
+;;;       In `speedbar-fetch-dynamic-texinfo', set the buffer to file
+;;;       to correspond to a speedbar change.
+;;;
+;;; 1.6 - By Eric Ludlam <zappo@gnu.org>
+;;;       speedbar-insert-texinfo-list no longer sets sthm to nil.
+;;;       speedbar-format-texinfo-list uses new positioned group for
+;;;       any chapter w/ sections (etc)  Also set new
+;;;       speedbar-generic-list-{group-expand|tag}-button-list to
+;;;       nice values.
+;;;
+;;; 1.5 - speedbar-tag-hierarchy-method is set to nil by
+;;;       speedbar-insert-texinfo-list as well as
+;;;       speedbar-fetch-dynamic-texinfo.  This is needed in order to
+;;;       have the texinfo nodes displayed in correct order.
+;;;
+;;; 1.4 - speedbar-tag-hierarchy-method is now set to nil by
+;;;       speedbar-fetch-dynamic-texinfo after making it buffer local
+;;;       first.  I thought this was buffer-local variable alread, but
+;;;       it is not.  Also added installation instruction.
+;;;
+;;; 1.3 - Added bunch of comments in the code as well as installation
+;;;       instruction.  speedbar-texinfo-mode-hook now turns on the
+;;;       speedbar mode.
+;;;
+;;; 1.2 - Use newly created variable speedbar-texinfo-section-regexp rather
+;;;       than texinfo-section-types-regexp, because the latter does not
+;;;       have "top" in it.
+;;;
+;;;       Also added a hook to texinfo-mode-hook which sets
+;;;       speedbar-tag-hierarchy-method to nil at Eric Ludlam's
+;;;       suggestion.
+;;;
+;;; 1.1 - first draft sent to Eric. on June 16, 2000.
+
+;;; Code:
+
+(require 'speedbar)
+
+;; GNU Emacs 20.7 comes with speedbar 0.8.1 bundled which does not work
+;; with sb-texinfo.  Lacking speedbar-version variable, check whether
+;; speedbar-dynamic-tags-function-list is bound which was introduced after
+;; 0.8.1.
+(or (boundp 'speedbar-dynamic-tags-function-list)
+    (error "Speedbar 0.11 or newer is required to use sb-texinfo."))
+
+;; Attach these new functions to handle texinfo-mode.
+(add-to-list 'speedbar-dynamic-tags-function-list
+	     '(speedbar-fetch-dynamic-texinfo . speedbar-insert-texinfo-list))
+
+;; speedbar-texinfo-section-regexp is same as texinfo-section-types-regexp
+;; except that it has "top" entry.
+(defconst speedbar-texinfo-section-regexp
+  "^@\\(top \\|chapter \\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)")
+
+(defun speedbar-fetch-dynamic-texinfo ( filename )
+  "This returns t if the major mode of the current buffer is not 'texinfo-mode.
+If it is 'texinfo-mode, then this returns a list where each element is
+(LEVEL NAME . MARKER).
+LEVEL is 0, 1, 2, or 3 corresponding to chapter section,
+subsection, and subsubsection respectively.
+NAME is the name of the node.
+MARKER is emacs marker that points to the beginning of the node.
+The elements in the the list returned are in ascending order of the MARKER.
+This function along with it's parter, speedbar-insert-texinfo-list, are
+designed to be added to the speedbar-dynamic-tags-function-list list."
+  (set-buffer (find-file-noselect filename))
+  (if (not (eq major-mode 'texinfo-mode))
+      t
+    (condition-case nil
+	(save-excursion
+
+	  ;; Set speedbar-tag-hierarchy-method to nil so that
+	  ;; speedbar-create-tag-hierarchy won't reorder the list.
+	  ;; Make it buffer local so that the global value is not touched.
+	  (make-local-variable 'speedbar-tag-hierarchy-method)
+	  (setq speedbar-tag-hierarchy-method nil)
+
+	  (set (make-local-variable
+		'speedbar-generic-list-group-expand-button-type)
+	       'expandtag)
+	  (set (make-local-variable
+		'speedbar-generic-list-tag-button-type)
+	       'statictag)
+
+	  (let ((heading-to-level
+		 '(("top" . 0)
+		   ("chapter" . 0) ("section" . 1)
+		   ("subsection" . 2) ("subsubsection" . 3)
+		   ("unnumbered" . 0) ("unnumberedsec" . 1)
+		   ("unnumberedsubsec" . 2) ("unnumberedsubsubsec" . 3)
+		   ("chapheading" . 0) ("heading" . 1)
+		   ("subheading" . 2) ("subsubheading" . 3)
+		   ("appendix" . 0) ("appendixsec" . 1)
+		   ("appendixsubsec" . 2) ("appendixsubsubsec" . 3)
+		   ("centerchap" . 0) ("majorheading" . 0)))
+		pos-beg title level section alist)
+	    ;; Create a list of all nodes
+	    (goto-char (point-min))
+	    (while (re-search-forward speedbar-texinfo-section-regexp nil t)
+	      (goto-char (1+ (match-beginning 0))) ;right after @
+	      (setq pos-beg (point-marker))
+	      (setq section (symbol-name (read (current-buffer))))
+	      (setq level (cdr (assoc section heading-to-level)))
+	      (setq title (buffer-substring
+			   (progn (skip-chars-forward " \t")
+				  (point))
+			   (progn (skip-chars-forward "^,\n")
+				  (skip-chars-backward " \t")
+				  (point))))
+	      (setq alist (cons (cons level (cons title pos-beg)) alist)))
+	    (nreverse alist)))
+      (error t))))
+
+(defun speedbar-format-texinfo-list ( lst level)
+  "See `speedbar-fetch-dynamic-texinfo' for description of LST.
+LEVEL should be 0 unless this is called recursively.
+This function converts LST from a flat list structure into
+a hierarchical list suitable to be passed on to `speedbar-insert-texinfo-list'.
+This function creates the hierarchical list recursively.
+On first pass all the nodes of each chapter are grouped into a list.
+Then each of these lists are recursively converted so that all nodes
+of each section are grouped together."
+  (let (new-list elem section-list)
+    (while lst
+      (setq section-list (list (cdr (car lst))))
+      (setq lst  (cdr lst))
+      (while (and lst (> (car (car lst)) level))
+	(setq section-list (cons (car lst) section-list))
+	(setq lst  (cdr lst)))
+      (setq new-list (cons (nreverse section-list) new-list)))
+    (setq new-list (nreverse new-list))
+    ;; Each member of new-list is a list of all chapters (on first pass), i.e.,
+    ;; ( ((chap1 marker) (1 sec1 marker) ...)  ((chap2 marker) ...) ... )
+
+    ;; Start recursion.
+    (setq level (1+ level))
+    (mapcar '(lambda (x)
+	       (if (eq (length x) 1)
+		   ;;(cons (car (car x)) x)
+		   (car x)
+		 (let ((head (car x)))
+		   (cons (car head)
+			 (cons (cdr head)
+			       (speedbar-format-texinfo-list
+				(cdr x) level))))))
+	    new-list)))
+
+(defun speedbar-insert-texinfo-list (indent lst)
+  "Insert a list of generic tokens reorganized into chapeters.
+INDENT is the current level of indentation, and LST is the list of tokens."
+  (speedbar-insert-generic-list indent
+				(speedbar-format-texinfo-list lst 0)
+				'speedbar-tag-expand
+				'speedbar-tag-find))
+
+(provide 'sb-texinfo)
+;;; sb-texinfo.el ends here
+
diff --git a/site/cedet-1.0pre7/speedbar/sb-w3.el b/site/cedet-1.0pre7/speedbar/sb-w3.el
new file mode 100755
index 0000000..698e9e7
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/sb-w3.el
@@ -0,0 +1,148 @@
+;;; sb-w3 --- Speedbar support for w3.
+
+;; Copyright (C) 1997, 1998, 2001, 2002, 2005 Free Software Foundation
+;;
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 0.2.1
+;; Keywords: tags, tools, w3
+;; X-RCS: $Id: sb-w3.el,v 1.10 2005/09/30 20:26:13 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; Please send bug reports, etc. to zappo@gnu.org
+;;
+
+;;; Commentary:
+;;
+;;   Speedbar provides a frame in which files, and locations in
+;; files are displayed.  These functions provide w3 specific support,
+;; showing links and addresses in the side-bar.
+;;
+;;   To enable, add this to your .emacs file.
+;;   (autoload 'w3-speedbar-buttons "sb-w3"
+;;             "W3 specific speedbar button generator.")
+;;
+;;   Load w3-toc to get additional tags which represent the major
+;;   headers in a given web page.
+;;
+;;   This file requires speedbar.
+
+;;; Change log:
+;; 0.1   - first revision copied from speedbspec.el V 0.1.1
+;; 0.1.1 - Removed dependency on speedbspec
+;; 0.2   - T.V.Raman's addition using newer w3, and w3 imenu.
+;; 0.2.1 - Added new keymap support
+
+;;; Code:
+(eval-and-compile
+  (condition-case nil
+      (require 'w3-imenu)
+    (error nil)))
+(require 'cl)
+(require 'speedbar)
+
+(defvar w3-speedbar-last-buffer nil
+  "The last buffer shown by w3-speedbar.")
+
+(defvar w3-speedbar-key-map nil
+  "Keymap used when in the w3 display mode.")
+
+(if w3-speedbar-key-map
+    nil
+  (setq w3-speedbar-key-map (speedbar-make-specialized-keymap))
+
+  ;; Basic features.
+  (define-key w3-speedbar-key-map "e" 'speedbar-edit-line)
+  (define-key w3-speedbar-key-map "r" 'speedbar-edit-line)
+  (define-key w3-speedbar-key-map "\C-m" 'speedbar-edit-line)
+  )
+
+(defvar w3-speedbar-menu-items
+  '(["Jump to link" speedbar-edit-line t]
+    )
+  "Extra menu items for w3 mode.")
+
+;;;###autoload
+(defun w3-speedbar-buttons (buffer)
+  "Create speedbar buttons for the current web BUFFER displayed in w3 mode."
+  (save-excursion
+    (goto-char (point-min))
+    (if (and (looking-at "History:") (equal w3-speedbar-last-buffer buffer))
+	nil
+      (setq w3-speedbar-last-buffer buffer)
+      (erase-buffer)
+      (let ((links (save-excursion (set-buffer buffer)
+                                   (w3-only-links)))
+            (toc (save-excursion
+                   (set-buffer buffer) imenu--index-alist))
+	    (part nil))
+	(insert "History:\n")
+	;; This taken out of w3 which was used to create the history list,
+	;; and is here modified to create the speedbar buttons
+	(cl-maphash
+	 (function
+	  (lambda (url desc)
+	    (speedbar-insert-button (w3-speedbar-shorten-button url)
+				    'speedbar-directory-face 'highlight
+				    'w3-speedbar-link url)))
+	 url-history-list)
+	(insert "Links:\n")
+	(while links
+	  (setq part (car (cdr (member ':href (car links))))
+		links (cdr links))
+          (when part 
+            (speedbar-insert-button (w3-speedbar-shorten-button part)
+                                    'speedbar-file-face 'highlight
+                                    'w3-speedbar-link
+                                    part)))
+	(if (not (featurep 'w3-imenu))
+	    nil
+	  (insert (format "Contents: %d\n" (length toc)))
+	  (loop for e in toc do
+		(when (car e)
+		  (speedbar-insert-button  (car e)
+					   'bold 'highlight
+					   'w3-speedbar-goto-marker
+					   (cdr e)
+					   'prevline))))))))
+
+(defun w3-speedbar-goto-marker (txt marker indent)
+  "Speedbar callback function for jumping to a marker in a w3 buffer.
+TXT is unused.  MARKER is the location.  INDENT is unused."
+  (pop-to-buffer (marker-buffer marker))
+  (goto-char (marker-position marker)))
+    
+(defun w3-speedbar-shorten-button (button)
+  "Takes text BUTTON and shortens it as much as possible."
+  ;; I should make this more complex, but I'm not sure
+  ;; how...
+  (when button 
+    (let ((fnnd (file-name-nondirectory button)))
+      (if (< 0 (length fnnd))
+	  fnnd
+	(if (string-match "\\(ht\\|f\\)tp://" button)
+	    (setq button (substring button (match-end 0))))
+	(if (string-match "/$" button)
+	    (setq button (substring button 0 (match-beginning 0))))
+	button))))
+
+(defun w3-speedbar-link (text token indent)
+  "Follow link described by TEXT which has the URL TOKEN.
+INDENT is not used."
+  (speedbar-with-attached-buffer (w3-fetch token)))
+
+(provide 'sb-w3)
+;;; sb-w3.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/speedbar-load.el b/site/cedet-1.0pre7/speedbar/speedbar-load.el
new file mode 100644
index 0000000..24cb1b1
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/speedbar-load.el
@@ -0,0 +1,36 @@
+;;; speedbar-load.el --- Autoload definitions for Speedbar
+
+;;; Copyright (C) 2003 David Ponce
+
+;; Author: David Ponce <david@dponce.com>
+;; X-RCS: $Id: speedbar-load.el,v 1.2 2005/09/30 20:26:23 zappo Exp $
+
+;; Speedbar is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize Speedbar for all supported conditions.
+
+;;; Code:
+;;
+
+;;; Speedbar autoloads
+;;
+(load "speedbar-loaddefs" nil t)
+
+(provide 'speedbar-load)
+
+;;; speedbar-load.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/speedbar-loaddefs.el b/site/cedet-1.0pre7/speedbar/speedbar-loaddefs.el
new file mode 100644
index 0000000..6cd78c0
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/speedbar-loaddefs.el
@@ -0,0 +1,112 @@
+;;; speedbar-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (rpm) "rpm" "rpm.el" (17213 40778))
+;;; Generated autoloads from rpm.el
+
+(autoload 'rpm "rpm" "\
+Red Hat Package Management in Emacs.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (gud-speedbar-buttons) "sb-gud" "sb-gud.el" (16232
+;;;;;;  37556))
+;;; Generated autoloads from sb-gud.el
+
+(autoload 'gud-speedbar-buttons "sb-gud" "\
+Create a speedbar display based on the current state of GUD.
+If the GUD BUFFER is not running a supported debugger, then turn
+off the specialized speedbar mode.
+
+\(fn BUFFER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (Info-speedbar-buttons Info-speedbar-browser) "sb-info"
+;;;;;;  "sb-info.el" (18873 37159))
+;;; Generated autoloads from sb-info.el
+
+(autoload 'Info-speedbar-browser "sb-info" "\
+Initialize speedbar to display an info node browser.
+This will add a speedbar major display mode.
+
+\(fn)" t nil)
+
+(autoload 'Info-speedbar-buttons "sb-info" "\
+Create a speedbar display to help navigation in an Info file.
+BUFFER is the buffer speedbar is requesting buttons for.
+
+\(fn BUFFER)" nil nil)
+
+(eval-after-load "info" '(require 'sb-info))
+
+;;;***
+
+;;;### (autoloads (rmail-speedbar-buttons) "sb-rmail" "sb-rmail.el"
+;;;;;;  (15958 27182))
+;;; Generated autoloads from sb-rmail.el
+
+(autoload 'rmail-speedbar-buttons "sb-rmail" "\
+Create buttons for BUFFER containing rmail messages.
+Click on the address under Reply to: to reply to this person.
+Under Folders: Click a name to read it, or on the <M> to move the
+current message into that RMAIL folder.
+
+\(fn BUFFER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3-speedbar-buttons) "sb-w3" "sb-w3.el" (17213
+;;;;;;  40805))
+;;; Generated autoloads from sb-w3.el
+
+(autoload 'w3-speedbar-buttons "sb-w3" "\
+Create speedbar buttons for the current web BUFFER displayed in w3 mode.
+
+\(fn BUFFER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
+;;;;;;  "speedbar.el" (18881 38525))
+;;; Generated autoloads from speedbar.el
+
+(defalias 'speedbar 'speedbar-frame-mode)
+
+(autoload 'speedbar-frame-mode "speedbar" "\
+Enable or disable speedbar.  Positive ARG means turn on, negative turn off.
+A nil ARG means toggle.  Once the speedbar frame is activated, a buffer in
+`speedbar-mode' will be displayed.  Currently, only one speedbar is
+supported at a time.
+`speedbar-before-popup-hook' is called before popping up the speedbar frame.
+`speedbar-before-delete-hook' is called before the frame is deleted.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'speedbar-get-focus "speedbar" "\
+Change frame focus to or from the speedbar frame.
+If the selected frame is not speedbar, then speedbar frame is
+selected.  If the speedbar frame is active, then select the attached frame.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("bigclock.el" "dframe.el" "fsum.el" "sb-ant.el"
+;;;;;;  "sb-html.el" "sb-image.el" "sb-texinfo.el" "speedbar-load.el")
+;;;;;;  (19335 11024 369316))
+
+;;;***
+
+(provide 'speedbar-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; speedbar-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/speedbar/speedbar.el b/site/cedet-1.0pre7/speedbar/speedbar.el
new file mode 100755
index 0000000..a84ca2a
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/speedbar.el
@@ -0,0 +1,4157 @@
+;;; speedbar --- quick access to files and tags in a frame
+
+;;; Copyright (C) 1996, 97, 98, 99, 00, 01, 02, 03, 04, 05, 06, 07, 08, 09 Free Software Foundation
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: file, tags, tools
+;; X-RCS: $Id: speedbar.el,v 1.260 2009/03/19 00:49:01 zappo Exp $
+
+(defvar speedbar-version "1.0.3"
+  "The current version of speedbar.")
+(defvar speedbar-incompatible-version "0.14beta4"
+  "This version of speedbar is incompatible with this version.
+Due to massive API changes (removing the use of the word PATH) 
+this version is not backward compatible to 0.14 or earlier.")
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;;   The speedbar provides a frame in which files, and locations in
+;; files are displayed.  These items can be clicked on with mouse-2 in
+;; to display that file location.
+;;
+;;; Customizing and Developing for speedbar
+;;
+;; Please see the speedbar manual for informaion.
+;;
+;;; Notes:
+;;
+;;    Users of really old emacsen without the need timer functions
+;; will not have speedbar updating automatically.  Use "g" to refresh
+;; the display after changing directories.  Remember, do not interrupt
+;; the stealthy updates or your display may not be completely
+;; refreshed.
+;;
+;;    AUC-TEX users: The imenu tags for AUC-TEX mode don't work very
+;; well.  Use the imenu keywords from tex-mode.el for better results.
+;;
+;; This file requires the library package assoc (association lists)
+;;     assoc should be available in all modern versions of Emacs.
+;; The custom package is optional (for easy configuration of speedbar)
+;;     http://www.dina.kvl.dk/~abraham/custom/
+;;     custom is available in all versions of Emacs version 20 or better.
+;;
+
+;;; TODO:
+;; - Timeout directories we haven't visited in a while.
+
+(require 'assoc)
+(require 'easymenu)
+(require 'dframe)
+(require 'sb-image)
+
+;; customization stuff
+(defgroup speedbar nil
+  "File and tag browser frame."
+  :group 'etags
+  :group 'tools
+  :group 'convenience
+;  :version "20.3"
+  )
+
+(defgroup speedbar-faces nil
+  "Faces used in speedbar."
+  :prefix "speedbar-"
+  :group 'speedbar
+  :group 'faces)
+
+(defgroup speedbar-vc nil
+  "Version control display in speedbar."
+  :prefix "speedbar-"
+  :group 'speedbar)
+
+;;; Code:
+(defun speedbar-require-version (major minor &optional beta)
+  "Non-nil if this version of SPEEDBAR does not satisfy a specific version.
+Arguments can be:
+
+  (MAJOR MINOR &optional BETA)
+
+  Values MAJOR and MINOR must be integers.  BETA can be an integer, or
+excluded if a released version is required.
+
+It is assumed that if the current version is newer than that specified,
+everything passes.  Exceptions occur when known incompatibilities are
+introduced."
+  (inversion-test 'speedbar
+		  (concat major "." minor
+			  (when beta (concat "beta" beta)))))
+
+(defvar speedbar-initial-expansion-mode-alist
+  '(("buffers" speedbar-buffer-easymenu-definition speedbar-buffers-key-map
+     speedbar-buffer-buttons)
+    ("quick buffers" speedbar-buffer-easymenu-definition speedbar-buffers-key-map
+     speedbar-buffer-buttons-temp)
+    ;; Files last, means first in the Displays menu
+    ("files" speedbar-easymenu-definition-special speedbar-file-key-map
+     speedbar-directory-buttons speedbar-default-directory-list)
+    )
+  "List of named expansion elements for filling the speedbar frame.
+These expansion lists are only valid for regular files.  Special modes
+still get to override this list on a mode-by-mode basis.  This list of
+lists is of the form (NAME MENU KEYMAP FN1 FN2 ...).  NAME is a string
+representing the types of things to be displayed.  MENU is an easymenu
+structure used when in this mode.  KEYMAP is a local keymap to install
+over the regular speedbar keymap.  FN1 ...  are functions that will be
+called in order.  These functions will always get the default
+directory to use passed in as the first parameter, and a 0 as the
+second parameter.  The 0 indicates the uppermost indentation level.
+They must assume that the cursor is at the position where they start
+inserting buttons.")
+
+(defvar speedbar-initial-expansion-list-name "files"
+  "A symbol name representing the expansion list to use.
+The expansion list `speedbar-initial-expansion-mode-alist' contains
+the names and associated functions to use for buttons in speedbar.")
+
+(defvar speedbar-previously-used-expansion-list-name "files"
+  "Save the last expansion list method.
+This is used for returning to a previous expansion list method when
+the user is done with the current expansion list.")
+
+(defvar speedbar-stealthy-function-list
+  '(("files"
+     speedbar-update-current-file
+     speedbar-check-read-only
+     speedbar-check-vc
+     speedbar-check-objects)
+    )
+  "List of functions to periodically call stealthily.
+This list is of the form:
+ '( (\"NAME\" FUNCTION ...)
+    ...)
+where NAME is the name of the major display mode these functions are
+for, and the remaining elements FUNCTION are functions to call in order.
+Each function must return nil if interrupted, or t if completed.
+Stealthy functions which have a single operation should always return
+t.  Functions which take a long time should maintain a state (where
+they are in their speedbar related calculations) and permit
+interruption.  See `speedbar-check-vc' as a good example.")
+
+(defvar speedbar-mode-functions-list
+  '(("files" (speedbar-item-info . speedbar-files-item-info)
+     (speedbar-line-directory . speedbar-files-line-directory))
+    ("buffers" (speedbar-item-info . speedbar-buffers-item-info)
+     (speedbar-line-directory . speedbar-buffers-line-directory))
+    ("quick buffers" (speedbar-item-info . speedbar-buffers-item-info)
+     (speedbar-line-directory . speedbar-buffers-line-directory))
+    )
+  "List of function tables to use for different major display modes.
+It is not necessary to define any functions for a specialized mode.
+This just provides a simple way of adding lots of customizations.
+Each sublist is of the form:
+  (\"NAME\" (FUNCTIONSYMBOL . REPLACEMENTFUNCTION) ...)
+Where NAME is the name of the specialized mode.  The rest of the list
+is a set of dotted pairs of the form FUNCTIONSYMBOL, which is the name
+of a function you would like to replace, and REPLACEMENTFUNCTION,
+which is a function you can call instead.  Not all functions can be
+replaced this way.  Replaceable functions must provide that
+functionality individually.")
+
+(defcustom speedbar-mode-specific-contents-flag t
+  "*Non-nil means speedbar will show special mode contents.
+This permits some modes to create customized contents for the speedbar
+frame."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-query-confirmation-method 'all
+  "*Query control for file operations.
+The 'always flag means to always query before file operations.
+The 'none-but-delete flag means to not query before any file
+operations, except before a file deletion."
+  :group 'speedbar
+  :type '(radio (const :tag "Always Query before some file operations."
+		       all)
+		(const :tag "Never Query before file operations, except for deletions."
+		       none-but-delete)
+;;;;		(const :tag "Never Every Query."
+;;;;		       none)
+		))
+
+(defvar speedbar-special-mode-expansion-list nil
+  "Default function list for creating specialized button lists.
+This list is set by modes that wish to have special speedbar displays.
+The list is of function names.  Each function is called with one
+parameter BUFFER, the originating buffer.  The current buffer is the
+speedbar buffer.")
+
+(defvar speedbar-special-mode-key-map nil
+  "Default keymap used when identifying a specialized display mode.
+This keymap is local to each buffer that wants to define special keybindings
+effective when its display is shown.")
+
+(defcustom speedbar-before-visiting-file-hook '(push-mark)
+  "*Hooks run before speedbar visits a file in the selected frame.
+The default buffer is the buffer in the selected window in the attached frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-visiting-file-hook nil
+  "*Hooks run when speedbar visits a file in the selected frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-before-visiting-tag-hook '(push-mark)
+  "*Hooks run before speedbar visits a tag in the selected frame.
+The default buffer is the buffer in the selected window in the attached frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-visiting-tag-hook '(speedbar-highlight-one-tag-line)
+  "*Hooks run when speedbar visits a tag in the selected frame."
+  :group 'speedbar
+  :type 'hook
+  :options '(speedbar-highlight-one-tag-line
+	     speedbar-recenter-to-top
+	     speedbar-recenter
+	     ))
+
+(defcustom speedbar-load-hook nil
+  "*Hooks run when speedbar is loaded."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-reconfigure-keymaps-hook nil
+  "*Hooks run when the keymaps are regenerated."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-show-unknown-files nil
+  "*Non-nil show files we can't expand with a ? in the expand button.
+A nil value means don't show the file in the list."
+  :group 'speedbar
+  :type 'boolean)
+
+;;; EVENTUALLY REMOVE THESE
+
+;; When I moved to a repeating timer, I had the horrible missfortune
+;; of loosing the ability for adaptive speed choice.  This update
+;; speed currently causes long delays when it should have been turned off.
+(defvar speedbar-update-speed dframe-update-speed
+  "*Obsoleted variable.  Use `dframe-update-speed'.")
+
+(defvar speedbar-navigating-speed dframe-update-speed
+  "*Obsoleted variable.  Use `dframe-update-speed'.")
+;;; END REMOVE THESE
+
+(defcustom speedbar-frame-parameters '((minibuffer . nil)
+				       (width . 20)
+				       (border-width . 0)
+				       (menu-bar-lines . 0)
+				       (tool-bar-lines . 0)
+				       (unsplittable . t)
+				       (left-fringe . 0)
+				       )
+  "*Parameters to use when creating the speedbar frame in Emacs.
+Any parameter supported by a frame may be added.  The parameter `height'
+will be initialized to the height of the frame speedbar is
+attached to and added to this list before the new frame is initialized."
+  :group 'speedbar
+  :type '(repeat (cons :format "%v"
+		       (symbol :tag "Parameter")
+		       (sexp :tag "Value"))))
+
+;; These values by Hrvoje Niksic <hniksic@srce.hr>
+(defcustom speedbar-frame-plist
+  '(minibuffer nil width 20 border-width 0
+	       internal-border-width 0 unsplittable t
+	       default-toolbar-visible-p nil has-modeline-p nil
+	       menubar-visible-p nil
+	       default-gutter-visible-p nil
+	       )
+  "*Parameters to use when creating the speedbar frame in XEmacs.
+Parameters not listed here which will be added automatically are
+`height' which will be initialized to the height of the frame speedbar
+is attached to."
+  :group 'speedbar
+  :type '(repeat (group :inline t
+			(symbol :tag "Property")
+			(sexp :tag "Value"))))
+
+(defcustom speedbar-use-imenu-flag (stringp (locate-library "imenu"))
+  "*Non-nil means use imenu for file parsing.  nil to use etags.
+XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
+use etags instead.  Etags support is not as robust as imenu support."
+  :tag "Use Imenu for tags"
+  :group 'speedbar
+  :type 'boolean)
+
+(defvar speedbar-dynamic-tags-function-list
+  '((speedbar-fetch-dynamic-imenu . speedbar-insert-imenu-list)
+    (speedbar-fetch-dynamic-etags . speedbar-insert-etags-list))
+  "Set to a list of functions which will return and insert a list of tags.
+Each element is of the form ( FETCH .  INSERT ) where FETCH
+is a function which takes one parameter (the file to tag) and returns a
+list of tags.  The tag list can be of any form as long as the
+corresponding insert method can handle it.  If it returns t, then an
+error occurred, and the next fetch routine is tried.
+INSERT is a function which takes an INDENTation level, and a LIST of
+tags to insert.  It will then create the speedbar buttons.")
+
+(defcustom speedbar-use-tool-tips-flag (and (not (featurep 'xemacs))
+				       (>= emacs-major-version 21))
+  "*Non-nil means to use tool tips if they are avaialble.
+When tooltips are not available, mouse-tracking and minibuffer
+display is used instead."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-track-mouse-flag (not speedbar-use-tool-tips-flag)
+  "*Non-nil means to display info about the line under the mouse."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-default-position 'left-right
+  "*Default position of the speedbar frame.
+Possible values are 'left, 'right or 'left-right.
+If value is 'left-right, the most suitable location is
+determined automatically."
+  :group 'speedbar
+  :type '(radio (const :tag "Automatic" left-right)
+		(const :tag "Left" left)
+		(const :tag "Right" right)))
+
+(defcustom speedbar-sort-tags nil
+  "*If non-nil, sort tags in the speedbar display.  *Obsolete*.
+Use `semantic-tag-hierarchy-method' instead."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-tag-hierarchy-method
+  '(speedbar-prefix-group-tag-hierarchy
+    speedbar-trim-words-tag-hierarchy)
+  "*List of hooks which speedbar will use to organize tags into groups.
+Groups are defined as expandable meta-tags.  Imenu supports
+such things in some languages, such as separating variables from
+functions.  Each hook takes one argument LST, and may destructively
+create a new list of the same form.  LST is a list of elements of the
+form:
+  (ELT1 ELT2 ... ELTn)
+where each ELT is of the form
+  (TAG-NAME-STRING . NUMBER-OR-MARKER)
+or
+  (GROUP-NAME-STRING ELT1 ELT2... ELTn)"
+  :group 'speedbar
+  :type 'hook
+  :options '(speedbar-prefix-group-tag-hierarchy
+	     speedbar-trim-words-tag-hierarchy
+	     speedbar-simple-group-tag-hierarchy
+	     speedbar-sort-tag-hierarchy)
+  )
+
+(defcustom speedbar-tag-group-name-minimum-length 4
+  "*The minimum length of a prefix group name before expanding.
+Thus, if the `speedbar-tag-hierarchy-method' includes `prefix-group'
+and one such groups common characters is less than this number of
+characters, then the group name will be changed to the form of:
+  worda to wordb
+instead of just
+  word
+This way we won't get silly looking listings."
+  :group 'speedbar
+  :type 'integer)
+
+(defcustom speedbar-tag-split-minimum-length 20
+  "*Minimum length before we stop trying to create sub-lists in tags.
+This is used by all tag-hierarchy methods that break large lists into
+sub-lists."
+  :group 'speedbar
+  :type 'integer)
+
+(defcustom speedbar-tag-regroup-maximum-length 10
+  "*Maximum length of submenus that are regrouped.
+If the regrouping option is used, then if two or more short subgroups
+are next to each other, then they are combined until this number of
+items is reached."
+  :group 'speedbar
+  :type 'integer)
+
+(defcustom speedbar-directory-button-trim-method 'span
+  "*Indicates how the directory button will be displayed.
+Possible values are:
+ 'span - span large directories over multiple lines.
+ 'trim - trim large directories to only show the last few.
+ nil   - no trimming."
+  :group 'speedbar
+  :type '(radio (const :tag "Span large directories over mutiple lines."
+		       span)
+		(const :tag "Trim large directories to only show the last few."
+		       trim)
+		(const :tag "No trimming." nil)))
+
+(defcustom speedbar-smart-directory-expand-flag t
+  "*Non-nil means speedbar should use smart expansion.
+Smart expansion only affects when speedbar wants to display a
+directory for a file in the attached frame.  When smart expansion is
+enabled, new directories which are children of a displayed directory
+are expanded in the current framework.  If nil, then the current
+hierarchy would be replaced with the new directory."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-indentation-width 1
+  "*When sub-nodes are expanded, the number of spaces used for indentation."
+  :group 'speedbar
+  :type 'integer)
+
+(defcustom speedbar-hide-button-brackets-flag nil
+  "*Non-nil means speedbar will hide the brackets around the + or -."
+  :group 'speedbar
+  :type 'boolean)
+
+(defcustom speedbar-before-popup-hook nil
+  "*Hooks called before popping up the speedbar frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-after-create-hook '(speedbar-frame-reposition-smartly)
+  "*Hooks called after popping up the speedbar frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-before-delete-hook nil
+  "*Hooks called before deleting the speedbar frame."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-mode-hook nil
+  "*Hooks called after creating a speedbar buffer."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-timer-hook nil
+  "*Hooks called after running the speedbar timer function."
+  :group 'speedbar
+  :type 'hook)
+
+(defcustom speedbar-verbosity-level 1
+  "*Verbosity level of the speedbar.  0 means say nothing.
+1 means medium level verbosity.  2 and higher are higher levels of
+verbosity."
+  :group 'speedbar
+  :type 'integer)
+
+(defvar speedbar-indicator-separator " "
+  "String separating file text from indicator characters.")
+
+(defcustom speedbar-vc-do-check t
+  "*Non-nil check all files in speedbar to see if they have been checked out.
+Any file checked out is marked with `speedbar-vc-indicator'."
+  :group 'speedbar-vc
+  :type 'boolean)
+
+(defvar speedbar-vc-indicator "*"
+  "Text used to mark files which are currently checked out.
+Other version control systems can be added by examining the function
+`speedbar-vc-directory-enable-hook' and `speedbar-vc-in-control-hook'.")
+
+(defcustom speedbar-vc-directory-enable-hook nil
+  "*Return non-nil if the current directory should be checked for Version Control.
+Functions in this hook must accept one parameter which is the directory
+being checked."
+  :group 'speedbar-vc
+  :type 'hook)
+
+(defcustom speedbar-vc-in-control-hook nil
+  "*Return non-nil if the specified file is under Version Control.
+Functions in this hook must accept two parameters.  The DIRECTORY of the
+current file, and the FILENAME of the file being checked."
+  :group 'speedbar-vc
+  :type 'hook)
+
+(defvar speedbar-vc-to-do-point nil
+  "Local variable maintaining the current version control check position.")
+
+(defcustom speedbar-obj-do-check t
+  "*Non-nil check all files in speedbar to see if they have an object file.
+Any file checked out is marked with `speedbar-obj-indicator', and the
+marking is based on `speedbar-obj-alist'"
+  :group 'speedbar-vc
+  :type 'boolean)
+
+(defvar speedbar-obj-to-do-point nil
+  "Local variable maintaining the current version control check position.")
+
+(defvar speedbar-obj-indicator '("#" . "!")
+  "Text used to mark files that have a corresponding hidden object file.
+The car is for an up-to-date object.  The cdr is for an out of date object.
+The expression `speedbar-obj-alist' defines who gets tagged.")
+
+(defvar speedbar-obj-alist
+  '(("\\.\\([cpC]\\|cpp\\|cc\\|cxx\\)$" . ".o")
+    ("\\.el$" . ".elc")
+    ("\\.java$" . ".class")
+    ("\\.f\\(or\\|90\\|77\\)?$" . ".o")
+    ("\\.tex$" . ".dvi")
+    ("\\.texi$" . ".info"))
+  "Alist of file extensions, and their corresponding object file type.")
+
+(defvar speedbar-ro-to-do-point nil
+  "Local variable maintaining the current read only check position.")
+
+(defvar speedbar-object-read-only-indicator "%"
+  "Indicator to append onto a line if that item is Read Only.")
+
+;; Note: Look for addition place to add indicator lists that
+;; use skip-chars instead of a regular expression.
+(defvar speedbar-indicator-regex
+  (concat (regexp-quote speedbar-indicator-separator)
+	  "\\("
+	  (regexp-quote speedbar-vc-indicator)
+	  "\\|"
+	  (regexp-quote (car speedbar-obj-indicator))
+	  "\\|"
+	  (regexp-quote (cdr speedbar-obj-indicator))
+	  "\\|"
+	  (regexp-quote speedbar-object-read-only-indicator)
+	  "\\)*")
+  "Regular expression used when identifying files.
+Permits stripping of indicator characters from a line.")
+
+(defcustom speedbar-scanner-reset-hook nil
+  "*Hook called whenever generic scanners are reset.
+Set this to implement your own scanning / rescan safe functions with
+state data."
+  :group 'speedbar
+  :type 'hook)
+
+(defvar speedbar-ignored-modes '(fundamental-mode)
+  "*List of major modes which speedbar will not switch directories for.")
+
+(defun speedbar-extension-list-to-regex (extlist)
+  "Takes EXTLIST, a list of extensions and transforms it into regexp.
+All the preceding `.' are stripped for an optimized expression starting
+with `.' followed by extensions, followed by full-filenames."
+  (let ((regex1 nil) (regex2 nil))
+    (while extlist
+      (if (= (string-to-char (car extlist)) ?.)
+	  (setq regex1 (concat regex1 (if regex1 "\\|" "")
+			       (substring (car extlist) 1)))
+	(setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist))))
+      (setq extlist (cdr extlist)))
+    ;; concat all the sub-exressions together, making sure all types
+    ;; of parts exist during concatination.
+    (concat "\\("
+	    (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "")
+	    (if (and regex1 regex2) "\\|" "")
+	    (if regex2 (concat "\\(" regex2 "\\)") "")
+	    "\\)$")))
+
+(defvar speedbar-ignored-directory-regexp nil
+  "Regular expression matching directorys speedbar will not switch to.
+Created from `speedbar-ignored-directory-expressions' with the function
+`speedbar-extension-list-to-regex' (A misnamed function in this case.)
+Use the function `speedbar-add-ignored-directory-regexp', or customize the
+variable `speedbar-ignored-directory-expressions' to modify this variable.")
+
+(defcustom speedbar-ignored-directory-expressions
+  '("[/\\]logs?[/\\]\\'")
+  "*List of regular expressions matching directories speedbar will ignore.
+They should included directorys to directories which are notoriously very
+large and take a long time to load in.  Use the function
+`speedbar-add-ignored-directory-regexp' to add new items to this list after
+speedbar is loaded.  You may place anything you like in this list
+before speedbar has been loaded."
+  :group 'speedbar
+  :type '(repeat (regexp :tag "Directory Regexp"))
+  :set (lambda (sym val)
+	 (setq speedbar-ignored-directory-expressions val
+	       speedbar-ignored-directory-regexp
+	       (speedbar-extension-list-to-regex val))))
+
+(defcustom speedbar-directory-unshown-regexp "^\\(CVS\\|RCS\\|SCCS\\|\\..*\\)\\'"
+  "*Regular expression matching directories not to show in speedbar.
+They should include commonly existing directories which are not
+useful, such as version control."
+  :group 'speedbar
+  :type 'string)
+
+(defvar speedbar-file-unshown-regexp
+  (let ((nstr "") (noext completion-ignored-extensions))
+    (while noext
+      (setq nstr (concat nstr (regexp-quote (car noext)) "\\'"
+			 (if (cdr noext) "\\|" ""))
+	    noext (cdr noext)))
+    ;;               backup      refdir      lockfile
+    (concat nstr "\\|#[^#]+#$\\|\\.\\.?\\'\\|\\.#"))
+  "*Regexp matching files we don't want displayed in a speedbar buffer.
+It is generated from the variable `completion-ignored-extensions'")
+
+(defvar speedbar-file-regexp nil
+  "Regular expression matching files we know how to expand.
+Created from `speedbar-supported-extension-expressions' with the
+function `speedbar-extension-list-to-regex'")
+
+;; this is dangerous to customize, because the defaults will probably
+;; change in the future.
+(defcustom speedbar-supported-extension-expressions
+  (append '(".[ch]\\(\\+\\+\\|pp\\|c\\|h\\|xx\\)?" ".tex\\(i\\(nfo\\)?\\)?"
+	    ".el" ".emacs" ".l" ".lsp" ".p" ".java" ".f\\(90\\|77\\|or\\)?")
+	  (if speedbar-use-imenu-flag
+	      '(".ada" ".p[lm]" ".tcl" ".m" ".scm" ".pm" ".py" ".g"
+		;; html is not supported by default, but an imenu tags package
+		;; is available.  Also, html files are nice to be able to see.
+		".s?html"
+		".ma?k" "[Mm]akefile\\(\\.in\\)?")))
+  "*List of regular expressions which will match files supported by tagging.
+Do not prefix the `.' char with a double \\ to quote it, as the period
+will be stripped by a simplified optimizer when compiled into a
+singular expression.  This variable will be turned into
+`speedbar-file-regexp' for use with speedbar.  You should use the
+function `speedbar-add-supported-extension' to add a new extension at
+runtime, or use the configuration dialog to set it in your .emacs
+file.
+If you add an extension to this list, and it does not appear, you may
+need to also modify `completion-ignored-extension' which will also help
+file completion."
+  :group 'speedbar
+  :type '(repeat (regexp :tag "Extension Regexp"))
+  :set (lambda (sym val)
+	 (set 'speedbar-supported-extension-expressions val)
+	 (set 'speedbar-file-regexp (speedbar-extension-list-to-regex val))))
+
+(setq speedbar-file-regexp
+      (speedbar-extension-list-to-regex speedbar-supported-extension-expressions))
+
+(defun speedbar-add-supported-extension (extension)
+  "Add EXTENSION as a new supported extension for speedbar tagging.
+This should start with a `.' if it is not a complete file name, and
+the dot should NOT be quoted in with \\.  Other regular expression
+matchers are allowed however.  EXTENSION may be a single string or a
+list of strings."
+  (interactive "sExtension: ")
+  (if (not (listp extension)) (setq extension (list extension)))
+  (while extension
+    (if (member (car extension) speedbar-supported-extension-expressions)
+	nil
+      (setq speedbar-supported-extension-expressions
+	    (cons (car extension) speedbar-supported-extension-expressions)))
+    (setq extension (cdr extension)))
+  (setq speedbar-file-regexp (speedbar-extension-list-to-regex
+			      speedbar-supported-extension-expressions)))
+
+(defun speedbar-add-ignored-directory-regexp (directory-expression)
+  "Add DIRECTORY-EXPRESSION as a new ignored directory for speedbar tracking.
+This function will modify `speedbar-ignored-directory-regexp' and add
+DIRECTORY-EXPRESSION to `speedbar-ignored-directory-expressions'."
+  (interactive "sDirectory regex: ")
+  (if (not (listp directory-expression))
+      (setq directory-expression (list directory-expression)))
+  (while directory-expression
+    (if (member (car directory-expression) speedbar-ignored-directory-expressions)
+	nil
+      (setq speedbar-ignored-directory-expressions
+	    (cons (car directory-expression) speedbar-ignored-directory-expressions)))
+    (setq directory-expression (cdr directory-expression)))
+  (setq speedbar-ignored-directory-regexp (speedbar-extension-list-to-regex
+				      speedbar-ignored-directory-expressions)))
+
+;; If we don't have custom, then we set it here by hand.
+(if (not (fboundp 'custom-declare-variable))
+    (setq speedbar-file-regexp (speedbar-extension-list-to-regex
+				speedbar-supported-extension-expressions)
+	  speedbar-ignored-directory-regexp (speedbar-extension-list-to-regex
+					speedbar-ignored-directory-expressions)))
+
+(defvar speedbar-update-flag dframe-have-timer-flag
+  "*Non-nil means to automatically update the display.
+When this is nil then speedbar will not follow the attached frame's directory.
+When speedbar is active, use:
+
+\\<speedbar-key-map> `\\[speedbar-toggle-updates]'
+
+to toggle this value.")
+
+(defvar speedbar-update-flag-disable nil
+  "Permanently disable changing of the update flag.")
+
+(defvar speedbar-syntax-table nil
+  "Syntax-table used on the speedbar.")
+
+(if speedbar-syntax-table
+    nil
+  (setq speedbar-syntax-table (make-syntax-table))
+  ;; turn off paren matching around here.
+  (modify-syntax-entry ?\' " " speedbar-syntax-table)
+  (modify-syntax-entry ?\" " " speedbar-syntax-table)
+  (modify-syntax-entry ?( " " speedbar-syntax-table)
+  (modify-syntax-entry ?) " " speedbar-syntax-table)
+  (modify-syntax-entry ?{ " " speedbar-syntax-table)
+  (modify-syntax-entry ?} " " speedbar-syntax-table)
+  (modify-syntax-entry ?[ " " speedbar-syntax-table)
+  (modify-syntax-entry ?] " " speedbar-syntax-table))
+
+(defvar speedbar-key-map nil
+  "Keymap used in speedbar buffer.")
+
+(if speedbar-key-map
+    nil
+  (setq speedbar-key-map (make-keymap))
+  (suppress-keymap speedbar-key-map t)
+
+  ;; control
+  (define-key speedbar-key-map "t" 'speedbar-toggle-updates)
+  (define-key speedbar-key-map "g" 'speedbar-refresh)
+
+  ;; navigation
+  (define-key speedbar-key-map "n" 'speedbar-next)
+  (define-key speedbar-key-map "p" 'speedbar-prev)
+  (define-key speedbar-key-map "\M-n" 'speedbar-restricted-next)
+  (define-key speedbar-key-map "\M-p" 'speedbar-restricted-prev)
+  (define-key speedbar-key-map "\C-\M-n" 'speedbar-forward-list)
+  (define-key speedbar-key-map "\C-\M-p" 'speedbar-backward-list)
+;; These commands never seemed useful.
+;;  (define-key speedbar-key-map " " 'speedbar-scroll-up)
+;;  (define-key speedbar-key-map [delete] 'speedbar-scroll-down)
+
+  ;; Short cuts I happen to find useful
+  (define-key speedbar-key-map "r"
+    (lambda () (interactive)
+      (speedbar-change-initial-expansion-list
+       speedbar-previously-used-expansion-list-name)))
+  (define-key speedbar-key-map "b"
+    (lambda () (interactive)
+      (speedbar-change-initial-expansion-list "quick buffers")))
+  (define-key speedbar-key-map "f"
+    (lambda () (interactive)
+      (speedbar-change-initial-expansion-list "files")))
+
+  (dframe-update-keymap speedbar-key-map)
+)
+
+(defun speedbar-make-specialized-keymap ()
+  "Create a keymap for use with a speedbar major or minor display mode.
+This basically creates a sparse keymap, and makes its parent be
+`speedbar-key-map'."
+  (let ((k (make-sparse-keymap)))
+    (set-keymap-parent k speedbar-key-map)
+    k))
+
+(defvar speedbar-file-key-map nil
+  "Keymap used in speedbar buffer while files are displayed.")
+
+(if speedbar-file-key-map
+    nil
+  (setq speedbar-file-key-map (speedbar-make-specialized-keymap))
+
+  ;; Basic tree features
+  (define-key speedbar-file-key-map "e" 'speedbar-edit-line)
+  (define-key speedbar-file-key-map "\C-m" 'speedbar-edit-line)
+  (define-key speedbar-file-key-map "+" 'speedbar-expand-line)
+  (define-key speedbar-file-key-map "=" 'speedbar-expand-line)
+  (define-key speedbar-file-key-map "-" 'speedbar-contract-line)
+
+  (define-key speedbar-file-key-map "[" 'speedbar-expand-line-descendants)
+  (define-key speedbar-file-key-map "]" 'speedbar-contract-line-descendants)
+
+  (define-key speedbar-file-key-map " " 'speedbar-toggle-line-expansion)
+
+  ;; file based commands
+  (define-key speedbar-file-key-map "U" 'speedbar-up-directory)
+  (define-key speedbar-file-key-map "I" 'speedbar-item-info)
+  (define-key speedbar-file-key-map "B" 'speedbar-item-byte-compile)
+  (define-key speedbar-file-key-map "L" 'speedbar-item-load)
+  (define-key speedbar-file-key-map "C" 'speedbar-item-copy)
+  (define-key speedbar-file-key-map "D" 'speedbar-item-delete)
+  (define-key speedbar-file-key-map "O" 'speedbar-item-object-delete)
+  (define-key speedbar-file-key-map "R" 'speedbar-item-rename)
+  (define-key speedbar-file-key-map "M" 'speedbar-create-directory)
+  )
+
+(defvar speedbar-easymenu-definition-base
+  (append
+   '("Speedbar"
+     ["Update" speedbar-refresh t]
+     ["Auto Update" speedbar-toggle-updates
+      :active (not speedbar-update-flag-disable)
+      :style toggle :selected speedbar-update-flag])
+   (if (and (or (fboundp 'defimage)
+		(fboundp 'make-image-specifier))
+	    (if (fboundp 'display-graphic-p)
+		(display-graphic-p)
+	      window-system))
+       (list
+	["Use Images" speedbar-toggle-images
+	 :style toggle :selected speedbar-use-images]))
+   )
+  "Base part of the speedbar menu.")
+
+(defvar speedbar-easymenu-definition-special
+  '(["Edit Item On Line" speedbar-edit-line t]
+    ["Show All Files" speedbar-toggle-show-all-files
+     :style toggle :selected speedbar-show-unknown-files]
+    ["Expand File Tags" speedbar-expand-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. "))]
+    ["Flush Cache & Expand" speedbar-flush-expand-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. "))]
+    ["Expand All Descendants" speedbar-expand-line-descendants
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. ")) ]
+    ["Contract File Tags" speedbar-contract-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.-. "))]
+;    ["Sort Tags" speedbar-toggle-sorting
+;     :style toggle :selected speedbar-sort-tags]
+    "----"
+    ["File/Tag Information" speedbar-item-info t]
+    ["Load Lisp File" speedbar-item-load
+     (save-excursion
+       (beginning-of-line)
+       (looking-at "[0-9]+: *\\[[+-]\\] .+\\(\\.el\\)\\( \\|$\\)"))]
+    ["Byte Compile File" speedbar-item-byte-compile
+     (save-excursion
+       (beginning-of-line)
+       (looking-at "[0-9]+: *\\[[+-]\\] .+\\(\\.el\\)\\( \\|$\\)"))]
+    ["Copy File" speedbar-item-copy
+     (save-excursion (beginning-of-line) (looking-at "[0-9]+: *\\["))]
+    ["Rename File" speedbar-item-rename
+     (save-excursion (beginning-of-line) (looking-at "[0-9]+: *[[<]"))]
+    ["Create Directory" speedbar-create-directory
+     (save-excursion (beginning-of-line) (looking-at "[0-9]+: *[[<]"))]
+    ["Delete File" speedbar-item-delete
+     (save-excursion (beginning-of-line) (looking-at "[0-9]+: *[[<]"))]
+    ["Delete Object" speedbar-item-object-delete
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))]
+    )
+  "Additional menu items while in file-mode.")
+ 
+(defvar speedbar-easymenu-definition-trailer
+  (append
+   (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
+       (list ["Customize..." speedbar-customize t]))
+   (list
+    ["Detach" speedbar-detach (and speedbar-frame
+				    (eq (selected-frame) speedbar-frame)) ]
+    ["Close" dframe-close-frame t]
+    ["Quit" delete-frame t] ))
+  "Menu items appearing at the end of the speedbar menu.")
+
+(defvar speedbar-desired-buffer nil
+  "Non-nil when speedbar is showing buttons specific to a special mode.
+In this case it is the originating buffer.")
+(defvar speedbar-buffer nil
+  "The buffer displaying the speedbar.")
+(defvar speedbar-frame nil
+  "The frame displaying speedbar.")
+(defvar speedbar-cached-frame nil
+  "The frame that was last created, then removed from the display.")
+(defvar speedbar-full-text-cache nil
+  "The last open directory is saved in its entirety for ultra-fast switching.")
+
+(defvar speedbar-last-selected-file nil
+  "The last file which was selected in speedbar buffer.")
+
+(defvar speedbar-shown-directories nil
+  "Maintain list of directories simultaneously open in the current speedbar.")
+
+(defvar speedbar-directory-contents-alist nil
+  "An association list of directories and their contents.
+Each sublist was returned by `speedbar-file-lists'.  This list is
+maintained to speed up the refresh rate when switching between
+directories.")
+
+(defvar speedbar-power-click nil
+  "Never set this by hand.  Value is t when S-mouse activity occurs.")
+
+
+;;; Compatibility
+;;
+(if (featurep 'xemacs)
+    (progn
+      (defalias 'speedbar-make-overlay 'make-extent)
+      (defalias 'speedbar-overlay-put 'set-extent-property)
+      (defalias 'speedbar-delete-overlay 'delete-extent)
+      (defalias 'speedbar-mode-line-update 'redraw-modeline))
+  (defalias 'speedbar-make-overlay 'make-overlay)
+  (defalias 'speedbar-overlay-put 'overlay-put)
+  (defalias 'speedbar-delete-overlay 'delete-overlay)
+  (defalias 'speedbar-mode-line-update 'force-mode-line-update))
+
+;;; Mode definitions/ user commands
+;;
+
+;;;###autoload
+(defalias 'speedbar 'speedbar-frame-mode)
+;;;###autoload
+(defun speedbar-frame-mode (&optional arg)
+  "Enable or disable speedbar.  Positive ARG means turn on, negative turn off.
+A nil ARG means toggle.  Once the speedbar frame is activated, a buffer in
+`speedbar-mode' will be displayed.  Currently, only one speedbar is
+supported at a time.
+`speedbar-before-popup-hook' is called before popping up the speedbar frame.
+`speedbar-before-delete-hook' is called before the frame is deleted."
+  (interactive "P")
+  ;; Get the buffer to play with
+  (if (not (buffer-live-p speedbar-buffer))
+      (save-excursion
+	(setq speedbar-buffer (get-buffer-create " SPEEDBAR"))
+	(set-buffer speedbar-buffer)
+	(speedbar-mode)))
+  ;; Do the frame thing
+  (dframe-frame-mode arg
+		     'speedbar-frame
+		     'speedbar-cached-frame
+		     'speedbar-buffer
+		     "Speedbar"
+		     #'speedbar-frame-mode
+		     (if dframe-xemacsp
+			 (append speedbar-frame-plist
+				 ;; This is a hack to get speedbar to iconfiy
+				 ;; with the selected frame.
+				 (list 'parent (selected-frame)))
+		       speedbar-frame-parameters)
+		     speedbar-before-delete-hook
+		     speedbar-before-popup-hook
+		     speedbar-after-create-hook)
+  ;; Start up the timer
+  (if (not speedbar-frame)
+      (speedbar-set-timer nil)
+    (speedbar-reconfigure-keymaps)
+    (speedbar-update-contents)
+    (speedbar-set-timer dframe-update-speed)
+    )
+  ;; Frame modifications
+  (set (make-local-variable 'dframe-delete-frame-function)
+       'speedbar-handle-delete-frame)
+  ;; hscroll
+  (set (make-local-variable 'automatic-hscrolling) nil) ; Emacs 21
+  ;; reset the selection variable
+  (setq speedbar-last-selected-file nil))
+
+(defun speedbar-frame-reposition-smartly ()
+  "Reposition the speedbar frame to be next to the attached frame."
+  (cond ((and dframe-xemacsp
+	      (or (member 'left speedbar-frame-plist)
+		  (member 'top speedbar-frame-plist)))
+	 (dframe-reposition-frame
+	  speedbar-frame
+	  (dframe-attached-frame speedbar-frame)
+	  (cons (car (cdr (member 'left speedbar-frame-plist)))
+		(car (cdr (member 'top speedbar-frame-plist)))))
+	 )
+	((and (not dframe-xemacsp)
+	      (or (assoc 'left speedbar-frame-parameters)
+		  (assoc 'top speedbar-frame-parameters)))
+	 ;; if left/top were specified in the parameters, pass them
+	 ;; down to the reposition function
+	 (dframe-reposition-frame
+	  speedbar-frame
+	  (dframe-attached-frame speedbar-frame)
+	  (cons (cdr (assoc 'left speedbar-frame-parameters))
+		(cdr (assoc 'top  speedbar-frame-parameters))))
+	 )
+	(t
+	 (dframe-reposition-frame speedbar-frame
+				  (dframe-attached-frame speedbar-frame)
+				  speedbar-default-position))))
+
+(defun speedbar-detach ()
+  "Detach the current Speedbar from auto-updating.
+Doing this allows the creation of a second speedbar."
+  (interactive)
+  (let ((buffer speedbar-buffer))
+    (dframe-detach 'speedbar-frame 'speedbar-cached-frame 'speedbar-buffer)
+    (save-excursion
+      (set-buffer buffer)
+      ;; Permanently disable auto-updating in this speedbar buffer.
+      (set (make-local-variable 'speedbar-update-flag) nil)
+      (set (make-local-variable 'speedbar-update-flag-disable) t)
+      ;; Make local copies of all the different variables to prevent
+      ;; funny stuff later...
+      )))
+
+(defsubst speedbar-current-frame ()
+  "Return the frame to use for speedbar based on current context."
+  (dframe-current-frame 'speedbar-frame 'speedbar-mode))
+
+(defun speedbar-handle-delete-frame (e)
+  "Handle a delete frame event E.
+If the deleted frame is the frame SPEEDBAR is attached to,
+we need to delete speedbar also."
+  (let ((frame-to-be-deleted (car (car (cdr e)))))
+    (if (eq frame-to-be-deleted dframe-attached-frame)
+	(delete-frame speedbar-frame)))
+  )
+
+;;;###autoload
+(defun speedbar-get-focus ()
+  "Change frame focus to or from the speedbar frame.
+If the selected frame is not speedbar, then speedbar frame is
+selected.  If the speedbar frame is active, then select the attached frame."
+  (interactive)
+  (speedbar-reset-scanners)
+  (dframe-get-focus 'speedbar-frame 'speedbar-frame-mode
+		    (lambda () (let ((speedbar-update-flag t))
+				 (speedbar-timer-fn)))))
+
+(defsubst speedbar-frame-width ()
+  "Return the width of the speedbar frame in characters.
+Return nil if it doesn't exist."
+  (frame-width speedbar-frame))
+
+(defun speedbar-mode ()
+  "Major mode for managing a display of directories and tags.
+\\<speedbar-key-map>
+The first line represents the default directory of the speedbar frame.
+Each directory segment is a button which jumps speedbar's default
+directory to that directory.  Buttons are activated by clicking `\\[speedbar-click]'.
+In some situations using `\\[dframe-power-click]' is a `power click' which will
+rescan cached items, or pop up new frames.
+
+Each line starting with <+> represents a directory.  Click on the <+>
+to insert the directory listing into the current tree.  Click on the
+<-> to retract that list.  Click on the directory name to go to that
+directory as the default.
+
+Each line starting with [+] is a file.  If the variable
+`speedbar-show-unknown-files' is t, the lines starting with [?] are
+files which don't have imenu support, but are not expressly ignored.
+Files are completely ignored if they match `speedbar-file-unshown-regexp'
+which is generated from `completion-ignored-extensions'.
+
+Files with a `*' character after their name are files checked out of a
+version control system.  (Currently only RCS is supported.)  New
+version control systems can be added by examining the documentation
+for `speedbar-this-file-in-vc' and `speedbar-vc-check-dir-p'.
+
+Files with a `#' or `!' character after them are source files that
+have an object file associated with them.  The `!' indicates that the
+files is out of date.  You can control what source/object associations
+exist through the variable `speedbar-obj-alist'.
+
+Click on the [+] to display a list of tags from that file.  Click on
+the [-] to retract the list.  Click on the file name to edit the file
+in the attached frame.
+
+If you open tags, you might find a node starting with {+}, which is a
+category of tags.  Click the {+} to expand the category.  Jump-able
+tags start with >.  Click the name of the tag to go to that position
+in the selected file.
+
+\\{speedbar-key-map}"
+  ;; NOT interactive
+  (save-excursion
+    (kill-all-local-variables)
+    (setq major-mode 'speedbar-mode)
+    (setq mode-name "Speedbar")
+    (set-syntax-table speedbar-syntax-table)
+    (setq font-lock-keywords nil) ;; no font-locking please
+    (setq truncate-lines t)
+    (make-local-variable 'frame-title-format)
+    (setq frame-title-format (concat "Speedbar " speedbar-version))
+    (setq case-fold-search nil)
+    (toggle-read-only 1)
+    (speedbar-set-mode-line-format)
+    ;; Add in our dframe hooks.
+    (if speedbar-track-mouse-flag
+	(setq dframe-track-mouse-function #'speedbar-track-mouse))
+    (setq dframe-help-echo-function #'speedbar-item-info
+	  dframe-mouse-click-function #'speedbar-click
+	  dframe-mouse-position-function #'speedbar-position-cursor-on-line)
+    (run-hooks 'speedbar-mode-hook))
+  speedbar-buffer)
+
+(defmacro speedbar-message (fmt &rest args)
+  "Like message, but for use in the speedbar frame.
+Argument FMT is the format string, and ARGS are the arguments for message."
+  `(dframe-message ,fmt ,@args))
+
+(defsubst speedbar-y-or-n-p (prompt &optional deleting)
+  "Like `y-or-n-p', but for use in the speedbar frame.
+Argument PROMPT is the prompt to use.
+Optional argument DELETING means this is a query that will delete something.
+The variable `speedbar-query-confirmation-method' can cause this to
+return true without a query."
+  (or (and (not deleting)
+	   (eq speedbar-query-confirmation-method 'none-but-delete))
+      (dframe-y-or-n-p prompt)))
+
+(defsubst speedbar-select-attached-frame ()
+  "Select the frame attached to this speedbar."
+  (dframe-select-attached-frame (speedbar-current-frame)))
+
+;; Backwards compatibility
+(defalias 'speedbar-with-attached-buffer 'dframe-with-attached-buffer)
+(defalias 'speedbar-maybee-jump-to-attached-frame 'dframe-maybee-jump-to-attached-frame)
+ 
+(defun speedbar-set-mode-line-format ()
+  "Set the format of the mode line based on the current speedbar environment.
+This gives visual indications of what is up.  It EXPECTS the speedbar
+frame and window to be the currently active frame and window."
+  (if (and (frame-live-p (speedbar-current-frame))
+	   (or (not dframe-xemacsp)
+	       (with-no-warnings
+		 (specifier-instance has-modeline-p)))
+	   speedbar-buffer)
+      (save-excursion
+	(set-buffer speedbar-buffer)
+	(let* ((w (or (speedbar-frame-width) 20))
+	       (p1 "<<")
+	       (p5 ">>")
+	       (p3 (if speedbar-update-flag "#" "!"))
+	       (p35 (capitalize speedbar-initial-expansion-list-name))
+	       (blank (- w (length p1) (length p3) (length p5) (length p35)
+			 (if line-number-mode 5 1)))
+	       (p2 (if (> blank 0)
+		       (make-string (/ blank 2) ? )
+		     ""))
+	       (p4 (if (> blank 0)
+		       (make-string (+ (/ blank 2) (% blank 2)) ? )
+		     ""))
+	       (tf
+		(if line-number-mode
+		    (list (concat p1 p2 p3 " " p35) '(line-number-mode " %3l")
+			  (concat p4 p5))
+		  (list (concat p1 p2 p3 p4 p5)))))
+	  (if (not (equal mode-line-format tf))
+	      (progn
+		(setq mode-line-format tf)
+		(speedbar-mode-line-update)))))))
+
+(defvar speedbar-previous-menu nil
+  "The menu before the last `speedbar-reconfigure-keymaps' was called.")
+
+(defun speedbar-reconfigure-keymaps ()
+  "Reconfigure the menu-bar in a speedbar frame.
+Different menu items are displayed depending on the current display mode
+and the existence of packages."
+  (let ((md (append
+	     speedbar-easymenu-definition-base
+	     (if speedbar-shown-directories
+		 ;; file display mode version
+		 (speedbar-initial-menu)
+	       (save-excursion
+		 (dframe-select-attached-frame speedbar-frame)
+		  (eval (nth 1 (assoc speedbar-initial-expansion-list-name
+				speedbar-initial-expansion-mode-alist)))))
+	     ;; Dynamic menu stuff
+	     '("-")
+	    (list (cons "Displays"
+			(let ((displays nil)
+			      (alist speedbar-initial-expansion-mode-alist))
+			  (while alist
+			    (setq displays
+				  (cons
+				   (vector
+				    (capitalize (car (car alist)))
+				    (list
+				     'speedbar-change-initial-expansion-list
+				     (car (car alist)))
+				    :style 'radio
+				    :selected
+				    `(string= ,(car (car alist))
+					 speedbar-initial-expansion-list-name)
+				    )
+				   displays))
+			    (setq alist (cdr alist)))
+			  displays)))
+	    ;; The trailer
+	    speedbar-easymenu-definition-trailer))
+	(localmap (save-excursion
+		    (let ((cf (selected-frame)))
+		      (prog2
+			  (dframe-select-attached-frame speedbar-frame)
+			  (if (local-variable-p
+			       'speedbar-special-mode-key-map
+			       (current-buffer))
+			      speedbar-special-mode-key-map)
+			(select-frame cf))))))
+    (save-excursion
+      (set-buffer speedbar-buffer)
+      (use-local-map (or localmap
+			 (speedbar-initial-keymap)
+			 ;; This creates a small keymap we can glom the
+			 ;; menu adjustments into.
+			 (speedbar-make-specialized-keymap)))
+      ;; Delete the old menu if applicable.
+      (if speedbar-previous-menu (easy-menu-remove speedbar-previous-menu))
+      (setq speedbar-previous-menu md)
+      ;; Now add the new menu
+      (if (not dframe-xemacsp)
+	  (easy-menu-define speedbar-menu-map (current-local-map)
+			    "Speedbar menu" md)
+	(easy-menu-add md (current-local-map))
+	(if (featurep 'menubars) (set-buffer-menubar (list md)))))
+    (run-hooks 'speedbar-reconfigure-keymaps-hook)))
+
+
+;;; User Input stuff
+;;
+(defun speedbar-customize ()
+  "Customize speedbar using the Custom package."
+  (interactive)
+  (let ((sf (selected-frame)))
+    (dframe-select-attached-frame speedbar-frame)
+    (customize-group 'speedbar)
+    (select-frame sf))
+  (dframe-maybee-jump-to-attached-frame))
+
+(defun speedbar-track-mouse (event)
+  "For motion EVENT, display info about the current line."
+  (if (not speedbar-track-mouse-flag)
+      nil
+    (save-excursion
+      (save-window-excursion
+	(condition-case nil
+	    (progn
+	      (mouse-set-point event)
+	      (if (eq major-mode 'speedbar-mode)
+		  ;; XEmacs may let us get in here in other mode buffers.
+		  (speedbar-item-info)))
+	  (t (speedbar-message nil)))))))
+
+(defun speedbar-show-info-under-mouse ()
+  "Call the info function for the line under the mouse.
+Optional EVENT is currently not used."
+  (let ((pos (mouse-position)))	; we ignore event until I use it later.
+    (if (equal (car pos) speedbar-frame)
+	(save-excursion
+	  (save-window-excursion
+	    (apply 'set-mouse-position pos)
+	    (speedbar-item-info))))))
+
+(defun speedbar-next (arg)
+  "Move to the next ARGth line in a speedbar buffer."
+  (interactive "p")
+  (forward-line (or arg 1))
+  (speedbar-item-info)
+  (speedbar-position-cursor-on-line))
+
+(defun speedbar-prev (arg)
+  "Move to the previous ARGth line in a speedbar buffer."
+  (interactive "p")
+  (speedbar-next (if arg (- arg) -1)))
+
+(defun speedbar-restricted-move (arg)
+  "Move to the next ARGth line in a speedbar buffer at the same depth.
+This means that movement is restricted to a subnode, and that siblings
+of intermediate nodes are skipped."
+  (if (not (numberp arg)) (signal 'wrong-type-argument (list arg 'numberp)))
+  ;; First find the extent for which we are allowed to move.
+  (let ((depth (save-excursion (beginning-of-line)
+			       (if (looking-at "[0-9]+:")
+				   (string-to-int (match-string 0))
+				 0)))
+	(crement (if (< arg 0) 1 -1))	; decrement or increment
+	(lastmatch (point)))
+    (while (/= arg 0)
+      (forward-line (- crement))
+      (let ((subdepth (save-excursion (beginning-of-line)
+				      (if (looking-at "[0-9]+:")
+					  (string-to-int (match-string 0))
+					0))))
+	(cond ((or (< subdepth depth)
+		   (progn (end-of-line) (eobp))
+		   (progn (beginning-of-line) (bobp)))
+	       ;; We have reached the end of this block.
+	       (goto-char lastmatch)
+	       (setq arg 0)
+	       (error "End of sub-list"))
+	      ((= subdepth depth)
+	       (setq lastmatch (point)
+		     arg (+ arg crement))))))
+    (speedbar-position-cursor-on-line)))
+
+(defun speedbar-restricted-next (arg)
+  "Move to the next ARGth line in a speedbar buffer at the same depth.
+This means that movement is restricted to a subnode, and that siblings
+of intermediate nodes are skipped."
+  (interactive "p")
+  (speedbar-restricted-move (or arg 1))
+  (speedbar-item-info))
+
+(defun speedbar-restricted-prev (arg)
+  "Move to the previous ARGth line in a speedbar buffer at the same depth.
+This means that movement is restricted to a subnode, and that siblings
+of intermediate nodes are skipped."
+  (interactive "p")
+  (speedbar-restricted-move (if arg (- arg) -1))
+  (speedbar-item-info))
+
+(defun speedbar-navigate-list (arg)
+  "Move across ARG groups of similarly typed items in speedbar.
+Stop on the first line of the next type of item, or on the last or first item
+if we reach a buffer boundary."
+  (interactive "p")
+  (beginning-of-line)
+  (if (looking-at "[0-9]+: *[[<{][-+?][]>}] ")
+      (let ((str (regexp-quote (match-string 0))))
+	(while (looking-at str)
+	  (speedbar-restricted-move arg)
+	  (beginning-of-line))))
+  (speedbar-position-cursor-on-line))
+
+(defun speedbar-forward-list ()
+  "Move forward over the current list.
+A LIST in speedbar is a group of similarly typed items, such as directories,
+files, or the directory button."
+  (interactive)
+  (speedbar-navigate-list 1)
+  (speedbar-item-info))
+
+(defun speedbar-backward-list ()
+  "Move backward over the current list.
+A LIST in speedbar is a group of similarly typed items, such as directories,
+files, or the directory button."
+  (interactive)
+  (speedbar-navigate-list -1)
+  (speedbar-item-info))
+
+(defun speedbar-scroll-up (&optional arg)
+  "Page down one screen-full of the speedbar, or ARG lines."
+  (interactive "P")
+  (scroll-up arg)
+  (speedbar-position-cursor-on-line))
+
+(defun speedbar-scroll-down (&optional arg)
+  "Page up one screen-full of the speedbar, or ARG lines."
+  (interactive "P")
+  (scroll-down arg)
+  (speedbar-position-cursor-on-line))
+
+(defun speedbar-up-directory ()
+  "Keyboard accelerator for moving the default directory up one.
+Assumes that the current buffer is the speedbar buffer."
+  (interactive)
+  (setq default-directory (expand-file-name (concat default-directory "../")))
+  (speedbar-update-contents))
+
+;;; Speedbar file activity (aka creeping featurism)
+;;
+(defun speedbar-refresh (&optional arg)
+  "Refresh the current speedbar display, disposing of any cached data.
+Argument ARG represents to force a refresh past any caches that may exist."
+  (interactive "P")
+  (let ((dl speedbar-shown-directories)
+	(dframe-power-click arg)
+	deactivate-mark)
+    ;; We need to hack something so this works in detached frames.
+    (while dl
+      (adelete 'speedbar-directory-contents-alist (car dl))
+      (setq dl (cdr dl)))
+    (if (<= 1 speedbar-verbosity-level)
+	(speedbar-message "Refreshing speedbar..."))
+    (speedbar-update-contents)
+    (speedbar-stealthy-updates)
+    ;; Reset the timer in case it got really hosed for some reason...
+    (speedbar-set-timer dframe-update-speed)
+    (if (<= 1 speedbar-verbosity-level)
+	(speedbar-message "Refreshing speedbar...done"))))
+
+(defun speedbar-item-load ()
+  "Load the item under the cursor or mouse if it is a Lisp file."
+  (interactive)
+  (let ((f (speedbar-line-file)))
+    (if (and (file-exists-p f) (string-match "\\.el\\'" f))
+	(if (and (file-exists-p (concat f "c"))
+		 (speedbar-y-or-n-p (format "Load %sc? " f)))
+	    ;; If the compiled version exists, load that instead...
+	    (load-file (concat f "c"))
+	  (load-file f))
+      (error "Not a loadable file"))))
+
+(defun speedbar-item-byte-compile ()
+  "Byte compile the item under the cursor or mouse if it is a Lisp file."
+  (interactive)
+  (let ((f (speedbar-line-file))
+	(sf (selected-frame)))
+    (if (and (file-exists-p f) (string-match "\\.el\\'" f))
+	(progn
+	  (dframe-select-attached-frame speedbar-frame)
+	  (byte-compile-file f nil)
+	  (select-frame sf)
+	  (speedbar-reset-scanners)))
+    ))
+
+(defun speedbar-mouse-item-info (event)
+  "Provide information about what the user clicked on.
+This should be bound to a mouse EVENT."
+  (interactive "e")
+  (mouse-set-point event)
+  (speedbar-item-info))
+
+(defun speedbar-generic-item-info ()
+  "Attempt to derive, and then display information about this line item.
+File style information is displayed with `speedbar-item-info'."
+  (save-excursion
+    (beginning-of-line)
+    ;; Skip invisible number info.
+    (if (looking-at "\\([0-9]+\\):") (goto-char (match-end 0)))
+    ;; Skip items in "folder" type text characters.
+    (if (looking-at "\\s-*[[<({].[]>)}] ") (goto-char (match-end 0)))
+    ;; Get the text
+    (speedbar-message "Text: %s" (buffer-substring-no-properties
+				  (point) (progn (end-of-line) (point))))))
+
+(defun speedbar-item-info ()
+  "Display info in the mini-buffer about the button the mouse is over.
+This function can be replaced in `speedbar-mode-functions-list' as
+`speedbar-item-info'."
+  (interactive)
+  (let (message-log-max)
+    (funcall (or (speedbar-fetch-replacement-function 'speedbar-item-info)
+		 'speedbar-generic-item-info))))
+
+(defun speedbar-item-info-file-helper (&optional filename)
+  "Display info about a file that is on the current line.
+Return nil if not applicable.  If FILENAME, then use that
+instead of reading it from the speedbar buffer."
+  (let* ((item (or filename (speedbar-line-file)))
+	 (attr (if item (file-attributes item) nil)))
+    (if (and item attr) (speedbar-message "%s %-6d %s" (nth 8 attr)
+					  (nth 7 attr) item)
+      nil)))
+
+(defun speedbar-item-info-tag-helper ()
+  "Display info about a tag that is on the current line.
+Return nil if not applicable."
+  (save-excursion
+    (beginning-of-line)
+    (if (re-search-forward " [-+=]?> \\([^\n]+\\)"
+			   (save-excursion(end-of-line)(point)) t)
+       (let* ((tag (match-string 1))
+	      (attr (speedbar-line-token))
+	      (item nil)
+	      (semantic-tagged (if (fboundp 'semantic-tag-p)
+				   (semantic-tag-p attr))))
+	  (if semantic-tagged
+	    (with-no-warnings
+	      (save-excursion
+		(when (and (semantic-tag-overlay attr)
+			   (semantic-tag-buffer attr))
+		  (set-buffer (semantic-tag-buffer attr)))
+		(speedbar-message
+		 (funcall semantic-sb-info-format-tag-function attr)
+		 )))
+	    (looking-at "\\([0-9]+\\):")
+	    (setq item (file-name-nondirectory (speedbar-line-directory)))
+	    (speedbar-message "Tag: %s  in %s" tag item)))
+      (if (re-search-forward "{[+-]} \\([^\n]+\\)$"
+			     (save-excursion(end-of-line)(point)) t)
+	  (speedbar-message "Group of tags \"%s\"" (match-string 1))
+	(if (re-search-forward " [+-]?[()|@] \\([^\n]+\\)$" nil t)
+	    (let* ((detailtext (match-string 1))
+		   (detail (or (speedbar-line-token) detailtext))
+		   (parent (save-excursion
+			     (beginning-of-line)
+			     (let ((dep (if (looking-at "[0-9]+:")
+					    (1- (string-to-int (match-string 0)))
+					  0)))
+			       (re-search-backward (concat "^"
+			       (int-to-string dep)
+			       ":")
+						   nil t))
+			     (if (looking-at "[0-9]+: +[-+=>]> \\([^\n]+\\)$")
+				 (speedbar-line-token)
+			       nil))))
+	      (if (featurep 'semantic)
+		  (with-no-warnings
+		    (if (semantic-tag-p detail)
+			(speedbar-message
+			 (funcall semantic-sb-info-format-tag-function detail parent))
+		      (if parent
+			  (speedbar-message "Detail: %s of tag %s" detail
+					    (if (semantic-tag-p parent)
+						(semantic-format-tag-name parent nil t)
+					      parent))
+			(speedbar-message "Detail: %s" detail))))
+		;; Not using `semantic':
+		(if parent
+		    (speedbar-message "Detail: %s of tag %s" detail parent)
+		  (speedbar-message "Detail: %s" detail))))
+	  nil)))))
+
+(defun speedbar-files-item-info ()
+  "Display info in the mini-buffer about the button the mouse is over."
+  (if (not speedbar-shown-directories)
+      (speedbar-generic-item-info)
+    (or (speedbar-item-info-file-helper)
+	(speedbar-item-info-tag-helper)
+	(speedbar-generic-item-info))))
+
+(defun speedbar-item-copy ()
+  "Copy the item under the cursor.
+Files can be copied to new names or places."
+  (interactive)
+  (let ((f (speedbar-line-file)))
+    (if (not f)	(error "Not a file"))
+    (if (file-directory-p f)
+	(error "Cannot copy directory")
+      (let* ((rt (read-file-name (format "Copy %s to: "
+					 (file-name-nondirectory f))
+				 (file-name-directory f)))
+	     (refresh (member (expand-file-name (file-name-directory rt))
+			      speedbar-shown-directories)))
+	;; Create the right file name part
+	(if (file-directory-p rt)
+	    (setq rt
+		  (concat (expand-file-name rt)
+			  (if (string-match "[/\\]$" rt) "" "/")
+			  (file-name-nondirectory f))))
+	(if (or (not (file-exists-p rt))
+		(speedbar-y-or-n-p (format "Overwrite %s with %s? " rt f)
+				   t))
+	    (progn
+	      (copy-file f rt t t)
+	      ;; refresh display if the new place is currently displayed.
+	      (if refresh
+		  (progn
+		    (speedbar-refresh)
+		    (if (not (speedbar-goto-this-file rt))
+			(speedbar-goto-this-file f))))
+	      ))))))
+
+(defun speedbar-item-rename ()
+  "Rename the item under the cursor or mouse.
+Files can be renamed to new names or moved to new directories."
+  (interactive)
+  (let ((f (speedbar-line-file)))
+    (if f
+	(let* ((rt (read-file-name (format "Rename %s to: "
+					   (file-name-nondirectory f))
+				   (file-name-directory f)))
+	       (refresh (member (expand-file-name (file-name-directory rt))
+				speedbar-shown-directories)))
+	  ;; Create the right file name part
+	  (if (file-directory-p rt)
+	      (setq rt
+		    (concat (expand-file-name rt)
+			    (if (string-match "[/\\]\\'" rt) "" "/")
+			    (file-name-nondirectory f))))
+	  (if (or (not (file-exists-p rt))
+		  (speedbar-y-or-n-p (format "Overwrite %s with %s? " rt f)
+				     t))
+	      (progn
+		(rename-file f rt t)
+		;; refresh display if the new place is currently displayed.
+		(if refresh
+		    (progn
+		      (speedbar-refresh)
+		      (speedbar-goto-this-file rt)
+		      )))))
+      (error "Not a file"))))
+
+(defun speedbar-create-directory ()
+  "Create a directory in speedbar."
+  (interactive)
+  (let ((f (speedbar-line-file)))
+    (if f
+	(let* ((basedir (file-name-directory f))
+	       (nd (read-file-name "Create directory: "
+				   basedir)))
+	  ;; Make the directory
+	  (make-directory nd t)
+	  (speedbar-refresh)
+	  (speedbar-goto-this-file nd)
+	  )
+      (error "Not a file"))))
+
+(defun speedbar-item-delete ()
+  "Delete the item under the cursor.  Files are removed from disk."
+  (interactive)
+  (let ((f (speedbar-line-file)))
+    (if (not f) (error "Not a file"))
+    (if (speedbar-y-or-n-p (format "Delete %s? " f) t)
+	(progn
+	  (if (file-directory-p f)
+	      (delete-directory f)
+	    (delete-file f))
+	  (speedbar-message "Okie dokie..")
+	  (let ((p (point)))
+	    (speedbar-refresh)
+	    (goto-char p))
+	  ))
+    ))
+
+(defun speedbar-item-object-delete ()
+  "Delete the object associated from the item under the cursor.
+The file is removed from disk.  The object is determined from the
+variable `speedbar-obj-alist'."
+  (interactive)
+  (let* ((f (speedbar-line-file))
+	 (obj nil)
+	 (oa speedbar-obj-alist))
+    (if (not f) (error "Not a file"))
+    (while (and oa (not (string-match (car (car oa)) f)))
+      (setq oa (cdr oa)))
+    (setq obj (concat (file-name-sans-extension f) (cdr (car oa))))
+    (if (and oa (file-exists-p obj)
+	     (speedbar-y-or-n-p (format "Delete %s? " obj) t))
+	(progn
+	  (delete-file obj)
+	  (speedbar-reset-scanners)))))
+
+(defun speedbar-enable-update ()
+  "Enable automatic updating in speedbar via timers."
+  (interactive)
+  (setq speedbar-update-flag t)
+  (speedbar-set-mode-line-format)
+  (speedbar-set-timer dframe-update-speed))
+
+(defun speedbar-disable-update ()
+  "Disable automatic updating and stop consuming resources."
+  (interactive)
+  (setq speedbar-update-flag nil)
+  (speedbar-set-mode-line-format)
+  (speedbar-set-timer nil))
+
+(defun speedbar-toggle-updates ()
+  "Toggle automatic update for the speedbar frame."
+  (interactive)
+  (if speedbar-update-flag
+      (speedbar-disable-update)
+    (speedbar-enable-update)))
+
+(defun speedbar-toggle-images ()
+  "Toggle use of images in the speedbar frame.
+Images are not available in Emacs 20 or earlier."
+  (interactive)
+  (setq speedbar-use-images (not speedbar-use-images))
+  (speedbar-refresh))
+
+(defun speedbar-toggle-sorting ()
+  "Toggle tag sorting."
+  (interactive)
+  (setq speedbar-sort-tags (not speedbar-sort-tags)))
+
+(defun speedbar-toggle-show-all-files ()
+  "Toggle display of files speedbar can not tag."
+  (interactive)
+  (setq speedbar-show-unknown-files (not speedbar-show-unknown-files))
+  (speedbar-refresh))
+
+(defmacro speedbar-with-writable (&rest forms)
+  "Allow the buffer to be writable and evaluate FORMS."
+  (list 'let '((inhibit-read-only t))
+	(cons 'progn forms)))
+(put 'speedbar-with-writable 'lisp-indent-function 0)
+
+(defun speedbar-insert-button (text face mouse function
+				    &optional token prevline)
+  "Insert TEXT as the next logical speedbar button.
+FACE is the face to put on the button, MOUSE is the highlight face to use.
+When the user clicks on TEXT, FUNCTION is called with the TOKEN parameter.
+This function assumes that the current buffer is the speedbar buffer.
+If PREVLINE, then put this button on the previous line.
+
+This is a convenience function for special modes that create their own
+specialized speedbar displays."
+  (goto-char (point-max))
+  (let ((start (point)))
+    (if (/= (current-column) 0) (insert "\n"))
+    (put-text-property start (point) 'invisible nil))
+  (if prevline (progn (delete-char -1)
+		      (insert " ") ;back up if desired...
+		      (put-text-property (1- (point)) (point) 'invisible nil)))
+  (let ((start (point)))
+    (insert text)
+    (speedbar-make-button start (point) face mouse function token))
+  (let ((start (point)))
+    (insert "\n")
+    (put-text-property start (point) 'face nil)
+    (put-text-property start (point) 'invisible nil)
+    (put-text-property start (point) 'mouse-face nil)))
+
+(defun speedbar-insert-separator (text)
+  "Insert a separation label of TEXT.
+Separators are not active, have no labels, depth, or actions."
+  (if speedbar-use-images
+      (let ((start (point)))
+	(insert "//")
+	(speedbar-insert-image-button-maybe start 2)))
+  (let ((start (point)))
+    (insert text "\n")
+    (speedbar-make-button start (point)
+			  'speedbar-separator-face
+			  nil nil nil)))
+
+(defun speedbar-make-button (start end face mouse function &optional token)
+  "Create a button from START to END, with FACE as the display face.
+MOUSE is the mouse face.  When this button is clicked on FUNCTION
+will be run with the TOKEN parameter (any Lisp object)"
+  (put-text-property start end 'face face)
+  (put-text-property start end 'mouse-face mouse)
+  (if speedbar-use-tool-tips-flag
+      (put-text-property start end 'help-echo #'dframe-help-echo))
+  (put-text-property start end 'invisible nil)
+  (put-text-property start end 'speedbar-text
+		     (buffer-substring-no-properties start end))
+  (if function (put-text-property start end 'speedbar-function function))
+  (if token (put-text-property start end 'speedbar-token token))
+  ;; So far the only text we have is less that 3 chars.
+  (if (<= (- end start) 3)
+      (speedbar-insert-image-button-maybe start (- end start)))
+  )
+
+;;; Initial Expansion list management
+;;
+(defun speedbar-initial-expansion-list ()
+  "Return the current default expansion list.
+This is based on `speedbar-initial-expansion-list-name' referencing
+`speedbar-initial-expansion-mode-alist'."
+  ;; cdr1 - name, cdr2 - menu
+  (cdr (cdr (cdr (assoc speedbar-initial-expansion-list-name
+			speedbar-initial-expansion-mode-alist)))))
+
+(defun speedbar-initial-menu ()
+  "Return the current default menu data.
+This is based on `speedbar-initial-expansion-list-name' referencing
+`speedbar-initial-expansion-mode-alist'."
+  (symbol-value
+   (car (cdr (assoc speedbar-initial-expansion-list-name
+		    speedbar-initial-expansion-mode-alist)))))
+
+(defun speedbar-initial-keymap ()
+  "Return the current default menu data.
+This is based on `speedbar-initial-expansion-list-name' referencing
+`speedbar-initial-expansion-mode-alist'."
+  (symbol-value
+   (car (cdr (cdr (assoc speedbar-initial-expansion-list-name
+			 speedbar-initial-expansion-mode-alist))))))
+
+(defun speedbar-initial-stealthy-functions ()
+  "Return a list of functions to call stealthily.
+This is based on `speedbar-initial-expansion-list-name' referencing
+`speedbar-stealthy-function-list'."
+  (cdr (assoc speedbar-initial-expansion-list-name
+	      speedbar-stealthy-function-list)))
+
+(defun speedbar-add-expansion-list (new-list)
+  "Add NEW-LIST to the list of expansion lists."
+  (add-to-list 'speedbar-initial-expansion-mode-alist new-list))
+
+(defun speedbar-change-initial-expansion-list (new-default)
+  "Change speedbar's default expansion list to NEW-DEFAULT."
+  (interactive
+   (list
+    (completing-read (format "Speedbar Mode (default %s): "
+			     speedbar-previously-used-expansion-list-name)
+		     speedbar-initial-expansion-mode-alist
+		     nil t "" nil
+		     speedbar-previously-used-expansion-list-name)))
+  (setq speedbar-previously-used-expansion-list-name
+	speedbar-initial-expansion-list-name
+	speedbar-initial-expansion-list-name new-default)
+  (if (and (speedbar-current-frame) (frame-live-p (speedbar-current-frame)))
+      (progn
+	(speedbar-refresh)
+	(speedbar-reconfigure-keymaps))))
+
+(defun speedbar-fetch-replacement-function (function)
+  "Return a current mode specific replacement for function, or nil.
+Scans `speedbar-mode-functions-list' first for the current mode, then
+for FUNCTION."
+  (cdr (assoc function
+	      (cdr (assoc speedbar-initial-expansion-list-name
+			  speedbar-mode-functions-list)))))
+
+(defun speedbar-add-mode-functions-list (new-list)
+  "Add NEW-LIST to the list of mode functions.
+See `speedbar-mode-functions-list' for details."
+  (add-to-list 'speedbar-mode-functions-list new-list))
+
+
+;;; Special speedbar display management
+;;
+(defun speedbar-maybe-add-localized-support (buffer)
+  "Quick check function called on BUFFERs by the speedbar timer function.
+Maintains the value of local variables which control speedbars use
+of the special mode functions."
+  (or speedbar-special-mode-expansion-list
+      (speedbar-add-localized-speedbar-support buffer)))
+
+(defun speedbar-add-localized-speedbar-support (buffer)
+  "Add localized speedbar support to BUFFER's mode if it is available."
+  (interactive "bBuffer: ")
+  (if (stringp buffer) (setq buffer (get-buffer buffer)))
+  (if (not (buffer-live-p buffer))
+      nil
+    (save-excursion
+      (set-buffer buffer)
+      (save-match-data
+	(let ((ms (symbol-name major-mode)) v)
+	  (if (not (string-match "-mode$" ms))
+	      nil ;; do nothing to broken mode
+	    (setq ms (substring ms 0 (match-beginning 0)))
+	    (setq v (intern-soft (concat ms "-speedbar-buttons")))
+	    (make-local-variable 'speedbar-special-mode-expansion-list)
+	    (if (not v)
+		(setq speedbar-special-mode-expansion-list t)
+	      ;; If it is autoloaded, we need to load it now so that
+	      ;; we have access to the varialbe -speedbar-menu-items.
+	      ;; Is this XEmacs safe?
+	      (let ((sf (symbol-function v)))
+		(if (and (listp sf) (eq (car sf) 'autoload))
+		    (load-library (car (cdr sf)))))
+	      (setq speedbar-special-mode-expansion-list (list v))
+	      (setq v (intern-soft (concat ms "-speedbar-key-map")))
+	      (if (not v)
+		  nil ;; don't add special keymap
+		(make-local-variable 'speedbar-special-mode-key-map)
+		(setq speedbar-special-mode-key-map
+		      (symbol-value v)))
+	      (setq v (intern-soft (concat ms "-speedbar-menu-items")))
+	      (if (not v)
+		  nil ;; don't add special menus
+		(make-local-variable 'speedbar-easymenu-definition-special)
+		(setq speedbar-easymenu-definition-special
+		      (symbol-value v)))
+	      )))))))
+
+(defun speedbar-remove-localized-speedbar-support (buffer)
+  "Remove any traces that BUFFER supports speedbar in a specialized way."
+  (save-excursion
+    (set-buffer buffer)
+    (kill-local-variable 'speedbar-special-mode-expansion-list)
+    (kill-local-variable 'speedbar-special-mode-key-map)
+    (kill-local-variable 'speedbar-easymenu-definition-special)))
+
+;;; File button management
+;;
+(defun speedbar-file-lists (directory)
+  "Create file lists for DIRECTORY.
+The car is the list of directories, the cdr is list of files not
+matching ignored headers.  Cache any directory files found in
+`speedbar-directory-contents-alist' and use that cache before scanning
+the file-system."
+  (setq directory (expand-file-name directory))
+  ;; If in powerclick mode, then the directory we are getting
+  ;; should be rescanned.
+  (if dframe-power-click
+      (adelete 'speedbar-directory-contents-alist directory))
+  ;; find the directory, either in the cache, or build it.
+  (or (cdr-safe (assoc directory speedbar-directory-contents-alist))
+      (let ((default-directory directory)
+	    (dir (directory-files directory nil))
+	    (dirs nil)
+	    (files nil))
+	(while dir
+	  (if (not
+	       (or (string-match speedbar-file-unshown-regexp (car dir))
+		   (string-match speedbar-directory-unshown-regexp (car dir))))
+	      (if (file-directory-p (car dir))
+		  (setq dirs (cons (car dir) dirs))
+		(setq files (cons (car dir) files))))
+	  (setq dir (cdr dir)))
+	(let ((nl (cons (nreverse dirs) (list (nreverse files)))))
+	  (aput 'speedbar-directory-contents-alist directory nl)
+	  nl))
+      ))
+
+(defun speedbar-directory-buttons (directory index)
+  "Insert a single button group at point for DIRECTORY.
+Each directory directory part is a different button.  If part of the directory
+matches the user directory ~, then it is replaced with a ~.
+INDEX is not used, but is required by the caller."
+  (let* ((tilde (expand-file-name "~/"))
+	 (dd (expand-file-name directory))
+	 (junk (string-match (concat "^" (regexp-quote tilde)) dd))
+	 (displayme (if junk
+			(concat "~/" (substring dd (match-end 0)))
+		      dd))
+	 (p (point)))
+    (if (string-match "^~[/\\]?\\'" displayme) (setq displayme tilde))
+    (insert displayme)
+    (save-excursion
+      (goto-char p)
+      (while (re-search-forward "\\([^/\\]+\\)[/\\]" nil t)
+	(speedbar-make-button (match-beginning 1) (match-end 1)
+			      'speedbar-directory-face
+			      'speedbar-highlight-face
+			      'speedbar-directory-buttons-follow
+			      (if (and (= (match-beginning 1) p)
+				       (not (char-equal (char-after (+ p 1)) ?:)))
+				  (expand-file-name "~/")  ;the tilde
+				(buffer-substring-no-properties
+				 p (match-end 0)))))
+      ;; Nuke the beginning of the directory if it's too long...
+      (cond ((eq speedbar-directory-button-trim-method 'span)
+	     (beginning-of-line)
+	     (let ((ww (or (speedbar-frame-width) 20)))
+	       (move-to-column ww nil)
+	       (while (>= (current-column) ww)
+		 (re-search-backward "[/\\]" nil t)
+		 (if (<= (current-column) 2)
+		     (progn
+		       (re-search-forward "[/\\]" nil t)
+		       (if (< (current-column) 4)
+			   (re-search-forward "[/\\]" nil t))
+		       (forward-char -1)))
+		 (if (looking-at "[/\\]?$")
+		     (beginning-of-line)
+		   (insert "/...\n ")
+		   (move-to-column ww nil)))))
+	    ((eq speedbar-directory-button-trim-method 'trim)
+	     (end-of-line)
+	     (let ((ww (or (speedbar-frame-width) 20))
+		   (tl (current-column)))
+	       (if (< ww tl)
+		   (progn
+		     (move-to-column (- tl ww))
+		     (if (re-search-backward "[/\\]" nil t)
+			 (progn
+			   (delete-region (point-min) (point))
+			   (insert "$")
+			   )))))))
+      )
+    (if (string-match "\\`[/\\][^/\\]+[/\\]\\'" displayme)
+	(progn
+	  (insert "  ")
+	  (let ((p (point)))
+	    (insert "<root>")
+	    (speedbar-make-button p (point)
+				  'speedbar-directory-face
+				  'speedbar-highlight-face
+				  'speedbar-directory-buttons-follow
+				  "/"))))
+    (end-of-line)
+    (insert-char ?\n 1 nil)))
+
+(defun speedbar-make-tag-line (exp-button-type
+			       exp-button-char exp-button-function
+			       exp-button-data
+			       tag-button tag-button-function tag-button-data
+			       tag-button-face depth)
+  "Create a tag line with EXP-BUTTON-TYPE for the small expansion button.
+This is the button that expands or contracts a node (if applicable),
+and EXP-BUTTON-CHAR the character in it (+, -, ?, etc).  EXP-BUTTON-FUNCTION
+is the function to call if it's clicked on.  Button types are
+'bracket, 'angle, 'curly, 'expandtag, 'statictag, t, or nil.
+EXP-BUTTON-DATA is extra data attached to the text forming the expansion
+button.
+
+Next, TAG-BUTTON is the text of the tag.  TAG-BUTTON-FUNCTION is the
+function to call if clicked on, and TAG-BUTTON-DATA is the data to
+attach to the text field (such a tag positioning, etc).
+TAG-BUTTON-FACE is a face used for this type of tag.
+
+Lastly, DEPTH shows the depth of expansion.
+
+This function assumes that the cursor is in the speedbar window at the
+position to insert a new item, and that the new item will end with a CR."
+  (let ((start (point))
+	(end (progn
+	       (insert (int-to-string depth) ":")
+	       (point)))
+	(depthspacesize (* depth speedbar-indentation-width)))
+    (put-text-property start end 'invisible t)
+    (insert-char ?  depthspacesize nil)
+    (put-text-property (- (point) depthspacesize) (point) 'invisible nil)
+    (let* ((exp-button (cond ((eq exp-button-type 'bracket) "[%c]")
+			     ((eq exp-button-type 'angle) "<%c>")
+			     ((eq exp-button-type 'curly) "{%c}")
+			     ((eq exp-button-type 'expandtag) " %c>")
+			     ((eq exp-button-type 'statictag) " =>")
+			     (t ">")))
+	   (buttxt (format exp-button exp-button-char))
+	   (start (point))
+	   (end (progn (insert buttxt) (point)))
+	   (bf (if (and exp-button-type (not (eq exp-button-type 'statictag)))
+		   'speedbar-button-face nil))
+	   (mf (if exp-button-function 'speedbar-highlight-face nil))
+	   )
+      (speedbar-make-button start end bf mf exp-button-function exp-button-data)
+      (if speedbar-hide-button-brackets-flag
+	  (progn
+	    (put-text-property start (1+ start) 'invisible t)
+	    (put-text-property end (1- end) 'invisible t)))
+      )
+    (insert-char ?  1 nil)
+    (put-text-property (1- (point)) (point) 'invisible nil)
+    (let ((start (point))
+	  (end (progn (insert tag-button) (point))))
+      (insert-char ?\n 1 nil)
+      (put-text-property (1- (point)) (point) 'invisible nil)
+      (speedbar-make-button start end tag-button-face
+			    (if tag-button-function 'speedbar-highlight-face nil)
+			    tag-button-function tag-button-data))
+    ))
+  
+(defun speedbar-change-expand-button-char (char)
+  "Change the expansion button character to CHAR for the current line."
+  (save-excursion
+    (beginning-of-line)
+    (if (re-search-forward ":\\s-*.\\([-+?]\\)" (save-excursion (end-of-line)
+								(point)) t)
+	(speedbar-with-writable
+	  (goto-char (match-end 1))
+	  (insert-char char 1 t)
+	  (forward-char -1)
+	  (delete-char -1)
+	  ;;(put-text-property (point) (1- (point)) 'invisible nil)
+	  ;; make sure we fix the image on the text here.
+	  (speedbar-insert-image-button-maybe (- (point) 1) 3)))))
+
+
+;;; Build button lists
+;;
+(defun speedbar-insert-files-at-point (files level)
+  "Insert list of FILES starting at point, and indenting all files to LEVEL.
+Tag expandable items with a +, otherwise a ?.  Don't highlight ? as we
+don't know how to manage them.  The input parameter FILES is a cons
+cell of the form ( 'DIRLIST .  'FILELIST )."
+  ;; Start inserting all the directories
+  (let ((dirs (car files)))
+    (while dirs
+      (speedbar-make-tag-line 'angle ?+ 'speedbar-dired (car dirs)
+			      (car dirs) 'speedbar-dir-follow nil
+			      'speedbar-directory-face level)
+      (setq dirs (cdr dirs))))
+  (let ((lst (car (cdr files)))
+	(case-fold-search t))
+    (while lst
+      (let* ((known (string-match speedbar-file-regexp (car lst)))
+	     (expchar (if known ?+ ??))
+	     (fn (if known 'speedbar-tag-file nil)))
+	(if (or speedbar-show-unknown-files (/= expchar ??))
+	    (speedbar-make-tag-line 'bracket expchar fn (car lst)
+				    (car lst) 'speedbar-find-file nil
+				    'speedbar-file-face level)))
+      (setq lst (cdr lst)))))
+
+(defun speedbar-default-directory-list (directory index)
+  "Insert files for DIRECTORY with level INDEX at point."
+  (speedbar-insert-files-at-point 
+   (speedbar-file-lists directory) index)
+  (speedbar-reset-scanners)
+  (if (= index 0)
+      ;; If the shown files variable has extra directories, then
+      ;; it is our responsibility to redraw them all
+      ;; Luckilly, the nature of inserting items into this list means
+      ;; that by reversing it, we can easilly go in the right order
+      (let ((sf (cdr (reverse speedbar-shown-directories))))
+	(setq speedbar-shown-directories
+	      (list (expand-file-name default-directory)))
+	;; exand them all as we find them
+	(while sf
+	  (if (speedbar-goto-this-file (car sf))
+	      (progn
+		(beginning-of-line)
+		(if (looking-at "[0-9]+:[ ]*<")
+		    (progn
+		      (goto-char (match-end 0))
+		      (speedbar-do-function-pointer)))))
+	  (setq sf (cdr sf)))
+	)))
+;;; Generic List support
+;;
+;;  Generic lists are hierarchies of tags which we may need to permute
+;;  in order to make it look nice.
+;;
+;;  A generic list is of the form:
+;;  ( ("name" . marker-or-number)              <-- one tag at this level
+;;    ("name" ("name" . mon) ("name" . mon) )  <-- one group of tags
+;;    ("name" mon ("name" . mon) )             <-- group w/ a position and tags
+(defun speedbar-generic-list-group-p (sublst)
+  "Non-nil if SUBLST is a group.
+Groups may optionally contain a position."
+  (and (stringp (car-safe sublst))
+       (or (and (listp (cdr-safe sublst))
+		(or (speedbar-generic-list-tag-p (car-safe (cdr-safe sublst)))
+		    (speedbar-generic-list-group-p (car-safe (cdr-safe sublst))
+						   )))
+	   (and (number-or-marker-p (car-safe (cdr-safe sublst)))
+		(listp (cdr-safe (cdr-safe sublst)))
+		(speedbar-generic-list-tag-p
+		 (car-safe (cdr-safe (cdr-safe sublst)))))
+	   )))
+
+(defun speedbar-generic-list-positioned-group-p (sublst)
+  "Non-nil of SUBLST is a group with a position."
+  (and (stringp (car-safe sublst))
+       (number-or-marker-p (car-safe (cdr-safe sublst)))
+       (listp (cdr-safe (cdr-safe sublst)))
+       (let ((rest (car-safe (cdr-safe (cdr-safe sublst)))))
+	 (or (speedbar-generic-list-tag-p rest)
+	     (speedbar-generic-list-group-p rest)
+	     (speedbar-generic-list-positioned-group-p rest)
+	     ))))
+
+(defun speedbar-generic-list-tag-p (sublst)
+  "Non-nil if SUBLST is a tag."
+  (and (stringp (car-safe sublst))
+       (or (and (number-or-marker-p (cdr-safe sublst))
+		(not (cdr-safe (cdr-safe sublst))))
+	   ;; For semantic/bovine items, this is needed
+	   (symbolp (car-safe (cdr-safe sublst))))
+       ))
+
+(defun speedbar-sort-tag-hierarchy (lst)
+  "Sort all elements of tag hierarchy LST."
+  (sort (copy-alist lst)
+	(lambda (a b) (string< (car a) (car b)))))
+
+(defun speedbar-try-completion (string alist)
+  "A wrapper for `try-completion'.
+Passes STRING and ALIST to `try-completion' if ALIST
+passes some tests."
+  (if (and (consp alist)
+	   (listp (car alist)) (stringp (car (car alist))))
+      (try-completion string alist)
+    nil))
+
+(defun speedbar-prefix-group-tag-hierarchy (lst)
+  "Prefix group names for tag hierarchy LST."
+  (let ((newlst nil)
+	(sublst nil)
+	(work-list nil)
+	(junk-list nil)
+	(short-group-list nil)
+	(short-start-name nil)
+	(short-end-name nil)
+	(num-shorts-grouped 0)
+	(bins (make-vector 256 nil))
+	(diff-idx 0))
+    (if (<= (length lst) speedbar-tag-regroup-maximum-length)
+	;; Do nothing.  Too short to bother with.
+	lst
+      ;; Break out sub-lists
+      (while lst
+	(if (speedbar-generic-list-group-p (car-safe lst))
+	    (setq newlst (cons (car lst) newlst))
+	  (setq sublst (cons (car lst) sublst)))
+	(setq lst (cdr lst)))
+      ;; Reverse newlst because it was made backwards.
+      ;; Sublist doesn't need reversing because the act
+      ;; of binning things will reverse it for us.
+      (setq newlst (nreverse newlst)
+	    sublst sublst)
+      ;; Now, first find out how long our list is.  Never let a
+      ;; list get-shorter than our minimum.
+      (if (<= (length sublst) speedbar-tag-split-minimum-length)
+	  (setq work-list sublst)
+	(setq diff-idx (length (speedbar-try-completion "" sublst)))
+	;; Sort the whole list into bins.
+	(while sublst
+	  (let ((e (car sublst))
+		(s (car (car sublst))))
+	    (cond ((<= (length s) diff-idx)
+		   ;; 0 storage bin for shorty.
+		   (aset bins 0 (cons e (aref bins 0))))
+		  (t
+		   ;; stuff into a bin based on ascii value at diff
+		   (aset bins (aref s diff-idx)
+			 (cons e (aref bins (aref s diff-idx)))))))
+	  (setq sublst (cdr sublst)))
+	;; Go through all our bins  Stick singles into our
+	;; junk-list, everything else as sublsts in work-list.
+	;; If two neighboring lists are both small, make a grouped
+	;; group combinding those two sub-lists.
+	(setq diff-idx 0)
+	(while (> 256 diff-idx)
+	  ;; The bins contents are currently in forward order.
+	  (let ((l (aref bins diff-idx)))
+	    (if l
+		(let ((tmp (cons (speedbar-try-completion "" l) l)))
+		  (if (or (> (length l) speedbar-tag-regroup-maximum-length)
+			  (> (+ (length l) (length short-group-list))
+			     speedbar-tag-split-minimum-length))
+		      (progn
+			;; We have reached a longer list, so we
+			;; must finish off a grouped group.
+			(cond
+			 ((and short-group-list
+			       (= (length short-group-list)
+				  num-shorts-grouped))
+			  ;; All singles?  Junk list
+			  (setq junk-list (append (nreverse short-group-list)
+						  junk-list)))
+			 ((= num-shorts-grouped 1)
+			  ;; Only one short group?  Just stick it in
+			  ;; there by itself.  Make a group, and find
+			  ;; a subexpression
+			  (let ((subexpression (speedbar-try-completion
+						"" short-group-list)))
+			    (if (< (length subexpression)
+				   speedbar-tag-group-name-minimum-length)
+				(setq subexpression
+				      (concat short-start-name
+					      " ("
+					      (substring
+					       (car (car short-group-list))
+					       (length short-start-name))
+					      ")")))
+			    (setq work-list
+				  (cons (cons subexpression
+					      short-group-list)
+					work-list ))))
+			 (short-group-list
+			  ;; Multiple groups to be named in a special
+			  ;; way by displaying the range over which we
+			  ;; have grouped them.
+			  (setq work-list
+				(cons (cons (concat short-start-name
+						    " to "
+						    short-end-name)
+					    short-group-list)
+				      work-list))))
+		     ;; Reset short group list information every time.
+			(setq short-group-list nil
+			      short-start-name nil
+			      short-end-name nil
+			      num-shorts-grouped 0)))
+		  ;; Ok, now that we cleaned up the short-group-list,
+		  ;; we can deal with this new list, to decide if it
+		  ;; should go on one of these sub-lists or not.
+		  (if (< (length l) speedbar-tag-regroup-maximum-length)
+		      (setq short-group-list (append l short-group-list)
+			    num-shorts-grouped (1+ num-shorts-grouped)
+			    short-end-name (car tmp)
+			    short-start-name (if short-start-name
+						 short-start-name
+					       (car tmp)))
+		    (setq work-list (cons tmp work-list))))))
+	  (setq diff-idx (1+ diff-idx))))
+      ;; Did we run out of things?  Drop our new list onto the end.
+      (cond
+       ((and short-group-list (= (length short-group-list) num-shorts-grouped))
+	;; All singles?  Junk list
+	(setq junk-list (append short-group-list junk-list)))
+       ((= num-shorts-grouped 1)
+	;; Only one short group?  Just stick it in
+	;; there by itself.
+	(setq work-list
+	      (cons (cons (speedbar-try-completion "" short-group-list)
+			  short-group-list)
+		    work-list)))
+       (short-group-list
+	;; Multiple groups to be named in a special
+	;; way by displaying the range over which we
+	;; have grouped them.
+	(setq work-list
+	      (cons (cons (concat short-start-name " to " short-end-name)
+			  short-group-list)
+		    work-list))))
+      ;; Reverse the work list nreversed when consing.
+      (setq work-list (nreverse work-list))
+      ;; Now, stick our new list onto the end of
+      (if work-list
+	  (if junk-list
+	      (append newlst work-list junk-list)
+	    (append newlst work-list))
+	(append  newlst junk-list)))))
+
+(defun speedbar-trim-words-tag-hierarchy (lst)
+  "Trim all words in a tag hierarchy.
+Base trimming information on word separators, and group names.
+Argument LST is the list of tags to trim."
+  (let ((newlst nil)
+	(sublst nil)
+	(trim-prefix nil)
+	(trim-chars 0)
+	(trimlst nil))
+    (while lst
+      (if (speedbar-generic-list-group-p (car-safe lst))
+	  (setq newlst (cons (car lst) newlst))
+	(setq sublst (cons (car lst) sublst)))
+      (setq lst (cdr lst)))
+    ;; Get the prefix to trim by.  Make sure that we don't trim
+    ;; off silly pieces, only complete understandable words.
+    (setq trim-prefix (speedbar-try-completion "" sublst)
+	  newlst (nreverse newlst))
+    (if (or (= (length sublst) 1)
+	    (not trim-prefix)
+	    (not (string-match "\\(\\w+\\W+\\)+" trim-prefix)))
+	(append newlst (nreverse sublst))
+      (setq trim-prefix (substring trim-prefix (match-beginning 0)
+				   (match-end 0)))
+      (setq trim-chars (length trim-prefix))
+      (while sublst
+	(setq trimlst (cons
+		       (cons (substring (car (car sublst)) trim-chars)
+			     (cdr (car sublst)))
+		       trimlst)
+	      sublst (cdr sublst)))
+      ;; Put the lists together
+      (append newlst trimlst))))
+
+(defun speedbar-simple-group-tag-hierarchy (lst)
+  "Create a simple 'Tags' group with orphaned tags.
+Argument LST is the list of tags to sort into groups."
+  (let ((newlst nil)
+	(sublst nil))
+    (while lst
+      (if (speedbar-generic-list-group-p (car-safe lst))
+	  (setq newlst (cons (car lst) newlst))
+	(setq sublst (cons (car lst) sublst)))
+      (setq lst (cdr lst)))
+    (if (not newlst)
+	(nreverse sublst)
+      (setq newlst (cons (cons "Tags" (nreverse sublst)) newlst))
+      (nreverse newlst))))
+
+(defun speedbar-create-tag-hierarchy (lst)
+  "Adjust the tag hierarchy in LST, and return it.
+This uses `speedbar-tag-hierarchy-method' to determine how to adjust
+the list."
+  (let* ((f (save-excursion
+	      (forward-line -1)
+	      (or (speedbar-line-file)
+		  (speedbar-line-directory))))
+	 (methods (if (get-file-buffer f)
+		      (save-excursion (set-buffer (get-file-buffer f))
+				      speedbar-tag-hierarchy-method)
+		    speedbar-tag-hierarchy-method))
+	 (lst (if (fboundp 'copy-tree)
+		  (copy-tree lst)
+		lst)))
+    (while methods
+      (setq lst (funcall (car methods) lst)
+	    methods (cdr methods)))
+    lst))
+
+(defvar speedbar-generic-list-group-expand-button-type 'curly
+  "The type of button created for groups of tags.
+Good values for this are `curly' and `expandtag'.
+Make buffer local for your mode.")
+
+(defvar speedbar-generic-list-tag-button-type nil
+  "The type of button created for tags in generic lists.
+Good values for this are nil and `statictag'.
+Make buffer local for your mode.")
+
+(defun speedbar-insert-generic-list (level lst expand-fun find-fun)
+  "At LEVEL, insert a generic multi-level alist LST.
+Associations with lists get {+} tags (to expand into more nodes) and
+those with positions just get a > as the indicator.  {+} buttons will
+have the function EXPAND-FUN and the token is the CDR list.  The token
+name will have the function FIND-FUN and not token."
+  ;; Remove imenu rescan button
+  (if (string= (car (car lst)) "*Rescan*")
+      (setq lst (cdr lst)))
+  ;; Get, and set up variables that define how we treat these tags.
+   (let ((f (save-excursion (forward-line -1)
+			    (or (speedbar-line-file)
+				(speedbar-line-directory))))
+	 expand-button tag-button)
+     (save-excursion
+       (if (get-file-buffer f)
+	   (set-buffer (get-file-buffer f)))
+       (setq expand-button speedbar-generic-list-group-expand-button-type
+	     tag-button speedbar-generic-list-tag-button-type))
+     ;; Adjust the list.
+     (setq lst (speedbar-create-tag-hierarchy lst))
+     ;; insert the parts
+     (while lst
+       (cond ((null (car-safe lst)) nil)	;this would be a separator
+	    ((speedbar-generic-list-tag-p (car lst))
+	     (speedbar-make-tag-line tag-button
+				     nil nil nil ;no expand button data
+				     (car (car lst)) ;button name
+				     find-fun ;function
+				     (cdr (car lst)) ;token is position
+				     'speedbar-tag-face
+				     (1+ level)))
+	    ((speedbar-generic-list-positioned-group-p (car lst))
+	     (speedbar-make-tag-line expand-button
+				     ?+ expand-fun (cdr (cdr (car lst)))
+				     (car (car lst)) ;button name
+				     find-fun ;function
+				     (car (cdr (car lst))) ;token is posn
+				     'speedbar-tag-face
+				     (1+ level)))
+	    ((speedbar-generic-list-group-p (car lst))
+	     (speedbar-make-tag-line expand-button
+				     ?+ expand-fun (cdr (car lst))
+				     (car (car lst)) ;button name
+				     nil nil 'speedbar-tag-face
+				     (1+ level)))
+	    (t (speedbar-message "speedbar-insert-generic-list: malformed list!")
+	       ))
+      (setq lst (cdr lst)))))
+
+(defun speedbar-insert-imenu-list (indent lst)
+  "At level INDENT, insert the imenu generated LST."
+  (speedbar-insert-generic-list indent lst
+				'speedbar-tag-expand
+				'speedbar-tag-find))
+				
+(defun speedbar-insert-etags-list (indent lst)
+  "At level INDENT, insert the etags generated LST."
+  (speedbar-insert-generic-list indent lst
+				'speedbar-tag-expand
+				'speedbar-tag-find))
+
+;;; Timed functions
+;;
+(defun speedbar-update-contents ()
+  "Generically update the contents of the speedbar buffer."
+  (interactive)
+  ;; Set the current special buffer
+  (setq speedbar-desired-buffer nil)
+
+  ;; Check for special modes
+  (speedbar-maybe-add-localized-support (current-buffer))
+
+  ;; Choose the correct method of doodling.
+  (if (and speedbar-mode-specific-contents-flag
+	   (consp speedbar-special-mode-expansion-list)
+	   (local-variable-p
+	    'speedbar-special-mode-expansion-list
+	    (current-buffer)))
+      ;;(eq (get major-mode 'mode-class 'special)))
+      (speedbar-update-special-contents)
+    (speedbar-update-directory-contents)))
+
+(defun speedbar-update-localized-contents ()
+  "Update the contents of the speedbar buffer for the current situation."
+  ;; Due to the historical growth of speedbar, we need to do something
+  ;; special for "files" mode.  Too bad.
+  (let ((name speedbar-initial-expansion-list-name)
+	(funclst (speedbar-initial-expansion-list))
+	)
+    (if (string= name "files")
+	;; Do all the files type work.  It still goes through the
+	;; expansion list stuff. :(
+	(if (or (member (expand-file-name default-directory)
+			speedbar-shown-directories)
+		(and speedbar-ignored-directory-regexp
+		     (string-match
+		      speedbar-ignored-directory-regexp
+		      (expand-file-name default-directory))))
+	    nil
+	  (if (<= 1 speedbar-verbosity-level)
+	      (speedbar-message "Updating speedbar to: %s..."
+				default-directory))
+	  (speedbar-update-directory-contents)
+	  (if (<= 1 speedbar-verbosity-level)
+	      (progn
+		(speedbar-message "Updating speedbar to: %s...done"
+				  default-directory)
+		(speedbar-message nil))))
+      ;; Else, we can do a short cut.  No text cache.
+      (let ((cbd (expand-file-name default-directory)))
+	(set-buffer speedbar-buffer)
+	(speedbar-with-writable
+	  (let* ((window (get-buffer-window speedbar-buffer 0))
+		 (p (window-point window))
+		 (start (window-start window)))
+	    (erase-buffer)
+	    (dolist (func funclst)
+	      (setq default-directory cbd)
+	      (funcall func cbd 0))
+	    (speedbar-reconfigure-keymaps)
+	    (set-window-point window p)
+	    (set-window-start window start)))))))
+
+(defun speedbar-update-directory-contents ()
+  "Update the contents of the speedbar buffer based on the current directory."
+
+  (save-excursion
+
+    (let ((cbd (expand-file-name default-directory))
+	  cbd-parent
+	  (funclst (speedbar-initial-expansion-list))
+	  (cache speedbar-full-text-cache)
+	  ;; disable stealth during update
+	  (speedbar-stealthy-function-list nil)
+	  (use-cache nil)
+	  (expand-local nil)
+	  ;; Because there is a bug I can't find just yet
+	  (inhibit-quit nil))
+      (set-buffer speedbar-buffer)
+      ;; If we are updating contents to where we are, then this is
+      ;; really a request to update existing contents, so we must be
+      ;; careful with our text cache!
+      (if (member cbd speedbar-shown-directories)
+	  (progn
+	    (setq cache nil)
+	    ;; If the current directory is not the last element in the dir
+	    ;; list, then we ALSO need to zap the list of expanded directories
+	    (if (/= (length (member cbd speedbar-shown-directories)) 1)
+		(setq speedbar-shown-directories (list cbd))))
+
+	;; Build cbd-parent, and see if THAT is in the current shown
+	;; directories.  First, go through pains to get the parent directory
+	(if (and speedbar-smart-directory-expand-flag
+		 (save-match-data
+		   (setq cbd-parent cbd)
+		   (if (string-match "[/\\]$" cbd-parent)
+		       (setq cbd-parent (substring cbd-parent 0
+						   (match-beginning 0))))
+		   (setq cbd-parent (file-name-directory cbd-parent)))
+		 (member cbd-parent speedbar-shown-directories))
+	    (setq expand-local t)
+
+	  ;; If this directory is NOT in the current list of available
+	  ;; directorys, then use the cache, and set the cache to our new
+	  ;; value.  Make sure to unhighlight the current file, or if we
+	  ;; come back to this directory, it might be a different file
+	  ;; and then we get a mess!
+	  (if (> (point-max) 1)
+	      (progn
+		(speedbar-clear-current-file)
+		(setq speedbar-full-text-cache
+		      (cons speedbar-shown-directories (buffer-string)))))
+
+	  ;; Check if our new directory is in the list of directories
+	  ;; shown in the text-cache
+	  (if (member cbd (car cache))
+	      (setq speedbar-shown-directories (car cache)
+		    use-cache t)
+	    ;; default the shown directories to this list...
+	    (setq speedbar-shown-directories (list cbd)))
+	  ))
+      (if (not expand-local) (setq speedbar-last-selected-file nil))
+      (speedbar-with-writable
+	(if (and expand-local
+		 ;; Find this directory as a speedbar node.
+		 (speedbar-directory-line cbd))
+	    ;; Open it.
+	    (speedbar-expand-line)
+	  (let* ((window (get-buffer-window speedbar-buffer 0))
+		 (p (window-point window))
+		 (start (window-start window)))
+	    (erase-buffer)
+	    (cond (use-cache
+		   (setq default-directory
+			 (nth (1- (length speedbar-shown-directories))
+			      speedbar-shown-directories))
+		   (insert (cdr cache)))
+		  (t
+		   (dolist (func funclst)
+		     (setq default-directory cbd)
+	    (funcall func cbd 0))))
+	    (set-window-point window p)
+	    (set-window-start window start))))))
+  (speedbar-reconfigure-keymaps))
+
+(defun speedbar-update-special-contents ()
+  "Use the mode-specific variable to fill in the speedbar buffer.
+This should only be used by modes classified as special."
+  (let ((funclst speedbar-special-mode-expansion-list)
+	(specialbuff (current-buffer)))
+    (save-excursion
+      (setq speedbar-desired-buffer specialbuff)
+      (set-buffer speedbar-buffer)
+      ;; If we are leaving a directory, cache it.
+      (if (not speedbar-shown-directories)
+	  ;; Do nothing
+	  nil
+	;; Clean up directory maintenance stuff
+	(speedbar-clear-current-file)
+	(setq speedbar-full-text-cache
+	      (cons speedbar-shown-directories (buffer-string))
+	      speedbar-shown-directories nil))
+      ;; Now fill in the buffer with our newly found specialized list.
+      (speedbar-with-writable
+	  (dolist (func funclst)
+	    ;; We do not erase the buffer because these functions may
+	    ;; decide NOT to update themselves.
+	    (funcall func specialbuff)))))
+  (speedbar-reconfigure-keymaps))
+
+(defun speedbar-set-timer (timeout)
+  "Set up the speedbar timer with TIMEOUT.
+Uses `dframe-set-timer'.
+Also resets scanner functions."
+  (dframe-set-timer timeout 'speedbar-timer-fn 'speedbar-update-flag)
+  ;; Apply a revert hook that will reset the scanners.  We attach to revert
+  ;; because most reverts occur during VC state change, and this lets our
+  ;; VC scanner fix itself.
+  (if timeout
+      (add-hook 'after-revert-hook 'speedbar-reset-scanners)
+    (remove-hook 'after-revert-hook 'speedbar-reset-scanners))
+  ;; change this if it changed for some reason
+  (speedbar-set-mode-line-format))
+
+(defun speedbar-timer-fn ()
+  "Run whenever Emacs is idle to update the speedbar item."
+  (if (or (not (speedbar-current-frame))
+	  (not (frame-live-p (speedbar-current-frame))))
+      (speedbar-set-timer nil)
+    ;; Save all the match data so that we don't mess up executing fns
+    (save-match-data
+      ;; Only do stuff if the frame is visible, not an icon, and if
+      ;; it is currently flagged to do something.
+      (if (and speedbar-update-flag
+	       (speedbar-current-frame)
+	       (frame-visible-p (speedbar-current-frame))
+	       (not (eq (frame-visible-p (speedbar-current-frame)) 'icon)))
+	  (let ((af (selected-frame)))
+	    (save-window-excursion
+	      (dframe-select-attached-frame speedbar-frame)
+	      ;; make sure we at least choose a window to
+	      ;; get a good directory from
+	      (if (window-minibuffer-p (selected-window))
+		  nil
+		;; Check for special modes
+		(speedbar-maybe-add-localized-support (current-buffer))
+		;; Update for special mode all the time!
+		(if (and speedbar-mode-specific-contents-flag
+			 (consp speedbar-special-mode-expansion-list)
+			 (local-variable-p
+			  'speedbar-special-mode-expansion-list
+			  (current-buffer)))
+		    ;;(eq (get major-mode 'mode-class 'special)))
+		    (progn
+		      (if (<= 2 speedbar-verbosity-level)
+			  (speedbar-message
+			   "Updating speedbar to special mode: %s..."
+			   major-mode))
+		      (speedbar-update-special-contents)
+		      (if (<= 2 speedbar-verbosity-level)
+			  (progn
+			    (speedbar-message
+			     "Updating speedbar to special mode: %s...done"
+			     major-mode)
+			    (speedbar-message nil))))
+
+ 		  ;; Update all the contents if directories change!
+ 		  (unless (and (or (member major-mode speedbar-ignored-modes)
+				   (eq af (speedbar-current-frame))
+				   (not (buffer-file-name)))
+			       ;; Always update for GUD.
+			       (not (string-equal "GUD"
+				     speedbar-initial-expansion-list-name)))
+		    (speedbar-update-localized-contents)))
+		(select-frame af)))
+	    ;; Now run stealthy updates of time-consuming items
+	    (speedbar-stealthy-updates)))))
+  (run-hooks 'speedbar-timer-hook))
+
+
+;;; Stealthy activities
+;;
+(defvar speedbar-stealthy-update-recurse nil
+  "Recursion avoidance variable for stealthy update.")
+
+(defun speedbar-stealthy-updates ()
+  "For a given speedbar, run all items in the stealthy function list.
+Each item returns t if it completes successfully, or nil if
+interrupted by the user."
+  (if (not speedbar-stealthy-update-recurse)
+      (let ((l (speedbar-initial-stealthy-functions))
+	    (speedbar-stealthy-update-recurse t))
+	(unwind-protect
+	    (speedbar-with-writable
+	      (while (and l (funcall (car l)))
+		;;(sit-for 0)
+		(setq l (cdr l))))
+	  ;;(speedbar-message "Exit with %S" (car l))
+	  ))))
+
+(defun speedbar-reset-scanners ()
+  "Reset any variables used by functions in the stealthy list as state.
+If new functions are added, their state needs to be updated here."
+  (setq speedbar-vc-to-do-point t
+	speedbar-obj-to-do-point t
+	speedbar-ro-to-do-point t)
+  (run-hooks 'speedbar-scanner-reset-hook)
+  )
+
+(defun speedbar-find-selected-file (file)
+  "Go to the line where FILE is."
+
+  (set-buffer speedbar-buffer)
+  
+  (goto-char (point-min))
+  (let ((m nil))
+    (while (and (setq m (re-search-forward
+			 (concat " \\(" (regexp-quote (file-name-nondirectory file))
+				 "\\)\\(" speedbar-indicator-regex "\\)?\n")
+			 nil t))
+		(not (string= file
+			      (concat
+			       (speedbar-line-directory
+				(save-excursion
+				  (goto-char (match-beginning 0))
+				  (beginning-of-line)
+				  (save-match-data
+				    (looking-at "[0-9]+:")
+				    (string-to-number (match-string 0)))))
+			       (match-string 1))))))
+    (if m
+	(progn
+	  (goto-char (match-beginning 1))
+	  (match-string 1)))))
+
+(defun speedbar-clear-current-file ()
+  "Locate the file thought to be current, and remove its highlighting."
+  (save-excursion
+    ;;(set-buffer speedbar-buffer)
+    (if speedbar-last-selected-file
+	(speedbar-with-writable
+	  (if (speedbar-find-selected-file speedbar-last-selected-file)
+	      (put-text-property (match-beginning 1)
+				 (match-end 1)
+				 'face
+				 'speedbar-file-face))))))
+
+(defun speedbar-update-current-file ()
+  "Find the current file, and update our visuals to indicate its name.
+This is specific to file names.  If the file name doesn't show up, but
+it should be in the list, then the directory cache needs to be
+updated."
+  (let* ((lastf (selected-frame))
+	 (newcfd (save-excursion
+		   (dframe-select-attached-frame speedbar-frame)
+		   (let ((rf (if (buffer-file-name)
+				 (buffer-file-name)
+			       nil)))
+		     (select-frame lastf)
+		     rf)))
+	 (newcf (if newcfd newcfd))
+	 (lastb (current-buffer))
+	 (sucf-recursive (boundp 'sucf-recursive))
+	 (case-fold-search t))
+    (if (and newcf
+	     ;; check here, that way we won't refresh to newcf until
+	     ;; its been written, thus saving ourselves some time
+	     (file-exists-p newcf)
+	     (not (string= newcf speedbar-last-selected-file)))
+	(progn
+	  ;; It is important to select the frame, otherwise the window
+	  ;; we want the cursor to move in will not be updated by the
+	  ;; search-forward command.
+	  (let ((current-frame (speedbar-current-frame)))
+	    (when current-frame (select-frame current-frame)))
+	  ;; Remove the old file...
+	  (speedbar-clear-current-file)
+	  ;; now highlight the new one.
+	  ;; (set-buffer speedbar-buffer)
+	  (speedbar-with-writable
+	    (if (speedbar-find-selected-file newcf)
+		;; put the property on it
+		(put-text-property (match-beginning 1)
+				   (match-end 1)
+				   'face
+				   'speedbar-selected-face)
+	      ;; Oops, it's not in the list.  Should it be?
+	      (if (and (string-match speedbar-file-regexp newcf)
+		       (string= (file-name-directory newcfd)
+				(expand-file-name default-directory)))
+		  ;; yes, it is (we will ignore unknowns for now...)
+		  (progn
+		    (speedbar-refresh)
+		    (if (speedbar-find-selected-file newcf)
+			;; put the property on it
+			(put-text-property (match-beginning 1)
+					   (match-end 1)
+					   'face
+					   'speedbar-selected-face)))
+		;; if it's not in there now, whatever...
+		))
+	    (setq speedbar-last-selected-file newcf))
+	  (if (not sucf-recursive)
+	      (progn
+
+                ;;Sat Dec 15 2001 12:40 AM (burton@openprivacy.org): this
+                ;;doesn't need to be in.  We don't want to recenter when we are
+                ;;updating files.
+
+                ;;(speedbar-center-buffer-smartly)
+
+		(speedbar-position-cursor-on-line)
+		))
+	  (set-buffer lastb)
+	  (select-frame lastf)
+	  )))
+  ;; return that we are done with this activity.
+  t)
+
+(defun speedbar-add-indicator (indicator-string &optional replace-this)
+  "Add INDICATOR-STRING to the end of this speedbar line.
+If INDICATOR-STRING is space, and REPLACE-THIS is a character, then
+the existing indicator is removed.  If there is already an
+indicator, then do not add a space."
+  (beginning-of-line)
+  ;; The nature of the beast: Assume we are in "the right place"
+  (end-of-line)
+  (skip-chars-backward (concat " " speedbar-vc-indicator
+			       speedbar-object-read-only-indicator
+			       (car speedbar-obj-indicator)
+			       (cdr speedbar-obj-indicator)))
+  (if (and (not (looking-at speedbar-indicator-regex))
+	   (not (string= indicator-string " ")))
+      (insert speedbar-indicator-separator))
+  (speedbar-with-writable
+    (save-excursion
+      (if (and replace-this
+	       (re-search-forward replace-this (save-excursion (end-of-line)
+							       (point))
+				  t))
+	  (delete-region (match-beginning 0) (match-end 0))))
+    (end-of-line)
+    (if (not (string= " " indicator-string))
+	(let ((start (point)))
+	  (insert indicator-string)
+	  (speedbar-insert-image-button-maybe start (length indicator-string))
+	  ))))
+
+(defun speedbar-check-read-only ()
+  "Scan all the files in a directory, and for each see if it is read only."
+  ;; Check for to-do to be reset.  If reset but no RCS is available
+  ;; then set to nil (do nothing) otherwise, start at the beginning
+  (save-excursion
+    (if speedbar-buffer (set-buffer speedbar-buffer))
+    (if (eq speedbar-ro-to-do-point t)
+	(setq speedbar-ro-to-do-point 0))
+    (if (numberp speedbar-ro-to-do-point)
+	(progn
+	  (goto-char speedbar-ro-to-do-point)
+	  (while (and (not (input-pending-p))
+		      (re-search-forward "^\\([0-9]+\\):\\s-*[[<][+-\?][]>] "
+					 nil t))
+	    (setq speedbar-ro-to-do-point (point))
+	    (let ((f (speedbar-line-file)))
+	      (if f
+		  (if (not (file-writable-p f))
+		      (speedbar-add-indicator
+		       speedbar-object-read-only-indicator
+		       (regexp-quote speedbar-object-read-only-indicator))
+		    (speedbar-add-indicator
+		     " " (regexp-quote
+			  speedbar-object-read-only-indicator))))))
+	  (if (input-pending-p)
+	      ;; return that we are incomplete
+	      nil
+	    ;; we are done, set to-do to nil
+	    (setq speedbar-ro-to-do-point nil)
+	    ;; and return t
+	    t))
+      t)))
+
+;; Load efs/ange-ftp only if compiling to remove byte-compiler warnings.
+;; Steven L Baur <steve@xemacs.org> said this was important:
+(eval-when-compile (or (featurep 'xemacs)
+		       (condition-case () (require 'efs)
+			 (error (require 'ange-ftp)))))
+
+(defun speedbar-check-vc ()
+  "Scan all files in a directory, and for each see if it's checked out.
+See `speedbar-this-file-in-vc' and `speedbar-vc-check-dir-p' for how
+to add more types of version control systems."
+  ;; Check for to-do to be reset.  If reset but no RCS is available
+  ;; then set to nil (do nothing) otherwise, start at the beginning
+  (save-excursion
+    (if speedbar-buffer (set-buffer speedbar-buffer))
+    (if (and speedbar-vc-do-check (eq speedbar-vc-to-do-point t)
+	     (speedbar-vc-check-dir-p default-directory)
+	     (not (or (and (featurep 'ange-ftp)
+			   (string-match
+			    (car (symbol-value
+				  (if dframe-xemacsp
+				      'ange-ftp-directory-format
+				    'ange-ftp-name-format)))
+			    (expand-file-name default-directory)))
+		      ;; efs support: Bob Weiner
+		      (and (featurep 'efs)
+			   (string-match
+			    (let ((reg (symbol-value 'efs-directory-regexp)))
+			      (if (stringp reg)
+				  reg
+				(car reg)))
+			    (expand-file-name default-directory))))))
+	(setq speedbar-vc-to-do-point 0))
+    (if (numberp speedbar-vc-to-do-point)
+	(progn
+	  (goto-char speedbar-vc-to-do-point)
+	  (while (and (not (input-pending-p))
+		      (re-search-forward "^\\([0-9]+\\):\\s-*\\[[+-?]\\] "
+					 nil t))
+	    (setq speedbar-vc-to-do-point (point))
+	    (if (speedbar-check-vc-this-line (match-string 1))
+		(speedbar-add-indicator speedbar-vc-indicator
+					(regexp-quote speedbar-vc-indicator))
+	      (speedbar-add-indicator " "
+				      (regexp-quote speedbar-vc-indicator))))
+	  (if (input-pending-p)
+	      ;; return that we are incomplete
+	      nil
+	    ;; we are done, set to-do to nil
+	    (setq speedbar-vc-to-do-point nil)
+	    ;; and return t
+	    t))
+      t)))
+
+(defun speedbar-check-vc-this-line (depth)
+  "Return t if the file on this line is check of of a version control system.
+Parameter DEPTH is a string with the current depth of indentation of
+the file being checked."
+  (let* ((d (string-to-int depth))
+	 (f (speedbar-line-directory d))
+	 (fn (buffer-substring-no-properties
+	      ;; Skip-chars: thanks ptype@dra.hmg.gb
+	      (point) (progn
+			(skip-chars-forward "^ "
+					    (save-excursion (end-of-line)
+							    (point)))
+			(point))))
+	 (fulln (concat f fn)))
+    (if (<= 2 speedbar-verbosity-level)
+	(speedbar-message "Speedbar vc check...%s" fulln))
+    (and (file-writable-p fulln)
+	 (speedbar-this-file-in-vc f fn))))
+
+(defun speedbar-vc-check-dir-p (directory)
+  "Return t if we should bother checking DIRECTORY for version control files.
+This can be overloaded to add new types of version control systems."
+  (or
+   ;; Local CVS available in Emacs 21
+   (and (fboundp 'vc-state)
+	(file-exists-p (concat directory "CVS/")))
+   ;; Local RCS
+   (file-exists-p (concat directory "RCS/"))
+   ;; Local SCCS
+   (file-exists-p (concat directory "SCCS/"))
+   ;; Remote SCCS project
+   (let ((proj-dir (getenv "PROJECTDIR")))
+     (if proj-dir
+	 (file-exists-p (concat proj-dir "/SCCS"))
+       nil))
+   ;; User extension
+   (run-hook-with-args-until-success 'speedbar-vc-directory-enable-hook
+                                     directory)
+   ))
+
+(defun speedbar-this-file-in-vc (directory name)
+  "Check to see if the file in DIRECTORY with NAME is in a version control system.
+You can add new VC systems by overriding this function.  You can
+optimize this function by overriding it and only doing those checks
+that will occur on your system."
+  (or
+   (if (fboundp 'vc-state)
+       ;; Emacs 21 handles VC state in a nice way.
+       (condition-case nil
+	   (let ((state  (vc-state (concat directory name))))
+	     (not (or (eq 'up-to-date state)
+		      (null state))))
+	 ;; An error means not in a VC system
+	 (error nil))
+     (or
+      ;; RCS file name
+      (file-exists-p (concat directory "RCS/" name ",v"))
+      (file-exists-p (concat directory "RCS/" name))
+      ;; Local SCCS file name
+      (file-exists-p (concat directory "SCCS/s." name))
+      ;; Remote SCCS file name
+      (let ((proj-dir (getenv "PROJECTDIR")))
+	(if proj-dir
+	    (file-exists-p (concat proj-dir "/SCCS/s." name))
+	  nil))))
+   ;; User extension
+   (run-hook-with-args 'speedbar-vc-in-control-hook directory name)
+   ))
+
+;; Objet File scanning
+(defun speedbar-check-objects ()
+  "Scan all files in a directory, and for each see if there is an object.
+See `speedbar-check-obj-this-line' and `speedbar-obj-alist' for how
+to add more object types."
+  ;; Check for to-do to be reset.  If reset but no RCS is available
+  ;; then set to nil (do nothing) otherwise, start at the beginning
+  (save-excursion
+    (if speedbar-buffer (set-buffer speedbar-buffer))
+    (if (and speedbar-obj-do-check (eq speedbar-obj-to-do-point t))
+	(setq speedbar-obj-to-do-point 0))
+    (if (numberp speedbar-obj-to-do-point)
+	(progn
+	  (goto-char speedbar-obj-to-do-point)
+	  (while (and (not (input-pending-p))
+		      (re-search-forward "^\\([0-9]+\\):\\s-*\\[[+-]\\] "
+					 nil t))
+	    (setq speedbar-obj-to-do-point (point))
+	    (let ((ind (speedbar-check-obj-this-line (match-string 1))))
+	      (if (not ind) (setq ind " "))
+	      (speedbar-add-indicator ind (concat
+					   (car speedbar-obj-indicator)
+					   "\\|"
+					   (cdr speedbar-obj-indicator)))))
+	  (if (input-pending-p)
+	      ;; return that we are incomplete
+	      nil
+	    ;; we are done, set to-do to nil
+	    (setq speedbar-obj-to-do-point nil)
+	    ;; and return t
+	    t))
+      t)))
+
+(defun speedbar-check-obj-this-line (depth)
+  "Return t if the file on this line has an associated object.
+Parameter DEPTH is a string with the current depth of indentation of
+the file being checked."
+  (let* ((d (string-to-int depth))
+	 (f (speedbar-line-directory d))
+	 (fn (buffer-substring-no-properties
+	      ;; Skip-chars: thanks ptype@dra.hmg.gb
+	      (point) (progn
+			(skip-chars-forward "^ "
+					    (save-excursion (end-of-line)
+							    (point)))
+			(point))))
+	 (fulln (concat f fn)))
+    (if (<= 2 speedbar-verbosity-level)
+	(speedbar-message "Speedbar obj check...%s" fulln))
+    (let ((oa speedbar-obj-alist))
+      (while (and oa (not (string-match (car (car oa)) fulln)))
+	(setq oa (cdr oa)))
+      (if (not (and oa (file-exists-p (concat (file-name-sans-extension fulln)
+					      (cdr (car oa))))))
+	  nil
+	;; Find out if the object is out of date or not.
+	(let ((date1 (nth 5 (file-attributes fulln)))
+	      (date2 (nth 5 (file-attributes (concat
+					      (file-name-sans-extension fulln)
+                                              (cdr (car oa)))))))
+	  (if (or (< (car date1) (car date2))
+		  (and (= (car date1) (car date2))
+		       (< (nth 1 date1) (nth 1 date2))))
+	      (car speedbar-obj-indicator)
+	    (cdr speedbar-obj-indicator)))))))
+
+;;; Clicking Activity
+;;
+(defun speedbar-position-cursor-on-line ()
+  "Position the cursor on a line."
+  (let ((oldpos (point)))
+    (beginning-of-line)
+    (if (looking-at "[0-9]+:\\s-*..?.? ")
+	(goto-char (1- (match-end 0)))
+      (goto-char oldpos))))
+
+(defun speedbar-click (e)
+  "Activate any speedbar buttons where the mouse is clicked.
+This must be bound to a mouse event.  A button is any location of text
+with a mouse face that has a text property called `speedbar-function'.
+Argument E is the click event."
+  ;; Backward compatibility let statement.
+  (let ((speedbar-power-click dframe-power-click))
+    (speedbar-do-function-pointer))
+  (dframe-quick-mouse e))
+
+(defun speedbar-do-function-pointer ()
+  "Look under the cursor and examine the text properties.
+From this extract the file/tag name, token, indentation level and call
+a function if appropriate."
+  (let* ((speedbar-frame (speedbar-current-frame))
+	 (fn (get-text-property (point) 'speedbar-function))
+	 (tok (get-text-property (point) 'speedbar-token))
+	 ;; The 1-,+ is safe because scaning starts AFTER the point
+	 ;; specified.  This lets the search include the character the
+	 ;; cursor is on.
+	 (tp (previous-single-property-change
+	      (1+ (point)) 'speedbar-function))
+	 (np (next-single-property-change
+	      (point) 'speedbar-function))
+	 (txt (buffer-substring-no-properties (or tp (point-min))
+					      (or np (point-max))))
+	 (dent (save-excursion (beginning-of-line)
+			       (string-to-number
+				(if (looking-at "[0-9]+")
+				    (buffer-substring-no-properties
+				    (match-beginning 0) (match-end 0))
+				  "0")))))
+    ;;(speedbar-message "%S:%S:%S:%s" fn tok txt dent)
+    (and fn (funcall fn txt tok dent)))
+  (speedbar-position-cursor-on-line))
+
+;;; Reading info from the speedbar buffer
+;;
+(defun speedbar-line-text (&optional p)
+  "Retrieve the text after prefix junk for the current line.
+Optional argument P is where to start the search from."
+  (save-excursion
+    (if p (goto-char p))
+    (beginning-of-line)
+    (if (looking-at (concat
+		     "\\([0-9]+\\): *[[<{]?[-+?= ][]>}@()|] \\([^ \n]+\\)"))
+	(get-text-property (match-beginning 2) 'speedbar-text)
+      nil)))
+
+(defun speedbar-line-token (&optional p)
+  "Retrieve the token information after the prefix junk for the current line.
+Optional argument P is where to start the search from."
+  (save-excursion
+    (if p (goto-char p))
+    (beginning-of-line)
+    (if (looking-at (concat
+		     "\\([0-9]+\\): *[[<{]?[-+?= ][]>}@()|] \\([^ \n]+\\)\\("
+		     speedbar-indicator-regex "\\)?"))
+	(progn
+	  (goto-char (match-beginning 2))
+	  (get-text-property (point) 'speedbar-token))
+      nil)))
+
+(defun speedbar-line-file (&optional p)
+  "Retrieve the file or whatever from the line at point P.
+The return value is a string representing the file.  If it is a
+directory, then it is the directory name."
+  (save-match-data
+    (save-restriction
+      (widen)
+      (let ((f (speedbar-line-text p)))
+	(if f
+	    (let* ((depth (string-to-int (match-string 1)))
+		   (directory (speedbar-line-directory depth)))
+	      (cond ((and (file-directory-p directory)
+			  (file-exists-p (concat directory f)))
+		     ;; if directory is a directory, and adding
+		     ;; f to it makes it a file.
+		     (concat directory f))
+		    ((and (not (file-directory-p directory))
+			  (file-exists-p directory))
+		     ;; if directory isn't a directory, but it
+		     ;; does exist, then it is our file.
+		     directory)
+		    (t nil)))
+	  nil)))))
+
+(defun speedbar-goto-this-file (file)
+  "If FILE is displayed, go to this line and return t.
+Otherwise do not move and return nil."
+  (let ((directory (substring (file-name-directory (expand-file-name file))
+			 (length (expand-file-name default-directory))))
+	(dest (point)))
+    (save-match-data
+      (goto-char (point-min))
+      ;; scan all the directories
+      (while (and directory (not (eq directory t)))
+	(if (string-match "^[/\\]?\\([^/\\]+\\)" directory)
+	    (let ((pp (match-string 1 directory)))
+	      (if (save-match-data
+		    (re-search-forward (concat "> " (regexp-quote pp) "$")
+				       nil t))
+		  (setq directory (substring directory (match-end 1)))
+		(setq directory nil)))
+	  (setq directory t)))
+      ;; find the file part
+      (if (or (not directory) (string= (file-name-nondirectory file) ""))
+	  ;; only had a dir part
+	  (if directory
+	      (progn
+		(speedbar-position-cursor-on-line)
+		t)
+	    (goto-char dest) nil)
+	;; find the file part
+	(let ((nd (file-name-nondirectory file)))
+	  (if (re-search-forward
+	       (concat "] \\(" (regexp-quote nd)
+		       "\\)\\(" speedbar-indicator-regex "\\)$")
+	       nil t)
+	      (progn
+		(speedbar-position-cursor-on-line)
+		t)
+	    (goto-char dest)
+	    nil))))))
+
+(defun speedbar-line-directory (&optional depth)
+  "Retrieve the directory name associated with the current line.
+This may require traversing backwards from DEPTH and combining the default
+directory with these items.  This function is replaceable in
+`speedbar-mode-functions-list' as `speedbar-line-directory'."
+  (save-restriction
+    (widen)
+    (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-directory)))
+      (if rf (funcall rf depth) default-directory))))
+      
+(defun speedbar-files-line-directory (&optional depth)
+  "Retrieve the directoryname associated with the current line.
+This may require traversing backwards from DEPTH and combining the default
+directory with these items."
+  (save-excursion
+    (save-match-data
+      (if (not depth)
+	  (progn
+	    (beginning-of-line)
+	    (looking-at "^\\([0-9]+\\):")
+	    (setq depth (string-to-int (match-string 1)))))
+      (let ((directory nil))
+	(setq depth (1- depth))
+	(while (/= depth -1)
+	  (if (not (re-search-backward (format "^%d:" depth) nil t))
+	      (error "Error building filename of tag")
+	    (cond ((looking-at "[0-9]+:\\s-*<->\\s-+\\([^\n]+\\)")
+		   (setq directory (concat (speedbar-line-text)
+				      "/"
+				      directory)))
+		  ((looking-at "[0-9]+:\\s-*[-]\\s-+\\([^\n]+\\)")
+		   ;; This is the start of our directory.
+		   (setq directory (speedbar-line-text)))))
+	  (setq depth (1- depth)))
+	(if (and directory
+		 (string-match (concat speedbar-indicator-regex "$")
+			       directory))
+	    (setq directory (substring directory 0 (match-beginning 0))))
+	(concat default-directory directory)))))
+
+(defun speedbar-directory-line (directory)
+  "Position the cursor on the line specified by DIRECTORY."
+  (save-match-data
+    (if (string-match "[/\\]$" directory)
+	(setq directory (substring directory 0 (match-beginning 0))))
+    (let ((nomatch t) (depth 0)
+	  (fname (file-name-nondirectory directory))
+	  (pname (file-name-directory directory)))
+      (if (not (member pname speedbar-shown-directories))
+	  (error "Internal Error: File %s not shown in speedbar" directory))
+      (goto-char (point-min))
+      (while (and nomatch
+		  (re-search-forward
+		   (concat "[]>] \\(" (regexp-quote fname)
+			   "\\)\\(" speedbar-indicator-regex "\\)?$")
+		   nil t))
+	(beginning-of-line)
+	(looking-at "\\([0-9]+\\):")
+	(setq depth (string-to-int (match-string 0))
+	      nomatch (not (string= pname (speedbar-line-directory depth))))
+	(end-of-line))
+      (beginning-of-line)
+      (not nomatch))))
+
+(defun speedbar-edit-line ()
+  "Edit whatever tag or file is on the current speedbar line."
+  (interactive)
+  (or (save-excursion
+	(beginning-of-line)
+	;; If this fails, then it is a non-standard click, and as such,
+	;; perfectly allowed.
+	(if (re-search-forward "[]>?}] [^ ]"
+			       (save-excursion (end-of-line) (point))
+			       t)
+	    (progn
+	      (forward-char -1)
+	      (speedbar-do-function-pointer))
+	  nil))
+      (speedbar-do-function-pointer)))
+
+(defun speedbar-expand-line (&optional arg)
+  "Expand the line under the cursor.
+With universal argument ARG, flush cached data."
+  (interactive "P")
+  (beginning-of-line)
+  (let* ((dframe-power-click arg)
+	 (speedbar-power-click arg))
+    (condition-case nil
+	(progn
+	  (re-search-forward ":\\s-*.\\+. "
+			     (save-excursion (end-of-line) (point)))
+	  (forward-char -2)
+	  (speedbar-do-function-pointer))
+      (error (speedbar-position-cursor-on-line)))))
+  
+(defun speedbar-flush-expand-line ()
+  "Expand the line under the cursor and flush any cached information."
+  (interactive)
+  (speedbar-expand-line 1))
+  
+(defun speedbar-contract-line ()
+  "Contract the line under the cursor."
+  (interactive)
+  (beginning-of-line)
+  (condition-case nil
+      (progn
+	(re-search-forward ":\\s-*.-. "
+			   (save-excursion (end-of-line) (point)))
+	(forward-char -2)
+	(speedbar-do-function-pointer))
+    (error (speedbar-position-cursor-on-line))))
+
+(defun speedbar-toggle-line-expansion ()
+  "Contract or expand the line under the cursor."
+  (interactive)
+  (beginning-of-line)
+  (condition-case nil
+      (progn
+	(re-search-forward ":\\s-*.[-+]. "
+			   (save-excursion (end-of-line) (point)))
+	(forward-char -2)
+	(speedbar-do-function-pointer))
+    (error (speedbar-position-cursor-on-line))))
+
+(defun speedbar-expand-line-descendants (&optional arg)
+  "Expand the line under the cursor and all descendants.
+Optional argument ARG indicates that any cache should be flushed."
+  (interactive "P")
+  (speedbar-expand-line arg)
+  ;; Now, inside the area expaded here, expand all subnodes of
+  ;; the same descendant type.
+  (save-excursion
+    (speedbar-next 1) ;; Move into the list.
+    (let ((err nil))
+      (while (not err)
+	(condition-case nil
+	    (progn
+	      (speedbar-expand-line-descendants arg)
+	      (speedbar-restricted-next 1))
+	  (error (setq err t))))))
+  )
+
+(defun speedbar-contract-line-descendants ()
+  "Expand the line under the cursor and all descendants."
+  (interactive)
+  (speedbar-contract-line)
+  ;; Don't need to do anything else since all descendants are
+  ;; hidden by default anyway.  Yay!  It's easy.
+  )
+
+(defun speedbar-find-file (text token indent)
+  "Speedbar click handler for filenames.
+TEXT, the file will be displayed in the attached frame.
+TOKEN is unused, but required by the click handler.  INDENT is the
+current indentation level."
+  (let ((cdd (speedbar-line-directory indent)))
+    ;; Run before visiting file hook here.
+    (let ((f (selected-frame)))
+      (dframe-select-attached-frame speedbar-frame)
+      (run-hooks 'speedbar-before-visiting-file-hook)
+      (select-frame f))
+    (speedbar-find-file-in-frame (concat cdd text))
+    (speedbar-stealthy-updates)
+    (run-hooks 'speedbar-visiting-file-hook)
+    ;; Reset the timer with a new timeout when cliking a file
+    ;; in case the user was navigating directories, we can cancel
+    ;; that other timer.
+    (speedbar-set-timer dframe-update-speed))
+  (dframe-maybee-jump-to-attached-frame))
+
+(defun speedbar-dir-follow (text token indent)
+  "Speedbar click handler for directory names.
+Clicking a directory will cause the speedbar to list files in
+the subdirectory TEXT.  TOKEN is an unused requirement.  The
+subdirectory chosen will be at INDENT level."
+  (setq default-directory
+	(concat (expand-file-name (concat (speedbar-line-directory indent) text))
+		"/"))
+  ;; Because we leave speedbar as the current buffer,
+  ;; update contents will change directory without
+  ;; having to touch the attached frame.  Turn off smart expand just
+  ;; in case.
+  (let ((speedbar-smart-directory-expand-flag nil))
+    (speedbar-update-contents))
+  (speedbar-set-timer speedbar-navigating-speed)
+  (setq speedbar-last-selected-file nil)
+  (speedbar-stealthy-updates))
+
+(defun speedbar-delete-subblock (indent)
+  "Delete text from point to indentation level INDENT or greater.
+Handles end-of-sublist smartly."
+  (speedbar-with-writable
+    (save-excursion
+      (end-of-line) (forward-char 1)
+      (let ((start (point)))
+	(while (and (looking-at "^\\([0-9]+\\):")
+		    (> (string-to-int (match-string 1)) indent)
+		    (not (eobp)))
+	  (forward-line 1)
+	  (beginning-of-line))
+	(delete-region start (point))))))
+
+(defun speedbar-dired (text token indent)
+  "Speedbar click handler for directory expand button.
+Clicking this button expands or contracts a directory.  TEXT is the
+button clicked which has either a + or -.  TOKEN is the directory to be
+expanded.  INDENT is the current indentation level."
+  (cond ((string-match "+" text)	;we have to expand this dir
+	 (setq speedbar-shown-directories
+	       (cons (expand-file-name
+		      (concat (speedbar-line-directory indent) token "/"))
+		     speedbar-shown-directories))
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-reset-scanners)
+	 (save-excursion
+	   (end-of-line) (forward-char 1)
+	   (speedbar-with-writable
+	     (speedbar-default-directory-list
+	      (concat (speedbar-line-directory indent) token "/")
+	      (1+ indent)))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-reset-scanners)
+	 (let ((oldl speedbar-shown-directories)
+	       (newl nil)
+	       (td (expand-file-name
+		    (concat (speedbar-line-directory indent) token))))
+	   (while oldl
+	     (if (not (string-match (concat "^" (regexp-quote td)) (car oldl)))
+		 (setq newl (cons (car oldl) newl)))
+	     (setq oldl (cdr oldl)))
+	   (setq speedbar-shown-directories (nreverse newl)))
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent)
+	 )
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly)
+  (save-excursion (speedbar-stealthy-updates)))
+
+(defun speedbar-directory-buttons-follow (text token indent)
+  "Speedbar click handler for default directory buttons.
+TEXT is the button clicked on.  TOKEN is the directory to follow.
+INDENT is the current indentation level and is unused."
+  (if (string-match "^[A-z]:$" token)
+      (setq default-directory (concat token "/"))
+    (setq default-directory token))
+  ;; Because we leave speedbar as the current buffer,
+  ;; update contents will change directory without
+  ;; having to touch the attached frame.
+  (speedbar-update-contents)
+  (speedbar-set-timer speedbar-navigating-speed))
+
+(defun speedbar-tag-file (text token indent)
+  "The cursor is on a selected line.  Expand the tags in the specified file.
+The parameter TEXT and TOKEN are required, where TEXT is the button
+clicked, and TOKEN is the file to expand.  INDENT is the current
+indentation level."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (let* ((fn (expand-file-name (concat (speedbar-line-directory indent)
+					      token)))
+		(mode nil)
+		(lst (speedbar-fetch-dynamic-tags fn)))
+	   ;; if no list, then remove expando button
+	   (if (not lst)
+	       (speedbar-change-expand-button-char ??)
+	     (speedbar-change-expand-button-char ?-)
+	     (speedbar-with-writable
+	       (save-excursion
+		 (end-of-line) (forward-char 1)
+		 (funcall (car lst) indent (cdr lst)))))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+(defun speedbar-tag-find (text token indent)
+  "For the tag TEXT in a file TOKEN, go to that position.
+INDENT is the current indentation level."
+  (let ((file (speedbar-line-directory indent)))
+    (let ((f (selected-frame)))
+      (dframe-select-attached-frame speedbar-frame)
+      (run-hooks 'speedbar-before-visiting-tag-hook)
+      (select-frame f))
+    (speedbar-find-file-in-frame file)
+    (save-excursion (speedbar-stealthy-updates))
+    ;; Reset the timer with a new timeout when cliking a file
+    ;; in case the user was navigating directories, we can cancel
+    ;; that other timer.
+    (speedbar-set-timer dframe-update-speed)
+    (goto-char token)
+    (run-hooks 'speedbar-visiting-tag-hook)
+    (dframe-maybee-jump-to-attached-frame)
+    ))
+
+(defun speedbar-tag-expand (text token indent)
+  "Expand a tag sublist.  Imenu will return sub-lists of specialized tag types.
+Etags does not support this feature.  TEXT will be the button
+string.  TOKEN will be the list, and INDENT is the current indentation
+level."
+  (cond ((string-match "+" text)	;we have to expand this file
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+	     (speedbar-insert-generic-list indent token 'speedbar-tag-expand
+					   'speedbar-tag-find))))
+	((string-match "-" text)	;we have to contract this node
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+	(t (error "Ooops...  not sure what to do")))
+  (speedbar-center-buffer-smartly))
+
+;;; Loading files into the attached frame.
+;;
+(defcustom speedbar-select-frame-method 'attached
+  "*Specify how to select a frame for displaying a file.
+A value of 'attached means to use the attached frame (the frame
+that speedbar was started from.)  A number such as 1 or -1 means to
+pass that number to `other-frame' while selecting a frame from speedbar."
+  :group 'speedbar
+  :type 'sexp)
+
+(defun speedbar-find-file-in-frame (file)
+  "This will load FILE into the speedbar attached frame.
+If the file is being displayed in a different frame already, then raise that
+frame instead."
+  (let* ((buff (find-file-noselect file))
+	 (bwin (get-buffer-window buff 0)))
+    (if bwin
+	(progn
+	  (select-window bwin)
+	  (raise-frame (window-frame bwin)))
+      (if dframe-power-click
+	  (let ((pop-up-frames t)) (select-window (display-buffer buff)))
+	(if (numberp speedbar-select-frame-method)
+	    (other-frame speedbar-select-frame-method)
+	  (dframe-select-attached-frame speedbar-frame))
+	(switch-to-buffer buff))))
+ )
+
+;;; Centering Utility
+;;
+(defun speedbar-center-buffer-smartly ()
+  "Recenter a speedbar buffer so the current indentation level is all visible.
+This assumes that the cursor is on a file, or tag of a file which the user is
+interested in."
+
+  (save-selected-window
+  
+    (select-window (get-buffer-window speedbar-buffer t))
+    
+    (set-buffer speedbar-buffer)
+    
+    (if (<= (count-lines (point-min) (point-max))
+	    (1- (window-height (selected-window))))
+	;; whole buffer fits
+	(let ((cp (point)))
+
+	  (goto-char (point-min))
+	  (recenter 0)
+	  (goto-char cp))
+      ;; too big
+      (let (depth start end exp p)
+	(save-excursion
+	  (beginning-of-line)
+	  (setq depth (if (looking-at "[0-9]+")
+			  (string-to-int (buffer-substring-no-properties
+					  (match-beginning 0) (match-end 0)))
+			0))
+	  (setq exp (format "^%d:" depth)))
+	(save-excursion
+	  (end-of-line)
+	  (if (re-search-backward exp nil t)
+	      (setq start (point))
+	    (setq start (point-min)))
+	  (save-excursion		;Not sure about this part.
+	    (end-of-line)
+	    (setq p (point))
+	    (while (and (not (re-search-forward exp nil t))
+			(>= depth 0))
+	      (setq depth (1- depth))
+	      (setq exp (format "^%d:" depth)))
+	    (if (/= (point) p)
+		(setq end (point))
+	      (setq end (point-max)))))
+	;; Now work out the details of centering
+	(let ((nl (count-lines start end))
+              (wl (1- (window-height (selected-window))))
+	      (cp (point)))
+	  (if (> nl wl)
+	      ;; We can't fit it all, so just center on cursor
+	      (progn (goto-char start)
+		     (recenter 1))
+	    ;; we can fit everything on the screen, but...
+	    (if (and (pos-visible-in-window-p start (selected-window))
+		     (pos-visible-in-window-p end (selected-window)))
+		;; we are all set!
+		nil
+	      ;; we need to do something...
+	      (goto-char start)
+	      (let ((newcent (/ (- (window-height (selected-window)) nl) 2))
+		    (lte (count-lines start (point-max))))
+		(if (and (< (+ newcent lte) (window-height (selected-window)))
+			 (> (- (window-height (selected-window)) lte 1)
+			    newcent))
+		    (setq newcent (- (window-height (selected-window))
+				     lte 1)))
+		(recenter newcent))))
+          (goto-char cp))))))
+
+;;; Tag Management -- List of expanders:
+;;
+(defun speedbar-fetch-dynamic-tags (file)
+  "Return a list of tags generated dynamically from FILE.
+This uses the entries in `speedbar-dynamic-tags-function-list'
+to find the proper tags.  It is up to each of those individual
+functions to do caching and flushing if appropriate."
+  (save-excursion
+    ;; If a file is in memory, switch to that buffer.  This allows
+    ;; us to use the local variable.  If the file is on disk, we
+    ;; can try a few of the defaults that can get tags without
+    ;; opening the file.
+    (if (get-file-buffer file)
+	(set-buffer (get-file-buffer file)))
+    ;; If there is a buffer-local value of
+    ;; speedbar-dynamic-tags-function-list, it will now be available.
+    (let ((dtf speedbar-dynamic-tags-function-list)
+	  (ret t))
+      (while (and (eq ret t) dtf)
+	(setq ret
+	      (if (fboundp (car (car dtf)))
+		  (funcall (car (car dtf)) file)
+		t))
+	(if (eq ret t)
+	    (setq dtf (cdr dtf))))
+      (if (eq ret t)
+	  ;; No valid tag list, return nil
+	  nil
+	;; We have some tags.  Return the list with the insert fn
+	;; prepended
+	(cons (cdr (car dtf)) ret)))))
+
+;;; Tag Management -- Imenu
+;;
+(if (not speedbar-use-imenu-flag)
+
+    nil
+
+(eval-when-compile (condition-case nil (require 'imenu) (error nil)))
+
+(defun speedbar-fetch-dynamic-imenu (file)
+  "Load FILE into a buffer, and generate tags using Imenu.
+Returns the tag list, or t for an error."
+  ;; Load this AND compile it in
+  (require 'imenu)
+  (set-buffer (find-file-noselect file))
+  (if dframe-power-click (setq imenu--index-alist nil))
+  (condition-case nil
+      (let ((index-alist (imenu--make-index-alist t)))
+	(if speedbar-sort-tags
+	    (sort (copy-alist index-alist)
+		  (lambda (a b) (string< (car a) (car b))))
+	  index-alist))
+    (error t)))
+)
+
+;;; Tag Management -- etags  (old XEmacs compatibility part)
+;;
+(defvar speedbar-fetch-etags-parse-list
+  '(;; Note that java has the same parse-group as c
+    ("\\.\\([cChH]\\|c\\+\\+\\|cpp\\|cc\\|hh\\|java\\|cxx\\|hxx\\)\\'" .
+     speedbar-parse-c-or-c++tag)
+    ("^\\.emacs$\\|.\\(el\\|l\\|lsp\\)\\'" .
+     "def[^i]+\\s-+\\(\\(\\w\\|[-_]\\)+\\)\\s-*\C-?")
+;    ("\\.\\([fF]\\|for\\|FOR\\|77\\|90\\)\\'" .
+;      speedbar-parse-fortran77-tag)
+    ("\\.tex\\'" . speedbar-parse-tex-string)
+    ("\\.p\\'" .
+     "\\(\\(FUNCTION\\|function\\|PROCEDURE\\|procedure\\)\\s-+\\([a-zA-Z0-9_.:]+\\)\\)\\s-*(?^?")
+    )
+  "Associations of file extensions and expressions for extracting tags.
+To add a new file type, you would want to add a new association to the
+list, where the car is the file match, and the cdr is the way to
+extract an element from the tags output.  If the output is complex,
+use a function symbol instead of regexp.  The function should expect
+to be at the beginning of a line in the etags buffer.
+
+This variable is ignored if `speedbar-use-imenu-flag' is non-nil.")
+
+(defvar speedbar-fetch-etags-command "etags"
+  "*Command used to create an etags file.
+
+This variable is ignored if `speedbar-use-imenu-flag' is t.")
+
+(defvar speedbar-fetch-etags-arguments '("-D" "-I" "-o" "-")
+  "*List of arguments to use with `speedbar-fetch-etags-command'.
+This creates an etags output buffer.  Use `speedbar-toggle-etags' to
+modify this list conveniently.
+
+This variable is ignored if `speedbar-use-imenu-flag' is t.")
+
+(defun speedbar-toggle-etags (flag)
+  "Toggle FLAG in `speedbar-fetch-etags-arguments'.
+FLAG then becomes a member of etags command line arguments.  If flag
+is \"sort\", then toggle the value of `speedbar-sort-tags'.  If its
+value is \"show\" then toggle the value of
+`speedbar-show-unknown-files'.
+
+  This function is a convenience function for XEmacs menu created by
+Farzin Guilak <farzin@protocol.com>."
+  (interactive)
+  (cond
+   ((equal flag "sort")
+    (setq speedbar-sort-tags (not speedbar-sort-tags)))
+   ((equal flag "show")
+    (setq speedbar-show-unknown-files (not speedbar-show-unknown-files)))
+   ((or (equal flag "-C")
+	(equal flag "-S")
+	(equal flag "-D"))
+    (if (member flag speedbar-fetch-etags-arguments)
+	(setq speedbar-fetch-etags-arguments
+	      (delete flag speedbar-fetch-etags-arguments))
+      (add-to-list 'speedbar-fetch-etags-arguments flag)))
+   (t nil)))
+
+(defun speedbar-fetch-dynamic-etags (file)
+  "For FILE, run etags and create a list of symbols extracted.
+Each symbol will be associated with its line position in FILE."
+  (let ((newlist nil))
+    (unwind-protect
+	(save-excursion
+	  (if (get-buffer "*etags tmp*")
+	      (kill-buffer "*etags tmp*"))	;kill to clean it up
+	  (if (<= 1 speedbar-verbosity-level)
+	      (speedbar-message "Fetching etags..."))
+	  (set-buffer (get-buffer-create "*etags tmp*"))
+	  (apply 'call-process speedbar-fetch-etags-command nil
+		 (current-buffer) nil
+		 (append speedbar-fetch-etags-arguments (list file)))
+	  (goto-char (point-min))
+	  (if (<= 1 speedbar-verbosity-level)
+	      (speedbar-message "Fetching etags..."))
+	  (let ((expr
+		 (let ((exprlst speedbar-fetch-etags-parse-list)
+		       (ans nil))
+		   (while (and (not ans) exprlst)
+		     (if (string-match (car (car exprlst)) file)
+			 (setq ans (car exprlst)))
+		     (setq exprlst (cdr exprlst)))
+		   (cdr ans))))
+	    (if expr
+		(let (tnl)
+		  (set-buffer (get-buffer-create "*etags tmp*"))
+		  (while (not (save-excursion (end-of-line) (eobp)))
+		    (save-excursion
+		      (setq tnl (speedbar-extract-one-symbol expr)))
+		    (if tnl (setq newlist (cons tnl newlist)))
+		    (forward-line 1)))
+	      (speedbar-message
+	       "Sorry, no support for a file of that extension"))))
+      )
+    (if speedbar-sort-tags
+	(sort newlist (lambda (a b) (string< (car a) (car b))))
+      (reverse newlist))))
+
+;; This bit donated by Farzin Guilak <farzin@protocol.com> but I'm not
+;; sure it's needed with the different sorting method.
+;;
+;(defun speedbar-clean-etags()
+;  "Removes spaces before the ^? character, and removes `#define',
+;return types, etc. preceding tags.  This ensures that the sort operation
+;works on the tags, not the return types."
+;  (save-excursion
+;    (goto-char (point-min))
+;    (while
+;	(re-search-forward "(?[ \t](?\C-?" nil t)
+;      (replace-match "\C-?" nil nil))
+;    (goto-char (point-min))
+;    (while
+;	(re-search-forward "\\(.*[ \t]+\\)\\([^ \t\n]+.*\C-?\\)" nil t)
+;      (delete-region (match-beginning 1) (match-end 1)))))
+
+(defun speedbar-extract-one-symbol (expr)
+  "At point, return nil, or one alist in the form: (SYMBOL .  POSITION)
+The line should contain output from etags.  Parse the output using the
+regular expression EXPR."
+  (let* ((sym (if (stringp expr)
+		  (if (save-excursion
+			(re-search-forward expr (save-excursion
+						  (end-of-line)
+						  (point)) t))
+		      (buffer-substring-no-properties (match-beginning 1)
+						      (match-end 1)))
+		(funcall expr)))
+	 (pos (let ((j (re-search-forward "[\C-?\C-a]\\([0-9]+\\),\\([0-9]+\\)"
+					  (save-excursion
+					    (end-of-line)
+					    (point))
+					  t)))
+		(if (and j sym)
+		    (1+ (string-to-int (buffer-substring-no-properties
+					(match-beginning 2)
+					(match-end 2))))
+		  0))))
+    (if (/= pos 0)
+	(cons sym pos)
+      nil)))
+
+(defun speedbar-parse-c-or-c++tag ()
+  "Parse a C or C++ tag, which tends to be a little complex."
+  (save-excursion
+    (let ((bound (save-excursion (end-of-line) (point))))
+      (cond ((re-search-forward "\C-?\\([^\C-a]+\\)\C-a" bound t)
+	     (buffer-substring-no-properties (match-beginning 1)
+					     (match-end 1)))
+	    ((re-search-forward "\\<\\([^ \t]+\\)\\s-+new(" bound t)
+	     (buffer-substring-no-properties (match-beginning 1)
+					     (match-end 1)))
+	    ((re-search-forward "\\<\\([^ \t(]+\\)\\s-*(\C-?" bound t)
+	     (buffer-substring-no-properties (match-beginning 1)
+					     (match-end 1)))
+	    (t nil))
+      )))
+
+(defun speedbar-parse-tex-string ()
+  "Parse a Tex string.  Only find data which is relevant."
+  (save-excursion
+    (let ((bound (save-excursion (end-of-line) (point))))
+      (cond ((re-search-forward "\\(\\(sub\\)*section\\|chapter\\|cite\\)\\s-*{[^\C-?}]*}?" bound t)
+	     (buffer-substring-no-properties (match-beginning 0)
+					     (match-end 0)))
+	    (t nil)))))
+
+
+;;; BUFFER DISPLAY mode.
+;;
+(defvar speedbar-buffers-key-map nil
+  "Keymap used when in the buffers display mode.")
+
+(if speedbar-buffers-key-map
+    nil
+  (setq speedbar-buffers-key-map (speedbar-make-specialized-keymap))
+
+  ;; Basic tree features
+  (define-key speedbar-buffers-key-map "e" 'speedbar-edit-line)
+  (define-key speedbar-buffers-key-map "\C-m" 'speedbar-edit-line)
+  (define-key speedbar-buffers-key-map "+" 'speedbar-expand-line)
+  (define-key speedbar-buffers-key-map "=" 'speedbar-expand-line)
+  (define-key speedbar-buffers-key-map "-" 'speedbar-contract-line)
+  (define-key speedbar-buffers-key-map " " 'speedbar-toggle-line-expansion)
+
+  ;; Buffer specific keybindings
+  (define-key speedbar-buffers-key-map "k" 'speedbar-buffer-kill-buffer)
+  (define-key speedbar-buffers-key-map "r" 'speedbar-buffer-revert-buffer)
+
+  )
+
+(defvar speedbar-buffer-easymenu-definition
+  '(["Jump to buffer" speedbar-edit-line t]
+    ["Expand File Tags" speedbar-expand-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. "))]
+    ["Flush Cache & Expand" speedbar-flush-expand-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.\\+. "))]
+    ["Contract File Tags" speedbar-contract-line
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.-. "))]
+    "----"
+    ["Kill Buffer" speedbar-buffer-kill-buffer
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.[-+?]. "))]
+    ["Revert Buffer" speedbar-buffer-revert-buffer
+     (save-excursion (beginning-of-line)
+		     (looking-at "[0-9]+: *.[-+?]. "))]
+    )
+  "Menu item elements shown when displaying a buffer list.")
+
+(defun speedbar-buffer-buttons (directory zero)
+  "Create speedbar buttons based on the buffers currently loaded.
+DIRECTORY is the directory to the currently active buffer, and ZERO is 0."
+  (speedbar-buffer-buttons-engine nil))
+
+(defun speedbar-buffer-buttons-temp (directory zero)
+  "Create speedbar buttons based on the buffers currently loaded.
+DIRECTORY is the directory to the currently active buffer, and ZERO is 0."
+  (speedbar-buffer-buttons-engine t))
+
+(defun speedbar-buffer-buttons-engine (temp)
+  "Create speedbar buffer buttons.
+If TEMP is non-nil, then clicking on a buffer restores the previous display."
+  (speedbar-insert-separator "Active Buffers:")
+  (let ((bl (buffer-list))
+	(case-fold-search t))
+    (while bl
+      (if (string-match "^[ *]" (buffer-name (car bl)))
+	  nil
+	(let* ((known (string-match speedbar-file-regexp
+				    (buffer-name (car bl))))
+	       (expchar (if known ?+ ??))
+	       (fn (if known 'speedbar-tag-file nil))
+	       (fname (save-excursion (set-buffer (car bl))
+				      (buffer-file-name))))
+	  (speedbar-make-tag-line 'bracket expchar fn
+				  (if fname (file-name-nondirectory fname))
+				  (buffer-name (car bl))
+				  'speedbar-buffer-click temp
+				  'speedbar-file-face 0)
+	  (speedbar-buffers-tail-notes (car bl))))
+      (setq bl (cdr bl)))
+    (setq bl (buffer-list))
+    (speedbar-insert-separator "Scratch Buffers:")
+    (while bl
+      (if (not (string-match "^\\*" (buffer-name (car bl))))
+	  nil
+	(if (eq (car bl) speedbar-buffer)
+	    nil
+	  (speedbar-make-tag-line 'bracket ?? nil nil
+				  (buffer-name (car bl))
+				  'speedbar-buffer-click temp
+				  'speedbar-file-face 0)
+	  (speedbar-buffers-tail-notes (car bl))))
+      (setq bl (cdr bl)))
+    (setq bl (buffer-list))
+    ;;(speedbar-insert-separator "Hidden Buffers:")
+    ;;(while bl
+    ;;  (if (not (string-match "^ " (buffer-name (car bl))))
+    ;;	  nil
+    ;;	(if (eq (car bl) speedbar-buffer)
+    ;;	    nil
+    ;;	  (speedbar-make-tag-line 'bracket ?? nil nil
+    ;;				  (buffer-name (car bl))
+    ;;				  'speedbar-buffer-click temp
+    ;;				  'speedbar-file-face 0)
+    ;;	  (speedbar-buffers-tail-notes (car bl))))
+    ;;  (setq bl (cdr bl)))
+    ))
+
+(defun speedbar-buffers-tail-notes (buffer)
+  "Add a note to the end of the last tag line.
+Argument BUFFER is the buffer being tested."
+  (let (mod ro)
+    (save-excursion
+      (set-buffer buffer)
+      (setq mod (buffer-modified-p)
+	    ro buffer-read-only))
+    (if ro (speedbar-insert-button "%" nil nil nil nil t))))
+
+(defun speedbar-buffers-item-info ()
+  "Display information about the current buffer on the current line."
+  (or (speedbar-item-info-tag-helper)
+      (let* ((item (speedbar-line-text))
+	     (buffer (if item (get-buffer item) nil)))
+	(and buffer
+	     (speedbar-message "%s%s %S %d %s"
+			       (if (buffer-modified-p buffer) "* " "")
+			       item
+			       (save-excursion (set-buffer buffer) major-mode)
+			       (save-excursion (set-buffer buffer)
+					       (buffer-size))
+			       (or (buffer-file-name buffer) "<No file>"))))))
+
+(defun speedbar-buffers-line-directory (&optional depth)
+  "Fetch the full directory to the file (buffer) specified on the current line.
+Optional argument DEPTH specifies the current depth of the back search."
+  (save-excursion
+    (end-of-line)
+    (let ((start (point)))
+      ;; Buffers are always at level 0
+      (if (not (re-search-backward "^0:" nil t))
+	  nil
+	(let* ((bn (speedbar-line-text))
+	       (buffer (if bn (get-buffer bn))))
+	  (if buffer
+	      (if (save-excursion
+		    (end-of-line)
+		    (eq start (point)))
+		  (or (save-excursion (set-buffer buffer)
+				      default-directory)
+		      "")
+		(buffer-file-name buffer))))))))
+
+(defun speedbar-buffer-click (text token indent)
+  "When the users clicks on a buffer-button in speedbar.
+TEXT is the buffer's name, TOKEN and INDENT are unused."
+  (if dframe-power-click
+      (let ((pop-up-frames t)) (select-window (display-buffer text)))
+    (dframe-select-attached-frame speedbar-frame)
+    (switch-to-buffer text)
+    (if token (speedbar-change-initial-expansion-list
+	       speedbar-previously-used-expansion-list-name))))
+
+(defun speedbar-buffer-kill-buffer ()
+  "Kill the buffer the cursor is on in the speedbar buffer."
+  (interactive)
+  (or (save-excursion
+	(let ((text (speedbar-line-text)))
+	  (if (and (get-buffer text)
+		   (speedbar-y-or-n-p (format "Kill buffer %s? " text)))
+	      (kill-buffer text))
+	  (speedbar-refresh)))))
+
+(defun speedbar-buffer-revert-buffer ()
+  "Revert the buffer the cursor is on in the speedbar buffer."
+  (interactive)
+  (save-excursion
+    (beginning-of-line)
+    ;; If this fails, then it is a non-standard click, and as such,
+    ;; perfectly allowed
+    (if (re-search-forward "[]>?}] [^ ]"
+			   (save-excursion (end-of-line) (point))
+			   t)
+	(let ((text (progn
+		      (forward-char -1)
+		      (buffer-substring (point) (save-excursion
+						  (end-of-line)
+						  (point))))))
+	  (if (get-buffer text)
+	      (progn
+		(set-buffer text)
+		(revert-buffer t)))))))
+
+
+;;; Useful hook values and such.
+;;
+(defun speedbar-highlight-one-tag-line ()
+  "Highlight the current line, unhighlighting a previously jumped to line.
+When available, use `pulse' package."
+  ;; Try to load pulse.  If we can't find it, that's ok.
+  (condition-case nil (require 'pulse) (error nil))
+  (if (featurep 'pulse)
+      (pulse-momentary-highlight-one-line (point)
+					  'speedbar-highlight-face)
+    (speedbar-highlight-on-tag-line-internal))
+  )
+
+(defvar speedbar-highlight-one-tag-line nil
+  "Overlay used for highlighting the most recently jumped to tag line.")
+
+(defun speedbar-highlight-one-tag-line-internal ()
+  "Highlight the current line, unhighlighting a previously jumped to line."
+  (speedbar-unhighlight-one-tag-line)
+  (setq speedbar-highlight-one-tag-line
+	(speedbar-make-overlay (save-excursion (beginning-of-line) (point))
+			       (save-excursion (end-of-line)
+					       (forward-char 1)
+					       (point))))
+  (speedbar-overlay-put speedbar-highlight-one-tag-line 'face
+			'speedbar-highlight-face)
+  (add-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line)
+  )
+
+(defun speedbar-unhighlight-one-tag-line ()
+  "Unhighlight the currently highlighted line."
+  (if speedbar-highlight-one-tag-line
+      (progn
+	(speedbar-delete-overlay speedbar-highlight-one-tag-line)
+	(setq speedbar-highlight-one-tag-line nil)))
+  (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line))
+
+(defun speedbar-recenter-to-top ()
+  "Recenter the current buffer so POINT is on the top of the window."
+  (recenter 1))
+
+(defun speedbar-recenter ()
+  "Recenter the current buffer so POINT is in the center of the window."
+  (recenter (/ (window-height (selected-window)) 2)))
+
+
+;;; Color loading section.
+;;
+(defface speedbar-button-face '((((class color) (background light))
+				 (:foreground "green4"))
+				(((class color) (background dark))
+				 (:foreground "green3")))
+  "Face used for +/- buttons."
+  :group 'speedbar-faces)
+
+(defface speedbar-file-face '((((class color) (background light))
+			       (:foreground "cyan4"))
+			      (((class color) (background dark))
+			       (:foreground "cyan"))
+			      (t (:bold t)))
+  "Face used for file names."
+  :group 'speedbar-faces)
+
+(defface speedbar-directory-face '((((class color) (background light))
+				    (:foreground "blue4"))
+				   (((class color) (background dark))
+				    (:foreground "light blue")))
+  "Face used for directory names."
+  :group 'speedbar-faces)
+(defface speedbar-tag-face '((((class color) (background light))
+			      (:foreground "brown"))
+			     (((class color) (background dark))
+			      (:foreground "yellow")))
+  "Face used for displaying tags."
+  :group 'speedbar-faces)
+
+(defface speedbar-selected-face '((((class color) (background light))
+				    (:foreground "red" :underline t))
+				  (((class color) (background dark))
+				   (:foreground "red" :underline t))
+				  (t (:underline t)))
+  "Face used to underline the file in the active window."
+  :group 'speedbar-faces)
+
+(defface speedbar-highlight-face '((((class color) (background light))
+				    (:background "green"))
+				   (((class color) (background dark))
+				    (:background "sea green"))
+				   (((class grayscale monochrome)
+				     (background light))
+				    (:background "black"))
+				   (((class grayscale monochrome)
+				     (background dark))
+				    (:background "white")))
+  "Face used for highlighting buttons with the mouse."
+  :group 'speedbar-faces)
+
+(defface speedbar-separator-face '((((class color) (background light))
+				    (:background "blue"
+				     :foreground "white"
+				     :overline "gray"))
+				   (((class color) (background dark))
+				    (:background "blue"
+				     :foreground "white"
+				     :overline "gray"))
+				   (((class grayscale monochrome)
+				     (background light))
+				    (:background "black"
+				     :foreground "white"
+				     :overline "white"))
+				   (((class grayscale monochrome)
+				     (background dark))
+				    (:background "white"
+				     :foreground "black"
+				     :overline "black")))
+  "Face used for separator labes in a display."
+  :group 'speedbar-faces)
+
+;; some edebug hooks
+(add-hook 'edebug-setup-hook
+	  (lambda ()
+	    (def-edebug-spec speedbar-with-writable def-body)))
+
+;; Fix a font lock problem for some versions of Emacs
+(if (boundp 'font-lock-global-modes)
+    (if (listp font-lock-global-modes)
+	(add-to-list 'font-lock-global-modes '(not speedbar-mode))
+      )
+  )
+
+
+;;; Obsolete variables and functions
+
+(when (fboundp 'define-obsolete-variable-alias)
+
+  (define-obsolete-variable-alias
+    'speedbar-ignored-path-regexp 'speedbar-ignored-directory-regexp)
+
+  (define-obsolete-variable-alias 'speedbar-ignored-path-expressions
+    'speedbar-ignored-directory-expressions)
+  )
+
+(when (fboundp 'define-obsolete-function-alias)
+
+  (define-obsolete-function-alias 'speedbar-add-ignored-path-regexp
+    'speedbar-add-ignored-directory-regexp)
+
+  (define-obsolete-function-alias 'speedbar-line-path
+    'speedbar-line-directory)
+
+  (define-obsolete-function-alias 'speedbar-buffers-line-path
+    'speedbar-buffers-line-directory)
+
+  (define-obsolete-function-alias 'speedbar-path-line
+    'speedbar-directory-line)
+
+  (define-obsolete-function-alias 'speedbar-buffers-line-path
+    'speedbar-buffers-line-directory)
+
+  )
+
+(provide 'speedbar)
+
+;; run load-time hooks
+(run-hooks 'speedbar-load-hook)
+
+;;; speedbar ends here
diff --git a/site/cedet-1.0pre7/speedbar/speedbar.info b/site/cedet-1.0pre7/speedbar/speedbar.info
new file mode 100644
index 0000000..3142136
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/speedbar.info
@@ -0,0 +1,1533 @@
+This is speedbar.info, produced by makeinfo version 4.9 from
+speedbar.texi.
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Speedbar: (speedbar).        File/Tag summarizing utility.
+END-INFO-DIR-ENTRY
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software
+Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.2 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being "The GNU Manifesto",
+     "Distribution" and "GNU GENERAL PUBLIC LICENSE", with the
+     Front-Cover texts being "A GNU Manual", and with the Back-Cover
+     Texts as in (a) below.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License" in the Emacs
+     manual.
+
+     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
+     modify this GNU Manual, like GNU software.  Copies published by
+     the Free Software Foundation raise funds for GNU development."
+
+     This document is part of a collection distributed under the GNU
+     Free Documentation License.  If you want to distribute this
+     document separately from the collection, you can do so by adding a
+     copy of the license to the document, as described in section 6 of
+     the license.
+
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Speedbar: (speedbar). File/Tag summarizing utility.
+END-INFO-DIR-ENTRY
+
+
+File: speedbar.info,  Node: Top,  Up: (dir)Top
+
+   Speedbar is a program for Emacs which can be used to summarize
+information related to the current buffer.  Its original inspiration is
+the `explorer' often used in modern development environments, office
+packages, and web browsers.
+
+   Speedbar displays a narrow frame in which a tree view is shown.  This
+tree view defaults to containing a list of files and directories.  Files
+can be `expanded' to list tags inside. Directories can be expanded to
+list the files within itself.  Each file or tag can be jumped to
+immediately.
+
+   Speedbar expands upon `explorer' windows by maintaining context with
+the user.  For example, when using the file view, the current buffer's
+file is highlighted.  Speedbar also mimics the explorer windows by
+providing multiple display modes.  These modes come in two flavors.
+Major display modes remain consistent across buffers, and minor display
+modes appear only when a buffer of the applicable type is shown.  This
+allows authors of other packages to provide speedbar summaries
+customized to the needs of that mode.
+
+   Throughout this manual, activities are defined as `clicking on', or
+`expanding' items.  Clicking means using `Mouse-2' on a button.
+Expanding refers to clicking on an expansion button to display an
+expanded summary of the entry the expansion button is on.  *Note Basic
+Navigation::.
+
+* Menu:
+
+* Introduction::     Basics of speedbar.
+* Basic Navigation:: Basics of speedbar common between all modes.
+* File Mode::        Summarizing files.
+* Buffer Mode::      Summarizing buffers.
+* Minor Modes::      Additional minor modes such as Info and RMAIL.
+* Customizing::      Changing speedbar behavior.
+* Extending::        Extend speedbar for your own project.
+* Index::
+
+
+File: speedbar.info,  Node: Introduction,  Next: Basic Navigation,  Up: Top
+
+1 Introduction
+**************
+
+To start using speedbar use the command `M-x speedbar RET' or select it
+from the Tools menu in versions of Emacs with speedbar installed by
+default.  This command will open a new frame to summarize the local
+files.  On X Window systems or on MS-Windows, speedbar's frame is twenty
+characters wide, and will mimic the height of the frame from which it
+was started.  It positions itself to the left or right of the frame you
+started it from.
+
+   To use speedbar effectively, it is important to understand its
+relationship with the frame you started it from.  This frame is the
+"attached frame" which speedbar will use as a reference point.  Once
+started, speedbar watches the contents of this frame, and attempts to
+make its contents relevant to the buffer loaded into the attached
+frame.  In addition, all requests made in speedbar that require the
+display of another buffer will display in the attached frame.
+
+   When used in terminal mode, the new frame appears the same size as
+the terminal.  Since it is not visible while working in the attached
+frame, speedbar will save time by using the "slowbar mode", where no
+tracking is done until speedbar is requested to show itself (i.e., the
+speedbar's frame becomes the selected frame).
+
+   The function to use when switching between frames using the keyboard
+is `speedbar-get-focus'.  This function will toggle between frames, and
+it's useful to bind it to a key in terminal mode.  *Note Customizing::.
+
+
+File: speedbar.info,  Node: Basic Navigation,  Next: File Mode,  Prev: Introduction,  Up: Top
+
+2 Basic Navigation
+******************
+
+Speedbar can display different types of data, and has several display
+and behavior modes.  These modes all have a common behavior, menu
+system, and look.  If one mode is learned, then the other modes are easy
+to use.
+
+* Menu:
+
+* Basic Key Bindings::
+* Basic Visuals::
+* Mouse Bindings::
+* Displays Submenu::
+
+
+File: speedbar.info,  Node: Basic Key Bindings,  Next: Basic Visuals,  Prev: Basic Navigation,  Up: Basic Navigation
+
+2.1 Basic Key Bindings
+======================
+
+These key bindings are common across all modes:
+
+`Q'
+     Quit speedbar, and kill the frame.
+
+`q'
+     Quit speedbar, and hide the frame.  This makes it faster to
+     restore the speedbar frame, than if you press `Q'.
+
+`g'
+     Refresh whatever contents are in speedbar.
+
+`t'
+     Toggle speedbar to and from slowbar mode.  In slowbar mode, frame
+     tracking is not done.
+
+`n'
+`p'
+     Move, respectively, to the next or previous item.  A summary of
+     that item will be displayed in the attached frame's minibuffer.
+
+`M-n'
+`M-p'
+     Move to the next or previous item in a restricted fashion.  If a
+     list is open, the cursor will skip over it.  If the cursor is in
+     an open list, it will not leave it.
+
+`C-M-n'
+`C-M-n'
+     Move forwards and backwards across extended groups.  This lets you
+     quickly skip over all files, directories, or other common
+     sub-items at the same current depth.
+
+`C-x b'
+     Switch buffers in the attached frame.
+
+   Speedbar can handle multiple modes.  Two are provided by default.
+These modes are File mode, and Buffers mode.  There are accelerators to
+switch into these different modes.
+
+`b'
+     Switch into Quick Buffers mode (*note Buffer Mode::).  After one
+     use, the previous display mode is restored.
+
+`f'
+     Switch into File mode.
+
+`r'
+     Switch back to the previous mode.
+
+   Some modes provide groups, lists and tags.  *Note Basic Visuals::.
+When these are available, some additional common bindings are available.
+
+`RET'
+`e'
+     Edit/Open the current group or tag.  This behavior is dependent on
+     the mode.  In general, files or buffers are opened in the attached
+     frame, and directories or group nodes are expanded locally.
+
+`+'
+`='
+     Expand the current group, displaying sub items.  When used with a
+     prefix argument, any data that may have been cached is flushed.
+     This is similar to a power click.  *Note Mouse Bindings::.
+
+`-'
+     Contract the current group, hiding sub items.
+
+
+File: speedbar.info,  Node: Basic Visuals,  Next: Mouse Bindings,  Prev: Basic Key Bindings,  Up: Basic Navigation
+
+2.2 Basic Visuals
+=================
+
+Speedbar has visual cues for indicating different types of data.  These
+cues are used consistently across the different speedbar modes to make
+them easier to interpret.
+
+   At a high level, in File mode, there are directory buttons, sub
+directory buttons, file buttons, tag buttons, and expansion buttons.
+This makes it easy to use the mouse to navigate a directory tree, and
+quickly view files, or a summary of those files.
+
+   The most basic visual effect used to distinguish between these button
+types is color and mouse highlighting.  Anything the mouse highlights
+can be clicked on and is called a button (*note Mouse Bindings::).
+Anything not highlighted by the mouse will not be clickable.
+
+   Text in speedbar consists of four different types of data.  Knowing
+how to read these textual elements will make it easier to navigate by
+identifying the types of data available.
+
+2.2.0.1 Groups
+..............
+
+Groups summarize information in a single line, and provide a high level
+view of more complex systems, like a directory tree, or manual chapters.
+
+   Groups appear at different indentation levels, and are prefixed with
+a `+' in some sort of `box'.  The group name will summarize the
+information within it, and the expansion box will display that
+information inline.  In File mode, directories and files are `groups'
+where the `+' is surrounded by brackets like this:
+
+     <+> include
+     <-> src
+      [+] foo.c
+
+   In this example, we see both open and closed directories, in
+addition to a file.  The directories have a box consisting of angle
+brackets, and a file uses square brackets.
+
+   In all modes, a group can be `edited' by pressing `RET', meaning a
+file will be opened, or a directory explicitly opened in speedbar.  A
+group can be expanded or contracted using `+' or `-'.  *Note Basic Key
+Bindings::.
+
+   Sometimes groups may have a `?' in its indicator box.  This means
+that it is a group type, but there are no contents, or no known way of
+extracting contents of that group.
+
+   When a group has been expanded, the indicator button changes from
+`+' to `-'.  This indicates that the contents are being shown.  Click
+the `-' button to contract the group, or hide the contents currently
+displayed.
+
+2.2.0.2 Tags
+............
+
+Tags are the leaf nodes of the tree system.  Tags are generally prefixed
+with a simple character, such as `>'.  Tags can only be jumped to using
+`RET' or `e'.
+
+2.2.0.3 Boolean Flags
+.....................
+
+Sometimes a group or tag is given a boolean flag.  These flags appear as
+extra text characters at the end of the line.  File mode uses boolean
+flags, such as a `*' to indicate that a file has been checked out of a
+versioning system.
+
+   For additional flags, see *Note File Mode::, and *Note Version
+Control::.
+
+2.2.0.4 Unadorned Text
+......................
+
+Unadorned text generally starts in column 0, without any special symbols
+prefixing them.  In Buffers mode different buffer groups are prefixed
+with a description of what the following buffers are (Files, scratch
+buffers, and invisible buffers.)
+
+   Unadorned text will generally be colorless, and not clickable.
+
+2.2.0.5 Color Cues
+..................
+
+Each type of Group, item indicator, and label is given a different
+color.  The colors chosen are dependent on whether the background color
+is light or dark.  Of important note is that the `current item', which
+may be a buffer or file name, is highlighted red, and underlined.
+
+   Colors can be customized from the group `speedbar-faces'.  Some
+modes, such as for Info, will use the Info colors instead of default
+speedbar colors as an indication of what is currently being displayed.
+
+   The face naming convention mirrors the File display mode.  Modes
+which do not use files will attempt to use the same colors on analogous
+entries.
+
+
+File: speedbar.info,  Node: Mouse Bindings,  Next: Displays Submenu,  Prev: Basic Visuals,  Up: Basic Navigation
+
+2.3 Mouse Bindings
+==================
+
+The mouse has become a common information navigation tool.  Speedbar
+will use the mouse to navigate file systems, buffer lists, and other
+data.  The different textual cues provide buttons which can be clicked
+on (*note Basic Visuals::).  Anything that highlights can be clicked on
+with the mouse, or affected by the menu.
+
+   The mouse bindings are:
+
+`Mouse-1'
+     Move cursor to that location.
+
+`Mouse-2'
+`Double-Mouse-1'
+     Activate the current button.  `Double-Mouse-1' is called a "double
+     click" on other platforms, and is useful for windows users with two
+     button mice.
+
+`S-Mouse-2'
+`S-Double-Mouse-1'
+     This has the same effect as `Mouse-2', except it is called a power
+     click.  This means that if a group with an expansion button `+' is
+     clicked, any caches are flushed, and subitems re-read.  If it is a
+     name, it will be opened in a new frame.
+
+`Mouse-3'
+     Activate the speedbar menu.  The item selected affects the line
+     clicked, not the line where the cursor was.
+
+`Mouse-1 (mode line)'
+     Activate the menu.  This affects the item the cursor is on before
+     the click, since the mouse was not clicked on anything.
+
+`C-Mouse-1'
+     Buffers sub-menu.  The buffer in the attached frame is switched.
+
+   When the mouse moves over buttons in speedbar, details of that item
+should be displayed in the minibuffer of the attached frame.  Sometimes
+this can contain extra information such as file permissions, or tag
+location.
+
+
+File: speedbar.info,  Node: Displays Submenu,  Prev: Mouse Bindings,  Up: Basic Navigation
+
+2.4 Displays Submenu
+====================
+
+You can display different data by using different display modes.  These
+specialized modes make it easier to navigate the relevant pieces of
+information, such as files and directories, or buffers.
+
+   In the main menu, found by clicking `Mouse-3', there is a submenu
+labeled `Displays'.  This submenu lets you easily choose between
+different display modes.
+
+   The contents are modes currently loaded into emacs.  By default, this
+would include Files, Quick Buffers, and Buffers.  Other major display
+modes such as Info are loaded separately.
+
+
+File: speedbar.info,  Node: File Mode,  Next: Buffer Mode,  Prev: Basic Navigation,  Up: Top
+
+3 File Mode
+***********
+
+File mode displays a summary of your current directory.  You can display
+files in the attached frame, or summarize the tags found in files.  You
+can even see if a file is checked out of a version control system, or
+has some associated object file.
+
+   Advanced behavior, like copying and renaming files, is also provided.
+
+* Menu:
+
+* Directory Display::   What the display means.
+* Hidden Files::        How to display hidden files.
+* File Key Bindings::   Performing file operations.
+
+
+File: speedbar.info,  Node: Directory Display,  Next: Hidden Files,  Prev: File Mode,  Up: File Mode
+
+3.1 Directory Display
+=====================
+
+There are three major sections in the display.  The first line or two is
+the root directory speedbar is currently viewing.  You can jump to one
+of the parent directories by clicking on the name of the directory you
+wish to jump to.
+
+   Next, directories are listed.  A directory starts with the group
+indicator button `<+>'.  Clicking the directory name makes speedbar
+load that directory as the root directory for its display.  Clicking the
+`<+>' button will list all directories and files beneath.
+
+   Next, files are listed.  Files start with the group indicator `[+]'
+or `[?]'.  You can jump to a file in the attached frame by clicking on
+the file name.  You can expand a file and look at its tags by clicking
+on the `[+]' symbol near the file name.
+
+   A typical session might look like this:
+
+     ~/lisp/
+     <+> checkdoc
+     <+> eieio
+     <-> speedbar
+      [+] Makefile
+      [+] rpm.el #
+      [+] sb-gud.el #
+      [+] sb-info.el #
+      [+] sb-rmail.el #
+      [+] sb-w3.el
+      [-] speedbar.el *!
+       {+} Types
+       {+} Variables
+       {+} def (group)
+       {+} speedbar-
+      [+] speedbar.texi *
+     <+> testme
+     [+] align.el
+     [+] autoconf.el
+
+   In this example, you can see several directories.  The directory
+`speedbar' has been opened inline.  Inside the directory `speedbar',
+the file `speedbar.el' has its tags exposed.  These tags are extensive,
+and they are summarized into tag groups.
+
+   Files get additional boolean flags associated with them.  Valid
+flags are:
+
+`*'
+     This file has been checked out of a version control system.  *Note
+     Version Control::.  
+
+`#'
+     This file has an up to date object file associated with it.  The
+     variable `speedbar-obj-alist' defines how speedbar determines this
+     value.
+
+`!'
+     This file has an out of date object file associated with it.
+
+   A Tag group is prefixed with the symbol `{+}'.  Clicking this symbol
+will show all symbols that have been organized into that group.
+Different types of files have unique tagging methods as defined by their
+major mode.  Tags are generated with either the `imenu' package, or
+through the `etags' interface.
+
+   Tag groups are defined in multiple ways which make it easier to find
+the tag you are looking for.  Imenu keywords explicitly create groups,
+and speedbar will automatically create groups if tag lists are too long.
+
+   In our example, Imenu created the groups `Types' and `Variables'.
+All remaining top-level symbols are then regrouped based on the
+variable `speedbar-tag-hierarchy-method'.  The subgroups `def' and
+`speedbar-' are groupings where the first few characters of the given
+symbols are specified in the group name.  Some group names may say
+something like `speedbar-t to speedbar-v', indicating that all symbols
+which alphabetically fall between those categories are included in that
+sub-group.  *Note Tag Hierarchy Methods::.
+
+
+File: speedbar.info,  Node: Hidden Files,  Next: File Key Bindings,  Prev: Directory Display,  Up: File Mode
+
+3.2 Hidden Files
+================
+
+On GNU and Unix systems, a hidden file is a file whose name starts with
+a period.  They are hidden from a regular directory listing because the
+user is not generally interested in them.
+
+   In speedbar, a hidden file is a file which isn't very interesting and
+might prove distracting to the user.  Any uninteresting files are
+removed from the File display.  There are two levels of uninterest in
+speedbar.  The first level of uninterest are files which have no
+expansion method, or way of extracting tags.  You can define which
+files are interesting with `speedbar-supported-extension-expressions'.
+The second level is any file that matches the same pattern used for
+completion in `find-file'.  This is derived from the variable
+`completion-ignored-extensions'.  This filter will override the
+supported extensions, so if you add something to be supported, and it
+doesn't appear, check for this.
+
+   You can toggle the display of uninteresting files from the toggle
+menu item `Show All Files'.  This will display all level one hidden
+files.  These files will be shown with a `?' indicator.  Level 2 hidden
+files will still not be shown.
+
+   Object files fall into the category of level 2 hidden files.  You can
+determine their presence by the `#' and `!' file indicators.  *Note
+Directory Display::.
+
+
+File: speedbar.info,  Node: File Key Bindings,  Prev: Hidden Files,  Up: File Mode
+
+3.3 File Key Bindings
+=====================
+
+File mode has key bindings permitting different file system operations
+such as copy or rename.  These commands all operate on the "current
+file".  In this case, the current file is the file at point, or clicked
+on when pulling up the menu.
+
+`U'
+     Move the entire speedbar display up one directory.
+
+`I'
+     Display information in the minibuffer about this line.  This is
+     the same information shown when navigating with `n' and `p', or
+     moving the mouse over an item.
+
+`B'
+     Byte compile the Emacs Lisp file on this line.
+
+`L'
+     Load the Emacs Lisp file on this line.  If a `.elc' file exists,
+     optionally load that.
+
+`C'
+     Copy the current file to some other location.
+
+`R'
+     Rename the current file, possibly moving it to some other location.
+
+`D'
+     Delete the current file.
+
+`O'
+     Delete the current file's object file.  Use the symbols `#' and
+     `!' to determine if there is an object file available.
+
+   One menu item toggles the display of all available files.  By
+default, only files which Emacs understands, and knows how to convert
+into a tag list, are shown.  By showing all files, additional files
+such as text files are also displayed, but they are prefixed with the
+`[?]' symbol.  This means that it is a file, but Emacs doesn't know how
+to expand it.
+
+
+File: speedbar.info,  Node: Buffer Mode,  Next: Minor Modes,  Prev: File Mode,  Up: Top
+
+4 Buffer Mode
+*************
+
+Buffer mode is very similar to File mode, except that instead of
+tracking the current directory and all files available there, the
+current list of Emacs buffers is shown.
+
+   These buffers can have their tags expanded in the same way as files,
+and uses the same unknown file indicator (*note File Mode::).
+
+   Buffer mode does not have file operation bindings, but the following
+buffer specific key bindings are available:
+
+`k'
+     Kill this buffer.  Do not touch its file.
+
+`r'
+     Revert this buffer, reloading from disk.
+
+   In addition to Buffer mode, there is also Quick Buffer mode.  In
+fact, Quick Buffers is bound to the `b' key.  The only difference
+between Buffers and Quick Buffers is that after one operation  is
+performed which affects the attached frame, the display is immediately
+reverted to the last displayed mode.
+
+   Thus, if you are in File mode, and you need quick access to a buffer,
+press `b', click on the buffer you want, and speedbar will revert back
+to File mode.
+
+
+File: speedbar.info,  Node: Minor Modes,  Next: Customizing,  Prev: Buffer Mode,  Up: Top
+
+5 Minor Display Modes
+*********************
+
+For some buffers, a list of files and tags makes no sense.  This could
+be because files are not currently in reference (such as web pages), or
+that the files you might be interested have special properties (such as
+email folders.)
+
+   In these cases, a minor display mode is needed.  A minor display mode
+will override any major display mode currently being displayed for the
+duration of the specialized buffer's use.  Minor display modes will
+follow the general rules of their major counterparts in terms of key
+bindings and visuals, but will have specialized behaviors.
+
+* Menu:
+
+* RMAIL::  Managing folders in speedbar
+* Info::   Browsing topics in speedbar
+* GDB::    Managing the current stack trace in speedbar
+
+
+File: speedbar.info,  Node: RMAIL,  Next: Info,  Prev: Minor Modes,  Up: Minor Modes
+
+5.1 RMAIL
+=========
+
+When using RMAIL, speedbar will display two sections.  The first is a
+layer one reply button.  Clicking here will initialize a reply buffer
+showing only this email address in the `To:' field.
+
+   The second section lists all RMAIL folders in the same directory as
+your main RMAIL folder.  The general rule is that RMAIL folders always
+appear in all caps, or numbers.  It is possible to save mail in folders
+with lower case letters, but there is no clean way of detecting such
+RMAIL folders without opening them all.
+
+   Each folder can be visited by clicking the name.  You can move mail
+from the current RMAIL folder into a different folder by clicking the
+`<M>' button.  The `M' stands for Move.
+
+   In this way you can manage your existing RMAIL folders fairly easily
+using the mouse.
+
+
+File: speedbar.info,  Node: Info,  Next: GDB,  Prev: RMAIL,  Up: Minor Modes
+
+5.2 Info
+========
+
+When browsing Info files, all local relevant information is displayed in
+the info buffer and a topical high-level view is provided in speedbar.
+All top-level info nodes are shown in the speedbar frame, and can be
+jumped to by clicking the name.
+
+   You can open these nodes with the `[+]' button to see what sub-topics
+are available.  Since these sub-topics are not examined until you click
+the `[+]' button, sometimes a `[?]' will appear when you click on a
+`[+]', indicating that there are no sub-topics.
+
+
+File: speedbar.info,  Node: GDB,  Prev: Info,  Up: Minor Modes
+
+5.3 GDB
+=======
+
+If you are debugging an application with GDB in Emacs, speedbar can show
+you the current stack when the current buffer is the `*gdb*' buffer.
+Usually, it will just report that there is no stack, but when the
+application is stopped, the current stack will be shown.
+
+   You can click on any stack element and gdb will move to that stack
+level.  You can then check variables local to that level at the GDB
+prompt.
+
+   This mode has the unfortunate side-effect of breaking GDB's repeat
+feature when you hit `RET' since your previous command is overridden
+with a stack fetching command.
+
+
+File: speedbar.info,  Node: Customizing,  Next: Extending,  Prev: Minor Modes,  Up: Top
+
+6 Customizing
+*************
+
+Speedbar is highly customizable, with a plethora of control elements.
+Since speedbar is so visual and reduces so much information, this is an
+important aspect of its behavior.
+
+   In general, there are three custom groups you can use to quickly
+modify speedbar's behavior.
+
+`speedbar'
+     Basic speedbar behaviors.
+
+`speedbar-vc'
+     Customizations regarding version control handling.
+
+`speedbar-faces'
+     Customize speedbar's many colors and fonts.
+
+* Menu:
+
+* Frames and Faces::        Visible behaviors.
+* Tag Hierarchy Methods::   Customizing how tags are displayed.
+* Version Control::         Adding new VC detection modes.
+* Hooks::                   The many hooks you can use.
+
+
+File: speedbar.info,  Node: Frames and Faces,  Next: Tag Hierarchy Methods,  Prev: Customizing,  Up: Customizing
+
+6.1 Frames and Faces
+====================
+
+There are several faces speedbar generates to provide a consistent
+color scheme across display types.  You can customize these faces using
+your favorite method.  They are:
+
+speedbar-button-face
+     Face used on expand/contract buttons.  
+
+speedbar-file-face
+     Face used on Files.  Should also be used on non-directory like
+     nodes.  
+
+speedbar-directory-face
+     Face used for directories, or nodes which consist of groups of
+     other nodes.  
+
+speedbar-tag-face
+     Face used for tags in a file, or for leaf items.  
+
+speedbar-selected-face
+     Face used to highlight the selected item.  This would be the
+     current file being edited.  
+
+speedbar-highlight-face
+     Face used when the mouse passes over a button.
+
+   You can also customize speedbar's initial frame parameters.  How
+this is accomplished is dependent on your platform being Emacs or
+XEmacs.
+
+   In Emacs, change the alist `speedbar-frame-parameters'.  This
+variable is used to set up initial details.  Height is also
+automatically added when speedbar is created, though you can override
+it.
+
+   In XEmacs, change the plist `speedbar-frame-plist'.  This is the
+XEmacs way of doing the same thing.
+
+
+File: speedbar.info,  Node: Tag Hierarchy Methods,  Next: Version Control,  Prev: Frames and Faces,  Up: Customizing
+
+6.2 Tag Hierarchy Methods
+=========================
+
+When listing tags within a file, it is possible to get an annoyingly
+long list of entries.  Imenu (which generates the tag list in Emacs)
+will group some classes of items automatically.   Even here, however,
+some tag groups can be quite large.
+
+   To solve this problem, tags can be grouped into logical units
+through a hierarchy processor.  The specific variable to use is
+`speedbar-tag-hierarchy-method'.  There are several methods that can be
+applied in any order.  They are:
+
+`speedbar-trim-words-tag-hierarchy'
+     Find a common prefix for all elements of a group, and trim it off.  
+
+`speedbar-prefix-group-tag-hierarchy'
+     If a group is too large, place sets of tags into bins based on
+     common prefixes.  
+
+`speedbar-simple-group-tag-hierarchy'
+     Take all items in the top level list not in a group, and stick
+     them into a `Tags' group.  
+
+`speedbar-sort-tag-hierarchy'
+     Sort all items, leaving groups on top.
+
+   You can also add your own functions to reorganize tags as you see
+fit.
+
+   Some other control variables are:
+
+`speedbar-tag-group-name-minimum-length'
+     Default value: 4.
+
+     The minimum length of a prefix group name before expanding.  Thus,
+     if the `speedbar-tag-hierarchy-method' includes
+     `speedbar-prefix-group-tag-hierarchy' and one such group's common
+     characters is less than this number of characters, then the group
+     name will be changed to the form of:
+
+          worda to wordb
+
+     instead of just
+
+          word
+
+     This way we won't get silly looking listings.
+
+`speedbar-tag-split-minimum-length'
+     Default value: 20.
+
+     Minimum length before we stop trying to create sub-lists in tags.
+     This is used by all tag-hierarchy methods that break large lists
+     into sub-lists.
+
+`speedbar-tag-regroup-maximum-length'
+     Default value: 10.
+
+     Maximum length of submenus that are regrouped.  If the regrouping
+     option is used, then if two or more short subgroups are next to
+     each other, then they are combined until this number of items is
+     reached.
+
+
+File: speedbar.info,  Node: Version Control,  Next: Hooks,  Prev: Tag Hierarchy Methods,  Up: Customizing
+
+6.3 Version Control
+===================
+
+When using the file mode in speedbar, information regarding a version
+control system adds small details to the display.  If a file is in a
+version control system, and is "checked out" or "locked" locally, an
+asterisk `*' appears at the end of the file name.  In addition, the
+directory name for Version Control systems are left out of the speedbar
+display.
+
+   You can easily add new version control systems into speedbar's
+detection scheme.  To make a directory "disappear" from the list, use
+the variable `speedbar-directory-unshown-regexp'.
+
+   Next, you need to write entries for two hooks.  The first is
+`speedbar-vc-directory-enable-hook' which will enable a VC check in the
+current directory for the group of files being checked.  Your hook
+function should take one parameter (the directory to check) and return
+`t' if your VC method is in control here.
+
+   The second function is `speedbar-vc-in-control-hook'.  This hook
+takes two parameters, the PATH of the file to check, and the FILE name.
+Return `t' if you want to have the asterisk placed near this file.
+
+   Lastly, you can change the VC indicator using the variable
+`speedbar-vc-indicator', and specify a single character string.
+
+
+File: speedbar.info,  Node: Hooks,  Prev: Version Control,  Up: Customizing
+
+6.4 Hooks
+=========
+
+There are several hooks in speedbar allowing custom behaviors to be
+added.  Available hooks are:
+
+`speedbar-visiting-file-hook'
+     Hooks run when speedbar visits a file in the selected frame.  
+
+`speedbar-visiting-tag-hook'
+     Hooks run when speedbar visits a tag in the selected frame.  
+
+`speedbar-load-hook'
+     Hooks run when speedbar is loaded.  
+
+`speedbar-reconfigure-keymaps-hook'
+     Hooks run when the keymaps are regenerated.  Keymaps are
+     reconfigured whenever modes change.  This will let you add custom
+     key bindings.  
+
+`speedbar-before-popup-hook'
+     Hooks called before popping up the speedbar frame.  New frames are
+     often popped up when "power clicking" on an item to view it.  
+
+`speedbar-before-delete-hook'
+     Hooks called before deleting or hiding the speedbar frame.  
+
+`speedbar-mode-hook'
+     Hooks called after creating a speedbar buffer.  
+
+`speedbar-timer-hook'
+     Hooks called after running the speedbar timer function.  
+
+`speedbar-scanner-reset-hook'
+     Hook called whenever generic scanners are reset.  Set this to
+     implement your own scanning or rescan safe functions with state
+     data.
+
+
+File: speedbar.info,  Node: Extending,  Next: Index,  Prev: Customizing,  Up: Top
+
+7 Extending
+***********
+
+Speedbar can run different types of Major display modes such as Files
+(*note File Mode::), and Buffers (*note Buffer Mode::).  It can also
+manage different minor display modes for use with buffers handling
+specialized data.
+
+   These major and minor display modes are handled through an extension
+system which permits specialized keymaps and menu extensions, in
+addition to a unique rendering function.  You can also specify a wide
+range of tagging functions.  The default uses `imenu', but new tagging
+methods can be easily added.  In this chapter, you will learn how to
+write your own major or minor display modes, and how to create
+specialized tagging functions.
+
+* Menu:
+
+* Minor Display Modes::    How to create a minor display mode.
+* Major Display Modes::    How to create a major display mode.
+* Tagging Extensions::     How to create your own tagging methods.
+* Creating a display::     How to insert buttons and hierarchies.
+
+
+File: speedbar.info,  Node: Minor Display Modes,  Next: Major Display Modes,  Prev: Extending,  Up: Extending
+
+7.1 Minor Display Modes
+=======================
+
+A "minor display mode" is a mode useful when using a specific type of
+buffer.  This mode might not be useful for any other kind of data or
+mode, or may just be more useful that a files or buffers based mode when
+working with a specialized mode.
+
+   Examples that already exist for speedbar include RMAIL, Info, and
+gdb.  These modes display information specific to the major mode shown
+in the attached frame.
+
+   To enable a minor display mode in your favorite Major mode, follow
+these steps.  The string `NAME' is the name of the major mode being
+augmented with speedbar.
+
+  1. Create the keymap variable `NAME-speedbar-key-map'.
+
+  2. Create a function, named whatever you like, which assigns values
+     into your keymap.  Use this command to create the keymap before
+     assigning bindings:
+
+              (setq NAME-speedbar-key-map (speedbar-make-specialized-keymap))
+
+     This function creates a special keymap for use in speedbar.
+
+  3. Call your install function, or assign it to a hook like this:
+
+          (if (featurep 'speedbar)
+              (NAME-install-speedbar-variables)
+            (add-hook 'speedbar-load-hook 'NAME-install-speedbar-variables))
+
+  4. Create an easymenu compatible vector named
+     `NAME-speedbar-menu-items'.  This will be spliced into speedbar's
+     control menu.
+
+  5. Create a function called `NAME-speedbar-buttons'.  This function
+     should take one variable, which is the buffer for which it will
+     create buttons.   At this time `(current-buffer)' will point to the
+     uncleared speedbar buffer.
+
+   When writing `NAME-speedbar-buttons', the first thing you will want
+to do is execute a check to see if you need to re-create your display.
+If it needs to be cleared, you need to erase the speedbar buffer
+yourself, and start drawing buttons.  *Note Creating a display::.
+
+
+File: speedbar.info,  Node: Major Display Modes,  Next: Tagging Extensions,  Prev: Minor Display Modes,  Up: Extending
+
+7.2 Major Display Modes
+=======================
+
+Creating a "Major Display Mode" for speedbar requires authoring a
+keymap, an easy-menu segment, and writing several functions.  These
+items can be given any name, and are made the same way as in a minor
+display mode (*note Minor Display Modes::).  Once this is done, these
+items need to be registered.
+
+   Because this setup activity may or may not have speedbar available
+when it is being loaded, it is necessary to create an install function.
+This function should create and initialize the keymap, and add your
+expansions into the customization tables.
+
+   When creating the keymap, use the function
+`speedbar-make-specialized-keymap' instead of other keymap making
+functions.  This will provide you with the initial bindings needed.
+Some common speedbar functions you might want to bind are:
+
+`speedbar-edit-line'
+     Edit the item on the current line.  
+
+`speedbar-expand-line'
+     Expand the item under the cursor.  With a numeric argument
+     (`C-u'), flush cached data before expanding.  
+
+`speedbar-contract-line'
+     Contract the item under the cursor.
+
+   These function require that function `speedbar-line-directory' be
+correctly overloaded to work.
+
+   Next, register your extension like this;
+
+       (speedbar-add-expansion-list '("MyExtension"
+                                      MyExtension-speedbar-menu-items
+                                      MyExtension-speedbar-key-map
+                                      MyExtension-speedbar-buttons))
+
+   There are no limitations to the names you use.
+
+   The first parameter is the string representing your display mode.
+The second parameter is a variable name containing an easymenu
+compatible menu definition.  This will be stuck in the middle of
+speedbar's menu.  The third parameter is the variable name containing
+the keymap we discussed earlier.  The last parameter is a function
+which draws buttons for your mode.  This function must take two
+parameters.  The directory currently being displayed, and the depth at
+which you should start rendering buttons.  The function will then draw
+(starting at the current cursor position) any buttons deemed necessary
+based on the input parameters.  *Note Creating a display::.
+
+   Next, you need to register function overrides.  This may look
+something like this:
+
+     (speedbar-add-mode-functions-list
+      '("MYEXTENSION"
+        (speedbar-item-info . MyExtension-speedbar-item-info)
+        (speedbar-line-directory . MyExtension-speedbar-line-directory)))
+
+   The first element in the list is the name of you extension.  The
+second is an alist of functions to overload.  The function to overload
+is first, followed by what you want called instead.
+
+   For `speedbar-line-directory' your function should take an optional
+DEPTH parameter.  This is the starting depth for heavily indented
+lines.  If it is not provided, you can derive it like this:
+
+     (save-match-data
+       (if (not depth)
+           (progn
+             (beginning-of-line)
+             (looking-at "^\\([0-9]+\\):")
+             (setq depth (string-to-int (match-string 1)))))
+
+where the depth is stored as invisible text at the beginning of each
+line.
+
+   The path returned should be the full path name of the file associated
+with that line.  If the cursor is on a tag, then the file containing
+that tag should be returned.  This is critical for built in file based
+functions to work (meaning less code for you to write).  If your display
+does not deal in files, you do not need to overload this function.
+
+   The function `speedbar-item-info', however, is very likely to need
+overloading.  This function takes no parameters and must derive a text
+summary to display in the minibuffer.
+
+   There are several helper functions you can use if you are going to
+use built in tagging.  These functions can be `or'ed since each one
+returns non-`nil' if it displays a message.  They are:
+
+`speedbar-item-info-file-helper'
+     This takes an optional FILENAME parameter.  You can derive your own
+     filename, or it will derive it using a (possibly overloaded)
+     function `speedbar-line-file'.  It shows details about a file.  
+
+`speedbar-item-info-tag-helper'
+     If the current line is a tag, then display information about that
+     tag, such as its parent file, and location.
+
+   Your custom function might look like this:
+
+     (defun MyExtension-item-info ()
+       "Display information about the current line."
+       (or (speedbar-item-info-tag-helper)
+           (message "Interesting detail.")))
+
+   Once you have done all this, speedbar will show an entry in the
+`Displays' menu declaring that your extension is available.
+
+   If your major mode is running slowly, you may need to add a set of
+stealthy update functions.
+
+ -- Variable: speedbar-stealthy-function-list
+     List of functions to periodically call stealthily.  Each function
+     must return `nil' if interrupted, or `t' if completed.  Stealthy
+     functions which have a single operation should always return `t'.
+     Functions which take a long time should maintain a state (where
+     they are in their speedbar related calculations) and permit
+     interruption.  See "speedbar-check-vc" as a good example.
+
+   Stealthy functions are currently used in files mode.  The first
+activity is to display the main list with minimal decorations though
+the buttons function.  Once that is done, additional work can be done
+decorating different lines after the fact.
+
+   For files mode, VC status and read-only markers can calculated after
+the first display is up.  Because the process of calculating that
+information can be slow, these functions are interruptable, and will
+continue processing at a later time out.
+
+
+File: speedbar.info,  Node: Tagging Extensions,  Next: Creating a display,  Prev: Major Display Modes,  Up: Extending
+
+7.3 Tagging Extensions
+======================
+
+It is possible to create new methods for tagging files in speedbar.  To
+do this, you need two basic functions, one function to fetch the tags
+from a buffer, the other to insert them below the filename.
+
+ -- Function: my-fetch-dynamic-tags file
+     Parse FILE for a list of tags.  Return the list, or `t' if there
+     was an error.  FILE is not necessarily available as an buffer when
+     your function is called.  Be sure to load it if it is needed with
+     code like this:
+
+          (save-excursion
+            (set-buffer (find-file-noselect file))
+            ...
+            )
+
+   The non-error return value can be anything, as long as it can be
+inserted by its paired function:
+
+ -- Function: my-insert-tag-list level lst
+     Insert a list of tags LST started at indentation level LEVEL.
+     Creates buttons for each tag, and provides any other display
+     information required.
+
+   It is often useful to use `speedbar-create-tag-hierarchy' on your
+tag list *Note Creating a display::.
+
+   Once these two functions are written, modify the variable
+`speedbar-dynamic-tags-function-list' to include your parser at the
+beginning, like this:
+
+     (add-to-list 'speedbar-dynamic-tags-function-list
+     	     '(my-fetch-dynamic-tags  . my-insert-tag-list))
+
+ -- Variable: speedbar-dynamic-tags-function-list
+     A list of functions which will return and insert a list of tags.
+     Each element is of the form ( FETCH .  INSERT ) where FETCH is a
+     function which takes one parameter (the file to tag) and returns a
+     list of tags.  The tag list can be of any form as long as the
+     corresponding insert method can handle it.  If it returns `t',
+     then an error occurred, and the next fetch routine is tried.
+     INSERT is a function which takes an INDENTation level, and a LIST
+     of tags to insert.  It will then create the speedbar buttons.
+
+   If your parser is only good for a few types of files (ie, just
+texinfo files), make sure that it is either a buffer local modification
+(set only in texi files), or that the tag generator returns `t' for
+unsupported buffers.
+
+
+File: speedbar.info,  Node: Creating a display,  Prev: Tagging Extensions,  Up: Extending
+
+7.4 Creating a display
+======================
+
+Rendering a display in speedbar is completely flexible.  When your
+button function is called, see *Note Minor Display Modes::, and *Note
+Major Display Modes::, you have control to `insert' anything you want.
+
+   The conventions allow almost anything to be inserted, but several
+helper functions are provided to make it easy to create the standardized
+buttons.
+
+   To understand the built in functions, each `button' in speedbar
+consists of four important pieces of data.  The text to be displayed,
+token data to be associated with the text, a function to call, and some
+face to display it in.
+
+   When a function is provided, then that text becomes mouse activated,
+meaning the mouse will highlight the text.
+
+   Additionally, for data which can form deep trees, each line is given
+a depth which indicates how far down the tree it is.  This information
+is stored in invisible text at the beginning of each line, and is used
+by the navigation commands.
+
+* Menu:
+
+* Creating Buttons::
+* Generic Tag Lists::
+* Expand Buttons::
+
+
+File: speedbar.info,  Node: Creating Buttons,  Next: Generic Tag Lists,  Up: Creating a display
+
+7.4.1 Creating Speedbar Buttons
+-------------------------------
+
+While it is certainly possible to insert your own text and add
+decorations to it, it is preferable to use the speedbar button creation
+API instead.
+
+ -- Function: speedbar-insert-button text face mouse function &optional
+          token prevline
+     This function inserts one button into the current location.  TEXT
+     is the text to insert.  FACE is the face in which it will be
+     displayed.   MOUSE is the face to display over the text when the
+     mouse passes over it.  FUNCTION is called whenever the user clicks
+     on the text.
+
+     The optional argument TOKEN is extra data to associated with the
+     text.  Lastly PREVLINE should be non-`nil' if you want this line to
+     appear directly after the last button which was created instead of
+     on the next line.
+
+   This routine creates a single button in the display, such as a [+]
+button, or the text that goes after it.  It is designed to be called
+iteratively with indicators on when to add carriage returns between
+buttons.
+
+   To insert a more traditional speedbar line that includes an expansion
+button followed by clickable text, it is preferable to create a
+tag-line.  Tag lines should be used to represent typical data a user
+will interact with.
+
+ -- Function: speedbar-make-tag-line exp-button-type exp-button-char
+          exp-button-function exp-button-data tag-button
+          tag-button-function tag-button-data tag-button-face depth
+     Create a tag line with EXP-BUTTON-TYPE for the small expansion
+     button.  This is the button that expands or contracts a node (if
+     applicable), and EXP-BUTTON-CHAR the character in it (`+', `-',
+     `?', etc).  EXP-BUTTON-FUNCTION is the function to call if it's
+     clicked on.  Button types are `'bracket', `'angle', `'curly',
+     `'expandtag', `'statictag', or nil.  EXP-BUTTON-DATA is extra data
+     attached to the text forming the expansion button.
+
+     Next, TAG-BUTTON is the text of the tag.  TAG-BUTTON-FUNCTION is
+     the function to call if clicked on, and TAG-BUTTON-DATA is the
+     data to attach to the text field (such a tag positioning, etc).
+     TAG-BUTTON-FACE is a face used for this type of tag.
+
+     Lastly, DEPTH shows the depth of expansion.
+
+     This function assumes that the cursor is in the speedbar window at
+     the position to insert a new item, and that the new item will end
+     with a CR.
+
+   Major display modes that use this function will have a consistant
+look and feel and reliable image use.
+
+
+File: speedbar.info,  Node: Generic Tag Lists,  Next: Expand Buttons,  Prev: Creating Buttons,  Up: Creating a display
+
+7.4.2 Generic Tag Lists
+-----------------------
+
+For data stored in a hierarchical list, it is likely possible to have
+the entire data structure inserted with the speedbar generic list
+methods.
+
+   These insertion functions assume that the data represents 'tags', or
+data extracted from inside a file, and they are marked with tag markers.
+
+   Tags stored in this format can then be manipulated by the tag
+hierarchy methods described earlier in this manual.
+
+ -- Function: speedbar-insert-generic-list level list expand-fun
+          find-fun
+     At LEVEL, (the current indentation level desired) insert a generic
+     multi-level alist LIST.  Associations with lists get `{+}' tags
+     (to expand into more nodes) and those with positions or other data
+     just get a `>' as the indicator.  `{+}' buttons will have the
+     function EXPAND-FUN and the token is the `cdr' list.  The token
+     name will have the function FIND-FUN and not token.
+
+     Each element of the list can have one of these forms:
+
+    `(NAME . marker-or-number)'
+          One tag at this level.
+
+    `(NAME (NAME . marker-or-number) (NAME . marker-or-number) ... )'
+          One group of tags.
+
+    `(NAME marker-or-number (NAME . marker-or-number) ... )'
+          One Group of tags where the group has a starting position.
+
+     When you use `speedbar-insert-generic-list', there are some
+     variables you can set buffer-locally to change the behavior.  The
+     most obvious is `speedbar-tag-hierarchy-method'.  *Note Tag
+     Hierarchy Methods::.
+
+      -- Variable: speedbar-generic-list-group-expand-button-type
+          This is the button type used for groups of tags, whether
+          expanded or added in via a hierarchy method.  Two good values
+          are `'curly' and `'expandtag'.  Curly is the default button,
+          and `'expandtag' is useful if the groups also has a position.
+
+      -- Variable: speedbar-generic-list-tag-button-type
+          This is the button type used for a single tag.  Two good
+          values are `nil' and `'statictag'.  `nil' is the default, and
+          `'statictag' has the same width as `'expandtag'.
+
+
+
+File: speedbar.info,  Node: Expand Buttons,  Prev: Generic Tag Lists,  Up: Creating a display
+
+7.4.3 Expand Buttons
+--------------------
+
+Once you have made some buttons, you need to hitch them up to do
+something once clicked on.  This is set up with
+`speedbar-make-tag-line' which takes two functions.  One is for the
+expand button, and the other for the tag.
+
+   The function for the tag can be anything, but the expand button has
+certain expectations.  When that button is has a `+' in it, that
+indicates that there is "more" inside.  A `-' indicates that a section
+can be closed.
+
+   The expand function takes the same signature as all speedbar button
+functions, such as:
+
+     (defun MY-expand-function (text token indent)
+        "Display more information about MY thing.
+     ..."
+
+   This function should then use the TEXT parameter to determine what
+to do.  For example:
+
+       (cond ((string-match "+" text)	;we have to expand this file
+              ;; Expand stuff here
+              )
+     	((string-match "-" text)	;we have to contract this node
+              ;; Contract stuff here
+              ))
+
+   When expanding or contracting, you will need to change the `+' or
+`-' into the opposite symbol.  You can do that with
+
+ -- Function: speedbar-change-expand-button-char char
+     Change the expansion button character to CHAR for the current line.
+
+   Our sample would then look like this:
+
+       (cond ((string-match "+" text)	;we have to expand this file
+              ;; Expand stuff here
+     	 (speedbar-change-expand-button-char ?-)
+              )
+     	((string-match "-" text)	;we have to contract this node
+              ;; Contract stuff here
+     	 (speedbar-change-expand-button-char ?+)
+              ))
+
+   To expand text, the speedbar buffer needs to be writable.  The
+initial button insertion function runs while the buffer is writable,
+but an expand function will need to change that.  The best way is to use
+`speedbar-with-writable'.
+
+ -- Function: speedbar-with-writable &rest forms
+     Allow the speedbar buffer to be writable and evaluate FORMS.
+
+   Once the buffer is writable, then you can insert more information
+using any mechanism you like.  Remember that the cursor will be on the
+expand button just clicked though.  As such, the code might look like
+this:
+
+       (cond ((string-match "+" text)	;we have to expand this file
+              ;; Expand stuff here
+     	 (speedbar-change-expand-button-char ?-)
+     	 (speedbar-with-writable
+     	   (save-excursion
+     	     (end-of-line) (forward-char 1)
+                  ;; Insert goodies here.
+                ))
+              )
+
+   Contracting a node is a bit easier.  You can just use this built in
+function to do the work:
+
+ -- Function: speedbar-delete-subblock indent
+     Delete text from point to indentation level INDENT or greater.
+     Handles end-of-sublist smartly.
+
+     Remember that INDENT is also available as passed into
+     `MY-expand-function'.
+
+   The end result would then look like this:
+
+       (cond ((string-match "+" text)	;we have to expand this file
+              ;; Expand stuff here
+     	 (speedbar-change-expand-button-char ?-)
+     	 (speedbar-with-writable
+     	   (save-excursion
+     	     (end-of-line) (forward-char 1)
+                  ;; Insert goodies here.
+                ))
+              )
+     	((string-match "-" text)	;we have to contract this node
+              ;; Contract stuff here
+     	 (speedbar-change-expand-button-char ?+)
+     	 (speedbar-delete-subblock indent))
+              ))
+
+   Expand buttons, unlike other speedbar operations can cause new data
+to appear in speedbar which would be useful to force onto the screen.
+You can then recenter using this function:
+
+ -- Function: speedbar-center-buffer-smartly
+     Recenter a speedbar buffer so the current indentation level is all
+     visible.  This assumes that the cursor is on a file, or tag of a
+     file which the user is interested in.
+
+
+File: speedbar.info,  Node: Index,  Prev: Extending,  Up: Top
+
+Concept Index
+*************
+
+[index]
+* Menu:
+
+* buffer mode:                           Buffer Mode.         (line   6)
+* common keys:                           Basic Key Bindings.  (line  59)
+* create major display mode:             Major Display Modes. (line   6)
+* create minor display mode:             Minor Display Modes. (line   6)
+* creating a display:                    Creating a display.  (line   6)
+* customizing:                           Customizing.         (line   6)
+* directory display:                     Directory Display.   (line   6)
+* displays submenu:                      Displays Submenu.    (line   6)
+* extending:                             Extending.           (line   6)
+* faces:                                 Frames and Faces.    (line   6)
+* file flags:                            Directory Display.   (line  51)
+* file key bindings:                     File Key Bindings.   (line   6)
+* file mode:                             File Mode.           (line   6)
+* frame parameters:                      Frames and Faces.    (line   6)
+* gdb:                                   GDB.                 (line   6)
+* groups:                                Basic Visuals.       (line  27)
+* gud:                                   GDB.                 (line   6)
+* hidden files:                          Hidden Files.        (line   6)
+* hooks:                                 Hooks.               (line   6)
+* Info:                                  Info.                (line   6)
+* introduction:                          Introduction.        (line   6)
+* key bindings:                          Basic Key Bindings.  (line   6)
+* minor display modes:                   Minor Modes.         (line   6)
+* mode switching hotkeys:                Basic Key Bindings.  (line  46)
+* mouse bindings:                        Mouse Bindings.      (line   6)
+* my-fetch-dynamic-tags:                 Tagging Extensions.  (line  11)
+* my-insert-tag-list:                    Tagging Extensions.  (line  25)
+* navigation:                            Basic Key Bindings.  (line  24)
+* power click:                           Mouse Bindings.      (line  25)
+* quitting speedbar:                     Basic Key Bindings.  (line   9)
+* refresh speedbar display:              Basic Key Bindings.  (line  16)
+* RMAIL:                                 RMAIL.               (line   6)
+* slowbar mode:                          Basic Key Bindings.  (line  19)
+* speedbar-before-delete-hook:           Hooks.               (line  25)
+* speedbar-before-popup-hook:            Hooks.               (line  21)
+* speedbar-button-face:                  Frames and Faces.    (line  10)
+* speedbar-center-buffer-smartly:        Expand Buttons.      (line 105)
+* speedbar-change-expand-button-char:    Expand Buttons.      (line  37)
+* speedbar-contract-line:                Major Display Modes. (line  27)
+* speedbar-create-tag-hierarchy:         Tagging Extensions.  (line  29)
+* speedbar-delete-subblock:              Expand Buttons.      (line  77)
+* speedbar-directory-face:               Frames and Faces.    (line  15)
+* speedbar-directory-unshown-regexp:     Version Control.     (line  13)
+* speedbar-dynamic-tags-function-list:   Tagging Extensions.  (line  32)
+* speedbar-edit-line:                    Major Display Modes. (line  22)
+* speedbar-expand-line:                  Major Display Modes. (line  23)
+* speedbar-file-face:                    Frames and Faces.    (line  11)
+* speedbar-frame-parameters, Emacs:      Frames and Faces.    (line  35)
+* speedbar-frame-plist, XEmacs:          Frames and Faces.    (line  40)
+* speedbar-get-focus:                    Introduction.        (line  28)
+* speedbar-highlight-face:               Frames and Faces.    (line  26)
+* speedbar-insert-button:                Creating Buttons.    (line  12)
+* speedbar-insert-generic-list:          Generic Tag Lists.   (line  18)
+* speedbar-item-info:                    Major Display Modes. (line  87)
+* speedbar-item-info-file-helper:        Major Display Modes. (line  95)
+* speedbar-item-info-tag-helper:         Major Display Modes. (line  98)
+* speedbar-line-directory:               Major Display Modes. (line  32)
+* speedbar-load-hook:                    Hooks.               (line  13)
+* speedbar-make-specialized-keymap:      Major Display Modes. (line  17)
+* speedbar-make-tag-line:                Creating Buttons.    (line  36)
+* speedbar-mode-hook:                    Hooks.               (line  28)
+* speedbar-obj-alist:                    Directory Display.   (line  53)
+* speedbar-prefix-group-tag-hierarchy:   Tag Hierarchy Methods.
+                                                              (line  17)
+* speedbar-reconfigure-keymaps-hook:     Hooks.               (line  16)
+* speedbar-scanner-reset-hook:           Hooks.               (line  34)
+* speedbar-selected-face:                Frames and Faces.    (line  22)
+* speedbar-simple-group-tag-hierarchy:   Tag Hierarchy Methods.
+                                                              (line  21)
+* speedbar-sort-tag-hierarchy:           Tag Hierarchy Methods.
+                                                              (line  25)
+* speedbar-tag-face:                     Frames and Faces.    (line  19)
+* speedbar-tag-group-name-minimum-length: Tag Hierarchy Methods.
+                                                              (line  35)
+* speedbar-tag-hierarchy-method:         Tag Hierarchy Methods.
+                                                              (line  11)
+* speedbar-tag-regroup-maximum-length:   Tag Hierarchy Methods.
+                                                              (line  59)
+* speedbar-tag-split-minimum-length:     Tag Hierarchy Methods.
+                                                              (line  52)
+* speedbar-timer-hook:                   Hooks.               (line  31)
+* speedbar-trim-words-tag-hierarchy:     Tag Hierarchy Methods.
+                                                              (line  16)
+* speedbar-vc-directory-enable-hook:     Version Control.     (line  17)
+* speedbar-vc-in-control-hook:           Version Control.     (line  23)
+* speedbar-vc-indicator:                 Version Control.     (line  27)
+* speedbar-visiting-file-hook:           Hooks.               (line   9)
+* speedbar-visiting-tag-hook:            Hooks.               (line  10)
+* speedbar-with-writable:                Expand Buttons.      (line  56)
+* tag groups:                            Tag Hierarchy Methods.
+                                                              (line   6)
+* tag hierarchy:                         Tag Hierarchy Methods.
+                                                              (line   6)
+* tag sorting:                           Tag Hierarchy Methods.
+                                                              (line   6)
+* tags:                                  Basic Visuals.       (line  61)
+* vc extensions:                         Version Control.     (line   6)
+* version control:                       Version Control.     (line   6)
+* visuals:                               Basic Visuals.       (line   6)
+
+
+
+Tag Table:
+Node: Top1466
+Node: Introduction3242
+Node: Basic Navigation4806
+Node: Basic Key Bindings5251
+Node: Basic Visuals7392
+Node: Mouse Bindings11347
+Node: Displays Submenu12972
+Node: File Mode13652
+Node: Directory Display14259
+Node: Hidden Files17299
+Node: File Key Bindings18746
+Node: Buffer Mode20180
+Node: Minor Modes21295
+Node: RMAIL22151
+Node: Info23049
+Node: GDB23656
+Node: Customizing24323
+Node: Frames and Faces25134
+Node: Tag Hierarchy Methods26472
+Node: Version Control28698
+Node: Hooks30045
+Node: Extending31301
+Node: Minor Display Modes32347
+Node: Major Display Modes34338
+Ref: speedbar-stealthy-function-list39277
+Node: Tagging Extensions40186
+Ref: speedbar-dynamic-tags-function-list41671
+Node: Creating a display42451
+Node: Creating Buttons43616
+Node: Generic Tag Lists46257
+Node: Expand Buttons48520
+Ref: speedbar-change-expand-button-char49814
+Ref: speedbar-with-writable50543
+Ref: speedbar-delete-subblock51295
+Ref: speedbar-center-buffer-smartly52294
+Node: Index52480
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/speedbar/speedbar.texi b/site/cedet-1.0pre7/speedbar/speedbar.texi
new file mode 100755
index 0000000..0d55892
--- /dev/null
+++ b/site/cedet-1.0pre7/speedbar/speedbar.texi
@@ -0,0 +1,1486 @@
+\input texinfo   @c -*-texinfo-*-
+@c
+@c $Id: speedbar.texi,v 1.19 2005/10/22 02:54:34 zappo Exp $
+@c
+
+@c This file is part of GNU Emacs
+
+@c GNU Emacs is free software; you can redistribute it and/or modify it
+@c under the terms of the GNU General Public License as published by the
+@c Free Software Foundation; either version 2 of the License, or (at
+@c your option) any later version.
+
+@c GNU Emacs is distributed in the hope that it will be useful, but
+@c WITHOUT ANY WARRANTY; without even the implied warranty of
+@c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+@c General Public License for more details.
+
+@c You should have received a copy of the GNU General Public License
+@c along with GNU Emacs; see the file COPYING.  If not, write to the
+@c Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+@c Boston, MA 02110-1301, USA.
+
+@setfilename speedbar.info
+@settitle Speedbar: File/Tag summarizing utility
+
+@dircategory Emacs
+@direntry
+* Speedbar: (speedbar).        File/Tag summarizing utility.
+@end direntry
+@ifnottex
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
+``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
+Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License'' in the Emacs manual.
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end ifnottex
+
+@dircategory Emacs
+@direntry
+* Speedbar: (speedbar). File/Tag summarizing utility.
+@end direntry
+
+@titlepage
+@sp 10
+@center @titlefont{Speedbar}
+@sp 2
+@center Eric Ludlam
+@vskip 0pt plus 1 fill
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@syncodeindex fn cp
+
+@node Top, , , (dir)Top
+@comment  node-name,  next,  previous,  up
+
+Speedbar is a program for Emacs which can be used to summarize
+information related to the current buffer.  Its original inspiration
+is the `explorer' often used in modern development environments, office
+packages, and web browsers.
+
+Speedbar displays a narrow frame in which a tree view is shown.  This
+tree view defaults to containing a list of files and directories.  Files
+can be `expanded' to list tags inside. Directories can be expanded to
+list the files within itself.  Each file or tag can be jumped to
+immediately.
+
+Speedbar expands upon `explorer' windows by maintaining context with the
+user.  For example, when using the file view, the current buffer's file
+is highlighted.  Speedbar also mimics the explorer windows by providing
+multiple display modes.  These modes come in two flavors.  Major display
+modes remain consistent across buffers, and minor display modes appear
+only when a buffer of the applicable type is shown.  This allows
+authors of other packages to provide speedbar summaries customized to
+the needs of that mode.
+
+Throughout this manual, activities are defined as `clicking on', or
+`expanding' items.  Clicking means using @kbd{Mouse-2} on a
+button.  Expanding refers to clicking on an expansion button to display
+an expanded summary of the entry the expansion button is
+on.  @xref{Basic Navigation}.
+
+@menu
+* Introduction::     Basics of speedbar.
+* Basic Navigation:: Basics of speedbar common between all modes.
+* File Mode::        Summarizing files.
+* Buffer Mode::      Summarizing buffers.
+* Minor Modes::      Additional minor modes such as Info and RMAIL.
+* Customizing::      Changing speedbar behavior.
+* Extending::        Extend speedbar for your own project.
+* Index::
+@end menu
+
+@node Introduction, Basic Navigation, , Top
+@comment  node-name,  next,  previous,  up
+@chapter Introduction
+@cindex introduction
+
+To start using speedbar use the command @kbd{M-x speedbar RET} or select
+it from the Tools menu in versions of Emacs with speedbar installed by
+default.  This command will open a new frame to summarize the local
+files.  On X Window systems or on MS-Windows, speedbar's frame is twenty
+characters wide, and will mimic the height of the frame from which it
+was started.  It positions itself to the left or right of the frame you
+started it from.
+
+To use speedbar effectively, it is important to understand its
+relationship with the frame you started it from.  This frame is the
+@dfn{attached frame} which speedbar will use as a reference point.  Once
+started, speedbar watches the contents of this frame, and attempts to
+make its contents relevant to the buffer loaded into the attached
+frame.  In addition, all requests made in speedbar that require the
+display of another buffer will display in the attached frame.
+
+When used in terminal mode, the new frame appears the same size as the
+terminal.  Since it is not visible while working in the attached frame,
+speedbar will save time by using the @dfn{slowbar mode}, where no tracking is
+done until speedbar is requested to show itself (i.e., the speedbar's
+frame becomes the selected frame).
+
+@cindex @code{speedbar-get-focus}
+The function to use when switching between frames using the keyboard is
+@code{speedbar-get-focus}.  This function will toggle between frames, and
+it's useful to bind it to a key in terminal mode.  @xref{Customizing}.
+
+@node Basic Navigation, File Mode, Introduction, Top
+@comment  node-name,  next,  previous,  up
+@chapter Basic Navigation
+
+Speedbar can display different types of data, and has several display
+and behavior modes.  These modes all have a common behavior, menu
+system, and look.  If one mode is learned, then the other modes are easy
+to use.
+
+@menu
+* Basic Key Bindings::
+* Basic Visuals::
+* Mouse Bindings::
+* Displays Submenu::
+@end menu
+
+@node Basic Key Bindings, Basic Visuals, Basic Navigation, Basic Navigation
+@comment  node-name,  next,  previous,  up
+@section Basic Key Bindings
+@cindex key bindings
+
+These key bindings are common across all modes:
+
+@table @kbd
+@item Q
+@cindex quitting speedbar
+Quit speedbar, and kill the frame.
+@item q
+Quit speedbar, and hide the frame.  This makes it faster to restore the
+speedbar frame, than if you press @kbd{Q}.
+@item g
+@cindex refresh speedbar display
+Refresh whatever contents are in speedbar.
+@item t
+@cindex slowbar mode
+Toggle speedbar to and from slowbar mode.  In slowbar mode, frame
+tracking is not done.
+@item n
+@itemx p
+@cindex navigation
+Move, respectively, to the next or previous item.  A summary of that
+item will be displayed in the attached frame's minibuffer.
+@item M-n
+@itemx M-p
+Move to the next or previous item in a restricted fashion.  If a list is
+open, the cursor will skip over it.  If the cursor is in an open list,
+it will not leave it.
+@item C-M-n
+@itemx C-M-n
+Move forwards and backwards across extended groups.  This lets you
+quickly skip over all files, directories, or other common sub-items at
+the same current depth.
+@item C-x b
+Switch buffers in the attached frame.
+@end table
+
+Speedbar can handle multiple modes.  Two are provided by default.
+These modes are File mode, and Buffers mode.  There are accelerators to
+switch into these different modes.
+
+@cindex mode switching hotkeys
+@table @kbd
+@item b
+Switch into Quick Buffers mode (@pxref{Buffer Mode}).  After one use, the
+previous display mode is restored.
+@item f
+Switch into File mode.
+@item r
+Switch back to the previous mode.
+@end table
+
+Some modes provide groups, lists and tags.  @xref{Basic Visuals}.  When
+these are available, some additional common bindings are available.
+
+@cindex common keys
+@table @kbd
+@item RET
+@itemx e
+Edit/Open the current group or tag.  This behavior is dependent on the
+mode.  In general, files or buffers are opened in the attached frame,
+and directories or group nodes are expanded locally.
+@item +
+@itemx =
+Expand the current group, displaying sub items.
+When used with a prefix argument, any data that may have been cached is
+flushed.  This is similar to a power click.  @xref{Mouse Bindings}.
+@item -
+Contract the current group, hiding sub items.
+@end table
+
+@node Basic Visuals, Mouse Bindings, Basic Key Bindings, Basic Navigation
+@comment  node-name,  next,  previous,  up
+@section Basic Visuals
+@cindex visuals
+
+Speedbar has visual cues for indicating different types of data.  These
+cues are used consistently across the different speedbar modes to make
+them easier to interpret.
+
+At a high level, in File mode, there are directory buttons, sub
+directory buttons, file buttons, tag buttons, and expansion buttons.
+This makes it easy to use the mouse to navigate a directory tree, and
+quickly view files, or a summary of those files.
+
+The most basic visual effect used to distinguish between these button
+types is color and mouse highlighting.  Anything the mouse highlights
+can be clicked on and is called a button (@pxref{Mouse Bindings}).
+Anything not highlighted by the mouse will not be clickable.
+
+Text in speedbar consists of four different types of data.  Knowing how
+to read these textual elements will make it easier to navigate by
+identifying the types of data available.
+
+@subsubsection Groups
+@cindex groups
+
+Groups summarize information in a single line, and provide a high level
+view of more complex systems, like a directory tree, or manual chapters.
+
+Groups appear at different indentation levels, and are prefixed with a
+@samp{+} in some sort of `box'.  The group name will summarize the
+information within it, and the expansion box will display that
+information inline.  In File mode, directories and files are `groups'
+where the @samp{+} is surrounded by brackets like this:
+
+@example
+<+> include
+<-> src
+ [+] foo.c
+@end example
+
+In this example, we see both open and closed directories, in addition to
+a file.  The directories have a box consisting of angle brackets, and a
+file uses square brackets.
+
+In all modes, a group can be `edited' by pressing @kbd{RET}, meaning a
+file will be opened, or a directory explicitly opened in speedbar.  A
+group can be expanded or contracted using @kbd{+} or
+@kbd{-}.  @xref{Basic Key Bindings}.
+
+Sometimes groups may have a @samp{?} in its indicator box.  This means
+that it is a group type, but there are no contents, or no known way of
+extracting contents of that group.
+
+When a group has been expanded, the indicator button changes from
+@samp{+} to @samp{-}.  This indicates that the contents are being shown.
+Click the @samp{-} button to contract the group, or hide the contents
+currently displayed.
+
+@subsubsection Tags
+@cindex tags
+
+Tags are the leaf nodes of the tree system.  Tags are generally prefixed
+with a simple character, such as @samp{>}.  Tags can only be jumped to using
+@kbd{RET} or @kbd{e}.
+
+@subsubsection Boolean Flags
+
+Sometimes a group or tag is given a boolean flag.  These flags appear as
+extra text characters at the end of the line.  File mode uses boolean
+flags, such as a @samp{*} to indicate that a file has been checked out
+of a versioning system.
+
+For additional flags, see
+@c Note to self, update these to sub-nodes which are more relevant.
+@ref{File Mode}, and @ref{Version Control}.
+
+@subsubsection Unadorned Text
+
+Unadorned text generally starts in column 0, without any special symbols
+prefixing them.  In Buffers mode different buffer groups are prefixed
+with a description of what the following buffers are (Files, scratch
+buffers, and invisible buffers.)
+
+Unadorned text will generally be colorless, and not clickable.
+
+@subsubsection Color Cues
+
+Each type of Group, item indicator, and label is given a different
+color.  The colors chosen are dependent on whether the background color
+is light or dark.
+Of important note is that the `current item', which may be a buffer or
+file name, is highlighted red, and underlined.
+
+Colors can be customized from the group @code{speedbar-faces}.  Some
+modes, such as for Info, will use the Info colors instead of default
+speedbar colors as an indication of what is currently being displayed.
+
+The face naming convention mirrors the File display mode.  Modes which
+do not use files will attempt to use the same colors on analogous
+entries.
+
+@node Mouse Bindings, Displays Submenu, Basic Visuals, Basic Navigation
+@comment  node-name,  next,  previous,  up
+@section Mouse Bindings
+@cindex mouse bindings
+
+The mouse has become a common information navigation tool.  Speedbar
+will use the mouse to navigate file systems, buffer lists, and other
+data.  The different textual cues provide buttons which can be clicked
+on (@pxref{Basic Visuals}).  Anything that highlights can be clicked on
+with the mouse, or affected by the menu.
+
+The mouse bindings are:
+
+@table @kbd
+@item Mouse-1
+Move cursor to that location.
+@item Mouse-2
+@itemx Double-Mouse-1
+Activate the current button.  @kbd{Double-Mouse-1} is called a @dfn{double
+click} on other platforms, and is useful for windows users with two
+button mice.
+@c Isn't it true that with two-button mice, the right button is Mouse-2?
+@c On GNU/Linux, the right button is Mouse-3.
+@item S-Mouse-2
+@itemx S-Double-Mouse-1
+@cindex power click
+This has the same effect as @kbd{Mouse-2}, except it is called a power
+click.  This means that if a group with an expansion button @samp{+} is
+clicked, any caches are flushed, and subitems re-read.  If it is a name,
+it will be opened in a new frame.
+@item Mouse-3
+Activate the speedbar menu.  The item selected affects the line clicked,
+not the line where the cursor was.
+@item Mouse-1 @r{(mode line)}
+Activate the menu.  This affects the item the cursor is on before the
+click, since the mouse was not clicked on anything.
+@item C-Mouse-1
+Buffers sub-menu.  The buffer in the attached frame is switched.
+@end table
+
+When the mouse moves over buttons in speedbar, details of that item
+should be displayed in the minibuffer of the attached frame.  Sometimes
+this can contain extra information such as file permissions, or tag
+location.
+
+@node Displays Submenu, , Mouse Bindings, Basic Navigation
+@comment  node-name,  next,  previous,  up
+@section Displays Submenu
+@cindex displays submenu
+
+You can display different data by using different display modes.  These
+specialized modes make it easier to navigate the relevant pieces of
+information, such as files and directories, or buffers.
+
+In the main menu, found by clicking @kbd{Mouse-3}, there is a submenu
+labeled @samp{Displays}.  This submenu lets you easily choose between
+different display modes.
+
+The contents are modes currently loaded into emacs.  By default, this
+would include Files, Quick Buffers, and Buffers.  Other major display
+modes such as Info are loaded separately.
+
+@node File Mode, Buffer Mode, Basic Navigation, Top
+@comment  node-name,  next,  previous,  up
+@chapter File Mode
+@cindex file mode
+
+File mode displays a summary of your current directory.  You can display
+files in the attached frame, or summarize the tags found in files.  You
+can even see if a file is checked out of a version control system, or
+has some associated object file.
+
+Advanced behavior, like copying and renaming files, is also provided.
+
+@menu
+* Directory Display::   What the display means.
+* Hidden Files::        How to display hidden files.
+* File Key Bindings::   Performing file operations.
+@end menu
+
+@node Directory Display, Hidden Files, File Mode, File Mode
+@comment  node-name,  next,  previous,  up
+@section Directory Display
+@cindex directory display
+
+There are three major sections in the display.  The first line or two is
+the root directory speedbar is currently viewing.  You can jump to one
+of the parent directories by clicking on the name of the directory you
+wish to jump to.
+
+Next, directories are listed.  A directory starts with the group
+indicator button @samp{<+>}.  Clicking the directory name makes speedbar
+load that directory as the root directory for its display.  Clicking the
+@samp{<+>} button will list all directories and files beneath.
+
+Next, files are listed.  Files start with the group indicator @samp{[+]}
+or @samp{[?]}.  You can jump to a file in the attached frame by clicking
+on the file name.  You can expand a file and look at its tags by
+clicking on the @samp{[+]} symbol near the file name.
+
+A typical session might look like this:
+
+@example
+~/lisp/
+<+> checkdoc
+<+> eieio
+<-> speedbar
+ [+] Makefile
+ [+] rpm.el #
+ [+] sb-gud.el #
+ [+] sb-info.el #
+ [+] sb-rmail.el #
+ [+] sb-w3.el
+ [-] speedbar.el *!
+  @{+@} Types
+  @{+@} Variables
+  @{+@} def (group)
+  @{+@} speedbar-
+ [+] speedbar.texi *
+<+> testme
+[+] align.el
+[+] autoconf.el
+@end example
+
+In this example, you can see several directories.  The directory
+@file{speedbar} has been opened inline.  Inside the directory
+@file{speedbar}, the file @file{speedbar.el} has its tags exposed.
+These tags are extensive, and they are summarized into tag groups.
+
+Files get additional boolean flags associated with them.  Valid flags are:
+
+@cindex file flags
+@table @code
+@item *
+This file has been checked out of a version control
+system.  @xref{Version Control}.
+@cindex @code{speedbar-obj-alist}
+@item #
+This file has an up to date object file associated with it.  The
+variable @code{speedbar-obj-alist} defines how speedbar determines this
+value.
+@item !
+This file has an out of date object file associated with it.
+@end table
+
+A Tag group is prefixed with the symbol @samp{@{+@}}.  Clicking this
+symbol will show all symbols that have been organized into that group.
+Different types of files have unique tagging methods as defined by their
+major mode.  Tags are generated with either the @code{imenu} package, or
+through the @code{etags} interface.
+
+Tag groups are defined in multiple ways which make it easier to find the
+tag you are looking for.  Imenu keywords explicitly create groups, and
+speedbar will automatically create groups if tag lists are too long.
+
+In our example, Imenu created the groups @samp{Types} and
+@samp{Variables}.  All remaining top-level symbols are then regrouped
+based on the variable @code{speedbar-tag-hierarchy-method}.  The
+subgroups @samp{def} and @samp{speedbar-} are groupings where the first
+few characters of the given symbols are specified in the group name.
+Some group names may say something like @samp{speedbar-t to speedbar-v},
+indicating that all symbols which alphabetically fall between those
+categories are included in that sub-group.  @xref{Tag Hierarchy Methods}.
+
+@node Hidden Files, File Key Bindings, Directory Display, File Mode
+@comment  node-name,  next,  previous,  up
+@section Hidden Files
+@cindex hidden files
+
+On GNU and Unix systems, a hidden file is a file whose name starts
+with a period.  They are hidden from a regular directory listing
+because the user is not generally interested in them.
+
+In speedbar, a hidden file is a file which isn't very interesting and
+might prove distracting to the user.  Any uninteresting files are
+removed from the File display.  There are two levels of uninterest in
+speedbar.  The first level of uninterest are files which have no
+expansion method, or way of extracting tags.  You can define which
+files are interesting with
+@code{speedbar-supported-extension-expressions}.  The second level is
+any file that matches the same pattern used for completion in
+@code{find-file}.  This is derived from the variable
+@code{completion-ignored-extensions}.  This filter will override the
+supported extensions, so if you add something to be supported, and
+it doesn't appear, check for this.
+
+You can toggle the display of uninteresting files from the toggle menu
+item @samp{Show All Files}.  This will display all level one hidden files.
+These files will be shown with a @samp{?} indicator.  Level 2 hidden
+files will still not be shown.
+
+Object files fall into the category of level 2 hidden files.  You can
+determine their presence by the @samp{#} and @samp{!} file indicators.
+@xref{Directory Display}.
+
+@node File Key Bindings, , Hidden Files, File Mode
+@comment  node-name,  next,  previous,  up
+@section File Key Bindings
+@cindex file key bindings
+
+File mode has key bindings permitting different file system operations
+such as copy or rename.  These commands all operate on the @dfn{current
+file}.  In this case, the current file is the file at point, or clicked
+on when pulling up the menu.
+
+@table @kbd
+@item U
+Move the entire speedbar display up one directory.
+@item I
+Display information in the minibuffer about this line.  This is the same
+information shown when navigating with @kbd{n} and @kbd{p}, or moving
+the mouse over an item.
+@item B
+Byte compile the Emacs Lisp file on this line.
+@item L
+Load the Emacs Lisp file on this line.  If a @file{.elc} file exists,
+optionally load that.
+@item C
+Copy the current file to some other location.
+@item R
+Rename the current file, possibly moving it to some other location.
+@item D
+Delete the current file.
+@item O
+Delete the current file's object file.  Use the symbols @samp{#} and
+@samp{!} to determine if there is an object file available.
+@end table
+
+One menu item toggles the display of all available files.  By default,
+only files which Emacs understands, and knows how to convert into a tag
+list, are shown.  By showing all files, additional files such as text files are
+also displayed, but they are prefixed with the @samp{[?]} symbol.  This
+means that it is a file, but Emacs doesn't know how to expand it.
+
+@node Buffer Mode, Minor Modes, File Mode, Top
+@comment  node-name,  next,  previous,  up
+@chapter Buffer Mode
+@cindex buffer mode
+
+Buffer mode is very similar to File mode, except that instead of
+tracking the current directory and all files available there, the
+current list of Emacs buffers is shown.
+
+These buffers can have their tags expanded in the same way as files,
+and uses the same unknown file indicator (@pxref{File Mode}).
+
+Buffer mode does not have file operation bindings, but the following
+buffer specific key bindings are available:
+
+@table @kbd
+@item k
+Kill this buffer.  Do not touch its file.
+@item r
+Revert this buffer, reloading from disk.
+@end table
+
+In addition to Buffer mode, there is also Quick Buffer mode.  In fact,
+Quick Buffers is bound to the @kbd{b} key.  The only difference between
+Buffers and Quick Buffers is that after one operation  is performed
+which affects the attached frame, the display is immediately reverted to
+the last displayed mode.
+
+Thus, if you are in File mode, and you need quick access to a buffer,
+press @kbd{b}, click on the buffer you want, and speedbar will revert
+back to File mode.
+
+@node Minor Modes, Customizing, Buffer Mode, Top
+@comment  node-name,  next,  previous,  up
+@chapter Minor Display Modes
+@cindex minor display modes
+
+For some buffers, a list of files and tags makes no sense.  This could
+be because files are not currently in reference (such as web pages), or
+that the files you might be interested have special properties (such as
+email folders.)
+
+In these cases, a minor display mode is needed.  A minor display mode
+will override any major display mode currently being displayed for the
+duration of the specialized buffer's use.  Minor display modes
+will follow the general rules of their major counterparts in terms of
+key bindings and visuals, but will have specialized behaviors.
+
+@menu
+* RMAIL::  Managing folders in speedbar
+* Info::   Browsing topics in speedbar
+* GDB::    Managing the current stack trace in speedbar
+@end menu
+
+@node RMAIL, Info, Minor Modes, Minor Modes
+@comment  node-name,  next,  previous,  up
+@section RMAIL
+@cindex RMAIL
+
+When using RMAIL, speedbar will display two sections.  The first is a
+layer one reply button.  Clicking here will initialize a reply buffer
+showing only this email address in the @samp{To:} field.
+
+The second section lists all RMAIL folders in the same directory as your
+main RMAIL folder.  The general rule is that RMAIL folders always appear
+in all caps, or numbers.  It is possible to save mail in folders with
+lower case letters, but there is no clean way of detecting such RMAIL folders
+without opening them all.
+
+Each folder can be visited by clicking the name.  You can move mail from
+the current RMAIL folder into a different folder by clicking the
+@samp{<M>} button.  The @samp{M} stands for Move.
+
+In this way you can manage your existing RMAIL folders fairly easily
+using the mouse.
+
+@node Info, GDB, RMAIL, Minor Modes
+@comment  node-name,  next,  previous,  up
+@section Info
+@cindex Info
+
+When browsing Info files, all local relevant information is displayed in
+the info buffer and a topical high-level view is provided in speedbar.
+All top-level info nodes are shown in the speedbar frame, and can be
+jumped to by clicking the name.
+
+You can open these nodes with the @samp{[+]} button to see what sub-topics
+are available.  Since these sub-topics are not examined until you click
+the @samp{[+]} button, sometimes a @samp{[?]} will appear when you click on
+a @samp{[+]}, indicating that there are no sub-topics.
+
+@node GDB, , Info, Minor Modes
+@comment  node-name,  next,  previous,  up
+@section GDB
+@cindex gdb
+@cindex gud
+
+If you are debugging an application with GDB in Emacs, speedbar can show
+you the current stack when the current buffer is the @file{*gdb*}
+buffer.  Usually, it will just report that there is no stack, but when
+the application is stopped, the current stack will be shown.
+
+You can click on any stack element and gdb will move to that stack
+level.  You can then check variables local to that level at the GDB
+prompt.
+
+This mode has the unfortunate side-effect of breaking GDB's repeat
+feature when you hit @kbd{RET} since your previous command is overridden
+with a stack fetching command.
+
+@node Customizing, Extending, Minor Modes, Top
+@comment  node-name,  next,  previous,  up
+@chapter Customizing
+@cindex customizing
+
+Speedbar is highly customizable, with a plethora of control elements.
+Since speedbar is so visual and reduces so much information, this is an
+important aspect of its behavior.
+
+In general, there are three custom groups you can use to quickly modify
+speedbar's behavior.
+
+@table @code
+@item speedbar
+Basic speedbar behaviors.
+@item speedbar-vc
+Customizations regarding version control handling.
+@item speedbar-faces
+Customize speedbar's many colors and fonts.
+@end table
+
+@menu
+* Frames and Faces::        Visible behaviors.
+* Tag Hierarchy Methods::   Customizing how tags are displayed.
+* Version Control::         Adding new VC detection modes.
+* Hooks::                   The many hooks you can use.
+@end menu
+
+@node Frames and Faces, Tag Hierarchy Methods, Customizing, Customizing
+@comment  node-name,  next,  previous,  up
+@section Frames and Faces
+@cindex faces
+@cindex frame parameters
+
+There are several faces speedbar generates to provide a consistent
+color scheme across display types.  You can customize these faces using
+your favorite method.  They are:
+
+@table @asis
+@cindex @code{speedbar-button-face}
+@item speedbar-button-face
+Face used on expand/contract buttons.
+@cindex @code{speedbar-file-face}
+@item speedbar-file-face
+Face used on Files.  Should also be used on non-directory like nodes.
+@cindex @code{speedbar-directory-face}
+@item speedbar-directory-face
+Face used for directories, or nodes which consist of groups of other nodes.
+@cindex @code{speedbar-tag-face}
+@item speedbar-tag-face
+Face used for tags in a file, or for leaf items.
+@cindex @code{speedbar-selected-face}
+@item speedbar-selected-face
+Face used to highlight the selected item.  This would be the current
+file being edited.
+@cindex @code{speedbar-highlight-face}
+@item speedbar-highlight-face
+Face used when the mouse passes over a button.
+@end table
+
+You can also customize speedbar's initial frame parameters.  How this is
+accomplished is dependent on your platform being Emacs or XEmacs.
+
+@cindex @code{speedbar-frame-parameters}, Emacs
+In Emacs, change the alist @code{speedbar-frame-parameters}.  This
+variable is used to set up initial details.  Height is also
+automatically added when speedbar is created, though you can override
+it.
+
+@cindex @code{speedbar-frame-plist}, XEmacs
+In XEmacs, change the plist @code{speedbar-frame-plist}.  This is the
+XEmacs way of doing the same thing.
+
+@node Tag Hierarchy Methods, Version Control, Frames and Faces, Customizing
+@comment  node-name,  next,  previous,  up
+@section Tag Hierarchy Methods
+@cindex tag hierarchy
+@cindex tag groups
+@cindex tag sorting
+
+When listing tags within a file, it is possible to get an annoyingly
+long list of entries.  Imenu (which generates the tag list in Emacs)
+will group some classes of items automatically.   Even here, however,
+some tag groups can be quite large.
+
+@cindex @code{speedbar-tag-hierarchy-method}
+To solve this problem, tags can be grouped into logical units through a
+hierarchy processor.  The specific variable to use is
+@code{speedbar-tag-hierarchy-method}.  There are several methods that
+can be applied in any order.  They are:
+
+@table @code
+@cindex @code{speedbar-trim-words-tag-hierarchy}
+@item speedbar-trim-words-tag-hierarchy
+Find a common prefix for all elements of a group, and trim it off.
+@cindex @code{speedbar-prefix-group-tag-hierarchy}
+@item speedbar-prefix-group-tag-hierarchy
+If a group is too large, place sets of tags into bins based on common
+prefixes.
+@cindex @code{speedbar-simple-group-tag-hierarchy}
+@item speedbar-simple-group-tag-hierarchy
+Take all items in the top level list not in a group, and stick them into
+a @samp{Tags} group.
+@cindex @code{speedbar-sort-tag-hierarchy}
+@item speedbar-sort-tag-hierarchy
+Sort all items, leaving groups on top.
+@end table
+
+You can also add your own functions to reorganize tags as you see fit.
+
+Some other control variables are:
+
+@table @code
+@cindex @code{speedbar-tag-group-name-minimum-length}
+@item speedbar-tag-group-name-minimum-length
+Default value: 4.
+
+The minimum length of a prefix group name before expanding.  Thus, if
+the @code{speedbar-tag-hierarchy-method} includes
+@code{speedbar-prefix-group-tag-hierarchy} and one such group's common
+characters is less than this number of characters, then the group name
+will be changed to the form of:
+
+@example
+worda to wordb
+@end example
+
+instead of just
+
+@example
+word
+@end example
+
+This way we won't get silly looking listings.
+
+@cindex @code{speedbar-tag-split-minimum-length}
+@item speedbar-tag-split-minimum-length
+Default value: 20.
+
+Minimum length before we stop trying to create sub-lists in tags.
+This is used by all tag-hierarchy methods that break large lists into
+sub-lists.
+
+@cindex @code{speedbar-tag-regroup-maximum-length}
+@item speedbar-tag-regroup-maximum-length
+Default value: 10.
+
+Maximum length of submenus that are regrouped.
+If the regrouping option is used, then if two or more short subgroups
+are next to each other, then they are combined until this number of
+items is reached.
+@end table
+
+@node Version Control, Hooks, Tag Hierarchy Methods, Customizing
+@comment  node-name,  next,  previous,  up
+@section Version Control
+@cindex version control
+@cindex vc extensions
+
+When using the file mode in speedbar, information regarding a version
+control system adds small details to the display.  If a file is in a
+version control system, and is ``checked out'' or ``locked'' locally, an
+asterisk @samp{*} appears at the end of the file name.  In addition,
+the directory name for Version Control systems are left out of the
+speedbar display.
+
+@cindex @code{speedbar-directory-unshown-regexp}
+You can easily add new version control systems into speedbar's detection
+scheme.  To make a directory ``disappear'' from the list, use the variable
+@code{speedbar-directory-unshown-regexp}.
+
+@cindex @code{speedbar-vc-directory-enable-hook}
+Next, you need to write entries for two hooks.  The first is
+@code{speedbar-vc-directory-enable-hook} which will enable a VC check in the
+current directory for the group of files being checked.  Your hook
+function should take one parameter (the directory to check) and return
+@code{t} if your VC method is in control here.
+
+@cindex @code{speedbar-vc-in-control-hook}
+The second function is @code{speedbar-vc-in-control-hook}.  This hook
+takes two parameters, the @var{path} of the file to check, and the
+@var{file} name.  Return @code{t} if you want to have the asterisk
+placed near this file.
+
+@cindex @code{speedbar-vc-indicator}
+Lastly, you can change the VC indicator using the variable
+@code{speedbar-vc-indicator}, and specify a single character string.
+
+@node Hooks, , Version Control, Customizing
+@comment  node-name,  next,  previous,  up
+@section Hooks
+@cindex hooks
+
+There are several hooks in speedbar allowing custom behaviors to be
+added.  Available hooks are:
+
+@table @code
+@cindex @code{speedbar-visiting-file-hook}
+@item speedbar-visiting-file-hook
+Hooks run when speedbar visits a file in the selected frame.
+@cindex @code{speedbar-visiting-tag-hook}
+@item speedbar-visiting-tag-hook
+Hooks run when speedbar visits a tag in the selected frame.
+@cindex @code{speedbar-load-hook}
+@item speedbar-load-hook
+Hooks run when speedbar is loaded.
+@cindex @code{speedbar-reconfigure-keymaps-hook}
+@item speedbar-reconfigure-keymaps-hook
+Hooks run when the keymaps are regenerated.  Keymaps are reconfigured
+whenever modes change.  This will let you add custom key bindings.
+@cindex @code{speedbar-before-popup-hook}
+@item speedbar-before-popup-hook
+Hooks called before popping up the speedbar frame.
+New frames are often popped up when ``power clicking'' on an item to view
+it.
+@cindex @code{speedbar-before-delete-hook}
+@item speedbar-before-delete-hook
+Hooks called before deleting or hiding the speedbar frame.
+@cindex @code{speedbar-mode-hook}
+@item speedbar-mode-hook
+Hooks called after creating a speedbar buffer.
+@cindex @code{speedbar-timer-hook}
+@item speedbar-timer-hook
+Hooks called after running the speedbar timer function.
+@cindex @code{speedbar-scanner-reset-hook}
+@item speedbar-scanner-reset-hook
+Hook called whenever generic scanners are reset.
+Set this to implement your own scanning or rescan safe functions with
+state data.
+@end table
+
+@node Extending, Index, Customizing, Top
+@comment  node-name,  next,  previous,  up
+@chapter Extending
+@cindex extending
+
+Speedbar can run different types of Major display modes such as Files
+(@pxref{File Mode}), and Buffers (@pxref{Buffer Mode}).  It can also manage
+different minor display modes for use with buffers handling specialized
+data.
+
+These major and minor display modes are handled through an extension
+system which permits specialized keymaps and menu extensions, in
+addition to a unique rendering function.  You can also specify a wide
+range of tagging functions.  The default uses @code{imenu}, but new
+tagging methods can be easily added.  In this chapter, you will
+learn how to write your own major or minor display modes, and how to
+create specialized tagging functions.
+
+@menu
+* Minor Display Modes::    How to create a minor display mode.
+* Major Display Modes::    How to create a major display mode.
+* Tagging Extensions::     How to create your own tagging methods.
+* Creating a display::     How to insert buttons and hierarchies.
+@end menu
+
+@node Minor Display Modes, Major Display Modes, Extending, Extending
+@section Minor Display Modes
+@cindex create minor display mode
+
+A @dfn{minor display mode} is a mode useful when using a specific type of
+buffer.  This mode might not be useful for any other kind of data or
+mode, or may just be more useful that a files or buffers based mode when
+working with a specialized mode.
+
+Examples that already exist for speedbar include RMAIL, Info, and gdb.
+These modes display information specific to the major mode shown in the
+attached frame.
+
+To enable a minor display mode in your favorite Major mode, follow these
+steps.  The string @samp{@var{name}} is the name of the major mode being
+augmented with speedbar.
+
+@enumerate
+@item
+Create the keymap variable @code{@var{name}-speedbar-key-map}.
+
+@item
+Create a function, named whatever you like, which assigns values into your
+keymap.  Use this command to create the keymap before assigning
+bindings:
+
+@smallexample
+    (setq @var{name}-speedbar-key-map (speedbar-make-specialized-keymap))
+@end smallexample
+
+This function creates a special keymap for use in speedbar.
+
+@item
+Call your install function, or assign it to a hook like this:
+
+@smallexample
+(if (featurep 'speedbar)
+    (@var{name}-install-speedbar-variables)
+  (add-hook 'speedbar-load-hook '@var{name}-install-speedbar-variables))
+@end smallexample
+
+@item
+Create an easymenu compatible vector named
+@code{@var{name}-speedbar-menu-items}.  This will be spliced into
+speedbar's control menu.
+
+@item
+Create a function called @code{@var{name}-speedbar-buttons}.  This function
+should take one variable, which is the buffer for which it will create
+buttons.   At this time @code{(current-buffer)} will point to the
+uncleared speedbar buffer.
+@end enumerate
+
+When writing @code{@var{name}-speedbar-buttons}, the first thing you will
+want to do is execute a check to see if you need to re-create your
+display.  If it needs to be cleared, you need to erase the speedbar
+buffer yourself, and start drawing buttons.  @xref{Creating a display}.
+
+@node Major Display Modes, Tagging Extensions, Minor Display Modes, Extending
+@section Major Display Modes
+@cindex create major display mode
+
+Creating a @dfn{Major Display Mode} for speedbar requires authoring a keymap,
+an easy-menu segment, and writing several functions.  These items can be
+given any name, and are made the same way as in a minor display mode
+(@pxref{Minor Display Modes}).  Once this is done, these items need to be
+registered.
+
+Because this setup activity may or may not have speedbar available when
+it is being loaded, it is necessary to create an install function.  This
+function should create and initialize the keymap, and add your
+expansions into the customization tables.
+
+@cindex @code{speedbar-make-specialized-keymap}
+When creating the keymap, use the function
+@code{speedbar-make-specialized-keymap} instead of other keymap making
+functions.  This will provide you with the initial bindings needed.
+Some common speedbar functions you might want to bind are:
+
+@table @code
+@cindex @code{speedbar-edit-line}
+@item speedbar-edit-line
+Edit the item on the current line.
+@cindex @code{speedbar-expand-line}
+@item speedbar-expand-line
+Expand the item under the cursor.
+With a numeric argument (@kbd{C-u}), flush cached data before expanding.
+@cindex @code{speedbar-contract-line}
+@item speedbar-contract-line
+Contract the item under the cursor.
+@end table
+
+@cindex @code{speedbar-line-directory}
+These function require that function @code{speedbar-line-directory} be
+correctly overloaded to work.
+
+Next, register your extension like this;
+
+@example
+  (speedbar-add-expansion-list '("MyExtension"
+                                 MyExtension-speedbar-menu-items
+                                 MyExtension-speedbar-key-map
+                                 MyExtension-speedbar-buttons))
+@end example
+
+There are no limitations to the names you use.
+
+The first parameter is the string representing your display mode.
+The second parameter is a variable name containing an easymenu compatible
+menu definition.  This will be stuck in the middle of speedbar's menu.
+The third parameter is the variable name containing the keymap we
+discussed earlier.
+The last parameter is a function which draws buttons for your mode.
+This function must take two parameters.  The directory currently being
+displayed, and the depth at which you should start rendering buttons.
+The function will then draw (starting at the current cursor position)
+any buttons deemed necessary based on the input parameters.
+@xref{Creating a display}.
+
+Next, you need to register function overrides.  This may look something
+like this:
+
+@example
+(speedbar-add-mode-functions-list
+ '("MYEXTENSION"
+   (speedbar-item-info . MyExtension-speedbar-item-info)
+   (speedbar-line-directory . MyExtension-speedbar-line-directory)))
+@end example
+
+The first element in the list is the name of you extension.  The second
+is an alist of functions to overload.  The function to overload is
+first, followed by what you want called instead.
+
+For @code{speedbar-line-directory} your function should take an optional DEPTH
+parameter.  This is the starting depth for heavily indented lines.  If
+it is not provided, you can derive it like this:
+
+@example
+(save-match-data
+  (if (not depth)
+      (progn
+        (beginning-of-line)
+        (looking-at "^\\([0-9]+\\):")
+        (setq depth (string-to-int (match-string 1)))))
+@end example
+
+@noindent
+where the depth is stored as invisible text at the beginning of each
+line.
+
+The path returned should be the full path name of the file associated
+with that line.  If the cursor is on a tag, then the file containing
+that tag should be returned.  This is critical for built in file based
+functions to work (meaning less code for you to write).  If your display
+does not deal in files, you do not need to overload this function.
+
+@cindex @code{speedbar-item-info}
+The function @code{speedbar-item-info}, however, is very likely to need
+overloading.  This function takes no parameters and must derive a text
+summary to display in the minibuffer.
+
+There are several helper functions you can use if you are going to use
+built in tagging.  These functions can be @code{or}ed since each one
+returns non-@code{nil} if it displays a message.  They are:
+
+@table @code
+@cindex @code{speedbar-item-info-file-helper}
+@item speedbar-item-info-file-helper
+This takes an optional @var{filename} parameter.  You can derive your own
+filename, or it will derive it using a (possibly overloaded) function
+@code{speedbar-line-file}.  It shows details about a file.
+@cindex @code{speedbar-item-info-tag-helper}
+@item speedbar-item-info-tag-helper
+If the current line is a tag, then display information about that tag,
+such as its parent file, and location.
+@end table
+
+Your custom function might look like this:
+
+@example
+(defun MyExtension-item-info ()
+  "Display information about the current line."
+  (or (speedbar-item-info-tag-helper)
+      (message "Interesting detail.")))
+@end example
+
+Once you have done all this, speedbar will show an entry in the
+@samp{Displays} menu declaring that your extension is available.
+
+If your major mode is running slowly, you may need to add a set of
+stealthy update functions.
+
+@defvar speedbar-stealthy-function-list
+@anchor{speedbar-stealthy-function-list}
+List of functions to periodically call stealthily.
+Each function must return @code{nil} if interrupted, or @code{t} if completed.
+Stealthy functions which have a single operation should always return
+@code{t}.  Functions which take a long time should maintain a state (where
+they are in their speedbar related calculations) and permit
+interruption.  See @dfn{speedbar-check-vc} as a good example.
+@end defvar
+
+Stealthy functions are currently used in files mode.  The first
+activity is to display the main list with minimal decorations though
+the buttons function.  Once that is done, additional work can be done
+decorating different lines after the fact.
+
+For files mode, VC status and read-only markers can calculated after
+the first display is up.  Because the process of calculating that
+information can be slow, these functions are interruptable, and will
+continue processing at a later time out.
+
+@node Tagging Extensions, Creating a display, Major Display Modes, Extending
+@section Tagging Extensions
+
+It is possible to create new methods for tagging files in speedbar.
+To do this, you need two basic functions, one function to fetch the
+tags from a buffer, the other to insert them below the filename.
+
+@defun my-fetch-dynamic-tags file
+Parse @var{file} for a list of tags.  Return the list, or @code{t} if
+there was an error.  @var{file} is not necessarily available as an
+buffer when your function is called.  Be sure to load it if it is needed
+with code like this:
+
+@example
+(save-excursion
+  (set-buffer (find-file-noselect file))
+  ...
+  )
+@end example
+@end defun
+
+The non-error return value can be anything, as long as it can be
+inserted by its paired function:
+
+@defun my-insert-tag-list level lst
+Insert a list of tags @var{lst} started at indentation level
+@var{level}.  Creates buttons for each tag, and provides any other
+display information required.
+@end  defun
+
+@cindex @code{speedbar-create-tag-hierarchy}
+It is often useful to use @code{speedbar-create-tag-hierarchy} on your
+tag list @ref{Creating a display}.
+
+@cindex @code{speedbar-dynamic-tags-function-list}
+Once these two functions are written, modify the variable
+@code{speedbar-dynamic-tags-function-list} to include your parser at the
+beginning, like this:
+
+@example
+(add-to-list 'speedbar-dynamic-tags-function-list
+	     '(my-fetch-dynamic-tags  . my-insert-tag-list))
+@end example
+
+@defvar speedbar-dynamic-tags-function-list
+@anchor{speedbar-dynamic-tags-function-list}
+A list of functions which will return and insert a list of tags.
+Each element is of the form ( @var{fetch} .  @var{insert} ) where @var{fetch}
+is a function which takes one parameter (the file to tag) and returns a
+list of tags.  The tag list can be of any form as long as the
+corresponding insert method can handle it.  If it returns @code{t}, then an
+error occurred, and the next fetch routine is tried.
+@var{insert} is a function which takes an INDENTation level, and a @var{list} of
+tags to insert.  It will then create the speedbar buttons.
+@end defvar
+
+If your parser is only good for a few types of files (ie, just texinfo
+files), make sure that it is either a buffer local modification (set
+only in texi files), or that the tag generator returns @code{t} for
+unsupported buffers.
+
+@node Creating a display, , Tagging Extensions, Extending
+@section Creating a display
+@cindex creating a display
+
+Rendering a display in speedbar is completely flexible.  When your
+button function is called, see @ref{Minor Display Modes}, and @ref{Major
+Display Modes}, you have control to @code{insert} anything you want.
+
+The conventions allow almost anything to be inserted, but several helper
+functions are provided to make it easy to create the standardized
+buttons.
+
+To understand the built in functions, each `button' in speedbar consists
+of four important pieces of data.  The text to be displayed, token
+data to be associated with the text, a function to call, and some face to
+display it in.
+
+When a function is provided, then that text becomes mouse activated,
+meaning the mouse will highlight the text.
+
+Additionally, for data which can form deep trees, each line is given a
+depth which indicates how far down the tree it is.  This information is
+stored in invisible text at the beginning of each line, and is used by
+the navigation commands.
+
+@menu
+* Creating Buttons::
+* Generic Tag Lists::
+* Expand Buttons::
+@end menu
+
+@node Creating Buttons, Generic Tag Lists, , Creating a display
+@subsection Creating Speedbar Buttons
+
+While it is certainly possible to insert your own text and add
+decorations to it, it is preferable to use the speedbar button
+creation API instead.
+
+@defun speedbar-insert-button text face mouse function &optional token prevline
+This function inserts one button into the current location.
+@var{text} is the text to insert.  @var{face} is the face in which it
+will be displayed.   @var{mouse} is the face to display over the text
+when the mouse passes over it.  @var{function} is called whenever the
+user clicks on the text.
+
+The optional argument @var{token} is extra data to associated with the
+text.  Lastly @var{prevline} should be non-@code{nil} if you want this line to
+appear directly after the last button which was created instead of on
+the next line.
+@end defun
+
+This routine creates a single button in the display, such as a [+]
+button, or the text that goes after it.  It is designed to be called
+iteratively with indicators on when to add carriage returns between
+buttons.
+
+To insert a more traditional speedbar line that includes an expansion
+button followed by clickable text, it is preferable to create a
+tag-line.  Tag lines should be used to represent typical data a user
+will interact with.
+
+@defun speedbar-make-tag-line exp-button-type exp-button-char exp-button-function exp-button-data tag-button tag-button-function tag-button-data tag-button-face depth
+
+Create a tag line with @var{exp-button-type} for the small expansion
+button.  This is the button that expands or contracts a node (if
+applicable), and @var{exp-button-char} the character in it (@samp{+},
+@samp{-}, @samp{?},
+etc).  @var{exp-button-function} is the function to call if it's clicked
+on.  Button types are @code{'bracket}, @code{'angle}, @code{'curly},
+@code{'expandtag}, @code{'statictag}, or nil.  @var{exp-button-data} is
+extra data attached to the text forming the expansion button.
+
+Next, @var{tag-button} is the text of the tag.
+@var{tag-button-function} is the function to call if clicked on, and
+@var{tag-button-data} is the data to attach to the text field (such a
+tag positioning, etc).  @var{tag-button-face} is a face used for this
+type of tag.
+
+Lastly, @var{depth} shows the depth of expansion.
+
+This function assumes that the cursor is in the speedbar window at the
+position to insert a new item, and that the new item will end with a CR.
+@end defun
+
+Major display modes that use this function will have a consistant look
+and feel and reliable image use.
+
+@node Generic Tag Lists, Expand Buttons, Creating Buttons, Creating a display
+@subsection Generic Tag Lists
+
+For data stored in a hierarchical list, it is likely possible to
+have the entire data structure inserted with the speedbar generic list
+methods.
+
+These insertion functions assume that the data represents 'tags', or
+data extracted from inside a file, and they are marked with tag
+markers.
+
+Tags stored in this format can then be manipulated by the tag
+hierarchy methods described earlier in this manual.
+
+@defun speedbar-insert-generic-list level list expand-fun find-fun
+
+At @var{level}, (the current indentation level desired) insert a generic
+multi-level alist @var{list}.  Associations with lists get @samp{@{+@}}
+tags (to expand into more nodes) and those with positions or other data
+just get a @samp{>} as the indicator.  @samp{@{+@}} buttons will have the
+function @var{expand-fun} and the token is the @code{cdr} list.  The
+token name will have the function @var{find-fun} and not token.
+
+Each element of the list can have one of these forms:
+
+@table @code
+@item (@var{name} . marker-or-number)
+One tag at this level.
+@item (@var{name} (@var{name} . marker-or-number) (@var{name} . marker-or-number) ... )
+One group of tags.
+@item (@var{name} marker-or-number (@var{name} . marker-or-number) ... )
+One Group of tags where the group has a starting position.
+@end table
+
+When you use @code{speedbar-insert-generic-list}, there are some
+variables you can set buffer-locally to change the behavior.  The most
+obvious is @code{speedbar-tag-hierarchy-method}.
+@xref{Tag Hierarchy Methods}.
+
+@defvar speedbar-generic-list-group-expand-button-type
+This is the button type used for groups of tags, whether expanded
+or added in via a hierarchy method.  Two good values are
+@code{'curly} and @code{'expandtag}.  Curly is the default button, and
+@code{'expandtag} is useful if the groups also has a position.
+@end defvar
+
+@defvar speedbar-generic-list-tag-button-type
+This is the button type used for a single tag.
+Two good values are @code{nil} and @code{'statictag}.
+@code{nil} is the default, and @code{'statictag} has the same width as
+@code{'expandtag}.
+@end defvar
+
+@end defun
+
+@node Expand Buttons, , Generic Tag Lists, Creating a display
+@subsection Expand Buttons
+
+Once you have made some buttons, you need to hitch them up to
+do something once clicked on.  This is set up with
+@code{speedbar-make-tag-line} which takes two functions.  One is for
+the expand button, and the other for the tag.
+
+The function for the tag can be anything, but the expand button has
+certain expectations.  When that button is has a @code{+} in it, that
+indicates that there is ``more'' inside.  A @code{-} indicates that a
+section can be closed.
+
+The expand function takes the same signature as all speedbar button
+functions, such as:
+
+@example
+(defun MY-expand-function (text token indent)
+   "Display more information about MY thing.
+..."
+@end example
+
+This function should then use the @var{text} parameter to determine
+what to do.  For example:
+
+@example
+  (cond ((string-match "+" text)	;we have to expand this file
+         ;; Expand stuff here
+         )
+	((string-match "-" text)	;we have to contract this node
+         ;; Contract stuff here
+         ))
+@end example
+
+When expanding or contracting, you will need to change the
+@code{+} or @code{-} into the opposite symbol.  You can do that with
+
+@defun speedbar-change-expand-button-char char
+@anchor{speedbar-change-expand-button-char}
+Change the expansion button character to @var{char} for the current line.
+@end defun
+
+Our sample would then look like this:
+
+@example
+  (cond ((string-match "+" text)	;we have to expand this file
+         ;; Expand stuff here
+	 (speedbar-change-expand-button-char ?-)
+         )
+	((string-match "-" text)	;we have to contract this node
+         ;; Contract stuff here
+	 (speedbar-change-expand-button-char ?+)
+         ))
+@end example
+
+To expand text, the speedbar buffer needs to be writable.  The initial
+button insertion function runs while the buffer is writable, but an
+expand function will need to change that.  The best way is to use
+@code{speedbar-with-writable}.
+
+@defun speedbar-with-writable &rest forms
+@anchor{speedbar-with-writable}
+Allow the speedbar buffer to be writable and evaluate @var{forms}.
+@end defun
+
+Once the buffer is writable, then you can insert more information
+using any mechanism you like.  Remember that the cursor will be on the
+expand button just clicked though.  As such, the code might look like
+this:
+
+@example
+  (cond ((string-match "+" text)	;we have to expand this file
+         ;; Expand stuff here
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+             ;; Insert goodies here.
+           ))         
+         )
+@end example
+
+Contracting a node is a bit easier.  You can just use this built in
+function to do the work:
+
+@defun speedbar-delete-subblock indent
+@anchor{speedbar-delete-subblock}
+Delete text from point to indentation level @var{indent} or greater.
+Handles end-of-sublist smartly.
+
+Remember that @var{indent} is also available as passed into
+@code{MY-expand-function}.
+@end defun
+
+The end result would then look like this:
+
+@example
+  (cond ((string-match "+" text)	;we have to expand this file
+         ;; Expand stuff here
+	 (speedbar-change-expand-button-char ?-)
+	 (speedbar-with-writable
+	   (save-excursion
+	     (end-of-line) (forward-char 1)
+             ;; Insert goodies here.
+           ))         
+         )
+	((string-match "-" text)	;we have to contract this node
+         ;; Contract stuff here
+	 (speedbar-change-expand-button-char ?+)
+	 (speedbar-delete-subblock indent))
+         ))
+@end example
+
+Expand buttons, unlike other speedbar operations can cause new data to
+appear in speedbar which would be useful to force onto the screen.
+You can then recenter using this function:
+
+@defun speedbar-center-buffer-smartly
+@anchor{speedbar-center-buffer-smartly}
+Recenter a speedbar buffer so the current indentation level is all visible.
+This assumes that the cursor is on a file, or tag of a file which the user is
+interested in.
+@end defun
+
+@node Index, , Extending, Top
+@comment  node-name,  next,  previous,  up
+@unnumbered Concept Index
+@printindex cp
+
+@bye
+@c  LocalWords:  speedbar's xref slowbar kbd subsubsection
+@c  LocalWords:  keybindings
+
+@ignore
+   arch-tag: e1fc85f0-1eeb-489f-a8d4-a2bfe711fa02
+@end ignore
diff --git a/site/cedet-1.0pre7/srecode/ChangeLog b/site/cedet-1.0pre7/srecode/ChangeLog
new file mode 100644
index 0000000..cbee55b
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/ChangeLog
@@ -0,0 +1,1761 @@
+2010-02-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Parts of SRecode):
+	Revise dictionary, template insertion and field
+	editing parts.
+	(SRecode Minor Mode): Update keybindings.
+	(Template Writing): Add a glossary.
+	(Variables, Multi-string Values,Compound Variable Values):
+	Distinguish between variables and macros.
+	(Special Variables): Add examples.
+	(Templates): Specify macro for macros.
+	(Template Section Dictionaries):
+	(Template Macros): Discuss specifying a context
+	(Dictionaries, Setting Dictionary Values, Compound Dictionary Values)
+	(Querying a Dictionary):
+	Use the word variable for variables.
+	(Template Naming Conventions): macro/variable fixes.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dictionary-add-section-dictionary):
+	Update doc string.
+
+	* srecode-texi.el (texinfo-mode::semantic-insert-foreign-tag):
+	Split old impl to:
+	(srecode-texi-insert-tag-as-doc): New, made of impl from above.
+
+	* srecode-fields.el (srecode-fields-exit-confirmation):
+	Set default value to nil.
+
+2010-02-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile (templates_MISC): Add proj-test.srt
+
+	* templates/Project.ede ("SRecode templates"): Add proj-test.srt.
+
+	* templates/proj-test.srt: Add 1st line summary.
+
+2010-02-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-insert.el (srecode-template-inserter-include::srecode-insert-include-lookup):
+	Do
+	not short-circuit a template lookup if a template had already been
+	discovered.
+
+2010-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-utest-project): New.
+
+	* templates/proj-test.srt: New test support file.
+
+	* srecode.texi (Special Variables): Add "project" description.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dictionary-add-template-table):
+	Do not add variables in tables not for the current project.
+
+	* srecode-mode.el (srecode-minor-mode-templates-menu):
+	Do not list templates that are not in the current project.
+
+	* srecode-find.el (srecode-template-table::srecode-template-table-in-project-p):
+	New.
+	(srecode-template-table::srecode-template-get-table)
+	(srecode-template-table::srecode-template-get-table-for-binding)
+	Skip behavior if not in current project.
+	(srecode-all-template-hash): Skip tables not in current project.
+
+	* srecode-table.el (srecode-template-table): Add a :project slot.
+	(srecode-dump): Dump the :project slot.
+
+	* srecode-compile.el (srecode-compile-templates):
+	Support special variable "project".
+	Tweak priorities, adding a "project" level.
+	(srecode-compile-template-table): Set the :project slot of newly
+	created tables.
+
+2010-02-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Special Variables):
+	Fix doc for priority to specify that it is a
+	string, and that high priority items are found first.
+
+	* srecode-compile.el (srecode-compile-templates):
+	Fix directory compare of built-in
+	templates so it will match.  Also set to have built-ins have lower
+	piority as the code is preferring templates with a higher priority.
+
+2010-02-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-test.srt (includable): Account for input variable.
+	(wrapinclude-around): Add an input variabe to subtemplate.
+
+	* srecode-test.el (srecode-utest-output-entries):
+	Update results based on change to template.
+
+	* srecode-texi.el (texinfo-mode::semantic-insert-foreign-tag):
+	Add call to srecode-load-tables-for-mode.
+
+	* srecode-insert.el (srecode-template::srecode-insert-method):
+	Pull dictionary merging back to this fcn.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dictionary-lookup-name):
+	Improve doc.
+	(srecode-field-value::srecode-compound-toString):
+	Handle cases where the default value is another compound value.
+	This can happen with field-editing, when input variables are applied
+	from other fields.
+
+	* srecode-test.el (srecode-utest-output::srecode-utest-test):
+	Remove argument resolve call.
+	(srecode-semantic-handle-:utestwitharg): Add support for looping.
+	(srecode-utest-output-entries): Add looping transform test.
+
+	* templates/srecode-test.srt (custom-arg-w-subdict): New.
+
+	* srecode-insert.el (srecode-insert): Remove commented out code.
+	(srecode-insert-fcn): Merge in the template dictionary before
+	resolving arguments.
+	(srecode-template::srecode-insert-method):
+	Remove merging of template dictionary before inserting.
+	(srecode-template-inserter-subtemplate::srecode-insert-method-helper):
+	Add error checking to make sure that we only have dictionaries.
+
+	* srecode-test.el (srecode-semantic-handle-:utestwitharg):
+	New arg handler.
+	(srecode-utest-output-entries): Add tests for the above arg handler.
+
+	* srecode.texi (Querying a Dictionary): New section in Dictionaries.
+
+	* templates/srecode-test.srt (custom-arg-w-arg): New.
+
+2010-02-03  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* srecode-mode.el (srecode-bind-insert):
+	call `srecode-load-tables-for-mode' to prevent
+	problems when `srecode-table' returns nil because tables have not yet
+	been loaded
+
+	* srecode-fields.el (srecode-fields-exit-confirmation):
+	new customization option; ask
+	before leaving field editing mode?
+	(srecode-field-exit-ask):
+
+	* srecode-cpp.el (require semantic-tag):
+	required for `semantic-tag-get-attribute'
+	(srecode-semantic-handle-:using-namespaces): new function; provide
+	:using-namespace srecode argument which inserts namespace prefixes
+	into a dictionary depending on whether there are using statements for
+	the namespaces
+
+2010-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-java.srt (include): Make NAME be a prompt.
+
+2010-01-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi: Patch from Hannu Koivisto:
+	(Parts of SRecode, Language Arguments, Template Naming Conventions):
+	it's -> its fixes.
+
+2009-12-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-getset.el (srecode-insert-getset): Force tag table update.
+	Don't query the class if it is empty.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: Regenerate from EDe.
+
+	* Makefile (ELISPPRELOAD): New
+	(srecode,tests): Use preloads.
+
+	* Project.ede (srecode,tests): Use preload compiler, add preloads.
+
+2009-09-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-compile.el (srecode-compile-split-code,srecode-compile-parse-inserter):
+	Fix byte compiler warnings.
+
+2009-09-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (SRecode Minor Mode): Fix typo.
+	Fix doc string pulled from sources.
+	(Templates): Fix ---- separator.
+	(Template Section Dictionaries): Add a little extra.
+	(Template Macros): Fix typo.
+	(Contexts): Add keybinding example.
+	(Setting Dictionary Values): Fix spelling error.
+	Fix docstring with table.
+	(Semantic Arguments): Fix spelling error.
+	(Developing Template Functions): untabity example code.
+	Add new sections on Template Lookup, and
+	Creating Dictionaries,
+
+2009-09-17  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile (VERSION): Updated.
+
+2009-09-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-el.srt (empty):
+	Add space between provide and end comment.
+
+2009-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (VERSION): Update to 1.0pre7
+
+	* Project.ede (version): Update to latest version number.
+
+	* srecode.el (srecode-version): Update version number.
+
+2009-08-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-semantic-handle-:utest): New arg handler.
+	(srecode-utest-output-entries): Add 'custom-arg-handler' test.
+
+	* templates/srecode-test.srt (UTESTVAR1): New file variable.
+	(custom-arg-handler): New template.
+
+	* srecode-map.el (srecode-adebug-maps): Fix spelling of buffer name.
+
+	* srecode-compile.el (srecode-compile-one-template-tag):
+	Fix spelling of called fcn
+	srecode-create-section-dictionary.
+
+	* srecode-dictionary.el (srecode-dictionary): Add :origin slot.
+	(srecode-create-dictionary): Set :origin to a string.
+	Only init dictionary from buffer variables if this dictionary is
+	derived directly from a buffer.
+	(srecode-create-section-dictionary): Fix spelling of name.
+	(srecode-adebug-dictionary): Fix spelling of buffer name.
+
+2009-06-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-ctxt.el (srecode-calculate-context-default):
+	Move call the semantic-fetch-tags inside the if.
+
+2009-05-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-cpp.el: Patch from: Henry S. Thompson
+	(srecode-semantic-handle-:cpp): Fix regexp to quote out + in h++.
+
+2009-04-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-semantic.el (srecode-semantic-insert-tag):
+	Skip the argument resolver during the
+	insert.
+
+	* srecode-insert.el (srecode-insert-fcn): Add skipresolver argument.
+
+2009-04-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-dictionary.el (srecode-field-value,srecode-field-value::srecode-compound-toString):
+	Moved to here.
+
+	* srecode-fields.el (srecode-field-value,srecode-field-value::srecode-compound-toString):
+	Moved.
+
+	* srecode-fields.el (srecode-field-keymap): Add C-cC-c to exit.
+	(srecode-field-exit-ask): New command.
+
+	* srecode-fields.el (srecode-template-inserted-region):
+	Provide initial value for active-region.
+
+2009-03-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Parts of SRecode, SRecode Minor Mode):
+	Changed how enabling field editing mode works.
+
+	* srecode-insert.el (srecode-insert-with-fields-p): Deleted
+
+	* templates/srecode-cpp.srt (method): PARENT as an ASK variable.
+	(include): ASK for the name.
+
+	* srecode-insert.el (srecode-insert-with-fields-p): Deleted
+	(srecode-insert-ask-variable-method): New variable
+	(srecode--insert-into-buffer): Use above config variable change.
+
+	* srecode-fields.el (srecode-overlaid::initialize-instance):
+	Create an overlay instead
+	of markers to get better marker movement control.
+	(srecode-overlaid::srecode-overlaid-activate):
+	Use above created overaly instead of markers.
+	(srecode-field-value::srecode-compound-toString):
+	Fix comment
+	(srecode-field-utest-impl): Fix to account for changes to initial use
+	of an overlay instead of markers.
+
+2009-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile, templates/Project.ede (VERSION): Update version
+	(templates): Remove srecode-expandproto-cpp.srt
+
+	* Makefile, Project.ede, srecode.el (srecode-version): Update version.
+
+2009-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el (srecode-map-save-file):
+	Update doc.  Explain it can be nil.
+	(srecode-map-update-map): Handle the case when
+	`srecode-map-save-file' is nil.  Create a non-saving map object.
+	If map-object has no bound :file slot, do not save.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-compile.el (srecode-compile-file):
+	When compiling a file, use the semantic-find-file-noselect feature.
+
+	* Makefile (dist): Add missing -C to subdir invocation.
+
+2009-03-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: When recursing with Make, use -C instead of cd.
+
+	* .cvsignore: add *.info
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede, srecode-fields.el, srecode-insert.el:
+	Merge from 1.0pre6 branch
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (EMACSFLAGS): New variable.
+	(srecode,tests,document): Use above.
+
+2009-02-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-fields.el (srecode-field-mod-hook):
+	Don't do work if the field object has no overlay.
+
+2009-02-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (SRecode Minor Mode):
+	Talk about srecode-takeover-INS-key.
+
+	* srecode-mode.el (srecode-takeover-INS-key): New option.
+	(srecode-prefix-map): Bind insert same as /.
+	(srecode-mode-map): bind insert as a prefix if option set.
+
+	* srecode.texi (Parts of SRecode): Add field-editing section.
+	(SRecode Minor Mode): Add a field editing section.
+	(Dictionaries, Argument Resolution, Developing Template Functions)
+	(Template Naming Conventions): Minor wording fixes.
+
+	* srecode-insert.el (srecode-fields): New require.
+	(srecode-insert-with-fields-p): New option.
+	(srecode-insert-with-fields-in-progress): New variable.
+	(srecode-insert-fcn): Call srecode--insert-into-buffer
+	when inserting into a buffer.
+	(srecode--insert-into-buffer): New function.
+	Like srecode-insert-method, but will create editable fields
+	in a template insert region.
+	(srecode-template-inserter-variable::srecode-insert-method):
+	Allow compound values to return nil when converting to a string.
+	If so, don't princ to standard out.
+	(srecode-template-inserter-ask::srecode-insert-ask-default):
+	New, extracted from...
+	(srecode-template-inserter-ask::srecode-insert-method):
+	Split out calculation of default.
+	Split out how values are asked into two new functions...
+	(srecode-template-inserter-ask::srecode-insert-method-ask):
+	New method from old code.
+	(srecode-template-inserter-ask::srecode-insert-method-field):
+	New method.  Instead of asking the user right now, create a field
+	that will edit that value later.
+
+	* srecode-dictionary.el (srecode-dictionary-compound-value::srecode-compound-toString):
+	Update doc to describe when you can return nil.
+
+	* Makefile (srecode_LISP): Add srecode-fields.el
+
+	* Project.ede (srecode): Add fields.
+
+	* srecode-fields.el (srecode-overlaid::initialize-instance):
+	Create the overlay as a
+	marker and length.
+	(srecode-overlaid::srecode-overlaid-activate): New.
+	(srecode-template-inserted-region::initialize-instance):
+	Extract some bits into...
+	(srecode-template-inserted-region::srecode-overlaid-activate): New
+	(srecode-template-inserted-region::srecode-delete): Fix arg name.
+	(srecode-field): Add prompt and read-fcn.  (Not used yet.)
+	(srecode-field::initialize-instance): Extract ovleray maintentance into...
+	(srecode-field::srecode-overlaid-activate): New.
+	(srecode-field-mod-hook): Do not operate during an undo.
+	Inhibit change and point-motion hooks.
+	Reposition overlays on self if they moved.
+	Do not replicate text if the change size is too big.
+	(srecode-field-value): New dictionary compound value.
+	(srecode-field-value::srecode-compound-toString): New
+	(srecode-field-utest): Test overlay non-creation activation.
+	Activate regions before tests.
+
+2009-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-fields.el (srecode-field-utest): Clear last region.
+
+2009-02-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-fields.el (Overlay compatibility): Eval and compile.
+
+	* srecode-fields.el: Field editing for SRecode.
+
+2009-02-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el (srecode-map-update-map):
+	Fix bug when finding new files where no new files were added after
+	the first one.
+
+2009-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-utest-output::srecode-utest-test):
+	If the test template
+	wasn't found, update the main map.
+	(srecode-utest-template-output): Pass major-mode into the
+	srecode-table query.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-utest-template-output):
+	Reset current buffer before each
+	test.  XEmacs will change buffers for an unknown reason.
+
+	* srecode-test-getset.el (srecode-utest-getset-output):
+	Fix for XEmacs which doesn't skip
+	preceeding whitespace before jumping a comment.
+
+2009-01-20  Jan Moringen <scymtym@users.sourceforge.net>
+
+	* srecode-cpp.el (srecode-semantic-apply-tag-to-dict):
+	new function; mode-local
+	override, which handles tags of classes include, using and function in
+	a C++-specific manner
+
+	* srecode-semantic.el (srecode-semantic-insert-tag):
+	fixed typo in comment
+
+2009-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-utest-template-output):
+	Use new cedet-utest APIs.
+
+	* srecode-template-mode.el (srecode-template-add-submode):
+	Comment out this unused section.
+
+	* srecode-test-getset.el (srecode-utest-getset-output):
+	Change to use updated cedet-utest APIs.
+
+	* srecode-getset.el (srecode-insert-getset):
+	Refresh class tag after modification and reparse.
+	(srecode-position-new-methods):
+	Add debugging messages.
+
+	* srecode-document.el (srecode-document-insert-variable-one-line-comment):
+	Eliminate unused variable bindings.
+
+2009-01-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-dictionary.el (srecode-adebug-dictionary): New command.
+
+	* srecode-args.el: (srecode-semantic-handle-:user)
+	(srecode-semantic-handle-:system): Reformat some lines.
+
+2009-01-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Parts of SRecode): Remove Multi positioning system.
+	(SRecode Minor Mode): Fill out some more keybindings.
+	(Variables): Add width variable.
+	(Template Section Dictionaries)
+	(Template Macros): Minor edits.
+	(Setting Dictionary Values):
+	Replace simple :blank arg example with :user.
+	(Creating new Arguments): Minor edits.
+	(Base Arguments): Minor edits
+	(Semantic Arguments): Add THROWS
+	(Language Arguments): Add :java
+
+	* srecode-insert.el (srecode-template-inserter-variable::srecode-insert-method):
+	Convert fcnpart (a string) to a symbol before passing to
+	srecode-compound-toString.
+
+	* templates/srecode-test.srt (column-data): New.
+
+	* srecode-test.el (srecode-utest-output-entries): Add width test.
+
+	* srecode-insert.el (srecode-template-inserter-variable::srecode-insert-variable-secondname-handler):
+	New
+	(srecode-template-inserter-variable::srecode-insert-method):
+	Don't convert second arg to a fcn handle.
+	Call above new method.
+	(srecode-template-inserter-width): New class
+	(srecode-template-inserter-width::srecode-insert-variable-secondname-handler):
+	(srecode-template-inserter-width::srecode-inserter-prin-example):
+	New methods for a bove.
+
+2009-01-13  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-document.el (srecode-document-programmer->english):
+	Support empty string.
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-texi.el (srecode-semantic-handle-:texitag):
+	Only add doc if there is some.
+	(srecode-texi-massage-to-texinfo): If a tag has no buffer, then
+	force texification while under texinfo mode.
+
+	* srecode-semantic.el (srecode-semantic-insert-tag):
+	When resolving arguments, set `srecode-semantic-selected-tag' to the
+	tag to insert.  The only add that tag if the args didn't do it for us.
+
+	* srecode-semantic.el (srecode-semantic-apply-tag-to-dict-default):
+	Fix variable default VALUE to go to subdict inside HAVEDEFAULT section.
+
+	* srecode-cpp.el: Formatting changes.
+
+	* Makefile (srecode_LISP): Add srecode-java.el
+
+	* Project.ede ("srecode"): Add srecode-java.el
+
+	* templates/srecode-java.srt (class-tag): implements
+
+	* srecode-test.el (srecode-utest-output::srecode-utest-test):
+	Ask push-mark to activate the region.
+
+2009-01-09  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-template.wy: (<property>)
+	(srecode-template-property-analyzer):
+	Allow arg text as just : to prevent incremental reparsing errors.
+
+	* srecode-template-mode.el:
+	(srecode-template-mode-font-lock-macro-helper)
+	(srecode-template-mode-macro-escape-match)
+	(srecode-macro-help, srecode-parse-this-macro)
+	(srecode-template-mode::semantic-analyze-current-context)
+	(srecode-template-mode::semantic-analyze-possible-completions):
+	Fix unused var bytcomp warning.
+
+	* srecode-table.el (srecode-get-mode-table):
+	Loop over mode lineage to find matching tables.
+
+	* srecode-srt.el (srecode-semantic-handle-:srt):
+	Fix unused var bytcomp warning.
+
+	* srecode-mode.el (mode-local): New require
+	(srecode-edit): Fix unused var bytcomp warning.
+
+	* srecode-map.el (srecode-map::srecode-map-entries-for-mode):
+	Use a mode-local fcn to check mode equivalence.
+	(srecode-adebug-maps): Fix unused var bytcomp warning.
+
+	* srecode-insert.el (srecode-resolve-argument-list, srecode-insert-method):
+	(srecode-inserter-apply-state, srecode-parse-input):
+	(srecode-insert-include-lookup): Fix unused var bytcomp warning.
+
+	* srecode-getset.el (srecode-insert-getset):
+	Fix unused var bytcomp warning.
+
+	* srecode-filters.el (srecode-comment-prefix):
+	Fix unused var bytcomp warning.
+
+	* srecode-extract.el (srecode-inserter-extract):
+	Fix unused var bytcomp warning.
+
+	* srecode-document.el:
+	(srecode-document-insert-variable-one-line-comment)
+	(srecode-document-programmer->english)
+	(srecode-document-function-comment-extract-test):
+	Fix unused var bytcomp warning.
+
+	* srecode-dictionary.el (srecode-dictionary-compound-variable::srecode-dump):
+	Fix unused var bytcomp warning.
+
+	* srecode-ctxt.el (srecode-semantic-handle-:ctxt):
+	Fix unused var bytcomp warning.
+
+	* srecode-compile.el:
+	(srecode-compile-one-template-tag, srecode-compile-split-code)
+	(srecode-compile-template-table): Fix unused var bytcomp warning.
+
+2009-01-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-template-mode.el (srecode-font-lock-keywords):
+	Fixup 1 include syntax.
+	(srecode-self-insert-complete-end-macro): Add in-macro detection.
+	(srecode-in-macro-p): Enable unended macros
+	(srecode-parse-this-macro): Enable undeded macros.
+
+	* templates/Makefile (templates_MISC):
+	Move some files to below new Var.
+	Add srecode-make.srt and srecode-java.srt.
+	(document_MISC): New target.
+	Add all document app support templates.
+
+	* templates/Project.ede (templates):
+	Move some files to below new target.
+	Add srecode-make.srt and srecode-java.srt.
+	(document): New target.
+	Add all document app support templates.
+
+	* templates/srecode-document-java.srt:
+	Document comment writing support for Java.
+
+	* srecode-java.el: Basic Java support for srecode.
+
+	* templates/default.srt (filecomment): Added more comment prefixing.
+
+	* templates/srecode-java.srt: Basic java templates.
+
+	* templates/srecode-make.srt: Basic Makefile templates
+
+2009-01-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-el.srt (variable-option):
+	Customtype macro is now an 'ask type
+
+	* srecode-texi.el, srecode-document.el (srecode-semantic): New require.
+
+	* srecode-template-mode.el (srecode-template-mode-map):
+	Add / binding to below
+	(srecode-self-insert-complete-end-macro): New command
+	(srecode-up-context-get-name): Allow incomplete sections to be found.
+
+2009-01-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-template-mode.el (srecode-template-mode-syntax-table):
+	Added more punctuation chars.
+	(semantic-ia-insert-tag): New override.
+	(srecode-in-macro-p): New util fcn.
+	(srecode-parse-this-macro): Fix typos.
+	Make work if escape start/end are the same string.
+	(srecode-template-mode::semantic-analyze-current-context):
+	Use functionarg analyzer, since we have slots in a fcn.
+	Record the argtype as a symbol so we know what kind of completion to
+	do.
+	Calculate a scope, and store it.
+	Fix lisp-symbol calculation.
+	If we find no tag, specify the originating prefix.
+	(srecode-template-mode::semantic-analyze-possible-completions):
+	New override.
+
+	* templates/srecode-template.srt (empty):
+	Attempt to derive majormode from :srt argument.
+
+	* srecode.texi (Language Arguments):
+	Add :srt and :el-custom arguments to the doc.
+
+	* srecode-srt.el (srecode-semantic-handle-:srt):
+	Attempt to derive the mode from the
+	file name.
+
+	* srecode-semantic.el (srecode-semantic-apply-tag-to-dict-default):
+	Add support for "THROWS" macro.
+
+	* srecode-insert.el (srecode-resolve-argument-list): Doc fix.
+
+	* srecode-template-mode.el (srecode-template-mode-syntax-table):
+	Add : and $ as punctuation.
+	(srecode-template-mode-font-lock-macro-helper)
+	(srecode-template-mode-macro-escape-match)
+	(srecode-macro-help):
+	Use helper for getting escape start/end.
+	(srecode-template-get-mode): Fix typo in name.
+	(srecode-up-context-get-name, srecode-parse-this-macro): New util
+	(semantic-up-context, semantic-beginning-of-context)
+	(semantic-end-of-context, semantic-get-local-variables)
+	(semantic-get-local-arguments, semantic-ctxt-current-symbol)
+	(semantic-analyze-current-context):
+	New overrides for srecode-template-mode
+	(srecode-template-get-escape-start, srecode-template-get-escape-end)
+	(srecode-template-current-context)
+	(srecode-template-find-templates-of-context):
+	New utility functions.
+
+2009-01-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-template-mode.el (srecode-font-lock-keywords):
+	New macro keywords.
+	(srecode-template-mode-font-lock-macro-helper)
+	(srecode-template-mode-macro-escape-match): New fcns.
+
+2009-01-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Base Arguments): Filled in more about :time
+	(Language Arguments): Fill in all misc args previously left empty.
+
+	* templates/srecode-texi.srt (function, function-command, variable):
+	Use :texitag arg instead of just :tag.
+
+	* templates/srecode-document-cpp.srt (section-comment): New
+
+	* templates/srecode-cpp.srt (doxygen-section-comment): New.
+
+	* templates/document-default.srt (section-comment): New
+	(function-comment, variable-same-line-comment, group-comment-start):
+	Turn var refs into ask variables.
+
+	* srecode-document.el (srecode-document-insert-comment):
+	If no tag is overlapped, then insert a section comment.
+	(srecode-document-insert-section-comment):
+	New fcn.
+
+	* templates/Makefile (templates_MISC): Add document-default.srt
+
+	* templates/Project.ede (templates): Add document-default.srt
+
+	* templates/document-default.srt:
+	Default commenting code for document application.
+
+	* srecode-find.el (srecode-template-table::srecode-template-get-table):
+	Add application argument. (Unused)
+	(srecode-mode-table::srecode-template-get-table):
+	Pass application in when recusring to next template.
+
+	* Makefile (srecode_LISP): Add srecode-extract.el
+	(document_LISP): Add srecode-document-vars.el
+
+	* Project.ede ("srecode"): Add srecode-extract.el
+	("document"): Add srecode-document-vars.el
+
+	* srecode-document.el (srecode-document-vars): New require.
+	(srecode-document-insert-comment): Fix sorting of region b/e
+	(srecode-document-insert-function-comment)
+	(srecode-document-insert-variable-one-line-comment):
+	Use new `srecode-document-function-name-comment'.
+	(srecode-document-insert-group-comments): New impl.
+	(srecode-document-autocomment-common-nouns-abbrevs):
+	Moved to srecode-document-vars.el
+	(srecode-document-function-name-comment)
+	(srecode-document-parameter-comment):
+	New fcns.
+
+	* templates/srecode-document-cpp.srt (variable-same-line-comment):
+	Doc fix.
+	(group-comment-start, group-comment-end):
+	New templates for declaration, and classdecl contexts.
+
+2008-12-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-document-vars.el:
+	Variables with tables for generating documentation.
+
+2008-12-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-texi.el (srecode-semantic-handle-:texi): Force a tag refresh.
+	(srecode-semantic-handle-:texitag): New arg handler
+	(semantic-insert-foreign-tag): Copied override from semantic.
+	(srecode-texi-massage-to-texinfo)
+	(srecode-texi-texify-docstring)
+	(srecode-texi-texify-docstring-default)
+	(srecode-texi-texify-docstring): New stuff copied from document.el
+	in semantic.
+
+	* srecode.el (mode-local): Add require.
+
+	* templates/srecode-document-cpp.srt (function-comment): Add :indent.
+
+	* srecode-document.el (srecode-document-trim-whitespace): New fcn.
+	(srecode-document-insert-function-comment):
+	Revamp extraction of text from old comments, and the list of questions
+	asked to be more detailed.
+
+	* srecode-extract.el (srecode-extract-method):
+	Simplify, we don't need the template stack.
+
+	* srecode-compile.el (srecode-flush-active-templates): New command.
+
+	* srecode-document.el (srecode-extract, srecode-args): New require.
+	(srecode-document-insert-comment): Added group-comment fcn args.
+	(srecode-document-insert-function-comment)
+	(srecode-document-insert-variable-one-line-comment):
+	Add comment text extraction.
+	(srecode-document-insert-group-comments): New fcn.
+	(srecode-document-function-comment-extract-test):
+	New debugging fcn for a combo of srecode-extract, and
+	extraction for document comments.
+
+	* srecode-extract.el:
+	Extract buffer text into a dictionary based on a template.
+
+2008-12-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-insert.el (srecode-insert-fcn):
+	Inhibit mod hooks during insertion, then
+	batch up those changes, and call the hook myself.
+	(srecode-template-inserter-blank::srecode-insert-method):
+	Clear trailing whitespace after point before deciding if a CR is needed.
+
+	* srecode-semantic.el (srecode-semantic-apply-tag-augment-hook):
+	New hook.
+	(srecode-semantic-apply-tag-to-dict-default): Use above hook.
+
+	* srecode-map.el (srecode-map-update-map):
+	Fix bytecomp warnings about copy-list.
+
+	* srecode-insert.el (srecode-resolve-argument-list):
+	Be more explicity about the type of
+	error being caught.
+	(srecode-template-inserter-newline, srecode-template-inserter-blank)
+	(srecode-template-inserter-comment, srecode-template-inserter-variable)
+	(srecode-template-inserter-ask, srecode-template-inserter-point)
+	(srecode-template-inserter-subtemplate, srecode-template-inserter-section-start)
+	(srecode-template-inserter-include, srecode-template-inserter-include-wrap):
+	 Doc enhancement
+	(srecode-template-inserter-comment::srecode-inserter-prin-example)
+	(srecode-template-inserter-point::srecode-inserter-prin-example)
+	(srecode-template-inserter-subtemplate::srecode-inserter-prin-example)
+	(srecode-template-inserter-include::srecode-inserter-prin-example)
+	(srecode-template-inserter-include-wrap::srecode-inserter-prin-example):
+	New methods.
+
+	* srecode-compile.el (srecode-template-inserter::srecode-inserter-prin-example):
+	New.
+
+	* srecode-args.el (srecode-semantic-handle-:time):
+	Add many more time notations.
+
+	* templates/Makefile (templates_MISC): Add srecode-document-cpp.srt.
+
+	* templates/Project.ede (templates): Add srecode-document-cpp.srt.
+
+	* Makefile (doocument_LISP): New var.
+	(all): Add document.
+	(clean): Clean up doc.
+	(dist): Add document files.
+
+	* Project.ede (document): New target.
+
+	* srecode-document.el: Add comments to things in a buffer.
+
+	* templates/srecode-cpp.srt (doxygen-function): Fixed point locator.
+	Fixed name notation.
+	(doxygen-variable-same-line): New.
+
+	* templates/srecode-document-cpp.srt:
+	C++ mode documenting comment macros.
+
+	* srecode-mode.el (srecode-add-code-generator):
+	Support binding overries during development.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dump):
+	Add CR at end of each dict entry.
+
+	* srecode-template-mode.el (srecode-separator-face): New.
+	(srecode-font-lock-keywords): Use above on the ---- separators.
+	(srecode-template-mode-map): Add binding for macro help.
+	(srecode-macro-help): New command.
+	(srecode-template-add-submode): Remove unused unknown fcn call.
+
+2008-12-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Top, Quick Start, Parts of SRecode, Section Show,Automatic Loop Variables):
+	(Templates, Dictionaries, Template Argument Dictionary Entries):
+	(Developing Template Functions): Misc simple fixes from Joakim.
+
+2008-10-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (cedet-utests): New require
+	(srecode-utest-output::srecode-utest-test)
+	(srecode-utest-template-output): Use cedet-utest for logging.
+
+	* srecode-test-getset.el (cedet-utests): New require.
+	(srecode-utest-getset-output): Use cedet-utest calls for logging.
+
+2008-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el (srecode-adebug-maps):
+	Require data-debug, not semantic-adebug.
+	(srecode-map-file-still-valid-p): Fix bug when filename is shorter
+	than load path.
+
+2008-07-03  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.el (eieio): Add require before loading the loaddefs.
+
+2008-06-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-template.srt (NEWMODE): Add new mode prompt reader.
+
+	* srecode-srt.el (srecode-read-major-mode-history): New hitory var.
+	(srecode-read-major-mode-name): New prompt fcn.
+
+	* srecode-insert.el (srecode-template-inserter-include::srecode-insert-include-lookup):
+	Add todo comment.
+
+	* srecode-find.el (srecode-table):
+	Search through mode-local-parent stack.
+
+2008-06-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-getset-cpp.srt (getset-in-class):
+	replace doxygen template names with more generic
+	comment templates.
+	(getset-field): Make type a query.
+
+	* templates/srecode-cpp.srt:
+	(comment-function-group-start, comment-function-group-end)
+	(comment-function): New templates that redirect to doxygen.
+	(doxygen-function): Moved.
+
+	* Makefile (tests_LISP): Add srecode-test-getset.el
+
+	* Project.ede ("SRecode"): Add srecode-test-getset.el
+
+	* srecode-getset.el ("srecode-mode"): New eval-after-load.
+	(srecode-insert-getset-fully-automatic-flag): New flag.
+	(srecode-insert-getset): Add check that templates we need exist
+	for this major mode.
+	Track starting point for inserting new fields as needed.
+	(srecode-position-new-methods): Be smarter about
+	destructor/constructor being public.
+	Don't position before a comment that belongs to preceeding tag.
+	(srecode-position-new-field): Allow to work if starting in the class.
+	(srecode-auto-choose-field): Support fully-automatic mode.
+
+	* srecode-mode.el (srecode-prefix-map): Remove getset binding
+	(srecode-menu-bar): Add "Generate..." menu
+	(srecode-minor-mode-generators): New variable.
+	(srecode-minor-mode-generate-menu): New automatic menu.
+	(srecode-add-code-generator): New utility.
+
+	* srecode-test-getset.el: New tests for getset recoder.
+
+2008-06-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-getset-cpp.srt (getset-in-class):
+	Fix include template names to include the context.
+
+2008-05-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-mode.el (srecode-edit): Add todo note.
+
+	* srecode-dictionary.el (srecode-dictionary-compound-value): Fix doc.
+
+2008-05-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (Top): Add some macros.
+	Tighten up purpose statement.
+	(Quick Start): Fix up install statement.
+	(Variables): Describe how variables and dictionaries are related.
+	(Multi-string Values): Renamed from Compound Values.
+	Replace "compound" with "multi-string" in text.
+	(Section Show): Proclaim that I haven't tried this.
+	(Special Variables): Add more about applications
+	(Automatic Loop Variables): New section
+	(Template Macros): Fix typo in example.
+	(Contexts): Fix capitalization in examples.
+	(Prompts): Replace $ escape strings with {{ }}
+	(Dictionaries): Proclaim this chapter mostly for Lisp programmers
+	(Compound Dictionary Values): Fixup description.
+	(Argument Resolution): Provide better intro paragraph.
+	(Creating new Arguments): New section
+	(Base Arguments): Add `indent-according-to-mode' part.
+	Add several intro statements to subsections.
+	(Semantic Arguments): Add more known arguments.
+	(Developing Template Functions): Fix bug in example.
+
+2008-05-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Project.ede ("SRecode templates"): update name.
+
+	* Project.ede ("SRecode"): Update name.
+
+2008-04-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Added ede to loadpath.
+
+2008-03-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el (srecode-adebug-maps):
+	Use new data-debug instead of semantic-adebug.
+
+2008-03-05  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-semantic.el (srecode-semantic-apply-tag-to-dict-default):
+	autoload cookie.
+
+	* srecode-map.el (srecode-map-update-map):
+	Allow ~/.srecode directory to be optional.
+	Don't ask if we are non-interactive, and don't error while scaning the path.
+
+	* srecode-filters.el (newcomment): Optional
+
+2008-03-02  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-load.el (global-srecode-minor-mode):
+	Stop turning on by default.
+
+2008-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-test.el (srecode-utest-template-output): Add autoload cookie.
+
+	* srecode-map.el (srecode-map-file-still-valid-p): New.
+	(srecode-map-update-map): Use above.
+	Also loop over apps to strip out dead template files.
+
+	* srecode-find.el (srecode-table): Support MODE argument.
+
+	* templates/srecode-texi.srt (empty): Add .info to setfilename.
+	(function): Use defun, not deffn.
+	(variable): Add :blank, and some blank lines.
+	(menu): Add some space and :blank.
+	(menuitem): Add blank.
+	(subnode): New
+
+	* templates/srecode-el.srt (section-comment): Moved
+	(major-mode): Add blank,indent.
+	(include, include-protected): New
+	(function, variable, variable-const, variable-option): add blank,indent.
+	(class): Add blank,indent
+	(class-tag): New, with now starter slots.
+	(method-tag): New
+	(modelocal, defgroup, keymap): add blank, indent.
+	(classdef:variable-tag): New
+	(classdef:variable): add blank,indent
+
+	* templates/srecode-cpp.srt (constructor-tag):
+	Stop using function template, and just write it
+	from scratch.
+
+	* srecode-texi.el (srecode-texi-add-menu): Support arg for node name.
+	Force tags to be up-to-date.
+	Choose between new node macro based on only, or sub nodes.
+
+	* srecode-semantic.el (srecode-semantic-insert-tag):
+	Spell constructor-tag, destructor-tag
+	correctly.  Add support for variable constants.
+
+	* srecode-insert.el (srecode-insert-fcn):
+	Make sure tag table is up-to-date for argument resolution.
+
+	* srecode-el.el (emacs-lisp-mode::srecode-semantic-apply-tag-to-dict):
+	Add override for INTERACTIVE.
+
+2008-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-mode.el (srecode-minor-mode-templates-menu):
+	Don't compile everything on first
+	menu click.  Instead offer a button to do the load.
+
+2008-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (top): Add new chapter.
+	(Template Naming Conventions):
+	Add a few more discovered from srecode-
+	(Inserting Tag Lists): New chapter.
+
+	* templates/Makefile (templates_MISC): Add srecode-test.srt
+
+	* templates/Project.ede ("ede-proj-project"): Added srecode-test.srt
+
+	* templates/srecode-cpp.srt:
+	Revamped to handle `srecode-semantic-insert-tag'.
+
+	* srecode-semantic.el (srecode-semantic-apply-tag-to-dict):
+	Now an overload fcn.
+	Support more tag classes.
+	(srecode-semantic-find-tempalte): New fcn.
+	(srecode-insert-tag): Implemented.
+
+	* srecode-insert.el (srecode-insert-fcn):
+	Always return something, even when no ^ inserter.
+	(srecode-insert-method): Always do indentation reguardless of newline.
+	(srecode-template-inserter-blank::srecode-insert-method):
+	Don't do blanking stuff unless we are the top template.
+	(srecode-template-inserter-point::srecode-insert-method):
+	Disable funcall feature so we don't recurse.
+	(srecode-insert-include-lookup): Track our current app
+	so apps are available to us too.
+
+	* srecode-ctxt.el (srecode-calculate-context-default):
+	Force tags to be updated
+	so our context calculation is accurate.
+
+2008-02-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-template.srt (mode-basics): Add :srt arg.
+	(priority): Add doc string.
+	(application): New template.
+	(point): Add :srt
+	(test, subs, wrapsomething, gapsomething): Deleted.
+	Moved to srecode-test.srt
+
+	* srecode.texi (Top): Add "Template Naming Conventions"
+	(Quick Start): Update examples.
+	Add big new section on map loading.
+	Add section on how to insert templates.
+	(User Templates): Fix
+	(Parts of SRecode): Use new macros.
+	(SRecode Minor Mode): Use new macros.
+	(Setting Dictionary Values): Update "add-section-dictionary" doc.
+	(Semantic Arguments): Remove big FIRST/LAST part.
+	(Getting Started): New section.
+	(Template Naming Conventions): New section.
+
+	* srecode-semantic.el (top): Various section comments.
+	(srecode-semantic-apply-tag-to-dict): Remove setting for FIRST/LAST
+	variables.  This happens automatically.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dictionary-add-template-table):
+	Fix doc.
+	(srecode-dictionary::srecode-dictionary-set-value): Fix signal.
+	(srecode-dictionary::srecode-dictionary-add-section-dictionary):
+	Doc fix.  Auto-set values for FIRST,LAST, NOTFIRST, and NOTLAST into
+	created sub dictionaries.
+	(srecode-dictionary::srecode-dictionary-hide-section): New
+	(srecode-dictionary::srecode-dictionary-lookup-name):
+	Strip FIRST, LAST, NOTFIRST, and NOTLAST from upward looking searc.
+
+	* srecode-args.el (srecode-semantic-handle-:indent): Fix doc.
+	(srecode-semantic-handle-:region): Fix doc.
+	(srecode-handle-region-when-non-active-flag): New
+	(srecode-semantic-handle-:region): Fix doc.
+	Use above flag.
+
+	* Makefile, Project.ede (tests): New target.
+
+	* srecode-map.el (srecode-get-maps): Improve spacing in app output.
+	(srecode-adebug-maps): New.
+
+	* srecode-table.el (srecode-template-table::srecode-dump):
+	Output application (if there
+	is one.)
+
+	* srecode-compile.el (srecode-compile-state::srecode-compile-add-prompt):
+	Fix.
+	(srecode-compile-do-hard-newline-p): New
+	(srecode-compile-split-code): Use above.
+
+	* srecode-insert.el (srecode-insert-fcn):
+	Make sure our inserter-point is bound.
+	(srecode-template-inserter-include::srecode-insert-include-lookup):
+	Improve the error.
+	Search through application tables in addition to core tables.
+
+	* srecode-test.el: Tests.
+
+	* templates/srecode-test.srt: Testing application templates
+
+2008-02-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-insert.el (srecode-insert-fcn):
+	Return a mark for the end of the insertion.
+	Useful when a point-inserter is used and the cursor is somewhere in
+	the text of the template.
+
+	* srecode-load.el (srecode-loaddefs): Don't load these.
+	(srecode): Require this.
+
+	* srecode.el ("srecode-loaddefs"): Load the loaddefs here.
+
+	* srecode.el (semantic): Stop requiring it.
+
+	* srecode-args.el (simple):
+	Don't require.  Simple is apprently a new thing in Emacs.
+
+2008-02-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-mode.el (srecode-edit): Pass in a good suggestion.
+
+2008-02-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-compile.el (srecode-compile-one-template-tag):
+	Set :where value onto blank inserters.
+	(srecode-compile-split-code): When creating a newline tag, specify
+	:hard based on previous compiled input value.
+
+	* srecode-insert.el (srecode-template-inserter-newline):
+	Add :hard slot.
+	(srecode-template-inserter-newline::srecode-insert-method):
+	If :hard, then always insert.  Otherwise, only insert if the various
+	macros in this line evaluated into nothing.
+	Don't do that if standard-output isn't a buffer.
+	(srecode-template-inserter-newline::srecode-dump):
+	Show :hard value.
+	(srecode-template-inserter-blank): Add :where.
+	(srecode-template-inserter-blank::srecode-insert-method):
+	Use :where to make different determinations based on current output.
+
+	* srecode-dictionary.el (srecode-dictionary::srecode-dump):
+	Try to fix newlining issue in dump output.
+
+	* srecode-map.el (srecode-map-update-map):
+	Do not create maps for backup files,
+	auto-save files, or files that can't be read.
+
+	* srecode-args.el (srecode-semantic-handle-:blank): autoload cookie.
+
+2008-02-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el (srecode-map-validate-file-for-mode):
+	Look in more places
+	for file before reparsing.
+
+2008-01-31  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-map.el: (srecode-map::srecode-map-update-file-entry)
+	(srecode-map::srecode-map-update-app-file-entry): Return non-nil if
+	the map changes.
+	(srecode-map-update-map): Track if the MAP changed.
+	If it changes, then write out a new version.
+	(srecode-map-validate-file-for-mode): Track if MAP changes, and return status.
+
+	* srecode.texi (Top): Rewrite SRecode goals
+	Add srecode and semantic macros.
+	(Quick Start): Use new macros
+	(User Templates): New section.
+	(Parts of SRecode, SRecode Minor Mode, Template Writing)
+	(Setting Dictionary Values, Getting Started)
+	(Developing Template Functions): Use new macros
+	(Application Writing): New section.
+
+	* srecode-getset.el (srecode-getset-template-file-alist): Deleted
+	(srecode-insert-getset): Use new app loading style.
+
+	* srecode-find.el (srecode-load-tables-for-mode): Doc fix.
+	Handle app level template loading.
+
+	* srecode-map.el (srecode-map): Add apps slot
+	(srecode-map::srecode-map-entry-for-file): Doc fix.
+	(srecode-map::srecode-map-entry-for-app)
+	(srecode-map::srecode-map-entries-for-app-and-mode)
+	(srecode-map::srecode-map-delete-file-entry-from-app)
+	(srecode-map::srecode-map-update-app-file-entry): New methods.
+	(srecode-get-maps): Update print to also show apps.
+	(srecode-mps-dump-file-list): New
+	(srecode-map-validate-file-for-mode): Support app parsing.
+
+	* srecode-mode.el (srecode-map): New require
+	(srecode-menu-bar): Add customize srecode option.
+	(srecode-minor-mode): Do not turn on if there are no templates.
+
+2008-01-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (srecode_LISP): Add srecode-maps.el
+
+	* Project.ede (srecode): Add srecode-maps.el
+
+	* srecode-find.el (srecode-template-file-alist, srecode-user-template-directory):
+	Delete.
+	(srecode-load-tables-for-mode): Use srecode-get-maps
+	to find the files for different major modes.
+
+	* srecode-mode.el (srecode-menu-bar): Add more dump menu items.
+
+	* srecode-map.el (srecode-map-load-path, srecode-map-load-path-set):
+	Move to end of file.
+	(srecode-map::srecode-map-entries-for-mode): New method.
+	(srecode-get-maps): Autoload cookie.
+	Add some help to end of the dump.
+
+	* srecode-ctxt.el (srecode-semantic-handle-:ctxt):
+	For templates of fcn/method
+	if preceeding tag is a datatype, use it's name as PARENT.
+
+	* srecode-map.el: First pass at a template map.
+
+	* templates/srecode-template.srt (empty):
+	Add escape_start and escape_end, and "context file" to template.
+	(mode-basics): New
+	(function, variable): Use :blank, add more settings
+	(prompt, priority, context, commentchars): New
+	(escape-start-quoted, escape-end-quoted): New
+	(wrapsomething, gapsomething): New test templates
+
+	* srecode.texi (Base Arguments): Describe :indent, :blank, and :region
+
+	* srecode-template.wy (template):
+	Use templatename instead of symbol so we can have
+	templates with names that are the same as keywords.
+	(templatename): New rule
+
+	* srecode-srt.el (srecode-semantic-handle-:srt):
+	Accept new parser output for variable
+	default value.
+
+	* srecode-insert.el (srecode-insert): Do not resolve arguments here.
+	(srecode-insert-fcn): Do resolve arguments w/in the setting of
+	standard-output.
+	(srecode-template-inserter-blank): New inserter
+	(srecode-template-inserter-blank::srecode-insert-method): New method.
+
+	* srecode-compile.el (srecode-compile-one-template-tag):
+	Extract `code' more cleanly.
+	If :blank arg, then add BLANK inserters.
+	(srecode-compile-split-code): Do not add empty strings to the compiled template.
+
+	* srecode-args.el: (srecode-semantic-handle-:blank)
+	(srecode-semantic-handle-:region): New handlers.
+
+2008-01-29  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (doc_*): Moved.
+	(VERSION): Changed.
+	(dist): Moved parts around.  Removed creation of .tar.gz. (metasubproject)
+
+	* Project.ede (doc): Moved to end.
+	(:version): Changed.
+	(srecode): set as metasubproject.
+
+	* templates/Makefile (VERSION): Fix version number.
+
+	* templates/srecode-wisent.srt (functino, keyword, token):
+	added bindings.
+
+	* templates/srecode-texi.srt (function):
+	Fix the way docstrings are extracted.
+
+	* templates/srecode-template.srt (includewrap): New template.
+
+	* templates/srecode-el.srt (MODESYM, MODENAME, MODEEXTENSION):
+	New prompts
+	(major-mode): Revised to use composition and sectiondictionaries.
+	(syntax-table): new
+	(INTERACTIVE, NAME): New prompts
+	(function, variable, variable-const, custom, method, mode-local)
+	(defgroup, keymap,): Some new.  All now support DOC macro and correct
+	placement of ^ point inserter.
+
+	* srecode.texi (Top): Remove warning. Add QuickStart
+	(Quick Start): New
+	(Parts of SRecode): Re-write.
+	(SRecode Minor Mode): Add links and keybindings.
+	(Template Writing): Fixup intro, and...
+	(Variables, Templates, Template Macros, Prompts, ...):
+	Divide up large nodes.  Add some new ones.
+	(Template Argument Dictionary Entries, Base Arguments)
+	(Semantic Arguments): New sections
+	(Developing Template Functions): Added more info.
+
+	* srecode-texi.el (srecode-texi-add-menu): Autoload cookie.
+	Force table loading. Set return mark to menu area.
+	(srecode-semantic-handle-:texi):
+	Handle changs to semantic texi parsing that includes the @node.
+
+	* srecode-semantic.el (srecode-semantic-tag::srecode-compound-toString):
+	New method.
+	(srecode-semantic-tag-from-kill-ring): Return just the tag
+	(srecode-semantic-handle-:tag): Fix bugs creating the semantic tag
+	compound variable.
+	(srecode-semantic-apply-tag-to-dict): Use the compound macro for tags.
+
+	* srecode-insert.el (srecode-template::srecode-insert-method):
+	Merge in template dictionaries.
+	Split out code stream inserter.
+	(srecode-insert-code-stream): Split from above.
+	(srecode-template-inserter-comment): Doc fix.
+	(srecode-template-inserter-variable::srecode-insert-method):
+	Do not error on missing macros, just warn.
+	Pass fcnpart into the toString method.
+	(srecode-template-inserter-ask::srecode-insert-method):
+	Change how the default-from-dictionary calculation is done.
+	Store user-queried values into the root dictionary, not the local dictionary.
+	(srecode-template-inserter-point-override): New variable.
+	(srecode-template-inserter-point::srecode-insert-method): When above
+	variable has functional value, run that instead of storing this point
+	location.
+	(srecode-inserted-subtemplate)
+	(srecode-inserted-subtemplate::srecode-insert-subtemplate)
+	(srecode-inserted-subtemplate::srecode-insert-method):
+	Support a wider range of subclasses that handle subtemplates.
+	Do not specify the :template slot.
+	(srecode-template-inserter-section-start): Add the :template slot.
+	(srecode-template-inserter-include): Add :includetemplate slot
+	(srecode-template-inserter-include::srecode-insert-include-lookup):
+	New method
+	(srecode-template-inserter-include::srecode-insert-method)
+	Split out above new method.
+	(srecode-template-inserter-include-wrap): New inserter class.
+	(srecode-template-inserter-include-wrap::insert-method): New method.
+
+	* srecode-dictionary.el (srecode-dictionary-compound-value):
+	Fix doc string.
+	(srecode-dictionary-compound-variable): New class
+	(srecode-dictionary-compound-variable::initialize-instance): New method
+	(srecode-create-dictionary): Allow bufferless dictionaries.
+	Better name.
+	(srecode-dictionary::srecode-dictionary-add-template-table): Doc fix.
+	(srecode-dictionary::srecode-dictionary-add-section-dictionary): Doc fix
+	(srecode-dictionary::srecode-dictionary-merge): New fcn.
+	(srecode-dictionary::srecode-dictionary-lookup-name): Doc fix.
+	(srecode-dictionary::srecode-root-dictionary): New method.
+	(srecode-dictionary-compound-value::srecode-compound-toString):
+	Add more complete docstring.  Accept a function.
+	(srecode-dictionary-compound-value::srecode-dump): Add princ
+	(srecode-dictionary-compound-variable::srecode-compound-toString)
+	(srecode-dictionary-compound-variable::srecode-dump): New.
+	(srecode-create-section-dictionary): New fcn.
+	(srecode-dictionary-dump, srecode-dictionary::srecode-dump):
+	Accept new features.  Provide nicer nested output.
+
+	* srecode-compile.el (srecode-template): Add per-template dictionary
+	(srecode-compile-state::srecode-compile-add-prompt): Handle new prompt format.
+	(srecode-compile-templates): Handle compound variables.
+	(srecode-compile-one-template-tag): Handle per-template dictionaries.
+	Remove old statuts messages.
+	(srecode-compile-split-code): Split
+	(srecode-compile-parse-inserter): New fcn split from above.
+	(srecode-template::srecode-dump): Show new features of templates.
+	(srecode-dump-code-list): Remove trailing CR
+
+	* srecode-template.el (srecode-template-mode::semantic-tag-components):
+	New override to
+	handle the added use of variable tag components of templates.
+	(srecode-template-mode-hook): Change hook.
+
+	* srecode-template-mode.el (srecode-font-lock-keywords):
+	Add new syntax support.
+	(srecode-template-mode): new fcn
+
+	* srecode-template.wy (SHOW, MACRO, SECTIONDICTIONARY, DEFAULTMACRO):
+	New keywords.
+	(opt-default-fcn): Add defaultmacro support.
+	(variable): Require a newline.  Enable "show" syntax.
+	(insertable-string-list, insertable-string): New rules
+	(template): Add optinal sectin dictinaries.
+	(opt-section-dictionaries, section-dictionary-list, one-section-dictionary)
+	(variable-list): New rules.
+
+2008-01-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-texi.srt (menu, menuitem): New templates
+
+	* templates/srecode-el.srt (modelocal): New template.
+
+	* srecode-texi.el (srecode-texi-add-menu): Implement.
+	(srecode-semantic-handle-:texi): Add "top" as a level.
+
+	* srecode-template.wy (prompt):
+	Add newline as part of the prompt statement.
+
+2008-01-25  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-template-mode.el (srecode-font-lock-keywords):
+	Support default "" and read keywords.
+
+	* srecode-insert.el (srecode-insert):
+	Rename arg dictentries which looks like a
+	misspelling with dict-entries.
+
+	* srecode-insert.el (srecode-insert):
+	Support optional dictionary plist.
+
+2008-01-22  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Makefile (templates_MISC): Add srecode-texi.el
+
+	* Makefile (srecode_LISP): Add srecode-texi.el
+
+	* Project.ede (srecode): Add srecode-texi.el
+
+	* templates/Project.ede ("templates"): Add srecode-texi.srt
+
+	* templates/srecode-texi.srt: Texinfo template support.
+
+	* srecode-texi.el: Support for texinfo files.
+
+	* srecode-srt.el (srecode-read-template-name):
+	Delete.  Use the other one.
+
+	* srecode-insert.el (srecode-template-inserter-newline::srecode-insert-method):
+	Use princ, instead of insert.
+	Do not indent an output device that is not a string.
+
+	* srecode-find.el (srecode-template-file-alist): Add texinfo.
+	(srecode-read-template-name): Support more arguments like most prompts.
+
+2008-01-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (srecode_LISP): Add two new source files.
+
+	* Project.ede (srecode): Add two new source files.
+
+	* templates/srecode-template.srt (escape_start, escape_end):
+	Don't need to quote as a regexp.
+	(KEY): New prompt.
+	(template): Add bind feature.
+	(context, var, ask,comment, include,point,section): New templates, or
+	new contents to old.  Add key bindings.
+
+	* templates/srecode-el.srt (escape_start, escape_end):
+	Don't need to quote as a regexp.
+	(empty): Whitespace change.
+	(INTERACTIVE, NAME): Added various prompt declarations.
+	(function, variable, variable-const, variable-option, type, method):
+	New templates.  Added bindings.
+
+	* templates/srecode-cpp.srt (comment_end,comment_prefix): Swap values.
+	(function-tag): Use filecomment node.
+	Bind to "f"
+
+	* templates/default.srt (filecomment):
+	Fix typo on cursor placement marker.
+
+	* srecode.texi (Template Writing): Split into submenus
+	(Variables, Templates, Contexts, Prompts): New nodes.
+	Some built from parent node.  Add some more detail.
+
+	* srecode-template-mode.el (srecode-template-mode-syntax-table):
+	Add $ as punctuation.
+	(srecode-font-lock-keywords): Highlight "bind" prefix.
+
+	* srecode-mode.el (srecode-insert, srecode-find): New requires
+	(srecode-prefix-map): srecode-edit bound to E.
+	Bind . to srecode-insert-again.
+	bind all lower case leters to srecode-bind-insert
+	(srecode-menu-bar): Add insert-again and a dynamic submenu listing
+	all templates that could be inserted.
+	(srecode-minor-mode-tmeplates-menu): New menu filter.
+	(srecode-bind-insert): New command.
+
+	* srecode-ctxt.el (srecode-calculate-context): Update doc string.
+	(srecode-calculate-context-default): Apply features found by font-lock.
+	(srecode-calculate-nearby-things): Stop using 'method'.  Just use function.
+	Support virtual and pure.
+	(srecode-calculate-context-font-lock): New fcn
+	(srecode-semanatic-handle-:ctxt): New argument handler.
+
+	* srecode-insert.el (srecode-insertion-start-context): New variable.
+	(srecode-insert-again): New command.
+	(srecode-insert): Track the starting context in var above.
+	(srecode-resolve-arguments): Split into two functions.
+	(srecode-resolve-argument-list): New, split from above.
+	Allow handlers to have an optional 2nd argument for the template being inserted.
+	(srecode-template-inserter-ask::srecode-inserter-apply-state): Supply
+	default read-fcn if there is no attribute.
+	(srecode-template-inserter-ask::srecode-insert-method): Add read-char support.
+
+	* srecode-compile.el (srecode-template): Add binding slot.
+	(srecode-compile-one-template-tag): Inittialize binding slot.
+	(srecode-compile-split-code): Track different start/end escape
+	sequences.  `regexp-quote' the raw string.
+	(srecode-template::srecode-dump): Don't show arg list if there aren't
+	any args.  Show binding if there is one.
+
+	* srecode-template.wy (bind): New keyword.
+	(template): Add opt-bind.
+	(opt-bind): New
+
+	* srecode-find.el (srecode-table): New require.
+	(srecode-mode-table::srecode-template-get-table-for-binding)
+	(srecode-template-table::srecode-template-get-table-for-binding):
+	New methods.
+	(srecode-calculate-default-template): Renamed to...
+	(srecode-calculate-default-template-string): Offer up a prefix
+	even if no exact match was found.
+	(srecode-read-template-name): Use new name above.
+
+	* srecode-table.el (srecode-template-table): Group slots.
+	Add slots for files size and date.  (For use with auto-refresh)
+	(srecode-mode-table-new): Initialize file size and date.
+	(srecode-dump-templates): Improved "no default mode specified" code.
+
+	* srecode-srt.el: Special handlerse for srt files.
+
+2008-01-20  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-el.el: Added new lisp specific handlers for Emacs Lisp.
+
+	* srecode-template.wy (PROMPT,DEFAULT,READ): Updated the summary.
+	(property): Accept symbol chars in addition to just word chars.
+	(srecode-template-property-analyzer): As above.
+
+	* srecode-insert.el (srecode-template-inserter-ask::srecode-insert-method):
+	After finding the default text string, look it up in the dictionary.
+	If it is there, use that as the string.
+	Make sure y-or-n-p version always sets up some new value.
+	Pass default into general reader.
+
+2007-09-07  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-insert.el (srecode-template-inserter-comment): Moved
+	(srecode-template-inserter-ask): Add a read-fcn
+	(srecode-template-inserter-ask::srecode-inserter-apply-state):
+	Calculate a new read fcn.
+	(srecode-template-inserter-ask::srecode-insert-method):
+	Ask the question with the read-fcn if there is one.
+
+2007-08-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-ctxt.el (srecode-calculate-context): Update doc.
+	(srecode-calculate-nearby-things): Return a list
+	(srecode-calculate-context-default): Use a bove.
+
+2007-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/default.srt (filecomment): Add cursor stop location.
+
+	* templates/srecode-el.srt (empty): Add point set
+	(INTERACTIVE): New prompt
+	(function): Add interactive option.
+	(method): New template.
+
+	* srecode-template.wy (READ): New prompt option
+	(prompt): Support a read option.
+	(opt-lisp-fcn): Deleted
+	(opt-default-fcn): Was opt-lisp-fcn.  Support symbols or strings.
+	(opt-read-fcn): New rule.
+
+2007-06-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-mode.el (srecode-prefix-map, srecode-menu-bar):
+	 Add srecode-edit binding.
+	(srecode-edit): New command.
+
+	* srecode-compile.el (srecode-template): Add :table slot.
+	(srecode-compile-template-table): XRef tables to templates.
+
+2007-03-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-mode.el (srecode-menu-bar): Add table dumper.
+
+	* srecode-cpp.el (srecode-template-inserter-include::srecode-insert-method):
+	Fix typo.
+
+	* srecode-insert.el (srecode-template-inserter-include::srecode-insert-method):
+	Support multiple nested templates when finding a context to match against.
+
+2007-03-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-el.srt (major-mode): Use MODESYM in doc string.
+
+	* templates/srecode-cpp.srt (declaration): Add in context.
+	(empty): Add :cpp arg, and stuff for header files.
+	(header_guard): New template.
+	(function-tag): Add indent.
+	(constructor-tag, destructor-tag): New temlates.
+	(doxygen-function-group-start, doxygen-function-group-end): add :indent
+
+	* templates/Project.ede (templates): Add expandproto and wisent.
+
+	* templates/Makefile (templates_MISC):
+	Added wisent and expandproto templates.
+
+	* srecode-cpp.el: Special functions for C++ in srecode.
+
+	* srecode-semantic.el (srecode-semantic-handle-:tagtype):
+	New argument handler.
+
+	* srecode-expandproto.el: Prototype expander.
+
+	* Project.ede ("srecode"):
+	Add srecode-cpp.el and srecode-expandproto.el.
+
+	* Makefile (LOADPATH): Strip out duplicates
+	(lang_SEMANTIC_GRAMMAR_EL,dist): Spelling fix.
+
+2007-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode-compile.el (srecode-compile-state):
+	Fix type for context initform.
+
+	* templates/srecode-cpp.srt: Add context statement.
+	Add GROUPNAME prompt.
+
+	* srecode-insert.el (srecode-template-inserter-ask):
+	Add defaults for prompt & defaultfcn.
+
+	* srecode-getset.el (srecode-insert-getset): Autoload cookie.
+	Add error for the difficult cases of the field we are getsetting.
+	(srecode-position-new-methods): Add constructor search.
+
+	* srecode-mode.el (srecode-prefix-map): Add "G" for getset.
+
+2007-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* srecode.texi (SRecode Minor Mode): New chapter.
+
+2007-03-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-template.srt (NEWMODE): New prompt
+	(empty): Change name of MODE since that's used by something else now.
+	(NAME): New prompt.
+
+	* srecode-template.wy (PROMPT,DEFAULT): New keywords.
+	(template_file): Add prompt
+	(prompt): New rule
+	(opt-lisp-fcn): New rule
+
+	* srecode-template-mode.el: Font lock up the new prompt command.
+
+	* srecode-insert.el (srecode-template-inserter-ask):
+	Add prompt and default slots.
+	(srecode-template-inserter-ask::srecode-apply-state): New method
+	(srecode-template-inserter-ask::srecode-insert-method): Use nice prompt.
+	(srecode-template-inserter-ask::srecode-dump): New method
+	(srecode-template-inserter-section-start::srecode-parse-input):
+	Use input STATE argument instead of old arguments.
+
+	* srecode-compile.el (srecode-template-inserter::srecode-parse-input):
+	Add START argument.
+	Remove escape arguments
+	(srecode-compile-state): New class
+	(srecode-compile-add-prompt): New method on above.
+	(srecode-compile-templates): Create a compile state and use.
+	Remove local vars of what was in the state.
+	Add support for PROMPTS.
+	(srecode-compile-one-template-tag, srecode-compile-split-code):
+	(srecode-compile-inserter): Take a START arg.  Remove old args.
+
+	* templates/srecode-template.srt: Add context statements.
+
+	* templates/srecode-el.srt (major-mode): Template for new major modes.
+
+	* templates/Project.ede ("ede-proj-project"): Add srecode-wisent.srt
+
+	* templates/default.srt (filecomment):
+	Add an RCS line if the template is in an RCS/CVS directory.
+
+	* srecode-template.wy (wisent-srecode-template-lexer): Doc fix.
+
+	* srecode-insert.el: Add copyright line.
+
+	* srecode-find.el (srecode-template-file-alist): Add wisent.
+
+	* templates/srecode-wisent.srt: Template for Wisent grammar mode
+
+2007-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/srecode-getset-cpp.srt (getset-in-class): Fix bugs.
+
+	* templates/srecode-cpp.srt (doxygen-function-group-end): Fix contents.
+
+	* srecode-semantic.el (srecode-semantic-selected-tag):
+	New way to pass tags into the dictionary.
+	(srecode-semantic-handle-:tag): Use above.
+
+	* srecode-insert.el (srecode-template-inserter-newline): New insertern
+	(srecode-template-inserter-section-end::srecode-match-end):
+	Fix implementation target.
+
+	* srecode-getset.el (srecode-getset-template-file-alist): New var
+	(srecode-insert-getset): Load in tables.
+	Add positioning for getset methods.
+	Create dict, update dict, find template, and inserter.
+	(srecode-strip-fieldname): New fcn
+	(srecode-position-new-methods): Finish Implementing.
+	(srecode-auto-choose-field): Fix bug.
+
+	* srecode-find.el (srecode-load-tables-for-mode):
+	Support an alist argument.
+	Allow loading from specialized application lists.
+
+	* srecode-compile.el (srecode-compile-split-code):
+	Add special support for newline inserter.
+
+	* srecode-args.el (srecode-semantic-handle-:indent): New arg fcn.
+
+	* Project.ede: *** empty log message ***
+
+2007-02-21  Eric M. Ludlam  <zappo@gnu.org>
+
+	* templates/Project.ede, templates/Makefile, srecode.texi, srecode-template.wy, srecode-template-mode.el, srecode-template.el, srecode-table.el, srecode-semantic.el, srecode-mode.el, srecode-load.el, srecode-insert.el, srecode-getset.el, srecode-find.el, srecode-filters.el, srecode-dictionary.el, srecode-ctxt.el, srecode-compile.el, srecode-args.el, templates/default.srt, templates/srecode-cpp.srt, templates/srecode-el.srt, templates/srecode-getset-cpp.srt, templates/srecode-template.srt, Makefile:
+	*** empty log message ***
+
+	* srecode.el: Semantic Recoder
+
diff --git a/site/cedet-1.0pre7/srecode/Makefile b/site/cedet-1.0pre7/srecode/Makefile
new file mode 100644
index 0000000..2f9cd89
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/Makefile
@@ -0,0 +1,117 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+Misc_AUX=ChangeLog
+LOADPATH= ../ede/ ../common/ ../semantic/ ../eieio/
+EMACSFLAGS=-batch --no-site-file
+EMACS=emacs
+LOADPATH= ../common/  ../speedbar/ ../eieio/ ../semantic/bovine/ ../semantic/ ../semantic/wisent/
+LOADDEFS=srecode-loaddefs.el
+LOADDIRS=.
+lang_SEMANTIC_GRAMMAR=srecode-template.wy
+lang_SEMANTIC_GRAMMAR_EL=srecode-template-wy.el
+srecode_LISP=srecode.el srecode-mode.el srecode-compile.el srecode-insert.el srecode-template-mode.el srecode-semantic.el srecode-load.el srecode-template.el srecode-dictionary.el srecode-args.el srecode-table.el srecode-filters.el srecode-find.el srecode-ctxt.el srecode-getset.el srecode-cpp.el srecode-expandproto.el srecode-el.el srecode-srt.el srecode-texi.el srecode-map.el srecode-extract.el srecode-java.el srecode-fields.el
+ELISPPRELOAD= cedet-compat
+doc_TEXINFOS=srecode.texi
+MAKEINFO=makeinfo
+tests_LISP=srecode-test.el srecode-test-getset.el
+document_LISP=srecode-document.el srecode-document-vars.el
+VERSION=1.0pre7
+DISTDIR=$(top)srecode-$(VERSION)
+
+
+
+all: autoloads lang srecode srecode.info tests document templates
+
+.PHONY: autoloads
+autoloads: 
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	@echo "(require 'cedet-autogen)" >> $@-compile-script
+	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f cedet-batch-update-autoloads $(LOADDEFS) $(LOADDIRS)
+
+.PHONY: lang
+lang: $(lang_SEMANTIC_GRAMMAR)
+	@echo "(add-to-list 'load-path nil)" > grammar-make-script
+	@for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-script; \
+	done;
+	@echo "(require 'semantic-load)" >> grammar-make-script
+	@echo "(require 'semantic-grammar)" >> grammar-make-script
+	"$(EMACS)" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^
+
+.PHONY: srecode
+srecode: $(srecode_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+srecode.info: $(doc_TEXINFOS)
+	$(MAKEINFO) $<
+
+.PHONY: tests
+tests: $(tests_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY: document
+document: $(document_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+.PHONY:templates
+templates:
+	$(MAKE) -C templates
+
+tags: 
+	$(MAKE) -C templates/ $(MFLAGS) $@
+
+
+clean:
+	rm -f *.elc *.html *.info*
+
+.PHONY: dist
+
+dist: autoloads $(lang_SEMANTIC_GRAMMAR_EL) srecode.info
+	mkdir $(DISTDIR)
+	cp $(Misc_AUX) srecode-loaddefs.el $(lang_SEMANTIC_GRAMMAR) $(lang_SEMANTIC_GRAMMAR_EL) $(srecode_LISP) $(doc_TEXINFOS) srecode.info* $(tests_LISP) $(document_LISP) $(ede_FILES) $(DISTDIR)
+	$(MAKE) -C templates $(MFLAGS) DISTDIR=$(DISTDIR)/templates dist
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/srecode/Project.ede b/site/cedet-1.0pre7/srecode/Project.ede
new file mode 100644
index 0000000..3352c67
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/Project.ede
@@ -0,0 +1,51 @@
+;; Object SRecode
+;; EDE project file.
+(ede-proj-project "SRecode"
+  :name "srecode"
+  :version "1.0pre7"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-aux "Misc"
+    :name "Misc"
+    :path ""
+    :source '("ChangeLog")
+    )
+   (ede-proj-target-elisp-autoloads "autoloads"
+    :name "autoloads"
+    :path ""
+    :autoload-file "srecode-loaddefs.el"
+    )
+   (semantic-ede-proj-target-grammar "lang"
+    :name "lang"
+    :path ""
+    :source '("srecode-template.wy")
+    )
+   (ede-proj-target-elisp "srecode"
+    :name "srecode"
+    :path ""
+    :source '("srecode.el" "srecode-mode.el" "srecode-compile.el" "srecode-insert.el" "srecode-template-mode.el" "srecode-semantic.el" "srecode-load.el" "srecode-template.el" "srecode-dictionary.el" "srecode-args.el" "srecode-table.el" "srecode-filters.el" "srecode-find.el" "srecode-ctxt.el" "srecode-getset.el" "srecode-cpp.el" "srecode-expandproto.el" "srecode-el.el" "srecode-srt.el" "srecode-texi.el" "srecode-map.el" "srecode-extract.el" "srecode-java.el" "srecode-fields.el")
+    :versionsource '("srecode.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("semantic" "wisent" "semantic-grammar" "semantic-el" "inversion" "eieio" "speedbar")
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-makefile-info "doc"
+    :name "doc"
+    :path ""
+    :source '("srecode.texi")
+    )
+   (ede-proj-target-elisp "tests"
+    :name "tests"
+    :path ""
+    :source '("srecode-test.el" "srecode-test-getset.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   (ede-proj-target-elisp "document"
+    :name "document"
+    :path ""
+    :source '("srecode-document.el" "srecode-document-vars.el")
+    :compiler 'ede-emacs-preload-compiler
+    )
+   )
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/srecode/srecode-args.el b/site/cedet-1.0pre7/srecode/srecode-args.el
new file mode 100644
index 0000000..b4b2b62
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-args.el
@@ -0,0 +1,197 @@
+;;; srecode-args.el --- Provide some simple template arguments
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-args.el,v 1.8 2009/01/16 01:27:10 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Srecode teplates can accept arguments.  These areguments represent
+;; sets of dictionary words that need to be derived.  This file contains
+;; a set of simple arguments for srecode templates.
+
+(require 'srecode-insert)
+
+;;; Code:
+
+;;; :blank
+;;
+;; Using :blank means that the template should force blank lines
+;; before and after the template, reguardless of where the insertion
+;; is occuring.
+;;;###autoload
+(defun srecode-semantic-handle-:blank (dict)
+  "Add macros into the dictionary DICT specifying blank line spacing.
+The wrapgap means make sure the first and last lines of the macro
+do not contain any text from preceeding or following text."
+  ;; This won't actually get used, but it might be nice
+  ;; to know about it.
+  (srecode-dictionary-set-value dict "BLANK" t)
+  )
+
+;;; :indent ARGUMENT HANDLING
+;;
+;; When a :indent argument is required, the default is to indent
+;; for the current major mode.
+;;;###autoload
+(defun srecode-semantic-handle-:indent (dict)
+  "Add macros into the dictionary DICT for indentation."
+  (srecode-dictionary-set-value dict "INDENT" t)
+  )
+
+;;; :region ARGUMENT HANDLING
+;;
+;; When a :region argument is required, provide macros that
+;; deal with that active region.
+;;
+;; Regions allow a macro to wrap the region text within the
+;; template bounds.
+;;
+(defvar srecode-handle-region-when-non-active-flag nil
+  "Non-nil means do region handling w/out the region being active.")
+
+;;;###autoload
+(defun srecode-semantic-handle-:region (dict)
+  "Add macros into the dictionary DICT based on the current :region."
+  ;; Only enable the region section if we can clearly show that
+  ;; the user is intending to do something with the region.
+  (when (or srecode-handle-region-when-non-active-flag
+	    (eq last-command 'mouse-drag-region)
+	    (and transient-mark-mode mark-active))
+    ;; Show the region section
+    (srecode-dictionary-show-section dict "REGION")
+    (srecode-dictionary-set-value
+     dict "REGIONTEXT" (buffer-substring-no-properties (point) (mark)))
+    ;; Only whack the region if our template output
+    ;; is also destined for the current buffer.
+    (when (eq standard-output (current-buffer))
+      (kill-region (point) (mark))))
+  )
+
+;;; :user ARGUMENT HANDLING
+;;
+;; When a :user argument is required, fill the dictionary with
+;; information about the current Emacs user.
+;;;###autoload
+(defun srecode-semantic-handle-:user (dict)
+  "Add macros into the dictionary DICT based on the current :user."
+  (srecode-dictionary-set-value dict "AUTHOR" (user-full-name))
+  (srecode-dictionary-set-value dict "LOGIN" (user-login-name))
+  (srecode-dictionary-set-value dict "EMAIL" user-mail-address)
+  (srecode-dictionary-set-value dict "EMACSINITFILE" user-init-file)
+  (srecode-dictionary-set-value dict "UID" (user-uid))
+  )
+
+;;; :time ARGUMENT HANDLING
+;;
+;; When a :time argument is required, fill the dictionary with
+;; information about the current Emacs time.
+;;;###autoload
+(defun srecode-semantic-handle-:time (dict)
+  "Add macros into the dictionary DICT based on the current :time."
+  ;; DATE Values
+  (srecode-dictionary-set-value
+   dict "YEAR" (format-time-string "%Y" (current-time)))
+  (srecode-dictionary-set-value
+   dict "MONTHNAME" (format-time-string "%B" (current-time)))
+  (srecode-dictionary-set-value
+   dict "MONTH" (format-time-string "%m" (current-time)))
+  (srecode-dictionary-set-value
+   dict "DAY" (format-time-string "%d" (current-time)))
+  (srecode-dictionary-set-value
+   dict "WEEKDAY" (format-time-string "%a" (current-time)))
+  ;; Time Values
+  (srecode-dictionary-set-value
+   dict "HOUR" (format-time-string "%H" (current-time)))
+  (srecode-dictionary-set-value
+   dict "HOUR12" (format-time-string "%l" (current-time)))
+  (srecode-dictionary-set-value
+   dict "AMPM" (format-time-string "%p" (current-time)))
+  (srecode-dictionary-set-value
+   dict "MINUTE" (format-time-string "%M" (current-time)))
+  (srecode-dictionary-set-value
+   dict "SECOND" (format-time-string "%S" (current-time)))
+  (srecode-dictionary-set-value
+   dict "TIMEZONE" (format-time-string "%Z" (current-time)))
+  ;; Convenience pre-packed date/time
+  (srecode-dictionary-set-value
+   dict "DATE" (format-time-string "%D" (current-time)))
+  (srecode-dictionary-set-value
+   dict "TIME" (format-time-string "%X" (current-time)))
+  )
+
+;;; :file ARGUMENT HANDLING
+;;
+;; When a :file argument is required, fill the dictionary with
+;; information about the file Emacs is editing at the time of
+;; insertion.
+;;;###autoload
+(defun srecode-semantic-handle-:file (dict)
+  "Add macros into the dictionary DICT based on the current :file."
+  (let* ((bfn (buffer-file-name))
+	 (file (file-name-nondirectory bfn))
+	 (dir (file-name-directory bfn)))
+    (srecode-dictionary-set-value dict "FILENAME" file)
+    (srecode-dictionary-set-value dict "FILE" (file-name-sans-extension file))
+    (srecode-dictionary-set-value dict "EXTENSION" (file-name-extension file))
+    (srecode-dictionary-set-value dict "DIRECTORY" dir)
+    (srecode-dictionary-set-value dict "MODE" (symbol-name major-mode))
+    (srecode-dictionary-set-value
+     dict "SHORTMODE"
+     (let* ((mode-name  (symbol-name major-mode))
+	    (match (string-match "-mode" mode-name)))
+       (if match
+	   (substring mode-name 0 match)
+	 mode-name)))
+    (if (or (file-exists-p "CVS")
+	    (file-exists-p "RCS"))
+	(srecode-dictionary-show-section dict "RCS")
+      )))
+
+;;; :system ARGUMENT HANDLING
+;;
+;; When a :system argument is required, fill the dictionary with
+;; information about the computer Emacs is running on.
+;;;###autoload
+(defun srecode-semantic-handle-:system (dict)
+  "Add macros into the dictionary DICT based on the current :system."
+    (srecode-dictionary-set-value dict "SYSTEMCONF" system-configuration)
+    (srecode-dictionary-set-value dict "SYSTEMTYPE" system-type)
+    (srecode-dictionary-set-value dict "SYSTEMNAME" (system-name))
+    (srecode-dictionary-set-value dict "MAILHOST" (or mail-host-address
+						      (system-name)))
+  )
+
+;;; :kill ARGUMENT HANDLING
+;;
+;; When a :kill argument is required, fill the dictionary with
+;; information about the current kill ring.
+;;;###autoload
+(defun srecode-semantic-handle-:kill (dict)
+  "Add macros into the dictionary DICT based on the kill ring."
+  (srecode-dictionary-set-value dict "KILL" (car kill-ring))
+  (srecode-dictionary-set-value dict "KILL2" (nth 1 kill-ring))
+  (srecode-dictionary-set-value dict "KILL3" (nth 2 kill-ring))
+  (srecode-dictionary-set-value dict "KILL4" (nth 3 kill-ring))
+  )
+
+(provide 'srecode-args)
+
+;;; srecode-args.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-compile.el b/site/cedet-1.0pre7/srecode/srecode-compile.el
new file mode 100644
index 0000000..4ce57e7
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-compile.el
@@ -0,0 +1,640 @@
+;;; srecode-compile --- Compilation of srecode template files.
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Compile a Semantic Recoder template file.
+;;
+;; Template files are parsed using a Semantic/Wisent parser into
+;; a tag table.  The code therin is then further parsed down using
+;; a regular expression parser.
+;;
+;; The output are a series of EIEIO objects which represent the
+;; templates in a way that could be inserted later.
+
+(require 'semantic-fw)
+(require 'eieio)
+(require 'eieio-base)
+(require 'srecode-table)
+
+;;; Code:
+
+;;; Template Class
+;;
+;; Templatets describe a patter of text that can be inserted into a
+;; buffer.
+;;
+(defclass srecode-template (eieio-named)
+  ((context :initarg :context
+	    :initform nil
+	    :documentation
+	    "Context this template belongs to.")
+   (args :initarg :args
+	 :documentation
+	 "List of arguments that this template requires.")
+   (code :initarg :code
+	 :documentation
+	 "Compiled text from the template.")
+   (dictionary :initarg :dictionary
+	       :type (or null srecode-dictionary)
+	       :documentation
+	       "List of section dictinaries.
+The compiled template can contain lists of section dictionaries,
+or values that are expected to be passed down into different
+section macros.  The template section dictionaries are merged in with
+any incomming dictionaries values.")
+   (binding :initarg :binding
+	    :documentation
+	    "Preferred keybinding for this template in `srecode-minor-mode-map'.")
+   (active :allocation :class
+	   :initform nil
+	   :documentation
+	   "During template insertion, this is the stack of active templates.
+The top-most template is the 'active' template.  Use the accessor methods
+for push, pop, and peek for the active template.")
+   (table :initarg :table
+	  :documentation
+	  "The table this template lives in.")
+   )
+  "Class defines storage for semantic recoder templates.")
+
+(defun srecode-flush-active-templates ()
+  "Flush the active template storage.
+Useful if something goes wrong in SRecode, and the active tempalte
+stack is broken."
+  (interactive)
+  (if (oref srecode-template active)
+      (when (y-or-n-p (format "%d active templates.  Flush? "
+			      (length (oref srecode-template active))))
+	(oset-default srecode-template active nil))
+    (message "No active templates to flush."))
+  )
+
+;;; Inserters
+;;
+;; Each inserter object manages a different thing that
+;; might be inserted into a template output stream.
+;;
+;; The 'srecode-insert-method' on each inserter does the actual
+;; work, and the smaller, simple inserter object is saved in
+;; the compiled templates.
+;;
+;; See srecode-insert.el for the specialized classes.
+;;
+(defclass srecode-template-inserter (eieio-named)
+  ((secondname :initarg :secondname
+	       :type (or null string)
+	       :documentation
+	       "If there is a colon in the inserter's name, it represents 
+additional static argument data."))
+  "This represents an item to be inserted via a template macro.
+Plain text strings are not handled via this baseclass."
+  :abstract t)
+
+(defmethod srecode-parse-input ((ins srecode-template-inserter) 
+				tag input STATE)
+  "For the template inserter INS, parse INPUT.
+Shorten input only by the amount needed.
+Return the remains of INPUT.
+STATE is the current compilation state."
+  input)
+
+(defmethod srecode-match-end ((ins srecode-template-inserter) name)
+  "For the template inserter INS, do I end a section called NAME?"
+  nil)
+
+(defmethod srecode-inserter-apply-state ((ins srecode-template-inserter) STATE)
+  "For the template inserter INS, apply information from STATE."
+  nil)
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (when (and (slot-exists-p ins 'key) (oref ins key))
+    (princ (format "%c" (oref ins key))))
+  (princ "VARNAME")
+  (princ escape-end)
+  (terpri)
+  )
+
+
+;;; Compile State
+(defclass srecode-compile-state ()
+  ((context :initform "declaration"
+	    :documentation "The active context.")
+   (prompts :initform nil
+	    :documentation "The active prompts.")
+   (escape_start :initform "{{"
+		 :documentation "The starting escape sequence.")
+   (escape_end :initform "}}"
+	       :documentation "The ending escape sequence.")
+   )
+  "Current state of the compile.")
+
+(defmethod srecode-compile-add-prompt ((state srecode-compile-state) 
+				       prompttag)
+  "Add PROMPTTAG to the current list of prompts."
+  (with-slots (prompts) state
+      (let ((match (assoc (semantic-tag-name prompttag) prompts))
+	    (newprompts prompts))
+	(when match
+	  (let ((tmp prompts))
+	    (setq newprompts nil)
+	    (while tmp
+	      (when (not (string= (car (car tmp))
+				  (car prompttag)))
+		(setq newprompts (cons (car tmp)
+				       newprompts)))
+	      (setq tmp (cdr tmp)))))
+	(setq prompts (cons prompttag newprompts)))
+      ))
+
+;;;  TEMPLATE COMPILER
+;;
+;;;###autoload
+(defun srecode-compile-file (fname)
+  "Compile the templates from the file FNAME."
+  (let ((peb (get-file-buffer fname)))
+    (save-excursion
+      ;; Make whatever it is local.
+      (if (not peb)
+	  (set-buffer (semantic-find-file-noselect fname))
+	(set-buffer peb))
+      ;; Do the compile.
+      (srecode-compile-templates)
+      ;; Trash the buffer if we had to read it in.
+      (if (not peb)
+	  (kill-buffer (current-buffer)))
+      )))
+
+;;;###autoload
+(defun srecode-compile-templates ()
+  "Compile a semantic recode template file into a mode-local variable."
+  (interactive)
+  (require 'srecode-insert)
+  (message "Compiling template %s..."
+	   (file-name-nondirectory (buffer-file-name)))
+  (let ((tags (semantic-fetch-tags))
+	(tag nil)
+	(class nil)
+	(table nil)
+	(STATE (srecode-compile-state (file-name-nondirectory
+				       (buffer-file-name))))
+	(mode nil)
+	(application nil)
+	(priority nil)
+	(project nil)
+	(vars nil)
+	)
+
+    ;;
+    ;; COMPILE
+    ;;
+    (while tags
+      (setq tag (car tags)
+	    class (semantic-tag-class tag))
+      ;; What type of item is it?
+      (cond
+       ;; CONTEXT tags specify the context all future tags
+       ;; belong to.
+       ((eq class 'context)
+	(oset STATE context (semantic-tag-name tag))
+	)
+
+       ;; PROMPT tags specify prompts for dictionary ? inserters
+       ;; which appear in the following templates
+       ((eq class 'prompt)
+	(srecode-compile-add-prompt STATE tag)
+	)
+	    
+       ;; VARIABLE tags can specify operational control
+       ((eq class 'variable)
+	(let* ((name (semantic-tag-name tag))
+	       (value (semantic-tag-variable-default tag))
+	       (firstvalue (car value)))
+	  ;; If it is a single string, and one value, then
+	  ;; look to see if it is one of our special variables.
+	  (if (and (= (length value) 1) (stringp firstvalue))
+	      (cond ((string= name "mode")
+		     (setq mode (intern firstvalue)))
+		    ((string= name "escape_start")
+		     (oset STATE escape_start firstvalue)
+		     )
+		    ((string= name "escape_end")
+		     (oset STATE escape_end firstvalue)
+		     )
+		    ((string= name "application")
+		     (setq application (read firstvalue)))
+		    ((string= name "priority")
+		     (setq priority (read firstvalue)))
+		    ((string= name "project")
+		     (setq project firstvalue))
+		    (t
+		     ;; Assign this into some table of variables.
+		     (setq vars (cons (cons name firstvalue) vars))
+		     ))
+	    ;; If it isn't a single string, then the value of the
+	    ;; variable belongs to a compound dictionary value.
+	    ;;
+	    ;; Create a compound dictionary value from "value".
+	    (let ((cv (srecode-dictionary-compound-variable
+		       name :value value)))
+	      (setq vars (cons (cons name cv) vars)))
+	    ))
+	)
+
+       ;; FUNCTION tags are really templates.
+       ((eq class 'function)
+	(setq table (cons (srecode-compile-one-template-tag tag STATE)
+			  table))
+	)
+
+       ;; Ooops
+       (t (error "Unknown TAG class %s" class))
+       )
+      ;; Continue
+      (setq tags (cdr tags)))
+
+    ;; MSG - Before install since nreverse whacks our list.
+    (message "%d templates compiled for %s"
+	     (length table) mode)
+
+    ;;
+    ;; APPLY TO MODE
+    ;;
+    (if (not mode)
+	(error "You must specify a MODE for your templates"))
+
+    ;;
+    ;; Calculate priority
+    ;; 
+    (if (not priority)
+	(let ((d (expand-file-name (file-name-directory (buffer-file-name))))
+	      (sd (expand-file-name (file-name-directory (locate-library "srecode"))))
+	      (defaultdelta (if (eq mode 'default) 0 10)))
+	  ;; @TODO :   WHEN INTEGRATING INTO EMACS
+	  ;;   The location of Emacs default templates needs to be specified
+	  ;;   here to also have a lower priority.
+	  (if (string-match (concat "^" sd) d)
+	      (setq priority (+ 30 defaultdelta))
+	    ;; If the user created template is for a project, then
+	    ;; don't add as much as if it is unique to just some user.
+	    (if (stringp project)
+		(setq priority (+ 50 defaultdelta))
+	      (setq priority (+ 80 defaultdelta))))
+	  (message "Templates %s has estimated priority of %d"
+		   (file-name-nondirectory (buffer-file-name))
+		   priority))
+      (message "Compiling templates %s priority %d... done!"
+	       (file-name-nondirectory (buffer-file-name))
+	       priority))
+
+    ;; Save it up!
+    (srecode-compile-template-table table mode priority application project vars)
+    )
+)
+
+(defun srecode-compile-one-template-tag (tag STATE)
+  "Compile a template tag TAG into an srecode template class.
+STATE is the current compile state as an object `srecode-compile-state'."
+  (let* ((context (oref STATE context))
+	 (codeout  (srecode-compile-split-code
+		    tag (semantic-tag-get-attribute tag :code)
+		    STATE))
+	 (code (cdr codeout))
+	 (args (semantic-tag-function-arguments tag))
+	 (binding (semantic-tag-get-attribute tag :binding))
+	 (rawdicts (semantic-tag-get-attribute tag :dictionaries))
+	 (sdicts (srecode-create-section-dictionary rawdicts STATE))
+	 (addargs nil)
+	 )
+;    (message "Compiled %s to %d codes with %d args and %d prompts."
+;	     (semantic-tag-name tag)
+;	     (length code)
+;	     (length args)
+;	     (length prompts))
+    (while args
+      (setq addargs (cons (intern (car args)) addargs))
+      (when (eq (car addargs) :blank)
+	;; If we have a wrap, then put wrap inserters on both
+	;; ends of the code.
+	(setq code (append 
+		    (list (srecode-compile-inserter "BLANK"
+						    "\r"
+						    STATE
+						    :secondname nil
+						    :where 'begin))
+		    code
+		    (list (srecode-compile-inserter "BLANK"
+						    "\r"
+						    STATE
+						    :secondname nil
+						    :where 'end))
+			  )))
+      (setq args (cdr args)))
+    (srecode-template (semantic-tag-name tag)
+		      :context context
+		      :args (nreverse addargs)
+		      :dictionary sdicts
+		      :binding binding
+		      :code code)
+    ))
+
+(defun srecode-compile-do-hard-newline-p (comp)
+  "Examine COMP to decide if the upcoming newline should be hard.
+It is hard if the previous inserter is a newline object."
+  (while (and comp (stringp (car comp)))
+    (setq comp (cdr comp)))
+  (or (not comp)
+      (srecode-template-inserter-newline-child-p (car comp))))
+
+(defun srecode-compile-split-code (tag str STATE
+				       &optional end-name)
+  "Split the code for TAG into something templatable.
+STR is the string of code from TAG to split.
+STATE is the current compile state.
+ESCAPE_START and ESCAPE_END are regexps that indicate the beginning
+escape character, and end escape character pattern for expandable
+macro names.
+Optional argument END-NAME specifies the name of a token upon which
+parsing should stop.
+If END-NAME is specified, and the input string"
+  (let* ((what str)
+	 (end-token nil)
+	 (comp nil)
+	 (regex (concat "\n\\|" (regexp-quote (oref STATE escape_start))))
+	 (regexend (regexp-quote (oref STATE escape_end)))
+	 )
+    (while (and what (not end-token))
+      (cond
+       ((string-match regex what)
+	(let* ((prefix (substring what 0 (match-beginning 0)))
+	       (match (substring what
+				 (match-beginning 0)
+				 (match-end 0)))
+	       (namestart (match-end 0))
+	       (junk (string-match regexend what namestart))
+	       end tail name key)
+	  ;; Add string to compiled output
+	  (when (> (length prefix) 0)
+	    (setq comp (cons prefix comp)))
+	  (if (string= match "\n")
+	      ;; Do newline thingy.
+	      (let ((new-inserter
+		     (srecode-compile-inserter
+		      "INDENT"
+		      "\n"
+		      STATE
+		      :secondname nil
+		      ;; This newline is "hard" meaning ALWAYS do it
+		      ;; if the previous entry is also a newline.
+		      ;; Without it, user entered blank lines will be
+		      ;; ignored.
+		      :hard (srecode-compile-do-hard-newline-p comp)
+		      )))
+		;; Trim WHAT back.
+		(setq what (substring what namestart))
+		(when (> (length what) 0)
+		  ;; make the new inserter, but only if we aren't last.
+		  (setq comp (cons new-inserter comp))
+		  ))
+	    ;; Regular inserter thingy.
+	    (setq end (if junk
+			  (match-beginning 0)
+			(error "Could not find end escape for %s"
+			       (semantic-tag-name tag)))
+		  tail (match-end 0))
+	    (cond ((not end)
+		   (error "No matching escape end for %s"
+			  (semantic-tag-name tag)))
+		  ((<= end namestart)
+		   (error "Stray end escape for %s"
+			  (semantic-tag-name tag)))
+		  )
+	    ;; Add string to compiled output
+	    (setq name (substring what namestart end)
+		  key nil)
+	    ;; Trim WHAT back.
+	    (setq what (substring what tail))
+	    ;; Get the inserter
+	    (let ((new-inserter
+		   (srecode-compile-parse-inserter name STATE))
+		  )
+	      ;; If this is an end inserter, then assign into
+	      ;; the end-token.
+	      (if (srecode-match-end new-inserter end-name)
+		  (setq end-token new-inserter))
+	      ;; Add the inserter to our compilation stream.
+	      (setq comp (cons new-inserter comp))
+	      ;; Allow the inserter an opportunity to modify
+	      ;; the input stream.
+	      (setq what (srecode-parse-input new-inserter tag what
+					      STATE))
+	      )
+	    )))
+       (t
+	(if end-name
+	    (error "Unmatched section end %s" end-name))
+	(setq comp (cons what comp)
+	      what nil))))
+    (cons what (nreverse comp))))
+
+(defun srecode-compile-parse-inserter (txt STATE)
+  "Parse the inserter TXT with the current STATE.
+Return an inserter object."
+  (let ((key (aref txt 0))
+	name
+	)
+    (if (and (or (< key ?A) (> key ?Z))
+	     (or (< key ?a) (> key ?z)) )
+	(setq name (substring txt 1))
+      (setq name txt
+	    key nil))
+    (let* ((junk (string-match ":" name))
+	   (namepart (if junk
+			 (substring name 0 (match-beginning 0))
+		       name))
+	   (secondname (if junk
+			   (substring name (match-end 0))
+			 nil))
+	   (new-inserter (srecode-compile-inserter
+			  namepart key STATE
+			  :secondname secondname
+			  )))
+      ;; Return the new inserter
+      new-inserter)))
+
+(defun srecode-compile-inserter (name key STATE &rest props)
+  "Create an srecode inserter object for some macro NAME.
+KEY indicates a single character key representing a type
+of inserter to create.
+STATE is the current compile state.
+PROPS are additional properties that might need to be passed
+to the inserter constructor."
+  ;;(message "Compile: %s %S" name props)
+  (if (not key)
+      (apply 'srecode-template-inserter-variable name props)
+    (let ((classes (class-children srecode-template-inserter))
+	  (new nil))
+      ;; Loop over the various subclasses and
+      ;; create the correct inserter.
+      (while (and (not new) classes)
+	(setq classes (append classes (class-children (car classes))))
+	;; Do we have a match?
+	(when (and (not (class-abstract-p (car classes)))
+		   (equal (oref (car classes) key) key))
+	  ;; Create the new class, and apply state.
+	  (setq new (apply (car classes) name props))
+	  (srecode-inserter-apply-state new STATE)
+	  )
+	(setq classes (cdr classes)))
+      (if (not new) (error "SRECODE: Unknown macro code %S" key))
+      new)))
+
+(defun srecode-compile-template-table (templates mode priority application project vars)
+  "Compile a list of TEMPLATES into an semantic recode table.
+The table being compiled is for MODE, or the string \"default\".
+PRIORITY is a numerical value that indicates this tables location
+in an ordered search.
+APPLICATION is the name of the application these templates belong to.
+PROJECT is a directory name which these templates scope to.
+A list of defined variables VARS provides a variable table."
+  (let ((namehash (make-hash-table :test 'equal
+				   :size (length templates)))
+	(contexthash (make-hash-table :test 'equal :size 10))
+	(lp templates)
+	)
+    
+    (while lp
+      
+      (let* ((objname (oref (car lp) :object-name))
+	     (context (oref (car lp) :context))
+	     (globalname (concat context ":" objname))
+	     )
+
+	;; Place this template object into the global name hash.
+	(puthash globalname (car lp) namehash)
+
+	;; Place this template into the specific context name hash.
+	(let ((hs (gethash context contexthash)))
+	  ;; Make a new context if none was available.
+	  (when (not hs)
+	    (setq hs (make-hash-table :test 'equal :size 20))
+	    (puthash context hs contexthash))
+	  ;; Put into that contenxt's hash.
+	  (puthash objname (car lp) hs)
+	  )
+
+	(setq lp (cdr lp))))
+
+    (when (stringp project)
+      (setq project (expand-file-name project)))
+
+    (let* ((table (srecode-mode-table-new mode (buffer-file-name)
+		   :templates (nreverse templates)
+		   :namehash namehash
+		   :contexthash contexthash
+		   :variables vars
+		   :major-mode mode
+		   :priority priority
+		   :application application
+		   :project project))
+	   (tmpl (oref table templates)))
+      ;; Loop over all the templates, and xref.
+      (while tmpl
+	(oset (car tmpl) :table table)
+	(setq tmpl (cdr tmpl))))
+    ))
+    
+
+
+;;; DEBUG
+;;
+;; Dump out information about the current srecoder compiled templates.
+;;
+
+(defmethod srecode-dump ((tmp srecode-template))
+  "Dump the contents of the SRecode template tmp."
+  (princ "== Template \"")
+  (princ (object-name-string tmp))
+  (princ "\" in context ")
+  (princ (oref tmp context))
+  (princ "\n")
+  (when (oref tmp args)
+    (princ "   Arguments: ")
+    (prin1 (oref tmp args))
+    (princ "\n"))
+  (when (oref tmp dictionary)
+    (princ "   Section Dictionaries:\n")
+    (srecode-dump (oref tmp dictionary) 4)
+    ;(princ "\n")
+    )
+  (when (and (slot-boundp tmp 'binding) (oref tmp binding))
+    (princ "   Binding: ")
+    (prin1 (oref tmp binding))
+    (princ "\n"))
+  (princ "   Compiled Codes:\n")
+  (srecode-dump-code-list (oref tmp code) "    ")
+  (princ "\n\n")
+  )
+
+(defun srecode-dump-code-list (code indent)
+  "Dump the CODE from a template code list to standard output.
+Argument INDENT specifies the indentation level for the list."
+  (let ((i 1))
+    (while code
+      (princ indent)
+      (prin1 i)
+      (princ ") ")
+      (cond ((stringp (car code))
+	     (prin1 (car code)))
+	    ((srecode-template-inserter-child-p (car code))
+	     (srecode-dump (car code) indent))
+	    (t
+	     (princ "Unknown Code: ")
+	     (prin1 (car code))))
+      (setq code (cdr code)
+	    i (1+ i))
+      (when code
+	(princ "\n"))))
+  )
+
+(defmethod srecode-dump ((ins srecode-template-inserter) indent)
+  "Dump the state of the SRecode template inserter INS."
+  (princ "INS: \"")
+  (princ (object-name-string ins))
+  (when (oref ins :secondname)
+    (princ "\" : \"")
+    (princ (oref ins :secondname)))
+  (princ "\" type \"")
+  (let* ((oc (symbol-name (object-class ins)))
+	 (junk (string-match "srecode-template-inserter-" oc))
+	 (on (if junk
+		 (substring oc (match-end 0))
+	       oc)))
+    (princ on))
+  (princ "\"")
+  )
+
+(provide 'srecode-compile)
+
+;;; srecode-compile.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-cpp.el b/site/cedet-1.0pre7/srecode/srecode-cpp.el
new file mode 100644
index 0000000..9b2aa87
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-cpp.el
@@ -0,0 +1,176 @@
+;;; srecode-cpp.el --- C++ specific handlers for Semantic Recoder
+
+;; Copyright (C) 2007, 2009 Eric M. Ludlam
+;; Copyright (C) 2009, 2010 Jan Moringen
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;;         Jan Moringen <scymtym@users.sourceforge.net>
+;; X-RCS: $Id: srecode-cpp.el,v 1.6 2010/02/03 01:32:02 scymtym Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Supply some C++ specific dictionary fillers and helpers
+
+;;; Code:
+
+(require 'semantic-tag)
+
+
+;;; Customization
+;;
+
+(defgroup srecode-cpp nil
+  "C++-specific Semantic Recoder settings."
+  :group 'srecode)
+
+(defcustom srecode-cpp-namespaces
+  '("std" "boost")
+  "List expansion candidates for the :using-namespaces argument.
+A dictionary entry of the named PREFIX_NAMESPACE with the value
+NAMESPACE:: is created for each namespace unless the current
+buffer contains a using NAMESPACE; statement "
+  :group 'srecode-cpp
+  :type  '(repeat string))
+
+;;; :cpp ARGUMENT HANDLING
+;;
+;; When a :cpp argument is required, fill the dictionary with
+;; information about the current C++ file.
+;;
+;; Error if not in a C++ mode.
+
+;;;###autoload
+(defun srecode-semantic-handle-:cpp (dict)
+  "Add macros into the dictionary DICT based on the current c++ file.
+Adds the following:
+FILENAME_SYMBOL - filename converted into a C compat symbol.
+HEADER - Shown section if in a header file."
+  ;; A symbol representing
+  (let ((fsym (file-name-nondirectory (buffer-file-name)))
+	(case-fold-search t))
+
+    ;; Are we in a header file?
+    (if (string-match "\\.\\(h\\|hh\\|hpp\\|h\\+\\+\\)$" fsym)
+	(srecode-dictionary-show-section dict "HEADER")
+      (srecode-dictionary-show-section dict "NOTHEADER"))
+
+    ;; Strip out bad characters
+    (while (string-match "\\.\\| " fsym)
+      (setq fsym (replace-match "_" t t fsym)))
+    (srecode-dictionary-set-value dict "FILENAME_SYMBOL" fsym)
+    )
+  )
+
+(defun srecode-semantic-handle-:using-namespaces (dict)
+  "Add macros into the dictionary DICT based on used namespaces.
+Adds the following:
+PREFIX_NAMESPACE - for each NAMESPACE in `srecode-cpp-namespaces'."
+  (let ((tags (semantic-find-tags-by-class
+	       'using (semantic-fetch-tags))))
+    (dolist (name srecode-cpp-namespaces)
+      (let ((variable (format "PREFIX_%s" (upcase name)))
+	    (prefix   (format "%s::"      name)))
+	(srecode-dictionary-set-value dict variable prefix)
+	(dolist (tag tags)
+	  (when (and (eq (semantic-tag-get-attribute tag :kind)
+			 'namespace)
+		     (string= (semantic-tag-name tag) name))
+	    (srecode-dictionary-set-value dict variable ""))))))
+  )
+
+(define-mode-local-override srecode-semantic-apply-tag-to-dict
+  c++-mode (tag-wrapper dict)
+  "Apply C++ specific features from TAG-WRAPPER into DICT.
+Calls `srecode-semantic-apply-tag-to-dict-default' first. Adds
+special behavior for tag of classes include, using and function."
+
+  ;; Use default implementation to fill in the basic properties.
+  (srecode-semantic-apply-tag-to-dict-default tag-wrapper dict)
+
+  ;; Pull out the tag for the individual pieces.
+  (let* ((tag   (oref tag-wrapper :prime))
+	 (class (semantic-tag-class tag)))
+
+    ;; Add additional information based on the class of the tag.
+    (cond
+     ;;
+     ;; INCLUDE
+     ;;
+     ((eq class 'include)
+      ;; For include tags, we have to discriminate between system-wide
+      ;; and local includes.
+      (if (semantic-tag-include-system-p tag)
+	(srecode-dictionary-show-section dict "SYSTEM")
+	(srecode-dictionary-show-section dict "LOCAL")))
+
+     ;;
+     ;; USING
+     ;;
+     ((eq class 'using)
+      ;; Insert the subject (a tag) of the include statement as VALUE
+      ;; entry into the dictionary.
+      (let ((value-tag  (semantic-tag-get-attribute tag :value))
+	    (value-dict (srecode-dictionary-add-section-dictionary
+			 dict "VALUE")))
+	(srecode-semantic-apply-tag-to-dict
+	 (srecode-semantic-tag (semantic-tag-name value-tag)
+			       :prime value-tag)
+	 value-dict))
+      ;; Discriminate using statements referring to namespaces and
+      ;; types.
+      (when (eq (semantic-tag-get-attribute tag :kind) 'namespace)
+	(srecode-dictionary-show-section dict "NAMESPACE")))
+
+     ;;
+     ;; FUNCTION
+     ;;
+     ((eq class 'function)
+      ;; @todo It would be nice to distinguish member functions from
+      ;; free functions and only apply the const and pure modifiers,
+      ;; when they make sense. My best bet would be
+      ;; (semantic-tag-function-parent tag), but it is not there, when
+      ;; the function is defined in the scope of a class.
+      (let ((member    't)
+	    (modifiers (semantic-tag-modifiers tag)))
+
+	;; Add modifiers into the dictionary
+	(dolist (modifier modifiers)
+	  (let ((modifier-dict (srecode-dictionary-add-section-dictionary
+				dict "MODIFIERS")))
+	    (srecode-dictionary-set-value modifier-dict "NAME" modifier)))
+
+	;; When the function is a member function, it can have
+	;; additional modifiers.
+	(when member
+
+	  ;; For member functions, constness is called
+	  ;; 'methodconst-flag'.
+	  (when (semantic-tag-get-attribute tag :methodconst-flag)
+	    (srecode-dictionary-show-section dict "CONST"))
+
+	  ;; If the member function is pure virtual, add a dictionary
+	  ;; entry.
+	  (when (semantic-tag-get-attribute tag :pure-virtual-flag)
+	    (srecode-dictionary-show-section dict "PURE"))
+	  )
+	))
+     ))
+  )
+
+(provide 'srecode-cpp)
+;;; srecode-cpp.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-ctxt.el b/site/cedet-1.0pre7/srecode/srecode-ctxt.el
new file mode 100644
index 0000000..9061790
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-ctxt.el
@@ -0,0 +1,242 @@
+;;; srecode-ctxt.el --- Derive a context from the source buffer.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Manage context calculations for Semantic Recoder.
+;;
+;; SRecode templates are always bound to a context.  By calculating
+;; the current context, we can narrow down the selection of possible 
+;; templates to something reasonable.
+;;
+;; Alternately, code here will find a context for templates that
+;; require different pieces of code placed in multiple areas.
+
+(require 'semantic)
+
+;;; Code:
+;;;###autoload
+(define-overload srecode-calculate-context ()
+  "Calculate the context at the current point.
+The returned context is a list, with the top-most context first.
+Each returned context is a string that that would show up in a `context'
+statement in an `.srt' file.
+
+Some useful context values used by the provided srecode templates are:
+  \"file\" - Templates that for a file (such as an empty file.)
+     \"empty\" - The file is empty
+  \"declaration\" - Top-level declarations in a file.
+     \"include\" - In or near include statements
+     \"package\" - In or near provide statements
+     \"function\" - In or near function statements
+         \"NAME\" - Near functions within NAME namespace or class
+     \"variable\" - In or near variable statements.
+     \"type\"     - In or near type declarations.
+     \"comment\"  - In a comment
+  \"classdecl\" - Declarations within a class/struct/etc.
+     \"variable\" - In or near class fields
+     \"function\" - In or near methods/functions
+        \"virtual\" - Nearby items are virtual
+           \"pure\" - and those virtual items are pure virtual
+     \"type\"     - In or near type declarations.
+     \"comment\"  - In a comment in a block of code
+     -- these items show up at the end of the context list. --
+     \"public\", \"protected\", \"private\" -
+                  In or near a section of public/pritected/private entries.
+  \"code\" - In a block of code.
+     \"string\" - In a string in a block of code
+     \"comment\"  - In a comment in a block of code
+
+    ... More later."
+  )
+
+(defun srecode-calculate-nearby-things ()
+  ;; NOTE: May need to add bounes to this FCN
+  "Calculate the CONTEXT type items nearby the current point.
+Assume that what we want to insert next is based on what is just
+before point.  If there is nothing, then assume it is whatever is
+after point."
+  ;; @todo - ADD BOUNDS TO THE PREV/NEXT TAG SEARCH
+  ;;         thus classdecl "near" stuff cannot be 
+  ;;         outside the bounds of the type in question.
+  (let ((near (semantic-find-tag-by-overlay-prev))
+	(prot nil)
+	(ans nil))
+    (if (not near)
+	(setq near (semantic-find-tag-by-overlay-next)))
+    (when near
+      ;; Calculate the type of thing we are near.
+      (if (not (semantic-tag-of-class-p near 'function))
+	  (setq ans (cons (symbol-name (semantic-tag-class near)) ans))
+	;; if the symbol NEAR has a parent,
+	(let ((p (semantic-tag-function-parent near)))
+	  (setq ans (cons (symbol-name (semantic-tag-class near)) ans))
+	  (cond ((semantic-tag-p p)
+		 (setq ans (cons (semantic-tag-name p) ans)))
+		((stringp p)
+		 (setq ans (cons p ans)))
+		(t nil)))
+	;; Was it virtual?
+	(when (semantic-tag-get-attribute near :virtual)
+	  (setq ans (cons "virtual" ans)))
+	;; Was it pure?
+	(when (semantic-tag-get-attribute near :pure-virtual-flag)
+	  (setq ans (cons "pure" ans)))
+      )
+      ;; Calculate the protection
+      (setq prot (semantic-tag-protection near))
+      (when (and prot (not (eq prot 'unknown)))
+	(setq ans (cons (symbol-name prot) ans)))
+      )
+    (nreverse ans)))
+
+(defun srecode-calculate-context-font-lock ()
+  "Calculate an srecode context by using font-lock."
+  (let ((face (get-text-property (point) 'face))
+	)
+    (cond ((member face '(font-lock-string-face
+			  font-lock-doc-face))
+	   (list "string"))
+	  ((member face '(font-lock-comment-face
+			  font-lock-comment-delimiter-face))
+	   (list "comment"))
+	  )
+    ))
+
+(defun srecode-calculate-context-default ()
+  "Generic method for calculating a context for srecode."
+  (if (= (point-min) (point-max))
+      (list "file" "empty")
+
+    (semantic-fetch-tags)
+    (let ((ct (semantic-find-tag-by-overlay))
+	  )
+      (cond ((or (not ct)
+		 ;; Ok, below is a bit C specific.
+		 (and (eq (semantic-tag-class (car ct)) 'type)
+		      (string= (semantic-tag-type (car ct)) "namespace")))
+	     (cons "declaration"
+		   (or (srecode-calculate-context-font-lock)
+		       (srecode-calculate-nearby-things)
+		       ))
+	     )
+	    ((eq (semantic-tag-class (car ct)) 'function)
+	     (cons "code" (srecode-calculate-context-font-lock))
+	     )
+	    ((eq (semantic-tag-class (car ct)) 'type) ; We know not namespace
+	     (cons "classdecl"
+		   (or (srecode-calculate-context-font-lock)
+		       (srecode-calculate-nearby-things)))
+	     )
+	    ((and (car (cdr ct))
+		  (eq (semantic-tag-class (car (cdr ct))) 'type))
+	     (list "classdecl"
+		   (symbol-name (semantic-tag-class (car ct))))
+	     )
+	    )
+      )))
+
+
+;;; HANDLERS
+;;
+;; The calculated context is one thing, but more info is often available.
+;; The context handlers can add info into the active dictionary that is
+;; based on the context, such as a method parent name, protection scheme,
+;; or other feature.
+
+(defun srecode-semantic-handle-:ctxt (dict &optional template)
+  "Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Argument TEMPLATE is the template object adding context dictionary
+entries.
+This might add the following:
+   VIRTUAL - show a section if a function is virtual
+   PURE - show a section if a function is pure virtual.
+   PARENT - The name of a parent type for functions.
+   PROTECTION - Show a protection section, and what the protection is."
+  (when template
+
+    (let ((name (oref template object-name))
+	  (cc srecode-insertion-start-context)
+	  ;(context (oref template context))
+	  )
+  
+;      (when (and cc
+;		 (null (string= (car cc) context))
+;		 )
+;	;; No current context, or the base is different, then
+;	;; this is the section where we need to recalculate
+;	;; the context based on user choice, if possible.
+;	;;
+;	;; The recalculation is complex, as there are many possibilities
+;	;; that need to be divined.  Set "cc" to the new context
+;	;; at the end.
+;	;;
+;	;; @todo -
+;	
+;	)
+
+      ;; The various context all have different features.
+      (let ((ct (nth 0 cc))
+	    (it (nth 1 cc))
+	    (last (last cc))
+	    (parent nil)
+	    )
+	(cond ((string= it "function")
+	       (setq parent (nth 2 cc))
+	       (when parent
+		 (cond ((string= parent "virtual")
+			(srecode-dictionary-show-section dict "VIRTUAL")
+			(when (nth 3 cc)
+			  (srecode-dictionary-show-section dict "PURE"))
+			)
+		       (t
+			(srecode-dictionary-set-value dict "PARENT" parent))))
+	       )
+	      ((and (string= it "type")
+		    (or (string= name "function") (string= name "method")))
+	       ;; If we have a type, but we insert a fcn, then use that type
+	       ;; as the function parent.
+	       (let ((near (semantic-find-tag-by-overlay-prev)))
+		 (when (and near (semantic-tag-of-class-p near 'type))
+		   (srecode-dictionary-set-value
+		    dict "PARENT" (semantic-tag-name near))))
+	       )
+	      ((string= ct "code")
+	       ;;(let ((analyzer (semantic-analyze-current-context)))
+	       ;; @todo - Use the analyze to setup things like local
+	       ;;         variables we might use or something.
+	       nil
+	       ;;)
+	       )
+	      (t
+	       nil))
+	(when (member last '("public" "private" "protected"))
+	  ;; Hey, fancy that, we can do both.
+	  (srecode-dictionary-set-value dict "PROTECTION" parent)
+	  (srecode-dictionary-show-section dict "PROTECTION"))
+	))
+    ))
+
+
+(provide 'srecode-ctxt)
+
+;;; srecode-ctxt.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-dictionary.el b/site/cedet-1.0pre7/srecode/srecode-dictionary.el
new file mode 100644
index 0000000..5e6267d
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-dictionary.el
@@ -0,0 +1,571 @@
+;;; srecode-dictionary.el --- Dictionary code for the semantic recoder.
+
+;; Copyright (C) 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-dictionary.el,v 1.13.2.1 2010/02/22 02:57:40 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Dictionaries contain lists of names and their assocaited values.
+;; These dictionaries are used to fill in macros from recoder templates.
+
+;;; Code:
+
+;;; CLASSES
+;;
+
+;;;###autoload
+(defclass srecode-dictionary ()
+  ((namehash :initarg :namehash
+	     :documentation
+	     "Hash table containing the names of all the templates.")
+   (buffer :initarg :buffer
+	   :documentation
+	   "The buffer this dictionary was initialized with.")
+   (parent :initarg :parent
+	   :type (or null srecode-dictionary)
+	   :documentation
+	   "The parent dictionary.
+Symbols not appearing in this dictionary will be checked against the
+parent dictionary.")
+   (origin :initarg :origin
+	   :type string
+	   :documentation
+	   "A string representing the origin of this dictionary.
+Useful only while debugging.")
+   )
+  "Dictionary of symbols and what they mean.
+Dictionaries are used to look up named symbols from
+templates to decide what to do with those symbols.")
+
+;;;###autoload
+(defclass srecode-dictionary-compound-value ()
+  ()
+  "A compound dictionary value.
+Values stored in a dictionary must be a STRING,
+a dictionary for showing sections, or an instance of a subclass
+of this class.
+
+Compound dictionary values derive from this class, and must
+provide a sequence of method implementations to convert into
+a string."
+  :abstract t)
+
+;;;###autoload
+(defclass srecode-dictionary-compound-variable 
+  (srecode-dictionary-compound-value)
+  ((value :initarg :value
+	  :documentation
+	  "The value of this template variable.
+Variables in template files are usually a single string
+which can be inserted into a dictionary directly.
+
+Some variables may be more complex and involve dictionary
+lookups, strings, concatenation, or the like.
+
+The format of VALUE is determined by current template
+formatting rules.")
+   (compiled :initarg :compiled
+	     :type list
+	     :documentation
+	     "The compiled version of VALUE.")
+   )
+  "A compound dictionary value for template file variables.
+You can declare a variable in a template like this:
+
+set NAME \"str\" macro \"OTHERNAME\"
+
+with appending various parts together in a list.")
+
+(defmethod initialize-instance ((this srecode-dictionary-compound-variable)
+				&optional fields)
+  "Initialize the compound variable THIS.
+Makes sure that :value is compiled."
+  (let ((newfields nil)
+	(state nil))
+    (while fields
+      ;; Strip out :state
+      (if (eq (car fields) :state)
+	  (setq state (car (cdr fields)))
+	(setq newfields (cons (car (cdr fields))
+			      (cons (car fields) newfields))))
+      (setq fields (cdr (cdr fields))))
+
+    (when (not state)
+      (error "Cannot create compound variable without :state"))
+    
+    (call-next-method this (nreverse newfields))
+    (when (not (slot-boundp this 'compiled))
+      (let ((val (oref this :value))
+	    (comp nil))
+	(while val
+	  (let ((nval (car val))
+		)
+	    (cond ((stringp nval)
+		   (setq comp (cons nval comp)))
+		  ((and (listp nval)
+			(equal (car nval) 'macro))
+		   (setq comp (cons
+			       (srecode-compile-parse-inserter 
+				(cdr nval)
+				state)
+			       comp)))
+		  (t
+		   (error "Don't know how to handle variable value %S" nval)))
+	    )
+	  (setq val (cdr val)))
+	(oset this :compiled (nreverse comp))))))
+
+;;; DICTIONARY METHODS
+;;
+
+;;;###autoload
+(defun srecode-create-dictionary (&optional buffer-or-parent)
+  "Create a dictionary for BUFFER.
+If BUFFER-OR-PARENT is not specified, assume a buffer, and
+use the current buffer.
+If BUFFER-OR-PARENT is another dictionary, then remember the
+parent within the new dictionary, and assume that BUFFER
+is the same as belongs to the parent dictionary.
+The dictionary is initialized with variables setup for that
+buffer's table.
+If BUFFER-OR-PARENT is t, then this dictionary should not be
+assocated with a buffer or parent."
+  (save-excursion
+    (let ((parent nil)
+	  (buffer nil)
+	  (origin nil)
+	  (initfrombuff nil))
+      (cond ((bufferp buffer-or-parent)
+	     (set-buffer buffer-or-parent)
+	     (setq buffer buffer-or-parent
+		   origin (buffer-name buffer-or-parent)
+		   initfrombuff t))
+	    ((srecode-dictionary-child-p buffer-or-parent)
+	     (setq parent buffer-or-parent
+		   buffer (oref buffer-or-parent buffer)
+		   origin (concat (object-name buffer-or-parent) " in "
+				  (if buffer (buffer-name buffer)
+				    "no buffer")))
+	     (when buffer
+	       (set-buffer buffer)))
+	    ((eq buffer-or-parent t)
+	     (setq buffer nil
+		   origin "Unspecified Origin"))
+	    (t
+	     (setq buffer (current-buffer)
+		   origin (concat "Unspecified.  Assume "
+				  (buffer-name buffer))
+		   initfrombuff t)
+	     )
+	    )
+      (let ((dict (srecode-dictionary
+		   major-mode
+		   :buffer buffer
+		   :parent parent
+		   :namehash  (make-hash-table :test 'equal
+					       :size 20)
+		   :origin origin)))
+	;; Only set up the default variables if we are being built
+	;; directroy for a particular buffer.
+	(when initfrombuff
+	  ;; Variables from the table we are inserting from.
+	  ;; @todo - get a better tree of tables.
+	  (let ((mt (srecode-get-mode-table major-mode))
+		(def (srecode-get-mode-table 'default)))
+	    ;; Each table has multiple template tables.
+	    ;; Do DEF first so that MT can override any values.
+	    (srecode-dictionary-add-template-table dict def)
+	    (srecode-dictionary-add-template-table dict mt)
+	    ))
+	dict))))
+
+(defmethod srecode-dictionary-add-template-table ((dict srecode-dictionary)
+						  tpl)
+  "Insert into DICT the variables found in table TPL.
+TPL is an object representing a compiled template file."
+  (when tpl
+    (let ((tabs (oref tpl :tables)))
+      (while tabs
+	(when (srecode-template-table-in-project-p (car tabs))
+	  (let ((vars (oref (car tabs) variables)))
+	    (while vars
+	      (srecode-dictionary-set-value
+	       dict (car (car vars)) (cdr (car vars)))
+	      (setq vars (cdr vars)))))
+	(setq tabs (cdr tabs))))))
+
+
+(defmethod srecode-dictionary-set-value ((dict srecode-dictionary)
+					 name value)
+  "In dictionary DICT, set NAME to have VALUE."
+  ;; Validate inputs
+  (if (not (stringp name))
+      (signal 'wrong-type-argument (list name 'stringp)))
+  ;; Add the value.
+  (with-slots (namehash) dict
+    (puthash name value namehash))
+  )
+
+(defmethod srecode-dictionary-add-section-dictionary ((dict srecode-dictionary)
+						      name &optional show-only)
+  "In dictionary DICT, add a section dictionary for section macro NAME.
+Return the new dictionary.
+
+You can add several dictionaries to the same section entry.
+For each dictionary added to a variable, the block of codes in
+the template will be repeated.
+
+If optional argument SHOW-ONLY is non-nil, then don't add a new dictionarly
+if there is already one in place.  Also, don't add FIRST/LAST entries.
+These entries are not needed when we are just showing a section.
+
+Each dictionary added will automatically get values for positional macros
+which will enable SECTIONS to be enabled.
+
+ * FIRST - The first entry in the table.
+ * NOTFIRST - Not the first entry in the table.
+ * LAST - The last entry in the table
+ * NOTLAST - Not the last entry in the table.
+
+Adding a new dictionary will alter these values in previously
+inserted dictionaries."
+  ;; Validate inputs
+  (if (not (stringp name))
+      (signal 'wrong-type-argument (list name 'stringp)))
+  (let ((new (srecode-create-dictionary dict))
+	(ov (srecode-dictionary-lookup-name dict name)))
+
+    (when (not show-only)
+      ;; Setup the FIRST/NOTFIRST and LAST/NOTLAST entries.
+      (if (null ov)
+	  (progn
+	    (srecode-dictionary-show-section new "FIRST")
+	    (srecode-dictionary-show-section new "LAST"))
+	;; Not the very first one.  Lets clean up CAR.
+	(let ((tail (car (last ov))))
+	  (srecode-dictionary-hide-section tail "LAST")
+	  (srecode-dictionary-show-section tail "NOTLAST")
+	  )
+	(srecode-dictionary-show-section new "NOTFIRST")
+	(srecode-dictionary-show-section new "LAST"))
+      )
+
+    (when (or (not show-only) (null ov))
+      (srecode-dictionary-set-value dict name (append ov (list new))))
+    ;; Return the new sub-dictionary.
+    new))
+
+(defmethod srecode-dictionary-show-section ((dict srecode-dictionary) name)
+  "In dictionary DICT, indicate that the section NAME should be exposed."
+  ;; Validate inputs
+  (if (not (stringp name))
+      (signal 'wrong-type-argument (list name 'stringp)))
+  ;; Showing a section is just like making a section dictionary, but
+  ;; with no dictionary values to add.
+  (srecode-dictionary-add-section-dictionary dict name t)
+  nil)
+
+(defmethod srecode-dictionary-hide-section ((dict srecode-dictionary) name)
+  "In dictionary DICT, indicate that the section NAME should be hidden."
+  ;; We need to find the has value, and then delete it.
+  ;; Validate inputs
+  (if (not (stringp name))
+      (signal 'wrong-type-argument (list name 'stringp)))
+  ;; Add the value.
+  (with-slots (namehash) dict
+    (remhash name namehash))
+  nil)
+
+(defmethod srecode-dictionary-merge ((dict srecode-dictionary) otherdict)
+  "Merge into DICT the dictionary entries from OTHERDICT."
+  (when otherdict
+    (maphash
+     (lambda (key entry)
+       ;; Only merge in the new values if there was no old value.
+       ;; This protects applications from being whacked, and basically
+       ;; makes these new section dictionary entries act like
+       ;; "defaults" instead of overrides.
+       (when (not (srecode-dictionary-lookup-name dict key))
+	 (cond ((and (listp entry) (srecode-dictionary-p (car entry)))
+		;; A list of section dictionaries.
+		;; We need to merge them in.
+		(while entry
+		  (let ((new-sub-dict
+			 (srecode-dictionary-add-section-dictionary
+			  dict key)))
+		    (srecode-dictionary-merge new-sub-dict (car entry)))
+		  (setq entry (cdr entry)))
+		  )
+
+	       (t
+		(srecode-dictionary-set-value dict key entry)))
+	       ))
+     (oref otherdict namehash))))
+
+(defmethod srecode-dictionary-lookup-name ((dict srecode-dictionary)
+					   name)
+  "Return information about the current DICT's value for NAME.
+DICT is a dictionary, and NAME is a string that is the name of
+a symbol in the dictionary.
+This function derives values for some special NAMEs, such as `FIRST'
+and 'LAST'."
+  (if (not (slot-boundp dict 'namehash))
+      nil
+    ;; Get the value of this name from the dictionary
+    (or (with-slots (namehash) dict
+	  (gethash name namehash))
+	(and (not (member name '("FIRST" "LAST" "NOTFIRST" "NOTLAST")))
+	     (oref dict parent)
+	     (srecode-dictionary-lookup-name (oref dict parent) name))
+	)))
+
+(defmethod srecode-root-dictionary ((dict srecode-dictionary))
+  "For dictionary DICT, return the root dictionary.
+The root dictionary is usually for a current or active insertion."
+  (let ((ans dict))
+    (while (oref ans parent)
+      (setq ans (oref ans parent)))
+    ans))
+
+;;; COMPOUND VALUE METHODS
+;;
+;; Compound values must provide at least the toStriong method
+;; for use in converting the compound value into sometehing insertable.
+
+(defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
+				      function
+				      dictionary)
+  "Convert the compound dictionary value CP to a string.
+If FUNCTION is non-nil, then FUNCTION is somehow applied to an aspect
+of the compound value.  The FUNCTION could be a fraction
+of some function symbol with a logical prefix excluded.
+
+If you subclass `srecode-dictionary-compound-value' then this
+method could return nil, but if it does that, it must insert
+the value itself using `princ', or by detecting if the current
+standard out is a buffer, and using `insert'."
+  (object-name cp))
+
+(defmethod srecode-dump ((cp srecode-dictionary-compound-value)
+			 &optional indent)
+  "Display information about this compound value."
+  (princ (object-name cp))
+  )
+
+(defmethod srecode-compound-toString ((cp srecode-dictionary-compound-variable)
+				      function
+				      dictionary)
+  "Convert the compound dictionary variable value CP into a string.
+FUNCTION and DICTIONARY are as for the baseclass."
+  (srecode-insert-code-stream (oref cp compiled) dictionary))
+
+
+(defmethod srecode-dump ((cp srecode-dictionary-compound-variable)
+			 &optional indent)
+  "Display information about this compound value."
+  (princ "# Compound Variable #\n")
+  (let ((indent (+ 4 (or indent 0)))
+	(cmp (oref cp compiled))
+	)
+    (srecode-dump-code-list cmp (make-string indent ? ))
+    ))
+
+;;; FIELD EDITING COMPOUND VALUE
+;;
+;; This is an interface to using field-editing objects
+;; instead of asking questions.  This provides the basics
+;; behind this compound value.
+
+;;;###autoload
+(defclass srecode-field-value (srecode-dictionary-compound-value)
+  ((firstinserter :initarg :firstinserter
+		  :documentation
+		  "The inserter object for the first occurance of this field.")
+   (defaultvalue :initarg :defaultvalue
+     :documentation
+     "The default value for this inserter.")
+   )
+  "When inserting values with editable field mode, a dictionary value.
+Compound values allow a field to be stored in the dictionary for when
+it is referenced a second time.  This compound value can then be
+inserted with a new editable field.")
+
+(defmethod srecode-compound-toString((cp srecode-field-value)
+				     function
+				     dictionary)
+  "Convert this field into an insertable string."
+  ;; If we are not in a buffer, then this is not supported.
+  (when (not (bufferp standard-output))
+    (error "FIELDS invoked while inserting template to non-buffer."))
+
+  (if function
+      (error "@todo: Cannot mix field insertion with functions.")
+
+    ;; No function.  Perform a plain field insertion.
+    ;; We know we are in a buffer, so we can perform the insertion.
+    (let* ((dv (oref cp defaultvalue))
+	   (sti (oref cp firstinserter))
+	   (start (point))
+	   (name (oref sti :object-name)))
+
+      (cond
+       ;; No default value.
+       ((not dv) (insert name))
+       ;; A compound value as the default?  Recurse.
+       ((srecode-dictionary-compound-value-child-p dv)
+	(srecode-compound-toString dv function dictionary))
+       ;; A string that is empty?  Use the name.
+       ((and (stringp dv) (string= dv ""))
+	(insert name))
+       ;; Insert strings
+       ((stringp dv) (insert dv))
+       ;; Some other issue
+       (t 
+	(error "Unknown default value for value %S" name)))
+
+      ;; Create a field from the inserter.
+      (srecode-field name :name name
+		     :start start
+		     :end (point)
+		     :prompt (oref sti prompt)
+		     :read-fcn (oref sti read-fcn)
+		     )
+      ))
+  ;; Returning nil is a signal that we have done the insertion ourselves.
+  nil)
+
+
+;;; Higher level dictionary functions
+;;
+(defun srecode-create-section-dictionary (sectiondicts STATE)
+  "Create a dictionary with section entries for a template.
+The format for SECTIONDICTS is what is emitted from the template parsers.
+STATE is the current compiler state."
+  (when sectiondicts
+    (let ((new (srecode-create-dictionary t)))
+      ;; Loop over each section.  The section is a macro w/in the
+      ;; template.
+      (while sectiondicts
+	(let* ((sect (car (car sectiondicts)))
+	       (entries (cdr (car sectiondicts)))
+	       (subdict (srecode-dictionary-add-section-dictionary new sect))
+	       )
+	  ;; Loop over each entry.  This is one variable in the
+	  ;; section dictionary.
+	  (while entries
+	    (let ((tname (semantic-tag-name (car entries)))
+		  (val (semantic-tag-variable-default (car entries))))
+	      (if (eq val t)
+		  (srecode-dictionary-show-section subdict tname)
+		(cond
+		 ((and (stringp (car val))
+		       (= (length val) 1))
+		  (setq val (car val)))
+		 (t
+		  (setq val (srecode-dictionary-compound-variable
+			     tname :value val :state STATE))))
+		(srecode-dictionary-set-value
+		 subdict tname val))
+	      (setq entries (cdr entries))))
+	  )
+	(setq sectiondicts (cdr sectiondicts)))
+      new)))
+
+;;; DUMP DICTIONARY
+;;
+;; Make a dictionary, and dump it's contents.
+
+;;;###autoload
+(defun srecode-adebug-dictionary ()
+  "Run data-debug on this mode's dictionary."
+  (interactive)
+  (require 'data-debug)
+  (let* ((modesym major-mode)
+	 (start (current-time))
+	 (junk (or (progn (srecode-load-tables-for-mode modesym)
+			  (srecode-get-mode-table modesym))
+		   (error "No table found for mode %S" modesym)))
+	 (dict (srecode-create-dictionary (current-buffer)))
+	 (end (current-time))
+	 )
+    (message "Creating a dictionary took %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (data-debug-new-buffer "*SRECODE ADEBUG*")
+    (data-debug-insert-object-slots dict "*")))
+
+;;;###autoload
+(defun srecode-dictionary-dump ()
+  "Dump a typical fabricated dictionary."
+  (interactive)
+  (let ((modesym major-mode))
+    ;; This load allows the dictionary access to inherited
+    ;; and stacked dictionary entries.
+    (srecode-load-tables-for-mode modesym)
+    (let ((tmp (srecode-get-mode-table modesym))
+	  )
+      (if (not tmp)
+	  (error "No table found for mode %S" modesym))
+      ;; Now make the dictionary.
+      (let ((dict (srecode-create-dictionary (current-buffer))))
+	(with-output-to-temp-buffer "*SRECODE DUMP*"
+	  (princ "DICTIONARY FOR ")
+	  (princ major-mode)
+	  (princ "\n--------------------------------------------\n")
+	  (srecode-dump dict))
+	))))
+
+(defmethod srecode-dump ((dict srecode-dictionary) &optional indent)
+  "Dump a dictionary."
+  (if (not indent) (setq indent 0))
+  (maphash (lambda (key entry)
+	     (princ (make-string indent ? ))
+	     (princ " ")
+	     (princ key)
+	     (princ " ")
+	     (cond ((and (listp entry)
+			 (srecode-dictionary-p (car entry)))
+		    (let ((newindent (if indent
+					 (+ indent 4)
+				       4)))
+		      (while entry
+			(princ " --> SUBDICTIONARY ")
+			(princ (object-name dict))
+			(princ "\n")
+			(srecode-dump (car entry) newindent)
+			(setq entry (cdr entry))
+			))
+		    (princ "\n")
+		    )
+		   ((srecode-dictionary-compound-value-child-p entry)
+		    (srecode-dump entry indent)
+		    (princ "\n")
+		    )
+		   (t
+		    (prin1 entry)
+		    ;(princ "\n")
+		    ))
+	     (terpri)
+	     )
+	   (oref dict namehash))
+  )
+
+(provide 'srecode-dictionary)
+;;; srecode-dictionary.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-document-vars.el b/site/cedet-1.0pre7/srecode/srecode-document-vars.el
new file mode 100644
index 0000000..1275757
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-document-vars.el
@@ -0,0 +1,237 @@
+;;; srecode-document-vars.el --- Variables for srecode-document
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-document-vars.el,v 1.1 2008/12/31 19:16:23 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Tables of English syntax stuff used by srecode-document.el.
+;;
+;; Copied from semantic/document-vars.el before it was obsoleted.
+
+;;; Code:
+
+(defcustom srecode-document-autocomment-common-nouns-abbrevs
+  '(
+    ("sock\\(et\\)?" . "socket")
+    ("addr\\(ess\\)?" . "address")
+    ("buf\\(f\\(er\\)?\\)?" . "buffer")
+    ("cur\\(r\\(ent\\)?\\)?" . "current")
+    ("dev\\(ice\\)?" . "device")
+    ("doc" . "document")
+    ("i18n" . "internationalization")
+    ("file" . "file")
+    ("line" . "line")
+    ("l10n" . "localization")
+    ("msg\\|message" . "message")
+    ("name" . "name")
+    ("next\\|nxt" . "next")
+    ("num\\(ber\\)?" . "number")
+    ("port" . "port")
+    ("host" . "host")
+    ("obj\\|object" . "object")
+    ("previous\\|prev" . "previous")
+    ("str\\(ing\\)?" . "string")
+    ("use?r" . "user")
+    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common syllable
+    )
+  "List of common English abbreviations or full words.
+These are nouns (as opposed to verbs) for use in creating expanded
+versions of names.This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-function-alist
+  '(
+    ("abort" . "Aborts the")
+    ;; trick to get re-alloc and alloc to pair into one sentence.
+    ("realloc" . "moves or ")
+    ("alloc\\(ate\\)?" . "Allocates and initializes a new ")
+    ("clean" . "Cleans up the")
+    ("clobber" . "Removes")
+    ("close" . "Cleanly closes")
+    ("check" . "Checks the")
+    ("comp\\(are\\)?" . "Compares the")
+    ("create" . "Creates a new ")
+    ("find" . "Finds ")
+    ("free" . "Frees up space")
+    ("gen\\(erate\\)?" . "Generates a new ")
+    ("get\\|find" . "Looks for the given ")
+    ("gobble" . "Removes")
+    ("he?lp" . "Provides help for")
+    ("li?ste?n" . "Listens for ")
+    ("connect" . "Connects to ")
+    ("acc?e?pt" . "Accepts a ")
+    ("load" . "Loads in ")
+    ("match" . "Check that parameters match")
+    ("name" . "Provides a name which ")
+    ("new" . "Allocates a ")
+    ("parse" . "Parses the parameters and returns ")
+    ("print\\|display" . "Prints out")
+    ("read" . "Reads from")
+    ("reset" . "Resets the parameters and returns")
+    ("scan" . "Scans the ")
+    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("select" . "Chooses the ")
+    ("send" . "Sends a")
+    ("re?c\\(v\\|ieves?\\)" . "Receives a ")
+    ("to" . "Converts ")
+    ("update" . "Updates the ")
+    ("wait" . "Waits for ")
+    ("write" . "Writes to")
+    )
+  "List of names to string match against the function name.
+This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string.
+
+Certain prefixes may always mean the same thing, and the same comment
+can be used as a beginning for the description.  Regexp should be
+lower case since the string they are compared to is downcased.
+A string may end in a space, in which case, last-alist is searched to
+see how best to describe what can be returned.
+Doesn't always work correctly, but that is just because English
+doesn't always work correctly."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-common-nouns-abbrevs
+  '(
+    ("sock\\(et\\)?" . "socket")
+    ("addr\\(ess\\)?" . "address")
+    ("buf\\(f\\(er\\)?\\)?" . "buffer")
+    ("cur\\(r\\(ent\\)?\\)?" . "current")
+    ("dev\\(ice\\)?" . "device")
+    ("file" . "file")
+    ("line" . "line")
+    ("msg\\|message" . "message")
+    ("name" . "name")
+    ("next\\|nxt" . "next")
+    ("port" . "port")
+    ("host" . "host")
+    ("obj\\|object" . "object")
+    ("previous\\|prev" . "previous")
+    ("str\\(ing\\)?" . "string")
+    ("use?r" . "user")
+    ("num\\(ber\\)?" . "number")
+    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable
+    )
+  "List of common English abbreviations or full words.
+These are nouns (as opposed to verbs) for use in creating expanded
+versions of names.This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-return-first-alist
+  '(
+    ;; Static must be first in the list to provide the intro to the sentence
+    ("static" . "Locally defined function which ")
+    ("Bool\\|BOOL" . "Status of ")
+    )
+  "List of regexp matches for types.
+They provide a little bit of text when typing information is
+described.
+This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-return-last-alist
+  '(
+    ("static[ \t\n]+struct \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("struct \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("static[ \t\n]+union \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("union \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("static[ \t\n]+enum \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("enum \\([a-zA-Z0-9_]+\\)" . "%s")
+    ("static[ \t\n]+\\([a-zA-Z0-9_]+\\)" . "%s")
+    ("\\([a-zA-Z0-9_]+\\)" . "of type %s")
+    )
+  "List of regexps which provide the type of the return value.
+This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string, which can contain %s, whih is replaced with
+`match-string' 1."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-param-alist
+  '( ("[Cc]txt" . "Context")
+     ("[Ii]d" . "Identifier of")
+     ("[Tt]ype" . "Type of")
+     ("[Nn]ame" . "Name of")
+     ("argc" . "Number of arguments")
+     ("argv" . "Argument vector")
+     ("envp" . "Environment variable vector")
+     )
+  "Alist of common variable names appearing as function parameters.
+This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string of text to use to describe MATCH.
+When one is encountered, document-insert-parameters will automatically
+place this comment after the parameter name."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+(defcustom srecode-document-autocomment-param-type-alist
+  '(("const" . "Constant")
+    ("void" . "Empty")
+    ("char[ ]*\\*" . "String ")
+    ("\\*\\*" . "Pointer to ")
+    ("\\*" . "Pointer ")
+    ("char[ ]*\\([^ \t*]\\|$\\)" . "Character")
+    ("int\\|long" . "Number of")
+    ("FILE" . "File of")
+    ("float\\|double" . "Value of")
+    ;; How about some X things?
+    ("Bool\\|BOOL" . "Flag")
+    ("Window" . "Window")
+    ("GC" . "Graphic Context")
+    ("Widget" . "Widget")
+    )
+  "Alist of input parameter types and strings desribing them.
+This is an alist with each element of the form:
+ (MATCH . RESULT)
+MATCH is a regexp to match in the type field.
+RESULT is a string."
+  :group 'document
+  :type '(repeat (cons (string :tag "Regexp")
+		       (string :tag "Doc Text"))))
+
+
+(provide 'srecode-document-vars)
+;;; srecode-document-vars.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-document.el b/site/cedet-1.0pre7/srecode/srecode-document.el
new file mode 100644
index 0000000..ad7f7df
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-document.el
@@ -0,0 +1,688 @@
+;;; srecode-document.el --- Documentation (comment) generation
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-document.el,v 1.9 2009/01/20 03:46:31 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Routines for fabricating human readable text from function an
+;; variable names as base-text for function comments.  Document is not
+;; meant to generate end-text for any function.  It is merely meant to
+;; provide some useful base words and text, and as a framework for
+;; managing comments.
+;;
+;;; Origins:
+;;
+;; Document was first written w/ cparse, a custom regexp based c parser.
+;;
+;; Document was then ported to cedet/semantic using sformat (super
+;; format) as the templating engine.
+;;
+;; Document has now been ported to srecode, using the semantic recoder
+;; as the templating engine.
+
+(require 'srecode-semantic)
+(require 'srecode-insert)
+(require 'srecode-dictionary)
+(require 'srecode-extract)
+(require 'srecode-args)
+(require 'srecode-document-vars)
+(require 'semantic)
+(require 'semantic-tag)
+(require 'semantic-doc)
+(require 'pulse)
+
+;;; Code:
+(defgroup document nil
+  "File and tag browser frame."
+  :group 'texinfo
+  :group 'srecode
+  )
+
+;;;###autoload
+(eval-after-load "srecode-mode"
+  ;; Once SRecode mode is loaded, then lets add ourself to the keymap.
+  '(progn
+     (srecode-add-code-generator 'srecode-document-insert-comment
+				 "Comments"
+				 "C")
+     )
+)
+
+;;;###autoload
+(defun srecode-document-insert-comment ()
+  "Insert some comments.
+Whack any comments that may be in the way and replace them.
+If the region is active, then insert group function comments.
+If the cursor is in a comment, figure out what kind of comment it is
+  and replace it.
+If the cursor is in a function, insert a function comment.
+If the cursor is on a one line prototype, then insert post-fcn comments."
+  (interactive)
+  (semantic-fetch-tags)
+  (let ((ctxt (srecode-calculate-context)))
+    (if ;; Active region stuff.
+	(or srecode-handle-region-when-non-active-flag
+	    (eq last-command 'mouse-drag-region)
+	    (and transient-mark-mode mark-active))
+	(if (> (point) (mark))
+	    (srecode-document-insert-group-comments (mark) (point))
+	  (srecode-document-insert-group-comments (point) (mark)))
+      ;; ELSE
+
+      ;; A declaration comment.  Find what it documents.
+      (when (equal ctxt '("declaration" "comment"))
+	
+	;; If we are on a one line tag/comment, go to that fcn.
+	(if (save-excursion (back-to-indentation)
+			    (semantic-current-tag))
+	    (back-to-indentation)
+
+	  ;; Else, do we have a fcn following us?
+	  (let ((tag (semantic-find-tag-by-overlay-next)))
+	    (when tag (semantic-go-to-tag tag))))
+	)
+
+      ;; Now analyze the tag we may be on.
+
+      (if (semantic-current-tag)
+	  (cond
+	   ;; A one-line variable
+	   ((and (semantic-tag-of-class-p (semantic-current-tag) 'variable)
+		 (srecode-document-one-line-tag-p (semantic-current-tag)))
+	    (srecode-document-insert-variable-one-line-comment))
+	   ;; A plain function
+	   ((semantic-tag-of-class-p (semantic-current-tag) 'function)
+	    (srecode-document-insert-function-comment))
+	   ;; Don't know.
+	   (t
+	    (error "Not sure what to comment"))
+	   )
+
+	;; ELSE, no tag.  Perhaps we should just insert a nice section
+	;; header??
+
+	(let ((title (read-string "Section Title (RET to skip): ")))
+	  
+	  (when (and (stringp title) (not (= (length title) 0)))
+	    (srecode-document-insert-section-comment title)))
+
+	))))
+
+(defun srecode-document-insert-section-comment (&optional title)
+  "Insert a section comment with TITLE."
+  (interactive "sSection Title: ")
+  
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'document)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  
+  (let* ((dict (srecode-create-dictionary))
+	 (temp (srecode-template-get-table (srecode-table)
+					   "section-comment"
+					   "declaration"
+					   'document)))
+    (if (not temp)
+	(error "No templates for inserting section comments"))
+
+    (when title
+      (srecode-dictionary-set-value
+       dict "TITLE" title))
+    
+    (srecode-insert-fcn temp dict)
+    ))
+
+
+(defun srecode-document-trim-whitespace (str)
+  "Strip stray whitespace from around STR."
+  (when (string-match "^\\(\\s-\\|\n\\)+" str)
+    (setq str (replace-match "" t t str)))
+  (when (string-match "\\(\\s-\\|\n\\)+$" str)
+    (setq str (replace-match "" t t str)))
+  str)
+
+;;;###autoload
+(defun srecode-document-insert-function-comment (&optional fcn-in)
+  "Insert or replace a function comment.
+FCN-IN is the Semantic tag of the function to add a comment too.
+If FCN-IN is not provied, the current tag is used instead.
+It is assumed that the comment occurs just in front of FCN-IN."
+  (interactive)
+
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'document)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  
+  (let* ((dict (srecode-create-dictionary))
+	 (temp (srecode-template-get-table (srecode-table)
+					   "function-comment"
+					   "declaration"
+					   'document)))
+    (if (not temp)
+	(error "No templates for inserting function comments"))
+
+    ;; Try to figure out the tag we want to use.
+    (when (not fcn-in)
+      (semantic-fetch-tags)
+      (setq fcn-in (semantic-current-tag)))
+  
+    (when (or (not fcn-in)
+	      (not (semantic-tag-of-class-p fcn-in 'function)))
+      (error "No tag of class 'function to insert comment for"))
+
+    (if (not (eq (current-buffer) (semantic-tag-buffer fcn-in)))
+	(error "Only insert comments for tags in the current buffer"))
+
+    ;; Find any existing doc strings.
+    (semantic-go-to-tag fcn-in)
+    (beginning-of-line)
+    (forward-char -1)
+
+    (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex))
+	  (doctext
+	   (srecode-document-function-name-comment fcn-in))
+	  )
+
+      (when lextok
+	(let* ((s (semantic-lex-token-start lextok))
+	       (e (semantic-lex-token-end lextok))
+	       (plaintext
+		(srecode-document-trim-whitespace
+		 (save-excursion
+		   (goto-char s)
+		   (semantic-doc-snarf-comment-for-tag nil))))
+	       (extract (condition-case nil
+			    (srecode-extract temp s e)
+			  (error nil))
+			)
+	       (distance (count-lines e (semantic-tag-start fcn-in)))
+	       (belongelsewhere (save-excursion
+				  (goto-char s)
+				  (back-to-indentation)
+				  (semantic-current-tag)))
+	       )
+
+	  (when (not belongelsewhere)
+
+	    (pulse-momentary-highlight-region s e)
+
+	    ;; There are many possible states that comment could be in.
+	    ;; Take a guess about what the user would like to do, and ask
+	    ;; the right kind of question.
+	    (when (or (not (> distance 2))
+		      (y-or-n-p "Replace this comment? "))
+
+	      (when (> distance 2)
+		(goto-char e)
+		(delete-horizontal-space)
+		(delete-blank-lines))
+
+	      (cond
+	       ((and plaintext (not extract))
+		(if (y-or-n-p "Convert old-style comment to Template with old text? ")
+		    (setq doctext plaintext))
+		(delete-region s e)
+		(goto-char s))
+	       (extract
+		(when (y-or-n-p "Refresh pre-existing comment (recycle old doc)? ")
+		  (delete-region s e)
+		  (goto-char s)
+		  (setq doctext
+			(srecode-document-trim-whitespace
+			 (srecode-dictionary-lookup-name extract "DOC")))))
+	       ))
+	    )))
+
+      (beginning-of-line)
+
+      ;; Perform the insertion
+      (let ((srecode-semantic-selected-tag fcn-in)
+	    (srecode-semantic-apply-tag-augment-hook
+	     (lambda (tag dict)
+	       (srecode-dictionary-set-value
+		dict "DOC"
+		(if (eq tag fcn-in)
+		    doctext
+		  (srecode-document-parameter-comment tag))
+		)))
+	    )
+	(srecode-insert-fcn temp dict)
+	))
+    ))
+
+;;;###autoload
+(defun srecode-document-insert-variable-one-line-comment (&optional var-in)
+  "Insert or replace a variable comment.
+VAR-IN is the Semantic tag of the function to add a comment too.
+If VAR-IN is not provied, the current tag is used instead.
+It is assumed that the comment occurs just after VAR-IN."
+  (interactive)
+
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'document)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  
+  (let* ((dict (srecode-create-dictionary))
+	 (temp (srecode-template-get-table (srecode-table)
+					   "variable-same-line-comment"
+					   "declaration"
+					   'document)))
+    (if (not temp)
+	(error "No templates for inserting variable comments"))
+
+    ;; Try to figure out the tag we want to use.
+    (when (not var-in)
+      (semantic-fetch-tags)
+      (setq var-in (semantic-current-tag)))
+  
+    (when (or (not var-in)
+	      (not (semantic-tag-of-class-p var-in 'variable)))
+      (error "No tag of class 'variable to insert comment for"))
+
+    (if (not (eq (current-buffer) (semantic-tag-buffer var-in)))
+	(error "Only insert comments for tags in the current buffer"))
+
+    ;; Find any existing doc strings.
+    (goto-char (semantic-tag-end var-in))
+    (skip-syntax-forward "-" (point-at-eol))
+    (let ((lextok (semantic-doc-snarf-comment-for-tag 'lex))
+	  )
+
+      (when lextok
+	(let ((s (semantic-lex-token-start lextok))
+	      (e (semantic-lex-token-end lextok)))
+
+	  (pulse-momentary-highlight-region s e)
+
+	  (when (not (y-or-n-p "A comment already exists.  Replace? "))
+	    (error "Quit"))
+
+	  ;; Extract text from the existing comment.
+	  (srecode-extract temp s e)
+
+	  (delete-region s e)
+	  (goto-char s) ;; To avoid adding a CR.
+	  ))
+      )
+
+    ;; Clean up the end of the line and use handy comment-column.
+    (end-of-line)
+    (delete-horizontal-space)
+    (move-to-column comment-column t)
+    (when (< (point) (point-at-eol)) (end-of-line))
+
+    ;; Perform the insertion
+    (let ((srecode-semantic-selected-tag var-in)
+	  (srecode-semantic-apply-tag-augment-hook
+	   (lambda (tag dict)
+	     (srecode-dictionary-set-value
+	      dict "DOC" (srecode-document-parameter-comment
+			  tag))))
+	  )
+      (srecode-insert-fcn temp dict)
+      ))
+  )
+
+;;;###autoload
+(defun srecode-document-insert-group-comments (beg end)
+  "Insert group comments around the active between BEG and END.
+If the region includes only parts of some tags, expand out
+to the beginning and end of the tags on the region.
+If there is only one tag in the region, complain."
+  (interactive "r")
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'document)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  
+  (let* ((dict (srecode-create-dictionary))
+	 (context "declaration")
+	 (temp-start nil)
+	 (temp-end nil)
+	 (tag-start (save-excursion
+		      (goto-char beg)
+		      (or (semantic-current-tag)
+			  (semantic-find-tag-by-overlay-next))))
+	 (tag-end (save-excursion
+		    (goto-char end)
+		    (or (semantic-current-tag)
+			(semantic-find-tag-by-overlay-prev))))
+	 (parent-tag nil)
+	 (first-pos beg)
+	 (second-pos end)
+	 )
+
+    ;; If beg/end wrapped nothing, then tag-start,end would actually
+    ;; point at some odd stuff that is out of order.
+    (when (or (not tag-start) (not tag-end)
+	      (> (semantic-tag-end tag-start)
+		 (semantic-tag-start tag-end)))
+      (setq tag-start nil
+	    tag-end nil))
+
+    (when tag-start
+      ;; If tag-start and -end are the same, and it is a class or
+      ;; struct, try to find child tags inside the classdecl.
+      (cond
+       ((and (eq tag-start tag-end)
+	     tag-start
+	     (semantic-tag-of-class-p tag-start 'type))
+	(setq parent-tag tag-start)
+	(setq tag-start (semantic-find-tag-by-overlay-next beg)
+	      tag-end (semantic-find-tag-by-overlay-prev end))
+	)
+       ((eq (semantic-find-tag-parent-by-overlay tag-start) tag-end)
+	(setq parent-tag tag-end)
+	(setq tag-end (semantic-find-tag-by-overlay-prev end))
+	)
+       ((eq tag-start (semantic-find-tag-parent-by-overlay tag-end))
+	(setq parent-tag tag-start)
+	(setq tag-start (semantic-find-tag-by-overlay-next beg))
+	)
+       )
+
+      (when parent-tag
+	;; We are probably in a classdecl
+	;; @todo -could I really use (srecode-calculate-context) ?
+
+	(setq context "classdecl")
+	)
+
+      ;; Derive start and end locations based on the tags.
+      (setq first-pos (semantic-tag-start tag-start)
+	    second-pos (semantic-tag-end tag-end))
+      )
+    ;; Now load the templates
+    (setq temp-start (srecode-template-get-table (srecode-table)
+						 "group-comment-start"
+						 context
+						 'document)
+	  temp-end (srecode-template-get-table (srecode-table)
+					       "group-comment-end"
+					       context
+					       'document))
+
+    (when (or (not temp-start) (not temp-end))
+      (error "No templates for inserting group comments"))
+
+    ;; Setup the name of this group ahead of time.
+
+    ;; @todo - guess at a name based on common strings
+    ;;         of the tags in the group.
+    (srecode-dictionary-set-value
+     dict "GROUPNAME"
+     (read-string "Name of group: "))
+    
+    ;; Perform the insertion
+    ;; Do the end first so we don't need to recalculate anything.
+    ;;
+    (goto-char second-pos)
+    (end-of-line)
+    (srecode-insert-fcn temp-end dict)
+
+    (goto-char first-pos)
+    (beginning-of-line)
+    (srecode-insert-fcn temp-start dict)
+
+    ))
+
+
+;;; Document Generation Functions
+;;
+;; Routines for making up English style comments.
+
+(defun srecode-document-function-name-comment (tag)
+  "Create documentation for the function defined in TAG.
+If we can identify a verb in the list followed by some
+name part then check the return value to see if we can use that to
+finish off the sentence.  ie. any function with 'alloc' in it will be
+allocating something based on its type."
+  (let ((al srecode-document-autocomment-return-first-alist)
+	(dropit nil)
+	(tailit nil)
+	(news "")
+	(fname (semantic-tag-name tag))
+	(retval (or (semantic-tag-type tag) "")))
+    (if (listp retval)
+	;; convert a type list into a long string to analyze.
+	(setq retval (car retval)))
+    ;; check for modifiers like static
+    (while al
+      (if (string-match (car (car al)) (downcase retval))
+	  (progn
+	    (setq news (concat news (cdr (car al))))
+	    (setq dropit t)
+	    (setq al nil)))
+      (setq al (cdr al)))
+    ;; check for verb parts!
+    (setq al srecode-document-autocomment-function-alist)
+    (while al
+      (if (string-match (car (car al)) (downcase fname))
+	  (progn
+	    (setq news
+		  (concat news (if dropit (downcase (cdr (car al)))
+				 (cdr (car al)))))
+	    ;; if we end in a space, then we are expecting a potential
+	    ;; return value.
+	    (if (= ?  (aref news (1- (length news))))
+		(setq tailit t))
+	    (setq al nil)))
+      (setq al (cdr al)))
+    ;; check for noun parts!
+    (setq al srecode-document-autocomment-common-nouns-abbrevs)
+    (while al
+      (if (string-match (car (car al)) (downcase fname))
+	  (progn
+	    (setq news
+		  (concat news (if dropit (downcase (cdr (car al)))
+				 (cdr (car al)))))
+	    (setq al nil)))
+      (setq al (cdr al)))
+    ;; add tailers to names which are obviously returning something.
+    (if tailit
+	(progn
+	  (setq al srecode-document-autocomment-return-last-alist)
+	  (while al
+	    (if (string-match (car (car al)) (downcase retval))
+		(progn
+		  (setq news
+			(concat news " "
+				;; this one may use parts of the return value.
+				(format (cdr (car al))
+					(srecode-document-programmer->english
+					 (substring retval (match-beginning 1)
+						    (match-end 1))))))
+		  (setq al nil)))
+	    (setq al (cdr al)))))
+    news))
+
+(defun srecode-document-parameter-comment (param &optional commentlist)
+  "Convert tag or string PARAM into a name,comment pair.
+Optional COMMENTLIST is list of previously existing comments to
+use instead in alist form.  If the name doesn't appear in the list of
+standard names, then englishify it instead."
+  (let ((cmt "")
+	(aso srecode-document-autocomment-param-alist)
+	(fnd nil)
+	(name (if (stringp param) param (semantic-tag-name param)))
+	(tt (if (stringp param) nil (semantic-tag-type param))))
+    ;; Make sure the type is a string.
+    (if (listp tt)
+	(setq tt (semantic-tag-name tt)))
+    ;; Find name description parts.
+    (while aso
+      (if (string-match (car (car aso)) name)
+	  (progn
+	    (setq fnd t)
+	    (setq cmt (concat cmt (cdr (car aso))))))
+      (setq aso (cdr aso)))
+    (if (/= (length cmt) 0)
+	nil
+      ;; finally check for array parts
+      (if (and (not (stringp param)) (semantic-tag-modifiers param))
+	  (setq cmt (concat cmt "array of ")))
+      (setq aso srecode-document-autocomment-param-type-alist)
+      (while (and aso tt)
+	(if (string-match (car (car aso)) tt)
+	    (setq cmt (concat cmt (cdr (car aso)))))
+	(setq aso (cdr aso))))
+    ;; Convert from programmer to english.
+    (if (not fnd)
+	(setq cmt (concat cmt " "
+			  (srecode-document-programmer->english name))))
+    cmt))
+
+(defun srecode-document-programmer->english (programmer)
+  "Take PROGRAMMER and convert it into English.
+Works with the following rules:
+  1) convert all _ into spaces.
+  2) inserts spaces between CamelCasing word breaks.
+  3) expands noun names based on common programmer nouns.
+  
+  This function is designed for variables, not functions.  This does
+not account for verb parts."
+  (if (string= "" programmer)
+      ""
+    (let ((ind 0) 			;index in string
+	  (llow nil)			;lower/upper case flag
+	  (newstr nil)			;new string being generated
+	  (al nil))			;autocomment list
+      ;;
+      ;; 1) Convert underscores
+      ;;
+      (while (< ind (length programmer))
+	(setq newstr (concat newstr
+			     (if (= (aref programmer ind) ?_)
+				 " " (char-to-string (aref programmer ind)))))
+	(setq ind (1+ ind)))
+      (setq programmer newstr
+	    newstr nil
+	    ind 0)
+      ;;
+      ;; 2) Find word breaks between case changes
+      ;;
+      (while (< ind (length programmer))
+	(setq newstr
+	      (concat newstr
+		      (let ((tc (aref programmer ind)))
+			(if (and (>= tc ?a) (<= tc ?z))
+			    (progn
+			      (setq llow t)
+			      (char-to-string tc))
+			  (if llow
+			      (progn
+				(setq llow nil)
+				(concat " " (char-to-string tc)))
+			    (char-to-string tc))))))
+	(setq ind (1+ ind)))
+      ;;
+      ;; 3) Expand the words if possible
+      ;;
+      (setq llow nil
+	    ind 0
+	    programmer newstr
+	    newstr nil)
+      (while (string-match (concat "^\\s-*\\([^ \t\n]+\\)") programmer)
+	(let ((ts (substring programmer (match-beginning 1) (match-end 1)))
+	      (end (match-end 1)))
+	  (setq al srecode-document-autocomment-common-nouns-abbrevs)
+	  (setq llow nil)
+	  (while al
+	    (if (string-match (car (car al)) (downcase ts))
+		(progn
+		  (setq newstr (concat newstr (cdr (car al))))
+		  ;; don't terminate because we may actuall have 2 words
+		  ;; next to eachother we didn't identify before
+		  (setq llow t)))
+	    (setq al (cdr al)))
+	  (if (not llow) (setq newstr (concat newstr ts)))
+	  (setq newstr (concat newstr " "))
+	  (setq programmer (substring programmer end))))
+      newstr)))
+
+;;; UTILS
+;;
+(defun srecode-document-one-line-tag-p (tag)
+  "Does TAG fit on one line with space on the end?"
+  (save-excursion
+    (semantic-go-to-tag tag)
+    (and (<= (semantic-tag-end tag) (point-at-eol))
+	 (goto-char (semantic-tag-end tag))
+	 (< (current-column) 70))))
+
+;;; TESTS
+;;
+;;;###autoload
+(defun srecode-document-function-comment-extract-test ()
+  "Test old comment extraction.
+Dump out the extracted dictionary."
+  (interactive)
+
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'document)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  
+  (let* ((temp (srecode-template-get-table (srecode-table)
+					   "function-comment"
+					   "declaration"
+					   'document))
+	 (fcn-in (semantic-current-tag)))
+
+    (if (not temp)
+	(error "No templates for function comments"))
+
+    ;; Try to figure out the tag we want to use.
+    (when (or (not fcn-in)
+	      (not (semantic-tag-of-class-p fcn-in 'function)))
+      (error "No tag of class 'function to insert comment for"))
+
+    (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex))
+	  )
+
+      (when (not lextok)
+	(error "No comment to attempt an extraction"))
+
+      (let ((s (semantic-lex-token-start lextok))
+	    (e (semantic-lex-token-end lextok))
+	    (extract nil))
+
+	(pulse-momentary-highlight-region s e)
+
+	;; Extract text from the existing comment.
+	(setq extract (srecode-extract temp s e))
+
+	(with-output-to-temp-buffer "*SRECODE DUMP*"
+	  (princ "EXTRACTED DICTIONARY FOR ")
+	  (princ (semantic-tag-name fcn-in))
+	  (princ "\n--------------------------------------------\n")
+	  (srecode-dump extract))
+	))))
+
+(provide 'srecode-document)
+;;; srecode-document.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-el.el b/site/cedet-1.0pre7/srecode/srecode-el.el
new file mode 100644
index 0000000..76c89ee
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-el.el
@@ -0,0 +1,107 @@
+;;; srecode-el.el --- Emacs Lisp specialize arguments
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-el.el,v 1.2 2008/02/24 01:42:28 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Emacs Lisp specific handlers.  To use these handlers in your
+;; template, add the :name part to your template argument list.
+;;
+;; Error if not in a Emacs Lisp mode
+
+;;; Code:
+
+
+;;;###autoload
+(defun srecode-semantic-handle-:el (dict)
+  "Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+  PRENAME - The common name prefix of this file."
+  (let* ((names (append (semantic-find-tags-by-class 'function (current-buffer))
+			(semantic-find-tags-by-class 'variable (current-buffer)))
+		)
+	 (common (try-completion "" names)))
+    
+    (srecode-dictionary-set-value dict "PRENAME" common)
+    ))
+
+;;;###autoload
+(defun srecode-semantic-handle-:el-custom (dict)
+  "Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+  GROUP - The 'defgroup' name we guess you want for variables.
+  FACEGROUP - The `defgroup' name you might want for faces."
+  (let ((groups (semanticdb-strip-find-results
+		 (semanticdb-brute-find-tags-by-class 'customgroup)))
+	(varg nil)
+	(faceg nil)
+	)
+
+    ;; Pick the best group
+    (while groups
+      (cond ((string-match "face" (semantic-tag-name (car groups)))
+	     (setq faceg (car groups)))
+	    ((not varg)
+	     (setq varg (car groups)))
+	    (t
+	     ;; What about other groups?
+	     ))
+      (setq groups (cdr groups)))
+
+    ;; Double check the facegroup.
+    (setq faceg (or faceg varg))
+    
+    ;; Setup some variables
+    (srecode-dictionary-set-value dict "GROUP" (semantic-tag-name varg))
+    (srecode-dictionary-set-value dict "FACEGROUP" (semantic-tag-name faceg))
+
+    ))
+
+(define-mode-local-override srecode-semantic-apply-tag-to-dict
+  emacs-lisp-mode (tagobj dict)
+  "Apply Emacs Lisp specific features from TAGOBJ into DICT.
+Calls `srecode-semantic-apply-tag-to-dict-default' first."
+  (srecode-semantic-apply-tag-to-dict-default tagobj dict)
+
+  ;; Pull out the tag for the individual pieces.
+  (let* ((tag (oref tagobj :prime))
+	 (doc (semantic-tag-docstring tag)))
+
+    ;; It is much more common to have doc on ELisp.
+    (srecode-dictionary-set-value dict "DOC" doc)
+
+    (cond
+     ;;
+     ;; FUNCTION
+     ;;
+     ((eq (semantic-tag-class tag) 'function)
+      (if (semantic-tag-get-attribute tag :user-visible-flag)
+	  (srecode-dictionary-set-value dict "INTERACTIVE" "  (interactive)\n  ")
+	(srecode-dictionary-set-value dict "INTERACTIVE" ""))
+      )
+     
+      
+     )
+    ))
+
+
+(provide 'srecode-el)
+;;; srecode-el.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-expandproto.el b/site/cedet-1.0pre7/srecode/srecode-expandproto.el
new file mode 100644
index 0000000..195e338
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-expandproto.el
@@ -0,0 +1,122 @@
+;;; srecode-expandproto.el --- Expanding prototypes.
+
+;; Copyright (C) 2007 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-expandproto.el,v 1.1 2007/03/18 16:47:16 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Methods for expanding a prototype into an implementation.
+
+(require 'semantic)
+(require 'semantic-analyze)
+(require 'srecode-insert)
+(require 'srecode-dictionary)
+
+;;; Code:
+(defcustom srecode-expandproto-template-file-alist
+  '( ( c++-mode . "srecode-expandproto-cpp.srt" )
+     )
+  ;; @todo - Make this variable auto-generated from the Makefile.
+  "Associate template files for expanding prototypes to a major mode."
+  :group 'srecode
+  :type '(repeat (cons (sexp :tag "Mode")
+		       (sexp :tag "Filename"))
+		 ))
+
+;;;###autoload
+(defun srecode-insert-prototype-expansion ()
+  "Insert get/set methods for the current class."
+  (interactive)
+
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode
+				srecode-expandproto-template-file-alist)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+
+  (let ((proto
+	 ;; Step 1: Find the prototype, or prototype list to expand.
+	 (srecode-find-prototype-for-expansion)))
+
+    (if (not proto)
+	(error "Could not find prototype to expand"))
+
+    ;; Step 2: Insert implementations of the prototypes.
+
+
+    ))
+
+(defun srecode-find-prototype-for-expansion ()
+  "Find a prototype to use for expanding into an implementation."
+  ;; We may find a prototype tag in one of several places.
+  ;; Search in order of logical priority.
+  (let ((proto nil)
+	)
+
+    ;; 1) A class full of prototypes under point.
+    (let ((tag (semantic-current-tag)))
+      (when tag
+	(when (not (semantic-tag-of-class-p tag 'type))
+	  (setq tag (semantic-current-tag-parent))))
+      (when (and tag (semantic-tag-of-class-p tag 'type))
+	;; If the current class has prototype members, then
+	;; we will do the whole class!
+	(if (semantic-brute-find-tag-by-attribute-value
+	     :prototype t
+	     (semantic-tag-type-members tag))
+	    (setq proto tag)))
+      )
+
+    ;; 2) A prototype under point.
+    (when (not proto)
+      (let ((tag (semantic-current-tag)))
+	(when (and tag
+		   (and
+		    (semantic-tag-of-class-p tag 'function)
+		    (semantic-tag-get-attribute tag :prototype)))
+	  (setq proto tag))))
+
+    ;; 3) A tag in the kill ring that is a prototype
+    (when (not proto)
+      (if (ring-empty-p senator-tag-ring)
+	  nil  ;; Not for us.
+	(let ((tag (ring-ref senator-tag-ring 0))
+	      )
+	  (when
+	      (and tag
+		   (or
+		    (and
+		     (semantic-tag-of-class-p tag 'function)
+		     (semantic-tag-get-attribute tag :prototype))
+		    (and
+		     (semantic-tag-of-class-p tag 'type)
+		     (semantic-brute-find-tag-by-attribute-value
+		      :prototype t
+		      (semantic-tag-type-members tag))))
+		   )
+	    (setq proto tag))
+	  )))
+
+    proto))
+
+(provide 'srecode-expandproto)
+
+;;; srecode-expandproto.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-extract.el b/site/cedet-1.0pre7/srecode/srecode-extract.el
new file mode 100644
index 0000000..bfe043e
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-extract.el
@@ -0,0 +1,242 @@
+;;; srecode-extract.el --- Extract content from previously inserted macro.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-extract.el,v 1.3 2009/01/09 22:56:32 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Extract content from a previously inserted macro.
+;;
+;; The extraction routines can be handy if you want to extract users
+;; added text from the middle of a template inserted block of text.
+;; This code will not work for all templates.  It will only work for
+;; templates with unique static text between all the different insert
+;; macros.
+;;
+;; That said, it will handle include and section templates, so complex
+;; or deep template calls can be extracted.
+;;
+;; This code was specifically written for srecode-document, which
+;; wants to extract user written text, and re-use it in a reformatted
+;; comment.
+
+(require 'srecode)
+(require 'srecode-compile)
+(require 'srecode-insert)
+
+;;; Code:
+
+(defclass srecode-extract-state ()
+  ((anchor :initform nil
+	   :documentation
+	   "The last known plain-text end location.")
+   (lastinserter :initform nil
+		 :documentation
+		 "The last inserter with 'later extraction type.")
+   (lastdict :initform nil
+	     :documentation
+	     "The dictionary associated with lastinserter.")
+   )
+  "The current extraction state.")
+
+(defmethod srecode-extract-state-set ((st srecode-extract-state) ins dict)
+  "Set onto the extract state ST a new inserter INS and dictinary DICT."
+  (oset st lastinserter ins)
+  (oset st lastdict dict))
+
+(defmethod srecode-extract-state-set-anchor ((st srecode-extract-state))
+  "Reset the achor point on extract state ST."
+  (oset st anchor (point)))
+
+(defmethod srecode-extract-state-extract ((st srecode-extract-state)
+					  endpoint)
+  "Perform an extraction on the extract state ST with ENDPOITNT.
+If there was no waiting inserter, do nothing."
+  (when (oref st lastinserter)
+    (save-match-data
+      (srecode-inserter-extract (oref st lastinserter)
+				(oref st anchor)
+				endpoint
+				(oref st lastdict)
+				st))
+    ;; Clear state.
+    (srecode-extract-state-set st nil nil)))
+
+;;; Extraction
+;l
+(defun srecode-extract (template start end)
+  "Extract TEMPLATE from between START and END in the current buffer.
+Uses TEMPLATE's constant strings to break up the text and guess what
+the dictionary entries were for that block of text."
+  (save-excursion
+    (save-restriction
+      (narrow-to-region start end)
+      (let ((dict (srecode-create-dictionary t))
+	    (state (srecode-extract-state "state"))
+	    )
+	(goto-char start)
+	(srecode-extract-method template dict state)
+	dict))))
+
+(defmethod srecode-extract-method ((st srecode-template) dictionary
+				   state)
+  "Extract template ST and store extracted text in DICTIONARY.
+Optional STARTRETURN is a symbol in which the start of the first
+plain-text match occured."
+  (srecode-extract-code-stream (oref st code) dictionary state))
+
+(defun srecode-extract-code-stream (code dictionary state)
+  "Extract CODE from buffer text into DICTIONARY.
+Uses string constants in CODE to split up the buffer.
+Uses STATE to maintain the current extraction state."
+  (while code
+    (cond
+
+     ;; constant strings need mark the end of old inserters that
+     ;; need to extract values, or are just there.
+     ((stringp (car code))
+      (srecode-extract-state-set-anchor state)
+      ;; When we have a string, find it in the collection, then extract
+      ;; that start point as the end point of the inserter
+      (unless (re-search-forward (regexp-quote (car code))
+				 (point-max) t)
+	(error "Unable to extract all dictionary entries"))
+
+      (srecode-extract-state-extract state (match-beginning 0))
+      (goto-char (match-end 0))
+      )
+
+     ;; Some inserters are simple, and need to be extracted after
+     ;; we find our next block of static text.
+     ((eq (srecode-inserter-do-extract-p (car code)) 'later)
+      (srecode-extract-state-set state (car code) dictionary)
+      )
+
+     ;; Some inserter want to start extraction now, such as sections.
+     ;; We can't predict the end point till we parse out the middle.
+     ((eq (srecode-inserter-do-extract-p (car code)) 'now)
+      (srecode-extract-state-set-anchor state)
+      (srecode-inserter-extract (car code) (point) nil dictionary state))
+     )
+    (setq code (cdr code))
+    ))
+
+;;; Inserter Base Extractors
+;;
+(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter))
+  "Return non-nil if this inserter can extract values."
+  nil)
+
+(defmethod srecode-inserter-extract ((ins srecode-template-inserter) 
+				     start end dict state)
+  "Extract text from START/END and store in DICT.
+Return nil as this inserter will extract nothing."
+  nil)
+
+;;; Variable extractor is simple and can extract later.
+;;
+(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-variable))
+  "Return non-nil if this inserter can extract values."
+  'later)
+
+(defmethod srecode-inserter-extract ((ins srecode-template-inserter-variable) 
+				     start end vdict state)
+  "Extract text from START/END and store in VDICT.
+Return t if something was extracted.
+Return nil if this inserter doesn't need to extract anything."
+  (srecode-dictionary-set-value vdict 
+				(oref ins :object-name)
+				(buffer-substring-no-properties
+				 start end)
+				)
+  t)
+
+;;; Section Inserter
+;;
+(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-section-start))
+  "Return non-nil if this inserter can extract values."
+  'now)
+
+(defmethod srecode-inserter-extract ((ins srecode-template-inserter-section-start) 
+				     start end indict state)
+  "Extract text from START/END and store in INDICT.
+Return the starting location of the first plain-text match.
+Return nil if nothing was extracted."
+  (let ((name (oref ins :object-name))
+	(subdict (srecode-create-dictionary indict))
+	(allsubdict nil)
+	)
+
+    ;; Keep extracting till we can extract no more.
+    (while (condition-case nil
+	       (progn
+		 (srecode-extract-method
+		  (oref ins template) subdict state)
+		 t)
+	     (error nil))
+      
+      ;; Success means keep this subdict, and also make a new one for
+      ;; the next iteration.
+      (setq allsubdict (cons subdict allsubdict))
+      (setq subdict (srecode-create-dictionary indict))
+      )
+
+    (srecode-dictionary-set-value indict name (nreverse allsubdict))
+
+    nil))
+
+;;; Include Extractor must extract now.
+;;
+(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-include))
+  "Return non-nil if this inserter can extract values."
+  'now)
+
+(defmethod srecode-inserter-extract ((ins srecode-template-inserter-include) 
+				     start end dict state)
+  "Extract text from START/END and store in DICT.
+Return the starting location of the first plain-text match.
+Return nil if nothing was extracted."
+  (goto-char start)
+  (srecode-insert-include-lookup ins dict)
+  ;; There are two modes for includes.  One is with no dict,
+  ;; so it is inserted straight.  If the dict has a name, then
+  ;; we need to run once per dictionary occurance.
+  (if (not (string= (oref ins :object-name) ""))
+      ;; With a name, do the insertion.
+      (let ((subdict (srecode-dictionary-add-section-dictionary
+		      dict (oref ins :object-name))))
+	(error "Need to implement include w/ name extractor.")
+	;; Recurse into the new template while no errors.
+	(while (condition-case nil
+		   (progn
+		     (srecode-extract-method
+		      (oref ins includedtemplate) subdict
+		      state)
+		     t)
+		 (error nil))))
+
+    ;; No stream, do the extraction into the current dictionary.
+    (srecode-extract-method (oref ins includedtemplate) dict
+			    state))
+  )
+
+
+(provide 'srecode-extract)
+;;; srecode-extract.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-fields.el b/site/cedet-1.0pre7/srecode/srecode-fields.el
new file mode 100644
index 0000000..e823ee8
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-fields.el
@@ -0,0 +1,705 @@
+;;; srecode-fields.el --- Handling type-in fields in a buffer.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-fields.el,v 1.11 2010/02/03 23:39:25 scymtym Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Idea courtesy of yasnippets.
+;;
+;; If someone prefers not to type unknown dictionary entries into
+;; mini-buffer prompts, it could instead use in-buffer fields.
+;;
+;; A template-region specifies an area in which the fields exist.  If
+;; the cursor exits the region, all fields are cleared.
+;;
+;; Each field is independent, but some are linked together by name.
+;; Typing in one will cause the matching ones to change in step.
+;;
+;; Each field has 2 overlays.  The second overlay allows control in
+;; the character just after the field, but does not highlight it.
+
+;; Keep this library independent of SRecode proper.
+(require 'eieio)
+
+;;; Overlay Compatibility
+;;
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (progn
+	(defalias 'srecode-make-overlay
+	  (lambda (beg end &optional buffer &rest rest)
+	    (let ((ol (make-extent beg end buffer)))
+	      (when rest
+		(set-extent-property ol 'start-open (car rest))
+		(setq rest (cdr rest)))
+	      (when rest
+		(set-extent-property ol 'end-open (car rest)))
+	      ol)))
+	(defalias 'srecode-overlay-put    'set-extent-property)
+	(defalias 'srecode-overlay-get    'extent-property)
+	(defalias 'srecode-overlay-move   'set-extent-endpoints)
+	(defalias 'srecode-overlay-delete 'delete-extent)
+	(defalias 'srecode-overlay-p      'extentp)
+	(defalias 'srecode-overlay-start  'extent-start-position)
+	(defalias 'srecode-overlay-end    'extent-end-position)
+	(defalias 'srecode-overlays-at
+	  (lambda (pos)
+	    (condition-case nil
+		(extent-list nil pos pos)
+	      (error nil))
+	    ))
+	)
+    (defalias 'srecode-make-overlay   'make-overlay)
+    (defalias 'srecode-overlay-put    'overlay-put)
+    (defalias 'srecode-overlay-get    'overlay-get)
+    (defalias 'srecode-overlay-move   'move-overlay)
+    (defalias 'srecode-overlay-delete 'delete-overlay)
+    (defalias 'srecode-overlays-at    'overlays-at)
+    (defalias 'srecode-overlay-p      'overlayp)
+    (defalias 'srecode-overlay-start  'overlay-start)
+    (defalias 'srecode-overlay-end    'overlay-end)
+    ))
+
+;;; Code:
+(defvar srecode-field-archive nil
+  "While inserting a set of fields, collect in this variable.
+Once an insertion set is done, these fields will be activated.")
+
+
+;;; Customization
+;;
+
+(defface srecode-field-face
+  '((((class color) (background dark))
+     (:underline "green"))
+    (((class color) (background light))
+     (:underline "green4")))
+  "*Face used to specify editable fields from a template."
+  :group 'semantic-faces)
+
+(defcustom srecode-fields-exit-confirmation t
+  "Ask for confirmation before leaving field editing mode."
+  :group 'srecode
+  :type  'boolean)
+
+;;; BASECLASS
+;;
+;; Fields and the template region share some basic overlay features.
+
+(defclass srecode-overlaid ()
+  ((overlay :documentation
+	    "Overlay representing this field.
+The overlay will crossreference this object.")
+   )
+  "An object that gets automatically bound to an overlay.
+Has virtual :start and :end initializers.")
+
+(defmethod initialize-instance ((olaid srecode-overlaid) &optional args)
+  "Initialize OLAID, being sure it archived."
+  ;; Extract :start and :end from the olaid list.
+  (let ((newargs nil)
+	(olay nil)
+	start end
+	)
+
+    (while args
+      (cond ((eq (car args) :start)
+	     (setq args (cdr args))
+	     (setq start (car args))
+	     (setq args (cdr args))
+	     )
+	    ((eq (car args) :end)
+	     (setq args (cdr args))
+	     (setq end (car args))
+	     (setq args (cdr args))
+	     )
+	    (t
+	     (push (car args) newargs)
+	     (setq args (cdr args))
+	     (push (car args) newargs)
+	     (setq args (cdr args)))
+	    ))
+
+    ;; Create a temporary overlay now.  We have to use an overlay and
+    ;; not a marker becaues of the in-front insertion rules.  The rules
+    ;; are backward from what is wanted while typing.
+    (setq olay (srecode-make-overlay start end (current-buffer) t nil))
+    (srecode-overlay-put olay 'srecode-init-only t)
+
+    (oset olaid overlay olay)
+    (call-next-method olaid (nreverse newargs))
+
+    ))
+
+(defmethod srecode-overlaid-activate ((olaid srecode-overlaid))
+  "Activate the overlaid area."
+  (let* ((ola (oref olaid overlay))
+	 (start (srecode-overlay-start ola))
+	 (end (srecode-overlay-end ola))
+	 ;; Create a new overlay here.
+	 (ol (srecode-make-overlay start end (current-buffer) nil t)))
+
+    ;; Remove the old one.
+    (srecode-overlay-delete ola)
+
+    (srecode-overlay-put ol 'srecode olaid)
+
+    (oset olaid overlay ol)
+
+    ))
+
+(defmethod srecode-delete ((olaid srecode-overlaid))
+  "Delete the overlay from OLAID."
+  (srecode-overlay-delete (oref olaid overlay))
+  (slot-makeunbound olaid 'overlay)
+  )
+
+(defmethod srecode-empty-region-p ((olaid srecode-overlaid))
+  "Return non-nil if the region covered by OLAID is of length 0."
+  (= 0 (srecode-region-size olaid)))
+
+(defmethod srecode-region-size ((olaid srecode-overlaid))
+  "Return the length of region covered by OLAID."
+  (let ((start (srecode-overlay-start (oref olaid overlay)))
+	(end (srecode-overlay-end (oref olaid overlay))))
+    (- end start)))
+
+(defmethod srecode-point-in-region-p ((olaid srecode-overlaid))
+  "Return non-nil if point is in the region of OLAID."
+  (let ((start (srecode-overlay-start (oref olaid overlay)))
+	(end (srecode-overlay-end (oref olaid overlay))))
+    (and (>= (point) start) (<= (point) end))))
+
+(defun srecode-overlaid-at-point (class)
+  "Return a list of overlaid fields of type CLASS at point."
+  (let ((ol (srecode-overlays-at (point)))
+	(ret nil))
+    (while ol
+      (let ((tmp (srecode-overlay-get (car ol) 'srecode)))
+	(when (and tmp (object-of-class-p tmp class))
+	  (setq ret (cons tmp ret))))
+      (setq ol (cdr ol)))
+    (car (nreverse ret))))
+
+(defmethod srecode-overlaid-text ((olaid srecode-overlaid) &optional set-to)
+  "Return the text under OLAID.
+If SET-TO is a string, then replace the text of OLAID wit SET-TO."
+  (let* ((ol (oref olaid overlay))
+	 (start (srecode-overlay-start ol)))
+    (if (not (stringp set-to))
+	;; Just return it.
+	(buffer-substring-no-properties start (srecode-overlay-end ol))
+      ;; Replace it.
+      (save-excursion
+	(delete-region start (srecode-overlay-end ol))
+	(goto-char start)
+	(insert set-to)
+	(srecode-overlay-move ol start (+ start (length set-to))))
+      nil)))
+
+;;; INSERTED REGION
+;;
+;; Managing point-exit, and flushing fields.
+
+(defclass srecode-template-inserted-region (srecode-overlaid)
+  ((fields :documentation
+	   "A list of field overlays in this region.")
+   (active-region :allocation :class
+		  :initform nil
+		  :documentation
+		  "The template region currently being handled.")
+   )
+  "Manage a buffer region in which fields exist.")
+
+(defmethod initialize-instance ((ir srecode-template-inserted-region)
+				&rest args)
+  "Initialize IR, capturing the active fields, and creating the overlay."
+  ;; Fill in the fields
+  (oset ir fields srecode-field-archive)
+  (setq srecode-field-archive nil)
+
+  ;; Initailize myself first.
+  (call-next-method)
+  )
+
+(defmethod srecode-overlaid-activate ((ir srecode-template-inserted-region))
+  "Activate the template area for IR."
+  ;; Activate all our fields
+
+  (dolist (F (oref ir fields))
+    (srecode-overlaid-activate F))
+
+  ;; Activate our overlay.
+  (call-next-method)
+
+  ;; Position the cursor at the first field
+  (let ((first (car (oref ir fields))))
+    (goto-char (srecode-overlay-start (oref first overlay))))
+
+  ;; Set ourselves up as 'active'
+  (oset ir active-region ir)
+
+  ;; Setup the post command hook.
+  (add-hook 'post-command-hook 'srecode-field-post-command t t)
+  )
+
+(defmethod srecode-delete ((ir srecode-template-inserted-region))
+  "Call into our base, but also clear out the fields."
+  ;; Clear us out of the baseclass.
+  (oset ir active-region nil)
+  ;; Clear our fields.
+  (mapc 'srecode-delete (oref ir fields))
+  ;; Call to our base
+  (call-next-method)
+  ;; Clear our hook.
+  (remove-hook 'post-command-hook 'srecode-field-post-command t)
+  )
+
+(defsubst srecode-active-template-region ()
+  "Return the active region for template fields."
+  (oref srecode-template-inserted-region active-region))
+
+(defun srecode-field-post-command ()
+  "Srecode field handler in the post command hook."
+  (let ((ar (srecode-active-template-region))
+	)
+    (if (not ar)
+	;; Find a bug and fix it.
+	(remove-hook 'post-command-hook 'srecode-field-post-command t)
+      (if (srecode-point-in-region-p ar)
+	  nil ;; Keep going
+	;; We moved out of the template.  Cancel the edits.
+	(srecode-delete ar)))
+    ))
+
+;;; FIELDS
+;;
+;;;###autoload
+(defclass srecode-field (srecode-overlaid)
+  ((tail :documentation
+	 "Overlay used on character just after this field.
+Used to provide useful keybindings there.")
+   (name :initarg :name
+	 :documentation
+	 "The name of this field.
+Usually initialized from the dictionary entry name that
+the users needs to edit.")
+   (prompt :initarg :prompt
+	   :documentation
+	   "A prompt string to use if this were in the minibuffer.
+Display when the cursor enters this field.")
+   (read-fcn :initarg :read-fcn
+	     :documentation
+	     "A function that would be used to read a string.
+Try to use this to provide useful completion when available.")
+   )
+  "Representation of one field.")
+
+(defvar srecode-field-keymap
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-i" 'srecode-field-next)
+    (define-key km "\M-\C-i" 'srecode-field-prev)
+    (define-key km "\C-e" 'srecode-field-end)
+    (define-key km "\C-a" 'srecode-field-start)
+    (define-key km "\M-m" 'srecode-field-start)
+    (define-key km "\C-c\C-c" 'srecode-field-exit-ask)
+    km)
+  "Keymap applied to field overlays.")
+
+(defmethod initialize-instance ((field srecode-field) &optional args)
+  "Initialize FIELD, being sure it archived."
+  (add-to-list 'srecode-field-archive field t)
+  (call-next-method)
+  )
+
+(defmethod srecode-overlaid-activate ((field srecode-field))
+  "Activate the FIELD area."
+  (call-next-method)
+
+  (let* ((ol (oref field overlay))
+	 (end nil)
+	 (tail nil))
+    (srecode-overlay-put ol 'face 'srecode-field-face)
+    (srecode-overlay-put ol 'keymap srecode-field-keymap)
+    (srecode-overlay-put ol 'modification-hooks '(srecode-field-mod-hook))
+    (srecode-overlay-put ol 'insert-behind-hooks '(srecode-field-behind-hook))
+    (srecode-overlay-put ol 'insert-in-front-hooks '(srecode-field-mod-hook))
+
+    (setq end (srecode-overlay-end ol))
+    (setq tail (srecode-make-overlay end (+ end 1) (current-buffer)))
+
+    (srecode-overlay-put tail 'srecode field)
+    (srecode-overlay-put tail 'keymap srecode-field-keymap)
+    (srecode-overlay-put tail 'face 'srecode-field-face)
+    (oset field tail tail)
+    )
+  )
+
+(defmethod srecode-delete ((olaid srecode-field))
+  "Delete our secondary overlay."
+  ;; Remove our spare overlay
+  (srecode-overlay-delete (oref olaid tail))
+  (slot-makeunbound olaid 'tail)
+  ;; Do our baseclass work.
+  (call-next-method)
+  )
+
+(defvar srecode-field-replication-max-size 100
+  "Maximum size of a field before cancelling replication.")
+
+(defun srecode-field-mod-hook (ol after start end &optional pre-len)
+  "Modification hook for the field overlay.
+OL is the overlay.
+AFTER is non-nil if it is called after the change.
+START and END are the bounds of the change.
+PRE-LEN is used in the after mode for the length of the changed text."
+  (when (and after (not undo-in-progress))
+    (let* ((field (srecode-overlay-get ol 'srecode))
+	   (inhibit-point-motion-hooks t)
+	   (inhibit-modification-hooks t)
+	   )
+      ;; Sometimes a field is deleted, but we might still get a stray
+      ;; event.  Lets just ignore those events.
+      (when (slot-boundp field 'overlay)
+	;; First, fixup the two overlays, in case they got confused.
+	(let ((main (oref field overlay))
+	      (tail (oref field tail)))
+	  (srecode-overlay-move main
+				(srecode-overlay-start main)
+				(1- (srecode-overlay-end tail)))
+	  (srecode-overlay-move tail
+				(1- (srecode-overlay-end tail))
+				(srecode-overlay-end tail)))
+	;; Now capture text from the main overlay, and propagate it.
+	(let* ((new-text (srecode-overlaid-text field))
+	       (region (srecode-active-template-region))
+	       (allfields (when region (oref region fields)))
+	       (name (oref field name)))
+	  (dolist (F allfields)
+	    (when (and (not (eq F field))
+		       (string= name (oref F name)))
+	      (if (> (length new-text) srecode-field-replication-max-size)
+		  (message "Field size too large for replication.")
+		;; If we find other fields with the same name, then keep
+		;; then all together.  Disable change hooks to make sure
+		;; we don't get a recursive edit.
+		(srecode-overlaid-text F new-text)
+		))))
+	))))
+
+(defun srecode-field-behind-hook (ol after start end &optional pre-len)
+  "Modification hook for the field overlay.
+OL is the overlay.
+AFTER is non-nil if it is called after the change.
+START and END are the bounds of the change.
+PRE-LEN is used in the after mode for the length of the changed text."
+  (when after
+    (let* ((field (srecode-overlay-get ol 'srecode))
+	   )
+      (srecode-overlay-move ol (srecode-overlay-start ol) end)
+      (srecode-field-mod-hook ol after start end pre-len))
+    ))
+
+(defmethod srecode-field-goto ((field srecode-field))
+  "Goto the FIELD."
+  (goto-char (srecode-overlay-start (oref field overlay))))
+
+(defun srecode-field-next ()
+  "Move to the next field."
+  (interactive)
+  (let* ((f (srecode-overlaid-at-point 'srecode-field))
+	 (tr (srecode-overlaid-at-point 'srecode-template-inserted-region))
+	 )
+    (when (not f) (error "Not in a field"))
+    (when (not tr) (error "Not in a template region"))
+
+    (let ((fields (oref tr fields)))
+      (while fields
+	;; Loop over fields till we match.  Then move to the next one.
+	(when (eq f (car fields))
+	  (if (cdr fields)
+	      (srecode-field-goto (car (cdr fields)))
+	    (srecode-field-goto (car (oref tr fields))))
+	  (setq fields nil)
+	  )
+	(setq fields (cdr fields))))
+    ))
+
+(defun srecode-field-prev ()
+  "Move to the prev field."
+  (interactive)
+  (let* ((f (srecode-overlaid-at-point 'srecode-field))
+	 (tr (srecode-overlaid-at-point 'srecode-template-inserted-region))
+	 )
+    (when (not f) (error "Not in a field"))
+    (when (not tr) (error "Not in a template region"))
+
+    (let ((fields (reverse (oref tr fields))))
+      (while fields
+	;; Loop over fields till we match.  Then move to the next one.
+	(when (eq f (car fields))
+	  (if (cdr fields)
+	      (srecode-field-goto (car (cdr fields)))
+	    (srecode-field-goto (car (oref tr fields))))
+	  (setq fields nil)
+	  )
+	(setq fields (cdr fields))))
+    ))
+
+(defun srecode-field-end ()
+  "Move to the end of this field."
+  (interactive)
+  (let* ((f (srecode-overlaid-at-point 'srecode-field)))
+    (goto-char (srecode-overlay-end (oref f overlay)))))
+
+(defun srecode-field-start ()
+  "Move to the end of this field."
+  (interactive)
+  (let* ((f (srecode-overlaid-at-point 'srecode-field)))
+    (goto-char (srecode-overlay-start (oref f overlay)))))
+
+(defun srecode-field-exit-ask ()
+  "Ask if the user wants to exit field-editing mini-mode."
+  (interactive)
+  (when (or (not srecode-fields-exit-confirmation)
+	    (y-or-n-p "Exit field-editing mode? "))
+    (srecode-delete (srecode-active-template-region))))
+
+;;; TESTS
+;;
+;; Test out field modification w/out using srecode templates.
+;;
+(defvar srecode-field-utest-text
+  "This is a test buffer.
+
+It is filled with some text."
+  "Text for tests.")
+
+;;;###autoload
+(defun srecode-field-utest ()
+  "Test the srecode field manager."
+  (interactive)
+  (if (featurep 'xemacs)
+      (message "There is no XEmacs support for SRecode Fields.")
+    (srecode-field-utest-impl)))
+
+(defun srecode-field-utest-impl ()
+  "Implementation of the SRecode field utest."
+  (save-excursion
+    (find-file "/tmp/srecode-field-test.txt")
+
+    (erase-buffer)
+    (goto-char (point-min))
+    (insert srecode-field-utest-text)
+    (set-buffer-modified-p nil)
+
+    ;; Test basic field generation.
+    (let ((srecode-field-archive nil)
+	  (f nil))
+
+      (end-of-line)
+      (forward-word -1)
+
+      (setq f (srecode-field "Test"
+			     :name "TEST"
+			     :start 6
+			     :end 8))
+
+      (when (or (not (slot-boundp f 'overlay)) (not (oref f overlay)))
+	(error "Field test: Overlay info not created for field"))
+
+      (when (and (srecode-overlay-p (oref f overlay))
+		 (not (srecode-overlay-get (oref f overlay) 'srecode-init-only)))
+	(error "Field creation overlay is not tagged w/ init flag"))
+
+      (srecode-overlaid-activate f)
+
+      (when (or (not (srecode-overlay-p (oref f overlay)))
+		(srecode-overlay-get (oref f overlay) 'srecode-init-only))
+	(error "New field overlay not created during activation"))
+
+      (when (not (= (length srecode-field-archive) 1))
+	(error "Field test: Incorrect number of elements in the field archive"))
+      (when (not (eq f (car srecode-field-archive)))
+	(error "Field test: Field did not auto-add itself to the field archive"))
+
+      (when (not (srecode-overlay-get (oref f overlay) 'keymap))
+	(error "Field test: Overlay keymap not set"))
+
+      (when (not (string= "is" (srecode-overlaid-text f)))
+	(error "Field test: Expected field text 'is', not %s"
+	       (srecode-overlaid-text f)))
+
+      ;; Test deletion.
+      (srecode-delete f)
+
+      (when (slot-boundp f 'overlay)
+	(error "Field test: Overlay not deleted after object delete"))
+      )
+
+    ;; Test basic region construction.
+    (let* ((srecode-field-archive nil)
+	   (reg nil)
+	   (fields
+	    (list
+	     (srecode-field "Test1" :name "TEST-1" :start 5 :end 10)
+	     (srecode-field "Test2" :name "TEST-2" :start 15 :end 20)
+	     (srecode-field "Test3" :name "TEST-3" :start 25 :end 30)
+
+	     (srecode-field "Test4" :name "TEST-4" :start 35 :end 35))
+	    ))
+
+      (when (not (= (length srecode-field-archive) 4))
+	(error "Region Test: Found %d fields.  Expected 4"
+	       (length srecode-field-archive)))
+
+      (setq reg (srecode-template-inserted-region "REG"
+						  :start 4
+						  :end 40))
+
+      (srecode-overlaid-activate reg)
+
+      ;; Make sure it was cleared.
+      (when srecode-field-archive
+	(error "Region Test: Did not clear field archive"))
+
+      ;; Auto-positioning.
+      (when (not (eq (point) 5))
+	(error "Region Test: Did not reposition on first field"))
+
+      ;; Active region
+      (when (not (eq (srecode-active-template-region) reg))
+	(error "Region Test: Active region not set"))
+
+      ;; Various sizes
+      (mapc (lambda (T)
+	      (if (string= (object-name-string T) "Test4")
+		  (progn
+		    (when (not (srecode-empty-region-p T))
+		      (error "Field %s is not empty"
+			     (object-name T)))
+		    )
+		(when (not (= (srecode-region-size T) 5))
+		  (error "Calculated size of %s was not 5"
+			 (object-name T)))))
+	    fields)
+
+      ;; Make sure things stay up after a 'command'.
+      (srecode-field-post-command)
+      (when (not (eq (srecode-active-template-region) reg))
+	(error "Region Test: Active region did not stay up"))
+
+      ;; Test field movement.
+      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
+		     (nth 0 fields)))
+	(error "Region Test: Field %s not under point"
+	       (object-name (nth 0 fields))))
+
+      (srecode-field-next)
+
+      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
+		     (nth 1 fields)))
+	(error "Region Test: Field %s not under point"
+	       (object-name (nth 1 fields))))
+
+      (srecode-field-prev)
+
+      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
+		     (nth 0 fields)))
+	(error "Region Test: Field %s not under point"
+	       (object-name (nth 0 fields))))
+
+      ;; Move cursor out of the region and have everything cleaned up.
+      (goto-char 42)
+      (srecode-field-post-command)
+      (when (srecode-active-template-region)
+	(error "Region Test: Active region did not clear on move out"))
+
+      (mapc (lambda (T)
+	      (when (slot-boundp T 'overlay)
+		(error "Overlay did not clear off of of field %s"
+		       (object-name T))))
+	    fields)
+
+      ;; End of LET
+      )
+
+    ;; Test variable linkage.
+    (let* ((srecode-field-archive nil)
+	   (f1 (srecode-field "Test1" :name "TEST" :start 6 :end 8))
+	   (f2 (srecode-field "Test2" :name "TEST" :start 28 :end 30))
+	   (f3 (srecode-field "Test3" :name "NOTTEST" :start 35 :end 40))
+	   (reg (srecode-template-inserted-region "REG" :start 4 :end 40))
+	   )
+      (srecode-overlaid-activate reg)
+
+      (when (not (string= (srecode-overlaid-text f1)
+			  (srecode-overlaid-text f2)))
+	(error "Linkage Test: Init strings are not ="))
+      (when (string= (srecode-overlaid-text f1)
+		     (srecode-overlaid-text f3))
+	(error "Linkage Test: Init string on dissimilar fields is now the same"))
+
+      (goto-char 7)
+      (insert "a")
+
+      (when (not (string= (srecode-overlaid-text f1)
+			  (srecode-overlaid-text f2)))
+	(error "Linkage Test: mid-insert strings are not ="))
+      (when (string= (srecode-overlaid-text f1)
+		     (srecode-overlaid-text f3))
+	(error "Linkage Test: mid-insert string on dissimilar fields is now the same"))
+
+      (goto-char 9)
+      (insert "t")
+
+      (when (not (string= (srecode-overlaid-text f1) "iast"))
+	(error "Linkage Test: tail-insert failed to captured added char"))
+      (when (not (string= (srecode-overlaid-text f1)
+			  (srecode-overlaid-text f2)))
+	(error "Linkage Test: tail-insert strings are not ="))
+      (when (string= (srecode-overlaid-text f1)
+		     (srecode-overlaid-text f3))
+	(error "Linkage Test: tail-insert string on dissimilar fields is now the same"))
+
+      (goto-char 6)
+      (insert "b")
+
+      (when (not (string= (srecode-overlaid-text f1) "biast"))
+	(error "Linkage Test: tail-insert failed to captured added char"))
+      (when (not (string= (srecode-overlaid-text f1)
+			  (srecode-overlaid-text f2)))
+	(error "Linkage Test: tail-insert strings are not ="))
+      (when (string= (srecode-overlaid-text f1)
+		     (srecode-overlaid-text f3))
+	(error "Linkage Test: tail-insert string on dissimilar fields is now the same"))
+
+      ;; Cleanup
+      (srecode-delete reg)
+      )
+
+    (set-buffer-modified-p nil)
+
+    (message "   All field tests passed.")
+    ))
+
+(provide 'srecode-fields)
+;;; srecode-fields.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-filters.el b/site/cedet-1.0pre7/srecode/srecode-filters.el
new file mode 100644
index 0000000..5ec4154
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-filters.el
@@ -0,0 +1,68 @@
+;;; srecode-filters.el --- Filteres for use in template variables.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Various useful srecoder template functions.
+
+;;; Code:
+;;
+
+;;(defun srecode-BLAHBLAH (str)
+;;  "Filter some string..."
+;;  (let* ((tpl (srecode-peek srecode-template))
+;;	 (dict srecode-inserter-variable-current-dictionary))
+;;    
+;;    ))
+
+(condition-case nil
+    (require 'newcomment)
+  (error nil))
+
+(require 'srecode-table)
+(require 'srecode-insert)
+
+;;;###autoload
+(defun srecode-comment-prefix (str)
+  "Prefix each line of STR with the comment prefix characters."
+  (let* ((dict srecode-inserter-variable-current-dictionary)
+	 ;; Derive the comment characters to put in front of each line.
+	 (cs (or (and dict
+		      (srecode-dictionary-lookup-name dict "comment_prefix"))
+		 (and comment-multi-line comment-continue)
+		 (and (not comment-multi-line) comment-start)))
+	 (strs (split-string str "\n"))
+	 (newstr "")
+	 )
+    (while strs
+      (cond ((and (not comment-multi-line) (string= (car strs) ""))
+	     ; (setq newstr (concat newstr "\n")))
+	     )
+	    (t
+	     (setq newstr (concat newstr cs " " (car strs)))))
+      (setq strs (cdr strs))
+      (when strs (setq newstr (concat newstr "\n"))))
+    newstr))
+
+(provide 'srecode-filters)
+
+;;; srecode-filters.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-find.el b/site/cedet-1.0pre7/srecode/srecode-find.el
new file mode 100644
index 0000000..56b56a9
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-find.el
@@ -0,0 +1,286 @@
+;;;; srecode-find.el --- Tools for finding templates in the database.
+
+;; Copyright (C) 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Various routines that search through various template tables
+;; in search of the right template.
+
+(require 'srecode-ctxt)
+(require 'srecode-table)
+;;; Code:
+
+;;; Basics
+;;
+
+;;;###autoload
+(defun srecode-table (&optional mode)
+  "Return the currently active Semantic Recoder table for this buffer.
+Optional argument MODE specifies the mode table to use."
+  (let* ((modeq (or mode major-mode))
+	 (table (srecode-get-mode-table modeq)))
+
+    ;; If there isn't one, keep searching backwards for a table.
+    (while (and (not table) (setq modeq (get-mode-local-parent modeq)))
+      (setq table (srecode-get-mode-table modeq)))
+
+    ;; Last ditch effort.
+    (when (not table)
+      (setq table (srecode-get-mode-table 'default)))
+
+    table))
+
+;;; TRACKER
+;;
+;; Template file tracker for between sessions.
+;;
+;;;###autoload
+(defun srecode-load-tables-for-mode (mmode &optional appname)
+  "Load all the template files for MMODE.
+Templates are found in the SRecode Template Map.
+See `srecode-get-maps' for more.
+APPNAME is the name of an application.  In this case,
+all template files for that application will be loaded."
+  (let ((files
+	 (if appname
+	     (apply 'append
+		    (mapcar
+		     (lambda (map)
+		       (srecode-map-entries-for-app-and-mode map appname mmode))
+		     (srecode-get-maps)))
+	   (apply 'append
+		  (mapcar
+		   (lambda (map)
+		     (srecode-map-entries-for-mode map mmode))
+		   (srecode-get-maps)))))
+	)
+    ;; Don't recurse if we are already the 'default state.
+    (when (not (eq mmode 'default))
+      ;; Are we a derived mode?  If so, get the parent mode's
+      ;; templates loaded too.
+      (if (get-mode-local-parent mmode)
+	  (srecode-load-tables-for-mode (get-mode-local-parent mmode)
+					appname)
+	;; No parent mode, all templates depend on the defaults being
+	;; loaded in, so get that in instead.
+	(srecode-load-tables-for-mode 'default appname)))
+    
+    ;; Load in templates for our major mode.
+    (dolist (f files)
+      (let ((mt (srecode-get-mode-table mmode))
+	    )
+	  (when (or (not mt) (not (srecode-mode-table-find mt (car f))))
+	    (srecode-compile-file (car f)))
+	))
+    ))
+
+;;; PROJECT
+;;
+;; Find if a template table has a project set, and if so, is the
+;; current buffer in that project.
+(defmethod srecode-template-table-in-project-p ((tab srecode-template-table))
+  "Return non-nil if the table TAB can be used in the current project.
+If TAB has a :project set, check that the directories match.
+If TAB is nil, then always return t."
+  (let ((proj (oref tab :project)))
+    ;; Return t if the project wasn't set.
+    (if (not proj) t
+      ;; If the project directory was set, lets check it.
+      (let ((dd (expand-file-name default-directory))
+	    (projexp (regexp-quote (directory-file-name proj))))
+	(if (string-match (concat "^" projexp) dd)
+	    t nil)))))
+
+;;; SEARCH
+;;
+;; Find a given template based on name, and features of the current
+;; buffer.
+(defmethod srecode-template-get-table ((tab srecode-template-table)
+				       template-name &optional
+				       context application)
+  "Find in the template in table TAB, the template with TEMPLATE-NAME.
+Optional argument CONTEXT specifies that the template should part
+of a particular context.
+The APPLICATION argument is unused."
+  (when (srecode-template-table-in-project-p tab)
+    (if context
+	;; If a context is specified, then look it up there.
+	(let ((ctxth (gethash context (oref tab contexthash))))
+	  (when ctxth
+	    (gethash template-name ctxth)))
+      ;; No context, perhaps a merged name?
+      (gethash template-name (oref tab namehash)))))
+
+;;;###autoload
+(defmethod srecode-template-get-table ((tab srecode-mode-table)
+				       template-name &optional
+				       context application)
+  "Find in the template in mode table TAB, the template with TEMPLATE-NAME.
+Optional argument CONTEXT specifies a context a particular template
+would belong to.
+Optional argument APPLICATION restricts searches to only template tables
+belonging to a specific application.  If APPLICATION is nil, then only
+tables that do not belong to an application will be searched."
+  (let* ((mt tab)
+	 (tabs (oref mt :tables))
+	 (ans nil))
+    (while (and (not ans) tabs)
+      (let ((app (oref (car tabs) :application)))
+	(when (or (and (not application) (null app))
+		  (and application (eq app application)))
+	  (setq ans (srecode-template-get-table (car tabs) template-name
+						context)))
+	(setq tabs (cdr tabs))))
+    (or ans
+	;; Recurse to the default.
+	(when (not (equal (oref tab :major-mode) 'default))
+	  (srecode-template-get-table (srecode-get-mode-table 'default)
+				      template-name context application)))))
+
+;;
+;; Find a given template based on a key binding.
+;;
+(defmethod srecode-template-get-table-for-binding
+  ((tab srecode-template-table) binding &optional context)
+  "Find in the template name in table TAB, the template with BINDING.
+Optional argument CONTEXT specifies that the template should part
+of a particular context."
+  (when (srecode-template-table-in-project-p tab)
+    (let* ((keyout nil)
+	   (hashfcn (lambda (key value)
+		      (when (and (slot-boundp value 'binding)
+				 (oref value binding)
+				 (= (aref (oref value binding) 0) binding))
+			(setq keyout key))))
+	   (contextstr (cond ((listp context)
+			      (car-safe context))
+			     ((stringp context)
+			      context)
+			     (t nil)))
+	   )
+      (if context
+	  (let ((ctxth (gethash contextstr (oref tab contexthash))))
+	    (when ctxth
+	      ;; If a context is specified, then look it up there.
+	      (maphash hashfcn ctxth)
+	      ;; Context hashes EXCLUDE the context prefix which
+	      ;; we need to include, so concat it here
+	      (when keyout
+		(setq keyout (concat contextstr ":" keyout)))
+	      )))
+      (when (not keyout)
+	;; No context, or binding in context.  Try full hash.
+	(maphash hashfcn (oref tab namehash)))
+      keyout)))
+
+;;;###autoload
+(defmethod srecode-template-get-table-for-binding
+  ((tab srecode-mode-table) binding &optional context application)
+  "Find in the template name in mode table TAB, the template with BINDING.
+Optional argument CONTEXT specifies a context a particular template
+would belong to.
+Optional argument APPLICATION restricts searches to only template tables
+belonging to a specific application.  If APPLICATION is nil, then only
+tables that do not belong to an application will be searched."
+  (let* ((mt tab)
+	 (tabs (oref mt :tables))
+	 (ans nil))
+    (while (and (not ans) tabs)
+      (let ((app (oref (car tabs) :application)))
+	(when (or (and (not application) (null app))
+		  (and application (eq app application)))
+	  (setq ans (srecode-template-get-table-for-binding
+		     (car tabs) binding context)))
+	(setq tabs (cdr tabs))))
+    (or ans
+	;; Recurse to the default.
+	(when (not (equal (oref tab :major-mode) 'default))
+	  (srecode-template-get-table-for-binding
+	   (srecode-get-mode-table 'default) binding context)))))
+;;; Interactive
+;;
+;; Interactive queries into the template data.
+;;
+(defvar srecode-read-template-name-history nil
+  "History for completing reads for template names.")
+
+(defun srecode-all-template-hash (&optional mode hash)
+  "Create a hash table of all the currently available templates.
+Optional argument MODE is the major mode to look for.
+Optional argument HASH is the hash table to fill in."
+  (let* ((mhash (or hash (make-hash-table :test 'equal)))
+	 (mmode (or mode major-mode))
+	 (mp (get-mode-local-parent mmode))
+	 )
+    ;; Get the parent hash table filled into our current hash.
+    (when (not (eq mode 'default))
+      (if mp
+	  (srecode-all-template-hash mp mhash)
+	(srecode-all-template-hash 'default mhash)))
+    ;; Load up the hash table for our current mode.
+    (let* ((mt (srecode-get-mode-table mmode))
+	   (tabs (when mt (oref mt :tables)))
+	   )
+      (while tabs
+	;; Exclude templates for a perticular application.
+	(when (and (not (oref (car tabs) :application))
+		   (srecode-template-table-in-project-p (car tabs)))
+	  (maphash (lambda (key temp)
+		     (puthash key temp mhash)
+		     )
+		   (oref (car tabs) namehash)))
+	(setq tabs (cdr tabs)))
+      mhash)))
+
+(defun srecode-calculate-default-template-string (hash)
+  "Calculate the name of the template to use as a DEFAULT.
+Templates are read from HASH.
+Context into which the template is inserted is calculated
+with `srecode-calculate-context'."
+  (let* ((ctxt (srecode-calculate-context))
+	 (ans (concat (nth 0 ctxt) ":" (nth 1 ctxt))))
+    (if (gethash ans hash)
+	ans
+      ;; No hash at the specifics, at least offer
+      ;; the prefix for the completing read
+      (concat (nth 0 ctxt) ":"))))
+
+;;;###autoload
+(defun srecode-read-template-name (prompt &optional initial hist default)
+  "Completing read for Semantic Recoder template names.
+PROMPT is used to query for the name of the template desired.
+INITIAL is the initial string to use.
+HIST is a history variable to use.
+DEFAULT is what to use if the user presses RET."
+  (srecode-load-tables-for-mode major-mode)
+  (let* ((hash (srecode-all-template-hash))
+	 (def (or initial
+		  (srecode-calculate-default-template-string hash))))
+    (completing-read prompt hash
+		     nil t def
+		     (or hist
+			 'srecode-read-template-name-history))))
+
+
+
+(provide 'srecode-find)
+
+;;; srecode-find.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-getset.el b/site/cedet-1.0pre7/srecode/srecode-getset.el
new file mode 100644
index 0000000..6738549
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-getset.el
@@ -0,0 +1,371 @@
+;;; srecode-getset.el --- 
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; SRecoder application for inserting new get/set methods into a class.
+
+(require 'semantic)
+(require 'semantic-analyze)
+(require 'srecode-insert)
+(require 'srecode-dictionary)
+
+;;;###autoload
+(eval-after-load "srecode-mode"
+  ;; Once SRecode mode is loaded, then lets add ourself to the keymap.
+  '(progn
+     (srecode-add-code-generator 'srecode-insert-getset
+				 "Get/Set"
+				 "G")
+
+     ))
+
+;;; Code:
+(defvar srecode-insert-getset-fully-automatic-flag nil
+  "Non-nil means accept choices srecode comes up with without asking.")
+
+;;;###autoload
+(defun srecode-insert-getset (&optional class-in field-in)
+  "Insert get/set methods for the current class.
+CLASS-IN is the semantic tag of the class to update.
+FIELD-IN is the semantic tag, or string name, of the field to add.
+If you do not specify CLASS-IN or FIELD-IN then a class and field
+will be derived."
+  (interactive)
+
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'getset)
+
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+
+  (if (not (srecode-template-get-table (srecode-table)
+				       "getset-in-class"
+				       "declaration"
+				       'getset))
+      (error "No templates for inserting get/set"))
+
+  ;; Step 1: Try to derive the tag for the class we will use
+  (semantic-fetch-tags)
+  (let* ((class (or class-in (srecode-auto-choose-class (point))))
+	 (tagstart (when class (semantic-tag-start class)))
+	 (inclass (eq (semantic-current-tag-of-class 'type) class))
+	 (field nil)
+	 )
+
+    (when (not class)
+      (error "Move point to a class and try again"))
+
+    ;; Step 2: Select a name for the field we will use.
+    (when field-in
+      (setq field field-in))
+
+    (when (and inclass (not field))
+      (setq field (srecode-auto-choose-field (point))))
+
+    (when (not field)
+      (setq field (srecode-query-for-field class)))
+
+    ;; Step 3: Insert a new field if needed
+    (when (stringp field)
+
+      (goto-char (point))
+      (srecode-position-new-field class inclass)
+
+      (let* ((dict (srecode-create-dictionary))
+	     (temp (srecode-template-get-table (srecode-table)
+					       "getset-field"
+					       "declaration"
+					       'getset))
+	     )
+	(when (not temp)
+	  (error "Getset templates for %s not loaded!" major-mode))
+	(srecode-resolve-arguments temp dict)
+	(srecode-dictionary-set-value dict "NAME" field)
+	(when srecode-insert-getset-fully-automatic-flag
+	  (srecode-dictionary-set-value dict "TYPE" "int"))
+	(srecode-insert-fcn temp dict)
+
+	(semantic-fetch-tags)
+	(save-excursion
+	  (goto-char tagstart)
+	  ;; Refresh our class tag.
+	  (setq class (srecode-auto-choose-class (point)))
+	  )
+
+	(let ((tmptag (semantic-deep-find-tags-by-name-regexp
+		       field (current-buffer))))
+	  (setq tmptag (semantic-find-tags-by-class 'variable tmptag))
+
+	  (if tmptag
+	      (setq field (car tmptag))
+	    (error "Could not find new field %s" field)))
+	)
+
+      ;; Step 3.5: Insert an initializer if needed.
+      ;; ...
+      
+
+      ;; Set up for the rest.
+      )
+
+    (if (not (semantic-tag-p field))
+	(error "Must specify field for get/set.  (parts may not be impl'd yet.)"))
+
+    ;; Set 4: Position for insertion of methods
+    (srecode-position-new-methods class field)
+
+    ;; Step 5: Insert the get/set methods
+    (if (not (eq (semantic-current-tag) class))
+	;; We are positioned on top of something else.
+	;; insert a /n
+	(insert "\n"))
+
+    (let* ((dict (srecode-create-dictionary))
+	   (srecode-semantic-selected-tag field)
+	   (temp (srecode-template-get-table (srecode-table)
+					     "getset-in-class"
+					     "declaration"
+					     'getset))
+	   )
+      (if (not temp)
+	  (error "Getset templates for %s not loaded!" major-mode))
+      (srecode-resolve-arguments temp dict)
+      (srecode-dictionary-set-value dict "GROUPNAME"
+				    (concat (semantic-tag-name field)
+					    " Accessors"))
+      (srecode-dictionary-set-value dict "NICENAME"
+				    (srecode-strip-fieldname
+				     (semantic-tag-name field)))
+      (srecode-insert-fcn temp dict)
+      )))
+
+(defun srecode-strip-fieldname (name)
+  "Strip the fieldname NAME of polish notation things."
+  (cond ((string-match "[a-z]\\([A-Z]\\w+\\)" name)
+	 (substring name (match-beginning 1)))
+	;; Add more rules here.
+	(t
+	 name)))
+
+(defun srecode-position-new-methods (class field)
+  "Position the cursor in CLASS where new getset methods should go.
+FIELD is the field for the get sets.
+INCLASS specifies if the cursor is already in CLASS or not."
+  (semantic-go-to-tag field)
+
+  (let ((prev (semantic-find-tag-by-overlay-prev))
+	(next (semantic-find-tag-by-overlay-next))
+	(setname nil)
+	(aftertag nil)
+	)
+    (cond
+     ((and prev (semantic-tag-of-class-p prev 'variable))
+      (setq setname
+	    (concat "set"
+		    (srecode-strip-fieldname (semantic-tag-name prev))))
+      )
+     ((and next (semantic-tag-of-class-p next 'variable))
+      (setq setname
+	    (concat "set"
+		    (srecode-strip-fieldname (semantic-tag-name prev)))))
+     (t nil))
+
+    (setq aftertag (semantic-find-first-tag-by-name
+		    setname (semantic-tag-type-members class)))
+
+    (when (not aftertag)
+      (setq aftertag (car-safe
+		      (semantic--find-tags-by-macro
+		       (semantic-tag-get-attribute (car tags) :destructor-flag)
+		       (semantic-tag-type-members class))))
+      ;; Make sure the tag is public
+      (when (not (eq (semantic-tag-protection aftertag class) 'public))
+	(setq aftertag nil))
+      )
+
+    (if (not aftertag)
+	(setq aftertag (car-safe
+			(semantic--find-tags-by-macro
+			 (semantic-tag-get-attribute (car tags) :constructor-flag)
+			 (semantic-tag-type-members class))))
+      ;; Make sure the tag is public
+      (when (not (eq (semantic-tag-protection aftertag class) 'public))
+	(setq aftertag nil))
+      )
+
+    (when (not aftertag)
+      (setq aftertag (semantic-find-first-tag-by-name
+		      "public" (semantic-tag-type-members class))))
+
+    (when (not aftertag)
+      (setq aftertag (car (semantic-tag-type-members class))))
+
+    (if aftertag
+	(let ((te (semantic-tag-end aftertag)))
+	  (when (not te)
+	    (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag)))
+	  (goto-char te)
+	  ;; If there is a comment immediatly after aftertag, skip over it.
+	  (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex))
+	    (let ((pos (point))
+		  (rnext (semantic-find-tag-by-overlay-next (point))))
+	      (forward-comment 1)
+	      ;; Make sure the comment we skipped didn't say anything about
+	      ;; the rnext tag.
+	      (when (and rnext
+			 (re-search-backward
+			  (regexp-quote (semantic-tag-name rnext)) pos t))
+		;; It did mention rnext, so go back to our starting position.
+		(goto-char pos)
+		)
+	      ))
+	  )
+
+      ;; At the very beginning of the class.
+      (goto-char (semantic-tag-end class))
+      (forward-sexp -1)
+      (forward-char 1)
+
+      )
+
+    (end-of-line)
+    (forward-char 1)
+    ))
+
+(defun srecode-position-new-field (class inclass)
+  "Select a position for a new field for CLASS.
+If INCLASS is non-nil, then the cursor is already in the class
+and should not be moved during point selection."
+  
+  ;; If we aren't in the class, get the cursor there, pronto!
+  (when (not inclass)
+
+    (error "You must position the cursor where to insert the new field")
+
+    (let ((kids (semantic-find-tags-by-class
+		 'variable (semantic-tag-type-members class))))
+      (cond (kids
+	     (semantic-go-to-tag (car kids) class))
+	    (t
+	     (semantic-go-to-tag class)))
+      )
+
+    (switch-to-buffer (current-buffer))
+
+    ;; Once the cursor is in our class, ask the user to position
+    ;; the cursor to keep going.
+    )
+
+  (if (or srecode-insert-getset-fully-automatic-flag
+	  (y-or-n-p "Insert new field here? "))
+      nil
+    (error "You must position the cursor where to insert the new field first"))
+  )
+
+
+
+(defun srecode-auto-choose-field (point)
+  "Choose a field for the get/set methods.
+Base selection on the field related to POINT."
+  (save-excursion
+    (when point
+      (goto-char point))
+
+    (let ((field (semantic-current-tag-of-class 'variable)))
+      
+      ;; If we get a field, make sure the user gets a chance to choose.
+      (when field
+	(if srecode-insert-getset-fully-automatic-flag
+	    nil
+	  (when (not (y-or-n-p
+		      (format "Use field %s? " (semantic-tag-name field))))
+	    (setq field nil))
+	  ))
+      field)))
+
+(defun srecode-query-for-field (class)
+  "Query for a field in CLASS."
+  (let* ((kids (semantic-find-tags-by-class
+		'variable (semantic-tag-type-members class)))
+	 (sel (completing-read "Use Field: " kids))
+	 )
+
+    (or (semantic-find-tags-by-name sel kids)
+	sel)
+    ))
+
+(defun srecode-auto-choose-class (point)
+  "Choose a class based on locatin of POINT."
+  (save-excursion
+    (when point
+      (goto-char point))
+    
+    (let ((tag (semantic-current-tag-of-class 'type)))
+
+      (when (or (not tag)
+		(not (string= (semantic-tag-type tag) "class")))
+	;; The current tag is not a class.  Are we in a fcn
+	;; that is a method?
+	(setq tag (semantic-current-tag-of-class 'function))
+
+	(when (and tag
+		   (semantic-tag-function-parent tag))
+	  (let ((p (semantic-tag-function-parent tag)))
+	    ;; @TODO : Copied below out of semantic-analyze
+	    ;;         Turn into a routine.
+
+	    (let* ((searchname (cond ((stringp p) p)
+				     ((semantic-tag-p p)
+				      (semantic-tag-name p))
+				     ((and (listp p) (stringp (car p)))
+				      (car p))))
+		   (ptag (semantic-analyze-find-tag searchname
+						    'type nil)))
+	      (when ptag (setq tag ptag ))
+	      ))))
+
+      (when (or (not tag)
+		(not (semantic-tag-of-class-p tag 'type))
+		(not (string= (semantic-tag-type tag) "class")))
+	;; We are not in a class that needs a get/set method.
+	;; Analyze the current context, and derive a class name.
+	(let* ((ctxt (semantic-analyze-current-context))
+	       (pfix nil)
+	       (ans nil))
+	  (when ctxt
+	    (setq pfix (reverse (oref ctxt prefix)))
+	    (while (and (not ans) pfix)
+	      ;; Start at the end and back up to the first class.
+	      (when (and (semantic-tag-p (car pfix))
+			 (semantic-tag-of-class-p (car pfix) 'type)
+			 (string= (semantic-tag-type (car pfix))
+				  "class"))
+		(setq ans (car pfix)))
+	      (setq pfix (cdr pfix))))
+	  (setq tag ans)))
+
+      tag)))
+
+(provide 'srecode-getset)
+
+;;; srecode-getset.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-insert.el b/site/cedet-1.0pre7/srecode/srecode-insert.el
new file mode 100644
index 0000000..0c64a21
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-insert.el
@@ -0,0 +1,997 @@
+;;; srecode-insert --- Insert srecode templates to an output stream.
+
+;;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: srecode-insert.el,v 1.34 2010/02/18 22:45:09 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Define and implements specific inserter objects.
+;;
+;; Manage the insertion process for a template.
+;;
+
+(require 'srecode-compile)
+(require 'srecode-find)
+(require 'srecode-dictionary)
+(eval-when-compile
+  (require 'srecode-fields))
+
+;;; Code:
+
+(defcustom srecode-insert-ask-variable-method 'ask
+  "Determine how to ask for a dictionary value when inserting a template.
+Only the ASK style inserter will query the user for a value.
+Dictionary value references that ask begin with the ? character.
+Possible values are:
+  'ask   - Prompt in the minibuffer as the value is inserted.
+  'field - Use the dictionary macro name as the inserted value,
+           and place a field there.  Matched fields change together.
+
+NOTE: The field feature does not yet work with XEmacs."
+  :group 'srecode
+  :type '(choice (const :tag "Ask" ask)
+		 (cons :tag "Field" field)))
+
+(defvar srecode-insert-with-fields-in-progress nil
+  "Non-nil means that we are actively inserting a template with fields.")
+
+;;; INSERTION COMMANDS
+;;
+;; User level commands for inserting stuff.
+(defvar srecode-insertion-start-context nil
+  "The context that was at point at the beginning of the template insertion.")
+
+;;;###autoload
+(defun srecode-insert-again ()
+  "Insert the previously inserted template (by name) again."
+  (interactive)
+  (let ((prev (car srecode-read-template-name-history)))
+    (if prev
+	(srecode-insert prev)
+      (call-interactively 'srecode-insert))))
+
+;;;###autoload
+(defun srecode-insert (template-name &rest dict-entries)
+  "Inesrt the template TEMPLATE-NAME into the current buffer at point.
+DICT-ENTRIES are additional dictionary values to add."
+  (interactive (list (srecode-read-template-name "Template Name: ")))
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  (let ((newdict (srecode-create-dictionary))
+	(temp (srecode-template-get-table (srecode-table) template-name))
+	(srecode-insertion-start-context (srecode-calculate-context))
+	)
+    (if (not temp)
+	(error "No Template named %s" template-name))
+    (while dict-entries
+      (srecode-dictionary-set-value newdict
+				    (car dict-entries)
+				    (car (cdr dict-entries)))
+      (setq dict-entries (cdr (cdr dict-entries))))
+    (srecode-insert-fcn temp newdict)
+    ;; Don't put code here.  We need to return the end-mark
+    ;; for this insertion step.
+    ))
+
+;;;###autoload
+(defun srecode-insert-fcn (template dictionary &optional stream skipresolver)
+  "Insert TEMPLATE using DICTIONARY into STREAM.
+Optional SKIPRESOLVER means to avoid refreshing the tag list,
+or resolving any template arguments.  It is assumed the caller
+has set everything up already."
+  ;; Perform the insertion.
+  (let ((standard-output (or stream (current-buffer)))
+	(end-mark nil))
+    ;; Merge any template entries into the input dictionary.
+    (when (slot-boundp template 'dictionary)
+      (srecode-dictionary-merge dictionary (oref template dictionary)))
+
+    (unless skipresolver
+      ;; Make sure the semantic tags are up to date.
+      (semantic-fetch-tags)
+      ;; Resolve the arguments
+      (srecode-resolve-arguments template dictionary))
+    ;; Insert
+    (if (bufferp standard-output)
+	;; If there is a buffer, turn off various hooks.  This will cause
+	;; the mod hooks to be buffered up during the insert, but
+	;; prevent tools like font-lock from fontifying mid-template.
+	;; Especialy important during insertion of complex comments that
+	;; cause the new font-lock to comment-color stuff after the inserted
+	;; comment.
+	;;
+	;; I'm not sure about the motion hooks.  It seems like a good
+	;; idea though.
+	;;
+	;; Borrowed these concepts out of font-lock.
+	;;
+	;; I tried `combine-after-change-calls', but it did not have
+	;; the effect I wanted.
+	(let ((start (point)))
+	  (let ((inhibit-point-motion-hooks t)
+		(inhibit-modification-hooks t)
+		)
+	    (srecode--insert-into-buffer template dictionary)
+	    )
+	  ;; Now call those after change functions.
+	  (run-hook-with-args 'after-change-functions
+			      start (point) 0)
+	  )
+      (srecode-insert-method template dictionary))
+    ;; Handle specialization of the POINT inserter.
+    (when (and (bufferp standard-output)
+	       (slot-boundp 'srecode-template-inserter-point 'point)
+	       )
+      (set-buffer standard-output)
+      (setq end-mark (point-marker))
+      (goto-char  (oref srecode-template-inserter-point point)))
+    (oset-default 'srecode-template-inserter-point point eieio-unbound)
+
+    ;; Return the end-mark.
+    (or end-mark (point)))
+  )
+
+(defun srecode--insert-into-buffer (template dictionary)
+  "Insert a TEMPLATE with DICTIONARY into a buffer.
+Do not call this function yourself.  Instead use:
+  `srecode-insert' - Inserts by name.
+  `srecode-insert-fcn' - Insert with objects.
+This function handles the case from one of the above functions when
+the template is inserted into a buffer.  It looks
+at `srecode-insert-ask-variable-method' to decide if unbound dictionary
+entries ask questions or insert editable fields.
+
+Buffer based features related to change hooks is handled one level up."
+  ;; This line prevents the field archive from being let bound
+  ;; while the field insert tool is loaded via autoloads during
+  ;; the insert.
+  (when (eq srecode-insert-ask-variable-method 'field)
+    (require 'srecode-fields))
+
+  (let ((srecode-field-archive nil) ; Prevent field leaks during insert
+	(start (point)) ; Beginning of the region.
+	)
+    ;; This sub-let scopes the 'in-progress' piece so we know
+    ;; when to setup the end-template.
+    (let ((srecode-insert-with-fields-in-progress
+	   (if (eq srecode-insert-ask-variable-method 'field) t nil))
+	  )
+      (srecode-insert-method template dictionary)
+      )
+    ;; If we are not in-progress, and we insert fields, then
+    ;; create the end-template with fields editable area.
+    (when (and (not srecode-insert-with-fields-in-progress)
+	       (eq srecode-insert-ask-variable-method 'field) ; Only if user asked
+	       srecode-field-archive ; Only if there were fields created
+	       )
+      (let ((reg
+	     ;; Create the field-driven editable area.
+	     (srecode-template-inserted-region
+	      "TEMPLATE" :start start :end (point))))
+	(srecode-overlaid-activate reg))
+      )
+    ;; We return with 'point being the end of the template insertion
+    ;; area.  Return value is not important.
+    ))
+
+;;; TEMPLATE ARGUMENTS
+;;
+;; Some templates have arguments.  Each argument is assocaited with
+;; a function that can resolve the inputs needed.
+(defun srecode-resolve-arguments (temp dict)
+  "Resolve all the arguments needed by the template TEMP.
+Apply anything learned to the dictionary DICT."
+  (srecode-resolve-argument-list (oref temp args) dict temp))
+
+(defun srecode-resolve-argument-list (args dict &optional temp)
+  "Resolve arguments in the argument list ARGS.
+ARGS is a list of symbols, such as :blank, or :file.
+Apply values to DICT.
+Optional argument TEMP is the template that is getting it's arguments resolved."
+  (let ((fcn nil))
+    (while args
+      (setq fcn (intern-soft (concat "srecode-semantic-handle-"
+				     (symbol-name (car args)))))
+      (if (not fcn)
+	  (error "Error resolving template argument %S" (car args)))
+      (if temp
+	  (condition-case nil
+	      ;; Allow some to accept a 2nd argument optionally.
+	      ;; They throw an error if not available, so try again.
+	      (funcall fcn dict temp)
+	    (wrong-number-of-arguments (funcall fcn dict)))
+	(funcall fcn dict))
+      (setq args (cdr args)))
+    ))
+
+;;; INSERTION STACK & METHOD
+;;
+;; Code managing the top-level insert method and the current
+;; insertion stack.
+;; 
+(defmethod srecode-push ((st srecode-template))
+  "Push the srecoder template ST onto the active stack."
+  (oset st active (cons st (oref st active))))
+
+(defmethod srecode-pop :STATIC ((st srecode-template))
+  "Pop the srecoder template ST onto the active stack.
+ST can be a class, or an object."
+  (oset st active (cdr (oref st active))))
+
+(defmethod srecode-peek :STATIC ((st srecode-template))
+  "Fetch the topmost active template record.  ST can be a class."
+  (car (oref st active)))
+
+(defmethod srecode-insert-method ((st srecode-template) dictionary)
+  "Insert the srecoder template ST."
+  ;; Merge any template entries into the input dictionary.
+  ;; This may happen twice since some templates arguments need
+  ;; these dictionary values earlier, but these values always
+  ;; need merging for template inserting in other templates.
+  (when (slot-boundp st 'dictionary)
+    (srecode-dictionary-merge dictionary (oref st dictionary)))
+  ;; Do an insertion.
+  (unwind-protect
+      (let ((c (oref st code)))
+	(srecode-push st)
+	(srecode-insert-code-stream c dictionary))
+    ;; Poping the stack is protected
+    (srecode-pop st)))
+
+(defun srecode-insert-code-stream (code dictionary)
+  "Insert the CODE from a template into `standard-output'.
+Use DICTIONARY to resolve any macros."
+  (while code
+    (cond ((stringp (car code))
+	   (princ (car code)))
+	  (t
+	   (srecode-insert-method (car code) dictionary)))
+    (setq code (cdr code))))
+
+;;; INSERTERS
+;;
+;; Specific srecode inserters.
+;; The base class is from srecode-compile.
+;;
+;; Each inserter handles various macro codes from the temlate.
+;; The `code' slot specifies a character used to identify which
+;; inserter is to be created.
+;;
+(defclass srecode-template-inserter-newline (srecode-template-inserter)
+  ((key :initform "\n"
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   (hard :initform nil
+	 :initarg :hard
+	 :documentation
+	 "Is this a hard newline (always inserted) or optional?
+Optional newlines don't insert themselves if they are on a blank line
+by themselves.")
+   )
+  "Insert a newline, and possibly do indenting.
+Specify the :indent argument to enable automatic indentation when newlines
+occur in your template.")
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-newline)
+				  dictionary)
+  "Insert the STI inserter."
+  ;; To be safe, indent the previous line since the template will
+  ;; change what is there to indent
+  (let ((i (srecode-dictionary-lookup-name dictionary "INDENT"))
+	(inbuff (bufferp standard-output))
+	(doit t)
+	(pm (point-marker)))
+    (when (and inbuff (not (oref sti hard)))
+      ;; If this is not a hard newline, we need do the calculation
+      ;; and set "doit" to nil.
+      (beginning-of-line)
+      (save-restriction
+	(narrow-to-region (point) pm)
+	(when (looking-at "\\s-*$")
+	  (setq doit nil)))
+      (goto-char pm)
+      )
+    ;; Do indentation reguardless of the newline.
+    (when (and (eq i t) inbuff)
+      (indent-according-to-mode)
+      (goto-char pm))
+
+    (when doit
+      (princ "\n")
+      ;; Indent after the newline, particularly for numeric indents.
+      (cond ((and (eq i t) (bufferp standard-output))
+	     ;; WARNING - indent according to mode requires that standard-output
+	     ;;           is a buffer!
+	     ;; @todo - how to indent in a string???
+	     (setq pm (point-marker))
+	     (indent-according-to-mode)
+	     (goto-char pm))
+	    ((numberp i)
+	     (princ (make-string i " ")))
+	    ((stringp i)
+	     (princ i))))))
+
+(defmethod srecode-dump ((ins srecode-template-inserter-newline) indent)
+  "Dump the state of the SRecode template inserter INS."
+  (call-next-method)
+  (when (oref ins hard)
+    (princ " : hard")
+    ))
+
+(defclass srecode-template-inserter-blank (srecode-template-inserter)
+   ((key :initform "\r"
+	 :allocation :class
+	 :documentation
+	 "The character represeinting this inserter style.
+Can't be blank, or it might be used by regular variable insertion.")
+    (where :initform 'begin
+	   :initarg :where
+	   :documentation
+	   "This should be 'begin or 'end, indicating where to insrt a CR.
+When set to 'begin, it will insert a CR if we are not at 'bol'.
+When set to 'end it will insert a CR if we are not at 'eol'")
+    ;; @TODO - Add slot and control for the number of blank
+    ;;         lines before and after point.
+   )
+   "Insert a newline before and after a template, and possibly do indenting.
+Specify the :blank argument to enable this inserter.")
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-blank)
+				  dictionary)
+  "Make sure there is no text before or after point."
+  (let ((i (srecode-dictionary-lookup-name dictionary "INDENT"))
+	(inbuff (bufferp standard-output))
+	(pm (point-marker)))
+    (when (and inbuff 
+	       ;; Don't do this if we are not the active template.
+	       (= (length (oref srecode-template active)) 1))
+
+      (when (and (eq i t) inbuff (not (eq (oref sti where) 'begin)))
+	(indent-according-to-mode)
+	(goto-char pm))
+      
+      (cond ((and (eq (oref sti where) 'begin) (not (bolp)))
+	     (princ "\n"))
+	    ((eq (oref sti where) 'end)
+	     ;; If there is whitespace after pnt, then clear it out.
+	     (when (looking-at "\\s-*$")
+	       (delete-region (point) (point-at-eol)))
+	     (when (not (eolp))
+	       (princ "\n")))
+	    )
+      (setq pm (point-marker))
+      (when (and (eq i t) inbuff (not (eq (oref sti where) 'end)))
+	(indent-according-to-mode)
+	(goto-char pm))
+      )))
+
+(defclass srecode-template-inserter-comment (srecode-template-inserter)
+  ((key :initform ?!
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   )
+  "Allow comments within template coding.  This inserts nothing.")
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-comment)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (princ "! Miscellaneous text commenting in your template. ")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-comment)
+				  dictionary)
+  "Don't insert anything for comment macros in STI."
+  nil)
+
+
+(defclass srecode-template-inserter-variable (srecode-template-inserter)
+  ((key :initform nil
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style."))
+  "Insert the value of a dictionary entry
+If there is no entry, insert nothing.")
+
+(defvar srecode-inserter-variable-current-dictionary nil
+  "The active dictionary when calling a variable filter.")
+
+(defmethod srecode-insert-variable-secondname-handler
+  ((sti srecode-template-inserter-variable) dictionary value secondname)
+  "For VALUE handle SECONDNAME behaviors for this variable inserter.
+Return the result as a string.
+By default, treat as a function name.
+If SECONDNAME is nil, return VALUE."
+  (if secondname
+      (let ((fcnpart (read secondname)))
+	(if (fboundp fcnpart)
+	    (let ((srecode-inserter-variable-current-dictionary dictionary))
+	      (funcall fcnpart value))
+	  ;; Else, warn.
+	  (error "Variable insertion second arg %s is not a function."
+		 secondname)))
+    value))
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-variable)
+				  dictionary)
+  "Insert the STI inserter."
+  ;; Convert the name into a name/fcn pair
+  (let* ((name (oref sti :object-name))
+	 (fcnpart (oref sti :secondname))
+	 (val (srecode-dictionary-lookup-name 
+	       dictionary name))
+	 (do-princ t)
+	 )
+    ;; Alert if a macro wasn't found.
+    (when (not val)
+      (message "Warning: macro %S was not found in the dictionary." name)
+      (setq val ""))
+    ;; If there was a functional part, call that function.
+    (cond ;; Strings
+       ((stringp val)
+	(setq val (srecode-insert-variable-secondname-handler
+		   sti dictionary val fcnpart)))
+       ;; Compound data value
+       ((srecode-dictionary-compound-value-child-p val)
+	;; Force FCN to be a symbol
+	(when fcnpart (setq fcnpart (read fcnpart)))
+	;; Convert compound value to a string with the fcn.
+	(setq val (srecode-compound-toString val fcnpart dictionary))
+	;; If the value returned is nil, then it may be a special
+	;; field inserter that requires us to set do-princ to nil.
+	(when (not val)
+	  (setq do-princ nil)
+	  )
+	)
+       ;; Dictionaries... not allowed in this style
+       ((srecode-dictionary-child-p val)
+	(error "Macro %s cannot insert a dictionary.  Use section macros instead."
+	       name))
+       ;; Other stuff... convert
+       (t
+	(error "Macro %s cannot insert arbitrary data." name)
+	;;(if (and val (not (stringp val)))
+	;;    (setq val (format "%S" val))))
+	))
+    ;; Output the dumb thing unless the type of thing specifically
+    ;; did the inserting forus.
+    (when do-princ
+      (princ val))))
+
+(defclass srecode-template-inserter-ask (srecode-template-inserter-variable)
+  ((key :initform ??
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   (prompt :initarg :prompt
+	   :initform nil
+	   :documentation
+	   "The prompt used to query for this dictionary value.")
+   (defaultfcn :initarg :defaultfcn
+	       :initform nil
+	       :documentation
+	       "The function which can calculate a default value.")
+   (read-fcn :initarg :read-fcn
+	     :initform 'read-string
+	     :documentation
+	     "The function used to read in the text for this prompt.")
+   )
+  "Insert the value of a dictionary entry
+If there is no entry, prompt the user for the value to use.
+The prompt text used is derived from the previous PROMPT command in the
+template file.")
+
+(defmethod srecode-inserter-apply-state ((ins srecode-template-inserter-ask) STATE)
+  "For the template inserter INS, apply information from STATE.
+Loop over the prompts to see if we have a match."
+  (let ((prompts (oref STATE prompts))
+	)
+    (while prompts
+      (when (string= (semantic-tag-name (car prompts))
+		     (oref ins :object-name))
+	(oset ins :prompt 
+	      (semantic-tag-get-attribute (car prompts) :text))
+	(oset ins :defaultfcn
+	      (semantic-tag-get-attribute (car prompts) :default))
+	(oset ins :read-fcn
+	      (or (semantic-tag-get-attribute (car prompts) :read)
+		  'read-string))
+	)
+      (setq prompts (cdr prompts)))
+    ))
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-ask)
+				  dictionary)
+  "Insert the STI inserter."
+  (let ((val (srecode-dictionary-lookup-name 
+	      dictionary (oref sti :object-name))))
+    (if val
+	;; Does some extra work.  Oh well.
+	(call-next-method)
+
+      ;; How is our -ask value determined?
+      (if srecode-insert-with-fields-in-progress
+	  ;; Setup editable fields.
+	  (setq val (srecode-insert-method-field sti dictionary))
+	;; Ask the question...
+	(setq val (srecode-insert-method-ask sti dictionary)))
+
+      ;; After asking, save in the dictionary so that
+      ;; the user can use the same name again later.
+      (srecode-dictionary-set-value 
+       (srecode-root-dictionary dictionary)
+       (oref sti :object-name) val)
+
+      ;; Now that this value is safely stowed in the dictionary,
+      ;; we can do what regular inserters do.
+      (call-next-method))))
+
+(defmethod srecode-insert-ask-default ((sti srecode-template-inserter-ask)
+				       dictionary)
+  "Derive the default value for an askable inserter STI.
+DICTIONARY is used to derive some values."
+  (let ((defaultfcn (oref sti :defaultfcn)))
+    (cond ((stringp defaultfcn)
+	   defaultfcn)
+	  ((functionp defaultfcn)
+	   (funcall defaultfcn))
+	  ((and (listp defaultfcn)
+		(eq (car defaultfcn) 'macro))
+	   (srecode-dictionary-lookup-name
+	    dictionary (cdr defaultfcn)))
+	  ((null defaultfcn)
+	   "")
+	  (t
+	   (error "Unknown default for prompt: %S"
+		  defaultfcn)))))
+
+(defmethod srecode-insert-method-ask ((sti srecode-template-inserter-ask)
+				      dictionary)
+  "Do the \"asking\" for the template inserter STI.
+Use DICTIONARY to resolve values."
+  (let* ((prompt (oref sti prompt))
+	 (default (srecode-insert-ask-default sti dictionary))
+	 (reader (oref sti :read-fcn))
+	 (val nil)
+	 )
+    (cond ((eq reader 'y-or-n-p)
+	   (if (y-or-n-p (or prompt
+			     (format "%s? "
+				     (oref sti :object-name))))
+	       (setq val default)
+	     (setq val "")))
+	  ((eq reader 'read-char)
+	   (setq val (format
+		      "%c"
+		      (read-char (or prompt
+				     (format "Char for %s: "
+					     (oref sti :object-name))))))
+	   )
+	  (t
+	   (save-excursion
+	     (setq val (funcall reader
+				(or prompt
+				    (format "Specify %s: "
+					    (oref sti :object-name)))
+				default
+				)))))
+    ;; Return our derived value.
+    val)
+  )
+
+(defmethod srecode-insert-method-field ((sti srecode-template-inserter-ask)
+					dictionary)
+  "Create an editable field for the template inserter STI.
+Use DICTIONARY to resolve values."
+  (let* ((default (srecode-insert-ask-default sti dictionary))
+	 (compound-value
+	  (srecode-field-value (oref sti :object-name)
+			       :firstinserter sti
+			       :defaultvalue default))
+	 )
+    ;; Return this special compound value as the thing to insert.
+    ;; This special compound value will repeat our asked question
+    ;; across multiple locations.
+    compound-value))
+
+(defmethod srecode-dump ((ins srecode-template-inserter-ask) indent)
+  "Dump the state of the SRecode template inserter INS."
+  (call-next-method)
+  (princ " : \"")
+  (princ (oref ins prompt))
+  (princ "\"")
+  )
+
+(defclass srecode-template-inserter-width (srecode-template-inserter-variable)
+  ((key :initform ?|
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   )
+  "Inserts the value of a dictionary variable with a specific width.
+The second argument specifies the width, and a pad, seperated by a colon.
+thus a specification of `10:left' will insert the value of A
+to 10 characters, with spaces added to the left.  Use `right' for adding
+spaces to the right.")
+
+(defmethod srecode-insert-variable-secondname-handler
+  ((sti srecode-template-inserter-width) dictionary value width)
+  "For VALUE handle WIDTH behaviors for this variable inserter.
+Return the result as a string.
+By default, treat as a function name."
+  (if width
+      ;; Trim or pad to new length
+      (let* ((split (split-string width ":"))
+	     (width (string-to-number (nth 0 split)))
+	     (second (nth 1 split))
+	     (pad (cond ((or (null second) (string= "right" second))
+			 'right)
+			((string= "left" second)
+			 'left)
+			(t
+			 (error "Unknown pad type %s" second)))))
+	(if (>= (length value) width)
+	    ;; Simple case - too long.
+	    (substring value 0 width)
+	  ;; We need to pad on one side or the other.
+	  (let ((padchars (make-string (- width (length value)) ? )))
+	    (if (eq pad 'left)
+		(concat padchars value)
+	      (concat value padchars)))))
+    (error "Width not specified for variable/width inserter.")))
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-width)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (princ "|A:10:right")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defvar srecode-template-inserter-point-override nil
+  "When non-nil, the point inserter will do this functin instead.")
+
+(defclass srecode-template-inserter-point (srecode-template-inserter)
+  ((key :initform ?^
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   (point :type (or null marker)
+	  :allocation :class
+	  :documentation
+	  "Record the value of (point) in this class slot.
+It is the responsibility of the inserter algorithm to clear this
+after a successful insertion."))
+  "Record the value of (point) when inserted.
+The cursor is placed at the ^ macro after insertion.
+Some inserter macros, such as `srecode-template-inserter-include-wrap'
+will place text at the ^ macro from the included macro.")
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-point)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (princ "^")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-point)
+				  dictionary)
+  "Insert the STI inserter.
+Save point in the class allocated 'point' slot.
+If `srecode-template-inserter-point-override' then this generalized
+marker will do something else.  See `srecode-template-inserter-include-wrap'
+as an example."
+  (if srecode-template-inserter-point-override
+      ;; Disable the old override while we do this.
+      (let ((over srecode-template-inserter-point-override)
+	    (srecode-template-inserter-point-override nil))
+	(funcall over dictionary)
+	)
+    (oset sti point (point-marker))
+    ))
+
+(defclass srecode-template-inserter-subtemplate (srecode-template-inserter)
+  ()
+  "Wrap a section of a template under the control of a macro."
+  :abstract t)
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-subtemplate)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (call-next-method)
+  (princ "     Template Text to control")
+  (terpri)
+  (princ "   ")
+  (princ escape-start)
+  (princ "/VARNAME")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defmethod srecode-insert-subtemplate ((sti srecode-template-inserter-subtemplate)
+				       dict slot)
+  "Insert a subtemplate for the inserter STI with dictionary DICT."
+  ;; make sure that only dictionaries are used.
+  (when (not (srecode-dictionary-child-p dict))
+    (error "Only section dictionaries allowed for %s" 
+	   (object-name-string sti)))
+  ;; Output the code from the sub-template.
+  (srecode-insert-method (slot-value sti slot) dict)
+  )
+
+(defmethod srecode-insert-method-helper ((sti srecode-template-inserter-subtemplate)
+					 dictionary slot)
+  "Do the work for inserting the STI inserter.
+Loops over the embedded CODE which was saved here during compilation.
+The template to insert is stored in SLOT."
+  (let ((dicts (srecode-dictionary-lookup-name 
+		dictionary (oref sti :object-name))))
+    (when (not (listp dicts))
+      (error "Cannot insert section %S from non-section variable."
+	     (oref sti :object-name)))
+    ;; If there is no section dictionary, then don't output anything
+    ;; from this section.
+    (while dicts
+      (when (not (srecode-dictionary-p (car dicts)))
+	(error "Cannot insert section %S from non-section variable."
+	       (oref sti :object-name)))
+      (srecode-insert-subtemplate sti (car dicts) slot)
+      (setq dicts (cdr dicts)))))
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-subtemplate)
+				  dictionary)
+  "Insert the STI inserter.
+Calls back to `srecode-insert-method-helper' for this class."
+  (srecode-insert-method-helper sti dictionary 'template))
+
+
+(defclass srecode-template-inserter-section-start (srecode-template-inserter-subtemplate)
+  ((key :initform ?#
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   (template :initarg :template
+	     :documentation
+	     "A Template used to frame the codes from this inserter.")
+   )
+  "Apply values from a sub-dictionary to a template section.
+The dictionary saved at the named dictionary entry will be
+applied to the text between the section start and the
+`srecode-template-inserter-section-end' macro.")
+
+(defmethod srecode-parse-input ((ins srecode-template-inserter-section-start)
+				tag input STATE)
+  "For the section inserter INS, parse INPUT.
+Shorten input until the END token is found.
+Return the remains of INPUT."
+  (let* ((out (srecode-compile-split-code tag input STATE
+					  (oref ins :object-name))))
+    (oset ins template (srecode-template 
+			(object-name-string ins)
+			:context nil
+			:args nil
+			:code (cdr out)))
+    (car out)))
+
+(defmethod srecode-dump ((ins srecode-template-inserter-section-start) indent)
+  "Dump the state of the SRecode template inserter INS."
+  (call-next-method)
+  (princ "\n")
+  (srecode-dump-code-list (oref (oref ins template) code)
+			  (concat indent "    "))
+  )
+
+(defclass srecode-template-inserter-section-end (srecode-template-inserter)
+  ((key :initform ?/
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   )
+  "All template segments between the secion-start and section-end
+are treated specially.")
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-section-end)
+				  dictionary)
+  "Insert the STI inserter."
+  )
+
+(defmethod srecode-match-end ((ins srecode-template-inserter-section-end) name)
+			      
+  "For the template inserter INS, do I end a section called NAME?"
+  (string= name (oref ins :object-name)))
+
+(defclass srecode-template-inserter-include (srecode-template-inserter-subtemplate)
+  ((key :initform ?>
+	:allocation :class
+	:documentation
+	"The character code used to identify inserters of this style.")
+   (includedtemplate 
+    :initarg :includedtemplate
+    :documentation
+    "The template included for this inserter."))
+   "Include a different template into this one.
+The included template will have additional dictionary entries from the subdictionary 
+stored specified by this macro.")
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-include)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (princ ">DICTNAME:contextname:templatename")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defmethod srecode-insert-include-lookup ((sti srecode-template-inserter-include)
+					  dictionary)
+  "For the template inserter STI, lookup the template to include.
+Finds the template with this macro function part and stores it in
+this template instance."
+  (let* ((templatenamepart (oref sti :secondname))
+	 )
+    ;; If there was no template name, throw an error
+    (if (not templatenamepart)
+	(error "Include macro %s needs a template name." (oref sti :object-name)))
+
+    ;; NOTE: We used to cache the template and not look it up a second time,
+    ;; but changes in the template tables can change which template is
+    ;; eventually discovered, so now we always lookup that template.
+
+    ;; Calculate and store the discovered template
+    (let ((tmpl (srecode-template-get-table (srecode-table)
+					    templatenamepart))
+	  (active (oref srecode-template active))
+	  ctxt)
+      (when (not tmpl)
+	;; If it isn't just available, scan back through
+	;; the active template stack, searching for a matching
+	;; context.
+	(while (and (not tmpl) active)
+	  (setq ctxt (oref (car active) context))
+	  (setq tmpl (srecode-template-get-table (srecode-table)
+						 templatenamepart
+						 ctxt))
+	  (when (not tmpl)
+	    (when (slot-boundp (car active) 'table)
+	      (let ((app (oref (oref (car active) table) application)))
+		(when app
+		  (setq tmpl (srecode-template-get-table 
+			      (srecode-table)
+			      templatenamepart
+			      ctxt app)))
+		)))
+	  (setq active (cdr active)))
+	(when (not tmpl)
+	  ;; If it wasn't in this context, look to see if it
+	  ;; defines it's own context
+	  (setq tmpl (srecode-template-get-table (srecode-table)
+						 templatenamepart)))
+	)
+
+      ;; Store the found template into this object for later use.
+      (oset sti :includedtemplate tmpl))
+
+    (if (not (oref sti includedtemplate))
+	;; @todo - Call into a debugger to help find the template in question.
+	(error "No template \"%s\" found for include macro `%s'"
+	       templatenamepart (oref sti :object-name)))
+    ))
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-include)
+				  dictionary)
+  "Insert the STI inserter.
+Finds the template with this macro function part, and inserts it
+with the dictionaries found in the dictinary."
+  (srecode-insert-include-lookup sti dictionary)
+  ;; Insert the template.
+  ;; Our baseclass has a simple way to do this.
+  (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name))
+      ;; If we have a value, then call the next method
+      (srecode-insert-method-helper sti dictionary 'includedtemplate)
+    ;; If we don't have a special dictitonary, then just insert with the
+    ;; current dictionary.
+    (srecode-insert-subtemplate sti dictionary 'includedtemplate))
+  )
+
+;;
+;; This template combines the include template and the sectional template.
+;; It will first insert the included template, then insert the embedded
+;; template wherever the $^$ in the included template was.
+;;
+;; Since it uses dual inheretance, it will magically get the end-matching
+;; behavior of #, with the including feature of >.
+;;
+(defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)
+   ((key :initform ?<
+	 :allocation :class
+	 :documentation
+	 "The character code used to identify inserters of this style.")
+    )
+   "Include a different template into this one, and add text at the ^ macro.
+The included template will have additional dictionary entries from the subdictionary 
+stored specified by this macro.  If the included macro includes a ^ macro,
+then the text between this macro and the end macro will be inserted at
+the ^ macro.")
+
+(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-include-wrap)
+						  escape-start escape-end)
+  "Insert an example using inserter INS.
+Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
+  (princ "   ")
+  (princ escape-start)
+  (princ "<DICTNAME:contextname:templatename")
+  (princ escape-end)
+  (terpri)
+  (princ "     Template Text to insert at ^ macro")
+  (terpri)
+  (princ "   ")
+  (princ escape-start)
+  (princ "/DICTNAME")
+  (princ escape-end)
+  (terpri)
+  )
+
+(defmethod srecode-insert-method ((sti srecode-template-inserter-include-wrap)
+				  dictionary)
+  "Insert the template STI.
+This will first insert the include part via inheritance, then
+insert the section it wraps into the location in the included
+template where  a ^ inserter occurs."
+  ;; Step 1: Look up the included inserter
+  (srecode-insert-include-lookup sti dictionary)
+  ;; Step 2: Temporarilly override the point inserter.
+  (let* ((vaguely-unique-name sti)
+	 (srecode-template-inserter-point-override
+	  (lambda (dict2)
+	    (if (srecode-dictionary-lookup-name 
+		 dict2 (oref vaguely-unique-name :object-name))
+		;; Insert our sectional part with looping.
+		(srecode-insert-method-helper 
+		 vaguely-unique-name dict2 'template)
+	      ;; Insert our sectional part just once.
+	      (srecode-insert-subtemplate vaguely-unique-name
+					  dict2 'template))
+	   )))
+    ;; Do a regular insertion for an include, but with our override in
+    ;; place.
+    (call-next-method)
+    ))
+
+(provide 'srecode-insert)
+
+;;; srecode-insert.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-java.el b/site/cedet-1.0pre7/srecode/srecode-java.el
new file mode 100644
index 0000000..a0df85c
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-java.el
@@ -0,0 +1,53 @@
+;;; srecode-java.el --- Srecode Java support
+
+;; Copyright (C) 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-java.el,v 1.1 2009/01/06 02:41:09 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Special support for the Java language.
+
+;;; Code:
+;;;###autoload
+(defun srecode-semantic-handle-:java (dict)
+  "Add macros into the dictionary DICT based on the current java file.
+Adds the following:
+FILENAME_AS_PACKAGE - file/dir converted into a java package name.
+FILENAME_AS_CLASS - file converted to a Java class name."
+  ;; A symbol representing
+  (let* ((fsym (file-name-nondirectory (buffer-file-name)))
+	 (fnox (file-name-sans-extension fsym))
+	 (dir (file-name-directory (buffer-file-name)))
+	 (fpak fsym)
+	 )
+    (while (string-match "\\.\\| " fpak)
+      (setq fpak (replace-match "_" t t fpak)))
+    (if (string-match "src/" dir)
+	(setq dir (substring dir (match-end 0)))
+      (setq dir (file-name-nondirectory (directory-file-name dir))))
+    (while (string-match "/" dir)
+      (setq dir (replace-match "_" t t dir)))
+    (srecode-dictionary-set-value dict "FILENAME_AS_PACKAGE"
+				  (concat dir "." fpak))
+    (srecode-dictionary-set-value dict "FILENAME_AS_CLASS" fnox)
+    ))
+
+(provide 'srecode-java)
+;;; srecode-java.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-load.el b/site/cedet-1.0pre7/srecode/srecode-load.el
new file mode 100644
index 0000000..70bd62c
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-load.el
@@ -0,0 +1,37 @@
+;;; srecode-load.el --- Autoload definitions for SRecode
+
+;; Copyright (C) 2007, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-load.el,v 1.3 2008/03/02 02:17:53 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Initialize SRecode for supported conditions.
+
+;;; Code:
+
+(require 'srecode)
+
+;; This may be desirous, but don't enable by default.
+;;(global-srecode-minor-mode 1)
+
+(provide 'srecode-load)
+
+;;; srecode-load.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-loaddefs.el b/site/cedet-1.0pre7/srecode/srecode-loaddefs.el
new file mode 100644
index 0000000..b9ae776
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-loaddefs.el
@@ -0,0 +1,653 @@
+;;; srecode-loaddefs.el --- Auto-generated CEDET autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (srecode-semantic-handle-:kill srecode-semantic-handle-:system
+;;;;;;  srecode-semantic-handle-:file srecode-semantic-handle-:time
+;;;;;;  srecode-semantic-handle-:user srecode-semantic-handle-:region
+;;;;;;  srecode-semantic-handle-:indent srecode-semantic-handle-:blank)
+;;;;;;  "srecode-args" "srecode-args.el" (18799 57966))
+;;; Generated autoloads from srecode-args.el
+
+(autoload 'srecode-semantic-handle-:blank "srecode-args" "\
+Add macros into the dictionary DICT specifying blank line spacing.
+The wrapgap means make sure the first and last lines of the macro
+do not contain any text from preceeding or following text.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:indent "srecode-args" "\
+Add macros into the dictionary DICT for indentation.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:region "srecode-args" "\
+Add macros into the dictionary DICT based on the current :region.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:user "srecode-args" "\
+Add macros into the dictionary DICT based on the current :user.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:time "srecode-args" "\
+Add macros into the dictionary DICT based on the current :time.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:file "srecode-args" "\
+Add macros into the dictionary DICT based on the current :file.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:system "srecode-args" "\
+Add macros into the dictionary DICT based on the current :system.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:kill "srecode-args" "\
+Add macros into the dictionary DICT based on the kill ring.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-compile-templates srecode-compile-file)
+;;;;;;  "srecode-compile" "srecode-compile.el" (19326 59187))
+;;; Generated autoloads from srecode-compile.el
+
+(autoload 'srecode-compile-file "srecode-compile" "\
+Compile the templates from the file FNAME.
+
+\(fn FNAME)" nil nil)
+
+(autoload 'srecode-compile-templates "srecode-compile" "\
+Compile a semantic recode template file into a mode-local variable.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-handle-:cpp) "srecode-cpp" "srecode-cpp.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from srecode-cpp.el
+
+(autoload 'srecode-semantic-handle-:cpp "srecode-cpp" "\
+Add macros into the dictionary DICT based on the current c++ file.
+Adds the following:
+FILENAME_SYMBOL - filename converted into a C compat symbol.
+HEADER - Shown section if in a header file.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-calculate-context) "srecode-ctxt" "srecode-ctxt.el"
+;;;;;;  (19010 47297))
+;;; Generated autoloads from srecode-ctxt.el
+
+(autoload 'srecode-calculate-context "srecode-ctxt" "\
+Calculate the context at the current point.
+The returned context is a list, with the top-most context first.
+Each returned context is a string that that would show up in a `context'
+statement in an `.srt' file.
+
+Some useful context values used by the provided srecode templates are:
+  \"file\" - Templates that for a file (such as an empty file.)
+     \"empty\" - The file is empty
+  \"declaration\" - Top-level declarations in a file.
+     \"include\" - In or near include statements
+     \"package\" - In or near provide statements
+     \"function\" - In or near function statements
+         \"NAME\" - Near functions within NAME namespace or class
+     \"variable\" - In or near variable statements.
+     \"type\"     - In or near type declarations.
+     \"comment\"  - In a comment
+  \"classdecl\" - Declarations within a class/struct/etc.
+     \"variable\" - In or near class fields
+     \"function\" - In or near methods/functions
+        \"virtual\" - Nearby items are virtual
+           \"pure\" - and those virtual items are pure virtual
+     \"type\"     - In or near type declarations.
+     \"comment\"  - In a comment in a block of code
+     -- these items show up at the end of the context list. --
+     \"public\", \"protected\", \"private\" -
+                  In or near a section of public/pritected/private entries.
+  \"code\" - In a block of code.
+     \"string\" - In a string in a block of code
+     \"comment\"  - In a comment in a block of code
+
+    ... More later.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-dictionary-dump srecode-adebug-dictionary
+;;;;;;  srecode-create-dictionary) "srecode-dictionary" "srecode-dictionary.el"
+;;;;;;  (19329 62116))
+;;; Generated autoloads from srecode-dictionary.el
+
+(eieio-defclass-autoload 'srecode-dictionary 'nil "srecode-dictionary" "Dictionary of symbols and what they mean.\nDictionaries are used to look up named symbols from\ntemplates to decide what to do with those symbols.")
+
+(eieio-defclass-autoload 'srecode-dictionary-compound-value 'nil "srecode-dictionary" "A compound dictionary value.\nValues stored in a dictionary must be a STRING,\na dictionary for showing sections, or an instance of a subclass\nof this class.\n\nCompound dictionary values derive from this class, and must\nprovide a sequence of method implementations to convert into\na string.")
+
+(eieio-defclass-autoload 'srecode-dictionary-compound-variable '(srecode-dictionary-compound-value) "srecode-dictionary" "A compound dictionary value for template file variables.\nYou can declare a variable in a template like this:\n\nset NAME \"str\" macro \"OTHERNAME\"\n\nwith appending various parts together in a list.")
+
+(autoload 'srecode-create-dictionary "srecode-dictionary" "\
+Create a dictionary for BUFFER.
+If BUFFER-OR-PARENT is not specified, assume a buffer, and
+use the current buffer.
+If BUFFER-OR-PARENT is another dictionary, then remember the
+parent within the new dictionary, and assume that BUFFER
+is the same as belongs to the parent dictionary.
+The dictionary is initialized with variables setup for that
+buffer's table.
+If BUFFER-OR-PARENT is t, then this dictionary should not be
+assocated with a buffer or parent.
+
+\(fn &optional BUFFER-OR-PARENT)" nil nil)
+
+(eieio-defclass-autoload 'srecode-field-value '(srecode-dictionary-compound-value) "srecode-dictionary" "When inserting values with editable field mode, a dictionary value.\nCompound values allow a field to be stored in the dictionary for when\nit is referenced a second time.  This compound value can then be\ninserted with a new editable field.")
+
+(autoload 'srecode-adebug-dictionary "srecode-dictionary" "\
+Run data-debug on this mode's dictionary.
+
+\(fn)" t nil)
+
+(autoload 'srecode-dictionary-dump "srecode-dictionary" "\
+Dump a typical fabricated dictionary.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-document-function-comment-extract-test
+;;;;;;  srecode-document-insert-group-comments srecode-document-insert-variable-one-line-comment
+;;;;;;  srecode-document-insert-function-comment srecode-document-insert-comment)
+;;;;;;  "srecode-document" "srecode-document.el" (18805 18711))
+;;; Generated autoloads from srecode-document.el
+
+(eval-after-load "srecode-mode" '(progn (srecode-add-code-generator 'srecode-document-insert-comment "Comments" "C")))
+
+(autoload 'srecode-document-insert-comment "srecode-document" "\
+Insert some comments.
+Whack any comments that may be in the way and replace them.
+If the region is active, then insert group function comments.
+If the cursor is in a comment, figure out what kind of comment it is
+  and replace it.
+If the cursor is in a function, insert a function comment.
+If the cursor is on a one line prototype, then insert post-fcn comments.
+
+\(fn)" t nil)
+
+(autoload 'srecode-document-insert-function-comment "srecode-document" "\
+Insert or replace a function comment.
+FCN-IN is the Semantic tag of the function to add a comment too.
+If FCN-IN is not provied, the current tag is used instead.
+It is assumed that the comment occurs just in front of FCN-IN.
+
+\(fn &optional FCN-IN)" t nil)
+
+(autoload 'srecode-document-insert-variable-one-line-comment "srecode-document" "\
+Insert or replace a variable comment.
+VAR-IN is the Semantic tag of the function to add a comment too.
+If VAR-IN is not provied, the current tag is used instead.
+It is assumed that the comment occurs just after VAR-IN.
+
+\(fn &optional VAR-IN)" t nil)
+
+(autoload 'srecode-document-insert-group-comments "srecode-document" "\
+Insert group comments around the active between BEG and END.
+If the region includes only parts of some tags, expand out
+to the beginning and end of the tags on the region.
+If there is only one tag in the region, complain.
+
+\(fn BEG END)" t nil)
+
+(autoload 'srecode-document-function-comment-extract-test "srecode-document" "\
+Test old comment extraction.
+Dump out the extracted dictionary.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-handle-:el-custom srecode-semantic-handle-:el)
+;;;;;;  "srecode-el" "srecode-el.el" (18368 52100))
+;;; Generated autoloads from srecode-el.el
+
+(autoload 'srecode-semantic-handle-:el "srecode-el" "\
+Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+  PRENAME - The common name prefix of this file.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:el-custom "srecode-el" "\
+Add macros into the dictionary DICT based on the current Emacs Lisp file.
+Adds the following:
+  GROUP - The 'defgroup' name we guess you want for variables.
+  FACEGROUP - The `defgroup' name you might want for faces.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-insert-prototype-expansion) "srecode-expandproto"
+;;;;;;  "srecode-expandproto.el" (17917 27924))
+;;; Generated autoloads from srecode-expandproto.el
+
+(autoload 'srecode-insert-prototype-expansion "srecode-expandproto" "\
+Insert get/set methods for the current class.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-field-utest) "srecode-fields" "srecode-fields.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from srecode-fields.el
+
+(eieio-defclass-autoload 'srecode-field '(srecode-overlaid) "srecode-fields" "Representation of one field.")
+
+(autoload 'srecode-field-utest "srecode-fields" "\
+Test the srecode field manager.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-comment-prefix) "srecode-filters" "srecode-filters.el"
+;;;;;;  (18791 54835))
+;;; Generated autoloads from srecode-filters.el
+
+(autoload 'srecode-comment-prefix "srecode-filters" "\
+Prefix each line of STR with the comment prefix characters.
+
+\(fn STR)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-read-template-name srecode-template-get-table-for-binding
+;;;;;;  srecode-template-get-table srecode-load-tables-for-mode srecode-table)
+;;;;;;  "srecode-find" "srecode-find.el" (19326 59187))
+;;; Generated autoloads from srecode-find.el
+
+(autoload 'srecode-table "srecode-find" "\
+Return the currently active Semantic Recoder table for this buffer.
+Optional argument MODE specifies the mode table to use.
+
+\(fn &optional MODE)" nil nil)
+
+(autoload 'srecode-load-tables-for-mode "srecode-find" "\
+Load all the template files for MMODE.
+Templates are found in the SRecode Template Map.
+See `srecode-get-maps' for more.
+APPNAME is the name of an application.  In this case,
+all template files for that application will be loaded.
+
+\(fn MMODE &optional APPNAME)" nil nil)
+
+(autoload 'srecode-template-get-table "srecode-find" "\
+Find in the template in mode table TAB, the template with TEMPLATE-NAME.
+Optional argument CONTEXT specifies a context a particular template
+would belong to.
+Optional argument APPLICATION restricts searches to only template tables
+belonging to a specific application.  If APPLICATION is nil, then only
+tables that do not belong to an application will be searched.
+
+\(fn (TAB srecode-mode-table) TEMPLATE-NAME &optional CONTEXT APPLICATION)" nil nil)
+
+(autoload 'srecode-template-get-table-for-binding "srecode-find" "\
+Find in the template name in mode table TAB, the template with BINDING.
+Optional argument CONTEXT specifies a context a particular template
+would belong to.
+Optional argument APPLICATION restricts searches to only template tables
+belonging to a specific application.  If APPLICATION is nil, then only
+tables that do not belong to an application will be searched.
+
+\(fn (TAB srecode-mode-table) BINDING &optional CONTEXT APPLICATION)" nil nil)
+
+(autoload 'srecode-read-template-name "srecode-find" "\
+Completing read for Semantic Recoder template names.
+PROMPT is used to query for the name of the template desired.
+INITIAL is the initial string to use.
+HIST is a history variable to use.
+DEFAULT is what to use if the user presses RET.
+
+\(fn PROMPT &optional INITIAL HIST DEFAULT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-insert-getset) "srecode-getset" "srecode-getset.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from srecode-getset.el
+
+(eval-after-load "srecode-mode" '(progn (srecode-add-code-generator 'srecode-insert-getset "Get/Set" "G")))
+
+(autoload 'srecode-insert-getset "srecode-getset" "\
+Insert get/set methods for the current class.
+CLASS-IN is the semantic tag of the class to update.
+FIELD-IN is the semantic tag, or string name, of the field to add.
+If you do not specify CLASS-IN or FIELD-IN then a class and field
+will be derived.
+
+\(fn &optional CLASS-IN FIELD-IN)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-insert-fcn srecode-insert srecode-insert-again)
+;;;;;;  "srecode-insert" "srecode-insert.el" (19326 59187))
+;;; Generated autoloads from srecode-insert.el
+
+(autoload 'srecode-insert-again "srecode-insert" "\
+Insert the previously inserted template (by name) again.
+
+\(fn)" t nil)
+
+(autoload 'srecode-insert "srecode-insert" "\
+Inesrt the template TEMPLATE-NAME into the current buffer at point.
+DICT-ENTRIES are additional dictionary values to add.
+
+\(fn TEMPLATE-NAME &rest DICT-ENTRIES)" t nil)
+
+(autoload 'srecode-insert-fcn "srecode-insert" "\
+Insert TEMPLATE using DICTIONARY into STREAM.
+Optional SKIPRESOLVER means to avoid refreshing the tag list,
+or resolving any template arguments.  It is assumed the caller
+has set everything up already.
+
+\(fn TEMPLATE DICTIONARY &optional STREAM SKIPRESOLVER)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-handle-:java) "srecode-java"
+;;;;;;  "srecode-java.el" (18786 50373))
+;;; Generated autoloads from srecode-java.el
+
+(autoload 'srecode-semantic-handle-:java "srecode-java" "\
+Add macros into the dictionary DICT based on the current java file.
+Adds the following:
+FILENAME_AS_PACKAGE - file/dir converted into a java package name.
+FILENAME_AS_CLASS - file converted to a Java class name.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-adebug-maps srecode-get-maps) "srecode-map"
+;;;;;;  "srecode-map.el" (19096 33912))
+;;; Generated autoloads from srecode-map.el
+
+(autoload 'srecode-get-maps "srecode-map" "\
+Get a list of maps relevant to the current buffer.
+Optional argument RESET forces a reset of the current map.
+
+\(fn &optional RESET)" t nil)
+
+(autoload 'srecode-adebug-maps "srecode-map" "\
+Run ADEBUG on the output of `srecode-get-maps'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (global-srecode-minor-mode srecode-minor-mode)
+;;;;;;  "srecode-mode" "srecode-mode.el" (19326 59187))
+;;; Generated autoloads from srecode-mode.el
+
+(autoload 'srecode-minor-mode "srecode-mode" "\
+Toggle srecode minor mode.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{srecode-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'global-srecode-minor-mode "srecode-mode" "\
+Toggle global use of srecode minor mode.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-insert-tag srecode-semantic-apply-tag-to-dict-default
+;;;;;;  srecode-semantic-apply-tag-to-dict srecode-semantic-handle-:tagtype
+;;;;;;  srecode-semantic-handle-:tag) "srecode-semantic" "srecode-semantic.el"
+;;;;;;  (18902 53110))
+;;; Generated autoloads from srecode-semantic.el
+
+(autoload 'srecode-semantic-handle-:tag "srecode-semantic" "\
+Add macroes into the dictionary DICT based on the current :tag.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:tagtype "srecode-semantic" "\
+Add macroes into the dictionary DICT based on a tag of class type at point.
+Assumes the cursor is in a tag of class type.  If not, throw an error.
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-apply-tag-to-dict "srecode-semantic" "\
+Insert fewatures of TAGOBJ into the dictionary DICT.
+TAGOBJ is an object of class `srecode-semantic-tag'.  This class
+is a compound inserter value.
+DICT is a dictionary object.
+At a minimum, this function will create dictionary macro for NAME.
+It is also likely to create macros for TYPE (data type), function arguments,
+variable default values, and other things.
+
+\(fn TAGOBJ DICT)" nil nil)
+
+(autoload 'srecode-semantic-apply-tag-to-dict-default "srecode-semantic" "\
+Insert features of TAGOBJ into dictionary DICT.
+
+\(fn TAGOBJ DICT)" nil nil)
+
+(autoload 'srecode-semantic-insert-tag "srecode-semantic" "\
+Insert TAG into a buffer useing srecode templates at point.
+
+Optional STYLE-OPTION is a list of minor configuration of styles,
+such as the symbol 'prototype for prototype functions, or
+'system for system includes, and 'doxygen, for a doxygen style
+comment.
+
+Optional third argument POINT-INSERT-FCN is a hook that is run after
+TAG is inserted that allows an opportunity to fill in the body of
+some thing.  This hook function is called with one argument, the TAG
+being inserted.
+
+The rest of the arguments are DICT-ENTRIES.  DICT-ENTRIES
+is of the form ( NAME1 VALUE1 NAME2 VALUE2 ... NAMEn VALUEn).
+
+The exact template used is based on the current context.
+The template used is found within the toplevel context as calculated
+by `srecode-calculate-context', such as `declaration', `classdecl',
+or `code'.
+
+For various conditions, this function looks for a template with
+the name CLASS-tag, where CLASS is the tag class.  If it cannot
+find that, it will look for that template in the
+`declaration'context (if the current context was not `declaration').
+
+If PROTOTYPE is specified, it will first look for templates with
+the name CLASS-tag-prototype, or CLASS-prototype as above.
+
+See `srecode-semantic-apply-tag-to-dict' for details on what is in
+the dictionary when the templates are called.
+
+This function returns to location in the buffer where the
+inserted tag ENDS, and will leave point inside the inserted
+text based on any occurance of a point-inserter.  Templates such
+as `function' will leave point where code might be inserted.
+
+\(fn TAG &optional STYLE-OPTION POINT-INSERT-FCN &rest DICT-ENTRIES)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-semantic-handle-:srt srecode-read-major-mode-name
+;;;;;;  srecode-read-variable-name) "srecode-srt" "srecode-srt.el"
+;;;;;;  (18791 54981))
+;;; Generated autoloads from srecode-srt.el
+
+(autoload 'srecode-read-variable-name "srecode-srt" "\
+Read in the name of a declaired variable in the current SRT file.
+PROMPT is the prompt to use.
+INITIAL is the initial string.
+HIST is the history value, otherwise `srecode-read-variable-name-history'
+     is used.
+DEFAULT is the default if RET is hit.
+
+\(fn PROMPT &optional INITIAL HIST DEFAULT)" nil nil)
+
+(autoload 'srecode-read-major-mode-name "srecode-srt" "\
+Read in the name of a desired `major-mode'.
+PROMPT is the prompt to use.
+INITIAL is the initial string.
+HIST is the history value, otherwise `srecode-read-variable-name-history'
+     is used.
+DEFAULT is the default if RET is hit.
+
+\(fn PROMPT &optional INITIAL HIST DEFAULT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:srt "srecode-srt" "\
+Add macros into the dictionary DICT based on the current SRT file.
+Adds the following:
+ESCAPE_START - This files value of escape_start
+ESCAPE_END - This files value of escape_end
+MODE - The mode of this buffer.  If not declared yet, guess.
+
+\(fn DICT)" nil nil)
+
+;;;***
+
+;;;### (autoloads (srecode-dump-templates srecode-mode-table-new
+;;;;;;  srecode-get-mode-table) "srecode-table" "srecode-table.el"
+;;;;;;  (19326 59187))
+;;; Generated autoloads from srecode-table.el
+
+(autoload 'srecode-get-mode-table "srecode-table" "\
+Get the SRecoder mode table for the major mode MODE.
+Optional argument SOFT indicates to not make a new one if a table
+was not found.
+
+\(fn MODE)" nil nil)
+
+(autoload 'srecode-mode-table-new "srecode-table" "\
+Create a new template table for MODE in FILE.
+INIT are the initialization parametrs for the new template table.
+
+\(fn MODE FILE &rest INIT)" nil nil)
+
+(autoload 'srecode-dump-templates "srecode-table" "\
+Dump a list of the current templates for MODE.
+
+\(fn MODE)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-template-setup-parser) "srecode-template"
+;;;;;;  "srecode-template.el" (18335 12812))
+;;; Generated autoloads from srecode-template.el
+
+(autoload 'srecode-template-setup-parser "srecode-template" "\
+Setup buffer for parse.
+
+\(fn)" nil nil)
+
+(add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser)
+
+;;;***
+
+;;;### (autoloads (srecode-template-mode) "srecode-template-mode"
+;;;;;;  "srecode-template-mode.el" (18805 18918))
+;;; Generated autoloads from srecode-template-mode.el
+
+(autoload 'srecode-template-mode "srecode-template-mode" "\
+Major-mode for writing srecode macros.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.srt$" . srecode-template-mode))
+
+;;;***
+
+;;;### (autoloads (srecode-utest-template-output) "srecode-test"
+;;;;;;  "srecode-test.el" (19326 59187))
+;;; Generated autoloads from srecode-test.el
+
+(autoload 'srecode-utest-template-output "srecode-test" "\
+Test various template insertion options.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-utest-getset-output) "srecode-test-getset"
+;;;;;;  "srecode-test-getset.el" (18810 36153))
+;;; Generated autoloads from srecode-test-getset.el
+
+(autoload 'srecode-utest-getset-output "srecode-test-getset" "\
+Test various template insertion options.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (srecode-texi-insert-tag-as-doc srecode-semantic-handle-:texitag
+;;;;;;  srecode-semantic-handle-:texi srecode-texi-add-menu) "srecode-texi"
+;;;;;;  "srecode-texi.el" (19329 62078))
+;;; Generated autoloads from srecode-texi.el
+
+(autoload 'srecode-texi-add-menu "srecode-texi" "\
+Add an item into the current menu.  Add @node statements as well.
+Argument NEWNODE is the name of the new node.
+
+\(fn NEWNODE)" t nil)
+
+(autoload 'srecode-semantic-handle-:texi "srecode-texi" "\
+Add macros into the dictionary DICT based on the current texinfo file.
+Adds the following:
+  LEVEL - chapter, section, subsection, etc
+  NEXTLEVEL - One below level
+
+\(fn DICT)" nil nil)
+
+(autoload 'srecode-semantic-handle-:texitag "srecode-texi" "\
+Add macros into the dictionary DICT based on the current :tag file.
+Adds the following:
+  TAGDOC - Texinfo formatted doc string for :tag.
+
+\(fn DICT)" nil nil)
+
+(define-mode-local-override semantic-insert-foreign-tag texinfo-mode (foreign-tag) "Insert FOREIGN-TAG from a foreign buffer in TAGFILE.\nAssume TAGFILE is a source buffer, and create a documentation\nthingy from it using the `document' tool." (srecode-texi-insert-tag-as-doc foreign-tag))
+
+(autoload 'srecode-texi-insert-tag-as-doc "srecode-texi" "\
+Insert TAG into the current buffer with SRecode.
+
+\(fn TAG)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("srecode-document-vars.el" "srecode-extract.el"
+;;;;;;  "srecode-load.el" "srecode-template-wy.el" "srecode.el")
+;;;;;;  (19335 11025 448262))
+
+;;;***
+
+(provide 'srecode-loaddefs)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; srecode-loaddefs.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-map.el b/site/cedet-1.0pre7/srecode/srecode-map.el
new file mode 100644
index 0000000..b1475e2
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-map.el
@@ -0,0 +1,406 @@
+;;; srecode-map.el --- Manage a template file map
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-map.el,v 1.16 2009/08/29 01:29:28 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Read template files, and build a map of where they can be found.
+;; Save the map to disk, and refer to it when bootstrapping a new
+;; Emacs session with srecode.
+
+(require 'semantic)
+
+;;; Code:
+(defun srecode-map-base-template-dir ()
+  "Find the base template directory for SRecode."
+  (let* ((lib (locate-library "srecode.el"))
+	 (dir (file-name-directory lib)))
+    (expand-file-name "templates/" dir)
+    ))
+
+
+;;; Current MAP
+;;
+
+(defvar srecode-current-map nil
+  "The current map for global SRecode templtes.")
+
+(defcustom srecode-map-save-file (expand-file-name "~/.srecode/srecode-map")
+  "The save location for SRecode's map file.
+If the save file is nil, then the MAP is not saved between sessions."
+  :group 'srecode
+  :type 'file)
+
+(defclass srecode-map (eieio-persistent)
+  ((fileheaderline :initform ";; SRECODE TEMPLATE MAP")
+   (files :initarg :files
+	  :initform nil
+	  :type list
+	  :documentation
+	  "An alist of files and the major-mode that they cover.")
+   (apps :initarg :apps
+	 :initform nil
+	 :type list
+	 :documentation
+	 "An alist of applications.
+Each app keys to an alist of files and modes (as above.)")
+   )
+  "A map of srecode templates.")
+
+(defmethod srecode-map-entry-for-file ((map srecode-map) file)
+  "Return the entry in MAP for FILE."
+  (assoc file (oref map files)))
+
+(defmethod srecode-map-entries-for-mode ((map srecode-map) mode)
+  "Return the entries in MAP for major MODE."
+  (let ((ans nil))
+    (dolist (f (oref map files))
+      (when (mode-local-use-bindings-p mode (cdr f))
+	(setq ans (cons f ans))))
+    ans))
+
+(defmethod srecode-map-entry-for-app ((map srecode-map) app)
+  "Return the entry in MAP for APP'lication."
+  (assoc app (oref map apps))
+  )
+
+(defmethod srecode-map-entries-for-app-and-mode ((map srecode-map) app mode)
+  "Return the entries in MAP for major MODE."
+  (let ((ans nil)
+	(appentry (srecode-map-entry-for-app map app)))
+    (dolist (f (cdr appentry))
+      (when (eq (cdr f) mode)
+	(setq ans (cons f ans))))
+    ans))
+
+(defmethod srecode-map-entry-for-file-anywhere ((map srecode-map) file)
+  "Search in all entry points in MAP for FILE.
+Return a list ( APP . FILE-ASSOC ) where APP is nil
+in the global map."
+  (or
+   ;; Look in the global entry
+   (let ((globalentry (srecode-map-entry-for-file map file)))
+     (when globalentry
+       (cons nil globalentry)))
+   ;; Look in each app.
+   (let ((match nil))
+     (dolist (app (oref map apps))
+       (let ((appmatch (assoc file (cdr app))))
+	 (when appmatch
+	   (setq match (cons app appmatch)))))
+     match)
+   ;; Other?
+   ))
+
+(defmethod srecode-map-delete-file-entry ((map srecode-map) file)
+  "Update MAP to exclude FILE from the file list."
+  (let ((entry (srecode-map-entry-for-file map file)))
+    (when entry
+      (object-remove-from-list map 'files entry))))
+
+(defmethod srecode-map-update-file-entry ((map srecode-map) file mode)
+  "Update a MAP entry for FILE to be used with MODE.
+Return non-nil if the MAP was changed."
+  (let ((entry (srecode-map-entry-for-file map file))
+	(dirty t))
+    (cond 
+     ;; It is already a match.. do nothing.
+     ((and entry (eq (cdr entry) mode))
+      (setq dirty nil))
+     ;; We have a non-matching entry.  Change the cdr.
+     (entry
+      (setcdr entry mode))
+     ;; No entry, just add it to the list.
+     (t
+      (object-add-to-list map 'files (cons file mode))
+      ))
+    dirty))
+
+(defmethod srecode-map-delete-file-entry-from-app ((map srecode-map) file app)
+  "Delete from MAP the FILE entry within the APP'lication."
+  (let* ((appe (srecode-map-entry-for-app map app))
+	 (fentry (assoc file (cdr appe))))
+    (setcdr appe (delete fentry (cdr appe))))
+  )
+
+(defmethod srecode-map-update-app-file-entry ((map srecode-map) file mode app)
+  "Update the MAP entry for FILE to be used with MODE within APP.
+Return non-nil if the map was changed."
+  (let* ((appentry (srecode-map-entry-for-app map app))
+	 (appfileentry (assoc file (cdr appentry)))
+	 (dirty t)
+	 )
+    (cond
+     ;; Option 1 - We have this file in this application already
+     ;;            with the correct mode.
+     ((and appfileentry (eq (cdr appfileentry) mode))
+      (setq dirty nil)
+      )
+     ;; Option 2 - We have a non-matching entry.  Change Cdr.
+     (appfileentry
+      (setcdr appfileentry mode))
+     (t
+      ;; For option 3 & 4 - remove the entry from any other lists
+      ;; we can find.
+      (let ((any (srecode-map-entry-for-file-anywhere map file)))
+	(when any
+	  (if (null (car any))
+	      ;; Global map entry
+	      (srecode-map-delete-file-entry map file)
+	    ;; Some app
+	    (let ((appentry (srecode-map-entry-for-app map app)))
+	      (setcdr appentry (delete (cdr any) (cdr appentry))))
+	  )))
+      ;; Now do option 3 and 4
+      (cond
+       ;; Option 3 - No entry for app.  Add to the list.
+       (appentry
+	(setcdr appentry (cons (cons file mode) (cdr appentry)))
+	)
+       ;; Option 4 - No app entry.  Add app to list with this file.
+       (t
+	(object-add-to-list map 'apps (list app (cons file mode)))
+	)))
+     )
+    dirty))
+
+
+;;; MAP Updating
+;;
+;;;###autoload
+(defun srecode-get-maps (&optional reset)
+  "Get a list of maps relevant to the current buffer.
+Optional argument RESET forces a reset of the current map."
+  (interactive "P")
+  ;; Always update the map, but only do a full reset if
+  ;; the user asks for one.
+  (srecode-map-update-map (not reset))
+
+  (if (interactive-p)
+      ;; Dump this map.
+      (with-output-to-temp-buffer "*SRECODE MAP*"
+	(princ "   -- SRecode Global map --\n")
+	(srecode-maps-dump-file-list (oref srecode-current-map files))
+	(princ "\n   -- Application Maps --\n")
+	(dolist (ap (oref srecode-current-map apps))
+	  (let ((app (car ap))
+		(files (cdr ap)))
+	    (princ app)
+	    (princ " :\n")
+	    (srecode-maps-dump-file-list files))
+	  (princ "\n"))
+	(princ "\nUse:\n\n M-x customize-variable RET srecode-map-load-path RET")
+	(princ "\n To change the path where SRecode loads templates from.")
+	)
+    ;; Eventually, I want to return many maps to search through.
+    (list srecode-current-map)))
+
+(eval-when-compile (require 'data-debug))
+
+;;;###autoload
+(defun srecode-adebug-maps ()
+  "Run ADEBUG on the output of `srecode-get-maps'."
+  (interactive)
+  (require 'data-debug)
+  (let ((start (current-time))
+	(p (srecode-get-maps t)) ;; Time the reset.
+	(end (current-time))
+	)
+    (message "Updating the map took %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (data-debug-new-buffer "*SRECODE ADEBUG*")
+    (data-debug-insert-stuff-list p "*")))
+
+(defun srecode-maps-dump-file-list (flist)
+  "Dump a file list FLIST to `standard-output'."
+  (princ "Mode\t\t\tFilename\n")
+  (princ "------\t\t\t------------------\n")
+  (dolist (fe flist)
+    (prin1 (cdr fe))
+    (princ "\t")
+    (when (> (* 2 8) (length (symbol-name (cdr fe))))
+      (princ "\t"))
+    (when (> 8 (length (symbol-name (cdr fe))))
+      (princ "\t"))
+    (princ (car fe))
+    (princ "\n")
+    ))
+
+(defun srecode-map-file-still-valid-p (filename map)
+  "Return t if FILENAME should be in MAP still."
+  (let ((valid nil))
+    (and (file-exists-p filename)
+	 (progn
+	   (dolist (p srecode-map-load-path)
+	     (when (and (< (length p) (length filename))
+			(string= p (substring filename 0 (length p))))
+	       (setq valid t))
+	     )
+	   valid))
+    ))
+
+(defun srecode-map-update-map (&optional fast)
+  "Update the current map from `srecode-map-load-path'.
+Scans all the files on the path, and makes sure we have entries
+for them.
+If option FAST is non-nil, then only parse a file for the mode-string
+if that file is NEW, otherwise assume the mode has not changed."
+  (interactive)
+
+  ;; When no map file, we are configured to not use a save file.
+  (if (not srecode-map-save-file)
+      ;; 0) Create a MAP when in no save file mode.
+      (when (not srecode-current-map)
+	(setq srecode-current-map (srecode-map "SRecode Map"))
+	(message "SRecode map created in non-save mode.")
+	)
+    
+    ;; 1) Do we even have a MAP or save file?
+    (when (and (not srecode-current-map)
+	       (not (file-exists-p srecode-map-save-file)))
+      (when (not (file-exists-p (file-name-directory srecode-map-save-file)))
+	;; Only bother with this interactively, not during a build
+	;; or test.
+	(when (not noninteractive)
+	  ;; No map, make the dir?
+	  (if (y-or-n-p (format "Create dir %s? "
+				(file-name-directory srecode-map-save-file)))
+	      (make-directory (file-name-directory srecode-map-save-file))
+	    ;; No make, change save file
+	    (customize-variable 'srecode-map-save-file)
+	    (error "Change your SRecode map file"))))
+      ;; Have a dir.  Make the object.
+      (setq srecode-current-map
+	    (srecode-map "SRecode Map"
+			 :file srecode-map-save-file)))
+
+    ;; 2) Do we not have a current map?  If so load.
+    (when (not srecode-current-map)
+      (setq srecode-current-map
+	    (eieio-persistent-read srecode-map-save-file))
+      )
+
+    )
+
+  ;;
+  ;; We better have a MAP object now.
+  ;;
+  (let ((dirty nil))
+    ;; 3) - Purge dead files from the file list.
+    (dolist (entry (copy-sequence (oref srecode-current-map files)))
+      (when (not (srecode-map-file-still-valid-p
+		  (car entry) srecode-current-map))
+	(srecode-map-delete-file-entry srecode-current-map (car entry))
+	(setq dirty t)
+	))
+    (dolist (app (copy-sequence (oref srecode-current-map apps)))
+      (dolist (entry (copy-sequence (cdr app)))
+	(when (not (srecode-map-file-still-valid-p
+		    (car entry) srecode-current-map))
+	  (srecode-map-delete-file-entry-from-app
+	   srecode-current-map (car entry) (car app))
+	  (setq dirty t)
+	  )))
+    ;; 4) - Find new files and add them to the map.
+    (dolist (dir srecode-map-load-path)
+      (when (file-exists-p dir)
+	(dolist (f (directory-files dir t "\\.srt$"))
+	  (when (and (not (backup-file-name-p f))
+		     (not (auto-save-file-name-p f))
+		     (file-readable-p f))
+	    (let ((fdirty (srecode-map-validate-file-for-mode f fast)))
+	      (setq dirty (or dirty fdirty))))
+	  )))
+    ;; Only do the save if we are dirty, or if we are in an interactive
+    ;; Emacs.
+    (when (and dirty (not noninteractive)
+	       (slot-boundp srecode-current-map :file))
+      (eieio-persistent-save srecode-current-map))
+    ))
+
+(defun srecode-map-validate-file-for-mode (file fast)
+  "Read and validate FILE via the parser.  Return the mode.
+Argument FAST implies that the file should not be reparsed if there
+is already an entry for it.
+Return non-nil if the map changed."
+  (when (or (not fast)
+	    (not (srecode-map-entry-for-file-anywhere srecode-current-map file)))
+    (let ((buff-orig (get-file-buffer file))
+	  (dirty nil))
+      (save-excursion
+	(if buff-orig
+	    (set-buffer buff-orig)
+	  (set-buffer (get-buffer-create " *srecode-map-tmp*"))
+	  (insert-file-contents file nil nil nil t)
+	  ;; Force it to be ready to parse.
+	  (srecode-template-mode)
+	  (let ((semantic-init-hooks nil))
+	    (semantic-new-buffer-fcn))
+	  )
+
+	(semantic-fetch-tags)
+	(let* ((mode-tag
+		(semantic-find-first-tag-by-name "mode" (current-buffer)))
+	       (val nil)
+	       (app-tag
+		(semantic-find-first-tag-by-name "application" (current-buffer)))
+	       (app nil))
+	  (if mode-tag
+	      (setq val (car (semantic-tag-variable-default mode-tag)))
+	    (error "There should be a mode declaration in %s" file))
+	  (when app-tag
+	    (setq app (car (semantic-tag-variable-default app-tag))))
+
+	  (setq dirty
+		(if app
+		    (srecode-map-update-app-file-entry srecode-current-map
+						       file
+						       (read val)
+						       (read app))
+		  (srecode-map-update-file-entry srecode-current-map
+						 file
+						 (read val))))
+	  )
+	)
+      dirty)))
+
+
+;;; THE PATH
+;;
+;; We need to do this last since the setter needs the above code.
+
+(defun srecode-map-load-path-set (sym val)
+  "Set SYM to the new VAL, then update the srecode map."
+  (set-default sym val)
+  (srecode-map-update-map t))
+
+(defcustom srecode-map-load-path
+  (list (srecode-map-base-template-dir)
+	(expand-file-name "~/.srecode/")
+	)
+  "*Global load path for SRecode template files."
+  :group 'srecode
+  :type '(repeat file)
+  :set 'srecode-map-load-path-set)
+
+
+(provide 'srecode-map)
+;;; srecode-map.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-mode.el b/site/cedet-1.0pre7/srecode/srecode-mode.el
new file mode 100644
index 0000000..b8167b8
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-mode.el
@@ -0,0 +1,408 @@
+;;; srecode-mode.el --- Minor-mode for managing and using SRecode templates
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Minor mode for working with SRecode template files.
+;;
+;; Depends on Semantic for minor-mode convenience functions.
+
+(require 'mode-local)
+(require 'srecode)
+(require 'srecode-insert)
+(require 'srecode-find)
+(require 'srecode-map)
+(require 'senator)
+(require 'wisent)
+
+;;; Code:
+(defcustom global-srecode-minor-mode nil
+  "Non-nil in buffers with Semantic Recoder macro keybindings."
+  :group 'srecode
+  :type 'boolean
+  :require 'srecode-mode
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (global-srecode-minor-mode (if val 1 -1))))
+
+(defvar srecode-minor-mode nil
+  "Non-nil in buffers with Semantic Recoder macro keybindings.")
+(make-variable-buffer-local 'srecode-minor-mode)
+
+(defcustom srecode-minor-mode-hook nil
+  "Hook run at the end of the function `srecode-minor-mode'."
+  :group 'srecode
+  :type 'hook)
+
+;; We don't want to waste space.  There is a menu after all.
+;;(add-to-list 'minor-mode-alist '(srecode-minor-mode ""))
+
+(defvar srecode-prefix-key [(control ?c) ?/]
+  "The common prefix key in srecode minor mode.")
+
+(defvar srecode-prefix-map
+  (let ((km (make-sparse-keymap)))
+    ;; Basic template codes
+    (define-key km "/" 'srecode-insert)
+    (define-key km [insert] 'srecode-insert)
+    (define-key km "." 'srecode-insert-again)
+    (define-key km "E" 'srecode-edit)
+    ;; Template indirect binding
+    (let ((k ?a))
+      (while (<= k ?z)
+	(define-key km (format "%c" k) 'srecode-bind-insert)
+	(setq k (1+ k))))
+    km)
+  "Keymap used behind the srecode prefix key in in srecode minor mode.")
+
+(defvar srecode-menu-bar
+  (list
+   "SRecoder"
+   (senator-menu-item
+    ["Insert Template"
+     srecode-insert
+     :active t
+     :help "Insert a template by name."
+     ])
+   (senator-menu-item
+    ["Insert Template Again"
+     srecode-insert-again
+     :active t
+     :help "Run the same template as last time again."
+     ])
+   (senator-menu-item
+    ["Edit Template"
+     srecode-edit
+     :active t
+     :help "Edit a template for this language by name."
+     ])
+   "---"
+   '( "Insert ..." :filter srecode-minor-mode-templates-menu )
+   `( "Generate ..." :filter srecode-minor-mode-generate-menu )
+   "---"
+    (senator-menu-item
+     ["Customize..."
+      (customize-group "srecode")
+      :active t
+      :help "Customize SRecode options"
+      ])
+   (list
+    "Debugging Tools..."
+    (senator-menu-item
+     ["Dump Template MAP"
+      srecode-get-maps
+      :active t
+      :help "Calculate (if needed) and display the current template file map."
+      ])
+    (senator-menu-item
+     ["Dump Tables"
+      srecode-dump-templates
+      :active t
+      :help "Dump the current template table."
+      ])
+    (senator-menu-item
+     ["Dump Dictionary"
+      srecode-dictionary-dump
+      :active t
+      :help "Calculate a dump a dictionary for point."
+      ])
+    )
+   )
+  "Menu for srecode minor mode.")
+
+(defvar srecode-minor-menu nil
+  "Menu keymap build from `srecode-menu-bar'.")
+
+(defcustom srecode-takeover-INS-key nil
+  "Use the insert key for inserting templates."
+  :group 'srecode
+  :type 'boolean)
+
+(defvar srecode-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km srecode-prefix-key srecode-prefix-map)
+    (easy-menu-define srecode-minor-menu km "Srecode Minor Mode Menu"
+                      srecode-menu-bar)
+    (when srecode-takeover-INS-key
+      (define-key km [insert] srecode-prefix-map))
+    km)
+  "Keymap for srecode minor mode.")
+
+;;;###autoload
+(defun srecode-minor-mode (&optional arg)
+  "Toggle srecode minor mode.
+With prefix argument ARG, turn on if positive, otherwise off.  The
+minor mode can be turned on only if semantic feature is available and
+the current buffer was set up for parsing.  Return non-nil if the
+minor mode is enabled.
+
+\\{srecode-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+             (if srecode-minor-mode 0 1))))
+  ;; Flip the bits.
+  (setq srecode-minor-mode
+        (if arg
+            (>
+             (prefix-numeric-value arg)
+             0)
+          (not srecode-minor-mode)))
+  ;; If we are turning things on, make sure we have templates for
+  ;; this mode first.
+  (when srecode-minor-mode
+    (when (not (apply
+		'append
+		(mapcar (lambda (map)
+			  (srecode-map-entries-for-mode map major-mode))
+			(srecode-get-maps))))
+      (setq srecode-minor-mode nil))
+    )
+  ;; Run hooks if we are turning this on.
+  (when srecode-minor-mode
+    (run-hooks 'srecode-minor-mode-hook))
+  srecode-minor-mode)
+
+;;;###autoload
+(defun global-srecode-minor-mode (&optional arg)
+  "Toggle global use of srecode minor mode.
+If ARG is positive, enable, if it is negative, disable.
+If ARG is nil, then toggle."
+  (interactive "P")
+  (setq global-srecode-minor-mode
+        (semantic-toggle-minor-mode-globally
+         'srecode-minor-mode arg)))
+
+;; Use the semantic minor mode magic stuff.
+(semantic-add-minor-mode 'srecode-minor-mode
+			 ""
+			 srecode-mode-map)
+
+;;; Menu Filters
+;;
+(defun srecode-minor-mode-templates-menu (menu-def)
+  "Create a menu item of cascading filters active for this mode.
+MENU-DEF is the menu to bind this into."
+  ;; Doing this SEGVs Emacs on windows.
+  ;;(srecode-load-tables-for-mode major-mode)
+
+  (let* ((modetable (srecode-get-mode-table major-mode))
+	 (subtab (when modetable (oref modetable :tables)))
+	 (context nil)
+	 (active nil)
+	 (ltab nil)
+	 (temp nil)
+	 (alltabs nil)
+	 )
+    (if (not subtab)
+	;; No tables, show a "load the tables" option.
+	(list (vector "Load Mode Tables..."
+		      (lambda ()
+			(interactive)
+			(srecode-load-tables-for-mode major-mode))
+		      ))
+      ;; Build something
+      (setq context (car-safe (srecode-calculate-context)))
+
+      (while subtab
+	(when (srecode-template-table-in-project-p (car subtab))
+	  (setq ltab (oref (car subtab) templates))
+	  (while ltab
+	    (setq temp (car ltab))
+
+	    ;; Do something with this template.
+
+	    (let* ((ctxt (oref temp context))
+		   (ctxtcons (assoc ctxt alltabs))
+		   (bind (if (slot-boundp temp 'binding)
+			     (oref temp binding)))
+		   (name (object-name-string temp)))
+
+	      (when (not ctxtcons)
+		(if (string= context ctxt)
+		    ;; If this context is not in the current list of contexts
+		    ;; is equal to the current context, then manage the
+		    ;; active list instead
+		    (setq active
+			  (setq ctxtcons (or active (cons ctxt nil))))
+		  ;; This is not an active context, add it to alltabs.
+		  (setq ctxtcons (cons ctxt nil))
+		  (setq alltabs (cons ctxtcons alltabs))))
+
+	      (let ((new (vector
+			  (if bind
+			      (concat name "   (" bind ")")
+			    name)
+			  `(lambda () (interactive)
+			     (srecode-insert (concat ,ctxt ":" ,name)))
+			  t)))
+
+		(setcdr ctxtcons (cons
+				  new
+				  (cdr ctxtcons)))))
+
+	    (setq ltab (cdr ltab))))
+	(setq subtab (cdr subtab)))
+
+      ;; Now create the menu
+      (easy-menu-filter-return
+       (easy-menu-create-menu
+	"Semantic Recoder Filters"
+	(append (cdr active)
+		alltabs)
+	))
+      )))
+
+(defvar srecode-minor-mode-generators nil
+  "List of code generators to be displayed in the srecoder menu.")
+
+(defun srecode-minor-mode-generate-menu (menu-def)
+  "Create a menu item of cascading filters active for this mode.
+MENU-DEF is the menu to bind this into."
+  ;; Doing this SEGVs Emacs on windows.
+  ;;(srecode-load-tables-for-mode major-mode)
+  (let ((allgeneratorapps nil))
+
+    (dolist (gen srecode-minor-mode-generators)
+      (setq allgeneratorapps
+	    (cons (vector (cdr gen) (car gen))
+		  allgeneratorapps))
+      (message "Adding %S to srecode menu" (car gen))
+      )
+
+    (easy-menu-filter-return
+     (easy-menu-create-menu
+      "Semantic Recoder Generate Filters"
+      allgeneratorapps)))
+  )
+
+;;; Minor Mode commands
+;;
+(defun srecode-bind-insert ()
+  "Bound insert for Srecode macros.
+This command will insert whichever srecode template has a binding
+to the current key."
+  (interactive)
+  (srecode-load-tables-for-mode major-mode)
+  (let* ((k last-command-char)
+	 (ctxt (srecode-calculate-context))
+	 ;; Find the template with the binding K
+	 (template (srecode-template-get-table-for-binding
+		    (srecode-table) k ctxt)))
+    ;; test it.
+    (when (not template)
+      (error "No template bound to %c" k))
+    ;; insert
+    (srecode-insert template)
+    ))
+
+(defun srecode-edit (template-name)
+  "Switch to the template buffer for TEMPLATE-NAME.
+Template is chosen based on the mode of the starting buffer."
+  ;; @todo - Get a template stack from the last run template, and show
+  ;; those too!
+  (interactive (list (srecode-read-template-name
+		      "Template Name: "
+		      (car srecode-read-template-name-history))))
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+    (let ((temp (srecode-template-get-table (srecode-table) template-name)))
+      (if (not temp)
+	  (error "No Template named %s" template-name))
+      ;; We need a template specific table, since tables chain.
+      (let ((tab (oref temp :table))
+	    (names nil)
+	    )
+	(find-file (oref tab :file))
+	(setq names (semantic-find-tags-by-name (oref temp :object-name)
+						(current-buffer)))
+	(cond ((= (length names) 1)
+	       (semantic-go-to-tag (car names))
+	       (semantic-momentary-highlight-tag (car names)))
+	      ((> (length names) 1)
+	       (let* ((ctxt (semantic-find-tags-by-name (oref temp :context)
+							(current-buffer)))
+		      (cls (semantic-find-tags-by-class 'context ctxt))
+		      )
+		 (while (and names
+			     (< (semantic-tag-start (car names))
+				(semantic-tag-start (car cls))))
+		   (setq names (cdr names)))
+		 (if names
+		     (progn
+		       (semantic-go-to-tag (car names))
+		       (semantic-momentary-highlight-tag (car names)))
+		   (error "Can't find template %s" template-name))
+		 ))
+	      (t (error "Can't find template %s" template-name)))
+	)))
+
+(defun srecode-add-code-generator (function name &optional binding)
+  "Add the srecoder code generator FUNCTION with NAME to the menu.
+Optional BINDING specifies the keybinding to use in the srecoder map.
+BINDING should be a capital letter.  Lower case letters are reserved
+for individual templates.
+Optional MODE specifies a major mode this function applies to.
+Do not specify a mode if this function could be applied to most
+programming modes."
+  ;; Update the menu generating part.
+  (let ((remloop nil))
+    (while (setq remloop (assoc function srecode-minor-mode-generators))
+      (setq srecode-minor-mode-generators
+	    (remove remloop srecode-minor-mode-generators))))
+
+  (add-to-list 'srecode-minor-mode-generators
+	       (cons function name))
+
+  ;; Remove this function from any old bindings.
+  (when binding
+    (let ((oldkey (where-is-internal function
+				      (list srecode-prefix-map)
+				      t t t)))
+      (if (or (not oldkey)
+	      (and (= (length oldkey) 1)
+		   (= (length binding) 1)
+		   (= (aref oldkey 0) (aref binding 0))))
+	  ;; Its the same.
+	  nil
+	;; Remove the old binding
+	(define-key srecode-prefix-map oldkey nil)
+	)))
+
+  ;; Update Keybings
+  (let ((oldbinding (lookup-key srecode-prefix-map binding)))
+
+    ;; During development, allow overrides.
+    (when (and oldbinding
+	       (not (eq oldbinding function))
+	       (or (eq this-command 'eval-defun) (eq this-command 'checkdoc-eval-defun))
+	       (y-or-n-p (format "Override old binding %s? " oldbinding)))
+      (setq oldbinding nil))
+
+    (if (not oldbinding)
+	(define-key srecode-prefix-map binding function)
+      (if (eq function oldbinding)
+	  nil
+	;; Not the same.
+	(message "Conflict binding %S binding to srecode map."
+		 binding))))
+  )
+
+(provide 'srecode-mode)
+
+;;; srecode-mode.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-semantic.el b/site/cedet-1.0pre7/srecode/srecode-semantic.el
new file mode 100644
index 0000000..b88c474
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-semantic.el
@@ -0,0 +1,438 @@
+;;; srecode-semantic.el --- Semantic specific extensions to SRecode.
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-semantic.el,v 1.14 2009/04/04 03:09:42 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic specific extensions to the Semantic Recoder.
+;;
+;; I realize it is the "Semantic Recoder", but most of srecode
+;; is a template library and set of user interfaces unrelated to
+;; semantic in the specific.
+;;
+;; This file defines the following:
+;;   - :tag argument handling.
+;;   - <more goes here>
+
+;;; Code:
+(require 'srecode-insert)
+(require 'srecode-dictionary)
+(require 'semantic-tag)
+(require 'senator)
+
+
+;;; The SEMANTIC TAG inserter
+;;
+;; Put a tag into the dictionary that can be used w/ arbitrary
+;; lisp expressions.
+
+(defclass srecode-semantic-tag (srecode-dictionary-compound-value)
+  ((prime :initarg :prime
+	  :type semantic-tag
+	  :documentation
+	  "This is the primary insertion tag.")
+   )
+  "Wrap up a collection of semantic tag information.
+This class will be used to derive dictionary values.")
+
+(defmethod srecode-compound-toString((cp srecode-semantic-tag)
+				     function
+				     dictionary)
+  "Convert the compound dictionary value CP to a string.
+If FUNCTION is non-nil, then FUNCTION is somehow applied to an
+aspect of the compound value."
+  (if (not function)
+      ;; Just format it in some handy dandy way.
+      (semantic-format-tag-prototype (oref cp :prime))
+    ;; Otherwise, apply the function to the tag itself.
+    (funcall function (oref cp :prime))
+    ))
+
+
+;;; Managing the `current' tag
+;;
+
+(defvar srecode-semantic-selected-tag nil
+  "The tag selected by a :tag template argument.
+If this is nil, then `senator-tag-ring' is used.")
+
+(defun srecode-semantic-tag-from-kill-ring ()
+  "Create an `srecode-semantic-tag' from the senator kill ring."
+  (if (ring-empty-p senator-tag-ring)
+      (error "You must use `senator-copy-tag' to provide a tag to this template"))
+  (ring-ref senator-tag-ring 0))
+
+
+;;; ARGUMENT HANDLERS
+
+;;; :tag ARGUMENT HANDLING
+;;
+;; When a :tag argument is required, identify the current :tag,
+;; and apply it's parts into the dictionary.
+;;;###autoload
+(defun srecode-semantic-handle-:tag (dict)
+  "Add macroes into the dictionary DICT based on the current :tag."
+  ;; We have a tag, start adding "stuff" into the dictionary.
+  (let ((tag (or srecode-semantic-selected-tag
+		 (srecode-semantic-tag-from-kill-ring))))
+    (when (not tag)
+      "No tag for current template.  Use the semantic kill-ring.")
+    (srecode-semantic-apply-tag-to-dict
+     (srecode-semantic-tag (semantic-tag-name tag)
+			   :prime tag)
+     dict)))
+
+;;; :tagtype ARGUMENT HANDLING
+;;
+;; When a :tagtype argument is required, identify the current tag, of
+;; cf class 'type.  Apply those parameters to the dictionary.
+
+;;;###autoload
+(defun srecode-semantic-handle-:tagtype (dict)
+  "Add macroes into the dictionary DICT based on a tag of class type at point.
+Assumes the cursor is in a tag of class type.  If not, throw an error."
+  (let ((typetag (or srecode-semantic-selected-tag
+		     (semantic-current-tag-of-class 'type))))
+    (when (not typetag)
+      (error "Cursor is not in a TAG of class 'type"))
+    (srecode-semantic-apply-tag-to-dict
+     typetag
+     dict)))
+
+
+;;; TAG in a DICTIONARY
+;;
+(defvar srecode-semantic-apply-tag-augment-hook nil
+  "A function called for each tag added to a dictionary.
+The hook is called with two arguments, the TAG and DICT
+to be augmented.")
+
+;;;###autoload
+(define-overload srecode-semantic-apply-tag-to-dict (tagobj dict)
+  "Insert fewatures of TAGOBJ into the dictionary DICT.
+TAGOBJ is an object of class `srecode-semantic-tag'.  This class
+is a compound inserter value.
+DICT is a dictionary object.
+At a minimum, this function will create dictionary macro for NAME.
+It is also likely to create macros for TYPE (data type), function arguments,
+variable default values, and other things."
+  )
+
+;;;###autoload
+(defun srecode-semantic-apply-tag-to-dict-default (tagobj dict)
+  "Insert features of TAGOBJ into dictionary DICT."
+  ;; Store the sst into the dictionary.
+  (srecode-dictionary-set-value dict "TAG" tagobj)
+
+  ;; Pull out the tag for the individual pieces.
+  (let ((tag (oref tagobj :prime)))
+
+    (srecode-dictionary-set-value dict "NAME" (semantic-tag-name tag))
+    (srecode-dictionary-set-value dict "TYPE" (semantic-format-tag-type tag nil))
+  
+    (run-hook-with-args 'srecode-semantic-apply-tag-augment-hook tag dict)
+
+    (cond
+     ;;
+     ;; FUNCTION
+     ;;
+     ((eq (semantic-tag-class tag) 'function)
+      ;; FCN ARGS
+      (let ((args (semantic-tag-function-arguments tag)))
+	(while args
+	  (let ((larg (car args))
+		(subdict (srecode-dictionary-add-section-dictionary
+			  dict "ARGS")))
+	    ;; Clean up elements in the arg list.
+	    (if (stringp larg)
+		(setq larg (semantic-tag-new-variable
+			    larg nil nil)))
+	    ;; Apply the sub-argument to the subdictionary.
+	    (srecode-semantic-apply-tag-to-dict
+	     (srecode-semantic-tag (semantic-tag-name larg)
+				   :prime larg)
+	     subdict)
+	    )
+	  ;; Next!
+	  (setq args (cdr args))))
+      ;; PARENTS
+      (let ((p (semantic-tag-function-parent tag)))
+	(when p
+	  (srecode-dictionary-set-value dict "PARENT" p)
+	  ))
+      ;; EXCEPTIONS (java/c++)
+      (let ((exceptions (semantic-tag-get-attribute tag :throws)))
+	(while exceptions
+	  (let ((subdict (srecode-dictionary-add-section-dictionary
+			  dict "THROWS")))
+	    (srecode-dictionary-set-value subdict "NAME" (car exceptions))
+	    )
+	  (setq exceptions (cdr exceptions)))
+	)
+      )
+     ;;
+     ;; VARIABLE
+     ;;
+     ((eq (semantic-tag-class tag) 'variable)
+      (when (semantic-tag-variable-default tag)
+	(let ((subdict (srecode-dictionary-add-section-dictionary
+			dict "HAVEDEFAULT")))
+	  (srecode-dictionary-set-value
+	   subdict "VALUE" (semantic-tag-variable-default tag))))
+      )
+     ;;
+     ;; TYPE
+     ;;
+     ((eq (semantic-tag-class tag) 'type)
+      (dolist (p (semantic-tag-type-superclasses tag))
+	(let ((sd (srecode-dictionary-add-section-dictionary
+		   dict "PARENTS")))
+	  (srecode-dictionary-set-value sd "NAME" p)
+	  ))
+      (dolist (i (semantic-tag-type-interfaces tag))
+	(let ((sd (srecode-dictionary-add-section-dictionary
+		   dict "INTERFACES")))
+	  (srecode-dictionary-set-value sd "NAME" i)
+	  ))
+; NOTE : The members are too complicated to do via a template.
+;        do it via the insert-tag solution instead.
+;
+;      (dolist (mem (semantic-tag-type-members tag))
+;	(let ((subdict (srecode-dictionary-add-section-dictionary
+;			dict "MEMBERS")))
+;	  (when (stringp mem)
+;	    (setq mem (semantic-tag-new-variable mem nil nil)))
+;	  (srecode-semantic-apply-tag-to-dict
+;	   (srecode-semantic-tag (semantic-tag-name mem)
+;				 :prime mem)
+;	   subdict)))
+      )
+     )
+    ))
+
+
+
+;;; INSERT A TAG API
+;;
+;; Routines that take a tag, and insert into a buffer.
+(define-overload srecode-semantic-find-template (class prototype ctxt)
+  "Find a template for a tag of class CLASS based on context.
+PROTOTYPE is non-nil if we want a prototype template instead."
+  )
+
+(defun srecode-semantic-find-template-default (class prototype ctxt)
+  "Find a template for tag CLASS based on context.
+PROTOTYPE is non-nil if we need a prototype.
+CTXT is the pre-calculated context."
+  (let* ((top (car ctxt))
+	 (tname (if (stringp class)
+		    class
+		  (symbol-name class)))
+	 (temp nil)
+	 )
+    ;; Try to find a template.
+    (setq temp (or
+		(when prototype
+		  (srecode-template-get-table (srecode-table)
+					      (concat tname "-tag-prototype")
+					      top))
+		(when prototype
+		  (srecode-template-get-table (srecode-table)
+					      (concat tname "-prototype")
+					      top))
+		(srecode-template-get-table (srecode-table)
+					    (concat tname "-tag")
+					    top)
+		(srecode-template-get-table (srecode-table)
+					    tname
+					    top)
+		(when (and (not (string= top "declaration"))
+			   prototype)
+		  (srecode-template-get-table (srecode-table)
+					      (concat tname "-prototype")
+					      "declaration"))
+		(when (and (not (string= top "declaration"))
+			   prototype)
+		  (srecode-template-get-table (srecode-table)
+					      (concat tname "-tag-prototype")
+					      "declaration"))
+		(when (not (string= top "declaration"))
+		  (srecode-template-get-table (srecode-table)
+					      (concat tname "-tag")
+					      "declaration"))
+		(when (not (string= top "declaration"))
+		  (srecode-template-get-table (srecode-table)
+					      tname
+					      "declaration"))
+		))
+    temp))
+
+;;;###autoload
+(defun srecode-semantic-insert-tag (tag &optional style-option
+					point-insert-fcn
+					&rest dict-entries)
+  "Insert TAG into a buffer useing srecode templates at point.
+
+Optional STYLE-OPTION is a list of minor configuration of styles,
+such as the symbol 'prototype for prototype functions, or
+'system for system includes, and 'doxygen, for a doxygen style
+comment.
+
+Optional third argument POINT-INSERT-FCN is a hook that is run after
+TAG is inserted that allows an opportunity to fill in the body of
+some thing.  This hook function is called with one argument, the TAG
+being inserted.
+
+The rest of the arguments are DICT-ENTRIES.  DICT-ENTRIES
+is of the form ( NAME1 VALUE1 NAME2 VALUE2 ... NAMEn VALUEn).
+
+The exact template used is based on the current context.
+The template used is found within the toplevel context as calculated
+by `srecode-calculate-context', such as `declaration', `classdecl',
+or `code'.
+
+For various conditions, this function looks for a template with
+the name CLASS-tag, where CLASS is the tag class.  If it cannot
+find that, it will look for that template in the
+`declaration'context (if the current context was not `declaration').
+
+If PROTOTYPE is specified, it will first look for templates with
+the name CLASS-tag-prototype, or CLASS-prototype as above.
+
+See `srecode-semantic-apply-tag-to-dict' for details on what is in
+the dictionary when the templates are called.
+
+This function returns to location in the buffer where the
+inserted tag ENDS, and will leave point inside the inserted
+text based on any occurance of a point-inserter.  Templates such
+as `function' will leave point where code might be inserted."
+  (srecode-load-tables-for-mode major-mode)
+  (let* ((ctxt (srecode-calculate-context))
+	 (top (car ctxt))
+	 (tname (symbol-name (semantic-tag-class tag)))
+	 (dict (srecode-create-dictionary))
+	 (temp nil)
+	 (errtype tname)
+	 (prototype (memq 'prototype style-option))
+	 )
+    ;; Try some special cases.
+    (cond ((and (semantic-tag-of-class-p tag 'function)
+		(semantic-tag-get-attribute tag :constructor-flag))
+	   (setq temp (srecode-semantic-find-template
+		       "constructor" prototype ctxt))
+	   )
+
+	  ((and (semantic-tag-of-class-p tag 'function)
+		(semantic-tag-get-attribute tag :destructor-flag))
+	   (setq temp (srecode-semantic-find-template
+		       "destructor" prototype ctxt))
+	   )
+
+	  ((and (semantic-tag-of-class-p tag 'function)
+		(semantic-tag-function-parent tag))
+	   (setq temp (srecode-semantic-find-template
+		       "method" prototype ctxt))
+	   )
+
+	  ((and (semantic-tag-of-class-p tag 'variable)
+		(semantic-tag-get-attribute tag :constant-flag))
+	   (setq temp (srecode-semantic-find-template
+		       "variable-const" prototype ctxt))
+	   )
+	  )
+
+    (when (not temp)
+      ;; Try the basics
+      (setq temp (srecode-semantic-find-template
+		  tname prototype ctxt)))
+
+    ;; Try some backup template names.
+    (when (not temp)
+      (cond
+       ;; Types might split things up based on the type's type.
+       ((and (eq (semantic-tag-class tag) 'type)
+	     (semantic-tag-type tag))
+	(setq temp (srecode-semantic-find-template
+		    (semantic-tag-type tag) prototype ctxt))
+	(setq errtype (concat errtype " or " (semantic-tag-type tag)))
+	)
+       ;; A function might be an externally declared method.
+       ((and (eq (semantic-tag-class tag) 'function)
+	     (semantic-tag-function-parent tag))
+	(setq temp (srecode-semantic-find-template
+		    "method" prototype ctxt)))
+       (t
+	nil)
+       ))
+
+    ;; Can't find one?  Drat!
+    (when (not temp)
+      (error "Cannot find template %s in %s for inserting tag %S"
+	     errtype top (semantic-format-tag-summarize tag)))
+
+    ;; Resolve Arguments
+    (let ((srecode-semantic-selected-tag tag))
+      (srecode-resolve-arguments temp dict))
+
+    ;; Resolve TAG into the dictionary.  We may have a :tag arg
+    ;; from the macro such that we don't need to do this.
+    (when (not (srecode-dictionary-lookup-name dict "TAG"))
+      (let ((tagobj (srecode-semantic-tag (semantic-tag-name tag) :prime tag))
+	    )
+	(srecode-semantic-apply-tag-to-dict tagobj dict)))
+
+    ;; Insert dict-entries into the dictionary LAST so that previous
+    ;; items can be overriden.
+    (let ((entries dict-entries))
+      (while entries
+	(srecode-dictionary-set-value dict
+				      (car entries)
+				      (car (cdr entries)))
+	(setq entries (cdr (cdr entries)))))
+
+    ;; Insert the template.
+    (let ((endpt (srecode-insert-fcn temp dict nil t)))
+
+      (run-hook-with-args 'point-insert-fcn tag)
+      ;;(sit-for 1)
+
+      (cond
+       ((semantic-tag-of-class-p tag 'type)
+	;; Insert all the members at the current insertion point.
+	(dolist (m (semantic-tag-type-members tag))
+	  
+	  (when (stringp m)
+	    (setq m (semantic-tag-new-variable m nil nil)))
+
+	  ;; We do prototypes w/in the class decl?
+	  (let ((me (srecode-semantic-insert-tag m '(prototype))))
+	    (goto-char me))
+
+	  ))
+       )
+
+      endpt)
+    ))
+
+(provide 'srecode-semantic)
+
+;;; srecode-semantic.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-srt.el b/site/cedet-1.0pre7/srecode/srecode-srt.el
new file mode 100644
index 0000000..19070e3
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-srt.el
@@ -0,0 +1,105 @@
+;;; srecode-srt.el --- argument handlers for SRT files
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-srt.el,v 1.6 2009/01/09 22:59:17 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Filters for SRT files, the Semantic Recoder template files.
+
+;;; Code:
+
+(defvar srecode-read-variable-name-history nil
+  "History for `srecode-read-variable-name'.")
+
+;;;###autoload
+(defun srecode-read-variable-name (prompt &optional initial hist default)
+  "Read in the name of a declaired variable in the current SRT file.
+PROMPT is the prompt to use.
+INITIAL is the initial string.
+HIST is the history value, otherwise `srecode-read-variable-name-history'
+     is used.
+DEFAULT is the default if RET is hit."
+  (let* ((newdict (srecode-create-dictionary))
+	 (currfcn (semantic-current-tag))
+	 )
+    (srecode-resolve-argument-list
+     (mapcar 'read
+	     (semantic-tag-get-attribute currfcn :arguments))
+     newdict)
+
+    (with-slots (namehash) newdict
+      (completing-read prompt namehash nil nil initial
+		       (or hist 'srecode-read-variable-name-history)
+		       default))
+    ))
+
+(defvar srecode-read-major-mode-history nil
+  "History for `srecode-read-variable-name'.")
+
+;;;###autoload
+(defun srecode-read-major-mode-name (prompt &optional initial hist default)
+  "Read in the name of a desired `major-mode'.
+PROMPT is the prompt to use.
+INITIAL is the initial string.
+HIST is the history value, otherwise `srecode-read-variable-name-history'
+     is used.
+DEFAULT is the default if RET is hit."
+  (completing-read prompt obarray
+		   (lambda (s) (string-match "-mode$" (symbol-name s)))
+		   nil initial (or hist 'srecode-read-major-mode-history))
+  )
+
+;;;###autoload
+(defun srecode-semantic-handle-:srt (dict)
+  "Add macros into the dictionary DICT based on the current SRT file.
+Adds the following:
+ESCAPE_START - This files value of escape_start
+ESCAPE_END - This files value of escape_end
+MODE - The mode of this buffer.  If not declared yet, guess."
+  (let* ((es (semantic-find-first-tag-by-name "escape_start" (current-buffer)))
+	 (ee (semantic-find-first-tag-by-name "escape_end" (current-buffer)))
+	 (mode-var (semantic-find-first-tag-by-name "mode" (current-buffer)))
+	 (mode (if mode-var
+		   (semantic-tag-variable-default mode-var)
+		 nil))
+	 )
+    (srecode-dictionary-set-value dict "ESCAPE_START"
+				  (if es
+				      (car (semantic-tag-variable-default es))
+				    "{{"))
+    (srecode-dictionary-set-value dict "ESCAPE_END"
+				  (if ee
+				      (car (semantic-tag-variable-default ee))
+				    "}}"))
+    (when (not mode)
+      (let* ((fname (file-name-nondirectory
+		     (buffer-file-name (current-buffer))))
+	     )
+	(when (string-match "-\\(\\w+\\)\\.srt" fname)
+	  (setq mode (concat (match-string 1 fname) "-mode")))))
+
+    (when mode
+      (srecode-dictionary-set-value dict "MAJORMODE" mode))
+	  
+    ))
+
+(provide 'srecode-srt)
+;;; srecode-srt.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-table.el b/site/cedet-1.0pre7/srecode/srecode-table.el
new file mode 100644
index 0000000..cb7eeb2
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-table.el
@@ -0,0 +1,257 @@
+;;; srecode-table.el --- Tables of Semantic Recoders
+
+;; Copyright (C) 2007, 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic Recoder tables manage lists of templates and the major
+;; modes they are associated with.
+;;
+
+(require 'eieio)
+(require 'eieio-base)
+
+;;; Code:
+
+;;; TEMPLATE TABLE
+;;
+(defclass srecode-template-table ()
+  (;;
+   ;; Raw file tracking
+   ;;
+   (file :initarg :file
+	 :type string
+	 :documentation
+	 "The name of the file this table was built from.")
+   (filesize :initarg :filesize
+	     :type number
+	     :documentation
+	     "The size of the file when it was parsed.")
+   (filedate :initarg :filedate
+	     :type cons
+	     :documentation
+	     "Date from the inode of the file when it was last edited.
+Format is from the `file-attributes' function.")
+   (major-mode :initarg :major-mode
+	       :documentation
+	       "The major mode this table of templates is associated with.")
+   ;;
+   ;; Template file sorting data
+   ;;
+   (application :initarg :application
+		:type symbol
+		:documentation
+		"Tracks the name of the application these templates belong to.
+If this is nil, then this template table belongs to a set of generic
+templates that can be used with no additional dictionary values.
+When it is non-nil, it is assumed the template macros need specialized
+Emacs Lisp code to fill in the dictoinary.")
+   (priority :initarg :priority
+	     :type number
+	     :documentation
+	     "For file of this Major Mode, what is the priority of this file.
+When there are multiple template files with similar names, templates with
+the highest priority are scanned last, allowing them to override values in
+previous template files.")
+   (project :initarg :project
+	    :type (or null string)
+	    :documentation
+	    "Scope some project files to a specific project.
+The value is a directory which forms the root of a particular project,
+or a subset of a particular project.")
+   ;;
+   ;; Parsed Data from the template file
+   ;;
+   (templates :initarg :templates
+	      :type list
+	      :documentation
+	      "The list of templates compiled into this table.")
+   (namehash :initarg :namehash
+	     :documentation
+	     "Hash table containing the names of all the templates.")
+   (contexthash :initarg :contexthash
+		:documentation
+		"")
+   (variables :initarg :variables
+	      :documentation
+	      "AList of variables.
+These variables are used to initialize dictionaries.")
+   )
+  "Semantic recoder template table.
+A Table contains all templates from a single .srt file.
+Tracks various lookup hash tables.")
+
+;;; MODE TABLE
+;;
+(defvar srecode-mode-table-list nil
+  "List of all the SRecode mode table classes that have been built.")
+
+(defclass srecode-mode-table (eieio-instance-tracker)
+   ((tracking-symbol :initform 'srecode-mode-table-list)
+    (major-mode :initarg :major-mode
+		:documentation
+		"Table of template tables for this major-mode.")
+    (tables :initarg :tables
+	    :documentation
+	    "All the tables that have been defined for this major mode.")
+    )
+   "Track template tables for a particular major mode.
+Tracks all the template-tables for a specific major mode.")
+
+;;;###autoload
+(defun srecode-get-mode-table (mode)
+  "Get the SRecoder mode table for the major mode MODE.
+Optional argument SOFT indicates to not make a new one if a table
+was not found."
+  (let ((ans nil))
+    (while (and (not ans) mode)
+      (setq ans (eieio-instance-tracker-find
+		 mode 'major-mode 'srecode-mode-table-list)
+	    mode (get-mode-local-parent mode)))
+    ans))
+
+(defun srecode-make-mode-table (mode)
+  "Get the SRecoder mode table for the major mode MODE."
+  (let ((old (eieio-instance-tracker-find
+	      mode 'major-mode 'srecode-mode-table-list)))
+    (if old
+	old
+      (let* ((ms (if (stringp mode) mode (symbol-name mode)))
+	     (new (srecode-mode-table ms
+				      :major-mode mode
+				      :tables nil)))
+	;; Save this new mode table in that mode's variable.
+	(eval `(setq-mode-local ,mode srecode-table ,new))
+	
+	new))))
+
+(defmethod srecode-mode-table-find ((mt srecode-mode-table) file)
+  "Look in the mode table MT for a template table from FILE.
+Return nil if there was none."
+  (object-assoc file 'file (oref mt tables)))
+
+;;;###autoload
+(defun srecode-mode-table-new (mode file &rest init)
+  "Create a new template table for MODE in FILE.
+INIT are the initialization parametrs for the new template table."
+  (let* ((mt (srecode-make-mode-table mode))
+	 (old (srecode-mode-table-find mt file))
+	 (attr (file-attributes file))
+	 (new (apply 'srecode-template-table
+		     (file-name-nondirectory file)
+		     :file file
+		     :filesize (nth 7 attr)
+		     :filedate (nth 5 attr)
+		     :major-mode mode
+		     init
+		     )))
+    ;; Whack the old table.
+    (when old (object-remove-from-list mt 'tables old))
+    ;; Add the new table
+    (object-add-to-list mt 'tables new)
+    ;; Sort the list in reverse order.  When other routines
+    ;; go front-to-back, the highest priority items are put
+    ;; into the search table first, allowing lower priority items
+    ;; to be the items found in the search table.
+    (object-sort-list mt 'tables (lambda (a b)
+				   (> (oref a :priority)
+				      (oref b :priority))))
+    ;; Return it.
+    new))
+
+(defun object-sort-list (object slot predicate)
+  "Sort the items in OBJECT's SLOT.
+Use PREDICATE is the same as for the `sort' function."
+  (when (slot-boundp object slot)
+    (when (listp (eieio-oref object slot))
+      (eieio-oset object slot (sort (eieio-oref object slot) predicate)))))
+
+;;; DEBUG
+;;
+;; Dump out information about the current srecoder compiled templates.
+;;
+;;;###autoload
+(defun srecode-dump-templates (mode)
+  "Dump a list of the current templates for MODE."
+  (interactive "sMode: ")
+  (let ((modesym (cond ((string= mode "")
+			major-mode)
+		       ((not (string-match "-mode" mode))
+			(intern-soft (concat mode "-mode")))
+		       (t
+			(intern-soft mode)))))
+    (srecode-load-tables-for-mode modesym)
+    (let ((tmp (srecode-get-mode-table modesym))
+	  )
+      (if (not tmp)
+	  (error "No table found for mode %S" modesym))
+      (with-output-to-temp-buffer "*SRECODE DUMP*"
+	(srecode-dump tmp))
+      )))
+
+(defmethod srecode-dump ((tab srecode-mode-table))
+  "Dump the contents of the SRecode mode table TAB."
+  (princ "MODE TABLE FOR ")
+  (princ (oref tab :major-mode))
+  (princ "\n--------------------------------------------\n\nNumber of tables: ")
+  (let ((subtab (oref tab :tables)))
+    (princ (length subtab))
+    (princ "\n\n")
+    (while subtab
+      (srecode-dump (car subtab))
+      (setq subtab (cdr subtab)))
+    ))
+
+(defmethod srecode-dump ((tab srecode-template-table))
+  "Dump the contents of the SRecode template table TAB."
+  (princ "Template Table for ")
+  (princ (object-name-string tab))
+  (princ "\nPriority: ")
+  (prin1 (oref tab :priority))
+  (when (oref tab :application)
+    (princ "\nApplication: ")
+    (princ (oref tab :application)))
+  (when (oref tab :project)
+    (princ "\nProject Directory: ")
+    (princ (oref tab :project))
+    (when (not (srecode-template-table-in-project-p tab))
+      (princ "\n   ** Not Usable in this file. **")))
+  (princ "\n\nVariables:\n")
+  (let ((vars (oref tab variables)))
+    (while vars
+      (princ (car (car vars)))
+      (princ "\t")
+      (if (< (length (car (car vars))) 9)
+	  (princ "\t"))
+      (prin1 (cdr (car vars)))
+      (princ "\n")
+      (setq vars (cdr vars))))
+  (princ "\n\nTemplates:\n")
+  (let ((temp (oref tab templates)))
+    (while temp
+      (srecode-dump (car temp))
+      (setq temp (cdr temp))))
+  )  
+
+
+(provide 'srecode-table)
+
+;;; srecode-table.el ends here
+
diff --git a/site/cedet-1.0pre7/srecode/srecode-template-mode.el b/site/cedet-1.0pre7/srecode/srecode-template-mode.el
new file mode 100644
index 0000000..1347172
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-template-mode.el
@@ -0,0 +1,760 @@
+;;; srecode-template-mode.el --- Major mode for writing screcode macros
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; 
+
+(require 'srecode-template)
+(require 'semantic)
+(require 'wisent)
+
+;;; Code:
+(defvar srecode-template-mode-syntax-table
+  (let ((table (make-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+    (modify-syntax-entry ?\n ">"     table) ;; Comment end
+    (modify-syntax-entry ?$  "."     table) ;; Punctuation
+    (modify-syntax-entry ?:  "."     table) ;; Punctuation
+    (modify-syntax-entry ?<  "."     table) ;; Punctuation
+    (modify-syntax-entry ?>  "."     table) ;; Punctuation
+    (modify-syntax-entry ?#  "."     table) ;; Punctuation
+    (modify-syntax-entry ?!  "."     table) ;; Punctuation
+    (modify-syntax-entry ??  "."     table) ;; Punctuation
+    (modify-syntax-entry ?\" "\""    table) ;; String
+    (modify-syntax-entry ?\- "_"     table) ;; Symbol
+    (modify-syntax-entry ?\\ "\\"    table) ;; Quote
+    (modify-syntax-entry ?\` "'"     table) ;; Prefix ` (backquote)
+    (modify-syntax-entry ?\' "'"     table) ;; Prefix ' (quote)
+    (modify-syntax-entry ?\, "'"     table) ;; Prefix , (comma)
+    
+    table)
+  "Syntax table used in semantic recoder macro buffers.")
+
+(defface srecode-separator-face
+  '((t (:weight bold :strike-through t)))
+  "Face used for decorating separators in srecode template mode."
+  :group 'srecode)
+
+(defvar srecode-font-lock-keywords
+  '(
+    ;; Template
+    ("^\\(template\\)\\s-+\\(\\w*\\)\\(\\( \\(:\\w+\\)\\|\\)+\\)$"
+     (1 font-lock-keyword-face)
+     (2 font-lock-function-name-face)
+     (3 font-lock-builtin-face ))
+    ("^\\(sectiondictionary\\)\\s-+\""
+     (1 font-lock-keyword-face))
+    ("^\\(bind\\)\\s-+\""
+     (1 font-lock-keyword-face))
+    ;; Variable type setting
+    ("^\\(set\\)\\s-+\\(\\w+\\)\\s-+"
+     (1 font-lock-keyword-face)
+     (2 font-lock-variable-name-face))
+    ("^\\(show\\)\\s-+\\(\\w+\\)\\s-*$"
+     (1 font-lock-keyword-face)
+     (2 font-lock-variable-name-face))
+    ("\\<\\(macro\\)\\s-+\""
+     (1 font-lock-keyword-face))
+    ;; Context type setting
+    ("^\\(context\\)\\s-+\\(\\w+\\)"
+     (1 font-lock-keyword-face)
+     (2 font-lock-builtin-face))
+    ;; Prompting setting
+    ("^\\(prompt\\)\\s-+\\(\\w+\\)"
+     (1 font-lock-keyword-face)
+     (2 font-lock-variable-name-face))
+    ("\\(default\\(macro\\)?\\)\\s-+\\(\\(\\w\\|\\s_\\)+\\)"
+     (1 font-lock-keyword-face)
+     (3 font-lock-type-face))
+    ("\\<\\(default\\(macro\\)?\\)\\>" (1 font-lock-keyword-face))
+    ("\\<\\(read\\)\\s-+\\(\\(\\w\\|\\s_\\)+\\)"
+     (1 font-lock-keyword-face)
+     (2 font-lock-type-face))
+
+    ;; Macro separators
+    ("^----\n" 0 'srecode-separator-face)
+
+    ;; Macro Matching
+    (srecode-template-mode-macro-escape-match 1 font-lock-string-face)
+    ((lambda (limit)
+       (srecode-template-mode-font-lock-macro-helper
+	limit "\\(\\??\\w+\\)[^ \t\n{}$#@&*()]*"))
+     1 font-lock-variable-name-face)
+    ((lambda (limit)
+       (srecode-template-mode-font-lock-macro-helper
+	limit "\\([#/]\\w+\\)[^ \t\n{}$#@&*()]*"))
+     1 font-lock-keyword-face)
+    ((lambda (limit)
+       (srecode-template-mode-font-lock-macro-helper
+	limit "\\([<>]\\w*\\):\\(\\w+\\):\\(\\w+\\)"))
+     (1 font-lock-keyword-face)
+     (2 font-lock-builtin-face)
+     (3 font-lock-type-face))
+    ((lambda (limit)
+       (srecode-template-mode-font-lock-macro-helper
+	limit "\\([<>?]?\\w*\\):\\(\\w+\\)"))
+     (1 font-lock-keyword-face)
+     (2 font-lock-type-face))
+    ((lambda (limit)
+       (srecode-template-mode-font-lock-macro-helper
+	limit "!\\([^{}$]*\\)"))
+     1 font-lock-comment-face)
+
+    )
+  "Keywords for use with srecode macros and font-lock.")
+
+(defun srecode-template-mode-font-lock-macro-helper (limit expression)
+  "Match against escape characters.
+Don't scan past LIMIT.  Match with EXPRESSION."
+  (let* ((done nil)
+	 (md nil)
+	 (es (regexp-quote (srecode-template-get-escape-start)))
+	 (ee (regexp-quote (srecode-template-get-escape-end)))
+	 (regex (concat es expression ee))
+	 )
+    (while (not done)
+      (save-match-data
+	(if (re-search-forward regex limit t)
+	    (when (equal (car (srecode-calculate-context)) "code")
+	      (setq md (match-data)
+		    done t))
+	  (setq done t))))
+    (set-match-data md)
+    ;; (when md (message "Found a match!"))
+    (when md t)))
+
+(defun srecode-template-mode-macro-escape-match (limit)
+  "Match against escape characters.
+Don't scan past LIMIT."
+  (let* ((done nil)
+	 (md nil)
+	 (es (regexp-quote (srecode-template-get-escape-start)))
+	 (ee (regexp-quote (srecode-template-get-escape-end)))
+	 (regex (concat "\\(" es "\\|" ee "\\)"))
+	 )
+    (while (not done)
+      (save-match-data
+	(if (re-search-forward regex limit t)
+	    (when (equal (car (srecode-calculate-context)) "code")
+	      (setq md (match-data)
+		    done t))
+	  (setq done t))))
+    (set-match-data md)
+    ;;(when md (message "Found a match!"))
+    (when md t)))
+
+(defvar srecode-font-lock-macro-keywords nil
+  "Dynamically generated `font-lock' keywords for srecode templates.
+Once the escape_start, and escape_end sequences are known, then
+we can tell font lock about them.")
+
+(defvar srecode-template-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-c\C-c" 'srecode-compile-templates)
+    (define-key km "\C-c\C-m" 'srecode-macro-help)
+    (define-key km "/" 'srecode-self-insert-complete-end-macro)
+    km)
+  "Keymap used in srecode mode.")
+
+;;;###autoload
+(defun srecode-template-mode ()
+  "Major-mode for writing srecode macros."
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'srecode-template-mode
+        mode-name "SRecoder"
+	comment-start ";;"
+	comment-end "")
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  (set (make-local-variable 'comment-start-skip)
+       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
+  (set-syntax-table srecode-template-mode-syntax-table)
+  (use-local-map srecode-template-mode-map)
+  (set (make-local-variable 'font-lock-defaults)
+       '(srecode-font-lock-keywords
+         nil  ;; perform string/comment fontification
+         nil  ;; keywords are case sensitive.
+         ;; This puts _ & - as a word constituant,
+         ;; simplifying our keywords significantly
+         ((?_ . "w") (?- . "w"))))
+  (run-hooks 'srecode-template-mode-hook)
+  )
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.srt$" . srecode-template-mode))
+
+;;; Template Commands
+;;
+(defun srecode-self-insert-complete-end-macro ()
+  "Self insert the current key, then autocomplete the end macro."
+  (interactive)
+  (call-interactively 'self-insert-command)
+  (when (and (semantic-current-tag)
+	     (semantic-tag-of-class-p (semantic-current-tag) 'function)
+	     )
+    (let* ((es (srecode-template-get-escape-start))
+	   (ee (srecode-template-get-escape-end))
+	   (name (save-excursion
+		   (forward-char (- (length es)))
+		   (forward-char -1)
+		   (if (looking-at (regexp-quote es))
+		       (srecode-up-context-get-name (point) t))))
+	   )
+      (when name
+	(insert name)
+	(insert ee))))
+  )
+  
+
+(defun srecode-macro-help ()
+  "Provide help for working with macros in a tempalte."
+  (interactive)
+  (let* ((root 'srecode-template-inserter)
+	 (chl (aref (class-v root) class-children))
+	 (ess (srecode-template-get-escape-start))
+	 (ees (srecode-template-get-escape-end))
+	 )
+    (with-output-to-temp-buffer "*SRecode Macros*"
+      (princ "Description of known SRecode Template Macros.")
+      (terpri)
+      (terpri)
+      (while chl
+	(let* ((C (car chl))
+	       (name (symbol-name C))
+	       (key (when (slot-exists-p C 'key)
+		      (oref C key)))
+	       (showexample t)
+	       )
+	  (setq chl (cdr chl))
+	  (setq chl (append (aref (class-v C) class-children) chl))
+
+	  (catch 'skip
+	    (when (eq C 'srecode-template-inserter-section-end)
+	      (throw 'skip nil))
+
+	    (when (class-abstract-p C)
+	      (throw 'skip nil))
+
+	    (princ "`")
+	    (princ name)
+	    (princ "'")
+	    (when (slot-exists-p C 'key)
+	      (when key
+		(princ " - Character Key: ")
+		(if (stringp key)
+		    (progn
+		      (setq showexample nil)
+		      (cond ((string= key "\n")
+			     (princ "\"\\n\"")
+			     )
+			    (t
+			     (prin1 key)
+			     )))
+		  (prin1 (format "%c" key))
+		  )))
+	    (terpri)
+	    (princ (documentation-property C 'variable-documentation))
+	    (terpri)
+	    (when showexample
+	      (princ "Example:")
+	      (terpri)
+	      (srecode-inserter-prin-example C ess ees)
+	      )
+
+	    (terpri)
+
+	    ) ;; catch
+	  );; let*
+	))))
+
+
+;;; Misc Language Overrides
+;;
+(define-mode-local-override semantic-ia-insert-tag
+  srecode-template-mode (tag)
+  "Insert the SRecode TAG into the current buffer."
+  (insert (semantic-tag-name tag)))
+
+
+;;; Local Context Parsing.
+;;
+(eval-when-compile
+  (require 'semantic-analyze))
+
+(defun srecode-in-macro-p (&optional point)
+  "Non-nil if POINT is inside a macro bounds.
+If the ESCAPE_START and END are different sequences,
+a simple search is used.  If ESCAPE_START and END are the same
+characteres, start at the beginning of the line, and find out
+how many occur."
+  (let ((tag (semantic-current-tag))
+	(es (regexp-quote (srecode-template-get-escape-start)))
+	(ee (regexp-quote (srecode-template-get-escape-end)))
+	(start (or point (point)))
+	)
+    (when (and tag (semantic-tag-of-class-p tag 'function))
+      (if (string= es ee)
+	  (save-excursion
+	    (beginning-of-line)
+	    (while (re-search-forward es start t 2))
+	    (if (re-search-forward es start t)
+		;; If there is a single, the the answer is yes.
+		t
+	      ;; If there wasn't another, then the answer is no.
+	      nil)
+	    )
+	;; ES And EE are not the same.
+	(save-excursion
+	  (and (re-search-backward es (semantic-tag-start tag) t)
+	       (>= (or (re-search-forward ee (semantic-tag-end tag) t)
+		       ;; No end match means an incomplete macro.
+		       start)
+		  start)))
+	))))
+
+(defun srecode-up-context-get-name (&optional point find-unmatched)
+  "Move up one context as for `semantic-up-context', and return the name.
+Moves point to the opening characters of the section macro text.
+If there is no upper context, return nil.
+Starts at POINT if provided.
+If FIND-UNMATCHED is specified as non-nil, then we are looking for an unmatched
+section."
+  (when point (goto-char (point)))
+  (let* ((tag (semantic-current-tag))
+	 (es (regexp-quote (srecode-template-get-escape-start)))
+	 (start (concat es "[#<]\\(\\w+\\)"))
+	 (orig (point))
+	 (name nil)
+	 (res nil))
+    (when (semantic-tag-of-class-p tag 'function)
+      (while (and (not res)
+		  (re-search-backward start (semantic-tag-start tag) t))
+	(when (save-excursion
+		(setq name (match-string 1))
+		(let ((endr (concat es "/" name)))
+		  (if (re-search-forward endr (semantic-tag-end tag) t)
+		      (< orig (point))
+		    (if (not find-unmatched)
+			(error "Unmatched Section Template")
+		      ;; We found what we want.
+		      t))))
+	  (setq res (point)))
+	)
+      ;; Restore in no result found.
+      (goto-char (or res orig))
+      name)))
+
+(define-mode-local-override semantic-up-context
+  srecode-template-mode (&optional point)
+  "Move up one context in the current code.
+Moves out one named section."
+  (not (srecode-up-context-get-name point)))
+
+(define-mode-local-override semantic-beginning-of-context
+  srecode-template-mode (&optional point)
+  "Move to the beginning of the current context.
+Moves the the beginning of one named section."
+  (if (semantic-up-context point)
+      t
+    (let ((es (regexp-quote (srecode-template-get-escape-start)))
+	  (ee (regexp-quote (srecode-template-get-escape-end))))
+      (re-search-forward es) ;; move over the start chars.
+      (re-search-forward ee) ;; Move after the end chars.
+      nil)))
+
+(define-mode-local-override semantic-end-of-context
+  srecode-template-mode (&optional point)
+  "Move to the beginning of the current context.
+Moves the the beginning of one named section."
+  (let ((name (srecode-up-context-get-name point))
+	(tag (semantic-current-tag))
+	(es  (regexp-quote (srecode-template-get-escape-start))))
+  (if (not name)
+      t
+    (unless (re-search-forward (concat es "/" name) (semantic-tag-end tag) t)
+      (error "Section %s has no end" name))
+    (goto-char (match-beginning 0))
+    nil)))
+
+(define-mode-local-override semantic-get-local-variables
+  srecode-template-mode (&optional point)
+  "Get local variables from an SRecode template."
+  (save-excursion
+    (when point (goto-char (point)))
+    (let* ((tag (semantic-current-tag))
+	   (name (save-excursion
+		   (srecode-up-context-get-name (point))))
+	   (subdicts (semantic-tag-get-attribute tag :dictionaries))
+	   (global nil)
+	   )
+      (dolist (D subdicts)
+	(setq global (cons (semantic-tag-new-variable (car D) nil)
+			   global)))
+      (if name
+	  ;; Lookup any subdictionaries in TAG.
+	  (let ((res nil))
+	    
+	    (while (and (not res) subdicts)
+	      ;; Find the subdictionary with the same name.  Those variables
+	      ;; are now local to this section.
+	      (when (string= (car (car subdicts)) name)
+		(setq res (cdr (car subdicts))))
+	      (setq subdicts (cdr subdicts)))
+	    ;; Pre-pend our global vars.
+	    (append global res))
+	;; If we aren't in a subsection, just do the global variables
+	global	    
+	))))
+
+(define-mode-local-override semantic-get-local-arguments
+  srecode-template-mode (&optional point)
+  "Get local arguments from an SRecode template."
+  (save-excursion
+    (when point (goto-char (point)))
+    (let* ((tag (semantic-current-tag))
+	   (args (semantic-tag-function-arguments tag))
+	   (argsym (mapcar 'intern args))
+	   (argvars nil)
+	   ;; Create a temporary dictionary in which the
+	   ;; arguments can be resolved so we can extract
+	   ;; the results.
+	   (dict (srecode-create-dictionary t))
+	   )
+      ;; Resolve args into our temp dictionary
+      (srecode-resolve-argument-list argsym dict)
+
+      (maphash 
+       (lambda (key entry)
+	 (setq argvars
+	       (cons (semantic-tag-new-variable key nil entry)
+		     argvars)))
+       (oref dict namehash))
+
+      argvars)))
+
+(define-mode-local-override semantic-ctxt-current-symbol
+  srecode-template-mode (&optional point)
+  "Return the current symbol under POINT.
+Return nil if point is not on/in a template macro."
+  (let ((macro (srecode-parse-this-macro point)))
+    (cdr macro))
+  )
+
+(defun srecode-parse-this-macro (&optional point)
+  "Return the current symbol under POINT.
+Return nil if point is not on/in a template macro.
+The first element is the key for the current macro, such as # for a
+section or ? for an ask variable."
+  (save-excursion
+    (if point (goto-char point))
+    (let ((tag (semantic-current-tag))
+	  (es (regexp-quote (srecode-template-get-escape-start)))
+	  (ee (regexp-quote (srecode-template-get-escape-end)))
+	  (start (point))
+	  (macrostart nil)
+	  (raw nil)
+	  )
+      (when (and tag (semantic-tag-of-class-p tag 'function)
+		 (srecode-in-macro-p point)
+		 (re-search-backward es (semantic-tag-start tag) t))
+	(setq macrostart (match-end 0))
+	(goto-char macrostart)
+	;; We have a match
+	(when (not (re-search-forward ee (semantic-tag-end tag) t))
+	  (goto-char start) ;; Pretend we are ok for completion
+	  (set-match-data (list start start))
+	  )
+
+	(if (> start (point))
+	    ;; If our starting point is after the found point, that
+	    ;; means we are not inside the macro.  Retur nil.
+	    nil
+	  ;; We are inside the macro, extract the text so far.
+	  (let* ((macroend (match-beginning 0))
+		 (raw (buffer-substring-no-properties
+		       macrostart macroend))
+		 (STATE (srecode-compile-state "TMP"))
+		 (inserter (condition-case nil
+			       (srecode-compile-parse-inserter
+				raw STATE)
+			     (error nil)))
+		 )
+	    (when inserter
+	      (let ((base
+		     (cons (oref inserter :object-name)
+			   (if (and (slot-boundp inserter :secondname)
+				    (oref inserter :secondname))
+			       (split-string (oref inserter :secondname)
+					     ":")
+			     nil)))
+		    (key (oref inserter key)))
+		(cond ((null key)
+		       ;; A plain variable
+		       (cons nil base))
+		      (t
+		       ;; A complex variable thingy.
+		       (cons (format "%c" key)
+			     base)))))
+	    )
+	  )))
+    ))
+
+(define-mode-local-override semantic-analyze-current-context
+  srecode-template-mode (point)
+  "Provide a Semantic analysis in SRecode template mode."
+    (let* ((context-return nil)
+	   (prefixandbounds (semantic-ctxt-current-symbol-and-bounds))
+	   (prefix (car prefixandbounds))
+	   (bounds (nth 2 prefixandbounds))
+	   (key (car (srecode-parse-this-macro (point))))
+	   (prefixsym nil)
+	   (prefix-var nil)
+	   (prefix-context nil)
+	   (prefix-function nil)
+	   (prefixclass (semantic-ctxt-current-class-list))
+	   (globalvar (semantic-find-tags-by-class 'variable (current-buffer)))
+	   (argtype 'macro)
+	   (scope (semantic-calculate-scope point))
+	   )
+
+      (oset scope fullscope (append (oref scope localvar) globalvar))
+      
+      (when prefix
+	;; First, try to find the variable for the first
+	;; entry in the prefix list.
+	(setq prefix-var (semantic-find-first-tag-by-name
+			  (car prefix) (oref scope fullscope)))
+	
+	(cond
+	 ((and (or (not key) (string= key "?"))
+	       (> (length prefix) 1))
+	  ;; Variables can have lisp function names.
+	  (with-mode-local emacs-lisp-mode
+	    (let ((fcns (semanticdb-find-tags-by-name (car (last prefix)))))
+	      (setq prefix-function (car (semanticdb-find-result-nth fcns 0)))
+	      (setq argtype 'elispfcn)))
+	  )
+	 ((or (string= key "<") (string= key ">"))
+	  ;; Includes have second args that is the template name.
+	  (if (= (length prefix) 3)
+	      (let ((contexts (semantic-find-tags-by-class
+			       'context (current-buffer))))
+		(setq prefix-context
+		      (or (semantic-find-first-tag-by-name
+			   (nth 1 prefix) contexts)
+			  ;; Calculate from location
+			  (semantic-tag
+			   (symbol-name
+			    (srecode-template-current-context))
+			   'context)))
+		(setq argtype 'template))
+	    (setq prefix-context
+		  ;; Calculate from location
+		  (semantic-tag
+		   (symbol-name (srecode-template-current-context))
+		   'context))
+	    (setq argtype 'template)
+	    )
+	  ;; The last one?
+	  (when (> (length prefix) 1)
+	    (let ((toc (srecode-template-find-templates-of-context
+			(read (semantic-tag-name prefix-context))))
+		  )
+	      (setq prefix-function 
+		    (or (semantic-find-first-tag-by-name
+			(car (last prefix)) toc)
+			;; Not in this buffer?  Search the master
+			;; templates list.
+			nil))
+	      ))
+	  )
+	 )
+
+	(setq prefixsym
+	      (cond ((= (length prefix) 3)
+		     (list (or prefix-var (nth 0 prefix))
+			   (or prefix-context (nth 1 prefix))
+			   (or prefix-function (nth 2 prefix))))
+		    ((= (length prefix) 2)
+		     (list (or prefix-var (nth 0 prefix))
+			   (or prefix-function (nth 1 prefix))))
+		    ((= (length prefix) 1)
+		     (list (or prefix-var (nth 0 prefix)))
+		     )))
+
+	(setq context-return
+	      (semantic-analyze-context-functionarg
+	       "context-for-srecode"
+	       :buffer (current-buffer)
+	       :scope scope
+	       :bounds bounds
+	       :prefix (or prefixsym
+			   prefix)
+	       :prefixtypes nil
+	       :prefixclass prefixclass
+	       :errors nil
+	       ;; Use the functionarg analyzer class so we
+	       ;; can save the current key, and the index
+	       ;; into the macro part we are completing on.
+	       :function (list key)
+	       :index (length prefix)
+	       :argument (list argtype)
+	       ))
+
+	context-return)))
+
+(define-mode-local-override semantic-analyze-possible-completions
+  srecode-template-mode (context)
+  "Return a list of possible completions based on NONTEXT."
+  (save-excursion
+    (set-buffer (oref context buffer))
+    (let* ((prefix (car (last (oref context :prefix))))
+	   (prefixstr (cond ((stringp prefix)
+			     prefix)
+			    ((semantic-tag-p prefix)
+			     (semantic-tag-name prefix))))
+;	   (completetext (cond ((semantic-tag-p prefix)
+;				(semantic-tag-name prefix))
+;			       ((stringp prefix)
+;				prefix)
+;			       ((stringp (car prefix))
+;				(car prefix))))
+	   (argtype (car (oref context :argument)))
+	   (matches nil))
+
+      ;; Depending on what the analyzer is, we have different ways
+      ;; of creating completions.
+      (cond ((eq argtype 'template)
+	     (setq matches (semantic-find-tags-for-completion
+			    prefixstr (current-buffer)))
+	     (setq matches (semantic-find-tags-by-class
+			    'function matches))
+	     )
+	    ((eq argtype 'elispfcn)
+	     (with-mode-local emacs-lisp-mode
+	       (setq matches (semanticdb-find-tags-for-completion
+			      prefixstr))
+	       (setq matches (semantic-find-tags-by-class
+			      'function matches))
+	       )
+	     )
+	    ((eq argtype 'macro)
+	     (let ((scope (oref context scope)))
+	       (setq matches 
+		     (semantic-find-tags-for-completion
+		      prefixstr (oref scope fullscope))))
+	     )
+	    )
+
+      matches)))
+
+
+
+;;; Utils
+;;
+(defun srecode-template-get-mode ()
+  "Get the supported major mode for this template file."
+  (let ((m (semantic-find-first-tag-by-name "mode" (current-buffer))))
+    (when m (read (semantic-tag-variable-default m)))))
+
+(defun srecode-template-get-escape-start ()
+  "Get the current escape_start characters."
+  (let ((es (semantic-find-first-tag-by-name "escape_start" (current-buffer)))
+	)
+     (if es (car (semantic-tag-get-attribute es :default-value))
+       "{{")))
+
+(defun srecode-template-get-escape-end ()
+  "Get the current escape_end characters."
+  (let ((ee (semantic-find-first-tag-by-name "escape_end" (current-buffer)))
+	)
+    (if ee (car (semantic-tag-get-attribute ee :default-value))
+      "}}")))
+
+(defun srecode-template-current-context (&optional point)
+  "Calculate the context encompassing POINT."
+  (save-excursion
+    (when point (goto-char (point)))
+    (let ((ct (semantic-current-tag)))
+      (when (not ct)
+	(setq ct (semantic-find-tag-by-overlay-prev)))
+
+      ;; Loop till we find the context.
+      (while (and ct (not (semantic-tag-of-class-p ct 'context)))
+	(setq ct (semantic-find-tag-by-overlay-prev
+		  (semantic-tag-start ct))))
+
+      (if ct
+	  (read (semantic-tag-name ct))
+	'declaration))))
+
+(defun srecode-template-find-templates-of-context (context &optional buffer)
+  "Find all the templates belonging to a particular CONTEXT.
+When optional BUFFER is provided, search that buffer."
+  (save-excursion
+    (when buffer (set-buffer buffer))
+    (let ((tags (semantic-fetch-available-tags))
+	  (cc 'declaration)
+	  (scan nil)
+	  (ans nil))
+
+      (when (eq cc context)
+	(setq scan t))
+
+      (dolist (T tags)
+	;; Handle contexts
+	(when (semantic-tag-of-class-p T 'context)
+	  (setq cc (read (semantic-tag-name T)))
+	  (when (eq cc context)
+	    (setq scan t)))
+
+	;; Scan
+	(when (and scan (semantic-tag-of-class-p T 'function))
+	  (setq ans (cons T ans)))
+	)
+
+      (nreverse ans))))
+
+
+;;; MMM-Mode support ??
+;;(condition-case nil
+;;    (require 'mmm-mode)
+;;  (error (message "SRecoder Template Mode: No multi-mode not support.")))
+;;
+;;(defun srecode-template-add-submode ()
+;;  "Add a submode to the current template file using mmm-mode.
+;;If mmm-mode isn't available, then do nothing."
+;;  (if (not (featurep 'mmm-mode))
+;;      nil  ;; Nothing to do.
+;;    ;; Else, set up mmm-mode in this buffer.
+;;    (let ((submode (semantic-find-tags-by-name "mode")))
+;;      (if (not submode)
+;;	  nil  ;; Nothing to do.
+;;	;; Well, we have a mode, lets try turning on mmm-mode.
+;;
+;;	;; (mmm-mode-on)
+;;    
+;;	
+;;
+;;	))))
+;;
+
+(provide 'srecode-template-mode)
+
+;;; srecode-template-mode.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-template-wy.el b/site/cedet-1.0pre7/srecode/srecode-template-wy.el
new file mode 100644
index 0000000..2e015ea
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-template-wy.el
@@ -0,0 +1,284 @@
+;;; srecode-template-wy.el --- Generated parser support file
+
+;; Copyright (C) 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@projectile.siege-engine.com>
+;; Created: 2009-08-30 09:50:53-0400
+;; Keywords: syntax
+;; X-RCS: $Id$
+
+;; This file is not part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+;;
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; PLEASE DO NOT MANUALLY EDIT THIS FILE!  It is automatically
+;; generated from the grammar file srecode-template.wy.
+
+;;; Code:
+
+;;; Prologue
+;;
+
+;;; Declarations
+;;
+(defconst srecode-template-wy--keyword-table
+  (semantic-lex-make-keyword-table
+   '(("set" . SET)
+     ("show" . SHOW)
+     ("macro" . MACRO)
+     ("context" . CONTEXT)
+     ("template" . TEMPLATE)
+     ("sectiondictionary" . SECTIONDICTIONARY)
+     ("prompt" . PROMPT)
+     ("default" . DEFAULT)
+     ("defaultmacro" . DEFAULTMACRO)
+     ("read" . READ)
+     ("bind" . BIND))
+   '(("bind" summary "bind \"<letter>\"")
+     ("read" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
+     ("defaultmacro" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
+     ("default" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
+     ("prompt" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
+     ("sectiondictionary" summary "sectiondictionary <name>\\n <dictionary entries>")
+     ("template" summary "template <name>\\n <template definition>")
+     ("context" summary "context <name>")
+     ("macro" summary "... macro \"string\" ...")
+     ("show" summary "show <name>   ; to show a section")
+     ("set" summary "set <name> <value>")))
+  "Table of language keywords.")
+
+(defconst srecode-template-wy--token-table
+  (semantic-lex-make-type-table
+   '(("number"
+      (number))
+     ("string"
+      (string))
+     ("symbol"
+      (symbol))
+     ("property"
+      (property))
+     ("separator"
+      (TEMPLATE_BLOCK . "^----"))
+     ("newline"
+      (newline)))
+   '(("number" :declared t)
+     ("string" :declared t)
+     ("symbol" :declared t)
+     ("property" :declared t)
+     ("newline" :declared t)
+     ("punctuation" syntax "\\s.+")
+     ("punctuation" :declared t)
+     ("keyword" :declared t)))
+  "Table of lexical tokens.")
+
+(defconst srecode-template-wy--parse-table
+  (progn
+    (eval-when-compile
+      (require 'wisent-comp))
+    (wisent-compile-grammar
+     '((SET SHOW MACRO CONTEXT TEMPLATE SECTIONDICTIONARY PROMPT DEFAULT DEFAULTMACRO READ BIND newline TEMPLATE_BLOCK property symbol string number)
+       nil
+       (template_file
+	((newline)
+	 nil)
+	((context))
+	((prompt))
+	((variable))
+	((template)))
+       (context
+	((CONTEXT symbol newline)
+	 (wisent-raw-tag
+	  (semantic-tag $2 'context))))
+       (prompt
+	((PROMPT symbol string opt-default-fcn opt-read-fcn newline)
+	 (wisent-raw-tag
+	  (semantic-tag $2 'prompt :text
+			(read $3)
+			:default $4 :read $5))))
+       (opt-default-fcn
+	((DEFAULT symbol)
+	 (progn
+	   (read $2)))
+	((DEFAULT string)
+	 (progn
+	   (read $2)))
+	((DEFAULTMACRO string)
+	 (progn
+	   (cons 'macro
+		 (read $2))))
+	(nil nil))
+       (opt-read-fcn
+	((READ symbol)
+	 (progn
+	   (read $2)))
+	(nil nil))
+       (variable
+	((SET symbol insertable-string-list newline)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil $3)))
+	((SHOW symbol newline)
+	 (wisent-raw-tag
+	  (semantic-tag-new-variable $2 nil t))))
+       (insertable-string-list
+	((insertable-string)
+	 (list $1))
+	((insertable-string-list insertable-string)
+	 (append $1
+		 (list $2))))
+       (insertable-string
+	((string)
+	 (read $1))
+	((MACRO string)
+	 (cons 'macro
+	       (read $2))))
+       (template
+	((TEMPLATE templatename opt-dynamic-arguments newline opt-string opt-section-dictionaries TEMPLATE_BLOCK newline opt-bind)
+	 (wisent-raw-tag
+	  (semantic-tag-new-function $2 nil $3 :documentation $5 :code $7 :dictionaries $6 :binding $9))))
+       (templatename
+	((symbol))
+	((PROMPT))
+	((CONTEXT))
+	((TEMPLATE))
+	((DEFAULT))
+	((MACRO))
+	((DEFAULTMACRO))
+	((READ))
+	((SET)))
+       (opt-dynamic-arguments
+	((property opt-dynamic-arguments)
+	 (cons $1 $2))
+	(nil nil))
+       (opt-string
+	((string newline)
+	 (read $1))
+	(nil nil))
+       (opt-section-dictionaries
+	(nil nil)
+	((section-dictionary-list)))
+       (section-dictionary-list
+	((one-section-dictionary)
+	 (list $1))
+	((section-dictionary-list one-section-dictionary)
+	 (append $1
+		 (list $2))))
+       (one-section-dictionary
+	((SECTIONDICTIONARY string newline variable-list)
+	 (cons
+	  (read $2)
+	  $4)))
+       (variable-list
+	((variable)
+	 (wisent-cook-tag $1))
+	((variable-list variable)
+	 (append $1
+		 (wisent-cook-tag $2))))
+       (opt-bind
+	((BIND string newline)
+	 (read $2))
+	(nil nil)))
+     '(template_file)))
+  "Parser table.")
+
+(defun srecode-template-wy--install-parser ()
+  "Setup the Semantic Parser."
+  (semantic-install-function-overrides
+   '((parse-stream . wisent-parse-stream)))
+  (setq semantic-parser-name "LALR"
+	semantic--parse-table srecode-template-wy--parse-table
+	semantic-debug-parser-source "srecode-template.wy"
+	semantic-flex-keywords-obarray srecode-template-wy--keyword-table
+	semantic-lex-types-obarray srecode-template-wy--token-table)
+  ;; Collect unmatched syntax lexical tokens
+  (semantic-make-local-hook 'wisent-discarding-token-functions)
+  (add-hook 'wisent-discarding-token-functions
+	    'wisent-collect-unmatched-syntax nil t))
+
+
+;;; Analyzers
+;;
+(require 'semantic-lex)
+
+(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'symbol)
+
+(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'string)
+
+(define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'number)
+
+(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\s.+"
+  nil
+  'punctuation)
+
+
+;;; Epilogue
+;;
+(define-lex-simple-regex-analyzer srecode-template-property-analyzer
+  "Detect and create a dynamic argument properties."
+  ":\\(\\w\\|\\s_\\)*" 'property 0)
+
+(define-lex-regex-analyzer srecode-template-separator-block
+  "Detect and create a template quote block."
+  "^----\n"
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'TEMPLATE_BLOCK
+    (match-end 0)
+    (semantic-lex-unterminated-syntax-protection 'TEMPLATE_BLOCK
+      (goto-char (match-end 0))
+      (re-search-forward "^----$")
+      (match-beginning 0))))
+  (setq semantic-lex-end-point (point)))
+
+
+(define-lex wisent-srecode-template-lexer
+  "Lexical analyzer that handles SRecode Template buffers.
+It ignores whitespace, newlines and comments."
+  semantic-lex-newline
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  srecode-template-separator-block
+  srecode-template-wy--<keyword>-keyword-analyzer
+  srecode-template-property-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
+  srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<string>-sexp-analyzer
+  srecode-template-wy--<punctuation>-string-analyzer
+  semantic-lex-default-action
+  )
+
+(provide 'srecode-template-wy)
+
+;;; srecode-template-wy.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-template.el b/site/cedet-1.0pre7/srecode/srecode-template.el
new file mode 100644
index 0000000..f3a0065
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-template.el
@@ -0,0 +1,71 @@
+;;; srecode-template.el --- SRecoder template language parser support.
+
+;;; Copyright (C) 2005, 2007, 2008 Eric M. Ludlam
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser setup for the semantic recoder template parser.
+
+;;; Code:
+(require 'semantic-wisent)
+(require 'semantic)
+(require 'srecode-template-wy)
+
+(define-mode-local-override semantic-tag-components
+  srecode-template-mode (tag)
+  "Return sectiondictionary tags."
+  (when (semantic-tag-of-class-p tag 'function)
+    (let ((dicts (semantic-tag-get-attribute tag :dictionaries))
+	  (ans nil))
+      (while dicts
+	(setq ans (append ans (cdr (car dicts))))
+	(setq dicts (cdr dicts)))
+      ans)      
+    ))
+
+;;;###autoload
+(defun srecode-template-setup-parser ()
+  "Setup buffer for parse."
+  (srecode-template-wy--install-parser)
+
+  (setq
+   ;; Lexical Analysis
+   semantic-lex-analyzer 'wisent-srecode-template-lexer
+   ;; Parsing
+   ;; Environment
+   semantic-imenu-summary-function 'semantic-format-tag-name
+   imenu-create-index-function 'semantic-create-imenu-index
+   semantic-command-separation-character "\n"
+   semantic-lex-comment-regex ";;"
+   ;; Speedbar
+   semantic-symbol->name-assoc-list
+   '((function . "Template")
+     (variable . "Variable")
+     )
+   ;; Navigation
+   senator-step-at-tag-classes '(function variable)
+   ))
+
+;;;###autoload
+(add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser)
+
+(provide 'srecode-template)
+
+;;; srecode-template.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-template.wy b/site/cedet-1.0pre7/srecode/srecode-template.wy
new file mode 100644
index 0000000..7ce2b01
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-template.wy
@@ -0,0 +1,237 @@
+;;; srecode-template.wy --- Semantic Recoder Template parser
+
+;; Copyright (C) 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: srecode-template.wy,v 1.10 2009/01/09 23:01:54 zappo Exp $
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Parser for the Semantic Recoder template language
+;;
+;; Semantic Recoder templates are based on Google Templates
+;; and are at the bottom of the Semantic Recoder API.
+
+%languagemode  srecode-mode
+
+%start template_file
+
+;;; KEYWORDS
+%type    <keyword>
+%keyword SET  "set"
+%put     SET  summary "set <name> <value>"
+%keyword SHOW "show"
+%put     SHOW summary "show <name>   ; to show a section"
+%keyword MACRO "macro"
+%put     MACRO summary "... macro \"string\" ..."
+%keyword CONTEXT "context"
+%put     CONTEXT summary "context <name>"
+%keyword TEMPLATE  "template"
+%put     TEMPLATE  summary "template <name>\\n <template definition>"
+%keyword SECTIONDICTIONARY "sectiondictionary"
+%put     SECTIONDICTIONARY summary "sectiondictionary <name>\\n <dictionary entries>"
+%keyword PROMPT "prompt"
+%keyword DEFAULT "default"
+%keyword DEFAULTMACRO "defaultmacro"
+%keyword READ "read"
+%put     { PROMPT DEFAULT DEFAULTMACRO READ } summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]"
+%keyword BIND "bind"
+%put     BIND summary "bind \"<letter>\""
+
+;;; Punctuation Types
+%type <punctuation> syntax "\\s.+"
+%type <newline>
+%token <newline> newline
+
+%token <separator> TEMPLATE_BLOCK "^----"
+
+;;; Bland default types
+%type <property> ":\\(\\w\\|\\s_\\)*"
+%token <property> property
+
+%type  <symbol>
+%token <symbol> symbol
+
+%type  <string>
+%token <string> string
+
+%type  <number>
+%token <number> number
+
+%%
+
+template_file
+  : newline ( )
+  | context
+  | prompt
+  | variable
+  | template
+  ;
+
+context
+  : CONTEXT symbol newline
+    (TAG $2 'context)
+  ;
+
+prompt
+  : PROMPT symbol string opt-default-fcn opt-read-fcn newline
+    (TAG $2 'prompt :text (read $3) :default $4 :read $5)
+  ;
+
+opt-default-fcn
+  : DEFAULT symbol
+    (progn (read $2))
+  | DEFAULT string
+    (progn (read $2))
+  | DEFAULTMACRO string
+    (progn (cons 'macro (read $2)))
+  | ()
+  ;
+
+opt-read-fcn
+  : READ symbol
+    (progn (read $2))
+  | ()
+  ;
+
+variable
+  : SET symbol insertable-string-list newline
+    (VARIABLE-TAG $2 nil $3)
+  | SHOW symbol newline
+    (VARIABLE-TAG $2 nil t)
+  ;
+
+insertable-string-list
+  : insertable-string
+    (list $1)
+  | insertable-string-list insertable-string
+    (append $1 (list $2))
+  ;
+
+insertable-string
+  : string
+    (read $1)
+  | MACRO string
+    (cons 'macro (read $2))
+  ;
+
+template
+  : TEMPLATE templatename opt-dynamic-arguments newline
+    opt-string
+    opt-section-dictionaries
+    TEMPLATE_BLOCK newline
+    opt-bind
+    (FUNCTION-TAG $2 nil $3 :documentation $5 :code $7
+		  :dictionaries $6 :binding $9 )
+  ;
+
+templatename
+  : symbol
+  | PROMPT
+  | CONTEXT
+  | TEMPLATE
+  | DEFAULT
+  | MACRO
+  | DEFAULTMACRO
+  | READ
+  | SET
+  ;
+
+opt-dynamic-arguments
+  : property opt-dynamic-arguments
+    (cons $1 $2)
+  | ()
+  ;
+
+opt-string
+  : string newline
+    ( read $1 )
+  | ()
+  ;
+
+opt-section-dictionaries
+  : () ;; EMPTY
+  | section-dictionary-list
+  ;
+
+section-dictionary-list
+  : one-section-dictionary
+    (list $1)
+  | section-dictionary-list one-section-dictionary
+    (append $1 (list $2))
+  ;
+
+one-section-dictionary
+  : SECTIONDICTIONARY string newline
+    variable-list
+    (cons (read $2) $4)
+  ;
+
+variable-list
+  : variable
+    (EXPANDTAG $1)
+  | variable-list variable
+    (append $1 (EXPANDTAG $2))
+  ;
+
+opt-bind
+  : BIND string newline
+    ( read $2 )
+  | ()
+  ;
+
+%%
+(define-lex-simple-regex-analyzer srecode-template-property-analyzer
+  "Detect and create a dynamic argument properties."
+  ":\\(\\w\\|\\s_\\)*" 'property 0)
+
+(define-lex-regex-analyzer srecode-template-separator-block
+  "Detect and create a template quote block."
+  "^----\n"
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'TEMPLATE_BLOCK
+    (match-end 0)
+    (semantic-lex-unterminated-syntax-protection 'TEMPLATE_BLOCK
+      (goto-char (match-end 0))
+      (re-search-forward "^----$")
+      (match-beginning 0))))
+  (setq semantic-lex-end-point (point)))
+
+
+(define-lex wisent-srecode-template-lexer
+  "Lexical analyzer that handles SRecode Template buffers.
+It ignores whitespace, newlines and comments."
+  semantic-lex-newline
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  srecode-template-separator-block
+  srecode-template-wy--<keyword>-keyword-analyzer
+  srecode-template-property-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
+  srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<string>-sexp-analyzer
+  srecode-template-wy--<punctuation>-string-analyzer
+  semantic-lex-default-action
+  )
+
+;;; wisent-dot.wy ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-test-getset.el b/site/cedet-1.0pre7/srecode/srecode-test-getset.el
new file mode 100644
index 0000000..64add78
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-test-getset.el
@@ -0,0 +1,164 @@
+;;; srecode-test-getset.el --- Test the getset inserter.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-test-getset.el,v 1.4 2009/01/24 03:38:33 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Unit tests for the getset inserter application.
+
+(require 'cedet-utests)
+
+;;; Code:
+(defvar srecode-utest-getset-pre-fill
+  "// Test Class for getset tests in c++.
+
+class myClass {
+public:
+  myClass() { };
+  ~myClass() { };
+  /** miscFunction
+   */
+  int miscFunction(int);
+
+private:
+  int fStartingField;
+
+};
+
+"
+  "The pre-fill class for the getset tests.")
+
+
+;;; Master Harness
+;;
+(defvar srecode-utest-getset-testfile "/tmp/srecode-utest-getset.cpp"
+  "File used to do testing.")
+
+;;;###autoload
+(defun srecode-utest-getset-output ()
+  "Test various template insertion options."
+  (interactive)
+
+  (cedet-utest-log-setup "SRECODE Get/Set")
+
+  (save-excursion
+    (let ((testbuff (find-file-noselect srecode-utest-getset-testfile))
+	  (srecode-insert-getset-fully-automatic-flag t))
+
+      (set-buffer testbuff)
+
+      (srecode-load-tables-for-mode major-mode)
+      (srecode-load-tables-for-mode major-mode 'getset)
+
+      (if (not (srecode-table))
+	  (error "No template table found for mode %s" major-mode))
+
+      (condition-case nil
+	  (erase-buffer)
+	(error nil))
+      (insert srecode-utest-getset-pre-fill)
+      (goto-char (point-min))
+      (cedet-utest-log " * Test Pre-fill")
+      (srecode-utest-getset-tagcheck '("public"
+				       "myClass"
+				       "myClass"
+				       "miscFunction"
+				       "private"
+				       "fStartingField"))
+      (srecode-utest-getset-jumptotag "fStartingField")
+
+      ;; Startup with fully automatic selection.
+      (srecode-insert-getset)
+
+      (cedet-utest-log " * Post get-set \"StartingField\"")
+      (srecode-utest-getset-tagcheck '("public"
+				       "myClass"
+				       "myClass"
+				       "getStartingField"
+				       "setStartingField"
+				       "miscFunction"
+				       "private"
+				       "fStartingField"))
+
+      ;; Now try convenience args.
+      (goto-char (point-min))
+      (srecode-utest-getset-jumptotag "fStartingField")
+      (end-of-line)
+      (insert "\n")
+
+      (srecode-insert-getset nil "AutoInsertField")
+
+      (cedet-utest-log " * Post get-set \"AutoInsertField\"")
+      (srecode-utest-getset-tagcheck '("public"
+				       "myClass"
+				       "myClass"
+				       "getStartingField"
+				       "setStartingField"
+				       "getAutoInsertField"
+				       "setAutoInsertField"
+				       "miscFunction"
+				       "private"
+				       "fStartingField"
+				       "fAutoInsertField"))
+
+      ;; Make sure all the comments are in the right place.
+      (srecode-utest-getset-jumptotag "miscFunction")
+      (let ((pos (point)))
+	(skip-chars-backward " \t\n") ; xemacs forward-comment is different.
+	(forward-comment -1)
+	(re-search-forward "miscFunction" pos))
+      
+      ))
+  (cedet-utest-log-shutdown
+   "SRECODE Get/Set"
+   nil ; How to detect a problem?
+   )
+  )
+
+(defun srecode-utest-getset-tagcheck (expected-members)
+  "Make sure that the tags in myClass have EXPECTED-MEMBERS."
+  (semantic-fetch-tags)
+  (let* ((mc (semantic-find-tags-by-name "myClass" (current-buffer)))
+	 (mem (semantic-tag-type-members (car mc))))
+    (while (and mem expected-members)
+      (when (not (string= (semantic-tag-name (car mem))
+			  (car expected-members)))
+	(switch-to-buffer (current-buffer))
+	(error "Did not find %s" (car expected-members)))
+      (setq mem (cdr mem)
+	    expected-members (cdr expected-members)))
+    (when expected-members
+      (switch-to-buffer (current-buffer))
+      (error "Did not find all expected tags in class"))
+    (when mem
+      (switch-to-buffer (current-buffer))
+      (error "Found extra tags in class"))))
+
+(defun srecode-utest-getset-jumptotag (tagname)
+  "Jump to the tag named TAGNAME."
+  (semantic-fetch-tags)
+  (let ((tag (semantic-deep-find-tags-by-name tagname (current-buffer))))
+    (if tag
+	(semantic-go-to-tag (car tag))
+      (error "Failed to jump to tag %s" tagname))))
+
+(provide 'srecode-test-getset)
+;;; srecode-test-getset.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-test.el b/site/cedet-1.0pre7/srecode/srecode-test.el
new file mode 100644
index 0000000..f9ca6fb
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-test.el
@@ -0,0 +1,341 @@
+;;; srecode-test.el --- SRecode Core Template tests.
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-test.el,v 1.13 2010/02/16 02:06:47 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Tests of SRecode template insertion routines and tricks.
+;;
+
+(require 'srecode-insert)
+(require 'srecode-dictionary)
+(require 'cedet-utests)
+
+;;; Code:
+
+;;; OUTPUT TESTING
+;;
+(defclass srecode-utest-output ()
+  ((name :initarg :name
+	 :documentation "Name of the template tested.")
+   (output :initarg :output
+	   :documentation "Expected Outupt of the template.")
+   (dict-entries :initarg :dict-entries
+		 :initform nil
+		 :documentation "Extra dictionary entries to specify.")
+   (pre-fill :initarg :pre-fill
+	     :initform nil
+	     :documentation "Text to prefill a buffer with.
+Place cursor on the ! and delete it.
+If there is a second !, the put the mark there.")
+   )
+  "A single template test.")
+
+(defmethod srecode-utest-test ((o srecode-utest-output))
+  "Perform the insertion and test the output.
+Assumes that the current buffer is the testing buffer."
+  (erase-buffer)
+
+  ;;(cedet-utest-log " * Entry %s ..." (object-print o))
+
+  (insert (or (oref o pre-fill) ""))
+  (goto-char (point-min))
+  (let ((start nil))
+    (when (re-search-forward "!" nil t)
+      (goto-char (match-beginning 0))
+      (setq start (point))
+      (replace-match ""))
+    (when (re-search-forward "!" nil t)
+      (push-mark (match-beginning 0) t t)
+      (replace-match ""))
+    (when start (goto-char start)))
+
+  (let* ((dict (srecode-create-dictionary))
+	 (temp (srecode-template-get-table (srecode-table)
+					   (oref o name)
+					   "test"
+					   'tests
+					   ))
+	 (srecode-handle-region-when-non-active-flag t)
+	 )
+    (when (not temp)
+      (srecode-map-update-map)
+      (setq temp (srecode-template-get-table (srecode-table)
+					     (oref o name)
+					     "test"
+					     'tests
+					     ))
+      )
+    (when (not temp)
+      (error "Test template \"%s\" for `%s' not loaded!"
+	     (oref o name) major-mode))
+
+    ;; RESOLVE AND INSERT
+    (let ((entries (oref o dict-entries)))
+      (while entries
+	(srecode-dictionary-set-value dict
+				      (car entries)
+				      (car (cdr entries)))
+	(setq entries (cdr (cdr entries)))))
+    (srecode-insert-fcn temp dict)
+
+    ;; COMPARE THE OUTPUT
+    (if (string= (oref o output) (buffer-string))
+	(cedet-utest-log " * Entry %s passed." (object-print o))
+      
+      (goto-char (point-max))
+      (insert "\n\n ------------- ^^ actual ^^ ------------\n\n
+ ------------- v expected vv ------------\n\n" (oref o output))
+      (pop-to-buffer (current-buffer))
+      (error "Entry %s failed!" (object-name o)))
+  ))
+
+;;; ARG HANDLER
+;;
+(defun srecode-semantic-handle-:utest (dict)
+  "Add macros into the dictionary DICT for unit testing purposes."
+  (srecode-dictionary-set-value dict "UTESTVAR1" "ARG HANDLER ONE")
+  (srecode-dictionary-set-value dict "UTESTVAR2" "ARG HANDLER TWO")
+  )
+
+(defun srecode-semantic-handle-:utestwitharg (dict)
+  "Add macros into the dictionary DICT based on other vars in DICT."
+  (let ((val1 (srecode-dictionary-lookup-name dict "UTWA"))
+	(nval1 nil))
+    ;; If there is a value, mutate it
+    (if (and val1 (stringp val1))
+	(setq nval1 (upcase val1))
+      ;; No value, make stuff up
+      (setq nval1 "NO VALUE"))
+
+    (srecode-dictionary-set-value dict "UTESTARGXFORM" nval1))
+
+  (let ((dicts (srecode-dictionary-lookup-name dict "UTLOOP")))
+    (dolist (D dicts)
+      ;; For each dictionary, lookup NAME, and transform into
+      ;; something in DICT instead.
+      (let ((sval (srecode-dictionary-lookup-name D "NAME")))
+	(srecode-dictionary-set-value dict (concat "FOO_" sval) sval)
+	)))
+  )
+
+;;; TEST POINTS
+;;
+(defvar srecode-utest-output-entries
+  (list
+   (srecode-utest-output
+    "test1" :name "test"
+    :output (concat ";; " (user-full-name) "\n"
+		    ";; " (upcase (user-full-name))) )
+   (srecode-utest-output
+    "subs" :name "subs"
+    :output ";; Before Loop
+;; After Loop" )
+   (srecode-utest-output
+    "firstlast" :name "firstlast"
+    :output "
+;; << -- FIRST
+;; I'm First
+;; I'm Not Last
+;; -- >>
+
+;; << -- MIDDLE
+;; I'm Not First
+;; I'm Not Last
+;; -- >>
+
+;; << -- LAST
+;; I'm Not First
+;; I'm Last
+;; -- >>
+" )
+   (srecode-utest-output
+    "gapsomething" :name "gapsomething"
+    :output ";; First Line
+### ALL ALONE ON A LINE ###
+;;Second Line"
+    :pre-fill ";; First Line
+!;;Second Line")
+   (srecode-utest-output
+    "wrapsomething" :name "wrapsomething"
+    :output ";; Put this line in front:
+;; First Line
+;; Put this line at the end:"
+    :pre-fill "!;; First Line
+!")
+   (srecode-utest-output
+    "inlinetext" :name "inlinetext"
+    :output ";; A big long comment XX *In the middle* XX with cursor in middle"
+    :pre-fill ";; A big long comment XX!XX with cursor in middle")
+
+   (srecode-utest-output
+    "wrapinclude-basic" :name "wrapinclude-basic"
+    :output ";; An includable  we could use.
+;; 
+;; Text after a point inserter."
+    )
+   (srecode-utest-output
+    "wrapinclude-basic2" :name "wrapinclude-basic"
+    :output ";; An includable MOOSE we could use.
+;; 
+;; Text after a point inserter."
+    :dict-entries '("COMMENT" "MOOSE")
+    )
+   (srecode-utest-output
+    "wrapinclude-around" :name "wrapinclude-around"
+    :output ";; An includable  we could use.
+;; [VAR]Intermediate Comments
+;; Text after a point inserter."
+    )
+   (srecode-utest-output
+    "wrapinclude-around1" :name "wrapinclude-around"
+    :output ";; An includable PENGUIN we could use.
+;; [VAR]Intermediate Comments
+;; Text after a point inserter."
+    :dict-entries '("COMMENT" "PENGUIN")
+    )
+   (srecode-utest-output
+    "complex-subdict" :name "complex-subdict"
+    :output ";; I have a cow and a dog.")
+   (srecode-utest-output
+    "wrap-new-template" :name "wrap-new-template"
+    :output "template newtemplate
+\"A nice doc string goes here.\"
+----
+Random text in the new template
+----
+bind \"a\""
+    :dict-entries '( "NAME" "newtemplate" "KEY" "a" )
+    )
+   (srecode-utest-output
+    "column-data" :name "column-data"
+    :output "Table of Values:
+Left Justified       | Right Justified
+FIRST                |                FIRST
+VERY VERY LONG STRIN | VERY VERY LONG STRIN
+MIDDLE               |               MIDDLE
+S                    |                    S
+LAST                 |                 LAST")
+   (srecode-utest-output
+    "custom-arg-handler" :name "custom-arg-handler"
+    :output "OUTSIDE SECTION: ARG HANDLER ONE
+INSIDE SECTION: ARG HANDLER ONE")
+   (srecode-utest-output
+    "custom-arg-w-arg none" :name "custom-arg-w-arg"
+    :output "Value of xformed UTWA: NO VALUE")
+   (srecode-utest-output
+    "custom-arg-w-arg upcase" :name "custom-arg-w-arg"
+    :dict-entries '( "UTWA" "uppercaseme" )
+    :output "Value of xformed UTWA: UPPERCASEME")
+   (srecode-utest-output
+    "custom-arg-w-subdict" :name "custom-arg-w-subdict"
+    :output "All items here: item1 item2 item3")
+   )
+  "Test point entries for the template output tests.")
+
+
+
+;;; Master Harness
+;;
+(defvar srecode-utest-testfile "/tmp/srecode-utest.srt"
+  "File used to do testing.")
+
+;;;###autoload
+(defun srecode-utest-template-output ()
+  "Test various template insertion options."
+  (interactive)
+
+  (save-excursion
+    (let ((testbuff (find-file-noselect srecode-utest-testfile)))
+
+      (set-buffer testbuff)
+
+      (srecode-load-tables-for-mode major-mode)
+      (srecode-load-tables-for-mode major-mode 'tests)
+
+      (if (not (srecode-table major-mode))
+	  (error "No template table found for mode %s" major-mode))
+
+      ;; Loop over the output testpoints.
+      ;;(cedet-utest-log-start "srecode: templates")
+      (cedet-utest-log-setup "SRECODE Templates")
+
+      (dolist (p srecode-utest-output-entries)
+	(set-buffer testbuff) ;; XEmacs causes a buffer switch.  I don't know why
+	(srecode-utest-test p)
+	)
+
+      (cedet-utest-log-shutdown 
+       "SRECODE Templates"
+       nil ; How to detect a problem?
+       )
+      )))
+
+;;; Project test
+;;
+;; Test that "project" specification works ok.
+
+(defun srecode-utest-project ()
+  "Test that project filtering works ok."
+  (interactive)
+  
+  (save-excursion
+    (let ((testbuff (find-file-noselect srecode-utest-testfile))
+	  (temp nil))
+
+      (set-buffer testbuff)
+
+      (srecode-load-tables-for-mode major-mode)
+      (srecode-load-tables-for-mode major-mode 'tests)
+
+      (if (not (srecode-table major-mode))
+	  (error "No template table found for mode %s" major-mode))
+  
+      (erase-buffer)
+
+
+      (setq temp (srecode-template-get-table (srecode-table)
+					     "test-project"
+					     "test"
+					     'tests
+					     ))
+
+      (when (not temp)
+	(error "Project template not found when in project"))
+
+      ;; Temporarily change the home of this file.
+      (let ((default-directory (expand-file-name "~/")))
+
+	(setq temp (srecode-template-get-table (srecode-table)
+					       "test-project"
+					       "test"
+					       'tests
+					       ))
+
+	(when temp
+	  (error "Project template found when not in project")))
+
+      ;;
+      )))
+
+
+(provide 'srecode-test)
+;;; srecode-test.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode-texi.el b/site/cedet-1.0pre7/srecode/srecode-texi.el
new file mode 100644
index 0000000..60e1de5
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode-texi.el
@@ -0,0 +1,285 @@
+;;; srecode-texi.el --- Srecode texinfo support.
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-texi.el,v 1.8.2.1 2010/02/22 02:57:02 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Texinfo semantic recoder support.
+;;
+;; Contains some handlers, and a few simple texinfo srecoder applications.
+
+(require 'semantic)
+(require 'semantic-texi)
+(require 'srecode-semantic)
+
+;;; Code:
+
+;;;###autoload
+(defun srecode-texi-add-menu (newnode)
+  "Add an item into the current menu.  Add @node statements as well.
+Argument NEWNODE is the name of the new node."
+  (interactive "sName of new node: ")
+  (srecode-load-tables-for-mode major-mode)
+  (semantic-fetch-tags)
+  (let ((currnode (reverse (semantic-find-tag-by-overlay)))
+	(nodebounds nil))
+    (when (not currnode)
+      (error "Cannot find node to put menu item into"))
+    (setq currnode (car currnode))
+    (setq nodebounds (semantic-tag-texi-section-text-bounds currnode))
+    ;; Step 1:
+    ;;   Limit search within this node.
+    ;; Step 2:
+    ;;   Find the menu.  If there isn't one, add one to the end.
+    ;; Step 3:
+    ;;   Add new item to end of menu list.
+    ;; Step 4:
+    ;;   Find correct node new item should show up after, and stick
+    ;;   the new node there.
+    (if (string= (semantic-texi-current-environment) "menu")
+	;; We are already in a menu, so insert the new item right here.
+	(beginning-of-line)
+      ;; Else, try to find a menu item to append to.
+      (goto-char (car nodebounds))
+      (if (not (re-search-forward "^@menu" (car (cdr nodebounds)) t))
+	  (progn
+	    (goto-char (car (cdr nodebounds)))
+	    (if (not (y-or-n-p "Add menu here? "))
+		(error "Abort"))
+	    (srecode-insert "declaration:menu"))
+	;; Else, find the end
+	(re-search-forward "@end menu")
+	(beginning-of-line)))
+    ;; At this point, we are in a menu... or not.
+    ;; If we are, do stuff, else error.
+    (when (string= (semantic-texi-current-environment) "menu")
+      (let ((menuname newnode)
+	    (returnpoint nil))
+	(srecode-insert "declaration:menuitem" "NAME" menuname)
+	(set-mark (point))
+	(setq returnpoint (make-marker))
+	;; Update the bound since we added text
+	(setq nodebounds (semantic-tag-texi-section-text-bounds currnode))
+	(beginning-of-line)
+	(forward-char -1)
+	(beginning-of-line)
+	(let ((end nil))
+	  (if (not (looking-at "\\* \\([^:]+\\):"))
+	      (setq end (car (cdr nodebounds)))
+	    (let* ((nname (match-string 1))
+		   (tag
+		    (semantic-deep-find-tags-by-name nname (current-buffer))))
+	      (when tag
+		(setq end (semantic-tag-end (car tag))))
+	      ))
+	  (when (not end)
+	    (goto-char returnpoint)
+	    (error "Could not find location for new node" ))
+	  (when end
+	    (goto-char end)
+	    (when (bolp) (forward-char -1))
+	    (insert "\n")
+	    (if (eq (semantic-current-tag) currnode)
+		(srecode-insert "declaration:subnode" "NAME" menuname)
+	      (srecode-insert "declaration:node" "NAME" menuname))
+	    )
+	  )))
+    ))
+
+;;;###autoload
+(defun srecode-semantic-handle-:texi (dict)
+  "Add macros into the dictionary DICT based on the current texinfo file.
+Adds the following:
+  LEVEL - chapter, section, subsection, etc
+  NEXTLEVEL - One below level"
+
+  ;; LEVEL and NEXTLEVEL calculation
+  (semantic-fetch-tags)
+  (let ((tags (reverse (semantic-find-tag-by-overlay)))
+	(level nil))
+    (while (and tags (not (semantic-tag-of-class-p (car tags) 'section)))
+      (setq tags (cdr tags)))
+    (when tags
+      (save-excursion
+	(goto-char (semantic-tag-start (car tags)))
+	(when (looking-at "@node")
+	  (forward-line 1)
+	  (beginning-of-line))
+	(when (looking-at "@\\(\\w+\\)")
+	  (setq level (match-string 1))
+	  )))
+    (srecode-dictionary-set-value dict "LEVEL" (or level "chapter"))
+    (let ((nl (assoc level '( ( nil . "top" )
+			      ("top" . "chapter")
+			      ("chapter" . "section")
+			      ("section" . "subsection")
+			      ("subsection" . "subsubsection")
+			      ("subsubsection" . "subsubsection")
+			      ))))
+      (srecode-dictionary-set-value dict "NEXTLEVEL" (cdr nl))))
+  )
+
+;;;###autoload
+(defun srecode-semantic-handle-:texitag (dict)
+  "Add macros into the dictionary DICT based on the current :tag file.
+Adds the following:
+  TAGDOC - Texinfo formatted doc string for :tag."
+
+  ;; If we also have a TAG, what is the doc?
+  (let ((tag (srecode-dictionary-lookup-name dict "TAG"))
+	(doc nil)
+	)
+
+    ;; If the user didn't apply :tag, then do so now.
+    (when (not tag)
+      (srecode-semantic-handle-:tag dict))
+    
+    (setq tag (srecode-dictionary-lookup-name dict "TAG"))
+
+    (when (not tag)
+      (error "No tag to insert for :texitag template argument"))
+
+    ;; Extract the tag out of the compound object.
+    (setq tag (oref tag :prime))
+
+    ;; Extract the doc string
+    (setq doc (semantic-documentation-for-tag tag))
+    
+    (when doc
+      (srecode-dictionary-set-value dict "TAGDOC"
+				    (srecode-texi-massage-to-texinfo
+				     tag (semantic-tag-buffer tag)
+				     doc)))
+    ))
+
+;;; OVERRIDES
+;;
+;; Override some semantic and srecode features with texi specific
+;; versions.
+
+;;;###autoload
+(define-mode-local-override semantic-insert-foreign-tag
+  texinfo-mode (foreign-tag)
+  "Insert FOREIGN-TAG from a foreign buffer in TAGFILE.
+Assume TAGFILE is a source buffer, and create a documentation
+thingy from it using the `document' tool."
+  (srecode-texi-insert-tag-as-doc foreign-tag))
+
+;;;###autoload
+(defun srecode-texi-insert-tag-as-doc (tag)
+  "Insert TAG into the current buffer with SRecode."
+  (when (not (eq major-mode 'texinfo-mode))
+    (error "Can only insert tags into texinfo in texinfo mode"))
+  (let ((srecode-semantic-selected-tag tag))
+    (srecode-load-tables-for-mode major-mode)
+    ;; @todo - choose of the many types of tags to insert,
+    ;; or put all that logic into srecode.
+    (srecode-insert "declaration:function")))
+
+
+;;; Texinfo mangling.
+;;
+(defun srecode-texi-massage-to-texinfo (tag buffer string)
+  "Massage TAG's documentation from BUFFER as STRING.
+This is to take advantage of TeXinfo's markup symbols."
+  (save-excursion
+    (if buffer 
+	(progn (set-buffer buffer)
+	       (srecode-texi-texify-docstring string))
+      ;; Else, no buffer, so lets do something else
+      (with-mode-local texinfo-mode
+	(srecode-texi-texify-docstring string)))))
+
+(define-overloadable-function srecode-texi-texify-docstring
+  (docstring)
+  "Texify the doc string DOCSTRING.
+Takes plain text formatting that may exist, and converts it to
+using TeXinfo formatting.")
+
+(defun srecode-texi-texify-docstring-default (docstring)
+  "Texify the doc string DOCSTRING.
+Takes a few very generic guesses as to what the formatting is."
+  (let ((case-fold-search nil)
+	(start 0))
+    (while (string-match
+	    "\\(^\\|[^{]\\)\\<\\([A-Z0-9_-]+\\)\\>\\($\\|[^}]\\)"
+	    docstring start)
+      (let ((ms (match-string 2 docstring)))
+	;(when (eq mode 'emacs-lisp-mode)
+	;  (setq ms (downcase ms)))
+	
+	(when (not (or (string= ms "A")
+		       (string= ms "a")
+		       ))
+	  (setq docstring (concat (substring docstring 0 (match-beginning 2))
+			       "@var{"
+			       ms
+			       "}"
+			       (substring docstring (match-end 2))))))
+      (setq start (match-end 2)))
+    ;; Return our modified doc string.
+    docstring))
+
+(define-mode-local-override srecode-texi-texify-docstring emacs-lisp-mode
+  (string)
+  "Take STRING, (a normal doc string), and convert it into a texinfo string.
+For instances where CLASS is the class being referenced, do not Xref
+that class.
+
+ `function' => @dfn{function}
+ `variable' => @code{variable}
+ `class'    => @code{class} @xref{class}
+ `unknown'  => @code{unknonwn}
+ \"text\"     => ``text''
+ 'quoteme   => @code{quoteme}
+ non-nil    => non-@code{nil}
+ t          => @code{t}
+ :tag       => @code{:tag}
+ [ stuff ]  => @code{[ stuff ]}
+ Key        => @kbd{Key}     (key is C\\-h, M\\-h, SPC, RET, TAB and the like)
+ ...        => @dots{}"
+  (while (string-match "`\\([-a-zA-Z0-9<>.]+\\)'" string)
+    (let* ((vs (substring string (match-beginning 1) (match-end 1)))
+	   (v (intern-soft vs)))
+      (setq string
+	    (concat
+	     (replace-match (concat
+			     (if (fboundp v)
+				 "@dfn{" "@code{")
+			     vs "}")
+		    nil t string)))))
+  (while (string-match "\\( \\|^\\)\\(nil\\|t\\|'[-a-zA-Z0-9]+\\|:[-a-zA-Z0-9]+\\)\\([. ,]\\|$\\)" string)
+    (setq string (replace-match "@code{\\2}" t nil string 2)))
+  (while (string-match "\\( \\|^\\)\\(\\(non-\\)\\(nil\\)\\)\\([. ,]\\|$\\)" string)
+    (setq string (replace-match "\\3@code{\\4}" t nil string 2)))
+  (while (string-match "\\( \\|^\\)\\(\\[[^]]+\\]\\)\\( \\|$\\)" string)
+    (setq string (replace-match "@code{\\2}" t nil string 2)))
+  (while (string-match "\\( \\|^\\)\\(\\(\\(C-\\|M-\\|S-\\)+\\([^ \t\n]\\|RET\\|SPC\\|TAB\\)\\)\\|\\(RET\\|SPC\\|TAB\\)\\)\\( \\|\\s.\\|$\\)" string)
+    (setq string (replace-match "@kbd{\\2}" t nil string 2)))
+  (while (string-match "\"\\(.+\\)\"" string)
+    (setq string (replace-match "``\\1''" t nil string 0)))
+  (while (string-match "\\.\\.\\." string)
+    (setq string (replace-match "@dots{}" t nil string 0)))
+  ;; Also do base docstring type.
+  (srecode-texi-texify-docstring-default string))
+
+(provide 'srecode-texi)
+;;; srecode-texi.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode.el b/site/cedet-1.0pre7/srecode/srecode.el
new file mode 100644
index 0000000..4771174
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode.el
@@ -0,0 +1,68 @@
+;;; srecode.el --- Semantic buffer evaluator.
+
+;;; Copyright (C) 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Keywords: codegeneration
+;; X-RCS: $Id: srecode.el,v 1.7 2009/08/30 16:44:55 zappo Exp $
+
+(eval-and-compile
+  ;; Other package depend on this value at compile time via inversion.
+
+  (defvar srecode-version "1.0pre7"
+    "Current version of the Semantic Recoder.")
+
+  )
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This software is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Semantic does the job of converting source code into useful tag
+;; information.  The set of `semantic-format-tag' functions has one
+;; function that will create a prototype of a tag, which has severe
+;; issues of complexity (in the format tag file itself) and inaccuracy
+;; (for the purpose of C++ code.)
+;;
+;; Contemplation of the simplistic problem within the scope of
+;; semantic showed that the solution was more complex than could
+;; possibly be handled in semantic-format.el.   Semantic Recode, or
+;; srecode is a rich API for generating code out of semantic tags, or
+;; recoding the tags.
+;;
+;; See the srecode manual for specific details.
+
+(require 'eieio)
+(require 'mode-local)
+(load "srecode-loaddefs" nil t)
+
+;;; Code:
+(defgroup srecode nil
+  "Semantic Recoder."
+  :group 'tools)
+
+(defun srecode ()
+  "Query user about desired code generation task."
+  (interactive)
+  ;; @todo - What would this command actually do?
+  )
+
+
+(provide 'srecode)
+
+;;; srecode.el ends here
diff --git a/site/cedet-1.0pre7/srecode/srecode.info b/site/cedet-1.0pre7/srecode/srecode.info
new file mode 100644
index 0000000..d6392af
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode.info
@@ -0,0 +1,1801 @@
+This is srecode.info, produced by makeinfo version 4.9 from
+srecode.texi.
+
+START-INFO-DIR-ENTRY
+* srecode: (srecode).       Template code generator
+END-INFO-DIR-ENTRY
+
+
+File: srecode.info,  Node: Top,  Next: Quick Start,  Up: (dir)
+
+SRecoder Manual
+***************
+
+SRecode is the Semantic Recoder.  Where semantic will parse source
+files into lists of tags, the Semantic Recoder will aid in converting
+semantic tags and various other information back into various types of
+code.
+
+   While the SRecode tool provides a template language, templates for
+several languages, and even a sequence of heuristics that aid the user
+in choosing a template to insert, this is not the main goal of SRecode.
+
+   The goal of SRecode is to provide an application framework where
+someone can write a complex code generator, and the underlying template
+commonality allows it to work in multiple languages with ease.
+
+* Menu:
+
+* Quick Start::                 Basic Setup for template insertion.
+* User Templates::	        Custom User Templates
+* Parts of SRecode::		Parts of the system
+* SRecode Minor Mode::		A minor mode for using templates
+* Template Writing::		How to write a template
+* Dictionaries::                How dictionaries work
+* Developing Template Functions:: How to write your own template insert functions.
+* Template Naming Conventions:: Creating a set of core templates
+* Inserting Tag Lists::	        Inserting Semantic tags via templates
+* Application Writing::         Writing an SRecoder application
+* Index::
+
+
+File: srecode.info,  Node: Quick Start,  Next: User Templates,  Prev: Top,  Up: Top
+
+1 Quick Start
+*************
+
+When you install CEDET and enable SRecode, an `SRecoder' menu item
+should appear.
+
+   To toggle SRecode minor mode on and off use:
+
+     M-x srecode-minor-mode RET
+   or
+     M-x global-srecode-minor-mode RET
+
+   or add
+
+     (srecode-minor-mode 1)
+
+   into a language hook function to force it on (which is the default)
+or pass in `-1' to force it off.
+
+   See *Note SRecode Minor Mode:: for more on using the minor mode.
+
+   Use the menu to insert templates into the current file.
+
+   You can add your own templates in `~/.srecode', or update the
+template map path:
+
+ -- Option: srecode-map-load-path
+     Global load path for SRecode template files.
+
+   Once installed, you can start inserting templates using the menu, or
+the command:
+
+ -- Command: srecode-insert template-name &rest dict-entries
+     Insert the template TEMPLATE-NAME into the current buffer at point.
+     DICT-ENTRIES are additional dictionary values to add.
+
+   SRecode Insert will prompt for a template name.  Template names are
+specific to each major mode.  A typical name is of the form:
+`CONTEXT:NAME' where a CONTEXT might be something like `file' or
+`declaration'.  The same NAME can occur in multiple contexts.
+
+
+File: srecode.info,  Node: User Templates,  Next: Parts of SRecode,  Prev: Quick Start,  Up: Top
+
+2 User Templates
+****************
+
+SRecode builds and maintains a map of all template files.  The root
+template files resides in the SRecode distribution.  User written
+templates files are saved in `~/.srecode', along with the SRecode map
+file.
+
+ -- Variable: srecode-map-save-file
+     The save location for SRecode's map file.
+
+   Template files end with a `.srt' extension.  Details on how to write
+templates are in *Note Template Writing::.
+
+   Each template file you write is dedicated to a single major mode.  In
+it, you can write templates within the same context and with the same
+name as core templates.  You can force your templates to override the
+core templates for a particular major mode by setting the priority.
+See *Note Special Variables::.
+
+   To get going quickly, open a new `.srt' file.  It will start in the
+SRecode template writing mode.  Use the SRecode minor mode menu to
+insert the `empty' file template.
+
+   When using templates in other modes (such as C++ or Emacs Lisp
+templates), use the "Edit Template" menu to find a template you would
+like to update.  Copy it into your user template file, and change it.
+
+   If you were to update `declaration:function' in your user template
+file, then you would get this new template instead of the one that
+comes with SRecode.  Higher level applications should always use
+`declaration:function' when generating their own code, so higher level
+templates will then adopt your changes to `declaration:function' into
+themselves.
+
+   You can also override variables.  Core variables are stored in the
+SRecode root template file `default.srt', and that contains the
+copyright usually used, and some basic file setup formats.  Override
+variables like this by specifying a `mode' of `default' like this:
+
+     set mode "default"
+
+
+File: srecode.info,  Node: Parts of SRecode,  Next: SRecode Minor Mode,  Prev: User Templates,  Up: Top
+
+3 Parts of SRecode
+******************
+
+The SRecode system is made up of several layers which work together to
+generate code.
+
+3.1 Template Layer
+==================
+
+The template layer provides a way to write, and compile templates.  The
+template layer is the scheme used to insert text into an Emacs buffer.
+
+   The SRecode template layer is more advanced than other modes like the
+Emacs packages `skeleton' or `tempo' in that it allows multiple layers
+of templates to be created with the same names.  This means that
+SRecode can provide a wide range of templates, and users can override
+only the small sections they want, instead of either accepting someone
+else's template, or writing large new templates of their own.
+
+   Templates are written in `.srt' files.  You can learn how to author
+new `.srt' files *Note Template Writing::.
+
+   While the template system was designed for SRecode based
+applications it can also be used independently for simple template
+insertion during typical coding.
+
+3.2 Template Manager
+====================
+
+Once templates have been written, a scheme for loading and selecting
+templates is needed.  The template manager has a loader for finding
+template files, and determining which templates are relevant to the
+current buffer.  Template files are sorted by priority, with user
+templates being found first, and system level default templates last.
+Templates are also sorted by application.  Each application has its own
+templates, and are kept seperate from the generic templates.
+
+3.3 Dictionary
+==============
+
+Dictionaries contain values associated with variable.  Variables are
+used in macros in a template.  Variables are what allows a generic
+template such as a function to be made specific, such as a function
+named foo.  The value of a variable can be one of three things; a
+string, a list of more dictionaries, or a special
+`srecode-dictionary-compound-value' object subclass.  See *Note
+Variables:: for more.
+
+3.4 Template Insertion
+======================
+
+The template insertion layer involves extensions to the basic template
+layer.  A wide range of custom variables are available for mixing
+derived data as macros into the plain text of a template.
+
+   In addition, templates can be declared with arguments.  These
+arguments represent predetermined sets of dictionary values, such as
+features of the current file name, user name, time, etc.
+
+   Some arguments are major-mode specific, such as the `:el' or `:cpp'
+arguments.
+
+3.5 Template Insertion Context
+==============================
+
+A context can be provided for templates in a file.  This helps
+auto-selection of templates by name, or allows templates in different
+contexts to have the same name.  Some standard contexts are `file',
+`declaration', and `classdecl'.
+
+   A context can be automatically derived as well based on the parsing
+state from Semantic.  *note Semantic Manual: (semantic)Top.
+
+3.6 Applications
+================
+
+Commands that do a particular user task which involves also writing
+Emacs Lisp code.  Applications are at the top layer.  These
+applications have their own template files and logic needed to fill in
+dictionaries or position a cursor.  SRecode comes with an example
+`srecode-document' application for creating comments for Semantic tags.
+The CEDET application EDE has a project type that is an SRecode
+application.
+
+3.7 Field Editing
+=================
+
+If the variable `srecode-insert-ask-variable-method' is set to 'field,
+then variables that would normally ask a question, will instead create
+"fields" in the buffer.  A field-editing layer provides simple
+interaction through the fields.  Typing in a field will cause all
+variable locations that are the same to edit at the same time.
+Pressing TAB on a field will move you to the next field.
+
+
+File: srecode.info,  Node: SRecode Minor Mode,  Next: Template Writing,  Prev: Parts of SRecode,  Up: Top
+
+4 SRecode Minor Mode
+********************
+
+The Semantic Recode minor mode enables a keymap and menu that provides
+simple access to different templates or template applications.
+
+   The key prefix is <C-c />.
+
+   If the variable `srecode-takeover-INS-key' is set, then the key
+<<insert>> can also be used.
+
+   The most important key is bound to `srecode-insert' which is <C-c /
+/>, or <insert insert>.  *Note Quick Start::.
+
+   Major keybindings are:
+
+<C-c / />
+     Insert a template whose name is typed into the minibuffer.
+
+<C-c / <lower case letter>>
+     Reserved for direct binding of simple templates to keys using a
+     keybinding command in the template file.
+
+<C-c / <upper case letter>>
+     Reserved for template applications (Such as comment or get/set
+     inserter.)
+
+<C-c / E>
+     Edit the code of a template.
+
+<C-c / .>
+     Insert template again.  This will cause the previously inserted
+     template to be inserted again.
+
+4.1 Field Editing
+=================
+
+By default, when inserting a template, if the user needs to enter text
+to fill in a part of the template, then the minibuffer is used to query
+for that information.  SRecode also supports a field-edting mode that
+can be used instead.  To enable it set:
+
+ -- Function: srecode-insert-ask-variable-method
+     Determine how to ask for a dictionary value when inserting a
+     template.  Only the ASK style inserter will query the user for a
+     value.  Dictionary value references that ask begin with the ?
+     character.  Possible values are:
+    `ask'
+          Prompt in the minibuffer as the value is inserted.
+
+    `field'
+          Use the dictionary macro name as the inserted value, and
+          place a field there.  Matched fields change together.
+
+     NOTE: The field feature does not yet work with XEmacs.
+
+   Field editing mode is supported in newer versions of Emacs.  You
+will not be prompted to fill in values while the template is inserted.
+Instead, short regions will be highlighted, and the cursor placed in a
+field.  Typing in the field will then fill in the value.  Several
+fields might be linked together.  In that case, typing in one area will
+modify the other linked areas.  Pressing TAB will move between editable
+fields in the template.
+
+   Once the cursor moves out of the are inserted by the template, all
+the fields are cancelled.
+
+   NOTE: Some conveniences in templates, such as completion, or
+character restrictins are lost when using field editing mode.
+
+
+File: srecode.info,  Node: Template Writing,  Next: Dictionaries,  Prev: SRecode Minor Mode,  Up: Top
+
+5 Template Writing
+******************
+
+`srecode-template-mode' is the major mode used for designing new
+templates.  SRecode files (Extension `.srt') are made up of variable
+settings and template declarations.
+
+   Here is an overview of the terminology you will need for the next few
+sections:
+
+template file
+     A file with a `.srt' extension which contains settings, variables,
+     and templates.
+
+template
+     One named entity which represents a block of text that will be
+     inserted.  The text is compiled into a sequence of insertable
+     entities.  The entities are string constants, and macros.
+
+macro
+     A macro is a text sequence within template text that is replaced
+     with some other value.
+
+dictionary
+     A table of variable names and values.
+
+subdictionary
+     A dictionary that is subordinate under another dictionary as a
+     value to some variable.
+
+variable
+     A variable is an entry in a dictionary which has a value.
+
+* Menu:
+
+* Variables:: Creating special and regular variables.
+* Templates:: Creating templates
+* Contexts::  Templates are grouped by context
+* Prompts::   Setting prompts for interactive insert macros
+
+
+File: srecode.info,  Node: Variables,  Next: Templates,  Up: Template Writing
+
+5.1 Variables
+=============
+
+Variables can be set up and used in templates.  Many variables you may
+use are set up via template arguments, but some may be preferences a
+user can set up that are used in system templates.
+
+   When expanding a template, variables are stored in a "dictionary".
+Dictionary entries are variables.  Variables defined in templates can
+have string like values.
+
+   A variable can be set like this:
+     set VARNAME "some value"
+
+   Note that a VARIABLE is a name in a dictionary that can be used in a
+MACRO in a template.  The macro referernces some variable by name.
+
+* Menu:
+
+* String Values::       Basic Variable values
+* Multi-string Values:: Complex variable values
+* Section Show::        Enabling the display of a named section.
+* Special Variables::   Variables with special names
+* Automatic Loop Variables:: Variables automatically set in section loops.
+* Compound Variable Values:: Compound Variable Values
+
+
+File: srecode.info,  Node: String Values,  Next: Multi-string Values,  Up: Variables
+
+5.1.1 String Values
+-------------------
+
+Variables can be set to strings.  Strings may contain newlines or any
+other characters.  Strings are interpreted by the Emacs Lisp reader so
+`\n', `\t', and `\"' work.
+
+   When a string is inserted as part of a template, nothing within the
+string is interperted, such as template escape characters.
+
+
+File: srecode.info,  Node: Multi-string Values,  Next: Section Show,  Prev: String Values,  Up: Variables
+
+5.1.2 Multi-string Values
+-------------------------
+
+A variable can be set to multiple strings.  A compound value is usually
+used when you want to use dictionary entries as part of a variable
+later on.
+
+   Multi-string variable values are set like string values except there
+are more than one.  For example
+
+     set NAME "this" "-mode"
+
+   These two strings will be concatenated together.
+
+   A more useful thing is to include dictionary variables and
+concatenate those into the string.  Use the "macro" keyword to include
+the name of a variable.  This is like macros in a template.  For
+example:
+
+     set NAME macro "MODE" "-mode"
+
+   will extract the value of the dictionary variable MODE and append
+"-mode" to the end.
+
+
+File: srecode.info,  Node: Section Show,  Next: Special Variables,  Prev: Multi-string Values,  Up: Variables
+
+5.1.3 Section Show
+------------------
+
+To set a variable to show a template section, use the `show' command.
+Sections are blocks of a template wrapped in section macros.  If there
+is a section macro using NAME it will be shown for each dictionary
+associated with the NAME macro.
+
+     show NAME
+
+   This will enable that section.
+
+   NOTE: May 11, 2008 - I haven't used this yet, so I don't know if it
+works.
+
+
+File: srecode.info,  Node: Special Variables,  Next: Automatic Loop Variables,  Prev: Section Show,  Up: Variables
+
+5.1.4 Special Variables
+-----------------------
+
+Some variables have special meaning that changes attributes when
+templates are compiled, including:
+
+`escape-start'
+     This is the character sequence that escapes from raw text to
+     template macro names.  The ability to change the escape characters
+     are key for enabling SRecode templates to work across many kinds
+     of languages.
+
+`escape-end'
+     This is the character sequence that escapes the end of a template
+     macro name.
+
+     Example:
+          set escape_start "$"
+          set escape_end "$"
+
+`mode'
+     This is the major mode, as a string with the full Emacs Lisp
+     symbol in it.  All templates in this file will be installed into
+     the template table for this major mode.
+
+     Multiple template files can use the same mode, and all those
+     templates will be available in buffers of that mode.
+
+     Example:
+          set mode "emacs-lisp-mode"
+
+`priority'
+     The priority of a file is a number in a string constant that
+     indicates where it lies in the template search order.  System
+     templates default to low priority numbers.  User templates default
+     to high priority numbers.  You can specify the priority of your
+     template to insert it anywhere in the template search list.
+
+     If there are multiple templates with the same context and name, the
+     template with the highest priority number will be used.
+
+     If multiple files have the same priority, then then sort order is
+     unpredictable.  If no template names match, then it doesn't matter.
+
+     Example:
+          set priority "35"
+
+`application'
+     If a template file contains templates only needed for a particular
+     application, then specify an application.  Template files for an
+     application are stored in the template repository, but are not
+     used in the generic template insertion case.
+
+     The application with a particular name will access these templates
+     from Lisp code.
+
+     Example:
+          set application "document"
+
+`project'
+     If a template file contains templates, or template overrides
+     specific to a set of files under a particular directory, then that
+     template file can specify a "project" that it belongs to.
+
+     Set the "project" special variable to a directory name.  Only files
+     under that directory will be able to access the templates in that
+     file.
+
+     Any template file that has a project specified will get have a
+     priority that is set between SRecode base templates, and user
+     defined templates.
+
+     Templates can be compiled via a project system, such as EDE.  EDE
+     loaded templates will get a PROJECT set automatically.
+
+     Example:
+          set project "/tmp/testproject"
+
+
+   If you need to insert the characters that belong to the variables
+`escape_start' or `escape_end', then place those into a variable.  For
+example
+
+     set escape_start "$"
+     set escape_end "$"
+     set DOLLAR "$"
+
+
+File: srecode.info,  Node: Automatic Loop Variables,  Next: Compound Variable Values,  Prev: Special Variables,  Up: Variables
+
+5.1.5 Automatic Loop Variables
+------------------------------
+
+When section macros are used, that section is repeated for each
+subdictionary bound to the loop variable.
+
+   Each dictionary added will automatically get values for positional
+macros which will enable different SECTIONS.  The automatic section
+variables are.
+
+   * FIRST - The first entry in the table.
+
+   * NOTFIRST - Not the first entry in the table.
+
+   * LAST - The last entry in the table
+
+   * NOTLAST - Not the last entry in the table.
+
+
+File: srecode.info,  Node: Compound Variable Values,  Prev: Automatic Loop Variables,  Up: Variables
+
+5.1.6 Compound Variable Values
+------------------------------
+
+A variable can also have a compound value.  This means the value of the
+variable is an EIEIO object, which is a subclass of
+`srecode-dictionary-compound-value'.
+
+   New compound variables can only be setup from Lisp code.  See *Note
+Compound Dictionary Values:: for details on setting up compound
+variables from Lisp.
+
+
+File: srecode.info,  Node: Templates,  Next: Contexts,  Prev: Variables,  Up: Template Writing
+
+5.2 Templates
+=============
+
+A template represents a text pattern that can be inserted into a buffer.
+
+   A basic template is declaired like this:
+
+     template TEMPLATENAME :arg1 :arg2
+     "Optional documentation string"
+     ----
+     The text to your template goes here.
+     ----
+     binding "a"
+
+   Templates are stored in a template table by name, and are inserted by
+the TEMPLATENAME provided.
+
+   The documentation string is optional.  This documentation string will
+be used to aid users in selecting which template they want to use.
+
+   The code that makes up the raw template occurs between the lines that
+contain the text "----".
+
+* Menu:
+
+* Template Section Dictionaries::  Template Scoped Macro values
+* Template Macros::     Macros occuring in template patterns
+
+
+File: srecode.info,  Node: Template Section Dictionaries,  Next: Template Macros,  Up: Templates
+
+5.2.1 Template Section Dictionaries
+-----------------------------------
+
+To add variable values to section dictionaries used within a specific
+template, you can add them to the beginning of the template declaration
+like this:
+
+     template TEMPLATENAME :arg1 :arg2
+     "Optional documentation string"
+     sectiondictionary "A"
+     set NAME "foo"
+     ----
+     A beginning line {{NAME}}
+     {{#A}}Optional string {{NAME}} here{{/A}}
+     An end line
+     ----
+
+   In this example, the NAME variable gets the value "foo", but only
+while it is inside section macro A.  The outer scoped NAME will be
+empty.
+
+   This is particularly useful while using an include macro to pull in a
+second template.  In this way, you can pass values known from one
+template to a subordinate template where some value is not known.
+
+   From the Emacs Lisp default template file, a syntax table is just a
+variable with a specialized value.
+
+   If a variable is declared like this (where $ is the escape
+character):
+
+     template variable :el
+     "Inert a variable.
+     DOC is optional."
+     ----
+     (defvar $?NAME$ $^$
+       "$DOC$")
+     ----
+
+   then you can see that there is a NAME and DOC that is needed.  The
+`^' point inserter is also a handy key here.
+
+   The syntax table wants a variable, but knows the values of some of
+these variables, and can recast the problem like this by using template
+specific `sectiondictionary' macro declarations.
+
+     template syntax-table
+     "Create a syntax table."
+     sectiondictionary "A"
+     set NAME macro "?MODESYM" "-mode-syntax-table"
+     set DOC "Syntax table used in " macro "?MODESYM" " buffers."
+     ----
+     $<A:variable$
+       (let ((table (make-syntax-table (standard-syntax-table))))
+         (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+         ;; ...
+         table)
+     $/A$
+     ----
+
+   In this way, NAME can be set as a user posed question for MODESYM
+with "-mode-syntax-table" appended.  A simplified doc string will also
+be inserted.
+
+   Lastly, the A section contains more macro text which is inserted at
+the `^' point marker.
+
+   By creating useful base templates for things like function or
+variable declarations, and recycling them in higher-order templates, an
+end user can override the basic declarator, and the higher order
+templates will then obey the new format, or perhaps even work in more
+than one major mode.
+
+
+File: srecode.info,  Node: Template Macros,  Prev: Template Section Dictionaries,  Up: Templates
+
+5.2.2 Template Macros
+---------------------
+
+Template macros occur in the template text.  The default escape
+characters are "{{" and "}}", though they can be changed in the
+top-level variables.  See *Note Variables::.
+
+   Thus, if you have the template code that looks like this:
+
+     ;; Author: {{AUTHOR}}
+
+   Then the text between {{ and }} are a macro, and substituted by the
+value of the variable AUTHOR.
+
+   Macros can be specialized to be more than just a text string.  For
+example, the macro above could be augmented with an Emacs Lisp function.
+
+     ;; Author: {{AUTHOR:upcase}}
+
+   In this case, the Emacs Lisp function `upcase' will be called on the
+text value of the AUTHOR variable.
+
+   Macros can also be specialized to have different behaviors by using a
+prefix, non-alpha character or symbol.  For example:
+
+     {{! This is a comment inside macro escape characters }}
+
+   shows that the "!" symbol is for comments.
+
+   Alternately, a macro could query the user during insertion:
+
+     (defun {{?NAME}} ()
+        {{^}}
+        ) ;; End of {{NAME}}
+
+   the "?" symbol indicates that if the symbol NAME isn't in the
+dictionary, then the user should be queried for the NAME variable.  If
+NAME appears again in the template, the original value specified by the
+user will be inserted again.
+
+   If the text from a dictionary value is to be placed in column format,
+you can use the "|" symbol to indicate you want column control.  For
+example:
+
+        | this | that |{{#A}}
+        | {{|THIS:4}} | {{|THAT:4}} |{{/A}}
+
+   For each repeated section "#A" the dictionary values for THIS and
+THAT will be inserted and either trimmed to, or expanded to 4
+characters in width.
+
+   Macros that are prefixed with the "#" symbol denote a section.  A
+macro of the same name with a "\\" prefix denotes the end of that
+section.
+
+     {{#MOOSE}}
+     Here is some text describing moose.
+     {{/MOOSE}}
+
+   In this example if the section MOOSE was "shown" in the active
+dictionary, then the text between the # and / macros will also be
+inserted.
+
+   All the text and macros within a section are either not shown at all
+(if that section is not 'visible') or the section is shown one time for
+each dictionary added to that symbol.  *Note Developing Template
+Functions::.
+
+   Macros prefixed with ">" will include another template.  Include
+macros would look like this:
+
+     {{>FOO:defun}}
+
+   where `FOO' is the dictionary variable for the sub-dictionary used
+for expanding the template `defun'.  The `defun' template will be
+looked up in the template repository for the current mode, or in any
+inherited modes.
+
+   Another way to include another template is with an include macro that
+will also wrap section text.  The includewrap insertion method looks
+like this:
+
+     {{<FOO:defun}}Handy Text goes here{{/FOO}}
+
+   In this case, `defun' is included just as above.  If the `defun'
+template has a {{^}} macro in it, then the section text "Handy Text
+goes here" will be inserted at that point, and that location will not
+be saved as the cursor location.
+
+   If there is no {{^}}, then the text will not be inserted.
+
+   For both kinds of include macros, you may need to include a template
+from a different context.  You can use `:' separate the context from
+the name, like this:
+
+     {{>FOO:declaration:function}}
+
+
+File: srecode.info,  Node: Contexts,  Next: Prompts,  Prev: Templates,  Up: Template Writing
+
+5.3 Context
+===========
+
+Each template belongs to a context.  When promting for a template by
+name, such as with `C-c / /', the name is prefixed by the current
+context.  If there is no context, it defaults to `declaration'.
+
+   You can change context like this:
+
+     context NAME
+
+   where NAME is some symbol that represents any context.
+
+   A context resides over all templates that come after it until the
+next context statement.  Thus:
+
+     context C1
+
+     template foo
+     "Foo template in C1"
+     ----
+     ----
+
+     context C2
+
+     temlate foo
+     "Foo template in C2"
+     ----
+     ----
+
+   creates two `foo' templates.  The first one is when in context C1.
+The second is available in context C2.
+
+   This is useful if there are multiple ways to declare something like a
+function or variable that differ only by where it is in the syntax of
+the lanugage.  The name `foo' is not ambiguous because each is in a
+different context.
+
+
+File: srecode.info,  Node: Prompts,  Prev: Contexts,  Up: Template Writing
+
+5.4 Prompt
+==========
+
+Some templates use promtping macro insertion.  A macro that needs a
+prompt looks like this:
+
+     {{?NAME}}
+
+   where ? comes after the first escape character.
+
+   by default, it will use a prompt like this when it is encountered:
+
+     Specify NAME:
+
+   For such macros, you can pre-define prompts for any dictionary entry.
+When that dictionary entry is first encountered, the user is prompted,
+and subsequent occurances of that dictionary entry use the same value.
+
+   To get a different prompt, use a prompt command like this:
+
+     prompt VARNAME "Nice Way to ask for VARNAME: "
+
+   Now, if you put this in a template:
+
+     template variable
+     ----
+     (defvar {{?VARNAME}} nil
+        "")
+     ----
+
+   when VARNAME is encountered, it will use the nice prompt.
+
+   Prompts can be extended as well.  For example:
+
+     prompt VARNAME "VARNAME: " default "srecode" read y-or-n-p
+
+   In this case, the `default' keyword indicates that `"srecode"' is
+the default string to use, and `y-or-n-p' is the function to use to ask
+the question.
+
+   For `y-or-n-p' if you type "y" it inserts the default string,
+otherwise it inserts empty.
+
+   For any other symbol that occurs after the `read' token, it is
+expected to take the same argument list as `read-string'.  As such, you
+can create your own prompts that do completing reads on deterministic
+values.
+
+   To have the default be calculated later from a dictionary entry, you
+need to use the `defaultmacro' keyword instead.
+
+     prompt VARNAME "Varname: " defaultmacro "PREFIX"
+
+   now, when it attempts to read in VARNAME, it will pre-populte the
+text editing section with whatever the value of PREFIX is.
+
+   Some language arguments may supply possible prefixes for prompts.
+Look for these when creating your prompts.
+
+
+File: srecode.info,  Node: Dictionaries,  Next: Developing Template Functions,  Prev: Template Writing,  Up: Top
+
+6 Dictionaries
+**************
+
+Dictionaries are a set of variables.  The values associated with the
+variable names could be anything, but how it is handled is dependent on
+the type of macro being inserted.
+
+   Most of this chapter is for writing Lisp programs that use SRecode.
+If you only want to write template files, then you only need to read
+the *Note Template Argument Dictionary Entries:: section.
+
+* Menu:
+
+* Create a Dictionary::
+* Setting Dictionary Values::	Basic dictionary values
+* Compound Dictionary Values::	Complex dictionary values
+* Argument Resolution::	        Automatic template argument resolution
+* Creating new Arguments::      Create new arguments for use in templates
+* Querying a Dictionary::       Querying a dictionary for values.
+* Template Argument Dictionary Entries:: Catalog of arguments
+
+
+File: srecode.info,  Node: Create a Dictionary,  Next: Setting Dictionary Values,  Up: Dictionaries
+
+6.1 Create a Dictionary
+=======================
+
+ -- Function: srecode-create-dictionary &optional buffer
+     Create a dictionary for BUFFER.  If BUFFER is not specified, use
+     the current buffer.  The dictionary is initialized with no
+     variables or enabled sections.  Any variables defined with `set'
+     in the template, however, becomes a name in the dictionary.
+
+
+File: srecode.info,  Node: Setting Dictionary Values,  Next: Compound Dictionary Values,  Prev: Create a Dictionary,  Up: Dictionaries
+
+6.2 Setting Dictionary Values
+=============================
+
+When building an SRecode based application, you will need to setup your
+dictionary values yourself.  There are several utility functions for
+this.
+
+   In the simplest form, you can assocate a string with a variable.
+
+ -- Function: srecode-dictionary-set-value dict name value
+     In dictionary DICT, set NAME to have VALUE.
+
+   For section macros, you can have alternate values.  A section can
+either be toggled as visible, or it can act as a loop.
+
+ -- Function: srecode-dictionary-show-section dict name
+     In dictionary DICT, indicate that the section NAME should be
+     exposed.
+
+ -- Function: srecode-dictionary-add-section-dictionary dict name
+          show-only
+     In dictionary DICT, add a section dictionary for section macro
+     NAME.  Return the new dictionary.
+
+     You can add several dictionaries to the same section entry.  For
+     each dictionary added to a variable, the block of codes in the
+     template will be repeated.
+
+     If optional argument SHOW-ONLY is non-`nil', then don't add a new
+     dictionarly if there is already one in place.  Also, don't add
+     FIRST/LAST entries.  These entries are not needed when we are just
+     showing a section.
+
+     Each dictionary added will automatically get values for positional
+     macros which will enable SECTIONS to be enabled.
+
+    FIRST
+          The first entry in the table.
+
+    NOTFIRST
+          Not the first entry in the table.
+
+    LAST
+          The last entry in the table
+
+    NOTLAST
+          Not the last entry in the table.
+
+     Adding a new dictionary will alter these values in previously
+     inserted dictionaries.
+
+
+File: srecode.info,  Node: Compound Dictionary Values,  Next: Argument Resolution,  Prev: Setting Dictionary Values,  Up: Dictionaries
+
+6.3 Compound Dictionary Values
+==============================
+
+If you want to associate a non-string value with a dictionary variable,
+then you will need to use a compound value.  Compound dictionary values
+are derived using EIEIO from a base class for handling arbitrary data
+in a macro.
+
+ -- Type: srecode-dictionary-compound-value
+     A compound dictionary value.  Values stored in a dictionary must
+     be a STRING, a dictionary for showing sections, or an instance of
+     a subclass of this class.
+
+     Compound dictionary values derive from this class, and must
+     provide a sequence of method implementations to convert into a
+     string.
+
+   Your new subclass of the compound value needs to implement these
+methods:
+
+ -- Function: srecode-compound-toString cp function dictionary
+     Convert the compound dictionary value CP to a string.  If FUNCTION
+     is non-`nil', then FUNCTION is somehow applied to an aspect of the
+     compound value.  The FUNCTION could be a fraction of some function
+     symbol with a logical prefix excluded.
+
+   The next method is for dumping out tables during debugging.
+
+ -- Function: srecode-dump cp &optional indent
+     Display information about this compound value.
+
+   Here is an example of wrapping a semantic tag in a compound value:
+
+     (defclass srecode-semantic-tag (srecode-dictionary-compound-value)
+       ((prime :initarg :prime
+     	  :type semantic-tag
+     	  :documentation
+     	  "This is the primary insertion tag.")
+        )
+       "Wrap up a collection of semantic tag information.
+     This class will be used to derive dictionary values.")
+
+     (defmethod srecode-compound-toString((cp srecode-semantic-tag)
+     				     function
+     				     dictionary)
+       "Convert the compound dictionary value CP to a string.
+     If FUNCTION is non-nil, then FUNCTION is somehow applied to an
+     aspect of the compound value."
+       (if (not function)
+           ;; Just format it in some handy dandy way.
+           (semantic-format-tag-prototype (oref cp :prime))
+         ;; Otherwise, apply the function to the tag itself.
+         (funcall function (oref cp :prime))
+         ))
+
+
+File: srecode.info,  Node: Argument Resolution,  Next: Creating new Arguments,  Prev: Compound Dictionary Values,  Up: Dictionaries
+
+6.4 Argument Resolution
+=======================
+
+Some dictionary entries can be set via template arguments in the
+template declaration.  For examples of template arguments, see *Note
+Template Argument Dictionary Entries::.
+
+   You can resolve an argument list into a dictionary with:
+
+ -- Function: srecode-resolve-arguments temp dict
+     Resolve all the arguments needed by the template TEMP.  Apply
+     anything learned to the dictionary DICT.
+
+
+File: srecode.info,  Node: Creating new Arguments,  Next: Querying a Dictionary,  Prev: Argument Resolution,  Up: Dictionaries
+
+6.5 Creating new Arguments
+==========================
+
+You can create new arguments for use in template files by writing new
+Emacs Lisp functions.  Doing so is easy.  Here is an example for the
+`:user' argument:
+
+     (defun srecode-semantic-handle-:user (dict)
+       "Add macros into the dictionary DICT based on the current :user."
+       (srecode-dictionary-set-value dict "AUTHOR" (user-full-name))
+       (srecode-dictionary-set-value dict "LOGIN" (user-login-name))
+        ;; ...
+       )
+
+   In this case, a function with the name prefix
+`srecode-semantic-handle-' that ends in `:user' creates a new argument
+`:user' that can be used in a template.
+
+   Your argument handler must take one argument DICT, which is the
+dictionary to fill in.  Inside your function, you can do whatever you
+want, but adding dictionary values is the right thing.
+
+
+File: srecode.info,  Node: Querying a Dictionary,  Next: Template Argument Dictionary Entries,  Prev: Creating new Arguments,  Up: Dictionaries
+
+6.6 Querying a Dictionary
+=========================
+
+When creating a new argument, it may be useful to ask the dicitonary
+what entries are already set there, and conditionally create new
+entries based on those.
+
+   In this way, a template author can get additional logic through more
+advanced arguments.
+
+ -- Function: srecode-dictionary-lookup-name dict name
+     Return information about the current DICT's value for NAME.  DICT
+     is a dictionary, and NAME is a string that is the name of a symbol
+     in the dictionary.  This function derives values for some special
+     NAMEs, such as FIRST and 'LAST'.
+
+
+File: srecode.info,  Node: Template Argument Dictionary Entries,  Prev: Querying a Dictionary,  Up: Dictionaries
+
+6.7 Template Argument Dictionary Entries
+========================================
+
+When a dictionary is initialized for a template, then the dictionary
+will be initialized with a predefined set of macro values.
+
+   A template of the form:
+
+     template template-name :arg1 :arg2
+     ----
+     Your template goes here
+     ----
+
+   specifies two arguments :arg1, and :arg2.
+
+   The following built-in simple arguments are available:
+
+* Menu:
+
+* Base Arguments::
+* Semantic Arguments::
+* Language Arguments::
+
+
+File: srecode.info,  Node: Base Arguments,  Next: Semantic Arguments,  Up: Template Argument Dictionary Entries
+
+6.7.1 Base Arguments
+--------------------
+
+6.7.1.1 Argument :indent
+........................
+
+Supplies the `INDENT' macro.  When `INDENT' is non-nil, then each line
+is individually indented with `indent-according-to-mode' during macro
+processing.
+
+6.7.2 Argument :blank
+---------------------
+
+Specifying this argument adds a special `:blank' handler at the
+beginning and end of the template.  This handler will insert `\n' if
+the insertion point is not on a line by itself.
+
+6.7.2.1 Argument :region
+........................
+
+If there is an active region via `transient-mark-mode', or
+`mouse-drag-region', then the `REGION' section will be enabled.
+
+   In addition, `REGIONTEXT' will be set the the text in the region,
+and that region of text will be "killed" from the current buffer.
+
+   If standard-output is NOT the current buffer, then the region will
+not be deleted.  In this way, you can safely use `:region' using
+templates in arbitrary output streams.
+
+6.7.2.2 Argument :user
+......................
+
+Sets up variables about the current user.
+
+`AUTHOR'
+     Value of the Emacs function `user-full-name'
+
+`EMAIL'
+     Current Emacs users email address.
+
+`LOGIN'
+     Current Emacs users login name.
+
+`UID'
+     Current Emacs users login name.
+
+`EMACSINITFILE'
+     This Emacs sessions' init file.
+
+6.7.2.3 Argument :time
+......................
+
+Sets up variables with the current date and time.
+
+`YEAR'
+     The current year.
+
+`MONTH'
+     The current month as a number.
+
+`MONTHNAME'
+     The current month name, unabbreviated.
+
+`DAY'
+     The current day as a number.
+
+`WEEKDAY'
+     The current day of the week as an abbreviated name
+
+`HOUR'
+     The current hour in 24 hour format.
+
+`HOUR12'
+     The current hour in 12 hour format.
+
+`AMPM'
+     Locale equivalent of AM or PM.  Usefule with HOUR12.
+
+`MINUTE'
+     The current minute.
+
+`SECOND'
+     The current second.
+
+`TIMEZONE'
+     The timezone string.
+
+`DATE'
+     The Locale supported date (%D).
+
+`TIME'
+     The Locale supported time format (%X).
+
+6.7.2.4 Argument :file
+......................
+
+Sets up variables with details about the current file.
+
+`FILENAME'
+     The filename with out the directory part of the current buffer.
+
+`FILE'
+     The filename with out the directory or extension
+
+`EXTENSION'
+     The filename extension.
+
+`DIRECTORY'
+     The directory in which the current buffer resides.
+
+`MODE'
+     Major mode of this buffer.
+
+`SHORTMODE'
+     Major mode of this buffer without "-mode".  Useful for inserting
+     the Emacs mode specifier.
+
+`section RCS'
+     Show the section RCS if there is a CVS or RCS directory here.
+
+6.7.2.5 Argument :system
+........................
+
+Sets up variables with computer system information.
+
+`SYSTEMCONF'
+     The "system-configuration".
+
+`SYSTEMTYPE'
+     The "system-type".
+
+`SYSTEMNAME'
+     The "system-name".
+
+`MAILHOST'
+     The name of the machine Emacs derived mail "comes from".
+
+6.7.2.6 Argument :kill
+......................
+
+`KILL'
+     The top-most item from the kill ring.
+
+`KILL2'
+     The second item in the kill ring.
+
+`KILL3'
+     The third item in the kill ring.
+
+`KILL4'
+     The fourth item in the kill ring.
+
+
+File: srecode.info,  Node: Semantic Arguments,  Next: Language Arguments,  Prev: Base Arguments,  Up: Template Argument Dictionary Entries
+
+6.7.3 Semantic Arguments
+------------------------
+
+6.7.3.1 Argument :tag
+.....................
+
+The :tag argument is filled in with information from Semantic.  The tag
+in question is queried from the senator tag ring, or passed in from
+SRecode utilities that use tags in templates.
+
+`TAG'
+     This is a compound value for the tag in the current senator kill
+     ring, or something handled via the variable
+     `srecode-semantic-selected-tag'.
+
+      -- Variable: srecode-semantic-selected-tag
+          The tag selected by a `:tag' template argument.  If this is
+          `nil', then `senator-tag-ring' is used.
+
+     Use the function part of a macro insert to extract obscure parts
+     of the tag.
+
+`NAME'
+     The name of the tag as a string.
+
+`TYPE'
+     The data type of the tag as a string.
+
+   If TAG is a function, you will get these additional dictionary
+entries.
+
+`ARGS'
+     A Loop macro value.  Each argument is inserted in ARGS.  To create
+     a comma separated list of arguments, you might do this:
+
+          {{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}}
+
+     Within the section dictionaries for each argument, you will find
+     both NAME and TYPE, in addition to the automatic section values
+     for FIRST, LAST, NOTFIRST, and NOTLAST.
+
+`PARENT'
+     The string name of the parent of this function, if the function is
+     a method of some class.
+
+`THROWS'
+     In each THROWS entry, the NAME of the signal thrown is specified.
+
+   If TAG is a variable, you will get these dictionary entries.
+
+`DEFAULTVALUE'
+     Enabled if there is a VALUE.
+
+`VALUE'
+     An entry in the HAVEDEFAULT subdictionary that represents the
+     textual representation of the default value of this variable.
+
+   If TAG is a datatype, you will get these dictionary entries.
+
+`PARENTS'
+     Section dictionaries for the parents of this class.  Each parent
+     will have a NAME.
+
+`INTERFACES'
+     Section dictionaries for all the implemented interfaces of this
+     class.  Each interface will have a NAME.
+
+   Note that data type templates should always have a `{{^}}' macro in
+it where the core contents of that type will go.  This is why data
+types don't have subdictionaries full of the slots in the classes or
+structs.
+
+
+File: srecode.info,  Node: Language Arguments,  Prev: Semantic Arguments,  Up: Template Argument Dictionary Entries
+
+6.7.4 language Arguments
+------------------------
+
+Each language typically has its own argument.  These arguments can be
+used to fill in language specific values that will be useful.
+
+6.7.4.1 Argument :srt
+.....................
+
+Used for SRecoder template files.
+
+`ESCAPE_START'
+     The characters used for an escape start
+
+`ESCAPE_END'
+     The characters used for an escape end
+
+6.7.4.2 Argument :cpp
+.....................
+
+`HEADER'
+     Shows this section if the current file is a header file.
+
+`NOTHEADER'
+     The opposite of `HEADER'.
+
+`FILENAME_SYMBOL'
+     The current filename reformatted as a C friendly symbol.
+
+6.7.5 Argument :java
+--------------------
+
+`FILENAME_AS_PACKAGE'
+     Converts the filename into text that would be suitable as a package
+     name.
+
+`FILENAME_AS_CLASS'
+     Converts the filename into text that would be suitable as a
+     class-name for the main class in the file.
+
+6.7.5.1 Argument :el
+....................
+
+Sets `PRENAME'.  This would be a common prefix from all the tags in the
+current buffer.
+
+   Most Emacs Lisp packages have some common prefix used in a way
+similar to namespaces in other languages.
+
+6.7.5.2 Argument :el-custom
+...........................
+
+`GROUP'
+     The name of the Emacs Custom group that instances of `defcustom'
+     ought to use.
+
+`FACEGROUP'
+     The name of the Emacs Custom group that faces delcared with
+     `defface' ought to use.
+
+6.7.5.3 Argument :texi
+......................
+
+`LEVEL'
+     The current section level, such as `chapter' or `section'.
+
+`NEXTLEVEL'
+     The next level down, so if `LEVEL' is `chapter', then `NEXTLEVEL'
+     would be `section'.
+
+6.7.5.4 Argument :texitag
+.........................
+
+The `:texitag' argument is like the `:tag' argument, except that
+additional variable `TAGDOC' is provided for each tag.
+
+   The `TAGDOC' is filled with derived documentation from the tag in
+question, and that documentation is also reformatted to be mostly
+texinfo compatible.
+
+
+File: srecode.info,  Node: Developing Template Functions,  Next: Template Naming Conventions,  Prev: Dictionaries,  Up: Top
+
+7 Developing Template Functions
+*******************************
+
+You can develop your own custom template insertion functions.  Doing so
+is relatively simple, and requires that you write an Emacs Lisp command.
+
+   If the built in commands don't provide enough options, you will need
+to write your own function in order to provide your dictionaries with
+the values needed for custom templates.
+
+   In this way, you can build your own code generator for any language
+based on a set of predefined macros whos values you need to derive from
+Emacs Lisp code yourself.
+
+   For example:
+
+     (defun my-srecode-insert (template-name)
+       "Inesrt the template TEMPLATE-NAME into the current buffer at point."
+
+       ;; Read in a template name.
+       (interactive (list (srecode-read-template-name "Template Name: ")))
+       (if (not (srecode-table))
+           (error "No template table found for mode %s" major-mode))
+       (let ((temp (srecode-template-get-table (srecode-table) template-name))
+
+             ;; Create a new dictionary
+             (newdict (srecode-create-dictionary)))
+
+         (if (not temp)
+             (error "No Template named %s" template-name))
+
+         ;; Add some values into the dictionary!
+         (srecode-dictionary-set-value newdict "FOO" (my-get-value-of-foo))
+         ;; Optionally show a section
+         (srecode-dictionary-show-section newdict "BLARG")
+
+         ;; Add in several items over a loop
+         (let ((my-stuff (get-my-stuff-list)))
+            (while my-stuff
+               (let ((subdict (srecode-dictionary-add-section-dictionary
+                                  newdict "LOOP")))
+                  (srecode-dictionary-set-value subdict "NAME" (nth 0 my-stuff))
+                  (srecode-dictionary-set-value subdict "ARG" (nth 1 my-stuff))
+                  (srecode-dictionary-set-value subdict "MOOSE" (nth 2 my-stuff))
+                  )
+               (setq my-stuff (cdr my-stuff)))
+
+         ;; Some templates have arguments that need to be resolved.
+         (srecode-resolve-arguments temp newdict)
+
+         ;; Do the expansion
+         (srecode-insert-fcn temp newdict)
+         ))
+
+   Lets look at the key functions involved above:
+
+7.1 Interactive Completion:
+===========================
+
+ -- Function: srecode-read-template-name prompt
+     Completing read for Semantic Recoder template names.  PROMPT is
+     used to query for the name of the template desired.
+
+7.2 Template Lookup
+===================
+
+Even if your program does not query the user for a template name, you
+will need to locate a template.  First, you need to locate the table to
+look the template up in.
+
+ -- Function: srecode-table &optional mode
+     Return the currently active Semantic Recoder table for this buffer.
+     Optional argument MODE specifies the mode table to use.
+
+ -- Function: srecode-template-get-table tab template-name &optional
+          context application
+     Find in the template in mode table TAB, the template with
+     TEMPLATE-NAME.  Optional argument CONTEXT specifies a context a
+     particular template would belong to.  Optional argument
+     APPLICATION restricts searches to only template tables belonging
+     to a specific application.  If APPLICATION is `nil', then only
+     tables that do not belong to an application will be searched.
+
+   For purposes of an SRecode application, it is important to decide
+what to call yoru application, and use that with this method call.
+
+7.3 Creating dictionaries
+=========================
+
+Several dictionary calls are made in this example, including:
+`srecode-create-dictionary'
+
+`srecode-dictionary-set-value'
+
+`srecode-dictionary-show-section'
+
+`srecode-dictionary-add-section-dictionary'
+
+   These are documented more fully *Note Dictionaries::.
+
+   Also used is `srecode-resolve-arguments'.  To learn more about that,
+see *Note Argument Resolution::.
+
+7.4 Template Insertion Commands
+===============================
+
+There are several ways to insert a template.  It is easiest to just
+start with the main entry point.
+
+ -- Function: srecode-insert-fcn template dictionary &optional stream
+     Insert TEMPLATE using DICTIONARY into STREAM.  If STREAM is nil,
+     then use the current buffer.
+
+
+File: srecode.info,  Node: Template Naming Conventions,  Next: Inserting Tag Lists,  Prev: Developing Template Functions,  Up: Top
+
+8 Template Naming Conventions
+*****************************
+
+For SRecode to work across langauges reliably, templates need to follow
+a predictable pattern.  For every language of similar nature (OO,
+functional, doc based) if they all provide the same base templates,
+then an application can be written against the base templates, and it
+will work in each of the supported language.
+
+   Having consistent templates also makes it easy to use those templates
+from a user perspective during basic interactive insertion via
+`srecode-minor-mode'.
+
+   NOTES ON THIS CHAPTER:
+
+   These conventions are being worked on.  Check w/ CEDET-DEVEL mailing
+list if you want to support a language, or write an application and
+provide your opinions on this topic.  Any help is appreciated.
+
+8.1 Context: File
+=================
+
+Each language should support the `file:empty' template.  This will
+generally use the default copyright insertion mechanism.
+
+8.2 Context: Declaration
+========================
+
+Functional languages should attempt to support the folowing:
+
+`function'
+     A standalone function.  Not a method, external method, or other.
+
+`method'
+     A method belonging to some class declaired outside the textual
+     bounds of that class' declaration.
+
+`variable'
+     A global variable.
+
+`type'
+     A data type.  If the language supports several types of datatypes
+     then do not use this, use more specific ones instead.
+
+`class'
+     For OO languages, use this instead of `type'.
+
+`include'
+     Include files.
+
+   For any semantic tag class in your language, you will likely want to
+have a corresponding template.
+
+   In order for the SRecode function `srecode-semantic-insert-tag' to
+work, you can create templates similar to those mentioned above, except
+with `-tag' appended to the end.  This lets a template like `function'
+have user conveniences when referencing `function-tag', while also
+allowing the tag inserter to do its job with a simpler template.
+
+8.3 Context: Classdef
+=====================
+
+Inside a class definition.  These are to be inserted inside the textual
+bounds of a class declaration.
+
+`function'
+     This would be a method of the class being inserted into.
+
+`constructor'
+`destructor'
+     Like `function' but specific to alloc/delete of an object.
+
+`variable'
+     This would be a field of the class being inserted into.
+
+8.4 Context: Code
+=================
+
+Inside a body of code, such as a function or method body.
+
+   - no conventions yet.
+
+8.5 Standard Dictionary Values
+==============================
+
+For these variables to be useful, standard names should be used.  These
+values could be provided directly from a Semantic tag, or by an
+application.
+
+NAME
+     The name of the declaration being created.
+
+PARENT
+     If the item belongs to some parent type, it would be the full name
+     of that type, including namespaces.
+
+TYPE
+     A datatype name for a variable, or the return value of a function.
+
+DOC
+     If there is some documentation associated with the item, then DOC
+     should contain the value.  (Optional)
+
+ARGS
+     The ARGS variable defines a section for 0 or more arguments to a
+     function or method.  Each entry in ARGS will follow the rest of
+     these naming conventions, such as for NAME and TYPE.
+
+   For templates used by `srecode-semantic-insert-tag', there is also
+the following useful dictionary values.
+
+TAG
+     A special insertion value TAG.  You can use semantic functions to
+     turn the tag into a string.
+
+HAVEDEFAULT
+DEFAULT
+     Default value for a variable.
+
+
+File: srecode.info,  Node: Inserting Tag Lists,  Next: Application Writing,  Prev: Template Naming Conventions,  Up: Top
+
+9 Inserting Tag Lists
+*********************
+
+Since SRecode is the Semantic Recoder, the ultimate goal for SRecode is
+to convert lists of tags, as produced by semantic back into code.
+
+   A single function provides the interface for programs to do this, but
+it requires any particular language to have provided the correct
+templates to make it work.
+
+ -- Function: srecode-semantic-insert-tag tag &optional style-option
+          point-insert-fcn &rest dict-entries
+     Insert TAG into a buffer useing srecode templates at point.
+
+     Optional STYLE-OPTION is a list of minor configuration of styles,
+     such as the symbol `'prototype' for prototype functions, or
+     `'system' for system includes, and `'doxygen', for a doxygen style
+     comment.
+
+     Optional third argument POINT-INSERT-FCN is a hook that is run
+     after TAG is inserted that allows an opportunity to fill in the
+     body of some thing.  This hook function is called with one
+     argument, the TAG being inserted.
+
+     The rest of the arguments are DICT-ENTRIES.  DICT-ENTRIES is of
+     the form ( NAME1 VALUE1 NAME2 VALUE2 ... NAMEn VALUEn).
+
+     The exact template used is based on the current context.  The
+     template used is found within the toplevel context as calculated
+     by "srecode-calculate-context", such as `declaration', `classdecl',
+     or `code'.
+
+     For various conditions, this function looks for a template with
+     the name CLASS-tag, where CLASS is the tag class.  If it cannot
+     find that, it will look for that template in the
+     `declaration'context (if the current context was not
+     `declaration').
+
+     If PROTOTYPE is specified, it will first look for templates with
+     the name CLASS-tag-prototype, or CLASS-prototype as above.
+
+     See "srecode-semantic-apply-tag-to-dict" for details on what is in
+     the dictionary when the templates are called.
+
+     This function returns to location in the buffer where the inserted
+     tag ENDS, and will leave point inside the inserted text based on
+     any occurance of a point-inserter.  Templates such as "function"
+     will leave point where code might be inserted.
+
+
+File: srecode.info,  Node: Application Writing,  Next: Index,  Prev: Inserting Tag Lists,  Up: Top
+
+10 Application Writing
+**********************
+
+The main goal of SRecode is to provide a strong platform for writing
+code generating applications.
+
+   Any templates that are application specific should make an
+application declaration for each template file they use.  This prevents
+those templates from being used outside of that application.
+
+   For example, add this to a file:
+     set application "getset"
+
+   In your application Emacs Lisp code, you would then load those
+templates.  A typical initialization would look like this:
+
+       (srecode-load-tables-for-mode major-mode)
+       (srecode-load-tables-for-mode major-mode 'getset)
+
+   These two lines will load in the base templates for the major mode,
+and then the application specific templates.
+
+ -- Function: srecode-load-tables-for-mode mmode &optional appname
+     Load all the template files for MMODE.  Templates are found in the
+     SRecode Template Map.  See "srecode-get-maps" for more.  APPNAME
+     is the name of an application.  In this case, all template files
+     for that application will be loaded.
+
+   todo - Add examples.  Most core stuff is already described above.
+
+
+File: srecode.info,  Node: Index,  Prev: Application Writing,  Up: Top
+
+11 Index
+********
+
+
+
+Tag Table:
+Node: Top168
+Node: Quick Start1518
+Ref: srecode-map-load-path2237
+Ref: srecode-insert2435
+Node: User Templates2828
+Ref: srecode-map-save-file3210
+Node: Parts of SRecode4719
+Node: SRecode Minor Mode8606
+Ref: srecode-insert-ask-variable-method9999
+Node: Template Writing11186
+Ref: `SRecode-template-mode'11330
+Node: Variables12449
+Node: String Values13475
+Node: Multi-string Values13904
+Node: Section Show14738
+Node: Special Variables15261
+Node: Automatic Loop Variables18347
+Node: Compound Variable Values18986
+Node: Templates19472
+Node: Template Section Dictionaries20350
+Node: Template Macros22859
+Node: Contexts26275
+Node: Prompts27317
+Node: Dictionaries29191
+Node: Create a Dictionary30131
+Ref: srecode-create-dictionary30340
+Node: Setting Dictionary Values30610
+Ref: srecode-dictionary-set-value31085
+Ref: srecode-dictionary-show-section31316
+Ref: srecode-dictionary-add-section-dictionary31483
+Node: Compound Dictionary Values32434
+Ref: srecode-dictionary-compound-value32906
+Ref: srecode-compound-toString33367
+Ref: srecode-dump33739
+Node: Argument Resolution34733
+Ref: srecode-resolve-arguments35203
+Node: Creating new Arguments35317
+Node: Querying a Dictionary36299
+Ref: srecode-dictionary-lookup-name36806
+Node: Template Argument Dictionary Entries37059
+Node: Base Arguments37685
+Node: Semantic Arguments40949
+Ref: srecode-semantic-selected-tag41587
+Node: Language Arguments43332
+Node: Developing Template Functions45421
+Ref: srecode-read-template-name47861
+Ref: srecode-table48240
+Ref: srecode-template-get-table48474
+Ref: srecode-insert-fcn49667
+Node: Template Naming Conventions49772
+Node: Inserting Tag Lists53443
+Ref: srecode-semantic-insert-tag54032
+Node: Application Writing55716
+Ref: srecode-load-tables-for-mode56645
+Node: Index56970
+
+End Tag Table
diff --git a/site/cedet-1.0pre7/srecode/srecode.texi b/site/cedet-1.0pre7/srecode/srecode.texi
new file mode 100644
index 0000000..59d487f
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/srecode.texi
@@ -0,0 +1,1759 @@
+\input texinfo   @c -*-texinfo-*-
+@c
+@c $Id: srecode.texi,v 1.21.2.1 2010/02/22 02:57:13 zappo Exp $
+@c
+@c %**start of header
+@setfilename srecode.info
+@set TITLE SRecoder Manual
+@set AUTHOR Eric M. Ludlam
+@settitle @value{TITLE}
+@c %**end of header
+
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* srecode: (srecode).       Template code generator
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
+@titlepage
+@sp 10
+@center @titlefont{srecode}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2007, 2008, 2009, 2010 Eric M. Ludlam
+@end titlepage
+
+@macro semantic{}
+@i{semantic}
+@end macro
+
+@macro EIEIO{}
+@i{EIEIO}
+@end macro
+
+@macro srecode{}
+@i{SRecode}
+@end macro
+
+@node Top
+@top @value{TITLE}
+
+@srecode{} is the @i{Semantic Recoder}.  Where @semantic{} will parse
+source files into lists of tags, the @i{Semantic Recoder} will aid in
+converting @semantic{} tags and various other information back into
+various types of code.
+
+While the @srecode{} tool provides a template language, templates for
+several languages, and even a sequence of heuristics that aid the user
+in choosing a template to insert, this is not the main goal of
+@srecode{}.
+
+The goal of @srecode{} is to provide an application framework where
+someone can write a complex code generator, and the underlying
+template commonality allows it to work in multiple languages with
+ease.
+
+@menu
+* Quick Start::                 Basic Setup for template insertion.
+* User Templates::	        Custom User Templates
+* Parts of SRecode::		Parts of the system
+* SRecode Minor Mode::		A minor mode for using templates
+* Template Writing::		How to write a template
+* Dictionaries::                How dictionaries work
+* Developing Template Functions:: How to write your own template insert functions.
+* Template Naming Conventions:: Creating a set of core templates
+* Inserting Tag Lists::	        Inserting Semantic tags via templates
+* Application Writing::         Writing an @srecode{}r application
+* Index::
+@end menu
+
+
+@node Quick Start
+@chapter Quick Start
+
+When you install CEDET and enable @srecode{}, an @code{SRecoder} menu
+item should appear.
+
+To toggle @srecode{} minor mode on and off use:
+
+@example
+M-x srecode-minor-mode RET
+@end example
+or
+@example
+M-x global-srecode-minor-mode RET
+@end example
+
+or add
+
+@example
+(srecode-minor-mode 1)
+@end example
+
+into a language hook function to force it on (which is the default) or
+pass in @code{-1} to force it off.
+
+See @ref{SRecode Minor Mode} for more on using the minor mode.
+
+Use the menu to insert templates into the current file.
+
+You can add your own templates in @file{~/.srecode}, or update the
+template map path:
+
+@deffn Option srecode-map-load-path
+@anchor{srecode-map-load-path}
+Global load path for SRecode template files.
+@end deffn
+
+
+Once installed, you can start inserting templates using the menu, or
+the command:
+
+@deffn Command srecode-insert template-name &rest dict-entries
+@anchor{srecode-insert}
+Insert the template @var{template-name} into the current buffer at point.
+@var{dict-entries} are additional dictionary values to add.
+@end deffn
+
+SRecode Insert will prompt for a template name.  Template names are
+specific to each major mode.  A typical name is of the form:
+@code{CONTEXT:NAME} where a @var{CONTEXT} might be something like
+@code{file} or @code{declaration}.  The same @var{NAME} can occur in
+multiple contexts.
+
+@node User Templates
+@chapter User Templates
+
+@srecode{} builds and maintains a map of all template files.  The root
+template files resides in the @srecode{} distribution.  User written
+templates files are saved in @file{~/.srecode}, along with the
+@srecode{} map file.
+
+@defvar srecode-map-save-file
+@anchor{srecode-map-save-file}
+The save location for SRecode's map file.
+@end defvar
+
+Template files end with a @file{.srt} extension.  Details on how to
+write templates are in @ref{Template Writing}.
+
+Each template file you write is dedicated to a single major mode.  In
+it, you can write templates within the same context and with the same
+name as core templates.  You can force your templates to override the
+core templates for a particular major mode by setting the
+priority.  See @ref{Special Variables}.
+
+To get going quickly, open a new @file{.srt} file.  It will start in
+the @srecode{} template writing mode.  Use the @srecode{} minor mode
+menu to insert the @code{empty} file template.
+
+When using templates in other modes (such as C++ or Emacs Lisp
+templates), use the ``Edit Template'' menu to find a template you
+would like to update.  Copy it into your user template file, and
+change it.
+
+If you were to update @code{declaration:function} in your user
+template file, then you would get this new template instead of the one
+that comes with @srecode{}.  Higher level applications should always
+use @code{declaration:function} when generating their own code, so
+higher level templates will then adopt your changes to
+@code{declaration:function} into themselves.
+
+You can also override variables.  Core variables are stored in the
+@srecode{} root template file @file{default.srt}, and that contains
+the copyright usually used, and some basic file setup formats.
+Override variables like this by specifying a @code{mode} of
+@code{default} like this:
+
+@example
+set mode "default"
+@end example
+
+@node Parts of SRecode
+@chapter Parts of SRecode
+
+The @srecode{} system is made up of several layers which work together
+to generate code.
+
+@section Template Layer
+The template layer provides a way to write, and compile templates.  The
+template layer is the scheme used to insert text into an Emacs buffer.
+
+The @srecode{} template layer is more advanced than other modes like the
+Emacs packages @code{skeleton} or @code{tempo} in that it allows
+multiple layers of templates to be created with the same names.  This
+means that @srecode{} can provide a wide range of templates, and users
+can override only the small sections they want, instead of either
+accepting someone else's template, or writing large new templates of
+their own.
+
+Templates are written in @file{.srt} files.  You can learn how to
+author new @file{.srt} files @ref{Template Writing}.
+
+While the template system was designed for @srecode{} based
+applications it can also be used independently for simple template
+insertion during typical coding.
+
+@section Template Manager
+Once templates have been written, a scheme for loading and selecting
+templates is needed.  The template manager has a loader for finding
+template files, and determining which templates are relevant to the
+current buffer.  Template files are sorted by priority, with user
+templates being found first, and system level default templates last.
+Templates are also sorted by application.  Each application has its
+own templates, and are kept seperate from the generic templates.
+
+@section Dictionary
+Dictionaries contain values associated with variable.  Variables are
+used in macros in a template.  Variables are what allows a generic
+template such as a function to be made specific, such as a function
+named foo.  The value of a variable can be one of three things; a
+string, a list of more dictionaries, or a special
+@code{srecode-dictionary-compound-value} object subclass.  See
+@ref{Variables} for more.
+
+@section Template Insertion
+The template insertion layer involves extensions to the basic template
+layer.  A wide range of custom variables are available for mixing derived
+data as macros into the plain text of a template.
+
+In addition, templates can be declared with arguments.  These
+arguments represent predetermined sets of dictionary values, such as
+features of the current file name, user name, time, etc.
+
+Some arguments are major-mode specific, such as the @code{:el} or
+@code{:cpp} arguments.
+@refill
+
+@section Template Insertion Context
+A context can be provided for templates in a file.  This helps
+auto-selection of templates by name, or allows templates in different
+contexts to have the same name.  Some standard contexts are
+@code{file}, @code{declaration}, and @code{classdecl}.
+
+A context can be automatically derived as well based on the parsing
+state from @i{Semantic}.  @inforef{Top, Semantic Manual, semantic}.
+@refill
+
+@section Applications
+Commands that do a particular user task which involves also writing
+Emacs Lisp code.  Applications are at the top layer.  These
+applications have their own template files and logic needed to fill in
+dictionaries or position a cursor.  SRecode comes with an example
+@code{srecode-document} application for creating comments for Semantic
+tags.  The CEDET application @i{EDE} has a project type that is an
+@srecode{} application.
+
+@section Field Editing
+If the variable @code{srecode-insert-ask-variable-method} is set to
+'field, then variables that would normally ask a question, will
+instead create ``fields'' in the buffer.  A field-editing layer
+provides simple interaction through the fields.  Typing in a field
+will cause all variable locations that are the same to edit at the
+same time.  Pressing TAB on a field will move you to the next field.
+
+@node SRecode Minor Mode
+@chapter SRecode Minor Mode
+
+The Semantic Recode minor mode enables a keymap and menu that provides
+simple access to different templates or template applications.
+
+The key prefix is @key{C-c /}.
+
+If the variable @code{srecode-takeover-INS-key} is set, then the key
+@key{<insert>} can also be used.
+
+The most important key is bound to @code{srecode-insert} which is
+@key{C-c / /}, or @key{insert insert}.  @ref{Quick Start}.
+
+Major keybindings are:
+
+@table @key
+@item C-c / /
+Insert a template whose name is typed into the minibuffer.
+@item C-c / <lower case letter>
+Reserved for direct binding of simple templates to keys using a
+keybinding command in the template file.
+@item C-c / <upper case letter>
+Reserved for template applications (Such as comment or get/set inserter.)
+@item C-c / E
+Edit the code of a template.
+@item C-c / .
+Insert template again.  This will cause the previously inserted
+template to be inserted again.
+@end table
+
+@section Field Editing
+
+By default, when inserting a template, if the user needs to enter text
+to fill in a part of the template, then the minibuffer is used to
+query for that information.  SRecode also supports a field-edting mode
+that can be used instead.  To enable it set:
+
+@defun srecode-insert-ask-variable-method
+@anchor{srecode-insert-ask-variable-method}
+Determine how to ask for a dictionary value when inserting a template.
+Only the @var{ASK} style inserter will query the user for a value.
+Dictionary value references that ask begin with the ? character.
+Possible values are:
+@table @code
+@item ask
+Prompt in the minibuffer as the value is inserted.
+@item field
+Use the dictionary macro name as the inserted value,
+and place a field there.  Matched fields change together.
+@end table
+
+@b{NOTE}: The field feature does not yet work with XEmacs.
+@end defun
+
+Field editing mode is supported in newer versions of Emacs.  You
+will not be prompted to fill in values while the template is
+inserted.  Instead, short regions will be highlighted, and the cursor
+placed in a field.  Typing in the field will then fill in the value.
+Several fields might be linked together.  In that case, typing in one
+area will modify the other linked areas.  Pressing TAB will move
+between editable fields in the template.
+
+Once the cursor moves out of the are inserted by the template, all the
+fields are cancelled.
+
+@b{NOTE}: Some conveniences in templates, such as completion, or
+character restrictins are lost when using field editing mode.
+
+@node Template Writing
+@chapter Template Writing
+@anchor{@code{SRecode-template-mode}}
+
+@code{srecode-template-mode} is the major mode used for designing new
+templates.  @srecode{} files (Extension @file{.srt}) are made up of
+variable settings and template declarations.
+
+Here is an overview of the terminology you will need for the next few
+sections:
+
+@table @asis
+@item template file
+A file with a @file{.srt} extension which contains settings,
+variables, and templates.
+@item template
+One named entity which represents a block of text that will be
+inserted.  The text is compiled into a sequence of insertable
+entities.  The entities are string constants, and macros.
+@item macro
+A macro is a text sequence within template text that is replaced with
+some other value.
+@item dictionary
+A table of variable names and values.
+@item subdictionary
+A dictionary that is subordinate under another dictionary as a value
+to some variable.
+@item variable
+A variable is an entry in a dictionary which has a value.
+@end table
+
+@menu
+* Variables:: Creating special and regular variables.
+* Templates:: Creating templates
+* Contexts::  Templates are grouped by context
+* Prompts::   Setting prompts for interactive insert macros
+@end menu
+
+@node Variables
+@section Variables
+
+Variables can be set up and used in templates.  Many variables you may
+use are set up via template arguments, but some may be preferences a
+user can set up that are used in system templates.
+
+When expanding a template, variables are stored in a @dfn{dictionary}.
+Dictionary entries are variables.  Variables defined in templates can
+have string like values.
+
+A variable can be set like this:
+@example
+set VARNAME "some value"
+@end example
+
+Note that a VARIABLE is a name in a dictionary that can be used in a
+MACRO in a template.  The macro referernces some variable by name.
+
+@menu
+* String Values::       Basic Variable values
+* Multi-string Values:: Complex variable values
+* Section Show::        Enabling the display of a named section.
+* Special Variables::   Variables with special names
+* Automatic Loop Variables:: Variables automatically set in section loops.
+* Compound Variable Values:: Compound Variable Values
+@end menu
+
+@node String Values
+@subsection String Values
+
+Variables can be set to strings.  Strings may contain newlines or any
+other characters.  Strings are interpreted by the Emacs Lisp reader so
+@code{\n}, @code{\t}, and @code{\"} work.
+
+When a string is inserted as part of a template, nothing within the
+string is interperted, such as template escape characters.
+
+@node Multi-string Values
+@subsection Multi-string Values
+
+A variable can be set to multiple strings.  A compound value is
+usually used when you want to use dictionary entries as part of a
+variable later on.
+
+Multi-string variable values are set like string values except there
+are more than one.  For example
+
+@example
+set NAME "this" "-mode"
+@end example
+
+These two strings will be concatenated together.
+
+A more useful thing is to include dictionary variables and concatenate
+those into the string.  Use the ``macro'' keyword to include the name
+of a variable.  This is like macros in a template.  For example:
+
+@example
+set NAME macro "MODE" "-mode"
+@end example
+
+will extract the value of the dictionary variable MODE and append
+``-mode'' to the end.
+
+@node Section Show
+@subsection Section Show
+
+To set a variable to show a template section, use the @code{show}
+command.  Sections are blocks of a template wrapped in section macros.
+If there is a section macro using @var{NAME} it will be shown for each
+dictionary associated with the @var{NAME} macro.
+
+@example
+show NAME
+@end example
+
+This will enable that section.
+
+
+NOTE: May 11, 2008 - I haven't used this yet, so I don't know if it works.
+
+
+@node Special Variables
+@subsection Special Variables
+
+Some variables have special meaning that changes attributes when
+templates are compiled, including:
+
+@table @code
+@item escape-start
+This is the character sequence that escapes from raw text to template
+macro names.  The ability to change the escape characters are key for
+enabling @srecode{} templates to work across many kinds of languages.
+@item escape-end
+This is the character sequence that escapes the end of a template
+macro name.
+
+Example:
+@example
+set escape_start "$"
+set escape_end "$"
+@end example
+@item mode
+This is the major mode, as a string with the full Emacs Lisp symbol in
+it.  All templates in this file will be installed into the template
+table for this major mode.
+
+Multiple template files can use the same mode, and all those templates
+will be available in buffers of that mode.
+
+Example:
+@example
+set mode "emacs-lisp-mode"
+@end example
+
+@item priority
+The priority of a file is a number in a string constant that
+indicates where it lies in the template search order.  System
+templates default to low priority numbers.  User templates default to
+high priority numbers.  You can specify the priority of your template
+to insert it anywhere in the template search list.
+
+If there are multiple templates with the same context and name, the
+template with the highest priority number will be used.
+
+If multiple files have the same priority, then then sort order is
+unpredictable.  If no template names match, then it doesn't matter.
+
+Example:
+@example
+set priority "35"
+@end example
+
+@item application
+If a template file contains templates only needed for a particular
+application, then specify an application.  Template files for an
+application are stored in the template repository, but are not used in
+the generic template insertion case.
+
+The application with a particular name will access these templates
+from Lisp code.
+
+Example:
+@example
+set application "document"
+@end example
+
+@item project
+If a template file contains templates, or template overrides specific
+to a set of files under a particular directory, then that template
+file can specify a ``project'' that it belongs to.
+
+Set the ``project'' special variable to a directory name.  Only files
+under that directory will be able to access the templates in that
+file.
+
+Any template file that has a project specified will get have a
+priority that is set between SRecode base templates, and user defined
+templates.
+
+Templates can be compiled via a project system, such as EDE.  EDE
+loaded templates will get a @var{project} set automatically.
+
+Example:
+@example
+set project "/tmp/testproject"
+@end example
+
+@end table
+
+If you need to insert the characters that belong to the variables
+@code{escape_start} or @code{escape_end}, then place those into
+a variable.  For example
+
+@example
+set escape_start "$"
+set escape_end "$"
+set DOLLAR "$"
+@end example
+
+@node Automatic Loop Variables
+@subsection Automatic Loop Variables
+
+When section macros are used, that section is repeated for each
+subdictionary bound to the loop variable.
+
+Each dictionary added will automatically get values for positional
+macros which will enable different @var{sections}.  The automatic
+section variables are.
+
+@itemize @bullet
+@item @var{first} - The first entry in the table.
+@item @var{notfirst} - Not the first entry in the table.
+@item @var{last} - The last entry in the table
+@item @var{notlast} - Not the last entry in the table.
+@end itemize
+
+@node Compound Variable Values
+@subsection Compound Variable Values
+
+A variable can also have a compound value.  This means the value of
+the variable is an @EIEIO{} object, which is a subclass of
+@code{srecode-dictionary-compound-value}.
+
+New compound variables can only be setup from Lisp code.  See
+@ref{Compound Dictionary Values} for details on setting up compound
+variables from Lisp.
+
+@node Templates
+@section Templates
+
+A template represents a text pattern that can be inserted into
+a buffer.
+
+A basic template is declaired like this:
+
+@example
+template TEMPLATENAME :arg1 :arg2
+"Optional documentation string"
+----
+The text to your template goes here.
+----
+binding "a"
+@end example
+
+Templates are stored in a template table by name, and are inserted by
+the @var{templatename} provided.
+
+The documentation string is optional.  This documentation string will
+be used to aid users in selecting which template they want to use.
+
+The code that makes up the raw template occurs between the lines that
+contain the text "-----".
+
+@menu
+* Template Section Dictionaries::  Template Scoped Macro values
+* Template Macros::     Macros occuring in template patterns
+@end menu
+
+@node Template Section Dictionaries
+@subsection Template Section Dictionaries
+
+To add variable values to section dictionaries used within a specific
+template, you can add them to the beginning of the template
+declaration like this:
+
+@example
+template TEMPLATENAME :arg1 :arg2
+"Optional documentation string"
+sectiondictionary "A"
+set NAME "foo"
+----
+A beginning line @{@{NAME@}@}
+@{@{#A@}@}Optional string @{@{NAME@}@} here@{@{/A@}@}
+An end line
+----
+@end example
+
+In this example, the @var{NAME} variable gets the value ``foo'', but
+only while it is inside section macro A.  The outer scoped NAME will
+be empty.
+
+This is particularly useful while using an include macro to pull in a
+second template.  In this way, you can pass values known from one
+template to a subordinate template where some value is not known.
+
+From the Emacs Lisp default template file, a syntax table is just a
+variable with a specialized value.
+
+If a variable is declared like this (where $ is the escape character):
+
+@example
+template variable :el
+"Inert a variable.
+DOC is optional."
+----
+(defvar $?NAME$ $^$
+  "$DOC$")
+----
+@end example
+
+then you can see that there is a NAME and DOC that is needed.
+The @code{^} point inserter is also a handy key here.
+
+The syntax table wants a variable, but knows the values of some of
+these variables, and can recast the problem like this by using
+template specific @code{sectiondictionary} macro declarations.
+
+@example
+template syntax-table
+"Create a syntax table."
+sectiondictionary "A"
+set NAME macro "?MODESYM" "-mode-syntax-table"
+set DOC "Syntax table used in " macro "?MODESYM" " buffers."
+----
+$<A:variable$
+  (let ((table (make-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+    ;; ...
+    table)
+$/A$
+----
+@end example
+
+In this way, @var{NAME} can be set as a user posed question for
+@var{MODESYM} with ``-mode-syntax-table'' appended.  A simplified doc
+string will also be inserted.
+
+Lastly, the @var{A} section contains more macro text which is inserted
+at the @code{^} point marker.
+
+By creating useful base templates for things like function or variable
+declarations, and recycling them in higher-order templates, an end
+user can override the basic declarator, and the higher order templates
+will then obey the new format, or perhaps even work in more than one
+major mode.
+
+@node Template Macros
+@subsection Template Macros
+
+Template macros occur in the template text.  The default escape
+characters are ``@{@{`` and ``@}@}'', though they can be changed
+in the top-level variables.  See @ref{Variables}.
+
+Thus, if you have the template code that looks like this:
+
+@example
+;; Author: @{@{AUTHOR@}@}
+@end example
+
+Then the text between @{@{ and @}@} are a macro, and substituted by
+the value of the variable @var{AUTHOR}.
+
+Macros can be specialized to be more than just a text string.  For
+example, the macro above could be augmented with an Emacs Lisp
+function.
+
+@example
+;; Author: @{@{AUTHOR:upcase@}@}
+@end example
+
+In this case, the Emacs Lisp function @code{upcase} will be called on
+the text value of the @var{AUTHOR} variable.
+
+Macros can also be specialized to have different behaviors by using a
+prefix, non-alpha character or symbol.  For example:
+
+@example
+@{@{! This is a comment inside macro escape characters @}@}
+@end example
+
+shows that the ``!'' symbol is for comments.
+
+Alternately, a macro could query the user during insertion:
+
+@example
+(defun @{@{?NAME@}@} ()
+   @{@{^@}@}
+   ) ;; End of @{@{NAME@}@}
+@end example
+
+the ``?'' symbol indicates that if the symbol @var{NAME} isn't in the
+dictionary, then the user should be queried for the @var{NAME}
+variable.  If @var{NAME} appears again in the template, the original
+value specified by the user will be inserted again.
+
+If the text from a dictionary value is to be placed in column format,
+you can use the ``|'' symbol to indicate you want column control.  For
+example:
+
+@example
+   | this | that |@{@{#A@}@}
+   | @{@{|THIS:4@}@} | @{@{|THAT:4@}@} |@{@{/A@}@}
+@end example
+
+For each repeated section ``#A'' the dictionary values for @var{THIS}
+and @var{THAT} will be inserted and either trimmed to, or expanded to
+4 characters in width.
+
+Macros that are prefixed with the ``#'' symbol denote a section.  A
+macro of the same name with a ``\\'' prefix denotes the end of that
+section.
+
+@example
+@{@{#MOOSE@}@}
+Here is some text describing moose.
+@{@{/MOOSE@}@}
+@end example
+
+In this example if the section MOOSE was ``shown'' in the active
+dictionary, then the text between the # and / macros will also be
+inserted.
+
+All the text and macros within a section are either not shown at all
+(if that section is not 'visible') or the section is shown one time
+for each dictionary added to that symbol.
+@xref{Developing Template Functions}.
+@refill
+
+Macros prefixed with ``>'' will include another template.  Include
+macros would look like this:
+
+@example
+@{@{>FOO:defun@}@}
+@end example
+
+where @code{FOO} is the dictionary variable for the sub-dictionary used for
+expanding the template @code{defun}.  The @code{defun} template will
+be looked up in the template repository for the current mode, or in
+any inherited modes.
+
+Another way to include another template is with an include macro that
+will also wrap section text.  The includewrap insertion method looks
+like this:
+
+@example
+@{@{<FOO:defun@}@}Handy Text goes here@{@{/FOO@}@}
+@end example
+
+In this case, @code{defun} is included just as above.  If the
+@code{defun} template has a @{@{^@}@} macro in it, then the
+section text ``Handy Text goes here'' will be inserted at that point,
+and that location will not be saved as the cursor location.
+
+If there is no @{@{^@}@}, then the text will not be inserted.
+
+For both kinds of include macros, you may need to include a template
+from a different context.  You can use @code{:} separate the context
+from the name, like this:
+
+@example
+@{@{>FOO:declaration:function@}@}
+@end example
+
+@node Contexts
+@section Context
+
+Each template belongs to a context.  When promting for a template by
+name, such as with @kbd{C-c / /}, the name is prefixed by the current
+context.  If there is no context, it defaults to @code{declaration}.
+
+You can change context like this:
+
+@example
+context NAME
+@end example
+
+where @var{name} is some symbol that represents any context.
+
+A context resides over all templates that come after it until the next
+context statement.  Thus:
+
+@example
+context C1
+
+template foo
+"Foo template in C1"
+----
+----
+
+context C2
+
+temlate foo
+"Foo template in C2"
+----
+----
+@end example
+
+creates two @code{foo} templates.  The first one is when in context
+C1.  The second is available in context C2.
+
+This is useful if there are multiple ways to declare something like a
+function or variable that differ only by where it is in the syntax of
+the lanugage.  The name @code{foo} is not ambiguous because each is in
+a different context.
+
+@node Prompts
+@section Prompt
+
+Some templates use promtping macro insertion.  A macro that needs a
+prompt looks like this:
+
+@example
+@{@{?NAME@}@}
+@end example
+
+where ? comes after the first escape character.
+
+by default, it will use a prompt like this when it is encountered:
+
+@example
+Specify NAME:
+@end example
+
+For such macros, you can pre-define prompts for any dictionary entry.
+When that dictionary entry is first encountered, the user is prompted,
+and subsequent occurances of that dictionary entry use the same value.
+
+To get a different prompt, use a prompt command like this:
+
+@example
+prompt VARNAME "Nice Way to ask for VARNAME: "
+@end example
+
+Now, if you put this in a template:
+
+@example
+template variable
+----
+(defvar @{@{?VARNAME@}@} nil
+   "")
+----
+@end example
+
+when VARNAME is encountered, it will use the nice prompt.
+
+Prompts can be extended as well.  For example:
+
+@example
+prompt VARNAME "VARNAME: " default "srecode" read y-or-n-p
+@end example
+
+In this case, the @code{default} keyword indicates that
+@code{"srecode"} is the default string to use, and @code{y-or-n-p} is
+the function to use to ask the question.
+
+For @code{y-or-n-p} if you type ``y'' it inserts the default string,
+otherwise it inserts empty.
+
+For any other symbol that occurs after the @code{read} token, it is
+expected to take the same argument list as @code{read-string}.  As
+such, you can create your own prompts that do completing reads on
+deterministic values.
+
+To have the default be calculated later from a dictionary entry, you
+need to use the @code{defaultmacro} keyword instead.
+
+@example
+prompt VARNAME "Varname: " defaultmacro "PREFIX"
+@end example
+
+now, when it attempts to read in VARNAME, it will pre-populte the text
+editing section with whatever the value of PREFIX is.
+
+Some language arguments may supply possible prefixes for prompts.
+Look for these when creating your prompts.
+
+@node Dictionaries
+@chapter Dictionaries
+
+Dictionaries are a set of variables.  The values associated with the
+variable names could be anything, but how it is handled is dependent
+on the type of macro being inserted.
+
+Most of this chapter is for writing Lisp programs that use @srecode{}.
+If you only want to write template files, then you only need to read
+the @ref{Template Argument Dictionary Entries} section.
+
+@menu
+* Create a Dictionary::
+* Setting Dictionary Values::	Basic dictionary values
+* Compound Dictionary Values::	Complex dictionary values
+* Argument Resolution::	        Automatic template argument resolution
+* Creating new Arguments::      Create new arguments for use in templates
+* Querying a Dictionary::       Querying a dictionary for values.
+* Template Argument Dictionary Entries:: Catalog of arguments
+@end menu
+
+@node Create a Dictionary
+@section Create a Dictionary
+
+@defun srecode-create-dictionary &optional buffer
+@anchor{srecode-create-dictionary}
+Create a dictionary for @var{buffer}.
+If @var{buffer} is not specified, use the current buffer.
+The dictionary is initialized with no variables or enabled sections.
+Any variables defined with @code{set} in the template, however,
+becomes a name in the dictionary.
+@end defun
+
+@node Setting Dictionary Values
+@section Setting Dictionary Values
+
+When building an @srecode{} based application, you will need to setup
+your dictionary values yourself.  There are several utility functions
+for this.
+
+In the simplest form, you can assocate a string with a variable.
+
+@defun srecode-dictionary-set-value dict name value
+@anchor{srecode-dictionary-set-value}
+In dictionary @var{dict}, set @var{name} to have @var{value}.
+@end defun
+
+For section macros, you can have alternate values.  A section can
+either be toggled as visible, or it can act as a loop.
+
+@defun srecode-dictionary-show-section dict name
+@anchor{srecode-dictionary-show-section}
+In dictionary @var{dict}, indicate that the section @var{name} should be exposed.
+@end defun
+
+
+@defun srecode-dictionary-add-section-dictionary dict name show-only
+@anchor{srecode-dictionary-add-section-dictionary}
+In dictionary @var{DICT}, add a section dictionary for section macro @var{NAME}.
+Return the new dictionary.
+
+You can add several dictionaries to the same section entry.
+For each dictionary added to a variable, the block of codes in
+the template will be repeated.
+
+If optional argument @var{SHOW-ONLY} is non-@code{nil}, then don't add a new dictionarly
+if there is already one in place.  Also, don't add @var{FIRST}/@var{LAST} entries.
+These entries are not needed when we are just showing a section.
+
+Each dictionary added will automatically get values for positional macros
+which will enable @var{SECTIONS} to be enabled.
+
+@table @var
+@item first
+The first entry in the table.
+@item notfirst
+Not the first entry in the table.
+@item last
+The last entry in the table
+@item notlast
+Not the last entry in the table.
+@end table
+
+Adding a new dictionary will alter these values in previously
+inserted dictionaries.
+@end defun
+
+@node Compound Dictionary Values
+@section Compound Dictionary Values
+
+If you want to associate a non-string value with a dictionary
+variable, then you will need to use a compound value.  Compound
+dictionary values are derived using @EIEIO{} from a base class for
+handling arbitrary data in a macro.
+
+@deffn Type srecode-dictionary-compound-value
+@anchor{srecode-dictionary-compound-value}
+A compound dictionary value.
+Values stored in a dictionary must be a @var{string},
+a dictionary for showing sections, or an instance of a subclass
+of this class.
+
+Compound dictionary values derive from this class, and must
+provide a sequence of method implementations to convert into
+a string.
+@end deffn
+
+Your new subclass of the compound value needs to implement these
+methods:
+
+@defun srecode-compound-toString cp function dictionary
+@anchor{srecode-compound-toString}
+Convert the compound dictionary value @var{cp} to a string.
+If @var{function} is non-@code{nil}, then @var{function} is somehow applied to an aspect
+of the compound value.  The @var{function} could be a fraction
+of some function symbol with a logical prefix excluded.
+@end defun
+
+The next method is for dumping out tables during debugging.
+
+@defun srecode-dump cp &optional indent
+@anchor{srecode-dump}
+Display information about this compound value.
+@end defun
+
+
+Here is an example of wrapping a semantic tag in a compound value:
+
+@example
+(defclass srecode-semantic-tag (srecode-dictionary-compound-value)
+  ((prime :initarg :prime
+	  :type semantic-tag
+	  :documentation
+	  "This is the primary insertion tag.")
+   )
+  "Wrap up a collection of semantic tag information.
+This class will be used to derive dictionary values.")
+
+(defmethod srecode-compound-toString((cp srecode-semantic-tag)
+				     function
+				     dictionary)
+  "Convert the compound dictionary value CP to a string.
+If FUNCTION is non-nil, then FUNCTION is somehow applied to an
+aspect of the compound value."
+  (if (not function)
+      ;; Just format it in some handy dandy way.
+      (semantic-format-tag-prototype (oref cp :prime))
+    ;; Otherwise, apply the function to the tag itself.
+    (funcall function (oref cp :prime))
+    ))
+@end example
+
+@node Argument Resolution
+@section Argument Resolution
+
+Some dictionary entries can be set via template arguments in the
+template declaration.  For examples of template arguments, see
+@ref{Template Argument Dictionary Entries}.
+
+  You can resolve an argument list into a dictionary with:
+
+@defun srecode-resolve-arguments temp dict
+@anchor{srecode-resolve-arguments}
+Resolve all the arguments needed by the template @var{temp}.
+Apply anything learned to the dictionary @var{dict}.
+@end defun
+
+@node Creating new Arguments
+@section Creating new Arguments
+
+You can create new arguments for use in template files by writing new
+Emacs Lisp functions.  Doing so is easy.  Here is an example for the
+@code{:user} argument:
+
+@example
+(defun srecode-semantic-handle-:user (dict)
+  "Add macros into the dictionary DICT based on the current :user."
+  (srecode-dictionary-set-value dict "AUTHOR" (user-full-name))
+  (srecode-dictionary-set-value dict "LOGIN" (user-login-name))
+   ;; ...
+  )
+@end example
+
+In this case, a function with the name prefix
+@code{srecode-semantic-handle-} that ends in @code{:user} creates a
+new argument @code{:user} that can be used in a template.
+
+Your argument handler must take one argument @var{dict}, which is the
+dictionary to fill in.  Inside your function, you can do whatever you
+want, but adding dictionary values is the right thing.
+
+@node Querying a Dictionary
+@section Querying a Dictionary
+
+When creating a new argument, it may be useful to ask the dicitonary
+what entries are already set there, and conditionally create new
+entries based on those.
+
+In this way, a template author can get additional logic through more
+advanced arguments.
+
+@defun srecode-dictionary-lookup-name dict name
+@anchor{srecode-dictionary-lookup-name}
+Return information about the current @var{DICT}'s value for @var{NAME}.
+@var{DICT} is a dictionary, and @var{NAME} is a string that is the name of
+a symbol in the dictionary.
+This function derives values for some special NAMEs, such as @var{FIRST}
+and '@var{LAST}'.
+@end defun
+
+
+
+@node Template Argument Dictionary Entries
+@section Template Argument Dictionary Entries
+
+When a dictionary is initialized for a template, then the dictionary
+will be initialized with a predefined set of macro values.
+
+A template of the form:
+
+@example
+template template-name :arg1 :arg2
+----
+Your template goes here
+----
+@end example
+
+specifies two arguments :arg1, and :arg2.
+
+The following built-in simple arguments are available:
+
+@menu
+* Base Arguments::
+* Semantic Arguments::
+* Language Arguments::
+@end menu
+
+@node Base Arguments
+@subsection Base Arguments
+
+@subsubsection Argument :indent
+
+Supplies the @code{INDENT} macro.  When @code{INDENT} is non-nil, then
+each line is individually indented with
+@code{indent-according-to-mode} during macro processing.
+
+@subsection Argument :blank
+
+Specifying this argument adds a special @code{:blank} handler at the
+beginning and end of the template.  This handler will insert @code{\n}
+if the insertion point is not on a line by itself.
+
+@subsubsection Argument :region
+
+If there is an active region via @code{transient-mark-mode}, or
+@code{mouse-drag-region}, then the @code{REGION} section will be
+enabled.
+
+In addition, @code{REGIONTEXT} will be set the the text in the region,
+and that region of text will be ``killed'' from the current buffer.
+
+If standard-output is NOT the current buffer, then the region will not
+be deleted.  In this way, you can safely use @code{:region} using
+templates in arbitrary output streams.
+
+@subsubsection Argument :user
+
+Sets up variables about the current user.
+
+@table @code
+@item AUTHOR
+Value of the Emacs function @code{user-full-name}
+@item EMAIL
+Current Emacs users email address.
+@item LOGIN
+Current Emacs users login name.
+@item UID
+Current Emacs users login name.
+@item EMACSINITFILE
+This Emacs sessions' init file.
+@end table
+
+@subsubsection Argument :time
+
+Sets up variables with the current date and time.
+
+@table @code
+@item YEAR
+The current year.
+@item MONTH
+The current month as a number.
+@item MONTHNAME
+The current month name, unabbreviated.
+@item DAY
+The current day as a number.
+@item WEEKDAY
+The current day of the week as an abbreviated name
+@item HOUR
+The current hour in 24 hour format.
+@item HOUR12
+The current hour in 12 hour format.
+@item AMPM
+Locale equivalent of AM or PM.  Usefule with HOUR12.
+@item MINUTE
+The current minute.
+@item SECOND
+The current second.
+@item TIMEZONE
+The timezone string.
+@item DATE
+The Locale supported date (%D).
+@item TIME
+The Locale supported time format (%X).
+@end table
+
+@subsubsection Argument :file
+
+Sets up variables with details about the current file.
+
+@table @code
+@item FILENAME
+The filename with out the directory part of the current buffer.
+@item FILE
+The filename with out the directory or extension
+@item EXTENSION
+The filename extension.
+@item DIRECTORY
+The directory in which the current buffer resides.
+@item MODE
+Major mode of this buffer.
+@item SHORTMODE
+Major mode of this buffer without ``-mode''.
+Useful for inserting the Emacs mode specifier.
+@item section RCS
+Show the section RCS if there is a CVS or RCS directory here.
+@end table
+
+@subsubsection Argument :system
+
+Sets up variables with computer system information.
+
+@table @code
+@item SYSTEMCONF
+The ``system-configuration''.
+@item SYSTEMTYPE
+The ``system-type''.
+@item SYSTEMNAME
+The ``system-name''.
+@item MAILHOST
+The name of the machine Emacs derived mail ``comes from''.
+@end table
+
+@subsubsection Argument :kill
+
+@table @code
+@item KILL
+The top-most item from the kill ring.
+@item KILL2
+The second item in the kill ring.
+@item KILL3
+The third item in the kill ring.
+@item KILL4
+The fourth item in the kill ring.
+@end table
+
+@node Semantic Arguments
+@subsection Semantic Arguments
+
+@subsubsection Argument :tag
+
+The :tag argument is filled in with information from Semantic.
+The tag in question is queried from the senator tag ring, or passed
+in from @srecode{} utilities that use tags in templates.
+
+@table @code
+@item TAG
+This is a compound value for the tag in the current senator kill ring,
+or something handled via the variable
+@code{srecode-semantic-selected-tag}.
+
+@defvar srecode-semantic-selected-tag
+@anchor{srecode-semantic-selected-tag}
+The tag selected by a @code{:tag} template argument.
+If this is @code{nil}, then @code{senator-tag-ring} is used.
+@end defvar
+
+Use the function part of a macro insert to extract obscure parts
+of the tag.
+@item NAME
+The name of the tag as a string.
+@item TYPE
+The data type of the tag as a string.
+@end table
+
+If @var{tag} is a function, you will get these additional dictionary
+entries.
+
+@table @code
+@item ARGS
+A Loop macro value.  Each argument is inserted in ARGS.  To create a
+comma separated list of arguments, you might do this:
+
+@example
+@{@{#ARGS@}@}@{@{TYPE@}@} @{@{NAME@}@}@{@{#NOTLAST@}@},@{@{/NOTLAST@}@}@{@{/ARGS@}@}
+@end example
+
+Within the section dictionaries for each argument, you will find both
+@var{NAME} and @var{TYPE}, in addition to the automatic section values
+for @var{FIRST}, @var{LAST}, @var{NOTFIRST}, and @var{NOTLAST}.
+@item PARENT
+The string name of the parent of this function, if the function is a
+method of some class.
+@item THROWS
+In each @var{THROWS} entry, the @var{NAME} of the signal thrown is specified.
+@end table
+
+If @var{tag} is a variable, you will get these dictionary entries.
+
+@table @code
+@item DEFAULTVALUE
+Enabled if there is a @var{VALUE}.
+@item VALUE
+An entry in the @var{HAVEDEFAULT} subdictionary that represents the
+textual representation of the default value of this variable.
+@end table
+
+If @var{tag} is a datatype, you will get these dictionary entries.
+
+@table @code
+@item PARENTS
+Section dictionaries for the parents of this class.  Each parent will
+have a @var{NAME}.
+@item INTERFACES
+Section dictionaries for all the implemented interfaces of this
+class.  Each interface will have a @var{NAME}.
+@end table
+
+Note that data type templates should always have a @code{@{@{^@}@}}
+macro in it where the core contents of that type will go.  This is why
+data types don't have subdictionaries full of the slots in the classes
+or structs.
+
+@node Language Arguments
+@subsection language Arguments
+
+Each language typically has its own argument.  These arguments can be
+used to fill in language specific values that will be useful.
+
+@subsubsection Argument :srt
+
+Used for SRecoder template files.
+
+@table @code
+@item ESCAPE_START
+The characters used for an escape start
+@item ESCAPE_END
+The characters used for an escape end
+@end table
+
+@subsubsection Argument :cpp
+
+@table @code
+@item HEADER
+Shows this section if the current file is a header file.
+@item NOTHEADER
+The opposite of @code{HEADER}.
+@item FILENAME_SYMBOL
+The current filename reformatted as a C friendly symbol.
+@end table
+
+@subsection Argument :java
+
+@table @code
+@item FILENAME_AS_PACKAGE
+Converts the filename into text that would be suitable as a package
+name.
+@item FILENAME_AS_CLASS
+Converts the filename into text that would be suitable as a class-name
+for the main class in the file.
+@end table
+
+@subsubsection Argument :el
+
+Sets @code{PRENAME}.  This would be a common prefix from all the
+tags in the current buffer.
+
+Most Emacs Lisp packages have some common prefix used in a way similar
+to namespaces in other languages.
+
+@subsubsection Argument :el-custom
+
+@table @code
+@item GROUP
+The name of the Emacs Custom group that instances of @code{defcustom}
+ought to use.
+@item FACEGROUP
+The name of the Emacs Custom group that faces delcared with
+@code{defface} ought to use.
+@end table
+
+@subsubsection Argument :texi
+
+@table @code
+@item LEVEL
+The current section level, such as @code{chapter} or @code{section}.
+@item NEXTLEVEL
+The next level down, so if @code{LEVEL} is @code{chapter}, then
+@code{NEXTLEVEL} would be @code{section}.
+@end table
+
+@subsubsection Argument :texitag
+
+The @code{:texitag} argument is like the @code{:tag} argument, except that
+additional variable @code{TAGDOC} is provided for each tag.
+
+The @code{TAGDOC} is filled with derived documentation from the tag in
+question, and that documentation is also reformatted to be mostly
+texinfo compatible.
+
+
+@node Developing Template Functions
+@chapter Developing Template Functions
+
+You can develop your own custom template insertion functions.
+Doing so is relatively simple, and requires that you write an Emacs
+Lisp command.
+
+If the built in commands don't provide enough options, you will need
+to write your own function in order to provide your dictionaries with
+the values needed for custom templates.
+
+In this way, you can build your own code generator for any language
+based on a set of predefined macros whos values you need to derive
+from Emacs Lisp code yourself.
+
+For example:
+
+@example
+(defun my-srecode-insert (template-name)
+  "Inesrt the template TEMPLATE-NAME into the current buffer at point."
+
+  ;; Read in a template name.
+  (interactive (list (srecode-read-template-name "Template Name: ")))
+  (if (not (srecode-table))
+      (error "No template table found for mode %s" major-mode))
+  (let ((temp (srecode-template-get-table (srecode-table) template-name))
+
+        ;; Create a new dictionary
+        (newdict (srecode-create-dictionary)))
+
+    (if (not temp)
+        (error "No Template named %s" template-name))
+
+    ;; Add some values into the dictionary!
+    (srecode-dictionary-set-value newdict "FOO" (my-get-value-of-foo))
+    ;; Optionally show a section
+    (srecode-dictionary-show-section newdict "BLARG")
+
+    ;; Add in several items over a loop
+    (let ((my-stuff (get-my-stuff-list)))
+       (while my-stuff
+          (let ((subdict (srecode-dictionary-add-section-dictionary
+                             newdict "LOOP")))
+             (srecode-dictionary-set-value subdict "NAME" (nth 0 my-stuff))
+             (srecode-dictionary-set-value subdict "ARG" (nth 1 my-stuff))
+             (srecode-dictionary-set-value subdict "MOOSE" (nth 2 my-stuff))
+             )
+          (setq my-stuff (cdr my-stuff)))
+
+    ;; Some templates have arguments that need to be resolved.
+    (srecode-resolve-arguments temp newdict)
+
+    ;; Do the expansion
+    (srecode-insert-fcn temp newdict)
+    ))
+@end example
+
+Lets look at the key functions involved above:
+
+@section Interactive Completion:
+
+@defun srecode-read-template-name prompt
+@anchor{srecode-read-template-name}
+Completing read for Semantic Recoder template names.
+@var{prompt} is used to query for the name of the template desired.
+@end defun
+
+@section Template Lookup
+
+Even if your program does not query the user for a template name, you
+will need to locate a template.  First, you need to locate the table
+to look the template up in.
+
+@defun srecode-table &optional mode
+@anchor{srecode-table}
+Return the currently active Semantic Recoder table for this buffer.
+Optional argument @var{MODE} specifies the mode table to use.
+@end defun
+
+
+@defun srecode-template-get-table tab template-name &optional context application
+@anchor{srecode-template-get-table}
+Find in the template in mode table @var{TAB}, the template with @var{TEMPLATE-NAME}.
+Optional argument @var{CONTEXT} specifies a context a particular template
+would belong to.
+Optional argument @var{APPLICATION} restricts searches to only template tables
+belonging to a specific application.  If @var{APPLICATION} is @code{nil}, then only
+tables that do not belong to an application will be searched.
+@end defun
+
+For purposes of an @srecode{} application, it is important to decide
+what to call yoru application, and use that with this method call.
+
+@section Creating dictionaries
+
+Several dictionary calls are made in this example, including:
+@table @code
+@item srecode-create-dictionary
+@item srecode-dictionary-set-value
+@item srecode-dictionary-show-section
+@item srecode-dictionary-add-section-dictionary
+@end table
+
+These are documented more fully @ref{Dictionaries}.
+
+Also used is @code{srecode-resolve-arguments}.  To learn more about
+that, see @ref{Argument Resolution}.
+
+@section Template Insertion Commands
+
+There are several ways to insert a template.  It is easiest to just
+start with the main entry point.
+
+@defun srecode-insert-fcn template dictionary &optional stream
+@anchor{srecode-insert-fcn}
+Insert @var{template} using @var{dictionary} into @var{stream}.
+If @var{stream} is nil, then use the current buffer.
+@end defun
+
+@node Template Naming Conventions
+@chapter Template Naming Conventions
+
+For @srecode{} to work across langauges reliably, templates need to
+follow a predictable pattern.  For every language of similar nature
+(OO, functional, doc based) if they all provide the same base
+templates, then an application can be written against the base
+templates, and it will work in each of the supported language.
+
+Having consistent templates also makes it easy to use those templates
+from a user perspective during basic interactive insertion via
+@code{srecode-minor-mode}.
+
+
+NOTES ON THIS CHAPTER:
+
+These conventions are being worked on.  Check w/ CEDET-DEVEL mailing
+list if you want to support a language, or write an application and
+provide your opinions on this topic.  Any help is appreciated.
+
+
+@section Context: File
+
+Each language should support the @code{file:empty} template.  This
+will generally use the default copyright insertion mechanism.
+
+@section Context: Declaration
+
+Functional languages should attempt to support the folowing:
+
+@table @code
+@item function
+A standalone function.  Not a method, external method, or other.
+@item method
+A method belonging to some class declaired outside the textual bounds
+of that class' declaration.
+@item variable
+A global variable.
+@item type
+A data type.  If the language supports several types of datatypes
+then do not use this, use more specific ones instead.
+@item class
+For OO languages, use this instead of @code{type}.
+@item include
+Include files.
+@end table
+
+For any @semantic{} tag class in your language, you will likely want
+to have a corresponding template.
+
+In order for the @srecode{} function
+@code{srecode-semantic-insert-tag} to work, you can create templates
+similar to those mentioned above, except with @code{-tag} appended to
+the end.  This lets a template like @code{function} have user
+conveniences when referencing @code{function-tag}, while also
+allowing the tag inserter to do its job with a simpler template.
+
+@section Context: Classdef
+
+Inside a class definition.  These are to be inserted inside the
+textual bounds of a class declaration.
+
+@table @code
+@item function
+This would be a method of the class being inserted into.
+@item constructor
+@itemx destructor
+Like @code{function} but specific to alloc/delete of an object.
+@item variable
+This would be a field of the class being inserted into.
+@end table
+
+@section Context: Code
+
+Inside a body of code, such as a function or method body.
+
+ - no conventions yet.
+
+@section Standard Dictionary Values
+
+For these variables to be useful, standard names should be used.
+These values could be provided directly from a Semantic tag, or by an
+application.
+
+@table @var
+@item NAME
+The name of the declaration being created.
+@item PARENT
+If the item belongs to some parent type, it would be the full name of
+that type, including namespaces.
+@item TYPE
+A datatype name for a variable, or the return value of a function.
+@item DOC
+If there is some documentation associated with the item, then DOC
+should contain the value.  (Optional)
+@item ARGS
+The ARGS variable defines a section for 0 or more arguments to a function
+or method.  Each entry in ARGS will follow the rest of these naming
+conventions, such as for NAME and TYPE.
+@end table
+
+For templates used by @code{srecode-semantic-insert-tag}, there is
+also the following useful dictionary values.
+
+@table @var
+@item TAG
+A special insertion value TAG.  You can use semantic functions to turn
+the tag into a string.
+@item HAVEDEFAULT
+@itemx DEFAULT
+Default value for a variable.
+@end table
+
+@node Inserting Tag Lists
+@chapter Inserting Tag Lists
+
+Since @srecode{} is the @i{Semantic Recoder}, the ultimate goal for
+@srecode{} is to convert lists of tags, as produced by @semantic{}
+back into code.
+
+A single function provides the interface for programs to do this, but
+it requires any particular language to have provided the correct
+templates to make it work.
+
+@defun srecode-semantic-insert-tag tag &optional style-option point-insert-fcn &rest dict-entries
+@anchor{srecode-semantic-insert-tag}
+Insert @var{tag} into a buffer useing srecode templates at point.
+
+Optional @var{style-option} is a list of minor configuration of styles,
+such as the symbol @code{'prototype} for prototype functions, or
+@code{'system} for system includes, and @code{'doxygen}, for a doxygen style
+comment.
+
+Optional third argument @var{point-insert-fcn} is a hook that is run after
+@var{tag} is inserted that allows an opportunity to fill in the body of
+some thing.  This hook function is called with one argument, the @var{tag}
+being inserted.
+
+The rest of the arguments are @var{dict-entries}.  @var{dict-entries}
+is of the form ( @var{name1} @var{value1} @var{name2} @var{value2} @dots{} NAMEn VALUEn).
+
+The exact template used is based on the current context.
+The template used is found within the toplevel context as calculated
+by @dfn{srecode-calculate-context}, such as @code{declaration}, @code{classdecl},
+or @code{code}.
+
+For various conditions, this function looks for a template with
+the name @var{class}-tag, where @var{class} is the tag class.  If it cannot
+find that, it will look for that template in the
+@code{declaration}context (if the current context was not @code{declaration}).
+
+If @var{prototype} is specified, it will first look for templates with
+the name @var{class}-tag-prototype, or @var{class}-prototype as above.
+
+See @dfn{srecode-semantic-apply-tag-to-dict} for details on what is in
+the dictionary when the templates are called.
+
+This function returns to location in the buffer where the
+inserted tag @var{ends}, and will leave point inside the inserted
+text based on any occurance of a point-inserter.  Templates such
+as @dfn{function} will leave point where code might be inserted.
+@end defun
+
+
+@node Application Writing
+@chapter Application Writing
+
+The main goal of @srecode{} is to provide a strong platform for
+writing code generating applications.
+
+Any templates that are application specific should make an application
+declaration for each template file they use.  This prevents those
+templates from being used outside of that application.
+
+For example, add this to a file:
+@example
+set application "getset"
+@end example
+
+In your application Emacs Lisp code, you would then load those
+templates.  A typical initialization would look like this:
+
+@example
+  (srecode-load-tables-for-mode major-mode)
+  (srecode-load-tables-for-mode major-mode 'getset)
+@end example
+
+These two lines will load in the base templates for the major mode,
+and then the application specific templates.
+
+@defun srecode-load-tables-for-mode mmode &optional appname
+@anchor{srecode-load-tables-for-mode}
+Load all the template files for @var{mmode}.
+Templates are found in the SRecode Template Map.
+See @dfn{srecode-get-maps} for more.
+@var{appname} is the name of an application.  In this case,
+all template files for that application will be loaded.
+@end defun
+
+
+ todo - Add examples.  Most core stuff is already described above.
+
+
+
+@node Index
+@chapter Index
+
+@contents
+
+@bye
diff --git a/site/cedet-1.0pre7/srecode/templates/Makefile b/site/cedet-1.0pre7/srecode/templates/Makefile
new file mode 100644
index 0000000..2422fee
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/Makefile
@@ -0,0 +1,42 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=../
+ede_FILES=Project.ede Makefile
+
+templates_MISC=default.srt srecode-el.srt srecode-getset-cpp.srt srecode-template.srt srecode-cpp.srt srecode-wisent.srt srecode-texi.srt srecode-test.srt srecode-make.srt srecode-java.srt proj-test.srt
+document_MISC=document-default.srt srecode-document-cpp.srt srecode-document-java.srt
+VERSION=1.0pre7
+DISTDIR=$(top)srecode-$(VERSION)/templates
+
+
+
+all: templates document
+
+templates: 
+	@
+
+document: 
+	@
+
+tags: 
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(templates_MISC) $(document_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/srecode/templates/Project.ede b/site/cedet-1.0pre7/srecode/templates/Project.ede
new file mode 100644
index 0000000..e35f6c3
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/Project.ede
@@ -0,0 +1,18 @@
+;; Object SRecode templates
+;; EDE project file.
+(ede-proj-project "SRecode templates"
+  :name "templates"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-makefile-miscelaneous "templates"
+    :name "templates"
+    :path ""
+    :source '("default.srt" "srecode-el.srt" "srecode-getset-cpp.srt" "srecode-template.srt" "srecode-cpp.srt" "srecode-wisent.srt" "srecode-texi.srt" "srecode-test.srt" "srecode-make.srt" "srecode-java.srt" "proj-test.srt")
+    )
+   (ede-proj-target-makefile-miscelaneous "document"
+    :name "document"
+    :path ""
+    :source '("document-default.srt" "srecode-document-cpp.srt" "srecode-document-java.srt")
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/srecode/templates/default.srt b/site/cedet-1.0pre7/srecode/templates/default.srt
new file mode 100644
index 0000000..f0f4acf
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/default.srt
@@ -0,0 +1,64 @@
+;;; default.srt --- Templates for srecode-template-mode
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: default.srt,v 1.5 2009/01/06 02:38:23 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "default"
+
+set comment_start  "#"
+
+set COPYRIGHT "This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA."
+
+set DOLLAR "$"
+
+context file
+
+template copyright
+----
+{{COPYRIGHT:srecode-comment-prefix}}
+----
+
+template filecomment :file :user :time
+----
+{{comment_start}} {{FILENAME}} --- {{^}}
+{{comment_prefix}}
+{{comment_prefix}} Copyright (C) {{YEAR}} {{?AUTHOR}}
+{{comment_prefix}}
+{{comment_prefix}} Author: {{AUTHOR}} <{{EMAIL}}>{{#RCS}}
+{{comment_prefix}} X-RCS: {{DOLLAR}}Id{{DOLLAR}}{{/RCS}}
+{{comment_prefix}}
+{{>:copyright}}
+{{comment_end}}
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/document-default.srt b/site/cedet-1.0pre7/srecode/templates/document-default.srt
new file mode 100644
index 0000000..7b2df18
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/document-default.srt
@@ -0,0 +1,81 @@
+;; document-default.srt --- 
+
+;; Copyright (C) 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: document-default.srt,v 1.2 2009/01/01 19:00:23 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "default"
+
+set application "document"
+
+context declaration
+
+template section-comment :blank :indent
+"A comment occuring in front of a group of declarations."
+----
+{{comment_start}} {{?TITLE}}
+{{comment_prefix}}
+{{comment_prefix}} {{^}}
+{{comment_end}}
+----
+
+template function-comment :tag :indent :blank
+"A comment occuring in front of a function."
+----
+{{comment_start}} {{?NAME}} --
+{{DOC:srecode-comment-prefix}}
+{{comment_end}}
+----
+
+template variable-same-line-comment :tag
+"A comment occuring after a veriable declaration."
+----
+{{comment_start}} {{?DOC}} {{comment_end}}
+----
+
+;; These happen to be the same as in a classdecl.
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations."
+----
+{{comment_start}} {{?GROUPNAME}} --
+{{comment_end}}
+----
+
+template group-comment-end :indent
+"A comment occuring at the end of a a group of declarations."
+----
+{{comment_start}} End {{?GROUPNAME}} {{comment_end}}
+----
+
+;; Some templates only show up in classdecls.
+context classdecl
+
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations."
+----
+{{>:declaration:group-comment-start}}
+----
+
+template group-comment-end :indent
+"A comment occuring at the end of a a group of declarations."
+----
+{{>:declaration:group-comment-end}}
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/proj-test.srt b/site/cedet-1.0pre7/srecode/templates/proj-test.srt
new file mode 100644
index 0000000..c896412
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/proj-test.srt
@@ -0,0 +1,38 @@
+;; proj-test.srt --- File for testing project scoping.
+;;
+;; Copyright (C) 2010 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: proj-test.srt,v 1.2 2010/02/20 21:53:34 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "srecode-template-mode"
+set escape_start "{{"
+set escape_end "}}"
+
+set application "tests"
+set project "/tmp/"
+
+context test
+
+template test-project
+"A template that only exists for files in /tmp."
+----
+Contents doesn't matter.
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-cpp.srt b/site/cedet-1.0pre7/srecode/templates/srecode-cpp.srt
new file mode 100644
index 0000000..8d27594
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-cpp.srt
@@ -0,0 +1,261 @@
+;;; srecode-cpp.srt --- Templates for c++-mode
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-cpp.srt,v 1.11 2009/03/29 12:41:54 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "c++-mode"
+
+set comment_start  "/**"
+set comment_end    " */"
+set comment_prefix " *"
+
+;; OVERRIDE THIS in your user or project template file to whatever
+;; you use for your project.
+set HEADEREXT ".h"
+
+context file
+
+template empty :time :user :file :cpp
+----
+{{>:filecomment}}
+
+{{#NOTHEADER}}
+
+{{^}}
+{{/NOTHEADER}}
+{{#HEADER}}
+{{>:header_guard}}
+{{/HEADER}}
+----
+
+template header_guard :file :blank
+----
+#ifndef {{FILENAME_SYMBOL}}
+#define {{FILENAME_SYMBOL}} 1
+
+{{^}}
+
+#endif // {{FILENAME_SYMBOL}}
+----
+
+context misc
+
+template arglist
+"Insert an argument list for a function.
+@todo - Support smart CR in a buffer for not too long lines."
+----
+({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}})
+----
+
+context declaration
+
+prompt TYPE "Return Type: "
+
+template function :indent :blank
+"Insert a function declaration."
+----
+{{?TYPE}} {{?NAME}}{{>:misc:arglist}}
+{{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}}
+{
+{{^}}
+}
+----
+bind "f"
+
+template function-prototype :indent :blank
+"Insert a function declaration."
+----
+{{?TYPE}} {{?NAME}}{{>:misc:arglist}};
+----
+
+
+prompt TYPE "Data Type: "
+
+template variable :indent :blank
+"Insert a variable declaration."
+----
+{{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}};
+----
+bind "v"
+
+template variable-prototype :indent :blank
+"Insert a variable declaration."
+----
+{{?TYPE}} {{?NAME}};
+----
+bind "v"
+
+template class :indent :blank
+"Insert a C++ class.  For use by user insertion.
+Override this template to change contents of a class.
+Override `class-tag' to override the outer structure of the class."
+----
+{{<A:class-tag}}
+   public:
+     {{>CONSTRUCTOR:classdecl:constructor-tag}}
+     {{>DESTRUCTOR:classdecl:destructor-tag}}
+   private:
+   {{^}}
+
+{{/A}}
+----
+
+template subclass :indent :blank
+"Insert a C++ subclass of some other class."
+sectiondictionary "PARENTS"
+set NAME "?PARENTNAME"
+----
+{{>A:class}}
+----
+
+template class-tag :indent :blank
+"Insert a C++ class with the expectation of it being used by a tag inserter.
+Override this to affect applications, or the outer class structure for
+the user-facing template."
+----
+class {{?NAME}} {{#PARENTS}}{{#FIRST}}: {{/FIRST}}public {{NAME}}{{/PARENTS}}
+{     
+   {{^}}
+};
+----
+bind "c"
+
+template method :indent :blank
+"Method belonging to some class, declared externally."
+----
+{{?TYPE}} {{?PARENT}}::{{?NAME}}{{>:misc:arglist}}
+{{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}}
+{
+{{^}}
+}
+----
+
+template include :blank
+"An include statement."
+----
+#include "{{?NAME}}"
+----
+bind "i"
+
+template label :blank :indent
+----
+  {{?NAME}}:
+----
+
+context classdecl
+
+template constructor-tag :indent :blank
+----
+{{?NAME}}{{>:misc:arglist}}
+{ {{^}} }
+----
+
+;; This one really sucks.  How can I finish it?
+template initializers :indent
+----
+{{#FIRST}}:
+{{/FIRST}}{{INITNAME}}(){{#NOTLAST}},{{/NOTLAST}}
+----
+
+template destructor-tag :indent :blank
+----
+~{{?NAME}}{{>:misc:arglist}}
+{ {{^}} }
+----
+
+;;; Base Comment functions for overriding.
+context classdecl
+
+template comment-function-group-start :indent :blank
+"Used for putting comments in front of a functional group of declarations.
+Override this with your own preference to avoid using doxygen."
+----
+{{>A:classdecl:doxygen-function-group-start}}
+----
+
+template comment-function-group-end :indent :blank
+"Used for putting comments in front of a functional group of declarations.
+Override this with your own preference to avoid using doxygen."
+----
+{{>A:classdecl:doxygen-function-group-end}}
+----
+
+context declaration
+
+template comment-function :indent :blank
+"Used to put a nice comment in front of a function.
+Override this with your own preference to avoid using doxygen"
+----
+{{>A:declaration:doxygen-function}}
+----
+
+;;; DOXYGEN FEATURES
+;; 
+;;
+context classdecl
+
+prompt GROUPNAME "Name of declaration group: "
+
+template doxygen-function-group-start :indent :blank
+----
+/**
+ * {{?GROUPNAME}}
+ * @{
+ */
+
+----
+
+template doxygen-function-group-end :indent :blank
+----
+/**
+ * @}
+ */
+
+----
+
+context declaration
+
+template doxygen-function :indent :blank
+----
+/**
+ * @name {{NAME}} - {{DOC}}{{^}}{{#ARGS}}
+ * @param {{NAME}} - {{DOC}}{{/ARGS}}
+ * @return {{TYPE}}
+ */
+----
+
+template doxygen-variable-same-line
+----
+/**< {{DOC}}{{^}} */
+----
+
+template doxygen-section-comment :blank :indent
+"Insert a comment that separates sections of an Emacs Lisp file."
+----
+
+/** {{?TITLE}}
+ *
+ * {{^}}
+ */
+
+----
+
+
+;; end
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-document-cpp.srt b/site/cedet-1.0pre7/srecode/templates/srecode-document-cpp.srt
new file mode 100644
index 0000000..04a57e3
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-document-cpp.srt
@@ -0,0 +1,85 @@
+;; srecode-document-c.srt --- "document" application templates
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-document-cpp.srt,v 1.4 2009/01/01 19:00:47 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "c++-mode"
+
+set application "document"
+context declaration
+
+;;; Notes on the DOCUMENT templates.
+;;
+;; These templates recycle existing templates for doxygen in the
+;; more general C++ template set.
+
+template section-comment :indent :blank
+"A comment separating major sections of a file."
+----
+{{>:declaration:doxygen-section-comment}}
+----
+
+template function-comment :tag :indent :blank
+"A comment occuring in front of a function.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:declaration:doxygen-function}}
+----
+
+template variable-same-line-comment :tag
+"A comment occuring after a veriable declaration.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:declaration:doxygen-variable-same-line}}
+----
+
+;; These happen to be the same as in a classdecl.
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:classdecl:doxygen-function-group-start}}
+----
+
+template group-comment-end :blank :indent
+"A comment occuring at the end of a a group of declarations.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:classdecl:doxygen-function-group-end}}
+----
+
+;; Some templates only show up in classdecls.
+context classdecl
+
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:classdecl:doxygen-function-group-start}}
+----
+
+template group-comment-end :blank :indent
+"A comment occuring at the end of a a group of declarations.
+Recycle doxygen comment code from the more general template set."
+----
+{{>:classdecl:doxygen-function-group-end}}
+----
+
+;; end
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-document-java.srt b/site/cedet-1.0pre7/srecode/templates/srecode-document-java.srt
new file mode 100644
index 0000000..bae5fdf
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-document-java.srt
@@ -0,0 +1,86 @@
+;; srecode-document-java.srt --- 
+
+;; Copyright (C) 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-document-java.srt,v 1.1 2009/01/06 02:42:08 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "java-mode"
+
+set application "document"
+
+context declaration
+
+;;; Notes on the DOCUMENT templates.
+;;
+;; These templates recycle existing templates for javadoc in the
+;; more general C++ template set.
+
+template section-comment :indent :blank
+"A comment separating major sections of a file."
+----
+{{>:declaration:javadoc-section-comment}}
+----
+
+template function-comment :tag :indent :blank
+"A comment occuring in front of a function.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:declaration:javadoc-function}}
+----
+
+template variable-same-line-comment :tag
+"A comment occuring after a veriable declaration.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:declaration:javadoc-variable-same-line}}
+----
+
+;; These happen to be the same as in a classdecl.
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:classdecl:javadoc-function-group-start}}
+----
+
+template group-comment-end :blank :indent
+"A comment occuring at the end of a a group of declarations.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:classdecl:javadoc-function-group-end}}
+----
+
+;; Some templates only show up in classdecls.
+context classdecl
+
+template group-comment-start :blank :indent
+"A comment occuring in front of a group of declarations.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:classdecl:javadoc-function-group-start}}
+----
+
+template group-comment-end :blank :indent
+"A comment occuring at the end of a a group of declarations.
+Recycle javadoc comment code from the more general template set."
+----
+{{>:classdecl:javadoc-function-group-end}}
+----
+
+;; end
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-el.srt b/site/cedet-1.0pre7/srecode/templates/srecode-el.srt
new file mode 100644
index 0000000..d3dd174
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-el.srt
@@ -0,0 +1,312 @@
+;;; srecode-el.srt --- Templates for Emacs Lisp mode
+
+;; Copyright (C) 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: srecode-el.srt,v 1.10 2009/09/11 14:29:15 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set escape_start "$"
+set escape_end "$"
+
+set mode "emacs-lisp-mode"
+
+set comment_start  ";;;"
+set comment_prefix  ";;"
+set comment_end  ""
+
+set DOLLAR "$"
+
+context file
+
+template section-comment :blank
+"Insert a comment that separates sections of an Emacs Lisp file."
+----
+
+;;; $^$
+;;
+
+----
+bind "s"
+
+
+template empty :user :time :file
+"Insert a skeleton for an Emacs Lisp file."
+----
+$>:filecomment$
+
+;;; Commentary:
+;;
+;; $^$
+
+;;; Code:
+
+
+(provide '$FILE$)
+
+;;; $FILENAME$ ends here
+
+----
+
+prompt MODESYM "Major Mode Symbol (sans -mode): "
+prompt MODENAME "Nice Name of mode: " defaultmacro "MODESYM"
+prompt MODEEXTENSION "File name extension for mode: "
+
+template major-mode :file :blank :indent
+"Insert the framework needed for a major mode."
+sectiondictionary "FONTLOCK"
+set NAME macro "MODESYM" "-mode-font-lock-keywords"
+set DOC "Keywords for use with srecode macros and font-lock."
+sectiondictionary "MODEHOOK"
+set NAME macro "MODESYM" "-mode-hook"
+set DOC "Hook run when " macro "MODESYM" " starts."
+set GROUP macro "MODESYM" "-mode"
+set CUSTOMTYPE "'hook"
+sectiondictionary "MODEFCN"
+set NAME macro "MODESYM" "-mode"
+set DOC "Major-mode for " macro "MODESYM" "-mode buffers."
+set INTERACTIVE ""
+----
+$>:declaration:defgroup$
+
+$>:syntax-table$
+
+$<FONTLOCK:declaration:variable$
+   '(
+     )
+$/FONTLOCK$
+
+$>:declaration:keymap$
+
+$<MODEHOOK:declaration:variable-option$nil$/MODEHOOK$
+
+;;;###autoload
+$<MODEFCN:declaration:function$
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode '$MODESYM$-mode
+        mode-name "$?MODENAME$"
+	comment-start ";;"
+	comment-end "")
+  (set (make-local-variable 'comment-start-skip)
+       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
+  (set-syntax-table $MODESYM$-mode-syntax-table)
+  (use-local-map $MODESYM$-mode-map)
+  (set (make-local-variable 'font-lock-defaults)
+       '($MODESYM$-mode-font-lock-keywords
+         nil  ;; perform string/comment fontification
+         nil  ;; keywords are case sensitive.
+         ;; This puts _ & - as a word constituant,
+         ;; simplifying our keywords significantly
+         ((?_ . "w") (?- . "w"))))
+  (run-hooks '$MODESYM$-mode-hook)
+$/MODEFCN$
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.$?MODEEXTENSION$$DOLLAR$" . $MODESYM$-mode))
+
+$<A:section-comment$Commands for $MODESYM$$/A$
+
+$<B:section-comment$Utils for $MODESYM$$/B$
+----
+
+template syntax-table
+"Create a syntax table."
+sectiondictionary "A"
+set NAME macro "?MODESYM" "-mode-syntax-table"
+set DOC "Syntax table used in " macro "?MODESYM" " buffers."
+----
+$<A:declaration:variable$
+  (let ((table (make-syntax-table (standard-syntax-table))))
+    (modify-syntax-entry ?\; ". 12"  table) ;; SEMI, Comment start ;;
+    (modify-syntax-entry ?\n ">"     table) ;; Comment end
+    (modify-syntax-entry ?\" "\""    table) ;; String
+    (modify-syntax-entry ?\- "_"     table) ;; Symbol
+    (modify-syntax-entry ?\\ "\\"    table) ;; Quote
+    (modify-syntax-entry ?\` "'"     table) ;; Prefix ` (backquote)
+    (modify-syntax-entry ?\' "'"     table) ;; Prefix ' (quote)
+    (modify-syntax-entry ?\, "'"     table) ;; Prefix , (comma)
+
+    table)
+$/A$
+----
+
+
+context declaration
+
+template include :blank
+"Insert a require statement."
+----
+(require '$?NAME$)
+----
+bind "i"
+
+template include-protected :blank
+"Insert a require statement."
+----
+(condition-case nil
+     (require '$?NAME$)
+   (error nil))
+----
+
+prompt INTERACTIVE "Is this an interactive function? " default "  (interactive)\n  " read y-or-n-p
+prompt NAME "Name: " defaultmacro "PRENAME"
+
+template function :el :indent :blank
+"Insert a defun outline."
+----
+(defun $?NAME$ ($#ARGS$$NAME$$#NOTLAST$ $/NOTLAST$$/ARGS$)
+  "$DOC$"
+$?INTERACTIVE$$^$
+  )
+----
+bind "f"
+
+
+template variable :el :indent :blank
+"Inert a variable.
+DOC is optional."
+----
+(defvar $?NAME$ $^$
+  "$DOC$")
+----
+bind "v"
+
+template variable-const :el :indent :blank
+"Inert a variable."
+----
+(defconst $?NAME$ $^$
+  "$DOC$")
+----
+
+template variable-option :el :el-custom :indent :blank
+"Inert a variable created using defcustom."
+----
+(defcustom $?NAME$ $^$
+  "*$DOC$"
+  :group $GROUP$
+  :type $?CUSTOMTYPE$)
+----
+bind "o"
+
+template class :el :indent :blank
+"Insert a new class."
+----
+(defclass $?NAME$ ()
+   (($?ARG1$ :initarg :$ARG1$
+             :documentation
+	     "$^$")
+   )
+   "Class $NAME$ ")
+----
+bind "c"
+
+template class-tag :el :indent :blank
+"Insert a new class."
+----
+(defclass $?NAME$ ($#PARENTS$$NAME$ $/PARENTS$)
+   ($^$
+    )
+   "Class $NAME$ ")
+----
+
+template method :el :ctxt :indent :blank
+"Insert a new method."
+----
+(defmethod $?NAME$ ((this $?PARENT$))
+  "$DOC$"
+  $^$
+  )
+----
+bind "m"
+
+template method-tag :el :ctxt :indent :blank
+"Insert a new method for tag inserter."
+----
+(defmethod $NAME$ ($#ARGS$$#FIRST$($NAME$ $PARENT$)$/FIRST$$#NOTFIRST$ $NAME$$/NOTFIRST$$/ARGS$)
+  "$DOC$"
+  $^$
+  )
+----
+
+prompt NAME "Method to Override: " defaultmacro "PRENAME" read mode-local-read-function
+prompt PARENT "Major Mode for binding: " defaultmacro "MODESYM"
+
+;; Note: PARENT is used for override methods and for classes.  Handy!
+template modelocal :el :ctxt :indent :blank
+"Insert a new mode-local function."
+----
+(define-mode-local-override $?NAME$ $?PARENT$ ()
+  "$DOC$"
+  $^$)
+----
+bind "l"
+
+
+template defgroup :indent :blank
+"Create a custom group."
+----
+(defgroup $?MODESYM$-mode nil
+  "$MODESYM$ group."
+  :group 'langauges)
+----
+bind "g"
+
+
+template keymap :indent :blank
+"Insert a keymap of some sort"
+----
+(defvar $?MODESYM$-mode-map
+  (let ((km (make-sparse-keymap)))
+    (define-key km "\C-c\C-c" '$MODESYM$-mode$^$)
+    km)
+  "Keymap used in `$MODESYM$-mode'.")
+----
+bind "k"
+
+
+context classdecl
+
+prompt NAME "Slot Name: "
+
+template variable-tag :indent :indent :blank
+"A field in a class."
+----
+($?NAME$ :initarg :$NAME$
+	 $#DEFAULTVALUE$:initform $VALUE$$/DEFAULTVALUE$
+	 :documentation
+	 "$DOC$")
+
+----
+
+template variable :indent :indent :blank
+"A field in a class."
+----
+($?NAME$ :initarg :$NAME$
+	 :initform nil
+	 :type list
+	 :documentation
+	 "$DOC$")
+
+----
+bind "s"
+
+
+
+;; end
+
+
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-getset-cpp.srt b/site/cedet-1.0pre7/srecode/templates/srecode-getset-cpp.srt
new file mode 100644
index 0000000..9220a70
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-getset-cpp.srt
@@ -0,0 +1,51 @@
+;;; srecode-getset-cpp.srt --- Create getter/setters for a C++ class.
+
+;; Copyright (C) 2007, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-getset-cpp.srt,v 1.4 2008/06/08 16:24:29 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "c++-mode"
+set application "getset"
+
+context declaration
+
+template getset-in-class :tag :indent :blank
+----
+{{>A:classdecl:comment-function-group-start}}
+{{TYPE}} get{{NICENAME}}() const {
+   return {{NAME}};
+}
+void set{{NICENAME}}({{TYPE}} {{NICENAME}}) {
+   {{NAME}} = {{NICENAME}};
+}
+{{>A:classdecl:comment-function-group-end}}
+----
+
+template getset-field :blank :indent
+----
+{{?TYPE}} f{{?NAME}};
+----
+
+template getset-initializer :indent
+----
+f{{NAME}}(){{#NOTLAST}},{{/NOTLAST}}
+----
+
+;; end
+
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-java.srt b/site/cedet-1.0pre7/srecode/templates/srecode-java.srt
new file mode 100644
index 0000000..7b7e755
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-java.srt
@@ -0,0 +1,182 @@
+;; srecode-java.srt --- 
+
+;; Copyright (C) 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-java.srt,v 1.3 2010/01/09 21:50:09 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "java-mode"
+set escape_start "{{"
+set escape_end "}}"
+
+context file
+
+set comment_start  "/**"
+set comment_end    " */"
+set comment_prefix " *"
+
+template empty :file :user :time :java :indent
+"Fill out an empty file."
+sectiondictionary "CLASSSECTION"
+set NAME macro "FILENAME_AS_CLASS"
+----
+{{>:filecomment}}
+
+package {{FILENAME_AS_PACKAGE}};
+
+{{>CLASSSECTION:declaration:class}}
+
+----
+bind "e"
+
+context declaration
+
+template import :blank :indent
+"Template to import a package."
+----
+{{>:declaration:include}}
+----
+bind "i"
+
+template class :blank :indent
+"Template to declare a variable."
+sectiondictionary "DOCSECTION"
+set NAME macro "NAME"
+----
+{{>DOCSECTION:declaration:javadoc-class}}
+public class {{?NAME}} {
+
+   {{^}}
+
+} // {{NAME}}
+----
+bind "c"
+
+;;; Semantic Tag support
+;;
+template class-tag :indent :blank
+"Insert a Java class with the expectation of it being used by a tag inserter.
+Override this to affect applications, or the outer class structure for
+the user-facing template."
+----
+{{>:declaration:javadoc-class}}
+public Class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
+{     
+   {{^}}
+};
+----
+
+template include :blank
+"An include statement."
+----
+import {{?NAME}};
+----
+
+context misc
+
+template arglist
+"Insert an argument list for a function.
+@todo - Support smart CR in a buffer for not too long lines."
+----
+({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}})
+----
+
+context classdecl
+
+template function :indent :blank
+----
+public {{?TYPE}} {{?NAME}}{{>:misc:arglist}} {
+{{^}}
+}
+----
+bind "m"
+
+template variable :indent :blank
+"Insert a variable declaration."
+----
+{{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}};
+----
+bind "v"
+
+;;; Java Doc Comments
+;;
+context classdecl
+
+prompt GROUPNAME "Name of declaration group: "
+
+template javadoc-function-group-start :indent :blank
+----
+/**
+ * {{?GROUPNAME}}
+ * @{
+ */
+
+----
+
+template javadoc-function-group-end :indent :blank
+----
+/**
+ * @}
+ */
+
+----
+
+context declaration
+
+template javadoc-class :indent :blank :time :user :tag
+----
+/**
+ * {{DOC}}{{^}}
+ *
+ * Created: {{DATE}}
+ *
+ * @author {{AUTHOR}}
+ * @version 
+ * @since 
+ */
+----
+
+template javadoc-function :indent :blank :tag
+----
+/**
+ * {{DOC}}{{^}}
+ * {{#ARGS}}
+ * @param {{?NAME}} - {{DOC}}{{/ARGS}}
+ * @return {{TYPE}}{{#THROWS}}
+ * @exception {{NAME}} - {{EXDOC}}{{/THROWS}}
+ */
+----
+
+template javadoc-variable-same-line
+----
+/**< {{DOC}}{{^}} */
+----
+
+template javadoc-section-comment :blank :indent
+"Insert a comment that separates sections of an Emacs Lisp file."
+----
+
+/** {{?TITLE}}
+ *
+ * {{^}}
+ */
+
+----
+
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-make.srt b/site/cedet-1.0pre7/srecode/templates/srecode-make.srt
new file mode 100644
index 0000000..a5169ce
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-make.srt
@@ -0,0 +1,80 @@
+;; srecode-make.srt --- 
+
+;; Copyright (C) 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-make.srt,v 1.1 2009/01/06 01:11:22 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "makefile-mode"
+set escape_start "{{"
+set escape_end "}}"
+set comment_start "#"
+set comment_prefix "#"
+set TAB "\t"
+
+context file
+
+template empty :file :user
+----
+{{>:filecomment}}
+
+all: {{^}}
+
+{{comment_start}} end
+----
+
+context declaration
+
+;; GNU Make has real functions you can define, but semantic uses
+;; 'function for rules.  This is unfortunate, and should be fixed.
+template rule :blank
+----
+{{?NAME}}:
+{{TAB}}{{^}}
+----
+bind "r"
+
+template inferencerule :blank
+----
+%.{{?SRCEXTENSION}}: %.{{?DESTEXTENSION}}
+{{TAB}}{{^}}
+----
+bind "i"
+
+template phonyrule :blank
+----
+.PHONY {{?NAME}}
+{{NAME}}:
+{{TAB}}{{^}}
+----
+bind "p"
+
+
+template variable :blank
+"Insert a variable declaration."
+----
+{{?NAME}}:= {{^}}
+----
+bind "v"
+
+template include :blank
+----
+include {{?NAME}}
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-template.srt b/site/cedet-1.0pre7/srecode/templates/srecode-template.srt
new file mode 100644
index 0000000..1fcd327
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-template.srt
@@ -0,0 +1,225 @@
+;;; srecode-template.srt --- Templates for Semantic Recoders
+
+;; Copyright (C) 2005, 2007, 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; X-RCS: $Id: srecode-template.srt,v 1.9 2009/01/04 14:27:08 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set escape_start "$"
+set escape_end "$"
+set mode "srecode-template-mode"
+set priority "70"
+
+set comment_start  ";;"
+set comment_end    ""
+set comment_prefix ";;"
+
+set SEPARATOR "----"
+
+set DOLLAR "$"
+
+context file
+
+prompt MAJORMODE "Major Mode for templates: " read srecode-read-major-mode-name
+prompt START "Escape Start Characters: " default "{{"
+prompt END "Escape End Characters: " default "}}"
+
+template empty :file :user :time :srt
+"Insert a skeleton for a template file."
+----
+$>:filecomment$
+
+set mode "$?MAJORMODE$"
+set escape_start "$?START$"
+set escape_end "$?END$"
+
+context file
+
+$^$
+
+
+;; end
+----
+
+template mode-basics :srt
+"Fill out a full template including parts for basic new mode stuff."
+sectiondictionary "E"
+set NAME "empty :file :user :time"
+set DOC "Fill out an empty file."
+set KEY "e"
+sectiondictionary "C1"
+set NAME "declaration"
+sectiondictionary "DTF"
+set NAME "function :blank :indent"
+set DOC "Template to declare a function."
+set KEY "f"
+sectiondictionary "DTV"
+set NAME "variable :blank :indent"
+set DOC "Template to declare a variable."
+set KEY "v"
+sectiondictionary "PR"
+set NAME "NAME"
+set PROMPT "Name for declaration: "
+----
+$>:declaration:commentchars$
+
+$<E:declaration:function$
+$ESCAPE_START$>:filecomment$ESCAPE_END$
+$/E$
+
+$>C1:declaration:context$
+
+$>PR:declaration:prompt$
+
+$>DTF:declaration:function$
+$>DTV:declaration:function$
+----
+bind "m"
+
+
+context declaration
+
+prompt NAME "Name of new template: "
+prompt KEY "Key Binding: " read read-char
+
+template function :blank
+"Insert a template block for Srecoder templates."
+----
+template $?NAME$$#ARG$$NAME$$/ARG$
+"$DOC$"
+$SEPARATOR$
+$^$
+$SEPARATOR$
+bind "$?KEY$"
+----
+bind "f"
+
+prompt NAME "Name of new variable: "
+
+template variable :blank
+"Inert a variable."
+----
+set $?NAME$ "$^$"
+----
+bind "v"
+
+template prompt :blank
+"Insert a prompt."
+----
+prompt $?NAME$ "$?PROMPT$"
+----
+bind "p"
+
+template priority :blank
+"Insert a priority statemept."
+----
+set priority $^$
+----
+
+template application :blank
+"Insert a priority statemept."
+----
+set application "$^$"
+----
+
+template context :blank
+"Insert a context statement."
+----
+context $NAME$
+----
+bind "c"
+
+template commentchars :blank
+"Insert the variables for handling comments."
+----
+set comment_start  ""
+set comment_end    ""
+set comment_prefix ""
+----
+
+context code
+
+prompt NAME "Name of variable: " read srecode-read-variable-name
+
+template variable :srt
+"Insert a variable with completion from the current file."
+----
+$ESCAPE_START$$?NAME$$ESCAPE_END$
+----
+bind "v"
+
+prompt NAME "Name of macro: "
+
+template ask :srt
+"Insert a prompting variable."
+----
+$ESCAPE_START$?$?NAME$$ESCAPE_END$
+----
+bind "a"
+
+template comment :srt
+----
+$ESCAPE_START$!$^$$ESCAPE_END$
+----
+bind "c"
+
+prompt TEMPLATE "Template to include: " read srecode-read-template-name
+
+template include :srt
+----
+$ESCAPE_START$>:$?TEMPLATE$$ESCAPE_END$
+----
+bind "i"
+
+template includewrap :srt
+----
+$ESCAPE_START$<:$?TEMPLATE$$ESCAPE_END$$^$$ESCAPE_START$/$NAME$$ESCAPE_END$
+----
+bind "w"
+
+template point :srt
+----
+$ESCAPE_START$^$ESCAPE_END$
+----
+bind "p"
+
+template section :srt
+"Insert a section, or looping construct."
+----
+$ESCAPE_START$#$?NAME$$ESCAPE_END$
+$^$
+$ESCAPE_START$/$NAME$$ESCAPE_END$
+----
+bind "s"
+
+template escape-start-quoted :srt
+"Escape Start"
+----
+$ESCAPE_START$ESCAPE_START$ESCAPE_END$
+----
+bind "q"
+
+template escape-end-quoted :srt
+"Escape Start"
+----
+$ESCAPE_START$ESCAPE_END$ESCAPE_END$
+----
+bind "e"
+
+
+;; end
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-test.srt b/site/cedet-1.0pre7/srecode/templates/srecode-test.srt
new file mode 100644
index 0000000..95b239e
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-test.srt
@@ -0,0 +1,167 @@
+;; srecode-test.srt --- Templates to be used for testing
+
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-test.srt,v 1.6 2010/02/09 21:34:03 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "srecode-template-mode"
+set escape_start "$"
+set escape_end "$"
+set application "tests"
+
+set UTESTVAR1 ".SRT VAR 1"
+;;
+;; These are for testing features of template files.
+;;
+context test
+
+template test :user
+----
+$! This is a comment in the template. $
+;; $AUTHOR$
+;; $AUTHOR:upcase$
+----
+
+template subs :blank
+----
+;; Before Loop
+$#LOOP$
+;;  - loop stuff
+$/LOOP$
+;; After Loop
+----
+
+;; Before insertion
+;; After insertion
+
+template firstlast
+sectiondictionary "A"
+set MOOSE "FIRST"
+sectiondictionary "A"
+set MOOSE "MIDDLE"
+sectiondictionary "A"
+set MOOSE "LAST"
+----
+$#A$
+;; << -- $MOOSE$
+$#FIRST$;; I'm First$/FIRST$
+$#NOTFIRST$;; I'm Not First$/NOTFIRST$
+$#LAST$;; I'm Last$/LAST$
+$#NOTLAST$;; I'm Not Last$/NOTLAST$
+;; -- >>
+$/A$
+----
+
+
+template wrapsomething :region
+----
+;; Put this line in front:
+$REGIONTEXT$
+;; Put this line at the end:
+----
+
+template gapsomething :blank
+----
+### ALL ALONE ON A LINE ###
+----
+
+template inlinetext
+"Insert text that has no nelines"
+----
+ *In the middle* 
+----
+
+template includable :blank
+----
+;; An includable $COMMENT$ we could use.
+;; $INPUTNAME$$^$
+;; Text after a point inserter.
+----
+
+template wrapinclude-basic
+----
+$>WI1:includable$
+----
+
+template wrapinclude-around
+sectiondictionary "WI1"
+set INPUTNAME "[VAR]"
+----
+$<WI1:includable$Intermediate Comments$/WI1$
+----
+
+template complex-subdict
+sectiondictionary "A"
+set MYVAR1 "cow"
+set MYVAR2 "dog"
+set CPLX "I have a " macro "MYVAR1" " and a " macro "MYVAR2" "."
+----
+;; $#A$$CPLX$$/A$
+----
+
+template wrap-new-template
+sectiondictionary "NEWTMP"
+set DOC "A nice doc string goes here."
+----
+$<NEWTMP:declaration:function$Random text in the new template
+$/NEWTMP$
+----
+
+template column-data
+sectiondictionary "A"
+set MOOSE "FIRST"
+sectiondictionary "A"
+set MOOSE "VERY VERY LONG STRING THAT WILL BE CROPPED."
+sectiondictionary "A"
+set MOOSE "MIDDLE"
+sectiondictionary "A"
+set MOOSE "S"
+sectiondictionary "A"
+set MOOSE "LAST"
+----
+Table of Values:
+Left Justified       | Right Justified$#A$
+$|MOOSE:20:right$ | $|MOOSE:20:left$$/A$
+----
+
+template custom-arg-handler :utest
+sectiondictionary "A"
+set MOOSE "why"
+----
+OUTSIDE SECTION: $UTESTVAR1$
+INSIDE SECTION: $#A$$UTESTVAR1$$/A$
+----
+
+template custom-arg-w-arg :utestwitharg
+----
+Value of xformed UTWA: $UTESTARGXFORM$
+----
+
+template custom-arg-w-subdict :utestwitharg
+sectiondictionary "UTLOOP"
+set NAME "item1"
+sectiondictionary "UTLOOP"
+set NAME "item2"
+sectiondictionary "UTLOOP"
+set NAME "item3"
+----
+All items here: $FOO_item1$ $FOO_item2$ $FOO_item3$
+----
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-texi.srt b/site/cedet-1.0pre7/srecode/templates/srecode-texi.srt
new file mode 100644
index 0000000..64a4af9
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-texi.srt
@@ -0,0 +1,174 @@
+;; srecode-texi.srt --- Texinfo templates
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-texi.srt,v 1.5 2009/01/01 19:01:42 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "texinfo-mode"
+
+set escape_start "$"
+set escape_end "$"
+set DOLLAR "$"
+
+context file
+
+prompt NAME "Name of manual: "
+
+template empty :file :user :time
+"Fill a new texinfo file with some baseline stuff."
+----
+\input texinfo   @c -*-texinfo-*-
+$#RCS$
+@c
+@c $Id: srecode-texi.srt,v 1.5 2009/01/01 19:01:42 zappo Exp $
+@c
+$/RCS$
+@c %**start of header
+@setfilename $FILE$.info
+@set TITLE $?NAME$
+@set AUTHOR $?AUTHOR$
+@settitle @value{TITLE}
+@c %**end of header
+
+@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* $FILE$: ($FILE$).       $NAME$
+END-INFO-DIR-ENTRY
+@end format
+@end ifinfo
+
+@titlepage
+@sp 10
+@center @titlefont{$FILE$}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} $YEAR$ $AUTHOR$
+@end titlepage
+
+@node Top
+@top @value{TITLE}
+
+$^$
+
+@menu
+* Index::
+@end menu
+
+
+
+
+@node Index
+@chapter Index
+
+@contents
+
+@bye
+----
+
+prompt NAME "Name of item: "
+
+context declaration
+
+;; Note to self: It would be cool to replace the junk in
+;; semantic/document.el with macros from here.
+template function :blank :texitag
+"Import some function tag into texinfo."
+----
+
+@defun $NAME$$#ARGS$ $NAME$$/ARGS$
+@anchor{$NAME$}
+$TAGDOC$
+@end defun
+
+----
+bind "f"
+
+template function-command :blank :texitag
+"Import some function tag into texinfo."
+----
+
+@deffn Command $NAME$$#ARGS$ $NAME$$/ARGS$
+@anchor{$NAME$}
+$TAGDOC$
+@end deffn
+
+----
+bind "f"
+
+
+template variable :blank :texitag
+"Import some variable tag into texinfo"
+----
+
+@defvar $NAME$$#ARGS$ $NAME$$/ARGS$
+@anchor{$NAME$}
+$TAGDOC$
+@end defvar
+
+----
+bind "v"
+
+prompt NAME "Name of node: "
+
+template node :texi
+"Insert a node right about here."
+----
+
+@node $?NAME$
+@$?LEVEL$ $NAME$
+
+$^$
+
+----
+bind "n"
+
+template subnode :texi
+"Insert a node right about here."
+----
+
+@node $?NAME$
+@$?NEXTLEVEL$ $NAME$
+
+$^$
+
+----
+bind "n"
+
+
+template menu :blank
+"Menu items for texinfo."
+----
+
+@menu
+$^$
+@end menu
+
+----
+bind "m"
+
+prompt NAME "Menu item: "
+
+template menuitem :blank
+"Insert a menu item."
+----
+* $?NAME$::	$^$
+----
+
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/srecode/templates/srecode-wisent.srt b/site/cedet-1.0pre7/srecode/templates/srecode-wisent.srt
new file mode 100644
index 0000000..de371c3
--- /dev/null
+++ b/site/cedet-1.0pre7/srecode/templates/srecode-wisent.srt
@@ -0,0 +1,95 @@
+;; srecode-wisent.srt --- Templates for Emacs/WISENT grammar files.
+
+;; Copyright (C) 2007, 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: srecode-wisent.srt,v 1.2 2008/01/29 14:30:49 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "wisent-grammar-mode"
+set comment_start  ";;"
+set comment_prefix  ";;"
+set comment_end  ""
+
+context file
+
+template empty :file :user :time
+"Insert a skeleton for a grammar file."
+----
+{{>:filecomment}}
+
+;;; Commentary:
+;;
+;; Parser for {{?TARGETMODE}} mode
+
+%languagemode {{TARGETMODE}}-mode
+%parsetable    wisent-{{TARGETMODE}}-parser-tables
+%keywordtable  wisent-{{TARGETMODE}}-keywords
+%tokentable    wisent-{{TARGETMODE}}-tokens
+%languagemode  {{TARGETMODE}}-mode
+%setupfunction wisent-{{TARGETMODE}}-default-setup
+
+%start goal
+
+;;; KEYWORDS
+%type <keyword>
+
+%%
+
+goal
+  : {{^}}
+  ;
+
+%%
+(define-lex wisent-{{TARGETMODE}}-lexer
+  "Lexical analzer to handle {{TARGETMODE}} buffers."
+  ;; semantic-lex-newline
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+
+  semantic-lex-default-action
+  )
+
+;; {{FILENAME}} ends here
+----
+
+context declaration
+
+template function
+----
+{{?NAME}}
+  : {{^}}
+  ;
+----
+bind "f"
+
+template keyword
+----
+%keyword {{?NAME:upcase}} "{{NAME:downcase}}"
+%put     {{NAME:upcase}} summary "{{NAME}} {{^}}"
+----
+bind "k"
+
+template token
+----
+%type <{{?LEXTOKEN}}>
+%token <{{LEXTOKEN}}> {{LEXTOKEN}}
+----
+bind "t"
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/tests/ChangeLog b/site/cedet-1.0pre7/tests/ChangeLog
new file mode 100644
index 0000000..d47aa29
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/ChangeLog
@@ -0,0 +1,307 @@
+2010-01-09  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* cit-gnustep.el:
+	* fix `cedet-integ-target-gnustep' variable at compatible
+	  value from `cedet-integ-test.el'.
+	* added test for scanner-mode.
+	* move compilation in a separate function.
+
+2009-12-27  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-dist.el (cit-make-dist):
+	Test w/ default version, then update and test again.
+	(cit-update-version): Force rebuild of Makefile.
+
+2009-12-26  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Lisp_LISP): Add cit-dist.el
+
+	* Project.ede ("cit"): Add cit-dist.el
+
+	* cedet-integ-test.el (cit-dist): New require.
+	(cedet-integ-test-proj): Call new cit-dist tests.
+	(cit-compile-and-wait): Split part out to...
+	(cit-wait-for-compilation): New.
+
+	* cit-dist.el: First pass of creating a distribution.
+
+2009-10-18  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-cpp.el (cit-main-cpp-tags): Add code to main.
+	(cit-srecode-fill-cpp): Run the compiled program.
+
+	* cit-load.el (semantic-c): Hack for Emacs 21 to get things running.
+
+	* cedet-integ-test.el (cit-srecode-fill-with-stuff):
+	If a tag has :code, insert it.
+	(cit-run-target): New.
+
+2009-10-16  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (ELISPPRELOAD): New
+	(Lisp): Use preloads.
+
+	* Project.ede (Lisp): Use preload compiler.
+
+2009-10-15  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-el.el (cit-el-tags): Removed eieio bits.
+	(cit-el-tags-eieio): New, from above.
+	(cit-srecode-fill-el): Only use eieio bits for Make types.
+
+	* cit-cpp.el (cit-remove-and-do-shared-lib):
+	Enable for use with Make projects too.
+	Create the srcs in a new lib directory.
+
+	* cedet-integ-test.el (cedet-integ-test-proj): Add a lib dir.
+	Add make-type arg ot cit-remove-and-do-shared-lib call.
+	(cit-compile-and-wait):
+	Accept an optional argument.
+
+2009-09-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-integ-test.el (cedet-integ-test-proj):
+	Add cit-remove-and-do-shared-lib.
+
+	* cit-cpp.el (cit-remove-and-do-shared-lib): New.
+
+2009-08-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cedet-integ-test.el (cit-finish-message):
+	Add a pause, then exit with a status of "1".
+
+	* cit-test.sh: Reverse the exist status of Emacs.
+
+	* cit-uml.el (cit-fill-uml): Accept a make-type argument.
+	Use above when creating a new project.
+
+	* cit-test.sh:
+	Determine the STYLE of test to run.  If none passed in, use Make.
+
+	* cit-el.el (cit-srecode-fill-el): Accept make-type argument.
+	Don't do autoloads with automake.
+
+	* cit-cpp.el (cit-srecode-fill-cpp): Accept make-type argument.
+	Control how projects are made based on what include variable is used
+	based on above.
+
+	* cedet-integ-test.el (cedet-integ-test-Make,cedet-integ-test-Automake,cedet-integ-test-GNUStep):
+	New
+	(cedet-integ-test-proj): Take a make-type argumemt.
+	Misc tests needed on new argument.
+	Change how ede creates projects based on make-type.
+	Remove spaces from the project name.
+	(cit-finish-message): Ending message now includes the make type.
+
+2009-05-30  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (LOADPATH): Add cogre to the load path.
+
+	* Project.ede ("Lisp"): Added cogre as an aux package.
+
+	* Makefile (Lisp_LISP): Add cit-uml.el
+	(Misc_MISC): Add cit-uml.cgr
+
+	* Project.ede (Lisp): Add cit-uml.el
+	(Misc): Add cit-uml.cgr
+
+	* cit-test.sh: Add -f toggle-debug-on-quit flag
+
+	* cedet-integ-test.el (cit-uml): New require
+	(cogre): New require
+	(cedet-integ-test): Make a UML test dir. Call `cit-fill-uml'.
+	(cit-compile-and-wait): Kill Project.ede buffer after compilation.
+
+	* cit-uml.el: Test generating code from a UML diagram.
+
+	* cit-uml.cgr: UML diagram to test generation of code from.
+
+2009-03-14  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-load.el: Disable semanticdb-file saving.
+	Disable srecode map saving.
+
+2009-03-12  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-gnustep.el (cedet-integ-target-gnustep): New var for files.
+	(cit-ede-step-test): Create dir for this project.
+	Create the file and make sure it is empty first.  Then make the
+	project.
+	Wait for compilation to finish and search for failure string.
+
+	* cedet-integ-test.el (cedet-integ-base): New, using old target value.
+	(cedet-integ-target): Subdir under base
+	(cedet-integ-test): Make the base dir first.
+	(cit-srecode-verify-tags): Fix paren typos on error condition.
+
+	* cedet-integ-test.el (cit-remove-add-to-project-cpp):
+	Set auto-add-method to always during step test.
+
+	* cit-cpp.el: Patch from David Engster
+	(cit-remove-add-to-project-cpp): Use ede-make-command
+
+	* cedet-integ-test.el (ede, ede-make): New require
+	(cit-srecode-verify-tags): Fix debugging output on failure.
+	Patch from David Engster
+	(cit-compile-and-wait): Use ede-make-command
+
+2009-03-08  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-gnustep.el (cit-ede-step-test): Execute gcc from a sh command.
+
+2009-03-06  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-cpp.el (cit-remove-add-to-project-cpp): Wait for make to finish.
+
+2009-03-05  Alex Ott <alexott@gmail.com>
+
+	* .cvsignore:
+	add ignore files to not show auxiliary scripts, not included into CVS
+
+2009-03-01  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile, Project.ede: Merge from 1.0pre6 branch
+
+2009-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-test.sh: Patch from Marcus Harnisch
+	(EMACS): Use conditional value from the environment.
+
+	* Project.ede ("cit"): Add speedbar aux package.
+
+	* Makefile (LOADPATH): Add speedbar.
+	(EMACSFLAGS): New variable
+	(Lisp): Use above.
+
+2009-01-28  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-gnustep.el (ede-gnustep): Simplify load.
+
+	* Makefile (LOADPATH): Add contrib.
+	(Misc): New
+	(dist): Add Misc
+
+	* Project.ede ("cit"): Give it a new name.
+	(Misc): New target.
+
+2009-01-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-gnustep.el: Comment out edebug require.
+
+	* cedet-integ-test.el (cit-version): New variable.
+	(semantic): New require
+
+	* Makefile (LOADPATH): Added
+
+	* Project.ede ("Lisp"): Add :versionsource, and :aux-packages
+
+2009-01-10  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-cpp.el (cit-srecode-fill-cpp): Fixed misspelling of target name.
+
+2008-09-15  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* cit-gnustep.el: fixed the require statement.
+
+2008-09-04  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (Lisp_LISP): Add cit-gnustep.el
+
+	* Project.ede ("Lisp"): Add cit-gnustep.el
+
+2008-09-02  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* cit-gnustep.el: added copyright statement
+
+2008-08-28  Marco (Bj) Bardelli <safanaj@users.sourceforge.net>
+
+	* cedet-integ-test.el:
+	added stuff to test ede-gnustep via `cit-ede-step-test' defined in
+	cit-gnustep.el . Something is not clear (ede-auto-add-method ???)
+
+	* cit-test.sh:
+	remove more dirs because to test ede-gnustep we need another dir, this
+	is because `ede-new' check the :class-sym that don't match in
+	/tmp/CEDET_INTEG (that contain a ede-proj-project).
+
+	* cit-gnustep.el:
+	First test for EDE GNUstep Integration via CIT (cedet-integ-test).
+	Not completly clean.
+
+2008-08-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* README: How to use the cit-test.sh script.
+
+	* Makefile (all, dist): Add scripts
+	(scripts): New
+
+	* Project.ede ("ede-proj-project"): Add scripts/cit-test.sh
+
+	* cedet-integ-test.el (cit-srecode-fill-with-stuff):
+	Protect erase-buffer call.
+	Add extra whitespace at end of empty filled buffers.
+
+2008-03-23  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-test.sh: Run the tests.
+
+2008-03-11  Eric M. Ludlam  <zappo@gnu.org>
+
+	* cit-load.el (inhibit-splash-screen): Set this.
+
+	* cedet-integ-test.el (cedet-integ-test): Post a PASSED message.
+
+2008-02-24  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile (templates_MISC, tempaltes): New
+	(all, dist): add templates
+
+	* Project.ede (Lisp): Add cit-srec.el
+	(templates): New
+
+	* Makefile (Lisp_LISP): Add cit-srec.el
+
+	* cit-load.el (cit-src-dir): New var.
+
+	* cedet-integ-test.el (cit-srec): New require
+	(cedet-integ-test): Call srec test.
+
+	* cit-srec.el: SRecoder feature testing.
+
+	* cit-extra-cpp.srt: Base template for cit testing.
+
+	* cedet-integ-test.el (cit-cpp,-el,-texi): Added requires.
+	(cedet-integ-test): Add in new calls to test support files.
+	(cit-header-tags, cit-src-tags, cit-main-tags, cit-srecode-fill):
+	Moved to cit-cpp.el
+	(cit-srecode-fill-with-stuff): Add empty-dict-entries argument.
+	Add pauses for visual effect.
+	(cit-srecode-verify-tags): Fix to work, and actually throw an error
+	if things don't match up.
+	(cit-tag-verify-error-debug): New support class.
+	(cit-compile-and-wait): New fcn.  Error if compilation fails.
+
+	* Makefile (Lisp_LISP): Add cit-cpp, cit-el, cit-texi, cit-load
+
+	* Project.ede ("Lisp"): Add cit-cpp, cit-el, cit-texi, cit-load
+
+	* cit-texi.el: Texinfo support for cedet integration tests.
+
+	* cit-load.el: Test system load file.
+
+	* cit-el.el: Emacs Lisp support for cedet integration tests.
+
+	* cit-cpp.el:
+	CPP integration support.  Core bits copied originally from cedet-integ-test.el
+
+2008-02-19  Eric M. Ludlam  <zappo@gnu.org>
+
+	* Makefile: New Makefile.
+
+	* Project.ede: New metaproject
+
+	* cedet-integ-test.el (cedet-integ-test, cit-srecode-fill, cit-srecode-fill-with-stuff):
+	Updated comments.
+
+	* cedet-integ-test.el: Integration Tests.
+
diff --git a/site/cedet-1.0pre7/tests/Makefile b/site/cedet-1.0pre7/tests/Makefile
new file mode 100644
index 0000000..324cc60
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/Makefile
@@ -0,0 +1,67 @@
+# Automatically Generated Makefile by EDE.
+# For use with: make
+#
+# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
+# EDE is the Emacs Development Environment.
+# http://cedet.sourceforge.net/ede.shtml
+#
+
+top=
+ede_FILES=Project.ede Makefile
+
+Lisp_LISP=cedet-integ-test.el cit-cpp.el cit-el.el cit-texi.el cit-load.el cit-srec.el cit-gnustep.el cit-uml.el cit-dist.el
+EMACS=emacs
+EMACSFLAGS=-batch --no-site-file
+LOADPATH= ../speedbar/ ../cogre/ ../contrib/ ../ede/ ../srecode/ ../semantic/wisent/ ../semantic/bovine/ ../semantic/ ../eieio/ ../common/
+ELISPPRELOAD= cedet-compat
+templates_MISC=cit-extra-cpp.srt
+scripts_MISC=cit-test.sh
+Misc_MISC=README ChangeLog cit-uml.cgr
+VERSION=1.0
+DISTDIR=$(top)cit-$(VERSION)
+
+
+
+all: Lisp templates scripts Misc
+
+.PHONY: Lisp
+Lisp: $(Lisp_LISP)
+	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+	for loadpath in . ${LOADPATH}; do \
+	   echo "(add-to-list 'load-path \"$$loadpath\")" >> $@-compile-script; \
+	done;
+	for preload in ${ELISPPRELOAD}; do \
+	   echo "(load \"$$preload\")" >> $@-compile-script; \
+	done;
+	@echo "(setq debug-on-error t)" >> $@-compile-script
+	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
+
+templates: 
+	@
+
+scripts: 
+	@
+
+Misc: 
+	@
+
+tags: 
+
+
+clean:
+	rm -f *.elc
+
+.PHONY: dist
+
+dist:
+	mkdir $(DISTDIR)
+	cp $(Lisp_LISP) $(templates_MISC) $(scripts_MISC) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
+
+Makefile: Project.ede
+	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+	@echo If you have not modified Project.ede, you can use 'touch' to update the Makefile time stamp.
+	@false
+
+
+
+# End of Makefile
diff --git a/site/cedet-1.0pre7/tests/Project.ede b/site/cedet-1.0pre7/tests/Project.ede
new file mode 100644
index 0000000..d47280f
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/Project.ede
@@ -0,0 +1,33 @@
+;; Object cit
+;; EDE project file.
+(ede-proj-project "cit"
+  :name "cit"
+  :file "Project.ede"
+  :targets (list 
+   (ede-proj-target-elisp "Lisp"
+    :name "Lisp"
+    :path ""
+    :source '("cedet-integ-test.el" "cit-cpp.el" "cit-el.el" "cit-texi.el" "cit-load.el" "cit-srec.el" "cit-gnustep.el" "cit-uml.el" "cit-dist.el")
+    :versionsource '("cedet-integ-test.el")
+    :compiler 'ede-emacs-preload-compiler
+    :aux-packages '("inversion" "eieio" "semantic" "semantic-bovine" "semantic-wisent" "srecode" "ede" "ede-gnustep" "cogre" "speedbar")
+    :pre-load-packages '("cedet-compat")
+    )
+   (ede-proj-target-makefile-miscelaneous "templates"
+    :name "templates"
+    :path ""
+    :source '("cit-extra-cpp.srt")
+    )
+   (ede-proj-target-makefile-miscelaneous "scripts"
+    :name "scripts"
+    :path ""
+    :source '("cit-test.sh")
+    )
+   (ede-proj-target-makefile-miscelaneous "Misc"
+    :name "Misc"
+    :path ""
+    :source '("README" "ChangeLog" "cit-uml.cgr")
+    )
+   )
+  :metasubproject 't
+  )
diff --git a/site/cedet-1.0pre7/tests/README b/site/cedet-1.0pre7/tests/README
new file mode 100644
index 0000000..4da0b2e
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/README
@@ -0,0 +1,13 @@
+ * HOW TO RUN CEDET INTEGRATION TESTS *
+   ==================================
+
+Run the shell script:
+
+  ./cit-test.sh
+
+Modify this script to specify the Emacs command to use to start Emacs.
+
+Once Emacs is up, do not move the mouse, or produce any other events
+for Emacs to read, or the sit-for commands that show the current
+output will stall, and you won't be able to see the current state.
+
diff --git a/site/cedet-1.0pre7/tests/cedet-integ-test.el b/site/cedet-1.0pre7/tests/cedet-integ-test.el
new file mode 100644
index 0000000..85410f9
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cedet-integ-test.el
@@ -0,0 +1,374 @@
+;;; cedet-integ-test.el --- CEDET full integration tests.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+
+(eval-and-compile
+  ;; Other package depend on this value at compile time via inversion.
+
+  (defvar cit-version "1.0"
+    "Current version of Semantic.")
+
+  )
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file provides a top level integration test harness for
+;; the various CEDET tools to do a simple stand-alone test.
+;;
+;; The below listed parts DO NOT happen in this order as various
+;; tools have to work together to build up the project.
+;;
+;; Note: Not all entries below are actually tested.  Make in comments the
+;; bit a new piece of code implements.
+;;
+;; Parts:
+;;
+;; 1) Create an EDE project in /tmp
+;;    a build directory tree
+;;    b make a toplevel project
+;;    c Make a src and include directory
+;;    d Put C++ src files into the correct directory.
+;;    e Tell EDE where they are.
+;;    f create a build file.
+;;    g build the sources
+;;    g.1 Run a program build by EDE
+;;    e remove files from a project.
+;;    f shared libraries from EDE.
+;;
+;; 2) Build sources using SRecode.
+;;    a Fill in the constructed C files with classes and methods.
+;;    b Test various templates
+;;    c Use a template to build some C++ templates
+;;    d SRecode to load the new template and construct some sources.
+;;    e SRecode map update for local templates.
+;;
+;; 3) Semantic to parse stuff
+;;    a Parse the sources
+;;    b Use srecode to make more sources
+;;    c test the incremental parsers.
+;;    d test the completion engine.
+;;    e Save semanticdb tables.  Are the files there?
+;;
+;; 4) Delete the project
+;;    a Make sure the semanticdb cleans up the dead cache files.
+;;    b Make sure EDE clears this project from it's project cache.
+;;
+;; 5) Use COGRE to build sources with SRecode
+;;    a Create a COGRE graph.
+;;    b Generate C++ code from the graph.
+;;    c Compile the sources.
+;;
+;; @TODO -
+;; 6) Create a distribution file.
+;;    a Call "make dist"
+;;    b update the version number
+;;    c make a new dist.  Verify version number.
+;;    d In a fresh dir, unpack the dist.
+;;    e Compile that dist.
+
+(require 'semantic)
+(require 'ede)
+(require 'data-debug)
+(require 'ede-make)
+(require 'cogre)
+
+(eval-and-compile
+  (defvar cedet-integ-base "/tmp/CEDET_INTEG"
+    "Root of multiple project integration tests.")
+  )
+
+(require 'cit-cpp)
+(require 'cit-uml)
+(require 'cit-srec)
+(require 'cit-el)
+(require 'cit-texi)
+(require 'cit-gnustep)
+(require 'cit-dist)
+
+(defvar cedet-integ-target (expand-file-name "edeproj" cedet-integ-base)
+  "Root of the EDE project integration tests.")
+
+;;; Code:
+(defun cedet-integ-test-Make ()
+  "Run the full CEDET integration test using a Make style project."
+  (cedet-integ-test-proj "Make"))
+
+(defun cedet-integ-test-Automake ()
+  "Run the full CEDET integration test using a Automake style project."
+  (let ((ede-pconf-create-file-query nil))
+    (cedet-integ-test-proj "Automake")))
+
+(defun cedet-integ-test-proj (&optional make-type)
+  "Run the full CEDET integration test.
+Optional argument MAKE-TYPE is the style of EDE project to test."
+  (interactive)
+
+  ;; Input check
+  (if (not (member make-type '("Make" "Automake")))
+      (error "Invalid make-type for test: %S" make-type))
+  (message "Running integration test of style %S" make-type)
+
+  ;; 1 a) build directories
+  ;;
+  (cit-make-dir cedet-integ-base)
+  (cit-make-dir cedet-integ-target)
+  ;; 1 c) make src and include directories
+  (cit-make-dir (cit-file "src"))
+  (cit-make-dir (cit-file "lib"))
+  (cit-make-dir (cit-file "include"))
+  (cit-make-dir (cit-file "uml"))
+  ;;
+  ;; 1 b) make a toplevel project
+  ;;
+  (find-file (expand-file-name "README" cedet-integ-target))
+  (ede-new make-type "CEDET_Integ_Test_Project")
+  ;; 1 d) Put C++ src into the right directories.
+  ;; 2 a) Create sources with SRecode
+  ;;
+  (cit-srecode-fill-cpp make-type)
+
+  ;; 5 a,b,c) UML code generation test
+  (cit-fill-uml make-type)
+
+  ;; 1 e) remove files from a project
+  (cit-remove-add-to-project-cpp)
+
+  ;; 1 f) remove files from a project
+  (cit-remove-and-do-shared-lib make-type)
+
+  ;; 2 e) srecode map manipulation
+  (cit-srecode-map-test)
+
+  ;; Do some more with Emacs Lisp.
+  (cit-srecode-fill-el make-type)
+
+  ;; Do some texinfo documentation.
+  (cit-srecode-fill-texi)
+
+  ;; Create a distribution
+  (find-file (expand-file-name "README" cedet-integ-target))
+  (cit-make-dist)
+
+  (cit-finish-message "PASSED" make-type)
+  )
+
+(defun cedet-integ-test-GNUStep ()
+  "Run the CEDET integration test using GNUStep style project."
+  (interactive)
+
+  ;; Do a EDE GNUstep-Make Project
+  (make-directory (concat cedet-integ-target "_ede_GSMake") t)
+  (find-file (expand-file-name "README" (concat cedet-integ-target "_ede_GSMake"))) ;; only to change dir
+  (let ((ede-auto-add-method 'always))
+    (cit-ede-step-test))
+
+  (cit-finish-message "PASSED" "GNUStep")
+  )
+
+(defun cit-finish-message (message style)
+  "Display a MESSAGE that some test is now finished.
+Argument STYLE is the type of build done."
+  (let ((b (set-buffer (get-buffer-create "*PASSED*"))))
+    (erase-buffer)
+    (insert "\n\n  PASSED!\n\n  Make Style: ")
+    (insert (format "%S" style) "\n")
+    (insert "\n\nWaiting 5 seconds before exiting with positive exit status.\n")
+    (switch-to-buffer b)
+    ;; Now wait.
+    (sit-for 5)
+    ;; 1 means GOOD to the shell script, since any other emacs exit
+    ;; mechanism will be 0. (ie - click on the X in the corner.)
+    (kill-emacs 1)
+    ))
+
+(defun cit-make-dir (dir)
+  "Make directory DIR if it doesn't exist."
+  (when (not (file-exists-p dir))
+    (make-directory dir)))
+
+(defun cit-file (filename)
+  "Return a testing filename.
+Append FILENAME to the target directory."
+  (expand-file-name filename cedet-integ-target))
+
+(defun cit-srecode-fill-with-stuff (filename tags &rest
+					     empty-dict-entries)
+  "Fill up FILENAME with some TAGS.
+Argument FILENAME is the file to fill up.
+Argument TAGS is the list of tags to insert into FILENAME.
+EMPTY-DICT-ENTRIES are dictionary entries for the EMPTY fill macro."
+  (let ((post-empty-tags nil)
+	)
+
+    ;;
+    ;; Fill up foo.h, header file with class in it.
+    ;;
+    (find-file (cit-file filename))
+    (srecode-load-tables-for-mode major-mode)
+    (condition-case nil
+	;; Protect against a font-lock bug.
+	(erase-buffer)
+      (error nil))
+    (apply 'srecode-insert "file:empty" empty-dict-entries)
+
+    (save-excursion
+      (goto-char (point-max))
+      (insert "\n\n"))
+
+    ;; 3 a) Parse the sources
+    (setq post-empty-tags (semantic-fetch-tags))
+
+    (sit-for 0)
+    ;;
+    ;; Add in our tags
+    ;;
+    (dolist (tag tags)
+
+      ;; 3 b) Srecode to make more sources
+      ;; 3 c) Test incremental parsers (by side-effect)
+      (let ((e (srecode-semantic-insert-tag tag))
+	    (code (semantic-tag-get-attribute tag :code)))
+      
+	(when code (insert code))
+
+	(goto-char e)
+	(sit-for 0)
+	)
+      )
+
+    (save-buffer)
+
+    ;; Make sure the tags we have are the same as the tags we tried
+    ;; to insert.
+    (cit-srecode-verify-tags (semantic-fetch-tags)
+			     tags
+			     post-empty-tags)
+
+
+    ))
+
+(defclass cit-tag-verify-error-debug ()
+  ((actual :initarg :actual
+	   :documentation
+	   "The actual value found in the buffer.")
+   (expected :initarg :expected
+	     :documentation
+	     "The expected value found in the buffer.")
+   )
+  "Debugging object for cit tag verifier.")
+
+(defun cit-srecode-verify-tags (actual expected &optional extra)
+  "Make sure the ACTUAL tags found in a buffer match those in EXPECTED.
+EXTRA tags might also be in the list, so don't fail if any tags in EXTRA
+are found, but don't error if they are not their."
+  (while actual
+    
+    (let ((T1 (car actual))
+	  (T2 (car expected)))
+
+      (cond
+       ((semantic-tag-similar-p T1 T2 :default-value)
+
+	(let ((mem1 (semantic-tag-components T1))
+	      (mem2 (semantic-tag-components T2)))
+
+	  (when (and (or mem1 mem2)
+		     (semantic-tag-p (car mem1)))
+	    (cit-srecode-verify-tags mem1 mem2))
+
+	  (setq expected (cdr expected)))
+	)
+
+	;;it might be in a list of extra tags???
+       ((semantic-tag-similar-p T1 (car extra) :default-value)
+
+	;; Don't check members.  These should be simple cases for now.
+	(setq extra (cdr extra))
+	)
+
+       (t ;; Not the same
+	(data-debug-new-buffer "*Test Failure*")
+	(data-debug-insert-thing
+	 (cit-tag-verify-error-debug "Dbg" :actual T1 :expected T2)
+	 ">" "")
+
+	(error "Tag %s does not match %s"
+	       (semantic-format-tag-name T1)
+	       (semantic-format-tag-name T2))
+	)
+       ))
+    
+    (setq actual (cdr actual))
+    ))
+
+(defun cit-compile-and-wait (&optional ARGS)
+  "Compile our current project, but wait for it to finish.
+Optional ARGS are additional arguments to add to the compile command,
+such as 'clean'."
+  (let ((bufftokill (find-file (cit-file "Project.ede"))))
+    ;; 1 f) Create a build file.
+    (ede-proj-regenerate)
+    ;; 1 g) build the sources.
+    (compile (concat ede-make-command (or ARGS "")))
+    
+    (cit-wait-for-compilation)
+
+    (kill-buffer bufftokill)
+    ))
+
+(defun cit-wait-for-compilation ()
+  "Wait for a compilation to finish."
+
+  (while compilation-in-progress
+    (accept-process-output)
+    (sit-for 1))
+
+  (save-excursion
+    (set-buffer "*compilation*")
+    (goto-char (point-max))
+
+    (when (re-search-backward " Error " nil t)
+      (error "Compilation failed!"))
+
+    )
+  )
+
+(defun cit-run-target (command)
+  "Run the program (or whatever) that is associated w/ the current target.
+Use COMMAND to run the program."
+  (let ((target ede-object)
+	(cnt 0))
+    ;; Run the target.
+    (project-run-target target command)
+    ;; Did it produce errors or anything?
+    (save-excursion
+      (set-buffer (ede-shell-buffer target))
+      (goto-char (point-min))
+      ;; Wait for prompt.
+      (unwind-protect
+	  (while (not (re-search-forward "MOOSE" nil t))
+	    (setq cnt (1+ cnt))
+	    (when (> cnt 10) (error "Program output not detected"))
+	    (sit-for .1))
+	;; Kill the buffer.
+	(kill-buffer (ede-shell-buffer target)))
+      )))
+
+(provide 'cedet-integ-test)
+;;; cedet-integ-test.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-cpp.el b/site/cedet-1.0pre7/tests/cit-cpp.el
new file mode 100644
index 0000000..391824e
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-cpp.el
@@ -0,0 +1,210 @@
+;;; cit-cpp.el --- C++ specific things for our integ test.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-cpp.el,v 1.8 2009/10/18 16:16:30 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; C++ specific code for the cedet integration tests.
+
+;;; Code:
+
+(defvar cit-header-cpp-tags
+  (list
+   (semantic-tag-new-type
+    "foo" "class"
+    (list
+     (semantic-tag "public" 'label)
+     (semantic-tag-new-function
+      "foo" '("foo" type (:type "class"))
+      (list (semantic-tag-new-variable "f" "int"))
+      :constructor-flag t)
+     (semantic-tag-new-function
+      "foo" "void" nil :destructor-flag t )
+     (semantic-tag-new-function
+      "doSomethingPublic" "void"
+      (list (semantic-tag-new-variable "ctxt" "int")
+	    (semantic-tag-new-variable "thing" "char"
+				       nil
+				       :pointer 1))
+      :prototype-flag t)
+     (semantic-tag-new-function
+      "setField1" "void"
+      (list (semantic-tag-new-variable "f" "int"))
+      :prototype-flag t)
+     (semantic-tag-new-function
+      "getField1" "int" nil
+      :prototype-flag t)
+     (semantic-tag "protected" 'label)
+     (semantic-tag-new-function
+      "doSomethingProtected" "void"
+      (list (semantic-tag-new-variable "ctxt" "int")
+	    (semantic-tag-new-variable "thing" "char"
+				       nil
+				       :pointer 1))
+      :prototype-flag t)
+     (semantic-tag "private" 'label)
+     (semantic-tag-new-variable
+      "Field1" "int")
+     )
+    nil)
+   )
+  "Tags to be inserted into a header file.")
+
+(defvar cit-src-cpp-tags
+  (list
+   (semantic-tag-new-include "foo.hh" nil)
+   (semantic-tag-new-function
+    "doSomethingPublic" "void"
+    (list (semantic-tag-new-variable "ctxt" "int")
+	  (semantic-tag-new-variable "thing" "char"
+				     nil
+				     :pointer 1))
+    :parent "foo")
+   (semantic-tag-new-function
+    "setField1" "void"
+    (list (semantic-tag-new-variable "f" "int"))
+    :parent "foo")
+   (semantic-tag-new-function
+    "getField1" "int" nil 
+    :parent "foo")
+   (semantic-tag-new-function
+    "doSomethingProtected" "void"
+    (list (semantic-tag-new-variable "ctxt" "int")
+	  (semantic-tag-new-variable "thing" "char"
+				     nil
+				     :pointer 1))
+    :parent "foo")
+   )
+  "Tags to be inserted into a source file.")
+
+(defvar cit-main-cpp-tags
+  (list
+   (semantic-tag-new-include "stdio.h" nil)
+   (semantic-tag-new-include "foo.hh" nil)
+   (semantic-tag-new-function
+    "main" "int"
+    (list (semantic-tag-new-variable "argc" "int")
+	  (semantic-tag-new-variable "argv" "char"
+				     nil
+				     :pointer 2 ))
+    :code "   printf(\"MOOSE\\n\");\n")
+   )
+  "Tags to be inserted into main.")
+
+
+(defun cit-srecode-fill-cpp (make-type)
+  "Fill up a base set of files with some base tags.
+MAKE-TYPE is the type of make process to use."
+
+  ;; 2 b) Test various templates.
+
+  (cit-srecode-fill-with-stuff "include/foo.hh" cit-header-cpp-tags)
+  (ede-new make-type "Includes")
+  ;; 1 e) Tell EDE where the srcs are
+  (ede-new-target "Includes" "miscellaneous" "n")
+  (ede-add-file "Includes")
+
+  (cit-srecode-fill-with-stuff "src/foo.cpp" cit-src-cpp-tags)
+  (ede-new make-type "Src")
+  ;; 1 e) Tell EDE where the srcs are
+  (ede-new-target "Prog" "program" "n")
+  (ede-add-file "Prog")
+
+  (cit-srecode-fill-with-stuff "src/main.cpp" cit-main-cpp-tags)
+  ;; 1 e) Tell EDE where the srcs are
+  (ede-add-file "Prog")
+
+  (let ((p (ede-current-project)))
+    (if (string= make-type "Automake")
+	(oset p :variables '( ( "AM_CPPFLAGS" . "-I../include") ))
+      (oset p :variables '( ( "CPPFLAGS" . "-I../include") )))
+    (ede-commit-project p)
+    )
+
+  ;; 1 g) build the sources.
+  (cit-compile-and-wait)
+
+  ;; 1 g.1) Run the compiled program.
+  (find-file (cit-file "src/main.cpp"))
+  (cit-run-target "./Prog")
+  )
+
+(defun cit-remove-add-to-project-cpp ()
+  "Remve foo.cpp from the current project.  Add in a new generated file."
+
+  (find-file (cit-file "src/foo.cpp"))
+  ;; Whack the file
+  (ede-remove-file t)
+  (kill-buffer (current-buffer))
+  (delete-file (cit-file "src/foo.cpp"))
+
+  ;; Make a new one
+  (cit-srecode-fill-with-stuff "src/bar.cpp" cit-src-cpp-tags)
+  (ede-add-file "Prog")
+  
+  ;; 1 g) build the sources.
+  ;; Direct compile to test that make fails properly.
+  (compile ede-make-command)
+  ;; @todo - verify make error status
+  (while compilation-in-progress
+    (accept-process-output)
+    (sit-for 1))
+
+  (cit-compile-and-wait)
+  )
+
+(defun cit-remove-and-do-shared-lib (make-type)
+  "Remove bar.cpp from the current project.
+Create a new shared lib with bar.cpp in it.
+Argument MAKE-TYPE is the type of make project to create."
+  (find-file (cit-file "src/bar.cpp"))
+  ;; Whack the file
+  (ede-remove-file t)
+  (kill-buffer (current-buffer))
+  (delete-file (cit-file "src/bar.cpp"))
+
+  ;; Create a new shared lib target, and add bar.cpp to it.
+  (find-file (cit-file "lib/bar.cpp"))
+  (cit-srecode-fill-with-stuff "lib/bar.cpp" cit-src-cpp-tags)
+  (ede-new make-type "Libs")
+  (ede-new-target "testlib" "sharedobject" "n")
+  (ede-add-file "testlib")
+
+  ;; 1 g) build the sources.
+  ;; Direct compile to test that make fails properly.
+  (compile ede-make-command)
+  ;; @todo - verify make error status
+  (while compilation-in-progress
+    (accept-process-output)
+    (sit-for 1))
+
+  (let ((p (ede-current-project)))
+    (if (string= make-type "Automake")
+	(oset p :variables '( ( "AM_CPPFLAGS" . "-I../include") ))
+      (oset p :variables '( ( "CPPFLAGS" . "-I../include") )))
+    (ede-commit-project p)
+    )
+
+  (cit-compile-and-wait)
+  )
+
+(provide 'cit-cpp)
+;;; cit-cpp.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-dist.el b/site/cedet-1.0pre7/tests/cit-dist.el
new file mode 100644
index 0000000..7915303
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-dist.el
@@ -0,0 +1,73 @@
+;;; cit-dist.el --- 
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-dist.el,v 1.2 2009/12/27 03:37:04 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Create a distribution, unpack it, and compile it somewhere.
+
+;;; Code:
+
+(defun cit-make-dist ()
+  "Create a distribution, and test that it exists."
+  ;; 6.a) Create the distribution
+  (ede-make-dist)
+  (cit-wait-for-compilation)
+
+  ;; Get the version number, then check for that file to exist.
+  (when (not (file-exists-p "CEDET_Integ_Test_Project-1.0.tar.gz"))
+    (error "Failed to create expected .tar.gz file."))
+
+  ;; 6.b) update the version number  
+  (cit-update-version)
+
+  ;; 6.c) make a new dist.  Verify version number.
+  (ede-make-dist)
+  (cit-wait-for-compilation)
+
+  ;; Get the version number, then check for that file to exist.
+  (when (not (file-exists-p "CEDET_Integ_Test_Project-2.1.tar.gz"))
+    (error "Failed to create expected .tar.gz file."))
+
+  ;; @TODO - test extraction and build somewhere else.
+  ;; 6.d)
+
+  )
+
+
+(defun cit-update-version ()
+  "Update the version number of the project.  Verify code changes."
+  ;; 6.b) update the version number.
+  (ede-update-version "2.1")
+
+  ;; Check it.
+  (let ((ver (oref (ede-toplevel) :version)))
+    (when (not (string= "2.1" ver))
+      (error "Version number did not update correctly.")))
+
+  ;; Force a rebuild with the new version number
+  (cit-compile-and-wait " Makefile")
+
+  )
+
+(provide 'cit-dist)
+
+;;; cit-dist.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-el.el b/site/cedet-1.0pre7/tests/cit-el.el
new file mode 100644
index 0000000..fc8f510
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-el.el
@@ -0,0 +1,125 @@
+;;; cit-el.el --- Elisp code generation for integration tests
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-el.el,v 1.3 2009/10/15 03:42:55 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; ELisp specific tests for SRecode and EDE.
+
+;;; Code:
+
+(defconst cit-el-tags
+  (list
+   (semantic-tag-new-variable "cit-spiffy-var" nil
+			      t)
+   (semantic-tag-new-variable "cit-spiffy-var-const" nil
+			      "'(1 2 3)" :constant-flag t)
+
+   (semantic-tag-new-function
+    "doSomething" nil
+    (list "arg1" "arg2")
+    :parent "elfoo"
+    :documentation "something for elfoo")
+
+   (semantic-tag-new-function
+    "niceMethod" nil
+    (list "arg1")
+    :parent "elfoo"
+    :documentation "Nice method on elfoo")
+
+   (semantic-tag-new-function
+    "niceMethod" nil
+    (list "arg1")
+    :parent "elbar"
+    :documentation "Method on elbar.")
+
+   (semantic-tag-new-function
+    "RegularFunction" nil
+    (list "arg1")
+    :documentation "Some boring old function.")
+
+   )
+  "Tags to be inserted into an Emacs Lisp file.")
+
+(defconst cit-el-tags-eieio
+  (list
+   (semantic-tag-new-include "eieio" nil)
+
+   (semantic-tag-new-type
+    "elfoo" "class"
+    (list
+     (semantic-tag-new-variable "Field1" nil "t" :documentation "First Field")
+     (semantic-tag-new-variable "Field2" nil "nil" :documentation "Second Field")
+     (semantic-tag-new-variable "Field3" nil "1" :documentation "Third Field")
+     (semantic-tag-new-variable "Field4" nil "\"Hi\"" :documentation "Fourth Field")
+     )
+    nil)
+
+   (semantic-tag-new-type
+    "elbar" "class"
+    (list
+     (semantic-tag-new-variable "Slot1" nil "nil" :documentation "First Slot")
+     (semantic-tag-new-variable "Slot2" nil "\"What\"" :documentation "First Slot")
+     (semantic-tag-new-variable "Slot3" nil "'(1 2 3)" :documentation "First Slot")
+     )
+    (list "elfoo"))
+   )
+  "Tags to be inserted into an Emacs Lisp file that supports EIEIO.")
+
+(defun cit-srecode-fill-el (make-type)
+  "Fill up a base set of files with some base tags.
+MAKE-TYPE indicates the makefile type being used."
+  ;;(interactive)
+ 
+  ;; 2 b) Test various templates.
+
+  (if (string= make-type "Automake")
+      (cit-srecode-fill-with-stuff "src/elfoo.el" cit-el-tags)
+    (cit-srecode-fill-with-stuff "src/elfoo.el" (append
+						 cit-el-tags
+						 cit-el-tags-eieio)))
+  ;; 1 e) Tell EDE where the srcs are
+
+  ;; Making the autoloads first should PREPEND, but Lisp should append.
+  ;; going in this order makes sure that happens.
+  (when (string= make-type "Make")
+    (ede-new-target "Auto" "emacs lisp autoloads" "n"))
+  (ede-new-target "Lisp" "emacs lisp" "n")
+  (ede-add-file "Lisp")
+
+  (cit-srecode-fill-with-stuff "src/elfoomode.el" nil)
+  (srecode-insert "file:major-mode"
+		  "MODESYM" "elfoo-mode"
+		  "MODENAME" "Ellfoo"
+		  "MODEEXTENSION" "elf")
+  (sit-for 0)
+  (ede-add-file "Lisp")
+  (save-buffer)
+
+  (oset ede-object :aux-packages '("eieio"))
+  (ede-commit-project (ede-current-project))
+
+  (cit-compile-and-wait)
+  )
+
+
+(provide 'cit-el)
+;;; cit-el.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-extra-cpp.srt b/site/cedet-1.0pre7/tests/cit-extra-cpp.srt
new file mode 100644
index 0000000..63453e7
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-extra-cpp.srt
@@ -0,0 +1,40 @@
+;; cit-extra-cpp.srt --- 
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-extra-cpp.srt,v 1.1 2008/02/24 18:21:37 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+set mode "c++-mode"
+set escape_start "{{"
+set escape_end "}}"
+
+set application "cit-test"
+
+context test
+
+template cit-test-template :blank :indent
+"A Template we need to test."
+----
+int moose() {
+  {{^}}
+}
+----
+
+
+;; end
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/tests/cit-gnustep.el b/site/cedet-1.0pre7/tests/cit-gnustep.el
new file mode 100644
index 0000000..d728681
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-gnustep.el
@@ -0,0 +1,123 @@
+;;; cit-gnustep.el --- Test EDE GNUstep Project
+
+;; Copyright (C) 2009 Eric M. Ludlam
+;; Copyright (C) 2008 "Marco (Bj) Bardelli"
+
+;; Author: Marco (Bj) Bardelli <bardelli.marco@gmail.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; EDE GNUstep for the cedet integration tests.
+
+;; TODO:
+;; - fix scanner mode (paths etc.)
+;; - maybe clean between compilations
+;; - test equivalence between modes, via diffing ProjStep.ede .
+;; - test RootProjStep.ede
+
+;;; Code:
+
+;(require 'ede-pmake "../ede/ede-pmake.el" t)
+(require 'ede-gnustep)
+
+(defvar cedet-integ-target-gnustep
+  (expand-file-name "edeproj_ede_GSMake" cedet-integ-base)
+  "Root of the EDE project integration tests.")
+
+(defun cit-ede-step-test ()
+  "Test EDE GNUstep-Make Project"
+
+  ;; Create file parts.
+  (cit-make-dir cedet-integ-target-gnustep)
+  (find-file (cit-step-file "main.c"))
+  (erase-buffer)
+  (insert
+   "#include <stdio.h>\nint main (){ printf(\"Hello CEDET!\"); }\n")
+  (save-buffer)
+
+  ;; Create the project and target in writer mode.
+  (ede-new "GNUstep-Make" "EDE GNUstep Integration Test, writer-mode")
+  (ede-new-target "test0" "tool" "n")
+  (ede-add-file "test0")
+  (ede-commit-project (ede-current-project))
+  (find-file "ProjStep.ede")
+  (ede-proj-regenerate)
+
+  ;; Test compilation
+  (cit-step-test-compilation)
+
+  ;; Rename ProjStep.ede to ProjStep.ede.writer
+  ;; to test scanner mode
+  (rename-file "ProjStep.ede" "ProjStep.ede.writer" t)
+
+  ;; To prevent cacheing of writer-mode project
+  (and (get-buffer "ProjStep.ede") (kill-buffer "ProjStep.ede"))
+  (and (get-buffer "edeproj_ede_GSMake") (kill-buffer "edeproj_ede_GSMake"))
+  (setq ede-projects nil)
+
+  (find-file cedet-integ-target-gnustep)
+  ;; Create the project and target in scanner mode.
+  (ede-new "GNUstep-Make in scanner mode"
+	   "EDE GNUstep Integration Test, scanner-mode")
+  (let ((ede-deep-rescan t))
+    (project-rescan (ede-current-project)))
+
+  ;; Test compilation
+  (cit-step-test-compilation)
+
+  ;; uncomment next-line to stop test and verify status
+  ;; of buffers etc. to verify cit.
+  ;(error t)
+  )
+
+(defun cit-step-test-compilation ()
+  "Test compilation, sitting for 1 second during compilation."
+  ;; test some stuff related to gnustep-make package, else use gcc.
+  (if (or
+       (getenv "GNUSTEP_MAKEFILES")
+       (not (equal "" (shell-command-to-string "which gnustep-config"))))
+      (ede-compile-project)
+    (progn
+      (message "I noticed that you didn't load `GNUstep.sh' for the GNUstep-Make Environment ... neither gnustep-make seems installed.")
+      (message "I'll compile this simple example via gcc ... but, use gnustep ... is better ;)")
+      (compile "sh -c \"gcc -o Prog main.c\"")
+
+      (while compilation-in-progress
+	(accept-process-output)
+	(sit-for 1))
+
+      (when (re-search-backward " Error " nil t)
+	(error "Compilation failed!"))
+      ;; (unless compilation-in-progress
+      ;; 	(kill-buffer "*compilation*"))
+      ))
+
+  ;; Let Compilation finish
+  (and compilation-in-progress
+       (switch-to-buffer-other-window "*compilation*"))
+  (while compilation-in-progress
+    (accept-process-output)
+    (sit-for 1)))
+
+(defun cit-step-file (filename)
+  "Return a testing filename.
+Append FILENAME to the target directory."
+  (expand-file-name filename cedet-integ-target-gnustep))
+
+
+(provide 'cit-gnustep)
diff --git a/site/cedet-1.0pre7/tests/cit-load.el b/site/cedet-1.0pre7/tests/cit-load.el
new file mode 100644
index 0000000..e1c6357
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-load.el
@@ -0,0 +1,58 @@
+;;; cit-load.el --- Configuration when running the integration tests.
+
+;; Copyright (C) 2008, 2009 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-load.el,v 1.5 2009/10/18 16:15:59 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Do a setup for running the integration tests.
+;;
+;; Disable various caches as needed to mimic a CEDET install that
+;; is bootstrapping up for the first time.
+
+;;; Code:
+
+(defvar cit-src-dir
+  (let ((dir (file-name-directory
+	      (or load-file-name (buffer-file-name)))))
+    (add-to-list 'load-path dir)
+    dir)
+  "Src dir to CIT testing suite.")
+
+(setq inhibit-splash-screen t)
+
+;; Fix bug in Emacs 21
+(when (< emacs-major-version 22)
+  (require 'semantic-c))
+
+;; Disables all caches related to semantic DB so all
+;; tests run as if we have bootstrapped CEDET for the
+;; first time.
+(setq-default semanticdb-new-database-class 'semanticdb-project-database)
+(message "Disabling existing Semantic Database Caches.")
+
+;; Disabling the srecoder map, we won't load a pre-existing one
+;; and will be forced to bootstrap a new one.
+(setq srecode-map-save-file nil)
+
+(require 'cedet-integ-test)
+
+(provide 'cit-load)
+;;; cit-load.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-srec.el b/site/cedet-1.0pre7/tests/cit-srec.el
new file mode 100644
index 0000000..88b7f6b
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-srec.el
@@ -0,0 +1,67 @@
+;;; cit-srec.el --- Test SRecode template mapping and such.
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-srec.el,v 1.1 2008/02/24 18:21:56 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; SRecode Testing
+
+;;; Code:
+
+(defun cit-srecode-map-test ()
+  "Test SRecode MAP path testintg."
+  (interactive)
+
+  (let ((extradir cit-src-dir)
+	(oldpath srecode-map-load-path))
+    (add-to-list 'srecode-map-load-path extradir)
+    (srecode-map-update-map t)
+
+    (srecode-load-tables-for-mode 'c++-mode)
+    (srecode-load-tables-for-mode 'c++-mode 'cit-test)
+
+    (unwind-protect
+	(when (not (srecode-template-get-table (srecode-table 'c++-mode)
+					       "cit-test-template"
+					       "test"
+					       'cit-test
+					       ))
+	  (error "Failed to find augmented template"))
+
+      ;; Get rid of our adaptation.  Double check.
+      (setq srecode-map-load-path oldpath)
+      (srecode-map-update-map t))
+
+;; This would be nice, but I'd have to purge and rebuild the table.
+;; to do it, which is a waste for a feature few would ever need.
+;;
+;;    (when (srecode-template-get-table (srecode-table 'c++-mode)
+;;				      "cit-test-template"
+;;				      "test"
+;;				      'cit-test
+;;				      )
+;;      (error "Failed to unload augmented template"))
+
+    ))
+
+
+(provide 'cit-srec)
+;;; cit-srec.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-test.sh b/site/cedet-1.0pre7/tests/cit-test.sh
new file mode 100755
index 0000000..89d1568
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-test.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+EMACS=${EMACS:-emacs};
+
+STYLE=$1;
+if [ -z $1 ]; then
+    STYLE=Make
+fi
+
+rm -r /tmp/CEDET_INTEG*
+
+if $EMACS -q -l ../common/cedet.el -l cit-load.el -f toggle-debug-on-error  -f toggle-debug-on-quit -f cedet-integ-test-${STYLE}; then
+    # Reverse the meaning of a 0 exit status, as the user had to quit Emacs
+    # but on success, the program kills emacs with 1 (to be different.)
+    exit 1;
+else
+    exit 0;
+fi
\ No newline at end of file
diff --git a/site/cedet-1.0pre7/tests/cit-texi.el b/site/cedet-1.0pre7/tests/cit-texi.el
new file mode 100644
index 0000000..5d001c5
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-texi.el
@@ -0,0 +1,96 @@
+;;; cit-texi.el --- testing Texinfo support.
+
+;; Copyright (C) 2008 Eric M. Ludlam
+
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-texi.el,v 1.1 2008/02/24 02:58:59 zappo Exp $
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Texinfo srecode/semantic testing.
+
+;;; Code:
+
+(defconst cit-doc-tags
+  (list
+   (semantic-tag-new-variable "cit-spiffy-var" nil
+			      "'(1 2 3 4)")
+   (semantic-tag-new-function
+    "RegularFunction" nil
+    (list (semantic-tag-new-variable "arg1" "nil"))
+    :documentation "Some boring old function.")
+
+   )
+  "List of tags to insert into a texinfo document.")
+
+(defconst cit-section-tags
+  (list
+   (semantic-tag
+    "@value{TITLE}" 'section
+    :members
+    (list
+     (semantic-tag "cit-spiffy-var" 'def)
+     (semantic-tag "RegularFunction" 'def)
+
+     (semantic-tag
+      "About Foo" 'section
+      :members
+      (list
+       (semantic-tag "Sub About Foo" 'section)))
+
+     (semantic-tag "Index" 'section)
+     ))
+   )
+  "Eventual tags we expect.")
+
+(defun cit-srecode-fill-texi ()
+  "Fill up a base set of files with some base tags."
+  (interactive)
+ 
+  ;; 2 b) Test various templates.
+
+  (cit-srecode-fill-with-stuff "src/foodoc.texi" cit-doc-tags
+			       "NAME" "All about the FOO.")
+
+  (re-search-forward "@menu\n")
+  (sit-for 0)
+  (srecode-texi-add-menu "About Foo")
+  (sit-for 0)
+
+  (srecode-semantic-insert-tag (semantic-tag "" 'menu))
+  (sit-for 0)
+
+  (srecode-texi-add-menu "Sub About Foo")
+  (sit-for 0)
+
+  (save-buffer)
+
+  (cit-srecode-verify-tags (semantic-fetch-tags)
+			   cit-section-tags)
+  
+  ;; 1 e) Tell EDE where the srcs are
+  (ede-new-target "Doc" "info" "n")
+  (ede-add-file "Doc")
+
+  (cit-compile-and-wait)
+  )
+
+
+
+(provide 'cit-texi)
+;;; cit-texi.el ends here
diff --git a/site/cedet-1.0pre7/tests/cit-uml.cgr b/site/cedet-1.0pre7/tests/cit-uml.cgr
new file mode 100644
index 0000000..322aac0
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-uml.cgr
@@ -0,0 +1,53 @@
+;; Object /home/zappo/cedet/tests/cit-uml
+;; EIEIO PERSISTENT OBJECT
+(cogre-base-graph "/home/zappo/cedet/tests/cit-uml"
+  :file "/home/zappo/cedet/tests/cit-uml.cgr"
+  :name "/home/zappo/cedet/tests/cit-uml"
+  :elements (list 
+   (cogre-class "CIT_Baseclass"
+    :position [27 0]
+    )
+   (cogre-class "CIT_Noodle"
+    :position [9 10]
+    )
+   (cogre-class "CIT_Bacon"
+    :position [29 10]
+    )
+   (cogre-class "CIT_Bread"
+    :position [47 10]
+    )
+   (cogre-class "CIT_Toast"
+    :position [47 20]
+    )
+   (cogre-class "CIT_Elbow"
+    :position [2 20]
+    )
+   (cogre-class "CIT_Spiral"
+    :position [18 20]
+    )
+   (cogre-inherit "Name"
+    :start "CIT_Spiral"
+    :end "CIT_Noodle"
+    )
+   (cogre-inherit "Name1"
+    :start "CIT_Elbow"
+    :end "CIT_Noodle"
+    )
+   (cogre-inherit "Name2"
+    :start "CIT_Bacon"
+    :end "CIT_Baseclass"
+    )
+   (cogre-inherit "Name3"
+    :start "CIT_Noodle"
+    :end "CIT_Baseclass"
+    )
+   (cogre-inherit "Name4"
+    :start "CIT_Bread"
+    :end "CIT_Baseclass"
+    )
+   (cogre-inherit "Name5"
+    :start "CIT_Toast"
+    :end "CIT_Bread"
+    )
+   )
+  )
diff --git a/site/cedet-1.0pre7/tests/cit-uml.el b/site/cedet-1.0pre7/tests/cit-uml.el
new file mode 100644
index 0000000..35670b2
--- /dev/null
+++ b/site/cedet-1.0pre7/tests/cit-uml.el
@@ -0,0 +1,77 @@
+;;; cit-uml.el --- Test COGRE as a part of the CEDET suite.
+;;
+;; Copyright (C) 2009 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; X-RCS: $Id: cit-uml.el,v 1.2 2009/08/08 21:53:08 zappo Exp $
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Use COGRE as part of the Cedet integration tests.
+;;
+;; Create a graph, generate code, and compile that code.  Use Semantic to validate
+;; that we created the correct objects.
+
+;;; Code:
+(defvar cit-uml-cogre-file "cit-uml.cgr"
+  "The file read in for a COGRE diagram.")
+
+;; We need some sort of main.
+(defvar cit-uml-main-cpp-tags
+  (list
+   (semantic-tag-new-function
+    "main" "int"
+    (list (semantic-tag-new-variable "argc" "int")
+	  (semantic-tag-new-variable "argv" "char"
+				     nil
+				     :pointer 2 )))
+   )
+  "Tags to be inserted into main.")
+
+(defun cit-fill-uml (make-type)
+  "Fill a buffer with code based on a UML representation."
+  
+  ;; 5 a) Read in the cogre UML file.
+  ;; It should automatically switch to cogre mode.
+  (find-file (locate-library "cit-uml.cgr"))
+  (sit-for 0)
+
+  ;; 5 b) Generate code for the graph.
+  (cogre-export-code (cit-file "uml/umltest.cpp"))
+  (sit-for 0)
+  (save-buffer)
+
+  ;; 5 c) Compile sources.
+  ;;  This needs a few EDE steps.
+  (ede-new make-type "UML")
+  (ede-new-target "UML" "program" "n")
+  (ede-add-file "UML")
+
+  ;; Need some sort of main for a successful compilation step.
+  (cit-srecode-fill-with-stuff "uml/main.cpp" cit-uml-main-cpp-tags)
+  (ede-add-file "UML")
+
+  (ede-commit-project (ede-current-project))
+
+  (cit-compile-and-wait)
+  )
+
+
+
+(provide 'cit-uml)
+;;; cit-uml.el ends here
diff --git a/site/ecb-2.40/Makefile b/site/ecb-2.40/Makefile
new file mode 100644
index 0000000..42d854e
--- /dev/null
+++ b/site/ecb-2.40/Makefile
@@ -0,0 +1,257 @@
+# This Makefile byte-compiles the ECB lisp files and generates online-help.
+
+# Copyright (C) 2000 - 2005 Jesper Nordenberg,
+#                           Klaus Berndl,
+#                           Kevin A. Burton,
+#                           Free Software Foundation, Inc.
+
+# Author: Jesper Nordenberg <mayhem@home.se>
+#         Klaus Berndl <klaus.berndl@sdm.de>
+#         Kevin A. Burton <burton@openprivacy.org>
+# Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+#             Kevin A. Burton <burton@openprivacy.org>
+# Keywords: browser, code, programming, tools
+# Created: 2001
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+
+# You should have received a copy of the GNU General Public License along with
+# GNU Emacs; see the file COPYING.  If not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# $Id: Makefile,v 1.114 2009/05/15 15:19:53 berndl Exp $
+
+
+# ========================================================================
+# User configurable section
+
+# ------------------------------------------------------------------------
+# Byte-compiling ECB:
+# ------------------------------------------------------------------------
+
+# Define here the correct path to your Emacs or XEmacs binary. Ensure you
+# have set this variable to 'xemacs' if you want byte-compile with XEmacs!
+EMACS=emacs
+
+# In the following path-settings of this section use always FORWARD-SLASHES
+# as directory-separator even with MS Windows systems.
+
+# -------- Compiling ECB with the cedet-library 1.0 ----------------------
+
+# cedet >= 1.0 (contains a.o. semantic >= 2.0, eieio >= 0.18 and speedbar
+# >= 0.15). Set here the full path to the cedet-installation directory.
+
+CEDET=c:/Programme/emacs-22.3/site-lisp/package-development/cedet
+
+# You can set here more load-paths to arbitrary packages if you want. But
+# this is really not necessary!
+LOADPATH=
+
+# Two ways to build ECB:
+# - Call "make" to byte-compile the ECB. You can savely ignore the messages.
+# - Or call
+#
+#      make EMACS="path/to/emacs"
+#
+#      or
+#
+#      make CEDET="path/to/cedet"
+#
+#   if you want to set either different load-paths or Emacs-binary and
+#   you do not want edit the Makefile. Do not forget quoting the arguments
+#   if they contain spaces!
+#
+# If there are any warning messages during byte-compilation (normally there
+# are not any) you can savely ignore them!
+
+
+# ------------------------------------------------------------------------
+# Generating different online-help formats
+# ------------------------------------------------------------------------
+
+# If you want to generate all formats of online-help from the texi-source
+# you must set here the FULL paths to the required tools. The Makefile
+# tests if the tools are available on these locations, so if a tool x is
+# not available let the related setting X empty! NOTE: For generating the
+# PDF-format you will need an installed TeX and Ghostscript!
+MAKEINFO=/usr/bin/makeinfo
+TEXI2DVI=/C/Programme/texmf/miktex/bin/texi2dvi
+# You need either the dvipdfm-tool
+#DVIPDFM=/C/Programme/texmf/miktex/bin/dvipdfm
+DVIPDFM=
+# or the tools dvips and ps2pdf. If dvipdfm is available the Makefile uses
+# this one!
+DVIPS=/C/Programme/texmf/miktex/bin/dvips
+PS2PDF=/C/home/bin/ps2pdf
+
+# To generate the online-formats just call "make online-help" for info- and
+# HTML-format and "make pdf" for PDF-format.
+
+# ------------------------------------------------------------------------
+# Installing the info online-help in the Top-directory of (X)Emacs-info
+# ------------------------------------------------------------------------
+
+# Set here the path of the info subdirectory of your (X)Emacs installation
+# which contains the dir file.
+EMACSINFOPATH=/C/Programme/emacs-22.3/info
+
+# If you want to install the info-format of the online-help in the
+# Top-directory of the info-directory of (X)Emacs (see above EMACSINFOPATH)
+# then you must specify the full path of the tool install-info.
+INSTALLINFO=/usr/bin/install-info
+
+# To install the online-help just call "make install-help"
+
+# end of user configurable section
+# ========================================================================
+
+
+# ========================================================================
+# !!!!!!!!!!!!!!!!!!!!! Do not change anything below !!!!!!!!!!!!!!!!!!!!!
+# ========================================================================
+
+
+# $Id: Makefile,v 1.114 2009/05/15 15:19:53 berndl Exp $
+
+# For the ECB-maintainers: Change the version-number here and not
+# elsewhere!
+ecb_VERSION=2.40
+#ecb_VERSION=2.32
+
+include ecb-makedef.mk
+
+ecb: $(ecb_LISP_EL)
+	@echo "Byte-compiling ECB with LOADPATH=${LOADPATH} ..."
+	@$(RM) $(ecb_LISP_ELC) ecb-compile-script
+	@echo "(add-to-list 'load-path nil)" > ecb-compile-script
+	@if test ! -z "${CEDET}"; then\
+	   echo "(load-file \"$(CEDET)/common/cedet.el\")" >> ecb-compile-script; \
+	fi
+	@if test ! -z "${LOADPATH}"; then\
+	   for loadpath in ${LOADPATH}; do \
+	      echo "(add-to-list 'load-path \"$$loadpath\")" >> ecb-compile-script; \
+	   done; \
+	fi
+	@echo "(require 'ecb)" >> ecb-compile-script
+	@echo "(setq debug-on-error t)" >> ecb-compile-script
+	$(EBATCH) -l ecb-compile-script --eval '(ecb-byte-compile t)'
+	@$(RM) ecb-compile-script
+
+all: ecb online-help
+
+online-help: $(ecb_TEXI)
+	@if test -x "$(MAKEINFO)"; then\
+	   $(RM) -R $(ecb_INFO_DIR) $(ecb_HTML_DIR); \
+	   $(MKDIR) $(ecb_INFO_DIR) $(ecb_HTML_DIR); \
+	   echo Generating info-format...; \
+	   $(MAKEINFO) --fill-column=78 $<; \
+	   $(MV) *.info* $(ecb_INFO_DIR); \
+	   echo Generating html-format...; \
+	   $(MAKEINFO) --html --output=$(ecb_HTML_DIR) $<; \
+	   for file in $(ecb_HTML_DIR)/*.html; do\
+	      $(MV) $$file tmpfile; \
+	      sed "s/index\\.html/$(ecb_HTML)/g" tmpfile > $$file; \
+	      $(RM) tmpfile; \
+	   done; \
+	   $(MV) $(ecb_HTML_DIR)/index.html $(ecb_HTML_DIR)/$(ecb_HTML); \
+	else \
+	   echo No info- and html-format generating because the tool; \
+	   echo - makeinfo in $(MAKEINFO); \
+	   echo is not available!; \
+	fi
+
+pdf: $(ecb_TEXI)
+	@if test -x "$(TEXI2DVI)" -a -x "$(DVIPDFM)"; then\
+	   $(RM) $(ecb_DVI) $(ecb_PDF); \
+	   echo Generating pdf-format with dvipdfm ...; \
+	   $(TEXI2DVI) --clean $<; \
+	   $(DVIPDFM) $(ecb_DVI); \
+	   $(RM) $(ecb_DVI); \
+	elif test -x "$(TEXI2DVI)" -a -x "$(DVIPS)" -a -x "$(PS2PDF)"; then\
+	   $(RM) $(ecb_DVI) $(ecb_PS) $(ecb_PDF); \
+	   echo Generating pdf-format with dvips and ps2pdf ...; \
+	   $(TEXI2DVI) --quiet --clean $<; \
+	   $(DVIPS) -Pcmz -q $(ecb_DVI) -o $(ecb_PS); \
+	   $(PS2PDF) $(ecb_PS); \
+	   $(RM) $(ecb_DVI) $(ecb_PS); \
+	else \
+	   echo No pdf-format generating because at least one of the tools; \
+	   echo - texi2dvi in $(TEXI2DVI); \
+	   echo - dvips in $(DVIPS); \
+	   echo - ps2pdf in $(PS2PDF); \
+	   echo is not available!; \
+	fi
+
+
+install-help: $(ecb_INFO_DIR)/$(ecb_INFO)
+	@if test -x "$(INSTALLINFO)" -a -f "$(EMACSINFOPATH)/dir"; then\
+	   echo Installing the Online-help in $(EMACSINFOPATH)...; \
+	   $(CP) $(ecb_INFO_DIR)/*info* $(EMACSINFOPATH); \
+	   $(INSTALLINFO) $< $(EMACSINFOPATH)/dir; \
+	else \
+	   echo Can not install the online-help because either; \
+	   echo - the tool $(INSTALLINFO) or; \
+	   echo - the file $(EMACSINFOPATH)/dir; \
+	   echo is not available!; \
+	fi
+
+
+clean:
+	@$(RM) $(ecb_LISP_ELC) ecb-compile-script
+
+# The targets below are only for maintaining the ECB-package.
+
+$(ecb_INFO_DIR)/$(ecb_INFO): online-help
+
+# updates RELEASE_NOTES, README, NEWS, ecb.texi and ecb.el to the
+# version-number of $(ecb_VERSION).
+prepversion:
+	@$(MV) RELEASE_NOTES RELEASE_NOTES.tmp
+	@sed "1s/version.*/version $(ecb_VERSION)/" RELEASE_NOTES.tmp > RELEASE_NOTES
+	@$(RM) RELEASE_NOTES.tmp
+	@$(MV) README README.tmp
+	@sed "1s/version.*/version $(ecb_VERSION)/" README.tmp > README
+	@$(RM) README.tmp
+	@$(MV) NEWS NEWS.tmp
+	@sed "1s/version.*/version $(ecb_VERSION)/" NEWS.tmp > NEWS
+	@$(RM) NEWS.tmp
+	@$(MV) ecb-upgrade.el ecb-upgrade.el.tmp
+	@sed "s/^(defconst ecb-version.*/(defconst ecb-version \"$(ecb_VERSION)\"/" ecb-upgrade.el.tmp > ecb-upgrade.el
+	@$(RM) ecb-upgrade.el.tmp
+	@(echo "/@macro ecbver";		\
+	  echo "+";				\
+	  echo "c";				\
+	  echo "$(ecb_VERSION)";		\
+	  echo ".";				\
+	  echo "w";				\
+	  echo "q") | ed -s $(ecb_TEXI) 1> /dev/null
+
+
+autoloads:
+	@$(RM) $(ecb_AUTOLOADS) $(ecb_AUTOLOADS)c
+	$(EBATCH) -l ecb-autogen -f ecb-update-autoloads
+
+
+# builds the distribution file $(ecb_VERSION).tar.gz
+distrib: $(ecb_INFO_DIR)/$(ecb_INFO) prepversion autoloads ecb
+	@$(RM) ecb-$(ecb_VERSION).tar.gz
+	@$(RM) -R ecb-$(ecb_VERSION)
+	@$(MKDIR) ecb-$(ecb_VERSION)
+	@$(CP) $(ecb_DISTRIB_FILES) ecb-$(ecb_VERSION)
+	@$(CP) -r $(ecb_INFO_DIR) ecb-$(ecb_VERSION)
+	@$(CP) -r $(ecb_HTML_DIR) ecb-$(ecb_VERSION)
+	@$(CP) -r $(ecb_IMAGE_DIR) ecb-$(ecb_VERSION)
+	@find ecb-$(ecb_VERSION)/$(ecb_IMAGE_DIR) -name CVS -print | xargs rm -Rf
+	@find ecb-$(ecb_VERSION)/$(ecb_IMAGE_DIR) -name *~ -print | xargs $(RM)
+	@find ecb-$(ecb_VERSION)/$(ecb_IMAGE_DIR) -name *.png -print | xargs $(RM)
+	@tar -cvzf ecb-$(ecb_VERSION).tar.gz ecb-$(ecb_VERSION)
+	@$(RM) -R ecb-$(ecb_VERSION)
+
+# End of Makefile
diff --git a/site/ecb-2.40/NEWS b/site/ecb-2.40/NEWS
new file mode 100644
index 0000000..4b4d133
--- /dev/null
+++ b/site/ecb-2.40/NEWS
@@ -0,0 +1,3024 @@
+* Changes for ECB version 2.40
+
+** ECB now requires full CEDET-suite being installed (at least version 1.0pre6)
+
+   This means the support for the single packages semantic 1.4.X, eieio 0.X
+   and speedbar 0.X is completely switched off.
+
+   As a consequence ECB is no longer runnable as XEmacs-package via the
+   package-manager of XEmacs. This is because CEDET is not available as
+   XEmacs-package. Therefore ECB can also not be run as XEmacs-package. If
+   CEDET will later become a XEmacs-package then probably ECB will come back
+   as XEmacs-package. But in the meanwhile you have to install ECB "by hand".
+
+   In general the current CEDET is much more powerful than older
+   semantic-versions and ECB uses this power, especially the power of the
+   semantic-analyzer.
+
+** Completely reworked synchronizing mechanism of the ECB-windows
+
+   Now there are separate options for synchronizing:
+
+   - The basic ECB-windows (directories, sources, methods, history):
+     `ecb-basic-buffer-sync', `ecb-basic-buffer-sync-delay' and
+     `ecb-basic-buffer-sync-hook'.
+   - The analyser-window (s.a.): `ecb-analyse-buffer-sync',
+     `ecb-analyse-buffer-sync-delay' and `ecb-analyse-buffer-sync-hook'
+   - The symboldef-window: `ecb-symboldef-buffer-sync',
+     `ecb-symboldef-buffer-sync-delay' and `ecb-symboldef-buffer-sync-hook'
+   - The integrated speedbar (if used): `ecb-speedbar-buffer-sync',
+     `ecb-speedbar-buffer-sync-delay' and `ecb-speedbar-buffer-sync-hook'
+   - The integrated eshell-support (if used): `ecb-eshell-buffer-sync',
+     `ecb-eshell-buffer-sync-delay' and `ecb-eshell-buffer-sync-hook'
+
+   But all options for synchronizing not the basic ECB-windows offer an
+   additional choice 'basic: Then ECB uses the setting of the related option
+   for the basic ECB-windows! Example: If you set `ecb-eshell-buffer-sync' to
+   'basic then the value of `ecb-basic-buffer-sync' is used. If you set
+   `ecb-eshell-buffer-sync-delay' to 'basic then the value of
+   `ecb-basic-buffer-sync-delay' is used.
+
+   This enhancement allows much more control for the synchronizing of certain
+   windows.
+     
+** Better compatibility with CEDET >= 1.0pre6 and semantic >= 2.0pre6
+
+*** The ECB-analyse-window now works very well with current semantic analyzer
+    There is an own synchronize-option-set for the analyse-window:
+    `ecb-analyse-buffer-sync', `ecb-analyse-buffer-sync-delay' and
+    `ecb-analyse-buffer-sync-hook'. See the docstrings. The advantage is, that
+    now the synchronizing of the analyse-window can be customized separately
+    from the other ECB-windows. THis is important because for the
+    analyse-window a higher delay (or even disabled auto.synchronizing)
+    increases usability a lot. See the info-manual.
+    
+*** Fix compatibility about some changes of semantic concerning adopting
+    external member-functions (as in C++ or eieio).
+
+*** ECB now works very well with semantic-idle-scheduler-mode (s.a.)
+
+** More user-responsible buffer-parsing based on the idle-mechanism of semantic
+
+   Force a reparse of the semantic-source if the idle-scheduler is off.
+   Generally ECB calls semantic to get the list of tags for current
+   source-file of current edit-window. Per default ECB does never
+   automatically force a reparse of the source-file - this is only done on
+   demand by calling `ecb-rebuild-methods-buffer'. So per default the
+   idle-scheduler of semantic is responsible for reparsing the source-file and
+   when this is necessary (see `semantic-idle-scheduler-mode' for further
+   details). This is the most user-resonsible and therefore the recommended
+   approach.
+
+   So it's strongly recommended to enable `semantic-idle-scheduler-mode'
+   because then reparsing is always done during idle-time of Emacs and is also
+   interruptable.
+
+   But if this idle-scheduler is switched off then ECB offers now two
+   possibilities (via `ecb-force-reparse-when-semantic-idle-scheduler-off'):
+   
+   - Not forcing itself a reparse when tags are needed by ECB: then a user
+     declines knowingly Emacs/semantic-driven parsing of code when he/she
+     switches off the idle-mode of semantic. This is the default behavior of
+     ECB and the default value of this option. But this has also the
+     consequence that the methods-buffer is only filed on demand via
+     `ecb-rebuild-methods-buffer' (bound to \[C-c . r])!
+
+     This means also in consequence that the methods-buffer is not
+     automatically filled when a source-file is opened but first on demand
+     after calling the command `ecb-rebuild-methods-buffer'!
+     
+   - Forcing a reparse when tags are needed: Then ECB forces semantic to parse
+     the source-file when ECB needs tags to display. For this behavior this
+     option has to be set to not nil.
+
+   The term "forcing a reparse by semantic" is a simplification: ECB uses then
+   the function `semantic-fetch-tags' which can decide that the cached tags
+   are up-to-date so no real reparsing is necessary - but it can also run a
+   full reparse and this reparse is not being done when Emacs is idle but
+   immediatelly and not interruptable (as with the idle-scheduler of
+   semantic), which can be quite annoying with big source-files.
+
+** Complete reworked history-buffer
+
+*** The history is able to deal with indirect-buffer entries.
+    See new option `ecb-history-stick-indirect-buffers-to-basebuffer'.
+
+*** The history can now be bucketized, see new `ecb-history-make-buckets'.
+    This option allows to define several criterias for building buckets in the
+    history-buffer all the history entries are sorted in (e.g. by major-mode,
+    directory, file-extension or regular expressions).
+
+    You can change the bucketizing type on the fly via the popup-menu of the
+    history-window.
+
+    The regular expressions bucketizing allows in combination with the
+    indirect-buffer ability to work with something like "virtual folders"
+    (well, "virtual folders" light).
+
+    For example, there is a large project with a huge number of files, and
+    there are various tasks in this project. So it could be convenient to
+    group buffers according to various tasks. It could be fulfiled through
+    using indirect buffers, for example like this
+
+       task_1-aaa.pl
+       task_1-bbb.c
+       task_1-ccc.sh
+       ...
+       task_N-xxx.java
+       task_N-ccc.sh
+
+    This means create indirect buffers with a name-part which can be used for
+    grouping together buffers with same name-part (here e.g. task_1- ...
+    task_N-). In the example above you would create two indirect buffers for
+    the filebuffer ccc.sh, one named task_1-ccc.sh, the other named
+    task_N-ccc.sh).
+
+    Then use the new option `ecb-history-make-buckets' to define regexps for
+    bucketizing all (indirect) buffers according their task-part in the
+    buffer-name.
+
+*** There are now new faces for the history entries.
+    See new options `ecb-history-bucket-node-face',
+    `ecb-history-dead-buffer-face' and `ecb-history-indirect-buffer-face' and
+    equaly named new faces.
+
+** Sticky parent-node for all special ECB-windows of type tree-buffer
+
+   Only for GNU Emacs: in the header-line of a tree-buffer always the
+   current-parent node of the first visible node is displayed (if there is a
+   parent node). This sticky node is exactly in the same manner clickable as
+   all other nodes. There is a new option `ecb-tree-make-parent-node-sticky'
+   which enabales/disables this new feature (default is enabled).
+
+** Much saver advice-backbone for all advices needed by ECB
+
+   This is not a user-visible change but enhances the stability of ECB by
+   using now a new advice-backbone which guarantes that all ecb-advices are
+   enabled rsp. disabled correctly depending on the surrounding context.
+   Introducing four new macros `defecb-advice-set', `defecb-advice',
+   `ecb-with-original-adviced-function-set' and `ecb-with-ecb-advice'.
+
+** Changes in the version control support of ECB
+
+*** ECB now also offers version control support only if the current vc-package is
+    installed which offers support for modern vc-backends like subversion, git
+    and monotone.
+    Because vc-package lacks having a version number which can be checked ECB
+    uses the following check if the right vc-package is installed:
+    (locate-library "vc-svn") must return not nil.
+   
+*** New support for Git and Monotone as version-control systems
+    If Git rsp. Monotone are supported by VC (means vc-git.el rsp. vc-mtn.el
+    are distributed with Emacs) then ECB supports now both of them out of the
+    box.
+
+*** `ecb-vc-supported-backends' offers now also a accurate recompute-state function
+    This is by offering `ecb-vc-recompute-state' as an alias to the function
+    `vc-recompute-state' as state-check function for this option.
+
+*** CVS-support is now fully compatible with Emacs 22 and 23
+
+** New options rsp. commands
+
+*** New command `ecb-goto-window-edit-by-smart-selection'
+
+*** New command `ecb-goto-window-ecb-by-smart-selection'
+
+*** New option `ecb-ignore-pop-up-frames'
+    The new option is for customizing the behavior of ECB concerning
+    `pop-up-frames'. It allows three value: Always, only when a permanent
+    compile-window is used and never. This makes ECB fully compatible with the
+    option `pop-up-frames'.
+
+** Much better compatibility with current Emacs-versions
+
+*** Full compatibility with Gnu Emacs 22
+
+**** `balance-windows' now works with Emacs 22 too
+     Cause of the completely new implemantation based on `window-tree' ECB
+     uses a new machanism for enabling balance-windows to work properly with
+     active ECB, so only the edit-windows are balanced but all ecb-windows
+     remain on their sizes.
+
+**** view-mode works also when a permanent compile-window is active
+     This is especially important for displaying help and completions.
+
+**** `master-mode' now works with Emacs 22
+
+**** Grepping from ECB now uses per default `lgrep' rsp. `rgrep'.
+
+***** The option `ecb-grep-function' defaults to `lgrep' if available
+      If not it tries `igrep' or 'grep'.
+
+***** `ecb-grep-find-function' has been renamed to `ecb-grep-recursive-function'
+      It defaults to `rgrep' if available. If not it tries `igrep-find' or
+      `grep-find'. The old value is automatically upgraded to the new option
+      name.
+
+**** Fixed problems with `ecb-fix-window-size' and active compile-windows
+     With Emacs >= 22 the bugs of Emacs 21.3.X concerning `window-size-fixed'
+     are fixed by the Emacs-team so now ECB supports this feature also with
+     active compile-window.
+
+**** Fixed small lack in the `switch-to-buffer-other-window'-advice.
+     In Emacs 22 this command ignores the settings in `same-window-*'. Now ECB
+     adopts this behavior also for its adviced version so the command works
+     in a smart manner optimized for ECB.
+
+*** Much better compatibility with forthcoming Gnu Emacs 23
+
+**** Removed an annoying behavior which has set the mark hundred of times even
+     when the user just moves the cursor.
+    
+     This comes from a change within Emacs 23 and the function `goto-line'
+     which sets the mark in Emacs 23. This is not necessary when not used as
+     command but as internal utility. Now ECB uses its own goto-line-function
+     which does not set the mark --> No unnecessary mark settings with Emacs
+     23.
+
+**** The adviced `display-buffer' is now fully compatible with Emacs 23
+     This means simply that you can work with ECB and Emacs 23 as you expect.
+
+     Especially for displaying temporary buffers (like completion, help,
+     compilation etc.) this means: Gnu Emacs 23 has a much smarter
+     window-manager for displaying temporary buffers (like help-buffers) and
+     "compile"-buffers. Therefore ECB uses completely the logic of Emacs 23
+     and does exactly what Emacs 23 would do without activated ECB: This means
+     mainly that the split-behavior depends on the settings of the options
+     `split-width-threshold' and `split-height-threshold'.
+      
+     So if you are wondering why displaying temporary-buffers (like help,
+     compile, grep, completion etc.) shows different behavior compared to
+     deactivated ECB, then you probably have to adjust the values of the
+     options `split-width-threshold' and `split-height-threshold' so they
+     matches the sizes of the edit-area of ECB (at least nearly).
+
+**** Fixing some incompatibilities with Emacs 23 concerning using temp. buffers
+
+     The fit-window-to-buffer version of Emacs 23 can destroy windows and is
+     therefore not useable within ECB - now ECB has its own - stolen and
+     adapted from Emacs 22.
+  
+     In addition to this the internal help-window-manager of Emacs 23 (a.o.
+     responsible for displaying *Help*-buffers) chooses sometimes dedicated
+     windows (which is a problem because ECB uses dedicated windows for its
+     own special ECB-windows) whereas Emacs 22 doesn't do this. Now ECB works
+     smoothly with Emacs 23 help-system. Same for view-mode.
+
+**** ediff-support of ECB is now also fully compatible with Emacs 23
+
+     Emacs 23 uses dedicated windows: Now ECB can deal with frame-layouts where
+     some windows are neither an ecb-, edit- nor a compile-window. Therefore
+     now also single-frame mode (see `ediff-windows-setup-function') of ediff
+     wirks smoothly with ECB.
+
+**** All this together makes the new layout-engine of ECB much more robust so ECB
+     works smoothly with forthcoming Emacs 23.
+    
+*** Better compatibility with XEmacs 21.4 and XEmacs 21.5
+
+    Compatibility has been increased but is still not perfect. There is a need
+    for much more tests with XEmacs. This can not been done by the
+    ECB-maintainer because it costs too much effort. Any help from
+    XEmacs-gurus using ECB for their daily work is very appreciated.
+
+** ECB is able to work with indirect buffers if the base-buffer is filebased
+
+   Now you can work with indirect-buffers as well as with normal file-buffers,
+   i.e. indirect buffers are shown in the history“, their contents are
+   displayed in the methods-buffer, the ECB-analyse-buffer works with them,
+   autom. synchronizing the ECB-tree-buffers works for them etc...
+
+** Deprecated, disabled and deactivated features:
+    
+*** The commands `ecb-download-ecb' and `ecb-download-semantic' are deactivated
+    These features are not supported anymore. It costs two much effort to keep
+    the needed links and mechanism to the sourceforge-download-area up to date.
+    Please download the needed release-archives and extract and install as
+    described in the shipped README rsp. INSTALL-files.
+
+** Fixed Bugs
+
+*** Fixed a bug which displayed empty tag-names in the methods-buffer when font-lock
+    is not loaded.
+
+*** Fixed a bug in the ping-functionality
+    Now `ecb-ping-options' has a new default value which should operate well
+    on most os.
+
+*** Fixed a bug which prevented `ecb-rebuild-methods-buffer' from working
+    correctly
+
+*** Fixed a bug in the internals of the methods-filter which prevented
+    all commands `ecb-methods-filter-*' from working correctly.
+
+*** Fixed context-menu for VC-operations in the sources- and history-window
+    Now all vc-commands are called interactively by ECB.
+
+*** Fixed a bug with the ECB-navigation feature (C-c . p and C-c . n)
+    Now the commands `ecb-nav-goto-next' and `ecb-nav-goto-previous' work
+    saver and also for indirect buffers.
+
+*** Fixed small bugs with synchronizing current tag with highlighted tag
+    in the methods buffer. This was when the buffer was reparsed with
+    `semantic-idle-scheduler-mode' or after saving the buffer.
+
+*** Fixed a bug in `ecb-create-new-layout' which has displayed wrong modelines
+    in the layout-creation frame.
+    
+*** Fixed a bug in `ecb-submit-problem-report' which prevented it from working
+
+
+* Changes for ECB version 2.32
+
+** New backbone-add-on of ECB for getting the definition of the symbol at point
+
+   It allows to display in a new special ECB-window the semantic (do not
+   confuse this term with the semantic-library!) context of the definition of
+   the current symbol under point. Per default ECB tries to find this context
+   via semanticdb (part of cedet) and etags (shipped with (X)Emacs) but in
+   general this is completely customizable; see the options of the new
+   options-group "ecb-symboldef".
+
+   Either use the layout "left-symboldef" (e.g. via [C-c . l c]) or create a
+   new ecb-layout via the command `ecb-create-new-layout' and add a buffer of
+   type "other" and name "symboldef" into this new layout.
+
+   This add-on interactior can be seen as a "backbone" infrastructure, because
+   it is/should be highly customizable how to get the definition of the symbol
+   at point (e.g. via semanticdb or etags or whatever).
+
+   Thanks to Hauke Wintjen <hauke.jans@tietoenator.com> for having the idea
+   and writing the first implementation
+
+   This add-on ECB-window of ECB is currently in beta or gamma stage but works
+   already quite well. So please try it out and send feedback to the
+   ECB-mailing-list. Every suggestion is highly appretiated!
+
+** New native ECB-window (tree-buffer) for the semantic-analyzer
+   There is a new tree-buffer ECB-analyse which displays the tags and
+   informations of the semanic-analyzer in a smooth way. There are already new
+   prebuild layouts "left-analyse" and "leftright-analyse" which contain this
+   new tree-buffer ECB-window. But of course it can be added to own build
+   layouts - either via the command `ecb-create-new-layout' (add a buffer of
+   type "other" and name "analyse" into the new layout) or via a
+   elisp-programmed new layout.
+   
+** New smart-arrow-navigation in a tree-buffer with up- and down-arrow
+   Point jumps to the first character of the previous (up) rsp. next node
+   (down). "First" character means either the first character of the
+   expand-symbol (in case `ecb-tree-expand-symbol-before' is not nil) or of
+   the displayed node-name. Or with other words: The first non-indentation and
+   non-guide-line (see `ecb-tree-buffer-style') character of a node.
+
+   Left- and right-arrow were already smart - see the existing option
+   `ecb-tree-navigation-by-arrow'.
+	 
+** Better handling of maximized ecb-windows
+
+*** Smarter handling of node-selections in maximized tree-windows
+
+    Now the default behavior of ECB is:
+
+    Maximized directories-window: When selecting a directory then first
+    automatically the maximized directories-window will be "minimized" (i.e.
+    all ecb-windows of current layout are displayed) if the current layout
+    contains a sources-buffer and no sources are shown in the
+    directories-window. So the source-files can be displayed in the
+    sources-window.
+    
+    Maximized sources- or history-window: When selecting a source-file in one of
+    these buffers then first automatically the maximized window will be
+    "minimized" (i.e. all ecb-windows of current layout are displayed) if the
+    current layout contains a methods-buffer. So the tag-contents of the
+    selected source-file can be displayed in the methods-window.
+
+    For a even smarter behavior ECB introduces a new option
+    `ecb-maximize-next-after-maximized-select' which automatically maximizes
+    the next logical tree-window after a node selection. The definition of
+    "next logical is": Directories --> sources, sources/history --> methods.
+    See the docstring of this new option for more detailled informations.
+    
+    Thanks for suggestion to Michael Reiher.
+    
+*** Easier maximizing and "minimizing"
+    ECB supports the default modeline-mechanisms for deleting other windows.
+    GNU Emacs binds `mouse-2' in its modeline to `delete-other-window'. XEmacs
+    binds a popup-menu with some window commands to `button-3' in its
+    modeline.
+
+    ECB combines the best of both worlds by supporting both of these
+    mechanisms for both Xemacs and Emacs: ECB binds a toggle-command to
+    `mouse-2' in the modeline of each tree-buffer which maximizes the current
+    tree-window if all ECB-windows are visible and displays all ECB-windows if
+    current tree-window is maximized. In addition ECB binds a popup-menu to
+    `mouse-3' which offers exactly 2 commands: Maximizing current tree-window
+    and displaying all ECB-windows.
+   
+** Renamed options or options with new type
+   The following options have been renamed:
+   ecb-truncate-lines --> ecb-tree-truncate-lines
+
+   The following options have now a new type:
+   ecb-tree-RET-selects-edit-window
+   ecb-tree-image-icons-directories
+
+   ECB automatically upgrades the old values to the new options!
+
+** Better assistance fixing errors related to semantic-load problems
+   Often users report errors somehow related to problems running ECB with the
+   right semantic-version. There are different reasons for this:
+   - People do not install the cedet-suite as described in the INSTALL-file of
+     cedet.
+   - People byte-compile ECB with another semantic (also eieio and speedbar)
+     version than loaded into Emacs.
+   All of them prevent ECB from working correctly.
+
+   Now ECB detects the error at startup-time and assists the user in finding
+   the reason of the problem and how to fix it.
+
+** More robust downloading of new ECB from within Emacs
+   Now `ecb-download-ecb' should work also with native Windows-XEmacs and also
+   when ECB is installed in a directory which name contains spaces. If there
+   are still problems in running this command please check the new options
+   `ecb-wget-setup', `ecb-gzip-setup' and `ecb-tar-setup'.
+
+** Support for (X)Emacs < 21 has been officialy removed.
+   ECB requires now (X)Emacs >= 21. ECB stops activation with an appropriate
+   error-message when (X)Emacs < 21 is detected.
+
+** Full documentation of the library tree-buffer.el
+   The ECB-info-manual contains a new section "tree-buffer" in the chapter
+   "Entry points for elisp-programers". This describes in detail how to
+   program with the library tree-buffer.el which is shipped with ECB.
+
+** Fixed Bugs
+
+*** Version-controlled (VC) and not-VC history-entries are now sorted
+    correctly according the setting in `ecb-history-sort-method'.
+
+*** Handles not anymore existing files in the stealthy tasks.
+    If a stealthy task detects that a displayed file does not exist anymore it
+    removes this source-file from the tree-displays.
+
+*** Fixed a bug when `ecb-process-non-semantic-files' is set to nil.
+    This bug only occurs with XEmacs. As a side effect of this fix now the
+    methods-buffer is correctly cleared out when loading a
+    non-semantic-sourcefile (i.e. not parsable by semantic) and processing of
+    non-semantic-files is switched off (`ecb-process-non-semantic-files' is
+    set to nil) or the sourcefile is not parsable by a parser like imenu or
+    etags/ctags.
+
+*** Fixed a bug in displaying semantic-tags which have plain-string members
+    E.g. parsing `defstruct' has failed in previous ECB-version cause of this
+    bug.
+
+*** Fixed a bug when Emacs is started with -q so Emacs could not determine the
+    `custom-file'. This case is correctly handled now.
+
+
+
+* Changes for ECB version 2.31
+
+** Fixed bugs
+
+*** Fixed a recently introduced bug with XEmacs and an active isearch.
+    This bug occured when a user has clicked onto a node in a tree-buffer
+    during an active isearch and it had as result completely out-of-order
+    tree-buffers. This buf is now fixed and should never occur.
+
+*** Fixed a bug concerning accessing root-drives in native window-XEmacs
+    Fixes an annoying behavior of the native windows-version of XEmacs: When a
+    path contains only a drive-letter and a : (e.g. C:) then
+    `expand-file-name' (and a lot of other file-operations) do not interpret
+    this path as root of that drive. So ECB adds temporary a trailing
+    `directory-sep-char' and calls file-operations like `expand-file-name'
+    with this new path because then `expand-file-name' treats this as root-dir
+    of that drive. For all (X)Emacs-version besides the native-windows-XEmacs
+    this fix is not needed and takes no effect.
+
+*** Better recognizing of remote CVS-root-repositories for the VC-support
+
+** Enhancement for the VC-support
+
+*** New option `ecb-vc-xemacs-exclude-remote-cvs-repository'
+    This excludes directories with a remote cvs-repository from VC-check. This
+    option takes only effect for XEmacs and is needed cause of the outdated
+    VC-package of XEmacs which offers no heuristic state-checking and also no
+    option `vc-cvs-stay-local'. So this option takes only effect if
+    `vc-cvs-stay-local' is not avaiable. In this case ECB treats directories
+    which are managed by CVS but have a remote repository as if the directory
+    would not being managed by CVS (so the files are not checked for their
+    VC-state). This is done to avoid blocking XEmacs cause of running full
+    cvs-commands (e.g. ``cvs status'') for a bunch of files over the net.
+
+*** Added beta-support for Clearcase
+    There is already an identify-backend-function `ecb-vc-dir-managed-by-CC'
+    and a check-state-function `ecb-vc-check-CC-state' and an advice for
+    `clearcase-sync-from-disk' which enable automatic state-update after
+    checkin/out. These code seems to work quite well but nevertheless there
+    are some problems so this Clearcase-support is not added per default to
+    `ecb-vc-supported-backends'.
+
+    So if you want Clearcase-support you have to customize the option
+    `ecb-vc-supported-backends' and add these functions mentioned above (the
+    advice of `clearcase-sync-from-disk' takes only effect if the function
+    `ecb-vc-dir-managed-by-CC' can be found in `ecb-vc-supported-backends' and
+    ECB is active!). But use it at your own risk. Of course the best would be
+    if a lot of people would test this Clearcase-support and fix the
+    encountered problems ;-). Thanks to David Ostrovsky for providing a first
+    implementation!
+
+
+
+* Changes for ECB version 2.30.1
+
+** Enhancement to the automatic option-upgrading mechanism
+   ECB now automatically makes a backup-file of that file which will be
+   modified by storing the upgraded rsp. renamed ECB-options. This backup file
+   gets a unique name by adding a suffix ".before_ecb_<version>" to the name
+   of the modified file. If such a file already exists ECB adds a unique number
+   to the end of the filename to make the filename unique.
+   This is a safety mechanism if something fails during storing the upgraded
+   options, so you never lose the contents of your customization-file!
+    
+** Enhancement to the VC-support
+
+*** Better recomputing of the VC-state of a file when state changed outside
+    With the new check-state-function `ecb-vc-state' the heuristic state is
+    always computed right which is especially useful if the state for a file
+    has been changed outside Emacs (e.g. by checking in from command line or
+    Windows Explorer). This function is now added to the default-value of
+    `ecb-vc-supported-backends' for GNU Emacs.
+
+*** Added out-of-the-box support for VC-system Subversion
+    For this the latest version of the VC-package incl. the library vc-syn.el
+    is needed. Latest CVS Emacs contains this VC-version. The new function
+    `ecb-vc-dir-managed-by-SVN' is now added to the default-value of
+    `ecb-vc-supported-backends'. Thanks for first implementation to Ekkehard
+    Görlach <ekkehard.goerlach@pharma.novartis.com>.
+
+** Fixed bugs
+
+*** Fixed errors occured at load-time of ECB 2.30
+
+
+
+* Changes for ECB version 2.30
+
+** Enhancements to the file-browser
+
+*** Much better performance of the file-browser display because all
+    time-consuming tasks (like the check if the displayed directories are
+    empty of not) are now performed "stealthy" - means when Emacs is idle.
+    Each stealthy task is interruptable by the user just by hitting any key or
+    clicking the mouse so Emacs/ECB will not be blocked by such tasks; next
+    time Emacs is idle again the interrupted task automatically proceeds from
+    the state it has been interrupted. There is a new macro `defecb-stealthy'
+    which can be used by a user to program own stealthy tasks.
+
+    Currently ECB performs three stealthy tasks:
+
+       Prescann directories for emptyness: Prescann directories and display
+       them as empty or not-empty in the directories-buffer. See the
+       documentation of the option `ecb-prescan-directories-for-emptyness' for
+       a description.
+     
+       File is read only: Check if sourcefile-items of the directories- or
+       sources-buffer are read-only or not. See documentation of the option
+       `ecb-sources-perform-read-only-check'.
+     
+       Version-control-state: Checks the version-control-state of files in
+       directories which are managed by a VC-backend. See the option
+       `ecb-vc-enable-support'.
+
+    There is also a new option `ecb-stealthy-tasks-delay'.
+
+    There are three options which allow excluding certain directories from
+    these stealthy tasks: `ecb-prescan-directories-exclude-regexps',
+    `ecb-read-only-check-exclude-regexps' and last but not least
+    `ecb-vc-directory-exclude-regexps'.
+
+*** ECB is now capable of handling remote paths.
+    "Remote" means file- or directory-paths in the sense of TRAMP, ANGE-FTP or
+    EFS. Such paths can now being added to the option `ecb-source-path' with
+    no limitation compared to "local" paths. Just work with remote-paths in
+    the same manner as with local paths. See also the additional choices of
+    the options `ecb-prescan-directories-for-emptyness',
+    `ecb-sources-perform-read-only-check' and `ecb-vc-enable-support' (new).
+    This new support is tested with the combinations GNU Emacs+TRAMP and
+    XEmacs+EFS but it should (hopefully) also work with all other
+    combinations. Thanks a lot to Tomas Orti for beta-testing!
+
+*** ECB displays the Version-control-state of a file in the tree-buffers.
+    There are four new options `ecb-vc-enable-support',
+    `ecb-vc-supported-backends', `ecb-vc-directory-exclude-regexps' and
+    `ecb-vc-state-mapping' which define if and how ECB should check the state
+    of a sourcefile in a directory managed by a version-control system. By
+    default ECB supports the same VC-backends as the builtin VC-support of
+    Emacs: CVS, RCS and SCCS. But the option `ecb-vc-supported-backends'
+    allows to add support for arbitrary VC-backends (e.g. Clearcase). New
+    image-icons are also included for a cute display of the VC-state in the
+    directories, sources and history-buffer. Thanks to Markus Gritsch
+    <gritsch@iue.tuwien.ac.at> for contributing the icons.
+
+    It's recommended to read the section "Version-control support" in the
+    chapter "Tips and Trick" of the ECB-info-manual!
+
+*** New hook which runs directly after the selected directory has changed.
+    See documentation of `ecb-after-directory-change-hook'.
+    
+** The popup-menu of the methods-browser allows precisely expanding of the
+   current node. This means you can precisely expand a certain node to an
+   exact indentation level relative to the node. This means all subnodes <=
+   this level will be expanded (full recursive expanding is therefore of
+   course also possible) and all subnodes indented deeper than this level will
+   be collapsed - this is very different from using the expand/collapse symbol
+   of a node. For forther details and examples the the manual and the section
+   "Expanding" and here the subsection "Explicit expanding of the current node
+   to a certain level".
+
+** Automatically upgraded ecb-option-settings are now not saved by default.
+   This means that ECB has now the new policy "Never touching the
+   customization-files of a user without asking". The result is a completely
+   redesigned upgraded-options-buffer: Now at the bottom of this buffer
+   (displayed by `ecb-display-upgraded-options') two clickable buttons [Save]
+   and [Cancel] are displayed which give the user the choice between saving
+   the upgraded options for future Emacs-sessions ot just to cancel this
+   buffer. In the latter case ECB has also upgraded the not compatible or
+   renamed options (as listed in the displayed upgraded-options-buffer) but
+   they will be not saved, i.e. no customization-file is touched and the
+   changed and upgraded values will be lost after quiting Emacs.
+
+** With XEmacs ECB temporary sets `progress-feedback-use-echo-area' to t
+   This is necessary because otherwise the progress-display with native
+   widgets modifies the window-sizes of ECB and does not exactly restore the
+   window-sizes as before that progress-display. Deactivating ECB
+   automatically restores the old value of this option.
+   
+** Fixed bugs
+
+*** Fixed resizing of the ecb-windows after opening a file
+    Sometimes (X)Emacs (the behavior has only been reported for XEmacs)
+    resizes the ecb-windows after opening a file by clicking onto a sourcefile
+    or calling `find-file' (or similar functions). This is not a bug of ECB
+    but nevertheless it is annoying for the ECB-users. Therefore ECB has now a
+    workaround which prevents the ecb-windows from resizing. The work around
+    is done via two simple advices of `find-file' and `find-file-other-window'.
+
+*** Fixed a bug in the upgrading feature (command `ecb-download-ecb') which has
+    occured when the user has set a different LOKALE (e.g. "de_DE@euro").
+
+*** Fixed a bug in restoring sizes of the ecb-windows.
+    Now a check will be performed if there are ecb-windows visible. If not
+    nothing will be done (versions < 2.30 have failed in such a case).
+    This bug has prevented ediff from working together with ECB when a
+    compile-window was visible and the user has stored window-sizes for the
+    current layout.
+
+
+
+* Changes for ECB version 2.27
+
+** The option `ecb-auto-expand-tag-tree-collapse-other' now has three possible
+   choices. You can decide between auto-collapsing only when point stays onto
+   a tag in the edit-window or even when point doesn't stay onto a tag (which
+   then results in a full collapsed methods-buffer). ECB autom. upgrades the
+   old setting of this option to the new type. Thanks to Javier Oviedo
+   <joviedo@telogy.com> for the suggestion.
+
+** Not accessible directories are displayed in a different face in the
+   directory-browser. See the new option `ecb-directory-not-accessible-face'
+   and the new face with same name.
+   
+** Enhancements to the permanent compile-window
+   
+*** Enlarging the compile-window does not destroy some ecb-windows
+    With previous versions of ECB enlarging the permanent compile-window has
+    often destroyed some ecb-windows if the compile-window has occupied a
+    large portion of the frame-height (e.g. half of the frame). Beginning with
+    ECB 2.27 such a ecb-window-damage is either prevented or - if it still
+    occurs (can not be prevented in all situations) - ECB now has a
+    "self-healing"-mechanism which immediatelly repairs the layout via
+    idle-checks if the current window-layout is correct for the current
+    `ecb-layout-name'. Conclusion: Enlarging or shrinking the compile-window
+    should never damage the ecb-windows! Thanks to Javier Oviedo
+    <joviedo@telogy.com> for a great problem-report!
+
+    Caution: If bytecompiled user-defined layouts are used (ie. the file,
+    which contains the user-defined layouts is byte-compiled) then you MUST
+    recompile this file with ECB 2.27 active!
+
+*** Now `ecb-store-window-sizes' and `ecb-restore-window-sizes' also work when
+    called during a permanent compile-window is visible and also when these
+    commands are called with another compile-window state than the other (e.g.
+    when the window-sizes are stored without a compile-window and restored
+    with a compile-window).
+
+*** Now ECB ensures that the permanent compile-window has always its specified
+    size when shrinked either by Emacs/ECB or by the command
+    `ecb-toggle-compile-window-height'.
+
+*** Now ECB ensures that all ecb-windows have always either their default or
+    stored size size after the compile-window has been shrinked either by
+    Emacs/ECB or by the command `ecb-toggle-compile-window-height'.
+
+*** ECB takes into account the new Emacs-option `grep-window-height' when it
+    compute the max. allowed size of its permanent compile-window. More
+    generally spoken: It takes into account all options with name
+    *-window-height defined for modes which are defined by the macro
+    `define-compilation-mode'. This mechanism is available in the forthcoming
+    Emacs 21.4 (and of course with current CVS-Emacs 21).
+    
+** Fixed Bugs
+
+*** Added a workaround for a bug in the custom-library of current release 21.3
+    of GNU Emacs which causes under certain circumstances the autom.
+    option-upgrading-feature of ECB to fail. Same for the command
+    `ecb-store-window-sizes'. Thanks for reporting this annoying bug and great
+    help to Christoph Ludwig <cludwig@cdc.informatik.tu-darmstadt.de>
+
+
+
+* Changes for ECB version 2.26
+
+** Improved the performance of the directories-buffer-display
+   Reduced the need of completely rebuilding the whole directories-tree-buffer
+   when just switching between buffers and the related directories are already
+   expanded. This can dramatically increase the speed of the tree-buffer
+   display when displaying the sources-files in the directories-buffer (see
+   `ecb-show-sources-in-directories-buffer'). Thanks to Rob Walker
+   <rob.lists@tenfoot.org.uk> for tracking down the performance bottleneck and
+   supplying a first patch.
+
+** Per default all mouse-actions in the special ECB-buffers are now triggered
+   first after releasing the mouse-button and not when pressed as with
+   previous ECB-versions. This is the standard behavior of Emacs and of most
+   applications. But with the new option `ecb-tree-mouse-action-trigger' a
+   user can switch back to the old behavior.
+
+   As a side effect now the ECB-tree-buffers can be used during an active
+   isearch - at least with GNU Emacs. Thanks to Markus Gritsch
+   <gritsch@iue.tuwien.ac.at> for pointing to this problem.
+
+** ECB sets autom. temp-buffer-resize-mode rsp. temp-buffer-shrink-to-fit when
+   needed. This modes are needed when a permanent compile-window is used
+   because otherwise the correct sizing of the compile-window according to the
+   settings in ecb-compile-window-temporally-enlarge and
+   ecb-enlarged-compilation-window-max-height is not possible. After disabling
+   the permanent compile-window or when deactivating ECB the original settings
+   of these modes are restored!
+      
+** Some regexp-options has been changed to regexp-list-options:
+   `ecb-excluded-directories-regexp' --> `ecb-excluded-directories-regexps'
+   `ecb-source-file-regexps'         --> `ecb-source-file-regexps'
+   `ecb-exclude-parents-regexp'      --> `ecb-exclude-parents-regexps'
+
+   All these options now accept (and require) a list of regexps instead of
+   exactly one big regexp. This allows easier regexp-definition and follows
+   now the way Emacs goes with other regexp-options like `same-window-regexps'
+   or `special-display-regexps' which are also lists of regexps.
+
+   ECB autom. upgrades your old settings to the new option-types rsp. also
+   -names (if the option has been renamed).
+
+** New option `ecb-history-exclude-file-regexps' for excluding certain files
+   from being displayed in the history-buffer of ECB. Currently the filenames
+   TAGS and semantic.cache are excluded per default. Thanks to Javier Oviedo
+   <joviedo@telogy.com> for the suggestion.
+
+** ECB now displays read-only sourcefiles in a different face.
+   For this a new option and a new face are offered both named
+   `ecb-source-read-only-face' (default: italic) which is used to display
+   source-files in the sources-tree-buffer (or in the directories-tree-buffer
+   if `ecb-show-sources-in-directories-buffer' is not nil) if the file is
+   read-only.
+       
+** Fixed bugs
+
+*** Fixed merging faces with XEmacs.
+    Now options like `ecb-type-tag-display' (merges own ECB-faces to already
+    by semantic faced tags) work also correct with XEmacs. ECB-versions prior
+    to 2.26 has not merged the ECB-faces to the already applied faces of a
+    text but instead replaced the applied faces with the ECB ones. Now all
+    faces are merged.
+
+*** Now the command `ecb-expand-methods-nodes' and all the expand-* menu-entries
+    in the popup-menu of the methods-buffer work for non-semantic-buffers too.
+
+*** Fixed a bug concerning `ecb-auto-expand-tag-tree-collapse-other'.
+    Thanks to Javier Oviedo <joviedo@telogy.com> for pointing to the problem.
+
+*** Handles not existing source-paths in `ecb-source-path' correct.
+    These paths are now ignored with a warning.
+
+    
+
+* Changes for ECB version 2.25
+
+** More flexible sorting of the Sources- and the History-buffer
+
+*** `ecb-sort-history-items' has been renamed to `ecb-history-sort-method'
+    and offers now the same choices as the already existing option
+    `ecb-sources-sort-method'.
+
+*** Two new options `ecb-sources-sort-ignore-case' and
+    `ecb-history-sort-ignore-case' which allow to ignore case when sorting the
+    Sources- and/or the History-buffer. Thanks for suggestion to Markus
+    Gritsch <gritsch@iue.tuwien.ac.at>. Per default case is now ignored.
+
+** New icons for parent-display in the Methods-buffer.
+   Thanks to Markus Gritsch <gritsch@iue.tuwien.ac.at> for contributing the
+   icon-images.
+
+** Fixed Bugs
+
+*** Fixed an annoying bug which results sometimes in an error "stack-overflow
+    error in equal" when using `senator-try-expand-semantic' which is called
+    when you use hippie-expand for example. Maybe the bug occured also in
+    other situation but now this bug has been extirpated!
+
+*** Fixed a bug in the mechanism which prescanes directories for emptyness.
+    Now a directory is checked if it is accessible before it is prescanned -
+    otherwise the prescan could fail with an error.
+
+*** Fixed a bug in the autom. option-upgrading-mechanism.
+    Thanks to Javier Oviedo <joviedo@telogy.com> for pointing to the
+    underlying problem.
+
+
+
+* Changes for ECB version 2.24
+
+** Enhancements for the Methods-buffer
+   
+*** Enhancements to the icon-display in the Methods-buffer
+
+**** New icon-images for enumerations and abstract/virtual tags (interfaces are
+     currently displayed with the icon for abstract classes - at least til
+     someone provides special icons ;-)
+
+**** Some slightly fixes in the other icons - e.g. a better display with a
+     not-white background
+
+**** Static and abstract tags are no longer underlined rsp. italic when icons are
+     displayed because this is somehow "tautological" when a special static
+     rsp. abstract icon is already displayed.
+
+*** New option for switching on/off distinction of function-prototypes from the
+    real function-definitions: `ecb-methods-separate-prototypes'. This is
+    useful for C++ and C because these languages distinct between a
+    method-prototype (rsp. function-prototype for C) and the method (rsp.
+    function for C) itself. If this option is not nil (default) then ECB
+    separates the prototypes from the real function/methods in the
+    Methods-buffer.
+
+*** New "current-type"-filter for the Methods-buffer
+    In languages which have types (like Java or C++) this filter displays only
+    the current type and all its members \(e.g. attributes and methods). The
+    current-type is either the type of the current tag in the source-buffer or
+    the type of the current node in the methods-buffer. If ECB can not
+    identify the current type in the source-buffer or in the methods-window
+    then nothing will be done.
+    
+** Now directories are prescanned for emptyness so they are displayed as empty
+   in the directories-buffer even without user-interaction (i.e. in previous
+   ECB-versions the emptyness of a directory has been first checked when the
+   user has clicked onto a directory). ECB optimizes this check as best as
+   possible but if a directory contains a lot of subdirectories which contain
+   in turn a lot of entries, then expanding such a directory or selecting it
+   takes of course more time as without this check - at least at the first
+   time (all following selects of a directory uses the cached information if
+   its subdirectories are empty or not). Therefore this feature can be
+   switched of via the new option `ecb-prescan-directories-for-emptyness'.
+
+** Fixed Bugs
+
+*** Fixed some newly introduced bugs which made ECB 2.23 incompatible with
+    semantic 1.4.
+
+*** Fixed a bug which changed the highlighted directory even after just expanding
+    or collapsing other directories.
+
+*** Fixed two small bugs which have influenced `ecb-create-new-layout'
+
+    
+
+* Changes for ECB version 2.23
+
+** New cedet1.0beta2 is supported.
+
+** Enhancements for the Methods-buffer
+
+*** The look&feel of the Methods-buffer is now much nicer because it has been
+    polished with a lot of new icons. ECB contains now a lot of new icons for
+    displaying the Method-buffer as pretty and professional as possible. The
+    new default-value of the option `ecb-tree-image-icons-directories' points
+    autom. to the new icon-images. Thanks a lot to Markus Gritsch
+    <gritsch@iue.tuwien.ac.at> for providing these new icons.
+
+    To use this you should reset the option `ecb-tree-image-icons-directories'
+    to the new default-value if you have customized this option!
+
+    You can disable this icon-display via the new option
+    `ecb-display-image-icons-for-semantic-tags' if you do not like the new
+    icons. 
+
+*** New feature for applying default tag-filters for certain files.
+    The new option `ecb-default-tag-filter' allow to define default
+    tag-filters for certain files which are applied automatically after
+    loading such a file into a buffer. The possible filters are the same as
+    offered by the command `ecb-methods-filter' and they are applied in the
+    same manner - the only difference is they are applied automatically. The
+    files can be specified on a combined major-mode- and
+    filename-regexp-basis.
+
+    Usage-example: This can be used to display for outline-mode files (e.g.
+    NEWS) in the Methods-buffer only the level-1-headings by defining a
+    regexp-filter "^\* .*" (see the default-value of this new option).
+
+*** New keybindings and commands for faster applying certain tag-filters.
+    Here are the new bindings:
+    [C-c . fr] --> `ecb-methods-filter-regexp'
+    [C-c . ft] --> `ecb-methods-filter-tagclass'
+    [C-c . fp] --> `ecb-methods-filter-protection'
+    [C-c . fn] --> `ecb-methods-filter-nofilter'
+    [C-c . fl] --> `ecb-methods-filter-delete-last'
+    [C-c . ff] --> `ecb-methods-filter-function'
+
+*** The popup-menu contains now mode-dependend tag-filter entries.
+    This means for sources not supported by semantic no protection- or
+    tag-class filters will be offered. And for semantic-supported sources
+    exactly these tag-classes are offered the semantic-parser for the current
+    major-mode offers. Same for the command `ecb-methods-filter'. For example
+    texi-sources can only be filtered by the tag-classes "Definitions" and
+    "Sections" and java-sources can be filtered by "Methods", "Variables",
+    "Classes" etc. In general the semantic-variable
+    `semantic-symbol->name-assoc-list' is used to get the right tag-classes.
+
+*** The option `ecb-show-tags' is now defined on a major-mode-basis.
+    This means you can have different settings for each major-mode. ECB autom.
+    upgrades your old setting to the new option-type.
+
+*** Distinction between functions and function-prototypes in the Methods-buffer
+    This is for example useful for C++ and C because these languages distinct
+    between a method-prototype (rsp. function-prototype for C) and the method
+    (rsp. function for C) itself. The new default value of `ecb-show-tags'
+    displayes per default the methods as flattened and the method-prototype as
+    collapsed when opening a C- or C++-buffer. ECB autom. updates your old
+    setting of this option to the new default value.
+
+** The command `ecb-toggle-layout' now has a prefix-argument:
+   If this optional argument is not nil (e.g. if called with a prefix-arg)
+   then always the last selected layout was choosen regardless of the setting
+   in `ecb-toggle-layout-sequence'. The last selected layout is always that
+   layout which was current direct before the most recent layout-switch. So
+   now a user can switch to another layout via `ecb-change-layout' [C-c . l c]
+   and always come back to his previous layout via [C-u C-c . l t].
+
+** Better internal self-monitoring of ECB
+   ECB now monitors itself when Emacs is idle, ie. it monitors if all
+   necessary ecb-functions are still member of the hooks `post-command-hook'
+   and `pre-command-hook'. This is because Emacs resets these hooks to nil if
+   any of the contained hook-functions fails with an error-signal. The
+   ECB-hook-functions are error-save but if any of the "other" hook-functions
+   of these hooks fail then the ECB-hooks would also have been removed from
+   these hooks. The new monitoring-mechanism checks this periodically and
+   re-adds the ECB-hooks if necessary.
+
+** New option group for the integrated speedbar and one new option:
+   The new hook `ecb-speedbar-before-activate-hook' runs directly before ECB
+   activates the integrated speedbar. For example this hook can be used to
+   change the expansion-mode of the integrated speedbar via
+   `speedbar-change-initial-expansion-list'. Example:
+   (speedbar-change-initial-expansion-list "buffers").
+
+** Added a new section in the info-manual which describes how desktop.el can be
+   used best in combination with ECB. This has been done because some
+   conflicts have been reported. See the "Conflicts"-Chapter in the
+   info-manual.
+      
+** Fixed bugs
+
+*** Double-clicking the mouse-1-button now works with integrated speedbar.
+
+*** Fixed two small bugs in the advice of `display-buffer':
+    One bug occured when called for one of the special ECB-buffers. The other
+    bug has not preserved the current-buffer when called for a buffer in the
+    sense of `ecb-compilation-buffer-p' and a hidden compile-window is
+    shown by display-buffer to display this buffer. The latter one for example
+    has prevented the ant-server of JDEE from working properly.
+
+*** Fixed a bug so now always the correct directory in the directories-buffer
+    is higlighted.
+
+    
+
+* Changes for ECB version 2.22
+
+** New nifty feature for filtering the tags displayed in the Methods-buffer
+   You can filter by regexp, protection, tag-class etc. See the new command
+   `ecb-methods-filter' (bound to [C-c . f m] and the new option
+   `ecb-methods-filter-replace-existing' for getting all details.
+
+   Filters can be layered filters, i.e. you can apply filters on top of
+   already applied filters: An example of 3 combined filters would be: Display
+   only all public methods having the string "test" in its name. The modeline
+   of the Methods-buffer always displays the topmost filter. But you can see
+   all currently applied filters by moving the mouse over this section of the
+   modeline: The filters will be displayed as help-echo.
+
+   The new functionality is also completely available via the popup-menu of
+   the Methods-buffer.
+
+   Currently tags of class 'type can not be filtered out, because especially
+   in OO-languages like Java or C++ this makes only less sense because if the
+   class is filtered out then no filter can be applied to its members like
+   methods or attributes.
+
+   These tag-filters can also applied to sources which are not supported by
+   the semantic-parser but "only" by imenu or etags. But because for these
+   sources not all information are avaiable the protection- and tag-class
+   filter can not used with such "non-semantic"-sources.
+
+** All tree-buffer filters are now guarded against filtering out all tags.
+   Each filter which a user can apply to the sources-, methods- or
+   history-buffer is now guarded against filtering out all nodes by accident,
+   ie. if a filter would empty the whole tree-buffer then this filter will be
+   autom. unwinded.
+   
+** Much smarter mechanism to highlight the current tag in the methods-buffer.
+   Previous versions of ECB have always fully expanded the whole tree in the
+   Methods-buffer if the current tag in the source-buffer was not visible in
+   the current tree - e.g. because the variables-bucket was collapsed or the
+   containing type of a tag (e.g. the class of a method) was collapsed. So in
+   most cases much more was expanded as needed to make the current tag
+   visible.
+
+   The mechanism of ECB 2.22 only expands the needed parts of the tree-buffer
+   to make the related node visible: First we try to highlight the current tag
+   with current expansion-state of the Methods-buffer. If the node is not
+   visible so the tag can not be highlighted then we go upstairs the ladder of
+   type-tags the current tag belongs to (e.g. we expand successive the nodes
+   of the whole class-hierachy of the current method-tag until the related
+   node becomes visible). If there is no containing type for the current tag
+   then the node of the tag is probably contained in a toplevel-bucket which
+   is currently collapsed; in this case we expand only this bucket-node and
+   try highlighting again. Only if this has still no success then we expand
+   the full tree-buffer and try to highlight the current tag.
+
+   There is also a new option `ecb-auto-expand-tag-tree-collapse-other': If
+   this option is set then auto. expanding the tag-tree collapses all not
+   related nodes. This means that all nodes which have no relevance for the
+   currently highlighted node will be collapsed, because they are not
+   necessary to make the highlighted node visible. This feature is switched
+   off by default because if always collapses the complete Methods-tree before
+   the the following highlighting of the node for the current tag expands the
+   needed parts of the tree-buffer.
+   
+** The popup-menus can now be nested into 4 levels of submenus. In general there
+   could be an infinite depth of nesting but it makes no sense - if possible
+   at all - to define infinite nested defcustom-types. So there is a limit of
+   4 levels until a user asks for more - then this wish can be satisfied
+   during 1 minute: Just increase the value of the `ecb-max-submenu-depth'
+   before loading ECB. This enhancement affects the four options with name
+   `ecb-*-menu-user-extension'.
+   
+** The indication for ECB in the minor-mode is now hidden when the ECB-windows
+   are visible because in this case the activity of ECB is quite obvious. When
+   the ECB-windows are hidden the the value of `ecb-minor-mode-text' is
+   displayed in the modeline.
+
+** Compatibility enhancements
+
+*** Cause of the fixed bugs the compatibility for `bs-show' has increased when
+    the buffer-selection should be displayed in the permanent compile-window.
+
+** Fixed Bugs
+
+*** Fixed a bug preventing the native Windows-port of XEmacs from working.
+
+*** Makes the behavior of adviced `display-buffer' fully compatible to the
+    original version for all buffers which are neither ecb-tree-buffer nor
+    compilation-buffers in the sense of `ecb-compilation-buffer-p'. These
+    "source-buffers" are now also handled correctly in all situations.
+
+*** Fixed a small bug in `ecb-toggle-compile-window-height'. This bug has
+    influenced the behavior of `display-buffer' when called from programs for
+    "compilation-buffers".
+
+*** Fixed a bug related to the speedbar-integration.
+    This bug complained "Can not switch buffer in dedicated window" when the
+    intergrated speedbar-buffer was selected and the user tries to open a file
+    or to jump to a tag.
+
+*** Fixed a bug for the special ECB-modeline-menu for the XEmacs-modelines.
+    Now only in the special ECB-tree-buffer a special ECB-modeline-menu is
+    bound to mouse-3, all other buffers display the standard modeline-menu of
+    XEmacs.
+
+*** Fixed a bug which occurs with XEmacs in combination with func-menu.
+    But there are still some incompatibilities between ECB and func-menu. So
+    the recommendation is to disable func-menu-support when using ECB.
+    Normally using func-menu makes no sense in combination with ECB because
+    ECB provides the same and even more informations as func-menu - so
+    func-menu is redundant ;-)
+    
+
+
+* Changes for ECB version 2.21
+
+** Advice for `balance-windows' so only the edit-windows are balanced.
+   Thanks to David Ishee <782zp6a02@sneakemail.com> for suggestion.
+
+** New option `ecb-ignore-display-buffer-function'
+   Per default the adviced version of `display-buffer' ignores the value of
+   `display-buffer-function' when called for the ECB-frame. If this variable
+   should not be ignored then the function of `display-buffer-function' is
+   completely responsible which window is used for the buffer to display - no
+   smart ECB-logic will help to deal best with the ECB-window-layout! You can
+   define if and when `display-buffer-function' should be ignored: Always
+   (default), when a compile-window is used or never.
+
+** Compatibility enhancements
+   In general the current layout-engine of ECB is so flexible that there
+   should be no - or at least very few - conflicts between ECB and any other
+   elisp-library - even when another lib is running during the ECB-windows are
+   visible.
+
+*** Commands like `bs-show' of the library bs.el now work correctly with ECB
+
+*** Xrefactory works even when all ECB-windows are visible (see Fixed Bugs).
+
+*** Applications like Gnus or BBDB run withing the ECB-frame without conflicts -
+    even when the ECB-windows are visible.
+
+*** Commands using `Electric-pop-up-window' now work correctly with ECB.
+    This ensures that the electric-* commands (e.g. `electric-buffer-list' or
+    `electric-command-history') work well with ECB. If the related
+    "display-buffer" of such an electric command is a "compilation-buffer" in
+    the sense of `ecb-compilation-buffer-p' then this buffer will be displayed
+    in the compile-window of ECB - if there is any shown.
+
+** For XEmacs the package fsf-compat is no longer required by ECB.
+   But it is still necessary to check if fsf-compat is required by the
+   packages semantic, eieio and speedbar which in turn are required by ECB.
+
+** Fixed Bugs
+
+*** Fixed a fatal bug which prevents `other-window' from working with
+    arguments < 0. This bug has also prevented Xrefactory from working correct
+    when ECB is active - see compatibility enhancements above.
+
+*** If point stays in the current source-buffer on a function argument then still
+    ECB highlights the function in the Methods-buffer.
+
+*** ECB now uses `compilation-window-height' correctly when set buffer-local
+    as possible with latest CVS-version of GNU Emacs 21.
+
+*** Fixed a bug in `ecb-sources-filter' and `ecb-history-filter'.
+    
+
+
+* Changes for ECB version 2.20
+
+** New customization group "ecb-most-important"
+   This group centralizes the most important options of ECB in one group which
+   is also offered by the "Preferences" submenu ob the ECB-menu. These are
+   options you should at least know that they exist.
+
+** The keybinding for the online-help has changed from [C-c . o] to [C-c . h]
+   This has been done because the key [C-c . o] is needed for the new command
+   `ecb-toggle-scroll-other-window-scrolls-compile'.
+
+** The options `ecb-major-modes-activate' and `ecb-majors-mode-deactivate' have
+   been replaced by one new option `ecb-major-modes-show-or-hide'. The purpose
+   of the old option is now quite out-of-date because:
+   - ECB supports window-managers like winring.el or escreen.el very well,
+   - as of version 2.20 ECB has no restrictions about the number of
+     edit-windows and
+   - the new option simplifies things a lot.
+      
+** The restriction of only two edit-windows has been gone!
+
+*** Beginning with this version 2.20 there are no restrictions about the
+    window-layout in the edit-area of ECB. This means you can split the
+    edit-area of ECB in as many windows as you like. The split-state of the
+    edit-area will be preserved when toggling the visibility of the
+    ECB-windows and even between activation and deactivation of ECB. Deleting
+    of certain edit-windows will never destroy the special ECB-windows or the
+    compile-window. Just work with the edit-area of ECB as if it would be an
+    extra frame!
+
+*** Option `ecb-split-edit-window' has been renamed in
+    `ecb-split-edit-window-after-start' because this new name reflects much
+    better the purpose of this option. In addition there is offered a new
+    value 'before-deactivation which is also the new default value. This new
+    value preserves the full state between activations of ECB, i.e. the
+    visibility of the ECB-windows, the visibility of a compile-window and also
+    the full split-state of the edit-area. ECB auto. upgrades your setting!
+
+*** Compile-window can now be displayed even when the ECB-windows are hidden.
+    So now you can have the same compile-window functionality when the
+    ECB-window are hidden as when the ECB-windows are visible. The state of
+    the compile-window will be preserved when toggling the ecb-windows or when
+    maximizing one ecb-windows! So you have the advantage of one special
+    window for all help-, grep or compile-output also when the ecb-windows are
+    hidden - a window which will not be deleted if you call
+    `delete-other-windows' (bound to [C-x 1]) for one of the edit-windows.
+    
+*** The option `ecb-primary-mouse-jump-destination' has been renamed to
+    `ecb-mouse-click-destination' and has also changed its default value to
+    'last-point. ECB autom. upgrades the old settings.
+
+*** New keybinding [C-c . g l] for selecting the last selected edit-window.
+    Also available via the ECB-menu. The command is
+    `ecb-goto-window-edit-last'.
+
+*** Option `ecb-other-window-jump-behavior' has been renamed to
+    `ecb-other-window-behavior' and has also two new allowed values: 'smart
+    (the new default) and an arbitrary function-symbol. With the latter one
+    the user can define his own other-window-behavior and the former one
+    chooses in a smart and intuitive way the "other window" for going to it
+    via `other-window' or for scrolling it via one of the "scroll another
+    window"-functions (e.g. `scroll-other-window'). Thanks to John S. Yates,
+    Jr. <john@yates-sheets.org> for suggesting the new smart behavior. ECB
+    autom. upgrades the old value of `ecb-other-window-jump-behavior' to the
+    new option-name.
+    
+*** New option `ecb-scroll-other-window-scrolls-compile-window' and new
+    command `ecb-toggle-scroll-other-window-scrolls-compile' (bound to [C-c .
+    o]). If this new option is nil then ECB chooses very smart and intuitive
+    the window which will be scrolled by commands like `scroll-other-window'
+    (see documentation of the the option `ecb-other-window-behavior'). But
+    sometimes the user wants to scroll the compile-window from another window.
+    With this new command the user can fest and easy toggle the behavior ECB
+    chooses another window for scrolling.
+
+*** Higher compatibility of ECB with other packages
+    Without the 2-edit-window-restriction ECB is now more compatible with
+    other packages. For example the package calculator.el can now also being
+    used without setting `calculator-electric-mode' to not nil - regardless in
+    how many edit-windows the edit-area of ECB is splitted. Also the package
+    bs.el (command `bs-show') benefits from the new layout-flexibility. As of
+    ECB-version 2.20 there should be no conflicts between this package and
+    ECB.
+
+** Enhancements to the tree-buffers of ECB
+    
+*** Enhancements to the popup-menus of the tree-buffers
+
+**** All popup-menus of the tree-buffers can be used with the tmm-library
+     The already existing command `tree-buffer-show-menu-keyboard' (bound to
+     [M-m] in every tree-buffer of ECB) accepts now a prefix argument. If called
+     with a prefix-argument (hit [C-u M-m]) then the popup-menu is displayed
+     with the tmm-mechanismus (like the Emacs-[menu-bar] is displayed when
+     `tmm-menubar' is called). Thanks for suggestion to Yvonne Thomson
+     <yvonne@thewatch.net>.
+
+**** Select an edit-window via popup where a source should be opened or a token
+     should be displayed.
+    
+**** The popup-menus can be dynamically extended.
+     See the new options `ecb-directories-menu-user-extension-function',
+     `ecb-sources-menu-user-extension-function',
+     `ecb-methods-menu-user-extension-function' and
+     `ecb-history-menu-user-extension-function'.
+
+**** All popup-menu-commands respect the setting of the option
+     `ecb-mouse-click-destination' (formerly known as
+     `ecb-primary-mouse-jump-destination' - see above).
+
+*** ECB supports the default modeline-mechanisms for deleting other windows.
+    GNU Emacs binds [mouse-2] in its modeline to `delete-other-window'. ECB
+    now supports this mechanism by binding a toggle-command to [mouse-2] in
+    the modeline of each tree-buffer: If all ECB-windows are visible then this
+    command maximizes the current tree-window and if current tree-window is
+    maximized all ECB-windows are displayed again. XEmacs binds a popup-menu
+    with some window commands to [button-3] in its modeline. ECB supports this
+    mechanism by replacing this menu by a menu which offers exactly 2
+    commands: Maximizing current tree-window and displaying all ECB-windows.
+
+*** Now all commands for selecting a tree-buffer work even when this buffer is
+    not visible because another tree-buffer is maximized. If the tree-buffer
+    is contained in the layout then the layout is redrawn with all its
+    tree-buffers visible so that tree-buffer can be selected. Same for
+    maximizing. An example for such a command is `ecb-goto-window-methods'.
+
+*** New option `ecb-maximize-ecb-window-after-selection'.
+    Automatic maximizing of a tree-window after selecting it. Thanks for
+    suggestion to John S. Yates, Jr. <john@yates-sheets.org>.
+       
+*** Changes to the image-icons of the tree-buffers
+
+**** All image-files have been renamed from <IMAGENAME>.xpm to
+     ecb-<IMAGENAME>.xpm. This was necessary because the icons for "open" and
+     "close" in Emacs toolbar got superseeded by ECB's icons for "open" and
+     "close". The problem was, that ECB was using the same names for the icon
+     files "open.xpm" and "close.xpm" as emacs toolbar does. This problem
+     occurs if the image-directory of ECB is contained in the `load-path'
+     which is when ECB is installed in the site-lisp directory of Emacs with
+     the default subdirs.el of Emacs which adds automatically all
+     subdirectories to the load-path (and therefore also subdirectories which
+     does not contain elisp-files but only images - btw: not really smart;-).
+     Thanks to Roland Schaeuble <roland.schaeuble@siemens.com> for pointing
+     out that.
+
+**** Added all image-icons in a 10-point height.
+     Thanks to Nick Cross <nick@goots.org> for sizing down the images.
+
+** New default-value for `ecb-post-process-semantic-taglist'.
+   Now for buffers with major-mode `c-mode' all function-prototypes are
+   filtered out. For example this is useful for editing C files which have the
+   function prototypes defined at the top of the file and the implementations
+   at the bottom. This means that everything appears twice in the methods
+   buffer, but probably nobody wants to jump to the prototypes, they are
+   only wasting space in the methods buffer. Of course in C-header-files
+   function-prototypes will be displayed!
+
+   Thanks for suggestion and a first implementation to Rob Walker
+   <rob.lists@tenfoot.org.uk>.
+
+** Changes for the compile-window
+   
+*** The command `ecb-toggle-compile-window' now displays a compile-window even if
+    the option `ecb-compile-window-height' is nil. This is a shortcut for
+    customizing this option via the customize-feature if you just want
+    displaying a compile-window for the current Emacs-session. In this
+    situation ECB asks for the height of the compile-window, sets this height
+    as new value of `ecb-compile-window-height' and displays the
+    compile-window.
+
+*** New option `ecb-change-layout-preserves-compwin-state'.
+    Changing the layout preserves now the state of the compile-window if this
+    option is not nil. This is for example useful if the user toggles between
+    several layouts and wants to preserve the hidden-state of the
+    compile-window. Thanks to John S. Yates, Jr. <john@yates-sheets.org> for
+    suggestion.
+
+*** Adviced `delete-window' and `delete-other-windows' handle compile-window.
+    The former one hides the compile-window if called in or for that window
+    whereas the latter one hides the compile-window if called in or for an
+    unsplitted edit-window. Thanks to John S. Yates, Jr.
+    <john@yates-sheets.org> for the suggestion.
+
+** New option `ecb-activation-selects-ecb-frame-if-already-active'.
+   See the docstring for more details. Thanks for suggestion to Jeff Jensen
+   <jeffjensen@nospam.visi.com>
+
+** The command `ecb-redraw-layout' can be called with prefix-argument(s).
+   Called with ONE prefix-argument the command behaves as with ECB-versions <
+   2.20, i.e. redrawing the full layout regardless of the current
+   visibility-state of the ecb-windows or the compile-window. Called without a
+   prefix-arg this command now preserves the state of the ecb-windows as well
+   as the state of the compile-window. Called with TWO prefix-args means an
+   emergency-redraw (see documentation of `ecb-redraw-layout').
+
+** New command `ecb-display-news-for-upgrade'.
+   ECB autom. displays after an upgrade a short summary of the most important
+   NEWS. With the new command you can do this also on demand.
+      
+** Fixed Bugs
+
+*** Adviced `display-buffer' handles `same-window-buffer-names' and
+    `same-window-regexps' correctly.
+
+*** Fixed a bug preventing tree-buffers with expand-symbol "before" to work
+
+*** Fixed a bug in the adviced version of `other-window'.
+    Now it works correctly also when a durable compile-window is set but
+    currently hidden.
+
+*** Fixed a bug when scrolling a window from within the minibuffer.
+    For example this bug has prevented scrolling the *Completion* buffer from
+    within the minibuffer. Now `minibuffer-scroll-window' is set correctly.
+
+*** Toggling the compile-window has not worked when `ecb-compile-window-height'
+    has not been saved for future sessions. This is fixed now.
+
+*** `ecb-cycle-through-compilation-buffers' works with hidden compile-window.
+
+*** Fixed a bug when an ECB-window was maximized and the user has stored sizes
+    for this layout.
+
+*** Fixed a bug in `ecb-major-modes-activate' and `ecb-major-modes-deactivate'
+
+*** Fixed a bug in the handling of the option `ecb-kill-buffer-clears-history'
+
+*** Fixed a bug which prevents some older version of XEmacs 21.4 working well.
+    For XEmacs 21.4.6 a bug was reported which causes this XEmacs-version to
+    fail when `compile' or `grep' is called. The reason for this was that
+    these old versions of XEmacs 21.4 contain versions of `display-buffer'
+    and/or `get-frame-for-buffer' which do not have the fourth argument
+    SHRINK-TO-FIT. Now ECB has fixed this and handles correctly the option
+    `temp-buffer-shrink-to-fit' and all shades of displaying and compiling
+    buffers even for these versions of XEmacs.
+
+    
+
+* Changes for ECB version 2.11
+
+** Using semanticdb to jump to type-tags defined in other files.
+   In OO-languages like CLOS, eieio and C++ there can be type-tags in the
+   method-buffer which are somehow virtual because there is no definition in
+   the current source-file. But such a virtual type collects all its outside
+   defined members like methods in C++ which are defined in the *.cc file
+   whereas the class-definition is defined in the associated header-file.
+   ECB uses semanticb to open the definition-file of such a tag and to jump to
+   the definition of this tag. Same for parent-tags in the methods-buffer.
+   This feature can only work correctly if semanticdb is well configured!
+
+** New option `ecb-ignore-special-display'
+   The options `special-display-buffer-names', `special-display-regexps' and
+   `special-display-function' work as expected. Per default this in only true,
+   when no durable compile-window is used (see option
+   `ecb-compile-window-height'), i.e. with a durable compile window the
+   special-display-options are ignored per default. But this behavior can be
+   changed with the new option `ecb-ignore-special-display'.
+
+   Thanks to Rob Walker <rob.lists@tenfoot.org.uk> for a first suggestion.
+
+** Better reporting if there are errors during ECB-startup
+
+** Fixed bugs
+
+*** Clicking onto nodes with positionless semantic-tags as data doesn't fail
+
+*** Non-semantic sources (e.g. Perl, TeX) work when cedet 1.0 is loaded
+
+*** Fixed the versioning of ECB so the autom. upgrade works
+
+
+
+* Changes for ECB version 2.01
+
+** Prepared for the new semantic 2.0 beta (contained in the cedet 1 beta)
+
+*** New naming convention
+
+    Forthcoming semantic 2.0 (part of the new cedet-library) introduces a new
+    naming convention. Here is the relevant part of the semantic 2.0
+    NEWS-file:
+    
+    token     - Refers to a lexical analyzer production.
+    stream    - A list of tokens
+    tag       - Refers to a datastructure created by a grammar to represent
+                something in a language file
+    table     - A hierarchical list of tags.
+    tag-class - A tag may represent a function, data type, or variable.
+    parse     - Run a source file through a parser.
+    
+    Normally there is no need for ECB users to bother with all details of
+    semantic naming conventions but for the sake of consisteny between
+    semantic and ECB the ECB-package has renamed all its variables and
+    functions from "token" to "tag". Therefore also all options which contain
+    "token" in their name have been renamed by replacing "token" with "tag".
+    See RELEASE_NOTES for a list of this options.
+ 
+    ECB autom. upgrades all old-values of these options to the new options!
+    There is nothing to do for you.
+
+*** ECB works with new semantic 2.0 which is shipped within cedet 1.0
+
+** Overhaul of the display-layer and -handling of the tree-buffers
+
+*** Now there are 3 different styles available
+    * Image: Looks very nice and modern - just give it a try or see the
+      screenshots-section at http://ecb.sourceforge.net
+    * Ascii with guide-lines: Drawing the trees with ascii-symbols
+    * Ascii without guide-lines: This is the style of ECB <= 1.96
+
+    For details and a visualization of these different styles see the new
+    option `ecb-tree-buffer-style' (replaces the old option
+    `ecb-tree-use-image-icons').
+
+    Especially the new image-style was inspired by the library tree-widget.el
+    written by David Ponce <david@dponce.com>. Also some images shipped with
+    ECB are "stolen" from this library.
+
+*** No-leaf-tree-nodes with currently no subnodes are displayed with [x]
+    An example are directories in the Directories tree-buffer which have
+    currently no subdirectories. Leafs like source-files or methods are of
+    course handled as leafs and not as currently empty nodes.
+
+*** Fixed some inconsistencies in expanding, collapsing and selecting nodes
+
+*** Moving all options related to the tree-buffer-style or -handling to the new
+    customize-group "ecb-tree-buffer".
+
+** Completely rewritten popup-menu mechanism.
+
+*** Now sub-menus are allowed for all popups
+    To give a better lucidity of the popup-menus of the tree-buffers these
+    menus can now being arranged in sub-menus. The default values now already
+    use sub-menus. So if you have added menu-entries to one of the options
+    `ecb-directories-menu-user-extension', `ecb-sources-menu-user-extension',
+    `ecb-methods-menu-user-extension' or `ecb-history-menu-user-extension' ECB
+    resets these options to the new defaults of ECB and adds at the top your
+    "old" personal entries. This comes because the type of these options has
+    changed. Thanks for general suggestion to Ole Arndt <ole@sugarshark.com>.
+
+*** Added new defaults to `ecb-directories-menu-user-extension'
+    Three new entries "CVS status", "CVS examine" and "CVS update" in a new
+    sub-menu "Version control" for running CVS-commands against the directory.
+    These menu-entries are added as new default values to
+    `ecb-directories-menu-user-extension' so a user can delete or change them
+    if he does not use CVS but another revision-tool (e.g. Clearcase). Thanks
+    for suggestion and first implementation to Ole Arndt <ole@sugarshark.com>.
+
+*** Added new defaults to `ecb-sources-menu-user-extension'
+    One new sub-menu "Version control" with some senseful commands. See also
+    new default for the option `ecb-directories-menu-user-extension'. Same is
+    added to the `ecb-history-menu-user-extension'. Thanks for suggestion and
+    first implementation to Ole Arndt <ole@sugarshark.com>.
+
+** Possibility to define which types should be expanded at file-open-time
+   Semantic groups types into different type-specifiers. Current available
+   type-specifiers are for example "class", "interface", "struct", "typedef",
+   "union" and "enum". With the new option `ecb-type-tag-expansion' you can
+   specify on a major-mode-basis which type-specifiers should be expanded at
+   file-open-time and which not. So for example in C++ it could be senseful
+   not to expand the types with a type-specifiers "typedef", "struct" or
+   "enum" (see the default-value of this option).
+    
+** Adding a filter-feature to the Sources- and the History-buffer
+   Now a filter can be applied to the Sources- and/or History-buffer which
+   desides which entries are displayed in these buffers. See the new commands
+   `ecb-sources-filter' (bound to [C-c . fs]) and `ecb-history-filter' (bound
+   to [C-c . fh]) and the new entries for the popup-menus for these buffers.
+   In the sources-buffer each directory has its own filter. The currently
+   applied filter is displayed in the modeline of that tree-buffer with the
+   new face `ecb-mode-line-prefix-face' (s.b.)
+
+** Changes related to the modelines of the tree-buffers
+   
+*** Added faces to the mode-lines of the ECB-tree-buffers.
+    See the three new options `ecb-mode-line-win-nr-face',
+    `ecb-mode-line-prefix-face' and `ecb-mode-line-data-face' and also they
+    related (and equally named) new faces.
+
+*** Moved all options related to the modelines in the new customize-group
+    "ecb-mode-line".
+       
+** No window-restrictions if the ECB-windows are hidden
+   If the special ECB-windows are hidden (e.g. by `ecb-toggle-ecb-windows')
+   then there are no restrictions about the window-layout of the ecb-frame:
+   The frame can be splitted in any arbitrary windows. All adviced functions
+   behave as their originals. So the frame can be used as if ECB would not be
+   active but ECB IS still active in the "background" and all ECB-commands and
+   all ECB-keybindings can be used. Of course some of them doesn't make much
+   sense but nevertheless they can be called.
+
+   Therefore it should be enough to hide the ECB-windows to run other
+   Emacs-applications which have their own window-layout-managing. There
+   should be no conflicts. But nevertheless the most recommended method for
+   running ECB and other applications (e.g. xrefactory, Gnus etc.) in the same
+   frame is to use a window-manager like winring.el or escreen.el!
+
+** Ediff runs per default in the ECB-frame.
+   Now ediff can run per default in the ECB-frame because ECB ensures that all
+   special ECB-windows are hidden before ediff sets up its own window-layout.
+   ECB also restores exactly the "before-ediff" window-layout of the ecb-frame
+   See new option `ecb-run-ediff-in-ecb-frame'.
+
+** More flexible directory-caching with new `ecb-cache-directory-contents-not'
+      
+** New option `ecb-advice-window-functions-signal-error'
+   Now the adviced window functions of `ecb-advice-window-functions' do not
+   signal per default an error if called in situations which are not allowed -
+   they simple do nothing. An example is calling `delete-window' in a special
+   ecb-window or in the compile-window; if this new option is nil then nothing
+   is done otherwise an error is signaled. If you want the old behavior of
+   signaling an error just set this new option to not nil.
+
+** Fixed Bugs
+
+*** When the special ECB-windows were hidden and a durable compile-window was set
+    then ECB shows the special ECB-windows when a temp-buffer (e.g.
+    *Help*-buffers) has been displayed. This annoying behavior is fixed.
+
+*** XEmacs has not added the ECB-menu to the menubar of that buffers which are
+    already alive while activating ECB. On the other side XEmacs has not
+    removed the ECB-menu from the menubar for all living buffers after
+    deactivating ECB. Both of these two bugs are fixed now.
+
+*** JDEE-dialogs now work correctly.
+    JDEE offers sometimes "dialogs" where the user can choose among several
+    options. These "dialogs" now work correctly regardless if a durable
+    compile-window is used or not.
+
+*** A bug in displaying the tree-buffers in a different font or font-height
+
+
+
+* Changes for ECB version 1.96
+
+** ECB can work together with the window-managers escreen and winring
+   This allows to run applications like Gnus, VM or BBDB in the same frame as
+   ECB! See the new lib ecb-winman-support.el and read the section
+   "Window-managers and ECB" in the chapter "Tips and tricks" in the
+   info-manual of ECB.
+   
+   Thanks to Johann "Myrkraverk" Oskarsson <myrkraverk@users.sourceforge.net>
+   who has reported some bugs related to escreen and has therefore motivated a
+   lot to add support for the well known window-managers escreen and winring.
+
+** ECB can display the window-number in the modeline of the special windows.
+   The left-top-most window in a frame has the window-number 0 and all other
+   windows are numbered with increasing numbers in the sequence, functions
+   like `other-window' or `next-window' would walk through the frame. This
+   allows to jump to windows by name as described at the Emacs-Wiki
+   http://www.emacswiki.org/cgi-bin/wiki.pl?SwitchingWindows.
+
+   See the new option `ecb-mode-line-display-window-number'. Currently this
+   feature is only available for GNU Emacs 21.X, because neither GNU Emacs <
+   21 nor XEmacs can dynamically evaluate forms in the mode-line.
+
+   Thanks to Johann "Myrkraverk" Oskarsson <myrkraverk@users.sourceforge.net>
+   for suggesting this.
+
+   In addition the already existing options `ecb-mode-line-data' and
+   `ecb-mode-line-prefixes' are now more flexible and are now able to define
+   special modelines not only for the 4 builtin ECB-tree-buffers but for every
+   special ECB-buffer. ECB will autom. upgrade the old values of these options
+   as best as possible to their new types!
+               
+** Much better support of the ECB-compile-window
+
+*** General overhaul for displaying buffers in the ECB-compile-window.
+    The whole mechanism has been rewritten so now using a durable
+    compile-window is much safer and works as well as without one. Now all
+    buffers displayed with `display-buffer' are checked if they are
+    "compilation-buffers" in the sense of the function
+    `ecb-compilation-buffer-p' and then displayed in the compile-window of
+    ECB. Especially temp-buffers displayed with `with-output-to-temp-buffer'
+    (e.g. *Help*-buffers) are now much better supported.
+
+    Simply said: All buffers for which `ecb-compilation-buffer-p' says t are
+    now *always* displayed in the compile-window (if there is any) with
+    complete consideration of Emacs-options like `compilation-window-height',
+    `temp-buffer-max-height', `temp-buffer-resize-mode' (GNU Emacs),
+    `temp-buffer-shrink-to-fit' (XEmacs) etc. All other buffer not.
+
+*** New layout-option `ecb-compile-window-width'.
+    Thanks for suggestion to John S. Yates, Jr. <jyates@netezza.com>
+
+*** New layout-option `ecb-compile-window-prevent-shrink-below-height'
+
+*** Better and more reliable eshell-integration. Now the compile-window fits
+    always autom. to the output of the last eshell-command.
+
+*** All options related to the ECB-compile-window have been moved to the new
+    customization-group "ecb-compilation" which is a subgroup of "ecb-layout".
+    
+** Safer handling of all adviced functions of ECB
+   All ECB-advices are now active if and only if ECB is running. Just loading
+   the ECB-library doesn't activate any ECB-advice! Also if there is an error
+   during the activation-process of ECB then all advices are always disabled
+   automatically.
+
+** ECB can visit tokens in a smarter way
+
+*** Narrowing via popup-menu of the Methods-buffer includes now the documentation
+    of the token if located outside of the token (e.g. Javadoc for Java).
+
+*** More flexible definition what to do after visiting a token via the
+    Methods-buffer. See the new option `ecb-token-visit-post-actions' which now
+    replaces the options ecb-highlight-token-header-after-jump',
+    `ecb-scroll-window-after-jump' and `ecb-token-jump-narrow'.
+
+** ECB selects autom. the current default-directory after activation even if
+   no file-buffer is displayed in the edit-window. This is useful if ECB is
+   autom. activated after startup of Emacs and Emacs is started without a
+   file-argument. So the directory from which the startup has performed is
+   auto. selected in the ECB-directories buffer and the ECB-sources buffer
+   displays the contents of this directory. See new option
+   `ecb-display-default-dir-after-start'. 
+
+** ECB preserves the split-state of the frame after activation rsp. deactivation
+   This is done if the already existing option `ecb-split-edit-window' has the
+   new value t.
+      
+** New command `ecb-toggle-window-sync' for fast toggling between autom.
+   synchronization of the ECB-buffers is switched on and off.
+
+** The popup-menu of the Directories-buffer allows opening a dir with Dired.
+   The Sources-Buffer offers the same for the current selected directory. In
+   the History-buffer the directory of the selected file-buffer can be
+   "dired".
+
+** Now manually resizing of the ECB-windows is possible even if
+   `ecb-fix-window-size' is not nil for current layout. Thanks for suggestion
+   Massimiliano Mirra <mmirra@libero.it>. Only relevant for GNU Emacs 21.X.
+
+** ECB does not call any functions of the cl-library at runtime.
+
+** Fixed Bugs
+
+*** Fixed all the file- and directory-commands in the popup-menus.
+    Now the Directories- and Sources-buffers are autom. updated after creating
+    rsp. deleting source-files or directories.
+
+*** Jumping to some tokens for Perl sources failed. This is fixed now.
+
+*** Now the buffer-names displayed in the History-window are always uptodate,
+    even if file-buffers are killed/opened during hidden ECB-windows.
+
+*** Fixed a conflict between ECB and `tmm-menubar' (tmm.el)
+    
+*** Fixed a lot of misspellings in the ECB-online-help and also in all comments
+    and strings of the sources.
+
+*** Fixed a bug in `ecb-toggle-enlarged-compilation-window'.
+    This function has been also renamed to `ecb-toggle-compile-window-height'.
+
+*** Fixed a bug in the layout-engine related to dedicated windows.
+    Thanks to Johann "Myrkraverk" Oskarsson <myrkraverk@users.sourceforge.net>
+    who helped to find this bug.
+
+*** Fixed some references in the info-manual of ECB.
+
+
+
+* Changes for ECB version 1.95.1
+
+** Now the ecb-windows can be "maximized", means all other ecb-windows are
+   deleted so only the edit-window(s), and this maximized ecb-window are
+   visible (and maybe a compile-window if active). This can be done either via
+   the popup-menus of the ecb-windows or via calling `delete-other-windows'
+   (bound to [C-x 1]) in one of the ecb-windows or via the new commands
+   `ecb-maximize-window-*' where * stands for {directories, sources, methods,
+   history, speedbar}. There is also a command
+   `ecb-cycle-maximized-ecb-buffers'.
+
+   *Note*: If there are byte-compiled(!) user-defined layouts - either created
+   interactively by `ecb-create-new-layout' or programmed with the macro
+   `ecb-layout-define' - then the file where these user-defined layouts are
+   saved (see option `ecb-create-layout-file') must be re-byte-compiled with
+   latest ECB version >= 1.95.1! If the user-defined layouts are not
+   byte-compiled then there is nothing to do.
+
+** Some default key-bindings have changed; see RELEASE_NOTES for details.
+
+** All popup-menus of the ECB-tree-buffers can be opened via [Meta-m]
+
+** Fixed bugs
+
+*** Clicking onto the image-icons of an integrated speedbar has failed for
+    XEmacs. This comes from a bug in speedbar which is now fixed locally in
+    ECB by advicing `dframe-mouse-set-point' if speedbar is integrated in the
+    ECB-frame.
+
+
+
+* Changes for ECB version 1.95
+
+** ECB now displays the expand- and collapse symbols in the tree-buffers with
+   image-icons - the same icons as speedbar uses. See the new option
+   `ecb-tree-use-image-icons'.
+
+** Adding hideshow to the popup-menu of the Methods-buffer.
+   This popup-menu now offers two entries for hiding rsp. showing the block
+   of that token in the Methods-buffer for which the popup-menu was opened.
+   This is done with the hideshow.el library.
+   Thanks to Christoff Pale <christoff_pale@yahoo.com> for suggestion.
+
+** Horizontal scrolling of the tree-buffers by clicking the edges of the
+   modeline with mouse-1 or mouse-2. I.e. if you click with mouse-1 onto the
+   left (rsp right) edge of the modeline you will scroll left (rsp. right)
+   with the scroll-step defined in `ecb-tree-easy-hor-scroll'. This is only
+   for GNU Emacs because XEmacs has hor. scrollbars.
+   
+** Changed default key-bindings:
+   - C-c . r:  `ecb-rebuild-methods-buffer'
+   - C-c . lc: `ecb-change-layout'
+   - C-c . lr: `ecb-redraw-layout'
+   - C-c . lt: `ecb-toggle-layout'
+   - C-c . lw: `ecb-toggle-ecb-windows'
+
+** Starting ECB is now possible via the "Tools"-menu
+
+** ECB now requires speedbar version 0.14beta1 or higher. An automatic
+   requirements-check is done by ECB. This is because now ECB has three
+   dependencies to speedbar-code: Integrating whole speedbar in the ECB-frame,
+   using speedbar-logic to parse files with imenu or etags and using the icons
+   of speedbar for the ECB-tree-buffers.
+
+** Fixed bugs
+
+*** Now the "goto-window-..." menu-entries in the "ECB"-menu are working correct
+    if a speedbar is integrated into the layout.
+
+*** Preventing etags-supported sources from being parsed (and saved) too often.
+
+
+
+* Changes for ECB version 1.94
+
+** Supporting of non-semantic-sources.
+
+*** Native parsing and displaying source-contents of imenu supported files
+
+*** Native parsing and displaying source-contents of etags supported files
+
+*** There are some new options like `ecb-process-non-semantic-files',
+    `ecb-non-semantic-parsing-function' and `ecb-method-non-semantic-face' and
+    one new face `ecb-method-non-semantic-face'. See new customize group
+    "ecb-non-semantic"!
+    
+** Better speedbar integration into the ECB-frame
+
+*** Now speedbar can be used not only as replacement for the
+    ECB-directory-browser in the directory-window but also instead of the
+    sources- or the methods-buffer/window. See new option
+    `ecb-use-speedbar-instead-native-tree-buffer' which replaces the old
+    option `ecb-use-speedbar-for-directories'.
+
+*** Now speedbar can be integrated into an arbitrary layout in the same way as
+    the other four special buffers (directories, sources, methods and
+    history). See new example layout with name "left-dir-plus-speedbar".
+
+*** New option `ecb-directories-update-speedbar' which helps you
+    to update a speedbar-window to the current selected directory of the
+    ECB-directories-window.
+
+** New option `ecb-compilation-predicates' for better specifying which buffers
+   should be treated as compilation-buffers and therefore be displayed in the
+   compile-window of ECB - if there is any.
+   
+** Better customizing of the mode-line of an ECB-tree-buffer.
+   See the new option `ecb-mode-line-data'.
+
+** Fixed bugs:
+
+*** Using "Add source path" from the popup-menu now doesn't open the Windows
+    file-dialog-box onto Windows-systems because this would prevent this
+    command from working.
+
+*** Smart arrowkey-navigation in the tree-buffers is now even smarter.
+    Thanks to John Russel <jorussel@cisco.com> for suggestion.
+
+*** If ECB was activated with a layout which does not contain a
+    directory-buffer then you got always an empty directory-buffer even after
+    switching to a layout with a directory-buffer. This is fixed now.
+
+    
+
+* Changes for ECB version 1.93
+
+** Fixed bugs:
+
+*** The adviced version of `other-window' now works correct too if a
+    minibuffer-window is active.
+
+*** The commands of `winner-mode' are now only forbidden in the ECB-frame
+    but work in any other frame.
+
+*** `scroll-all-mode' now works correct in other frames than the ECB-frame.
+
+*** Removed the annoying message "Partial reparsing..."
+
+** Enhancements to the layout:
+
+*** Slightly better redrawing current layout especially if the layout contains
+    a compile-window.
+
+*** ECB autom. displays hidden compile-window before starting a compilation.
+    This is done if `ecb-compile-window-height' is not nil but the
+    compile-window is currently hidden by `ecb-toggle-compile-window'. Of
+    course this works also for grep and other compile-modes. Same for
+    `switch-to-buffer' and `switch-to-buffer-other-window' if called for a
+    compilation-buffer in the sense of `ecb-compilation-buffer-p'.
+
+*** `switch-to-buffer-other-window' now works more naturally within the
+    ECB-frame, especially if a compile-window is used.
+
+*** `ecb-toggle-compile-window' now has a default key-binding: [C-c . \]
+
+*** Now also layouts with user-defined special ecb-windows can be created
+    interactively. See the online-manual for further details.
+
+** Enhancements to the tree-buffers:
+   
+*** Now user-extensions can be added to the popup-menus of the tree-buffers.
+    See new options `ecb-directories-menu-user-extension',
+    `ecb-sources-menu-user-extension', `ecb-methods-menu-user-extension',
+    `ecb-history-menu-user-extension'.
+
+*** The methods-buffer now has a popup-menu with senseful actions
+    
+** New option `ecb-sources-exclude-cvsignore' which allows to exclude files from
+   being displayed in the sources-buffer if they are contained in a .cvsignore
+   file.
+
+** ECB now also works with buffers "online" extracted from archives.
+   Buffers extracted from an archive in `tar-mode' or `archive-mode' are now
+   correct handled as if they were normal file-buffers. This feature doesn't
+   work with XEmacs cause of its tar-mode and arc-mode implementation which
+   does not handle extracted files as normal files.
+
+** ECB now checks at load-time if the required packages semantic and eieio are
+   at least available - regardless of the needed version. If at least one of
+   these packages is missing then ECB offers to download and install it. More
+   details are available in the installation instructions.
+
+
+
+* Changes for ECB version 1.92.1
+
+** Fixed bugs:
+
+*** Fixing eating up a lot of CPU-power just for updating the menu-
+    entries of current compilation-buffers in the ECB-menu. Now the mechanism
+    is based on a idle-timer and a cache.
+    Fixed with great testing-help by Dan Debertin <airboss@nodewarrior.org>
+
+*** Fixed a bug which always truncates lines in the ECB-windows regardless
+    of the value of `ecb-truncate-lines'
+
+*** The upgrade library of ECB now explicitly requires and loads the
+    library executable.el because Emacs 20.X does not autoload the
+    function `executable-find'.
+
+*** `ecb-toggle-compile-window' now works also correct if called with
+    a prefix arg.
+
+
+
+* Changes for ECB version 1.92
+
+** Fixed bugs:
+
+*** Fixed small bugs in the popup-menu of the history-buffer.
+
+*** Fixed some not working links in the FAQ.
+
+** ECB now includes a file "ecb-autoloads.el" which contains all available
+   autoloads of ECB. Therefore loading this file is enough.
+
+** Enhancements to the layout
+
+*** The sizes of the ecb-windows can be fixed even during frame-resizing
+    This new feature is only available with GNU Emacs 21.X. See new option
+    `ecb-fix-window-size'.
+    Suggested by Gunther Ohrner <G.Ohrner@post.rwth-aachen.de>
+     
+*** The command `ecb-store-window-sizes' can now also store fixed sizes.
+    If called with a prefix arg then fixed sizes are stored instead of
+    fractions of frame-width rsp. -height.
+
+*** The command `split-window' is now also adviced to work properly.
+
+** Enhancements for the tree-buffers
+
+*** "Create Source" in the popup-menus now work also for non-java-files.
+
+*** ecb-truncate-lines can now be set different for each ECB-tree-buffer.
+
+*** Easy horizontal mouse-scrolling of the ECB tree-buffers. See new option
+    `ecb-tree-easy-hor-scroll'.
+
+** Added a command `ecb-jde-display-class-at-point' which displays the contents
+   of the java-class under point in the methods-buffer of ECB.
+
+** Renamed previous HISTORY file to NEWS and reformated it for outline-mode.
+
+
+
+* Changes for ECB version 1.91.1
+
+** Fixed bugs:
+
+*** Fixes a bug in the speedbar integration which prevented clicking onto a
+    directory in the speedbar: Always after clicking onto a directory speedbar
+    has re-synced itself to the directory of the current source-buffer in the
+    edit-window. This bug is fixed, now directory navigation in the speedbar
+    works. (Klaus)
+
+*** Fixes a bug in upgrading stored window-sizes from ECB 1.80 to ECB >= 1.90.
+    Fixes also two bugs in `ecb-store-window-sizes' if default-values are used in
+    `ecb-layout-window-sizes' or if ecb-windows have frame-height as height
+    (rsp. frame-width as width) . (Klaus)
+
+*** Fixed a bug in the navigation-history of ECB which sometimes has prevented
+    that a user can open files from the sources/history buffer or clicking onto
+    tokens in the method-buffer. Now the back-forward-navigation works stable.
+    (Klaus)
+    
+** Enhanced the downloading feature of ECB
+
+*** Fixed a bug in the downloading feature of ECB. (Klaus)
+
+*** Now ECB autom. checks at the download sites which versions are available.
+    With the new option `ecb-download-package-version-type' you can define
+    which types of version you allow to download (only stable, stable and betas
+    or stable, betas and alphas); see related section in the online-manual!
+    (Klaus)
+
+*** New command `ecb-download-semantic' for easy getting latest semantic
+    versions. (Klaus)
+
+
+
+* Changes for ECB version 1.90
+
+** The website of ECB has moved from http://home.swipnet.se/mayhem/ecb.html to
+   http://ecb.sourceforge.net. Maintainance has switched from Jesper Nordenberg
+   to Klaus Berndl.
+
+** Fixed bugs:
+   
+*** Fixed an annoying bug which results in an error "Wrong type argument:
+    integer-or-marker-p nil)" after a full buffer reparse. ECB 1.80 has repaired
+    its internal state but nevertheless the user had to re-click on the same
+    token after this error to really jump to a token. With ECB 1.90 this bug has
+    been gone (Klaus).
+
+*** Fixed a small bug in `ecb-add-all-buffers-to-history': If
+    `ecb-sort-history-items' is nil then now the most recently used buffers are
+    added to the top of the history, the seldom used buffers at the bottom.
+    Thanks to Stefan Reichör <xsteve@riic.at>! (Klaus).
+
+*** Fixed some bugs concerning the eshell-integration (Klaus):
+
+**** Synchronizing does not set the mark anymore
+
+**** No longer synchronizing after every command if current source resides in
+     the HOME directory.
+
+**** Redrawing the layout preserves the eshell-buffer in the compile-window.
+
+**** Standard emacs-hooks are not clobbered with ecb-eshell-functions if ECB is
+     not active.
+
+** General enhancements:
+     
+*** Now ECB displays at every start a "Tip of the day" in a dialog-box. This can
+    be switched off with option `ecb-tip-of-the-day'. There is also a new
+    command `ecb-show-tip-of-the-day' (Klaus).
+
+*** Advicing `scroll-all-mode' so it works correct with ECB, means
+    `scroll-all-mode' scrolls only the windows of the edit-area, i.e. max. the
+    two edit-windows (Klaus).
+
+*** Autom. preventing `winner-mode' from being activated as long as ECB is
+    running (Klaus).
+
+*** Now autom. (de)activating ECB via the options ecb-major-modes-activate and
+    ecb-major-modes-deactivate also works when opening files via dired (Klaus).
+
+*** Now ECB can be "autoloaded", i.e.
+    + ecb-activate,
+    + ecb-minor-mode,
+    + ecb-byte-compile and
+    + ecb-show-help
+    are autoload-able via '(autoload ...)' (Klaus)
+
+*** Silencing the byte-compiler, i.e. byte-compilation of ECB should now be
+    warning free. If byte-compilation still throws warnings during
+    byte-compilation with 'ecb-byte-compile' (rsp. using the Makefile or
+    make.bat) please send this to our mailing list. (Klaus)
+
+** Enhancements to the methods/variable/token tree-buffer:
+   
+*** New feature: Now the methods buffer is auto. expanded if the node related to
+    the current token in the edit-window is not visible (probably because its
+    parent is collapsed). See new options `ecb-auto-expand-token-tree' and
+    `ecb-expand-methods-switch-off-auto-expand' and the new command
+    `ecb-toggle-auto-expand-token-tree' (Klaus).
+  
+*** New command `ecb-expand-methods-nodes' which allows precisely expanding
+    tokens with a certain indentation-level. There are also two new related
+    options `ecb-methods-nodes-expand-spec' and
+    `ecb-methods-nodes-collapse-spec' (Klaus).
+
+** Enhancements to the directories tree-buffer:
+    
+*** New command `ecb-expand-directory-nodes' which does the same for the
+    directories tree-buffer as the new command `ecb-expand-methods-nodes' for
+    the methods tree-buffer (Klaus).
+
+*** Rewritten cache-mechanism for directories and sources:
+    Depending on the value of the option ecb-cache-directory-contents the
+    following is cached for a directory:
+    - The disk-contents of the directory means subdirs and files
+    - If ecb-show-sources-in-directories-buffer is nil (i.e. sources are
+      displayed in the extra ECB-sources-window) then also the complete
+      sources-buffer is cached. This results in a speed-boost for big-size
+      directories.
+    The cache of a directory is refreshed and actualized with a POWER-click onto
+    the related directory in the directories-buffer (s.b.) (Klaus)
+
+** Enhancements to the sources tree-buffer:
+   
+*** The option ecb-source-file-regexps now works on a directory-base, which means
+    for each directory-regexp the files to display can be specified. Default is
+    an all-matching directory-regexp. Old saved values are autom. upgraded
+    (Klaus).
+
+** Enhancements to the layout-customization:
+
+*** Naming and managing of layouts has been changed! Now a layout is not longer
+    identified by an integer but by an arbitrary string! Example: The layout
+    with index 0 in ECB <= 1.80 is now named "left1" in ECB 1.90.
+
+**** Therefore the name of the option 'ecb-layout-nr' has changed to
+     'ecb-layout-name'! See the docstring of 'ecb-layout-name' for the names
+     of all built-in layouts.
+
+**** In this context also the type of ecb-show-sources-in-directories-buffer has
+     changed so it is now a list of layout-names where the sources should be
+     displayed in the directories window (or 'always/'never). Now every change of
+     the layout also checks the value of ecb-show-sources-in-directories-buffer.
+  
+**** This change also introduces three new commands:
+     - ecb-change-layout: Change layouts by selecting a name
+     - ecb-delete-new-layout: Delete an user-created (by 'ecb-create-new-layout')
+       layout.
+     - ecb-show-layout-help: Displays the docstring of a layout which at least
+       for built-in layouts contains a picture of the outline of this layout.
+     All three commands offer TAB-completion for easy selecting a layout name.
+
+**** ECB autom. upgrades the following options to theirs new names/types:
+     - ecb-layout-nr: The stored value is transformed to the new name of the
+       related layout and stored in 'ecb-layout-name'
+     - ecb-toggle-layout-sequence: The stored value is transformed to the new
+       type with layout-names instead of layout-numbers.
+     - ecb-major-modes-activate: The stored value is transformed to the new type
+       with layout-names instead of layout-numbers.
+     - ecb-layout-window-sizes: The stored value is transformed to the new type
+       with layout-names instead of layout-numbers.
+     - ecb-show-sources-in-directories-buffer: Reset to the new default value.
+     (Klaus)
+
+*** Adding a new layout type "left-right" which allows the ECB-tree-windows to
+    be located at the left and the right side of the ECB-frame. See the new
+    layouts "leftright1", "leftright2" and "leftright3" for examples. Other
+    layouts of this type can be created or programmed very easy with
+    'ecb-create-newlayout' rsp. the macro 'ecb-layout-define'. (Klaus)
+
+*** Now ECB offers a command `ecb-create-new-layout' for interactively creating
+    new layouts "by example". Read the online-help. (Klaus)
+
+*** Rewritten the mechanism for storing customized window-sizes. See option
+    ecb-layout-window-sizes and the command ecb-store-window-sizes and
+    ecb-restore-window-sizes. Now the sizes are always saved as fractions of
+    the width (rsp. height) of the ECB-frame, so the stored sizes are always
+    correct regardless of the current frame-size (Klaus). Suggested and first
+    implementation by Geert Ribbers [geert.ribbers@realworld.nl]
+
+** General Enhancements of the tree-windows:
+
+*** Introduced a POWER-click (was SHIFT-click before) in the ECB-tree-windows -
+    see documentation of ecb-primary-secondary-mouse-buttons and see also the
+    online-help section "Usage of ECB --> Using the mouse" (Klaus).
+
+*** Now the ECB-tree-buffers offer in their popup-menus a "Grep" and a "Grep
+    recursive" (= grep-find) command where you can perform an easy grep in every
+    directory without buffer-switching before. See also the new options
+    `ecb-grep-function' and `ecb-grep-find-function'. (Klaus)
+
+*** Modified syntax-table for all tree-buffers with all paren, braces and
+    brackets handled as whitespace so for example no paren-matching takes place
+    (Klaus).
+    
+** Enhancements to the layout-engine of ECB:
+   
+*** Added a complete new section "The layout-engine of ECB" to the online-help
+    which describes in detail how to program new layouts and new special
+    windows. This is for foreign packages which want to display own informations
+    in own special windows and synchronizing these windows with the edit-window
+    of ECB (a graphical debugger could be an example). Also a full working
+    example is added in the new file ecb-examples.el. (Klaus)
+
+*** Completely rewritten how to program new layouts. Now there is a new macro
+    `ecb-layout-define' which offers very easy programming of new layouts.
+    (Klaus).
+
+** Enhancements to the compile-window
+
+*** ECB now has a list of valid compilation buffers within the ECB menu. (Kevin)
+
+*** ECB now supports `ecb-enlarged-compilation-window-max-height' which can be
+    used for defining the max. height of the ecb-compile-window if enlarged by
+    `ecb-toggle-enlarged-compilation-window'. (burton)
+
+*** Added new command 'ecb-toggle-compile-window': Toggle the visibility of the
+    compile-window of ECB (Klaus).
+
+** Speedbar is now integrated in ECB and can be used instead of the standard
+   ECB-directories buffer (or instead of all tree-buffers if you like :-). Most
+   of the important basic work has been done by Kevin A. Burton.
+    
+*** See new option 'ecb-use-speedbar-for-directories' and the node "Integrating
+    speedbar" in the online-help. (Klaus)
+
+*** Version-checking for correct speedbar version (>= 0.14beta1). For lower
+    versions ecb-use-speedbar-for-directories has no effect. (Klaus)
+
+*** ecb-speedbar and speedbar first loaded direct before drawing the layout
+    with integrated speedbar. (Klaus)
+
+*** The speedbar-commands speedbar, speedbar-get-focus are adviced during
+    running speedbar within ECB, so they behave in a senseful way. (Klaus)
+
+** Enhancements to the ehell-support of ECB:
+   
+*** ecb-eshell now recenters after command execution. (burton)
+
+*** ecb-eshell now recenters if there are any window resizes.  This is done so
+    that the prompt is always at the bottom of the window. (burton)
+
+*** ecb-eshell integration now protects against buffer-list modifications during
+    transparent eshell updates in the compile window.  In the past, if the eshell
+    was running, and you want from buffer "foo", to "bar", and then tries to go
+    back to "foo" the next entry in your buffer list is "*eshell*" so this would
+    break a lot of completion tools like 'switch-to-buffer.  (burton)
+
+*** Added online documentation for the eshell integration. See section
+    "Tips and tricks". (Klaus)
+
+** New hooks:
+  
+*** New or renamed hooks:
+    - ecb-redraw-layout-after-hook (new)
+    - ecb-redraw-layout-before-hook (new)
+    - ecb-hide-ecb-windows-after-hook (new)
+    - ecb-hide-ecb-windows-before-hook (was ecb-hide-ecb-windows-hook)
+    - ecb-show-ecb-windows-after-hook (new)
+    - ecb-show-ecb-windows-before-hook (was ecb-show-ecb-windows-hook)
+    Read the documentation! (Klaus)
+
+*** Added two general hooks:
+    + ecb-before-activate-hook: Activate ECB only if all added hooks return not
+      nil
+    + ecb-before-deactivate-hook: Deactivate ECB only if all added hooks return
+      not nil
+    (Klaus)
+
+*** Added 5 new hooks for the ECB tree-buffers:
+    + ecb-common-tree-buffer-after-create-hook
+    + ecb-directories-buffer-after-create-hook
+    + ecb-sources-buffer-after-create-hook
+    + ecb-methods-buffer-after-create-hook
+    + ecb-history-buffer-after-create-hook
+    These hooks are called directly after tree-buffer creation so they can be
+    used for example to add personal local key-bindings either to all
+    tree-buffers (ecb-common-tree-buffer-after-create-hook) or just to a certain
+    tree-buffer. Please read the documentation. (Klaus)
+
+
+
+* Changes for ECB version 1.80
+
+** ECB now requires:
+   + Latest stable release of semantic: Version 1.4
+   + Latest stable release of eieio: Version 0.17
+   ECB checks at start-time if the correct versions are available and if not
+   ECB offers you to download and install them from within Emacs. After this
+   you have only to restart Emacs and you are fine. (Klaus)
+
+** Fixed bugs:
+   
+*** Fixed: Now no empty tool-tips are displayed if mouse moves over nodes in the
+    tree-buffers of ECB which can be displayed completely in the tree-window.
+    (Klaus)
+
+*** Fixed a bug in ecb-eshell.  If we are running with current buffer sync, and
+    there is garbage on the current line, when we change buffers this garbage will
+    be executed which could result in a 'command not found' or even worse, a
+    damaging command executed.  We now cleanse the command line prior to directory
+    changed. (Kevin A. Burton) 
+
+*** Fixed a bug in ecb-speedbar.  The speedbar was doing its own updating outside
+    of the ECB.  This means that if you were to change buffers in a frame outside
+    of the ECB frame, the ECB's Speedbar would be updated to reflect a buffer not
+    within the ECB.  We now disable Speedbar's automatic update and have ECB
+    handle this.  (Kevin A. Burton) 
+
+*** Fixed a bug: Sometimes there occurs a a "wrong-type-argument"-error (or
+    "destroyed extent"-error with XEmacs) under some circumstances. Now ECB
+    auto-reparses the buffer and after that ECB is in correct state again.
+    (Klaus)
+
+*** Fixed formatting of "Parent" nodes in token buffer. (Jesper)
+
+** Byte compiling ECB either interactive with `ecb-byte-compile' or with the
+   supplied Makefile now checks also the versions of semantic and eieio.
+   (Klaus)
+
+** ECB now displays the section "First steps" of the online-manual after
+   activating first time. (Klaus)
+
+** Now the adviced versions of `delete-window' and `delete-other-windows' can
+   also handle the optional WINDOW argument of the original versions correctly
+   so the adviced versions now also work correct if called from program (Klaus).
+
+** New adviced window command: `delete-windows-on' now works correct with ECB.
+   See `ecb-advice-window-functions'. (Klaus)
+
+** In the ECB-directories buffer now F4 adds a new source-path instead of F1.
+   That is because F1 is such an important key in many OS and tools (e.g. opens
+   help in all windows-programs), so ECB should not hardly "rebind" it. (Klaus)
+
+** Enhancing the option 'ecb-window-sync': Now the synchronization can take
+   place for all buffers which have a relation to files AND directories, i.e.
+   now also for dired-buffers. But per default this is switched off, see the
+   doc-string. (Klaus)
+
+** Now the ECB online help is available in the standard Info-format and also in
+   HTML-format. With the new option 'ecb-show-help-format' you can choose which
+   format is used by the function 'ecb-show-help'. (Klaus)
+
+** New feature and command: ecb-download-ecb. With this function you can
+   download and install any arbitrary ECB-version from the ECB-website from
+   within Emacs. This is especially useful for upgrading to the latest
+   version. (Klaus)
+
+** New debug mode for ECB which prints some debug informations in the message
+   buffer for certain critical operations with semantic-overlays/extends.
+   New option 'ecb-debug-mode' (also available in the Help-menu of ECB).
+   (Klaus)
+
+** Some default key-bindings have changed; see `ecb-key-map'. (Klaus)
+
+** New feature: Possibility to define a sequence of layouts with new option
+   `ecb-toggle-layout-sequence' and toggle very fast between them via
+   `ecb-toggle-layout'. Read the online-help section "Simulation a speedbar
+   without an extra frame"! (Klaus).
+
+** Two new hooks: ecb-hide-ecb-windows-hook and ecb-show-ecb-windows-hook. Read
+   the documentation. (Klaus)
+   Suggested by Daniel Hegyi <daniel_hegyi@hotmail.com>
+
+** Two new options: ecb-major-modes-activate and ecb-major-modes-deactivate.
+   Allow (de)activation of ECB on major-mode base. Instead of deactivation also
+   just hiding the ECB-windows is possible. Read the docstrings. (Klaus)
+   Suggested by Daniel Hegyi <daniel_hegyi@hotmail.com>
+
+** Redefining of the option 'ecb-compile-window-temporally-enlarge': Now you
+   can specify that the compile-window is auto. enlarged after selecting it and
+   auto. shrinked after leaving it. Read the docstring! (Klaus)
+   Suggested by Daniel Hegyi <daniel_hegyi@hotmail.com>
+
+** Much better and more powerful auto. upgrading-mechanism of incompatible or
+   renamed ECB-options to latest ECB-version. See the option
+   ecb-auto-compatibility-check! (Klaus)
+
+** New option ecb-tree-RET-selects-edit-window: Possibility not to select the
+   edit-window of hitting RET in a tree-buffer; see the doc-string. There is
+   also a new function ecb-toggle-RET-selects-edit-window which is bound to
+   [C-t] in each tree-buffer. (Kevin A. Burton,  Klaus)
+
+** Better grouping of external methods, i.e. methods which are implemented
+   outside the class-definition, like in C++, CLOS and EIEIO. Now this is done
+   completely by semantic. (Klaus)
+
+** For application programmers using the tree-buffer library:
+   + The function tree-buffer-create has a new argument NODE-DATA-EQUAL-FN. See
+     the doc-string for a description (Klaus).
+   + For each tree-buffer a special user-data-storage (for any arbitrary data)
+     is created which can be accessed via `tree-buffer-set-data-store' and
+     `tree-buffer-get-data-store'. See the docstring of `tree-buffer-create'.
+     (Klaus)
+
+    
+
+* Changes for ECB version 1.70
+
+** New option ecb-bucket-token-display. See doc-string for details. (Klaus)
+
+** Reorganization of the faces used by ECB. The group 'ecb-face-options'
+   contains now all options which type is 'face (i.e. the defcustom's) and the
+   group 'ecb-faces' contains all face-definition (the defface's). In addition
+   it is now possible to change easily and fast the general face for ALL
+   ECB-tree-buffers (same for the highlighting face). See the docstring of the
+   new faces 'ecb-default-general-face' and 'ecb-default-highlight-face' for
+   further details. (Klaus).
+
+** Smarter incr. search in a tree-buffer with the [end]-key: If there are at
+   least two nodes with the same greatest common-prefix than every hit of
+   [end] jumps to the next node with this common prefix. (Klaus)
+
+** New feature ecb-auto-compatibility-check: ECB checks on startup if the
+   current value of an ECB-option OPT is not compatible with the type of OPT in
+   current ECB-release. This is done during activation. If there are
+   incompatible options ECB resets them to the default value of current ECB
+   release and displays after activation in a temporary window which options
+   have been reset, incl. their old-value (before the reset) and new-value
+   (after the reset). (Klaus)
+
+** New feature ecb-tree-navigation-by-arrow: Smarter navigation in the
+   tree-windows with left- and right-arrow key (Klaus).
+   Thanks for the suggestion and a first implementation to Geert Ribbers
+   <geert.ribbers@realworld.nl>!
+
+** New feature 'ecb-type-token-display'. See the doc-string of this new option
+   for a description. (Klaus)
+
+** Now the option 'ecb-post-process-semantic-tokenlist' has per default an
+   entry for emacs-lisp-mode, so for eieio-code the methods (defmethod) of a
+   class are grouped with respect to the class they belong. The new default
+   value of this option does this for c++- and eieio-code. (Klaus)
+
+** Now in the ECB-tree-buffers RETURN works like the primary button (already in
+   previous versions) and C-RETURN works like the secondary button (new in
+   version 1.70). For an explanation of primary and secondary see the option
+   ecb-primary-secondary-mouse-buttons. (Klaus)
+
+** New feature: Now the token-display function can be defined separated for
+   each major-mode. Furthermore the token-display for C++ has enhanced,
+   especially for template-classes (but template displaying is first available
+   with semantic > version 14beta13!).
+   For this the option ecb-token-display-function has been completely rewritten
+   and is now incompatible with the old values before ECB 1.61. (Klaus)
+
+** Fixed a bug with mouse-avoidance-mode (only relevant for GNU Emacs 20.X)
+   Klaus. 
+
+** New feature, ecb-select-edit-window-on-redraw.  Mostly used if you are running
+   with ecb-redraw-layout-quickly and want to make sure you are always in the
+   edit window. (Kevin)
+
+** New feature, ecb-auto-activate.  If non-nil we can start the ECB after Emacs
+   is started.  See `ecb-auto-activate' for more information.  (Kevin)
+
+** New package, ecb-cycle.el.  Supports cycling through all known compilation
+   buffers. (Kevin)
+     + ecb-cycle-switch-to-compilation-buffer - switch to available compilation
+       buffers.
+     + ecb-cycle-through-compilation-buffers - cycle through all compilation
+       buffers.
+  
+** Much better performance of the directory and file-browser in ECB, especially
+   for directories with a lot of entries (means ~ >1000, dependent on your
+   machine and the net-connection in case of network-drives). See also the new
+   feature: ecb-cache-directory-contents. (Klaus)
+
+** ecb-eshell now supports customization.  (Kevin)
+
+** New feature: ecb-layout-always-operate-in-edit-window. Look at the
+   documentation. (Kevin & Klaus)
+
+** Fixed a bug in `ecb-toggle-ecb-windows'.  For starters we weren't setting
+   `ecb-window-hidden' when we redraw the layout.  This means that the ecb
+   windows could be hidden but never shown.
+   Other things:
+   + ecb-windows-hidden now has documentation
+   + we display status messages when we hide windows. (Kevin)
+
+** Fixed bug in `ecb-redraw-layout-quickly'.  If for come reason any of the ECB
+   windows are not alive, we do not return with a hard error.  Instead, we use
+   the scratch buffer.  (Kevin)
+
+** New function ecb-toggle-enlarged-compilation-window allows users to expand and
+   then contract the compilation window with a new key binding C-c . / (Kevin)
+
+** new option ecb-add-path-for-not-matching-files. Look at the documentation
+   (Klaus).
+
+
+   
+* Changes for ECB version 1.60
+
+** ecb-highlight-token-header-after-jump is now a boolean; which face is used
+   for highlighting is defined in ecb-token-header-face. (Klaus)
+
+** New option 'ecb-post-process-semantic-tokenlist': Special post-processing of
+   the semantic tokenlist for certain major-modes. This is useful for
+   c++-mode. Now with the default value of this option all methods in a
+   c++-implementation-file (no class/method-declaration but only method
+   implementations) are grouped with respect to the class they belong. (Klaus)
+
+** Now also with C++ Sources the method- and variable-protection is displayed
+   correct in the ECB-method buffer (Klaus).
+
+** Fixed a bug which prevented ECB using the root path "/" on Unix-like systems
+   as a source-path. (Klaus)
+
+** If a file via the standard-mechanisms of Emacs (e.g. find-file) is opened,
+   then the auto. window sync (see `ecb-window-sync') has worked only correct
+   if the new file is located in any of the paths in `ecb-source-path'. Now ECB
+   adds the path of the new file at least temporally via `ecb-add-source-path'
+   to the list of paths in `ecb-source-path', so the window-sync works always
+   correct. ECB asks the user if the new path should saved also for future
+   sessions. (Klaus)
+
+** Added ecb-redraw-layout-hooks so that code can be executed after we redraw the
+   ecb layout.
+
+** New hook ecb-current-buffer-sync-hook allows developers to add code to be
+   evaluated after the ECB is synchronized with the current buffer.
+
+** Now all faces used by ECB for highlighting and displaying it“s own stuff are
+   customizable. See new group 'ecb-faces' (Klaus).
+
+** ECB is now fully prepared for Emacs 21. The new feature
+   `ecb-show-node-info-in-minibuffer' is implemented with the new 'help-echo
+   property of Emacs 21, therefore the ugly `track-mouse' mechanism is not
+   needed anymore with Emacs 21. (Klaus).
+
+** The options `ecb-show-node-name-in-minibuffer',
+   `ecb-show-complete-file-name-in-minibuffer' and
+   `ecb-show-file-info-in-minibuffer' are gone and have been replaced by one
+   single new option `ecb-show-node-info-in-minibuffer' where you can define
+   separately for every tree-buffer when and which node info should be
+   displayed in the minibuffer (Klaus).
+
+** ecb-auto-expand-directory-tree now offers two options:
+   - best: Expand always the best matching source-path for a file
+   - first: Expand always the first matching source-path for a file (Klaus)
+
+** Fixed a bug in auto. expanding directories if a source-path has an alias.
+   (Klaus)
+
+** If mouse is moved over an alias in the directories buffer then the real path
+   is shown in the echo-area; see also 'ecb-show-node-info-in-minibuffer'
+   (Klaus).
+
+** If mouse is moved over an history-entry then the full path is shown in the
+   echo-area so you can distinct better between two entries with the same name
+   but with different paths; see also 'ecb-show-node-info-in-minibuffer'
+   (Klaus).
+
+** New option for the history: ecb-kill-buffer-clears-history defines if
+   `kill-buffer' should also remove the corresponding history entry. There are
+   several options (Klaus).
+
+
+   
+* Changes for ECB version 1.52
+
+** Added EIEIO requirement to ECB.
+
+
+
+* Changes for ECB version 1.51
+
+** Now the names of all ECB buffers begin with a SPC per default. (Klaus)
+
+** ECB now can handle not only full but also partial buffer reparsing if done
+   by semantic and other tools (e.g. JDE >= 2.2.9). The method buffer will
+   always be uptodate if for a major-mode auto. reparsing after buffer changes
+   is enabled (the auto. buffer reparsing itself is not an ECB feature but must
+   be supplied by the major-mode, e.g. JDE). (Klaus)
+
+** Incremental node-search in the ECB-buffers now uses the value of
+   `case-fold-search'. (Klaus)
+
+** Complete new customization of the ECB-key-bindings. The option
+   `ecb-prefix-key' has been removed. There is one new option `ecb-key-map'
+   where you can customize all key-settings of ECB (including a common
+   prefixkey). (Klaus)
+
+** ecb-add-source-path and ecb-delete-source-path now ask if saving should be
+   done for future sessions (Klaus).
+
+** Added new navigator functionality. Makes it easy to go to the back and forward
+   in navigated tokens and buffers. See ecb-nav-goto-next and 
+   ecb-nav-goto-previous. (Jesper)
+
+** Added an option to narrow the buffer to the token that is jumped to. See
+   ecb-token-jump-narrow. (Jesper)
+
+** Fixed a small bug that placed the window start at the beginning of the token
+   instead of the beginning of the token line. (Jesper)
+
+
+      
+* Changes for ECB version 1.50
+
+** Fixed a minor bug that occured when de-activating ECB under XEmacs. (Jesper)
+
+** ecb-layout-window-sizes variable is now an association list, which makes it
+   easier to add and remove layouts. (Jesper)
+
+** Added a new layout (nr. 12). Thanks to Nick Cross
+   <nick.cross@prismtechnologies.com> for this layout.
+
+** Each source path can now have an alias that is displayed instead of the path
+   name in the directories buffer. (Jesper)
+
+** The history items can now use the buffer name instead of the file
+   name. Customizable with ecb-history-item-name. (Jesper)
+
+** When jumping to a token the window can be scrolled so that the token starts 
+   at the top or center of the window. This behavior is customizable with
+   the variable ecb-scroll-window-after-jump. (Jesper)
+
+** Fixed a bug when retrieving parent names for a token. (Jesper)
+
+** Now the option 'ecb-prefix-key' is customizable so you can define another
+   prefix if there are conflicts with other minor-modes or packages (Klaus).
+
+
+   
+* Changes for ECB version 1.41
+
+** Fixed bug when clicking on token in the methods buffer in XEmacs.
+
+
+
+* Changes for ECB version 1.40
+
+** Tree-incremental-search in the ecb-windows now ignores all non interesting
+   stuff:
+   + any leading spaces
+   + expand/collapse-buttons: [+] rsp. [-]
+   + protection-signs (+, -, #) in the method-window if uml-notation is used
+   + variables types or return-types in front of variable- or method-names.
+   + const specifier for variables
+   This makes incremental-searching in a tree-buffer much faster and easier.
+   (Klaus)
+
+** ECB now uses Semantic DB to find parents of types. (Jesper)
+
+** Long source paths in the directories buffer are now truncated at the
+   beginning. Customizable with variable ecb-truncate-long-names. (Jesper)
+
+** Tokens can now be sorted by access. (Jesper)
+
+** Added a function to semantic-clean-token-hooks that just updates the token
+   changed instead of re-building the entire token tree. (Jesper)
+
+** Implemented a token tree cache that stores recently opened buffers' token
+   trees. This makes the buffer switching much faster and also saves expanded
+   nodes and window positions. The cache is unlimited at the moment. (Jesper)
+
+** Added a speedbar-like layout nr. 11. This is very useful (like also layout
+   nr. 10) either for users with small screens or users which normally do not
+   need/want the ECB-windows but sometimes browsing/selecting
+   methods/variables. (Klaus)
+
+** Better extraction of tokens from current buffer. ECB now displays any token
+   type in any order. (Jesper)
+
+** ECB now uses Semantic to display tokens in the methods buffer. (Jesper)
+
+** Much saver ecb-redraw-layout: Now the layout can be restored ALWAYS
+   regardless what messy thing has been done before. (Klaus)
+
+** New advice for 'other-window-for-scrolling', so all scroll-functions for the
+   "other" window can also scroll the first edit-window if point stays in the
+   second one. (Klaus)
+
+** ecb-toggle-ecb-windows now preserves the split, the split-amount, the buffer
+   contents, the window starts and current point. (Klaus)
+
+** Some important changes in the ECB-layout concerning displaying compilation-
+   and temp-buffers. (Klaus):
+
+*** 'ecb-select-compile-window' has been gone.
+  
+*** 'ecb-use-dedicated-windows' is not longer a user-customizable option but
+    it is always set to t, because this is essential for correct working of
+    the ecb-layout engine!
+
+*** 'ecb-compile-window-temporally-enlarge' is now a boolean option.  
+
+*** Now ECB does all necessary that your edit-window of ECB seems to be a
+    normal Emacs frame, especially concerning displaying temp-buffers (like
+    help- and completion-buffers) and compilation-buffers.
+    
+*** The variables 'compilation-window-height' and 'temp-buffer-shrink-to-fit'
+    (XEmacs) and 'temp-buffer-resize-mode' (GNU Emacs) are now fully supported
+    by ECB if no durable compilation-window is shown.
+
+** New function to toggle visibility of the ECB windows. Now it“s possible to
+   hide all ECB windows without deactivating ECB (see 'ecb-toggle-ecb-windows')
+   (Klaus).
+
+** ECB is now a global minor mode with it“s own menu "ECB" and it“s own key-map
+   with prefix "C-c .". New function to (de)activate/toggle ECB with
+   'ecb-minor-mode'. (Klaus)
+
+** Fixed a bug in highlighting current token in the method-buffer when
+   font-lock-mode is nil for the source-buffer. (Klaus)
+
+** New option for highlighting the method-header in the edit-window after
+   clicking onto the method in the method-window (like Speedbar does). (Klaus)
+
+** Function for automatically submitting a problem report to the ECB mailing
+   list: ecb-submit-problem-report. (Klaus)
+
+** Now not only for method-highlighting an idle delay can be set but also for
+   synchronizing the ECB windows with current edit window (see option
+   ecb-window-sync and ecb-window-sync-delay; default is 0.25 sec delay)
+   (Klaus).
+
+** Smarter highlighting of current method (Klaus).
+
+** All tree-buffers now have as default-directory the current selected
+   directory in the directory buffer. So you can also open files with find-file
+   etc. from within the tree-buffers. (Klaus).
+
+
+   
+* Changes for ECB version 1.32
+
+** Nil parent bug fixed. (Jesper)
+
+** New advices for find-file and switch-to-buffer (Klaus).
+
+** Now possible to set an idle delay before the current method is highlighted;
+   useful for slow machines but prevents also "jumping backward/forward" during
+   scrolling within java-classes if point goes out of method-definition into
+   class-definition. Default is an idle time of 0.25 seconds. (Klaus).
+
+
+   
+* Changes for ECB version 1.31
+
+** Parents (extends and implements) of the classes in the current buffer is now
+   shown in the methods buffer. (Jesper). Possibility to define a regexp which
+   parents should not be shown. (Klaus).
+
+** Now displaying the complete node name in minibuffer with the track-mouse
+   mechanism works also with mouse-avoidance-mode on; the mouse-avoidance will
+   be deactivated as long ECB is activated and the node-name display-mechanism
+   is on. This refers only to GNU Emacs! (Klaus)
+
+** Fixed a bug in 'ecb-current-buffer-sync' and 'ecb-redraw-layout' (Klaus)
+
+** Fixed a bug in loading semantic 1.3.3 or semantic 1.4 (Klaus)
+
+
+
+* Changes for ECB version 1.30
+
+** If not all ECB-tree-windows of current layout are visible at redraw-time
+   ('ecb-redraw-layout') then the redraw synchronizes the contents of the
+   tree-windows with the source displayed in current edit-window (Klaus).
+
+** Added a section "Tips and Tricks" to the ECB online-help. (Klaus)
+
+** Added a new layout Nr. 10 for very small screen resolutions where all
+   square-centimeters are needed for the editing itself. This layout only
+   displays a method-window and a edit-window. (Klaus).
+
+** The messages displayed after moving the mouse over a node in a tree-buffer
+   do not longer wasting the log, means they will not be logged (Klaus).
+
+** ECB now also works with semantic >= 1.4 (Klaus).
+
+** Now the ecb-compile-window-height is also preserved after displaying
+   temp-buffers (e.g. help-buffers after C-h f) - if you want this. See the
+   documentation of the option 'ecb-compile-window-temporally-enlarge'. (Klaus)
+
+** Added menu items for modification of the source paths in the directories
+   buffer. (Jesper)
+
+** Added buttons to directories buffer. (Jesper)
+
+** Mouse over files, methods etc. now work even if follow-mouse isn't
+   activated (Jesper). ECB adds a more intelligent mouse tracking mechanism, so
+   not only the mouse-over-node stuff of ECB works now very well and savely but
+   also follow-mouse itself works better and saver as without activated ECB.
+   (Klaus)
+
+** Popup menus now work in XEmacs. (Jesper)
+
+** You can now specify paths with env-vars like $HOME in the option
+   `ecb-source-path'. (Klaus)
+
+** The user must now confirm if he tries to delete the ECB frame. If he wants
+   to proceed then ECB will be first deactivated before deleting the frame.
+   This works for all ways to delete a frame (shortcut, window-manager-button,
+   ...). (Klaus)
+
+** ECB now optionally create its own frame when activated. See the new option
+   'ecb-new-ecb-frame'. (Klaus)
+
+** Intelligent recentering of tree-buffers now completely implemented without
+   the function 'recenter'. This means no flickering and flashing the whole
+   frame anymore after each 'recenter'. Now the ECB display is stable like a
+   rock :-) (Klaus)
+
+** Mouse over directories now shows directory path. (Jesper)
+
+** Methods and variables with point are now highlighted. (Jesper)
+
+** ECB windows are now updated when saving new files and deleting files. (Jesper)
+
+** incremental-search in every tree-buffer for easier and faster selecting
+   nodes with the keyboard (see new option `ecb-tree-incremental-search' and
+   new function 'tree-buffer-incremental-node-search') for more details.
+   (Klaus)
+
+** ecb-redraw-layout now restores both edit window buffers and the edit window
+   start. (Jesper)
+
+** Spelling corrections. Thanks to Colin Marquardt
+   <colin.marquardt@usa.alcatel.com> for spotting them.
+
+** Mode line prefixes can now be set individually for each ECB-buffer. There is
+   a default-prefix for each buffer but the user can also define a custom
+   prefix or no prefix at all. (Jesper/Klaus)
+
+** Fixed small bug in directory tree that caused directories to be sorted by
+   extension. (Jesper)
+
+
+   
+* Changes for ECB version 1.20
+
+** Now the ECB-buffers are intelligent in displaying nodes (Klaus):
+   + Expandable nodes: (e.g. a directory with it“s subdirectories). An
+     ECB-tree-window now tries always to make visible as much as possible of
+     the sub-nodes of a node if a node is expanded (e.g. by clicking onto it“s
+     expand-symbol).
+   + Other nodes: A ECB-tree-window is always best filled, means no empty lines
+     if there are enough lines to fill the whole window.
+
+** The source file is only parsed if the ECB methods window is visible
+   (Jesper).
+
+** The methods buffer now show fields of EIEIO classes. Only works with
+   semantic 1.4. Thanks to Eric M. Ludlam <eric@siege-engine.com> for
+   this patch.
+
+** Now all adviced functions behave only special in the ECB-frame. In each other
+   frame they behave exactly like the not adviced functions. (Klaus)
+
+** Fix "invalid method-buffer"-bug (Klaus, with a lot of help by Eric Ludlam
+   and David Ponce).
+
+** Source files can now be sorted by name, extension or not sorted at all
+   (Jesper).
+
+** Now you can precisely define by an exclude and include regexp which files
+   should be displayed by ECB. (Jesper).
+
+** Jumping to a method/variable from the ECB-method buffer now sets the mark so
+   the user can easily jump back (see `ecb-method-jump-sets-mark'). (Klaus)
+
+** Now you can define a primary and a secondary mouse-button for ECB. See the
+   new variable `ecb-primary-secondary-mouse-buttons'.
+   Note: The name of the option 'ecb-left-mouse-jump-destination' has been
+   changed to `ecb-primary-mouse-jump-destination'!
+
+** Now ECB is really ediff-friendly: During ediff is active the advices of ECB
+   are temporally deactivated! (Klaus)
+
+** Now all tree-buffers (ECB-buffers) are read-only (Klaus)!
+
+** Better implementation of advising the functions. Now all advice-able
+   functions are completely independent from each other (Klaus)!
+
+** Removes the redundant modeline info and shows important
+   information.
+
+** Added new option `ecb-advice-window-functions'. Enabling the intelligent
+   window functions via customize. No hook hacking necessary anymore!
+   Now the intelligent window functions are implemented by advicing (Klaus).
+
+** Better online help display (Klaus).
+
+** Added new option 'ecb-primary-mouse-jump-destination' (thanks to David Hay
+   for suggestion <David.Hay@requisite.com>.
+
+** Adviced 'other-window' acts now exactly like the original but always related
+   to 'ecb-other-window-jump-behavior' (Klaus)!
+
+** Fixed bug with 'ecb-compile-window-height'. Now ECB has always the correct
+   compile-window height after compilation-output (compile, grep etc.)
+
+** New option 'ecb-compile-window-temporally-enlarge'. Allowing
+   Emacs-compilation to enlarge the ECB-compile-window temporally.
+
+
+   
+* Changes for ECB version 1.10
+
+** Automatic expansion of the directory tree.
+
+** Method parsing is now recursive, so that for example inner classes
+   in Java are shown in the methods buffer.
+
+** Variables are now shown in the methods buffer.
+
+** Selected files and directories now use the secondary-selection
+   face. Thanks to Kevin A. Burton <burton@relativity.yi.org> for this
+   patch.
+
+** Fixed some issues with XEmacs. Thanks to Colin Marquardt
+   <colin.marquardt@usa.alcatel.com> for this.
+
+** Fixed bug with truncating lines in tree-buffer.el.
+
+** The methods buffer can now be automatically updated when the source
+   file is saved.
+
+** Help text is available with "ecb-show-help".
+
+** Moving the mouse over a node shows the name in the
+   mini-buffer. Currently this only works when follow-mouse is
+   activated.
+
+
+   
+* Changes for ECB version 1.0
+
+** Changed name from JCB to ECB and prefix from "jde-jcb-" to "ecb-".
+
+** Works with semantic 1.3.1 and higher.
+
+** Fixed a couple of bugs when creating and deleting files.
+
+** Grouped customization variables.
+
+** Contributed by Klaus Berndl <klaus.berndl@sdm.de>:
+
+*** A lot of intelligent ECB window-functions (e.g. ecb-delete-window) which
+    gives you the feeling as if the edit-window is the only window of the ECB
+    frame.
+
+*** New layout functionality.
+
+*** The history buffer can optionally be sorted and also cleared.
+
+*** The package expanded symbol can optionally be placed before the package name.
+
+*** Syntax highlighting of the methods buffer.
+
+*** Show argument names and return type in the methods buffer.
+
+*** History clear function: ecb-clear-history.
+
+*** Added pop-up menu to the history buffer.
+
+*** Fixed edit buffer sync bug.
+
+
+
+* Changes for ECB version 0.04
+
+** Keyboard navigation in JCB buffers. Use Return to select and Tab to expand.
+
+** Tree view of packages.
+
+** Class files can be viewed in the packages buffer.
+
+** Better handling of mouse events.
+
+** Automatic update of the packages buffer.
+
+** Added pop-up menus to the packages and classes buffers. They are activated 
+   with mouse button 3 (right button).
+
+** Added method sorting. Thanks to Brian Anderson <brian.anderson@luna.com> 
+   for this improvement.
+
+
+   
+* Changes for ECB version 0.03
+
+** Fixed naming of variables.
+
+** Fixed license and copyright comments.
+
+** Fixed class file regular expression bug. 
+   Thanks to Jim Loverde <loverde@str.com> for finding it.
+
+** Added three new layouts.
+
+** The JCB buffers can now be (almost) synchronized with the edit window.
+
+** When clicking on a class or method using mouse button 2, it will be loaded
+   into another window. A new customization variable was added for this.
+
+** Minor changes. Thanks to Jim for his suggestions.
+
+** Removed the "jde-jcb-window-skips-from-methods-buffer" and 
+   "jde-jcb-window-skips-from-history-buffer" customization variables.
+
+   
+   
+* Changes for ECB version 0.02
+
+** Changed prefix from "jcb-" to "jde-jcb-". This will cause JCB customization 
+   variables to be saved in JDE project files.
+
+** Lists and parses non-Java file types. Currently the C and Lisp parsers from 
+   semantic-ex.el are used.
+
+** History buffer implemented.
+
+** Layout function implement. Thanks to Jim Loverde <loverde@str.com> for 
+   helping out with this.
+
+** Packages matching a regular expression can be excluded from the packages 
+   buffer. Thanks to Mark Gibson <mark@markg.co.uk> for this feature.
+
+
+   
+* Changes for ECB version 0.01
+
+** Initial version.
+
+
+
+Local variables:
+mode: outline
+paragraph-separate: "[ 	]*$"
+end:
diff --git a/site/ecb-2.40/README b/site/ecb-2.40/README
new file mode 100644
index 0000000..d3c9e3a
--- /dev/null
+++ b/site/ecb-2.40/README
@@ -0,0 +1,182 @@
+README for the Emacs Code Browser (ECB) version 2.40
+
+
+About
+-----
+
+This package contains a code browser for several programming-languages for
+(X)Emacs. For instructions on how to use the browser read the online-help
+either with the shipped info-manual (see "Usage" below) or direct from the
+ECB-Homepage at http://ecb.sourceforge.net.
+
+The latest version can be found at: http://ecb.sourceforge.net
+
+------------
+Requirements
+------------
+
+1. Emacs-version: ECB works only with (X)Emacs >= 21! If you have an older
+   one, please upgrade.
+
+2. Install CEDET-suite: Get it from http://cedet.sourceforge.net, read
+   the setup-instructions in http://cedet.sourceforge.net/setup.shtml and
+   read also the shipped file INSTALL.
+
+3. Only for XEmacs-users: If you use XEmacs you must have installed the
+   package c-support (contains hideshow.el). If you want to read the
+   online-help of ECB in HTML-format you must have the library browse-url
+   (part of the mail-lib XEmacs package) installed; this package is also
+   needed for submitting problem-reports to the ECB-maintainers!
+
+4. Optional for Java-coding: If Java code is edited the ECB works best when
+   the JDEE package ( http://jdee.sourceforge.net) is installed.
+
+
+Do not install ECB before you have successfully installed the requirements!
+
+
+------------
+Installation
+------------
+
+*IMPORTANT*: ECB is no longer runnable as XEmacs-package via the
+package-manager of XEmacs. This is because CEDET is not available as
+XEmacs-package. Therefore ECB can also not be run as XEmacs-package. If CEDET
+will later become a XEmacs-package then probably ECB will come back as
+XEmacs-package. But in the meanwhile you have to install ECB "by hand".
+
+  1. Fulfill all requirements ECB needs (*note Requirements::)
+
+     ECB performs two autom checks:
+
+        - At load-time: It checks if the cedet-suite is at least installed so
+          ECB can be loaded. If not it reports an error.
+
+        - At start-time: It checks if the correct versions of cedet and
+          semantic are installed and gives you proper feedback.
+
+     So if you are not sure if you have installed the required packages at
+     all or if you have installed the correct versions of these packages then
+     do not worry about this, just go on with the following installation
+     steps: If ECB is missing something it will give you proper feedback and
+     support not later than at load-time or start-time!
+
+  2. Download and unpack the ECB archive (probably you have already done this
+     :-)
+
+  3. Add the new ECB-directory to your `load-path' variable.
+
+     You *MUST* add the ECB-install-directory to the `load-path' either by
+     changing the `load-path' variable directly in your `.emacs' or
+     `site-lisp/site-start.el' or by working with a file `subdirs.el'(1).
+
+     So for example the needed entry for your `.emacs'-file could be:
+
+        (add-to-list 'load-path
+                     "/path/to/your/ecb/installation/directory")
+
+     *ATTENTION*: ECB is NOT properly installed if it's directory is not
+     added to `load-path' and for example just loaded by
+
+        (load-file "/path/to/ecb/ecb.el")
+
+     Do not do this! It will not work!
+
+  4. Load ECB by adding code to your `.emacs':
+
+     If you want to load the complete ECB at (X)Emacs-loadtime (Advantage:
+     All ECB-options available after loading ECB. Disadvantage: Increasing
+     loadtime(2)):
+
+        (require 'ecb)
+
+     If you want to load the ECB first after starting it by `ecb-activate'
+     (Advantage: Fast loading(3).  Disadvantage: ECB- and semantic-options
+     first available after starting ECB):
+
+        (require 'ecb-autoloads)
+
+     This loads all available autoloads of ECB, e.g. `ecb-activate',
+     `ecb-minor-mode', `ecb-byte-compile' and `ecb-show-help'.
+
+     Regardless which method you prefer: In both cases the used statement
+     must be placed *after* the statement of step 3!
+
+  5. Restart (X)Emacs.
+
+ECB is now ready for use and can be activated by calling `M-x ecb-activate'
+or `ecb-minor-mode'. Now you can either starting using ECB or you can do
+these optional installation steps:
+
+  6. Reading the online help with `ecb-show-help'
+
+     Maybe you are interested to read the online-help of ECB before first
+     start.
+
+  7. Bytecompiling ECB with `ecb-byte-compile'
+
+     This byte compiles ECB. You can safely ignore all messages if there are
+     any. (You can also bytecompile ECB from the command-line either by using
+     the `Makefile' or by using the batch-file `make.bat'; just read the
+     comments in that file you choose.)
+
+  8. Installing the Info-help of ECB
+
+     The ECB distribution contains a subdirectory `info-help' which contains
+     the online-help of ECB in Info-format. You can install this online help
+     so it's available in the Top-directory of Info. There are two ways to do
+     this:
+
+        - Use "install-info" (recommended):
+
+            1. Copy the files of the subdirectory `info-help' into the
+               info-directory of Emacs
+
+            2. Install the file `info-help/ecb.info' with the command
+               "install-info" (if available on your system) in the `dir'-file.
+
+          The supplied `Makefile' offers a target `install-help' which does
+          both of these steps. You have just to call `make install-help' with
+          the correct EMACSINFOPATH set (see the comment in `Makefile'). Here
+          is an example:
+
+             make EMACSINFOPATH=/path/to/emacs/info install-help
+
+        - Manually Installation:
+
+          Copy the files of the subdirectory `info-help' into the
+          info-directory of Emacs and modify the file `dir' manually.
+
+     But it doesn't matter if you do not execute this step (8.) because the
+     online help of ECB is always available though, see `ecb-show-help'.
+
+     
+-----   
+Usage
+-----
+
+Call "M-x ecb-activate" to activated ECB.
+
+Call "M-x ecb-customize-most-important" to get a list of the most important
+options of ECB. These are options you should at least know that they exist.
+
+Call "M-x ecb-show-help" to get a detailed online-help for ECB. If you are
+using ECB the first time you should read the online help accurately!
+
+--------
+Contacts
+--------
+
+Send comments, bug reports and improvement suggestions to:
+
+ecb-list@lists.sourceforge.net
+
+*IMPORTANT*: Cause of extra appearance of SPAM in the mailing-lists,
+SourceForge has changed its policy: Now it is only possible to post to the
+mailing-list for users who have subscribed this mailing-list.
+
+So please be aware you will not be able to send comments, bug reports and
+improvement suggestions before you have subscribed the ECB-mailing-list. See
+the section "Mailing-list" at the ECB-website at http://ecb.sourceforge.net
+how to do this.
+
diff --git a/site/ecb-2.40/RELEASE_NOTES b/site/ecb-2.40/RELEASE_NOTES
new file mode 100644
index 0000000..b53779d
--- /dev/null
+++ b/site/ecb-2.40/RELEASE_NOTES
@@ -0,0 +1,288 @@
+This file contains some important release-notes for ECB version 2.40
+
+General:
+--------
+
+Please read also the sections "Known conflicts and bugs" and "Tips and Tricks"
+in the online help ('ecb-show-help'). The former one is a small list of known
+conflicts and for each conflict a proper and easy solution! Please read also
+carefully the upgrade informations below!
+
+
+Installing ECB first time:
+--------------------------
+
+No special notes beyond the contents of README.
+
+
+Upgrading from any version:
+---------------------------
+
+If you are upgrading from version newer then 2.27 (ie. ecb-version > 2.27)
+then you can skip the rest of this release notes.
+
+
+Upgrading from any version < 2.27:
+----------------------------------
+
+The option `ecb-auto-expand-tag-tree-collapse-other' has changed its type. ECB
+autom. upgrades your old setting to the new option-type.
+
+
+Upgrading from any version < 2.26:
+----------------------------------
+
+Some regexp-options has been changed to regexp-list-options:
+`ecb-excluded-directories-regexp' --> `ecb-excluded-directories-regexps'
+`ecb-source-file-regexps'         --> `ecb-source-file-regexps'
+`ecb-exclude-parents-regexp'      --> `ecb-exclude-parents-regexps'
+
+All these options now accept (and require) a list of regexps instead of
+exactly one big regexp. ECB autom. upgrades your old settings to the new
+option-types rsp. also -names (if the option has been renamed).
+
+
+Upgrading from versions < 2.25:
+-------------------------------
+
+`ecb-sort-history-items' has been renamed to `ecb-history-sort-method'. ECB
+autom. upgrades your old setting to the new option-name and -type.!
+
+
+Upgrading from versions < 2.23:
+-------------------------------
+
+The option `ecb-show-tags' has changed its type. ECB autom. upgrades your old
+setting to the new option-type.!
+
+
+Upgrading from versions < 2.20:
+-------------------------------
+
+All user-defined extensions written for and added to one of the options
+`ecb-directories-menu-user-extension', `ecb-sources-menu-user-extension',
+`ecb-methods-menu-user-extension' or `ecb-history-menu-user-extension' MUST be
+rewritten and redefined via the new macro `tree-buffer-defpopup-command'!
+
+The option `ecb-primary-mouse-jump-destination' has been renamed to
+`ecb-mouse-click-destination' and has also changed its default value to
+'last-point.
+
+The option `ecb-split-edit-window' has been renamed in
+`ecb-split-edit-window-after-start'. In addition the value t is not allowed
+anymore for this option - use 'before-activation instead. In a further
+addition this option has a new default value 'before-deactivation. See the
+docstring of this option to get all details.
+
+The Option `ecb-other-window-jump-behavior' has been renamed to
+`ecb-other-window-behavior'.
+
+ECB autom. upgrades your old settings to the new option types/names!
+
+    
+Upgrading from versions < 2.11:
+-------------------------------
+
+The type of the option `ecb-post-process-semantic-taglist' has been changed.
+ECB autom. upgrades the old-value of that option to the new type! There is
+nothing to do for you. 
+
+
+Upgrading from versions < 2.01:
+-------------------------------
+
+The following options have changed their name:
+
+- ecb-auto-expand-token-tree           -> ecb-auto-expand-tag-tree
+- ecb-font-lock-tokens                 -> ecb-font-lock-tags
+- ecb-token-jump-sets-mark             -> ecb-tag-jump-sets-mark
+- ecb-token-display-function           -> ecb-tag-display-function
+- ecb-type-token-display               -> ecb-type-tag-display
+- ecb-post-process-semantic-tokenlist  -> ecb-post-process-semantic-taglist
+- ecb-show-only-positioned-tokens      -> ecb-show-only-positioned-tags
+- ecb-show-tokens                      -> ecb-show-tags
+- ecb-highlight-token-with-point       -> ecb-highlight-tag-with-point
+- ecb-highlight-token-with-point-delay -> ecb-highlight-tag-with-point-delay
+- ecb-token-visit-post-actions         -> ecb-tag-visit-post-actions
+- ecb-token-header-face                -> ecb-tag-header-face
+
+ECB autom. upgrades all old-values of these options to the new options! There
+is nothing to do for you.
+
+The type of the options `ecb-directories-menu-user-extension',
+`ecb-sources-menu-user-extension', `ecb-methods-menu-user-extension' and
+`ecb-history-menu-user-extension' has been changed - now sub-menus are
+allowed. The new default values of these options contains now entries, mostly
+concerning "version control". ECB autom. upgrades the old-values to the new
+option-type by appending the new defaults to your old values. So no old
+personal menu-entries are lost, but cause of the new default maybe you have
+some entries twice. Feel free to delete via customize what you want from the
+new settings.
+
+The old option `ecb-tree-use-image-icons' has been replaced by
+`ecb-tree-buffer-style'.
+
+
+Upgrading from versions < 1.96:
+-------------------------------
+
+The options `ecb-mode-line-data' and `ecb-mode-line-prefixes' have changed
+their type. ECB will autom. upgrade the old values of these options as best as
+possible to the new types!
+
+The option `ecb-layout-switch-to-compilation-window' has been removed. This
+mimic is now done automatically.
+
+The name of the command `ecb-toggle-enlarged-compilation-window' has been
+changed to `ecb-toggle-compile-window-height' (The old name is still available
+as alias but is deprecated). The keybinding [C-. /] remains.
+
+The command `ecb-eshell-goto-eshell' has been removed. Now just use `eshell'
+to work with the eshell. The old binding [C-. e] now simply runs `eshell'.
+
+The command `ecb-eshell-enlarge' has been removed. Now just use the standard
+ECB-command `ecb-toggle-compile-window-height' for this.
+
+
+Upgrading from a version < 1.95.1:
+----------------------------------
+
+If there are byte-compiled(!) user-defined layouts - either created
+interactively by `ecb-create-new-layout' or programmed with the macro
+`ecb-layout-define' - then the file where these user-defined layouts are saved
+(see option `ecb-create-layout-file') must be re-byte-compiled with latest ECB
+version >= 1.95.1! If the user-defined layouts are not byte-compiled then
+there is nothing to do.
+
+Some default key-bindings have changed; the new bindings are:
+
+  C-c . g1: `ecb-goto-window-edit1'       (was C-c . 1)
+  C-c . g2: `ecb-goto-window-edit2'       (was C-c . 2)
+  C-c . gd: `ecb-goto-window-directories' (was C-c . d)
+  C-c . gs: `ecb-goto-window-sources'     (was C-c . s)
+  C-c . gm: `ecb-goto-window-methods'     (was C-c . m)
+  C-c . gh: `ecb-goto-window-history'     (was C-c . h)
+  C-c . gb: `ecb-goto-window-speedbar'    (was C-c . bw)
+  C-c . gc: `ecb-goto-window-compilation' (was C-c . c)
+
+  
+Upgrading from version < 1.95:
+------------------------------
+
+Some default key-bindings have changed; the new bindings are:
+
+  C-c . r:  `ecb-rebuild-methods-buffer' (was not bound before)
+  C-c . lc: `ecb-change-layout'          (was C-c . l)
+  C-c . lr: `ecb-redraw-layout'          (was C-c . r)
+  C-c . lt: `ecb-toggle-layout'          (was C-c . t)
+  C-c . lw: `ecb-toggle-ecb-windows'     (was C-c . w)
+
+ECB now requires speedbar. ECB needs a version >= 0.14beta1.
+
+For XEmacs now the package c-support (contains hideshow.el) has to be
+installed.
+
+
+Upgrading from versions < 1.92:
+--------------------------------
+
+The type of the option `ecb-truncate-lines' has changed.
+ECB autom. upgrades the old value of this option to its new type!
+
+
+Upgrading from version 1.80:
+----------------------------
+
+The type or name of the following options has changed:
+
+- ecb-layout-nr: New name is ecb-layout-name
+- ecb-toggle-layout-sequence: New type
+- ecb-major-modes-activate: New type
+- ecb-layout-window-sizes: New type
+- ecb-show-sources-in-directories-buffer: New type
+- ecb-cache-directory-contents: New type
+- ecb-source-file-regexps: New type
+- ecb-show-ecb-windows-hook: New name is ecb-show-ecb-windows-before-hook
+- ecb-hide-ecb-windows-hook: New name is ecb-hide-ecb-windows-before-hook
+
+ECB autom. upgrades the values of these options to theirs new names/types!
+
+
+Upgrading from version < 1.80:
+------------------------------
+
+The type of the following options has changed:
+
+- 'ecb-token-display-function'
+- 'ecb-window-sync'
+
+ECB has a new feature 'ecb-auto-compatibility-check' which enables a check for
+incompatible or renamed ECB-options at ECB startup. These options are then
+autom. upgraded to the new type or reset to the default-values of current
+ECB-version if no upgrade is possible. All upgraded or reset options are
+displayed to the user with their old and new values!
+
+ECB now requires Semantic version 1.4 and eieio version 0.17! Any previous
+beta version is not supported anymore!
+
+
+Upgrading from any version < 1.60:
+----------------------------------
+
+- The options `ecb-show-node-name-in-minibuffer',
+  `ecb-show-complete-file-name-in-minibuffer' and
+  `ecb-show-file-info-in-minibuffer' are gone and have been replaced by one
+  single new option `ecb-show-node-info-in-minibuffer' where you can define
+  separately for every tree-buffer when and which node info should be
+  displayed in the minibuffer
+
+  
+Upgrading from versions < 1.52:
+-------------------------------
+
++ ECB now requires eieio >= 0.16 (see also README)
+
++ The option ecb-prefix-key has been removed. Now all customization of
+  key-bindings is done via the new option ecb-key-map.
+
++ ecb-layout-window-sizes is now an association list. If you have customized
+  this variable or used the ecb-store-window-sizes function, there will be an
+  error when drawing the ECB layout. Reset ecb-layout-window-sizes to it's
+  default value (nil) and store your window sizes using ecb-store-window-sizes.
+
++ A new customization variable ecb-show-tokens controls the behavior of the
+  methods buffer. Read the documentation for more information.
+
+  
+Upgrading from versions < 1.20:
+-------------------------------
+
++ Now mouse-1 and mouse-2 for opening source-files and jumping to
+  methods/variables is not longer the default key-binding. Please take a look
+  at the new options 'ecb-primary-secondary-mouse-buttons' and
+  'ecb-primary-mouse-jump-destination'.
+
++ Now it is no longer necessary to bind in the ECB-hooks (ecb-activate-hook
+  and ecb-deactivate-hook) some standard-Emacs-keys for window-handling to the
+  ECB replacements for the related standard-functions to get proper
+  window-handling within the edit-window(s) of ECB.
+
+  Example: With ECB < 1.20 it was necessary to bind [C-x o] to
+  'ecb-other-window' in 'ecb-activate-hook' (and also "unbinding" it back to
+  the standard other-window in the 'ecb-deactivate-hook') to get a more
+  ECB-suitable other-window behavior. Same for other window-keys.
+
+  This way will work also in ECB 1.20 but it is NOT the recommended way
+  because the new option 'ecb-advice-window-functions' makes this much easier
+  and better. Please read the documentation of this option exactly!
+
++ Default-value of `ecb-other-window-jump-behavior' is now 'all.
+
++ Interactively calling 'ecb-update-methods-buffer' is not longer necessary as
+  work-around for the bug, that sometimes the error "Wrong type argument,
+  integer-or-marker-p nil" is displayed after clicking onto a method/variable
+  in the ECB-method-buffer. This bug is fixed!
+
++ For a complete list of changes and new features for versions > 1.20 see the
+  NEWS file.
+
diff --git a/site/ecb-2.40/ecb-advice-test.el b/site/ecb-2.40/ecb-advice-test.el
new file mode 100755
index 0000000..d13bfd1
--- /dev/null
+++ b/site/ecb-2.40/ecb-advice-test.el
@@ -0,0 +1,281 @@
+;;; ecb-advice-test.el --- test-lib for the advice backbone of ECB
+
+;; Copyright (C) 2000 - 2009 Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author:  Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2009
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-advice-test.el,v 1.2 2009/05/15 15:19:53 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains a test-suite for the advice-backbone of ECB.
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+;;; Usage
+;;
+;; 1. Load this library into Emacs
+;; 2. Call M-x ecb-test-with-original-advice-set
+;; 3. Compare the Output in the message-buffer with the expected output at the
+;;    end of this file
+;; 4. If there are differences then send this output to
+;;    the ecb-mailing-list (see Info-manual)
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-common-browser)
+
+(defecb-advice-set ecb-advice-test-set
+  "An advice-set only for testing the advice-mechanism of ECB")
+
+(defun ecb-advice-test-defun-1 ()
+  (message "I'm the ORIGINAL function ecb-advice-test-defun-1"))
+
+(defecb-advice ecb-advice-test-defun-1 around ecb-advice-test-set
+  "An advice"
+  (message "I'm the AROUND advice of ecb-advice-test-defun-1"))
+
+(defun ecb-advice-test-defun-2 ()
+  (message "I'm the ORIGINAL function ecb-advice-test-defun-2"))
+
+(defecb-advice ecb-advice-test-defun-2 before ecb-advice-test-set
+  "An advice"
+  (message "I'm the BEFORE advice of ecb-advice-test-defun-2"))
+
+(defecb-advice ecb-advice-test-defun-2 after ecb-advice-test-set
+  "An advice"
+  (message "I'm the AFTER advice of ecb-advice-test-defun-2"))
+
+(defun ecb-advice-test-defun-3 ()
+  (message "I'm the ORIGINAL function ecb-advice-test-defun-3"))
+
+(defecb-advice ecb-advice-test-defun-3 around ecb-always-disabled-advices
+  "An always disabled advice"
+  (message "I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3"))
+
+(defecb-advice ecb-advice-test-defun-3 after ecb-always-disabled-advices
+  "An always disabled advice"
+  (message "I'm the AFTER advice of (the always disabled) ecb-advice-test-defun-3"))
+
+(defun ecb-advice-test-defun-4 ()
+  (message "I'm the ORIGINAL function ecb-advice-test-defun-4"))
+
+(defecb-advice ecb-advice-test-defun-4 around ecb-always-disabled-advices
+  "An always disabled advice"
+  (message "I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-4"))
+
+(defun ecb-test-with-original-advice-set ()
+  (interactive)
+  (let ((ecb-advices-debug-error t))
+    (unwind-protect
+        (progn
+          (message "!!! BEGIN ecb-test-with-original-advice-set !!!!")
+          (ecb-enable-advices 'ecb-advice-test-set)
+          (ecb-disable-advices 'ecb-always-disabled-advices)
+          (ecb-advice-test-defun-1)
+          (ecb-advice-test-defun-2)
+          (ecb-advice-test-defun-3)
+          (ecb-advice-test-defun-4)
+          (ecb-with-original-adviced-function-set 'ecb-advice-test-set
+            (ecb-advice-test-defun-1)
+            (message "LOC-0.1 ecb-test-with-original-advice-set")
+            (ecb-with-ecb-advice 'ecb-advice-test-defun-3 'around
+              (ecb-advice-test-defun-1)
+              (ecb-advice-test-defun-2)
+              (ecb-advice-test-defun-3)
+              (ecb-advice-test-defun-4)
+              (ecb-with-ecb-advice 'ecb-advice-test-defun-3 'around
+                (ecb-advice-test-defun-3)
+                (ecb-advice-test-defun-4)
+                (ecb-with-ecb-advice 'ecb-advice-test-defun-3 'after
+                  (ecb-advice-test-defun-3)
+                  (ecb-advice-test-defun-4)
+                  (ecb-with-ecb-advice 'ecb-advice-test-defun-4 'around
+                    (ecb-advice-test-defun-3)
+                    (ecb-advice-test-defun-4))
+                  (message "LOC-0.2 ecb-test-with-original-advice-set")
+                  (ecb-advice-test-defun-3)
+                  (ecb-advice-test-defun-4))
+                (message "LOC-0.3 ecb-test-with-original-advice-set")
+                (ecb-advice-test-defun-3)
+                (ecb-advice-test-defun-4))
+              (message "LOC-0.4 ecb-test-with-original-advice-set")
+              (ecb-advice-test-defun-3)
+              (ecb-advice-test-defun-4))
+            (ecb-advice-test-defun-2)
+            (ecb-advice-test-defun-3)
+            (ecb-advice-test-defun-4)
+            (message "LOC-1 ecb-test-with-original-advice-set")
+            (ecb-with-original-adviced-function-set 'ecb-advice-test-set
+              (ecb-advice-test-defun-1)
+              (ecb-advice-test-defun-2))
+            (message "LOC-2 ecb-test-with-original-advice-set")
+            (ecb-advice-test-defun-1)
+            (ecb-advice-test-defun-2)            
+            (message "LOC-3 ecb-test-with-original-advice-set")
+            (ecb-with-original-adviced-function-set 'ecb-advice-test-set
+              (ecb-advice-test-defun-1)
+              (ecb-advice-test-defun-2)
+              (message "LOC-4 ecb-test-with-original-advice-set")
+              (ecb-with-original-adviced-function-set 'ecb-advice-test-set
+                (ecb-advice-test-defun-1)
+                (ecb-advice-test-defun-2)))            
+            (message "LOC-5 ecb-test-with-original-advice-set")
+            )
+          (ecb-advice-test-defun-1)
+          (ecb-advice-test-defun-2)
+          (message "LOC-6 ecb-test-with-original-advice-set"))
+      (ecb-disable-advices 'ecb-advice-test-set)
+      (ecb-advice-test-defun-1)
+      (ecb-advice-test-defun-2)
+      (ecb-advice-test-defun-3)
+      (ecb-advice-test-defun-4)
+      (message "!!! END ecb-test-with-original-advice-set !!!!"))))
+
+
+;; expected output:
+
+;;  !!! BEGIN ecb-test-with-original-advice-set !!!!
+;;  ECB 2.33: debug enabling the advice-set: ecb-advice-test-set
+;;  ECB 2.33: debug enabling of 'after' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug enabling of 'before' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug enabling of 'around' advice ecb-advice-test-defun-1 
+;;  ECB 2.33: debug disabling the advice-set: ecb-always-disabled-advices
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-4 
+;;  ECB 2.33: debug disabling of 'after' advice ecb-advice-test-defun-3 
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-3 
+;;  ECB 2.33: debug disabling of 'around' advice count-windows 
+;;  ECB 2.33: debug disabling of 'around' advice one-window-p 
+;;  ECB 2.33: debug disabling of 'around' advice walk-windows 
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-1 
+;;  I'm the AROUND advice of ecb-advice-test-defun-1
+;;  ECB 2.33: debug calling of 'before' advice ecb-advice-test-defun-2 
+;;  I'm the BEFORE advice of ecb-advice-test-defun-2
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  ECB 2.33: debug calling of 'after' advice ecb-advice-test-defun-2 
+;;  I'm the AFTER advice of ecb-advice-test-defun-2
+;;  I'm the ORIGINAL function ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - ENTRY
+;;  ECB 2.33: debug disabling the advice-set: ecb-advice-test-set
+;;  ECB 2.33: debug disabling of 'after' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug disabling of 'before' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-1 
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  LOC-0.1 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-3 - ENTRY
+;;  ECB 2.33: debug enabling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-3 - ENTRY
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug with always disabled ecb-advice: after ecb-advice-test-defun-3 - ENTRY
+;;  ECB 2.33: debug enabling of 'after' advice ecb-advice-test-defun-3 
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  ECB 2.33: debug calling of 'after' advice ecb-advice-test-defun-3 
+;;  I'm the AFTER advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-4 - ENTRY
+;;  ECB 2.33: debug enabling of 'around' advice ecb-advice-test-defun-4 
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  ECB 2.33: debug calling of 'after' advice ecb-advice-test-defun-3 
+;;  I'm the AFTER advice of (the always disabled) ecb-advice-test-defun-3
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-4 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-4
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-4 
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-4 - EXIT
+;;  LOC-0.2 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  ECB 2.33: debug calling of 'after' advice ecb-advice-test-defun-3 
+;;  I'm the AFTER advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug disabling of 'after' advice ecb-advice-test-defun-3 
+;;  ECB 2.33: debug with always disabled ecb-advice: after ecb-advice-test-defun-3 - EXIT
+;;  LOC-0.3 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-3 - EXIT
+;;  LOC-0.4 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-3 
+;;  I'm the AROUND advice of (the always disabled) ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-3 
+;;  ECB 2.33: debug with always disabled ecb-advice: around ecb-advice-test-defun-3 - EXIT
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  I'm the ORIGINAL function ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  LOC-1 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - ENTRY
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - EXIT
+;;  LOC-2 ecb-test-with-original-advice-set
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  LOC-3 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - ENTRY
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  LOC-4 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - ENTRY
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - EXIT
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - EXIT
+;;  LOC-5 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug enabling the advice-set: ecb-advice-test-set
+;;  ECB 2.33: debug enabling of 'after' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug enabling of 'before' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug enabling of 'around' advice ecb-advice-test-defun-1 
+;;  ECB 2.33: debug with original advice-set: ecb-advice-test-set - EXIT
+;;  ECB 2.33: debug calling of 'around' advice ecb-advice-test-defun-1 
+;;  I'm the AROUND advice of ecb-advice-test-defun-1
+;;  ECB 2.33: debug calling of 'before' advice ecb-advice-test-defun-2 
+;;  I'm the BEFORE advice of ecb-advice-test-defun-2
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  ECB 2.33: debug calling of 'after' advice ecb-advice-test-defun-2 
+;;  I'm the AFTER advice of ecb-advice-test-defun-2
+;;  LOC-6 ecb-test-with-original-advice-set
+;;  ECB 2.33: debug disabling the advice-set: ecb-advice-test-set
+;;  ECB 2.33: debug disabling of 'after' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug disabling of 'before' advice ecb-advice-test-defun-2 
+;;  ECB 2.33: debug disabling of 'around' advice ecb-advice-test-defun-1 
+;;  I'm the ORIGINAL function ecb-advice-test-defun-1
+;;  I'm the ORIGINAL function ecb-advice-test-defun-2
+;;  I'm the ORIGINAL function ecb-advice-test-defun-3
+;;  I'm the ORIGINAL function ecb-advice-test-defun-4
+;;  !!! END ecb-test-with-original-advice-set !!!!
+
+(silentcomp-provide 'ecb-advice-test)
+
+;;; ecb-advice-test.el ends here
+
diff --git a/site/ecb-2.40/ecb-analyse.el b/site/ecb-2.40/ecb-analyse.el
new file mode 100644
index 0000000..aa36d30
--- /dev/null
+++ b/site/ecb-2.40/ecb-analyse.el
@@ -0,0 +1,716 @@
+;;; ecb-analyse.el --- ECB analysis display window
+
+;;; Copyright (C) 2004 - 2005 Klaus Berndl
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, analyse
+;; Created: 2004
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-analyse.el,v 1.25 2009/05/08 14:05:55 berndl Exp $
+
+
+;;; Commentary:
+;;
+;; Displays the analysing informations of semantic-analyze in a special
+;; tree-buffer.
+;;
+
+;;; Code:
+
+(require 'semantic-analyze)
+(require 'ecb-layout)
+(require 'ecb-common-browser)
+(require 'ecb-method-browser)
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+
+(defgroup ecb-analyse nil
+  "Settings for the analyse-buffer in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+
+(defcustom ecb-analyse-buffer-name " *ECB Analyse*"
+  "*Name of the ECB analyse buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB Analyse*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-analyse-buffer by this name, e.g. by a call of `set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-analyse
+  :type 'string)
+
+(defcustom ecb-analyse-buffer-after-create-hook nil
+  "*Local hook running after the creation of the analyse-buffer.
+Every function of this hook is called once without arguments direct after
+creating the analyse-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of `local-set-key' to define new
+key-bindings only for the analyse-buffer of ECB."
+  :group 'ecb-analyse
+  :type 'hook)
+
+(defcustom ecb-analyse-show-node-info '(if-too-long . name)
+  "*When to display which node-info in the analyse-buffer.
+Define which node info should displayed after moving the mouse over a node
+\(or after a shift click onto the node) in the analyse-buffer.
+
+You can define \"when\" a node-info should be displayed:
+See `ecb-directories-show-node-info' for the possible choices.
+
+You can define what info should be displayed:
+- name: The full name of the node
+- full-info: All infos available to a node.
+
+Do NOT set this option directly via setq but use always customize!"
+  :group 'ecb-analyse
+  :type '(cons (choice :tag "When"
+                       (const :tag "Always" :value always)
+                       (const :tag "If too long" :value if-too-long)
+                       (const :tag "After shift click" :value shift-click)
+                       (const :tag "Never" :value never))
+               (choice :tag "What"
+                       (const :tag "Node-name" :value name)
+                       (const :tag "Full info" :value full-info))))
+
+
+(defcustom ecb-analyse-collapsed-buckets nil
+  "*Buckets collapsed when displaying the current semantic analysis.
+The semantic analyse-modul offers several categories of analysis which are
+called buckets here. These are for example:
+
+Context: The current context, which is the current function/method, variable,
+class etc. \(what exactly depends on the programming language) point is in.
+This means not the current function/method/variable/class-name point stand on
+but the current surrounding context. Example: If point stays somewhere within
+a defun-definition in emacs-lisp or within a java-method then this defun rsp.
+method is the context. In object oriented languages this can be the full
+hierachy, i.e. not only the current method, but the current method, the class
+of this method, the superclass of this class and so on!
+
+Local Variables: All accessible and bound local variables visible at current
+point.
+
+Prefix: The currently parsed prefix, which is mostly the current identifier
+point stands on.
+
+Assignee: See the semantic manual
+
+Function: Current function-name point stands on.
+
+Argument #: When point is located within a function-call then this is the
+number of the argument point stands on.
+
+Completions: All possible completions for current prefix \(see above). This is
+probably the most helpful bucket.
+
+If one of these categories/buckets are not needed per default then add the
+bucket-name \(s.a.) to this option and ECB will per default collapse this
+bucket. So most needed buckets are better visible in the analyse-buffer."
+  :group 'ecb-analyse
+  :type '(repeat (choice :tag "Bucket" :menu-tag "Bucket"
+                         (const :tag "Context" :value "Context")
+                         (const :tag "Arguments" :value "Arguments")
+                         (const :tag "Local Variables" :value "Local Variables")
+                         (const :tag "Prefix" :value "Prefix")
+                         (const :tag "Assignee" :value "Assignee")
+                         (const :tag "Function" :value "Function")
+                         (const :tag "Argument #" :value "Argument #")
+                         (const :tag "Completions" :value "Completions")
+                         (string :tag "Other bucketname"))))
+
+(defcustom ecb-analyse-fontified-buckets '("Context" "Function")
+  "*Buckets whose elements should be fontified as in the methods-buffer.
+If the name of a category/bucket is contained in this option then
+all elements of this bucket will be displayed as in the
+methods-buffer - at least if an element is a semantic-tag. This
+means if `ecb-font-lock-tags' is not nil and the font-lock
+feature is loaded into Emacs these elements will be fontified and
+also displayed with an appropriate icon if possible. The default
+value does this only for the Context-bucket because for most of
+the other buckets this makes not really much sense.
+
+For available buckets see `ecb-analyse-collapsed-buckets'.
+
+For the faces used to display a bucket-node itself or bucket-elements not
+fontified see the options `ecb-analyse-bucket-node-face' rsp.
+`ecb-analyse-bucket-element-face'."
+  :group 'ecb-analyse
+  :type '(repeat (choice :tag "Bucket" :menu-tag "Bucket"
+                         (const :tag "Context" :value "Context")
+                         (const :tag "Arguments" :value "Arguments")
+                         (const :tag "Local Variables" :value "Local Variables")
+                         (const :tag "Prefix" :value "Prefix")
+                         (const :tag "Assignee" :value "Assignee")
+                         (const :tag "Function" :value "Function")
+                         (const :tag "Argument #" :value "Argument #")
+                         (const :tag "Completions" :value "Completions")
+                         (string :tag "Other bucketname"))))
+
+(defcustom ecb-analyse-gen-tag-info-fn nil
+  "*Which info should be displayed for a tag of the analyse-buffer.
+If nil then the default information about a tag will be displayed. If a
+function then this function gets as argument the tag for which tag-information
+should be displayed. This function has to return a string which will be then
+display as tag-info. This string has to be fully formatted \(e.g. must already
+include line-breaks if the tag-info should be displayed in several lines).
+
+See `ecb-analyse-show-tag-info-fn' how the tag-info is displayed."
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Default info" :value nil)
+                (function :tag "")))
+
+(defcustom ecb-analyse-show-tag-info-fn 'message
+  "*How to display the tag-info for a tag of the analyse-buffer.
+The value of this option is a function which will be called with the
+info-string generated for the current tag of the analyse-buffer. This function
+must do all things necessary for displaying this info. When this function is
+called the window stored in `ecb-last-edit-window-with-point' is the selected
+window!
+
+ECB offers two builtin ways: Display the info in the echo-area \(via the
+function `message') or in a temp-buffer in the edit-area \(via the function
+`ecb-analyse-show-tag-info-in-temp-buffer'). Default is echo-area-display.
+
+See also `ecb-analyse-gen-tag-info-fn'."
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Display in the echo-area" :value message)
+                (const :tag "Display in a temp-buffer"
+                       :value ecb-analyse-show-tag-info-in-temp-buffer)
+                (function :tag "Info display-function")))
+
+(defcustom ecb-analyse-buffer-sync 'basic
+  "*Synchronize the analyse buffer automatically with current edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+Normally it's not necessary to exclude some major-modes because with
+not-semantic supported major-modes simply nothing happens. But maybe it can be
+helpful for certain situations...
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-analyse-buffer-sync-hook' is evaluated."
+    :group 'ecb-analyse
+    :type '(radio :tag "Synchronize ECBs analyse buffer"
+                  (const :tag "use basic value" :value basic)
+                  (const :tag "Always" :value always)
+                  (const :tag "Never" nil)
+                  (repeat :tag "Not with these modes"
+                          (symbol :tag "mode"))))
+
+(defcustom ecb-analyse-buffer-sync-delay 2
+  "*Time Emacs must be idle before the analyse-buffer is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately.
+
+CAUTION: With analysing a value not too small is strongly recommended because
+it can be very annoying if more or less after each typing the current context
+is analysed. If set to nil then *each* keyboard hit refreshes the
+analyse-buffer which will make ECB quite unusable!
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'"
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-analyse-buffer-sync))))
+  :initialize 'custom-initialize-default)
+
+(defcustom ecb-analyse-buffer-sync-hook nil
+  "Hook run at the end of `ecb-analyse-buffer-sync'.
+See documentation of `ecb-analyse-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+- Current buffer is the buffer of the currently selected
+  edit-window.
+- The analyse-buffer is displayed in a visible window of the
+  ecb-frame \(so no check for visibilty of the analyse-buffer in
+  the ecb-frame is necessary in a hook function)
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option `ecb-analyse-buffer-sync' is not
+nil the function `ecb-analyse-buffer-sync' is running either
+every time Emacs is idle or even after every command \(see
+`ecb-analyse-buffer-sync-delay'). So if the anaylse-buffer is
+displayed in a window of the ecb-frame \(see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically!"
+    :group 'ecb-analyse
+    :type 'hook)
+
+(defconst ecb-analyse-nodedata-tag-with-pos 0)
+(defconst ecb-analyse-nodedata-tag-without-pos 1)
+(defconst ecb-analyse-nodedata-no-tag 2)
+
+(defconst ecb-analyse-nodetype-bucket 0)
+(defconst ecb-analyse-nodetype-context 1)
+(defconst ecb-analyse-nodetype-arguments 2)
+(defconst ecb-analyse-nodetype-completions 3)
+(defconst ecb-analyse-nodetype-localvars 4)
+(defconst ecb-analyse-nodetype-prefix 5)
+(defconst ecb-analyse-nodetype-assignee 6)
+(defconst ecb-analyse-nodetype-function 7)
+(defconst ecb-analyse-nodetype-function-arg 8)
+
+(defecb-autocontrol/sync-function ecb-analyse-buffer-sync
+    ecb-analyse-buffer-name ecb-analyse-buffer-sync t
+  "Synchronize the analyse buffer with the current buffer and point.
+This means in fact display the current analysis for current point."
+  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: make interruptable. Necessary
+  ;; e.g. when typing: "(e" then scanning all elisp stuff beginning with e is
+  ;; really annoying....
+  (let ((analysis nil)
+        (scope nil)
+        (completions nil)
+        (cnt nil)
+        (mode-local-active-mode nil)
+        )
+    ;; Try and get some sort of analysis
+    (condition-case nil
+        (progn
+          (setq mode-local-active-mode major-mode)
+          (save-excursion
+            ;; Get the current scope
+            (setq scope (semantic-calculate-scope (point)))
+            ;; Get the analysis
+            (setq analysis (ecb--semantic-analyze-current-context (point)))
+            (setq cnt (ecb--semantic-find-tag-by-overlay))
+            (when analysis
+              (setq completions (ecb--semantic-analyze-possible-completions analysis)))))
+      (error nil))
+    (ecb-exec-in-window ecb-analyse-buffer-name
+      ;; we must remove the old nodes
+      (tree-buffer-set-root (tree-node-new-root))
+      (when cnt
+        (ecb-analyse-add-nodes "Context" "Context"
+                               cnt ecb-analyse-nodetype-context))
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should adopt this
+      ;; for ecb-analyse..
+      ;;     (when analysis
+      ;;       ;; If this analyzer happens to point at a complete symbol, then
+      ;;       ;; see if we can dig up some documentation for it.
+      ;;       (semantic-ia-sb-show-doc analysis))
+
+      ;; Show local variables
+      (when scope
+        (ecb-analyse-show-scope scope))
+
+      (when analysis
+        ;; Let different classes draw more buttons.
+        (ecb-analyse-more-nodes analysis)
+        (when completions
+          (ecb-analyse-add-nodes "Completions" "Completions" completions
+                                 ecb-analyse-nodetype-completions)))
+      (tree-buffer-update)))
+  (run-hooks 'ecb-analyse-buffer-sync-hook))
+        
+(defun ecb-analyse-show-scope (scope)
+  "Show SCOPE information."
+  (let ((localvars (when scope
+		     (oref scope localvar))))
+    (when localvars
+      (ecb-analyse-add-nodes "Local Variables" "Local Variables" localvars
+                             ecb-analyse-nodetype-localvars))))
+
+(defmethod ecb-analyse-more-nodes ((context semantic-analyze-context))
+  "Show a set of ecb-nodes specific to CONTEXT."
+  (let ((prefix (oref context prefix)))
+    (when prefix
+      (ecb-analyse-add-nodes "Prefix" "Prefix" prefix ecb-analyse-nodetype-prefix))))
+
+(defmethod ecb-analyse-more-nodes ((context semantic-analyze-context-assignment))
+  "Show a set of ecb-nodes specific to CONTEXT."
+  (call-next-method)
+  (let ((assignee (oref context assignee)))
+    (when assignee
+      (ecb-analyse-add-nodes "Assignee" "Assignee" assignee
+                             ecb-analyse-nodetype-assignee))))
+
+(defmethod ecb-analyse-more-nodes ((context semantic-analyze-context-functionarg))
+  "Show a set of ecb-nodes specific to CONTEXT."
+  (call-next-method)
+  (let ((func (oref context function)))
+    (when func
+      (ecb-analyse-add-nodes "Function" "Function" func ecb-analyse-nodetype-function)
+      ;; An index for the argument the prefix is in:
+      (let ((arg (oref context argument)))
+	(when arg
+	  (ecb-analyse-add-nodes "Argument #"
+                                 (format "Argument # %d" (oref context index))
+                                 arg
+                                 ecb-analyse-nodetype-function-arg))))))
+
+;; Each category of nodes gets its own nodetype, so we can offer different
+;; popup-menus for different categories (e.g. completions have other senseful
+;; popup-menu-entries than the rest. The date of a node will always be a cons
+;; where the car is the analyse-elem and the cdr is a const if it is a
+;; semantic-tag (positionless or with position) or not.
+
+(defun ecb-analyse-add-nodes (bucket bucket-name list nodetype)
+  "Create ecb-nodes from LIST. BUCKET is one of the categories/buckets
+mentioned in `ecb-analyse-collapsed-buckets'. BUCKET-NAME is the name a bucket
+should be displayed with. LIST is a list of tags for this bucket. NODETYPE is
+an integer which will be added as type to the nodes created for the elements
+of LIST."
+  (when list
+    (save-excursion
+      (set-buffer ecb-analyse-buffer-name)
+      (let* ((bucket-name-formatted
+              (ecb-merge-face-into-text (ecb-format-bucket-name bucket-name)
+                                        ecb-analyse-bucket-node-face))
+             (bucket-node (tree-node-new bucket-name-formatted
+                                         ecb-analyse-nodetype-bucket
+                                         (list 'ecb-bucket-node
+                                               ecb-analyse-nodetype-bucket)
+                                         nil
+                                         (tree-buffer-get-root))))
+        (setf (tree-node->expanded bucket-node)
+              (not (member bucket ecb-analyse-collapsed-buckets)))
+        (ecb-exit-on-input 'ecb-analyse
+          (dolist (elem list)
+            (ecb-throw-on-input 'ecb-analyse-tree-buffer-build)
+            (let* ((fontify-tags (member bucket ecb-analyse-fontified-buckets))
+                   (string-1 (typecase elem
+                               (string elem)
+                               (ecb--semantic-tag
+                                (if fontify-tags
+                                    (ecb-displayed-tag-name elem)
+                                  (ecb--semantic-format-tag-uml-concise-prototype elem)))
+                               (otherwise "foo")))
+                   (string (concat string-1)))
+              (unless fontify-tags
+                (ecb-merge-face-into-text string ecb-analyse-bucket-element-face))
+              (if (ecb--semantic-tag-p elem)
+                  (tree-node-new string nodetype
+                                 (list elem 
+                                       (if (ecb--semantic-tag-with-position-p elem)
+                                           ecb-analyse-nodedata-tag-with-pos
+                                         ecb-analyse-nodedata-tag-without-pos)
+                                       nodetype)
+                                 t bucket-node nil)
+                (tree-node-new string nodetype
+                               (list elem ecb-analyse-nodedata-no-tag nodetype)
+                               t bucket-node nil)))))))))
+  
+(defun ecb-analyse-compare-node-data (left right)
+  "Return not nil when LEFT and RIGHT are identical node-datas."
+  (and (equal (nth 2 left) (nth 2 right))
+       (ecb-compare-methods-buffer-node-data (car left) (car right))))
+
+(tree-buffer-defpopup-command ecb-analyse-jump-to-tag
+  "Jump to the definition of current tag of the analyse-buffer.
+If first arg of the REST-ARG-LIST is not nil then it must be a window and then
+ECB jumps to that window. If nil then `ecb-last-edit-window-with-point' is
+used as window."
+  (let ((window (nth 0 rest-arg-list)))
+    (when node
+      (let* ((data (tree-node->data node))
+             (tag (nth 0 data)))
+        ;; if we have a positioned tag we jump to it
+        (when (and tag (= (nth 1 data) ecb-analyse-nodedata-tag-with-pos))
+          ;; We must highlight the tag
+          (tree-buffer-highlight-node-by-data/name data)
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: what about tags without
+          ;; buffer but onlxy with start- and end-pos?!
+          (ecb-display-tag (ecb-source-make (ecb-buffer-file-name
+                                             (ecb-semantic-tag-buffer tag))
+                                            (ecb-semantic-tag-buffer tag))
+                           tag
+                           (or window (ecb-get-edit-window nil))
+                           t nil))))))
+
+(tree-buffer-defpopup-command ecb-analyse-complete/insert
+  "Complete/insert at current point the selected completion/localvar."
+  ;; We must highlight the tag
+  (let* ((data (tree-node->data node))
+         (tag (nth 0 data))
+         (type (tree-node->type node)))
+    (when (or (= type ecb-analyse-nodetype-completions)
+              (= type ecb-analyse-nodetype-localvars))
+      (tree-buffer-highlight-node-by-data/name data)
+      (ecb-display-source ecb-path-selected-source nil)
+      (let* ((a (ecb--semantic-analyze-current-context (point)))
+             (bounds (if a (oref a bounds)))
+             (movepoint nil))
+        (if (null bounds)
+            (insert (ecb--semantic-tag-name tag))
+          (save-excursion
+            (if (and (<= (point) (cdr bounds)) (>= (point) (car bounds)))
+                (setq movepoint t))
+            (goto-char (car bounds))
+            (delete-region (car bounds) (cdr bounds))
+            (insert (ecb--semantic-tag-name tag))
+            (if movepoint (setq movepoint (point))))
+          (if movepoint
+              (goto-char movepoint)))))))
+
+(defecb-tree-buffer-callback ecb-analyse-node-clicked ecb-analyse-buffer-name select nil
+  "Handles clicking onto any of the nodes in the analyse-buffer of ECB."
+  (if shift-mode
+      (ecb-mouse-over-analyse-node node nil nil 'force))
+  (let* ((data (tree-node->data node))
+         (tag (nth 0 data))
+         (type (tree-node->type node)))
+    ;; we handle hiding the ecb-windows for ourself
+    (setq no-meta-hiding t)
+    (cond
+     ((= type ecb-analyse-nodetype-bucket)
+      (tree-node-toggle-expanded node)
+      (tree-buffer-update node))
+     ((= type ecb-analyse-nodetype-completions)
+      (ecb-analyse-complete/insert node))
+     ((= type ecb-analyse-nodetype-localvars)
+      (ecb-analyse-complete/insert node))
+     (t
+      (ecb-analyse-jump-to-tag node (ecb-get-edit-window
+                                     ;; `ecb-analyse-jump-to-tag' expects all
+                                     ;; args beyond NODE as one list.
+                                     `(,(ecb-combine-ecb-button/edit-win-nr
+                                         ecb-button edit-window-nr))))
+      (when (and tag (= (nth 1 data) ecb-analyse-nodedata-tag-with-pos))
+        (when meta-mode
+          (ecb-run-with-idle-timer 0.001 nil 'ecb-hide-ecb-windows)))))))
+
+(defecb-window-dedicator ecb-set-analyse-buffer ecb-analyse-buffer-name
+  "Display the analyse buffer in current window and make window dedicated."
+  (ecb-activate-ecb-autocontrol-function ecb-analyse-buffer-sync-delay
+                                         'ecb-analyse-buffer-sync)
+  (switch-to-buffer ecb-analyse-buffer-name))
+
+(defun ecb-maximize-window-analyse ()
+  "Maximize the ECB-analyse-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-analyse-window is not visible in current layout."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-analyse-buffer-name t))
+
+(defun ecb-goto-window-analyse ()
+  "Make the ECB-analyse window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-analyse-buffer-name))
+
+(defun ecb-analyse-show-tag-info-in-temp-buffer (info-string)
+  "Display INFO-STRING in a temp-buffer in the edit-area." 
+  (with-output-to-temp-buffer "*Tag Information*"
+    (save-excursion
+      (set-buffer "*Tag Information*")
+      (insert info-string)))
+  ;; Make it small
+  (shrink-window-if-larger-than-buffer
+   (get-buffer-window "*Tag Information*")))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: we could use the function
+;; `semantic-documentation-for-tag' here to display more infos?!
+
+(defun ecb-analyse-gen-tag-info (tag)
+  "Return the info-string for TAG."
+  (or (and (functionp ecb-analyse-gen-tag-info-fn)
+           (or (funcall ecb-analyse-gen-tag-info-fn tag)
+               (format "No info generated by `%s'." ecb-analyse-gen-tag-info-fn)))
+      (concat (ecb-displayed-tag-name tag)
+              "\n"
+              (let ((typetag
+                     (condition-case nil
+                         (save-excursion
+                           (ecb--semantic-analyze-tag-type tag))
+                       (error nil))))
+                (if typetag
+                    (ecb-displayed-tag-name typetag)
+                  ;; No type found by the analyzer The below used
+                  ;; to try and select the buffer from the last
+                  ;; analysis, but since we are already in the
+                  ;; correct buffer, I don't think that is needed.
+                  (when (fboundp 'semantic-lex-keyword-p)
+                    (let ((type (ecb--semantic-tag-type tag)))
+                      (typecase type
+                        (ecb--semantic-tag
+                         (setq type (ecb--semantic-tag-name type)))
+                        (list
+                         (setq type (car type))))
+                      (if (semantic-lex-keyword-p type)
+                          (setq typetag
+                                (semantic-lex-keyword-get type 'summary))))
+                    (if typetag
+                        typetag))
+                  )))))
+
+
+(tree-buffer-defpopup-command ecb-analyse-show-tag-info
+  "Display as much information as possible about current tag.
+Show the information in a shrunk split-buffer and expand out as many details
+as possible."
+  (let* ((data (tree-node->data node))
+         (tag (car data)))
+    (when (ecb--semantic-tag-p tag)
+      (save-selected-window
+        (select-window ecb-last-edit-window-with-point)
+        (funcall ecb-analyse-show-tag-info-fn (ecb-analyse-gen-tag-info tag))))))
+
+(defun ecb-mouse-over-analyse-node (node &optional window no-message click-force)
+  "Displays help text if mouse moves over a node in the analyse buffer or if
+CLICK-FORCE is not nil and always with regards to the settings in
+`ecb-analyse-show-node-info'. NODE is the node for which help text should be
+displayed, WINDOW is the related window, NO-MESSAGE defines if the help-text
+should be printed here."
+  (let ((str (when (or click-force
+                       (ecb-show-minibuffer-info node window
+                                                 (car
+                                                 ecb-analyse-show-node-info)))
+               (if (equal (cdr ecb-analyse-show-node-info) 'full-info)
+                   (ecb-analyse-gen-tag-info (car (tree-node->data node)))
+                 (tree-node->name node)))))
+    (prog1 str
+      (unless no-message
+        (ecb-nolog-message str)))))
+
+(defun ecb-analyse-node-mouse-highlighted-p (node)
+  "Return not nil when NODE has a positioned tag as data or belongs to the
+completions. This means that this node should be highlighted when mouse is
+moved over it."
+  (or (equal ecb-analyse-nodedata-tag-with-pos
+             (nth 1 (tree-node->data node)))
+      (member (tree-node->type node)
+              (list ecb-analyse-nodetype-completions
+                    ecb-analyse-nodetype-localvars))))
+
+(defun ecb-analyse-create-menu (node)
+  "Return a popup-menu suitable for NODE."
+  (let* ((data (tree-node->data node))
+         (tag-p (not (equal (nth 1 data) ecb-analyse-nodedata-no-tag)))
+         (tag-with-pos-p (equal (nth 1 data) ecb-analyse-nodedata-tag-with-pos))
+         (nodetype (nth 2 data)))
+    (delq nil (list (if (member nodetype (list
+                                          ecb-analyse-nodetype-completions
+                                          ecb-analyse-nodetype-localvars))
+                        '(ecb-analyse-complete/insert "Complete/insert"))
+                    (if tag-p 
+                        '(ecb-analyse-show-tag-info "Show tag info"))
+                    (if tag-with-pos-p
+                        '(ecb-analyse-jump-to-tag "Jump to tag"))))))
+    
+(defun ecb-analyse-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the analyse-buffer."
+  (setq ecb-layout-prevent-handle-ecb-window-selection t)
+  (let ((nodetype (tree-node->type node)))
+    (unless (equal nodetype ecb-analyse-nodetype-bucket)
+      (mapcar (function (lambda (type)
+                          (cons type (ecb-analyse-create-menu node))))
+              `(,ecb-analyse-nodetype-context
+                ,ecb-analyse-nodetype-arguments
+                ,ecb-analyse-nodetype-completions
+                ,ecb-analyse-nodetype-localvars
+                ,ecb-analyse-nodetype-prefix
+                ,ecb-analyse-nodetype-assignee
+                ,ecb-analyse-nodetype-function
+                ,ecb-analyse-nodetype-function-arg)))))
+
+
+(defun ecb-analyse-gen-menu-title-creator ()
+  "Returns a menu-title-create-function for the nodetypes of the
+analyse-buffer."
+  (mapcar (function (lambda (nodetype)
+                      (cons nodetype
+                            (function (lambda (node)
+                                        (tree-node->name node))))))
+          `(,ecb-analyse-nodetype-context
+            ,ecb-analyse-nodetype-arguments
+            ,ecb-analyse-nodetype-completions
+            ,ecb-analyse-nodetype-localvars
+            ,ecb-analyse-nodetype-prefix
+            ,ecb-analyse-nodetype-assignee
+            ,ecb-analyse-nodetype-function
+            ,ecb-analyse-nodetype-function-arg)))
+
+
+(defecb-tree-buffer-creator ecb-create-analyse-tree-buffer ecb-analyse-buffer-name
+  "Create the tree-buffer for analyse-display."
+  (tree-buffer-create
+   ecb-analyse-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-analyse-node
+   :mouse-highlight-fn 'ecb-analyse-node-mouse-highlighted-p
+   :node-data-equal-fn 'ecb-analyse-compare-node-data
+   :maybe-empty-node-types nil
+   :leaf-node-types nil
+   :menu-creator 'ecb-analyse-menu-creator
+   :menu-titles (ecb-analyse-gen-menu-title-creator)
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :sticky-parent-p ecb-tree-make-parent-node-sticky
+   :sticky-indent-string ecb-tree-stickynode-indent-string
+   :sticky-parent-fn nil
+   :trunc-lines (ecb-member-of-symbol/value-list ecb-analyse-buffer-name
+                                                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p nil ;; ecb-tree-incremental-search
+   :incr-search-additional-pattern nil ;; ecb-methods-incr-searchpattern-node-prefix
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list ecb-analyse-buffer-name
+                                                           (cdr ecb-tree-image-icons-directories)
+                                                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer nil
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-analyse-face
+   :general-face ecb-analyse-general-face
+   :after-create-hook (append
+                       (list (function (lambda ()
+                                         (ecb-common-after-tree-buffer-create-actions))))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-analyse-buffer-after-create-hook)
+   :after-update-hook nil))
+
+
+
+(silentcomp-provide 'ecb-analyse)
+
+;;; ecb-anaylse.el ends here
diff --git a/site/ecb-2.40/ecb-autogen.el b/site/ecb-2.40/ecb-autogen.el
new file mode 100644
index 0000000..a0131da
--- /dev/null
+++ b/site/ecb-2.40/ecb-autogen.el
@@ -0,0 +1,161 @@
+;;; ecb-autogen.el --- Auto load statement generator
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2003
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-autogen.el,v 1.14 2009/04/15 14:22:35 berndl Exp $
+
+;;; Commentary:
+;;
+;; Automatically generate autoloads for ECB
+;;
+;; This code is based onto semantic-autogen.el, the autoload generator of
+;; semantic.
+;;
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+;;
+
+(require 'autoload)
+
+(require 'ecb-util)
+
+(eval-when-compile
+  (require 'silentcomp))
+
+
+(when (ecb-noninteractive)
+  ;; If the user is doing this non-interactively, we need to set up
+  ;; these conveniences.
+  (add-to-list 'load-path nil)
+  (set (if (boundp 'find-file-hook)
+           'find-file-hook
+         'find-file-hooks) nil)
+  (setq find-file-suppress-same-file-warnings t)
+  )
+
+
+(defconst ecb-autogen-header
+  "Auto-generated ecb autoloads"
+  "Header of the auto-generated autoloads file.")
+
+(defconst ecb-autogen-file "ecb-autoloads.el"
+  "Name of the auto-generated autoloads file.")
+
+(defconst ecb-autoload-feature "ecb-autoloads"
+  "Feature-name of the autoloads")
+
+(defvar ecb-autogen-subdirs nil
+  "Sub-directories to scan for autoloads.")
+
+(defun ecb-autogen-update-header ()
+  "Update header of the auto-generated autoloads file.
+Run as `write-contents-hooks'."
+  (when (ecb-string= generated-autoload-file (buffer-file-name))
+    (let ((tag (format ";;; %s ---" (file-name-nondirectory
+                                     (buffer-file-name)))))
+      (message "Updating header...")
+      (goto-char (point-min))
+      (cond
+       ;; Replace existing header line
+       ((re-search-forward (concat "^" (regexp-quote tag)) nil t)
+        (beginning-of-line)
+        (kill-line 1)
+        )
+       ;; Insert header before first ^L encountered (XEmacs)
+       ((re-search-forward "^" nil t)
+        (beginning-of-line)
+        ))
+      (insert tag " " ecb-autogen-header)
+      (newline)
+      (message "Updating header...done")
+      nil ;; Say not already written.
+      )))
+
+;; We code this so clumsy to silence the bytecompiler of GNU Emacs >= 21.4 not
+;; to complain about obsoleteness of `write-contents-hooks'.
+(defun ecb-batch-update-autoloads ()
+  (let ((old-val (symbol-value (if (boundp 'write-contents-functions)
+                                   'write-contents-functions
+                                 'write-contents-hooks))))
+    (unwind-protect
+        (progn
+          (set (if (boundp 'write-contents-functions)
+                   'write-contents-functions
+                 'write-contents-hooks)
+               '(ecb-autogen-update-header))
+          (batch-update-autoloads))
+      (set (if (boundp 'write-contents-functions)
+               'write-contents-functions
+             'write-contents-hooks)
+           old-val)))) 
+
+(defun ecb-update-autoloads ()
+  "Update ecb autoloads from sources.
+Autoloads file name is defined in variable `ecb-autogen-file'. If ECB is
+installed as regular XEmacs-package then this function reports an error and
+does nothing."
+  (interactive)
+  (if ecb-regular-xemacs-package-p
+      (ecb-error "Updating autoloads not possible for regular XEmacs-packages!")
+    (if (file-exists-p (expand-file-name ecb-autogen-file))
+        (delete-file (expand-file-name ecb-autogen-file)))
+    (when (not ecb-running-xemacs)
+      ;; generate a new one but do this not for XEmacs because XEmacs must(!)
+      ;; handle this itself
+      (with-temp-file (expand-file-name ecb-autogen-file)
+        (insert "")))
+    (let* ((default-directory (file-name-directory (locate-library "ecb")))
+           (generated-autoload-file (expand-file-name ecb-autogen-file))
+           ;; needed for XEmacs to ensure that always a feature 'ecb-autoloads
+           ;; is provided and not a feature like 'ecb-1.91.2-autoloads (XEmacs
+           ;; uses the installation-directory of ECB as feature prefix if
+           ;; autoload-package-name is not provided.
+           (autoload-package-name "ecb")
+           (subdirs (mapcar 'expand-file-name ecb-autogen-subdirs))
+           (command-line-args-left (cons default-directory subdirs))
+           )
+      (ecb-batch-update-autoloads))
+    ;; XEmacs adds autom. the provide statement but for GNU Emacs we must do
+    ;; this:
+    (when (not ecb-running-xemacs)
+      (save-excursion
+        (set-buffer (find-file-noselect (expand-file-name ecb-autogen-file)))
+        (goto-char (point-min))
+        (when (not (re-search-forward (format "^(provide '%s)"
+                                              ecb-autoload-feature) nil t))
+          (goto-char (point-max))
+          (insert (format "\n(provide '%s)\n" ecb-autoload-feature))
+          (save-buffer)
+          (kill-buffer (current-buffer)))))))
+
+(silentcomp-provide 'ecb-autogen)
+
+;;; ecb-autogen.el ends here
diff --git a/site/ecb-2.40/ecb-autoloads.el b/site/ecb-2.40/ecb-autoloads.el
new file mode 100755
index 0000000..c65ac6e
--- /dev/null
+++ b/site/ecb-2.40/ecb-autoloads.el
@@ -0,0 +1,72 @@
+
+;;;### (autoloads (ecb-byte-compile ecb-minor-mode ecb-activate)
+;;;;;;  "ecb" "ecb.el" (18951 1663))
+;;; Generated autoloads from ecb.el
+
+(autoload (quote ecb-activate) "ecb" "\
+Activates ECB and creates the special buffers for the choosen layout.
+For the layout see `ecb-layout-name'. This function raises always the
+ECB-frame if called from another frame. This is the same as calling
+`ecb-minor-mode' with a positive argument.
+
+\(fn)" t nil)
+
+(autoload (quote ecb-minor-mode) "ecb" "\
+Toggle ECB minor mode.
+With prefix argument ARG, turn on if positive, otherwise off. Return non-nil
+if the minor mode is enabled.
+
+\\{ecb-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote ecb-byte-compile) "ecb" "\
+Byte-compiles the ECB package.
+This is done for all lisp-files of ECB if FORCE-ALL is not nil or for each
+lisp-file FILE.el which is either newer than FILE.elc or if FILE.elc doesn't
+exist.
+
+\(fn &optional FORCE-ALL)" t nil)
+
+;;;***
+
+;;;### (autoloads (ecb-show-help) "ecb-help" "ecb-help.el" (18949
+;;;;;;  40966))
+;;; Generated autoloads from ecb-help.el
+
+(autoload (quote ecb-show-help) "ecb-help" "\
+Shows the online help of ECB in Info or HTML-format.
+The format depends on the setting in `ecb-show-help-format'. If called with
+prefix argument, i.e. if FORMAT is not nil then the user is prompted to choose
+the format of the help (Info or Html).
+
+If an error about not finding the needed help-file occurs please take a look
+at the options `ecb-help-info-start-file' and `ecb-help-html-start-file'!
+
+Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included.
+
+\(fn &optional FORMAT)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "ecb-util" "ecb-util.el" (18957 34841))
+;;; Generated autoloads from ecb-util.el
+
+(defconst ecb-running-xemacs (featurep (quote xemacs)))
+
+;;;***
+
+;;;### (autoloads nil nil ("ecb-advice-test.el" "ecb-analyse.el"
+;;;;;;  "ecb-autogen.el" "ecb-cedet-wrapper.el" "ecb-common-browser.el"
+;;;;;;  "ecb-compatibility.el" "ecb-compilation.el" "ecb-create-layout.el"
+;;;;;;  "ecb-cycle.el" "ecb-eshell.el" "ecb-examples.el" "ecb-face.el"
+;;;;;;  "ecb-file-browser.el" "ecb-jde.el" "ecb-layout-defs.el" "ecb-layout.el"
+;;;;;;  "ecb-method-browser.el" "ecb-mode-line.el" "ecb-navigate.el"
+;;;;;;  "ecb-speedbar.el" "ecb-symboldef.el" "ecb-tod.el" "ecb-upgrade.el"
+;;;;;;  "ecb-winman-support.el" "silentcomp.el" "tree-buffer.el")
+;;;;;;  (18958 49293 356000))
+
+;;;***
+
+(provide 'ecb-autoloads)
diff --git a/site/ecb-2.40/ecb-cedet-wrapper.el b/site/ecb-2.40/ecb-cedet-wrapper.el
new file mode 100755
index 0000000..09bf98f
--- /dev/null
+++ b/site/ecb-2.40/ecb-cedet-wrapper.el
@@ -0,0 +1,200 @@
+;;; ecb-cedet-wrapper.el -- define wrappers for all semantic funcs/vars
+
+;; Copyright (C) 2000 - 2009 Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2009
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-cedet-wrapper.el,v 1.1 2009/04/21 15:23:22 berndl Exp $
+
+;;; Commentary:
+
+;; This file contains wrappers for every cedet-function and -variable used
+;; by ECB independent which cedet version is used. So the ECB-code is
+;; independent from the fact, if cedet offers backward-compatibility or
+;; not. This library offers for each used variable V of cedet a getter-function
+;; named "ecb--V" and for each function F an alias named "ecb--F". V and F
+;; follow the naming conventiones of cedet 1.0 but the resulting functions
+;; always point to the correct variable or function of cedet independent
+;; which cedet version is loaded. ECB only uses the functions exported from
+;; ecb-cedet-wrapper.el!
+
+
+(require 'semantic)
+(require 'semantic-ctxt)
+(require 'semantic-analyze)
+(require 'semanticdb)
+(require 'semanticdb-find)
+(require 'semanticdb-mode)
+
+(defconst ecb-semantic-2-loaded (string-match "^2" semantic-version))
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+;; -- getter functions for all variables of cedet currently used by ECB ---
+
+(defsubst ecb--semantic-symbol->name-assoc-list ()
+  "Return the value of `semantic-symbol->name-assoc-list'."
+  (symbol-value 'semantic-symbol->name-assoc-list))
+
+(defsubst ecb--semantic-symbol->name-assoc-list-for-type-parts ()
+  "Return the value of `semantic-symbol->name-assoc-list-for-type-parts'."
+  (symbol-value 'semantic-symbol->name-assoc-list-for-type-parts))
+
+(defsubst ecb--semantic-format-tag-functions ()
+  "Return value of `semantic-format-tag-functions'."
+  (symbol-value 'semantic-format-tag-functions))
+
+(defsubst ecb--semantic-orphaned-member-metaparent-type ()
+  "Return the value of `semantic-orphaned-member-metaparent-type'."
+  (symbol-value 'semantic-orphaned-member-metaparent-type))
+
+(defsubst ecb--semantic-uml-colon-string ()
+  "Return the value of `semantic-uml-colon-string'."
+  (symbol-value 'semantic-uml-colon-string))
+
+(defsubst ecb--semantic-format-face-alist ()
+  "Return the value of `semantic-format-face-alist'."
+  (symbol-value 'semantic-format-face-alist))
+
+(defsubst ecb--semantic-after-toplevel-cache-change-hook ()
+  "Return the hook-symbol `semantic-after-toplevel-cache-change-hook'."
+  'semantic-after-toplevel-cache-change-hook)
+
+(defsubst ecb--semantic-after-partial-cache-change-hook ()
+  "Return the hook-symbol `semantic-after-partial-cache-change-hook'."
+  'semantic-after-partial-cache-change-hook)
+
+(defsubst ecb--semantic--before-fetch-tags-hook ()
+  "Return the hook-symbol `semantic--before-fetch-tags-hook'."
+  'semantic--before-fetch-tags-hook)
+
+(defsubst ecb--ezimage-use-images ()
+  (if (boundp 'ezimage-use-images)
+      ezimage-use-images))
+
+(defsubst ecb--semantic-format-use-images-flag ()
+  (if (boundp 'semantic-format-use-images-flag)
+      semantic-format-use-images-flag))
+
+;; -- an alias for all functions of cedet currently used by ECB ---
+
+;; (delq nil (mapcar (function (lambda (f)
+;;                               (if (not (fboundp f))
+;;                                   f)))
+;;                   ecb--cedet-function-list))
+
+(defconst ecb--cedet-function-list
+  '(
+    semantic--format-colorize-text
+    semantic--tag-get-property
+    semantic--tag-overlay-cdr
+    semantic--tag-put-property
+    semantic--tag-set-overlay
+    semantic-active-p
+    semantic-adopt-external-members
+    semantic-analyze-current-context
+    semantic-analyze-find-tag
+    semantic-analyze-possible-completions
+    semantic-analyze-tag-type
+    semantic-brute-find-first-tag-by-name
+    semantic-bucketize
+    semantic-calculate-scope
+    semantic-clear-toplevel-cache
+    semantic-current-tag
+    semantic-current-tag-parent
+    semantic-dependency-tag-file
+    semantic-documentation-for-tag
+    semantic-equivalent-tag-p
+    semantic-fetch-available-tags
+    semantic-fetch-tags
+    semantic-find-tag-by-overlay
+    semantic-find-tags-by-class
+    semantic-find-tags-by-name
+    semantic-flatten-tags-table
+    semantic-get-local-arguments
+    semantic-go-to-tag
+    semantic-lex-token-start
+    semantic-overlay-live-p
+    semantic-overlay-p
+    semantic-something-to-tag-table
+    semantic-tag
+    semantic-tag-abstract-p
+    semantic-tag-buffer
+    semantic-tag-calculate-parent
+    semantic-tag-children-compatibility
+    semantic-tag-class
+    semantic-tag-components
+    semantic-tag-end
+    semantic-tag-faux-p
+    semantic-tag-function-arguments
+    semantic-tag-function-constructor-p
+    semantic-tag-function-destructor-p
+    semantic-tag-function-parent
+    semantic-tag-get-attribute
+    semantic-tag-name
+    semantic-tag-new-variable
+    semantic-tag-overlay
+    semantic-tag-p
+    semantic-tag-protection
+    semantic-tag-prototype-p
+    semantic-tag-start
+    semantic-tag-static-p
+    semantic-tag-type
+    semantic-tag-type-interfaces
+    semantic-tag-type-members
+    semantic-tag-type-superclasses
+    semantic-tag-with-position-p
+    semanticdb-brute-deep-find-tags-by-name
+    semanticdb-deep-find-tags-by-name
+    semanticdb-find-result-length
+    semanticdb-find-result-nth
+    semanticdb-find-tags-by-name
+    semanticdb-full-filename
+    semanticdb-minor-mode-p
+    semanticdb-strip-find-results
+    )
+)
+
+(defconst ecb--semantic-format-function-list
+  '(
+    semantic-format-tag-abbreviate
+    semantic-format-tag-concise-prototype
+    semantic-format-tag-name
+    semantic-format-tag-prin1
+    semantic-format-tag-prototype
+    semantic-format-tag-summarize
+    semantic-format-tag-uml-abbreviate
+    semantic-format-tag-uml-concise-prototype
+    semantic-format-tag-uml-prototype
+    ))
+
+;; new let us create the aliase. Each alias has the name "ecb--"<function of
+;; cedet >= 1.0
+(dolist (f-elem  (append ecb--cedet-function-list ecb--semantic-format-function-list))
+  (defalias (intern (concat "ecb--" (symbol-name f-elem))) f-elem))
+
+(silentcomp-provide 'ecb-cedet-wrapper)
+
+;;; ecb-cedet-wrapper.el end here
diff --git a/site/ecb-2.40/ecb-common-browser.el b/site/ecb-2.40/ecb-common-browser.el
new file mode 100644
index 0000000..3d6448d
--- /dev/null
+++ b/site/ecb-2.40/ecb-common-browser.el
@@ -0,0 +1,2169 @@
+;;; ecb-common-browser.el --- common browsing stuff for  Emacs
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2004
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PATICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-common-browser.el,v 1.39 2009/05/15 15:19:53 berndl Exp $
+
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+
+(require 'ecb-util)
+
+(require 'tree-buffer)
+;; (require 'ecb-layout) ;; causes cyclic dependencies!
+(require 'ecb-mode-line)
+(require 'ecb-navigate)
+
+;; various loads
+(require 'assoc)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+(silentcomp-defvar modeline-map)
+
+(defgroup ecb-tree-buffer nil
+  "General settings related to the tree-buffers of ECB."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defcustom ecb-bucket-node-display '("" "" ecb-bucket-node-face)
+  "*How ECB displays bucket-nodes in a ECB tree-buffer.
+Bucket-nodes have only one job: Nodes with similar properties will be dropped
+into one bucket for such a common property and all these nodes will be added
+as children to the bucket-node. Besides being expandable and collapsable a
+bucket-node has no senseful action assigned. Examples for bucket-nodes are
+\"[+] Variables\", \"[+] Dependencies\" etc. in the Methods-buffer or buckets
+which combine filenames with same extension under a bucket-node with name this
+extension.
+
+This option defines how bucket-node should be displayed. The name of the
+bucket-node is computed by ECB but you can define a prefix, a suffix and a
+special face for the bucket-node
+
+The default are empty prefix/suffix-strings and 'ecb-bucket-node-face'. But
+an alternative can be for example '\(\"[\" \"]\" nil) which means no special
+face and a display like \"[+] [<bucket-name>]\"."
+  :group 'ecb-tree-buffer
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type '(list (string :tag "Bucket-prefix" :value "[")
+               (string :tag "Bucket-suffix" :value "]")
+               (choice :tag "Bucket-face" :menu-tag "Bucket-face"
+                       (const :tag "No special face" :value nil)
+                       (face :tag "Face" :value ecb-bucket-node-face)))
+  :initialize 'custom-initialize-default)
+
+(defcustom ecb-use-speedbar-instead-native-tree-buffer nil
+  "*If true then uses speedbar for directories, sources or methods.
+This means that speedbar is integrated in the ECB-frame and is displayed in
+that window normally displaying the standard ECB-directories-buffer,
+ECB-sources-buffer or ECB-methods-buffer.
+
+This option takes effect in all layouts which contain either a directory
+window, a sources window or a method window.
+
+This option can have four valid values:
+- nil: Do not use speedbar \(default)
+- dir: Use speedbar instead of the standard directories-buffer
+- source: Use speedbar instead of the standard sources-buffer
+- method: Use speedbar instead of the standard methods-buffer
+
+Note: For directories and sources a similar effect and usability is available
+by setting this option to nil \(or 'method) and setting
+`ecb-show-sources-in-directories-buffer' to not nil, because this combination
+displays also directories and sources in one window.
+
+`ecb-use-speedbar-instead-native-tree-buffer' is for people who like the
+speedbar way handling directories and source-files or methods and want it in
+conjunction with ECB."
+  :group 'ecb-tree-buffer
+  :group 'ecb-directories
+  :group 'ecb-sources
+  :group 'ecb-methods
+  :type '(radio (const :tag "Do not use speedbar" :value nil)
+                (const :tag "For directories" :value dir)
+                (const :tag "For sources" :value source)
+                (const :tag "For methods" :value method))
+  :initialize 'custom-initialize-default
+  :set (function (lambda (sym val)
+                   (set sym val)
+                   (if (and (boundp 'ecb-minor-mode) ecb-minor-mode)
+                       (ecb-redraw-layout-full)))))
+
+(defvar ecb-tree-do-not-leave-window-after-select--internal nil
+  "Only set by customizing `ecb-tree-do-not-leave-window-after-select' or
+calling `ecb-toggle-do-not-leave-window-after-select'! Do not set this
+variable directly, it is only for internal uses!")
+
+(defcustom ecb-tree-do-not-leave-window-after-select nil
+  "*Tree-buffers which stay selected after a key- or mouse-selection.
+If a buffer \(either its name or the variable-symbol which holds the name) is
+contained in this list then selecting a tree-node either by RET or by a
+mouse-click doesn't leave that tree-buffer after the node-selection but
+performes only the appropriate action \(opening a new source, selecting a
+method etc.) but point stays in the tree-buffer. In tree-buffers not contained
+in this option normaly a node-selection selects as \"last\" action the right
+edit-window or maximizes the next senseful tree-buffer in case of a currently
+maximized tree-buffer \(see `ecb-maximize-next-after-maximized-select').
+
+The buffer-name can either be defined as plain string or with a symbol which
+contains the buffer-name as value. The latter one is recommended for the
+builtin ECB-tree-buffers because then simply the related option-symbol can be
+used.
+
+A special remark for the `ecb-directories-buffer-name': Of course here the
+value of this option is only relevant if the name of the current layout is
+contained in `ecb-show-sources-in-directories-buffer' or if the value of
+`ecb-show-sources-in-directories-buffer' is 'always and the clicked ot hitted
+node represents a sourcefile \(otherwise this would not make any sense)!
+
+The setting in this option is only the default for each tree-buffer. With the
+command `ecb-toggle-do-not-leave-window-after-select' the behavior of a
+node-selection can be changed fast and easy in a tree-buffer without
+customizing this option, but of course not for future Emacs sessions!"
+  :group 'ecb-tree-buffer
+  :set (function (lambda (sym val)
+                   (set sym val)
+                   (setq ecb-tree-do-not-leave-window-after-select--internal
+                         (ecb-copy-list val))))
+  :type '(repeat (choice :menu-tag "Buffer-name"
+                        (string :tag "Buffer-name as string")
+                        (symbol :tag "Symbol holding buffer-name"))))
+
+(defcustom ecb-tree-indent 4
+  "*Indent size for tree buffer.
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect."
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type 'integer)
+
+(defcustom ecb-tree-expand-symbol-before t
+  "*Show the expand symbol before the items in a tree.
+When the expand-symbol is located before the items then the tree looks like:
+
+\[-] ECB
+    \[+] code-save
+    \[-] ecb-images
+        \[-] directories
+
+When located after then the tree looks like:
+
+ECB \[-]
+  code-save \[+]
+  ecb-images \[-]
+    directories \[-]
+
+The after-example above use a value of 2 for `ecb-tree-indent' whereas the
+before-example uses a value of 4.
+
+It is recommended to display the expand-symbol before because otherwise it
+could be that with a deep nested item-structure with and/or with long
+item-names \(e.g. a deep directory-structure with some long
+subdirectory-names) the expand-symbol is not visible in the tree-buffer and
+the tree-buffer has to be horizontal scrolled to expand an item."
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type 'boolean)
+
+;; we can savely set here 'image as default because the tree-buffer-lib checks
+;; itslef if image-support is possible and switches back to 'ascii-style if not.
+(defcustom ecb-tree-buffer-style 'image
+  "*The style of the tree-buffers.
+There are three different styles available:
+
+Image-style \(value 'image):
+Very nice and modern - just try it. For this style the options
+`ecb-tree-indent' and `ecb-tree-expand-symbol-before' have no effect!
+The value 'image means use image-style if images can be displayed with current
+Emacs-setup \(otherwise auto. 'ascii-style is used).
+Note: GNU Emacs <= 21.3.X for Windows does not support image-display so ECB
+uses always 'ascii-guides even when here 'image is set!
+
+Ascii-style with guide-lines \(value 'ascii-guides):
+\[-] ECB
+ |  \[+] code-save
+ `- \[-] ecb-images
+     |  \[-] directories
+     |   |  \[-] height-15
+     |   |   |  * close.xpm
+     |   |   |  * empty.xpm
+     |   |   |  * leaf.xpm
+     |   |   `- * open.xpm
+     |   |  \[+] height-17
+     |   |  \[+] height-19
+     |   `- \[+] height-21
+     |  \[x] history
+     |  \[x] methods
+     `- \[x] sources
+
+Ascii-style without guide-lines \(value 'ascii-no-guides) - this is the style
+used by ECB <= 1.96:
+\[-] ECB
+    \[+] code-save
+    \[-] ecb-images
+        \[-] directories
+            \[-] height-15
+                * close.xpm
+                * empty.xpm
+                * leaf.xpm
+                * open.xpm
+            \[+] height-17
+            \[+] height-19
+            \[+] height-21
+        \[x] history
+        \[x] methods
+        \[x] sources
+
+With both ascii-styles the tree-layout can be affected with the options
+`ecb-tree-indent' and `ecb-tree-expand-symbol-before'."
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Images-style" :value image)
+                (const :tag "Ascii-style with guide-lines" :value ascii-guides)
+                (const :tag "Ascii-style w/o guide-lines" :value ascii-no-guides)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: add here the analyse buffer if
+;; additonal images are necessary - but currently i don't think we need
+;; special images for this analyse-stuff.
+(defcustom ecb-tree-image-icons-directories
+  (let ((base (concat (if ecb-regular-xemacs-package-p
+                          (format "%s" (locate-data-directory "ecb"))
+                        ecb-ecb-dir)
+                      "ecb-images/")))
+    (cons (concat base "default/height-17")
+          (mapcar (function (lambda (i)
+                              (cons (car i) (concat base (cdr i)))))
+                  '((ecb-directories-buffer-name . "directories/height-17")
+                    (ecb-sources-buffer-name . "sources/height-14_to_21")
+                    (ecb-methods-buffer-name . "methods/height-14_to_21")))))
+  "*Directories where the images for the tree-buffer can be found.
+This is a cons cell where:
+
+car: Default directory where the default images for the tree-buffer can be
+found. It should contain an image for every name of
+`tree-buffer-tree-image-names'. The name of an image-file must be:
+\"ecb-<NAME of TREE-BUFFER-TREE-IMAGE-NAMES>.<ALLOWED EXTENSIONS>\".
+
+cdr: This is a list where each element is a cons again with: car is the buffer
+name of the tree-buffer for which a special image-path should be used. The
+buffer-name can either be defined as plain string or with a symbol which
+contains the buffer-name as value. The latter one is recommended for the
+builtin ECB-tree-buffers because then simply the related option-symbol can be
+used \(e.g. the symbol `ecb-directories-buffer-name'). The cdr is the the
+full-path of an additional image-directorie which is searched first for images
+needed for the related tree-buffer. If the image can not be found in this
+directory then the default-directory \(see above) is searched. If the
+image can't even be found there the related ascii-symbol is used - which is
+defined in `tree-buffer-tree-image-names'. If a tree-buffer is not contained
+in this list then there is no additional special image-directory for it.
+
+ECB comes with predefined images in several different heights - so for the
+most senseful font-heights of a tree-buffer a fitting image-size should be
+available. The images reside either in the subdirectory \"ecb-images\" of the
+ECB-installation or - if ECB is installed as regular XEmacs-package - in the
+ECB-etc data-directory \(the directory returned by \(locate-data-directory
+\"ecb\")."
+  :group 'ecb-tree-buffer
+  :type '(cons (directory :tag "Full default image-path")
+               (repeat (cons (choice :menu-tag "Buffer-name"
+                                     (string :tag "Buffer-name as string")
+                                     (symbol :tag "Symbol holding
+                                     buffer-name"))                             
+                             (directory :tag "Full image-path for this tree-buffer")))))
+
+(defcustom ecb-tree-truncate-lines '(ecb-directories-buffer-name
+                                     ecb-sources-buffer-name
+                                     ecb-methods-buffer-name
+                                     ecb-history-buffer-name
+                                     ecb-analyse-buffer-name)
+  "*Truncate lines in ECB buffers.
+If a buffer \(either its name or the variable-symbol which holds the name) is
+contained in this list then line-truncation is switched on for this buffer
+otherwise it is off.
+
+The buffer-name can either be defined as plain string or with a symbol which
+contains the buffer-name as value. The latter one is recommended to switch on
+line-truncation for one of the builtin ECB-tree-buffers because then simply
+the related option-symbol can be used. To truncate lines in the builtin
+directories tree-buffer just add the symbol `ecb-directories-buffer-name' to
+this option.
+
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect."
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type '(repeat (choice :menu-tag "Buffer-name"
+                         (string :tag "Buffer-name as string")
+                         (symbol :tag "Symbol holding buffer-name"))))
+
+(defcustom ecb-tree-easy-hor-scroll 5
+  "*Scroll step for easy hor. scrolling via mouse-click in tree-buffers.
+XEmacs has horizontal scroll-bars so invisible parts beyond the right
+window-border of a tree-buffer can always made visible very easy.
+
+GNU Emacs does not have hor. scroll-bars so especially with the mouse it is
+quite impossible to scroll smoothly right and left. The functions
+`scroll-left' and `scroll-right' can be annoying and are also not bound to
+mouse-buttons.
+
+If this option is a positive integer S then in all ECB-tree-buffers the keys
+\[M-mouse-1] and \[M-mouse-3] are bound to scrolling left rsp. right with
+scroll-step S - clicking with mouse-1 or mouse-2 onto the edge of the modeline
+has the same effect, i.e. if you click with mouse-1 onto the left \(rsp.
+right) edge of the modeline you will scroll left \(rsp. right). Additionally
+\[C-M-mouse-1] and \[C-M-mouse-3] are bound to scrolling left rsp. right with
+scroll-step `window-width' - 2. Default is a scroll-step of 5. If the value is
+nil then no keys for horizontal scrolling are bound."
+  :group 'ecb-tree-buffer
+  :type '(radio :value 5
+                (const :tag "No hor. mouse scrolling" :value nil)
+                (integer :tag "Scroll step")))
+
+
+(defcustom ecb-tree-make-parent-node-sticky t
+  "*Make the parent-node sticky in the headerline of the tree-buffer.
+
+If not nil then the first line of the tree-buffer is used as header-line which
+is used to display the next unvisible parent of the first visible node as
+sticky, so always the parent of a node is visible and clickable. If a node has
+no parent then just the next node above is displayed in the header-line. The
+node displayed in the header-line is exactly in the same manner clickable as
+all other nodes.
+
+See also `ecb-tree-stickynode-indent-string'.
+
+This feature is only available with Gnu Emacs, not with XEmacs."
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type 'boolean)
+
+(defcustom ecb-tree-stickynode-indent-string (tree-buffer-sticky-default-indent-string)
+  "*String used to indent the stickynode.
+This string is used to match the space used by scrollbars and
+fringe so it does not appear that the node-name is moving left/right
+when it lands in the sticky line.
+
+Normally the needed value is computed automatically by ECB. But if the result
+is not matching this option allows to customize the indent-string.
+The default value is computed by the function
+`tree-buffer-sticky-default-indent-string', so you can change the needed value
+with that starting-point.
+
+Changing this option takes only effect after restarting Emacs!"
+  :group 'ecb-tree-buffer
+  :type 'string)
+  
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should change this to a
+;; type analogous to ecb-tree-truncate-lines
+(defcustom ecb-truncate-long-names t
+  "*Truncate long names that don't fit in the width of the ECB windows.
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect."
+  :group 'ecb-tree-buffer
+  :type 'boolean)
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should change this to a
+;; type analogous to ecb-tree-truncate-lines
+(defcustom ecb-tree-incremental-search 'prefix
+  "*Enable incremental search in the ECB-tree-buffers.
+For a detailed explanation see the online help section \"Working with the
+keyboard in the ECB buffers\". If you change this during ECB is activated you
+must deactivate and activate ECB again to take effect."
+  :group 'ecb-tree-buffer
+  :type '(radio (const :tag "Match only prefix"
+                       :value prefix)
+                (const :tag "Match every substring"
+                       :value substring)
+                (const :tag "No incremental search"
+                       :value nil)))
+
+(defcustom ecb-tree-navigation-by-arrow t
+  "*Enable smart navigation in the tree-windows by horizontal arrow-keys.
+If not nil then the left- and right-arrow keys work in the ECB tree-window in
+the following smart way if onto an expandable node:
++ Left-arrow: If node is expanded then it will be collapsed otherwise point
+  jumps to the next \"higher\" node in the hierarchical tree \(higher means
+  the next higher tree-level or - if no higher level available - the next
+  higher node on the same level).
++ Right-arrow: If node is not expanded then it will be expanded.
+Onto a not expandable node the horizontal arrow-keys go one character in the
+senseful correct direction.
+
+If this option is changed the new value takes first effect after deactivating
+ECB and then activating it again!"
+  :group 'ecb-tree-buffer
+  :type 'boolean)
+
+(defun ecb-show-any-node-info-by-mouse-moving-p ()
+  "Return not nil if for at least one tree-buffer showing node info only by
+moving the mouse over a node is activated. See
+`ecb-directories-show-node-info' etc...."
+  (let ((when-list (mapcar (function (lambda (elem)
+                                       (car (symbol-value elem))))
+                           '(ecb-directories-show-node-info
+                             ecb-sources-show-node-info
+                             ecb-methods-show-node-info
+                             ecb-history-show-node-info
+                             ecb-analyse-show-node-info
+                             ))))
+    (or (member 'if-too-long when-list)
+        (member 'always when-list))))
+
+(defcustom ecb-primary-secondary-mouse-buttons 'mouse-2--C-mouse-2
+  "*Primary- and secondary mouse button for using the ECB-buffers.
+A click with the primary button causes the main effect in each ECB-buffer:
+- ECB Directories: Expanding/collapsing nodes and displaying files in the ECB
+  Sources buffer.
+- ECB sources/history: Opening the file in that edit-window specified by the
+  option `ecb-mouse-click-destination'.
+- ECB Methods: Jumping to the method in that edit-window specified by the
+  option `ecb-mouse-click-destination'.
+
+A click with the primary mouse-button while the SHIFT-key is pressed called
+the POWER-click and does the following \(depending on the ECB-buffer where the
+POWER-click occurs):
++ Directory-buffer: Refreshing the directory-contents-cache \(see
+  `ecb-cache-directory-contents').
++ Sources- and History-buffer: Only displaying the source-contents in the
+  method-buffer but not displaying the source-file in the edit-window.
++ Methods-buffer: Narrowing to the clicked method/variable/ect... \(see
+  `ecb-tag-visit-post-actions'). This works only for sources supported by
+  semantic!
+
+In addition always the whole node-name is displayed in the minibuffer after a
+POWER-click \(for this see `ecb-directories-show-node-info' etc...).
+
+The secondary mouse-button is for opening \(jumping to) the file in another
+edit-window \(see the documentation `ecb-mouse-click-destination').
+
+The following combinations are possible:
+- primary: mouse-2, secondary: C-mouse-2 \(means mouse-2 while CTRL-key is
+  pressed). This is the default setting.
+- primary: mouse-1, secondary: C-mouse-1
+- primary: mouse-1, secondary: mouse-2
+
+Note: If the tree-buffers are used with the keyboard instead with the mouse
+then [RET] is interpreted as primary mouse-button and [C-RET] as secondary
+mouse-button!
+
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect!"
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Primary: mouse-2, secondary: Ctrl-mouse-2"
+                       :value mouse-2--C-mouse-2)
+                (const :tag "Primary: mouse-1, secondary: Ctrl-mouse-1"
+                       :value mouse-1--C-mouse-1)
+                (const :tag "Primary: mouse-1, secondary: mouse-2"
+                       :value mouse-1--mouse-2)))
+
+(defcustom ecb-tree-mouse-action-trigger 'button-release
+  "*When the tree-buffer mouse-action should be triggered.
+This option determines the moment a mouse-action in a tree-buffer is
+triggered. This can be either direct after pressing a mouse-button \(value
+'button-press) or not until releasing the mouse-button \(value:
+'button-release).
+
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect!"
+  :group 'ecb-tree-buffer
+  :type '(radio (const :tag "After button release" :value button-release)
+                (const :tag "After button press" :value button-press)))
+
+(defcustom ecb-mouse-click-destination 'last-point
+  "*Destination of a mouse-button click.
+Defines in which edit-window \(if splitted) ECB does the \"right\" action
+\(opening a source, jumping to a method/variable etc.) after clicking with a
+mouse-button \(see `ecb-primary-secondary-mouse-buttons') onto a node. There
+are two possible choices:
+- left-top: Does the \"right\" action always in the left/topmost edit-window.
+- last-point: Does the \"right\" action always in that edit-window which had
+  the point before.
+This is if the user has clicked either with the primary mouse-button or
+has activated a popup-menu in the tree-buffer.
+
+A click with the secondary mouse-button \(see again
+`ecb-primary-secondary-mouse-buttons') does the \"right\" action always in
+another edit-window related to the setting in this option: If there are two
+edit-windows then the \"other\" edit-window is used and for more than 2
+edit-windows the \"next\" edit-window is used \(whereas the next edit-window
+of the last edit-window is the first edit-window).
+
+If the edit-window is not splitted this setting has no effect.
+
+Note: If the tree-buffers are used with the keyboard instead with the mouse
+then this option takes effect too because [RET] is interpreted as primary
+mouse-button and [C-RET] as secondary mouse-button!"
+  :group 'ecb-tree-buffer
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Left/topmost edit-window"
+                       :value left-top)
+                (const :tag "Last edit-window with point"
+                       :value last-point)))
+
+
+(defcustom ecb-common-tree-buffer-after-create-hook nil
+  "*Local hook running at the end of each tree-buffer creation.
+Every function of this hook is called once without arguments direct after
+creating a tree-buffer of ECB and it's local key-map. So for example a function
+could be added which performs calls of `local-set-key' to define new
+key-bindings for EVERY tree-buffer.
+
+The following keys must not be rebind in all tree-buffers:
+- <RET> and all combinations with <Shift> and <Ctrl>
+- <TAB>
+- `C-t'"
+  :group 'ecb-tree-buffer
+  :type 'hook)
+
+(defcustom ecb-basic-buffer-sync '(Info-mode dired-mode)
+  "*Synchronize the basic ECB-buffers automatically with current edit buffer.
+
+The basic ECB-buffers are the buffers for directories, sources, methods and
+history.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+But in every case the synchronization takes only place if the current-buffer
+in the edit-window has a relation to files or directories. Examples for the
+former one are all programming-language-modes, `Info-mode' too, an example for
+the latter one is `dired-mode'. For all major-modes related to
+non-file/directory-buffers like `help-mode', `customize-mode' and others never
+an autom. synchronization will be done!
+
+It's recommended to exclude at least `Info-mode' because it makes no sense to
+synchronize the ECB-windows after calling the Info help. Per default also
+`dired-mode' is excluded but it can also making sense to synchronize the
+ECB-directories/sources windows with the current directory in the
+dired-buffer.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-basic-buffer-sync-hook' is evaluated."
+  :group 'ecb-tree-buffer
+  :type '(radio :tag "Synchronize basic ECB buffers"
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+
+(defcustom ecb-basic-buffer-sync-delay 0.25
+  "*Time Emacs must be idle before the special ECB-buffers are synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay."
+  :group 'ecb-tree-buffer
+  :type '(radio (const :tag "No synchronizing delay"
+                       :value nil)
+                (number :tag "Idle time before synchronizing"
+                        :value 0.25))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if ecb-minor-mode
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-basic-buffer-sync))))
+  :initialize 'custom-initialize-default)
+
+(defcustom ecb-basic-buffer-sync-hook nil
+  "*Hook run at the end of `ecb-basic-buffer-sync'.
+See documentation of `ecb-basic-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Precondition for such a hook:
+Current buffer is the buffer of the currently selected edit-window.
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option `ecb-basic-buffer-sync' is not nil
+the function `ecb-basic-buffer-sync' is running either every time
+Emacs is idle or even after every command \(see
+`ecb-basic-buffer-sync-delay'). So these hooks can be really
+called very often! Therefore each function of this hook
+should/must check in an efficient way at beginning if its task
+have to be really performed and then do them only if really
+necessary! Otherwise performance of Emacs could slow down
+dramatically!
+
+It is strongly recommended that each function added to this hook uses the
+macro `ecb-do-if-buffer-visible-in-ecb-frame' at beginning! See
+`ecb-speedbar-buffer-sync' and `ecb-eshell-buffer-sync' for
+examples how to use this macro!"
+  :group 'ecb-tree-buffer
+  :type 'hook)
+
+;;====================================================
+;; Internals
+;;====================================================
+
+;;; ----- advice stuff -------------------------------------
+
+(defvar ecb-adviced-function-sets nil
+  "A list of adviced-function sets defined with `defecb-advice-set'.
+Each element is a cons-cell where car is the advice-set-var and cdr is an
+indicator if the caller of `ecb-with-original-adviced-function-set' is the
+outmost caller.
+
+DO NOT CHANGE THIS!")
+
+(defvar ecb-adviced-permanent-function-sets nil
+  "A list of symbols, each of them an advice-set which should be permanent.
+Permanent means this advice set will not be disabled during deactivation of
+ECB. This variable is only set by `defecb-advice-set'.
+
+DO NOT CHANGE THIS!")
+
+(defvar ecb-adviced-functions nil
+  "A list of all advices defined with `defecb-advice'.
+This list is the set union of the values of all function-sets of
+`ecb-adviced-function-sets'.
+
+DO NOT CHANGE THIS!")
+
+(defvar ecb-advices-debug-error nil
+  "It not nil then each advice of ECB reports when it's en/disabled or called.")
+
+(defun ecb-advices-debug-error (advice class action &rest args)
+  "Run ARGS through `format' and write it to the *Messages*-buffer.
+ADVICE is the adviced-function-symbol, CLASS is the advice-class \(after,
+around or before) and ACTION is one of the symbols 'calling, 'enabling,
+'disabling or 'reporting.
+
+This will build up a message string like:
+ECB <version>: debug <ACTION> of '<CLASS>' advice ADVICE: ARGS.
+If ARGS is nil then only the message above is reported."
+  (when ecb-advices-debug-error
+    (message (concat (format "ECB %s: debug %s of '%s' advice %s "
+                             ecb-version
+                             action
+                             class
+                             advice)
+                     (if args
+                         (apply 'format args))))))
+
+(defmacro defecb-advice-set (advice-set docstring &optional permanent)
+  "Defines an advice-set for ECB.
+This defines a variable which will contain adviced functions defined by
+`defecb-advice-set'. This is a set of advices which can be enabled or disabled
+\"en block\" which must be done either by `ecb-enable-advices',
+`ecb-disable-advices' or `ecb-with-original-adviced-function-set'.
+
+Before defining a new advice-set it's recommended to take a look at the value
+of `ecb-adviced-function-sets' if there is already a suitable advice-set.
+
+IMPORTANT: Each advice in ECB must be defined by `defecb-advice' and must
+belong to an advice-set previously defined by `defecb-advice-set'!
+
+All advice-sets of ECB will be automatically\(!) disabled at load-time of the
+ecb-library and at deactivation-time of ECB. But: Enabling of a certain
+advice-set must be done appropriately.
+
+If optional argument PERMANENT is t then this advice-set will NOT be disabled
+at deactivation-time of ECB! Calling `ecb-disable-advices' for an advice set
+defined with permanent is t will take no effect unless the optional argument
+FORCE-PERMANENT of this function is set to not nil.
+PERMANENT can also be a function which will be called by `ecb-disable-advices'
+for this advice set \(the function gets one argument: the symbol of the
+advice-set) and have to return not nil if the advice-set should not be disable
+by `ecb-disable-advices' unless the FORCE-PERMANENT of this function is set to
+not nil. 
+
+Example:
+
+\(defecb-advice-set ecb-always-disabled-advices
+  \"These advices are always disabled.\")"
+  `(eval-and-compile
+     (add-to-list 'ecb-adviced-function-sets (cons (quote ,advice-set), nil))
+     ,(if permanent
+          `(add-to-list 'ecb-adviced-permanent-function-sets
+                        (cons (quote ,advice-set) ,permanent)))
+     (defvar ,advice-set nil ,docstring)))
+
+(put 'defecb-advice-set 'lisp-indent-function 1)
+
+(defmacro defecb-advice (adviced-function advice-class advice-set advice-docstring &rest body)
+  "Defines an advice for ADVICED-FUNCTION with ADVICE-CLASS for ADVICE-SET.
+ADVICED-FUNCTION must be an advicable object \(e.g. a function, a subr
+etc...). ADVICE-CLASS must be one of around, after or before. ADVICE-SET must
+ba an advice-set previously defined by `defecb-advice-set'. ADVICE-DOCSTRING
+ist the docstring for the advice. BODY is the program-code for the advice as
+it would be written with `defadvice'.
+
+Do not quote ADVICED-FUNCTION, ADVICE-CLASS and ADVICE-SET.
+
+Example:
+
+\(defecb-advice delete-frame around ecb-layout-basic-adviced-functions
+  \"If FRAME is equal to the ECB frame then...\"
+  \(let \(\(frame \(or \(ad-get-arg 0) \(selected-frame))))
+    \(if \(and ecb-minor-mode
+             \(equal frame ecb-frame))
+        \(when \(ecb-confirm \"Attempt to delete the ECB-frame....Proceed? \")
+	  \(ecb-deactivate-internal) 
+	  ad-do-it)
+      ad-do-it)))"
+  `(progn
+     (if (assoc (quote ,advice-set) ecb-adviced-function-sets)
+         (add-to-list (quote ,advice-set)
+                      (cons (quote ,adviced-function) (quote ,advice-class)))
+       (error "The advice-set %s does not exist!"
+              (symbol-name (quote ,advice-set))))
+     (if (not (member (quote ,advice-class)
+                      '(around after before)))
+         (error "The advice-class %s is not allowed - only around, after and before!"
+                (symbol-name (quote ,advice-class))))
+     (add-to-list 'ecb-adviced-functions (cons (quote ,adviced-function) (quote ,advice-class)))
+     (eval-and-compile
+       (defadvice ,adviced-function (,advice-class ecb)
+         ,advice-docstring
+         (ecb-advices-debug-error (quote ,adviced-function)
+                                  (quote ,advice-class)
+                                  'calling)
+         ,@body))))
+
+(put 'defecb-advice 'lisp-indent-function 3)
+
+;; (insert (pp (macroexpand '(defecb-advice insert around
+;;                                          ecb-always-disabled-advices "doc"
+;;                                          (message "test")))))
+
+
+(defun ecb-enable-ecb-advice (function-symbol advice-class arg)
+  "If ARG is greater or equal zero then enable the adviced version of
+FUNCTION-SYMBOL. Otherwise disable the adviced version. The advice must be
+defined with class ADVICE-CLASS by `defecb-advice'.
+
+IMPORTANT: Do not use the function directly. Always use `ecb-enable-advices',
+`ecb-disable-advices' or `ecb-with-original-adviced-function-set'!."
+  (if (< arg 0)
+      (progn
+        (ad-disable-advice function-symbol advice-class 'ecb)
+        (ad-activate function-symbol)
+        (ecb-advices-debug-error function-symbol advice-class 'disabling))
+    (ad-enable-advice function-symbol advice-class 'ecb)
+    (ad-activate function-symbol)
+    (ecb-advices-debug-error function-symbol advice-class 'enabling)))
+    
+
+(defun ecb-enable-advices (adviced-function-set-var)
+  "Enable all advices of ADVICED-FUNCTION-SET-VAR, which must be defined by
+`defecb-advice-set'."
+  (if ecb-advices-debug-error
+      (message "ECB %s: debug enabling the advice-set: %s"
+               ecb-version adviced-function-set-var))
+  (if (eq adviced-function-set-var 'ecb-always-disabled-advices)
+      (error "The advice-set ecb-always-disabled-advices must not be enabled!"))
+  (if (not (assq adviced-function-set-var ecb-adviced-function-sets))
+      (error "The adviced function set %s is not defined by defecb-advice-set!"
+             (symbol-name adviced-function-set-var)))
+  (dolist (elem (symbol-value adviced-function-set-var))
+    (ecb-enable-ecb-advice (car elem) (cdr elem) 1)))
+  
+(defun ecb-disable-advices (adviced-function-set-var &optional force-permanent)
+  "Disable all advices of ADVICED-FUNCTION-SET-VAR, which must be defined by
+`defecb-advice-set'
+
+This function tests if ADVICED-FUNCTION-SET-VAR has been defined as permanent
+by `defecb-advice-set'.
+
+Calling `ecb-disable-advices' for an advice set defined with
+permanent t will take no effect unless the optional argument
+FORCE-PERMANENT is set to not nil. If the advice set is defined as permanent
+with a permanent-disable-function then this function is called with
+ADVICED-FUNCTION-SET-VAR as argument; if this function returns not nil then
+the adviced will be treated as permanent and will not being disabled.
+
+If optional FORCE-PERMANENT is not nil then ADVICED-FUNCTION-SET-VAR will
+be disabled regardless if permanent or not."
+  (if ecb-advices-debug-error
+      (message "ECB %s: debug disabling the advice-set: %s"
+               ecb-version adviced-function-set-var))
+  (if (not (assq adviced-function-set-var ecb-adviced-function-sets))
+      (error "The adviced function set %s is not defined by defecb-advice-set!"
+             (symbol-name adviced-function-set-var)))
+  (let ((permanent (if force-permanent
+                       nil
+                     (cdr (assq adviced-function-set-var
+                                ecb-adviced-permanent-function-sets)))))
+    (unless (or (eq permanent t)
+                (and (functionp permanent)
+                     (funcall permanent adviced-function-set-var)))
+      (dolist (elem (symbol-value adviced-function-set-var))
+        (ecb-enable-ecb-advice (car elem) (cdr elem) -1)))))
+
+;; for the outmost-caller-stuff see ecb-with-original-adviced-function-set
+(defmacro ecb-with-ecb-advice (function-symbol advice-class &rest body)
+  "Evaluates BODY with the adviced version of FUNCTION-SYMBOL. The advice must
+be defined by `defecb-advice' with class ADVICE-CLASS for the advice-set
+`ecb-always-disabled-advices'. Otherwise an error occurs. The advice is only
+active during BODY.
+
+BODY is protected by `unwind-protect' so in each case the advice
+will be disabled after finishing this macro unless it is nested
+within a call to this macro for the *same* FUNCTION-SYMBOL and
+ADVICE-CLASS-combination! This means that the usage of this macro
+is save for arbitrary nested calls, so full BODY is guaranted
+being evaluated with enabled ADVICE-CLASS advice for
+FUNCTION-SYMBOL.
+
+Returns the value of BODY.
+
+Example where this macro is used for `walk-windows' within another advice:
+
+\(ecb-with-ecb-advice 'walk-windows 'around
+   ad-do-it)"
+  (let ((outmost-caller-p (make-symbol "outmost-caller-p")))
+    ;; we have to check if we are the outmost-caller of this macro for this
+    ;; adviced function AND the advice-class! different advice-classes for the
+    ;; same function have to be treated differently!!
+    `(let ((,outmost-caller-p (unless (member ,advice-class (get ,function-symbol 'ecb-with-ecb-advice))
+                                (put ,function-symbol 'ecb-with-ecb-advice
+                                     (append (list ,advice-class) (get ,function-symbol 'ecb-with-ecb-advice)))
+                                ,advice-class)))
+       (if (not (member (cons ,function-symbol ,advice-class)
+                      ecb-always-disabled-advices))
+         (error "Advice for %s with class %s not registered in ecb-always-disabled-advices!"
+                (symbol-name ,function-symbol)
+                (symbol-name ,advice-class)))
+       (if ecb-advices-debug-error
+           (message "ECB %s: debug with always disabled ecb-advice: %s %s - ENTRY"
+                    ecb-version ,advice-class ,function-symbol))
+       (unwind-protect
+         (progn
+           (when ,outmost-caller-p
+             (ecb-enable-ecb-advice ,function-symbol ,advice-class 1))
+           ,@body)
+         (when ,outmost-caller-p
+           ;; Only if we are the outmost caller we are allowed to disable the
+           ;; enabled advice
+           (put ,function-symbol 'ecb-with-ecb-advice
+                (delete ,advice-class (get ,function-symbol 'ecb-with-ecb-advice)))
+           (ecb-enable-ecb-advice ,function-symbol ,advice-class -1))
+         (if ecb-advices-debug-error
+             (message "ECB %s: debug with always disabled ecb-advice: %s %s - EXIT"
+                      ecb-version ,advice-class ,function-symbol))))))
+         
+(put 'ecb-with-ecb-advice 'lisp-indent-function 2)
+
+;; (insert (pp (macroexpand '(ecb-with-ecb-advice 'one-window-p 'around
+;;                             (message "")))))
+
+(defmacro ecb-with-original-adviced-function-set (adviced-function-set-var &rest body)
+  "Evaluates BODY with all adviced functions of ADVICED-FUNCTION-SET-VAR
+being disabled \(means with their original definition). Restores always \(even
+if an error occurs during evaluating BODY) the previous state of the adviced
+functions, means it depends if the call to this macro is the outermost call:
+Only if it is the outermost-call the advices of the used advice-set will be
+disabled after finishing. So full BODY is guaranted being evaluated with
+disabled advices of ADVICED-FUNCTION-SET-VAR.
+
+ADVICED-FUNCTION-SET-VAR must be defined by `defecb-advice-set' and all
+advices of this set must be defined by `defecb-advice'. Otherwise an error
+occurs.
+
+Example:
+
+\(ecb-with-original-adviced-function-set 'ecb-layout-basic-adviced-functions
+   \(do-something..))"
+  (let ((outmost-caller-p (make-symbol "outmost-caller-p")))
+    `(let ((,outmost-caller-p 
+            (unless (equal (cdr (assq ,adviced-function-set-var ecb-adviced-function-sets))
+                           'outmost-caller)
+              ;; if we are the outmost caller of this macro we store this
+              ;; for
+              ;; a) following callers
+              ;; b) ourself, so we can later reset is
+              (setcdr (assq ,adviced-function-set-var ecb-adviced-function-sets) 'outmost-caller))
+            ))
+       (if ecb-advices-debug-error
+           (message "ECB %s: debug with original advice-set: %s - ENTRY"
+                    ecb-version ,adviced-function-set-var))
+       (unwind-protect
+           (progn
+             (when ,outmost-caller-p
+               ;; we must force disabling permanent advice-sets too
+               (ecb-disable-advices ,adviced-function-set-var t))
+             ,@body)
+         (when ,outmost-caller-p
+           ;; Only if we are the outmost caller we are allowed to re-enable the
+           ;; disabled advice-set
+           (setcdr (assq ,adviced-function-set-var ecb-adviced-function-sets) nil)
+           (ecb-enable-advices ,adviced-function-set-var))
+         (if ecb-advices-debug-error
+             (message "ECB %s: debug with original advice-set: %s - EXIT"
+                      ecb-version ,adviced-function-set-var))))))
+
+
+(put 'ecb-with-original-adviced-function-set 'lisp-indent-function 1)
+
+
+
+(defecb-advice-set ecb-always-disabled-advices
+  "These advices are always disabled.
+This advice-set can not be enabled by `ecb-enable-advices' but such an
+advice has to be activated 'on demand' by the caller. Such an advice must be
+used with the macro `ecb-with-ecb-advice'.")
+
+;; -- window stuff
+
+(defun ecb-combine-ecb-button/edit-win-nr (ecb-button edit-window-nr)
+  "Depending on ECB-BUTTON and EDIT-WINDOW-NR return one value:
+- nil if ECB-BUTTON is 1.
+- t if ECB-BUTTON is 2 and the edit-area of ECB is splitted.
+- EDIT-WINDOW-NR if ECB-BUTTON is 3."
+  (case ecb-button
+    (1 nil)
+    (2 (ecb-edit-window-splitted))
+    (3 edit-window-nr)))
+
+(defun ecb-get-edit-window (other-edit-window)
+  "Get the correct edit-window. Which one is the correct one depends on the
+value of OTHER-EDIT-WINDOW \(which is a value returned by
+`ecb-combine-ecb-button/edit-win-nr') and `ecb-mouse-click-destination'.
+- OTHER-EDIT-WINDOW is nil: Get the edit-window according to the option
+  `ecb-mouse-click-destination'.
+- OTHER-EDIT-WINDOW is t: Get the next edit-window in the cyclic list of
+  current edit-windows starting either from the left-top-most one or from the
+  last edit-window with point (depends on
+  `ecb-mouse-click-destination').
+- OTHER-EDIT-WINDOW is an integer: Get exactly the edit-window with that
+  number > 0."
+  (let ((edit-win-list (ecb-canonical-edit-windows-list)))
+    (typecase other-edit-window
+      (null
+       (if (eq ecb-mouse-click-destination 'left-top)
+           (car edit-win-list)
+         ecb-last-edit-window-with-point))
+      (integer
+       (ecb-get-edit-window-by-number other-edit-window edit-win-list))
+      (otherwise
+       (ecb-next-listelem edit-win-list
+                          (if (eq ecb-mouse-click-destination 'left-top)
+                              (car edit-win-list)
+                            ecb-last-edit-window-with-point))))))
+
+(defun ecb-source-make (filename &optional buffer)
+  "Build a source-object from FILENAME and BUFFER.
+If optional arg BUFFER is nil then the just FILENAME is returned.
+If BUFFER is not nil then it can be either a buffer-object or a buffer-name.
+A cons is returned where car is FILENAME and cdr is the buffername of BUFFER."
+  (let ((buffername (when buffer
+                      (if (bufferp buffer)
+                          (buffer-name buffer)
+                        buffer))))
+    (if buffername
+        (cons filename buffername)
+      filename)))
+
+(defun ecb-source-get-filename (source)
+  "SOURCE is either a string, then it is a filename or a cons, then the car is
+the filename and the cdr is the buffer-name, whereas the latter one can be the
+name of an indirect-buffer."
+  (if (consp source)
+      (car source)
+    source))
+
+(defun ecb-source-get-buffername (source)
+  "SOURCE is either a string, then it is a filename or a cons, then the car is
+the filename and the cdr is the buffer-name, whereas the latter one can be the
+name of an indirect-buffer."
+  (if (consp source)
+      (cdr source)))
+
+(defun ecb-source-get-buffer (source)
+  "Return a living buffer-object for SOURCE.
+SOURCE is either a string, then it is a filename or a cons, then the car is
+the filename and the cdr is the buffer-name, whereas the latter one can be the
+name of an indirect-buffer.
+
+If SOURCE contains a living buffer then this buffer is returned. Otherwise a
+buffer for the filename-part of SOURCE is created and returned. For an
+existing ans readable file this means the file is loaded into a buffer.
+
+Note: The buffer is just returned but not displayed."
+  (let* ((my-source (if (consp source) source (cons source nil)))
+         (filename (car my-source))
+         (buffer (and (cdr my-source)
+                      (get-buffer (cdr my-source)))))
+    (or buffer
+        (find-file-noselect filename))))
+
+(defun ecb-display-source (source other-edit-window)
+  "Display SOURCE in the correct edit-window.
+What the correct window is depends on the setting in
+`ecb-mouse-click-destination' and the value of OTHER-EDIT-WINDOW
+\(for this see `ecb-combine-ecb-button/edit-win-nr').
+
+SOURCE is either a string, then it is a filename or a cons, then the car is
+the filename and the cdr is the buffer-name, whereas the latter one can be the
+name of an indirect-buffer."
+  (select-window (ecb-get-edit-window other-edit-window))
+  (ecb-nav-save-current)
+  (switch-to-buffer (ecb-source-get-buffer source))
+  (ecb-nav-add-item (ecb-nav-file-history-item-new)))
+
+(defvar ecb-path-selected-directory nil
+  "Path to currently selected directory.")
+
+(defvar ecb-path-selected-source nil
+  "Path to currently selected source.
+
+It is a cons where the cdr is a buffer-object of the current selected source
+The name of this file is the car of the cons:
+\(<filename> . <indirect-buffer-object>).
+
+This variable is only set by `ecb-path-selected-source-set' and evaluated by
+the function `ecb-path-selected-source'.
+
+Do not use it directly! Use always one of the mentioned functions!")
+
+(defun ecb-path-selected-source-set (filename buffer)
+  "Set `ecb-path-selected-source' to FILENAME and BUFFER.
+Returns in the new value. FILENAME and BUFFER must not be nil.
+For a description of FILENAME and BUFFER see `ecb-source-make'."
+  (unless (and filename buffer)
+    (error "ECB %s: Invalid setting of `ecb-path-selected-source with file %s, buffer %s"
+           ecb-version filename buffer))
+  (setq ecb-path-selected-source (ecb-source-make filename buffer)))
+  
+(defun ecb-path-selected-source (&optional type)
+  "Get the value of the internal variable `ecb-path-selected-source'.
+If optional arg TYPE is the symbol 'file then the filename-part
+is returned as string, if it is the symbol 'buffername then the
+stored buffername is returned if there is any and and if it is the
+symbol 'buffer then the buffer-object of the stored buffername is
+returned if there is any or nil.
+
+In all other cases of TYPE always that value is returned
+`ecb-path-selected-source' has been set by most recent
+`ecb-path-selected-source-set'."
+  (case type
+    (file (ecb-source-get-filename ecb-path-selected-source))
+    (buffername (ecb-source-get-buffername ecb-path-selected-source))
+    (buffer (ecb-source-get-buffer ecb-path-selected-source))
+    (otherwise ecb-path-selected-source)))
+
+
+;; all defined tree-buffer creators
+
+(defvar ecb-tree-buffer-creators nil
+  "The tree-buffer creators of ECB.
+An alist where each element is a cons where the car is a symbol which contains
+the name of a tree-buffer \(e.g. `ecb-sources-buffer-name') and the cdr is the
+associated function-symbol which creates the tree-buffer with that name.")
+
+(defun ecb-tree-buffer-creators-init ()
+  "Initialize `ecb-tree-buffer-creators'.
+Removes all creators and set it to nil."
+  (setq ecb-tree-buffer-creators nil))
+
+(defun ecb-tree-buffer-creators-register (name-symbol fn)
+  "Register the creator-function FN for the tree-buffer NAME-SYMBOL."
+  (add-to-list 'ecb-tree-buffer-creators (cons name-symbol fn)))
+
+(defun ecb-tree-buffer-creators-run ()
+  "Run all currently registered creator-functions."
+  (dolist (creator-elem ecb-tree-buffer-creators)
+    ;; create all the tree-buffers if they don't already exist
+    (funcall (cdr creator-elem))))
+  
+
+(defmacro defecb-tree-buffer-creator (creator
+                                      tree-buffer-name-symbol
+                                      docstring &rest body)
+  "Define a creator-function CREATOR for a tree-buffer which name is hold in
+the symbol TREE-BUFFER-NAME-SYMBOL. Do not quote CREATOR and
+TREE-BUFFER-NAME-SYMBOL. DOCSTRING is the docstring for CREATOR. BODY is all
+the program-code of CREATOR \(must contain a call to `tree-buffer-create'). It
+makes sense that BODY returns the created tree-buffer.
+
+When creating a tree-buffer with this macro then this tree-buffer will be
+automatically created \(i.e. its creator-function defined with this macro will
+be called) when activating ECB and the tree-buffer will automatically
+registered at ECB. This means that some features of ECB will work
+automatically out of the box with this tree-buffer.
+
+When creating a tree-buffer for ECB then it MUST be created with this macro
+and not with `tree-buffer-create'!"
+  `(eval-and-compile
+     (ecb-tree-buffer-creators-register (quote ,tree-buffer-name-symbol)
+                                        (quote ,creator))
+     (defun ,creator ()
+       ,docstring
+       (unless (ecb-tree-buffers-get-symbol ,tree-buffer-name-symbol)
+         (ecb-tree-buffers-add ,tree-buffer-name-symbol
+                               (quote ,tree-buffer-name-symbol))
+         ,@body))))
+
+(put 'defecb-tree-buffer-creator 'lisp-indent-function 2)
+
+;; all created tree-buffers 
+
+(defvar ecb-tree-buffers nil
+  "The tree-buffers of ECB.
+An alist with a cons for each created \(do not confuse created with visible!)
+tree-buffer where the car is the name of the tree-buffer and the cdr is the
+associated symbol which contains this name.")
+
+(defsubst ecb-tree-buffers-init ()
+  (setq ecb-tree-buffers nil))
+
+(defsubst ecb-tree-buffers-add (name name-symbol)
+  (unless (ecb-find-assoc name ecb-tree-buffers)
+    (setq ecb-tree-buffers
+          (ecb-add-assoc (cons name name-symbol) ecb-tree-buffers))))
+
+(defsubst ecb-tree-buffers-name-list ()
+  (mapcar (function (lambda (e) (car e))) ecb-tree-buffers))
+
+(defsubst ecb-tree-buffers-symbol-list ()
+  (mapcar (function (lambda (e) (cdr e))) ecb-tree-buffers))
+
+(defsubst ecb-tree-buffers-buffer-list ()
+  (mapcar (function (lambda (e) (get-buffer (car e)))) ecb-tree-buffers))
+
+(defsubst ecb-tree-buffers-get-symbol (name)
+  (ecb-find-assoc-value name ecb-tree-buffers))
+
+(defvar ecb-tree-buffer-callbacks '((expand . nil) (select . nil))
+  "All callback-functions for the tree-buffers of ECB.
+This list contains two items of the form:
+\(<callback-type> .\(<buffer-callback-alist>))
+where <callback-type> is 'select and 'expand and
+<buffer-callback-alist> is an alist where each item is a cons
+like \(<buffer-name-symbol> . <callback-symbol>)."
+  )
+
+
+(defun ecb-tree-buffer-callbacks-add (type buffer-name-symbol callback)
+  (unless (member type '(select expand))
+    (error "ECB %s tries to add tree-buffer-callback of unknown type %s"
+           ecb-version type))
+  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should add a check if
+  ;; the buffer-name-symbol is already registered with defecb-tree-buffer-creator
+  (let ((type-elem (ecb-find-assoc type ecb-tree-buffer-callbacks)))
+    (unless (ecb-find-assoc buffer-name-symbol type-elem)
+      (setcdr type-elem (cons (cons buffer-name-symbol callback)
+                              (cdr type-elem))))))
+
+
+(defun ecb-tree-buffer-callbacks-alist-of-type (type)
+  (unless (member type '(select expand))
+    (error "ECB %s tries to get tree-buffer-callback of unknown type %s"
+           ecb-version type))
+  (cdr (assoc type ecb-tree-buffer-callbacks)))
+
+
+(defmacro defecb-tree-buffer-callback (callback
+                                       tree-buffer-name-symbol
+                                       callback-type
+                                       optional-arg-list
+                                       docstring &rest body)
+  "Define a callback-function CALLBACK for a tree-buffer which name is hold in
+the symbol TREE-BUFFER-NAME-SYMBOL. Do not quote CALLBACK and
+TREE-BUFFER-NAME-SYMBOL and CALLBACK-TYPE. DOCSTRING is the
+docstring for CALLBACK. BODY is all the program-code of CALLBACK.
+
+CALLBACK-TYPE must be either 'expand or 'select, whereas the
+former one defines a callback for handling expanding a node and
+the latter one for clicking onto a node.
+
+CALLBACK is defined as a function with at least five arguments:
+NODE, ECB-BUTTON, EDIT-WINDOW-NR, SHIFT-MODE and META-MODE.
+CALLBACK must handle clicking onto NODE in the tree-buffer for
+which the callback is defined. ECB-BUTTON can be 1, 2 or 3 \(=
+mouse-buttons). If 3 then EDIT-WINDOW-NR contains the number of
+the edit-window the NODE should be displayed or whatever should
+be done with NODE. For 1 and 2 the value of EDIT-WINDOW-NR is
+ignored. SHIFT-MODE and META-MODE are not nil if the user has
+pressed the shift- rsp. the meta-button during his click. Note:
+using the keyboard in the tree-buffer instead the mouse is
+already handled by the caller of CALLBACK, so CALLBACK has no
+need to bother with keyboard or mouse specific stuff!
+
+If OPTIONAL-ARG-LIST is not nil then it must be a list with all
+optional or rest arguments. You have to include the keywords
+&optional or/and &rest! The first item of this list must be
+either the keyword &optional or &rest! The defined CALLBACK gets
+exactly these additional arguments after the reqired 5 arguments
+described above. Do not quote OPTIONAL-ARG-LIST!
+
+The defined CALLBACK automatically hides the ecb-windows after
+selecting a node in case META-MODE is not nil and if the CALLBACK
+is of type 'select; this is a must for every tree-buffer. Do not
+do this within BODY! But: During the evaluation of BODY the local
+variable no-meta-hiding is bound and set to nil per default. If
+BODY sets it to not nil then the hiding of the ecb-windows is
+prevented even if META-MODE is not nil.
+
+The value of the last expression of BODY is returned.
+
+This macro automatically adds the appropriate description of the
+5 arguments of the defined CALLBACK to DOCSTRING. So just
+describe what the CALLBACK does!
+
+It is strongly recommended defining a callback-function for a
+tree-buffer of ECB with this macro and not with plain `defun',
+because then a lot of stuff needed to be done by every
+tree-buffer is automatically performed."
+  `(eval-and-compile
+     (ecb-tree-buffer-callbacks-add (quote ,callback-type)
+                                    (quote ,tree-buffer-name-symbol)
+                                    (quote ,callback))
+     (defun ,callback ,(append '(node ecb-button edit-window-nr shift-mode meta-mode)
+                               optional-arg-list)
+       ,(concat (if (equal callback-type 'select)
+                    (concat
+                     "Handle clicking onto NODE in the current tree-buffer.\n"
+                     "ECB-BUTTON can be 1, 2 or 3. If 3 then EDIT-WINDOW-NR contains the number\n"
+                     "of the edit-window the NODE should be displayed or whatever should be done\n"
+                     "with NODE. For 1 and 2 the value of EDIT-WINDOW-NR is ignored.\n"
+                     "SHIFT-MODE and META-MODE are self-explanatory.")
+                  (concat
+                   "Handle expanding NODE in the current tree-buffer.\n"
+                   "ECB-BUTTON can be 1, 2 or 3. If 3 then EDIT-WINDOW-NR contains the number\n"
+                   "of the edit-window the NODE should be displayed or whatever should be done\n"
+                   "with NODE. For 1 and 2 the value of EDIT-WINDOW-NR is ignored.\n"
+                   "SHIFT-MODE and META-MODE are self-explanatory."))
+                "\n\n"
+                docstring)
+       (let ((no-meta-hiding nil))
+         (prog1
+             (progn
+               ,@body)
+           ,(if (equal callback-type 'select)
+                `(when (and (not no-meta-hiding) meta-mode)
+                   (ecb-run-with-idle-timer 0.001 nil 'ecb-hide-ecb-windows))))))))
+
+;; (insert (pp (macroexpand
+;;              '(defecb-tree-buffer-callback kausi-callback ecb-history-buffer
+;;                 expand (&optional a b)
+;;                 "das ist ein Docstring"
+;;                 (message "")
+;;                 (if nil t nil)))))
+
+
+(put 'defecb-tree-buffer-callback 'lisp-indent-function 4)
+
+;; the filename/path cache
+
+(defecb-multicache ecb-filename-cache 500 nil '(FILES-AND-SUBDIRS
+                                                EMPTY-DIR-P
+                                                SOURCES
+                                                VC
+                                                FIXED-FILENAMES
+                                                REMOTE-PATH
+                                                HOST-ACCESSIBLE)
+  "Cache used for the filebrowser to cache all necessary informations
+associated to file- or directory-names.
+
+Currently there are the following subcaches managed within this cache:
+
+  FILES-AND-SUBDIRS:
+  
+  Cache for every directory all subdirs and files. This is a cache with
+     key:   <directory>
+     value: \(<file-list> . <subdirs-list>)
+  
+  EMPTY-DIR-P:
+  
+  Cache for every directory if it is empty or not. This is a cache with
+     key:   <directory>
+     value: \(\[nil|t] . <checked-with-show-sources>)
+  
+  SOURCES:
+  
+  Cache for the contents of the buffer `ecb-sources-buffer-name'. This is a
+  cache with
+     key:   <directory>
+     value: \(<full-content> . <filtered-content>)
+  whereas <full-content> is a 3-elem list \(tree-buffer-root <copy of
+  tree-buffer-displayed-nodes> buffer-string) for a full \(i.e. all files)
+  cache and <filtered-content> is a 4-elem list \(tree-buffer-root <copy of
+  tree-buffer-displayed-nodes> sources-buffer-string <filter>) for a filtered
+  cache where <filter> is a cons-cell \(<filter-regexp> . <filter-display>).
+
+  VC:
+
+  Cache necessary informations for the version-control-support. This is a
+  cache for filenames and directories. In case of a file with
+     key: <filename> of a sourcefile
+     value: \(<state> <check-timestamp> <checked-buffers>)
+  whereas <state> is the that VC-state the file had at time <check-timestamp>.
+  <checked-buffers> is a list of tree-buffer-names for which <state> was
+  checked.
+  In case of a directory with
+     key: <dirname> of a directory
+     value: <vc-state-fcn> or 'NO-VC
+  <vc-state-fcn> is the function used to get the VC-state if <check-timestamp>
+  is older than the most recent modification-timestamp of <filename>.
+
+  FIXED-FILENAMES:
+
+  Cache for fixed filenames which can speedup handling-remote-paths \(like
+  tramp-paths)
+     key: The concatenation of the args PATH and FILENAME of `ecb-fix-filename'.
+     value: The result of `ecb-fix-filename' for these args.
+
+  REMOTE-PATH:
+
+  Cache if a path is a remote path and store its components if yes.
+     key: a path
+     value: 'NOT-REMOTE if not a remote path otherwise the result of
+     `ecb-remote-path'.
+
+  HOST-ACCESSIBLE:
+
+  Cache if a host is accessible or not.
+     key: a host \(e.g. ecb.sourceforge.net)
+     value: \(<timestamp> . <value>) whereas <timestamp> is the cache time of
+     <value> and <value> is either 'NOT-ACCESSIBLE if host is not accessible
+     or t if accessible.
+")
+
+(defun ecb-filename-cache-init ()
+  "Initialize the whole cache for file- and directory-names"
+  (if (ecb-multicache-p 'ecb-filename-cache)
+      (ecb-multicache-clear 'ecb-filename-cache)))
+
+;; directory separator
+
+(defconst ecb-directory-sep-char
+  (if ecb-running-xemacs
+      ;; to avoid compiler complainings
+      (symbol-value 'directory-sep-char)
+    ?/))
+
+(defsubst ecb-directory-sep-char (&optional refdir)
+  (if (or (null refdir)
+          (not (ecb-remote-path refdir)))
+      ecb-directory-sep-char
+    ?/))
+
+(defsubst ecb-directory-sep-string (&optional refdir)
+  (char-to-string (ecb-directory-sep-char refdir)))   
+
+;; autocontrol/sync-stuff --------------------------------------------
+
+(defvar ecb-autotrace-autocontrol/sync-functions nil
+  "Allow autotracing the internal autocontrol/synchronisations of ECB.
+All functions defined with `defecb-autocontrol/sync-function' can
+be autotraced. The value of this variable is either nil \(then no
+autotracing will be performed) or t \(then all functions defined with
+`defecb-autocontrol/sync-function' will be traced) or a list of
+function-symbols \(then exactly these functions will be traced).
+
+Auto-tracing means that each\(!) time the function runs \(either
+by idle-timer or within pre- or post-command-hook) a trace-message on
+function-entry and a trace-message on function exit is writen.")
+
+(defvar ecb-bodytrace-autocontrol/sync-functions nil
+  "Allows a body tracing of the internal autocontrol/synchronisations of ECB.
+For allowed values for this variable see `ecb-autotrace-autocontrol/sync-functions'
+
+Body-tracing means calls to `ecb-bodytrace-autocontrol/sync-fcn-error'
+somewhere within the BODY of functions defined by
+`defecb-autocontrol/sync-function'. So by setting this variable tracing of the
+BODY of autocontrol/sync-function can be switched on or off.")
+
+;; (setq ecb-autotrace-autocontrol/sync-functions
+;;       (list 'ecb-compilation-buffer-list-changed-p))
+;; (setq ecb-bodytrace-autocontrol/sync-functions
+;;       (list 'ecb-compilation-buffer-list-changed-p))
+
+(defun ecb-autotrace-autocontrol/sync-fcn-error (autocontrol-fcn &rest args)
+  "Run ARGS through `format' and write it to the *Messages*-buffer.
+Do not use this function for own traces, but use the function
+`ecb-bodytrace-autocontrol/sync-fcn-error'!
+Entry and exit-traces are already buildin in functions defined with
+`defecb-autocontrol/sync-function' and can be switched on/off by
+`ecb-autotrace-autocontrol/sync-functions'."
+  (when (or (eq ecb-autotrace-autocontrol/sync-functions t)
+            (member autocontrol-fcn ecb-autotrace-autocontrol/sync-functions))
+    (message (concat (format "ECB %s autocontrol-fcn %s autotrace [%s] "
+                             ecb-version autocontrol-fcn
+                             (format-time-string "%H:%M:%S"))
+                     (apply 'format args)))))
+
+(defun ecb-bodytrace-autocontrol/sync-fcn-error (autocontrol-fcn &rest args)
+  "Run ARGS through `format' and write it to the *Messages*-buffer.
+
+Use this function only for traces used within the BODY of a function defined
+with `defecb-autocontrol/sync-function' and not for entry and exit-traces
+because these ones are already buildin in functions defined with
+`defecb-autocontrol/sync-function' and can be switched on/off by
+`ecb-autotrace-autocontrol/sync-functions'.
+
+Body-tracing can be switched on/off with
+`ecb-bodytrace-autocontrol/sync-function'."
+  (when (or (eq ecb-bodytrace-autocontrol/sync-functions t)
+            (member autocontrol-fcn ecb-bodytrace-autocontrol/sync-functions))
+    (message (concat (format "ECB %s autocontrol-fcn %s bodytrace [%s] "
+                             ecb-version autocontrol-fcn
+                             (format-time-string "%H:%M:%S"))
+                     (apply 'format args)))))
+
+(defvar ecb-autocontrol/sync-fcn-register nil
+  "List of autocontrol/sync-functions defined by
+`defecb-autocontrol/sync-function'. Each element is a cons where car is the
+function symbol and cdr is either the symbol of a variable containing a
+buffer-name of a special ECB-buffer or nil.")
+(defvar ecb-idle-timer-alist nil
+  "List of active idle-timers of ECB")
+(defvar ecb-post-command-hooks nil
+  "List of functions which have to be part of the value of `post-command-hook'")
+(defvar ecb-pre-command-hooks nil
+  "List of functions which have to be part of the value of `pre-command-hook'")
+
+(defun ecb-register-autocontrol/sync-function (fcn-symbol buffer-name-symbol)
+  (add-to-list 'ecb-autocontrol/sync-fcn-register (cons fcn-symbol buffer-name-symbol)))
+
+(defun ecb-stop-all-autocontrol/sync-functions ()
+  (dolist (fcn-elem ecb-autocontrol/sync-fcn-register)
+    (ecb-stop-autocontrol/sync-function (car fcn-elem))))
+
+(defun ecb-stop-autocontrol/sync-function (fcn-symbol)
+  (let* ((timer-elem (assoc fcn-symbol ecb-idle-timer-alist))
+         (timer (cdr timer-elem)))
+    (when timer-elem
+      (ecb-cancel-timer timer)
+      (setq ecb-idle-timer-alist (delq timer-elem ecb-idle-timer-alist)))
+    (remove-hook 'post-command-hook fcn-symbol)
+    (remove-hook 'pre-command-hook fcn-symbol)
+    (setq ecb-post-command-hooks (delq fcn-symbol ecb-post-command-hooks))
+    (setq ecb-pre-command-hooks (delq fcn-symbol ecb-pre-command-hooks))))
+  
+
+(defun ecb-activate-ecb-autocontrol-function (value func)
+  "Adds function FUNC to `ecb-idle-timer-alist' and activates an idle-timer
+with idle-time VALUE if VALUE is a number. If nil or 'post the
+FUNC is added to `post-command-hook' and `ecb-post-command-hooks'
+and removed from the idle-list \(if it has been contained). If
+'pre the FUNC is added to `pre-command-hook' and
+`ecb-pre-command-hooks' and removed from the idle-list \(if it
+has been contained)."
+  (unless (assoc func ecb-autocontrol/sync-fcn-register)
+    (error "ECB %s: Try to activate unregistered %s as autocontrol/sync-function"
+           ecb-version func))
+  ;; `ecb-basic-buffer-sync-delay' can never have the value 'basic so this
+  ;; recursion is save
+  (if (equal 'basic value)
+      (ecb-activate-ecb-autocontrol-function ecb-basic-buffer-sync-delay func)
+    (ecb-stop-autocontrol/sync-function func)
+    (case value
+      ((nil post)
+       (add-hook 'post-command-hook func)
+       (add-to-list 'ecb-post-command-hooks func))
+      (pre
+       (add-hook 'pre-command-hook func)
+       (add-to-list 'ecb-pre-command-hooks func))
+      (otherwise
+       (add-to-list 'ecb-idle-timer-alist
+                    (cons func
+                          (ecb-run-with-idle-timer value t func)))))))
+
+(defmacro defecb-autocontrol/sync-function (fcn buffer-name-symbol
+                                                buffer-sync-option-symbol
+                                                interactive-p docstring
+                                                &rest body)
+  "Define a function run either by idle-timer or before or after each command.
+Such a function is used either for automatic self-controlling certain aspects
+of ECB or for synchronizing a special window/buffer of ECB with contents of
+the active buffer in the edit-area.
+
+FCN is the name of the defined function and BUFFER-NAME-SYMBOL is
+either nil or a variable-symbol containing the buffer-name
+of a special ECB-window/buffer for which the defined function is
+used for synchronizing it with the edit-area. In the latter case
+BODY is encapsulated with the macros a)
+`ecb-when-point-in-edit-window-ecb-windows-visible' and b)
+`ecb-do-if-buffer-visible-in-ecb-frame' so BODY runs only if a)
+point stays in an edit-window \(ie. the currently selected window
+is an edit-window) and the ecb-windows of current layout are
+not hidden and b) the buffer of BUFFER-NAME-SYMBOL is displayed in a
+window of the ECB-frame \(for details see the documentation of
+this macro).
+
+Please note: If BUFFER-NAME-SYMBOL is nil then BODY is not
+encapsulated with these two macros mentioned above!
+
+The defined function has an optional argument FORCE which can be used within
+BODY.
+
+BUFFER-SYNC-OPTION-SYMBOL is either nil or the name of an option
+which defines if and under which circumstances the
+synchronization should take place. Such an option must be of the
+same type and must offer exactly the same values as `ecb-analyse-buffer-sync'.
+If BUFFER-SYNC-OPTION-SYMBOL is not nil and a valid symbol then the generated
+function encapsulates BODY in a when-statement whereas the condition-clause is
+exactly true when either:
+- force is not nil or
+- The value of BUFFER-SYNC-OPTION-SYMBOL is t or 'always or
+- The major-mode of current buffer is not contained in the list-value of
+  BUFFER-SYNC-OPTION-SYMBOL or
+- The value of BUFFER-SYNC-OPTION-SYMBOL is 'basic and the conditions above
+  are true for `ecb-basic-buffer-sync'.
+
+If INTERACTIVE-P is not nil then FCN will be defined as an interactice
+command, i.e. it will containe the clause \(interactive \"P\").
+
+The defined function is automatically prepared for tracing its calls when
+`ecb-autotrace-autocontrol/sync-functions' is either set to t or the symbol of FCN
+is contained in the list of this variable. In this case a trace-statemant with
+time-details is reported to the message-buffer directly before and after BODY.
+
+Do not quote FCN, BUFFER-NAME-SYMBOL and BUFFER-SYNC-OPTION-SYMBOL!
+
+Example:
+
+\(defecb-autocontrol/sync-function ecb-sync-a-buffer ecb-a-special-buffer-name
+   ecb-a-special-buffer-sync nil
+  \"Synchronize the buffer of ECB-A-SPECIAL-BUFFER-NAME with...\"
+  \(let \(\(x nil))
+    \(if force
+        ;; do something
+      ;; do something else
+      )
+    ))
+
+This defines a non interactive function `ecb-sync-a-buffer' which
+should be used for synchronizing the special buffer the name is
+hold in the variable `ecb-a-special-buffer-name'.
+"
+  `(eval-and-compile
+     (ecb-register-autocontrol/sync-function (quote ,fcn) (quote ,buffer-name-symbol))
+
+     (defun ,fcn (&optional force)
+       ,docstring
+       ,(if interactive-p
+            '(interactive "P"))
+       (ecb-autotrace-autocontrol/sync-fcn-error (quote ,fcn)
+                                                 "Begin: Cur-buf: %s" (current-buffer))
+       (let (,(if (and buffer-sync-option-symbol (symbolp buffer-sync-option-symbol))
+                  `(,buffer-sync-option-symbol (if (equal
+                                                    ,buffer-sync-option-symbol
+                                                    'basic)
+                                                   ecb-basic-buffer-sync
+                                                 ,buffer-sync-option-symbol))
+                ;; we need anything to bound in the else-fork, so we just bind
+                ;; major-mode to major-mode - we could use any variable, takes
+                ;; no effect
+                `(major-mode major-mode))
+;;                 `(,(make-symbol "abc123xyz456efg789") nil))
+             )
+         (when ,(if (and buffer-sync-option-symbol (symbolp buffer-sync-option-symbol))
+                    `(or force
+                         (equal 'always ,buffer-sync-option-symbol)
+                         (equal t ,buffer-sync-option-symbol)
+                         (and ,buffer-sync-option-symbol
+                              (listp ,buffer-sync-option-symbol)
+                              (not (member major-mode ,buffer-sync-option-symbol))))
+                  t)
+           ,(if (and buffer-name-symbol (symbolp buffer-name-symbol))
+                `(ecb-when-point-in-edit-window-ecb-windows-visible
+                  (ecb-do-if-buffer-visible-in-ecb-frame (quote ,buffer-name-symbol)
+                    (ecb-bodytrace-autocontrol/sync-fcn-error (quote ,fcn)
+                                                              "After conditions: Cur-buf: %s" (current-buffer))
+                    ,@body
+                    (ecb-autotrace-autocontrol/sync-fcn-error (quote ,fcn)
+                                                              "End:   Cur-buf: %s" (current-buffer))
+                    nil ;; we always return nil
+                    ))
+              `(progn
+                 (ecb-bodytrace-autocontrol/sync-fcn-error (quote ,fcn)
+                                                           "After conditions: Cur-buf: %s" (current-buffer))
+                 ,@body
+                 (ecb-autotrace-autocontrol/sync-fcn-error (quote ,fcn)
+                                                           "End:   Cur-buf: %s"
+                                                           (current-buffer))
+                 nil ;; we always return nil
+                 )
+              ))))))
+(put 'defecb-autocontrol/sync-function 'lisp-indent-function 4)
+
+;; (insert (pp (macroexpand
+;;              '(defecb-autocontrol/sync-function ecb-analyse-buffer-sync-test 
+;;                 ecb-anaylyse-buffer-name-test ecb-basic-buffer-sync nil
+;;                 "testdoctsirng"
+;;                 (let ((analysis nil)
+;;                       (completions nil)
+;;                       (fnargs nil)
+;;                       (cnt nil)
+;;                       )
+;;                   ;; Try and get some sort of analysis
+;;                   (ignore-errors
+;;                     (save-excursion
+;;                       (setq analysis (ecb--semantic-analyze-current-context (point)))
+;;                       (setq cnt (ecb--semantic-find-tag-by-overlay))
+;;                       (when analysis
+;;                         (setq completions (ecb--semantic-analyze-possible-completions analysis))
+;;                         (setq fnargs (ecb--semantic-get-local-arguments (point)))
+;;                         )))))
+;;              )))
+
+
+(defecb-autocontrol/sync-function ecb-monitor-autocontrol-functions nil nil nil
+  "Checks if all necessary ECB-hooks are contained in `post-command-hook' rsp.
+`pre-command-hook'. If one of them has been removed by Emacs \(Emacs resets
+these hooks to nil if any of the contained functions fails!) then this
+function reads them to these hooks."
+  ;; post-command-hook
+  (dolist (hook ecb-post-command-hooks)
+    (when (not (member hook post-command-hook))
+      (add-hook 'post-command-hook hook)))
+  ;; pre-command-hook
+  (dolist (hook ecb-pre-command-hooks)
+    (when (not (member hook pre-command-hook))
+      (add-hook 'pre-command-hook hook))))
+
+;; -- end of sync stuff
+
+
+
+;;; ----- Wrappers for file- and directory-operations ------
+
+(dolist (f '(file-name-nondirectory
+             file-exists-p
+             file-name-directory
+             file-readable-p
+             file-attributes
+             file-name-extension
+             file-directory-p
+             file-accessible-directory-p
+             file-name-sans-extension
+             file-writable-p
+             file-name-as-directory
+             directory-files))
+  (fset (intern (format "ecb-%s" f))
+        `(lambda (file-or-dir-name &rest args)
+           ,(format "Delegate all args to `%s' but call first `ecb-fix-path' for FILE-OR-DIR-NAME." f)
+           (apply (quote ,f) (ecb-fix-path file-or-dir-name) args))))
+
+(defun ecb-expand-file-name (name &optional default-dir)
+  "Delegate all args to `expand-file-name' but call first `ecb-fix-path'
+for both args."
+  (expand-file-name (ecb-fix-path name) (ecb-fix-path default-dir)))
+
+;;; ----- Canonical filenames ------------------------------
+
+(defun ecb-fix-path (path)
+  "Fixes an annoying behavior of the native windows-version of XEmacs:
+When PATH contains only a drive-letter and a : then `expand-file-name' does
+not interpret this PATH as root of that drive. So we add a trailing
+`directory-sep-char' and return this new path because then `expand-file-name'
+treats this as root-dir of that drive. For all \(X)Emacs-version besides the
+native-windows-XEmacs PATH is returned."
+  (if (and ecb-running-xemacs
+           (equal system-type 'windows-nt))
+      (if (and (= (length path) 2)
+               (equal (aref path 1) ?:))
+          (concat path (ecb-directory-sep-string))
+        path)
+    path))
+
+;; accessors for the FIXED-FILENAMES-cache
+
+(defsubst ecb-fixed-filename-cache-put (path filename fixed-filename)
+  "Add FIXED-FILENAME for PATH and FILENAME to the FIXED-FILENAMES-cache
+of `ecb-filename-cache'."
+  (ecb-multicache-put-value 'ecb-filename-cache
+                            (concat path filename)
+                            'FIXED-FILENAMES
+                            fixed-filename))
+
+(defsubst ecb-fixed-filename-cache-get (path filename)
+  "Get the cached value for PATH and FILENAME from the FIXED-FILENAMES-cache
+in `ecb-filename-cache'. If no vaue is cached for PATH and FILENAME then nil
+is returned."
+  (ecb-multicache-get-value 'ecb-filename-cache
+                            (concat path filename)
+                            'FIXED-FILENAMES))
+
+(defun ecb-fixed-filename-cache-dump (&optional no-nil-value)
+  "Dump the whole FIXED-FILENAMES-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache
+                                 'FIXED-FILENAMES
+                                 no-nil-value))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: What about the new cygwin-version
+;; of GNU Emacs 21? We have to test if this function and all locations where
+;; `ecb-fix-path' is used work correctly with the cygwin-port of GNU Emacs.
+(silentcomp-defun mswindows-cygwin-to-win32-path)
+(defun ecb-fix-filename (path &optional filename substitute-env-vars)
+  "Normalizes path- and filenames for ECB. If FILENAME is not nil its pure
+filename \(i.e. without directory part) will be concatenated to PATH. The
+result will never end with the directory-separator! If SUBSTITUTE-ENV-VARS is
+not nil then in both PATH and FILENAME env-var substitution is done. If the
+`system-type' is 'cygwin32 then the path is converted to win32-path-style!"
+  (when (stringp path)
+    (or (ecb-fixed-filename-cache-get path filename)
+        (let ((remote-path (ecb-remote-path path))
+              (norm-path nil)
+              (result nil))
+          (if (or (not remote-path)
+                  (ecb-host-accessible-p (nth 1 remote-path)))
+              (progn
+                (setq norm-path (if ecb-running-xemacs
+                                    (case system-type
+                                      (cygwin32
+                                       (mswindows-cygwin-to-win32-path
+                                        (expand-file-name path)))
+                                      (windows-nt
+                                       (expand-file-name (ecb-fix-path path)))
+                                      (otherwise
+                                       (expand-file-name path)))
+                                  (expand-file-name path)))
+                ;; substitute environment-variables
+                (setq norm-path (expand-file-name (if substitute-env-vars
+                                                      (substitute-in-file-name norm-path)
+                                                    norm-path))))
+            (setq norm-path path))
+          ;; For windows systems we normalize drive-letters to downcase
+          (setq norm-path (if (and (member system-type '(windows-nt cygwin32))
+                                   (> (length norm-path) 1)
+                                   (equal (aref norm-path 1) ?:))
+                              (concat (downcase (substring norm-path 0 2))
+                                      (substring norm-path 2))
+                            norm-path))
+          ;; delete a trailing directory-separator if there is any
+          (setq norm-path (if (and (> (length norm-path) 1)
+                                   (= (aref norm-path (1- (length norm-path)))
+                                      (ecb-directory-sep-char path)))
+                              (substring norm-path 0 (1- (length norm-path)))
+                            norm-path))
+          (setq result
+                (concat norm-path
+                        (if (stringp filename)
+                            (concat (when (> (length norm-path) 1)
+                                      ;; currently all protocols like tramp,
+                                      ;; ange-ftp or efs support only not
+                                      ;; windows-remote-hosts ==> we must not
+                                      ;; add a backslash here (would be done
+                                      ;; in case of a native Windows-XEmacs)
+                                      (ecb-directory-sep-string path))
+                                    (file-name-nondirectory (if substitute-env-vars
+                                                                (substitute-in-file-name filename)
+                                                              filename))))))
+          (ecb-fixed-filename-cache-put path filename result)
+          result))))
+
+;; (ecb-fix-filename "/berndl@ecb.sourceforge.net:~")
+
+;; -- end of canonical filenames
+
+
+(defun ecb-format-bucket-name (name &optional ignore-prefix-suffix ignore-bucket-face)
+  "Format NAME as a bucket-name according to `ecb-bucket-node-display'.
+If optional arg IGNORE-PREFIX-SUFFIX rsp. IGNORE-BUCKET-FACE is not nil then
+these settings of `ecb-bucket-node-display' are ignored."
+  (let ((formatted-name (if ignore-prefix-suffix
+                            name
+                          (concat (nth 0 ecb-bucket-node-display)
+                                  name
+                                  (nth 1 ecb-bucket-node-display)))))
+    (unless ignore-bucket-face
+      (ecb-merge-face-into-text formatted-name (nth 2 ecb-bucket-node-display)))
+    formatted-name))
+
+(defun ecb-toggle-do-not-leave-window-after-select ()
+  "Toggles if a node-selection in a tree-buffer leaves the tree-window.
+See also the option `ecb-tree-do-not-leave-window-after-select'."
+  (interactive)
+  (let ((tree-buffer (ecb-point-in-ecb-tree-buffer)))
+    (if tree-buffer
+        (let ((tree-buf-name (buffer-name tree-buffer)))
+          (if (ecb-member-of-symbol/value-list
+               tree-buf-name
+               ecb-tree-do-not-leave-window-after-select--internal)
+              (progn
+                (setq ecb-tree-do-not-leave-window-after-select--internal
+                      ;; we must try both - the symbol of the tree-buffer-name
+                      ;; and the tree-buffer-name because we do not know what
+                      ;; the user has specified in
+                      ;; `ecb-tree-do-not-leave-window-after-select'!
+                      (delete (ecb-tree-buffers-get-symbol tree-buf-name)
+                              (delete tree-buf-name
+                                      ecb-tree-do-not-leave-window-after-select--internal)))
+                (message "Selections leave the tree-window of %s" tree-buf-name))
+            (setq ecb-tree-do-not-leave-window-after-select--internal
+                  (append ecb-tree-do-not-leave-window-after-select--internal
+                          (list (ecb-tree-buffers-get-symbol tree-buf-name))))
+            (message "Selections don't leave the tree-window of %s." tree-buf-name)))
+      (message "Point must stay in an ECB tree-buffer!"))))
+
+(defun ecb-common-tree-buffer-modeline-menu-creator (buf-name)
+  "Return a menu for the modeline of all ECB-tree-buffers."
+  '((delete-other-windows "Maximize Window Above")
+    (ecb-redraw-layout-preserving-compwin-state "Display All ECB-windows")))
+
+(defun ecb-common-after-tree-buffer-create-actions ()
+  "Things which should be performed after creating a tree-buffer.
+The tree-buffer is the current buffer."
+  (local-set-key (kbd "C-t") 'ecb-toggle-do-not-leave-window-after-select)
+  (if ecb-running-xemacs
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Is it necessary to make
+      ;; modeline-map buffer-local for current buffer first?!
+      (define-key modeline-map
+        '(button2up)
+        'ecb-toggle-maximize-ecb-window-with-mouse)
+    (local-set-key [mode-line mouse-2]
+                   'ecb-toggle-maximize-ecb-window-with-mouse)))
+  
+ 
+
+
+;;====================================================
+;; Mouse callbacks
+;;====================================================
+
+(defun ecb-tree-buffer-node-select-callback (node
+					     mouse-button
+					     shift-pressed
+					     control-pressed
+                                             meta-pressed
+					     tree-buffer-name)
+  "This is the callback-function ecb.el gives to every tree-buffer to call
+when a node has been selected. This function does nothing if the click
+combination is invalid \(see `ecb-interpret-mouse-click'."
+  (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+						     shift-pressed
+						     control-pressed
+                                                     meta-pressed
+						     tree-buffer-name))
+	 (ecb-button (nth 0 ecb-button-list))
+	 (shift-mode (nth 1 ecb-button-list))
+         (meta-mode (nth 2 ecb-button-list))
+         (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard))
+         (maximized-p (ecb-buffer-is-maximized-p tree-buffer-name))
+         (select-callbacks (ecb-tree-buffer-callbacks-alist-of-type 'select))
+         (callback-fcn nil))
+    ;; we need maybe later that something has clicked in a tree-buffer, e.g.
+    ;; in `ecb-handle-major-mode-visibilty'.
+    (setq ecb-item-in-tree-buffer-selected t)
+    (if (not keyboard-p)
+        (setq ecb-layout-prevent-handle-ecb-window-selection t))
+    
+    ;; first we dispatch to the right action
+    (when ecb-button-list
+      (setq callback-fcn
+            (ecb-member-of-symbol/value-list tree-buffer-name
+                                             select-callbacks
+                                             'car
+                                             'cdr))
+      (when (functionp callback-fcn)
+        (funcall callback-fcn node ecb-button nil shift-mode meta-mode)))
+
+    ;; now we go back to the tree-buffer but only if all of the following
+    ;; conditions are true:
+    ;; 1. The ecb-windows are now not hidden
+    ;; 2. The tree-buffer-name is contained in
+    ;;    ecb-tree-do-not-leave-window-after-select--internal
+    ;; 3. Either it is not the ecb-directories-buffer-name or
+    ;;    at least `ecb-show-sources-in-directories-buffer-p' is true and the
+    ;;    hitted node is a sourcefile
+    (when (and (not ecb-windows-hidden)
+               (ecb-member-of-symbol/value-list
+                tree-buffer-name
+                ecb-tree-do-not-leave-window-after-select--internal)
+               (or (not (ecb-string= tree-buffer-name ecb-directories-buffer-name))
+                   (and (ecb-show-sources-in-directories-buffer-p)
+                        (= ecb-directories-nodetype-sourcefile
+                           (tree-node->type node)))))
+      ;; If there is currently no maximized window then we can savely call
+      ;; `ecb-goto-ecb-window'. If we have now a maximized window then there
+      ;; are two possibilities:
+      ;; - if it is not equal to the maximzed tree-buffer before the selection
+      ;;   then we must maximi
+      (if (and maximized-p
+               (not (ecb-buffer-is-maximized-p tree-buffer-name)))
+          (ecb-maximize-ecb-buffer tree-buffer-name t)
+        (ecb-goto-ecb-window tree-buffer-name))
+      (tree-buffer-remove-highlight))))
+ 
+(defun ecb-tree-buffer-node-collapsed-callback (node
+                                                mouse-button
+                                                shift-pressed
+                                                control-pressed
+                                                meta-pressed
+                                                tree-buffer-name)
+  "This is the callback-function ecb.el gives to every tree-buffer to call
+when a node has been collapsed."
+  (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+						     shift-pressed
+						     control-pressed
+                                                     meta-pressed
+						     tree-buffer-name))
+         (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard)))
+    (if (not keyboard-p)
+        (setq ecb-layout-prevent-handle-ecb-window-selection t))))
+
+(defun ecb-tree-buffer-node-expand-callback (node
+					     mouse-button
+					     shift-pressed
+					     control-pressed
+                                             meta-pressed
+					     tree-buffer-name)
+  "This is the callback-function ecb.el gives to every tree-buffer to call
+when a node should be expanded. This function does nothing if the click
+combination is invalid \(see `ecb-interpret-mouse-click')."
+  (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+						     shift-pressed
+						     control-pressed
+                                                     meta-pressed
+						     tree-buffer-name))
+	 (ecb-button (nth 0 ecb-button-list))
+	 (shift-mode (nth 1 ecb-button-list))
+         (meta-mode (nth 2 ecb-button-list))
+         (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard))
+         (expand-callbacks (ecb-tree-buffer-callbacks-alist-of-type 'expand))
+         (callback-fcn nil))
+    (if (not keyboard-p)
+        (setq ecb-layout-prevent-handle-ecb-window-selection t))
+    ;; we just dispatch to the right action
+    (when ecb-button-list
+      (setq callback-fcn
+            (ecb-member-of-symbol/value-list tree-buffer-name
+                                             expand-callbacks
+                                             'car
+                                             'cdr))
+      (when (functionp callback-fcn)
+        (funcall callback-fcn node ecb-button nil shift-mode meta-mode)))))
+
+(defun ecb-interpret-mouse-click (mouse-button
+                                  shift-pressed
+                                  control-pressed
+                                  meta-pressed
+                                  tree-buffer-name)
+  "Converts the physically pressed MOUSE-BUTTON \(1 = mouse-1, 2 = mouse-2, 0 =
+no mouse-button but the keys RET or TAB) to ECB-mouse-buttons: either primary
+or secondary mouse-button depending on the value of CONTROL-PRESSED and the
+setting in `ecb-primary-secondary-mouse-buttons'. Returns a list
+'\(<ECB-button> <shift-mode> <meta-mode> <device>) where <ECB-button> is
+either 1 \(= primary) or 2 \(= secondary) and <shift-mode> and <meta-mode> are
+non nil if SHIFT-PRESSED rsp. META-PRESSED is non nil. <device> is either
+'mouse or 'keyboard dependent if the uses has used the mouse rsp. the keyboard
+in the tree-buffer. For an invalid and not accepted click combination nil is
+returned.
+
+Note: If MOUSE-BUTTON is 0 \(means no mouse-button but a key like RET or TAB
+was hitted) then CONTROL-PRESSED is interpreted as ECB-button 2.
+
+Currently the fourth argument TREE-BUFFER-NAME is not used here."
+  (if (eq mouse-button 0)
+      (list (if control-pressed 2 1) shift-pressed meta-pressed 'keyboard)
+    (if (and (not (eq mouse-button 1)) (not (eq mouse-button 2)))
+	nil
+      (case ecb-primary-secondary-mouse-buttons
+        (mouse-1--mouse-2
+         (if control-pressed
+             nil
+           (list mouse-button shift-pressed meta-pressed 'mouse)))
+        (mouse-1--C-mouse-1
+         (if (not (eq mouse-button 1))
+             nil
+           (list (if control-pressed 2 1) shift-pressed meta-pressed 'mouse)))
+        (mouse-2--C-mouse-2
+         (if (not (eq mouse-button 2))
+             nil
+           (list (if control-pressed 2 1) shift-pressed meta-pressed 'mouse)))
+        (otherwise nil)))))
+
+(defun ecb-show-minibuffer-info (node window when-spec)
+  "Checks if any info about the current node in the ECB-window WINDOW should
+be displayed. WHEN-SPEC must have the same format as the car of
+`ecb-directories-show-node-info'."
+  (or (eq when-spec 'always)
+      (and (eq when-spec 'if-too-long)
+           window
+           (>= (tree-node-linelength node)
+               (window-width window)))))
+
+
+(tree-buffer-defpopup-command ecb-maximize-ecb-window-menu-wrapper
+  "Expand the current ECB-window from popup-menu."
+  (ecb-maximize-ecb-buffer (buffer-name (current-buffer)) t))
+
+;; stealthy mechanism
+
+(defvar ecb-stealthy-function-list nil
+  "List of functions which ECB runs stealthy. Do not modify this variable!
+This variable is autom. set by the macro `defecb-stealthy'!")
+
+(defvar ecb-stealthy-function-state-alist nil
+  "Alist which stores the state of each function of
+`ecb-stealthy-function-list'. Do not add new items to this variable because
+this is autom. done by the macro `defecb-stealthy'!")
+
+(defun ecb-stealthy-function-list-add (fcn)
+  (add-to-list 'ecb-stealthy-function-list fcn))
+
+(defun ecb-stealthy-function-state-alist-add (fcn)
+  (add-to-list 'ecb-stealthy-function-state-alist
+               (cons fcn 'done)))
+
+(defun ecb-stealthy-function-state-get (fcn)
+  "Getter for `ecb-stealthy-function-state-alist'. Return state for the
+stealthy function FCN."
+  (cdr (assoc fcn ecb-stealthy-function-state-alist)))
+
+(defun ecb-stealthy-function-state-set (fcn state)
+  "Setter for `ecb-stealthy-function-state-alist'. Set STATE for the
+stealthy function FCN. Return STATE."
+  (setcdr (assoc fcn ecb-stealthy-function-state-alist) state))
+
+(defun ecb-stealthy-function-p (fcn)
+  "Return not nil if FCN is a stealthy function defined with
+`defecb-stealthy'."
+  (member fcn ecb-stealthy-function-list))
+
+(defun ecb-stealthy-function-state-init (&optional fcn state)
+  "Reset the state of stealthy functions. If first optional arg FCN is a
+stealthy function then only the state of this function is reset - otherwise
+all stealthy functions of `ecb-stealthy-function-list' are reset. If second
+optional arg STATE is nil then the state will be reset to the special state
+'restart - otherwise to the value STATE."
+  (if (and fcn (ecb-stealthy-function-p fcn))
+      (ecb-stealthy-function-state-set fcn (or state 'restart))
+    (dolist (f ecb-stealthy-function-list)
+      (ecb-stealthy-function-state-set f (or state 'restart)))))
+
+(defmacro defecb-stealthy (name docstring &rest body)
+  "Define a so called stealthy function with NAME. This function will be
+registered by this macro in `ecb-stealthy-function-list' and
+`ecb-stealthy-function-state-alist'. During the evaluation of BODY the
+variable `state' will be bound and initialized with the stealthy state. BODY
+can use and modify `state'. After evaluating BODY `state' will be
+automatically saved so its available at the runtime of this stealthy function.
+BODY will only be evaluated if `state' is not 'done. BODY should be designed
+to be interruptable by the user, so its recommended to use for this
+`ecb-exit-on-input' ans `ecb-throw-on-input' \(see example in
+`ecb-test-throw-on-input'). If BODY completes then BODY has to set `state' to
+the special value 'done! If BODY has been interrupted then `state' can have an
+arbitrary value which will be autom. stored and at next runtime of the
+stealthy function NAME `state' will be initialized with this stored value. If
+`state' is initialized with the special value 'restart then this means the
+stealthy function should start from scratch because an eventually stored state
+is not longer valid. If the stealthy function sets `state' to 'done then this
+function will first being called after the state for this function has been
+reset to something else than 'done \(mostly to 'restart)\; such a reset of the
+state for a stealthy function can be done by any code and must be done via
+`ecb-stealthy-function-state-init'!"
+  `(progn
+     (unless (fboundp (quote ,name))
+       (ecb-stealthy-function-list-add (quote ,name))
+       (ecb-stealthy-function-state-alist-add (quote ,name)))
+     (eval-and-compile
+       (unless (fboundp (quote ,name))
+         (defun ,name nil
+           ,docstring
+           (let ((state (ecb-stealthy-function-state-get (quote ,name))))
+             (unless (equal state 'done)
+               ,@body)
+             (ecb-stealthy-function-state-set (quote ,name) state)))))))
+  
+(put 'defecb-stealthy 'lisp-indent-function 1)
+
+(defvar ecb-stealthy-update-running nil
+  "Recursion avoidance variable for stealthy performance.")
+
+(defecb-autocontrol/sync-function ecb-stealthy-updates nil nil nil
+  "Run all functions in the stealthy function list.
+Each function returns 'done if it completes successfully, or something else if
+interrupted by the user \(i.e. the function has been interrupted by the
+user). If a function is interrupted then `ecb-stealthy-function-list' is
+rotated so the interrupted function is the first element so the next stealthy
+run starts with this interrupted function."
+  (unless ecb-stealthy-update-running
+    (let ((l ecb-stealthy-function-list)
+          (ecb-stealthy-update-running t)
+          ;; necessary because timers set this locally to t to prevent
+          ;; timer-actions from being quitted by C-g. Our potentially long
+          ;; lasting actions must be quit-able!
+          (inhibit-quit nil))
+      (while (and l (equal 'done (funcall (car l))))
+        (setq l (cdr l)))
+      ;; if l is nil this means all functions have successfully completed -
+      ;; otherwise we ensure that next time we start with the interrupted
+      ;; function.
+      (when l
+        (setq ecb-stealthy-function-list
+              (ecb-rotate ecb-stealthy-function-list (car l)))))))
+
+;
+;; generation of nodes rsp. of attributes of nodes
+
+(defun ecb-generate-node-name (text-name first-chars icon-name name-of-buffer)
+  "Generate a new name from TEXT-NAME by adding an appropriate image according
+to ICON-NAME to the first FIRST-CHARS of TEXT-NAME. If FIRST-CHARS is < 0 then
+a string with length abs\(FIRST-CHARS) is created, the image is applied to
+this new string and this \"image\"-string is added to the front of TEXT-NAME.
+If no image can be found for ICON-NAME then the original TEXT-NAME is
+returned. NAME-OF-BUFFER is the name of the tree-buffer where the resulting
+node-name will be displayed.
+
+If an image is added then two text-properties are added to the FIRST-CHARS of
+the returned string: 'tree-buffer-image-start which holds 0 as value and
+'tree-buffer-image-length which holds the absolute value of FIRST-CHARS
+value."
+  (let ((image nil)
+        (ret nil))
+    (save-excursion
+      (set-buffer name-of-buffer)
+      (setq image (and icon-name (tree-buffer-find-image icon-name)))
+      (setq ret
+            (if image
+                (if (> first-chars 0)
+                    (tree-buffer-add-image-icon-maybe
+                     0 first-chars text-name image)
+                  (concat (tree-buffer-add-image-icon-maybe
+                           0 (- first-chars)
+                           (make-string (- first-chars) ? ) image)
+                          text-name))
+              text-name)))
+    ret))
+
+
+(silentcomp-provide 'ecb-common-browser)
+
+;;; ecb-common-browser.el ends here
diff --git a/site/ecb-2.40/ecb-compatibility.el b/site/ecb-2.40/ecb-compatibility.el
new file mode 100644
index 0000000..255801f
--- /dev/null
+++ b/site/ecb-2.40/ecb-compatibility.el
@@ -0,0 +1,380 @@
+;;; ecb-compatibility.el --- ECB-compatibility for other packages
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2004
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-compatibility.el,v 1.14 2009/05/15 15:19:53 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains compatibility-code for other-packages.
+;;
+;; Whenever commands of other packages are not fully compatible with ECB then
+;; this library should contain the necessary code to make it fully compatible
+;; - or at least working acceptable.
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+(eval-when-compile
+  (require 'silentcomp))
+
+
+(require 'ecb-util)
+(require 'ecb-common-browser)
+(require 'ecb-layout)
+
+;; To add compatibilty code for packages just do:
+;;
+;; 1. Add the needed advice(s) to `ecb-compatibility-advices'
+;; 2. Add the advice-code below.
+;;
+;; All advices of `ecb-compatibility-advices' will be autom. enabled when ECB
+;; starts and autom. disabled when ECB shuts down. No advice is enabled just
+;; by loading the ECB-library!
+
+(defecb-advice-set ecb-compatibility-advices
+  "Contains all advices needed for package-compatibility.")
+
+;; package bs.el ----------------------------------------------------------
+
+(defecb-advice bs-show before ecb-compatibility-advices
+  "Ensures `bs-show' works well when called from another window as an
+edit-window. Does nothing if called in another frame as the `ecb-frame'."
+  (when (equal (selected-frame) ecb-frame)
+    (unless (ecb-point-in-edit-window-number)
+      (ecb-select-edit-window))
+    ;; now we handle if bs-show should always display in the compile-window
+    (let ((my-bs-buffer (get-buffer-create "*buffer-selection*")))
+      ;; ecb-compilation-buffer-p needs a living buffer!
+      (when (and (ecb-compilation-buffer-p my-bs-buffer)
+                 ecb-compile-window-height)
+        (display-buffer (buffer-name my-bs-buffer))))))
+
+;; package electric.el ------------------------------------------------------
+
+
+(defecb-advice one-window-p around ecb-always-disabled-advices
+  "If called for the `ecb-frame' is only returns not nil if there is exactly
+one edit-window. Neither the ecb-windows nor the compile-window nor the
+minibuffer-window are considered. This adviced version of `one-window-p' is
+not for direct usage therefore it's added to `ecb-always-disabled-advices' and
+therefore it's always disabled\; use the macro `ecb-with-ecb-advice' instead
+if you need this adviced version of `one-window-p'!"
+  (if (and ecb-minor-mode
+           (equal (selected-frame) ecb-frame))
+      (setq ad-return-value
+            (= (length (ecb-canonical-edit-windows-list)) 1))
+    ad-do-it))
+
+(defecb-advice Electric-pop-up-window around ecb-compatibility-advices
+  "Ensures that the electric-* commands \(e.g. `electric-buffer-list') work
+well with ECB. If BUFFER is a \"compilation-buffer\" in the sense of
+`ecb-compilation-buffer-p' then BUFFER will be displayed in the compile-window
+of ECB - if there is any. If the compile-window is temporally hidden then the
+BUFFER is displayed in an edit-window!"
+  (if (and ecb-minor-mode
+           (equal (selected-frame) ecb-frame))
+      (if (and (ecb-compilation-buffer-p (ad-get-arg 0))
+               (equal (ecb-compile-window-state) 'visible))
+          (pop-to-buffer (ad-get-arg 0))
+        (let ((ecb-compilation-buffer-names nil)
+              (ecb-compilation-major-modes nil)
+              (ecb-compilation-predicates nil))
+          (ecb-with-ecb-advice 'one-window-p 'around
+            ad-do-it)))
+    ad-do-it))
+
+(defecb-advice electric-command-history before ecb-compatibility-advices
+  "Ensures that the electric-* commands work well with ECB."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame)
+             (ecb-point-in-dedicated-special-buffer))
+    (ecb-select-edit-window)))
+
+(defecb-advice electric-buffer-list before ecb-compatibility-advices
+  "Ensures that the electric-* commands work well with ECB."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame)
+             (ecb-point-in-dedicated-special-buffer))
+    (ecb-select-edit-window)))
+
+(defecb-advice electric-buffer-list after ecb-compatibility-advices
+  "Ensures that the electric-* commands work well with ECB."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    (if (get-buffer "*Buffer List*")
+        (bury-buffer (get-buffer "*Buffer List*")))))
+
+;; package master.el (only Emacs >= 22.X) ------------------------------------
+
+;; The adviced version of switch-to-buffer-other-window can redraw the layout
+;; (e.g. if the buffer in the compile-window is the slave and the
+;; compile-window has been made visible), so <window> in the code below can be
+;; a destroyed window-object! we have to prevent from this (e.g. by selecting
+;; the window before by number).
+(when-ecb-running-emacs
+ (defecb-advice master-says around ecb-compatibility-advices
+   "Makes the function compatible with ECB."
+   (if (or (not ecb-minor-mode)
+           (not (equal (selected-frame) ecb-frame)))
+       (ecb-with-original-basic-functions ad-do-it)
+     (if (null (buffer-live-p (get-buffer master-of)))
+         (error "Slave buffer has disappeared")
+       (let ((window  (selected-window))
+             (point-loc (ecb-where-is-point))
+             (p (point)))
+         (if (not (eq (window-buffer window) (get-buffer master-of)))
+             (switch-to-buffer-other-window master-of))
+         (if (ad-get-arg 0)
+             (condition-case nil
+                 (apply (ad-get-arg 0) (ad-get-arg 1))
+               (error nil)))
+         (select-window (case (car point-loc)
+                          (ecb
+                           (ecb-get-ecb-window-by-number (cdr point-loc)))
+                          (edit
+                           (ecb-get-edit-window-by-number (cdr point-loc)))
+                          (compile
+                           ecb-compile-window)
+                          (minibuf
+                           (minibuffer-window ecb-frame))
+                          (other-dedicated
+                           (ecb-get-window-by-number (cdr point-loc)))))
+         (goto-char (point))))))
+   )
+
+;; package scroll-all.el --------------------------------------------------
+
+
+(defecb-advice count-windows around ecb-always-disabled-advices
+  "If the selected frame is the ecb-frame and `scroll-all-mode' is not nil
+then return the current number of edit-windows if point is in an edit-window
+and always return 1 if point is not in an edit-window. In any other frame or
+if `scroll-all-mode' is nil return the number of visible windows."
+  (if (and (equal (selected-frame) ecb-frame)
+           ecb-minor-mode
+           (boundp 'scroll-all-mode)
+           scroll-all-mode)
+      (setq ad-return-value (if (ecb-point-in-edit-window-number)
+                                (length (ecb-canonical-edit-windows-list))
+                              1))
+    (ecb-with-original-basic-functions
+     ad-do-it)))
+
+(defecb-advice scroll-all-function-all around ecb-compatibility-advices
+  "Make it compatible with ECB."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions ad-do-it)
+    (let (;; This runs the `other-window'-calls in the body in the right mode
+          (ecb-other-window-behavior 'only-edit))
+      (ecb-with-ecb-advice 'count-windows 'around
+        ad-do-it))))
+
+
+;; package tmm.el --------------------------------------------------------
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: We can not use our
+;; Electric-pop-up-window advice instaed of this advice because otherwise
+;; some commands of the popup-menus of the ecb-buffers would not work - this
+;; comes from the save-window-excursion in the the tmm.
+(when-ecb-running-emacs
+ (defecb-advice tmm-prompt around ecb-compatibility-advices
+   "Make it compatible with ECB."
+   (if (or (not ecb-minor-mode)
+           (not (equal (selected-frame) ecb-frame)))
+       (ecb-with-original-basic-functions ad-do-it)
+     ;; we set temporally `ecb-other-window-behavior' to a function which
+     ;; always selects the "next" window after the
+     ;; `ecb-last-edit-window-with-point'
+     (let ((ecb-other-window-behavior
+            (lambda (win-list edit-win-list ecb-win-list comp-win
+                              mini-win point-loc nth-win)
+              (ecb-next-listelem edit-win-list
+                                 ecb-last-edit-window-with-point)))
+           ;; we must not handle the tmm-stuff as compilation-buffer
+           (ecb-compilation-buffer-names nil)
+           (ecb-compilation-major-modes nil)
+           (ecb-compilation-predicates nil))
+       ad-do-it)))
+ )
+
+;; ediff-stuff ---------------------------------------------------------------
+
+(silentcomp-defun ediff-cleanup-mess)
+(silentcomp-defvar ediff-quit-hook)
+
+;; (defecb-advice ediff-setup-windows around ecb-compatibility-advices
+;;   "Ediff can manage all its windows with deactivated ECB-advices.
+
+;; This is possible because we have in the setup-hook cleared the whole ecb-frame."
+;;   (if (and (boundp 'ecb-minor-mode)
+;;            ecb-minor-mode
+;;            (eq (selected-frame) ecb-frame))
+;;       (ecb-with-original-basic-functions
+;;        ad-do-it)
+;;     ad-do-it))
+
+(defvar ecb-before-ediff-window-config nil)
+
+;; We must not add this function to `ediff-before-setup-windows-hook' because
+;; this hook is called very often - see docu. The hook
+;; `ediff-before-setup-hook' is called only once - so it can be used to store
+;; window-configs!
+(defun ecb-ediff-before-setup-hook ()
+  "Special ecb-setup before starting ediff."
+  (if (and ecb-minor-mode
+           (equal (selected-frame) ecb-frame))
+      (progn
+        (setq ecb-before-ediff-window-config (ecb-current-window-configuration))
+        (if ecb-run-ediff-in-ecb-frame
+            ;; !!!! we must delete all ECB-windows and the compile-window so
+            ;; ediff can manage the whole ecb-frame concerning its windows!
+            ;; This is the reason why we can advice `ediff-setup-windows' so
+            ;; it runs with all original layout basic functions (especially
+            ;; delete-other-window is necessary!)
+            (progn
+              (ecb-toggle-ecb-windows -1)
+              (ecb-toggle-compile-window -1))
+          (if (not ecb-windows-hidden)
+              (delete-other-windows (car (ecb-canonical-edit-windows-list))))))
+    (setq ecb-before-ediff-window-config nil)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Should we add this function to
+;; `ediff-suspend-hook' too?! We should add something but this functions is
+;; not perfectly....in general suspending ediff need some work here...
+(defun ecb-ediff-quit-hook ()
+  "Added to the end of `ediff-quit-hook' during ECB is activated. It
+does all necessary after finishing ediff."
+  (when ecb-minor-mode
+    (if (and (not (equal (selected-frame) ecb-frame))
+             (y-or-n-p
+              "Ediff finished. Do you want to delete the extra ediff-frame? "))
+        (delete-frame (selected-frame) t))
+    (select-frame ecb-frame)
+    (when ecb-before-ediff-window-config
+      (ecb-set-window-configuration ecb-before-ediff-window-config)
+      (setq ecb-before-ediff-window-config nil))))
+
+(defun ecb-activate-ediff-compatibility ()
+  (if (boundp 'ediff-quit-hook)
+      (put 'ediff-quit-hook 'ecb-ediff-quit-hook-value
+           ediff-quit-hook))
+  (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
+  (add-hook 'ediff-quit-hook 'ecb-ediff-quit-hook t)
+  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: suspending ediff and
+  ;; especially reactivating does currently not really work well...
+  ;; (add-hook 'ediff-suspend-hook 'ecb-ediff-quit-hook t)
+  (add-hook 'ediff-before-setup-hook
+            'ecb-ediff-before-setup-hook))
+
+(defun ecb-deactivate-ediff-compatibility ()
+  (if (get 'ediff-quit-hook 'ecb-ediff-quit-hook-value)
+      (setq ediff-quit-hook (get 'ediff-quit-hook
+                                 'ecb-ediff-quit-hook-value))
+    (remove-hook 'ediff-quit-hook 'ecb-ediff-quit-hook))
+  (remove-hook 'ediff-before-setup-hook
+               'ecb-ediff-before-setup-hook))
+
+
+;; view-stuff --------------------------------------------------------------------
+
+;; The code of the view-package of GNU Emacs has to be advices when the
+;; view-buffer is displayed in the compile-window of ECB.
+;; The much simpler view-mechanism of XEmacs (view-less.el) should work out of
+;; the box.
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: for Emacs 22 we need also a
+;; workaround when no compile-window is active because the return-to-alist
+;; stuff in Emacs 22 is not really smart and does not work with layout like
+;; ECB - with Emacs 23 it works perfectly without a compile-window.
+;; In Emacs 22 the return-to-alist contains in case of a window-layout with
+;; more than two windows quit-window which switches the buffer after quiting
+;; (which is not what we want); with deactivated ECB and more than 2 windows
+;; the same dump behavior - but unfortunatelly ECB contains always more than
+;; two windows (at least in by far most cases), so current view-mode-exit
+;; stuff wil not work with Emacs 22 and ECB ==> we simplify the logic in the
+;; following case:
+;; - Emacs 22 is running and
+;; - there is no compile-window:
+;; - current buffer is in view-mode
+;; then we just delete the current-window (for which view-mode-exit is called)
+;; and select ecb-last-edit-window-with-point (hmm, is this possible - this
+;; one will be the deleted one...how to go back to that window we have to go
+;; back??
+
+(when-ecb-running-emacs
+ (defecb-advice view-mode-exit around ecb-compatibility-advices
+   "Makes view-mode compatible with ECB.
+
+If there is no compile-window \(i.e. the buffer with view-mode is not
+displayed in the special compile-window of ECB) then nothing special is done
+but the original `view-mode-exit' is performed.
+
+If the view-buffer is displayed in the compile-window \(i.e. this function is
+called from within the compile-window) then the whole window-management stuff
+of view-mode is disabled only `view-no-disable-on-exit' is taken into acount.
+
+The compile-window will be shrinked down with
+`ecb-toggle-compile-window-height' and the last edit-window with point will be
+selected afterwards."
+   (if (and (boundp 'ecb-minor-mode)
+            ecb-minor-mode
+            (eq (selected-frame) ecb-frame)
+            (eq (selected-window) ecb-compile-window))
+       (when view-mode
+         (or view-no-disable-on-exit
+             (view-mode-disable))
+;;          (when (ad-get-arg 1) ;; = exit-action
+;;            (setq view-exit-action nil)
+;;            (funcall (ad-get-arg 1) (current-buffer)))
+         (force-mode-line-update)
+         (ecb-toggle-compile-window-height -1)
+         (select-window ecb-last-edit-window-with-point))
+     ad-do-it))
+)
+
+
+;; not yet done ----------------------------------------------------------------
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>:
+;; *** The new package gdb-ui.el provides an enhanced graphical interface to
+;; GDB. You can interact with GDB through the GUD buffer in the usual way, but
+;; there are also further buffers which control the execution and describe the
+;; state of your program. It separates the input/output of your program from
+;; that of GDB and watches expressions in the speedbar. It also uses features
+;; of Emacs 21 such as the display margin for breakpoints, and the toolbar.
+;; This is new in Emacs 21.4 so maybe we have to make it compatible with ECB!
+;; But maybe this could be hard because AFAIK gdb-ui.el uses dedicated
+;; windows!
+
+
+
+
+;; we disable the advices at load-time
+(ecb-disable-advices 'ecb-compatibility-advices t)
+
+(silentcomp-provide 'ecb-compatibility)
+
+;;; ecb-compatibility.el ends here
diff --git a/site/ecb-2.40/ecb-compilation.el b/site/ecb-2.40/ecb-compilation.el
new file mode 100644
index 0000000..b4aa32d
--- /dev/null
+++ b/site/ecb-2.40/ecb-compilation.el
@@ -0,0 +1,312 @@
+;;; ecb-compilation.el --- code for buffers displayed in compile-window
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-compilation.el,v 1.39 2009/04/15 14:22:35 berndl Exp $
+
+;;; Commentary:
+
+;; NOTE: If you enjoy this software, please consider a donation to the EFF
+;; (http://www.eff.org)
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(silentcomp-defun comint-check-proc)
+
+(require 'ecb-util)
+
+(defcustom ecb-compilation-buffer-names `(("*Calculator*" . nil)
+                                          ("*vc*" . nil)
+                                          ("*vc-diff*" . nil)
+                                          ,(if ecb-running-xemacs
+                                               '("\\*Apropos.*\\*" . t)
+                                             '("*Apropos*" . nil))
+                                          ("*Occur*" . nil)
+                                          ("*shell*" . nil)
+                                          ("\\*[cC]ompilation.*\\*" . t)
+                                          ("\\*i?grep.*\\*" . t)
+                                          ("*JDEE Compile Server*" . nil)
+                                          ,(if ecb-running-xemacs
+                                               '("\\*Help.*\\*" . t)
+                                              '("*Help*" . nil))
+                                          ("*Completions*" . nil)
+                                          ("*Backtrace*" . nil)
+                                          ("*Compile-log*" . nil)
+                                          ("*bsh*" . nil)
+                                          (,(if ecb-running-xemacs
+                                               " *Message-Log*"
+                                             "*Messages*") . nil))
+  "*Additional buffer names that should be displayed in the compile-window.
+Buffer names can either be defined as strings or as regexps. If the
+buffer-name of a buffer matches one of the defined string or regexp then it
+will be displayed in the compile-window of ECB even if `compilation-buffer-p'
+says nil for this buffer.
+
+It is not recommended to add the name of eshell-buffers to this list because
+ECB already handles the eshell-integration as best as possible.
+
+See also the options `ecb-compilation-major-modes' and
+`ecb-compilation-predicates'."
+  :group 'ecb-compilation
+  :group 'ecb-most-important
+  :type '(repeat (cons (string :tag "Buffer name")
+                       (boolean :tag "Handled as regexp"))))
+
+(defvar ecb-compilation-buffer-names-internal nil
+  "This variable is for ECB internal use and can be used by ECB to add
+buffer-names to the set specified in `ecb-compilation-buffer-names'. Type is
+the same as of option `ecb-compilation-buffer-names'")
+
+(defun ecb-compilation-buffer-names ()
+  "Return the set of buffer names which should be displayed in the
+compile-window of ECB. This is a list combined of
+`ecb-compilation-buffer-names' and `ecb-compilation-buffer-names-internal'."
+  (append ecb-compilation-buffer-names
+          ecb-compilation-buffer-names-internal))
+
+(defun ecb-compilation-registered-buffer-p (name)
+  "Check if name belongs to the set of buffers returned by
+`ecb-compilation-buffer-names'. If yes returns NAME."
+  (catch 'exit
+    (dolist (b (ecb-compilation-buffer-names))
+      (if (null (cdr b))
+          (if (ecb-string= name (car b))
+              (throw 'exit name))
+        (save-match-data
+          (if (string-match (car b) name)
+              (throw 'exit name))))
+      nil)))
+
+(defcustom ecb-compilation-major-modes '(compilation-mode)
+  "*Additional major-mode that should be displayed in the compile-window.
+All buffers of a major-mode contained in this list are displayed in the
+compile-window even if `compilation-buffer-p' says nil for such a buffer.
+
+It is not recommended to add `eshell-mode' to this list because ECB already
+handles the eshell-integration as best as possible."
+  :group 'ecb-compilation
+  :type '(repeat (symbol :tag "major-mode name")))
+
+(defvar ecb-compilation-major-modes-internal nil
+  "This variable is for ECB internal use and can be used by ECB to add
+major-mode symbols to the set specified in `ecb-compilation-major-modes'.")
+
+(defun ecb-compilation-major-modes ()
+  "Return all major-mode symbols which should be displayed in the
+compile-window. This is a list combined of `ecb-compilation-major-modes' and
+`ecb-compilation-major-modes-internal'."
+  (append ecb-compilation-major-modes
+          ecb-compilation-major-modes-internal))
+
+
+(defcustom ecb-compilation-predicates '(comint-check-proc)
+  "*Predicates when a buffer should be treated as compilation-buffer.
+Every element of this list has to be a function or lambda-expression which
+gets as argument a buffer-object and which has to return not nil when this
+buffer should be treated as compilation-buffer \(even if
+`compilation-buffer-p' says nil) and therefore be displayed in the
+compile-window of ECB \(if there is any).
+
+In combination with the values of `ecb-compilation-buffer-names' and
+`ecb-compilation-major-modes' ECB decides when a buffer is displayed in the
+compile-window.
+
+Default value is the function `comint-check-proc' which returns not nil when
+the buffer is related to a living process."
+  :group 'ecb-compilation
+  :type '(repeat (symbol :tag "Compilation predicate")))
+
+(defvar ecb-compilation-predicates-internal nil
+  "This variable is for ECB internal use and can be used by ECB to add
+predicates to the set defined in `ecb-compilation-predicates'.")
+
+(defun ecb-compilation-predicates ()
+  "Return all predicates which should be used to test if a buffer should be
+displayed in the compile-window. This is a list combined of
+`ecb-compilation-predicates' and `ecb-compilation-predicates-internal'."
+  (append ecb-compilation-predicates
+          ecb-compilation-predicates-internal))
+
+
+
+(defun ecb-compilation-get-buffers()
+  "Get all known compilation buffer names.  See `ecb-compilation-buffer-p'."
+
+  (let((buffer-names '())
+       (buffer-list (buffer-list ecb-frame))
+       (index 0))
+
+    (setq buffer-list (sort buffer-list (lambda(first second)
+                                          (ecb-string< (buffer-name first)
+                                                       (buffer-name second)))))
+    (dolist(buffer buffer-list)
+      (when (ecb-compilation-buffer-p buffer)
+        (setq buffer-names
+              (append buffer-names
+                      (list (cons (buffer-name buffer) index))))
+        (setq index (1+ index))))
+
+    buffer-names))
+
+
+(defun ecb-compilation-buffer-p (buffer-or-name)
+  "Test if the given buffer BUFFER-OR-NAME should be treated as a compilation
+buffer. Note that in this case we define \"compilation buffer\" as a buffer
+that should ideally be displayed in the compile-window of ECB \(see
+`ecb-compile-window-height'). This means that in some situations this might
+not be the result of a real `compile-internal'. A good example would be the
+*Help* buffer.
+
+BUFFER-OR-NAME can be the name of a living\(!) buffer or a buffer-object.
+
+This function returns the buffer-object of BUFFER-OR-NAME - i.e.
+BUFFER-OR-NAME will be treated as compilation-buffer - if:
+
+- The name of the buffer is contained in the list returned by the function
+  `ecb-compilation-buffer-names' or
+- the `major-mode' of the buffer is contained in the list returned by the
+  function `ecb-compilation-major-modes' or
+- if `compilation-buffer-p' returns true or
+- one of the predicates returned by `ecb-compilation-predicates' returns not
+  nil for the buffer.
+
+Otherwise nil is returned.
+
+Summary for ECB-end-users: A buffer will be treated as compilation-buffer if
+either 
+- `compilation-buffer-p' returns not nil, i.e. if a real compilation-buffer or
+- if at least one of the options `ecb-compilation-buffer-names',
+  `ecb-compilation-major-modes' or `ecb-compilation-predicates' define the
+  buffer as compilation-buffer."
+  ;;determine the best valid for the buffer.
+  (let ((buffer (ecb-buffer-obj buffer-or-name))
+        (ecb-comp-predicates (ecb-compilation-predicates)))
+    (when buffer
+
+      ;;test if this is a valid buffer by name.
+      (if (ecb-compilation-registered-buffer-p (buffer-name buffer))
+          buffer
+        ;;else test if this is a valid buffer by mode
+        (if (save-excursion
+              (set-buffer buffer)
+              (member major-mode (ecb-compilation-major-modes)))
+            buffer
+          ;;else test if this is a regular compilation buffer
+          (if (compilation-buffer-p buffer)
+              buffer
+            ;; we do not use run-hook-with-args-until-success because we have
+            ;; to check if the functions are bound!!
+            (if (dolist (p ecb-comp-predicates)
+                  (if (and (fboundp p) (funcall p buffer))
+                      (return t)))
+                buffer
+              nil)))))))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: The following mechanism is necessary to
+;; avoid eating up whole CPU for updating the menu-entries for the
+;; compilation-buffers. Especially if you have opened a lot of buffers this
+;; can slow down Emacs/ECB dramatically. Now we add an idle-times
+;; check-function `ecb-compilation-buffer-list-changed-p' which checks if the
+;; buffer-list has changed. If yes, then the variable
+;; `ecb-compilation-update-menu-p' is set to t. Only if this variable is not
+;; nil the menu-bar-update-hook `ecb-compilation-update-menu' updates the
+;; ECB-menu.
+
+(defvar ecb-compilation-update-menu-p nil)
+(defvar ecb-compilation-buffer-list-cache nil)
+(defvar ecb-compilation-update-idle-time 0.25)
+
+(defun ecb-compilation-buffer-list-init ()
+  "Initialize the compilation buffer list cache."
+  (setq ecb-compilation-update-menu-p nil)
+  (setq ecb-compilation-buffer-list-cache nil)
+  (ecb-compilation-buffer-list-changed-p))
+
+(defecb-autocontrol/sync-function ecb-compilation-buffer-list-changed-p nil nil nil
+  "Check if current active buffer list has changed - i.e. if a new buffer has
+been created or a buffer has been deleted. If yes then
+`ecb-compilation-update-menu-p' is set to not nil and the cache is updated."
+  (let ((new-buffer-list (buffer-list)))
+    (when (not (equal new-buffer-list
+                      ecb-compilation-buffer-list-cache))
+      (ecb-bodytrace-autocontrol/sync-fcn-error
+       'ecb-compilation-buffer-list-changed-p
+       "New buffer list not equal with cached buffer list.")
+      (setq ecb-compilation-buffer-list-cache new-buffer-list)
+      ;; Nowhere else this variable will be set to t.
+      (setq ecb-compilation-update-menu-p t))))
+
+
+(defun ecb-compilation-update-menu()
+  "Create an install a menu that allows the user to navigate buffers that are
+valid ECB compilation buffers. This is only done if
+`ecb-compilation-update-menu-p' is not nil; see
+`ecb-compilation-buffer-list-changed-p'. For more information about
+compilation buffers see `ecb-compilation-buffer-p'."
+
+  (when ecb-compilation-update-menu-p
+    (let ((submenu nil)
+          (buffers (ecb-compilation-get-buffers)))
+      (condition-case nil
+          (progn
+            (setq ecb-compilation-update-menu-p nil)
+            (dolist(buffer buffers)
+              (setq submenu
+                    (append submenu
+                            (list (vector (car buffer)
+                                          ;; switch-to-buffer-other-window is
+                                          ;; ok for all situations because if
+                                          ;; no compile-window it uses another
+                                          ;; edit-window otherwise it uses the
+                                          ;; compile-window. 
+                                          `(funcall 'switch-to-buffer-other-window
+                                                    ,(car buffer))
+                                          :active t)))))
+            
+            ;;TODO: Klaus Berndl <klaus.berndl@sdm.de>: Seems not to work with
+            ;;Emacs 20.X
+            (easy-menu-change (list ecb-menu-name)
+                              "Compilation Buffers"
+                              submenu
+                              "Navigate")
+            t)
+        (error nil)))))
+      
+
+
+(silentcomp-provide 'ecb-compilation)
+
+;;; ecb-compilation.el ends here
diff --git a/site/ecb-2.40/ecb-create-layout.el b/site/ecb-2.40/ecb-create-layout.el
new file mode 100644
index 0000000..65d37a3
--- /dev/null
+++ b/site/ecb-2.40/ecb-create-layout.el
@@ -0,0 +1,862 @@
+;;; ecb-create-layout.el --- creating new layouts
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-create-layout.el,v 1.36 2009/05/15 16:40:05 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains code for easy creating new layouts
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+(require 'ecb-mode-line)
+(require 'ecb-util)
+(require 'ecb-compilation)
+
+;; XEmacs stuff
+(silentcomp-defvar vertical-divider-map)
+(silentcomp-defvar modeline-map)
+;; Emacs 21.X stuff
+(silentcomp-defvar automatic-hscrolling)
+(silentcomp-defvar before-make-frame-hook)
+(silentcomp-defvar after-make-frame-functions)
+;; First loaded during activated ECB
+(silentcomp-defvar ecb-buildin-layouts)
+
+(defgroup ecb-create-layout nil
+  "Settings for creating new ECB-layouts."
+  :group 'ecb-layout
+  :prefix "ecb-create-layout-")
+
+(defcustom ecb-create-layout-file "~/.ecb-user-layouts.el"
+  "*File where all layouts created by `ecb-create-new-layout' are stored."
+  :group 'ecb-create-layout
+  :type 'file)
+
+(defcustom ecb-create-layout-frame-width 110
+  "*Frame width of the layout creation frame."
+  :group 'ecb-create-layout
+  :type 'integer)
+
+(defcustom ecb-create-layout-frame-height 42
+  "*Frame height of the layout creation frame."
+  :group 'ecb-create-layout
+  :type 'integer)
+
+
+;; internal vars and consts
+
+
+(defconst ecb-create-layout-buf-prefix " *ECB-LC-")
+(defconst ecb-create-layout-frame-name "Creation of a new ECB-layout")
+(defconst ecb-create-layout-all-buf-types
+  '("directories" "history" "methods" "sources" "speedbar" "analyse"))
+
+(defconst ecb-create-layout-help-text-left-right
+  "
+ ECB layout creation mode
+ ========================
+
+ This is the help-screen of this mode. The window
+ displaying this help text is called the edit-window
+ which is neither selectable nor delete-able nor
+ split-able in this mode.
+
+ <left/right/up/down-arrow>: Moving around in current
+ window C-n, C-p: Go to next/previous window (beside
+ the edit-window)
+
+ C-s: Split current window. You will be asked:
+      - If \"vertical\" or \"horizontal\" split
+      - How to split: \"at-point\", \"half\" or
+        \"other\" (i.e. you can specify any fraction
+        between 0.1 and 0.9)
+      - Which type the current window should be
+        \(see description of C-t below).
+ C-u: Unsplit, ie. delete current window
+ C-t: Give the current window a built-in type
+      (\"directories\", \"sources\", \"methods\",
+      \"history\" etc.) or any arbitrary user-defined
+      type (\"other\"). See the Online-manual!
+
+ C-c: Cancel layout creation. This does not save the
+      layout. Deletes this frame.
+ C-q: Save current defined layout and quit the layout
+      creation. You will be asked for a layout-name.
+      With TAB-completion you can get the names already
+      in use. You have to choose a new name!
+      Deletes this frame.
+
+ There are NO other commands or keys available. ALL
+ other keys are disabled in this mode!
+")
+
+(defconst ecb-create-layout-help-text-top
+  " ECB layout creation mode
+ ========================
+
+ This is the help-screen of this mode. The window displaying this help text is called
+ the edit-window which is neither selectable nor delete-able nor split-able in this mode.
+
+ <left/right/up/down-arrow>: Moving around in current window
+ C-n, C-p: Go to next/previous window (beside the edit-window)
+
+ C-s: Split current window. You will be asked:
+      - If \"vertical\" or \"horizontal\" split
+      - How to split: \"at-point\", \"half\" or \"other\" (i.e. you can specify any
+        fraction between 0.1 and 0.9)
+      - Which type the current window should be \(see description of C-t below).
+ C-u: Unsplit, ie. delete current window
+ C-t: Give the current window a built-in type (\"directories\", \"sources\", \"methods\",
+      \"history\" etc.) or any arbitrary user-defined type (\"other\").
+
+ C-c: Cancel layout creation. This does not save the layout. Deletes this frame.
+ C-q: Save current defined layout and quit the layout creation. You will be asked for a
+      layout-name. With TAB-completion you can get the names already in use.
+      You have to choose a new name! Deletes this frame.
+
+ There are NO other commands or keys available. ALL other keys are disabled in this mode!
+")
+
+(defconst ecb-create-layout-file-header
+     "
+
+;; Copyright (C) 2001 - 2005 Jesper Nordenberg
+;; Copyright (C) 2001 - 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001 - 2005 Klaus Berndl <klaus.berndl@sdm.de>
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: java, class, browser
+
+;; This program is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 2, or (at your option) any later
+;; version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+;; more details.
+
+;; You should have received a copy of the GNU General Public License along
+;; with GNU Emacs; see the file COPYING. If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file contains all user-defined ECB-layouts created by the command
+;; `ecb-create-new-layout'.
+
+;; !!! DO NOT EDIT THIS FILE MANUALLY - IT IS GENERATED BY ECB !!!
+
+")
+
+
+(defvar ecb-create-layout-frame nil)
+(defvar ecb-create-layout-edit-window nil)
+
+(defvar ecb-create-layout-old-global-map nil)
+(defvar ecb-create-layout-old-minor-mode-map-alist nil)
+(defvar ecb-create-layout-old-hscroll nil)
+(defvar ecb-create-layout-old-debug-on-error nil)
+(defvar ecb-create-layout-old-frame nil)
+(defvar ecb-create-layout-old-vertical-div-map nil)
+(defvar ecb-create-layout-old-modeline-map nil)
+(defvar ecb-create-layout-old-after-frame-h nil)
+(defvar ecb-create-layout-old-before-frame-h nil)
+
+(defvar ecb-create-layout-generated-lisp nil)
+(defvar ecb-create-layout-gen-counter 0)
+
+(defvar ecb-create-layout-buf-types nil)
+
+;; can be 'left, 'right, 'top or 'left-right
+(defvar ecb-create-layout-type 'left)
+
+(defun ecb-create-layout-initilize ()
+  (setq ecb-create-layout-buf-types
+        (ecb-copy-list ecb-create-layout-all-buf-types))
+  (setq ecb-create-layout-frame nil)
+  (setq ecb-create-layout-edit-window nil)
+  (setq ecb-create-layout-old-global-map nil)
+  (setq ecb-create-layout-old-minor-mode-map-alist nil)
+  (setq ecb-create-layout-old-hscroll nil)
+  (setq ecb-create-layout-old-frame nil)
+
+  (if ecb-running-xemacs
+      (progn
+        (setq ecb-create-layout-old-vertical-div-map nil)
+        (setq ecb-create-layout-old-modeline-map nil))
+    (setq ecb-create-layout-old-after-frame-h nil)
+    (setq ecb-create-layout-old-before-frame-h nil))
+  
+  (setq ecb-create-layout-generated-lisp nil)
+  (setq ecb-create-layout-gen-counter 0))
+
+(defvar ecb-create-layout-frame-deleted nil)
+
+(defadvice delete-frame (before ecb-create-layout)
+  "Ensure calling `ecb-create-layout-cancel' during deleting the
+layout-creation frame. Does nothing for any other other frame!"
+  (let ((frame (or (ad-get-arg 0) (selected-frame))))
+    (when (ecb-string= (ecb-frame-parameter frame 'name)
+                       ecb-create-layout-frame-name)
+      (setq ecb-create-layout-frame-deleted t)
+      (ecb-create-layout-cancel))))
+
+(defadvice delete-frame (after ecb-create-layout)
+  "Ensures correct deleting of the layout-creation frame. Does nothing for any
+other other frame!"
+  (when ecb-create-layout-frame-deleted
+    (setq ecb-create-layout-frame-deleted nil)
+    (ecb-activate))
+  (ad-disable-advice 'delete-frame 'after 'ecb-create-layout)
+  (ad-activate 'delete-frame))
+  
+
+(defun ecb-create-layout-frame-ok ()
+  "Return not nil if current frame is the `ecb-create-layout-frame'"
+  (and ecb-create-layout-frame
+       (frame-live-p ecb-create-layout-frame)
+       (equal (selected-frame) ecb-create-layout-frame)))
+
+(defun ecb-create-layout-cancel (&rest ignore)
+  "Cancel layout-creation without saving the layout."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (ecb-create-layout-clear-all (interactive-p))
+    (message "ECB Layout Creation canceled - the layout is not saved!")
+    (and (interactive-p) (ecb-activate))))
+
+(defun ecb-create-layout-clear-all (&optional delete-frame)
+  "Resets all stuff to state before `ecb-create-new-layout' was called. If
+DELETE-FRAME is not nil then the new created frame will be deleted and the
+`ecb-create-layout-old-frame' will be selected."
+  ;; disabling the advice
+  (ad-disable-advice 'delete-frame 'before 'ecb-create-layout)
+  (ad-activate 'delete-frame)
+  ;; killing all white-space-filled layout-buffers
+  (save-match-data
+    (dolist (b (buffer-list ecb-create-layout-frame))
+      (if (string-match "^ \\*ECB-LC-" (buffer-name b))
+          (kill-buffer b))))
+  ;; restore the global-map
+  (if (keymapp ecb-create-layout-old-global-map)
+      (use-global-map ecb-create-layout-old-global-map))
+  ;; restore the minor-mode-maps
+  (if ecb-create-layout-old-minor-mode-map-alist
+      (setq minor-mode-map-alist
+            ecb-create-layout-old-minor-mode-map-alist))
+  ;; restore horiz. scrolling
+  (unless ecb-running-xemacs
+    (setq automatic-hscrolling ecb-create-layout-old-hscroll))
+  ;; for XEmacs restore these maps
+  (if ecb-running-xemacs
+      (progn
+        (setq vertical-divider-map ecb-create-layout-old-vertical-div-map)
+        (setq modeline-map ecb-create-layout-old-modeline-map))
+    ;; before and after making frame stuff
+    (setq before-make-frame-hook ecb-create-layout-old-before-frame-h)
+    (setq after-make-frame-functions ecb-create-layout-old-after-frame-h))
+  ;; restore old debug-on-error
+  (setq debug-on-error ecb-create-layout-old-debug-on-error)
+  ;; delete the layout-frame and select the ecb-create-layout-old-frame
+  (when delete-frame
+    (when (and ecb-create-layout-old-frame
+               (frame-live-p ecb-create-layout-old-frame))
+      (raise-frame ecb-create-layout-old-frame)
+      (select-frame ecb-create-layout-old-frame))
+    (when (and ecb-create-layout-frame
+               (frame-live-p ecb-create-layout-frame))
+      (ad-with-originals 'delete-frame
+        (delete-frame ecb-create-layout-frame))))
+  (setq ecb-create-layout-frame nil))
+
+(defun ecb-create-layout-save-and-quit (&rest ignore)
+  "Quit the ECB Layout creation and save the defined layout."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (if (ecb-create-layout-ready-for-save-p)
+        (let ((delete-frame (interactive-p)))
+          ;; if an error occurs during `ecb-create-layout-save-layout' or the
+          ;; user hits C-q we must clean the layout creation stuff!
+          (unwind-protect
+              (ecb-create-layout-save-layout)
+            ;; clean the layout creation stuff
+            (ecb-create-layout-clear-all delete-frame)
+            (message "ECB Layout Creation finished.")
+            (ecb-activate)))
+      (ecb-error "You must give every ECB-tree-window a type (use C-t)!"))))
+
+
+(defun ecb-create-layout-ready-for-save-p ()
+  "Returns only not nil if all windows in current layout have a type."
+  (let ((save-p t))
+    (save-excursion
+      (dolist (win (ecb-window-list (selected-frame) 0))
+        (unless (equal win ecb-create-layout-edit-window)
+          (set-buffer (window-buffer win))
+          (setq save-p (ecb-create-layout-buffer-type)))))
+    save-p))
+
+
+(defmacro ecb-create-layout-insert-line (line)
+  "Insert LINE in current-buffer and adds a newline."
+  `(progn
+     (insert ,line)
+     (insert "\n")))
+
+(defun ecb-create-layout-insert-file-header ()
+  (insert (format ";;; %s --- user defined ECB-layouts" ;;
+                  (file-name-nondirectory ecb-create-layout-file)))
+  (insert ecb-create-layout-file-header))
+
+(defun ecb-create-layout-save-layout ()
+  "Saves current layout in `ecb-create-layout-file'."
+  ;; make edit-window the current selected window
+  (ecb-create-layout-select-edit-window)
+  ;; we need the reversed sequence of the generated code
+  (setq ecb-create-layout-generated-lisp
+        (nreverse ecb-create-layout-generated-lisp))
+  ;; ensure we have load all layouts defined until now
+  (ecb-load-layouts)
+  ;; now we have the create-code in the right sequence so we can save the new
+  ;; layout in the user-layout file
+  (let ((layout-name ""))
+    ;; a repeat...until-loop
+    (while (progn
+             ;;the while body
+             (setq layout-name
+                   (ecb-choose-layout-name (ecb-available-layouts-of-type nil)
+                                           nil))
+             ;; the while condition
+             (ecb-available-layouts-member-p layout-name)))
+    (with-temp-file (expand-file-name ecb-create-layout-file)
+      (erase-buffer)
+      (if (file-readable-p (expand-file-name ecb-create-layout-file))
+          (insert-file-contents (expand-file-name ecb-create-layout-file))
+        (ecb-create-layout-insert-file-header))
+      (goto-char (point-max))
+      ;; insert header of the layout-define macro
+      (ecb-create-layout-insert-line
+       (format "(ecb-layout-define \"%s\" %s nil"
+               layout-name
+               (symbol-name ecb-create-layout-type)))
+      ;; insert all the generated layout-code of the new layout
+      (dolist (line ecb-create-layout-generated-lisp)
+        (ecb-create-layout-insert-line
+         (format "  %s" line)))
+      ;; close the new layout-function
+      (ecb-create-layout-insert-line "  )"))
+    ;; now we load the new layout
+    (load-file (expand-file-name ecb-create-layout-file))
+    (message "The new layout is saved in %s, loaded and available!"
+             ecb-create-layout-file)))
+
+(defun ecb-create-layout-gen-lisp (lisp-statement)
+  (setq ecb-create-layout-generated-lisp
+        (cons lisp-statement ecb-create-layout-generated-lisp)))
+
+(defun ecb-create-layout-split-ver (&optional fraction)
+  (let ((factor (or fraction
+                    (/ (float (count-lines (window-start) (point)))
+                       (float (- (ecb-window-full-height) 2))))))
+    (ecb-split-ver factor t)
+    (ecb-create-layout-gen-lisp `(ecb-split-ver ,factor t))
+    factor))
+
+(defun ecb-create-layout-split-hor (&optional fraction)
+  (let ((factor (or fraction
+                    (/ (float (- (point) (ecb-line-beginning-pos)))
+                       (float (- (window-width) 3))))))
+    (ecb-split-hor factor t)
+    (ecb-create-layout-gen-lisp `(ecb-split-hor ,factor t))
+    (beginning-of-line)
+    factor))
+
+(defun ecb-create-layout-add-to-buf-types (type)
+  (when (and (stringp type)
+             (member type ecb-create-layout-all-buf-types))
+    (add-to-list 'ecb-create-layout-buf-types type)
+    (setq ecb-create-layout-buf-types
+          (sort ecb-create-layout-buf-types 'ecb-string<))))
+
+(defun ecb-create-layout-remove-from-buf-type (type)
+  (when (stringp type)
+    (setq ecb-create-layout-buf-types
+          (sort (delete type ecb-create-layout-buf-types) 'ecb-string<))))
+
+(defun ecb-create-layout-buffer-type ()
+  (get-text-property (point-min) 'ecb-create-layout-type))
+
+(defun ecb-create-layout-buffer-factor ()
+  (get-text-property (point-min) 'ecb-create-layout-factor))
+
+(defun ecb-create-layout-set-buffer-type (type)
+  (let ((buffer-read-only nil))
+    (put-text-property (point-min) (1+ (point-min)) 'ecb-create-layout-type
+                       type)))
+
+(defun ecb-create-layout-set-buffer-factor (factor)
+  (let ((buffer-read-only nil))
+    (put-text-property (point-min) (1+ (point-min)) 'ecb-create-layout-factor
+                       factor)))
+
+
+(defun ecb-create-layout-gen-lisp-for-buffer-type (type)
+  (let ((func-sym (intern (format "ecb-set-%s-buffer" type))))
+    (ecb-create-layout-gen-lisp
+     `(if (fboundp (quote ,func-sym))
+          (,func-sym)
+        (ecb-set-default-ecb-buffer)))))
+  
+
+(defun ecb-create-layout-set-buffer-to-type (&optional type)
+  "Give current ECB-buffer a type."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    ;; adding the old buffer type to the available-list
+    (ecb-create-layout-add-to-buf-types (or type
+                                            (ecb-create-layout-buffer-type)))
+    (let ((new-type (or (and (stringp type) type)
+                        (ecb-query-string "Type of current ECB-tree-buffer:"
+                                          ecb-create-layout-buf-types
+                                          "Insert the buffer type"))))
+      ;; removing the new buffer type from the available-list
+      (ecb-create-layout-remove-from-buf-type new-type)
+      (ecb-mode-line-set (buffer-name (current-buffer))
+                         (selected-frame)
+                         (concat "ECB " new-type) nil t)
+      ;; setting the new buffer type in the buffer itself
+      (ecb-create-layout-set-buffer-type new-type)
+      (when (interactive-p)
+        (ecb-create-layout-gen-lisp-for-buffer-type new-type)
+        (ecb-create-layout-next-window))
+      new-type)))
+
+(defun ecb-create-layout-select-edit-window ()
+  (let ((counter 0))
+    (while (not (equal (selected-window) ecb-create-layout-edit-window))
+      (other-window 1)
+      (setq counter (1+ counter)))
+    (ecb-create-layout-gen-lisp `(dotimes (i ,counter)
+                                   (other-window 1)
+                                   (if (equal (selected-window)
+                                              ecb-compile-window)
+                                       (other-window 1))))))
+
+(defun ecb-create-layout-split ()
+  "Split current window."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    ;; splitting
+    (let* ((old-buf-type (ecb-create-layout-buffer-type))
+           (split-choices (if (equal ecb-create-layout-type 'top)
+                              '("horizontal" "vertical")
+                            '("vertical" "horizontal")))
+           (split-type (ecb-query-string "Split type:" split-choices))
+           (split-method
+            (ecb-query-string "Split method:"
+                              '("at-point" "half")
+                              "Insert a fraction between 0.1 and 0.9"))
+           (fraction (cond ((ecb-string= split-method "at-point")
+                            nil)
+                           ((ecb-string= split-method "half")
+                            0.5)
+                           ((floatp (string-to-number split-method))
+                            (string-to-number split-method))
+                           (t 0.5)))
+           (real-split-factor
+            (if (ecb-string= split-type "horizontal")
+                (ecb-create-layout-split-hor fraction)
+              (ecb-create-layout-split-ver fraction))))
+      ;; creating new fitting buffers
+      (ecb-create-layout-new-buffer)
+       (save-excursion
+         (save-selected-window
+           (select-window (next-window))
+           (ecb-create-layout-new-buffer)))
+      ;; asking for the buffer type
+      (ecb-create-layout-set-buffer-factor real-split-factor)
+      (ecb-create-layout-gen-lisp-for-buffer-type
+       (ecb-create-layout-set-buffer-to-type old-buf-type))
+      (ecb-create-layout-next-window))))
+
+(defun ecb-create-layout-forward-char ()
+  "Move one character forward."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (unless (> (- (point) (ecb-line-beginning-pos)) (- (window-width)
+                                                       (if ecb-running-xemacs
+                                                           3
+                                                         2)))
+      (call-interactively 'forward-char))))
+
+(defun ecb-create-layout-next-window ()
+  "Go to the next window.
+This command always goes to the next special ECB-window, i.e. it never selects
+the edit-window."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (let ((steps (if (equal (next-window) ecb-create-layout-edit-window) 2 1)))
+      (other-window steps)
+      (ecb-create-layout-gen-lisp `(dotimes (i ,steps)
+                                     (other-window 1)
+                                     (if (equal (selected-window)
+                                                ecb-compile-window)
+                                         (other-window 1)))))))
+
+(defun ecb-create-layout-previous-window ()
+  "Go to the previous window.
+This command always goes to the ECB-window preceding current window, i.e. it
+never selects the edit-window."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (let ((steps (if (equal (previous-window (selected-window) 0)
+                            ecb-create-layout-edit-window)
+                     -2 -1)))
+      (other-window steps)
+      (ecb-create-layout-gen-lisp `(dotimes (i ,(abs steps))
+                                     (other-window -1)
+                                     (if (equal (selected-window)
+                                                ecb-compile-window)
+                                         (other-window -1)))))))
+
+(defun ecb-create-layout-delete-window ()
+  "Delete current window."
+  (interactive)
+  (when (ecb-create-layout-frame-ok)
+    (unless (or (equal (selected-window) ecb-create-layout-edit-window)
+                (= (length (ecb-window-list nil 0))
+                   (if (equal ecb-create-layout-type 'left-right) 3 2)))
+      (if (and (member ecb-create-layout-type '(right left-right))
+               (equal (previous-window (selected-window) 0)
+                      ecb-create-layout-edit-window)
+               (> (nth 0 (ecb-window-edges (next-window))) (nth 0 (ecb-window-edges)))
+               (= (nth 3 (ecb-window-edges ecb-create-layout-edit-window))
+                  (nth 3 (ecb-window-edges))))
+          ;; In exactly this window context we can not delete the current
+          ;; window because otherwise the edit-window would enlarge and the
+          ;; wrong window would be deleted!
+          (ecb-error "This window can not be deleted! Delete another one.")
+        ;; add the buffer type of the deleted window to the available-list
+        (ecb-create-layout-add-to-buf-types (ecb-create-layout-buffer-type))
+        (kill-buffer (current-buffer))
+        (delete-window)
+        (ecb-create-layout-gen-lisp '(delete-window))
+        (if (equal (selected-window) ecb-create-layout-edit-window)
+            (ecb-create-layout-previous-window))
+        ;; add the buffer type of the new bigger window to the available-list
+        (ecb-create-layout-add-to-buf-types (ecb-create-layout-buffer-type))
+        (kill-buffer (current-buffer))
+        (ecb-create-layout-new-buffer)))))
+
+(defvar ecb-create-layout-mode-map nil
+  "`ecb-create-layout-mode' key-map.")
+
+(if ecb-create-layout-mode-map
+    ()
+  (setq ecb-create-layout-mode-map (make-sparse-keymap))
+;;  (suppress-key-map ecb-create-layout-mode-map t)
+
+  ;; for minibuffer insertion we need the following
+  (dotimes (i 26)
+    (define-key ecb-create-layout-mode-map
+      (string (+ i 97)) 'self-insert-command))
+
+  (dotimes (i 26)
+    (define-key ecb-create-layout-mode-map
+      (string (+ i 65)) 'self-insert-command))
+
+  (dotimes (i 10)
+    (define-key ecb-create-layout-mode-map
+      (string (+ i 48)) 'self-insert-command))
+
+  (define-key ecb-create-layout-mode-map "." 'self-insert-command)
+  (define-key ecb-create-layout-mode-map "-" 'self-insert-command)
+  
+  (if ecb-running-xemacs
+      (define-key ecb-create-layout-mode-map (kbd "<BS>")
+        'delete-backward-char)
+    (define-key ecb-create-layout-mode-map (kbd "<DEL>")
+      'backward-delete-char-untabify))
+
+  (define-key ecb-create-layout-mode-map (kbd "C-q")
+    'ecb-create-layout-save-and-quit)
+  (define-key ecb-create-layout-mode-map (kbd "C-c")
+    'ecb-create-layout-cancel)
+  (define-key ecb-create-layout-mode-map (kbd "C-u")
+    'ecb-create-layout-delete-window)
+  (define-key ecb-create-layout-mode-map (kbd "C-s") 'ecb-create-layout-split)
+  (define-key ecb-create-layout-mode-map (kbd "C-t")
+    'ecb-create-layout-set-buffer-to-type)
+  (define-key ecb-create-layout-mode-map (kbd "<left>") 'backward-char)
+  (define-key ecb-create-layout-mode-map (kbd "<right>")
+    'ecb-create-layout-forward-char)
+  (define-key ecb-create-layout-mode-map (kbd "<up>") 'previous-line)
+  (define-key ecb-create-layout-mode-map (kbd "<down>") 'next-line)
+  (define-key ecb-create-layout-mode-map (kbd "C-n")
+    'ecb-create-layout-next-window)
+  (define-key ecb-create-layout-mode-map (kbd "C-p")
+    'ecb-create-layout-previous-window)
+;;   (define-key ecb-create-layout-mode-map (kbd "C-h v")
+;;     'describe-variable)
+;;   (define-key ecb-create-layout-mode-map (kbd "C-h k")
+;;     'describe-key)
+;;   (define-key ecb-create-layout-mode-map (kbd "C-h d")
+;;     'ecb-create-layout-debug)
+;;   (define-key ecb-create-layout-mode-map (kbd "M-<down>")
+;;     'scroll-other-window)
+  (set-keymap-parent ecb-create-layout-mode-map nil))
+
+
+(defun ecb-create-layout-new-buffer (&optional do-not-fill)
+  (set-window-dedicated-p (selected-window) nil)
+  (switch-to-buffer (generate-new-buffer ecb-create-layout-buf-prefix))
+  (erase-buffer)
+  (unless do-not-fill
+    (dotimes (i (ecb-window-full-height))
+      (insert
+       (format "%s\n"
+               (make-string (- (window-width)
+                               (if ecb-running-xemacs 3 1))
+                            ?\ )))))
+  (goto-char (point-min))
+  (ecb-create-layout-mode)
+  (set-window-dedicated-p (selected-window) t))
+
+
+
+(defun ecb-create-layout-mode ()
+  "Major mode for creating new ECB-layouts."
+  (setq major-mode 'ecb-create-layout-mode)
+  (setq mode-name "ECB Create-Layout")
+  (use-local-map ecb-create-layout-mode-map)
+  (make-local-variable 'buffer-read-only)
+  (ecb-mode-line-set (buffer-name (current-buffer))
+                     (selected-frame) "" nil t)
+  (setq buffer-read-only t))
+
+(defun ecb-create-layout-init-layout (&optional new)
+  (delete-other-windows)
+  (ecb-create-layout-new-buffer)
+  (when new
+    (setq ecb-create-layout-type (intern (ecb-query-string
+                                          "Location of the the ECB-tree-windows:"
+                                          '("left" "right" "top" "left-right")))))
+  (case ecb-create-layout-type
+    (left
+     (ecb-split-hor ecb-windows-width))
+    (right
+     (ecb-split-hor (- ecb-windows-width) t))
+    (top
+     (ecb-split-ver ecb-windows-height))
+    (otherwise
+     (ecb-split-hor (- (* 0.667 ecb-windows-width)) t)
+     (ecb-split-hor (* 0.667 ecb-windows-width) nil t)))
+  ;; we set the buffer in the big edit-window
+  (ecb-create-layout-new-buffer t)
+  ;; now we insert the help in the edit-window
+  (let ((buffer-read-only nil))
+    (insert (if (equal ecb-create-layout-type 'top)
+                ecb-create-layout-help-text-top
+              ecb-create-layout-help-text-left-right)))
+  (setq ecb-create-layout-edit-window (selected-window))
+  (ecb-mode-line-set (buffer-name (current-buffer))
+                     (selected-frame) "   ECB edit-window" nil t)
+  ;; The edit window must not be dedicated
+  (set-window-dedicated-p (selected-window) nil)
+  ;; we set the buffer for the (currently unsplitted) ECB-window
+  (other-window 1)
+  (ecb-create-layout-new-buffer)
+  ;; for the left-right type we have to set the other column too
+  (when (equal ecb-create-layout-type 'left-right)
+    (other-window 1)
+    (ecb-create-layout-new-buffer)))
+
+
+(defun ecb-create-layout-make-frame ()
+  "Create a new frame for the layout creation process and return it."
+  (if ecb-running-xemacs
+      (make-frame `((name . ,ecb-create-layout-frame-name)
+                    (minibuffer . t)
+                    (user-position . t)
+                    (width . ,ecb-create-layout-frame-width)
+                    (height . ,ecb-create-layout-frame-height)
+                    (default-toolbar-visible-p . nil)
+                    (left-toolbar-visible-p . nil)
+                    (right-toolbar-visible-p . nil)
+                    (top-toolbar-visible-p . nil)
+                    (bottom-toolbar-visible-p . nil)
+                    (default-gutter-visible-p . nil)
+                    (left-gutter-visible-p . nil)
+                    (right-gutter-visible-p . nil)
+                    (top-gutter-visible-p . nil)
+                    (bottom-gutter-visible-p . nil)
+                    (has-modeline-p . t)
+                    (use-left-overflow . nil)
+                    (vertical-scrollbar-visible-p . nil)
+                    (horizontal-scrollbar-visible-p . nil)
+                    (use-right-overflow . nil)
+                    (menubar-visible-p . nil)))
+    (make-frame `((name . ,ecb-create-layout-frame-name)
+                  (minibuffer . t)
+                  (user-position . t)
+                  (width . ,ecb-create-layout-frame-width)
+                  (height . ,ecb-create-layout-frame-height)
+                  (vertical-scroll-bars . nil)
+                  (horizontal-scroll-bars . nil)
+                  (tool-bar-lines . 0)
+                  (menu-bar-lines . 0)))))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Wir müssen ev. ECB vorher
+;; deaktivieren, da sonst ein 2. ECB-menu entsteht. Beim C-c oder C-q eben
+;; dann wieder aktivieren.
+(defun ecb-create-new-layout ()
+  "Start interactively layout creating."
+  (interactive)
+
+  (ecb-deactivate)
+  (ecb-create-layout-initilize)
+
+  ;; before- and after make frame stuff
+  (when (not ecb-running-xemacs)
+    (setq ecb-create-layout-old-after-frame-h after-make-frame-functions)
+    (setq after-make-frame-functions nil)
+    (setq ecb-create-layout-old-before-frame-h before-make-frame-hook)
+    (setq before-make-frame-hook nil))
+    
+  ;; saving old frame
+  (setq ecb-create-layout-old-frame (selected-frame))
+
+  ;; creating new frame
+  (setq ecb-create-layout-frame (ecb-create-layout-make-frame))
+  (raise-frame ecb-create-layout-frame)
+  (select-frame ecb-create-layout-frame)
+  (ad-enable-advice 'delete-frame 'before 'ecb-create-layout)
+  (ad-enable-advice 'delete-frame 'after 'ecb-create-layout)
+  (ad-activate 'delete-frame)
+
+  ;; global map
+  (setq ecb-create-layout-old-global-map (current-global-map))
+  (use-global-map ecb-create-layout-mode-map)
+
+  ;; minor-modes map
+  (setq ecb-create-layout-old-minor-mode-map-alist minor-mode-map-alist)
+  (setq minor-mode-map-alist nil)
+
+  ;; horiz. scrolling
+  (unless ecb-running-xemacs
+    (setq ecb-create-layout-old-hscroll automatic-hscrolling)
+    (setq automatic-hscrolling nil))
+
+  ;; for XEmacs modeline- and vertical-divider maps
+  (when ecb-running-xemacs
+    (setq ecb-create-layout-old-vertical-div-map vertical-divider-map)
+    (setq vertical-divider-map nil)
+    (setq ecb-create-layout-old-modeline-map modeline-map)
+    (setq modeline-map nil))
+
+  ;; debug on error
+  (setq ecb-create-layout-old-debug-on-error debug-on-error)
+  (setq debug-on-error nil)
+
+  (ecb-create-layout-init-layout t))
+
+
+(defun ecb-delete-new-layout ()
+  "Select a layout-name and delete this layout.
+This means the layout-definition is removed from the file
+`ecb-create-layout-file' and the layout-function and associated aliases are
+unbound."
+  (interactive)
+  ;; ensure we have load all layouts defined until now
+  (ecb-load-layouts)
+  (let ((new-layout-list
+         (sort (ecb-set-difference (ecb-available-layouts-of-type nil)
+                                   (mapcar (function (lambda (elem)
+                                                       (car elem)))
+                                           ecb-buildin-layouts)
+                                   'member)
+               'ecb-string<))
+        (layout-name nil))
+    (if (= (length new-layout-list) 0)
+        (ecb-error "There are no layouts to delete!")
+      (setq layout-name (ecb-choose-layout-name new-layout-list t)))
+    (with-temp-file (expand-file-name ecb-create-layout-file)
+      (erase-buffer)
+      (if (file-readable-p (expand-file-name ecb-create-layout-file))
+          (insert-file-contents (expand-file-name ecb-create-layout-file))
+        (ecb-error "This layout is not defined in %s!" ecb-create-layout-file))
+      (goto-char (point-min))
+      (if (re-search-forward (concat "^(ecb-layout-define +"
+                                     "\"" layout-name "\".+$")
+                             nil t)
+          (progn
+            ;; Deleting the layout definition in the file
+            ;; `ecb-create-layout-file'.
+            (beginning-of-line)
+            (delete-region (match-beginning 0)
+                           (progn
+                             (forward-sexp)
+                             (point)))
+            (kill-line)
+            ;; undefining the function and aliases.
+            (ecb-layout-undefine layout-name))
+        (ecb-error "This layout is not defined in %s!" ecb-create-layout-file)))))
+
+(defun ecb-create-layout-debug ()
+  "Debugging command for the ECB-developers."
+  (interactive)
+  (message "Layout-Debug: Type: %s, Factor: %s"
+           (ecb-create-layout-buffer-type)
+           (ecb-create-layout-buffer-factor)))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Cause of the magic autostart stuff of
+;; the advice-package we must disable at load-time all these advices!!
+;; Otherwise would just loading ecb (not activating!) activate each advice
+;; AFTER the FIRST usage of our advices!!
+(ad-disable-advice 'delete-frame 'after 'ecb-create-layout)
+(ad-disable-advice 'delete-frame 'before 'ecb-create-layout)
+(ad-activate 'delete-frame)
+
+
+(silentcomp-provide 'ecb-create-layout)
+
+;; ecb-help.el ends here
diff --git a/site/ecb-2.40/ecb-cycle.el b/site/ecb-2.40/ecb-cycle.el
new file mode 100644
index 0000000..aef01e4
--- /dev/null
+++ b/site/ecb-2.40/ecb-cycle.el
@@ -0,0 +1,137 @@
+;;; ecb-cycle.el --- cycle buffers through ecb windows.
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-cycle.el,v 1.30 2009/04/15 14:22:35 berndl Exp $
+
+;;; Commentary:
+
+;; NOTE: If you enjoy this software, please consider a donation to the EFF
+;; (http://www.eff.org)
+
+;;; History:
+
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; TODO:
+;;
+;; - What is the pattern we should use for cycling through other windows?
+;;
+;;   - ecb-cycle-through-X-buffers (select the next X buffer)
+;;   - ecb-cycle-switch-to-X-buffer (set the X buffer using completion)
+;;
+;; - How do we setup the menubar?
+;;
+;;          - ECB
+;;                Cycle
+;;                     - Forward Compilation Buffer
+;;                     - Set Compilation Buffer
+;;
+;; - What do we use for key bindings?
+;;
+;; - We need an easier way to setup completion and a better way to get the
+;;   index.
+;;
+;; - If possible, try to put fit the buffer so that the end of buffer is at the
+;; end of the window... if necessary.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-compilation)
+(require 'ecb-layout)
+
+(defgroup ecb-cycle nil
+  "Setting for cycling through misc ECB buffers."
+  :group 'ecb
+  :prefix "ecb-cycle-")
+
+
+(defun ecb-cycle-through-compilation-buffers(&optional choose-buffer)
+  "Cycle through all compilation buffers currently open.
+The choosen compilation buffer is displayed within the compilation window
+`ecb-compile-window' \(if this window doesn't exist then an error is
+displayed). If the currently opened buffer within the compilation window is
+not a compilation buffer, we jump to the first compilation buffer. If not we
+try to loop through all compilation buffers. If we hit the end we go back to
+the beginning.
+
+If CHOOSE-BUFFER is not nil then the user will be prompted for the
+compilation-buffer to switch to.
+
+Afterwards always the compile-window of ECB is selected."
+
+  (interactive "P")
+  (if (not (numberp ecb-compile-window-height))
+      (ecb-error "This command needs a persistent compile window!")
+    (if choose-buffer
+        (switch-to-buffer (completing-read "ECB compilation buffer: "
+                                           (ecb-compilation-get-buffers)))
+      
+      (let* ((compilation-buffers (ecb-compilation-get-buffers))
+             ;; This works even if ecb-compile-window is nil or not alive
+             ;; (means temporally hidden) --> then current-buffer is the
+             ;; buffer of the currently selected window!
+             (current-buffer (or (and (ecb-compile-window-live-p)
+                                      (window-buffer ecb-compile-window))
+                                 (current-buffer)))
+             (current-buffer-name (buffer-name current-buffer))
+             (current nil)
+             (index nil))
+        (when (null compilation-buffers)
+          (ecb-error "No compilation buffers available."))
+        
+        (if (not (ecb-compilation-buffer-p current-buffer))
+            ;;if the current buffer is not a compilation buffer, goto the first
+            ;;compilation buffer.
+            
+            (ecb-cycle-set-compilation-buffer 0 compilation-buffers)
+          
+          ;;else... we need to determine what buffer to display.
+          
+          (setq current (assoc current-buffer-name compilation-buffers))
+          
+          (setq index (cdr current))
+          
+          (if (= (1+ index) (length compilation-buffers))
+              ;;go back to the first buffer.
+              (ecb-cycle-set-compilation-buffer 0 compilation-buffers)
+            (ecb-cycle-set-compilation-buffer (1+ index)
+                                              compilation-buffers)))))))
+  
+
+(defun ecb-cycle-set-compilation-buffer(index compilation-buffers)
+  "Set the buffer in the compilation window."
+
+  (let ((buffer-name (car (nth index compilation-buffers))))
+    (switch-to-buffer buffer-name)))
+
+
+(silentcomp-provide 'ecb-cycle)
+
+;;; ecb-cycle.el ends here
diff --git a/site/ecb-2.40/ecb-eshell.el b/site/ecb-2.40/ecb-eshell.el
new file mode 100644
index 0000000..7e154f8
--- /dev/null
+++ b/site/ecb-2.40/ecb-eshell.el
@@ -0,0 +1,397 @@
+;;; ecb-eshell.el --- eshell integration for the ECB.
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-eshell.el,v 1.85 2009/05/08 14:05:55 berndl Exp $
+
+;;; Commentary:
+
+;; This package provides eshell integration for the ECB.  This basically allows
+;; you to jump to the eshell in the compilation window, sync up the current
+;; eshell with the current ECB buffer and run commands without getting in the
+;; way.
+;;
+;; It provides the following features:
+;;
+;; - ability to jump to the eshell buffer within the compilation window ( C-.e )
+;;   If the eshell isn't running it will be started
+;;
+;; - expands the compilation window when you run commands.  So for example it
+;;   allows you to view the eshell in minimized mode and then when you run 'ls'
+;;   the window automatically expands.
+;;
+;; - Synchronizes the current directory of the eshell with the current buffer
+;;   of the either the edit-window or the ecb-windows.
+;;
+;; - Provides smart window layout of the eshell buffer.  This makes sure that
+;;   the eshell is taking up the exact amount of space and that nothing is
+;;   hidden.
+;; 
+;; The goal is to make it easy to jump to a command prompt to run OS level
+;; commands.  
+;; 
+;; If you enjoy this software, please consider a donation to the EFF
+;; (http://www.eff.org)
+
+;;; History:
+
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Design:
+;;
+;; Syncing the current buffer with the eshell is done two ways.  If the buffer
+;; is visible in a window, we always resync.  If it is not visible then
+;; ecb-eshell-goto-eshell will sync up when the user goes to the eshell
+;; buffer.
+;;
+;; Integrating of eshell is mostly done by advicing the command `eshell' which
+;; uses the mechanism of the display-buffer (adviced version).
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-compilation)
+(require 'ecb-common-browser)
+
+(silentcomp-defvar eshell-buffer-name)
+(silentcomp-defun eshell)
+(silentcomp-defun eshell/cd)
+(silentcomp-defun eshell-send-input)
+(silentcomp-defun eshell-bol)
+
+(defgroup ecb-eshell nil
+  "Settings for eshell integration within the ECB."
+  :group 'ecb
+  :prefix "ecb-eshell-")
+
+(defcustom ecb-eshell-enlarge-when-eshell t
+  "*Enlarge the compile-window if it is selected by `eshell'.
+This takes only effect if the command `eshell' is called!"
+  :group 'ecb-eshell
+  :type 'boolean)
+
+(defcustom ecb-eshell-fit-window-to-command-output t
+  "*Fit the compile-window after an eshell-command to the output.
+This is done by the function `ecb-eshell-fit-window-to-output' which is added
+to `eshell-post-command-hook' ie. which is running autom. after each
+eshell-command."
+  :group 'ecb-eshell
+  :type 'boolean)
+
+(defcustom ecb-eshell-auto-activate nil
+  "*Startup the eshell and display it in the compile-window.
+If current layout does not display a compile-window \(see
+`ecb-compile-window-height') then nothing is done."
+  :group 'ecb-eshell
+  :type 'boolean)
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: was ecb-eshell-synchronize -->
+;; rename in texi and also to ecb-upgrade (also with value-upgrade!)
+(defcustom ecb-eshell-buffer-sync 'basic
+  "*Synchronize eshell with the default-directory of current source-buffer.
+
+This option takes only effect if a permanant compile-window is used in the
+current layout.
+
+If 'always then the synchronization takes place always a buffer
+changes in the edit window and if after this the
+default-directory of the new edit-buffer is different from the
+default-directory of the current eshell-buffer. If value is nil
+then never a synchronization will take place. If a list of
+major-modes then only if the `major-mode' of the new buffer
+belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'."
+  :group 'ecb-eshell
+  :type '(radio :tag "Synchronize the eshell if in compile-window."
+                (const :tag "Use basic value" :value basic)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+    
+
+(defcustom ecb-eshell-buffer-sync-delay 'basic
+  "*Time Emacs must be idle before the eshell-buffer of ECB is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'."
+  :group 'ecb-eshell
+  :type '(radio (const :tag "Use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-analyse-buffer-sync))))
+  :initialize 'custom-initialize-default)
+  
+
+
+(defvar ecb-eshell-pre-command-point nil
+  "Point in the buffer we are at before we executed a command.")
+
+(defvar ecb-eshell-buffer-list nil
+  "List of eshell-buffers created until now.
+Background: `eshell' creates new eshell-buffers with `generate-new-buffer' if
+called with an prefix arg!")
+
+
+(defecb-advice-set ecb-eshell-adviced-functions
+  "These functions of eshell are adviced if ehsell is active during ECB is
+active.")
+
+(defecb-advice eshell around ecb-eshell-adviced-functions
+  "Ensure that ehsell is running in the ECB-compile-window if any."
+  ;; we tell ECB to handle the eshell-buffers as compilation-buffers so they
+  ;; will be displayed in the compile-window (if any). We must add this as
+  ;; regexp because ehsell can open new eshell-buffers with a name created by
+  ;; generate-new-buffer-name! This approach is not completely save because if
+  ;; a users changes `eshell-buffer-name' during acivated ECB we get not
+  ;; informed about this and maybe we can handle the new buffer-name of eshell
+  ;; not as compilation-buffer. But we have no other chance: Adding the return
+  ;; value of `eshell' in the advice to `ecb-compilation-buffer-names-internal'
+  ;; does not help because `eshell' uses the new buffer-name already for
+  ;; `pop-to-buffer'. So an after advice would add the new buffer-name to late
+  ;; and a before-advice does not know the new-buffer name. The only way would
+  ;; be to reimplement the whole `eshell'-code in an around advice but this is
+  ;; not related to the benefit. IMO is it very improbably that a user changes
+  ;; `eshell-buffer-name' at all...
+  (let ((new-elem (cons (concat ".*"
+                                (regexp-quote eshell-buffer-name)
+                                ".*")
+                        t)))
+    (if ecb-compile-window-height
+        (progn
+          (add-to-list 'ecb-compilation-buffer-names-internal new-elem)
+          (add-to-list 'ecb-compilation-major-modes-internal 'eshell-mode))
+      ;; if we have no persistent compile-window we do not handle eshell autom.
+      ;; as compilation-buffer. If the user wants this then he has to modify
+      ;; `ecb-compilation-buffer-names' and/or `ecb-compilation-major-modes'.
+      ;; Therefore we remove the new-elem here from the internal lists.
+      (setq ecb-compilation-buffer-names-internal
+            (delete new-elem ecb-compilation-buffer-names-internal))
+      (setq ecb-compilation-major-modes-internal
+            (delete 'eshell-mode ecb-compilation-major-modes-internal))))
+  
+  ;; maybe we have to auto toggle our compile-window if temporally hidden
+  (when (equal 'hidden (ecb-compile-window-state))
+    (ecb-layout-debug-error "eshell around-advice: comp-win will be toggled.")
+    (ecb-toggle-compile-window 1))
+
+  (ecb-activate-ecb-autocontrol-function ecb-eshell-buffer-sync-delay
+                                         'ecb-eshell-buffer-sync)
+  ;; some hooks
+  (add-hook 'eshell-post-command-hook 'ecb-eshell-recenter)
+  (add-hook 'eshell-post-command-hook 'ecb-eshell-fit-window-to-output)
+  (add-hook 'eshell-pre-command-hook 'ecb-eshell-precommand-hook)
+  (add-hook 'window-size-change-functions 'ecb-eshell-window-size-change)
+
+  ;; run `eshell' --------------------------------------------
+  (ecb-eshell-save-buffer-history
+   ad-do-it)
+  ;; ---------------------------------------------------------
+
+  ;; some post processing
+
+  ;; add the buffer of the buffer used/created by `eshell' to
+  ;; `ecb-eshell-buffer-list'
+  (add-to-list 'ecb-eshell-buffer-list ad-return-value)
+
+  (when ecb-eshell-enlarge-when-eshell
+    (ecb-toggle-compile-window-height 1))
+
+  ;;always recenter because if the point is at the top of the eshell buffer
+  ;;and we switch to it the user is not going to be able to type a command
+  ;;right away.
+  (ecb-eshell-recenter)  
+  
+  ;;sync to the current buffer
+  (ecb-eshell-buffer-sync))
+  
+  
+
+(defun ecb-eshell-activate-integration ()
+  "Does all necessary to activate the eshell-integration. But this doesn not
+load or activate eshell - it just prepares ECB to work perfectly with eshell."
+  (ecb-enable-advices 'ecb-eshell-adviced-functions))
+
+(defun ecb-eshell-deactivate-integration ()
+  (ecb-disable-advices 'ecb-eshell-adviced-functions)
+  (ecb-stop-autocontrol/sync-function 'ecb-eshell-buffer-sync)
+  (remove-hook 'eshell-post-command-hook 'ecb-eshell-recenter)
+  (remove-hook 'eshell-post-command-hook 'ecb-eshell-fit-window-to-output)
+  (remove-hook 'eshell-pre-command-hook 'ecb-eshell-precommand-hook)
+  (remove-hook 'window-size-change-functions 'ecb-eshell-window-size-change))
+
+(defecb-autocontrol/sync-function ecb-eshell-buffer-sync nil ecb-eshell-buffer-sync t
+  "Synchronize the eshell with the directory of current source-buffer.
+This is only done if the eshell is currently visible in the compile-window of
+ECB and if either this function is called interactively or
+`ecb-eshell-buffer-sync' is not nil."
+  (when (and (equal (selected-frame) ecb-frame)
+             (ecb-compile-window-live-p)
+             (ecb-point-in-edit-window-number))
+    (let* ((my-eshell-buffer
+            ;; nil or a living eshell-buffer in the ecb-compile-window
+            (car (member (window-buffer ecb-compile-window)
+                         ecb-eshell-buffer-list)))
+           (my-reference-directory default-directory)
+           (my-eshell-directory (and (bufferp my-eshell-buffer)
+                                     (save-excursion
+                                       (set-buffer my-eshell-buffer)
+                                       default-directory))))
+      (when (and (bufferp my-eshell-buffer)
+                 (stringp my-reference-directory)
+                 (stringp my-eshell-directory)
+                 (not (ecb-string= (ecb-fix-filename my-reference-directory)
+                                   (ecb-fix-filename my-eshell-directory))))
+        (ecb-eshell-save-buffer-history
+         (save-excursion
+           (set-buffer my-eshell-buffer)
+           ;; make sure we have a clean eshell-command-line
+           (goto-char (point-max))
+           (eshell-bol)
+           (delete-region (point) (point-at-eol))
+           ;;change the directory without showing the cd command
+           (eshell/cd my-reference-directory))
+           
+         ;;execute the command
+         (save-selected-window
+           (select-window ecb-compile-window)
+           (eshell-send-input)))
+        
+        (ecb-eshell-recenter)
+        
+        ;; we need to make sure that that the eshell buffer isn't at the
+        ;; top of the buffer history list just because we implicitly
+        ;; changed its directory and switched to it. It might not be a
+        ;; good idea in the long term to put it all the way at the end of
+        ;; the history list but it is better than leaving it at the top.
+        (bury-buffer eshell-buffer-name)))))
+
+(defmacro ecb-eshell-save-buffer-history (&rest body)
+  "Protect the buffer-list so that the eshell buffer name is not placed early
+in the buffer list or at all if it currently doesn't exist."
+  (let ((eshell-buffer-list (make-symbol "my-buffer-list")))
+    `(let ((,eshell-buffer-list (ecb-frame-parameter (selected-frame)
+                                                     'buffer-list)))
+       (unwind-protect
+           (progn
+             ,@body)
+         (modify-frame-parameters nil (list (cons 'buffer-list
+                                                  ,eshell-buffer-list)))))))
+
+(defun ecb-eshell-recenter(&optional display-errors)
+  "Recenter the eshell window so that the prompt is at the buffer-end."
+  (interactive (list t))
+
+  (if (and (equal (selected-frame) ecb-frame)
+           (ecb-compile-window-live-p)
+           ;; the buffer in the ecb-compile-window is a living eshell-buffer
+           (member (window-buffer ecb-compile-window)
+                   ecb-eshell-buffer-list))
+      (save-selected-window
+        (select-window ecb-compile-window)
+        (goto-char (point-max))
+        (recenter -2))
+    (when display-errors
+      (ecb-error "Eshell not running or compile-window not visible!"))))
+
+(defun ecb-eshell-precommand-hook ()
+  ;;use the eshell-pre-command-hook to set the point.
+  (setq ecb-eshell-pre-command-point (point)))
+
+
+(defun ecb-eshell-fit-window-to-output()
+  "Fit window of eshell to the output of last command. This function is added
+to `eshell-post-command-hook' and only called there. This function tries to
+fit the height of the compile-window best to the last command-output. The
+algorithm fit the window to the height of the last command-output but do not
+enlarge the compile-window over half of the frame-height and also not below
+`ecb-compile-window-height' (in lines)."
+  (when (and (equal (selected-frame) ecb-frame)
+             (ecb-compile-window-live-p)
+             ;; the buffer in the ecb-compile-window is a living eshell-buffer
+             (member (window-buffer ecb-compile-window)
+                     ecb-eshell-buffer-list))
+
+    ;; fit the window to the height of the last command-output but do not
+    ;; enlarge the compile-window over half of the frame-height and also not
+    ;; below `ecb-compile-window-height' (in lines).
+    (when (and ecb-eshell-fit-window-to-command-output
+               (integer-or-marker-p ecb-eshell-pre-command-point))
+      (let* ((compile-window-height-lines
+              (ecb-normalize-number ecb-compile-window-height
+                                    (1- (frame-height))))
+             (ecb-enlarged-compilation-window-max-height
+              (max (min (save-excursion
+                          (set-buffer (window-buffer ecb-compile-window))
+                          ;; we want to see the old command line too and 2
+                          ;; must be added because we have a modeline and one
+                          ;; empty line cause of the (recenter -2) in
+                          ;; `ecb-eshell-recenter'. For XEmacs it would be
+                          ;; better to check if a horiz. scrollbar is used.
+                          ;; This causes the one line more we need for XEmacs
+                          (+ (if ecb-running-xemacs 4 3)
+                             (count-lines ecb-eshell-pre-command-point
+                                          (point))))
+                        (/ (1- (frame-height)) 2))
+                   compile-window-height-lines)))
+        (ecb-toggle-compile-window-height 1)
+        (ecb-eshell-recenter))
+        
+      ;;reset
+      (setq ecb-eshell-pre-command-point nil))))
+
+
+(defun ecb-eshell-auto-activate-hook()
+  "Activate the eshell when ECB is activated. See `ecb-eshell-auto-activate'."
+  (when ecb-eshell-auto-activate
+    (ignore-errors (eshell))))
+
+(defun ecb-eshell-window-size-change(frame)
+  "Called when we change window sizes so that the eshell can resize."
+  (when (and ecb-minor-mode
+             (equal frame ecb-frame))
+    (ignore-errors (ecb-eshell-recenter))))
+
+(add-hook 'ecb-activate-hook 'ecb-eshell-auto-activate-hook)
+
+(silentcomp-provide 'ecb-eshell)
+
+;;; ecb-eshell.el ends here
diff --git a/site/ecb-2.40/ecb-examples.el b/site/ecb-2.40/ecb-examples.el
new file mode 100644
index 0000000..1bedd74
--- /dev/null
+++ b/site/ecb-2.40/ecb-examples.el
@@ -0,0 +1,560 @@
+;;; ecb-examples.el --- examples for using ECB with Elisp
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-examples.el,v 1.26 2009/05/08 14:05:55 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains the code for some examples mentioned in the online-help.
+;; This is a full working layout-example to demonstrate how to program
+;; complete new special windows/buffers, add them to a layout and synchronize
+;; it with the edit-window of ECB.
+;;
+;; To test this example just do:
+;; 1. Start ECB 
+;; 2. Load ecb-examples.el into (X)Emacs: (require 'ecb-examples)
+;; 3. Call `ecb-show-layout-help' and insert "example-layout1" as layout name
+;;    to see the outline of the test layout and get information about the
+;;    special windows of this layout.
+;; 4. Call `ecb-examples-activate'.
+;; 5. Play around with the new layout and test it.
+;; 6. Call `ecb-examples-deactivate'.
+;;
+;; The intention of this example is to be a skeleton and pattern for other
+;; packages which want to use the layout-engine of ECB do display their own
+;; information. For example graphical debuggers (like JDEbug of JDEE) could be
+;; made this way.
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+
+;;; Code
+
+;; ---------------------------------------------------------------------------
+;; --- Some requirements we always need if using the ECB layout-engine -------
+;; ---------------------------------------------------------------------------
+
+(require 'ecb-util)
+(require 'ecb-layout)
+(require 'ecb-common-browser)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+;; ---------------------------------------------------------------------------
+;; --- Code for the bufferinfo buffer ----------------------------------------
+;; ---------------------------------------------------------------------------
+
+;; Normally we should have some options the user can customize
+
+;; Lets define an own customize-group
+(defgroup ecb-examples nil
+  "Settings for the bufferinfo example in the Emacs code browser."
+  :group 'ecb-examples-bufferinfo
+  :prefix "ecb-")
+
+;; The following three options are typical for a special ECB-buffer which
+;; should be synchronized with current buffer in the edit-area.
+
+;; The :type of the first two options is essential and MUST NOT be defined
+;; different, because the macro `defecb-autocontrol/sync-function' and the
+;; function `ecb-activate-ecb-autocontrol-function' expects exactly this
+;; option-type!
+
+;; An own hook running after synchronizing is not essential but mostly useful
+;; for users who wants to do some own stuff.
+
+(defcustom ecb-examples-bufferinfo-buffer-sync 'basic
+  "*Synchronize the bufferinfo buffer automatically with current edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-bufferinfo-buffer-sync-hook' is evaluated."
+  :group 'ecb-examples-bufferinfo
+  :type '(radio :tag "Synchronize ECBs example bufferino buffer"
+                (const :tag "use basic value" :value basic)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+
+(defcustom ecb-examples-bufferinfo-buffer-sync-delay 'basic
+  "*Time Emacs must be idle before the bufferinfo-buffer is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'"
+  :group 'ecb-analyse
+  :type '(radio (const :tag "use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            (featurep 'ecb-examples)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-examples-bufferinfo-buffer-sync))))
+  :initialize 'custom-initialize-default)
+
+(defcustom ecb-examples-bufferinfo-buffer-sync-hook nil
+  "Hook run at the end of `ecb-examples-bufferinfo-buffer-sync'.
+See documentation of `ecb-examples-bufferinfo-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+- Current buffer is the buffer of the currently selected
+  edit-window.
+- The bufferinfo-buffer is displayed in a visible window of the
+  ecb-frame \(so no check for visibilty of the bufferinfo-buffer in
+  the ecb-frame is necessary in a hook function)
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option
+`ecb-examples-bufferinfo-buffer-sync' is not nil the function
+`ecb-examples-bufferinfo-buffer-sync' is running either every
+time Emacs is idle or even after every command \(see
+`ecb-examples-bufferinfo-buffer-sync-delay'). So if the
+bufferinfo-buffer is displayed in a window of the ecb-frame \(see
+preconditions above) these hooks can be really called very often!
+Therefore each function of this hook should/must check in an
+efficient way at beginning if its task have to be really
+performed and then do them only if really necessary! Otherwise
+performance of Emacs could slow down dramatically!"
+  :group 'ecb-analyse
+  :type 'hook)
+
+;; --------------- internals for bufferinfo-buffer -------------------
+
+
+(defconst ecb-examples-bufferinfo-buffer-name " *ECB buffer info*")
+(defvar ecb-examples-bufferinfo-last-file-buffer nil)
+
+;; Two helper functions for displaying infos in a special buffer
+
+(defun ecb-examples-print-file-attributes (buffer filename)
+  "Insert in buffer BUFFER some file-information about FILENAME."
+  (ecb-with-readonly-buffer buffer
+    (erase-buffer)
+    (insert (format "Bufferinfo for %s:\n\n" filename))
+    (let* ((attributes (file-attributes filename))
+           (type (format "Type: %s\n" (cond ((null (nth 0 attributes))
+                                             "File")
+                                            ((equal (nth 0 attributes) t)
+                                             "Directory")
+                                            ((stringp (nth 0 attributes))
+                                             (concat "Link to "
+                                                     (nth 0 attributes))))))
+           (size (format "Size: %d\n" (nth 7 attributes)))
+           (modes (format "Modes: %s\n" (nth 8 attributes))))
+      (insert type size modes))))
+
+
+(defun ecb-examples-print-non-filebuffer (buffer buffer-name)
+  "Insert in buffer BUFFER a small message for buffer with name BUFFER-NAME."
+  (ecb-with-readonly-buffer buffer
+    (erase-buffer)
+    (insert (format "Bufferinfo for buffer %s\n\n" buffer-name))
+    (insert "This is a not a filebuffer, so there are no\n")
+    (insert "informations available.")))
+
+;; IMPORTANT: The main synchronizing function must be defined with the macro
+;; `defecb-autocontrol/sync-function'!
+
+(defecb-autocontrol/sync-function ecb-examples-bufferinfo-buffer-sync
+    ecb-examples-bufferinfo-buffer-name ecb-examples-bufferinfo-buffer-sync t
+  "Synchronizes the buffer-info buffer with current source if changed.
+Can be called interactively but normally this should not be necessary because
+it will be called autom. by the internal synchronizing mechanism of ECB."
+
+  ;; The macro `defecb-autocontrol/sync-function' does a lot for our
+  ;; conveniance:
+  
+  ;; 1) here we can be sure that the buffer with name
+  ;; `ecb-examples-bufferinfo-buffer-name' is displayed in a window of
+  ;; `ecb-frame' because the macro `defecb-autocontrol/sync-function'
+  ;; encapsulates automatically the following code within
+  ;; `ecb-do-if-buffer-visible-in-ecb-frame' and this macro binds locally the
+  ;; variables visible-buffer and visible-window: visible-window:=
+  ;; (get-buffer-window ecb-examples-bufferinfo-buffer-name) visible-buffer:=
+  ;; (get-buffer ecb-examples-bufferinfo-buffer-name)
+
+  ;; 2) The macro `defecb-autocontrol/sync-function' automatically takes care of
+  ;; the setting of option `ecb-examples-bufferinfo-buffer-sync' and runs the
+  ;; following code only when the related conditions are true
+
+  ;; 3) The generated function has one optional argument FORCE which can be used
+  ;; in the code below.
+  
+  ;; 4) The macro `defecb-autocontrol/sync-function' makes this synchronizing
+  ;; function interactive
+
+  ;; For details please read the documentation of
+  ;; `defecb-autocontrol/sync-function'!
+
+  ;; synchronize only when point stays in one of the edit-window.
+  (when (ecb-point-in-edit-window-number)
+
+    ;; we need the file-name of indirect-buffers too (if the base-buffer is a
+    ;; file-buffer), therefore we use `ecb-buffer-file-name' (see the docstring
+    ;; of this function)
+    (let ((filename (ecb-buffer-file-name (current-buffer))))
+    
+      (if (and filename (ecb-buffer-or-file-readable-p filename))
+
+          ;; synchronizing for real filesource-buffers or indirect buffers of
+          ;; real file buffers
+
+            ;; Let us be smart: We synchronize only if sourcebuffer has changed
+            ;; or if the argument FORCE is not nil
+            (when (or force
+                      (not (equal (current-buffer)
+                                  ecb-examples-bufferinfo-last-file-buffer)))
+              ;; set new last-file-buffer so we can check next time if changed
+              (setq ecb-examples-bufferinfo-last-file-buffer (current-buffer))
+              ;; we display the file-infos for current source-buffer
+              (ecb-examples-print-file-attributes visible-buffer filename))
+        
+        ;; what should we do for non file buffers like help-buffers etc...
+        (setq ecb-examples-bufferinfo-last-file-buffer nil)
+        (ecb-examples-print-non-filebuffer visible-buffer
+                                           (buffer-name (current-buffer)))))
+
+    ;; Now lets run the hooks in `ecb-examples-bufferinfo-buffer-sync-hook'
+    (run-hooks 'ecb-examples-bufferinfo-buffer-sync-hook)))
+
+
+;; Two conveniance-commands for the user
+
+(defun ecb-maximize-bufferinfo-window ()
+  "Maximize the bufferinfo-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works
+also if the ECB-analyse-window is not visible in current layout."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-examples-bufferinfo-buffer-name t))
+
+(defun ecb-goto-bufferinfo-window ()
+  "Make the bufferinfo-window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-examples-bufferinfo-buffer-name))
+
+
+;; The "window-dedicator"-function for the bufferinfo-buffer. See
+;; `defecb-window-dedicator' for an explanation.
+
+(defecb-window-dedicator ecb-examples-set-bufferinfo-buffer
+    ecb-examples-bufferinfo-buffer-name
+  "Set the buffer in the current window to the bufferinfo-buffer and make this
+window dedicated for this buffer. Makes the buffer read-only."
+  ;; activating the synchronization of the bufferinfo-window:
+  ;; `ecb-activate-ecb-autocontrol-function' takes care of the possible
+  ;; settings in `ecb-examples-bufferinfo-buffer-sync-delay'. Therefore we do
+  ;; it here because then changes in ecb-examples-bufferinfo-buffer-sync-delay
+  ;; are taken into account each time the bufferinfo buffer is set in the
+  ;; layout (after each hiding/showing the ecb-window, each redrawing the
+  ;; layout deactivating/activating ECB)
+  (ecb-activate-ecb-autocontrol-function ecb-examples-bufferinfo-buffer-sync-delay
+                                         'ecb-examples-bufferinfo-buffer-sync)
+  
+  (switch-to-buffer (get-buffer-create ecb-examples-bufferinfo-buffer-name))
+  (setq buffer-read-only t))
+
+;; ---------------------------------------------------------------------------
+;; --- Code for the action buffer --------------------------------------------
+;; ---------------------------------------------------------------------------
+
+
+(defconst ecb-examples-action-buffer-name " *ECB action buffer*")
+(defvar ecb-examples-action-buffer-keymap nil)
+
+
+
+;; Two helper functions for creating a read-only buffer with a special local
+;; key-map.
+
+(defun ecb-examples-insert-text-in-action-buffer (text)
+  "Insert TEXT at point and make it highlight-able for mouse-movement over the
+text."
+  (let ((p (point)))
+    (insert text)
+    (put-text-property p (+ p (length text)) 'mouse-face 'highlight)))
+
+(defun ecb-examples-action-buffer-create ()
+  "Return the action-buffer with name `ecb-examples-action-buffer-name' If
+the buffer does not exist it will be created. The buffer is read only,
+contains two buttons \[prior] and \[next] and mouse-2 calls
+`ecb-examples-action-buffer-clicked'."
+  (save-excursion
+    (if (get-buffer ecb-examples-action-buffer-name)
+        (get-buffer ecb-examples-action-buffer-name)
+      (let ((nop (function (lambda() (interactive)))))
+        (set-buffer (get-buffer-create ecb-examples-action-buffer-name))
+
+        ;; we setup a local key-map
+        
+        (make-local-variable 'ecb-examples-action-buffer-keymap)
+        (setq ecb-examples-action-buffer-keymap (make-sparse-keymap))
+        
+        ;; define mouse-2 with `ecb-examples-action-buffer-clicked'
+        (define-key ecb-examples-action-buffer-keymap
+          (if ecb-running-xemacs '(button2) [down-mouse-2])
+          'ecb-examples-action-buffer-clicked)
+
+        ;; nop operations for the other mouse-2 operations with Emacs
+        (define-key ecb-examples-action-buffer-keymap [mouse-2] nop)
+        (define-key ecb-examples-action-buffer-keymap [double-mouse-2] nop)
+        (define-key ecb-examples-action-buffer-keymap [triple-mouse-2] nop)
+        
+        (use-local-map ecb-examples-action-buffer-keymap)
+
+        ;; insert the action buttons [prior] and [next] and make it read-only
+
+        (ecb-with-readonly-buffer (current-buffer)
+         (erase-buffer)
+         (ecb-examples-insert-text-in-action-buffer "[prior]")
+         (insert "\n")
+         (ecb-examples-insert-text-in-action-buffer "[next]")
+         (insert "\n"))
+        
+        (current-buffer)))))
+
+
+
+;; The function which performs the actions in the action-buffer
+
+(defun ecb-examples-action-buffer-clicked (e)
+  "Perform the right action for the mouse-click.
+If the user clicks onto \[prior] the buffer in the edit-window is scrolled up,
+if clicks onto \[next] the buffer in the edit-window is scrolled down.
+Otherwise nothing will be done."
+  (interactive "e")
+  (mouse-set-point e)
+  (let ((line (ecb-buffer-substring (ecb-line-beginning-pos) (ecb-line-end-pos))))
+    (save-match-data
+      (cond ((string-match "prior" line)
+             (ecb-select-edit-window)
+             (call-interactively 'scroll-down))
+            ((string-match "next" line)
+             (ecb-select-edit-window)
+             (call-interactively 'scroll-up))
+            (t nil)))))
+
+
+;; Two conveniance-commands for the user
+
+(defun ecb-maximize-action-window ()
+  "Maximize the action-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works
+also if the ECB-analyse-window is not visible in current layout."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-examples-action-buffer-name t))
+
+(defun ecb-goto-action-window ()
+  "Make the action-window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-examples-action-buffer-name))
+
+
+;; The "window-dedicator"-function for the action-buffer. See
+;; `defecb-window-dedicator' for an explanation.
+
+(defecb-window-dedicator ecb-examples-set-action-buffer
+    (buffer-name (ecb-examples-action-buffer-create))
+  "Set the buffer in the current window to the action-buffer and make this
+window dedicated for this buffer."
+  (switch-to-buffer (buffer-name (ecb-examples-action-buffer-create))))
+
+;; ---------------------------------------------------------------------------
+;; --- The layout definition with a bufferinfo- and a action-buffer -----------
+;; ---------------------------------------------------------------------------
+
+
+(ecb-layout-define "example-layout1" top
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |Bufferinfo for <filename>:            |[prior]       |
+   |Type: file                            |[next]        |
+   |Size: 23456                           |              |
+   |Modes: rw-rw-rw-                      |              |
+   |-----------------------------------------------------|
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                    Edit                             |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place.
+
+The top-left window always displays informations about the current buffer in
+the selected edit-window. This window demonstrates how autom. synchronizing
+a special window/buffer of a layout with current edit-window.
+
+The top-right window offers two buttons which can be used with the middle
+mouse-button to scroll the edit-window. This is not very senseful but it
+demonstrates how to drive the edit-window with actions performed in a special
+window/buffer of a layout."
+
+  ;; dedicating the bufferinfo window to the bufferinfo-buffer
+  (ecb-examples-set-bufferinfo-buffer)
+  
+  ;; creating the action-window
+  (ecb-split-hor 0.75)
+  
+  ;; dedicating the action window to the action-buffer
+  (ecb-examples-set-action-buffer)
+
+  ;; selecting the edit-window
+  (select-window (next-window)))
+
+
+;; ---------------------------------------------------------------------------
+;; --- (De)activating the new layout and the synchronization -----------------
+;; ---------------------------------------------------------------------------
+
+
+
+;; Code for saving and restoring the state before activation
+
+(defvar ecb-examples-preact-layout nil)
+(defvar ecb-examples-preact-windows-height nil)
+(defvar ecb-examples-preact-compile-window-height nil)
+(defun ecb-examples-preactivation-state(action)
+  (cond ((equal action 'save)
+         (setq ecb-examples-preact-layout
+               ecb-layout-name
+               ecb-examples-preact-windows-height
+               ecb-windows-height
+               ecb-examples-preact-compile-window-height
+               ecb-compile-window-height))
+        ((equal action 'restore)
+         (setq ecb-layout-name
+               ecb-examples-preact-layout
+               ecb-windows-height
+               ecb-examples-preact-windows-height
+               ecb-compile-window-height
+               ecb-examples-preact-compile-window-height))))
+
+
+
+;; Activation of the example. Because a set of new special windows integrated
+;; in a new layout is often just the GUI of a complete tool (like a graphical
+;; debugger) we demonstrate here the complete activation and deactivation of
+;; such a tool or at least of the tool-GUI. We decide that the GUI of our
+;; example tool needs a compile-window with height 5 lines and the height of
+;; the special windows "row" on top should be exactly 6 lines (normally width
+;; and height of the special windows should be a fraction of the frame, but
+;; here we use 6 lines; You can change the code below to use a frame-fraction
+;; of 0.2 instead of 6 hard lines, just try it!
+
+(defun ecb-examples-activate ()
+  "Activate the new layout \"example-layout1\".
+Set `ecb-compile-window-height' to 5 and `ecb-windows-height' to 6. The
+preactivation-state is saved and will be restored by
+`ecb-examples-deactivate'."
+  (interactive)
+
+  (assert (featurep 'ecb) nil
+          "ECB must be loaded!")
+  (assert ecb-minor-mode nil
+          "ECB must be activated!")
+  (assert (equal (selected-frame) ecb-frame) nil
+          "The ECB-frame must be selected!")
+  (assert (not (ecb-string= ecb-layout-name "example-layout1")) nil
+          "The examples-layout1 is already active!")
+  
+  ;; saving the state
+  (ecb-examples-preactivation-state 'save)
+
+  ;; switch to our prefered layout
+  (setq ecb-windows-height 6)
+  (setq ecb-compile-window-height 8)
+  (let ((ecb-change-layout-preserves-compwin-state nil))
+    ;; activating the synchronization of the bufferinfo-window is done in the
+    ;; dedicator-function (see `ecb-examples-set-bufferinfo-buffer' for the
+    ;; reason). So the synchronizing will be activated implicitly with the
+    ;; layout-switch because this redraws the layout and this calls all
+    ;; dedicator-functions.
+    (ecb-layout-switch "example-layout1")))
+
+
+;; Deactivation of the example
+
+(defun ecb-examples-deactivate ()
+  "Deactivate the new layout \"example-layout1\".
+Stops `ecb-examples-bufferinfo-buffer-sync' and restore the state
+as before activation."
+  (interactive)
+
+  (assert (featurep 'ecb) nil
+          "ECB must be loaded!")
+  (assert ecb-minor-mode nil
+          "ECB must be activated!")
+  (assert (equal (selected-frame) ecb-frame) nil
+          "The ECB-frame must be selected!")
+  (assert (ecb-string= ecb-layout-name "example-layout1") nil
+          "The example-layout1 is not active!")
+  
+  (ecb-stop-autocontrol/sync-function 'ecb-examples-bufferinfo-buffer-sync)
+  
+  (ecb-examples-preactivation-state 'restore)
+  
+  (ecb-layout-switch ecb-layout-name))
+  
+
+;; ---------------------------------------------------------------------------
+;; --- Providing the examples ------------------------------------------------
+;; ---------------------------------------------------------------------------
+
+(provide 'ecb-examples)
+
+;; ecb-examples.el ends here
diff --git a/site/ecb-2.40/ecb-face.el b/site/ecb-2.40/ecb-face.el
new file mode 100644
index 0000000..e007d54
--- /dev/null
+++ b/site/ecb-2.40/ecb-face.el
@@ -0,0 +1,688 @@
+;;; ecb-face.el --- all face-options of ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-face.el,v 1.25 2009/05/03 13:16:11 berndl Exp $
+
+;;; Commentary:
+
+;; This file contains all options with type 'face and all face-definitions of
+;; ECB.
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(silentcomp-defun set-face-parent)
+(silentcomp-defun make-face-bold)
+(silentcomp-defun make-face)
+(silentcomp-defun set-face-foreground)
+
+(defgroup ecb-face-options nil
+  "Settings for all faces used in ECB."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-faces nil
+  "Definitions of all ECB-faces"
+  :group 'ecb-face-options 
+  :group 'faces
+  :prefix "ecb-")
+
+(defmacro ecb-face-default (&optional height bold-p italic-p
+                                      inherit
+                                      fg-light-col fg-dark-col
+                                      bg-light-col bg-dark-col
+                                      fg-rest bg-rest
+                                      reverse-video-p)
+  "Macro for setting default values for an ECB face.
+The parameters are set for the following display-types:
+- ((class color) (background light)): HEIGHT, BOLD-P, ITALIC-P, INHERIT
+                                      FG-LIGHT-COL, BG-LIGHT-COL
+- ((class color) (background dark)): HEIGHT, BOLD-P, ITALIC-P, INHERIT
+                                     FG-DARK-COL, BG-DARK-COL
+- t: HEIGHT, BOLD-P, ITALIC-P, INHERIT, FG-REST, BG-REST, REVERSE-VIDEO."
+  `(list (list '((class color) (background light))
+               (append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
+                       (if ,bold-p (if (not ecb-running-xemacs)
+                                       (list :weight 'bold)
+                                     (list :bold t)))
+                       (if ,italic-p (if (not ecb-running-xemacs)
+                                         (list :slant 'italic)
+                                       (list :italic t)))
+                       (if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
+                       (if ,fg-light-col (list :foreground ,fg-light-col))
+                       (if ,bg-light-col (list :background ,bg-light-col))))
+         (list '((class color) (background dark))
+               (append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
+                       (if ,bold-p (if (not ecb-running-xemacs)
+                                       (list :weight 'bold)
+                                     (list :bold t)))
+                       (if ,italic-p (if (not ecb-running-xemacs)
+                                         (list :slant 'italic)
+                                       (list :italic t)))
+                       (if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
+                       (if ,fg-dark-col (list :foreground ,fg-dark-col))
+                       (if ,bg-dark-col (list :background ,bg-dark-col))))
+         (list 't (append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
+                          (if ,bold-p (if (not ecb-running-xemacs)
+                                          (list :weight 'bold)
+                                        (list :bold t)))
+                          (if ,italic-p (if (not ecb-running-xemacs)
+                                            (list :slant 'italic)
+                                          (list :italic t)))
+                          (if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
+                          (if ,fg-rest (list :foreground ,fg-rest))
+                          (if ,bg-rest (list :foreground ,bg-rest))
+                          (if ,reverse-video-p (list :reverse-video t))))))
+
+(defface ecb-default-general-face (ecb-face-default 1.0)
+  "*Basic face for all ECB tree-buffers.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc.
+
+In GNU Emacs 21.X all faces \(even the face 'ecb-default-highlight-face') used
+in the ECB tree-buffers inherit from this face. Therefore the default
+attributes like font etc. of a face used in a tree-buffer can be very easily
+changed with face 'ecb-default-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature but the options
+`ecb-directories-general-face', `ecb-sources-general-face',
+`ecb-methods-general-face' and `ecb-history-general-face' offer the choice to
+use the face 'ecb-default-general-face' so also with XEmacs and GNU Emacs 20.X
+the basic face-settings can be easily changed just by customizing the face
+'ecb-default-general-face'!"
+  :group 'ecb-faces)
+
+(defface ecb-tree-guide-line-face (ecb-face-default 1.0 nil nil
+                                                    'ecb-default-general-face
+                                                    "grey" "gray")
+  "*Face for the guide-lines in the tree-buffers."
+  :group 'ecb-faces)
+
+(defcustom ecb-tree-guide-line-face 'ecb-tree-guide-line-face
+  "*Face for the guide-lines in the tree-buffers."
+  :group 'ecb-face-options)
+
+(defface ecb-directories-general-face (ecb-face-default 1.0 nil nil
+                                                        'ecb-default-general-face)
+  "*Basic face for the ECB directories buffer.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc."
+  :group 'ecb-faces)
+
+(defcustom ecb-directories-general-face 'ecb-default-general-face
+  "*Basic face for the ECB directories buffer.
+This defines the basic face the whole directory buffer should displayed with.
+If the face 'ecb-default-general-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-general-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-directories
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-directories-general-face)))
+
+(defface ecb-sources-general-face (ecb-face-default 1.0 nil nil
+                                                    'ecb-default-general-face)
+  "*Basic face for the ECB sources buffer.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc."
+  :group 'ecb-faces)
+
+(defcustom ecb-sources-general-face 'ecb-default-general-face
+  "*Basic face for the ECB sources buffer.
+This defines the basic face the whole sources buffer should displayed with. If
+the face 'ecb-default-general-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-general-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-sources
+  :type 'face
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-sources-general-face)))
+
+(defface ecb-methods-general-face (ecb-face-default 1.0 nil nil
+                                                    'ecb-default-general-face)
+  "*Basic face for the ECB methods buffer.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc."
+  :group 'ecb-faces)
+
+(defcustom ecb-methods-general-face 'ecb-default-general-face
+  "*Basic face for the ECB methods buffer.
+This defines the basic face the whole methods buffer should displayed with. If
+the face 'ecb-default-general-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-general-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-methods
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-methods-general-face)))
+
+(defface ecb-history-general-face (ecb-face-default 1.0 nil nil
+                                                    'ecb-default-general-face)
+  "*Basic face for the ECB history buffer.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc."
+  :group 'ecb-faces)
+
+(defcustom ecb-history-general-face 'ecb-default-general-face
+  "*Basic face for the ECB history buffer.
+This defines the basic face the whole history buffer should displayed with. If
+the face 'ecb-default-general-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-general-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-history
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-history-general-face)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: add the following three faces
+;; incl. their options to the texi
+(defface ecb-history-bucket-node-face (ecb-face-default nil nil nil
+                                                        'ecb-bucket-node-face)
+  "*Face used for displaying a bucket-node in the ECB-history-buffer.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-bucket-node-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-history-buffer should be displayed with the same basic
+attributes set by 'ecb-bucket-node-face' this set of basic attributes have
+to be set in 'ecb-history-bucket-node-face' too!"
+  :group 'ecb-faces)
+
+(defcustom ecb-history-bucket-node-face 'ecb-history-bucket-node-face
+  "*Basic face for displaying a bucket-node in the ECB-history-buffer.
+This defines the basic face for the bucket-nodes used to bucketize the
+history-entries as defined with the option `ecb-history-make-buckets'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-history
+  :type '(radio (const :tag "Use ecb-bucket-node-face"
+                       :value ecb-bucket-node-face)
+                (face :tag "Special face"
+                      :value ecb-history-bucket-node-face)))
+
+(defface ecb-history-indirect-buffer-face (ecb-face-default nil nil t
+                                                            'ecb-history-general-face)
+  "*Define a face for displaying indirect buffers in the history buffer.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-history-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-history-buffer should be displayed with the same basic
+attributes set by 'ecb-history-general-face' this set of basic attributes have
+to be set in 'ecb-history-indirect-buffer-face' too!"
+  :group 'ecb-faces)
+ 
+(defcustom ecb-history-indirect-buffer-face 'ecb-history-indirect-buffer-face
+  "*Face for indirect buffers in the history buffer."
+  :group 'ecb-history
+  :group 'ecb-face-options
+  :type '(radio (const :tag "Use ecb-history-general-face"
+                       :value ecb-history-general-face)
+                (face :tag "Special face"
+                      :value ecb-history-indirect-buffer-face)))
+
+(defface ecb-history-dead-buffer-face (ecb-face-default nil nil nil
+                                                        'ecb-history-general-face
+                                                        "gray60"
+                                                        "gray60"
+                                                        nil nil
+                                                        nil "gray60")
+  "*Define a face for history entries pointing to dead buffers.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-history-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-history-buffer should be displayed with the same basic
+attributes set by 'ecb-history-general-face' this set of basic attributes have
+to be set in 'ecb-history-dead-buffer-face' too!"
+  :group 'ecb-faces)
+ 
+(defcustom ecb-history-dead-buffer-face 'ecb-history-dead-buffer-face
+  "*Face for history entries pointing to dead buffers."
+  :group 'ecb-history
+  :group 'ecb-face-options
+  :type '(radio (const :tag "Use ecb-history-general-face"
+                       :value ecb-history-general-face)
+                (face :tag "Special face"
+                      :value ecb-history-dead-buffer-face)))
+
+
+(defface ecb-default-highlight-face (ecb-face-default nil nil nil
+                                                      nil ;'ecb-default-general-face
+                                                      "yellow" nil
+                                                      "cornflower blue" "magenta"
+                                                      nil nil t)
+  "*Define basic face for highlighting the selected node in a tree-buffer.
+In GNU Emacs 21.X all highlighting faces in the ECB tree-buffers inherit from
+this face. Therefore the default attributes like font etc. of a face used in a
+tree-buffer for highlighting the current tag can be very easily changed with
+face 'ecb-default-highlight-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature but the options
+`ecb-directory-face', `ecb-source-face', `ecb-method-face' and
+`ecb-history-face' offer the choice to use the face
+'ecb-default-highlight-face' so also with XEmacs and GNU Emacs 20.X the basic
+face-settings can be easily changed just by customizing the face
+'ecb-default-highlight-face'!"
+  :group 'ecb-faces)
+
+(defface ecb-directory-face (ecb-face-default nil nil nil
+                                              'ecb-default-highlight-face
+                                              "yellow" nil
+                                              "cornflower blue" "magenta"
+                                              nil nil t)
+  "*Define face used for highlighting current dir in directories buffer."
+  :group 'ecb-faces)
+
+(defcustom ecb-directory-face 'ecb-default-highlight-face
+  "*Face used for highlighting current directory in the directories-buffer.
+If the face 'ecb-default-highlight-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-highlight-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-directories
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-directory-face)))
+
+(defface ecb-source-face (ecb-face-default nil nil nil
+                                           'ecb-default-highlight-face
+                                           "yellow" nil
+                                           "cornflower blue" "magenta"
+                                           nil nil t)
+  "*Define face used for highlighting current source in the sources buffer."
+  :group 'ecb-faces)
+
+(defcustom ecb-source-face 'ecb-default-highlight-face
+  "*Face used for highlighting current source in the sources buffer.
+If the face 'ecb-default-highlight-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-highlight-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-sources
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-sources-face)))
+
+(defface ecb-method-face (ecb-face-default nil nil nil
+                                           'ecb-default-highlight-face
+                                           "yellow" nil
+                                           "cornflower blue" "magenta"
+                                           nil nil t)
+  "*Define face used for highlighting current tag in the methods buffer."
+  :group 'ecb-faces)
+
+(defcustom ecb-method-face 'ecb-default-highlight-face
+  "*Face used for highlighting current tag in the methods buffer.
+If the face 'ecb-default-highlight-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-highlight-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-methods
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-method-face)))
+
+(defface ecb-method-non-semantic-face (ecb-face-default nil nil nil
+                                                        'ecb-methods-general-face
+                                                        "brown" "brown")
+  "*Define face used for displaying tags of non-semantic-sources."
+  :group 'ecb-faces)
+
+(defcustom ecb-method-non-semantic-face 'speedbar-tag-face
+  "*Face used for for displaying tags of non-semantic-sources.
+Default is the face used by speedbar for tags.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-methods
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-method-face)))
+
+(defface ecb-history-face (ecb-face-default nil nil nil
+                                            'ecb-default-highlight-face
+                                            "yellow" nil
+                                            "cornflower blue" "magenta"
+                                            nil nil t)
+  "*Define face used for highlighting current entry in the history buffer."
+  :group 'ecb-faces)
+
+(defcustom ecb-history-face 'ecb-default-highlight-face
+  "*Face used for highlighting current entry in the history buffer.
+If the face 'ecb-default-highlight-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-highlight-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-history
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-history-face)))
+
+(defface ecb-analyse-face (ecb-face-default nil nil nil
+                                            'ecb-default-highlight-face
+                                            "yellow" nil
+                                            "cornflower blue" "magenta"
+                                            nil nil t)
+  "*Define face used for highlighting current entry in the analyse buffer."
+  :group 'ecb-faces)
+
+(defcustom ecb-analyse-face 'ecb-default-highlight-face
+  "*Face used for highlighting current entry in the analyse buffer.
+If the face 'ecb-default-highlight-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-highlight-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Use ecb-default-highlight-face"
+                       :value ecb-default-highlight-face)
+                (face :tag "Special face"
+                      :value ecb-analyse-face)))
+
+(defface ecb-analyse-general-face (ecb-face-default 1.0 nil nil
+                                                    'ecb-default-general-face)
+  "*Basic face for the ECB analyse buffer.
+It“s recommended to define here the font-family, the font-size, the basic
+color etc."
+  :group 'ecb-faces)
+
+(defcustom ecb-analyse-general-face 'ecb-default-general-face
+  "*Basic face for the ECB analyse buffer.
+This defines the basic face the whole history buffer should displayed with. If
+the face 'ecb-default-general-face' is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+'ecb-default-general-face'.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-analyse-general-face)))
+
+(defface ecb-analyse-bucket-element-face (ecb-face-default nil nil nil
+                                                           'ecb-analyse-general-face
+                                                           "brown")
+  "*Face used for displaying elements of buckets in the ECB-analyse-buffer.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-default-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-buffers should be displayed with the same basic
+attributes set by 'ecb-default-general-face' this set of basic attributes have
+to be set in 'ecb-analyse-bucket-node-face' too!"
+  :group 'ecb-faces)
+
+(defcustom ecb-analyse-bucket-element-face 'ecb-analyse-bucket-element-face
+  "*Basic face for displaying elements of buckets in the ECB-analyse-buffer.
+This defines the basic face for the elements of category-buckets like Context,
+Prefix, Completions etc. in the ECB-analyse-buffer.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Use ecb-default-general-face"
+                       :value ecb-default-general-face)
+                (face :tag "Special face"
+                      :value ecb-analyse-bucket-element-face)))
+
+(defface ecb-analyse-bucket-node-face (ecb-face-default nil t nil
+                                                        'ecb-bucket-node-face)
+  "*Face used for displaying a bucket-node in the ECB-analyse-buffer.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-default-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-buffers should be displayed with the same basic
+attributes set by 'ecb-default-general-face' this set of basic attributes have
+to be set in 'ecb-analyse-bucket-node-face' too!"
+  :group 'ecb-faces)
+
+(defcustom ecb-analyse-bucket-node-face 'ecb-analyse-bucket-node-face
+  "*Basic face for displaying a bucket-node in the ECB-analyse-buffer.
+This defines the basic face for the bucket-nodes like Context, Prefix,
+Completions etc. in the ECB-analyse-buffer.
+
+Changes take first effect after finishing and reactivating ECB!"
+  :group 'ecb-face-options
+  :group 'ecb-analyse
+  :type '(radio (const :tag "Use ecb-bucket-node-face"
+                       :value ecb-bucket-node-face)
+                (face :tag "Special face"
+                      :value ecb-analyse-bucket-node-face)))
+
+(defface ecb-tag-header-face (ecb-face-default nil nil nil nil nil nil
+                                               "SeaGreen1" "SeaGreen1"
+                                               nil nil t)
+  "*Define face used for highlighting the tag header.
+The tag header is the first line of the tag which is highlighted after
+jumping to it by clicking onto a node in the methods buffer."
+  :group 'ecb-faces)
+  
+(defcustom ecb-tag-header-face 'ecb-tag-header-face
+  "*Face used for highlighting the tag header.
+The tag header is the first line of the tag which is highlighted after
+jumping to it by clicking onto a node in the methods buffer."
+  :group 'ecb-face-options
+  :group 'ecb-methods
+  :type 'face)
+
+(defface ecb-source-in-directories-buffer-face (ecb-face-default nil nil nil
+                                                                 'ecb-directories-general-face
+                                                                 "medium blue"
+                                                                 "LightBlue1"
+                                                                 nil nil
+                                                                 nil "gray")
+  "*Define a face for displaying sources in the directories buffer."
+  :group 'ecb-faces)
+ 
+(defcustom ecb-source-in-directories-buffer-face 'ecb-source-in-directories-buffer-face
+  "*Face for source files in the directories buffer."
+  :group 'ecb-directories
+  :group 'ecb-face-options
+  :type 'face)
+
+(defface ecb-source-read-only-face (ecb-face-default nil nil t
+                                                     'ecb-default-general-face)
+  "*Define a face for displaying read-only sources."
+  :group 'ecb-faces)
+ 
+(defcustom ecb-source-read-only-face 'ecb-source-read-only-face
+  "*Face for read-only sources."
+  :group 'ecb-sources
+  :group 'ecb-directories
+  :group 'ecb-face-options
+  :type 'face)
+
+(defface ecb-directory-not-accessible-face (ecb-face-default nil nil nil
+                                                             'ecb-directories-general-face
+                                                             "gray60"
+                                                             "gray60"
+                                                             nil nil
+                                                             nil "gray60")
+  "*Define a face for displaying not accessible dirs in the directories buffer."
+  :group 'ecb-faces)
+ 
+(defcustom ecb-directory-not-accessible-face 'ecb-directory-not-accessible-face
+  "*Face for not accessible dirs in the directories buffer."
+  :group 'ecb-directories
+  :group 'ecb-face-options
+  :type 'face)
+
+(defface ecb-type-tag-class-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-interface-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-struct-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-typedef-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-union-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-enum-face (ecb-face-default nil t)
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-type-tag-group-face (ecb-face-default nil t nil nil
+                                                   (if ecb-running-xemacs
+                                                       "dimgray"
+                                                     "dim gray")
+                                                   (if ecb-running-xemacs
+                                                       "dimgray"
+                                                     "dim gray"))
+  "*Define face used with option `ecb-type-tag-display'."
+  :group 'ecb-faces)
+
+(defface ecb-bucket-node-face (ecb-face-default nil t nil
+                                                'ecb-default-general-face)
+  "*Face used for displaying bucket-nodes in the ECB-buffers.
+See also `ecb-bucket-node-display'.
+
+In GNU Emacs 21.X this face inherits from the face 'ecb-default-general-face'.
+
+With XEmacs and GNU Emacs 20.X there is no inheritance-feature so if the
+buckets in the ECB-buffers should be displayed with the same basic
+attributes set by 'ecb-default-general-face' this set of basic attributes have
+to be set in 'ecb-bucket-node-face' too!"
+  :group 'ecb-faces)
+
+;; - mode-line faces-------------------------------------------
+
+;; For XEmacs a face in the modeline should really inhertit from the face
+;; 'modeline!
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Currently with XEmacs 21.4.X
+;; set-face-parent MUST be before defface - therefore we have to use make-face
+;; first and then adding the values to this face we would have also added
+;; by`defface. The defface is here only used to make this face customizable!
+;; Maybe later XEmacs-versions support the parent-keyword with defface then we
+;; can change back this ugly hack.
+(when ecb-running-xemacs
+  (make-face 'ecb-mode-line-win-nr-face)
+  (set-face-parent 'ecb-mode-line-win-nr-face 'modeline nil '(default))
+  (make-face-bold 'ecb-mode-line-win-nr-face))
+(defface ecb-mode-line-win-nr-face (ecb-face-default nil t)
+  "*Define face for the window-number in the mode-line.
+See `ecb-mode-line-display-window-number'."
+  :group 'ecb-faces)
+
+(defcustom ecb-mode-line-win-nr-face 'ecb-mode-line-win-nr-face
+  "*Face used for the window-number in the mode-line.
+See `ecb-mode-line-display-window-number'. For XEmacs the face should inherit
+from the face 'modeline \(see `set-face-parent')!"
+  :group 'ecb-mode-line
+  :group 'ecb-face-options
+  :type 'face)
+
+(when ecb-running-xemacs
+  (make-face 'ecb-mode-line-prefix-face)
+  (set-face-parent 'ecb-mode-line-prefix-face 'modeline nil '(default))
+  (set-face-foreground 'ecb-mode-line-prefix-face "forestgreen"))
+;;                        nil '(default color win)))
+(defface ecb-mode-line-prefix-face (ecb-face-default nil nil nil nil
+                                                     "forestgreen"
+                                                     "forestgreen")
+  "*Define face for the prefix in the mode-line.
+See `ecb-mode-line-prefixes'."
+  :group 'ecb-faces)
+
+(defcustom ecb-mode-line-prefix-face 'ecb-mode-line-prefix-face
+  "*Face used for the prefix in the mode-line.
+See `ecb-mode-line-prefixes'. For XEmacs the face should inherit from the face
+'modeline \(see `set-face-parent')!"
+  :group 'ecb-mode-line
+  :group 'ecb-face-options
+  :type 'face)
+
+(when ecb-running-xemacs
+  (make-face 'ecb-mode-line-data-face)
+  (set-face-parent 'ecb-mode-line-data-face 'modeline nil '(default)))
+(defface ecb-mode-line-data-face (ecb-face-default)
+  "*Define face for the data in the mode-line.
+See `ecb-mode-line-data'."
+  :group 'ecb-faces)
+
+(defcustom ecb-mode-line-data-face 'ecb-mode-line-data-face
+  "*Face used for the data in the mode-line.
+See `ecb-mode-line-data'. For XEmacs the face should inherit from the face
+'modeline \(see `set-face-parent')!"
+  :group 'ecb-mode-line
+  :group 'ecb-face-options
+  :type 'face)
+
+(silentcomp-provide 'ecb-face)
+
+;;; ecb-face.el ends here
diff --git a/site/ecb-2.40/ecb-file-browser.el b/site/ecb-2.40/ecb-file-browser.el
new file mode 100644
index 0000000..da7796b
--- /dev/null
+++ b/site/ecb-2.40/ecb-file-browser.el
@@ -0,0 +1,4763 @@
+;;; ecb-file-browser.el --- the file-browser of Emacs
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-file-browser.el,v 1.79 2009/05/16 13:24:19 berndl Exp $
+
+;;; Commentary:
+
+;; This file contains the code of the file-browser of ECB
+
+(require 'ecb-util)
+(require 'tree-buffer)
+(require 'ecb-mode-line)
+(require 'ecb-navigate)
+(require 'ecb-face)
+(require 'ecb-speedbar)
+(require 'ecb-layout)
+(require 'ecb-common-browser)
+
+;; various loads
+(require 'assoc)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(silentcomp-defun ecb-speedbar-update-contents)
+(silentcomp-defun vc-load-vc-hooks)
+;; (silentcomp-defvar vc-svn-admin-directory)
+(silentcomp-defun substring-no-properties)
+(silentcomp-defun vc-find-root)
+(silentcomp-defun vc-file-clearprops)
+(silentcomp-defun vc-state)
+(silentcomp-defvar dired-directory)
+
+;;====================================================
+;; Customization
+;;====================================================
+
+
+(defgroup ecb-directories nil
+  "Settings for the directories-buffer in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-sources nil
+  "Settings for the sources-buffers in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-history nil
+  "Settings for the history-buffer in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-version-control nil
+  "Settings for the version-control support in the ECB."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defcustom ecb-source-path nil
+  "*Paths where to find code sources.
+Each path can have an optional alias that is used as it's display name. If no
+alias is set, the path is used as display name.
+
+Lisp-type of this option: The value must be a list L whereas each element of L
+is either
+- a simple string which has to be the full path of a directory \(this string
+  is displayed in the directory-browser of ECB) or
+- a 2-element list whereas the first element is the full path of a directory
+  \(string) and the second element is an arbitrary alias \(string) for this
+  directory which is then displayed instead of the underlying directory."
+  :group 'ecb-directories
+  :group 'ecb-most-important
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode
+			    (functionp 'ecb-update-directories-buffer))
+		       (ecb-update-directories-buffer))))
+  :type '(repeat (choice :tag "Display type"
+                         :menu-tag "Display type"
+			 (directory :tag "Path")
+			 (list :tag "Path with alias"
+			       (directory :tag "Path")
+			       (string :tag "Alias")))))
+
+(defcustom ecb-add-path-for-not-matching-files '(t . nil)
+  "*Add path of a file to `ecb-source-path' if not already contained.
+This is done during the auto. windows synchronization which happens if a file
+is opened not via the file/directory-browser of ECB. In such a situation ECB
+adds the path of the new file auto. to `ecb-source-path' at least temporally
+for the current Emacs session. This option defines two things:
+1. Should only the root-part \(which means for Unix-like systems always '/'
+   and for windows-like systems the drive) of the new file be added as
+   source-path to `ecb-source-path' or the whole directory-part? For
+   remote-files \(e.g. tramp, ange-ftp- or efs-files) the root-part is the
+   complete host-part + the root-dir at that host \(example:
+   /berndl@ecb.sourceforge.net:/ would be the root-part of
+   /berndl@ecb.sourceforge.net:/tmp/test.txt).
+2. Should this path be added for future sessions too?
+
+The value of this option is a cons-cell where the car is a boolean for 1. and
+the cdr is a boolean for 2.
+
+A value of not nil for the car \(1.) is reasonably if a user often opens files
+not via the ECB-browser which are not located in any of the paths of
+`ecb-source-path' because then only one path for each drive \(windows) or the
+root-path \(unix) is added to the directory buffer of ECB."
+  :group 'ecb-directories
+  :type '(cons (boolean :tag "Add only root path")
+               (boolean :tag "Ask for saving for future sessions")))
+
+
+(defvar ecb-source-path-functions nil
+  "List of functions to call for finding sources.
+Each time the function `ecb-update-directories-buffer' is called, the
+functions in this variable will be evaluated. Such a function must return
+either nil or a list of strings where each string is a path.")
+
+
+(defcustom ecb-display-default-dir-after-start t
+  "*Automatically display current default-directory after activating ECB.
+If a file-buffer is displayed in the edit-window then ECB synchronizes its
+tree-buffers to this file-buffer - at least if the option `ecb-basic-buffer-sync' it
+not nil. So for this situation `ecb-display-default-dir-after-start' takes no
+effect but this option is for the case if no file-buffer is displayed in the
+edit-window after startup:
+
+If true then ECB selects autom. the current default-directory after activation
+even if no file-buffer is displayed in the edit-window. This is useful if ECB
+is autom. activated after startup of Emacs and Emacs is started without a
+file-argument. So the directory from which the startup has performed is auto.
+selected in the ECB-directories buffer and the ECB-sources buffer displays the
+contents of this directory."
+  :group 'ecb-directories
+  :type 'boolean)
+
+
+(defcustom ecb-show-sources-in-directories-buffer '("left7" "left13"
+                                                    "left14" "left15")
+  "*Show source files in directories buffer.
+The value is either 'always or 'never or a list of layout-names for which
+layouts sources should be displayed in the directories window."
+  :group 'ecb-directories
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (if (and ecb-minor-mode
+			    (functionp 'ecb-set-selected-directory)
+                            ecb-path-selected-directory)
+		       (ecb-set-selected-directory ecb-path-selected-directory t))))
+  :type '(radio (const :tag "Always" :value always)
+                (const :tag "Never" :value never)
+                (repeat :tag "With these layouts"
+                        (string :tag "Layout name"))))
+
+
+(defcustom ecb-directories-show-node-info '(if-too-long . path)
+  "*When to display which node-info in the directories-buffer.
+Define which node info should be displayed after moving the mouse
+over a node \(or after a shift click onto the node) in the
+directories-buffer.
+
+You can define \"when\" a node-info should be displayed:
+- always: Node info is displayed by moving with the mouse over a node.
+- if-too-long: Node info is only displayed by moving with the mouse over a
+  node does not fit into the window-width of the tree-buffer window.
+  In the ECB directories buffer this means also if a node is shortend or if
+  the node has an alias \(see `ecb-source-path').
+- shift-click: Node info is only displayed after a shift click with the
+  primary mouse button onto the node.
+- never: Node info is never displayed.
+
+You can define \"which\" info should be displayed:
+- name: Only the full node-name is displayed.
+- path: The full-path of the node is displayed.
+
+Do NOT set this option directly via setq but use always customize!"
+  :group 'ecb-directories
+  :type '(cons (choice :tag "When"
+                       (const :tag "Always" :value always)
+                       (const :tag "If too long" :value if-too-long)
+                       (const :tag "After shift click" :value shift-click)
+                       (const :tag "Never" :value never))
+               (choice :tag "What"
+                       (const :tag "Node-name" :value name)
+                       (const :tag "Full path" :value path))))
+
+(defcustom ecb-directories-update-speedbar 'auto
+  "*Update an integrated speedbar after selecting a directory.
+If not nil then an integrated speedbar will be updated after selecting a
+directory in the ECB-directories-buffer so the speedbar displays the contents
+of that directory.
+
+Of course this option makes only sense if the integrated speedbar is displayed
+in addition to the ECB-directories-buffer.
+
+This option can have the following values:
+- t: Always update speedbar.
+- nil: Never update speedbar.
+- auto: Update when senseful \(see scenarios below)
+- <function>: A user-defined function. The function is called after a
+  directory is selected, gets the selected directory as argument and has to
+  return nil if the the integrated speedbar should NOT be updated.
+
+Two example-scenarios where different values for this option can be senseful:
+
+If `ecb-show-sources-in-directories-buffer' is not nil or you have a layout
+where an ECB-sources-buffer is visible then you probably want to use the
+ECB-directories-buffer \(and/or the ECB-sources-buffer) for directory- and
+file-browsing. If you have in addition an integrated speedbar running then you
+probably want to use speedbar instead of the ECB-methods-buffer for
+source-content-browsing. In this case you probably want the speedbar not be
+updated because you do not need speedbar reflecting the current-directory
+contents but only the contents of the currently selected source-file and the
+integrated speedbar updates itself autom. for the latter one!
+
+If `ecb-show-sources-in-directories-buffer' is nil and there is also no
+ECB-sources-buffer visible in the current layout then you probably want to use
+an integrated speedbar for browsing directory-contents \(i.e. the files) and
+file-contents \(instead of the ECB-methods-buffer for example). In this case
+you probably want the speedbar updated because you need speedbar reflecting
+the current-directory contents so you can select files.
+
+The value 'auto \(see above) takes exactly these two scenarios into account."
+  :group 'ecb-directories
+  :type '(radio (const :tag "Always" :value t)
+                (const :tag "Never" :value nil)
+                (const :tag "Automatic" :value auto)
+                (function :tag "Custom function")))
+
+
+(defun ecb-show-sources-in-directories-buffer-p ()
+  "Return not nil if in current layout sources are shown in the
+directories-buffer."
+  (case ecb-show-sources-in-directories-buffer
+    (never nil)
+    (always t)
+    (otherwise
+     (and (listp ecb-show-sources-in-directories-buffer)
+          (member ecb-layout-name
+                  ecb-show-sources-in-directories-buffer)))))
+
+(defcustom ecb-cache-directory-contents '(("^/\\([^:/]*@\\)?\\([^@:/]*\\):.*" . 0)
+                                          (".*" . 50))
+  "*Cache contents of certain directories.
+This can be useful if `ecb-source-path' contains directories with many files
+and subdirs, especially if these directories are mounted net-drives \(\"many\"
+means here something > 1000, dependent of the speed of the net-connection and
+the machine). Or if it contains remote-source-paths which means paths in the
+sense of tramp, ange-ftp or efs. For these directories actualizing the
+sources- and/or directories- buffer of ECB \(if displayed in current layout!)
+can slow down dramatically so a caching increases speed a lot.
+
+The value of this option is a list where the each element is a cons-cell and
+looks like:
+  \(<dir-regexp> . <filenumber threshold>)
+<dir-regexp>: Regular expression a directory must match to be cached.
+<filenumber threshold>: Number of directory contents must exceed this number.
+
+A directory will only be cached if and only if the directory-name matches
+one regexp of this option and its content-number exceeds the related
+threshold AND the directory-name does not match and regexp of
+`ecb-cache-directory-contents-not'!
+
+The cache entry for a certain directory will be refreshed and actualized only
+by using the POWER-click \(see `ecb-primary-secondary-mouse-buttons') in the
+directories-buffer of ECB.
+
+Default-value: ECB caches the contents of all remote directories regardless of
+the size and all other directories if more than 50 entries are contained.
+
+Examples:
+
+An entry \(\"/usr/home/john_smith/bigdir*\" . 1000) means the contents of
+every subdirectory of the home-directory of John Smith will be cached if the
+directory contains more than 1000 entries and its name begins with \"bigdir\".
+
+An entry \(\".*\" . 1000) caches every directory which has more than 1000
+entries.
+
+An entry \(\"^/\\\\\(\[^:/]*@\\\\)?\\\\\(\[^@:/]*\\\\):.*\" . 0) caches every
+remote \(in the sense of tramp, ange-ftp or efs) directory regardless of the
+number of entries.
+
+Please note: If you want your home-dir being cached then you MUST NOT use
+\"~\" because ECB tries always to match full path-names!"
+  :group 'ecb-directories
+  :group 'ecb-most-important
+  :type `(repeat (cons (regexp :tag "Directory-regexp")
+                       (integer :tag "Filenumber threshold" :value 1000))))
+
+
+(defcustom ecb-cache-directory-contents-not nil
+  "*Do not cache the contents of certain directories.
+The value of this option is a list where the each element is a regular
+expression a directory must match if it should not being cached.
+
+If a directory-name matches at least one of the regexps of this option the
+directory-contents will never being cached. See `ecb-cache-directory-contents'
+to see when a directory will be cached.
+
+This option can be useful when normally all directories with a certain amount
+of content \(files and subdirs) should be cached but some special directories
+not. This can be achieved by:
+- setting `ecb-cache-directory-contents' to \(\".*\" . 500): Caches all
+  directories with more then 500 entries
+- setting `ecb-cache-directory-contents-not' to a value which matches these
+  directories which should not being cached \(e.g. \(\"/usr/home/john_smith\")
+  excludes the HOME-directory of John Smith from being cached).
+
+Please note: If you want your home-dir exclude from being cached then you MUST
+NOT use \"~\" because ECB tries always to match full path-names!"
+  :group 'ecb-directories
+  :type `(repeat (regexp :tag "Directory-regexp")))
+
+(defcustom ecb-ping-program "ping"
+  "Program to send network test packets to a host.
+The set ping-program is used to test if a remote host of a remote
+path \(e.g. a tramp-, ange-ftp- or efs-path) is accessible. See
+also `ecb-ping-options'."
+  :group 'ecb-directories
+  :type  'string)
+
+(defcustom ecb-ping-options
+  (append (cond ((memq system-type (list 'linux 'gnu/linux 'irix))
+                 (list "-c" "2"))
+                ((eq system-type 'windows-nt)
+                 (list "-n" "2")))
+          (list "HOST"))
+  "List of options for the ping program.
+These options have to ensure that the program set in `ecb-ping-program' only
+emits as few as possible ICMP packets, ideally exactly 1. These options must
+ensure the ping-program doesn't emit an endless sequence of packets!
+
+These sequence of options must fit the required argument- and options-list of
+the specified ping-program \(see `ecb-ping-program'). Therefore at least on of
+these options must be the string HOST \(uppercase) which will be replaced
+internally by ECB with that host-name the accessibility of this host
+has to be tested. So ensure that this 'HOST'-option is in the right place of
+the options-sequence - check the manual of your ping-program!
+
+Default-value of this option is a list with just one element
+HOST, which means the ping-program of `ecb-ping-program' will be
+called with one argument which will be the host-name which should be
+tested.
+
+See also `ecb-ping-program'."
+  :group 'ecb-directories
+  :type  '(repeat string))
+
+(defcustom ecb-host-accessible-check-valid-time nil
+  "Time in seconds a cached accessible-state of a remote host is valid.
+This option is a list where each element specifies how long for a certain
+remote host the cached ping-state \(i.e. if the host is accessible or not)
+should be valid. During this time-intervall ECB pings such a remote host only
+once, all other checks use the cached value of that real check. But it the
+cached value is older than the value of this option ECB will ping again.
+
+Per default ECB discards after 1 minute the cached ping-state of each remote
+host. But if you are sure that a certain remote host is always accessible
+\(i.e. means in consequence that you are always online when working with ECB
+and remote-paths) then add an entry to this option with a high valid-interval.
+
+Examples: An entry \(\".*sourceforge.*\" . 3600) ensures that all remote hosts
+machting the string \"sourceforge\" will only once pinged during one hour. Or
+\(\".*\" . 300) would ensure that every remote host would be pinged only once
+during 5 minutes."
+  :group 'ecb-directories
+  :type '(repeat (cons (regexp :tag "Remote host regexp")
+                       (integer :tag "Valid interval"))))
+
+(defcustom ecb-prescan-directories-for-emptyness 'unless-remote
+  "*Prescan directories for emptyness.
+ECB does this so directories are displayed as empty in the directories-buffer
+even without user-interaction \(i.e. in previous ECB-versions the emptyness of
+a directory has been first checked when the user has clicked onto a
+directory). ECB optimizes this check as best as possible but if a directory
+contains a lot of subdirectories which contain in turn a lot of entries, then
+expanding such a directory or selecting it would take of course more time as
+without this check - at least at the first time \(all following selects of a
+directory uses the cached information if its subdirectories are empty or not).
+Therefore ECB performs this check stealthy \(see `ecb-stealthy-tasks-delay')
+so normally there should no performance-decrease or additional waiting-time
+for the user. There is one exception: For remote directories \(in the sense of
+tramp, ange-ftp, or efs) this check can descrease performance even if
+performed stealthy and interruptable. Therefore this option offers three
+possible settings:
+
+  t: Switch on this feature
+
+  'unless-remote: Switch on this feature but not for remote directories. The
+  term \"remote\" means here directories which are used via tramp, ange-ftp or
+  efs. So mounted directories are counted not as remote directories here even
+  if such a directory is maybe hosted on a remote machine. But normally only
+  directories in a LAN are mounted so there should be no performance-problems
+  with such mounted directories.
+
+  nil: Switch off this feature completely.
+
+The option `ecb-prescan-directories-exclude-regexps' offers are more fine
+granularity to exclude certain directories from this prescan."
+  :group 'ecb-directories
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Switch on" :value t)
+                (const :tag "Switch off for remote directories" :value unless-remote)
+                (const :tag "Switch off completely" :value nil)))
+
+(defcustom ecb-prescan-directories-exclude-regexps nil
+  "*Which directories should be excluded from the empty-prescan.
+If a directory matches any of the regexps of this option it will not be
+prescanned for emptyness - This option takes only effect if
+`ecb-prescan-directories-for-emptyness' is not nil."
+  :group 'ecb-directories
+  :type '(repeat (regexp :tag "Directory-regexp")))
+
+(defsubst ecb-directory-should-prescanned-p (dir)
+  "Return not nil if DIR should be prescanned for emptyness.
+The check is performed according to the settings in the options
+`ecb-prescan-directories-for-emptyness' and
+`ecb-prescan-directories-exclude-regexps'."
+  (and (or (equal t ecb-prescan-directories-for-emptyness)
+           (and (equal 'unless-remote ecb-prescan-directories-for-emptyness)
+                (not (ecb-remote-path dir))))
+       (not (ecb-match-regexp-list dir ecb-prescan-directories-exclude-regexps))))
+
+(defcustom ecb-grep-function (cond ((fboundp 'lgrep)
+                                    'lgrep)
+                                   ((fboundp 'igrep)
+                                    'igrep)
+                                   (t 'grep))
+  "*Function used for performing a grep.
+The popup-menu of the tree-buffers \"Directories\", \"Sources\" and
+\"History\" offer to grep the \"current\" directory:
+- Directory-buffer: The grep is performed in the current popup-directory after
+  clicking the right mouse-button onto a node.
+- Sources-buffer: The grep is performed in the current selected directory.
+- History-buffer: The grep is performed in the directory of the current
+  popup-source after clicking the right mouse-button onto a node.
+
+Conditions for such a function:
+- The function is called interactively via `call-interactively'
+- During the function-call the `default-directory' is temp. set to that
+  directory mentioned above with \"... is performed in ...\", i.e. the
+  function can use the value of `default-directory' to determine the directory
+  to grep.
+- The function must read all it's arguments itself.
+- The function is completely responsible for performing the grep itself and
+  displaying the results.
+
+Normally one of the standard-grepping functions like `lgrep',
+`grep' or `igrep' \(or some wrappers around it) should be used!"
+  :group 'ecb-directories
+  :group 'ecb-sources
+  :type 'function)
+
+(defcustom ecb-grep-recursive-function (cond ((fboundp 'rgrep)
+                                              'rgrep)
+                                             ((fboundp 'igrep-find)
+                                              'igrep-find)
+                                             (t 'grep-find))
+  "*Function used for performing a recursive grep.
+For more Details see option `ecb-grep-function' and replace \"grep\" with
+\"recursive grep\".
+
+Normally one of the standard-grepping functions like `rgrep',
+`grep-find' or `igrep-find' \(or some wrappers around it) should
+be used!"
+  :group 'ecb-directories
+  :group 'ecb-sources
+  :type 'function)
+
+(defcustom ecb-after-directory-change-hook nil
+  "*Hook which run directly after the selected directory has changed.
+This means not onyl after a click onto a directory in the directory-window of
+ECB but it means this hook runs always when the current directory changes
+regardless of the trigger of this change. So for example it runs also when you
+just switches from one buffer to another via `switch-to-buffer' or
+`switch-to-buffer-other-window' and the directory of these filebuffers is
+different but only when auto-synchronizing of the ECB-windows is on (see
+`ecb-basic-buffer-sync'). It runs not when switching between buffers and the
+associated files reside in the same directory.
+
+Each function added to this hook will be called with two arguments: The
+directory which was current _before_ the directory-change-trigger and the
+directory which was now the current \(i.e. after the trigger).
+
+Example: If you switch from a filebuffer \"~/.emacs\" to a filebuffer
+\"/tmp/test.txt\" then the functions of this hook will be called with the
+two arguments \"~\" and \"/tmp\"."
+  :group 'ecb-directories
+  :type 'hook)
+
+(defcustom ecb-sources-perform-read-only-check 'unless-remote
+  "*Check if source-items in the tree-buffers are read-only.
+If a sourcefile is read-only then it will be displayed with that face set in
+the option `ecb-source-read-only-face'.
+
+Because this check can be take some time if files are used via a mounted
+net-drive ECB performs this check stealthy \(see `ecb-stealthy-tasks-delay')
+so normally there should no performance-decrease or additional waiting-time
+for the user. But to get sure this option offers three choices: t,
+'unless-remote and nil. See `ecb-prescan-directories-for-emptyness' for an
+explanation for these three choices.
+
+The option `ecb-read-only-check-exclude-regexps' offers are more fine
+granularity to exclude the sources of certain directories from the read-only
+state-check."
+  :group 'ecb-sources
+  :group 'ecb-directories
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Switch on" :value t)
+                (const :tag "Switch off for remote directories" :value unless-remote)
+                (const :tag "Switch off completely" :value nil)))
+
+(defcustom ecb-read-only-check-exclude-regexps nil
+  "*Which directories should be excluded from the sources-read-only-check.
+If a directory matches any of the regexps of this option their sources will
+not be checked if they are writable - This option takes only effect if
+`ecb-sources-perform-read-only-check' is not nil."
+  :group 'ecb-sources
+  :group 'ecb-directories
+  :type '(repeat (regexp :tag "Directory-regexp")))
+
+(defsubst ecb-sources-read-only-check-p (dir)
+  "Return not nil if the sources of DIR should be checked for read-only-state.
+The check is performed according to the settings in the options
+`ecb-sources-perform-read-only-check' and
+`ecb-read-only-check-exclude-regexps'."
+  (and (or (equal t ecb-sources-perform-read-only-check)
+           (and (equal 'unless-remote ecb-sources-perform-read-only-check)
+                (not (ecb-remote-path dir))))
+       (not (ecb-match-regexp-list dir ecb-read-only-check-exclude-regexps))))
+
+(defcustom ecb-directories-buffer-name " *ECB Directories*"
+  "*Name of the ECB directory buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB Directories*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-directory-buffer by this name, e.g. by a call of `set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-directories
+  :type 'string)
+
+
+(defcustom ecb-excluded-directories-regexps '("^\\(CVS\\|\\.[^xX]*\\)$")
+  "*Directories that should not be included in the directories list.
+The value of this variable should be a list of regular expressions."
+  :group 'ecb-directories
+  :type '(repeat (regexp :tag "Directory-regexp")))
+
+(defsubst ecb-check-dir-exclude (dir)
+  (ecb-match-regexp-list dir ecb-excluded-directories-regexps))
+
+(defcustom ecb-auto-expand-directory-tree 'best
+  "*Automatically expand the directory tree to the current source file.
+There are three options:
+- best: Expand the best-matching source-path
+- first: Expand the first matching source-path
+- nil: Do not automatically expand the directory tree."
+  :group 'ecb-directories
+  :type '(radio (const :tag "Best matching"
+                       :value best)
+                (const :tag "First matching"
+                       :value first)
+                (const :tag "No auto. expand"
+                       :value nil)))
+
+
+(defcustom ecb-sources-buffer-name " *ECB Sources*"
+  "*Name of the ECB sources buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB Sources*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-sources-buffer by this name, e.g. by a call of `set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-sources
+  :type 'string)
+
+(defcustom ecb-sources-show-node-info '(if-too-long . name)
+  "*When to display which node-info in the sources-buffer.
+Define which node info should be displayed after moving the mouse
+over a node \(or after a shift click onto the node) in the
+sources-buffer.
+
+You can define \"when\" a node-info should be displayed:
+See `ecb-directories-show-node-info' for the possible choices.
+
+You can define \"which\" info should be displayed:
+- name: Only the full node-name is displayed.
+- file-info: File infos for this file are displayed.
+- file-info-full: Fill infos incl. full path for this file are displayed.
+
+Do NOT set this option directly via setq but use always customize!"
+  :group 'ecb-sources
+  :type '(cons (choice :tag "When"
+                       (const :tag "Always" :value always)
+                       (const :tag "If too long" :value if-too-long)
+                       (const :tag "After shift click" :value shift-click)
+                       (const :tag "Never" :value never))
+               (choice :tag "What"
+                       (const :tag "Node-name" :value name)
+                       (const :tag "File info" :value file-info)
+                       (const :tag "File info \(full path)"
+                              :value file-info-full))))
+
+(defcustom ecb-sources-exclude-cvsignore nil
+  "*Specify if files contained in a .cvsignore should be excluded.
+Value is a list of regular expressions or nil. If you want to exclude files
+listed in a .cvsignore-file from being displayed in the ecb-sources-buffer
+then specify a regexp for such a directory.
+
+If you want to exclude the contents of .cvsignore-files for every directory
+then you should add one regexp \".*\" which matches every directory.
+
+If you never want to exclude the contents of .cvsignore-files then set this
+option to nil. This is the default."
+  :group 'ecb-sources
+  :group 'ecb-directories
+  :type '(repeat (regexp :tag "Directory-regexp")))
+
+(defcustom ecb-source-file-regexps
+  '((".*" . (("\\(^\\(\\.\\|#\\)\\|\\(~$\\|\\.\\(elc\\|obj\\|o\\|class\\|lib\\|dll\\|a\\|so\\|cache\\)$\\)\\)")
+             ("^\\.\\(emacs\\|gnus\\)$"))))
+  "*Specifies which files are shown as source files.
+This is done on directory-base, which means for each directory-regexp the
+files to display can be specified. If more than one directory-regexp matches
+the current selected directory then always the first one \(and its related
+file-exclude/include-regexps) is used! If no directory-regexp matches then all
+files are displayed for the currently selected directory.
+
+Important note: It is recommended that the *LAST* element of this list should
+contain an always matching directory-regexp \(\".*\")!
+
+So the value of this option is a list of cons-cells where the car is a
+directory regexp and the cdr is a 2 element list where the first element is a
+list of exclude regexps and the second element is a list of include regexps. A
+file is displayed in the sources-buffer of ECB iff: The file does not match
+any of the exclude regexps OR the file matches at least one of the include
+regexps.
+
+But regardless of the value of this option a file F is never displayed in the
+sources-buffer if the directory matches `ecb-sources-exclude-cvsignore'
+and the directory contains a file .cvsignore which contains F as an entry!
+
+There are three predefined and useful combinations of an exclude and include
+regexp:
+- All files
+- All, but no backup, object, lib or ini-files \(except .emacs and .gnus). This
+  means all files except those starting with \".\", \"#\" or ending with
+  \"~\", \".elc\", \".obj\", \".o\", \".lib\", \".dll\", \".a\", \".so\".
+  (but including .emacs and .gnus)
+- Common source file types (.c, .java etc.)
+In addition to these predefined values a custom exclude and include
+combination can be defined. Here each list must at least contain one regexp -
+this can be a least the empty regexp \"\"!
+
+Tips for the directory- and file-regexps: \"$^\" matches no files/directories,
+\".*\" matches all files/directories."
+  :group 'ecb-sources
+  :group 'ecb-most-important
+  :type '(repeat (cons :tag "Directory file-spec"
+                       (regexp :tag "Directory regexp")
+                       (choice :tag "Files to display"
+                               :menu-tag "Files to display"
+                               (const :tag "All files"
+                                      :value (("") ("")))
+                               (const :tag "All, but no backups, objects, etc..."
+                                      :value (("\\(^\\(\\.\\|#\\)\\|\\(~$\\|\\.\\(elc\\|obj\\|o\\|class\\|lib\\|dll\\|a\\|so\\|cache\\)$\\)\\)") ("^\\.\\(x?emacs\\|gnus\\)$")))
+                               (const :tag "Common source file types"
+                                      :value (("") ("\\(\\(M\\|m\\)akefile\\|.*\\.\\(java\\|el\\|c\\|cc\\|h\\|hh\\|txt\\|html\\|texi\\|info\\|bnf\\)\\)$")))
+                               (list :tag "Custom"
+                                     (repeat (regexp :tag "Exclude regexp"
+                                                     :value ""))
+                                     (repeat (regexp :tag "Include regexp"
+                                                     :value "")))))))
+
+
+(defcustom ecb-show-source-file-extension t
+  "*Show the file extension of source files."
+  :group 'ecb-sources
+  :type 'boolean)
+
+(defcustom ecb-sources-sort-method 'name
+  "*Defines how the source files are sorted.
+- 'name: Sorting by name.
+- 'extension: Sorting first by extension and then by name.
+- nil: No sorting, means source files are displayed in the sequence returned by
+  `directory-files' \(called without sorting).
+See also `ecb-sources-sort-ignore-case'."
+  :group 'ecb-sources
+  :type '(radio (const :tag "By name"
+                       :value name)
+                (const :tag "By extension"
+                       :value extension)
+                (const :tag "No sorting"
+                       :value nil)))
+
+(defcustom ecb-sources-sort-ignore-case t
+  "*Ignore case for sorting the source-files of the Sources-buffer.
+See also `ecb-sources-sort-method'."
+  :group 'ecb-sources
+  :type 'boolean)
+
+(defcustom ecb-history-buffer-name " *ECB History*"
+  "*Name of the ECB history buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB History*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-history-buffer by this name, e.g. by a call of `set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-history
+  :type 'string)
+
+(defcustom ecb-history-exclude-file-regexps '("TAGS$" "semantic\\.cache$")
+  "*List of regexps which exclude source-files from being historized. Be aware
+that each always full filenames \(ie. incl. full path) are matched against
+these regexps! Therefore be carefore with regexps beginning with ^!"
+  :group 'ecb-history
+  :type '(repeat (regexp :tag "Source-regexp")))
+
+(defsubst ecb-check-filename-for-history-exclude (filename)
+  (ecb-match-regexp-list filename ecb-history-exclude-file-regexps))
+
+(defcustom ecb-history-show-node-info '(always . name-path)
+  "*When to display which node-info in the history-buffer.
+Define which node info should be displayed after moving the mouse
+over a node \(or after a shift click onto the node) in the
+history-buffer.
+
+You can define \"when\" a node-info should be displayed:
+See `ecb-directories-show-node-info' for the possible choices.
+
+You can define \"which\" info should be displayed:
+- name: Only the full node-name is displayed.
+- path: The full-path of the node is displayed.
+- name-path: The full node-name and the full-path is displayed.
+
+Do NOT set this option directly via setq but use always customize!"
+  :group 'ecb-history
+  :type '(cons (choice :tag "When"
+                       (const :tag "Always" :value always)
+                       (const :tag "If too long" :value if-too-long)
+                       (const :tag "After shift click" :value shift-click)
+                       (const :tag "Never" :value never))
+               (choice :tag "What"
+                       (const :tag "Node-name" :value name)
+                       (const :tag "Full path" :value path)
+                       (const :tag "Node-name \(Full path)" :value name-path))))
+
+(defcustom ecb-history-make-buckets 'directory
+  "*Bucketize the entries of the history-buffer.
+
+There are several options how the bucketizing should be done:
+- 'never: No bucketizing at all, ie. all entries of the history-buffer we be
+  displayed flat.
+- 'directory: All entries with related filesources residing in the same
+  directory will be contained in a bucket named with that directory.
+- 'mode: All entries with related buffers have the same
+  major-mode will be contained in a bucket named with that major-mode
+- 'extension: All entries with related filesources having the
+  same extension will be contained in a bucket named with that extension
+
+If the value is a list of regular expressions then all entries where the
+buffername matches the same regular expression will be contained in one
+bucket. If the value is nil then this is interpreted as an empty list of
+regular expressions!
+
+The default value is 'directory."
+  :group 'ecb-history
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode)
+                     (ecb-exec-in-window ecb-history-buffer-name
+                       (ecb-add-buffers-to-history-new)))))
+  :type '(radio (const :tag "Never" :value never)
+                (const :tag "By directory" :value directory)
+                (const :tag "By major-mode" :value mode)
+                (const :tag "By file-extension" :value extension)
+                (repeat :tag "By regexps"
+                        (regexp :tag "A bucket regexp"))))
+
+(defcustom ecb-history-stick-indirect-buffers-to-basebuffer t
+  "*Stick all indirect-buffers as subnodes to their base-buffer.
+
+If nil then indirect-buffers are treated as non-indirect-buffers
+and sorted into the history-buffer-sequence according to the
+setting of `ecb-history-sort-method'.
+
+If not nil then indirect-buffers are always sticked to their base-buffer, ie.
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history looks like:
+\[-] <base-buffer BB>
+ |  <indirect-buffer 1 of BB>
+ `- <indirect-buffer 2 of BB>"
+  :group 'ecb-history
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode)
+                     (ecb-exec-in-window ecb-history-buffer-name
+                       (ecb-add-buffers-to-history-new)))))
+  :type 'boolean)
+
+(defcustom ecb-history-sort-method 'name
+  "*Defines how the entries in the history-buffer are sorted.
+- 'name: Sorting by name.
+- 'extension: Sorting first by extension and then by name.
+- nil: No sorting, means the most recently used buffers are on the top of the
+       history and the seldom used buffers at the bottom.
+See also `ecb-history-sort-ignore-case'.
+
+If the history is bucketized \(see `ecb-history-make-buckets') then this
+sorting applies to the sorting within each bucket."
+  :group 'ecb-history
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode)
+                     (ecb-exec-in-window ecb-history-buffer-name
+                       (ecb-add-buffers-to-history-new)))))
+  :type '(radio (const :tag "By name"
+                       :value name)
+                (const :tag "By extension"
+                       :value extension)
+                (const :tag "No sorting"
+                       :value nil)))
+
+(defcustom ecb-history-sort-ignore-case t
+  "*Ignore case for sorting the history-entries.
+See also `ecb-history-sort-method'."
+  :group 'ecb-history
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode)
+                     (ecb-exec-in-window ecb-history-buffer-name
+                       (ecb-add-buffers-to-history-new)))))
+  :type 'boolean)
+
+(defcustom ecb-kill-buffer-clears-history nil
+  "*Define if `kill-buffer' should also clear the history.
+There are three options:
+- auto: Removes automatically the corresponding history-entry after the buffer
+  has been killed.
+- ask: Asks, if the history-entry should be removed after the kill.
+- nil: `kill-buffer' does not affect the history \(this is the default)."
+  :group 'ecb-history
+  :type '(radio (const :tag "Remove history entry automatically"
+                       :value auto)
+                (const :tag "Ask if history entry should be removed"
+                       :value ask)
+                (const :tag "Do not clear the history"
+                       :value nil)))
+
+(defcustom ecb-directories-menu-user-extension
+  '(("Version Control"
+     (ecb-dir-popup-cvs-status "CVS Status" )
+     (ecb-dir-popup-cvs-examine "CVS Examine")
+     (ecb-dir-popup-cvs-update "CVS Update")))
+  "*Static user extensions for the popup-menu of the directories buffer.
+Value is a list of elements of the following type: Each element defines a new
+menu-entry and is either:
+
+a) Menu-command: A list containing two sub-elements, whereas the first is the
+   function \(a function symbol) being called if the menu-entry is selected
+   and the second is the name of the menu-entry.
+b) Separator: A one-element-list and the element is the string \"---\": Then a
+   non-selectable menu-separator is displayed.
+c) Submenu: A list where the first element is the title of the submenu
+   displayed in the main-menu and all other elements are either menu-commands
+   \(see a) or separators \(see b) or another submenu \(see c). This allows
+   deep nested menu-submenu-structures. Currently a level of 4 is allowed but
+   in general there could be an infinite depth of nesting but it makes no
+   sense - if possible at all - to define infinite nested defcustom-types. So
+   there is a limit of 4 levels but tis is not a hard limit: Just increase the
+   value of the `ecb-max-submenu-depth' *BEFORE* first loading ECB!
+
+The function of a menu-command must follow the following guidelines: Such a
+function must be defined with the macro `tree-buffer-defpopup-command! This
+macro defines a new popup-command whereas the newly defined command gets one
+argument NODE. See the docstring of `tree-buffer-defpopup-command' for further
+details.
+
+Example for the definition of such a popupmenu-command:
+
+\(tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+  \"Prints the name of the directory of the node under point.\"
+  \(let \(\(node-data=dir \(tree-node->data node)))
+     \(message \"Dir under node: %s\" node-data=dir)))
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of `ecb-directories-menu' but the whole menu can be
+re-arranged with `ecb-directories-menu-sorter'.
+
+These menu-extensions are static. A dynamic menu-extension can be achieved via
+`ecb-directories-menu-user-extension-function'."
+  :group 'ecb-directories
+  :type (ecb-create-menu-user-ext-type 1 ecb-max-submenu-depth))
+
+(defcustom ecb-directories-menu-user-extension-function 'ignore
+  "*Dynamic user extensions for the popup-menu of the directories buffer.
+A function which has to return a list in the same format like the option
+`ecb-directories-menu-user-extension'. This function is called when the user
+opens the popup-menu for the directories buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+directories-buffer the function has to return nil. Therefore the default-value
+of this option is `ignore'.
+
+Per default the dynamic user-extensions are added in front of the static
+extensions of `ecb-directories-menu-user-extension' but the whole menu can be
+re-arranged with `ecb-directories-menu-sorter'."
+  :group 'ecb-directories
+  :type 'function)
+
+(defcustom ecb-sources-menu-user-extension
+  '(("Version control"
+     (ecb-file-popup-ediff-revision "Ediff against revision")
+     ("---")
+     (ecb-file-popup-vc-next-action "Check In/Out")
+     (ecb-file-popup-vc-log "Revision history")
+     (ecb-file-popup-vc-annotate "Annotate")
+     (ecb-file-popup-vc-diff "Diff against last version")
+     ("---")
+     (ecb-file-popup-vc-refresh-file "Recompute state for file")
+     (ecb-file-popup-vc-refresh-dir "Recompute state for whole dir")))
+  "*Static user extensions for the popup-menu of the sources buffer.
+For further explanations see `ecb-directories-menu-user-extension'.
+
+The node-argument of a menu-function contains as data the source
+for which the popup-menu has been opened. Use always
+`ecb-source-get-*' to extract whatever you need from the
+node-data. E.g. use `ecb-source-get-filename' to get the full
+filename of the source of the node.
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of `ecb-sources-menu' but the whole menu can be
+re-arranged with `ecb-sources-menu-sorter'."
+  :group 'ecb-sources
+  :type (ecb-create-menu-user-ext-type 1 ecb-max-submenu-depth))
+
+(defcustom ecb-sources-menu-user-extension-function 'ignore
+  "*Dynamic user extensions for the popup-menu of the sources buffer.
+A function which has to return a list in the same format like the option
+`ecb-sources-menu-user-extension'. This function is called when the user
+opens the popup-menu for the sources buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+sources-buffer the function has to return nil. Therefore the default-value
+of this option is `ignore'.
+
+Per default the dynamic user-extensions are added in front of the static
+extensions of `ecb-sources-menu-user-extension' but the whole menu can be
+re-arranged with `ecb-sources-menu-sorter'."
+  :group 'ecb-sources
+  :type 'function)
+
+(defcustom ecb-history-menu-user-extension
+  '(("Version control"
+     (ecb-file-popup-ediff-revision "Ediff against revision")
+     ("---")
+     (ecb-file-popup-vc-next-action "Check In/Out")
+     (ecb-file-popup-vc-log "Revision history")
+     (ecb-file-popup-vc-annotate "Annotate")
+     (ecb-file-popup-vc-diff "Diff against last version")
+     ("---")
+     (ecb-file-popup-vc-refresh-file "Recompute state for file")
+     (ecb-file-popup-vc-refresh-all-files "Recompute state for whole history")))
+      "*Static user extensions for the popup-menu of the history buffer.
+For further explanations see `ecb-directories-menu-user-extension'.
+
+The node-argument of a menu-function contains as data a cons:
+
+car is the filename of the source for which the popup-menu has
+been opened. cdr is the related buffer-name; but be careful,
+because the node can point to a dead buffer (see
+`ecb-kill-buffer-clears-history'). Use always `ecb-source-get-*'
+to extract whatever you need from the node-data. E.g. use
+`ecb-source-get-filename' to get the full filename of the source
+of the node and use `ecb-source-get-buffername' or `ecb-source-get-buffer' to
+get the buffername rsp. the buffer-object.
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of `ecb-history-menu' but the whole menu can be
+re-arranged with `ecb-history-menu-sorter'."
+  :group 'ecb-history
+  :type (ecb-create-menu-user-ext-type 1 ecb-max-submenu-depth))
+
+(defcustom ecb-history-menu-user-extension-function 'ignore
+  "*Dynamic user extensions for the popup-menu of the history buffer.
+A function which has to return a list in the same format like the option
+`ecb-history-menu-user-extension'. This function is called when the user
+opens the popup-menu for the history buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+history-buffer the function has to return nil. Therefore the default-value
+of this option is `ignore'.
+
+Per default the dynamic user-extensions are added in front of the static
+extensions of `ecb-history-menu-user-extension' but the whole menu can be
+re-arranged with `ecb-history-menu-sorter'."
+  :group 'ecb-history
+  :type 'function)
+
+(defcustom ecb-directories-menu-sorter nil
+  "*Function which re-sorts the menu-entries of the directories buffer.
+If a function then this function is called to re-arrange the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+`ecb-directories-menu-user-extension' and the built-in-menu
+`ecb-directories-menu'. If nil then no special sorting will be done and the
+user-extensions are placed in front of the built-in-entries.
+
+The function get one argument, a list of menu-entries. For the format of this
+argument see `ecb-directories-menu-user-extension'. The function must return a
+new list in the same format. Of course this function can not only re-arrange
+the entries but also delete entries or add new entries."
+  :group 'ecb-directories
+  :type '(choice :tag "Menu-sorter" :menu-tag "Menu-sorter"
+                 (const :tag "No special sorting" :value nil)
+                 (function :tag "Sort-function" :value identity)))
+
+
+(defcustom ecb-sources-menu-sorter nil
+  "*Function which re-sorts the menu-entries of the directories buffer.
+If a function then this function is called to sort the menu-entries of the
+combined menu-entries of the user-menu-extensions of
+`ecb-sources-menu-user-extension' and the built-in-menu
+`ecb-sources-menu'. If nil then no special sorting will be done and the
+user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+`ecb-directories-menu-sorter'."
+  :group 'ecb-sources
+  :type '(choice :tag "Menu-sorter" :menu-tag "Menu-sorter"
+                 (const :tag "No special sorting" :value nil)
+                 (function :tag "Sort-function" :value identity)))
+
+
+(defcustom ecb-history-menu-sorter nil
+  "*Function which re-sorts the menu-entries of the directories buffer.
+If a function then this function is called to sort the menu-entries of the
+combined menu-entries of the user-menu-extensions of
+`ecb-history-menu-user-extension' and the built-in-menu
+`ecb-history-menu'. If nil then no special sorting will be done and the
+user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+`ecb-directories-menu-sorter'."
+  :group 'ecb-history
+  :type '(choice :tag "Menu-sorter" :menu-tag "Menu-sorter"
+                 (const :tag "No special sorting" :value nil)
+                 (function :tag "Sort-function" :value identity)))
+
+
+(defcustom ecb-directories-buffer-after-create-hook nil
+  "*Local hook running after the creation of the directories-buffer.
+Every function of this hook is called once without arguments direct after
+creating the directories-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of `local-set-key' to define new
+key-bindings only for the directories-buffer of ECB.
+
+The following keys must not be rebind in the directories-buffer:
+<F2>, <F3> and <F4>"
+  :group 'ecb-directories
+  :type 'hook)
+
+
+(defcustom ecb-sources-buffer-after-create-hook nil
+  "*Local hook running after the creation of the sources-buffer.
+Every function of this hook is called once without arguments direct after
+creating the sources-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of `local-set-key' to define new
+key-bindings only for the sources-buffer of ECB."
+  :group 'ecb-sources
+  :type 'hook)
+
+
+(defcustom ecb-history-buffer-after-create-hook nil
+  "*Local hook running after the creation of the history-buffer.
+Every function of this hook is called once without arguments direct after
+creating the history-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of `local-set-key' to define new
+key-bindings only for the history-buffer of ECB."
+  :group 'ecb-history
+  :type 'hook)
+
+(defvar ecb-vc-needed-vc-package-available-p
+  (if (locate-library "vc-svn") t nil)
+  "Not nil if that vc-package is installed needed by ECB to enable vc-support.
+If this variable is nil all other vc related options of ECB have no effect!")
+
+(defcustom ecb-vc-enable-support (and ecb-vc-needed-vc-package-available-p
+                                      'unless-remote)
+  "*Enable support for version-control \(VC) systems.
+If on then in the directories-buffer \(if the value of the option
+`ecb-show-sources-in-directories-buffer' is on for current layout), the
+sources-buffer and the history-buffer all file-items are displayed with an
+appropriate icon in front of the item-name to indicate the VC-state of this
+item. If off then no version-control-state checking is done.
+
+Because this check can be take some time if files are managed by a not local
+Version-control-server ECB performs this check stealthy \(see
+`ecb-stealthy-tasks-delay') so normally there should no performance-decrease
+or additional waiting-time for the user. But to get sure this option offers
+three choices: t, 'unless-remote and nil. See the option
+`ecb-prescan-directories-for-emptyness' for an explanation for these three
+choices.
+
+The option `ecb-vc-directory-exclude-regexps' offers are more fine granularity
+to exclude the sources of certain directories from the VC-state-check.
+
+See `ecb-vc-supported-backends' how to customize the VC-support itself."
+  :group 'ecb-version-control
+  :group 'ecb-sources
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Switch on" :value t)
+                (const :tag "Switch off for remote directories" :value unless-remote)
+                (const :tag "Switch off completely" :value nil)))
+
+(defcustom ecb-vc-directory-exclude-regexps nil
+  "*Which directories should be excluded from VC-state-check.
+If a directory matches any of the regexps of this option the VC-state of its
+sources will not be checked - This option takes only effect if
+`ecb-vc-enable-support' is not nil."
+  :group 'ecb-version-control
+  :group 'ecb-sources
+  :type '(repeat (regexp :tag "Directory-regexp")))
+
+(defsubst ecb-vc-directory-should-be-checked-p (dir)
+  "Return not nil if the sources of DIR should be checked for VC-state.
+The check is performed according to the settings in the options
+`ecb-vc-enable-support' and `ecb-vc-directory-should-be-checked-p'."
+  (and ecb-vc-needed-vc-package-available-p
+       (or (equal t ecb-vc-enable-support)
+           (and (equal 'unless-remote ecb-vc-enable-support)
+                (not (ecb-remote-path dir))))
+       (not (ecb-match-regexp-list dir ecb-vc-directory-exclude-regexps))))
+
+(defcustom ecb-vc-state-mapping '((up-to-date       . up-to-date)
+                                  (edited           . edited)
+                                  (locally-modified . edited)
+                                  (needs-patch      . needs-patch)
+                                  (needs-checkout   . needs-patch)
+                                  (needs-merge      . needs-merge)
+                                  (unlocked-changes . unlocked-changes)
+                                  (added            . added)
+                                  (locally-added    . added)
+                                  (ignored          . ignored)
+                                  (unknown          . unknown))
+  "*Mapping from VC-state-values of the backends to VC-state-values of ECB.
+ECB understands the following state-values:
+
+  'up-to-date        The working file is unmodified with respect to the
+                     latest version on the current branch, and not locked.
+
+  'edited            The working file has been locally edited by the user. If
+                     locking is used for the file, this state means that
+                     the current version is locked by the calling user.
+
+  'needs-patch       The file has not been edited by the user, but there is
+                     a more recent version on the current branch stored
+                     in the master file.
+
+  'needs-merge       The file has been edited by the user, and there is also
+                     a more recent version on the current branch stored in
+                     the master file. This state can only occur if locking
+                     is not used for the file.
+
+  'unlocked-changes  The current version of the working file is not locked,
+                     but the working file has been changed with respect
+                     to that version. This state can only occur for files
+                     with locking\; it represents an erroneous condition that
+                     should be resolved by the user.
+
+  'added             The working file has already been added/registered to the
+                     VC-system but not yet commited.
+
+  'ignored           The version-control-system ignores this file \(e.g.
+                     because included in a .cvsignore-file in case of CVS).
+
+  'unknown           The state of the file can not be retrieved\; probably the
+                     file is not under a version-control-system.
+
+All state-values a check-vc-state-function of `ecb-vc-supported-backends' can
+return must have a mapping to one of the ECB-state-values listed above. If for
+a certain backend-VC-state no mapping can be found then per default 'edited is
+assumed!
+
+The default value of this option maps already the possible returned
+state-values of `ecb-vc-state', `vc-state' and `vc-recompute-state' \(both GNU
+Emacs) and `vc-cvs-status' \(Xemacs) to the ECB-VC-state-values."
+  :group 'ecb-version-control
+  :group 'ecb-sources
+  :initialize 'custom-initialize-default  
+  :set (function (lambda (sym val)
+                   (set sym val)
+                   (ecb-vc-cache-clear)))
+  :type '(repeat (cons (choice :tag "Backend VC-state"
+                               :menu-tag "Backend VC-state"
+                               (const :tag "up-to-date" :value up-to-date)
+                               (const :tag "edited" :value edited)
+                               (const :tag "locally-modified" :value locally-modified)
+                               (const :tag "needs-patch" :value needs-patch)
+                               (const :tag "needs-checkout" :value needs-checkout)
+                               (const :tag "needs-merge" :value needs-merge)
+                               (const :tag "unlocked-changes" :value unlocked-changes)
+                               (const :tag "added" :value added)
+                               (const :tag "locally-added" :value locally-added)
+                               (const :tag "ignored" :value ignored)
+                               (const :tag "unknown" :value unknown)
+                               (symbol :tag "Other..."))
+                       (choice :tag "ECB VC-state"
+                               :menu-tag "ECB VC-state"
+                               (const :tag "up-to-date" :value up-to-date)
+                               (const :tag "edited" :value edited)
+                               (const :tag "needs-patch" :value needs-patch)
+                               (const :tag "needs-merge" :value needs-merge)
+                               (const :tag "unlocked-changes" :value unlocked-changes)
+                               (const :tag "added" :value added)
+                               (const :tag "ignored" :value ignored)
+                               (const :tag "unknown" :value unknown)))))
+
+;; Remark why we need for ECB the information if a *directory* is managed by
+;; a version-control system and why we can not use the file-based machanism
+;; offered by vc*.el:
+;; With only a file-based check we would need to check each file in each directory
+;; when displaying the contents of a directory either in the sources-buffer or
+;; in the directories buffer (when ecb-show-sources-in-directories-buffer is
+;; not nil). With our directory-based machanism we check only if the directory
+;; is in general managed by a version-control system and then we perform the
+;; check for each file of a directory only in this case --> this is much
+;; faster.
+;; Therefore we can not use functions like `vc-backend' or `vc-registered'.
+
+(defcustom ecb-vc-supported-backends
+              '((ecb-vc-dir-managed-by-CVS . ecb-vc-state)
+                (ecb-vc-dir-managed-by-RCS . ecb-vc-state)
+                (ecb-vc-dir-managed-by-SCCS . ecb-vc-state)
+                (ecb-vc-dir-managed-by-SVN . ecb-vc-state)
+                (ecb-vc-dir-managed-by-GIT . ecb-vc-state)
+                (ecb-vc-dir-managed-by-MTN . ecb-vc-state))
+  "*Define how to to identify the VC-backend and how to check the state.
+The value of this option is a list containing cons-cells where the car is a
+function which is called to identify the VC-backend for a DIRECTORY and the
+cdr is a function which is called to check the VC-state of the FILEs contained
+in DIRECTORY.
+
+Identify-backend-function: It gets a full directory-name as argument - always
+without ending slash \(rsp. backslash for native Windows-XEmacs) - and has to
+return a unique symbol for the VC-backend which manages that directory \(e.g.
+'CVS for the CVS-system or 'RCS for the RCS-system) or nil if the file is not
+managed by a version-control-system.
+
+Check-vc-state-function: It gets a full filename \(ie. incl. the complete
+directory-part) and has to return a symbol which indicates the VC-state of
+that file. The possible returned values of such a check-vc-state-function have
+to be mapped with `ecb-vc-state-mapping' to the allowed ECB-VC-state values.
+
+ECB runs for a certain DIRECTORY all identify-backend-functions in that order
+they are listed in this option. For the first which returns a value unequal
+nil the associated check-state-function is used to retrieve the VC-state of
+all sourcefiles in that DIRECTORY.
+
+There is no need for the identify-backend-function or the
+check-vc-state-function to cache any state because ECB automatically caches
+internally all necessary informations for directories and files for best
+possible performance.
+
+To prepend ECB from checking the VC-state for any file set
+`ecb-vc-enable-support' to nil.
+
+Default value: Support for CVS, RCS, SCCS, Subversion, Git and
+Monotone. To identify the VC-backend the functions
+`ecb-vc-managed-by-CVS', `ecb-vc-managed-by-RCS' rsp.
+`ecb-vc-managed-by-SCCS' rsp. `ecb-vc-managed-by-SVN' rsp.
+`ecb-vc-managed-by-GIT' rsp. `ecb-vc-managed-by-MTN'are used.
+
+For all six backends the function `ecb-vc-state' of the
+VC-package is used by default \(which uses a heuristic and
+therefore faster but less accurate approach), but there is also
+`ecb-vc-recompute-state' available which is an alias for
+`vc-recompute-state' \(which returns accurate state-values by calling the
+backend which can be slow especialy for remote root-repositories!)
+
+Example: If `ecb-vc-recompute-state' \(to get real state-values not
+only heuristic ones) should be used to check the state for CVS-managed files
+and `ecb-vc-state' for all other backends then an element
+\(ecb-vc-dir-managed-by-CVS . ecb-vc-recompute-state) should be added at the
+beginning of this option."
+  :group 'ecb-version-control
+  :group 'ecb-sources
+  :initialize 'custom-initialize-default  
+  :set (function (lambda (sym val)
+                   (set sym val)
+                   (ecb-vc-cache-clear)))
+  :type '(repeat (cons :tag "Backend-identifier and state-checker"
+                       (choice :tag "Identify-backend-function"
+                               :menu-tag "Identify-backend-function"
+                               (const :tag "ecb-vc-dir-managed-by-CVS"
+                                      :value ecb-vc-dir-managed-by-CVS)
+                               (const :tag "ecb-vc-dir-managed-by-RCS"
+                                      :value ecb-vc-dir-managed-by-RCS)
+                               (const :tag "ecb-vc-dir-managed-by-SCCS"
+                                      :value ecb-vc-dir-managed-by-SCCS)
+                               (const :tag "ecb-vc-dir-managed-by-SVN"
+                                      :value ecb-vc-dir-managed-by-SVN)
+                               (const :tag "ecb-vc-dir-managed-by-GIT"
+                                      :value ecb-vc-dir-managed-by-GIT)
+                               (const :tag "ecb-vc-dir-managed-by-MTN"
+                                      :value ecb-vc-dir-managed-by-MTN)
+                               (function :tag "Any function"))
+                       (choice :tag "Check-state-function"
+                               :menu-tag "Check-state-function"
+                               (const :tag "ecb-vc-state (heuristic)"
+                                      :value ecb-vc-state)
+                               (const :tag "ecb-vc-recompute-state (accurate)"
+                                      :value ecb-vc-recompute-state)
+                               (function :tag "Any function")))))
+
+
+
+;;====================================================
+;; Internals
+;;====================================================
+
+
+;; constants for the node-types - they should be all different!
+(defconst ecb-directories-nodetype-directory 100)
+(defconst ecb-directories-nodetype-sourcefile 200)
+(defconst ecb-directories-nodetype-sourcepath 300)
+(defconst ecb-sources-nodetype-sourcefile 400)
+(defconst ecb-history-nodetype-bucket 500)
+(defconst ecb-history-nodetype-filebuffer 600)
+(defconst ecb-history-nodetype-indirect-filebuffer 700)
+
+
+;; accessors for the FILES-AND-SUBDIRS-cache
+
+(defun ecb-files-and-subdirs-cache-add (dir cached-value)
+  "Add the files and subdirs of DIR to the cache."
+  (ecb-multicache-put-value 'ecb-filename-cache dir 'FILES-AND-SUBDIRS
+                             cached-value))
+
+(defun ecb-files-and-subdirs-cache-get (dir)
+  "Get the files and subdirs of DIR from the cache. Nil if not cached."
+  (ecb-multicache-get-value 'ecb-filename-cache dir 'FILES-AND-SUBDIRS))
+
+(defun ecb-files-and-subdirs-cache-remove (dir)
+  "Remove DIR from the cache."
+  (ecb-multicache-clear-value 'ecb-filename-cache dir 'FILES-AND-SUBDIRS))
+
+(defun ecb-files-and-subdirs-cache-clear ()
+  "Clear the whole FILES-AND-SUBDIRS-cache."
+  (ecb-multicache-clear-subcache 'ecb-filename-cache 'FILES-AND-SUBDIRS))
+
+(defun ecb-files-and-subdirs-cache-dump (&optional no-nil-value)
+  "Dump the whole FILES-AND-SUBDIRS-cache in another window. If NO-NIL-VALUE
+is not nil then these cache-entries are not dumped. This command is not
+intended for end-users of ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache
+                                 'FILES-AND-SUBDIRS
+                                 no-nil-value))
+  
+;; accessors for the EMPTY-DIR-P-cache
+
+(defun ecb-directory-empty-cache-add (dir cached-value)
+  "Add information if DIR is empty or not to the cache."
+  (ecb-multicache-put-value 'ecb-filename-cache dir 'EMPTY-DIR-P
+                             cached-value))
+
+(defun ecb-directory-empty-cache-get (dir)
+  "get information if DIR is empty or not from the cache."
+  (ecb-multicache-get-value 'ecb-filename-cache dir 'EMPTY-DIR-P))
+
+(defun ecb-directory-empty-cache-remove (dir)
+  "Remove DIR from the EMPTY-DIR-P-cache."
+  (ecb-multicache-clear-value 'ecb-filename-cache dir 'EMPTY-DIR-P))
+
+(defun ecb-directory-empty-cache-remove-all (dir)
+  "Remove DIR and all its suddirs from the EMPTY-DIR-P-cache."
+  (ecb-directory-empty-cache-remove dir)
+  ;; now we remove the subdirs
+  (save-match-data
+    (ecb-multicache-mapsubcache
+     'ecb-filename-cache 'EMPTY-DIR-P
+     (function (lambda (key old-value)
+                 (if (string-match (concat "^"
+                                           (regexp-quote dir)
+                                           ".+")
+                                   key)
+                     ;; the directory-key matches DIR so its a cache
+                     ;; subdirectory of DIR so we return nil ==> in fact we
+                     ;; remove this subdir from the empty-dir-p-cache
+                     nil
+                   ;; the directory-key doesn't match DIR so we just return
+                   ;; the old-value, which means in fact that nothing changes
+                   old-value))))))
+
+(defun ecb-directory-empty-cache-clear ()
+  "Clear the whole EMPTY-DIR-P-cache."
+  (ecb-multicache-clear-subcache 'ecb-filename-cache 'EMPTY-DIR-P))
+
+(defun ecb-directory-empty-cache-dump (&optional no-nil-value)
+  "Dump the whole EMPTY-DIR-P-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of
+ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache
+                                 'EMPTY-DIR-P no-nil-value))
+
+
+;; accessors for the SOURCES-cache
+
+(defun ecb-sources-cache-remove (dir)
+  "Remove the cache-entry for DIR from the cache."
+  (ecb-multicache-clear-value 'ecb-filename-cache dir 'SOURCES))
+
+(defun ecb-sources-cache-add-full (dir cache-elem-full)
+  "Add the full sources-cache CACHE-ELEM-FULL for DIR to the cache. If there
+is already a full cache-entry then replace it. CACHE-ELEM-FULL has to be a
+list as returned by `ecb-sources-cache-get-full'."
+  (ecb-multicache-apply-to-value
+   'ecb-filename-cache dir 'SOURCES
+   (function (lambda (old-cached-value)
+               (if (consp old-cached-value)
+                   (progn
+                     (setcar old-cached-value cache-elem-full)
+                     old-cached-value)
+                 (cons cache-elem-full nil))))))
+
+(defun ecb-sources-cache-add-filtered (dir cache-elem-filtered)
+  "Add the filtered sources-cache CACHE-ELEM-FILTERED for DIR to the cache. If
+there is already a filtered cache-entry then replace it. CACHE-ELEM-FILTERED
+has to be a list as returned by `ecb-sources-cache-get-filtered'."
+  (ecb-multicache-apply-to-value
+   'ecb-filename-cache dir 'SOURCES
+   (function (lambda (old-cached-value)
+               (if (consp old-cached-value)
+                   (progn
+                     (setcdr old-cached-value cache-elem-filtered)
+                     old-cached-value)
+                 (cons nil cache-elem-filtered))))))
+
+(defun ecb-sources-cache-get-full (dir)
+  "Return the full value of a cached-directory DIR, means the 3-element-list
+\(tree-buffer-root, tree-buffer-displayed-nodes, sources-buffer-string). If no
+cache-entry for DIR is available then nil is returned."
+  (car (ecb-multicache-get-value 'ecb-filename-cache dir 'SOURCES)))
+
+(defun ecb-sources-cache-get-filtered (dir)
+  "Return the filtered value of a cached-directory DIR, means the
+4-element-list \(tree-buffer-root, tree-buffer-displayed-nodes,
+sources-buffer-string, filter-regexp). If no cache-entry for DIR is available
+then nil is returned."
+  (cdr (ecb-multicache-get-value 'ecb-filename-cache dir 'SOURCES)))
+
+(defun ecb-sources-cache-clear ()
+  "Clear the whole SOURCES-cache."
+  (ecb-multicache-clear-subcache 'ecb-filename-cache 'SOURCES))
+
+(defun ecb-sources-cache-dump (&optional no-nil-value)
+  "Dump the whole SOURCES-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of
+ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache 'SOURCES no-nil-value))
+
+;; accessors for the VC-cache
+
+(defun ecb-vc-cache-add-file (file state checked-buffer-names)
+  (ecb-multicache-put-value 'ecb-filename-cache file 'VC
+                            (list state
+                                  (ecb-subseq (current-time) 0 2)
+                                  checked-buffer-names))
+  state)
+
+(defun ecb-vc-cache-add-dir (dir backend)
+  (ecb-multicache-put-value 'ecb-filename-cache dir 'VC backend)
+  backend)
+
+(defun ecb-vc-cache-get (file)
+  (ecb-multicache-get-value 'ecb-filename-cache file 'VC))
+
+(defun ecb-vc-cache-remove (file)
+  "Remove FILE from the VC-cache."
+  (ecb-multicache-clear-value 'ecb-filename-cache file 'VC))
+
+(defun ecb-vc-cache-remove-files-of-dir (dir)
+  "Remove all files contained in DIR from the VC-cache."
+  (let* ((dir-sep-string (ecb-directory-sep-string dir))
+         (regexp (concat "^"
+                         (regexp-quote dir)
+                         (regexp-quote dir-sep-string)
+                         "[^"
+                         dir-sep-string
+                         "]+$")))
+    (save-match-data
+      (ecb-multicache-mapsubcache
+       'ecb-filename-cache 'VC
+       (function (lambda (key old-value)
+                   (if (and old-value
+                            (string-match regexp key))
+                       ;; the filename-key has a VC-cache value and matches the
+                       ;; regexp above so its a cached file of DIR so we return
+                       ;; nil ==> in fact we remove this file from the VC-cache
+                       nil
+                     ;; the filename-key doesn't match the regexp above so we
+                     ;; just return the old-value, which means in fact that
+                     ;; nothing changes
+                     old-value)))))))
+
+
+(defun ecb-vc-cache-clear ()
+  "Clear the whole VC-cache."
+  (ecb-multicache-clear-subcache 'ecb-filename-cache 'VC))
+
+(defun ecb-vc-cache-dump (&optional no-nil-value)
+  "Dump the whole VC-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of
+ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache 'VC no-nil-value))
+
+;; accessors for the REMOTE-PATH cache
+
+(defun ecb-remote-path-cache-add (path remote-path)
+  "Add the value of REMOTE-PATH for PATH to the REMOTE-PATH-cache."
+  (ecb-multicache-put-value 'ecb-filename-cache path 'REMOTE-PATH
+                            remote-path))
+
+(defun ecb-remote-path-cache-get (path)
+  "Return the cached value for PATH from the REMOTE-PATH-cache."
+  (ecb-multicache-get-value 'ecb-filename-cache path 'REMOTE-PATH))
+
+(defun ecb-remote-path-cache-dump (&optional no-nil-value)
+  "Dump the whole REMOTE-PATH-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of
+ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache 'REMOTE-PATH no-nil-value))
+
+;; accessors for the HOST-ACCESSIBLE cache
+
+(defun ecb-host-accessible-cache-add (host accessible-p)
+  "Add the value of ACCESSIBLE-P to the HOST-ACCESSIBLE-cache with key HOST."
+  (ecb-multicache-put-value 'ecb-filename-cache host 'HOST-ACCESSIBLE
+                            (cons (current-time) accessible-p)))
+
+(defun ecb-host-accessible-cache-get (host valid-time)
+  "Get the accessible-p value from the HOST-ACCESSIBLE-cache. If the cache
+entry is older then VALID-TIME \(in seconds) then it is discarded."
+  (let ((value (ecb-multicache-get-value 'ecb-filename-cache host
+                                         'HOST-ACCESSIBLE)))
+    (if (or (null value)
+            (> (ecb-time-diff (current-time) (car value) t) valid-time))
+        ;; either not yet cached or outdated
+        nil
+      ;; return the valid cache-value
+      (cdr value))))
+
+(defun ecb-host-accessible-cache-dump (&optional no-nil-value)
+  "Dump the whole HOST-ACCESSIBLE-cache. If NO-NIL-VALUE is not nil then these
+cache-entries are not dumped. This command is not intended for end-users of
+ECB."
+  (interactive "P")
+  (ecb-multicache-print-subcache 'ecb-filename-cache 'HOST-ACCESSIBLE no-nil-value))
+
+
+;; ---- end of filename-cache implementation -----------------------
+
+(defun ecb-file-browser-initialize-caches ()
+  "Initialize the caches of the file-browser of ECB."
+  (ecb-reset-history-filter)
+  (ecb-filename-cache-init))
+
+(defun ecb-file-browser-initialize (&optional no-caches)
+  "Initialize the file-browser of ECB. If optional arg NO-CACHES is not nil
+then the caches used by the file-browser will not be initialized."
+  (setq ecb-path-selected-directory nil
+        ecb-path-selected-source nil)
+  (unless no-caches
+    (ecb-file-browser-initialize-caches)))
+  
+(defun ecb-goto-window-directories ()
+  "Make the ECB-directories window the current window.
+If `ecb-use-speedbar-instead-native-tree-buffer' is 'dir then goto to the
+speedbar-window."
+  (interactive)
+  (or (ecb-goto-ecb-window ecb-directories-buffer-name)
+      (and (equal ecb-use-speedbar-instead-native-tree-buffer 'dir)
+           (ecb-goto-window-speedbar))))
+
+(defun ecb-goto-window-sources ()
+  "Make the ECB-sources window the current window.
+If `ecb-use-speedbar-instead-native-tree-buffer' is 'source then goto to the
+speedbar-window."
+  (interactive)
+  (or (ecb-goto-ecb-window ecb-sources-buffer-name)
+      (and (equal ecb-use-speedbar-instead-native-tree-buffer 'source)
+           (ecb-goto-window-speedbar))))
+
+(defun ecb-goto-window-history ()
+  "Make the ECB-history window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-history-buffer-name))
+
+(defun ecb-maximize-window-directories ()
+  "Maximize the ECB-directories-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-directories-window is not visible in current layout."
+  (interactive)
+  (if (equal ecb-use-speedbar-instead-native-tree-buffer 'dir)
+      (ecb-maximize-window-speedbar)
+    (ecb-maximize-ecb-buffer ecb-directories-buffer-name t)))
+
+(defun ecb-maximize-window-sources ()
+  "Maximize the ECB-sources-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-sources-window is not visible in current layout."
+  (interactive)
+  (if (equal ecb-use-speedbar-instead-native-tree-buffer 'source)
+      (ecb-maximize-window-speedbar)
+    (ecb-maximize-ecb-buffer ecb-sources-buffer-name t)))
+
+(defun ecb-maximize-window-history ()
+  "Maximize the ECB-history-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-history-window is not visible in current layout."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-history-buffer-name t))
+
+(defecb-window-dedicator ecb-set-directories-buffer ecb-directories-buffer-name
+  "Display the Directories-buffer in current window and make window dedicated."
+  (let ((set-directories-buffer
+         (not (equal ecb-use-speedbar-instead-native-tree-buffer 'dir))))
+    ;; first we act depending on the value of
+    ;; ecb-use-speedbar-instead-native-tree-buffer
+    (when (not set-directories-buffer)
+      (condition-case error-data
+          (ecb-set-speedbar-buffer)
+        ;; setting the speedbar buffer has failed so we set
+        ;; set-directories-buffer to t ==> standard-directories-buffer is set!
+        (error (message "%s" error-data)
+               (setq set-directories-buffer t))))
+    ;; maybe we need to set the standard directories buffer:
+    ;; - if ecb-use-speedbar-instead-native-tree-buffer is not 'dir or
+    ;; - if setting the speedbar buffer has failed.
+    (when set-directories-buffer
+      (if (null ecb-use-speedbar-instead-native-tree-buffer)
+          (ignore-errors (ecb-speedbar-deactivate)))
+      (switch-to-buffer ecb-directories-buffer-name))))
+
+(defecb-window-dedicator ecb-set-sources-buffer ecb-sources-buffer-name
+  "Display the Sources-buffer in current window and make window dedicated."
+  (let ((set-sources-buffer
+         (not (equal ecb-use-speedbar-instead-native-tree-buffer 'source))))
+    ;; first we act depending on the value of
+    ;; ecb-use-speedbar-instead-native-tree-buffer
+    (when (not set-sources-buffer)
+      (condition-case error-data
+          (ecb-set-speedbar-buffer)
+        ;; setting the speedbar buffer has failed so we set
+        ;; set-sources-buffer to t ==> standard-sources-buffer is set!
+        (error (message "%s" error-data)
+               (setq set-sources-buffer t))))
+    ;; maybe we need to set the standard sources buffer:
+    ;; - if ecb-use-speedbar-instead-native-tree-buffer is not 'source or
+    ;; - if setting the speedbar buffer has failed.
+    (when set-sources-buffer
+      (if (null ecb-use-speedbar-instead-native-tree-buffer)
+          (ignore-errors (ecb-speedbar-deactivate)))
+      (switch-to-buffer ecb-sources-buffer-name))))
+
+(defecb-window-dedicator ecb-set-history-buffer ecb-history-buffer-name
+  "Display the History-buffer in current window and make window dedicated."
+  (switch-to-buffer ecb-history-buffer-name))
+
+(defecb-autocontrol/sync-function ecb-basic-buffer-sync nil ecb-basic-buffer-sync nil
+  "Synchronizing the basic tree-buffers of ECB.
+
+The basic ecb-buffers are the tree-buffers for drirectories, sources, history
+and methods.
+
+Under the following additional conditions some tasks are performed:
+
+- Current buffer is a file-buffer and either FORCE is not nil or the buffer
+  is different from the source-file currently displayed in the
+  ECB-tree-buffers:
+
+  Synchronizing all basic tree-buffers \(directories, sources, history,
+  methods) with the current buffer
+
+- Current buffer is a dired-buffer:
+
+  Synchronizing the directory- and sources-tree-buffer if visible
+
+At the end the hooks in `ecb-basic-buffer-sync-hook' run."
+  (when (and ecb-minor-mode
+             (not ecb-windows-hidden)
+             (ecb-point-in-edit-window-number))
+    (let* ((filename (ecb-buffer-file-name (current-buffer))))
+      (cond ( ;; synchronizing for real filesource-buffers and indirect
+              ;; buffers which have a filesource-buffer as base-buffer
+             (and filename
+                  (ecb-buffer-or-file-readable-p filename)
+                  (or force
+                      (not (equal (ecb-source-make filename (buffer-name))
+                                  (ecb-path-selected-source)))))
+             
+             ;; * KB: Problem: seems this little sleep is necessary because
+             ;; otherwise jumping to certain markers in new opened files (e.g.
+             ;; with next-error etc. ) doesnĀ“t work correct. CanĀ“t debug down
+             ;; this mysterious thing! Regardless of the size of the file to
+             ;; load, this 0.1 fraction of a sec is enough!
+             ;; * KB: With current ECB implementation this sit-for seems not
+             ;;   longer necessary, it works with every Emacs version correct.
+             ;;   Therefore i comment out the sit-for until this error occurs
+             ;;   again.
+             ;; (sit-for 0.1)
+             
+             ;; if the file is not located in any of the paths in
+             ;; `ecb-source-path' or in the paths returned from
+             ;; `ecb-source-path-functions' we must at least add the new
+             ;; source path temporally to our paths. But the user has also
+             ;; the choice to save it for future sessions too.
+             (if (null (ecb-matching-source-paths filename))
+                 (let* ((norm-filename (ecb-fix-filename filename))
+                        (remote-path (ecb-remote-path norm-filename))
+                        (source-path (if (car ecb-add-path-for-not-matching-files)
+                                         ;; we always add the only the root
+                                         ;; as source-path
+                                         (if remote-path
+                                             ;; for a remote-path we add the
+                                             ;; host+ the root of the host
+                                             (concat (car remote-path) "/")
+                                           ;; filename is a local-path
+                                           (if (= (aref norm-filename 0) ?/)
+                                               ;; for Unix-style-path we add the
+                                               ;; root-dir
+                                               (substring norm-filename 0 1)
+                                             ;; for win32-style-path we add
+                                             ;; the drive; because
+                                             ;; `ecb-fix-filename' also
+                                             ;; converts cygwin-path-style
+                                             ;; to win32-path-style here
+                                             ;; also the drive is added.
+                                             (substring norm-filename 0 2)))
+                                       ;; add the full directory as source-path
+                                       (ecb-file-name-directory norm-filename))))
+                   (ecb-add-source-path source-path (ecb-fix-filename source-path)
+                                        (not (cdr ecb-add-path-for-not-matching-files)))))
+             
+             ;; now we can be sure that a matching source-path exists
+             
+             ;; Klaus: The explicit update of the directories buffer is not
+             ;; necessary because the sync with the current source is done by
+             ;; `ecb-select-source'!
+             ;; (ecb-update-directories-buffer)
+             (ecb-path-selected-source-set filename (buffer-name))
+             (ecb-select-source force)
+             (ecb-update-methods-buffer--internal 'scroll-to-begin)
+             (setq ecb-major-mode-selected-source major-mode)
+             
+             ;; Klaus Berndl <klaus.berndl@sdm.de>: is now be done at the
+             ;; end of `ecb-rebuild-methods-buffer-with-tagcache' which is
+             ;; called by `ecb-update-methods-buffer--internal'!
+             
+             ;; selected source has changed, therefore we must initialize
+             ;; ecb-selected-tag again.
+             (ecb-tag-sync 'force)
+             )
+            
+            ( ;; synchronizing for dired-mode
+             (eq major-mode 'dired-mode)
+             (ecb-set-selected-directory
+              (or (and (stringp dired-directory)
+                       (ecb-file-exists-p dired-directory)
+                       dired-directory)
+                  (and (listp dired-directory)
+                       (car dired-directory)))))
+            (t nil)))
+    (run-hooks 'ecb-basic-buffer-sync-hook)
+    ))
+
+  
+(defun ecb-expand-directory-tree (path node)
+  "Expands the directory part so the node representing PATH is visible.
+Start with the childrens of NODE. Return not nil when an expansion has been
+done \(so normally the tree-buffer must be rebuild). Return nil if the
+expansion-state of the tree can show without any further expansion the node
+representing PATH."
+  (catch 'exit
+    (dolist (child (tree-node->children node))
+      (let ((data (tree-node->data child)))
+        (when (and (>= (length path) (length data))
+                   (ecb-string= (substring path 0 (length data)) data)
+                   (or (= (length path) (length data))
+                       (eq (elt path (length data))
+                           (ecb-directory-sep-char path))))
+          (let ((was-expanded (or (not (tree-node->expandable child))
+                                  (tree-node->expanded child))))
+            (setf (tree-node->expanded child) t)
+            (ecb-update-directory-node child)
+            (throw 'exit
+                   (or (when (> (length path) (length data))
+                         (ecb-expand-directory-tree path child))
+                       (not was-expanded)))))))))
+
+
+(defun ecb-check-directory-for-caching (dir number-of-contents)
+  "Return not nil if DIR matches not any regexp of the option
+`ecb-cache-directory-contents-not' but matches at least one regexp in
+`ecb-cache-directory-contents' and NUMBER-OF-CONTENTS is greater then the
+related threshold."
+  (and (not (catch 'exit
+              (dolist (elem ecb-cache-directory-contents-not)
+                (let ((case-fold-search t))
+                  (save-match-data
+                    (if (string-match (car elem) dir)
+                        (throw 'exit (car elem))))
+                  nil))))
+       (catch 'exit
+         (dolist (elem ecb-cache-directory-contents)
+           (let ((case-fold-search t))
+             (save-match-data
+               (if (and (string-match (car elem) dir)
+                        (> number-of-contents (cdr elem)))
+                   (throw 'exit (car elem))))
+             nil)))))
+
+
+(defun ecb-check-directory-for-source-regexps (dir)
+  "Return the related source-exclude-include-regexps of
+`ecb-source-file-regexps' if DIR matches any directory-regexp in
+`ecb-source-file-regexps'."
+  (ecb-match-regexp-list dir ecb-source-file-regexps 'car 'cdr))
+
+
+(defun ecb-files-from-cvsignore (dir)
+  "Return an expanded list of filenames which are excluded by the .cvsignore
+file in current directory."
+  (let ((cvsignore-content (ecb-file-content-as-string
+                            (ecb-expand-file-name ".cvsignore" dir)))
+        (files nil))
+    (when cvsignore-content
+      (dolist (f (split-string cvsignore-content))
+        (setq files (append (ecb-directory-files dir nil
+                                                 (wildcard-to-regexp f) t)
+                            files)))
+      files)))
+
+
+(defun ecb-check-directory-for-cvsignore-exclude (dir)
+  "Return not nil if DIR matches a regexp in `ecb-sources-exclude-cvsignore'."
+  (ecb-match-regexp-list dir ecb-sources-exclude-cvsignore))
+
+(defun ecb-get-sources-sort-function (sort-method &optional ignore-case)
+  "According to SORT-METHOD \(which can either be 'name, 'extension or nil)
+and IGNORE-CASE return a function which can be used as argument for `sort'."
+  (case sort-method
+    (name
+     (function (lambda (a b)
+                 (ecb-string< a b ecb-sources-sort-ignore-case))))
+    (extension
+     (function
+      (lambda(a b)
+        (let ((ext-a (ecb-file-name-extension a t))
+              (ext-b (ecb-file-name-extension b t)))
+          (if (ecb-string= ext-a ext-b ecb-sources-sort-ignore-case)
+              (ecb-string< a b ecb-sources-sort-ignore-case)
+            (ecb-string< ext-a ext-b ecb-sources-sort-ignore-case))))))
+    (otherwise
+     (function (lambda (a b)
+                 nil)))))
+
+
+(defun ecb-get-files-and-subdirs (dir)
+  "Return a cons cell where car is a list of all files to display in DIR and
+cdr is a list of all subdirs to display in DIR. Both lists are sorted
+according to `ecb-sources-sort-method'."
+  (or (ecb-files-and-subdirs-cache-get dir)
+      ;; dir is not cached
+      (let ((files (ecb-directory-files dir nil nil t))
+            (source-regexps (or (ecb-check-directory-for-source-regexps
+                                 (ecb-fix-filename dir))
+                                '(("") (""))))
+            (cvsignore-files (if (ecb-check-directory-for-cvsignore-exclude dir)
+                                 (ecb-files-from-cvsignore dir)))
+            sorted-files source-files subdirs cached-value)
+        ;; if necessary sort FILES
+        (setq sorted-files
+              (if ecb-sources-sort-method
+                  (sort files (ecb-get-sources-sort-function
+                               ecb-sources-sort-method))
+                files))
+        ;; divide real files and subdirs. For really large directories (~ >=
+        ;; 2000 entries) this is the performance-bottleneck in the
+        ;; file-browser of ECB.
+        (dolist (file sorted-files)
+          (if (ecb-file-directory-p (ecb-fix-filename dir file))
+              (when (not (ecb-check-dir-exclude file))
+;;                 (when (not (ecb-file-accessible-directory-p file))
+;;                   (ecb-merge-face-into-text file
+;;                                             ecb-directory-not-accessible-face))
+                (setq subdirs (append subdirs (list file))))
+            (when (and (not (member file cvsignore-files))
+                       (or (ecb-match-regexp-list file (cadr source-regexps))
+                           (not (ecb-match-regexp-list file (car source-regexps)))))
+              (setq source-files (append source-files (list file))))))
+        
+        (setq cached-value (cons source-files subdirs))
+        ;; check if this directory must be cached
+        (if (ecb-check-directory-for-caching dir (length sorted-files))
+            (ecb-files-and-subdirs-cache-add dir cached-value))
+        ;; return the result
+        cached-value)))
+
+
+(defun ecb-update-sources-buffer (dir-before-update)
+  "Updates the sources-buffer with all sources contained in
+`ecb-path-selected-directory' - the contents are either newly computed or come
+from the `ecb-sources-cache'. DIR-BEFORE-UPDATE is the directory which was
+selected before this update."
+
+  ;; Here we add a cache-mechanism which caches for each path the node-tree
+  ;; and the whole buffer-string of the sources-buffer. A cache-elem would be
+  ;; removed from the cache if a directory is POWER-clicked in the directories
+  ;; buffer because this is the only way to synchronize the sources-buffer
+  ;; with the disk-contents of the clicked directory. This works because the
+  ;; tree of the sources-buffer contains only not expandable nodes (see the
+  ;; comment in `ecb-rebuild-methods-buffer-with-tagcache'). If we would
+  ;; make the nodes in the Sources-buffer "expandable" this caching would not
+  ;; work!
+  
+  (ecb-exec-in-window ecb-sources-buffer-name
+    ;; if we have a filtered cache we must display it - otherwise we use the
+    ;; full cache if there is any
+    (let ((cache-elem (or (ecb-sources-cache-get-filtered ecb-path-selected-directory)
+                          (ecb-sources-cache-get-full ecb-path-selected-directory))))
+      (if cache-elem
+          (progn
+            (tree-buffer-set-root (nth 0 cache-elem))
+            (tree-buffer-update nil (cons (nth 2 cache-elem)
+                                          (nth 1 cache-elem))))
+        (let ((new-tree (tree-node-new-root))
+              (old-children (tree-node->children (tree-buffer-get-root)))
+              (new-cache-elem nil))
+          ;; building up the new files-tree
+          (ecb-tree-node-add-files
+           new-tree
+           ecb-path-selected-directory
+           (car (ecb-get-files-and-subdirs ecb-path-selected-directory))
+           ecb-sources-nodetype-sourcefile
+           ecb-show-source-file-extension old-children t)
+
+          ;; updating the buffer itself
+          (tree-buffer-set-root new-tree)
+          (tree-buffer-update)
+
+          ;; check if the sources buffer for this directory must be
+          ;; cached: If yes update the cache
+          (when (ecb-check-directory-for-caching
+                 ecb-path-selected-directory
+                 (tree-buffer-number-of-displayed-nodes))
+            (setq new-cache-elem (list (tree-buffer-get-root)
+                                       (tree-buffer-displayed-nodes-copy)
+                                       (ecb-buffer-substring (point-min)
+                                                             (point-max))))
+            (ecb-sources-cache-add-full ecb-path-selected-directory
+                                        new-cache-elem))))
+           
+      (when (not (ecb-string= dir-before-update ecb-path-selected-directory))
+        (ecb-scroll-window (point-min) (point-min))))))
+
+(defun ecb-sources-filter-by-ext (ext-str)
+  "Filter the sources by extension EXT-STR."
+  (if (= (length ext-str) 0)
+      (ecb-apply-filter-to-sources-buffer
+       "^[^.]+$" ;; matches only filenames with no extension
+       "No ext.")
+    (ecb-apply-filter-to-sources-buffer
+     (format "\\.%s\\'" ext-str)
+     (format "*.%s" ext-str))))
+
+(tree-buffer-defpopup-command ecb-popup-sources-filter-by-ext
+  "Filter the sources by extension by popup."
+  (ecb-sources-filter-by-ext
+   (read-string "Insert the filter-extension without leading dot: "
+                (and node
+                     (ecb-file-name-extension (tree-node->data node))))))
+
+(defun ecb-sources-filter-by-regexp (&optional regexp filter-display)
+  "Filter history entries by REGEXP. If the first optional argument REGEXP is
+nil then it asks for a regexp. If second argument FILTER-DISPLAY is not nil
+then it is displayed in the modeline of the history-buffer for current
+regexp-filter. Otherwise the regexp itself."
+(let ((regexp-str (or regexp (read-string "Insert the filter-regexp: "))))
+    (if (> (length regexp-str) 0)
+        (ecb-apply-filter-to-sources-buffer regexp-str filter-display))))
+  
+(tree-buffer-defpopup-command ecb-popup-sources-filter-by-regexp
+  "Filter the sources by regexp by popup."
+  (ecb-sources-filter-by-regexp))
+  
+(tree-buffer-defpopup-command ecb-popup-sources-filter-none
+  "Remove any filter from the sources by popup."
+  (ecb-apply-filter-to-sources-buffer nil))
+  
+
+(defun ecb-sources-filter ()
+  "Apply a filter to the sources-buffer to reduce the number of entries.
+So you get a better overlooking. There are three choices:
+- Filter by extension: Just insert the extension you want the Sources-buffer
+  being filtered. Insert the extension without leading dot!
+- Filter by regexp: Insert the filter as regular expression.
+- No filter: This means to display an entry for every file in the current
+  selected directory \(all except these filter already filtered out by
+  `ecb-source-file-regexps' and `ecb-sources-exclude-cvsignore').
+Such a filter is only applied to the current selected directory, i.e. each
+directory has its own filtered sources-buffer."
+  (interactive)
+  (let ((choice (ecb-query-string "Filter sources by:"
+                                  '("extension" "regexp" "nothing"))))
+    (cond ((ecb-string= choice "extension")
+           (ecb-sources-filter-by-ext
+            (read-string "Insert the filter-extension without leading dot: ")))
+          ((ecb-string= choice "regexp")
+           (ecb-sources-filter-by-regexp))
+          (t (ecb-apply-filter-to-sources-buffer nil)))))
+
+(defun ecb-sources-filter-modeline-prefix (buffer-name sel-dir sel-source)
+  "Compute a mode-line prefix for the Sources-buffer so the current filter
+applied to the sources is displayed. This function is only for using by
+the option `ecb-mode-line-prefixes'."
+  (let ((filtered-cache-elem (ecb-sources-cache-get-filtered sel-dir)))
+    (if (null filtered-cache-elem)
+        nil ;; no prefix if no filter
+      (format "[Filter: %s]" (cdr (nth 3 filtered-cache-elem))))))
+
+(defun ecb-apply-filter-to-sources-buffer (filter-regexp &optional filter-display)
+  "Apply the regular expression FILTER-REGEXP to the files of
+`ecb-path-selected-directory' and display only the filtered files in the
+Sources-buffer. If FILTER-REGEXP is nil then any applied filter is removed and
+all files are displayed. Returns t if the filter has been applied otherwise
+nil. Returns 'window-not-visible if the ECB-sources-buffer is not visible."
+  (prog1
+      (ecb-exec-in-window ecb-sources-buffer-name
+        (if (or (null filter-regexp) (= (length filter-regexp) 0))
+            ;; no filtering
+            (progn
+              ;; remove the filtered cache by setting it to nil
+              (ecb-sources-cache-add-filtered ecb-path-selected-directory nil)
+              ;; update the sources buffer - because the filtered cache is nil
+              ;; the full sources are displayed.
+              (ecb-update-sources-buffer ecb-path-selected-directory)
+              (tree-buffer-highlight-node-by-data/name (ecb-path-selected-source 'file))
+              nil)
+          ;; apply the filter-regexp
+          (let ((new-tree (tree-node-new-root))
+                (old-children (tree-node->children (tree-buffer-get-root)))
+                (all-files (car (ecb-get-files-and-subdirs ecb-path-selected-directory)))
+                (filtered-files nil))
+            (save-match-data
+              (dolist (file all-files)
+                (if (string-match filter-regexp file)
+                    (setq filtered-files
+                          (cons file filtered-files)))))
+            (if (null filtered-files)
+                (progn
+                  (ecb-apply-filter-to-sources-buffer nil)
+                  (message "ECB has not applied this filter because it would filter out all files!")
+                  nil)
+              ;; building up the new files-tree
+              (ecb-tree-node-add-files
+               new-tree
+               ecb-path-selected-directory
+               (nreverse filtered-files)
+               ecb-sources-nodetype-sourcefile
+               ecb-show-source-file-extension old-children t)
+
+              ;; updating the buffer itself
+              (tree-buffer-set-root new-tree)
+              (tree-buffer-update)
+              (ecb-scroll-window (point-min) (point-min))
+              (tree-buffer-highlight-node-by-data/name (ecb-path-selected-source 'file))
+
+              ;; add the new filter to the cache, so the next call to
+              ;; `ecb-update-sources-buffer' displays the filtered sources.
+              (ecb-sources-cache-add-filtered ecb-path-selected-directory
+                                              (list (tree-buffer-get-root)
+                                                    (tree-buffer-displayed-nodes-copy)
+                                                    (ecb-buffer-substring (point-min)
+                                                                          (point-max))
+                                                    (cons filter-regexp
+                                                          (or filter-display
+                                                              filter-regexp))))
+              t))))
+    ;; now we update the mode-lines so the current filter (can be no filter) is
+    ;; displayed in the mode-line. See `ecb-sources-filter-modeline-prefix'.
+    (ecb-mode-line-format)))
+
+(defun ecb-matching-source-paths (path-to-match &optional sorted)
+  "Return all source-paths of `ecb-source-path' which match PATH-TO-MATCH. If
+SORTED is not nil then the paths are sorted by descending length, means the
+longest path \(which is the best matching) is the first elem and the shortest
+path the last elem. Otherwise the matching paths are returned in that sequence
+they occur in `ecb-source-paths'."
+  (let* ((p-t-m (ecb-fix-filename path-to-match))
+         (normed-current-source-paths
+          (mapcar (function (lambda (elem)
+                              (ecb-fix-filename (if (listp elem) (car elem) elem))))
+                  (append (ecb-get-source-paths-from-functions)
+                          ecb-source-path)))
+         (matching-paths
+          (delq nil
+                (mapcar (lambda (elem)
+                          (save-match-data
+                            (if (string-match (concat "^" (regexp-quote elem))
+                                              p-t-m)
+                                elem)))
+                        normed-current-source-paths))))
+    (if (not sorted)
+        matching-paths
+      (sort matching-paths
+            (lambda (lhs rhs)
+              (> (length lhs) (length rhs)))))))
+
+(defun ecb-get-best-matching-source-path (path)
+  "Return the best-matching source-path for PATH."
+  (car (ecb-matching-source-paths path t)))
+
+(defun ecb-set-selected-directory (path &optional force)
+  "Set the contents of the ECB-directories and -sources buffer correct for the
+value of PATH. If PATH is equal to the value of `ecb-path-selected-directory'
+then nothing is done unless first optional argument FORCE is not nil."
+  (let ((last-dir ecb-path-selected-directory))
+    (setq ecb-path-selected-directory (ecb-fix-filename path))
+    ;; if ecb-path-selected-directory has not changed then there is no need
+    ;; to do anything here because neither the content of directory buffer
+    ;; nor the content of the sources buffer can have been changed!
+    (when (or force (not (ecb-string= last-dir ecb-path-selected-directory)))
+      (when (or (not (ecb-show-sources-in-directories-buffer-p))
+                ecb-auto-expand-directory-tree)
+        (ecb-exec-in-window ecb-directories-buffer-name
+          (let (start was-expanded)
+            (when ecb-auto-expand-directory-tree
+              ;; Expand tree to show selected directory
+              (setq start
+                    (if (equal ecb-auto-expand-directory-tree 'best)
+                        ;; If none of the source-paths in the buffer
+                        ;; `ecb-directories-buffer-name' matches then nil
+                        ;; otherwise the node of the best matching
+                        ;; source-path
+                        (let ((best-source-path
+                               (ecb-get-best-matching-source-path
+                                ecb-path-selected-directory)))
+                          (if best-source-path
+                              (tree-buffer-search-displayed-node-list
+                               (function
+                                (lambda (node)
+                                  (if (and (tree-buffer-node-data-equal-p
+                                            (tree-node->data node)
+                                            (ecb-fix-filename best-source-path))
+                                           ;; only nodes of level 0 (ie. with
+                                           ;; parent == root) can be source-paths
+                                           (eq (tree-buffer-get-root)
+                                               (tree-node->parent node)))
+                                      node))))))
+                      ;; we start at the root node
+                      (tree-buffer-get-root)))
+              (when (and (equal ecb-auto-expand-directory-tree 'best)
+                         start)
+                (setq was-expanded (or (not (tree-node->expandable start))
+                                       (tree-node->expanded start)))
+                ;; expand the best-match node itself
+                (setf (tree-node->expanded start) t)
+                ;; This function ensures a correct expandable-state of
+                ;; start-node
+                (ecb-update-directory-node start))
+              ;; start recursive expanding of either the best-matching node or
+              ;; the root-node itself.
+              (if (or (ecb-expand-directory-tree ecb-path-selected-directory
+                                                 (or start
+                                                     (tree-buffer-get-root)))
+                      (not was-expanded))
+                  (tree-buffer-update)
+                (tree-buffer-recenter start (selected-window))
+                ;; sometimes we do not need a full tree-buffer-update, even
+                ;; when FORCE is not nil. But we have to restart the
+                ;; directories-buffer stealthy-state.
+                (and force (ecb-stealth-tasks-after-directories-update))))
+            ;;              (ecb-expand-directory-tree ecb-path-selected-directory
+            ;;                                           (or start
+            ;;                                               (tree-buffer-get-root)))
+            ;;                (tree-buffer-update))
+            (when (not (ecb-show-sources-in-directories-buffer-p))
+              (tree-buffer-highlight-node-by-data/name ecb-path-selected-directory
+                                                       nil start)))))
+      ;; now we update the sources buffer for `ecb-path-selected-directory'
+      (ecb-update-sources-buffer last-dir)
+      ;; now we run the hooks
+      (run-hook-with-args 'ecb-after-directory-change-hook
+                          last-dir ecb-path-selected-directory)
+      ))
+  
+  ;; set the default-directory of each tree-buffer to current selected
+  ;; directory so we can open files via find-file from each tree-buffer.
+  ;; is this necessary if neither dir.- nor sources-buffer-contents have been
+  ;; changed? I think not but anyway, doesn't matter, costs are very low.
+  (save-excursion
+    (dolist (buf (ecb-tree-buffers-buffer-list))
+      (set-buffer buf)
+      (setq default-directory
+            (concat ecb-path-selected-directory
+                    (and (not (= (aref ecb-path-selected-directory
+                                       (1- (length ecb-path-selected-directory)))
+                                 (ecb-directory-sep-char ecb-path-selected-directory)))
+                         (ecb-directory-sep-string ecb-path-selected-directory))))))
+  ;; set the modelines of all visible tree-buffers new
+  (ecb-mode-line-format))
+
+
+(defun ecb-get-source-name (filename)
+  "Returns the source name of a file."
+  (let ((f (ecb-file-name-nondirectory filename)))
+    (if ecb-show-source-file-extension
+        f
+      (ecb-file-name-sans-extension f))))
+
+(defun ecb-select-source (&optional force)
+  "Updates the directories, sources and history buffers to match the filename
+given. If FORCE is not nil then the update of the directories buffer is done
+even if current directory is equal to `ecb-path-selected-directory'."
+  (ecb-set-selected-directory (ecb-file-name-directory
+                               (ecb-path-selected-source 'file)) force)
+    
+  ;; Update directory buffer
+  (when (ecb-show-sources-in-directories-buffer-p)
+    (ecb-exec-in-window ecb-directories-buffer-name
+      (tree-buffer-highlight-node-by-data/name (ecb-path-selected-source 'file))))
+  
+  ;; Update source buffer
+  (ecb-exec-in-window ecb-sources-buffer-name
+    (tree-buffer-highlight-node-by-data/name (ecb-path-selected-source 'file)))
+  
+  (ecb-add-buffers-to-history-new))
+
+
+(defvar ecb-history-filter nil
+  "A cons-cell where car is the filter-function and the cdr is a string how
+the current active filter should be displayed in the modeline of
+the History-buffer. The filter-function gets as arguments the
+buffername and the filename of an existing file-buffer and has to
+return not nil if for these data a history-entry should be
+added.")
+
+(defun ecb-reset-history-filter ()
+  "Reset the `ecb-history-filter' so all file-buffers are displayed."
+  (setq ecb-history-filter (cons (function
+                                  (lambda (buf file)
+                                    t))
+                                 nil)))
+
+(defun ecb-history-filter-reset-p ()
+  (null (cdr ecb-history-filter)))
+
+(ecb-reset-history-filter)
+
+(defun ecb-indirect-buffers-of-buffer (&optional buffer-or-name)
+  (let ((buffer (if (null buffer-or-name)
+                    (current-buffer)
+                  (if (and (bufferp buffer-or-name)
+                           (buffer-live-p buffer-or-name))
+                      buffer-or-name
+                    (if (stringp buffer-or-name)
+                        (get-buffer buffer-or-name))))))
+    (delq nil (mapcar (function
+                       (lambda (buf)
+                         (if (equal buffer (buffer-base-buffer buf))
+                             buf)))
+                      (buffer-list)))))
+
+;; When a base-buffer of indirect-buffers is killed then automatically all
+;; indirect-buffers are killed too by Emacs - for all these ind. buffers
+;; kill-buffer-hook is called and therefore also this function ==> we must not
+;; perform any special logic because the indirect-buffers nodes are always
+;; removed.
+(defun ecb-history-kill-buffer-clear (curr-buf)
+  "Does all necessary clearence when CURR-BUF is killed."
+  (let* ((buffer-file (ecb-fix-filename (ecb-buffer-file-name curr-buf)))
+         (node (if buffer-file
+                   (ecb-exec-in-window ecb-history-buffer-name
+                     (tree-buffer-find-displayed-node-by-data/name
+                      (ecb-source-make buffer-file curr-buf)))))
+         (buffer-name-to-ignore-list-for-rebuild nil))
+    (when node
+      (when (or (buffer-base-buffer curr-buf) ; indirect-buffers always!
+                (equal ecb-kill-buffer-clears-history 'auto)
+                (and (equal ecb-kill-buffer-clears-history 'ask)
+                     (y-or-n-p "Remove history entry for this buffer?")))
+        ;; we must do this even when the history is not visible!!
+        ;; the history should be always up-to-date
+        (save-excursion
+          (set-buffer ecb-history-buffer-name)
+          (tree-buffer-remove-node node))
+        ;; if we have removed a node then we must ignore the related buffer
+        ;; when rebuilding the history - otherwise the node would be added
+        ;; again. This is because the history is rebuild before
+        ;; kill-buffer-hook has been finished and therefore the killed buffer
+        ;; is still in (buffer-list) which is used by
+        ;; `ecb-add-buffers-to-history-new'!
+        (setq buffer-name-to-ignore-list-for-rebuild (list (buffer-name curr-buf))))
+      (ecb-add-buffers-to-history-new nil buffer-name-to-ignore-list-for-rebuild))))
+
+(defun ecb-add-all-buffers-to-history ()
+  "Add all current file-buffers to the history-buffer of ECB.
+Dependend on the values of `ecb-history-make-buckets' and
+`ecb-history-sort-method' afterwards the history is bucketized or
+not and sorted either by name or by extension \(if bucketized
+then the sorting is only within each bucket). If
+`ecb-history-sort-method' is nil the most recently used buffers
+are on the top of the history and the seldom used buffers at the
+bottom \(again: when bucketized then this holds only within each
+bucket)."
+  (interactive)
+  (ecb-reset-history-filter)
+  (ecb-add-buffers-to-history-new 'no-dead-buffers))
+
+(defalias 'ecb-clear-history 'ecb-add-all-buffers-to-history)
+
+(defun ecb-history-content-all-dead-buffers-alist ()
+  "Return alist with items \(<buffer-name> . <file-name>) for dead buffers
+entries of the history-buffer."
+  (save-excursion
+    (set-buffer ecb-history-buffer-name)
+    (delq nil (tree-node-map-subtree
+               (tree-buffer-get-root)
+               (function
+                (lambda (node)
+                  (let ((data (tree-node->data node)))
+                    (unless (or (= (tree-node->type node) ecb-history-nodetype-bucket)
+                                (get-buffer (ecb-source-get-buffername data)))
+                      (cons (ecb-source-get-buffername data)
+                            (ecb-source-get-filename data))))))))))
+
+(defun ecb-add-buffers-to-history-new (&optional no-dead-buffers ignore-buffername-list)
+  "Update contents of the history-buffer.
+This means a history-item is added to the history-buffer if an existing buffer:
+- is a file-buffer or is based on a file-buffer \(e.g. indirect-file-buffers)
+- is not excluded by `ecb-check-filename-for-history-exclude'
+- is not filtered out by the current history-filter
+In addition dead-buffer items of the history-content before are added again
+unless optional argument NO-DEAD-BUFFERS is not nil.
+
+If second optional argument IGNORE-BUFFERNAME-LIST is not nil, then it must be a
+list of buffer-names which should be ignored for the history-rebuild.
+
+It takes into account the values of the options `ecb-history-make-buckets' and 
+`ecb-history-stick-indirect-buffers-to-basebuffer'.
+
+It calls at the end `ecb-mode-line-format'.
+
+If the current history-filter leads to an empty history-buffer it will not be
+applied but an unfiltered history will be build.
+
+Returns t if the current history filter has been applied otherwise nil."
+  (let* ((never-bucket-string "No_hist_bucketizing")
+         (aggr-sort-fcn (function
+                         (lambda (l r)
+                           ;; l and r are conses like:
+                           ;; (<bucket-string> . (<buffername> . <filename>))
+                           (if (ecb-string= (car l) (car r) ecb-history-sort-ignore-case)
+                               (case ecb-history-sort-method
+                                 (extension
+                                  (let ((ext-l (file-name-extension (cdr (cdr l)) t))
+                                        (ext-r (file-name-extension (cdr (cdr r)) t)))
+                                    (if (ecb-string= ext-l ext-r ecb-history-sort-ignore-case)
+                                        (ecb-string< (car (cdr l)) (car (cdr r))
+                                                     ecb-history-sort-ignore-case)
+                                      (ecb-string< ext-l ext-r ecb-history-sort-ignore-case))))
+                                 (name
+                                  (ecb-string< (car (cdr l)) (car (cdr r))
+                                               ecb-history-sort-ignore-case))
+                                 (otherwise nil))
+                             (ecb-string< (car l) (car r) ecb-history-sort-ignore-case)))))
+         (aggr-same-fcn (function
+                         (lambda (l r)
+                           ;; l and r are strings (= the car of an item of base-alist)
+                           (ecb-string= l r ecb-history-sort-ignore-case))))
+         (indirect-buffer-base nil)
+         ;; lets build an alist where each item is a cons like
+         ;; (<buffer-name> . <filename>) and only items are contained which are:
+         ;; - based on file-buffers (indirect-file-buffers too)
+         ;; - not excluded by `ecb-check-filename-for-history-exclude'
+         ;; - not filtered out by the current history-filter
+         ;; if indirect-buffers should be sticked to the base-buffer then we
+         ;; are sorting out them here and add them all to indirect-buffer-base
+         (buf-file-alist
+          (delq nil
+                (mapcar (function
+                         (lambda (buf)
+                           (let ((file-name (ecb-fix-filename
+                                             (ecb-buffer-file-name buf)))
+                                 (base-buf (buffer-base-buffer buf)))
+                             (if (and file-name
+                                      ;; needed for revision-files temporally
+                                      ;; checked out (e.g. by ediff-revision)
+                                      ;; these not longer existing files
+                                      ;; would pollute the history - we do not
+                                      ;; want entries which could not loaded
+                                      ;; into a buffer
+                                      (ecb-buffer-or-file-readable-p file-name)
+                                      (not (member (buffer-name buf)
+                                                   ignore-buffername-list))
+                                      (not (ecb-check-filename-for-history-exclude file-name))
+                                      (funcall (car ecb-history-filter)
+                                               (buffer-name buf)
+                                               file-name))
+                                 (if (and ecb-history-stick-indirect-buffers-to-basebuffer
+                                          base-buf)
+                                     ;; if indirect-buffers should be sticked
+                                     ;; to the base-buffer then we are sorting
+                                     ;; out them here and add them all to
+                                     ;; indirect-buffer-base
+                                     (progn
+                                       (push (cons (buffer-name base-buf)
+                                                   (cons (buffer-name buf) file-name))
+                                             indirect-buffer-base)
+                                       nil)
+                                   (cons (buffer-name buf) file-name))))))
+                        ;; we call reverse to get the most recently used
+                        ;; buffers first; usefull when no sorting takes place
+                        (reverse (buffer-list)))))
+         (additonal-dead-history-buffer-alist
+          (if no-dead-buffers
+              nil
+            ;; we need these entries of the history-buffer which are marked as
+            ;; dead. If all is working fine the set-difference would not be
+            ;; necessary because dead-items are dead because no buffer exists
+            ;; for them - so both lists should be disjunct - but who knows, to
+            ;; get sure we make the difference so we have no duplicates.
+            (ecb-set-difference (ecb-history-content-all-dead-buffers-alist)
+                                buf-file-alist
+                                'member)))
+         (base-alist (mapcar (function
+                              (lambda (elem)
+                                ;; an elem is a cons (<buffername> . <filename>)
+                                (cons (case ecb-history-make-buckets
+                                        (never never-bucket-string)
+                                        (directory (ecb-substring-no-properties
+                                                    (ecb-fix-filename
+                                                     (file-name-directory
+                                                      (cdr elem)))
+                                                    (if ecb-running-xemacs 0)))
+                                        (mode (symbol-name
+                                               (if (get-buffer (car elem))
+                                                   (save-excursion
+                                                     (set-buffer (get-buffer (car elem)))
+                                                     major-mode)
+                                                 ;; for dead buffers of the
+                                                 ;; history we use auto-mode-alist
+                                                 (or (ecb-match-regexp-list (car elem)
+                                                                            auto-mode-alist
+                                                                            'car 'cdr)
+                                                     'no-major-mode-avail))))
+                                        (extension (file-name-extension (cdr elem) t))
+                                        (otherwise (or (ecb-match-regexp-list
+                                                        (car elem)
+                                                        ecb-history-make-buckets)
+                                                       "No matchings")))
+                                      elem)))
+                             (append buf-file-alist
+                                     additonal-dead-history-buffer-alist)))
+         (aggregated-alist-with-buckets (ecb-aggregate-alist base-alist
+                                                             aggr-same-fcn
+                                                             aggr-sort-fcn))
+         (aggregated-indirect-buffers-alist (ecb-aggregate-alist indirect-buffer-base
+                                                                 'string=
+                                                                 (function
+                                                                  (lambda (l r)
+                                                                    (string< (car l)
+                                                                             (car r))))))
+         ;; an alist with items like (<bucket-name> . <expand-state>) for each
+         ;; toplevel bucket of the history-buffer. This is the state before
+         ;; rebuilding the history!
+         (curr-bucket-expand-status-alist
+          (save-excursion
+            (set-buffer ecb-history-buffer-name)
+            (delq nil (mapcar (function
+                               (lambda (node)
+                                 (when (= (tree-node->type node)
+                                          ecb-history-nodetype-bucket)
+                                   (cons (tree-node->name node)
+                                         (and (tree-node->expandable node)
+                                              (tree-node->expanded node))))))
+                              (tree-node->children (tree-buffer-get-root))))))
+         )
+;; just for debugging:    
+;;     (list buf-file-alist
+;;           aggregated-alist-with-buckets
+;;           additonal-dead-history-buffer-alist
+;;           indirect-buffer-base
+;;           aggregated-indirect-buffers-alist)
+    (save-excursion
+      (set-buffer ecb-history-buffer-name)
+      (tree-buffer-clear-tree)
+      (dolist (bucket-elem aggregated-alist-with-buckets)
+        (let* ((bucket-name (car bucket-elem))
+               (bucket-name-formatted (ecb-merge-face-into-text (ecb-format-bucket-name bucket-name)
+                                                                ecb-history-bucket-node-face))
+               (bucket-node (if (string= never-bucket-string bucket-name)
+                                (tree-buffer-get-root)
+                              (tree-node-new bucket-name-formatted
+                                             ecb-history-nodetype-bucket
+                                             'ecb-bucket-node
+                                             nil
+                                             (tree-buffer-get-root)
+                                             'beginning))))
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: if bucket only contains
+          ;; one elem, we should maybe not make a bucket but insert this node
+          ;; flat
+          (unless (string= never-bucket-string bucket-name)
+            ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we can make
+            ;; this even smarter...depending if now a bucket contains more
+            ;; items than before - for this we have to store not onlxy the
+            ;; expand-state but also the number of children of a bucket
+            (setf (tree-node->expanded bucket-node)
+                  (if (assoc bucket-name-formatted
+                             curr-bucket-expand-status-alist)
+                      (cdr (assoc bucket-name-formatted
+                                  curr-bucket-expand-status-alist))
+                    t)))
+          (dolist (elem (cdr bucket-elem))
+            (let* ((buf-name (car elem))
+                   ;; can only be not nil if the option
+                   ;; `ecb-history-stick-indirect-buffers-to-basebuffer' is not
+                   ;; nil --> see above the mechanism how indirect-buffer-base
+                   ;; is build
+                   (indirect-buffer-p (buffer-base-buffer (get-buffer buf-name)))
+                   ;; Note: indirect-buffer elems can not be dead-buffer
+                   ;; elems, because indirect-buffer-items are *always*
+                   ;; removed immediately from the history-buffer when such a
+                   ;; buffer is killed!
+                   (buf-name-formatted (cond (indirect-buffer-p
+                                              (ecb-merge-face-into-text
+                                               buf-name
+                                               ecb-history-indirect-buffer-face))
+                                             ((member elem
+                                                      additonal-dead-history-buffer-alist)
+                                              (ecb-merge-face-into-text
+                                               buf-name
+                                               ecb-history-dead-buffer-face))
+                                             (t buf-name)))
+                   (file-name (cdr elem))
+                   (dir (ecb-file-name-directory file-name))
+                   (vc-p (and (ecb-vc-directory-should-be-checked-p dir)
+                              (ecb-vc-managed-dir-p dir)))
+                   (node-name (if vc-p
+                                  (ecb-vc-generate-node-name buf-name-formatted
+                                                             (nth 0 (ecb-vc-cache-get file-name)))
+                                (ecb-generate-node-name buf-name-formatted -1 "leaf"
+                                                        ;; here ecb-sources-buffer-name is
+                                                        ;; also correct for history
+                                                        ;; because we want the same
+                                                        ;; icon-stuff as in the sources buffer
+                                                        ecb-sources-buffer-name)))
+                   (node (tree-node-new
+                          node-name
+                          (if indirect-buffer-p
+                              ecb-history-nodetype-indirect-filebuffer
+                            ecb-history-nodetype-filebuffer)
+                          (ecb-source-make file-name buf-name)
+                          t
+                          bucket-node)))
+              ;; if `ecb-history-stick-indirect-buffers-to-basebuffer' is nil
+              ;; then this dolist does nothing because then the list is always
+              ;; nil, because aggregated-indirect-buffers-alist is nil in this
+              ;; case 
+              (dolist (indirect-elem (ecb-find-assoc-value buf-name
+                                                           aggregated-indirect-buffers-alist))
+                (let* ((ind-buf-name (car indirect-elem))
+                       ;; here we have no need to deal with dead-buffers
+                       ;; because indirect-buffers can not dead-buffer-items -
+                       ;; s.a.
+                       (ind-buf-name-formatted (ecb-merge-face-into-text
+                                                ind-buf-name
+                                                ecb-history-indirect-buffer-face))
+                       (ind-node-name (if vc-p
+                                          (ecb-vc-generate-node-name ind-buf-name-formatted
+                                                                     (nth 0 (ecb-vc-cache-get file-name)))
+                                        (ecb-generate-node-name ind-buf-name-formatted -1 "leaf"
+                                                                ;; here ecb-sources-buffer-name is
+                                                                ;; also correct for history
+                                                                ;; because we want the same
+                                                                ;; icon-stuff as in the sources buffer
+                                                                ecb-sources-buffer-name))))
+                  (setf (tree-node->expandable node) t)
+                  (setf (tree-node->expanded node) t)
+                  (tree-node-new
+                   ;; indirect buffers have the same vc-state as the file
+                   ;; associated with the base-buffer ==> we use the same
+                   ind-node-name
+                   ecb-history-nodetype-indirect-filebuffer
+                   (ecb-source-make file-name ind-buf-name)
+                   t
+                   node)))
+              )))))
+    (ecb-exec-in-window ecb-history-buffer-name
+      (tree-buffer-update)
+      (tree-buffer-highlight-node-by-data/name (ecb-path-selected-source)))
+    (prog1
+        (if (and (save-excursion
+                   (set-buffer ecb-history-buffer-name)
+                   (tree-buffer-empty-p))
+                 (not (ecb-history-filter-reset-p)))
+            (progn
+              (ecb-add-all-buffers-to-history)
+              (message "ECB has not applied this filter because it would filter out all entries!")
+              nil)
+          t)
+      ;; now the modeline has to display the current filter
+      (ecb-mode-line-format))
+  ))
+
+;;(insert (pp (ecb-klaus-add-buffers-to-history)))
+
+;;(ecb-add-buffers-to-history-new)
+
+(defun ecb-history-filter-modeline-prefix (buffer-name sel-dir sel-source)
+  "Compute a mode-line prefix for the History-buffer so the current filter
+applied to the history-entries is displayed. This function is only for using
+by the option `ecb-mode-line-prefixes'."
+  (and (cdr ecb-history-filter)
+       (format "[Filter: %s]" (cdr ecb-history-filter))))
+
+
+(defun ecb-set-selected-source (source other-edit-window
+                                       no-edit-buffer-selection)
+  "Updates all the ECB buffers and loads the SOURCE. The source is also
+displayed unless NO-EDIT-BUFFER-SELECTION is set to non nil. In such case the
+source is only loaded invisible in the background, all semantic-parsing and
+ECB-Buffer-updating is done but the content of the main-edit window is not
+changed. For the allowed values of OTHER-EDIT-WINDOW see
+`ecb-combine-ecb-button/edit-win-nr'.
+
+SOURCE is either a string, then it is a filename or a cons, then the car is
+the filename and the cdr is the buffer-name, whereas the latter one can be an
+indirect-buffer."
+  (if no-edit-buffer-selection
+      ;; load the selected source in an invisible buffer, do all the
+      ;; updating and parsing stuff with this buffer in the background and
+      ;; display the methods in the METHOD-buffer. We can not go back to
+      ;; the edit-window because then the METHODS buffer would be
+      ;; immediately updated with the methods of the edit-window.
+      (save-excursion
+        (set-buffer (ecb-source-get-buffer source))
+        (ecb-path-selected-source-set (ecb-source-get-filename source)
+                                      (buffer-name))
+        (ecb-update-methods-buffer--internal 'scroll-to-begin nil t t))
+    ;; open the selected source in the correct edit-window and do all the
+    ;; update and parsing stuff with this buffer
+    (ecb-display-source source other-edit-window)
+    (ecb-path-selected-source-set (ecb-source-get-filename source)
+                                  (buffer-name))
+    (ecb-update-methods-buffer--internal 'scroll-to-begin)
+    (setq ecb-major-mode-selected-source major-mode)
+    (ecb-tag-sync 'force))
+  (ecb-select-source t))
+
+
+(defun ecb-update-directory-node (node)
+  "Updates the directory node NODE and add all subnodes if any."
+  (let ((old-children (tree-node->children node))
+        (path (tree-node->data node)))
+    (setf (tree-node->children node) nil)
+    (if (ecb-file-accessible-directory-p path)
+        (let ((files-and-dirs (ecb-get-files-and-subdirs path)))
+          (ecb-tree-node-add-files node path (cdr files-and-dirs)
+                                   ecb-directories-nodetype-directory
+                                   t old-children)
+          (if (ecb-show-sources-in-directories-buffer-p)
+              (ecb-tree-node-add-files node path (car files-and-dirs)
+                                       ecb-directories-nodetype-sourcefile
+                                       ecb-show-source-file-extension
+                                       old-children t))
+          (setf (tree-node->expandable node)
+                (or (tree-node->children node)))
+          ;; if node is not expandable we set its expanded state to nil
+          (setf (tree-node->expanded node)
+                (if (not (tree-node->expandable node))
+                    nil
+                  (tree-node->expanded node)))))))
+
+(defecb-tree-buffer-callback ecb-directory-expand ecb-directories-buffer-name expand nil
+  "Expand the clickes directory and add all subnodes if any.
+Subnodes can be directories or sources."
+  (ecb-update-directory-node node))
+
+(defun ecb-get-source-paths-from-functions ()
+  "Return a list of paths found by querying `ecb-source-path-functions'."
+  (let ((func ecb-source-path-functions)
+	(paths nil)
+	(rpaths nil))
+    (while func
+      (setq paths (append paths (funcall (car func)))
+	    func (cdr func)))
+    (while paths
+      (setq rpaths (cons (ecb-fix-filename (car paths)) rpaths)
+	    paths (cdr paths)))
+    rpaths))
+
+
+(defun ecb-update-directories-buffer ()
+  "Updates the ECB directories buffer."
+  (interactive)
+  (unless (or (not ecb-minor-mode)
+              (not (equal (selected-frame) ecb-frame)))
+    (ecb-exec-in-window ecb-directories-buffer-name
+      (let* ((node (tree-buffer-get-root))
+             (old-children (tree-node->children node))
+             (paths (append (ecb-get-source-paths-from-functions)
+                            ecb-source-path)))
+        (setf (tree-node->children node) nil)
+        (dolist (dir paths)
+          (let* ((path (if (listp dir) (car dir) dir))
+                 (remote-path (ecb-remote-path path))
+                 (norm-dir nil)
+                 (name nil)
+                 (not-accessible nil))
+            (if (or (not remote-path)
+                    (ecb-host-accessible-p (nth 1 remote-path)))
+                (progn
+                  (setq norm-dir (ecb-fix-filename path nil t))
+                  (setq name (if (listp dir) (cadr dir) norm-dir))
+                  (if (ecb-file-accessible-directory-p norm-dir)
+                      (tree-node-add-children
+                       node
+                       (ecb-new-child old-children name
+                                      ecb-directories-nodetype-sourcepath
+                                      norm-dir
+                                      nil
+                                      (if ecb-truncate-long-names
+                                          'beginning)))
+                    (setq not-accessible t)))
+              (setq not-accessible t))
+            (when not-accessible
+              (if (listp dir)
+                  (ecb-warning "Source-path %s with alias %s is not accessible - ignored!"
+                               (car dir) (cadr dir))
+                (ecb-warning "Source-path %s is not accessible - ignored!" dir)))))
+        (tree-buffer-update)))
+    ))
+
+
+;; remote-path stuff 
+;; (ecb-host-accessible-valid-time "ecb.sourceforge.net")
+;; (ecb-host-accessible-cache-get "ecb.sourceforge.net" 60)
+(defsubst ecb-host-accessible-valid-time (host)
+  "Get the valid-cache-time of a remote HOST concering its ping-state. If host
+doesn't match any regexp of `ecb-host-accessible-check-valid-time' then return
+60 seconds."
+  (or (ecb-match-regexp-list host ecb-host-accessible-check-valid-time
+                             'car 'cdr)
+      60))
+
+;; (ecb-host-accessible-valid-time "ecb.sourceforge.net")
+;; (ecb-host-accessible-cache-get "ecb.sourceforge.net" 60)
+(defun ecb-host-accessible-p (host)
+  "Return not nil if HOST is accessible."
+  (let ((value (ecb-host-accessible-cache-get
+                host (ecb-host-accessible-valid-time host))))
+    (case value
+      (NOT-ACCESSIBLE nil)
+      ((nil) ;; not cached or outdated
+       (let* ((options (ecb-replace-all-occurences (ecb-copy-list ecb-ping-options)
+                                                   "HOST" host))
+              (result (equal 0 (apply 'call-process
+                                      ecb-ping-program
+                                      nil nil nil
+                                      options))))
+         (ecb-host-accessible-cache-add host (or result 'NOT-ACCESSIBLE))
+         result))
+      (otherwise value))))
+
+
+;; (ecb-host-accessible-p "ecb.cvs.sourceforge.net")
+
+(silentcomp-defun ange-ftp-ftp-name)
+(silentcomp-defun efs-ftp-path)
+(silentcomp-defun tramp-tramp-file-p)
+(silentcomp-defun tramp-file-name-path)
+(silentcomp-defun tramp-file-name-localname)
+(silentcomp-defun tramp-file-name-host)
+(silentcomp-defun tramp-dissect-file-name)
+(defun ecb-remote-path (path)
+  "Test if PATH is a remote path and dissect it into components if yes.
+Returns a list (FULL-HOST-USER-PART HOST REAL-PATH), or nil if PATH is not a
+remote path. FULL-HOST-USER-PART is that component from beginning of PATH to
+the :-separator which separates user- and host-parts from the real path, i.e.
+it always ends with a colon! HOST is the remote HOST and REAL-PATH is that
+component after that :-separator. Supports tramp, ange-ftp and efs."
+  (let ((value (ecb-remote-path-cache-get path)))
+    (case value
+      (NOT-REMOTE nil)
+      ((nil)
+       (let* ((dissection (or (and (featurep 'tramp) ;; tramp-support
+                                   (tramp-tramp-file-p path)
+                                   (tramp-dissect-file-name path))
+                              (and (featurep 'ange-ftp) ;; ange-ftp-support
+                                   (ange-ftp-ftp-name path))
+                              (and (featurep 'efs) ;; efs support
+                                   (efs-ftp-path path))))
+              (host/real-path
+               (if dissection
+                   (or (and (featurep 'tramp) ;; tramp-support
+                            (cons (tramp-file-name-host dissection)
+                                  (if (fboundp 'tramp-file-name-localname)
+                                      (tramp-file-name-localname dissection)
+                                    (tramp-file-name-path dissection))))
+                       (and (featurep 'ange-ftp) ;; ange-ftp-support
+                            (cons (nth 0 dissection)
+                                  (nth 2 dissection)))
+                       (and (featurep 'efs) ;; efs support
+                            (cons (nth 0 dissection)
+                                  (nth 2 dissection))))
+                 (cons nil path)))
+              (full-host-user-part
+               (substring path 0 (- (length path)
+                                    (length (cdr host/real-path)))))
+              (result nil))
+         (setq result
+               (and dissection
+                    (list full-host-user-part
+                          (car host/real-path)
+                          (cdr host/real-path))))
+         (ecb-remote-path-cache-add path (or result 'NOT-REMOTE))
+         result))
+      (otherwise value))))
+
+;;(ecb-remote-path "/berndl@ecb.sourceforge.net:~")
+;;(directory-files "/berndl@ecb.sourceforge.net:~/beate")
+;; (ecb-remote-path "~")
+
+;; empty dirs
+
+(defun ecb-check-emptyness-of-dir (dir)
+  "Checks if DIR is an empty directory. If empty return not nil otherwise nil."
+  (let ((cache-value (ecb-directory-empty-cache-get dir))
+        (show-sources (ecb-show-sources-in-directories-buffer-p)))
+    (if (and cache-value
+             (equal (cdr cache-value) show-sources))
+        (car cache-value)
+      (ecb-directory-empty-cache-remove dir)
+      (let ((entries (and (ecb-file-accessible-directory-p dir)
+                          (ecb-directory-files dir nil nil t)))
+            (just-files-means-empty (not show-sources))
+            (full-file-name nil)
+            (empty-p nil))
+        (setq empty-p
+              (catch 'found
+                (dolist (e entries)
+                  (when (not (member e '("." ".." "CVS")))
+                    (setq full-file-name (ecb-fix-filename dir e))
+                    (if (ecb-file-directory-p full-file-name)
+                        (throw 'found 'nil)
+                      (if (not just-files-means-empty)
+                          (throw 'found 'nil)))))
+                t))
+        ;; now we add this value to the cache
+        (ecb-directory-empty-cache-add (ecb-fix-filename dir)
+                                       (cons empty-p show-sources))
+        empty-p))))
+
+
+(defecb-stealthy ecb-stealthy-empty-dir-check
+  "Check for each current visible nodes in the directories buffer if the
+underlying directory is empty or not and update the node if the current node
+state and display is different from the empty-state of the associated
+directory. This function is only for use by `ecb-stealthy-updates'!"
+  (when (equal 'window-not-visible
+               (ecb-exec-in-window ecb-directories-buffer-name
+                 (if (equal state 'restart)
+                     (setq state 1))
+                 ;; Here the state is an integer because a stealthy functions runs only
+                 ;; when state != 'done
+                 (let ((lines-of-buffer (count-lines (point-min) (point-max)))
+                       (curr-node nil)
+                       (dir-empty-p nil))
+                   (ecb-exit-on-input 'empty-dir-check-stealthy
+                     (save-excursion
+                       (while (<= state lines-of-buffer)
+                         (ecb-throw-on-input 'lines-of-buffer-loop)
+                         (ecb-goto-line state)
+                         (setq curr-node (tree-buffer-get-node-at-point))
+                         (when (and ;;(not (= ecb-directories-nodetype-sourcefile
+                                      ;;      (tree-node->type curr-node)))
+                                    (ecb-directory-should-prescanned-p
+                                     (tree-node->data curr-node))
+                                    (ecb-file-exists-p
+                                     (tree-node->data curr-node)))
+                           (setq dir-empty-p
+                                 (ecb-check-emptyness-of-dir (tree-node->data curr-node)))
+                           ;; we update the node only if we have an empty dir and the node is
+                           ;; still expandable
+                           (when (or (and dir-empty-p
+                                          (tree-node->expandable curr-node))
+                                     (and (not dir-empty-p)
+                                          (not (tree-node->expandable curr-node))))
+                             (tree-buffer-update-node nil
+                                                      'use-old-value
+                                                      'use-old-value
+                                                      'use-old-value
+                                                      'use-old-value
+                                                      (not dir-empty-p)
+                                                      t)))
+                         (setq state (1+ state)))))
+                   (if (> state lines-of-buffer)
+                       (setq state 'done)))))
+    (setq state 'done)))
+
+;; read-only-files?
+
+(defun ecb-stealthy-read-only-check--internal (state)
+  "Check for all sourcefile-nodes either in the directories- or the
+sources-buffer if the associated file is writable or not. This function does
+the real job and is is only for use by a stealthy function defined with
+`defecb-stealthy'! STATE is the initial state-value the stealthy-function has
+when called. Return the new state-value."
+  (if (or (not ecb-sources-perform-read-only-check)
+          (not (or (string= (buffer-name (current-buffer))
+                            ecb-sources-buffer-name)
+                   (and (string= (buffer-name (current-buffer))
+                                 ecb-directories-buffer-name)
+                        (ecb-show-sources-in-directories-buffer-p)))))
+      'done
+    ;; Now we are either in the sources-buffer or in the directories-buffer
+    ;; when sources are displayed in the directories-buffer
+    (if (equal state 'restart)
+        (setq state 1))
+    ;; Here the state is an integer because a stealthy functions runs only
+    ;; when state != 'done
+    (let ((lines-of-buffer (count-lines (point-min) (point-max)))
+          (curr-node nil)
+          (new-name nil)
+          (read-only-p nil)
+          (node-types-to-check (list ecb-sources-nodetype-sourcefile
+                                     ecb-directories-nodetype-sourcefile)))
+      (ecb-exit-on-input 'read-only-stealthy
+        (save-excursion
+          (while (<= state lines-of-buffer)
+            (ecb-throw-on-input 'lines-of-buffer-loop)
+            (ecb-goto-line state)
+            (setq curr-node (tree-buffer-get-node-at-point))
+            (when (and (member (tree-node->type curr-node) node-types-to-check)
+                       (ecb-sources-read-only-check-p
+                        (ecb-file-name-directory (tree-node->data curr-node))))
+              (setq new-name (tree-node->name curr-node))
+              (setq read-only-p
+                    (not (ecb-file-writable-p (tree-node->data curr-node))))
+              (if read-only-p
+                  (ecb-merge-face-into-text new-name
+                                            ecb-source-read-only-face))
+              ;; we update the node only if we have an empty dir and the node is
+              ;; still expandable
+              (when read-only-p
+                (tree-buffer-update-node
+                 nil
+                 new-name
+                 'use-old-value
+                 'use-old-value
+                 'use-old-value
+                 'use-old-value
+                 t)))
+            (setq state (1+ state)))))
+      (if (> state lines-of-buffer)
+          (setq state 'done)))
+    state))
+
+(defecb-stealthy ecb-stealthy-ro-check-in-directories-buf
+  "Check for all sourcefile-nodes in the directories-buffer if the associated
+file is writable or not."
+  (if (ecb-show-sources-in-directories-buffer-p)
+      (when (equal 'window-not-visible
+                   (ecb-exec-in-window ecb-directories-buffer-name
+                     (setq state
+                           (ecb-stealthy-read-only-check--internal state))))
+        (setq state 'done))
+    (setq state 'done)))
+
+
+;; Test, if our new interrupt mechanism works...
+;; (defecb-stealthy ecb-stealthy-klaus-test
+;;   "test"
+;;   (setq state
+;;         (if (equal (ecb-exit-on-input 'testing
+;;                      (let ((inhibit-quit nil)
+;;                            (message-log-max nil))
+;;                        (while t
+;;                          (message "Looping ...")
+;;                          (ecb-throw-on-input 'user-input)
+;;                          )))
+;;                    'user-input)
+;;             'done
+;;           'Klaus)))
+
+
+(defecb-stealthy ecb-stealthy-ro-check-in-sources-buf
+  "Check for all sourcefile-nodes in the sources-buffer if the associated file
+is writable or not."
+  (when (equal 'window-not-visible
+               (ecb-exec-in-window ecb-sources-buffer-name
+                 (setq state
+                       (ecb-stealthy-read-only-check--internal state))))
+    (setq state 'done)))
+
+;; version control support
+
+(defecb-advice-set ecb-vc-advices 
+  "All advices needed for the builtin VC-support of ECB.")
+
+;; We use a cache which stores for
+;; + a directory: either the function used to check the VC-state of its files
+;;   (if the directory is managed by a VC-backend) or the symbol 'NO-VC (if
+;;   the dir is not managed by a VC-backend).
+;; + a file: the most recent VC-state plus the check-timestamp for this state.
+;;
+;; So we have to call only once the identify-backend-function (see above) for
+;; a directory. The check-state-function must only be called if the file has
+;; been modified since the stored check-state-timestamp. With this caching
+;; even using real-VC-checks (as vc-recompute-state) which never uses
+;; heuristics is possible without loosing to much informations (only if a file
+;; is modified by another user can not be detected with this cache - but for
+;; this we have the power-click which always throws away any cache-state)
+
+(defconst ecb-vc-state-icon-alist '((up-to-date . ("vc-up-to-date" "(u)"))
+                                    (edited . ("vc-edited" "(e)"))
+                                    (added . ("vc-added" "(a)"))
+                                    (needs-patch . ("vc-needs-patch" "(p)"))
+                                    (needs-merge . ("vc-needs-merge" "(m)"))
+                                    (ignored . ("vc-ignored" "(x)"))
+                                    (unknown . ("vc-unknown" "(?)"))
+                                    (nil . ("vc-unknown" "(?)")))
+  "Associate an image-name and a textual icon to the allowed VC-states - see
+`ecb-vc-supported-backends'. Each element is a cons-cell where the car is the
+symbol of a supported VC-state and the cdr a 2-element list where the first
+element is the name of the needed image-icon and the second element the
+ascii-string which should be dislayed if Emacs doesn't support image-display.")
+
+(defsubst ecb-vc-get-image-name-for-vc-state (state)
+  "Return the associated image-name for the vc-state STATE."
+  (or (nth 0 (cdr (assq state ecb-vc-state-icon-alist)))
+      "vc-unknown"))
+  
+(defsubst ecb-vc-get-ascii-icon-for-vc-state (state)
+  "Return the associated texual icon for the vc-state STATE."
+  (or (nth 1 (cdr (assq state ecb-vc-state-icon-alist)))
+      "(?)"))
+
+
+(defconst ecb-vc-incr-searchpattern-node-prefix
+  '("\\(\\(([uempx?])\\)? \\)?" . 2)
+  "Prefix-pattern which ignores all not interesting vc-icon-stuff of a
+node-name at incr. search. This ignores the \"(<vc-state-char>)\" whereas
+<vc-state-char> is one of u, e, m, p or ?.
+Format: cons with car is the pattern and cdr is the number of subexpr in this
+pattern.")
+
+
+(defun ecb-vc-check-state (file tree-buffer-name vc-state-fcn)
+  "Check if the VC-state for FILE must be rechecked, i.e. if it is out of
+date. If it is still valid and also already checked for TREE-BUFFER-NAME then
+return the symbol 'unchanged \(if still valid but only not checked for
+TREE-BUFFER-NAME then return the state and store the fact that it has been
+check now also for this buffer). Otherwise check the new state for FILE with
+VC-STATE-FCN, store it in the cache only for TREE-BUFFER-NAME and return the
+new state."
+  (let* ((cached-state (ecb-vc-cache-get file))
+         (last-state (nth 0 cached-state))
+         (last-check-time (nth 1 cached-state))
+         (checked-tree-buffer-names (nth 2 cached-state))
+         (no-need-for-state-check-p
+          (and last-check-time
+               (or (null last-state) ;; FILE has been checked but is not in VC
+                   (not (ecb-time-less-p last-check-time
+                                         (ecb-subseq (nth 5 (ecb-file-attributes file))
+                                                     0 2))))))
+         (result nil))
+    (if no-need-for-state-check-p
+        ;; FILE was not modified since our last vc-state-check
+        (if (member tree-buffer-name checked-tree-buffer-names)
+            ;; TREE-BUFFER-NAMES is in the list of buffer-names for which the
+            ;; state of FILE has already been cached ==> there is no need to
+            ;; update the cache we can just return 'unchanged to signalize
+            ;; that nothing has to be updated
+            (setq result 'unchanged)
+          ;; now we add TREE-BUFFER-NAME to that list - this new list will be
+          ;; added to the cache below. As result we will return the last-state
+          ;; because the state itself is still valid - the only thing we now
+          ;; have to store in the cache is that the last-state is now valid
+          ;; for TREE-BUFFER-NAME too!
+          (setq result last-state)
+          (setq checked-tree-buffer-names
+                (cons tree-buffer-name checked-tree-buffer-names)))
+
+      ;; FILE was modified since our last vc-state-check, so we have to check
+      ;; the state again
+      
+      ;; set the list of the buffer-names for which the check will be performed
+      ;; and then cached to TREE-BUFFER-NAME ==> Only for this buffer-name the
+      ;; cache is valid.
+      (setq checked-tree-buffer-names (list tree-buffer-name))
+      ;; get the new vc-state
+      (setq result (and vc-state-fcn
+                        (fboundp vc-state-fcn)
+                        ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>:
+                        ;; vc-cvs-state seems to change the window-config
+                        ;; (opens a new small window) if it fails...so maybe
+                        ;; we have to save the window-config before this call
+                        ;; and restore it when the call fails - later... ;-)
+
+                        ;; we must ignore errors here because it could be that
+                        ;; a user has a certain VC-system not installed onto
+                        ;; his machine but opens directories which have a
+                        ;; CVS-subdir for example - then for such a directory
+                        ;; ECB would eventually call this backend - but this
+                        ;; would fail because the needed program is not
+                        ;; installed - so we ignore this and handle this as
+                        ;; unknown-state. 
+                        (ignore-errors (funcall vc-state-fcn file))))
+      ;; now we map the backend-state to one of the ECB-VC-state-values
+      (setq result (or (cdr (assoc result ecb-vc-state-mapping)) 'unknown)))
+    (if (not (equal result 'unchanged))
+        ;; add the new state to the cache because either the list of checked
+        ;; buffers and/or the state has been modified.
+        (ecb-vc-cache-add-file file
+                               result
+                               checked-tree-buffer-names))
+    ;; return the result - either 'unchanged or the new VC-state
+    result))
+
+(defun ecb-vc-update-sources-cache (dir)
+  "Update the SOURCES cache for DIR with the current-content of the
+sources-buffer if DIR has currently either a filtered or full cache entry in
+the SOURCES-cache."
+  (let* ((full-sources-cache (ecb-sources-cache-get-full dir))
+         (filtered-sources-cache (and full-sources-cache
+                                      (ecb-sources-cache-get-filtered dir))))
+    (if filtered-sources-cache
+        ;; we have currently a filtered sources-buffer so we must update the
+        ;; filtered sources-cache.
+        (ecb-sources-cache-add-filtered dir
+                                        (list (tree-buffer-get-root)
+                                              (tree-buffer-displayed-nodes-copy)
+                                              (ecb-buffer-substring (point-min)
+                                                                    (point-max))
+                                              ;; add the old-filter-spec
+                                              ;; because it must be the same
+                                              (nth 3 filtered-sources-cache)))
+      (if full-sources-cache
+          ;; we have currently a cached sources-buffer without an applied
+          ;; filter so we must update the full sources-cache.
+          (ecb-sources-cache-add-full dir
+                                      (list (tree-buffer-get-root)
+                                            (tree-buffer-displayed-nodes-copy)
+                                            (ecb-buffer-substring (point-min)
+                                                                  (point-max))))))))
+
+;; Not needed anymore - but we leave it here, who knows...
+;; (defun ecb-vc-cvs-root-remote-p (root)
+;;   "Return not nil if ROOT is a remote CVS-repository."
+;;   (save-match-data
+;;     (if (string-match "^:local:" root)
+;;         nil
+;;       (and (string-match "^\\(:ext:\\|:server:\\)?\\([^@]+@\\)?\\([^:]+\\):"
+;;                          root)
+;;            (match-string 3 root)))))
+
+;; some tests:
+;; The following must all return cvs.sourceforge.net!
+;; (ecb-vc-cvs-root-remote-p ":ext:berndl@cvs.sourceforge.net:/usr/local/root")
+;; (ecb-vc-cvs-root-remote-p "berndl@cvs.sourceforge.net:/usr/local/root")
+;; (ecb-vc-cvs-root-remote-p ":ext:cvs.sourceforge.net:/usr/local/root")
+;; (ecb-vc-cvs-root-remote-p "cvs.sourceforge.net:/usr/local/root")
+;; (ecb-vc-cvs-root-remote-p ":ext:berndl@cvs.sourceforge.net:C:/local/root")
+;; (ecb-vc-cvs-root-remote-p "berndl@cvs.sourceforge.net:C:/local/root")
+;; (ecb-vc-cvs-root-remote-p ":ext:cvs.sourceforge.net:C:/local/root")
+;; (ecb-vc-cvs-root-remote-p "cvs.sourceforge.net:C:/local/root")
+;; The following has to return nil!
+;; (ecb-vc-cvs-root-remote-p "/local/root")
+;; (ecb-vc-cvs-root-remote-p ":local:C:/local/root")
+;; The following is allowed to return "C" because CVS forbids to use
+;; windows-path as root without keyword :local:!
+;; (ecb-vc-cvs-root-remote-p "C:/local/root")
+
+(defun ecb-vc-dir-managed-by-CVS (directory)
+  "Return 'CVS if DIRECTORY is managed by CVS. nil if not."
+  (and (locate-library "vc-cvs")
+       (ecb-file-exists-p (concat directory "/CVS/"))
+       (require 'vc)
+       (require 'vc-cvs)
+       'CVS))
+
+(defun ecb-vc-dir-managed-by-RCS (directory)
+  "Return 'RCS if DIRECTORY is managed by RCS. nil if not."
+  (and (locate-library "vc-rcs")
+       (ecb-file-exists-p (concat directory "/RCS/"))
+       (require 'vc)
+       (require 'vc-rcs)
+       'RCS))
+
+(defun ecb-vc-dir-managed-by-SVN (directory)
+  "Return 'SVN if DIRECTORY is managed by SVN. nil if not."
+  (and (locate-library "vc-svn")
+       (let ((admin-dir (cond ((and (memq system-type '(cygwin windows-nt ms-dos))
+                                    (getenv "SVN_ASP_DOT_NET_HACK"))
+                               "_svn")
+                              (t ".svn"))))
+         (ecb-file-exists-p (concat directory "/" admin-dir "/")))
+       (require 'vc)
+       (require 'vc-svn)
+       'SVN))
+
+(defun ecb-vc-dir-managed-by-SCCS (directory)
+  "Return 'SCCS if DIRECTORY is managed by SCCS. nil if not."
+  (and (locate-library "vc-sccs")
+       (or (ecb-file-exists-p (concat directory "/SCCS/"))
+           ;; Remote SCCS project
+           (let ((proj-dir (getenv "PROJECTDIR")))
+             (if proj-dir
+                 (ecb-file-exists-p (concat proj-dir "/SCCS")))))
+       (require 'vc)
+       (require 'vc-sccs)
+       'SCCS))
+       
+
+;; Git support
+
+(defun ecb-vc-dir-managed-by-GIT (directory)
+  "Return 'GIT if DIRECTORY is managed by Git. nil if not.
+Because with Git only the top-most directory of a source-tree has a subdir
+.git this function tries recursively upwards if there is a .git-subdir."
+  ;; With XEmacs we must first load the vc-hooks which contain the function
+  ;; `vc-find-root'
+  (when ecb-running-xemacs
+    (ignore-errors (vc-load-vc-hooks)))
+  (and (locate-library "vc-git")
+       (fboundp 'vc-find-root)
+       (vc-find-root directory ".git")
+       (require 'vc)
+       (require 'vc-git)
+       'GIT))
+
+;; an own implementation for Git...
+;; (defun ecb-vc-dir-managed-by-GIT (directory)
+;;   (let* ((sourcedir (ecb-fix-filename (file-truename directory)))
+;;          (gitdir (concat sourcedir "/.git/")))
+;;     (if (and (ecb-file-exists-p gitdir)
+;;              (locate-library "vc-git"))
+;;         'GIT
+;;       (if (equal sourcedir (ecb-fix-filename "/"))
+;;           nil
+;;         (ecb-vc-dir-managed-by-GIT (concat sourcedir "/../"))))))
+
+;;(ecb-vc-dir-managed-by-GIT default-directory)
+
+;; Monotone support
+
+(defun ecb-vc-dir-managed-by-MTN (directory)
+  "Return 'MTN if DIRECTORY is managed by Monotone. nil if not."
+  ;; With XEmacs we must first load the vc-hooks which contain the function
+  ;; `vc-find-root'
+  (when ecb-running-xemacs
+    (ignore-errors (vc-load-vc-hooks)))
+  (and (locate-library "vc-mtn")
+       (fboundp 'vc-find-root)
+       (vc-find-root directory "_MTN/format")
+       (require 'vc)
+       (require 'vc-mtn)
+       'MTN))
+
+;; clearcase support
+
+;; To enable Cleacase-support just add the combination
+;; ecb-vc-dir-managed-by-CC and ecb-vc-check-CC-state to
+;; `ecb-vc-supported-backends'
+
+;; Problem: is this OK to assume, that the clearcase-specific stuff is already
+;; loaded? may be we need more checks here.
+(silentcomp-defun clearcase-file-is-in-view-p)
+(defun ecb-vc-dir-managed-by-CC (directory)
+  "Return 'CC if DIRECTORY is managed by ClearCase. nil if not."
+  (and (fboundp 'clearcase-file-is-in-view-p)
+       (if (clearcase-file-is-in-view-p directory)
+           'CC)))
+
+(silentcomp-defun clearcase-compute-next-action)
+(defun ecb-vc-check-CC-state (file)
+  "Checks the VC-state of FILE when under Control of Clearcase.
+Returns the following different state-values: 'unknown, 'up-to-date, 'edited
+and 'unlocked-changes."
+  (let ((action (and (fboundp 'clearcase-compute-next-action)
+                     (clearcase-compute-next-action file))))
+    (cond
+     ((eq action 'mkelem)
+      'unknown)
+     ((eq action 'checkout)
+      'up-to-date)
+     ((eq action 'uncheckout)
+      'edited)
+     ((eq action 'illegal-checkin)
+      ;; ??? Is OK ???
+      'unlocked-changes)
+     ((eq action 'checkin)
+      'edited))))
+
+(defecb-advice clearcase-sync-from-disk after ecb-vc-advices
+  "Ensures that the ECB-cache is reset and the entry for the currently
+checked-in/out or added file is cleared. Does nothing if the function
+`ecb-vc-dir-managed-by-CC' is not contained in `ecb-vc-supported-backends'!"
+  (when (assoc 'ecb-vc-dir-managed-by-CC ecb-vc-supported-backends)
+    (ecb-vc-cache-remove (ecb-fix-filename (ad-get-arg 0)))
+    (ecb-vc-reset-vc-stealthy-checks)))
+
+
+
+;; This function should work for all backends supported by vc
+(defun ecb-vc-state (file)
+  "Same as `vc-state' but it clears the internal caches of the VC-package for
+FILE before calling `vc-state'. Finally calls `vc-state' and returns that
+value. This function should work for all backends supported by vc.
+
+Note: `vc-state' probably uses the heuristic-state function of the backend
+which is much faster but can be sometimes inaccurate. If always the accurate
+state is needed `vc-recompute-state' has to be used - see
+`ecb-vc-recompute-state'."
+  (and (fboundp 'vc-file-clearprops) (vc-file-clearprops file))
+  (vc-state file))
+
+(defalias 'ecb-vc-recompute-state 'vc-recompute-state)
+
+(defun ecb-vc-get-state-fcn-for-dir (directory)
+  "Get that function which should be used for checking the VC-state for files
+contained in DIRECTORY. Get it either from the VC-cache or call the car of
+each element of `ecb-vc-supported-backends' and return the cdr of the first
+elem where the car returns not nil. If Directory is not managed by a
+version-control system then return nil. Store the result in the VC-cache for
+speeding up things next time. Ange-ftp- or efs-directories will never be
+checked for VC-states!"
+  (let* ((norm-dir (ecb-fix-filename directory))
+         (cache-val (ecb-vc-cache-get norm-dir)))
+    (case cache-val
+      (NO-VC nil)
+      ((nil) ;; not cached or outdated
+       (let ((vc-backend-fcn
+              (catch 'found
+                (dolist (elem ecb-vc-supported-backends)
+                  (when (and (fboundp (car elem))
+                             (funcall (car elem) norm-dir))
+                    (throw 'found (cdr elem))))
+                nil)))
+         ;; Add it to the vc-cache: Either NO-VC if nil otherwise the
+         ;; check-state-function
+         (ecb-vc-cache-add-dir norm-dir (or vc-backend-fcn 'NO-VC))
+         vc-backend-fcn))
+      (otherwise cache-val))))
+
+(defalias 'ecb-vc-managed-dir-p 'ecb-vc-get-state-fcn-for-dir)
+
+(defun ecb-vc-generate-node-name (name state)
+  "Generate a node-name with an appropriate icon in the front of NAME
+depending on STATE. If Emacs supports image-display then an image-icon wll be
+used otherwise an ascii-icon. The text-property 'ecb-vc-ascii-icon-length is
+added to the full length of the returned node-name. It contains as value the
+length of the ascii-icon \(incl. one trailing space) which is added in front
+of NAME."
+  (let* ((ascii-icon (ecb-vc-get-ascii-icon-for-vc-state state))
+         (node-name (concat ascii-icon " "
+                            (save-match-data
+                              (if (string-match "^(.) \\(.+\\)$" name)
+                                  (match-string 1 name)
+                                name)))))
+    (put-text-property 0 (length node-name)
+                       'ecb-vc-ascii-icon-length (1+ (length ascii-icon))
+                       node-name)
+    (ecb-generate-node-name node-name (1+ (length ascii-icon))
+                            (ecb-vc-get-image-name-for-vc-state state)
+                            ;; even in the history- or the directories-buffers
+                            ;; we use the icons of the sources-buffer because
+                            ;; they are the same!
+                            ecb-sources-buffer-name)))
+
+;; (insert (ecb-vc-generate-node-name "test-name" 'needs-merge))
+
+(defun ecb-get-sourcename-of-nodename (nodename)
+  "Extract the name of the source from the node-name NODENAME.
+This is for nodenames generated by `ecb-vc-generate-node-name' or
+`ecb-generate-node-name' and it return exactly this part of NODENAME without
+all the preceding stuff added by one of these functions."
+  (let* ((vc-ascii-icon-length (get-text-property
+                                0
+                                'ecb-vc-ascii-icon-length
+                                nodename))
+         (prefix-length (or vc-ascii-icon-length
+                            (or (get-text-property
+                                 0
+                                 'tree-buffer-image-length
+                                 nodename)
+                                0))))
+    (substring nodename prefix-length)))
+
+(defun ecb-stealthy-vc-check--dir/history (state)
+  "Check for all sourcefile-nodes either in the directories- or the
+history-buffer the VC-state. This function does the real job and is is only
+for use by a stealthy function defined with `defecb-stealthy'! STATE is the
+initial state-value the stealthy-function has when called. Return the new
+state-value."
+  (if (or (not ecb-vc-needed-vc-package-available-p)
+          (not ecb-vc-enable-support))
+      'done
+    (if (not (or (string= (buffer-name (current-buffer))
+                          ecb-history-buffer-name)
+                 (and (string= (buffer-name (current-buffer))
+                               ecb-directories-buffer-name)
+                      (ecb-show-sources-in-directories-buffer-p))))
+        'done
+      ;; Now we are either in the history-buffer or in the directories-buffer
+      ;; when sources are displayed in the directories-buffer
+      (if (equal state 'restart)
+          (setq state 1))
+      ;; Here the state is an integer because a stealthy functions runs only
+      ;; when state != 'done
+      (let ((lines-of-buffer (count-lines (point-min) (point-max)))
+            (curr-node nil)
+            (curr-dir nil)
+            (new-name nil)
+            (vc-state-fcn nil)
+            (new-state nil)
+            (node-types-to-check (list ecb-history-nodetype-filebuffer
+                                       ecb-history-nodetype-indirect-filebuffer
+                                       ecb-directories-nodetype-sourcefile)))
+        (ecb-exit-on-input 'vc-check-dir-hist-stealthy
+          (save-excursion
+            (while (<= state lines-of-buffer)
+              (ecb-throw-on-input 'lines-of-buffer-loop)
+              (ecb-goto-line state)
+              (setq curr-node (tree-buffer-get-node-at-point))
+              (when (member (tree-node->type curr-node) node-types-to-check)
+                (setq curr-dir (ecb-file-name-directory
+                                (ecb-source-get-filename (tree-node->data curr-node))))
+                (when (and (ecb-vc-directory-should-be-checked-p curr-dir)
+                           (ecb-file-exists-p (ecb-source-get-filename
+                                               (tree-node->data curr-node))))
+                  (setq vc-state-fcn (ecb-vc-get-state-fcn-for-dir curr-dir))
+                  (when vc-state-fcn ;; file is under VC-control
+                    (setq new-name (tree-node->name curr-node))
+                    (setq new-state
+                          (ecb-vc-check-state (ecb-source-get-filename
+                                               (tree-node->data curr-node))
+                                              (buffer-name (current-buffer))
+                                              vc-state-fcn))
+                    ;; we update the node only if the state has changed 
+                    (when (not (equal 'unchanged new-state))
+                      (setq new-name (ecb-vc-generate-node-name new-name new-state))
+                      (tree-buffer-update-node
+                       nil new-name
+                       'use-old-value 'use-old-value 'use-old-value 'use-old-value t)))))
+              (setq state (1+ state)))))
+        (if (> state lines-of-buffer)
+            (setq state 'done)))
+      state)))
+
+(defun ecb-stealthy-vc-check--sources (state)
+  "Check for all sourcefile-nodes in sources-buffer the VC-state. This
+function does the real job and is is only for use by a stealthy function
+defined with `defecb-stealthy'! STATE is the initial state-value the
+stealthy-function has when called. Return the new state-value."
+  (if (or (not ecb-vc-needed-vc-package-available-p)
+          (not (ecb-vc-directory-should-be-checked-p ecb-path-selected-directory)))
+      'done
+    (let ((vc-state-fcn (ecb-vc-get-state-fcn-for-dir ecb-path-selected-directory)))
+      (if (null vc-state-fcn)
+          ;; the sources-files are not under VC-control
+          'done
+        ;; Now we are either in the sources-, or history-buffer or in the
+        ;; directories-buffer when sources are displayed in the
+        ;; directories-buffer
+        (if (equal state 'restart)
+            (setq state 1))
+        ;; Here the state is an integer because a stealthy functions runs only
+        ;; when state != 'done
+        (let ((lines-of-buffer (count-lines (point-min) (point-max)))
+              (curr-node nil)
+              (new-name nil)
+              (new-state nil)
+              (update-performed-for-dir nil))
+          (ecb-exit-on-input 'vc-check-sources-stealthy
+            (save-excursion
+              (while (<= state lines-of-buffer)
+                (ecb-throw-on-input 'lines-of-buffer-loop)
+                (ecb-goto-line state)
+                (setq curr-node (tree-buffer-get-node-at-point))
+                (if (ecb-file-exists-p (tree-node->data curr-node))
+                    (progn
+                      (setq new-name (tree-node->name curr-node))
+                      (setq new-state
+                            (ecb-vc-check-state (tree-node->data curr-node)
+                                                (buffer-name (current-buffer))
+                                                vc-state-fcn))
+                      ;; we update the node only if the state has changed 
+                      (when (not (equal 'unchanged new-state))
+                        (setq new-name (ecb-vc-generate-node-name new-name new-state))
+                        (or update-performed-for-dir
+                            (setq update-performed-for-dir ecb-path-selected-directory))
+                        (tree-buffer-update-node
+                         curr-node new-name
+                         'use-old-value 'use-old-value 'use-old-value
+                         'use-old-value t))
+                      (setq state (1+ state)))
+                
+                  ;; file does no longer exist
+                
+                  ;; reduce the number of lines/files
+                  (setq lines-of-buffer (1- lines-of-buffer))
+                  ;; remove the node from the tree and the tree-display
+                  (tree-buffer-remove-node curr-node t)
+                  ;; remove the current dir from the files-and-sub-dir-cache
+                  (ecb-files-and-subdirs-cache-remove ecb-path-selected-directory)
+                  ;; if there is currently only one line in the tree-buffer the
+                  ;; directory will be probably empty now (we knowingly ignore
+                  ;; here the possibility that some files can exists in the dir
+                  ;; but they are not displayed in the tree-buffer cause of some
+                  ;; filters for example), so it's a heuristic approach
+                  (if (= lines-of-buffer 1)
+                      (ecb-directory-empty-cache-remove ecb-path-selected-directory))
+                  ;; we must trigger that the sources-cache will be updated below
+                  (setq update-performed-for-dir ecb-path-selected-directory)
+                  ))))
+          ;; if we have performed at least one update then we must update the
+          ;; SOURCES-cache.
+          (when update-performed-for-dir
+            (ecb-vc-update-sources-cache update-performed-for-dir))
+          (if (> state lines-of-buffer)
+              (setq state 'done)))
+        state))))
+
+(defecb-stealthy ecb-stealthy-vc-check-in-history-buf
+  "Check for all entries in the history-buffer their VC-state and
+display an appropriate icon in front of the item."
+  (when (equal 'window-not-visible
+               (ecb-exec-in-window ecb-history-buffer-name
+                 (setq state
+                       (ecb-stealthy-vc-check--dir/history state))))
+    (setq state 'done)))
+
+
+(defecb-stealthy ecb-stealthy-vc-check-in-sources-buf
+  "Check for all sourcefile-nodes in the sources-buffer their VC-state and
+display an appropriate icon in front of the file."
+  (when (equal 'window-not-visible
+               (ecb-exec-in-window ecb-sources-buffer-name
+                 (setq state
+                       (ecb-stealthy-vc-check--sources state))))
+    (setq state 'done)))
+
+(defecb-stealthy ecb-stealthy-vc-check-in-directories-buf
+  "Check for all sourcefile-nodes in the directories-buffer their VC-state and
+display an appropriate icon in front of the file."
+  (if (ecb-show-sources-in-directories-buffer-p)
+      (when (equal 'window-not-visible
+                   (ecb-exec-in-window ecb-directories-buffer-name
+                     (setq state
+                           (ecb-stealthy-vc-check--dir/history state))))
+        (setq state 'done))
+    (setq state 'done)))
+
+(defun ecb-vc-reset-vc-stealthy-checks ()
+  "Resets all stealthy VC-checks."
+  ;; we can call savely all these initialization because if one of the
+  ;; following tree-windows is not visible nothing will be done (and the
+  ;; directories-check will only run when sources are displayed in the
+  ;; directories buffer!). If visible the vc-check will be performed for all
+  ;; current visible file-nodes again in all visible tree-buffers of the
+  ;; file-browser but because we have only removed the cache-entry for
+  ;; exactly one file, the check will be very fast for all file-nodes
+  ;; besides this file!
+
+  ;; I think the read-only check must be performed too - because for
+  ;; backends like Clearcase a changed VC-state can also result in a changed
+  ;; read-only-state!
+  (ecb-stealthy-function-state-init 'ecb-stealthy-ro-check-in-directories-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-ro-check-in-sources-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-sources-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-directories-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-history-buf)
+  ;; This function is also used in write-file-hooks so we have to return nil
+  ;; because otherwise a file will never be written - see documentation of
+  ;; `write-file-hooks'!
+  nil)
+  
+;; we have to add a smart piece of code to `vc-checkin-hook' which is able to
+;; clear the cache entry for exactly that file checked-in with vc-checkin!
+;; Problems to solve:
+;; - unfortunatelly this hook is not called with the checked-in filename as
+;;   argument but it is a normal hook runned with `run-hooks' :-( But we can
+;;   not reset the stuff in the advice itself because this doesn't ensure that
+;;   the after-advice-stuff is called *after* the checkin - seems that the
+;;   after-advice runs already during the user inserts/edits the
+;;   checkin-comment. But the vc-checkin-hook is really called after the
+;;   checkin! ==> We use a combination of an after-advice and vc-checkin-hook!
+;; - If a user uses PCL-CVS for CVS-operations this advice of vc-checkin will
+;;   not run because pcl-cvs doesn't delegate the checkin-task to
+;;   `vc-checkin'. Therefore also the `vc-checkin-hook' is not runned via
+;;   pcl-cvs.
+;; - What about other backends not supported by VC, e.g. clearcase.el? Well,
+;;   with a good documentation what a user has to do.... ;-)
+
+
+(defvar ecb-checkedin-file nil
+  "Stored the filename of the most recent checked-in file. Is only set by the
+after-advice of `vc-checkin' and `ecb-vc-checkin-hook' \(resets it to nil).
+Evaluated only by `ecb-vc-checkin-hook'.
+
+This is the communication-channel between `vc-checkin' and
+`ecb-vc-checkin-hook' so this hook-function gets the filename of the
+checked-in file.")
+
+(defecb-advice vc-checkin after ecb-vc-advices
+  "Simply stores the filename of the checked-in file in `ecb-checkedin-file'
+so it is available in the `vc-checkin-hook'."
+  (ignore-errors
+    (setq ecb-checkedin-file (ecb-fix-filename (ad-get-arg 0)))))
+
+(defun ecb-vc-checkin-hook ()
+  "Ensures that the ECB-cache is reset and the entry for the most recent
+checkedin file is cleared. Uses `ecb-checkedin-file' as last checked-in file."
+  (when ecb-checkedin-file
+    (ecb-vc-cache-remove ecb-checkedin-file)
+    (ecb-vc-reset-vc-stealthy-checks)
+    (setq ecb-checkedin-file nil)))
+
+(defun ecb-vc-after-revert-hook ()
+  "Ensures that the ECB-cache is reset and the entry for the currently
+reverted file-buffer is cleared."
+  (let ((file (ignore-errors (ecb-fix-filename (ecb-buffer-file-name)))))
+    (when (and file (ecb-file-exists-p file))
+      (ecb-vc-cache-remove file)
+      (ecb-vc-reset-vc-stealthy-checks))))
+
+(defun ecb-vc-enable-internals (arg)
+  "Enable or disable \(if ARG < 0) all settings needed by the VC-support."
+  (if (< arg 0)
+      (progn
+        (remove-hook 'after-revert-hook 'ecb-vc-after-revert-hook)
+        (remove-hook 'write-file-hooks 'ecb-vc-reset-vc-stealthy-checks)
+        (remove-hook 'vc-checkin-hook 'ecb-vc-checkin-hook)
+        (ecb-disable-advices 'ecb-vc-advices))
+    (add-hook 'after-revert-hook 'ecb-vc-after-revert-hook)
+    (add-hook 'write-file-hooks 'ecb-vc-reset-vc-stealthy-checks)
+    (add-hook 'vc-checkin-hook 'ecb-vc-checkin-hook)
+    (ecb-enable-advices 'ecb-vc-advices)))
+
+;; -- end of vc-support ---------------
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Maybe we should run directly
+;; `ecb-stealthy-updates' from within this after-update-hooks?!
+
+(defun ecb-stealth-tasks-after-directories-update ()
+  "After update hook for the directories-buffer. Runs directly after
+performing a `tree-buffer-update' for this buffer."
+  (ecb-stealthy-function-state-init 'ecb-stealthy-empty-dir-check)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-ro-check-in-directories-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-directories-buf)
+  )
+
+(defun ecb-stealth-tasks-after-sources-update ()
+  "After update hook for the sources-buffer. Runs directly after
+performing a `tree-buffer-update' for this buffer."
+  (ecb-stealthy-function-state-init 'ecb-stealthy-ro-check-in-sources-buf)
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-sources-buf)
+  )
+
+(defun ecb-stealth-tasks-after-history-update ()
+  "After update hook for the history-buffer. Runs directly after
+performing a `tree-buffer-update' for this buffer."
+  (ecb-stealthy-function-state-init 'ecb-stealthy-vc-check-in-history-buf)
+  )
+
+;; -- adding files ---------------------
+
+(defun ecb-tree-node-add-files
+  (node path files type include-extension old-children &optional not-expandable)
+  "For every file in FILES add a child-node to NODE."
+  (let* ((no-vc-state-display
+          ;; no vc-state-display when the type of FILES means subdirs in
+          ;; the directories-buffer
+          (and (equal (buffer-name) ecb-directories-buffer-name)
+               (= type ecb-directories-nodetype-directory)))
+         (dir-managed-by-vc (if (or no-vc-state-display
+                                    (not (ecb-vc-directory-should-be-checked-p path)))
+                                nil
+                              (ecb-vc-managed-dir-p path))))
+    (dolist (file files)
+      (let* ((filename (ecb-fix-filename path file))
+             (file-1 (if include-extension
+                         file
+                       (ecb-file-name-sans-extension file))))
+        (tree-node-add-children
+         node
+         (ecb-new-child
+          old-children
+          (if no-vc-state-display
+              file-1
+            (if dir-managed-by-vc
+                (ecb-vc-generate-node-name file-1
+                                           (nth 0 (ecb-vc-cache-get filename)))
+              (ecb-generate-node-name file-1 -1 "leaf"
+                                      ecb-sources-buffer-name)))
+          type filename
+          (or not-expandable
+              (= type ecb-directories-nodetype-sourcefile)
+              ;; The empty-dir-check is performed stealthy
+              nil ;;(ecb-check-emptyness-of-dir filename)
+              )
+          (if ecb-truncate-long-names 'end)))))))
+
+(defun ecb-new-child (old-children name type data
+    &optional not-expandable shrink-name)
+  "Return a node with type = TYPE, data = DATA and name = NAME. Tries to find
+a node with matching TYPE and DATA in OLD-CHILDREN. If found no new node is
+created but only the fields of this node will be updated. Otherwise a new node
+is created."
+  (catch 'exit
+    (dolist (child old-children)
+      (when (and (equal (tree-node->data child) data)
+                 (= (tree-node->type child) type))
+        (setf (tree-node->name child) name)
+        (if not-expandable
+            (setf (tree-node->expandable child) nil))
+        (throw 'exit child)))
+    (tree-node-new name type data not-expandable nil shrink-name)))
+
+(defun ecb-add-source-path (&optional dir alias no-prompt-for-future-session)
+  "Add a directory to the `ecb-source-path'."
+  (interactive)
+  ;; we must manually cut a filename because we must not add filenames to
+  ;; `ecb-source-path'!
+  (let* ((use-dialog-box nil)
+         (my-dir (ecb-fix-filename
+                  (or dir
+                      (ecb-file-name-directory (read-file-name "Add source path: ")))
+                  nil t))
+         (my-alias (or alias
+                       (read-string (format "Alias for \"%s\" (empty = no alias): "
+                                            my-dir)))))
+    (setq ecb-source-path (append ecb-source-path
+                                  (list (if (> (length my-alias) 0)
+                                            (list my-dir my-alias) my-dir))))
+    (ecb-update-directories-buffer)
+    (if (and (not no-prompt-for-future-session)
+             (y-or-n-p "Add the new source-path also for future-sessions? "))
+        (ecb-customize-save-variable 'ecb-source-path ecb-source-path)
+      (customize-set-variable 'ecb-source-path ecb-source-path))))
+
+(tree-buffer-defpopup-command ecb-add-source-path-node
+  "Runs `ecb-add-source-path' from popup."
+  (call-interactively 'ecb-add-source-path))
+
+
+(tree-buffer-defpopup-command ecb-node-to-source-path
+  "Add this node to the source-path."
+  (ecb-add-source-path (tree-node->data node)))
+
+
+(defun ecb-delete-s (child children sources)
+  (when children
+    (if (eq child (car children))
+	(cdr sources)
+      (cons (car sources) (ecb-delete-s child (cdr children) (cdr sources))))))
+
+
+(tree-buffer-defpopup-command ecb-delete-source-path
+  "Delete this source-path via popup."
+  (let ((path (tree-node->data node)))
+    (when (ecb-confirm (concat "Really delete source-path " path "?"))
+      (setq ecb-source-path (ecb-delete-s
+                             node (tree-node->children (tree-node->parent node))
+                             ecb-source-path))
+      (ecb-update-directories-buffer)
+      (if (y-or-n-p "Delete source-path also for future-sessions? ")
+          (ecb-customize-save-variable 'ecb-source-path ecb-source-path)
+        (customize-set-variable 'ecb-source-path ecb-source-path)))))
+
+
+(defun ecb-remove-dir-from-caches (dir)
+  "Remove DIR from the caches SUBDIR, EMPTY-DIR and SOURCES."
+  (ecb-files-and-subdirs-cache-remove dir)
+  (ecb-directory-empty-cache-remove dir)
+  (ecb-sources-cache-remove dir))
+
+(defun ecb-directory-update-speedbar (dir)
+  "Update the integrated speedbar if necessary."
+  (and (ecb-speedbar-active-p)
+       ;; depending on the value of `ecb-directory-update-speedbar' we have to
+       ;; check if it is senseful to update the speedbar.
+       (or (equal ecb-directories-update-speedbar t)
+           (and (equal ecb-directories-update-speedbar 'auto)
+                (not (or (get-buffer-window ecb-sources-buffer-name ecb-frame)
+                         (member ecb-layout-name
+                                 ecb-show-sources-in-directories-buffer))))
+           (and (not (equal ecb-directories-update-speedbar 'auto))
+                (functionp ecb-directories-update-speedbar)
+                (funcall ecb-directories-update-speedbar dir)))
+       (ecb-speedbar-update-contents)))
+
+(defecb-tree-buffer-callback ecb-directory-or-source-clicked ecb-directories-buffer-name select nil
+  "Does all necessary when a user clicks onto a node in the directories-buffer.
+Directory- and sources nodes are handled appropriately."
+  (if (= 3 (tree-node->type node))
+      (funcall (tree-node->data node))
+    (ecb-update-directory-node node)
+    (if shift-mode
+        (ecb-mouse-over-directory-node node nil nil 'force))
+    (if (or (= ecb-directories-nodetype-directory
+               (tree-node->type node))
+            (= ecb-directories-nodetype-sourcepath
+               (tree-node->type node)))
+        (progn
+          ;; prevent from automatically hiding the ecb-windows when meta-mode
+          ;; is not nil
+          (setq no-meta-hiding t)
+          (if (= 2 ecb-button)
+              (when (tree-node->expandable node)
+                (tree-node-toggle-expanded node)
+                (ecb-exec-in-window ecb-directories-buffer-name
+                  ;; Update the tree-buffer with optimized display of NODE
+                  (tree-buffer-update node)))
+            
+            ;; Removing the element from the sources-cache, the
+            ;; files-and-subdirs-cache and the empty-dirs-cache (incl. all
+            ;; subdirs)
+            (when shift-mode
+              (ecb-remove-dir-from-caches (tree-node->data node))
+              (ecb-directory-empty-cache-remove-all (tree-node->data node))
+              ;; a powerclick should remove all vc-caches of contained files
+              (ecb-vc-cache-remove-files-of-dir (tree-node->data node))
+              )
+
+            ;; if we are in a maximized directories-window and if no sources
+            ;; are shown in the directories-buffer but a sources-buffer is
+            ;; contained in current layout then we have to redraw the full
+            ;; layout first so the contents of the clicked directory can be
+            ;; displayed in the sources-buffer.
+            (when (and (ecb-buffer-is-maximized-p ecb-directories-buffer-name)
+                       (not (ecb-show-sources-in-directories-buffer-p))
+                       (ecb-buffer-is-ecb-buffer-of-current-layout-p
+                        ecb-sources-buffer-name))
+              (if (ecb-member-of-symbol/value-list
+                   ecb-directories-buffer-name
+                   ecb-maximize-next-after-maximized-select)
+                  (progn
+                    (ecb-maximize-ecb-buffer ecb-sources-buffer-name)
+                    (ecb-window-select ecb-sources-buffer-name))
+                (ecb-undo-maximize-ecb-buffer t)))
+            
+            (ecb-set-selected-directory (tree-node->data node) shift-mode)
+            ;; if we have running an integrated speedbar we must update the
+            ;; speedbar 
+            (ecb-directory-update-speedbar (tree-node->data node))))
+      
+      (ecb-source-item-clicked node ecb-button edit-window-nr shift-mode meta-mode)
+      )))
+
+(defun ecb-source-item-clicked (node ecb-button edit-window-nr shift-mode meta-mode)
+  ;; if we are in a maximized sources-window and if a methods-buffer is
+  ;; contained in current layout then we have to redraw the full layout first
+  ;; so the contents of the clicked source-file can be displayed in the
+  ;; methods-buffer.
+  (when (and (ecb-buffer-is-maximized-p (buffer-name))
+             (ecb-buffer-is-ecb-buffer-of-current-layout-p
+              ecb-methods-buffer-name))
+    (if (ecb-member-of-symbol/value-list
+         (buffer-name)
+         ecb-maximize-next-after-maximized-select)
+        (progn
+          (ecb-maximize-ecb-buffer ecb-methods-buffer-name)
+          (ecb-window-select ecb-methods-buffer-name))
+      (ecb-undo-maximize-ecb-buffer t)))
+  (ecb-set-selected-source (tree-node->data node)
+                           (ecb-combine-ecb-button/edit-win-nr ecb-button edit-window-nr)
+			   shift-mode)
+  )
+
+(defecb-tree-buffer-callback ecb-source-clicked ecb-sources-buffer-name select nil
+  "Does all necessary when a user clicks onto a node in the sources-buffer."
+  (if shift-mode
+      (ecb-mouse-over-source-node node nil nil 'force))
+  (ecb-source-item-clicked node ecb-button edit-window-nr shift-mode meta-mode))
+
+(defecb-tree-buffer-callback ecb-history-clicked ecb-history-buffer-name select nil
+  "Does all necessary when a user clicks onto a node in the history-buffer."
+  (if shift-mode
+      (ecb-mouse-over-history-node node nil nil 'force))
+  (if (= (tree-node->type node) ecb-history-nodetype-bucket)
+      ;; Just expand/collapse the node
+      (progn
+        (tree-node-toggle-expanded node)
+        ;; Update the tree-buffer with optimized display of NODE
+        (tree-buffer-update node))      
+    (ecb-source-item-clicked node ecb-button edit-window-nr shift-mode meta-mode)))
+
+(defun ecb-expand-directory-nodes (level)
+  "Set the expand level of the nodes in the ECB-directories-buffer.
+For argument LEVEL see `ecb-expand-methods-nodes'.
+
+Be aware that for deep structured paths and a lot of source-paths this command
+can last a long time - depending of machine- and disk-performance."
+  (interactive "nLevel: ")
+  (ecb-exec-in-window ecb-directories-buffer-name
+    (dolist (node (tree-node->children (tree-buffer-get-root)))
+      (tree-buffer-expand-node node level))
+    (tree-buffer-update))
+  (ecb-basic-buffer-sync 'force))
+
+
+(defun ecb-get-file-info-text (file)
+  "Return a file-info string for a file in the ECB sources buffer"
+  (let ((attrs (ecb-file-attributes file)))
+    (format "%s %8s %4d %10d %s %s"
+	    (nth 8 attrs)
+	    (user-login-name (nth 2 attrs))
+	    (nth 3 attrs)
+	    (nth 7 attrs)
+	    (format-time-string "%Y/%m/%d %H:%M" (nth 5 attrs))
+            (if (equal (cdr ecb-sources-show-node-info) 'file-info-full)
+                file
+              (ecb-file-name-nondirectory file)))
+    ))
+
+
+(defun ecb-mouse-over-directory-node (node &optional window no-message click-force)
+  "Displays help text if mouse moves over a node in the directory buffer or if
+CLICK-FORCE is not nil and always with regards to the settings in
+`ecb-directories-show-node-info'. NODE is the node for which help text should
+be displayed, WINDOW is the related window, NO-MESSAGE defines if the
+help-text should be printed here."
+  (if (= (tree-node->type node) ecb-directories-nodetype-sourcefile)
+      (ecb-mouse-over-source-node node window no-message click-force)
+    (if (not (= (tree-node->type node) 3))
+        (let ((str (when (or click-force
+                             (ecb-show-minibuffer-info node window
+                                                       (car ecb-directories-show-node-info))
+                             (and (not (equal (car ecb-directories-show-node-info)
+                                              'never))
+                                  (not (ecb-string= (tree-node->data node)
+                                                    (tree-node->name node)))
+                                  (eq (tree-node->parent node)
+                                      (tree-buffer-get-root))))
+                     (if (equal (cdr ecb-directories-show-node-info) 'name)
+                         (tree-node->name node)
+                       (tree-node->data node)))))
+          (prog1 str
+            (unless no-message
+              (ecb-nolog-message str)))))))
+
+
+(defun ecb-mouse-over-source-node (node &optional window no-message click-force)
+  "Displays help text if mouse moves over a node in the sources buffer or if
+CLICK-FORCE is not nil and always with regards to the settings in
+`ecb-sources-show-node-info'. NODE is the node for which help
+text should be displayed, WINDOW is the related window, NO-MESSAGE defines if
+the help-text should be printed here."
+  (let ((str (ignore-errors ;; For buffers that hasn't been saved yet
+               (when (or click-force
+                         (ecb-show-minibuffer-info node window
+                                                   (car ecb-sources-show-node-info)))
+                 (if (equal (cdr ecb-sources-show-node-info) 'name)
+                     (tree-node->name node)
+                   (ecb-get-file-info-text (tree-node->data node)))))))
+    (prog1 str
+      (unless no-message
+        (ecb-nolog-message str)))))
+
+
+(defun ecb-mouse-over-history-node (node &optional window no-message click-force)
+  "Displays help text if mouse moves over a node in the history buffer or if
+CLICK-FORCE is not nil and always with regards to the settings in
+`ecb-history-show-node-info'. NODE is the node for which help
+text should be displayed, WINDOW is the related window, NO-MESSAGE defines if
+the help-text should be printed here."
+  (let ((str (ignore-errors ;; For buffers that hasn't been saved yet
+               (when (or click-force
+                         (ecb-show-minibuffer-info node window
+                                                   (car ecb-history-show-node-info)))
+                 (case (cdr ecb-history-show-node-info)
+                   (name (tree-node->name node))
+                   (path (ecb-source-get-filename (tree-node->data node)))
+                   (name-path (format "%s (%s)" (tree-node->name node)
+                                      (ecb-source-get-filename (tree-node->data node)))))))))
+    (prog1 str
+      (unless no-message
+        (ecb-nolog-message str)))))
+
+;; popups
+
+;; needs methods
+(tree-buffer-defpopup-command ecb-create-source
+  "Creates a new sourcefile in current directory."
+  (let* ((use-dialog-box nil)
+         (dir (ecb-fix-filename
+               (funcall (if (ecb-file-directory-p (tree-node->data node))
+                            'identity
+                          'ecb-file-name-directory)
+                        (tree-node->data node))))
+         (filename (ecb-file-name-nondirectory
+                    (read-file-name "Source name: " (concat dir "/")))))
+    (ecb-select-edit-window)
+    (if (save-match-data (string-match "\\.java$" filename))
+        (ecb-jde-gen-class-buffer dir filename)
+      (find-file (concat dir "/" filename)))
+    (when (= (point-min) (point-max))
+      (set-buffer-modified-p t)
+      (let ((ecb-auto-update-methods-after-save nil))
+        (save-buffer))
+      (ecb-rebuild-methods-buffer-with-tagcache nil nil t))
+    (ecb-remove-dir-from-caches dir)
+    (ecb-set-selected-directory dir t)
+    (ecb-basic-buffer-sync)))
+
+
+(defun ecb-grep-directory-internal (node find)
+  (ecb-select-edit-window)
+  (let* ((node-data-file (ecb-source-get-filename (tree-node->data node)))
+         (default-directory (concat (ecb-fix-filename
+                                     (if (ecb-file-directory-p node-data-file)
+                                         node-data-file
+                                       (ecb-file-name-directory node-data-file)))
+                                    (ecb-directory-sep-string node-data-file))))
+    (call-interactively (if find
+                            (or (and (fboundp ecb-grep-recursive-function)
+                                     ecb-grep-recursive-function)
+                                'grep-find)
+                          (or (and (fboundp ecb-grep-function)
+                                   ecb-grep-function)
+                              'grep)))))
+
+
+(tree-buffer-defpopup-command ecb-grep-find-directory
+  "Runs grep-find for current directory."
+  (ecb-grep-directory-internal node t))
+
+
+(tree-buffer-defpopup-command ecb-grep-directory
+  "Runs grep for current directory."
+  (ecb-grep-directory-internal node nil))
+
+
+(defun ecb-create-directory (parent-node)
+  (make-directory (concat (tree-node->data parent-node) "/"
+                          (read-from-minibuffer "Directory name: ")))
+  (ecb-update-directory-node parent-node)
+  (tree-buffer-update))
+
+
+(tree-buffer-defpopup-command ecb-delete-directory
+  "Delete current directory."
+  (let ((dir (tree-node->data node)))
+    (when (ecb-confirm (concat "Really delete directory" dir "? "))
+      (delete-directory (tree-node->data node))
+      (ecb-update-directory-node (tree-node->parent node))
+      (tree-buffer-update))))
+
+
+(defun ecb-dired-directory-internal (node &optional other)
+  (ecb-select-edit-window)
+  (let* ((node-data-file (ecb-source-get-filename (tree-node->data node)))
+         (dir (ecb-fix-filename
+               (funcall (if (ecb-file-directory-p node-data-file)
+                            'identity
+                          'ecb-file-name-directory)
+                        node-data-file))))
+    (funcall (if other
+                 'dired-other-window
+               'dired)
+             dir)))
+
+
+(tree-buffer-defpopup-command ecb-dired-directory
+  "Run dired for this directory."
+  (ecb-dired-directory-internal node))
+
+
+(tree-buffer-defpopup-command ecb-dired-directory-other-window
+  "Run dired for this directory in the other window."
+  (ecb-dired-directory-internal node 'other))
+
+
+(defun ecb-dir-run-cvs-op (node op op-arg-list)
+  (let ((dir (tree-node->data node)))
+    (funcall op dir op-arg-list)))
+
+
+(tree-buffer-defpopup-command ecb-dir-popup-cvs-status
+  "Check status of directory \(and below) in pcl-cvs mode."
+  (ecb-dir-run-cvs-op node 'cvs-status '("-v")))
+
+
+(tree-buffer-defpopup-command ecb-dir-popup-cvs-examine
+  "Examine directory \(and below) in pcl-cvs mode."
+  (ecb-dir-run-cvs-op node 'cvs-examine '("-d" "-P")))
+
+
+(tree-buffer-defpopup-command ecb-dir-popup-cvs-update
+  "Update directory \(and below) in pcl-cvs mode."
+  (ecb-dir-run-cvs-op node 'cvs-update '("-d" "-P")))
+
+
+(defvar ecb-common-directories-menu nil)
+
+
+(setq ecb-common-directories-menu
+      '(("Grep"
+         (ecb-grep-directory "Grep Directory")
+         (ecb-grep-find-directory "Grep Directory recursive"))
+        ;;("---")
+        ("Dired"
+         (ecb-dired-directory "Open in Dired")
+         (ecb-dired-directory-other-window "Open in Dired other window"))
+        ("---")
+	(ecb-create-source "Create Sourcefile")
+	(ecb-create-directory "Create Child Directory")
+	(ecb-delete-directory "Delete Directory")
+        ("---")
+	(ecb-add-source-path-node "Add Source Path")))
+
+
+(defvar ecb-directories-menu nil
+  "Built-in menu for the directories-buffer for directories which are not a
+source-path of `ecb-source-path'.")
+(setq ecb-directories-menu
+      (append
+       ecb-common-directories-menu
+       '((ecb-node-to-source-path "Make This a Source Path")
+         ("---")
+         (ecb-maximize-ecb-window-menu-wrapper "Maximize window"))))
+
+
+(defvar ecb-directories-menu-title-creator
+  (function (lambda (node)
+              (let ((node-type (tree-node->type node))
+                    (node-name (tree-node->name node)))
+                    (cond ((= node-type ecb-directories-nodetype-directory)
+                           (format "%s  (Directory)" node-name))
+                          ((= node-type ecb-directories-nodetype-sourcefile)
+                           (format "%s  (File)" node-name))
+                          ((= node-type ecb-directories-nodetype-sourcepath)
+                           (format "%s  (Source-path)" node-name))))))
+  "The menu-title for the directories menu. Has to be either a string or a
+function which is called with current node and has to return a string.")
+
+(tree-buffer-defpopup-command ecb-open-source-in-editwin1
+  "Open current source-file the 1. edit-window."
+  ;; We can use `ecb-source-clicked' for history-buffer too because shift-mode
+  ;; is nil.
+  (ecb-source-clicked node 3 1 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin2
+  "Open current source-file the 2. edit-window."
+  (ecb-source-clicked node 3 2 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin3
+  "Open current source-file the 3. edit-window."
+  (ecb-source-clicked node 3 3 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin4
+  "Open current source-file the 4. edit-window."
+  (ecb-source-clicked node 3 4 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin5
+  "Open current source-file the 5. edit-window."
+  (ecb-source-clicked node 3 5 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin6
+  "Open current source-file the 6. edit-window."
+  (ecb-source-clicked node 3 6 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin7
+  "Open current source-file the 7. edit-window."
+  (ecb-source-clicked node 3 7 nil nil))
+(tree-buffer-defpopup-command ecb-open-source-in-editwin8
+  "Open current source-file the 8. edit-window."
+  (ecb-source-clicked node 3 8 nil nil))
+
+(defun ecb-dir/source/hist-menu-editwin-entries ()
+  "Generate popup-menu-entries for each edit-window if there are at least 2
+edit-windows. Otherwise return nil."
+  (let ((edit-win-list (ecb-canonical-edit-windows-list))
+        (result nil))
+    (when (> (length edit-win-list) 1)
+      (dotimes (i (min 8 (length edit-win-list)))
+        (setq result
+              (append result
+                      (list (list (intern (format "ecb-open-source-in-editwin%d" (1+ i)))
+                                  (format "edit-window %d" (1+ i)))))))
+      (append (list (list "---")) ;; we want a separator
+              (list (append (list "Open source-file in ...")
+                            result))))))
+
+
+(defun ecb-directories-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the directories-buffer."
+  (setq ecb-layout-prevent-handle-ecb-window-selection t)
+  (let ((dyn-user-extension
+         (and (functionp ecb-directories-menu-user-extension-function)
+              (funcall ecb-directories-menu-user-extension-function
+                       tree-buffer-name node)))
+        (dyn-builtin-extension (ecb-dir/source/hist-menu-editwin-entries)))
+    (list (cons ecb-directories-nodetype-directory
+                (funcall (or ecb-directories-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-directories-menu-user-extension
+                                 ecb-directories-menu)))
+          (cons ecb-directories-nodetype-sourcefile
+                (funcall (or ecb-sources-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-sources-menu-user-extension
+                                 ecb-sources-menu
+                                 dyn-builtin-extension)))
+          (cons ecb-directories-nodetype-sourcepath
+                (funcall (or ecb-directories-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-directories-menu-user-extension
+                                 ecb-source-path-menu))))))
+
+;; source-path tokens
+
+(defvar ecb-source-path-menu nil
+  "Built-in menu for the directories-buffer for directories which are elements of
+`ecb-source-path'.")
+(setq ecb-source-path-menu
+      (append
+       ecb-common-directories-menu
+       '((ecb-delete-source-path "Delete Source Path")
+         ("---")
+         (ecb-maximize-ecb-window-menu-wrapper "Maximize window"))))
+
+
+(tree-buffer-defpopup-command ecb-delete-source
+  "Deletes current sourcefile."
+  (let* ((file (ecb-source-get-filename (tree-node->data node)))
+         (dir (ecb-fix-filename (ecb-file-name-directory file))))
+    (when (ecb-confirm (concat "Really delete " (ecb-file-name-nondirectory file) "? "))
+      (when (get-file-buffer file)
+        ;; if there is an open buffer for this source then we kill them - this
+        ;; ensures also that if there are indirect-buffers to this base-buffer
+        ;; these buffers will be killed too by Emacs and the called
+        ;; kill-buffer-hook is called for each indirect-buffer - so all
+        ;; history-nodes for these are removed.
+        (kill-buffer (get-file-buffer file)))
+      (ecb-delete-file file)
+      (ecb-remove-dir-from-caches dir)
+      (ecb-set-selected-directory dir t))))
+
+
+(tree-buffer-defpopup-command ecb-file-popup-ediff-revision
+  "Diff file against repository with ediff."
+  (let ((file (ecb-source-get-filename (tree-node->data node))))
+    (ediff-revision file)))
+
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-next-action
+  "Checkin/out file."
+  (ecb-display-source (tree-node->data node) nil)
+  (call-interactively 'vc-next-action))
+
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-log
+  "Print revision history of file."
+  (ecb-display-source (tree-node->data node) nil)
+  (call-interactively 'vc-print-log))
+
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-annotate
+  "Annotate file"
+  (ecb-display-source (tree-node->data node) nil)
+  (call-interactively 'vc-annotate))
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-diff
+  "Diff file against last version in repository."
+  (ecb-display-source (tree-node->data node) nil)
+  (call-interactively 'vc-diff))
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-refresh-file
+  "Recompute the VC-state for this file."
+  (let ((file (ecb-source-get-filename (tree-node->data node))))
+    (ecb-vc-cache-remove file)
+    (ecb-vc-reset-vc-stealthy-checks)))
+
+(tree-buffer-defpopup-command ecb-file-popup-vc-refresh-dir
+  "Recompute the VC-state-values for the whole directory."
+  (let ((dir (ecb-fix-filename
+              (ecb-file-name-directory
+               (ecb-source-get-filename (tree-node->data node))))))
+    (ecb-vc-cache-remove-files-of-dir dir)
+    (ecb-vc-reset-vc-stealthy-checks)))
+
+(defvar ecb-sources-menu nil
+  "Built-in menu for the sources-buffer.")
+
+(setq ecb-sources-menu
+      '(("Grep"
+         (ecb-grep-directory "Grep Directory")
+         (ecb-grep-find-directory "Grep Directory recursive"))
+        ("Dired"
+         (ecb-dired-directory "Open Dir in Dired")
+         (ecb-dired-directory-other-window "Open Dir in Dired other window"))
+        ("Filter"
+         (ecb-popup-sources-filter-by-ext "Filter by extension")
+         (ecb-popup-sources-filter-by-regexp "Filter by a regexp")
+         (ecb-popup-sources-filter-none "No filter"))
+        ("---")        
+	(ecb-create-source "Create Sourcefile")
+        (ecb-delete-source "Delete Sourcefile")
+        ("---")
+        (ecb-maximize-ecb-window-menu-wrapper "Maximize window")))
+
+
+(defvar ecb-sources-menu-title-creator
+  (function (lambda (node)
+              (ecb-file-name-nondirectory (tree-node->data node))))
+  "The menu-title for the sources menu. See
+`ecb-directories-menu-title-creator'.")
+
+(defun ecb-sources-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the sources-buffer."
+  (setq ecb-layout-prevent-handle-ecb-window-selection t)
+  (let ((dyn-user-extension
+         (and (functionp ecb-sources-menu-user-extension-function)
+              (funcall ecb-sources-menu-user-extension-function
+                       tree-buffer-name node)))
+        (dyn-builtin-extension (ecb-dir/source/hist-menu-editwin-entries)))
+    (list (cons ecb-sources-nodetype-sourcefile
+                (funcall (or ecb-sources-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-sources-menu-user-extension
+                                 ecb-sources-menu
+                                 dyn-builtin-extension))))))
+
+;; history popups
+
+(tree-buffer-defpopup-command ecb-history-kill-buffer
+  "Kills the buffer for current entry."
+  (let* ((buf (ecb-source-get-buffer (tree-node->data node))))
+    (when buf
+      ;; current buffer is always the history-buffer - we have to set
+      ;; the buffer representing data (buf) as current buffer - otherwise
+      ;; ecb-kill-buffer-hook would not run correctly
+      (save-excursion
+        (set-buffer buf)
+        (kill-buffer buf)
+        (ecb-add-buffers-to-history-new)))))
+
+(defun ecb-history-filter-by-ext (ext-str)
+  "Filter history entries by extension. Returns t if the filter has been
+applied otherwise nil."
+  (if (= (length ext-str) 0)
+      (setq ecb-history-filter
+            (cons `(lambda (buffername filename)
+                     ;; for extention-filter we only use the filename-arg
+                     (save-match-data
+                       (string-match "^[^.]+$" filename)))
+                  "No ext."))
+    (setq ecb-history-filter
+          (cons `(lambda (buffername filename)
+                   ;; for extention-filter we only use the filename-arg
+                   (save-match-data
+                     (string-match ,(format "\\.%s\\'" ext-str)
+                                   filename)))
+                (format "*.%s" ext-str))))
+  (ecb-add-buffers-to-history-new))
+
+(tree-buffer-defpopup-command ecb-popup-history-filter-by-ext
+  "Filter history entries by extension."
+  (let ((ext-str (read-string "Insert the filter-extension without leading dot: "
+                              (and node
+                                   (ecb-file-name-extension
+                                    (ecb-source-get-filename (tree-node->data node)))))))
+    (ecb-history-filter-by-ext ext-str)))
+
+(defun ecb-history-filter-by-regexp (&optional regexp filter-display)
+  "Filter history entries by REGEXP. If the first optional argument REGEXP is
+nil then it asks for a regexp. If second argument FILTER-DISPLAY is not nil
+then it is displayed in the modeline of the history-buffer for current
+regexp-filter. Otherwise the regexp itself. Returns t if the filter has been
+applied otherwise nil."
+  (let ((regexp-str (or regexp (read-string "Insert the filter-regexp: "))))
+    (if (> (length regexp-str) 0)
+        (setq ecb-history-filter
+              (cons `(lambda (buffername filename)
+                       ;; for regexp-filter we only use the buffername-arg
+                       (save-match-data
+                         (string-match ,regexp-str buffername)))
+                    (or filter-display regexp-str)))))
+  (ecb-add-buffers-to-history-new))
+
+(tree-buffer-defpopup-command ecb-popup-history-filter-by-regexp
+  "Filter history entries by regexp by popup."
+  (ecb-history-filter-by-regexp))
+  
+(tree-buffer-defpopup-command ecb-popup-history-filter-all-existing
+  "No history filter, i.e. add all existing file-buffers to the history."
+  (ecb-add-all-buffers-to-history))
+  
+(tree-buffer-defpopup-command ecb-file-popup-vc-refresh-all-files
+  "Recompute the VC-state for the whole history."
+  (when (equal (buffer-name) ecb-history-buffer-name)
+    (let ((files (mapcar (function (lambda (node)
+                                     (ecb-source-get-filename (tree-node->data node))))
+                         (tree-node->children (tree-buffer-get-root)))))
+      (dolist (file files)
+        (ecb-vc-cache-remove file))
+      (ecb-vc-reset-vc-stealthy-checks))))
+
+(tree-buffer-defpopup-command ecb-popup-history-bucketize-by-dir
+  "Bucketize the history by directory.
+
+It changes temporaly the option `ecb-history-make-buckets' to the value
+'directory."
+  (customize-set-variable 'ecb-history-make-buckets 'directory))
+
+(tree-buffer-defpopup-command ecb-popup-history-bucketize-by-mode
+  "Bucketize the history by major-mode.
+
+It changes temporaly the option `ecb-history-make-buckets' to the value
+'mode."
+  (customize-set-variable 'ecb-history-make-buckets 'mode))
+
+(tree-buffer-defpopup-command ecb-popup-history-bucketize-by-ext
+  "Bucketize the history by file-extension.
+
+It changes temporaly the option `ecb-history-make-buckets' to the value
+'extension."
+  (customize-set-variable 'ecb-history-make-buckets 'extension))
+
+(tree-buffer-defpopup-command ecb-popup-history-bucketize-by-reg
+  "Bucketize the history by regular expressions.
+
+It opens the customize-buffer for the option `ecb-history-make-buckets' so the
+regular expressions can be inserted."
+  (customize-option 'ecb-history-make-buckets))
+
+(tree-buffer-defpopup-command ecb-popup-history-bucketize-never
+  "Remove all bucketizing in the history - display it \"flat\".
+
+It changes temporaly the option `ecb-history-make-buckets' to the value
+'never."
+  (customize-set-variable 'ecb-history-make-buckets 'never))
+
+(defun ecb-history-filter ()
+  "Apply a filter to the history-buffer to reduce the number of entries.
+So you get a better overlooking. There are three choices:
+- Filter by extension: Just insert the extension you want the History-buffer
+  being filtered. Insert the extension without leading dot!
+- Filter by regexp: Insert the filter as regular expression.
+- No filter: This means to display an entry for all currently living
+  file-buffers."
+  (interactive)
+  (let ((choice (ecb-query-string "Filter history by:"
+                                  '("extension" "regexp" "no filter"))))
+    (cond ((ecb-string= choice "extension")
+           (ecb-history-filter-by-ext
+            (read-string "Insert the filter-extension without leading dot: ")))
+          ((ecb-string= choice "regexp")
+           (ecb-history-filter-by-regexp))
+          (t (ecb-add-all-buffers-to-history)))))
+
+(defvar ecb-history-common-menu nil
+  "Common menu entries for history-nodes")
+(setq ecb-history-common-menu
+      '((ecb-popup-history-filter-all-existing "Exactly all living file-buffers")
+        ("---")
+        ("Bucketize"
+         (ecb-popup-history-bucketize-never "No bucketizing")
+         (ecb-popup-history-bucketize-by-dir "by directory")
+         (ecb-popup-history-bucketize-by-mode "by major-mode")
+         (ecb-popup-history-bucketize-by-ext "by file-extension")
+         (ecb-popup-history-bucketize-by-reg "by reg. expr."))
+        ("---")
+        (ecb-maximize-ecb-window-menu-wrapper "Maximize window")))        
+
+
+(defvar ecb-history-menu nil
+  "Built-in menu for the history-buffer.")
+(setq ecb-history-menu
+      (append
+       '(("Grep"
+          (ecb-grep-directory "Grep Directory")
+          (ecb-grep-find-directory "Grep Directory recursive"))
+         ;;("---")
+         ("Dired"
+          (ecb-dired-directory "Open Dir in Dired")
+          (ecb-dired-directory-other-window "Open Dir in Dired other window"))
+         ("Filter"
+          (ecb-popup-history-filter-by-ext "Filter by extension")
+          (ecb-popup-history-filter-by-regexp "Filter by regexp")
+          (ecb-popup-history-filter-all-existing "No filter"))
+         ("---")
+         (ecb-history-kill-buffer "Kill Buffer")
+         (ecb-delete-source "Delete Sourcefile"))
+       ecb-history-common-menu))
+
+(defvar ecb-history-menu-title-creator
+  (function (lambda (node)
+              (tree-node->name node)))
+  "The menu-title for the history menu. See
+`ecb-directories-menu-title-creator'.")
+
+(defun ecb-history-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the history-buffer."
+  (setq ecb-layout-prevent-handle-ecb-window-selection t)
+  (let ((dyn-user-extension
+         (and (functionp ecb-history-menu-user-extension-function)
+              (funcall ecb-history-menu-user-extension-function
+                       tree-buffer-name node)))
+        (dyn-builtin-extension (ecb-dir/source/hist-menu-editwin-entries)))
+    (list (cons ecb-history-nodetype-filebuffer
+                (funcall (or ecb-history-menu-sorter 'identity)
+                         (append dyn-user-extension
+                                 ecb-history-menu-user-extension
+                                 ecb-history-menu
+                                 dyn-builtin-extension)))
+          (cons ecb-history-nodetype-bucket
+                (funcall (or ecb-history-menu-sorter 'identity)
+                         (append dyn-user-extension
+                                 ecb-history-common-menu)))
+          (cons ecb-history-nodetype-indirect-filebuffer
+                (funcall (or ecb-history-menu-sorter 'identity)
+                         (append dyn-user-extension
+                                 ecb-history-menu-user-extension
+                                 ecb-history-menu
+                                 dyn-builtin-extension))))))
+
+;; create the tree-buffers
+
+(defecb-tree-buffer-creator ecb-create-directories-tree-buffer
+    ecb-directories-buffer-name
+  "Create the tree-buffer for directories"
+  (tree-buffer-create
+   ecb-directories-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-directory-node
+   :mouse-highlight-fn t ;; highlight each node when moving mouse over it
+   :node-data-equal-fn 'equal
+   :maybe-empty-node-types (list ecb-directories-nodetype-directory)
+   ;; Now no longer tree-buffer decides if a node is displayed as leave but
+   ;; now the file-browser does it in the function `ecb-tree-node-add-files' -
+   ;; Reason: We have now to deal with the VC-support
+   :leaf-node-types nil ;;(list ecb-directories-nodetype-sourcefile)
+   :menu-creator 'ecb-directories-menu-creator
+   :menu-titles (list (cons ecb-directories-nodetype-directory
+                            ecb-directories-menu-title-creator)
+                      (cons ecb-directories-nodetype-sourcefile
+                            ecb-directories-menu-title-creator)
+                      (cons ecb-directories-nodetype-sourcepath
+                            ecb-directories-menu-title-creator))
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :sticky-parent-p ecb-tree-make-parent-node-sticky
+   :sticky-indent-string ecb-tree-stickynode-indent-string
+   :sticky-parent-fn nil
+   :trunc-lines (ecb-member-of-symbol/value-list ecb-directories-buffer-name
+                                                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p ecb-tree-incremental-search
+   :incr-search-additional-pattern ecb-vc-incr-searchpattern-node-prefix
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list ecb-directories-buffer-name
+                                                           (cdr ecb-tree-image-icons-directories)
+                                                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer (list (cons ecb-directories-nodetype-sourcefile
+                           ecb-source-in-directories-buffer-face))
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-directory-face
+   :general-face ecb-directories-general-face
+   ;; we add an after-create-hook to the tree-buffer
+   :after-create-hook (append
+                       (list (function (lambda ()
+                                         (local-set-key [f2] 'ecb-customize)
+                                         (local-set-key [f3] 'ecb-show-help)
+                                         (local-set-key [f4] 'ecb-add-source-path)
+                                         (ecb-common-after-tree-buffer-create-actions))))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-directories-buffer-after-create-hook)
+   :after-update-hook 'ecb-stealth-tasks-after-directories-update
+   ))
+
+(defecb-tree-buffer-creator ecb-create-sources-tree-buffer ecb-sources-buffer-name
+  "Create the tree-buffer for sources"
+  (tree-buffer-create
+   ecb-sources-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-source-node
+   :mouse-highlight-fn t ;; highlight each node when moving mouse over it
+   :node-data-equal-fn 'equal
+   :maybe-empty-node-types nil
+   ;; If we want to display the VC-state in the sources-icon then we should
+   ;; set this argument to nil because then we must compute the needed icon in
+   ;; the file-browser and not in the tree-buffer-library (analogue to the
+   ;; methods-icons computet in the methods-browser).
+   :leaf-node-types nil ;; (list ecb-sources-nodetype-sourcefile)
+   :menu-creator 'ecb-sources-menu-creator
+   :menu-titles (list (cons ecb-sources-nodetype-sourcefile
+                            ecb-sources-menu-title-creator))
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :sticky-parent-p nil
+   :sticky-parent-fn nil
+   :trunc-lines (ecb-member-of-symbol/value-list ecb-sources-buffer-name
+                                                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p ecb-tree-incremental-search
+   :incr-search-additional-pattern ecb-vc-incr-searchpattern-node-prefix
+   ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: make an option for this
+   :reduce-tree-for-incr-search-fn
+   (lambda (search full-search-regexp)
+     (if (ecb-apply-filter-to-sources-buffer (and search
+                                                  (> (length search) 0)
+                                                  full-search-regexp)
+                                             search)
+         search
+       ""))
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list ecb-sources-buffer-name
+                                                           (cdr ecb-tree-image-icons-directories)
+                                                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer nil
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-source-face
+   :general-face ecb-sources-general-face
+   :after-create-hook (append
+                       (list (function (lambda ()
+                                         (ecb-common-after-tree-buffer-create-actions))))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-sources-buffer-after-create-hook)
+   :after-update-hook 'ecb-stealth-tasks-after-sources-update))
+
+(defecb-tree-buffer-creator ecb-create-history-tree-buffer ecb-history-buffer-name
+  "Create the tree-buffer for history"
+  (tree-buffer-create
+   ecb-history-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-history-node
+   :mouse-highlight-fn t ;; highlight each node when moving mouse over it
+   :node-data-equal-fn 'equal
+   :maybe-empty-node-types nil
+   :leaf-node-types nil
+   :menu-creator 'ecb-history-menu-creator
+   :menu-titles (list (cons ecb-history-nodetype-filebuffer
+                            ecb-history-menu-title-creator)
+                      (cons ecb-history-nodetype-indirect-filebuffer
+                            ecb-history-menu-title-creator)
+                      (cons ecb-history-nodetype-bucket
+                            ecb-history-menu-title-creator))
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :sticky-parent-p ecb-tree-make-parent-node-sticky
+   :sticky-indent-string ecb-tree-stickynode-indent-string
+   :sticky-parent-fn nil
+   :trunc-lines (ecb-member-of-symbol/value-list ecb-history-buffer-name
+                                                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p ecb-tree-incremental-search
+   :incr-search-additional-pattern ecb-vc-incr-searchpattern-node-prefix
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list ecb-history-buffer-name
+                                                           (cdr ecb-tree-image-icons-directories)
+                                                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer nil
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-history-face
+   :general-face ecb-history-general-face
+   :after-create-hook (append
+                       (list (function (lambda ()
+                                         (ecb-common-after-tree-buffer-create-actions))))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-history-buffer-after-create-hook)
+   :after-update-hook 'ecb-stealth-tasks-after-history-update))
+
+(silentcomp-provide 'ecb-file-browser)
+
+;;; ecb-file-browser.el ends here
diff --git a/site/ecb-2.40/ecb-help.el b/site/ecb-2.40/ecb-help.el
new file mode 100644
index 0000000..674e422
--- /dev/null
+++ b/site/ecb-2.40/ecb-help.el
@@ -0,0 +1,458 @@
+;;; ecb-help.el --- online help for ECB and bug reporting
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-help.el,v 1.117 2009/05/09 15:23:50 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains all online-help for ECB (stolen something from recentf.el)
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-layout)
+(require 'ecb-util)
+
+;; XEmacs and Emacs 20.X
+(silentcomp-defvar browse-url-new-window-p)
+(silentcomp-defun browse-url)
+;; Emacs 21
+(silentcomp-defvar browse-url-new-window-flag)
+;; JDE
+(silentcomp-defvar jde-version)
+;; mail and reporter
+(silentcomp-defun mail-subject)
+(silentcomp-defun mail-text)
+(silentcomp-defun reporter-submit-bug-report)
+
+(defconst ecb-help-info-start-file "ecb.info")
+(defconst ecb-help-html-start-file "ecb.html")
+(defconst ecb-help-info-subdir "./info-help/")
+(defconst ecb-help-html-subdir "./html-help/")
+
+(defgroup ecb-help nil
+  "Settings for the ECB online help"
+  :group 'ecb)
+
+(defcustom ecb-show-help-format 'info
+  "*The format `ecb-show-help' shows its online help.
+Allowed values are 'info \(for the Info format) and 'html \(for HTML format).
+If the value is 'html then `browse-url-browser-function' says which browser is
+used.
+
+Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included."
+  :group 'ecb-help
+  :group 'ecb-most-important
+  :type '(choice :tag "Online-help format" :menu-tag "Online-help format"
+                 (const :tag "Info" :value info)
+                 (const :tag "Html" :value html)))
+
+
+(defcustom ecb-help-info-path (concat
+                               (if ecb-running-xemacs
+                                   (if (file-exists-p
+                                        (concat ecb-ecb-dir
+                                                ecb-help-info-subdir
+                                                ecb-help-info-start-file))
+                                       ecb-help-info-subdir
+                                     "../../info/")
+                                 ecb-help-info-subdir)
+                               ecb-help-info-start-file)
+  "*Path where the ECB online help in info format resides.
+This must be the location of the file \"ecb.info\" which comes with the ECB
+distribution. If is installed by unpacking the archive available on the ECB
+web-site then this is the subdir `ecb-help-info-subdir' of the installation
+directory of ECB. If it is installed as XEmacs-package \(e.g. via the package
+manager of XEmacs) then this is probably the directory \"../../info/\"
+\(relativ to the Elisp directory of ECB).
+
+The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+Normally there should be no need to change this option!"
+  :group 'ecb-help
+  :type 'file)
+
+(defcustom ecb-help-html-path
+  (if (not ecb-running-xemacs)
+      (concat ecb-help-html-subdir ecb-help-html-start-file)
+    (cond ((file-exists-p
+            (concat ecb-ecb-dir
+                    ecb-help-html-subdir
+                    ecb-help-html-start-file))
+           (concat ecb-help-html-subdir ecb-help-html-start-file))
+          ((file-exists-p
+            (concat ecb-ecb-dir
+                    "../../html/"
+                    ecb-help-html-start-file))
+           (concat "../../html/" ecb-help-html-start-file))
+          ((file-exists-p
+            (concat ecb-ecb-dir
+                    "../../html/ecb/index.html"))
+           "../../html/ecb/index.html")
+          (t
+           (concat "../../etc/ecb/html/" ecb-help-html-start-file))))
+  "*Path where the ECB online help in HTML format resides.
+This must be the location of the file \"index.html\" which comes with the ECB
+distribution. If is installed by unpacking the archive available on the ECB
+web-site then this is the subdir `ecb-help-html-subdir' of the installation
+directory of ECB. If it is installed as XEmacs-package \(e.g. via the package
+manager of XEmacs) then this is probably either the directory \"../../html/\" or
+\"../../etc/ecb/html/\" \(both relative to the Elisp directory of ECB).
+
+The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+Normally there should be no need to change this option!"
+  :group 'ecb-help
+  :type 'file)
+
+
+(defun ecb-info (info-file &optional no-file-not-exist-err)
+  "Starts `info' with INFO-FILE. If INFO-FILE does not exists then nil is
+returned otherwise true. If NO-FILE-NOT-EXIST-ERR is not nil then just nil is
+returned if INFO-FILE does not exist otherwise an error is reported."
+  (if (file-exists-p info-file)
+      (prog1 t
+        (info info-file))
+    (unless no-file-not-exist-err
+      (ecb-error "Info file %s does not exists!" info-file))
+    nil))
+
+(defun ecb-browse-html-file (html-file &optional no-file-not-exist-err)
+  "Opens HTML-FILE in the standard-webbrowser with `browse-url'. If INFO-FILE
+does not exists then nil is returned otherwise true. If NO-FILE-NOT-EXIST-ERR
+is not nil then just nil is returned if HTML-FILE does not exist otherwise an
+error is reported."
+  (if (file-exists-p html-file)
+      (prog1 t
+        (if (and (locate-library "browse-url")
+                 (require 'browse-url)
+                 (fboundp 'browse-url))
+            (browse-url (concat "file://" html-file)
+                        (if (boundp 'browse-url-new-window-flag)
+                            browse-url-new-window-flag
+                          browse-url-new-window-p))
+          (ecb-error "Function 'browse-url needed for displaying HTML!")))
+    (unless no-file-not-exist-err
+      (ecb-error "HTML file %s does not exists!" html-file))
+    nil))
+
+;;;###autoload
+(defun ecb-show-help (&optional format)
+  "Shows the online help of ECB in Info or HTML-format.
+The format depends on the setting in `ecb-show-help-format'. If called with
+prefix argument, i.e. if FORMAT is not nil then the user is prompted to choose
+the format of the help \(Info or Html).
+
+If an error about not finding the needed help-file occurs please take a look
+at the options `ecb-help-info-start-file' and `ecb-help-html-start-file'!
+
+Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included."
+  (interactive "P")
+  (let ((f (if format
+               (intern (ecb-query-string "Choose format of online-help:"
+                                         (if (equal 'ecb-show-help-format
+                                                    'html)
+                                             '("info" "html")
+                                           '("html" "info"))))
+             ecb-show-help-format))
+        (info-path-abs (expand-file-name
+                        (save-match-data
+                          (if (or (string-match "^\\." ecb-help-info-path)
+                                  (string-match (concat "^"
+                                                        (regexp-quote
+                                                         ecb-help-info-start-file))
+                                                ecb-help-info-path))
+                              (concat ecb-ecb-dir ecb-help-info-path)
+                            ecb-help-info-path))))
+        (html-path-abs (expand-file-name
+                        (save-match-data
+                          (if (or (string-match "^\\." ecb-help-html-path)
+                                  (string-match (concat "^"
+                                                        (regexp-quote
+                                                         ecb-help-html-start-file))
+                                                ecb-help-html-path))
+                              (concat ecb-ecb-dir ecb-help-html-path)
+                            ecb-help-html-path)))))
+    (if (equal f 'info)
+        (ecb-info info-path-abs)
+      (message "Opening ECB online-help in a web-browser...")
+      (ecb-browse-html-file html-path-abs))))
+
+
+;;
+;; Problem reporting functions stolen from JDEE
+;;
+(defvar ecb-problem-report-mail-address "ecb-list@lists.sourceforge.net" )
+
+(defconst ecb-problem-report-message
+  "Please enter the details of your bug report here")
+
+(defun ecb-submit-problem-report()
+  "Submit a problem report for the ECB to the ECB mailing-list.
+This command generates in the edit-window a problem-report which contains
+already the current values of all ECB options, the current backtrace-buffer if
+there is any and the current message-buffer. You will be asked for a
+problem-report subject and then you must insert a description of the problem.
+Please describe the problem as detailed as possible!
+
+*IMPORTANT*: Cause of extra appearance of SPAM in the mailing-lists,
+SourceForge has changed its policy: Now it is only possible to post to the
+mailing-list for users who have subscribed this mailing-list. So please be
+aware you will not be able to send comments, bug reports and improvement
+suggestions before you have subscribed the ECB-mailing-list. See the section
+\"Mailing-list\" at the ECB-website at http://ecb.sourceforge.net how to do
+this."
+
+  (interactive)
+  (when (or ecb-minor-mode
+            (y-or-n-p "ECB should be active when submitting a problem-report. Force report? "))
+    (if (and (equal ecb-frame (selected-frame))
+             (not (ecb-point-in-edit-window-number)))
+        (ecb-select-edit-window))
+    (if (not (locate-library "reporter"))
+        (ecb-error "You need the reporter.el package to submit a bugreport for ECB!")
+      (require 'reporter)
+      (progn
+        (message "Preparing problem report...")
+        ;;prepare the basic buffer
+        (reporter-submit-bug-report
+         ecb-problem-report-mail-address
+         (format "ECB: %s, CEDET: %s, semantic: %s, eieio: %s, speedbar: %s, JDEE: %s"
+                 ecb-version
+                 cedet-version
+                 semantic-version
+                 eieio-version
+                 speedbar-version
+                 (if (boundp 'jde-version)
+                     jde-version
+                   "No JDEE"))
+         (ecb-problem-report-list-all-variables)
+         nil
+         'ecb-problem-report-post-hook
+         ecb-problem-report-message)
+        (if (equal ecb-frame (selected-frame))
+            (ecb-redraw-layout))
+        (mail-subject)
+        (insert (read-string "Problem report subject: "
+                             (format "ECB-%s -- " ecb-version)))
+        (mail-text)
+        (search-forward ecb-problem-report-message)
+        (end-of-line)
+        (message "Preparing bug report...done")))))
+
+(defun ecb-problem-report-post-hook()
+  "Function run the reporter package done its work. It looks for a message- and
+a backtrace-buffer and inserts the contents of that."
+  (save-excursion
+    (goto-char (point-min))
+    ;; if the mail-packages has already inserted a signature we must not go to
+    ;; the buffer-end but just before the signature
+    (if (re-search-forward "^--[ \t]*$" nil t)
+        (progn
+          (beginning-of-line)
+          (insert "\n\n\n")
+          (forward-line -2))
+      (goto-char (point-max))
+      (insert "\n\n"))
+    ;; ecb-faces
+    (let ((ecb-face-list (delq nil (mapcar (function
+                                            (lambda (f)
+                                              (if (save-match-data
+                                                    (string-match "^ecb-"
+                                                                  (symbol-name f)))
+                                                  f
+                                                nil)))
+                                           (face-list)))))
+      (insert "\n\n-----------------------------------------------------\n")
+      (insert "The attributes of the ECB-faces are:\n\n")
+      (dolist (f ecb-face-list)
+        (when f
+          (insert (format "%s: %s\n"
+                          (symbol-name f)
+                          (funcall (if ecb-running-xemacs
+                                       'face-custom-attributes-get
+                                     'custom-face-attributes-get)
+                                   f ecb-frame)))))
+      (insert "\n-----------------------------------------------------\n\n"))
+    (let* ((messages-buffer 
+	    (get-buffer
+	     (if ecb-running-xemacs " *Message-Log*" "*Messages*")))
+	   (backtrace-buffer (get-buffer "*Backtrace*"))
+           (tag-dump-buffer (get-buffer "*ecb-tag-dump*")))
+
+      ;;insert the contents of the tag-dump buffer if it is there. 
+      (insert "\n\n-----------------------------------------------------\n")
+      (if tag-dump-buffer
+          (progn
+            (insert "The contents of the *ecb-tag-dump* buffer were\n\n")
+	    (insert-buffer-substring tag-dump-buffer)
+            ;; we must force the mark
+	    ;;(goto-char (mark t))
+            (insert "\nEnd Insert *ecb-tag-dump* buffer" ))
+        (insert "There was no *ecb-tag-dump* buffer" ))
+      (insert "\n-----------------------------------------------------\n\n")
+
+      ;;insert the contents of the trace-output buffer if it is there. 
+;;       (insert "\n\n-----------------------------------------------------\n")
+;;       (if tag-dump-buffer
+;;           (progn
+;;             (insert "The contents of the *ecb-tag-dump* buffer were\n\n")
+;; 	    (insert-buffer-substring tag-dump-buffer)
+;;             ;; we must force the mark
+;; 	    (goto-char (mark t))
+;;             (insert "\nEnd Insert *ecb-tag-dump* buffer" ))
+;;         (insert "There was no *ecb-tag-dump* buffer" ))
+;;       (insert "\n-----------------------------------------------------\n\n")
+
+      ;;insert the contents of the backtrace buffer if it is there. 
+      (insert "\n\n-----------------------------------------------------\n")
+      (if backtrace-buffer
+          (progn
+            (insert "The contents of the *Backtrace* buffer were\n\n")
+	    (insert-buffer-substring backtrace-buffer)
+            ;; we must force the mark
+	    ;;(goto-char (mark t))
+            (insert "\nEnd Insert *Backtrace* buffer" ))
+        (insert "There was no *Backtrace* buffer" ))
+      (insert "\n-----------------------------------------------------\n\n")
+
+      ;;insert the contents of the messages buffer if it is there. 
+      (insert "-----------------------------------------------------\n")
+      (if messages-buffer
+          (progn
+            (insert "The contents of the *Messages* buffer were\n\n")
+	    (insert-buffer-substring messages-buffer)
+	    ;;(goto-char (mark t))
+            (insert "\nEnd Insert *Messages* buffer" ))
+        (insert "There was no *Messages* buffer" ))
+      (insert  "\n-----------------------------------------------------\n\n"))))
+
+
+(defun ecb-problem-report-list-all-variables()
+  "List all variables starting with `ecb-' and some other variables which
+could be interesting for support."
+  (let ((emacs-vars (sort (delete nil
+                                  `(pre-command-hook
+                                    post-command-hook
+                                    after-save-hook
+                                    help-mode-hook
+                                    compilation-mode-hook
+                                    truncate-partial-width-windows
+                                    truncate-lines
+                                    ,(if (boundp 'compilation-window-height)
+                                         'compilation-window-height)
+                                    ,(if (boundp 'temp-buffer-max-height)
+                                         'temp-buffer-max-height)
+                                    auto-mode-alist
+                                    ,(if (boundp 'c-mode-hook)
+                                         'c-mode-hook)
+                                    ,(if (boundp 'c++-mode-hook)
+                                         'c++-mode-hook)
+                                    ,(if (boundp 'c-mode-common-hook)
+                                         'c-mode-common-hook)
+                                    ,(if (boundp 'java-mode-hook)
+                                         'java-mode-hook)
+                                    ,(if (boundp 'jde-mode-hook)
+                                         'jde-mode-hook)
+                                    system-type
+                                    window-system
+                                    max-specpdl-size
+                                    max-lisp-eval-depth
+                                    ,(if (boundp 'ediff-quit-hook)
+                                         'ediff-quit-hook)))
+                          (function (lambda (l r)
+                                      (ecb-string< (symbol-name l)
+                                                   (symbol-name r))))))
+        (semantic-vars (sort (delete nil
+                                     `(semantic-after-toplevel-cache-change-hook
+                                       semantic-after-partial-cache-change-hook
+                                       semantic-format-face-alist
+                                       semantic-uml-colon-string
+                                       semantic-orphaned-member-metaparent-type))
+                             (function (lambda (l r)
+                                         (ecb-string< (symbol-name l)
+                                                      (symbol-name r))))))
+        (speedbar-vars (sort '(speedbar-dynamic-tags-function-list
+                               speedbar-tag-hierarchy-method
+                               speedbar-tag-group-name-minimum-length
+                               speedbar-tag-split-minimum-length
+                               speedbar-tag-regroup-maximum-length
+                               speedbar-fetch-etags-command
+                               speedbar-fetch-etags-arguments
+                               speedbar-fetch-etags-parse-list)
+                             (function (lambda (l r)
+                                         (ecb-string< (symbol-name l)
+                                                      (symbol-name r))))))
+        (ecb-options (mapcar
+                      'intern
+                      (sort
+                       (let (completion-ignore-case)
+                         (all-completions "ecb-" obarray 'user-variable-p))
+                       'ecb-string<)))
+        (ecb-internal-vars (sort '(ecb-path-selected-directory
+                                   ecb-path-selected-source
+                                   ecb-use-semantic-grouping
+                                   ecb-autocontrol/sync-fcn-register
+                                   ecb-idle-timer-alist
+                                   ecb-post-command-hooks
+                                   ecb-pre-command-hooks
+                                   ecb-max-specpdl-size-old
+                                   ecb-max-lisp-eval-depth-old
+                                   ecb-minor-mode
+                                   ecb-adviced-function-sets
+                                   ecb-adviced-functions
+                                   ecb-last-window-config-before-deactivation
+                                   ecb-edit-area-creators
+                                   ecb-stealthy-function-list
+                                   ecb-stealthy-function-state-alist
+                                   ecb-windows-hidden
+                                   ecb-toggle-layout-state
+                                   ecb-tree-buffer-creators
+                                   ecb-tree-buffers
+                                   ecb-buffer-setfunction-registration
+                                   ecb-current-maximized-ecb-buffer-name
+                                   ecb-special-ecb-buffers-of-current-layout)
+                                 (function (lambda (l r)
+                                             (ecb-string< (symbol-name l)
+                                                          (symbol-name r)))))))
+    (append emacs-vars semantic-vars speedbar-vars
+            ecb-internal-vars ecb-options)))
+
+
+(silentcomp-provide 'ecb-help)
+
+;; ecb-help.el ends here
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-close.xpm
new file mode 100755
index 0000000..3121562
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-close.xpm
@@ -0,0 +1,48 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 10 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-empty.xpm
new file mode 100755
index 0000000..ccc8695
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-empty.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * empty_xpm[] = {
+"16 10 28 1",
+" 	c None",
+".	c #848400",
+"+	c #858504",
+"@	c #91911F",
+"#	c #8C8C13",
+"$	c #91911E",
+"%	c #9B9B33",
+"&	c #9C9C36",
+"*	c #8F8F16",
+"=	c #868604",
+"-	c #929220",
+";	c #9C9C34",
+">	c #9E9E3B",
+",	c #A4A445",
+"'	c #A6A64B",
+")	c #949423",
+"!	c #959527",
+"~	c #9E9E3A",
+"{	c #A4A444",
+"]	c #ACAC53",
+"^	c #959525",
+"/	c #9B9B31",
+"(	c #A6A64C",
+"_	c #AAAA4F",
+":	c #92921E",
+"<	c #878706",
+"[	c #A0A03C",
+"}	c #939320",
+"                ",
+"   ..           ",
+"  +@#.          ",
+" .$%&*.         ",
+"=-;>,').        ",
+"=!~{']^.        ",
+" ./(_:.         ",
+"  <[}.          ",
+"   ..           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-end-guide.xpm
new file mode 100755
index 0000000..f5b1199
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-end-guide.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static char * end_guide_xpm[] = {
+"6 10 2 1",
+" 	c None",
+".	c #ADA5C6",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      "};
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-guide.xpm
new file mode 100755
index 0000000..c9db0e7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-guide.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static char * guide_xpm[] = {
+"6 10 2 1",
+" 	c None",
+".	c #ADA5C6",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  ",
+"   .  "};
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-handle.xpm
new file mode 100755
index 0000000..d74113c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-handle.xpm
@@ -0,0 +1,16 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 10 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-leaf.xpm
new file mode 100755
index 0000000..cef6024
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-leaf.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * leaf_xpm[] = {
+"16 10 21 1",
+" 	c None",
+".	c #484848",
+"+	c #000000",
+"@	c #585858",
+"#	c #777777",
+"$	c #7C7C7C",
+"%	c #818181",
+"&	c #858585",
+"*	c #3E3E3E",
+"=	c #595959",
+"-	c #8A8A8A",
+";	c #8E8E8E",
+">	c #474747",
+",	c #868686",
+"'	c #939393",
+")	c #979797",
+"!	c #9F9F9F",
+"~	c #5E5E5E",
+"{	c #A0A0A0",
+"]	c #616161",
+"^	c #4B4B4B",
+"                ",
+"   .+++         ",
+"  @#$%&*        ",
+" =#$%&-;*       ",
+">#$%,-;')+      ",
+">$%,-;')!+      ",
+" ~&-;'){*       ",
+"  ];'){*        ",
+"   ^+++         ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-no-guide.xpm
new file mode 100755
index 0000000..61b3e93
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-no-guide.xpm
@@ -0,0 +1,14 @@
+/* XPM */
+static char * no_guide_xpm[] = {
+"6 10 1 1",
+" 	c None",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      "};
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-no-handle.xpm
new file mode 100755
index 0000000..237015c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-no-handle.xpm
@@ -0,0 +1,15 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 10 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-10/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-10/ecb-open.xpm
new file mode 100755
index 0000000..8388517
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-10/ecb-open.xpm
@@ -0,0 +1,50 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 10 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-close.xpm
new file mode 100755
index 0000000..e535183
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-close.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char * ecb_close_xpm[] = {
+"12 14 34 1",
+" 	c None",
+".	c #7898B5",
+"+	c #FFFFFF",
+"@	c #FCFCFB",
+"#	c #FDFDFB",
+"$	c #040404",
+"%	c #FCFCFA",
+"&	c #F7F6F3",
+"*	c #F7F7F5",
+"=	c #F7F7F4",
+"-	c #F6F6F4",
+";	c #F1F0EB",
+">	c #E5E1DA",
+",	c #A5A5C6",
+"'	c #F5F5F1",
+")	c #DFDBD2",
+"!	c #F2F2EE",
+"~	c #F0F0EC",
+"{	c #EDEDE7",
+"]	c #EAE9E3",
+"^	c #E3E0D9",
+"/	c #DBD6CC",
+"(	c #E4E1D9",
+"_	c #DCD8CF",
+":	c #D8D3C9",
+"<	c #D6D1C6",
+"[	c #D2CCC0",
+"}	c #CFC8BB",
+"|	c #D2CCBF",
+"1	c #C6BEAE",
+"2	c #C2B8A8",
+"3	c #C1B8A7",
+"4	c #C0B7A6",
+"5	c #C3BAAA",
+"            ",
+"            ",
+"            ",
+"  .......   ",
+" .+++++++.  ",
+" .@##$@%&.  ",
+" .**=$-;>.  ",
+",.'$$$$$).  ",
+" .!~{$]^/.  ",
+" .(_:$<[}.  ",
+" .|123345.  ",
+"  .......   ",
+"            ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-empty.xpm
new file mode 100755
index 0000000..88ea9d9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-empty.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-end-guide.xpm
new file mode 100755
index 0000000..8d2759e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-end-guide.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    14      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-guide.xpm
new file mode 100755
index 0000000..8b31487
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-guide.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    14      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-handle.xpm
new file mode 100755
index 0000000..1c38784
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-handle.xpm
@@ -0,0 +1,19 @@
+/* XPM */
+static char * ecb_handle_xpm[] = {
+"6 14 2 1",
+" 	c None",
+".	c #ADA5C6",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"......",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      "};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-leaf.xpm
new file mode 100755
index 0000000..a5fdb26
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-leaf.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-no-guide.xpm
new file mode 100755
index 0000000..fe34f00
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-no-guide.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    14     256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-no-handle.xpm
new file mode 100755
index 0000000..f207331
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-no-handle.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * ecb_no_handle_xpm[] = {
+"6 14 1 1",
+" 	c None",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      ",
+"      "};
diff --git a/site/ecb-2.40/ecb-images/default/height-14/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-14/ecb-open.xpm
new file mode 100755
index 0000000..a34bf9b
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-14/ecb-open.xpm
@@ -0,0 +1,53 @@
+/* XPM */
+static char * ecb_open_xpm[] = {
+"12 14 36 1",
+" 	c None",
+".	c #7898B5",
+"+	c #FFFFFF",
+"@	c #FCFCFB",
+"#	c #FDFDFB",
+"$	c #FCFCFA",
+"%	c #F7F6F3",
+"&	c #F7F7F5",
+"*	c #F7F7F4",
+"=	c #F6F6F4",
+"-	c #F1F0EB",
+";	c #E5E1DA",
+">	c #A5A5C6",
+",	c #F5F5F1",
+"'	c #040404",
+")	c #DFDBD2",
+"!	c #F2F2EE",
+"~	c #F0F0EC",
+"{	c #EDEDE7",
+"]	c #ECEBE6",
+"^	c #EAE9E3",
+"/	c #E3E0D9",
+"(	c #DBD6CC",
+"_	c #E4E1D9",
+":	c #DCD8CF",
+"<	c #D8D3C9",
+"[	c #D7D2C7",
+"}	c #D6D1C6",
+"|	c #D2CCC0",
+"1	c #CFC8BB",
+"2	c #D2CCBF",
+"3	c #C6BEAE",
+"4	c #C2B8A8",
+"5	c #C1B8A7",
+"6	c #C0B7A6",
+"7	c #C3BAAA",
+"            ",
+"            ",
+"            ",
+"  .......   ",
+" .+++++++.  ",
+" .@###@$%.  ",
+" .&&**=-;.  ",
+">.,''''').  ",
+" .!~{]^/(.  ",
+" ._:<[}|1.  ",
+" .2345567.  ",
+"  .......   ",
+"     >      ",
+"     >      "};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-close.xpm
new file mode 100755
index 0000000..880ca4d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-close.xpm
@@ -0,0 +1,53 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 15 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-empty.xpm
new file mode 100755
index 0000000..e8086be
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-empty.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-end-guide.xpm
new file mode 100755
index 0000000..480e912
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-end-guide.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    15      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-guide.xpm
new file mode 100755
index 0000000..d2a029d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-guide.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    15      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-handle.xpm
new file mode 100755
index 0000000..b66c6bf
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-handle.xpm
@@ -0,0 +1,21 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 15 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-leaf.xpm
new file mode 100755
index 0000000..32ac453
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-leaf.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-no-guide.xpm
new file mode 100755
index 0000000..0832c0b
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-no-guide.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    15     256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-no-handle.xpm
new file mode 100755
index 0000000..d88265a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-no-handle.xpm
@@ -0,0 +1,20 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 15 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-15/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-15/ecb-open.xpm
new file mode 100755
index 0000000..4ed6d69
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-15/ecb-open.xpm
@@ -0,0 +1,55 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 15 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-close.xpm
new file mode 100755
index 0000000..eaf3bd5
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-close.xpm
@@ -0,0 +1,54 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 16 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-empty.xpm
new file mode 100755
index 0000000..66b5173
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-empty.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    16      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-end-guide.xpm
new file mode 100755
index 0000000..86ded17
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-end-guide.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    16      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-guide.xpm
new file mode 100755
index 0000000..9ee05db
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-guide.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    16      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-handle.xpm
new file mode 100755
index 0000000..6ef3f32
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-handle.xpm
@@ -0,0 +1,22 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 16 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-leaf.xpm
new file mode 100755
index 0000000..45e361d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-leaf.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    16      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-no-guide.xpm
new file mode 100755
index 0000000..d53a394
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-no-guide.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    16     256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-no-handle.xpm
new file mode 100755
index 0000000..1d2574b
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-no-handle.xpm
@@ -0,0 +1,21 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 16 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-16/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-16/ecb-open.xpm
new file mode 100755
index 0000000..da0d30c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-16/ecb-open.xpm
@@ -0,0 +1,56 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 16 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-close.xpm
new file mode 100755
index 0000000..5d3710e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-close.xpm
@@ -0,0 +1,55 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 17 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-empty.xpm
new file mode 100755
index 0000000..bd4c711
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-empty.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    17      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-end-guide.xpm
new file mode 100755
index 0000000..4eaef16
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-end-guide.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    17      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-guide.xpm
new file mode 100755
index 0000000..490b2a3
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-guide.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    17      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-handle.xpm
new file mode 100755
index 0000000..6927e96
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-handle.xpm
@@ -0,0 +1,23 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 17 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-leaf.xpm
new file mode 100755
index 0000000..86914df
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-leaf.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    17      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-no-guide.xpm
new file mode 100755
index 0000000..cdd2655
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-no-guide.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    17     256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-no-handle.xpm
new file mode 100755
index 0000000..caf078a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-no-handle.xpm
@@ -0,0 +1,22 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 17 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-17/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-17/ecb-open.xpm
new file mode 100755
index 0000000..7440ff3
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-17/ecb-open.xpm
@@ -0,0 +1,57 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 17 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-close.xpm
new file mode 100755
index 0000000..d51ced2
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-close.xpm
@@ -0,0 +1,56 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 18 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-empty.xpm
new file mode 100755
index 0000000..81c279a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-empty.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    18      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-end-guide.xpm
new file mode 100755
index 0000000..d805eed
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-end-guide.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    18      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-guide.xpm
new file mode 100755
index 0000000..cb95818
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-guide.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    18      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-handle.xpm
new file mode 100755
index 0000000..dbbd508
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-handle.xpm
@@ -0,0 +1,24 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 18 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-leaf.xpm
new file mode 100755
index 0000000..11da467
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-leaf.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    18      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-no-guide.xpm
new file mode 100755
index 0000000..65ac162
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-no-guide.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    18      256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-no-handle.xpm
new file mode 100755
index 0000000..3cb8ede
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-no-handle.xpm
@@ -0,0 +1,23 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 18 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-18/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-18/ecb-open.xpm
new file mode 100755
index 0000000..7cfcd98
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-18/ecb-open.xpm
@@ -0,0 +1,58 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 18 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-close.xpm
new file mode 100755
index 0000000..0bdb691
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-close.xpm
@@ -0,0 +1,57 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 19 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-empty.xpm
new file mode 100755
index 0000000..b5c14d9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-empty.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    19      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-end-guide.xpm
new file mode 100755
index 0000000..c2efee9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-end-guide.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    19      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-guide.xpm
new file mode 100755
index 0000000..b8fd211
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-guide.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    19      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-handle.xpm
new file mode 100755
index 0000000..83b915e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-handle.xpm
@@ -0,0 +1,25 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 19 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-leaf.xpm
new file mode 100755
index 0000000..2911f08
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-leaf.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    19      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-no-guide.xpm
new file mode 100755
index 0000000..43a7eae
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-no-guide.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    19      256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-no-handle.xpm
new file mode 100755
index 0000000..48a9732
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-no-handle.xpm
@@ -0,0 +1,24 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 19 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-19/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-19/ecb-open.xpm
new file mode 100755
index 0000000..92c2c7a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-19/ecb-open.xpm
@@ -0,0 +1,59 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 19 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-close.xpm
new file mode 100755
index 0000000..e178e2a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-close.xpm
@@ -0,0 +1,58 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 20 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-empty.xpm
new file mode 100755
index 0000000..1f26822
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-empty.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    20      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-end-guide.xpm
new file mode 100755
index 0000000..1ac47f8
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-end-guide.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    20      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-guide.xpm
new file mode 100755
index 0000000..b75ac48
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-guide.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    20      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-handle.xpm
new file mode 100755
index 0000000..5fb978a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-handle.xpm
@@ -0,0 +1,26 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 20 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-leaf.xpm
new file mode 100755
index 0000000..ab6bc04
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-leaf.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    20      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-no-guide.xpm
new file mode 100755
index 0000000..875ab96
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-no-guide.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    20      256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-no-handle.xpm
new file mode 100755
index 0000000..6210d03
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-no-handle.xpm
@@ -0,0 +1,25 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 20 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-20/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-20/ecb-open.xpm
new file mode 100755
index 0000000..232213a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-20/ecb-open.xpm
@@ -0,0 +1,60 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 20 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-close.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-close.xpm
new file mode 100755
index 0000000..488a444
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-close.xpm
@@ -0,0 +1,59 @@
+/* XPM */ 
+static char * ecbclose_xpm[] = {
+"16 21 35 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #040404",
+"(	c #FCFCFA",
+")	c #F7F6F3",
+"*	c #F7F7F5",
+"+	c #F7F7F4",
+",	c #F6F6F4",
+"-	c #F1F0EB",
+".	c #E5E1DA",
+"0	c #A5A5C6",
+"1	c #F5F5F1",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #EAE9E3",
+"7	c #E3E0D9",
+"8	c #DBD6CC",
+"9	c #E4E1D9",
+":	c #DCD8CF",
+";	c #D8D3C9",
+"<	c #D6D1C6",
+"=	c #D2CCC0",
+">	c #CFC8BB",
+"?	c #D2CCBF",
+"@	c #C6BEAE",
+"A	c #C2B8A8",
+"B	c #C1B8A7",
+"C	c #C0B7A6",
+"D	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&'%()$      ",
+" $**+',-.$      ",
+"0$1'''''2$      ",
+" $345'678$      ",
+" $9:;'<=>$      ",
+" $?@ABBCD$      ",
+" #$$$$$$$#      ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-empty.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-empty.xpm
new file mode 100755
index 0000000..6bb0a28
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-empty.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    21      256            2",
+/* colors */
+"`` c #848400",
+"`. c #949429",
+"`# c #9c9c31",
+"`a c #9c9c39",
+"`b c #a5a542",
+"`c c #a5a54a",
+"`d c #adad4a",
+"`e c #adad52",
+"`f c #adad5a",
+"`g c None",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`````.`````g`g`g`g`g`g`g`g",
+"`g`g`````.`#`a`````g`g`g`g`g`g`g",
+"`g`````.`#`a`a`b`````g`g`g`g`g`g",
+"`````.`#`a`a`b`c`c`````g`g`g`g`g",
+"```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
+"`````a`a`b`c`c`e`f`````g`g`g`g`g",
+"`g`````b`c`c`e`f`````g`g`g`g`g`g",
+"`g`g`````c`e`f`````g`g`g`g`g`g`g",
+"`g`g`g`````f`````g`g`g`g`g`g`g`g",
+"`g`g`g`g```````g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
+"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-end-guide.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-end-guide.xpm
new file mode 100755
index 0000000..8e5d727
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-end-guide.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *end-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    21      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c",
+"`c`c`c`c`c`c"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-guide.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-guide.xpm
new file mode 100755
index 0000000..56006ee
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-guide.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    21      256            2",
+/* colors */
+"`` c #000000",
+"`. c #a5a5c6",
+"`# c #ada5c6",
+"`a c #cecee7",
+"`b c #ceceff",
+"`c c None",
+"`d c #ffffff",
+"`e c #ffffff",
+"`f c #ffffff",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #808000",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#",
+"`c`c`c`c`c`#"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-handle.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-handle.xpm
new file mode 100755
index 0000000..13f1a3e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-handle.xpm
@@ -0,0 +1,27 @@
+/* XPM */ 
+static char * ecbhandle_xpm[] = {
+"8 21 3 1",
+" 	c None",
+"!	c black",
+"#	c #ADA5C6",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"########",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-leaf.xpm
new file mode 100755
index 0000000..8b5db38
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-leaf.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    21      256            2",
+/* colors */
+"`` c #424242",
+"`. c #737373",
+"`# c #7b7b7b",
+"`a c #848484",
+"`b c #8c8c8c",
+"`c c #949494",
+"`d c #9c9c9c",
+"`e c #a5a5a5",
+"`f c None",
+"`g c #ffffff",
+"`h c #ffffff",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
+"`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
+"```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
+"```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
+"```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
+"`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
+"`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
+"`f`f`f```````````f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
+"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-no-guide.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-no-guide.xpm
new file mode 100755
index 0000000..82729cf
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-no-guide.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *no-guide[] = {
+/* width height num_colors chars_per_pixel */
+"     6    21      256            2",
+/* colors */
+"`` c #000000",
+"`. c #84849c",
+"`# c #8c8ca5",
+"`a c #a5a5c6",
+"`b c #ada5c6",
+"`c c #b5b5ce",
+"`d c #cecee7",
+"`e c #ceceff",
+"`f c #e7e7ff",
+"`g c None",
+"`h c #808000",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g",
+"`g`g`g`g`g`g"
+};
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-no-handle.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-no-handle.xpm
new file mode 100755
index 0000000..d5ebd3f
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-no-handle.xpm
@@ -0,0 +1,26 @@
+/* XPM */ 
+static char * ecbnohandle_xpm[] = {
+"8 21 2 1",
+" 	c None",
+"!	c black",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        ",
+"        "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/default/height-21/ecb-open.xpm b/site/ecb-2.40/ecb-images/default/height-21/ecb-open.xpm
new file mode 100755
index 0000000..abe9080
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/default/height-21/ecb-open.xpm
@@ -0,0 +1,61 @@
+/* XPM */ 
+static char * ecbopen_xpm[] = {
+"16 21 37 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #7898B5",
+"%	c #FCFCFB",
+"&	c #FDFDFB",
+"'	c #FCFCFA",
+"(	c #F7F6F3",
+")	c #F7F7F5",
+"*	c #F7F7F4",
+"+	c #F6F6F4",
+",	c #F1F0EB",
+"-	c #E5E1DA",
+".	c #A5A5C6",
+"0	c #F5F5F1",
+"1	c #040404",
+"2	c #DFDBD2",
+"3	c #F2F2EE",
+"4	c #F0F0EC",
+"5	c #EDEDE7",
+"6	c #ECEBE6",
+"7	c #EAE9E3",
+"8	c #E3E0D9",
+"9	c #DBD6CC",
+":	c #E4E1D9",
+";	c #DCD8CF",
+"<	c #D8D3C9",
+"=	c #D7D2C7",
+">	c #D6D1C6",
+"?	c #D2CCC0",
+"@	c #CFC8BB",
+"A	c #D2CCBF",
+"B	c #C6BEAE",
+"C	c #C2B8A8",
+"D	c #C1B8A7",
+"E	c #C0B7A6",
+"F	c #C3BAAA",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" #$$$$$$$#      ",
+" $#######$      ",
+" $%&&&%'($      ",
+" $))**+,-$      ",
+".$0111112$      ",
+" $3456789$      ",
+" $:;<=>?@$      ",
+" $ABCDDEF$      ",
+" #$$$$$$$#      ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          ",
+"     .          "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-10/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-10/ecb-close.xpm
new file mode 100755
index 0000000..4fe0ee0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-10/ecb-close.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * close_xpm[] = {
+"16 10 49 1",
+" 	c None",
+".	c #98981E",
+"+	c #96961B",
+"@	c #929216",
+"#	c #FFFDBC",
+"$	c #B5B54B",
+"%	c #949418",
+"&	c #94941A",
+"*	c #97971D",
+"=	c #98981F",
+"-	c #999923",
+";	c #8E8E0F",
+">	c #878706",
+",	c #95951B",
+"'	c #98981D",
+")	c #9F9F26",
+"!	c #ADAD40",
+"~	c #B0B045",
+"{	c #B5B54A",
+"]	c #B6B651",
+"^	c #BCBC59",
+"/	c #919115",
+"(	c #8B8B0B",
+"_	c #A4A430",
+":	c #A9A935",
+"<	c #AFAF44",
+"[	c #B4B449",
+"}	c #B5B550",
+"|	c #BDBD5A",
+"1	c #8C8C0C",
+"2	c #AAAA36",
+"3	c #BEBE5B",
+"4	c #C3C361",
+"5	c #939317",
+"6	c #8D8D0E",
+"7	c #ADAD3F",
+"8	c #B6B650",
+"9	c #BBBB58",
+"0	c #C2C260",
+"a	c #C6C669",
+"b	c #939319",
+"c	c #8D8D0F",
+"d	c #C2C25F",
+"e	c #C9C96E",
+"f	c #868603",
+"g	c #8E8E11",
+"h	c #8F8F12",
+"i	c #919114",
+"j	c #878705",
+"                ",
+" ..+            ",
+"@##$%&*=-;      ",
+">,')!~{]^/      ",
+"(_:!<[}^|/      ",
+"12!<$]^345      ",
+"67<{89|0ab      ",
+"c<[89|dae&      ",
+"f6;ghhi/@j      ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/directories/height-10/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-10/ecb-empty.xpm
new file mode 100755
index 0000000..35697d5
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-10/ecb-empty.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * empty_xpm[] = {
+"16 10 25 1",
+" 	c None",
+".	c #454545",
+"+	c #A5A5A5",
+"@	c #A3A3A3",
+"#	c #999999",
+"$	c #7B7B7B",
+"%	c #666666",
+"&	c #656565",
+"*	c #636363",
+"=	c #616161",
+"-	c #5B5B5B",
+";	c #424242",
+">	c #7E7E7E",
+",	c #6F6F6F",
+"'	c #6D6D6D",
+")	c #737373",
+"!	c #747474",
+"~	c #797979",
+"{	c #848484",
+"]	c #727272",
+"^	c #585858",
+"/	c #646464",
+"(	c #838383",
+"_	c #858585",
+":	c #4F4F4F",
+"                ",
+" ...            ",
+".+@#....        ",
+".@$%&*=-.;      ",
+".>$.......      ",
+".,.')!~>{..     ",
+"..']!~>{.^      ",
+"./])~>(_.       ",
+"........:       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/directories/height-10/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-10/ecb-leaf.xpm
new file mode 100755
index 0000000..830e046
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-10/ecb-leaf.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * leaf_xpm[] = {
+"16 10 19 1",
+" 	c None",
+".	c #424242",
+"+	c #494949",
+"@	c #979797",
+"#	c #9D9D9D",
+"$	c #A4A4A4",
+"%	c #737373",
+"&	c #999999",
+"*	c #9B9B9B",
+"=	c #A2A2A2",
+"-	c #B3B3B3",
+";	c #939393",
+">	c #989898",
+",	c #BABABA",
+"'	c #9C9C9C",
+")	c #949494",
+"!	c #BDBDBD",
+"~	c #AFAFAF",
+"{	c #B5B5B5",
+"                ",
+"....+           ",
+".@#$.%          ",
+".@&#...         ",
+".#*==-.         ",
+".&&;>,.         ",
+".')>>!.         ",
+".~{,!!.         ",
+".......         ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/directories/height-10/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-10/ecb-open.xpm
new file mode 100755
index 0000000..e2f8bed
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-10/ecb-open.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * open_xpm[] = {
+"16 10 20 1",
+" 	c None",
+".	c #848400",
+"+	c #FFFDBC",
+"@	c #D6D67B",
+"#	c #CECE7B",
+"$	c #C6C66B",
+"%	c #BDBD5A",
+"&	c #CECE73",
+"*	c #B2B247",
+"=	c #B8B84D",
+"-	c #BDBD57",
+";	c #C0C05D",
+">	c #B9B950",
+",	c #C9C96A",
+"'	c #C1C15E",
+")	c #B7B74C",
+"!	c #BCBC56",
+"~	c #C6C664",
+"{	c #ADAD40",
+"]	c #A5A5C6",
+" ..             ",
+".++...          ",
+".@##$%.         ",
+".@&......       ",
+".&.*=-;>,.      ",
+".&.=-'',.       ",
+"..)!;~,,.       ",
+".{{!~,,.        ",
+".......         ",
+"   ]            "};
diff --git a/site/ecb-2.40/ecb-images/directories/height-14/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-14/ecb-close.xpm
new file mode 100755
index 0000000..0e748f5
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-14/ecb-close.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-14/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-14/ecb-empty.xpm
new file mode 100755
index 0000000..40b0fe9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-14/ecb-empty.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *empty[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #424242",
+"`. c #6b6b6b",
+"`# c #737373",
+"`a c #7b7b7b",
+"`b c #848484",
+"`c c #8c8c8c",
+"`d c #949494",
+"`e c #9c9c9c",
+"`f c #a5a5a5",
+"`g c #adadad",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`````````h`h`h`h`h`h`h`h`h`h`h",
+"```f`f`f`e```````````h`h`h`h`h`h",
+"```f`f`e`e`e`d`d`c`c```h`h`h`h`h",
+"```f`e`````````````````````h`h`h",
+"```e```.`.`.`#`#`#`a`a`b`b```h`h",
+"```e```.`.`#`#`#`a`a`b`b```h`h`h",
+"`````.`.`#`#`#`a`a`b`b`b```h`h`h",
+"`````.`#`#`#`a`a`b`b`b```h`h`h`h",
+"```.`#`#`#`a`a`b`b`b`c```h`h`h`h",
+"```````````````````````h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-14/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-14/ecb-leaf.xpm
new file mode 100755
index 0000000..197c10f
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-14/ecb-leaf.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-14/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-14/ecb-open.xpm
new file mode 100755
index 0000000..170cf44
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-14/ecb-open.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-15/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-15/ecb-close.xpm
new file mode 100755
index 0000000..dfdc74c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-15/ecb-close.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-15/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-15/ecb-empty.xpm
new file mode 100755
index 0000000..8305b1d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-15/ecb-empty.xpm
@@ -0,0 +1,32 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 15 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-15/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-15/ecb-leaf.xpm
new file mode 100755
index 0000000..7812a29
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-15/ecb-leaf.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-15/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-15/ecb-open.xpm
new file mode 100755
index 0000000..06b765a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-15/ecb-open.xpm
@@ -0,0 +1,278 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-16/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-16/ecb-close.xpm
new file mode 100755
index 0000000..8729815
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-16/ecb-close.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    16     256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-16/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-16/ecb-empty.xpm
new file mode 100755
index 0000000..ceaa805
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-16/ecb-empty.xpm
@@ -0,0 +1,33 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 16 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-16/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-16/ecb-leaf.xpm
new file mode 100755
index 0000000..3b7631a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-16/ecb-leaf.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    16      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-16/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-16/ecb-open.xpm
new file mode 100755
index 0000000..82bf842
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-16/ecb-open.xpm
@@ -0,0 +1,279 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    16      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-17/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-17/ecb-close.xpm
new file mode 100755
index 0000000..da7aa18
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-17/ecb-close.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    17      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-17/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-17/ecb-empty.xpm
new file mode 100755
index 0000000..47dcd67
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-17/ecb-empty.xpm
@@ -0,0 +1,34 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 17 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-17/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-17/ecb-leaf.xpm
new file mode 100755
index 0000000..015baff
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-17/ecb-leaf.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    17      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-17/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-17/ecb-open.xpm
new file mode 100755
index 0000000..fad97fd
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-17/ecb-open.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    17      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-18/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-18/ecb-close.xpm
new file mode 100755
index 0000000..fedb3a0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-18/ecb-close.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    18      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-18/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-18/ecb-empty.xpm
new file mode 100755
index 0000000..17b8c79
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-18/ecb-empty.xpm
@@ -0,0 +1,35 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 18 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-18/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-18/ecb-leaf.xpm
new file mode 100755
index 0000000..e2696fe
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-18/ecb-leaf.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    18      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-18/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-18/ecb-open.xpm
new file mode 100755
index 0000000..5ccaa37
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-18/ecb-open.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    18      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-19/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-19/ecb-close.xpm
new file mode 100755
index 0000000..25d95b4
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-19/ecb-close.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    19      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-19/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-19/ecb-empty.xpm
new file mode 100755
index 0000000..37dc1c7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-19/ecb-empty.xpm
@@ -0,0 +1,36 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 19 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-19/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-19/ecb-leaf.xpm
new file mode 100755
index 0000000..8004390
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-19/ecb-leaf.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    19      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-19/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-19/ecb-open.xpm
new file mode 100755
index 0000000..fc3564e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-19/ecb-open.xpm
@@ -0,0 +1,282 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    19      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-20/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-20/ecb-close.xpm
new file mode 100755
index 0000000..3e9f165
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-20/ecb-close.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    20      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-20/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-20/ecb-empty.xpm
new file mode 100755
index 0000000..8af71d4
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-20/ecb-empty.xpm
@@ -0,0 +1,37 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 20 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-20/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-20/ecb-leaf.xpm
new file mode 100755
index 0000000..6eadda7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-20/ecb-leaf.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    20      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-20/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-20/ecb-open.xpm
new file mode 100755
index 0000000..6e29214
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-20/ecb-open.xpm
@@ -0,0 +1,283 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    20      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-21/ecb-close.xpm b/site/ecb-2.40/ecb-images/directories/height-21/ecb-close.xpm
new file mode 100755
index 0000000..aa16485
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-21/ecb-close.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *close[] = {
+/* width height num_colors chars_per_pixel */
+"    16    21      256            2",
+/* colors */
+"`` c #848400",
+"`. c #9c9c29",
+"`# c #a5a531",
+"`a c #adad39",
+"`b c #adad42",
+"`c c #b5b54a",
+"`d c #b5b552",
+"`e c #bdbd52",
+"`f c #bdbd5a",
+"`g c #c6c663",
+"`h c #c6c66b",
+"`i c #cece6b",
+"`j c #cece73",
+"`k c #dede8c",
+"`l c #e7e794",
+"`m c #e7e79c",
+"`n c #efef9c",
+"`o c None",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`````````o`o`o`o`o`o`o`o`o`o`o",
+"```m`l`l`k```````````````o`o`o`o",
+"```````````a`b`b`c`c`d`f```o`o`o",
+"```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
+"```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
+"```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
+"```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
+"```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
+"```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
+"```````````````````````````o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
+"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-21/ecb-empty.xpm b/site/ecb-2.40/ecb-images/directories/height-21/ecb-empty.xpm
new file mode 100755
index 0000000..3cd16e5
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-21/ecb-empty.xpm
@@ -0,0 +1,38 @@
+/* XPM */ 
+static char * ecbempty_xpm[] = {
+"16 21 14 1",
+" 	c None",
+"!	c black",
+"#	c #AEA950",
+"$	c #FDF9B1",
+"%	c #FDF9AC",
+"&	c #FDF9A9",
+"'	c #FDF8A0",
+"(	c #FDF793",
+")	c #FDF790",
+"*	c #FCF67C",
+"+	c #FCF67F",
+",	c #FCF688",
+"-	c #FDF89D",
+".	c #FDF9A6",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+" ####           ",
+"#$%%&#####      ",
+"#%%&&''(()#     ",
+"#%&##########   ",
+"#&#*++,,)((--#  ",
+"#&#++,,)((--#   ",
+"##++,,)((--'#   ",
+"##+,,)((--'#    ",
+"#+,,)((--'.#    ",
+"###########     ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/directories/height-21/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/directories/height-21/ecb-leaf.xpm
new file mode 100755
index 0000000..fd8db92
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-21/ecb-leaf.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    21      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/directories/height-21/ecb-open.xpm b/site/ecb-2.40/ecb-images/directories/height-21/ecb-open.xpm
new file mode 100755
index 0000000..e5d3963
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/directories/height-21/ecb-open.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *open[] = {
+/* width height num_colors chars_per_pixel */
+"    16    21      256            2",
+/* colors */
+"`` c #848400",
+"`. c #a5a5c6",
+"`# c #adad39",
+"`a c #adad42",
+"`b c #b5b54a",
+"`c c #bdbd52",
+"`d c #bdbd5a",
+"`e c #c6c663",
+"`f c #c6c66b",
+"`g c #cece6b",
+"`h c #cece73",
+"`i c #cece7b",
+"`j c #d6d67b",
+"`k c None",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
+"`k`````````k`k`k`k`k`k`k`k`k`k`k",
+"```j`i`i`h```````````k`k`k`k`k`k",
+"```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
+"```i`h`````````````````````k`k`k",
+"```h```#`a`a`b`b`c`d`d`e`e```k`k",
+"```h```a`a`b`b`c`d`d`e`e```k`k`k",
+"`````a`a`b`b`c`d`d`e`e`f```k`k`k",
+"`````a`b`b`c`d`d`e`e`f```k`k`k`k",
+"```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
+"```````````````````````k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
+"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
+};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-private.xpm
new file mode 100755
index 0000000..669f81a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-private.xpm
@@ -0,0 +1,49 @@
+/* XPM */
+static char * ecb_class_private_xpm[] = {
+"16 14 32 1",
+" 	c None",
+".	c #696969",
+"+	c #F5F5F5",
+"@	c #434343",
+"#	c #FFFFFF",
+"$	c #C5C5C5",
+"%	c #F1F1F1",
+"&	c #CACACA",
+"*	c #E6E6E6",
+"=	c #C9C9C9",
+"-	c #D5D5D5",
+";	c #D8D8D8",
+">	c #8C8C8C",
+",	c #D1D1D1",
+"'	c #656565",
+")	c #868686",
+"!	c #898989",
+"~	c #C8C8C8",
+"{	c #B6B6B6",
+"]	c #ABABAB",
+"^	c #D7D7D7",
+"/	c #BDBDBD",
+"(	c #BBBBBB",
+"_	c #AFAFAF",
+":	c #D2D2D2",
+"<	c #A7A7A7",
+"[	c #B0B0B0",
+"}	c #AAAAAA",
+"|	c #676767",
+"1	c #CBCBCB",
+"2	c #B8B8B8",
+"3	c #B4B4B4",
+"           ...+ ",
+"   @#     .$#$.+",
+"  @%@+    .+ +.#",
+" @%&&@#   .....+",
+"@*=$-;@+  ..>..#",
+" @;,;@#   .>#>.+",
+"  @;@+ @@'..>..#",
+"@@)@)!@~{].....+",
+"@^/{(@~,]_/'+#+#",
+"@:<[}@{}{~=|#   ",
+"@123(@}_~=;'+   ",
+"@:3(3!@/=;'#    ",
+"@)!)!)+'|'+     ",
+" #+#+# #+#      "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-protected.xpm
new file mode 100755
index 0000000..72e59b0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-protected.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * ecb_class_protected_xpm[] = {
+"16 14 38 1",
+" 	c None",
+".	c #444444",
+"+	c #FFFFFF",
+"@	c #EDEDED",
+"#	c #F2F2F2",
+"$	c #E7E7E7",
+"%	c #747474",
+"&	c #F1F1F1",
+"*	c #F5F5F5",
+"=	c #D8D8D8",
+"-	c #D2D2D2",
+";	c #8C8C8C",
+">	c #CACACA",
+",	c #404040",
+"'	c #E0E0E0",
+")	c #898989",
+"!	c #E6E6E6",
+"~	c #C9C9C9",
+"{	c #C5C5C5",
+"]	c #D5D5D5",
+"^	c #787878",
+"/	c #D1D1D1",
+"(	c #656565",
+"_	c #868686",
+":	c #C8C8C8",
+"<	c #B6B6B6",
+"[	c #ABABAB",
+"}	c #D7D7D7",
+"|	c #BDBDBD",
+"1	c #BBBBBB",
+"2	c #AFAFAF",
+"3	c #A7A7A7",
+"4	c #B0B0B0",
+"5	c #AAAAAA",
+"6	c #CBCBCB",
+"7	c #B8B8B8",
+"8	c #B4B4B4",
+"9	c #676767",
+"         .....+ ",
+"   .+   .+@#@$%+",
+"  .&.*  .@=.=-;*",
+" .&>>.+ ,$-='=)+",
+".!~{]=.* ..-^)* ",
+" .=/=.+   .=)+  ",
+"  .=.* ..(.-;*  ",
+".._._).:<[.=';+ ",
+".}|<1.:/[2.';*  ",
+".-345.<5<:~^+   ",
+".6781.52:~=*    ",
+".-818).|~=(+    ",
+"._)_)_*(9(*     ",
+" +*+*+ +*+      "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-public.xpm
new file mode 100755
index 0000000..6b5a8a4
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-public.xpm
@@ -0,0 +1,49 @@
+/* XPM */
+static char * ecb_class_public_xpm[] = {
+"16 14 32 1",
+" 	c None",
+".	c #686868",
+"+	c #FFFFFF",
+"@	c #444444",
+"#	c #9F9F9F",
+"$	c #F5F5F5",
+"%	c #F1F1F1",
+"&	c #CACACA",
+"*	c #E6E6E6",
+"=	c #C9C9C9",
+"-	c #C5C5C5",
+";	c #D5D5D5",
+">	c #D8D8D8",
+",	c #D1D1D1",
+"'	c #656565",
+")	c #868686",
+"!	c #898989",
+"~	c #C8C8C8",
+"{	c #B6B6B6",
+"]	c #ABABAB",
+"^	c #D7D7D7",
+"/	c #BDBDBD",
+"(	c #BBBBBB",
+"_	c #AFAFAF",
+":	c #D2D2D2",
+"<	c #A7A7A7",
+"[	c #B0B0B0",
+"}	c #AAAAAA",
+"|	c #676767",
+"1	c #CBCBCB",
+"2	c #B8B8B8",
+"3	c #B4B4B4",
+"         ...+   ",
+"   @+   .#+#.$  ",
+"  @%@$  .$ $.+  ",
+" @%&&@+ + .....$",
+"@*=-;>@$  ..#..+",
+" @>,>@+   .#+#.$",
+"  @>@$ @@'..#..+",
+"@@)@)!@~{].....$",
+"@^/{(@~,]_/'$+$+",
+"@:<[}@{}{~=|+   ",
+"@123(@}_~=>'$   ",
+"@:3(3!@/=>'+    ",
+"@)!)!)$'|'$     ",
+" +$+$+ +$+      "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-unknown.xpm
new file mode 100755
index 0000000..c95b9d8
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-class-unknown.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * ecb_class_unknown_xpm[] = {
+"16 14 31 1",
+" 	c None",
+".	c #434343",
+"+	c #FFFFFF",
+"@	c #F1F1F1",
+"#	c #F5F5F5",
+"$	c #CACACA",
+"%	c #E6E6E6",
+"&	c #C9C9C9",
+"*	c #C5C5C5",
+"=	c #D5D5D5",
+"-	c #D8D8D8",
+";	c #D1D1D1",
+">	c #656565",
+",	c #A5A5C6",
+"'	c #868686",
+")	c #898989",
+"!	c #C8C8C8",
+"~	c #B6B6B6",
+"{	c #ABABAB",
+"]	c #D7D7D7",
+"^	c #BDBDBD",
+"/	c #BBBBBB",
+"(	c #AFAFAF",
+"_	c #D2D2D2",
+":	c #A7A7A7",
+"<	c #B0B0B0",
+"[	c #AAAAAA",
+"}	c #676767",
+"|	c #CBCBCB",
+"1	c #B8B8B8",
+"2	c #B4B4B4",
+"                ",
+"    .+          ",
+"   .@.#         ",
+"  .@$$.+        ",
+" .%&*=-.#       ",
+"  .-;-.+        ",
+"   .-.# ..>#    ",
+",..'.').!~{>+   ",
+" .]^~/.!;{(^>#  ",
+" ._:<[.~[~!&}+  ",
+" .|12/.[(!&->#  ",
+" ._2/2).^&->+   ",
+" .')')'#>}>#    ",
+"  +#+#+ +#+     "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-private.xpm
new file mode 100755
index 0000000..31283b2
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-private.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+static char * ecb_constructor_private_xpm[] = {
+"16 14 18 1",
+" 	c None",
+".	c #696969",
+"+	c #FFFFFF",
+"@	c #C5C5C5",
+"#	c #F5F5F5",
+"$	c #444444",
+"%	c #EFEFEF",
+"&	c #787878",
+"*	c #C2C2C2",
+"=	c #C9C9C9",
+"-	c #8C8C8C",
+";	c #CECECE",
+">	c #C6C6C6",
+",	c #D1D1D1",
+"'	c #CDCDCD",
+")	c #CACACA",
+"!	c #E0E0E0",
+"~	c #D5D5D5",
+"                ",
+"          ...+  ",
+"         .@+@.# ",
+"    $#   .+ +.+ ",
+"   $%&#  .....# ",
+"  $%*=&# ..-..+ ",
+" $%*;>,&#.-+-.# ",
+"$%*'),;!&..-..+ ",
+" $!)~;!&#.....# ",
+"  $!,!&# #+#+#+ ",
+"   $!&#         ",
+"    &#          ",
+"    #           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-protected.xpm
new file mode 100755
index 0000000..f7a73ed
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-protected.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char * ecb_constructor_protected_xpm[] = {
+"16 14 25 1",
+" 	c None",
+".	c #444444",
+"+	c #FFFFFF",
+"@	c #EDEDED",
+"#	c #F2F2F2",
+"$	c #E7E7E7",
+"%	c #747474",
+"&	c #F5F5F5",
+"*	c #D8D8D8",
+"=	c #D2D2D2",
+"-	c #8C8C8C",
+";	c #FBFBFB",
+">	c #EFEFEF",
+",	c #787878",
+"'	c #404040",
+")	c #E0E0E0",
+"!	c #898989",
+"~	c #C2C2C2",
+"{	c #C9C9C9",
+"]	c #CECECE",
+"^	c #C6C6C6",
+"/	c #D1D1D1",
+"(	c #CDCDCD",
+"_	c #CACACA",
+":	c #D5D5D5",
+"                ",
+"         .....+ ",
+"        .+@#@$%+",
+"    .&  .@*.*=-;",
+"   .>,& '$=*)*!+",
+"  .>~{,&+..=,!+ ",
+" .>~]^/,&+.*!+  ",
+".>~(_/]),&.=-;  ",
+" .)_:]),& .*)-+ ",
+"  .)/),&  .)-;  ",
+"   .),&    ,;   ",
+"    ,&     ;    ",
+"    &           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-public.xpm
new file mode 100755
index 0000000..3ad5a35
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-public.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * ecb_constructor_public_xpm[] = {
+"16 14 17 1",
+" 	c None",
+".	c #686868",
+"+	c #9F9F9F",
+"@	c #FFFFFF",
+"#	c #F5F5F5",
+"$	c #444444",
+"%	c #EFEFEF",
+"&	c #787878",
+"*	c #C2C2C2",
+"=	c #C9C9C9",
+"-	c #CECECE",
+";	c #C6C6C6",
+">	c #D1D1D1",
+",	c #CDCDCD",
+"'	c #CACACA",
+")	c #E0E0E0",
+"!	c #D5D5D5",
+"                ",
+"        ...     ",
+"       .+@+.#   ",
+"    $# .@  .@   ",
+"   $%&#@ .....# ",
+"  $%*=&# ..+..@ ",
+" $%*-;>&#.+@+.# ",
+"$%*,'>-)&..+..@ ",
+" $)'!-)&#.....# ",
+"  $)>)&# #@#@#@ ",
+"   $)&#         ",
+"    &#          ",
+"    #           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-unknown.xpm
new file mode 100755
index 0000000..bbc1b95
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-constructor-unknown.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * ecb_constructor_unknown_xpm[] = {
+"12 14 15 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #EFEFEF",
+"#	c #787878",
+"$	c #C2C2C2",
+"%	c #C9C9C9",
+"&	c #CECECE",
+"*	c #C6C6C6",
+"=	c #D1D1D1",
+"-	c #A5A5C6",
+";	c #CDCDCD",
+">	c #CACACA",
+",	c #E0E0E0",
+"'	c #D5D5D5",
+"            ",
+"            ",
+"            ",
+"     .+     ",
+"    .@#+    ",
+"   .@$%#+   ",
+"  .@$&*=#+  ",
+"-.@$;>=&,#+ ",
+"  .,>'&,#+  ",
+"   .,=,#+   ",
+"    .,#+    ",
+"     #+     ",
+"     +      ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private-static.xpm
new file mode 100755
index 0000000..56af6cd
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private-static.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char * ecb_function_private_static_xpm[] = {
+"16 14 44 1",
+" 	c None",
+".	c #696969",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #C5C5C5",
+"&	c #FFFFFF",
+"*	c #EEEEEE",
+"=	c #AAAAAA",
+"-	c #656565",
+";	c #4C4C4C",
+">	c #DCDCDC",
+",	c #989898",
+"'	c #444444",
+")	c #C8C8C8",
+"!	c #8A8A8A",
+"~	c #ECECEC",
+"{	c #A1A1A1",
+"]	c #676767",
+"^	c #8C8C8C",
+"/	c #DDDDDD",
+"(	c #A8A8A8",
+"_	c #E2E2E2",
+":	c #A7A7A7",
+"<	c #B6B6B6",
+"[	c #D1D1D1",
+"}	c #A4A4A4",
+"|	c #A3A3A3",
+"1	c #BDBDBD",
+"2	c #A5A5A5",
+"3	c #8E8E8E",
+"4	c #E3E3E3",
+"5	c #ACACAC",
+"6	c #C9C9C9",
+"7	c #B5B5B5",
+"8	c #D8D8D8",
+"9	c #E6E6E6",
+"0	c #AFAFAF",
+"a	c #666666",
+"b	c #939393",
+"c	c #9B9B9B",
+"d	c #EAEAEA",
+"e	c #B7B7B7",
+"                ",
+"          ...+  ",
+"   @#$+  .%&%.+ ",
+"   #*=&  .& +.& ",
+"  -;>,+  .....+ ",
+" ')!~{]+ ..^..& ",
+"')/(_:<]+.^&^.+ ",
+"'[}|~})-&..^..& ",
+"'123456]+.....+ ",
+"'27!*(8-&+&+&+& ",
+"+'<390-&        ",
+" +]a9b&         ",
+"  +cde+         ",
+"   ^$|&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private.xpm
new file mode 100755
index 0000000..cbb3fc5
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-private.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * ecb_function_private_xpm[] = {
+"16 14 20 1",
+" 	c None",
+".	c #696969",
+"+	c #F5F5F5",
+"@	c #C5C5C5",
+"#	c #FFFFFF",
+"$	c #444444",
+"%	c #C8C8C8",
+"&	c #D1D1D1",
+"*	c #BDBDBD",
+"=	c #A6A6A6",
+"-	c #676767",
+";	c #8C8C8C",
+">	c #A4A4A4",
+",	c #B5B5B5",
+"'	c #B6B6B6",
+")	c #656565",
+"!	c #A5A5A5",
+"~	c #B3B3B3",
+"{	c #C9C9C9",
+"]	c #D8D8D8",
+"                ",
+"          ...+  ",
+"         .@#@.+ ",
+"         .# +.# ",
+"  $$$$+  .....+ ",
+" $%&*=-+ ..;..# ",
+"$%&>=,'-+.;#;.+ ",
+"$&>=,'%)#..;..# ",
+"$*!~'%{-+.....+ ",
+"$!,'%{])#+#+#+# ",
+"+$'%{])#        ",
+" +-)-)#         ",
+"  +#+#          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected-static.xpm
new file mode 100755
index 0000000..74f455f
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected-static.xpm
@@ -0,0 +1,68 @@
+/* XPM */
+static char * ecb_function_protected_static_xpm[] = {
+"16 14 51 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #FFFFFF",
+"&	c #EDEDED",
+"*	c #F2F2F2",
+"=	c #E7E7E7",
+"-	c #747474",
+";	c #EEEEEE",
+">	c #AAAAAA",
+",	c #D8D8D8",
+"'	c #D2D2D2",
+")	c #8C8C8C",
+"!	c #FBFBFB",
+"~	c #656565",
+"{	c #4C4C4C",
+"]	c #DCDCDC",
+"^	c #989898",
+"/	c #E0E0E0",
+"(	c #898989",
+"_	c #C8C8C8",
+":	c #8A8A8A",
+"<	c #ECECEC",
+"[	c #A1A1A1",
+"}	c #676767",
+"|	c #787878",
+"1	c #DDDDDD",
+"2	c #A8A8A8",
+"3	c #E2E2E2",
+"4	c #A7A7A7",
+"5	c #B6B6B6",
+"6	c #D1D1D1",
+"7	c #A4A4A4",
+"8	c #A3A3A3",
+"9	c #BDBDBD",
+"0	c #A5A5A5",
+"a	c #8E8E8E",
+"b	c #E3E3E3",
+"c	c #ACACAC",
+"d	c #C9C9C9",
+"e	c #B5B5B5",
+"f	c #E6E6E6",
+"g	c #AFAFAF",
+"h	c #666666",
+"i	c #939393",
+"j	c #9B9B9B",
+"k	c #EAEAEA",
+"l	c #B7B7B7",
+"                ",
+"         .....+ ",
+"   @#$+ .%&*&=-%",
+"   #;>% .&,.,')!",
+"  ~{]^+ .=',/,(%",
+" ._:<[}++..'|(% ",
+"._12345}+%.,(%  ",
+".678<7_~% .')!  ",
+".90abcd}+ .,/)% ",
+".0e:;2,~% ./)!  ",
+"+.5afg~%  +|!   ",
+" +}hfi%    !    ",
+"  +jkl+         ",
+"   )$8%         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected.xpm
new file mode 100755
index 0000000..b188a09
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-protected.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * ecb_function_protected_xpm[] = {
+"16 14 27 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #FFFFFF",
+"#	c #EDEDED",
+"$	c #F2F2F2",
+"%	c #E7E7E7",
+"&	c #747474",
+"*	c #D8D8D8",
+"=	c #D2D2D2",
+"-	c #8C8C8C",
+";	c #FBFBFB",
+">	c #E0E0E0",
+",	c #898989",
+"'	c #C8C8C8",
+")	c #D1D1D1",
+"!	c #BDBDBD",
+"~	c #A6A6A6",
+"{	c #676767",
+"]	c #787878",
+"^	c #A4A4A4",
+"/	c #B5B5B5",
+"(	c #B6B6B6",
+"_	c #656565",
+":	c #A5A5A5",
+"<	c #B3B3B3",
+"[	c #C9C9C9",
+"                ",
+"         .....+ ",
+"        .@#$#%&@",
+"        .#*.*=-;",
+"  ....+ .%=*>*,@",
+" .')!~{++..=],@ ",
+".')^~/({+@.*,@  ",
+".)^~/('_@ .=-;  ",
+".!:<('[{+ .*>-@ ",
+".:/('[*_@ .>-;  ",
+"+.('[*_@  +];   ",
+" +{_{_@    ;    ",
+"  +@+@          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public-static.xpm
new file mode 100755
index 0000000..9399ba0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public-static.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char * ecb_function_public_static_xpm[] = {
+"16 14 44 1",
+" 	c None",
+".	c #686868",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #9F9F9F",
+"&	c #FFFFFF",
+"*	c #EEEEEE",
+"=	c #AAAAAA",
+"-	c #656565",
+";	c #4C4C4C",
+">	c #DCDCDC",
+",	c #989898",
+"'	c #444444",
+")	c #C8C8C8",
+"!	c #8A8A8A",
+"~	c #ECECEC",
+"{	c #A1A1A1",
+"]	c #676767",
+"^	c #DDDDDD",
+"/	c #A8A8A8",
+"(	c #E2E2E2",
+"_	c #A7A7A7",
+":	c #B6B6B6",
+"<	c #D1D1D1",
+"[	c #A4A4A4",
+"}	c #A3A3A3",
+"|	c #BDBDBD",
+"1	c #A5A5A5",
+"2	c #8E8E8E",
+"3	c #E3E3E3",
+"4	c #ACACAC",
+"5	c #C9C9C9",
+"6	c #B5B5B5",
+"7	c #D8D8D8",
+"8	c #E6E6E6",
+"9	c #AFAFAF",
+"0	c #666666",
+"a	c #939393",
+"b	c #9B9B9B",
+"c	c #EAEAEA",
+"d	c #B7B7B7",
+"e	c #8C8C8C",
+"                ",
+"        ...+    ",
+"   @#$+.%&%.+   ",
+"   #*=&.& +.&   ",
+"  -;>,+  .....+ ",
+" ')!~{]+ ..%..& ",
+"')^/(_:]+.%&%.+ ",
+"'<[}~[)-&..%..& ",
+"'|12345]+.....+ ",
+"'16!*/7-&+&+&+& ",
+"+':289-&        ",
+" +]08a&         ",
+"  +bcd+         ",
+"   e$}&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public.xpm
new file mode 100755
index 0000000..79f93d0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-public.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * ecb_function_public_xpm[] = {
+"16 14 19 1",
+" 	c None",
+".	c #686868",
+"+	c #F5F5F5",
+"@	c #9F9F9F",
+"#	c #FFFFFF",
+"$	c #444444",
+"%	c #C8C8C8",
+"&	c #D1D1D1",
+"*	c #BDBDBD",
+"=	c #A6A6A6",
+"-	c #676767",
+";	c #A4A4A4",
+">	c #B5B5B5",
+",	c #B6B6B6",
+"'	c #656565",
+")	c #A5A5A5",
+"!	c #B3B3B3",
+"~	c #C9C9C9",
+"{	c #D8D8D8",
+"                ",
+"        ...+    ",
+"       .@#@.+   ",
+"       .# +.#   ",
+"  $$$$++ .....+ ",
+" $%&*=-+ ..@..# ",
+"$%&;=>,-+.@#@.+ ",
+"$&;=>,%'#..@..# ",
+"$*)!,%~-+.....+ ",
+"$)>,%~{'#+#+#+# ",
+"+$,%~{'#        ",
+" +-'-'#         ",
+"  +#+#          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown-static.xpm
new file mode 100755
index 0000000..6506f49
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown-static.xpm
@@ -0,0 +1,60 @@
+/* XPM */
+static char * ecb_function_unknown_static_xpm[] = {
+"12 14 43 1",
+" 	c None",
+".	c #757575",
+"+	c #727272",
+"@	c #8F8F8F",
+"#	c #F5F5F5",
+"$	c #EEEEEE",
+"%	c #AAAAAA",
+"&	c #FFFFFF",
+"*	c #656565",
+"=	c #4C4C4C",
+"-	c #DCDCDC",
+";	c #989898",
+">	c #444444",
+",	c #C8C8C8",
+"'	c #8A8A8A",
+")	c #ECECEC",
+"!	c #A1A1A1",
+"~	c #676767",
+"{	c #DDDDDD",
+"]	c #A8A8A8",
+"^	c #E2E2E2",
+"/	c #A7A7A7",
+"(	c #B6B6B6",
+"_	c #A5A5C6",
+":	c #D1D1D1",
+"<	c #A4A4A4",
+"[	c #A3A3A3",
+"}	c #BDBDBD",
+"|	c #A5A5A5",
+"1	c #8E8E8E",
+"2	c #E3E3E3",
+"3	c #ACACAC",
+"4	c #C9C9C9",
+"5	c #B5B5B5",
+"6	c #D8D8D8",
+"7	c #E6E6E6",
+"8	c #AFAFAF",
+"9	c #666666",
+"0	c #939393",
+"a	c #9B9B9B",
+"b	c #EAEAEA",
+"c	c #B7B7B7",
+"d	c #8C8C8C",
+"            ",
+"            ",
+"    .+@#    ",
+"    +$%&    ",
+"   *=-;#    ",
+"  >,')!~#   ",
+" >,{]^/(~#  ",
+"_>:<[)<,*&  ",
+" >}|1234~#  ",
+" >|5'$]6*&  ",
+" #>(178*&   ",
+"  #~970&    ",
+"   #abc#    ",
+"    d@[&    "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown.xpm
new file mode 100755
index 0000000..e4cb0e0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-function-unknown.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+static char * ecb_function_unknown_xpm[] = {
+"12 14 18 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #C8C8C8",
+"#	c #D1D1D1",
+"$	c #BDBDBD",
+"%	c #A6A6A6",
+"&	c #676767",
+"*	c #A4A4A4",
+"=	c #B5B5B5",
+"-	c #B6B6B6",
+";	c #A5A5C6",
+">	c #656565",
+",	c #FFFFFF",
+"'	c #A5A5A5",
+")	c #B3B3B3",
+"!	c #C9C9C9",
+"~	c #D8D8D8",
+"            ",
+"            ",
+"            ",
+"            ",
+"   ....+    ",
+"  .@#$%&+   ",
+" .@#*%=-&+  ",
+";.#*%=-@>,  ",
+" .$')-@!&+  ",
+" .'=-@!~>,  ",
+" +.-@!~>,   ",
+"  +&>&>,    ",
+"   +,+,     ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private-static.xpm
new file mode 100755
index 0000000..1809bbe
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private-static.xpm
@@ -0,0 +1,64 @@
+/* XPM */
+static char * ecb_variable_private_static_xpm[] = {
+"16 14 47 1",
+" 	c None",
+".	c #696969",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #C5C5C5",
+"&	c #FFFFFF",
+"*	c #989898",
+"=	c #EDEDED",
+"-	c #AFAFAF",
+";	c #444444",
+">	c #676767",
+",	c #D8D8D8",
+"'	c #939393",
+")	c #D7D7D7",
+"!	c #BDBDBD",
+"~	c #8C8C8C",
+"{	c #EBEBEB",
+"]	c #929292",
+"^	c #A9A9A9",
+"/	c #D2D2D2",
+"(	c #9E9E9E",
+"_	c #898989",
+":	c #E1E1E1",
+"<	c #979797",
+"[	c #AAAAAA",
+"}	c #CBCBCB",
+"|	c #A5A5A5",
+"1	c #868686",
+"2	c #E9E9E9",
+"3	c #B3B3B3",
+"4	c #A2A2A2",
+"5	c #8B8B8B",
+"6	c #E2E2E2",
+"7	c #B0B0B0",
+"8	c #888888",
+"9	c #B9B9B9",
+"0	c #A7A7A7",
+"a	c #8D8D8D",
+"b	c #E3E3E3",
+"c	c #B4B4B4",
+"d	c #B6B6B6",
+"e	c #7D7D7D",
+"f	c #E8E8E8",
+"g	c #BCBCBC",
+"h	c #9D9D9D",
+"                ",
+"          ...+  ",
+"   @#$+  .%&%.+ ",
+"   *=-&  .& +.& ",
+";;;>,';; .....+ ",
+";)!~{]!^&..~..& ",
+";/(_:<[_+.~&~.+ ",
+";}|12]31&..~..& ",
+";/456<7_+.....+ ",
+";}[8{]91&+&+&+& ",
+";/0ab<c_+       ",
+";d_ef]_1&       ",
+" &+02g+&+       ",
+"   *h[&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private.xpm
new file mode 100755
index 0000000..ed537e8
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-private.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * ecb_variable_private_xpm[] = {
+"16 14 31 1",
+" 	c None",
+".	c #696969",
+"+	c #F5F5F5",
+"@	c #C5C5C5",
+"#	c #FFFFFF",
+"$	c #444444",
+"%	c #D7D7D7",
+"&	c #BDBDBD",
+"*	c #B6B6B6",
+"=	c #A9A9A9",
+"-	c #8C8C8C",
+";	c #D2D2D2",
+">	c #9E9E9E",
+",	c #A6A6A6",
+"'	c #A3A3A3",
+")	c #ACACAC",
+"!	c #AAAAAA",
+"~	c #898989",
+"{	c #CBCBCB",
+"]	c #A5A5A5",
+"^	c #ABABAB",
+"/	c #B3B3B3",
+"(	c #868686",
+"_	c #A2A2A2",
+":	c #B0B0B0",
+"<	c #A7A7A7",
+"[	c #B1B1B1",
+"}	c #AFAFAF",
+"|	c #B9B9B9",
+"1	c #B8B8B8",
+"2	c #B4B4B4",
+"                ",
+"          ...+  ",
+"         .@#@.+ ",
+"         .# +.# ",
+"$$$$$$$$ .....+ ",
+"$%&*&*&=#..-..# ",
+"$;>,')!~+.-#-.+ ",
+"${]'^=/(#..-..# ",
+"$;_!=/:~+.....+ ",
+"${!<[}|(#+#+#+# ",
+"$;<:}12~+       ",
+"$*~(~(~(#       ",
+" #+#+#+#+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected-static.xpm
new file mode 100755
index 0000000..d7a147d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected-static.xpm
@@ -0,0 +1,68 @@
+/* XPM */
+static char * ecb_variable_protected_static_xpm[] = {
+"16 14 51 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #FFFFFF",
+"&	c #EDEDED",
+"*	c #F2F2F2",
+"=	c #E7E7E7",
+"-	c #747474",
+";	c #989898",
+">	c #AFAFAF",
+",	c #D8D8D8",
+"'	c #D2D2D2",
+")	c #8C8C8C",
+"!	c #FBFBFB",
+"~	c #676767",
+"{	c #939393",
+"]	c #E0E0E0",
+"^	c #898989",
+"/	c #D7D7D7",
+"(	c #BDBDBD",
+"_	c #EBEBEB",
+":	c #929292",
+"<	c #A9A9A9",
+"[	c #787878",
+"}	c #9E9E9E",
+"|	c #E1E1E1",
+"1	c #979797",
+"2	c #AAAAAA",
+"3	c #CBCBCB",
+"4	c #A5A5A5",
+"5	c #868686",
+"6	c #E9E9E9",
+"7	c #B3B3B3",
+"8	c #A2A2A2",
+"9	c #8B8B8B",
+"0	c #E2E2E2",
+"a	c #B0B0B0",
+"b	c #888888",
+"c	c #B9B9B9",
+"d	c #A7A7A7",
+"e	c #8D8D8D",
+"f	c #E3E3E3",
+"g	c #B4B4B4",
+"h	c #B6B6B6",
+"i	c #7D7D7D",
+"j	c #E8E8E8",
+"k	c #BCBCBC",
+"l	c #9D9D9D",
+"                ",
+"         .....+ ",
+"   @#$+ .%&*&=-%",
+"   ;&>% .&,.,')!",
+"...~,{...=',],^%",
+"./()_:(<%..'[^% ",
+".'}^|12^+%.,^%  ",
+".3456:75% .')!  ",
+".'8901a^+ .,])% ",
+".32b_:c5% .])!  ",
+".'def1g^+  [!   ",
+".h^ij:^5%  !    ",
+" %+d6k+%+       ",
+"   ;l2%         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected.xpm
new file mode 100755
index 0000000..725d6a2
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-protected.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * ecb_variable_protected_xpm[] = {
+"16 14 37 1",
+" 	c None",
+".	c #444444",
+"+	c #F5F5F5",
+"@	c #FFFFFF",
+"#	c #EDEDED",
+"$	c #F2F2F2",
+"%	c #E7E7E7",
+"&	c #747474",
+"*	c #D8D8D8",
+"=	c #D2D2D2",
+"-	c #8C8C8C",
+";	c #FBFBFB",
+">	c #E0E0E0",
+",	c #898989",
+"'	c #D7D7D7",
+")	c #BDBDBD",
+"!	c #B6B6B6",
+"~	c #A9A9A9",
+"{	c #787878",
+"]	c #9E9E9E",
+"^	c #A6A6A6",
+"/	c #A3A3A3",
+"(	c #ACACAC",
+"_	c #AAAAAA",
+":	c #CBCBCB",
+"<	c #A5A5A5",
+"[	c #ABABAB",
+"}	c #B3B3B3",
+"|	c #868686",
+"1	c #A2A2A2",
+"2	c #B0B0B0",
+"3	c #A7A7A7",
+"4	c #B1B1B1",
+"5	c #AFAFAF",
+"6	c #B9B9B9",
+"7	c #B8B8B8",
+"8	c #B4B4B4",
+"                ",
+"         .....+ ",
+"        .@#$#%&@",
+"        .#*.*=-;",
+".........%=*>*,@",
+".')!)!)~@..={,@ ",
+".=]^/(_,+@.*,@  ",
+".:</[~}|@ .=-;  ",
+".=1_~}2,+ .*>-@ ",
+".:_3456|@ .>-;  ",
+".=32578,+  {;   ",
+".!,|,|,|@  ;    ",
+" @+@+@+@+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public-static.xpm
new file mode 100755
index 0000000..b7a9105
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public-static.xpm
@@ -0,0 +1,65 @@
+/* XPM */
+static char * ecb_variable_public_static_xpm[] = {
+"16 14 48 1",
+" 	c None",
+".	c #686868",
+"+	c #F5F5F5",
+"@	c #757575",
+"#	c #727272",
+"$	c #8F8F8F",
+"%	c #9F9F9F",
+"&	c #FFFFFF",
+"*	c #989898",
+"=	c #EDEDED",
+"-	c #AFAFAF",
+";	c #444444",
+">	c #676767",
+",	c #D8D8D8",
+"'	c #939393",
+")	c #404040",
+"!	c #D7D7D7",
+"~	c #BDBDBD",
+"{	c #8C8C8C",
+"]	c #EBEBEB",
+"^	c #929292",
+"/	c #A9A9A9",
+"(	c #D2D2D2",
+"_	c #9E9E9E",
+":	c #898989",
+"<	c #E1E1E1",
+"[	c #979797",
+"}	c #AAAAAA",
+"|	c #CBCBCB",
+"1	c #A5A5A5",
+"2	c #868686",
+"3	c #E9E9E9",
+"4	c #B3B3B3",
+"5	c #A2A2A2",
+"6	c #8B8B8B",
+"7	c #E2E2E2",
+"8	c #B0B0B0",
+"9	c #888888",
+"0	c #B9B9B9",
+"a	c #A7A7A7",
+"b	c #8D8D8D",
+"c	c #E3E3E3",
+"d	c #B4B4B4",
+"e	c #B6B6B6",
+"f	c #7D7D7D",
+"g	c #E8E8E8",
+"h	c #BCBCBC",
+"i	c #9D9D9D",
+"                ",
+"        ...+    ",
+"   @#$+.%&%.+   ",
+"   *=-&.& +.&   ",
+";;;>,';) .....+ ",
+";!~{]^~/&..%..& ",
+";(_:<[}:+.%&%.+ ",
+";|123^42&..%..& ",
+";(567[8:+.....+ ",
+";|}9]^02&+&+&+& ",
+";(abc[d:+       ",
+";e:fg^:2&       ",
+" &+a3h+&+       ",
+"   *i}&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public.xpm
new file mode 100755
index 0000000..b1f2f9f
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-public.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * ecb_variable_public_xpm[] = {
+"16 14 31 1",
+" 	c None",
+".	c #686868",
+"+	c #F5F5F5",
+"@	c #9F9F9F",
+"#	c #FFFFFF",
+"$	c #444444",
+"%	c #404040",
+"&	c #D7D7D7",
+"*	c #BDBDBD",
+"=	c #B6B6B6",
+"-	c #A9A9A9",
+";	c #D2D2D2",
+">	c #9E9E9E",
+",	c #A6A6A6",
+"'	c #A3A3A3",
+")	c #ACACAC",
+"!	c #AAAAAA",
+"~	c #898989",
+"{	c #CBCBCB",
+"]	c #A5A5A5",
+"^	c #ABABAB",
+"/	c #B3B3B3",
+"(	c #868686",
+"_	c #A2A2A2",
+":	c #B0B0B0",
+"<	c #A7A7A7",
+"[	c #B1B1B1",
+"}	c #AFAFAF",
+"|	c #B9B9B9",
+"1	c #B8B8B8",
+"2	c #B4B4B4",
+"                ",
+"        ...+    ",
+"       .@#@.+   ",
+"       .# +.#   ",
+"$$$$$$$% .....+ ",
+"$&*=*=*-#..@..# ",
+"$;>,')!~+.@#@.+ ",
+"${]'^-/(#..@..# ",
+"$;_!-/:~+.....+ ",
+"${!<[}|(#+#+#+# ",
+"$;<:}12~+       ",
+"$=~(~(~(#       ",
+" #+#+#+#+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown-static.xpm
new file mode 100755
index 0000000..7c3e766
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown-static.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * ecb_variable_unknown_static_xpm[] = {
+"12 14 46 1",
+" 	c None",
+".	c #757575",
+"+	c #727272",
+"@	c #8F8F8F",
+"#	c #F5F5F5",
+"$	c #989898",
+"%	c #EDEDED",
+"&	c #AFAFAF",
+"*	c #FFFFFF",
+"=	c #444444",
+"-	c #676767",
+";	c #D8D8D8",
+">	c #939393",
+",	c #D7D7D7",
+"'	c #BDBDBD",
+")	c #8C8C8C",
+"!	c #EBEBEB",
+"~	c #929292",
+"{	c #A9A9A9",
+"]	c #D2D2D2",
+"^	c #9E9E9E",
+"/	c #898989",
+"(	c #E1E1E1",
+"_	c #979797",
+":	c #AAAAAA",
+"<	c #A5A5C6",
+"[	c #CBCBCB",
+"}	c #A5A5A5",
+"|	c #868686",
+"1	c #E9E9E9",
+"2	c #B3B3B3",
+"3	c #A2A2A2",
+"4	c #8B8B8B",
+"5	c #E2E2E2",
+"6	c #B0B0B0",
+"7	c #888888",
+"8	c #B9B9B9",
+"9	c #A7A7A7",
+"0	c #8D8D8D",
+"a	c #E3E3E3",
+"b	c #B4B4B4",
+"c	c #B6B6B6",
+"d	c #7D7D7D",
+"e	c #E8E8E8",
+"f	c #BCBCBC",
+"g	c #9D9D9D",
+"            ",
+"            ",
+"    .+@#    ",
+"    $%&*    ",
+" ===-;>==   ",
+" =,')!~'{*  ",
+" =]^/(_:/#  ",
+"<=[}|1~2|*  ",
+" =]345_6/#  ",
+" =[:7!~8|*  ",
+" =]90a_b/#  ",
+" =c/de~/|*  ",
+"  *#91f#*#  ",
+"    $g:*    "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown.xpm
new file mode 100755
index 0000000..db019d0
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-abstract-variable-unknown.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char * ecb_variable_unknown_xpm[] = {
+"12 14 29 1",
+" 	c None",
+".	c #444444",
+"+	c #D7D7D7",
+"@	c #BDBDBD",
+"#	c #B6B6B6",
+"$	c #A9A9A9",
+"%	c #FFFFFF",
+"&	c #D2D2D2",
+"*	c #9E9E9E",
+"=	c #A6A6A6",
+"-	c #A3A3A3",
+";	c #ACACAC",
+">	c #AAAAAA",
+",	c #898989",
+"'	c #F5F5F5",
+")	c #A5A5C6",
+"!	c #CBCBCB",
+"~	c #A5A5A5",
+"{	c #ABABAB",
+"]	c #B3B3B3",
+"^	c #868686",
+"/	c #A2A2A2",
+"(	c #B0B0B0",
+"_	c #A7A7A7",
+":	c #B1B1B1",
+"<	c #AFAFAF",
+"[	c #B9B9B9",
+"}	c #B8B8B8",
+"|	c #B4B4B4",
+"            ",
+"            ",
+"            ",
+"            ",
+" ........   ",
+" .+@#@#@$%  ",
+" .&*=-;>,'  ",
+").!~-{$]^%  ",
+" .&/>$](,'  ",
+" .!>_:<[^%  ",
+" .&_(<}|,'  ",
+" .#,^,^,^%  ",
+"  %'%'%'%'  ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-private.xpm
new file mode 100755
index 0000000..8444c25
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-private.xpm
@@ -0,0 +1,57 @@
+/* XPM */
+static char * ecb_class_private_xpm[] = {
+"16 14 40 1",
+" 	c None",
+".	c #BA0000",
+"+	c #F2F2F2",
+"@	c #040404",
+"#	c #FFFFFF",
+"$	c #FF9090",
+"%	c #F2F1C5",
+"&	c #E0B84B",
+"*	c #DCB857",
+"=	c #F2DDA4",
+"-	c #E0B74A",
+";	c #D7B34F",
+">	c #ECC864",
+",	c #F2CB61",
+"'	c #FF2424",
+")	c #E8C25C",
+"!	c #4F2721",
+"~	c #4B5F87",
+"{	c #4F648E",
+"]	c #E5A684",
+"^	c #D48E67",
+"/	c #D67A44",
+"(	c #C2CBDF",
+"_	c #8AAAEA",
+":	c #83A1DE",
+"<	c #87A7E8",
+"[	c #E2B7A1",
+"}	c #D08254",
+"|	c #DF966D",
+"1	c #B2C5EB",
+"2	c #6B8CD1",
+"3	c #7798DF",
+"4	c #7190D4",
+"5	c #D67942",
+"6	c #DEAC90",
+"7	c #532923",
+"8	c #A9BBDF",
+"9	c #83A3E6",
+"0	c #809EDC",
+"a	c #EEC1AA",
+"           ...+ ",
+"   @#     .$#$.+",
+"  @%@+    .+ +.#",
+" @%&*@#   .....+",
+"@=-;>,@+  ..'..#",
+" @,),@#   .'#'.+",
+"  @,@+ @@!..'..#",
+"@@~@~{@]^/.....+",
+"@(_:<@][/}|!+#+#",
+"@1234@^5^]67#   ",
+"@890<@5}]6a!+   ",
+"@10<0{@|6a!#    ",
+"@~{~{~+!7!+     ",
+" #+#+# #+#      "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-protected.xpm
new file mode 100755
index 0000000..e6a7e32
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-protected.xpm
@@ -0,0 +1,65 @@
+/* XPM */ 
+static char * ecbclassprotected_xpm[] = {
+"16 14 48 1",
+" 	c None",
+"!	c black",
+"#	c #040404",
+"$	c white",
+"%	c #FEE99F",
+"&	c #FEF0B7",
+"'	c #FEDF8B",
+"(	c #8E2E00",
+")	c #F2F1C5",
+"*	c #F2F2F2",
+"+	c #FDC760",
+",	c #FCBD4F",
+"-	c #C04C00",
+".	c #E0B84B",
+"0	c #DCB857",
+"1	c #FDD378",
+"2	c #B84900",
+"3	c #F2DDA4",
+"4	c #E0B74A",
+"5	c #D7B34F",
+"6	c #ECC864",
+"7	c #F2CB61",
+"8	c #963400",
+"9	c #E8C25C",
+":	c #4F2721",
+";	c #4B5F87",
+"<	c #4F648E",
+"=	c #E5A684",
+">	c #D48E67",
+"?	c #D67A44",
+"@	c #C2CBDF",
+"A	c #8AAAEA",
+"B	c #83A1DE",
+"C	c #87A7E8",
+"D	c #E2B7A1",
+"E	c #D08254",
+"F	c #B2C5EB",
+"G	c #6B8CD1",
+"H	c #7798DF",
+"I	c #7190D4",
+"J	c #D67942",
+"K	c #DEAC90",
+"L	c #A9BBDF",
+"M	c #83A3E6",
+"N	c #809EDC",
+"O	c #EEC1AA",
+"P	c #DF966D",
+"Q	c #532923",
+"         #####$ ",
+"   #$   #$%&%'($",
+"  #)#*  #%+#+,-*",
+" #).0#$ !',+1+2$",
+"#34567#* ##,82* ",
+" #797#$   #+2$  ",
+"  #7#* ##:#,-*  ",
+"##;#;<#=>?#+1-$ ",
+"#@ABC#=D?E#1-*  ",
+"#FGHI#>J>=K8$   ",
+"#LMNC#JE=KO:    ",
+"#FNCN<#PKO:$    ",
+"#;<;<;*:Q:*     ",
+" $*$*$ $*$      "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-public.xpm
new file mode 100755
index 0000000..230d7f7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-public.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * ecb_class_public_xpm[] = {
+"16 14 39 1",
+" 	c None",
+".	c #005D00",
+"+	c #FFFFFF",
+"@	c #040404",
+"#	c #3CBA00",
+"$	c #F2F2F2",
+"%	c #F2F1C5",
+"&	c #E0B84B",
+"*	c #DCB857",
+"=	c #F2DDA4",
+"-	c #E0B74A",
+";	c #D7B34F",
+">	c #ECC864",
+",	c #F2CB61",
+"'	c #E8C25C",
+")	c #4F2721",
+"!	c #4B5F87",
+"~	c #4F648E",
+"{	c #E5A684",
+"]	c #D48E67",
+"^	c #D67A44",
+"/	c #C2CBDF",
+"(	c #8AAAEA",
+"_	c #83A1DE",
+":	c #87A7E8",
+"<	c #E2B7A1",
+"[	c #D08254",
+"}	c #DF966D",
+"|	c #B2C5EB",
+"1	c #6B8CD1",
+"2	c #7798DF",
+"3	c #7190D4",
+"4	c #D67942",
+"5	c #DEAC90",
+"6	c #532923",
+"7	c #A9BBDF",
+"8	c #83A3E6",
+"9	c #809EDC",
+"0	c #EEC1AA",
+"         ...+   ",
+"   @+   .#+#.$  ",
+"  @%@$  .$ $.+  ",
+" @%&*@+ + .....$",
+"@=-;>,@$  ..#..+",
+" @,',@+   .#+#.$",
+"  @,@$ @@)..#..+",
+"@@!@!~@{]^.....$",
+"@/(_:@{<^[})$+$+",
+"@|123@]4]{56+   ",
+"@789:@4[{50)$   ",
+"@|9:9~@}50)+    ",
+"@!~!~!$)6)$     ",
+" +$+$+ +$+      "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-unknown.xpm
new file mode 100755
index 0000000..12e47b9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-class-unknown.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * ecb_class_unknown_xpm[] = {
+"16 14 38 1",
+" 	c None",
+".	c #040404",
+"+	c #FFFFFF",
+"@	c #F2F1C5",
+"#	c #F2F2F2",
+"$	c #E0B84B",
+"%	c #DCB857",
+"&	c #F2DDA4",
+"*	c #E0B74A",
+"=	c #D7B34F",
+"-	c #ECC864",
+";	c #F2CB61",
+">	c #E8C25C",
+",	c #4F2721",
+"'	c #A5A5C6",
+")	c #4B5F87",
+"!	c #4F648E",
+"~	c #E5A684",
+"{	c #D48E67",
+"]	c #D67A44",
+"^	c #C2CBDF",
+"/	c #8AAAEA",
+"(	c #83A1DE",
+"_	c #87A7E8",
+":	c #E2B7A1",
+"<	c #D08254",
+"[	c #DF966D",
+"}	c #B2C5EB",
+"|	c #6B8CD1",
+"1	c #7798DF",
+"2	c #7190D4",
+"3	c #D67942",
+"4	c #DEAC90",
+"5	c #532923",
+"6	c #A9BBDF",
+"7	c #83A3E6",
+"8	c #809EDC",
+"9	c #EEC1AA",
+"                ",
+"    .+          ",
+"   .@.#         ",
+"  .@$%.+        ",
+" .&*=-;.#       ",
+"  .;>;.+        ",
+"   .;.# ..,#    ",
+"'..).)!.~{],+   ",
+" .^/(_.~:]<[,#  ",
+" .}|12.{3{~45+  ",
+" .678_.3<~49,#  ",
+" .}8_8!.[49,+   ",
+" .)!)!)#,5,#    ",
+"  +#+#+ +#+     "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-bucket.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-bucket.xpm
new file mode 100755
index 0000000..5567234
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-bucket.xpm
@@ -0,0 +1,111 @@
+/* XPM */
+static char * Constructors_xpm[] = {
+"16 14 94 2",
+"  	c None",
+". 	c #040404",
+"+ 	c #FFFFFF",
+"@ 	c #FFE9AD",
+"# 	c #848484",
+"$ 	c #8B8B8B",
+"% 	c #CAA542",
+"& 	c #E0B74A",
+"* 	c #666666",
+"= 	c #616161",
+"- 	c #3B3B3B",
+"; 	c #D1D1D1",
+"> 	c #E4BD54",
+", 	c #CDAA4C",
+"' 	c #E8C25C",
+") 	c #C6C6C6",
+"! 	c #545454",
+"~ 	c #6B6A6A",
+"{ 	c #050505",
+"] 	c #E3BD53",
+"^ 	c #D3B257",
+"/ 	c #FFD666",
+"( 	c #7C7C7C",
+"_ 	c #717070",
+": 	c #F2F2F2",
+"< 	c #5E5E5E",
+"[ 	c #5B5B5B",
+"} 	c #626262",
+"| 	c #676767",
+"1 	c #414141",
+"2 	c #857A5D",
+"3 	c #756C55",
+"4 	c #80765D",
+"5 	c #766E57",
+"6 	c #7B7B7B",
+"7 	c #6F6F6F",
+"8 	c #BCBCBC",
+"9 	c #C6C5C6",
+"0 	c #EFEFEF",
+"a 	c #FBFCFB",
+"b 	c #727272",
+"c 	c #FCE7AC",
+"d 	c #E1D1A3",
+"e 	c #FBE5AB",
+"f 	c #FAFAFA",
+"g 	c #6B6B6B",
+"h 	c #696969",
+"i 	c #C5C5C5",
+"j 	c #BBBBBB",
+"k 	c #FBFBFC",
+"l 	c #EEEDED",
+"m 	c #F9F9F9",
+"n 	c #717170",
+"o 	c #FAFAF9",
+"p 	c #E6E6E6",
+"q 	c #717171",
+"r 	c #EBEBEA",
+"s 	c #F6F7F7",
+"t 	c #F9FAF9",
+"u 	c #F1F0F1",
+"v 	c #C2C2C2",
+"w 	c #B7B8B7",
+"x 	c #F5F5F5",
+"y 	c #E7E8E8",
+"z 	c #E5E5E5",
+"A 	c #E2E2E2",
+"B 	c #EDEDEE",
+"C 	c #DFDFDF",
+"D 	c #B7B7B8",
+"E 	c #BABBBB",
+"F 	c #D9D9D9",
+"G 	c #D8D8D8",
+"H 	c #D7D7D7",
+"I 	c #D7D6D6",
+"J 	c #D6D6D6",
+"K 	c #D5D5D5",
+"L 	c #D4D5D4",
+"M 	c #D4D4D4",
+"N 	c #C7C7C7",
+"O 	c #BDBDBD",
+"P 	c #484847",
+"Q 	c #C1C1C0",
+"R 	c #F1F1F0",
+"S 	c #E3E3E3",
+"T 	c #E0E0E0",
+"U 	c #EBEBEB",
+"V 	c #DEDEDE",
+"W 	c #E8E9E8",
+"X 	c #DCDBDB",
+"Y 	c #EAEBEB",
+"Z 	c #E9E8E9",
+"` 	c #DCDCDB",
+" .	c #E7E7E6",
+"..	c #646464",
+"              . +               ",
+"            . @ . +             ",
+"      # $ . @ % & . * # $ = -   ",
+"    # ; . @ % > , ' . ; ) ! ~ + ",
+"  = ; { @ % ] ^ ' ^ / . ( ) _ : ",
+"< [ } | 1 2 3 4 5 2 1 6 ) ; ~ + ",
+"7 8 9 0 a b c d e 7 f g ; ) _ : ",
+"h i j k l m n e 7 o p q ) ; ~ + ",
+"7 j i l m r s 7 t p u g ; ) _ : ",
+"h v w x y : z s A B C q ) ; ~ + ",
+"7 D E F G H I J K L M g N O P : ",
+"h Q J R S l T U V W X q ) } :   ",
+"7 J : S B T Y V Z `  .g } :     ",
+"h 7 h 7 h 7 h 7 h 7 h ..:       "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-private.xpm
new file mode 100755
index 0000000..4508d79
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-private.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static char * ecb_constructor_private_xpm[] = {
+"16 14 22 1",
+" 	c None",
+".	c #BA0000",
+"+	c #FFFFFF",
+"@	c #FF9090",
+"#	c #F2F2F2",
+"$	c #040404",
+"%	c #FFE9AD",
+"&	c #6B4900",
+"*	c #D5AE46",
+"=	c #E0B74A",
+"-	c #FF2424",
+";	c #D5AF47",
+">	c #E4BD54",
+",	c #D8B350",
+"'	c #E8C25C",
+")	c #050505",
+"!	c #E3BD53",
+"~	c #DCB857",
+"{	c #E0BE5F",
+"]	c #FFD666",
+"^	c #ECC864",
+"/	c #E4C267",
+"                ",
+"          ...+  ",
+"         .@+@.# ",
+"    $#   .+ +.+ ",
+"   $%&#  .....# ",
+"  $%*=&# ..-..+ ",
+" $%;>,'&#.-+-.# ",
+")%*!~'{]&..-..+ ",
+" $]~^{]&#.....# ",
+"  $]/]&# #+#+#+ ",
+"   $]&#         ",
+"    &#          ",
+"    #           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-protected.xpm
new file mode 100755
index 0000000..7ea8281
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-protected.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * ecb_constructor_protected_xpm[] = {
+"16 14 31 1",
+" 	c None",
+".	c #040404",
+"+	c #FFFFFF",
+"@	c #FEE99F",
+"#	c #FEF0B7",
+"$	c #FEDF8B",
+"%	c #8E2E00",
+"&	c #F2F2F2",
+"*	c #FDC760",
+"=	c #FCBD4F",
+"-	c #C04C00",
+";	c #FEFBE5",
+">	c #FFE9AD",
+",	c #6B4900",
+"'	c #000000",
+")	c #FDD378",
+"!	c #B84900",
+"~	c #D5AE46",
+"{	c #E0B74A",
+"]	c #963400",
+"^	c #D5AF47",
+"/	c #E4BD54",
+"(	c #D8B350",
+"_	c #E8C25C",
+":	c #050505",
+"<	c #E3BD53",
+"[	c #DCB857",
+"}	c #E0BE5F",
+"|	c #FFD666",
+"1	c #ECC864",
+"2	c #E4C267",
+"                ",
+"         .....+ ",
+"        .+@#@$%+",
+"    .&  .@*.*=-;",
+"   .>,& '$=*)*!+",
+"  .>~{,&+..=]!+ ",
+" .>^/(_,&+.*!+  ",
+":>~<[_}|,&.=-;  ",
+" .|[1}|,& .*)-+ ",
+"  .|2|,&  .)-;  ",
+"   .|,&    ];   ",
+"    ,&     ;    ",
+"    &           ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-public.xpm
new file mode 100755
index 0000000..798630b
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-public.xpm
@@ -0,0 +1,39 @@
+/* XPM */ 
+static char * ecbconstructorpublic_xpm[] = {
+"16 14 22 1",
+" 	c None",
+"!	c black",
+"#	c #005D00",
+"$	c white",
+"%	c #3CBA00",
+"&	c #F2F2F2",
+"'	c #040404",
+"(	c #FFE9AD",
+")	c #6B4900",
+"*	c #D5AE46",
+"+	c #E0B74A",
+",	c #D5AF47",
+"-	c #E4BD54",
+".	c #D8B350",
+"0	c #E8C25C",
+"1	c #050505",
+"2	c #E3BD53",
+"3	c #DCB857",
+"4	c #E0BE5F",
+"5	c #FFD666",
+"6	c #ECC864",
+"7	c #E4C267",
+"                ",
+"        ###$    ",
+"       #%$%#&   ",
+"    '& #$  #$   ",
+"   '()&$ #####& ",
+"  '(*+)& ##%##$ ",
+" '(,-.0)&#%$%#& ",
+"1(*23045)##%##$ ",
+" '53645)&#####& ",
+"  '575)& &$&$&$ ",
+"   '5)&         ",
+"    )&          ",
+"    &           ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-unknown.xpm
new file mode 100755
index 0000000..c22dfb9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-constructor-unknown.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * ecb_constructor_unknown_xpm[] = {
+"12 14 19 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #FFE9AD",
+"#	c #6B4900",
+"$	c #D5AE46",
+"%	c #E0B74A",
+"&	c #D5AF47",
+"*	c #E4BD54",
+"=	c #D8B350",
+"-	c #E8C25C",
+";	c #A5A5C6",
+">	c #050505",
+",	c #E3BD53",
+"'	c #DCB857",
+")	c #E0BE5F",
+"!	c #FFD666",
+"~	c #ECC864",
+"{	c #E4C267",
+"            ",
+"            ",
+"            ",
+"     .+     ",
+"    .@#+    ",
+"   .@$%#+   ",
+"  .@&*=-#+  ",
+";>@$,'-)!#+ ",
+"  .!'~)!#+  ",
+"   .!{!#+   ",
+"    .!#+    ",
+"     #+     ",
+"     +      ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-private.xpm
new file mode 100755
index 0000000..dfc408c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-private.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * ecb_enumeration_private_xpm[] = {
+"16 14 7 1",
+" 	c None",
+".	c #BA0000",
+"+	c #FFFFFF",
+"@	c #F2F2F2",
+"#	c #FF9090",
+"$	c #0000FF",
+"%	c #FF2424",
+"                ",
+"           ...+ ",
+"+@+       .#+#.+",
+"@$@       .+ @.@",
+"$$+@+@    .....+",
+"@$@$$+    ..%..@",
+"+$+@+$+@+ .%+%.+",
+"@$@+$+$$@@..%..@",
+"+@+$+@+@$+.....+",
+"  @$$$@$@@+@+@+ ",
+"  +@+@+@$@      ",
+"     +$$@+      ",
+"     @+@+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-protected.xpm
new file mode 100755
index 0000000..223aee3
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-protected.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * ecb_enumeration_protected_xpm[] = {
+"16 14 16 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #FFFFFF",
+"#	c #FEE99F",
+"$	c #FEF0B7",
+"%	c #FEDF8B",
+"&	c #8E2E00",
+"*	c #0000FF",
+"=	c #FDC760",
+"-	c #FCBD4F",
+";	c #C04C00",
+">	c #FEFBE5",
+",	c #FDD378",
+"'	c #B84900",
+")	c #963400",
+"                ",
+"         .....+ ",
+"@+@     .@#$#%&@",
+"+*+     .#=.=-;>",
+"**@+@+  .%-=,='@",
+"+*+**@  @..-)'@ ",
+"@*@+@*@+@@.='@  ",
+"+*+@*@**++.-;>  ",
+"@+@*@+@+*@.=,;@ ",
+"  +***+*++.,;>  ",
+"  @+@+@+*+ )>   ",
+"     @**+@ >    ",
+"     +@+@       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-public.xpm
new file mode 100755
index 0000000..02cab0e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-public.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ecb_enumeration_public_xpm[] = {
+"16 14 6 1",
+" 	c None",
+".	c #005D00",
+"+	c #F2F2F2",
+"@	c #FFFFFF",
+"#	c #3CBA00",
+"$	c #0000FF",
+"                ",
+"         ...+   ",
+"@+@     .#@#.+  ",
+"+$+     .@ +.@  ",
+"$$@+@+  @ .....@",
+"+$+$$@    ..#..+",
+"@$@+@$@+@ .#@#.@",
+"+$+@$@$$++..#..+",
+"@+@$@+@+$@.....@",
+"  +$$$+$++@+@+@+",
+"  @+@+@+$+      ",
+"     @$$+@      ",
+"     +@+@       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-unknown.xpm
new file mode 100755
index 0000000..8caa355
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-enum-unknown.xpm
@@ -0,0 +1,22 @@
+/* XPM */ 
+static char * ecbenumunknown_xpm[] = {
+"16 14 5 1",
+" 	c None",
+"!	c black",
+"#	c white",
+"$	c #F2F2F2",
+"%	c #0000FF",
+"                ",
+"                ",
+"#$#             ",
+"$%$             ",
+"%%#$#$          ",
+"$%$%%#          ",
+"#%#$#%#$#       ",
+"$%$#%#%%$$      ",
+"#$#%#$#$%#      ",
+"  $%%%$%$$      ",
+"  #$#$#$%$      ",
+"     #%%$#      ",
+"     $#$#       ",
+"                "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-bucket.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-bucket.xpm
new file mode 100755
index 0000000..45b42a9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-bucket.xpm
@@ -0,0 +1,120 @@
+/* XPM */
+static char * Methods_xpm[] = {
+"16 14 103 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #E5A684",
+"@ 	c #D6AE99",
+"# 	c #DF966D",
+"$ 	c #C16E3E",
+"% 	c #532923",
+"& 	c #E6E6E6",
+"* 	c #CA713E",
+"= 	c #DB8958",
+"- 	c #C98762",
+"; 	c #848484",
+"> 	c #8B8B8B",
+", 	c #616161",
+"' 	c #3B3B3B",
+") 	c #4B251F",
+"! 	c #D1D1D1",
+"~ 	c #C6C6C6",
+"{ 	c #545454",
+"] 	c #6B6A6A",
+"^ 	c #FFFFFF",
+"/ 	c #C16D3C",
+"( 	c #DB8757",
+"_ 	c #D3A389",
+": 	c #717070",
+"< 	c #F2F2F2",
+"[ 	c #5E5E5E",
+"} 	c #5B5B5B",
+"| 	c #626262",
+"1 	c #444444",
+"2 	c #715B4F",
+"3 	c #7B665A",
+"4 	c #736358",
+"5 	c #7E6E65",
+"6 	c #766963",
+"7 	c #80756F",
+"8 	c #544948",
+"9 	c #7B7B7B",
+"0 	c #6F6F6F",
+"a 	c #BCBCBC",
+"b 	c #C6C5C6",
+"c 	c #EFEFEF",
+"d 	c #787978",
+"e 	c #DAB8A5",
+"f 	c #EFCEBC",
+"g 	c #DEC5B8",
+"h 	c #F2DACE",
+"i 	c #96837F",
+"j 	c #FAFAFA",
+"k 	c #6B6B6B",
+"l 	c #696969",
+"m 	c #C5C5C5",
+"n 	c #BBBBBB",
+"o 	c #FBFBFC",
+"p 	c #EEEEED",
+"q 	c #A28D89",
+"r 	c #988480",
+"s 	c #A18B88",
+"t 	c #FAFAF9",
+"u 	c #717171",
+"v 	c #EEEDED",
+"w 	c #F9F9F9",
+"x 	c #E9E9E8",
+"y 	c #FBFBFB",
+"z 	c #E7E7E7",
+"A 	c #F9FAF9",
+"B 	c #F1F0F1",
+"C 	c #C2C2C2",
+"D 	c #B7B8B7",
+"E 	c #F5F5F5",
+"F 	c #E7E8E8",
+"G 	c #E5E5E5",
+"H 	c #EFF0F0",
+"I 	c #E2E2E2",
+"J 	c #ECEDED",
+"K 	c #DFDFDF",
+"L 	c #B7B7B8",
+"M 	c #C0C1C1",
+"N 	c #D6D6D6",
+"O 	c #E0E0E0",
+"P 	c #D4D4D4",
+"Q 	c #DFDEDE",
+"R 	c #D3D3D3",
+"S 	c #DDDDDD",
+"T 	c #D1D2D1",
+"U 	c #DCDCDC",
+"V 	c #C7C7C7",
+"W 	c #BDBDBD",
+"X 	c #484847",
+"Y 	c #C1C1C0",
+"Z 	c #F1F1F0",
+"` 	c #E3E3E3",
+" .	c #EBEBEB",
+"..	c #DEDEDE",
+"+.	c #E8E9E8",
+"@.	c #DCDBDB",
+"#.	c #EDEDEE",
+"$.	c #EAEBEB",
+"%.	c #E9E8E9",
+"&.	c #DCDCDB",
+"*.	c #E7E7E6",
+"=.	c #646464",
+"-.	c #040404",
+"          -.-.-.-.              ",
+"        -.+ @ # $ % &           ",
+"      -.+ @ * $ = - % ; > , '   ",
+"    ; -.@ * $ = - + ) ! ~ { ] ^ ",
+"  , ! -.# / ( - + _ % ~ { ~ : < ",
+"[ } | 1 2 3 4 5 6 7 8 9 ~ ! ] ^ ",
+"0 a b c d e f g h i j k ! ~ : < ",
+"l m n o p q r s i t & u ~ ! ] ^ ",
+"0 n m v w x y z A & B k ! ~ : < ",
+"l C D E F < G H I J K u ~ ! ] ^ ",
+"0 L M N O P Q R S T U k V W X < ",
+"l Y N Z ` v O  ...+.@.u ~ | <   ",
+"0 N < ` #.O $...%.&.*.k | <     ",
+"l 0 l 0 l 0 l 0 l 0 l =.<       "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private-static.xpm
new file mode 100755
index 0000000..9f9aee7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private-static.xpm
@@ -0,0 +1,70 @@
+/* XPM */ 
+static char * ecbfunctionprivatestatic_xpm[] = {
+"16 14 53 1",
+" 	c None",
+"!	c black",
+"#	c #BA0000",
+"$	c #F2F2F2",
+"%	c #474747",
+"&	c #434343",
+"'	c #626C7D",
+"(	c #FF9090",
+")	c white",
+"*	c #F6E8C6",
+"+	c #C27F58",
+",	c #4F2721",
+"-	c #1B0D0B",
+".	c #E0CFB0",
+"0	c #B16238",
+"1	c #040404",
+"2	c #E5A684",
+"3	c #915532",
+"4	c #F7E4C2",
+"5	c #C36D3D",
+"6	c #532923",
+"7	c #FF2424",
+"8	c #E7CBBC",
+"9	c #C07B57",
+":	c #EAD6B7",
+";	c #CE7644",
+"<	c #D48E67",
+"=	c #E2B7A1",
+">	c #CA713E",
+"?	c #B67553",
+"@	c #F7E2C6",
+"A	c #C37344",
+"B	c #DF966D",
+"C	c #CB733F",
+"D	c #995A35",
+"E	c #EAD7C1",
+"F	c #D07C4D",
+"G	c #DEAC90",
+"H	c #DB8958",
+"I	c #F8E5D1",
+"J	c #C6794E",
+"K	c #EEC1AA",
+"L	c #EBDACB",
+"M	c #D18255",
+"N	c #4A2A26",
+"O	c #ECDBCF",
+"P	c #A85D35",
+"Q	c #887371",
+"R	c #EDE0D8",
+"S	c #D58F67",
+"T	c #73605E",
+"U	c #796563",
+"V	c #90807F",
+"                ",
+"          ###$  ",
+"   %&'$  #()(#$ ",
+"   &*+)  #) $#) ",
+"  ,-.0$  #####$ ",
+" 123456$ ##7##) ",
+"1289:;<6$#7)7#$ ",
+"1=>?@A2,)##7##) ",
+"1BCDEFG6$#####$ ",
+"1CH3IJK,)$)$)$) ",
+"$1<DLM,)        ",
+" $6NOP)         ",
+"  $QRS$         ",
+"   TUV)         "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private.xpm
new file mode 100755
index 0000000..ccd4084
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-private.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * ecb_function_private_xpm[] = {
+"16 14 20 1",
+" 	c None",
+".	c #BA0000",
+"+	c #F2F2F2",
+"@	c #FF9090",
+"#	c #FFFFFF",
+"$	c #040404",
+"%	c #E5A684",
+"&	c #E2B7A1",
+"*	c #DF966D",
+"=	c #CB7441",
+"-	c #532923",
+";	c #FF2424",
+">	c #CA713E",
+",	c #DB8958",
+"'	c #D48E67",
+")	c #4F2721",
+"!	c #CB733F",
+"~	c #DB8757",
+"{	c #DEAC90",
+"]	c #EEC1AA",
+"                ",
+"          ...+  ",
+"         .@#@.+ ",
+"         .# +.# ",
+"  $$$$+  .....+ ",
+" $%&*=-+ ..;..# ",
+"$%&>=,'-+.;#;.+ ",
+"$&>=,'%)#..;..# ",
+"$*!~'%{-+.....+ ",
+"$!,'%{])#+#+#+# ",
+"+$'%{])#        ",
+" +-)-)#         ",
+"  +#+#          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected-static.xpm
new file mode 100755
index 0000000..6a7d3b4
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected-static.xpm
@@ -0,0 +1,77 @@
+/* XPM */
+static char * ecb_function_protected_static_xpm[] = {
+"16 14 60 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #474747",
+"#	c #434343",
+"$	c #626C7D",
+"%	c #FFFFFF",
+"&	c #FEE99F",
+"*	c #FEF0B7",
+"=	c #FEDF8B",
+"-	c #8E2E00",
+";	c #F6E8C6",
+">	c #C27F58",
+",	c #FDC760",
+"'	c #FCBD4F",
+")	c #C04C00",
+"!	c #FEFBE5",
+"~	c #4F2721",
+"{	c #1B0D0B",
+"]	c #E0CFB0",
+"^	c #B16238",
+"/	c #FDD378",
+"(	c #B84900",
+"_	c #E5A684",
+":	c #915532",
+"<	c #F7E4C2",
+"[	c #C36D3D",
+"}	c #532923",
+"|	c #963400",
+"1	c #E7CBBC",
+"2	c #C07B57",
+"3	c #EAD6B7",
+"4	c #CE7644",
+"5	c #D48E67",
+"6	c #E2B7A1",
+"7	c #CA713E",
+"8	c #B67553",
+"9	c #F7E2C6",
+"0	c #C37344",
+"a	c #DF966D",
+"b	c #CB733F",
+"c	c #995A35",
+"d	c #EAD7C1",
+"e	c #D07C4D",
+"f	c #DEAC90",
+"g	c #DB8958",
+"h	c #F8E5D1",
+"i	c #C6794E",
+"j	c #EEC1AA",
+"k	c #EBDACB",
+"l	c #D18255",
+"m	c #4A2A26",
+"n	c #ECDBCF",
+"o	c #A85D35",
+"p	c #887371",
+"q	c #EDE0D8",
+"r	c #D58F67",
+"s	c #73605E",
+"t	c #796563",
+"u	c #90807F",
+"                ",
+"         .....+ ",
+"   @#$+ .%&*&=-%",
+"   #;>% .&,.,')!",
+"  ~{]^+ .=',/,(%",
+" ._:<[}++..'|(% ",
+"._12345}+%.,(%  ",
+".67890_~% .')!  ",
+".abcdef}+ .,/)% ",
+".bg:hij~% ./)!  ",
+"+.5ckl~%  +|!   ",
+" +}mno%    !    ",
+"  +pqr+         ",
+"   stu%         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected.xpm
new file mode 100755
index 0000000..e421dc1
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-protected.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * ecb_function_protected_xpm[] = {
+"16 14 28 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #FFFFFF",
+"#	c #FEE99F",
+"$	c #FEF0B7",
+"%	c #FEDF8B",
+"&	c #8E2E00",
+"*	c #FDC760",
+"=	c #FCBD4F",
+"-	c #C04C00",
+";	c #FEFBE5",
+">	c #FDD378",
+",	c #B84900",
+"'	c #E5A684",
+")	c #E2B7A1",
+"!	c #DF966D",
+"~	c #CB7441",
+"{	c #532923",
+"]	c #963400",
+"^	c #CA713E",
+"/	c #DB8958",
+"(	c #D48E67",
+"_	c #4F2721",
+":	c #CB733F",
+"<	c #DB8757",
+"[	c #DEAC90",
+"}	c #EEC1AA",
+"                ",
+"         .....+ ",
+"        .@#$#%&@",
+"        .#*.*=-;",
+"  ....+ .%=*>*,@",
+" .')!~{++..=],@ ",
+".')^~/({+@.*,@  ",
+".)^~/('_@ .=-;  ",
+".!:<('[{+ .*>-@ ",
+".:/('[}_@ .>-;  ",
+"+.('[}_@  +];   ",
+" +{_{_@    ;    ",
+"  +@+@          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public-static.xpm
new file mode 100755
index 0000000..7c9b1c3
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public-static.xpm
@@ -0,0 +1,68 @@
+/* XPM */
+static char * ecb_function_public_static_xpm[] = {
+"16 14 51 1",
+" 	c None",
+".	c #005D00",
+"+	c #F2F2F2",
+"@	c #474747",
+"#	c #434343",
+"$	c #626C7D",
+"%	c #3CBA00",
+"&	c #FFFFFF",
+"*	c #F6E8C6",
+"=	c #C27F58",
+"-	c #4F2721",
+";	c #1B0D0B",
+">	c #E0CFB0",
+",	c #B16238",
+"'	c #040404",
+")	c #E5A684",
+"!	c #915532",
+"~	c #F7E4C2",
+"{	c #C36D3D",
+"]	c #532923",
+"^	c #E7CBBC",
+"/	c #C07B57",
+"(	c #EAD6B7",
+"_	c #CE7644",
+":	c #D48E67",
+"<	c #E2B7A1",
+"[	c #CA713E",
+"}	c #B67553",
+"|	c #F7E2C6",
+"1	c #C37344",
+"2	c #DF966D",
+"3	c #CB733F",
+"4	c #995A35",
+"5	c #EAD7C1",
+"6	c #D07C4D",
+"7	c #DEAC90",
+"8	c #DB8958",
+"9	c #F8E5D1",
+"0	c #C6794E",
+"a	c #EEC1AA",
+"b	c #EBDACB",
+"c	c #D18255",
+"d	c #4A2A26",
+"e	c #ECDBCF",
+"f	c #A85D35",
+"g	c #887371",
+"h	c #EDE0D8",
+"i	c #D58F67",
+"j	c #73605E",
+"k	c #796563",
+"l	c #90807F",
+"                ",
+"        ...+    ",
+"   @#$+.%&%.+   ",
+"   #*=&.& +.&   ",
+"  -;>,+  .....+ ",
+" ')!~{]+ ..%..& ",
+"')^/(_:]+.%&%.+ ",
+"'<[}|1)-&..%..& ",
+"'234567]+.....+ ",
+"'38!90a-&+&+&+& ",
+"+':4bc-&        ",
+" +]def&         ",
+"  +ghi+         ",
+"   jkl&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public.xpm
new file mode 100755
index 0000000..78f3828
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-public.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * ecb_function_public_xpm[] = {
+"16 14 19 1",
+" 	c None",
+".	c #005D00",
+"+	c #F2F2F2",
+"@	c #3CBA00",
+"#	c #FFFFFF",
+"$	c #040404",
+"%	c #E5A684",
+"&	c #E2B7A1",
+"*	c #DF966D",
+"=	c #CB7441",
+"-	c #532923",
+";	c #CA713E",
+">	c #DB8958",
+",	c #D48E67",
+"'	c #4F2721",
+")	c #CB733F",
+"!	c #DB8757",
+"~	c #DEAC90",
+"{	c #EEC1AA",
+"                ",
+"        ...+    ",
+"       .@#@.+   ",
+"       .# +.#   ",
+"  $$$$++ .....+ ",
+" $%&*=-+ ..@..# ",
+"$%&;=>,-+.@#@.+ ",
+"$&;=>,%'#..@..# ",
+"$*)!,%~-+.....+ ",
+"$)>,%~{'#+#+#+# ",
+"+$,%~{'#        ",
+" +-'-'#         ",
+"  +#+#          ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown-static.xpm
new file mode 100755
index 0000000..510b95e
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown-static.xpm
@@ -0,0 +1,67 @@
+/* XPM */
+static char * ecb_function_unknown_static_xpm[] = {
+"12 14 50 1",
+" 	c None",
+".	c #474747",
+"+	c #434343",
+"@	c #626C7D",
+"#	c #F2F2F2",
+"$	c #F6E8C6",
+"%	c #C27F58",
+"&	c #FFFFFF",
+"*	c #4F2721",
+"=	c #1B0D0B",
+"-	c #E0CFB0",
+";	c #B16238",
+">	c #040404",
+",	c #E5A684",
+"'	c #915532",
+")	c #F7E4C2",
+"!	c #C36D3D",
+"~	c #532923",
+"{	c #E7CBBC",
+"]	c #C07B57",
+"^	c #EAD6B7",
+"/	c #CE7644",
+"(	c #D48E67",
+"_	c #A5A5C6",
+":	c #E2B7A1",
+"<	c #CA713E",
+"[	c #B67553",
+"}	c #F7E2C6",
+"|	c #C37344",
+"1	c #DF966D",
+"2	c #CB733F",
+"3	c #995A35",
+"4	c #EAD7C1",
+"5	c #D07C4D",
+"6	c #DEAC90",
+"7	c #DB8958",
+"8	c #F8E5D1",
+"9	c #C6794E",
+"0	c #EEC1AA",
+"a	c #EBDACB",
+"b	c #D18255",
+"c	c #4A2A26",
+"d	c #ECDBCF",
+"e	c #A85D35",
+"f	c #887371",
+"g	c #EDE0D8",
+"h	c #D58F67",
+"i	c #73605E",
+"j	c #796563",
+"k	c #90807F",
+"            ",
+"            ",
+"    .+@#    ",
+"    +$%&    ",
+"   *=-;#    ",
+"  >,')!~#   ",
+" >,{]^/(~#  ",
+"_>:<[}|,*&  ",
+" >123456~#  ",
+" >27'890*&  ",
+" #>(3ab*&   ",
+"  #~cde&    ",
+"   #fgh#    ",
+"    ijk&    "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown.xpm
new file mode 100755
index 0000000..cb9c615
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-function-unknown.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+static char * ecb_function_unknown_xpm[] = {
+"12 14 18 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #E5A684",
+"#	c #E2B7A1",
+"$	c #DF966D",
+"%	c #CB7441",
+"&	c #532923",
+"*	c #CA713E",
+"=	c #DB8958",
+"-	c #D48E67",
+";	c #A5A5C6",
+">	c #4F2721",
+",	c #FFFFFF",
+"'	c #CB733F",
+")	c #DB8757",
+"!	c #DEAC90",
+"~	c #EEC1AA",
+"            ",
+"            ",
+"            ",
+"            ",
+"   ....+    ",
+"  .@#$%&+   ",
+" .@#*%=-&+  ",
+";.#*%=-@>,  ",
+" .$')-@!&+  ",
+" .'=-@!~>,  ",
+" +.-@!~>,   ",
+"  +&>&>,    ",
+"   +,+,     ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-bucket.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-bucket.xpm
new file mode 100755
index 0000000..f5c14ae
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-bucket.xpm
@@ -0,0 +1,205 @@
+/* XPM */
+static char * parents_xpm[] = {
+"16 14 188 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #BCBCBC",
+"@ 	c #BABABA",
+"# 	c #EBEBEB",
+"$ 	c #EBE1CE",
+"% 	c #D1B37B",
+"& 	c #D5B67F",
+"* 	c #CCAB6E",
+"= 	c #E0D6C3",
+"- 	c #C0C0C0",
+"; 	c #555555",
+"> 	c #7E7E7E",
+", 	c #7B7B7B",
+"' 	c #4F4F4F",
+") 	c #9E9E9E",
+"! 	c #F7F4EC",
+"~ 	c #C29542",
+"{ 	c #DEB66E",
+"] 	c #E7C893",
+"^ 	c #DCBA7D",
+"/ 	c #B0842F",
+"( 	c #DCD8D2",
+"_ 	c #DEDEDE",
+": 	c #3F3F3F",
+"< 	c #5C5C5C",
+"[ 	c #818181",
+"} 	c #7F7E7E",
+"| 	c #53403C",
+"1 	c #27211E",
+"2 	c #CFCFCF",
+"3 	c #E1CCA4",
+"4 	c #C38D2A",
+"5 	c #CB973C",
+"6 	c #D79D44",
+"7 	c #DC9839",
+"8 	c #C28829",
+"9 	c #A99875",
+"0 	c #757575",
+"a 	c #424242",
+"b 	c #414141",
+"c 	c #734122",
+"d 	c #AC551F",
+"e 	c #DE7529",
+"f 	c #CC7226",
+"g 	c #99897A",
+"h 	c #E1BD84",
+"i 	c #FEB953",
+"j 	c #FABB55",
+"k 	c #FFBE58",
+"l 	c #FFB953",
+"m 	c #FDB14B",
+"n 	c #A48B61",
+"o 	c #373737",
+"p 	c #343434",
+"q 	c #4D3522",
+"r 	c #EC862D",
+"s 	c #F69131",
+"t 	c #F48F30",
+"u 	c #E8822B",
+"v 	c #926D52",
+"w 	c #DCB57B",
+"x 	c #FFAE48",
+"y 	c #FFB24C",
+"z 	c #FDA640",
+"A 	c #9C8A6A",
+"B 	c #292929",
+"C 	c #242424",
+"D 	c #623517",
+"E 	c #D16B24",
+"F 	c #D77126",
+"G 	c #D67025",
+"H 	c #CC6622",
+"I 	c #876553",
+"J 	c #D7BE95",
+"K 	c #FEA13B",
+"L 	c #FFA43E",
+"M 	c #FFA13B",
+"N 	c #DB8B2B",
+"O 	c #ABA8A2",
+"P 	c #626262",
+"Q 	c #121212",
+"R 	c #3E1E0F",
+"S 	c #B54F1B",
+"T 	c #BA541C",
+"U 	c #B9531C",
+"V 	c #A44114",
+"W 	c #93817C",
+"X 	c #EBEAE1",
+"Y 	c #CE8827",
+"Z 	c #F4942E",
+"` 	c #E78D28",
+" .	c #917244",
+"..	c #E5E5E5",
+"+.	c #444444",
+"@.	c #0D0D10",
+"#.	c #4B1908",
+"$.	c #9D3712",
+"%.	c #993311",
+"&.	c #692926",
+"*.	c #86A18A",
+"=.	c #66B366",
+"-.	c #699957",
+";.	c #BF914A",
+">.	c #C08A38",
+",.	c #758234",
+"'.	c #6A9569",
+").	c #C3CCE5",
+"!.	c #3C5CBA",
+"~.	c #4A3C78",
+"{.	c #7A3F4F",
+"].	c #7A5A7E",
+"^.	c #4264CA",
+"/.	c #376CB1",
+"(.	c #6CC47F",
+"_.	c #7CBD80",
+":.	c #F0F8FF",
+"<.	c #C0DBD2",
+"[.	c #5DB760",
+"}.	c #57BD57",
+"|.	c #7CA97C",
+"1.	c #E8EDF8",
+"2.	c #4765DF",
+"3.	c #6782FD",
+"4.	c #527AE6",
+"5.	c #81B3F2",
+"6.	c #9DD0FF",
+"7.	c #537CE2",
+"8.	c #6078FC",
+"9.	c #4180A5",
+"0.	c #5CB25E",
+"a.	c #E9FBF8",
+"b.	c #5FAF60",
+"c.	c #6FD06F",
+"d.	c #54C354",
+"e.	c #2B972B",
+"f.	c #D2D5D2",
+"g.	c #8BA2DC",
+"h.	c #425BEC",
+"i.	c #5C72FD",
+"j.	c #6A85FD",
+"k.	c #4D77DD",
+"l.	c #A8DAFB",
+"m.	c #466AE3",
+"n.	c #576BFB",
+"o.	c #3068AF",
+"p.	c #45B145",
+"q.	c #5FAA6B",
+"r.	c #59C359",
+"s.	c #53C353",
+"t.	c #3DB83D",
+"u.	c #1D9D1D",
+"v.	c #9AA99A",
+"w.	c #748FD5",
+"x.	c #2B4ED6",
+"y.	c #465EF0",
+"z.	c #586CFC",
+"A.	c #576EF8",
+"B.	c #4070CF",
+"C.	c #475FEE",
+"D.	c #3251D5",
+"E.	c #385B7C",
+"F.	c #4C8B4C",
+"G.	c #2E7B2E",
+"H.	c #378D37",
+"I.	c #328B32",
+"J.	c #2A832A",
+"K.	c #397639",
+"L.	c #C5C6C5",
+"M.	c #D5DBEA",
+"N.	c #556DAD",
+"O.	c #3D59AB",
+"P.	c #4059AD",
+"Q.	c #435BAE",
+"R.	c #465D9F",
+"S.	c #5F709C",
+"T.	c #959AA7",
+"U.	c #DFDFDF",
+"V.	c #F4F4F4",
+"W.	c #E8E8E8",
+"X.	c #DCDCDC",
+"Y.	c #DBDBDB",
+"Z.	c #ECECEC",
+"`.	c #F9F9F9",
+" +	c #F1F1F1",
+".+	c #F0F0F0",
+"++	c #FAFAFA",
+"@+	c #FFFFFF",
+"    . + @ #       $ % & * =     ",
+"  - ; > , ' )   ! ~ { ] ^ / (   ",
+"_ : < [ } | 1 2 3 4 5 6 7 8 9   ",
+"0 a b c d e f g h i j k l m n   ",
+"o p q r s t u v w x y y x z A   ",
+"B C D E F G H I J K L L M N O   ",
+"P Q R S T U V W X Y Z Z `  ...  ",
+"..+.@.#.$.%.&.*.=.-.;.>.,.'.    ",
+"  ).!.~.{.].^./.(._.:.<.[.}.|.  ",
+"1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.",
+"g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.",
+"w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.",
+"M.N.O.P.Q.R.S.T.U.V.W.X.Y.X.Z.  ",
+"  `. +.+.+V.++@+                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-private.xpm
new file mode 100755
index 0000000..523351d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-private.xpm
@@ -0,0 +1,127 @@
+/* XPM */
+static char * ecb_variable_private_xpm[] = {
+"16 14 110 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #BCBCBC",
+"@ 	c #BABABA",
+"# 	c #EBEBEB",
+"$ 	c #C0C0C0",
+"% 	c #555555",
+"& 	c #7E7E7E",
+"* 	c #7B7B7B",
+"= 	c #4F4F4F",
+"- 	c #9E9E9E",
+"; 	c #BA0000",
+"> 	c #F2F2F2",
+", 	c #DEDEDE",
+"' 	c #3F3F3F",
+") 	c #5C5C5C",
+"! 	c #818181",
+"~ 	c #7F7E7E",
+"{ 	c #53403C",
+"] 	c #27211E",
+"^ 	c #CFCFCF",
+"/ 	c #FF9090",
+"( 	c #FFFFFF",
+"_ 	c #757575",
+": 	c #424242",
+"< 	c #414141",
+"[ 	c #734122",
+"} 	c #AC551F",
+"| 	c #DE7529",
+"1 	c #CC7226",
+"2 	c #99897A",
+"3 	c #373737",
+"4 	c #343434",
+"5 	c #4D3522",
+"6 	c #EC862D",
+"7 	c #F69131",
+"8 	c #F48F30",
+"9 	c #E8822B",
+"0 	c #926D52",
+"a 	c #292929",
+"b 	c #242424",
+"c 	c #623517",
+"d 	c #D16B24",
+"e 	c #D77126",
+"f 	c #D67025",
+"g 	c #CC6622",
+"h 	c #876553",
+"i 	c #FF2424",
+"j 	c #626262",
+"k 	c #121212",
+"l 	c #3E1E0F",
+"m 	c #B54F1B",
+"n 	c #BA541C",
+"o 	c #B9531C",
+"p 	c #A44114",
+"q 	c #93817C",
+"r 	c #A5A5C6",
+"s 	c #444444",
+"t 	c #0D0D10",
+"u 	c #4B1908",
+"v 	c #9D3712",
+"w 	c #993311",
+"x 	c #692926",
+"y 	c #C3CCE5",
+"z 	c #3C5CBA",
+"A 	c #4A3C78",
+"B 	c #7A3F4F",
+"C 	c #7A5A7E",
+"D 	c #4264CA",
+"E 	c #376CB1",
+"F 	c #E8EDF8",
+"G 	c #4765DF",
+"H 	c #6782FD",
+"I 	c #527AE6",
+"J 	c #81B3F2",
+"K 	c #9DD0FF",
+"L 	c #537CE2",
+"M 	c #6078FC",
+"N 	c #4180A5",
+"O 	c #8BA2DC",
+"P 	c #425BEC",
+"Q 	c #5C72FD",
+"R 	c #6A85FD",
+"S 	c #4D77DD",
+"T 	c #A8DAFB",
+"U 	c #466AE3",
+"V 	c #576BFB",
+"W 	c #3068AF",
+"X 	c #748FD5",
+"Y 	c #2B4ED6",
+"Z 	c #465EF0",
+"` 	c #586CFC",
+" .	c #576EF8",
+"..	c #4070CF",
+"+.	c #475FEE",
+"@.	c #3251D5",
+"#.	c #385B7C",
+"$.	c #D5DBEA",
+"%.	c #556DAD",
+"&.	c #3D59AB",
+"*.	c #4059AD",
+"=.	c #435BAE",
+"-.	c #465D9F",
+";.	c #5F709C",
+">.	c #959AA7",
+",.	c #DFDFDF",
+"'.	c #F1F1F1",
+").	c #F0F0F0",
+"!.	c #F4F4F4",
+"~.	c #FAFAFA",
+"    . + @ #                     ",
+"  $ % & * = -         ; ; ; >   ",
+", ' ) ! ~ { ] ^     ; / ( / ; > ",
+"_ : < [ } | 1 2     ; (   > ; ( ",
+"3 4 5 6 7 8 9 0     ; ; ; ; ; > ",
+"a b c d e f g h     ; ; i ; ; ( ",
+"j k l m n o p q     ; i ( i ; > ",
+"r s t u v w x ^     ; ; i ; ; ( ",
+"  y z A B C D E     ; ; ; ; ; > ",
+"F G H I J K L M N   > ( > ( > ( ",
+"O P Q R S T U V W               ",
+"X Y Z `  ...+.@.#.              ",
+"$.%.&.*.=.-.;.>.,.              ",
+"    '.).).!.~.                  "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-protected.xpm
new file mode 100755
index 0000000..3cb7a18
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-protected.xpm
@@ -0,0 +1,136 @@
+/* XPM */
+static char * ecb_variable_protected_xpm[] = {
+"16 14 119 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #BCBCBC",
+"@ 	c #BABABA",
+"# 	c #EBEBEB",
+"$ 	c #C0C0C0",
+"% 	c #555555",
+"& 	c #7E7E7E",
+"* 	c #7B7B7B",
+"= 	c #4F4F4F",
+"- 	c #9E9E9E",
+"; 	c #040404",
+"> 	c #F2F2F2",
+", 	c #DEDEDE",
+"' 	c #3F3F3F",
+") 	c #5C5C5C",
+"! 	c #818181",
+"~ 	c #7F7E7E",
+"{ 	c #53403C",
+"] 	c #27211E",
+"^ 	c #CFCFCF",
+"/ 	c #FFFFFF",
+"( 	c #FEE99F",
+"_ 	c #FEF0B7",
+": 	c #FEDF8B",
+"< 	c #8E2E00",
+"[ 	c #757575",
+"} 	c #424242",
+"| 	c #414141",
+"1 	c #734122",
+"2 	c #AC551F",
+"3 	c #DE7529",
+"4 	c #CC7226",
+"5 	c #99897A",
+"6 	c #FDC760",
+"7 	c #FCBD4F",
+"8 	c #C04C00",
+"9 	c #FEFBE5",
+"0 	c #373737",
+"a 	c #343434",
+"b 	c #4D3522",
+"c 	c #EC862D",
+"d 	c #F69131",
+"e 	c #F48F30",
+"f 	c #E8822B",
+"g 	c #926D52",
+"h 	c #FDD378",
+"i 	c #B84900",
+"j 	c #292929",
+"k 	c #242424",
+"l 	c #623517",
+"m 	c #D16B24",
+"n 	c #D77126",
+"o 	c #D67025",
+"p 	c #CC6622",
+"q 	c #876553",
+"r 	c #963400",
+"s 	c #626262",
+"t 	c #121212",
+"u 	c #3E1E0F",
+"v 	c #B54F1B",
+"w 	c #BA541C",
+"x 	c #B9531C",
+"y 	c #A44114",
+"z 	c #93817C",
+"A 	c #A5A5C6",
+"B 	c #444444",
+"C 	c #0D0D10",
+"D 	c #4B1908",
+"E 	c #9D3712",
+"F 	c #993311",
+"G 	c #692926",
+"H 	c #C3CCE5",
+"I 	c #3C5CBA",
+"J 	c #4A3C78",
+"K 	c #7A3F4F",
+"L 	c #7A5A7E",
+"M 	c #4264CA",
+"N 	c #376CB1",
+"O 	c #E8EDF8",
+"P 	c #4765DF",
+"Q 	c #6782FD",
+"R 	c #527AE6",
+"S 	c #81B3F2",
+"T 	c #9DD0FF",
+"U 	c #537CE2",
+"V 	c #6078FC",
+"W 	c #4180A5",
+"X 	c #8BA2DC",
+"Y 	c #425BEC",
+"Z 	c #5C72FD",
+"` 	c #6A85FD",
+" .	c #4D77DD",
+"..	c #A8DAFB",
+"+.	c #466AE3",
+"@.	c #576BFB",
+"#.	c #3068AF",
+"$.	c #748FD5",
+"%.	c #2B4ED6",
+"&.	c #465EF0",
+"*.	c #586CFC",
+"=.	c #576EF8",
+"-.	c #4070CF",
+";.	c #475FEE",
+">.	c #3251D5",
+",.	c #385B7C",
+"'.	c #D5DBEA",
+").	c #556DAD",
+"!.	c #3D59AB",
+"~.	c #4059AD",
+"{.	c #435BAE",
+"].	c #465D9F",
+"^.	c #5F709C",
+"/.	c #959AA7",
+"(.	c #DFDFDF",
+"_.	c #F1F1F1",
+":.	c #F0F0F0",
+"<.	c #F4F4F4",
+"[.	c #FAFAFA",
+"    . + @ #                     ",
+"  $ % & * = -     ; ; ; ; ; >   ",
+", ' ) ! ~ { ] ^ ; / ( _ ( : < / ",
+"[ } | 1 2 3 4 5 ; ( 6 ; 6 7 8 9 ",
+"0 a b c d e f g ; : 7 6 h 6 i / ",
+"j k l m n o p q / ; ; 7 r i /   ",
+"s t u v w x y z   / ; 6 i /     ",
+"A B C D E F G ^     ; 7 8 9     ",
+"  H I J K L M N     ; 6 h 8 /   ",
+"O P Q R S T U V W   ; h 8 9     ",
+"X Y Z `  ...+.@.#.    r 9       ",
+"$.%.&.*.=.-.;.>.,.    9         ",
+"'.).!.~.{.].^./.(.              ",
+"    _.:.:.<.[.                  "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-public.xpm
new file mode 100755
index 0000000..6750c40
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-public.xpm
@@ -0,0 +1,126 @@
+/* XPM */
+static char * ecb_variable_public_xpm[] = {
+"16 14 109 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #BCBCBC",
+"@ 	c #BABABA",
+"# 	c #EBEBEB",
+"$ 	c #C0C0C0",
+"% 	c #555555",
+"& 	c #7E7E7E",
+"* 	c #7B7B7B",
+"= 	c #4F4F4F",
+"- 	c #9E9E9E",
+"; 	c #005D00",
+"> 	c #F2F2F2",
+", 	c #DEDEDE",
+"' 	c #3F3F3F",
+") 	c #5C5C5C",
+"! 	c #818181",
+"~ 	c #7F7E7E",
+"{ 	c #53403C",
+"] 	c #27211E",
+"^ 	c #CFCFCF",
+"/ 	c #3CBA00",
+"( 	c #FFFFFF",
+"_ 	c #757575",
+": 	c #424242",
+"< 	c #414141",
+"[ 	c #734122",
+"} 	c #AC551F",
+"| 	c #DE7529",
+"1 	c #CC7226",
+"2 	c #99897A",
+"3 	c #373737",
+"4 	c #343434",
+"5 	c #4D3522",
+"6 	c #EC862D",
+"7 	c #F69131",
+"8 	c #F48F30",
+"9 	c #E8822B",
+"0 	c #926D52",
+"a 	c #292929",
+"b 	c #242424",
+"c 	c #623517",
+"d 	c #D16B24",
+"e 	c #D77126",
+"f 	c #D67025",
+"g 	c #CC6622",
+"h 	c #876553",
+"i 	c #626262",
+"j 	c #121212",
+"k 	c #3E1E0F",
+"l 	c #B54F1B",
+"m 	c #BA541C",
+"n 	c #B9531C",
+"o 	c #A44114",
+"p 	c #93817C",
+"q 	c #A5A5C6",
+"r 	c #444444",
+"s 	c #0D0D10",
+"t 	c #4B1908",
+"u 	c #9D3712",
+"v 	c #993311",
+"w 	c #692926",
+"x 	c #C3CCE5",
+"y 	c #3C5CBA",
+"z 	c #4A3C78",
+"A 	c #7A3F4F",
+"B 	c #7A5A7E",
+"C 	c #4264CA",
+"D 	c #376CB1",
+"E 	c #E8EDF8",
+"F 	c #4765DF",
+"G 	c #6782FD",
+"H 	c #527AE6",
+"I 	c #81B3F2",
+"J 	c #9DD0FF",
+"K 	c #537CE2",
+"L 	c #6078FC",
+"M 	c #4180A5",
+"N 	c #8BA2DC",
+"O 	c #425BEC",
+"P 	c #5C72FD",
+"Q 	c #6A85FD",
+"R 	c #4D77DD",
+"S 	c #A8DAFB",
+"T 	c #466AE3",
+"U 	c #576BFB",
+"V 	c #3068AF",
+"W 	c #748FD5",
+"X 	c #2B4ED6",
+"Y 	c #465EF0",
+"Z 	c #586CFC",
+"` 	c #576EF8",
+" .	c #4070CF",
+"..	c #475FEE",
+"+.	c #3251D5",
+"@.	c #385B7C",
+"#.	c #D5DBEA",
+"$.	c #556DAD",
+"%.	c #3D59AB",
+"&.	c #4059AD",
+"*.	c #435BAE",
+"=.	c #465D9F",
+"-.	c #5F709C",
+";.	c #959AA7",
+">.	c #DFDFDF",
+",.	c #F1F1F1",
+"'.	c #F0F0F0",
+").	c #F4F4F4",
+"!.	c #FAFAFA",
+"    . + @ #                     ",
+"  $ % & * = -     ; ; ; >       ",
+", ' ) ! ~ { ] ^ ; / ( / ; >     ",
+"_ : < [ } | 1 2 ; (   > ; (     ",
+"3 4 5 6 7 8 9 0     ; ; ; ; ; > ",
+"a b c d e f g h     ; ; / ; ; ( ",
+"i j k l m n o p     ; / ( / ; > ",
+"q r s t u v w ^     ; ; / ; ; ( ",
+"  x y z A B C D     ; ; ; ; ; > ",
+"E F G H I J K L M   > ( > ( > ( ",
+"N O P Q R S T U V               ",
+"W X Y Z `  ...+.@.              ",
+"#.$.%.&.*.=.-.;.>.              ",
+"    ,.'.'.).!.                  "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-unknown.xpm
new file mode 100755
index 0000000..5615ff3
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-parent-unknown.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char * ecb_variable_unknown_xpm[] = {
+"12 14 105 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #BCBCBC",
+"@ 	c #BABABA",
+"# 	c #EBEBEB",
+"$ 	c #C0C0C0",
+"% 	c #555555",
+"& 	c #7E7E7E",
+"* 	c #7B7B7B",
+"= 	c #4F4F4F",
+"- 	c #9E9E9E",
+"; 	c #DEDEDE",
+"> 	c #3F3F3F",
+", 	c #5C5C5C",
+"' 	c #818181",
+") 	c #7F7E7E",
+"! 	c #53403C",
+"~ 	c #27211E",
+"{ 	c #CFCFCF",
+"] 	c #757575",
+"^ 	c #424242",
+"/ 	c #414141",
+"( 	c #734122",
+"_ 	c #AC551F",
+": 	c #DE7529",
+"< 	c #CC7226",
+"[ 	c #99897A",
+"} 	c #373737",
+"| 	c #343434",
+"1 	c #4D3522",
+"2 	c #EC862D",
+"3 	c #F69131",
+"4 	c #F48F30",
+"5 	c #E8822B",
+"6 	c #926D52",
+"7 	c #292929",
+"8 	c #242424",
+"9 	c #623517",
+"0 	c #D16B24",
+"a 	c #D77126",
+"b 	c #D67025",
+"c 	c #CC6622",
+"d 	c #876553",
+"e 	c #626262",
+"f 	c #121212",
+"g 	c #3E1E0F",
+"h 	c #B54F1B",
+"i 	c #BA541C",
+"j 	c #B9531C",
+"k 	c #A44114",
+"l 	c #93817C",
+"m 	c #A5A5C6",
+"n 	c #444444",
+"o 	c #0D0D10",
+"p 	c #4B1908",
+"q 	c #9D3712",
+"r 	c #993311",
+"s 	c #692926",
+"t 	c #C3CCE5",
+"u 	c #3C5CBA",
+"v 	c #4A3C78",
+"w 	c #7A3F4F",
+"x 	c #7A5A7E",
+"y 	c #4264CA",
+"z 	c #376CB1",
+"A 	c #E8EDF8",
+"B 	c #4765DF",
+"C 	c #6782FD",
+"D 	c #527AE6",
+"E 	c #81B3F2",
+"F 	c #9DD0FF",
+"G 	c #537CE2",
+"H 	c #6078FC",
+"I 	c #4180A5",
+"J 	c #8BA2DC",
+"K 	c #425BEC",
+"L 	c #5C72FD",
+"M 	c #6A85FD",
+"N 	c #4D77DD",
+"O 	c #A8DAFB",
+"P 	c #466AE3",
+"Q 	c #576BFB",
+"R 	c #3068AF",
+"S 	c #748FD5",
+"T 	c #2B4ED6",
+"U 	c #465EF0",
+"V 	c #586CFC",
+"W 	c #576EF8",
+"X 	c #4070CF",
+"Y 	c #475FEE",
+"Z 	c #3251D5",
+"` 	c #385B7C",
+" .	c #D5DBEA",
+"..	c #556DAD",
+"+.	c #3D59AB",
+"@.	c #4059AD",
+"#.	c #435BAE",
+"$.	c #465D9F",
+"%.	c #5F709C",
+"&.	c #959AA7",
+"*.	c #DFDFDF",
+"=.	c #F1F1F1",
+"-.	c #F0F0F0",
+";.	c #F4F4F4",
+">.	c #FAFAFA",
+"      . + @ #           ",
+"    $ % & * = -         ",
+"  ; > , ' ) ! ~ {       ",
+"  ] ^ / ( _ : < [       ",
+"  } | 1 2 3 4 5 6       ",
+"  7 8 9 0 a b c d       ",
+"  e f g h i j k l       ",
+"m m n o p q r s {       ",
+"    t u v w x y z       ",
+"  A B C D E F G H I     ",
+"  J K L M N O P Q R     ",
+"  S T U V W X Y Z `     ",
+"   ...+.@.#.$.%.&.*.    ",
+"      =.-.-.;.>.        "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-bucket.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-bucket.xpm
new file mode 100755
index 0000000..acdae43
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-bucket.xpm
@@ -0,0 +1,133 @@
+/* XPM */
+static char * Variables_xpm[] = {
+"16 14 116 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #C2CBDF",
+"@ 	c #8AAAEA",
+"# 	c #83A1DE",
+"$ 	c #6F8FD3",
+"% 	c #FFFFFF",
+"& 	c #B2C5EB",
+"* 	c #5B79BF",
+"= 	c #688AD5",
+"- 	c #6180C3",
+"; 	c #7193DC",
+"> 	c #6B89C9",
+", 	c #4F648E",
+"' 	c #848484",
+") 	c #8B8B8B",
+"! 	c #616161",
+"~ 	c #3B3B3B",
+"{ 	c #A0B1D4",
+"] 	c #6789D6",
+"^ 	c #617FC3",
+"/ 	c #7091DA",
+"( 	c #6988C8",
+"_ 	c #7B9CE2",
+": 	c #475A80",
+"< 	c #D1D1D1",
+"[ 	c #C6C6C6",
+"} 	c #545454",
+"| 	c #6B6A6A",
+"1 	c #617EC3",
+"2 	c #6F91DA",
+"3 	c #6987C7",
+"4 	c #7A9CE1",
+"5 	c #7390CD",
+"6 	c #717070",
+"7 	c #F2F2F2",
+"8 	c #5E5E5E",
+"9 	c #5B5B5B",
+"0 	c #626262",
+"a 	c #444444",
+"b 	c #696D76",
+"c 	c #5F687B",
+"d 	c #5A6273",
+"e 	c #626B7C",
+"f 	c #5D6574",
+"g 	c #656D7E",
+"h 	c #535761",
+"i 	c #4C4C4C",
+"j 	c #6F6F6F",
+"k 	c #BCBCBC",
+"l 	c #C6C5C6",
+"m 	c #737373",
+"n 	c #D5DFF3",
+"o 	c #A7B7D9",
+"p 	c #B6C7EB",
+"q 	c #ACBBDB",
+"r 	c #BACBEE",
+"s 	c #AFBEDC",
+"t 	c #9EA9BF",
+"u 	c #6B6B6B",
+"v 	c #696969",
+"w 	c #C5C5C5",
+"x 	c #BBBBBB",
+"y 	c #787879",
+"z 	c #B2C2DF",
+"A 	c #A0ABC1",
+"B 	c #969FB3",
+"C 	c #9FAAC0",
+"D 	c #949EB2",
+"E 	c #9EA9BE",
+"F 	c #939DB1",
+"G 	c #717171",
+"H 	c #EEEDED",
+"I 	c #F9F9F9",
+"J 	c #EBEBEA",
+"K 	c #F6F7F7",
+"L 	c #E9E9E9",
+"M 	c #F3F4F3",
+"N 	c #E6E6E6",
+"O 	c #F1F0F1",
+"P 	c #C2C2C2",
+"Q 	c #B7B8B7",
+"R 	c #F5F5F5",
+"S 	c #E7E8E8",
+"T 	c #E5E5E5",
+"U 	c #EFF0F0",
+"V 	c #E2E2E2",
+"W 	c #ECEDED",
+"X 	c #DFDFDF",
+"Y 	c #B7B7B8",
+"Z 	c #C0C1C1",
+"` 	c #D6D6D6",
+" .	c #E0E0E0",
+"..	c #D4D4D4",
+"+.	c #DFDEDE",
+"@.	c #D3D3D3",
+"#.	c #DDDDDD",
+"$.	c #D1D2D1",
+"%.	c #DCDCDC",
+"&.	c #C7C7C7",
+"*.	c #BDBDBD",
+"=.	c #484847",
+"-.	c #C1C1C0",
+";.	c #F1F1F0",
+">.	c #E3E3E3",
+",.	c #EBEBEB",
+"'.	c #DEDEDE",
+").	c #E8E9E8",
+"!.	c #DCDBDB",
+"~.	c #EDEDEE",
+"{.	c #EAEBEB",
+"].	c #E9E8E9",
+"^.	c #DCDCDB",
+"/.	c #E7E7E6",
+"(.	c #646464",
+"_.	c #040404",
+"      _._._._._._._._.          ",
+"      _.+ @ # @ # @ $ %         ",
+"      _.& * = - ; > , ' ) ! ~   ",
+"    ' _.{ ] ^ / ( _ : < [ } | % ",
+"  ! < _.& 1 2 3 4 5 , [ } [ 6 7 ",
+"8 9 0 a b c d e f g h i [ < | % ",
+"j k l m n o p q r s t u < [ 6 7 ",
+"v w x y z A B C D E F G [ < | % ",
+"j x w H I J K L M N O u < [ 6 7 ",
+"v P Q R S 7 T U V W X G [ < | % ",
+"j Y Z `  ...+.@.#.$.%.u &.*.=.7 ",
+"v -.` ;.>.H  .,.'.).!.G [ 0 7   ",
+"j ` 7 >.~. .{.'.].^./.u 0 7     ",
+"v j v j v j v j v j v (.7       "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private-static.xpm
new file mode 100755
index 0000000..99d45f7
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private-static.xpm
@@ -0,0 +1,72 @@
+/* XPM */
+static char * ecb_variable_private_static_xpm[] = {
+"16 14 55 1",
+" 	c None",
+".	c #BA0000",
+"+	c #F2F2F2",
+"@	c #474747",
+"#	c #434343",
+"$	c #626C7D",
+"%	c #FF9090",
+"&	c #FFFFFF",
+"*	c #6E7683",
+"=	c #E7EBD8",
+"-	c #8296BD",
+";	c #040404",
+">	c #2D3544",
+",	c #CBCEBD",
+"'	c #5C729A",
+")	c #C2CBDF",
+"!	c #8AAAEA",
+"~	c #57688C",
+"{	c #E1E8DD",
+"]	c #5C7099",
+"^	c #6F8FD3",
+"/	c #FF2424",
+"(	c #B2C5EB",
+"_	c #6080C9",
+":	c #50648B",
+"<	c #D3DAD4",
+"[	c #6176A1",
+"}	c #7190D4",
+"|	c #4F648E",
+"1	c #A9BBDF",
+"2	c #6789D6",
+"3	c #4D6085",
+"4	c #DFE5E2",
+"5	c #7B9CE2",
+"6	c #4B5F87",
+"7	c #6685CD",
+"8	c #53668D",
+"9	c #D4DADA",
+"0	c #7998D8",
+"a	c #6E8FD9",
+"b	c #506287",
+"c	c #DFE7E9",
+"d	c #83A4E6",
+"e	c #6D8CD1",
+"f	c #56698F",
+"g	c #D5DBE1",
+"h	c #809EDC",
+"i	c #83A1DE",
+"j	c #44536D",
+"k	c #DCE2E9",
+"l	c #838B9A",
+"m	c #DEE3E9",
+"n	c #92A8D0",
+"o	c #727E95",
+"p	c #8690A1",
+"                ",
+"          ...+  ",
+"   @#$+  .%&%.+ ",
+"   *=-&  .& +.& ",
+";;;>,';; .....+ ",
+";)!~{]!^&../..& ",
+";(_:<[}|+./&/.+ ",
+";1234]56&../..& ",
+";(789[0|+.....+ ",
+";1abc]d6&+&+&+& ",
+";(efg[h|+       ",
+";i|jk]|6&       ",
+" &+lmn+&+       ",
+"   *op&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private.xpm
new file mode 100755
index 0000000..9289bce
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-private.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * ecb_variable_private_xpm[] = {
+"16 14 39 1",
+" 	c None",
+".	c #BA0000",
+"+	c #F2F2F2",
+"@	c #FF9090",
+"#	c #FFFFFF",
+"$	c #040404",
+"%	c #C2CBDF",
+"&	c #8AAAEA",
+"*	c #83A1DE",
+"=	c #6F8FD3",
+"-	c #FF2424",
+";	c #B2C5EB",
+">	c #6080C9",
+",	c #688AD5",
+"'	c #6687CD",
+")	c #7193DC",
+"!	c #7190D4",
+"~	c #4F648E",
+"{	c #A9BBDF",
+"]	c #6789D6",
+"^	c #6686CD",
+"/	c #7091DA",
+"(	c #7B9CE2",
+"_	c #4B5F87",
+":	c #6685CD",
+"<	c #6F91DA",
+"[	c #6F8ED2",
+"}	c #7A9CE1",
+"|	c #7998D8",
+"1	c #6E8FD9",
+"2	c #6D8DD2",
+"3	c #799AE0",
+"4	c #7897D7",
+"5	c #83A4E6",
+"6	c #6D8CD1",
+"7	c #7899DF",
+"8	c #7896D7",
+"9	c #83A3E6",
+"0	c #809EDC",
+"                ",
+"          ...+  ",
+"         .@#@.+ ",
+"         .# +.# ",
+"$$$$$$$$ .....+ ",
+"$%&*&*&=#..-..# ",
+"$;>,')!~+.-#-.+ ",
+"${]^/=(_#..-..# ",
+"$;:<[}|~+.....+ ",
+"${12345_#+#+#+# ",
+"$;67890~+       ",
+"$*~_~_~_#       ",
+" #+#+#+#+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected-static.xpm
new file mode 100755
index 0000000..c46185d
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected-static.xpm
@@ -0,0 +1,80 @@
+/* XPM */
+static char * ecb_variable_protected_static_xpm[] = {
+"16 14 63 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #474747",
+"#	c #434343",
+"$	c #626C7D",
+"%	c #FFFFFF",
+"&	c #FEE99F",
+"*	c #FEF0B7",
+"=	c #FEDF8B",
+"-	c #8E2E00",
+";	c #6E7683",
+">	c #E7EBD8",
+",	c #8296BD",
+"'	c #FDC760",
+")	c #FCBD4F",
+"!	c #C04C00",
+"~	c #FEFBE5",
+"{	c #2D3544",
+"]	c #CBCEBD",
+"^	c #5C729A",
+"/	c #FDD378",
+"(	c #B84900",
+"_	c #C2CBDF",
+":	c #8AAAEA",
+"<	c #57688C",
+"[	c #E1E8DD",
+"}	c #5C7099",
+"|	c #6F8FD3",
+"1	c #963400",
+"2	c #B2C5EB",
+"3	c #6080C9",
+"4	c #50648B",
+"5	c #D3DAD4",
+"6	c #6176A1",
+"7	c #7190D4",
+"8	c #4F648E",
+"9	c #A9BBDF",
+"0	c #6789D6",
+"a	c #4D6085",
+"b	c #DFE5E2",
+"c	c #7B9CE2",
+"d	c #4B5F87",
+"e	c #6685CD",
+"f	c #53668D",
+"g	c #D4DADA",
+"h	c #7998D8",
+"i	c #6E8FD9",
+"j	c #506287",
+"k	c #DFE7E9",
+"l	c #83A4E6",
+"m	c #6D8CD1",
+"n	c #56698F",
+"o	c #D5DBE1",
+"p	c #809EDC",
+"q	c #83A1DE",
+"r	c #44536D",
+"s	c #DCE2E9",
+"t	c #838B9A",
+"u	c #DEE3E9",
+"v	c #92A8D0",
+"w	c #727E95",
+"x	c #8690A1",
+"                ",
+"         .....+ ",
+"   @#$+ .%&*&=-%",
+"   ;>,% .&'.')!~",
+"...{]^...=)'/'(%",
+"._:<[}:|%..)1(% ",
+".2345678+%.'(%  ",
+".90ab}cd% .)!~  ",
+".2efg6h8+ .'/!% ",
+".9ijk}ld% ./!~  ",
+".2mno6p8+  1~   ",
+".q8rs}8d%  ~    ",
+" %+tuv+%+       ",
+"   ;wx%         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected.xpm
new file mode 100755
index 0000000..c45587a
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-protected.xpm
@@ -0,0 +1,64 @@
+/* XPM */
+static char * ecb_variable_protected_xpm[] = {
+"16 14 47 1",
+" 	c None",
+".	c #040404",
+"+	c #F2F2F2",
+"@	c #FFFFFF",
+"#	c #FEE99F",
+"$	c #FEF0B7",
+"%	c #FEDF8B",
+"&	c #8E2E00",
+"*	c #FDC760",
+"=	c #FCBD4F",
+"-	c #C04C00",
+";	c #FEFBE5",
+">	c #FDD378",
+",	c #B84900",
+"'	c #C2CBDF",
+")	c #8AAAEA",
+"!	c #83A1DE",
+"~	c #6F8FD3",
+"{	c #963400",
+"]	c #B2C5EB",
+"^	c #6080C9",
+"/	c #688AD5",
+"(	c #6687CD",
+"_	c #7193DC",
+":	c #7190D4",
+"<	c #4F648E",
+"[	c #A9BBDF",
+"}	c #6789D6",
+"|	c #6686CD",
+"1	c #7091DA",
+"2	c #7B9CE2",
+"3	c #4B5F87",
+"4	c #6685CD",
+"5	c #6F91DA",
+"6	c #6F8ED2",
+"7	c #7A9CE1",
+"8	c #7998D8",
+"9	c #6E8FD9",
+"0	c #6D8DD2",
+"a	c #799AE0",
+"b	c #7897D7",
+"c	c #83A4E6",
+"d	c #6D8CD1",
+"e	c #7899DF",
+"f	c #7896D7",
+"g	c #83A3E6",
+"h	c #809EDC",
+"                ",
+"         .....+ ",
+"        .@#$#%&@",
+"        .#*.*=-;",
+".........%=*>*,@",
+".')!)!)~@..={,@ ",
+".]^/(_:<+@.*,@  ",
+".[}|1~23@ .=-;  ",
+".]45678<+ .*>-@ ",
+".[90abc3@ .>-;  ",
+".]defgh<+  {;   ",
+".!<3<3<3@  ;    ",
+" @+@+@+@+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public-static.xpm
new file mode 100755
index 0000000..aff5ca2
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public-static.xpm
@@ -0,0 +1,72 @@
+/* XPM */
+static char * ecb_variable_public_static_xpm[] = {
+"16 14 55 1",
+" 	c None",
+".	c #005D00",
+"+	c #F2F2F2",
+"@	c #474747",
+"#	c #434343",
+"$	c #626C7D",
+"%	c #3CBA00",
+"&	c #FFFFFF",
+"*	c #6E7683",
+"=	c #E7EBD8",
+"-	c #8296BD",
+";	c #040404",
+">	c #2D3544",
+",	c #CBCEBD",
+"'	c #5C729A",
+")	c #000000",
+"!	c #C2CBDF",
+"~	c #8AAAEA",
+"{	c #57688C",
+"]	c #E1E8DD",
+"^	c #5C7099",
+"/	c #6F8FD3",
+"(	c #B2C5EB",
+"_	c #6080C9",
+":	c #50648B",
+"<	c #D3DAD4",
+"[	c #6176A1",
+"}	c #7190D4",
+"|	c #4F648E",
+"1	c #A9BBDF",
+"2	c #6789D6",
+"3	c #4D6085",
+"4	c #DFE5E2",
+"5	c #7B9CE2",
+"6	c #4B5F87",
+"7	c #6685CD",
+"8	c #53668D",
+"9	c #D4DADA",
+"0	c #7998D8",
+"a	c #6E8FD9",
+"b	c #506287",
+"c	c #DFE7E9",
+"d	c #83A4E6",
+"e	c #6D8CD1",
+"f	c #56698F",
+"g	c #D5DBE1",
+"h	c #809EDC",
+"i	c #83A1DE",
+"j	c #44536D",
+"k	c #DCE2E9",
+"l	c #838B9A",
+"m	c #DEE3E9",
+"n	c #92A8D0",
+"o	c #727E95",
+"p	c #8690A1",
+"                ",
+"        ...+    ",
+"   @#$+.%&%.+   ",
+"   *=-&.& +.&   ",
+";;;>,';) .....+ ",
+";!~{]^~/&..%..& ",
+";(_:<[}|+.%&%.+ ",
+";1234^56&..%..& ",
+";(789[0|+.....+ ",
+";1abc^d6&+&+&+& ",
+";(efg[h|+       ",
+";i|jk^|6&       ",
+" &+lmn+&+       ",
+"   *op&         "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public.xpm
new file mode 100755
index 0000000..633a047
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-public.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * ecb_variable_public_xpm[] = {
+"16 14 39 1",
+" 	c None",
+".	c #005D00",
+"+	c #F2F2F2",
+"@	c #3CBA00",
+"#	c #FFFFFF",
+"$	c #040404",
+"%	c #000000",
+"&	c #C2CBDF",
+"*	c #8AAAEA",
+"=	c #83A1DE",
+"-	c #6F8FD3",
+";	c #B2C5EB",
+">	c #6080C9",
+",	c #688AD5",
+"'	c #6687CD",
+")	c #7193DC",
+"!	c #7190D4",
+"~	c #4F648E",
+"{	c #A9BBDF",
+"]	c #6789D6",
+"^	c #6686CD",
+"/	c #7091DA",
+"(	c #7B9CE2",
+"_	c #4B5F87",
+":	c #6685CD",
+"<	c #6F91DA",
+"[	c #6F8ED2",
+"}	c #7A9CE1",
+"|	c #7998D8",
+"1	c #6E8FD9",
+"2	c #6D8DD2",
+"3	c #799AE0",
+"4	c #7897D7",
+"5	c #83A4E6",
+"6	c #6D8CD1",
+"7	c #7899DF",
+"8	c #7896D7",
+"9	c #83A3E6",
+"0	c #809EDC",
+"                ",
+"        ...+    ",
+"       .@#@.+   ",
+"       .# +.#   ",
+"$$$$$$$% .....+ ",
+"$&*=*=*-#..@..# ",
+"$;>,')!~+.@#@.+ ",
+"${]^/-(_#..@..# ",
+"$;:<[}|~+.....+ ",
+"${12345_#+#+#+# ",
+"$;67890~+       ",
+"$=~_~_~_#       ",
+" #+#+#+#+       ",
+"                "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown-static.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown-static.xpm
new file mode 100755
index 0000000..f834ec1
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown-static.xpm
@@ -0,0 +1,70 @@
+/* XPM */
+static char * ecb_variable_unknown_static_xpm[] = {
+"12 14 53 1",
+" 	c None",
+".	c #474747",
+"+	c #434343",
+"@	c #626C7D",
+"#	c #F2F2F2",
+"$	c #6E7683",
+"%	c #E7EBD8",
+"&	c #8296BD",
+"*	c #FFFFFF",
+"=	c #040404",
+"-	c #2D3544",
+";	c #CBCEBD",
+">	c #5C729A",
+",	c #C2CBDF",
+"'	c #8AAAEA",
+")	c #57688C",
+"!	c #E1E8DD",
+"~	c #5C7099",
+"{	c #6F8FD3",
+"]	c #B2C5EB",
+"^	c #6080C9",
+"/	c #50648B",
+"(	c #D3DAD4",
+"_	c #6176A1",
+":	c #7190D4",
+"<	c #4F648E",
+"[	c #A5A5C6",
+"}	c #A9BBDF",
+"|	c #6789D6",
+"1	c #4D6085",
+"2	c #DFE5E2",
+"3	c #7B9CE2",
+"4	c #4B5F87",
+"5	c #6685CD",
+"6	c #53668D",
+"7	c #D4DADA",
+"8	c #7998D8",
+"9	c #6E8FD9",
+"0	c #506287",
+"a	c #DFE7E9",
+"b	c #83A4E6",
+"c	c #6D8CD1",
+"d	c #56698F",
+"e	c #D5DBE1",
+"f	c #809EDC",
+"g	c #83A1DE",
+"h	c #44536D",
+"i	c #DCE2E9",
+"j	c #838B9A",
+"k	c #DEE3E9",
+"l	c #92A8D0",
+"m	c #727E95",
+"n	c #8690A1",
+"            ",
+"            ",
+"    .+@#    ",
+"    $%&*    ",
+" ===-;>==   ",
+" =,')!~'{*  ",
+" =]^/(_:<#  ",
+"[=}|12~34*  ",
+" =]567_8<#  ",
+" =}90a~b4*  ",
+" =]cde_f<#  ",
+" =g<hi~<4*  ",
+"  *#jkl#*#  ",
+"    $mn*    "};
diff --git a/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown.xpm b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown.xpm
new file mode 100755
index 0000000..5d84868
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/methods/height-14_to_21/ecb-variable-unknown.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * ecb_variable_unknown_xpm[] = {
+"12 14 37 1",
+" 	c None",
+".	c #040404",
+"+	c #C2CBDF",
+"@	c #8AAAEA",
+"#	c #83A1DE",
+"$	c #6F8FD3",
+"%	c #FFFFFF",
+"&	c #B2C5EB",
+"*	c #6080C9",
+"=	c #688AD5",
+"-	c #6687CD",
+";	c #7193DC",
+">	c #7190D4",
+",	c #4F648E",
+"'	c #F2F2F2",
+")	c #A5A5C6",
+"!	c #A9BBDF",
+"~	c #6789D6",
+"{	c #6686CD",
+"]	c #7091DA",
+"^	c #7B9CE2",
+"/	c #4B5F87",
+"(	c #6685CD",
+"_	c #6F91DA",
+":	c #6F8ED2",
+"<	c #7A9CE1",
+"[	c #7998D8",
+"}	c #6E8FD9",
+"|	c #6D8DD2",
+"1	c #799AE0",
+"2	c #7897D7",
+"3	c #83A4E6",
+"4	c #6D8CD1",
+"5	c #7899DF",
+"6	c #7896D7",
+"7	c #83A3E6",
+"8	c #809EDC",
+"            ",
+"            ",
+"            ",
+"            ",
+" ........   ",
+" .+@#@#@$%  ",
+" .&*=-;>,'  ",
+").!~{]$^/%  ",
+" .&(_:<[,'  ",
+" .!}|123/%  ",
+" .&45678,'  ",
+" .#,/,/,/%  ",
+"  %'%'%'%'  ",
+"            "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-leaf.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-leaf.xpm
new file mode 100755
index 0000000..197c10f
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-leaf.xpm
@@ -0,0 +1,277 @@
+/* XPM */
+static char *leaf[] = {
+/* width height num_colors chars_per_pixel */
+"    16    14      256            2",
+/* colors */
+"`` c #000000",
+"`. c #424242",
+"`# c #848484",
+"`a c #949494",
+"`b c #9c9c9c",
+"`c c #a5a5a5",
+"`d c #adadad",
+"`e c #b5b5b5",
+"`f c #bdbdbd",
+"`g c #c6c6c6",
+"`h c None",
+"`i c #ffffff",
+"`j c #ffffff",
+"`k c #ffffff",
+"`l c #ffffff",
+"`m c #ffffff",
+"`n c #ffffff",
+"`o c #ffffff",
+"`p c #ffffff",
+"`q c #ffffff",
+"`r c #ffffff",
+"`s c #ffffff",
+"`t c #ffffff",
+"`u c #ffffff",
+"`v c #ffffff",
+"`w c #ffffff",
+"`x c #ffffff",
+"`y c #ffffff",
+"`z c #ffffff",
+"`A c #ffffff",
+"`B c #ffffff",
+"`C c #ffffff",
+"`D c #ffffff",
+"`E c #ffffff",
+"`F c #ffffff",
+"`G c #ffffff",
+"`H c #ffffff",
+"`I c #ffffff",
+"`J c #ffffff",
+"`K c #ffffff",
+"`L c #ffffff",
+"`M c #ffffff",
+"`N c #ffffff",
+"`O c #ffffff",
+"`P c #ffffff",
+"`Q c #ffffff",
+"`R c #ffffff",
+"`S c #ffffff",
+"`T c #ffffff",
+"`U c #ffffff",
+"`V c #ffffff",
+"`W c #ffffff",
+"`X c #ffffff",
+"`Y c #ffffff",
+"`Z c #ffffff",
+"`0 c #ffffff",
+"`1 c #ffffff",
+"`2 c #ffffff",
+"`3 c #ffffff",
+"`4 c #ffffff",
+"`5 c #ffffff",
+"`6 c #ffffff",
+"`7 c #ffffff",
+"`8 c #ffffff",
+".` c #ffffff",
+".. c #ffffff",
+".# c #ffffff",
+".a c #ffffff",
+".b c #ffffff",
+".c c #ffffff",
+".d c #ffffff",
+".e c #ffffff",
+".f c #ffffff",
+".g c #ffffff",
+".h c #ffffff",
+".i c #ffffff",
+".j c #ffffff",
+".k c #ffffff",
+".l c #ffffff",
+".m c #ffffff",
+".n c #ffffff",
+".o c #ffffff",
+".p c #ffffff",
+".q c #ffffff",
+".r c #ffffff",
+".s c #ffffff",
+".t c #ffffff",
+".u c #ffffff",
+".v c #ffffff",
+".w c #ffffff",
+".x c #ffffff",
+".y c #ffffff",
+".z c #ffffff",
+".A c #ffffff",
+".B c #ffffff",
+".C c #ffffff",
+".D c #ffffff",
+".E c #ffffff",
+".F c #ffffff",
+".G c #ffffff",
+".H c #ffffff",
+".I c #ffffff",
+".J c #ffffff",
+".K c #ffffff",
+".L c #ffffff",
+".M c #ffffff",
+".N c #ffffff",
+".O c #ffffff",
+".P c #ffffff",
+".Q c #ffffff",
+".R c #ffffff",
+".S c #ffffff",
+".T c #ffffff",
+".U c #ffffff",
+".V c #ffffff",
+".W c #ffffff",
+".X c #ffffff",
+".Y c #ffffff",
+".Z c #ffffff",
+".0 c #ffffff",
+".1 c #ffffff",
+".2 c #ffffff",
+".3 c #ffffff",
+".4 c #ffffff",
+".5 c #ffffff",
+".6 c #ffffff",
+".7 c #ffffff",
+".8 c #ffffff",
+"#` c #ffffff",
+"#. c #ffffff",
+"## c #ffffff",
+"#a c #ffffff",
+"#b c #ffffff",
+"#c c #ffffff",
+"#d c #ffffff",
+"#e c #ffffff",
+"#f c #ffffff",
+"#g c #ffffff",
+"#h c #ffffff",
+"#i c #ffffff",
+"#j c #ffffff",
+"#k c #ffffff",
+"#l c #ffffff",
+"#m c #ffffff",
+"#n c #ffffff",
+"#o c #ffffff",
+"#p c #ffffff",
+"#q c #ffffff",
+"#r c #ffffff",
+"#s c #ffffff",
+"#t c #ffffff",
+"#u c #ffffff",
+"#v c #ffffff",
+"#w c #ffffff",
+"#x c #ffffff",
+"#y c #ffffff",
+"#z c #ffffff",
+"#A c #ffffff",
+"#B c #ffffff",
+"#C c #ffffff",
+"#D c #ffffff",
+"#E c #ffffff",
+"#F c #ffffff",
+"#G c #ffffff",
+"#H c #ffffff",
+"#I c #ffffff",
+"#J c #ffffff",
+"#K c #ffffff",
+"#L c #ffffff",
+"#M c #ffffff",
+"#N c #ffffff",
+"#O c #ffffff",
+"#P c #ffffff",
+"#Q c #ffffff",
+"#R c #ffffff",
+"#S c #ffffff",
+"#T c #ffffff",
+"#U c #ffffff",
+"#V c #ffffff",
+"#W c #ffffff",
+"#X c #ffffff",
+"#Y c #ffffff",
+"#Z c #ffffff",
+"#0 c #ffffff",
+"#1 c #ffffff",
+"#2 c #ffffff",
+"#3 c #ffffff",
+"#4 c #ffffff",
+"#5 c #ffffff",
+"#6 c #ffffff",
+"#7 c #ffffff",
+"#8 c #ffffff",
+"a` c #ffffff",
+"a. c #ffffff",
+"a# c #ffffff",
+"aa c #ffffff",
+"ab c #ffffff",
+"ac c #ffffff",
+"ad c #ffffff",
+"ae c #ffffff",
+"af c #ffffff",
+"ag c #ffffff",
+"ah c #ffffff",
+"ai c #ffffff",
+"aj c #ffffff",
+"ak c #ffffff",
+"al c #ffffff",
+"am c #ffffff",
+"an c #ffffff",
+"ao c #ffffff",
+"ap c #ffffff",
+"aq c #ffffff",
+"ar c #ffffff",
+"as c #ffffff",
+"at c #ffffff",
+"au c #ffffff",
+"av c #ffffff",
+"aw c #ffffff",
+"ax c #ffffff",
+"ay c #ffffff",
+"az c #ffffff",
+"aA c #ffffff",
+"aB c #ffffff",
+"aC c #ffffff",
+"aD c #ffffff",
+"aE c #ffffff",
+"aF c #ffffff",
+"aG c #ffffff",
+"aH c #ffffff",
+"aI c #ffffff",
+"aJ c #ffffff",
+"aK c #ffffff",
+"aL c #ffffff",
+"aM c #ffffff",
+"aN c #ffffff",
+"aO c #ffffff",
+"aP c #ffffff",
+"aQ c #ffffff",
+"aR c #ffffff",
+"aS c #ffffff",
+"aT c #ffffff",
+"aU c #ffffff",
+"aV c #ffffff",
+"aW c #ffffff",
+"aX c #ffffff",
+"aY c #ffffff",
+"aZ c #ffffff",
+"a0 c #ffffff",
+"a1 c #ffffff",
+"a2 c #ffffff",
+"a3 c #ffffff",
+"a4 c #ffffff",
+"a5 c #ffffff",
+"a6 c #ffffff",
+"a7 c #ffffff",
+"a8 c #ffffff",
+/* pixels */
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
+"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
+"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
+"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
+"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
+"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
+"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
+"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
+"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
+"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
+"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
+"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
+"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
+};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-added.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-added.xpm
new file mode 100755
index 0000000..6f91a13
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-added.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_added_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #FE9832",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%**==**     ",
+".#$$***==***    ",
+".$%%*======*    ",
+".$$&*======*    ",
+".$&&***==***    ",
+".....**==**     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-edited.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-edited.xpm
new file mode 100755
index 0000000..d375ff9
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-edited.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_modified_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #FF9933",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%**==**     ",
+".#$$**=**=**    ",
+".$%%*=****=*    ",
+".$$&*=****=*    ",
+".$&&**=**=**    ",
+".....**==**     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-ignored.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-ignored.xpm
new file mode 100755
index 0000000..e8c7ef6
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-ignored.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_ignored_by_cvs_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #B2B2B2",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%******     ",
+".#$$**=**=**    ",
+".$%%***==***    ",
+".$$&***==***    ",
+".$&&**=**=**    ",
+".....******     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-merge.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-merge.xpm
new file mode 100755
index 0000000..1d2bb34
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-merge.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_needs_merge_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #FE3201",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%**==**     ",
+".#$$***==***    ",
+".$%%***==***    ",
+".$$&***==***    ",
+".$&&********    ",
+".....**==**     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-patch.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-patch.xpm
new file mode 100755
index 0000000..de46a9c
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-needs-patch.xpm
@@ -0,0 +1,28 @@
+/* XPM */ 
+static char * ecbvcneedspatch_xpm[] = {
+"16 14 11 1",
+" 	c None",
+"!	c black",
+"#	c #424242",
+"$	c #949494",
+"%	c #9C9C9C",
+"&	c #A5A5A5",
+"'	c #ADADAD",
+"(	c #848484",
+")	c #B5B5B5",
+"*	c #FF9933",
+"+	c white",
+"                ",
+"#######         ",
+"#$$%%&##        ",
+"#$%%&&#'#       ",
+"#%%&&&####      ",
+"#%((($(')#      ",
+"#&&&''****      ",
+"#&($(**++**     ",
+"#&''***++***    ",
+"#'((***++***    ",
+"#'')***++***    ",
+"#'))********    ",
+"#####**++**     ",
+"      ****      "};
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-unknown.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-unknown.xpm
new file mode 100755
index 0000000..0bc4619
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-unknown.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_not_in_cvs_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #0066CC",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%**==**     ",
+".#$$**=**=**    ",
+".$%%*****=**    ",
+".$$&***==***    ",
+".$&&********    ",
+".....**==**     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-up-to-date.xpm b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-up-to-date.xpm
new file mode 100755
index 0000000..ac70bcc
--- /dev/null
+++ b/site/ecb-2.40/ecb-images/sources/height-14_to_21/ecb-vc-up-to-date.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ecb_leaf_in_cvs_xpm[] = {
+"16 14 10 1",
+" 	c None",
+".	c #424242",
+"+	c #949494",
+"@	c #9C9C9C",
+"#	c #A5A5A5",
+"$	c #ADADAD",
+"%	c #848484",
+"&	c #B5B5B5",
+"*	c #009900",
+"=	c #FFFFFF",
+"                ",
+".......         ",
+".++@@#..        ",
+".+@@##.$.       ",
+".@@###....      ",
+".@%%%+%$&.      ",
+".###$$****      ",
+".#%+%******     ",
+".#$$********    ",
+".$%%******=*    ",
+".$$&*=***=**    ",
+".$&&**=*=***    ",
+".....**=***     ",
+"      ****      "};
diff --git a/site/ecb-2.40/ecb-jde.el b/site/ecb-2.40/ecb-jde.el
new file mode 100644
index 0000000..0071cfe
--- /dev/null
+++ b/site/ecb-2.40/ecb-jde.el
@@ -0,0 +1,179 @@
+;;; ecb-jde.el --- ECB JDE integrations
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2003
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-jde.el,v 1.19 2009/05/10 16:41:42 berndl Exp $
+
+;;; Commentary:
+;;
+;;
+;; Contains code for JDEE integrations into ECB or vice versa
+;; JDEE is available at http://jdee.sunsite.dk/
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(silentcomp-defun jde-show-class-source)
+(silentcomp-defvar jde-open-class-at-point-find-file-function)
+(silentcomp-defun jde-open-functions-exist)
+(silentcomp-defun jde-parse-java-variable-at-point)
+(silentcomp-defun jde-open-get-class-to-open)
+(silentcomp-defun jde-open-get-path-prefix-list)
+(silentcomp-defun jde-open-find-java-file-name)
+(silentcomp-defun jde-gen-class-buffer)
+(silentcomp-defvar jde-sourcepath)
+
+(require 'ecb-util)
+(require 'ecb-layout)
+(require 'ecb-file-browser)
+(require 'ecb-method-browser)
+
+
+(defgroup ecb-jde-integration nil
+  "Settings for the JDEE-integration in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-jde-")
+
+
+(defcustom ecb-jde-set-directories-buffer-to-jde-sourcepath nil
+  "*THIS FEATURE IS NOT YET FINISHED"
+  :group 'ecb-jde-integration
+  :type '(radio (const :tag "No" :value nil)
+                (const :tag "Add" :value add)
+                (const :tag "Replace" :value replace)))
+
+(defun ecb-jde-display-class-at-point ()
+  "Displays in the ECB-methods-buffer contents of class under point.
+This means displays the contents \(methods, attributes etc...) of the class
+which contains the definition of the \"thing\" under point \(this can be a
+variablename, classname, methodname, attributename). This function needs the
+same requirements to work as the method-completion feature of JDE \(see
+`jde-complete-at-point')!. The source-file is searched first in
+`jde-sourcepath', then in `jde-global-classpath', then in $CLASSPATH, then in
+current-directory.
+
+Works only for classes where the source-code \(i.e. the *.java-file) is
+available."
+  (interactive)
+  (when (and ecb-minor-mode
+             (ecb-point-in-edit-window-number)
+             (equal major-mode 'jde-mode))
+    (if (jde-open-functions-exist)
+        (let* (
+               (thing-of-interest (ecb-thing-at-point 'symbol))
+               (pair (save-excursion (ecb-end-of-thing 'symbol)
+                                     (jde-parse-java-variable-at-point)))
+               (class-to-open (jde-open-get-class-to-open
+                               pair thing-of-interest))
+               (source-path-prefix-list (jde-open-get-path-prefix-list)) 
+               (java-file-name nil)
+               )
+          (if (and class-to-open (stringp class-to-open))
+              (progn
+                (setq java-file-name (jde-open-find-java-file-name
+                                      class-to-open source-path-prefix-list))
+                (if (not java-file-name)
+                    (ecb-error "Can not find the sourcecode-file for \"%s\""
+                               thing-of-interest)
+
+                  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: 
+                  ;; The following two lines of code are the only difference
+                  ;; between this function and `jde-open-class-at-point'.
+                  ;; Therefore it would be nice if the whole stuff necessary
+                  ;; for finding the source-file of `thing-of-interest' would
+                  ;; be extracted in an own function of JDE.
+                  
+                  ;; we have found the java-sourcefile. So let“s display its
+                  ;; contents in the method-buffer of ECB - we must select the
+                  ;; methods-window before because otherwise our automatically
+                  ;; buffer-sync would resync with current java-source-file.
+                  (if (ecb-window-select ecb-methods-buffer-name)
+                      (ecb-set-selected-source java-file-name nil t))))
+            
+            (ecb-error "Can not parse the thing at point!")))
+      (message "You need JDE >= 2.2.6 and Senator for using this feature!"))))
+
+
+(defun ecb-jde-show-class-source (external-tag)
+  "Calls `jde-show-class-source' for th tag-name of EXTERNAL-TAG.
+Returns t if the tag is found and no error occurs otherwise nil.
+
+This function is for usage with `ecb-find-external-tag-functions'."
+  (when (eq major-mode 'jde-mode)
+    (condition-case nil
+        (progn
+          (jde-show-class-source (ecb--semantic-tag-name external-tag))
+          t)
+      (error nil))))
+
+(defun ecb-jde-gen-class-buffer (dir filename)
+  "Calls `jde-gen-class-buffer' for the file FILENAME in DIR. If this function
+is not available then `find-file' is called."
+  (let ((file (concat dir "/" filename)))
+    (if (fboundp 'jde-gen-class-buffer)
+        (jde-gen-class-buffer file)
+      (find-file file))))
+
+
+(defun ecb-jde-get-source-path ()
+  (mapcar 'jde-normalize-path jde-sourcepath))
+
+(defun ecb-jde-update-ecb-source-paths ()
+  (interactive)
+  (case ecb-jde-set-directories-buffer-to-jde-sourcepath
+    (add
+     (add-hook 'ecb-source-path-functions
+               'ecb-jde-get-source-path))
+    (replace
+     (setq ecb-source-path (ecb-jde-get-source-path)))
+    (otherwise
+     (remove-hook 'ecb-source-path-functions
+                  'ecb-jde-get-source-path)))
+  (ecb-update-directories-buffer))
+
+
+(when (locate-library "efc")
+  (require 'efc)
+  (if (boundp 'efc-dialog-show-before-hook)
+      (add-hook 'efc-dialog-show-before-hook
+                (function (lambda ()
+                            (ecb-toggle-compile-window -1)))))
+  
+  (if (boundp 'efc-dialog-close-after-hook)
+      (add-hook 'efc-dialog-close-after-hook
+                (function (lambda ()
+                            (ecb-toggle-compile-window 1))))))
+
+(silentcomp-provide 'ecb-jde)
+
+;;; ecb-jde.el ends here
diff --git a/site/ecb-2.40/ecb-layout-defs.el b/site/ecb-2.40/ecb-layout-defs.el
new file mode 100644
index 0000000..20db315
--- /dev/null
+++ b/site/ecb-2.40/ecb-layout-defs.el
@@ -0,0 +1,990 @@
+;;; ecb-layout-defs.el --- layout definitions for ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-layout-defs.el,v 1.22 2009/04/15 14:22:35 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains all layout definitions for ECB
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-layout)
+
+;; ========= Current available layouts ===============================
+
+;; Here come all the index layout-functions:
+
+;; Layout left1 -----------------------------------------------------
+
+(ecb-layout-define "left1" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |      |       |                                      |
+   | Sour | Hist  |                 Edit                 |
+   |      |       |                                      |
+   |      |       |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-methods-buffer)
+  (select-window (previous-window))
+  (ecb-split-hor 0.5)
+  (ecb-set-history-buffer)
+  (select-window (next-window (next-window))))
+
+;; Layout left2 -----------------------------------------------------
+
+(ecb-layout-define "left2" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Sources     |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-sources-buffer)
+  (select-window (next-window)))
+
+;; Layout left3 -----------------------------------------------------
+
+(ecb-layout-define "left3" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Sources     |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout left4 -----------------------------------------------------
+
+(ecb-layout-define "left4" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |      |       |                                      |
+   |      |       |                                      |
+   |      |       |                                      |
+   | Sour | Hist  |                                      |
+   |      |       |                                      |
+   |      |       |                                      |
+   |      |       |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-sources-buffer)
+  (ecb-split-hor 0.5)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout left5 -----------------------------------------------------
+
+(ecb-layout-define "left5" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Sources     |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  History     |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout right1 -----------------------------------------------------
+
+(ecb-layout-define "right1" right
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |                                      |              |
+   |                                      |  Directories |
+   |                                      |              |
+   |                                      |              |
+   |                                      |--------------|
+   |                                      |              |
+   |                                      |              |
+   |             Edit                     |  Sources     |
+   |                                      |              |
+   |                                      |              |
+   |                                      |--------------|
+   |                                      |              |
+   |                                      |  Methods     |
+   |                                      |              |
+   |                                      |              |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (let ((edit-win (previous-window (selected-window) 0)))
+    (ecb-set-directories-buffer)
+    (ecb-split-ver 0.3)
+    (ecb-set-sources-buffer)
+    (ecb-split-ver 0.5)
+    (ecb-set-methods-buffer)
+    (select-window edit-win)))
+
+;; Layout right2 -----------------------------------------------------
+
+(ecb-layout-define "right2" right
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |                                      |              |
+   |                                      |              |
+   |                                      |              |
+   |                                      |  Directories |
+   |                                      |              |
+   |                                      |              |
+   |                                      |              |
+   |             Edit                     |--------------|
+   |                                      |              |
+   |                                      |              |
+   |                                      |              |
+   |                                      |  Methods     |
+   |                                      |              |
+   |                                      |              |
+   |                                      |              |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (let ((edit-win (previous-window (selected-window) 0)))
+    (ecb-set-directories-buffer)
+    (ecb-split-ver 0.5)
+    (ecb-set-methods-buffer)
+    (select-window edit-win)))
+
+;; Layout left6 -----------------------------------------------------
+
+(ecb-layout-define "left6" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |  Sources     |                                      | 
+   |--------------|                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                 Edit                 |
+   |              |                                      | 
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |  History     |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.2)
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.75)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout top1 -----------------------------------------------------
+
+(ecb-layout-define "top1" top
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |                        |             |              |
+   |                        |             |              |
+   |      Directories       |  Sources    |  Methods     |
+   |                        |             |              |
+   |                        |             |              |
+   |-----------------------------------------------------|
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                    Edit                             |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-hor 0.5)
+  (ecb-set-sources-buffer)
+  (ecb-split-hor 0.5)
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout left7 -----------------------------------------------------
+
+(ecb-layout-define "left7" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |  History     |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place. This layout works best if it is contained in
+`ecb-show-sources-in-directories-buffer'!"
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.6)
+  (ecb-set-history-buffer)
+  (ecb-split-ver 0.4)
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout left8 -----------------------------------------------------
+
+(ecb-layout-define "left8" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Sources     |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |  History     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.35)
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.65)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout top2 -----------------------------------------------------
+
+(ecb-layout-define "top2" top
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |                                                     |
+   |                                                     |
+   |                    Methods                          |
+   |                                                     |
+   |                                                     |
+   |-----------------------------------------------------|
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                    Edit                             |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout left9 -----------------------------------------------------
+
+(ecb-layout-define "left9" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |   Methods    |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout left10 -----------------------------------------------------
+
+(ecb-layout-define "left10" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |  Sou | Hist  |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then the
+layout contains no persistent compilation window and the other windows get a little
+more place."
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.75)
+  (ecb-set-sources-buffer)
+  (ecb-split-hor 0.5)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout left11 -----------------------------------------------------
+
+(ecb-layout-define "left11" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |    Hist      |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then the
+layout contains no persistent compilation window and the other windows get a little
+more place."
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.75)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout left12 -----------------------------------------------------
+
+(ecb-layout-define "left12" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |   History    |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout left13 -----------------------------------------------------
+
+(ecb-layout-define "left13" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   | Directories  |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place. This layout works best if it is contained in
+`ecb-show-sources-in-directories-buffer'!"
+  (ecb-set-directories-buffer)
+  (select-window (next-window)))
+
+;; Layout left14 -----------------------------------------------------
+
+(ecb-layout-define "left14" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   | Directories  |                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |    Hist      |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place. This layout works best if it is contained in
+`ecb-show-sources-in-directories-buffer'!"
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.75)
+  (ecb-set-history-buffer)
+  (select-window (next-window)))
+
+;; Layout left15 -----------------------------------------------------
+
+(ecb-layout-define "left15" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place. This layout works best if it is contained in
+`ecb-show-sources-in-directories-buffer'!"
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-methods-buffer)
+  (select-window (next-window)))
+
+;; Layout leftright1 -----------------------------------------------------
+
+(ecb-layout-define "leftright1" left-right
+ "This function creates the following layout:
+
+   --------------------------------------------------------------
+   |              |                               |             |
+   |  Directories |                               |  Methods    |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |--------------|             Edit              |             |
+   |              |                               |             |
+   |  Sources     |                               |             |
+   |              |                               |             |
+   |--------------|                               |             |
+   |              |                               |             |
+   |  History     |                               |             |
+   |              |                               |             |
+   --------------------------------------------------------------
+   |                                                            |
+   |                    Compilation                             |
+   |                                                            |
+   --------------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+ (ecb-set-directories-buffer)
+ (ecb-split-ver 0.4)
+ (ecb-set-sources-buffer)
+ (ecb-split-ver 0.5)
+ (ecb-set-history-buffer)
+ (select-window (next-window (next-window)))
+ (ecb-set-methods-buffer)
+ (select-window (previous-window (selected-window) 0)))
+
+;; Layout leftright2 -----------------------------------------------------
+
+(ecb-layout-define "leftright2" left-right
+ "This function creates the following layout:
+
+   --------------------------------------------------------------
+   |              |                               |             |
+   |  Directories |                               |  Methods    |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |--------------|             Edit              |-------------|
+   |              |                               |             |
+   |  Sources     |                               |  History    |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   --------------------------------------------------------------
+   |                                                            |
+   |                    Compilation                             |
+   |                                                            |
+   --------------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+ (ecb-set-directories-buffer)
+ (ecb-split-ver 0.66)
+ (ecb-set-sources-buffer)
+ (select-window (next-window (next-window)))
+ (ecb-set-methods-buffer)
+ (ecb-split-ver 0.66)
+ (ecb-set-history-buffer)
+ (select-window (previous-window (previous-window (selected-window) 0) 0)))
+
+;; Layout leftright3 -----------------------------------------------------
+
+(ecb-layout-define "leftright3" left-right
+  "This function creates the following layout:
+
+   --------------------------------------------------------------
+   |              |                               |             |
+   |  Directories |                               |  Methods    |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |             Edit              |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   --------------------------------------------------------------
+   |                                                            |
+   |                    Compilation                             |
+   |                                                            |
+   --------------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (select-window (next-window (next-window)))
+  (ecb-set-methods-buffer)
+  (select-window (previous-window (selected-window) 0)))
+
+
+(ecb-layout-define "left-dir-plus-speedbar" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Speedbar    |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place. This layout works best if it is contained in
+`ecb-show-sources-in-directories-buffer'!"
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-speedbar-buffer)
+  (select-window (next-window)))
+
+(ecb-layout-define "left-analyse" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Sources     |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Analyse     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.35)
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-analyse-buffer)
+  (select-window (next-window)))
+
+(ecb-layout-define "leftright-analyse" left-right
+  "This function creates the following layout:
+
+   --------------------------------------------------------------
+   |              |                               |             |
+   |  Directories |                               |  Methods    |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |              |                               |             |
+   |--------------|             Edit              |-------------|
+   |              |                               |             |
+   |  Sources     |                               |             |
+   |              |                               |             |
+   |--------------|                               |  Analyse    |
+   |              |                               |             |
+   |  History     |                               |             |
+   |              |                               |             |
+   --------------------------------------------------------------
+   |                                                            |
+   |                    Compilation                             |
+   |                                                            |
+   --------------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.4)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-history-buffer)
+  (select-window (next-window (next-window)))
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-analyse-buffer)
+  (select-window (previous-window (previous-window (selected-window) 0) 0)))
+
+(ecb-layout-define "left-symboldef" left
+  "This function creates the following layout:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Sources     |                                      |
+   |              |                                      |
+   |--------------|                 Edit                 |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  Symbol-defs |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows get a
+little more place."
+  (ecb-set-directories-buffer)
+  (ecb-split-ver 0.3)
+  (ecb-set-sources-buffer)
+  (ecb-split-ver 0.35)
+  (ecb-set-methods-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-symboldef-buffer)
+  (select-window (next-window)))
+
+(defconst ecb-buildin-layouts (ecb-copy-list ecb-available-layouts)
+  "All layouts defined until now.")
+
+(silentcomp-provide 'ecb-layout-defs)
+
+;;; ecb-layout-defs.el ends here
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-layout.el b/site/ecb-2.40/ecb-layout.el
new file mode 100644
index 0000000..929a95d
--- /dev/null
+++ b/site/ecb-2.40/ecb-layout.el
@@ -0,0 +1,5814 @@
+;;; ecb-layout.el --- layout for ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-layout.el,v 1.276 2009/05/16 13:24:19 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains functions for settings the ECB layout.
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+;; This file has been re-implemented by Klaus Berndl <klaus.berndl@sdm.de>.
+;; What has been done:
+;; Completely rewritten the layout mechanism for better customizing, adding
+;; new layouts, better redrawing and more straightforward code.
+;; 1. Now all user-layouting is done by customizing the new option
+;;    `ecb-layout-name' or by the command `ecb-change-layout'. The function
+;;    `ecb-redraw-layout' (formally known as 'ecb-set-layout) can still be
+;;    called interactively. But it just redraws the layout specified in
+;;    `ecb-layout-name'. All changes to the layout must be made by customizing
+;;    this new option. Please read the very detailed comment of
+;;    `ecb-layout-name'!
+;; 2. Adding new layouts is now much easier and more straightforward: We have
+;;    now a main core-layout function (`ecb-redraw-layout-full') which is the
+;;    "environment" for the specific "layout-functions". The core function
+;;    does first some layout independent actions, then calls the
+;;    "layout-function" for the name which has been set in `ecb-layout-name'
+;;    and after that it does some layout independent actions again (see the
+;;    comments in this function). See the macro `ecb-layout-define' and the
+;;    command `ecb-create-new-layout'!
+;;
+;; Background-info: For each layout-type (ecb-windows left, right, top and
+;; left-right) there is one function:
+;; 'ecb-delete-window-ecb-windows-[left|right|top|leftright]'.
+;; These functions follow these guide-lines:
+;; - Preconditions for these functions:
+;;   + the edit-area is splitted - at least in two edit-windows
+;;   + The function gets two arguments: The window to delete (if nil then the
+;;     current window has to be deleted) and the list of all current
+;;     edit-windows.
+;;   + These functions are always(!) called with deactivated advices of
+;;     `delete-window' function.
+;;   + These functions can only use `delete-window' of the set of maybe
+;;     adviced window functions, because of a bug in advice.el only one
+;;     function“s advice can be deactivated within a advice itself!
+;; - What must they do: Doing the appropriate action (e.g.
+;;   `ecb-delete-window-ecb-windows-left' must delete the window. This action
+;;   must be done appropriate for the current ECB-layout type (see
+;;   postconditions)
+;; - Postcondition of these functions:
+;;   + The named edit-window must be deleted and all ecb-windows in the
+;;     ecb-frame must have the layout like before the delete.
+;;   + If the current window has been deleted then point must reside after
+;;     deletion in the next edit-window in a circular meaning (i.e. if the
+;;     last edit-window has been deleted, point must stay afterwards in the
+;;     first edit-window). If a window unequal the current window has been
+;;     deleted point must stay in the window before deletion at the same
+;;     place.
+;;
+;; New adviced intelligent window-functions as replacement for these originals:
+;; - `other-window'
+;; - `delete-window'
+;; - `delete-other-windows'
+;; - `delete-windows-on'
+;; - `split-window-horizontally'
+;; - `split-window-vertically'
+;; - `split-window'
+;; - `display-buffer'
+;; - `switch-to-buffer'
+;; - `switch-to-buffer-other-window'
+;; - `other-window-for-scrolling'
+;; - `balance-windows'
+;; The behavior of the adviced functions is:
+;; - All these function behaves exactly like their corresponding original
+;;   functions but they always act as if the edit-window(s) of ECB would be the
+;;   only window(s) of the ECB-frame. So the edit-window(s) of ECB seems to be
+;;   a normal Emacs-frame to the user.
+;; - If a persistent compile-window is used all buffers for which
+;;   `ecb-compilation-buffer-p' returns not nil are handled in the
+;;   compile-window!
+;;
+;; IMPORTANT: A note for programming Elisp for packages which work during
+;; activated ECB (for ECB itself too :-): ECB offers three macros for easy
+;; temporally (regardless of the settings in `ecb-advice-window-functions'!)
+;; using all original-functions, all adviced functions or only some adviced
+;; functions:
+;; - `ecb-with-original-functions'
+;; - `ecb-with-adviced-functions'
+;; - `ecb-with-some-adviced-functions'
+;;
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-common-browser)
+(require 'ecb-speedbar)
+(require 'ecb-compilation)
+(require 'ecb-create-layout)
+
+;; XEmacs
+(silentcomp-defvar scrollbars-visible-p)
+(silentcomp-defun window-displayed-height)
+(silentcomp-defvar pre-display-buffer-function)
+(silentcomp-defvar split-width-threshold)
+(silentcomp-defvar split-width-threshold)
+(silentcomp-defun popup-menu-and-execute-in-window)
+(silentcomp-defvar modeline-map)
+(silentcomp-defun modeline-menu)
+;; for the display-buffer stuff of XEmacs
+(silentcomp-defun last-nonminibuf-frame)
+(silentcomp-defun check-argument-type)
+(silentcomp-defun buffer-dedicated-frame)
+(silentcomp-defun display-buffer-1)
+(silentcomp-defun frame-property)
+(silentcomp-defun window-leftmost-p)
+(silentcomp-defun window-rightmost-p)
+(silentcomp-defun window-parent)
+(silentcomp-defun window-previous-child)
+(silentcomp-defun window-next-child)
+(silentcomp-defun window-pixel-edges)
+(silentcomp-defun window-pixel-height)
+(silentcomp-defun record-buffer)
+(silentcomp-defun push-window-configuration)
+(silentcomp-defun set-frame-property)
+(silentcomp-defvar temp-buffer-shrink-to-fit)
+
+;; Emacs
+(silentcomp-defvar scroll-bar-mode)
+;; only Emacs 21 has this
+(silentcomp-defvar window-size-fixed)
+;;(silentcomp-defun fit-window-to-buffer)
+(silentcomp-defvar temp-buffer-resize-mode)
+(silentcomp-defun temp-buffer-resize-mode)
+(silentcomp-defun modify-frame-parameters)
+;; Emacs 21
+(silentcomp-defvar grep-window-height)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+(defvar ecb-layouts-reload-needed t)
+(defun ecb-load-layouts ()
+  "Load all defined layouts"
+  (when ecb-layouts-reload-needed
+    (require 'ecb-layout-defs)
+    (if (file-readable-p ecb-create-layout-file)
+        (load-file ecb-create-layout-file))
+    (setq ecb-layouts-reload-needed nil)))
+
+(defgroup ecb-layout nil
+  "Settings for the screen-layout of the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-compilation nil
+  "Settings for the compile window of ECB."
+  :group 'ecb-layout
+  :prefix "ecb-")
+
+
+(defconst ecb-layout-option-set-function
+  (function (lambda (symbol value)
+	      (set symbol value)
+             ;; we must check this because otherwise the layout would be drawn
+	      ;; if we have changed the initial value regardless if ECB is
+	      ;; activated or not.
+	      (when (and (boundp 'ecb-minor-mode)
+                         ecb-minor-mode
+                         (frame-live-p ecb-frame))
+                (let ((curr-frame (selected-frame)))
+                  (unwind-protect
+                      (progn
+                        (select-frame ecb-frame)
+                        (ecb-redraw-layout-full))
+                    (select-frame curr-frame)))))))
+                    
+
+(defcustom ecb-select-edit-window-on-redraw nil
+  "*Select the first edit window on `ecb-redraw-layout'."
+  :group 'ecb-layout
+  :type 'boolean)
+
+(defcustom ecb-new-ecb-frame nil
+  "*Create a new frame at activation time of ECB."
+  :group 'ecb-layout
+  :group 'ecb-most-important
+  :type 'boolean)
+
+(defcustom ecb-activate-before-new-frame-created-hook nil
+  "*Hook run before the new ECB-frame is created.
+This has only an effect if `ecb-new-ecb-frame' is not nil \(otherwise this
+hook is not evaluated)."
+  :group 'ecb-layout
+  :type 'hook)
+
+(defvar ecb-last-selected-layout nil
+  "Name of that layout which was current direct before switching to another
+layout.")
+
+(defcustom ecb-layout-name "left8"
+  "*Select a window layout of ECB.
+Value is any arbitrary string. There are four different types of layouts:
+left, right, top and left-right, which means the location of the
+ECB-tree-windows in the ECB-frame. Currently there are 20 predefined layouts;
+names see below. You can savely try out any of them by changing this value and
+saving it only for the current session. If you are sure which layout you want
+you can save it for future sessions. To get a picture of the layout for name
+<name> call `ecb-show-layout-help'.
+
+Currently available layouts:
+
++ Left layouts:
+  left1 left2 left3 left4 left5 left6 left7 left8 left9 left10 left11 left12
+  left13 left14 left15
+
++ Right layouts:
+  right1
+
++ Top layouts:
+  top1 top2
+
++ Left-right layouts:
+  leftright1 leftright2 leftright3
+
+Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to this
+layout with `ecb-redraw-layout'"
+  :group 'ecb-layout
+  :group 'ecb-most-important
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+                   (ecb-load-layouts)
+                   (if (fboundp (intern (format "ecb-layout-function-%s"
+                                                value)))
+                       (progn
+                         (setq ecb-last-selected-layout ecb-layout-name)
+                         (funcall ecb-layout-option-set-function
+                                  symbol value))
+                     (ecb-error "There is no layout with name %s available!"
+                                value))))
+  :type 'string)
+
+(defun ecb-enable-temp-buffer-shrink-to-fit (arg)
+  "Enables `temp-buffer-resize-mode' \(GNU Emacs) rsp.
+`temp-buffer-shrink-to-fit' \(XEmacs) when a comile-window is used. When the
+compile-window is disabled or when ECB is deactivated then the old state of
+these modes/variables is restored."
+  (if arg
+      (progn
+        ;; store old value if not already done
+        (or (get 'ecb-enable-temp-buffer-shrink-to-fit
+                 'ecb-old-temp-buffer-shrink-to-fit)
+            (put 'ecb-enable-temp-buffer-shrink-to-fit
+                 'ecb-old-temp-buffer-shrink-to-fit
+                 (cons 'stored
+                       (if ecb-running-xemacs
+                           temp-buffer-shrink-to-fit
+                         temp-buffer-resize-mode))))
+        ;; now we activate temp-buffer-shrinking
+        (if ecb-running-xemacs
+            (setq temp-buffer-shrink-to-fit t)
+          (temp-buffer-resize-mode 1))
+        )
+    ;; reset to the original value
+    (and (get 'ecb-enable-temp-buffer-shrink-to-fit
+              'ecb-old-temp-buffer-shrink-to-fit)
+         (if ecb-running-xemacs
+             (setq temp-buffer-shrink-to-fit
+                   (cdr (get 'ecb-enable-temp-buffer-shrink-to-fit
+                             'ecb-old-temp-buffer-shrink-to-fit)))
+           (temp-buffer-resize-mode
+            (if (cdr (get 'ecb-enable-temp-buffer-shrink-to-fit
+                          'ecb-old-temp-buffer-shrink-to-fit))
+                1
+              -1))))
+    (put 'ecb-enable-temp-buffer-shrink-to-fit
+         'ecb-old-temp-buffer-shrink-to-fit
+         nil)))
+
+(defcustom ecb-compile-window-height nil
+  "*Height of the persistent compilation-window of ECB.
+If you want a compilation window shown at the bottom of the ECB-layout
+then set here the height of it \(Default is a height of 5). If you redraw the
+current layout with `ecb-redraw-layout' then the compilation window (if any)
+has the height you set here. If the number is less than 1.0 the height is a
+fraction of the frame height.
+
+If you do not set a persistent compilation window then doing a compilation or
+displaying temp-buffers \(e.g. *Help*-buffers) splits temporally the edit
+window vertically if the edit window is not splitted already or uses another
+edit window temporally for compilation output if the edit window is already
+splitted. This is the recommended value for this option because this is the
+standard-behavior of Emacs.
+
+Beware: If you set a persistent compilation window then ECB displays all buffers
+for which `ecb-compilation-buffer-p' returns not nil in that persistent
+compilation window. If a buffer which should being displayed there is not
+displayed there then try to modify the options `ecb-compilation-buffer-names',
+`ecb-compilation-major-modes' or `ecb-compilation-predicates' \(in this
+sequence).
+
+See also the options `ecb-compile-window-temporally-enlarge' and
+`ecb-enlarged-compilation-window-max-height' and also the command
+`ecb-toggle-compile-window-height'!
+
+ECB offers the functionality of such a persistent compile-window regardless if
+the special ECB-windows are visible or not \(see the command
+`ecb-toggle-ecb-windows').
+
+Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to this
+layout with `ecb-redraw-layout'"
+  :group 'ecb-compilation
+  :group 'ecb-most-important
+  :initialize 'custom-initialize-default
+  ;; we can not use here ' ecb-layout-option-set-function' because here we
+  ;; must call `ecb-redraw-layout-full' with NO-ECB-WINDOWS depending on the
+  ;; value of `ecb-windows-hidden'! Same for `ecb-compile-window-width'. If
+  ;; this is necessary for other options too then we should
+  ;; `ecb-layout-option-set-function' to a function with an additional
+  ;; parameter which decides if ecb-window-hidden should be used for
+  ;; NO-ECB-WINDOWS or not.
+  :set (function (lambda (symbol value)
+                   ;; Emacs < 22 has some bugs concerning `windows-size-fixed'
+                   ;; so we must disable window-fixing.
+                   (and (not ecb-running-version-22) (ecb-set-window-size-fixed nil))
+                   (set symbol value)
+                   ;; we must check this because otherwise the layout would be
+                   ;; drawn if we have changed the initial value regardless if
+                   ;; ECB is activated or not.
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode
+                              (frame-live-p ecb-frame))
+                     (ecb-enable-temp-buffer-shrink-to-fit value)
+                     (let ((curr-frame (selected-frame)))
+                       (unwind-protect
+                           (progn
+                             (select-frame ecb-frame)
+                             (ecb-redraw-layout-full nil nil nil
+                                                     ecb-windows-hidden))
+                         (select-frame curr-frame))))))
+  :type '(radio (const :tag "No compilation window" nil)
+                (number :tag "Window height" :value 6)))
+
+
+
+(defcustom ecb-compile-window-width 'frame
+  "*Width of the compile-window.
+
+Possible values are 'frame and 'edit-window.
+With 'frame the compile-window looks like:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|            edit-window(s)            |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
+
+With 'edit-window the compile-window looks like:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|            edit-window(s)            |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |---------------------------------------
+   |              |                                      |
+   |              |            Compilation               |
+   |              |                                      |
+   -------------------------------------------------------
+
+This option takes only effect if `ecb-compile-window-height' is not nil!"
+  :group 'ecb-compilation
+  :group 'ecb-most-important
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+                   ;; Emacs < 22 has some bugs concerning `windows-size-fixed'
+                   ;; so we must disable window-fixing.
+                   (and (not ecb-running-version-22) (ecb-set-window-size-fixed nil))
+                   (set symbol value)
+                   ;; we must check this because otherwise the layout would be
+                   ;; drawn if we have changed the initial value regardless if
+                   ;; ECB is activated or not.
+                   (when (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode
+                              (frame-live-p ecb-frame))
+                     (let ((curr-frame (selected-frame)))
+                       (unwind-protect
+                           (progn
+                             (select-frame ecb-frame)
+                             (ecb-redraw-layout-full nil nil nil
+                                                     ecb-windows-hidden))
+                         (select-frame curr-frame))))))
+  :type '(radio (const :tag "Width of ECB-frame" :value frame)
+                (const :tag "Width of edit-window" :value edit-window)))
+
+(defcustom ecb-change-layout-preserves-compwin-state t
+  "*Changing the layout preserves the state of the compile-window.
+This is for example useful if the user toggles between several layouts \(see
+`ecb-toggle-layout') and wants to preserve the hidden-state of the
+compile-window."
+  :group 'ecb-compilation
+  :type 'boolean)
+
+(defcustom ecb-compile-window-temporally-enlarge 'after-display
+  "*Let Emacs temporally enlarge the compile-window of the ECB-layout.
+This option has only an effect if `ecb-compile-window-height' is not nil!
+
+The following values are possible:
+- 'after-display: After displaying a \"compilation-buffer\" \(in the sense of
+  `ecb-compilation-buffer-p'!) in the compile-window of ECB. For the max.
+  height of the enlarged compile-window see the option
+  `ecb-enlarged-compilation-window-max-height'.
+
+- 'after-selection: selecting the `ecb-compile-window' auto. enlarges it and
+  de-selecting \(means leaving `ecb-compile-window') auto. shrinks it.
+  Enlarging and shrinking the `ecb-compile-window' is done with
+  `ecb-toggle-compile-window-height'. See also the documentation of this
+  function!
+
+- 'both: The combination of 'after-display and 'after-selection.
+
+- nil: ECB fixes always the height of the `ecb-compile-window' at the value of
+  `ecb-compile-window-height'.
+
+To restore the ECB-layout after such a buffer-enlarge just call
+`ecb-toggle-compile-window-height' or `ecb-redraw-layout'."
+  :group 'ecb-compilation
+  :type '(radio (const :tag "After displaying a buffer in the compile-window"
+                       :value after-display)
+                (const :tag "After selecting the compile window"
+                       :value after-selection)
+                (const :tag "Both of them" :value both)
+                (const :tag "Never" :value nil)))
+
+(defcustom ecb-maximize-ecb-window-after-selection nil
+  "*If not nil maximize current tree-window after selection.
+When selecting another not-tree-window after such an automatic maximizing all
+tree-windows of current layout are displayed again. But a tree-window is not
+maximized if either a node has been selected via primary- oder secondarc
+mouse-button or the popup-menu of that tree-buffer has been opened."
+  :group 'ecb-layout
+  :type 'boolean)
+
+(defcustom ecb-maximize-next-after-maximized-select nil
+  "*Maximizes the next logical tree-window after a maximized node-selection.
+Selecting a node in a maximized tree-window is handled very smart by ECB:
+
+If a tree-buffer-name is not contained in this option then selecting a node in
+this maximized tree-buffer automatically \"minimizes\" that tree-window \(i.e.
+displays all windows of the current layout) so the user can perform the next
+logical step \(e.g. the next logical step after selecting a directory in the
+directories-buffer is to select a source-file - therefore the sources-buffer
+of current layout has to be displayed - if the current layout contains one;
+the next logical step of selecting a source-file is probably to jump to a
+certain tag via the methods-buffer).
+
+If a tree-buffer-name is contained in this option then selecting a node in
+this tree-buffer automatically maximizes the next logical tree-window \(e.g.
+directories --> sources, sources/history --> methods). But if the current
+maximized tree-buffer is also contained in the option
+`ecb-tree-do-not-leave-window-after-select' \(see also the tree-buffer-command
+`ecb-toggle-do-not-leave-window-after-select' which is bound to `C-t' in each
+tree-buffer) then ECB does *not* maximize the next logical tree-window but
+point stays in the currently maximized tree-buffer so for example the user can
+select more than one node \(e.g. more than one source-file from the
+sources-buffer.
+
+The tree-buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended for the
+builtin ECB-tree-buffers because then simply the related option-symbol can be
+used \(e.g. `ecb-directories-buffer-name', `ecb-sources-buffer-name' or
+`ecb-history-buffer-name').
+
+In future versions this option will probably also allow to define the next
+logical tree-buffer for a tree-buffer - currently this is hard-coded as
+follows:
+- directories --next-logical--> sources
+- sources     --next-logical--> methods
+- history     --next-logical--> methods."
+  :group 'ecb-layout
+  :type '(repeat (choice :menu-tag "Buffer-name"
+                         (string :tag "Buffer-name as string")
+                         (symbol :tag "Symbol holding buffer-name"))))
+
+;; A value of never makes no sense because it is not much effort to prevent
+;; all interactive shrinking commands (incl. mouse-commands) from shrinking it
+;; below ecb-compile-window-height and it is also not worth. IMHO preventing
+;; in non-interactive calls and allowing interactively is the best choice.
+;; Allowing always is also possible and easy to implement.
+(defcustom ecb-compile-window-prevent-shrink-below-height t
+  "*Allow the compile-window to be shrunken below its height.
+A non nil value means ECB prevents the compile-window from being shrunken
+below the threshold of `ecb-compile-window-height' by displaying temp-buffers
+\(e.g. *Help* etc.) or after running compilations or greps. But interactively
+it is always allowed to shrink it to every height!
+
+If nil then ECB does nothing to prevent being shrunken below the value of
+`ecb-compile-window-height'.
+
+Default is t."
+  :group 'ecb-compilation
+  :type 'boolean)
+
+
+(defcustom ecb-enlarged-compilation-window-max-height 'best
+  "*The max height of the compile-window after enlarging it.
+The max height of the compilation window after enlarged by
+`ecb-toggle-compile-window-height'. The following values are allowed:
+
+'best:
+
+ECB fits the height of the compile-window exactly to the size of its current
+contents but never shrinks below the value of `ecb-compile-window-height' or
+enlarges over the half of the frame-height of the ECB-frame. The values of the
+options `compilation-window-height' and `temp-buffer-max-height' are taken
+into account dependent of the current `major-mode' of the buffer in the
+compile-window: If `compilation-mode' then `compilation-window-height' is used
+otherwise `temp-buffer-max-height'.
+
+'half:
+
+1/2 the frame-height of the ECB-frame
+
+Any number:
+
+Max height in lines. If the number is less than 1.0 the height is a fraction
+of the frame height \(e.g. 0.33 results in a max-height of 1/3 the
+frame-height)."
+  :group 'ecb-compilation
+  :type '(radio (const :tag "Compute best height"
+                       :value best)
+                (const :tag "1/2 the frame height)"
+                       :value half)
+                (number :tag "Height" :value 0.3)))
+
+(defcustom ecb-scroll-other-window-scrolls-compile-window nil
+  "*`scroll-other-window' scrolls always the compile-window.
+For all details about the scroll-behavior of `scroll-other-window' see the
+advice documentation of `other-window-for-scrolling'."
+  :group 'ecb-compilation
+  :type 'boolean)
+
+(defcustom ecb-ignore-special-display 'compile-window
+  "*Ignore special-display-handling.
+This means, that all values of `special-display-function',
+`special-display-buffer-names' and `special-display-regexps' are ignored
+- only when persistent compile window is used - i.e. if
+  `ecb-compile-window-height' is not nil - this is the default value.
+- always when ECB is active - that means no special-display-handling of
+  buffers when ECB is active
+- never, i.e. special-dislay-handling depends on the values of the options
+  `special-display-function', `special-display-buffer-names' and
+  `special-display-regexps'."
+  :group 'ecb-layout
+  :type '(radio (const :tag "When a persistent compile-window is used"
+                       :value compile-window)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)))
+
+(defsubst ecb-ignore-special-display ()
+  (or (equal ecb-ignore-special-display 'always)
+      (and (equal ecb-ignore-special-display 'compile-window)
+           ecb-compile-window-height)))
+
+(defcustom ecb-ignore-pop-up-frames 'compile-window
+  "*Ignore setting of option `pop-up-frames'.
+This means, that a value of not nil for `pop-up-frames' is ignored
+- only when persistent compile window is used - i.e. if
+  `ecb-compile-window-height' is not nil - this is the default value.
+- always when ECB is active - that means no pop-up-frames when ECB is active
+- never, i.e. pop-up-frames is fully active when set."
+  :group 'ecb-layout
+  :type '(radio (const :tag "When a persistent compile-window is used"
+                       :value compile-window)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)))
+
+(defsubst ecb-ignore-pop-up-frames ()
+  (or (equal ecb-ignore-pop-up-frames 'always)
+      (and (equal ecb-ignore-pop-up-frames 'compile-window)
+           ecb-compile-window-height)))
+
+(defcustom ecb-ignore-display-buffer-function 'always
+  "*Adviced `display-buffer' ignores `display-buffer-function'.
+This means, that the adviced version of `display-buffer' ignores the value of
+`display-buffer-function' when called for the `ecb-frame'. If this variable
+should not be ignored then the function of `display-buffer-function' is
+completely responsible which window is used for the buffer to display - no
+smart ECB-logic will help to deal best with the ECB-window-layout! You can
+define if and when `display-buffer-function' should be ignored:
+- only when persistent compile window is used - i.e. if
+  `ecb-compile-window-height' is not nil
+- always when ECB is active - that means ignore when ECB is active otherwise
+  not - this is the default value
+- never, the adviced version of `display-buffer' always uses the value of
+  `display-buffer-function' if the value is a function."
+  :group 'ecb-layout
+  :type '(radio (const :tag "When a persistent compile-window is used"
+                       :value compile-window)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)))
+
+(defsubst ecb-ignore-display-buffer-function ()
+  (or (equal ecb-ignore-display-buffer-function 'always)
+      (and (equal ecb-ignore-display-buffer-function 'compile-window)
+           ecb-compile-window-height)))
+
+(defcustom ecb-split-edit-window-after-start 'before-deactivation
+  "*Sets how and if the edit window should be splitted after ECB-start.
+But be aware: This option determines only if and how the edit-window should be
+splitted at start-time of ECB. There are five different values allowed for
+this option:
+- nil: Do not split the edit-area of ECB after activation, i.e. there will be
+  only one edit-window after starting ECB.
+- 'horizontal: Split the edit-area in 2 edit-windows side by side.
+- 'vertical: Split the edit-area in 2 edit-windows, one above the other.
+- 'before-activation: Split the edit-area as before the ECB-start, i.e. the
+  edit-area will have after start a window-layout as the whole frame had
+  before the start of ECB.
+- 'before-deactivation: Split the edit-area into a window-layout ECB had in
+  its edit-area direct before the ECB-deactivation. This value preserves the
+  full state between activations of ECB, i.e. the visibility of the
+  ECB-windows, the visibility of a compile-window and also the full
+  split-state of the edit-area. But this can only be done if important
+  layout-options have not been changed in the meanwhile. These are the options
+  `ecb-layout-name', `ecb-compile-window-height', `ecb-compile-window-width',
+  `ecb-windows-width' and `ecb-windows-height'.
+
+Default value is 'before-deactivation.
+
+Some remarks to the value 'before-activation: If this value has been set then
+ECB needs four permanent adivces even when ECB is deactivated: `split-window',
+`delete-window', `delete-other-windows' and `set-window-configuration'. But
+these advices do not change any behavior of these functions but only storing
+in an internal ECB-variable the facts that a window has been splitted or
+deleted etc. In addition to this these advices are 100% error-save, means the
+functionality of the original functions will be performed in every\(!) case
+even if within the advice an error occurs \(but normally there can no errors
+occur in these advices because they are very simple). Conclusion: If you want
+really all ECB-advices being disabled after deactivating ECB then you have to
+set this option to other values then 'before-activation. But setting this
+variable to this value is really completely save."
+  :group 'ecb-layout
+  :type '(radio (const :tag "Split as before ECB-start"
+                       :value before-activation)
+                (const :tag "Split as before last ECB-deactivation"
+                       :value before-deactivation)
+                (const :tag "Split horizontally"
+                       :value horizontal)
+                (const :tag "Split vertically"
+                       :value vertical)
+                (const :tag "Do not split"
+                       :value nil)))
+
+(defcustom ecb-windows-width 0.33
+  "*The width of the ECB windows in columns for left- and right layouts.
+If the number is less than 1.0 the width is a fraction of the frame width."
+  :group 'ecb-layout
+  :initialize 'custom-initialize-default
+  :set ecb-layout-option-set-function
+  :type 'number)
+
+(defcustom ecb-windows-height 0.33
+  "*The height of the ECB windows in lines for top layouts.
+If the number is less than 1.0 the width is a fraction of the frame height."
+  :group 'ecb-layout
+  :initialize 'custom-initialize-default
+  :set ecb-layout-option-set-function
+  :type 'number)
+
+
+(defcustom ecb-fix-window-size nil
+  "*Fix size of the ECB-windows/buffers even after frame-resizing.
+The fix type \(valid values are nil, t, width and height) can either be set on
+a layout-basis \(means a different value for each layout) or one value can be
+set for all layouts. For the latter case there is an additional value 'auto
+which choose autom. the senseful fix-type depending on the current
+layout-type: For top-layouts the fix-type 'height and for all other
+layout-types the fix-type 'width.
+
+For a detailed description of the valid values see documentation of
+`window-size-fixed' which is newly introduced in GNU Emacs 21 and is only
+available there. Therefore this option takes only effect with GNU Emacs >= 21.
+This option has no effect with XEmacs because it does not support the feature
+`window-size-fixed'.
+
+Note1: Manually resizing the ECB-windows via `enlarge-window',
+`shrink-window', `mouse-drag-vertical-line' and `mouse-drag-mode-line' is
+still possible even if the window-sizes are fixed for frame-resizing!
+
+Note2: The description of `window-size-fixed' in the elisp-info-manual is more
+detailed than the description offered by \[C-h v]!
+
+Note3: With Emacs < 22 there seems to be no distinction between 'width,
+'height and t. Therefore this option takes no effect \(means all ecb-windows
+have always unfixed sizes) with Emacs < 22 if `ecb-compile-window-height' is
+not nil.
+
+Per default no window-size fixing has been done."
+  :group 'ecb-directories
+  :initialize 'custom-initialize-default
+  :set (function (lambda (sym value)
+                   (set sym value)
+                   (ecb-set-window-size-fixed
+                    (ecb-get-window-fix-type ecb-layout-name))))
+  :type '(radio (choice :tag "Fix type for all layouts"
+                        :menu-tag "Fix type for all layouts"
+                        (const :tag "Automatic" :value auto)
+                        (const :tag "Fix only width" :value width)
+                        (const :tag "Fix only height" :value height)
+                        (const :tag "Fix both" :value t)
+                        (const :tag "No fixing" :value nil))
+                (repeat :tag "With these layouts"
+                        (cons (string :tag "Layout name")
+                              (choice :tag "Fix type"
+                                      :menu-tag "Fix type for all layouts"
+                                      (const :tag "Fix only width" :value width)
+                                      (const :tag "Fix only height" :value height)
+                                      (const :tag "Fix both" :value t)
+                                      (const :tag "No fixing" :value nil))))))
+
+(defun ecb-get-window-fix-type (layout-name)
+  "Determine which value of `window-size-fixed' we must set in all ecb-buffers
+of layout LAYOUT-NAME."
+  (if (symbolp ecb-fix-window-size)
+      (if (equal ecb-fix-window-size 'auto)
+          (if (equal (ecb-get-layout-type ecb-layout-name) 'top)
+              'height
+            'width)
+        ecb-fix-window-size)
+    (cdr (assoc layout-name ecb-fix-window-size))))
+
+(defun ecb-set-window-size-fixed (fix)
+  "Set the buffer-local value of `window-size-fixed' in each visible
+ecb-window to FIX. For Emacs < 22: If `ecb-compile-window-height' is not nil
+then set always nil!"
+  (unless ecb-running-xemacs
+    (let ((l (ecb-canonical-ecb-windows-list)))
+      (dolist (w l)
+        (save-excursion
+          (set-buffer (window-buffer w))
+          (setq window-size-fixed (if (and (not ecb-running-version-22)
+                                           ecb-compile-window-height)
+                                      nil
+                                    fix)))))))
+
+
+(defmacro ecb-do-with-unfixed-ecb-buffers (&rest body)
+  "Evaluate BODY with unfixed size of all current-visible ecb-buffers and
+ensure that at the end \(either after finishing of BODY or after an error
+occurs during BODY) all now current visible ecb-buffers get the value of their
+buffer-local `window-size-fixed' from the setting in `ecb-fix-window-size'."
+  `(unwind-protect
+       (progn
+         (ecb-set-window-size-fixed nil)
+         ,@body)
+     (ecb-set-window-size-fixed (ecb-get-window-fix-type ecb-layout-name))))
+
+(defmacro ecb-do-with-fixed-ecb-buffers (&rest body)
+  "Evaluate BODY with fixed size of all current-visible ecb-buffers and
+ensure that at the end \(either after finishing of BODY or after an error
+occurs during BODY) all now current visible ecb-buffers get the value of their
+buffer-local `window-size-fixed' from the setting in `ecb-fix-window-size'."
+  `(unwind-protect
+       (progn
+         (ecb-set-window-size-fixed t)
+         ,@body)
+     (ecb-set-window-size-fixed (ecb-get-window-fix-type ecb-layout-name))))
+
+
+
+(defcustom ecb-other-window-behavior 'smart
+  "*The behavior of ECB concerning getting an \"other window\".
+
+The following settings are possible:
+
+'all:
+
+ECB will cycle through all windows of the ECB-frame or scroll simply
+the next window in the ECB-frame, means it behaves like the original
+`other-window' rsp. the original `other-window-for-scrolling'.
+
+'only-edit:
+
+ECB will only cycle through the edit-windows of ECB or only
+scroll another edit-window. If the selected window is not an edit-window
+then it behaves like with value 'all.
+
+'edit-and-compile:
+
+Like 'only-edit plus the compile window if any. If the
+selected window is neither an edit-window nor the compile-window then it
+behaves like with value 'all.
+
+'smart:
+
+With this setting ECB tries to choose the `other-window'-destination or the
+\"other window\" to scroll in a smart and intuitive way: If point is in one of
+the edit-windows and if the edit-area is splitted then always the \"next\"
+edit-window is choosen \(whereas the next edit-window of the last edit-window
+is the first edit-window)- if the edit-area is unsplitted then the
+compile-window is used if there is one. In the context of an
+`other-window'-call the ARG of `other-window' will be taken into account.
+
+If one of the special ecb-windows is selected then always the \"next\"
+ecb-window is choosen \(whereas the next ecb-window of the last ecb-window is
+the first ecb-window). In the context of an `other-window'-call the ARG of
+`other-window' will be taken into account. If there is only one ecb-window
+then ECB considers also the edit-windows!
+
+If the compile-window is selected then always the last selected edit-window
+will be used unless `other-window' has been called with a prefix-argument
+unequal 1.
+
+If there is an active minibuffer:
+
+Regardless of the allowed values above ECB handles the situation of an active
+minibuffer during a call to `other-window' or `scroll-other-window' like
+follows:
+
+If the minibuffer-window is selected then ECB always chooses the window
+`minibuffer-scroll-window' points to \(when this variable is set, otherwise
+the compile-window or the last selected edit-window is choosen) when the
+called command is called to choose the 1. next window \(always true for
+scrolling another window or true when `other-window' called without prefix-arg
+or with prefix-arg equal 1). Otherwise the window ARG steps away is choosen
+\(in case of `other-window).
+
+If there is an active minibuffer but the minibuffer-window is not selected
+then `other-window' and `scroll-other-window' behave like the original
+version.
+
+In addition to the allowed values above the value of this option can also be a
+function:
+
+This function gets seven arguments:
+1. A canonical list of all currently visible windows of the `ecb-frame'
+2. A canonical list of all currently visible edit-windows
+3. A canonical list of all currently visible ecb-windows
+4. The window-object of the compile-window if there is any.
+5. The minibuffer-window of the ECB-frame if there is an active minibuffer.
+5. The result of the function `ecb-where-is-point' - see the documentation
+   of this function for details.
+6. An integer which indicates how many steps away from the current selected
+   window the \"other-window\ is. Is nil when this function is called in
+   another context then for `other-window'.
+The function has to return a window-object which is then used as \"other
+window\" for the command `other-window' or for scrolling another window
+\(e.g. with `scroll-other-window').
+
+This function has to handle all properly situations for itself.
+`ecb-get-other-window-smart' is an example for such a function."
+  :group 'ecb-layout
+  :group 'ecb-most-important
+  :type '(radio (const :tag "Smart" :value smart)
+                (const :tag "All windows" all)
+                (const :tag "Only edit windows" only-edit)
+                (const :tag "Edit + compile window" edit-and-compile)
+                (function :tag "User defined" :value ignore)))
+
+
+(defcustom ecb-advice-window-functions-signal-error nil
+  "*Signal an error if an adviced function can not do its job.
+If not nil then an error is signaled if one of the adviced functions can not
+do its job. So for example if the user tries to split the compile-window or an
+ecb-tree-window or if one tries to switch to another buffer in one of the
+ecb-tree-windows. For details see the documentation of each of the adviced
+functions to get info when an error is signaled.
+
+If this option is nil then no error is signaled but the called adviced
+function does simply nothing.
+
+Default is nil but it can also be useful to signal errors - so you see when
+call a function in a situation which is not supported by this function."
+  :group 'ecb-layout
+  :type 'boolean)
+
+(defcustom ecb-layout-always-operate-in-edit-window
+  '(switch-to-buffer)
+  "*Adviced window functions work always in the edit-window.
+If we are in an ECB special buffer (methods, directories, etc), and any of the
+adviced windowing functions is called interactively, we will select first an
+edit-window according to the value of `ecb-mouse-click-destination'. This is
+useful if you have any functions that use such functions and you don't want
+them to fail with an error complaining that the current buffer can not be
+split, or something similar.
+
+Because this may not be desirable in all situations and for all adviced
+functions this can be enabled separately for function where it is senseful. If
+the symbol of an adviced function is contained in the value of this option,
+then the edit-window is first selected otherwise either an error is reported
+or some other special reaction (depends on
+`ecb-advice-window-functions-signal-error'); see the documentation of the
+adviced functions for this.
+
+Per default this is only enabled for `switch-to-buffer'."
+  :group 'ecb-layout
+  :type '(set (const :tag "delete-window"
+                     :value delete-window)
+              (const :tag "delete-other-windows"
+                     :value delete-other-windows)
+              (const :tag "split-window-horizontally"
+                     :value split-window-horizontally)
+              (const :tag "split-window-vertically"
+                     :value split-window-vertically)
+              (const :tag "split-window"
+                     :value split-window)
+              (const :tag "display-buffer"
+                     :value display-buffer)
+              (const :tag "switch-to-buffer"
+                     :value switch-to-buffer)))
+
+(defun ecb-canonical-ecb-windows-list (&optional winlist)
+  "Return a list of all visible ECB-windows.
+
+Such a window must be dedicated to its ecb-buffer and for the related buffer
+a dedicator-function must be defined with `defecb-window-dedicator' so this
+dedicator is registered for that ecb-buffer.
+The list starts from the left-most top-most window in the order `other-window'
+would walk through these windows."
+  (let ((windows-list (or winlist (ecb-canonical-windows-list)))
+        (registered-ecb-buffers (ecb-dedicated-special-buffers))
+        )
+    (delete nil (mapcar (function (lambda (elem)
+                                    (if (and (not (memq elem
+                                                        ecb-layout-temporary-dedicated-windows))
+                                             (window-dedicated-p elem)
+                                             (memq (window-buffer elem) registered-ecb-buffers)
+                                             )
+                                        elem)))
+                        windows-list))))
+
+(defun ecb-canonical-edit-windows-list (&optional winlist)
+  "Return a list of all current edit-windows \(starting from the left-most
+top-most window) in the order `other-window' would walk through these windows.
+These are all windows in the `ecb-frame' which are not identical to the
+compile-window and not identical to one of the visible ECB-windows."
+  (let ((comp-win-state (ecb-compile-window-state))
+        (windows-list (or winlist (ecb-canonical-windows-list))))
+    (delete nil (mapcar (function (lambda (elem)
+                                    (if (and (or (member elem
+                                                         ecb-layout-temporary-dedicated-windows)
+                                                 (not (window-dedicated-p elem)))
+                                             (or (not (equal comp-win-state 'visible))
+                                                 (not (equal elem ecb-compile-window))))
+                                        elem)))
+                        windows-list))))
+
+(defcustom ecb-layout-window-sizes nil
+  "*Specifies the sizes of the ECB windows for each layout.
+The easiest way \(and also the strongly recommended way) to change this
+variable is to change the window sizes by dragging the window borders using
+the mouse and then store the window sizes by calling the command
+`ecb-store-window-sizes'. Next time the layout is redrawn the values stored in
+this option will be used.
+
+If `ecb-store-window-sizes' is used then the windows sizes are stored per
+default as fractions of current frame-width and -height of the ecb-frame, so
+the stored values will \"work\" for other frame sizes too. But if you call
+`ecb-store-window-sizes' with a prefix-argument then the fixed values of
+current width and height are stored!
+
+If this option is set \"by hand\" \(i.e. not by `ecb-store-window-sizes') then
+the following is important:
+- It is recommended to use fractions of frame-width and -height!.
+- The order of the sequence of the inserted window sizes must be the same as
+  `other-window' \(the not-adviced version!) would walk!"
+  :group 'ecb-layout
+  :initialize 'custom-initialize-default
+  :set ecb-layout-option-set-function
+  :type '(repeat (cons :tag "Window layout"
+                       (string :tag "Layout name")
+                       (repeat :tag "Window sizes"
+                               (cons (choice :tag "Width"
+                                             :menu-tag "Width"
+                                             :value 0.0
+                                             (const :tag "Default value"
+                                                    :value nil)
+                                             (number :tag "Custom size"))
+                                     (choice :tag "Height"
+                                             :menu-tag "Height"
+                                             (const :tag "Default value"
+                                                    :value nil)
+                                             (number :tag "Custom size")))))))
+
+(defcustom ecb-redraw-layout-quickly nil
+  "If non-nil, we will attempt to redraw the layout quickly.
+Please read also carefully the documentation of `ecb-redraw-layout'."
+  :type 'boolean
+  :group 'ecb-layout)
+
+(defcustom ecb-major-modes-show-or-hide (cons nil nil)
+  "*List of major-modes which show or hide the ecb-windows.
+The value is a cons-cell where the car contains all major-mode-symbols which
+should show the special ecb-windows and the cdr contains all
+major-mode-symbols which should hide the special ecb-windows. If the symbol of
+a major-mode is neither contained in the car-\"show-list\" nor in the
+cdr-\"hide-list\" then the visibility-state of the ecb-windows does not
+change."
+  :group 'ecb-layout
+  :group 'ecb-most-important
+  :type '(cons (repeat :tag "Modes for visible ecb-windows"
+                       (symbol :tag "Major-mode"))
+               (repeat :tag "Modes for invisible ecb-windows"
+                       (symbol :tag "Major-mode"))))
+
+(defcustom ecb-toggle-layout-sequence '("left9" "left14")
+  "*Toggle sequence for layout toggling with `ecb-toggle-layout'.
+Every element of this list has to be a valid layout-name \(a string) i.e.
+either one of the predefined layouts or one of the user-defined layouts \(see
+`ecb-create-new-layout').
+
+You can add here as many layouts as you want but to use this option most
+effective you should not add more than 2 or 3 layouts so every layout can be
+accessed very fast by toggling with `ecb-toggle-layout'. It is also senseful
+to add layouts which have the same principal outline, i.e. all their
+tree-buffers are on the same side of the frame and the
+tree-buffer-\"column\" \(or -\"row\") has identical size for the layouts.
+
+Recommended values are for example:
+- \(\"left10\" \"left15\"), toggles between methods and directories/history
+- \(\"left10\" \"left13\"), toggles between methods and directories
+- \(\"left10\" \"left14\"), toggles between methods and history
+- \(\"left10\" \"left13\" \"left14\"), toggles between methods, history and
+  directories
+
+See also option `ecb-show-sources-in-directories-buffer'.
+
+This option makes only sense if the value is a list with more than 1 element!"
+  :group 'ecb-layout
+  :type '(repeat (string :tag "Layout name."))
+  :initialize 'custom-initialize-default
+  :set (function (lambda (symbol value)
+                   (ecb-load-layouts)
+                   (dolist (name value)
+                     (if (and (boundp 'ecb-minor-mode)
+                              ecb-minor-mode
+                              (not (fboundp (intern
+                                             (format "ecb-layout-function-%s"
+                                                     name)))))
+                         (ecb-error "There is no layout available with name %s!"
+                                    name)))
+                   (set symbol value))))
+
+(defcustom ecb-hide-ecb-windows-before-hook nil
+  "*Hook run direct before the ECB windows will be hidden.
+Hiding is done either by `ecb-toggle-ecb-windows' or `ecb-hide-ecb-windows'.
+This means that at runtime of this hook all the ECB-tree-windows of current
+layout are visible.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+`ecb-redraw-layout' and therefore also the hooks
+`ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+evaluated. The hook-sequence is analogous to that described in
+`ecb-show-ecb-windows-before-hook'."
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-hide-ecb-windows-after-hook nil
+  "*Hooks run direct after the ECB windows have been hidden.
+Hiding was done either by `ecb-toggle-ecb-windows' or `ecb-hide-ecb-windows'.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+`ecb-redraw-layout' and therefore also the hooks
+`ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+evaluated. The hook-sequence is analogous to that described in
+`ecb-show-ecb-windows-after-hook'."
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-show-ecb-windows-before-hook nil
+  "*Hooks run direct before the ECB windows will be shown.
+Showing is done either by `ecb-toggle-ecb-windows' or `ecb-show-ecb-windows'.
+This means that at runtime of this hook the ECB-windows are still hidden.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+`ecb-redraw-layout' and therefore also the hooks
+`ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+evaluated. So there is the following sequence of hooks during the process of
+showing the hidden ECB-windows:
+1. `ecb-show-ecb-windows-before-hook'
+2. `ecb-redraw-layout-before-hook'
+3. <redrawing the layout to show the hidden ECB-windows>
+4. `ecb-redraw-layout-after-hook'
+5. `ecb-show-ecb-windows-after-hook'
+So be aware which code you add to which hook!"
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-show-ecb-windows-after-hook nil
+  "*Hooks run direct before the ECB windows will be shown.
+Showing has been done either by `ecb-toggle-ecb-windows' or
+`ecb-show-ecb-windows'. This means that at runtime of this hook the
+ECB-windows are already visible.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+`ecb-redraw-layout' and therefore also the hooks
+`ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+evaluated. So there is the following sequence of hooks during the process of
+showing the hidden ECB-windows:
+1. `ecb-show-ecb-windows-before-hook'
+2. `ecb-redraw-layout-before-hook'
+3. <redrawing the layout to show the hidden ECB-windows>
+4. `ecb-redraw-layout-after-hook'
+5. `ecb-show-ecb-windows-after-hook'
+So be aware which code you add to which hook!"
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-redraw-layout-after-hook '(ecb-eshell-recenter)
+  "*Hooks run direct after the ECB-layout has been redrawn.
+If you use the eshell-integration of ECB then the function
+`ecb-eshell-recenter' should be in this hook."
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-redraw-layout-before-hook nil
+  "*Hooks run direct before the ECB-layout will be redrawn."
+  :group 'ecb-layout
+  :type 'hook)
+
+(defcustom ecb-layout-debug-mode nil
+  "*Write debug-information about layout-operations in the Messages-buffer.
+Normally there should be no need to set this option to true but if there are
+problems to display buffers in the compile-window of ECB \(e.g. buffers which
+should be displayed there aren't or the temporally enlarging-mechanism does
+not do what you think it should do etc...) then please do the following steps:
+1. Set `ecb-layout-debug-mode' to not nil
+2. Reproduce the wrong behavior exactly by repeating all the operations which
+   lead to the problem.
+3. Now send immediately a bug report with `ecb-submit-problem-report'.
+4. Set `ecb-layout-debug-mode' back to nil if you do not want further
+   debugging output in the *Messages* buffer"
+  :group 'ecb-layout
+  :type 'boolean)
+
+
+;; ====== internal variables ====================================
+
+(defvar ecb-frame nil
+  "Frame where ECB runs. This frame is only set if this variable is nil or the
+value points to a dead frame. Deactivation and activation of ECB does not set
+this variable to nil!")
+
+(defvar ecb-edit-window nil
+  "Only used internally by `ecb-redraw-layout-full'. Do not refer to this
+variable because the value is not predictable!")
+
+(defvar ecb-last-edit-window-with-point nil
+  "The edit-window of ECB which had the point before an emacs-command is
+done.")
+
+(defvar ecb-last-source-buffer nil
+  "The source-buffer of `ecb-last-edit-window-with-point'.")
+
+(defvar ecb-last-compile-buffer-in-compile-window nil
+  "The buffer in the compile-window before an emacs-command is done.")
+
+(defvar ecb-compile-window nil
+  "Window to display compile-output in.")
+
+;; We need this absolute # of lines of the compile-window-height because if it
+;; is specified by a fraction of the frame (e.g. 0.1) we need this information
+;; at all places where the compile-window will be shrunken back to its
+;; specified height and computing the height from the value of
+;; `ecb-compile-window-height' will often be unequal to that height drawn by
+;; `ecb-redraw-layout-full' ==> we store and use the height drawn by this
+;; function.
+(defvar ecb-compile-window-height-lines nil
+  "Contains always the absolute number of lines \(incl. modeline) of the
+compile-window direct after a full redraw. Only set by
+`ecb-redraw-layout-full' and evaluated and used by *all* mechanisms of ECB
+which shrink back the compile-window to its specified height without doing a
+full redraw!!")
+
+(defvar ecb-compile-window-was-selected-before-command nil
+  "Not nil only if the `ecb-compile-window' was selected before most recent
+command.")
+
+(defvar ecb-layout-default-window-sizes nil
+  "Contains the the sizes of the ecb-windows of the current layout exactly as
+drawn by the layout-function \(see `ecb-redraw-layout-full').")
+
+(defvar ecb-windows-hidden nil
+  "Used with `ecb-toggle-ecb-windows'. If true the ECB windows are hidden. Do
+not change this variable!")
+
+(defvar ecb-special-ecb-buffers-of-current-layout nil
+  "The list of special ecb-buffers of current-layout.")
+
+(defvar ecb-ecb-buffer-name-selected-before-command nil
+  "Not nil only if a special ecb-window was selected before most recent
+command. If not nil it contains the buffer-name of this special ecb-buffer.")
+
+(defvar ecb-layout-prevent-handle-ecb-window-selection nil
+  "If not nil ECB will ignore in the post-command-hook auto. maximizing.")
+
+
+(defvar ecb-last-major-mode nil)
+
+(defecb-autocontrol/sync-function ecb-handle-major-mode-visibilty nil nil nil
+  "Added to `post-command-hook' after loading the ecb-library. Handles the
+value `ecb-major-modes-show-or-hide'. Because this hook of `post-command-hook'
+does nothing if the major-mode has not changed there should be no
+performance-problem!"
+  ;; Klaus: I think we need this to prevent doing here (de)activation
+  ;; immediately after the button-pressed event (which is a command) because
+  ;; then a mysterious window-live-p error for the minibuffer-window occurs if
+  ;; we click onto a file which deactivates ECB.
+  ;; With this the (de)activation is first done after the button-released
+  ;; event which is created by Emacs for every tree-buffer click and is bound
+  ;; to a nop.
+  ;; At least this is my current interpretation and it works :-)
+  ;; TODO: detecting the real reason why this happens and fixing it.
+  (if (and ecb-item-in-tree-buffer-selected
+           (equal ecb-tree-mouse-action-trigger 'button-press))
+      (setq ecb-item-in-tree-buffer-selected nil)
+    ;; do nothing if major-mode has not been changed or if a minibuffer is
+    ;; active or if now one of the ecb-buffers is active
+    (when (and (not (> (minibuffer-depth) 0))
+               (not (equal ecb-last-major-mode major-mode))
+               (not (member (current-buffer)
+                            (ecb-get-current-visible-ecb-buffers))))
+      (let ((last-mode ecb-last-major-mode))
+        (setq ecb-last-major-mode major-mode)
+        (ignore-errors
+          (cond ((member major-mode (car ecb-major-modes-show-or-hide))
+                 (let ((edit-win-list (ecb-canonical-edit-windows-list)))
+                   ;; the window must not be splitted or if splitted the last
+                   ;; major-mode must be dired-mode
+                   (when (or (not (ecb-edit-window-splitted edit-win-list))
+                             (equal last-mode 'dired-mode))
+                     (and (ecb-point-in-edit-window-number edit-win-list)
+                          ecb-windows-hidden
+                          (ecb-show-ecb-windows)))))
+                ((member major-mode (cdr ecb-major-modes-show-or-hide))
+                 (let ((edit-win-list (ecb-canonical-edit-windows-list)))
+                   ;; the window must not be splitted or if splitted the last
+                   ;; major-mode must be dired-mode
+                   (when (or (not (ecb-edit-window-splitted edit-win-list))
+                             (equal last-mode 'dired-mode))
+                     (and (ecb-point-in-edit-window-number edit-win-list)
+                          (not ecb-windows-hidden)
+                          (ecb-hide-ecb-windows))))))))))
+  )
+
+(defun ecb-initialize-layout ()
+  ;; We do not initialize the `ecb-frame'!
+  (setq ecb-edit-window nil
+        ecb-last-edit-window-with-point nil
+        ecb-last-source-buffer nil
+        ecb-last-compile-buffer-in-compile-window nil
+        ecb-current-maximized-ecb-buffer-name nil
+        ecb-cycle-ecb-buffer-state nil
+        ecb-special-ecb-buffers-of-current-layout nil
+        ecb-windows-hidden nil
+        ecb-compile-window nil
+        ecb-layout-prevent-handle-compile-window-selection nil
+        ecb-layout-prevent-handle-ecb-window-selection nil
+        ecb-ecb-buffer-name-selected-before-command nil
+        ecb-compile-window-was-selected-before-command nil
+        ecb-compile-window-height-lines nil)
+  (ecb-window-config-cache-clear))
+
+(defun ecb-layout-debug-error (&rest args)
+  "Run ARGS through `format' and write it to the *Messages*-buffer."
+  (when ecb-layout-debug-mode
+    (message (concat (format "ECB %s layout debug [%s] " ecb-version
+                             (format-time-string "%H:%M:%S"))
+                     (apply 'format args)))))
+
+
+(defun ecb-compile-window-live-p (&optional display-msg)
+  "Return not nil when a compile-window is live and visible.
+If optional arg DISPLAY-MSG is not nil then an informational message for the
+user is displayed in the echo-area if no compile-window is visible."
+  (if (and ecb-compile-window-height
+           ecb-compile-window
+           (window-live-p ecb-compile-window))
+      t
+    (if display-msg
+        (message "No compile-window visible in current ECB-layout!"))
+    nil))
+
+(defun ecb-get-compile-window-buffer ()
+  "Return the buffer currently displayed in the compile-window or nil if there
+is no compile-window displayed."
+  (if (ecb-compile-window-live-p)
+      (window-buffer ecb-compile-window)))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: This function is only there for
+;; backward compatibility and is not needed for ECB-versions > 2.11
+(defun ecb-edit-window-live-p ()
+  "At least one edit-window is always alive."
+  t)
+
+(defun ecb-window-live-p (buffer-name)
+  "Return not nil if buffer BUFFER-NAME is displayed in an active window."
+  (and buffer-name (window-live-p (get-buffer-window buffer-name))))
+
+;; ====== basic advices ======================================================
+
+(defecb-advice-set ecb-layout-basic-adviced-functions
+  "All functions  needed to be adviced for the layout-engine of ECB.")
+
+(defecb-advice delete-frame around ecb-layout-basic-adviced-functions
+  "If FRAME is equal to the ECB frame then the user will be asked if he want
+to proceed. If yes then ECB will be deactivated before deleting FRAME. If ECB
+is not activated or FRAME is not equal the ECB-frame then this advice is
+either not activated or it behaves exactly like the original version!"
+  (let ((frame (or (ad-get-arg 0) (selected-frame))))
+    (if (and ecb-minor-mode
+             (equal frame ecb-frame))
+        (when (ecb-confirm "Attempt to delete the ECB-frame. ECB will be deactivated! Proceed? ")
+	  (ecb-deactivate-internal) ;; deletes also the ecb-frame if not the only frame
+	  ad-do-it)
+      ad-do-it)))
+
+(require 'compile)
+
+;; GNU Emacs 21.4 has has a new variable `grep-window-height'. Cause of the
+;; smart mechanism of the new compile-library of Emacs 21.4 which sets autom.
+;; for all compilation-* variables local values in the derived modes (like
+;; `grep-mode) according to the value of the equivalent variable in the
+;; derived mode (e.g. if `grep-window-height' has a special value in
+;; `grep-mode' then the new macro `define-compilation-mode' sets the local
+;; value of `compilation-window-height' to the value of `grep-window-height').
+;; we have not to deal with special variables like `grep-window-height' (see
+;; `define-compilation-mode') in the functions `compilation-set-window-height'
+;; and `ecb-toggle-compile-window-height'!
+(defecb-advice compilation-set-window-height around ecb-layout-basic-adviced-functions
+  "Makes the function compatible with ECB."
+  (if (not (equal (window-frame (ad-get-arg 0)) ecb-frame))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (if (and (equal (ad-get-arg 0) ecb-compile-window)
+             (member ecb-compile-window-temporally-enlarge
+                     '(after-selection nil)))
+        (ecb-toggle-compile-window-height -1)
+      ;; we prevent to shrink the compile-window below
+      ;; `ecb-compile-window-height'
+      (let* ((comp-win-height-value (ecb-buffer-local-value
+                                     'compilation-window-height
+                                     (window-buffer (ad-get-arg 0))))
+             (compilation-window-height (if (and ecb-compile-window-prevent-shrink-below-height
+                                                 comp-win-height-value
+                                                 ecb-compile-window-height-lines
+                                                 (< comp-win-height-value
+                                                    ecb-compile-window-height-lines))
+                                            ecb-compile-window-height-lines
+                                          comp-win-height-value)))
+        (and compilation-window-height
+             ;; Klaus Berndl <klaus.berndl@sdm.de>: we do nothing if an unsplitted
+             ;; edit-window should be resized because this would fail (e.g. if
+             ;; `pop-up-windows' is nil).
+             (or (equal (ad-get-arg 0) ecb-compile-window)
+                 (ecb-edit-window-splitted))
+             ;; If window is alone in its frame, aside from a minibuffer,
+             ;; don't change its height.
+             (not (eq (ad-get-arg 0) (frame-root-window (window-frame (ad-get-arg 0)))))
+             ;; This save-excursion prevents us from changing the current buffer,
+             ;; which might not be the same as the selected window's buffer.
+             (save-excursion
+               (let ((w (selected-window)))
+                 (ecb-layout-debug-error "compilation-set-window-height: window: %s, cur-win: %s, cur-height: %d"
+                                         (ad-get-arg 0) w
+                                         (ecb-window-full-height (ad-get-arg 0)))
+                 (unwind-protect
+                     (progn
+                       (select-window (ad-get-arg 0))
+                       (enlarge-window (- compilation-window-height
+                                          (ecb-window-full-height))))
+                   ;; The enlarge-window above may have deleted W, if
+                   ;; compilation-window-height is large enough.
+                   (when (window-live-p w)
+                     (select-window w))))))))))
+
+;; We need this advice only because the ugly implementation of Emacs:
+;; `scroll-other-window' uses per default not the function
+;; `other-window-for-scrolling'.
+(defecb-advice scroll-other-window around ecb-layout-basic-adviced-functions
+  "See the advice-documentation of `other-window-for-scrolling' to get all
+details which window will be scrolled."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame))
+          (and (equal (selected-window) (minibuffer-window ecb-frame))
+               minibuffer-scroll-window))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (let* ((o-w (other-window-for-scrolling))
+           (o-w-s-b (window-buffer o-w))
+           (other-window-scroll-buffer (if (or (equal (current-buffer) o-w-s-b)
+                                               (equal (minibuffer-window ecb-frame)
+                                                      o-w))
+                                           nil
+                                         o-w-s-b)))
+      ad-do-it)))
+
+
+;; The following two advices are currently not activated because with XEmacs
+;; we now set `progress-feedback-use-echo-area' to t which prevents this
+;; window-resizing!
+;; (defadvice find-file (around ecb)
+;;   "Workaround for the annoying \(X)Emacs-behavior to resize some of the
+;; special ecb-windows after opening a file. This advices restores the sizes of
+;; the ecb-windows exactly as before this command."
+;;   (if (and ecb-minor-mode
+;;            (equal (selected-frame) ecb-frame)
+;;            (not ecb-windows-hidden))
+;;       (let ((ecb-sizes-before (ecb-get-ecb-window-sizes t)))
+;;         ad-do-it
+;;         ;; this seems to be necessary - otherwise the reszing seems not to
+;;         ;; take effect...
+;;         (sit-for 0)
+;;         (ignore-errors (ecb-set-ecb-window-sizes ecb-sizes-before)))
+;;     ad-do-it))
+      
+;; (defadvice find-file-other-window (around ecb)
+;;   "Workaround for the annoying \(X)Emacs-behavior to resize some of the
+;; special ecb-windows after opening a file. This advices restores the sizes of
+;; the ecb-windows exactly as before this command."
+;;   (if (and ecb-minor-mode
+;;            (equal (selected-frame) ecb-frame)
+;;            (not ecb-windows-hidden))
+;;       (let ((ecb-sizes-before (ecb-get-ecb-window-sizes t)))
+;;         ad-do-it
+;;         ;; this seems to be necessary - otherwise the reszing seems not to
+;;         ;; take effect...
+;;         (sit-for 0)
+;;         (ignore-errors (ecb-set-ecb-window-sizes ecb-sizes-before)))
+;;     ad-do-it))
+
+(defun ecb-toggle-scroll-other-window-scrolls-compile (&optional arg)
+  "Toggle the state of `ecb-scroll-other-window-scrolls-compile-window'.
+With prefix argument ARG, set it to t, otherwise to nil. For all details about
+the scroll-behavior of `scroll-other-window' see the advice documentation of
+`other-window-for-scrolling'."
+  (interactive "P")
+  (unless (or (not ecb-minor-mode)
+              (not (equal (selected-frame) ecb-frame)))
+    (setq ecb-scroll-other-window-scrolls-compile-window
+          (if (null arg)
+              (not ecb-scroll-other-window-scrolls-compile-window)
+            (>= (prefix-numeric-value arg) 0)))
+    (message "Scrolling the other-window scrolls compile-window is now %s."
+             (if ecb-scroll-other-window-scrolls-compile-window "ON" "OFF"))))
+      
+
+  
+(defun ecb-edit-window-splitted (&optional edit-windows-list)
+  "Returns either nil if the ECB edit-window is not splitted or 'vertical or
+'horizontal when splitted in two windows \(depending on the splitting) or
+'splitted if splitted in more than two windows. If EDIT-WINDOWS-LIST is not
+nil then it must be a current list of edit-windows \(got by
+`ecb-canonical-edit-windows-list'). If EDIT-WINDOWS-LIST is nil then a new
+edit-window-list is computed via `ecb-canonical-edit-windows-list'."
+  (let ((edit-win-list (or edit-windows-list (ecb-canonical-edit-windows-list))))
+    (cond ((null edit-win-list)
+           (ecb-error "Internal error - redraw the layout!"))
+          ((= (length edit-win-list) 1)
+           nil)
+          ((= (length edit-win-list) 2)
+           (if (= (car (ecb-window-edges (car edit-win-list)))
+                  (car (ecb-window-edges (cadr edit-win-list))))
+               'vertical
+             'horizontal))
+          (t 'splitted))))
+
+(defvar ecb-temp-buffer-shrink-to-fit nil
+  "Workaround for XEmacs-version which have a `display-buffer' with only 3
+arguments. Do never set this variable; it is only set by
+`show-temp-buffer-in-current-frame'!")
+
+(when-ecb-running-xemacs
+ ;; We advice this function to exactly that version of XEmacs 21.4.13.
+ ;; For that XEmacs-version (and higher) this would not be necessary but
+ ;; we need this advice for versions of XEmacs which do not have the
+ ;; 4-argument-version of `display-buffer'. With this advice we give
+ ;; older XEmacsen the newest display-buffer- and
+ ;; shrink-to-fit-mechanism. How this is done is described at beginning
+ ;; of `ecb-display-buffer-xemacs'.
+
+ ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: XEmacs crashes in the following
+ ;; scenario:
+ ;; 1. acticate ECB
+ ;; 2. open a file
+ ;; 3. no compile-window active
+ ;; 4. set temp-buffer-shrink-to-fit to t
+ ;; 5. Split edit-window vertically
+ ;; 6. call from the above window help (e.g. for function insert)
+ ;; 7. insert help is displayed in the bottom window with shrinked window,
+ ;;    point stay in the help-window
+ ;; 8. press q --> the previous window-layout is restored (both window equally
+ ;;    high); point stays in the top-window.
+ ;; 9. now call C-x 1 (delete-other-windows) --> XEmacs crashes
+ ;; It crashes not if temp-buffer-shrink-to-fit is nil (see step 4 above)
+ ;; Solution: seems that with current shrink-window-if-larger-than-buffer
+ ;; (s.b.) the crash has been gone.......
+ 
+ (defecb-advice shrink-window-if-larger-than-buffer around ecb-layout-basic-adviced-functions
+   "Makes the function compatible with ECB."
+   (or (ad-get-arg 0) (ad-set-arg 0 (selected-window)))
+   (ecb-layout-debug-error "shrink-window-if-larger-than-buffer: window: %s"
+                           (ad-get-arg 0))
+   (if (or (not ecb-minor-mode)
+           (not (equal (window-frame (ad-get-arg 0)) ecb-frame))
+           (member (ad-get-arg 0) (ecb-canonical-ecb-windows-list)))
+       (ecb-with-original-basic-functions
+        ad-do-it)
+
+     ;; now:
+     ;; - the window to shrink is in the ecb-frame
+     ;; - this window is not a special ecb-window
+
+     ;; we handle only the edit-windows and the compile-window of the
+     ;; ecb-frame in a special manner.
+
+     ;; if called non-interactively (e.g. by `display-buffer's forth
+     ;; argument SHRINK-TO-FIT) and if called for the compile-window of
+     ;; ECB and if `ecb-compile-window-temporally-enlarge' is either
+     ;; after-selection or nil then we shrink to the
+     ;; ecb-compile-window-height! Otherwise we run the normal job!
+     (if (and (not (interactive-p))
+              (equal (ad-get-arg 0) ecb-compile-window)
+              (member ecb-compile-window-temporally-enlarge
+                      '(after-selection nil))
+              ;; The *Completions*-buffer must always being enlarged!
+              (not (ecb-string= (buffer-name (window-buffer (ad-get-arg 0)))
+                                "*Completions*")))
+         (ecb-toggle-compile-window-height -1)
+       (save-excursion
+         (set-buffer (window-buffer (ad-get-arg 0)))
+         (ecb-layout-debug-error "shrink-window-if-larger-than-buffer: buffer to shrink: %s"
+                                 (current-buffer))
+         ;; we prevent to shrink the compile-window below
+         ;; `ecb-compile-window-height'
+         (let ((window-min-height (if (and (equal (ad-get-arg 0) ecb-compile-window)
+                                           (and ecb-compile-window-prevent-shrink-below-height
+                                                (not (interactive-p)))
+                                           window-min-height
+                                           ecb-compile-window-height-lines
+                                           (< window-min-height
+                                              ecb-compile-window-height-lines))
+                                      ecb-compile-window-height-lines
+                                    window-min-height))
+               (mini (frame-property (window-frame (ad-get-arg 0)) 'minibuffer)))
+           (when (and (let ((frame (selected-frame)))
+                        (select-frame (window-frame (ad-get-arg 0)))
+                        (unwind-protect
+                            (not (one-window-p t))
+                          (select-frame frame)))
+                      (ecb-window-safely-shrinkable-p (ad-get-arg 0))
+                      (pos-visible-in-window-p (point-min) (ad-get-arg 0))
+                      (not (eq mini 'only)))
+             (ecb-fit-window-to-buffer (ad-get-arg 0)
+                                       (ecb-window-full-height (ad-get-arg 0)))))))))
+      
+ (defecb-advice pop-to-buffer around ecb-layout-basic-adviced-functions
+   "Chooses the window with the ECB-adviced version of `display-buffer'."
+   ad-do-it
+   (when (and (equal (selected-frame) ecb-frame)
+              (ecb-point-in-compile-window))
+     ;; we set the height of the compile-window according to
+     ;; `ecb-enlarged-compilation-window-max-height'
+     (ecb-set-compile-window-height)))
+      
+ ) ;; end of if-ecb-running-xemacs
+
+(when-ecb-running-emacs
+ ;; only GNU Emacs basic advices
+ (defecb-advice mouse-drag-vertical-line around ecb-layout-basic-adviced-functions
+   "Allows manually window-resizing even if `ecb-fix-window-size' is not nil
+for current layout."
+   (if (and ecb-minor-mode
+            (equal (selected-frame) ecb-frame)
+            (not ecb-windows-hidden)
+            (ecb-get-window-fix-type ecb-layout-name))
+       (ecb-do-with-unfixed-ecb-buffers ad-do-it)
+     ad-do-it))
+
+
+ (defecb-advice mouse-drag-mode-line around ecb-layout-basic-adviced-functions
+   "Allows manually window-resizing even if `ecb-fix-window-size' is not nil
+for current layout."
+   (if (and ecb-minor-mode
+            (equal (selected-frame) ecb-frame)
+            (not ecb-windows-hidden)
+            (ecb-get-window-fix-type ecb-layout-name)
+            (member (car (car (cdr (ad-get-arg 0)))) ;; the window of the event
+                    (ecb-canonical-ecb-windows-list)))
+       (ecb-do-with-unfixed-ecb-buffers ad-do-it)
+     ad-do-it))
+
+ (defecb-advice enlarge-window around ecb-layout-basic-adviced-functions
+   "Allows manually window-resizing even if `ecb-fix-window-size' is not nil
+for current layout."
+   (if (and ecb-minor-mode
+            (equal (selected-frame) ecb-frame)
+            (not ecb-windows-hidden)
+            (ecb-get-window-fix-type ecb-layout-name)
+            (member (selected-window) (ecb-canonical-ecb-windows-list)))
+       (ecb-do-with-unfixed-ecb-buffers ad-do-it)
+     ad-do-it))
+
+ (defecb-advice shrink-window around ecb-layout-basic-adviced-functions
+   "Allows manually window-resizing even if `ecb-fix-window-size' is not nil
+for current layout."
+   (if (and ecb-minor-mode
+            (equal (selected-frame) ecb-frame)
+            (not ecb-windows-hidden)
+            ;; See comment of defecb-advice for mouse-drag-mode-line
+            (ecb-get-window-fix-type ecb-layout-name)
+            (member (selected-window) (ecb-canonical-ecb-windows-list)))
+       (ecb-do-with-unfixed-ecb-buffers ad-do-it)
+     ad-do-it))
+
+ (defecb-advice shrink-window-if-larger-than-buffer around ecb-layout-basic-adviced-functions
+   "Makes the function compatible with ECB."
+   (or (ad-get-arg 0) (ad-set-arg 0 (selected-window)))
+   (ecb-layout-debug-error "shrink-window-if-larger-than-buffer: window: %s"
+                           (ad-get-arg 0))
+   (if (or (not ecb-minor-mode)
+           (not (equal (window-frame (ad-get-arg 0)) ecb-frame))
+           (member (ad-get-arg 0) (ecb-canonical-ecb-windows-list)))
+       (ecb-with-original-basic-functions
+        ad-do-it)
+     (save-selected-window
+       (select-window (ad-get-arg 0))
+       (ecb-layout-debug-error "shrink-window-if-larger-than-buffer: buffer to shrink: %s"
+                               (current-buffer))
+       (let* ((params (frame-parameters))
+              (mini (cdr (assq 'minibuffer params)))
+              (edges (ecb-window-edges))
+              ;; we prevent to shrink the compile-window below
+              ;; `ecb-compile-window-height'
+              (window-min-height (if (and (equal (ad-get-arg 0) ecb-compile-window)
+                                          (and ecb-compile-window-prevent-shrink-below-height
+                                               (not (interactive-p)))
+                                          window-min-height
+                                          ecb-compile-window-height-lines
+                                          (< window-min-height
+                                             ecb-compile-window-height-lines))
+                                     ecb-compile-window-height-lines
+                                   window-min-height)))
+         (if (and (let ((frame (selected-frame)))
+                    (select-frame (window-frame (ad-get-arg 0)))
+                    (unwind-protect
+                        (not (one-window-p t))
+                      (select-frame frame)))
+                  (ecb-window-safely-shrinkable-p (ad-get-arg 0))
+                  (pos-visible-in-window-p (point-min) (ad-get-arg 0))
+                  (not (eq mini 'only))
+                  (or (not mini)
+                      (< (nth 3 edges) (nth 1 (ecb-window-edges mini)))
+                      (> (nth 1 edges) (cdr (assq 'menu-bar-lines params)))))
+             (ecb-fit-window-to-buffer (ad-get-arg 0)
+                                       (ecb-window-full-height (ad-get-arg 0))))))))
+
+ (defecb-advice resize-temp-buffer-window around ecb-layout-basic-adviced-functions
+   "Makes the function compatible with ECB."
+   (ecb-layout-debug-error "resize-temp-buffer-window: buffer: %s, window: %s, frame: %s"
+                           (current-buffer) (selected-window) (selected-frame))
+   (if (or (not ecb-minor-mode)
+           (not (equal (selected-frame) ecb-frame))
+           (equal (car (ecb-where-is-point)) 'ecb))
+       (ecb-with-original-basic-functions
+        ad-do-it)
+     (if (and (equal (selected-window) ecb-compile-window)
+              (member ecb-compile-window-temporally-enlarge
+                      '(after-selection nil))
+              ;; The *Completions* buffer must always being enlarged!!
+              (not (ecb-string= (buffer-name (current-buffer)) "*Completions*")))
+         (progn
+           (ecb-layout-debug-error "resize-temp-buffer-window: buffer: shrink to comp-win-height")
+           (ecb-toggle-compile-window-height -1))
+       ;; we prevent to shrink the compile-window below
+       ;; `ecb-compile-window-height'
+       (let ((window-min-height (if (and window-min-height
+                                         ecb-compile-window-height-lines
+                                         ecb-compile-window-prevent-shrink-below-height
+                                         (< window-min-height
+                                            ecb-compile-window-height-lines))
+                                    ecb-compile-window-height-lines
+                                  window-min-height)))
+         (ecb-layout-debug-error "resize-temp-buffer-window: within let - window: %s"
+                                 (selected-window))
+         (ecb-layout-debug-error "resize-temp-buffer-window: check unless %s, %s, %s"
+                                 (one-window-p 'nomini)
+                                 (and (not (equal (selected-window) ecb-compile-window))
+                                      (not (ecb-edit-window-splitted)))
+                                 (not (pos-visible-in-window-p (point-min))))
+         (unless (or (one-window-p 'nomini)
+                     ;; Klaus Berndl <klaus.berndl@sdm.de>: we do nothing if an unsplitted
+                     ;; edit-window should be resized because this would fail (e.g. if
+                     ;; `pop-up-windows' is nil)
+                     (and (not (equal (selected-window) ecb-compile-window))
+                          (not (ecb-edit-window-splitted)))
+                     (not (pos-visible-in-window-p (point-min)))
+                     )
+           (ecb-layout-debug-error "resize-temp-buffer-window: resize buffer: %s"
+                                   (current-buffer))
+           (ecb-fit-window-to-buffer
+            (selected-window)
+            (if (functionp temp-buffer-max-height)
+                (funcall temp-buffer-max-height (current-buffer))
+              temp-buffer-max-height)))))))
+ 
+ (defecb-advice pop-to-buffer around ecb-layout-basic-adviced-functions
+   "Chooses the window with the ECB-adviced version of `display-buffer'."
+   (if (or (not ecb-minor-mode)
+           (null (ad-get-arg 0)))
+       (ecb-with-original-basic-functions
+        ad-do-it)
+     (condition-case nil
+         (progn
+           (ecb-layout-debug-error "pop-to-buffer: buffer: %s, %s"
+                                   (ad-get-arg 0) (ad-get-arg 1))
+           (select-window (display-buffer (ad-get-arg 0)
+                                          (ad-get-arg 1)))
+           ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Do we need this?!
+           (set-buffer (ad-get-arg 0))
+           (if (ad-get-arg 2)
+               ;; not the best solution but for now....
+               (bury-buffer (ad-get-arg 0))))
+       ;; This is if the call to the adviced `display-buffer' fails (seems
+       ;; to make problems with C-h i and the *info*-buffer). Then we run the
+       ;; orginal version.
+       (error
+        (ecb-layout-debug-error "pop-to-buffer: adviced version failed for buffer: %s, %s"
+                                (ad-get-arg 0) (ad-get-arg 1))
+        (if (ecb-buffer-is-dedicated-special-buffer-p (ad-get-arg 0))
+            (ecb-error "Can not go to a invisible special ECB-buffer!")
+          ad-do-it)))
+     (when (ecb-point-in-compile-window)
+       ;; we set the height of the compile-window according to
+       ;; `ecb-enlarged-compilation-window-max-height'
+       (ecb-set-compile-window-height)))))
+  
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Fixes a bug with ths
+;; shrink-to-fit stuff: (set-window-buffer ...) has to be called BEFORE
+;; `shrink-window-if-larger-than-buffer'! The rest is identical with the
+;; version from window-xemacs.el of XEmacs 21.4.13. Shrinking in an
+;; after advice does not work - fails for the first call for
+;; `display-buffer' in case of an temp-buffer!
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Some older versions of XEmacs
+;; 21.4 does not support a four-argument display-buffer. We handle this case
+;; properly within `ecb-display-buffer-xemacs' and
+;; `show-temp-buffer-in-current-frame'; see the comments in both of these
+;; functions.
+(defun ecb-display-buffer-xemacs (buffer &optional not-this-window-p
+                                         override-frame
+                                         shrink-to-fit)
+  "Make BUFFER appear in some window on the current frame, but don't select it.
+BUFFER can be a buffer or a buffer name.
+If BUFFER is shown already in some window in the current frame,
+just uses that one, unless the window is the selected window and
+NOT-THIS-WINDOW-P is non-nil (interactively, with prefix arg).
+
+If BUFFER has a dedicated frame, display on that frame instead of
+the current frame, unless OVERRIDE-FRAME is non-nil.
+
+If OVERRIDE-FRAME is non-nil, display on that frame instead of
+the current frame (or the dedicated frame).
+
+If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give
+the new buffer less than half the space if it is small enough to fit.
+
+If `pop-up-windows' is non-nil, always use the
+current frame and create a new window regardless of whether the
+buffer has a dedicated frame, and regardless of whether
+OVERRIDE-FRAME was specified.
+
+If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
+
+Returns the window displaying BUFFER."
+  (interactive "BDisplay buffer:\nP")
+
+  (ecb-layout-debug-error "ecb-display-buffer-xemacs for %s %s %s %s [%s]"
+                          buffer not-this-window-p override-frame
+                          shrink-to-fit ecb-temp-buffer-shrink-to-fit)
+  ;; Here we make the shrink-to-fit workaround for these old XEmacs 21.4
+  ;; versions which do not have a display-buffer-command with 4 arguments:
+  ;; `ecb-temp-buffer-shrink-to-fit' is only set by
+  ;; `show-temp-buffer-in-current-frame' (an XEmacs-only function) to the
+  ;; value of `temp-buffer-shrink-to-fit' and can only be set to not nil
+  ;; there. This is done be a let-binding so `ecb-temp-buffer-shrink-to-fit'
+  ;; has always nil after finishing this function! Only if
+  ;; `ecb-temp-buffer-shrink-to-fit' is not nil here we override the value of
+  ;; SHRINK-TO-FIT. And because  `ecb-temp-buffer-shrink-to-fit' is only set
+  ;; to not nil in case of a wrong-number-of-arguments error for
+  ;; `display-buffer' (see `show-temp-buffer-in-current-frame') this will
+  ;; never take place for XEmacs-versions with the 4-arg version of
+  ;; `display-buffer'!
+  (setq shrink-to-fit (or ecb-temp-buffer-shrink-to-fit shrink-to-fit))
+  (let ((wconfig (current-window-configuration))
+        (result
+         ;; We just simulate a `return' in C.  This function is way ugly
+         ;; and does `returns' all over the place and there's no sense
+         ;; in trying to rewrite it to be more Lispy.
+         (catch 'done
+           (let (window old-frame target-frame explicit-frame shrink-it)
+             (setq old-frame (or (last-nonminibuf-frame) (selected-frame)))
+             (setq buffer (get-buffer buffer))
+             (check-argument-type 'bufferp buffer)
+
+             ;; KB: For pre-display-buffer-function and
+             ;; display-buffer-function we have to check for
+             ;; wrong-number-of-arguments errors because older XEmacs 21.4
+             ;; does not support the SHRINK-TO-FIT-argument and therefore
+             ;; these functions probably don't too. Therefore in case of this
+             ;; error we call these functions again with only the first three
+             ;; arguments.
+             
+             (setq explicit-frame
+                   (if pre-display-buffer-function
+                       (condition-case oops
+                           (funcall pre-display-buffer-function buffer
+                                    not-this-window-p
+                                    override-frame
+                                    shrink-to-fit)
+                         (wrong-number-of-arguments
+                          (funcall pre-display-buffer-function buffer
+                                   not-this-window-p
+                                   override-frame))
+                         (error (signal (car oops) (cdr oops)))
+                         (quit (signal 'quit nil)))))
+
+             ;; Give the user the ability to completely reimplement
+             ;; this function via the `display-buffer-function'.
+             (if display-buffer-function
+                 (throw 'done
+                        (condition-case oops
+                            (funcall display-buffer-function buffer
+                                     not-this-window-p
+                                     override-frame
+                                     shrink-to-fit)
+                          (wrong-number-of-arguments
+                           (funcall display-buffer-function buffer
+                                    not-this-window-p
+                                    override-frame))
+                          (error (signal (car oops) (cdr oops)))
+                          (quit (signal 'quit nil)))))
+
+             ;; If the buffer has a dedicated frame, that takes
+             ;; precedence over the current frame, and over what the
+             ;; pre-display-buffer-function did.
+             (let ((dedi (buffer-dedicated-frame buffer)))
+               (if (frame-live-p dedi) (setq explicit-frame dedi)))
+
+             ;; if override-frame is supplied, that takes precedence over
+             ;; everything.  This is gonna look bad if the
+             ;; pre-display-buffer-function raised some other frame
+             ;; already.
+             (if override-frame
+                 (progn
+                   (check-argument-type 'frame-live-p override-frame)
+                   (setq explicit-frame override-frame)))
+
+             (setq target-frame
+                   (or explicit-frame
+                       (last-nonminibuf-frame)
+                       (selected-frame)))
+
+             ;; If we have switched frames, then set not-this-window-p
+             ;; to false.  Switching frames means that selected-window
+             ;; is no longer the same as it was on entry -- it's the
+             ;; selected-window of target_frame instead of old_frame,
+             ;; so it's a fine candidate for display.
+             (if (not (eq old-frame target-frame))
+                 (setq not-this-window-p nil))
+
+             ;; if it's in the selected window, and that's ok, then we're done.
+             (if (and (not not-this-window-p)
+                      (eq buffer (window-buffer (selected-window))))
+                 (throw 'done (display-buffer-1 (selected-window))))
+
+             ;; See if the user has specified this buffer should appear
+             ;; in the selected window.
+
+             (if not-this-window-p
+                 nil
+
+               (if (or (member (buffer-name buffer) same-window-buffer-names)
+                       (assoc (buffer-name buffer) same-window-buffer-names))
+                   (progn
+                     (switch-to-buffer buffer)
+                     (throw 'done (display-buffer-1 (selected-window)))))
+
+               (let ((tem same-window-regexps))
+                 (while tem
+                   (let ((car (car tem)))
+                     (if (save-match-data
+                           (or
+                            (and (stringp car)
+                                 (string-match car (buffer-name buffer)))
+                            (and (consp car) (stringp (car car))
+                                 (string-match (car car) (buffer-name buffer)))))
+                         (progn
+                           (switch-to-buffer buffer)
+                           (throw 'done (display-buffer-1
+                                         (selected-window))))))
+                   (setq tem (cdr tem)))))
+
+             ;; If pop-up-frames, look for a window showing BUFFER on
+             ;; any visible or iconified frame.  Otherwise search only
+             ;; the current frame.
+             (if (and (not explicit-frame)
+                      (or pop-up-frames (not (last-nonminibuf-frame))))
+                 (setq target-frame 0))
+
+             ;; Otherwise, find some window that it's already in, and
+             ;; return that, unless that window is the selected window
+             ;; and that isn't ok.  What a contorted mess!
+             (setq window (or (if (not explicit-frame)
+                                  ;; search the selected frame
+                                  ;; first if the user didn't
+                                  ;; specify an explicit frame.
+                                  (get-buffer-window buffer nil))
+                              (get-buffer-window buffer target-frame)))
+             (if (and window
+                      (or (not not-this-window-p)
+                          (not (eq window (selected-window)))))
+                 (throw 'done (display-buffer-1 window)))
+
+             ;; Certain buffer names get special handling.
+             (if special-display-function
+                 (progn
+                   (if (member (buffer-name buffer)
+                               special-display-buffer-names)
+                       (throw 'done (funcall special-display-function buffer)))
+
+                   (let ((tem (assoc (buffer-name buffer)
+                                     special-display-buffer-names)))
+                     (if tem
+                         (throw 'done (funcall special-display-function
+                                               buffer (cdr tem)))))
+
+                   (let ((tem special-display-regexps))
+                     (while tem
+                       (let ((car (car tem)))
+                         (if (and (stringp car)
+                                  (save-match-data (string-match car (buffer-name buffer))))
+                             (throw 'done
+                                    (funcall special-display-function buffer)))
+                         (if (and (consp car)
+                                  (stringp (car car))
+                                  (save-match-data
+                                    (string-match (car car)
+                                                  (buffer-name buffer))))
+                             (throw 'done (funcall
+                                           special-display-function buffer
+                                           (cdr car)))))
+                       (setq tem (cdr tem))))))
+
+             ;; If there are no frames open that have more than a minibuffer,
+             ;; we need to create a new frame.
+             (if (or pop-up-frames
+                     (null (last-nonminibuf-frame)))
+                 (progn
+                   (setq window (frame-selected-window
+                                 (funcall pop-up-frame-function)))
+                   (set-window-buffer window buffer)
+                   (throw 'done (display-buffer-1 window))))
+
+             ;; Otherwise, make it be in some window, splitting if
+             ;; appropriate/possible.  Do not split a window if we are
+             ;; displaying the buffer in a different frame than that which
+             ;; was current when we were called.  (It is already in a
+             ;; different window by virtue of being in another frame.)
+             (if (or (and pop-up-windows (eq target-frame old-frame))
+                     (eq 'only (frame-property (selected-frame) 'minibuffer))
+                     ;; If the current frame is a special display frame,
+                     ;; don't try to reuse its windows.
+                     (window-dedicated-p (frame-root-window (selected-frame))))
+                 (progn
+                   (if (eq 'only (frame-property (selected-frame) 'minibuffer))
+                       (setq target-frame (last-nonminibuf-frame)))
+
+                   ;; Don't try to create a window if would get an error with
+                   ;; height.
+                   (if (< split-height-threshold (* 2 window-min-height))
+                       (setq split-height-threshold (* 2 window-min-height)))
+
+                   ;; Same with width.
+                   (if (< split-width-threshold (* 2 window-min-width))
+                       (setq split-width-threshold (* 2 window-min-width)))
+
+                   ;; If the frame we would try to split cannot be split,
+                   ;; try other frames.
+                   (if (frame-property (if (null target-frame)
+                                           (selected-frame)
+                                         (last-nonminibuf-frame))
+                                       'unsplittable)
+                       (setq window
+                             ;; Try visible frames first.
+                             (or (get-largest-window 'visible)
+                                 ;; If that didn't work, try iconified frames.
+                                 (get-largest-window 0)
+                                 (get-largest-window t)))
+                     (setq window (get-largest-window target-frame)))
+
+                   ;; If we got a tall enough full-width window that
+                   ;; can be split, split it.
+                   (if (and window
+                            (not (frame-property (window-frame window)
+                                                 'unsplittable))
+                            (>= (window-height window) split-height-threshold)
+                            (or (>= (window-width window)
+                                    split-width-threshold)
+                                (and (window-leftmost-p window)
+                                     (window-rightmost-p window))))
+                       (setq window (split-window window))
+                     (let (upper
+                           ;;			   lower
+                           other)
+                       (setq window (get-lru-window target-frame))
+                       ;; If the LRU window is selected, and big enough,
+                       ;; and can be split, split it.
+                       (if (and window
+                                (not (frame-property (window-frame window)
+                                                     'unsplittable))
+                                (or (eq window (selected-window))
+                                    (not (window-parent window)))
+                                (>= (window-height window)
+                                    (* 2 window-min-height)))
+                           (setq window (split-window window)))
+                       ;; If get-lru-window returned nil, try other approaches.
+                       ;; Try visible frames first.
+                       (or window
+                           (setq window (or (get-largest-window 'visible)
+                                            ;; If that didn't work, try
+                                            ;; iconified frames.
+                                            (get-largest-window 0)
+                                            ;; Try invisible frames.
+                                            (get-largest-window t)
+                                            ;; As a last resort, make
+                                            ;; a new frame.
+                                            (frame-selected-window
+                                             (funcall
+                                              pop-up-frame-function)))))
+                       ;; If window appears above or below another,
+                       ;; even out their heights.
+                       (if (window-previous-child window)
+                           (setq other (window-previous-child window)
+                                 ;;				 lower window
+                                 upper other))
+                       (if (window-next-child window)
+                           (setq other (window-next-child window)
+                                 ;;				 lower other
+                                 upper window))
+                       ;; Check that OTHER and WINDOW are vertically arrayed.
+                       (if (and other
+                                (not (= (nth 1 (window-pixel-edges other))
+                                        (nth 1 (window-pixel-edges window))))
+                                (> (window-pixel-height other)
+                                   (window-pixel-height window)))
+                           ;; Klaus Berndl <klaus.berndl@sdm.de>: here we
+                           ;; write this as somehow clumsy code to silence the
+                           ;; byte-compiler because GNU Emacs <= 21.3. knows
+                           ;; only 2 args for `enlarge-window'
+                           (funcall (symbol-function 'enlarge-window)
+                                    (- (/ (+ (window-height other)
+                                             (window-height window))
+                                          2)
+                                       (window-height upper))
+                                    nil upper))
+                       ;; Klaus Berndl <klaus.berndl@sdm.de>: Only in
+                       ;; this situation we shrink-to-fit but we can do
+                       ;; this first after we have displayed buffer in
+                       ;; window (s.b. (set-window-buffer window buffer))
+                       (setq shrink-it shrink-to-fit))))
+
+               (setq window (get-lru-window target-frame)))
+
+             ;; Bring the window's previous buffer to the top of the MRU chain.
+             (if (window-buffer window)
+                 (save-excursion
+                   (save-selected-window
+                     (select-window window)
+                     (record-buffer (window-buffer window)))))
+
+             (set-window-buffer window buffer)
+
+             ;; Now window's previous buffer has been brought to the top
+             ;; of the MRU chain and window displays buffer - now we can
+             ;; shrink-to-fit if necessary
+             (if shrink-it
+                 (shrink-window-if-larger-than-buffer window))
+                   
+             (display-buffer-1 window)))))
+    (or (equal wconfig (current-window-configuration))
+        (push-window-configuration wconfig))
+    result))
+
+(defun ecb-temp-buffer-show-function-emacs (buf)
+  ;; cause of running the hooks in `temp-buffer-show-hook' we must use
+  ;; save-selected-window (s.b.). But maybe `display-buffer' calls
+  ;; `ecb-toggle-compile-window' which completely destroy all windows and
+  ;; redraw the layout. This conflicts with the save-selected-window.
+  ;; Therefore we toggle the compile-window before the save-selected-window!
+  (when (ecb-compilation-buffer-p buf)
+    (ecb-layout-debug-error "ecb-temp-buffer-show-function-emacs: comp-buffer: %s"
+                            buf)
+    (when (and (equal (selected-frame) ecb-frame)
+               (equal 'hidden (ecb-compile-window-state))
+               ;; calling this from minibuffer (e.g. completions)
+               ;; seems to cause problems
+               (not (equal (minibuffer-window ecb-frame) (selected-window))))
+      (ecb-layout-debug-error "ecb-temp-buffer-show-function-emacs: comp-win will toggled")
+      (ecb-toggle-compile-window 1)))
+  (save-selected-window
+    (save-excursion
+      ;; this call to `display-buffer' runs the adviced version of ECB which
+      ;; always handles all the compile-window stuff if buf is a
+      ;; compile-buffer in the sense of `ecb-compilation-buffer-p'.
+      (let ((win (display-buffer buf)))
+        (ecb-layout-debug-error "ecb-temp-buffer-show-function-emacs: win: %s, buf: %s,dedi:%s"
+                                win buf (window-dedicated-p win))
+        (select-window win)
+        (setq minibuffer-scroll-window win)
+        (set-buffer buf)
+        (run-hooks 'temp-buffer-show-hook)
+        (ecb-layout-debug-error "ecb-temp-buffer-show-function-emacs: sel-win: %s, win-buf: %s,dedi%s"
+                                (selected-window)
+                                (window-buffer (selected-window))
+                                (window-dedicated-p (selected-window)))
+;;         (if (and (boundp 'help-window)
+;;                  (equal (selected-window) ecb-compile-window))
+;;             (setq help-window ecb-compile-window))
+        ))))
+
+(defvar ecb-temp-buffer-show-function-old nil)
+
+(defun ecb-enable-own-temp-buffer-show-function (arg)
+  "If ARG then set `temp-buffer-show-function' to the right function so ECB
+works correct. Store the old value. If ARG is nil then restore the old value
+of `temp-buffer-show-function'."
+  (if arg
+      (progn
+        (setq ecb-temp-buffer-show-function-old
+              temp-buffer-show-function)
+        (setq temp-buffer-show-function
+              (if ecb-running-xemacs
+                  'show-temp-buffer-in-current-frame
+                'ecb-temp-buffer-show-function-emacs)))
+    (setq temp-buffer-show-function
+          ecb-temp-buffer-show-function-old)))
+
+
+;; =========== intelligent window function advices ===================
+
+(defmacro ecb-with-original-basic-functions (&rest body)
+  "Evaluates BODY with all adviced basic-functions of ECB deactivated \(means
+with their original definition). Restores always the previous state of the ECB
+adviced basic-functions, means after evaluating BODY it activates the advices
+of exactly the functions in `ecb-layout-basic-adviced-functions'!"
+  `(ecb-with-original-adviced-function-set 'ecb-layout-basic-adviced-functions
+     ,@body))
+
+(defecb-advice-set ecb-permanent-adviced-layout-functions
+  "Permanent adviced layout functions.
+This means these function will remain adviced after deactivating ecb!"
+  t)
+
+(defmacro ecb-with-original-permanent-layout-functions (&rest body)
+  "Evaluates BODY with all adviced permanent-functions of ECB deactivated
+\(means with their original definition). Restores always the previous state of
+the ECB adviced permanent-functions, means after evaluating BODY it activates
+the advices of exactly the functions in `ecb-permanent-adviced-layout-functions'!"
+  `(ecb-with-original-adviced-function-set 'ecb-permanent-adviced-layout-functions
+                                           ,@body))
+
+(defun ecb-where-is-point (&optional win-list)
+  "Return a cons-cell with the exact location of point in the ecb-frame.
+The car is one of 'ecb \(point in a special ecb-window), 'edit
+\(point in an edit-window of the edit-area), 'compile \(point in
+the compile window), 'minibuf \(the minibuffer is the selected
+window) or 'other-dedicated \(point is in a dedicated window
+which is not one of the special ecb-windows - some packages like
+ediff could use dedicated windows for their own needs). The cdr
+is the number of the window in the related window-list in
+canonical order \(means top-left-most window in the related
+window-list has number 1 and so on...). In case of 'other-dedicated the cdr is
+the number of the window in the full window-list of the ecb-frame \(without
+minibuffer-window).
+
+If the compile-window or the minibuffer is the selected window then the window
+number is always 1.
+
+If the ecb-frame is not the selected frame then nil is returned.
+This means the result is undefined.
+
+If WIN-LIST is nil then a new window-list is computed via
+`ecb-canonical-windows-list'.
+
+Examples:
+
+If point stays in the second special-window list, then \('ecb . 2) is
+returned, even in layouts of type 'right'.
+
+If there are 3 edit windows and point stays in the third one, then \(edit . 3)
+is returned, even in layouts of type 'left'.
+
+If the compile-window or the minibuffer is the selected window then
+\('compile . 1) rsp. \(minibuf . 1) is returned."
+  (when (equal (selected-frame) ecb-frame)
+    (let ((win-list (or win-list (ecb-canonical-windows-list)))
+          (type (cond ((memq (selected-window)
+                             (ecb-canonical-ecb-windows-list win-list))
+                       'ecb)
+                      ((memq (selected-window)
+                             (ecb-canonical-edit-windows-list win-list))
+                       'edit)
+                      ((equal (selected-window) (minibuffer-window ecb-frame))
+                       'minibuf)
+                      ((ecb-point-in-compile-window)
+                       'compile)
+                      (t 'other-dedicated))))
+           (cons type (case type
+                        (ecb (ecb-point-in-ecb-window-number
+                              (ecb-canonical-ecb-windows-list win-list)))
+                        (edit (ecb-point-in-edit-window-number
+                               (ecb-canonical-edit-windows-list win-list)))
+                        (compile 1)
+                        (minibuf 1)
+                        (otherwise (ecb-window-in-window-list-number win-list)))))))
+
+;; Do not use the following two functions in pre- or post-command hook because
+;; XEmacs has no builtin c-function but only an elisp one for this and
+;; therefore using it within post-command-hook or pre-command-hook would
+;; dramatically slow down XEmacs.
+
+(defun ecb-point-in-ecb-window-number (&optional ecb-windows-list)
+  "Return nil if point stays not in an special ecb-window otherwise return 1
+if point is in the left/topmost ecb-window or 2 if in the next ecb-window and
+so on. Return the number of the ecb-window \(if point is in an ecb-window) in
+the order `walk-windows' would go through the ecb-windows. If ECB-WINDOWS-LIST
+is not nil then it must be a current list of ecb-windows \(got by
+`ecb-canonical-ecb-windows-list'). If ECB-WINDOWS-LIST is nil then a new
+ecb-window-list is computed via `ecb-canonical-ecb-windows-list'."
+  (when (equal (selected-frame) ecb-frame)
+    (ignore-errors (ecb-window-in-window-list-number
+                    (or ecb-windows-list (ecb-canonical-ecb-windows-list))))))
+
+
+(defun ecb-point-in-edit-window-number (&optional edit-windows-list)
+  "Return nil if point stays not in an edit-window otherwise return 1 if point
+is in the left/topmost edit-window or 2 if in the next edit-window and so on.
+Return the number of the edit-window \(if point is in an edit-window) in the
+order `walk-windows' would go through the edit-windows. If EDIT-WINDOWS-LIST
+is not nil then it must be a current list of edit-windows \(got by
+`ecb-canonical-edit-windows-list'). If EDIT-WINDOWS-LIST is nil then a new
+edit-window-list is computed via `ecb-canonical-edit-windows-list'."
+  (when (equal (selected-frame) ecb-frame)
+    (ignore-errors (ecb-window-in-window-list-number
+                    (or edit-windows-list (ecb-canonical-edit-windows-list))))))
+
+(defmacro ecb-when-point-in-edit-window-ecb-windows-visible (&rest body)
+  "Evaluate BODY if an edit-window is selected and ecb-windows are visible."
+  `(when (and ecb-minor-mode
+              (not ecb-windows-hidden)
+              (ecb-point-in-edit-window-number))
+     ,@body))
+
+
+(defun ecb-get-edit-window-by-number (edit-win-nr &optional edit-win-list)
+  "Return that edit-window with number EDIT-WIN-NR. If EDIT-WIN-LIST is set
+then get it from that list otherwise from `ecb-canonical-edit-windows-list'.
+EDIT-WIN-NR must be an integer between 1 and length of EDIT-WIN-LIST \(rsp.
+`ecb-canonical-edit-windows-list')."
+  (nth (1- edit-win-nr) (or edit-win-list (ecb-canonical-edit-windows-list))))
+
+(defun ecb-get-window-by-number (win-nr &optional win-list)
+  "Return that window with number WIN-NR. If WIN-LIST is set
+then get it from that list otherwise from `ecb-canonical-windows-list'.
+WIN-NR must be an integer between 1 and length of WIN-LIST \(rsp.
+`ecb-canonical-windows-list')."
+  (nth (1- win-nr) (or win-list (ecb-canonical-windows-list))))
+
+(defun ecb-get-ecb-window-by-number (ecb-win-nr &optional ecb-win-list)
+  "Return that ecb-window with number ECB-WIN-NR. If ECB-WIN-LIST is set
+then get it from that list otherwise from `ecb-canonical-ecb-windows-list'.
+ECB-WIN-NR must be an integer between 1 and length of ECB-WIN-LIST \(rsp.
+`ecb-canonical-ecb-windows-list')."
+  (nth (1- ecb-win-nr) (or ecb-win-list (ecb-canonical-ecb-windows-list))))
+
+(defun ecb-point-in-compile-window ()
+  "Return not nil iff point is in the compile-window of ECB"
+  (and (equal (selected-frame) ecb-frame)
+       (ecb-compile-window-live-p)
+       (equal (selected-window) ecb-compile-window)))
+
+(defun ecb-point-in-ecb-tree-buffer ()
+  "Return not nil if point is in any of the standard tree-buffers \(see
+function `ecb-tree-buffers-name-list') of ECB and if the current buffer is
+displayed in the currently selected window."
+  (when (and (equal (selected-frame) ecb-frame)
+             (member (buffer-name (current-buffer))
+                     (ecb-tree-buffers-name-list))
+             (eq (selected-window) (get-buffer-window (current-buffer)
+                                                      ecb-frame)))
+    (current-buffer)))
+
+;; This function should not use any call to `ecb-window-list' because XEmacs
+;; has no builtin c-function but only an elisp one for this and therefore
+;; using it within post-command-hook or pre-command-hook would dramatically
+;; slow down XEmacs.
+(defun ecb-point-in-dedicated-special-buffer ()
+  "Return not nil if point is in any of the special dedicated buffers which
+are registrated via the macro `defecb-window-dedicator' \(see
+`ecb-dedicated-special-buffers') and if the current buffer is displayed in the
+currently selected window."
+  (when (equal (selected-frame) ecb-frame)
+    (if (and (member (current-buffer) (ecb-dedicated-special-buffers))
+             (eq (selected-window) (get-buffer-window (current-buffer) ecb-frame)))
+        (current-buffer))))
+          
+(defun ecb-buffer-is-dedicated-special-buffer-p (buffer-or-name)
+  "Return not nil if BUFFER-OR-NAME is a member of
+`ecb-dedicated-special-buffers'. BUFFER-OR-NAME ca be either a
+buffer-object or a buffer-name."
+  (let ((buffer (ecb-buffer-obj buffer-or-name)))
+    (member buffer (ecb-dedicated-special-buffers))))
+
+
+(defun ecb-goto-ecb-window (ecb-buffer-name)
+  "Select that ecb-window displaying the special ecb-buffer ECB-BUFFER-NAME.
+Only buffer-names defined for the current layout \(see function
+`ecb-buffer-is-ecb-buffer-of-current-layout-p') or the buffer-name of the
+integrated speedbar are accepted. If such a window can not be selected then
+probably because another ecb-window of current layout is currently maximized;
+therefore in such a case the layout has been redrawn and then tried to select
+the window again. This function does nothing if NAME fulfills not the
+described conditions or if the ecb-windows are hidden or ECB is not active. If
+necessary the `ecb-frame' will be first raised."
+  (when (and ecb-minor-mode
+             (not ecb-windows-hidden)
+             (or (equal ecb-buffer-name ecb-speedbar-buffer-name)
+                 (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-buffer-name)))
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (or (ecb-window-select ecb-buffer-name)
+        ;; the window is not visible because another one is maximized;
+        ;; therefore we first redraw the layout
+        (progn
+          (ecb-redraw-layout-full nil nil nil nil)
+          ;; now we can go to the window
+          (ecb-window-select ecb-buffer-name)))))
+
+(defun ecb-goto-window-edit-last ()
+  "Make the last selected edit-window window the current window. This is the
+same as if `ecb-mouse-click-destination' is set to 'last-point."
+  (interactive)
+  (when ecb-minor-mode
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (let ((ecb-mouse-click-destination 'last-point))
+      (ecb-select-edit-window))))
+
+(defun ecb-goto-window-edit1 ()
+  "Make the \(first) edit-window window the current window."
+  (interactive)
+  (when ecb-minor-mode
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (ecb-select-edit-window 1)))
+
+(defun ecb-goto-window-edit2 ()
+  "Make the second edit-window \(if available) window the current window."
+  (interactive)
+  (when ecb-minor-mode
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (ecb-select-edit-window t)))
+
+(defun ecb-goto-window-edit-by-smart-selection (&optional use-immediate-completion)
+  "Selects an edit-window by smart selection.
+The command offers a list of all edit-windows by buffer-name. Selecting the
+buffer-name will select the displaying window. Which edit-windows are offered
+depends on the currently selected window: If not an edit-window is the
+currently selected-window then all edit-windows are offered in canonical order
+\(means from top-left to button-right). If an edit-window is the currently
+selected-window then all other\(!) edit-windows are offered, beginning with
+the next edit-window to the current edit-window \(the following edit-windows
+also in canonical order). If there is only one senseful
+destination-edit-window then this window is immediately selected, without
+confirmation \(e.g.: There are two edit-windows and point stays in one of
+them. Or there is only one edit-window and point stays either in one of the
+special ecb-windows or in the compile-window).
+
+If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer."
+  (interactive "P")
+  (ecb-goto-window-by-smart-selection--internal
+   (ecb-canonical-edit-windows-list)
+   use-immediate-completion))
+
+(defun ecb-goto-window-ecb-by-smart-selection (&optional use-immediate-completion)
+  "Selects a special ecb-browsing-window by smart selection.
+The command offers a list of all special ecb-windows by buffer-name. Selecting
+the buffer-name will select the displaying window. Which special ecb-windows
+are offered depends on the currently selected window: If not a special
+ecb-window is the currently selected-window then all edit-windows are offered
+in canonical order \(means from top-left to button-right). If an ecb-window is
+the currently selected-window then all other\(!) special ecb-windows are
+offered, beginning with the next special ecb-window to the current ecb-window
+\(the following special ecb-windows also in canonical order). If there is only
+one senseful destination-ecb-window then this window is immediately selected,
+without confirmation \(e.g.: There are two special ecb-windows and point stays
+in one of them. Or there is only one ecb-window and point stays either in one
+of the edit-windows or in the compile-window).
+
+If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer."
+  (interactive "P")
+  (ecb-goto-window-by-smart-selection--internal
+   (ecb-canonical-ecb-windows-list)
+   use-immediate-completion))
+
+(defun ecb-goto-window-by-smart-selection--internal (win-list &optional use-immediate-completion)
+  "Perform smart window-selection depending on WIN-LIST.
+Possible window-destinations are offered by the buffer-name displayed in a
+window. Selecting the buffer-name will make the displaying window the
+selected-window. Which windows are offered depends on the currently selected
+window at call-time: If not a window contained in WIN-LIST is currently the
+selected-window then all windows of WIN-LIST are offered in canonical order
+\(means from top-left to button-right). If a window contained in WIN-LIST is
+currently the selected-window then all other\(!) windows of WIN-LIST are
+offered, beginning with the next edit-window to the currently selected window
+\(the following windows also in canonical order). If there is only one
+senseful destination-window then this window is immediately selected, without
+confirmation \(e.g. if WIN-LIST is the list of all edit-windows: There are two
+edit-windows and point stays in one of them. Or there is only one edit-window
+and point stays either in one of the special ecb-windows or in the
+compile-window).
+
+If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all
+possible destinations are immediately shown in a completion-buffer."
+  (when ecb-minor-mode
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (let* ((destination-list (if (member (selected-window) win-list)
+                                 ;; point already in a window of the win-list ==> all
+                                 ;; windows of this list but the current one
+                                 (cdr (ecb-rotate win-list (selected-window)))
+                               ;; point elsewhere ==> all windows of the list in
+                               ;; canonical order
+                               win-list))
+           ;; build an alist with car is a left-trimmed buffer-name (usefull
+           ;; for the special ECB-buffers which all start with a blank) and
+           ;; cdr ist the real buffer-name (used for selecting the buffer)
+           (choices-buffer-name-alist
+            (mapcar (function (lambda (w)
+                                (cons (ecb-left-trim (buffer-name (window-buffer w)))
+                                      (buffer-name (window-buffer w)))))
+                    destination-list)))
+      (when choices-buffer-name-alist
+        (if (= (length choices-buffer-name-alist) 1)
+            ;; no user-interaction necessary because only one senseful destination
+            (ecb-window-select (cdar choices-buffer-name-alist))
+          ;; we ask the user which window/buffer should be selected. For conveniance
+          ;; the left-trimmed buffer-names are offered - s.a.
+          (if use-immediate-completion
+              (ecb-window-select
+               (cdr (assoc (ecb-offer-choices "Select a window: "
+                                              (mapcar 'car choices-buffer-name-alist))
+                           choices-buffer-name-alist)))
+            (ecb-window-select
+             (cdr (assoc (ecb-query-string "Select a window: "
+                                           (mapcar 'car choices-buffer-name-alist))
+                         choices-buffer-name-alist)))))))))
+
+(defun ecb-goto-window-compilation ()
+  "Goto the ecb compilation window `ecb-compile-window'."
+  (interactive)
+  (when (and ecb-minor-mode
+             (equal 'visible (ecb-compile-window-state)))
+    (raise-frame ecb-frame)
+    (select-frame ecb-frame)
+    (select-window ecb-compile-window)))
+
+
+(defun ecb-select-ecb-frame ()
+  "Selects the `ecb-frame' if ECB is activated - otherwise reports an error."
+  (interactive)
+  (if ecb-minor-mode
+      (progn
+        (raise-frame ecb-frame)
+        (select-frame ecb-frame))
+    (ecb-error "ECB is not avtive in any frame!")))
+
+(defun ecb-select-edit-window (&optional edit-window-number)
+  "Moves point into the edit-window. If optional EDIT-WINDOW-NUMBER
+is an integer then move point into the EDIT-WINDOW-NUMBER-nth edit-window
+\(beginning from 1). If EDIT-WINDOW-NUMBER is not nil but not an integer or an
+integer < 0 or > number of current available edit-windows then move point to
+the second edit-window if there is more than 1. If EDIT-WINDOW-NUMBER is nil
+then select the edit-window according to the value of the option
+`ecb-mouse-click-destination'. If point already stays in the right edit-window
+nothing is done."
+  (if (and (null edit-window-number)
+           (equal ecb-mouse-click-destination 'last-point))
+      (condition-case nil
+          (select-window ecb-last-edit-window-with-point)
+        (error (ecb-select-edit-window 1)))
+    (let* ((edit-win-list (ecb-canonical-edit-windows-list))
+           (edit-win (or (and (not edit-window-number)
+                              (car edit-win-list))
+                         (and (integerp edit-window-number)
+                              (> edit-window-number 0)
+                              (<= edit-window-number (length edit-win-list))
+                              (nth (1- edit-window-number) edit-win-list))
+                         (and (> (length edit-win-list) 1)
+                              (nth 1 edit-win-list))
+                         (car edit-win-list))))
+      (select-window edit-win))))
+
+;; VERY IMPORTANT: pre-command- and the post-command-hook must NOT use any
+;; function which calls `ecb-window-list' because this would slow-down the
+;; performance of all Emacs-versions unless GNU Emacs >= 21 because they have no
+;; builtin `window-list'-function.
+(defecb-autocontrol/sync-function ecb-layout-pre-command-hook nil nil nil
+  "During activated ECB this function is added to `pre-command-hook' to set
+always `ecb-last-edit-window-with-point', `ecb-last-source-buffer',
+`ecb-compile-window-was-selected-before-command' and
+`ecb-last-compile-buffer-in-compile-window' correct so other functions
+can use these variables."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    ;; We MUST not use here `ecb-point-in-edit-window-number' because this
+    ;; would slow-down the performance of all Emacs-versions unless GNU Emacs
+    ;; >= 21 because they have no builtin `window-list'-function.
+    (when (and (not (ecb-point-in-dedicated-special-buffer))
+               (not (equal (minibuffer-window ecb-frame)
+                           (selected-window)))
+               (not (ecb-point-in-compile-window)))
+      (setq ecb-last-edit-window-with-point (selected-window))
+      (setq ecb-last-source-buffer (current-buffer)))
+    (if (ecb-point-in-compile-window)
+        (progn
+          (setq ecb-compile-window-was-selected-before-command t)
+          (setq ecb-last-compile-buffer-in-compile-window
+                (current-buffer)))
+      (setq ecb-compile-window-was-selected-before-command nil)
+      (setq ecb-last-compile-buffer-in-compile-window nil))
+    (if (ecb-point-in-dedicated-special-buffer)
+        (setq ecb-ecb-buffer-name-selected-before-command (buffer-name))
+      (setq ecb-ecb-buffer-name-selected-before-command nil))))
+      
+
+(defvar ecb-layout-prevent-handle-compile-window-selection nil)
+(defvar ecb-last-edit-area-creators nil)
+(defecb-autocontrol/sync-function ecb-layout-post-command-hook nil nil nil
+  "During activated ECB this function is added to `post-command-hook' to do
+some special tasks:
+- handling of `ecb-compile-window-temporally-enlarge'
+- handling of `ecb-maximize-ecb-window-after-selection'"
+  (if ecb-layout-prevent-handle-compile-window-selection
+      (setq ecb-layout-prevent-handle-compile-window-selection nil)
+    (when (and ecb-minor-mode
+               (equal (selected-frame) ecb-frame)
+               (member ecb-compile-window-temporally-enlarge
+                       '(after-selection both))
+               (ecb-compile-window-live-p)
+               (= (minibuffer-depth) 0))
+      (cond ((and (ecb-point-in-compile-window)
+                  (not ecb-compile-window-was-selected-before-command))
+             (ecb-layout-debug-error "ecb-layout-post-command-hook: enlarge")
+             (ecb-toggle-compile-window-height 1)
+             ;; now we change the window-start, so we see autom. more text
+             ;; after the enlargement of the window.
+;;              (let ((height-before (ecb-window-full-height))
+;;                    (height-after (ecb-toggle-compile-window-height 1)))
+;;                (set-window-start ecb-compile-window
+;;                                  (save-excursion
+;;                                    (goto-char (window-start))
+;;                                    (forward-line (* -1 (- height-after height-before)))
+;;                                    (ecb-line-beginning-pos))
+;;                                  t))
+             )
+            ((and ecb-compile-window-was-selected-before-command
+                  (not (ecb-point-in-compile-window)))
+             (ecb-layout-debug-error "ecb-layout-post-command-hook: shrink")
+             (ecb-toggle-compile-window-height -1)))))
+  (if ecb-layout-prevent-handle-ecb-window-selection
+      (progn
+        (setq ecb-layout-prevent-handle-ecb-window-selection nil))
+    (when (and ecb-minor-mode
+               ecb-maximize-ecb-window-after-selection
+               ;; Klaus Berndl <klaus.berndl@sdm.de>: There is a very
+               ;; mysterious behavior of GNU Emacs 21: When reaching this
+               ;; code-part then after the full-redraw Emacs runs
+               ;; automatically the command bound to the button-release-event
+               ;; of mouse-1 with an event which contains as event-window the
+               ;; top/left-most window which is in left- and top-layouts the
+               ;; first ecb-window - so it seems that Emacs automatically
+               ;; "clicks" into the first ecb-window which then maximizes this
+               ;; window which is definitively very annoying and a bug (with
+               ;; right-layouts there is no problem, because the top/left-most
+               ;; window is not a ecb-tree-window and has therefore no special
+               ;; mouse-1 binding!). But it's currently not sure if it is a
+               ;; bug somewhere in ECB or in GNU Emacs - but for the moment i
+               ;; assume Emacs because with XEmacs all is working fine, i.e.
+               ;; the full window redraw is done and nothing afterwards this
+               ;; post-command-hook.
+
+               ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: We should identify
+               ;; the underlying problem and if it is an Emacs-bug we should
+               ;; report it - maybe we have to write a small ECB-independent
+               ;; code-example which reproduces this bug/behavior?!!
+
+               ;; In the meanwhile we allow automatic maximizing only when
+               ;; `ecb-tree-mouse-action-trigger' is 'button-press!
+               (or ecb-running-xemacs
+                   ecb-running-version-22
+                   (equal ecb-tree-mouse-action-trigger 'button-press))
+               (equal (selected-frame) ecb-frame)
+               (= (minibuffer-depth) 0))
+      (cond ((and (not (equal ecb-ecb-buffer-name-selected-before-command
+                              (buffer-name)))
+                  (ecb-point-in-dedicated-special-buffer))
+             (ecb-maximize-ecb-buffer (buffer-name) t))
+            ((and ecb-ecb-buffer-name-selected-before-command
+                  (not (ecb-point-in-dedicated-special-buffer)))
+             (ecb-redraw-layout-full nil nil nil nil)))))
+  )
+
+
+;; here come the advices
+
+;; *** `special-display-buffer-names' and `special-display-regexps' now
+;; understand two new boolean pseudo-frame-parameters `same-frame' and
+;; `same-buffer'. This is new in Emacs 22 so we have to integrate it!
+;; The format is: (same-buffer . VALUE) or (same-frame . VALUE). But this is
+;; automatically taken into account by ecb-check-for-special-buffer because
+;; the car of an element of special-display-buffer-names must be a buffer-name
+;; and we must only check if the buffer-name matches... if yes our advice of
+;; display-buffer calls et the end by ad-do-it the display-buffer-code which
+;; itself evaluates these options... so we are fine with the following
+;; implementation!
+
+(defun ecb-check-for-special-buffer (buffer-or-name)
+  "Return  not nil if and only if `special-display-function' is not nil and
+BUFFER-OR-NAME is contained or matches `special-display-buffer-names' or
+`special-display-regexps'."
+  (let ((result
+         (if (ecb-ignore-special-display)
+             nil
+           (catch 'done
+             (let ((buf-name (ecb-buffer-name buffer-or-name)))
+               (when (and buf-name special-display-function)
+                 (if (member buf-name
+                             special-display-buffer-names)
+                     (throw 'done t))
+      
+                 (let ((tem (assoc buf-name
+                                   special-display-buffer-names)))
+                   (if tem
+                       (throw 'done t)))
+
+                 (let ((tem special-display-regexps))
+                   (while tem
+                     (let ((car (car tem)))
+                       (if (and (stringp car)
+                                (save-match-data (string-match car buf-name)))
+                           (throw 'done t))
+                       (if (and (consp car)
+                                (stringp (car car))
+                                (save-match-data (string-match (car car) buf-name)))
+                           (throw 'done t)))
+                     (setq tem (cdr tem))))))))))
+    (ecb-layout-debug-error "ecb-check-for-special-buffer for %s: %s"
+                            buffer-or-name result)
+    result))
+    
+(defun ecb-check-for-same-window-buffer (buffer-or-name)
+  "Return not nil if BUFFER-OR-NAME is contained or matches
+`same-window-buffer-names' or `same-window-regexps'."
+  (let ((result
+          (catch 'done
+            (let ((buf-name (ecb-buffer-name buffer-or-name)))
+              (when buf-name
+                (if (or (member buf-name same-window-buffer-names)
+                        (assoc buf-name same-window-buffer-names))
+                    (throw 'done t))
+                (let ((tem same-window-regexps))
+                  (while tem
+                    (let ((car (car tem)))
+                      (if (or
+                           (and (stringp car)
+                                (save-match-data (string-match car buf-name)))
+                           (and (consp car) (stringp (car car))
+                                (save-match-data (string-match (car car) buf-name))))
+                          (throw 'done t)))
+                    (setq tem (cdr tem)))))))))
+     (ecb-layout-debug-error "ecb-check-for-same-window-buffer for %s: %s"
+                             buffer-or-name result)
+     result))
+
+(if ecb-running-xemacs
+    (defmacro ecb-with-unsplittable-ecb-frame (&rest body)
+      "Runs BODY with `ecb-frame' temporally unsplittable."
+      `(unwind-protect
+           (progn
+             (set-frame-property ecb-frame 'unsplittable t)
+             ,@body)
+         (set-frame-property ecb-frame 'unsplittable nil)))
+    
+  (defmacro ecb-with-unsplittable-ecb-frame (&rest body)
+    "Runs BODY with `ecb-frame' temporally unsplittable."
+    `(unwind-protect
+         (progn
+           (modify-frame-parameters ecb-frame '((unsplittable . t)))
+           ,@body)
+       (modify-frame-parameters ecb-frame '((unsplittable . nil)))))
+  )
+     
+
+
+(defvar ecb-layout-temporary-dedicated-windows nil
+  "List of windows temporary made dedicated by ECB.
+Only set by the adviced `display-buffer' and only evaluated by
+`ecb-canonical-edit-windows-list' and `ecb-canonical-ecb-windows-list'. This
+variable is strictly only for internal usage!")
+
+;; The XEmacs-versions never choose dedicated windows (so the function don't
+;; have a DEDICATED argument and so we don't need advice....
+(when-ecb-running-emacs
+ (defecb-advice get-largest-window before ecb-layout-basic-adviced-functions
+   "When called from within the `ecb-frame' then DEDICATED is always set to nil.
+So never a dedicated window is returned during activated ECB."
+   (ecb-layout-debug-error "get-largest-window for frame:%s, dedicated:%s"
+                           (ad-get-arg 0) (ad-get-arg 1))
+   (and (boundp 'ecb-minor-mode)
+        ecb-minor-mode
+        (eq (selected-frame) ecb-frame)
+        ;; caller wants dedicated windows also taken into account
+        (ad-get-arg 1)
+        ;; we forbid dedicated windows
+        (ad-set-arg 1 nil)))
+      
+
+ (defecb-advice get-lru-window before ecb-layout-basic-adviced-functions
+   "When called from within the `ecb-frame' then DEDICATED is always set to nil.
+So never a dedicated window is returned during activated ECB."
+   (ecb-layout-debug-error "get-lru-window for frame:%s, dedicated:%s"
+                           (ad-get-arg 0) (ad-get-arg 1))
+   (and (boundp 'ecb-minor-mode)
+        ecb-minor-mode
+        (eq (selected-frame) ecb-frame)
+        ;; caller wants dedicated windows also taken into account
+        (ad-get-arg 1)
+        ;; we forbid dedicated windows
+        (ad-set-arg 1 nil)))
+ )
+
+
+;; This advice is the heart of the mechanism which displays all buffer in the
+;; compile-window if they are are "compilation-buffers" in the sense of
+;; `ecb-compilation-buffer-p'!
+;; We do not use `display-buffer-function' but we just handle it within the
+;; advice, because otherwise we would have to implement all window-choosing
+;; for ourself and with our advice we just "restrict" the windows
+;; `display-buffer' can use (by setting the not choosable windows temporarly
+;; dedicated) but the real choosing-task is done by the function
+;; itself - this is much better and smarter than implementing the whole stuff.
+
+(defecb-advice display-buffer around ecb-layout-basic-adviced-functions
+  "Makes this function compatible with ECB if called in or for the ecb-frame.
+It displays all buffers which are \"compilation-buffers\" in the sense of
+`ecb-compilation-buffer-p' in the compile-window of ECB. If the compile-window
+is temporally hidden then it will be displayed first.
+
+If there is no compile-window \(`ecb-compile-window-height' is nil) then it
+splits the edit-window if unsplitted and displays BUFFER in the other
+edit-window but only if `pop-up-windows' is not nil \(otherwise the
+edit-window will not splitted).
+
+All buffers which are not \"compilation-buffers\" in the sense of
+`ecb-compilation-buffer-p' will be displayed in one of the edit-area and
+`display-buffer' behaves as if the edit-windows would be the only windows in
+the frame.
+
+If BUFFER is contained in `special-display-buffer-names' or matches
+`special-display-regexps' then `special-display-function' will be called \(if
+not nil). But this behavior depends on the value of the option
+`ecb-ignore-special-display'. The values of `same-window-buffer-names' and
+`same-window-regexps' are supported as well.
+
+See the value of the option `ecb-ignore-display-buffer-function'!
+
+If called for other frames it works like the original version."
+  (if ecb-running-xemacs
+      (ecb-layout-debug-error "display-buffer entered with: %s %s %s %s"
+                              (ad-get-arg 0)
+                              (ad-get-arg 1)
+                              (ad-get-arg 2)
+                              (ad-get-arg 3))
+    (ecb-layout-debug-error "display-buffer entered with: %s %s %s"
+                            (ad-get-arg 0)
+                            (ad-get-arg 1)
+                            (ad-get-arg 2)))
+  (if (and ecb-minor-mode
+           (or (and (ad-get-arg 2)
+                    (framep (ad-get-arg 2))
+                    (equal (ad-get-arg 2) ecb-frame))
+               (and (or (null (ad-get-arg 2))
+                        (equal (ad-get-arg 2) t)
+                        (equal (ad-get-arg 2) 0))
+                    (equal (selected-frame) ecb-frame)))
+           (not (ecb-check-for-special-buffer (ad-get-arg 0)))
+           (not (and (boundp 'display-buffer-function)
+                     (fboundp display-buffer-function)
+                     (not (ecb-ignore-display-buffer-function)))))
+      (let ((special-display-function (if (ecb-ignore-special-display)
+                                          nil
+                                        special-display-function)))
+        (cond ((ecb-compilation-buffer-p (ad-get-arg 0))
+               (ecb-layout-debug-error "display-buffer for a comp-buffer: %s"
+                                       (ad-get-arg 0))
+               ;; we have to display the buffer in the compile-window if a
+               ;; compile-window was set but currently hidden --> then we have
+               ;; to show it now. `ecb-toggle-compile-window' preserves always
+               ;; the selected window!
+               (when (and (equal 'hidden (ecb-compile-window-state))
+                          ;; calling this from minibuffer (e.g. completions)
+                          ;; seems to cause problems
+                          (not (equal (minibuffer-window ecb-frame) (selected-window))))
+                 (ecb-layout-debug-error "display-buffer: comp-win will be toggled.")
+                 (save-excursion (ecb-toggle-compile-window 1)))
+               (if (ecb-compile-window-live-p)
+                   ;; now we have to make the edit-window(s) dedicated
+                   (let ((edit-window-list (ecb-canonical-edit-windows-list))
+                         (pop-up-frames (if (ecb-ignore-pop-up-frames)
+                                            nil
+                                          pop-up-frames)))
+                     (ecb-layout-debug-error "display-buffer: buffer %s has to be displayed in the alive compile-window: %s"
+                                             (ad-get-arg 0) ecb-compile-window)
+                     (unwind-protect
+                         (progn
+                           (mapc (function (lambda (w)
+                                             (set-window-dedicated-p w t)))
+                                 edit-window-list)
+                           (setq ecb-layout-temporary-dedicated-windows
+                                 edit-window-list)
+                           ;; now we perform the original `display-buffer' but
+                           ;; now the only not dedicated window is the compile
+                           ;; window so `display-buffer' MUST use this.
+
+                           ;; `display-buffer' sometimes tries to split the
+                           ;; compile-window (e.g. if it is called from the
+                           ;; compile-window - e.g. calling help from the
+                           ;; compile-window - or with Emacs 23 also when
+                           ;; using a frame-width compile-window and do
+                           ;; completions). To avoid this we must temporally
+                           ;; make the ecb-frame unsplittable - but here we
+                           ;; can do this savely because here we have a live
+                           ;; compile-window and a buffer which should be
+                           ;; displayed there ==> display-buffer MUST
+                           ;; (because all other windows are temporally
+                           ;; dedicated) use exactly this window and there
+                           ;; is no need to split it
+                           (ecb-with-unsplittable-ecb-frame
+                            (if ecb-running-xemacs
+                                ;; XEmacs does not shrink to fit if
+                                ;; `pop-up-windows' is nil so we must set it
+                                ;; here temporally to t
+                                (let ((pop-up-windows t))
+                                  ad-do-it)
+                              ad-do-it)))
+                       ;; making the edit-window(s) not dedicated
+                       (mapc (function (lambda (w)
+                                         (set-window-dedicated-p w nil)))
+                             edit-window-list)
+                       ;;(modify-frame-parameters ecb-frame '((unsplittable . nil)))
+                       (setq ecb-layout-temporary-dedicated-windows nil)) ;; end unwind-protect
+
+                     ;; if called interactively we run now our
+                     ;; `ecb-toggle-compile-window-height' to set the height of
+                     ;; the compile-window according to the value of
+                     ;; `ecb-enlarged-compilation-window-max-height'. If called
+                     ;; non-interactively (e.g. by `compile-internal',
+                     ;; `with-output-to-temp-buffer' etc...) then all the
+                     ;; resizing or shrinking stuff is handled by
+                     ;; `compilation-set-window-height',
+                     ;; `resize-temp-buffer-window' (GNU Emacs) or
+                     ;; `shrink-window-if-larger-than-buffer' (called by the
+                     ;; SHRINK-TO-FIT arg of the XEmacs `display-buffer').
+
+                     ;; We can not do this in the non-interactive case because
+                     ;; here often after the call of display-buffer the buffer
+                     ;; to display does not contain its final contents so the
+                     ;; algorithm of `ecb-toggle-compile-window-height' fails
+                     ;; (e.g. during `compile-internal'!).
+                     (unless pop-up-frames
+                       (if (interactive-p)
+                           (ecb-set-compile-window-height)
+                         (if (save-excursion
+                               (set-buffer (ad-get-arg 0))
+                               (= (point-min) (point-max)))
+                             ;; Klaus Berndl <klaus.berndl@sdm.de>: If this
+                             ;; makes trouble we remove it.
+                             (ecb-toggle-compile-window-height -1)))
+                       
+                       (if (member ecb-compile-window-temporally-enlarge
+                                   '(after-selection both))
+                           (setq ecb-layout-prevent-handle-compile-window-selection t)))
+                     ) ;; end of let...
+
+                 ;; OK, we have really no compile-window...
+               
+                 ;; needed for TAB-completion if this offers the completions in
+                 ;; a temp-buffer. Without this manually split the whole
+                 ;; edit-window would be used for the completions which is not
+                 ;; the default-behavior of Emacs.
+                 (let ((pop-up-frames (if (ecb-ignore-pop-up-frames)
+                                          nil
+                                        pop-up-frames)))
+                   ;; emacs 23 splits automatically when window-size allows
+                   ;; this (see split-width-threshold and
+                   ;; split-height-threshold)... 
+                   (when (and (not ecb-running-version-23)
+                              (not ecb-windows-hidden)
+                              (not (ecb-layout-top-p))
+                              pop-up-windows
+                              (not pop-up-frames)
+                              (not (ecb-edit-window-splitted))
+                              (not (ecb-check-for-same-window-buffer (ad-get-arg 0))))
+                     (ecb-layout-debug-error "display-buffer for comp-buffer %s - split edit-window:"
+                                             (ad-get-arg 0))
+                     (split-window (car (ecb-canonical-edit-windows-list))))
+                   ;; Here the values of temp-buffer-max-height and
+                   ;; compilation-window-height take effect.
+                   ad-do-it)))
+            
+              ((not (ecb-buffer-is-dedicated-special-buffer-p (ad-get-arg 0)))
+               (ecb-layout-debug-error "display-buffer for normal buffer: %s"
+                                       (ad-get-arg 0))
+               (let ((edit-win-list (ecb-canonical-edit-windows-list))
+                     (pop-up-frames (if (ecb-ignore-pop-up-frames)
+                                        nil
+                                      pop-up-frames)))
+                 ;; maybe we have to split the edit-area here
+                 (when (and (or pop-up-windows (ad-get-arg 1))
+                            (not pop-up-frames)
+                            (not (ecb-edit-window-splitted edit-win-list))
+                            ;; if the BUFFER is already displayed in an
+                            ;; edit-window and NOT-THIS-WINDOW is nil then
+                            ;; we must not split the edit-window because
+                            ;; display-buffer then just uses this window for
+                            ;; displaying BUFFER.
+                            (not (and (not (ad-get-arg 1))
+                                      (member (get-buffer-window (ad-get-arg 0) ecb-frame)
+                                              edit-win-list)))
+                            ;; if we display a "normal" buffer from outside
+                            ;; the edit-windows then we have per se another
+                            ;; window because the buffer will displayed in
+                            ;; an edit-window ==> we only split if we are
+                            ;; already in an edit-window.
+                            (ecb-point-in-edit-window-number edit-win-list)
+                            (not (ecb-check-for-same-window-buffer (ad-get-arg 0))))
+                   (ecb-layout-debug-error "display-buffer for normal-buffer %s - split edit-window:"
+                                           (ad-get-arg 0))
+                   (split-window (car edit-win-list)))
+                 (if (ecb-compile-window-live-p)
+                     (unwind-protect
+                         (progn
+                           (set-window-dedicated-p ecb-compile-window t)
+                           ;; now we perform the original `display-buffer' but
+                           ;; now the only not dedicated window(s) are the
+                           ;; edit-window(s)
+                           (setq ecb-layout-temporary-dedicated-windows
+                                 (list ecb-compile-window))
+                           ad-do-it)
+                       ;; making the compile-window not dedicated
+                       (set-window-dedicated-p ecb-compile-window nil)
+                       (setq ecb-layout-temporary-dedicated-windows nil))
+                   ad-do-it)))
+            
+              (t ;; buffer is a special ecb-buffer
+               (ecb-layout-debug-error "display-buffer for special ecb-buffer: %s" (ad-get-arg 0))
+               (or (setq ad-return-value (get-buffer-window (ad-get-arg 0) ecb-frame))
+                   (ecb-error "display-buffer can not display not visible ecb-buffers!")))))
+
+    (ecb-layout-debug-error "display-buffer - just run original version.")
+    (ecb-with-original-basic-functions
+     ad-do-it)))
+
+;; (defecb-advice display-buffer around ecb-layout-basic-adviced-functions
+;;   "Makes this function compatible with ECB if called in or for the ecb-frame.
+;; It displays all buffers which are \"compilation-buffers\" in the sense of
+;; `ecb-compilation-buffer-p' in the compile-window of ECB. If the compile-window
+;; is temporally hidden then it will be displayed first.
+
+;; If there is no compile-window \(`ecb-compile-window-height' is nil) then it
+;; splits the edit-window if unsplitted and displays BUFFER in the other
+;; edit-window but only if `pop-up-windows' is not nil \(otherwise the
+;; edit-window will not splitted).
+
+;; All buffers which are not \"compilation-buffers\" in the sense of
+;; `ecb-compilation-buffer-p' will be displayed in one of the edit-area and
+;; `display-buffer' behaves as if the edit-windows would be the only windows in
+;; the frame.
+
+;; If BUFFER is contained in `special-display-buffer-names' or matches
+;; `special-display-regexps' then `special-display-function' will be called \(if
+;; not nil). But this behavior depends on the value of the option
+;; `ecb-ignore-special-display'. The values of `same-window-buffer-names' and
+;; `same-window-regexps' are supported as well.
+
+;; See the value of the option `ecb-ignore-display-buffer-function'!
+
+;; If called for other frames it works like the original version."
+;;   (if ecb-running-xemacs
+;;       (ecb-layout-debug-error "display-buffer entered with: %s %s %s %s"
+;;                               (ad-get-arg 0)
+;;                               (ad-get-arg 1)
+;;                               (ad-get-arg 2)
+;;                               (ad-get-arg 3))
+;;     (ecb-layout-debug-error "display-buffer entered with: %s %s %s"
+;;                             (ad-get-arg 0)
+;;                             (ad-get-arg 1)
+;;                             (ad-get-arg 2)))
+;;   (if (and ecb-minor-mode
+;;            (or (and (ad-get-arg 2)
+;;                     (framep (ad-get-arg 2))
+;;                     (equal (ad-get-arg 2) ecb-frame))
+;;                (and (or (null (ad-get-arg 2))
+;;                         (equal (ad-get-arg 2) t)
+;;                         (equal (ad-get-arg 2) 0))
+;;                     (equal (selected-frame) ecb-frame)))
+;;            (not (ecb-check-for-special-buffer (ad-get-arg 0)))
+;;            (not (and (boundp 'display-buffer-function)
+;;                      (fboundp display-buffer-function)
+;;                      (not (ecb-ignore-display-buffer-function)))))
+;;       (let ((special-display-function (if (ecb-ignore-special-display)
+;;                                           nil
+;;                                         special-display-function)))
+;;         (cond ((ecb-compilation-buffer-p (ad-get-arg 0))
+;;                (ecb-layout-debug-error "display-buffer for a comp-buffer: %s"
+;;                                        (ad-get-arg 0))
+;;                ;; we have to display the buffer in the compile-window if a
+;;                ;; compile-window was set but currently hidden --> then we have
+;;                ;; to show it now. `ecb-toggle-compile-window' preserves always
+;;                ;; the selected window!
+;;                (when (and (equal 'hidden (ecb-compile-window-state))
+;;                           ;; calling this from minibuffer (e.g. completions)
+;;                           ;; seems to cause problems
+;;                           (not (equal (minibuffer-window ecb-frame) (selected-window))))
+;;                  (ecb-layout-debug-error "display-buffer: comp-win will be toggled.")
+;;                  (save-excursion (ecb-toggle-compile-window 1)))
+;;                (if (ecb-compile-window-live-p)
+;;                    ;; now we have to make the edit-window(s) dedicated
+;;                    (let ((edit-window-list (ecb-canonical-edit-windows-list))
+;;                          (pop-up-frames (if (ecb-ignore-pop-up-frames)
+;;                                             nil
+;;                                           pop-up-frames)))
+;;                      (ecb-layout-debug-error "display-buffer: buffer %s has to be displayed in the alive compile-window: %s"
+;;                                              (ad-get-arg 0) ecb-compile-window)
+;;                      (unwind-protect
+;;                          (progn
+;;                            (mapc (function (lambda (w)
+;;                                              (set-window-dedicated-p w t)))
+;;                                  edit-window-list)
+;;                            (setq ecb-layout-temporary-dedicated-windows
+;;                                  edit-window-list)
+;;                            ;; now we perform the original `display-buffer' but
+;;                            ;; now the only not dedicated window is the compile
+;;                            ;; window so `display-buffer' MUST use this.
+
+;;                            ;; `display-buffer' sometimes tries to split the
+;;                            ;; compile-window (e.g. if it is called from the
+;;                            ;; compile-window - e.g. calling help from the
+;;                            ;; compile-window - or with Emacs 23 also when
+;;                            ;; using a frame-width compile-window and do
+;;                            ;; completions). To avoid this we must temporally
+;;                            ;; make the ecb-frame unsplittable - but here we
+;;                            ;; can do this savely because here we have a live
+;;                            ;; compile-window and a buffer which should be
+;;                            ;; displayed there ==> display-buffer MUST
+;;                            ;; (because all other windows are temporally
+;;                            ;; dedicated) use exactly this window and there
+;;                            ;; is no need to split it
+;;                            (ecb-with-unsplittable-ecb-frame
+;;                             (if ecb-running-xemacs
+;;                                 ;; XEmacs does not shrink to fit if
+;;                                 ;; `pop-up-windows' is nil so we must set it
+;;                                 ;; here temporally to t
+;;                                 (let ((pop-up-windows t))
+;;                                   (setq ad-return-value
+;;                                         (ecb-display-buffer-xemacs (ad-get-arg 0)
+;;                                                                    (ad-get-arg 1)
+;;                                                                    (ad-get-arg 2)
+;;                                                                    (ad-get-arg 3))))
+;;                               ad-do-it)))
+;;                        ;; making the edit-window(s) not dedicated
+;;                        (mapc (function (lambda (w)
+;;                                          (set-window-dedicated-p w nil)))
+;;                              edit-window-list)
+;;                        ;;(modify-frame-parameters ecb-frame '((unsplittable . nil)))
+;;                        (setq ecb-layout-temporary-dedicated-windows nil)) ;; end unwind-protect
+
+;;                      ;; if called interactively we run now our
+;;                      ;; `ecb-toggle-compile-window-height' to set the height of
+;;                      ;; the compile-window according to the value of
+;;                      ;; `ecb-enlarged-compilation-window-max-height'. If called
+;;                      ;; non-interactively (e.g. by `compile-internal',
+;;                      ;; `with-output-to-temp-buffer' etc...) then all the
+;;                      ;; resizing or shrinking stuff is handled by
+;;                      ;; `compilation-set-window-height',
+;;                      ;; `resize-temp-buffer-window' (GNU Emacs) or
+;;                      ;; `shrink-window-if-larger-than-buffer' (called by the
+;;                      ;; SHRINK-TO-FIT arg of the XEmacs `display-buffer').
+
+;;                      ;; We can not do this in the non-interactive case because
+;;                      ;; here often after the call of display-buffer the buffer
+;;                      ;; to display does not contain its final contents so the
+;;                      ;; algorithm of `ecb-toggle-compile-window-height' fails
+;;                      ;; (e.g. during `compile-internal'!).
+;;                      (unless pop-up-frames
+;;                        (if (interactive-p)
+;;                            (ecb-set-compile-window-height)
+;;                          (if (save-excursion
+;;                                (set-buffer (ad-get-arg 0))
+;;                                (= (point-min) (point-max)))
+;;                              ;; Klaus Berndl <klaus.berndl@sdm.de>: If this
+;;                              ;; makes trouble we remove it.
+;;                              (ecb-toggle-compile-window-height -1)))
+                       
+;;                        (if (member ecb-compile-window-temporally-enlarge
+;;                                    '(after-selection both))
+;;                            (setq ecb-layout-prevent-handle-compile-window-selection t)))
+;;                      ) ;; end of let...
+
+;;                  ;; OK, we have really no compile-window...
+               
+;;                  ;; needed for TAB-completion if this offers the completions in
+;;                  ;; a temp-buffer. Without this manually split the whole
+;;                  ;; edit-window would be used for the completions which is not
+;;                  ;; the default-behavior of Emacs.
+;;                  (let ((pop-up-frames (if (ecb-ignore-pop-up-frames)
+;;                                           nil
+;;                                         pop-up-frames)))
+;;                    ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: emacs 23
+;;                    ;; splits automatically when window-size allows this (see
+;;                    ;; split-width-threshold and split-height-threshold)...
+;;                    ;; Test and ev. modify (not a serious problem but not nice)
+;;                    (when (and (not ecb-windows-hidden)
+;;                               (not (ecb-layout-top-p))
+;;                               pop-up-windows
+;;                               (not pop-up-frames)
+;;                               (not (ecb-edit-window-splitted))
+;;                               (not (ecb-check-for-same-window-buffer (ad-get-arg 0))))
+;;                      (ecb-layout-debug-error "display-buffer for comp-buffer %s - split edit-window:"
+;;                                              (ad-get-arg 0))
+;;                      (split-window (car (ecb-canonical-edit-windows-list))))
+;;                    ;; Here the values of temp-buffer-max-height and
+;;                    ;; compilation-window-height take effect.
+;;                    (if ecb-running-xemacs
+;;                        (setq ad-return-value
+;;                              (ecb-display-buffer-xemacs (ad-get-arg 0)
+;;                                                         (ad-get-arg 1)
+;;                                                         (ad-get-arg 2)
+;;                                                         (ad-get-arg 3)))
+;;                      ad-do-it))))
+            
+;;               ((not (ecb-buffer-is-dedicated-special-buffer-p (ad-get-arg 0)))
+;;                (ecb-layout-debug-error "display-buffer for normal buffer: %s"
+;;                                        (ad-get-arg 0))
+;;                (let ((edit-win-list (ecb-canonical-edit-windows-list))
+;;                      (pop-up-frames (if (ecb-ignore-pop-up-frames)
+;;                                         nil
+;;                                       pop-up-frames)))
+;;                  ;; maybe we have to split the edit-area here
+;;                  (when (and (or pop-up-windows (ad-get-arg 1))
+;;                             (not pop-up-frames)
+;;                             (not (ecb-edit-window-splitted edit-win-list))
+;;                             ;; if the BUFFER is already displayed in an
+;;                             ;; edit-window and NOT-THIS-WINDOW is nil then
+;;                             ;; we must not split the edit-window because
+;;                             ;; display-buffer then just uses this window for
+;;                             ;; displaying BUFFER.
+;;                             (not (and (not (ad-get-arg 1))
+;;                                       (member (get-buffer-window (ad-get-arg 0) ecb-frame)
+;;                                               edit-win-list)))
+;;                             ;; if we display a "normal" buffer from outside
+;;                             ;; the edit-windows then we have per se another
+;;                             ;; window because the buffer will displayed in
+;;                             ;; an edit-window ==> we only split if we are
+;;                             ;; already in an edit-window.
+;;                             (ecb-point-in-edit-window-number edit-win-list)
+;;                             (not (ecb-check-for-same-window-buffer (ad-get-arg 0))))
+;;                    (ecb-layout-debug-error "display-buffer for normal-buffer %s - split edit-window:"
+;;                                            (ad-get-arg 0))
+;;                    (split-window (car edit-win-list)))
+;;                  (if (ecb-compile-window-live-p)
+;;                      (unwind-protect
+;;                          (progn
+;;                            (set-window-dedicated-p ecb-compile-window t)
+;;                            ;; now we perform the original `display-buffer' but
+;;                            ;; now the only not dedicated window(s) are the
+;;                            ;; edit-window(s)
+;;                            (setq ecb-layout-temporary-dedicated-windows
+;;                                  (list ecb-compile-window))
+;;                            (if ecb-running-xemacs
+;;                                (setq ad-return-value
+;;                                      (ecb-display-buffer-xemacs (ad-get-arg 0)
+;;                                                                 (ad-get-arg 1)
+;;                                                                 (ad-get-arg 2)
+;;                                                                 (ad-get-arg 3)))
+;;                              ad-do-it))
+;;                        ;; making the compile-window not dedicated
+;;                        (set-window-dedicated-p ecb-compile-window nil)
+;;                        (setq ecb-layout-temporary-dedicated-windows nil))
+;;                    (if ecb-running-xemacs
+;;                        (setq ad-return-value
+;;                              (ecb-display-buffer-xemacs (ad-get-arg 0)
+;;                                                         (ad-get-arg 1)
+;;                                                         (ad-get-arg 2)
+;;                                                         (ad-get-arg 3)))
+;;                      ad-do-it))))
+            
+;;               (t ;; buffer is a special ecb-buffer
+;;                (ecb-layout-debug-error "display-buffer for special ecb-buffer: %s" (ad-get-arg 0))
+;;                (or (setq ad-return-value (get-buffer-window (ad-get-arg 0) ecb-frame))
+;;                    (ecb-error "display-buffer can not display not visible ecb-buffers!")))))
+
+;;     (ecb-layout-debug-error "display-buffer - just run original version.")
+;;     (ecb-with-original-basic-functions
+;;      (if ecb-running-xemacs
+;;          (setq ad-return-value
+;;                (ecb-display-buffer-xemacs (ad-get-arg 0)
+;;                                           (ad-get-arg 1)
+;;                                           (ad-get-arg 2)
+;;                                           (ad-get-arg 3)))
+;;        ad-do-it))))
+
+
+(defun ecb-get-other-window-minibuf-active (win-list
+                                            edit-win-list
+                                            ecb-win-list
+                                            comp-win
+                                            minibuf-win
+                                            point-loc
+                                            nth-window)
+  "Implements the situation of an active minibuffer, see
+`ecb-other-window-behavior'."
+  (let ((nth-win (or nth-window 1)))
+    (if (equal (car point-loc) 'minibuf)
+        (if (= nth-win 1)
+            (or (if (and minibuffer-scroll-window
+                         (window-live-p minibuffer-scroll-window)
+                         (equal (window-frame minibuffer-scroll-window)
+                                ecb-frame))
+                    minibuffer-scroll-window)
+                comp-win
+                ecb-last-edit-window-with-point)
+          (ecb-next-listelem (append edit-win-list
+                                     (if comp-win
+                                         (list comp-win))
+                                     (if minibuf-win
+                                         (list minibuf-win)))
+                             (selected-window) nth-win))
+      (ecb-next-listelem (append win-list (if minibuf-win (list minibuf-win)))
+                         (selected-window) nth-win))))
+  
+
+
+(defun ecb-get-other-window-smart (win-list
+                                   edit-win-list
+                                   ecb-win-list
+                                   comp-win
+                                   minibuf-win
+                                   point-loc
+                                   nth-window)
+  "Implements the smart-setting of `ecb-other-window-behavior'."
+  (if minibuf-win
+      ;; if we have an active mini-buffer we delegate this to
+      ;; `ecb-get-other-window-minibuf-active'
+      (ecb-get-other-window-minibuf-active win-list
+                                           edit-win-list
+                                           ecb-win-list
+                                           comp-win
+                                           minibuf-win
+                                           point-loc
+                                           nth-window)
+    ;; here we have no active minibuffer!
+    (let ((nth-win (or nth-window 1)))
+      (case (car point-loc)
+        (ecb
+         (ecb-next-listelem (if (and ecb-win-list
+                                     (= 1 (length ecb-win-list)))
+                                (append ecb-win-list edit-win-list)
+                              ecb-win-list)
+                            (selected-window) nth-win))
+        (compile
+         (if (= nth-win 1)
+             (or (and ecb-last-edit-window-with-point
+                      (window-live-p ecb-last-edit-window-with-point)
+                      ecb-last-edit-window-with-point)
+                 (car edit-win-list))
+           (ecb-next-listelem (append edit-win-list
+                                      (list (selected-window)))
+                              (selected-window)
+                              nth-win)))
+        (other-dedicated
+         (ecb-next-listelem win-list
+                            (selected-window)
+                            nth-win))
+        (otherwise ;; must be an edit-window
+         (ecb-next-listelem (append edit-win-list
+                                    (if (and comp-win
+                                             (= (length edit-win-list)
+                                                1))
+                                        (list comp-win)))
+                            (selected-window)
+                            nth-win))))))
+
+(defun ecb-get-other-window (nth-window)
+  "Return the \"other window\" according to `ecb-other-window-behavior'.
+Returns the window NTH-WINDOW steps away from the current window. If
+NTH-WINDOW is nil then it is treated as 1."
+  (let* ((nth-win (or nth-window 1))
+         (windows-list (ecb-canonical-windows-list))
+         (edit-win-list (ecb-canonical-edit-windows-list windows-list))
+         (ecb-win-list (ecb-canonical-ecb-windows-list windows-list))
+         (point-loc (ecb-where-is-point windows-list))
+         (compwin-state (ecb-compile-window-state))
+         (minibuf-win (if (> (minibuffer-depth) 0)
+                          (minibuffer-window ecb-frame))))
+    (if (functionp ecb-other-window-behavior)
+        (let ((other-win (funcall ecb-other-window-behavior
+                                  windows-list
+                                  edit-win-list
+                                  ecb-win-list
+                                  (if (equal compwin-state 'visible)
+                                      ecb-compile-window)
+                                  minibuf-win
+                                  point-loc
+                                  nth-window)))
+          (if (and other-win (window-live-p other-win))
+              other-win
+            (ecb-next-listelem (append windows-list (list minibuf-win))
+                               (selected-window) nth-win)))
+      (if minibuf-win
+          (ecb-get-other-window-minibuf-active windows-list
+                                               edit-win-list
+                                               ecb-win-list
+                                               (if (equal compwin-state 'visible)
+                                                   ecb-compile-window)
+                                               minibuf-win
+                                               point-loc
+                                               nth-window)
+        ;; in the following there is no minibuffer active...
+        (case ecb-other-window-behavior
+          (all
+           (ecb-next-listelem windows-list
+                              (selected-window) nth-win))
+          (only-edit
+           (if (not (equal 'edit (car point-loc))) ;; point not in an edit-window
+               (if (= nth-win 1)
+                   (or (and ecb-last-edit-window-with-point
+                            (window-live-p ecb-last-edit-window-with-point)
+                            ecb-last-edit-window-with-point)
+                       (car edit-win-list))
+                 (ecb-next-listelem windows-list
+                                    (selected-window) nth-win))
+             (ecb-next-listelem edit-win-list
+                                (selected-window) nth-win)))
+          (edit-and-compile
+           (if (member (car point-loc) '(ecb other-dedicated))
+               (ecb-next-listelem windows-list
+                                  (selected-window) nth-win)
+             ;; point stays either in edit- or compile-window
+             (ecb-next-listelem (append edit-win-list
+                                        (if (equal compwin-state 'visible)
+                                            (list ecb-compile-window)))
+                                (selected-window)
+                                nth-win)))
+          (otherwise ;; = 'smart
+           (ecb-get-other-window-smart windows-list
+                                       edit-win-list
+                                       ecb-win-list
+                                       (if (equal compwin-state 'visible)
+                                           ecb-compile-window)
+                                       minibuf-win
+                                       point-loc
+                                       nth-window)))))))
+
+;; (ecb-get-other-window-smart (ecb-canonical-windows-list) (ecb-canonical-edit-windows-list) (ecb-canonical-ecb-windows-list) nil nil '(other-dedicated . 2) 1)
+
+
+(defecb-advice other-window around ecb-layout-basic-adviced-functions
+  "The ECB-version of `other-window'. Works exactly like the original function
+with the following ECB-adjustment: The behavior depends on
+`ecb-other-window-behavior'."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (let* ((count (if (ad-get-arg 0)
+                      (ad-get-arg 0)
+                    1))
+           (o-w (ecb-get-other-window count)))
+      (select-window o-w))))
+
+
+(defecb-advice delete-windows-on around ecb-layout-basic-adviced-functions
+  "The ECB-version of `delete-windows-on'. Works exactly like the original
+function with the following ECB-adjustment:
+
+An error is reported if BUFFER is an ECB-tree-buffer. These windows are not
+allowed to be deleted."
+  (let ((curr-frame (selected-frame))
+        (buf-name (or (and (stringp (ad-get-arg 0))
+                           (ad-get-arg 0))
+                      (and (bufferp (ad-get-arg 0))
+                           (buffer-name (ad-get-arg 0)))))
+        (frames (case (ad-get-arg 1)
+                  (0 ;; visible or iconified frames
+                   (delete nil (mapcar (lambda (f)
+                                         (if (frame-visible-p f) f))
+                                       (frame-list))))
+                  (visible ;; visible frames
+                   (delete nil (mapcar (lambda (f)
+                                         (if (equal (frame-visible-p f) t)
+                                             f))
+                                       (frame-list))))
+                  ((nil) ;; all frames
+                   (frame-list))
+                  ((t) ;; current frame
+                   (list (selected-frame)))
+                  (otherwise ;; a certain frame
+                       (if (frame-live-p (ad-get-arg 1))
+                           (list (ad-get-arg 1)))))))
+    (if (member (get-buffer buf-name) (ecb-get-current-visible-ecb-buffers))
+        (if ecb-advice-window-functions-signal-error
+            (ecb-error "delete-windows-on is not allowed for the special ECB-buffers!"))
+      (dolist (f frames)
+        (if (not (equal f ecb-frame))
+            (progn
+              (ad-set-arg 1 f)
+              ad-do-it)
+          (when (get-buffer-window buf-name ecb-frame)
+            (select-frame ecb-frame)
+            ;; first we must delete the window
+            (delete-window (get-buffer-window buf-name ecb-frame))
+            ;; to get exactly the same behavior like the original version
+            ;; we must check if the current-buffer in the edit-window is
+            ;; the same as the buffer argument for the current call and if
+            ;; yes we must switch to the buffer returned by `other-buffer'.
+            (if (ecb-string= buf-name
+                             (buffer-name (window-buffer (car (ecb-canonical-edit-windows-list)))))
+                (switch-to-buffer (other-buffer buf-name
+                                                nil ecb-frame)))
+            (select-frame curr-frame)))))))
+
+(defvar ecb-edit-area-creators nil)
+
+(defsubst ecb-edit-area-creators-init ()
+  (setq ecb-edit-area-creators nil))
+
+(defsubst ecb-edit-area-creators-add (creator)
+  (setq ecb-edit-area-creators (append ecb-edit-area-creators (list creator))))
+
+(defun ecb-restore-edit-area ()
+  (dolist (elem ecb-edit-area-creators)
+    (let ((edit-win-list (ecb-canonical-edit-windows-list)))
+      (select-window (nth (car elem) edit-win-list))
+      (funcall (cdr elem)))))
+
+(defun ecb-edit-area-creators-number-of-edit-windows ()
+  (let ((dels (length (delq nil (mapcar (function (lambda (e)
+                                                    (if (equal (cdr e)
+                                                               'delete-window)
+                                                        e
+                                                      nil)))
+                                        ecb-edit-area-creators)))))
+    (- (1+ (- (length ecb-edit-area-creators) dels))
+       dels)))
+                              
+
+(defecb-advice delete-window before ecb-permanent-adviced-layout-functions
+  "Does nothing special but only storing the fact that the edit-window has
+been deleted. This is done even when ECB is deactivated so ECB can later
+restore the window-layout as if before activation. Normally there can not
+occur an error in this advice but nevertheless this advice is constructed
+error-save, i.e. if an error occurs during this before-advice then it will be
+reported but `delete-window' will be executed correctly."
+  (when (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+               ecb-frame)
+    (condition-case oops
+        (let* ((edit-win-list (ecb-canonical-edit-windows-list))
+               (window (or (ad-get-arg 0) (selected-window)))
+               (edit-win-number (ecb-position edit-win-list window)))
+          (when edit-win-number
+            (if (or (= (length edit-win-list) 1)
+                    (/= (length edit-win-list)
+                        (ecb-edit-area-creators-number-of-edit-windows)))
+                (ecb-edit-area-creators-init)
+              (if (= (length edit-win-list) 2)
+                  ;; After the deletion of WINDOW there will be only one
+                  ;; edit-window.
+                  (ecb-edit-area-creators-init)
+                ;; After the deletion of WINDOW there will be still more than
+                ;; one edit-window.
+                (ecb-edit-area-creators-add (cons edit-win-number
+                                                  'delete-window))))))
+      (error (ecb-warning "Before-advice delete-window (error-type: %S, error-data: %S)"
+                          (car oops) (cdr oops))))))
+
+(defecb-advice delete-window around ecb-layout-basic-adviced-functions
+  "The ECB-version of `delete-window'. Works exactly like the original
+function with the following ECB-adjustment:
+
+If optional argument WINDOW is nil \(i.e. probably called interactively): If
+called in a splitted edit-window then it works like as if all the edit-windows
+would be the only windows in the frame. This means the current edit-window
+which contains the point will be destroyed and its place will be occupied from
+another one. If called in the compile-window of ECB then the compile-window
+will be hidden \(like with `ecb-toggle-compile-window'). If called in an
+unsplitted edit-window then nothing is done. If called in an ecb-window of the
+current ECB-layout there are two alternatives:
+- If the function is contained in `ecb-layout-always-operate-in-edit-window'
+  the right edit-window is selected \(depends on the value of the option
+  `ecb-mouse-click-destination') and does then it“s job.
+- Otherwise the behavior depends on the value of the option
+  `ecb-advice-window-functions-signal-error'.
+
+If optional argument WINDOW is a living window \(i.e. called from program): If
+WINDOW is an edit-window then this window is deleted, if WINDOW is the
+compile-window then it will be hidden and otherwise the behavior depends on
+`ecb-advice-window-functions-signal-error'."
+  (if (or (not ecb-minor-mode)
+          (not (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+                      ecb-frame))
+          ;; we are in the ecb-frame but neither a compile-window nor the
+          ;; ecb-windows are visible, so we have no windows to protect against
+          ;; deletion.
+          (and ecb-windows-hidden
+               (not (ecb-compile-window-live-p)))
+          ;; if all windows are dedicated (i.e. there is no edit-window left)
+          ;; we allow deletion of all other windows (incl. ecb-windows and
+          ;; compile-window
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: not perfect but...
+          (null (ecb-canonical-edit-windows-list))
+          )
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (ecb-do-with-unfixed-ecb-buffers
+     (when (and (interactive-p)
+                (null (ad-get-arg 0))
+                (member 'delete-window ecb-layout-always-operate-in-edit-window)
+                (not (ecb-point-in-compile-window))
+                ;; this is needed because otherwise we would also select
+                ;; the 1. edit-window if point stays in another one!
+                (not (ecb-point-in-edit-window-number)))
+       (ecb-select-edit-window))
+     
+     (let* ((edit-win-list (ecb-canonical-edit-windows-list))
+            (window (or (ad-get-arg 0) (selected-window)))
+            (edit-win-number (ecb-position edit-win-list window))
+            (curr-window-before (selected-window)))
+       (cond ((equal window ecb-compile-window)
+              (ecb-toggle-compile-window -1))
+             ((null edit-win-number)
+              (if ecb-advice-window-functions-signal-error
+                  (ecb-error "Only an edit-window can be deleted!")))
+             (t
+              (ad-with-originals 'delete-window
+                (when (> (length edit-win-list) 1)
+                  (if ecb-windows-hidden
+                      (delete-window window)
+                    (funcall (intern (format "ecb-delete-window-in-editwindow-%s"
+                                             ecb-layout-name))
+                             window edit-win-list))
+                  ;; If we have deleted that window which was current at call-time
+                  ;; we have to ensure that point stays in the next edit-window
+                  (when (equal curr-window-before window)
+                    (let ((edit-win-list-after (ecb-canonical-edit-windows-list)))
+                      (if (not (member (selected-window) edit-win-list-after))
+                          (select-window (car edit-win-list-after)))))))))))))
+
+(defecb-advice delete-other-windows before ecb-permanent-adviced-layout-functions
+  "Does nothing special but only storing the fact that the other edit-windows
+have been deleted. This is done even when ECB is deactivated so ECB can later
+restore the window-layout as if before activation. Normally there can not
+occur an error in this advice but nevertheless this advice is constructed
+error-save, i.e. if an error occurs during this before-advice then it will be
+reported but `delete-window' will be executed correctly."
+  (when (and (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+                    ecb-frame)
+             ;; The case when ecb is active is handled completely by
+             ;; delete-window!
+             (not ecb-minor-mode))
+    (condition-case oops
+        (let* ((edit-win-list (ecb-canonical-edit-windows-list))
+               (window (or (ad-get-arg 0) (selected-window)))
+               (edit-win-number (ecb-position edit-win-list window)))
+          (when edit-win-number
+            ;; After the deletion of the other edit-windows there will be only
+            ;; one edit-window. We can init the edit-area-creators always
+            ;; regardless of current number of edit-windows.
+            (ecb-edit-area-creators-init)))
+      (error (ecb-warning "Before-advice delete-other-windows (error-type: %S, error-data: %S)"
+                          (car oops) (cdr oops))))))
+
+(defecb-advice delete-other-windows around ecb-layout-basic-adviced-functions
+  "The ECB-version of `delete-other-windows'. Works exactly like the
+original function with the following ECB-adjustment:
+
+If optional argument WINDOW is nil \(i.e. probably called interactively): If
+called in a splitted edit-window then it works like as if all the edit-windows
+would be the only windows in the frame. This means all other edit-windows
+besides the current edit-window which contains the point will be destroyed and
+the current edit-window fills the whole edit-area. Neither the special
+ecb-windows nor the compile-window will be destroyed!
+- If called in an unsplitted edit-window then either the compile-window will
+  be hidden \(if there is one) or nothing is done.
+- If called in one of the ecb-windows then the current one is maximized, i.e.
+  the other ecb-windows \(not the edit-windows!) are deleted.
+- If called in the compile window there are two
+  alternatives:
+  + If the function is contained in `ecb-layout-always-operate-in-edit-window'
+    the right edit-window is selected \(depends on the value of the option
+    `ecb-mouse-click-destination') and then it does it“s job.
+  + Otherwise the behavior depends on the value of the option
+  `ecb-advice-window-functions-signal-error'.
+
+If optional argument WINDOW is a living window \(i.e. called from program): If
+WINDOW is an edit-window then this window is maximized \(i.e. the other
+edit-window is deleted) if there are more at least 2 edit-windows otherwise
+the compile-window is deleted \(if there is one). If WINDOW is an ecb-window
+then only the other ecb-windows are deleted and in all other cases the
+behavior depends on `ecb-advice-window-functions-signal-error'."
+  
+  (if (or (not ecb-minor-mode)
+          (not (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+                                    ecb-frame))
+          ;; we are in the ecb-frame but neither a compile-window nor the
+          ;; ecb-windows are visible, so we have no windows to protect against
+          ;; deletion.
+          (and ecb-windows-hidden
+               (not (ecb-compile-window-live-p)))
+          ;; if all windows are dedicated (i.e. there is no edit-window left)
+          ;; we allow deletion of all other windows (incl. ecb-windows and
+          ;; compile-window
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: not perfect but...
+          (null (ecb-canonical-edit-windows-list))
+          )
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (ecb-do-with-unfixed-ecb-buffers
+     (when (and (interactive-p)
+                (null (ad-get-arg 0))
+                (member 'delete-other-windows
+                        ecb-layout-always-operate-in-edit-window)
+                ;; this is needed because otherwise we would also select
+                ;; the 1. edit-window if point stays in another one!
+                ;; if in an ecb-window then we stay there because then we
+                ;; want to maximize the current ecb-window
+                (ecb-point-in-compile-window))
+       (ecb-select-edit-window))
+     
+     (let ((edit-win-list (ecb-canonical-edit-windows-list))
+           (window (or (ad-get-arg 0) (selected-window))))
+       (cond ((equal window ecb-compile-window)
+              (if ecb-advice-window-functions-signal-error
+                  (ecb-error "The compile window can not be maximized!")))
+             ((integerp (ecb-position edit-win-list window))
+              ;; we run the adviced version of delete-window for each "other"
+              ;; edit-window
+              (if (= (length edit-win-list) 1)
+                  (ecb-toggle-compile-window -1)
+                (dolist (ew (delete window edit-win-list))
+                  (delete-window ew))))
+             (t ;; must be one of the special ecb-windows
+              (ecb-maximize-ecb-buffer (buffer-name (window-buffer window)) t)))))))
+            
+  
+(defecb-advice split-window-horizontally around ecb-layout-basic-adviced-functions
+  "The ECB-version of `split-window-horizontally'. Works exactly like the
+original function with the following ECB-adjustment:
+
+If called in any other window of the current ECB-layout it stops with an error
+if this `split-window-horizontally' is not contained in the option
+`ecb-layout-always-operate-in-edit-window'!"
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (when (and (member 'split-window-horizontally
+                       ecb-layout-always-operate-in-edit-window)
+               ;; this is needed because otherwise we would also select the 1.
+               ;; edit-window if point stays in another one!
+               (not (ecb-point-in-edit-window-number)))
+      (ecb-select-edit-window))
+    ad-do-it))
+
+(defecb-advice split-window-vertically around ecb-layout-basic-adviced-functions
+  "The ECB-version of `split-window-vertically'. Works exactly like the
+original function with the following ECB-adjustment:
+
+If called in any other window of the current ECB-layout it stops with an error
+if this `split-window-vertically' is not contained in the option
+`ecb-layout-always-operate-in-edit-window'!"
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (when (and (member 'split-window-vertically
+                       ecb-layout-always-operate-in-edit-window)
+               (not (ecb-point-in-edit-window-number)))
+      (ecb-select-edit-window))
+    ad-do-it))
+
+(defecb-advice split-window before ecb-permanent-adviced-layout-functions
+  "Does nothing special but only storing the fact that the window is splitted.
+This is done even when ECB is deactivated so ECB can later restore the
+window-layout as if before activation. Normally there can not occur an error
+in this advice but nevertheless this advice is constructed error-save, i.e. if
+an error occurs during this before-advice then it will be reported but
+`split-window' will be executed correctly."
+  (when (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+               ecb-frame)
+    (condition-case oops
+        (let* ((edit-win-list (ecb-canonical-edit-windows-list))
+               (window (or (ad-get-arg 0) (selected-window)))
+               (edit-win-number (ecb-position edit-win-list window)))
+          (when (and edit-win-number
+                     (or (= (length edit-win-list) 1)
+                         (/= (length edit-win-list)
+                             (ecb-edit-area-creators-number-of-edit-windows))))
+            (ecb-edit-area-creators-init))
+          (when edit-win-number
+            (ecb-edit-area-creators-add (cons edit-win-number
+                                              (if (ad-get-arg 2)
+                                                  'split-window-horizontally
+                                                'split-window-vertically)))))
+      (error (ecb-warning "Before-advice split-window (error-type: %S, error-data: %S)"
+                          (car oops) (cdr oops))))))
+      
+
+(defecb-advice split-window around ecb-layout-basic-adviced-functions
+  "The ECB-version of `split-window'. Works exactly like the original function
+with the following ECB-adjustment:
+
+If called for a not-edit-window in the `ecb-frame' it stops with an error if
+`split-window' is not contained in the option
+`ecb-layout-always-operate-in-edit-window'! Besides this \(e.g. called for a
+window in another frame than the `ecb-frame') it behaves like the original
+version."
+  (ecb-layout-debug-error "split-window entered for window: %s" (ad-get-arg 0))
+  (if (or (not ecb-minor-mode)
+          (not (equal (window-frame (or (ad-get-arg 0) (selected-window)))
+                      ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    ;; if called interactively and WINDOW is nil (i.e. selected window is
+    ;; used) then we maybe must first go to the edit-window.
+    ;; The check for interactiv-p prevents that we jump to the edit-window if
+    ;; called from within `split-window-vertically' for example.
+    (when (and (interactive-p)
+               (null (ad-get-arg 0))
+               (member 'split-window
+                       ecb-layout-always-operate-in-edit-window)
+               (not (ecb-point-in-edit-window-number)))
+      (ecb-select-edit-window))
+
+    ;; now perform the splitting task
+    (let* ((window (or (ad-get-arg 0) (selected-window)))
+           (edit-win-number (ecb-position (ecb-canonical-edit-windows-list)
+                                          window)))
+      (if edit-win-number
+          ad-do-it
+        (if ecb-advice-window-functions-signal-error
+            (ecb-error "Only the edit-windows of ECB are split-able!")
+          (setq ad-return-value (selected-window)))))))
+
+(defecb-advice switch-to-buffer-other-window around ecb-layout-basic-adviced-functions
+  "The ECB-version of `switch-to-buffer-other-window'. Works exactly like the
+original but with some adaptions for ECB so this function works in a
+\"natural\" way:
+
+If called in any special ecb-window of the current ECB-layout then it goes
+always to an edit-window \(which one depends on the setting in
+`ecb-mouse-click-destination') and then goes on as if called from this
+edit-window.
+
+If a compile-window is used \(i.e. `ecb-compile-window-height' is not nil)
+then \"compilation-buffers\" in the sense of `ecb-compilation-buffer-p' are
+always displayed in the compile-window. If the compile-window is temporally
+hidden then it will be displayed first. If no compile-window is used it
+behaves like the original.
+
+If called from within the compile-window then \"compilation-buffers\" will be
+displayed still there and all other buffers are displayed in one of the
+edit-windows - if the destination-buffer is already displayed in one of the
+edit-windows then this one is used otherwise it behaves like the original.
+
+If called within an edit-window it behaves like the original function except
+for compilation-buffers \(if a compile-window is used, see above)."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (if (equal (car (ecb-where-is-point)) 'ecb)
+        (ecb-select-edit-window))
+    (let ((pop-up-windows t)
+          ;; Don't let these interfere...
+          same-window-buffer-names same-window-regexps)          
+      (pop-to-buffer (ad-get-arg 0) t
+                     (if ecb-running-xemacs
+                         (selected-frame)
+                       (ad-get-arg 1))))))
+
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: We can not use pop-to-buffer here
+;; because with XEmacs there is an error max-lisp-eval-depth exceeded. XEmacs
+;; implements display-buffer (which is called by pop-to-buffer) internally
+;; with switch-to-buffer so there is an bidirectional dependency - ugly :-(
+(defecb-advice switch-to-buffer around ecb-layout-basic-adviced-functions
+  "The ECB-version of `switch-to-buffer'. Works exactly like the original but
+with the following enhancements for ECB:
+
+\"compilation-buffers\" in the sense of `ecb-compilation-buffer-p' will be
+displayed always in the compile-window of ECB \(if `ecb-compile-window-height'
+is not nil) - if the compile-window is temporally hidden then it will be
+displayed first. If you do not want this you have to modify the options
+`ecb-compilation-buffer-names', `ecb-compilation-major-modes' or
+`ecb-compilation-predicates'.
+
+If called for non \"compilation-buffers\" \(s.a.) from outside the edit-area
+of ECB it behaves as if called from an edit-window if `switch-to-buffer' is
+contained in the option `ecb-layout-always-operate-in-edit-window'. Otherwise
+an error is reported."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame)))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (ecb-layout-debug-error "switch-to-buffer buffer: %s" (ad-get-arg 0))
+    (cond ((ecb-compilation-buffer-p (ad-get-arg 0))
+           (when (equal 'hidden (ecb-compile-window-state))
+             (ecb-toggle-compile-window 1))
+           (if (ecb-compile-window-live-p)
+               (select-window ecb-compile-window))
+           ;; now we must handle if there is still no compile-window and
+           ;; therefore point can still stay in an ecb-window
+           (if (equal (car (ecb-where-is-point)) 'ecb)
+               (if (member 'switch-to-buffer ecb-layout-always-operate-in-edit-window)
+                   (ecb-select-edit-window)
+                 (ecb-error "switch-to-buffer: Can not switch to %s in an ecb-window!"
+                            (ad-get-arg 0)))))
+          ((ecb-buffer-is-dedicated-special-buffer-p (ad-get-arg 0))
+           (if (get-buffer-window (ad-get-arg 0) ecb-frame)
+               (select-window (get-buffer-window (ad-get-arg 0) ecb-frame))
+             (ecb-error "switch-to-buffer: Can only switch to visible special ecb-buffers!")))
+          (t ;; normal buffers
+           (if (member (car (ecb-where-is-point)) '(ecb compile))
+               (if (member 'switch-to-buffer ecb-layout-always-operate-in-edit-window)
+                   (ecb-select-edit-window)
+                 (ecb-error "switch-to-buffer: Can only switch to %s in an edit-window!"
+                            (ad-get-arg 0))))))
+    ;; now we stay in the correct window
+    (ecb-with-original-basic-functions
+     ad-do-it)
+    (ecb-layout-debug-error "switch-to-buffer curr-buffer: %s" (current-buffer))
+    (when (ecb-point-in-compile-window)
+      (ecb-layout-debug-error "switch-to-buffer curr-buffer: %s, curr window %s"
+                              (current-buffer) (selected-window))
+      ;; we set the height of the compile-window according to
+      ;; `ecb-enlarged-compilation-window-max-height'
+      (ecb-set-compile-window-height))))
+
+(defecb-advice other-window-for-scrolling around ecb-layout-basic-adviced-functions
+  "This function determines the window which is scrolled if any of the
+\"other-window-scrolling-functions\" is called \(e.g. `scroll-other-window'):
+
+If the option `ecb-scroll-other-window-scrolls-compile-window' is not nil
+\(maybe set by `ecb-toggle-scroll-other-window-scrolls-compile') and a
+compile-window is visible then always the current buffer in the compile-window
+is scrolled!
+
+Otherwise it depends completely on the setting in `ecb-other-window-behavior'."
+  (if (or (not ecb-minor-mode)
+          (not (equal (selected-frame) ecb-frame))
+          (and (equal (selected-window) (minibuffer-window ecb-frame))
+               minibuffer-scroll-window))
+      (ecb-with-original-basic-functions
+       ad-do-it)
+    (let* ((o-w-s-b 
+            (if (and ecb-scroll-other-window-scrolls-compile-window
+                     (not (ecb-point-in-compile-window))
+                     (equal 'visible (ecb-compile-window-state)))
+                (window-buffer ecb-compile-window)
+              (window-buffer (ecb-get-other-window nil))))
+           (other-window-scroll-buffer (if (equal (current-buffer) o-w-s-b)
+                                           nil
+                                         o-w-s-b)))
+      ad-do-it)))
+
+(defecb-advice walk-windows around ecb-always-disabled-advices
+  "Walk only through the edit-windows of ECB. When ECB is not active or
+called for other frames than for the `ecb-frame' then act like the original.
+This adviced version of `walk-windows' is not for direct usage therefore it is
+added to `ecb-always-disabled-advices' and therefore always disabled; use the
+macro `ecb-with-ecb-advice' instead if you need this adviced version of
+`walk-windows'!"
+  (if (and ecb-minor-mode
+           (or (equal (ad-get-arg 2) ecb-frame)
+               (and (null (ad-get-arg 2))
+                    (equal (selected-frame) ecb-frame))))
+      (progn
+        (let ((ecb-walk-windows-advice-proc (ad-get-arg 0)))
+          (ad-with-originals 'walk-windows
+            (walk-windows (function (lambda (w)
+                                      (if (or (ecb-buffer-is-ecb-buffer-of-current-layout-p
+                                               (window-buffer w))
+                                              (equal w ecb-compile-window))
+                                          nil
+                                        ;; for an edit-window we call the
+                                        ;; original PROC
+                                        (funcall ecb-walk-windows-advice-proc w))))
+                          (ad-get-arg 1)
+                          (ad-get-arg 2)))))
+    ad-do-it))
+
+(defecb-advice balance-windows around ecb-layout-basic-adviced-functions
+  "When called in the `ecb-frame' then only the edit-windows are balanced."
+  (if (and ecb-minor-mode
+           (equal (selected-frame) ecb-frame)
+           (not ecb-windows-hidden))
+      (if ecb-running-version-22
+          ;; Emacs 22 has reimplemented balance-windows so it is not longer based on
+          ;; walk-windows but uses a completely new mechanism based on a
+          ;; c-level-function `window-tree'! Therefore we have to use another
+          ;; mechanism which just restore the size of the ecb-windows as
+          ;; before belance-windows...
+          (let ((ecb-sizes-before (ecb-get-ecb-window-sizes t)))
+            (ecb-do-with-fixed-ecb-buffers ad-do-it)
+            ;; this seems to be necessary - otherwise the reszing seems not to
+            ;; take effect...
+            (sit-for 0)
+            (ignore-errors (ecb-set-ecb-window-sizes ecb-sizes-before)))
+        ;; with Emacs 21 running the adviced version of walk-windows is
+        ;; sufficient
+        (ecb-with-ecb-advice 'walk-windows 'around
+          ad-do-it))
+    ad-do-it))
+
+
+;;======= Helper-functions ===========================================
+
+(defun ecb-split-hor (amount &optional dont-switch-window use-frame)
+  "Splits the current-window horizontally and returns the absolute amount in
+columns. If AMOUNT is greater than -1.0 and lower than +1.0 then the value is
+multiplied with the current window-width \(frame-width if USE-FRAME is not nil)."
+  (let ((abs-amout (ecb-normalize-number amount (if use-frame
+                                                    (frame-width)
+                                                  (window-width)))))
+    (ecb-split-hor-abs abs-amout dont-switch-window)
+    abs-amout))
+
+(defun ecb-split-hor-abs (amount &optional dont-switch-window)
+  (split-window-horizontally amount)
+  (if (not dont-switch-window)
+      (select-window (next-window))))
+
+(defun ecb-split-ver (amount &optional dont-switch-window use-frame)
+  "Splits the current-window and returns the absolute amount in lines. If
+AMOUNT is greater than -1.0 and lower than +1.0 then the value is multiplied
+with the current window-height \(frame-height if USE-FRAME is not nil)."
+  (let ((abs-amout (ecb-normalize-number amount (if use-frame
+                                                    (1- (frame-height))
+                                                  (ecb-window-full-height)))))
+    (ecb-split-ver-abs abs-amout dont-switch-window)
+    abs-amout))
+
+(defun ecb-split-ver-abs (amount &optional dont-switch-window)
+  (split-window-vertically amount)
+  (if (not dont-switch-window)
+      (select-window (next-window))))
+
+;;======= The new layout mechanism========================================
+
+;; Klaus: Completely rewritten the layout mechanism to make it more
+;; straightforward, more customizable by users and slightly more
+;; convenient.
+
+(defvar ecb-buffer-setfunction-registration nil
+  "An alist where for each `buffer-name' of a special ecb-buffer - displayed
+in a dedicated window - a function must be registered which displays that
+buffer in current window and makes this window dedicated to this buffer. So
+for every ecb-buffer a cons cell must be added to this alist where car is
+`buffer-name' and cdr is the symbol of the setting-function.
+
+The setting function of such a buffer must be defined with the macro
+`defecb-window-dedicator' and do:
+
+1. switch to that buffer in current window
+2. all things necessary for this buffer - e.g. making it read-only
+
+The setting function must ensure that the current window is still current at
+the end and that the related ecb-buffer is displayed in this window at the
+end.
+
+One examples of such a setting function is `ecb-set-history-buffer' for the
+buffer with name `ecb-history-buffer-name'.")
+
+(defun ecb-dedicated-special-buffers ()
+  "Return a list of the special dedicated buffers which are registrated via
+the macro `defecb-window-dedicator' \(these are normally only the standard
+tree-buffers of ECB plus the integrated speedbar-buffer, but in general it can
+be more if there are additional buffers registrated, e.g. by other
+applications). The value returned is independend from the currently *visible*
+special ecb-buffers and therefore also from the current layout. If the
+currently visible ECB-buffers are needed then use the function
+`ecb-get-current-visible-ecb-buffers'. "
+  (delq nil (mapcar (function (lambda (e)
+                                (get-buffer (car e))))
+                    ecb-buffer-setfunction-registration)))
+
+(defun ecb-get-current-visible-ecb-buffers ()
+  "Return a list of all buffer-objects displayed in a currently visible and
+dedicated special ecb-window. The superset of all possible \(because
+registered) special ecb-buffers are available by
+`ecb-dedicated-special-buffers'."
+  (mapcar (function (lambda (window)
+                      (window-buffer window)))
+          (ecb-canonical-ecb-windows-list)))
+
+(defun ecb-buffer-is-visible-ecb-buffer-p (buffer-or-name)
+  "Return not nil if BUFFER-OR-NAME is a member of
+`ecb-get-current-visible-ecb-buffers'. BUFFER-OR-NAME ca be either a
+buffer-object or a buffer-name."
+  (let ((buffer (ecb-buffer-obj buffer-or-name)))
+    (member buffer (ecb-get-current-visible-ecb-buffers))))
+
+(defun ecb-buffer-is-ecb-buffer-of-current-layout-p (buffer-or-name)
+  "Return not nil if BUFFER-OR-NAME is a member of
+`ecb-special-ecb-buffers-of-current-layout', means BUFFER-OR-NAME is one of
+that buffers which build up the current-layout as it is defined.
+BUFFER-OR-NAME ca be either a buffer-object or a buffer-name."
+  (let ((buff-name (ecb-buffer-name buffer-or-name)))
+    (member buff-name ecb-special-ecb-buffers-of-current-layout)))
+
+(defun ecb-buffer-is-the-only-visible-ecb-buffer-p (buffer-or-name)
+  "Return not nil if BUFFER-OR-NAME is currently the only visible ecb-buffer."
+  (let ((buffer (ecb-buffer-obj buffer-or-name))
+        (current-ecb-buffers (ecb-get-current-visible-ecb-buffers)))
+    (and (= (length current-ecb-buffers) 1)
+         (equal buffer (car current-ecb-buffers)))))
+
+(defun ecb-set-minor-mode-text ()
+  (setq ecb-minor-mode-text
+        (if ecb-windows-hidden
+            (or (ecb-option-get-value 'ecb-minor-mode-text 'saved-value)
+                (ecb-option-get-value 'ecb-minor-mode-text 'standard-value))
+          "")))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: For left-right-layouts: Not only
+;; hiding all the ecb-windows but offering to hide only one of the left or the
+;; right column. Maybe toggling in the sequence "Hide left" --> "Hide all" -->
+;; Hide right" --> "Show all". But i (Klaus) think this is not so easy........
+(defun ecb-toggle-ecb-windows (&optional arg)
+  "Toggle visibility of the ECB-windows.
+With prefix argument ARG, make visible if positive, otherwise invisible.
+This has nothing to do with \(de)activating ECB but only affects the
+visibility of the ECB windows. ECB minor mode remains active!"
+  (interactive "P")
+  (unless (or (not ecb-minor-mode)
+              (not (equal (selected-frame) ecb-frame)))
+
+    (let ((new-state (if (null arg)
+                         (not ecb-windows-hidden)
+                       (<= (prefix-numeric-value arg) 0))))
+      (if (not new-state)
+          (progn
+            (run-hooks 'ecb-show-ecb-windows-before-hook)
+            (if (ecb-show-any-node-info-by-mouse-moving-p)
+                (tree-buffer-activate-follow-mouse))
+            ;; if `ecb-buffer-is-maximized-p' is not nil then this means we
+            ;; should only restore this one maximized buffer!
+            (let ((compwin-hidden (equal 'hidden
+                                         (ecb-compile-window-state))))
+              (if (ecb-buffer-is-maximized-p)
+                   (ecb-maximize-ecb-buffer ecb-current-maximized-ecb-buffer-name)
+                (ecb-redraw-layout-full))
+              (if compwin-hidden
+                  (ecb-toggle-compile-window -1)))
+            (run-hooks 'ecb-show-ecb-windows-after-hook)
+            (message "ECB windows are now visible."))
+        (unless ecb-windows-hidden
+          (run-hooks 'ecb-hide-ecb-windows-before-hook)
+          (tree-buffer-deactivate-follow-mouse)
+            (let ((compwin-hidden (equal 'hidden
+                                         (ecb-compile-window-state))))
+              (ecb-redraw-layout-full nil nil nil t)
+              (if compwin-hidden
+                  (ecb-toggle-compile-window -1)))
+          (run-hooks 'ecb-hide-ecb-windows-after-hook)
+          (message "ECB windows are now hidden."))))))
+
+(defun ecb-hide-ecb-windows ()
+  "Hide the ECB windows if not already hidden."
+  (interactive)
+  (ecb-toggle-ecb-windows 0))
+
+(defun ecb-show-ecb-windows ()
+  "Make the ECB windows visible."
+  (interactive)
+  (ecb-toggle-ecb-windows 1))
+
+
+(defvar ecb-current-maximized-ecb-buffer-name nil
+  "If not nil then it contains the buffer-name of the current maximized
+ecb-buffer. If nil then this means currently there is no ecb-buffer maximized.
+
+Do not set this variable. It is only set by `ecb-redraw-layout-full' and
+`ecb-maximize-ecb-buffer'.")
+
+(defun ecb-redraw-layout-preserving-compwin-state ()
+  "Redraw current layout with all ECB-windows visible."
+  (interactive)
+  (let ((compwin-state (ecb-compile-window-state)))
+    (ecb-redraw-layout-full)
+    (if (equal compwin-state 'hidden)
+        (ecb-toggle-compile-window -1))))
+
+(defun ecb-toggle-maximize-ecb-window-with-mouse ()
+  "Mouse-wrapper for `ecb-toggle-maximize-ecb-window'."
+  (interactive "@")
+  (ecb-toggle-maximize-ecb-window))
+
+(defun ecb-toggle-maximize-ecb-window (&optional ecb-buffer-name)
+  "Toggle maximizing the special ecb-window of ECB-BUFFER-NAME.
+If there is a maximizied ecb-window then it will be \"minimized\", i.e. all
+ecb-windows of current layout will be displayed. If there is no ecb-window
+maximized then that of ECB-BUFFER-NAME will be maximized. If ECB-BUFFER-NAME
+is nil then the current buffer-name is used. Nothing will be done if the
+caller tries to maximize a non-ecb-window."
+  (if (ecb-buffer-is-maximized-p)
+      (ecb-undo-maximize-ecb-buffer)
+    (let ((buf-name (or ecb-buffer-name (buffer-name))))
+      (when (ecb-buffer-is-ecb-buffer-of-current-layout-p buf-name)
+        (ecb-maximize-ecb-buffer buf-name t)))))
+
+(defun ecb-undo-maximize-ecb-buffer (&optional preserve-selected-window)
+  "Undo the maximizing of an ecb-buffer.
+If optional arg PRESERVE-SELECTED-WINDOW is not nil then the currently
+selected window does not change. Otherwise after displaying all ecb-windows the
+current edit-window is selected."
+  (when (equal (selected-frame) ecb-frame)
+    (let ((curr-loc (ecb-where-is-point))
+          (prev-buffer-name (buffer-name)))
+      (ecb-redraw-layout-preserving-compwin-state)
+      ;; point is now in the edit-buffer so maybe we have to move point to the
+      ;; buffer where it was before.
+      (when preserve-selected-window
+        (case (car curr-loc)
+          (ecb
+           (ecb-window-select prev-buffer-name))
+          (compile
+           (ecb-window-select ecb-compile-window))))
+      (ecb-info-message "Maximizing has been undone."))))
+
+(defun ecb-maximized-tree-buffer-name ()
+  "Return the currently maximized tree-buffer-name or nil if there is none."
+  ecb-current-maximized-ecb-buffer-name)
+
+(defun ecb-buffer-is-maximized-p (&optional ecb-buffer-name)
+  "Not nil if ECB-BUFFER-NAME is currently maximized.
+If ECB-BUFFER-NAME is not nil and not part of the current layout then nil is
+returned. If ECB-BUFFER-NAME is nil then not nil is returned if any special
+buffer of current layout is maximized otherwise nil."
+  (if ecb-buffer-name
+      (and (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-buffer-name)
+           (equal ecb-buffer-name
+                  ecb-current-maximized-ecb-buffer-name))
+    ecb-current-maximized-ecb-buffer-name))
+
+(defun ecb-maximize-ecb-buffer (ecb-buffer-name &optional preserve-selected-window)
+  "Maximize that window which displays the special ECB-buffer ECB-BUFFER-NAME.
+Afterwards ECB-BUFFER-NAME is the only visible special ECB-buffer. If optional
+arg PRESERVE-SELECTED-WINDOW is nil then after maximizing always the current
+edit-window is selected and if not nil then the currently selected window-type
+does not change which means: If any ecb-window was selected before maximizing
+then after maximizing the maximized ecb-window is selected \(regardless if its
+the same as before the maximizing). If the compile window was selected before
+then it will be selected also after. If an edit-window was selected before it
+will be selected also after."
+  (when (equal (selected-frame) ecb-frame)
+    (let ((curr-point (ecb-where-is-point))
+          (compwin-hidden (equal 'hidden (ecb-compile-window-state))))
+      ;; maximize the window if ECB-BUFFER-NAME is one of the special
+      ;; ecb-buffers of current layout
+      (when (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-buffer-name)
+        (ecb-redraw-layout-full
+         t ;; no buffer synchronisation!
+         (cdr (assoc ecb-buffer-name
+                     ecb-buffer-setfunction-registration)))
+        (if compwin-hidden (ecb-toggle-compile-window -1))
+        (setq ecb-current-maximized-ecb-buffer-name ecb-buffer-name)
+        ;; point is now in the edit-buffer so maybe we have to move point to the
+        ;; buffer where it was before.
+        (when preserve-selected-window
+          (case (car curr-point)
+            (ecb
+             (ecb-window-select ecb-buffer-name))
+            (compile
+             (ecb-window-select ecb-compile-window))))))))
+
+(defvar ecb-cycle-ecb-buffer-state nil
+  "State of ecb-buffer-cycling. An alist where the car is the list of all
+buffer-names of the ecb-buffers of current layout and the cdr the index which
+buffer-name is the next one in the cycle-sequence. Is only set by
+`ecb-redraw-layout-full' and `ecb-cycle-maximized-ecb-buffers'.")
+
+(defun ecb-cycle-maximized-ecb-buffers ()
+  "Cycles through all ecb-buffers by maximizing one at each step."
+  (interactive)
+  (when (null ecb-cycle-ecb-buffer-state)
+    ;; we have redrawn the complete layout and therefore the cycle-state
+    ;; has been reset. If we start the cycling with an already maximized
+    ;; ecb-window we have first redraw fully so we get a correct
+    ;; initialization!
+    (ecb-redraw-layout-full)
+    (setq ecb-cycle-ecb-buffer-state
+          (cons (mapcar (function (lambda (w)
+                                    (buffer-name (window-buffer w))))
+                        (ecb-canonical-ecb-windows-list))
+                0)))
+  ;; now we have a valid cycle-state so we can display the next ecb-buffer
+  (ecb-maximize-ecb-buffer (nth (cdr ecb-cycle-ecb-buffer-state)
+                                (car ecb-cycle-ecb-buffer-state))
+                              t)
+  ;; now we have to move forward the cycle-state
+  (setcdr ecb-cycle-ecb-buffer-state
+          (if (= (cdr ecb-cycle-ecb-buffer-state)
+                 (1- (length (car ecb-cycle-ecb-buffer-state))))
+              0
+            (1+ (cdr ecb-cycle-ecb-buffer-state)))))
+
+
+(defun ecb-window-configuration-data ()
+  "Return current window configuration of the ecb-frame as a list with the
+following structure:
+1. The number of the edit-window if point is one of the edit-windows, nil
+   otherwise
+2. current point if one of the edit-windows is selected, nil otherwise.
+3. Data of all edit-windows in form of a list: Everey listelement is a list
+   again with first subelement is the buffer of an edit-window, second
+   subelement is the `window-start' of this window, third is the
+   `window-point' and fourth subelement is the result of `ecb-get-window-size'
+   for this window. This data-list has the same ordering as
+   `ecb-canonical-edit-windows-list'.
+4. Data of the compile window or nil \(if there is no compile-window visible):
+   List with first elem is the buffer of the compile-window, second elem is
+   current point of the compile-buffer if the compile-window is selected
+   \(otherwise nil) and third elem is the current height of the
+   compile-window.
+5. The window sizes of the ecb-windows as returned by
+   `ecb-get-ecb-window-sizes'"
+  (let* ((win-list (ecb-canonical-windows-list))
+         (edit-win-list (ecb-canonical-edit-windows-list win-list))
+         (ecb-win-list (ecb-canonical-ecb-windows-list win-list))
+         (point-pos (ecb-where-is-point win-list))
+         (edit-area-size (ecb-get-edit-area-size win-list)))
+    (list (if (equal 'edit (car point-pos)) (cdr point-pos))
+          (if (equal 'edit (car point-pos)) (point))
+          (mapcar (function (lambda (win)
+                              (list (window-buffer win)
+                                    (window-start win)
+                                    (window-point win)
+                                    (ecb-get-window-size win nil edit-area-size))))
+                  edit-win-list)
+          (if (equal 'visible (ecb-compile-window-state))
+              (list (window-buffer ecb-compile-window)
+                    (if (equal (car point-pos) 'compile) (point))
+                    (ecb-window-full-height ecb-compile-window)))
+          (ecb-get-ecb-window-sizes nil ecb-win-list)
+          )))
+
+;; =================== Helper functions ==================================
+
+(defmacro ecb-with-dedicated-window (&rest body)
+  "Make current selected window not dedicated, evaluate BODY in current
+window and make this window dedicated at the end. Even if an error occurs
+during evaluating BODY the current window is always dedicated at the end!"
+  `(unwind-protect
+       (progn
+         (set-window-dedicated-p (selected-window) nil)
+         ,@body)
+     (set-window-dedicated-p (selected-window) t)))
+
+(defmacro defecb-window-dedicator (creator buffer-name docstring &rest body)
+  "Define a function CREATOR which makes the selected window dedicated to the
+BUFFER-NAME. Do not quote CREATOR. DOCSTRING is the docstring for CREATOR.
+BODY is all the program-code of CREATOR which will be run encapsulated within
+a call to `ecb-with-dedicated-window'.
+
+Example:
+
+\(defecb-window-dedicator ecb-set-history-buffer ecb-history-buffer-name
+  \"Display the History-buffer in current window and make window
+dedicated.\"
+  \(switch-to-buffer ecb-history-buffer-name))
+
+This defines a function `ecb-set-history-buffer' registered as
+\"window-dedicator\" for the buffer with name `ecb-history-buffer-name'. The
+BODY \(in this example only a call to switch-to-buffer) will run within the
+macro `ecb-with-dedicated-window'!"
+  `(eval-and-compile
+     (defun ,creator ()
+       ,docstring
+       (add-to-list 'ecb-buffer-setfunction-registration
+                    (cons ,buffer-name (quote ,creator)))
+       (ecb-with-dedicated-window
+        ,@body))))
+
+(put 'defecb-window-dedicator 'lisp-indent-function 2)
+
+(defecb-window-dedicator ecb-set-speedbar-buffer ecb-speedbar-buffer-name
+  "Display in current window the speedbar-buffer and make window dedicated."
+  (ecb-speedbar-set-buffer))
+
+(defecb-window-dedicator ecb-set-default-ecb-buffer " *ECB-default-buffer*"
+  "Set in the current window the default ecb-buffer which is useless but is
+used if a layout calls within its creation body a non bound
+ecb-buffer-setting-function."
+  (switch-to-buffer (get-buffer-create " *ECB-default-buffer*"))
+  (when (= (buffer-size) 0)
+    (insert " This is the default\n")
+    (insert " ecb-buffer which is\n")
+    (insert " useless. Probably this\n")
+    (insert " buffer is displayed\n")
+    (insert " because the layout uses\n")
+    (insert " an unbound window-\n")
+    (insert " dedicator!"))
+  (setq buffer-read-only t))
+
+
+;; ======== Delete-window-functions for the different layout-types ==========
+
+;; There are three different types of layouts:
+;; 1. Ecb-windows on the left side (include layouts with left and right side
+;;    ECB-windows)
+;; 2. Ecb-windows on the right side
+;; 3. Ecb-windows on the top
+;; For each type we have a special replacement for `delete-window' which
+;; operates correctly as if all the edit-windows would be in an extra frame.
+
+;; 1. Ecb-windows on the left side
+
+(defun ecb-delete-window-ecb-windows-left (window edit-win-list)
+  (let ((ecb-win-width-before (window-width (frame-first-window ecb-frame)))
+        (curr-edit-win-width (ecb-window-full-width window)))
+    (delete-window window)
+    (when (/= (window-width (frame-first-window ecb-frame))
+              ecb-win-width-before)
+      ;; We have to select here the "next" edit-window explicitly because if
+      ;; WINDOW is not the selected-window `delete-window' does not select the
+      ;; next window!
+      (save-selected-window
+        (select-window (ecb-next-listelem edit-win-list window))
+        (enlarge-window (+ curr-edit-win-width
+                           (if ecb-running-xemacs
+                               (if scrollbars-visible-p 3 1)
+                             0))
+                        t)))))
+
+(defalias 'ecb-delete-window-ecb-windows-left-right
+  'ecb-delete-window-ecb-windows-left)
+
+;; 2. Ecb-windows on the right side
+
+(defun ecb-delete-window-ecb-windows-right (window edit-win-list)
+  (delete-window window))
+
+;; 3. Ecb-windows on the top
+
+(defun ecb-delete-window-ecb-windows-top (window edit-win-list)
+  (let ((ecb-win-height-before (ecb-window-full-height (frame-first-window ecb-frame)))
+        (curr-edit-win-height (ecb-window-full-height window)))
+    (delete-window window)
+    (when (/= (ecb-window-full-height (frame-first-window ecb-frame))
+              ecb-win-height-before)
+      (save-selected-window
+        (select-window (ecb-next-listelem edit-win-list window))
+        (enlarge-window curr-edit-win-height)))))
+
+
+(defconst ecb-layout-types '(left right top left-right))
+
+(defun ecb-layout-type-p (type &optional err)
+  (if (not (member type ecb-layout-types))
+      (if err
+          (error "Only left, right, top and left-right are allowed as types!")
+        nil)
+    t))
+
+(defvar ecb-available-layouts nil
+  "List of all current available layout names. Do not change this variable!
+This variable is only modified by `ecb-available-layouts-add' and
+`ecb-available-layouts-remove'. These functions are only called by
+`ecb-layout-define' and `ecb-layout-undefine'!")
+
+;; Accessors for `ecb-available-layouts':
+(defun ecb-available-layouts-of-type (type)
+  "Return a list of all layout-names for given type TYPE. Type must be an
+element of `ecb-layout-types' or nil \(then return all layout-names
+regardless of the type)."
+  (if type (ecb-layout-type-p type t))
+  (delete nil (mapcar (function (lambda (elem)
+                                  (if (or (not type)
+                                          (equal (cdr elem) type))
+                                      (car elem))))
+                      ecb-available-layouts)))
+
+(defun ecb-available-layouts-member-p (layout-name)
+  "Return a non nil value iff LAYOUT-NAME is the name of a layout of
+`ecb-available-layouts'."
+  (member layout-name (ecb-available-layouts-of-type nil)))
+
+(defun ecb-available-layouts-add (name type)
+  "Add layout with NAME and TYPE to `ecb-available-layouts'. NAME is a string
+and TYPE must be an element of `ecb-layout-types'."
+  (add-to-list 'ecb-available-layouts (cons name type))
+  (setq ecb-available-layouts
+        (sort ecb-available-layouts
+              (function (lambda (l r)
+                          (ecb-string< (car l) (car r)))))))
+
+(defun ecb-available-layouts-remove (name)
+  "Remove layout with NAME from `ecb-available-layouts'."
+  (let ((elem (assoc name ecb-available-layouts)))
+    (when elem
+      (setq ecb-available-layouts
+            (sort (delete elem ecb-available-layouts)
+                  (function (lambda (l r)
+                              (ecb-string< (car l) (car r)))))))))
+
+(defun ecb-get-layout-type (&optional name)
+  "Return the type of current layout or of layout NAME."
+  (let ((n (or name ecb-layout-name)))
+    (cdr (assoc n ecb-available-layouts))))
+
+(defun ecb-layout-left-p (&optional name)
+  "Return not nil if current layout or layout NAME is of type left."
+  (equal 'left (ecb-get-layout-type name)))
+
+(defun ecb-layout-leftright-p (&optional name)
+  "Return not nil if current layout or layout NAME is of type left-right."
+  (equal 'left-right (ecb-get-layout-type name)))
+
+(defun ecb-layout-right-p (&optional name)
+  "Return not nil if current layout or layout NAME is of type right."
+  (equal 'right (ecb-get-layout-type name)))
+
+(defun ecb-layout-top-p (&optional name)
+  "Return not nil if current layout or layout NAME is of type top."
+  (equal 'top (ecb-get-layout-type name)))
+
+;; Macro for easy defining new layouts
+(defmacro ecb-layout-define (name type doc &rest create-code)
+  "Creates a new ECB-layout with name NAME which must be a string. TYPE is the
+type of the new layout and is literal, i.e. not evaluated. It can be left,
+right, top or left-right. DOC is the docstring for the new layout-function
+\"ecb-layout-function-<name>\". CREATE-CODE is all the lisp code which is
+necessary to define the ECB-windows/buffers. This macro adds the layout with
+NAME and TYPE to the internal variable `ecb-available-layouts'.
+
+Preconditions for CREATE-CODE:
+1. Current frame is splitted at least in one edit-window and the column\(s)
+   (for layout types left, right and left-right) rsp. row \(for a top layout)
+   for the special ECB-windows/buffers. Depending on the value of the option
+   `ecb-compile-window-height' there is also a compile window at the bottom of
+   the frame which is stored in `ecb-compile-window'.
+
+2. All windows are not dedicated.
+
+3. Neither the edit-window nor the compile-window \(if there is one) are
+   selected for types left, right and top. For type left-right the left
+   column-window is selected.
+
+4. All ECB-advices for the functions in `ecb-layout-basic-adviced-functions' are
+   disabled!
+
+Things CREATE-CODE has to do:
+1. Splitting the ECB-windows-column\(s)/row \(s.a.) in all the ECB-windows the
+   layout should contain \(e.g. directories, sources, methods and history).
+   The split must not be done with other functions than `ecb-split-hor' and
+   `ecb-split-ver'! It is recommended not to to use a \"hard\" number of
+   split-lines or -columns but using fractions between -0.9 and +0.9! Tip: It
+   is recommended to spilt from right to left and from bottom to top or with
+   other words: First create the right-most and bottom-most special windows!
+
+2. Making each special ECB-window a dedicated window. This can be done with
+   one of the following functions:
+   + `ecb-set-directories-buffer'
+   + `ecb-set-sources-buffer'
+   + `ecb-set-methods-buffer'
+   + `ecb-set-history-buffer'
+   + `ecb-set-speedbar-buffer'
+   Each layout can only contain one of each tree-buffer-type!
+
+   In addition to these functions there is a general macro:
+   + `defecb-window-dedicator':
+   This macro defines a so called \"window-dedicator\" which is a function
+   registered at ECB and called by ECB to perform any arbitrary code in
+   current window and makes the window autom. dedicated at the end. This can
+   be used by third party packages like JDEE to create arbitrary ECB-windows
+   besides the standard tree-windows.
+
+   To make a special ECB-window a dedicated window either one of the five
+   functions above must be used or a new \"window-dedicator\"-function has to
+   be defined with `defecb-window-dedicator' and must be used within the
+   layout-definition.
+
+3. Every\(!) special ECB-window must be dedicated as described in 2.
+
+4. CREATE-CODE must work correctly regardless if there is already a
+   compile-window \(stored in `ecb-compile-window') or not
+   \(`ecb-compile-window' is nil)
+
+Things CREATE-CODE can do or can use:
+1. Using the values of `ecb-compile-window-height', `ecb-windows-width',
+   `ecb-windows-height' and `ecb-compile-window-width'.
+
+Things CREATE-CODE must NOT do:
+1. Splitting the edit-window
+2. Creating a compile-window
+3. Deleting the edit-window, the compile-window \(if there is any) or the
+   ECB-windows-column\(s)/row \(see Precondition 1.)
+4. Referring to the values of `ecb-edit-window' or `ecb-compile-window'
+   because these values are always nil or undefined during CREATE-CODE.
+5. Using the function `ecb-compile-window-live-p'.
+
+Postconditions for CREATE-CODE:
+1. The edit-window must be the selected window and must not be dedicated.
+2. Every window besides the edit-window \(and the compile-window) must be
+   a dedicated window \(e.g. a ECB-tree-window)."
+  `(progn
+     (ecb-layout-type-p (quote ,type) t)
+     (eval-and-compile
+       (defun ,(intern (format "ecb-layout-function-%s" name)) (&optional create-code-fcn)
+         ,doc
+         ;; Klaus Berndl <klaus.berndl@sdm.de>: creating the compile-window is
+         ;; now done in `ecb-redraw-layout-full'!
+         ;; (when (and ecb-compile-window-height
+         ;;            (or (equal ecb-compile-window-width 'frame)
+         ;;                (equal (ecb-get-layout-type ecb-layout-name) 'top)))
+         ;;   (ecb-split-ver (- ecb-compile-window-height) t t)
+         ;;   (setq ecb-compile-window (next-window)))
+         ,(cond ((equal type 'left)
+                 '(ecb-split-hor ecb-windows-width t))
+                ((equal type 'right)
+                 '(ecb-split-hor (- ecb-windows-width) nil))
+                ((equal type 'top)
+                 '(ecb-split-ver ecb-windows-height t))
+                ((equal type 'left-right)
+                 '(progn
+                    (ecb-split-hor (- ecb-windows-width) t)
+                    (ecb-split-hor ecb-windows-width t t))))
+         ;; if create-code-fcn is not nil and we have not a left-right layout
+         ;; then we call this function instead of create-code - afterwards we
+         ;; have to select the edit-window. If create-code-fcn is nil then the
+         ;; leftmost-topmost ecb-window-column/bar is selected.
+         (if (and create-code-fcn
+                  (not (equal (ecb-get-layout-type ecb-layout-name) 'left-right)))
+             (progn
+               (funcall create-code-fcn)
+               (select-window (next-window)))
+           ,@create-code)
+         ;; Klaus Berndl <klaus.berndl@sdm.de>: creating the compile-window is
+         ;; now done in `ecb-redraw-layout-full'!
+         ;; (when (and ecb-compile-window-height
+         ;;            (equal ecb-compile-window-width 'edit-window)
+         ;;            (not (equal (ecb-get-layout-type ecb-layout-name) 'top)))
+         ;;   (ecb-split-ver (- ecb-compile-window-height) t t)
+         ;;   (setq ecb-compile-window (next-window)))
+         (setq ecb-edit-window (selected-window)))
+       (defalias (quote ,(intern
+                          (format "ecb-delete-window-in-editwindow-%s"
+                                  name)))
+         (quote ,(intern
+                  (format "ecb-delete-window-ecb-windows-%s" type)))))
+     (ecb-available-layouts-add ,name (quote ,type))))
+
+;; we want proper editing with ecb-layout-define like follows:
+;; (ecb-layout-define "name" left
+;;   "documentation" or nil
+;;   ;; here comes the creation code
+;;   )
+(put 'ecb-layout-define 'lisp-indent-function 2)
+
+(defun ecb-layout-undefine (name)
+  "Unbind ecb-layout-function-<NAME>, ecb-delete-window-ecb-windows-<NAME>,
+ecb-delete-other-windows-ecb-windows-<NAME> and remove NAME from
+`ecb-available-layouts'."
+  (fmakunbound (intern (format "ecb-layout-function-%s" name)))
+  (fmakunbound (intern (format "ecb-delete-window-ecb-windows-%s" name)))
+  (ecb-available-layouts-remove name))
+
+
+(defun ecb-choose-layout-name (layout-list require-match)
+  "Calls `completing-read' for LAYOUT-LIST which is a list of layout-names.
+For REQUIRE-MATCH see documentation of `completing-read'. For a null input the
+first element of LAYOUT-LIST is returned."
+  (let ((result (completing-read "Insert a layout name: "
+                                 (mapcar (function (lambda (x) (list x t)))
+                                         layout-list)
+                                 nil require-match)))
+    (if (= (length result) 0)
+        (car layout-list)
+      result)))
+
+(defun ecb-layout-switch (name)
+  "Switch to layout with layout-name NAME."
+  (let ((comp-win-state (ecb-compile-window-state)))
+    (customize-set-variable 'ecb-layout-name name)
+    (if (and ecb-change-layout-preserves-compwin-state
+             (equal comp-win-state 'hidden))
+        (ecb-toggle-compile-window -1))))
+  
+
+(defun ecb-change-layout (&optional preselect-type)
+  "Change to one of current available layouts.
+For this TAB-completion is offered. If optional argument PRESELECT-TYPE is not
+nil then you can preselect a layout-type \(TAB-completion is offered too) and
+then will be asked only for layouts of that preselected type.
+
+Note: Do not use this function from within elisp-programs; use
+`ecb-layout-switch'!"
+  (interactive "P")
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    (let ((type (if preselect-type
+                    (intern (ecb-query-string
+                             "Insert a layout type:"
+                             (mapcar (function (lambda (elem)
+                                                 (symbol-name elem)))
+                                     ecb-layout-types))))))
+      (ecb-layout-switch (ecb-choose-layout-name
+                          (ecb-available-layouts-of-type type) t)))))
+
+(defun ecb-show-layout-help ()
+  "Select a layout-name and shows the documentation of the layout-function.
+At least for the built-in layouts the documentation contains a picture of the
+outline of the chosen layout."
+  (interactive)
+  ;; ensure we have load all layouts defined until now
+  (ecb-load-layouts)
+  (describe-function
+   (intern (format "ecb-layout-function-%s"
+                   (ecb-choose-layout-name (ecb-available-layouts-of-type nil)
+                                           t)))))
+
+;; the window-configuration cache with some accessors
+
+;; TODO: Make this advices permanent.
+(defvar ecb-window-config-cache-size 200)
+(defvar ecb-window-config-cache nil
+  "A ring-cache for ecb-window-configurations. Max. size is
+`ecb-window-config-cache-size'. If a new element is added and the cache is
+already full then the oldest item is dumped to make room.")
+
+(defun ecb-window-config-cache-add (ecb-window-config)
+  "Add ECB-WINDOW-CONFIG to the `ecb-window-config-cache'-ring. The new config
+will be added as the newest \(last) item. If the cache is full \(see
+`ecb-window-config-cache-size'), dump the oldest item to make room."
+  (ecb-window-config-cache-init)
+  (ecb-ring-insert ecb-window-config-cache ecb-window-config))
+
+(defun ecb-window-config-cache-get (emacs-window-config)
+  "Get the cache-element for the EMACS-WINDOW-CONFIG which is
+window-configuration-object like returned by `current-window-configuration'.
+If the cache does not contain such an element then nil is returned."
+  (if (and (ecb-ring-p ecb-window-config-cache)
+           (not (ecb-ring-empty-p ecb-window-config-cache)))
+      (let ((configs (ecb-ring-elements ecb-window-config-cache)))
+        (assq emacs-window-config configs))))
+
+(defun ecb-window-config-cache-get-latest ()
+  "Get the newest \(last) cache-item."
+  (if (and (ecb-ring-p ecb-window-config-cache)
+           (not (ecb-ring-empty-p ecb-window-config-cache)))
+      (ecb-ring-ref ecb-window-config-cache 0)))
+
+(defun ecb-window-config-cache-init ()
+  "Initialize the cache as a ring of size `ecb-window-config-cache-size' if
+not already initialized."
+  (or (ecb-ring-p ecb-window-config-cache)
+      (setq ecb-window-config-cache
+            (ecb-make-ring ecb-window-config-cache-size))))
+
+(defun ecb-window-config-cache-clear ()
+  "Clear the cache."
+  (setq ecb-window-config-cache nil))
+
+;; handling window-configurations 
+
+(defun ecb-window-configuration-invalidp (window-config)
+  "Return non nil when WINDOW-CONFIG is probably not valid anymore.
+WINDOW-CONFIG must be got from the adviced version of
+`current-window-configuration'."
+  (not (equal (nth 3 window-config)
+              (list ecb-frame ecb-layout-name ecb-compile-window-height
+                    ecb-compile-window-width
+                    ecb-windows-width ecb-windows-height))))
+
+
+(defecb-advice current-window-configuration after ecb-layout-basic-adviced-functions
+  "Stores some additional informations about the window-configurations needed
+by ECB."
+  (condition-case oops
+      (let ((f (or (ad-get-arg 0) (selected-frame))))
+        (when (equal f ecb-frame)
+          (ecb-window-config-cache-add
+           (list ad-return-value
+                 (if ecb-windows-hidden
+                     nil
+                   (ecb-get-current-visible-ecb-buffers))
+                 (if (ecb-compile-window-live-p)
+                     (ecb-position (ecb-canonical-windows-list)
+                                   ecb-compile-window))
+                 ;; We add here as first element `ecb-frame' and also in the
+                 ;; check of `ecb-window-configuration-invalidp'! Then a
+                 ;; ecb-window-config made from a frame which is now deleted
+                 ;; would be always invalid, which would be more consistency
+                 ;; with the return-value of `set-window-configuration' (see
+                 ;; docstring)
+                 ;;
+                 ;; This element is only used in
+                 ;; `ecb-window-configuration-invalidp'!
+                 (list ecb-frame ecb-layout-name ecb-compile-window-height
+                       ecb-compile-window-width
+                       ecb-windows-width ecb-windows-height)
+                 ecb-edit-area-creators
+                 ecb-windows-hidden
+                 (ecb-window-configuration-data)))))
+    (error
+     (ecb-layout-debug-error "advice of current-window-configuration failed: (error-type: %S, error-data: %S)"
+                             (car oops) (cdr oops))))
+  ad-return-value)
+
+
+(defecb-advice set-window-configuration after ecb-layout-basic-adviced-functions
+  "Resets some internal window-configuration-states needed by ECB. These
+internal ECB-states were stored by `current-window-configuration' in a
+ring-cache as add-on to CONFIGURATION."
+  (condition-case oops
+      (when (equal (selected-frame) ecb-frame)
+        (let ((config (ecb-window-config-cache-get (ad-get-arg 0))))
+          (when (and config
+                     (not (ecb-window-configuration-invalidp config)))
+            (ecb-make-windows-not-dedicated ecb-frame)
+            ;; we have to reset the dedicated state because it is not
+            ;; preserved by `current-window-configuration' and
+            ;; `set-window-configuration'! At least not with GNU Emacs 21.X,
+            ;; In addition we have to reset ecb-compile-window and also to set
+            ;; ecb-windows-hidden correctly
+            (and (nth 1 config)
+                 (ecb-set-windows-dedicated-state (nth 1 config) t))
+            (when (nth 2 config)
+              (let ((win-list (ecb-canonical-windows-list)))
+                (and ecb-compile-window-height
+                     (setq ecb-compile-window (nth (nth 2 config) win-list)))))
+            ;; (nth 3 config) is not used and needed within this function!
+            (setq ecb-edit-area-creators (nth 4 config))
+            (setq ecb-windows-hidden (nth 5 config))
+            (ecb-set-minor-mode-text))))
+    (error
+     (ecb-layout-debug-error "advice of set-window-configuration failed: (error-type: %S, error-data: %S)"
+                             (car oops) (cdr oops))))
+  ad-return-value)
+
+(when-ecb-running-xemacs
+ (defecb-advice set-window-configuration/mapping after ecb-layout-basic-adviced-functions
+   "If `set-window-configuration' changes the values of `ecb-edit-window',
+`ecb-last-edit-window-with-point' or `ecb-compile-window', this advice reset
+them to the new values to allow ecb to run at all in XEmacs 21.5"
+   (let ((edit-window-changed (assq ecb-edit-window ad-return-value))
+         (last-edit-window-with-point-changed (assq ecb-last-edit-window-with-point ad-return-value))
+         (compile-window-changed (assq ecb-compile-window ad-return-value)))
+     (if edit-window-changed
+         (setq ecb-edit-window (cdr edit-window-changed)))
+     (if last-edit-window-with-point-changed
+         (setq ecb-last-edit-window-with-point (cdr last-edit-window-with-point-changed)))
+     (if compile-window-changed
+         (setq ecb-compile-window (cdr compile-window-changed)))))
+ )
+
+
+(defun ecb-current-window-configuration ()
+  "Return the current ecb-window-configuration"
+  (progn
+    (current-window-configuration)
+    (ecb-window-config-cache-get-latest)))
+
+(defun ecb-set-window-configuration (ecb-window-config)
+  "Sets the window-configuration of ECB-WINDOW-CONFIG. The additional
+informations needed by ECB will be set by the adviced version of
+`set-window-configuration'."
+  (set-window-configuration (car ecb-window-config)))
+
+(defmacro ecb-save-window-excursion (&rest body)
+  "Same as `save-window-excursion' but it takes care of the ECB-needs."
+  (let ((current-window-config (make-symbol "curr-win-conf")))
+    `(let ((,current-window-config (ecb-current-window-configuration)))
+       (unwind-protect
+           (progn
+             ,@body)
+         (ecb-set-window-configuration ,current-window-config)))))
+
+;; test of the advices of set-window-configuration and
+;; current-window-configuration.
+
+;; Show a compile-window and split the edit-area and then run this code. At
+;; the end the layout has to be as before.
+;;   (let ((config (current-window-configuration)))
+;;     (ecb-with-original-basic-functions
+;;      (delete-other-windows))
+;;     ;; set ecb-compile-window and ecb-edit-area-creators to some crap. If the
+;;     ;; test is ok, then the adviced set-window-configuration must reset these
+;;     ;; variables correctly!
+;;     (setq ecb-compile-window nil)
+;;     (setq ecb-edit-area-creators '(1 2 3 4))
+;;     (set-window-configuration config))
+
+;; run `ecb-test-store' when some splitted layout is active. Then do anything
+;; what you want to change the split-state of the layout and/or the
+;; visibility-state of the compile-window. Then run `ecb-test-restore': This
+;; has to bring back completely the stored configuration!
+;;   (defvar ecb-test-config nil)
+;;   (defun ecb-test-store ()
+;;     (interactive)
+;;     (setq ecb-test-config (current-window-configuration)))
+;;   (defun ecb-test-restore ()
+;;     (interactive)
+;;     (set-window-configuration ecb-test-config))
+
+
+;; redrawing the layout
+
+(defun ecb-redraw-layout (&optional arg)
+  "Redraw the ECB screen.
+
+Do not call this command from elisp-program but only interactively!
+
+Called without a prefix-argument the state of the ECB-frame-layout will
+preserved. This means:
+- The state of compile-window \(hidden or visible) will be preserved but if
+  visible then the height will be as specified in `ecb-compile-window-height'.
+- The state of the ECB-windows will be preserved \(hidden or visible) but if
+  visible then the sizes will be as specified in the layout \(and with the
+  options `ecb-windows-width' and `ecb-windows-height') or as stored with
+  `ecb-store-window-sizes'.
+
+If called with ONE prefix-argument \(\[C-u]) then the layout will be drawn
+with all ECB-windows and also with a visible compile-window \(when
+`ecb-compile-window-height' is not nil). The splitting-state of the edit-area
+will be preserved.
+
+If called with TWO prefix-arguments \(i.e. hitting \[C-u] twice: \[C-u]
+\[C-u]) then an emergency-redraw will be performed. This means the same as if
+called with one prefix-argument \(s.a.) but the splitting-state of the
+edit-area will NOT be preserved but all edit-windows besides the current one
+will be deleted. Use this only if there are some anomalies after standard
+redraws!
+
+If the variable `ecb-redraw-layout-quickly' is not nil then the redraw is done
+by the `ecb-redraw-layout-quickly' function, otherwise by
+`ecb-redraw-layout-full'.
+
+Please not: It's strongly recommended to use the quick redraw only if you have
+really slow machines where a full redraw takes several seconds because the
+quick redraw is not really safe and has some annoying drawbacks! On normal
+machines the full redraw should be done in << 1s so there should be no need
+for the quick version!"
+  (interactive "P")
+
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    (let ((compwin-hidden (equal (ecb-compile-window-state) 'hidden)))
+      (message "ECB redrawing layout...")
+    
+      (if (and ecb-redraw-layout-quickly
+               ecb-activated-window-configuration)
+          (condition-case nil
+              (ecb-redraw-layout-quickly)
+            (error (message "ECB: Quick redraw failed...full redraw will be performed!")
+                   (ecb-redraw-layout-full nil nil nil (and (not arg)
+                                                            ecb-windows-hidden)
+                                           (equal arg '(16)))))
+        (ecb-redraw-layout-full nil nil nil (and (not arg)
+                                                 ecb-windows-hidden)
+                                (equal arg '(16))))
+      
+      (if (and (not arg) compwin-hidden)
+          (ecb-toggle-compile-window -1)))
+
+    ;;make sure we are in the edit window if necessary.
+    (when ecb-select-edit-window-on-redraw
+      (ecb-select-edit-window))
+  
+    (message "ECB redrawing layout...done")))
+
+
+(defecb-autocontrol/sync-function ecb-repair-only-ecb-window-layout nil nil nil
+  "Repair the ecb-window layout if it has been destroyed."
+  ;; In the following situation repairing the layout with preserving all
+  ;; states of all edit-windows and the compile-window (incl. all sizes) makes
+  ;; sense:
+  ;; 1. There is a permanent compile-window visible
+  ;; 2. The ecb-windows are not hidden
+  ;; 3. there is no ecb-window maximized
+  ;; 4. There is no active minibuffer
+  ;; 5. we have less ecb-windows than we should have
+  ;; 6. Emacs does not wait for output of a running process where the
+  ;;    associated process-buffer is visible in the ecb-frame
+
+  ;; Then we redraw the layout with the current window-configuration-data
+  ;; (i.e. all data of all edit-windows and all data of the compile window) so
+  ;; we get back all ecb-windows of current lyout but preserve the
+  ;; edit-windows and also the compile-window (incl. its height).
+  (if (and (ecb-compile-window-live-p)
+           (not ecb-windows-hidden)
+           (not (ecb-buffer-is-maximized-p))
+           (not (minibuffer-window-active-p (minibuffer-window ecb-frame)))
+           (not (equal (mapcar 'buffer-name
+                               (ecb-get-current-visible-ecb-buffers))
+                       ecb-special-ecb-buffers-of-current-layout))
+           ;; Klaus Berndl <klaus.berndl@sdm.de>: Currently this is not
+           ;; perfect, because for example with a *shell* buffer visible this
+           ;; returns nil even if the shell-buffer will probably not be in use
+           ;; by Emacs - but for savety we have to incl. *shell* because a
+           ;; long running shell-job could run where the job inserts output in
+           ;; the shell-buffer.
+           (not (delq nil (mapcar (function (lambda (p)
+                                              (and (process-buffer p)
+                                                   (get-buffer-window (process-buffer p)
+                                                                      ecb-frame))))
+                                  (process-list)))))
+      (let ((config-data (ecb-window-configuration-data))
+            ;; (win-config-before (ecb-current-window-configuration))
+            (success nil))
+        (ecb-layout-debug-error "ecb-repair-ecb-window-layout: Current ecb-windows: %s"
+                                (ecb-get-current-visible-ecb-buffers))
+        (ecb-layout-debug-error "ecb-repair-ecb-window-layout: We repair with data: %s"
+                                config-data)
+        (setq success (condition-case oops
+                          (progn
+                            (ecb-redraw-layout-full nil nil config-data)
+                            (equal (mapcar 'buffer-name
+                                           (ecb-get-current-visible-ecb-buffers))
+                                   ecb-special-ecb-buffers-of-current-layout))
+                        (error
+                         (ecb-layout-debug-error "ecb-repair-only-ecb-window-layout failed (error-type: %S, error-data: %S)"
+                                                 (car oops) (cdr oops))
+                         nil)))
+        (when (not success)
+          ;; Reseting to the window-config before is good when done
+          ;; interactively but not with an idle-times because then this reset
+          ;; would be done until the user creates a window-config where no
+          ;; repair is necessary or at least the repair doesn't fail. So we
+          ;; have to implement a smarter mechanism..............
+          nil ;; (ecb-set-window-configuration win-config-before)
+          ))))
+
+                        
+
+(defun ecb-draw-compile-window (&optional height)
+  "Draws the compile-window during `ecb-redraw-layout-full'. This function
+does not change the selected window! It sets `ecb-compile-window' and
+`ecb-compile-window-height-lines'. If HEIGHT is not nil then the
+compile-window will drawn with height HEIGHT otherwise
+`ecb-compile-window-height' is used."
+  (ecb-split-ver (- ecb-compile-window-height) t t)
+  (setq ecb-compile-window (next-window))
+  ;; now we store the absolut height of the compile-window - if there is
+  ;; any - we need this height to always have the absolut height in
+  ;; lines when we want shrink back the compile-window to its
+  ;; specified height.
+  (setq ecb-compile-window-height-lines
+        (ecb-window-full-height ecb-compile-window))
+  ;; now we change the height of the compile-window if
+  ;; WINDOW-CONFIGURATION-DATA is not nil and contains data for a
+  ;; compile-window. This must be done before the layout-function
+  ;; is called so the ecb-windows will be created also with correct
+  ;; sizes when the compile-window is enlarged.
+  (when height
+    (save-selected-window
+      (select-window ecb-compile-window)
+      (enlarge-window (- height ecb-compile-window-height-lines)))))
+  
+
+;; the main layout core-function. This function is the "environment" for a
+;; special layout function (l.b.)
+(defun ecb-redraw-layout-full (&optional no-buffer-sync ecb-windows-creator
+                                         window-configuration-data
+                                         no-ecb-windows emergency)
+  "Redraw the ECB screen according to the layout set in `ecb-layout-name'. After
+this function the edit-window is selected which was current before redrawing.
+If NO-BUFFER-SYNC is not nil then the ecb-buffers will not be synchronized. If
+ECB-WINDOWS-CREATOR is not nil then it will be used to draw the layout instead
+of the standard layout. If WINDOW-CONFIGURATION-DATA is not nil it must be an
+object returned by `ecb-window-configuration-data' and will be used for
+restoring the layout. If EMERGENCY is not nil then all other args will be
+ignored and the layout will be redrawn like defined in the current layout and
+the edit-area will be unsplitted and will just contain the buffer before the
+emergency-redraw."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    ;; this functions are only needed at runtime!
+    (ecb-load-layouts)
+    (run-hooks 'ecb-redraw-layout-before-hook)
+    (let* ((config (or window-configuration-data (ecb-window-configuration-data)))
+           (window-before-redraw (nth 0 config))
+           (pos-before-redraw (nth 1 config))
+           (edit-win-data-before-redraw (nth 2 config))
+           (compile-window-config (nth 3 config))
+           (compile-buffer-before-redraw (nth 0 compile-window-config))
+           (compile-buffer-pos-before-redraw (nth 1 compile-window-config))
+           (ecb-windows-before-redraw (ecb-get-current-visible-ecb-buffers))
+           (edit-area-size nil)
+           (edit-win-list-after-redraw nil))
+
+      (ecb-layout-debug-error "ecb-redraw-layout-full: config: %s, hidden-state: %s, curr-buff: %s, last-source-buff: %s"
+                              config ecb-windows-hidden (current-buffer)
+                              ecb-last-source-buffer)
+      
+      ;; The following code runs with deactivated adviced functions, so the
+      ;; layout-functions can use the original function-definitions.
+      (ecb-with-original-basic-functions
+       (ecb-with-original-permanent-layout-functions
+        ;; first we go to the edit-window/buffer
+        (ecb-select-edit-window)
+
+        (ecb-do-with-unfixed-ecb-buffers
+         ;; Do some actions regardless of the chosen layout
+
+         ;; first we make all windows of ecb-frame not dedicated and then we
+         ;; delete all other windows so we have a clean frame with only one
+         ;; window where we can draw our layout. We restore later the
+         ;; frame-state (splits, buffers, points etc.)
+         (ecb-make-windows-not-dedicated ecb-frame)
+         (delete-other-windows)
+         ;; some paranoia...
+         (set-window-dedicated-p (selected-window) nil)
+
+         ;; we force a layout-function to set both of these windows
+         ;; correctly.
+         (setq ecb-edit-window nil
+               ecb-compile-window nil)
+
+         ;; Now we draw the compile-window and also the ecb-windows - the
+         ;; latter ones by calling the layout-function
+         (if (and (not emergency) no-ecb-windows)
+             ;; we want a layout-redraw without ecb-windows
+             (progn
+               (when ecb-compile-window-height
+                 (ecb-draw-compile-window (and window-configuration-data
+                                               compile-window-config
+                                               (nth 2 compile-window-config)))
+                 )
+               (setq ecb-edit-window (selected-window)))
+
+           ;; we have to redraw with ecb-windows
+           ;; 1. Drawing the compile-window when it has frame-width
+           (when (and ecb-compile-window-height
+                      (or (equal ecb-compile-window-width 'frame)
+                          (equal (ecb-get-layout-type ecb-layout-name) 'top)))
+             (ecb-draw-compile-window (and window-configuration-data
+                                           compile-window-config
+                                           (nth 2 compile-window-config))))
+
+           ;; 2. Drawing the ecb-windows with the layout-function
+           (funcall (intern (format "ecb-layout-function-%s" ecb-layout-name))
+                    ecb-windows-creator)
+
+           ;; 3. Drawing the compile-window when it has edit-area-width
+           (when (and ecb-compile-window-height
+                      (equal ecb-compile-window-width 'edit-window)
+                      (not (equal (ecb-get-layout-type ecb-layout-name) 'top)))
+             (ecb-draw-compile-window (and window-configuration-data
+                                           compile-window-config
+                                           (nth 2 compile-window-config)))))
+
+         ;; Now we store the window-sizes of the ecb-windows but only if we
+         ;; have drawn them either without a compile-window or with a
+         ;; compile-window with height as specified in
+         ;; `ecb-compile-window-height'
+         (if (or (not ecb-compile-window-height-lines)
+                 (not (and window-configuration-data
+                           compile-window-config)))
+             (setq ecb-layout-default-window-sizes (ecb-get-ecb-window-sizes)))
+
+         ;; Here all needed windows are created
+
+         ;; selecting the edit-window (this is an implicit-check if the
+         ;; layout-function has set `ecb-edit-window'
+         (select-window
+          (if ecb-edit-window
+              ecb-edit-window
+            (error "Edit-window not set in function 'ecb-layout-function-%s"
+                   ecb-layout-name)))
+
+         ;; resetting some states if we have a full layout
+         (when (or emergency
+                   (and (null ecb-windows-creator) (not no-ecb-windows)))
+           (setq ecb-current-maximized-ecb-buffer-name nil)
+           (setq ecb-cycle-ecb-buffer-state nil))
+
+         ;; now regardless of the value of ECB-WINDOWS-CREATOR and
+         ;; NO-ECB-WINDOWS the selected window is the edit-window and
+         ;; ecb-edit-window is set to this window.
+
+         ) ;; end ecb-do-with-unfixed-ecb-buffers
+
+        (if emergency
+            (setq ecb-windows-hidden nil)
+          (setq ecb-windows-hidden no-ecb-windows))
+        (ecb-set-minor-mode-text)
+
+        ;; Now all the windows must be created and the editing window must not
+        ;; be splitted! In addition the variables `ecb-edit-window' and
+        ;; `ecb-compile-window' must be set to the correct windows.
+
+        ;; The following when-expression is added for better relayouting the
+        ;; chosen layout if we have a compilation-window.
+        (when ecb-compile-window-height
+          (if (not (ecb-compile-window-live-p))
+              (error "Compilation-window not set in the layout-function"))
+          (set-window-buffer
+           ecb-compile-window
+           (or (and compile-buffer-before-redraw
+                    (ecb-compilation-buffer-p compile-buffer-before-redraw))
+               (ecb-some (function (lambda (buf)
+                                     (and (not (ecb-string= "*Completions*"
+                                                            (ecb-buffer-name buf)))
+                                          (not (ecb-check-for-special-buffer buf))
+                                          (ecb-compilation-buffer-p buf))))
+                         (buffer-list ecb-frame))
+               (get-buffer-create "*scratch*"))))
+
+        ;; Only the function `ecb-redraw-layout-full' is allowed to refer and
+        ;; set the variable `ecb-edit-window' but not after the following
+        ;; code-line. The only exception is that every layout-function must set
+        ;; `ecb-edit-window' and `ecb-compile-window' at its end (but because
+        ;; most layout-function will be generated with `ecb-layout-define' this
+        ;; is not really an exception).
+        (select-window ecb-edit-window))) ;; end of ecb-with-original-basic-functions,
+                                          ;; ecb-with-original-permanent-layout-functions
+
+      ;; now we restore the edit-windows as before the redraw
+      (if (and (not emergency)
+               (= (length edit-win-data-before-redraw)
+                  (ecb-edit-area-creators-number-of-edit-windows)))
+          (ecb-with-original-basic-functions
+           (ecb-with-original-permanent-layout-functions
+            (ecb-restore-edit-area)))
+        (ecb-edit-area-creators-init))
+      
+      (when (not emergency)
+        (setq edit-win-list-after-redraw (ecb-canonical-edit-windows-list))
+        (setq edit-area-size (ecb-get-edit-area-size)))
+
+      ;; a safety-check if we have now after redrawing at least as many
+      ;; edit-windows as before redrawing. If yes we restore all window-data
+      ;; as before redraw.
+      (when (and (not emergency)
+                 (= (length edit-win-list-after-redraw)
+                    (length edit-win-data-before-redraw)))
+        (dotimes (i (length edit-win-data-before-redraw))
+          (let ((win (nth i edit-win-list-after-redraw))
+                (data (nth i edit-win-data-before-redraw)))
+            (when (buffer-live-p (nth 0 data))
+              (set-window-buffer win (nth 0 data))
+              (set-window-start win (nth 1 data))
+              (set-window-point win (nth 2 data)))))
+
+        ;; Klaus Berndl <klaus.berndl@sdm.de>: It seems that resizing the
+        ;; windows is not reliable in some constellations with more than 3
+        ;; edit-windows - but with max. 3 edit-windows there are not known any
+        ;; problems - and 3 edit-windows should e sufficient for most
+        ;; situations.
+        (when (< (length edit-win-data-before-redraw) 4)
+          (dotimes (i (length edit-win-data-before-redraw))
+            (let ((win (nth i edit-win-list-after-redraw))
+                  (data (nth i edit-win-data-before-redraw)))
+              (if (> (length edit-win-list-after-redraw) 1)
+                  (ecb-set-window-size win (nth 3 data) edit-area-size))
+              )))
+
+        ;; at the end of the edit-area-redraw we always stay in that edit-window
+        ;; as before the redraw
+        (when (integerp window-before-redraw)
+          (ecb-select-edit-window window-before-redraw))       
+        ;; if we were in an edit-window before redraw let us go to the old
+        ;; place if the buffer is still alive.
+        (when (and pos-before-redraw
+                   (buffer-live-p (nth 0 (nth (1- window-before-redraw)
+                                              edit-win-data-before-redraw))))
+          (goto-char pos-before-redraw)))
+
+      ;; Restore saved window sizes
+      (when (or emergency
+                (and (null ecb-windows-creator) (not no-ecb-windows)))
+        (ecb-restore-window-sizes))
+
+      (setq ecb-last-source-buffer (current-buffer))
+      (setq ecb-last-edit-window-with-point (selected-window))
+
+      ;; updating and synchronizing of the ecb-windows but only when we have a
+      ;; full redraw incl. the ecb-windows.
+      (when (or emergency (not no-ecb-windows))
+        (let ((current-ecb-buffers (ecb-get-current-visible-ecb-buffers)))
+          (when (or emergency (null ecb-windows-creator))
+            (setq ecb-special-ecb-buffers-of-current-layout
+                  (mapcar 'buffer-name current-ecb-buffers)))
+          ;; fill-up the history new with all buffers if the history buffer was
+          ;; not shown before the redisplay but now (means if the layout has
+          ;; changed)
+          (when (and (not (member (get-buffer ecb-history-buffer-name)
+                                  ecb-windows-before-redraw))
+                     (member (get-buffer ecb-history-buffer-name)
+                             current-ecb-buffers))
+            (ecb-add-buffers-to-history-new))
+          ;; update the directories buffer if the directories buffer was not
+          ;; shown before the redisplay but now (means if the layout has
+          ;; changed)
+          (when (and (not (member (get-buffer ecb-directories-buffer-name)
+                                  ecb-windows-before-redraw))
+                     (member (get-buffer ecb-directories-buffer-name)
+                             current-ecb-buffers))
+            (ecb-update-directories-buffer))
+          ;; deactivate the speedbar stuff if the speedbar-integration-buffer
+          ;; was shown before but not now
+          (when (and (member (get-buffer ecb-speedbar-buffer-name)
+                             ecb-windows-before-redraw)
+                     (not (member (get-buffer ecb-speedbar-buffer-name)
+                                  current-ecb-buffers)))
+            (ignore-errors (ecb-speedbar-deactivate)))
+          ;; synchronize the special ecb-buffers if necessary (means if not all
+          ;; ecb-windows of current layout were visible before redraw) and
+          (when (and (not (equal ecb-windows-before-redraw current-ecb-buffers))
+                     (not no-buffer-sync))
+            ;; maybe we have to deal with the other special buffers too but
+            ;; maybe this is not necessary because the idle-stuff runs...
+            (ecb-basic-buffer-sync t))
+          ))
+
+      ;; if the compile-window was selected before redraw we go back to it
+      (when (and (ecb-compile-window-live-p)
+                 compile-buffer-pos-before-redraw)
+        (select-window ecb-compile-window)
+        (goto-char compile-buffer-pos-before-redraw))
+
+      ;; after a full redraw the stored window-configuration for a quick
+      ;; redraw should be actualized
+      (if ecb-redraw-layout-quickly
+          (setq ecb-activated-window-configuration
+                (ecb-current-window-configuration))))
+    (run-hooks 'ecb-redraw-layout-after-hook)))
+    
+
+(defun ecb-redraw-layout-quickly ()
+  "Redraw the layout quickly using the cached window configuration
+`ecb-activated-window-configuration'."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame))
+    (run-hooks 'ecb-redraw-layout-before-hook)
+    (ecb-set-window-configuration ecb-activated-window-configuration)
+    (run-hooks 'ecb-redraw-layout-after-hook)))
+
+
+(defvar ecb-toggle-layout-state 0
+  "Internal state of `ecb-toggle-layout'. Do not change it!")
+(defun ecb-toggle-layout (&optional last-one)
+  "Toggles between the layouts defined in `ecb-toggle-layout-sequence'.
+See also option `ecb-show-sources-in-directories-buffer'.
+
+If optional argument LAST-ONE is not nil \(e.g. called with a prefix-arg) then
+always the last selected layout was choosen regardless of the setting in
+`ecb-toggle-layout-sequence'. The last selected layout is always that layout
+which was current direct before the most recent layout-switch. So now a user
+can switch to another layout via `ecb-change-layout' and always come back to
+his previous layout via \[C-u] `ecb-toggle-layout'."
+  (interactive "P")
+  (if (and last-one
+           (stringp ecb-last-selected-layout))
+      (ecb-layout-switch ecb-last-selected-layout)
+    (let ((layout-name (nth ecb-toggle-layout-state ecb-toggle-layout-sequence))
+          (next-index (if (< (1+ ecb-toggle-layout-state)
+                             (length ecb-toggle-layout-sequence))
+                          (1+ ecb-toggle-layout-state)
+                        0)))
+      (when (and layout-name (not (= ecb-toggle-layout-state next-index)))
+        (setq ecb-toggle-layout-state next-index)
+        (ecb-layout-switch layout-name)))))
+
+(defun ecb-store-window-sizes (&optional fix)
+  "Stores the sizes of the ECB windows for the current layout.
+The size of the ECB windows will be set to their stored values when
+`ecb-redraw-layout' or `ecb-restore-window-sizes' is called. To reset the
+window sizes to their default values call `ecb-restore-default-window-sizes'.
+Please read also the documentation of `ecb-layout-window-sizes'!
+
+The windows sizes are stored per default as fractions of current frame-width
+and -height of the ecb-frame, so the stored values will \"work\" for other
+frame sizes too. If a permanent compile-window is visible then ECB will tell
+you that window-sizes should be stored with hidden compile-window and ask you
+if you want proceed; if you proceed then the window-heights will be stored as
+fractions of current \(frame-height minus current visible
+compile-window-height) so you should ensure that the current compile-window
+has its standard-height as specified in `ecb-compile-window-height'!. If FIX
+is not nil \(means called with a prefix argument) then always the fixed values
+of current width and height are stored!"
+  (interactive "P")
+  (when (equal (selected-frame) ecb-frame)
+    (if (ecb-buffer-is-maximized-p)
+         (ecb-error "Sizes can not be stored when an ECB-window is maximized!")
+      (if (or (not (ecb-compile-window-live-p))
+              (y-or-n-p "Window-sizes should be stored with hidden compile-window! Proceed? "))
+          (let ((a (ecb-find-assoc ecb-layout-name ecb-layout-window-sizes)))
+            (unless a
+              (setq a (cons ecb-layout-name nil))
+              (setq ecb-layout-window-sizes
+                    (ecb-add-assoc a ecb-layout-window-sizes)))
+            (setcdr a (ecb-get-ecb-window-sizes fix))
+            (ecb-customize-save-variable 'ecb-layout-window-sizes
+                                         ecb-layout-window-sizes))))))
+
+
+(defun ecb-restore-window-sizes ()
+  "Sets the sizes of the ECB windows to their stored values."
+  (interactive)
+  (when (equal (selected-frame) ecb-frame)
+    (ecb-set-ecb-window-sizes (ecb-find-assoc-value ecb-layout-name
+                                                    ecb-layout-window-sizes))))
+
+(defun ecb-restore-default-window-sizes ()
+  "Resets the sizes of the ECB windows to their default values."
+  (interactive)
+  (when (equal (selected-frame) ecb-frame)
+    (setq ecb-layout-window-sizes
+	  (ecb-remove-assoc ecb-layout-name ecb-layout-window-sizes))
+    (ecb-customize-save-variable 'ecb-layout-window-sizes ecb-layout-window-sizes)))
+
+;; Now per default returns fractions of the ecb-frame; thanks to Geert Ribbers
+;; [geert.ribbers@realworld.nl] for a first implementation.
+(defun ecb-get-window-size (window &optional fix ref-size)
+  "Return the sizes of WINDOW as a cons where the car is the width and the cdr
+is the height. Per default both values are fractions of the frame-width (rsp.
+height) of the `ecb-frame' unless FIX is not nil. Optional third argument
+REF-SIZE is a cons where car is the referencial width and the cdr is the
+referencial height when the sizes should be computed as fractionals of the
+REF-SIZE; then the resulting sizes are floating-point-numbers) \(if FIX is
+nil). Default referencial width rsp. height are `frame-width' rsp.
+`frame-height' of the `ecb-frame'."
+  (when window
+    (let ((ref-width (or (car ref-size) (frame-width ecb-frame)))
+          (ref-height (or (cdr ref-size) (frame-height ecb-frame))))
+      (cons (/ (ecb-window-full-width window)
+               (if fix
+                   1
+                 (* 1.0 ref-width)))
+            (/ (ecb-window-full-height window)
+               (if fix
+                   1
+                 (* 1.0 ref-height)))))))
+
+
+(defun ecb-get-ecb-window-sizes (&optional fix ecb-win-list)
+  "Get all window-sizes of current visible ecb-windows. If FIX is not nil then
+fixed sizes are used otherwise fractions of current frame-width rsp. -height.
+If a permanent compile-window is visible then window-heights will be computed
+as fractions of current \(frame-height minus current visible
+compile-window-height)!
+Uses ECB-WIN-LIST or - if nil - computes it with the function
+`ecb-canonical-ecb-windows-list'."
+  (let ((ref-height (if (ecb-compile-window-live-p)
+                        (- (frame-height ecb-frame)
+                           (ecb-window-full-height ecb-compile-window))
+                      (frame-height ecb-frame)))
+        (ref-width (frame-width ecb-frame)))
+    (mapcar (function (lambda (window)
+                        (ecb-get-window-size window
+                                             fix
+                                             (cons ref-width ref-height))))
+            (or ecb-win-list (ecb-canonical-ecb-windows-list)))))
+
+;; Now possible to set fractional sizes; thanks to Geert Ribbers
+;; [geert.ribbers@realworld.nl] for a first implementation.
+(defun ecb-set-window-size (window size &optional ref-size)
+  "Enlarge/shrink WINDOW to SIZE where SIZE is a cons with new width as car
+and new height as cdr. New width and height can be floating-point-numbers.
+Optional third argument REF-SIZE is a cons too where car is the referencial
+width and the cdr is the referencial height when the car and cdr of SIZE are
+floating-point-numbers. Default referencial width rsp. height are
+`frame-width' rsp. `frame-height' of the `ecb-frame'."
+  (when (and window (window-live-p window) (consp size))
+    (let* ((ref-width (or (car ref-size) (frame-width ecb-frame)))
+           (ref-height (or (cdr ref-size) (frame-height ecb-frame)))
+           (absolut-width (if (and (numberp (car size))
+                                   (floatp (car size))) 
+                              (* (car size) ref-width)
+                            (car size)))
+           (absolut-height (if (and (numberp (car size))
+                                    (floatp (cdr size))) 
+                               (* (cdr size) ref-height)
+                             (cdr size)))
+           (enlarge-width (if (numberp absolut-width)
+                              (- (round absolut-width)
+                                 (ecb-window-full-width window))))
+           (enlarge-height (if (numberp absolut-height)
+                               (- (round absolut-height)
+                                  (ecb-window-full-height window)))))
+      (save-selected-window
+        (select-window window)
+        (if (and (numberp enlarge-width) (/= enlarge-width 0))
+            (ignore-errors (enlarge-window enlarge-width t)))
+        (if (and (numberp enlarge-height) (/= enlarge-height 0))
+            (ignore-errors (enlarge-window enlarge-height)))))))
+
+(defun ecb-set-ecb-window-sizes (window-sizes)
+  (unless ecb-windows-hidden
+    (ecb-do-with-unfixed-ecb-buffers
+     (let ((sizes (or window-sizes ecb-layout-default-window-sizes))
+           (windows (ecb-canonical-ecb-windows-list))
+           (ref-width (frame-width ecb-frame))
+           (ref-height (if (ecb-compile-window-live-p)
+                           (- (frame-height ecb-frame)
+                              (ecb-window-full-height ecb-compile-window))
+                         (frame-height ecb-frame))))
+       (ecb-layout-debug-error "ecb-set-ecb-window-sizes: window-sizes: %s, sizes: %s, windows: %s, length-s: %d, length-w: %d"
+                               window-sizes sizes windows
+                               (length sizes) (length windows))
+       (mapc (lambda (win)
+               (ecb-layout-debug-error "ecb-set-ecb-window-sizes: win %s, ded: %s"
+                                       win (window-dedicated-p win)))
+             windows)
+       (when sizes
+         (if (= (length windows) (length sizes))
+             (dolist (size sizes)
+               (ecb-set-window-size (car windows) size (cons ref-width ref-height))
+               (setq windows (cdr windows)))
+           (when (interactive-p)
+             (ecb-error "Stored sizes of layout %s not applicable for current window layout!"
+                        ecb-layout-name))))))))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: frame-width is smaller than
+;; ecb-window-full-width for only one window in the frame. But for now this
+;; doesn't matter because it is only important that for getting and setting
+;; the edit-windows-sizes the same reference-sizes are used.
+(defun ecb-get-edit-area-size (&optional win-list)
+  (let ((layout-type (ecb-get-layout-type ecb-layout-name))
+        (ecb-win-list (ecb-canonical-ecb-windows-list win-list))
+        (comp-win-height (if (equal (ecb-compile-window-state) 'visible)
+                             (ecb-window-full-height ecb-compile-window)
+                           0)))
+    (if (null ecb-win-list)
+        (cons (frame-width ecb-frame)
+              (- (frame-height ecb-frame) comp-win-height))
+      (case layout-type
+        (top
+         (cons (frame-width ecb-frame)
+               (- (frame-height ecb-frame)
+                  (ecb-window-full-height (ecb-first ecb-win-list))
+                  comp-win-height)))
+        (left-right
+         (cons (- (frame-width ecb-frame)
+                  (ecb-window-full-width (ecb-first ecb-win-list))
+                  (ecb-window-full-width (ecb-last ecb-win-list)))
+               (- (frame-height ecb-frame)
+                  comp-win-height)))
+        (otherwise
+         (cons (- (frame-width ecb-frame)
+                  (ecb-window-full-width (ecb-first ecb-win-list)))
+               (- (frame-height ecb-frame)
+                  comp-win-height)))))))
+
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Cause of a much better repair-mechanism
+;; (see `ecb-repair-only-ecb-window-layout') the following code and mechanism
+;; is not used - but who knows, maybe we can need it later.................
+
+;; Klaus Berndl <klaus.berndl@sdm.de>:
+;; - this var must be set with the `current-window-configuration' in
+;;   + `ecb-restore-window-sizes' (`ecb-store-window-sizes' and
+;;     `ecb-restore-default-window-sizes' uses the :set-function of
+;;     `ecb-layout-window-sizes' which in turn calles
+;;     `ecb-redraw-layout-full' - see below).
+;;   + What about the `enlarge-window', `shrink-window',
+;;     `mouse-drag-mode-line' and `mouse-drag-vertical-line' (rsp.
+;;     `drag-window-divider' for XEmacs) (new after advices)??
+;;   + `delete-window' (new after advice)
+;;   + `split-window' (new after advice)
+;;   + `ecb-redraw-layout-full' (should cover all siutuation like
+;;     hidden-ecb-windows, visible-ecb-windows, maximized-ecb-windows etc...
+;;   + `ecb-toggle-compile-window-height' when the window has to be enlarged.
+;;   Whenever a compile-window is visible and has its specified height
+;;   (`ecb-compile-window-height-lines') then the current window-config has to
+;;   be stored into this variable. Otherwise this variable must be set to nil!
+;; - This stored config is used by `ecb-toggle-compile-window-height' to
+;;   shrink back a compile-window to its specified height - so eventually
+;;   be the compile-window-enlargement destroyed or resized ecb-windows will
+;;   be redrawn - we can not shrink the compile-window by a full redraw with
+;;   ecb-redraw-layout-full because this would damage some
+;;   save-selected-window calls with `ecb-toggle-compile-window-height
+(defvar ecb-compile-window-specified-height-config nil
+  "Contains the most recent and valid ecb-window-configuration \(a object
+returned by `ecb-current-window-configuration') or nil. If not nil then this
+config contains always a visible compile-window of height
+`ecb-compile-window-height!")
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Not really necessary but a
+;; fallback-mechanism to disable in an easy way the new
+;; window-config-shrinking if there occur problems.
+(defvar ecb-use-window-config-for-compwin-shrink nil)
+
+(defun ecb-store-compile-window-specified-height-config ()
+  "Store the current ecb-window-configuration in
+`ecb-compile-window-specified-height-config' but do this only if a
+compile-window is visible and if this compile-window has height
+`ecb-compile-window-height-lines'! Otherwise set this variable to nil."
+  (setq ecb-compile-window-specified-height-config
+        (if (and ecb-use-window-config-for-compwin-shrink
+                 (ecb-compile-window-live-p)
+                 (equal (ecb-window-full-height ecb-compile-window)
+                        ecb-compile-window-height-lines))
+            (ecb-current-window-configuration))))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: returns curently always nil because
+;; currently ecb-store-compile-window-specified-height-config is never called
+;; - see comment above!
+(defun ecb-reset-compile-window-specified-height-config ()
+  "Set the ecb-window-configuration of
+`ecb-compile-window-specified-height-config' if it is a still valid
+ecb-window-configuration. If this had success return t otherwise nil."
+  (let ((result
+         (and ecb-compile-window-specified-height-config
+              (not (ecb-window-configuration-invalidp ecb-compile-window-specified-height-config))
+              (ecb-set-window-configuration ecb-compile-window-specified-height-config))))
+    (ecb-layout-debug-error "ecb-reset-compile-window-specified-height-config: %s"
+                            result)
+    result))
+
+;; For backward-compatibility
+(defalias 'ecb-toggle-enlarged-compilation-window
+  'ecb-toggle-compile-window-height)
+
+(defun ecb-toggle-compile-window-height (&optional arg)
+  "Toggle whether the `ecb-compile-window' is enlarged or not.
+If ARG > 0 then shrink or enlarge the the compile-window according to the
+value of `ecb-enlarged-compilation-window-max-height'. But never shrink below
+the value of `ecb-compile-window-height'. If ARG <= 0 then shrink
+`ecb-compile-window' to `ecb-compile-window-height' and if ARG is nil then
+toggle the enlarge-state. Returns the new height of the compile-window or nil
+if no compile-window is visible."
+  (interactive "P")
+  (if (and ecb-minor-mode
+           (equal (selected-frame) ecb-frame)
+           (equal 'visible (ecb-compile-window-state)))
+      (let* ((height-before (ecb-window-full-height ecb-compile-window))
+             (should-shrink (if (null arg)
+                               (> height-before ecb-compile-window-height-lines)
+                             (<= (prefix-numeric-value arg) 0)))
+;;             (compile-window-selected-p (equal (selected-window)
+;;                                               ecb-compile-window))
+            (max-height nil)
+            (number-of-lines nil))
+        ;; we must use save-excursion because otherwise this command behaves
+        ;; wrong when called from program within a (save-excursion (set-buffer
+        ;; ...)) call.
+        (save-excursion
+          (save-selected-window
+            (select-window ecb-compile-window)
+            (setq number-of-lines (+ (if ecb-running-xemacs 2 1) ; XEmacs hor. scrollb.
+                                     (count-lines (point-min) (point-max))))
+            (ecb-layout-debug-error "ecb-toggle-compile-window-height: buffer: %s, lines: %d"
+                                    (current-buffer) number-of-lines)
+            (if should-shrink
+                (progn
+                  (ecb-layout-debug-error "ecb-toggle-compile-window-height: buffer: %s, lines: %d shrink down to compile-window-height"
+                                          (current-buffer) number-of-lines)
+                  (when (not (ecb-reset-compile-window-specified-height-config))
+                    (ecb-layout-debug-error "ecb-toggle-compile-window-height: call shrink-window!")
+                    (shrink-window (max 0 (- (ecb-window-full-height)
+                                             ecb-compile-window-height-lines)))
+                    ;; we restore the window-sizes (either the default or the
+                    ;; stored sizes. because this function is often called
+                    ;; during display-buffer (e.g. when completions, help-buffers,
+                    ;; choosing a completion are performed) and XEmacs often
+                    ;; destroyes the window-layout (e.g. the topmost
+                    ;; ecb-window disappears, when doing completion etc..) we
+                    ;; hav to ignore errors here.... it's not easy to find out
+                    ;; what is precisely happening here but with this error
+                    ;; ignoring all seems to work...
+                    (ignore-errors (ecb-restore-window-sizes))
+                    ))
+              (if (equal ecb-enlarged-compilation-window-max-height 'best)
+                  ;; With GNU Emacs we could use `ecb-fit-window-to-buffer' but
+                  ;; XEmacs doesn't have such a function; Therefore...
+                  ;; We fit the window to exactly this height:
+                  ;; The minimum MIN of
+                  ;; - half of frame-height
+                  ;; - number of lines +1 in current buffer
+                  ;; - temp-buffer-max-height or compilation-window-height (in
+                  ;;   lines) - dependent on the mode of current buffer.
+                  ;; Then we take the maximum of this MIN and the height of the
+                  ;; compile-window as defined in `ecb-compile-window-height'
+                  ;; (in lines).
+                  (progn
+                    (setq max-height
+                          (max (min (floor (/ (1- (frame-height)) 2))
+                                    (or (if (ecb-derived-mode-p 'compilation-mode)
+                                            compilation-window-height
+                                          (if ecb-running-xemacs
+                                              (ignore-errors ; if temp-buffer-... is nil!
+                                                (ecb-normalize-number
+                                                 temp-buffer-max-height
+                                                 (1- (frame-height))))
+                                            (if (functionp temp-buffer-max-height)
+                                                (funcall temp-buffer-max-height
+                                                         (current-buffer))
+                                              temp-buffer-max-height)))
+                                        1000) ; 1000 is surely > then half of the frame
+                                    number-of-lines)
+                               ecb-compile-window-height-lines))
+                    (ecb-layout-debug-error "ecb-toggle-compile-window-height: max-height: %s, curr-win-height: %s"
+                                            max-height (ecb-window-full-height))
+                    (enlarge-window (- max-height (ecb-window-full-height))))
+                (setq max-height
+                      (cond ((equal ecb-enlarged-compilation-window-max-height
+                                    'half)
+                             (floor (/ (1- (frame-height)) 2)))
+                            ((numberp ecb-enlarged-compilation-window-max-height)
+                             (ecb-normalize-number
+                              ecb-enlarged-compilation-window-max-height
+                              (1- (frame-height))))))
+                (enlarge-window (- (max max-height ecb-compile-window-height-lines)
+                                   (ecb-window-full-height))))
+              ;; now we set the window-start
+              (set-window-start ecb-compile-window
+                                (save-excursion
+                                  (goto-char (window-start))
+                                  (forward-line (* -1
+                                                   (- (ecb-window-full-height)
+                                                      height-before)))
+                                  (ecb-line-beginning-pos))
+                                t)
+;;               (when (and (not (equal major-mode 'compilation-mode))
+;;                          (not compile-window-selected-p))
+;;                 (set-window-start ecb-compile-window (point-min)))
+              )
+            ;; return the new compile-window height
+            (ecb-window-full-height))))
+    (if (interactive-p)
+        (ecb-info-message "No compile-window in current ECB-layout!"))
+    nil))
+
+;; This function takes into account the value of of
+;; `temp-buffer-shrink-to-fit' (XEmacs) and `temp-buffer-resize-mode' (GNU
+;; Emacs) so all the callers can profit: pop-to-buffer (==>
+;; switch-to-buffer-other-window too), display-buffer (if interactive) and
+;; switch-to-buffer.
+;;
+;; The case for calling help via `with-output-to-temp-buffer' is automatically
+;; taken into account because in this case XEmacs calls display-buffer with
+;; SHRINK-TO-FIT = nil (called by show-temp-buffer-in-current-frame which is
+;; value of temp-buffer-show-function) and GNU Emacs doesn't add
+;; resize-temp-buffer-window to the temp-buffer-show-hook.
+(defun ecb-set-compile-window-height ()
+  "Set the height of the compile-window according to
+`ecb-enlarged-compilation-window-max-height' and the value of
+`temp-buffer-shrink-to-fit' \(XEmacs) and `temp-buffer-resize-mode' \(GNU
+Emacs)."
+  (if (and (ecb-compile-window-live-p)
+           (member ecb-compile-window-temporally-enlarge
+                   '(after-display both))
+           (or (save-excursion
+                 (set-buffer (window-buffer ecb-compile-window))
+                 (equal major-mode 'compilation-mode))
+               (if ecb-running-xemacs
+                   temp-buffer-shrink-to-fit
+                 temp-buffer-resize-mode)))
+      (progn
+        (ecb-layout-debug-error "ecb-set-compile-window-height: enlarge/fit")
+        (ecb-toggle-compile-window-height 1))
+    (ecb-layout-debug-error "ecb-set-compile-window-height: shrink")
+    (ecb-toggle-compile-window-height -1)))
+
+
+(defun ecb-compile-window-state ()
+  "Returns the state of the compile-window:
+- 'no: No persistent compile-window, i.e. `ecb-compile-window-height' is nil.
+- 'visible: The compile-window is visible.
+- 'hidden: A persistent compile-window is set but it is currently hidden."
+  (if (null ecb-compile-window-height)
+      'no
+    (if (ecb-compile-window-live-p)
+        'visible
+      'hidden)))
+
+(defun ecb-toggle-compile-window (&optional arg)
+  "Toggle the visibility of the compile-window of ECB.
+With prefix argument ARG, make visible if positive, otherwise invisible. The
+height of the compile-window is always the current value of
+`ecb-compile-window-height'! If called and `ecb-compile-window-height' is nil
+then ECB asks for the height of the compile-window, sets this height as new
+value of `ecb-compile-window-height' and displays the compile-window \(so if
+you have called this command by mistake and you do not want a compile-window
+you have to quit with `C-g')."
+  (interactive "P")
+  (unless (or (not ecb-minor-mode)
+              (not (equal (selected-frame) ecb-frame)))
+    (let ((new-state (if (null arg)
+                         (not (ecb-compile-window-live-p))
+                       (>= (prefix-numeric-value arg) 0)))
+          (ecb-buf (if (member (current-buffer)
+                                (ecb-get-current-visible-ecb-buffers))
+                       (current-buffer)))
+          (new-win nil))
+      (if new-state
+          (let ((height (or ecb-compile-window-height
+                            (and (interactive-p)
+                                 (or (ecb-option-get-value 'ecb-compile-window-height
+                                                           'saved-value)
+                                     (ecb-read-number "Insert height of the compile-window: " 6))))))
+            (when height
+              (customize-set-variable 'ecb-compile-window-height height)
+              ;; ecb-redraw-layout-full only preserves point and selected window
+              ;; if called from an edit- or compile-window. If called from an
+              ;; ECB-window we have to restore it here.
+              (when ecb-buf
+                (setq new-win (get-buffer-window ecb-buf))
+                (if (and new-win (window-live-p new-win)
+                         (equal (window-frame new-win) ecb-frame))
+                    (select-window new-win)))))
+        (when (ecb-compile-window-live-p)
+          (let ((point-location (ecb-where-is-point)))
+            (ecb-with-original-basic-functions
+             (ecb-with-original-permanent-layout-functions
+              (delete-window ecb-compile-window)))
+            (ecb-restore-window-sizes)
+            ;; If point was in the compile-window we move it back to the first
+            ;; edit-window
+            (if (equal (car point-location) 'compile)
+                (ecb-select-edit-window))))))))
+
+
+(silentcomp-provide 'ecb-layout)
+
+;;; ecb-layout.el ends here
+
+;; LocalWords:  ecb Jesper Nordenberg Berndl java splitted Elisp ChangeLog CVS
+;; LocalWords:  berndl Exp eval silentcomp util speedbar defvar defun cl defs
diff --git a/site/ecb-2.40/ecb-makedef.mk b/site/ecb-2.40/ecb-makedef.mk
new file mode 100644
index 0000000..5ebd1fd
--- /dev/null
+++ b/site/ecb-2.40/ecb-makedef.mk
@@ -0,0 +1,63 @@
+# This file defines some settings used for the ECB-Makefiles
+
+# Copyright (C) 2000 - 2005 Klaus Berndl,
+#                           Free Software Foundation, Inc.
+
+# Author: Klaus Berndl <klaus.berndl@sdm.de>
+# Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+# Keywords: browser, code, programming, tools
+# Created: 2004
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+
+# You should have received a copy of the GNU General Public License along with
+# GNU Emacs; see the file COPYING.  If not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# $Id: ecb-makedef.mk,v 1.9 2009/05/15 15:19:53 berndl Exp $
+
+RM=rm -f
+CP=cp
+MV=mv -f
+MKDIR=mkdir -p
+
+EBATCH=$(EMACS) -batch -no-site-file
+
+ecb_LISP_EL=tree-buffer.el ecb-util.el ecb-mode-line.el ecb-help.el \
+            ecb-layout.el ecb-layout-defs.el ecb-navigate.el ecb.el \
+            ecb-eshell.el ecb-cycle.el ecb-face.el ecb-compilation.el \
+            ecb-upgrade.el ecb-create-layout.el silentcomp.el \
+            ecb-speedbar.el ecb-examples.el ecb-tod.el ecb-autogen.el \
+	    ecb-jde.el ecb-file-browser.el ecb-method-browser.el \
+	    ecb-winman-support.el ecb-cedet-wrapper.el \
+	    ecb-compatibility.el ecb-common-browser.el ecb-analyse.el \
+	    ecb-symboldef.el ecb-advice-test.el
+
+ecb_LISP_ELC=$(ecb_LISP_EL:.el=.elc)
+
+ecb_AUTOLOADS=ecb-autoloads.el
+
+ecb_ETC=NEWS README RELEASE_NOTES ecb-makedef.mk Makefile make.bat
+
+ecb_TEXI=ecb.texi
+
+ecb_INFO=$(ecb_TEXI:.texi=.info)
+ecb_HTML=$(ecb_TEXI:.texi=.html)
+ecb_HTML_DIR=html-help
+ecb_INFO_DIR=info-help
+
+ecb_DVI=$(ecb_TEXI:.texi=.dvi)
+ecb_PS=$(ecb_TEXI:.texi=.ps)
+ecb_PDF=$(ecb_TEXI:.texi=.pdf)
+
+ecb_IMAGE_DIR=ecb-images
+
+ecb_DISTRIB_FILES=$(ecb_LISP_EL) $(ecb_AUTOLOADS) $(ecb_TEXI) $(ecb_ETC)
+
diff --git a/site/ecb-2.40/ecb-method-browser.el b/site/ecb-2.40/ecb-method-browser.el
new file mode 100644
index 0000000..7e5ede0
--- /dev/null
+++ b/site/ecb-2.40/ecb-method-browser.el
@@ -0,0 +1,4696 @@
+;;; ecb-method-browser.el --- the method-browser of Emacs
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-method-browser.el,v 1.94 2009/05/08 14:05:55 berndl Exp $
+
+;;; Commentary:
+
+;; This file contains the code for the method-browser of ECB
+
+
+(require 'tree-buffer)
+(require 'ecb-util)
+(require 'ecb-layout)
+(require 'ecb-mode-line)
+(require 'ecb-navigate)
+(require 'ecb-face)
+(require 'ecb-speedbar)
+(require 'ecb-common-browser)
+
+(require 'ecb-cedet-wrapper)
+;; This loads the semantic-setups for the major-modes.
+(require 'semantic-load)
+
+;; various loads
+(require 'assoc)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(silentcomp-defun hs-minor-mode)
+(silentcomp-defun hs-show-block)
+(silentcomp-defun hs-hide-block)
+(silentcomp-defvar hs-minor-mode)
+(silentcomp-defvar hs-block-start-regexp)
+(silentcomp-defvar imenu--index-alist)
+
+(silentcomp-defvar semantic-idle-scheduler-mode)
+
+(silentcomp-defun ecb-get-tags-for-non-semantic-files)
+(silentcomp-defun ecb-create-non-semantic-tree)
+
+(defvar ecb-selected-tag nil
+  "The currently selected Semantic tag.")
+(make-variable-buffer-local 'ecb-selected-tag)
+
+(defvar ecb-methods-root-node nil
+  "Path to currently selected source.")
+
+(defconst ecb-methods-nodetype-tag 0)
+(defconst ecb-methods-nodetype-bucket 1)
+(defconst ecb-methods-nodetype-externtag 2)
+
+(defun ecb-method-browser-initialize-caches ()
+  "Initialize the caches of the method-browser of ECB."
+  (ecb-clear-tag-tree-cache))
+
+(defun ecb-method-browser-initialize (&optional no-caches)
+  "Initialize the method-browser of ECB. If optional arg NO-CACHES is not nil
+then the caches used by the method-browser will not be initialized."
+  (setq ecb-selected-tag nil)
+  (setq ecb-methods-root-node nil)
+  (setq ecb-methods-user-filter-alist nil)
+  (setq ecb-current-post-processed-tag-table nil)
+  (unless no-caches
+    (ecb-method-browser-initialize-caches)))
+
+;;====================================================
+;; Customization
+;;====================================================
+
+(defgroup ecb-methods nil
+  "Settings for the methods-buffer in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+
+(defgroup ecb-non-semantic nil
+  "Settings for parsing and displaying non-semantic files."
+  :group 'ecb
+  :prefix "ecb-")
+
+
+(defcustom ecb-methods-buffer-name " *ECB Methods*"
+  "*Name of the ECB methods buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB Methods*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-methods-buffer by this name, e.g. by a call of `set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-methods
+  :type 'string)
+
+
+(defcustom ecb-auto-expand-tag-tree 'expand-spec
+  "*Expand the methods-tag-tree automatically if node invisible.
+This option has only an effect if option `ecb-highlight-tag-with-point' is
+switched on too. There are three possible choices:
+- nil: No auto. expanding of the method buffer.
+- expand-spec: Auto expand the method-buffer nodes if the node belonging to
+  current tag under point is invisible because its parent-node is collapsed.
+  But expanding is only done if the type of the tag under point in the
+  edit-buffer is contained in `ecb-methods-nodes-expand-spec'.
+- all: Like expand-spec but expands all tags regardless of the setting in
+  `ecb-methods-nodes-expand-spec'.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(radio (const :tag "No auto. expand" :value nil)
+                (const :tag "Expand as specified" :value expand-spec)
+                (const :tag "Expand all" :value all)))
+
+
+(defcustom ecb-auto-expand-tag-tree-collapse-other nil
+  "*Auto. expanding the tag-tree collapses all not related nodes.
+There are several choices:
+- Only if on tag: This means collapsing all nodes which have no relevance for
+  the currently highlighted node will be collapsed, because they are not
+  necessary to make the highlighted node visible. But do this only if point
+  stays onto a tag in the selected edit-window.
+- Always: Same as before but collapse also when point doesn't stays on a tag
+  \(e.g. between two defuns in elisp) in the selected edit-window. This means
+  in such a situation a full collapsing of the methods-buffer.
+- Never: Do not automatically collapse the methods-buffer."
+  :group 'ecb-methods
+  :type '(radio (const :tag "Collapse only when point stays on a tag"
+                       :value only-if-on-tag)
+                (const :tag "Collapse always" :value always)
+                (const :tag "Never" :value nil)))
+
+(defcustom ecb-expand-methods-switch-off-auto-expand t
+  "*Switch off auto expanding in the ECB-method buffer.
+If on then auto expanding is switched off after explicit expanding or
+collapsing by `ecb-expand-methods-nodes'.
+
+This is done with `ecb-toggle-auto-expand-tag-tree' so after the switch off
+the auto expanding feature can again switched on quickly.
+
+But after explicitly expanding/collapsing the methods-buffer to a certain
+level the auto. expanding could undo this when the node belonging to current
+tag under point in the edit-window is invisible after
+`ecb-expand-methods-nodes' - then the auto. expand feature would make this
+node immediately visible and destroys the explicitly set expand-level."
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defcustom ecb-auto-update-methods-after-save t
+  "*Automatically updating the ECB method buffer after saving a source."
+  :group 'ecb-methods
+  :type 'boolean)
+
+
+(defcustom ecb-font-lock-tags t
+  "*Adds font-locking \(means highlighting) to the ECB-method buffer.
+This options takes only effect for semantic-sources \(ie. sources supported
+by semantic!) and if the font-lock-feature is loaded."
+  :group 'ecb-methods
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type 'boolean
+  :initialize 'custom-initialize-default)
+
+(defsubst ecb-font-lock-tags ()
+  "Returns not nil if `ecb-font-lock-tags' is not nil and font-lock loaded."
+  (and ecb-font-lock-tags
+       (featurep 'font-lock)))
+
+(defcustom ecb-tag-jump-sets-mark t
+  "*Set the mark after jumping to a tag from the ECB-method buffer.
+If set the user can easily jump back."
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defconst ecb-tag->text-functions
+  (mapcar (lambda (fkt-elem)
+            (cons (intern
+                   (concat "ecb-"
+                           (mapconcat 'identity
+                                      (cdr (split-string (symbol-name fkt-elem) "-"))
+                                      "-")))
+                  (intern
+                   (concat "ecb--" (symbol-name fkt-elem)))))
+          ecb--semantic-format-function-list)
+  "Alist containing one element for every member of 
+`ecb--semantic-format-function-list'")
+
+(defcustom ecb-tag-display-function '((default . ecb-format-tag-uml-prototype))
+  "*Function to use for displaying tags in the methods buffer.
+This functionality is set on major-mode base, i.e. for every major-mode a
+different function can be used. The value of this option is a list of
+cons-cells:
+- The car is either a major-mode symbol or the special symbol 'default which
+  means if no function for a certain major-mode is defined then the cdr of
+  the 'default cons-cell is used.
+- The cdr is the function used for displaying a tag in the related
+  major-mode.
+Every function is called with 3 arguments:
+1. The tag
+2. The parent-tag of tag \(can be nil)
+3. The value of the function `ecb-font-lock-tags'.
+Every function must return the display of the tag as string, colorized if
+the third argument is not nil.
+
+The following functions are predefined:
+- For each element E of `ecb--semantic-format-function-list' exists a
+  function with name \"ecb--<E>\". These functions are just aliase to
+  the builtin format-functions of semantic. See the docstring of these
+  functions to see what they do.
+  Example: `semantic-format-tag-name' is an
+  element of `ecb--semantic-format-function-list'. Therefore the
+  alias-function for this element is named `ecb--semantic-format-tag-name'.
+- For each element in `ecb--semantic-format-function-list' with name
+  \"semantic-XYZ\" a function with name \"ecb-XYC\" is predefined. The
+  differences between the semantic- and the ECB-version are:
+  + The ECB-version displays for type tags only the type-name and nothing
+    else \(exceptions: In c++-mode a template specifier is appended to the
+    type-name if a template instead a normal class. If the tag-name of a
+    type-tag is the empty-string \(tag has no name) then always the
+    type-specifier is displayed - see `ecb-type-tag-display'.).
+  + The ECB-version displays type-tags according to the setting in
+    `ecb-type-tag-display'. This is useful for better recognizing
+    different classes, structs etc. in the ECB-method window.
+  For all tags which are not types the display of the ECB-version is
+  identical to the semantic version. Example: For
+  `ecb--semantic-format-tag-name' \(the builtin semantic formatter) the
+  pendant is `ecb-format-tag-name'.
+
+This functionality also allows the user to display tags as UML. To enable
+this functionality set the function for a major-mode \(e.g. `jde-mode') to
+`ecb--semantic-format-tag-uml-concise-prototype',
+`ecb--semantic-format-tag-uml-prototype', or
+`ecb--semantic-format-tag-uml-abbreviate' the ECB-versions of these functions.
+
+If the value is nil, i.e. neither a function for a major-mode is defined nor
+the special 'default, then `ecb--semantic-format-tag-prototype' is used for
+displaying the tags.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :group 'ecb-most-important
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type (list 'repeat ':tag "Display functions per mode"
+              (list 'cons ':tag "Mode tag display"
+                    '(symbol :tag "Major mode")
+                    (nconc (list 'choice ':tag "Display function"
+                                 ':menu-tag '"Display function")
+                           (append
+                            (mapcar (lambda (f)
+                                      (list 'const ':tag
+                                            (symbol-name (car f)) (car f)))
+                                    ecb-tag->text-functions)
+                            (mapcar (lambda (f)
+                                      (list 'const ':tag
+                                            (symbol-name (cdr f)) (cdr f)))
+                                    ecb-tag->text-functions)
+                            (list '(function :tag "Function"))))))
+  :initialize 'custom-initialize-default)
+
+(defun ecb-get-tag-display-function ()
+  (let ((mode-display-fkt (cdr (assoc major-mode ecb-tag-display-function)))
+        (default-fkt (cdr (assoc 'default ecb-tag-display-function))))
+    (or (and (fboundp mode-display-fkt) mode-display-fkt)
+        (and (fboundp default-fkt) default-fkt)
+        'ecb--semantic-format-tag-prototype)))
+  
+
+(defcustom ecb-type-tag-display nil
+  "*How to display semantic type-tags in the methods buffer.
+Normally all tag displaying, colorizing and facing is done by semantic
+according to the value of `ecb--semantic-format-face-alist' and the semantic
+display-function \(e.g. one from `ecb--semantic-format-function-list'). But
+sometimes a finer distinction in displaying the different type specifiers of
+type-tags can be useful. For a description when this option is evaluated look
+at `ecb-tag-display-function'!
+
+This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. The value of this option is a list of
+cons-cells:
+- The car is either a major-mode symbol or the special symbol 'default which
+  means if no setting for a certain major-mode is defined then the cdr of
+  the 'default cons-cell is used.
+- The cdr is a list of 3-element-lists:
+  1. First entry is a semantic type specifier in string-form. Current
+     available type specifiers are for example \"class\", \"interface\",
+     \"struct\", \"typedef\", \"union\" and \"enum\". In addition to these
+     ones there is also a special ECB type specifier \"group\" which is
+     related to grouping tags \(see `ecb-post-process-semantic-taglist' and
+     `ecb-group-function-tags-with-parents'). Any arbitrary specifier can be
+     set here but if it is not \"group\" or not known by semantic it will be
+     useless.
+  2. Second entry is a flag which indicates if the type-specifier string from
+     \(1.) itself should be removed \(if there is any) from the display.
+  3. Third entry is the face which is used in the ECB-method window to display
+     type-tags with this specifier. ECB has some predefined faces for this
+     \(`ecb-type-tag-class-face', `ecb-type-tag-interface-face',
+     `ecb-type-tag-struct-face', `ecb-type-tag-typedef-face',
+     `ecb-type-tag-union-face', `ecb-type-tag-enum-face' and
+     `ecb-type-tag-group-face') but any arbitrary face can be set here. This
+     face is merged with the faces semantic already uses to display a tag,
+     i.e. the result is a display where all face-attributes of the ECB-face
+     take effect plus all face-attributes of the semantic-faces which are not
+     set in the ECB-face \(with XEmacs this merge doesn't work so here the
+     ECB-face replaces the semantic-faces; this may be fixed in future
+     versions).
+
+The default value is nil means there is no special ECB-displaying of
+type-tags in addition to the displaying and colorizing semantic does. But a
+value like the following could be a useful setting:
+
+  \(\(default
+     \(\"class\" t ecb-type-tag-class-face)
+     \(\"group\" nil ecb-type-tag-group-face))
+    \(c-mode
+     \(\"struct\" nil ecb-type-tag-struct-face)
+     \(\"typedef\" nil ecb-type-tag-typedef-face)))
+
+This means that in `c-mode' only \"struct\"s and \"typedef\"s are displayed
+with special faces \(the specifiers itself are not removed) and in all other
+modes \"class\"es and grouping-tags \(see `ecb-tag-display-function',
+`ecb-group-function-tags-with-parents') have special faces and the \"class\"
+specifier-string is removed from the display.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :group 'ecb-most-important
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (repeat :tag "Display of type specifiers"
+                               (list (choice :tag "Specifier list"
+                                             :menu-tag "Specifier list"
+                                             (const :tag "class"
+                                                    :value "class")
+                                             (const :tag "interface"
+                                                    :value "interface")
+                                             (const :tag "struct"
+                                                    :value "struct")
+                                             (const :tag "typedef"
+                                                    :value "typedef")
+                                             (const :tag "union"
+                                                    :value "union")
+                                             (const :tag "enum"
+                                                    :value "enum")
+                                             (const :tag "group"
+                                                    :value "group")
+                                             (string :tag "Any specifier"))
+                                     (boolean :tag "Remove the type-specifier" t)
+                                     (face :tag "Any face"
+                                           :value ecb-type-tag-class-face)))))
+  :initialize 'custom-initialize-default)
+
+(defun ecb-get-face-for-type-tag (type-specifier)
+  "Return the face set in `ecb-type-tag-display' for current major-mode and
+TYPE-SPECIFIER or nil."
+  (let ((mode-display (cdr (assoc major-mode ecb-type-tag-display)))
+        (default-display (cdr (assoc 'default ecb-type-tag-display))))
+    (or (nth 2 (assoc type-specifier mode-display))
+        (and (null mode-display)
+             (nth 2 (assoc type-specifier default-display))))))
+
+
+(defun ecb-get-remove-specifier-flag-for-type-tag (type-specifier)
+  "Return the remove-specifier-flag set in `ecb-type-tag-display' for
+current major-mode and TYPE-SPECIFIER or nil."
+  (let ((mode-display (cdr (assoc major-mode ecb-type-tag-display)))
+        (default-display (cdr (assoc 'default ecb-type-tag-display))))
+    (or (nth 1 (assoc type-specifier mode-display))
+        (and (null mode-display)
+             (nth 1 (assoc type-specifier default-display))))))
+
+(defcustom ecb-type-tag-expansion
+  '((default . ("class" "interface" "group" "namespace"))
+    (c-mode .  ("struct")))
+  "*Default expansion of semantic type-tags.
+Semantic groups type-tags into different type-specifiers. Current available
+type specifiers are for example \"class\", \"interface\", \"struct\",
+\"typedef\", \"union\" and \"enum\". In addition to these ones there is also a
+special ECB type specifier \"group\" which is related to grouping tags \(see
+`ecb-post-process-semantic-taglist').
+
+This option defines which type-specifiers should be expanded at
+file-open-time. Any arbitrary specifier can be set here but if it is not
+\"group\" or not known by semantic it will be useless.
+
+This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. The value of this option is a list of
+cons-cells:
+- The car is either a major-mode symbol or the special symbol 'default which
+  means if no setting for a certain major-mode is defined then the cdr of
+  the 'default cons-cell is used.
+- The cdr is either a list of type-specifiers which should be expanded at
+  file-open-time or the symbol 'all-specifiers \(then a type-tag is always
+  expanded regardless of its type-specifier).
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :group 'ecb-most-important
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (radio (const :tag "Expand all type-specifiers"
+                                     :value all-specifiers)
+                              (repeat :tag "Expand type specifiers"
+                                      (choice :tag "Specifier"
+                                              :menu-tag "Specifier"
+                                              (const :tag "class"
+                                                     :value "class")
+                                              (const :tag "interface"
+                                                     :value "interface")
+                                              (const :tag "struct"
+                                                     :value "struct")
+                                              (const :tag "typedef"
+                                                     :value "typedef")
+                                              (const :tag "union"
+                                                     :value "union")
+                                              (const :tag "enum"
+                                                     :value "enum")
+                                              (const :tag "group"
+                                                     :value "group")
+                                              (string :tag "Any specifier"))))))
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :initialize 'custom-initialize-default)
+  
+(defun ecb-type-tag-expansion (type-specifier)
+  "Return the default expansion-state of TYPE-SPECIFIER for current major-mode
+as specified in `ecb-type-tag-expansion'"
+  (let ((mode-expansion (cdr (assoc major-mode ecb-type-tag-expansion)))
+        (default-expansion (cdr (assoc 'default ecb-type-tag-expansion))))
+    (or (equal mode-expansion 'all-specifiers)
+        (member type-specifier mode-expansion)
+        (and (null mode-expansion)
+             (or (equal default-expansion 'all-specifiers)
+                 (member type-specifier default-expansion))))))
+
+(defun ecb-get-type-specifier (tag)
+  (if (ecb--semantic-tag-faux-p tag)
+      "group"
+    (ecb--semantic-tag-type tag)))
+  
+
+(dolist (elem ecb-tag->text-functions)
+  (fset (car elem)
+        `(lambda (tag &optional parent-tag colorize)
+           (if (eq 'type (ecb--semantic-tag-class tag))
+               (let* (;; we must here distinguish between UML- and
+                      ;; not-UML-semantic functions because for UML we must
+                      ;; preserve some semantic facing added by semantic (e.g.
+                      ;; italic for abstract classes)!
+                      (text (funcall (if (save-match-data
+                                           (string-match "-uml-" (symbol-name (quote ,(car elem)))))
+                                         'ecb--semantic-format-tag-uml-abbreviate
+                                       'ecb--semantic-format-tag-name)
+                                     tag parent-tag colorize))
+                      (type-specifier (ecb-get-type-specifier tag))
+                      (face (ecb-get-face-for-type-tag type-specifier))
+                      (remove-flag (ecb-get-remove-specifier-flag-for-type-tag
+                                    type-specifier)))
+                 (save-match-data
+                   ;; the following is done to replace the "struct" from
+                   ;; grouping tags (see
+                   ;; ecb-group-function-tags-with-parents) with "group".
+                   ;; This code can be removed (or changed) if semantic allows
+                   ;; correct protection display for function-tags with
+                   ;; parent-tag.
+                   (when (ecb--semantic-tag-faux-p tag)
+                     (save-match-data 
+                       (if (string-match (concat "^\\(.+"
+                                                 (ecb--semantic-uml-colon-string)
+                                                 "\\)\\("
+                                                 (if (ecb--semantic-tag-faux-p tag)
+                                                     (ecb--semantic-orphaned-member-metaparent-type)
+                                                   "struct")
+                                                 "\\)") text)
+                           (let ((type-spec-text "group"))
+                             (put-text-property 0 (length type-spec-text)
+                                                'face
+                                                (get-text-property
+                                                 0 'face
+                                                 (match-string 2 text))
+                                                type-spec-text)
+                             (setq text (concat (match-string 1 text)
+                                                type-spec-text))))))
+                   ;; Now we must maybe add a template-spec in c++-mode and
+                   ;; maybe remove the type-specifier string.
+                   (let (col-type-name col-type-spec template-text)
+                     (save-match-data 
+                       (if (string-match (concat "^\\(.+\\)\\("
+                                                 (ecb--semantic-uml-colon-string)
+                                                 type-specifier "\\)")
+                                         text)
+                           (setq col-type-name (match-string 1 text)
+                                 col-type-spec (if (not remove-flag)
+                                                   (match-string 2 text)))
+                         ;; necessary for anonymous types like unnamed enums etc...
+                         (setq col-type-spec (if (= (length text) 0)
+                                                 type-specifier
+                                               nil))
+                         (setq col-type-name text)))
+                     (when (and (equal major-mode 'c++-mode)
+                                (fboundp 'semantic-c-template-string))
+                       (setq template-text (semantic-c-template-string
+                                            tag parent-tag colorize))
+                       ;; Removing {...} from within the template-text.
+                       ;; Normally the semantic-formatters should not add this
+                       ;; ugly stuff.
+                       (save-match-data 
+                         (if (string-match "^\\(.+\\){.*}\\(.+\\)$" template-text)
+                             (setq template-text
+                                   (concat (match-string 1 template-text)
+                                           (match-string 2 template-text))))^)
+                       (put-text-property 0 (length template-text)
+                                          'face
+                                          (get-text-property
+                                           (1- (length col-type-name)) 'face
+                                           col-type-name)
+                                          template-text))
+                     (setq text (concat col-type-name template-text
+                                        col-type-spec))))
+                 ;; now we add some own colorizing if necessary
+                 (if face
+                     (ecb-merge-face-into-text text face))
+                 text)
+             (funcall (quote ,(cdr elem)) tag parent-tag colorize)))))
+
+(defcustom ecb-find-external-tag-functions
+  (list (cons 'default
+              (list (if (fboundp 'semantic-calculate-scope)
+                        'ecb-search-tag-by-semantic-analyzer
+                      'ecb-search-tag-by-semanticdb)))
+        (cons 'jde-mode (list 'ecb-jde-show-class-source)))
+  "*Functions used for searching external tags clicked in the methods buffer.
+The methods buffer displays for oo-languages the parents of a
+type under a special bucket \"Parents\". Languages like C++, CLOS
+and Eieio allow to define the implementation of a method outside
+of the class definition and even in another file. In the
+methods-buffer of ECB such externaly defined methods are
+collected and displayed under a 'virtual' faux type-tag named as
+the class-qualifier of the methods. This faux-tag is virtual
+because it does not extist in the parsed buffer.
+
+If a user clicks either onto such a faux-type-tag or onto a
+parent-tag then ECB tries to find the definition of the
+underlying type on a name-basis, displaying the containing file
+as buffer in the current edit-window and jumping to the start of
+the type-definition in this buffer.
+
+Finding such external types can be very complex and there are
+several roads to success. ECB uses per default methods based on
+the semantic-analyzer. But this option allows to define own
+find-functions and tell ECB to uses them.
+
+This functionality is set on a `major-mode' base, i.e. for every
+`major-mode' a different setting can be used. The value of this
+option is a list of cons-cells:
+- The car is either a `major-mode' symbol or the special symbol 'default.
+- The cdr is a list of find-functions or nil.
+
+ECB first performs all find-functions defined for current
+`major-mode' \(if any) anf then all find-functions defined for
+the special symbol 'default \(if any).
+
+ECB offers some predefined senseful finding-functions. Currently there are:
+- `ecb-search-tag-by-semantic-analyzer' (most powerful)
+- `ecb-search-tag-by-semanticdb'
+- `ecb-jde-show-class-source' (for major-mode `jde-mode' when coding in java)
+  This function does not only the searching but displays the founded tag.
+See the documentation of these function for details how they work.
+
+But you can add any arbitrary function if the following conditions are
+fulfilled:
+- The function gets a semantic tag representing the external type which should
+  be found. This is a positionless-tag \(otherwise it would not be hard to go
+  to it) and it's either a faux-tag \(for which `ecb--semantic-faux-tag-p' is
+  not nil; the function can use this check if necessary) or a simple tag
+  containing only a name an a tag-class. The tag-class for both is 'type.
+- The return value of the function must be one of:
+  + nil: No tag is found
+  + t: A tag has been found and also be displayed in the edit-window \(this
+    prevents ECB from running further function of this option because the
+    searched tag is already displayed. So a function should only return t if
+    all is fine and no further actions are needed.
+  + A positioned semantic tag \(for which `ecb--semantic-tag-with-position-p'
+    returns not nil) which represents the found external type-tag.
+  It's strongly recommended for the function not to display the found
+  location for itself but to return a positioned semantic tag! But sometimes
+  the displaying is integrated in a third-party find-function like
+  `jde-show-class-source' which is used by `ecb-jde-show-class-source'. In
+  these cases the function has to return t if the searched tag has been
+  successfully displayed.
+
+Precondition for a find-function:
+Current buffer is the buffer the clicked faux- or parent tag belongs to
+Current point depends on the clicked tag:
+- In case of a faux-tag it's the start of the first child of the
+  faux-tag. There must be at least one adopted child-tag because
+  otherwise we would not have the faux-tag
+- In case of an external parent-tag its the the start of the
+  external tag itself."
+  :group 'ecb-methods
+  :type '(repeat (cons (symbol :tag "Major-mode or default")
+                       (repeat (choice :tag "Find external tag function" :menu-tag "Function list"
+                                       (const :tag "ecb-search-tag-by-semantic-analyzer"
+                                              :value ecb-search-tag-by-semantic-analyzer)
+                                       (const :tag "ecb-search-tag-by-semanticdb"
+                                              :value ecb-search-tag-by-semanticdb)
+                                       (const :tag "ecb-jde-show-class-source"
+                                              :value ecb-jde-show-class-source)
+                                       (function :tag "Function"))))))
+
+(defcustom ecb-display-image-icons-for-semantic-tags t
+  "*Display nice and pretty icons for semantic-tags in the Methods-buffer.
+A non nil value takes only effect if Emacs can display images and if
+`ecb-tree-buffer-style' is set to 'image."
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defsubst ecb-use-images-for-semantic-tags ()
+  (and ecb-display-image-icons-for-semantic-tags
+       (ecb-images-can-be-used)
+       (equal ecb-tree-buffer-style 'image)))
+
+(defcustom ecb-post-process-semantic-taglist
+  '((c++-mode . (ecb-group-function-tags-with-parents))
+    (emacs-lisp-mode . (ecb-group-function-tags-with-parents))
+    (c-mode . (ecb-filter-c-prototype-tags)))
+  "*Define mode-dependent post-processing for the semantic-taglist.
+This is an alist where the car is a major-mode symbol and the cdr is a list of
+function-symbols of functions which should be used for post-processing the
+taglist returned by semantic. for a buffer in this
+major-mode. The first function in the list is called with current semantic
+taglist of current buffer and must return a valid taglist again. All other
+functions are called with the result-taglist of its preceding function and
+have to return a new taglist again.
+
+For oo-programming languages where the methods of a class can be defined
+outside the class-definition \(e.g. C++, Eieio) the function
+`ecb-group-function-tags-with-parents' can be used to get a much better
+method-display in the methods-window of ECB, because all method
+implementations of a class are grouped together.
+
+Another senseful usage is to filter out certain tags, e.g. prototype tags in
+`c-mode'. For this you can set `ecb-filter-c-prototype-tags'.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (repeat (function :tag "Post-process function")))))
+
+(defcustom ecb-default-tag-filter nil
+  "*Default tag-filters for certain files.
+This option allow to define default tag-filters for certain files which are
+applied automatically after loading such a file into a buffer. The possible
+filters are the same as offered by the command `ecb-methods-filter' and they
+are applied in the same manner - the only difference is they are applied
+automatically. Please be aware that symbol-filters \(e.g. protection-symbols
+like public or private) must not be inserted with quotes whereas a
+filter-regexp has to be inserted with surrounding double-quotes! In addition
+backslashes in a regexp have to be doubled!
+
+For each file-spec \(a major-mode plus a file-regexp which both specify a
+file for which filters should be applied) there can be as much filters as
+needed - they are layered like with `ecb-methods-filter' too.
+
+Tag-classes which are completely hidden or excluded by the option
+`ecb-show-tags' will never being displayed in the Methods-buffer regardless of
+the filters of this option!"
+  :group 'ecb-methods
+  :type '(repeat (cons :tag "Default tag filter"
+                       (cons :tag "Filespec"
+                             (symbol :tag "Major-mode")
+                             (regexp :tag "Filename-regexp"))
+                       (repeat :tag "Default filters"
+                               (list :tag "Filterspec"
+                                     (choice :tag "Filter-type"
+                                             :menu-tag "Filtertype"
+                                             (const :tag "Regexp" :value regexp)
+                                             (const :tag "Protection" :value protection)
+                                             (const :tag "Tag-class" :value tag-class)
+                                             (const :tag "Funtion" :value function))
+                                     (sexp :tag "Filter-value")
+                                     (boolean :tag "inverse"))))))
+
+  
+(defcustom ecb-show-only-positioned-tags nil
+  "*Show only nodes in the method-buffer which are \"jump-able\".
+If not nil then ECB displays in the method-buffer only nodes which are
+\"jump-able\", i.e. after selecting it by clicking or with RET then ECB jumps
+to the corresponding location in the edit-window.
+Example: With CLOS or Eieio source-code there can exist some position-less
+nodes like variable-attributes in a `defclass' form which are only displayed
+if this option is nil. Displaying such nodes can be senseful even if they can
+not be jumped.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defcustom ecb-force-reparse-when-semantic-idle-scheduler-off nil
+  "*Force a reparse of the semantic-source if the idle-scheduler is off.
+Generally ECB calls semantic to get the list of tags for current source-file
+of current edit-window. Per default ECB does never automatically force a
+reparse of the source-file - this is only done on demand by calling
+`ecb-rebuild-methods-buffer'. So per default the idle-scheduler of semantic is
+responsible for reparsing the source-file and when this is necessary \(see
+`semantic-idle-scheduler-mode' for further details). This is the most
+user-resonsible and therefore the recommended approach. So it's strongly
+recommended to enable `semantic-idle-scheduler-mode' because then reparsing is
+always done during idle-time of Emacs and is also interruptable.
+
+But if this idle-scheduler is switched off then ECB offers two possibilities
+\(with this option):
+- Not forcing itself a reparse when tags are needed by ECB: then a user
+  declines knowingly Emacs/semantic-driven parsing of code when he/she
+  switches off the idle-mode of semantic. This is the default behavior of ECB
+  and the default value of this option. But this has also the consequence that
+  the methods-buffer is only filed on demand via `ecb-rebuild-methods-buffer'
+  \(bound to \[C-c . r])!
+- Forcing a reparse when tags are needed: Then ECB forces semantic to parse
+  the source-file when ECB needs tags to display. For this behavior this
+  option has to be set to not nil.
+
+Note 1: This option takes only effect when `semantic-idle-scheduler-mode' is
+not enabled!
+
+Note 2: The term \"forcing a reparse by semantic\" is a simplification:
+It uses the function `semantic-fetch-tags' which can decide that the cached
+tags are up-to-date so no real reparsing is necessary - but it can also run a
+full reparse and this reparse is not being done when Emacs is idle but
+immediatelly and not interruptable \(as with the idle-scheduler of semantic)!"
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defcustom ecb-show-tags
+  '((default . ((include collapsed nil)
+                (parent collapsed nil)
+                (type flattened nil)
+                (variable collapsed access)
+                (function flattened access)
+                (label hidden nil)
+                (t collapsed nil)))
+    (c++-mode . ((include collapsed nil)
+                 (parent collapsed nil)
+                 (type flattened nil)
+                 (variable collapsed access)
+                 (function flattened access) ;; for Methods
+                 (function collapsed access) ;; for Method-prototypes
+                 (label hidden nil)
+                 (t collapsed nil)))
+    (c-mode . ((include collapsed nil)
+               (parent collapsed nil)
+               (type flattened nil)
+               (variable collapsed access)
+               (function flattened access) ;; for Functions
+               (function collapsed access) ;; for Function-prototypes
+               (label hidden nil)
+               (t collapsed nil)))
+    (bovine-grammar-mode . ((keyword collapsed name)
+                            (token collapsed name)
+                            (nonterminal flattened name)
+                            (rule flattened name)
+                            (t collapsed nil)))
+    (wisent-grammar-mode . ((keyword collapsed name)
+                            (token collapsed name)
+                            (nonterminal flattened name)
+                            (rule flattened name)
+                            (t collapsed nil)))
+    (texinfo-mode . ((section flattened nil)
+                     (def collapsed name)
+                     (t collapsed nil))))
+  "*How to show tags in the methods buffer first time after find-file.
+This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. The value of this option is a list of
+cons-cells:
+
+The car is either a major-mode symbol or the special symbol 'default which
+means if no setting for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used. This option should always contain a
+default-setting!
+
+The cdr is a list where each element represents a type of tags:
+
+\(<tag type> <display type> <sort method>)
+
+There can be more than 1 element for a certain <tag type>. This is for example
+useful for C++ and C because these languages distinct between a
+method-prototype \(rsp. function-prototype for C) and the method \(rsp.
+function for C) itself. The default value of these option contains two entries
+for <tag type> is 'function whereas the first one is responsible for the
+\"real\" methods \(rsp. functions) and the second one for the prototypes. So
+if the methods should be flattened and the prototypes collapsed the
+show-tags-list for C++ and C must contain two entries for <tag type>
+'function, the first one defined as 'flattened and the second one defined as
+'collapsed. See also `ecb-methods-separate-prototypes'.
+
+The tags in the methods buffer are displayed in the order as they appear in
+this list.
+
+Tag Type
+----------
+
+A Semantic tag type symbol \(for all possible type symbols see documentation
+of semantic):
+- include
+- type
+- variable
+- function
+- rule
+- section \(chapters and sections in `info-mode')
+- def \(definitions in `info-mode')
+
+or one of the following:
+
+- t:      All tag types not specified anywhere else in the list.
+- parent: The parents of a type.
+
+Display Type
+------------
+
+A symbol which describes how the tags of this type shall be shown:
+
+- expanded:  The tags are shown in an expanded node.
+- collapsed: The tags are shown in a collapsed node.
+- flattened: The tags are added to the parent node.
+- hidden:    The tags are not shown.
+
+Sort Method
+-----------
+
+A symbol describing how to sort the tags of this type:
+
+- name:   Sort by the tag name.
+- access: Sort by tag access (public, protected, private) and then by name.
+- nil:    Don't sort tags. They appear in the same order as in the source
+          buffer.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :group 'ecb-most-important
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (repeat (list (symbol :tag "Tag symbol")
+                                     (choice :tag "Display type" :value collapsed
+                                             (const :tag "Expanded" expanded)
+                                             (const :tag "Collapsed" collapsed)
+                                             (const :tag "Flattened" flattened)
+                                             (const :tag "Hidden" hidden))
+                                     (choice :tag "Sort by" :value nil
+                                             (const :tag "Name" name)
+                                             (const :tag "Access then name" access)
+                                             (const :tag "No sort" nil))))))
+  :initialize 'custom-initialize-default)
+
+(defun ecb-get-show-tags-list ()
+  "Return the show-tags-list of `ecb-show-tags' for current major-mode."
+  (let ((mode-show-tag-list (cdr (assoc major-mode ecb-show-tags)))
+        (default-show-tag-list (cdr (assoc 'default ecb-show-tags))))
+    (or mode-show-tag-list
+        (and (null mode-show-tag-list)
+             default-show-tag-list))))
+
+(defcustom ecb-methods-separate-prototypes t
+  "*Separate function-prototypes from the real functions.
+This is for example useful for C++ and C because these languages distinct
+between a method-prototype \(rsp. function-prototype for C) and the method
+\(rsp. function for C) itself. If this option is not nil then ECB separates
+the prototypes from the real function/methods. Then with `ecb-show-tags' the
+user can define different display-settings for each of them. If this option is
+nil then the prototypes and the real functions are filled in the same bucket
+and displayed plain and there is no sorting between prototypes and functions
+possible. If this option is switched on then it is senseful that
+`ecb-show-tags' contains for all modes which distinct between prototypes and
+real functions/methods two entries for the tag-type 'function - see the
+documentation of this option."
+  :group 'ecb-methods
+  :type 'boolean)
+
+(defcustom ecb-methods-filter-replace-existing 'never
+  "*How the methods-filter should be applied to existing filters.
+There are three different choices:
+- 'never: This is the default and means that calling `ecb-methods-filter'
+  always adds the new filter on top of already existing filters. So you can
+  combine several filter to one combined like this example: 'Display only all
+  public methods having the string \"test\" in its name.' With this setting
+  the filters can only be cleared by calling `ecb-methods-filter' and then
+  choosing \"nothing\".
+- 'always: This means that `ecb-methods-filter' always clears a previous
+  filter before applying the new one.
+- 'ask: ECB asks if the new filter should replace the existing ones."
+  :group 'ecb-methods
+  :type '(radio (const :tag "Do not replace" :value never)
+                (const :tag "Always replace" :value always)
+                (const :tag "Ask if to replace" :value ask)))
+
+(defcustom ecb-methods-nodes-expand-spec '(type variable function section
+                                                nonterminal keyword token)
+  "*Semantic tag-types expanded by `ecb-expand-methods-nodes'.
+The value of this option is either the symbol 'all \(all tags are expanded
+regardless of their type) or a list of symbols where each symbol is a valid
+semantic tag-type. For a description of semantic tag types see option
+`ecb-show-tags'.
+
+But this option also defines if bucket-nodes in the ECB-method-buffer \(e.g.
+\"\[Variables\]\") should be expanded. Therefore valid symbols for this list
+are also all cars of the variable `semantic-symbol->name-assoc-list'.
+
+If there is a bucket-name \(the node-name stripped of the settings in
+`ecb-bucket-node-display') which is not contained as cdr in
+`semantic-symbol->name-assoc-list' then the symbol with this bucket-name as
+name is also a valid symbol for this list. Example: In ECB there are buckets
+\"\[Parents\]\". The bucket-name is \"Parents\" and the valid symbol-name is
+then 'Parents.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(radio (const :tag "All node-types" :value all)
+                (repeat :tag "Node-type list"
+                        (symbol :tag "Node-type"))))
+
+
+(defcustom ecb-methods-nodes-collapse-spec 'all
+  "*Semantic tag-types collapsed by `ecb-expand-methods-nodes'.
+For valid values of this option see `ecb-methods-nodes-expand-spec'!
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(radio (const :tag "All node-types" :value all)
+                (repeat :tag "Node-type list"
+                        (symbol :tag "Node-type"))))
+
+(defcustom ecb-methods-show-node-info '(if-too-long . name+type)
+  "*When to display which node-info in the methods-buffer.
+Define which node info should displayed after moving the mouse over a node
+\(or after a shift click onto the node) in the methods-buffer.
+
+You can define \"when\" a node-info should be displayed:
+See `ecb-directories-show-node-info' for the possible choices.
+
+You can define what info should be displayed:
+- name: Only the full node name is displayed.
+- name+type: The full name + the type of the node \(function, class,
+  variable) is displayed.
+
+Do NOT set this option directly via setq but use always customize!"
+  :group 'ecb-methods
+  :type '(cons :tag "* Method-buffer"
+               (choice :tag "When"
+                       (const :tag "Always" :value always)
+                       (const :tag "If too long" :value if-too-long)
+                       (const :tag "After shift click" :value shift-click)
+                       (const :tag "Never" :value never))
+               (choice :tag "What"
+                       (const :tag "Node-name" :value name)
+                       (const :tag "Node-name + type" :value name+type))))
+
+
+(defcustom ecb-exclude-parents-regexps nil
+  "*Regexps which parent classes should not be shown in the methods buffer.
+If nil then all parents will be shown if `ecb-show-parents' is not nil.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :set (function (lambda (symbol value)
+		   (set symbol value)
+		   (ecb-clear-tag-tree-cache)))
+  :type '(repeat (regexp :tag "Parents-regexp to exclude"))
+  :initialize 'custom-initialize-default)
+
+(defsubst ecb-check-parent-for-exclude (parent-name)
+  (ecb-match-regexp-list parent-name ecb-exclude-parents-regexps))
+
+(defcustom ecb-highlight-tag-with-point 'highlight-scroll
+  "*How to highlight the method or variable under the cursor.
+- highlight-scroll: Always scroll the method buffer, so the current method of the
+  edit-window is highlighted in the method-window.
+- highlight: Only highlight the current method of the edit window in the
+  method window if the method is visible in the method-window.
+- nil: No highlighting is done.
+See also `ecb-highlight-tag-with-point-delay'.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(radio (const :tag "Highlight and scroll window"
+                       :value highlight-scroll)
+                (const :tag "Just highlight"
+                       :value highlight)
+                (const :tag "Do not highlight"
+                       :value nil)))
+
+
+(defcustom ecb-highlight-tag-with-point-delay 0.25
+  "*Time Emacs must be idle before current tag is highlighted.
+If nil then there is no delay, means current tag is highlighted immediately.
+A small value of about 0.25 seconds saves CPU resources and you get even
+though almost the same effect as if you set no delay. But such a delay
+prevents also \"jumping backward/forward\" during scrolling within
+java-classes if point goes out of method-definition into class-definition.
+Therefore the default value is a delay of 0.25 seconds.
+
+This options takes only effect for semantic-sources - means sources supported
+by semantic!"
+  :group 'ecb-methods
+  :type '(radio (const :tag "No highlighting delay"
+                       :value nil)
+                (number :tag "Idle time before highlighting"
+                        :value 0.25))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode) ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function value
+                                                               'ecb-tag-sync))))
+  :initialize 'custom-initialize-default)
+
+
+(defvar ecb-method-overlay (ecb-make-overlay 1 1)
+  "Internal overlay used for the first line of a method.")
+(ecb-overlay-put ecb-method-overlay 'face ecb-tag-header-face)
+
+
+(defcustom ecb-tag-visit-post-actions '((default . (ecb-tag-visit-smart-tag-start
+                                                    ecb-tag-visit-highlight-tag-header))
+                                        (java-mode . (ecb-tag-visit-goto-doc-start))
+                                        (jde-mode . (ecb-tag-visit-goto-doc-start)))
+  "*Actions to perform after visiting a tag from the Method-buffer.
+With this option actions can be added which will be performed after visiting
+the start of the tag in the source-buffer.
+
+This functionality is set on a `major-mode' base, i.e. for every `major-mode' a
+different setting can be used. The value of this option is a list of
+cons-cells:
+- The car is either a `major-mode' symbol or the special symbol 'default.
+- The cdr is a list of action-functions or nil.
+
+ECB first performs all actions defined for the special symbol 'default \(if
+any) and then all actions defined for current `major-mode' \(if any).
+
+ECB offers some predefined senseful action-functions. Currently there are:
+- `ecb-tag-visit-highlight-tag-header'
+- `ecb-tag-visit-smart-tag-start'
+- `ecb-tag-visit-recenter'
+- `ecb-tag-visit-recenter-top'
+- `ecb-tag-visit-goto-doc-start'
+- `ecb-tag-visit-narrow-tag'
+See the documentation of these function for details what they do.
+
+But you can add any arbitrary function if the following conditions are
+fulfilled:
+- The function gets the semantic tag as argument and
+- the function returns the \(new) point after finishing its job.
+- The function must not put the point outside the tag-boundaries of the
+  tag-argument."
+  :group 'ecb-methods
+  :type '(repeat (cons :value (nil . (ecb-tag-visit-recenter))
+                       (symbol :tag "Major-mode or default")
+                       (repeat (choice :tag "Post action" :menu-tag "Post action"
+                                       (const :tag "ecb-tag-visit-smart-tag-start"
+                                              :value ecb-tag-visit-smart-tag-start)
+                                       (const :tag "ecb-tag-visit-highlight-tag-header"
+                                              :value ecb-tag-visit-highlight-tag-header)
+                                       (const :tag "ecb-tag-visit-goto-doc-start"
+                                              :value ecb-tag-visit-goto-doc-start)
+                                       (const :tag "ecb-tag-visit-narrow-tag"
+                                              :value ecb-tag-visit-narrow-tag)
+                                       (const :tag "ecb-tag-visit-recenter-top"
+                                              :value ecb-tag-visit-recenter-top)
+                                       (const :tag "ecb-tag-visit-recenter"
+                                              :value ecb-tag-visit-recenter)
+                                       (function :tag "Function"))))))
+
+
+(defun ecb-tag-visit-function-member-p (fnc)
+  (or (member fnc (cdr (assoc 'default ecb-tag-visit-post-actions)))
+      (member fnc (cdr (assoc major-mode ecb-tag-visit-post-actions)))))
+
+(defcustom ecb-methods-menu-user-extension nil
+  "*Static user extensions for the popup-menu of the methods buffer.
+For further explanations see `ecb-directories-menu-user-extension'.
+
+The node-argument of a menu-function contains as data the semantic-tag of
+the method/variable/tag for which the popup-menu has been opened.
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of `ecb-methods-menu' but the whole menu can be
+re-arranged with `ecb-methods-menu-sorter'."
+  :group 'ecb-methods
+  :type (ecb-create-menu-user-ext-type 1 ecb-max-submenu-depth))
+
+
+(defcustom ecb-methods-menu-user-extension-function 'ignore
+  "*Dynamic user extensions for the popup-menu of the methods buffer.
+A function which has to return a list in the same format like the option
+`ecb-methods-menu-user-extension'. This function is called when the user opens
+the popup-menu for the methods buffer. For an example how such a function can
+be programmed see `ecb-methods-menu-editwin-entries'.
+
+If no dynamically evaluated menu-extensions should be added to the
+methods-buffer the function has to return nil. Therefore the default-value
+of this option is `ignore'.
+
+Per default the dynamic user-extensions are added in front of the static
+extensions of `ecb-methods-menu-user-extension' but the whole menu can be
+re-arranged with `ecb-methods-menu-sorter'."
+  :group 'ecb-methods
+  :type 'function)
+
+(defcustom ecb-methods-menu-sorter nil
+  "*Function which re-sorts the menu-entries of the directories buffer.
+If a function then this function is called to sort the menu-entries of the
+combined menu-entries of the user-menu-extensions of
+`ecb-methods-menu-user-extension' and the built-in-menu
+`ecb-methods-menu'. If nil then no special sorting will be done and the
+user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+`ecb-directories-menu-sorter'."
+  :group 'ecb-methods
+  :type '(choice :tag "Menu-sorter" :menu-tag "Menu-sorter"
+                 (const :tag "No special sorting" :value nil)
+                 (function :tag "Sort-function" :value identity)))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: We do ot implement an own mechanism but
+;; we use the semantic-idle-scheduler-* options...
+
+;; (defcustom ecb-disable-semantic-threshold-alist nil
+;;   "*Threshold for disabling semantic-parsing
+;; Define a threshold fpr buffer-size. Exceeding this threshold disables parsing
+;; current buffer by semantic.
+
+;; This functionality is set on a major-mode base, i.e. for every major-mode a
+;; different setting can be used. The value of this option is a list of
+;; cons-cells:
+;; - The car is either a major-mode symbol or the special symbol 'default which
+;;   means if no setting for a certain major-mode is defined then the cdr of
+;;   the 'default cons-cell is used.
+;; - The cdr is an integer which defines the threshold for the buffer-size for
+;;   this major-mode.
+
+;; Example:
+
+;;   \(\(default . 1000000)
+;;     \(c-mode . 200000))
+
+;; This example whould not parse c-mode buffers exceeding a buffer-size of
+;; 200000. And buffers of all other modes would be only parsed if smaller than
+;; 1000000.
+
+;; A setting of \(\(c-mode . 200000)) would only restrict c-mode buffers to a
+;; size of 200000 but would parse all other buffer regardless their size."
+;;   :group 'ecb-methods
+;;   :type '(repeat (cons (symbol :tag "Major-Mode")
+;;                        (integer :tag "Buffer-size"))))
+
+;; (defun ecb-get-max-buffer-size-for-parsing ()
+;;   "Threshold set in `ecb-disable-semantic-threshold-alist' for
+;; current major-mode"
+;;   (let ((mode-threshold (cdr (assoc major-mode ecb-disable-semantic-threshold-alist)))
+;;         (default-threshold (cdr (assoc 'default ecb-disable-semantic-threshold-alist))))
+;;     (or mode-threshold default-threshold)))
+
+;; (defun ecb-prevent-from-parsing-if-exceeding-threshold ()
+;;   "Prevents from parsing current buffer if exceeding the threshold
+;; defined in `ecb-disable-semantic-threshold-alist'."
+;;   (if (and (boundp 'ecb-minor-mode)
+;;            ecb-minor-mode
+;;            (ecb--semantic-active-p))
+;;       (let ((threshold (ecb-get-max-buffer-size-for-parsing)))
+;;         (not (and threshold (> (buffer-size) threshold))))
+;;     t))
+
+(defcustom ecb-methods-buffer-after-create-hook nil
+  "*Local hook running after the creation of the methods-buffer.
+Every function of this hook is called once without arguments direct after
+creating the methods-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of `local-set-key' to define new
+key-bindings only for the methods-buffer of ECB."
+  :group 'ecb-methods
+  :type 'hook)
+
+
+(defcustom ecb-process-non-semantic-files (if (locate-library "speedbar")
+                                              t)
+  "*Display contents of non-semantic-files in the ECB-methods-buffer.
+See also `ecb-non-semantic-parsing-function'."
+  :group 'ecb-general
+  :group 'ecb-non-semantic
+  :group 'ecb-most-important
+  :type 'boolean)
+
+
+(defcustom ecb-non-semantic-parsing-function nil
+  "*Define mode-dependent parsing functions for non-semantic files.
+This is an alist where the car is a major-mode symbol and the cdr is a
+function-symbol of a function which should be used for parsing a non-semantic
+buffer, i.h. a buffer for which no semantic grammar exists. Such a function
+gets one argument - the filename of current buffer - and has to generate and
+return a tag/tag list which is understandable by
+`speedbar-insert-generic-list'. speedbar has already included two functions
+`speedbar-fetch-dynamic-imenu' and `speedbar-fetch-dynamic-etags' which can be
+used for parsing buffers with imenu rsp. etags.
+
+This option takes only effect if `ecb-process-non-semantic-files' is not nil:
+Then ECB checks for non-semantic buffers if current `major-mode' is contained
+in this option and if yes, then the specified parsing function is called;
+if not then the cars of the elements of `speedbar-dynamic-tags-function-list'
+are called in that sequence they are listed in this variable. See option
+`speedbar-dynamic-tags-function-list' for further details.
+
+In most cases imenu-parsing is preferable over etags-parsing because imenu
+operates on Emacs-buffers and needs no external tool and therefore parsing
+works also if current contents of a buffer are not saved to disk. But maybe
+sometimes etags may return better parsing results.
+
+IMPORTANT: if imenu-parsing should be used then the option
+`speedbar-use-imenu-flag' must be set to not nil!"
+  :group 'ecb-methods
+  :group 'ecb-non-semantic
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (function :tag "Parsing function"))))
+
+
+(defcustom ecb-non-semantic-methods-initial-expand nil
+  "*Initially expand all tags for not by semantic supported sources.
+This option can be customized on a major-mode basis, i.e. if a `major-mode' is
+contained in this option then all tags for this modes will be initially
+expanded - otherwise not."
+  :group 'ecb-methods
+  :group 'ecb-non-semantic
+  :type '(repeat :tag "Expand this modes"
+                 (symbol :tag "major mode")))
+
+
+(defcustom ecb-auto-save-before-etags-methods-rebuild t
+  "*Automatic saving of current buffer before rebuilding its methods.
+This option is only relevant for sources which are supported and parsed by
+etags \(see `ecb-process-non-semantic-files'). Because etags is an external
+tool a source-buffer can only be reparsed if the buffer is saved to disk. So
+the command `ecb-rebuild-methods-buffer' checks for sources which are not
+supported by semantic or imenu if either this option is t or if the major-mode
+of the source-buffer is contained in this list: In both cases ECB saves the
+current source-buffer before it re-runs etags for reparsing the source.
+If nil or if the major-mode is not contained then no automatic saving will be
+done!
+
+For all source supported by semantic or by imenu this option takes no effect."
+  :group 'ecb-methods
+  :group 'ecb-non-semantic
+  :type '(radio (const :tag "For all etags modes" :value t)
+                (repeat :tag "For these modes" (symbol :tag "Major-mode"))))
+
+
+(defcustom ecb-non-semantic-exclude-modes '(sh-mode fundamental-mode text-mode)
+  "*Exclude modes from parsing with imenu or etags.
+Per default, ECB tries to parse all file-types not supported by semantic with
+imenu or etags or some other method \(for details see the option
+`ecb-non-semantic-parsing-function'). If a file-type can not be parsed by
+semantic, imenu or etags than this simply results in an empty method-buffer
+for this file. But nevertheless you will get a message \"Sorry, no support for
+a file of that extension\" which comes from the speedbar-library and can not
+switched off. Therefore if a `major-mode' is known as not parse-able by
+semantic, imenu or etags it can be added to this option and then it will be
+excluded from being tried to parsed."
+  :group 'ecb-non-semantic
+  :type '(repeat :tag "Modes to exclude"
+                 (symbol :tag "Major-mode")))
+
+
+(defcustom ecb-rebuild-non-semantic-methods-before-hook nil
+  "*Hook at beginning of `ecb-rebuild-methods-buffer-for-non-semantic'.
+So this function is always called by the command `ecb-rebuild-methods-buffer'
+for not semantic supported source-types.
+
+Every function of this hook gets one argument: The complete filename of the
+current source-buffer in the edit-window. The Method-buffer is only rebuild by
+`ecb-rebuild-methods-buffer-for-non-semantic' if either the hook contains no
+function \(the default) or if no function of this hook returns nil! See
+`run-hook-with-args-until-failure' for description how these function are
+processed."
+  :group 'ecb-methods
+  :group 'ecb-non-semantic
+  :type 'hook)
+
+;;====================================================
+;; Internals
+;;====================================================
+
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe this should be placed in
+;; ecb-common-browser.el
+(defun ecb-enter-debugger (&rest error-args)
+  "If `ecb-debug-mode' is not nil then enter the Emacs-debugger and signal an
+error with ERROR-ARGS."
+  (when ecb-debug-mode
+    (let ((debug-on-error t))
+      (apply 'error error-args))))
+
+;; encapsulation all semantic-functions ECB uses if they operate with the
+;; semantic-overlays, so we can handle an error if these overlays (extends for
+;; XEmacs) are destroyed and invalid cause of some mysterious circumstances.
+
+(defun ecb-semantic-assert-valid-tag (tag &optional no-reparse)
+  "Assert that TAG is a valid tag. If not valid then `ecb-enter-debugger'
+is called. If NO-REPARSE is not nil then the buffer is not autom. reparsed. It
+returns nil if the assertion fails otherwise not nil. So the caller can even
+check the result if `ecb-debug-mode' is nil in which case the function
+`ecb-enter-debugger' is a no-op."
+  (if (ecb--semantic-tag-p tag)
+      (if (ecb--semantic-tag-with-position-p tag)
+          (let ((o  (ecb--semantic-tag-overlay tag)))
+            (if (and (ecb--semantic-overlay-p o)
+                     (not (ecb--semantic-overlay-live-p o)))
+                (progn
+                  (when (not no-reparse)
+                    ;; we need this because:
+                    ;; 1. After every jump to a tag X via the method-buffer of
+                    ;;    ECB this tag X is added to the navigation history list
+                    ;;    as new ecb-nav-tag-history-item.
+                    ;; 2. Before any select of a source in the sources- or
+                    ;;    history-buffer or of a node in the method-buffer
+                    ;;    `ecb-nav-save-current' is called which operates onto
+                    ;;    the last saved history-item which is often a
+                    ;;    tag-history-item (see 1.): `ecb-nav-save-current'
+                    ;;    saves for tag-history-items current-position and
+                    ;;    window-start relative to the tag position of the
+                    ;;    last saved tag-history-item which is tag X from
+                    ;;    1.
+                    ;; Now suppose that after 1. and before 2. the overlay of
+                    ;; tag X has been destroyed cause of some reason. Then
+                    ;; the tag-history-item of 1. contains now a tag with
+                    ;; a destroyed overlay. Now step 2. is performed and now
+                    ;; we see why from this moment every click onto a node in
+                    ;; the source-, history- or method-buffer must fail:
+                    ;; During step 2. `ecb-nav-save-current' gets the tag
+                    ;; from the last tag-history-item and calls for this
+                    ;; tag `ecb--semantic-tag-start' which fails now because
+                    ;; the contained overlay of this tag is destroyed in the
+                    ;; meanwhile. Therefore we must throw away this last
+                    ;; tag-history-item containing the tag with the
+                    ;; destroyed overlay. Then after a complete reparse of the
+                    ;; source-buffer and following rebuild of the
+                    ;; ECB-method-buffer ECB is in correct state again!
+                    (ecb-nav-initialize)
+                    (ecb--semantic-clear-toplevel-cache)
+                    (ecb-update-methods-buffer--internal))
+                  (ecb-enter-debugger "Tag %S is invalid!" tag)
+                  nil)
+              ;; else, tag is OK.
+              t))
+        ;; Position-less tags are also OK.
+        t)
+    ;; For no semantic-tags a reparse makes no sense!
+    (ecb-enter-debugger "Not a semantic tag: %S" tag)
+    nil))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: This workaround should be removed
+;; after semantic is available in a release which deals correctly with
+;; indirect buffers!! Currently we do not use and need it because we have
+;; adviced make-indirect-buffer.
+;; (defun ecb-semantic-tag-buffer-indirect-buffer-check (tag)
+;;   "Makes `semantic-tag-buffer' working well with indirect-buffers.
+;; If current selected source-buffer is an indirect buffer and the tag-buffer of
+;; TAG is not equal to this indirect-buffer but the underlying files of both
+;; buffers are identical then we return the indirect buffer as tag-buffer of TAG.
+
+;; This is ncessary because semantic is file-focussed and `semantic-tag-buffer'
+;; returns always the buffer of the underlying base-buffer when called for tag of
+;; the indirect-buffer.
+
+;; This is not a full fix for the semantic problems with indirect buffers but it
+;; is sufficient for the needs of ECB.
+
+;; NOTE: This workaround should be removed after semantic is available in a
+;; release which deals correctly with indirect buffers!!"
+;;   (let ((source-buffer (ecb-path-selected-source 'buffer))
+;;         (buffer-of-tag (ecb--semantic-tag-buffer tag)))
+;;     (if (and (buffer-base-buffer source-buffer)
+;;              (not (equal source-buffer buffer-of-tag))
+;;              (equal (ecb-path-selected-source 'file)
+;;                     (ecb-fix-filename (ecb-buffer-file-name buffer-of-tag))))
+;;         source-buffer
+;;       buffer-of-tag)))
+
+(defun ecb-semantic-tag-buffer (tag)
+  ;; if ecb-debug-mode is not nil then the TAG is valid if we pass the
+  ;; assert. If ecb-debug-mode is nil then we call simply the semantic
+  ;; function and see what happens.
+  (ecb-semantic-assert-valid-tag tag)
+  (ecb--semantic-tag-buffer tag))
+
+(defun ecb-semantic-tag-start (tag)
+  ;; if ecb-debug-mode is not nil then the TAG is valid if we pass the
+  ;; assert. If ecb-debug-mode is nil then we call simply the semantic
+  ;; function and see what happens.
+  (ecb-semantic-assert-valid-tag tag)
+  (ecb--semantic-tag-start tag))
+
+
+(defun ecb-semantic-tag-end (tag)
+  ;; if ecb-debug-mode is not nil then the TAG is valid if we pass the
+  ;; assert. If ecb-debug-mode is nil then we call simply the semantic
+  ;; function and see what happens.
+  (ecb-semantic-assert-valid-tag tag)
+  (ecb--semantic-tag-end tag))
+
+;; Klaus: We must not reparse the buffer if `ecb--semantic-current-tag'
+;; returns nil because here this is no error but nil is always returned for
+;; example if point stays within a comment. Therefore here we only catch real
+;; errors!
+;; NOT used anymore...
+(defun ecb-semantic-current-nonterminal ()
+  (condition-case nil
+      (ecb--semantic-current-tag)
+    (error (message "ecb--semantic-current-tag has problems --> reparsed is performed!")
+           (when (ecb-point-in-edit-window-number)
+             (ecb--semantic-clear-toplevel-cache)
+             (ecb-update-methods-buffer--internal)
+             (ecb--semantic-current-tag)))))
+
+
+(defun ecb-goto-window-methods ()
+  "Make the ECB-methods window the current window.
+If `ecb-use-speedbar-instead-native-tree-buffer' is 'method then goto to the
+speedbar-window."
+  (interactive)
+  (or (ecb-goto-ecb-window ecb-methods-buffer-name)
+      (and (equal ecb-use-speedbar-instead-native-tree-buffer 'method)
+           (ecb-goto-window-speedbar))))
+
+(defun ecb-maximize-window-methods ()
+  "Maximize the ECB-methods-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-methods-window is not visible in current layout."
+  (interactive)
+  (if (equal ecb-use-speedbar-instead-native-tree-buffer 'method)
+      (ecb-maximize-window-speedbar)
+    (ecb-maximize-ecb-buffer ecb-methods-buffer-name t)))
+
+(defecb-window-dedicator ecb-set-methods-buffer ecb-methods-buffer-name
+  "Display in current window the methods-buffer and make window dedicated."
+  (let ((set-methods-buffer
+         (not (equal ecb-use-speedbar-instead-native-tree-buffer 'method))))
+    ;; first we act depending on the value of
+    ;; ecb-use-speedbar-instead-native-tree-buffer
+    (when (not set-methods-buffer)
+      (condition-case error-data
+          (ecb-set-speedbar-buffer)
+        ;; setting the speedbar buffer has failed so we set
+        ;; set-method-buffer to t ==> standard-methods-buffer is set!
+        (error (message "%s" error-data)
+               (setq set-methods-buffer t))))
+    ;; maybe we need to set the standard methods buffer:
+    ;; - if ecb-use-speedbar-instead-native-tree-buffer is not 'method or
+    ;; - if setting the speedbar buffer has failed.
+    (when set-methods-buffer
+      (if (null ecb-use-speedbar-instead-native-tree-buffer)
+          (ignore-errors (ecb-speedbar-deactivate)))
+      (switch-to-buffer ecb-methods-buffer-name))))
+
+
+(defun ecb-create-node (parent-node display name data type)
+  (if (eq 'hidden display)
+      nil
+    (if (eq 'flattened display)
+	parent-node
+      (let ((node (tree-node-new name type data nil parent-node
+				 (if ecb-truncate-long-names 'end))))
+	(when (eq 'expanded display)
+	  (setf (tree-node->expanded node) t))
+        node))))
+
+
+(defun ecb-get-tag-type-display (tag-type)
+  (let* ((show-tags-list (ecb-get-show-tags-list))
+         (display (ecb-find-assoc tag-type show-tags-list)))
+    (if display
+	display
+      (setq display (ecb-find-assoc t show-tags-list))
+      (if display
+	  display
+	'(t hidden nil)))))
+
+
+(defun ecb-get-tag-parent-names (parents)
+  (when parents
+    (let* ((parent (car parents))
+	   (name (cond
+		  ((ecb--semantic-tag-p parent)
+		   (ecb--semantic-format-tag-name parent nil (ecb-font-lock-tags)))
+		  ((stringp parent)
+		   (ecb--semantic--format-colorize-text parent 'type)))))
+      (if name
+	  (if (ecb-check-parent-for-exclude name)
+	      (ecb-get-tag-parent-names (cdr parents))
+	    (cons name (ecb-get-tag-parent-names (cdr parents))))
+	(if (listp parent)
+	    (append (ecb-get-tag-parent-names parent)
+		    (ecb-get-tag-parent-names (cdr parents))))))))
+
+(defun ecb-get-tag-parents (tag)
+  "Return a list of parent-names already colorized by semantic. Currently
+there is no distinction between superclasses and interfaces."
+  (ecb-get-tag-parent-names
+   (append (ecb--semantic-tag-type-superclasses tag)
+           (ecb--semantic-tag-type-interfaces tag))))
+;;    (ecb--semantic-tag-type-parent tag)))
+
+
+(defun ecb-get-tag-name (tag &optional parent-tag)
+  "Get the name of TAG with the appropriate fcn from
+`ecb-tag-display-function'."
+  (condition-case nil
+      (funcall (ecb-get-tag-display-function)
+               tag parent-tag (ecb-font-lock-tags))
+    (error (ecb--semantic-format-tag-prototype tag parent-tag
+                                               (ecb-font-lock-tags)))))
+
+
+(defun ecb-find-add-tag-bucket (node type display sort-method buckets
+                                       &optional parent-tag no-bucketize)
+  "Finds a bucket containing tags of the given TYPE, creates nodes for them
+and adds them to the given NODE. The bucket is removed from the BUCKETS list.
+PARENT-TAG is only propagated to `ecb-add-tag-bucket'."
+  (when (cdr buckets)
+    (let ((bucket (cadr buckets)))
+      (if (eq type (ecb--semantic-tag-class (cadr bucket)))
+	  (progn
+	    (ecb-add-tag-bucket node bucket display sort-method parent-tag
+                                  no-bucketize)
+	    (setcdr buckets (cddr buckets)))
+	(ecb-find-add-tag-bucket node type display sort-method
+				   (cdr buckets) parent-tag no-bucketize)))))
+
+(defsubst ecb-forbid-tag-display (tag)
+  (ecb--semantic--tag-put-property tag 'hide-tag t))
+  
+(defsubst ecb-allow-tag-display (tag)
+  (ecb--semantic--tag-put-property tag 'hide-tag nil))
+
+(defsubst ecb-tag-forbidden-display-p (tag)
+  (ecb--semantic--tag-get-property tag 'hide-tag))
+
+(defsubst ecb-show-at-least-one-tag-p (taglist)
+  "Not nil if at least one of the tags in TAGLIST should be displayed in the
+Methods-buffer."
+  (catch 'found
+    (dolist (tag taglist)
+      (if (not (ecb-tag-forbidden-display-p tag))
+          (throw 'found t)))
+    nil))
+
+
+;; The function requires that TAGLIST is a subset of the tag-table returned by
+;; semantic for the current-buffer.
+(defun ecb-apply-user-filter-to-tags (taglist)
+  "Applies to the tags of TAGLIST the related filter of
+`ecb-methods-user-filter-alist' - if there is any."
+  (save-match-data
+    (let ((filters (cdr (assoc (current-buffer) ecb-methods-user-filter-alist)))
+          (filter-type nil)
+          (filter nil)
+          (inverse nil))
+      (when filters
+        (dolist (tag taglist)
+          (dolist (filter-spec filters)
+            (setq filter-type (nth 0 filter-spec))
+            (setq filter (car (nth 1 filter-spec))) ;; ignore the attached fcn
+            (setq inverse (nth 2 filter-spec))
+            ;; we forbid some tags to be displayed when they do not match the
+            ;; filter. Currently we do not apply a filter to tags of class 'type
+            (unless (equal (ecb--semantic-tag-class tag) 'type)
+              (cond ((equal filter-type 'regexp)
+                     (if (funcall inverse
+                                  (not (string-match filter
+                                                     (ecb--semantic-tag-name tag))))
+                         (ecb-forbid-tag-display tag)))
+                    ((and (member filter '(private protected public))
+                          (equal filter-type 'protection))
+                     (if (funcall inverse
+                                  (not (or (null (ecb--semantic-tag-protection tag))
+                                           (equal (ecb--semantic-tag-protection tag)
+                                                  filter))))
+                         (ecb-forbid-tag-display tag)))
+                    ((and (symbolp filter)
+                          (equal filter-type 'tag-class))
+                     (if (funcall inverse
+                                  (not (equal (ecb--semantic-tag-class tag) filter)))
+                         (ecb-forbid-tag-display tag)))
+                    ((and (functionp filter)
+                          (equal filter-type 'function))
+                     (if (funcall inverse
+                                  (not (funcall filter tag (current-buffer))))
+                         (ecb-forbid-tag-display tag)))
+                    (t nil)))))))))
+
+
+(defun ecb-tag-generate-node-name (text-name first-chars icon-name)
+  "Generate an suitable node name. Add needed image-icons if possible and
+necessary. For the arguments TEXT-NAME, FIRST-CHARS and ICON-NAME see
+`ecb-generate-node-name'."
+  (if (ecb-use-images-for-semantic-tags)
+      (ecb-generate-node-name text-name first-chars icon-name
+                              ecb-methods-buffer-name)
+    text-name))
+
+
+(defun ecb-add-tag-bucket (node bucket display sort-method
+                                &optional parent-tag no-bucketize)
+  "Adds a tag bucket to a node unless DISPLAY equals 'hidden."
+  (when bucket
+    (let* ((name-bucket (ecb-format-bucket-name (car bucket)))
+           (image-name (format "%s-bucket" (ecb--semantic-tag-class (cadr bucket))))
+           (name (ecb-tag-generate-node-name name-bucket -1 image-name))
+           ;;(type (ecb--semantic-tag-class (cadr bucket)))
+           (bucket-node node))
+      (unless (eq 'hidden display)
+        (ecb-apply-user-filter-to-tags (cdr bucket))
+	(unless (or (eq 'flattened display)
+                    ;; we must not create a bucket-node when each tag in the
+                    ;; bucket is forbidden to be displayed
+                    (not (ecb-show-at-least-one-tag-p (cdr bucket))))
+	  (setq bucket-node
+                (tree-node-new name ecb-methods-nodetype-bucket
+                               (list 'ecb-bucket-node
+                                     (car bucket)
+                                     (ecb--semantic-tag-class (car (cdr bucket))))
+                               nil node
+                               (if ecb-truncate-long-names 'end)))
+	  (setf (tree-node->expanded bucket-node) (eq 'expanded display)))
+        (dolist (tag (ecb-sort-tags sort-method (cdr bucket)))
+          ;; we create only a new node for a tag of the bucket when the tag is
+          ;; not forbidden to be displayed.
+          (if (not (ecb-tag-forbidden-display-p tag))
+              (ecb-update-tag-node tag
+                                   (tree-node-new "" ecb-methods-nodetype-tag
+                                                  tag t bucket-node
+                                                  (if ecb-truncate-long-names 'end))
+                                   parent-tag no-bucketize))
+          ;; now we allow each tag to be displayed. This can be done because
+          ;; here we already excluded the tag from being added as a node to
+          ;; the tree-buffer and therefore from being displayed. So we can
+          ;; reset all tags to be shown by default. So we can apply a complete
+          ;; new filter (or no filter) without resetting the old filter before.
+          (ecb-allow-tag-display tag))))))
+
+
+
+(defconst ecb-tag-image-name-alias-alist
+  '((abstract . ((static . ((struct . ((nil . "abstract-class-unknown")
+                                       (unknown . "abstract-class-unknown")
+                                       (private . "abstract-class-private")
+                                       (protected . "abstract-class-protected")
+                                       (public . "abstract-class-public")))
+                            (class . ((nil . "abstract-class-unknown")
+                                      (unknown . "abstract-class-unknown")
+                                      (private . "abstract-class-private")
+                                      (protected . "abstract-class-protected")
+                                      (public . "abstract-class-public")))
+                            ;; currently we have no special icon for
+                            ;; interfaces - we use the icon for abstract classes
+                            (interface . ((nil . "abstract-class-unknown")
+                                          (unknown . "abstract-class-unknown")
+                                          (private . "abstract-class-private")
+                                          (protected . "abstract-class-protected")
+                                          (public . "abstract-class-public")))
+                            ;; we have no static and no abstract enum-icon
+                            (enum . ((nil . "enum-unknown")
+                                     (unknown . "enum-unknown")
+                                     (private . "enum-private")
+                                     (protected . "enum-protected")
+                                     (public . "enum-public")))
+                            ;; we have no icon for static constructors
+                            (constructor . ((nil . "abstract-constructor-unknown")
+                                            (unknown . "abstract-constructor-unknown")
+                                            (private . "abstract-constructor-private")
+                                            (protected . "abstract-constructor-protected")
+                                            (public . "abstract-constructor-public")))
+                            (function . ((nil . "abstract-function-unknown-static")
+                                         (unknown . "abstract-function-unknown-static")
+                                         (private . "abstract-function-private-static")
+                                         (protected . "abstract-function-protected-static")
+                                         (public . "abstract-function-public-static")))
+                            (variable . ((nil . "abstract-variable-unknown-static")
+                                         (unknown . "abstract-variable-unknown-static")
+                                         (private . "abstract-variable-private-static")
+                                         (protected . "abstract-variable-protected-static")
+                                         (public . "abstract-variable-public-static")))))
+                 (not-static . ((struct . ((nil . "abstract-class-unknown")
+                                           (unknown . "abstract-class-unknown")
+                                           (private . "abstract-class-private")
+                                           (protected . "abstract-class-protected")
+                                           (public . "abstract-class-public")))
+                                (class . ((nil . "abstract-class-unknown")
+                                          (unknown . "abstract-class-unknown")
+                                          (private . "abstract-class-private")
+                                          (protected . "abstract-class-protected")
+                                          (public . "abstract-class-public")))
+                                ;; we have currently no special icon for interfaces
+                                (interface . ((nil . "abstract-class-unknown")
+                                              (unknown . "abstract-class-unknown")
+                                              (private . "abstract-class-private")
+                                              (protected . "abstract-class-protected")
+                                              (public . "abstract-class-public")))
+                                ;; we have no abstract enum-icon
+                                (enum . ((nil . "enum-unknown")
+                                         (unknown . "enum-unknown")
+                                         (private . "enum-private")
+                                         (protected . "enum-protected")
+                                         (public . "enum-public")))
+                                (constructor . ((nil . "abstract-constructor-unknown")
+                                                (unknown . "abstract-constructor-unknown")
+                                                (private . "abstract-constructor-private")
+                                                (protected . "abstract-constructor-protected")
+                                                (public . "abstract-constructor-public")))
+                                (function . ((nil . "abstract-function-unknown")
+                                             (unknown . "abstract-function-unknown")
+                                             (private . "abstract-function-private")
+                                             (protected . "abstract-function-protected")
+                                             (public . "abstract-function-public")))
+                                (variable . ((nil . "abstract-variable-unknown")
+                                             (unknown . "abstract-variable-unknown")
+                                             (private . "abstract-variable-private")
+                                             (protected . "abstract-variable-protected")
+                                             (public . "abstract-variable-public")))))))
+    (not-abstract . ((static . ((struct . ((nil . "class-unknown")
+                                           (unknown . "class-unknown")
+                                           (private . "class-private")
+                                           (protected . "class-protected")
+                                           (public . "class-public")))
+                                (class . ((nil . "class-unknown")
+                                          (unknown . "class-unknown")
+                                          (private . "class-private")
+                                          (protected . "class-protected")
+                                          (public . "class-public")))
+                                ;; we use the icon for abstract classes for interfaces
+                                (interface . ((nil . "abstract-class-unknown")
+                                              (unknown . "abstract-class-unknown")
+                                              (private . "abstract-class-private")
+                                              (protected . "abstract-class-protected")
+                                              (public . "abstract-class-public")))
+                                ;; we have no static enum-icon
+                                (enum . ((nil . "enum-unknown")
+                                         (unknown . "enum-unknown")
+                                         (private . "enum-private")
+                                         (protected . "enum-protected")
+                                         (public . "enum-public")))
+                                (constructor . ((nil . "constructor-unknown")
+                                                (unknown . "constructor-unknown")
+                                                (private . "constructor-private")
+                                                (protected . "constructor-protected")
+                                                (public . "constructor-public")))
+                                (function . ((nil . "function-unknown-static")
+                                             (unknown . "function-unknown-static")
+                                             (private . "function-private-static")
+                                             (protected . "function-protected-static")
+                                             (public . "function-public-static")))
+                                (variable . ((nil . "variable-unknown-static")
+                                             (unknown . "variable-unknown-static")
+                                             (private . "variable-private-static")
+                                             (protected . "variable-protected-static")
+                                             (public . "variable-public-static")))))
+                     (not-static . ((struct . ((nil . "class-unknown")
+                                               (unknown . "class-unknown")
+                                               (private . "class-private")
+                                               (protected . "class-protected")
+                                               (public . "class-public")))
+                                    (class . ((nil . "class-unknown")
+                                              (unknown . "class-unknown")
+                                              (private . "class-private")
+                                              (protected . "class-protected")
+                                              (public . "class-public")))
+                                    (interface . ((nil . "abstract-class-unknown")
+                                                  (unknown . "abstract-class-unknown")
+                                                  (private . "abstract-class-private")
+                                                  (protected . "abstract-class-protected")
+                                                  (public . "abstract-class-public")))
+                                    (enum . ((nil . "enum-unknown")
+                                             (unknown . "enum-unknown")
+                                             (private . "enum-private")
+                                             (protected . "enum-protected")
+                                             (public . "enum-public")))
+                                    (constructor . ((nil . "constructor-unknown")
+                                                    (unknown . "constructor-unknown")
+                                                    (private . "constructor-private")
+                                                    (protected . "constructor-protected")
+                                                    (public . "constructor-public")))
+                                    (function . ((nil . "function-unknown")
+                                                 (unknown . "function-unknown")
+                                                 (private . "function-private")
+                                                 (protected . "function-protected")
+                                                 (public . "function-public")))
+                                    (variable . ((nil . "variable-unknown")
+                                                 (unknown . "variable-unknown")
+                                                 (private . "variable-private")
+                                                 (protected . "variable-protected")
+                                                 (public . "variable-public"))))))))
+  "This alist defines the mapping from the combination
+abstract-static-tag-protection to an existing icon-file-name.")
+
+
+(defsubst ecb-get-icon-for-tag (abstract-p static-p type protection)
+  (cdr (assq protection
+              (cdr (assq type
+                          (cdr (assq static-p
+                                      (cdr (assq abstract-p
+                                                  ecb-tag-image-name-alias-alist)))))))))
+
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: All this tag-icon-display-stuff
+;; should be done by semantic - but for now we let do it by ECB because so we
+;; can test the whole stuff. If Eric has added such icon-display to semantic
+;; then we can throw away all this stuff and just using plain-tag-name as
+;; node-name without any modification.
+
+(defun ecb-displayed-tag-name (tag &optional parent-tag)
+  "Return the tag-name of TAG as it will be displayed in the methods-buffer."
+  (let* ((plain-tag-name (ecb-get-tag-name tag parent-tag))
+         (has-protection (if (= 0 (length plain-tag-name))
+                             nil
+                           (member (ecb-first plain-tag-name)
+                                   '(?- ?# ?+))))
+         (icon-name (ecb-get-icon-for-tag
+                     (if (ecb--semantic-tag-abstract-p tag parent-tag)
+                         'abstract
+                       'not-abstract)
+                     (if (ecb--semantic-tag-static-p tag parent-tag)
+                         'static
+                       'not-static)
+                     (or (and (equal (ecb--semantic-tag-class tag)
+                                     'type)
+                              (intern (ecb--semantic-tag-type tag)))
+                         (and (ecb--semantic-tag-function-constructor-p tag)
+                              'constructor)
+                         (ecb--semantic-tag-class tag))
+                     (or (and (ecb--semantic--tag-get-property tag 'adopted)
+                              'unknown)
+                         (and (not (member (ecb--semantic-tag-class tag)
+                                           '(type function variable)))
+                              'unknown)
+                         (ecb--semantic-tag-protection tag parent-tag)))))
+    (ecb-tag-generate-node-name plain-tag-name
+                                (if has-protection 1 -1)
+                                icon-name)))
+
+(defun ecb-children-tags (parent-tag)
+  "Return a list of children-tags of PARENT-TAG. If a child is not a
+semantic-tag \(but a plain string) then it will be converted to a positionless
+tag of class 'variable."
+  (mapcar (function (lambda (c)
+                      (typecase c
+                        (ecb--semantic-tag
+                         c)
+                        (string
+                         (ecb--semantic-tag-new-variable c nil nil nil))
+                        (otherwise
+                         (ecb-error "Tag with name %s contains invalid childrens"
+                                    (ecb--semantic-tag-name parent-tag))))))
+          (ecb--semantic-tag-children-compatibility
+           parent-tag ecb-show-only-positioned-tags)))
+                        
+
+(defun ecb-update-tag-node (tag node &optional parent-tag no-bucketize)
+  "Updates a node containing a tag."
+  (let ((children (ecb-children-tags tag))
+        (tag-name (ecb-displayed-tag-name tag parent-tag)))
+    (setf (tree-node->name node) tag-name)
+    (unless (eq 'function (ecb--semantic-tag-class tag))
+      (ecb-add-tags node children tag no-bucketize)
+      (setf (tree-node->expandable node)
+            (not (= 0 (length (tree-node->children node)))))
+      ;; Always expand types, maybe this should be customizable and more
+      ;; flexible
+      (if (not (eq 'type (ecb--semantic-tag-class tag)))
+          (setf (tree-node->expanded node) nil)
+        (let ((type-specifier (ecb-get-type-specifier tag)))
+          (setf (tree-node->expanded node)
+                (and (tree-node->expandable node)
+                     (ecb-type-tag-expansion type-specifier))))))))
+
+;; (ecb-tag-generate-node-name "klaus" 1 "function-public")
+
+(defun ecb-post-process-taglist (taglist)
+  "If for current major-mode post-process functions are found in
+`ecb-post-process-semantic-taglist' then these functions are called with
+TAGLIST otherwise TAGLIST is returned."
+  (let ((fcn-list (cdr (assoc major-mode ecb-post-process-semantic-taglist))))
+    (dolist (fcn fcn-list)
+      (if (fboundp fcn)
+          (setq taglist (funcall fcn taglist)))))
+  (ecb-set-current-tag-table taglist)
+  ;; now we apply that tag-filters which must operate onto the whole
+  ;; tag-table of
+  (ecb-apply-tag-table-filters taglist))
+
+(defun ecb-apply-tag-table-filters (taglist)
+  "Perform all tag-filters which must be applied to the whole tag-table."
+  (let ((filters (cdr (assoc (current-buffer) ecb-methods-user-filter-alist)))
+        (filter nil))
+    (dolist (filter-type '(current-type))
+      (setq filter (car (cdr (assoc filter-type filters))))
+      (if filter
+          (setq taglist (funcall (cdr filter) (car filter) taglist)))))
+  taglist)
+
+
+(defun ecb-methods-filter-perform-current-type (filter taglist)
+  "Perform a current-type filter on TAGLIST. FILTER is a type-name-hierarchy
+for a certain type. If this hierarchy can be found in TAGLIST a new tag-list
+is returned which contains only the leaf-type in the hierarchy."
+  (let ((curr-type-filter (reverse filter))
+        (new-tag-list taglist)
+        (found-type-tag nil))
+    (if (null curr-type-filter)
+        taglist
+      (catch 'not-found
+        (dolist (type-name curr-type-filter)
+          (setq found-type-tag
+                (car (ecb--semantic-find-tags-by-name
+                      type-name
+                      (ecb--semantic-find-tags-by-class 'type new-tag-list))))
+          (if (null found-type-tag)
+              (progn
+                ;; remove here the filters for current source because the
+                ;; current-type filter is no longer useable! TODO: Klaus
+                ;; Berndl <klaus.berndl@sdm.de>: Maybe we should be smarter
+                ;; and only remove the current-type-filter instead of all
+                ;; filters. This could be done with
+                ;; `ecb-replace-first-occurence' (replace the curr filter with
+                ;; nil and then do (delq nil filters)
+                (ecb-methods-filter-apply nil nil nil "" "" (current-buffer))
+                (ecb-info-message
+                 "ECB has removed all filters cause of changes in the type-hierarchy for the current-type!")
+                ;; whenever we can not found any type in our filter type-hierarchy
+                ;; then we can not apply this current-type filter so we have to
+                ;; return the original tag-list
+                (throw 'not-found taglist))
+            (setq new-tag-list (ecb-children-tags found-type-tag))))
+        ;; when we reach this point we can be sure that the whole type-hierarchy
+        ;; has been found and so we return just our current-type as new taglist.
+        (list found-type-tag)))))
+
+(defun ecb-group-function-tags-with-parents (taglist)
+  "Return a new taglist based on TAGLIST where all function-tags in
+TAGLIST having a parent tag are grouped together under a new faux tag
+for this parent-tag. The new taglist contains first all parent-less tags
+and then all grouped tags.
+
+This is useful for oo-programming languages where the methods of a class can
+be defined outside the class-definition, e.g. C++, Eieio."
+  (ecb--semantic-adopt-external-members taglist))
+
+(defun ecb-filter-c-prototype-tags (taglist)
+  "Filter out all prototypes.
+Beginning with version 2.24 of ECB this function does nothing when
+`ecb-methods-separate-prototypes' is set to not nil \(default).
+
+For example this is useful for editing C files which have the function
+prototypes defined at the top of the file and the implementations at the
+bottom. This means that everything appears twice in the methods buffer, but
+probably nobody wants to jump to the prototypes, they are only wasting space
+in the methods buffer.
+For C-header-files prototypes are never filtered out!"
+;;   ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Is there a better way to
+;;   ;; recognize a C-Header-file?
+  (if ecb-methods-separate-prototypes
+      taglist
+    (let ((header-extensions '("\\.h\\'" "\\.H\\'" "\\.HH\\'" "\\.hxx\\'" "\\.hh\\'")))
+      (or (and (catch 'found
+                 (dolist (ext header-extensions)
+                   (if (save-match-data
+                         (string-match ext (ecb-buffer-file-name (current-buffer))))
+                       (throw 'found t)))
+                 nil)
+               taglist)
+          (ecb-filter taglist
+                      (function (lambda (x)
+                                  (not (ecb--semantic-tag-prototype-p x)))))))))
+
+;; Filtering the Methods-buffer by the user ----------------
+
+(defvar ecb-methods-user-filter-alist nil
+  "The filter currently applied to the methods-buffer by the user. This cache
+is an alist where the key is the buffer-object of that buffer the filter
+belongs and the value is the applied filter to that buffer.
+
+Filters which can work onto single tags are applied by
+`ecb-apply-user-filter-to-tags' whereas tag-filters which have to be applied
+onto the whole tag-table are performed by `ecb-apply-tag-table-filters'.")
+
+
+(defun ecb-methods-filter-by-prot (inverse source-buffer &optional prot)
+  "Filter the Methods-buffer by protection."
+  (let ((choice (or prot
+                    (ecb-query-string "Protection filter:"
+                                      '("private" "protected" "public")))))
+    (ecb-methods-filter-apply 'protection
+                              (cons (intern choice) nil)
+                              inverse
+                              (concat (and inverse "^") "Prot")
+                              choice
+                              source-buffer)))
+
+(defun ecb-methods-filter-by-tag-class (inverse source-buffer
+                                                &optional tag-class)
+  "Filter the Methods-buffer by a tag-class."
+  (let* ((curr-semantic-symbol->name-assoc-list
+          (save-excursion
+            (set-buffer source-buffer)
+            (ecb--semantic-symbol->name-assoc-list)))
+         (choice (or tag-class
+                     (ecb-query-string "Tag-class filter:"
+                                       (mapcar 'cdr
+                                               curr-semantic-symbol->name-assoc-list))))
+         (class (or tag-class
+                    (symbol-name
+                     (car (delq nil (mapcar (function (lambda (e)
+                                                        (if (ecb-string= (cdr e) choice)
+                                                            (car e))))
+                                            curr-semantic-symbol->name-assoc-list)))))))
+    (ecb-methods-filter-apply 'tag-class
+                              (cons (intern class) nil)
+                              inverse
+                              (concat (and inverse "^") "Tagclass")
+                              (cdr (assoc (intern class)
+                                          curr-semantic-symbol->name-assoc-list))
+                              source-buffer)))
+
+
+;; The popup-menu commands for protection- and tag-class-filters are generated
+;; dynamically - see `ecb-methods-menu-tagfilter-entries'.
+
+(defun ecb-methods-filter-by-regexp (inverse source-buffer &optional regexp)
+  "Filter the Methods-buffer by a regular expression."
+  (let ((regexp-str (or regexp (read-string "Filter-regexp: "))))
+    (ecb-methods-filter-apply 'regexp
+                              (if (> (length regexp-str) 0)
+                                  (cons regexp-str nil)
+                                nil)
+                              inverse
+                              (concat (and inverse "^") "Regexp")
+                              (if (> (length regexp-str) 0) regexp-str nil)
+                              source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-by-regexp-popup
+  "Filter the Methods-buffer by regexp from popup."
+  (ecb-methods-filter-by-regexp nil (ecb-methods-get-data-store 'source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-by-regexp-popup-inverse
+  "Filter the Methods-buffer by inverse regexp from popup."
+  (ecb-methods-filter-by-regexp t (ecb-methods-get-data-store 'source-buffer)))
+
+(defun ecb-methods-filter-by-function (inverse source-buffer &optional fcn-name)
+  "Filter the Methods-buffer by a filter-function."
+  (let ((filter-fcn-name (or fcn-name
+                             (completing-read "Tag-filter-function: "
+                                              obarray 'fboundp t))))
+    (ecb-methods-filter-apply 'function
+                              (cons (intern filter-fcn-name)
+                                    nil)
+                              inverse
+                              (concat (and inverse "^") "Function")
+                              filter-fcn-name
+                              source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-by-function-popup
+  "Filter the Methods-buffer by function-filter from popup."
+  (ecb-methods-filter-by-function nil (ecb-methods-get-data-store 'source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-by-function-popup-inverse
+  "Filter the Methods-buffer by inverse function-filter from popup."
+  (ecb-methods-filter-by-function t (ecb-methods-get-data-store 'source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-by-nothing-popup
+  "Remove any filter from the Methods-buffer from popup."
+  (ecb-methods-filter-apply nil nil nil "" ""
+                            (ecb-methods-get-data-store 'source-buffer)))
+
+(tree-buffer-defpopup-command ecb-methods-filter-delete-last-popup
+  "Remove the last added filter from the Methods-buffer from popup."
+  (ecb-methods-filter-apply nil nil nil "" "" (ecb-methods-get-data-store 'source-buffer) t))
+
+
+(defun ecb-get-type-node-of-node (node)
+  "Returns that node which data-tag is of class 'type the tag of the node NODE
+of the Methods-buffer belongs to. If the tag of NODE do not belong to a type
+then nil is returned."
+  (let ((parent (tree-node->parent node)))
+    (catch 'found
+      (while (not (eq (tree-buffer-get-root) parent))
+        (if (equal (and (= (tree-node->type parent) ecb-methods-nodetype-tag)
+                        (ecb--semantic-tag-class (tree-node->data parent)))
+                   'type)
+            (throw 'found parent)
+          (setq parent (tree-node->parent parent))))
+      nil)))
+
+
+(defun ecb-get-type-name-hierarchy-of-current-node ()
+  "Return the type-name-hierarchy of current node in form of a list whereas the
+first element is the name of the tag of the current node itself, the second
+element is the name of the type the current node belongs to, the third element
+is the name of the parent-type of that type and so on. The last element in
+this list is the topmost type-parent of the tag of the current node. If the
+current node has no tag as data then nil is returned. If the tag of the
+current node does not belong to a type-tag \(e.g. a toplevel function) then
+the returned list contains just the name of the tag of the current node."
+  (let ((type-hierarchy nil)
+        (curr-node (tree-buffer-get-node-at-point)))
+    (when (and curr-node
+               (= (tree-node->type curr-node) ecb-methods-nodetype-tag))
+      (while (progn
+               (setq type-hierarchy (cons (ecb--semantic-tag-name
+                                           (tree-node->data curr-node))
+                                          type-hierarchy))
+               (setq curr-node (ecb-get-type-node-of-node curr-node)))))
+    (nreverse type-hierarchy)))
+
+
+(defun ecb-get-type-tag-of-tag (&optional tag table always-parent-type)
+  "Returns that tag of class 'type the tag TAG belongs to. If TAG does not
+belong to a type then nil is returned. If TAG is already of class 'type then
+the behavior depends on the optional argument ALWAYS-PARENT-TYPE: If nil then
+the current tag is returned otherwise the next parent-tag of class 'type is
+returned.
+
+If TAG is nil the tag returned by `ecb-get-real-curr-tag' is used. If TABLE is
+nil then the tag-table of the current buffer is used; otherwise the tag-table
+TABLE is used."
+  (let* ((table (or table (ecb-get-current-tag-table)))
+         (curr-tag (or tag (ecb-get-real-curr-tag)))
+         (function-parent (ecb--semantic-tag-function-parent curr-tag)))
+    (cond ((ecb--semantic-tag-faux-p curr-tag)
+           (and (not always-parent-type) curr-tag))
+          ((and (not always-parent-type)
+                (equal (ecb--semantic-tag-class curr-tag) 'type))
+           curr-tag)
+          (t (if function-parent
+                 ;; we have an external member and we search the type this
+                 ;; external member belongs to. This can either be a type-tag
+                 ;; in the current file (which is then contained in table) or
+                 ;; a faux-tag (created by semantic-adopt-external-members)
+                 ;; when the parent-type of this external member is defined
+                 ;; outside the current source - but this faux-type is
+                 ;; contained in table too.
+                 (catch 'found
+                   (dolist (tag (ecb--semantic-flatten-tags-table table))
+                     (if (and (equal (ecb--semantic-tag-class tag) 'type)
+                              (ecb-string= (ecb--semantic-tag-name tag)
+                                           function-parent)
+                              (delq nil
+                                    (mapcar (lambda (child)
+                                              (if (ecb--semantic-equivalent-tag-p
+                                                   child curr-tag)
+                                                  curr-tag))
+                                            (ecb-children-tags tag))))
+                         (throw 'found tag)))
+                   nil)
+               ;; we are already inside the parent-type - if there is any, so
+               ;; we simply search the nearest tag of class 'type in the
+               ;; reversed overlay-stack
+               (catch 'found
+                 (dolist (tag (cdr (reverse
+                                    (ecb--semantic-find-tag-by-overlay
+                                     (ecb-semantic-tag-start curr-tag)
+                                     (ecb-semantic-tag-buffer curr-tag)))))
+                   (if (equal (ecb--semantic-tag-class tag) 'type)
+                       (throw 'found tag)))
+                 nil))))))
+
+
+(defun ecb-get-type-name-hierarchy-of-current-tag (&optional tag)
+  "Return the type-name-hierarchy of TAG in form of a list whereas the
+first element is the name of the TAG itself, the second element is the name of
+the type the TAG belongs to, the third element is the name of the parent-type
+of that type and so on. The last element in this list is the topmost
+type-parent of the TAG. If the TAG does not belong to a type-tag \(e.g. a
+toplevel function) then the returned list contains just the name of the
+TAG. If TAG is nil then the current tag returned by `ecb-get-real-curr-tag' is
+used; if point does not stay on a tag then nil is returned."
+  (let ((type-hierarchy nil)
+        (curr-tag (or tag (ecb-get-real-curr-tag))))
+    (when curr-tag
+      (while (progn
+               (setq type-hierarchy (cons (ecb--semantic-tag-name curr-tag)
+                                          type-hierarchy))
+               (setq curr-tag (ecb-get-type-tag-of-tag curr-tag nil t)))))
+    (nreverse type-hierarchy)))
+
+(defun ecb-methods-filter-by-current-type (inverse source-buffer &optional
+                                                   tag)
+  "Display only the current-type and its contents in the methods-buffer. The
+argument INVERSE is ignored here."
+  (let* ((curr-type-tag (or (and (ecb--semantic-tag-p tag)
+                                 (save-excursion
+                                   (set-buffer source-buffer)
+                                   (ecb-get-type-tag-of-tag tag)))
+                            (cond ((ecb-point-in-edit-window-number)
+                                   (if (ecb--semantic-active-p)
+                                       (save-excursion
+                                         (set-buffer source-buffer)
+                                         (ecb-get-type-tag-of-tag (ecb-get-real-curr-tag)))))
+                                  ((equal (current-buffer)
+                                          (get-buffer ecb-methods-buffer-name))
+                                   (let ((node (tree-buffer-get-node-at-point)))
+                                     (and node
+                                          (tree-node->data (ecb-get-type-node-of-node node)))))
+                                  (t (ecb-error "ECB can not identify the current-type-tag!")))))
+         (curr-tag-type-name-hierachy (and curr-type-tag
+                                           (save-excursion
+                                             (set-buffer source-buffer)
+                                             (ecb-get-type-name-hierarchy-of-current-tag
+                                              curr-type-tag)))))
+    (if (and curr-type-tag curr-tag-type-name-hierachy)
+        (ecb-methods-filter-apply 'current-type
+                                  (cons curr-tag-type-name-hierachy
+                                        'ecb-methods-filter-perform-current-type)
+                                  nil
+                                  "Type"
+                                  (ecb--semantic-tag-name curr-type-tag)
+                                  source-buffer)
+      (ecb-error "ECB can not identify the current-type!"))))
+                          
+(tree-buffer-defpopup-command ecb-methods-filter-by-current-type-popup
+  "Display only the current-type from popup."
+  (ecb-methods-filter-by-current-type nil
+                                      (ecb-methods-get-data-store 'source-buffer)
+                                      (tree-node->data node)))
+
+
+(defun ecb-get-source-buffer-for-tag-filter ()
+  "Return the source-buffer of the tag-list which should be filtered."
+  (cond ((ecb-point-in-edit-window-number)
+         (current-buffer))
+        ((equal (current-buffer)
+                (get-buffer ecb-methods-buffer-name))
+         (ecb-methods-get-data-store 'source-buffer))
+        (t (or (and ecb-last-source-buffer
+                    (buffer-live-p ecb-last-source-buffer)
+                    ecb-last-source-buffer)
+               (ecb-error "There is no source-file to filter!")))))
+  
+(defun ecb-methods-filter-inverse ()
+  "Apply an inverse filter to the Methods-buffer. This is the same as calling
+`ecb-methods-filter' with a prefix arg."
+  (interactive)
+  (ecb-methods-filter-internal t))
+
+(defun ecb-methods-filter-protection (&optional inverse)
+  "Filter the methods-buffer by protection. If INVERSE is not nil \(called
+with a prefix arg) then an inverse filter is applied. For further details see
+`ecb-methods-filter'."
+  (interactive "P")
+  (ecb-methods-filter-internal inverse 'protection))
+
+(defun ecb-methods-filter-tagclass (&optional inverse)
+  "Filter the methods-buffer by tag-class. If INVERSE is not nil \(called
+with a prefix arg) then an inverse filter is applied. For further details see
+`ecb-methods-filter'."
+  (interactive "P")
+  (ecb-methods-filter-internal inverse 'tag-class))
+
+(defun ecb-methods-filter-current-type ()
+  "Display in the Methods-buffer only the current type and its members. For
+further details see `ecb-methods-filter'."
+  (interactive)
+  (ecb-methods-filter-internal nil 'curr-type))
+
+(defun ecb-methods-filter-regexp (&optional inverse)
+  "Filter the methods-buffer by a regexp. If INVERSE is not nil \(called
+with a prefix arg) then an inverse filter is applied. For further details see
+`ecb-methods-filter'."
+  (interactive "P")
+  (ecb-methods-filter-internal inverse 'regexp))
+
+(defun ecb-methods-filter-function (&optional inverse)
+  "Filter the methods-buffer by a function. If INVERSE is not nil \(called
+with a prefix arg) then an inverse filter is applied. For further details see
+`ecb-methods-filter'."
+  (interactive "P")
+  (ecb-methods-filter-internal inverse 'function))
+
+(defun ecb-methods-filter-nofilter ()
+  "Remove any filter from the Methods-buffer. For further details see
+`ecb-methods-filter'."
+  (interactive)
+  (ecb-methods-filter-internal nil 'no-filter))
+
+(defun ecb-methods-filter-delete-last ()
+  "Remove the most recent filter from the Methods-buffer. For further details see
+`ecb-methods-filter'."
+  (interactive)
+  (ecb-methods-filter-internal nil 'delete-last))
+
+(defun ecb-methods-filter (&optional inverse)
+  "Apply a filter to the Methods-buffer to reduce the number of entries.
+So you get a better overlooking. There are six choices:
+- Filter by protection: Just insert the protection you want the Methods-buffer
+  being filtered: private, protected or public!
+- Filter by regexp: Insert the filter as regular expression.
+- Filter by tag-class: You can filter by the tag-classes of current
+  major-mode. The available tag-classes come from the variable
+  `semantic--symbol->name-assoc-list'. The are normally methods, variables
+  etc.
+- Filter by current type: In languages which have types like Java or C++ this
+  filter displays only the current type and all its members \(e.g. attributes
+  and methods). If ECB can not identify the current type in the source-buffer
+  or in the methods-window then nothing will be done.
+- Filter by a filter-function: Such a function gets two arguments: a tag and
+  the source-buffer of this tag. If the tag should be displayed \(i.e. not
+  being filtered out) then the function has to return not nil otherwise nil.
+- No special filter: This means to display all tags specified with the option
+  `ecb-show-tokens'. If currently some of the above filters are applied they
+  will be all removed.
+- Delete the last added: This removes only the topmost filter-layer, means
+  that filter added last.
+
+The protection-, the current-type and the tag-class-filter are only available
+for semantic-supported sources.
+
+Be aware that the tag-list specified by the option `ecb-show-tags' is the
+basis of all filters, i.e. tags which are excluded by that option will never
+be shown regardless of the filter type here!
+
+All tags which match the applied filter\(s) will be displayed in the
+Methods-buffer.
+
+If called with a prefix-argument or when optional arg INVERSE is not nil then 
+an inverse filter is applied to the Methods-buffer, i.e. all tags which
+do NOT match the choosen filter will be displayed in the Methods-buffer!
+
+Per default the choosen filter will be applied on top of already existing
+filters. This means that filters applied before are combined with the new
+filter. This behavior can changed via the option
+`ecb-methods-filter-replace-existing'. But regardless of the setting in
+`ecb-methods-filter-replace-existing' applying one of the not-inverse filters
+protection, tag-class or current-type always replaces exactly already existing
+filters of that type. On the other hand applying more than one inverse
+tag-class- or protection-filter can make sense.
+
+Such a filter is only applied to the current source-buffer, i.e. each
+source-buffer can have its own tag-filters.
+
+The current active filter will be displayed in the modeline of the
+Methods-buffer \[regexp, prot \(= protection), tag-class, function \(=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is applied
+then always the top-most filter is displayed in the modeline but the fact of
+more than 1 filter is visualized by the number of the filters - included in
+parens. You can see all currently applied filters by moving the mouse over the
+filter-string in modeline of the Methods-buffer: They will displayed as
+help-echo.
+
+See the option `ecb-default-tag-filter' if you search for automatically
+applied default-tag-filters."
+  (interactive "P")
+  (ecb-methods-filter-internal inverse))
+
+(defun ecb-methods-filter-internal (inverse &optional filter-type)
+  "FILTER-TYPE has to be one of the symbols 'regexp, 'protection,
+'tag-class, 'curr-type, 'function, 'no-filter or 'delete-last."
+  (if (save-excursion
+        (set-buffer ecb-methods-buffer-name)
+        (tree-buffer-empty-p))
+      (message "There is nothing to filter in an empty Methods-buffer!")
+    (let* ((source-buffer (ecb-get-source-buffer-for-tag-filter))
+           (semantic-source-p (save-excursion
+                                (set-buffer source-buffer)
+                                (ecb--semantic-active-p)))
+           (choice (or filter-type
+                       (intern (ecb-query-string
+                                (format "Apply %sfilter:"
+                                        (if inverse "inverse " ""))
+                                (delq nil (list "regexp"
+                                                (if semantic-source-p "protection")
+                                                (if semantic-source-p "tag-class")
+                                                (if semantic-source-p "curr-type")
+                                                "function" "no-filter" "delete-last"))))
+                       'no-filter-specified)))
+      (case choice
+        (protection
+         (ecb-methods-filter-by-prot inverse source-buffer))
+        (tag-class
+         (ecb-methods-filter-by-tag-class inverse source-buffer))
+        (regexp
+         (ecb-methods-filter-by-regexp inverse source-buffer))
+        (curr-type
+         (ecb-methods-filter-by-current-type inverse source-buffer))
+        (function
+         (ecb-methods-filter-by-function inverse source-buffer))
+        (delete-last
+         (ecb-methods-filter-apply nil nil nil "" "" source-buffer t))
+        (no-filter
+         (ecb-methods-filter-apply nil nil nil "" "" source-buffer))
+        (otherwise
+         (ecb-methods-filter-apply nil nil nil "" "" source-buffer))))))
+
+(defun ecb-methods-filter-apply (filtertype filter inverse filter-type-display
+                                            filter-display
+                                            source-buffer &optional remove-last)
+  "Apply the FILTER of type FILTERTYPE to the buffer SOURCEBUFFER. If INVERSE
+is not nil then this filter will be applied inverse. FILTER-TYPE-DISPLAY and
+FILTER-DISPLAY are strings and specify how the FILTER of type FILTERTYPE
+should be displayed in the modeline of the methods-buffer. If REMOVE-LAST is
+not nil then the topmost filter will be removed and all other arguments unless
+SOURCE-BUFFER arguments are ignored. Returns t if the filter has been applied
+otherwise nil."
+  (save-excursion
+    (set-buffer source-buffer)
+    (if (and (not remove-last)
+             (member filtertype '(protection tag-class curr-type))
+             (not (ecb--semantic-active-p)))
+        (ecb-error "A %s-filter '%s' can only applied to semantic-supported sources!"
+                   filtertype filter)))
+  (let* ((filter-elem (assoc source-buffer ecb-methods-user-filter-alist))
+         (new-filter-spec (and filtertype
+                               (list filtertype filter (if inverse 'not 'identity)
+                                     filter-type-display filter-display)))
+         (replace-all (and (not remove-last)
+                           (not (equal ecb-methods-filter-replace-existing 'never))
+                           (or (equal ecb-methods-filter-replace-existing 'always)
+                               (y-or-n-p "Should the new filter replace existing ones? "))))
+         (replace-filter-type (and (not inverse)
+                                   (not replace-all)
+                                   (not remove-last)
+                                   (assoc filtertype (cdr filter-elem))
+                                   (member filtertype '(protection tag-class current-type))))
+         (filters (or (and replace-filter-type
+                           (progn
+                             (setcdr filter-elem
+                                     (ecb-remove-assoc filtertype (cdr filter-elem)))
+                             (append (cdr filter-elem) (list new-filter-spec))))
+                      (and remove-last
+                           (nreverse (cdr (reverse (cdr filter-elem)))))
+                      (and new-filter-spec ;; if nil there should be no filter anymore
+                           (if replace-all
+                               new-filter-spec ;; just the new filter-spec
+                             (append (cdr filter-elem) (list new-filter-spec)))))))
+    (if filter-elem
+        (setcdr filter-elem filters)
+      (if filters
+          (setq ecb-methods-user-filter-alist
+                (cons (cons source-buffer filters) ecb-methods-user-filter-alist)))))
+  (when (buffer-live-p source-buffer)
+    (save-excursion
+      (set-buffer source-buffer)
+      (if (ecb--semantic-active-p)
+          ;; For semantic-sources we do not use `ecb-rebuild-methods-buffer)'
+          ;; because this would always reparse the source-buffer even if not
+          ;; necessary.
+          (save-restriction
+            (widen)
+            (ecb-rebuild-methods-buffer-with-tagcache
+             (ecb-fetch-semantic-tags)))
+        (ecb-rebuild-methods-buffer-fully)))
+    (if (save-excursion
+          (set-buffer ecb-methods-buffer-name)
+          (tree-buffer-empty-p))
+        (progn
+          (ecb-methods-filter-apply nil nil nil "" "" source-buffer t)
+          (message "ECB has not applied this filter because it would filter out all nodes!")
+          nil)
+      t)))
+        
+  
+(defun ecb-methods-filter-modeline-prefix (buffer-name sel-dir sel-source)
+  "Compute a mode-line prefix for the Methods-buffer so the current filter
+applied to the displayed tags is displayed. This function is only for using by
+the option `ecb-mode-line-prefixes'."
+  (let* ((filters (and sel-source
+                       (cdr (assoc (get-buffer (cdr sel-source))
+                                   ecb-methods-user-filter-alist))))
+         (top-filter-spec (ecb-last filters))
+         (filter-type-str (nth 3 top-filter-spec))
+         (filter-str (nth 4 top-filter-spec)))
+    (if (null top-filter-spec)
+        nil ;; no prefix if no filter
+      (let ((str (format "[%s%s: %s]"
+                         filter-type-str
+                         (if (> (length filters) 1)
+                             (format "(%d)" (length filters))
+                           "")
+                         filter-str)))
+        (put-text-property
+         0 (length str) 'help-echo
+         (concat "Filter-Stack: "
+                 (mapconcat 'identity
+                            (loop for f-elem being the elements of filters using (index f-elem-index)
+                                  collect (let ((f-type-str (nth 3 f-elem) )
+                                                (f-str (nth 4 f-elem)))
+                                            (format "%d. [%s: %s]" (1+ f-elem-index) f-type-str f-str)))
+                            ", "))
+         str)
+        str))))
+
+(defun ecb-default-tag-filter-for-current-source ()
+  "Check if for the file of the current buffer a default-tag-filter should be
+applied. If yes, then the filters-list of `ecb-default-tag-filter' is returned
+otherwise nil."
+  (catch 'found
+    (dolist (spec ecb-default-tag-filter)
+      (let ((m-mode (caar spec))
+            (regexp (cdar spec)))
+        (if (and (equal major-mode m-mode)
+                 (save-match-data
+                   (string-match regexp (ecb-buffer-file-name (current-buffer)))))
+            (throw 'found (cdr spec)))))
+    nil))
+
+(defun ecb-apply-default-tag-filter ()
+  "Applies all default-tag-filters specified in `ecb-default-tag-filter' for
+the current file."
+  (remove-hook 'post-command-hook 'ecb-apply-default-tag-filter)
+  (ignore-errors
+    (let ((tag-filter-list (ecb-default-tag-filter-for-current-source)))
+      (dolist (filter-spec tag-filter-list)
+        (let ((filter-apply-fcn
+               (case (nth 0 filter-spec)
+                 (protection 'ecb-methods-filter-by-prot)
+                 (tag-class  'ecb-methods-filter-by-tag-class)
+                 (regexp 'ecb-methods-filter-by-regexp)
+                 (function 'ecb-methods-filter-by-function)))
+              (filter
+               (case (nth 0 filter-spec)
+                 (protection
+                  (typecase (nth 1 filter-spec)
+                    (symbol (symbol-name (nth 1 filter-spec)))
+                    (string (nth 1 filter-spec))
+                    (otherwise
+                     (ecb-error "Not a valid tag-filter: %s" (nth 1 filter-spec)))))
+                 (tag-class
+                  (typecase (nth 1 filter-spec)
+                    (symbol (symbol-name (nth 1 filter-spec)))
+                    (string (nth 1 filter-spec))
+                    (otherwise
+                     (ecb-error "Not a valid tag-filter: %s" (nth 1 filter-spec)))))
+                 (regexp
+                  (typecase (nth 1 filter-spec)
+                    (string (nth 1 filter-spec))
+                    (otherwise
+                     (ecb-error "Not a valid tag-filter: %s" (nth 1 filter-spec)))))
+                 (function
+                  (typecase (nth 1 filter-spec)
+                    (symbol (symbol-name (nth 1 filter-spec)))
+                    (string (nth 1 filter-spec))
+                    (otherwise
+                     (ecb-error "Not a valid tag-filter: %s" (nth 1 filter-spec))))))))
+          (funcall filter-apply-fcn
+                   (nth 2 filter-spec) (current-buffer) filter))))))
+
+(defun ecb-find-file-hook ()
+  "Adds `ecb-apply-default-tag-filter' to `post-command-hook'. This function
+removes itself from the `post-command-hook'."
+  (add-hook 'post-command-hook 'ecb-apply-default-tag-filter))
+
+;; adding tags to the Methods-buffer 
+
+(defun ecb-add-tags (node tags &optional parent-tag no-bucketize)
+  "Add TAGS to the node NODE.
+If NO-BUCKETIZE is not nil then TAGS will not bucketized by
+`ecb--semantic-bucketize' but must already been bucketized! If not nil
+PARENT-TAG is the parent of TAGS."
+  (ecb-add-tag-buckets
+   node parent-tag
+   (if no-bucketize
+       tags
+     (ecb--semantic-bucketize tags
+                              (and parent-tag
+                                   (ecb--semantic-symbol->name-assoc-list-for-type-parts)
+                                   (equal (ecb--semantic-tag-class parent-tag)
+                                          'type))))
+   no-bucketize))
+
+
+(defun ecb-access-order (access)
+  "Map ACCESS to a integer-value.
+'public     --> 0
+'protected  --> 1
+'private    --> 3
+<all other> --> 2"
+  (cond
+   ((eq 'public access) 0)
+   ((eq 'protected access) 1)
+   ((eq 'private access) 3)
+   (t  2)))
+
+
+(defun ecb-sort-tags (sort-method tags)
+  (if sort-method
+      (let ((tags-by-name
+	     (sort tags (function (lambda (a b)
+				      (ecb-string< (ecb--semantic-tag-name a)
+                                                   (ecb--semantic-tag-name b)))))))
+	(if (eq 'access sort-method)
+	    (sort tags-by-name
+		  (function
+		   (lambda (a b)
+		     (< (ecb-access-order (ecb--semantic-tag-protection a))
+			(ecb-access-order (ecb--semantic-tag-protection b))))))
+	  tags-by-name))
+    tags))
+
+
+(defun ecb-add-tag-buckets (node parent-tag buckets &optional no-bucketize)
+  "Creates and adds tag nodes to the given node.
+The PARENT-TAG is propagated to the functions `ecb-add-tag-bucket' and
+`ecb-find-add-tag-bucket'."
+  (setq buckets (cons nil buckets))
+  (dolist (tag-display (ecb-get-show-tags-list))
+    (let* ((type (car tag-display))
+           (display (cadr tag-display))
+           (sort-method (caddr tag-display)))
+      (cond
+       ((eq 'parent type)
+ 	(when (and parent-tag
+ 		   (eq 'type (ecb--semantic-tag-class parent-tag)))
+ 	  (let ((parents (ecb-get-tag-parents parent-tag)))
+	    (when parents
+	      (let* ((name-bucket (ecb-format-bucket-name "Parents"))
+                     (name (ecb-tag-generate-node-name name-bucket -1
+                                                       "parent-bucket"))
+                     (parent-node nil))
+                (setq parent-node (ecb-create-node node display
+                                                   name
+                                                   (list 'ecb-bucket-node
+                                                         "Parents"
+                                                         'parent)
+                                                   ecb-methods-nodetype-bucket))
+                (when node
+		  (dolist (parent (if sort-method
+				      (sort parents 'ecb-string<) parents))
+                    (let* ((plain-parent-name
+                            (if (ecb-font-lock-tags)
+                                (ecb--semantic--format-colorize-text parent 'type)
+                              parent))
+                           ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: When
+                           ;; the next version of the semantic-parsers offer
+                           ;; the protection of the inheritance (like possible
+                           ;; in C++) then we have to adjust this code and
+                           ;; compute the correct icon-name.
+                           (parent-name (ecb-tag-generate-node-name plain-parent-name
+                                                                    -1
+                                                                    "parent-unknown")))
+                      (tree-node-new parent-name
+                                     ecb-methods-nodetype-externtag
+                                     parent t parent-node
+                                     (if ecb-truncate-long-names 'end))))))))))
+       (t (ecb-find-add-tag-bucket node type display sort-method buckets
+                                   parent-tag no-bucketize)))))
+  (let ((type-display (ecb-get-tag-type-display t)))
+    (dolist (bucket buckets)
+      (ecb-add-tag-bucket node bucket (cadr type-display)
+                            (caddr type-display) parent-tag no-bucketize))))
+
+
+(defun ecb-update-after-partial-reparse (updated-tags)
+  "Updates the method buffer and all internal ECB-caches after a partial
+semantic-reparse. This function is added to the hook
+`semantic-after-partial-cache-change-hook'."
+  ;; TODO: Currently we get simply the whole cache from semantic (already up
+  ;; to date at this time!) and then we rebuild the whole tree-buffer with
+  ;; this cache-contents. This is slow for big sources. We should implement
+  ;; a mechanism where only the UPDATED-TAGS are used and only this ones are
+  ;; updated.
+
+  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: here we could check if
+  ;; UPDATED-TAGS contains only one tag and if this tag contains no childrens
+  ;; then we could use the new function `tree-buffer-update-node' to simply
+  ;; updating the associated node instead of a full reparse and then full
+  ;; tree-buffer-update.
+  (if (and (= 1 (length updated-tags))
+           (null (ecb-children-tags (car updated-tags))))
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: 
+      ;; we could update this single node if we can find this node. But this
+      ;; could be difficult (or impossible?) because here we only know the new
+      ;; semantic-tag but our nodes contain only outdated semantic-tags as
+      ;; data so how to find the associated node??!!
+      ;; Maybe we could search the node which contaisn the parent-tag of the
+      ;; updated tag and then we compute the position p of this tag in the list
+      ;; of the children of its parent-tag and then we update that node which
+      ;; comes on the same position p in the list of childrens of the
+      ;; associated parent-node - hmm, but can we be sure that the sequence of
+      ;; children-tags and children-nodes is the same?? probably not because
+      ;; the nodes are ordered alphabetically and the tags are are ordered in
+      ;; that sequence they are code in the source-buffer! Hmmm...........
+      ;; Until this question is solved we must use the full reparse/rebuild
+      ;; :-( One possible solution: tempor. ordering the
+      ;; semantic-tag-childrens by name and getting the position p of the
+      ;; updated tag in that ordered tag-sequence...
+      (ecb-rebuild-methods-buffer-with-tagcache (ecb-fetch-semantic-tags))
+    (ecb-rebuild-methods-buffer-with-tagcache (ecb-fetch-semantic-tags))))
+
+
+(defun ecb-semantic-active-for-file (filename)
+  "Return not nil if FILENAME is already displayed in a buffer and if semantic
+is active for this buffer."
+  (and (get-file-buffer filename)
+       (save-excursion
+         (set-buffer (get-file-buffer filename))
+         (ecb--semantic-active-p))))
+
+
+(defun ecb-update-methods-after-saving ()
+  "Updates the methods-buffer after saving if this option is turned on and if
+current-buffer is saved."
+  (when (and (equal (selected-frame) ecb-frame)
+             ecb-auto-update-methods-after-save
+             ecb-last-edit-window-with-point
+             ;; this prevents updating the method buffer after saving a not
+             ;; current buffer (e.g. with `save-some-buffers'), because this
+             ;; would result in displaying a method-buffer not belonging to the
+             ;; current source-buffer.
+             (equal (current-buffer)
+                    (window-buffer ecb-last-edit-window-with-point)))
+    (ecb-select-source)
+    (if (ecb--semantic-active-p)
+        (ecb-update-methods-buffer--internal nil nil t)
+      (ecb-rebuild-methods-buffer-for-non-semantic))))
+
+(defun ecb-fetch-semantic-tags (&optional full)
+  "Get a taglist for current buffer.
+If optional arg FULL is not nil or if the `semantic-idle-scheduler-mode' is
+not enabled for current source-buffer and the option
+`ecb-force-reparse-when-semantic-idle-scheduler-off' is not nil then use
+`ecb--semantic-fetch-tags' otherwise use `ecb--semantic-fetch-available-tags'.
+The latter always returns just the currently available tags in the
+semantic-cache \(reparsing is done completely by the idle-scheduler of
+semantic if necessary). The former one triggers immediate parsing if
+necessary!"
+  (if (or full
+          (and (or (not (boundp 'semantic-idle-scheduler-mode))
+                   (not semantic-idle-scheduler-mode))
+               ecb-force-reparse-when-semantic-idle-scheduler-off)
+          )
+      (ecb--semantic-fetch-tags)
+    (ecb--semantic-fetch-available-tags)))
+
+
+(defvar ecb-method-buffer-needs-rebuild t
+  "This variable is only set and evaluated by the functions
+`ecb-update-methods-buffer--internal' and
+`ecb-rebuild-methods-buffer-with-tagcache'!")
+
+(defvar ecb-method-buffer-rebuild-allowed-for-invisible-buffers nil
+  "This variable is only set and evaluated by the functions
+`ecb-update-methods-buffer--internal' and
+`ecb-rebuild-methods-buffer-with-tagcache'!")
+
+
+(defun ecb-update-methods-buffer--internal (&optional scroll-to-top
+                                                      rebuild-non-semantic
+                                                      full-semantic
+                                                      invisible-sourcebuffer-allowed)
+  "Updates the methods buffer with the current buffer. The only thing what
+must be done is to start the toplevel parsing of semantic, because the rest is
+done by `ecb-rebuild-methods-buffer-with-tagcache' because this function is in
+the `semantic-after-toplevel-cache-change-hook'.
+If optional argument SCROLL-TO-TOP is non nil then the method-buffer is
+displayed with window-start and point at beginning of buffer.
+
+If second optional argument REBUILD-NON-SEMANTIC is not nil then non-semantic
+sources are forced to be rescanned and reparsed by
+`ecb-rebuild-methods-buffer-with-tagcache'. The function
+`ecb-rebuild-methods-buffer-for-non-semantic' is the only one settings this
+argument to not nil!
+
+If third optional arg FULL-SEMANTIC is not nil then for semantic-sources an
+immediate parse-run is triggered - not an idle one! Has no effect for
+non-semantic-sources.
+
+If fourth optional argument INVISIBLE-SOURCEBUFFER-ALLOWED is not NIL then we
+drive `ecb-rebuild-methods-buffer-with-tagcache' so it does not prevent
+rebuilding a not visible source-buffer."
+  (when (and (equal (selected-frame) ecb-frame)
+             (get-buffer-window ecb-methods-buffer-name))
+    ;; Set here `ecb-method-buffer-needs-rebuild' to t so we can see below if
+    ;; `ecb-rebuild-methods-buffer-with-tagcache' was called auto. after
+    ;; `ecb-fetch-semantic-tags'.
+    (setq ecb-method-buffer-needs-rebuild t)
+    ;; set this global variable according to the value of
+    ;; invisible-sourcebuffer-allowed so that the hook-driven call to
+    ;; `ecb-rebuild-methods-buffer-with-tagcache' and the call below as well
+    ;; do not prevent rebuilding an invisible source-buffer.
+    ;; `ecb-method-buffer-rebuild-allowed-for-invisible-buffers' is evaluated
+    ;; by `ecb-rebuild-methods-buffer-with-tagcache' and also reset to nil at
+    ;; the end.
+    (setq ecb-method-buffer-rebuild-allowed-for-invisible-buffers
+          invisible-sourcebuffer-allowed)
+
+    (let ((current-tagcache (and (ecb--semantic-active-p)
+                                   ;; if we manually bovinate the buffer we
+                                   ;; must widen the source to get all tags.
+                                   (save-excursion
+                                     (save-restriction
+                                       (widen)
+                                       (ecb-fetch-semantic-tags full-semantic))))))
+      ;; If the `ecb-fetch-semantic-tags' has done no reparsing but
+      ;; only used it“s still valid cache then neither the hooks of
+      ;; `semantic-after-toplevel-cache-change-hook' nor the hooks in
+      ;; `semantic-after-partial-cache-change-hook' are evaluated and
+      ;; therefore `ecb-rebuild-methods-buffer-with-tagcache' was not called.
+      ;; Therefore we call it here manually.
+      ;; `ecb-rebuild-methods-buffer-with-tagcache' is the only function which
+      ;; sets `ecb-method-buffer-needs-rebuild' to nil to signalize that a
+      ;; "manually" rebuild of the method buffer is not necessary.
+      ;;
+      ;; `ecb-update-methods-buffer--internal' is called by
+      ;; `ecb-basic-buffer-sync' and `ecb-set-selected-source' (depending
+      ;; on the method switching to current buffer) which both are called also
+      ;; for buffers which are not setup for semantic (e.g. text-,
+      ;; tex-buffers). current-tagcache is nil for such buffers so we call the
+      ;; rebuilding of the method buffer with a nil cache and therefore the
+      ;; method-buffer will be cleared out for such buffers. This is what we
+      ;; want! For further explanation see
+      ;; `ecb-rebuild-methods-buffer-with-tagcache'...
+      (when ecb-method-buffer-needs-rebuild
+        ;; the hook was not called therefore here manually
+        (ecb-rebuild-methods-buffer-with-tagcache
+         current-tagcache
+         ;; set the argument NO-UPDATE-SEMANTIC as follows:
+         ;; - no-sematic-sources: always nil
+         ;; - semantic-sources: If we want a complete rebuild of the
+         ;;   methods-buffer based on current tag-list of current buffer
+         ;;   (i.e. FULL-SEMANTIC is not nil) then we have to set this arg
+         ;;   to nil... if we just want the cached tree-content of the
+         ;;   methods-buffer then we set this arg to t.
+         (and (ecb--semantic-active-p) (not full-semantic))
+         ;; we force a rebuild also for an empty cache because an empty
+         ;; cache is returned by `ecb-fetch-semantic-tags' when a file
+         ;; exceeds the limit set in the option
+         ;; `semantic-idle-scheduler-max-buffer-size'. If we would not force
+         ;; a nil-cache rebuild the method-buffer would not be cleared out
+         ;; for such files. But for non-semantic-buffers we have to pass nil
+         ;; for this argument because otherwise the methods-buffer-contents
+         ;; would not be cached - see usage of arg force-nil-cache in
+         ;; `ecb-rebuild-methods-buffer-with-tagcache'. This is maybe a
+         ;; somehow clumsy and ugly dependence...but it works...maybe we
+         ;; should try in future to redesign this....
+         (ecb--semantic-active-p)
+         rebuild-non-semantic)))
+    (when scroll-to-top
+      (ecb-exec-in-window ecb-methods-buffer-name
+        (ecb-scroll-window (point-min) (point-min))))))
+
+
+(defvar ecb-tag-tree-cache nil
+  "This is the tag-tree-cache for already opened file-buffers. The cache is
+a list of cons-cells where the car is the name of the source and the cdr is
+the current tag-tree for this source. The cache contains exactly one element
+for a certain source.")
+(setq ecb-tag-tree-cache nil)
+
+(defun ecb-clear-tag-tree-cache (&optional source-name)
+  "Clears either the whole tag-tree-cache \(SOURCE-NAME is nil) or
+removes only the tag-tree for SOURCE-NAME from the cache."
+  (if (not source-name)
+      (setq ecb-tag-tree-cache nil)
+    (setq ecb-tag-tree-cache
+          (adelete 'ecb-tag-tree-cache source-name))))
+
+(defvar ecb-current-post-processed-tag-table nil
+  "This is the current tag-table of the current source-buffer returned by
+`ecb-post-process-taglist'. Do not set this variable, only the function
+`ecb-rebuild-methods-buffer-with-tagcache' is allowed to do this.")
+(make-variable-buffer-local 'ecb-current-post-processed-tag-table)
+
+(defun ecb-get-current-tag-table ()
+  "Return the current tag-table of the current source-buffer returned by
+`ecb-post-process-taglist'. Use always this function if you just need the
+current post-processed tag-table of the current buffer and you do not need or
+want rebuilding the Methods-buffer."
+  ecb-current-post-processed-tag-table)
+
+(defun ecb-set-current-tag-table (table)
+  "Set the current tag-table of the current source-buffer to TABLE. Return
+TABLE."
+  (setq ecb-current-post-processed-tag-table table))
+
+
+(defun ecb-methods-get-data-store (key)
+  "Get the value for KEY from the tree-buffer-data-store of the Methods-buffer."
+  (save-excursion
+    (set-buffer ecb-methods-buffer-name)
+    (cdr (assoc key (tree-buffer-get-data-store)))))
+  
+
+(defun ecb-rebuild-methods-buffer-with-tagcache (updated-cache
+                                                 &optional no-update-semantic
+                                                 force-nil-cache
+                                                 non-semantic-rebuild)
+  "Rebuilds the ECB-method buffer after toplevel-parsing by semantic. This
+function is added to the hook `semantic-after-toplevel-cache-change-hook'.
+
+If NO-UPDATE-SEMANTIC is not nil then the tags of the ECB-methods-buffer are
+not updated with UPDATED-CACHE but the method-buffer is rebuild with these
+tags ECB has already cached in it `ecb-tag-tree-cache'. Only relevant for
+semantic-parsed sources!
+
+If FORCE-NIL-CACHE is not nil then the method-buffer is even rebuild if
+UPDATED-CACHE is nil. Normally a nil cache is ignored if it belongs to a
+buffer witch is setup for semantic-parsing; only nil caches for non-semantic
+buffers \(like plain text-buffers) are used for updating the method-buffers.
+With FORCE-NIL-CACHE the method-buffer is updated with a nil cache too, i.e.
+it is cleared.
+
+IF NON-SEMANTIC-REBUILD is not nil then current non-semantic-source is forced
+to be rescanned/reparsed and therefore the Method-buffer will be rebuild too."
+  ;; The most important function for (re)building the Method-buffer
+  (when (and ecb-minor-mode ;; ECB must be active - just for saveness
+             ;; ECB-frame must be active
+             (equal (selected-frame) ecb-frame)
+             ;; the methods-buffer must be visible
+             (get-buffer-window ecb-methods-buffer-name)
+             ;; current buffer must have a filename.
+             (ecb-buffer-file-name (current-buffer))
+             ;; the parsed buffer must be displayed in a window within the
+             ;; ECB-frame: This prevents the methods-buffer being confused by
+             ;; the background-parsing of other files by semantic-idle-timer
+             (or ecb-method-buffer-rebuild-allowed-for-invisible-buffers
+                 (get-buffer-window (current-buffer) ecb-frame))
+             ;; The functions of the hook
+             ;; `semantic-after-toplevel-cache-change-hook' are also called
+             ;; after clearing the cache to set the cache to nil if a buffer
+             ;; is parsed which has no tags. But buffers with no tags are
+             ;; really seldom so cause of better performance here we do not
+             ;; want rebuilding the method-buffer if the cache is nil but the
+             ;; current buffer is set up for semantic-parsing, because the
+             ;; real rebuild should be done after the cache is filled again.
+             ;; If this hook is called "manually" by
+             ;; `ecb-update-methods-buffer--internal' then we do an update
+             ;; also for a nil cache if the buffer is not setup for semantic
+             ;; (like text-buffers or non-semantic-sources) so we can either
+             ;; clear out the method-buffer or fill it with parsing
+             ;; information of non-semantic-sources!
+             (or updated-cache
+                 (not (ecb--semantic-active-p))
+                 force-nil-cache))
+
+    ;; no-update-semantic has to be nil for non-semantic-sources!
+    (if (not (ecb--semantic-active-p)) (setq no-update-semantic nil))
+
+    ;; the following cache-mechanism MUST use the (buffer-name) instead of
+    ;; ecb-path-selected-source because in case of opening a buffer not via
+    ;; directory-window but via the standard-mechanism of Emacs this function
+    ;; is called via hook BEFORE ecb-path-selected-source is set currently by
+    ;; the synchronize-mechanism of ECB. Also if we create a new cache-element
+    ;; for the tag-tree we MUST look if in the cache is already an element
+    ;; with this key and if we MUST update this cache-element instead of
+    ;; always adding a new one to the cache. Otherwise we would get more than
+    ;; one cache-element for the same source!.
+
+    ;; with buffer-name we can also handle indirect-buffers
+    (let* ((cache-key (buffer-name))
+           (cache (assoc cache-key ecb-tag-tree-cache))
+           (curr-buff (current-buffer))
+           (tag-sync-necessary nil)
+           (curr-major-mode major-mode)
+           (ezimage-use-images (if (ecb-use-images-for-semantic-tags)
+                                   nil
+                                 (ecb--ezimage-use-images)))
+           (semantic-format-use-images-flag (if (ecb-use-images-for-semantic-tags)
+                                                nil
+                                              (ecb--semantic-format-use-images-flag)))
+           (my-format-face-alist (if (ecb-use-images-for-semantic-tags)
+                                     (ecb-remove-assoc 'abstract
+                                                       (ecb-remove-assoc 'static
+                                                                         (ecb--semantic-format-face-alist)))
+                                   (ecb--semantic-format-face-alist)))
+           (semantic-format-face-alist my-format-face-alist)
+           (semantic-bucketize-tag-class
+            (if ecb-methods-separate-prototypes
+                (function (lambda (tag)
+                            (if (ecb--semantic-tag-prototype-p tag)
+                                'prototype
+                              (ecb--semantic-tag-class tag))))
+              semantic-bucketize-tag-class))
+           (semantic-symbol->name-assoc-list-for-type-parts
+            (and (ecb--semantic-active-p)
+                 (ecb--semantic-symbol->name-assoc-list-for-type-parts)
+                 (or (and (null (cdr (assoc 'function
+                                            (ecb--semantic-symbol->name-assoc-list-for-type-parts))))
+                          (ecb--semantic-symbol->name-assoc-list-for-type-parts))
+                     (append (ecb--semantic-symbol->name-assoc-list-for-type-parts)
+                             (list (cons 'prototype
+                                         (format "%s-prototypes"
+                                                 (ecb-string-make-singular
+                                                  (cdr (assoc 'function
+                                                              (ecb--semantic-symbol->name-assoc-list-for-type-parts)))))))))))
+           (semantic-symbol->name-assoc-list
+            (and (ecb--semantic-active-p)
+                 (ecb--semantic-symbol->name-assoc-list)
+                 (or (and (null (cdr (assoc 'function
+                                            (ecb--semantic-symbol->name-assoc-list))))
+                          (ecb--semantic-symbol->name-assoc-list))
+                     (append (ecb--semantic-symbol->name-assoc-list)
+                             (list (cons 'prototype
+                                         (format "%s-prototypes"
+                                                 (ecb-string-make-singular
+                                                  (cdr (assoc 'function
+                                                              (ecb--semantic-symbol->name-assoc-list)))))))))))
+           (curr-semantic-symbol->name-assoc-list semantic-symbol->name-assoc-list)
+           new-tree non-semantic-handling)
+      
+      (if ecb-debug-mode
+          (dolist (a-tag updated-cache)
+            (ecb-semantic-assert-valid-tag a-tag)))
+      
+      ;; here we process non-semantic buffers if the user wants this. But only
+      ;; if either non-semantic-rebuild is true or no cache exists.
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Here we could evaluate an
+      ;; option which would define which modes should be parsed by which
+      ;; parser (so a user could also parse semantic-enabled-files with
+      ;; etags/imenu)
+      (when (and ecb-process-non-semantic-files
+                 (null updated-cache)                 
+                 (not (ecb--semantic-active-p))
+                 (ecb-buffer-file-name (current-buffer))
+                 (or non-semantic-rebuild (null cache)))
+        (setq updated-cache (ignore-errors
+                              (ecb-get-tags-for-non-semantic-files)))
+        (setq non-semantic-handling
+              (if updated-cache 'parsed 'parsed-failed)))
+
+      ;; Now non-semantic-handling is only nil either for semantic-sources or
+      ;; for non-semantic-sources if already a cache exists and
+      ;; non-semantic-rebuild is nil (i.e. no rescan and rebuild is
+      ;; necessary). A not-nil value is only possible for non-semantic-sources
+      ;; and is then either 'parsed in case the parsing was successful or
+      ;; 'parsed-failed.
+
+      ;; We always make a new tag-tree with updated-cache except for
+      ;; - semantic-sources if no-update-semantic is true and already a
+      ;;   cache exists. This means this function is NOT called by
+      ;;   `semantic-after-toplevel-cache-change-hook'.
+      ;; - non-semantic-sources if non-semantic-handling is false, because
+      ;;   then no rescan has been performed and updated-cache contains
+      ;;   nothing; see comment above.
+      (unless (or (and no-update-semantic cache) ;; for semantic-sources
+                  (and (not (ecb--semantic-active-p)) ;; for non-semantic-sources
+                       (not non-semantic-handling)
+                       ;; for clearing out non-semantic-buffers too after
+                       ;; killing one; see `ecb-kill-buffer-hook'.
+                       (not force-nil-cache)))
+        ;; when we update the cache for the current source-buffer then we have
+        ;; to resync the current tag at the end.
+        (setq tag-sync-necessary t)
+        (setq new-tree (tree-node-new-root))
+        (if non-semantic-handling
+            (if (equal non-semantic-handling 'parsed)
+                (ecb-create-non-semantic-tree new-tree updated-cache))
+          (ecb-add-tags new-tree
+                        (ecb-post-process-taglist updated-cache)))
+        (if cache
+            (setcdr cache new-tree)
+          (setq cache (cons cache-key new-tree))
+          (setq ecb-tag-tree-cache (cons cache ecb-tag-tree-cache))))
+
+      ;; Now we either update the method-buffer with a newly created
+      ;; tag-tree or with the tag-tree from the cache (with all its
+      ;; existing expansions). This work because we store in the cache not a
+      ;; copy of the tree but the tree itself, so every expansion of nodes in
+      ;; the tree (e.g. by clicking onto the expand-button) expands the nodes
+      ;; in the cache!! Cause of this storing the buffer-string too in the
+      ;; cache can not work because the buffer-string is a "copy" of the
+      ;; tree-buffer and therefore the cached buffer-string can not be updated
+      ;; automatically.
+      (save-excursion
+        (set-buffer ecb-methods-buffer-name)
+        ;; we store in the tree-buffer the buffer and the major-mode for which
+        ;; the tree-buffer has been build. In no other place the data-store
+        ;; will be set!
+        (tree-buffer-set-data-store (list (cons 'source-buffer curr-buff)
+                                          (cons 'source-major-mode curr-major-mode)
+                                          (cons 'semantic-symbol->name-assoc-list
+                                                curr-semantic-symbol->name-assoc-list)))
+        ;; To ensure cleaning out the methods-display for non-semantic-sources
+        ;; when non-semantic-parsing is disabled or such a source is not
+        ;; parsable we set cache to an empty tree. As a side effect this fixes
+        ;; a bug with XEmacs which has the annoying behavior that even
+        ;; semantic-sources are processed twice here when loading such a
+        ;; source whereas the first time semantic is not active; without this
+        ;; dummy-cache we would run in setting the tree-buffer-root to nil
+        ;; which would cause a wrong-argument-type arrayp nil error!
+        (unless cache
+          (setq cache (cons cache-key (tree-node-new-root))))
+        (tree-buffer-set-root (cdr cache))
+        (setq ecb-methods-root-node (cdr cache))
+        (tree-buffer-update))
+      
+      (ecb-mode-line-format)
+
+      (if tag-sync-necessary
+          (ecb-tag-sync 'force))
+      )
+    
+    ;; Klaus Berndl <klaus.berndl@sdm.de>: after a full reparse all overlays
+    ;; stored in the dnodes of the navigation-list now are invalid. Therefore
+    ;; we have changed the implementation of ecb-navigate.el from storing
+    ;; whole tags to storing buffer and start- and end-markers!
+    ;; Just for information also remarked here.
+    
+    ;; signalize that the rebuild has already be done
+    (setq ecb-method-buffer-needs-rebuild nil))
+
+  ;; prevent from allowing rebuilding for invisible buffers unless it is
+  ;; explicitly demanded
+  (setq ecb-method-buffer-rebuild-allowed-for-invisible-buffers nil))
+
+(defun ecb-save-without-auto-update-methods ()
+  (let ((ecb-auto-update-methods-after-save nil))
+    (save-buffer)))
+
+
+(defun ecb-rebuild-methods-buffer-for-non-semantic ()
+  "Rebuild the ECB-method-buffer for current source-file of the edit-window.
+This function does nothing if point stays not in an edit-window of the
+ECB-frame or if current source-file is supported by semantic!
+
+Before rebuilding the Methods-buffer the hook
+`ecb-rebuild-non-semantic-methods-before-hook' is called. The Method-buffer is
+only rebuild if either the hook contains no function \(the default) or if no
+function of this hook returns nil! See `run-hook-with-args-until-failure' for
+description how these function are pressed.
+
+The option `ecb-auto-save-before-etags-methods-rebuild' is checked before
+rescanning the source-buffer and rebuilding the methods-buffer.
+
+This function is called by the command `ecb-rebuild-methods-buffer'."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame)
+             (not (ecb--semantic-active-p))
+             (not (member major-mode ecb-non-semantic-exclude-modes))
+             (ecb-point-in-edit-window-number))
+    (when (run-hook-with-args-until-failure
+           'ecb-rebuild-non-semantic-methods-before-hook
+           (ecb-buffer-file-name))
+      ;; For etags supported non-semantic-sources we maybe have to save the
+      ;; buffer first.
+      (when (and (buffer-modified-p)
+                 (not (and (boundp 'imenu--index-alist)
+                           imenu--index-alist))
+                 (or (equal ecb-auto-save-before-etags-methods-rebuild t)
+                     (member major-mode
+                             ecb-auto-save-before-etags-methods-rebuild)))
+        ;; to prevent files from being parsed too often we need to temp.
+        ;; switch off the auto-method-updating-after-save feature
+        (ecb-save-without-auto-update-methods))
+      (ecb-update-methods-buffer--internal nil t))))
+
+
+(defun ecb-rebuild-methods-buffer-for-semantic (&optional clear-cache)
+  "Rebuild the ECB-method-buffer for current source-file of the edit-window.
+This function does nothing if point stays not in an edit-window of the
+ECB-frame or if current source-file is not supported by semantic!
+
+If optional arg CLEAR-CACHE is not nil the semantic-cache is cleared before
+reparsing."
+  (when (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame)
+             (ecb--semantic-active-p)
+             (ecb-point-in-edit-window-number))
+    (and clear-cache (ecb--semantic-clear-toplevel-cache))
+    (ecb-update-methods-buffer--internal nil nil t)))
+
+
+(defun ecb-rebuild-methods-buffer (&optional clear-cache)
+  "Updates the methods buffer with the current source-buffer.
+This means ECB asks the parsing-engine for tags for the current
+source-buffer and rebuilds its methods-buffer with the tag-set
+returned by the parsing-engine \(semantic for semantic-sources
+and imenu rsp. etags for non-semantic-sources). For
+semantic-sources this command ignores the
+`semantic-idle-scheduler-mode' and therefore also all settings in
+`semantic-idle-scheduler-max-buffer-size' so be aware that this
+command will also parse huge files!
+
+If called with a prefix-arg \(ie. if optional arg CLEAR-CACHE is not nil) the
+complete previous parser-information is deleted before, means no
+semantic-cache is used! This argument takes only effect for semantic-sources.
+
+Point must stay in an edit-window otherwise nothing is done. This method is
+merely needed in the following situations:
+
++ To force parsing huge files with slow parsers when such files are excluded
+  from parsing via `semantic-idle-scheduler-max-buffer-size' - see above.
+
++ If an elisp-file is parsed which contains in the middle a defun X where the
+  closing ) is missing then semantic parses only until this defun X is reached
+  and you will get an incomplete ECB-method buffer. In such a case you must
+  complete the defun X and then call this function to completely reparse the
+  elisp-file and rebuild the ECB method buffer!
+
++ For not semantic supported buffers which can be parsed by imenu or etags
+  \(see `ecb-process-non-semantic-files') because for these buffers there is
+  no built-in auto-rebuild mechanism. For these buffers this command calls
+  `ecb-rebuild-methods-buffer-for-non-semantic'.
+
+For non-semantic-sources supported by etags the option
+`ecb-auto-save-before-etags-methods-rebuild' is checked before rescanning the
+source-buffer and rebuilding the methods-buffer.
+
+If point is in one of the ecb-windows or in the compile-window then this
+command rebuids the methods-buffer with the contents of the source-buffer the
+last selected edit-window."
+  (interactive "P")
+  (save-selected-window
+    (when (not (ecb-point-in-edit-window-number))
+      (let ((ecb-mouse-click-destination 'last-point))
+        (ecb-select-edit-window)))
+    (ecb-rebuild-methods-buffer-fully clear-cache)))
+
+(defun ecb-rebuild-methods-buffer-fully (&optional clear-cache)
+  "Rebuilds the methods buffer with current content of the source-buffer.
+This can cause a full reparse! No idle-parsing but immediate parsing because
+the tags are fetched by `ecb--semantic-fetch-tags' for semantic-sources!
+
+If called with a prefix-arg \(ie. if optional arg CLEAR-CACHE is not nil) the
+complete previous parser-information is deleted before parsing, means no
+semantic-cache is used! This argument takes only effect for semantic-sources.
+
+Point must stay in an edit-window otherwise nothing is done."
+  (when (ecb-point-in-edit-window-number)
+    (if (ecb--semantic-active-p)
+        (let ((semantic-idle-scheduler-max-buffer-size 0))
+          (ecb-rebuild-methods-buffer-for-semantic clear-cache))
+      (ecb-rebuild-methods-buffer-for-non-semantic))))
+
+(defvar ecb-auto-expand-tag-tree-old 'expand-spec)
+
+(defun ecb-toggle-auto-expand-tag-tree (&optional arg)
+  "Toggle auto expanding of the ECB-methods-buffer.
+With prefix argument ARG, switch on if positive, otherwise switch off. If the
+effect is that auto-expanding is switched off then the current value of
+`ecb-auto-expand-tag-tree' is saved so it can be used for the next switch on
+by this command."
+  (interactive "P")
+  (let* ((new-value (if (null arg)
+                        (if ecb-auto-expand-tag-tree
+                            (progn
+                              (setq ecb-auto-expand-tag-tree-old
+                                    ecb-auto-expand-tag-tree)
+                              nil)
+                          ecb-auto-expand-tag-tree-old)
+                      (if (<= (prefix-numeric-value arg) 0)
+                          (progn
+                            (if ecb-auto-expand-tag-tree
+                                (setq ecb-auto-expand-tag-tree-old
+                                      ecb-auto-expand-tag-tree))
+                            nil)
+                        (or ecb-auto-expand-tag-tree
+                            ecb-auto-expand-tag-tree-old)))))
+    (setq ecb-auto-expand-tag-tree new-value)
+    (message "Auto. expanding of the methods-buffer is switched %s \(Value: %s\)."
+             (if new-value "on" "off")
+             new-value)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Define this with define-overload
+;; when the cedet 1.0 is stable - then we can remove the semantic 1.4 support
+;; - but first when cedet 1.0 is also available as XEmacs-package!
+(defun ecb-get-real-curr-tag ()
+  "Get the \"real\" current tag. This will be in most cases the tag returned
+by `ecb--semantic-current-tag' but there are exceptions:
+
+- If the current-tag is an argument-tag of a function-tag then we are not
+  interested in this argument-tag but in its parent-tag which is the
+  function-tag the argument belongs.
+- If the current-tag is a label-tag then we are interested in the type-tag
+  which contains this label \(e.g. usefull in c++ and the labels public,
+  protected and private)."
+  (let* ((tagstack (reverse (ecb--semantic-find-tag-by-overlay)))
+         (curr-tag (car tagstack))
+         (next-tag (car (cdr tagstack)))
+         )
+    (if (or (and (equal (ecb--semantic-tag-class curr-tag) 'variable)
+                 (equal (ecb--semantic-tag-class next-tag) 'function)
+                 (member curr-tag
+                         (ecb--semantic-tag-function-arguments next-tag)))
+            (equal (ecb--semantic-tag-class curr-tag) 'label))
+        (setq curr-tag next-tag))
+    curr-tag))
+
+
+(defun ecb-try-highlight-tag (highlight-tag curr-tag table)
+  "First we try to expand only the absolute needed parts of the tree-buffer to
+highlight the tag HIGHLIGHT-TAG - this means we recursively go upstairs the
+ladder of types the current tag belongs to. If this has still no success then
+we return nil otherwise true \(the HIGHLIGHT-TAG is highlighted).
+
+If called from program: HIGHLIGHT-TAG is the tag to highlight, CURR-TAG has to
+be equal to HIGHLIGHT-TAG and TABLE must be the current tag-table of the
+current buffer."
+  (let* ((type-tag (and curr-tag
+                        (ecb-get-type-tag-of-tag curr-tag table t)))
+         (bucket-data
+          (and (not type-tag)
+               (list 'ecb-bucket-node
+                     (cdr (assoc (or (and (ecb--semantic-tag-prototype-p highlight-tag)
+                                          'prototype)
+                                     (ecb--semantic-tag-class highlight-tag))
+                                 (ecb-methods-get-data-store
+                                  'semantic-symbol->name-assoc-list)))
+                     (ecb--semantic-tag-class highlight-tag))))
+         (type-node nil))
+    (or (and curr-tag
+             (ecb-exec-in-window ecb-methods-buffer-name
+               (or (tree-buffer-highlight-node-by-data/name
+                    highlight-tag nil nil
+                    (equal ecb-highlight-tag-with-point 'highlight))
+                   ;; If the tag could not be highlighted and if there is no
+                   ;; containing type for this tag then this tag is probably
+                   ;; contained in a toplevel bucket. Then we search the
+                   ;; bucket-node for the tag if this tag-class is specified
+                   ;; as expanded or collapsed (ie not flattened or hidden
+                   ;; because in these cases no bucket would exist). If we
+                   ;; find the bucket-node then we expand only this
+                   ;; bucket-node and try highlighting again.
+                   (when (and highlight-tag
+                              bucket-data ;; tag has no containing type
+                              ;;(member (car (cdr (assoc (ecb--semantic-tag-class highlight-tag)
+                              ;;                         (ecb-get-show-tags-list))))
+                              ;;        '(expanded collapsed))
+                              (or (equal ecb-auto-expand-tag-tree 'all)
+                                  (member (ecb--semantic-tag-class highlight-tag)
+                                          (ecb-normalize-expand-spec
+                                           ecb-methods-nodes-expand-spec))))
+                     (let ((bucket-node
+                            (tree-buffer-search-displayed-node-list
+                             (function (lambda (node)
+                                         (if (and (tree-buffer-node-data-equal-p
+                                                   (tree-node->data node)
+                                                   bucket-data)
+                                                  (eq (tree-buffer-get-root)
+                                                      (tree-node->parent node)))
+                                             node))))))
+                       (when bucket-node
+                         (ecb-expand-methods-node-internal
+                          bucket-node
+                          100
+                          (equal ecb-auto-expand-tag-tree 'all)
+                          nil t)
+                         (tree-buffer-highlight-node-by-data/name
+                          highlight-tag nil nil
+                          (equal ecb-highlight-tag-with-point 'highlight)))))
+                   ;; The node representing HIGHLIGHT-TAG could not be
+                   ;; highlighted by `tree-buffer-highlight-node-by-data/name' -
+                   ;; probably it is invisible. Let's try to make expand its
+                   ;; containing type (if there is any) and then highlighting
+                   ;; again.
+                   (when (and highlight-tag
+                              type-tag
+                              (or (equal ecb-auto-expand-tag-tree 'all)
+                                  (member (ecb--semantic-tag-class highlight-tag)
+                                          (ecb-normalize-expand-spec
+                                           ecb-methods-nodes-expand-spec))))
+                     (setq type-node (tree-buffer-find-displayed-node-by-data/name type-tag))
+                     (when type-node
+                       (ecb-expand-methods-node-internal
+                        type-node
+                        ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Maybe we
+                        ;; should not immediately fully expand the type but
+                        ;; in two steps:
+                        ;; 1. We expand only the first level of the type and
+                        ;;    check if the tag is contained in a flattended
+                        ;;    bucket. If yes we will have success and are
+                        ;;    finished because the tag must be contained in
+                        ;;    the type-tag. If no we go to step 2.
+                        ;; 2. because the tag MUST be contained in that
+                        ;;    type-node we now know that it must be contained
+                        ;;    in a collapsed bucket-subnode of this
+                        ;;    type-node. So we have to expand this
+                        ;;    bucket-subnode (similar to the mechanism above)
+                        ;;    and then try again...
+                        100
+                        (equal ecb-auto-expand-tag-tree 'all)
+                        nil t)
+                       (tree-buffer-highlight-node-by-data/name
+                        highlight-tag nil nil
+                        (equal ecb-highlight-tag-with-point 'highlight))
+                       )))))
+        (if curr-tag
+            (ecb-try-highlight-tag highlight-tag type-tag table)))))
+
+(defvar ecb-tag-sync-do-nothing nil
+  "Only set by `ecb-display-tag' and only evaluated by `ecb-tag-sync'")
+
+;; This approach only expands the needed parts of the tree-buffer when
+;; the current-tag is not visible as node and not the whole tree-buffer.
+
+(defecb-autocontrol/sync-function ecb-tag-sync ecb-methods-buffer-name nil nil
+  "Synchronizing tag-display of the methods-buffer with current point."
+  (if nil ;; ecb-tag-sync-do-nothing
+      ;; user has selected a tag via the Methods-window so there is nothing
+      ;; to sync - we must prevent from syncing here because in some modes
+      ;; the point stays after a click outside of the selected tag (see
+      ;; `ecb-tag-visit-post-actions') and if we would sync then in the
+      ;; methods-buffer the selected tag will be unhighlighted and the
+      ;; surrounding one will be highlighted (e.g. java the class of the
+      ;; tag). But we must reset this flag so the resync-mechanism runs
+      ;; next time...
+      ;; Klaus Berndl <klaus.berndl@sdm.de>: Now all functions of
+      ;; ecb-tag-visit-post-actions are forbidden to put the point outside
+      ;; of the tag-boundaries. Therefore we can now remove this mechanism
+      ;; so now synching can take place also after a click. But i let the
+      ;; code in because im not at 100% sure if there are other needs in ECB
+      ;; which need this mechanism - but for now we can disable it.... ;-)
+      (setq ecb-tag-sync-do-nothing nil)
+    (when ecb-highlight-tag-with-point
+      (let ((curr-tag (ecb-get-real-curr-tag)))
+        (when (or force (not (equal ecb-selected-tag curr-tag)))
+          (setq ecb-selected-tag curr-tag)
+          (if (null curr-tag)
+              (ecb-exec-in-window ecb-methods-buffer-name
+                ;; If there is no tag to highlight then we remove the
+                ;; highlighting
+                (tree-buffer-highlight-node-by-data/name nil)
+                (if (equal ecb-auto-expand-tag-tree-collapse-other 'always)
+                    ;; If this option is t (means always) we collapse also
+                    ;; when point is not on a tag!
+                    (ecb-expand-methods-node-internal
+                     (tree-buffer-get-root)
+                     -1
+                     (equal ecb-auto-expand-tag-tree 'all)
+                     nil t))
+                )
+            ;; Maybe we must first collapse all so only the needed parts are
+            ;; expanded afterwards. Klaus Berndl <klaus.berndl@sdm.de>: Is it
+            ;; necessary to update the tree-buffer after collapsing? IMO yes,
+            ;; because otherwise we set the expansion-state of the tree-buffer
+            ;; to all collapsed and if we find really nothing to highlight and
+            ;; do also no node-expanding (which would update the tree-buffer)
+            ;; then we have an inconsistent state - would be probably very
+            ;; seldom but could be - so let us be somehow paranoid ;-)
+            (if ecb-auto-expand-tag-tree-collapse-other
+                (ecb-exec-in-window ecb-methods-buffer-name
+                  (when (and curr-tag
+                             (or (equal ecb-auto-expand-tag-tree 'all)
+                                 (member (ecb--semantic-tag-class curr-tag)
+                                         (ecb-normalize-expand-spec
+                                          ecb-methods-nodes-expand-spec))))
+                    (ecb-expand-methods-node-internal
+                     (tree-buffer-get-root)
+                     -1
+                     (equal ecb-auto-expand-tag-tree 'all)
+                     nil t))))
+            ;; First we try to expand only the absolute needed parts - this
+            ;; means we go upstairs the ladder of types the current tag
+            ;; belongs to. If there is no containing type then we try to
+            ;; expand only the containing toplevel bucket. If this has no
+            ;; success then we expand the full tree-buffer and try it again.
+            (when (not (ecb-try-highlight-tag curr-tag curr-tag
+                                              (ecb-get-current-tag-table)))
+              ;; The node representing CURR-TAG could not be highlighted by
+              ;; `tree-buffer-highlight-node-by-data/name' - probably it is still
+              ;; invisible. Let's try to make visible all nodes and then
+              ;; highlighting again.
+              (ecb-exec-in-window ecb-methods-buffer-name
+                (when (and curr-tag
+                           (or (equal ecb-auto-expand-tag-tree 'all)
+                               (member (ecb--semantic-tag-class curr-tag)
+                                       (ecb-normalize-expand-spec
+                                        ecb-methods-nodes-expand-spec))))
+                  (ecb-expand-methods-node-internal
+                   (tree-buffer-get-root)
+                   100 ;; this should be enough levels ;-)
+                   (equal ecb-auto-expand-tag-tree 'all)
+                   nil t)
+                  (tree-buffer-highlight-node-by-data/name
+                   curr-tag nil nil (equal ecb-highlight-tag-with-point 'highlight)))
+                ))))))))
+
+
+(defun ecb-string-make-singular (string)
+  (if (equal (aref string (1- (length string))) ?s)
+      (substring string 0 (1- (length string)))
+    string))
+
+
+(defun ecb-methods-node-get-semantic-type (node)
+  (cond ((= ecb-methods-nodetype-bucket (tree-node->type node))
+         (nth 2 (tree-node->data node)))
+        ((= ecb-methods-nodetype-tag (tree-node->type node))
+         (ignore-errors (ecb--semantic-tag-class (tree-node->data node))))
+        (t nil)))
+
+
+(defun ecb-expand-methods-nodes (&optional force-all)
+  "Set the expand level of the nodes in the ECB-methods-buffer.
+This command asks in the minibuffer for an indentation level LEVEL. With this
+LEVEL you can precisely specify which level of nodes should be expanded. LEVEL
+means the indentation-level of the nodes.
+
+A LEVEL value X means that all nodes with an indentation-level <= X are
+expanded and all other are collapsed. A negative LEVEL value means all visible
+nodes are collapsed.
+
+Nodes which are not indented have indentation-level 0!
+
+Which node-types are expanded \(rsp. collapsed) by this command depends on
+the options `ecb-methods-nodes-expand-spec' and
+`ecb-methods-nodes-collapse-spec'! With optional argument FORCE-ALL all tags
+will be expanded/collapsed regardless of the values of these options.
+
+Examples:
+- LEVEL = 0 expands only nodes which have no indentation itself.
+- LEVEL = 2 expands nodes which are either not indented or indented once or
+  twice
+- LEVEL ~ 10 should normally expand all nodes unless there are nodes which
+  are indented deeper than 10.
+
+Note 1: This command switches off auto. expanding of the method-buffer if
+`ecb-expand-methods-switch-off-auto-expand' is not nil. But it can be switched
+on again quickly with `ecb-toggle-auto-expand-tag-tree' or \[C-c . a].
+
+Note 2: All this is only valid for file-types parsed by semantic. For other
+file types which are parsed by imenu or etags \(see
+`ecb-process-non-semantic-files') FORCE-ALL is always true!"
+  (interactive "P")
+  (let* ((first-node (save-excursion
+                       (goto-char (point-min))
+                       (tree-buffer-get-node-at-point)))
+         (level (ecb-read-number
+                 "Expand indentation-level: "
+                 (if (and first-node
+                          (tree-node->expandable first-node)
+                          (tree-node->expanded first-node))
+                     -1
+                   10))))
+    ;; here we should switch off autom. expanding tag-tree because otherwise
+    ;; our expanding to a certain level takes no effect because if the current
+    ;; tag in the edit-buffer would be invisible afterwards (after the
+    ;; expanding/collapsing) then immediately the tag would be autom.
+    ;; expanded to max level...
+    (when ecb-expand-methods-switch-off-auto-expand
+      (ecb-toggle-auto-expand-tag-tree -1))
+    (ecb-expand-methods-node-internal (save-excursion
+                                         (set-buffer ecb-methods-buffer-name)
+                                         (tree-buffer-get-root))
+                                       level force-all t t)))
+
+(defun ecb-expand-methods-node-internal (node level
+                                               &optional force-all
+                                               resync-tag update-tree-buffer)
+  "Set the expand level of NODE and its subnodes in the ECB-methods-buffer.
+
+If NODE is equal to the root-node of the methods-tree-buffer then this
+function will be called for each of the root-children. Otherwise it will only
+expand/collaps NODE.
+
+For a description of LEVEL see `tree-buffer-expand-node' and for a description
+of FORCE-ALL see `ecb-expand-methods-nodes'.
+
+If RESYNC-TAG is not nil then after expanding/collapsing the methods-buffer
+is resynced to the current tag of the edit-window.
+
+If UPDATE-TREE-BUFFER is not nil then the methods-tree-buffer will be updated
+after the expansion.
+
+Note: All this is only valid for file-types parsed by semantic. For other file
+types which are parsed by imenu or etags \(see
+`ecb-process-non-semantic-files') FORCE-ALL is always true!"
+  ;; for buffers which are not parsed by semantic we always set force-all to
+  ;; t! We "misuse" (ecb-methods-get-data-store
+  ;; 'semantic-symbol->name-assoc-list) to decide if a buffer is parsed by
+  ;; semantic or not because only semantic-parsed buffers can have a value
+  ;; not nil!
+  (setq force-all
+        (if (not (ecb-methods-get-data-store 'semantic-symbol->name-assoc-list))
+            t
+          force-all))
+  (ecb-exec-in-window ecb-methods-buffer-name
+    (let ( ;; normalizing the elements of `ecb-methods-nodes-expand-spec'
+          ;; and `ecb-methods-nodes-collapse-spec'.
+          (norm-expand-types (ecb-normalize-expand-spec
+                              ecb-methods-nodes-expand-spec))
+          (norm-collapse-types (ecb-normalize-expand-spec
+                                ecb-methods-nodes-collapse-spec))
+          (node-list (if (equal node (tree-buffer-get-root))
+                         (tree-node->children (tree-buffer-get-root))
+                       (list node))))
+      (dolist (node node-list)
+        (tree-buffer-expand-node
+         node
+         level
+         (and (not force-all)
+              (function (lambda (node current-level)
+                          (or (equal norm-expand-types 'all)
+                              (member (ecb-methods-node-get-semantic-type node)
+                                      norm-expand-types)))))
+         (and (not force-all)
+              (function (lambda (node current-level)
+                          (or (equal norm-collapse-types 'all)
+                              (member (ecb-methods-node-get-semantic-type node)
+                                      norm-collapse-types)))))))
+      (if update-tree-buffer
+          (tree-buffer-update)
+        (ecb-scroll-window (point-min) (point-min)))))
+
+  ;; we want resync the new method-buffer to the current tag in the
+  ;; edit-window.
+  (if resync-tag (ecb-tag-sync 'force)))
+
+
+
+(defun ecb-normalize-expand-spec (spec)
+  (if (equal 'all spec)
+      'all
+    (mapcar (function (lambda (elem)
+                        (intern
+                         (downcase (ecb-string-make-singular
+                                    (symbol-name elem))))))
+            spec)))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: modify this so it can be used by
+;; ecb-find-external-tag-functions - currently not used
+(defun ecb-semantic-tag-external-class-default (tag)
+  "Return a list of real tags that faux TAG might represent.
+See `semantic-tag-external-class' for details."
+  (if (and (fboundp 'semanticdb-minor-mode-p)
+	   (semanticdb-minor-mode-p))
+      (let* ((semanticdb-search-system-databases nil)
+	     (m (semanticdb-find-tags-by-class 
+		 (semantic-tag-class tag)
+		 (semanticdb-find-tags-by-name (semantic-tag-name tag)))))
+	(semanticdb-strip-find-results m))
+    ;; Presumably, if the tag is faux, it is not local.
+    nil
+    ))
+
+
+;; ;; semantic 1.X does not have this
+(silentcomp-defvar semanticdb-search-system-databases)
+
+(defun ecb-semanticdb-find-result-nth-with-file (result n)
+  "In RESULT, return the Nth search result.
+This is a 0 based search result, with the first match being element 0. Returns
+a cons cell with car is the searched and found tag and the cdr is the
+associated full filename of this tag. If the search result is not associated
+with a file, then the cdr of the result-cons is nil."
+  (let ((result-nth (ecb--semanticdb-find-result-nth result n)))
+    (if (and (car result-nth)
+             (ecb--semantic-tag-with-position-p (car result-nth))
+             (cdr result-nth))
+        (cons (car result-nth)
+              (ecb--semanticdb-full-filename (cdr result-nth)))
+      (cons (car result-nth) nil))))
+
+(defun ecb-semanticdb-get-type-definition-list (external-tag)
+  "Search for the definition of the type with name of EXTERNAL-TAG.
+The search is performed viy semanticdb.
+`semanticdb-search-system-databases' is taken into account.
+Return-value is either nil \(if no positioned tag can be found
+for external-tag or a positioned semantic-tag for the
+type-definition of EXTERNAL-TAG."
+  (when (and (featurep 'semanticdb) (ecb--semanticdb-minor-mode-p))
+    ;; With semantic 2.X we do a full featured database-search.
+    (let* ((search-result (ecb--semanticdb-find-tags-by-name
+                           (ecb--semantic-tag-name external-tag)))
+           (result-tags (and search-result
+                             (ecb--semanticdb-strip-find-results search-result)))
+           (type-tag-numbers nil))
+      (when (and result-tags
+                 ;; some paranoia
+                 (= (length result-tags)
+                    (ecb--semanticdb-find-result-length search-result)))
+        ;; First we check which tags in the stripped search-result
+        ;; (result-tags) are types with positions (means associated with a
+        ;; file) and collect their sequence-positions in type-tag-numbers.
+        (dotimes (i (length result-tags))
+          (if (and (equal (ecb--semantic-tag-class (nth i result-tags))
+                          'type)
+                   (ecb--semantic-tag-with-position-p (nth i result-tags)))
+              (setq type-tag-numbers
+                    (cons i type-tag-numbers))))
+        (setq type-tag-numbers (nreverse type-tag-numbers))
+        ;; Now we get for each element in type-tag-numbers the related
+        ;; filename (where the tag is defined) and collect them in an alist
+        ;; where each element is a cons-cell where car is the filename and
+        ;; cdr is the tag in this file. Especially with scoped languages
+        ;; like C++ or Java a type with the same name can be defined in more
+        ;; than one file - each of these files belonging to another
+        ;; package/library.
+        (delq nil
+              (mapcar (function (lambda (n)
+                                  (let ((r (ecb-semanticdb-find-result-nth-with-file
+                                            search-result n)))
+                                    (if (and (cdr r)
+                                             (stringp (cdr r))
+                                             (ecb-file-readable-p (cdr r)))
+                                        (cons (cdr r) (car r))))))
+                      type-tag-numbers))))))
+
+(defun ecb-search-tag-by-semanticdb (external-tag)
+  "Uses semanticdb to search for the type-definition of EXTERNAL-TAG.
+Return exactly one semantic tag for the type-definition of
+EXTERNAL-TAG. If more than one definition have been found then
+the user has to make a choice on file-basis.
+
+This function is for usage with `ecb-find-external-tag-functions.'"
+  (let ((type-definition-alist (ecb-semanticdb-get-type-definition-list
+                                external-tag))
+        (result-elem))
+    (when type-definition-alist
+      ;; if we got more than one file for EXTERNAL-TAG then the user has to
+      ;; choose one.
+      (setq result-elem
+            (if (> (length type-definition-alist) 1)
+                (assoc (ecb-offer-choices "Select a definition-file: "
+                                          (mapcar #'car type-definition-alist))
+                       type-definition-alist)
+              (car type-definition-alist)))
+      ;; we add the filename to the tag, then all needed informations are
+      ;; within the tag and afterwards `semantic-tag-buffer can do its work
+      (semantic--tag-put-property (cdr result-elem)
+                                  :filename
+                                  (car result-elem)))))
+
+(defun ecb-search-tag-by-semantic-analyzer (tag)
+  "Calculate the scope at current point and search for a type with name of TAG.
+
+Return either a positioned semantic-tag for the found
+type-definition or nil if nothing is found. This mechanism uses
+the semantic-analyzer. Therefore it will work at its best if all
+nneded customizations for the semantic analyzer have been done.
+\(See the manual of the semantic analyzer for how to customizing
+it).
+
+This function is for usage with `ecb-find-external-tag-functions'."
+  (let* ((scope (ecb--semantic-calculate-scope)))
+    (when scope
+      (ecb--semantic-analyze-find-tag (ecb--semantic-tag-name tag)
+                                      'type scope))))
+
+(defun ecb-next-tag-parent-node (node)
+  "Go upward in the parent-hierarchy of NODE and return next node holding a tag."
+  (let ((parent-node (tree-node->parent node)))
+    (cond ((null parent-node) nil)
+          ((= (tree-node->type parent-node) ecb-methods-nodetype-tag)
+           parent-node)
+          (t (ecb-next-tag-parent-node parent-node)))))
+
+;; (defun klaus-ecb-test-ext-function (tag)
+;;   (progn
+;;     (find-file "~/klaus.cc")
+;;     t))
+
+(defecb-tree-buffer-callback ecb-method-clicked ecb-methods-buffer-name select
+                             (&optional no-post-action additional-post-action-list)
+  "Does all necessary when a user clicks onto a node in the methods-buffer."
+  (if shift-mode
+      (ecb-mouse-over-method-node node nil nil 'force))
+  ;; First of all we must highlight the tag
+  (tree-buffer-highlight-node-by-data/name (tree-node->data node))
+  (if (= (tree-node->type node) ecb-methods-nodetype-bucket)
+      ;; Type ecb-methods-nodetype-bucket = a title of a group
+      ;; Just expand/collapse the node
+      (progn
+        (tree-node-toggle-expanded node)
+        ;; Update the tree-buffer with optimized display of NODE
+        (tree-buffer-update node))
+    ;; from now on we have as node-data either semantic-tags or plain strings
+    ;; holding typenames (e.g. for parents of type-tags).
+    ;; we normalize these two data-possibilities by converting plain strings in
+    ;; semantic-tags of class 'type ==> we can operate always on semantic-tags!
+    (let ((node-tag (if (ecb--semantic-tag-p (tree-node->data node))
+                        (tree-node->data node)
+                      (ecb--semantic-tag (tree-node->data node) 'type)))
+          (node-type (tree-node->type node))
+          ;; destination-source will be later to a source in the sense of
+          ;; `ecb-source-make'
+          (destination nil))
+      ;; first we process include-tags and try to find the related
+      ;; included file
+      (unless destination
+        (when (equal 'include (ecb--semantic-tag-class node-tag))
+          (save-excursion
+            (set-buffer (ecb-path-selected-source 'buffer))
+            (let ((file (ecb--semantic-dependency-tag-file node-tag)))
+              (when (and file (ecb-file-exists-p file))
+                (setq destination (list (ecb-source-make file)
+                                        nil)))))))
+
+      ;; now we process faux-tags and external tags like parent-types
+      (unless destination
+        (when (or (= node-type ecb-methods-nodetype-externtag)
+                  (and (ecb--semantic-tag-p node-tag)
+                       (ecb--semantic-tag-faux-p node-tag)))
+          (save-excursion
+            ;; tag-to-go:
+            ;; - In case of a faux-tag it's the first child of the faux-tag -
+            ;;   there must be at least one adopted child-tag because
+            ;;   otherwise we would not have the faux-tag
+            ;; - In case of an external tag its the external tag itself
+            ;;
+            ;; parent-tag-of-tag-to-go:
+            ;; - In case of a faux-tag it's nil because the faux-tag is
+            ;;   virtual and doesn't exists in the source-buffer; so it can
+            ;;   not have an enclosing parent-tag
+            ;; - In case of an external tag it's the next upward enclosing tag
+            ;;   - we can get this be climbing the node-tree upwards until we
+            ;;     find a node with node-type tag            
+            (let ((tag-to-go (if (ecb--semantic-tag-faux-p node-tag)
+                                 (car (ecb--semantic-tag-children-compatibility
+                                       node-tag t))
+                               ;; in case of an external tag
+                               node-tag))
+                  (parent-tag-of-tag-to-go (and (= node-type ecb-methods-nodetype-externtag)
+                                                (tree-node->data (ecb-next-tag-parent-node node))))
+                  found)
+              (when tag-to-go
+                (ecb--semantic-go-to-tag tag-to-go parent-tag-of-tag-to-go)
+                ;; now we stay at the right location (child of the faux-tag
+                ;; rsp. the clicked parent-pseudo-tag)
+                ;; Now we search for the clicked node-tag via the functions
+                ;; defined in `ecb-find-external-tag-functions' until one of
+                ;; them returns not nil
+                (setq found (catch 'foundit
+                              (dolist (f (append (cdr (assoc major-mode ecb-find-external-tag-functions))
+                                                 (cdr (assoc 'default ecb-find-external-tag-functions))))
+                                (let ((f-result (funcall f node-tag)))
+                                  (if f-result (throw 'foundit f-result))))
+                              nil))
+                (setq destination
+                      (cond ((and (ecb--semantic-tag-p found)
+                                  (ecb--semantic-tag-with-position-p found))
+                             (list (ecb-source-make (ecb-buffer-file-name
+                                                     (ecb-semantic-tag-buffer found))
+                                                    (ecb-semantic-tag-buffer found))
+                                   found))
+                            ;; founded and already displayed!
+                            ((equal found t) t)
+                            ;; in all other cases we assess the result as not found
+                            (t nil))))))))
+
+      ;; now we process positionless tags like slots of an elisp-defclass...
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe in the future..
+
+      (unless destination
+        (when (and (ecb--semantic-tag-p node-tag)
+                   (ecb--semantic-tag-with-position-p node-tag)
+                   ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Currently we
+                   ;; comment out this check because in some cases the tag is
+                   ;; positioned only with start and end but without a
+                   ;; buffer-info...
+                   ;; Normally all these tags must reside in the current
+                   ;; selected source-buffer so we can switch off this
+                   ;; check...
+                   ;; Maybe in the future we switch it on when semantic is
+                   ;; able to deal with indirect buffers...
+;;                    (equal (ecb-semantic-tag-buffer node-tag)
+;;                           (ecb-path-selected-source 'buffer))
+                   )
+          (setq destination (list (ecb-source-make (ecb-buffer-file-name
+                                                    (ecb-path-selected-source 'buffer))
+                                                   (ecb-path-selected-source 'buffer))
+                                  node-tag))))
+
+      (when (and destination (listp destination))
+        (ecb-display-tag (nth 0 destination) ;; the source
+                         (nth 1 destination) ;; a tag or nil
+                         (ecb-get-edit-window
+                          (ecb-combine-ecb-button/edit-win-nr ecb-button edit-window-nr))
+                         no-post-action
+                         (if (and shift-mode
+                                  (not (member 'ecb-tag-visit-narrow-tag
+                                               additional-post-action-list)))
+                             (cons 'ecb-tag-visit-narrow-tag
+                                   additional-post-action-list)
+                           additional-post-action-list))))))
+
+
+(defun ecb-tag-visit-smart-tag-start (tag)
+  "Go to the real tag-name of TAG in a somehow smart way.
+This is especially needed for languages like c++ where a often used style is
+like:
+    void
+    ClassX::methodM\(arg1...)
+    \{
+      ...
+    \}
+Here we want to jump to the line \"ClassX::...\" and not to line \"void\".
+
+Returns point."
+  (goto-char (ecb-semantic-tag-start tag))
+  (beginning-of-line)
+  ;; We must bind the search to the max. of either the end-of-line-pos or the
+  ;; tag-end, because in some languages the tag-name displayed in the
+  ;; Methods-buffer and returned by the parsing engine can not be found in the
+  ;; source-buffer. Perl is an example, because here imenu returns tag-names
+  ;; like <package>::<function> (e.g. bigfloat::norm) but in the source buffer
+  ;; only "sub <function>" (e.g. "sub norm...") can be found. So to avoid
+  ;; finding a wrong position in the source-buffer (e.g. if the tag-name
+  ;; returned by imenu is mentioned in a comment somewhere) we bind the
+  ;; search.
+  (search-forward (ecb--semantic-tag-name tag)
+                  (max (ecb-line-end-pos)
+                       (ecb-semantic-tag-end tag))
+                  t)
+  (beginning-of-line-text)
+  (point))
+
+
+(defun ecb-start-of-tag-doc (tag)
+  "If TAG has an outside documentation located direct before TAG then
+return the start of the documentation. Otherwise return nil"
+  ;; there can be an error if tag has no documentation - e.g.
+  ;; in elisp
+  (let ((comment (ignore-errors (ecb--semantic-documentation-for-tag tag
+                                                                     'flex))))
+    (if (and comment
+             (not (stringp comment)))
+        ;; probably we have a semantic flex-object
+        (ecb--semantic-lex-token-start comment))))
+
+
+(defun ecb-tag-visit-display-doc-start (tag)
+  "Display the beginning of the documentation of TAG if defined outside.
+This means move the window-start of current edit-window so the whole
+documentation is visible. But points still stays onto the tag-start!
+This is useful especially for languages like Java where the documentation
+resides direct before the TAG in Javadoc format.
+If the documentation is located within TAG then nothing is done.
+
+If this function is set in `ecb-tag-visit-post-actions' then it's strongly
+recommended not to add `ecb-tag-visit-recenter' or
+`ecb-tag-visit-recenter-top' after this this function!
+
+This action is not recommended for sources of type TeX, texinfo etc. So you
+should not add this action to the 'default element of
+`ecb-tag-visit-post-actions'!
+
+Returns current point."
+  (let ((tag-doc-start  (ecb-start-of-tag-doc tag)))
+    (when (and tag-doc-start
+               (not (pos-visible-in-window-p tag-doc-start)))
+      ;; tag-doc-start must be above the current window-start so we must must
+      ;; reset the window-start
+      (set-window-start (selected-window) tag-doc-start))
+;;      (goto-char tag-doc-start))
+    (point)))
+
+;; for backward-compatibility
+(defalias 'ecb-tag-visit-goto-doc-start 'ecb-tag-visit-display-doc-start)
+
+(defvar ecb-unhighlight-hook-called nil
+  "This mechanism is necessary because tree-buffer creates for mouse releasing a
+new nop-command \(otherwise the cursor jumps back to the tree-buffer).")
+
+
+(defun ecb-unhighlight-tag-header ()
+  (let ((key (ecb-event-to-key last-input-event)))
+    (when (not (or (and (equal key 'mouse-release)
+                        (not ecb-unhighlight-hook-called))
+                   (equal key 'mouse-movement)))
+      (ecb-overlay-delete ecb-method-overlay)
+      (remove-hook 'pre-command-hook 'ecb-unhighlight-tag-header)))
+  (setq ecb-unhighlight-hook-called t))
+
+
+(defun ecb-tag-visit-highlight-tag-header (tag)
+  "Highlights line where `ecb-tag-visit-smart-tag-start' puts point for
+TAG. Returns current point"
+  (save-excursion
+    (ecb-tag-visit-smart-tag-start tag)
+    (ecb-overlay-move ecb-method-overlay
+                      (ecb-line-beginning-pos)
+                      (ecb-line-end-pos)
+                      (current-buffer)))
+  (setq ecb-unhighlight-hook-called nil)
+  (add-hook 'pre-command-hook 'ecb-unhighlight-tag-header)
+  (point))
+
+
+(defun ecb-display-tag (source tag &optional window
+                               no-tag-visit-post-actions
+                               additional-post-action-list)
+  "Display SOURCE and go to TAG.
+SOURCE is a source in the sense of `ecb-source-make'. TAG is either nil \(then
+just the SOURCE is displayed) or a semantic-tag. If it is a positioned tag
+then this function goes to this TAG in SOURCE.
+If optional arg WINDOW is nil then the current window is used otherwise the
+window-object WINDOW contains.
+
+If NO-TAG-VISIT-POST-ACTIONS is not nil then the functions of
+`ecb-tag-visit-post-actions' are not performed. If
+ADDITIONAL-POST-ACTION-LIST is a list of function-symbols then these functions
+are performed after these ones of `ecb-tag-visit-post-actions'. So if
+NO-TAG-VISIT-POST-ACTIONS is not nil then only the functions of
+ADDITIONAL-POST-ACTION-LIST are performed. If ADDITIONAL-POST-ACTION-LIST is
+nil too then no post-actions are performed."
+  (unless window
+    (setq window (selected-window)))
+  (select-window window)
+  (ecb-nav-save-current)
+  ;; first display the right buffer
+  (switch-to-buffer (ecb-source-get-buffer source))
+  (if (null tag)
+      ;; there is no tag to display - we are already fine
+      (ecb-nav-add-item (ecb-nav-file-history-item-new))
+    ;; in the following we display the TAG
+    (when (ecb--semantic-tag-with-position-p tag)
+      (ecb-semantic-assert-valid-tag tag)
+      ;; let us set the mark so the user can easily jump back.
+      (if ecb-tag-jump-sets-mark
+          (push-mark nil t))
+      (widen)
+      (goto-char (ecb-semantic-tag-start tag))
+      ;; the following 2 lines prevent the autom. tag-sync-mechanism from
+      ;; starting.
+      (setq ecb-tag-sync-do-nothing t)
+      ;; Klaus Berndl <klaus.berndl@sdm.de>: See the comment in
+      ;; `ecb-tag-sync' for an explanation why this is now commented out.
+      ;; (setq ecb-selected-tag tag)
+      ;; process post action
+      (unless no-tag-visit-post-actions
+        ;; first the default post actions
+        (dolist (f (cdr (assoc 'default ecb-tag-visit-post-actions)))
+          (ecb-call-tag-visit-function tag f))
+        ;; now the mode specific actions
+        (dolist (f (cdr (assoc major-mode ecb-tag-visit-post-actions)))
+          (ecb-call-tag-visit-function tag f)))
+      ;; now we perform the additional-post-action-list
+      (dolist (f additional-post-action-list)
+        (ecb-call-tag-visit-function tag f))
+      ;; Klaus Berndl <klaus.berndl@sdm.de>: Now we use a different
+      ;; implementation of ecb-nav-tag-history-item. Not longer storing
+      ;; the whole tag but the tag-buffer and markers of tag-start
+      ;; and tag-end. This prevents the navigation-tree from getting
+      ;; unusable cause of invalid overlays after a full reparse!
+      (let* ((tag-buf (current-buffer))
+             (tag-name (ecb--semantic-tag-name tag))
+             (tag-start (move-marker (make-marker)
+                                     (ecb-semantic-tag-start tag) tag-buf))
+             (tag-end (move-marker (make-marker)
+                                   (ecb-semantic-tag-end tag) tag-buf)))
+        (ecb-nav-add-item (ecb-nav-tag-history-item-new
+                           tag-name
+                           tag-buf
+                           tag-start
+                           tag-end
+                           (member 'ecb-tag-visit-narrow-tag
+                                   additional-post-action-list)))))))
+
+
+(defun ecb-mouse-over-method-node (node &optional window no-message click-force)
+  "Displays help text if mouse moves over a node in the method buffer or if
+CLICK-FORCE is not nil and always with regards to the settings in
+`ecb-methods-show-node-info'. NODE is the node for which help text should be
+displayed, WINDOW is the related window, NO-MESSAGE defines if the help-text
+should be printed here."
+  (let ((str (when (or click-force
+                       (ecb-show-minibuffer-info node window
+                                                 (car ecb-methods-show-node-info)))
+               (concat
+                (tree-node->name node)
+                (if (and (= ecb-methods-nodetype-tag
+                            (tree-node->type node))
+                         (tree-node->data node)
+                         (equal (cdr ecb-methods-show-node-info) 'name+type))
+                    (concat ", "
+                            (symbol-name (ecb--semantic-tag-class
+                                          (tree-node->data node))))
+                  "")))))
+    (prog1 str
+      (unless no-message
+        (ecb-nolog-message str)))))
+
+;;; popup-menu stuff for the methods-buffer
+
+(defun ecb-call-tag-visit-function (tag fcn)
+  "Call FCN with TAG as argument and check if the resulting point is between
+the tag-boundaries of TAG. If yes, then go to this point if no point stays at
+the location before calling FCN."
+  (when (fboundp fcn)
+    (let* ((start (ecb--semantic-tag-start tag))
+           (end (ecb--semantic-tag-end tag))
+           (result-point (save-excursion
+                           (funcall fcn tag))))
+      (if (and (>= result-point start)
+               (<= result-point end))
+          (goto-char result-point)
+        (ecb-warning "The tag-visit-function `%s' moves point outside of tag - ignored!"
+                     fcn)))))
+
+(defun ecb-tag-visit-narrow-tag (tag)
+  "Narrow the source buffer to TAG.
+If an outside located documentation belongs to TAG and if this documentation
+is located direct before TAG \(e.g. Javadoc in Java) then this documentation
+is included in the narrow.
+
+Returns current point."
+  (when (not (ecb-speedbar-sb-tag-p tag))
+    (narrow-to-region (or (ecb-start-of-tag-doc tag)
+                          (ecb-semantic-tag-start tag))
+                      (ecb-semantic-tag-end tag)))
+  (point))
+
+
+(defun ecb-tag-visit-recenter (tag)
+  "Recenter the source-buffer, so current line is in the middle of the window.
+If this function is added to `ecb-tag-visit-post-actions' then it's
+recommended to add this function add the end of the action list for 'default
+or a `major-mode' and not to add the function `ecb-tag-visit-recenter-top'
+too!
+
+Returns current point."
+  (set-window-start
+   (selected-window)
+   (ecb-line-beginning-pos (- (/ (ecb-window-full-height) 2))))
+  (point))
+
+(defun ecb-tag-visit-recenter-top (tag)
+  "Recenter the source-buffer, so current line is in the middle of the window.
+If this function is added to `ecb-tag-visit-post-actions' then it's
+recommended to add this function add the end of the action list for 'default
+or a `major-mode' and not to add the function `ecb-tag-visit-recenter' too!
+
+Returns current point."
+  (set-window-start (selected-window)
+                    (ecb-line-beginning-pos))
+  (point))
+
+(tree-buffer-defpopup-command ecb-methods-menu-jump-and-narrow
+  "Jump to the token related to the node under point an narrow to this token."
+  (ecb-method-clicked node 1 nil nil nil t '(ecb-tag-visit-narrow-tag
+                                             ecb-tag-visit-highlight-tag-header)))
+
+
+(tree-buffer-defpopup-command ecb-methods-menu-widen
+  "Widen the current buffer in the current edit-window."
+  (ecb-select-edit-window)
+  (widen))
+
+
+(if (not ecb-running-xemacs)
+    ;; Klaus Berndl <klaus.berndl@sdm.de>: This is for silencing the
+    ;; byte-compiler. Normally there should be no warning when
+    ;; silentcomp-defun is used for hs-minor-mode but....argghhh.
+    (require 'hideshow))
+
+(defun ecb-methods-menu-activate-hs ()
+  "Activates `hs-minor-mode' in the buffer of `ecb-path-selected-source'. If
+this fails then nil is returned otherwise t."
+  (save-excursion
+    (set-buffer (get-file-buffer (ecb-path-selected-source 'file)))
+    (if (or (not (boundp 'hs-minor-mode))
+            (not hs-minor-mode))
+        (if (fboundp 'hs-minor-mode)
+            (progn
+              (hs-minor-mode 1)
+              t)
+          nil)
+      t)))
+
+
+(tree-buffer-defpopup-command ecb-methods-menu-show-block
+  "Runs `hs-show-block' for the current node under point."
+  (if (not (ecb-methods-menu-activate-hs))
+      (ecb-error "hs-minor-mode can not be activated!")
+    ;; point must be at beginning of tag-name
+    (ecb-method-clicked node 1 nil nil nil t '(ecb-tag-visit-smart-tag-start))
+    (save-excursion
+      (or (looking-at hs-block-start-regexp)
+          (re-search-forward hs-block-start-regexp nil t))
+      (hs-show-block))
+    ;; Now we are at the beginning of the block or - with other word - on that
+    ;; position `ecb-method-clicked' has set the point.
+    (ecb-tag-visit-highlight-tag-header (tree-node->data node))))
+
+
+(tree-buffer-defpopup-command ecb-methods-menu-hide-block
+  "Runs `hs-hide-block' for the current node under point."
+  (if (not (ecb-methods-menu-activate-hs))
+      (ecb-error "hs-minor-mode can not be activated!")
+    ;; point must be at beginning of tag-name
+    (ecb-method-clicked node 1 nil nil nil t '(ecb-tag-visit-smart-tag-start))
+    (save-excursion
+      (or (looking-at hs-block-start-regexp)
+          (re-search-forward hs-block-start-regexp nil t))
+      (hs-hide-block))
+    (ecb-tag-visit-highlight-tag-header (tree-node->data node))))
+
+
+(tree-buffer-defpopup-command ecb-methods-menu-collapse-all
+  "Collapse all expandable and expanded nodes"
+  (ecb-expand-methods-node-internal (tree-buffer-get-root) -1 nil t t))
+
+(tree-buffer-defpopup-command ecb-methods-menu-collapse-current
+  "Collapse the current node"
+  (let ((ecb-methods-nodes-collapse-spec 'all))
+    (ecb-expand-methods-node-internal node -1 nil t t)))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-all-0
+  "Expand all nodes exactly to level 0."
+  (ecb-expand-methods-node-internal (tree-buffer-get-root) 0 nil t t))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-current-0
+  "Expand current node exactly to level 0."
+  (let ((ecb-methods-nodes-expand-spec 'all))
+    (ecb-expand-methods-node-internal node 0 nil t t)))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-all-1
+  "Expand all nodes to exactly level 1."
+  (ecb-expand-methods-node-internal (tree-buffer-get-root) 1 nil t t))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-current-1
+  "Expand current node exactly to level 0."
+  (let ((ecb-methods-nodes-expand-spec 'all))
+    (ecb-expand-methods-node-internal node 1 nil t t)))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-all-2
+  "Expand all nodes to exactly level 2."
+  (ecb-expand-methods-node-internal (tree-buffer-get-root) 2 nil t t))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-current-2
+  "Expand current node exactly to level 0."
+  (let ((ecb-methods-nodes-expand-spec 'all))
+    (ecb-expand-methods-node-internal node 2 nil t t)))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-all-full
+  "Expand all expandable nodes recursively, i.e. completely."
+  (ecb-expand-methods-node-internal (tree-buffer-get-root) 100 nil t t))
+
+(tree-buffer-defpopup-command ecb-methods-menu-expand-current-full
+  "Expand the current node recursively, i.e. completely."
+  (let ((ecb-methods-nodes-expand-spec 'all))
+    (ecb-expand-methods-node-internal node 100 nil t t)))
+
+
+(defvar ecb-common-methods-menu nil
+  "Built-in menu for the methods-buffer.")
+
+
+(setq ecb-common-methods-menu
+      '( ;;("---")
+        ("Expand/Collapse"
+         (ecb-methods-menu-collapse-current "Collapse this node completely")
+         (ecb-methods-menu-expand-current-0 "Expand this node to level 0")
+         (ecb-methods-menu-expand-current-1 "Expand this node to level 1")
+         (ecb-methods-menu-expand-current-2 "Expand this node to level 2")
+         (ecb-methods-menu-expand-current-full "Expand this node completely")
+         ("---")
+         (ecb-methods-menu-collapse-all "Collapse all completely")
+         (ecb-methods-menu-expand-all-0 "Expand all to level 0")
+         (ecb-methods-menu-expand-all-1 "Expand all to level 1")
+         (ecb-methods-menu-expand-all-2 "Expand all to level 2")
+         (ecb-methods-menu-expand-all-full "Expand all completely")
+         )
+        ("---")
+        (ecb-maximize-ecb-window-menu-wrapper "Maximize window")))
+
+
+(defvar ecb-methods-tag-menu nil)
+(setq ecb-methods-tag-menu
+      (append '(("Hide/Show"
+                 (ecb-methods-menu-hide-block "Jump to tag and hide block")
+                 (ecb-methods-menu-show-block "Jump to tag and show block"))
+                ("Narrow/Widen"
+                 (ecb-methods-menu-jump-and-narrow "Jump to tag and narrow")
+                 (ecb-methods-menu-widen "Undo narrowing of edit-window")))
+              ecb-common-methods-menu))
+
+
+(defvar ecb-methods-menu-title-creator
+  (function (lambda (node)
+              (let ((data (tree-node->data node)))
+                (if (and data (/= ecb-methods-nodetype-bucket
+                                  (tree-node->type node)))
+                    (typecase data
+                      (ecb--semantic-tag (ecb--semantic-tag-name data))
+                      (string data)
+                      (otherwise (tree-node->name node)))
+                  (tree-node->name node)))))
+  "The menu-title for the methods menu. See
+`ecb-directories-menu-title-creator'.")
+
+(dotimes (i 8)
+  (eval `(tree-buffer-defpopup-command
+             ,(intern (format "ecb-jump-to-tag-in-editwin%d" (1+ i)))
+           ,(format "Jump to current tag in the %d. edit-window." (1+ i))
+           (ecb-method-clicked node 3 ,(1+ i) nil nil))))
+
+(defun ecb-methods-menu-editwin-entries ()
+  "Generate popup-menu-entries for each edit-window if there are at least 2
+edit-windows. Otherwise return nil."
+  (let ((edit-win-list (ecb-canonical-edit-windows-list))
+        (result nil))
+    (when (> (length edit-win-list) 1)
+      (dotimes (i (min 8 (length edit-win-list)))
+        (setq result
+              (append result
+                      (list (list (intern (format "ecb-jump-to-tag-in-editwin%d" (1+ i)))
+                                  (format "edit-window %d" (1+ i)))))))
+      (append (list (list "---")) ;; we want a separator
+              (list (append (list "Jump to tag in ...")
+                            result))))))
+
+
+(defun ecb-methods-menu-tagfilter-entries ()
+  "Generate popup-menu-entries for the tag-filtering"
+  (let* ((curr-semantic-symbol->name-assoc-list
+          ;; we must not use here (ecb-methods-get-data-store
+          ;; 'semantic-symbol->name-assoc-list) because we do not want the
+          ;; function-prototypes...
+          (save-excursion
+            (set-buffer (ecb-methods-get-data-store 'source-buffer))
+            (ecb--semantic-symbol->name-assoc-list)))
+         (prot-list '("private" "protected" "public"))
+         (prot-menu-elems nil)
+         (prot-menu-elems-inverse nil)
+         (prot-menu-entries nil)
+         (prot-menu-entries-inverse)
+         (tag-menu-class-elems nil)
+         (tag-menu-class-elems-inverse nil)
+         (tag-menu-class-entries nil)
+         (tag-menu-class-entries-inverse nil))
+    ;; First we have to define all the needed tree-buffer-commands for
+    ;; protection- and tagclass-filtering. But this is only done for
+    ;; semantic-sources and also the first time.
+    (when curr-semantic-symbol->name-assoc-list
+      (dolist (tag-class curr-semantic-symbol->name-assoc-list)
+        (let ((fcn-sym (intern (format "ecb-methods-filter-by-%s-tagclass"
+                                       (car tag-class)))))
+          (setq tag-menu-class-elems (cons (cons fcn-sym (cdr tag-class))
+                                           tag-menu-class-elems))
+          (when (not (fboundp fcn-sym))
+            (eval `(tree-buffer-defpopup-command ,fcn-sym
+                     ,(format "Filter all tags with tag-class '%s." (car tag-class))
+                     (ecb-methods-filter-by-tag-class nil
+                                                      (ecb-methods-get-data-store 'source-buffer)
+                                                      ,(symbol-name (car tag-class))))))))
+      (dolist (tag-class curr-semantic-symbol->name-assoc-list)
+        (let ((fcn-sym (intern (format "ecb-methods-filter-by-%s-tagclass-inverse"
+                                       (car tag-class)))))
+          (setq tag-menu-class-elems-inverse
+                (cons (cons fcn-sym (concat "not " (cdr tag-class)))
+                      tag-menu-class-elems-inverse))
+          (when (not (fboundp fcn-sym))
+            (eval `(tree-buffer-defpopup-command ,fcn-sym
+                     ,(format "Filter all tags with tag-class unequal '%s."
+                              (car tag-class))
+                     (ecb-methods-filter-by-tag-class t
+                                                      (ecb-methods-get-data-store 'source-buffer)
+                                                      ,(symbol-name (car tag-class))))))))
+      (dolist (prot prot-list)
+        (let ((fcn-sym (intern (format "ecb-methods-filter-by-%s-prot" prot))))
+          (setq prot-menu-elems (cons (cons fcn-sym prot)
+                                      prot-menu-elems))
+          (when (not (fboundp fcn-sym))
+            (eval `(tree-buffer-defpopup-command ,fcn-sym
+                     ,(format "Filter all tags with %s protection." prot)
+                     (ecb-methods-filter-by-prot nil
+                                                 (ecb-methods-get-data-store 'source-buffer)
+                                                 ,prot))))))
+      (dolist (prot prot-list)
+        (let ((fcn-sym (intern (format "ecb-methods-filter-by-%s-prot-inverse" prot))))
+          (setq prot-menu-elems-inverse
+                (cons (cons fcn-sym (concat "not " prot))
+                      prot-menu-elems-inverse))
+          (when (not (fboundp fcn-sym))
+            (eval `(tree-buffer-defpopup-command ,fcn-sym
+                     ,(format "Filter all tags with not %s protection." prot)
+                     (ecb-methods-filter-by-prot t
+                                                 (ecb-methods-get-data-store 'source-buffer)
+                                                 ,prot)))))))
+    ;; building the menu-entries-list for tag-classes and protections.
+    (dolist (elem tag-menu-class-elems)
+      (setq tag-menu-class-entries
+            (append tag-menu-class-entries
+                    (list (list (car elem) (cdr elem))))))
+    (dolist (elem tag-menu-class-elems-inverse)
+      (setq tag-menu-class-entries-inverse
+            (append tag-menu-class-entries-inverse
+                    (list (list (car elem) (cdr elem))))))
+    (dolist (elem prot-menu-elems)
+      (setq prot-menu-entries
+            (append prot-menu-entries
+                    (list (list (car elem) (cdr elem))))))
+    (dolist (elem prot-menu-elems-inverse)
+      (setq prot-menu-entries-inverse
+            (append prot-menu-entries-inverse
+                    (list (list (car elem) (cdr elem))))))
+    ;; building the complete filter-menu
+    (append nil ;; (list (list "---")) ;; we want a separator
+            (list (append (list "Filter tags")
+                          (list '(ecb-methods-filter-by-nothing-popup
+                                  "No tag filter")
+                                '(ecb-methods-filter-delete-last-popup
+                                  "Remove last added")
+                                '("---")
+                                '(ecb-methods-filter-by-regexp-popup
+                                  "By regexp"))
+                          (when prot-menu-entries
+                            (list (append (list "By protection")
+                                          prot-menu-entries)))
+                          (when tag-menu-class-entries
+                            (list (append (list "By tag-class")
+                                          tag-menu-class-entries)))
+                          (when curr-semantic-symbol->name-assoc-list
+                            (list '(ecb-methods-filter-by-current-type-popup
+                                    "By current type")))
+                          (list '(ecb-methods-filter-by-function-popup
+                                  "By a filter-function")
+                                '("---")
+                                '(ecb-methods-filter-by-regexp-popup-inverse
+                                  "By inverse regexp"))
+                          (when prot-menu-entries-inverse
+                            (list (append (list "By inverse protection")
+                                          prot-menu-entries-inverse)))
+                          (when tag-menu-class-entries-inverse
+                            (list (append (list "By inverse tag-class")
+                                          tag-menu-class-entries-inverse)))
+                          (list '(ecb-methods-filter-by-function-popup-inverse
+                                  "By a inverse filter-function")))))))
+    
+(defun ecb-methods-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the methods-buffer."
+  (setq ecb-layout-prevent-handle-ecb-window-selection t)
+  (let ((dyn-user-extension
+         (and (functionp ecb-methods-menu-user-extension-function)
+              (funcall ecb-methods-menu-user-extension-function
+                       tree-buffer-name node)))
+        (dyn-builtin-extension-edit-win (ecb-methods-menu-editwin-entries))
+        (dyn-builtin-extension-tagfilter (ecb-methods-menu-tagfilter-entries)))
+    (list (cons ecb-methods-nodetype-tag
+                (funcall (or ecb-methods-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-methods-menu-user-extension
+                                 dyn-builtin-extension-tagfilter
+                                 ecb-methods-tag-menu
+                                 dyn-builtin-extension-edit-win)))
+          (cons ecb-methods-nodetype-bucket
+                (funcall (or ecb-methods-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-methods-menu-user-extension
+                                 dyn-builtin-extension-tagfilter
+                                 ecb-common-methods-menu)))
+          (cons ecb-methods-nodetype-externtag
+                (funcall (or ecb-methods-menu-sorter
+                             'identity)
+                         (append dyn-user-extension
+                                 ecb-methods-menu-user-extension
+                                 dyn-builtin-extension-tagfilter
+                                 ecb-common-methods-menu))))))
+
+(defconst ecb-methods-incr-searchpattern-node-prefix
+  '("\\([-+#(]\\|[^-+#(][^ \n]+ \\)?" . 1)
+  "Prefix-pattern which ignores all not interesting stuff of a node-name at
+incr. search. The following contents of a node-name are ignored by this
+pattern:
+- types of a variable or return-types of a method
+- const specifier of variables
+- protection sign of a variable/method: +, - or #
+
+Format: cons with car is the pattern and cdr is the number of subexpr in this
+pattern.")
+
+;; Function which compares the node-data of a tree-buffer-node in the
+;; method-buffer for equality. We must compare semantic-tags but we must not
+;; compare the tags with eq or equal because they can be re-grouped by
+;; ecb--semantic-adopt-external-members. the following function is a save
+;; "equal"-condition for ECB because currently the method buffer always
+;; displays only tags from exactly the buffer of the current edit-window. If
+;; `ecb--semantic-equivalent-tag-p' fails we return the result of an
+;; eq-comparison.
+(defun ecb-compare-methods-buffer-node-data (l r)
+  (cond ((or (stringp l) (stringp r))
+         (equal l r))
+        ((or (equal 'ecb-bucket-node (car l))
+             (equal 'ecb-bucket-node (car r)))
+         (equal l r))
+        (t ;; tags
+         (condition-case nil
+             (ecb--semantic-equivalent-tag-p l r)
+           (error (eq l r))))))
+
+(defun ecb-methods-node-mouse-highlighted-p (node)
+  "Return not nil when NODE has a positioned tag as data or belongs to the
+completions. This means that this node should be highlighted when mouse is
+moved over it."
+  (or (not (equal (tree-node->type node) ecb-methods-nodetype-tag))
+      (ecb--semantic-tag-with-position-p (tree-node->data node))
+      (ecb--semantic-tag-faux-p (tree-node->data node))))
+
+(defecb-tree-buffer-creator ecb-create-methods-tree-buffer ecb-methods-buffer-name
+  "Create the tree-buffer for methods."
+  (tree-buffer-create
+   ecb-methods-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-method-node
+   :mouse-highlight-fn 'ecb-methods-node-mouse-highlighted-p
+   :node-data-equal-fn 'ecb-compare-methods-buffer-node-data
+   :maybe-empty-node-types (list ecb-methods-nodetype-bucket)
+   :leaf-node-types nil
+   :menu-creator 'ecb-methods-menu-creator
+   :menu-titles (list (cons ecb-methods-nodetype-tag ecb-methods-menu-title-creator)
+                      (cons ecb-methods-nodetype-bucket ecb-methods-menu-title-creator)
+                      (cons ecb-methods-nodetype-externtag ecb-methods-menu-title-creator))
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :sticky-parent-p ecb-tree-make-parent-node-sticky
+   :sticky-indent-string ecb-tree-stickynode-indent-string
+   :sticky-parent-fn nil
+   :trunc-lines (ecb-member-of-symbol/value-list ecb-methods-buffer-name
+                                                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p ecb-tree-incremental-search
+   :incr-search-additional-pattern ecb-methods-incr-searchpattern-node-prefix
+   ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: add an option to make this
+   ;; customizable! Define the docstring as follows: reducing the node-list by
+   ;; typing always(!) removes first any filter applied before so it always
+   ;; starts from the full unfiltered list. (KB: So this mechanism is
+   ;; consistent for all buffers, sources, history and methods)
+   :reduce-tree-for-incr-search-fn
+   (lambda (search full-search-regexp)
+     (ecb-methods-filter-apply nil nil nil "" ""
+                               (ecb-methods-get-data-store 'source-buffer))
+     (if (and search full-search-regexp (> (length search) 0)
+              (ecb-methods-filter-apply 'regexp
+                                        (cons full-search-regexp nil)
+                                        nil
+                                        "Search"
+                                        search
+                                        (ecb-methods-get-data-store 'source-buffer)))
+         search
+       ""))
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list ecb-methods-buffer-name
+                                                           (cdr ecb-tree-image-icons-directories)
+                                                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer nil
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-method-face
+   :general-face ecb-methods-general-face
+   :after-create-hook (append
+                       (list (function (lambda ()
+                                         (ecb-common-after-tree-buffer-create-actions)
+                                         (setq ecb-methods-root-node (tree-buffer-get-root)))))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-methods-buffer-after-create-hook)
+   :after-update-hook nil))
+
+
+(defun ecb-dump-semantic-toplevel ()
+  "Dump the current semantic-tags in special buffer and display them."
+  (interactive)
+  (let ((tags (ecb-fetch-semantic-tags t))
+        (source-buf (current-buffer)))
+    (save-selected-window
+      (set-buffer (get-buffer-create "*ecb-tag-dump*"))
+      (erase-buffer)
+      (ecb-dump-semantic-tags-internal tags nil source-buf 1)
+      (switch-to-buffer-other-window (get-buffer-create "*ecb-tag-dump*"))
+      (goto-char (point-min)))))
+
+(defun ecb-dump-semantic-tags-internal (table parent source-buffer indent)
+  (dolist (tag table)
+    ;; we ca not use format here because XEmacs-format removes all
+    ;; text-properties! 
+    (insert (concat (make-string indent ? )
+                    (save-excursion
+                      (set-buffer source-buffer)
+                      (ecb--semantic-format-tag-uml-prototype tag parent t))
+                    ", tag-class: "
+                    (format "%s" (ecb--semantic-tag-class tag))
+                    "\n"))
+    (unless (equal (ecb--semantic-tag-class tag) 'function)
+      (ecb-dump-semantic-tags-internal (ecb-children-tags tag)
+                                       (if (equal (ecb--semantic-tag-class tag)
+                                                  'type)
+                                           tag)
+                                       source-buffer
+                                       (+ 2 indent)))))
+
+(defecb-advice-set ecb-methods-browser-advices
+  "Adviced functions needed by the methods-browser of ECB.")
+
+(defecb-advice make-indirect-buffer after ecb-methods-browser-advices
+  "Clears the semantic topleven-cache for the newly created indirect-buffer.
+
+This is only done when the argument CLONE is not nil. But in this case it must
+be ensured that the new clone gets its own tags and do not share it with its
+base-buffer. This is achieved by clearing the toplevel cache of semantic.
+
+Returns always the newly created indirect buffer."
+  (when (and (not ecb-running-xemacs) ;; clone not available with XEmacs
+             ;; clone-flag is not nil
+             (ad-get-arg 2))
+    (with-current-buffer ad-return-value
+      (message "ECB: semantic cache for indirect buffer %s cleared!" (current-buffer))
+      (ecb--semantic-clear-toplevel-cache)))
+  ad-return-value)
+
+(defecb-advice custom-save-all around ecb-methods-browser-advices
+  "Save the customized options completely in the background, i.e. the
+file-buffer where the value is saved \(see option `custom-file') is not parsed
+by semantic and also killed afterwards."
+  (if ecb-minor-mode
+      (let ( ;; XEmacs 21.4 does not set this so we do it here, to ensure that
+            ;; the custom-file is loadede in an emacs-lisp-mode buffer, s.b.
+            (default-major-mode 'emacs-lisp-mode)
+            (ecb-basic-buffer-sync nil)
+            (kill-buffer-hook nil)
+            ;; we prevent parsing the custom-file
+            (semantic--before-fetch-tags-hook (lambda ()
+                                                nil))
+            (semantic-after-toplevel-cache-change-hook nil)
+            (semantic-after-partial-cache-change-hook nil))
+        ;; Klaus Berndl <klaus.berndl@sdm.de>: we must ensure that the
+        ;; current-buffer has a lisp major-mode when the kernel of
+        ;; `custom-save-all' is called because cause of a bug (IMHO) in the
+        ;; `custom-save-delete' of GNU Emacs (which loads the file returned by
+        ;; `custom-file' with `default-major-mode' set to nil which in turn
+        ;; causes that new buffer will get the major-mode of the
+        ;; current-buffer) the file `custom-file' will get the major-mode of
+        ;; the current-buffer. So when the current-buffer has for example
+        ;; major-mode `c++-mode' then the file `custom-file' will be loaded
+        ;; into a buffer with major-mode c++-mode. The function
+        ;; `custom-save-delete' then parses this buffer with (forward-sexp
+        ;; (buffer-size)) which of course fails because forward-sexp tries to
+        ;; parse the custom-file (which is an emacs-lisp-file) as a c++-file
+        ;; with c++-paren-syntax.
+        ;; Solution: Ensure that the buffer *scratch* is current when calling
+        ;; custom-save-all so we have surely a lispy-buffer and therefore we
+        ;; can be sure that custom-file is loaded as lispy-buffer.
+        (save-excursion
+          (set-buffer (get-buffer-create "*scratch*"))
+          ;; now we do the standard task
+          ad-do-it)
+        ;; now we have to kill the custom-file buffer otherwise semantic would
+        ;; parse the buffer of custom-file and the method-buffer would be
+        ;; updated with the contents of custom-file which is definitely not
+        ;; desired.
+        (ignore-errors
+          (kill-buffer (find-file-noselect (ecb-custom-file)))))
+    ad-do-it))
+
+(ecb-disable-advices 'ecb-methods-browser-advices t)
+
+(silentcomp-provide 'ecb-method-browser)
+
+;;; ecb-method-browser.el end here
+
diff --git a/site/ecb-2.40/ecb-mode-line.el b/site/ecb-2.40/ecb-mode-line.el
new file mode 100644
index 0000000..c04847f
--- /dev/null
+++ b/site/ecb-2.40/ecb-mode-line.el
@@ -0,0 +1,340 @@
+;;; ecb-mode-line.el --- mode-line for ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-mode-line.el,v 1.40 2009/05/15 16:40:05 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains all mode-line enhancements for ECB.
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-face)
+
+;; XEmacs
+(silentcomp-defun redraw-modeline)
+(silentcomp-defun make-extent)
+(silentcomp-defun set-extent-face)
+(silentcomp-defun set-extent-property)
+;; Emacs
+(silentcomp-defun force-mode-line-update)
+(silentcomp-defun propertize)
+
+(defgroup ecb-mode-line nil
+  "Settings for the modelines of the ECB-tree-buffers."
+  :group 'ecb-general
+  :prefix "ecb-")
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: update the texi
+(defcustom ecb-mode-line-prefixes '((ecb-directories-buffer-name . nil)
+                                    (ecb-sources-buffer-name . ecb-sources-filter-modeline-prefix)
+                                    (ecb-methods-buffer-name . ecb-methods-filter-modeline-prefix)
+                                    (ecb-history-buffer-name . ecb-history-filter-modeline-prefix))
+  "*Prefixes shown in the modelines of the special ECB-buffers.
+The displayed prefix then looks like: \"[ <PREFIX>[: ]]\", means if a prefix
+is defined for an special ECB-buffer then a single space is prepended and if
+there is additional text to display \(e.g. the current directory in the
+sources buffer, see `ecb-mode-line-data') then also the string \": \" is
+appended.
+
+Everey element of this list is a cons-cell where the car is used to define a
+buffer-name and the cdr to define the modeline-prefix for that buffer.
+
+The buffer-name can either be defined as plain string or with a symbol which
+contains the buffer-name as value. The latter one is recommended to define a
+prefix for one of the builtin ECB-tree-buffers because then simply the related
+option-symbol can be used. To add a prefix for the builtin directories
+tree-buffer just set the symbol `ecb-directories-buffer-name' as car.
+
+The cdr is the prefix for a buffer and can either be a string
+which used as it is or a function-symbol which is called with
+three argument \(the buffer-name, the current selected directory
+and the current selected source whereas the latter one is a cons
+as returned by `ecb-path-selected-source') and must return either
+nil \(for no prefix) or a string which is then used a prefix.
+Such a function can add the text-property 'help-echo to the
+result-string. Then this help-string will be displayed when the
+user moves the mouse over this section of the modeline.
+
+If a special ECB-buffer should not have a prefix in its modeline then this
+buffer-name should either not being added to this option or added with \"No
+prefix\" \(= nil as cdr)."
+  :group 'ecb-mode-line
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-mode-line-format))))
+  :initialize 'custom-initialize-default
+  :type '(repeat (cons :tag "Prefix-definition"
+                       (choice :tag "Buffer-name" :menu-tag "Buffer-name"
+                               (string :tag "Buffer-name as string")
+                               (symbol :tag "Symbol containing buffer-name"))
+                       (choice :tag "Prefix" :menu-tag "Prefix"
+                               (const :tag "No prefix" :value nil)
+                               (string :tag "Prefix-string")
+                               (function :tag "Compute prefix with")))))
+  
+
+
+(defcustom ecb-mode-line-display-window-number t
+  "*Display in the modeline of every special ECB-window the window-number.
+The left-top-most window in a frame has the window-number 0 and all other
+windows are numbered with increasing numbers in the sequence, functions like
+`other-window' or `next-window' would walk through the frame.
+
+This can be used to jump to windows by number with commands like:
+
+  \(defun my-switch-to-window-number \(number)
+    \"Switch to the nth window\"
+    \(interactive \"P\")
+    \(if \(integerp number)
+        \(select-window \(nth number \(window-list)))))
+
+Currently this feature is only available for GNU Emacs 21.X, because neither
+GNU Emacs < 21 nor XEmacs can evaluate dynamically forms in the mode-line."
+  :group 'ecb-mode-line
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-mode-line-format))))
+  :initialize 'custom-initialize-default
+  :type 'boolean)
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: update the texi
+(defcustom ecb-mode-line-data '((ecb-directories-buffer-name . sel-dir)
+                                (ecb-sources-buffer-name . sel-dir)
+                                (ecb-methods-buffer-name . sel-source)
+                                (ecb-analyse-buffer-name . sel-source)
+                                (ecb-history-buffer-name . "History"))
+  "*Data shown in the modelines of the special ECB-buffers.
+Everey element of this list is a cons-cell where the car is used to define a
+buffer-name and the cdr to define the modeline-data for that buffer. For
+details about how to defining a buffer-name see `ecb-mode-line-prefixes' - its
+completely the same.
+
+The cdr is the data for ths modeline and can either be the symbol 'sel-dir or
+'sel-source whereas the former one displays the current selected directory as
+modeline-data and the latter one the current selected source-file \(without
+path).
+
+In addition to these two predefined values for every special
+ECB-buffer either a simple string \(which will be displayed) or a
+function can be specified which gets three args \(name of the
+buffer, current selected directory and current selected source
+whereas the latter one is a cons as returned by
+`ecb-path-selected-source') and must return a string which will
+be displayed in the modeline \(or nil if no data should be
+displayed). Such a function can add the text-property 'help-echo
+to the result-string. Then this help-string will be displayed
+when the user moves the mouse over this section of the modeline.
+
+If a special ECB-buffer should not display special data in its modeline then
+this buffer-name should either not being added to this option or added with
+\"No data\" \(= nil as cdr).
+
+The whole modeline of the special ECB-buffer consists of the prefix of
+`ecb-mode-line-prefixes' and the data of `ecb-mode-line-data' - eventually
+prepended by the window-number, see `ecb-mode-line-display-window-number'."
+  :group 'ecb-mode-line
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-mode-line-format))))
+  :initialize 'custom-initialize-default
+  :type '(repeat (cons :tag "Data-definition"
+                       (choice :tag "Buffer-name" :menu-tag "Buffer-name"
+                               (string :tag "Buffer-name as string")
+                               (symbol :tag "Symbol containing buffer-name"))
+                       (choice :tag "Modeline-data" :menu-tag "Modeline-data"
+                               (const :tag "No data" :value nil)
+                               (const :tag "Current selected directory"
+                                      :value sel-dir)
+                               (const :tag "Current selected source"
+                                      :value sel-source)
+                               (string :tag "Data-string")
+                               (function :tag "Compute data with")))))
+
+
+(defun ecb-mode-line-format ()
+  "Update all of the modelines of each ecb buffer."
+  (save-excursion
+    ;; update the modeline for each visible(!!) ECB-buffer
+    (mapc (function
+           (lambda (buffer)
+             (let* ((prefix-elem (ecb-some (function
+                                            (lambda (p)
+                                              (cond ((stringp (car p))
+                                                     (if (ecb-string= (car p)
+                                                                      (buffer-name buffer))
+                                                         (cdr p)
+                                                       nil))
+                                                    ((and (symbolp (car p))
+                                                          (boundp (car p))
+                                                          (stringp (symbol-value (car p))))
+                                                     (if (ecb-string= (symbol-value (car p))
+                                                                      (buffer-name buffer))
+                                                         (cdr p)
+                                                       nil))
+                                                    (t (ecb-error "ecb-mode-line-format: Can not get prefix-elem: %s" p)))))
+                                           ecb-mode-line-prefixes))
+                    (prefix-str (typecase prefix-elem
+                                  (null nil)
+                                  (string prefix-elem)
+                                  (function (funcall prefix-elem
+                                                     (buffer-name buffer)
+                                                     ecb-path-selected-directory
+                                                     (ecb-path-selected-source)))))
+                    (data-elem (ecb-some (function
+                                          (lambda (p)
+                                            (cond ((stringp (car p))
+                                                   (if (ecb-string= (car p)
+                                                                    (buffer-name buffer))
+                                                       (cdr p)
+                                                     nil))
+                                                  ((and (symbolp (car p))
+                                                        (boundp (car p))
+                                                        (stringp (symbol-value (car p))))
+                                                   (if (ecb-string= (symbol-value (car p))
+                                                                    (buffer-name buffer))
+                                                       (cdr p)
+                                                     nil))
+                                                  (t (ecb-error "ecb-mode-line-format: Can not get data-elem: %s" p)))))
+                                         ecb-mode-line-data))
+                    (data-str (cond ((equal data-elem 'sel-dir)
+                                     ecb-path-selected-directory)
+                                    ((equal data-elem 'sel-source)
+                                     (and ecb-path-selected-source
+                                          (ecb-path-selected-source 'buffername)))
+                                    ((stringp data-elem)
+                                     data-elem)
+                                    ((null data-elem)
+                                     nil)
+                                    ((functionp data-elem)
+                                     (funcall data-elem
+                                              (buffer-name buffer)
+                                              ecb-path-selected-directory
+                                              (ecb-path-selected-source))))))
+               ;; Display a default help-echo but only if the modeline-data is
+               ;; not computed by a user-function.
+               (when (and (not (functionp data-elem))
+                          (stringp data-str))
+                 (put-text-property 0 (length data-str) 'help-echo
+                                    "Mouse-2 toggles maximizing, mouse-3 displays a popup-menu"
+                                    data-str))
+               ;; Now set the modeline
+               (ecb-mode-line-set (buffer-name buffer)
+                                  ecb-frame
+                                  prefix-str
+                                  data-str))))
+          (ecb-get-current-visible-ecb-buffers))))
+
+
+(defun ecb-mode-line-make-modeline-str (str face)
+  "Applies FACE to the STR. In additon it applies a help-echo to STR if STR
+contains a text-property 'help-echo."
+  (let ((strcp (copy-sequence str)))
+    (if ecb-running-xemacs
+        (let ((ext (make-extent nil nil))
+              (help-echo-str
+               (catch 'found
+                 (dotimes (i (length strcp))
+                   (if (get-text-property i 'help-echo strcp)
+                       (throw 'found
+                              (get-text-property i 'help-echo strcp))))
+                 nil)))
+          (set-extent-face ext face)
+          (set-extent-property ext 'help-echo help-echo-str)
+          (list (cons ext strcp)))
+      (list (propertize strcp 'face face)))))
+                 
+(defun ecb-mode-line-set (buffer-name frame prefix &optional text no-win-nr)
+  "Sets the mode line for a buffer. The mode line has the scheme:
+\"[WIN-NR ][PREFIX[: ]][TEXT]\". WIN-NR is the number of the window which
+displays BUFFER-NAME and is only displayed if the option
+`ecb-mode-line-display-window-number' is not nil and if NO-WIN-NR is nil. See
+this option for a description of the window-number. WIN-NR will be displayed
+as \"W-<number>\"."
+  (when (get-buffer-window buffer-name frame)
+    (let ((shown-prefix (if (stringp prefix)
+                            (concat " " prefix (if (stringp text) ": " ""))
+                          (if (stringp text) " " "")))
+          (win-width (window-width (get-buffer-window buffer-name)))
+          (available-text-width nil))
+      (setq shown-prefix (ecb-fit-str-to-width shown-prefix (1- win-width) 'right))
+      (setq available-text-width (- win-width
+                                   (+ (length shown-prefix)
+                                      (if (and (not ecb-running-xemacs)
+                                               ecb-mode-line-display-window-number
+                                               (not no-win-nr))
+                                          4 0))))
+      (ecb-mode-line-update-buffer
+       buffer-name
+       (list (if (and (not ecb-running-xemacs)
+                      ecb-mode-line-display-window-number
+                      (not no-win-nr))
+                 ;; With :eval we must not use a list
+                 '(:eval (car (ecb-mode-line-make-modeline-str
+                               (format " W-%d"
+                                       (1- (ecb-window-in-window-list-number (ecb-canonical-windows-list))))
+                               ecb-mode-line-win-nr-face)))
+               "")
+             (ecb-mode-line-make-modeline-str shown-prefix
+                                              ecb-mode-line-prefix-face)
+             (ecb-mode-line-make-modeline-str
+              (concat (if (stringp text)
+                          (ecb-fit-str-to-width text
+                                                available-text-width
+                                                'left)))
+              ecb-mode-line-data-face))))))
+
+
+(defun ecb-mode-line-update-buffer (buffer-name new-mode-line-format)
+  "Update the given buffer...."
+  (if (get-buffer buffer-name)
+      (save-excursion
+        (set-buffer buffer-name)
+        (setq mode-line-format new-mode-line-format)
+        (if ecb-running-xemacs
+            (redraw-modeline)
+          (force-mode-line-update)))
+    (message "This buffer isn't available: %s"  buffer-name)))
+
+(silentcomp-provide 'ecb-mode-line)
+
+;;; ecb-mode-line.el end here
+
diff --git a/site/ecb-2.40/ecb-navigate.el b/site/ecb-2.40/ecb-navigate.el
new file mode 100644
index 0000000..64af0f6
--- /dev/null
+++ b/site/ecb-2.40/ecb-navigate.el
@@ -0,0 +1,386 @@
+;;; ecb-navigate.el --- Browser-navigation for ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-navigate.el,v 1.23 2009/04/15 14:22:35 berndl Exp $
+
+;;; Commentary:
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'eieio)
+(require 'ecb-util)
+
+
+
+;;====================================================
+;; 
+;;====================================================
+
+(defclass ecb-dlist-node ()
+  ((previous :initform nil); :protection :private)
+   (next :initform nil); :protection :private)
+   (data :initarg :data :initform nil); :protection :private)
+   )
+  "A node in a double linked list."
+  )
+
+(defun ecb-dlist-node-new (data)
+  (ecb-dlist-node "node" :data data))
+
+(defmethod ecb-get-data ((node ecb-dlist-node))
+  (oref node data))
+
+(defmethod ecb-get-next ((node ecb-dlist-node))
+  (oref node next))
+
+(defmethod ecb-get-previous ((node ecb-dlist-node))
+  (oref node previous))
+
+(defmethod ecb-set-data ((node ecb-dlist-node) data)
+  (oset node data data))
+
+(defmethod ecb-set-next ((node ecb-dlist-node) next)
+  (let ((old-next (ecb-get-next node)))
+    (when old-next
+      (oset old-next previous nil))
+    (oset node next next)
+    (when next
+      (ecb-set-previous next nil)
+      (oset next previous node))))
+
+(defmethod ecb-set-previous ((node ecb-dlist-node) previous)
+  (let ((old-previous (ecb-get-previous node)))
+    (when old-previous
+      (oset old-previous next nil))
+    (oset node previous previous)
+    (when previous
+      (ecb-set-next previous nil)
+      (oset previous next node))))
+
+
+;;====================================================
+;; 
+;;====================================================
+
+(defclass ecb-nav-history-item ()
+  ((pos :initarg :pos :initform 0); :protection :private)
+   (window-start :initarg :window-start :initform 0); :protection :private)
+   )
+  )
+  
+(defmethod ecb-nav-set-pos ((item ecb-nav-history-item) pos)
+  (oset item pos pos))
+
+(defmethod ecb-nav-set-window-start ((item ecb-nav-history-item) point)
+  (oset item window-start point))
+
+(defmethod ecb-nav-get-pos ((item ecb-nav-history-item))
+  (oref item pos))
+
+(defmethod ecb-nav-get-window-start ((item ecb-nav-history-item))
+  (oref item window-start))
+
+(defmethod ecb-nav-to-string ((item ecb-nav-history-item))
+  (concat (int-to-string (ecb-nav-get-pos item)) ":"
+	  (int-to-string (ecb-nav-get-window-start item))))
+
+;; This method must return nil if saving can not be performed and otherwise
+;; not nil!
+(defmethod ecb-nav-save ((item ecb-nav-history-item))
+  t)
+
+(defmethod ecb-nav-is-valid ((item ecb-nav-history-item))
+  t)
+
+
+;;====================================================
+;; 
+;;====================================================
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Changed this class from storing the
+;; whole tag to storing explicitly the tag-buffer, the marker of the
+;; tag-start, the marker of the tag-end. This prevents the stored
+;; navigation-items from getting invalid and unusable after a full
+;; semantic-reparse because such a reparse makes the overlays contained in the
+;; stored tags invalid so we can not uses their informations.
+(defclass ecb-nav-tag-history-item (ecb-nav-history-item)
+  ((tag-buffer :initarg :tag-buffer :initform nil); :protection :private)
+   (tag-start :initarg :tag-start :initform nil) ; :protection :private)
+   (tag-end :initarg :tag-end :initform nil) ; :protection :private)
+   (tag-name :initarg :tag-name :initform nil) ; :protection :private)
+   (narrow :initarg :narrow :initform nil); :protection :private)
+   )
+  )
+
+(defun ecb-nav-tag-history-item-new (tag-name tag-buffer tag-start
+                                                  tag-end &optional narrow)
+  (ecb-nav-tag-history-item tag-name
+                              :tag-buffer tag-buffer
+                              :tag-start tag-start
+                              :tag-end tag-end
+                              :tag-name tag-name
+                              :narrow narrow))
+
+(defmethod ecb-nav-get-tag-buffer ((item ecb-nav-tag-history-item))
+  (oref item tag-buffer))
+
+(defmethod ecb-nav-get-tag-start ((item ecb-nav-tag-history-item))
+  (oref item tag-start))
+
+(defmethod ecb-nav-get-tag-end ((item ecb-nav-tag-history-item))
+  (oref item tag-end))
+
+(defmethod ecb-nav-get-tag-name ((item ecb-nav-tag-history-item))
+  (oref item tag-name))
+
+(defmethod ecb-nav-get-narrow ((item ecb-nav-tag-history-item))
+  (oref item narrow))
+
+(defmethod ecb-nav-goto ((item ecb-nav-tag-history-item))
+  (let ((tag-buffer (ecb-nav-get-tag-buffer item))
+        (tag-start (ecb-nav-get-tag-start item))
+        (tag-end (ecb-nav-get-tag-end item))
+        (win-start (ecb-nav-get-window-start item)))
+    (select-window ecb-last-edit-window-with-point)
+    (set-window-buffer (selected-window) tag-buffer)
+    (widen)
+    (goto-char tag-start)
+    (when (ecb-nav-get-narrow item)
+      (narrow-to-region (ecb-line-beginning-pos) tag-end))
+    (goto-char (+ tag-start (ecb-nav-get-pos item)))
+    (if win-start
+        (set-window-start (selected-window) (+ tag-start win-start)))))
+
+(defmethod ecb-nav-save ((item ecb-nav-tag-history-item))
+  "Return only nil if tag-start of ITEM points into a dead buffer. In this
+case no position saving is done."
+  (let ((tag-start (ecb-nav-get-tag-start item)))
+    (if (and tag-start (marker-buffer tag-start))
+        (progn
+          (save-excursion
+            (set-buffer (marker-buffer tag-start))
+            (ecb-nav-set-pos item (- (point) tag-start)))
+          (ecb-nav-set-window-start
+           item
+           (if (equal (window-buffer) (marker-buffer tag-start))
+               (- (window-start) tag-start)
+             nil))
+          t)
+      nil)))
+
+(defmethod ecb-nav-to-string ((item ecb-nav-tag-history-item))
+  (concat (ecb-nav-get-tag-name item) ":" (call-next-method)))
+
+(defmethod ecb-nav-is-valid ((item ecb-nav-tag-history-item))
+   (let ((tag-start (ecb-nav-get-tag-start item))
+         (tag-buf (ecb-nav-get-tag-buffer item))
+         (tag-end (ecb-nav-get-tag-end item)))
+     (if (and tag-start (marker-buffer tag-start)
+              tag-end (marker-buffer tag-end)
+              tag-buf (buffer-live-p tag-buf))
+         t)))
+ 
+
+;;====================================================
+;; 
+;;====================================================
+
+(defclass ecb-nav-file-history-item (ecb-nav-history-item)
+  ((file :initarg :file :initform ""); :protection :private)
+   ;; the following is nil if the item does not point to an indirect-buffer
+   ;; based on a file-buffer
+   (indirect-buffer-name :initarg :indirect-buffer-name :initform "") ; :protection :private)
+   )
+  )
+
+(defun ecb-nav-file-history-item-new ()
+  (let* ((file (ecb-buffer-file-name))
+         (ind-buffer-name (and file
+                               (buffer-base-buffer)
+                               (buffer-name)))
+         (item (ecb-nav-file-history-item (buffer-name)
+                                          :file file
+                                          :indirect-buffer-name ind-buffer-name)))
+    (ecb-nav-set-pos item (point))
+    (ecb-nav-set-window-start item
+                              (window-start (get-buffer-window (current-buffer))))
+    item))
+
+(defmethod ecb-nav-get-file ((item ecb-nav-file-history-item))
+  (oref item file))
+
+(defmethod ecb-nav-set-file ((item ecb-nav-file-history-item) file)
+  (oset item file file))
+
+(defmethod ecb-nav-get-indirect-buffer-name ((item ecb-nav-file-history-item))
+  (oref item indirect-buffer-name))
+
+(defmethod ecb-nav-set-indirect-buffer-name ((item ecb-nav-file-history-item) indirect-buffer-name)
+  (oset item indirect-buffer-name indirect-buffer-name))
+
+(defmethod ecb-nav-save ((item ecb-nav-file-history-item))
+  (ecb-nav-set-pos item (point))
+  (ecb-nav-set-window-start item (window-start))
+  (ecb-nav-set-file item (ecb-buffer-file-name))
+  (ecb-nav-set-indirect-buffer-name item (and (ecb-buffer-file-name)
+                                              (buffer-base-buffer)
+                                              (buffer-name)))
+  t)
+
+(defmethod ecb-nav-goto ((item ecb-nav-file-history-item))
+  (when (ecb-nav-get-file item)
+    (if (ecb-nav-get-indirect-buffer-name item)
+        (switch-to-buffer (ecb-nav-get-indirect-buffer-name item))
+      (find-file (ecb-nav-get-file item)))
+    (widen)
+    (goto-char (ecb-nav-get-pos item))
+    (let ((win-start (ecb-nav-get-window-start item)))
+      (if win-start
+          (set-window-start (selected-window) win-start)))))
+  
+(defmethod ecb-nav-to-string ((item ecb-nav-file-history-item))
+  (concat (ecb-nav-get-file item) "-"
+          (ecb-nav-get-indirect-buffer-name item)
+          ":" (call-next-method)))
+
+(defmethod ecb-nav-is-valid ((item ecb-nav-file-history-item))
+  ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: for saveness we should test if
+  ;; file points to a readable file - but what about remote-file (can last
+  ;; long)?
+  (and (ecb-nav-get-file item)
+       (or (null (ecb-nav-get-indirect-buffer-name item))
+           (get-buffer (ecb-nav-get-indirect-buffer-name item)))))
+
+;;====================================================
+;; 
+;;====================================================
+
+(defvar ecb-nav-first-node nil)
+(setq ecb-nav-first-node (ecb-dlist-node-new (ecb-nav-history-item "First item")))
+
+(defvar ecb-nav-current-node nil)
+(setq ecb-nav-current-node ecb-nav-first-node)
+
+
+(defun ecb-nav-initialize ()
+  (setq ecb-nav-first-node
+        (ecb-dlist-node-new (ecb-nav-history-item "First item")))
+  (setq ecb-nav-current-node ecb-nav-first-node))
+  
+
+(defun ecb-nav-jump-to-tag (file tag &optional narrow)
+  (ecb-nav-save-current)
+  (find-file file)
+  (ecb-nav-add-item (ecb-nav-tag-history-item tag narrow)))
+
+(defun ecb-nav-jump-to-file (file)
+  (ecb-nav-save-current)
+  (find-file file)
+  (ecb-nav-add-item (ecb-nav-file-history-item file)))
+
+(defun ecb-nav-add-item (item)
+  (let ((node (ecb-dlist-node-new item)))
+    (ecb-set-next node (ecb-get-next ecb-nav-current-node))
+    (ecb-set-next ecb-nav-current-node node)
+    (setq ecb-nav-current-node node)))
+
+(defun ecb-nav-remove-current-node ()
+  (ecb-nav-remove-node ecb-nav-current-node))
+
+(defun ecb-nav-remove-node (node)
+  "Remove NODE and set `ecb-nav-first-node' and `ecb-nav-current-node' if
+necessary."
+  (let ((prev (ecb-get-previous node))
+        (next (ecb-get-next node)))
+    (if prev
+        (ecb-set-next prev (ecb-get-next node)))
+    (if next
+        (ecb-set-previous next (ecb-get-previous node)))
+    (if (eq node ecb-nav-current-node)
+        (setq ecb-nav-current-node (or prev
+                                       next
+                                       ecb-nav-first-node)))
+    (if (eq node ecb-nav-first-node)
+        (if next
+            (setq ecb-nav-first-node next)
+        (ecb-nav-initialize)))))
+
+(defun ecb-nav-remove-invalid-nodes ()
+  (let ((node ecb-nav-first-node)
+        (next-node nil))
+    (while node
+      (setq next-node (ecb-get-next node))
+      (if (not (ecb-nav-is-valid (ecb-get-data node)))
+          (ecb-nav-remove-node node))
+      (setq node next-node))))
+
+(defun ecb-nav-save-current ()
+  (while (not (ecb-nav-save (ecb-get-data ecb-nav-current-node)))
+    (ecb-nav-remove-current-node)))
+
+(defun ecb-nav-goto-next ()
+  "Go forward in the navigation history list."
+  (interactive)
+  (ecb-nav-goto--internal (ecb-get-next ecb-nav-current-node)))
+
+(defun ecb-nav-goto-previous ()
+  "Go back in the navigation history list."
+  (interactive)
+  (ecb-nav-goto--internal (ecb-get-previous ecb-nav-current-node)))
+
+(defun ecb-nav-dump-history ()
+  (interactive)
+  (ecb-nav-remove-invalid-nodes)
+  (ecb-nav-dump-history--internal ecb-nav-first-node))
+
+(defun ecb-nav-dump-history--internal (node)
+  (when node
+    (insert (ecb-nav-to-string (ecb-get-data node)) "\n")
+    (ecb-nav-dump-history--internal (ecb-get-next node))))
+
+(defun ecb-nav-goto--internal (node)
+  (if (or (not node) (eq ecb-nav-first-node node))
+      (message "No more valid history items!")
+    ;; before doing something we have to clear the history from now invalid
+    ;; nodes means removing nodes which does not point into a live buffer
+    (ecb-nav-remove-invalid-nodes)
+    (ecb-nav-save-current)
+    (setq ecb-nav-current-node node)
+    (ecb-nav-goto (ecb-get-data node))))
+
+
+(silentcomp-provide 'ecb-navigate)
+
+;;; ecb-navigate.el ends here
diff --git a/site/ecb-2.40/ecb-speedbar.el b/site/ecb-2.40/ecb-speedbar.el
new file mode 100644
index 0000000..d739b24
--- /dev/null
+++ b/site/ecb-2.40/ecb-speedbar.el
@@ -0,0 +1,565 @@
+;;; ecb-speedbar.el --- Integration of speedbar into ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-speedbar.el,v 1.73 2009/05/08 14:05:55 berndl Exp $
+
+;;; Commentary:
+
+;; This package provide speedbar integration and using for the ECB.
+;;
+;; There are two complete different aspects of integration/using speedbar for
+;; ECB:
+;;
+;; 1. Integration the speedbar itself into the ecb-frame:
+;;
+;;    This allows you to:
+;;    
+;;    - Sync up to the speedbar with the current buffer.
+;;    
+;;    - Files opened with the speedbar are displayed in the ecb source window.
+;;
+;; 2. Using the speedbar-mechanism for parsing files supported not by semantic
+;;    but by imenu and/or etags.
+;;
+;;    This is not done via the speedbar-display but only the parsing mechanism
+;;    of `speedbar-fetch-dynamic-tags' is used and the tags are natively
+;;    display in the methods-buffer of ECB!
+;;
+;; Note that this is tested with recent speedbars >= 0.14beta1. If the
+;; speedbar implementation changes a lot this could break.
+;;
+;; If you enjoy this software, please consider a donation to the EFF
+;; (http://www.eff.org)
+
+;;; History:
+
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'speedbar)
+(require 'ecb-util)
+(require 'ecb-cedet-wrapper)
+(require 'ecb-common-browser)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+
+;; imenu
+(silentcomp-defvar imenu--rescan-item)
+(silentcomp-defvar imenu--index-alist)
+;; XEmacs
+(silentcomp-defun event-button)
+(silentcomp-defvar mouse-motion-handler)
+
+(defgroup ecb-speedbar nil
+  "Settings for the speedbar-integration of ECB."
+  :group 'ecb-general
+  :prefix "ecb-")
+
+(defcustom ecb-speedbar-before-activate-hook nil
+  "*Hook running directly before ECB activates the integrated speedbar.
+
+For example this hook can be used to change the expansion-mode of the
+integrated speedbar via `speedbar-change-initial-expansion-list'.
+Example: \(speedbar-change-initial-expansion-list \"buffers\")."
+  :group 'ecb-speedbar
+  :type 'hook)
+
+(defcustom ecb-speedbar-buffer-sync 'basic
+  "*Synchronize the speedbar-buffer of ECB automatically with current
+edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-speedbar-buffer-sync-hook' is evaluated."
+  :group 'ecb-speedbar
+  :type '(radio :tag "Synchronize ECBs speedbar buffer"
+                (const :tag "Use basic value" :value basic)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+    
+
+(defcustom ecb-speedbar-buffer-sync-delay 'basic
+  "*Time Emacs must be idle before the speedbar-buffer of ECB is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'."
+  :group 'ecb-speedbar
+  :type '(radio (const :tag "Use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-analyse-buffer-sync))))
+  :initialize 'custom-initialize-default)
+  
+(defcustom ecb-speedbar-buffer-sync-hook nil
+  "Hook run at the end of `ecb-speedbar-buffer-sync'.
+See documentation of `ecb-speedbar-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+- Current buffer is the buffer of the currently selected
+  edit-window.
+- The speedbar-buffer is displayed in a visible window of the
+  ecb-frame \(so no check for visibilty of the speedbar-buffer in
+  the ecb-frame is necessary in a hook function)
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option `ecb-speedbar-buffer-sync' is not
+nil the function `ecb-speedbar-buffer-sync' is running either
+every time Emacs is idle or even after every command \(see
+`ecb-speedbar-buffer-sync-delay'). So if the speedbar-buffer is
+displayed in a window of the ecb-frame \(see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically!"
+  :group 'ecb-speedbar
+  :type 'hook)
+
+
+(defecb-advice-set ecb-speedbar-adviced-functions 
+  "These functions of speedbar are always adviced if ECB is active.")
+
+(defconst ecb-speedbar-buffer-name " SPEEDBAR"
+  "Name of the ECB speedbar buffer.")
+
+(defun ecb-speedbar-buffer-selected ()
+  (equal (current-buffer) (get-buffer ecb-speedbar-buffer-name)))
+
+(defecb-advice speedbar-click around ecb-speedbar-adviced-functions
+  "Makes the function compatible with ECB. If ECB is active and the window of
+`ecb-speedbar-buffer-name' is visible \(means a layouts uses the
+speedbar-integration) and the clicked node in speedbar is a file then the
+ECB-edit-window is selected at the end. So always the edit-window is selected
+after clicking onto a filename in the speedbar."
+  ;; Klaus Berndl <klaus.berndl@sdm.de>: We must use an around-advice because
+  ;; we need exactly the information if the *clicked* item is a file or not.
+  ;; This is only available before the original speedbar-click actions because
+  ;; speedbar seems to do some intelligent stuff like autom. using the first
+  ;; file if a clicked directory contains any.
+  (let ((item (and (fboundp 'speedbar-line-file)
+                   (speedbar-line-file))))
+    ad-do-it
+    (if (and ecb-minor-mode
+             (equal (selected-frame) ecb-frame)
+             (window-live-p (get-buffer-window ecb-speedbar-buffer-name))
+             (and item
+                  (ecb-file-exists-p item)
+                  (not (ecb-file-directory-p item))))
+        (ecb-select-edit-window))))
+
+
+(defecb-advice speedbar-frame-mode around ecb-speedbar-adviced-functions
+  "During running speedbar within ECB this command is disabled!"
+  (if ecb-minor-mode
+      (when (interactive-p)
+        (ecb-info-message "speedbar-frame-mode takes no effect when running within ECB!"))
+    ad-do-it))
+
+
+(defecb-advice speedbar-get-focus around ecb-speedbar-adviced-functions
+  "During running speedbar within ECB this function behaves like follows:
+Change window focus to or from the ECB-speedbar-window. If the selected window
+is not speedbar-window, then the speedbar-window is selected. If the
+speedbar-window is active, then select the edit-window."
+  (if ecb-minor-mode
+      (if (ecb-speedbar-buffer-selected)
+          (ecb-select-edit-window)
+        (ecb-speedbar-select-speedbar-window))
+    ad-do-it))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: This implementation is done to make
+;; clear where the bug is fixed...a better impl. can be seen in
+;; tree-buffer-mouse-set-point (does the same but better code - IMHO).
+(defecb-advice dframe-mouse-set-point around ecb-speedbar-adviced-functions
+  "Fixes a bug in the original implementation: if clicked onto an image then
+the point was not set by `mouse-set-point'."
+  (if (and (fboundp 'event-over-glyph-p) (event-over-glyph-p e))
+      ;; We are in XEmacs, and clicked on a picture
+      (let ((ext (event-glyph-extent e)))
+        ;; This position is back inside the extent where the
+        ;; junk we pushed into the property list lives.
+        (if (extent-end-position ext)
+            (progn
+              (mouse-set-point e)
+              (goto-char (1- (extent-end-position ext))))
+          (mouse-set-point e)))
+    ;; We are not in XEmacs, OR we didn't click on a picture.
+    (mouse-set-point e)))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: we can not advice
+;; speedbar-select-attached-frame because this is a defsubst and is therefore
+;; inline compiled into all users of this function. So our advice would never
+;; take effect. But dframe-select-attached-frame is a defun so we can advice
+;; it!
+(defecb-advice dframe-select-attached-frame after ecb-speedbar-adviced-functions
+  "Run `ecb-speedbar-dframe-select-attached-window' but only if
+`dframe-after-select-attached-frame-hook' is not available."
+  (unless (boundp 'dframe-after-select-attached-frame-hook)
+    (ecb-speedbar-dframe-select-attached-window)))
+
+(defun ecb-speedbar-dframe-select-attached-window ()
+  (when (and ecb-last-edit-window-with-point
+             ecb-last-source-buffer
+             (window-live-p ecb-last-edit-window-with-point)
+             (equal (window-buffer ecb-last-edit-window-with-point)
+                    ecb-last-source-buffer))
+    (select-window ecb-last-edit-window-with-point)
+    (set-buffer ecb-last-source-buffer)
+;;     nil
+    ))
+
+(defun ecb-speedbar-select-speedbar-window ()
+  (ignore-errors
+    (and (window-live-p (get-buffer-window ecb-speedbar-buffer-name))
+         (select-window (get-buffer-window ecb-speedbar-buffer-name)))))
+
+(defun ecb-speedbar-set-buffer()
+  "Set the speedbar buffer within ECB."
+  (ecb-speedbar-activate)
+  (set-window-buffer (selected-window)
+                     (get-buffer-create ecb-speedbar-buffer-name))
+  (unless ecb-running-xemacs
+    (set (make-local-variable 'automatic-hscrolling) nil)))
+
+
+(defvar ecb-speedbar-verbosity-level-old nil)
+(defvar ecb-speedbar-select-frame-method-old nil)
+(defvar ecb-speedbar-update-flag-old -1)
+
+(defun ecb-speedbar-activate()
+  "Make sure the speedbar is running. WARNING: This could be dependent on the
+current speedbar implementation but normally it should work with recent
+speedbar versions >= 0.14beta1. But be aware: If the speedbar impl changes in
+future this could break."
+
+  ;; enable the advices for speedbar
+  (ecb-enable-advices 'ecb-speedbar-adviced-functions)
+  
+  (run-hooks 'ecb-speedbar-before-activate-hook)
+
+  (add-hook 'dframe-after-select-attached-frame-hook
+            'ecb-speedbar-dframe-select-attached-window)
+
+  ;;disable automatic speedbar updates... let the ECB handle this with
+  ;;its sync-mechanism
+  (speedbar-disable-update)
+
+  ;;always stay in the current frame
+  ;; save the old value but only first time!
+  (if (null ecb-speedbar-select-frame-method-old)
+      (setq ecb-speedbar-select-frame-method-old speedbar-select-frame-method))
+  (setq speedbar-select-frame-method 'attached)
+
+  (when (not (buffer-live-p speedbar-buffer))
+    (save-excursion
+      (setq speedbar-buffer (get-buffer-create ecb-speedbar-buffer-name))
+      (set-buffer speedbar-buffer)
+      (speedbar-mode)
+
+      (if ecb-running-xemacs
+          ;; Hack the XEmacs mouse-motion handler
+          (progn
+            ;; Hack the XEmacs mouse-motion handler
+            (set (make-local-variable 'mouse-motion-handler)
+                 'dframe-track-mouse-xemacs)
+            ;; Hack the double click handler
+            (make-local-variable 'mouse-track-click-hook)
+            (add-hook 'mouse-track-click-hook
+                      (lambda (event count)
+                        (if (/= (event-button event) 1)
+                            nil		; Do normal operations.
+                          (case count
+                            (1 (dframe-quick-mouse event))
+                            ((2 3) (dframe-click event)))
+                          ;; Don't do normal operations.
+                          t))))
+        ;; Enable mouse tracking in emacs
+        (if dframe-track-mouse-function
+            (set (make-local-variable 'track-mouse) t)) ;this could be messy.
+        ;; disable auto-show-mode for Emacs
+        ;; obsolete with beginning of Emacs 21...
+;;         (setq auto-show-mode nil)
+        )))
+
+  ;;Start up the timer
+  (speedbar-reconfigure-keymaps)
+  (speedbar-update-contents)
+  (speedbar-set-timer 1)
+
+  ;;Set the frame that the speedbar should use.  This should be the selected
+  ;;frame.  AKA the frame that ECB is running in.
+  (setq speedbar-frame ecb-frame)
+  (setq dframe-attached-frame ecb-frame)
+  
+  ;;this needs to be 0 because we can't have the speedbar too chatty in the
+  ;;current frame because this will mean that the minibuffer will be updated too
+  ;;much.
+  ;; save the old value but only first time!
+  (if (null ecb-speedbar-verbosity-level-old)
+      (setq ecb-speedbar-verbosity-level-old speedbar-verbosity-level))
+  (setq speedbar-verbosity-level 0)
+
+  ;; save old update-flag but only the first time
+  (if (equal ecb-speedbar-update-flag-old -1)
+      (setq ecb-speedbar-update-flag-old speedbar-update-flag))
+  (setq speedbar-update-flag nil)
+
+  (ecb-activate-ecb-autocontrol-function ecb-speedbar-buffer-sync-delay 
+                                          'ecb-speedbar-buffer-sync)
+
+  ;;reset the selection variable
+  (setq speedbar-last-selected-file nil))
+
+
+(defun ecb-speedbar-deactivate ()
+  "Reset things as before activating speedbar by ECB"
+  (ecb-disable-advices 'ecb-speedbar-adviced-functions)
+  
+  (remove-hook 'dframe-after-select-attached-frame-hook
+               'ecb-speedbar-dframe-select-attached-window)
+
+  (setq speedbar-frame nil)
+  (setq dframe-attached-frame nil)
+
+  (speedbar-enable-update)
+  
+  (if ecb-speedbar-select-frame-method-old
+      (setq speedbar-select-frame-method ecb-speedbar-select-frame-method-old))
+  (setq ecb-speedbar-select-frame-method-old nil)
+
+  (if ecb-speedbar-verbosity-level-old
+      (setq speedbar-verbosity-level ecb-speedbar-verbosity-level-old))
+  (setq ecb-speedbar-verbosity-level-old nil)
+
+  (if (not (equal ecb-speedbar-update-flag-old -1))
+      (setq speedbar-update-flag ecb-speedbar-update-flag-old))
+
+  (ecb-stop-autocontrol/sync-function 'ecb-speedbar-buffer-sync)
+
+  (when (and speedbar-buffer
+             (buffer-live-p speedbar-buffer))
+    (kill-buffer speedbar-buffer)
+    (setq speedbar-buffer nil)))
+
+
+(defun ecb-speedbar-active-p ()
+  "Return not nil if speedbar is active and integrated in the `ecb-frame'."
+  (and (get-buffer ecb-speedbar-buffer-name)
+       (get-buffer-window (get-buffer ecb-speedbar-buffer-name) ecb-frame)))
+
+(defun ecb-speedbar-update-contents ()
+  "Encapsulate updating the speedbar."
+  (speedbar-update-contents))
+
+
+(defecb-autocontrol/sync-function ecb-speedbar-buffer-sync
+    ecb-speedbar-buffer-name ecb-speedbar-buffer-sync t
+  "Update the speedbar so that it's synced up with the current file."
+  (let ((speedbar-default-directory
+         (save-excursion
+           (set-buffer visible-buffer)
+           (ecb-fix-filename default-directory)))
+        (ecb-default-directory (ecb-fix-filename default-directory)))
+    (when (and (or (not (ecb-string= speedbar-default-directory
+                                     ecb-default-directory))
+                   (member speedbar-initial-expansion-list-name
+                           ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: make
+                           ;; this customizable
+                           '("buffers" "Analyze")))
+               speedbar-buffer
+               (buffer-live-p speedbar-buffer))
+      (ecb-speedbar-update-contents)
+      (run-hooks 'ecb-speedbar-buffer-sync-hook))))
+
+(defun ecb-goto-window-speedbar ()
+  "Make the ECB-speedbar window the current window.
+This command does nothing if no integrated speedbar is visible in the
+ECB-frame."
+  (interactive)
+  (ecb-goto-ecb-window ecb-speedbar-buffer-name))
+
+(defun ecb-maximize-window-speedbar ()
+  "Maximize the ECB-speedbar-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Does nothing if the
+speedbar-window is not visible within the ECB-frame."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-speedbar-buffer-name t))
+
+
+;; Handling of files which can not be parsed by semantic (i.e. there is no
+;; semantic-grammar available) but which can be parsed by imenu and/or etags
+;; via speedbar.
+
+(defun ecb-speedbar-sb-tag-p (tag)
+  "Return not nil if TAG is a semantic-tag generated from a speedbar tag."
+  (ecb--semantic--tag-get-property tag 'ecb-speedbar-tag))
+
+(require 'tree-buffer)
+(require 'ecb-face)
+(defun ecb-create-non-semantic-tree (node tag-list)
+  "Add all tags of TAG-LIST with side-effects as children to NODE. TAG-LIST is
+a list generated by `ecb-get-tags-for-non-semantic-files'. TAG-LIST is of the
+form:
+\( \(\"name\" . marker-or-number) <-- one tag at this level
+  \(\"name\" \(\"name\" . mon) (\"name\" . mon) )  <-- one group of tags
+  \(\"name\" mon \(\"name\" . mon) )             <-- group w/ a pos. and tags
+
+Groups can contain tags which are groups again...therefore this function is
+called recursive for the elements of a group.
+
+Return NODE."
+  (let ((new-node nil)
+        (new-tag nil))
+    (dolist (tag tag-list)
+      (typecase tag
+        (null nil) ;; this would be a separator
+        (speedbar-generic-list-tag
+         ;; the semantic tag for this tag
+         (setq new-tag (ecb--semantic-tag (car tag)
+                                          (intern (car tag))))
+         (ecb--semantic--tag-set-overlay new-tag (make-vector 2 (cdr tag)))
+         (ecb--semantic--tag-put-property new-tag 'ecb-speedbar-tag t)
+         (ecb-apply-user-filter-to-tags (list new-tag))
+         (when (not (ecb-tag-forbidden-display-p new-tag))
+           (tree-node-new (progn
+                            (set-text-properties
+                             0 (length (car tag))
+                             `(face ,ecb-method-non-semantic-face) (car tag))
+                            (car tag))
+                          0
+                          new-tag
+                          t
+                          node)))
+        (speedbar-generic-list-positioned-group
+         ;; the semantic tag for this tag
+         (setq new-tag (ecb--semantic-tag (car tag)
+                                          (intern (car tag))))
+         (ecb--semantic--tag-set-overlay new-tag
+                                         (make-vector 2 (car (cdr tag))))
+         (ecb--semantic--tag-put-property new-tag 'ecb-speedbar-tag t)
+         (ecb-apply-user-filter-to-tags (list new-tag))
+         (when (not (ecb-tag-forbidden-display-p new-tag))             
+           (ecb-create-non-semantic-tree
+            (setq new-node
+                  (tree-node-new (progn
+                                   (set-text-properties
+                                    0 (length (car tag))
+                                    `(face ,ecb-method-non-semantic-face) (car tag))
+                                   (car tag))
+                                 0
+                                 new-tag
+                                 nil node))
+            (cdr (cdr tag)))
+           (setf (tree-node->expanded new-node)
+                 (member major-mode
+                         ecb-non-semantic-methods-initial-expand))))
+        (speedbar-generic-list-group
+         (ecb-create-non-semantic-tree
+          (setq new-node
+                (tree-node-new (progn
+                                 (set-text-properties
+                                  0 (length (car tag))
+                                  `(face ,ecb-method-non-semantic-face) (car tag))
+                                 (car tag))
+                               1
+                               nil nil node))
+          (cdr tag))
+         (setf (tree-node->expanded new-node)
+               (member major-mode
+                       ecb-non-semantic-methods-initial-expand)))
+        (otherwise
+         (ecb-error "ecb-create-non-semantic-tree: malformed tag-list!")
+         )))
+    node))
+
+(defun ecb-get-tags-for-non-semantic-files ()
+  "Get a tag-list for current source-file. This is done via the
+`speedbar-fetch-dynamic-tags' mechanism which supports imenu and etags."
+  (require 'imenu)
+  (if (member major-mode ecb-non-semantic-exclude-modes)
+      nil
+    (let* ((lst (let ((speedbar-dynamic-tags-function-list
+                       (if (not (assoc major-mode
+                                       ecb-non-semantic-parsing-function))
+                           (list (cons 'speedbar-fetch-dynamic-imenu 'identity)
+                                 (cons 'speedbar-fetch-dynamic-etags 'identity))
+                         (list (cons (cdr (assoc major-mode
+                                                 ecb-non-semantic-parsing-function))
+                                     'identity)))))
+                  (speedbar-fetch-dynamic-tags (ecb-buffer-file-name
+                                                (current-buffer)))))
+           (tag-list (cdr lst))
+           (methods speedbar-tag-hierarchy-method))
+    
+      ;; removing the imenu-Rescan-item
+      (if (ecb-string= (car (car tag-list)) (car imenu--rescan-item))
+          (setq tag-list (cdr tag-list)))
+      ;; If imenu or etags returns already groups (etags will do this probably
+      ;; not, but imenu will do this sometimes - e.g. with cperl) then we do not
+      ;; regrouping with the speedbar-methods of
+      ;; `speedbar-tag-hierarchy-method'!
+      (when (dolist (tag tag-list t)
+              (if (or (speedbar-generic-list-positioned-group-p tag)
+                      (speedbar-generic-list-group-p tag))
+                  (return nil)))
+        (while methods
+          (setq tag-list (funcall (car methods) tag-list)
+                methods (cdr methods))))
+      tag-list)))
+
+
+(silentcomp-provide 'ecb-speedbar)
+
+;;; ecb-speedbar.el ends here
diff --git a/site/ecb-2.40/ecb-symboldef.el b/site/ecb-2.40/ecb-symboldef.el
new file mode 100644
index 0000000..3b54493
--- /dev/null
+++ b/site/ecb-2.40/ecb-symboldef.el
@@ -0,0 +1,456 @@
+;;; ecb-symboldef.el --- ECB displayor for symbol-definitions
+
+;;; Copyright (C) 2005 Hauke Jans
+
+;; Author: Hauke Jans, <hauke.jans@sesa.de>, <hauke.jans@t-online.de>
+;; Maintainer: Hauke Jans, <hauke.jans@sesa.de>, <hauke.jans@t-online.de>
+;;             Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, symbol-definition
+;; Created: 2005
+
+;; This program is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 2, or (at your option) any later
+;; version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+;; more details.
+
+;; You should have received a copy of the GNU General Public License along
+;; with GNU Emacs; see the file COPYING. If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-symboldef.el,v 1.7 2009/05/08 14:05:55 berndl Exp $
+
+;;; Commentary:
+;;
+;; Define an ecb-buffer which shows in a special ecb buffer the semantic
+;; context of the definition of a current symbol under point.
+;;
+
+;;; Usage
+;;
+;; Either use the layout "left-symboldef" (e.g. via [C-c . l c]) or create a
+;; new ecb-layout via the command `ecb-create-new-layout' and add a buffer of
+;; type "other" and name "symboldef" into this new layout.
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+
+(require 'ecb-util)
+(require 'ecb-layout)
+(require 'ecb-common-browser)
+(require 'ecb-cedet-wrapper)
+
+(eval-when-compile
+  (require 'silentcomp))
+
+;; XEmacs-stuff
+(silentcomp-defun function-arglist)
+(silentcomp-defun function-documentation)
+(silentcomp-defun find-tag-internal)
+;; Emacs stuff
+(silentcomp-defun find-tag-noselect)
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>:
+;; 1. Add all necessary documentation to the info-manual (texi)
+;; 2. Add this preferences group to the menu in ecb.el
+(defgroup ecb-symboldef nil
+  "Settings for the symbol-definition-buffer in the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defcustom ecb-symboldef-buffer-name " *ECB Symboldefinition*"
+  "*Name of the ECB-symbol-definition buffer.
+Because it is not a normal buffer for editing you should enclose the name with
+stars, e.g. \"*ECB Symboldefinition*\".
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object
+of the ECB-symbol-definition-buffer by this name, e.g. by a call of
+`set-buffer'.
+
+Changes for this option at runtime will take affect only after deactivating and
+then activating ECB again!"
+  :group 'ecb-symboldef
+  :type 'string)
+
+(defcustom ecb-symboldef-find-functions
+  '((lisp-interaction-mode . ecb-symboldef-find-lisp-doc)
+    (lisp-mode . ecb-symboldef-find-lisp-doc)
+    (emacs-lisp-mode . ecb-symboldef-find-lisp-doc)
+    (default . ecb-symboldef-find-definition))
+    "*Funtions to find the definition for current symbol under point.
+This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. The value of this option is a list of
+cons-cells:
+- The car is either a major-mode symbol or the special symbol 'default which
+  means if no setting for a certain major-mode is defined then the cdr of
+  the 'default cons-cell is used.
+- The car is a function intended to find the definition of a certain symbol
+  for files of this major-mode. Such a function will be called with two
+  arguments, the first is the symbol-name as string for which the definition
+  should be displayed and the second the current edit-buffer as buffer-object,
+  i.e. the current buffer of the current edit-window. The function will be
+  called with the special ecb-symbol-definition-buffer as current buffer
+  whereas this buffer is empty. The function has to insert everything
+  necessary to display the symbol-definition and is also responsible to format
+  the displayed text. The buffer-local variable `fill-column is already preset
+  to the window-width of the special ecb-window minus 1. The function is
+  responsible to set the buffer-local variable `truncate-lines' appropriate.
+  The function can either return nil or a string which will be integrated in
+  the modeline-display of this ecb-window.
+
+There are two prefined functions `ecb-symboldef-find-lisp-doc' and
+`ecb-symboldef-find-definition' whereas the latter on is used a default
+find-function."
+  :group 'ecb-symboldef
+  :type '(repeat (cons (symbol :tag "Major-mode")
+                       (function :tag "Find function"))))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: This option is an example how the
+;; user could determine which backends should be used for finding a definition
+;; and also in which order the backends should be tried...
+;; probbaly not necessary anymore with current cedet
+;; (defcustom ecb-symboldef-find-backends '(semanticdb etags)
+;;   "*Feature currently not implemented!"
+;;   :group 'ecb-symboldef
+;;   :type '(repeat (choice :tag "Backends"
+;;                          :menu-tag "Backends"
+;;                          (const :tag "semanticdb" :value semanticdb)
+;;                          (const :tag "etags" :value etags)
+;;                          (symbol :tag "Other"))))
+
+(defcustom ecb-symboldef-buffer-sync 'basic
+  "*Synchronize the symboldef buffer automatically with current edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-symboldef-buffer-sync-hook' is evaluated."
+  :group 'ecb-symboldef
+  :type '(radio :tag "Synchronize ECBs symboldef buffer"
+                (const :tag "Use basic value" :value basic)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+    
+
+(defcustom ecb-symboldef-buffer-sync-delay 'basic
+  "*Time Emacs must be idle before the symboldef-buffer is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'."
+  :group 'ecb-symboldef
+  :type '(radio (const :tag "Use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-analyse-buffer-sync))))
+  :initialize 'custom-initialize-default)
+  
+(defcustom ecb-symboldef-buffer-sync-hook nil
+  "Hook run at the end of the function `ecb-symboldef-buffer-sync'.
+See documentation of `ecb-symboldef-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+- Current buffer is the buffer of the currently selected
+  edit-window.
+- The symboldef-buffer is displayed in a visible window of the
+  ecb-frame \(so no check for visibilty of the symboldef-buffer in
+  the ecb-frame is necessary in a hook function)
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option `ecb-symboldef-buffer-sync' is not
+nil the function `ecb-symboldef-buffer-sync' is running either
+every time Emacs is idle or even after every command \(see
+`ecb-symboldef-buffer-sync-delay'). So if the symboldef-buffer is
+displayed in a window of the ecb-frame \(see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically!"
+  :group 'ecb-symboldef
+  :type 'hook)
+
+
+;; ---- internal variables -----------
+
+(defvar ecb-symboldef-last-symbol nil
+  "Holds the previous symbol under cursor")
+
+(defun ecb-symboldef-get-find-function ()
+  "Returns the symbol find function to use according to major-mode"
+  (let ((mode-function (cdr (assoc major-mode ecb-symboldef-find-functions)))
+	(default-function (cdr (assoc 'default ecb-symboldef-find-functions))))
+    (or mode-function
+        default-function
+        'ecb-symboldef-find-null)))
+
+(defun ecb-symboldef-find-null (symbol-name edit-buffer)
+  "Empty symbol-definition find function. 
+Only prints mode and info but does not find any symbol-definition."
+  (let ((symboldef-window-height (ecb-window-full-height
+                                  (get-buffer-window (current-buffer)))))
+    (dotimes (i (/ symboldef-window-height 2)) (insert "\n"))
+    (insert  "*  No symbol definition function for current mode *\n"
+             "*  See variable `ecb-symboldef-find-functions' *")))
+
+(defun ecb-symboldef-get-elisp-arglist (function)
+  "Return the argument-list of FUNCTION as a string in the format:
+\(FUNCTION ARG1 ARG2...ARGn)."
+  (if ecb-running-xemacs
+      ;; XEmacs does not return an arglist for builtins (test by subrp)! So if
+      ;; the documentation itself does not contain the arglist there is no way
+      ;; to get it (e.g. call C-h f for `append', `list'...).
+      (function-arglist function)
+    ;; GNU Emacs - mechanism stolen from `describe-function-1'...
+    (let (;; resolve alias-chains
+          (def (indirect-function function))
+          (arglist nil))
+      ;; If def is a macro, find the function inside it.
+      (if (eq (car-safe def) 'macro)
+          (setq def (cdr def)))
+      (setq arglist (cond ((byte-code-function-p def)
+                           (car (append def nil)))
+                          ((eq (car-safe def) 'lambda)
+                           (nth 1 def))
+                          ((and (eq (car-safe def) 'autoload)
+                                (not (eq (nth 4 def) 'keymap)))
+                           (concat "[Arg list not available until "
+                                   "function definition is loaded.]"))
+                          (t t)))
+      (cond ((listp arglist)
+             (prin1-to-string
+              (cons (if (symbolp function) function "anonymous")
+                    (mapcar (lambda (arg)
+                              (if (memq arg '(&optional &rest))
+                                  arg
+                                (intern (upcase (symbol-name arg)))))
+                            arglist))))
+            ((stringp arglist)
+             (format "(%s %s)" function arglist))))))
+
+(defun ecb-symboldef-find-lisp-doc (symbol-name edit-buffer)
+  "Insert the lisp-documentation of symbol with name SYMBOL-NAME."
+  (setq truncate-lines nil)
+  (let ((symbol (intern symbol-name))
+        (retval nil)
+        (args nil))
+    (when (fboundp symbol)
+      (insert (format "%s\t%s\n\n" symbol
+                      (if (commandp symbol)
+                          (let ((keys (where-is-internal symbol)))
+                            (if keys
+                                (concat
+                                 "is a command with keys: "
+                                 (mapconcat 'key-description
+                                            keys ", "))
+                              "is a command with no keys"))
+                        "is a function")))
+      (insert (format "%s\n\n" (or (documentation symbol)
+                                   "Not documented")))
+      (setq args (ecb-symboldef-get-elisp-arglist symbol))
+      ;; KB: We display the arglist AFTER the documentation because in GNU
+      ;; Emacs the documentation of subr's (test by subrp) contains the
+      ;; arglist at the end of the documentation so we display it at the same
+      ;; place for all other functions. The internal help of GNU Emacs has an
+      ;; ugly hack for its function-help (see `describe-function-1' in
+      ;; help.el) which searches for the arglist of subr's in the docu,
+      ;; removes it from the end and inserts it again at beginning of the
+      ;; documentation. I'm to lazy to do the same here because it's a clumsy
+      ;; hack...but if you want the arglist in front of the docu-text you have
+      ;; to do this here too (how to do it can be seen in
+      ;; `describe-function-1').
+      (and args (insert (format "%s\n\n" args)))
+      (setq retval (format "Lisp %s"
+                           (if (commandp symbol)
+                               "Command"
+                             "Function"))))
+    (when (boundp symbol)
+      (insert (format "%s\t%s\n\n%s\n\nValue: %s\n\n" symbol
+                      (if (user-variable-p symbol)
+                          "Option " "Variable")
+                      (or (documentation-property
+                           symbol 'variable-documentation)
+                          "not documented")
+                      (symbol-value symbol)))
+      (setq retval "Lisp Variable"))
+    (fill-region (point-min) (point-max) 'left)
+    retval))
+
+(defun ecb-symboldef-find-tag-by-semanticdb (symbol-name edit-buffer)
+  "Function to find a semantic-tag by SYMBOL-NAME.
+Returns nil if not found otherwise a list \(tag-buffer tag-begin tag-end)"
+  (save-excursion
+    (set-buffer edit-buffer)
+    (let* ((mytag-list (ecb--semanticdb-brute-deep-find-tags-by-name symbol-name
+                                                                     nil t))
+	   (mytag (if mytag-list 
+                      (car (ecb--semanticdb-find-result-nth
+                            mytag-list
+                            (1- (ecb--semanticdb-find-result-length mytag-list))))))
+	   (mytag-ovr (if mytag (semantic-tag-bounds mytag)))
+	   (mytag-min (if mytag-ovr (car mytag-ovr)))
+	   (mytag-max (if mytag-ovr (car (cdr mytag-ovr))))
+	   (mytag-buf (if mytag (semantic-tag-buffer mytag))))
+      (if mytag-buf
+          (list mytag-buf mytag-min mytag-max)))))
+
+(defun ecb-symboldef-find-tag-by-etags (symbol-name edit-buffer)
+  "Try to find the definition of SYMBOL-NAME via etags.
+Returns nil if not found otherwise a list \(tag-buffer tag-begin tag-end)
+whereas tag-end is currently always nil."
+  (if ecb-running-xemacs
+      (let ((result (ignore-errors (find-tag-internal (list symbol-name)))))
+	(if result
+	    (list (car result) (cdr result) nil)))
+    ;; else gnu emacs:
+    (let* ((result-buf (ignore-errors (find-tag-noselect symbol-name)))
+	   (result-point (if result-buf 
+                             (with-current-buffer result-buf
+                               (point)))))
+      (if result-buf
+	  (list result-buf result-point nil)))))
+
+(defun ecb-symboldef-find-definition (symbol-name edit-buffer)
+  "Inserts the definition of symbol with name SYMBOL-NAME.
+Fill the upper-half of the special ecb-window with text preceding the
+symbol-definition in the definition-file. First tries to find the definition
+with semanticdb and then - if no success - with current etags-file."
+  (let* ((symboldef-window-height (ecb-window-full-height
+                                   (get-buffer-window (current-buffer))))
+         ;; first lookup via semnaticdb, then via etags:
+         (result (or (ecb-symboldef-find-tag-by-semanticdb symbol-name edit-buffer)
+                     (ecb-symboldef-find-tag-by-etags symbol-name edit-buffer)
+                     (list nil nil nil)))
+         (num-tag-lines (- (/ symboldef-window-height 2) 0))
+         (tag-buf (nth 0 result))
+         (tag-point (nth 1 result))
+         (tag-point-max (nth 2 result))
+         (extend-point-min nil)
+         (extend-point-max nil)
+         (hilight-point-min nil)
+         (hilight-point-max nil))
+    (setq truncate-lines t)
+    (when tag-buf
+      (save-excursion
+        (set-buffer tag-buf)
+        (goto-char tag-point)
+        (forward-line (- num-tag-lines))
+        (setq extend-point-min (point))
+        (forward-line num-tag-lines)
+        (forward-line num-tag-lines)
+        (setq extend-point-max (point)))
+      (insert (ecb-buffer-substring extend-point-min extend-point-max tag-buf))
+      (goto-char (+ (- tag-point extend-point-min) 1))
+      (setq hilight-point-min (point))
+      (if tag-point-max 
+          (goto-char (+ (- tag-point-max extend-point-min) 1))
+        (end-of-line))
+      (setq hilight-point-max (point))
+      (add-text-properties hilight-point-min hilight-point-max
+                           '(face highlight ))
+      ;; return value
+      (buffer-name tag-buf))))
+
+(defecb-autocontrol/sync-function ecb-symboldef-buffer-sync
+    ecb-symboldef-buffer-name ecb-symboldef-buffer-sync t
+  "Synchronizes the symbol-definition buffer with current source if changed.
+Can be called interactively but normally this should not be necessary because
+it will be called by internal idle-mechanism'.
+
+Runs the finder of `ecb-symboldef-find-functions' for current
+symbol. Displays the found text in the buffer of
+`ecb-symboldef-buffer-name' if it is displayed in a window of the ecb-frame."
+  (save-excursion
+    (let ((modeline-display nil)
+          (edit-buffer (current-buffer))
+          (current-symbol
+           ;; check if point is not at start, since
+           ;; buggy thingatpt yields error then:
+           ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: i can not believe this
+           (if (> (point) (point-min))
+               (ecb-thing-at-point 'symbol)
+             nil))
+          ;; find tag search function according to mode:
+          (find-func (ecb-symboldef-get-find-function)))
+      ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: make an option for this
+      ;; min-length 
+      ;; only use tags with a minimal length:
+      (setq current-symbol (if (> (length current-symbol) 3)
+                               current-symbol))
+      ;; buggy thingatpt returns whole buffer if on empty line:
+      (setq current-symbol (if (< (length current-symbol) 80)
+                               current-symbol))
+      ;; research tag only if different from last and not empty: 
+      (when (and current-symbol
+                 (not (equal current-symbol ecb-symboldef-last-symbol)))
+        (ecb-with-readonly-buffer visible-buffer
+          (setq ecb-symboldef-last-symbol current-symbol)
+          (erase-buffer)
+          (setq fill-column (1- (window-width visible-window)))
+          (setq modeline-display
+                (or (funcall find-func
+                             current-symbol
+                             edit-buffer)
+                    ""))
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: replace this by
+          ;; a ecb-mode-line-format - if possible?!
+          (ecb-mode-line-set (buffer-name visible-buffer)
+                             (selected-frame)
+                             (format "* Def %s <<%s>> *"
+                                     modeline-display current-symbol)
+                             nil t)
+          ))))
+  (run-hooks 'ecb-symboldef-buffer-sync-hook))
+
+
+(defecb-window-dedicator ecb-set-symboldef-buffer
+    (buffer-name (get-buffer-create ecb-symboldef-buffer-name))
+  "Set the buffer in the current window to the tag-definition-buffer and make
+this window dedicated for this buffer."
+  (switch-to-buffer (get-buffer-create ecb-symboldef-buffer-name))
+  (ecb-activate-ecb-autocontrol-function ecb-symboldef-buffer-sync-delay
+                                         'ecb-symboldef-buffer-sync))
+
+(defun ecb-maximize-window-symboldef ()
+  "Maximize the ECB-symbol-defnition window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works also if the
+ECB-symboldefinition-window is not visible in current layout."
+  (interactive)
+  (ecb-maximize-ecb-buffer ecb-symboldef-buffer-name t))
+
+(defun ecb-goto-window-symboldef ()
+  "Make the ECB-symbol-definition window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-symboldef-buffer-name))
+
+(silentcomp-provide 'ecb-symboldef)
+
+;;; ecb-symboldef.el ends here
diff --git a/site/ecb-2.40/ecb-tod.el b/site/ecb-2.40/ecb-tod.el
new file mode 100644
index 0000000..8f41e67
--- /dev/null
+++ b/site/ecb-2.40/ecb-tod.el
@@ -0,0 +1,149 @@
+;;; ecb-tod.el --- ECB tip of the day
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2003
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-tod.el,v 1.23 2009/04/21 15:23:22 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains code for tips of the day
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+
+(silentcomp-defvar ecb-tod-cursor)
+
+(defcustom ecb-tip-of-the-day t
+  "*Show tip of the day at start time of ECB."
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-tip-of-the-day-file "~/.ecb-tip-of-day.el"
+  "*File where tip-of-the-day cursor is stored."
+  :group 'ecb-general
+  :type 'file)
+
+(defconst ecb-tod-tip-list
+  '("You can expand the ECB-methods-buffer with `ecb-expand-methods-nodes' [C-c . x]."
+    "You can toggle between different layouts with `ecb-toggle-layout' [C-c . t]."
+    "You can go back to the most recent layout with [C-u] `ecb-toggle-layout' [C-u C-c . t]."
+    "You can toggle displaying the ECB-windows with `ecb-toggle-ecb-windows' [C-c . w]."
+    "You can show and hide the ECB-windows on a major-mode-basis with `ecb-major-modes-show-or-hide'."
+    "You can maximize a certain ECB-window either via its popup-menu or with [C-x 1] in that window."
+    "You can use speedbar instead of the native tree-buffers with option `ecb-use-speedbar-instead-native-tree-buffer'."
+    "You can speedup access for big directories with option `ecb-cache-directory-contents'."
+    "You can display the online help also in HTML-format with option `ecb-show-help-format'."
+    "You can interactively create your own layouts with the command `ecb-create-new-layout'."
+    "You can start the eshell in the compile-window simply with `eshell' or [C-c . e]."
+    "Use the incremental search in the methods-buffer for fast node-selecting; see `ecb-tree-incremental-search'."
+    "You can cycle through all currently opened \"compile-buffers\" with `ecb-cycle-through-compilation-buffers'."
+    "You can change the window-sizes by dragging the mouse and storing the new sizes with `ecb-store-window-sizes'."
+    "You can get a quick overlook of all built-in layouts with `ecb-show-layout-help'."
+    "Browse your sources as with a web-browser with `ecb-nav-goto-next' \[C-c . n], `ecb-nav-goto-previous' \[C-c . p]."
+    "Customize the look\&feel of the tree-buffers with `ecb-tree-expand-symbol-before' and `ecb-tree-indent'."
+    "Customize the contents of the methods-buffer with `ecb-tag-display-function', `ecb-type-tag-display', `ecb-show-tags'."
+    "Customize the main mouse-buttons of the tree-buffers with `ecb-primary-secondary-mouse-buttons'."
+    "Customize with `ecb-tree-do-not-leave-window-after-select' for which tree-buffers a selection doesn't leave the window."
+    "Grep a directory \(recursive) by using the popup-menu \(the right mouse-button) in the directories buffer."
+    "Customize the sorting of the sources with the option `ecb-sources-sort-method'."
+    "Narrow the source-buffer to the selected tag in the methods-buffer with `ecb-tag-visit-post-actions'."
+    "Enable autom. enlarging of the compile-window by select with the option `ecb-compile-window-temporally-enlarge'."
+    "Customize with `ecb-compile-window-temporally-enlarge' the situations the compile-window is allowed to enlarge."
+    "Customize the meaning of `other-window' [C-x o] with the option `ecb-other-window-behavior'."
+    "Customize height and width of the ECB-windows with `ecb-windows-height' and `ecb-windows-width'."
+    "Define with `ecb-compilation-buffer-names' and `ecb-compilation-major-modes' which buffers are \"compile-buffers\"."
+    "Customize all faces used by ECB with the customize-groups `ecb-face-options' and `ecb-faces'."
+    "Auto-activate eshell with the option `ecb-eshell-auto-activate'."
+    "Get best use of big screen-displays with leftright-layouts like \"leftright1\" or \"leftright2\"."
+    "Use the POWER-click in the methods-buffer to narrow the clicked node in the edit-window."
+    "Use the POWER-click in the sources- and history-buffer to get only an overlook of the source-contents."
+    "Exclude not important sources from being displayed in the sources-buffer with `ecb-source-file-regexps'."
+    "Use left- and right-arrow for smart expanding/collapsing tree-buffer-nodes; see `ecb-tree-navigation-by-arrow'." ;;
+    "Add personal key-bindings to the tree-buffers with `ecb-common-tree-buffer-after-create-hook'."
+    "Add personal key-bindings to the directories-buffer with `ecb-directories-buffer-after-create-hook'."
+    "Add personal key-bindings to the sources-buffer with `ecb-sources-buffer-after-create-hook'."
+    "Add personal key-bindings to the methods-buffer with `ecb-methods-buffer-after-create-hook'."
+    "Add personal key-bindings to the history-buffer with `ecb-history-buffer-after-create-hook'."
+    "Pop up a menu with the right mouse-button and do senseful things in the tree-buffers."
+    "Extend the builtin popup-menus to your needs - see `ecb-directories-menu-user-extension'."
+    "Call `ecb-show-help' [C-c . o] with a prefix-argument [C-u] and choose the help-format."
+    "You can change the prefix [C-c .] of all ECB-key-bindings quick and easy with `ecb-key-map'."
+    "Send a problem-report to the ECB-mailing-list quick and easy with `ecb-submit-problem-report'."
+    "Switch on/off auto. expanding of the ECB-methods-buffer with `ecb-auto-expand-directory-tree'."
+    "You can quickly toggle auto. expanding of the ECB-methods-buffer with `ecb-toggle-auto-expand-tag-tree'."
+    "Highlight current semantic-tag of the edit-buffer in the ECB-methods-buffer with `ecb-highlight-tag-with-point'."
+    "Apply a filter to the sources-buffer either via `ecb-sources-filter' or via the popup-menu."
+    "Apply a filter to the history-buffer either via `ecb-history-filter' or via the popup-menu."
+    "Apply tag-filters (can be layered) to the methods-buffer either via `ecb-methods-filter' or via the popup-menu."
+    "Use `scroll-all-mode' to scroll both edit-windows of ECB simultaneously - and no other windows are scrolled!"
+    "You can toggle having a compile window with `ecb-toggle-compile-window' if `ecb-compile-window-height' is not nil."
+    "Start ECB automatically after Emacs is started. Use option `ecb-auto-activate'"
+    "Maximize a tree-buffer via modeline - ECB supports the standard-mechanism of (X)Emacs for deleting other windows."
+    "Easy horizontal scrolling the tree-buffers with the mouse with [M-mouse-1] and [M-mouse-3]; see `ecb-tree-easy-hor-scroll'."
+    "Expand and collapse very precisely the current node in a tree-buffer with commands in the popup-menu."
+    "Let ECB display the version-control-state of your files in the tree-buffers. See `ecb-vc-enable-support'."
+    "Work with remote paths (e.g. TRAMP-, ANGE-FTP-, or EFS-paths) as with local paths in `ecb-source-path'."
+    "Exclude certain files from being displayed in the history-buffer. See `ecb-history-exclude-file-regexps'."
+    "Get the most important options of ECB at a glance by viewing the customization group \"ecb-most-important\"."
+    )
+  "List of all available tips of the day.")
+
+
+
+
+(defun ecb-show-tip-of-the-day ()
+  "Show tip of the day if `ecb-tip-of-the-day' is not nil."
+  (interactive)
+  (when (or (interactive-p) ecb-tip-of-the-day)
+    (ignore-errors (load-file ecb-tip-of-the-day-file))
+    (let* ((cursor (if (boundp 'ecb-tod-cursor)
+                       ecb-tod-cursor
+                     0))
+           (tip (or (ignore-errors (nth cursor ecb-tod-tip-list))
+                    (nth 0 ecb-tod-tip-list))))
+      ;; show tip
+      (ecb-message-box tip "Tip of the day" "Close")
+      ;; change cursor
+      (ecb-tod-move-cursor cursor))))
+
+(defun ecb-tod-move-cursor (cursor)
+  (with-temp-file (expand-file-name ecb-tip-of-the-day-file)
+    (erase-buffer)
+    (insert (format "(defvar ecb-tod-cursor 0)\n(setq ecb-tod-cursor %d)"
+                    (if (< (1+ cursor) (length ecb-tod-tip-list))
+                        (1+ cursor)
+                      0)))))
+
+(silentcomp-provide 'ecb-tod)
+
+;; ecb-tod.el ends here
\ No newline at end of file
diff --git a/site/ecb-2.40/ecb-upgrade.el b/site/ecb-2.40/ecb-upgrade.el
new file mode 100644
index 0000000..a4e2505
--- /dev/null
+++ b/site/ecb-2.40/ecb-upgrade.el
@@ -0,0 +1,1287 @@
+;;; ecb-upgrade.el --- Upgrade an old ecb-version to the latest one
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-upgrade.el,v 1.115 2009/05/15 15:19:53 berndl Exp $
+
+;;; Commentary:
+;;
+;; This file upgrades an old ECB-version best possible to the latest one.
+;;
+;; What is the intention of this library:
+;;
+;; Big packages like ECB will be enhanced and developed continuously so
+;; sometimes a new version must be released. Such packages offer in general a
+;; lot of customizable options so probably some of these options change the
+;; type or are renamed because the old type and/or name of the option makes no
+;; sense in the new release.
+;;
+;; Especially options which have changed the type of their value are now a
+;; problem for the user which want to upgrade to the latest ECB-version: If
+;; the user has saved a certain value for option X in its .emacs-file but the
+;; type of this saved value doesn't match the new defined type in the
+;; defcustom-form after an ECB-upgrade then there can occur serious problems
+;; like ECB can not be started anymore or even Emacs can not be started
+;; without errors.
+;;
+;; Until now there was only one way to fix these problems: The user must
+;; manually edit his .emacs-file and remove all entries for options which have
+;; now another type. After this and after restarting Emacs the new
+;; default-values of the type-changed options in the new ECB-release are
+;; active and the user can go on using Emacs and ECB. But this approach to fix
+;; the incompatible-option-problem has two serious drawbacks:
+;; 1. The user must manually edit the customize-section in his .emacs-file.
+;;    This should normally not be done and if then only by old-handed
+;;    Emacs-users.
+;; 2. The customized value of the option X in the old-release (with the old
+;;    type) is lost because after removing the related entry from the
+;;    .emacs-file the new default-value is active, so the user must
+;;    re-customize the option X.
+;;
+;; OK, this is one half of the option-upgrade-problem but a new ECB-release
+;; can also rename a option from name X to name Y because the new name Y makes
+;; much more sense and/or is more mnemonic. If only the name has changed but
+;; not the type this is not a serious problem like above but also annoying
+;; because the customized value of the old-option X takes no effect in the new
+;; release but instead the default-value of the new-option Y is now active.
+;; But nevertheless this problem has the drawback number 2 (see above).
+;;
+;; The last category of upgrade-problems is a renamed option which has also
+;; changed its type.
+;;
+;; ecb-upgrade.el is the solution for all these problems:
+
+;; - It checks all customized values of all ECB-options if they are still
+;;   type-compatible. If not then it tries to upgrade the old-value to the new
+;;   value-type and if this is not possible then it resets the option to the
+;;   new default value and store it via customize in the .emacs-file (or in
+;;   any file which is used for customized options).
+;; - It offers a special constant `ecb-upgradable-option-alist' which allows
+;;   the ECB-maintainers to define special transformings for renamed options
+;;   so even the value of an old-option X can be savely transformed to the
+;;   new-option Y and the old setting is not lost.
+;;
+;; All these checks and transformings are done at beginning of activating ECB.
+;; If ECB has recognized incompatible or renamed options it does its
+;; upgrading/reseting-job so all ECB-options have correct types so ECB can
+;; start correct. After ECB is started it displays a list of all upgraded or
+;; reseted option with their old and new values.
+;;
+;; How does this library work:
+;;
+;; The important functions are `ecb-check-not-compatible-options' and
+;; `ecb-upgrade-not-compatible-options':
+;;
+;; The former one checks if all customized values of ECB-options have still
+;; correct type. If not the incompatible options and their old values are
+;; stored in an alist `ecb-not-compatible-options'. Only this function is
+;; allowed to changed this alist!!
+;;
+;; The latter one processes now this alist and looks for every incompatible
+;; option if there is an entry in `ecb-upgradable-option-alist'. If yes then a
+;; special value-transforming is tried by `ecb-option-upgrade'. If no or if
+;; the special transforming has been failed for any reason then it resets the
+;; option to the default-value of current active ECB-version and save it via
+;; `customize-save-variable'.
+;;
+;; So if the ECB-maintainers define no special transforming in the alist
+;; `ecb-upgradable-option-alist' for a re-typed option X then all incompatible
+;; options are at least reset to their current default-value and therefore ECB
+;; can start correct.
+;;
+;; But there is another function `ecb-upgrade-renamed-options': This function
+;; processes the alist `ecb-upgradable-option-alist' and call for every
+;; element-key (an old option-symbol) of this alist `ecb-option-upgrade' but
+;; only if this element-key is not also contained in the alist
+;; `ecb-not-compatible-options' because in this case this option has been
+;; already be upgraded/reseted by `ecb-upgrade-not-compatible-options' (see
+;; above).
+;;
+;; So the calling sequence of these three functions must be:
+;; 1. `ecb-check-not-compatible-options'
+;; 2. `ecb-upgrade-not-compatible-options'
+;;    `ecb-upgrade-renamed-options' or vice versa.
+;; 
+;; There are also two interactive commands:
+;; - `ecb-display-upgraded-options' displays a temp. buffer with all upgraded
+;;   or reseted ECB-options with their old and new values.
+;; - `ecb-upgrade-options': Does all necessary beginning with the
+;;   incompatibility-check and ending with the display of the options.
+;;
+;; What must an ECB-maintainer do:
+;;
+;; + If he wants only a save and correct ECB-start with the new release:
+;;   NOTHING
+;; + If he wants to preserve best possible the customized values of now
+;;   type-incompatible and/or renamed options:
+;;   - Adding entries to the alist `ecb-upgradable-option-alist' and
+;;   - Defining suitable transforming-functions for every of these options.
+;;   See the comment of `ecb-upgradable-option-alist'.
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+;; IMPORTANT: The version-number is auto-frobbed from the Makefile. Do not
+;; change it here!
+;; (defconst ecb-version "2.33beta1"
+;;   "Current ECB version.")
+
+(defconst ecb-version "2.40"
+  "Current ECB version.")
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'ecb-util)
+
+(silentcomp-defun widget-convert)
+(silentcomp-defun ecb-find-optionsym-for-tree-buffer-name)
+
+;; -------------------------------------------------------------------------
+;; define in this defconst all important NEWS which a user should know after
+;; upgrading to the new version.
+;; -------------------------------------------------------------------------
+
+;; Each NEWS-string should be a one-liner shorter than 70 chars
+(defconst ecb-upgrade-news
+  '(("2.40" . ("ECB now requires full CEDET being installed (at least 1.0pre6)."
+               "More user-responsible buffer-parsing based on the idle-mechanism of semantic."
+               "ECB is able to work with indirect buffers it the base-buffer is filebased."
+               "The history can now be bucketized, see new `ecb-history-make-buckets'."
+               "New faces `ecb-history-bucket-node-face', `ecb-history-dead-buffer-face', `ecb-history-indirect-buffer-face'."
+               "Sticky parwnt-node for all ECB-windows of type tree-buffer."
+               "New support for Git and Monotone as version-control systems."
+               "New command `ecb-goto-window-edit-by-smart-selection'."
+               "New command `ecb-goto-window-ecb-by-smart-selection'."
+               "New option `ecb-ignore-pop-up-frames'."
+               "Full compatibility with Emacs 22 and 23 - see NEWS file."
+               "Better compatibility with CEDET 1.0preX and semantic 2.0preX - see NEWS file."
+               "The internal download-feature of ECB has been completely disabled."
+               ))
+    ("2.32" . ("New ECB-window (tree-buffer) for the semantic-analyser."
+               "New ECB-window for displaying definition for current symbol at point."
+               "Up- and down-arrow are now also smart in the tree-buffers."
+               "Much better maximizing/minimizing of the ecb-tree-windows."
+               "New option `ecb-maximize-next-after-maximized-select'."
+               "`ecb-truncate-lines' has been renamed to `ecb-tree-truncate-lines'"))
+    ("2.30" . ("Support for displaying the VC-state in the tree-buffers; see NEWS." ;;
+               "ECB is now capable of handling remote paths (e.g. TRAMP-paths)"
+               "Precisely expanding of current node via popup-menu of the methods-buffer."
+               "Time consuming tasks are performed stealthy; see `ecb-stealthy-tasks-delay'"))
+    ("2.27" . ("Much saver resizing-mechanism for permanent compile-window. See NEWS."))
+    ("2.26" . ("Some regexp-options has been changed to regexp-list-options. See NEWS."
+               "New option `ecb-history-exclude-file-regexps'."
+               "`ecb-expand-methods-nodes' works for non-semantic-buffers too."
+               "Readonly-sourcefiles are display in a different face."))
+    ("2.25" . ("`ecb-sort-history-items' has been renamed to `ecb-history-sort-method'"
+               "New options `ecb-sources-sort-ignore-case' and `ecb-history-sort-ignore-case'"
+               "New icons for parent-display in the Methods-buffer"))
+    ("2.24" . ("New \"current-type\"-filter for the Methods-buffer"
+               "Now directories are prescanned for emptyness"))
+    ("2.23" . ("New cedet1.0beta2 is supported."
+               "Distinction between functions and function-prototypes in the Methods-buffer"
+               "The command `ecb-toggle-layout' now has a prefix-argument"
+               "Default tag-filters for certain files which are applied automatically"
+               "Double-clicking the mouse-1-button now works with integrated speedbar"
+               "A new hook `ecb-speedbar-before-activate-hook'"))
+    ("2.22" . ("New nifty feature for filtering the tags displayed in the Methods-buffer"
+               "Much smarter mechanism to highlight the current tag in the methods-buffer"
+               "New option `ecb-auto-expand-tag-tree-collapse-other'."
+               "Fixed a bug preventing the native Windows-port of XEmacs from working."))
+    ("2.21" . ("Advice for `balance-windows' so only the edit-windows are balanced."
+               "Gnus, BBDB, VM, Xrefactory etc. work even when ECB-windows are visible."
+               "Commands using `Electric-pop-up-window' now work correctly with ECB."
+               "Fixed some annoying bugs and one fatal bug."))
+    ("2.20" . ("Fixed a bug preventing tree-buffers with expand-symbol \'before\' to work"
+               "'ecb-major-modes-\(de)activate' replaced by `ecb-major-modes-show-or-hide'"
+               "New keybinding for the online-help: [C-c . h]"
+               "The edit-area can be splitted in more than 2 windows."
+               "`ecb-other-window-jump-behavior' renamed in `ecb-other-window-behavior'"
+               "New option `ecb-maximize-ecb-window-after-selection'"
+               "popup-menus of the tree-buffers can be used with the tmm-library"
+               "New option `ecb-change-layout-preserves-compwin-state'"
+               "`delete-window' and `delete-other-windows' handle the compile-window"
+               "Support of the default modeline-mechanisms for deleting other windows"))
+    ("2.11" . ("Using semanticdb to jump to type-tags defined in other files"))
+    ("2.01" . ("Support for semantic 2.0"
+               "The tree-buffers can be displayed graphically with images"
+               "Popup-menus of the tree-buffers support submenus"
+               "The sources- and the history-buffer can be filtered"
+               "Ediff runs per default in the ECB-frame"))
+    ("1.96" . ("ECB can work together with the window-managers escreen and winring"
+               "Much better support of the ECB-compile-window"))))
+
+
+
+;; ----------------------------------------------------------------------
+;; define in this defconst all options which should be upgraded
+;; ----------------------------------------------------------------------
+
+(defconst ecb-upgradable-option-alist
+  '((ecb-compile-window-temporally-enlarge . (ecb-compile-window-temporally-enlarge
+                                              ecb-upgrade-compile-window-temporally-enlarge))
+    ;;(ecb-window-sync . (ecb-window-sync ecb-upgrade-window-sync))
+    (ecb-hide-ecb-windows-hook . (ecb-hide-ecb-windows-before-hook identity))
+    (ecb-show-ecb-windows-hook . (ecb-show-ecb-windows-before-hook identity))
+    (ecb-layout-nr . (ecb-layout-name ecb-upgrade-layout-nr))
+    (ecb-toggle-layout-sequence . (ecb-toggle-layout-sequence
+                                   ecb-upgrade-toggle-layout-sequence))
+    (ecb-cache-directory-contents . (ecb-cache-directory-contents
+                                     ecb-upgrade-cache-directory-contents))
+    (ecb-layout-always-operate-in-edit-window . (ecb-layout-always-operate-in-edit-window
+                                                 ecb-upgrade-alway-operate-in-edit-window))
+    (ecb-truncate-lines . (ecb-tree-truncate-lines ecb-upgrade-truncate-lines))
+    (ecb-mode-line-prefixes . (ecb-mode-line-prefixes
+                               ecb-upgrade-mode-line-prefixes))
+    (ecb-mode-line-data . (ecb-mode-line-data
+                               ecb-upgrade-mode-line-data))
+    (ecb-use-speedbar-for-directories . (ecb-use-speedbar-instead-native-tree-buffer
+                                         ecb-upgrade-use-speedbar-for-directories))
+
+    (ecb-directories-menu-user-extension . (ecb-directories-menu-user-extension
+                                            ecb-upgrade-directories-menu-ext))
+    (ecb-sources-menu-user-extension . (ecb-sources-menu-user-extension
+                                        ecb-upgrade-sources-menu-ext))
+    (ecb-methods-menu-user-extension . (ecb-methods-menu-user-extension
+                                        ecb-upgrade-methods-menu-ext))
+    (ecb-history-menu-user-extension . (ecb-history-menu-user-extension
+                                        ecb-upgrade-history-menu-ext))
+    (ecb-bucket-token-display . (ecb-bucket-node-display identity))
+    (ecb-auto-expand-token-tree . (ecb-auto-expand-tag-tree identity))
+    (ecb-font-lock-tokens . (ecb-font-lock-tags identity))
+    (ecb-token-jump-sets-mark . (ecb-tag-jump-sets-mark identity))
+    (ecb-token-display-function . (ecb-tag-display-function ecb-upgrade-token-display-function))
+    (ecb-type-token-display . (ecb-type-tag-display ecb-upgrade-type-token-display))
+    (ecb-post-process-semantic-tokenlist . (ecb-post-process-semantic-taglist
+                                            ecb-upgrade-post-process-semantic-tokenlist))
+    (ecb-show-only-positioned-tokens . (ecb-show-only-positioned-tags identity))
+    (ecb-show-tokens . (ecb-show-tags ecb-upgrade-show-tags))
+    (ecb-show-tags . (ecb-show-tags ecb-upgrade-show-tags))
+    (ecb-highlight-token-with-point . (ecb-highlight-tag-with-point identity))
+    (ecb-highlight-token-with-point-delay . (ecb-highlight-tag-with-point-delay identity))
+    (ecb-token-visit-post-actions . (ecb-tag-visit-post-actions
+                                     ecb-upgrade-token-visit-post-actions))
+    (ecb-token-header-face . (ecb-tag-header-face
+                              ecb-upgrade-token-header-face))
+    (ecb-post-process-semantic-taglist . (ecb-post-process-semantic-taglist
+                                          ecb-upgrade-post-process-semantic-taglist))
+    (ecb-primary-mouse-jump-destination . (ecb-mouse-click-destination identity))
+    (ecb-split-edit-window . (ecb-split-edit-window-after-start ecb-upgrade-split-edit-window))
+    (ecb-sort-history-items . (ecb-history-sort-method ecb-upgrade-sort-history-items))
+    (ecb-other-window-jump-behavior . (ecb-other-window-behavior ecb-upgrade-other-window-jump-behavior))
+    (ecb-excluded-directories-regexp . (ecb-excluded-directories-regexps
+                                        ecb-upgrade-excluded-directories-regexp))
+    (ecb-source-file-regexps . (ecb-source-file-regexps
+                                ecb-upgrade-source-file-regexps))
+    (ecb-exclude-parents-regexp . (ecb-exclude-parents-regexps
+                                   ecb-upgrade-exclude-parents-regexp))
+    (ecb-auto-expand-tag-tree-collapse-other . (ecb-auto-expand-tag-tree-collapse-other
+                                                ecb-upgrade-auto-expand-tag-tree-collapse-other))
+    (ecb-prescan-directories-for-emptyness . (ecb-prescan-directories-for-emptyness
+                                              ecb-upgrade-prescan-directories-for-emptyness))
+    (ecb-sources-perform-read-only-check . (ecb-sources-perform-read-only-check
+                                            ecb-upgrade-sources-perform-read-only-check))
+    (ecb-vc-enable-support . (ecb-vc-enable-support
+                              ecb-upgrade-vc-enable-support))
+    (ecb-tree-image-icons-directories . (ecb-tree-image-icons-directories
+                                         ecb-upgrade-tree-image-icons-directories))
+    (ecb-tree-RET-selects-edit-window . (ecb-tree-do-not-leave-window-after-select
+                                         ecb-upgrade-tree-RET-selects-edit-window))
+    (ecb-grep-find-function . (ecb-grep-recursive-function identity))
+    )
+  "Alist of all options which should be upgraded for current ECB-version.
+There are several reasons why an option should be contained in this alist:
+a) An old option has just be renamed in current-ECB version but has still the
+   same type of value so the new option should get the value of the old one.
+b) An old option has changed its type and we try to transform the old-typed
+   value to the new type.
+c) An old option has be renamed and also changed its type so we try to
+   transform the value of the old option to the type of the new option and set
+   the new option to this transformed value.
+
+If an old option has changed its type and we can not savely transform the
+old-value to the new type then this option should NOT be contained in this
+alist! Such an option is auto. reset to the current default-value by
+`ecb-upgrade-not-compatible-options'!
+
+Every element of this alist has the following form:
+The car is the old option symbol and the cdr is a 2-element-list with:
+1. elem: The new option symbol \(can be equal with the old option symbol, see
+   b) above)
+2. elem: A function which converts the value of the old option to the new
+   option. If the type of the options is identical \(i.e. only the option name
+   has been changed, see a) above) then this function should be `identity'
+   otherwise a function which gets one argument \(the value of the old option)
+   and returns either a corresponding value for the new option with the new
+   correct type or the symbol 'ecb-no-upgrade-conversion if no correct
+   conversion can be performed! Maybe the function `ecb-option-get-value' can
+   be helpful within such a transforming-function.")
+
+;; ----------------------------------------------------------------------
+;; define here all necessary upgrade functions
+;; ----------------------------------------------------------------------
+
+;; upgrading ecb-compile-window-temporally-enlarge
+(defun ecb-upgrade-compile-window-temporally-enlarge (old-val)
+  (case old-val
+    ((t after-compilation) 'after-display)
+    ((nil) nil)
+    ((after-selection both) old-val)
+    (otherwise 'ecb-no-upgrade-conversion)))
+
+;; upgrading ecb-window-sync
+(defun ecb-upgrade-window-sync (old-val)
+  (if (equal old-val t)
+      (ecb-option-get-value 'ecb-window-sync 'standard-value)
+    nil))
+
+;; upgrading old layout-numbers (ECB <= 1.80) to new layout-names (ECB
+;; >= 1.90)
+(defun ecb-upgrade-layout-nr2name (number)
+  (let ((number-name-alist '((nil . "left8")
+                             (0 . "left1")
+                             (1 . "left2")
+                             (2 . "left3")
+                             (3 . "left4")
+                             (4 . "left5")
+                             (5 . "right1")
+                             (6 . "left6")
+                             (7 . "top1")
+                             (8 . "left7")
+                             (9 . "left8")
+                             (10 . "top2")
+                             (11 . "left9")
+                             (12 . "left10")
+                             (13 . "left11")
+                             (14 . "left12")
+                             (15 . "left13")
+                             (16 . "left14")
+                             (17 . "left15")
+                             (18 . "leftright1")
+                             (19 . "leftright2")
+                             (20 . "speedbar1"))))
+    (cdr (assoc number number-name-alist))))
+
+(defun ecb-upgrade-layout-nr (old-val)
+  (let ((name (ecb-upgrade-layout-nr2name old-val)))
+    (if (stringp name)
+        name
+      'ecb-no-upgrade-conversion)))
+
+(defun ecb-upgrade-toggle-layout-sequence (old-val)
+  (mapcar (function (lambda (elem)
+                      (ecb-upgrade-layout-nr2name elem)))
+          old-val))
+
+(defun ecb-upgrade-use-speedbar-for-directories (old-val)
+  (if old-val
+      'dir))
+
+(defun ecb-upgrade-major-modes-activate (old-val)
+  (if (not (listp old-val))
+      old-val
+    (let ((l (copy-tree old-val)))
+      (dolist (elem l)
+        (if (and (consp elem)
+                 (integerp (cdr elem)))
+            (setcdr elem (ecb-upgrade-layout-nr2name (cdr elem)))))
+      l)))
+
+(defun ecb-upgrade-cache-directory-contents (old-val)
+  (mapcar (function (lambda (elem)
+                      (cons (nth 0 elem) (nth 1 elem))))
+          old-val))
+
+(defun ecb-upgrade-truncate-lines (old-val)
+  (cond ((equal t old-val)
+         '(ecb-directories-buffer-name
+           ecb-sources-buffer-name
+           ecb-methods-buffer-name
+           ecb-history-buffer-name))
+        ((equal nil old-val)
+         nil)
+        ((listp old-val)
+         (let ((new-list nil))
+           (if (nth 0 old-val)
+               (setq new-list (cons 'ecb-directories-buffer-name new-list)))
+           (if (nth 1 old-val)
+               (setq new-list (cons 'ecb-sources-buffer-name new-list)))
+           (if (nth 2 old-val)
+               (setq new-list (cons 'ecb-methods-buffer-name new-list)))
+           (if (nth 3 old-val)
+               (setq new-list (cons 'ecb-history-buffer-name new-list)))
+           new-list))
+        (t
+         '(ecb-directories-buffer-name
+           ecb-sources-buffer-name
+           ecb-methods-buffer-name
+           ecb-history-buffer-name))))
+
+(defun ecb-upgrade-alway-operate-in-edit-window (old-val)
+  (let ((l (copy-tree old-val)))
+    (setq l (delete 'switch-to-buffer-other-window l))
+    l))
+
+(defun ecb-upgrade-mode-line-prefixes (old-val)
+  (list (cons 'ecb-directories-buffer-name
+              (nth 0 old-val))
+        (cons 'ecb-sources-buffer-name
+              (nth 1 old-val))
+        (cons 'ecb-methods-buffer-name
+              (nth 2 old-val))
+        (cons 'ecb-history-buffer-name
+              (nth 3 old-val))))
+
+(defun ecb-upgrade-mode-line-data (old-val)
+  (list (cons 'ecb-directories-buffer-name
+              (if (equal (nth 0 old-val) 'selected)
+                  'sel-dir
+                (nth 0 old-val)))
+        (cons 'ecb-sources-buffer-name
+              (if (equal (nth 1 old-val) 'selected)
+                  'sel-dir
+                (nth 1 old-val)))
+        (cons 'ecb-methods-buffer-name
+              (if (equal (nth 2 old-val) 'selected)
+                  'sel-source
+                (nth 2 old-val)))
+        (cons 'ecb-history-buffer-name
+              (nth 3 old-val))))
+
+(defun ecb-upgrade-menu-extension (old-list)
+  (mapcar (function (lambda (i)
+                      (reverse i)))
+          old-list))
+
+(defun ecb-upgrade-directories-menu-ext (old-val)
+  (append (ecb-upgrade-menu-extension old-val)
+          (ecb-option-get-value 'ecb-directories-menu-user-extension
+                                'standard-value)))
+
+(defun ecb-upgrade-sources-menu-ext (old-val)
+  (append (ecb-upgrade-menu-extension old-val)
+          (ecb-option-get-value 'ecb-sources-menu-user-extension
+                                'standard-value)))
+
+(defun ecb-upgrade-methods-menu-ext (old-val)
+  (append (ecb-upgrade-menu-extension old-val)
+          (ecb-option-get-value 'ecb-methods-menu-user-extension
+                                'standard-value)))
+
+(defun ecb-upgrade-history-menu-ext (old-val)
+  (append (ecb-upgrade-menu-extension old-val)
+          (ecb-option-get-value 'ecb-history-menu-user-extension
+                                'standard-value)))
+
+(defun ecb-upgrade-token-display-function (old-val)
+  (let ((l (copy-tree old-val))
+        (mapping-list
+         '((semantic-name-nonterminal                  . ecb--semantic-format-tag-name)
+           (semantic-abbreviate-nonterminal            . ecb--semantic-format-tag-abbreviate)
+           (semantic-summarize-nonterminal             . ecb--semantic-format-tag-summarize)
+           (semantic-prototype-nonterminal             . ecb--semantic-format-tag-prototype)
+           (semantic-concise-prototype-nonterminal     . ecb--semantic-format-tag-concise-prototype)
+           (semantic-uml-abbreviate-nonterminal        . ecb--semantic-format-tag-uml-abbreviate)
+           (semantic-uml-prototype-nonterminal         . ecb--semantic-format-tag-uml-prototype)
+           (semantic-uml-concise-prototype-nonterminal . ecb--semantic-format-tag-uml-concise-prototype)
+           (semantic-prin1-nonterminal                 . ecb--semantic-format-tag-prin1)
+           (ecb-name-nonterminal                  . ecb-format-tag-name)
+           (ecb-abbreviate-nonterminal            . ecb-format-tag-abbreviate)
+           (ecb-summarize-nonterminal             . ecb-format-tag-summarize)
+           (ecb-prototype-nonterminal             . ecb-format-tag-prototype)
+           (ecb-concise-prototype-nonterminal     . ecb-format-tag-concise-prototype)
+           (ecb-uml-abbreviate-nonterminal        . ecb-format-tag-uml-abbreviate)
+           (ecb-uml-prototype-nonterminal         . ecb-format-tag-uml-prototype)
+           (ecb-uml-concise-prototype-nonterminal . ecb-format-tag-uml-concise-prototype)
+           (ecb-prin1-nonterminal                 . ecb-format-tag-prin1))))
+    (mapc (function (lambda (e)
+                      (if (assoc (cdr e) mapping-list)
+                          (setcdr e (cdr (assoc (cdr e) mapping-list))))))
+          l)
+    l))
+
+
+(defun ecb-upgrade-type-token-display (old-val)
+  (let ((val-copy (copy-tree old-val))
+        (mapping-list
+         '((ecb-type-token-class-face . ecb-type-tag-class-face)
+           (ecb-type-token-interface-face . ecb-type-tag-interface-face)
+           (ecb-type-token-struct-face . ecb-type-tag-struct-face)
+           (ecb-type-token-typedef-face . ecb-type-tag-typedef-face)
+           (ecb-type-token-enum-face . ecb-type-tag-enum-face)
+           (ecb-type-token-group-face . ecb-type-tag-group-face))))
+    (mapc (function (lambda (e)
+                      (dolist (l (cdr e))
+                        (if (assoc (nth 2 l) mapping-list)
+                            (ecb-set-elt l 2
+                                         (cdr (assoc (nth 2 l) mapping-list)))))))
+          val-copy)
+    val-copy))
+
+(defun ecb-upgrade-post-process-semantic-tokenlist (old-val)
+  (let ((val-copy (copy-tree old-val))
+        (mapping-list
+         '((ecb-group-function-tokens-with-parents . ecb-group-function-tags-with-parents))))
+    (mapc (function (lambda (e)
+                      (if (assoc (cdr e) mapping-list)
+                          (setcdr e (cdr (assoc (cdr e) mapping-list))))))
+          val-copy)
+    val-copy))
+
+(defun ecb-upgrade-token-visit-post-actions (old-val)
+  (let ((val-copy (copy-tree old-val))
+        (mapping-list
+         '((ecb-token-visit-highlight-token-header . ecb-tag-visit-highlight-tag-header)
+           (ecb-token-visit-smart-token-start . ecb-tag-visit-smart-tag-start)
+           (ecb-token-visit-recenter . ecb-tag-visit-recenter)
+           (ecb-token-visit-recenter-top . ecb-tag-visit-recenter-top)
+           (ecb-token-visit-goto-doc-start . ecb-tag-visit-goto-doc-start)
+           (ecb-token-visit-narrow-token . ecb-tag-visit-narrow-tag))))
+    (mapc (function (lambda (e)
+                      (dotimes (i (length (cdr e)))
+                        (if (assoc (nth i (cdr e)) mapping-list)
+                            (ecb-set-elt (cdr e) i
+                                         (cdr (assoc (nth i (cdr e))
+                                                     mapping-list)))))))
+          val-copy)
+    val-copy))
+
+(defun ecb-upgrade-token-header-face (old-val)
+  (if (equal old-val 'ecb-token-header-face)
+      'ecb-tag-header-face
+    old-val))
+
+(defun ecb-upgrade-post-process-semantic-taglist (old-val)
+  (let ((l (copy-tree old-val)))
+    (dolist (elem l)
+      (if (cdr elem)
+          (setcdr elem (list (cdr elem)))))
+    l))
+
+(defun ecb-upgrade-split-edit-window (old-val)
+  (if (equal old-val t)
+      'before-activation
+    old-val))
+
+(defun ecb-upgrade-other-window-jump-behavior (old-val)
+  (if (equal old-val 'all)
+      'all
+    (ecb-option-get-value 'ecb-other-window-behavior
+                          'standard-value)))
+
+(defun ecb-upgrade-show-tags (old-val)
+  (ecb-option-get-value 'ecb-show-tags
+                        'standard-value))
+
+(defun ecb-upgrade-sort-history-items (old-val)
+  (if old-val ecb-sources-sort-method))
+
+(defun ecb-upgrade-excluded-directories-regexp (old-val)
+  (list old-val))
+
+(defun ecb-upgrade-source-file-regexps (old-val)
+  (let ((l (copy-tree old-val)))
+    (dolist (elem l)
+      (setcdr elem (list (list (cadr elem)) (list (caddr elem)))))
+    l))
+    
+(defun ecb-upgrade-exclude-parents-regexp (old-val)
+  (if old-val (list old-val)))
+
+(defun ecb-upgrade-auto-expand-tag-tree-collapse-other (old-val)
+  (if old-val
+      'only-if-on-tag
+    nil))
+
+(defun ecb-upgrade-prescan-directories-for-emptyness (old-val)
+  (if old-val 'unless-remote nil))
+
+(defun ecb-upgrade-sources-perform-read-only-check (old-val)
+  (if old-val 'unless-remote nil))
+  
+(defun ecb-upgrade-vc-enable-support (old-val)
+  (if old-val 'unless-remote nil))
+
+(defun ecb-upgrade-tree-image-icons-directories (old-val)
+  (let ((l (copy-tree old-val)))
+    (cons (nth 0 l)
+          (delq nil (list (if (nth 1 l)
+                              (cons 'ecb-directories-buffer-name
+                                    (nth 1 l)))
+                          (if (nth 2 l)
+                              (cons 'ecb-sources-buffer-name
+                                    (nth 2 l)))
+                          (if (nth 3 l)
+                              (cons 'ecb-methods-buffer-name
+                                    (nth 3 l)))
+                          (if (nth 4 l)
+                              (cons 'ecb-history-buffer-name
+                                    (nth 4 l))))))))
+
+(defun ecb-upgrade-tree-RET-selects-edit-window (old-val)
+  (delq nil (mapcar (lambda (b)
+                      (and (not (ecb-member-of-symbol/value-list
+                                 (symbol-value b)
+                                 old-val))
+                           b))
+                    '(ecb-directories-buffer-name
+                      ecb-sources-buffer-name
+                      ecb-methods-buffer-name
+                      ecb-history-buffer-name
+                      ecb-analyse-buffer-name))))
+    
+
+;; ----------------------------------------------------------------------
+;; internal functions. Don't change anything below this line
+;; ----------------------------------------------------------------------
+
+(defgroup ecb-upgrade-internal nil
+  "Only Internal setting for the ECB upgrade-mechanism - no user-options!"
+  :group 'ecb-general
+  :prefix "ecb-")
+
+(defcustom ecb-options-version ecb-version
+  "*DO NOT CUSTOMIZE THIS VALUE - IT IS ONLY FOR INTERNAL USAGE!"
+  :group 'ecb-upgrade-internal
+  :type 'string)
+
+(defun ecb-custom-file-writeable-p ()
+  "Returns not nil if and only if the custom-file is writable for ECB, which
+means it is neither a bytecompiled-file nor a read-only-file."
+  (let ((file (ecb-custom-file)))
+    (and file
+         (not (equal (file-name-extension file) "elc"))
+         (file-writable-p file))))
+
+(defun ecb-customize-save-variable (option value)
+  ;; because the adviced version of `custom-save-all' do only all the special
+  ;; needed things if `ecb-minor-mode' is on we must temporally set here this
+  ;; variable to not nil because at that time this function is called this
+  ;; variable is maybe still nil.
+  (let ((ecb-minor-mode t))
+    (if (ecb-custom-file-writeable-p)
+        (customize-save-variable option value)
+      (customize-set-variable option value))))
+
+(defun ecb-customize-set-variable (option value)
+  (customize-set-variable option value))
+
+(defun ecb-option-set-default (option)
+  "Save the ECB-option OPTION with current default value."
+  (ecb-customize-set-variable option
+                              (ecb-option-get-value option 'standard-value)))
+
+(defun ecb-option-upgrade (old-option)
+  "Upgrade the old ECB-option OLD-OPTION if the following conditions are ALL
+true:
+1. OLD-OPTION is the key of an element of `ecb-upgradable-option-alist'
+2. 'saved-value of OLD-OPTION is not nil
+3. Either
+   + the new-option from `ecb-upgradable-option-alist' has the same name
+     as OLD-OPTION and
+   + the type of the value of OLD-OPTION is not compatible with the current
+     type of OLD-OPTION \(this prevents from doing an upgrade twice!)
+   or
+   + OLD-OPTION is not a valid option in current ECB and
+   + The related new-option `ecb-upgradable-option-alist' is not already
+     customized, i.e. the 'saved-value of new-option is nil.
+
+If all conditions are true then the value of OLD-OPTION is transformed by the
+transforming-function of the related element of `ecb-upgradable-option-alist'
+to the correct new type and then the related new option is saved with this new
+value.
+
+Return nil if no upgrade is necessary because at least one of the conditions
+above is not true. Returns the transformed value of OLD-OPTION or
+'ecb-no-upgrade-conversion in form of a list, to distinguish a transformed
+value nil from the nil-result which indicates that no upgrade was necessary
+\(see above). This means the \"real\" new value is the car of this
+result-list!"
+  (let ((upgrade-elem (cdr (assoc old-option ecb-upgradable-option-alist)))
+        new-value)
+    ;; check if an upgrade is necessary or allowed
+    (when (and upgrade-elem
+               (or (and (equal old-option (nth 0 upgrade-elem))
+                        (not (ecb-option-compatible-p old-option)))
+                   (and (not (member old-option ecb-all-options))
+                        (null (get (nth 0 upgrade-elem) 'saved-value))))
+               (get old-option 'saved-value))
+      ;; try to transform the old-value in the new type.
+      (setq new-value
+            (condition-case nil
+                (funcall (nth 1 upgrade-elem)
+                         (ecb-option-get-value old-option 'saved-value))
+              (error 'ecb-no-upgrade-conversion)))
+      (when (not (equal new-value 'ecb-no-upgrade-conversion))
+        ;; the old-value has been transformed successfully into the new type
+        ;; so we can save it.
+        (ecb-customize-set-variable (nth 0 upgrade-elem) new-value))
+      ;; we return the value of the transforming-function even if it is
+      ;; 'ecb-no-upgrade-conversion!
+      (list new-value))))
+
+(defun ecb-option-compatible-p (option)
+  "Return not nil only if the type of the value of OPTION is compatible with
+its current defcustom-definition."
+  (require 'cus-edit)
+  (widget-apply (widget-convert (get option 'custom-type))
+                :match (symbol-value option)))
+
+(defvar ecb-old-ecb-version nil
+  "Only not nil if ECB has upgraded the options to a newer options-version
+after an ECB-upgrade.")
+
+(defun ecb-options-version=ecb-version-p ()
+  "Return not nil if the saved value of `ecb-options-version' is equal to
+`ecb-version'."
+  (equal (ecb-option-get-value 'ecb-options-version 'saved-value)
+         ecb-version))
+
+(defun ecb-store-current-options-version ()
+  (when (not (ecb-options-version=ecb-version-p))
+    (setq ecb-old-ecb-version (ecb-option-get-value 'ecb-options-version
+                                                    'saved-value))
+    (ecb-customize-save-variable 'ecb-options-version ecb-version)))
+  
+
+(defvar ecb-not-compatible-options nil
+  "This variable is only set by `ecb-check-not-compatible-options'! It is an
+alist with car is the symbol of an incompatible option and the cdr is the not
+compatible value of this option.
+This option is evaluated by `ecb-upgrade-not-compatible-options' and
+`ecb-display-upgraded-options'.")
+
+
+(defvar ecb-all-options nil)
+
+(defun ecb-get-all-ecb-options ()
+  (or ecb-all-options
+      (mapatoms
+       (lambda (symbol)
+         (when (and (save-match-data (string-match "ecb-" (symbol-name symbol)))
+                    (get symbol 'custom-type))
+           (setq ecb-all-options (cons symbol ecb-all-options)))))))
+
+(defun ecb-check-not-compatible-options ()
+  "Check for all ECB-options if their current value is compatible to the
+defined type. If not store it in `ecb-not-compatible-options'."
+  (setq ecb-not-compatible-options nil)
+
+  ;; get all options of ECB
+;;   (let ((ecb-options nil))
+  (ecb-get-all-ecb-options)
+  
+  ;; check if all current values of ECB options match their types. Add not
+  ;; matching options to `ecb-not-compatible-options'.
+  (dolist (option ecb-all-options)
+    (require 'cus-edit)
+    (unless (ecb-option-compatible-p option)
+      (setq ecb-not-compatible-options
+            (cons (cons option
+                        (symbol-value option))
+                  ecb-not-compatible-options)))))
+
+(defun ecb-upgrade-not-compatible-options ()
+  "Upgrade all not anymore compatible options of `ecb-not-compatible-options'.
+If such an option is contained in `ecb-upgradable-option-alist' then try to
+perform a special upgrade with `ecb-option-upgrade'. If no special upgrade is
+done then the option is reset to the default-value of current ECB-version."
+  ;; For every not compatible option perform an upgrade
+  (let ((is-not-a-downgrade
+         (not (ecb-package-version-list<
+               (ecb-package-version-str2list ecb-version)
+               (ecb-package-version-str2list ecb-options-version)))))
+    (dolist (option ecb-not-compatible-options)
+      ;; if the incompatible option is not upgraded by `ecb-option-upgrade'
+      ;; then we reset it to the standard-value of current ECB-version. If we
+      ;; make a downgrade we always reset to the default!
+      (let ((upgrade-result
+             (if is-not-a-downgrade (ecb-option-upgrade (car option)))))
+        (when (or (null upgrade-result) ;; no upgrade necessary or allowed
+                  ;; the upgrade has been tried but has failed.
+                  (equal (car upgrade-result) 'ecb-no-upgrade-conversion))
+          (ecb-option-set-default (car option)))))))
+    
+
+(defvar ecb-renamed-options nil)
+
+(defun ecb-upgrade-renamed-options ()
+  "Upgrade all renamed options of `ecb-upgradable-option-alist' and store
+every option in `ecb-renamed-options' if at least an upgrade was tried \(see
+`ecb-option-upgrade').
+
+Note: This function upgrades only the renamed but not the incompatible options
+\(i.e. only the type but not the name of the option has changed) of
+`ecb-upgradable-option-alist' because the latter ones will be upgraded by
+`ecb-upgrade-not-compatible-options'!"
+  (setq ecb-renamed-options nil)
+  (when (not (ecb-package-version-list<
+              (ecb-package-version-str2list ecb-version)
+              (ecb-package-version-str2list ecb-options-version)))
+    (ecb-get-all-ecb-options)
+    (dolist (option ecb-upgradable-option-alist)
+      ;; perform only an upgrade if the option is not contained in
+      ;; `ecb-not-compatible-options' too because then ECB has auto.
+      ;; recognized that this option is not compatible and the upgrade (or
+      ;; reset) is performed by `ecb-upgrade-not-compatible-options'!
+      (when (not (assoc (car option) ecb-not-compatible-options))
+        (let ((new-value-list (ecb-option-upgrade (car option))))
+          ;; if an upgrade was tried then store the option in
+          ;; `ecb-renamed-options'.
+          (when (and new-value-list
+                     (not (equal (car new-value-list)
+                                 'ecb-no-upgrade-conversion)))
+            (setq ecb-renamed-options
+                  (cons (list (car option)
+                              (ecb-option-get-value (car option) 'saved-value)
+                              (car (cdr option))
+                              (car new-value-list))
+                        ecb-renamed-options))))))))
+
+(require 'wid-edit)
+(silentcomp-defvar widget-button-keymap)
+(silentcomp-defvar widget-keymap)
+
+(defvar ecb-upgrade-button-keymap
+  (let (parent-keymap mouse-button1 keymap)
+    (if ecb-running-xemacs
+        (setq parent-keymap widget-button-keymap
+              mouse-button1 [button1])
+      (setq parent-keymap widget-keymap
+            mouse-button1 [down-mouse-1]))
+    (setq keymap (copy-keymap parent-keymap))
+    (define-key keymap mouse-button1 #'widget-button-click)
+    keymap)
+  "Keymap used inside buttons.")
+
+
+(defun ecb-not-compatible-or-renamed-options-detected ()
+  (or ecb-not-compatible-options ecb-renamed-options))
+
+(defun ecb-upgrade-make-copy-of-custom-file ()
+  "Make a backup of the file returned by `ecb-custom-file' in the same directory."
+  (when (ecb-custom-file-writeable-p)
+    (let* ((file (ecb-custom-file))
+           (backup-file-base (format "%s.before_ecb_%s" file ecb-version))
+           (backup-file backup-file-base)
+           (i 0))
+      (while (file-exists-p backup-file)
+        (setq i (1+ i))
+        (setq backup-file (format "%s__%d" backup-file-base i)))
+      (copy-file file backup-file))))
+      
+
+(defun ecb-display-upgraded-options ()
+  "Display a information-buffer which options have been upgraded or reset.
+Offers two buttons where the user can decide if the upgraded options should
+also being saved by ECB for future settings or if the buffer should be
+killed.
+
+If saving is possible this command display where the options would be saved.
+It is that file Emacs uses to save customize-settings. This file is
+\"computed\" from the settings in `custom-file' and `user-init-file' \(see the
+documentation of these variables).
+
+ECB automatically makes a backup-file of that file which will be modified by
+storing the upgraded rsp. renamed ECB-options. This backup file gets a unique
+name by adding a suffix \".before_ecb_<version>\" to the name of the modified
+file. If such a file already exists ECB adds a unique number to the end of the
+filename to make the filename unique. This is a safety mechanism if something
+fails during storing the upgraded options, so you never lose the contents of
+your customization-file!"
+  (interactive)
+  (if (ecb-not-compatible-or-renamed-options-detected)
+      (progn
+        (with-current-buffer (get-buffer-create "*ECB upgraded options*")
+          (switch-to-buffer (current-buffer))
+          (kill-all-local-variables)
+          (let ((inhibit-read-only t))
+            (erase-buffer))
+          (if (not (ecb-custom-file-writeable-p))
+              (progn
+                (widget-insert "Emacs can not save the upgraded incompatible options (s.b.) because that file\n")
+                (widget-insert "specified for storing all customizations (see documentation of the option\n")
+                (widget-insert "`custom-file') because the file")
+                (widget-insert (if (ecb-custom-file)
+                                   (concat (ecb-custom-file) " is not writeable by Emacs!")
+                                 " does either not exist or Emacs has been\nstarted with -q (in the latter case Emacs prevents from writing in the\ncustomizations-file)!\n"))
+                (widget-insert "\nPlease restart Emacs with a writeable custom- or init-file or without -q\nso the new option-values can be stored!\n\n"))
+            (when (not (get 'ecb-display-upgraded-options
+                            'ecb-upgrades-saved))
+              (widget-insert (format "Click on [Save] to save all changed options (s.b.) into %s.\n"
+                                     (ecb-custom-file)))
+              (widget-insert (format "This makes a backup of this file uniquely named with a suffix .before_ecb_%s.\n\n"
+                                     ecb-version))))
+          (widget-insert "Click on [Close] to kill this buffer (do this also after clicking [Save]).\n\n")
+          (when ecb-not-compatible-options
+            (widget-insert "The values of the following options are incompatible with current type.\nECB has tried to transform the old-value to the new type. In cases where\nthis was not possible ECB has reset to the current default-value.")
+            (widget-insert "\n\n"))
+          (dolist (option ecb-not-compatible-options)
+            (let ((option-name (symbol-name (car option)))
+                  (old-value (cdr option))
+                  (new-value (symbol-value (car option))))
+              (widget-insert (concat "+ Option:   " option-name))
+              (widget-insert "\n")
+              (widget-insert (concat "  Old value: "
+                                     (if (and (not (equal old-value nil))
+                                              (not (equal old-value t))
+                                              (or (symbolp old-value)
+                                                  (listp old-value)))
+                                         "'")
+                                     (prin1-to-string old-value)))
+              (widget-insert "\n")
+              (widget-insert (concat "  New value: "
+                                     (if (and (not (equal new-value nil))
+                                              (not (equal new-value t))
+                                              (or (symbolp new-value)
+                                                  (listp new-value)))
+                                         "'")
+                                     (prin1-to-string new-value)))
+              (widget-insert "\n\n")))
+          (when ecb-renamed-options
+            (widget-insert "The following options are not longer valid and have now new names. ECB has\ntried to transform the old value to the new option. In cases where this\nwas not possible the current default value is active!")
+            (widget-insert "\n\n"))
+          (dolist (option ecb-renamed-options)
+            (let ((old-option-name (symbol-name (nth 0 option)))
+                  (old-value (nth 1 option))
+                  (new-option-name (symbol-name (nth 2 option)))
+                  (new-value (nth 3 option)))
+              (widget-insert (concat "+ Old option: " old-option-name))
+              (widget-insert "\n")
+              (widget-insert (concat "  Old value:  "
+                                     (if (and (not (equal old-value nil))
+                                              (not (equal old-value t))
+                                              (or (symbolp old-value)
+                                                  (listp old-value)))
+                                         "'")
+                                     (prin1-to-string old-value)))
+              (widget-insert "\n")
+              (widget-insert (concat "  New option: " new-option-name))
+              (widget-insert "\n")
+              (widget-insert (concat "  New value:  "
+                                     (if (equal new-value 'ecb-no-upgrade-conversion)
+                                         ;; we print the new default value.
+                                         (prin1-to-string (symbol-value (nth 2 option)))
+                                       (concat (if (and (not (equal new-value nil))
+                                                        (not (equal new-value t))
+                                                        (or (symbolp new-value)
+                                                            (listp new-value)))
+                                                   "'")
+                                               (prin1-to-string new-value)))))
+              (if (equal new-value 'ecb-no-upgrade-conversion)
+                  (widget-insert "\n  (The old value couldn't be transformed - this is the current default!)"))
+              (widget-insert "\n\n")))
+          (widget-insert "If the new values are not what you want please re-customize!")
+          (widget-insert "\n\n")
+          (widget-insert "For a list of the most important NEWS call `ecb-display-news-for-upgrade'!\n\n")
+          (widget-insert "\n")
+          (when (ecb-custom-file-writeable-p)
+            (when (not (get 'ecb-display-upgraded-options
+                            'ecb-upgrades-saved))
+              ;; Insert the Save button
+              (widget-create 'push-button
+                             :button-keymap ecb-upgrade-button-keymap ; XEmacs
+                             :keymap ecb-upgrade-button-keymap ; Emacs
+                             :notify (lambda (&rest ignore)
+                                       (if (get 'ecb-display-upgraded-options
+                                                'ecb-upgrades-saved)
+                                           (ecb-info-message "Upgraded options are already saved!")
+                                         (ecb-upgrade-make-copy-of-custom-file)
+                                         (dolist (option ecb-not-compatible-options)
+                                           (ecb-customize-save-variable
+                                            (car option) (symbol-value (car option))))
+                                         (dolist (option ecb-renamed-options)
+                                           (ecb-customize-save-variable
+                                            (nth 2 option)
+                                            (symbol-value (nth 2 option))))
+                                         ;; store the information that the
+                                         ;; upgradings have already been saved now
+                                         (put 'ecb-display-upgraded-options
+                                              'ecb-upgrades-saved t)
+                                         (ecb-store-current-options-version)
+                                         (ecb-info-message "Upgraded options saved!")))
+                             "Save")
+              (widget-insert " ")))
+          ;; Insert the Cancel button
+          (widget-create 'push-button
+                         :button-keymap ecb-upgrade-button-keymap ; XEmacs
+                         :keymap ecb-upgrade-button-keymap ; Emacs
+                         :notify (lambda (&rest ignore)
+                                   (kill-buffer (current-buffer)))
+                         "Close")
+          (widget-setup)
+          (goto-char (point-min)))
+        t)
+    ;; now we display only the choice to save the ecb-options-version but only
+    ;; if ecb-options-version != ecb-version and (either the command is called
+    ;; interactively or first-time called by program)
+    (when (and (or (interactive-p)
+                   (not (get 'ecb-display-upgraded-options
+                         'ecb-options-version-save-displayed)))
+               (not (ecb-options-version=ecb-version-p)))
+      (put 'ecb-display-upgraded-options 'ecb-options-version-save-displayed t)
+      (with-current-buffer (get-buffer-create "*ECB upgraded options*")
+        (switch-to-buffer (current-buffer))
+        (kill-all-local-variables)
+        (let ((inhibit-read-only t))
+          (erase-buffer))
+        (widget-insert "There are no incompatible or renamed options. Your settings are correct.\n")
+        (widget-insert (format "But ECB must store that the ecb-settings are uptodate with %s.\n\n"
+                               ecb-version))
+        (if (not (ecb-custom-file-writeable-p))
+            (progn
+              (widget-insert (format "Emacs can not save the value of `ecb-options-version' (%s) in that file\n" ecb-options-version))
+              (widget-insert "specified for storing all customizations (see documentation of the option\n")
+              (widget-insert "`custom-file') because the file")
+              (widget-insert (if (ecb-custom-file)
+                                 (concat (ecb-custom-file) " is not writeable by Emacs!")
+                               " does either not exist or Emacs has been\nstarted with -q (in the latter case Emacs prevents from writing in the\ncustomizations-file)!\n"))
+              (widget-insert "\nPlease restart Emacs with a writeable custom- or init-file or without -q\nso the value of `ecb-options-version' (s.a.) can be stored!\n\n"))
+          (widget-insert (format "Click on [Save] to save `ecb-options-version' (%s) into %s.\n"
+                                 ecb-options-version (ecb-custom-file)))
+          (widget-insert (format "This makes a backup of this file unique named with a suffix .before_ecb_%s.\n\n"
+                                 ecb-version)))
+        (widget-insert "Click on [Close] to kill this buffer (do this also after clicking [Save]).\n\n")
+        (widget-insert "For a list of the most important NEWS call `ecb-display-news-for-upgrade'!\n\n")
+        (widget-insert "\n")
+        (when (ecb-custom-file-writeable-p)
+          ;; Insert the Save button
+          (widget-create 'push-button
+                         :button-keymap ecb-upgrade-button-keymap ; XEmacs
+                         :keymap ecb-upgrade-button-keymap ; Emacs
+                         :notify (lambda (&rest ignore)
+                                   (ecb-upgrade-make-copy-of-custom-file)
+                                   (ecb-store-current-options-version)
+                                   (ecb-info-message "ecb-options-version saved!"))
+                         "Save")
+          (widget-insert " "))
+        ;; Insert the Close button
+        (widget-create 'push-button
+                       :button-keymap ecb-upgrade-button-keymap ; XEmacs
+                       :keymap ecb-upgrade-button-keymap ; Emacs
+                       :notify (lambda (&rest ignore)
+                                 (kill-buffer (current-buffer)))
+                       "Close")
+        (widget-setup)
+        (goto-char (point-min))))
+    nil))
+
+(defun ecb-display-news-for-upgrade (&optional full-news)
+  "Display the most important NEWS after an ECB-upgrade.
+If you call this function but no ECB-upgrade has been performed before
+starting ECB then nothing is display unless FULL-NEWS is not nil.
+
+If FULL-NEWS is not nil then the NEWS-file is displayed in another window."
+  (interactive "P")
+  (if full-news
+      (find-file-other-window (concat ecb-ecb-dir "NEWS"))
+    (if (and ecb-old-ecb-version
+             (or (not (get 'ecb-display-news-for-upgrade
+                           'ecb-news-for-upgrade-displayed))
+                 (interactive-p)))
+        (progn
+          (with-output-to-temp-buffer "*News for the new ECB-version*"
+            (princ (format "You have upgraded ECB from version %s to %s.\n\n"
+                           ecb-old-ecb-version ecb-version))
+            (princ "Here are the most important NEWS:\n\n")
+            (mapc (function (lambda (version)
+                              (if (ecb-package-version-list<
+                                   (ecb-package-version-str2list ecb-old-ecb-version)
+                                   (ecb-package-version-str2list (car version)))
+                                  (dolist (news (cdr version))
+                                    (princ (concat "* " news "\n"))))))
+                  ecb-upgrade-news)
+            (princ "\nFor more details see the attached NEWS-file."))
+          ;; We want this being displayed only once
+          (put 'ecb-display-news-for-upgrade 'ecb-news-for-upgrade-displayed t))
+      (message "There are no NEWS to display."))))
+    
+  
+(defun ecb-upgrade-options ()
+  "Check for all ECB-options if the current value is compatible to the type.
+If not upgrade it to the new type or reset it to the default-value of current
+ECB. Try also to upgrade renamed options. Displays all upgraded or reset
+options with their old \(before the upgrade/reset) and new values."
+  (interactive)
+  (ecb-check-not-compatible-options)
+  (ecb-upgrade-not-compatible-options)
+  (ecb-upgrade-renamed-options)
+  (ecb-display-upgraded-options))
+
+;; ----------------------------------------------------------------------
+;; all needs for the requirements check
+;; ----------------------------------------------------------------------
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should set this to pre6
+(defconst ecb-required-cedet-version-min '(1 0 2 6))
+(defconst ecb-required-cedet-version-max '(1 0 4 9))
+
+(defvar ecb-all-requirements-available nil)
+
+(defun ecb-check-requirements ()
+  "Ensure that if all requirements of ECB are fulfilled.
+
+Currently this is a check if the right `cedet-version is loaded."
+  ;; we do not support (X)Emacs 18, 19 or 20!
+  (when ecb-running-unsupported-emacs
+    (ecb-error "Sorry, but ECB requires an (X)Emacs-version >= 21!"))
+
+  (when ecb-regular-xemacs-package-p
+    (ecb-error "Sorry, but ECB is currently not runnable as XEmacs-package. Install \"by hand\"."))
+
+  (when (and (or (not (boundp 'ecb-version-check)) ecb-version-check)
+             (not ecb-all-requirements-available))
+    (let ((cedet-required-version-str-min (ecb-package-version-list2str
+                                           ecb-required-cedet-version-min))
+          (cedet-required-version-str-max (ecb-package-version-list2str
+                                           ecb-required-cedet-version-max))
+          (version-error nil))
+      ;; check if vedet-version is correct
+      (when (or (not (boundp 'cedet-version))
+                (ecb-package-version-list<
+                 (ecb-package-version-str2list cedet-version)
+                 ecb-required-cedet-version-min)
+                (ecb-package-version-list<
+                 ecb-required-cedet-version-max
+                 (ecb-package-version-str2list cedet-version)))
+        (setq version-error (concat "cedet ["
+                                    cedet-required-version-str-min
+                                    ", "
+                                    cedet-required-version-str-max
+                                    "]")))
+      (if (null version-error)
+          ;; this is the only place where this variable is set
+          (setq ecb-all-requirements-available t)
+        (ecb-error "ECB can only be used with %s! Please install it and restart Emacs!"
+                   version-error))))
+  (when ecb-all-requirements-available
+    (message "All requirements for ECB %s fulfilled - Enjoy it!" ecb-version)))
+
+
+(defun ecb-package-version-str2list (ver-str)
+  "Convert the version-str VER-STR to the internal version-list format with
+the following elements of the version-list:
+1. Major-version
+2. Minor-version
+3. 0 = alpha, 1 = beta, 2 = pre, 3 = nothing \(e.g. \"1.4\"), 4 = . \(e.g. \"1.4.3\"
+4. Subversion after the alpha, beta, pre or .
+
+Return nil if ver-str has not the required syntax:
+<major>.<minor>\[.|pre|beta|alpha]\[<sub-stable/pre/beta/alpha-version>]"
+  (let ((str ver-str))
+    (save-match-data 
+      (if (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)\\(pre\\|beta\\|alpha\\|\\.\\)?\\([0-9]+\\)?$" str)
+          (list (string-to-number (match-string 1 str))
+                (string-to-number (match-string 2 str))
+                (if (ecb-string= (match-string 3 str) "alpha")
+                    0
+                  (if (ecb-string= (match-string 3 str) "beta")
+                      1
+                    (if (ecb-string= (match-string 3 str) "pre")
+                        2
+                      (if (ecb-string= (match-string 3 str) ".")
+                          4
+                        3))))
+                (if (match-string 4 str)
+                    (string-to-number (match-string 4 str))
+                  0))))))
+
+;; (ecb-package-version-str2list "1.0")
+;; (ecb-package-version-str2list "1.0alpha")
+;; (ecb-package-version-str2list "1.0alpha3")
+;; (ecb-package-version-str2list "1.0beta")
+;; (ecb-package-version-str2list "1.0beta3")
+;; (ecb-package-version-str2list "1.0pre")
+;; (ecb-package-version-str2list "1.0pre3")
+;; (ecb-package-version-str2list "1.0.1")
+
+
+
+(defun ecb-package-version-list< (ver1 ver2)
+  "Return non-nil if VER1 is less than VER2."
+  (let ((v1-0 (nth 0 ver1))
+	(v1-1 (nth 1 ver1))
+	(v1-2 (nth 2 ver1))
+	(v1-3 (nth 3 ver1))
+	;; v2
+	(v2-0 (nth 0 ver2))
+	(v2-1 (nth 1 ver2))
+	(v2-2 (nth 2 ver2))
+	(v2-3 (nth 3 ver2)))
+    (or (< v1-0 v2-0)
+        (and (= v1-0 v2-0)
+             (< v1-1 v2-1))
+        (and (= v1-0 v2-0)
+             (= v1-1 v2-1)
+             (< v1-2 v2-2))
+        (and (= v1-0 v2-0)
+             (= v1-1 v2-1)
+             (= v1-2 v2-2)
+             (< v1-3 v2-3)))))
+
+(defun ecb-package-version-string< (ver1-str ver2-str)
+  "Return non nil if VER-STR1 is logically less then VER-STR2."
+  (let ((ver1 (ecb-package-version-str2list ver1-str))
+        (ver2 (ecb-package-version-str2list ver2-str)))
+    (ecb-package-version-list< ver1 ver2)))
+
+(defun ecb-package-version-list2str (ver)
+  "Complementary function to `ecb-package-version-str2list'."
+  (concat (number-to-string (nth 0 ver))
+          "."
+          (number-to-string (nth 1 ver))
+          (case (nth 2 ver)
+            (0 "alpha")
+            (1 "beta")
+            (2 "pre")
+            (4 ".")
+            (otherwise ""))
+          (if (and (not (= (nth 2 ver) 3))
+                   (not (= (nth 3 ver) 0)))
+              (number-to-string (nth 3 ver))
+            "")))
+
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0alpha"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0alpha3"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0beta"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0beta3"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0pre"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0pre3"))
+;; (ecb-package-version-list2str (ecb-package-version-str2list "1.0.1"))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: remove from texi the whole
+;; download stuff inkl. in the command ssection ecb-download-*
+
+(silentcomp-provide 'ecb-upgrade)
+
+;;; ecb-upgrade.el ends here
diff --git a/site/ecb-2.40/ecb-util.el b/site/ecb-2.40/ecb-util.el
new file mode 100644
index 0000000..84d3b54
--- /dev/null
+++ b/site/ecb-2.40/ecb-util.el
@@ -0,0 +1,2171 @@
+;;; ecb-util.el --- utility functions for ECB
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-util.el,v 1.155 2009/05/15 15:19:53 berndl Exp $
+
+;;; Commentary:
+;;
+;; Contains misc utility functions for ECB.
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(eval-when-compile (require 'cl))
+
+;;; ----- Silentcomp-Defs ----------------------------------
+
+;; XEmacs
+(silentcomp-defun symbol-value-in-buffer)
+(silentcomp-defun button-release-event-p)
+(silentcomp-defun button-press-event-p)
+(silentcomp-defun event-key)
+(silentcomp-defun frame-property)
+(silentcomp-defun point-at-bol)
+(silentcomp-defun point-at-eol)
+(silentcomp-defun frame-parameter)
+(silentcomp-defun line-beginning-position)
+(silentcomp-defun line-end-position)
+(silentcomp-defun window-pixel-edges)
+(silentcomp-defun noninteractive)
+;; Emacs
+(silentcomp-defun event-basic-type)
+(silentcomp-defvar noninteractive)
+(silentcomp-defun window-edges)
+(silentcomp-defun buffer-local-value)
+(silentcomp-defun posn-point)
+(silentcomp-defun posn-window)
+(silentcomp-defun event-start)
+(silentcomp-defun set-window-vscroll)
+;; XEmacs
+(silentcomp-defun make-dialog-box)
+(silentcomp-defun display-message)
+(silentcomp-defun clear-message)
+(silentcomp-defun make-event)
+;; Emacs
+(silentcomp-defvar message-log-max)
+(silentcomp-defvar message-truncate-lines)
+(silentcomp-defun x-popup-dialog)
+(silentcomp-defun display-images-p)
+(silentcomp-defvar tar-subfile-mode)
+(silentcomp-defvar archive-subfile-mode)
+(silentcomp-defun count-screen-lines)
+(silentcomp-defvar header-line-format)
+
+;; timer stuff for Xemacs
+(silentcomp-defun delete-itimer)
+(silentcomp-defun start-itimer)
+;; thing stuff for XEmacs
+(silentcomp-defun thing-boundaries)
+(silentcomp-defun thing-symbol)
+
+(silentcomp-defun custom-file)
+
+;;; ----- Some constants -----------------------------------
+
+;;;###autoload
+;;(defconst ecb-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
+(defconst ecb-running-xemacs (featurep 'xemacs))
+
+(defconst ecb-running-unsupported-emacs (condition-case nil
+                                            (<= emacs-major-version 20)
+                                          (error t))
+  "True if running XEmacs or Emacs < 21.")
+
+(defconst ecb-running-version-22 (and (not ecb-running-unsupported-emacs)
+                                      (>= emacs-major-version 22))
+  "True if running \(X)Emacs >= version 22")
+
+(defconst ecb-running-version-23 (and (not ecb-running-unsupported-emacs)
+                                      (>= emacs-major-version 23))
+  "True if running \(X)Emacs >= version 23")
+
+(defconst ecb-temp-dir
+  (file-name-as-directory
+   (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
+       (if (eq system-type 'windows-nt) "c:/temp/" "/tmp/")))
+  "A directory where ECB can store temporary files.")
+
+(defconst ecb-ecb-dir
+  (expand-file-name (file-name-directory (locate-library "ecb"))))
+(defconst ecb-semantic-dir
+  (if (locate-library "semantic")
+      (expand-file-name (file-name-directory (locate-library "semantic")))))
+
+(defconst ecb-ecb-parent-dir (expand-file-name (concat ecb-ecb-dir "../")))
+
+;; we assume that current loaded ECB is a regular XEmacs-package if and only
+;; if `ecb-ecb-dir' contains the files "_pkg.el" and "auto-autoloads.el" and
+;; we are running XEmacs
+(defconst ecb-regular-xemacs-package-p
+  (and ecb-running-xemacs
+       (file-exists-p (expand-file-name (concat ecb-ecb-dir "_pkg.el")))
+       (file-exists-p (expand-file-name (concat ecb-ecb-dir "auto-autoloads.el")))))
+
+;; image support possible with current Emacs setup?
+;; This will first checked at activation-time of ECB because otherwise usage
+;; of emacs --deamon could fail...
+
+(defvar ecb-images-can-be-used nil
+  "INTERNAL - DO NOT USE AND CHANGE!")
+(defvar ecb-images-can-be-used-init-p nil
+  "INTERNAL - DO NOT USE AND CHANGE!")
+
+(defun ecb-images-can-be-used ()
+  "Not nil if images can be used with current Emacs setup."
+  (if ecb-images-can-be-used-init-p
+      ecb-images-can-be-used
+    (setq ecb-images-can-be-used-init-p t)
+    (setq ecb-images-can-be-used
+          (and (or (fboundp 'defimage)
+                   (fboundp 'make-image-specifier))
+               (if (fboundp 'display-images-p)
+                   (display-images-p)
+                 window-system)))))
+
+
+;;; ----- Tracing ------------------------------------------
+
+;; we use the trace.el library!
+
+;;; ----- Compatibility between GNU Emacs and XEmacs -------
+
+;; miscellaneous differences
+
+(defmacro when-ecb-running-xemacs (&rest body)
+  "Evaluates BODY when `ecb-running-xemacs' is true. Use this macro when you
+want the BODY being parsed by semantic!. If not use the variable
+`ecb-running-xemacs'."
+  `(when ecb-running-xemacs
+     ,@body))
+
+(defmacro when-ecb-running-emacs (&rest body)
+  "Evaluates BODY when `ecb-running-xemacs' is false. Use this macro when you
+want the BODY being parsed by semantic!. If not use the form
+\(unless ecb-running-xemacs)."
+  `(unless ecb-running-xemacs
+     ,@body))
+
+;; I do not want all this compatibitly stuff being parsed by semantic,
+;; therefore i do not use the macro `when-ecb-running-xemacs'!
+
+(when ecb-running-xemacs
+  (defun ecb-event-to-key (event)
+    (typecase event
+      (button-release-event 'mouse-release)
+      (button-press-event 'mouse-press)
+      (otherwise
+       ;; the ignore-errors is a little hack because i don't know all
+       ;; events of XEmacs so sometimes event-key produces a
+       ;; wrong-type-argument error.
+       (ignore-errors (event-key event)))))
+  (defun ecb-facep (face)
+    (memq face (face-list)))
+  (defun ecb-noninteractive ()
+    "Return non-nil if running non-interactively, i.e. in batch mode."
+    (noninteractive))
+  (defun ecb-subst-char-in-string (fromchar tochar string &optional inplace)
+    "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+    (let ((i (length string))
+          (newstr (if inplace string (copy-sequence string))))
+      (while (> i 0)
+        (setq i (1- i))
+        (if (eq (aref newstr i) fromchar)
+            (aset newstr i tochar)))
+      newstr))
+  (defun ecb-substring-no-properties (string &optional start end)
+    (let* ((start (or start 0))
+           (end (or end (length string)))
+           (string (substring string start end)))
+      (set-text-properties start end nil string)
+      string))
+    
+  (defun ecb-derived-mode-p (&rest modes)
+    "Non-nil if the current major mode is derived from one of MODES.
+Uses the `derived-mode-parent' property of the symbol to trace backwards."
+    (let ((parent major-mode))
+      (while (and (not (memq parent modes))
+                  (setq parent (get parent 'derived-mode-parent))))
+      parent))
+  (defsubst ecb-count-screen-lines (&optional beg end)
+    (let ((b (or beg (point-min)))
+          (e (or end (point-max))))
+      (count-lines b e)))
+  (defalias 'ecb-frame-parameter 'frame-property)
+  (defalias 'ecb-line-beginning-pos 'point-at-bol)
+  (defalias 'ecb-bolp 'bolp)
+  (defalias 'ecb-eolp 'eolp)
+  (defalias 'ecb-bobp 'bobp)
+  (defalias 'ecb-eobp 'eobp)
+  (defalias 'ecb-line-end-pos 'point-at-eol)
+  (defalias 'ecb-event-window 'event-window)
+  (defalias 'ecb-event-point 'event-point)
+  (defalias 'ecb-event-buffer 'event-buffer)
+  (defalias 'ecb-window-full-width 'window-full-width)
+  (defalias 'ecb-window-full-height 'window-height)
+  (defalias 'ecb-window-display-height 'window-displayed-height)
+  (defun ecb-frame-char-width (&optional frame)
+    (/ (frame-pixel-width frame) (frame-width frame)))
+  (defun ecb-frame-char-height (&optional frame)
+    (/ (frame-pixel-height frame) (frame-height frame)))
+  (defun ecb-window-edges (&optional window)
+    (let ((pix-edges (window-pixel-edges window)))
+      (list (/ (nth 0 pix-edges) (ecb-frame-char-width))
+            (/ (nth 1 pix-edges) (ecb-frame-char-height))
+            (/ (nth 2 pix-edges) (ecb-frame-char-width))
+            (/ (nth 3 pix-edges) (ecb-frame-char-height))))))
+
+(unless ecb-running-xemacs
+  (defun ecb-event-to-key (event)
+    (let ((type (event-basic-type event)))
+      (case type
+        ((mouse-1 mouse-2 mouse-3) 'mouse-release)
+        ((down-mouse-1 down-mouse-2 down-mouse-3) 'mouse-press)
+        (otherwise (event-basic-type event)))))
+  (defalias 'ecb-facep 'facep)
+  (defun ecb-noninteractive ()
+    "Return non-nil if running non-interactively, i.e. in batch mode."
+    noninteractive)
+  (defalias 'ecb-subst-char-in-string 'subst-char-in-string)
+  (defalias 'ecb-substring-no-properties 'substring-no-properties)
+  (defalias 'ecb-derived-mode-p 'derived-mode-p)
+  (defsubst ecb-count-screen-lines (&optional beg end)
+    (count-screen-lines beg end))
+  (defalias 'ecb-frame-parameter 'frame-parameter)
+  (defalias 'ecb-line-beginning-pos 'line-beginning-position)
+  (defalias 'ecb-line-end-pos 'line-end-position)
+  (defalias 'ecb-bolp 'bolp)
+  (defalias 'ecb-eolp 'eolp)
+  (defalias 'ecb-bobp 'bobp)
+  (defalias 'ecb-eobp 'eobp)
+  (defun ecb-event-window (event)
+    (posn-window (event-start event)))
+  (defun ecb-event-point (event)
+    (posn-point (event-start event)))
+  (defun ecb-event-buffer (event)
+    (window-buffer (ecb-event-window event)))
+  (defun ecb-window-full-width (&optional window)
+    (let ((edges (window-edges window)))
+      (- (nth 2 edges) (nth 0 edges))))
+  (defalias 'ecb-window-display-height 'window-text-height)
+  (defalias 'ecb-window-full-height 'window-height)
+  (defalias 'ecb-frame-char-width 'frame-char-width)
+  (defalias 'ecb-frame-char-height 'frame-char-height)
+  (defalias 'ecb-window-edges 'window-edges))
+
+;; thing at point stuff
+
+(if (not ecb-running-xemacs)
+    (progn
+      (require 'thingatpt)
+      (defalias 'ecb-thing-at-point 'thing-at-point)
+      (defalias 'ecb-end-of-thing 'end-of-thing)
+      (defalias 'ecb-beginning-of-thing 'beginning-of-thing))
+  ;; Xemacs
+  (require 'thing)
+  (defun ecb-thing-at-point (thing)
+    (let ((bounds (if (eq 'symbol thing)
+                      (thing-symbol (point))
+                    (thing-boundaries (point)))))
+      (buffer-substring (car bounds) (cdr bounds))))
+  (defun ecb-end-of-thing (thing)
+    (goto-char (cdr (if (eq 'symbol thing)
+                        (thing-symbol (point))
+                      (thing-boundaries (point))))))
+  (defun ecb-beginning-of-thing (thing)
+    (goto-char (car (if (eq 'symbol thing)
+                        (thing-symbol (point))
+                      (thing-boundaries (point)))))))
+
+;; overlay- and extend-stuff
+
+(if (not ecb-running-xemacs)
+    (progn
+      (defalias 'ecb-make-overlay            'make-overlay)
+      (defalias 'ecb-overlay-put             'overlay-put)
+      (defalias 'ecb-overlay-move            'move-overlay)
+      (defalias 'ecb-overlay-delete          'delete-overlay)
+      (defalias 'ecb-overlay-kill            'delete-overlay))
+  ;; XEmacs
+  (defalias 'ecb-make-overlay            'make-extent)
+  (defalias 'ecb-overlay-put             'set-extent-property)
+  (defalias 'ecb-overlay-move            'set-extent-endpoints)
+  (defalias 'ecb-overlay-delete          'detach-extent)
+  (defalias 'ecb-overlay-kill            'delete-extent))
+
+;; timer stuff
+
+(if (not ecb-running-xemacs)
+    (progn
+      (defalias 'ecb-run-with-timer 'run-with-timer)
+      (defalias 'ecb-run-with-idle-timer 'run-with-idle-timer)
+      (defalias 'ecb-cancel-timer 'cancel-timer))
+  ;; XEmacs
+  (defun ecb-run-with-timer (secs repeat function &rest args)
+    (start-itimer "ecb-timer" function secs repeat
+                  nil (if args t nil) args))
+  (defun ecb-run-with-idle-timer (secs repeat function &rest args)
+    (start-itimer "ecb-idle-timer"
+                  function secs (if repeat secs nil)
+                  t (if args t nil) args))
+  (defun ecb-cancel-timer (timer)
+    (delete-itimer timer))
+  )
+
+
+;;; ----- Customize stuff ----------------------------------
+
+(defun ecb-custom-file ()
+  "Filename of that file which is used by \(X)Emacs to store the
+customize-options. If no custom-file can be computed or if Emacs reports an
+error \(e.g. GNU Emacs complains when calling `custom-file' and Emacs has been
+started with -q) nil is returned."
+  (if ecb-running-xemacs
+      custom-file
+    (require 'cus-edit)
+    (ignore-errors (custom-file))))
+
+(defun ecb-option-get-value (option &optional type)
+  "Return the value of a customizable ECB-option OPTION with TYPE, where TYPE
+can either be 'standard-value \(the default-value of the defcustom) or
+'saved-value \(the value stored persistent by the user via customize) or
+'customized-value \(the value set but not saved in the customize buffer).
+If TYPE is nil then the most recent set value is returned, means it
+tries the customized-value, then the saved-value and then the standard-value
+in exactly this sequence."
+  (let ((val (car (if type
+                      (get option type)
+                    (or (get option 'customized-value)
+                        (get option 'saved-value)
+                        (get option 'standard-value))))))
+    (cond ((not (listp val)) val)
+          ((equal 'quote (car val)) (car (cdr val)))
+;;          (t (car val)))))
+          (t (eval val)))))
+
+;;; ----- Assoc helpers ------------------------------------
+
+(defun ecb-remove-assoc (key list)
+  (delete nil
+          (mapcar (function (lambda (elem)
+                              (if (equal (car elem) key)
+                                  nil
+                                elem)))
+                  list)))
+
+
+(defun ecb-add-assoc (key-value list)
+  (cons key-value list))
+
+(defun ecb-find-assoc-value (key list)
+  (cdr (assoc key list)))
+
+(defun ecb-find-assoc (key list)
+  (assoc key list))
+
+;;; ----- Some function from cl ----------------------------
+
+(defun ecb-filter (seq pred)
+  "Filter out those elements of SEQUENCE for which PREDICATE returns nil."
+  (let ((res))
+    (dolist (elem seq)
+      (if (if pred (funcall pred elem) elem)
+          (setq res (append res (list elem)))))
+    res))
+
+(defun ecb-some (cl-pred cl-seq &rest cl-rest)
+  "Return true if PREDICATE is true of any element of SEQ or SEQs.
+If so, return the true (non-nil) value returned by PREDICATE."
+  (if (or cl-rest (nlistp cl-seq))
+      (catch 'cl-some
+	(apply 'map nil
+	       (function (lambda (&rest cl-x)
+			   (let ((cl-res (apply cl-pred cl-x)))
+			     (if cl-res (throw 'cl-some cl-res)))))
+	       cl-seq cl-rest) nil)
+    (let ((cl-x nil))
+      (while (and cl-seq (not (setq cl-x (funcall cl-pred (pop cl-seq))))))
+      cl-x)))
+
+(defun ecb-copy-list (list)
+  "Return a copy of a LIST, which may be a dotted list.
+The elements of the list are not copied, just the list structure itself."
+  (if (fboundp 'copy-sequence)
+      (copy-sequence list)
+    (if (consp list)
+        (let ((res nil))
+          (while (consp list) (push (pop list) res))
+          (prog1 (nreverse res) (setcdr res list)))
+      (car list))))
+
+(defun ecb-set-difference (list1 list2 &optional test-fcn)
+  "Combine LIST1 and LIST2 using a set-difference operation.
+The result list contains all items that appear in LIST1 but not LIST2.
+This is a non-destructive function; it makes a copy of the data if necessary
+to avoid corrupting the original LIST1 and LIST2.
+If TEST-FCN is not nil then it must be a function which is used to check if an
+item of LIST1 is an element of LIST2. If TEST-FCN is nil then `memq' is used."
+  (if (or (null list1) (null list2)) list1
+    (let ((res nil))
+      (while list1
+        (or (if test-fcn
+                (funcall test-fcn (car list1) list2)
+              (memq (car list1) list2))
+            (push (car list1) res))
+        (pop list1))
+      res)))
+
+
+(defun ecb-member (item list &optional test-fcn)
+  "Find the first occurrence of ITEM in LIST.
+Return the sublist of LIST whose car is ITEM. Comparison is done via `equal'
+unless TEST-FCN is not nil: In this case TEST-FCN will be used to compare ITEM
+with the elements of LIST. If TEST-FCN is `eq' then `memq' is called for
+optimization."
+  (if test-fcn
+      (if (eq test-fcn 'eq)
+          ;; some optimization
+          (memq item list)
+        (progn
+          (while (and list (not (funcall test-fcn item (car list))))
+            (setq list (cdr list)))
+          list))
+    (member item list)))
+
+(defun ecb-position (seq elem &optional test-fcn)
+  "Return the position of ELEM within SEQ counting from 0. Comparison is done
+with `equal' unless TEST-FCN is not nil: In this case TEST-FCN will be used to
+compare ITEM with the elements of SEQ."
+  (if (listp seq)
+      (let ((pos (- (length seq) (length (ecb-member elem seq test-fcn)))))
+        (if (= pos (length seq))
+            nil
+          pos))
+    (catch 'found
+      (dotimes (i (length seq))
+        (if (funcall (or test-fcn 'equal) elem (aref seq i))
+            (throw 'found i)))
+      nil)))
+
+(defun ecb-set-elt (seq n val)
+  "Set VAL as new N-th element of SEQ. SEQ can be any sequence. SEQ will be
+changed because this is desctructive function. SEQ is returned."
+  (if (listp seq)
+      (setcar (nthcdr n seq) val)
+    (aset seq n val))
+  seq)
+
+(defun ecb-remove-elt (seq n)
+  "Remove N-th element from SEQ. SEQ can be any sequence. SEQ will be
+changed because this is desctructive function. SEQ is returned."
+  (delq 'ecb-util-remove-marker (ecb-set-elt seq n 'ecb-util-remove-marker)))
+
+(defun ecb-replace-first-occurence (seq old-elem new-elem)
+  "Replace in SEQ the first occurence of OLD-ELEM with NEW-ELEM. Comparison is
+done by `equal'. This is desctructive function. SEQ is returned."
+  (let ((pos (ecb-position seq old-elem)))
+    (if pos
+        (ecb-set-elt seq pos new-elem)))
+  seq)
+
+(defun ecb-replace-all-occurences (seq old-elem new-elem)
+  "Replace in SEQ all occurences of OLD-ELEM with NEW-ELEM. Comparison is
+done by `equal'. This is desctructive function. SEQ is returned."
+  (while (ecb-position seq old-elem)
+    (setq seq (ecb-replace-first-occurence seq old-elem new-elem)))
+  seq)
+
+(defun ecb-remove-first-occurence-from-list (list elem)
+  "Replace first occurence of ELEM from LIST. Comparison is done by `equal'.
+This is desctructive function. LIST is returned."
+  (delq 'ecb-util-remove-marker
+        (ecb-replace-first-occurence list elem 'ecb-util-remove-marker)))
+
+(defun ecb-remove-all-occurences-from-list (list elem)
+  "Replace all occurences of ELEM from LIST. Comparison is done by `equal'.
+This is desctructive function. LIST is returned."
+  (delq 'ecb-util-remove-marker
+        (progn          
+          (while (ecb-position list elem)
+            (setq list (ecb-replace-first-occurence list elem
+                                                    'ecb-util-remove-marker)))
+          list)))
+
+(defun ecb-subseq (seq start &optional end)
+  "Return the subsequence of SEQ from START to END.
+If END is omitted, it defaults to the length of the sequence.
+If START or END is negative, it counts from the end."
+  (if (stringp seq) (substring seq start end)
+    (let (len)
+      (and end (< end 0) (setq end (+ end (setq len (length seq)))))
+      (if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
+      (typecase seq
+        (list (if (> start 0) (setq seq (nthcdr start seq)))
+              (if end
+                  (let ((res nil))
+                    (while (>= (setq end (1- end)) start)
+                      (push (pop seq) res))
+                    (nreverse res))
+                (copy-sequence seq)))
+        (otherwise (or end (setq end (or len (length seq))))
+                   (let ((res (make-vector (max (- end start) 0) nil))
+                         (i 0))
+                     (while (< start end)
+                       (aset res i (aref seq start))
+                       (setq i (1+ i) start (1+ start)))
+                     res))))))
+
+(defun ecb-concatenate (type &rest seqs)
+  "Concatenate, into a sequence of type TYPE, the argument SEQUENCES.
+TYPE can be 'string, 'vector or 'list."
+  (case type
+    (vector (apply 'vconcat seqs))
+    (string (apply 'concat seqs))
+    (list (apply 'append (append seqs '(nil))))
+    (otherwise (ecb-error "Not a sequence type name: %s" type))))
+
+(defun ecb-rotate (seq start-elem)
+  "Rotate SEQ so START-ELEM is the new first element of SEQ. SEQ is an
+arbitrary sequence. Example: \(ecb-rotate '\(a b c d e f) 'c) results in \(c d
+e f a b). If START-ELEM is not contained in SEQ then nil is returned."
+  (let ((start-pos (ecb-position seq start-elem)))
+    (when start-pos
+      (ecb-concatenate (typecase seq
+                         (list 'list)
+                         (string 'string)
+                         (vector 'vector))
+                       (ecb-subseq seq start-pos)
+                       (ecb-subseq seq 0 start-pos)))))
+
+(defun ecb-last (seq)
+  "Return the last elem of the sequence SEQ."
+  (if (listp seq)
+      (car (last seq))
+    (if (> (length seq) 0)
+        (aref seq (1- (length seq)))
+      nil)))
+
+(defun ecb-first (seq)
+  "Return the first elem of the sequence SEQ."
+  (if (listp seq)
+      (car seq)
+    (if (> (length seq) 0)
+        (aref seq 0)
+      nil)))
+  
+
+(defun ecb-next-listelem (list elem &optional nth-next)
+  "Return that element of LIST which follows directly ELEM when ELEM is an
+element of LIST. If ELEM is the last element of LIST then return the first
+element of LIST. If ELEM is not an element of LIST nil is returned. Elements
+are compared with `equal'.
+
+If NTH-NEXT is an integer then the NTH-NEXT element of LIST in the meaning
+described above is returned, i.e. the algorithm above is applied NTH-NEXT
+times. Example: Suppose LIST = '\(a b c d), ELEM is 'c and NTH-NEXT = 3 then
+'b is returned - same result for NTH-NEXT = 7, 11... It works also for
+negative integers, so when NTH-NEXT is -1 in the example above then 'b is
+returned."
+  (let ((elem-pos (ecb-position list elem))
+        (next (or nth-next 1)))
+    (and elem-pos
+         (nth (mod (+ elem-pos next)
+                   (length list))
+              list))))
+
+(defun ecb-aggregate-alist (alist same-predicate sort-predicate)
+  "Return ALIST as a sorted, aggregated alist.
+
+In the result all items with the same car element (according to
+SAME-PREDICATE) are aggregated together.  The alist is first sorted by
+SORT-PREDICATE which is called with two items of the alist and has to return
+not nil if item1 should be precede item2.
+
+Please note: SAME-PREDICATE gets the car of an item as argument, whereas
+SORT-PREDICATE gets two complete items as arguments!
+
+Example:
+\(ecb-aggregate-alist
+ '((a . a1) (a . a2) (b . b1) (c . c3) (a . a4) (a . a3) (b . b3) (b . b2))
+ (function string=)
+ (lambda (item1 item2)
+   (string< (symbol-name (car item1)) (symbol-name (car item2)))))
+results in
+\((a a1 a2 a4 a3) (b b1 b3 b2) (c c3))"
+  (when (not (null alist))
+    (let (same
+	  tmp-old-car
+	  tmp-same
+	  (first-time-p t)
+	  old-car)
+      (nconc
+       (apply #'nconc
+	      (mapcar
+	       (lambda (item)
+		 (cond
+		  (first-time-p
+		   (push (cdr item) same)
+		   (setq first-time-p nil)
+		   (setq old-car (car item))
+		   nil)
+		  ((funcall same-predicate (car item) old-car)
+		   (push (cdr item) same)
+		   nil)
+		  (t
+		   (setq tmp-same same
+			 tmp-old-car old-car)
+		   (setq same (list (cdr item))
+			 old-car (car item))
+		   (list (cons tmp-old-car (nreverse tmp-same))))))
+	       (sort alist (lambda (item1 item2)
+			     (funcall sort-predicate
+                                      item1 item2)))))
+       (list (cons old-car (nreverse same)))))))
+
+;; test
+;; (ecb-aggregate-alist
+;;  '((a . a1) (a . a2) (b . b1) (c . c3) (a . a4) (a . a3) (b . b3) (b . b2))
+;;  'string=
+;;  (lambda (item1 item2)
+;;    (if (string= (car item1) (car item2))
+;;        (string< (symbol-name (cdr item1)) (symbol-name (cdr item2)))
+;;      (string< (car item1) (car item2)))))
+
+;; Maybe we should enhance this docstring ;-)
+(defun ecb-member-of-symbol/value-list (value list &optional elem-accessor
+                                              return-accessor compare-fcn)
+  "Returns not nil when VALUE is a member of that list which is build from
+LIST by using the symbol-value if a list-member is a symbol and otherwise the
+list-member itself. If a member then the matching elem of LIST is returned.
+
+Per default comparison between VALUE and such a list-elem is done by `equal'
+unless third optional argument COMPARE-FCN is not nil: Then this function is
+used.
+
+If ELEM-ACCESSOR is a function then it is used to get that part of an elem
+of LIST for which the rule above should be applied. If RETURN-ACCESSOR is a
+function then it is used to get that part of that list-elem which is equal
+according to the rules above."
+  (let ((elem-acc (or elem-accessor 'identity))
+        (return-acc (or return-accessor 'identity))
+        (cmp-fcn (or compare-fcn 'equal)))
+    (catch 'exit
+      (dolist (elem list)
+        (let ((case-fold-search t)
+              (e (funcall elem-acc elem)))
+          (if (funcall cmp-fcn value (if (symbolp e)
+                                         (symbol-value e)
+                                       e))
+              (throw 'exit (funcall return-acc elem)))
+          nil)))))
+
+;; tests
+
+;; (ecb-member-of-symbol/value-list ecb-directories-buffer-name
+;;                                  ecb-tree-do-not-leave-window-after-select--internal)
+
+;; (ecb-member-of-symbol/value-list ecb-directories-buffer-name
+;;                                  (cdr '("adgasgd" .
+;;                                         ((ecb-directories-buffer-name . "dir")
+;;                                          (ecb-sources-buffer-name . "sou")
+;;                                          (ecb-history-buffer-name . "hist"))))
+;;                                  'car
+;;                                  'cdr)
+
+;;; ----- Some regexp stuff  -------------------------------
+
+(defsubst ecb-match-regexp-list (str regexp-list &optional elem-accessor
+                                     return-accessor)
+  "Return not nil if STR matches one of the regexps in REGEXP-LIST. If
+ELEM-ACCESSOR is a function then it is used to get the regexp from the
+processed elem of REGEXP-LIST. If nil the elem itself is used. If
+RETURN-ACCESSOR is a function then it is used to get the object to return from
+the matching elem. If nil then the matching elem itself is returned."
+  (let ((elem-acc (or elem-accessor 'identity))
+        (return-acc (or return-accessor 'identity)))
+    (catch 'exit
+      (dolist (elem regexp-list)
+        (let ((case-fold-search t))
+          (save-match-data
+            (if (string-match (funcall elem-acc elem) str)
+                (throw 'exit (funcall return-acc elem))))
+          nil)))))
+
+;;; ----- Multicache ---------------------------------------
+
+;; internal functions
+(defsubst ecb-multicache-init (cache-var)
+  "Initialize the ecb-multicache of CACHE-VAR. If CACHE-VAR contains already
+a valid cache then nothing is done otherwise a new cache is created."
+  (or (ecb-multicache-p cache-var)
+      (set cache-var (make-hash-table :size (get cache-var 'ecb-multicache-size)
+                                      :test (get cache-var 'ecb-multicache-test)))))
+
+(defun ecb-multicache-add-empty-key (cache-var key)
+  "Checks if KEY is already cached in the cache of CACHE-VAR. If yes nothing
+is done otherwise a new cache-element with empty subcaches is added to the
+cache. All subcaches defined via `defecb-multicache' are created with a
+value nil. CACHE-VAR has to be a symbol for which an assoc cache has been
+defined with `defecb-multicache'!"
+  (ecb-multicache-init cache-var)
+  (or (gethash key (symbol-value cache-var))
+      ;; now we add as value an assoc-list with an element for each registered
+      ;; subcache-element
+      (puthash key (mapcar (function (lambda (sc)
+                                       (cons sc nil)))
+                           (get cache-var
+                                'ecb-multicache-subcache-list))
+               (symbol-value cache-var))))
+
+(defun ecb-multicache-get-subcache (cache-var key subcache)
+  "Return that cons-cell which is associated with KEY in the cache of
+CACHE-VAR and which has the symbol SUBCACHE as its car. The cdr of this
+cons-cell is the currently stored SUBCACHE-value for KEY. If KEY is not cached
+then nil is returned."
+  (ecb-multicache-init cache-var)
+  (let ((hash-val (gethash key (symbol-value cache-var))))
+    (and hash-val
+         (assoc subcache hash-val))))
+
+;; public interface for the multi-cache
+
+(defmacro defecb-multicache (name size test subcache docstring)
+  "Defines NAME as variable and makes it an ecb-multicache.
+This means that for each cache-item of the cache NAME informations can be
+associated to different subcaches. SUBCACHE is either a symbol or a list of
+symbols. For each symbol in SUBCACHE a subcache is reserved in the cache NAME.
+
+Such a cache is especially senseful if different informations should be
+associated to one key.
+
+SIZE is a hint as to how many elements will be put in the cache. If SIZE is
+nil then the default is 100. If the cache exceeds SIZE it will be increased
+automatically.
+
+TEST must be a symbol that specifies how to compare keys. If TEST is nil then
+the default is `equal'.
+
+After defining the cache with this macro the cache can be used immediately\;
+there is no need for special initialization. The following functions are
+available for setting and accessing values in such a cache:
+
+  `ecb-multicache-put-value'
+  `ecb-multicache-apply-to-value'
+  `ecb-multicache-get-value'
+  `ecb-multicache-mapsubcache'
+  `ecb-multicache-clear-value'
+  `ecb-multicache-clear-subcache'
+  `ecb-multicache-remove'
+  `ecb-multicache-clear'
+  `ecb-multicache-print-subcache'
+  `ecb-multicache-p'
+
+The lookup in this multi-cache is really fast because the time required is
+essentially _independent_ of how many elements are stored in the cache."
+  `(progn
+     (eval-and-compile
+       (defvar ,name nil ,docstring))
+     (unless (get ',name 'ecb-multicache-p)
+       (setq ,name nil)
+       (put ',name 'ecb-multicache-subcache-list
+            (if (listp ,subcache)
+                ,subcache
+              (list ,subcache)))
+       (put ',name 'ecb-multicache-p t)
+       (put ',name 'ecb-multicache-size ,(or size 100))
+       (put ',name 'ecb-multicache-test ,(or test (quote 'equal)))
+       )))
+(put 'defecb-multicache 'lisp-indent-function 4)
+
+;; (insert (pp (macroexpand '(defecb-multicache klaus nil 'equal '(A B C) "docstring"))))
+
+
+
+(defun ecb-multicache-p (cache-var)
+  "Return not nil if the value of CACHE-VAR is a cache defined with
+`defecb-multicache'."
+  (and (hash-table-p (symbol-value cache-var))
+       (get cache-var 'ecb-multicache-p)))
+
+(defun ecb-multicache-get-value (cache-var key subcache)
+  "Return the currently associated value for KEY in the subcache SUBCACHE of
+the cache of CACHE-VAR. CACHE-VAR has to be a symbol for which an assoc cache
+has been defined with `defecb-multicache'!
+
+Be aware that the semantic of nil is not unique because nil can have the
+following meanings:
+- There is no cached item with KEY at all
+- There is an item with KEY in the cache but there is no assigned value for
+  SUBCACHE.
+- nil has been set as value for KEY and SUBCACHE \(via
+  `ecb-multicache-put-value' or `ecb-multicache-apply-to-value') - but this
+  is not recommended, see `ecb-multicache-apply-to-value'."
+  (cdr (ecb-multicache-get-subcache cache-var key subcache)))
+
+(defun ecb-multicache-get-values (cache-var key &optional subcache-list)
+  "Return an assoc-list with the subcaches listed in SUBCACHE-LIST. If
+SUBCACHE-LIST is nil then all currently registered subcaches of CACHE-VAR are
+returned. The result is an assoc-list where each element is a cons-cell:
+- car: subcache-symbol.
+- cdr: The currenty cached value for the subcache in the car.
+
+So apply `assoc' and `cdr' to the result of this function.to get the value of
+a certain subcache.
+
+This function is useful when the values of more than one subcache for a key are
+needed at the same time, i.e. with one cache-lookup."
+  (ecb-multicache-init cache-var)
+  (let ((cache-val (gethash key (symbol-value cache-var))))
+    (when cache-val
+      (if (null subcache-list)
+          cache-val
+        (mapcar (function (lambda (s)
+                            (assoc s cache-val)))
+                subcache-list)))))
+
+(defun ecb-multicache-apply-to-value (cache-var key subcache apply-fcn
+                                                &optional only-if-key-exist)
+  "Apply the function APPLY-FCN to the old SUBCACHE-value of the cached item
+with key KEY. APPLY-FCN is called with the old SUBCACHE-value as argument and
+should return the new value which is then set as new SUBCACHE-value of the
+cached-item. If optional argument ONLY-IF-KEY-EXIST is not nil then nothing
+will be done if no cached item with key KEY exists. Otherwise a new item with
+KEY will be added to the cache and APPLY-FCN will be called with nil.
+CACHE-VAR has to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!
+
+With this function an already cached SUBCACHE-value for KEY can be evaluated
+and then modified with only one cache-lookup because APPLY-FCN gets the
+old-value as argument and has to return the new value which is then set as new
+SUBCACHE-value of the cached item. This is more efficient than a call-sequence
+of `ecb-multicache-get-value' \(to get the old-value) and then
+`ecb-multicache-put-value' to set a new value.
+
+It is recommended that APPLY-FCN doesn't return nil \(unless the SUBCACHE for
+KEY should be cleared within APPLY-FCN) because then this will be set as new
+value and then the returned value of next call to `ecb-multicache-get-value'
+can have an ambiguous semantic - see documentation of
+`ecb-multicache-get-value'. nil should be reserved to indicate that either no
+item with KEY is cached or that no value has been put for SUBCACHE."
+  (let ((subcache-conscell
+         (or (ecb-multicache-get-subcache cache-var key subcache)
+             ;; key is currently not cached
+             (unless only-if-key-exist
+               (ecb-multicache-add-empty-key cache-var key)
+               (ecb-multicache-get-subcache cache-var key subcache)))))
+    (when subcache-conscell
+      (setcdr subcache-conscell
+              (funcall apply-fcn (cdr subcache-conscell))))))
+        
+(defun ecb-multicache-put-value (cache-var key subcache value)
+  "Put VALUE as SUBCACHE-value of the cached item with key KEY. If there is
+already a value for this subcache and key then it will be replaced with VALUE.
+CACHE-VAR has to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!
+
+Return VALUE.
+
+It is recommended not to put nil as value - see
+`ecb-multicache-apply-to-value' for an explanation. If the SUBCACHE for KEY
+should be cleared use `ecb-multicache-clear-value'."
+  (ecb-multicache-apply-to-value cache-var key subcache
+                                 (function (lambda (old-val)
+                                             value))))
+
+(defun ecb-multicache-clear-value (cache-var key subcache)
+  "Put nil as value of the cached item with key KEY under the subcache
+SUBCACHE. This clears in fact the subcache SUBCACHE for a cached item with key
+KEY. CACHE-VAR has to be a symbol for which an assoc cache has been defined
+with `defecb-multicache'!"
+  (ecb-multicache-put-value cache-var key subcache nil))
+
+(defun ecb-multicache-remove (cache-var key)
+  "Remove the cache item with key KEY from the cache of CACHE-VAR. CACHE-VAR
+has to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!"
+  (ecb-multicache-init cache-var)
+  (remhash key (symbol-value cache-var)))
+
+(defun ecb-multicache-mapsubcache (cache-var subcache mapfcn)
+  "Iterate over all item of the cache of CACHE-VAR and call the function
+MAPFCN for each item for the subcache SUBCACHE. MAPFCN is called with two
+arguments, the key and the SUBCACHE-value of the currently processed
+cache-item. The SUBCACHE-value of this cache-item will be set to the
+return-value of MAPFCN. So if MAPFCN is not intended to change the
+SUBCACHE-value it should return the value of its second argument! CACHE-VAR
+has to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!"
+  (ecb-multicache-init cache-var)
+  (maphash (function (lambda (key value)
+                       (let ((cache (assoc subcache value)))
+                         (and cache
+                              (setcdr cache
+                                      (funcall mapfcn
+                                               key (cdr cache)))))))
+           (symbol-value cache-var)))
+
+(defun ecb-multicache-clear-subcache (cache-var subcache)
+  "Put nil as SUBCACHE-value for each cached item. This clears in fact the
+whole SUBCACHE. CACHE-VAR has to be a symbol for which an assoc cache has been
+defined with `defecb-multicache'!"
+  (ecb-multicache-mapsubcache cache-var subcache
+                              (function (lambda (key value)
+                                          nil))))
+
+(defun ecb-multicache-clear (cache-var)
+  "Clears the whole cache of CACHE-VAR, i.e. remove all items. CACHE-VAR has
+to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!"
+  (ecb-multicache-init cache-var)
+  (clrhash (symbol-value cache-var)))
+
+(defun ecb-multicache-print-subcache (cache-var subcache &optional no-nil-value)
+  "Print the contents of SUBCACHE of the cache of CACHE-VAR in another window
+in a special buffer. This is mostly for debugging the cache-contents.
+CACHE-VAR has to be a symbol for which an assoc cache has been defined with
+`defecb-multicache'!
+
+The output has the following form:
+
+Key: <the key of a cached element>
+     Value: <the associated value in the subcache SUBCACHE>
+Key: <the key of a cached element>
+     Value: <the associated value in the subcache SUBCACHE>
+...
+Key: <the key of a cached element>
+     Value: <the associated value in the subcache SUBCACHE>
+
+If NO-NIL-VALUE is not nil then Keys with a SUBCACHE-value nil will be
+excluded from the output."
+  (let ((dump-buffer-name (format "*ecb-multicache - subcache: %s*"
+                                  subcache))
+        (key-str "Key:")
+        (value-str "Value:")
+        ;; Because XEmacs is not able to get a face-attributes-plist as value
+        ;; for the special property 'face we have to create two temporary
+        ;; faces here :-(
+	(key-face (copy-face 'default 'ecb-multicache-print-key-face))
+	(value-str-face (copy-face 'italic
+                                   'ecb-multicache-print-value-str-face)))
+    (set-face-foreground key-face "blue")
+    (set-face-foreground value-str-face "forest green")    
+    (put-text-property 0 (length key-str) 'face 'bold key-str)
+    (put-text-property 0 (length value-str) 'face value-str-face value-str)
+    (save-selected-window
+      (set-buffer (get-buffer-create dump-buffer-name))
+      (erase-buffer)
+      (ecb-multicache-mapsubcache
+       cache-var subcache
+       (function (lambda (key value)
+                   ;; if key is a string we colorize it blue but we must du
+                   ;; this with a copy of key because otherwise we would
+                   ;; colorize the key-object itself which maybe is not what
+                   ;; we want if key is displayed somewhere else (e.g. in a
+                   ;; tree-buffer).
+                   (let ((key-cp (and (stringp key)
+                                      (concat key))))
+                     (and key-cp (put-text-property 0 (length key-cp)
+                                                    'face key-face key-cp))
+                     (unless (and no-nil-value (null value))
+                       (insert (concat key-str " "
+                                       (if key-cp
+                                           key-cp
+                                         (format "%s" key))
+                                       "\n     "
+                                       value-str " "
+                                       (format "%s" value)
+                                       "\n")))
+                     value))))
+      (switch-to-buffer-other-window (get-buffer-create dump-buffer-name))
+      (goto-char (point-min)))))
+  
+
+;;; ----- User-interaction ---------------------------------
+
+(defun ecb-confirm (text)
+  (yes-or-no-p text))
+
+;; stolen from query.el and slightly enhanced
+;; This is for a small number of choices each of them a short string
+(defun ecb-query-string (prompt choices &optional other-prompt)
+  "Prints PROMPT and returns a string which must be one of CHOICES.
+CHOICES is either a list of strings whereas the first choice is the default
+\(which is returned if the user simply types RET) or nil \(then only a simple
+RET quits the query and returns nil). If OTHER-PROMPT is not nil and a string
+then the choice \"other\" is added to CHOICES and after selecting this choice
+the user is prompted with OTHER-PROMPT to insert any arbitrary string."
+  (let* ((new-choices (if other-prompt
+                          ;; Emacs 20.X add-to-list can not append at the end
+                          (append choices (list "other"))
+                        choices))
+         (default (car new-choices))
+         answer)
+    (setq prompt (concat prompt
+                         " ["
+                         (if new-choices
+                             (mapconcat (function (lambda (x) x))
+                                        new-choices ", ")
+                           "RET")
+                         "] "))
+    (setq new-choices (nconc (mapcar (function (lambda (x) (list x t)))
+                                     new-choices)
+                             '('("" t))))
+    (setq answer (completing-read prompt new-choices nil t))
+    (cond ((ecb-string= answer "")
+           (setq answer default))
+          ((ecb-string= answer "other")
+           (setq answer (read-string (concat other-prompt ": ")))))
+    answer))
+
+;; This is for any number of string-choices without any length restriction -
+;; see also `ecb-query-string'.
+(defun ecb-offer-choices (prompt choices)
+  "Prints PROMPT and returns a string which must be one of CHOICES.
+CHOICES is a list of strings whereas the first choice is the default. All
+choices are immediately displayed as if completion does it so a selection can
+be made either with the mouse or with the keyboard."
+  (let* ((minibuffer-setup-hook
+          (append minibuffer-setup-hook
+                  (list (lambda ()
+                          (with-output-to-temp-buffer "*Completions*"
+                            (display-completion-list (all-completions "" minibuffer-completion-table)))))))
+         (completion-list (mapcar (function (lambda (x) (list x t)))
+                                  choices))
+         (answer (completing-read prompt
+                                  completion-list
+                                  nil t
+                                  (try-completion "" completion-list))))
+    (if (ecb-string= answer "")
+        (car choices)
+      answer)))
+
+
+;; ecb-offer-choices-1 and ecb-offer-choices-2 are two other approaches for
+;; ecb-offer-choices - but IMHO not as good and clean as the current one and
+;; therefore not used in ECB
+;; (defun ecb-offer-choices-1 (prompt choices)
+;;   "Prints PROMPT and returns a string which must be one of CHOICES.
+;; CHOICES is a list of strings whereas the first choice is the default. All
+;; choices are immediately displayed as if completion does it so a selection can
+;; be made either with the mouse or with the keyboard."
+;;   (let* ((minibuffer-setup-hook
+;;           (append minibuffer-setup-hook
+;;                   '(minibuffer-complete
+;;                     minibuffer-complete
+;;                     minibuffer-complete)))
+;;          (answer (completing-read
+;;                   prompt
+;;                   (mapcar (function (lambda (x) (list x t)))
+;;                           choices)
+;;                   nil t)))
+;;     (if (ecb-string= answer "")
+;;         (car choices)
+;;       answer)))
+
+;; (defun ecb-offer-choices-2 (prompt choices)
+;;   "Prints PROMPT and returns a string which must be one of CHOICES.
+;; CHOICES is a list of strings whereas the first choice is the default. All
+;; choices are immediately displayed as if completion does it so a selection can
+;; be made either with the mouse or with the keyboard."
+;;   ;; First we create a TAB-event
+;;   (let ((event (if ecb-running-xemacs
+;;                    (make-event 'key-press '(key tab))
+;;                  9)))
+;;     ;; With these 3 TAB-events we ensure that
+;;     ;; 1. The longest possible common substring is display in the minibuffer
+;;     ;; 2. All possible completions are displayed
+;;     (dotimes (i 3)
+;;       (setq unread-command-events (cons event unread-command-events))))
+;;   (let ((answer (completing-read
+;;                  prompt
+;;                  (mapcar (function (lambda (x) (list x t)))
+;;                          choices)
+;;                  nil t)))
+;;     (if (ecb-string= answer "")
+;;         (car choices)
+;;       answer)))
+
+(defun ecb-read-number (prompt &optional init-value)
+  "Ask in the minibuffer for a number with prompt-string PROMPT. Optional
+INIT-VALUE can be either a number or a string-representation of a number."
+  (let ((init (typecase init-value
+                (number (number-to-string init-value))
+                (string
+                 (if (ecb-string= init-value "0")
+                     init-value
+                   (if (not (= 0 (string-to-number init-value)))
+                       init-value
+                     (ecb-error "ecb-read-number: init-value not a valid number!"))))
+                (otherwise nil)))
+        result)
+    (while (progn
+             (setq result (read-string prompt init))
+             (not (or (ecb-string= "0" result)
+                      (not (= 0 (string-to-number result)))))))
+    (string-to-number result)))
+
+(defun ecb-message-box (message-str &optional title-text button-text)
+  "Display a message-box with message MESSAGE-STR and title TITLE-TEXT if
+TITLE-TEXT is not nil - otherwise \"Message-box\" is used as title. The title
+gets always the prefix \"ECB - \". Second optional argument BUTTON-TEXT
+specifies the text of the message-box button; if nil then \"OK\" is used.
+
+Remark: BUTTON-TEXT is currently only used with XEmacs. With GNU Emacs the
+message itself is the button because GNU Emacs currently does not support
+dialog-boxes very well.
+
+If `window-system' is nil then a simple message is displayed in the echo-area."
+  (let ((button (if (stringp button-text)
+                    button-text
+                  "OK"))
+        (title (concat "ECB"
+                       (if (stringp title-text)
+                           (concat " - " title-text)
+                         " Message"))))
+    (if window-system
+        (progn
+          (if ecb-running-xemacs
+              (make-dialog-box 'question
+                               :title title
+                               :modal t
+                               :question message-str
+                               :buttons (list (vector button '(identity nil) t)))
+            (x-popup-dialog t (list title (cons message-str t))))
+          t)
+      (message (concat title " " message-str)))))
+
+;; some first approaches to display informations in a temp-window
+
+;; (defvar ecb-window-config-before-msg-display nil)
+
+;; (defun ecb-display-temp-message-1 (msg-title msg-content)
+;;   (require 'wid-edit)
+;;   (setq ecb-window-config-before-msg-display
+;;         (ecb-current-window-configuration))
+;;   (with-current-buffer (get-buffer-create msg-title)
+;;     (switch-to-buffer-other-window (current-buffer))
+;;     (kill-all-local-variables)
+;;     (let ((inhibit-read-only t))
+;;       (erase-buffer))
+;;     (widget-insert msg-content)
+;;     (widget-insert "\n\n")
+;;     ;; Insert the Save button
+;;     (widget-create 'push-button
+;;                    :button-keymap ecb-upgrade-button-keymap ; XEmacs
+;;                    :keymap ecb-upgrade-button-keymap ; Emacs
+;;                    :notify (lambda (&rest ignore)
+;;                              (when ecb-window-config-before-msg-display
+;;                                (ignore-errors
+;;                                  (ecb-set-window-configuration
+;;                                   ecb-window-config-before-msg-display))
+;;                                (setq ecb-window-config-before-msg-display nil)))
+;;                    "OK")
+;;     (widget-setup)
+;;     (goto-char (point-min))))
+
+
+;; (defun ecb-display-temp-message-2 (msg-title msg-content)
+;;   (require 'wid-edit)
+;;   (setq ecb-window-config-before-msg-display
+;;         (ecb-current-window-configuration))
+;;   (with-output-to-temp-buffer msg-title
+;;     (widget-insert msg-content)
+;;     (widget-insert "\n\n")
+;;     ;; Insert the Save button
+;;     (widget-create 'push-button
+;;                    :button-keymap ecb-upgrade-button-keymap ; XEmacs
+;;                    :keymap ecb-upgrade-button-keymap ; Emacs
+;;                    :notify (lambda (&rest ignore)
+;;                              (when ecb-window-config-before-msg-display
+;;                                (ignore-errors
+;;                                  (ecb-set-window-configuration
+;;                                   ecb-window-config-before-msg-display))
+;;                                (setq ecb-window-config-before-msg-display nil)))
+;;                    "OK")
+;;     (widget-setup)
+;;     (goto-char (point-min))))
+
+;; (defvar ecb-user-information-msg-buffer nil)
+
+;; (defun ecb-display-temp-message (msg-content)
+;;   (require 'wid-edit)
+;;   (progn
+;;     (setq ecb-user-information-msg-buffer
+;;           (get-buffer-create "*ECB User-Information*"))
+;;     (cond
+;;      ((not (get-buffer-window ecb-user-information-msg-buffer))
+;;       (let ((split-window-keep-point nil)
+;;             (window-min-height 2))
+;;         ;; maybe leave two lines for our window because of the normal
+;;         ;; `raised' modeline in Emacs 21
+;;         ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: adjust this for Xemacs!
+;;         (select-window
+;;          (split-window-vertically
+;;           (if (and (fboundp 'face-attr-construct)
+;;                    (plist-get (face-attr-construct 'modeline) :box))
+;;               -3 -2)))
+;;         (switch-to-buffer ecb-user-information-msg-buffer)))
+;;      ((not (eq (current-buffer) ecb-user-information-msg-buffer))
+;;       (select-window (get-buffer-window ecb-user-information-msg-buffer))))
+;;     ;; insert now the msg-content
+;;     (let ((inhibit-read-only t))
+;;       (erase-buffer))
+;;     (widget-insert msg-content)
+;;     (widget-insert "\n\n")
+;;     ;; Insert the Save button
+;;     (widget-create 'push-button
+;;                    :button-keymap ecb-upgrade-button-keymap ; XEmacs
+;;                    :keymap ecb-upgrade-button-keymap ; Emacs
+;;                    :notify (lambda (&rest ignore)
+;;                              (set-buffer ecb-user-information-msg-buffer)
+;;                              (condition-case nil
+;;                                  (while (get-buffer-window ecb-user-information-msg-buffer)
+;;                                    (delete-window (get-buffer-window ecb-user-information-msg-buffer)))
+;;                                (error nil))
+;;                              (kill-buffer ecb-user-information-msg-buffer)
+;;                              (setq ecb-user-information-msg-buffer nil))
+                             
+;;                    "OK")
+;;     (widget-setup)
+;;     ;; (setq buffer-read-only t)
+;;     (message "Click [OK] or hit q for restoring previous window-layout.")))
+
+;; ----- Information-display - errors, warnings, infos ----
+
+(defun ecb-nolog-message (&rest args)
+  "Works exactly like `message' but does not log the message"
+  (let ((msg (cond ((or (null args)
+                        (null (car args)))
+                    nil)
+                   ((null (cdr args))
+                    (car args))
+                   (t
+                    (apply 'format args)))))
+    ;; Now message is either nil or the formated string.
+    (if ecb-running-xemacs
+        ;; XEmacs way of preventing log messages.
+        (if msg
+            (display-message 'no-log msg)
+          (clear-message 'no-log))
+      ;; Emacs way of preventing log messages.
+      (let ((message-log-max nil)
+            (message-truncate-lines nil))
+        (if msg
+            (message "%s" msg)
+          (message nil))))
+    msg))
+
+(defun ecb-error (&rest args)
+  "Signals an error but prevents it from entering the debugger. This is
+useful if an error-message should be signaled to the user and evaluating
+should stopped but no debugging is senseful."
+  (let ((debug-on-error nil))
+    (error (concat "ECB " ecb-version " - Error: "
+                   (apply 'format args)))))
+
+(defun ecb-warning (&rest args)
+  "Displays a warning."
+  (message (concat "ECB " ecb-version " - Warning: " (apply 'format args))))
+
+(defun ecb-info-message (&rest args)
+  "Displays an information."
+  (message (concat "ECB " ecb-version " - Info: " (apply 'format args))))
+
+;;; ----- Text and string-stuff ----------------------------
+
+(defun ecb-merge-face-into-text (text face)
+  "Merge FACE to the already precolored TEXT so the values of all
+face-attributes of FACE take effect and but the values of all face-attributes
+of TEXT which are not set by FACE are preserved."
+  (if (null face)
+      text
+    (if ecb-running-xemacs
+        (put-text-property 0 (length text) 'face
+                           (let* ((current-face (get-text-property 0
+                                                                   'face
+                                                                   text))
+                                  (cf
+                                   (typecase current-face
+                                     (ecb-face (list current-face))
+                                     (list current-face)
+                                     (otherwise nil)))
+                                  (nf
+                                   (typecase face
+                                     (ecb-face (list face))
+                                     (list face)
+                                     (otherwise nil))))
+                             ;; we must add the new-face in front of
+                             ;; current-face to get the right merge!
+                             (if (member face cf)
+                                 cf
+                               (append nf cf)
+                               )
+                             )
+                           text)
+      (alter-text-property 0 (length text) 'face
+                           (lambda (current-face)
+                             (let ((cf
+                                    (typecase current-face
+                                      (ecb-face (list current-face))
+                                      (list current-face)
+                                      (otherwise nil)))
+                                   (nf
+                                    (typecase face
+                                      (ecb-face (list face))
+                                      (list face)
+                                      (otherwise nil))))
+                               ;; we must add the new-face in front of
+                               ;; current-face to get the right merge!
+                               (if (member face cf)
+                                   cf
+                                 (append nf cf))))
+                           text))
+    text))
+
+(if (fboundp 'compare-strings)
+    (defalias 'ecb-compare-strings 'compare-strings)
+  (defun ecb-compare-strings (str1 start1 end1 str2 start2 end2 &optional ignore-case)
+    "Compare the contents of two strings.
+In string STR1, skip the first START1 characters and stop at END1.
+In string STR2, skip the first START2 characters and stop at END2.
+END1 and END2 default to the full lengths of the respective strings.
+
+Case is significant in this comparison if IGNORE-CASE is nil.
+
+The value is t if the strings (or specified portions) match.
+If string STR1 is less, the value is a negative number N;
+  - 1 - N is the number of characters that match at the beginning.
+If string STR1 is greater, the value is a positive number N;
+  N - 1 is the number of characters that match at the beginning."
+    (or start1 (setq start1 0))
+    (or start2 (setq start2 0))
+    (setq end1 (if end1
+                   (min end1 (length str1))
+                 (length str1)))
+    (setq end2 (if end2
+                   (min end2 (length str2))
+                 (length str2)))
+    (let ((i1 start1)
+          (i2 start2)
+          result c1 c2)
+      (while (and (not result) (< i1 end1) (< i2 end2))
+        (setq c1 (aref str1 i1)
+              c2 (aref str2 i2)
+              i1 (1+ i1)
+              i2 (1+ i2))
+        (if ignore-case
+            (setq c1 (upcase c1)
+                  c2 (upcase c2)))
+        (setq result (cond ((< c1 c2) (- i1))
+                           ((> c1 c2) i1))))
+      (or result
+          (cond ((< i1 end1) (1+ (- i1 start1)))
+                ((< i2 end2) (1- (- start1 i1)))
+                (t)))
+      )))
+
+(defsubst ecb-string= (str1 str2 &optional ignore-case)
+  (let ((s1 (or (and (stringp str1) str1) (symbol-name str1)))
+        (s2 (or (and (stringp str2) str2) (symbol-name str2))))
+    (eq (ecb-compare-strings s1 nil nil s2 nil nil ignore-case) t)))
+
+(defsubst ecb-string< (str1 str2 &optional ignore-case)
+  (let ((s1 (or (and (stringp str1) str1) (symbol-name str1)))
+        (s2 (or (and (stringp str2) str2) (symbol-name str2)))
+        (result nil))
+    (setq result (ecb-compare-strings s1 nil nil s2 nil nil ignore-case))
+    (and (numberp result) (< result 0))))
+
+(defun ecb-excessive-trim (str)
+  "Return a string where all double-and-more whitespaces in STR are replaced
+with a single space-character."
+  (let ((s str))
+    (save-match-data
+      (while (string-match "[ \t][ \t]+" s)
+        (setq s (concat (substring s 0 (match-beginning 0))
+                        " "
+                        (substring s (match-end 0))))))
+    s))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: we have to take account that GNU Emacs
+;; > 21.3 has changed its split-string function! For the new split-string is
+;; (cdr (split-string ...)) not nil (at least in our context below), for GNU
+;; Emacs <= 21.3 nil!
+(defun ecb-left-trim (str)
+  "Return a string stripped of all leading whitespaces of STR."
+  (let ((split-result (split-string str "^[\n\t ]*")))
+    (or (or (and (cdr split-result) ;; GNU Emacs > 21.3
+                 (car (cdr split-result)))
+            (car split-result))
+        "")))
+
+(defun ecb-right-trim (str)
+  "Return a string stripped of all trailing whitespaces of STR."
+  (or (car (split-string str "[\n\t ]*$")) ""))
+
+(defun ecb-trim (str)
+  "Applies `ecb-right-trim' and `ecb-left-trim' to STR."
+  (ecb-left-trim (ecb-right-trim str)))
+
+(defun ecb-full-trim (str)
+  "Applies `ecb-trim' and `ecb-middle-trim' to STR."
+  (ecb-excessive-trim (ecb-trim str)))
+
+(defun ecb-fit-str-to-width (str width from)
+  "If STR is longer than WIDTH then fit it to WIDTH by stripping from left or
+right \(depends on FROM which can be 'left or 'right) and prepend \(rsp.
+append) \"...\" to signalize that the string is stripped. If WIDTH >= length
+of STR the always STR is returned. If either WIDTH or length of STR is < 5
+then an empty string is returned because stripping makes no sense here."
+  (let ((len-str (length str)))
+    (if (>= width len-str)
+        str
+      (if (or (< len-str 5) ;; we want at least two characters visible of str
+              (< width 5))
+          ""
+        (if (equal from 'left)
+            (concat "..." (substring str (* -1 (- width 3))))
+          (concat (substring str 0 (- width 3)) "..."))))))
+
+;;; ----- Number-stuff -------------------------------------
+
+(defun ecb-normalize-number (value &optional ref-value)
+  "Normalize VALUE in the following manner and return:
+* VALUE > -1.0 and < +1.0 and REF-VALUE a number: `floor' of VALUE * REF-VALUE
+* all other cases: `floor' of VALUE"
+  (floor (if (and (< value 1.0)
+                  (> value -1.0)
+                  (numberp ref-value))
+             (* ref-value value)
+           value)))
+
+
+;;; ----- Working-display ----------------------------------
+
+;; code for a working display - complete stolen from the semantic-package.
+;; ECB has thrown away all code which is not needed by ECB
+;; The original code is written by Eric M. Ludlam <zappo@gnu.org>
+
+
+;; Variables used in stages
+(defvar ecb-working-message nil
+  "Message stored when in a status loop.")
+(defvar ecb-working-donestring nil
+  "Done string stored when in a status loop.")
+(defvar ecb-working-ref1 nil
+  "A reference number used in a status loop.")
+(defvar ecb-working-last-percent 0
+  "A reference number used in a status loop.")
+
+(defun ecb-working-frame-animation-display (length number frames)
+  "Manage a simple frame-based animation for working functions.
+LENGTH is the number of characters left.  NUMBER is a passed in
+number (which happens to be ignored.).  While coders pass t into
+NUMBER, functions using this should convert NUMBER into a vector
+describing how to render the done message.
+Argument FRAMES are the frames used in the animation."
+  (typecase number
+    (vector
+     (let ((zone (- (length (aref frames 0)) (length (aref number 0))
+                    (length (aref number 1)))))
+       (if (< (length ecb-working-donestring) zone)
+           (concat " " (aref number 0)
+                   (make-string
+                    (ceiling (/ (- (float zone)
+                                   (length ecb-working-donestring)) 2)) ? )
+                   ecb-working-donestring
+                   (make-string
+                    (floor (/ (- (float zone)
+                                 (length ecb-working-donestring)) 2)) ? )
+                   (aref number 1))
+         (concat " " (aref frames (% ecb-working-ref1 (length frames)))
+                 " " ecb-working-donestring))))
+    (otherwise
+     (concat " " (aref frames (% ecb-working-ref1 (length frames)))))))
+
+(defvar ecb-working-celeron-strings
+  [ "[O     ]" "[oO    ]" "[-oO   ]" "[ -oO  ]" "[  -oO ]" "[   -oO]"
+    "[    -O]" "[     O]" "[    Oo]" "[   Oo-]"  "[  Oo- ]" "[ Oo-  ]"
+    "[Oo-   ]" "[O-    ]"]
+  "Strings representing a silly celeron.")
+
+(defun ecb-working-celeron-display (length number)
+  "Return a string displaying a celeron as things happen.
+LENGTH is the amount of display that has been used.  NUMBER
+is t to display the done string, or the number to display."
+  (case number
+    ((t)
+     (ecb-working-frame-animation-display length [ "[" "]" ]
+					  ecb-working-celeron-strings))
+    ;; All the % signs because it then gets passed to message.
+    (otherwise
+     (ecb-working-frame-animation-display length number
+                                          ecb-working-celeron-strings))))
+
+
+
+(defun ecb-working-dynamic-status (&optional number)
+  "show the status. If NUMBER is nil, then increment a local NUMBER from 0
+with each call. If it is a number or float, use it as the raw percentile."
+  (let* ((n (or number ecb-working-ref1))
+         (m1 (funcall 'format ecb-working-message))
+         (m2 (ecb-working-celeron-display (length m1) n)))
+    (ecb-nolog-message "%s%s" m1 m2)
+    (setq ecb-working-ref1 (1+ ecb-working-ref1))))
+
+(defmacro ecb-working-status-timeout (timeout message donestr &rest forms)
+  "Contain a block of code during which working status is shown.
+The code may call `sit-for' or `accept-process-output', so a timer
+is needed to update the message.
+TIMEOUT is the length of time to wait between message updates.
+MESSAGE is the message string to use and DONESTR is the completed text
+to use when the functions `ecb-working-status' is called from FORMS."
+  (let ((current-message (make-symbol "ecb-working-current-message")))
+    `(let* ((,current-message (current-message))
+            (ecb-working-message ,message)
+            (ecb-working-donestring ,donestr)
+            (ecb-working-ref1 0)
+            (time ,timeout)
+            (ecb-working-timer
+             (ecb-run-with-timer time time 'ecb-working-dynamic-status)))
+       (unwind-protect
+           (progn ,@forms)
+         (ecb-cancel-timer ecb-working-timer)
+         (ecb-working-dynamic-status t)
+         (message ,current-message)))))
+
+
+(defun ecb-working-status-call-process
+  (timeout message donestr program &optional infile buffer display &rest args)
+  "Display working messages while running a process.
+TIMEOUT is how fast to display the messages.
+MESSAGE is the message to show, and DONESTR is the string to add when done.
+CALLPROCESSARGS are the same style of args as passed to `call-process'.
+The are: PROGRAM, INFILE, BUFFER, DISPLAY, and ARGS.
+Since it actually calls `start-process', not all features will work.
+It returns the exit-status of the called PROGRAM."
+  (ecb-working-status-timeout timeout message donestr
+    (let* ((process-environment (cons "LC_ALL=C" process-environment))
+           (proc (apply 'start-process "ecb-working"
+                        (if (listp buffer) (car buffer) buffer)
+                        program args)))
+      (set-process-sentinel proc 'list)
+      (while (eq (process-status proc) 'run)
+	(accept-process-output proc)
+	;; accept-process-output caused my Solaris Emacs 20.3 to crash.
+	;; If this is unreliable for you, use the below which will work
+	;; in that situation.
+	;; (if (not (sit-for timeout)) (read-event))
+	)
+      (process-exit-status proc))))
+
+;;; ----- Buffers and files --------------------------------
+
+(defsubst ecb-current-line ()
+  "Return the current line-number - the first line in a buffer has number 1."
+  (+ (count-lines 1 (point)) (if (= (current-column) 0) 1 0)))
+
+(defun ecb-goto-line (line)
+  "Goto LINE, counting from line 1 at beginning of buffer.
+
+This function doesn't set the mark."
+  ;; Move to the specified line number in that buffer.
+  (save-restriction
+    (widen)
+    (goto-char 1)
+    (if (eq selective-display t)
+        (re-search-forward "[\n\C-m]" nil 'end (1- line))
+      (forward-line (1- line)))))
+
+(defmacro ecb-with-readonly-buffer (buffer &rest body)
+  "Make buffer BUFFER current but do not display it. Evaluate BODY in buffer
+BUFFER \(not read-only an evaluation-time of BODY) and make afterwards BUFFER
+read-only. Note: All this is done with `save-excursion' so after BODY that
+buffer is current which was it before calling this macro."
+  `(if (buffer-live-p ,buffer)
+       (save-excursion
+         (set-buffer ,buffer)
+         (unwind-protect
+             (progn
+               (setq buffer-read-only nil)
+               ,@body)
+           (setq buffer-read-only t)))
+     (ecb-error "Try to set a not existing buffer.")))
+
+(put 'ecb-with-readonly-buffer 'lisp-indent-function 1)
+
+(defmacro ecb-do-if-buffer-visible-in-ecb-frame (buffer-name-symbol &rest body)
+  "Evaluate BODY if a buffer is visible in the ECB-frame.
+
+This means in fact if the following conditions are all true:
+- The symbol BUFFER-NAME-SYMBOL is bound
+- The value of BUFFER-NAME-SYMBOL is a name of a living buffer B
+- The buffer B is visible and displayed in a window of the `ecb-frame'
+- ECB is active
+- The current frame is the `ecb-frame'
+- The window of buffer B is not a window in the edit-area.
+If one of these conditions is false then nothing will be done.
+
+During the evaluation of BODY the following local variables are bound:
+- visible-buffer: The buffer-object which name is the value of
+  BUFFER-NAME-SYMBOL.
+- visible-window: The window which displays visible-buffer"
+  `(let* ((visible-buffer (if (and (boundp ,buffer-name-symbol)
+                                   (stringp (symbol-value ,buffer-name-symbol)))
+                              (get-buffer (symbol-value ,buffer-name-symbol))))
+          (visible-window (if (bufferp visible-buffer)
+                              (get-buffer-window visible-buffer))))
+     (when (and ecb-minor-mode
+                (equal (selected-frame) ecb-frame)
+                visible-window
+                (window-live-p visible-window)
+                (not (member visible-window (ecb-canonical-edit-windows-list))))
+       ,@body)))
+(put 'ecb-do-if-buffer-visible-in-ecb-frame 'lisp-indent-function 1)
+
+(defun ecb-buffer-substring (minpoint maxpoint &optional buffer)
+  "Return the contents of part of BUFFER as a string.
+If BUFFER is nil then the current-buffer is used. BUFFER can be a buffer-name
+or a buffer-object."
+  (with-current-buffer (or buffer (current-buffer))
+    (buffer-substring minpoint maxpoint)))
+
+(defun ecb-delete-file (file)
+  "Delete FILE if it eexists."
+  (let ((exp-file (expand-file-name file)))
+    (if (file-exists-p exp-file)
+        (delete-file exp-file))))
+
+(defun ecb-buffer-name (buffer-or-name)
+  "Return the buffer-name of BUFFER-OR-NAME."
+  (typecase buffer-or-name
+    (string buffer-or-name)
+    (buffer (buffer-name buffer-or-name))
+    (otherwise nil)))
+
+(defun ecb-buffer-obj (buffer-or-name)
+  "Return the buffer-object of BUFFER-OR-NAME."
+  (typecase buffer-or-name
+    (string (get-buffer buffer-or-name))
+    (buffer buffer-or-name)
+    (otherwise nil)))
+
+(defun ecb-buffer-local-value (sym buffer)
+  "Get the buffer-local value of variable SYM in BUFFER. If there is no
+buffer-local value in BUFFER then the global value of SYM is used."
+  (if (fboundp 'buffer-local-value)
+      (buffer-local-value sym buffer)
+    (when ecb-running-xemacs
+      (symbol-value-in-buffer sym buffer))))
+;;     (or (cdr (assoc sym (buffer-local-variables buffer)))
+;;         (save-excursion
+;;           (set-buffer buffer)
+;;           (symbol-value sym)))))
+
+
+(defun ecb-file-content-as-string (file)
+  "If FILE exists and is readable returns the contents as a string otherwise
+return nil.
+Note: No major/minor-mode is activated and no local variables are evaluated
+for FILE, but proper EOL-conversion and character interpretation is done!"
+  (let ((exp-filename (expand-file-name file)))
+    (if (and (file-exists-p exp-filename)
+             (file-readable-p exp-filename))
+        (with-temp-buffer
+          (insert-file-contents exp-filename)
+          (buffer-string)))))
+
+(defun ecb-current-buffer-archive-extract-p ()
+  "Return not nil if current buffer was extracted of an archive which is in
+`tar-mode' or `archive-mode'. For this the current buffer has either to be in
+minor-mode `tar-subfile-mode' or `archive-subfile-mode'."
+  (or (and (boundp 'tar-subfile-mode)
+           tar-subfile-mode)
+      (and (boundp 'archive-subfile-mode)
+           archive-subfile-mode)))
+
+(defun ecb-buffer-file-name (&optional buffer no-indirect-buffers)
+  "Return filename of file represented by BUFFER.
+BUFFER can also be an indirect buffer - if its base buffer points to a file
+then this filename is returned.
+BUFFER can be a buffer-object or a buffer-name.
+If BUFFER is nil then current buffer is used.
+If NO-INDIRECT-BUFFERS is not nil then for indirect buffers always nil is
+returned."
+  (or (buffer-file-name buffer)
+      (and (not no-indirect-buffers)
+           (buffer-base-buffer buffer)
+           (buffer-file-name (buffer-base-buffer buffer)))))
+
+
+(defun ecb-buffer-or-file-readable-p (&optional filename)
+  "Checks if a buffer or a file is a readable file in the sense of ECB which
+means either a real physical file or an auto-extracted file from an archive.
+See `ecb-current-buffer-archive-extract-p'. FILENAME is either a filename or
+nil whereas in the latter case the current-buffer is assumed."
+  (let* ((file (or filename (ecb-buffer-file-name (current-buffer)))))
+    (or (and file (file-readable-p file))
+        (and (not ecb-running-xemacs)
+             (if filename
+                 (save-excursion
+                   (set-buffer (find-file-noselect filename))
+                   (ecb-current-buffer-archive-extract-p))
+               (ecb-current-buffer-archive-extract-p))))))
+
+
+;;; ----- Windows ------------------------------------------
+
+;; Emacs 20 has no window-list function and the XEmacs and Emacs 21 one has no
+;; specified ordering. The following one is stolen from XEmacs and has fixed
+;; this lack of a well defined order. We preserve also point of current
+;; buffer! IMPORTANT: When the window-ordering is important then currently
+;; these function should only be used with WINDOW = (frame-first-window
+;; ecb-frame)!
+(defun ecb-window-list (&optional frame minibuf window)
+  "Return a list of windows on FRAME, beginning with WINDOW. The
+windows-objects in the result-list are in the same canonical windows-ordering
+of `next-window'. If omitted, WINDOW defaults to the selected window. FRAME and
+WINDOW default to the selected ones. Optional second arg MINIBUF t means count
+the minibuffer window even if not active. If MINIBUF is neither t nor nil it
+means not to count the minibuffer even if it is active."
+  ;; At least under XEmacs 21.5 there's a problem with the advice on
+  ;; current-window-configuration -- that advice calls
+  ;; ecb-window-configuration-data, which in turn involves ecb-windows-list,
+  ;; which uses save-windows-excursion, which in 21.5-b28 is. . . a macro
+  ;; which uses current-window-configuration!
+  ;; To avoid this we run the body of this function with deactivated basic
+  ;; advices of ecb.
+   (if (not ecb-running-xemacs)
+       ;; Klaus Berndl <klaus.berndl@sdm.de>: There seems to be mysterious
+       ;; behavior when running our own window-list version with GNU Emacs >=
+       ;; 21.3 - especially when running an igrep when the igrep-buffer is
+       ;; already in another window. We can here savely use the function
+       ;; `window-list' because it returns an ordered list
+       (window-list frame minibuf window)
+     ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: the following is needed for
+     ;; XEmacs - but the best would be if we would not need
+     ;; implementing window-list, means the best would be if window-list
+     ;; returns an ordered list!
+     (ecb-with-original-basic-functions
+      (setq window (or window (selected-window))
+            frame (or frame (selected-frame)))
+      (if (not (eq (window-frame window) frame))
+          (error "Window must be on frame."))
+      (let ((current-frame (selected-frame))
+            (current-window (selected-window))
+            (current-point (point))
+            list)
+        (unwind-protect
+            (progn ;;save-window-excursion
+              (select-frame frame)
+              ;; this is needed for correct start-point
+              (select-window window)
+              (walk-windows
+               (function (lambda (cur-window)
+                           (if (not (eq window cur-window))
+                               (setq list (cons cur-window list)))))
+               minibuf
+               'selected)
+              ;; This is needed to get the right canonical windows-order, i.e. the
+              ;; same order of windows than `walk-windows' walks through!
+              (setq list (nreverse list))
+              (setq list (cons window list)))
+          (select-frame current-frame)
+          (select-window current-window)
+          ;; we must reset the point of the buffer which was current at call-time
+          ;; of this function
+          (goto-char current-point))))))
+
+(defun ecb-canonical-windows-list ()
+  "Return a list of all current visible windows in the `ecb-frame' \(starting
+from the left-most top-most window) in the order `next-window' would walk
+through these windows."
+  (ecb-window-list ecb-frame 0 (frame-first-window ecb-frame)))
+
+(defun ecb-enlarge-window (window &optional val)
+  "Enlarge the given window.
+If VAL is nil then WINDOW is enlarged so that it is 1/2 of the current frame.
+If VAL is a positive integer then WINDOW is enlarged so that its new height is
+VAL lines. If VAL is > 0 and < 1 then WINDOW is enlarged so that its new
+height is that fraction of the frame."
+  (if (and window (window-live-p window))
+      (let* ((norm-val (if val
+                           (ecb-normalize-number val (1- (frame-height)))
+                         (/ (1- (frame-height)) 2)))
+             (enlargement (- norm-val (ecb-window-full-height window))))
+        (save-selected-window
+          (select-window window)          
+          (if (> enlargement 0)
+              (enlarge-window enlargement))))
+    (error "Window is not alive!")))
+
+(defun ecb-window-safely-shrinkable-p (&optional window)
+  "Non-nil if the WINDOW can be shrunk without shrinking other windows.
+If WINDOW is nil or omitted, it defaults to the currently selected window."
+  (with-selected-window (or window (selected-window))
+    (let ((edges (ecb-window-edges)))
+      (or (= (nth 2 edges) (nth 2 (ecb-window-edges (previous-window))))
+	  (= (nth 0 edges) (nth 0 (ecb-window-edges (next-window))))))))
+
+(defun ecb-fit-window-to-buffer (&optional window max-height min-height)
+  "Make WINDOW the right height to display its contents exactly.
+If WINDOW is omitted or nil, it defaults to the selected window.
+If the optional argument MAX-HEIGHT is supplied, it is the maximum height
+  the window is allowed to be, defaulting to the frame height.
+If the optional argument MIN-HEIGHT is supplied, it is the minimum
+  height the window is allowed to be, defaulting to `window-min-height'.
+
+MAX-HEIGHT and MIN-HEIGHT can be also afraction between 0 and 1: then this is
+interpreted as that fraction of the frame-height of WINDOW \(or the selected
+window if WINDOW is nil).
+
+The heights in MAX-HEIGHT and MIN-HEIGHT include the mode-line and/or
+header-line."
+  (interactive)
+
+  (when (null window)
+    (setq window (selected-window)))
+  (when (null max-height)
+    (setq max-height (frame-height (window-frame window))))
+
+  (let* ((buf
+	  ;; Buffer that is displayed in WINDOW
+	  (window-buffer window))
+	 (window-height
+	  ;; The current height of WINDOW
+	  (ecb-window-full-height window)) ;; KB: was window-height
+         (max-height-norm (ecb-normalize-number max-height
+                                                (frame-height (window-frame window))))
+         (min-height-norm (and min-height
+                               (ecb-normalize-number min-height
+                                                     (frame-height (window-frame window)))))
+	 (desired-height
+	  ;; The height necessary to show the buffer displayed by WINDOW
+	  ;; (`count-screen-lines' always works on the current buffer).
+	  (with-current-buffer buf
+	    (+ (ecb-count-screen-lines)
+	       ;; If the buffer is empty, (count-screen-lines) is
+	       ;; zero.  But, even in that case, we need one text line
+	       ;; for cursor.
+	       (if (= (point-min) (point-max))
+		   1 0)
+	       ;; For non-minibuffers, count the mode-line, if any
+	       (if (and (not (window-minibuffer-p window))
+			mode-line-format)
+		   1 0)
+	       ;; Count the header-line, if any
+               (if ecb-running-xemacs
+                   0
+                 (if header-line-format 1 0)))))
+	 (delta
+	  ;; Calculate how much the window height has to change to show
+	  ;; desired-height lines, constrained by MIN-HEIGHT and MAX-HEIGHT.
+	  (- (max (min desired-height max-height-norm)
+		  (or min-height-norm window-min-height))
+	     window-height))
+	 ;; We do our own height checking, so avoid any restrictions due to
+	 ;; window-min-height.
+	 (window-min-height 1))
+
+    ;; Don't try to redisplay with the cursor at the end
+    ;; on its own line--that would force a scroll and spoil things.
+    (when (with-current-buffer buf
+	    (and (ecb-eobp) (ecb-bolp) (not (ecb-bobp))))
+      (set-window-point window (1- (window-point window))))
+
+    (save-selected-window
+      (select-window window)
+
+      ;; Adjust WINDOW to the nominally correct size (which may actually
+      ;; be slightly off because of variable height text, etc).
+      (unless (zerop delta)
+	(enlarge-window delta))
+
+      ;; Check if the last line is surely fully visible.  If not,
+      ;; enlarge the window.
+      (let ((end (with-current-buffer buf
+		   (save-excursion
+		     (goto-char (point-max))
+		     (when (and (ecb-bolp) (not (ecb-bobp)))
+		       ;; Don't include final newline
+		       (backward-char 1))
+		     (when truncate-lines
+		       ;; If line-wrapping is turned off, test the
+		       ;; beginning of the last line for visibility
+		       ;; instead of the end, as the end of the line
+		       ;; could be invisible by virtue of extending past
+		       ;; the edge of the window.
+		       (forward-line 0))
+		     (point)))))
+        (unless ecb-running-xemacs
+          (set-window-vscroll window 0))
+	(while (and (< desired-height max-height-norm)
+		    (= desired-height (window-height window))
+		    (not (pos-visible-in-window-p end window)))
+	  (enlarge-window 1)
+	  (setq desired-height (1+ desired-height)))))))
+
+(defun ecb-test-fit-window-to-buffer ()
+  (interactive)
+  (ecb-fit-window-to-buffer
+   (selected-window)
+   (if (functionp temp-buffer-max-height)
+       (funcall temp-buffer-max-height (current-buffer))
+     temp-buffer-max-height)))
+
+(defun ecb-scroll-window (point window-start)
+  "Scrolls window of current buffer. The window will start at WINDOW-START and
+point will stay on POINT."
+  (goto-char point)
+  (set-window-start (get-buffer-window (current-buffer)) window-start))
+
+(defun ecb-window-select (buffer-or-name)
+  "Select that window which displays in the `ecb-frame' the buffer
+BUFFER-OR-NAME which can be either a buffer-object or a buffer-name. Return
+the window-object. If that buffer is not displayed in the `ecb-frame' then
+nothing happens and nil is returned."
+  (let ((window (get-buffer-window buffer-or-name ecb-frame)))
+    (if window
+	(select-window window)
+      nil)))
+
+(defmacro ecb-exec-in-window (buffer-or-name &rest body)
+  "Evaluates BODY in that window which displays the buffer BUFFER-OR-NAME
+which can be either a buffer-object or a buffer-name. If that window is not
+visible then BODY is not evaluated and the symbol 'window-not-visible is
+returned. Otherwise the return value of BODY is returned. Runs encapsulated in
+`save-selected-window' and `save-excursion'."
+  `(save-selected-window
+     (if (not (ecb-window-select ,buffer-or-name))
+         'window-not-visible
+       (save-excursion
+         (set-buffer ,buffer-or-name)
+         ,@body))))
+
+(put 'ecb-exec-in-window 'lisp-indent-function 1)
+
+(defun ecb-make-windows-not-dedicated (&optional frame)
+  "Make all windows of FRAME not dedicated."
+  (mapc (function (lambda (w)
+                    (set-window-dedicated-p w nil)))
+        (ecb-window-list (or frame (selected-frame)))))
+
+(defun ecb-set-windows-dedicated-state (buf-list state)
+  "For every buffer in BUF-LIST set its windows dedicated-state to STATE if
+visible in the `ecb-frame'."
+  (mapc (function (lambda (b)
+                    (when (get-buffer-window b ecb-frame)
+                      (set-window-dedicated-p
+                       (get-buffer-window b ecb-frame) state))))
+        buf-list))
+
+
+(defun ecb-window-in-window-list-number (win-list &optional window)
+  "Return the number of WINDOW in the window-list WIN-LIST.
+The left-top-most window of the frame has number 1. The other windows have
+the same ordering as `other-window' would walk through the frame.
+
+If WINDOW is nil then the currently selected window is used."
+  (let ((win-number (ecb-position win-list (or window (selected-window)))))
+    (if win-number (1+ win-number) nil)))
+
+
+
+;;; ----- Time  stuff -----------------------------------------
+
+;; next three functions stolen from gnus
+(defun ecb-time-to-seconds (time)
+  "Convert TIME to a floating point number."
+  (+ (* (car time) 65536.0)
+     (cadr time)
+     (/ (or (nth 2 time) 0) 1000000.0)))
+
+(defun ecb-seconds-to-time (seconds)
+  "Convert SECONDS (a floating point number) to an Emacs time structure."
+  (list (floor seconds 65536)
+	(floor (mod seconds 65536))
+	(floor (* (- seconds (ffloor seconds)) 1000000))))
+
+(defun ecb-subtract-time (t1 t2)
+  "Subtract two internal times and return the result as internal time."
+  (let ((borrow (< (cadr t1) (cadr t2))))
+    (list (- (car t1) (car t2) (if borrow 1 0))
+	  (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2)))))
+
+(defun ecb-time-diff (t1 t2 &optional rounded)
+  "Return the difference between time T1 and T2 in seconds \(can be a
+floating-point number). If optional arg ROUNDED is not nil the result is a
+rounded integer."
+  (funcall (if rounded 'round 'identity)
+           (ecb-time-to-seconds (ecb-subtract-time t1 t2))))
+  
+;; (let ((t1 nil)
+;;       (t2 nil))
+;;   (setq t1 (current-time))
+;;   (sit-for 5)
+;;   (setq t2 (current-time))
+;;   (ecb-time-diff t2 t1 t))
+
+(defun ecb-time-less-p (t1 t2)
+  "Say whether time T1 is less than time T2."
+  (or (< (car t1) (car t2))
+      (and (= (car t1) (car t2))
+	   (< (nth 1 t1) (nth 1 t2)))))
+
+;;; ----- Ringstuff ----------------------------------------
+
+(require 'ring)
+(defalias 'ecb-make-ring 'make-ring)
+(defalias 'ecb-ring-p 'ring-p)
+(defalias 'ecb-ring-empty-p 'ring-empty-p)
+(defalias 'ecb-ring-insert 'ring-insert)
+(defalias 'ecb-ring-ref 'ring-ref)
+;; at least XEmacs does not have this function.
+(defun ecb-ring-elements (ring)
+  "Return a list of the lements of RING."
+  (mapcar #'identity (cddr ring)))
+
+;;; ----- Menu stuff ---------------------------------------
+
+(defvar ecb-max-submenu-depth 4
+  "The maximum depth of nesting submenus for the tree-buffers.")
+
+(defun ecb-create-menu-user-ext-type (curr-level max-level)
+  "Creates the :type-definition for the *-menu-user-extension options.
+This allows nested submenus for the popup-menus of the tree-buffers up to a
+maximum level of MAX-LEVEL. CURR-LEVEL must be 1 when used in a
+defcustom-clause and has to be <= MAX-LEVEL."
+  (list 'repeat (delq nil
+                      (list 'choice ':tag "Menu-entry" ':menu-tag "Menu-entry"
+                            ':value '(ignore "")
+                            (list 'const ':tag "Separator" ':value '("---"))
+                            (list 'list ':tag "Menu-command"
+                                  (list 'function ':tag "Function" ':value 'ignore)
+                                  (list 'string ':tag "Entry-name"))
+                            (if (= curr-level max-level)
+                                nil
+                              (list 'cons ':tag "Submenu"
+                                    (list 'string ':tag "Submenu-title")
+                                    (ecb-create-menu-user-ext-type (1+ curr-level)
+                                                                   max-level)))))))
+
+;;; ----- byte-compiling stuff ----------------------------
+
+(defun ecb-is-byte-compiling ()
+  "Return non-nil if eval'ed during compilation.  Don't use outside
+`eval-when-compile'."
+  (and (boundp 'byte-compile-dest-file)
+       (stringp byte-compile-dest-file)))
+
+(defun ecb-load-in-progress-p ()
+  load-in-progress)
+
+;;; ----- User Interrupt handling -------------------------
+
+;; KB: stolen from semantic.....
+
+(defvar ecb-current-input-throw-symbol nil
+  "The current throw symbol for `ecb-exit-on-input'.")
+
+(defmacro ecb-exit-on-input (symbol &rest forms)
+  "Using SYMBOL as an argument to `throw', execute FORMS.
+If FORMS includes a call to `ecb-thow-on-input', then if a user presses any
+key during execution, this form macro will exit with the value passed to
+`ecb-throw-on-input'. If FORMS completes, then the return value is the same as
+`progn'."
+  `(let ((ecb-current-input-throw-symbol ,symbol))
+     (catch ,symbol
+       ,@forms)))
+(put 'ecb-exit-on-input 'lisp-indent-function 1)
+
+(defmacro ecb-throw-on-input (from &optional value)
+  "Exit with `throw' when in `ecb-exit-on-input' on user input.
+FROM is an indication of where this function is called. Optional arg VALUE is
+what should be thrown out and both are are combined in a cons-cell and passed
+to `throw'. It is recommended to add as FROM the name of the function calling
+this one or a descriptive symbol which indicates part of a code has been
+interrupted..
+
+Example: \(ecb-throw-on-input 'test-inner-loop \"test\") would throw a
+cons-cell \('test-inner-loop . \"test\")"
+  `(when (and ecb-current-input-throw-symbol
+              (or (input-pending-p) (accept-process-output)))
+     (throw ecb-current-input-throw-symbol (cons ,from ,value))))
+
+
+(defun ecb-test-throw-on-input ()
+  "Test that throw on input will work."
+  (interactive)
+  (ecb-throw-on-input 'done-die)
+  (message "Exit Code: %s"
+	   (ecb-exit-on-input 'testing
+	     (let ((inhibit-quit nil)
+		   (message-log-max nil))
+	       (while t
+		 (message "Looping ...")
+                 ;; with the following line it isn't interruptable... so if
+                 ;; you call a funtion which do not return you never reach the
+                 ;; throw-part and no interruption takes place (could be if you
+                 ;; run external processes!)
+                 ;; So this mechanism is better than nothing but not really
+                 ;; good... we need the `while-no-input'-macro...
+                 ;;(while t nil)
+		 (ecb-throw-on-input 'test-inner-loop "test")
+                 )
+	       'exit))))
+
+;; (defun ecb-test-throw-on-input-new ()
+;;   "Test that while-no-input will work even better."
+;;   (interactive)
+;;   (message "Exit Code: %s"
+;; 	   (while-no-input
+;; 	     (let ((inhibit-quit nil)
+;; 		   (message-log-max nil))
+;; 	       (while t
+;; 		 (message "Looping ...")
+;;                  (while t nil)
+;; 		 "test")
+;; 	       'exit))))
+
+
+;;; ----- Provide ------------------------------------------
+
+(silentcomp-provide 'ecb-util)
+
+;;; Local Variables: ***
+;;; mode:outline-minor ***
+;;; End: ***
diff --git a/site/ecb-2.40/ecb-winman-support.el b/site/ecb-2.40/ecb-winman-support.el
new file mode 100644
index 0000000..62af819
--- /dev/null
+++ b/site/ecb-2.40/ecb-winman-support.el
@@ -0,0 +1,319 @@
+;; ecb-winman-support.el - support of several window managers
+
+;; Copyright (C) 2000 - 2005 Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools, escreen, winring
+;; Created: 2003
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb-winman-support.el,v 1.16 2009/05/15 15:19:53 berndl Exp $
+
+;;; Commentary
+;;
+;; This library contains support for several window-managers so they interact
+;; well with ECB. Currently the following window-managers are supported by ECB:
+;; - winring.el: Written by Barry A. Warsaw <bwarsaw@python.org>, get it from
+;;   http://www.python.org/emacs/winring
+;; - escreen.el: Written by Noah Friedman <friedman@splode.com>, get it from
+;;   http://www.splode.com/~friedman/software/emacs-lisp/#ui
+;;
+;; Note: With one of these window-managers installed and active you can run
+;; applications like Gnus, VM or BBDB in the same frame as ECB! Just use
+;; different window-configurations (winring.el) or escreens (escreen.el) for
+;; ECB and the other applications. Especially with winring.el you can give
+;; every configuration a descriptive name like "ECB" or "Gnus" ; afterwards
+;; you can jump to a window-configuration by name!
+
+
+;;; Installation and enabling
+;;
+;; This library is installed autom. with ECB. But every support must be
+;; enabled explicitly:
+;; - winring: Call `ecb-winman-winring-enable-support'. This *must* be done
+;;   *before* the first call to any winring-command, so also before calling
+;;   `winring-initialize'!
+;; - escreen: Call `ecb-winman-escreen-enable-support'. This *must* be done
+;;   *before* the first call to any escreen-command, so also before calling
+;;   `escreen-install'!
+;;
+;; You can also put into your .emacs:
+;; (ecb-winman-winring-enable-support) or/and
+;; (ecb-winman-escreen-enable-support)
+
+;;; Deinstallation
+;;
+;; Just run `ecb-winman-escreen-disable-support' rsp.
+;; `ecb-winman-winring-disable-support'.
+
+
+;;; Usage
+;;
+;; After enabling the support of one of the supported window-managers just go
+;; on as described in the commentary or introduction of the respective
+;; library-file(s) of the window-manager. Here is a short description:
+
+;; - winring: Run `winring-initialize'. If ECB is active then the resulting
+;;   window-configuration is the ECB-window-configuration. Otherwise you can
+;;   create the ECB-window-configuration when you first time call
+;;   `winring-new-configuration' with name equal to `ecb-winman-winring-name'.
+;;   In general you can run all commands of the winring-library. If you jump
+;;   to the ECB-window-configuration then ECB will be autom. activated and if
+;;   you leave the ECB-window-configuration then ECB will autom. deactivated.
+
+;; - escreen: Run `escreen-install' (deactivates ECB if currently
+;;   running), `escreen-create-screen', `escreen-goto-screen' etc. The latter
+;;   ones activate autom. ECB if creating or selecting the escreen with number
+;;   `ecb-escreen-number' (default = 1) and deactivate ECB autom. if leaving
+;;   the ECB-escreen.
+
+
+;;; BUGS
+;;
+;; Currently not known
+
+
+;; Thanks to Johann "Myrkraverk" Oskarsson <myrkraverk@users.sourceforge.net>
+;; for the first trigger for this support-library. He has suggested to
+;; integrate ECB with escreen.
+
+
+;;; Code
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(require 'ecb-util)
+(require 'ecb-common-browser)
+
+(silentcomp-defvar escreen-current-screen-number)
+
+
+(defgroup ecb-winman-support nil
+  "Settings for supporting several window-managers.
+Currently winring and escreen are supported."
+  :group 'ecb
+  :prefix "ecb-winman-")
+
+(defcustom ecb-winman-escreen-number 1
+  "*Number of the escreen which is reserved for ECB.
+If you go to the escreen with this number you go always to the escreen with
+activated ECB. All other escreen-numbers are escreens with deactivated ECB!"
+  :group 'ecb-winman-support
+  :group 'ecb-most-important
+  :type 'integer)
+
+(defcustom ecb-winman-winring-name "ECB"
+  "*Name of the winring-window-configuration reserved for ECB.
+If you go to the window-configuration with this name you go always to the
+window-configuration with activated ECB. All other window-configuration are
+configurations with deactivated ECB!"
+  :group 'ecb-winman-support
+  :group 'ecb-most-important
+  :type 'string)
+
+;; support for the library escreen.el ----------------------------------------
+
+(defecb-advice-set ecb-winman-escreen-adviced-functions
+  "These functions of escreen are adviced if escreen is active during ECB is
+active. This advice is a permanent advice set!"
+  t)
+
+
+(defun ecb-winman-escreen-enable-support ()
+  "Load the escreen-library and enable the ECB-support for it.
+This does not install or activate escreen! For this you have still to call
+`escreen-install'! For further documentation about escreen see the file
+escreen.el!"
+  (interactive)
+  (if (locate-library "escreen")
+      (condition-case nil
+          (progn
+            (require 'escreen)
+            (ecb-enable-advices 'ecb-winman-escreen-adviced-functions)
+            (add-hook 'escreen-goto-screen-hook
+                      'ecb-winman-escreen-goto-escreen-hook)
+            (ecb-info-message "Support for escreen enabled."))
+        (error
+         (ecb-winman-escreen-disable-support)
+         (ecb-error "The escreen-support can not be properly installed!")))
+    (ecb-error "The library escreen.el can not be found!")))
+
+
+(defun ecb-winman-escreen-disable-support ()
+  "Disable the escreen-support of ECB."
+  (interactive)
+  (ecb-disable-advices 'ecb-winman-escreen-adviced-functions t)
+  (when (featurep 'escreen)
+    (remove-hook 'escreen-goto-screen-hook
+                 'ecb-winman-escreen-goto-escreen-hook)))
+    
+
+(defun ecb-winman-escreen-goto-escreen-hook ()
+  "Activate ECB if we go to the escreen with number `ecb-escreen-number'."
+  (if (and (boundp 'ecb-minor-mode)
+           (not ecb-minor-mode)
+           (= escreen-current-screen-number
+              ecb-winman-escreen-number))
+      (let ((ecb-split-edit-window-after-start 'before-deactivation))
+        (ecb-activate))))
+
+(defecb-advice escreen-save-current-screen-configuration
+    before
+    ecb-winman-escreen-adviced-functions
+  "escreen can only handle screen-configurations if ECB is deactivated. This
+is because ECB handles its window-creation completely by itself and because it
+uses dedicated windows. So we deactivate ECB before running this function."
+  (if (and (boundp 'ecb-minor-mode)
+           ecb-minor-mode
+           (equal ecb-frame (selected-frame)))
+      (let ((ecb-split-edit-window-after-start 'before-deactivation))
+        (ecb-deactivate))))
+
+;; support for the library winring.el ---------------------------------------
+
+(defecb-advice-set ecb-winman-winring-adviced-functions
+  "These functions of winring are adviced if winring is active during ECB is
+active.  This advice is a permanent advice set!"
+  t)
+
+(defun ecb-winman-winring-enable-support ()
+  "Load the winring-library and enable the ECB-support for it.
+This does not install or activate winring! For this you have still to call
+`winring-initialize'! For further documentation about winring see the file
+winring.el!"
+  (interactive)
+  (if (locate-library "winring")
+      (condition-case nil
+          (progn
+            (require 'winring)
+            (ecb-enable-advices 'ecb-winman-winring-adviced-functions)
+            (ecb-info-message "Support for winring enabled."))
+        (error
+         (ecb-winman-winring-disable-support)
+         (ecb-error "The winring-support can not be properly installed!")))
+    (ecb-error "The library winring.el can not be found!")))
+
+(defun ecb-winman-winring-disable-support ()
+  "Disable the winring-support of ECB."
+  (interactive)
+  (ecb-disable-advices 'ecb-winman-winring-adviced-functions t))
+
+
+(defvar ecb-winman-winring-ecb-frame nil
+  "Frame for which the ECB-window-configuration was set first time.")
+
+(defecb-advice winring-set-name after ecb-winman-winring-adviced-functions
+  "Store frame if name is equal with `ecb-winman-winring-name' and activate
+ECB if we set the name `ecb-winman-winring-name'."
+  ;; Because this is an after advice of winring-name-of-current returns here
+  ;; already the new name!
+  (when (ecb-string= (winring-name-of-current) ecb-winman-winring-name)
+    ;; we do this only the first time
+    (when (null ecb-winman-winring-ecb-frame)
+      (setq ecb-winman-winring-ecb-frame
+            (or (ad-get-arg 1) (selected-frame))))
+    ;; now we activate ECB if necessary
+    (when (and (boundp 'ecb-minor-mode)
+               (not ecb-minor-mode)
+               (equal (or (ad-get-arg 1)
+                          (selected-frame)) ecb-winman-winring-ecb-frame))
+      (let ((ecb-split-edit-window-after-start 'before-deactivation))
+        (ecb-activate)))))
+
+(defecb-advice winring-duplicate-configuration before ecb-winman-winring-adviced-functions
+  "Prevent the ECB-window-configuration from being duplicated."
+  (if (ecb-string= (winring-name-of-current) ecb-winman-winring-name)
+      (ecb-error "The ECB-window-configuration can not be duplicated!")))
+
+(defecb-advice winring-restore-configuration before ecb-winman-winring-adviced-functions
+  "Deactivates ECB if the ECB-window-configuration is active."
+  (if (and (ecb-string= (winring-name-of-current) ecb-winman-winring-name)
+           (boundp 'ecb-minor-mode)
+           ecb-minor-mode)
+      (let ((ecb-split-edit-window-after-start 'before-deactivation))
+        (ecb-deactivate))))
+  
+
+(defecb-advice winring-save-current-configuration before ecb-winman-winring-adviced-functions
+  "winring can only handle window-configurations if ECB is deactivated. This
+is because ECB handles its window-creation completely by itself and because it
+uses dedicated windows. So we deactivate ECB before running this function."
+  (if (and (boundp 'ecb-minor-mode)
+           ecb-minor-mode
+           (equal ecb-frame (selected-frame)))
+      (let ((ecb-split-edit-window-after-start 'before-deactivation))
+        (ecb-deactivate))))
+
+  
+(defecb-advice winring-initialize after ecb-winman-winring-adviced-functions
+  "If ECB is active when winring is initialized then this initial
+window-configuration gets always the name `ecb-winman-winring-name'."
+  (if (and (boundp 'ecb-minor-mode)
+           ecb-minor-mode
+           (equal ecb-frame (selected-frame)))
+      (winring-set-name ecb-winman-winring-name)))
+
+
+;; not supported window-managing functions------------------------------------
+
+(defecb-advice-set ecb-winman-not-supported-function-advices
+  "These function will be adviced so an error is reported when executed in the
+ecb-frame. This advice is a permanent advice set!"
+  t)
+
+(defecb-advice winner-mode before ecb-winman-not-supported-function-advices
+  "Prevents `winner-mode' from being activated for the ECB-frame."
+  (if (equal (selected-frame) ecb-frame)
+      (ecb-error "Can't use winner-mode functions in the ecb-frame.")))
+
+(defecb-advice winner-redo before ecb-winman-not-supported-function-advices
+  "Prevents `winner-redo' from being used within the ECB-frame."
+  (if (equal (selected-frame) ecb-frame)
+      (ecb-error "Can't use winner-mode functions in the ecb-frame.")))
+
+(defecb-advice winner-undo before ecb-winman-not-supported-function-advices
+  "Prevents `winner-undo' from being used within the ECB-frame."
+  (if (equal (selected-frame) ecb-frame)
+      (ecb-error "Can't use winner-mode functions in the ecb-frame.")))
+
+(when-ecb-running-xemacs
+  (defecb-advice push-window-configuration before ecb-winman-not-supported-function-advices
+    (if (and (equal (selected-frame) ecb-frame)
+             (interactive-p))
+        (ecb-error "Can't use interactive push-window-configuration in the ecb-frame.")))
+
+  (defecb-advice pop-window-configuration before ecb-winman-not-supported-function-advices
+    (if (and (equal (selected-frame) ecb-frame)
+             (interactive-p))
+        (ecb-error "Can't use interactive pop-window-configuration in the ecb-frame.")))
+  
+  (defecb-advice unpop-window-configuration before ecb-winman-not-supported-function-advices
+    (if (and (equal (selected-frame) ecb-frame)
+             (interactive-p))
+        (ecb-error "Can't use interactive unpop-window-configuration in the ecb-frame.")))
+  )
+
+;; we disable all advices per default.
+
+(ecb-disable-advices 'ecb-winman-winring-adviced-functions t)
+(ecb-disable-advices 'ecb-winman-escreen-adviced-functions t)
+(ecb-disable-advices 'ecb-winman-not-supported-function-advices t)
+
+(silentcomp-provide 'ecb-winman-support)
+
+;;; ecb-winman-support.el ends here
diff --git a/site/ecb-2.40/ecb.el b/site/ecb-2.40/ecb.el
new file mode 100644
index 0000000..deb7c76
--- /dev/null
+++ b/site/ecb-2.40/ecb.el
@@ -0,0 +1,2051 @@
+;;; ecb.el --- a code browser for Emacs
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: ecb.el,v 1.446 2009/05/10 16:53:19 berndl Exp $
+
+;;; Commentary:
+;;
+;; ECB stands for "Emacs Code Browser".  While Emacs already has good
+;; *editing* support for many modes, its *browsing* support is somewhat
+;; lacking. That's where ECB comes in: it displays a number of informational
+;; windows that allow for easy source code navigation and overview.
+;;
+;; The informational windows can contain:
+;;
+;; - A directory tree,
+;; - a list of source files in the current directory,
+;; - a list of functions/classes/methods/... in the current file, (ECB uses
+;;   the Semantic Bovinator, or Imenu, or etags, for getting this list so all
+;;   languages supported by any of these tools are automatically supported by
+;;   ECB too)
+;; - a history of recently visited files, 
+;; - the Speedbar and
+;; - output from compilation (the "*compilation*" window) and other modes like
+;;   help, grep etc. or whatever a user defines to be displayed in this
+;;   window.
+;;
+;; As an added bonus, ECB makes sure to keep these informational windows visible,
+;; even when you use C-x 1 and similar commands.
+;;
+;; It goes without saying that you can configure the layout, ie which
+;; informational windows should be displayed where. ECB comes with a number of
+;; ready-made window layouts to choose from.
+;;
+;; Here is an ascii-screenshot of what ECB offers you:
+;;
+;;   ------------------------------------------------------------------
+;;   |              |                                                 |
+;;   | Directories  |                                                 |
+;;   |              |                                                 |
+;;   |--------------|                                                 |
+;;   |              |                                                 |
+;;   | Sources      |                                                 |
+;;   |              |                                                 |
+;;   |--------------|                   Edit-area                     |
+;;   |              |    (can be splitted in several edit-windows)    |
+;;   | Methods/Vars |                                                 |
+;;   |              |                                                 |
+;;   |--------------|                                                 |
+;;   |              |                                                 |
+;;   | History      |                                                 |
+;;   |              |                                                 |
+;;   ------------------------------------------------------------------
+;;   |                                                                |
+;;   |                 Compilation-window (optional)                  |
+;;   |                                                                |
+;;   ------------------------------------------------------------------
+;;
+
+;;; Installation
+;;
+;; To use the Emacs code browser add the ECB files to your load path and add the
+;; following line to your .emacs file:
+;;
+;; If you want autoloading ECB after first start:
+;;
+;;    (require 'ecb-autoloads)
+;;
+;; or if you want loading the complete ECB:
+;;
+;;    (require 'ecb)
+;;
+;; Optional: You can byte-compile ECB with `ecb-byte-compile' after the
+;;           ECB-package is loaded
+
+
+;;; Requirements
+;;
+;; - Semantic, author-version between >= 1.4
+;;   (http://cedet.sourceforge.net/semantic.shtml).
+;; - Eieio, author-version >= 0.17
+;;   (http://cedet.sourceforge.net/eieio.shtml).
+;; - speedbar, author version >= 0.14beta1
+;;   (http://cedet.sourceforge.net/speedbar.shtml)
+;; - Optional: If Java code is edited the ECB works best when the JDEE package
+;;   (http://sunsite.auc.dk/jde) is installed.
+
+
+;;; Activation
+;;
+;; ECB is either activated and started by calling
+;;    M-x ecb-activate
+;; or
+;;    via the menu "Tools --> Start Code Browser (ECB)"
+;;
+;; ECB can also be (de)activated/toggled by M-x ecb-minor-mode.
+;;
+;; After activating ECB you should call `ecb-show-help' to get a detailed
+;; description of what ECB offers to you and how to use ECB.
+
+
+;;; Availability
+;;
+;; The latest version of the ECB is available at http://ecb.sourceforge.net
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+
+;; We need this libraries already here if we miss some requirements
+(require 'ecb-upgrade)
+(require 'ecb-util)
+
+;; if we miss some of the requirements we report an error.
+
+(defconst ecb-cedet-load-ok (featurep 'cedet))
+
+(defconst ecb-compiled-in-semantic-version
+  (eval-when-compile (ignore-errors semantic-version))
+  "Semantic-version used for byte-compiling ECB. Either nil when no semantic
+is loaded or the value of `semantic-version' at ECB-compilation time.")
+
+(defconst ecb-compiled-in-cedet-version
+  (eval-when-compile (ignore-errors cedet-version))
+  "Cedet-version used for byte-compiling ECB. Either nil when no semantic
+is loaded or the value of `cedet-version' at ECB-compilation time.")
+
+(when (not ecb-cedet-load-ok)
+  (if (ecb-noninteractive)
+      (ecb-error "ECB is missing CEDET - check your CEDET-installation/setup!")
+    (ecb-check-requirements)))
+
+
+;; If we are here we can load ECB because at least we have installed and
+;; loaded all required packages. The correct version will be checked
+;; at start- or byte-compile-time
+
+
+(message "ECB %s uses CEDET %s (contains semantic %s, eieio %s, speedbar %s)."
+         ecb-version
+         (or (and (boundp 'cedet-version)
+                  cedet-version)
+             "<unknown version>")
+         (or (and (boundp 'semantic-version)
+                  semantic-version)
+             "<unknown version>")
+         (or (and (boundp 'eieio-version)
+                  eieio-version)
+             "<unknown version>")
+         (or (and (boundp 'speedbar-version)
+                  speedbar-version)
+             "<unknown version>"))
+
+;; rest of ecb loads
+(require 'tree-buffer)
+(require 'ecb-file-browser)
+(require 'ecb-method-browser)
+(require 'ecb-jde)
+(require 'ecb-layout)
+(require 'ecb-create-layout)
+(require 'ecb-mode-line)
+(require 'ecb-help)
+(require 'ecb-navigate)
+(require 'ecb-eshell)
+(require 'ecb-compilation)
+(require 'ecb-cycle)
+(require 'ecb-face)
+(require 'ecb-tod)
+(require 'ecb-speedbar)
+(require 'ecb-autogen)
+(require 'ecb-winman-support)
+(require 'ecb-compatibility)
+
+;; add-ons
+(require 'ecb-analyse)
+(require 'ecb-symboldef)
+
+;; various loads
+(require 'assoc)
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+
+;; XEmacs
+(silentcomp-defun redraw-modeline)
+(silentcomp-defvar modeline-map)
+(silentcomp-defvar progress-feedback-use-echo-area)
+;; Emacs
+(silentcomp-defun force-mode-line-update)
+(silentcomp-defun font-lock-add-keywords)
+
+(silentcomp-defvar current-menubar)
+(silentcomp-defun find-menu-item)
+(silentcomp-defun add-submenu)
+(silentcomp-defun delete-menu-item)
+(silentcomp-defun Info-goto-node)
+
+(silentcomp-defun ecb-speedbar-deactivate)
+(silentcomp-defvar ecb-speedbar-buffer-name)
+
+
+;;====================================================
+;; Variables
+;;====================================================
+(defvar ecb-major-mode-selected-source nil
+  "Major-mode of currently selected source.")
+
+(defvar ecb-item-in-tree-buffer-selected nil
+  "Only true if any item in any tree-buffer has been selected in recent
+command.")
+
+(defun ecb-initialize-all-internals (&optional no-caches)
+  (ecb-tree-buffers-init)
+  (setq ecb-major-mode-selected-source nil
+        ecb-item-in-tree-buffer-selected nil)
+  (ecb-file-browser-initialize no-caches)
+  (ecb-method-browser-initialize no-caches))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: FRAME-LOCAL
+(defvar ecb-minor-mode nil
+  "Do not set this variable directly. Use `ecb-activate' and
+`ecb-deactivate' or `ecb-minor-mode'.!")
+
+(defvar ecb-activated-window-configuration nil
+  "Window configuration used after the ECB is activated.")
+
+;;====================================================
+;; Customization
+;;====================================================
+
+(defgroup ecb nil
+  "Emacs code browser."
+  :group 'tools
+  :prefix "ecb-")
+
+(defgroup ecb-general nil
+  "General settings for the Emacs code browser."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defgroup ecb-most-important nil
+  "The most important settings of ECB you should know."
+  :group 'ecb
+  :prefix "ecb-")
+
+(defcustom ecb-use-recursive-edit nil
+  "*Tell ECB to use a recursive edit.
+If set then it can easily be deactivated by \(keyboard-escape-quit)."
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-auto-activate nil
+  "*Automatically startup ECB when Emacs starts up.
+This should only be true if you always want to run `ecb-activate'."
+  :group 'ecb-general
+  :group 'ecb-most-important
+  :type 'boolean)
+
+(defcustom ecb-activation-selects-ecb-frame-if-already-active 'ask
+  "*Trying to activate an already activated ECB selects the ECB-frame.
+If t then the ECB-frame is selected, if nil then it is not. If 'ask then ECB
+asks if the ECB-frame should be selected if the current-frame is not the
+`ecb-frame'."
+  :group 'ecb-general
+  :type '(radio (const :tag "Select the ECB-frame" :value t)
+                (const :tag "Ask if the ECB-frame should be selected" :value ask)
+                (const :tag "Do not select the ECB-frame" :value nil)))
+
+(defcustom ecb-clear-caches-before-activate nil
+  "*Clear all ECB internal caches before startup.
+If t then ECB clears all its internal caches before starting up. Caches are
+used for files- and subdirs \(see `ecb-cache-directory-contents' and
+`ecb-cache-directory-contents-not') for semantic-tags and for the
+history-filter.
+
+This caches are completely empty at load-time of the ECB-library!
+
+Default is nil, because is makes sense not to clear these caches at start-time
+because ECB is often deacticated temporally especially in combination with
+window-managers like escreen.el. In these situations the internal state of ECB
+should be preserved for next activation."
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-stealthy-tasks-delay 1
+  "*Time Emacs must be idle before ECB runs its stealthy tasks.
+Currently ECB performes the following stealthy tasks:
+
+  Prescann directories for emptyness: Prescann directories and display them as
+  empty or not-empty in the directories-buffer. See the documentation of the
+  option `ecb-prescan-directories-for-emptyness' for a description.
+
+  File is read only: Check if sourcefile-items of the directories- or
+  sources-buffer are read-only or not. See documentation of the option
+  `ecb-sources-perform-read-only-check'.
+
+  Version-control-state: Checks the version-control-state of files in
+  directories which are managed by a VC-backend. See the option
+  `ecb-vc-enable-support'.
+
+Here the interval is defined ECB has to be idle before starting with these
+stealthy tasks. It can be a floating-point value in seconds. The value can
+also be changed during running ECB."
+  :group 'ecb-general
+  :group 'ecb-most-important
+  :type '(number :tag "Idle time before running stealthy tasks"
+                 :value 1)
+  :initialize 'custom-initialize-default
+  :set (function (lambda (sym val)
+                   (set sym val)
+                   (ecb-activate-ecb-autocontrol-function
+                    val 'ecb-stealthy-updates))))
+                    
+
+
+(defcustom ecb-minor-mode-text " ECB"
+  "*String to display in the mode line when ECB minor mode is active.
+\(When the string is not empty, make sure that it has a leading space.)
+
+Because for ECB it is quite obvious if it is active or not when the
+ECB-windows are visible this text is only display in the modeline if the
+ECB-windows are hidden."
+  :group 'ecb-general
+  :type 'string)
+
+(defcustom ecb-auto-compatibility-check t
+  "*Check at ECB-startup if all ECB-options have correct values.
+If not nil then all ECB-options are checked if their current value have the
+correct type. It the type is incorrect the option is either auto. upgraded to
+the new type or reset to the default-value of current ECB if no upgrade is
+possible. This feature can also upgrade options which are renamed in current
+ECB and try to transform the old-value to the new named option. After startup
+all upgraded or reset options are displayed with their old \(before
+upgrade/reset) and new values. See also the commands `ecb-upgrade-options' and
+`ecb-display-upgraded-options'. If this option is off then the user can
+perform the check and reset manually with `ecb-upgrade-options'."
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-version-check t
+  "*Checks at start-time if the requirements are fulfilled.
+It checks if the required versio of CEDET is installed and loaded into Emacs.
+
+It is strongly recommended to set this option to not nil!"
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-debug-mode nil
+  "*If not nil ECB displays debug-information in the Messages-buffer.
+This is done for some critical situations concerning semantic-tags and their
+overlays \(or extends for XEmacs). Normally you should not need this switched
+on! But if you get errors like \"destroyed extend\" for XEmacs or
+\"wrong-argument-type\" concerning overlays for GNU Emacs then you should
+switch on this option and submitting a bug-report to the ecb-mailing-list
+\(`ecb-submit-problem-report') after getting the error again!"
+  :group 'ecb-general
+  :type 'boolean)
+
+(defcustom ecb-run-ediff-in-ecb-frame t
+  "*Run ediff-sessions in the same frame as ECB is running.
+If not nil then ECB ensures that ediff runs in the same frame as ECB and ECB
+restores exactly the \"before-ediff\"-window-layout after quiting ediff. If
+nil then ediff decides in which frame it will run - depending on the current
+window-layout \(e.g. if the ecb-windows are currently hidden) this can be the
+ecb-frame but this can also be a newly created frame or any other frame."
+  :group 'ecb-general
+  :type 'boolean)
+
+
+(defcustom ecb-activate-before-layout-draw-hook nil
+  "*Hook run at the end of activating ECB by `ecb-activate'.
+These hooks run after all the internal setup process but directly before\(!)
+drawing the layout specified in `ecb-layout' \(means before dividing the frame
+into several windows). A senseful using of this hook can be maximizing the
+Emacs-frame for example, because this should be done before the layout is
+drawn because ECB computes the size of the ECB-windows with the current frame
+size! If you need a hook-option for the real end of the activating process
+\(i.e. after the layout-drawing) look at `ecb-activate-hook'.
+
+IMPORTANT: The difference between this hook and
+`ecb-redraw-layout-before-hook' is that the latter one is evaluated always
+before the layout is redrawn \(for example after calling `ecb-redraw-layout')
+whereas the former one \(this hook) is only evaluated exactly once during the
+activation-process of ECB. So during the activation process there is the
+following sequence of hooks:
+1. 'ecb-activate-before-layout-draw-hook' \(this one)
+2. `ecb-redraw-layout-before-hook'
+3. <Drawing the layout>
+4. `ecb-redraw-layout-after-hook'
+5. `ecb-activate-hook'"
+  :group 'ecb-general
+  :type 'hook)
+
+
+(defcustom ecb-before-activate-hook nil
+  "*Hook run at the beginning of activating ECB by `ecb-activate'.
+These hooks run before any other tasks of the activating process are
+performed. If any of these hooks returns nil then ECB will not be activated!
+
+This can be used to check some conditions and then only start ECB if all
+conditions are true. For example a function could be added which returns only
+nil if Gnus is running. Then calling `ecb-activate' or `ecb-minor-mode' will
+only start ECB if Gnus is not already running."
+  :group 'ecb-general
+  :type 'hook)
+
+
+(defcustom ecb-activate-hook nil
+  "*Hook run at the end of activating ECB by `ecb-activate'.
+These hooks run at the real end of the activating process, means after the
+layout has been drawn!. If you need hooks which are run direct before the
+layout-drawing look at `ecb-activate-before-layout-draw-hook'."
+  :group 'ecb-general
+  :type 'hook)
+
+(defcustom ecb-deactivate-hook nil
+  "*Hook run at the end of deactivating ECB by `ecb-deactivate'.
+These hooks run before the ecb-layout is cleared!"
+  :group 'ecb-general
+  :type 'hook)
+
+(defcustom ecb-before-deactivate-hook nil
+  "*Hook run at the beginning of deactivating ECB by `ecb-deactivate'.
+These hooks run before any other tasks of the deactivating process are
+performed. If any of these hooks returns nil then ECB will not be deactivated!
+See also `ecb-before-activate-hook'."
+  :group 'ecb-general
+  :type 'hook)
+
+
+;;====================================================
+;; Internals
+;;====================================================
+
+(defun ecb-kill-buffer-hook ()
+  "Function added to the `kill-buffer-hook' during ECB activation.
+  It does several tasks:
+- Depending on the value in `ecb-kill-buffer-clears-history' the corresponding
+  entry in the history-buffer is removed.
+- Clearing the method buffer if a file-buffer has been killed.
+- The entry of the removed file-buffer is removed from `ecb-tag-tree-cache'."
+  (let* ((curr-buf (current-buffer))
+         (buffer-file (ecb-fix-filename (ecb-buffer-file-name curr-buf))))
+    ;; this prevents automatically from killing one of the ecb-buffers because
+    ;; these ones are never releated to file!
+    (when buffer-file
+      ;; 1. clearing the history if necessary
+      (ecb-history-kill-buffer-clear curr-buf)
+
+      ;; 2. clearing the method buffer if a file-buffer is killed
+      (ecb-rebuild-methods-buffer-with-tagcache nil nil t)
+
+      ;; 3. removing the file-buffer from `ecb-tag-tree-cache'. Must be done
+      ;;    after 2. because otherwise a new element in the cache would be
+      ;;    created again by `ecb-rebuild-methods-buffer-with-tagcache'.
+      (ecb-clear-tag-tree-cache (buffer-name curr-buf)))
+    (when (member curr-buf (ecb-get-current-visible-ecb-buffers))
+      (ecb-error "Killing an special ECB-buffer is not possible!"))))
+
+
+(defun ecb-window-sync (&optional only-basic-windows)
+  "Synchronizes all special ECB-buffers with current buffer.
+Depending on the contents of current buffer this command performs different
+synchronizing tasks but only if ECB is active and point stays in an
+edit-window.
+
+- If current buffer is a file-buffer \(or an indirect-buffer with a
+  file-buffer as base-buffer) then all special ECB-tree-buffers are
+  synchronized with current buffer.
+
+- If current buffer is a dired-buffer then the directory- and
+  the sources-tree-buffer are synchronized if visible
+
+In addition to this the hooks in `ecb-basic-buffer-sync-hook' run.
+
+If optional argument only-basic-windows is not nil then only the basic
+tree-buffer directories, sources, methods and history are synchronized.
+Otherwise all registered special ecb-buffers."
+  (interactive "P")
+  (when (and ecb-minor-mode
+             (not ecb-windows-hidden)
+             (ecb-point-in-edit-window-number))
+    (ecb-basic-buffer-sync t)
+    ;; look in the sync-register and call all sync-function registered with a
+    ;; buffer-name when buffer is contained in the list of buffers returned by
+    ;; ecb-get-current-visible-ecb-buffers.
+    (unless only-basic-windows
+      (let ((visible-ecb-windows (ecb-get-current-visible-ecb-buffers)))
+        (dolist (elem ecb-autocontrol/sync-fcn-register)
+          (when (and (cdr elem)
+                     (member (get-buffer (symbol-value (cdr elem)))
+                             visible-ecb-windows))
+            (funcall (car elem) t)))))
+    ))
+
+
+(defun ecb-customize ()
+  "Open a customize-buffer for all customize-groups of ECB."
+  (interactive)
+  (ecb-select-edit-window)
+  (customize-group "ecb"))
+
+(defun ecb-customize-most-important ()
+  "Open a customize-buffer for the most important options of ECB."
+  (interactive)
+  (ecb-select-edit-window)
+  (customize-group "ecb-most-important"))
+
+
+;;====================================================
+;; ECB minor mode: Create buffers & menus & maps
+;;====================================================
+
+(defun ecb-menu-item (item)
+  "Build an XEmacs compatible menu item from vector ITEM.
+That is remove the unsupported :help stuff."
+  (if ecb-running-xemacs
+      (let ((n (length item))
+            (i 0)
+            slot l)
+        (while (< i n)
+          (setq slot (aref item i))
+          (if (and (keywordp slot)
+                   (eq slot :help))
+              (setq i (1+ i))
+            (setq l (cons slot l)))
+          (setq i (1+ i)))
+        (apply #'vector (nreverse l)))
+    item))
+
+(defvar ecb-menu-name "ECB")
+(defvar ecb-menu-bar
+  (list
+   ecb-menu-name
+   (ecb-menu-item
+    [ "Select ECB frame"
+      ecb-select-ecb-frame
+      :active (and ecb-minor-mode
+                   (not (equal (selected-frame) ecb-frame)))
+      :help "Select the ECB-frame."
+      ])
+   (ecb-menu-item
+    [ "Synchronize ECB windows"
+      (ecb-window-sync)
+      :active (and (equal (selected-frame) ecb-frame)
+                   (ecb-point-in-edit-window-number))
+      :help "Synchronize the ECB windows with the current edit-window."
+      ])
+   (ecb-menu-item
+    [ "Update directories buffer"
+      ecb-update-directories-buffer
+      :active (equal (selected-frame) ecb-frame)
+      :help "Updates the directories buffer with current disk-state"
+      ])
+   (ecb-menu-item
+    [ "Add all buffers to history"
+      ecb-add-all-buffers-to-history
+      :active (and (equal (selected-frame) ecb-frame)
+                   (ecb-window-live-p ecb-history-buffer-name))
+      :help "Add all current file-buffers to history"
+      ])
+   "-"
+   (ecb-menu-item
+    [ "Rebuild methods buffer"
+      ecb-rebuild-methods-buffer
+      :active (equal (selected-frame) ecb-frame)
+      :help "Rebuild the methods buffer completely"
+      ])
+   (ecb-menu-item
+    [ "Expand methods buffer"
+      ecb-expand-methods-nodes
+      :active (equal (selected-frame) ecb-frame)
+      :help "Expand all nodes of a certain indent-level"
+      ])
+   (ecb-menu-item
+    [ "Toggle auto. expanding of the method buffer"
+      ecb-toggle-auto-expand-tag-tree
+      :active (equal (selected-frame) ecb-frame)
+      :help "Toggle auto. expanding of the method buffer"
+      ])
+   "-"
+   (ecb-menu-item
+    [ "Change layout"
+      ecb-change-layout
+      :active (equal (selected-frame) ecb-frame)
+      :help "Change the layout."
+      ])
+   (ecb-menu-item
+    [ "Redraw layout"
+      ecb-redraw-layout
+      :active (equal (selected-frame) ecb-frame)
+      :help "Redraw the current layout."
+      ])
+   (ecb-menu-item
+    [ "Toggle layout"
+      ecb-toggle-layout
+      :active (and (equal (selected-frame) ecb-frame)
+                   (> (length ecb-toggle-layout-sequence) 1))
+      :help "Toggle between several layouts"
+      ])
+   (ecb-menu-item
+    [ "Toggle visibility of ECB windows"
+      ecb-toggle-ecb-windows
+      :active (equal (selected-frame) ecb-frame)
+      :help "Toggle the visibility of all ECB windows."
+      ])
+   (list
+    "Layout administration"
+    (ecb-menu-item
+     [ "Store current window-sizes"
+       ecb-store-window-sizes
+       :active (equal (selected-frame) ecb-frame)
+       :help "Store current sizes of the ecb-windows in current layout."
+       ])
+    (ecb-menu-item
+     [ "Restore sizes of the ecb-windows"
+       ecb-restore-window-sizes
+       :active (equal (selected-frame) ecb-frame)
+       :help "Restore the sizes of the ecb-windows in current layout."
+       ])
+    (ecb-menu-item
+     [ "Restore default-sizes of the ecb-windows"
+       ecb-restore-default-window-sizes
+       :active (equal (selected-frame) ecb-frame)
+       :help "Restore the default-sizes of the ecb-windows in current layout."
+       ])
+    "-"
+    (ecb-menu-item
+     [ "Create new layout"
+       ecb-create-new-layout
+       :active (equal (selected-frame) ecb-frame)
+       :help "Create a new ECB-layout."
+       ])
+    (ecb-menu-item
+     [ "Delete new layout"
+       ecb-delete-new-layout
+       :active (equal (selected-frame) ecb-frame)
+       :help "Delete an user-created ECB-layout."
+       ])
+    "-"
+    (ecb-menu-item
+     [ "Show help for a layout"
+       ecb-show-layout-help
+       :active t
+       :help "Show the documentation for a layout."
+       ]))
+   "-"
+   (ecb-menu-item
+    [ "Toggle compile window"
+      ecb-toggle-compile-window
+      :active (equal (selected-frame) ecb-frame)
+      :help "Toggle visibility of compile window."
+      ])
+   (ecb-menu-item
+    [ "Toggle enlarged compile window"
+      ecb-toggle-compile-window-height
+      :active (and (equal (selected-frame) ecb-frame)
+                   ecb-compile-window
+                   (ecb-compile-window-live-p))
+      :help "Toggle enlarged compile window."
+      ])
+   "-"
+   (list
+    "Navigate"
+    (ecb-menu-item
+     ["Previous \(back)"
+      ecb-nav-goto-previous
+      :active t
+      :help "Go to the previous navigation point"
+      ])
+    (ecb-menu-item
+     ["Next \(forward)"
+      ecb-nav-goto-next
+      :active t
+      :help "Go to the next navigation point"
+      ]))
+   (list
+    "Goto window"
+    (ecb-menu-item
+     ["Last selected edit-window"
+      ecb-goto-window-edit-last
+      :active t
+      :help "Go to the last selected edit-window"
+      ])
+    (ecb-menu-item
+     ["Edit-window 1"
+      ecb-goto-window-edit1
+      :active t
+      :help "Go to the first edit-window"
+      ])
+    (ecb-menu-item
+     ["Edit-window 2"
+      ecb-goto-window-edit2
+      :active (ecb-edit-window-splitted)
+      :help "Go to the second edit-window \(if splitted\)"
+      ])
+    (ecb-menu-item
+     ["Directories"
+      ecb-goto-window-directories
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-directories-buffer-name)
+      :help "Go to the directories window"
+      ])
+    (ecb-menu-item
+     ["Sources"
+      ecb-goto-window-sources
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-sources-buffer-name)
+      :help "Go to the sources window"
+      ])
+    (ecb-menu-item
+     ["Methods and Variables"
+      ecb-goto-window-methods
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-methods-buffer-name)
+      :help "Go to the methods/variables window"
+      ])
+    (ecb-menu-item
+     ["History"
+      ecb-goto-window-history
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-history-buffer-name)
+      :help "Go to the history window"
+      ])
+    (ecb-menu-item
+     ["Analyse"
+      ecb-goto-window-analyse
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-analyse-buffer-name)
+      :help "Go to the analyse window"
+      ])
+    (ecb-menu-item
+     ["Speedbar"
+      ecb-goto-window-speedbar
+      :active (and ecb-use-speedbar-instead-native-tree-buffer
+                   (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-speedbar-buffer-name))
+      :help "Go to the integrated speedbar window"
+      ])
+    (ecb-menu-item
+     ["Compilation"
+      ecb-goto-window-compilation
+      :active (equal 'visible (ecb-compile-window-state))
+      :help "Go to the history window"
+      ])
+    )
+   (list
+    "Display window maximized"
+    (ecb-menu-item
+     ["Directories"
+      ecb-maximize-window-directories
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-directories-buffer-name)
+      :help "Maximize the directories window - even if currently not visible"
+      ])
+    (ecb-menu-item
+     ["Sources"
+      ecb-maximize-window-sources
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-sources-buffer-name)
+      :help "Maximize the sources window - even if currently not visible"
+      ])
+    (ecb-menu-item
+     ["Methods and Variables"
+      ecb-maximize-window-methods
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-methods-buffer-name)
+      :help "Maximize the methods/variables window - even if currently not visible"
+      ])
+    (ecb-menu-item
+     ["History"
+      ecb-maximize-window-history
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-history-buffer-name)
+      :help "Maximize the history window - even if currently not visible"
+      ])
+    (ecb-menu-item
+     ["Analyse"
+      ecb-maximize-window-analyse
+      :active (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-analyse-buffer-name)
+      :help "Maximize the analyse window - even if currently not visible"
+      ])
+    (ecb-menu-item
+     ["Speedbar"
+      ecb-maximize-window-speedbar
+      :active (and ecb-use-speedbar-instead-native-tree-buffer
+                   (ecb-buffer-is-ecb-buffer-of-current-layout-p ecb-speedbar-buffer-name))
+      :help "Maximize the integrated speedbar window - even if not visible"
+      ])
+    )
+   "-"
+   (list
+    "Preferences"
+    (ecb-menu-item
+     ["Most important..."
+      (customize-group "ecb-most-important")
+      :active t
+      :help "Customize the most important options"
+      ])
+    (ecb-menu-item
+     ["All..."
+      (ecb-customize)
+      :active t
+      :help "Display all available option-groups..."
+      ])
+    "-"
+    (ecb-menu-item
+     ["General..."
+      (customize-group "ecb-general")
+      :active t
+      :help "Customize general ECB options"
+      ])
+    (ecb-menu-item
+     ["Directories..."
+      (customize-group "ecb-directories")
+      :active t
+      :help "Customize ECB directories"
+      ])
+    (ecb-menu-item
+     ["Sources..."
+      (customize-group "ecb-sources")
+      :active t
+      :help "Customize ECB sources"
+      ])
+    (ecb-menu-item
+     ["Methods..."
+      (customize-group "ecb-methods")
+      :active t
+      :help "Customize ECB method display"
+      ])
+    (ecb-menu-item
+     ["History..."
+      (customize-group "ecb-history")
+      :active t
+      :help "Customize ECB history"
+      ])
+    (ecb-menu-item
+     ["Analyse..."
+      (customize-group "ecb-analyse")
+      :active t
+      :help "Customize ECB analyse ingeractor"
+      ])
+    (ecb-menu-item
+     ["Version control..."
+      (customize-group "ecb-version-control")
+      :active t
+      :help "Customize the version-control-support"
+      ])
+    (ecb-menu-item
+     ["Layout..."
+      (customize-group "ecb-layout")
+      :active t
+      :help "Customize ECB layout"
+      ])
+    (ecb-menu-item
+     ["Tree-buffer style and handling..."
+      (customize-group "ecb-tree-buffer")
+      :active t
+      :help "Customize the tree-buffers of ECB"
+      ])
+    (ecb-menu-item
+     ["Face options..."
+      (customize-group "ecb-face-options")
+      :active t
+      :help "Customize ECB faces"
+      ])
+    (ecb-menu-item
+     ["Help options..."
+      (customize-group "ecb-help")
+      :active t
+      :help "Customize options for the online help of ECB"
+      ])
+    (ecb-menu-item
+     ["ECB/eshell options..."
+      (customize-group "ecb-eshell")
+      :active t
+      :help "Customize options for the eshell integration of ECB"
+      ])
+    (ecb-menu-item
+     ["Supporting non-semantic-sources..."
+      (customize-group "ecb-non-semantic")
+      :active t
+      :help "Customize options for parsing non-semantic-sources"
+      ])
+    (ecb-menu-item
+     ["Supporting window-managers..."
+      (customize-group "ecb-winman-support")
+      :active t
+      :help "Customize options for the window-manager-support"
+      ])
+    )
+   (list
+    "Upgrade ECB"
+    (ecb-menu-item
+     [ "Upgrade ECB-options to current ECB-version"
+       ecb-upgrade-options
+       :active (equal (selected-frame) ecb-frame)
+       :help "Try to upgrade ECB-options to current ECB-version if necessary."
+       ])
+    )
+   (list
+    "Help"
+    (ecb-menu-item
+     [ "Show Online Help"
+       ecb-show-help
+       :active t
+       :help "Show the online help of ECB."
+       ])
+    (ecb-menu-item
+     [ "ECB NEWS"
+       (ecb-display-news-for-upgrade t)
+       :active t
+       :help "Displays the NEWS-file of ECB."
+       ])
+    (ecb-menu-item
+     [ "List of most important options"
+       (let ((ecb-show-help-format 'info))
+         (ecb-show-help)
+         (Info-goto-node "Most important options"))
+       :active t
+       :help "Displays a a list of options which you should know."
+       ])
+    (ecb-menu-item
+     [ "List of all options"
+       (let ((ecb-show-help-format 'info))
+         (ecb-show-help)
+         (Info-goto-node "Option Index"))
+       :active t
+       :help "Displays an index of all user-options in the online-help."
+       ])
+    (ecb-menu-item
+     [ "List of all commands"
+       (let ((ecb-show-help-format 'info))
+         (ecb-show-help)
+         (Info-goto-node "Command Index"))
+       :active t
+       :help "Displays an index of all commands in the online-help."
+       ])
+    (ecb-menu-item
+     [ "FAQ"
+       (let ((ecb-show-help-format 'info))
+         (ecb-show-help)
+         (Info-goto-node "FAQ"))
+       :active t
+       :help "Show the FAQ of ECB."
+       ])
+    (ecb-menu-item
+     [ "Conflicts with other packages"
+       (let ((ecb-show-help-format 'info))
+         (ecb-show-help)
+         (Info-goto-node "Conflicts and bugs"))
+       :active t
+       :help "What to do for conflicts with other packages."
+       ])
+    (ecb-menu-item
+     [ "Submit problem report"
+       ecb-submit-problem-report
+       :active t
+       :help "Submit a problem report to the ECB mailing list."
+       ])
+    (ecb-menu-item
+     [ "ECB Debug mode"
+       (setq ecb-debug-mode (not ecb-debug-mode))
+       :active t
+       :style toggle
+       :selected ecb-debug-mode
+       :help "Print debug-informations about parsing files in the message buffer."
+       ])
+    (ecb-menu-item
+     [ "ECB Layout Debug mode"
+       (setq ecb-layout-debug-mode (not ecb-layout-debug-mode))
+       :active t
+       :style toggle
+       :selected ecb-layout-debug-mode
+       :help "Print debug-informations about window-operations in the message buffer."
+       ])
+    "-"
+    (ecb-menu-item
+     ["Help preferences..."
+      (customize-group "ecb-help")
+      :active t
+      :help "Customize options for the online help of ECB"
+      ])
+    "-"
+    (concat "ECB " ecb-version)
+    )
+   "-"
+   (ecb-menu-item
+    [ "Deactivate ECB"
+      ecb-deactivate
+      :active t
+      :help "Deactivate ECB."
+      ])
+   )
+  "Menu for ECB minor mode.")
+
+(defun ecb-add-to-minor-modes ()
+  "Does all necessary to add ECB as a minor mode with current values of
+`ecb-mode-map' and `ecb-minor-mode-text'."
+  ;; ECB minor mode doesn't work w/ Desktop restore.
+  ;; This line will disable this minor mode from being restored
+  ;; by Desktop.
+  (when (boundp 'desktop-minor-mode-handlers)
+    (add-to-list 'desktop-minor-mode-handlers
+		 (cons 'ecb-minor-mode 'ignore)))
+  (add-minor-mode 'ecb-minor-mode
+                  'ecb-minor-mode-text ecb-mode-map))
+
+(defvar ecb-mode-map nil
+  "Internal key-map for ECB minor mode.")
+
+(defcustom ecb-key-map
+  '("C-c ." . ((t "fh" ecb-history-filter)
+               (t "fs" ecb-sources-filter)
+               (t "fm" ecb-methods-filter)
+               (t "fr" ecb-methods-filter-regexp)
+               (t "ft" ecb-methods-filter-tagclass)
+               (t "fc" ecb-methods-filter-current-type)
+               (t "fp" ecb-methods-filter-protection)
+               (t "fn" ecb-methods-filter-nofilter)
+               (t "fl" ecb-methods-filter-delete-last)
+               (t "ff" ecb-methods-filter-function)
+               (t "p" ecb-nav-goto-previous)
+               (t "n" ecb-nav-goto-next)
+               (t "lc" ecb-change-layout)
+               (t "lr" ecb-redraw-layout)
+               (t "lw" ecb-toggle-ecb-windows)
+               (t "lt" ecb-toggle-layout)
+               (t "s" ecb-window-sync)
+               (t "r" ecb-rebuild-methods-buffer)
+               (t "a" ecb-toggle-auto-expand-tag-tree)
+               (t "x" ecb-expand-methods-nodes)
+               (t "h" ecb-show-help)
+               (t "gl" ecb-goto-window-edit-last)
+               (t "g1" ecb-goto-window-edit1)
+               (t "g2" ecb-goto-window-edit2)
+               (t "gc" ecb-goto-window-compilation)
+               (t "gd" ecb-goto-window-directories)
+               (t "gs" ecb-goto-window-sources)
+               (t "gm" ecb-goto-window-methods)
+               (t "gh" ecb-goto-window-history)
+               (t "ga" ecb-goto-window-analyse)
+               (t "gb" ecb-goto-window-speedbar)
+               (t "md" ecb-maximize-window-directories)
+               (t "ms" ecb-maximize-window-sources)
+               (t "mm" ecb-maximize-window-methods)
+               (t "mh" ecb-maximize-window-history)
+               (t "ma" ecb-maximize-window-analyse)
+               (t "mb" ecb-maximize-window-speedbar)
+               (t "e" eshell)
+               (t "o" ecb-toggle-scroll-other-window-scrolls-compile)
+               (t "\\" ecb-toggle-compile-window)
+               (t "/" ecb-toggle-compile-window-height)
+               (t "," ecb-cycle-maximized-ecb-buffers)
+               (t "." ecb-cycle-through-compilation-buffers)))
+
+  "*Specifies all key-bindings for the ECB minor-mode key-map.
+The value is a cons-cell where the car is a common-prefix key for all the
+key-bindings. The cdr is a list of key-bindings each of them a list again. A
+key-binding has the following form:
+
+  '\(<common-prefix-flag> <keysequence> <function>) where
+
+<common-prefix-flag>: If t then the common-prefixkey defined as car of the
+                      value \(see above) is used.
+<keysequence>: If the common prefixkey is used then the final key-binding is the
+               concatenation of the common-prefixkey \(see above) and this
+               keysequence.
+<function>: The function to bind to the key. This can also be a
+            lambda-expression .
+
+It is highly recommended to use one of the standard keys C-c or C-x as first key
+of your common-prefixkey!
+
+You MUST change this option via customize to take effect!
+
+All keysequences must be inserted as a string and must follow the syntax needed
+by `read-kbd-macro' or `kbd'. This means you can insert the key in the same
+manner \"C-h k\" displays keysequences. Here is the summary of the syntax:
+
+Text is divided into \"words \" separated by whitespace. Except for the words
+described below, the characters of each word go directly as characters of the
+keysequence. The whitespace that separates words is ignored. Whitespace in the
+macro must be written explicitly, as in \"C-c SPC\".
+
+  * The special words RET, SPC, TAB, DEL, LFD, ESC, and NUL represent special
+   control characters. The words must be written in uppercase.
+
+  * A word in angle brackets, e.g., <return>, <down>, <left> or <f1>, represents
+    a function key. \(Note that in the standard configuration, the function
+    key <return> and the control key RET are synonymous.). You can use angle
+    brackets on the words RET, SPC, etc., but they are not required there.
+
+  * Keys can be written by their ASCII code, using a backslash followed by up
+    to six octal digits. This is the only way to represent keys with codes
+    above \377.
+
+  * One or more prefixes M- \(meta), C- \(control), S- \(shift), A- \(alt),
+    H- \(hyper), and s- \(super) may precede a character or key notation. For
+    function keys, the prefixes may go inside or outside of the brackets:
+    C-<down> = <C-down>. The prefixes may be written in any order: M-C-x =
+    C-M-x.
+    Prefixes are not allowed on multi-key words, e.g., C-abc, except that the
+    Meta prefix is allowed on a sequence of digits and optional minus sign:
+    M--123 = M-- M-1 M-2 M-3.
+
+  * The `^' notation for control characters also works:  ^M = C-m."
+  :group 'ecb-general
+  :group 'ecb-most-important
+  :type '(cons (choice :tag "Common prefix-key"
+                       (const :tag "No common prefix-key" :value nil)
+                       (string :tag "Prefix-key" :value "C-c ."))
+               (repeat :tag "Key-bindings"
+                       (list :tag "Key-definition"
+                             (boolean :tag "o Use common prefix-key" :value t)
+                             (string :tag "o Key")
+                             (function :tag "o Function or lambda-expression"
+                                       :value nil))))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   ;; make a mode-map and save it
+                   (setq ecb-mode-map
+                         (let ((km (make-sparse-keymap))
+                               (val-list (ecb-copy-list (cdr value)))
+                               keq-string)
+                           (dolist (elem val-list)
+                             (setq key-string (concat (if (nth 0 elem) (car value))
+                                                      " " (nth 1 elem)))
+                             (define-key km (read-kbd-macro key-string) (nth 2 elem)))
+                           (easy-menu-define ecb-minor-menu km
+                             "ECB Minor Mode Menu" ecb-menu-bar)
+                           km))
+                   ;; add the minor-mode and and the minor-mode-map to the
+                   ;; alists if not already contained. In this case just
+                   ;; replace the values in the alists
+                   (ecb-add-to-minor-modes))))
+
+;;;###autoload
+(defun ecb-activate ()
+  "Activates ECB and creates the special buffers for the choosen layout.
+For the layout see `ecb-layout-name'. This function raises always the
+ECB-frame if called from another frame. This is the same as calling
+`ecb-minor-mode' with a positive argument."
+  (interactive)
+  (ecb-minor-mode 1))
+
+(defun ecb-activate-internal ()
+  "Activates the ECB and creates all the buffers and draws the ECB-screen
+with the actually chosen layout \(see `ecb-layout-name'). This function raises
+always the ECB-frame if called from another frame."
+
+  (if ecb-use-recursive-edit
+      (if ecb-minor-mode
+	  (progn
+	    (message "ECB already activated. Drawing layout.")
+	    (ecb-redraw-layout))
+	(catch 'exit
+	  (progn
+	    (ecb-activate--impl)
+	    (recursive-edit))
+	  (ecb-deactivate-internal)))
+    (ecb-activate--impl))
+  ecb-minor-mode)
+
+
+(defvar ecb-upgrade-check-done nil)
+
+(defun ecb-clean-up-after-activation-failure (msg err)
+  "Complete cleanup of all ECB-setups and report an error with message MSG."
+  (let ((ecb-minor-mode t))
+    (ecb-deactivate-internal t)
+    (if ecb-running-xemacs
+        (redraw-modeline t)
+      (force-mode-line-update t))
+    (error "ECB %s: %s (error-type: %S, error-data: %S)" ecb-version msg
+           (car err) (cdr err))))
+
+(defvar ecb-last-window-config-before-deactivation nil
+  "Contains the last `ecb-current-window-configuration' directly before
+ECB has been deactivated. Do not set this variable!")
+
+(defvar ecb-temporary-changed-emacs-variables-alist nil
+  "Internal alist which stores old values of emacs variables/options which
+have to be changed during running ECB. Use only `ecb-modify-emacs-variable'
+for modifying this alist.")
+
+(defun ecb-modify-emacs-variable (var action &optional new-value)
+  "Stores or restores the old value of the Emacs-variable symbol VAR.
+VAR has to be a bound symbol for a variable. ACTION is either 'store or
+'restore. The optional arg NEW-VALUE is only used when ACTION is 'store and is
+that value VAR should be set to. After calling with ACTION is 'restore the
+value of VAR is as before storing a NEW-VALUE for variable-symbol VAR."
+  (case action
+    (store
+     (or (ecb-find-assoc var ecb-temporary-changed-emacs-variables-alist)
+         (progn
+           (setq ecb-temporary-changed-emacs-variables-alist
+                 (ecb-add-assoc (cons var (symbol-value var))
+                                ecb-temporary-changed-emacs-variables-alist))
+           (set var new-value))))
+    (restore
+     (let ((elem (ecb-find-assoc var ecb-temporary-changed-emacs-variables-alist)))
+       (when elem
+         (set var (cdr elem))
+         (setq ecb-temporary-changed-emacs-variables-alist
+               (ecb-remove-assoc var ecb-temporary-changed-emacs-variables-alist)))))))
+
+(defun ecb-check-semantic-load ()
+  "Checks if cedet is correctly loaded if semantic 2.X is used and if the same
+semantic-version has been used for byte-compiling ECB and loading into Emacs.
+If ECB detects a problem it is reported and then an error is thrown."
+  (when (boundp 'semantic-version)
+    (let ((err-msg
+           (cond ;; Different semantic-version used for byte-compiling ECB and
+                 ;; loading into Emacs.
+                 ((not (string= semantic-version ecb-compiled-in-semantic-version))
+                  (concat "ECB has been byte-compiled with another semantic-version than currently\n"
+                          "loaded into Emacs:\n"
+                          (format "  + Semantic used for byte-compiling ECB: %s\n"
+                                  ecb-compiled-in-semantic-version)
+                          (format "  + Semantic currently loaded into Emacs: %s\n"
+                                  semantic-version)
+                          "Please ensure that ECB is byte-compiled with the same semantic-version as you\n"
+                          "you load into your Emacs. Check if you have byte-compiled ECB with the cedet-\n"
+                          "suite but loaded old semantic 1.X into Emacs or vice versa.\n\n"
+                          "In general it is recommended to start ECB first-time not byte-compiled\n"
+                          "and then call the command `ecb-byte-compile'. This ensures you byte-compile ECB\n"
+                          "with the same library-versions \(semantic etc.) as you load into Emacs.\n"
+                          "If you use the Makefile check the variables CEDET before compiling!\n"
+                          ))
+                 (t ""))))
+      (unless (= 0 (length err-msg)) 
+        (with-output-to-temp-buffer "*ECB semantic-load problems*"
+          (princ "Currently ECB can not be activated cause of the following reason:\n\n")
+          (princ err-msg)
+          (princ "\n\nPlease fix the reported problem and restart Emacs\n"))
+        (ecb-error "Please fix the reported problem and restart Emacs!")))))
+
+(defun ecb-check-cedet-load ()
+  "Checks if cedet is correctly loaded if semantic 2.X is used and if the same
+semantic-version has been used for byte-compiling ECB and loading into Emacs.
+If ECB detects a problem it is reported and then an error is thrown."
+  (when (boundp 'cedet-version)
+    (let ((err-msg
+           (cond ;; cedet was not compiled into ECB
+                 ((null ecb-compiled-in-cedet-version)
+                  (concat (format "Currently CEDET %s is loaded but ECB has been byte-compiled without\n"
+                                  cedet-version)
+                          "any CEDET. Please either use ECB un-byte-compiled \(remove all *.elc\n"
+                          "files from the ECB-directory) or byte-compile ECB correctly with CEDET!\n"
+                          "In the later case it is recommended to start ECB first-time not byte-compiled\n"
+                          "and then call the command `ecb-byte-compile'. This ensures you byte-compile ECB\n"
+                          "with the same CEDET-library-version as you load into Emacs.\n"
+                          "If you use the Makefile check the variable CEDET before compiling!\n"
+                          ))
+                 ;; Different cedet-version used for byte-compiling ECB and
+                 ;; loading into Emacs.
+                 ((not (string= cedet-version ecb-compiled-in-cedet-version))
+                  (concat "ECB has been byte-compiled with another cedet-version than currently\n"
+                          "loaded into Emacs:\n"
+                          (format "  + CECET used for byte-compiling ECB: %s\n"
+                                  ecb-compiled-in-cedet-version)
+                          (format "  + CEDET currently loaded into Emacs: %s\n"
+                                  cedet-version)
+                          "Please ensure that ECB is byte-compiled with the same cedet-version as you\n"
+                          "you load into your Emacs.\n\n"
+                          "In general it is recommended to start ECB first-time not byte-compiled\n"
+                          "and then call the command `ecb-byte-compile'. This ensures you byte-compile ECB\n"
+                          "with the same CEDET-library-version as you load into Emacs.\n"
+                          "If you use the Makefile check the variable CEDET before compiling!\n"))
+                 (t ""))))
+      (unless (= 0 (length err-msg)) 
+        (with-output-to-temp-buffer "*ECB cedet-load problems*"
+          (princ "Currently ECB can not be activated cause of the following reason:\n\n")
+          (princ err-msg)
+          (princ "\n\nPlease fix the reported problem and restart Emacs\n"))
+        (ecb-error "Please fix the reported problem and restart Emacs!")))))
+
+
+(defun ecb-activate--impl ()
+  "See `ecb-activate'.  This is the implementation of ECB activation."
+  (when (or (null ecb-frame) (not (frame-live-p ecb-frame)))
+    (setq ecb-frame (selected-frame)))
+  
+  (if ecb-minor-mode
+      (when (and (not (equal (selected-frame) ecb-frame))
+                 (or (equal ecb-activation-selects-ecb-frame-if-already-active t)
+                     (and (equal ecb-activation-selects-ecb-frame-if-already-active 'ask)
+                          (y-or-n-p "ECB is already active in another frame. Select it? "))))
+        (ecb-select-ecb-frame)
+        (ecb-update-directories-buffer))
+
+    (let ((stack-trace-on-error stack-trace-on-error))
+      ;; we activate only if all before-hooks return non nil
+      (when (run-hook-with-args-until-failure 'ecb-before-activate-hook)
+
+        ;; temporary changing some emacs-vars
+        (when (< max-specpdl-size 3000)
+          (ecb-modify-emacs-variable 'max-specpdl-size 'store 3000))
+        (when (< max-lisp-eval-depth 1000)
+          (ecb-modify-emacs-variable 'max-lisp-eval-depth 'store 1000))
+        (when (and ecb-running-xemacs
+                   (boundp 'progress-feedback-use-echo-area))
+          (ecb-modify-emacs-variable 'progress-feedback-use-echo-area 'store t))
+      
+        ;; checking if there are cedet or semantic-load problems
+        (ecb-check-cedet-load)
+        (ecb-check-semantic-load)
+              
+        ;; checking the requirements
+        (ecb-check-requirements)
+
+        (condition-case err-obj
+            (progn
+              
+              ;; initialize the navigate-library
+              (ecb-nav-initialize)
+
+              ;; enable basic advices (we need the custom-save-all advice
+              ;; already here! Maybe it would be better to remove this advice
+              ;; from the basic-advices and add it to upgrade-advices.....)
+              ;;(ecb-enable-advices 'ecb-layout-basic-adviced-functions)
+
+              ;; we need the custom-all advice here!
+              (ecb-enable-advices 'ecb-methods-browser-advices)
+              
+              ;; maybe we must upgrade some not anymore compatible or even renamed
+              ;; options
+              (when (and ecb-auto-compatibility-check
+                         (not ecb-upgrade-check-done))
+                (ecb-check-not-compatible-options)
+                (ecb-upgrade-not-compatible-options)
+                (ecb-upgrade-renamed-options)
+                (setq ecb-upgrade-check-done t))
+
+              ;; first initialize the whole layout-engine
+              (ecb-initialize-layout)
+
+              ;; initialize internals
+              (ecb-initialize-all-internals (not ecb-clear-caches-before-activate))
+
+              ;; enable permanent advices - these advices will never being
+              ;; deactivated after first activation of ECB unless
+              ;; `ecb-split-edit-window-after-start' is not 'before-activation
+              ;; (see `ecb-deactivate-internal')
+              (ecb-enable-advices 'ecb-permanent-adviced-layout-functions)
+
+              ;; enable advices for not supported window-managers
+              (ecb-enable-advices 'ecb-winman-not-supported-function-advices)
+
+              ;; enable advices for the compatibility with other packages
+              (ecb-enable-advices 'ecb-compatibility-advices)
+            
+              ;; set the ecb-frame
+              (let ((old-ecb-frame ecb-frame))
+                (if ecb-new-ecb-frame
+                    (progn
+                      (run-hooks 'ecb-activate-before-new-frame-created-hook)
+                      (setq ecb-frame (make-frame))
+                      (put 'ecb-frame 'ecb-new-frame-created t))
+                  (setq ecb-frame (selected-frame))
+                  (put 'ecb-frame 'ecb-new-frame-created nil))
+                ;; If ECB is acivated in a frame unequal to that frame which was
+                ;; the ecb-frame at last deactivation then we initialize the
+                ;; `ecb-edit-area-creators'.
+                (if (not (equal ecb-frame old-ecb-frame))
+                    (ecb-edit-area-creators-init)))
+              (raise-frame ecb-frame)
+              (select-frame ecb-frame)
+
+              (ecb-enable-own-temp-buffer-show-function t)
+      
+              ;; now we can activate ECB
+
+              ;; first we run all tree-buffer-creators
+              (ecb-tree-buffer-creators-run)
+    
+              ;; activate the eshell-integration - does not load eshell but
+              ;; prepares ECB to run eshell right - if loaded and activated
+              (ecb-eshell-activate-integration)
+
+              ;; we need some hooks
+              (add-hook (ecb--semantic-after-partial-cache-change-hook)
+                        'ecb-update-after-partial-reparse t)
+              (add-hook (ecb--semantic-after-toplevel-cache-change-hook)
+                        'ecb-rebuild-methods-buffer-with-tagcache t)
+;;               (add-hook (ecb--semantic--before-fetch-tags-hook)
+;;                         'ecb-prevent-from-parsing-if-exceeding-threshold)              
+              (ecb-activate-ecb-autocontrol-function ecb-highlight-tag-with-point-delay
+                                                     'ecb-tag-sync)
+              (ecb-activate-ecb-autocontrol-function ecb-basic-buffer-sync-delay
+                                                     'ecb-basic-buffer-sync)
+              (ecb-activate-ecb-autocontrol-function ecb-compilation-update-idle-time
+                                                     'ecb-compilation-buffer-list-changed-p)
+              (ecb-activate-ecb-autocontrol-function 'post
+                                                     'ecb-layout-post-command-hook)
+              (ecb-activate-ecb-autocontrol-function 'pre
+                                                     'ecb-layout-pre-command-hook)
+              (ecb-activate-ecb-autocontrol-function 0.5
+                                                     'ecb-repair-only-ecb-window-layout)
+              (ecb-activate-ecb-autocontrol-function 'post
+                                                     'ecb-handle-major-mode-visibilty)
+              (add-hook 'after-save-hook 'ecb-update-methods-after-saving)
+              (add-hook 'kill-buffer-hook 'ecb-kill-buffer-hook)
+
+              (add-hook 'find-file-hooks 'ecb-find-file-hook)
+
+              ;; after adding all idle-timers and post- and pre-command-hooks we
+              ;; activate the monitoring
+              (ecb-activate-ecb-autocontrol-function 1 'ecb-monitor-autocontrol-functions)
+
+              ;; We activate the stealthy update mechanism
+              (ecb-stealthy-function-state-init)
+              (ecb-activate-ecb-autocontrol-function ecb-stealthy-tasks-delay
+                                                      'ecb-stealthy-updates)
+            
+              ;; running the compilation-buffer update first time
+              (ecb-compilation-buffer-list-init)
+                            
+              ;; ediff-stuff; we operate here only with symbols to avoid bytecompiler
+              ;; warnings
+              (ecb-activate-ediff-compatibility)
+
+              ;; enabling the VC-support
+              (ecb-vc-enable-internals 1)
+              
+              ;; menus - dealing with the menu for XEmacs is really a pain...
+              (when ecb-running-xemacs
+                (let ((dummy-buf-name " *dummytogetglobalmap*"))
+                  (save-excursion
+                    (set-buffer (get-buffer-create dummy-buf-name))
+                    (add-submenu nil ecb-minor-menu)
+                    (kill-buffer dummy-buf-name)))
+                (save-excursion
+                  (dolist (buf (buffer-list))
+                    (set-buffer buf)
+                    (if (null (car (find-menu-item current-menubar
+                                                   (list ecb-menu-name))))
+                        (add-submenu nil ecb-minor-menu)))))
+
+              (add-hook (if ecb-running-xemacs
+                            'activate-menubar-hook
+                          'menu-bar-update-hook)
+                        'ecb-compilation-update-menu)
+              )
+          (error
+           ;;          (backtrace)
+           (ecb-clean-up-after-activation-failure
+            "Errors during the basic setup of ECB." err-obj)))
+
+        (condition-case err-obj
+            ;; run personal hooks before drawing the layout
+            (run-hooks 'ecb-activate-before-layout-draw-hook)
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during the hooks of ecb-activate-before-layout-draw-hook."
+            err-obj)))
+         
+        (setq ecb-minor-mode t)
+
+        ;; now we draw the screen-layout of ECB.
+        (condition-case err-obj
+            ;; now we draw the layout chosen in `ecb-layout'. This function
+            ;; activates at its end also the adviced functions if necessary!
+            ;; Here the directories- and history-buffer will be updated.
+            (let ((ecb-redraw-layout-quickly nil)
+                  (use-last-win-conf (and ecb-last-window-config-before-deactivation
+                                          (equal ecb-split-edit-window-after-start
+                                                 'before-deactivation)
+                                          (not (ecb-window-configuration-invalidp
+                                                ecb-last-window-config-before-deactivation)))))
+              (ecb-enable-temp-buffer-shrink-to-fit ecb-compile-window-height)
+              (if use-last-win-conf                     
+                  (setq ecb-edit-area-creators
+                        (nth 4 ecb-last-window-config-before-deactivation)))
+
+              (ecb-redraw-layout-full 'no-buffer-sync
+                                      nil
+                                      (if use-last-win-conf
+                                          (nth 6 ecb-last-window-config-before-deactivation))
+                                      (if use-last-win-conf
+                                          (nth 5 ecb-last-window-config-before-deactivation)
+                                        nil))
+
+              ;; if there was no compile-window before deactivation then we have
+              ;; to hide the compile-window after activation
+              (if (and use-last-win-conf
+                       (null (nth 2 ecb-last-window-config-before-deactivation)))
+                  (ecb-toggle-compile-window -1))
+
+              (when (member ecb-split-edit-window-after-start
+                            '(vertical horizontal nil))
+                (delete-other-windows)
+                (case ecb-split-edit-window-after-start
+                  (horizontal (split-window-horizontally))
+                  (vertical (split-window-vertically))))
+            
+              ;; now we synchronize all ECB-windows
+              (ecb-window-sync)
+            
+              ;; now update all the ECB-buffer-modelines
+              (ecb-mode-line-format)
+              )
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during the layout setup of ECB." err-obj)))
+        
+        (condition-case err-obj
+            (let ((edit-window (car (ecb-canonical-edit-windows-list))))
+              (when (and ecb-display-default-dir-after-start
+                         (null (ecb-buffer-file-name
+                                (window-buffer edit-window))))
+                (ecb-set-selected-directory
+                 (ecb-fix-filename (save-excursion
+                                     (set-buffer (window-buffer edit-window))
+                                     default-directory)))))
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during setting the default directory." err-obj)))
+
+        (condition-case err-obj
+            ;; we run any personal hooks
+            (run-hooks 'ecb-activate-hook)
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during the hooks of ecb-activate-hook." err-obj)))
+
+        (condition-case err-obj
+            ;; enable mouse-tracking for the ecb-tree-buffers; we do this after
+            ;; running the personal hooks because if a user put“s activation of
+            ;; follow-mouse.el (`turn-on-follow-mouse') in the
+            ;; `ecb-activate-hook' then our own ECB mouse-tracking must be
+            ;; activated later. If `turn-on-follow-mouse' would be activated
+            ;; after our own follow-mouse stuff, it would overwrite our
+            ;; mechanism and the show-node-name stuff would not work!
+            (if (ecb-show-any-node-info-by-mouse-moving-p)
+                (tree-buffer-activate-follow-mouse))
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during the mouse-tracking activation." err-obj)))
+
+        (setq ecb-minor-mode t)
+        (message "The ECB is now activated.")
+
+        (condition-case err-obj
+            ;; now we display all `ecb-not-compatible-options' and
+            ;; `ecb-renamed-options'
+            (if (and ecb-auto-compatibility-check
+                     (or (ecb-not-compatible-or-renamed-options-detected)
+                         (not (ecb-options-version=ecb-version-p))))
+                ;; we must run this with an idle-times because otherwise these
+                ;; options are never displayed when Emacs is started with a
+                ;; file-argument and ECB is automatically activated. I this
+                ;; case the buffer of the file-argument would be displayed
+                ;; after the option-display and would so hide this buffer.
+                (ecb-run-with-idle-timer 0.25 nil 'ecb-display-upgraded-options)
+              (ecb-display-news-for-upgrade))
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Error during the compatibility-check of ECB." err-obj)))
+
+        ;; if we activate ECB first time then we display the node "First steps" of
+        ;; the online-manual
+        (ignore-errors
+          (when (null ecb-source-path)
+            (let ((ecb-show-help-format 'info))
+              (ecb-show-help)
+              (Info-goto-node "First steps"))))
+
+        ;; display tip of the day if `ecb-tip-of-the-day' is not nil
+        (ignore-errors
+          (ecb-show-tip-of-the-day))
+
+        (ecb-enable-advices 'ecb-layout-basic-adviced-functions)
+        
+        (condition-case err-obj
+            ;;now take a snapshot of the current window configuration
+            (setq ecb-activated-window-configuration
+                  (ecb-current-window-configuration))
+          (error
+           (ecb-clean-up-after-activation-failure
+            "Errors during the snapshot of the windows-configuration." err-obj)))
+        ))))
+
+
+(defun ecb-deactivate ()
+  "Deactivates the ECB and kills all ECB buffers and windows."
+  (interactive)
+  (ecb-minor-mode 0))
+
+(defun ecb-deactivate-internal (&optional run-no-hooks)
+  "Deactivates the ECB and kills all ECB buffers and windows."
+  (unless (not ecb-minor-mode)
+
+    (when (or run-no-hooks
+              (run-hook-with-args-until-failure 'ecb-before-deactivate-hook))
+
+      (setq ecb-last-window-config-before-deactivation
+            (ecb-current-window-configuration))
+      
+      ;; deactivating the adviced functions
+      (dolist (adviced-set-elem ecb-adviced-function-sets)
+        ;; Note: as permanent defined advices-sets are not disabled here!
+        (ecb-disable-advices (car adviced-set-elem)))
+
+      (ecb-enable-own-temp-buffer-show-function nil)      
+
+      (ecb-enable-temp-buffer-shrink-to-fit nil)
+
+      ;; deactivate and reset the speedbar stuff
+      (ignore-errors (ecb-speedbar-deactivate))
+
+      ;; deactivates the eshell-integration; this disables also the
+      ;; eshell-advices! 
+      (ecb-eshell-deactivate-integration)
+
+      ;; For XEmacs
+      (tree-buffer-activate-follow-mouse)
+      (tree-buffer-deactivate-follow-mouse)
+
+      ;; remove the hooks
+      (remove-hook (ecb--semantic-after-partial-cache-change-hook)
+                   'ecb-update-after-partial-reparse)
+      (remove-hook (ecb--semantic-after-toplevel-cache-change-hook)
+                   'ecb-rebuild-methods-buffer-with-tagcache)
+;;       (remove-hook (ecb--semantic--before-fetch-tags-hook)
+;;                 'ecb-prevent-from-parsing-if-exceeding-threshold)
+      (ecb-stop-all-autocontrol/sync-functions)
+      (remove-hook 'after-save-hook 'ecb-update-methods-after-saving)
+      (remove-hook 'kill-buffer-hook 'ecb-kill-buffer-hook)
+
+      (remove-hook 'find-file-hooks 'ecb-find-file-hook)
+
+      ;; ediff-stuff
+      (ecb-deactivate-ediff-compatibility)
+
+      ;; disabling the VC-support
+      (ecb-vc-enable-internals -1)
+
+      ;; menus - dealing with the menu for XEmacs is really a pain...
+      (ignore-errors
+        (when ecb-running-xemacs
+          (save-excursion
+            (dolist (buf (buffer-list))
+              (set-buffer buf)
+              (if (car (find-menu-item current-menubar
+                                       (list ecb-menu-name)))
+                  (delete-menu-item (list ecb-menu-name)))))))
+      
+      (remove-hook (if ecb-running-xemacs
+                       'activate-menubar-hook
+                     'menu-bar-update-hook)
+                   'ecb-compilation-update-menu)
+
+      ;; run any personal hooks
+      (unless run-no-hooks
+        (run-hooks 'ecb-deactivate-hook))
+    
+      ;; clear the ecb-frame. Here we try to preserve the split-state after
+      ;; deleting the ECB-screen-layout.
+      (when (frame-live-p ecb-frame)
+        (raise-frame ecb-frame)
+        (select-frame ecb-frame)
+        (condition-case oops
+            (let* ((config (ecb-window-configuration-data))
+                   (window-before-redraw (nth 0 config))
+                   (pos-before-redraw (nth 1 config))
+                   (edit-win-data-before-redraw (nth 2 config))
+                   (edit-win-list-after-redraw nil))
+              ;; first we make all windows of the ECB-frame not dedicated and
+              ;; then we delete all ECB-windows
+              (ecb-select-edit-window)
+              (ecb-make-windows-not-dedicated ecb-frame)
+
+              ;; deletion of all windows. (All other advices are already
+              ;; disabled!) 
+              (ecb-with-original-permanent-layout-functions
+               (delete-other-windows))
+              
+              ;; some paranoia....
+              (set-window-dedicated-p (selected-window) nil)
+
+              ;; now we restore the edit-windows as before the deactivation
+              ;; (All other advices are already disabled!)
+              (if (= (length edit-win-data-before-redraw)
+                     (ecb-edit-area-creators-number-of-edit-windows))
+                  (ecb-with-original-permanent-layout-functions
+                   (ecb-restore-edit-area))
+                (ecb-edit-area-creators-init))
+              
+              (setq edit-win-list-after-redraw (ecb-canonical-edit-windows-list))
+
+              ;; a safety-check if we have now at least as many windows as
+              ;; edit-windows before deactivation. If yes we restore all
+              ;; window-data as before deactivation.
+              (when (= (length edit-win-list-after-redraw)
+                       (length edit-win-data-before-redraw))
+                (dotimes (i (length edit-win-data-before-redraw))
+                  (let ((win (nth i edit-win-list-after-redraw))
+                        (data (nth i edit-win-data-before-redraw)))
+                    (set-window-buffer win (nth 0 data))
+                    (set-window-start win (nth 1 data))
+                    (set-window-point win (nth 2 data))
+                    (if (> (length edit-win-list-after-redraw) 1)
+                        (ecb-set-window-size win (nth 3 data)))
+                    )))
+
+              ;; at the end we always stay in that window as before the
+              ;; deactivation.
+              (when (integerp window-before-redraw)
+                (ecb-select-edit-window window-before-redraw))       
+              ;; if we were in an edit-window before deactivation let us go to
+              ;; the old place
+              (when pos-before-redraw
+                (goto-char pos-before-redraw)))
+          (error
+           ;; in case of an error we make all windows not dedicated and delete
+           ;; at least all other windows
+           (ecb-warning "ecb-deactivate-internal (error-type: %S, error-data: %S)"
+                        (car oops) (cdr oops))
+           (ignore-errors (ecb-make-windows-not-dedicated ecb-frame))
+           (ignore-errors (delete-other-windows))))
+        
+        (if (get 'ecb-frame 'ecb-new-frame-created)
+            (ignore-errors (delete-frame ecb-frame t))))
+        
+      (ecb-initialize-layout)
+
+      ;; we do NOT disable the permanent-advices of
+      ;; `ecb-permanent-adviced-layout-functions' unless the user don't want
+      ;; preserving the split-state after reactivating ECB.
+      (when (not (equal ecb-split-edit-window-after-start 'before-activation))
+        (ecb-disable-advices 'ecb-permanent-adviced-layout-functions t)
+        (ecb-edit-area-creators-init))
+
+      ;; we can safely do the kills because killing non existing buffers
+      ;; doesn“t matter. We kill these buffers because some customize-options
+      ;; takes only effect when deactivating/reactivating ECB, or to be more
+      ;; precise when creating the tree-buffers again.
+      (dolist (tb-elem ecb-tree-buffers)
+        (tree-buffer-destroy (car tb-elem)))
+      (ecb-tree-buffers-init)
+      
+      (setq ecb-activated-window-configuration nil)
+
+      (setq ecb-minor-mode nil)
+
+      ;; restoring the value of temporary modified vars
+      (ecb-modify-emacs-variable 'max-specpdl-size 'restore)
+      (ecb-modify-emacs-variable 'max-lisp-eval-depth 'restore)
+      (when (and ecb-running-xemacs
+                 (boundp 'progress-feedback-use-echo-area))
+        (ecb-modify-emacs-variable 'progress-feedback-use-echo-area 'restore))))
+      
+  
+  (if (null ecb-minor-mode)
+      (message "The ECB is now deactivated."))
+  ecb-minor-mode)
+
+;;;###autoload
+(defun ecb-minor-mode (&optional arg)
+  "Toggle ECB minor mode.
+With prefix argument ARG, turn on if positive, otherwise off. Return non-nil
+if the minor mode is enabled.
+
+\\{ecb-mode-map}"
+  (interactive "P")
+  (let ((new-state (if (null arg)
+                       (not ecb-minor-mode)
+                     (> (prefix-numeric-value arg) 0))))
+    (if new-state
+        (ecb-activate-internal)
+      (ecb-deactivate-internal)))
+  (if ecb-running-xemacs
+      (redraw-modeline t)
+    (force-mode-line-update t))
+  ecb-minor-mode)
+
+
+;; ECB byte-compilation
+
+(defun ecb-compile-file-if-necessary (file &optional force)
+  "Compile the ECB-file FILE if necessary. This is done if FORCE is not nil or
+FILE.el is newer than FILE.elc or if FILE.elc doesn't exist."
+  (let ((elc-file (concat (ecb-file-name-sans-extension file) ".elc")))
+    (if (or force
+	    (not (ecb-file-exists-p elc-file))
+	    (file-newer-than-file-p file elc-file))
+        (byte-compile-file file))))
+
+;;;###autoload
+(defun ecb-byte-compile (&optional force-all)
+  "Byte-compiles the ECB package.
+This is done for all lisp-files of ECB if FORCE-ALL is not nil or for each
+lisp-file FILE.el which is either newer than FILE.elc or if FILE.elc doesn't
+exist."
+  (interactive "P")
+  (ecb-check-requirements)
+  (let ((load-path
+	 (append (list (ecb-file-name-directory
+			(or (locate-library "semantic")
+			    (ecb-error "Semantic is not in the load-path!")))
+                       (ecb-file-name-directory
+			(or (locate-library "eieio")
+			    (ecb-error "Eieio is not in the load-path!")))
+                       (ecb-file-name-directory
+			(or (locate-library "speedbar")
+			    (ecb-error "Speedbar is not in the load-path!")))
+		       (ecb-file-name-directory (locate-library "ecb")))
+		 load-path))
+	(files (ecb-directory-files (ecb-file-name-directory (locate-library "ecb"))
+                                    t)))
+    (save-excursion
+      (dolist (file files)
+	(if (save-match-data
+              (and (string-match "\\(silentcomp\\|tree-buffer\\|ecb.*\\)\\.el$" file)
+                   (not (string-match "ecb-autoloads" file))))
+            (ecb-compile-file-if-necessary file force-all))))))
+
+(defun ecb-auto-activate-hook()
+  "If necessary, run `ecb-activate' when Emacs is started."
+  (when ecb-auto-activate
+    (ecb-activate)))
+
+(add-hook 'emacs-startup-hook 'ecb-auto-activate-hook)
+
+(silentcomp-defvar menu-bar-tools-menu)
+(condition-case oops
+    (progn
+      (require 'easymenu)
+      (easy-menu-add-item (if ecb-running-xemacs nil menu-bar-tools-menu)
+                          (if ecb-running-xemacs '("tools") nil)
+                          (ecb-menu-item
+                           [ "Start Code Browser (ECB)"
+                             ecb-activate
+                             :active t
+                             :help "Start the Emacs Code Browser."
+                             ]))
+      )
+  (error
+   (ecb-warning "Not critical error during adding menu-entry to Tools-menu (error-type: %S, error-data: %S)"
+                (car oops) (cdr oops))))
+
+
+;; some goodies for editing the ecb-elisp-code
+
+;; parsing of our ecb-macros
+
+(eval-after-load "semantic-el"
+  (condition-case oops
+      (when (fboundp 'semantic-elisp-setup-form-parser)
+        ;; defecb-multicache
+        (semantic-elisp-reuse-form-parser defvar defecb-multicache)
+        ;; defecb-advice-set
+        (semantic-elisp-reuse-form-parser defvar defecb-advice-set)        
+        ;; defecb-stealthy and tree-buffer-defpopup-command
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (symbol-name (nth 1 read-lobject)) nil nil
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 2 read-lobject))))
+          defecb-stealthy
+          tree-buffer-defpopup-command)
+        ;; defecb-tree-buffer-creator
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (symbol-name (nth 1 read-lobject)) nil nil
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 3 read-lobject))))
+          defecb-tree-buffer-creator
+          defecb-window-dedicator)
+        ;; defecb-advice
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (symbol-name (nth 1 read-lobject)) nil
+               (semantic-elisp-desymbolify
+                (list '**ecb-advice: (nth 2 read-lobject) (nth 3 read-lobject)))
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 4 read-lobject))))
+          defecb-advice)
+        ;; defecb-tree-buffer-callback
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (symbol-name (nth 1 read-lobject)) nil
+               (semantic-elisp-desymbolify
+                (append '(node ecb-button edit-window-nr shift-mode meta-mode)
+                        (nth 4 read-lobject)))
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 5 read-lobject))))
+          defecb-tree-buffer-callback)
+        ;; defecb-autocontrol/sync-function
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (symbol-name (nth 1 read-lobject)) nil
+               (semantic-elisp-desymbolify
+                (list '**autocontrol/sync_for_buffer: (nth 2 read-lobject)))
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 5 read-lobject))))
+          defecb-autocontrol/sync-function)
+        ;; ecb-layout-define
+        (semantic-elisp-setup-form-parser
+            (lambda (read-lobject start end)
+              (semantic-tag-new-function
+               (nth 1 read-lobject) nil
+               (semantic-elisp-desymbolify (list (nth 2 read-lobject)))
+               :user-visible-flag nil
+               :documentation (semantic-elisp-do-doc (nth 3 read-lobject))))
+          ecb-layout-define)
+        ;; when-ecb-running-... macros
+        (semantic-elisp-reuse-form-parser eval-and-compile
+                                          when-ecb-running-xemacs
+                                          when-ecb-running-emacs)
+        )
+    (error
+     (ecb-warning "Not critical error during supporting parsing the ecb-macros: (error-type: %S, error-data: %S)"
+                  (car oops) (cdr oops)))))
+
+;; highlighting of some ecb-keywords
+(condition-case oops
+    (progn
+      (defconst ecb-font-lock-keywords
+        (eval-when-compile
+          (let* (
+                 ;; Function declarations and exec-with-macros
+                 (variable-defs '(
+                                  "defecb-multicache"
+                                  "defecb-advice-set"
+                                  ))
+                 (function-defs '(
+                                  "defecb-stealthy"
+                                  "defecb-tree-buffer-creator"
+                                  "defecb-window-dedicator"
+                                  "defecb-advice"
+                                  "defecb-autocontrol/sync-function"
+                                  "defecb-tree-buffer-callback"
+                                  ))
+                 (plain-keywords '(
+                                   "ecb-exec-in-window"
+                                   "ecb-do-with-unfixed-ecb-buffers"
+                                   "ecb-do-with-fixed-ecb-buffers"
+                                   "ecb-with-original-adviced-function-set"
+                                   "ecb-with-original-permanent-layout-functions"
+                                   "ecb-with-dedicated-window"
+                                   "ecb-with-original-basic-functions"
+                                   "ecb-with-ecb-advice"
+                                   "ecb-with-readonly-buffer"
+                                   "ecb-do-if-buffer-visible-in-ecb-frame"
+                                   "ecb-when-point-in-edit-window-ecb-windows-visible"
+                                   "ecb-layout-define"
+                                   "when-ecb-running-xemacs"
+                                   "when-ecb-running-emacs"
+                                   "ecb-exit-on-input"
+                                   ))
+                 (v-regexp (regexp-opt variable-defs t))
+                 (f-regexp (regexp-opt function-defs t))
+                 (k-regexp (regexp-opt plain-keywords t))
+                 ;; Regexp depths
+                 (v-depth (regexp-opt-depth v-regexp))
+                 (f-depth (regexp-opt-depth f-regexp))
+                 (k-depth (regexp-opt-depth k-regexp))
+                 (full (concat
+                        ;; Declarative things: the whole parenthesis expr has always
+                        ;; number 1 ==> The paren-expression number for a keyword
+                        ;; contained in (append variable-defs function-defs
+                        ;; plain-keywords) is always 1
+                        "(\\(" v-regexp "\\|" f-regexp "\\|" k-regexp "\\)"
+                        ;; Whitespaces & name: The parenthesis expr for name has
+                        ;; always the number
+                        ;; (+ 1        -- the whole paren-expr for the declarative
+                        ;;                things
+                        ;;    v-depth  -- all paren-expressions of the variable-defs
+                        ;;    f-depth  -- all paren-expressions of the function-defs
+                        ;;    k-depth  -- all paren-expressions of the plain keywords
+                        ;;    1        -- The \\(\\sw+\\)?: This is the name in case
+                        ;;                of a variable- or function-def
+                        ;;  )
+                        ;; So variable, functions and keywords have the following
+                        ;; numbers:
+                        ;; - variable-match: Always 2 (The whole surrounding
+                        ;;   paren-expr + the surrounding paren-expr defined with
+                        ;;   regexp-opt for the variable-defs
+                        ;; - function-match: 1 (for the whole surrounding
+                        ;;   paren-expr) + v-depth (to jump over the paren-expr of
+                        ;;   the variable-defs + 1 (the surrounding paren-expr
+                        ;;   defined with regexp-opt for the function-defs
+                        "\\>[ \t]*\\(\\sw+\\)?"
+                        ))
+                 )
+            `((,full
+               (1 font-lock-keyword-face)
+               (,(+ 1 v-depth f-depth k-depth 1) ;; see explanation above
+                (cond ((match-beginning 2) ;; see explanation above
+                       font-lock-variable-name-face)
+                      ((match-beginning ,(+ 1 v-depth 1)) ;; see explanation above
+                       font-lock-function-name-face)
+                      (t nil))
+                nil t)))
+            ))
+        "Highlighted ecb keywords.")
+
+      (when (fboundp 'font-lock-add-keywords)
+        (font-lock-add-keywords 'emacs-lisp-mode
+                                ecb-font-lock-keywords)
+        ))
+  (error
+   (ecb-warning "Not critical error during supporting fontifying the ecb-macros: (error-type: %S, error-data: %S)"
+                (car oops) (cdr oops))))
+  
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Cause of the magic autostart stuff of
+;; the advice-package we must disable at load-time all these advices!!
+;; Otherwise would just loading ecb (not activating!) activate each advice
+;; AFTER the FIRST usage of our advices!!
+
+(dolist (adviced-set-elem ecb-adviced-function-sets)
+  (ecb-disable-advices (car adviced-set-elem) t))
+
+;; init the method- and file-browser at load-time
+(ecb-file-browser-initialize)
+(ecb-method-browser-initialize)
+
+(silentcomp-provide 'ecb)
+
+;;; ecb.el ends here
diff --git a/site/ecb-2.40/ecb.texi b/site/ecb-2.40/ecb.texi
new file mode 100644
index 0000000..01d5308
--- /dev/null
+++ b/site/ecb-2.40/ecb.texi
@@ -0,0 +1,15697 @@
+\input texinfo   @c -*-texinfo-*-
+
+@c Copyright (C) 2000 - 2009 Jesper Nordenberg,
+@c                           Klaus Berndl,
+@c                           Kevin A. Burton,
+@c                           Free Software Foundation, Inc.
+
+@c Author: Klaus Berndl <klaus.berndl@sdm.de>
+@c Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+@c Keywords: browser, code, programming, tools
+@c Created: 2001
+
+@c This program is free software; you can redistribute it and/or modify it under
+@c the terms of the GNU General Public License as published by the Free Software
+@c Foundation; either version 2, or (at your option) any later version.
+
+@c This program is distributed in the hope that it will be useful, but WITHOUT
+@c ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+@c FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+@c details.
+
+@c You should have received a copy of the GNU General Public License along with
+@c GNU Emacs; see the file COPYING.  If not, write to the Free Software
+@c Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+@c $Id: ecb.texi,v 1.226 2009/05/16 13:24:19 berndl Exp $
+
+@setfilename ecb.info
+
+@settitle ECB - the Emacs Code Browser
+
+@c If we want only one index for concepts, functions and variables
+@c @syncodeindex vr cp
+@c @syncodeindex fn cp
+
+@c in info we do not want paragraph indenting
+@ifinfo
+@paragraphindent 0
+@end ifinfo
+
+@exampleindent   3
+
+@footnotestyle end
+
+@c The version number is auto-frobbed from the Makefile, so you should
+@c edit the Makefile to change the version number. mechanism stolen
+@c from Tramp
+@macro ecbver{}
+2.40
+@end macro
+
+
+@dircategory GNU Emacs Lisp
+@direntry
+* ECB: (ecb).           Emacs Code Browser
+@end direntry
+
+@titlepage
+@sp 10
+@center @titlefont{ECB version @ecbver{} - User manual}
+@vskip 0pt plus 1 fill
+Copyright @copyright{} 2000 - 2009 Jesper Nordenberg, Klaus Berndl
+@end titlepage
+
+@node Top, Install and first steps, (dir), (dir)
+@comment  node-name,  next,  previous,  up
+
+@ifnottex
+This is the user manual for ECB version @ecbver{}.
+@end ifnottex
+
+ECB stands for "Emacs Code Browser". While (X)Emacs already has good
+@strong{editing} support for many modes, its @strong{browsing} support
+is somewhat lacking. That's where ECB comes in: it displays a number
+of informational windows that allow for easy source code navigation
+and overview.
+
+The informational windows can contain:
+
+@itemize @bullet
+@item A directory tree,
+@item a list of source files in the current directory
+(with full support and display of the VC-state),
+@item a list of functions/classes/methods/... in the current file,
+(ECB uses the CEDET-Semantic, or Imenu, or etags, for getting this
+list so all languages supported by any of these tools are
+automatically supported by ECB too)
+@item a history of recently visited files
+(groupable by several criterias),
+@item helpful informations and possible completions according to the current
+context which is computed by the semantic-analyzer for some sort of
+intellisense,
+@item the Speedbar and
+@item output from compilation (the "*compilation*" window) and other
+modes like help, grep etc. or whatever a user defines to be displayed
+in this window.
+@end itemize
+
+As an added bonus, ECB makes sure to keep these informational windows
+visible, even when you use @kbd{C-x 1} and similar commands.
+
+It goes without saying that you can configure the layout, ie which
+informational windows should be displayed where. ECB comes with a
+number of ready-made window layouts to choose from.
+
+@iftex
+@sp 1
+@end iftex
+
+@strong{Please note}: Experienced ECB users find a complete
+alphabetical list of all commands and user-options in @ref{Interactive
+ECB commands} and @ref{Customizable options}.
+
+@c In the following two paragraphs we distinct between HTML-, info-,
+@c and tex-format concerning the display of the URLs.
+@ifinfo
+The latest version of ECB can always be found at the URL
+@url{http://ecb.sourceforge.net}.
+
+To send bug reports, or participate in discussions about ECB, use the
+mailing list @email{ecb-list@@lists.sourceforge.net} via the URL
+@url{http://lists.sourceforge.net/lists/listinfo/ecb-list}.
+
+@end ifinfo
+
+@iftex
+@sp 1
+
+The latest version of ECB can always be found at the URL @*
+@url{http://ecb.sourceforge.net}.
+
+@sp 1
+
+To send bug reports, or participate in discussions about ECB, use the
+mailing list @*@email{ecb-list@@lists.sourceforge.net} via the URL @*
+@url{http://lists.sourceforge.net/lists/listinfo/ecb-list}.
+@end iftex
+
+@ifhtml
+The latest version of ECB can always be found at 
+@uref{http://ecb.sourceforge.net}
+
+To send bug reports, or participate in discussions about ECB, use the
+mailing list @email{ecb-list@@lists.sourceforge.net} via 
+@uref{http://lists.sourceforge.net/lists/listinfo/ecb-list}
+@end ifhtml
+
+@strong{IMPORTANT}: Cause of extra appearance of SPAM in the
+mailing-lists, SourceForge has changed its policy: Now it is only
+possible to post to the mailing-list for users who have subscribed
+this mailing-list. So please be aware you will not be able to send
+comments, bug reports and improvement suggestions before you have
+subscribed the ECB-mailing-list. See the section "Mailing-list" at the
+ECB-website at
+@ifhtml
+@uref{http://ecb.sourceforge.net}
+@end ifhtml
+@ifnothtml
+@url{http://ecb.sourceforge.net}
+@end ifnothtml
+how to do this.
+
+@menu
+* Install and first steps::     Installing ECB and first steps
+* Overview::                    Compact introducing of basic concepts
+* Manual usage::                How to use this manual
+* ECB-windows::                 Description of all ECB-windows of ECB
+* Activation and Deactivation:: How to start and end ECB
+* Usage of ECB::                How to use ECB
+* Customizing::                 How to customize ECB
+* Submitting problem report::   What to do when problems occur
+* Upgrading::                   Upgrading and downloading packages
+* Common use-cases::             Useful hints and tips
+* Elisp programming::           Entry points for Elisp programmers
+* Conflicts and bugs::          Known Conflicts with other packages and bugs
+* FAQ::                         Frequently asked questions
+* Command Index::               Index for interactive commands
+* Option Index::                Index for user options
+* Concept Index::               Index for concepts and terms
+@comment * Index::
+
+@detailmenu
+ --- The Detailed Node Listing ---
+
+Installation and first steps of ECB
+
+* Installation::                Installation of ECB
+* Setting up Emacs::            How to set up Emacs for file parsing with ECB
+* First steps::                 First steps after activating ECB first time
+
+Installation of ECB
+
+* Requirements::                Requirements for ECB
+* ECB as XEmacs-package::       Installation of ECB as a XEmacs-package
+* Standard ECB-Installation::   Standard installation of ECB for (X)Emacs
+
+How to set up Emacs for file parsing with ECB
+
+* General hints::               General hints for a correct setup
+* Setting up CEDET/semantic::   How to setup semantic correctly
+* Non-semantic files::          Setup for file types not supported by semantic
+
+All ECB-windows of ECB
+
+* Basic ECB-windows::           Description of the basic ECB-windows
+* Add-on ECB-windows::          Description of additional ECB-windows
+
+The basic ECB-windows of ECB
+
+* Tree-buffer basics::          General introduction into tree-buffers
+* Tree-buffer styles::          Displaying the trees with different styles
+* ECB Directories-window::      Contents of the ECB Directories-window
+* ECB Sources-window::          Contents of the ECB Sources-window
+* ECB Methods-window::          Contents of the ECB Methods-window
+* ECB History-window::          Contents of the ECB History-window
+
+Displaying the trees with different styles
+
+* Style basics::                Basic knowledge about the styles
+* Ascii-based styles::          How to customize the ascii-styles
+* Tree-buffers with images::    Which images are used for the tree
+* Images for Methods-buffer::   Images for the tags in the Methods-buffer
+
+Add-on ECB-windows of ECB
+
+* Semantic analyser::           Analyses and displays semantic context
+* Symboldefinition::            Displays definition of current symbol
+
+Activation and Deactivation
+
+* Standard activation::         How to manually (de)activate ECB
+* Automatic activation::        Automatically (de)activating ECB
+
+Usage of ECB
+
+* Using the mouse::             Working with the mouse
+* Using the keyboard::          Working with the keyboard
+* The edit-area::               How to use the edit-area
+* Temp- and compile-buffers::   Displaying temp- and compilation-buffers
+* The other window::            How the ``other window'' is determined
+* The Methods buffer::          Using and customizing the Methods-buffer
+* Filtering the tree-buffers::  Applying filters to the ECB-tree-buffers 
+* The ECB-layout::              Changing, customizing, redrawing, creating
+* Hiding the ECB windows::      Hiding/Showing the ECB-windows
+* Maximizing the ECB windows::  Maximizing the ECB-windows
+* Back/forward navigation::     Back- and forward navigation like a browser
+* ECB-window synchronizing::    Auto./manual synchronizing the ECB-windows
+* Stealthy background tasks::   Stealthy background-tasks of ECB
+* Interactive ECB commands::    All interactive user-commands of ECB
+
+Working with the keyboard in the ECB-windows
+
+* Navigation/Selection::        Keyboard navigation/selection in a tree-buffer
+* Incremental search::          Find nodes as fast as possible
+* Personal tree-keybindings::   Adding personal keybindings to a tree-buffer
+* Using popup-menus::           Using the popup-menus from keyboard.
+
+Using and customizing the ECB-Methods buffer
+
+* Visiting tags::               Possible actions after visiting a tag
+* Expanding::                   Explicit and automatic expanding
+* Customizing the display::     How to customize the Methods-buffer display
+* Rebuilding the Methods::      When to rebuild the Methods-buffer      
+
+Applying filters to the special ECB-tree-buffers
+
+* Filtering Directories::       Applying filters to the Directories-buffer
+* Filtering Sources::           Applying filters to the Sources--buffer
+* Filtering History::           Applying filters to the History-buffer
+* Filtering Methods::           Applying filters to the Methods-buffer
+
+Changing, customizing, redrawing and creating layouts
+
+* Changing the ECB-layout::     How to change and customize the layout
+* Redrawing the ECB-layout::    How and when redrawing the layout
+* Changing window sizes::       Changing sizes of the ECB-windows
+* Fixing window sizes::         Fixing sizes of the ECB-windows
+* Creating a new ECB-layout::   Interactively creating new layouts
+
+Synchronization of the ECB-windows
+
+* General synchronization aspects::       General synchronization aspects
+* Synchronization of basic ECB-windows::  Synchronization of basic ECB-windows
+* Add-on synchronization::                Synchronization of add-on ECB-windows
+
+Customizing ECB
+
+* General aspects::             General aspects for customizing ECB
+* Most important options::      Which option you must know
+* Customizable options::        All customizable options of ECB
+
+General aspects for customizing ECB
+
+* setq or customize::           Should i use setq or customize?
+* Site-wide customizing::       Site-wide customizing of ECB
+
+All customizable options of ECB
+
+* ecb-general::                 General customizing ECB
+* ecb-tree-buffer::             Customizing the general tree layout
+* ecb-directories::             Customizing the ECB-directories-tree
+* ecb-sources::                 Customizing the ECB-sources-window
+* ecb-methods::                 Customizing the ECB-methods-window
+* ecb-history::                 Customizing the ECB-history-window
+* ecb-analyse::                 Customizing the ECB-analyse-window
+* ecb-layout::                  Customizing the ECB-layout
+* ecb-compilation::             Customizing the compile-window
+* ecb-create-layout::           Customizing options for creating layouts
+* ecb-face-options::            Customizing options for faces
+* ecb-faces::                   Customizing the faces
+* ecb-help::                    Customizing the online help of ECB
+* ecb-eshell::                  Customizing the eshell-integration
+* ecb-speedbar::                Customizing the speedbar-integration
+* ecb-non-semantic::            Customizing parsing non-semantic sources
+* ecb-winman::                  Customizing window-manager support
+* ecb-mode-line::               Customizing the tree-buffer-modelines
+* ecb-version-control::         Customizing the version-control-support
+
+Upgrading and downloading packages
+
+* Downloading new versions::    How to download newer versions of packages
+* Auto. option-upgrading::      ECB can auto. upgrade your options
+
+Automatic upgrading of options
+
+* User interface::              Options and commands you should know
+* Background information::      Maybe some interesting informations
+
+Handling of common use-cases
+
+* Changing faces::              Changing faces in the ECB tree-buffers
+* Small screens::               Working with small screens
+* Big screens::                 Working with big screens
+* Simulating speedbar::         Simulating speedbar without an extra frame
+* Integrating speedbar::        Integrating speedbar in the ECB-frame
+* Large directories::           Working with large directories
+* Remote directories::          Working with remote directories
+* Version-control support::     Supporting Version control systems
+* Using eshell::                Optimal using of eshell in ECB
+* Grepping directories::        Grepping directories with ECB
+* Working with JDEE::           Working best with ECB and JDEE
+* Compile-window on demand::    Displaying the compile-window on demand
+* Non-semantic sources::        Parsing and displaying non-semantic sources
+* Hide-show::                   Using hide-show from the methods-buffer-menu
+* Window-managers and ECB::     Support of several Emacs-window-managers
+
+Supporting Version control systems
+
+* Identifying backends::        How ECB identifies the VC-backend of a dir
+* Checking the state::          How ECB checks the VC-state of a file
+* Remote repositories::         What you should know about this
+* Refreshing the VC-state::     How to refresh when state changed outside
+* Adding new backends::         Necessary steps for adding new backends
+* Known VC-problems::           Currently known problems of the VC-support
+
+Entry points for Elisp programmers
+
+* List of variables::           Which variables an Elisp-program can use
+* List of hooks::               All available hooks
+* tree-buffer::                 Full description of the tree-buffer-library
+* Adviced functions::           How to deal with the adviced functions
+* The layout-engine::           Programming new layouts and special windows
+
+The library tree-buffer.el
+
+* Introduction::                General description of tree-buffers
+* A new tree-buffer::           How to create a new tree-buffer
+* A new tree-node::             How to add new tree-nodes to a tree-buffer
+* Updating a tree-buffer::      How to update a tree-buffer after changes
+* Tree-buffer keybindings::     Default and customizable keybindings
+* The tree-buffer-API::         All functions for tree-buffers and -nodes
+* Do not with tree-buffer::     Things which are strictly forbidden
+* Tree-buffer How to::          Dealing with special situations
+
+How to program new layouts and new special windows
+
+* Programming a new layout::    How to program a new layout
+* Programming special windows:: Aspects of programming special windows
+* Possible layout-outlines::    The wide range of possible layouts
+* The layout-engine API::       The complete layout-engine API
+
+Conflicts and bugs of ECB
+
+* Conflicts::                   Conflicts with other packages
+* Bugs::                        Known bugs
+
+@end detailmenu
+@end menu
+
+@node Install and first steps, Overview, Top, Top
+@chapter Installation and first steps of ECB
+
+This chapter describes how to install ECB and setup (X)Emacs correctly
+and what are the first steps after activation of ECB.
+
+@menu
+* Installation::                Installation of ECB
+* Setting up Emacs::            How to set up Emacs for file parsing with ECB
+* First steps::                 First steps after activating ECB first time
+@end menu
+
+@node Installation, Setting up Emacs, Install and first steps, Install and first steps
+@section Installation of ECB
+
+This section describes how to install ECB.
+
+@menu
+* Requirements::                Requirements for ECB
+* ECB as XEmacs-package::       Installation of ECB as a XEmacs-package
+* Standard ECB-Installation::   Standard installation of ECB for (X)Emacs
+@end menu
+
+@node Requirements, ECB as XEmacs-package, Installation, Installation
+@subsection Requirements
+
+This section describes the requirements of ECB. Just follow these steps and
+the requirements of ECB are fulfilled.
+
+@enumerate
+
+@item Emacs-version:
+ECB works only with (X)Emacs >= 21! If you have an older one, please upgrade.
+
+@item Install CEDET-suite:
+Get it from @url{http://cedet.sourceforge.net}, read the setup-instructions in
+@url{http://cedet.sourceforge.net/setup.shtml} and read also the shipped file
+@file{INSTALL}.
+
+@strong{Please note}: ECB requires now a complete CEDET-installation! It will
+not longer work with outdated separate packages semantic 1.4.X, eieio 0.X and
+speedbar 0.X!
+
+@item Only for XEmacs-users:
+If you use XEmacs you must have installed the
+package c-support (contains hideshow.el). If you want to read the online-help
+of ECB in HTML-format you must have the library browse-url (part of the
+mail-lib XEmacs package) installed; this package is also needed for submitting
+problem-reports to the ECB-maintainers!
+
+@item Optional for Java-coding:
+If Java code is edited the ECB works best when the JDEE package (
+@url{http://jdee.sourceforge.net}) is installed.
+
+@end enumerate
+
+Do not install ECB before you have successfully installed the requirements!
+
+@node ECB as XEmacs-package, Standard ECB-Installation, Requirements, Installation
+@subsection Installation of ECB as a XEmacs-package
+
+This section is only relevant for XEmacs-users!
+
+In previous versions of ECB XEmacs-users could use the
+package-management-system of XEmacs for first-time downloading/installing ECB
+or for upgrading to a newer version of ECB.
+
+Beginning with version 2.33 ECB does no longer support the old versions of
+semantic, eieio and speedbar not part of the CEDET-suite. ECB >= 2.33 requires
+fully installed CEDET-suite with version >= 1.0pre6. This one is not available as
+XEmacs-package. Therefore ECB can also not be run as XEmacs-package. If cedet
+will become a XEmacs-package then probably ECB will come back as
+XEmacs-package. But in the meanwhile you have to install ECB ``by hand'' as
+described in the next section (@pxref{Standard ECB-Installation}).
+
+@c @strong{Recommendation}: If you are able to manually install ECB and its
+@c requirements as described in @ref{Standard ECB-Installation} then go on and
+@c proceed with that (you will see, it's easy). You will get a much more powerful
+@c ECB and also CEDET/semantic.
+@c  
+@c If you are desperate to use the package-management-system of ECB for
+@c installing ECB, then here is a short guide (for details about the
+@c package-manager of XEmacs see the related info-manual):
+@c  
+@c @strong{Caution}: If ECB is already installed and you just want
+@c upgrading to a newer version then it is recommended to deactivate ECB
+@c before proceeding with the steps below!
+@c  
+@c @enumerate
+@c @item Choose a download-site
+@c  
+@c This can be done via the menu ``Tools --> Packages --> Add Download
+@c Site'': Choose one of the listed sites. Or you can customize the
+@c option @code{package-get-remote} by hand and save it for future
+@c sessions.
+@c  
+@c @item Activate the packages list
+@c  
+@c This can be done either by the menu ``Tools --> Packages --> List and
+@c Install'' or via the command @code{pui-list-packages}. After that a
+@c special packages-buffer is displayed where you can interactively
+@c install or upgrade packages. At the end of this buffer there is a
+@c short description how to use this buffer.
+@c  
+@c @item Install ECB and all required packages
+@c  
+@c Mark the package named ``ecb'' for install. Do this also for the
+@c required packages ``semantic'', ``eieio'' and ``speedbar''. The
+@c package ``mail-lib'' is needed for easy submitting of problem-reports
+@c to the ECB-maintainers and the package ``c-support'' is needed for
+@c easy using hideshow within the Methods-buffer of ECB@footnote{All
+@c required packages can simply autom. marked by hitting @kbd{r} in the
+@c packages buffer. But this installs a lot of packages more (e.g. the
+@c Newsreader Gnus) which are really not essential for ECB. Therefore it
+@c is recommended to mark the required packages by hand.}.
+@c  
+@c After marking all needed packages for installation hit @kbd{x} to
+@c install them.
+@c  
+@c If you have already installed ECB and you want just upgrading to the
+@c latest available version then proceed as described above - same if you
+@c want to upgrade one of the required packages.
+@c  
+@c @item Start ECB
+@c  
+@c Now you can immediately start ECB via the command @code{ecb-activate};
+@c there is no need to restart XEmacs! As an alternative you can first
+@c read the online-help via @code{ecb-show-help}.
+@c  
+@c @end enumerate
+@c  
+@c If you do not like the package-manager of XEmacs but you want
+@c installing ECB ``by hand'' direct from the ECB-website then you have
+@c to follow the instructions in @ref{Standard ECB-Installation}.
+
+@node Standard ECB-Installation,  , ECB as XEmacs-package, Installation
+@subsection Standard installation of ECB for (X)Emacs
+
+Follow exatly these steps to install ECB:
+
+@enumerate
+
+@item
+Fulfill all requirements ECB needs (@pxref{Requirements})
+
+ECB performs two autom checks:
+
+@itemize @minus
+@item At load-time:
+It checks if cedet is at least installed so ECB can be loaded. If not it
+reports an error.
+
+@item At start-time:
+It checks if the correct versions of cedet and semantic are installed and
+gives you proper feedback.
+@end itemize
+
+So if you are not sure if you have installed the required packages at
+all or if you have installed the correct versions of these packages
+then do not worry about this, just go on with the following
+installation steps: If ECB is missing something it will give you
+proper feedback and support not later than at load-time or start-time!
+
+@item
+Download and unpack the ECB archive (probably you have already done
+this :-)
+
+@item
+Add the new ECB-directory to your @code{load-path} variable.
+
+You @strong{MUST} add the ECB-install-directory to the @code{load-path} either
+by changing the @code{load-path} variable directly in your @file{.emacs} or
+@file{site-lisp/site-start.el} or by working with a file
+@file{subdirs.el}@footnote{This works at least for Emacs but XEmacs may have
+slightly different mechanisms; see the XEmacs documentation}.
+
+So for example the needed entry for your @file{.emacs}-file could be:
+
+@example
+(add-to-list 'load-path
+             "/path/to/your/ecb/installation/directory")
+@end example
+
+@strong{ATTENTION}:
+ECB is NOT properly installed if it's directory is not added to
+@code{load-path} and for example just loaded by
+
+@example
+(load-file "/path/to/ecb/ecb.el")
+@end example
+
+Do not do this! It will not work!
+
+@item
+Load ECB by adding code to your @file{.emacs}:
+
+If you want to load the complete ECB at (X)Emacs-loadtime (Advantage:
+All ECB-options available after loading ECB. Disadvantage: Increasing
+loadtime@footnote{Cause of full loading of ECB itself and also the
+packages semantic, eieio and speedbar regardless if ECB is started.}):
+
+@example
+(require 'ecb)
+@end example
+
+If you want to load the ECB first after starting it by
+@code{ecb-activate} (Advantage: Fast loading@footnote{ECB, semantic,
+eieio and speedbar are first loaded after starting ECB or with other
+words: ECB and semantic are not loaded if you do not use/need them}.
+Disadvantage: ECB- and semantic-options first available after starting
+ECB):
+
+@example
+(require 'ecb-autoloads)
+@end example
+
+This loads all available autoloads of ECB, e.g. @code{ecb-activate},
+@code{ecb-minor-mode}, @code{ecb-byte-compile} and
+@code{ecb-show-help}.
+
+Regardless which method you prefer: In both cases the used statement
+must be placed @strong{after} the statement of step 3!
+
+
+@item Restart (X)Emacs.
+@end enumerate
+
+ECB is now ready for use and can be activated by calling @code{M-x
+ecb-activate} or @code{ecb-minor-mode}. Now you can either starting
+using ECB or you can do these optional installation steps:
+
+@enumerate 6
+
+@item Reading the online help with @code{ecb-show-help}
+
+Maybe you are interested to read the online-help of ECB before first
+start.
+
+@item Bytecompiling ECB with @code{ecb-byte-compile}
+
+This byte compiles ECB. You can safely ignore all messages if there
+are any. (You can also bytecompile ECB from the command-line either by
+using the @file{Makefile} or by using the batch-file @file{make.bat};
+just read the comments in that file you choose.)
+
+@item Installing the Info-help of ECB
+
+The ECB distribution contains a subdirectory @file{info-help} which
+contains the online-help of ECB in Info-format. You can install this
+online help so it's available in the Top-directory of Info. There are
+two ways to do this:
+
+@itemize @minus
+@item Use ``install-info'' (recommended):
+
+@enumerate
+@item
+Copy the files of the subdirectory @file{info-help} into the
+info-directory of Emacs
+
+@item
+Install the file @file{info-help/ecb.info} with the command
+``install-info'' (if available on your system) in the @file{dir}-file.
+@end enumerate
+
+The supplied @file{Makefile} offers a target @code{install-help} which
+does both of these steps. You have just to call @code{make
+install-help} with the correct EMACSINFOPATH set (see the comment in
+@file{Makefile}). Here is an example:
+
+@example
+make EMACSINFOPATH=/path/to/emacs/info install-help
+@end example
+
+@item Manual Installation:
+
+Copy the files of the subdirectory @file{info-help} into the
+info-directory of Emacs and modify the file @file{dir} manually.
+@end itemize
+
+But it doesn't matter if you do not execute this step (8.) because the
+online help of ECB is always available though, see
+@code{ecb-show-help} (@pxref{Interactive ECB commands}).
+
+@end enumerate
+
+@node Setting up Emacs, First steps, Installation, Install and first steps
+@section How to set up Emacs for file parsing with ECB
+
+@strong{Please note}: Normally it should not necessary for you to
+bother with the following stuff unless you have problems getting ECB
+working correctly for you.
+
+@menu
+* General hints::               General hints for a correct setup
+* Setting up CEDET/semantic::   How to setup semantic correctly
+* Non-semantic files::          Setup for file types not supported by semantic
+@end menu
+
+@node General hints, Setting up CEDET/semantic, Setting up Emacs, Setting up Emacs
+@subsection General hints for a correct setup
+
+ECB is for browsing files and therefore you have to setup your
+Emacs-configuration properly so the file-parsing engines like semantic, imenu
+or etags can be activated automatically for parsing your Emacs-Lisp, C, C++ or
+Java buffers@footnote{semantic supports some more ``languages'' like Phython,
+Makefiles and some more. But these are the most important ones.}. For this
+Emacs must activate the correct @code{major-mode} for the source-files and
+Emacs can only do this if the option @code{auto-mode-alist} is setup
+correctly. The correct major-modes and possible
+file-extensions@footnote{Especially for C++ and C you can use any extension
+you want but these are the most common ones!} are:
+
+@multitable @columnfractions 0.20 0.50 0.30
+
+@item
+@ifnotinfo
+@strong{Language}
+@end ifnotinfo
+@ifinfo
+LANGUAGE
+@end ifinfo
+@tab
+@ifnotinfo
+@strong{Major-mode}
+@end ifnotinfo
+@ifinfo
+MAJOR-MODE
+@end ifinfo
+@tab
+@ifnotinfo
+@strong{Extension(s)}
+@end ifnotinfo
+@ifinfo
+EXTENSION(S)
+@end ifinfo
+
+@item Emacs Lisp @tab @code{emacs-lisp-mode} @tab .el
+
+@item C @tab @code{c-mode} @tab .h, .c
+
+@item C++ @tab @code{c++-mode} @tab .h, .hxx, .hh, .HH, .cxx, .cpp,
+.cc, .CC
+
+@item Java @tab @code{java-mode} or @code{jde-mode} (if you use JDEE)
+@tab .java
+@end multitable
+
+Example: If you want files with extension ``.cpp'' being c++-parsed by
+semantic and ECB, your @code{auto-mode-alist} must contain an entry
+like:
+
+@example
+("\\.cpp\\'" . c++-mode)
+@end example
+
+After this ECB will correctly parse your ``.cpp''-sources and display
+all the parsing information in the ECB-methods buffer.
+
+@node Setting up CEDET/semantic, Non-semantic files, General hints, Setting up Emacs
+@subsection Setting up CEDET/semantic
+
+To ensure ECB and semantic are working correctly for all by semantic
+supported languages you have to pay attention to the following aspects
+concerning your Emacs-setup:
+
+@enumerate
+@item Setting up CEDET/semantic itself
+
+This section implies that you have already successfully installed
+the CEDET-suite and describes how to setup cedet and here mainly
+semantic.
+
+For all semantic-supported file-types parsing files is done completely
+by semantic. ECB just displays the parsing results. For all needs of
+ECB semantic is completely setup by ECB itself, i.e. ECB sets up
+semantic for you!
+
+@strong{Please note}: Nevertheless you should read carefully the file
+@file{INSTALL} shipped with the cedet-suite. In addition the CEDET-website
+offers a link to a ``Gentle introduction to Cedet''. It's worth to read it!
+You find it here:
+@ifhtml
+@uref{http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html}
+@end ifhtml
+@ifnothtml
+@url{http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html}
+@end ifnothtml
+If CEDET is not correctly installed then ECB can not setup semantic for its
+needs.
+
+@strong{Minimum setup recommendation}: It is very useful to enable the
+@code{global-semantic-idle-scheduler-mode} and
+@code{global-semanticdb-minor-mode}. Read the manual of cedet/semantic how to
+do this. With CEDET-versions >= 1.0pre6 this can be done by adding
+@code{semantic-load-enable-minimum-features} to your startup-file. Please read
+also the subsection ``Jumping to the definition of external types'' in
+@ref{ECB Methods-window}.
+
+@anchor{Checking your hooks}
+@item Checking your hooks
+
+If you have already checked point (1.) and if you have still problems
+getting ECB/semantic working properly for your sources you should
+check the related major-mode hook. Every major-mode X has a hook with
+name ``X-hook'' which is evaluated after activating the major-mode
+(see above, 2.), e.g. the hook for the major-mode @code{c++-mode} is
+@code{c++-mode-hook}.
+
+Semantic adds automatically during load-time a special
+``semantic-setup'' to these major-mode hooks@footnote{Of course only
+for major-modes supported by semantic!} in form of a
+``setup-function''. Example: For c and c++ modes semantic adds
+@code{semantic-default-c-setup} to @code{c-mode-hook} and
+@code{c++-mode-hook}.
+
+If your own Emacs-setup (e.g. in @file{.emacs} or
+@file{site-lisp/site-start.el}) overwrites such a major-mode-hook then
+semantic can not be activated for this major-mode and in consequence
+ECB can not work properly too!
+
+Check if your Emacs-setup uses somewhere @code{setq} for adding code
+to a major-mode-hook. @strong{IMPORTANT}: Use @code{add-hook} instead of
+@code{setq}@footnote{@code{setq} replaces/overwrites the current
+value of a hook with the new value whereas @code{add-hook}
+@strong{adds} the new value to the old-value of the hook!}!
+
+@end enumerate
+
+If your source-files are ``running'' with correct @code{major-mode}
+and correct major-mode hooks ECB and semantic will do what you expect
+them doing!
+
+@node Non-semantic files, , Setting up CEDET/semantic, Setting up Emacs
+@subsection Setup for file types not supported by semantic
+
+From version 1.94 on ECB supports also parsing and displaying
+file-contents for file-types not supported by semantic (i.e. there is
+no semantic-grammar available for such file-types).
+
+Such non-semantic file-types can often be parsed by imenu and/or
+etags. Both of these parsing methods are now supported: ECB can
+display the results of imenu and/or etags in its Method-buffer. ECB
+uses for this speedbar-logic. Therefore the following speedbar options
+takes effect for this feature:
+
+@itemize @minus
+@item @code{speedbar-dynamic-tags-function-list}
+@item @code{speedbar-tag-split-minimum-length}
+@item @code{speedbar-tag-regroup-maximum-length}
+@item @code{speedbar-tag-hierarchy-method}
+@end itemize
+
+Normally there should be no need for you to bother with these options,
+because the default values are suitable for most situations! But if
+you are not satisfied with the parsing/display results then you can
+change some of these options.
+
+@node First steps, , Setting up Emacs, Install and first steps
+@section First steps after activating ECB first time
+
+This section of the ECB online-help is displayed automatically by ECB
+after activating ECB first time and describes what are the first basic
+steps:
+
+@enumerate
+
+@item Configure where ECB can find your sources:
+
+Call @code{M-x customize-option RET ecb-source-path RET}@footnote{This
+means first hitting the keys @kbd{M} (Meta- or Alt-key) and @kbd{x}
+simultaneously, inserting ``customize-option'' in the minibuffer,
+hitting RETURN, inserting ``ecb-source-path'' in the minibuffer and
+finally hitting RETURN again}. This lets you customize the option
+@code{ecb-source-path} with the customize-feature of Emacs. This opens
+a customize-buffer where you can insert all the directories where ECB
+can find your source-files. Save your changes with the button ``Save
+for future sessions'' and then throw away this customize-buffer either
+by killing it with @code{M-x kill-buffer} or clicking at the button
+``Finish''.
+
+@item Take a look at the most important options of ECB
+Call @code{M-x ecb-customize-most-important RET} and see a list of
+options which you should at least know that these options exist.
+
+@item Read the online-help of ECB:
+
+The online-help of ECB is available via
+
+@itemize @minus
+@item calling @code{M-x ecb-show-help},
+@item pressing @kbd{C-c . h} or
+@item using the menu ``ECB''.
+@end itemize
+
+(The section you are currently reading is part of the online-help of
+ECB)
+
+The chapter ``Common use-cases'' is also very interesting!
+
+@item Start working with ECB.
+@end enumerate
+
+@node Overview, Manual usage, Install and first steps, Top
+@chapter Overview
+
+@cindex tree-buffer
+@cindex ECB-windows
+ECB is a global minor-mode which offers a couple of @dfn{ECB-windows}
+for browsing your sources comfortable with the mouse and the keyboard.
+
+ECB offers some basic ECB-windows to browse your sources:
+@itemize @minus
+@item ECB-Directories for browsing directories
+@item ECB-Sources for browsing source-files and a file-history
+@item ECB-Methods for browsing the contents of a source
+@end itemize
+
+See @ref{Basic ECB-windows} for a detailled description what these
+basic ECB-windows offer. See @ref{ECB-windows} for a general
+introduction in the ECB-window-concept of ECB.
+
+In addition to these ``special'' ECB-windows you have always an
+@dfn{edit-area} where you can edit your source-files. The edit-area
+can be divided into several @dfn{edit-windows} - as many as you need
+(@pxref{The edit-area}). And at the bottom of the ECB-frame a persistent
+@dfn{compilation-window} (also called @dfn{compile-window}) can be
+displayed (optional), where all the output of Emacs-compilation
+(compile, grep etc.) is shown (@pxref{Temp- and compile-buffers}).
+
+The following ``screenshot'' illustrates the typical layout of the
+ECB-frame@footnote{This is only one example of the layouts ECB offers,
+see @ref{Changing the ECB-layout}}:
+
+@example
+@group
+------------------------------------------------------------------
+|              |                                                 |
+|  Directories |                                                 |
+|              |                                                 |
+|--------------|                                                 |
+|              |                                                 |
+|  Sources     |                                                 |
+|              |                                                 |
+|--------------|                   Edit-area                     |
+|              |   (can be splitted in several edit-windows)     |
+|  Methods     |                                                 |
+|              |                                                 |
+|--------------|                                                 |
+|              |                                                 |
+|  History     |                                                 |
+|              |                                                 |
+------------------------------------------------------------------
+|                                                                |
+|            Persistent Compilation-window (optional)            |
+|                                                                |
+------------------------------------------------------------------
+@end group
+@end example
+
+@node Manual usage, ECB-windows, Overview, Top
+@chapter How to use this manual
+
+@strong{IMPORTANT}: You should have read the chapter @ref{Overview}
+before going on reading the current chapter.
+
+This chapter describes shortly the contents of the following chapters
+of this manual so maybe you can find faster what you are searching
+for.
+
+@table @asis
+
+@item All ECB-windows of ECB (@pxref{ECB-windows})
+Gives an introduction into the concept of ECB-windows of ECB, what
+they are, which different types exist, how they look, how they can be
+used and last but not least what they do in detail, i.e. explains
+every ECB-window of ECB in detail.
+
+@item Activation and Deactivation (@pxref{Activation and Deactivation})
+Describes how to activate and deactivate ECB and which different types
+of activation are possible.
+
+@item Usage of ECB (@pxref{Usage of ECB})
+Describes in detail how to use ECB with mouse and keyboard, explains
+the concept of the edit-area and the persistent compile-window,
+describe how to change the window-layout and hide and show special
+windows, which stealthy background-tasks ECB performs and so on...
+
+@item Customizing ECB (@pxref{Customizing})
+Gives an overview of the most important options of ECB and tell you
+something about do's and don'ts concerning customization of ECB. Lists
+all options of ECB and describe exactly the purpose of them.
+
+@item Submitting a problem report (@pxref{Submitting problem report})
+Instructions what to do if you encounters problems with ECB.
+
+@item Upgrading and downloading ECB (@pxref{Upgrading})
+Gives an introduction into the automatic option-upgrading-feature of
+ECB and you can download and install a newer ECB-version from within
+ECB.
+
+@item Common use-cases (@pxref{Common use-cases})
+How to deal with special situations and circumstances, so e.g. working
+with big and small screens, working with large directories, using the
+builtin version-control-support of ECB, parsing non-semantic-supported
+sources like perl, using hide-show, working best with eshell and JDEE
+and some window-managers of Emacs (like escreen or winring) and many
+more...
+
+@item Entry points for Elisp programmers (@pxref{Elisp programming})
+All informations needed by programmers when using some ECB-concepts
+from within other elisp-libraries. This includes a full description
+how to use the ECB-independent library tree-buffer.el. Lists also all
+available hooks and describes with full working example how to program
+own layouts.
+
+@item Conflicts and bugs of ECB (@pxref{Conflicts and bugs})
+Lists all currently known bugs and problems and gives well working
+work-arounds.
+
+@item Frequently asked Questions (@pxref{FAQ})
+Take a look...
+
+@item Command Index (@pxref{Command Index})
+List of all interactive commands of ECB
+
+@item Option Index (@pxref{Option Index})
+List of all user-customizable options of ECB
+
+@item Concept Index (@pxref{Concept Index})
+List of all concepts introduced by ECB
+
+@end table
+
+
+
+@node ECB-windows, Activation and Deactivation, Manual usage, Top
+@chapter All ECB-windows of ECB
+
+ECB displays a number of informational windows that allow for easy
+source code navigation and overview. These informational windows are
+called @dfn{ECB-windows}. Each ECB-window is displayed in its own
+special window/buffer which is dedicated and read-only.
+
+There are some ``basic'' ECB-windows (e.g. for browsing directories
+and sources) and some ``add-on'' ECB-windows for special purposes like
+displaying the definition of the current symbol under point. This
+chapter describes all ECB-windows of ECB in detail.
+
+@menu
+* Basic ECB-windows::           Description of the basic ECB-windows
+* Add-on ECB-windows::          Description of additional ECB-windows
+@end menu
+
+@node Basic ECB-windows, Add-on ECB-windows, ECB-windows, ECB-windows
+@section The basic ECB-windows of ECB
+
+ECB offers basic ECB-windows for browsing directory-structures, files
+of a directory and contents of source-files (e.g. methods and
+variables). These basic ECB-windows are build from a special class of
+ECB-windows, called @dfn{tree-buffer}. See @ref{Tree-buffer basics}
+for more details about the functionality of tree-buffers. See
+@ref{Tree-buffer styles} to get an impression about the look&feel of
+these tree-buffers.
+
+In the following subsections these basic ECB-windows of ECB will be
+explained in detail.
+
+@menu
+* Tree-buffer basics::          General introduction into tree-buffers
+* Tree-buffer styles::          Displaying the trees with different styles
+* ECB Directories-window::      Contents of the ECB Directories-window
+* ECB Sources-window::          Contents of the ECB Sources-window
+* ECB Methods-window::          Contents of the ECB Methods-window
+* ECB History-window::          Contents of the ECB History-window
+@end menu
+
+@node Tree-buffer basics, Tree-buffer styles, Basic ECB-windows, Basic ECB-windows
+@subsection General introduction into tree-buffers
+
+
+@subsubsection Content and structure of a tree-buffer
+
+ECB displays most of its informations (e.g. about directory-structures
+or file-contents) in so called @dfn{tree-buffers} which means the
+display of such a tree-buffer is structured in a tree consisting of
+@dfn{tree-nodes}. Every line in a tree-buffer displays exactly one
+tree-node. Each node can have any arbitrary number of
+@dfn{children}-nodes. If a tree-node has no children then it is called
+a @dfn{leaf}.
+
+Each tree-buffer of ECB is displayed in an own special
+ECB-window/buffer which is read-only ie. not editable.
+
+The difference between a natural tree like a fir and an ECB-tree is
+that the root(-node) of a tree-buffer is not visible but only its
+children. In the example below the nodes parent-node-1 and
+parent-node-2 are the children of the invisible root-node.
+
+If a tree-node contains at least one child it is displayed with a
+special expand/collapse-symbol (see the example below). This symbol
+allows expanding (rsp. collapsing) the tree-node wheras expanding
+means to display the children-nodes and collapsing means to hide the
+childrens of a tree-node.
+
+Here is an example of a tree-buffer:
+
+@example
+@group
+[+] parent-node-1  -------.
+[-] parent-node-2  -------|
+    [-] expanded  --------|
+        leaf-node-1  -----|
+        leaf-node-2  -----|-----[tree-nodes]
+        leaf-node-3  -----|
+        leaf-node-4  -----|
+    [+] collapsed  -------“
+     |
+     `-----------------[expand/collapse-symbol]
+@end group
+@end example
+
+@subsubsection Possible actions for a tree-node
+
+In most cases an action is triggered when clicking with the mouse onto
+a tree-node@footnote{Of course using the keyboard is also possible,
+see @ref{Using the keyboard}.} (e.g. clicking onto ``leaf-node-1'' or
+``parent-node-1'' in the example above). Which actions depends on the
+type of the tree-buffer. For example clicking on a tree-node in the
+ECB-sources-buffer (which is the name of a source-file) opens the
+relelated file in the edit-area of ECB (@pxref{ECB Sources-window})
+whereas clicking onto a node in the ECB-methods-buffer (which is the
+name of a tag in the current source-file displayed in the edit-area)
+``jumps'' to the location of this tag in the source-buffer in the
+edit-area (@pxref{ECB Methods-window}).
+
+Almost every ECB-window of ECB offers a special popup-menu when
+clicking with the right mouse-button (of course also possible via
+keyboard, see @ref{Using the keyboard}) onto a tree-node (e.g. some
+senseful actions possible for directory-nodes like grepping this
+directory or performing version-control actions for this directory or
+something else).
+
+See @ref{ECB Directories-window}, @ref{ECB Sources-window}, @ref{ECB
+Methods-window} and @ref{Add-on ECB-windows} for a detailed description which
+actions are triggered and which popup-menus are offered in all the ECB-windows
+of ECB.
+
+@subsubsection Sticky parent-node for tree-buffers
+
+In the header-line (only for GNU Emacs) of a tree-buffer always the
+current-parent node of the first visible node is displayed (if there is a
+parent node). So a user always has a good overview to which parent a node
+belongs. This sticky node is exactly in the same manner clickable as all other
+nodes (see above).
+
+There is a option @code{ecb-tree-make-parent-node-sticky} which
+enabales/disables this feature (default is enabled).
+
+There is also an option @code{ecb-tree-stickynode-indent-string}. Normally
+there is no need to bother with this option but if you encounter
+alignment-problems with the sticky node in the headerline then take a look at
+this option, because it allows to fix the problem.
+
+This feature is only available for GNU Emacs >= 21.
+
+@node Tree-buffer styles, ECB Directories-window, Tree-buffer basics, Basic ECB-windows
+@subsection Displaying the trees with different styles
+
+ECB offers three different styles for the tree-buffers in the
+ECB-windows. Two of the styles are ascii-based and one style uses
+images for drawing the tree-structure.
+
+@menu
+* Style basics::                Basic knowledge about the styles
+* Ascii-based styles::          How to customize the ascii-styles
+* Tree-buffers with images::    Which images are used for the tree
+* Images for Methods-buffer::   Images for the tags in the Methods-buffer
+@end menu
+
+@node Style basics, Ascii-based styles, Tree-buffer styles, Tree-buffer styles
+@subsubsection Basic knowledge about the styles
+
+There are nine image-names which define the control- and guide-symbols
+to draw the tree. Here is the list of the allowed image-names and the
+related corresponding ascii-symbols:
+
+@itemize @minus
+@item open (``[-]''):
+The control-symbol displayed for an opened tree-node which has several
+subnodes. Clicking onto this control closes the node.
+
+@item close (``[+]''):
+The control-symbol displayed for a closed tree-node, i.e. an
+expandable node with subnodes but all subnodes are hidden. Clicking
+onto this control opened the node and displays its subnodes - if
+there are any. If it has no subnodes the empty-symbol will be
+displayed.
+
+@item empty (``[x]''):
+The symbol displayed for an empty node. An empty node is a
+node which could have subnodes but has currently none.
+
+@item leaf (``*''):
+The symbol displayed for a node which can not have any subnodes so it
+is a ``leaf'' in the tree.
+
+@item guide (`` |''):
+The symbol used for drawing vertical ``guide-lines'' for opened nodes.
+See the example below.
+
+@item no-guide (``  ''):
+Sometimes invisible guide-lines are needed to draw the tree.
+
+@item end-guide (`` `''):
+The symbol used for the guide-line of the last subnode of an opened
+node.
+
+@item handle (``-''):
+The symbol displayed before every subnode. Each handle is connected to
+a guide-line - either a normal guide or an end-guide.
+
+@item no-handle (`` ''):
+An invisible handle.
+@end itemize
+
+A tree will be build-up with these elements like follows:
+
+@example
+@group
+[-] node-with-subnodes      (open)
+ |-[+] not-empty-subnode1   (guide+handle+close)
+ |-[x] empty-subnode        (guide+handle+empty)
+ `-[-] not-empty-subnode2   (end-guide+handle+open)
+    |-* leaf-1              (no-guide+no-handle+guide+handle+leaf)
+    `-* leaf-2              (no-guide+no-handle+end-guide+handle+leaf)
+@end group
+@end example
+
+@node Ascii-based styles, Tree-buffers with images, Style basics, Tree-buffer styles
+@subsubsection How to customize the ascii-styles
+
+The ECB-option @code{ecb-tree-buffer-style} offers two different
+styles completely drawn with ascii-controls and -guides.
+
+Ascii-style with guide-lines (value @code{ascii-guides})@footnote{For
+a better look&feel of such a tree-buffer ECB displays only the last
+subnode of an opened node with a handle!}:
+
+@example
+@group
+[-] ECB
+ |  [+] code-save
+ `- [-] ecb-images
+     |  [-] directories
+     |   |  [-] height-15
+     |   |   |  * close.xpm
+     |   |   |  * empty.xpm
+     |   |   |  * leaf.xpm
+     |   |   `- * open.xpm
+     |   |  [+] height-17
+     |   |  [+] height-19
+     |   `- [+] height-21
+     |  [x] history
+     |  [x] methods
+     `- [x] sources
+@end group
+@end example
+
+Ascii-style without guide-lines (value @code{ascii-no-guides}) - this
+is the style used by ECB <= 1.96:
+
+@example
+@group
+[-] ECB
+    [+] code-save
+    [-] ecb-images
+        [-] directories
+            [-] height-15
+                * close.xpm
+                * empty.xpm
+                * leaf.xpm
+                * open.xpm
+            [+] height-17
+            [+] height-19
+            [+] height-21
+        [x] history
+        [x] methods
+        [x] sources
+@end group
+@end example
+
+The tree-layout of both ascii-styles can be affected with the options
+@code{ecb-tree-indent} and @code{ecb-tree-expand-symbol-before} (the
+examples above have set 4 for the former and true for the latter one).
+For the guide-style the face and color of the guide- and
+handle-symbols can be customized with the option
+@code{ecb-tree-guide-line-face} (default is the equal-named face).
+
+@node Tree-buffers with images, Images for Methods-buffer, Ascii-based styles, Tree-buffer styles
+@subsubsection Which images are used for the tree
+
+Depending on the value of @code{ecb-tree-buffer-style} and the
+image-support of (X)Emacs, the tree-buffer try to use images instead
+of strings to draw a nice-looking tree.
+
+If images can and should be used then the option
+@code{ecb-tree-image-icons-directories} tells ECB where to search for
+suitable image-icons for each of the nine image-names (see above). An
+image is used for displaying a control with name ``XXX'' if one of the
+directories of @code{ecb-tree-image-icons-directories} contains an
+image-file with basename ``ecb-XXX'' and an extension which is
+supported by (X)Emacs. Currently supported extensions are ``.xpm'',
+``.png'', ``.gif'', ``.jpeg'', .''jpg'' and ``.xbm''.
+
+Example: To display the control with name ``open'' with a suitable
+image then one of the directories of
+@code{ecb-tree-image-icons-directories} must contain a file with name
+``ecb-open.xpm'' or ``ecb-open.png'' etc. See the description of this
+option to get all important details how and in which sequence ECB
+searches the directories of @code{ecb-tree-image-icons-directories}.
+
+ECB comes with predefined default-images usable for every tree-buffer
+and special images for the Directories- and the Methods-tree-buffer.
+They are defined in several different heights - so for the most
+senseful font-heights of a tree-buffer a fitting image-size should be
+available. The shipped images reside either in the subdirectory
+"ecb-images" of the ECB-installation or - if ECB is installed as
+regular XEmacs-package - in the ECB-etc data-directory (the directory
+returned by evaluating (locate-data-directory "ecb"). If you do not
+want to change the images then you normally have nothing to do because
+the default value of @code{ecb-tree-image-icons-directories} points
+already to the correct image-directories.
+
+A special remark for XEmacs:
+
+At least XEmacs 21.14 (but probably previous versions too) has a bug
+in its display-engine which prevents adjacent images to be displayed
+correctly. The effect is, that in a row of two or more adjacent images
+(e.g. end-guide+handle+open - see the tree-example above) always all
+images are masked by the last one, means only the last one is visible.
+If at least one normal character (e.g. a space) is placed between two
+images then the images are displayed correctly. Therefore ECB has
+implemented the following work-around to get best possible results
+with XEmacs: open-, close-, empty-, leaf-, guide-, end-guide- and
+no-guide-images are displayed with images and the handle- and the
+no-handle-images are displayed with the corresponding ascii-symbols
+(which is ``-'' rsp. `` ''). The face (the color) of the handle-symbol
+is customizable via the option @code{ecb-tree-guide-line-face}.
+
+This bug is already reported to the XEmacs-team. If your XEmacs has
+fixed this bug then add the following to your @file{.emacs}-file (or
+whereever your emacs-setup is located):
+
+@lisp
+(setq tree-buffer-enable-xemacs-image-bug-hack nil)
+@end lisp
+
+Then ECB uses images without any special work-around with XEmacs too.
+Just try it - if the tree-buffers look ugly then the XEmacs-bug is
+probably not fixed correctly.
+
+@node Images for Methods-buffer, ,Tree-buffers with images, Tree-buffer styles
+@subsubsection Special images for the Methods-buffer
+
+ECB can display all the semantic-tags in the Method-buffer with
+special icons for methods, variables and classes - each of them with a
+different icon dependend of the protection of the tag. This feature
+can be disabled/enabled via the option
+@code{ecb-display-image-icons-for-semantic-tags}. All the special
+images are located in that directory where the option
+@code{ecb-tree-image-icons-directories} point to for methods.
+
+@node ECB Directories-window, ECB Sources-window, Tree-buffer styles, Basic ECB-windows
+@subsection ECB Directories-window
+
+@cindex Directories
+The ECB directories interactor is for browsing directories. The direct
+children of the invisible root-node are called @dfn{source-path} and
+can be defined with the option @code{ecb-source-path}. Each
+source-path is the starting-node of the complete directory-structure
+below this path and can be browsed with the directories-interactor.
+
+When a sources ECB-window is contained in the current layout then per
+default only directories and subdirectories are displayed in the
+directories tree-buffer (the source-files are displayed in the sources
+tree-buffer - see @ref{ECB Sources-window}) but this can be changed
+with the option @code{ecb-show-sources-in-directories-buffer}.
+
+@subsubsection Usage of the directories ECB-window
+
+@itemize @bullet
+@item
+Select directories (and - if enabled - source files) in the
+@dfn{ECB-Directories} buffer by clicking a mouse button on the directory
+name or by hitting RETURN when the cursor is placed on the item line,
+see @ref{Usage of ECB}.
+
+IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+while clicking with the primary mouse button (@pxref{Using the mouse})
+or RETURN (@pxref{Using the keyboard})) on a directory node in the
+this buffer then the directory-contents-cache for this directory will
+be refreshed and actualized.
+
+@item
+Directory names with a ``[+]'' symbol after (or before) them can be
+expanded/collapsed by clicking on the symbol, pressing the TAB key
+(@pxref{Using the keyboard}) when the cursor is placed on the package
+line or clicking a mouse button on the item, see @ref{Using the mouse}.
+
+@item
+Right clicking on an item will open a popup menu where different
+operations on the item under the mouse cursor can be performed. This
+popup-menu offers operations for version-control, dired, grep, some
+file-operations like creating a directory and commands to make a
+directory a source-path in the sense of @code{ecb-source-path}.
+
+@item
+Pressing F2 will open the ECB customization group
+(@pxref{Customizing}) in the edit window. F3 shows the online help in
+the edit-window. Pressing F4 in the ECB-directories buffer will offer
+adding a new source-path.
+@end itemize
+
+When source-files-nodes are displayed in the directories-buffer (see
+@code{ecb-show-sources-in-directories-buffer}) then for these nodes
+all descriptions of section @ref{ECB Sources-window} are valid.
+
+@subsubsection Activating/Displaying the directories ECB-window
+
+Either use one of the predefined layouts which contain the directories
+ECB-window (@pxref{Changing the ECB-layout}) (e.g. via @kbd{C-c . l
+c}) or create a new ecb-layout via the command
+@code{ecb-create-new-layout} and add a buffer of type ``directories''
+into this new layout (@pxref{Creating a new ECB-layout}).
+
+@subsubsection Customizing the directories ECB-window
+
+See @ref{ecb-directories} for a list of all options currently
+available for customizing this ECB-windows to your needs.
+
+@node ECB Sources-window, ECB Methods-window, ECB Directories-window, Basic ECB-windows
+@subsection ECB Sources-window
+
+@cindex Sources
+ECB offers a ECB-windows for displaying source-file-names of a certain
+directory: The sources-window. It displays all source-file names of the
+currently selected directory of the directories-ECB-window (@pxref{ECB
+Directories-window}).
+
+The history-tree-buffer is a ``flat'' tree-buffers means all nodes are direct
+children of the invisible root-node and can not be expanded.
+
+@subsubsection Usage of the ECB-Sources-window
+
+@itemize @bullet
+@item
+Source files can be selected by clicking with the primary mouse button
+(@pxref{Using the mouse}) or hitting RETURN (@pxref{Using the keyboard}) on
+the source row in the @dfn{ECB-Sources}-window. The buffer of the selected
+source-file will be displayed in an edit-window - which one depends on the
+setting in @code{ecb-mouse-click-destination}.
+
+IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+clicking with the primary mouse button (@pxref{Using the mouse}) or RETURN
+(@pxref{Using the keyboard})) on a source row in the ECB-Sources-windows then
+the source will not be displayed in an edit-window but it will be scanned in
+the background and all its contents (e.g. methods and variables) are listed in
+the @dfn{ECB Methods}-window (@pxref{ECB Methods-window}. So you can get an
+overlook over the source without changing the buffer in the edit-window.
+
+@item
+Clicking on the source file with the secondary mouse button or
+C-RETURN (@pxref{Usage of ECB}) will open the source file in
+another edit window - which one depends on the setting in
+@code{ecb-mouse-click-destination}. 
+
+@item
+Right clicking on a source file (mouse-button 3) will open a popup menu where
+different operation on the item under the mouse cursor can be performed. This
+popup-menu offers operations for version-control, dired, grep, filtering the
+file-names and some file-operations like deleting the related file from disk.
+In addition the ECB-Sources-window can be maximized via the popup-menu
+
+@end itemize
+
+@subsubsection Activating/Displaying the ECB-Sources-window
+
+Either use one of the predefined layouts which contain the sources ECB-window
+(@pxref{Changing the ECB-layout}) (e.g. via @kbd{C-c . l c}) or create a new
+ecb-layout via the command @code{ecb-create-new-layout} and add a buffer of
+type ``sources'' into this new layout (@pxref{Creating a new ECB-layout}).
+
+@subsubsection Customizing the ECB-Sources-window
+
+See @ref{ecb-sources} for a list of all options currently available for
+customizing this ECB-window to your needs.
+
+@node ECB Methods-window, ECB History-window, ECB Sources-window, Basic ECB-windows
+@subsection The ECB Methods-window
+
+@cindex Methods
+The @dfn{ECB-Methods} ECB-window contains all parsed and recognized tags
+of the current source-buffer. It is called ``Method-buffer'' because
+ECB is mostly designed for browsing sourcecode files and for
+programming-languages these tags are often methods (and variables
+etc.) To simplify explanations we talk in the following only about
+methods and variables - but in general the method-buffer can contain
+any kind of tags (e.g. sections and subsections for texinfo
+buffers).
+
+Per default the content of the methods-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (@pxref{ECB-window synchronizing}).
+
+@subsubsection Usage of the methods ECB-window
+
+@itemize @bullet
+@item
+When a node (e.g. method or variable) is selected with the primary mouse
+button (@pxref{Using the mouse}) or RETURN (@pxref{Using the keyboard}) the
+buffer in the edit-window (which one depends on the setting in
+@code{ecb-mouse-click-destination}) will jump to the method/variable.
+
+IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+while clicking with the primary mouse button (@pxref{Using the mouse})
+or RETURN (@pxref{Using the keyboard})) on a node in this buffer then
+the edit-buffer will be narrowed to the selected tag (see also
+option @code{ecb-tag-visit-post-actions}). But this works only for
+sources parsed by semantic, not by imenu or etags!
+
+@item
+Clicking on a node with the secondary mouse button or C-RETURN
+(@pxref{Usage of ECB}) will jump to the method in another edit window
+- which one depends on the setting in
+@code{ecb-mouse-click-destination}.
+
+@item
+Right clicking on a node will open a popup menu where
+different operation on the item under the mouse cursor can be
+performed. The popup-menu offers commands for filtering the displayed
+tree-nodes, hiding/narrowing the related tags in the source-buffer and
+expanding/collapsing one/all tree-nodes according to a certain
+expansion-level.
+
+@end itemize
+
+@subsubsection Activating/Displaying the methods ECB-window
+
+Either use one of the predefined layouts which contain the methods
+ECB-window (@pxref{Changing the ECB-layout}) (e.g. via @kbd{C-c . l
+c}) or create a new ecb-layout via the command
+@code{ecb-create-new-layout} and add a buffer of type ``methods'' into
+this new layout (@pxref{Creating a new ECB-layout}).
+
+@subsubsection Synchronizing the Methods-window with current source-buffer
+
+First a preliminary remark: Do not confuse this chapter with that
+synchronizing described in @ref{ECB-window synchronizing}. The latter one
+describes the mechanism for synchronizing the ECB-windows when the
+current-buffer in the edit-area has been changed. This chapter describes how
+to synchronize the ECB-methods-window with the contents of the current-buffer
+if the buffer has been modified!
+
+Now lets start:
+
+Generally ECB calls semantic to get the list of tags for current source-file
+of current edit-window. Per default ECB does never automatically force a
+reparse of the source-file after this has been changed - this is only done on
+demand by calling the command @code{ecb-rebuild-methods-buffer}. So per
+default the idle-scheduler of semantic is responsible for reparsing the
+source-file when this is necessary (see `semantic-idle-scheduler-mode' for
+further details). So this scheduler is also repsonsible in turn for
+updating/sychronizing the methods-window with current buffer-contents. This is
+the most user-resonsible and therefore the recommended approach.
+
+So it's strongly recommended to enable @code{semantic-idle-scheduler-mode} or
+@code{global-semantic-idle-scheduler-mode} (@pxref{Setting up CEDET/semantic})
+because then reparsing is always done during idle-time of Emacs and - maybe
+even more important - it is also interruptable.
+
+But if this idle-scheduler is switched off then ECB offers now two
+possibilities (via @code{ecb-force-reparse-when-semantic-idle-scheduler-off}):
+
+@itemize @bullet
+
+@item
+
+Not forcing itself a reparse when tags are needed by ECB: then a user declines
+knowingly Emacs/semantic-driven parsing of code when he/she switches off the
+idle-mode of semantic. This is the default behavior of ECB and the default
+value of this option. But this has also the consequence that the
+methods-buffer is only filed on demand via @code{ecb-rebuild-methods-buffer}
+(bound to @key{C-c . r})!
+
+This means also in consequence that the methods-buffer is not
+automatically filled when a source-file is opened but first on demand
+after calling the command @code{ecb-rebuild-methods-buffer}!
+
+@item
+
+Forcing a reparse when tags are needed: Then ECB forces semantic to parse
+the source-file when ECB needs tags to display. For this behavior this
+option has to be set to not nil.
+@end itemize
+
+The term ``forcing a reparse by semantic'' is a simplification: ECB uses then
+the function @code{semantic-fetch-tags} which can decide that the cached tags
+are up-to-date so no real reparsing is necessary - but it can also run a full
+reparse and this reparse is not being done when Emacs is idle but immediatelly
+and not interruptable (as with the idle-scheduler of semantic), which can be
+quite annoying with big source-files.
+
+To make a long story short: It is strongly recommended to enable the
+@code{semantic-idle-scheduler-mode} or
+@code{global-semantic-idle-scheduler-mode}! See @ref{Setting up
+CEDET/semantic}. This will give you in all cases the behavior you would expect
+of en IDE like ECB/semantic.
+
+@subsubsection Synchronizing with indirect buffers
+
+ECB works out of the box with indirect buffers, especially with indirect
+buffer clones created with the command @code{clone-indirect-buffer} (only
+available with GNU Emacs >= 21). They will be handled as all other buffers and
+you can work with them with no difference to ``normal'' buffers. With one
+exception:
+
+@strong{Please note}: Cause of a bug in Emacs 22 (and maybe also in Emacs 23)
+the propagation of parsing informations from one buffer to all others which are
+in an indirect-buffer relation to the same base-buffer does currently not
+work.
+
+What does this mean: If you modify a buffer then Emacs propagates this change
+to all buffers with the same base-buffer. ECB/semantic recognize this change
+and do all necessary to automatically reparse the changed buffer (at least if
+you have customized semantic/ECB to do this). So far so good, but: If you
+switch to another buffer with the same base-buffer then you will notice that
+the methods-window of ECB still displays the contents before the change, ie.
+the need for a reparse has not been propagated to these other buffers. This is
+a bug in Emacs.
+
+What can you do: As long as this bug is not fixed there is no chance that all
+other affected ``indirect-related'' buffers will be reparsed automatically
+after modifying one of them. So you have to do this reparse ``by hand'' after
+switching to such an indirect-related buffer, but this is very simple: Just
+call the command @code{ecb-rebuild-methods-buffer} with prefix arg or hit
+@key{C-u C-c . r} (key this command is bound to).
+
+Lets make an example:
+
+@enumerate
+
+@item
+
+Suppose we have a sourcefile test.java loaded as a buffer into Emacs and
+suppose further we have created two indirect-buffer clones test-clone1.java and
+test-clone2.java - all of these buffers point to the same file: test.java.
+
+@item
+
+Now lets be the buffer test-clone1.java the current buffer and let us modify
+it (e.g. adding a new method). If you have enabled the idle-reparse mechanism
+of semantic (@pxref{Setting up CEDET/semantic}) then this buffer will be
+reparsed automatically and ECBs methods-window will be updated in turn too.
+
+@item
+
+So far so good. But if you now switch to one of the two other buffers, lets
+say to test.java, then you will notice that the change done in
+test-clone1.java is also visible in the buffer test.java but the
+ECB-methods-window for test.java will display the contents before the change.
+This is cause of the Emacs-bug described above.
+
+@item
+
+To update the methods-window for test.java to the new contents you have to call
+@code{ecb-rebuild-methods-buffer} with prefix argument (ie. clear-cache is
+true) or hitting @key{C-u C-c . r}. Note: Calling this command without prefix
+argument is not enough!
+
+@end enumerate
+
+@subsubsection Jumping to the definition of external types
+
+There are two common types of ``external'' tags displayed in the
+method-window, mostly with object oriented programing-languages:
+
+@enumerate
+
+@item parent-types
+
+Tags which represent the type of a parent-class (which can be defined in the
+same file but which is more often defined in another file). All parents
+(regardless if defined internaly or externaly) of a type will be displayed
+under a bucket ``[Parents]'' in the methods-window of ECB.
+
+@item ``virtual'' types
+
+In OO-languages like CLOS, eieio and C++ there can be nodes with type-tags in
+the method-buffer which are somehow virtual because there is no definition in
+the current source-file. But such a virtual type collects all its outside
+defined members like methods in C++ which are defined in the @file{*.cc} file
+whereas the class-definition is defined in the associated header-file.
+
+@end enumerate
+
+In both cases the user wants to jump to the definition of the type if he clicks
+onto the related node in the methods-window of ECB.
+
+Here is a C++-example for ``virtual'' types (2) and parent types (1) which
+explains this in detail:
+
+Let's say this class is defined in a file @file{ParentClass.h}:
+
+@example
+@group
+class ParentClass
+@{
+protected:
+  int p;
+@};  
+@end group
+@end example
+
+Let's say this class is defined in a file @file{ClassWithExternals.h}
+
+@example
+@group
+#include "ParentClass.h"
+
+class ClassWithExternals : public ParentClass
+@{
+private:
+  int i;
+
+public:
+  ClassWithExternals();
+  ~ClassWithExternals();
+@};
+@end group
+@end example
+
+Both the constructor and the destructor of the class
+``ClassWithExternals'' are implemented in a file
+@file{ClassWithExternals.cc}:
+
+@example
+@group
+#include "test.h"
+
+ClassWithExternals::ClassWithExternals(int i,
+                                       boolean b,
+                                       char c)
+@{
+  return;
+@}
+
+void
+ClassWithExternals::~ClassWithExternals()
+@{
+  return;
+@}
+@end group
+@end example
+
+ECB displays the contents of @file{ClassWithExternals.cc} in its methods-buffer like
+follows:
+
+@example
+@group
+[-] [Includes]
+ `- test.h
+[-] ClassWithExternals
+ |  +ClassWithExternals (+i:int, +b:class boolean, +c:char):ClassWithExternals
+ `- +~ClassWithExternals ():void
+@end group
+@end example
+
+Both the constructor and the destructor of the class
+``ClassWithExternals'' are grouped under their class-type. But this class-type
+``ClassWithExternals'' is represented by a so called ``virtual'' or ``faux''
+node-tag, i.e. there is no real tag in the current source-buffer for this tag.
+
+If a user now clicks onto the node of ``ClassWithExternals'' then he wants to
+jump to the right location in the right file where ``ClassWithExternals'' is
+defined. ECB now uses now some smart mechanisms (see below) to do this. In
+case of success (means ECB has found the definition) it opens the right file
+and point will stay at beginning of the definition of the type
+``ClassWithExternals''.
+
+The contents of @file{ClassWithExternals.h} are then displayed like
+follows:
+
+@example
+@group
+[-] [Includes]
+ `- ParentClass.h
+[-] ClassWithExternals:class
+ |  [-] [Parents]
+ |   `- ParentClass
+ |  [-] [Variables]
+ |   `- -i:int
+ |  +ClassWithExternals ():ClassWithExternals
+ |  +~ClassWithExternals ():void
+ `- [+] [Misc]
+@end group
+@end example
+
+Now let's play it again: Now we want to go to the definition of the
+parent-type ``ParentClass'' when we click onto the related node under the
+bucket ``[Parents]''. Again ECB uses its smartness to jump to the definition
+of the class ``ParentClass'' when you click onto the node ``ParentClass''.
+
+Now lets explain the precondition which must be fulfilled so ECB can do its
+job:
+
+@itemize
+@item Customizing the semantic analyzer for your needs
+
+ECB itself is quite stupid concerning finding external tags. But it can use
+the semantic-analyzer of the CEDET-suite (remember: The CEDET-suite is a
+must-requirement of ECB, see @ref{Requirements}). But this in turn means that the
+semantic-analyzer must be customized in the right way for the needs of your
+programing projects. Mainly this means activating semanticdb and setting the
+correct include-path etc...
+
+@strong{Please note}: Read the related manuals of semantic and - strongly
+recommended - read in addition the article ``Gentle introduction to Cedet''.
+It's worth to read it! The website of CEDET contains a link, you find it here:
+@ifhtml
+@uref{http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html}
+@end ifhtml
+@ifnothtml
+@url{http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html}
+@end ifnothtml
+
+@item Customize the related options of ECB:
+
+There is exactly one option you have to take into account:
+@code{ecb-find-external-tag-functions}. This defines the method ECB uses to
+find these external tags.
+
+Mostly there is nothing to do because the default values should do a good job.
+But if things are running bad then maybe this is the right screw for you.
+
+Finding such external types can be very complex and there are several roads to
+success. ECB uses per default methods based on the semantic-analyzer. But this
+option allows to define own find-functions and tell ECB to uses them.
+
+This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. ECB first performs all find-functions defined
+for current major-mode (if any) anf then all find-functions defined for the
+special symbol 'default (if any).
+
+ECB offers some predefined senseful finding-functions. Currently there are:
+
+@itemize @minus
+@item @code{ecb-search-tag-by-semantic-analyzer}: The most powerfil one, based
+on the semantic-analyzer
+@item @code{ecb-search-tag-by-semanticdb}: A backup for the first one
+@item @code{ecb-jde-show-class-source}: For major-mode @code{jde-mode} when
+coding in java, uses java-mechanisms - maybe for java the best choice.
+@end itemize
+
+See the documentation of the option and also of these function for details how
+they work and how to write own finding-functions.
+
+@end itemize
+
+
+@subsubsection Customizing the methods ECB-window
+
+See @ref{ecb-methods} for a list of all options currently available
+for customizing this ECB-window to your needs.
+
+@node ECB History-window, , ECB Methods-window, Basic ECB-windows
+@subsection The ECB History-window
+
+@cindex History
+ECB offers a ECB-windows for displaying a history of currently open or
+recently closed source-buffers, regardless of the directory the related file
+belongs to.
+
+Contrary to the ECB-sources-window the ECB-History-window can be flat but
+needn't. Another difference to the ECB-sources window is that the History
+displays not filenames but buffer-names for buffers which are either directly
+related to a file or which are indirect-buffers with a base-buffer which is
+related to a file. For a description of the indirect-buffer concept see the
+Emacs manual (see command @code{clone-indirect-buffer} or
+@code{make-indirect-buffer} for XEmacs).
+
+@strong{Please note}: The History of ECB is not meant to be a full replacement
+for the Buffers-menu of (X)Emacs! It only displays buffers which are related
+to a file (either directly or via indirect-buffer). All non-file-related
+buffers (e.g. *Help*, *grep* etc.) will never be displayed in the
+ECB-History-window!
+
+@subsubsection Usage of the ECB-History-window
+
+@itemize @bullet
+@item
+Buffers in the history can be selected by clicking with the primary mouse button
+(@pxref{Using the mouse}) or hitting RETURN (@pxref{Using the keyboard}) on
+the buffername-node in the @dfn{ECB-History}-window. The buffer of the selected
+buffer-name will be displayed in an edit-window - which one depends on the
+setting in @code{ecb-mouse-click-destination}.
+
+IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+clicking with the primary mouse button (@pxref{Using the mouse}) or RETURN
+(@pxref{Using the keyboard})) on a node in the ECB-History-window then the
+related buffer will not be displayed in an edit-window but it will be scanned
+in the background and all its contents (e.g. methods and variables) are listed
+in the @dfn{ECB Methods}-window (@pxref{ECB Methods-window}. So you can get an
+overlook over the buffer-contents without changing the buffer in the
+edit-window.
+
+@item
+Clicking on a buffername-node with the secondary mouse button or
+C-RETURN (@pxref{Usage of ECB}) will open the buffer in
+another edit window - which one depends on the setting in
+@code{ecb-mouse-click-destination}. 
+
+@item
+Right clicking on a buffername-node (mouse-button 3) will open a popup menu
+where different operation on the item under the mouse cursor can be performed.
+This popup-menu offers operations for version-control, dired, grep, filtering
+the buffernames and some file-operations like deleting the related file from
+disk. In addition the ECB-History-window can be maximized or the bucketizing
+type (s.b. ``Bucketizing the history'') can be changed on the fly via
+popup-menu.
+
+@end itemize
+
+@subsubsection Activating/Displaying the ECB-History-window
+
+Either use one of the predefined layouts which contain the ECB-History-window
+(@pxref{Changing the ECB-layout}) (e.g. via @kbd{C-c . l c}) or create a new
+ecb-layout via the command @code{ecb-create-new-layout} and add a buffer of
+type ``history'' into this new layout (@pxref{Creating a new ECB-layout}).
+
+@subsubsection Dead buffers in the history
+
+You can customize if ECB should remove the related buffername-node from the
+history-window after killing a buffer. This is done with the option
+@code{ecb-kill-buffer-clears-history}. See the documentation of this option
+for the possible choices. If you decide that ECB should @strong{not} remove
+the related buffername-node then this is named a ``dead'' buffer in the
+history-window. It is displayed with a special face (see
+@code{ecb-history-dead-buffer-face}), default is a kind of grey.
+
+You can use such a dead-buffer-node in the history as all other
+buffername-nodes: ECB will reopen the related file in a buffer and perform the
+action you have choosen (see above section ``Usage of the
+ECB-History-window'').
+
+@subsubsection Indirect buffers in the history
+
+You can work with indirect buffers as well with direct buffers. See the
+(X)Emacs manual for an introduction for indirect buffers (e.g. see the command
+@code{clone-indirect-buffer} for GNU Emacs).
+
+Indirect buffers are displayed with the face
+@code{ecb-history-indirect-buffer-face}, default is an italic outline.
+
+There is an option @code{ecb-history-stick-indirect-buffers-to-basebuffer}
+which allows to customize how ECB displays indirect buffers in the
+history-window:
+
+If this option is @code{nil} then indirect-buffers are treated as
+non-indirect-buffers and sorted into the history-buffer-sequence according to
+the setting of @code{ecb-history-sort-method}. Then the history contains
+something like this:
+
+@example
+<base-buffer BB>
+<indirect-buffer 1 of BB>
+<indirect-buffer 2 of BB>
+<indirect-buffer 3 of BB>
+@end example
+
+If not nil then indirect-buffers are always sticked to their base-buffer, ie.
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history contains something like:
+
+@example
+[-] <base-buffer BB>
+ |  <indirect-buffer 1 of BB>
+ |  <indirect-buffer 2 of BB>
+ `- <indirect-buffer 3 of BB>
+@end example
+
+Here the buffer with name ``<base-buffer BB>'' has three indirect-buffers
+which are display as childrens of their base-buffer.
+
+@subsubsection Bucketizing the history
+
+ECB can display the history-contents ``flat'' or it can display buckets to
+bucketize the contens according to certain criterias. This is done with the
+option @code{ecb-history-make-buckets}. It allows bucketizing according to the
+directory, the file-extension, the major-mode or a list of regular expression
+- see the documentation of this option for details.
+
+Here is an example for a history-window bucketized according to the major-mode
+of the related buffers:
+
+@example
+[-] [c++-mode]
+ |  headerfile-1.h
+ |  headerfile-2.h
+ |  codefile-1.cc
+ `- codefile-2.cc
+[-] [emacs-lisp-mode]
+ |  elisp-buffer-1.el
+ |  elisp-buffer-1.el
+ `- elisp-buffer-1.el
+[-] [makefile-mode]
+ `- Makefile
+[-] [java-mode]
+ |  java-buffer-1.java
+ `- java-buffer-2.java
+@end example
+
+@strong{Please note}: If @code{ecb-history-make-buckets} is nil then this is
+interpreted as an empty list of regular-expressions and the history is display
+with exactly one bucket. Use the value 'never if you want the? contents of the
+history-window to be displayed ``flat''!
+
+You can change the bucketizing type on the fly via the popup-menu of the
+history-window.
+
+
+@subsubsection Customizing the ECB-History-window
+
+See @ref{ecb-history} for a list of all options currently available for
+customizing this ECB-windows to your needs.
+
+
+@node Add-on ECB-windows, , Basic ECB-windows, ECB-windows
+@section Add-on ECB-windows of ECB
+
+This chapter gives detailled informations about available add-on
+ECB-windows. This includes basic desciptions what they do as well as
+how to use them.
+
+@menu
+* Semantic analyser::           Analyses and displays semantic context
+* Symboldefinition::            Displays definition of current symbol
+@end menu
+
+@node Semantic analyser, Symboldefinition, Add-on ECB-windows, Add-on ECB-windows
+@subsection Displaying the current semantic context via analyser
+
+@cindex Analyse
+@cindex Analyze
+The CEDET-suite contains the @dfn{semantic analyzer}@footnote{Note that ECB
+uses analyser (with s) whereas semantic uses analyzer (with z).} which is a
+library tool that performs context analysis and can derive useful
+information.
+
+Please see the related node in the info-manual of cedet/semantic for more
+detailed informations about this tool and how to setup it for best performance
+for your project needs.
+
+The semantic-analyzer output can be used through a special ECB-window. This
+interface lists details about the analysis, such as the current function,
+local arguments and variables, details on the prefix (the symbol the cursor is
+on), and a list of all possible completions (see
+@code{semantic-analyze-possible-completions} for more details about
+completions available via the semantic-analyser).
+
+The analyser-ECB-window is of type tree-buffer. See @ref{Tree-buffer
+basics} for basic informations how to use such a tree-buffer.
+
+@subsubsection Usage of the analyser-ECB-window
+
+@itemize @bullet
+@item
+When a node-name in the ``Context''-bucket is selected with the
+primary mouse button (@pxref{Using the mouse}) or RETURN (@pxref{Using
+the keyboard}) the buffer in the edit-window (which one depends on the
+setting in @code{ecb-mouse-click-destination}) will jump to the
+related entry. For strongly typed languages, this means you will jump
+to the definition of the variable, slot, or type definition.
+
+@item
+Clicking on a node-name in the ``Context''-bucket with the secondary
+mouse button or C-RETURN (@pxref{Usage of ECB}) will jump to the
+related entry in another edit window - which one depends on the
+setting in @code{ecb-mouse-click-destination}.
+
+@item
+If you click on a node-name in the "Completions"-bucket, then the text
+that was recently analyzed will be replaced with the name of the tag
+that was clicked on in the analyser-ECB-window.
+
+@item
+Right clicking with the mouse (or with the keyboard, see @ref{Using
+popup-menus}) onto a tree-node opens a popup-menu which allows to
+display additional (if available) informations to the current node.
+@end itemize
+
+@subsubsection Synchronizing the analyse-window
+
+Per default the content of the analyser-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (see @code{ecb-analyse-buffer-sync} and most notably
+@code{ecb-analyse-buffer-sync-delay}) and @ref{ECB-window synchronizing}).
+
+In contrary to the sync-options of the basic ECB-windows@footnote{see
+@ref{Basic ECB-windows} and the options @code{ecb-basic-buffer-sync} and
+@code{ecb-basic-buffer-sync-delay}.} the default synchronisation delay of the
+ECB-analyse-window is quite high: 2 seconds (see
+@code{ecb-analyse-buffer-sync}).
+
+What is the reason for this: a small value like 0.25 as for the basic windows
+would make the analyse-window quite unusable because then more or less after
+each type (depends on how fast you are typing) the analyse window would be
+synchronized with current point, which can be really annoying when there would
+be hundreds of completions for the current point.
+
+Imagine the following scenario: programming in emacs-lisp, typing
+@example
+(e
+@end example
+and then you make a short break, just a moment, but immediately ECB would call
+the semantic-analyzer to analyse the current context for possible completions
+(a.o.). You can imagine that there are even thousands of possible function
+completions in emacs-lisp which beginns with ``e''. Getting all these and
+displaying them in the analyse-window can take some time! Of course the whole
+stuff is interruptable by any key-press so ECB will not be blocked but
+nevertheless the will be a noticeable break in your typing.
+
+Therefore it is strongly recommended to choose one of the following
+possibilities:
+
+@itemize
+@item Automatic synchronizing with long delay
+
+Set @code{ecb-analyse-buffer-sync-delay} to a value which is suitable for your
+programing and typing style, default is already to seconds.
+
+@item Manually synchronizing on demand
+
+@enumerate
+
+@item Switch off the automatic synchronizing for the ECB-analyse-window by setting
+the option @code{ecb-analyse-buffer-sync} to nil. Use always customize for
+this, never setq!
+@item Bind the command @code{ecb-analyse-buffer-sync} to a conveniant shortcut
+@item Synchronize the analyse-window exactly then when you need the
+context informations for current point (e.g. possible local variables or
+completions).
+
+But note that semantic already offers some intellisense commands which can
+help you on demand too! See the documentation of the semantic analyzer.
+@end enumerate
+
+@end itemize
+
+@subsubsection Interactive commands of the analyser-ECB-window
+
+ECB offers the following commands for the analyser-ECB-window:
+
+@itemize @minus
+@item @code{ecb-analyse-buffer-sync}
+@item @code{ecb-goto-window-analyse}
+@item @code{ecb-maximize-window-analyse}
+@end itemize
+
+See @ref{Interactive ECB commands} for details about these commands.
+
+@subsubsection Activating/Displaying the analyser-ECB-window
+
+Either use one of the predefined layouts "left-analyse" or
+``leftright-analyse'' (e.g. via @kbd{C-c . l c}) or create a new
+ecb-layout via the command @code{ecb-create-new-layout} and add a
+buffer of type ``other'' and name ``analyse'' into this new layout
+(@pxref{Creating a new ECB-layout}).
+
+@subsubsection Customizing the analyser ECB-window
+
+See @ref{ecb-analyse} for a list of all options currently available
+for customizing this ECB-window to your needs.
+
+@node Symboldefinition, ,Semantic analyser, Add-on ECB-windows
+@subsection Displaying the definition of the current symbol under point
+
+@c TODO
+
+@node Activation and Deactivation, Usage of ECB, ECB-windows, Top
+@chapter Activation and Deactivation
+
+@noindent
+This chapter describes all aspects of activating and deactivating ECB.
+
+@menu
+* Standard activation::         How to manually (de)activate ECB
+* Automatic activation::        Automatically (de)activating ECB
+@end menu
+
+@strong{IMPORTANT}: Regardless of the activation-type (standard or
+automatic) the activation-process of ECB is always completely
+failure-save. This means any error during any step of the
+activation-process forces a complete cleanup (e.g. removing hooks,
+disabling advices etc.) of all settings ECB did (e.g. adding hooks,
+activating advices etc.) until the failure. Therefore if
+ECB-activation stops cause of a failure then you can be sure that your
+Emacs has the same state as before the ECB-activation-start!
+
+@node Standard activation, Automatic activation, Activation and Deactivation, Activation and Deactivation
+@section Standard activation and deactivation
+
+Call @kbd{M-x ecb-activate} and @kbd{M-x ecb-deactivate} to activate
+or deactivate ECB@footnote{Activation is also possible via the menu
+``Tools --> Start Code Browser (ECB)''.}. If you want ECB started in a
+new frame see the option @code{ecb-new-ecb-frame} (default is nil).
+@code{ecb-activate} always raises and selects the ECB-frame even if
+ECB is already started.
+
+@cindex minor mode
+Because ECB is a global minor-mode it can also be
+(de)activated/toggled by @kbd{M-x ecb-minor-mode}.
+
+@cindex Activation hook-sequence
+@anchor{Activation hook-sequence}
+The following sequence of hooks is evaluated during activation of ECB:
+@enumerate
+@item @code{ecb-before-activate-hook}
+@item <All actions for activation but no layout drawing>
+@item @code{ecb-activate-before-layout-draw-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item <Drawing the layout>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-activate-hook}
+@end enumerate
+
+@anchor{Deactivation hook-sequence}
+@cindex Deactivation hook-sequence
+The following sequence of hooks is evaluated during deactivation of
+ECB:
+@enumerate
+@item @code{ecb-before-deactivate-hook}
+@item <All actions for deactivation of ECB>
+@item @code{ecb-deactivate-hook}
+@end enumerate
+
+@node Automatic activation, , Standard activation, Activation and Deactivation
+@section Automatic activation and deactivation
+
+@cindex Automatic activation
+@cindex Automatic deactivation
+There are two ways for auto. (de)activation ECB after Emacs-start and
+for different window-configurations.
+
+@table @code
+@item ecb-auto-activate
+This option is for auto. activating ECB after Emacs-startup. Set this
+to not nil and ECB will automatically be started after Emacs comes up.
+
+@item window-manager support
+The window-manager support of ECB deactivates ECB when going to
+another window-configuration and reactivates ECB when coming back to
+the ECB-window-configuration. For all details about this see
+@ref{Window-managers and ECB}.
+@end table
+
+@node Usage of ECB, Customizing, Activation and Deactivation, Top
+@chapter Usage of ECB
+
+This chapter describes in a detailed manner all aspects of using the
+Emacs Code Browser.
+
+@menu
+* Using the mouse::             Working with the mouse
+* Using the keyboard::          Working with the keyboard
+* The edit-area::               How to use the edit-area
+* Temp- and compile-buffers::   Displaying temp- and compilation-buffers
+* The other window::            How the ``other window'' is determined
+* The Methods buffer::          Using and customizing the Methods-buffer
+* Filtering the tree-buffers::  Applying filters to the ECB-tree-buffers 
+* The ECB-layout::              Changing, customizing, redrawing, creating
+* Hiding the ECB windows::      Hiding/Showing the ECB-windows
+* Maximizing the ECB windows::  Maximizing the ECB-windows
+* Back/forward navigation::     Back- and forward navigation like a browser
+* ECB-window synchronizing::    Auto./manual synchronizing the ECB-windows
+* Stealthy background tasks::   Stealthy background-tasks of ECB
+* Interactive ECB commands::    All interactive user-commands of ECB
+@end menu
+
+@node Using the mouse, Using the keyboard, Usage of ECB, Usage of ECB
+@section Working with the mouse in the ECB-windows
+
+@cindex primary button
+@cindex secondary button
+@cindex mouse button
+Normally you get best usage if you use ECB with a mouse. ECB
+distinguishes between a @dfn{primary} and a @dfn{secondary}
+mouse-button.
+
+With the option @code{ecb-primary-secondary-mouse-buttons} the following
+combinations of primary and secondary mouse-buttons are possible:
+
+@itemize @minus
+@item
+primary: mouse-2, secondary: C-mouse-2@footnote{means mouse-2 while CTRL-key
+is pressed.}. This is the default.
+
+@item
+primary: mouse-1, secondary: C-mouse-1
+
+@item
+primary: mouse-1, secondary: mouse-2
+@end itemize
+
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect.
+
+@subsection The primary mouse-button
+
+A click with the primary button causes the main effect in each ECB-buffer:
+
+@itemize @minus
+@item ECB Directories:
+Expanding/collapsing nodes and displaying files in the ECB-Sources
+buffer.
+
+@item ECB sources/history:
+Opening the file in that edit-window specified by the option
+@code{ecb-mouse-click-destination}.
+
+@item ECB Methods:
+Jumping to the method in that edit-window specified by the option
+@code{ecb-mouse-click-destination}.
+@end itemize
+
+@subsection The POWER- or SHIFT-click
+
+@cindex SHIFT-click
+@cindex POWER-click
+A click with the primary mouse-button while the SHIFT-key is pressed
+is called the POWER-click and does the following (depending on the
+ECB-buffer where the POWER-click occurs):
+
+@itemize @minus
+@item ECB Directory:
+Refreshing the directory-contents-cache (see
+@code{ecb-cache-directory-contents}).
+
+@item ECB sources/history:
+Only displaying the source-contents in the method-buffer but not
+displaying the source-file in an edit-window. This means it opens the
+clicked source only in the background and shows all its
+methods/variables in ECB-Methods; the buffer of the edit-window is not
+changed! This is very useful to get only an overlook for a certain
+source.
+
+@item ECB Methods:
+Narrowing to the clicked method/variable/ect... (see
+@code{ecb-tag-visit-post-actions}). But this works only for sources
+parsed by semantic, not by imenu or etags!
+@end itemize
+
+Per default the complete node-name of an item in a tree-buffer is displayed in
+the echo-area if the mouse moves over it, regardless if the related window is
+the active one or not. You get the same effect always after a POWER-click. In
+general: For each tree-buffer there is an option @code{ecb-*-show-node-info}
+(replace ``*'' with directories, sources, methods, history or analyse, e.g.
+@code{ecb-directories-show-node-info} is the option for the
+ECB-directories-window.): you can specify in a detailed manner for the named
+ECB tree-buffer when and which node-info should be displayed in the
+minibuffer.
+
+@subsection The secondary mouse-button
+
+The secondary mouse-button is for opening (jumping to) the file in
+another edit-window (see the documentation of the option
+@code{ecb-mouse-click-destination}).
+
+@subsection The right mouse-button
+
+In each ECB-buffer mouse-3 (= right button) opens a special context
+popup-menu for the clicked item where you can choose several senseful
+actions.
+
+With the options @code{ecb-directories-menu-user-extension},
+@code{ecb-sources-menu-user-extension},
+@code{ecb-methods-menu-user-extension} and
+@code{ecb-history-menu-user-extension} you can add statically new
+commands to the popup-menus. See the docstring of
+@code{ecb-directories-menu-user-extension} for more details.
+
+With the options @code{ecb-directories-menu-user-extension-function},
+@code{ecb-sources-menu-user-extension-function},
+@code{ecb-methods-menu-user-extension-function} and
+@code{ecb-history-menu-user-extension-function} you can add new
+commands to the popup-menus in a dynamic manner. See the docstring of
+@code{ecb-directories-menu-user-extension-function} for more details.
+
+With the options @code{ecb-directories-menu-sorter},
+@code{ecb-sources-menu-sorter}, @code{ecb-methods-menu-sorter} and
+@code{ecb-history-menu-sorter} you can even re-arrange all the entries
+of the popup-menus.
+
+@subsection Horizontal scrolling with the mouse
+
+In each tree-buffer of ECB you can easily scroll left and right with
+the mouse if the option @code{ecb-tree-easy-hor-scroll} is not
+@code{nil}.
+
+The reason for this is: XEmacs has horizontal scroll-bars so invisible
+parts beyond the right window-border of a tree-buffer can always made
+visible very easy.
+
+GNU Emacs does not have hor. scroll-bars so especially with the mouse
+it is quite impossible to scroll smoothly right and left. The
+functions @code{scroll-left} and @code{scroll-right} can be annoying
+and are also not bound to mouse-buttons.
+
+ECB offers three ways for smoothly hor. scrolling with GNU Emacs if
+@code{ecb-tree-easy-hor-scroll} is a positive integer-value S:
+
+@itemize @bullet
+@item
+In all ECB-tree-buffers the keys @kbd{M-mouse-1} and @kbd{M-mouse-3}
+are bound to scrolling left rsp. right with scroll-step S.
+
+@item
+Clicking with mouse-1 or mouse-2 onto the edge of the modeline has the
+same effect, i.e. if you click with mouse-1 onto the left \(resp
+right) edge of the modeline you will scroll left \(resp. right) with
+scroll-step S.
+
+@item
+Additionally @kbd{C-M-mouse-1} and @code{C-M-mouse-3} are bound to
+scrolling left rsp. right with scroll-step @code{window-width} - 2.
+@end itemize
+
+This is NOT done for XEmacs cause of its horizontal scrollbars. If you
+want scrolling left and right with the mouse in XEmacs then activate
+the horizontal scrollbars.
+
+
+@node Using the keyboard, The edit-area, Using the mouse, Usage of ECB
+@section Working with the keyboard in the ECB-windows
+
+ECB offers the @code{ecb-mode-map} which binds the most important
+functions of ECB to keys so you can easily use ECB in every
+window@footnote{Regardless if a tree-window or an edit-window} without
+a mouse.
+
+IMPORTANT: Do not modify @code{ecb-mode-map} directly! The option
+@code{ecb-key-map} defines all ECB keybindings, including a common
+prefix-key (This is by default @kbd{C-c .}). If there are conflicts
+with other minor-modes or packages you can define very easy another
+prefix. Please read carefully the description of @code{ecb-key-map}
+(@pxref{ecb-general}).!
+
+The following sections describe special topics about using the
+keyboard in the ECB-tree-buffers:
+
+@menu
+* Navigation/Selection::        Keyboard navigation/selection in a tree-buffer
+* Incremental search::          Find nodes as fast as possible
+* Personal tree-keybindings::   Adding personal keybindings to a tree-buffer
+* Using popup-menus::           Using the popup-menus from keyboard.
+@end menu
+
+@node Navigation/Selection, Incremental search, Using the keyboard, Using the keyboard
+@subsection Navigation and Selection in a tree-buffer
+
+@cindex RETURN key
+@cindex TAB key
+@cindex expanding
+@cindex collapsing
+In the ECB-buffers RETURN and TAB are the most important keys:
+
+@itemize @bullet
+@item
+RETURN does the same as the primary button and C-RETURN does the same
+as the secondary button. S-RETURN is the same as the SHIFT-click or
+POWER-click. The terms ``primary'', ``secondary'', ``SHIFT-'' and
+``POWER-click'' are explained in @ref{Using the mouse}. See also the
+option @code{ecb-tree-do-not-leave-window-after-select} and the
+function @code{ecb-toggle-do-not-leave-window-after-select} which is
+bound to @kbd{C-t} in each tree-buffer of ECB!
+
+For all RETURN (and S-RETURN and C-RETURN) hits the position of the
+point within the current node-line is irrelevant! This is for
+conveniance.
+
+@item
+TAB always expands or collapses expandable nodes.
+@end itemize
+
+The RETURN and TAB keys can not be (re)defined with @code{ecb-key-map}!
+
+If you set @code{ecb-tree-navigation-by-arrow} to not nil then the
+arrow keys work in the ECB tree-window in the following smart way:
+
+@itemize @bullet
+@item
+Left-arrow: If node is expanded then it will be collapsed otherwise
+(i.e. current node is either not expandable or not expanded) point
+jumps to the next ``higher'' node in the hierarchical tree (higher
+means the next higher level or - if no higher level available
+- the next higher node on the same level).
+
+@item
+Right-arrow: If node is expandable but not expanded then it will be
+expanded. Otherwise (i.e. current node is either not expandable or
+already expanded) point jumps to the next following node (which is the
+first subnode in case of an already expanded node or simply the next
+node in the following line).
+
+@item
+Up- and down-arrow: Point jumps to the first character of the previous
+(up) rsp. next node (down). ``First'' character means either the first
+character of the expand-symbol (in case
+@code{ecb-tree-expand-symbol-before} is not nil) or of the displayed
+node-name. Or with other words: The first non-indentation and
+non-guide-line (see @code{ecb-tree-buffer-style}) character of a node
+(@pxref{Tree-buffer styles}).
+@end itemize
+
+
+@node Incremental search, Personal tree-keybindings, Navigation/Selection, Using the keyboard
+@subsection Incremental search for a node in current tree-buffer
+
+@cindex Incremental search
+Each display-able key (e.g. all keys normally bound to @code{self-insert-command})
+is appended to the current search-pattern. The tree-buffer tries to jump to the
+first node which matching the current search-pattern either as substring or as
+prefix (see below). If no match is found then nothing is done. There are some
+special keys:
+
+@itemize @bullet
+@item @kbd{backspace} and @kbd{delete}:
+Delete the last character from the search-pattern.
+
+@item @kbd{home}:
+Delete the complete search-pattern
+
+@item @kbd{end}:
+Expand either to a complete node if current search-pattern is already
+unique or expands to the greatest common substring or prefix of the
+nodes. If there are at least two nodes with the same greatest
+common-prefix than every hit of @kbd{end} jumps to the next node with this
+common prefix.
+@end itemize
+
+For better overlooking the current search-pattern is shown in the echo area.
+After selecting a node with RET the search-pattern is cleared out. With
+@code{ecb-tree-incremental-search} you can specify if the current search-pattern
+must be a real prefix of the node (default) or if any substring is matched.
+
+For faster and easier finding the right node in a ecb-window the incremental
+search ignores the following non interesting stuff:
+
+@itemize @minus
+@item any leading spaces
+@item expand/collapse-buttons: [+] rsp. [-]
+@item protection-signs (+, -, #) in the method-window if uml-notation is used
+@item variables types or return-types in front of variable- or method-names.
+@item const specifier for variables
+@end itemize
+
+This means: Just type in the prefix (rsp. a substring) of a class-,
+variable-, method-, directory- or filename and ECB will bring you as
+fast as possible to the node you want. Incremental node-search uses
+the value of @code{case-fold-search}.
+
+Tip: The @code{ecb-minor-mode} offers you in the @code{ecb-mode-map}
+(customizable via @code{ecb-key-map}) some keys for selecting every window
+of the ecb-frame. This makes window-selection a child“s play. For
+example you can jump into the method-window by hitting @kbd{C-c . gm}.
+
+@node Personal tree-keybindings, Using popup-menus, Incremental search, Using the keyboard
+@subsection Adding personal keybindings for the tree-buffers
+
+There are five hooks which can be used for adding personal keybindings
+to the ECB tree-buffers:
+
+@itemize @minus
+@item @code{ecb-common-tree-buffer-after-create-hook}
+@item @code{ecb-directories-buffer-after-create-hook}
+@item @code{ecb-sources-buffer-after-create-hook}
+@item @code{ecb-methods-buffer-after-create-hook}
+@item @code{ecb-history-buffer-after-create-hook}
+@end itemize
+
+These hooks are called directly after tree-buffer creation so they can
+be used to add personal local keybindings@footnote{To be more general:
+They can be used to run any arbitrary lisp code after a tree-buffer
+creation!} either to all tree-buffers
+(@code{ecb-common-tree-buffer-after-create-hook}) or just to a certain
+tree-buffer. Here is a list which keys MUST NOT be rebound:
+
+@itemize @bullet
+@item @kbd{RET} and all combinations with @kbd{Shift} and @kbd{Ctrl}:
+Used for selecting nodes in all tree-buffers.
+@item @kbd{TAB}:
+Used for expanding/collapsing nodes in all tree-buffers.
+@item @kbd{C-t}:
+Used for toggling ``do not leave window after selection'' in all
+tree-buffers, see command
+@code{ecb-toggle-do-not-leave-window-after-select}.
+@item All self-inserting characters:
+Used for easy and fast navigation in all tree-buffers,
+@xref{Incremental search}.
+@item @kbd{F2}, @kbd{F3}, @kbd{F4}:
+Used for customizing ECB, adding source-path in the directories buffer.
+@end itemize
+
+The following example binds @kbd{C-a} to some useful code in ALL
+tree-buffers and @kbd{C-d} to even more useful code ONLY in the
+directories buffer:
+
+@example
+@group
+(add-hook 'ecb-common-tree-buffer-after-create-hook
+          (lambda ()
+             (local-set-key (kbd "C-a")
+                            (lambda ()
+                               (interactive)
+                               (message "ECB is great!")))))
+
+(add-hook 'ecb-directories-buffer-after-create-hook
+          (lambda ()
+             (local-set-key (kbd "C-d")
+                            (lambda ()
+                               (interactive)
+                               (message "ECB is wonderful!")))))
+@end group
+@end example
+
+@node Using popup-menus, ,Personal tree-keybindings, Using the keyboard
+@subsection Using the popup-menu of a tree-buffer from keyboard.
+
+@cindex tmm
+A popup-menu of a tree-buffer can be activated from keyboard with the
+command @code{tree-buffer-show-menu-keyboard} which is bound to
+@kbd{M-m} in every tree-buffer. How the popup-menu is displayed
+depends if this command is called with a prefix-argument or not:
+
+If called without a prefix-arg then the popup-menu is displayed
+graphically as if it would be activated via mouse (for GNU Emacs this
+works perfectly but for XEmacs there is a bug which results in a wrong
+menu-position - but the menu itself works also with XEmacs).
+
+If called with a prefix-arg (@kbd{C-u M-m}) then the popup-menu is
+displayed with the tmm-mechanism (like the Emacs-[menu-bar] is
+displayed when `tmm-menubar' is called). This tmm-display is only
+available for GNU Emacs.
+
+
+@node The edit-area, Temp- and compile-buffers, Using the keyboard, Usage of ECB
+@section Working with the edit-window(s) of the edit-area
+
+@cindex edit-window
+ECB offers you all what you need to work with the edit-area as if the
+edit-windows of the edit-area would be the only windows of the
+ECB-frame.
+
+@cindex Adviced functions
+ECB advices the following user-commands so they work best with ECB:
+
+@itemize @minus
+@item @code{balance-windows}
+@item @code{delete-other-windows}
+@item @code{delete-window}
+@item @code{delete-windows-on}
+@item @code{display-buffer}
+@item @code{shrink-window-if-larger-than-buffer}
+@item @code{split-window}
+@item @code{split-window-horizontally}
+@item @code{split-window-vertically}
+@item @code{switch-to-buffer}
+@item @code{switch-to-buffer-other-window}
+@item @code{other-window}
+@item @code{other-window-for-scrolling}
+@end itemize
+
+The behavior of the adviced functions is (slightly simplified):
+
+@itemize @bullet
+@item
+All these adviced functions behaves exactly like their corresponding
+original functions but they always act as if the edit-window(s) of ECB
+would be the only window(s) of the ECB-frame. So the edit-window(s) of
+ECB seems to be a normal Emacs-frame to the user. This means that you
+can split and delete edit-windows without any restriction - ECB
+ensures that neither the special ECB-windows nor the compile-window
+will be damaged.
+
+@item
+If there is a persistent compile-window (@pxref{Temp- and
+compile-buffers}) then all compilation-buffers in the sense of
+@code{ecb-compilation-buffer-p} will be displayed in the
+compile-window.
+
+@item
+If called in another frame than the ECB-frame these functions behave
+exactly like the not adviced original versions!
+@end itemize
+
+@strong{Please note}: All these advices are only enabled when ECB is
+enabled.
+
+Another interesting option in the context of the edit-window and these
+adviced functions is @code{ecb-layout-always-operate-in-edit-window}!
+
+@subsection Documentation of the adviced window functions
+
+This section describes for every adviced window function (s.a.) how it
+differs from the original version. Only the differences are mentioned,
+so if you want the full documentation of such a function call
+@code{describe-function} or @kbd{C-h f}.
+
+@deffn Command other-window ARG &optional ALL-FRAMES
+Around-advice @code{ecb}: The ECB-version of @code{other-window}.
+Works exactly like the original function with the following
+ECB-adjustment: The behavior depends on
+@code{ecb-other-window-behavior}.
+@end deffn
+
+@deffn Command delete-window &optional WINDOW
+Around-advice @code{ecb}: The ECB-version of @code{delete-window}.
+Works exactly like the original function with the following
+ECB-adjustment:
+
+If optional argument WINDOW is nil (i.e. probably called
+interactively): If called in a splitted edit-window then it works like
+as if all the edit-windows would be the only windows in the frame.
+This means the current edit-window which contains the point will be
+destroyed and its place will be occupied from another one. If called
+in an unsplitted edit-window then nothing is done. If called in the
+compile-window of ECB then the compile-window will be hidden (like
+with @code{ecb-toggle-compile-window}). If called in an ecb-window
+of the current ECB-layout there are two alternatives:
+
+@itemize
+@item If the function is contained in
+@code{ecb-layout-always-operate-in-edit-window} the right edit-window
+is selected (depends on the value of the option
+@code{ecb-mouse-click-destination}) and does then it“s job.
+
+@item Otherwise the behavior depends on the value of the option
+@code{ecb-advice-window-functions-signal-error}.
+@end itemize
+
+If optional argument WINDOW is a living window (i.e. called from
+program): If WINDOW is an edit-window then this window is deleted, if
+WINDOW is the compile-window then it will be hidden and otherwise the
+behavior depends on @code{ecb-advice-window-functions-signal-error}.
+@end deffn
+
+@deffn Command delete-other-windows &optional WINDOW
+Around-advice @code{ecb}: The ECB-version of
+@code{delete-other-windows}. Works exactly like the original function
+with the following ECB-adjustment:
+
+If optional argument WINDOW is nil (i.e. probably called
+interactively): If called in a splitted edit-window then it works like
+as if all the edit-windows would be the only windows in the frame.
+This means all other edit-windows besides the current edit-window
+which contains the point will be destroyed and the current edit-window
+fills the whole edit-area. Neither the special ecb-windows nor the
+compile-window will be destroyed!
+
+@itemize
+
+@item
+If called in an unsplitted edit-window then either the compile-window
+will be hidden (if there is one) otherwise nothing is done.
+
+@item
+If called in one of the ecb-windows then the current one is maximized,
+i.e. the other ecb-windows (not the edit-windows!) are deleted.
+
+@item
+If called in the compile window there are two alternatives:
+
+@itemize @minus
+@item
+If the function is contained in
+@code{ecb-layout-always-operate-in-edit-window} the right edit-window
+is selected (depends on the value of the option
+@code{ecb-mouse-click-destination}) and then it does it“s job.
+
+@item
+Otherwise the behavior depends on the value of the option
+@code{ecb-advice-window-functions-signal-error}.
+@end itemize
+@end itemize
+
+If optional argument WINDOW is a living window (i.e. called from
+program): If WINDOW is an edit-window then this window is maximized
+(i.e. the other edit-window is deleted) if there are more at least 2
+edit-windows otherwise the compile-window is deleted (if there is
+one). If WINDOW is an ecb-window then only the other ecb-windows are
+deleted and in all other cases the behavior depends on
+@code{ecb-advice-window-functions-signal-error}.
+@end deffn
+
+
+@deffn Command delete-windows-on BUFFER &optional FRAME
+Around-advice @code{ecb}: The ECB-version of @code{delete-windows-on}.
+Works exactly like the original function with the following
+ECB-adjustment:
+
+An error is reported if @var{BUFFER} is an ECB-tree-buffer. These
+windows are not allowed to be deleted.
+@end deffn
+
+@deffn Command split-window &optional WINDOW SIZE HORFLAG
+Around-advice @code{ecb}: The ECB-version of @code{split-window}.
+Works exactly like the original function with the following
+ECB-adjustment:
+
+If called for a not-edit-window in the @code{ecb-frame} it stops with
+an error if @code{split-window} is not contained in the option
+@code{ecb-layout-always-operate-in-edit-window}! Besides this (e.g.
+called for a window in another frame than the @code{ecb-frame}) it
+behaves like the original version.
+@end deffn
+
+
+@deffn Command split-window-horizontally
+Around-advice @code{ecb}: The ECB-version of
+@code{split-window-horizontally}. Works exactly like the original
+function with the following ECB-adjustment:
+
+If called in any other window of the current ECB-layout it stops with
+an error if this @code{split-window-horizontally} is not contained in
+the option @code{ecb-layout-always-operate-in-edit-window}!
+@end deffn
+
+@deffn Command split-window-vertically
+Around-advice @code{ecb}: The ECB-version of
+@code{split-window-vertically}. Works exactly like the original
+function with the following ECB-adjustment:
+
+If called in any other window of the current ECB-layout it stops with
+an error if this @code{split-window-vertically} is not contained in
+the option @code{ecb-layout-always-operate-in-edit-window}!
+@end deffn
+
+
+@deffn Command display-buffer BUFFER &optional NOT-THIS-WINDOW FRAME
+Around-advice @code{ecb}: Makes this function compatible with ECB if
+called in or for the ecb-frame. It displays all buffers which are
+``compilation-buffers'' in the sense of
+@code{ecb-compilation-buffer-p} in the compile-window of ECB. If the
+compile-window is temporally hidden then it will be displayed first.
+
+If there is no compile-window (@code{ecb-compile-window-height} is
+nil) then it splits the edit-window if unsplitted and displays BUFFER
+in another edit-window but only if @code{pop-up-windows} is not nil
+(otherwise the edit-window will not be splitted).
+
+All buffers which are not ``compilation-buffers'' in the sense of
+@code{ecb-compilation-buffer-p} will be displayed in one of the
+edit-area and @code{display-buffer} behaves as if the edit-windows
+would be the only windows in the frame.
+
+If BUFFER is contained in @code{special-display-buffer-names} or
+matches @code{special-display-regexps} then
+@code{special-display-function} will be called (if not nil). But this
+behavior depends on the value of the option
+@code{ecb-ignore-special-display}. The values of
+@code{same-window-buffer-names} and @code{same-window-regexps} are
+supported as well.
+
+See the option @code{ecb-ignore-display-buffer-function}!
+
+If called for other frames it works like the original version.
+@end deffn
+
+@deffn Command switch-to-buffer BUFFER &optional NORECORD
+Around-advice @code{ecb}: The ECB-version of @code{switch-to-buffer}.
+Works exactly like the original but with the following enhancements
+for ECB:
+
+``compilation-buffers'' in the sense of
+@code{ecb-compilation-buffer-p} will be displayed always in the
+compile-window of ECB (if @code{ecb-compile-window-height} is not nil)
+- if the compile-window is temporally hidden then it will be displayed
+first. If you do not want this you have to modify the options
+@code{ecb-compilation-buffer-names},
+@code{ecb-compilation-major-modes} or
+@code{ecb-compilation-predicates}.
+
+If called for non ``compilation-buffers'' (s.a.) from outside the
+edit-area of ECB it behaves as if called from an edit-window if
+@code{switch-to-buffer} is contained in the option
+@code{ecb-layout-always-operate-in-edit-window}. Otherwise an error is
+reported.
+@end deffn
+
+@deffn Command switch-to-buffer-other-window BUFFER &optional FRAME
+Around-advice @code{ecb}: The ECB-version of
+@code{switch-to-buffer-other-window}. Works exactly like the original
+but with some adaptions for ECB so this function works in a
+``natural'' way:
+
+If called in any special ecb-window of the current ECB-layout then it
+goes always to an edit-window (which one depends on the setting in
+@code{ecb-mouse-click-destination}) and then goes on as if called from
+this edit-window.
+
+If a compile-window is used (i.e. @code{ecb-compile-window-height} is
+not nil) then ``compilation-buffers'' in the sense of
+@code{ecb-compilation-buffer-p} are always displayed in the
+compile-window. If the compile-window is temporally hidden then it
+will be displayed first. If no compile-window is used it behaves like
+the original.
+
+If called from within the compile-window then ``compilation-buffers''
+will be displayed still there and all other buffers are displayed in
+one of the edit-windows - if the destination-buffer is already
+displayed in one of the edit-windows then this one is used otherwise
+it behaves like the original.
+
+If called within an edit-window it behaves like the original function
+except for compilation-buffers (if a compile-window is used, see
+above).
+@end deffn
+
+
+@deffn Function other-window-for-scrolling
+Around-advice @code{ecb}: This function determines the window which is
+scrolled if any of the ``other-window-scrolling-functions'' is called
+(e.g. @code{scroll-other-window}):
+
+If the option @code{ecb-scroll-other-window-scrolls-compile-window} is
+not nil (maybe set by
+@code{ecb-toggle-scroll-other-window-scrolls-compile}) and a
+compile-window is visible then always the current buffer in the
+compile-window is scrolled!
+
+Otherwise it depends completely on the setting in
+@code{ecb-other-window-behavior}.
+@end deffn
+
+@deffn Command balance-windows
+Around-advice @code{ecb}: When called in the @code{ecb-frame} then
+only the edit-windows are balanced.
+@end deffn
+
+@node Temp- and compile-buffers, The other window, The edit-area, Usage of ECB
+@section Temp- and compile-buffers display in ECB
+
+@cindex temporary buffers
+@cindex help buffers
+@cindex compilation buffers
+@cindex grep buffers
+If you call any help in Emacs, e.g. by calling @code{describe-function}, or
+if you do a completion in the minibuffer, then Emacs displays the
+result-buffer in another window. This behavior you have also in ECB.
+
+@subsection Standard Emacs behavior
+
+@subsubsection Gnu Emacs 21.x, 22.x and XEmacs 21.4:
+
+If the edit-area is already splitted into at least two edit-windows then the
+temp-buffer is displayed in another edit-window otherwise the edit-area will
+be splitted first vertically into two edit-windows, one above the other. The
+variables @code{temp-buffer-max-height} and @code{temp-buffer-resize-mode}
+(for GNU Emacs) and @code{temp-buffer-shrink-to-fit} (for XEmacs) work also
+correctly with ECB.
+
+Same for all completion-buffer and ``compile''-like output-buffers (e.g. after
+a @code{compile} or @code{grep}) and the variable
+@code{compilation-window-height}@footnote{It goes without saying that is is
+also true for @code{grep-window-height} and all other ``compile''-modes.}.
+
+@subsubsection Gnu Emacs 23.x
+
+Gnu Emacs 23 has a much smarter window-manager for displaying temporary
+buffers (like help-buffers) and ``compile''-buffers (like real compilation
+outputs but also grep-outputs, completions etc.). Therefore ECB uses
+completely the logic of Emacs 23 and does exactly what Emacs 23 would do
+without activated ECB: This means mainly that the split-behavior depends on
+the settings of the options @code{split-width-threshold} and
+@code{split-height-threshold}.
+
+@strong{Please note}: If you are wondering why displaying temporary-buffers
+(like help, compile, grep, completion etc.) shows different behavior compared
+to deactivated ECB, then you probably have to adjust the values of the options
+@code{split-width-threshold} and @code{split-height-threshold} to the sizes of
+the edit-area of ECB (at least nearly).
+
+
+This is default behavior of ECB. But there is also another way to
+display such buffers: Using a persistent extra window at the bottom of
+the ECB-frame, named the ``compile-window'':
+
+@subsection Using a persistent compile window
+
+With the option @code{ecb-compile-window-height} you can define if the
+ECB layout should contain per default a compile-window at the
+bottom (just specify the number of lines which should be used for the
+compile-window at the bottom of the frame). If ``yes'' ECB displays
+all buffers for which the function @code{ecb-compilation-buffer-p}
+returns not nil (e.g. all output of compilation-mode (compile, grep
+etc.) or all temp-buffers like *Help*-buffers) in this special
+window.
+
+In general: With the options @code{ecb-compilation-buffer-names},
+@code{ecb-compilation-major-modes} and
+@code{ecb-compilation-predicates} you can define which buffers should
+be displayed in the compile-window of ECB (for example if you call
+@code{switch-to-buffer} or @code{display-buffer} or if you run
+@code{compile} or if you display *Help*-buffers). Per default these
+are all temp-buffers like *Help*-buffers, all compile- and grep
+buffers, *Occur*-buffers etc. See the default values of these options.
+
+With the command @code{ecb-toggle-compile-window} (bound to @kbd{C-c .
+\}) you can toggle the visibility of the compile-window
+(@pxref{Interactive ECB commands}).
+
+There are some more useful options and commands related to the
+compile-window of ECB (to see all options for the compile-window see
+the customization group @ref{ecb-compilation}):
+
+@itemize @bullet
+@item
+With the option @code{ecb-compile-window-temporally-enlarge} you can
+allow Emacs to enlarge temporally the ECB-compile-window in some
+situations. Please read the comment of this option. See also the
+description of the command
+@code{ecb-toggle-compile-window-height}.
+
+@item
+With the option @code{ecb-enlarged-compilation-window-max-height} you
+specify how @code{ecb-toggle-compile-window-height} should
+enlarge the compile-window.
+
+@item
+With the command @code{ecb-cycle-through-compilation-buffers}
+(@pxref{Interactive ECB commands}) you can cycle through all current
+open compilation-buffers (in the sense of
+@code{ecb-compilation-buffer-p}) very fast.
+@end itemize
+
+ECB offers the same compile-window functionality regardless if the
+ECB-window are hidden or not. The state of the compile-window will be
+preserved when toggling the ecb-windows or when maximizing one
+ecb-windows! So you have the advantage of one special window for all
+help-, grep or compile-output (see above) also when the ecb-windows
+are hidden - a window which will not be deleted if you call
+@code{delete-other-windows} (bound to @kbd{C-x 1}) for one of the
+edit-windows. In general: All features of the compile-window work with
+hidden ecb-windows exactly as when the ecb-windows are visible.
+
+
+@anchor{Problems with the compile window}
+@subsection What to do if there are problems with the compile-window
+
+Normally displaying temp- and compilation-buffers (or more general:
+displaying buffer for which @code{ecb-compilation-buffer-p} is not
+nil) should work reliable. But if there are problems which you can not
+handle with the options @code{ecb-compilation-buffer-names},
+@code{ecb-compilation-major-modes} or
+@code{ecb-compilation-predicates} then please go on like follows:
+
+@enumerate
+@item
+Set the option @code{ecb-layout-debug-mode} to not nil.
+
+@item
+Reproduce the wrong behavior exactly by repeating all the operations
+which lead to the problem. If possible then restart Emacs before
+reproducing the problem so you can begin from the beginning!
+
+@item
+Now send immediately a bug report with
+@code{ecb-submit-problem-report}.
+
+@item
+Set @code{ecb-layout-debug-mode} back to nil if you do not want
+further debugging output in the *Messages* buffer"
+@end enumerate
+
+@anchor{Using special-display with ECB}
+@cindex special-display
+@subsection Handling special-display-buffers
+
+Emacs offers three options for a special-display-handling of certain
+buffers: @code{special-display-function},
+@code{special-display-buffer-names} and
+@code{special-display-regexps} (see the Emacs manual for a description
+of these options). ECB offers an option
+@code{ecb-ignore-special-display} for specification in which
+situations ECB should take account for the values of these
+special-display-options.
+
+Default-behavior of ECB is to ignore these special-display-options
+when a persistent compile-window is active (i.e.
+@code{ecb-compile-window-height} is not nil). But with
+@code{ecb-ignore-special-display} you can tell ECB, that either always
+the special-display-options should be ignored as long as ECB is active
+or that they should be never igored regardless if a persistent
+compile-window is set or not. In the latter case using
+@code{display-buffer} or @code{pop-to-buffer} takes always account for
+the values of these options - like the original behavior of Emacs.
+
+@node The other window, The Methods buffer, Temp- and compile-buffers, Usage of ECB
+@section How the ``other window'' is determined by ECB
+
+@cindex other window
+Normally all windows in an Emacs-frame are arranged in a cyclic order
+and window-selecting-commands like @code{other-window} or
+window-scrolling-commands like @code{scroll-other-window} choose
+simply the next@footnote{@code{other-window} allows to select ARG'th
+different window, i.e. the window ARG steps away from current window
+in the cyclic order of the windows} window after the current window as
+``other window''.
+
+@subsection ``Other window''-basics in ECB
+
+With a typical window-layout of ECB such a cyclic order of
+@strong{all} windows in the ECB-frame does not make sense because it
+would be not very intuitive and against that what the user wants to
+``say'' when calling @code{other-window} or
+@code{scroll-other-window}.
+
+Therefore ECB divides the whole set of windows of the ECB-frame in
+several subsets:
+
+@itemize @bullet
+@item The edit-windows of the edit-area
+@item The special tree-windows for browsing-tasks
+@item The compile-window at the bottom (if there is one)
+@item The minibuffer-window of the ECB-frame (if active)
+@end itemize
+
+Each of these subsets will be treated as a cyclic ordered subset, i.e.
+all windows in each of these subsets are ordered as the function
+@code{walk-windows} would visit the windows when the windows of a
+subset would be the only windows of a
+frame@footnote{@code{other-window} uses the same window-ordering as
+@code{walk-windows}}.
+
+@subsection Builtin ``other window'' behaviors of ECB
+
+ECB now offers to specify the behavior of commands like
+@code{other-window} or @code{scroll-other-window} within the
+ECB-frame. This can be done with the option
+@code{ecb-other-window-behavior}. This option offers several builtin
+behaviors:
+
+@itemize @bullet
+@item All windows of the ECB-frame are considered
+
+ECB will cycle through all windows of the ECB-frame or scroll simply
+the next window in the ECB-frame, means it behaves like the original
+@code{other-window} rsp. the original
+@code{other-window-for-scrolling}.
+
+@item Only the windows of the edit-area are considered
+
+ECB will only cycle through the edit-windows of ECB or only scroll
+another edit-window. If the selected window is not an edit-window then
+all windows are taken into account.
+
+@item The edit-windows and the compile-window are considered
+
+Like above but the compile-window will be added to the subset of the
+edit-windows.
+
+@item Behave as smart and intuitive as possible
+
+This is the default behavior of ECB. ECB tries to choose the
+@code{other-window}-destination or the ``other window'' to scroll in a
+smart and intuitive way: If point is in one of the edit-windows and if
+the edit-area is splitted then always the ``next'' edit-window is
+choosen (whereas the next edit-window of the last edit-window is the
+first edit-window)- if the edit-area is unsplitted then the
+compile-window is used if there is one. In the context of an
+@code{other-window}-call the @var{ARG} of @code{other-window} will be
+taken into account.
+
+If one of the special ecb-windows is selected then always the ``next''
+ecb-window is choosen (whereas the next ecb-window of the last
+ecb-window is the first ecb-window). In the context of an
+@code{other-window}-call the @var{ARG} of @code{other-window} will be
+taken into account. If there is only one ecb-window then ECB considers
+also the edit-windows.
+
+If the compile-window is selected then always the last edit-window
+which had the point will be used unless @code{other-window} has been
+called with a prefix-argument unequal 1.
+@end itemize
+
+Regardless of the different behaviors above ECB handles the situation
+of an active minibuffer during a call to @code{other-window} or
+@code{scroll-other-window} like follows:
+
+If the minibuffer-window is selected then ECB always chooses the
+window @code{minibuffer-scroll-window} points to (when this variable
+is set, otherwise the compile-window or the last selected edit-window
+is choosen) when the called command is called to choose the 1. next
+window (always true for scrolling another window or true when
+@code{other-window} called without prefix-arg or with prefix-arg equal
+1). Otherwise the window ARG steps away is choosen (in case of
+@code{other-window}).
+
+If there is an active minibuffer but the minibuffer-window is not
+selected then @code{other-window} and @code{scroll-other-window}
+behave like the original version.
+
+@subsection User-defined ``other window'' behavior
+
+In addition to the builtin ``other window'' behaviors ECB offers a
+user to completely define for himself how ECB should choose another
+window for scrolling it or selecting it. This can be done with the
+option @code{ecb-other-window-behavior} too because this option can
+also have a function-symbol as value:
+
+Such a function gets seven arguments:
+@enumerate
+@item
+A canonical list of all currently visible windows of the
+@code{ecb-frame}
+@item
+A canonical list of all currently visible edit-windows
+@item
+A canonical list of all currently visible ecb-windows
+@item
+The window-object of the compile-window if there is any.
+@item
+The minibuffer-window of the ECB-frame if there is an active
+minibuffer.
+@item
+The result of the function @code{ecb-where-is-point} - see the
+documentation of this function for details.
+@item
+An integer which indicates how many steps away from the current
+selected window the ``other-window'' is. Is nil when this function is
+called in another context than for @code{other-window}.
+@end enumerate
+
+The function has to return a window-object which is then used as
+``other window'' for the command @code{other-window} or for scrolling
+another window (e.g. with @code{scroll-other-window}). Such a function
+has to handle properly all situation for itself.
+
+Here is an example for such a function:
+
+@example
+@group
+(defun ecb-get-other-window-smart (win-list
+                                   edit-win-list
+                                   ecb-win-list
+                                   comp-win
+                                   minibuf-win
+                                   point-loc
+                                   nth-window)
+  "Implements the smart-setting of `ecb-other-window-behavior'."
+  (if minibuf-win
+      ;; if we have an active mini-buffer we delegate this to
+      ;; `ecb-get-other-window-minibuf-active'
+      (ecb-get-other-window-minibuf-active win-list
+                                           edit-win-list
+                                           ecb-win-list
+                                           comp-win
+                                           minibuf-win
+                                           point-loc
+                                           nth-window)
+    ;; here we have no active minibuffer!
+    (let ((nth-win (or nth-window 1)))
+      (cond ((equal point-loc 'ecb)
+             (ecb-next-listelem ecb-win-list (selected-window) nth-win))
+            ((equal point-loc 'compile)
+             (if (= nth-win 1)
+                 (or (and ecb-last-edit-window-with-point
+                          (window-live-p ecb-last-edit-window-with-point)
+                          ecb-last-edit-window-with-point)
+                     (car edit-win-list))
+               (ecb-next-listelem (append edit-win-list
+                                          (list (selected-window)))
+                                  (selected-window)
+                                  nth-win)))
+            (t ;; must be an edit-window
+             (ecb-next-listelem (append edit-win-list
+                                        (if (and comp-win
+                                                 (= (length edit-win-list)
+                                                    1))
+                                            (list comp-win)))
+                                (selected-window)
+                                nth-win))))))
+@end group
+@end example
+
+This example implements the builtin smart behavior described above.
+
+@node The Methods buffer, Filtering the tree-buffers, The other window, Usage of ECB
+@section Using and customizing the ECB-Methods buffer
+
+ECB is mostly designed to display parsing information for files
+supported by semantic. But beginning with version 1.94 it also
+supports other parsing engines like imenu and etags, so also files not
+supported by semantic but by imenu/etags can be displayed in the
+Method-buffer of ECB. Therefore we have to introduce some terminology:
+
+@cindex semantic-sources
+@anchor{Definition of semantic- and non-semantic-sources}
+@itemize @minus
+@item @dfn{semantic-sources}:
+These are file-types for which a semantic grammar is available, so the
+files are parse-able by semantic. These sources are supported best by
+ECB and most of the following options and descriptions are related to
+these file-types. Examples are programming-sources like C++, C, Java,
+Emacs-Lisp and Texinfo-file and some more.
+
+@cindex non-semantic-sources
+@item @dfn{non-semantic-sources}:
+For these files there is no semantic-grammar available so they can not
+be parsed by semantic. Examples are Perl-, LaTeX- and TeX-files. But
+for many of these files imenu and/or etags parsers exist. ECB supports
+now parsing and displaying these file-types too and it uses for this
+some speedbar-logic.
+@end itemize
+
+This chapter describes how to use and customize the Methods-buffer of
+ECB.
+
+@menu
+* Visiting tags::               Possible actions after visiting a tag
+* Expanding::                   Explicit and automatic expanding
+* Customizing the display::     How to customize the Methods-buffer display
+* Rebuilding the Methods::      When to rebuild the Methods-buffer      
+@end menu
+
+@node Visiting tags, Expanding, The Methods buffer, The Methods buffer
+@subsection Possible actions after visiting a tag
+
+You visit a tag by clicking with either the primary oder secondary
+mouse-button (or by hitting @kbd{RET} or @kbd{C-RET} if using the
+keyboard) onto a node in the Methods-tree-buffer of ECB. This simply
+selects the ``right'' edit-window (depends if clicked with the primary
+or secondary button, in how many windows the edit-area is splitted and
+the value of @code{ecb-mouse-click-destination}) and puts the point
+onto the first line of the clicked tag.
+
+But you can define if after this ``basic'' tag-visit-action more
+additional actions should be performed by ECB. You can either use some
+of the predefined actions (e.g. highlighting the header-line of the
+tag) or define own actions. You can set different actions for
+different major-modes. All this is done via the option
+@code{ecb-tag-visit-post-actions}.
+
+The following actions are currently predefined:
+@itemize @minus
+@item @code{ecb-tag-visit-highlight-tag-header}
+@item @code{ecb-tag-visit-smart-tag-start}
+@item @code{ecb-tag-visit-recenter}
+@item @code{ecb-tag-visit-recenter-top}
+@item @code{ecb-tag-visit-goto-doc-start}
+@item @code{ecb-tag-visit-narrow-tag}
+@end itemize
+
+See the documentation of these function for details what they do.
+
+Per default ECB performs the actions
+@code{ecb-tag-visit-smart-tag-start} and
+@code{ecb-tag-visit-highlight-tag-header} for all major-modes.
+
+
+@node Expanding, Customizing the display, Visiting tags, The Methods buffer
+@subsection Explicit and automatic expanding of the ECB-methods-buffer
+
+@subsubsection Explicit expanding all nodes to a certain expansion level
+
+With the command @code{ecb-expand-methods-nodes} (bound to @kbd{C-c .
+x}) you can get a fast overlook of the contents of the source-buffer,
+because this command allows precisely expanding all tags with a
+certain indentation-level. So you can either expand no tags (or with
+other words collapse all tags) or expand all tags so see the contents
+of a buffer at one glance. Or you can expand exactly that tags of a
+certain indentation level.
+
+Which node-types are expanded (rsp. collapsed) by this command
+depends for semantic-sources on the options
+@code{ecb-methods-nodes-expand-spec} and
+@code{ecb-methods-nodes-collapse-spec}! For non-semantic-sources always
+all node-types are expanded/collapsed, i.e. the two options above
+takes no effect for these files.
+
+@subsubsection Explicit expanding of the current node to a certain level
+
+With the popup-menu of the methods-buffer an even more precise
+expansion is possible because it allows not only expanding all tags
+(see above) but offers in addition expanding only the current-node
+(for which the menu was activated) to an exact level of expansion:
+
+All menu-entries are label with an expansion-``level'' whereas level
+specifies precisely which level of nodes should be expanded. level
+means the indentation-level of the NODE itself and its (recursive)
+subnodes relative to the NODE itself.
+
+So a level value X means that all (sub)nodes with an indentation-level
+<= X relative to NODE are expanded and all other are collapsed.
+
+Examples:
+
+@itemize @minus
+@item Expand this node to level 0:
+Expand only the NODE itself because it is the only node which has
+indentation 0 to itself. All deeper indented nodes will be collapsed.
+This is also the important difference between using this menu compared
+to clicking onto the expand-symbol of the node: The latter one expands
+the NODE to that expansion-state it has before the last collapsing (so
+when deeper nodes has been expanded they will be expanded now to). The
+former one expands exactly(!) to level 0, means expand only the node
+itself and collapse all(!) its subnodes recursively(!).
+
+@item Expand this node to level 1:
+Expand the NODE itself and all of its direct subnodes - because only
+the direct subnodes of NODE have indentation-level 1 relativ to NODE.
+All deeper nodes will be collapsed.
+
+@item Collapse this node completely:
+Collapses the current node recursively, means collapse not only the
+node itself but also its subnodes, the subnodes of the subnodes and so
+on! This is very differnt from clicking onto the collapse symbol
+because this action only collapses the node itself but preserves the
+expansion-state of all its subnodes!
+
+@end itemize
+
+Expanding the current node with the popup-menu ignores the settings in
+the options @code{ecb-methods-nodes-expand-spec} and
+@code{ecb-methods-nodes-collapse-spec}!
+
+@subsubsection Automatic expansion ot tags after buffer-parsing
+
+With the option @code{ecb-show-tags} you tell ECB how to display tags
+of a certain tag-class (@pxref{Customizing the display}). Among other
+things you can tell ECB that a certain tag-class should be combined
+under an expanded or collapsed bucket-node. But such a setting defines
+the expansion-state of such a bucket-node only direct afterwards the
+buffer has been (re)parsed, which can occur after opening a file,
+after autom. reparsing the buffer via semantic or after manually
+rebuilding the methods-buffer of ECB.
+
+The tag-class @code{type} (classes, interfaces, enumerations etc.) is
+divided into several subtypes by semantic. The subtypes are strings
+which names exactly if the tag with tag-class @code{type} is a class,
+an interface, an enumeration, a typedef etc. With the option
+@code{ecb-type-tag-expansion} you can tell ECB if these type-tags
+should be autom. expanded after (reparsing) a buffer (see above) or if
+they should be displayed collapsed - so all its members (methods,
+variables etc.) are hidden.
+
+@subsubsection Automatic expanding the ECB-methods-buffer for current tag
+
+If the option @code{ecb-highlight-tag-with-point} is switched on, then
+always that node in the method-buffer is highlighted which belongs to
+the current semantic-tag under point in the current active
+edit-window. But if this node is invisible (probably because its
+parent node is collapsed) then no node is highlighted if the auto.
+expanding feature is switched off.
+
+You can either switch on this feature with the option
+@code{ecb-auto-expand-tag-tree} or even easier with the command
+@code{ecb-toggle-auto-expand-tag-tree}.
+
+There is another option
+@code{ecb-expand-methods-switch-off-auto-expand} which makes both
+explicit and auto. expanding best working together. See the
+documentation of this option to get the details.
+
+The autom. expanding feature is only available for semantic-sources!
+
+Previous versions of ECB have always fully expanded the whole tree in
+the Methods-buffer if the current tag in the source-buffer was not
+visible in the current tree - e.g. because the variables-bucket was
+collapsed or the containing type of a tag (e.g. the class of a method)
+was collapsed. So in most cases much more was expanded as needed to
+make the current tag visible.
+
+The mechanism of ECB 2.22 and higher only expands the needed parts of
+the tree-buffer to make the related node visible: First we try to
+highlight the current tag with current expansion-state of the
+Methods-buffer. If the node is not visible so the tag can not be
+highlighted then we go upstairs the ladder of type-tags the current
+tag belongs to (e.g. we expand successive the nodes of the whole
+class-hierachy of the current method-tag until the related node
+becomes visible). If there is no containing type for the current tag
+then the node of the tag is probably contained in a toplevel-bucket
+which is currently collapsed; in this case we expand only this
+bucket-node and try highlighting again. Only if this has still no
+success then we expand the full tree-buffer and try to highlight the
+current tag.
+
+There is another option
+@code{ecb-auto-expand-tag-tree-collapse-other}: If this option is set
+then auto. expanding the tag-tree collapses all not related nodes.
+This means that all nodes which have no relevance for the currently
+highlighted node will be collapsed, because they are not necessary to
+make the highlighted node visible. This feature is switched off by
+default because if always collapses the complete Methods-tree before
+the following highlighting of the node for the current tag expands the
+needed parts of the tree-buffer.
+
+
+@node Customizing the display, Rebuilding the Methods, Expanding, The Methods buffer
+@subsection Customizing the display of the Methods-buffer
+
+@cindex semantic tag
+@cindex tag
+The ECB-Methods buffer is probably the most important browsing window
+offered by ECB. It displays all parsing informations of the current
+source-buffer (the buffer displayed in the current active
+edit-window).
+
+Normally ECB gets all informations displayed in this Methods-buffer from the
+semantic-library - at least for semantic-sources. This library parses auto.
+the current source-buffer in the edit-window of ECB and returns all
+information in form of @dfn{tags} to ECB which displays them in a browse-able
+form in its Method-buffer. See @ref{ECB Methods-window} for information how to
+use the Methods-buffer.
+
+There are several options to customize which tags ECB should display
+in general, if the tags should be collapsed or expanded, how to
+fontify them (i.e. syntax-highlighting) and something more.
+
+@table @code
+@item ecb-show-tags
+With the option @code{ecb-show-tags} you specify how ECB should
+display the tags returned by the semantic parser. Semantic divides its
+tags in several so called @dfn{tag classes}. A tag-class is always a
+symbol and can be for example @code{type} (tags which represent a
+class@footnote{Do not confuse the term ``class'' in the context of a
+tag, which means the class of the tag and which is a semantic-term and
+a ``class'' in the context of an object oriented language like Java or
+C++! Normally the surrounding context sould be sufficient to
+understand which type of ``class'' is meant whenever the term
+``class'' is used in this manual.}, a interface, an enumeration etc.),
+@code{function} (tags which represent function or methods),
+@code{variable} (variables and attributes), @code{include}
+(import-statements) etc. There is no predefined superset of allowed
+tag-class-symbols because each language-parser can define its own
+tag-classes. But to get an overview of the most common tag-classes see
+the default value of the option @code{ecb-show-tags}.
+
+With the option @code{ecb-show-tags} you can now specify how ECB
+should display tags of a certain tag-class in a certain major-mode.
+You can tell ECB that all tags of a tag-class @code{X} should be
+displayed in an expanded bucket and all tags of a tag-class @code{Y}
+should be displayed in a collapsed bucket and all tags of a tag-class
+@code{Z} should be displayed flattened (means not contained in a
+expandable/collapsable bucket-node). These settings can be made
+separately for each major-mode but you can also define a
+default-display which takes effect when for a major-mode no special
+setting can be found in @code{ecb-show-tags}.
+
+For every tag-class you can tell ECB how the tags should be sorted.
+
+@item ecb-font-lock-tags
+@itemx ecb-type-tag-display
+How to fontify the tags in the Method-buffer
+
+@item ecb-tag-display-function
+ECB and semantic offer several predefined functions for displaying the
+tags. Here you can customize, what informations tags should
+contain (only the method-name or the whole signature or something
+else) and what notation should be used, e.g. UML or not.
+
+@end table
+
+These are the most important options for this topic but it is
+recommended to have a look into the customize-group @code{ecb-methods}
+(@pxref{ecb-methods}) and check all the options offered there!
+
+All these options are only relevant for semantic-sources and take no
+effect for non-semantic-sources!
+
+@node Rebuilding the Methods, , Customizing the display, The Methods buffer
+@subsection Rebuilding the Methods-buffer
+
+In almost all cases there is @strong{NO} need to manually rebuild the
+method-buffer, because it is always done automatically if necessary;
+the mechanism depends on the sources:
+
+@itemize @minus
+@item semantic-sources:
+The command @code{global-semantic-auto-parse-mode} switches on autom.
+reparsing of semantic-sources.
+
+@item non-semantic-sources (imenu supported):
+You can switch on autom. rescanning/reparsing with the option
+@code{imenu-auto-rescan}. But nevertheless you have to manually
+rebuild the Method-buffer (with the autom. updated imenu-tags) via the
+command @code{ecb-rebuild-methods-buffer} (bound to @kbd{C-c . r}).
+
+@item non-semantic-sources (etags supported):
+For these sources there is no built-in auto-rescan mechanism, because
+etags is an external tool it can only operate on the saved
+file-contents. So rescanning the buffer contents would need to save
+the buffer before. Therefore there is no built-in auto-rescan mechanism
+because this would always result in saving the buffer and running an
+external tool. But of course you can program such a an
+etags-auto-rescan mechanism for yourself!
+@end itemize
+
+Besides for etags-supported non-semantic-sources there exist a few rare
+scenarios also for the other sources where a complete manual rebuild
+can be necessary. Here is one example:
+
+Depending on the semantic-version: If an Elisp-file is parsed which
+contains a defun X in the middle where the closing ) is missing, then
+semantic parses only until this defun X is reached and you will get an
+incomplete ECB-method buffer. In such a case you must complete the
+defun X and then completely reparse the Elisp-file and rebuild the ECB
+method buffer!
+
+A complete manually rebuild is done by
+@code{ecb-rebuild-methods-buffer}. For etags-parsed
+non-semantic-sources this causes an automatic saving of the
+source-buffer because otherwise etags would not operate with the
+latest contents!
+
+@node Filtering the tree-buffers, The ECB-layout, The Methods buffer, Usage of ECB
+@section Applying filters to the special ECB-tree-buffers
+
+@cindex Filter
+To get a fast and good overlook of the contents of a tree-buffer ECB
+offers a filter-mechanism for the Directories-, Sources-, the History-
+and the Methods-buffer.
+
+@menu
+* Filtering Directories::       Applying filters to the Directories-buffer
+* Filtering Sources::           Applying filters to the Sources--buffer
+* Filtering History::           Applying filters to the History-buffer
+* Filtering Methods::           Applying filters to the Methods-buffer
+@end menu
+
+@node Filtering Directories, Filtering Sources, Filtering the tree-buffers, Filtering the tree-buffers
+@subsection Applying filters to the Directories-buffer
+
+With the option @code{ecb-excluded-directories-regexps} certain
+directories can be excluded from being displayed in the
+directories-browser of ECB. This can be done by defining regular
+expressions. If the name of a directory matches at least one of the
+regexps of this option the directory is not displayed in the
+directories-tree-buffer.
+
+The option @code{ecb-sources-exclude-cvsignore} allows to exclude
+source-files from the sources-tree-buffer if their name is listed in a
+so called @file{.cvsignore}-file. This option is a list of regular
+expressions and if a directory-name matches at least one of these
+regexps then all files listed in the @file{.cvsignore}-file of this
+directory are not displayed in the sources-tree-buffer.
+
+@node Filtering Sources, Filtering History, Filtering Directories, Filtering the tree-buffers
+@subsection Applying filters to the Sources-buffer
+
+@subsubsection Interactive Sources-filters
+
+The command @code{ecb-sources-filter} allows to filter these
+tree-buffer either by a regular expression or by an extension (e.g.
+java, cc, el for java-, c++- rsp elisp-sources). This functionality is
+also available via the popup-menu of the Sources-tree-buffer.
+
+The currently applied filter is indicated in the modeline of the
+related tree-buffer. Applying a new filter replaces an eventually
+already applied filter.
+
+@subsubsection Default Sources-filters
+
+The option @code{ecb-source-file-regexps} allow to specify which
+source-files should be displayed and which not. This is done on a
+directory-basis, ie. for each directory-regexp the files to display
+can be specified. See the documentation of this option for all
+details.
+
+In addition to this option you should also know the option
+@code{ecb-sources-exclude-cvsignore} (@pxref{Filtering Directories}).
+
+@node Filtering History, Filtering Methods, Filtering Sources, Filtering the tree-buffers
+@subsection Applying filters to the History-buffer
+
+@subsubsection Interactive History-filters
+
+The command @code{ecb-history-filter} allows to filter these
+tree-buffer either by a regular expression or by an extension (e.g.
+java, cc, el for java-, c++- rsp elisp-sources). This functionality is
+also available via the popup-menu of the History-tree-buffer.
+
+The currently applied filter is indicated in the modeline of the
+related tree-buffer. Applying a new filter replaces an eventually
+already applied filter.
+
+@subsubsection Default History-filters
+
+The option @code{ecb-history-exclude-file-regexps} allows to exclude
+source-files from being historized (ie. displayed in the
+History-buffer). Despite the fact that the History-buffer already
+excludes all non-file-buffers there can be still buffers which name
+you do not wat to be displayed in the history. These are file-buffer
+like @file{TAGS} or @file{semantic.cache} which store
+meta-informations used by Emacs and its tools (etags, semantic etc.).
+These files can be excluded via
+@code{ecb-history-exclude-file-regexps}.
+
+@node Filtering Methods, , Filtering History, Filtering the tree-buffers
+@subsection Applying filters to the Methods-buffer
+
+The commands @code{ecb-methods-filter},
+@code{ecb-methods-filter-regexp},
+@code{ecb-methods-filter-protection},
+@code{ecb-methods-filter-tagclass},
+@code{ecb-methods-filter-function},
+@code{ecb-methods-filter-delete-last},
+@code{ecb-methods-filter-nofilter} allows to filter the tags/nodes of
+the Methods-buffer by several criterias. As for the Sources- and the
+History-buffer the same functionality is also available via the
+popup-menu of the Methods-buffer.
+
+@subsubsection Possible filter-criterias
+
+@itemize @bullet
+@item Filter by protection:
+Just insert the protection you want the Methods-buffer being filtered:
+private, protected or public! For sources not supported by semantic
+the protection filter will not be offered because these informations
+are not available for such sources.
+
+@item Filter by regexp:
+Insert the filter as regular expression.
+
+@item Filter by tag-class:
+You can filter by tag-classes. The popup-menu contains mode-dependend
+tag-filter entries and the command @code{ecb-methods-filter} offers
+only the tag-classes of the current mode. This means for sources not
+supported by semantic the tag-class filter will not be offered. And
+for semantic-supported sources exactly these tag-classes are offered
+the semantic-parser for the current major-mode offers. For example
+texi-sources can only be filtered by the tag-classes ``Definitions''
+and ``Sections'' and java-sources can be filtered by ``Methods'',
+``Variables'', ``Classes'' etc. In general the semantic-variable
+@code{semantic-symbol->name-assoc-list} is used to get the right
+tag-classes.
+
+@item Filter by a filter-function:
+Such a function gets two arguments: a tag and the source-buffer of
+this tag. If the tag should be displayed (i.e. not being filtered out)
+then the function has to return not nil otherwise nil.
+
+@item No special filter:
+This means to display all tags specified with the option
+@code{ecb-show-tokens}. If currently some of the above filters are
+applied they will be all removed.
+
+@item Delete the last added:
+This removes only the topmost filter-layer, means that filter added
+last.
+@end itemize
+
+Be aware that the tag-list specified by the option
+@code{ecb-show-tags} is the basis of all filters, i.e. tags which are
+excluded by that option will never be shown regardless of the filter
+type here!
+
+All tags which match the applied filter(s) will be displayed in the
+Methods-buffer. Such a filter is only applied to the current
+source-buffer, i.e. each source-buffer can have its own tag-filters.
+
+These tag-filters can also applied to sources which are not supported
+by the semantic-parser but ``only'' by imenu or etags. But because for
+these sources not all information are avaiable the protection- and
+tag-class filter are not offered with such ``non-semantic''-sources.
+See @ref{Non-semantic sources} for further details about working with
+source-files not supported by the semantic-parser.
+
+
+@subsubsection Inverse Filters
+
+But if @code{ecb-methods-filter} is called with a prefix-argument then
+an inverse filter is applied to the Methods-buffer, i.e. all tags
+which do @strong{NOT} match the choosen filter will be displayed in
+the Methods-buffer!
+
+@subsubsection Layered filters
+
+Per default the choosen filter will be applied on top of already
+existing filters. This means that filters applied before are combined
+with the new filter. This behavior can changed via the option
+@code{ecb-methods-filter-replace-existing}.
+
+@subsubsection Display of currently applied filters
+
+The current active filter will be displayed in the modeline of the
+Methods-buffer [regexp, prot (= protection), tag-class, function (=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is
+applied then always the top-most filter is displayed in the modeline
+but the fact of more than 1 filter is visualized by the number of the
+filters - included in parens. You can see all currently applied
+filters by moving the mouse over the filter-string in modeline of the
+Methods-buffer: They will displayed as help-echo.
+
+@subsubsection Default filters for certain files.
+
+The new option @code{ecb-default-tag-filter} allow to define default
+tag-filters for certain files which are applied automatically after
+loading such a file into a buffer. The possible filters are the same
+as offered by the command @code{ecb-methods-filter} and they are
+applied in the same manner - the only difference is they are applied
+automatically. The files can be specified on a combined major-mode-
+and filename-regexp-basis.
+
+Usage-example: This can be used to display in outline-mode files (e.g.
+@file{NEWS}) only the level-1-headings by defining a filter regexp
+``^\* .*''.
+
+@node The ECB-layout, Hiding the ECB windows, Filtering the tree-buffers, Usage of ECB
+@section Changing, customizing, redrawing and creating layouts
+
+@cindex layout
+@cindex ECB-layout
+The term @dfn{ECB-layout} means in which windows the ECB-frame is
+divided. This chapter describes all aspects concerning this layout,
+especially changing, customizing, redrawing and also creating new
+layouts.
+
+@menu
+* Changing the ECB-layout::     How to change and customize the layout
+* Redrawing the ECB-layout::    How and when redrawing the layout
+* Changing window sizes::       Changing sizes of the ECB-windows
+* Fixing window sizes::         Fixing sizes of the ECB-windows
+* Creating a new ECB-layout::   Interactively creating new layouts
+@end menu
+
+@node Changing the ECB-layout, Redrawing the ECB-layout, The ECB-layout, The ECB-layout
+@subsection Changing and customizing the ECB-layout
+
+ECB offers several predefined layouts with different sets and also
+different locations of ECB-windows. See below the ``ascii-screenshot''
+of all currently built-in layouts@footnote{The command
+@code{ecb-show-layout-help'} shows the outline-picture for all built-in
+layouts.}.
+
+In addition to these predefined layouts you can either interactively
+create new layouts ``by example'' (@pxref{Creating a new ECB-layout})
+or program new layouts with the macro @code{ecb-layout-define}
+(@pxref{The layout-engine}). The former method is the recommended
+one!
+
+There are two ways to interactively change the layout:
+@itemize @bullet
+@item Changing permanently:
+Customize the option @code{ecb-layout-name} and store it for future
+Emacs sessions.
+
+@item Switching between several layouts at runtime:
+If you want to switch fast between a certain sequence of layouts see
+the option @code{ecb-toggle-layout-sequence} and the command
+@code{ecb-toggle-layout} (@pxref{Simulating speedbar}). For just
+selecting another layout during current Emacs-session use the command
+@code{ecb-change-layout}.
+@end itemize
+
+With the option @code{ecb-show-sources-in-directories-buffer} you can
+define if sources are displayed in the directory-window of a layout
+(@pxref{ECB Directories-window}).
+
+In addition to the general layout you can specify if the layout should
+contain a persistent compilation-window at the bottom of the frame, see
+@code{ecb-compile-window-height} (@pxref{Temp- and compile-buffers}).
+
+Maybe you want also change the look&feel of the tree-buffers. Then you
+can change the general style of the tree-buffers with the option
+@code{ecb-tree-buffer-style} and the location of the collapse- and
+expand-symbols and the indentation of sub-nodes in a tree. See
+@code{ecb-tree-indent} and @code{ecb-tree-expand-symbol-before}. More
+details about the different tree-buffer-styles are described in
+@ref{Tree-buffer styles}.
+
+Here are all currently available layouts (for creating own new layouts
+see @ref{Creating a new ECB-layout}); just customize the option
+@code{ecb-layout-name} to the related name:
+
+@table @asis
+@item Layout ``left1''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|      |       |                                      |
+| Sour | Hist  |                 Edit                 |
+|      |       |                                      |
+|      |       |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+   
+@item Layout ``left2''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Sources     |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left3''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Sources     |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left4''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|      |       |                                      |
+|      |       |                                      |
+|      |       |                                      |
+| Sour | Hist  |                                      |
+|      |       |                                      |
+|      |       |                                      |
+|      |       |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left5''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Sources     |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  History     |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``right1''
+@example
+@group
+-------------------------------------------------------
+|                                      |              |
+|                                      |  Directories |
+|                                      |              |
+|                                      |              |
+|                                      |--------------|
+|                                      |              |
+|                                      |              |
+|             Edit                     |  Sources     |
+|                                      |              |
+|                                      |              |
+|                                      |--------------|
+|                                      |              |
+|                                      |  Methods     |
+|                                      |              |
+|                                      |              |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left6''
+@example
+@group
+-------------------------------------------------------
+|  Sources     |                                      | 
+|--------------|                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Methods     |                 Edit                 |
+|              |                                      | 
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|  History     |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``top1''
+@example
+@group
+-------------------------------------------------------
+|                        |             |              |
+|                        |             |              |
+|      Directories       |  Sources    |  Methods     |
+|                        |             |              |
+|                        |             |              |
+|-----------------------------------------------------|
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+|                    Edit                             |
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left7''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|  History     |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left8''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Sources     |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|  History     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``top2''
+@example
+@group
+-------------------------------------------------------
+|                                                     |
+|                                                     |
+|                    Methods                          |
+|                                                     |
+|                                                     |
+|-----------------------------------------------------|
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+|                    Edit                             |
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left9''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|   Methods    |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left10''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Methods     |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|      |       |                                      |
+| Sou  | Hist  |                                      |
+|      |       |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left11''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Methods     |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  History     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left12''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|   History    |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left13''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+| Directories  |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left14''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+| Directories  |                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  History     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left15''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|              |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``leftright1''
+@example
+@group
+-------------------------------------------------------
+|             |                         |             |
+| Directories |                         |  Methods    |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|-------------|          Edit           |             |
+|             |                         |             |
+| Sources     |                         |             |
+|             |                         |             |
+|-------------|                         |             |
+|             |                         |             |
+| History     |                         |             |
+|             |                         |             |
+-------------------------------------------------------
+|                                                     |
+|                   Compilation                       |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``leftright2''
+@example
+@group
+-------------------------------------------------------
+|             |                         |             |
+| Directories |                         |  Methods    |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |          Edit           |             |
+|-------------|                         |-------------|
+|             |                         |             |
+| Sources     |                         |  History    |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+-------------------------------------------------------
+|                                                     |
+|                   Compilation                       |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``leftright3''
+@example
+@group
+-------------------------------------------------------
+|             |                         |             |
+| Directories |                         |  Methods    |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |          Edit           |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+|             |                         |             |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@item Layout ``left-dir-plus-speedbar''
+@example
+@group
+-------------------------------------------------------
+|             |                                       |
+| Directories |                                       |
+|             |                                       |
+|             |                                       |
+|             |                                       |
+|             |                                       |
+|             |                                       |
+|-------------|                                       |
+|             |                                       |
+|             |                                       |
+|             |                                       |
+| Speedbar    |                                       |
+|             |                                       |
+|             |                                       |
+|             |                                       |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+
+@item Layout ``left-analyse''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Sources     |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Analyse     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+
+@item Layout ``left-symboldef''
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|  Directories |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Sources     |                                      |
+|              |                                      |
+|--------------|                 Edit                 |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  Symbol-defs |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@end table
+
+@node Redrawing the ECB-layout, Changing window sizes, Changing the ECB-layout, The ECB-layout
+@subsection Redrawing the ECB-layout
+
+@cindex Redraw
+If you have unintentionally destroyed the ECB-layout, you can always
+restore the layout with calling @code{ecb-redraw-layout}. This is even
+true, if you get messages like ``wrong-type-argument window-live-p
+#<window 222>''.
+
+If the variable @code{ecb-redraw-layout-quickly} is not nil then the redraw
+is done by the @code{ecb-redraw-layout-quickly} function, otherwise by
+@code{ecb-redraw-layout-full}. But it's strongly recommended to use the
+quick redraw only if you have really slow machines where a full redraw
+takes several seconds because the quick redraw is not really safe and
+may have some drawbacks! On normal machines the full redraw should be
+done in << 1s!
+
+Please read the documentation of the command @code{ecb-redraw-layout}!
+
+See also the hooks @code{ecb-redraw-layout-after-hook} and
+@code{ecb-redraw-layout-before-hook}!
+
+@node Changing window sizes, Fixing window sizes, Redrawing the ECB-layout, The ECB-layout
+@subsection Changing the sizes of the special ECB-windows
+
+The standard width and height of the special ECB-windows is defined
+with the options @code{ecb-windows-width} and
+@code{ecb-windows-height}. But changing these options always
+influences all layouts which is not always desired.
+
+ECB offers to re-adjust the width and height of the ECB-windows (e.g. by
+dragging the windows-borders via the mouse) and then saving exactly
+these current window-sizes for the current layout so after activating
+this layout all windows have autom. the stored sizes.
+
+This is done via the option @code{ecb-layout-window-sizes} and the
+commands @code{ecb-store-window-sizes},
+@code{ecb-restore-window-sizes} and
+@code{ecb-restore-default-window-sizes}.
+
+Here is an example how to resize and store the sizes of the
+ECB-windows of layout ``left1'':
+
+@enumerate
+@item
+Switch to layout ``left1'' via @code{ecb-change-layout} (@kbd{C-c . lc})
+@item
+Resize the ECB-windows by dragging the window-borders with the mouse
+@item
+Call @code{ecb-store-window-sizes}
+@end enumerate
+
+After this layout ``left1'' will be always drawn with the new sizes
+until you call @code{ecb-restore-default-window-sizes} during layout
+``left1'' is active.
+
+@strong{Please note}: @code{ecb-store-window-sizes} stores the width
+and height of the windows per default as fractions of the width (rsp.
+height) of the ECB-frame, so the stored sizes are always correct
+regardless of the current frame-size! But if called with a prefix
+argument then fixed sizes are stored.
+
+@node Fixing window sizes, Creating a new ECB-layout, Changing window sizes, The ECB-layout
+@subsection Fixing the sizes of the special ECB-windows
+
+GNU Emacs 21 introduced a new feature which can fix the sizes of a
+window displaying a certain buffer even after resizing the frame. This
+new feature is driven by the new buffer-local variable
+@code{window-size-fixed}@footnote{Currently XEmacs does not support
+this feature therefore @code{ecb-fix-window-size} has no effect with
+XEmacs}.
+
+ECB offers an option @code{ecb-fix-window-size} for fixing the sizes
+of the special ECB-windows/buffers even after frame-resizing. The fix
+type (valid values are @code{nil}, @code{t}, @code{width} and
+@code{height}) can either be set on a layout-basis (means a different
+value for each layout) or one value can be set for all layouts. In the
+latter case there is an additional value @code{auto} which choose
+autom. the senseful fix-type depending on the current layout-type: For
+top-layouts the fix-type @code{height} and for all other layout-types
+the fix-type @code{width}.
+
+Probably the most senseful value is @code{auto} for all layouts
+because it makes less sense to fix the height of the ecb-windows in a
+left-, right- or leftright-layout. Same for fixing the width in a
+top-layout.
+
+Note: With Emacs < 22 there seems to be no distinction between
+@code{width}, @code{height} and @code{t}. Therefore this option takes
+no effect (means all ecb-windows have always unfixed sizes) with Emacs
+< 22 if @code{ecb-compile-window-height} is not @code{nil}.
+
+@node Creating a new ECB-layout, , Fixing window sizes, The ECB-layout
+@subsection Interactively creating new layouts
+
+@cindex New layouts
+@cindex Creating new layouts
+
+If you want to create your own ECB-layout then you can do this very
+easy ``by example'' with the command @code{ecb-create-new-layout}.
+This command creates a new empty frame and offers a small set of keys
+to create the new layout by splitting windows.
+@code{ecb-create-new-layout} and this couple of keys are your guide
+during the layout-creation-process@footnote{During the creation
+process you will be asked in the minibuffer for several options; here
+you can use TAB-completion and an ``empty'' RET chooses always the
+first option!}.
+
+After calling @code{ecb-create-new-layout} you will be asked which
+type of layout you want to create: ``left'', ``right'', ``top'' or
+``left-right''. Here you specify where the ECB-tree-windows/buffers
+should be located in the ECB-frame:
+
+@itemize @minus
+@item left: All ECB-tree-windows are located on the left side
+@item right: All ECB-tree-windows are located on the right side
+@item top: All ECB-tree-windows are located on the top side
+@item left-right: All ECB-tree-windows are located on the left and
+right side
+@end itemize
+
+Depending on the type you choose the window is splitted by the values
+of the options @code{ecb-windows-width} (types ``left'', ``right'' and
+``left-right'') or @code{ecb-windows-height} (type ``top'').
+
+Afterwards you will see a frame like follows (here the layout-type is
+``left-right''):
+
+@example
+@group
+-----------------------------------------------------------------
+|<point>       |                                   |            |
+|              | ECB-layout creation mode          |            |
+|              | ========================          |            |
+|              |                                   |            |
+|              | <This is a persistent help-screen>|            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+|              |                                   |            |
+-----------------------------------------------------------------
+               |
+               |   ,---
+               `---| Splitted by the value of @code{ecb-windows-width}.
+                   `---
+@end group
+@end example
+
+The big window (here the middle window) will be the edit-area of the
+new layout and can not be selected, deleted or splitted during the
+creation process. It displays the help-screen for the layout-creation
+mode. Here all the available commands are displayed.
+
+The small window(s) (here the left and right windows) can be splitted
+by you wherever you want (@kbd{C-s}). The left one contains the point.
+You must give every ECB-tree-window you create a type (@kbd{C-t})
+which can be either
+
+@itemize @bullet
+@item One of the built-in types
+
+This can be either ``directories'', ``sources'', ``methods'',
+``history'' or ``speedbar''.
+
+@item Any user-defined type:
+
+In this case you insert ``other'' after hitting @kbd{C-t} and you will
+then be asked for the name of the user-defined type. You can insert
+any arbitrary type name X. But to get this layout working you have to
+define a function with name @code{ecb-set-X-buffer} whereas X is the
+name of the user-defined type you have specified during
+layout-creation.
+
+This function @code{ecb-set-X-buffer} must be defined with the macro
+@code{defecb-window-dedicator} and has to switch to the buffer you
+want to display in this window. This macro automatically ensures that
+this window is dedicated to that buffer.
+
+Here is an example: Suppose you have inserted as type name ``example''
+then you have to define and load a function
+@code{ecb-set-example-buffer} which could be defined like follows:
+
+@example
+(defecb-window-dedicator ecb-set-example-buffer " *ECB example-buf*"
+  (switch-to-buffer (get-buffer-create " *ECB example-buf*")))
+@end example
+
+If you forget to define such a function for the user-defined type then
+nevertheless ECB will draw this layout but it will use the
+default-function @code{ecb-set-default-ecb-buffer} instead.
+@end itemize
+
+If you are satisfied with your new layout just hit @kbd{C-q}. You will
+be asked for a new layout-name (TAB-completion is offered to get a
+list of all names already in use) and after inserting a new(!) name
+the new layout is saved in the file defined by the option
+@code{ecb-create-layout-file}. The new layout is now available via the
+option @code{ecb-layout-name}.
+
+There is no need for you to load the file
+@code{ecb-create-layout-file} manually into your Emacs because it's
+automatically loaded by ECB!
+
+@strong{Please note}: During the layout-creation process only the
+commands displayed in the help-screen are available. ALL other
+commands are temporally disabled (even the mouse-commands).
+
+For programming new layouts with emacs-lisp see @ref{The layout-engine}.
+
+With the command @code{ecb-delete-new-layout} you can delete
+previously created layouts (TAB-completion is offered for all names of
+user created layouts).
+
+@node Hiding the ECB windows, Maximizing the ECB windows, The ECB-layout, Usage of ECB
+@section Hiding/Showing the ECB windows
+
+@cindex Hide windows
+@cindex Show windows
+With @code{ecb-toggle-ecb-windows}, @code{ecb-hide-ecb-windows} and
+@code{ecb-show-ecb-windows} you can hide/show all the ECB windows
+without changing the activation state of ECB and also without
+deactivating the advices for @code{delete-other-windows} and/or
+@code{delete-window}. This is most useful if you use a layout like
+``top2'' (@pxref{Common use-cases}) or if you want to have maximum space
+for editing and you don't need the browsing windows all the time.
+
+The following sequence of hooks is evaluated during showing again the
+hidden ECB-windows:
+@enumerate
+@item @code{ecb-show-ecb-windows-before-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item <Redrawing the layout to show the hidden ECB-windows>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-show-ecb-windows-after-hook}
+@end enumerate
+
+The following sequence of hooks is evaluated during hiding the
+ECB-windows:
+@enumerate
+@item @code{ecb-hide-ecb-windows-before-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item <Hiding the ECB-windows>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-hide-ecb-windows-after-hook}
+@end enumerate
+
+If the special ECB-windows are hidden (e.g. by
+`ecb-toggle-ecb-windows') all adviced functions behave as their
+originals. So the frame can be used as if ECB would not be active but
+ECB IS still active in the ``background'' and all ECB-commands and all
+ECB-keybindings can be used. Of course some of them doesn't make much
+sense but nevertheless they can be called. Toggling the visibility of
+the ECB-windows preserves the splitting-state of the edit-area: If you
+hide the ECB-windows then the frame will be divided in the same
+window-layout the edit-area had before the hiding and if you show the
+ECB-windows again the edit-area will be divided into all the
+edit-windows the ECB-frame had before the showing.
+
+Therefore it should be enough to hide the ECB-windows to run other
+Emacs-applications which have their own window-layout-managing. There
+should be no conflicts. But nevertheless the most recommended method
+for running ECB and other applications (e.g. xrefactory, Gnus etc.) in
+the same frame is to use a window-manager like winring.el or
+escreen.el (@pxref{Window-managers and ECB}).
+
+
+@node Maximizing the ECB windows, Back/forward navigation, Hiding the ECB windows, Usage of ECB
+@section Maximizing the ECB windows
+
+@subsection How to maximize and minimize special ecb-tree-windows
+
+To get a better overlook about the contents of a certain ECB-window
+every ECB-window can be ``maximized'', means all other ECB-windows are
+deleted so only the edit-window(s) and this maximized ECB-window are
+visible (and maybe a compile-window if active). There are several ways
+to do this:
+
+@itemize @bullet
+@item
+Via the node-popup-menus of the ECB-windows
+
+@item
+Via the main ``ECB''-menu and here ``Display window maximized''
+
+@item
+Via calling the adviced version of
+@code{delete-other-windows}@footnote{This command is adviced per
+default, see @ref{The edit-area}.} (bound to @kbd{C-x 1}) in one of
+the ECB windows.
+
+@item
+Via one of the commands @code{ecb-maximize-window-directories},
+@code{ecb-maximize-window-sources}, @code{ecb-maximize-window-methods},
+@code{ecb-maximize-window-history} or
+@code{ecb-maximize-window-speedbar} or the bound short-cuts for those
+commands.
+
+@item
+Via the new command @code{ecb-cycle-maximized-ecb-buffers} which
+cycles through all ecb-buffers of current layout by maximizing exactly
+one of the ecb-windows after every cycle-step.
+
+@item
+Via the option @code{ecb-maximize-ecb-window-after-selection} and then
+just by selecting an ECB-window. ``Deselecting'' an ECB-window brings
+back all ECB-windows of current layout.
+
+@item
+Via the default modeline-mechanisms for deleting other windows. GNU
+Emacs binds @kbd{mouse-2} in its modeline to
+@code{delete-other-window}. XEmacs binds a popup-menu with some window
+commands to @kbd{button-3} in its modeline.
+
+ECB combines the best of both worlds by supporting both of these
+mechanisms for both Xemacs and Emacs: ECB binds a toggle-command to
+@kbd{mouse-2} in the modeline of each tree-buffer which maximizes the
+current tree-window if all ECB-windows are visible and displays all
+ECB-windows if current tree-window is maximized. In addition ECB binds
+a popup-menu to @kbd{mouse-3} which offers exactly 2 commands:
+Maximizing current tree-window and displaying all ECB-windows.
+@end itemize
+
+``Minimizing'' such a maximized ECB-window, i.e. bringing back to its
+original size and displays all ecb-windows of current layout, can
+simply be done by redrawing the layout via the command
+@code{ecb-redraw-layout} (bound to @kbd{C-c . lr}).
+
+@subsection Selecting a node in a maximized ecb-tree-window
+
+When you select a node (either via mouse or RET) in a maximized
+tree-window the default behavior of ECB is the following:
+
+Maximized directories-window: When selecting a directory then first
+automatically the maximized directories-window will be ``minimized''
+(i.e. all ecb-windows of current layout are displayed) if the current
+layout contains a sources-buffer and no sources are shown in the
+directories-window - see @code{ecb-show-sources-in-directories-buffer}.
+So the source-files can be displayed in the sources-window.
+    
+Maximized sources- or history-window: When selecting a source-file in
+one of these buffers then first automatically the maximized window
+will be ``minimized'' (i.e. all ecb-windows of current layout are
+displayed) if the current layout contains a methods-buffer. So the
+tag-contents of the selected source-file can be displayed in the
+methods-window.
+
+For a even smarter behavior ECB offers the option
+@code{ecb-maximize-next-after-maximized-select} which automatically
+maximizes the next logical tree-window after a node selection. The
+definition of ``next logical is'': Directories --> sources,
+sources/history --> methods. But if the current maximized tree-buffer
+is also contained in the option
+@code{ecb-tree-do-not-leave-window-after-select} (see also the
+tree-buffer-command @code{ecb-toggle-do-not-leave-window-after-select}
+which is bound to @key{C-t} in each tree-buffer) then ECB does *not*
+maximize the next logical tree-window but point stays in the currently
+maximized tree-buffer so for example the user can select more than one
+source-file from the sources-buffer.
+
+@node Back/forward navigation, ECB-window synchronizing, Maximizing the ECB windows, Usage of ECB
+@section Back- and forward navigation like a browser
+
+With ECB you can ``browse'' in your source-files like with a
+web-browser. This means ECB stores the current buffer- and
+window-position relative to the current tag@footnote{e.g. a method,
+a variable or any other semantic tag} in the edit-window after
+
+@itemize @minus
+@item selecting a tag in the ECB-methods buffer or
+@item selecting a source-file in the ECB-sources/history-buffer.
+@end itemize
+
+ECB offers two commands @code{ecb-nav-goto-next} (@kbd{C-c . n}) and
+@code{ecb-nav-goto-previous} (@kbd{C-c . p}) to go forward and
+backward within this navigation history-list. These commands are also
+available via the menu ``ECB --> Navigate''.
+
+Aside normal ``location-browsing'' this is useful for example in a
+scenario where the buffer is narrowed to a tag (see
+@code{ecb-tag-visit-post-actions}):
+
+@enumerate
+@item You edit a function
+@item Goto another function above the current in the same file
+@item Add a few lines
+@item Call ecb-nav-goto-previous
+
+Now you will edit at the same place in the function.
+@end enumerate
+
+@node ECB-window synchronizing, Stealthy background tasks, Back/forward navigation, Usage of ECB
+@section Synchronization of the ECB-windows
+
+Per default ECB synchronizes automatically the contents of the
+ECB-windows (e.g. tree-buffers) with the current active edit-window
+(rsp. the current buffer of the edit window).
+
+ECB distinguishes between the so called ``basic'' ECB-windows (for a general
+description see @ref{Basic ECB-windows}) and add-on
+ECB-windows (@pxref{Add-on ECB-windows}). This distinction is also important
+concerning synchronization:
+
+The basic ECB-windows are always synchronized together whereas for each add-on
+ECB-window a separate synchronization option is offered.
+
+This section describes at beginning some general synchronization aspects
+(common for all ECB-windows, basic ones as well as add-ons), then the
+synchronization of the basic-ECB-windows and finally the synchronization of
+the add-on ECB-windows.
+
+
+
+@menu
+* General synchronization aspects::       General synchronization aspects
+* Synchronization of basic ECB-windows::  Synchronization of basic ECB-windows
+* Add-on synchronization::                Synchronization of add-on ECB-windows
+@end menu
+
+@node General synchronization aspects, Synchronization of basic ECB-windows, ECB-window synchronizing, ECB-window synchronizing
+@subsection General synchronization aspects
+
+For each separate ECB-window-synchronization (remember: One common for the basic
+ECB-windows, one for each add-on ECB-window) ECB offers the following
+option-triple (demonstrated for the basic ECB-windows):
+
+@itemize
+
+@item @code{ecb-basic-buffer-sync}:
+
+Enables or disables the synchronization in general.
+
+If active then the synchronization for the related ECB-window-buffers/windows
+takes place whenever a buffer changes in an edit window or if another
+edit-window with another buffer will be selected, if deactivated then never.
+But you can also set this option to a list of major-modes and then the sync.
+will only be done if the major-mode of the current buffer does NOT belong to
+this list.
+
+But in every case the synchronization only takes place if the
+major-mode of the current-buffer in the current selected edit-window
+has a relation to files or directories. Examples for the former one
+are all programming-language-modes like @code{c++-mode} or
+@code{java-mode}, @code{Info-mode} too, an example for the latter one
+is @code{dired-mode}. For all major-modes related to
+non-file/directory-buffers like @code{help-mode},
+@code{customize-mode} and others a synchronization will never be done!
+
+It's recommended to exclude at least @code{Info-mode} because it makes
+no sense to synchronize the ECB-windows after calling the Info help.
+Per default also @code{dired-mode} is excluded but it can also making
+sense to synchronize the ECB-directories/sources windows with the
+current directory of the dired-buffer in the edit-window.
+
+@item @code{ecb-basic-buffer-sync-delay}:
+
+This option takes only effect if the synchronization is switched on via
+@code{ecb-basic-buffer-sync} and determines when ECB synchronizes.
+
+This option sets the time in seconds (fractions allowed) Emacs must be idle
+before the related ECB-window(s) are synchronized. If nil then there is no
+delay, means synchronization takes place immediately. A small value of about
+0.25 seconds saves CPU resources and you get even though almost the same
+effect as if you set no delay.
+
+Per default ECB always synchronizes on idle-basis and it is strongly
+recommened not to change this (ie. not setting the delay-option to nil)
+because this can be very performance consuming (e.g. at least the check if a
+synchronization must be performed is done after @strong{every} key- or
+mouse-button press!
+
+Some fraction of a second is probably always the best choice, because it does
+not cost cpu-power and nonetheless the synchronization takes place quite
+immediately. So in most cases there is no need to bother with this option,
+just use the default value.
+
+@item @code{ecb-basic-buffer-sync-hook}:
+
+For each separate synchronization a hook variable is offered where you can
+hook in with some elisp code if you need some tasks performed afterwards the
+synchronization has been finished.
+
+In most cases no hook will be needed.
+
+@end itemize
+
+Analogous to the shown options for the basic ECB-windows each add-on
+ECB-window has its own separate triple of these options, named congruent to
+the name of the buffer-name of the add-on ECB-window (e.g. for the analyse
+ECB-window with the buffer-name hold in @code{ecb-analyse-buffer-name} these
+three options are named @code{ecb-analyse-buffer-sync},
+@code{ecb-analyse-buffer-sync-delay} and @code{ecb-analyse-buffer-sync-hook}.
+For some specialities see @ref{Add-on synchronization}.
+
+@strong{Please note}: With the command @code{ecb-window-sync} you can
+do a manual synchronization if the automatic one is switched off or
+if you just want to do this! See the documantation of this command.
+
+@node Synchronization of basic ECB-windows, Add-on synchronization, General synchronization aspects, ECB-window synchronizing
+@subsection Synchronization of the basic ECB-windows
+
+This section describes some special aspects of the synchronizing of the basic
+ECB-windows:
+
+@itemize @bullet
+
+@item ECB-directories:
+
+This windows is synchronized to display the directory where the
+source-file which is displayed in the current active edit-window is
+located. If the source-path (i.e. an element of the option
+@code{ecb-source-path}) containing this directory is not expanded it
+will be auto. expanded according to the value of the option
+@code{ecb-auto-expand-directory-tree} (@pxref{ecb-directories}).
+
+@item ECB-sources:
+
+The ECB-sources-buffer contains after synchronizing all the sources of
+the directory of the ``current'' source-file displayed in the
+edit-window. The entry of the ``current'' source-file is highlighted.
+
+@item ECB-methods:
+
+Contains after synchronizing all the tags of the buffer in the current
+selected edit-window, i.e. all methods, variables etc... depending on
+the major-mode.
+
+@item ECB-history:
+
+Highlights the entry of the buffer displayed in the current active
+edit-window if this buffer is a source-file.
+
+@end itemize
+
+The synchronization can be customized via the option triple
+@code{ecb-basic-buffer-sync}, @code{ecb-basic-buffer-sync-delay} and
+@code{ecb-basic-buffer-sync-hook}. The four basic ECB-windows of ECB are
+always synchonized together, never separate!
+
+@node Add-on synchronization, , Synchronization of basic ECB-windows, ECB-window synchronizing
+@subsection Synchronization of add-on ECB-windows
+
+Currently ECB has a separate synchronization for the add-on ECB-windows
+ECB-analyse and ECB-symboldef and also for the eshell and
+speedbar-integration. Customizing can be done via:
+
+@itemize
+
+@item ECB-analyse:
+@code{ecb-analyse-buffer-sync}, @code{ecb-analyse-buffer-sync-delay} and
+@code{ecb-analyse-buffer-sync-hook}
+
+@item ECB-symboldef:
+@code{ecb-symboldef-buffer-sync}, @code{ecb-symboldef-buffer-sync-delay} and
+@code{ecb-symboldef-buffer-sync-hook}
+
+@item ECB-eshell:
+@code{ecb-eshell-buffer-sync}, @code{ecb-eshell-buffer-sync-delay} and
+@code{ecb-eshell-buffer-sync-hook}
+
+@item ECB-speedbar:
+@code{ecb-speedbar-buffer-sync}, @code{ecb-speedbar-buffer-sync-delay} and
+@code{ecb-speedbar-buffer-sync-hook}
+
+@end itemize
+
+Each enabling- and delay-option has an additonal special value 'basic which is
+the default for all these options because it allows to use the current setting
+of @code{ecb-basic-buffer-sync} rsp. @code{ecb-basic-buffer-sync-delay} for
+the add-on synchronization too. Example: If @code{ecb-basic-buffer-sync} is
+set to the value @code{(Info-mode dired-mode)} then a setting of 'basic for
+@code{ecb-analyse-buffer-sync} means that synchronization is always done
+unless the current major-mode is Info-mode or dired-mode. Per default all
+add-on synchronization enabling- and delay-options are set to 'basic with one
+exeption: @code{ecb-analyse-buffer-sync-delay}: See the documentation of this
+option for a detailed description.
+
+In general it is recommended to read the documentation of all these options.
+
+@node Stealthy background tasks, Interactive ECB commands, ECB-window synchronizing, Usage of ECB
+@section Stealthy background-tasks of ECB
+
+ECB performs some tasks stealthily in the background and also
+interruptable by the user because these tasks can be time-consuming
+and could otherwise block ECB. Currently the following tasks are
+performed stealthily and in the background by ECB:
+
+@table @asis
+@item Prescann directories for emptyness
+Prescann directories and display them as empty or not-empty in the
+directories-buffer. See the documentation of the option
+@code{ecb-prescan-directories-for-emptyness} for a description.
+
+@item File is read only
+Check if sourcefile-items of the directories- or sources-buffer are
+read-only or not. See documentation of the option
+@code{ecb-sources-perform-read-only-check}.
+
+@item Version-control-state
+Checks the version-control-state of files in directories which are
+managed by a VC-backend. See the option @code{ecb-vc-enable-support}.
+
+@end table
+
+All of these tasks (e.g. checking if a directory is empty or not)
+perform a certain action for all directories or sources displayed in
+the current visible tree-buffers of ECB. Normally there should be no
+annoying delay for the user because each of these tasks will be only
+performed when Emacs is idle and will be interrupted immediatelly when
+a user hits a key or clicks the mouse but especially for
+remote-directories one single action (e.g. checking if a certain
+directory is empty or checking the VC-state of a sourcefile in such a
+remote directory) can be very time-consuming and such a single action
+is not interruptable (an interrupt can only occur between the
+single-actions for two directories or sources) For a further
+discussion how to deal best with remote directories see @ref{Remote
+directories}.!
+
+ECB offers for all stealthy tasks three steps of activation:
+@itemize @bullet
+@item @code{t}:
+Switch on this feature.
+
+@item @code{unless-remote}:
+Switch on this feature but not for remote directories. The term
+``remote'' means here directories which are used via tramp, ange-ftp
+or efs. So mounted directories are counted not as remote directories
+here even if such a directory is maybe hosted on a remote machine. But
+normally only directories in a LAN are mounted so there should be no
+performance-problems with such mounted directories.
+
+@item @code{nil}:
+Switch off this feature completely.
+@end itemize
+
+In combination with the option @code{ecb-stealthy-tasks-delay} these
+three choices already allow adapting the stealthy tasks to most
+needs. But to offer finest granularity for which directories a certain
+stealthy task should be switched on and for which not ECB offers for
+every stealthy task an additional option which allows a finer
+adjustment:
+
+@itemize @bullet
+@item Prescanning directories for emptyness:
+@code{ecb-prescan-directories-exclude-regexps}.
+
+@item Checking the read-only-state of a sourcefile:
+@code{ecb-read-only-check-exclude-regexps}
+
+@item Checking the VC-state of sourcefiles:
+@code{ecb-vc-directory-exclude-regexps}
+@end itemize
+
+These options take only effect when the related task is not completely
+switched off. If this is the case they allow excluding certain
+directories (or the sources of directories) from being processed by a
+certain stealthy task.
+
+
+@node Interactive ECB commands, ,Stealthy background tasks, Usage of ECB
+@section Interactive ECB commands
+
+@noindent
+ECB offers a lot of interactive commands. Some of these commands
+prompt the user in the minibuffer if called with a prefix argument.
+
+Example: If @code{ecb-clear-history} is called with a prefix argument
+then you will be prompted in the minibuffer with:
+
+@example
+Clear from history: [all, not-existing-buffers, existing-buffers]
+@end example 
+
+You can choose one of the options enclosed in brackets with
+TAB-completion; hitting RET direct after the prompt chooses auto. the
+first offered option (in the example above ``all'').
+
+@strong{Please note}: The following interactive commands of ECB are
+listed without the prefix ``ecb-'' (e.g. the command
+@code{ecb-activate} is listed with name ``activate''). This has been
+done for a better readable command index. @xref{Command Index}.
+
+@deffn Command activate
+Activates ECB and creates the special buffers for the choosen layout.
+For the layout see @code{ecb-layout-name}. This function always raises
+the ECB-frame if called from another frame. This is the same as
+calling @code{ecb-minor-mode} with a positive argument.
+@end deffn
+
+@deffn Command add-all-buffers-to-history
+Add all current file-buffers to the history-buffer of ECB.
+Dependend on the values of @code{ecb-history-make-buckets} and
+@code{ecb-history-sort-method} afterwards the history is bucketized or
+not and sorted either by name or by extension (if bucketized
+then the sorting is only within each bucket). If
+@code{ecb-history-sort-method} is nil the most recently used buffers
+are on the top of the history and the seldom used buffers at the
+bottom (again: when bucketized then this holds only within each
+bucket).
+@end deffn
+
+@deffn Command analyse-buffer-sync
+Synchronize the analyse buffer with the current buffer and point. This
+means in fact display the current analysis for current point.
+@end deffn
+
+
+@deffn Command change-layout &optional preselect-type
+Select a layout-name from all current available layouts
+(TAB-completion is offered) and change the layout to the selected
+layout-name. If optional argument PRESELECT-TYPE is not nil then you
+can preselect a layout-type \(TAB-completion is offered too) and then
+you will be asked only for layouts of that preselected type. Note:
+This function works by changing the option @code{ecb-layout-name} but
+only for current Emacs-session.
+@end deffn
+
+@deffn Command clear-history
+Clears the history-buffer.
+@end deffn
+
+@deffn Command customize
+Open a customize-buffer for all customize-groups of ECB.
+@end deffn
+
+@deffn Command customize-most-important
+Open a customize-buffer for the most important options of ECB.
+@end deffn
+
+@deffn Command create-new-layout
+Start process for interactively creating a new ECB-layout
+(@pxref{Creating a new ECB-layout}).
+@end deffn
+
+@deffn Command cycle-maximized-ecb-buffers
+Cycles through all ecb-buffers of current layout by maximizing exactly
+one of the ecb-windows after every cycle-step.
+@end deffn
+
+@deffn Command cycle-through-compilation-buffers &optional choose-buffer
+Cycle through all compilation buffers currently open and display them
+within the compilation window @code{ecb-compile-window}. If the
+currently opened buffer within the compilation window is not a
+compilation buffer, we jump to the first compilation buffer. If not we
+try to loop through all compilation buffers. If we hit the end we go
+back to the beginning.
+
+If @var{CHOOSE-BUFFER} is not @code{nil} then the user will be
+prompted for the compilation-buffer to switch to.
+@end deffn
+
+@deffn Command deactivate
+Deactivates the ECB and kills all ECB buffers and windows.
+@end deffn
+
+@deffn Command delete-new-layout
+Select a layout-name for a layout created by
+@code{ecb-create-new-layout} and delete this layout. This means the
+layout-definition is removed from the file
+@code{ecb-create-layout-file} and the layout-function and associated
+aliases are unbound.
+@end deffn
+
+@deffn Command display-news-for-upgrade &optional FULL-NEWS
+Display the most important NEWS after an ECB-upgrade. If you call this
+function but no ECB-upgrade has been performed before starting ECB
+then nothing is display unless @var{FULL-NEWS} is not nil.
+
+If @var{FULL-NEWS} is not nil then the NEWS-file is displayed in
+another window.
+@end deffn
+
+@deffn Command display-upgraded-options
+Display a information-buffer which options have been upgraded or
+reset. Offers two buttons where the user can decide if the upgraded
+options should also being saved by ECB for future settings or if the
+buffer should be killed.
+
+If saving is possible this command display where the options would be
+saved. It is that file Emacs uses to save customize-settings. This
+file is ``computed'' from the settings in @code{custom-file} and
+@code{user-init-file} (see the documentation of these variables).
+
+ECB automatically makes a backup-file of that file which will be
+modified by storing the upgraded rsp. renamed ECB-options. This backup
+file gets a unique name by adding a suffix ``.before_ecb_<version>''
+to the name of the modified file. If such a file already exists ECB
+adds a unique number to the end of the filename to make the filename
+unique. This is a safety mechanism if something fails during storing
+the upgraded options, so you never lose the contents of your
+customization-file!
+@end deffn
+
+@deffn Command expand-methods-nodes &optional force-all
+Set the expand level of the nodes in the ECB-methods-buffer.
+
+This command asks in the minibuffer for an indentation level LEVEL. With this
+LEVEL you can precisely specify which level of nodes should be expanded. LEVEL
+means the indentation-level of the nodes.
+
+A LEVEL value X means that all nodes with an indentation-level <= X are
+expanded and all other are collapsed. A negative LEVEL value means all visible
+nodes are collapsed.
+
+Nodes which are not indented have indentation-level 0!
+
+Which node-types are expanded (rsp. collapsed) by this command
+depends on the options @code{ecb-methods-nodes-expand-spec} and
+@code{ecb-methods-nodes-collapse-spec}! With optional argument
+@var{FORCE-ALL} all tags will be expanded/collapsed regardless of
+the values of these options.
+
+Examples:
+@itemize @minus
+@item LEVEL = 0
+expands only nodes which have no indentation itself.
+@item LEVEL = 2
+expands nodes which are either not indented or indented indented once
+or twice
+@item LEVEL ~ 10
+should normally expand all nodes expect there are nodes which are
+indented deeper than 10.
+@end itemize
+
+Note 1: This command switches off auto. expanding of the method-buffer
+if @code{ecb-expand-methods-switch-off-auto-expand} is not nil. But it
+can be switched on again quickly with
+@code{ecb-toggle-auto-expand-tag-tree} or @kbd{[C-c . a]}.
+
+Note 2: All this is only valid for file-types parsed by semantic. For
+other file types which are parsed by imenu or etags (see
+@code{ecb-process-non-semantic-files}) @var{FORCE-ALL} is always true!
+@end deffn
+
+@deffn Command dump-semantic-toplevel
+Dump the current semantic-tags in special buffer and display them.
+@end deffn
+
+
+@deffn Command eshell-current-buffer-sync
+Synchronize the eshell with the directory of current source-buffer.
+This is only done if the eshell is currently visible in the
+compile-window of ECB and if either this function is called
+interactively or @code{ecb-eshell-buffer-sync} is not nil.
+@end deffn
+
+@deffn Command eshell-recenter
+Recenter the eshell window so that the prompt is at the buffer-end.
+@end deffn
+
+@deffn Command expand-directory-nodes
+Set the expand level of the nodes in the ECB-directories-buffer. For
+argument LEVEL see @code{ecb-expand-methods-nodes}.
+
+Be aware that for deep structured paths and a lot of source-paths this
+command can last a long time - depending on machine- and
+disk-performance.
+@end deffn
+
+@deffn Command goto-window-analyse
+Make the ECB-analyse window the current window.
+@end deffn
+
+@deffn Command goto-window-compilation
+Goto the ecb compilation window @code{ecb-compile-window}.
+@end deffn
+
+@deffn Command goto-window-directories
+Make the ECB-directories window the current window. If
+@code{ecb-use-speedbar-instead-native-tree-buffer} is @code{dir} then
+goto to the speedbar-window.
+@end deffn
+
+@deffn Command goto-window-ecb-by-smart-selection
+selects a special ecb-browsing-window by smart selection. The command offers a
+list of all special ecb-windows by buffer-name. Selecting the buffer-name will
+select the displaying window. Which special ecb-windows are offered depends on
+the currently selected window: If not a special ecb-window is the currently
+selected-window then all edit-windows are offered in canonical order (means
+from top-left to button-right). If an ecb-window is the currently
+selected-window then all other(!) special ecb-windows are offered, beginning
+with the next special ecb-window to the current ecb-window (the following
+special ecb-windows also in canonical order). If there is only one senseful
+destination-ecb-window then this window is immediately selected, without
+confirmation (e.g.: There are two special ecb-windows and point stays in one
+of them. Or there is only one ecb-window and point stays either in one of the
+edit-windows or in the compile-window).
+
+If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer.
+@end deffn
+
+@deffn Command goto-window-edit-by-smart-selection
+Selects an edit-window by smart selection. The command offers a list of all
+edit-windows by buffer-name. Selecting the buffer-name will select the
+displaying window. Which edit-windows are offered depends on the currently
+selected window: If not an edit-window is the currently selected-window then
+all edit-windows are offered in canonical order (means from top-left to
+button-right). If an edit-window is the currently selected-window then all
+other(!) edit-windows are offered, beginning with the next edit-window to the
+current edit-window (the following edit-windows also in canonical order). If
+there is only one senseful destination-edit-window then this window is
+immediately selected, without confirmation (e.g.: There are two edit-windows
+and point stays in one of them. Or there is only one edit-window and point
+stays either in one of the special ecb-windows or in the compile-window).
+
+If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer.
+@end deffn
+
+@deffn Command goto-window-edit1
+Make the (first) edit-window window the current window.
+@end deffn
+
+@deffn Command goto-window-edit2
+Make the second edit-window (if available) window the current window.
+@end deffn
+
+@deffn Command goto-window-edit-last
+Make the last selected edit-window window the current window. This is
+the same as if @code{ecb-mouse-click-destination} is set to
+@code{last-point}.
+@end deffn
+
+
+@deffn Command goto-window-history
+Make the ECB-history window the current window.
+@end deffn
+
+@deffn Command goto-window-methods
+Make the ECB-methods window the current window. If
+@code{ecb-use-speedbar-instead-native-tree-buffer} is @code{method}
+then goto to the speedbar-window.
+@end deffn
+
+@deffn Command goto-window-sources
+Make the ECB-sources window the current window. If
+@code{ecb-use-speedbar-instead-native-tree-buffer} is @code{source}
+then goto to the speedbar-window.
+@end deffn
+
+@deffn Command history-filter
+Apply a filter to the history-buffer to reduce the number of entries.
+So you get a better overlooking. There are three choices:
+
+@itemize @minus
+@item Filter by extension:
+Just insert the extension you want the History-buffer being filtered.
+Insert the extension without leading dot!
+
+@item Filter by regexp:
+Insert the filter as regular expression.
+
+@item No filter:
+This means to display an entry for all currently living file-buffers.
+@end itemize
+@end deffn
+
+@deffn Command jde-display-class-at-point
+Display in the ECB-methods-buffer the contents (methods, attributes
+etc...) of the class which contains the definition of the ``thing''
+under point (this can be a variable-name, class-name, method-name,
+attribute-name). This function needs the same requirements to work as
+the method-completion feature of JDEE (see
+@code{jde-complete})!. The source-file is searched first in
+@code{jde-sourcepath}, then in @code{jde-global-classpath}, then in
+@var{$CLASSPATH}, then in current-directory.
+
+Works only for classes where the source-code (i.e. the *.java-file) is
+available.
+@end deffn
+
+@deffn Command maximize-window-analyse
+Maximize the ECB-analyse-window. I.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-analyse-window is not visible
+in current layout.
+@end deffn
+
+@deffn Command maximize-window-directories
+Maximize the ECB-directories-window, i.e. delete all other
+ECB-windows, so only one ECB-window and the edit-window(s) are visible
+(and maybe a compile-window). Works also if the ECB-directories-window
+is not visible in current layout.
+@end deffn
+
+@deffn Command maximize-window-sources
+Maximize the ECB-sources-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-sources-window is not visible
+in current layout.
+@end deffn
+
+@deffn Command maximize-window-methods
+Maximize the ECB-methods-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-methods-window is not visible
+in current layout.
+@end deffn
+
+@deffn Command maximize-window-history
+Maximize the ECB-history-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-history-window is not visible
+in current layout.
+@end deffn
+
+@deffn Command maximize-window-speedbar
+Maximize the ECB-speedbar-window, i.e. delete all other ECB-windows,
+so only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Does nothing if the speedbar-window is not visible
+within the ECB-frame.
+@end deffn
+
+@deffn Command methods-filter
+Apply a filter to the Methods-buffer to reduce the number of entries.
+So you get a better overlooking. There are six choices:
+
+@itemize @bullet
+@item Filter by protection:
+Just insert the protection you want the Methods-buffer being filtered:
+private, protected or public!
+
+@item Filter by regexp:
+Insert the filter as regular expression.
+
+@item Filter by tag-class:
+You can filter by the tag-classes of current major-mode. The available
+tag-classes come from the variable
+@code{semantic--symbol->name-assoc-list}. The are normally methods,
+variables etc.
+
+@item Filter by current type:
+In languages which have types like Java or C++ this filter displays
+only the current type and all its members (e.g. attributes and
+methods). If ECB can not identify the current type in the
+source-buffer or in the methods-window then nothing will be done.
+
+@item Filter by a filter-function:   
+Such a function gets two arguments: a tag and the source-buffer of
+this tag. If the tag should be displayed (i.e. not being filtered out)
+then the function has to return not nil otherwise nil.
+
+@item No special filter:
+This means to display all tags specified with the option
+@code{ecb-show-tokens}. If currently some of the above filters are
+applied they will be all removed.
+
+@item Delete the last added:
+This removes only the topmost filter-layer, means that filter added
+last.
+@end itemize
+
+The protection-, current-type- and the tag-class-filter are only
+available for semantic-supported sources.
+
+Be aware that the tag-list specified by the option
+@code{ecb-show-tags} is the basis of all filters, i.e. tags which are
+excluded by that option will never be shown regardless of the filter
+type here!
+
+All tags which match the applied filter(s) will be displayed in the
+Methods-buffer.
+
+If called with a prefix-argument or when optional arg INVERSE is not
+nil then an inverse filter is applied to the Methods-buffer, i.e. all
+tags which do NOT match the choosen filter will be displayed in the
+Methods-buffer!
+
+Per default the choosen filter will be applied on top of already
+existing filters. This means that filters applied before are combined
+with the new filter. This behavior can changed via the option
+@code{ecb-methods-filter-replace-existing}. But regardless of the
+setting in @code{ecb-methods-filter-replace-existing} applying one of
+the not-inverse filters protection, tag-class or current-type always
+replaces exactly already existing filters of that type. On the other
+hand applying more than one inverse tag-class- or protection-filter
+can make sense.
+
+Such a filter is only applied to the current source-buffer, i.e. each
+source-buffer can have its own tag-filters.
+
+The current active filter will be displayed in the modeline of the
+Methods-buffer [regexp, prot (= protection), tag-class, function (=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is
+applied then always the top-most filter is displayed in the modeline
+but the fact of more than 1 filter is visualized by the number of the
+filters - included in parens. You can see all currently applied
+filters by moving the mouse over the filter-string in modeline of the
+Methods-buffer: They will displayed as help-echo.
+
+See the option @code{ecb-default-tag-filter} if you search for
+automatically applied default-tag-filters.
+@end deffn
+
+@deffn Command methods-filter-current-type
+Display in the Methods-buffer only the current type and its members.
+For further details see @code{ecb-methods-filter}.
+@end deffn
+
+
+@deffn Command methods-filter-delete-last
+Remove the most recent filter from the Methods-buffer. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command methods-filter-function &optional inverse
+Filter the methods-buffer by a function. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command methods-filter-nofilter
+Remove any filter from the Methods-buffer. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command methods-filter-protection &optional inverse
+Filter the methods-buffer by protection. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command methods-filter-regexp &optional inverse
+Filter the methods-buffer by a regexp. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command methods-filter-tagclass &optional inverse
+Filter the methods-buffer by tag-class. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+@code{ecb-methods-filter}.
+@end deffn
+
+@deffn Command minor-mode &optional arg
+Toggle ECB minor mode. With prefix argument @var{ARG}, turn on if
+positive, otherwise off. Return non-@code{nil} if the minor mode is
+enabled.
+@end deffn
+
+@deffn Command nav-goto-previous
+Go backward in the navigation history-list, see @ref{Back/forward
+navigation}.
+@end deffn
+
+@deffn Command nav-goto-next
+Go forward in the navigation history-list, see @ref{Back/forward
+navigation}.
+@end deffn
+
+@deffn Command rebuild-methods-buffer
+Updates the methods buffer with the current buffer after deleting the
+complete previous parser-information, means no semantic-cache is used!
+Point must stay in an edit-window otherwise nothing is done. This
+method is merely needed for semantic parsed buffers if semantic parses
+not the whole buffer because it reaches a not parse-able code or for
+buffers not supported by semantic but by imenu or etags.
+
+Examples when a call to this function can be necessary:
+
+@itemize
+@item
+If an Elisp-file is parsed which contains in the middle a defun X
+where the closing ) is missing then semantic parses only until this
+defun X is reached and you will get an incomplete ECB-method buffer.
+In such a case you must complete the defun X and then call this
+function to completely reparse the Elisp-file and rebuild the ECB
+method buffer!
+
+@item
+For not semantic supported buffers which can be parsed by imenu or
+etags (see @code{ecb-process-non-semantic-files}) because for these
+buffers there is no built-in auto-rebuild mechanism. For these buffers
+this command calls @code{ecb-rebuild-methods-buffer-for-non-semantic}.
+@end itemize
+
+For non-semantic-sources supported by etags the option
+@code{ecb-auto-save-before-etags-methods-rebuild} is checked before
+rescanning the source-buffer and rebuilding the methods-buffer.
+
+If point is in one of the ecb-windows or in the compile-window then
+this command rebuids the methods-buffer with the contents of the
+source-buffer the last selected edit-window.
+@end deffn
+
+@deffn Command redraw-layout &optional ARG
+Redraw the ECB screen.
+
+Do not call this command from elisp-program but only interactively!
+
+Called without a prefix-argument the state of the ECB-frame-layout
+will preserved. This means:
+
+@itemize @minus
+@item
+The state of compile-window (hidden or visible) will be preserved but
+if visible then the height will be as specified in
+@code{ecb-compile-window-height}.
+
+@item
+The state of the ECB-windows will be preserved (hidden or visible) but
+if visible then the sizes will be as specified in the layout (and with
+the options @code{ecb-windows-width} and @code{ecb-windows-height}) or
+as stored with @code{ecb-store-window-sizes}.
+@end itemize
+
+If called with ONE prefix-argument (@kbd{[C-u]}) then the layout will
+be drawn with all ECB-windows and also with a visible compile-window
+(when @code{ecb-compile-window-height} is not nil). The
+splitting-state of the edit-area will be preserved.
+
+If called with TWO prefix-arguments (i.e. hitting @kbd{[C-u]} twice:
+(@kbd{[C-u]} @kbd{[C-u]}) then an emergency-redraw will be performed.
+This means the same as if called with one prefix-argument (s.a.) but
+the splitting-state of the edit-area will NOT be preserved but all
+edit-windows besides the current one will be deleted. Use this only if
+there are some anomalies after standard redraws!
+
+If the variable @code{ecb-redraw-layout-quickly} is not nil then the
+redraw is done by the @code{ecb-redraw-layout-quickly} function,
+otherwise by @code{ecb-redraw-layout-full}.
+
+Please not: It's strongly recommended to use the quick redraw only if
+you have really slow machines where a full redraw takes several
+seconds because the quick redraw is not really safe and has some
+annoying drawbacks! On normal machines the full redraw should be done
+in << 1s so there should be no need for the quick version!
+@end deffn
+
+
+@deffn Command restore-default-window-sizes
+Resets the sizes of the ECB windows to their default values.
+@end deffn
+
+@deffn Command restore-window-sizes
+Sets the sizes of the ECB windows to their stored values. See option
+@code{ecb-layout-window-sizes} and command
+@code{ecb-store-window-sizes}.
+@end deffn
+
+@deffn Command select-ecb-frame
+Selects the @code{ecb-frame} if ECB is activated - otherwise reports
+an error.
+@end deffn
+
+@deffn Command show-help &optional format
+Shows the online help of ECB either in Info or in HTML format
+depending on the value of @code{ecb-show-help-format}. If called with
+prefix argument, i.e. if @var{FORMAT} is not nil then the user is
+prompted to choose the format of the help (Info or HTML). If an error
+about not finding the needed help-file occurs please take a look at
+the options @code{ecb-help-info-start-file} and
+@code{ecb-help-html-start-file}!
+
+Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included.
+@end deffn
+
+@deffn Command show-layout-help
+Select a name of a layout and shows the documentation of the
+associated layout-function. At least for the built-in layouts the
+documentation contains a picture of the outline of the chosen layout.
+@end deffn
+
+@deffn Command show-tip-of-the-day
+Show tip of the day if @code{ecb-tip-of-the-day} is not nil or if
+called interactively.
+@end deffn
+
+@deffn Command sources-filter
+Apply a filter to the sources-buffer to reduce the number of entries.
+So you get a better overlooking. There are three choices:
+
+@itemize @minus
+@item Filter by extension:
+Just insert the extension you want the Sources-buffer being filtered.
+Insert the extension without leading dot!
+
+@item Filter by regexp:
+Insert the filter as regular expression.
+
+@item No filter:
+This means to display an entry for every file in the current selected
+directory (all except these filter already filtered out by
+@code{ecb-source-file-regexps} and
+@code{ecb-sources-exclude-cvsignore}).
+@end itemize
+
+Such a filter is only applied to the current selected directory, i.e. each
+directory has its own filtered sources-buffer.
+@end deffn
+
+@deffn Command store-window-sizes &optional FIX
+Stores the sizes of the ECB windows for the current layout. The size
+of the ECB windows will be set to their stored values when
+@code{ecb-redraw-layout} or @code{ecb-restore-window-sizes} is called.
+To reset the window sizes to their default values call
+@code{ecb-restore-default-window-sizes}. Please read also the
+documentation of @code{ecb-layout-window-sizes}!
+
+The windows sizes are stored per default as fractions of current
+frame-width and -height of the ecb-frame, so the stored values will
+``work'' for other frame sizes too. If a permanent compile-window is
+visible then ECB will tell you that window-sizes should be stored with
+hidden compile-window and ask you if you want proceed; if you proceed
+then the window-heights will be stored as fractions of current
+(frame-height minus current visible compile-window-height) so you
+should ensure that the current compile-window has its standard-height
+as specified in @code{ecb-compile-window-height}!. If @var{FIX} is not
+nil (means called with a prefix argument) then always the fixed values
+of current width and height are stored!
+@end deffn
+
+@deffn Command submit-problem-report
+Submit a problem report for the ECB to the ECB mailing-list. This
+command generates in the edit-window a problem-report which contains
+already the current values of all ECB options, the current
+backtrace-buffer if there is any and the current message-buffer. You
+will be asked for a problem-report subject and then you must insert a
+description of the problem. Please describe the problem as detailed as
+possible!
+@end deffn
+
+@deffn Command toggle-auto-expand-tag-tree &optional arg
+Toggle auto expanding of the ECB-methods-buffer. With prefix argument
+@var{ARG}, make switch on if positive, otherwise switch off. If the
+effect is that auto-expanding is switched off then the current value
+of @code{ecb-auto-expand-tag-tree} is saved so it can be used for
+the next switch on by this command.
+@end deffn
+
+@deffn Command toggle-compile-window &optional arg
+Toggle the visibility of the compile-window of ECB. With prefix
+argument ARG, make visible if positive, otherwise invisible. The
+height of the compile-window is always the current value of
+@code{ecb-compile-window-height}! If called and
+@code{ecb-compile-window-height} is nil then ECB asks for the height
+of the compile-window, sets this height as new value of
+@code{ecb-compile-window-height} and displays the compile-window (so
+if you have called this command by mistake and you do not want a
+compile-window you have to quit with @key{C-g}).
+@end deffn
+
+
+@deffn Command toggle-compile-window-height &optional arg
+Toggle whether the @code{ecb-compile-window} is enlarged or not. If
+@var{ARG} > 0 then shrink or enlarge the the compile-window according
+to the value of @code{ecb-enlarged-compilation-window-max-height}. But
+never shrink below the value of @code{ecb-compile-window-height}. If
+@var{ARG} <= 0 then shrink @code{ecb-compile-window} to
+@code{ecb-compile-window-height} and if @var{ARG} is nil then toggle
+the enlarge-state.
+@end deffn
+
+@deffn Command toggle-ecb-windows &optional arg
+Toggle visibility of the ECB-windows. With prefix argument @var{ARG},
+make visible if positive, otherwise invisible. This has nothing to do
+with (de)activating ECB but only affects the visibility of the ECB
+windows. ECB minor mode remains active!
+@end deffn
+
+@deffn Command toggle-layout &optional last-one
+Toggles between the layouts defined in
+@code{ecb-toggle-layout-sequence} (See also option
+@code{ecb-show-sources-in-directories-buffer}). Note: This function
+works by changing the options @code{ecb-layout-name} but only for
+current Emacs-session.
+
+If optional argument @var{LAST-ONE} is not nil (e.g. called with a
+prefix-arg) then always the last selected layout was choosen
+regardless of the setting in @code{ecb-toggle-layout-sequence}. The
+last selected layout is always that layout which was current direct
+before the most recent layout-switch. So now a user can switch to
+another layout via `ecb-change-layout' and always come back to his
+previous layout via @kbd{[C-u]} @code{ecb-toggle-layout}.
+@end deffn
+
+@deffn Command toggle-scroll-other-window-scrolls-compile &optional ARG
+Toggle the state of
+@code{ecb-scroll-other-window-scrolls-compile-window}. With prefix
+argument @var{ARG}, set it to @code{t}, otherwise to @code{nil}. For
+all details about the scroll-behavior of @code{scroll-other-window}
+see the advice documentation of @code{other-window-for-scrolling}.
+@end deffn
+
+@deffn Command update-directories-buffer
+Updates the ECB directories buffer.
+@end deffn
+
+@deffn Command upgrade-options
+Check for all ECB-options if their current value is compatible to the
+defined type. If not upgrade it to the new type or reset it to the
+default-value of current ECB. Try also to upgrade renamed options.
+Displays all upgraded or reset options with their old (before the
+upgrade/reset) and new values.
+@end deffn
+
+@deffn Command window-sync
+ynchronizes all special ECB-buffers with current buffer.
+Depending on the contents of current buffer this command performs different
+synchronizing tasks but only if ECB is active and point stays in an
+edit-window.
+
+@itemize
+@item
+If current buffer is a file-buffer (or an indirect-buffer with a file-buffer
+as base-buffer) then all basic ECB-windows (directories, sources, methods and
+history) are synchronized with current buffer.
+
+@item
+If current buffer is a dired-buffer then the directory- and
+the sources-tree-buffer are synchronized if visible
+@end itemize
+
+In addition to this the hooks in @code{ecb-basic-buffer-sync-hook} run.
+
+If optional argument ONLY-BASIC-WINDOWS is not nil then only the basic
+tree-buffer directories, sources, methods and history are synchronized.
+Otherwise all registered special ecb-buffers are synchronized too.
+
+See @ref{ECB-window synchronizing}.
+@end deffn
+
+Most of these functions are also available via the menu ``ECB'' and
+also via the ECB key-map with prefix @kbd{C-c .} (see
+@code{ecb-minor-mode} for a complete list of the keybindings).
+
+@node Customizing, Submitting problem report, Usage of ECB, Top
+@chapter Customizing ECB
+
+This chapter describes how to customize ECB for your personal taste.
+The first section introduces some general aspects (which you should
+really know!), the second one gives an overview of the most important
+options and the third one lists all options of ECB (divided into the
+customize groups).
+
+@menu
+* General aspects::             General aspects for customizing ECB
+* Most important options::      Which option you must know
+* Customizable options::        All customizable options of ECB
+@end menu
+
+@node General aspects, Most important options, Customizing, Customizing
+@section General aspects for customizing ECB
+
+This chapter contains all important informations you should know about
+customizing ECB. The first section gives an answer to the question
+``@code{setq} or @code{customize}'' and the second section describes
+what to do when you have to customize ECB for a lot of people.
+
+@menu
+* setq or customize::           Should i use setq or customize?
+* Site-wide customizing::       Site-wide customizing of ECB
+@end menu
+
+@node setq or customize, Site-wide customizing, General aspects, General aspects
+@subsection Setq or customize - what should i use?
+
+The best way to customize all the options of ECB is via the
+customize-feature of (X)Emacs, i.e. means calling the commands
+@code{customize-option} or @code{customize-group} etc. This is also
+the strongly recommended way!
+
+But you can also use @code{setq} or some Elisp-code to change the values of
+many but not all of the options. The values of the following options
+@strong{MUST NOT} be changed via @code{setq} or Elisp-code but only with the
+customize-feature!
+
+@itemize @minus
+@item @code{ecb-analyse-buffer-sync-delay}
+@item @code{ecb-analyse-show-node-info}
+@item @code{ecb-basic-buffer-sync-delay}
+@item @code{ecb-bucket-node-display}
+@item @code{ecb-compile-window-height}
+@item @code{ecb-compile-window-temporally-enlarge}
+@item @code{ecb-compile-window-width}
+@item @code{ecb-directories-show-node-info}
+@item @code{ecb-eshell-buffer-sync-delay}
+@item @code{ecb-exclude-parents-regexp}
+@item @code{ecb-fix-window-size}
+@item @code{ecb-font-lock-tags}
+@item @code{ecb-highlight-tag-with-point-delay}
+@item @code{ecb-history-show-node-info}
+@item @code{ecb-key-map}
+@item @code{ecb-layout-name}
+@item @code{ecb-layout-window-sizes}
+@item @code{ecb-methods-show-node-info}
+@item @code{ecb-mode-line-data}
+@item @code{ecb-mode-line-display-window-number}
+@item @code{ecb-mode-line-prefixes}
+@item @code{ecb-show-tags}
+@item @code{ecb-source-path}
+@item @code{ecb-sources-show-node-info}
+@item @code{ecb-speedbar-buffer-sync-delay}
+@item @code{ecb-symboldef-buffer-sync-delay}
+@item @code{ecb-toggle-layout-sequence}
+@item @code{ecb-tag-display-function}
+@item @code{ecb-tree-do-not-leave-window-after-select}
+@item @code{ecb-type-tag-display}
+@item @code{ecb-type-tag-expansion}
+@item @code{ecb-use-speedbar-instead-native-tree-buffer}
+@item @code{ecb-windows-height}
+@item @code{ecb-windows-width}
+@end itemize
+
+@node Site-wide customizing, , setq or customize, General aspects
+@subsection Site-wide customizing of ECB
+
+If you are the administrator for an Emacs-site, means you are
+responsible for the basic customization of a lot of Emacs users, then
+you maybe need a way to customize Emacs and ECB without changing
+everyones @file{.emacs}-file and normally you will do this with the
+file @file{site-start.el}. You can customize all options of ECB in a
+central @file{site-start.el} (even the options mentioned above!) but
+you @strong{MUST NOT} do this via @code{setq} but you have to use a
+mechanism like the following@footnote{At least for the options for
+which @code{setq} is explicitly forbidden, but it is recommended to
+use always such a mechanism}!
+
+This section describes two methods how to pre-customize ECB site-wide.
+The elisp-code contained in the following two subsections has to be
+copied to the file @file{site-start.el} before it can be used.
+
+But ensure for both methods that you customize the options with the
+correct lisp format. Read carefully the docstrings of the options you
+want to customize from within Elisp-code!
+
+@subsubsection Storing all option-settings in the users custom-file
+
+The mechanism described here defines all site-wide-settings in a file
+@file{site-lisp.el} but stores the values in the users
+@code{custom-file} which is probably @file{.emacs}!
+
+First two helper functions are needed, namely
+@code{customize-option-get-value} and
+@code{customize-save-variable-save} whereas the latter one sets the
+value for an option via the customize-mechanism (and is therefore
+allowed for the setq-forbidden options!) but only if the option has no
+saved value until now (i.e. the user has not saved this option for
+future sessions until now)
+
+@example
+@group
+(defun customize-option-get-value (option type)
+  "Return the value of a customizable option OPTION with TYPE, where TYPE
+can either be 'standard-value \(the default-value of the defcustom) or
+'saved-value \(the value stored persistent by the user via customize)."
+  (let ((val (car (get option type))))
+    (cond ((not (listp val)) val)
+          ((equal 'quote (car val)) (car (cdr val)))
+          (t (car val)))))
+
+(defun customize-save-variable-save (option value &optional override)
+  "Calls `customize-save-variable' with OPTION and VALUE if OPTION is a
+custom-type and if OPTION has no saved-value until now.
+If OVERRIDE is a function or lambda-form then it is called with two arguments:
+- OLD-SAVED-VAL: The saved value of OPTION
+- NEW-VALUE: see argument VALUE.
+OVERRIDE is only called if OPTION has already a saved-value. If OVERIDE
+returns not nil then `customize-save-variable' is called for OPTION with VALUE
+even if OPTION has no saved-value until now."
+  (and (get option 'custom-type)
+       (or (not (get option 'saved-value))
+           (and (functionp override)
+                (funcall override
+                         (customize-option-get-value option 'saved-value)
+                         value)))
+       (progn
+         (message "Overriding saved value for option %s with %s" option value)
+         (customize-save-variable option value))))
+@end group
+@end example
+
+With @code{customize-save-variable-save} all ECB-options can be
+site-wide pre-customized like follows:
+
+@example
+@group
+(customize-save-variable-save 'ecb-show-tags
+                              '((include collapsed nil)
+                                (parent collapsed nil)
+                                (type flattened nil)
+                                (variable collapsed name)
+                                (function flattened name)
+                                (rule flattened name)
+                                (section flattened nil)
+                                (def collapsed name)
+                                (t collapsed name)))
+(customize-save-variable-save 'ecb-font-lock-tags t)
+;; add here more options of ECB it you want
+@end group
+@end example
+
+@subsubsection Using a special setq for site-wide settings
+
+The mechanism above saves the pre-customized values always in the
+users @code{custom-file} (probably @file{.emacs}). If this is not
+preferred, then you can use the following mechanism but of course the
+offered @code{setq-save} is only allowed for options which are not
+setq-forbidden (@pxref{setq or customize}).
+
+The mechanism below does not change the users @code{custom-file}. This
+mechanism is needed especially if ECB should be autoloaded and all
+site-wide settings should first loaded when ECB is activated by the
+user. This can be achieved for example via@footnote{The file
+@file{site-ecb.el} contains all site-wide settings for ECB}:
+
+@example
+@group
+(require 'ecb-autoloads))
+(eval-after-load "ecb"
+  '(require 'site-ecb))
+@end group
+@end example
+
+In such a situation the whole @code{custom-file} of a user is mostly
+loaded @strong{before} ECB is activated and therefore before the
+site-wide-settings are loaded. So the users own customizations are
+loaded before the site-wide ones.
+
+The @code{setq-save}-mechanism described below prevents the users own
+customisations contained in his @code{custom-file} from being
+overridden by the site-wide setq-settings. If @code{setq} would be
+used for the site-wide settings then in an autoload-situation the
+site-wide settings would override the users-settings and this should
+not be done!
+
+First two helper-macros are needed:
+
+@example
+@group
+(defmacro custom-saved-p (option)
+  "Return only not nil if OPTION is a defcustom-option and has a
+saved value. Option is a variable and is literal \(not evaluated)."
+  `(and (get (quote ,option) 'custom-type)
+        (get (quote ,option) 'saved-value)))
+
+(defmacro setq-save (option value)
+  "Sets OPTION to VALUE if and only if OPTION is not already saved
+by customize. Option is a variable and is literal \(not evaluated)."
+  `(and (not (custom-saved-p ,option))
+        (set (quote ,option) ,value)))
+@end group
+@end example
+
+With @code{setq-save} all ``not-setq-forbidden''-ECB-options can be
+site-wide pre-customized like follows:
+
+@example
+@group
+(setq-save ecb-tree-indent 4)
+(setq-save ecb-tree-expand-symbol-before t)
+(setq-save ecb-primary-secondary-mouse-buttons 'mouse-1--mouse-2)
+@end group
+@end example
+
+@node Most important options, Customizable options, General aspects, Customizing
+@section The most important options of ECB
+
+Here are the most important options (it is recommended to check at
+least the following options before working with ECB). You can
+customize them via the customize-group ``ecb-most-important'' or via
+the command @code{ecb-customize-most-important}.
+
+@table @code
+@item ecb-source-path
+Where ECB can find your sources. You must set this option!
+@item ecb-show-help-format
+Should the online help of ECB be displayed in the standard Info format
+or in HTML format in a web-browser.
+@item ecb-auto-activate
+@item ecb-major-modes-show-or-hide
+Auto. activation of ECB after start (@pxref{Automatic activation}) or
+major-mode-based showing or hiding the ecb-windows.
+@item ecb-winman-escreen-number
+@itemx ecb-winman-winring-name
+Support of several window-managers (@pxref{Window-managers and ECB}).
+@item ecb-key-map
+All ECB-keybindings incl. a common prefix-key (@pxref{Using the
+keyboard}).
+@item ecb-new-ecb-frame
+Should ECB create a new frame at activation time.
+@item  ecb-primary-secondary-mouse-buttons
+@itemx ecb-mouse-click-destination
+Define how to use the mouse (@pxref{Using the mouse}).
+@item ecb-tree-buffer-style
+@itemx ecb-tree-expand-symbol-before
+@itemx ecb-tree-indent
+@itemx ecb-truncate-lines
+The look&feel of the trees in the tree-buffers. The former option
+defines the general style of the tree-buffers and the latter ones
+allow to customize the ascii-style tree-buffers (maybe you like a
+value of 4 for the latter one if you display the expand-symbol before
+(@pxref{Tree-buffer styles}).
+@item ecb-source-file-regexps
+Which files will (not) be shown in ECB.
+@item ecb-layout-name
+@itemx ecb-compile-window-height
+@itemx ecb-compile-window-width
+@itemx ecb-other-window-behavior
+The ECB layout, means which windows you want to be displayed in the
+ECB-frame and also the location of these windows (@pxref{Changing the
+ECB-layout}).
+@item ecb-compilation-buffer-names
+Which buffers should be treaten as ``compilation-buffers'' and
+therefore displayed in the compile-window of ECB - if there is any.
+@item  ecb-tag-display-function
+@itemx ecb-type-tag-display
+@itemx ecb-type-tag-expansion
+@itemx ecb-show-tags
+How to display the entries in the ECB-method window for semantic
+supported sources (@pxref{Customizing the display}). These options
+take only effect for semantic-sources (@pxref{Definition of semantic-
+and non-semantic-sources}).
+@item ecb-process-non-semantic-files
+Displaying file-contents for not by semantic supported files too, e.g.
+for LaTeX- and perl-sources (@pxref{Non-semantic sources}).
+@end table
+
+But to make ECB working best for you it is also recommended to have a
+look at @ref{Customizable options}!
+
+@node Customizable options, ,Most important options, Customizing
+@section All customizable options of ECB
+
+@noindent
+All customization of ECB is divided into the following ``customize
+groups''. You can highly customize all the ECB behavior/layout so just
+go to these groups and you will see all well documented ECB-options.
+
+@strong{Please note}: All options in the following subsections are
+listed without the prefix ``ecb-'' (e.g. the option
+@code{ecb-layout-name} is listed with name ``layout-name''). This has
+been done for a better readable option index. @xref{Option Index}.
+
+@menu
+* ecb-general::                 General customizing ECB
+* ecb-tree-buffer::             Customizing the general tree layout
+* ecb-directories::             Customizing the ECB-directories-tree
+* ecb-sources::                 Customizing the ECB-sources-window
+* ecb-methods::                 Customizing the ECB-methods-window
+* ecb-history::                 Customizing the ECB-history-window
+* ecb-analyse::                 Customizing the ECB-analyse-window
+* ecb-layout::                  Customizing the ECB-layout
+* ecb-compilation::             Customizing the compile-window
+* ecb-create-layout::           Customizing options for creating layouts
+* ecb-face-options::            Customizing options for faces
+* ecb-faces::                   Customizing the faces
+* ecb-help::                    Customizing the online help of ECB
+* ecb-eshell::                  Customizing the eshell-integration
+* ecb-speedbar::                Customizing the speedbar-integration
+* ecb-non-semantic::            Customizing parsing non-semantic sources
+* ecb-winman::                  Customizing window-manager support
+* ecb-mode-line::               Customizing the tree-buffer-modelines
+* ecb-version-control::         Customizing the version-control-support
+@end menu
+
+@node ecb-general, ecb-tree-buffer, Customizable options, Customizable options
+@subsection Group ecb-general
+
+@noindent
+This group contains general settings for the Emacs code browser:
+
+@defopt activate-before-layout-draw-hook
+Normal hook run at the end of activating the ecb-package by running
+@code{ecb-activate}. This hooks are run after all the internal setup
+process but directly before(!) drawing the layout specified in
+@code{ecb-layout} (means before dividing the frame into several
+windows).
+
+A senseful using of this hook can be maximizing the Emacs-frame for
+example, because this should be done before the layout is drawn
+because ECB computes the size of the ECB-windows with the current
+frame size! If you need a hook-option for the real end of the
+activating process (i.e. after the layout-drawing) look at
+@code{ecb-activate-hook}.
+
+IMPORTANT: The difference between this hook and
+@code{ecb-redraw-layout-before-hook} is that the latter one is
+evaluated always before the layout is redrawn (for example after
+calling @code{ecb-redraw-layout}) whereas the former one (this hook)
+is only evaluated exactly once during the activation-process of ECB.
+So during the activation process there is the following sequence of
+hooks:
+@enumerate
+@item @code{ecb-activate-before-layout-draw-hook} \(this one)
+@item @code{ecb-redraw-layout-before-hook}
+@item <Drawing the layout>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-activate-hook}
+@end enumerate
+@end defopt
+
+@defopt activate-hook
+Hook run at the end of activating ECB by @code{ecb-activate}. This
+hooks are run at the real end of the activating process, means after
+the layout has been drawn!. If you need hooks which are run direct
+before the layout-drawing look at
+@code{ecb-activate-before-layout-draw-hook}.
+@end defopt
+
+@defopt activation-selects-ecb-frame-if-already-active
+Trying to activate an already activated ECB selects the ECB-frame. If
+t then the ECB-frame is selected, if nil then it is not. If 'ask then
+ECB asks if the ECB-frame should be selected if the current-frame is
+not the @code{ecb-frame}.
+@end defopt
+
+@defopt auto-activate
+Automatically startup ECB when Emacs starts up. This should only be
+true if you always want to run @code{ecb-activate}.
+@end defopt
+
+@defopt auto-compatibility-check
+Check at ECB-startup if all ECB-options have correct values. If not
+nil then all ECB-options are checked if their current value have the
+correct type. It the type is incorrect the option is either auto.
+upgraded to the new type or reset to the default-value of current ECB
+if no upgrade is possible. This feature can also upgrade options which
+are renamed in current ECB and try to transform the old-value to the
+new named option. After startup all upgraded or reset options are
+displayed with their old (before upgrade/reset) and new values. See
+also the commands @code{ecb-upgrade-options} and
+@code{ecb-display-upgraded-options}. If this option is off then the
+user can perform the check and reset manually with
+@code{ecb-upgrade-options}.
+@xref{Auto. option-upgrading}.
+@end defopt
+
+@defopt before-activate-hook
+Normal hook run at the beginning of activating the ecb-package by
+running @code{ecb-activate}. These hooks run before any other tasks of
+the activating process are performed. If any of these hooks returns
+nil then ECB will not be activated!
+
+This can be used to check some conditions and then only start ECB if
+all conditions are true. For example a function could be added which
+returns only nil if Gnus is running. Then calling @code{ecb-activate}
+or @code{ecb-minor-mode} will only start ECB if Gnus is not already
+running.
+@end defopt
+
+@defopt before-deactivate-hook
+Normal hook run at the beginning of deactivating ECB by running
+@code{ecb-deactivate}. These hooks run before any other tasks of the
+deactivating process are performed. If any of these hooks returns nil
+then ECB will not be deactivated! See also
+@code{ecb-before-activate-hook}.
+@end defopt
+
+@defopt bucket-node-display
+How ECB displays bucket-nodes in a ECB tree-buffer. Bucket-nodes have
+only one job: Nodes with similar properties will be dropped into one
+bucket for such a common property and all these nodes will be added as
+children to the bucket-node. Besides being expandable and collapsable
+a bucket-node has no senseful action assigned. Examples for
+bucket-nodes are ``[+] Variables, ``[+] Dependencies'' etc. in the
+Methods-buffer or buckets which combine filenames with same extension
+under a bucket-node with name this extension.
+
+This option defines how bucket-node should be displayed. The name of
+the bucket-node is computed by ECB but you can define a prefix, a
+suffix and a special face for the bucket-node
+
+The default are empty prefix/suffix-strings and
+@code{ecb-bucket-node-face}. But an alternative can be for example
+'(``['' ``]'' nil) which means no special face and a display like
+``[+] [<bucket-name>]''.
+@end defopt
+
+
+@defopt clear-caches-before-activate
+Clear all ECB internal caches before startup. If t then ECB clears all
+its internal caches before starting up. Caches are used for files- and
+subdirs (see @code{ecb-cache-directory-contents} and
+@code{ecb-cache-directory-contents-not}) for semantic-tags and for
+the history-filter.
+
+This caches are completely clean at load-time of the ECB-library!
+
+Default is nil, because is makes sense not to clear these caches at
+start-time because ECB is often deacticated temporally especially in
+combination with window-managers like escreen.el. In these situations
+the internal state of ECB should be preserved for next activation.
+@end defopt
+
+
+@defopt deactivate-hook
+Normal hook run at the end of deactivating (but before the ecb-layout
+is cleared!) ECB by running @code{ecb-deactivate}.
+@end defopt
+
+@defopt debug-mode
+If not nil ECB displays debug-information in the Messages-buffer. This
+is done for some critical situations concerning semantic-tags and
+their overlays (or extends for XEmacs). Normally you should not need
+this switched on! But if you get errors like ``destroyed extend'' for
+XEmacs or ``wrong-argument-type'' concerning overlays for GNU Emacs then
+you should switch on this option and submitting a bug-report to the
+ecb-mailing-list (@code{ecb-submit-problem-report}) after getting the
+error again!
+@end defopt
+
+@defopt grep-function
+Function used for performing a grep. The popup-menu of the
+tree-buffers ``Directories'', ``Sources'' and ``History'' offer to
+grep the ``current'' directory:
+@itemize @minus
+@item
+Directory-buffer: The grep is performed in the current popup-directory
+after clicking the right mouse-button onto a node.
+@item
+Sources-buffer: The grep is performed in the current selected directory.
+@item
+History-buffer: The grep is performed in the directory of the current
+popup-source after clicking the right mouse-button onto a node.
+@end itemize
+@end defopt
+
+@defopt grep-recursive-function
+Function used for performing a recursive grep. For more Details see
+option `ecb-grep-function' and replace ``grep'' with ``recursive
+grep''.
+@end defopt
+
+@defopt key-map
+Specifies all keybindings for the ECB minor-mode key-map. The value is
+a cons-cell where the car is a common-prefix key for all the
+keybindings. The cdr is a list of keybindings each of them a list
+again. A key-binding has the following form:
+
+@example
+'(<common-prefix-flag> <keysequence> <function>) where
+@end example
+
+@table @code
+@item <common-prefix-flag>
+If t then the common-prefix-key defined as car of the value (see above)
+is used.
+
+@item <keysequence>
+If the common prefix-key is used then the final key-binding is the
+concatenation of the common-prefix-key (see above) and this
+keysequence.
+
+@item <function>:
+The function to bind to the key. This can also be a lambda-expression
+.
+@end table
+
+It is highly recommended to use one of the standard keys C-c or C-x as
+first key of your common-prefix-key!
+
+You MUST change this option via customize to take effect!
+
+All keysequences must be inserted as a string and must follow the
+syntax needed by @code{read-kbd-macro} or @code{kbd}. This means you
+can insert the key in the same manner @kbd{C-h k} displays keysequences.
+Here is the summary of the syntax:
+
+Text is divided into ``words'' separated by whitespace. Except for the words
+described below, the characters of each word go directly as characters of the
+keysequence. The whitespace that separates words is ignored. Whitespace in the
+macro must be written explicitly, as in @kbd{C-c SPC}.
+
+@itemize @bullet
+@item
+The special words RET, SPC, TAB, DEL, LFD, ESC, and NUL represent
+special control characters. The words must be written in uppercase.
+
+@item
+A word in angle brackets, e.g., <return>, <down>, <left> or <f1>,
+represents a function key. (Note that in the standard configuration,
+the function key <return> and the control key RET are synonymous.).
+You can use angle brackets on the words RET, SPC, etc., but they are
+not required there.
+
+@item
+Keys can be written by their ASCII code, using a backslash followed by
+up to six octal digits. This is the only way to represent keys with
+codes above ’.
+
+@item
+One or more prefixes M- (meta), C- (control), S- (shift), A- (alt), H-
+(hyper), and s- (super) may precede a character or key notation. For
+function keys, the prefixes may go inside or outside of the brackets:
+C-<down> = <C-down>. The prefixes may be written in any order: M-C-x =
+C-M-x. Prefixes are not allowed on multi-key words, e.g., C-abc,
+except that the Meta prefix is allowed on a sequence of digits and
+optional minus sign: M--123 = M-- M-1 M-2 M-3.
+
+@item
+The @code{^} notation for control characters also works: ^M = C-m.
+@end itemize
+@end defopt
+
+@defopt major-modes-show-or-hide
+List of major-modes which show or hide the ecb-windows. The value is a
+cons-cell where the car contains all major-mode-symbols which should
+show the special ecb-windows and the cdr contains all
+major-mode-symbols which should hide the special ecb-windows. If the
+symbol of a major-mode is neither contained in the car-``show-list''
+nor in the cdr-``hide-list'' then the visibility-state of the
+ecb-windows does not change.
+@end defopt
+
+
+@defopt minor-mode-text
+String to display in the mode line when ECB minor mode is active.
+(When the string is not empty, make sure that it has a leading space.)
+
+Because for ECB it is quite obvious if it is active or not when the
+ECB-windows are visible this text is only display in the modeline if
+the ECB-windows are hidden.
+@end defopt
+
+
+@defopt run-ediff-in-ecb-frame
+Run ediff-sessions in the same frame as ECB is running.
+If not nil then ECB ensures that ediff runs in the same frame as ECB and ECB
+restores exactly the ``before-ediff''-window-layout after quiting ediff. If
+nil then ediff decides in which frame it will run - depending on the current
+window-layout (e.g. if the ecb-windows are currently hidden) this can be the
+ecb-frame but this can also be a newly created frame or any other frame.
+@end defopt
+
+@defopt stealthy-tasks-delay
+Time Emacs must be idle before ECB runs its stealthy tasks. Currently
+ECB performes the following stealthy tasks:
+
+@table @asis
+@item Prescann directories for emptyness
+Prescann directories and display them as empty or not-empty in the
+directories-buffer. See the documentation of the option
+@code{ecb-prescan-directories-for-emptyness} for a description.
+
+@item File is read only
+Check if sourcefile-items of the directories- or sources-buffer are
+read-only or not. See documentation of the option
+@code{ecb-sources-perform-read-only-check}.
+
+@item Version-control-state
+Checks the version-control-state of files in directories which are
+managed by a VC-backend. See the option @code{ecb-vc-enable-support}.
+
+@end table
+
+Here the interval is defined ECB has to be idle before starting with
+these stealthy tasks. It can be a floating-point value in seconds. The
+value can also be changed during running ECB.
+@end defopt
+
+
+
+@defopt tip-of-the-day
+Show tip of the day at start time of ECB.
+@end defopt
+
+@defopt tip-of-the-day-file
+File where tip-of-the-day cursor is stored.
+@end defopt
+
+@defopt use-recursive-edit
+Tell ECB to use a recursive edit. If set then it can easily be
+deactivated by (keyboard-escape-quit).
+@end defopt
+
+@defopt version-check
+Checks at start-time if the requirements are fulfilled. It checks if the
+required versions of CEDET is installed and loaded into Emacs.
+
+It is strongly recommended to set this option to not @code{nil}!
+@end defopt
+
+
+@node ecb-tree-buffer, ecb-directories, ecb-general, Customizable options
+@subsection Group ecb-tree-buffer
+
+@noindent
+This group contains general settings related to the tree-buffers of
+ECB:
+
+@defopt basic-buffer-sync
+Synchronize the basic ECB-buffers automatically with current edit buffer.
+
+The basic ECB-buffers are the buffers for directories, sources, methods and
+history.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+@code{major-mode} of the new buffer belongs NOT to this list.
+
+But in every case the synchronization takes only place if the current-buffer
+in the edit-window has a relation to files or directories. Examples for the
+former one are all programming-language-modes, @code{Info-mode} too, an
+example for the latter one is @code{dired-mode}. For all major-modes related
+to non-file/directory-buffers like @code{help-mode}, @code{customize-mode} and
+others never an autom. synchronization will be done!
+
+It's recommended to exclude at least @code{Info-mode} because it makes no
+sense to synchronize the ECB-windows after calling the Info help. Per default
+also @code{dired-mode} is excluded but it can also making sense to synchronize
+the ECB-directories/sources windows with the current directory in the
+dired-buffer.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+@code{ecb-basic-buffer-sync-hook} is evaluated.
+@end defopt
+
+@defopt basic-buffer-sync-delay
+Time Emacs must be idle before the special ECB-buffers are synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+@end defopt
+
+@defopt basic-buffer-sync-hook
+Hook run at the end of @code{ecb-basic-buffer-sync}.
+See documentation of @code{ecb-basic-buffer-sync} for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Precondition for such a hook:
+Current buffer is the buffer of the currently selected edit-window.
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option @code{ecb-basic-buffer-sync} is not nil
+the function @code{ecb-basic-buffer-sync} is running either every time
+Emacs is idle or even after every command (see
+@code{ecb-basic-buffer-sync-delay}). So these hooks can be really
+called very often! Therefore each function of this hook
+should/must check in an efficient way at beginning if its task
+have to be really performed and then do them only if really
+necessary! Otherwise performance of Emacs could slow down
+dramatically!
+
+It is strongly recommended that each function added to this hook uses the
+macro @code{ecb-do-if-buffer-visible-in-ecb-frame} at beginning! See
+@code{ecb-speedbar-buffer-sync} and @code{ecb-eshell-buffer-sync} for
+examples how to use this macro!
+@end defopt
+
+@defopt bucket-node-display
+How ECB displays bucket-nodes in a ECB tree-buffer.
+Bucket-nodes have only one job: Nodes with similar properties will be dropped
+into one bucket for such a common property and all these nodes will be added
+as children to the bucket-node. Besides being expandable and collapsable a
+bucket-node has no senseful action assigned. Examples for bucket-nodes are
+''[+] Variables'', ``[+] Dependencies'' etc. in the Methods-buffer or buckets
+which combine filenames with same extension under a bucket-node with name this
+extension.
+
+This option defines how bucket-node should be displayed. The name of the
+bucket-node is computed by ECB but you can define a prefix, a suffix and a
+special face for the bucket-node
+
+The default are empty prefix/suffix-strings and @code{ecb-bucket-node-face}. But
+an alternative can be for example '(''['' ``]'' nil) which means no special
+face and a display like ``[+] [<bucket-name>]''.
+@end defopt
+
+
+@defopt common-tree-buffer-after-create-hook
+Local hook running at the end of each tree-buffer creation. Every
+function of this hook is called once without arguments direct after
+creating a tree-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of @code{local-set-key}
+to define new keybindings for EVERY tree-buffer.
+
+The following keys must not be rebind in all tree-buffers:
+@itemize @minus
+@item @kbd{RET} and all combinations with @kbd{Shift} and @kbd{Ctrl}
+@item @kbd{TAB}
+@item @code{C-t}
+@end itemize
+@end defopt
+
+@defopt mouse-click-destination
+Destination of a mouse-button click. Defines in which edit-window (if
+splitted) ECB does the ``right'' action (opening a source, jumping to
+a method/variable etc.) after clicking with the primary mouse-button
+(see @code{ecb-primary-secondary-mouse-buttons}) onto a node. There
+are two possible choices:
+
+@itemize @minus
+@item @code{left-top}:
+Does the ``right'' action always in the left/topmost edit-window.
+@item @code{last-point}:
+Does the ``right'' action always in that edit-window which had the point
+before.
+@end itemize
+This is if the user has clicked either with the primary mouse-button or
+has activated a popup-menu in the tree-buffer.
+
+If the edit-area is not splitted this setting doesn't matter.
+
+A click with the secondary mouse-button (see again
+@code{ecb-primary-secondary-mouse-buttons} does the ``right'' action
+always in another edit-window related to the setting in this option:
+If there are two edit-windows then the ``other'' edit-window is used
+and for more than 2 edit-windows the ``next'' edit-window is used
+(whereas the next edit-window of the last edit-window is the first
+edit-window).
+
+Note: If the tree-buffers are used with the keyboard instead with the
+mouse then this option takes effect too because @kbd{RET} is
+interpreted as primary mouse-button and @kbd{C-RET} as secondary
+mouse-button!
+@end defopt
+
+
+@defopt primary-secondary-mouse-buttons
+Primary- and secondary mouse button for using the ECB-buffers. A click
+with the primary button causes the main effect in each ECB-buffer:
+
+@itemize @bullet
+@item ECB Directories:
+Expanding/collapsing nodes and displaying files in the ECB
+Sources buffer.
+
+@item ECB sources/history:
+Opening the file in that edit-window specified by the option
+@code{ecb-mouse-click-destination}.
+
+@item ECB Methods:
+Jumping to the method in that edit-window specified by the option
+@code{ecb-mouse-click-destination}.
+@end itemize
+
+A click with the primary mouse-button while the SHIFT-key is pressed called
+the POWER-click and does the following (depending on the ECB-buffer where the
+POWER-click occurs):
+
+@itemize @bullet
+@item ECB Directories:
+Refreshing the directory-contents-cache (see
+@code{ecb-cache-directory-contents}).
+
+@item ECB sources/history:
+Only displaying the source-contents in the method-buffer but not
+displaying the source-file in the edit-window.
+
+@item ECB Methods:
+Narrowing to the clicked method/variable/ect... (see
+@code{ecb-tag-visit-post-actions}). This works only for semantic
+supported sources but not for imenu- or etags-supported ones!
+@end itemize
+
+In addition always the whole node-name is displayed in the minibuffer after a
+POWER-click (for this see also @code{ecb-methods-show-node-info}).
+
+The secondary mouse-button is for opening (jumping to) the file in
+another edit-window (see the documentation
+@code{ecb-mouse-click-destination}).
+
+The following combinations are possible:
+
+@itemize @minus
+@item
+primary: mouse-2, secondary: C-mouse-2 (means mouse-2 while CTRL-key is
+pressed). This is the default setting.
+@item
+primary: mouse-1, secondary: C-mouse-1
+@item
+primary: mouse-1, secondary: mouse-2
+@end itemize
+
+Please note: If the tree-buffers are used with the keyboard instead
+with the mouse then @kbd{RET} is interpreted as primary mouse-button and
+@kbd{C-RET} as secondary mouse-button!
+
+If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect
+@end defopt
+
+
+
+@defopt tree-buffer-style
+The style of the tree-buffers.
+There are three different styles available:
+
+Image-style (value @code{image}): Very nice and modern - just try it. For this
+style the options @code{ecb-tree-indent} and
+@code{ecb-tree-expand-symbol-before} have no effect! The value 'image means
+use image-style if images can be displayed with current Emacs-setup
+\(otherwise auto. 'ascii-style is used). Note: GNU Emacs <= 21.3.X for Windows
+does not support image-display so ECB uses always 'ascii-guides even when here
+'image is set!
+
+Ascii-style with guide-lines (value @code{ascii-guides}):
+@example
+@group
+[-] ECB
+ |  [+] code-save
+ `- [-] ecb-images
+     |  [-] directories
+     |   |  [-] height-15
+     |   |   |  * close.xpm
+     |   |   |  * empty.xpm
+     |   |   |  * leaf.xpm
+     |   |   `- * open.xpm
+     |   |  [+] height-17
+     |   |  [+] height-19
+     |   `- [+] height-21
+     |  [x] history
+     |  [x] methods
+     `- [x] sources
+@end group
+@end example
+
+Ascii-style without guide-lines (value @code{ascii-no-guides}) - this
+is the style used by ECB <= 1.96:
+@example
+@group
+[-] ECB
+    [+] code-save
+    [-] ecb-images
+        [-] directories
+            [-] height-15
+                * close.xpm
+                * empty.xpm
+                * leaf.xpm
+                * open.xpm
+            [+] height-17
+            [+] height-19
+            [+] height-21
+        [x] history
+        [x] methods
+        [x] sources
+@end group
+@end example
+
+With both ascii-styles the tree-layout can be affected with the
+options @code{ecb-tree-indent} and
+@code{ecb-tree-expand-symbol-before}.
+@end defopt
+
+@defopt tree-do-not-leave-window-after-select
+Tree-buffers which stay selected after a key- or mouse-selection. If a
+buffer (either its name or the variable-symbol which holds the name)
+is contained in this list then selecting a tree-node either by RET or
+by a mouse-click doesn't leave that tree-buffer after the
+node-selection but performes only the appropriate action (opening a
+new source, selecting a method etc.) but point stays in the
+tree-buffer. In tree-buffers not contained in this option normaly a
+node-selection selects as ``last'' action the right edit-window or
+maximizes the next senseful tree-buffer in case of a currently
+maximized tree-buffer (see
+@code{ecb-maximize-next-after-maximized-select}).
+
+The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+for the builtin ECB-tree-buffers because then simply the related
+option-symbol can be used.
+
+A special remark for the @code{ecb-directories-buffer-name}: Of course
+here the value of this option is only relevant if the name of the
+current layout is contained in
+@code{ecb-show-sources-in-directories-buffer} or if the value of
+@code{ecb-show-sources-in-directories-buffer} is 'always and the
+clicked ot hitted node represents a sourcefile (otherwise this would
+not make any sense)!
+
+The setting in this option is only the default for each tree-buffer.
+With the command @code{ecb-toggle-do-not-leave-window-after-select}
+the behavior of a node-selection can be changed fast and easy in a
+tree-buffer without customizing this option, but of course not for
+future Emacs sessions!
+@end defopt
+
+
+@defopt tree-easy-hor-scroll
+Scroll step for easy hor. scrolling via mouse-click in tree-buffers.
+XEmacs has horizontal scroll-bars so invisible parts beyond the right
+window-border of a tree-buffer can always made visible very easy.
+
+GNU Emacs does not have hor. scroll-bars so especially with the mouse
+it is quite impossible to scroll smoothly right and left. The
+functions @code{scroll-left} and @code{scroll-right} can be annoying
+and are also not bound to mouse-buttons.
+
+If this option is a positive integer S then in all ECB-tree-buffers
+the keys @kbd{M-mouse-1} and @code{M-mouse-3} are bound to scrolling
+left rsp. right with scroll-step S - clicking with @kbd{mouse-1} or
+@kbd{mouse-2} onto the edge of the modeline has the same effect, i.e.
+if you click with mouse-1 onto the left (rsp right) edge of the
+modeline you will scroll left (rsp. right).
+
+Additionally @code{C-M-mouse-1} and @code{C-M-mouse-3} are bound to
+scrolling left rsp. right with scroll-step @code{window-width} - 2.
+
+Default is a scroll-step of 5. If the value is @code{nil} then no keys
+for horizontal scrolling are bound.
+@end defopt
+
+@defopt tree-expand-symbol-before
+Show the expand symbol before the items in a tree. When the
+expand-symbol is located before the items then the tree looks like:
+
+@example
+@group
+[-] ECB
+    [+] code-save
+    [-] ecb-images
+        [-] directories
+@end group
+@end example
+
+When located after then the tree looks like:
+
+@example
+@group
+ECB [-]
+  code-save [+]
+  ecb-images [-]
+    directories [-]
+@end group
+@end example
+
+The after-example above use a value of 2 for @code{ecb-tree-indent}
+whereas the before-example uses a value of 4.
+
+It is recommended to display the expand-symbol before because
+otherwise it could be that with a deep nested item-structure with
+and/or with long item-names (e.g. a deep directory-structure with some
+long subdirectory-names) the expand-symbol is not visible in the
+tree-buffer and the tree-buffer has to be horizontal scrolled to
+expand an item.
+@end defopt
+
+@defopt tree-image-icons-directories
+Directories where the images for the tree-buffer can be found. This is
+a cons cell where:
+
+car: Default directory where the default images for the tree-buffer
+can be found. It should contain an image for every name of
+@code{tree-buffer-tree-image-names}. The name of an image-file must
+be: ``ecb-<NAME of TREE-BUFFER-TREE-IMAGE-NAMES>.<ALLOWED
+EXTENSIONS>''.
+
+cdr: This is a list where each element is a cons again with: car is
+the buffer name of the tree-buffer for which a special image-path
+should be used. The buffer-name can either be defined as plain string
+or with a symbol which contains the buffer-name as value. The latter
+one is recommended for the builtin ECB-tree-buffers because then
+simply the related option-symbol can be used (e.g. the symbol
+@code{ecb-directories-buffer-name}). The cdr is the the full-path of
+an additional image-directorie which is searched first for images
+needed for the related tree-buffer. If the image can not be found in
+this directory then the default-directory (see above) is searched. If
+the image can't even be found there the related ascii-symbol is used -
+which is defined in @code{tree-buffer-tree-image-names}. If a
+tree-buffer is not contained in this list then there is no additional
+special image-directory for it.
+
+ECB comes with predefined images in several different heights - so for
+the most senseful font-heights of a tree-buffer a fitting image-size
+should be available. The images reside either in the subdirectory
+``ecb-images'' of the ECB-installation or - if ECB is installed as
+regular XEmacs-package - in the ECB-etc data-directory (the directory
+returned by (locate-data-directory ``ecb'').
+@end defopt
+
+
+@defopt tree-incremental-search
+Enable incremental search in the ECB-tree-buffers. For a detailed
+explanation see the online help section ``Working with the keyboard in
+the ECB buffers''. If you change this during ECB is activated you must
+deactivate and activate ECB again to take effect.
+@end defopt
+
+@defopt tree-indent
+Indent size for tree buffer. If you change this during ECB is
+activated you must deactivate and activate ECB again to take effect.
+@end defopt
+
+@defopt tree-make-parent-node-sticky
+Make the parent-node sticky in the headerline of the tree-buffer.
+
+If not nil then the first line of the tree-buffer is used as header-line which
+is used to display the next unvisible parent of the first visible node as
+sticky, so always the parent of a node is visible and clickable. If a node has
+no parent then just the next node above is displayed in the header-line. The
+node displayed in the header-line is exactly in the same manner clickable as
+all other nodes.
+
+See also @code{ecb-tree-stickynode-indent-string}.
+
+This feature is only available with Gnu Emacs, not with XEmacs.
+@end defopt
+
+@defopt tree-mouse-action-trigger
+When the tree-buffer mouse-action should be triggered. This option
+determines the moment a mouse-action in a tree-buffer is triggered.
+This can be either direct after pressing a mouse-button (value
+@code{button-press}) or not until releasing the mouse-button (value:
+@code{button-release}).
+
+If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect!
+@end defopt
+
+
+@defopt tree-navigation-by-arrow
+Enable smart navigation in the tree-windows by horiz. arrow-keys. If
+not nil then the left- and right-arrow keys work in the ECB
+tree-window in the following smart way if onto an expandable node:
+
+@itemize @bullet
+@item Left-arrow:
+If node is expanded then it will be collapsed otherwise point jumps to
+the next ``higher'' node in the hierarchical tree (higher means the next
+higher tree-level or - if no higher level available - the next higher
+node on the same level).
+
+@item Right-arrow:
+If node is not expanded then it will be expanded. Onto a not
+expandable node the horizontal arrow-keys go one character in the
+senseful correct direction.
+@end itemize
+
+If this option is changed the new value takes first effect after deactivating
+ECB and then activating it again!
+@end defopt
+
+@defopt tree-stickynode-indent-string
+String used to indent the stickynode.
+This string is used to match the space used by scrollbars and
+fringe so it does not appear that the node-name is moving left/right
+when it lands in the sticky line.
+
+Normally the needed value is computed automatically by ECB. But if the result
+is not matching this option allows to customize the indent-string. The default
+value is computed by the function
+@code{tree-buffer-sticky-default-indent-string}, so you can change the needed
+value with that starting-point.
+
+Changing this option takes only effect after restarting Emacs!
+@end defopt
+
+@defopt tree-truncate-lines
+Truncate lines in ECB buffers. If a buffer (either its name or the
+variable-symbol which holds the name) is contained in this list then
+line-truncation is switched on for this buffer otherwise it is off.
+
+The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+to switch on line-truncation for one of the builtin ECB-tree-buffers
+because then simply the related option-symbol can be used. To truncate
+lines in the builtin directories tree-buffer just add the symbol
+@code{ecb-directories-buffer-name} to this option.
+
+If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect.
+@end defopt
+
+@defopt truncate-long-names
+Truncate long names that don't fit in the width of the ECB windows. If
+you change this during ECB is activated you must deactivate and
+activate ECB again to take effect.
+@end defopt
+
+
+@node ecb-directories, ecb-sources, ecb-tree-buffer, Customizable options
+@subsection Group ecb-directories
+
+@noindent
+This group contains settings for the directories-buffer in the ECB:
+
+@defopt add-path-for-not-matching-files
+Add path of a file to @code{ecb-source-path} if not already contained.
+This is done during the auto. windows synchronization which happens if
+a file is opened not via the file/directory-browser of ECB. In such a
+situation ECB adds the path of the new file auto. to
+@code{ecb-source-path} at least temporally for the current Emacs
+session. This option defines two things:
+
+@enumerate
+@item
+Should only the root-part (which means for Unix-like systems always
+'/' and for windows-like systems the drive) of the new file be added
+as source-path to @code{ecb-source-path} or the whole directory-part?
+For remote-files (e.g. tramp, ange-ftp- or efs-files) the root-part is
+the complete host-part + the root-dir at that host (example:
+/berndl@@ecb.sourceforge.net:/ would be the root-part of
+/berndl@@ecb.sourceforge.net:/tmp/test.txt).
+@item
+Should this path be added for future sessions too?
+@end enumerate
+
+The value of this option is a cons-cell where the car is a boolean for
+1. and the cdr is a boolean for 2.
+
+A value of not nil for the car (1.) is reasonably if a user often
+opens files not via the ECB-browser which are not located in any of
+the paths of @code{ecb-source-path} because then only one path for
+each drive (windows) or the root-path (Unix) is added to the directory
+buffer of ECB.
+@end defopt
+
+@defopt auto-expand-directory-tree
+Automatically expand the directory tree to the current source file.
+There are three options:
+
+@itemize @minus
+@item @code{best}: Expand the best-matching source-path
+@item @code{first}: Expand the first matching source-path
+@item @code{nil}: Do not automatically expand the directory tree.
+@end itemize
+@end defopt
+
+@defopt after-directory-change-hook
+Hook which run directly after the selected directory has changed. This means
+not onyl after a click onto a directory in the directory-window of ECB but it
+means this hook runs always when the current directory changes regardless of
+the trigger of this change. So for example it runs also when you just switches
+from one buffer to another via @code{switch-to-buffer} or
+@code{switch-to-buffer-other-window} and the directory of these filebuffers is
+different but only when auto-synchronizing of the ECB-windows is on (see
+@code{ecb-basic-buffer-sync}). It runs not when switching between buffers and
+the associated files reside in the same directory.
+
+Each function added to this hook will be called with two arguments:
+The directory which was current _before_ the directory-change-trigger
+and the directory which was now the current (i.e. after the trigger).
+
+Example: If you switch from a filebuffer ``~/.emacs'' to a filebuffer
+``/tmp/test.txt'' then the functions of this hook will be called with
+the two arguments ``~'' and ``/tmp''.
+@end defopt
+
+
+
+@defopt cache-directory-contents
+Cache contents of directories.
+
+This can be useful if @code{ecb-source-path} contains directories with
+many files and subdirs, especially if these directories are mounted
+net-drives (``many'' means here something > 500, dependent of the
+speed of the net-connection and the machine). Or if it contains
+remote-source-paths which means paths in the sense of tramp, ange-ftp
+or efs. For these directories actualizing the sources- and/or
+directories- buffer of ECB (if displayed in current layout!) can slow
+down dramatically so a caching increases speed a lot.
+ 
+The value of this option is a list where each element is a cons-cell
+and looks like:
+
+@example
+  (<dir-regexp> . <filenumber threshold>) with
+@end example
+
+@table @code
+@item <dir-regexp>:
+Regular expression a directory must match to be cached.
+@item <filenumber threshold>:
+Number of directory contents must exceed this number.
+@end table
+
+A directory will only be cached if and only if the directory-name
+matches at least one rexexp of this option and its content-number
+exceeds the related threshold AND the directory-name matches NOT any
+regexp of @code{ecb-cache-directory-contents-not}!
+
+The cache entry for a certain directory will be refreshed and
+actualized only by using the POWER-click (see
+@code{ecb-primary-secondary-mouse-buttons}) in the directories-buffer
+of ECB (@pxref{Using the mouse}).
+
+Default-value: ECB caches the contents of all remote directories
+regardless of the size and all other directories if more than 50
+entries are contained.
+
+Examples:
+
+An entry @code{("/usr/home/john_smith/bigdir*" . 1000)} means the
+contents of every subdirectory of the home-directory of John Smith
+will be cached if the directory contains more than 1000 entries and
+its name begins with ``bigdir''.
+
+An entry @code{(".*" . 1000)} caches every directory which has more
+than 1000 entries.
+
+An entry @code{("^/\\([^:/]*@@\\)?\\([^@@:/]*\\):.*" . 0)} caches
+every remote (in the sense of tramp, ange-ftp or efs) directory
+regardless of the number of entries."
+
+Please note: If you want your home-dir being cached then you MUST NOT
+use ``~'' because ECB tries always to match full path-names!
+@end defopt
+
+@defopt cache-directory-contents-not
+Do not cache the contents of certain directories. The value of this
+option is a list where the each element is a regular expression a
+directory must match if it should not being cached.
+
+If a directory-name matches at least one of the regexps of this option
+the directory-contents will never being cached. See
+@code{ecb-cache-directory-contents} to see when a directory will be
+cached.
+
+This option can be useful when normally all directories with a certain
+amount of content (files and subdirs) should be cached but some
+special directories not. This can be achieved by:
+
+@itemize @minus
+@item
+Setting @code{ecb-cache-directory-contents} to ((``.*'' . 500)):
+Caches all directories with more then 500 entries
+
+@item
+Setting @code{ecb-cache-directory-contents-not} to a value which
+matches these directories which should not being cached (e.g.
+(``/usr/home/john_smith'') excludes the HOME-directory of John Smith
+from being cached).
+@end itemize
+
+Please note: If you want your home-dir exclude from being cached then
+you MUST NOT use ``~'' because ECB tries always to match full
+path-names!
+@end defopt
+
+
+
+@defopt directories-buffer-after-create-hook
+Local hook running after the creation of the directories-buffer. Every
+function of this hook is called once without arguments direct after
+creating the directories-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+@code{local-set-key} to define new keybindings only for the
+directories-buffer of ECB.
+
+The following keys must not be rebind in the directories-buffer:
+@kbd{F2}, @kbd{F3} and @kbd{F4}
+@end defopt
+
+
+@defopt directories-buffer-name
+Name of the ECB directory buffer. Because it is not a normal buffer
+for editing you should enclose the name with stars, e.g. `` *ECB
+Directories*''.
+
+If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-directory-buffer by this name, e.g. by a call of @code{set-buffer}.
+
+Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again!
+@end defopt
+
+@defopt directories-menu-sorter
+Function which re-sorts the menu-entries of the directories buffer.
+
+If a function then this function is called to re-arrange the
+menu-entries of the combined menu-entries of the user-menu-extensions
+of @code{ecb-directories-menu-user-extension} and the built-in-menu
+@code{ecb-directories-menu}. If nil then no special sorting will be
+done and the user-extensions are placed in front of the
+built-in-entries.
+
+The function get one argument, a list of menu-entries. For the format
+of this argument see @code{ecb-directories-menu-user-extension}. The
+function must return a new list in the same format. Of course this
+function can not only re-arrange the entries but also delete entries
+or add new entries.
+@end defopt
+
+
+@defopt directories-menu-user-extension
+Static user extensions for the popup-menu of the directories buffer.
+Value is a list of elements of the following type: Each element
+defines a new menu-entry and is either:
+
+@enumerate
+@item Menu-command:
+A list containing two sub-elements, whereas the first is the function
+(a function symbol) being called if the menu-entry is selected and the
+second is the name of the menu-entry.
+
+@item Separator:
+A one-element-list and the element is the string ``---'': Then a
+non-selectable menu-separator is displayed.
+
+@item Submenu:
+A list where the first element is the title of the submenu displayed
+in the main-menu and all other elements are either menu-commands (see
+1) or separators (see 2) or another submenu (see c). This allows deep
+nested menu-submenu-structures. Currently a level of 4 is allowed but
+in general there could be an infinite depth of nesting but it makes no
+sense - if possible at all - to define infinite nested
+defcustom-types. So there is a limit of 4 levels but tis is not a hard
+limit: Just increase the value of the @code{ecb-max-submenu-depth}
+@strong{BEFORE} first loading ECB!
+@end enumerate
+
+The function of a menu-command must follow the following guidelines:
+Such a function must be defined with the macro
+@code{tree-buffer-defpopup-command}! This macro defines a new
+popup-command whereas the newly defined command gets one argument
+@var{NODE}. See the docstring of @code{tree-buffer-defpopup-command}
+for further details.
+
+Example for the definition of such a menu-function:
+
+@example
+(tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+  "Prints the name of the directory of the node under point."
+  (let ((node-data=dir (tree-node-get-data node)))
+     (message ``Dir under node: %s'' node-data=dir)))
+@end example
+
+Per default the static user-extensions are added at the beginning of
+the built-in menu-entries of @code{ecb-directories-menu} but the whole
+menu can be re-arranged with @code{ecb-directories-menu-sorter}.
+
+These menu-extensions are static. A dynamic menu-extension can be
+achieved via @code{ecb-directories-menu-user-extension-function}.
+@end defopt
+
+@defopt directories-menu-user-extension-function
+Dynamic user extensions for the popup-menu of the directories buffer.
+A function which has to return a list in the same format like the
+option @code{ecb-directories-menu-user-extension}. This function is
+called when the user opens the popup-menu for the directories buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+directories-buffer the function has to return nil. Therefore the
+default-value of this option is @code{ignore}.
+
+Per default the dynamic user-extensions are added in front of the
+static extensions of @code{ecb-directories-menu-user-extension} but
+the whole menu can be re-arranged with
+@code{ecb-directories-menu-sorter}.
+@end defopt
+
+@defopt directories-show-node-info
+When to display which node-info in the directories-buffer.
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+directories-buffer.
+
+You can define ``when'' a node-info should be displayed:
+@itemize @minus
+@item always: Node info is displayed by moving with the mouse over a node.
+@item if-too-long: Node info is only displayed by moving with the mouse over a
+node does not fit into the window-width of the tree-buffer window.
+In the ECB directories buffer this means also if a node is shortend or if
+the node has an alias (see @code{ecb-source-path}).
+@item shift-click: Node info is only displayed after a shift click with the
+primary mouse button onto the node.
+@item never: Node info is never displayed.
+@end itemize
+
+You can define ``which'' info should be displayed:
+@itemize @minus
+@item name: Only the full node-name is displayed.
+@item path: The full-path of the node is displayed.
+@end itemize
+
+Do NOT set this option directly via setq but use always customize!
+@end defopt
+
+@defopt display-default-dir-after-start
+Automatically display current default-directory after activating ECB.
+
+If a file-buffer is displayed in the current active edit-window then
+ECB synchronizes its basic tree-buffers to this file-buffer - at least if
+the option @code{ecb-basic-buffer-sync} it not nil. So for this situation
+@code{ecb-display-default-dir-after-start} takes no effect but this
+option is for the case if no file-buffer is displayed in the
+edit-window after startup:
+
+If true then ECB selects autom. the current default-directory after
+activation even if no file-buffer is displayed in the current active
+edit-window. This is useful if ECB is autom. activated after startup
+of Emacs and Emacs is started without a file-argument. So the
+directory from which the startup has performed is auto. selected in
+the ECB-directories buffer and the ECB-sources buffer displays the
+contents of this directory.
+@end defopt
+
+
+@defopt excluded-directories-regexps
+Directories that should not be included in the directories list. The
+value of this variable should be a list of regular expression.
+@end defopt
+
+@defopt prescan-directories-for-emptyness
+Prescan directories for emptyness. ECB does this so directories are
+displayed as empty in the directories-buffer even without
+user-interaction (i.e. in previous ECB-versions the emptyness of a
+directory has been first checked when the user has clicked onto a
+directory). ECB optimizes this check as best as possible but if a
+directory contains a lot of subdirectories which contain in turn a lot
+of entries, then expanding such a directory or selecting it would take
+of course more time as without this check - at least at the first time
+(all following selects of a directory uses the cached information if
+its subdirectories are empty or not). Therefore ECB performs this
+check stealthy (see @code{ecb-stealthy-tasks-delay}) so normally there
+should no performance-decrease or additional waiting-time for the
+user. There is one exception: For remote directories (in the sense of
+tramp, ange-ftp, or efs) this check can descrease performance even if
+performed stealthy and interruptable. Therefore this option offers
+three possible settings:
+
+@itemize @bullet
+@item @code{t}
+Switch on this feature
+
+@item @code{unless-remote}
+Switch on this feature but not for remote directories. The term
+``remote'' means here directories which are used via tramp, ange-ftp
+or efs. So mounted directories are counted not as remote directories
+here even if such a directory is maybe hosted on a remote machine. But
+normally only directories in a LAN are mounted so there should be no
+performance-problems with such mounted directories.
+
+@item @code{nil}
+Switch off this feature completely.
+@end itemize
+
+The option @code{ecb-prescan-directories-exclude-regexps} offers are
+more fine granularity to exclude certain directories from this
+prescan.
+@end defopt
+
+@defopt host-accessible-check-valid-time
+Time in seconds a cached accessible-state of a remote host is valid.
+This option is a list where each element specifies how long for a
+certain remote host the cached ping-state (i.e. if the host is
+accessible or not) should be valid. During this time-intervall ECB
+pings such a remote host only once, all other checks use the cached
+value of that real check. But it the cached value is older than the
+value of this option ECB will ping again.
+
+Per default ECB discards after 1 minute the cached ping-state of each
+remote host. But if you are sure that a certain remote host is always
+accessible (i.e. means in consequence that you are always online when
+working with ECB and remote-paths) then add an entry to this option
+with a high valid-interval.
+
+Examples: An entry (``.*sourceforge.*'' . 3600) ensures that all
+remote hosts machting the string ``sourceforge'' will only once pinged
+during one hour. Or (``.*'' . 300) would ensure that every remote host
+would be pinged only once during 5 minutes.
+@end defopt
+
+@defopt ping-options
+List of options for the ping program. These options can be used to
+limit how many ICMP packets are emitted. Ping is used to test if a
+remote host of a remote path (e.g. a tramp-, ange-ftp- or efs-path) is
+accessible See also @code{ecb-ping-program}.
+@end defopt
+
+@defopt ping-program
+Program to send network test packets to a host. See also
+@code{ecb-ping-options}.
+@end defopt
+
+@defopt prescan-directories-exclude-regexps
+Which directories should be excluded from the empty-prescan. If a
+directory matches any of the regexps of this option it will not be
+prescanned for emptyness - This option takes only effect if
+@code{ecb-prescan-directories-for-emptyness} is not nil.
+@end defopt
+
+
+@defopt show-sources-in-directories-buffer
+Show source files in directories buffer.
+@end defopt
+
+@defopt source-path
+Paths where to find code sources. Each path can have an optional alias
+that is used as it's display name. If no alias is set, the path is
+used as display name.
+@end defopt
+
+@defopt source-path
+Paths where to find code sources. Each path can have an optional alias
+that is used as it's display name. If no alias is set, the path is
+used as display name.
+
+Lisp-type of tis option: The value must be a list L whereas each
+element of L is either
+@itemize @minus
+@item
+a simple string which has to be the full path of a directory (this
+string is displayed in the directory-browser of ECB) or
+
+@item
+a 2-element list whereas the first element is the full path of a
+directory (string) and the second element is an arbitrary alias
+(string) for this directory which is then displayed instead of the
+underlying directory.
+@end itemize
+@end defopt
+
+
+
+@defopt use-speedbar-instead-native-tree-buffer
+If true then uses speedbar for directories, sources or methods. This
+means that speedbar is integrated in the ECB-frame and is displayed in
+that window normally displaying the standard ECB-directories-buffer,
+ECB-sources-buffer or ECB-methods-buffer.
+
+This option takes effect in all layouts which contain either a
+directory window, a sources window or a method window.
+
+This option can have four valid values:
+@itemize @minus
+@item @code{nil}: Do not use speedbar (default)
+@item @code{dir}: Use speedbar instead of the standard directories-buffer
+@item @code{source}: Use speedbar instead of the standard sources-buffer
+@item @code{method}: Use speedbar instead of the standard methods-buffer
+@end itemize
+
+Note: For directories and sources a similar effect and usability is
+available by setting this option to @code{nil} (or @code{method}) and
+setting @code{ecb-show-sources-in-directories-buffer} to not
+@code{nil}, because this combination displays also directories and
+sources in one window.
+
+@code{ecb-use-speedbar-instead-native-tree-buffer} is for people who
+like the speedbar way handling directories and source-files or methods
+and want it in conjunction with ECB.
+@end defopt
+
+
+@node ecb-sources, ecb-methods, ecb-directories, Customizable options
+@subsection Group ecb-sources
+
+@noindent
+This group contains settings for the sources-buffer in the ECB:
+
+@defopt read-only-check-exclude-regexps
+Which directories should be excluded from the sources-read-only-check.
+If a directory matches any of the regexps of this option their sources
+will not be checked if they are writable - This option takes only
+effect if @code{ecb-sources-perform-read-only-check} is not nil.
+@end defopt
+
+@defopt show-source-file-extension
+Show the file extension of source files.
+@end defopt
+
+@defopt source-file-regexps
+Specifies which files are shown as source files.
+
+This is done on directory-base, which means for each directory-regexp
+the files to display can be specified. If more than one
+directory-regexp matches the current selected directory then always the
+first one (and its related file-exclude/include-regexps) is used! If
+no directory-regexp matches then all files are displayed for the
+currently selected directory.
+
+Important note: It is recommended that the *LAST* element of this list
+should contain an always matching directory-regexp (@code{".*"})!
+
+So the value of this option is a list of cons-cells where the car is a
+directory regexp and the cdr is a 2 element list where the first
+element is a list of exclude regexps and the second element is a list
+of include regexps. A file is displayed in the source-buffer of ECB
+iff: The file does not match any of the exclude regexps OR the file
+matches at least one of the include regexps.
+
+But regardless of the value of this option a file F is never displayed
+in the sources-buffer if the directory matches
+@code{ecb-sources-exclude-cvsignore} and the directory contains a file
+.cvsignore which contains F as an entry!
+
+There are three predefined and useful combinations of an exclude and
+include regexp:
+
+@itemize @bullet
+@item All files
+
+@item All, but no backup, object, lib or ini-files (except .emacs and .gnus). This
+means all files except those starting with ``.'', ``#'' or ending with
+``~'', ``.elc'', ``.obj'', ``.o'', ``.lib'', ``.dll'', ``.a'',
+``.so''. (but including .emacs and .gnus)
+
+@item Common source file types (.c, .java etc.)
+@end itemize
+
+In addition to these predefined values a custom exclude and include
+combination can be defined.
+
+Tips for the directory- and file-rexexps: @code{"$^"} matches no
+files/directories, @code{".*"} matches all files/directories.
+@end defopt
+
+@defopt sources-buffer-after-create-hook
+Local hook running after the creation of the sources-buffer. Every
+function of this hook is called once without arguments direct after
+creating the sources-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+@code{local-set-key} to define new keybindings only for the
+sources-buffer of ECB.
+@end defopt
+
+
+@defopt sources-buffer-name
+Name of the ECB sources buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. ``*ECB Sources*''.
+
+If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-sources-buffer by this name, e.g. by a call
+of @code{set-buffer}.
+
+Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again!
+@end defopt
+
+
+@defopt sources-exclude-cvsignore
+Specify if files contained in a @file{.cvsignore} should be
+excluded.
+
+Value is a list of regular expressions or nil. If you want to exclude
+files listed in a @file{.cvsignore}-file from being displayed in the
+ecb-sources-buffer then specify a regexp for such a directory.
+
+If you want to exclude the contents of @file{.cvsignore}-files for
+every directory then you should add one regexp ``.*'' which matches
+every directory.
+
+If you never want to exclude the contents of @file{.cvsignore}-files
+then set this option to nil.
+@end defopt
+
+
+@defopt sources-menu-sorter
+Function which re-sorts the menu-entries of the directories buffer.
+
+If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+@code{ecb-sources-menu-user-extension} and the built-in-menu
+@code{ecb-sources-menu}. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+@code{ecb-directories-menu-sorter}.
+@end defopt
+
+@defopt sources-menu-user-extension
+Static user extensions for the popup-menu of the sources buffer.
+For further explanations see @code{ecb-directories-menu-user-extension}.
+
+The node-argument of a menu-function contains as data the source
+for which the popup-menu has been opened. Use always
+@code{ecb-source-get-*} to extract whatever you need from the
+node-data. E.g. use @code{ecb-source-get-filename} to get the full
+filename of the source of the node.
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of @code{ecb-sources-menu} but the whole menu can be
+re-arranged with @code{ecb-sources-menu-sorter}.
+@end defopt
+
+
+
+@defopt sources-menu-user-extension-function
+Dynamic user extensions for the popup-menu of the sources buffer. A
+function which has to return a list in the same format like the option
+@code{ecb-sources-menu-user-extension}. This function is called when
+the user opens the popup-menu for the sources buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+sources-buffer the function has to return nil. Therefore the
+default-value of this option is @code{ignore}.
+
+Per default the dynamic user-extensions are added in front of the
+static extensions of @code{ecb-sources-menu-user-extension} but the
+whole menu can be re-arranged with @code{ecb-sources-menu-sorter}.
+@end defopt
+
+
+@defopt sources-perform-read-only-check
+Check if source-items in the tree-buffers are read-only. If a
+sourcefile is read-only then it will be displayed with that face set
+in the option @code{ecb-source-read-only-face}.
+
+Because this check can be take some time if files are used via a
+mounted net-drive ECB performs this check stealthily (see
+@code{ecb-stealthy-tasks-delay}) so normally the user should not see a
+performance-decrease or additional waiting-time. But to get sure this
+option offers three choices: @code{t}, @code{unless-remote} and
+@code{nil}. See @code{ecb-prescan-directories-for-emptyness} for an
+explanation for these three choices.
+
+The option @code{ecb-read-only-check-exclude-regexps} offers are more
+fine granularity to exclude the sources of certain directories from
+the read-only state-check.
+@end defopt
+
+@defopt sources-show-node-info
+When to display which node-info in the sources-buffer.
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+sources-buffer.
+
+You can define ``when'' a node-info should be displayed:
+See @code{ecb-directories-show-node-info} for the possible choices.
+
+@itemize @minus
+@item name: Only the full node-name is displayed.
+@item file-info: File infos for this file are displayed.
+@item file-info-full: Fill infos incl. full path for this file are displayed.
+@end itemize
+
+Do NOT set this option directly via setq but use always customize!
+@end defopt
+
+
+
+@defopt sources-sort-ignore-case
+Ignore case for sorting the source-files of the Sources-buffer. See
+also @code{ecb-sources-sort-method}.
+@end defopt
+
+@defopt sources-sort-method
+Defines how the source files are sorted.
+
+@itemize @minus
+@item @code{name}:
+Sorting by name.
+@item @code{extension}:
+Sorting first by extension and then by name.
+@item @code{nil}:
+No sorting, means source files are displayed in the sequence returned
+by @code{directory-files} (called without sorting).
+@end itemize
+
+See also @code{ecb-sources-sort-ignore-case}
+@end defopt
+
+
+@node ecb-methods, ecb-history, ecb-sources, Customizable options
+@subsection Group ecb-methods
+
+@noindent
+This group contains settings for the methods-buffer in the ECB:
+
+@defopt auto-expand-tag-tree
+Expand the methods-tag-tree automatically if node invisible.
+
+This option has only an effect if option @code{ecb-highlight-tag-with-point} is
+switched on too. There are three possible choices:
+@itemize @minus
+@item @code{nil}:
+No auto. expanding of the method buffer.
+@item @code{expand-spec}:
+Auto expand the method-buffer nodes if the node belonging to current
+tag under point is invisible because its parent-node is collapsed.
+But expanding is only done if the type of the tag under point in the
+edit-buffer is contained in @code{ecb-methods-nodes-expand-spec}.
+@item @code{all}:
+Like expand-spec but expands all tags regardless of the setting in
+@code{ecb-methods-nodes-expand-spec}.
+@end itemize
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt auto-expand-tag-tree-collapse-other
+Auto. expanding the tag-tree collapses all not related nodes. There
+are several choices:
+
+@itemize @minus
+@item Only if on tag:
+This means collapsing all nodes which have no relevance for the
+currently highlighted node will be collapsed, because they are not
+necessary to make the highlighted node visible. But do this only if
+point stays onto a tag in the selected edit-window.
+
+@item Always:
+Same as before but collapse also when point doesn't stays on a tag
+(e.g. between two defuns in elisp) in the selected edit-window. This
+means in such a situation a full collapsing of the methods-buffer.
+
+@item Never:
+Do not automatically collapse the methods-buffer.
+@end itemize
+@end defopt
+
+
+@defopt auto-update-methods-after-save
+Automatically updating the ECB method buffer after saving a source.
+@end defopt
+
+@defopt default-tag-filter
+Default tag-filters for certain files. This option allow to define
+default tag-filters for certain files which are applied automatically
+after loading such a file into a buffer. The possible filters are the
+same as offered by the command @code{ecb-methods-filter} and they are
+applied in the same manner - the only difference is they are applied
+automatically. Please be aware that symbol-filters (e.g.
+protection-symbols like public or private) must not be inserted with
+quotes whereas a filter-regexp has to be inserted with surrounding
+double-quotes! In addition backslashes in a regexp have to be doubled!
+
+For each file-spec (a major-mode plus a file-regexp which both specify
+a file for which filters should be applied) there can be as much
+filters as needed - they are layered like with
+@code{ecb-methods-filter} too.
+
+Tag-classes which are completely hidden or excluded by the option
+@code{ecb-show-tags} will never being displayed in the Methods-buffer
+regardless of the filters of this option!
+@end defopt
+
+@defopt disable-semantic-threshold-alist
+Threshold for disabling semantic-parsing Define a threshold fpr
+buffer-size. Exceeding this threshold disables parsing current buffer
+by semantic.
+
+This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+@itemize @minus
+@item
+The car is either a major-mode symbol or the special symbol 'default which
+means if no setting for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used.
+@item
+The cdr is an integer which defines the threshold for the buffer-size for
+this major-mode.
+@end itemize
+
+Example:
+
+@example
+  ((default . 1000000)
+    (c-mode . 200000))
+@end example
+
+This example whould not parse c-mode buffers exceeding a buffer-size
+of 200000. And buffers of all other modes would be only parsed if
+smaller than 1000000.
+
+A setting of @code{((c-mode . 200000))} would only restrict c-mode
+buffers to a size of 200000 but would parse all other buffer
+regardless their size.
+@end defopt
+
+
+
+@defopt display-image-icons-for-semantic-tags
+Display nice and pretty icons for semantic-tags in the Methods-buffer. A non
+nil value takes only effect if Emacs can display images and if
+@code{ecb-tree-buffer-style} is set to @code{image}.
+@end defopt
+
+@defopt exclude-parents-regexp
+Regexps which parent classes should not be shown in the methods buffer
+(see also @code{ecb-show-parents}). If nil then all parents will be
+shown if @code{ecb-show-parents} is not nil.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt expand-methods-switch-off-auto-expand
+Switch off auto expanding in the ECB-method buffer. If on then auto
+expanding is switched off after explicit expanding or collapsing by
+@code{ecb-expand-methods-nodes}.
+
+This is done with @code{ecb-toggle-auto-expand-tag-tree} so after
+the switch off the auto expanding feature can again switched on
+quickly.
+
+But after explicitly expanding/collapsing the methods-buffer to a
+certain level the auto. expanding could undo this when the node
+belonging to current tag under point in the current active edit-window
+is invisible after @code{ecb-expand-methods-nodes} - then the auto.
+expand feature would make this node immediately visible and destroys
+the explicitly set expand-level.
+@end defopt
+
+@defopt find-external-tag-functions
+Functions used for searching external tags clicked in the methods buffer.
+
+The methods buffer displays for oo-languages the parents of a type under a
+special bucket ``Parents''. Languages like C++, CLOS and Eieio allow to define
+the implementation of a method outside of the class definition and even in
+another file. In the methods-buffer of ECB such externaly defined methods are
+collected and displayed under a @code{virtual} faux type-tag named as the
+class-qualifier of the methods. This faux-tag is virtual because it does not
+extist in the parsed buffer.
+
+If a user clicks either onto such a faux-type-tag or onto a parent-tag then
+ECB tries to find the definition of the underlying type on a name-basis,
+displaying the containing file as buffer in the current edit-window and
+jumping to the start of the type-definition in this buffer.
+
+Finding such external types can be very complex and there are several roads to
+success. ECB uses per default methods based on the semantic-analyzer. But this
+option allows to define own find-functions and tell ECB to uses them.
+
+This functionality is set on a @code{major-mode} base, i.e. for every
+@code{major-mode} a different setting can be used. The value of this option is
+a list of cons-cells: The car is either a @code{major-mode} symbol or the
+special symbol 'default. The cdr is a list of find-functions or nil.
+
+ECB first performs all find-functions defined for current @code{major-mode}
+(if any) anf then all find-functions defined for the special symbol 'default
+(if any).
+
+ECB offers some predefined senseful finding-functions. Currently there are:
+@itemize
+@item @code{ecb-search-tag-by-semantic-analyzer} (most powerful)
+@item @code{ecb-search-tag-by-semanticdb}
+@item @code{ecb-jde-show-class-source} (for major-mode @code{jde-mode} when
+coding in java)
+@end itemize
+
+This function does not only the searching but displays the founded tag. See
+the documentation of these function for details how they work.
+
+But you can add any arbitrary function if the following conditions are
+fulfilled:
+
+@itemize
+@item
+The function gets a semantic tag representing the external type which should
+be found. This is a positionless-tag (otherwise it would not be hard to go
+to it) and it's either a faux-tag (for which @code{ecb--semantic-faux-tag-p} is
+not nil; the function can use this check if necessary) or a simple tag
+containing only a name an a tag-class. The tag-class for both is 'type.
+
+@item
+The return value of the function must be one of:
+@itemize @minus
+@item @code{nil}: No tag is found
+@item @code{t}: A tag has been found and also be displayed in the edit-window (this
+prevents ECB from running further function of this option because the searched
+tag is already displayed. So a function should only return @code{t} if all is
+fine and no further actions are needed.
+@item A positioned semantic tag (for which @code{ecb--semantic-tag-with-position-p}
+returns not @code{nil}) which represents the found external type-tag.
+@end itemize
+@end itemize
+
+It's strongly recommended for the function not to display the found location
+for itself but to return a positioned semantic tag! But sometimes the
+displaying is integrated in a third-party find-function like
+@code{jde-show-class-source} which is used by
+@code{ecb-jde-show-class-source}. In these cases the function has to return t
+if the searched tag has been successfully displayed.
+
+Precondition for a find-function:
+Current buffer is the buffer the clicked faux- or parent tag belongs to
+Current point depends on the clicked tag:
+@itemize
+@item In case of a faux-tag it's the start of the first child of the
+faux-tag. There must be at least one adopted child-tag because
+otherwise we would not have the faux-tag
+@item In case of an external parent-tag its the the start of the
+external tag itself.
+@end itemize
+@end defopt
+
+
+
+@defopt font-lock-tags
+Adds font-locking (means highlighting) to the ECB-method buffer.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt highlight-tag-with-point
+How to highlight the method or variable under the cursor.
+
+@itemize @minus
+@item @code{highlight-scroll}:
+Always scroll the method buffer, so the current method of the
+edit-window is highlighted in the method-window.
+@item @code{highlight}:
+Only highlight the current method of the edit window in the
+method window if the method is visible in the method-window.
+@item @code{nil}:
+No highlighting is done.
+@end itemize
+
+See also @code{ecb-highlight-tag-with-point-delay}.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt highlight-tag-with-point-delay
+Time Emacs must be idle before current tag is highlighted. If nil
+then there is no delay, means current tag is highlighted
+immediately. A small value of about 0.25 seconds saves CPU resources
+and you get even though almost the same effect as if you set no delay.
+But such a delay prevents also ``jumping backward/forward'' during
+scrolling within java-classes if point goes out of method-definition
+into class-definition. Therefore the default value is a delay of 0.25
+seconds.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt methods-buffer-after-create-hook
+Local hook running after the creation of the methods-buffer. Every
+function of this hook is called once without arguments direct after
+creating the methods-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+@code{local-set-key} to define new keybindings only for the
+methods-buffer of ECB.
+@end defopt
+
+
+@defopt methods-buffer-name
+Name of the ECB methods buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. `` *ECB
+Methods*''.
+
+If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-methods-buffer by this name, e.g. by a call
+of @code{set-buffer}.
+
+Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again!
+@end defopt
+
+@defopt methods-filter-replace-existing
+How the methods-filter should be applied to existing filters. There
+are three different choices:
+
+@itemize @minus
+@item @code{never}:
+This is the default and means that calling @code{ecb-methods-filter}
+always adds the new filter on top of already existing filters. So you
+can combine several filter to one combined like this example: 'Display
+only all public methods having the string ``test'' in its name.' With
+this setting the filters can only be cleared by calling
+@code{ecb-methods-filter} and then choosing ``nothing''.
+
+@item @code{always}:
+This means that @code{ecb-methods-filter} always clears a previous
+filter before applying the new one.
+
+@item @code{ask}:
+ECB asks if the new filter should replace the existing ones.
+@end itemize
+@end defopt
+
+
+
+@defopt methods-menu-sorter
+Function which re-sorts the menu-entries of the directories buffer.
+
+If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+@code{ecb-methods-menu-user-extension} and the built-in-menu
+@code{ecb-methods-menu}. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+@code{ecb-directories-menu-sorter}.
+@end defopt
+
+
+@defopt methods-menu-user-extension
+Static user extensions for the popup-menu of the methods buffer. For
+further explanations see @code{ecb-directories-menu-user-extension}.
+
+The node-argument of a menu-function contains as data the semantic-tag
+of the method/variable/tag for which the popup-menu has been opened.
+
+Per default the static user-extensions are added at the beginning of
+the built-in menu-entries of @code{ecb-methods-menu} but the whole
+menu can be re-arranged with @code{ecb-methods-menu-sorter}.
+@end defopt
+
+@defopt methods-menu-user-extension-function
+Dynamic user extensions for the popup-menu of the methods buffer. A
+function which has to return a list in the same format like the option
+@code{ecb-methods-menu-user-extension}. This function is called when
+the user opens the popup-menu for the methods buffer. For an example
+how such a function can be programmed see
+@code{ecb-methods-menu-editwin-entries}.
+
+If no dynamically evaluated menu-extensions should be added to the
+methods-buffer the function has to return nil. Therefore the
+default-value of this option is @code{ignore}.
+
+Per default the dynamic user-extensions are added in front of the
+static extensions of @code{ecb-methods-menu-user-extension} but the
+whole menu can be re-arranged with @code{ecb-methods-menu-sorter}.
+@end defopt
+
+
+@defopt methods-nodes-collapse-spec
+Semantic tag-types collapsed by @code{ecb-expand-methods-nodes}.
+For valid values of this option see @code{ecb-methods-nodes-expand-spec}!
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+
+@defopt methods-nodes-expand-spec
+Semantic tag-types expanded by @code{ecb-expand-methods-nodes}.
+
+The value of this option is either the symbol @code{all} (all tags
+are expanded regardless of their type) or a list of symbols where each
+symbol is a valid semantic tag-type. For a description of semantic
+tag types see option @code{ecb-show-tags}.
+
+But this option also defines if bucket-nodes in the ECB-method-buffer
+(e.g. ``[Variables]'') should be expanded. Therefore valid symbols for
+this list are also all cars of the variable returned by
+@code{ecb--semantic-symbol->name-assoc-list}.
+
+If there is a bucket-name (the node-name stripped of the settings in
+@code{ecb-bucket-node-display}) which is not contained as cdr in the
+value returned by @code{ecb--semantic-symbol->name-assoc-list} then
+the symbol with this bucket-name as name is also a valid symbol for
+this list. Example: In ECB there are buckets ``[Parents]''. The
+bucket-name is ``Parents'' and the valid symbol-name is then
+@code{Parents}.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt methods-separate-prototypes
+Separate function-prototypes from the real functions. This is for
+example useful for C++ and C because these languages distinct between
+a method-prototype (rsp. function-prototype for C) and the method
+(rsp. function for C) itself. If this option is not nil then ECB
+separates the prototypes from the real function/methods. Then with
+@code{ecb-show-tags} the user can define different display-settings
+for each of them. If this option is nil then the prototypes and the
+real functions are filled in the same bucket and displayed plain and
+there is no sorting between prototypes and functions possible. If this
+option is switched on then it is senseful that @code{ecb-show-tags}
+contains for all modes which distinct between prototypes and real
+functions/methods two entries for the tag-type 'function - see the
+documentation of this option.
+@end defopt
+
+@defopt methods-show-node-info
+When to display which node-info in the methods-buffer. Define which
+node info should displayed after moving the mouse over a node (or
+after a shift click onto the node) in the methods-buffer.
+
+You can define ``when'' a node-info should be displayed: See
+@code{ecb-directories-show-node-info} for the possible choices.
+
+You can define what info should be displayed:
+@itemize @minus
+@item name:
+Only the full node name is displayed.
+
+@item name+type:
+The full name + the type of the node (function, class, variable) is
+displayed.
+@end itemize
+
+Do NOT set this option directly via setq but use always customize!
+@end defopt
+
+
+
+@defopt post-process-semantic-taglist
+Define mode-dependent post-processing for the semantic-taglist. This
+is an alist where the car is a major-mode symbol and the cdr is a list
+of function-symbols of functions which should be used for
+post-processing the taglist (returned by
+@code{ecb--semantic-bovinate-toplevel}) for a buffer in this
+major-mode. The first function in the list is called with current
+semantic taglist of current buffer and must return a valid taglist
+again. All other functions are called with the result-taglist of its
+preceding function and have to return a new taglist again.
+
+For oo-programming languages where the methods of a class can be
+defined outside the class-definition (e.g. C++, Eieio) the function
+@code{ecb-group-function-tags-with-parents} can be used to get a much
+better method-display in the methods-window of ECB, because all method
+implementations of a class are grouped together.
+
+Another senseful usage is to filter out certain tags, e.g. prototype
+tags in @code{c-mode}. For this you can set
+@code{ecb-filter-c-prototyp-tags}.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt show-only-positioned-tags
+Show only nodes in the method-buffer which are ``jump-able''. If not nil
+then ECB displays in the method-buffer only nodes which are
+``jump-able'', i.e. after selecting it by clicking or with RET then ECB
+jumps to the corresponding location in the edit-window. Example: With
+CLOS or Eieio source-code there can exist some position-less nodes like
+variable-attributes in a @code{defclass} form which are only displayed
+if this option is nil. Displaying such nodes can be senseful even if
+they can not be jumped.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt show-tags
+How to show tags in the methods buffer first time after find-file.
+This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+The car is either a major-mode symbol or the special symbol 'default
+which means if no setting for a certain major-mode is defined then the
+cdr of the 'default cons-cell is used. This option should always
+contain a default-setting!
+
+The cdr is a list where each element represents a type of tags:
+
+@example
+(<tag type> <display type> <sort method>)
+@end example
+
+There can be more than 1 element for a certain <tag type>. This is for
+example useful for C++ and C because these languages distinct between
+a method-prototype (rsp. function-prototype for C) and the method
+(rsp. function for C) itself. The default value of these option
+contains two entries for <tag type> is @code{function} whereas the
+first one is responsible for the ``real'' methods (rsp. functions) and
+the second one for the prototypes. So if the methods should be
+flattened and the prototypes collapsed the show-tags-list for C++ and
+C must contain two entries for <tag type> @code{function}, the first
+one defined as @code{flattened} and the second one defined as
+@code{collapsed}.
+
+The tags in the methods buffer are displayed in the order as they appear in
+this list.
+
+@table @code
+@item <tag type>
+A Semantic tag type symbol (function, variable, rule, include etc.)
+or one of the following:
+
+@itemize @minus
+@item @code{t}: All tag types not specified anywhere else in the list.
+@item @code{parent}: The parents of a type.
+@end itemize
+
+@item <display type>
+A symbol which describes how the tags of this type shall be shown:
+
+@itemize @minus
+@item @code{expanded}: The tags are shown in an expanded node.
+@item @code{collapsed}: The tags are shown in a collapsed node.
+@item @code{flattened}: The tags are added to the parent node.
+@item @code{hidden}: The tags are not shown.
+@end itemize
+
+@item <sort method>
+A symbol describing how to sort the tags of this type:
+
+@itemize @minus
+@item @code{name}:
+Sort by the tag name.
+@item @code{access}:
+Sort by tag access (public, protected, private) and then by name.
+@item @code{nil}:
+Don't sort tags. They appear in the same order as in the source
+buffer.
+@end itemize
+@end table
+
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt tag-display-function
+Function to use for displaying tags in the methods buffer. This
+functionality is set on major-mode base, i.e. for every major-mode a
+different function can be used. The value of this option is a list of
+cons-cells:
+
+@itemize @minus
+@item
+The car is either a major-mode symbol or the special symbol 'default which
+means if no function for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used.
+@item
+The cdr is the function used for displaying a tag in the related
+major-mode.
+@end itemize
+
+Every function is called with 3 arguments:
+
+@enumerate
+@item The tag
+@item The parent-tag of tag (can be nil)
+@item The value of @code{ecb-font-lock-tags}.
+@end enumerate
+
+Every function must return the display of the tag as string,
+colorized if the third argument is not nil.
+
+The following functions are predefined:
+
+@itemize @bullet
+@item
+For each element E of @code{ecb--semantic-format-function-alist}
+exists a function with name ``ecb--<(cdr E)>''. These functions are
+just aliase to the builtin format-functions of semantic. See the
+docstring of these functions to see what they do. Example:
+(semantic-name-nonterminal . semantic-format-tag-name) is an element
+of @code{ecb--semantic-format-function-alist}. Therefore the
+alias-function for this element is named
+@code{ecb--semantic-format-tag-name}.
+  
+@item
+For every cdr in @code{ecb--semantic-format-function-alist} with name
+``semantic-XYZ'' a function with name ``ecb-XYC'' is predefined. The
+differences between the semantic- and the ECB-version are:
+
+@itemize @minus
+@item
+The ECB-version displays for type tags only the type-name and nothing
+else (exception: In c++-mode a template specifier is appended to the
+type-name if a template instead a normal class).
+@item
+The ECB-version displays type-tags according to the setting in
+@code{ecb-type-tag-display}. This is useful for better recognizing
+different classes, structs etc. in the ECB-method window.
+@end itemize
+
+For all tags which are not types the display of the ECB-version is
+identical to the semantic version. Example: For
+@code{ecb--semantic-format-tag-name} (one of the builtin semantic
+formatters) the pendant is @code{ecb-format-tag-name}.
+@end itemize
+
+This functionality also allows the user to display tags as UML. To
+enable this functionality set the function for a major-mode \(e.g.
+@code{jde-mode}) to
+@code{ecb--semantic-format-tag-uml-concise-prototype},
+@code{ecb--semantic-format-tag-uml-prototype}, or
+@code{ecb--semantic-format-tag-uml-abbreviate} the ECB-versions of
+these functions.
+
+If the value is @code{nil}, i.e. neither a function for a major-mode
+is defined nor the special 'default, then
+@code{ecb--semantic-format-tag-prototype} is used for displaying the
+tags.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt tag-jump-sets-mark
+Set the mark after jumping to a tag from the ECB-method buffer. If
+set the user can easily jump back.
+@end defopt
+
+@defopt tag-visit-post-actions
+Actions to perform after visiting a tag from the Method-buffer. With
+this option actions can be added which will be performed after
+visiting the start of the tag in the source-buffer.
+
+This functionality is set on a @code{major-mode} base, i.e. for every
+@code{major-mode} a different setting can be used. The value of this
+option is a list of cons-cells:
+@itemize @minus
+@item
+The car is either a @code{major-mode} symbol or the special symbol
+'default.
+
+@item
+The cdr is a list of action-functions or nil.
+@end itemize
+
+ECB first performs all actions defined for the special symbol 'default
+(if any) and then all actions defined for current @code{major-mode}
+(if any).
+
+ECB offers some predefined senseful action-functions. Currently there
+are: @code{ecb-tag-visit-highlight-tag-header}
+@code{ecb-tag-visit-smart-tag-start}
+@code{ecb-tag-visit-recenter} @code{ecb-tag-visit-recenter-top}
+@code{ecb-tag-visit-goto-doc-start}
+@code{ecb-tag-visit-narrow-tag} See the documentation of these
+function for details what they do.
+
+But you can add any arbitrary function if the following conditions are
+fulfilled: The function gets the semantic tag as argument, returns the
+(new) point after finishing its job and the function must not put the
+point outside the tag-boundaries of the tag-argument.
+@end defopt
+
+
+
+@defopt type-tag-display
+How to display semantic type-tags in the methods buffer. Normally
+all tag displaying, colorizing and facing is done by semantic
+according to the value returned by
+@code{ecb--semantic-format-face-alist} and the semantic
+display-function (e.g. one from
+@code{ecb--semantic-format-tag-functions}). But sometimes a finer
+distinction in displaying the different type specifiers of type-tags
+can be useful. For a description when this option is evaluated look at
+@code{ecb-tag-display-function}!
+
+This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+@itemize @bullet
+@item
+The car is either a major-mode symbol or the special symbol 'default which
+means if no setting for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used.
+
+@item
+The cdr is a list of 3-element-lists:
+
+@enumerate
+@item
+First entry is a semantic type specifier in string-form. Current
+available type specifiers are for example ``class'', ``interface'',
+``struct'', ``typedef'' and ``enum''. In addition to these ones there
+is also a special ECB type specifier ``group'' which is related to
+grouping tags (see @code{ecb-post-process-semantic-taglist} and
+@code{ecb-group-function-tags-with-parents}). Any arbitrary
+specifier can be set here but if it is not ``group'' or not known by
+semantic it will be useless.
+@item
+Second entry is a flag which indicates if the type-specifier string
+from (1.) itself should be removed (if there is any) from the display.
+@item
+Third entry is the face which is used in the ECB-method window to
+display type-tags with this specifier. ECB has some predefined faces
+for this (@code{ecb-type-tag-class-face},
+@code{ecb-type-tag-interface-face}, @code{ecb-type-tag-struct-face},
+@code{ecb-type-tag-typedef-face}, @code{ecb-type-tag-union-face},
+@code{ecb-type-tag-enum-face} and @code{ecb-type-tag-group-face}) but
+any arbitrary face can be set here. This face is merged with the faces
+semantic already uses to display a tag,
+i.e. the result is a display where all face-attributes of the ECB-face
+take effect plus all face-attributes of the semantic-faces which are not
+set in the ECB-face (with XEmacs this merge doesn't work so here the
+ECB-face replaces the semantic-faces; this may be fixed in future
+versions).
+@end enumerate
+@end itemize
+
+The default value is nil means there is no special ECB-displaying of
+type-tags in addition to the displaying and colorizing semantic
+does. But a value like the following could be a useful setting:
+
+@example
+@group
+((default
+   ("class" t ecb-type-tag-class-face)
+   ("group" nil ecb-type-tag-group-face))
+ (c-mode
+  ("struct" nil ecb-type-tag-struct-face)
+  ("typedef" nil ecb-type-tag-typedef-face)))
+@end group
+@end example
+
+This means that in @code{c-mode} only ``struct''s and ``typedef''s are
+displayed with special faces (the specifiers itself are not removed)
+and in all other modes ``class''s and grouping-tags (see
+@code{ecb-tag-display-function},
+@code{ecb-group-function-tags-with-parents}) have special faces and
+the ``class'' specifier-string is removed from the display.
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+@defopt type-tag-expansion
+Default expansion of semantic type-tags. Semantic groups type-tags in
+different type-specifiers. Current available type specifiers are for
+example ``class'', ``interface'', ``struct'', ``typedef'', ``union''
+and ``enum''. In addition to these ones there is also a special ECB
+type-specifier ``group'' which is related to grouping tags (see
+@code{ecb-post-process-semantic-taglist}).
+
+This option defines which type-specifiers should be expanded at
+file-open-time. Any arbitrary specifier can be set here but if it is
+not ``group'' or not known by semantic it will be useless.
+
+This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+@itemize
+@item
+The car is either a major-mode symbol or the special symbol
+@code{default} which means if no setting for a certain major-mode is
+defined then the cdr of the @code{default} cons-cell is used.
+
+@item
+The cdr is either a list of type-specifiers which should be expanded
+at file-open-time or the symbol @code{all-specifiers} (then a type-tag
+is always expanded regardless of its type-specifier).
+@end itemize
+
+This options takes only effect for semantic-sources - means sources
+supported by semantic!
+@end defopt
+
+
+@node ecb-history, ecb-analyse, ecb-methods, Customizable options
+@subsection Group ecb-history
+
+@noindent
+This group contains settings for the history-buffer in the ECB:
+
+@defopt history-buffer-after-create-hook
+Local hook running after the creation of the history-buffer. Every
+function of this hook is called once without arguments direct after
+creating the history-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+@code{local-set-key} to define new keybindings only for the
+history-buffer of ECB.
+@end defopt
+
+
+@defopt history-buffer-name
+Name of the ECB history buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. ``*ECB
+History*''.
+
+If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-history-buffer by this name, e.g. by a call
+of @code{set-buffer}.
+
+Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again!
+@end defopt
+
+@defopt history-exclude-file-regexps
+List of regexps which exclude source-files from being historized. Be
+aware that each always full filenames (ie. incl. full path) are
+matched against these regexps! Therefore be carefore with regexps
+beginning with ^!
+@end defopt
+
+@defopt history-item-name
+The name to use for items in the history buffer.
+@end defopt
+
+@defopt history-make-buckets
+Bucketize the entries of the history-buffer.
+
+There are several options how the bucketizing should be done:
+@itemize
+@item 'never:
+
+No bucketizing at all, ie. all entries of the history-buffer we be
+displayed flat.
+
+@item 'directory:
+
+All entries with related filesources residing in the same
+directory will be contained in a bucket named with that directory.
+
+@item 'mode:
+
+All entries with related buffers have the same
+major-mode will be contained in a bucket named with that major-mode
+
+@item 'extension:
+
+All entries with related filesources having the
+same extension will be contained in a bucket named with that extension
+@end itemize
+
+If the value is a list of regular expressions then all entries where the
+buffername matches the same regular expression will be contained in one
+bucket. If the value is nil then this is interpreted as an empty list of
+regular expressions!
+
+The default value is 'directory.
+@end defopt
+
+
+
+@defopt history-menu-sorter
+Function which re-sorts the menu-entries of the directories buffer.
+
+If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+@code{ecb-history-menu-user-extension} and the built-in-menu
+@code{ecb-history-menu}. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+For the guidelines for such a sorter-function see
+@code{ecb-directories-menu-sorter}.
+@end defopt
+
+@defopt history-menu-user-extension
+Static user extensions for the popup-menu of the history buffer.
+For further explanations see @code{ecb-directories-menu-user-extension}.
+
+The node-argument of a menu-function contains as data a cons:
+
+car is the filename of the source for which the popup-menu has
+been opened. cdr is the related buffer-name; but be careful,
+because the node can point to a dead buffer (see
+@code{ecb-kill-buffer-clears-history}). Use always @code{ecb-source-get-*}
+to extract whatever you need from the node-data. E.g. use
+@code{ecb-source-get-filename} to get the full filename of the source
+of the node and use @code{ecb-source-get-buffername} or @code{ecb-source-get-buffer} to
+get the buffername rsp. the buffer-object.
+
+Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of @code{ecb-history-menu} but the whole menu can be
+re-arranged with @code{ecb-history-menu-sorter}.
+@end defopt
+
+
+
+@defopt history-menu-user-extension-function
+Dynamic user extensions for the popup-menu of the history buffer. A
+function which has to return a list in the same format like the option
+@code{ecb-history-menu-user-extension}. This function is called when
+the user opens the popup-menu for the history buffer.
+
+If no dynamically evaluated menu-extensions should be added to the
+history-buffer the function has to return nil. Therefore the
+default-value of this option is @code{ignore}.
+
+Per default the dynamic user-extensions are added in front of the
+static extensions of @code{ecb-history-menu-user-extension} but the
+whole menu can be re-arranged with @code{ecb-history-menu-sorter}.
+@end defopt
+
+@defopt history-show-node-info
+When to display which node-info in the history-buffer.
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+history-buffer.
+
+You can define ``when'' a node-info should be displayed:
+See @code{ecb-directories-show-node-info} for the possible choices.
+
+You can define ``which'' info should be displayed:
+@itemize
+@item name: Only the full node-name is displayed.
+@item path: The full-path of the node is displayed.
+@item name-path: The full node-name and the full-path is displayed.
+@end itemize
+
+Do NOT set this option directly via setq but use always customize!
+@end defopt
+
+@defopt history-sort-ignore-case
+Ignore case for sorting the history-entries. See also
+@code{ecb-history-sort-method}.
+@end defopt
+
+@defopt history-sort-method
+Defines how the entries in the history-buffer are sorted.
+@itemize @minus
+@item @code{name}:
+Sorting by name (default).
+@item @code{extension}:
+Sorting first by extension and then by name.
+@item @code{nil}:
+No sorting, means the most recently used buffers are on the top of the
+history and the seldom used buffers at the bottom.
+@end itemize
+
+See also @code{ecb-history-sort-ignore-case}.
+
+If the history is bucketized (see @code{ecb-history-make-buckets}) then this
+sorting applies to the sorting within each bucket.
+@end defopt
+
+@defopt history-stick-indirect-buffers-to-basebuffer
+Stick all indirect-buffers as subnodes to their base-buffer.
+
+If nil then indirect-buffers are treated as non-indirect-buffers
+and sorted into the history-buffer-sequence according to the
+setting of @code{ecb-history-sort-method}.
+
+If not nil then indirect-buffers are always sticked to their base-buffer, ie.
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history looks like:
+
+@example
+[-] <base-buffer BB>
+ |  <indirect-buffer 1 of BB>
+ `- <indirect-buffer 2 of BB>
+@end example
+@end defopt
+
+
+
+@defopt kill-buffer-clears-history
+Define if @code{kill-buffer} should also clear the history. There are
+three options:
+
+@itemize @minus
+@item @code{auto}:
+Removes automatically the corresponding history-entry after the buffer
+has been killed.
+@item @code{ask}:
+Asks, if the history-entry should be removed after the kill.
+@item @code{nil}:
+@code{kill-buffer} does not affect the history (this is the default).
+@end itemize
+@end defopt
+
+@node ecb-analyse, ecb-layout, ecb-history, Customizable options
+@subsection Group ecb-analyse
+
+@defopt analyse-bucket-element-face
+Basic face for displaying elements of buckets in the
+ECB-analyse-buffer. This defines the basic face for the elements of
+category-buckets like Context, Prefix, Completions etc. in the
+ECB-analyse-buffer.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt analyse-bucket-node-face
+Basic face for displaying a bucket-node in the ECB-analyse-buffer.
+This defines the basic face for the bucket-nodes like Context, Prefix,
+Completions etc. in the ECB-analyse-buffer.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt analyse-buffer-after-create-hook
+Local hook running after the creation of the analyse-buffer. Every
+function of this hook is called once without arguments direct after
+creating the analyse-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+@code{local-set-key} to define new key-bindings only for the
+analyse-buffer of ECB.
+@end defopt
+
+@defopt analyse-buffer-name
+Name of the ECB analyse buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. ``*ECB
+Analyse*''.
+
+If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-analyse-buffer by this name, e.g. by a call
+of @code{set-buffer}.
+
+Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again!
+@end defopt
+
+@defopt analyse-buffer-sync
+Synchronize the analyse buffer automatically with current edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+@code{major-mode} of the new buffer belongs NOT to this list.
+
+Normally it's not necessary to exclude some major-modes because with
+not-semantic supported major-modes simply nothing happens. But maybe it can be
+helpful for certain situations...
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync}.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+@code{ecb-analyse-buffer-sync-hook} is evaluated.
+@end defopt
+
+@defopt analyse-buffer-sync-delay
+Time Emacs must be idle before the analyse-buffer is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately.
+
+CAUTION: With analysing a value not too small is strongly recommended because
+it can be very annoying if more or less after each typing the current context
+is analysed. If set to nil then *each* keyboard hit refreshes the
+analyse-buffer which will make ECB quite unusable!
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync-delay}
+@end defopt
+
+@defopt analyse-buffer-sync-hook
+ook run at the end of @code{ecb-analyse-buffer-sync}.
+See documentation of @code{ecb-analyse-buffer-sync} for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+
+@itemize
+
+@item Current buffer is the buffer of the currently selected
+edit-window.
+
+@item The analyse-buffer is displayed in a visible window of the
+ecb-frame (so no check for visibilty of the analyse-buffer in
+the ecb-frame is necessary in a hook function)
+@end itemize
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option @code{ecb-analyse-buffer-sync} is not
+nil the function @code{ecb-analyse-buffer-sync} is running either
+every time Emacs is idle or even after every command (see
+@code{ecb-analyse-buffer-sync-delay}). So if the anaylse-buffer is
+displayed in a window of the ecb-frame (see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically!
+@end defopt
+
+
+
+@defopt analyse-collapsed-buckets
+Buckets collapsed when displaying the current semantic analysis. The
+semantic analyse-modul offers several categories of analysis which are
+called buckets here. These are for example:
+
+Context: The current context, which is the current function/method,
+variable, class etc. (what exactly depends on the programming
+language) point is in. This means not the current
+function/method/variable/class-name point stand on but the current
+surrounding context. Example: If point stays somewhere within a
+defun-definition in emacs-lisp or within a java-method then this defun
+rsp. method is the context. In object oriented languages this can be
+the full hierachy, i.e. not only the current method, but the current
+method, the class of this method, the superclass of this class and so
+on!
+
+Arguments: The arguments of the context if the context is a
+function/method.
+
+Local Variables: All accessible and bound local variables visible at
+current point.
+
+Prefix: The currently parsed prefix, which is mostly the current
+identifier point stands on.
+
+Assignee: See the semantic user-manual
+
+Function: Current function-name point stands on.
+
+Argument #: When point is located within a function-call then this is
+the number of the argument point stands on.
+
+Completions: All possible completions for current prefix (see above).
+This is probably the most helpful bucket.
+
+If one of these categories/buckets are not needed per default then add
+the bucket-name (s.a.) to this option and ECB will per default
+collapse this bucket. So most needed buckets are better visible in the
+analyse-buffer.
+@end defopt
+
+@defopt analyse-face
+Face used for highlighting current entry in the analyse buffer. If the
+face @code{ecb-default-highlight-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-highlight-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt analyse-fontified-buckets
+Buckets whose elements should be fontified as in the methods-buffer.
+If the name of a category/bucket is contained in this option then all
+elements of this bucket will be displayed as in the methods-buffer -
+at least if an element is a semantic-tag. This means if
+@code{ecb-font-lock-tags} is not nil these elements will be fontified
+and also displayed with an appropriate icon if possible. The default
+value does this only for the Context-bucket because for most of the
+other buckets this makes not really much sense.
+
+For available buckets see @code{ecb-analyse-collapsed-buckets}.
+
+For the faces used to display a bucket-node itself or bucket-elements
+not fontified see the options @code{ecb-analyse-bucket-node-face} rsp.
+@code{ecb-analyse-bucket-element-face}.
+@end defopt
+
+@defopt analyse-gen-tag-info-fn
+Which info should be displayed for a tag of the analyse-buffer. If nil
+then the default information about a tag will be displayed. If a
+function then this function gets as argument the tag for which
+tag-information should be displayed. This function has to return a
+string which will be then display as tag-info. This string has to be
+fully formatted (e.g. must already include line-breaks if the tag-info
+should be displayed in several lines).
+
+See @code{ecb-analyse-show-tag-info-fn} how the tag-info is displayed.
+@end defopt
+
+@defopt analyse-general-face
+Basic face for the ECB analyse buffer. This defines the basic face the
+whole history buffer should displayed with. If the face
+@code{ecb-default-general-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-general-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt analyse-show-node-info
+When to display which node-info in the history-buffer. Define which
+node info should displayed after moving the mouse over a node (or
+after a shift click onto the node) in the history-buffer.
+
+You can define ``when'' a node-info should be displayed: See
+@code{ecb-directories-show-node-info} for the possible choices.
+
+You can define what info should be displayed:
+
+@itemize @minus
+@item name: The full name of the node
+@item full-info: All infos available to a node.
+@end itemize
+
+Do NOT set this option directly via setq but use always customize!
+@end defopt
+
+@defopt analyse-show-tag-info-fn
+How to display the tag-info for a tag of the analyse-buffer. The value
+of this option is a function which will be called with the info-string
+generated for the current tag of the analyse-buffer. This function
+must do all things necessary for displaying this info. When this
+function is called the window stored in
+@code{ecb-last-edit-window-with-point} is the selected window!
+
+ECB offers two builtin ways: Display the info in the echo-area (via
+the function @code{message}) or in a temp-buffer in the edit-area (via
+the function @code{ecb-analyse-show-tag-info-in-temp-buffer}). Default
+is echo-area-display.
+
+See also @code{ecb-analyse-gen-tag-info-fn}.
+@end defopt
+
+@node ecb-layout, ecb-compilation, ecb-analyse, Customizable options
+@subsection Group ecb-layout
+
+@noindent
+This group contains settings for the screen-layout of the ECB:
+
+@defopt activate-before-new-frame-created-hook
+Normal hook run before the new ECB-frame is created if
+@code{ecb-new-ecb-frame} is not nil (otherwise this hook is not
+evaluated).
+@end defopt
+
+@defopt advice-window-functions-signal-error
+Signal an error if an adviced function can not do its job. If not nil
+then an error is signaled if one of the adviced user-commands can not
+do its job. So for example if the user tries to split the
+compile-window or an ecb-tree-window or if one tries to switch to
+another buffer in one of the ecb-tree-windows. For details see the
+documentation of each of the adviced functions to get info when an
+error is signaled.
+
+If this option is nil then no error is signaled but the called adviced
+function does simply nothing.
+
+Default is nil but it can also be useful to signal errors - so you see
+when call a function in a situation which is not supported by this
+function.
+@end defopt
+
+@defopt fix-window-size
+Fix size of the ECB-windows/buffers even after frame-resizing. The fix
+type (valid values are nil, t, width and height) can either be set on
+a layout-basis (means a different value for each layout) or one value
+can be set for all layouts. For the latter case there is an additional
+value @code{auto} which choose autom. the senseful fix-type depending
+on the current layout-type: For top-layouts the fix-type @code{height}
+and for all other layout-types the fix-type @code{width}.
+
+For a detailed description of the valid values see documentation of
+@code{window-size-fixed} which is newly introduced in GNU Emacs 21 and
+is only available there. Therefore this option takes only effect with
+GNU Emacs >= 21. This option has no effect with XEmacs because it does
+not support the feature @code{window-size-fixed}.
+
+Note1: Manually resizing the ECB-windows via @code{enlarge-window},
+@code{shrink-window}, @code{mouse-drag-vertical-line} and
+@code{mouse-drag-mode-line} is still possible even if the window-sizes
+are fixed for frame-resizing!
+
+Note2: The description of @code{window-size-fixed} in the
+elisp-info-manual is more detailed than the description offered by
+@kbd{C-h v}!
+
+Note3: With Emacs < 22 there seems to be no distinction between
+'width, 'height and t. Therefore this option takes no effect (means
+all ecb-windows have always unfixed sizes) with Emacs < 22 if
+@code{ecb-compile-window-height} is not nil.
+
+Per default no window-size fixing has been done.
+@end defopt
+
+
+@defopt hide-ecb-windows-after-hook
+Hooks run direct after the ECB windows have been hidden. Hiding was
+done either by @code{ecb-toggle-ecb-windows} or
+@code{ecb-hide-ecb-windows}.
+
+IMPORTANT: Hiding the ECB-windows is internally done by calling
+@code{ecb-redraw-layout} and therefore also the hooks
+@code{ecb-redraw-layout-before-hook} and
+@code{ecb-redraw-layout-after-hook} are evaluated. The hook-sequence
+is analogous to that described in
+@code{ecb-show-ecb-windows-after-hook}.
+@end defopt
+
+@defopt hide-ecb-windows-before-hook
+Hook run direct before the ECB windows will be hidden. Hiding is done
+either by @code{ecb-toggle-ecb-windows} or
+@code{ecb-hide-ecb-windows}. This means that at runtime of this hook
+all the ECB-tree-windows of current layout are visible.
+
+IMPORTANT: Hiding the ECB-windows is internally done by calling
+@code{ecb-redraw-layout} and therefore also the hooks
+@code{ecb-redraw-layout-before-hook} and
+@code{ecb-redraw-layout-after-hook} are evaluated. The hook-sequence
+is analogous to that described in
+@code{ecb-show-ecb-windows-before-hook}.
+@end defopt
+
+@defopt ignore-display-buffer-function
+Adviced @code{display-buffer} ignores @code{display-buffer-function}.
+This means, that the adviced version of @code{display-buffer} ignores
+the value of @code{display-buffer-function} when called for the
+@code{ecb-frame}. If this variable should not be ignored then the
+function of @code{display-buffer-function} is completely responsible
+which window is used for the buffer to display - no smart ECB-logic
+will help to deal best with the ECB-window-layout! You can define if
+and when @code{display-buffer-function} should be ignored:
+
+@itemize @minus
+@item
+only when persistent compile window is used - i.e. if
+@code{ecb-compile-window-height} is not nil
+
+@item
+always when ECB is active - that means ignore when ECB is active
+otherwise not - this is the default value
+
+@item
+never, the adviced version of @code{display-buffer} always uses the
+value of @code{display-buffer-function} if the value is a function.
+@end itemize
+@end defopt
+
+@defopt ignore-pop-up-frames
+Ignore setting of option @code{pop-up-frames}.
+This means, that a value of not nil for @code{pop-up-frames} is ignored:
+@itemize
+@item 'compile-window: only when persistent compile window is used - i.e. if
+@code{ecb-compile-window-height} is not nil - this is the default value.
+@item 'always: always when ECB is active - that means no pop-up-frames when ECB is active
+@item @code{nil}: pop-up-frames is fully active when set
+@end itemize
+@end defopt
+
+@defopt ignore-special-display
+Ignore special-display-handling. This means, that all values of
+@code{special-display-function}, @code{special-display-buffer-names}
+and @code{special-display-regexps} are ignored
+
+@itemize
+@item
+only when persistent compile window is used - i.e. if
+@code{ecb-compile-window-height} is not nil - this is the default
+value.
+
+@item
+always when ECB is active - that means no special-display-handling of
+buffers when ECB is active
+
+@item
+never, i.e. special-dislay-handling depends on the values of the
+options @code{special-display-function},
+@code{special-display-buffer-names} and
+@code{special-display-regexps}.
+
+@end itemize
+@end defopt
+
+@defopt layout-always-operate-in-edit-window
+Adviced window functions work always in the edit-window. If we are in
+an ECB special buffer (methods, directories, etc), and any of the
+adviced windowing functions is called interactively, we will select
+first an edit-window according to the value of
+@code{ecb-mouse-click-destination}. This is useful if you have any
+functions that use such functions and you don't want them to fail with
+an error complaining that the current buffer can not be split, or
+something similar.
+
+Because this may not be desirable in all situations and for all
+adviced functions this can be enabled separately for function where it
+is senseful. If the symbol of an adviced function is contained in the
+value of this option, then the edit-window is first selected otherwise
+either an error is reported or some other special reaction (depends on
+@code{ecb-advice-window-functions-signal-error}); see the
+documentation of the adviced functions for this.
+
+Per default this is only enabled for @code{switch-to-buffer}.
+@end defopt
+
+
+@defopt layout-debug-mode
+Write debug-information about layout-operations in the
+Messages-buffer. Normally there should be no need to set this option
+to true but if there are problems to display buffers in the
+compile-window of ECB (e.g. buffers which should be displayed there
+aren't or the temporally enlarging-mechanism does not do what you
+think it should do etc...) then please do the following steps:
+
+@enumerate
+@item
+Set @code{ecb-layout-debug-mode} to not nil
+
+@item
+Reproduce the wrong behavior exactly by repeating all the operations
+which lead to the problem.
+
+@item
+Now send immediately a bug report with
+@code{ecb-submit-problem-report}.
+
+@item
+Set @code{ecb-layout-debug-mode} back to nil if you do not want
+further debugging output in the *Messages* buffer
+@end enumerate
+@end defopt
+
+
+
+@defopt layout-name
+Select a window layout of ECB. Value is any arbitrary string. There are
+four different types of layouts: left, right, top and left-right,
+which means the location of the ECB-tree-windows in the ECB-frame.
+Currently there are 20 predefined layouts; names see below. You can
+savely try out any of them by changing this value and saving it only
+for the current session. If you are sure which layout you want you can
+save it for future sessions. To get a picture of the layout for name
+<name> call `ecb-show-layout-help'. @code{ecb-layout-function-9}.
+
+Currently available layouts:
+
+@itemize @bullet
+@item Left layouts:
+left1 left2 left3 left4 left5 left6 left7 left8 left9 left10 left11
+left12 left13 left14 left15
+
+@item Right layouts:
+right1
+
+@item Top layouts:
+top1 top2
+
+@item Left-right layouts:
+leftright1 leftright2
+@end itemize
+
+Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to
+this layout with @code{ecb-redraw-layout}
+@end defopt
+
+
+@defopt layout-window-sizes
+Specifies the sizes of the ECB windows for each layout. The easiest
+way (and also the strongly recommended way) to change this variable is
+to change the window sizes by dragging the window borders using the
+mouse and then store the window sizes by calling the command
+@code{ecb-store-window-sizes}. Next time the layout is redrawn the
+values stored in this option will be used.
+
+If @code{ecb-store-window-sizes} is used then the windows sizes are
+stored per default as fractions of current frame-width and -height of
+the ecb-frame, so the stored values will ``work'' for other frame
+sizes too. But if you call @code{ecb-store-window-sizes} with a
+prefix-argument then the fixed values of current width and height are
+stored!
+
+If this option is set ``by hand'' (i.e. not by
+@code{ecb-store-window-sizes}) then the following is important:
+@itemize @minus
+@item
+It is recommended to use fractions of frame-width and -height!.
+@item
+The order of the sequence of the inserted window sizes must be the same as
+@code{other-window} (the not-adviced version!) would walk!
+@end itemize
+@end defopt
+
+@defopt maximize-ecb-window-after-selection
+If not nil maximize current tree-window after selection. When
+selecting another not-tree-window after such an automatic maximizing
+all tree-windows of current layout are displayed again. But a
+tree-window is not maximized if either a node has been selected via
+primary- oder secondarc mouse-button or the popup-menu of that
+tree-buffer has been opened.
+@end defopt
+
+@defopt maximize-next-after-maximized-select
+Maximizes the next logical tree-window after a maximized
+node-selection. Selecting a node in a maximized tree-window is handled
+very smart by ECB:
+
+If a tree-buffer-name is not contained in this option then selecting a
+node in this maximized tree-buffer automatically ``minimizes'' that
+tree-window (i.e. displays all windows of the current layout) so the
+user can perform the next logical step (e.g. the next logical step
+after selecting a directory in the directories-buffer is to select a
+source-file - therefore the sources-buffer of current layout has to be
+displayed - if the current layout contains one; the next logical step
+of selecting a source-file is probably to jump to a certain tag via
+the methods-buffer).
+
+If a tree-buffer-name is contained in this option then selecting a
+node in this tree-buffer automatically maximizes the next logical
+tree-window (e.g. directories --> sources, sources/history -->
+methods). But if the current maximized tree-buffer is also contained
+in the option @code{ecb-tree-do-not-leave-window-after-select} (see
+also the tree-buffer-command
+@code{ecb-toggle-do-not-leave-window-after-select} which is bound to
+@code{C-t} in each tree-buffer) then ECB does *not* maximize the next
+logical tree-window but point stays in the currently maximized
+tree-buffer so for example the user can select more than one node
+(e.g. more than one source-file from the sources-buffer.
+
+The tree-buffer-name can either be defined as plain string or with a
+symbol which contains the buffer-name as value. The latter one is
+recommended for the builtin ECB-tree-buffers because then simply the
+related option-symbol can be used (e.g.
+@code{ecb-directories-buffer-name}, @code{ecb-sources-buffer-name} or
+@code{ecb-history-buffer-name}).
+
+In future versions this option will probably also allow to define the
+next logical tree-buffer for a tree-buffer - currently this is
+hard-coded as follows:
+@itemize @minus
+@item directories --next-logical--> sources
+@item sources     --next-logical--> methods
+@item history     --next-logical--> methods.
+@end itemize
+@end defopt
+
+
+
+@defopt maximize-next-after-maximized-select
+Maximizes the next logical tree-window after a maximized
+node-selection. Selecting a node in a maximized tree-window is handled
+very smart by ECB:
+
+If this option is nil then selecting a node in a maximized
+directories- sources- or history-tree-buffer automatically
+``minimizes'' that tree-window (i.e. displays all windows of the
+current layout) so the user can perform the next logical step (e.g.
+the next logical step after selecting a directory in the
+directories-buffer is to select a source-file - therefore the
+sources-buffer of current layout has to be displayed - if the current
+layout contains one; the next logical step of selecting a source-file
+is probably to jump to a certain tag via the methods-buffer).
+
+If this option is not nil then selecting a node in a maximized
+directories- sources- or history-tree-buffer automatically maximizes
+the next logical tree-window (directories --> sources, sources/history
+--> methods). But if the current maximized tree-buffer is contained in
+the option @code{ecb-tree-do-not-leave-window-after-select} (see also
+the tree-buffer-command
+@code{ecb-toggle-do-not-leave-window-after-select} which is bound to
+@code{C-t} in each tree-buffer) then ECB does *not* maximize the next
+logical tree-window but point stays in the currently maximized
+tree-buffer so for example the user can select more than one
+source-file from the sources-buffer.
+@end defopt
+
+
+
+@defopt new-ecb-frame
+Create a new frame at activation time of ECB.
+@end defopt
+
+@defopt other-window-behavior
+The behavior of ECB concerning getting an ``other window''. The
+following settings are possible:
+
+@code{all}:
+
+ECB will cycle through all windows of the ECB-frame or scroll simply
+the next window in the ECB-frame, means it behaves like the original
+@code{other-window} rsp. the original
+@code{other-window-for-scrolling}.
+
+@code{only-edit}:
+
+ECB will only cycle through the edit-windows of ECB or only scroll
+another edit-window. If the selected window is not an edit-window then
+it behaves like with value @code{all}.
+
+@code{edit-and-compile}:
+
+Like @code{only-edit} plus the compile window if any. If the selected
+window is neither an edit-window nor the compile-window then it
+behaves like with value @code{all}.
+
+@code{smart}:
+
+With this setting ECB tries to choose the
+@code{other-window}-destination or the ``other window'' to scroll in a
+smart and intuitive way: If point is in one of the edit-windows and if
+the edit-area is splitted then always the ``next'' edit-window is
+choosen (whereas the next edit-window of the last edit-window is the
+first edit-window)- if the edit-area is unsplitted then the
+compile-window is used if there is one. In the context of an
+@code{other-window}-call the @var{ARG} of @code{other-window} will be
+taken into account.
+
+If one of the special ecb-windows is selected then always the ``next''
+ecb-window is choosen (whereas the next ecb-window of the last
+ecb-window is the first ecb-window). In the context of an
+@code{other-window}-call the @var{ARG} of @code{other-window} will be
+taken into account. If there is only one ecb-window then ECB considers
+also the edit-windows
+
+If the compile-window is selected then always the last edit-window
+which had the point will be used unless @code{other-window} has been
+called with a prefix-argument unequal 1.
+
+If there is an active minibuffer:
+
+Regardless of the allowed values above ECB handles the situation of an
+active minibuffer during a call to @code{other-window} or
+@code{scroll-other-window} like follows:
+
+If the minibuffer-window is selected then ECB always chooses the
+window @code{minibuffer-scroll-window} points to (when this variable
+is set, otherwise the compile-window or the last selected edit-window
+is choosen) when the called command is called to choose the 1. next
+window (always true for scrolling another window or true when
+@code{other-window} called without prefix-arg or with prefix-arg equal
+1). Otherwise the window ARG steps away is choosen (in case of
+@code{other-window}).
+
+If there is an active minibuffer but the minibuffer-window is not
+selected then @code{other-window} and @code{scroll-other-window}
+behave like the original version.
+
+In addition to the allowed values above the value of this option can
+also be a function:
+
+A function:
+
+This function gets seven arguments:
+@enumerate
+@item
+A canonical list of all currently visible windows of the
+@code{ecb-frame}
+@item
+A canonical list of all currently visible edit-windows
+@item
+A canonical list of all currently visible ecb-windows
+@item
+The window-object of the compile-window if there is any.
+@item
+The minibuffer-window of the ECB-frame if there is an active
+minibuffer.
+@item
+The result of the function @code{ecb-where-is-point} - see the
+documentation of this function for details.
+@item
+An integer which indicates how many steps away from the current
+selected window the ``other-window'' is. Is nil when this function is
+called in another context then for @code{other-window}.
+@end enumerate
+
+The function has to return a window-object which is then used as
+``other window'' for the command @code{other-window} or for scrolling
+another window (e.g. with @code{scroll-other-window}). Such a function
+has to handle properly all situation for itself.
+@code{ecb-get-other-window-smart} is an example for such a function.
+@end defopt
+
+@defopt redraw-layout-after-hook
+Hooks run direct before the ECB windows will be shown either by
+@code{ecb-toggle-ecb-windows} or @code{ecb-show-ecb-windows}. This
+means that at runtime of this hook the ECB-windows are already
+visible.
+@end defopt
+
+@defopt redraw-layout-before-hook
+Hooks run direct before the ECB-layout will be redrawn by either
+@code{ecb-redraw-layout}.
+@end defopt
+
+@defopt redraw-layout-quickly
+If non-nil, we will attempt to redraw the layout quickly. Please read
+also carefully the documentation of @code{ecb-redraw-layout}.
+@end defopt
+
+@defopt select-edit-window-on-redraw
+Select the first edit window on @code{ecb-redraw-layout}.
+@end defopt
+
+@defopt show-ecb-windows-after-hook
+Hooks run direct before the ECB windows will be shown either by
+@code{ecb-toggle-ecb-windows} or @code{ecb-show-ecb-windows}. This
+means that at runtime of this hook the ECB-windows are already
+visible.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by
+calling @code{ecb-redraw-layout} and therefore also the hooks
+@code{ecb-redraw-layout-before-hook} and
+@code{ecb-redraw-layout-after-hook} are evaluated. So there is the
+following sequence of hooks during the process of showing the hidden
+ECB-windows:
+@enumerate
+@item @code{ecb-show-ecb-windows-before-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item <redrawing the layout to show the hidden ECB-windows>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-show-ecb-windows-after-hook}
+@end enumerate
+So be aware which code you add to which hook!
+@end defopt
+
+@defopt show-ecb-windows-before-hook
+Hooks run direct before the ECB windows will be shown either by
+@code{ecb-toggle-ecb-windows} or @code{ecb-show-ecb-windows}. This
+means that at runtime of this hook the ECB-windows are still hidden.
+
+IMPORTANT: Showing the hidden ECB-windows is internally done by
+calling @code{ecb-redraw-layout} and therefore also the hooks
+@code{ecb-redraw-layout-before-hook} and
+@code{ecb-redraw-layout-after-hook} are evaluated. So there is the
+following sequence of hooks during the process of showing the hidden
+ECB-windows:
+@enumerate
+@item @code{ecb-show-ecb-windows-before-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item <redrawing the layout to show the hidden ECB-windows>
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-show-ecb-windows-after-hook}
+@end enumerate
+So be aware which code you add to which hook!
+@end defopt
+
+
+@defopt split-edit-window-after-start
+Sets if and how the edit window should be splitted after ECB-start.
+But be aware: This option determines only if and how the edit-window
+should be splitted at start-time of ECB. There are five different
+values allowed for this option:
+
+@itemize @minus
+@item @code{nil}:
+Do not split the edit-area of ECB after activation, i.e. there will be
+only one edit-window after starting ECB.
+
+@item @code{horizontal}:
+Split the edit-area in 2 edit-windows side by side.
+
+@item @code{vertical}:
+Split the edit-area in 2 edit-windows, one above the other.
+
+@item @code{before-activation}:
+Split the edit-area as before the ECB-start, i.e. the edit-area will
+have after start a window-layout as the whole frame had before the
+start of ECB.
+
+@item @code{before-deactivation}:
+Split the edit-area into a window-layout ECB had in its edit-area
+direct before the ECB-deactivation. This value preserves the full
+state between activations of ECB, i.e. the visibility of the
+ECB-windows, the visibility of a compile-window and also the full
+split-state of the edit-area. But this can only be done if important
+layout-options have not been changed in the meanwhile. These are the
+options @code{ecb-layout-name}, @code{ecb-compile-window-height},
+@code{ecb-compile-window-width}, @code{ecb-windows-width} and
+@code{ecb-windows-height}.
+@end itemize
+
+Default value is @code{before-deactivation}.
+
+Some remarks to the value @code{before-activation}: If this value has
+been set then ECB needs three permanent adivces even when ECB is
+deactivated: @code{split-window}, @code{delete-window} and
+@code{delete-other-windows}. But these advices do not change any
+behavior of these functions but only storing in an internal
+ECB-variable the facts that a window has been splitted or deleted. In
+addition to this these advices are 100% error-save, means the
+functionality of the original functions will be performed in every(!)
+case even if within the advice an error occurs (but normally there can
+no errors occur in these advices because they are very simple).
+Conclusion: If you want really all ECB-advices being disabled after
+deactivating ECB then you have to set this option to other values then
+@code{before-activation}. But setting this variable to this value is
+really completely save.
+@end defopt
+
+@defopt toggle-layout-sequence
+Toggle sequence for layout toggling with @code{ecb-toggle-layout}.
+Every element of this list has to be a valid layout-name i.e. either
+one of the predefined layouts or one of the user-defined layouts.
+
+You can add here as many layouts as you want but to use this option
+most effective you should not add more than 2 or 3 layouts so every
+layout can be accessed very fast by toggling with
+@code{ecb-toggle-layout}. It is also senseful to add layouts which
+have the same principal outline, i.e. all their tree-buffers are on
+the same side of the frame and the tree-buffer-''column'' (or
+-''row'') has identical size for the layouts.
+
+Recommended values are for example:
+
+@itemize @minus
+@item (``left10'' ``left15''), toggles between methods and directories/history
+@item (``left10'' ``left13''), toggles between methods and directories
+@item (``left10'' ``left14''), toggles between methods and history
+@item (``left10'' ``left13'' ``left14''), toggles between methods, history and directories
+@end itemize
+
+See also option @code{ecb-show-sources-in-directories-buffer}.
+
+This option makes only sense if the value is a list with more than 1
+element!
+@end defopt
+
+@defopt windows-height
+The height of the ECB windows in lines for top-layouts. If the number
+is less than 1.0 the width is a fraction of the frame height.
+@end defopt
+
+@defopt windows-width
+The width of the ECB windows in columns for left- and right layouts.
+If the number is less than 1.0 the width is a fraction of the frame
+width.
+@end defopt
+
+@node ecb-compilation, ecb-create-layout, ecb-layout, Customizable options
+@subsection Group ecb-compilation
+
+@noindent
+This group contains settings for the compile window of ECB:
+
+@defopt compilation-buffer-names
+Additional buffer names that should be displayed in the
+compile-window. Buffer names can either be defined as strings or as
+regexps. If the buffer-name of a buffer matches one of the defined
+string or regexp then it will be displayed in the compile-window of
+ECB even if @code{compilation-buffer-p} says nil for this buffer.
+
+It is not recommended to add the eshell-buffer-names to this list
+because ECB already handles the eshell-integration as best as
+possible (@pxref{Using eshell}).
+
+See also the options @code{ecb-compilation-major-modes} and
+@code{ecb-compilation-predicates}.
+@end defopt
+
+@defopt compilation-major-modes
+Additional major-mode that should be displayed in the compile-window.
+All buffers of a major-mode contained in this list are displayed in
+the compile-window even if @code{compilation-buffer-p} says nil for
+such a buffer.
+
+It is not recommended to add @code{eshell-mode} to this list because
+ECB already handles the eshell-integration as best as possible
+(@pxref{Using eshell}).
+@end defopt
+
+@defopt compilation-predicates
+Predicates when a buffer should be treated as compilation-buffer.
+Every element of this list has to be a function or lambda-expression
+which gets as argument a buffer-object and which has to return not nil
+when this buffer should be treated as compilation-buffer (even if
+@code{compilation-buffer-p} says nil) and therefore be displayed in
+the compile-window of ECB (if there is any).
+
+In combination with the values of @code{ecb-compilation-buffer-names}
+and @code{ecb-compilation-major-modes} ECB decides when a buffer is
+displayed in the compile-window.
+
+Default value is the function @code{comint-check-proc} which returns
+not nil when the buffer is related to a living process.
+@end defopt
+
+@defopt compile-window-height
+Height of the persistent compilation-window of ECB. If you want a
+compilation window shown at the bottom of the ECB-layout then set here
+the height of it (Default is a height of 5). If you redraw the current
+layout with @code{ecb-redraw-layout} then the compilation window (if
+any) has the height you set here. If the number is less than 1.0 the
+height is a fraction of the frame height.
+
+If you do not set a persistent compilation window then doing a
+compilation or displaying temp-buffers (e.g. *Help*-buffers) splits
+temporally the edit window vertically if the edit window is not
+splitted already or uses another edit window temporally for
+compilation output if the edit window is already splitted. This is the
+recommended value for this option because this is the
+standard-behavior of Emacs.
+
+Beware: If you set a persistent compilation window then ECB displays all
+buffers for which @code{ecb-compilation-buffer-p} returns not nil in
+that persistent compilation window. If a buffer which should being
+displayed there is not displayed there then try to modify the options
+@code{ecb-compilation-buffer-names},
+@code{ecb-compilation-major-modes} or
+@code{ecb-compilation-predicates} (in this sequence).
+
+See also the options @code{ecb-compile-window-temporally-enlarge} and
+@code{ecb-enlarged-compilation-window-max-height} and also the command
+@code{ecb-toggle-compile-window-height}!
+
+ECB offers the functionality of such a persistent compile-window
+regardless if the special ECB-windows are visible or not (see the
+command @code{ecb-toggle-ecb-windows}).
+
+Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to
+this layout with @code{ecb-redraw-layout}
+@end defopt
+
+@defopt compile-window-prevent-shrink-below-height
+Allow the compile-window to be shrunken below its height. A non nil
+value means ECB prevents the compile-window from being shrunken below
+the threshold of @code{ecb-compile-window-height} by displaying
+temp-buffers (e.g. *Help* etc.) or after running compilations or
+greps. But interactively it is always allowed to shrink it to every
+height!
+
+If nil then ECB does nothing to prevent being shrunken below the value
+of @code{ecb-compile-window-height}.
+
+Default is t.
+@end defopt
+
+
+
+@defopt compile-window-temporally-enlarge
+Let Emacs temporally enlarge the compile-window of the ECB-layout.
+This option has only an effect if @code{ecb-compile-window-height} is
+not nil!
+
+The following values are possible:
+@itemize @minus
+@item @code{after-display}:
+After displaying a ``compilation-buffer'' (in the sense of
+@code{ecb-compilation-buffer-p}!) in the compile-window of ECB. For
+the max. height of the enlarged compile-window see the option
+@code{ecb-enlarged-compilation-window-max-height}.
+
+@item @code{after-selection}:
+Selecting the @code{ecb-compile-window} auto. enlarges it and
+de-selecting (means leaving @code{ecb-compile-window}) auto. shrinks
+it. Enlarging and shrinking the @code{ecb-compile-window} is done with
+@code{ecb-toggle-compile-window-height}. See also the
+documentation of this function!
+
+@item @code{both}:
+The combination of 'after-display and 'after-selection.
+
+@item @code{nil}:
+ECB fixes always the height of the @code{ecb-compile-window} at the
+value of @code{ecb-compile-window-height}.
+@end itemize
+
+To restore the ECB-layout after such a buffer-enlarge just call
+@code{ecb-toggle-compile-window-height} or
+@code{ecb-redraw-layout}.
+@end defopt
+
+@defopt compile-window-width
+Width of the compile-window.
+
+Possible values are @code{frame} and @code{edit-window}.
+With @code{frame} the compile-window looks like:
+
+
+@example
+@group
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|            edit-window(s)            |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+@end group
+@end example
+
+With @code{edit-window} the compile-window looks like:
+
+@example
+@group
+   -------------------------------------------------------
+   |              |                                      |
+   |  Directories |                                      |
+   |              |                                      |
+   |--------------|            edit-window(s)            |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |---------------------------------------
+   |              |                                      |
+   |              |            Compilation               |
+   |              |                                      |
+   -------------------------------------------------------
+@end group
+@end example
+   
+This option takes only effect if @code{ecb-compile-window-height} is
+not nil!
+@end defopt
+
+@defopt change-layout-preserves-compwin-state
+Changing the layout preserves the state of the compile-window. This is
+for example useful if the user toggles between several layouts (see
+@code{ecb-toggle-layout}) and wants to preserve the hidden-state of
+the compile-window.
+@end defopt
+
+
+@defopt enlarged-compilation-window-max-height
+The max height of the compile-window after enlarging it. The max
+height of the compilation window after enlarged by
+@code{ecb-toggle-compile-window-height}. The following values are
+allowed:
+
+@code{best}:
+
+ECB fits the height of the compile-window exactly to the size of its
+current contents but never shrinks below the value of
+@code{ecb-compile-window-height} or enlarges over the half of the
+frame-height of the ECB-frame. The values of the options
+@code{compilation-window-height} and @code{temp-buffer-max-height} are
+taken into account dependent of the current @code{major-mode} of the
+buffer in the compile-window: If @code{compilation-mode} then
+@code{compilation-window-height} is used otherwise
+@code{temp-buffer-max-height}.
+
+@code{half}:
+
+1/2 the frame-height of the ECB-frame
+
+Any number:
+
+Max height in lines. If the number is less than 1.0 the height is a
+fraction of the frame height (e.g. 0.33 results in a max-height of 1/3
+the frame-height).
+@end defopt
+
+@defopt scroll-other-window-scrolls-compile-window
+@code{scroll-other-window} scrolls always the compile-window. For all
+details about the scroll-behavior of @code{scroll-other-window} see
+the advice documentation of @code{other-window-for-scrolling}.
+@end defopt
+
+
+@node ecb-create-layout, ecb-face-options, ecb-compilation, Customizable options
+@subsection Group ecb-create-layout
+
+@noindent
+This group contains settings for creating new ECB-layouts:
+
+@defopt create-layout-file
+File where all layouts created by @code{ecb-create-new-layout} are
+stored.
+@end defopt
+
+@defopt ecb-create-layout-frame-height
+Frame height of the layout creation frame.
+@end defopt
+
+@defopt ecb-create-layout-frame-width
+Frame width of the layout creation frame.
+@end defopt
+
+@node ecb-face-options, ecb-faces, ecb-create-layout, Customizable options
+@subsection Group ecb-face-options
+
+@noindent
+This group contains settings for all faces used in ECB:
+
+@defopt directories-general-face
+Basic face for the ECB directories buffer. This defines the basic face
+the whole directory buffer should displayed with. If the face
+@code{ecb-default-general-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-general-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt directory-face
+Face used for highlighting current directory in the directories
+buffer. If the face @code{ecb-default-highlight-face} is used then the
+display of all ECB-tree-buffers can be changed by modifying only the
+face @code{ecb-default-highlight-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt directory-not-accessible-face
+Face for not accessible dirs in the directories buffer.
+@end defopt
+
+@defopt history-bucket-node-face
+Basic face for displaying a bucket-node in the ECB-history-buffer.
+This defines the basic face for the bucket-nodes used to bucketize the
+history-entries as defined with the option @code{ecb-history-make-buckets}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt history-dead-buffer-face
+Face for history entries pointing to dead buffers.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt history-face
+Face used for highlighting current history-entry in the history
+buffer. If the face @code{ecb-default-highlight-face} is used then the
+display of all ECB-tree-buffers can be changed by modifying only the
+face @code{ecb-default-highlight-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt history-general-face
+Basic face for the ECB directory buffer. This defines the basic face
+the whole history buffer should displayed with. If the face
+@code{ecb-default-general-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-general-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt history-indirect-buffer-face
+Face for indirect buffers in the history buffer.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+
+
+@defopt method-face
+Face used for highlighting current method, class or variable in the
+methods buffer. If the face @code{ecb-default-highlight-face} is used
+then the display of all ECB-tree-buffers can be changed by modifying
+only the face @code{ecb-default-highlight-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt method-non-semantic-face
+Face used for for displaying tags of sources not supported by
+semantic.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+
+@defopt methods-general-face
+Basic face for the ECB methods buffer. This defines the basic face the
+whole methods buffer should displayed with. If the face
+@code{ecb-default-general-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-general-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt source-face
+Face used for highlighting current source in the sources buffer. If
+the face @code{ecb-default-highlight-face} is used then the display of
+all ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-highlight-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt source-in-directories-buffer-face
+Face for source files in the directories buffer.
+@end defopt
+
+@defopt sources-general-face
+Basic face for the ECB sources buffer. This defines the basic face the
+whole sources buffer should displayed with. If the face
+@code{ecb-default-general-face} is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+@code{ecb-default-general-face}.
+
+Changes take first effect after finishing and reactivating ECB!
+@end defopt
+
+@defopt source-read-only-face
+Face for read-only sources.
+@end defopt
+
+@defopt tag-header-face
+Face used for highlighting the tag header after jumping to it by
+clicking onto a node in the methods buffer.
+@end defopt
+
+
+
+@node ecb-faces, ecb-help, ecb-face-options, Customizable options
+@subsection Group ecb-faces
+
+@noindent
+This group contains all faces used in ECB:
+
+@table @code
+@item ecb-bucket-node-face:
+Face which can be used for displaying bucket tags in the methods
+buffer. See also @code{ecb-bucket-node-display}.
+
+@item ecb-default-general-face:
+Basic face for all ECB tree-buffers.
+It's recommended to define here the font-family, the font-size, the basic
+color etc.
+
+In GNU Emacs 21.X all faces (even the face
+@code{ecb-default-highlight-face}) used in the ECB tree-buffers inherit
+from this face. Therefore the default attributes like font etc. of a
+face used in a tree-buffer can be very easily changed with face
+@code{ecb-default-general-face}.
+
+With XEmacs there is no inheritance-feature but the options
+@code{ecb-directories-general-face}, @code{ecb-sources-general-face},
+@code{ecb-methods-general-face} and @code{ecb-history-general-face}
+offer the choice to use the face @code{ecb-default-general-face} so
+also with XEmacs the basic face-settings can be easily changed just by
+customizing the face @code{ecb-default-general-face}!
+
+@item ecb-default-highlight-face:
+Define basic face for highlighting the selected node in an ECB
+tree-buffer.
+
+In GNU Emacs 21.X all highlighting faces in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a face used in a tree-buffer for highlighting the current
+tag can be very easily changed with face
+@code{ecb-default-highlight-face}.
+
+With XEmacs there is no inheritance-feature but the options
+@code{ecb-directory-face}, @code{ecb-source-face},
+@code{ecb-method-face} and @code{ecb-history-face} offer the choice to
+use the face @code{ecb-default-highlight-face} so also with XEmacs the
+basic face-settings can be easily changed just by customizing the face
+@code{ecb-default-highlight-face}!
+
+@item ecb-directories-general-face:
+Basic face for the ECB directories buffer. It“s recommended to define
+here the font-family, the font-size, the basic color etc.
+
+@item ecb-directory-face:
+Define face used for highlighting current directory in the directories
+buffer.
+
+@item ecb-directory-not-accessible-face
+Define a face for not accessible dirs in the directories buffer.
+
+@item ecb-history-bucket-node-face:
+Face used for displaying a bucket-node in the ECB-history-buffer.
+
+In GNU Emacs 21.X this face inherits from the face
+@code{ecb-bucket-node-face}. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by @code{ecb-bucket-node-face}
+this set of basic attributes have to be set in
+@code{ecb-history-bucket-node-face} too!
+
+@item ecb-history-dead-buffer-face:
+Face used for history entries pointing to dead buffers.
+
+In GNU Emacs 21.X this face inherits from the face
+@code{ecb-history-general-face}. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by
+@code{ecb-history-general-face} this set of basic attributes have to be set in
+@code{ecb-history-dead-buffer-face} too!
+
+@item ecb-history-face:
+Define face used for highlighting current history-entry in the history
+buffer.
+
+@item ecb-history-general-face:
+Basic face for the ECB history buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+@item ecb-history-indirect-buffer-face:
+Face used for history entries pointing to dead buffers.
+
+In GNU Emacs 21.X this face inherits from the face
+@code{ecb-history-general-face}. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by
+@code{ecb-history-general-face} this set of basic attributes have to be set in
+@code{ecb-history-indirect-buffer-face} too!
+
+@item ecb-method-face:
+Define face used for highlighting current method, class or variable in
+the methods buffer.
+
+@item ecb-methods-general-face:
+Basic face for the ECB methods buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+@item ecb-method-non-semantic-face:
+Define face used for displaying tags of sources not supported by semantic.
+
+@item ecb-mode-line-data-face
+Define face for the data in the mode-line. See
+@code{ecb-mode-line-data}.
+
+@item ecb-mode-line-prefix-face
+Define face for the prefix in the mode-line. See
+@code{ecb-mode-line-prefixes}.
+
+@item ecb-source-face:
+Define face used for highlighting current source in the sources
+buffer.
+
+@item ecb-source-in-directories-buffer-face:
+Define a face for displaying sources in the directories buffer.
+
+@item ecb-sources-general-face:
+Basic face for the ECB sources buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+@item ecb-source-read-only-face
+Define a face for read-only sources
+
+@item ecb-tag-header-face:
+Define face used for highlighting the tag header after jumping to it
+by clicking onto a node in the methods buffer.
+
+@item ecb-tree-guide-line-face:
+Define face for the guide-lines in the tree-buffers. See the option
+@code{ecb-tree-buffer-style} for a explanation of guide-lines.
+
+@item ecb-type-tag-class-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-enum-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-group-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-interface-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-struct-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-typedef-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-type-tag-union-face:
+Define face used with option @code{ecb-type-tag-display}.
+
+@item ecb-mode-line-win-nr-face
+Define face for the window-number in the mode-line. See
+@code{ecb-mode-line-display-window-number}.
+
+@end table
+
+Just call @code{customize-face <face-name>} to customize these faces
+for your personal taste. Or customize the related option in the group
+@ref{ecb-face-options}.
+
+
+@node ecb-help, ecb-eshell, ecb-faces, Customizable options
+@subsection Group ecb-help
+
+@noindent
+This group contains settings for the ECB online help:
+
+
+@defopt help-html-path
+Path where the ECB online help in HTML format resides. This must be
+the location of the @file{ecb.html} which comes with the ECB
+distribution. If is installed by unpacking the archive available on
+the ECB website then this is the subdir @code{ecb-help-html-subdir} of
+the installation directory of ECB. If it is installed as
+XEmacs-package (e.g. via the package manager of XEmacs) then this is
+probably either the directory ``../../html/'' or
+``../../etc/ecb/html/'' (both relative to the Elisp directory of ECB).
+
+The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+Normally there should be no need to change this option!
+@end defopt
+
+
+@defopt help-info-path
+Path where the ECB online help in info format resides. This must be
+the location of the @file{ecb.info} which comes with the ECB
+distribution. If is installed by unpacking the archive available on
+the ECB website then this is the subdir @code{ecb-help-info-subdir} of
+the installation directory of ECB. If it is installed as
+XEmacs-package (e.g. via the package manager of XEmacs) then this is
+probably the directory ``../../info/'' (relative to the Elisp directory
+of ECB).
+
+The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+Normally there should be no need to change this option!
+@end defopt
+
+
+@defopt show-help-format
+The format @code{ecb-show-help} shows its online help. Allowed values
+are 'info (for the Info format) and 'html (for HTML format). If the
+value is 'html then @code{browse-url-browser-function} says which
+browser is used.
+
+Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included.
+@end defopt
+
+@node ecb-eshell, ecb-speedbar, ecb-help, Customizable options
+@subsection Group ecb-eshell
+
+@noindent
+This group contains settings for eshell integration within the ECB:
+
+@defopt eshell-auto-activate
+Startup the eshell and display it in the compile-window. If current
+layout does not display a compile-window (see
+@code{ecb-compile-window-height}) then nothing is done.
+@end defopt
+
+@defopt eshell-buffer-sync
+Synchronize eshell with the default-directory of current source-buffer.
+
+This option takes only effect if a permanant compile-window is used in the
+current layout.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window and if after this the default-directory of the new edit-buffer is
+different from the default-directory of the current eshell-buffer. If value is
+nil then never a synchronization will take place. If a list of major-modes
+then only if the @code{major-mode} of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync}.
+@end defopt
+
+@defopt eshell-buffer-sync-delay
+Time Emacs must be idle before the eshell-buffer of ECB is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync-delay}.
+@end defopt
+
+@defopt eshell-enlarge-when-eshell
+Enlarge the compile-window if it is selected by @code{eshell}. This
+takes only effect if the command @code{eshell} is called!
+@end defopt
+
+@defopt eshell-fit-window-to-command-output
+Fit the compile-window after an eshell-command to the output. This is
+done by the function @code{ecb-eshell-fit-window-to-output} which is
+added to @code{eshell-post-command-hook} ie. which is running autom.
+after each eshell-command.
+@end defopt
+
+@node ecb-speedbar, ecb-non-semantic, ecb-eshell, Customizable options
+@subsection Group ecb-speedbar
+
+@defopt speedbar-before-activate-hook
+Hook running directly before ECB activates the integrated speedbar.
+
+For example this hook can be used to change the expansion-mode of the
+integrated speedbar via @code{speedbar-change-initial-expansion-list}.
+Example: (speedbar-change-initial-expansion-list ``buffers'').
+@end defopt
+
+@defopt speedbar-buffer-sync
+Synchronize the speedbar-buffer of ECB automatically with current
+edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+@code{major-mode} of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync}.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+@code{ecb-speedbar-buffer-sync-hook} is evaluated.
+@end defopt
+
+@defopt speedbar-buffer-sync-delay
+Time Emacs must be idle before the speedbar-buffer of ECB is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+@code{ecb-basic-buffer-sync-delay}.
+@end defopt
+
+@defopt speedbar-buffer-sync-hook
+ook run at the end of @code{ecb-speedbar-buffer-sync}.
+See documentation of @code{ecb-speedbar-buffer-sync} for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+Preconditions for such a hook:
+
+@itemize
+
+@item Current buffer is the buffer of the currently selected
+edit-window.
+
+@item The speedbar-buffer is displayed in a visible window of the
+ecb-frame (so no check for visibilty of the speedbar-buffer in
+the ecb-frame is necessary in a hook function)
+@end itemize
+
+Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+Important note: If the option @code{ecb-speedbar-buffer-sync} is not
+nil the function @code{ecb-speedbar-buffer-sync} is running either
+every time Emacs is idle or even after every command (see
+@code{ecb-speedbar-buffer-sync-delay}). So if the speedbar-buffer is
+displayed in a window of the ecb-frame (see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically!
+@end defopt
+
+@node ecb-non-semantic, ecb-winman, ecb-speedbar, Customizable options
+@subsection Group ecb-non-semantic
+
+@noindent
+This group contains settings for parsing and displaying non-semantic files:
+
+@defopt auto-save-before-etags-methods-rebuild
+Automatic saving of current buffer before rebuilding its methods.
+
+This option is only relevant for sources which are supported and
+parsed by etags (see @code{ecb-process-non-semantic-files}). Because
+etags is an external tool a source-buffer can only be reparsed if the
+buffer is saved to disk. So the command
+@code{ecb-rebuild-methods-buffer} checks for sources which are not
+supported by semantic or imenu if either this option is t or if the
+major-mode of the source-buffer is contained in this list: In both
+cases ECB saves the current source-buffer before it re-runs etags for
+reparsing the source. If nil or if the major-mode is not contained
+then no automatic saving will be done!
+
+For all source supported by semantic or by imenu this option takes no
+effect.
+@end defopt
+
+@defopt non-semantic-exclude-modes
+Exclude modes from parsing with imenu or etags. Per default, ECB tries
+to parse all file-types not supported by semantic with imenu or etags
+or some other method (for details see the option
+@code{ecb-non-semantic-parsing-function}). If a file-type can not be
+parsed by semantic, imenu or etags than this simply results in an
+empty method-buffer for this file. But nevertheless you will get a
+message ``Sorry, no support for a file of that extension'' which comes
+from the speedbar-library and can not switched off. Therefore if a
+@code{major-mode} is known as not parse-able by semantic, imenu or etags
+it can be added to this option and then it will be excluded from being
+tried to parsed.
+@end defopt
+
+@defopt non-semantic-methods-initial-expand
+Initially expand all tags for not by semantic supported sources.
+This option can be customized on a major-mode basis, i.e. if a
+@code{major-mode} is contained in this option then all tags for this
+modes will be initially expanded - otherwise not.
+@end defopt
+
+@defopt non-semantic-parsing-function
+Define mode-dependent parsing functions for non-semantic files. This
+is an alist where the car is a major-mode symbol and the cdr is a
+function-symbol of a function which should be used for parsing a
+non-semantic buffer, i.h. a buffer for which no semantic grammar
+exists. Such a function gets one argument - the filename of current
+buffer - and has to generate and return a tag/tag list which is
+understandable by @code{speedbar-insert-generic-list}. speedbar has
+already included two functions @code{speedbar-fetch-dynamic-imenu} and
+@code{speedbar-fetch-dynamic-etags} which can be used for parsing
+buffers with imenu rsp. etags.
+
+This option takes only effect if @code{ecb-process-non-semantic-files}
+is not nil: Then ECB checks for non-semantic buffers if current
+@code{major-mode} is contained in this option and if yes, then the
+specified parsing function is called; if not then the cars of the
+elements of @code{speedbar-dynamic-tags-function-list} are called in
+that sequence they are listed in this variable. See option
+@code{speedbar-dynamic-tags-function-list} for further details.
+
+In most cases imenu-parsing is preferable over etags-parsing because
+imenu operates on Emacs-buffers and needs no external tool and
+therefore parsing works also if current contents of a buffer are not
+saved to disk. But maybe sometimes etags may return better parsing
+results
+
+IMPORTANT: if imenu-parsing should be used then the option
+@code{speedbar-use-imenu-flag} must be set to not nil!
+@end defopt
+
+@defopt process-non-semantic-files
+Display content of non-semantic-files in the ECB-methods-buffer. See
+also @code{ecb-non-semantic-parsing-function}.
+@end defopt
+
+@defopt rebuild-non-semantic-methods-before-hook
+Hook running at beginning of the function
+@code{ecb-rebuild-methods-buffer-for-non-semantic}. This function is
+always called by the command @code{ecb-rebuild-methods-buffer} for not
+semantic supported source-types.
+
+Every function of this hook gets one argument: The complete filename
+of the current source-buffer in the edit-window. The Method-buffer is
+only rebuild by @code{ecb-rebuild-methods-buffer-for-non-semantic} if
+either the hook contains no function (the default) or if no function
+of this hook returns nil! See @code{run-hook-with-args-until-failure}
+for description how these function are processed.
+@end defopt
+
+@node ecb-winman, ecb-mode-line, ecb-non-semantic, Customizable options
+@subsection Group ecb-winman
+
+@noindent
+This group contains settings for supporting several window-managers:
+
+@defopt winman-escreen-number
+Number of the escreen which is reserved for ECB. If you go to the
+escreen with this number you go always to the escreen with activated
+ECB. All other escreen-numbers are escreens with deactivated ECB!
+@end defopt
+
+@defopt winman-winring-name
+Name of the winring-window-configuration reserved for ECB. If you go
+to the window-configuration with this name you go always to the
+window-configuration with activated ECB. All other
+window-configuration are configurations with deactivated ECB!
+@end defopt
+
+@node ecb-mode-line, ecb-version-control, ecb-winman, Customizable options
+@subsection Group ecb-mode-line
+
+@noindent
+This group contains settings for the modelines of the
+ECB-tree-buffers:
+
+@defopt mode-line-data
+Data shown in the modelines of the special ECB-buffers. Everey element
+of this list is a cons-cell where the car is used to define a
+buffer-name and the cdr to define the modeline-data for that buffer.
+For details about how to defining a buffer-name see
+@code{ecb-mode-line-prefixes} - its completely the same.
+
+The cdr is the data for ths modeline and can either be the symbol
+@code{sel-dir} or @code{sel-source} whereas the former one displays
+the current selected directory as modeline-data and the latter one the
+current selected source-file (without path).
+
+In addition to these two predefined values for every special
+ECB-buffer a plain string (which is displayed) or a function can be
+specified which gets three args (name of the buffer, current selected
+directory and current selected source-file) and must return a string
+which will be displayed in the modeline (or nil if no data should be
+displayed). Such a function can add the text-property @code{help-echo}
+to the result-string. Then this help-string will be displayed when the
+user moves the mouse over this section of the modeline.
+
+If a special ECB-buffer should not display special data in its
+modeline then this buffer-name should either not being added to this
+option or added with ``No data'' (= nil as cdr).
+
+The whole modeline of the special ECB-buffer consists of the prefix of
+@code{ecb-mode-line-prefixes} and the data of
+@code{ecb-mode-line-data} - eventually prepended by the window-number,
+see @code{ecb-mode-line-display-window-number}.
+@end defopt
+
+@defopt mode-line-data-face
+Face used for the data in the mode-line. See
+@code{ecb-mode-line-data}. For XEmacs the face should inherit from the
+face @code{modeline} (see @code{set-face-parent})!
+@end defopt
+
+
+@defopt mode-line-display-window-number
+Display in the modeline of every special ECB-window the window-number.
+The left-top-most window in a frame has the window-number 0 and all
+other windows are numbered with increasing numbers in the sequence,
+functions like @code{other-window} or @code{next-window} would walk
+through the frame.
+
+This can be used to jump to windows by number with commands like:
+
+@lisp
+@group
+  (defun my-switch-to-window-number (number)
+    ``Switch to the nth window''
+    (interactive ``P'')
+    (if (integerp number)
+        (select-window (nth number (window-list)))))
+@end group
+@end lisp
+
+Currently this feature is only available for GNU Emacs 21.X, because
+neither GNU Emacs < 21 nor XEmacs can evaluate dynamically forms in
+the mode-line.
+@end defopt
+
+@defopt mode-line-prefixes
+Prefixes shown in the modelines of the special ECB-buffers. The
+displayed prefix then looks like: ``[ <PREFIX>[: ]]'', means if a
+prefix is defined for an special ECB-buffer then a single space is
+prepended and if there is additional text to display (e.g. the current
+directory in the sources buffer, see @code{ecb-mode-line-data}) then
+also the string ``: '' is appended.
+
+Everey element of this list is a cons-cell where the car is used to
+define a buffer-name and the cdr to define the modeline-prefix for
+that buffer.
+
+The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+to define a prefix for one of the builtin ECB-tree-buffers because
+then simply the related option-symbol can be used. To add a prefix for
+the builtin directories tree-buffer just set the symbol
+@code{ecb-directories-buffer-name} as car.
+
+The cdr is the prefix for a buffer and can either be a string which
+used as it is or a function-symbol which is called with three argument
+(the buffer-name, the current selected directory and the current
+selected source-file) and must return either nil (for no prefix) or a
+string which is then used a prefix. Such a function can add the
+text-property @code{help-echo} to the result-string. Then this
+help-string will be displayed when the user moves the mouse over this
+section of the modeline.
+
+If a special ECB-buffer should not have a prefix in its modeline then
+this buffer-name should either not being added to this option or added
+with ``No prefix'' (= nil as cdr).
+@end defopt
+
+@defopt mode-line-prefix-face
+Face used for the prefix in the mode-line. See
+@code{ecb-mode-line-prefixes}. For XEmacs the face should inherit from
+the face @code{modeline} (see @code{set-face-parent})!
+@end defopt
+
+@defopt mode-line-win-nr-face
+Face used for the window-number in the mode-line. See
+@code{ecb-mode-line-display-window-number}. For XEmacs the face should
+inherit from the face @code{modeline} (see @code{set-face-parent})!
+@end defopt
+
+@node ecb-version-control, ,ecb-mode-line, Customizable options
+@subsection Group ecb-version-control
+
+@noindent
+This group contains settings for the version-control-support of ECB:
+
+@defopt vc-directory-exclude-regexps
+Which directories should be excluded from VC-state-check. If a
+directory matches any of the regexps of this option the VC-state of
+its sources will not be checked - This option takes only effect if
+@code{ecb-vc-enable-support} is not nil.
+@end defopt
+
+
+@defopt vc-enable-support
+Enable support for version-control (VC) systems. If on then in the
+directories-buffer (if the value of the option
+@code{ecb-show-sources-in-directories-buffer} is on for current
+layout), the sources-buffer and the history-buffer all file-items are
+displayed with an appropriate icon in front of the item-name to
+indicate the VC-state of this item. If off then no
+version-control-state checking is done.
+
+Because this check can be take some time if files are managed by a not
+local Version-control-server ECB performs this check stealthy (see
+@code{ecb-stealthy-tasks-delay}) so normally there should no
+performance-decrease or additional waiting-time for the user. But to
+get sure this option offers three choices: @code{t},
+@code{unless-remote} and @code{nil}. See the option
+@code{ecb-prescan-directories-for-emptyness} for an explanation for
+these three choices.
+
+The option @code{ecb-vc-directory-exclude-regexps} offers are more
+fine granularity to exclude the sources of certain directories from
+the VC-state-check.
+
+See @code{ecb-vc-supported-backends} and @code{ecb-vc-state-mapping}
+how to customize the VC-support itself.
+@end defopt
+
+@defopt vc-state-mapping
+Mapping between VC-states from the backends and ECB-known VC-states.
+ECB understands the following state-values:
+
+@table @code
+@item up-to-date
+The working file is unmodified with respect to the latest version on
+the current branch, and not locked.
+
+@item edited
+The working file has been edited by the user. If locking is used for
+the file, this state means that the current version is locked by the
+calling user.
+
+@item needs-patch
+The file has not been edited by the user, but there is a more recent
+version on the current branch stored in the master file.
+
+@item needs-merge
+The file has been edited by the user, and there is also a more recent
+version on the current branch stored in the master file. This state
+can only occur if locking is not used for the file.
+
+@item added
+The working file has already been added/registered to the VC-system
+but not yet commited.
+
+@item unlocked-changes
+The current version of the working file is not locked, but the working
+file has been changed with respect to that version. This state can
+only occur for files with locking; it represents an erroneous
+condition that should be resolved by the user.
+
+@item ignored
+The version-control-system ignores this file (e.g. because included in
+a .cvsignore-file in case of CVS).
+
+@item unknown
+The state of the file can not be retrieved; probably the file is not
+under a version-control-system.
+
+@end table
+
+All state-values a check-vc-state-function of
+@code{ecb-vc-supported-backends} can return must have a mapping to one
+of the ECB-state-values listed above. If for a certain
+backend-VC-state no mapping can be found then per default 'edited is
+assumed!
+
+The default value of this option maps already the possible returned
+state-values of @code{vc-state} and @code{vc-recompute-state} (both
+GNU Emacs) and @code{vc-cvs-status} (Xemacs) to the
+ECB-VC-state-values.
+@end defopt
+
+@defopt vc-supported-backends
+Define how to to identify the VC-backend and how to check the state.
+The value of this option is a list containing cons-cells where the car is a
+function which is called to identify the VC-backend for a DIRECTORY and the
+cdr is a function which is called to check the VC-state of the FILEs contained
+in DIRECTORY.
+
+Identify-backend-function: It gets a full directory-name as argument - always
+without ending slash (rsp. backslash for native Windows-XEmacs) - and has to
+return a unique symbol for the VC-backend which manages that directory (e.g.
+'CVS for the CVS-system or 'RCS for the RCS-system) or nil if the file is not
+managed by a version-control-system.
+
+Check-vc-state-function: It gets a full filename (ie. incl. the complete
+directory-part) and has to return a symbol which indicates the VC-state of
+that file. The possible returned values of such a check-vc-state-function have
+to be mapped with @code{ecb-vc-state-mapping} to the allowed ECB-VC-state values.
+
+ECB runs for a certain DIRECTORY all identify-backend-functions in that order
+they are listed in this option. For the first which returns a value unequal
+nil the associated check-state-function is used to retrieve the VC-state of
+all sourcefiles in that DIRECTORY.
+
+There is no need for the identify-backend-function or the
+check-vc-state-function to cache any state because ECB automatically caches
+internally all necessary informations for directories and files for best
+possible performance.
+
+To prepend ECB from checking the VC-state for any file set
+@code{ecb-vc-enable-support} to nil.
+
+Default value: Support for CVS, RCS, SCCS, Subversion, Git and
+Monotone. To identify the VC-backend the functions
+@code{ecb-vc-managed-by-CVS}, @code{ecb-vc-managed-by-RCS} rsp.
+@code{ecb-vc-managed-by-SCCS} rsp. @code{ecb-vc-managed-by-SVN} rsp.
+@code{ecb-vc-managed-by-GIT} rsp. @code{ecb-vc-managed-by-MTN}are used.
+
+For all six backends the function @code{ecb-vc-state} of the
+VC-package is used by default (which uses a heuristic and
+therefore faster but less accurate approach), but there is also
+@code{ecb-vc-recompute-state} available which is an alias for
+@code{vc-recompute-state} (which returns accurate state-values by calling the
+backend which can be slow especialy for remote root-repositories!)
+
+Example: If @code{ecb-vc-recompute-state} (to get real state-values not
+only heuristic ones) should be used to check the state for CVS-managed files
+and @code{ecb-vc-state} for all other backends then an element
+(ecb-vc-dir-managed-by-CVS . ecb-vc-recompute-state) should be added at the
+beginning of this option.
+@end defopt
+
+
+@node Submitting problem report, Upgrading, Customizing, Top
+@chapter Submitting a problem report
+
+@cindex Bug report
+@cindex Problem report
+If you run into problems with ECB you should first take a look into
+
+@itemize @minus
+@item @ref{FAQ} or
+@item @ref{Conflicts and bugs} or
+@item @ref{Common use-cases} or
+@item the appropriate section of this online-manual.
+@end itemize
+
+If your problem(s) still remain you can/should send a problem report
+to the ECB mailing list @email{ecb-list@@lists.sourceforge.net}. ECB
+offers you a command which does all necessary for you to send a
+problem report. Just call @code{ecb-submit-problem-report}! Please
+read the documentation of this command, see @ref{Interactive ECB
+commands}.
+
+@strong{IMPORTANT}: Cause of extra appearance of SPAM in the
+mailing-lists, SourceForge has changed its policy: Now it is only
+possible to post to the mailing-list for users who have subscribed
+this mailing-list. So please be aware you will not be able to send
+comments, bug reports and improvement suggestions before you have
+subscribed the ECB-mailing-list. See the section "Mailing-list" at the
+ECB-website at
+@ifhtml
+@uref{http://ecb.sourceforge.net}
+@end ifhtml
+@ifnothtml
+@url{http://ecb.sourceforge.net}
+@end ifnothtml
+how to do this.
+
+If you think there are problems concerning parsing-results for certain
+sources supported by semantic then you should call
+@code{ecb-dump-semantic-toplevel} for the problematic source-buffer
+@strong{BEFORE} you call @code{ecb-submit-problem-report} because this
+``dump''-command generates for the current-buffer a new buffer with
+name ``*ecb-tag-dump*'' which contains all semantic-tags for this
+source. The contents of this ``*ecb-tag-dump*'' will then autom. be
+added to the problem-report generated by
+@code{ecb-submit-problem-report}!
+
+This command creates a problem-report buffer for you. After that you
+get a menu ``Mail'' (dependent on the mail-package used, the menu can
+have a different name) with commands to send the problem report. But
+for this the variable @code{mail-user-agent} must be configured right for
+your system. If you can“t get working this mechanism you can simply
+copy the whole problem-report buffer after filling it out and sending
+it with your standard mail-client to
+@email{ecb-list@@lists.sourceforge.net}!
+
+Please read also the documentation of the option @code{ecb-debug-mode} and
+switch on the debug mode of ECB (also available in the Help-menu of
+ECB!) before submitting a problem-report!
+
+@node Upgrading, Common use-cases, Submitting problem report, Top
+@chapter Upgrading and downloading packages
+
+This chapter describes all aspects of upgrading to a newer version of
+ECB.
+
+The first section describes how to download and install a new
+package from the web, where ``package'' means either ECB itself or the
+required library CEDET
+
+After installing a new ECB-version ECB checks if the values of the
+customized ECB-options are still compatible. If not ECB does some
+smart things. This is the topic of the second section.
+
+@menu
+* Downloading new versions::    How to download newer versions of packages
+* Auto. option-upgrading::      ECB can auto. upgrade your options
+@end menu
+
+@node Downloading new versions, Auto. option-upgrading, Upgrading, Upgrading
+@section Downloading new versions of ECB and/or CEDET
+
+@cindex Download
+
+@strong{Please note}: THE PACKAGE-DOWNLOAD-FEATURE OF ECB IS COMPLETELY
+DEACTIVATED SINCE VERSION 2.33! Please got to the website of ECB and download
+and install ``by hand'':
+
+@enumerate
+
+@item Download ECB
+
+Go to
+@ifhtml
+@uref{http://ecb.sourceforge.net}
+@end ifhtml
+@ifnothtml
+@url{http://ecb.sourceforge.net}
+@end ifnothtml
+and download the latest release (or if you are brave and tough the latest
+CVS-snapshot) from the download section.
+
+Save the archive (either *.tar.gz or *.zip) in a suitable location of your disk.
+
+@item Extract the downloaded ECB-archive
+
+Extract the archive with a suitable extraction-tool. The archive will extract
+into a new directory @file{ecb-<version>} whereas <version> is either the
+version number of the downloaded release or ``latest'' in case of the
+CVS-snapshot. (example for a release: The archive extracts into a new
+subdirectory @file{ecb-2.33}.
+
+The newly created subdirectory contains all files of ECB in the needed
+subdirectory structure.
+
+@strong{Note}: Do not change the subdirectory structure of the extracted archive -
+this will prevent ECB from working correctly!
+
+@item Install and setup ECB
+
+See @ref{Installation}.
+
+@item Start ECB
+
+ECB will perform some requirements checks, especially for CEDET.
+@strong{Remark}: By setting the option @code{ecb-version-check} to
+@code{nil} you can prevent ECB from checking correct versions of CEDET but
+it's strongly recommended not to do this!
+
+@item (Optional) Download and install a newer version of CEDET
+
+If the version-check in (4) fails then you have to install a newer version of
+CEDET which fulfill the version-number ECB reports to you after its version
+check.
+
+See the instruction of CEDET how to do this. You will find CEDET at
+@ifhtml
+@uref{http://cedet.sourceforge.net}
+@end ifhtml
+@ifnothtml
+@url{http://cedet.sourceforge.net}
+@end ifnothtml
+
+For setting up CEDET see @ref{Setting up CEDET/semantic}.
+
+If you have installed a new CEDET-version you @strong{MUST} re-byte-compile
+ECB unless you run ECB not byte-compiled!
+
+@end enumerate
+
+@node Auto. option-upgrading, , Downloading new versions, Upgrading
+@section Automatic upgrading of options
+
+@menu
+* User interface::              Options and commands you should know
+* Background information::      Maybe some interesting informations
+@end menu
+
+@node User interface, Background information, Auto. option-upgrading, Auto. option-upgrading
+@subsection User interface for option-upgrading
+
+There are two interactive commands (@pxref{Interactive ECB commands}):
+
+@itemize @minus
+@item @code{ecb-upgrade-options}:
+Does all necessary beginning with a incompatibility-check for all
+options, upgrading/resetting incompatible options and ending with the
+display of all upgraded or reset options.
+
+@item @code{ecb-display-upgraded-options}:
+Displays an information-buffer which options have been upgraded or
+reset. Offers two buttons where the user can decide if the upgraded
+options should also being saved by ECB for future settings or if the
+buffer should be killed.
+@end itemize
+
+If the option @code{ecb-auto-compatibility-check} has a non-nil value
+(which is the default) then ECB does all this stuff automatically at
+startup. This is very recommended!
+
+If you are interested in some background information, read
+@ref{Background information}!
+
+@node Background information, , User interface, Auto. option-upgrading
+@subsection Background information
+
+Big packages like ECB will be enhanced and developed continuously so
+sometimes a new version must be released. Such packages offer in
+general a lot of customizable options so probably some of these
+options change the type or are renamed because the old type and/or
+name of the option makes no sense in the new release.
+
+Especially options which have changed the type of their value are now
+a problem for the user which want to upgrade to the latest
+ECB-version: If the user has saved a certain value for option X in its
+file @file{.emacs} but the type of this saved value doesn't match the
+new defined type in the defcustom-form after an ECB-upgrade then there
+can occur serious problems like ECB can not be started anymore or even
+Emacs can not be started without errors.
+
+Until now there was only one way to fix these problems: The user must
+manually edit his file @file{.emacs} and remove all entries for
+options which have now another type. After this and after restarting
+Emacs the new default-values of the type-changed options in the new
+ECB-release are active and the user can go on using Emacs and ECB. But
+this approach to fix the incompatible-option-problem has two serious
+drawbacks:
+
+@enumerate
+@item
+The user must manually edit the customize-section in his file
+@file{.emacs}. This should normally not be done and if then only by
+old-handed Emacs-users.
+
+@item
+The customized value of the option X in the old-release (with the old
+type) is lost because after removing the related entry from the
+file @file{.emacs} the new default-value is active, so the user must
+re-customize the option X.
+@end enumerate
+
+OK, this is one half of the option-upgrade-problem but a new ECB-release
+can also rename a option from name X to name Y because the new name Y makes
+much more sense and/or is more mnemonic. If only the name has changed but
+not the type this is not a serious problem like above but also annoying
+because the customized value of the old-option X takes no effect in the new
+release but instead the default-value of the new-option Y is now active.
+But nevertheless this problem has the drawback number 2 (see above).
+
+The last category of upgrade-problems is a renamed option which has also
+changed its type.
+
+@noindent
+ECB has a solution for all these problems:
+
+@itemize @bullet
+
+@item
+It checks all customized values of all ECB-options if they are still
+type-compatible. If not then it tries to upgrade the old-value to the
+new value-type and if this is not possible then it resets the option
+to the new default value and offers then to store it via customize in
+the .emacs-file (or in any file which is used for customized options).
+But ECB does not touch any customization-file without asking the user!
+
+@item
+It offers a special constant @code{ecb-upgradable-option-alist} which
+allows the ECB-maintainers to define special transformings for renamed
+options so even the value of an old-option X can be savely transformed
+to the new-option Y and the old setting is not lost.
+@end itemize
+
+All these checks and transformings are done at beginning of activating
+ECB - if the option @code{ecb-auto-compatibility-check} is not nil. If
+ECB has recognized incompatible or renamed options it does its
+upgrading/reseting-job so all ECB-options have correct types so ECB
+can start correct. After ECB is started it displays a list of all
+upgraded or reseted option with their old and new values.
+
+
+@node Common use-cases, Elisp programming, Upgrading, Top
+@chapter Handling of common use-cases
+
+@c TODO: Move some section to the Usage-chapter!!
+
+This chapter lists some common (and also some non-common) use-cases of ECB and
+gives a detailed description for each one. This contains also some tips and
+tricks how to deal best with some situations.
+
+@menu
+* Changing faces::              Changing faces in the ECB tree-buffers
+* Small screens::               Working with small screens
+* Big screens::                 Working with big screens
+* Simulating speedbar::         Simulating speedbar without an extra frame
+* Integrating speedbar::        Integrating speedbar in the ECB-frame
+* Large directories::           Working with large directories
+* Remote directories::          Working with remote directories
+* Version-control support::     Supporting Version control systems
+* Using eshell::                Optimal using of eshell in ECB
+* Grepping directories::        Grepping directories with ECB
+* Working with JDEE::           Working best with ECB and JDEE
+* Compile-window on demand::    Displaying the compile-window on demand
+* Non-semantic sources::        Parsing and displaying non-semantic sources
+* Hide-show::                   Using hide-show from the methods-buffer-menu
+* Window-managers and ECB::     Support of several Emacs-window-managers
+* Virtual folders in History::  Simulating something like virtual folders
+@end menu
+
+@node Changing faces, Small screens, Common use-cases, Common use-cases
+@section Changing faces in the ECB tree-buffers
+
+@cindex Faces
+There are two basic faces:
+
+@itemize @bullet
+@item @code{ecb-default-general-face}:
+Basic face for displaying an ECB-tree-buffer.
+
+It“s recommended to define the font-family, the font-size, the basic
+color etc. with this face.
+
+In GNU Emacs 21.X all faces (even the face
+@code{ecb-default-highlight-face}) used in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a face used in a tree-buffer can be very easily changed with
+face @code{ecb-default-general-face}.
+
+With XEmacs there is no inheritance-feature but the options
+@code{ecb-directories-general-face}, @code{ecb-sources-general-face},
+@code{ecb-methods-general-face} and @code{ecb-history-general-face}
+offer the choice to use the face @code{ecb-default-general-face} so
+also with XEmacs the basic face-settings can be easily changed just by
+customizing the face @code{ecb-default-general-face}.
+
+@item @code{ecb-default-highlight-face}:
+Basic face for highlighting the current node in an ECB-tree-buffer.
+
+In GNU Emacs 21.X all highlighting faces used in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a highlighting face used in a tree-buffer can be very easily
+changed with face @code{ecb-default-highlight-face}.
+
+With XEmacs there is no inheritance-feature but the options
+@code{ecb-directory-face}, @code{ecb-source-face},
+@code{ecb-method-face} and @code{ecb-history-face} offer the choice to
+use the face @code{ecb-default-highlight-face} so also with XEmacs the
+basic face-settings can be easily changed just by customizing the face
+@code{ecb-default-highlight-face}.
+
+@end itemize
+
+With these faces you can change the basic attributes easily and fast
+for ALL ECB-tree-buffers. But you are also able to display each
+ECB-tree-buffer with different faces, see the different options for
+every tree-buffer mentioned above.
+
+@strong{Please note} (only for XEmacs users): Cause of the lack of the
+font-inheritance feature using ONE other font for the ECB-methods
+buffer can NOT be achieved just by setting
+@code{ecb-methods-general-face} to @code{ecb-default-general-face} and
+changing the font of this default face. In addition you have to set
+the same font also for the face @code{ecb-bucket-node-face} like in
+the following example:
+
+@example
+(defconst my-ecb-font
+          "-outline-Courier-normal-normal-13-97-96-96-c-*-iso8859-1")
+(set-face-font 'ecb-default-general-face my-ecb-font)
+(set-face-font 'ecb-bucket-node-face my-ecb-font)
+@end example
+
+This code sets the new defined font @code{my-ecb-font} as font for
+all@footnote{Of course @code{ecb-directories-general-face},
+@code{ecb-sources-general-face}, @code{ecb-methods-general-face} and
+@code{ecb-history-general-face} must be set to
+@code{ecb-default-general-face}!} ECB-tree-buffers (incl. the methods
+buffer).
+
+@node Small screens, Big screens, Changing faces, Common use-cases
+@section Working with small screens
+
+@cindex Small screen
+If your screen is very small so you need every square-centimeter for
+displaying the buffer which you want to edit, ECB offers you a special
+layouts, where only the ECB-methods buffer is displayed on top or on
+left-side. Here comes what you should/can do to work best with ECB in
+such a situation:
+
+@itemize @bullet
+@item First customize your ECB:
+
+@enumerate
+@item
+Customize @code{ecb-layout-name} to layout-name ``top2'' (on top) or
+``left9'' (on left-side)
+
+@item
+Ensure that @code{ecb-compile-window-height} is nil.
+
+@item
+Optional: Adjust the @code{ecb-windows-height} rsp. @code{ecb-windows-width}.
+
+@item
+Save your changes.
+@end enumerate
+
+@item To edit your buffers:
+Call @code{ecb-toggle-ecb-windows} (also available via the menu ``ECB'' and
+by @kbd{C-c . lw}) or @code{ecb-hide-ecb-windows} to hide the ECB-method buffer
+so you get all the place of your screen for editing.
+
+@item To browse and select functions:
+Call @code{ecb-toggle-ecb-windows} or @code{ecb-show-ecb-windows} to
+make the ECB-method buffer visible if not already. If you want select
+a method/variable with the keyboard instead with the mouse you should
+read the section @ref{Using the keyboard} in this online help!
+@end itemize
+
+The possibility of hiding temporally the ECB windows like described
+above is also useful for all the other layouts.
+
+
+@node Big screens, Simulating speedbar, Small screens, Common use-cases
+@section Working with big screens
+
+ECB offers a layout type ``left-right'' with special ECB-tree-windows
+on the left and right side of the edit-area. The layouts
+``leftright1'' and ``leftright2''are examples for this layout type.
+See @ref{Creating a new ECB-layout} and @ref{The layout-engine}
+for details about how to create or program more layouts of this type.
+
+Such a layout is eventually the best choice for big screens because
+the several ECB-tree-windows are bigger and can display more
+informations without scrolling.
+
+With such a layout it can could be senseful to reduce the value of the
+option @code{ecb-windows-width} compared to layouts of type left or
+right. A value of max. 0.25 should be enough.
+
+@node Simulating speedbar, Integrating speedbar, Big screens, Common use-cases
+@section Simulating speedbar without an extra frame
+
+@cindex Speedbar
+You can simulate a speedbar-like layout within ONE frame by doing the
+following:
+
+@enumerate
+@item
+Customize @code{ecb-layout-name} to layout name ``left9'', ``left12'',
+``left13'' or ``left14'' dependent to what you like.
+
+@item
+Optional: Ensure that @code{ecb-compile-window-height} is nil.
+
+@item
+Optional: Adjust the @code{ecb-windows-width}.
+
+@item
+Optional: Customize @code{ecb-toggle-layout-sequence} and toggle very fast
+between several layouts by @code{ecb-toggle-layout}. See the doc-strings!
+
+@item
+Optional: Customize @code{ecb-show-sources-in-directories-buffer} to
+not nil if the chosen layout (see 1. and 4.) contains a
+directories-tree-buffer.
+
+@item
+Save your changes.
+@end enumerate
+
+But not only simulating speedbar is possible but also full integrating
+it into the ECB and the ECB-frame, @xref{Integrating speedbar}.
+
+@node Integrating speedbar, Large directories, Simulating speedbar, Common use-cases
+@section Integrating speedbar in the ECB-frame
+
+It is very easy to integrate speedbar into ECB. There are two
+different ways to do this:
+
+@enumerate
+@item
+You can either use speedbar in the directories-, sources- or
+methods-window of ECB instead of the built-in directory-, sources- or
+methods-browser of ECB. This can be done via the option
+@code{ecb-use-speedbar-instead-native-tree-buffer}.
+
+@item
+Or you can integrate an extra speedbar-window into a layout
+independent of the existence of a directory-, sources- or
+methods-window. For this you can either use the built-in layout
+``left-dir-plus-speedbar'' or you have to create your own layout
+interactively with the command @code{ecb-create-new-layout}. This way
+is not described in more details because there is nothing more to
+describe - just create your layout.
+@end enumerate
+
+In general integrating speedbar into the ECB-frame makes sense for
+people...
+
+@itemize @bullet
+@item
+...who like the speedbar way of handling directories and source-files
+but also like the ECB-way of displaying the buffer-contents (like
+methods and variables in a source-file). This people should use the
+option @code{ecb-use-speedbar-instead-native-tree-buffer} and set it
+to @code{dir}.
+
+@item
+...who like the speedbar way of browsing things like directories,
+files, file-contents etc. but who dislike the extra speedbar-frame.
+@end itemize
+
+Note: It is not necessary to integrate speedbar if you only want
+parsing sources not supported by semantic. From version 1.94 on ECB
+supports native parsing and displaying of such sources
+(@pxref{Non-semantic sources})!
+
+Regardless the group you belong, with the speedbar-integration feature
+of ECB you can combine both worlds, the speedbar- and the ECB-world:
+
+@enumerate
+@item Choose a layout which either contains a directories- or a
+sources-window but not both of them@footnote{Only one of them is
+needed if you use speedbar because speedbar displays directories and
+sources in one window. But if you like wasting space then you can also
+use a layout with both windows...}.
+
+Because speedbar has also display-modes for buffers and info-nodes and
+some other useful things (which can be changed by the speedbar-command
+@code{speedbar-change-initial-expansion-list} we recommend layouts
+like ``left15'' or ``leftright3'' for using with speedbar.
+
+@item Set the option
+@code{ecb-use-speedbar-instead-native-tree-buffer} to not nil. After
+this the chosen window of ECB will contain a full featured speedbar
+(the only difference to standard speedbar is not residing in an extra
+frame).
+@end enumerate
+
+Note: If you belong to the first group of people (s.a.) a similar
+effect and usability is available by setting
+@code{ecb-use-speedbar-instead-native-tree-buffer} to nil and setting
+@code{ecb-show-sources-in-directories-buffer} to not nil, because this
+combination displays also directories and sources in one window.
+
+So with the option @code{ecb-use-speedbar-instead-native-tree-buffer}
+you have the choice which way of displaying and handling ``things''
+(directories, sources, methods...) you want (the speedbar- or the
+ECB-way).
+
+During speedbar is running within ECB (i.e.
+@code{ecb-use-speedbar-instead-native-tree-buffer} is not nil) the
+speedbar-command @code{speedbar} is disabled and the speedbar-command
+@code{speedbar-get-focus} switches between the speedbar-window and the
+edit-window@footnote{The standard behavior is switching between the
+speedbar-frame and the attached frame, but this make obviously no
+sense during running speedbar with ECB.}.
+
+@strong{IMPORTANT}: ECB can only integrate speedbar-versions >=
+0.14beta1! If you use lower versions of speedbar
+@code{ecb-use-speedbar-instead-native-tree-buffer} has no effect.
+
+@node Large directories, Remote directories, Integrating speedbar, Common use-cases
+@section Working with large directories
+
+If @code{ecb-source-path} contains directories with many files and
+subdirs, especially if these directories are mounted net-drives
+(``many'' means here something > 500, dependent on the speed of the
+net-connection and the machine), actualizing the sources- and/or
+directories- buffer of ECB (if displayed in current layout!) can slow
+down dramatically. If this is a problem the contents of certain
+directories and also the contents of the sources-buffer can be cached
+which increases the speed a lot. See the option
+@code{ecb-cache-directory-contents}.
+
+IMPORTANT: The full speed-advantage of this cache-mechanism is only
+available if @code{ecb-show-sources-in-directories-buffer} is
+@code{nil}, i.e. sources of a directory are displayed in the
+ECB-sources-window. The reason is that only with a sources window the
+tree-buffer contents for the sources can be cached (i.e. the
+buffer-content of the ECB-sources-window) whereas with sources
+displayed in the directories buffer only the disk-contents of a
+directory are cached - which increases speed too but not so much as
+with sources displayed in the extra window ECB-sources.
+
+The cache of a directory can be only refreshed by a POWER-click (with
+mouse or keyboard) onto the related directory-node in the
+directories-buffer of ECB (@pxref{Using the mouse}).
+
+See also the option @code{ecb-cache-directory-contents-not}. Here are
+some useful settings for both of these options:
+
+@itemize @bullet
+@item Cache all directories with more than 500 entries:
+Set @code{ecb-cache-directory-contents} to ((``.*'' . 500)) and set
+@code{ecb-cache-directory-contents-not} to nil.
+
+@item Cache only all directories > 200 beginning with /usr/
+Set @code{ecb-cache-directory-contents} to ((``^/usr/.*'' . 200)) and
+set @code{ecb-cache-directory-contents-not} to nil.
+
+@item Cache all directories > 500 but NOT these beginning with /usr/:
+Set @code{ecb-cache-directory-contents} to ((``.*'' . 500)) and set
+@code{ecb-cache-directory-contents-not} to (``^/usr/.*'').
+@end itemize
+
+Another way for getting a faster overlook for large directories with
+many source-entries is to apply an online-filter to the
+sources-buffer. This can be done via the command
+@code{ecb-sources-filter} or via the popup-menu of the sources-buffer.
+
+@node Remote directories, Version-control support, Large directories, Common use-cases
+@section Working with remote directories
+
+The term ``remote'' means directories which are remote in the sense of
+TRAMP@footnote{TRAMP stands for 'Transparent Remote (file) Access,
+Multiple Protocol'. This package provides remote file editing, similar
+to ANGE-FTP.}, ANGE-FTP@footnote{This package attempts to make
+accessing files and directories using FTP from within Emacs as simple
+and transparent as possible.} or EFS@footnote{A system for transparent
+file-transfer between remote hosts using the FTP protocol within
+Emacs}. Each of these Emacs-addons is intended to make editing
+directories and files on remote machines as transparent as possible.
+
+@subsection General remarks
+
+ECB supports such remote directoires out of the box and completely
+transparently, i.e. you can add remote directories to the option
+@code{ecb-source-path} without any restriction. ECB will handle these
+directories transparently with the appropriate tool - either TRAMP,
+ANGE-FTP or EFS. So when  working with such a remote directory is
+possible without ECB it will be possible too with active ECB - at
+least as long you are ``connected''!
+
+@strong{Caution}: Suppose you have added a remote dir (e.g.
+``user@@host.at.a.server:/dir/'') to @code{ecb-source-path} and you
+start ECB when you are offline, means there can be no connection
+established to the remote computer (e.g. ``host.at.a.server''). Each
+time ECB has to process a remote path ECB pings via the ping-program
+the remote host (in the example above it would ping the host
+``host.at.a.server'') to test if it is accessible. If not then this
+path will be ignored by ECB@footnote{This avoids long lasting and
+annoying blocking of ECB when a remote-path is not accessible: Without
+a ping ECB would always try to open this directory through the
+appropriate library (e.g. TRAMP) and it would depend on the
+timeout-mechanism of this library (e.g. TRAMP has 60 seconds) how long
+ECB would be blocked. First after this timeout ECB could start
+working! A fast ``pre''-ping avoids this problem!}. Ensure that ECB
+calls your ping-program (see @code{ecb-ping-program}) with the right
+options (see @code{ecb-ping-options}). To avoid to many pings to the
+same host ECB caches the ping result so there should be no performance
+decrease. But to ensure still correct accessible-results and to avoid
+using outdated cache-results ECB discards the cached value of the
+accessible-state of a certain host after a customizable time-interval
+(please read the documentation of
+@code{ecb-host-accessible-check-valid-time}!).
+
+
+@subsection Excluding remote directories from time-consuming tasks
+
+ECB performs some tasks stealthily and interruptable by the user (see
+the option @code{ecb-stealthy-tasks-delay} for additional
+explanations) because these tasks are time-consuming and could
+otherwise ECB block. Especially for remote directories these special
+tasks can cause annoying blocks of Emacs (@pxref{Stealthy background
+tasks}).
+
+Therefore it is probably the best to switch on each of the stealthy
+tasks with the @code{unless-remote} which is the default activation
+(@pxref{Stealthy background tasks}). So a certain stealthy task will
+be swtiched on for all local directories (and also for all mounted
+drives in the LAN) but not for real remote directories used via TRAMP,
+ANGE-FTP or EFS.
+
+@subsection Caching the contents of remote directories
+
+ECB caches per default the contents of remote directories to avoid
+annoying delays. The cache is done via the option
+@code{ecb-cache-directory-contents} which contains an entry which
+covers the syntax of remote directories. If you do not want this
+caching (which is strongly recommened) you have to remove this entry
+from this option.
+
+@node Version-control support, Using eshell, Remote directories, Common use-cases
+@section Supporting Version control systems
+
+Beginning with version 2.30 ECB supports Version-control systems (in
+the following named VC-systems). This means the special tree-buffers
+of ECB display files managed by a VC-system with an appropriate
+image-icon@footnote{Of course only when Emacs is capable to display
+images; otherwise a suitable ascii-icon will be displayed.} in front
+of the filename.
+
+The following four options allow full control over this feature (see
+also @ref{ecb-version-control}:
+
+@table @code
+@item ecb-vc-enable-support
+Enable or disable this feature.
+@item ecb-vc-supported-backends
+The most important option for this feature. Allows to specify how ECB
+should test if a directory is managed by a VC-system (how to identify
+the VC-backend of a directory) and - if yes - how it should check the
+VC-state of a certain file. The former ones are called
+@dfn{identify-backend-functions} and the latter ones
+@dfn{check-state-functions}.
+@item ecb-vc-directory-exclude-regexps
+Allows excluding certain directories (on a regexp-basis) from the
+VC-support even if they are managed by a VC-system.
+@item ecb-vc-state-mapping
+Defines the mapping between the state-values returned by a
+check-state-function (a function set in
+@code{ecb-vc-supported-backends} and used for getting the VC-state of
+a file, e.g. @code{vc-state}) and the allowed state-values ECB can
+understand.
+@end table
+
+Probably the default settings will fit your needs but to get sure you
+should carefully read the documentation of these options!
+
+The following subsection give you important informations about
+identify-backend-functions, check-state-functions, about working with
+remote repositories.
+
+@menu
+* Identifying backends::        How ECB identifies the VC-backend of a dir
+* Checking the state::          How ECB checks the VC-state of a file
+* Remote repositories::         What you should know about this
+* Refreshing the VC-state::     How to refresh when state changed outside
+* Adding new backends::         Necessary steps for adding new backends
+* Known VC-problems::           Currently known problems of the VC-support
+@end menu
+
+@node Identifying backends, Checking the state, Version-control support, Version-control support
+@subsection How ECB identifies the VC-backend of a dir
+
+ECB tries all functions added as identify-backend-funtions to the
+option @code{ecb-vc-supported-backends} until one of them returns not
+@code{nil} but a symbol which identifies the backend (e.g.
+@code{CVS}). After this check ECB stores the result of this check
+(i.e. either the identified backend or the fact that the directory is
+not managed by a VC-system) for that directory in a special cache, so
+the identify-backend-process will be performed only once per
+directory. If for a directory a VC-backend could be identified ECB
+stores not only the backend itself for that directory but also the
+associated check-state-function defined in
+@code{ecb-vc-supported-backends} (@pxref{Checking the state}).
+
+You can add arbitrary functions to this options as long as they get one
+directory-argument and return either nil or a backend-symbol. Per default ECB
+offers the following functions to identify the VC-backend CVS, RCS, SCCS, Git,
+Monotone or Subversion@footnote{For this the most recent version of the VC-package
+(incl. the libraries vc-git.el, vc-mono.el and vc-svn.el) is needed - as
+contained in Emacs >= 22 and XEmacs >= 21.4.22}:
+
+@table @code
+@item ecb-vc-dir-managed-by-CVS DIRECTORY
+Return @code{CVS} if DIRECTORY is managed by CVS. nil if not.
+
+@item ecb-vc-dir-managed-by-RCS DIRECTORY
+Return @code{RCS} if DIRECTORY is managed by RCS. nil if not.
+
+@item ecb-vc-dir-managed-by-SCCS DIRECTORY
+Return @code{SCCS} if DIRECTORY is managed by SCCS. nil if not.
+
+@item ecb-vc-dir-managed-by-MTN DIRECTORY
+return @code{MTN} if directory is managed by Monotone. nil if not.
+
+@item ecb-vc-dir-managed-by-GIT DIRECTORY
+Return @code{GIT} if directory is managed by Git. nil if not.
+Because with Git only the top-most directory of a source-tree has a subdir
+.git this function tries recursively upwards if there is a .git-subdir.
+
+@item ecb-vc-dir-managed-by-SVN DIRECTORY
+Return @code{SVN} if DIRECTORY is managed by Subversion. nil if not.
+Returns always nil if the library vc-svn.el can not be found.
+
+@end table
+
+If ECB should support another VC-backend than CVS, RCS, SCCS, Monotone, Git or
+Subversion you have to write your own identify-backend-funtion for the used
+VC-backend (e.g. Clearcase)!
+
+@node Checking the state, Remote repositories, Identifying backends, Version-control support
+@subsection How ECB checks the VC-state of a file
+
+After ECB has identified the VC-backend of a directory it will display
+the VC-state (e.g. up-to-date, edited, needs-mergs etc...) with a
+suitable image-icon in the tree-windows of the ECB-file-browser. To
+get this state for a certain file ECB uses that check-state-function
+stored in the cache for the directory of that file (@pxref{Identifying
+backends}).
+
+You can add any arbitrary functions as check-state-function to
+@code{ecb-vc-supported-backends} as long as they get one
+filename-argument and return a state-symbol (e.g. @code{up-to-date}.
+ECB can understand a certain set of state-values which are then
+mapped to suitable image-icons which will in turn be displayed in
+front of the filename in the file-browser. Because the values a
+check-state-function return can differ from that state-values ECB
+understands, ECB offers an option to define a appropriate
+state-mapping. The name of this option is @code{ecb-vc-state-mapping}.
+See the documentation of this option to get a list of all state-value
+ECB understands.
+
+Per default ECB uses the function @code{vc-state} of the
+VC-package@footnote{The VC-package of Emacs offers a standardised and uniform
+interface for several backends; per default CVS, RCS, SCCS, Subversion, Git
+and Monotone are supported by the VC-package.} to check the state for the
+backends CVS, RCS, SCCS, Subversion, Git and Monotone. So the default-value of
+@code{ecb-vc-state-mapping} contains a mapping between these values
+@code{ecb-vc-state} can return and that state-values ECB understands.
+
+If ECB should support other VC-backends than CVS, RCS, SCCS, Monotone, Git and
+Subversion (e.g. Clearcase) you should add that new backend to the VC-package
+(see the initial comments of vc.el how to do this) then ECB will automatically
+support that new backend. Alternatively it may be sufficient if you write your
+own check-state-function for this backend and add the needed mapping to
+@code{ecb-vc-state-mapping} if necessary.
+
+@subsubsection Getting heuristic state-values or real ones for a backend
+
+The interface of Emacs' VC-package offers two different ways to
+get the VC-state of a file:
+
+@itemize @bullet
+@item The real, fresh and expensive approach
+
+VC has a function @code{vc-recompute-state} which always performs a real
+backend command (e.g. ``cvs status'' for CVS) to get a fresh and real state
+for a file. As you can imagine this operation can be very expensive and long
+lasting depending on the location of the repository. But for CVS the
+CVS-backend of VC offers with the option @code{vc-cvs-stay-local} a way to
+tell Emacs to stay local even for the sake of getting a real
+state@footnote{For other backends you have to check the VC-manual if there is
+equivalent option}.
+
+ECB offers @code{ecb-vc-recompute-state} for this approach which is an alias
+for @code{vc-recompute-state}.
+
+@item The heuristic approach:
+
+The function @code{vc-state} always returns a ``heuristic'' state
+which should be used when a fresh and real state is not necessary.
+With @code{vc-state} the option @code{vc-cvs-stay-local} will never
+take effect.
+
+ECB offers @code{ecb-vc-state} for this approach - see below for the
+difference between @code{vc-state} and @code{ecb-vc-state}.
+@end itemize
+
+Example CVS:
+
+VC/CVS actually does it this way (regardless if ECB is active or
+not): When you visit a file, it always uses just the heuristic to get the
+state (comparing file times), regardless of the setting of
+@code{vc-cvs-stay-local}. This is because the "fresh-but-slow" state is
+determined by calling "cvs status" on the file, and this was deemed
+unacceptably slow if done at visiting time under any conditions.
+
+The state is updated by calling @code{vc-recompute-state} prior to
+@code{vc-next-action} (C-x v v) which either checks a file in or out.
+IF @code{vc-cvs-stay-local} is nil, then this does in fact call "cvs
+status" to get the "fresh-but-slow-state", but if
+@code{vc-cvs-stay-local} is t, then it just compares the file times
+again.
+
+But under certain conditions (e.g. if called for files not already
+visited or for files their VC-state has been changed from outside
+Emacs, e.g. by checking in the file via command line) @code{vc-state}
+does not compute a new heuristic state but returns a cached one
+(cached by the VC-package itself not by ECB) which does not reflect
+the current VC-state. Example: if you have edited a file within Emacs
+and then checked in from outside Emacs @code{vc-state} returns a wrong
+state until you call @code{revert-buffer} for this file. Therefore ECB
+offers the check-state-function @code{ecb-vc-state} which does the
+same as @code{vc-state} but it clears the internal caches of the
+VC-package for that file before calling @code{vc-state}.
+
+The bottom line for you is this: If you use @code{ecb-vc-state} in
+@code{ecb-vc-supported-backends} to get the version control state, then you
+get the same policy that VC uses and you get always a ``correct'' heuristic
+state (as correct as possible a heuristic state can be). There should no harm
+if you use @code{ecb-vc-recompute-state} (which is an alias for
+@code{vc-recompute-state}) as a replacement function if you want to get fresh
+and real state-values, but then (a) you must make sure to set
+@code{vc-cvs-stay-local} to nil, and (b) fetching the state over the network
+under all conditions was deemed unacceptably slow in VC.
+
+@node Remote repositories, Refreshing the VC-state, Checking the state, Version-control support
+@subsection Important informations about remote repositories
+
+At least CVS can be used in a mode called ``Client/Server'' which
+means the root repository is located on a remote machine. We call a
+repository which can not being mounted by the client-machine (which
+contains the working directory) a @dfn{remote repository}. In most
+cases getting the fresh and real VC-state for such repositories will
+be unacceptable slow or often users will work offline means with no
+connection available to the remote host. To avoid problems like these
+ECB offers first an option @code{ecb-vc-directory-exclude-regexps} to
+exclude such directories with a remote repository from the VC-support
+of ECB and secondary the identify-backend-funtion
+@code{ecb-vc-dir-managed-by-CVS} behaves smart with that respect
+(@pxref{Identifying backends}). See also
+@code{ecb-vc-xemacs-exclude-remote-cvs-repository}!
+
+@subsubsection Remote paths and the VC-support of ECB
+
+ECB supports working with remote directories like TRAMP- or
+EFS-directories (@pxref{Remote directories}). Do not confuse remote
+directories with remote repositories. A local directory located on
+your disk and set in @code{ecb-source-path} can have a remote
+repository if managed by a VC-system. A remote directory means a path
+in the format of TRAMP, ANGE-FTP or EFS set in @code{ecb-source-path}.
+Its very likely that getting the VC-state of files contained in such a
+remote directory would be extremly expensive and therefore ECB would
+be blocked quite long even if the VC-check is performed stealthy
+(@pxref{Stealthy background tasks}).
+
+To avoid problems with such remote directories ECB prevents per
+default such directories from being processed by the VC-support of
+ECB. But if a user is dying to having the VC-state being displayed in
+the tree-buffers ECB offers two ways to switch on the VC-support - see
+the option @code{ecb-vc-enable-support}: This option is set per
+default to the value @code{unless-remote} which means remote paths
+will not be processed but it can be set to @code{t} which means
+process all directories regardless if remote or not. It's strongly
+recommended to use @code{unless-remote}!
+
+@node Refreshing the VC-state, Adding new backends, Remote repositories, Version-control support
+@subsection How to refresh ECB-state-display when changed outside
+
+If all actions concerning version controlling of a file are performed
+within Emacs with commands offeres by VC then the displayed state for
+such a file in the tree-buffers of ECB will be always correct - in
+that sense that ECB will always display that state which the
+check-state-function for the file will return. At least with GNU Emacs
+for the backends CVS, RCS, SCCS and Subversion this will be true. With
+XEmacs only for CVS. For other backends see @ref{Adding new backends}.
+
+But if the VC-state of a file will be changed outside of Emacs
+(unfortunately PCL-CVS must be called ``outside'' too because PCL-CVS
+doesn't use the functions of the VC-package of Emacs for checking-in
+or -out) then ECB can not automatically recognize this and therefore
+it can not aurtomatically update the displayed state-image-icon. You
+have to tell ECB for which files in the tree-buffers the VC-state
+should be recomputed. This can be done via the popup-menus of the
+ECB-tree-buffers - The following popup-commands are offered in the
+submenu ``Version Control'':
+
+@table @asis
+@item ECB-directories-buffer (if sources are displayed within):
+``Recompute state for file'' and ``Recompute state for dir'' whereas
+the latter one recomputes the VC-state for all files of that directory
+the file belongs.
+@item ECB-sources-buffer
+``Recompute state for file'' and ``Recompute state for dir'' whereas
+the latter one recomputes the VC-state for all files currently
+displayed in the sources-buffer.
+@item ECB-history-buffer
+``Recompute state for file'' and ``Recompute state for whole history''
+whereas the latter one recomputes the VC-state for all file-entries currently
+displayed in the history-buffer.
+@end table
+
+@strong{Caution}: The state will only recomputed right under all
+situations if you use either @code{ecb-vc-state} or
+@code{vc-recompute-state} as check-state-function in
+@code{ecb-vc-supported-backends} (@pxref{Checking the state}).
+
+Of course all these commands update the VC-state in all visible
+tree-buffers the file is currently displayed (e.g. often a file is
+displayed in the sources- and the history-buffer)!
+
+For general informations about the usage of popup-menus in ECB see
+@ref{Using the mouse} (subsection ``The right mouse button'').
+
+In addition to these popup-commands using the POWER- rsp. Shift-click
+(@pxref{Using the mouse}) onto a directory in the directory-window of
+ECB refreshes the VC-state-values of all files contained in this
+directory too.
+
+@node Adding new backends, Known VC-problems, Refreshing the VC-state, Version-control support
+@subsection Necessary steps and informations for adding new backends
+
+There are mainly three necessary steps for adding a new@footnote{i.e.
+not already supported by the VC-package because all these backends are
+automatically supported by ECB too!} backend BE which should be
+supported by ECB:
+
+@enumerate
+@item Adding an identify-backend-function to @code{ecb-vc-supported-backends}
+ECB needs a function how to identify the new backend BE for a certain
+directory. If there exists already a library (other then VC)
+supporting this backend then this library propably contains already
+such a function which can be used or can be used at least with a small
+elisp-wrapper. If no elisp-library for backend BE exists then you have
+probably write the full identify-backend-function for your self. This
+function has to be added to @code{ecb-vc-supported-backends}.
+
+@item Adding an check-state-function to @code{ecb-vc-supported-backends}
+Associated to the new identify-backend-function mentioned in step 1 a
+new check-state-function is needed which can be used by ECB to get the
+VC-state for a file. See @ref{Checking the state} for a description
+about the needed interface of such a function. In combinatio with the
+identify-backend-function from step 1 this function has to be added to
+@code{ecb-vc-supported-backends}.
+
+@item Enabling automatic state-update after checkin/out
+
+This step is not essential if you do not need the displayed VC-state
+automatically updated after a checkin/out of a file via the commands
+available for backend BE (e.g. clearcase.el offers for the backend
+Clearcase elisp-commands to checkin and checkout a file which then
+should also update the displayed state in the ECB-tree-buffers. All
+you need is a way to tell these commands that they should clear the
+ECB-VC-cache for the file and then restart the ECB-VC-check-mechanism.
+This should be done after these commands have finished their original
+job.
+
+ECB enables this per default for all backends supported by the
+VC-package with the following code. Maybe this is a good starting
+point.
+
+@example
+@group
+(defvar ecb-checkedin-file nil
+  "Stored the filename of the most recent checked-in file. Is only set by the
+after-advice of `vc-checkin' and `ecb-vc-checkin-hook' \(resets it to nil).
+Evaluated only by `ecb-vc-checkin-hook'.
+
+This is the communication-channel between `vc-checkin' and
+`ecb-vc-checkin-hook' so this hook-function gets the filename of the
+checked-in file.")
+
+(defadvice vc-checkin (after ecb)
+  "Simply stores the filename of the checked-in file in `ecb-checkedin-file'
+so it is available in the `vc-checkin-hook'."
+  (setq ecb-checkedin-file (ecb-fix-filename (ad-get-arg 0))))
+
+(defun ecb-vc-checkin-hook ()
+  "Ensures that the ECB-cache is reset and the entry for the most recent
+checkedin file is cleared. Uses `ecb-checkedin-file' as last checked-in file."
+  (when ecb-checkedin-file
+    (ecb-vc-cache-remove ecb-checkedin-file)
+    (ecb-vc-reset-vc-stealthy-checks)
+    (setq ecb-checkedin-file nil)))
+@end group
+@end example
+
+@end enumerate
+
+@node Known VC-problems, ,Adding new backends, Version-control support
+@subsection Currently known problems with the VC-support
+
+There are no reported problems concerning the Version Control support of ECB.
+
+@node Using eshell, Grepping directories, Version-control support, Common use-cases
+@section Optimal using of eshell in ECB
+
+@cindex eshell
+ECB offers a very smart integration of the ``eshell'' if you are using
+a compile window (@pxref{Temp- and compile-buffers})@footnote{Of
+course you can use eshell also if there is no compile-window. Then it
+is just displayed in the edit-area and there is no special
+integration.}
+
+Here is a short summary of provided features:
+
+@itemize @bullet
+@item
+Ability to jump to the eshell buffer within the compilation window by
+simply call @code{eshell} (bound to @kbd{C-c . e}). If the eshell
+isn't running it will be started.
+
+@item
+Expands the compilation window when you run commands. So for example
+it allows you to view the eshell in minimized mode and then when you
+run ``ls'' the window automatically expands (but always depending on
+the output of the command you run).
+
+@item
+Synchronizes the current directory of the eshell with the current
+buffer in the current active edit-window of ECB.
+
+@item
+Provides smart window layout of the eshell buffer. This makes sure
+that the eshell is taking up the exact amount of space and that
+nothing is hidden.
+@end itemize
+
+Here comes a detailed explanation of these features and how to use it
+(all these features are only available if you use a persistent
+compile-window, i.e. if @code{ecb-compile-window-height} is not nil):
+
+You do not have to learn a new command for the eshell-start - just
+call @code{eshell} (for convenience also bound to @kbd{C-c . e}) and
+the eshell will displayed in the compile-window of ECB (if eshell is
+not already alive then it will be started automatically).
+
+
+ECB tries to display the contents of the eshell-buffer as best as
+possible, means ECB can autom. enlarge and shrink the compile-window
+so the contents of the eshell are fitting the window. See option
+@code{ecb-eshell-enlarge-when-eshell} and
+@code{ecb-eshell-fit-window-to-command-output}. Normally this is done
+autom. but you can also you the standard compile-window
+enlarging-command of ECB: @code{ecb-toggle-compile-window-height}.
+
+ECB tries also to recenter the eshell-buffer as best as possible.
+Normally this is done autom. but you can do it on demand with the
+command @code{ecb-eshell-recenter}.
+
+If option @code{ecb-eshell-buffer-sync} is true then ECB always
+synchronizes the command prompt of eshell with the directory of
+current source-buffer of the current active edit-window.
+
+With the option @code{ecb-eshell-auto-activate} you can start eshell
+autom. in the compile-window when ECB is started but of course if a
+compile-window exists.
+
+@node Grepping directories, Working with JDEE, Using eshell, Common use-cases
+@section Grepping directories with ECB
+
+ECB offers in the popup-menus in the directories- and
+sources-tree-buffer commands for easy (recursive) grepping the current
+directory under point (directory-buffer) rsp. the current-directory
+(sources-buffer). In every case just the function of the options
+@code{ecb-grep-function} rsp. @code{ecb-grep-find-function} is called
+and the @code{default-directory} is tempor. set to the chosen
+directory so the grep will performed in this directory regardless of
+the @code{default-directory} of current buffer in the edit-window.
+
+Other smart things beyond that are not done by ECB, see also
+@code{ecb-grep-function}!
+
+So, how to exclude some subdirectories or files from the grep?
+
+Basically this has to be done with the ``-prune'' option of the
+find-utility: If the standard-grep facility of Emacs is used then this
+is not easy but with the command @file{igrep.el} there is a convenient
+way to exclude things like CVS- or RCS-directories from the find-call:
+See the variable @code{igrep-find-prune-clause} of the library
+@file{igrep.el}.
+
+@node Working with JDEE, Compile-window on demand, Grepping directories, Common use-cases
+@section Working best with ECB and JDEE
+
+ECB is completely language independent, i.e. it works with any
+language supported by semantic (e.g. C, C++, Java, Elisp etc.).
+
+But there are some special integrations for the great
+Java-Development-Environment JDEE:
+
+@itemize @bullet
+@item Displaying contents of class under point
+
+With the command @code{ecb-jde-display-class-at-point} you can display
+the contents of the class which contains the definition of the
+``thing'' at point (which can be a method, variable etc.).
+
+@item Creating new source-files
+
+The popup-menus in the directories- and the sources-buffer offer a
+command ``Create Source'' which allows easy creating new java-sources
+by calling the command @code{jde-gen-class-buffer}.
+
+@item Adding user-extensions to the popup-menus
+
+The options @code{ecb-directories-menu-user-extension} and
+@code{ecb-sources-menu-user-extension}@footnote{If you need a dynamic
+way of menu-extension then you should have a look at the options
+@code{ecb-directories-menu-user-extension-function} and
+@code{ecb-sources-menu-user-extension-function}.} allow adding often
+used JDEE-commands to the popup-menus of the directories- or
+sources-buffer. One example is to add building the project of current
+directory. Here is a function which could be added to
+@code{ecb-directories-menu-user-extension}:
+
+@example
+@group
+(defun ecb-dir-popup-jde-build (node)
+  "Build project in directory."
+  (let ((project-file 
+	 (expand-file-name jde-ant-buildfile (tree-node-get-data node))))
+    (jde-ant-build project-file "build")))
+@end group
+@end example
+
+Of course you can add entries to the option
+@code{ecb-methods-menu-user-extension} and
+@code{ecb-methods-menu-user-extension} too. 
+
+@end itemize
+
+
+
+@node Compile-window on demand, Non-semantic sources, Working with JDEE, Common use-cases
+@section Displaying the compile-window on demand
+
+If you like displaying all output of compile/grep/etc. an all
+temp-buffers like *Help*-buffers in an extra compile-window
+(@pxref{Temp- and compile-buffers}) but you dislike wasting the space
+of this compile-window if you are just editing then you can get a
+compile-window ``on demand''. Just do the following:
+
+@enumerate
+@item
+Customize @code{ecb-compile-window-height} to not nil and save it for
+future sessions. This gives you an extra compile-window at the
+bottom.
+
+@item
+Add the following to your .emacs:
+
+@example
+(add-hook 'ecb-activate-hook
+          (lambda ()
+            (let ((compwin-buffer (ecb-get-compile-window-buffer)))
+            (if (not (and compwin-buffer
+                          (ecb-compilation-buffer-p compwin-buffer)))
+                (ecb-toggle-compile-window -1)))))
+@end example
+
+This hides the extra compile-window directly after the start of ECB
+because there is no need for a compile-window at this moment. But the
+hiding will not be done if there is a compile-window and if a
+``compile-buffer'' in the sense of @code{ecb-compilation-buffer-p} is
+displayed in this compile-window. Without this additional check the
+compile-window would always be hidden after the ECB-start even when
+ECB is reactivated after a deactivation by the window-manager-support
+of ECB (@pxref{Window-managers and ECB}); but in these cases we want
+to preserve the state before deactivation as good as possible (see
+also option @code{ecb-split-edit-window-after-start}).
+
+@end enumerate
+
+This is all you have to do. Now if you run @code{compile} (or
+@code{grep} or other compile-modes) or display temp-buffers like
+*Help*-buffers then ECB autom. displays the compile-window at the
+bottom and display the output there.
+
+If you have finished with using the compile- or temp-output (e.g.
+fixing errors) then you can throw away the compile-window just by
+@code{ecb-toggle-compile-window} - ECB will reactivate it autom.
+before next compilation or help-buffer-display.!
+
+@node Non-semantic sources, Hide-show, Compile-window on demand, Common use-cases
+@section Parsing and displaying non-semantic sources
+
+ECB is mostly designed to display parsing information for files
+supported by semantic. But beginning with version 1.94 it also
+supports other parsing engines like imenu and etags, so also files not
+supported by semantic but by imenu/etags can be displayed in the
+Method-buffer of ECB. See @ref{Definition of semantic- and
+non-semantic-sources} for a description of ``semantic-sources'' and
+``non-semantic-sources''.
+
+If support of non-semantic-sources is enabled then ECB will display
+the contents of all sources which can be displayed by speedbar too.
+This comes from the fact that ECB uses speedbar-logic to parse sources
+with imenu or etags.
+
+In most cases imenu-parsing is preferable over etags-parsing because
+imenu operates on Emacs-buffers and needs no external tool and
+therefore parsing works also if current contents of a buffer are not
+saved to disk.
+
+This section describes all important aspects about parsing and
+displaying file-contents of file-types not supported by semantic but
+by imenu and/or etags.
+
+@subsection Enabling parsing and displaying of non-semantic-sources
+
+Enabling is simply done with the option @code{ecb-process-non-semantic-files}.
+
+ECB offers an option @code{ecb-non-semantic-parsing-function} to
+specify on a major-mode basis which parsing-method should be used:
+imenu or etags. Normally there should be no need to change this option
+but read the documentation of this option (@pxref{ecb-non-semantic})
+for further details.
+
+IMPORTANT:
+
+@itemize
+@item
+If imenu-parsing should be used then the option
+@code{speedbar-use-imenu-flag} must be set to not @code{nil}!
+
+@item
+If some non-semantic-sources are not parsed (i.e. there is an empty
+Methods-buffer) and you think that they should then maybe they are neither
+supported by imenu nor by etags or you have to check the options
+@code{ecb-non-semantic-parsing-function} and
+@code{speedbar-dynamic-tags-function-list} and - especially for etags -
+@code{speedbar-fetch-etags-parse-list}, @code{speedbar-fetch-etags-arguments}
+and @code{speedbar-fetch-etags-command}.
+
+@item
+Even with support for semantic-, imenu- and etags-parsing there will
+remain some file-types rsp. @code{major-modes} which are not
+parse-able, neither by semantic, imenu nor etags. This is no problem
+because these files simply have an empty Methods-buffer. But
+nevertheless you will get a message ``Sorry, no support for a file of
+that extension'' which comes from the speedbar-library and can not
+switched off. Therefore if a @code{major-mode} is known as not
+parse-able by semantic, imenu or etags it can be added to the option
+@code{ecb-non-semantic-exclude-modes} and then it will be excluded
+from being tried to parsed and this (annoying) message will not occur.
+@end itemize
+
+@subsection Automatic rescanning/reparsing of non-semantic-sources
+
+In contrast to semantic (see @code{global-semantic-auto-parse-mode})
+there is no built-in mechanism for autom. reparsing
+non-semantic-sources and then updating the contents of the
+Methods-buffer.
+
+For non-semantic-sources you have always at least to call
+@code{ecb-rebuild-methods-buffer} (bound to @kbd{C-c . r}) or saving
+the source-file (if @code{ecb-auto-update-methods-after-save} is true)
+to update the Method-buffer@footnote{Maybe future versions of ECB (>
+1.94) will offer an autom. mechanism for this.}.
+
+Depending on the parsing-mechanism the following options have to be
+switched on so ECB can rebuild the methods-buffer for
+non-semantic-sources:
+
+@itemize @bullet
+@item imenu:
+
+The imenu-option @code{imenu-auto-rescan} must be enabled and
+@code{imenu-auto-rescan-maxout} has to be set big enough to auto-parse
+big files too! But this results not directly in an autom. updated
+Method-buffer. This is first done after calling the command
+@code{ecb-rebuild-methods-buffer} or saving the source-file (if
+@code{ecb-auto-update-methods-after-save} is true).
+
+@item etags:
+
+Only if @code{ecb-auto-save-before-etags-methods-rebuild} is switched on
+the command @code{ecb-rebuild-methods-buffer} rebuilds the
+method-buffer with current source-contents. See description of this
+option for an explanation.
+@end itemize
+
+Tip: If you want to program your own real. automatic
+rescan/reparse/rebuild mechanism for non-semantic-sources you can do:
+
+Adding to @code{after-change-functions} a function F which either runs
+itself @code{ecb-rebuild-methods-buffer-for-non-semantic} or which
+adds only another function FF to an idle-timer and the function FF
+runs @code{ecb-rebuild-methods-buffer-for-non-semantic}. The latter
+approach has the advantage that the reparse/rebuild is not performed
+immediately after every change but first after Emacs is idle for a
+senseful interval (e.g. 4 seconds) after last change. Of course the
+function FF has to cancel its own idle-timer at the end, so the next
+idle-timer is first started again after the next change (i.e. by
+function F which is still contained in @code{after-change-functions}.
+
+@subsection Customizing the display of the tags
+
+For non-semantic-sources ECB uses does no special organizing of tags
+in groups and sub-tags but it completely uses the tag-hierarchy the
+imenu- and etags-parsers of speedbar return. So the displayed tag
+hierarchy can only be customized with some options speedbar offers for
+this:
+
+@code{speedbar-tag-hierarchy-method},
+@code{speedbar-tag-group-name-minimum-length},
+@code{speedbar-tag-split-minimum-length} and
+@code{speedbar-tag-regroup-maximum-length}. See the speedbar
+documentation for details about these options.
+
+With the option @code{ecb-method-non-semantic-face} you can define the
+face used for displaying the tags in the Method-buffer for
+non-semantic-sources.
+
+@code{ecb-non-semantic-methods-initial-expand} can be useful too.
+
+
+@node Hide-show, Window-managers and ECB, Non-semantic sources, Common use-cases
+@section Using hide-show from the methods-buffer-menu
+
+The popup-menu of the Methods-buffer offer two entries for either
+hiding or showing the block which is related to the selected tag
+(that tag for which the popup-menu was opened):
+
+@itemize @bullet
+@item ``Jump to tag and hide block'':
+Jumps to the tag and calls @code{hs-hide-block} from the
+hideshow-library which is shipped with (X)Emacs. After that the block
+is hidden, i.e. only the header-line of that tag (method, variable
+etc.) is visible, the rest is hidden behind the ``...''.
+
+@item ``Jump to tag and show block'':
+Jumps to the tag and calls @code{hs-show-block}. This shows the related
+hidden block if the block was hidden via @code{hs-hide-block} or the
+menu-entry ``Jump to tag and hide block'' (s.a.).
+@end itemize
+
+For this feature the library @file{hideshow.el} is used which should
+normally being included in the (X)Emacs-distribution. If this library
+is not loaded into Emacs, ECB does this automatically before the first
+call to one of these menu-entries.
+
+IMPORTANT: If in some @code{major-mode} hiding and showing does not
+work as you expect it to work then you must probably add an entry for
+this @code{major-mode} to the hideshow-variable
+@code{hs-special-modes-alist}. See the documentation of this variable
+for further details. One example of such a @code{major-mode} is
+@code{jde-mode} of the Java Development Environment JDEE; just add an
+entry for it like the already contained entries for @code{c++-mode} or
+@code{java-mode} and hiding and showing will work for you with JDEE
+too.
+
+@node Window-managers and ECB, Virtual folders in History, Hide-show, Common use-cases
+@section Support of several Emacs-window-managers
+
+@cindex winring
+@cindex escreen
+@cindex window-manager
+There are several window-managers available which offer an easy
+interface to jump between different window-configurations within the
+same frame. A window configuration is the layout of windows and
+associated buffers within a frame. There is always at least one
+configuration, the current configuration. You can create new
+configurations and cycle through the layouts in either direction.
+Window configurations are often named or numbered, and you can jump to
+and delete named rsp. numbered configurations.
+
+Without special support by ECB these window-managers would not work in
+combination with ECB!
+
+ECB currently supports the following managers:
+ 
+@itemize @bullet
+@item winring.el:
+Written by Barry A. Warsaw @email{bwarsaw@@python.org}, available at
+@ifhtml
+@uref{http://www.python.org/emacs/winring}
+@end ifhtml
+@ifnothtml
+@url{http://www.python.org/emacs/winring}
+@end ifnothtml
+
+@item escreen.el:
+Written by Noah Friedman @email{friedman@@splode.com}, available at
+@ifhtml
+@uref{http://www.splode.com/~friedman/software/emacs-lisp/#ui}
+@end ifhtml
+@ifnothtml
+@url{http://www.splode.com/~friedman/software/emacs-lisp/#ui}
+@end ifnothtml
+@end itemize
+
+@strong{IMPORTANT}: With one of these window-managers installed and
+active you can run applications like Gnus, VM or BBDB in the same
+frame as ECB! Just use different window-configurations (winring.el) or
+escreens (escreen.el) for ECB and the other applications. Especially
+with winring.el you can give every configuration a descriptive name
+like ``ECB'' or ``Gnus''; afterwards you can jump to a
+window-configuration by name!
+
+When you go back to the ECB-window-configuration (winring.el) or the
+ECB-escreen (escreen.el) with any of the special
+window-manager-commands then the state of ECB will be restored exactly
+as you have left it when going to another window-configuration rsp.
+escreen. This includes the whole splitting state of the edit-area and
+the visibilty of the ecb-windows and of the compile-window!
+
+The rest of this section describes how to enable the special
+ECB-support for these window-managers and how to use them.
+
+@subsection Enabling of the support
+
+Every support must be enabled explicitly:
+@itemize @bullet
+@item winring:
+Call @code{ecb-winman-winring-enable-support}. This @strong{MUST} be
+done @strong{BEFORE} the first call to any winring-command, so also
+before calling @code{winring-initialize}!
+
+@item escreen:
+Call @code{ecb-winman-escreen-enable-support}. This @strong{MUST} be
+done @strong{BEFORE} the first call to any escreen-command, so also
+before calling @code{escreen-install}!
+@end itemize
+
+If a window-manager-support should be enabled autom. after Emacs-start
+just put the following into your @file{.emacs}:
+
+@lisp
+@group
+(ecb-winman-winring-enable-support)
+(winring-initialize)
+
+;; or - if you like escreen more
+
+(ecb-winman-escreen-enable-support)
+(escreen-install)
+@end group
+@end lisp
+
+@subsection Usage of a window-manager in combination with ECB
+
+After enabling the support of one of the supported window-managers
+just go on as described in the commentary or introduction of the
+respective library-file(s) of the window-manager. Here is a short
+description:
+
+@itemize @bullet
+@item winring:
+First you have to define how to identify the ECB-window-configuration,
+i.e. the configuration with activated ECB. This done with the option
+@code{ecb-winman-winring-name}. There is always only one
+window-configurations with name @code{ecb-winman-winring-name}!
+
+Then run @code{winring-initialize}. If ECB is active then the
+resulting window-configuration is the ECB-window-configuration.
+Otherwise you can create the ECB-window-configuration when you first
+time call @code{winring-new-configuration} with name equal to
+@code{ecb-winman-winring-name}. In general you can run all commands of
+the winring-library. If you jump to the ECB-window-configuration then
+ECB will be autom. activated and if you leave the
+ECB-window-configuration then ECB will autom. deactivated.
+
+@item escreen:
+First you have to define how to identify the ECB-escreen
+i.e. that escreen with activated ECB. This done with the option
+@code{ecb-winman-escreen-number}. There is always only one
+escreen with number @code{ecb-winman-escreen-number}!
+
+Then run @code{escreen-install} (deactivates ECB if currently
+running). After that you can call @code{escreen-create-screen} and
+@code{escreen-goto-screen}@footnote{And of course all other
+@code{escreen-goto-*} commands!}. These commands autom. activate ECB
+if creating or selecting the escreen with number
+@code{ecb-escreen-number} (default = 1) and autom. deactivate ECB if
+leaving the ECB-escreen.
+@end itemize
+
+@subsection Disabling the support
+
+There is normally no need to do this but nevertheless it can be done
+by @code{ecb-winman-escreen-disable-support} rsp.
+@code{ecb-winman-winring-disable-support}.
+
+@node Virtual folders in History, , Window-managers and ECB, Common use-cases
+@section Something like virtual folders with the ECB-history
+
+For example, there is a large project with a huge number of files, and there
+are various tasks in this project (e.g. several different bug-fixing tasks).
+So it could be convenient to group buffers according to various tasks, or with
+other words: something like virtual folders for the buffers. It can be
+fulfiled through using indirect buffers.
+
+See the following example:
+
+@example
+task_1-aaa.pl
+task_1-bbb.c
+task_1-ccc.sh
+task_2-aaa.pl
+task_2-eee.c
+task_2-ccc.sh
+task_3-xxx.java
+task_3-ccc.sh
+@end example
+
+This means create indirect buffers@footnote{Remember the most important
+feature of indirect buffers: Changes made in one of them will immediately take
+effect in all others with the same base-buffer} with a name-part which can be
+used for grouping together buffers with same name-part (here e.g. task_1- ...
+task_3-). In the example above you would create three indirect buffers for the
+filebuffer ccc.sh because this source is needed in all three tasks, two
+indirect buffers for aaa.pl because it is needed in the task-1 and task-2 and
+so on for the rest of the buffers. Make all this indirect buffers with the
+command @code{clone-indirect-buffer}@footnote{Currently only available with
+GNU Emacs}, which creates real clones means the indirect buffers have the same
+major-mode etc. as the base-buffer (see the manual of Emas).
+
+Now remember to the option @code{ecb-history-make-buckets} which allows a.o.
+to define a list of regular expressions to bucketize the buffers of the
+history. Use this to make one bucket for each task. So in our example a value
+
+@example
+("^task_1-.+" "^task_2-.+" "^task_3-.+")
+@end example
+
+for @code{ecb-history-make-buckets} would satiesfy our needs.
+
+This option allows to define several criterias for building buckets in the
+history-buffer all the history entries are sorted in (e.g. by major-mode,
+directory, file-extension or regular expressions).
+
+After that the history-window would display something like the following:
+
+@example
+[-] [^task_1-.+]
+ |  task_1-aaa.pl
+ |  task_1-bbb.c
+ `- task_1-ccc.sh
+[-] [^task_2-.+]
+ |  task_2-aaa.pl
+ |  task_2-eee.c
+ `- task_2-ccc.sh
+[-] [^task_3-.+]
+ |  task_3-xxx.java
+ `- task_3-ccc.sh
+@end example
+
+Hopefully this example could give an impression how the combination of usage
+of indirect buffers and bucketizing the history-window can be used for
+using one sources for different sake and grouping together what belongs
+together.
+
+@node Elisp programming, Conflicts and bugs, Common use-cases, Top
+@chapter Entry points for Elisp programmers
+
+This chapter describes how ECB can be used/programmed/driven by an
+Elisp-program. This contains:
+
+@menu
+* List of variables::           Which variables an Elisp-program can use
+* List of hooks::               All available hooks
+* tree-buffer::                 Full description of the tree-buffer-library
+* Adviced functions::           How to deal with the adviced functions
+* The layout-engine::           Programming new layouts and special windows
+@end menu
+
+@node List of variables, List of hooks, Elisp programming, Elisp programming
+@section Variables for Elisp-programs
+
+Variables an Elisp-program can use beyond those ones mentioned in
+@ref{The layout-engine}:
+
+@itemize @bullet
+@item @code{ecb-source-path-functions}
+@end itemize
+
+Look at the documentation of these variables to get a description.
+
+@node List of hooks, tree-buffer, List of variables, Elisp programming
+@section Available hooks of ECB
+
+The following hooks are available:
+
+@cindex Hooks
+@itemize @bullet
+@item @code{ecb-activate-before-new-frame-created-hook}
+@item @code{ecb-activate-before-layout-draw-hook}
+@item @code{ecb-activate-hook}
+@item @code{ecb-after-directory-change-hook}
+@item @code{ecb-before-activate-hook}
+@item @code{ecb-before-deactivate-hook}
+@item @code{ecb-common-tree-buffer-after-create-hook}
+@item @code{ecb-basic-buffer-sync-hook}
+@item @code{ecb-analyse-buffer-sync-hook}
+@item @code{ecb-symboldef-buffer-sync-hook}
+@item @code{ecb-speedbar-buffer-sync-hook}
+@item @code{ecb-eshell-buffer-sync-hook}
+@item @code{ecb-deactivate-hook}
+@item @code{ecb-directories-buffer-after-create-hook}
+@item @code{ecb-hide-ecb-windows-after-hook}
+@item @code{ecb-hide-ecb-windows-before-hook}
+@item @code{ecb-history-buffer-after-create-hook}
+@item @code{ecb-methods-buffer-after-create-hook}
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item @code{ecb-show-ecb-windows-after-hook}
+@item @code{ecb-show-ecb-windows-before-hook}
+@item @code{ecb-sources-buffer-after-create-hook}
+@end itemize
+
+Look at the documentation of these hooks to get a detailed description.
+
+@node tree-buffer, Adviced functions, List of hooks, Elisp programming
+@section The library tree-buffer.el
+
+The library tree-buffer.el is an ECB-independent library written
+completely in emacs lisp and can be used also by other applications
+than ECB. But the main purpose of tree-buffer.el is to offer a small
+but powerful API to create new tree-buffers for ECB, add new
+tree-nodes to a tree-buffer and thus use such a tree-buffer to display
+arbitrary information structured by a tree.
+
+This chapter is for emacs-lisp-programmers and describes how to create
+a new tree-buffer, how to add new tree-nodes to a tree-buffer
+(includes removing and updating already existing tree-nodes) and how
+to use the offered tree-buffer- and tree-node-APIs.
+
+@menu
+* Introduction::                General description of tree-buffers
+* A new tree-buffer::           How to create a new tree-buffer
+* A new tree-node::             How to add new tree-nodes to a tree-buffer
+* Updating a tree-buffer::      How to update a tree-buffer after changes
+* Tree-buffer keybindings::     Default and customizable keybindings
+* The tree-buffer-API::         All functions for tree-buffers and -nodes
+* Do not with tree-buffer::     Things which are strictly forbidden
+* Tree-buffer How to::          Dealing with special situations
+@end menu
+
+@node Introduction, A new tree-buffer, tree-buffer, tree-buffer
+@subsection General description of tree-buffers
+
+This subchapter is a general introduction in the main concepts of a
+tree-buffer.
+
+@subsubsection What is a tree-buffer?
+
+A @dfn{tree-buffer} is meant to display certain informations (e.g. a
+directory-tree) in a tree-structure consisting of @dfn{tree-nodes}.
+Every line in a tree-buffer displays exactly one tree-node. Each node
+has exactly one parent-node and can have any arbitrary number of
+@dfn{children}-nodes. If a tree-node has no children then it is called
+a @dfn{leaf}. A tree-node contains several ``slots'' wheras the most
+important ones are the ``name'', ``displayed-name'' and ``data''. See
+@ref{A new tree-node} for a detailed explanation.
+
+The difference between a natural tree like a fir and a tree-buffer is
+that the root(-node) of a tree-buffer is not visible but only its
+children. In the example below the nodes parent-node-1 and
+parent-node-2 are the children of the invisible root-node. Each
+tree-buffer has exactly one root-node which is created automatically
+by `tree-buffer-create'.
+
+If a tree-node contains at least one child it is displayed with a
+special expand/collapse-symbol (see the example below). This symbol
+allows expanding (rsp. collapsing) the tree-node wheras expanding
+means to display the children-nodes and collapsing means to hide the
+childrens of a tree-node.
+
+Here is an example of a tree-buffer:
+
+@example
+@group
+<root-node>  ------------------------[root-node (invisible)]
+    [+] <parent-node-1>  -------.
+    [-] <parent-node-2>  -------|
+        [-] <expanded>  --------|
+            <leaf-node-1>  -----|
+            <leaf-node-2>  -----|-----[tree-nodes]
+            <leaf-node-3>  -----|
+            <leaf-node-4>  -----|
+        [+] <collapsed>  -------“
+         |
+         `-----------------[expand/collapse-symbol]
+@end group
+@end example
+     
+In most cases an action is triggered when clicking with the mouse onto
+a tree-node@footnote{Of course using the keyboard is also possible,
+see @ref{Tree-buffer keybindings}.} (e.g. clicking onto
+``leaf-node-1'' or ``parent-node-1'' in the example above). Which
+action is triggered by which key depends on what you specify at
+creation-time of the tree-buffer - see @ref{A new tree-buffer} for
+details.
+
+The creation-interface of a tree-buffer allows defining special
+popup-menus when clicking with the right mouse-button (of course also
+possible via keyboard, see @ref{Tree-buffer keybindings}) onto a
+tree-node (e.g. some senseful actions possible for directory-nodes
+like grepping this directory or performing version-control actions for
+this directory or something else).
+
+@subsubsection General recipe for a tree-buffer
+
+The following sequence of tasks is the general recipe for a
+tree-buffer beginning from creation and ending with the display.
+
+@enumerate
+@item Create the tree-buffer
+Creating a new tree-buffer has to be done with
+@code{tree-buffer-create} for non ECB-tree-buffers and with the macro
+@code{defecb-tree-buffer-creator} when the tree-buffer should be used
+as an ECB-tree-buffer, so it is an ECB-window. See @ref{A new
+tree-buffer} for all details.
+
+@item Add tree-nodes to the tree-buffer
+Adding nodes to the new tree-buffer (means make the new tree-buffer
+the current buffer and call @code{tree-node-new} for a new tree-node
+(note that a root-node for this tree-buffer has been autom. created by
+@code{tree-buffer-create}!). The first tree-node you add to a
+tree-buffer must have always the root-node (avaliable via
+@code{tree-buffer-get-root}) as parent-node. The next nodes can have
+either one of the fromerly added nodes or the root-node too. All
+tree-nodes haveing the root-node as parent will be displayed at the
+toplevel of the tree-buffer. See @ref{A new tree-node} for all
+details.
+
+@item Display the tree-buffer with current nodes and state
+When you are finished building up the tree-node-structure call
+@code{tree-buffer-update} to display the current tree-structure (again
+after making the tree-buffer the current-buffer). See @ref{Updating a
+tree-buffer} for all details.
+@end enumerate
+
+@strong{IMPORTANT}: First a call of @code{tree-buffer-update} updates
+the @strong{display} of a tree-buffer, means shows all the tree-nodes
+in an emacs-buffer! Neither creating a tree-buffer nor adding
+tree-nodes display anything; this just builds the internal
+tree-structure.
+
+@strong{IMPORTANT}: See @ref{Programming special windows} for details
+about programming ECB-windows (special windows) regardless if they
+were build as tree or not. There you can find a.o. how to
+automatically synchronizing a special window with the current
+edit-buffer.
+
+@node A new tree-buffer, A new tree-node, Introduction, tree-buffer
+@subsection How to create a new tree-buffer
+
+The creator-function for a new tree-buffer depends on the fact if the
+new tree-buffer should be used as an ECB-window or not. For a new
+ECB-window the macro @code{defecb-tree-buffer-creator} has to be
+used, otherwise the function @code{tree-buffer-create}. In the end
+both methods use @code{tree-buffer-create} because the BODY-argument
+of @code{defecb-tree-buffer-creator} must contain a call to this
+function!.
+
+This section describes all arguments of @code{tree-buffer-create}.
+
+Except the first argument @var{NAME} all arguments are key-arguments
+of the form :arg-name arg-value, so for example a call looks like
+
+@example
+(tree-buffer-create <buffer-name> :frame <frame-object> ...).
+@end example
+
+These key-arguments (all except the first argument @code{NAME}) can be
+arranged in any arbitrary order but all of them are not-optional! The
+key-arg-name is always a : followed by the lowercase version of the
+mentioned argument below (e.g. @code{FRAME} --> :frame,
+@code{MOUSE-ACTION-TRIGGER} --> :mouse-action-trigger).
+
+Here is a description of the arguments of @code{tree-buffer-create} -
+also available as docstring for this function (via @kbd{C-h f}). The
+description below contains also some examples for complex-arguments!
+
+@table @code
+
+@item @code{NAME}
+Buffername of the new tree-buffer.
+
+@item @var{FRAME}
+Frame in which the tree-buffer is displayed and valid. All
+key-bindings and interactive functions of the tree-buffer work only if
+called in @var{FRAME} otherwise nothing is done!
+
+@item @var{MOUSE-ACTION-TRIGGER}
+When a mouse-action is triggered. Allowed values:
+@code{button-release} and @code{button-press}.
+
+@item @var{IS-CLICK-VALID-FN}
+@code{tree-buffer-create} rebinds @kbd{mouse-1}, @kbd{mouse-2},
+@kbd{RET} (and @kbd{TAB}) and also in combination with shift and
+control (not with @kbd{TAB}). @var{IS-CLICK-VALID-FN} is called first
+if a node or an expand-symbol is clicked. This function is called with
+five arguments:
+
+@itemize @minus
+@item mouse-button:
+The clicked mouse-button or RET or TAB (0 = RET or TAB, 1 = mouse-1, 2
+= mouse 2)
+@item shift-pressed:
+Non nil if the SHIFT-key was pressed during mouse-click or RET.
+@item control-pressed:
+Non nil if the CONTROL-key was pressed during mouse-click or RET.
+@item meta-pressed:
+Non nil if the META-key was pressed during mouse-click or RET.
+@item tree-buffer-name:
+The buffer-name of the tree-buffer where the node has been clicked.
+@end itemize
+
+The function must return not nil iff exactly this click/hit is
+accepted. If the function returns nil then really nothing is done by
+the tree-buffer after this click/hit!
+
+Here is an example (call @kbd{C-h f} to see what it does) for this
+callback-function:
+
+@example
+@group
+(defun ecb-interpret-mouse-click (mouse-button
+                                  shift-pressed
+                                  control-pressed
+                                  meta-pressed
+                                  tree-buffer-name)
+  (if (eq mouse-button 0)
+      (list (if control-pressed 2 1) shift-pressed meta-pressed
+            'keyboard)
+    (if (and (not (eq mouse-button 1)) (not (eq mouse-button 2)))
+	nil
+      (case ecb-primary-secondary-mouse-buttons
+        (mouse-1--mouse-2
+         (if control-pressed
+             nil
+           (list mouse-button shift-pressed meta-pressed 'mouse)))
+        (mouse-1--C-mouse-1
+         (if (not (eq mouse-button 1))
+             nil
+           (list (if control-pressed 2 1) shift-pressed meta-pressed
+                 'mouse)))
+        (mouse-2--C-mouse-2
+         (if (not (eq mouse-button 2))
+             nil
+           (list (if control-pressed 2 1) shift-pressed meta-pressed
+                 'mouse)))
+        (otherwise nil)))))
+@end group
+@end example
+
+This example would be passed as parameter as follows:
+
+@example
+(tree-buffer-create "myname"
+                    :is-click-valid-fn 'ecb-interpret-mouse-click
+                    ...)
+@end example
+
+@item @var{NODE-SELECTED-FN}
+Function to call if a node has been selected. This function
+is called with the following parameters:
+
+@itemize @minus
+@item node: The selected node
+@item mouse-button (0 = RET, 1 = mouse-1, 2 = mouse 2)
+@item shift-pressed
+@item control-pressed
+@item meta-pressed
+@item tree-buffer-name
+@end itemize
+
+For the last four arguments see the description above. This function
+has to ensure that the expandable- and expanded-state of the selected
+node is correct after returning.
+
+Here is an example (call @kbd{C-h f} to see what it does) for this
+callback-function:
+
+@example
+@group
+(defun ecb-tree-buffer-node-select-callback (node
+					     mouse-button
+					     shift-pressed
+					     control-pressed
+                                             meta-pressed
+					     tree-buffer-name)
+  (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+						     shift-pressed
+						     control-pressed
+                                                     meta-pressed
+						     tree-buffer-name))
+	 (ecb-button (nth 0 ecb-button-list))
+	 (shift-mode (nth 1 ecb-button-list))
+         (meta-mode (nth 2 ecb-button-list))
+         (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard))
+         (maximized-p (ecb-buffer-is-maximized-p tree-buffer-name)))
+    ;; now we dispatch to the right action
+    (when ecb-button-list
+      (cond ((ecb-string= tree-buffer-name ecb-directories-buffer-name)
+	     (ecb-directory-clicked node ecb-button nil shift-mode
+                                    meta-mode))
+	    ((ecb-string= tree-buffer-name ecb-sources-buffer-name)
+	     (ecb-source-clicked node ecb-button nil shift-mode
+                                 meta-mode))
+	    ((ecb-string= tree-buffer-name ecb-history-buffer-name)
+	     (ecb-history-clicked node ecb-button nil shift-mode
+                                  meta-mode))
+	    ((ecb-string= tree-buffer-name ecb-methods-buffer-name)
+	     (ecb-method-clicked node ecb-button nil shift-mode
+                                 meta-mode))
+	    ((ecb-string= tree-buffer-name ecb-analyse-buffer-name)
+	     (ecb-analyse-node-clicked node ecb-button nil shift-mode
+                                       meta-mode))
+	    (t nil)))))
+@end group
+@end example
+
+This example would be passed as parameter as follows:
+
+@example
+(tree-buffer-create "myname"
+                    :node-selected-fn 'ecb-tree-buffer-node-select-callback
+                    ...)
+@end example
+
+@strong{IMPORTANT}: This callback must not modify the slot
+@var{EXPANDED} of the passed node because this is done automatically
+by the tree-buffer-library!
+
+@item @var{NODE-EXPANDED-FN}
+Function to call if a node is expandable, point stays onto the
+expand-symbol and node is not already expanded. This function is
+called with the following parameters:
+
+@itemize @minus
+@item node: The selected node
+@item mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+@item shift-pressed
+@item control-pressed
+@item meta-pressed
+@item tree-buffer-name
+@end itemize
+
+This function should add all children nodes to this node if not
+already done (if possible). This function has to ensure that the
+expandable- and expanded state of the selected node is correct after
+returning!
+
+@strong{IMPORTANT}: This callback must not modify the slot
+@var{EXPANDED} of the passed node because this is done automatically
+by the tree-buffer-library!
+
+@item @var{NODE-COLLAPSED-FN}
+Function to call if a node is expandable, point stays onto the
+expand-symbol and node is already expanded. This function is called
+with the following parameters:
+
+@itemize @minus
+@item node: The selected node
+@item mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+@item shift-pressed
+@item control-pressed
+@item meta-pressed
+@item tree-buffer-name
+@end itemize
+
+This function is only a callback to inform the owner/user of this
+tree-buffer that this node has been collapsed. This function must not
+modify the expandable- or expanded state of the selected node!
+
+Often a sensefull value for this parameter is the function
+@code{ignore}.
+
+@strong{IMPORTANT}: This callback must not modify the slot
+@var{EXPANDED} of the passed node because this is done automatically
+by the tree-buffer-library!
+
+@item @var{NODE-MOUSE-OVER-FN}
+Function to call when the mouse is moved over a node. This function is
+called with three arguments: NODE, WINDOW, NO-PRINT, each of them
+related to the current tree-buffer. If NO-PRINT is nil then the
+function must print the text itself in any manner. This function must
+always return the text which either is printed by the function itself
+or by the caller (if NO-PRINT is not nil). The current buffer for this
+function is the tree-buffer itself. With XEmacs this function is only
+called if the tree-buffer track-mouse mechanism is activated (see the
+function @code{tree-buffer-activate-follow-mouse}). With GNU Emacs >=
+21 this function is called by the @code{help-echo} property added to
+each node.
+
+Here is an example (call @kbd{C-h f} to see what it does) for this
+callback-function:
+
+@example
+@group
+(defun ecb-mouse-over-analyse-node (node &optional window no-message
+                                         click-force)
+  (let ((str (when (or click-force
+                       (ecb-show-minibuffer-info
+                        node window
+                        (car ecb-analyse-show-node-info)))
+               (if (equal (cdr ecb-analyse-show-node-info)
+                          'full-info)
+                   (ecb-analyse-gen-tag-info
+                    (car (tree-node->data node)))
+                 (tree-node->name node)))))
+    (prog1 str
+      (unless no-message
+        (ecb-nolog-message str)))))
+@end group
+@end example
+
+@item @var{MOUSE-HIGHLIGHT-FN}
+If nil then in this tree-buffer no node is highlighted when the mouse
+moves over it. If t then each node is highlighted when the mouse moves
+over it. If a function then it is called with the node as argument and
+if it returns not nil then the node will be highlighted when the mouse
+moves over it - otherwise no highlighting takes place.
+
+@item @var{NODE-DATA-EQUAL-FN}
+Function used by the tree-buffer to test if the data of two tree-nodes
+are equal. The function is called with two args: The DATA-slots of the
+two tree-nodes (see @ref{A new tree-node} for details about the
+data-slots).
+
+Here is an example (call @kbd{C-h f} to see what it does) for this
+callback-function:
+
+@example
+@group
+(defun ecb-analyse-compare-node-data (left right)
+  "Return not nil when LEFT and RIGHT are identical node-datas."
+  (and (equal (nth 2 left) (nth 2 right))
+       (ecb-compare-methods-buffer-node-data (car left)
+                                             (car right))))
+@end group
+@end example
+
+Often a suitable value for this parameter is @code{equal}.
+
+@item @var{MAYBE-EMPTY-NODE-TYPES}
+Nil or a list of node-types (a node-type is an integer which must be
+set with @code{tree-node-new}). Nodes with one of these types are
+treated as empty if they are not expandable (i.e. they have no
+children) and will be displayed with the empty-symbol ([x]); for other
+nodes see next argument.
+
+@item @var{LEAF-NODE-TYPES}
+Nil or a list of node-types (see above). Nodes with one of these types
+are treated as leafs and will be displayed with the leaf-symbol (*).
+
+Summary for @var{MAYBE-EMPTY-NODE-TYPES} and @var{LEAF-NODE-TYPES}:
+
+@itemize @bullet
+@item
+Expandable nodes will always be displayed either with the open- or
+with the close-symbol.
+
+@item
+Not-expandable nodes with a node-type contained in
+@var{MAYBE-EMPTY-NODE-TYPES} will be displayed with the empty-symbol.
+
+@item
+Not-expandable nodes with a node-type contained in
+@var{LEAF-NODE-TYPES} will be displayed with the leaf-symbol.
+
+@item
+All other nodes will be displayed with no symbol just with correct
+indentation.
+@end itemize
+
+@item @var{MENU-CREATOR}
+Nil or function which has to return nil or a list of conses, each cons
+for a known node-type of this tree-buffer (the node-type of a node is
+an integer). Example: ((0 . menu-for-type-0) (1 . menu-for-type-1)).
+The cdr of a cons must be a menu in the same format
+@code{tree-buffer-create-menu} expects as argument - see the
+documentation of this function for details. This function gets two
+arguments: The name of the tree-buffer and the node for which a
+popup-menu should be opened.
+
+Here is an example for such a menu-creator-callback:
+
+@example
+@group
+(defconst ecb-analyse-nodedata-tag-with-pos 0)
+(defconst ecb-analyse-nodedata-tag-without-pos 1)
+(defconst ecb-analyse-nodedata-no-tag 2)
+
+(defconst ecb-analyse-nodetype-bucket 0)
+(defconst ecb-analyse-nodetype-context 1)
+(defconst ecb-analyse-nodetype-arguments 2)
+(defconst ecb-analyse-nodetype-completions 3)
+(defconst ecb-analyse-nodetype-localvars 4)
+(defconst ecb-analyse-nodetype-prefix 5)
+(defconst ecb-analyse-nodetype-assignee 6)
+(defconst ecb-analyse-nodetype-function 7)
+(defconst ecb-analyse-nodetype-function-arg 8)
+
+(defun ecb-analyse-create-menu (node)
+  "Return a popup-menu suitable for NODE."
+  (let* ((data (tree-node->data node))
+         (tag-p (not (equal (nth 1 data) ecb-analyse-nodedata-no-tag)))
+         (tag-with-pos-p (equal (nth 1 data)
+                                ecb-analyse-nodedata-tag-with-pos))
+         (nodetype (nth 2 data)))
+    (delq nil (list (if (equal nodetype ecb-analyse-nodetype-completions)
+                        '(ecb-analyse-complete "Complete"))
+                    (if tag-p
+                        '(ecb-analyse-show-tag-info "Show tag info"))
+                    (if tag-with-pos-p
+                        '(ecb-analyse-jump-to-tag "Jump to tag"))))))
+    
+(defun ecb-analyse-menu-creator (tree-buffer-name node)
+  "Creates the popup-menus for the analyse-buffer."
+  (let ((nodetype (tree-node->type node)))
+    (unless (equal nodetype ecb-analyse-nodetype-bucket)
+      (mapcar (function (lambda (type)
+                          (cons type (ecb-analyse-create-menu node))))
+              `(,ecb-analyse-nodetype-context
+                ,ecb-analyse-nodetype-arguments
+                ,ecb-analyse-nodetype-completions
+                ,ecb-analyse-nodetype-localvars
+                ,ecb-analyse-nodetype-prefix
+                ,ecb-analyse-nodetype-assignee
+                ,ecb-analyse-nodetype-function
+                ,ecb-analyse-nodetype-function-arg)))))
+@end group
+@end example
+
+This example would be passed as parameter as follows:
+
+@example
+(tree-buffer-create "myname"
+                    :menu-creator 'ecb-analyse-menu-creator
+                    ...)
+@end example
+
+@item @var{MENU-TITLES}
+Nil or a list conses, each cons for a node-type. See
+@var{MENU-CREATOR}. The cdr of a cons must be either a string or a
+function which will be called with current node under point and must
+return a string which is displayed as the menu-title.
+
+@item @var{MODELINE-MENU-CREATOR}
+Nil or a function which has to return nil or a menu in the same format
+@code{tree-buffer-create-menu} expects as argument - see the
+documentation of this function for details. This function gets one
+argument: The name of the tree-buffer. If the function returns a menu
+then this menu will be displayed when the user clicks with
+mouse-button 3 at the modeline of the tree-buffer. The menu-title will
+be ``Tree-buffer modeline-menu''.
+
+@item @var{sticky-parent-p}
+If not nil then with GNU Emacs >= 21 the tree-buffer displays in its
+header-line the unvisible parent-node if there is any. sticky-parent-fn is
+used to get this parent node.
+                 
+@item @var{sticky-indent-string}
+String used for indendation of the sticky node in the header-line so it
+matches the tree-display.
+                      
+@item @var{sticky-parent-fn}
+Function used to get that parent node which should be sticky. This function
+gets as argument a node and should either return nil (if there is not suitable
+parent node) or a node. This node will be displayed as sticky in the
+header-line of the tree-buffer. If nil is returned and sticky-parent-p is not
+nil then just the node under the header-line is displayed. If this argument is
+nil and sticky-parent-p is not nil then always the next unvisible parent node
+will be displayed in the header-line.
+
+@item @var{TRUNC-LINES}
+Should lines in this tree buffer be truncated (not nil).
+
+@item @var{READ-ONLY}
+Should the treebuffer be read-only (not nil).
+
+@item @var{TREE-INDENT}
+Spaces subnodes should be indented. Ignored if @var{TREE-STYLE} is
+@code{image} (see below).
+
+@item @var{INCR-SEARCH-P}
+Should the incremental search be enabled in the tree-buffer. Three
+choices: @code{prefix}, @code{substring}, @code{nil}. See the command
+@code{tree-buffer-incremental-node-search}.
+
+@item @var{INCR-SEARCH-ADDITIONAL-PATTERN}
+Every search-pattern is prefixed with a regexp to jump over not
+important stuff of a displayed node-name at incr. search.. This is per
+default: beginning spaces and guide characters (|`-) and all
+expand/collapse-buttons [+], [x], rsp. [-]!
+
+If this argument is not nil then it must be a cons-cell where car is a
+string which should be a regexp-pattern which is added to the
+basic-prefix pattern (see above) and both of them prefix the
+incr-search-pattern. The cdr is the number of subexpressions in this
+additoonal pattern.
+
+@item @var{ARROW-NAVIGATION}
+If not nil then a smart navigation with arrow keys is offered:
+
+@itemize @minus
+@item Left-arrow:
+If node is expanded then it will be collapsed otherwise point
+jumps to the next "higher" node in the hierarchical tree (higher means
+the next higher tree-level or - if no higher level available - the next
+higher node on the same level).
+
+@item Right-arrow:
+If node is not expanded then it will be expanded.
+
+Onto a not expandable node the horizontal arrow-keys go one character in the
+senseful correct direction.
+
+@item Up- and down-key:
+Point jumps to the first character of the previous (up) rsp. next node
+(down). ``First'' character means either the first character of the
+expand-symbol (in case @var{EXPAND-SYMBOL-BEFORE-P} is not nil) or of
+the displayed node-name. Or with other words: The first
+non-indentation and non-guide-line (see @var{TREE-STYLE}) character of
+a node.
+@end itemize
+
+
+@item @var{HOR-SCROLL-STEP}
+Number of columns a hor. scroll in the tree-buffer should scroll. If
+not nil then @kbd{M-mouse-1} and @kbd{M-mouse-2} scroll left and right
+and also @kbd{M-<left-arrow>} and @kbd{M-<right-arrow>}. Ignored with
+XEmacs.
+
+@item @var{DEFAULT-IMAGES-DIR}
+Full path where the default images for the tree-buffer can be found.
+It should contain an image for every name of
+@code{tree-buffer-tree-image-names}.
+
+@item @var{ADDITIONAL-IMAGES-DIR}
+Additional image-dir which should be searched first for images needed
+for current tree-buffer. If the image can not be found in this
+directory then @var{DEFAULT-IMAGES-DIR} is searched. If the image can't even
+found here the related ascii-symbol is used.
+
+@item @var{IMAGE-FILE-PREFIX}
+Common prefix for all image-files for this tree-buffer, e.g. ``ecb-''.
+
+@item @var{TREE-STYLE}
+There are three different styles available: Image-style (value
+@code{image}): Very nice and modern because image-icons are used to display
+the tree-buffer. For this style the arguments @var{TREE-INDENT} and
+@var{EXPAND-SYMBOL-BEFORE-P} have no effect.
+            
+Ascii-style with guide-lines (value @code{ascii-guides}) and
+ascii-style without guidelines (value @code{ascii-no-guides}. See
+@ref{Tree-buffer styles} for details about the tree-styles.
+            
+Both ascii-styles are affected by the args @var{TREE-INDENT} and
+@var{EXPAND-SYMBOL-BEFORE-P}.
+
+@item @var{ASCII-GUIDE-FACE}
+If @var{TREE-STYLE} is @code{ascii-guides} then this defines the face
+the guides should be displayed with.
+
+@item @var{TYPE-FACER}:
+Nil or a list of one or more conses, each cons for a node-type (a
+node-type is an integer which must be set with @code{tree-node-new}).
+The cdr of a cons can be:
+
+@itemize @minus
+@item a face-symbol
+
+@item a function-symbol which gets two arguments (see
+@code{tree-buffer-insert-text}). This function can do anything, but
+normally it should face a tree-node.
+
+@item the symbol t. Then the tree-buffer assumes that the node-text is
+already faced and therefore it does not face the node, means it does
+nothing then inserting the node-text, if the tree-buffer is updated.
+@end itemize
+
+@item @var{EXPAND-SYMBOL-BEFORE-P}
+If not nil then the expand-symbol is displayed before the node-text.
+Ignored when @var{TREE-STYLE} is @code{image} and Emacs can display
+images.
+
+@item @var{HIGHLIGHT-NODE-FACE}
+Face used for highlighting current selected node in this
+tree-buffer.
+
+@item @var{GENERAL-FACE}
+General face in which the whole tree-buffer should be displayed.
+
+@item @var{AFTER-CREATE-HOOK}:
+A function or a list of functions (with no arguments) called directly
+after creating the tree-buffer and defining it's local keymap. For
+example such a function can add additional key-bindings for this
+tree-buffer local keymap (use @code{local-set-key} for this).
+
+Here is an example for such a hook:
+
+@example
+@group
+(defun ecb-common-after-tree-buffer-create-actions ()
+  "Things which should be performed after creating a tree-buffer.
+The tree-buffer is the current buffer."
+  (local-set-key (kbd "C-t")
+                 'ecb-toggle-do-not-leave-window-after-select)
+  (if ecb-running-xemacs
+      (define-key modeline-map
+        '(button2up)
+        'ecb-toggle-maximize-ecb-window-with-mouse)
+    (local-set-key [mode-line mouse-2]
+                   'ecb-toggle-maximize-ecb-window-with-mouse))) 
+@end group
+@end example
+
+@item @var{AFTER-UPDATE-HOOK}:
+A function or a list of functions (with no arguments) called each time
+after the tree-buffer has been updated via @code{tree-buffer-update}.
+
+@end table
+
+Here is an example how to create a tree-buffer (if you want a
+tree-buffer not for ECB then just strip off the
+@code{defecb-tree-buffer-creator} and just call
+@code{tree-buffer-create}):
+
+@example
+@group
+(defecb-tree-buffer-creator ecb-create-analyse-tree-buffer
+    ecb-analyse-buffer-name
+  "Create the tree-buffer for analyse-display."
+  (tree-buffer-create
+   ecb-analyse-buffer-name
+   :frame ecb-frame
+   :mouse-action-trigger ecb-tree-mouse-action-trigger
+   :is-click-valid-fn 'ecb-interpret-mouse-click
+   :node-selected-fn 'ecb-tree-buffer-node-select-callback
+   :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+   :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+   :node-mouse-over-fn 'ecb-mouse-over-analyse-node
+   :mouse-highlight-fn 'ecb-analyse-node-mouse-highlighted-p
+   :node-data-equal-fn 'ecb-analyse-compare-node-data
+   :maybe-empty-node-types nil
+   :leaf-node-types nil
+   :menu-creator 'ecb-analyse-menu-creator
+   :menu-titles (ecb-analyse-gen-menu-title-creator)
+   :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+   :trunc-lines (ecb-member-of-symbol/value-list
+                 ecb-analyse-buffer-name
+                 ecb-tree-truncate-lines)
+   :read-only t
+   :tree-indent ecb-tree-indent
+   :incr-search-p t
+   :incr-search-additional-pattern nil
+   :arrow-navigation ecb-tree-navigation-by-arrow
+   :hor-scroll-step ecb-tree-easy-hor-scroll
+   :default-images-dir (car ecb-tree-image-icons-directories)
+   :additional-images-dir (ecb-member-of-symbol/value-list
+                           ecb-analyse-buffer-name
+                           (cdr ecb-tree-image-icons-directories)
+                           'car 'cdr)
+   :image-file-prefix "ecb-"
+   :tree-style ecb-tree-buffer-style
+   :ascii-guide-face ecb-tree-guide-line-face
+   :type-facer nil
+   :expand-symbol-before-p ecb-tree-expand-symbol-before
+   :highlight-node-face ecb-analyse-face
+   :general-face ecb-analyse-general-face
+   :after-create-hook (append
+                       (list (lambda ()
+                               (ecb-common-after-create-actions)))
+                       ecb-common-tree-buffer-after-create-hook
+                       ecb-analyse-buffer-after-create-hook)
+   :after-update-hook nil))
+@end group
+@end example
+
+@node A new tree-node, Updating a tree-buffer, A new tree-buffer, tree-buffer
+@subsection How to create a new tree-node
+
+When a new tree-buffer has been created, then the most senseful
+programming-task is adding some tree-nodes to it.
+
+@subsubsection Content of a tree-node
+
+A tree-node is an object which stores in special @dfn{slots} several
+data necessary to link the node with other nodes, to display the node
+and to hold some associated node-data (e.g. a tag created by the
+semantic-library).
+
+A tree-node can have the following slots:
+
+@table @code
+@item @var{NAME}
+The name of the node. Regardless how the node is displayed; see
+@var{SHRINK-NAME} and @var{DISPLAYED-NAME}.
+
+@item @var{TYPE}
+The type of the node; must currently be an interger! The type is used
+to classify the nodes, so for example all nodes of a certain type can
+display the same popup-menu - see @code{tree-buffer-create} or @ref{A
+new tree-buffer} which parts of a tree-buffer are distinguished by
+node-types.
+
+@item @var{DATA}
+The data of the node; This can be any arbitrary emacs-lisp-object.
+This slots holds that data asscociated with the node and represented
+by the node in the tree-buffer. Example: Assume a tree-buffer
+displaying a directory-tree where each node just displays as its name
+the name of (sub)directories, but not the full path. The full path is
+stored in the @var{DATA}-slot of a node so when clicking onto this
+node the asscociated directory can be open for example in a
+dired-buffer.
+
+@item @var{EXPANDABLE}
+If not nil then the node is expandable means it has children.
+
+@item @var{EXPANDED}
+If not nil then the node is currently expanded, means its
+children are visible in the tree-buffers as subnodes of the node.
+
+@item @var{PARENT}
+The parent tree-node. This is the link to the father (rsp. mother ;-)
+of the node. It must be a object of type tree-node!
+
+@item @var{CHILDREN}
+List of children tree-nodes. They must be all objects of type
+tree-node!
+
+@item @var{SHRINK-NAME}
+Decides if the @var{NAME} can be shortened when displayed in a narrow
+tree buffer window. The following values are valid:
+
+@itemize @minus
+@item @code{beginning}:
+The @var{NAME} is truncated at the beginning so the end is always
+visible.
+
+@item @code{end}:
+The @var{NAME} is truncated at the end. If the tree-node is EXPANDABLE
+the name is truncated so that the expand symbol is visible.
+
+@item @code{nil}:
+The @var{NAME} is never truncated. In this case @var{DISPLAYED-NAME}
+is equal to @var{NAME}.
+@end itemize
+
+@item @var{INDENTSTR}
+Containes the full indentation-string for the node. So a single node
+can easily be redrawn.
+
+@item @var{DISPLAYED-NAME}
+Contains the current displayed name of the node. The
+displayed name can be different from the @var{NAME} according to the value of
+@var{SHRINK-NAME}.
+
+@end table
+
+@subsubsection Creating a new tree-node and adding it to the tree
+
+A new tree-node has to be created with the function
+@code{tree-node-new}. This ``constructor'' accepts the following
+parameter: @var{NAME}, @var{TYPE}, @var{DATA}, @var{NOT-EXPANDABLE},
+@var{PARENT} and @var{SHRINK-NAME}.
+
+For all parameters except @var{NOT-EXPANDABLE} the description is
+available in the slot-description in the section above. If
+@var{NOT-EXPANDABLE} is set to not nil then the slot @var{EXPANDABLE}
+will be set to @code{nil}; otherwise to @code{t}.
+
+@code{tree-node-new} returns a new tree-node.
+
+The new node can either being added implicitely to the tree via the
+optional @var{PARENT}-parameter when calling @code{tree-buffer-new} or
+explicitely by first creating the new node without setting the
+parent-node but later setting the parent-node via the according
+accessor (see next section below). Children should only being added
+with @code{tree-node-add-children} - see next section.
+
+@subsubsection Accessing the slots of a tree-node
+
+The section above shows which slots a tree-node have. 
+
+A slot with name XXX is getable with the following piece of code:
+
+@lisp
+(tree-node->xxx <a tree node>)
+@end lisp
+
+Here is an example how to get the value of the slot @var{DATA}:
+
+@example
+(tree-node->data <a tree node>)
+@end example
+
+A slot with name XXX is setable with the following piece of code:
+
+@lisp
+(setf (tree-node->xxx <a tree node>) <new value>)
+@end lisp
+
+Again an example with slot @var{DATA} which sets this slot to the
+string ``~/a_subdir_of_HOME'':
+
+@example
+(setf (tree-node->data <a tree node>) "~/a_subdir_of_HOME")
+@end example
+
+@strong{IMPORTANT}: Adding new children to a node should always being
+done with the function @code{tree-node-add-children} because this
+functions encapsulates all the necessary stuff needed to add children
+to a node (mainly adding the children itself and setting the node itself as
+parent for every children).
+
+See @ref{The tree-buffer-API} for the rest of the API available for
+tree-nodes.
+
+@node Updating a tree-buffer, Tree-buffer keybindings, A new tree-node, tree-buffer
+@subsection How to update a tree-buffer-display after changes
+
+When finished with adding tree-nodes to the tree-structure you mostly
+want to display the current tree and its state in the buffer/window so
+a user can see the current tree and can use it.
+
+Threre are two ways to update a tree-buffer for display:
+
+@enumerate
+@item Updating the whole tree-buffer:
+
+This is the most used way to update the tree-buffer display. It's
+quite simple, just call @code{tree-buffer-update}. In most cases you
+want to call it without arguments.
+
+If you want to display a certain expanded node and as much as possible
+subnodes of this node then pass this node-object as first argument to
+@code{tree-buffer-update}.
+
+If you do not have the need to display a completely new tree-structure
+but you want only to display a previously cached display-state then
+pass this cached-state as second argument to
+@code{tree-buffer-update}. See the documentation of this function and
+also @ref{Tree-buffer How to} for a detailled description how to do
+this.
+
+@item Updating only a single node of the tree-buffer:
+
+Sometimes it can be useful to update only exactly one special node,
+e.g. when your application codes some node-state in the displayed
+node-name (e.g. ECB displays the version-control state of a file as
+part of the related node-name) then it is necessary to update only
+this node if the state has changed.
+
+This can be done with the function @code{tree-buffer-update-node}. For
+this function the mentioning in this section can be misleading because
+this function can not only update the node-display but in general the
+slots @var{NAME}, @var{SHRINK-NAME}, @var{TYPE}, @var{DATA} and
+@var{EXPANDABLE}. Do @kbd{C-h f} to see the documentation of this
+function for all details!
+
+@end enumerate
+
+@node Tree-buffer keybindings, The tree-buffer-API, Updating a tree-buffer, tree-buffer
+@subsection Default and customizable keybindings of a tree-buffer
+
+When creating a tree-buffer with @code{tree-buffer-create} the
+following keys will automatically being bound:
+
+@table @asis
+
+@item @kbd{delete}
+@itemx @kbd{backspace}
+@itemx @kbd{home}
+@itemx @kbd{end}
+@itemx @kbd{a} (and each other key bound to @code{self-insert-command})
+All of these keys are bound to the command
+@code{tree-buffer-incremental-node-search} if the argument
+@var{INCR-SEARCH-P} of @code{tree-buffer-create} was set to not nil.
+See the documentation of @code{tree-buffer-incremental-node-search}
+for all details.
+
+@item @kbd{RET}
+@itemx @kbd{C-RET}
+@itemx @kbd{S-RET}
+@itemx @kbd{M-RET}
+@itemx @kbd{C-S-RET}
+@itemx @kbd{mouse-1}
+@itemx @kbd{C-mouse-1}
+@itemx @kbd{S-mouse-1}
+@itemx @kbd{M-mouse-1}
+@itemx @kbd{mouse-2}
+@itemx @kbd{C-mouse-2}
+@itemx @kbd{S-mouse-2}
+@itemx @kbd{M-mouse-2}
+All these keys are bound to an action-dispatcher which works as
+follows:
+
+If the callback-function in slot @var{IS-CLICK-VALID-FN} of the
+tree-buffer (@pxref{A new tree-buffer}) returns nil then nothing is
+done.
+
+If either @kbd{RET} has been hitted or point is as the node-name (i.e.
+the user has clicked with the mouse-1/2 at the node-name) then the
+callback-function in slot @var{NODE-SELECTED-FN} is called with the
+needed arguments (@pxref{A new tree-buffer}).
+
+If point is at the expand/collape-button then depending on the
+expansion-state of the node either the callback in slot
+@var{NODE-EXPANDED-FN} or @var{NODE-COLLAPSED-FN} is called (for
+parameters see again @ref{A new tree-buffer}).
+
+@strong{IMPORTANT}: None of these callbacks must modify the slot
+@var{EXPANDED} of the passed node because this is done automatically
+by the action-dispatcher!
+
+At the end the dispatcher updates the tree-buffer-display with
+optimized display of the clicked/selected node - see @ref{Updating a
+tree-buffer}. This means @code{tree-buffer-update} is called with that
+node as argument.
+
+@item @kbd{TAB}
+Depending on the expansion-state of the node either the callback in
+slot @var{NODE-EXPANDED-FN} or @var{NODE-COLLAPSED-FN} is called (for
+parameters see again @ref{A new tree-buffer}).
+
+@strong{IMPORTANT}: None of these callbacks must modify the slot
+@var{EXPANDED} of the passed node because this is done automatically
+by the action-dispatcher!
+
+At the end the the tree-buffer-display is updated with optimized
+display of the clicked/selected node - see @ref{Updating a
+tree-buffer}. This means @code{tree-buffer-update} is called with that
+node as argument.
+
+@item @kbd{mouse-3}
+Activates the popup-menu for the current tree-buffer for current
+node-type (if defined). See @ref{A new tree-buffer} at argument
+@var{MENU-CREATOR} and @var{MENU-TITLES}. These callbacks are called
+for getting the menu and the menu-title.
+
+@item @kbd{modeline-mouse-3}
+Activates the popup-menu for the modeline of the current tree-buffer
+(if defined). See @ref{A new tree-buffer} at argument
+@var{MODELINE-MENU-CREATOR}. This callback is called for getting the
+modeline-menu.
+
+@item @kbd{M-m}
+This key is bound to the command
+@code{tree-buffer-show-node-menu-keyboard}: Activates the popup-menu
+of current tree-buffer for current node-type via keyboard. If called
+with a prefix-arg then the library @file{tmm.el} is used for
+displaying the popup-menu - ignored with XEmacs.
+
+@item @kbd{<up>}
+@itemx @kbd{<down>}
+@itemx @kbd{<left>}
+@itemx @kbd{<right>}
+These keys are bound to the command @code{tree-buffer-arrow-pressed}
+which implements the smart arrow-key-navigation described in @ref{A
+new tree-buffer} at argument @var{ARROW-NAVIGATION}.
+
+@end table
+
+In addition to these automatically bound keys you can add further
+keybindings to the local-keymap of the tree-buffer with the parameter
+@var{AFTER-CREATE-HOOK} of @code{tree-buffer-create}. See @ref{A new
+tree-buffer} for an example which binds @kbd{C-t} in this hook.
+
+@node The tree-buffer-API, Do not with tree-buffer, Tree-buffer keybindings, tree-buffer
+@subsection All functions available for tree-buffers and tree-nodes
+
+This chapter lists the complete API available for tree-buffers and
+tree-nodes.
+
+@strong{IMPORTANT}: These are the only functions and macros of
+tree-buffer.el you are allowed to use for programming with
+tree-buffers and tree-nodes. If you use other - not here listed -
+functions, macros or variables of tree-buffer.el then you run the risk
+of unwanted side-effects or program-behaviors!
+
+@subsubsection The API for a tree-buffer:
+
+See the documentation of these functions (e.g. via @kbd{C-h f}) to get
+the details how to use it.
+
+@itemize
+@item @code{tree-buffer-add-image-icon-maybe}
+@item @code{tree-buffer-find-image}
+@item @code{tree-buffer-create}@footnote{If the tree-buffer should be
+used by ECB then you must use @code{defecb-tree-buffer-creator} - see
+the documentation!}
+@item @code{tree-buffer-defpopup-command}
+@item @code{tree-buffer-destroy}@footnote{Not needed when
+@code{defecb-tree-buffer-creator} has been used for creation.}
+@item @code{tree-buffer-empty-p}
+@item @code{tree-buffer-expand-node}
+@item @code{tree-buffer-get-node-at-point}
+@item @code{tree-buffer-node-data-equal-p}
+@item @code{tree-buffer-recenter}
+@item @code{tree-buffer-highlight-node-by-data/name}
+@item @code{tree-buffer-find-displayed-node-by-data/name}
+@item @code{tree-buffer-remove-highlight}
+@item @code{tree-buffer-remove-node}
+@item @code{tree-buffer-clear-tree}
+@item @code{tree-buffer-displayed-nodes-copy}
+@item @code{tree-buffer-search-displayed-node-list}
+@item @code{tree-buffer-number-of-displayed-nodes}
+@item @code{tree-buffer-get-data-store}
+@item @code{tree-buffer-set-data-store}
+@item @code{tree-buffer-get-root}
+@item @code{tree-buffer-set-root}
+@item @code{tree-buffer-update}
+@item @code{tree-buffer-update-node}
+@end itemize
+
+@subsubsection The API for a tree-node
+
+See the documentation of these functions (e.g. via @kbd{C-h f}) to get
+the details how to use it.
+
+@itemize
+@item @code{tree-node-add-children}
+@item @code{tree-node-linelength}
+@item @code{tree-node-map-subtree}
+@item @code{tree-node-new}
+@item @code{tree-node-new-root}
+@item @code{tree-node-remove-child}
+@item @code{tree-node-remove-child-by-data/name}
+@item @code{tree-node-find-child-by-data/name}
+@item @code{tree-node-find-child-by-name}
+@item @code{tree-node-search-subtree-by-data/name}
+@item @code{tree-node-sort-children}
+@item @code{tree-node-toggle-expanded}
+@end itemize
+
+In addition to these functions the tree-node API contains all accessors
+for a tree-node which are described in @ref{A new tree-node}.
+
+@node Do not with tree-buffer, Tree-buffer How to, The tree-buffer-API, tree-buffer
+@subsection Things which are strictly forbidden
+
+Variable @code{tree-buffers}: Only for internal use! It contains all
+tree-buffers of current Emacs-instance, means @strong{all}
+tree-buffers of @strong{all} applications which uses currently
+tree-buffers. Every application must store its own collection of
+tree-buffers in an own variable! For example: ECB stores its
+tree-buffer set in @code{ecb-tree-buffers}!
+
+Variable @code{tree-buffer-displayed-nodes}: Only for internal use!
+Contains all the current visible nodes of current tree-buffer in
+top-to-bottom order. This variable is buffer-local in each
+tree-buffer! Do not use it directly! When you want to cache the
+current display, then see @ref{Tree-buffer How to} how to do this.
+
+@strong{IMPORTANT}: An application may only use the API tree-buffer.el
+provides but no internal variables - see @ref{The tree-buffer-API}!
+
+@node Tree-buffer How to, ,Do not with tree-buffer, tree-buffer
+@subsection How to deal with certain programming-requirements
+
+This chapter describes in detail how to solve certain
+programming-challenges with tree-buffers.
+
+@subsubsection Caching the current tree-buffer display
+
+Sometimes it can be useful or important to cache the current display
+of a tree-buffer and display later exactly this cached display-state.
+Here is how to do this:
+
+@enumerate
+@item Caching the display:
+You have to do two tasks: First store the current internal structure
+of the tree-buffer; you must do this with the function
+@code{tree-buffer-displayed-nodes-copy}. Then store the
+buffer-contents of that tree-buffer you want to cache; you can do this
+for example with @code{buffer-substring}. For both tasks you must make
+the tree-buffer the current-buffer.
+
+@item Displaying a previous tree-buffer-cache:
+Make the tree-buffer the current buffer, call
+@code{tree-buffer-update} and pass as second argument @var{CONTENT}
+the data you have stored in step 1. See the documentation of
+@code{tree-buffer-update} for details.
+
+Here is an example:
+
+@example
+@group
+(tree-buffer-update
+  nil
+  (cons (nth 2 cache-elem) ;; the stored buffer-string
+        (nth 1 cache-elem) ;; the stored tree-structure
+  )))
+@end group
+@end example
+@end enumerate
+
+@node Adviced functions, The layout-engine, tree-buffer, Elisp programming
+@section How to deal with the adviced functions
+
+ECB needs a bunch of advices so ECB can work correctly. ECB has a
+powerful advice-backbone which allows defining sets of adviced
+functions whereas a set means, that all advices of a certain set are
+always enabled or disabled together.
+
+For this ECB contains four macros:
+
+@itemize @minus
+@item @code{defecb-advice-set}
+@item @code{defecb-advice}
+@item @code{ecb-with-original-adviced-function-set}
+@item @code{ecb-with-ecb-advice} (for this one see below)
+@end itemize
+
+For a detailed explanation of each macro read the documentation with
+@code{describe-function}!
+
+An advice in ECB must not being defined by @code{defadvice} but only
+with @code{defecb-advice} which in turn needs a previously defined
+advice-set defined by @code{defecb-advice-set}.
+
+So ECB has always full control of all advices. For example ECB
+automatically disables all advices of all advice-sets at load-time of
+ECB and also at deactivation time of ECB. So you can be sure that
+after deactivating ECB all ecb-advices are deactivated/disabled too.
+
+In addition to the four macros above ECB offers two further macros
+for running code with disabled some ecb-advices:
+
+@itemize @minus
+@item @code{ecb-with-original-basic-functions}
+@item @code{ecb-with-original-permanent-layout-functions}
+@end itemize
+
+The advice set @code{ecb-basic-adviced-functions} contains most of the
+ecb-advices. See the contents of this variable to see which advices
+are contained in this set. Use
+@code{ecb-with-original-basic-functions} when you want evaluating
+elisp-code with disabled basic-advices.
+@code{ecb-with-original-basic-functions} is only a shortcut for
+@code{ecb-with-original-adviced-function-set} called for the
+@code{ecb-basic-adviced-functions}-set.
+
+Same for @code{ecb-with-original-permanent-layout-functions} which is a
+shortcut for the advice-set @code{ecb-permanent-adviced-layout-functions}.
+
+Last but not least ECB contains an advice-set
+@code{ecb-always-disabled-advices}. These advices are always disabled.
+This advice-set can not be enabled by @code{ecb-enable-advices} but
+such an advice has to be activated 'on demand' by the caller. Such an
+advice must be used with the macro @code{ecb-with-ecb-advice} (see the
+docstring) and is also enabled within the BODY of the macro-call.
+
+ECB contains some more advice-sets but don't bother about it.
+
+@strong{Please Note}: See the value of @code{ecb-adviced-function-sets} which
+advice-sets are defined and see @code{ecb-adviced-functions} for an overview
+for all adviced functions.
+
+
+@node The layout-engine, , Adviced functions, Elisp programming
+@section How to program new layouts and new special windows
+
+There are two aspects concerning this topic:
+
+@enumerate
+@item
+Programming a new layout which contains several special ECB-windows
+like directories, sources, methods, history or other special windows
+and arranging them in a new outline.
+
+@item
+Creating complete new special windows (e.g. a local-variable window
+for a graphical debugger like JDEbug of JDEE), adding them to a layout
+and synchronizing them with the current active edit-window.
+@end enumerate
+
+The former one covers merely the layout-programming aspect which is
+explained in the first subsection of this chapter whereas the latter
+one covers all aspects of creating new special windows and what is
+necessary to synchronize it with the current active edit-window of
+ECB. This is explained in the second subsection which will refers to
+the first subsection.
+
+@menu
+* Programming a new layout::    How to program a new layout
+* Programming special windows:: Aspects of programming special windows
+* Possible layout-outlines::    The wide range of possible layouts
+* The layout-engine API::       The complete layout-engine API
+@end menu
+
+@node Programming a new layout, Programming special windows, The layout-engine, The layout-engine
+@subsection How to program a new layout
+
+If you just want creating a new layout with the standard ECB-windows
+like directories, sources, methods, history and speedbar it's is
+strongly recommended to define the new layout interactively with the
+command @code{ecb-create-new-layout} (@pxref{Creating a new
+ECB-layout}).
+
+If you want creating a new layout and if this layout should contain
+other special windows than the standard ECB-windows then it's still
+recommended to define this layout interactively with
+@code{ecb-create-new-layout} and using the option to give the created
+windows user-defined types. For every user defined type you have then
+just to program the necessary buffer-set function. For all the details
+see @ref{Creating a new ECB-layout}.
+
+But if you do not like the interactive way (because you are tough and
+brave) but you want programming the new layout with Elisp then use the
+macro @code{ecb-layout-define} (the following definition has stripped
+the prefix ``ecb-'' for better indexing this manual):
+
+@defmac layout-define name type doc &rest create-code
+Creates a new ECB-layout with name @var{NAME}. @var{TYPE} is the type
+of the new layout and is literal, i.e. not evaluated. It can be left,
+right, top or left-right. @var{DOC} is the docstring for the new
+layout-function ``ecb-layout-function-<name>''. @var{CREATE-CODE} is
+all the lisp code which is necessary to define the
+ECB-windows/buffers. This macro adds the layout with @var{NAME} and
+@var{TYPE}to the internal variable @code{ecb-available-layouts}.
+
+Preconditions for @var{CREATE-CODE}:
+@enumerate
+@item
+Current frame is splitted at least in one edit-window and the
+``column'' (for layout types left, right and left-right) rsp. ``row''
+(for a top layout) for the special ECB-windows/buffers. The width of
+the ``column'' rsp. the height of the ``row'' is always defined with
+the option @code{ecb-windows-width} rsp. @code{ecb-windows-height}.
+Depending on the value of the option @code{ecb-compile-window-height}
+there is also a compile window at the bottom of the frame which is
+stored in @code{ecb-compile-window}.
+
+@item
+All windows are not dedicated.
+
+@item
+Neither the edit-window nor the compile-window (if there is one) are
+selected for types left, right and top. For type left-right the left
+column-window is selected
+
+@item
+All ECB-advices of the advice-sets @code{ecb-basic-adviced-functions}
+and @code{ecb-permanent-adviced-functions} are disabled.
+@end enumerate
+
+Things @var{CREATE-CODE} has to do:
+@enumerate
+@item
+Splitting the ECB-tree-windows-column(s)/row (s.a.) in all the
+ECB-windows the layout should contain (directories, sources, methods
+and history). The split must not be done with other functions than
+@code{ecb-split-hor} and @code{ecb-split-ver}! It is recommended not to
+to use a ``hard'' number of split-lines or -rows but using fractions
+between -0.9 and +0.9! Tip: It is recommended to spilt from right to
+left and from bottom to top or with other words: First create the
+right-most and bottom-most special windows!
+
+@item
+Making each special ECB-window a dedicated window. This can be done with
+one of the following functions:
+@itemize @minus
+@item @code{ecb-set-directories-buffer}
+@item @code{ecb-set-sources-buffer}
+@item @code{ecb-set-methods-buffer}
+@item @code{ecb-set-history-buffer}
+@item @code{ecb-set-speedbar-buffer}
+@end itemize
+Each layout can only contain one of each tree-buffer-type!
+
+In addition to these functions there is a general macro:
+@code{defecb-window-dedicator}: This macro defines a so called
+``window-dedicator'' which is a function registered at ECB and called
+by ECB to perform any arbitrary code in current window and makes the
+window autom. dedicated at the end. This can be used by third party
+packages like JDEE to create arbitrary ECB-windows besides the
+standard tree-windows.
+
+To make a special ECB-window a dedicated window either one of the five
+functions above must be used or a new ``window-dedicator''-function
+has to be defined with `defecb-window-dedicator' and must be used
+within the layout-definition.
+
+@item
+Every(!) special ECB-window must be dedicated as described in 2.
+
+@item
+@var{CREATE-CODE} must work correctly regardless if there is already a
+compile-window (stored in @code{ecb-compile-window}) or not
+(@code{ecb-compile-window} is nil).
+@end enumerate
+
+Things @var{CREATE-CODE} can do or can use:
+@enumerate
+@item
+The value of @code{ecb-compile-window} which contains the compile-window (if
+there is one). Using the values of @code{ecb-compile-window-height},
+@code{ecb-windows-width}, @code{ecb-windows-height}.
+@end enumerate
+
+Things @var{CREATE-CODE} must NOT do:
+@enumerate
+@item Splitting the edit-window
+@item Creating a compile-window
+@item
+Deleting the edit-window, the compile-window (if there is any) or the
+ECB-windows-column(s)/row (see Precondition 1.)
+@item
+Referring to the value of @code{ecb-edit-window} because this is always nil
+during @var{CREATE-CODE}.
+@end enumerate
+
+Postconditions for @var{CREATE-CODE}:
+@enumerate
+@item
+The edit-window must be the selected window and must not be dedicated
+and not be splitted.
+
+@item
+Every window besides the edit-window (and the compile-window) must be
+a dedicated window (e.g. a ECB-tree-window).
+@end enumerate
+@end defmac
+
+Use this macro to program new layouts within your @file{.emacs} or any
+other file which is loaded into your Emacs. After loading the file(s)
+with all the new layout-definitions you can use it by customizing the
+option @code{ecb-layout-name} to the appropriate name or with the
+command @code{ecb-change-layout}.
+
+With the function @code{ecb-layout-undefine} you can remove a layout
+from the list of available layouts:
+
+@defun layout-undefine name
+Unbind ecb-layout-function-<NAME> and
+ecb-delete-window-ecb-windows-<NAME> and remove @code{NAME} from
+@code{ecb-available-layouts}.
+@end defun
+
+Here is an example for a new layout programmed with
+@code{ecb-layout-define}:
+
+@example
+@group
+(ecb-layout-define "my-own-layout" left nil
+  ;; The frame is already splitted side-by-side and point stays in the
+  ;; left window (= the ECB-tree-window-column)
+
+  ;; Here is the creation code for the new layout
+  
+  ;; 1. Defining the current window/buffer as ECB-methods buffer
+  (ecb-set-methods-buffer)
+  ;; 2. Splitting the ECB-tree-windows-column in two windows
+  (ecb-split-ver 0.75 t)
+  ;; 3. Go to the second window
+  (other-window 1)
+  ;; 4. Defining the current window/buffer as ECB-history buffer
+  (ecb-set-history-buffer)
+  ;; 5. Make the ECB-edit-window current (see Postcondition above)
+  (select-window (next-window)))
+@end group
+@end example
+
+This layout definition defines a layout with name ``my-own-layout''
+which looks like:
+
+@example
+@group
+-------------------------------------------------------
+|              |                                      |
+|              |                                      |
+|              |                                      |
+|  Methods     |                                      |
+|              |                                      |
+|              |                                      |
+|              |               Edit                   |
+|              |                                      |
+|              |                                      |
+|--------------|                                      |
+|              |                                      |
+|  History     |                                      |
+|              |                                      |
+-------------------------------------------------------
+|                                                     |
+|                    Compilation                      |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@node Programming special windows, Possible layout-outlines, Programming a new layout, The layout-engine
+@subsection All aspects of programming special windows
+
+ECB offers a flexible programmable layout-engine for other packages to
+display their own contents and informations in special ECB-windows. An
+example could be a graphical debugger which offers a special window for
+displaying local variables and another special window for messages
+from the debugger-process (like JDEbug of JDEE@footnote{JDEE is
+available at
+@ifhtml
+@uref{http://jdee.sunsite.dk/}
+@end ifhtml
+@ifnothtml
+@url{http://jdee.sunsite.dk/}
+@end ifnothtml
+}).
+
+This section explains all aspects of programming new special windows,
+adding them to a new layout and synchronizing them with edit-window of
+ECB. This can be done best with an easy example which nevertheless
+covers all necessary aspects to be a good example and skeleton for
+complex tools (like a graphical debugger) which want to use the
+layout-engine of ECB do display their own information.
+
+@strong{IMPORTANT}: See @ref{tree-buffer} for a full documentation of
+the library tree-buffer.el which can be used for programming a new
+special window as a tree!
+
+Here comes the example:
+
+@subsubsection The outline of the example layout:
+
+@example
+@group
+-------------------------------------------------------
+|Bufferinfo for <filename>:            |[prior]       |
+|Type: file                            |[next]        |
+|Size: 23456                           |              |
+|Modes: rw-rw-rw-                      |              |
+|-----------------------------------------------------|
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+|                 edit-window                         |
+|                                                     |
+|                                                     |
+|                                                     |
+|                                                     |
+-------------------------------------------------------
+|                                                     |
+|                 compilation-window                  |
+|                                                     |
+-------------------------------------------------------
+@end group
+@end example
+
+@subsubsection The description of the layout-contents
+
+The top-left window always displays informations about the current
+buffer in the selected edit-window. This window demonstrates how
+autom. synchronizing a special window/buffer of a layout with current
+edit-window.
+
+The top-right window contains an read-only ``action-buffer'' and
+offers two buttons which can be used with the middle mouse-button to
+scroll the edit-window. This is not very senseful but it demonstrates
+how to control the edit-window with actions performed in a special
+window/buffer of a layout.
+
+(If you have not set a compilation-window in
+@code{ecb-compile-window-height} then the layout contains no persistent
+compilation window and the other windows get a little more place).
+
+@subsubsection The example code
+
+Now let have us a look at the several parts of the Elisp-program
+needed to program this new example layout. ECB contains a library
+@file{ecb-examples.el} which contains the full working code of this
+example. To test this example and to play with it you can load this
+library into Emacs (with @code{load-library} for example) and then
+calling @code{ecb-change-layout} (bound to @kbd{C-c . lc}) and
+inserting ``example-layout1'' as layout-name. An alternative is
+calling @code{ecb-examples-activate} and
+@code{ecb-examples-deactivate}. For details see file
+@file{ecb-examples.el}.
+
+The following steps only contain code-skeletons to demonstrate the
+principle. The full working code is available in
+@file{ecb-examples.el}.
+
+@subsubsection The bufferinfo buffer of the example
+
+The name of the bufferinfo buffer:
+
+@lisp
+(defconst ecb-examples-bufferinfo-buffer-name " *ECB buffer info*")
+@end lisp
+
+Two helper functions for displaying infos in a special buffer:
+
+@lisp
+@group
+(defun ecb-examples-print-file-attributes (buffer filename)
+  (ecb-with-readonly-buffer buffer
+    (erase-buffer)
+    (insert (format "Bufferinfo for %s:\n\n" filename))
+    ;; insert with the function `file-attributes' some 
+    ;; informations about FILENAME.
+    ))
+
+(defun ecb-examples-print-non-filebuffer (buffer buffer-name)
+  (ecb-with-readonly-buffer buffer
+    (erase-buffer)
+    ;; analogous to `ecb-examples-print-file-attributes'
+    ))
+@end group
+@end lisp
+
+
+For synchronizing the bufferinfo window with the current source-buffer we
+first introduce some three options which are very typical for a special
+ECB-window which should be synchronized with current buffer in the edit-area.
+
+The :type of the first two options is essential and @strong{MUST NOT} be
+defined differently, because the macro @code{defecb-autocontrol/sync-function}
+(s.b.) and the function @code{ecb-activate-ecb-autocontrol-function} (s.b.)
+expects exactly these option-types.
+
+The third one for an own hook running after synchronizing is not essential but
+mostly useful for users who wants to do some own stuff.
+
+Here come the three options - for detailled docstrings take a look into the
+file @file{ecb-examples.el}:
+
+@lisp
+@group
+(defcustom ecb-examples-bufferinfo-buffer-sync 'basic
+  "*Synchronize the bufferinfo buffer automatically with current edit buffer.
+
+If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+`major-mode' of the new buffer belongs NOT to this list.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync'.
+
+IMPORTANT NOTE: Every time the synchronization is done the hook
+`ecb-bufferinfo-buffer-sync-hook' is evaluated."
+  :group 'ecb-examples-bufferinfo
+  :type '(radio :tag "Synchronize ECBs example bufferino buffer"
+                (const :tag "use basic value" :value basic)
+                (const :tag "Always" :value always)
+                (const :tag "Never" nil)
+                (repeat :tag "Not with these modes"
+                        (symbol :tag "mode"))))
+
+(defcustom ecb-examples-bufferinfo-buffer-sync-delay 'basic
+  "*Time Emacs must be idle before the bufferinfo-buffer is synchronized.
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+If the special value 'basic is set then ECB uses the setting of the option
+`ecb-basic-buffer-sync-delay'"
+  :group 'ecb-analyse
+  :type '(radio (const :tag "use basic value" :value basic)
+                (const :tag "No synchronizing delay" :value nil)
+                (number :tag "Idle time before synchronizing" :value 2))
+  :set (function (lambda (symbol value)
+                   (set symbol value)
+                   (if (and (boundp 'ecb-minor-mode)
+                            (featurep 'ecb-examples)
+                            ecb-minor-mode)
+                       (ecb-activate-ecb-autocontrol-function
+                        value 'ecb-examples-bufferinfo-buffer-sync))))
+  :initialize 'custom-initialize-default)
+
+(defcustom ecb-examples-bufferinfo-buffer-sync-hook nil
+  "Hook run at the end of `ecb-examples-bufferinfo-buffer-sync'.
+See documentation of `ecb-examples-bufferinfo-buffer-sync' for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+..."
+  :group 'ecb-analyse
+  :type 'hook)
+
+@end group
+@end lisp
+
+Now we define the synchronizing function. @strong{IMPORTANT}: The main
+synchronizing function must be defined with the macro
+@code{defecb-autocontrol/sync-function}! See the documentation of this
+function for all details.
+
+The following function synchronizes the bufferinfo buffer with the current
+buffer of the edit-window if that buffer has changed
+
+See the comments in the code for explanations.
+
+@lisp
+@group
+(defvar ecb-examples-bufferinfo-last-file-buffer nil)
+
+(defecb-autocontrol/sync-function ecb-examples-bufferinfo-buffer-sync
+    ecb-examples-bufferinfo-buffer-name ecb-examples-bufferinfo-buffer-sync t
+  "Synchronizes the buffer-info buffer with current source if changed.
+Can be called interactively but normally this should not be necessary because
+it will be called autom. by the internal synchronizing mechanism of ECB."
+
+  ;; The macro `defecb-autocontrol/sync-function' does a lot for our
+  ;; conveniance:
+  
+  ;; 1) here we can be sure that the buffer with name
+  ;; `ecb-examples-bufferinfo-buffer-name' is displayed in a window of
+  ;; `ecb-frame' because the macro `defecb-autocontrol/sync-function'
+  ;; encapsulates automatically the following code within
+  ;; `ecb-do-if-buffer-visible-in-ecb-frame' and this macro binds locally the
+  ;; variables visible-buffer and visible-window: visible-window:=
+  ;; (get-buffer-window ecb-examples-bufferinfo-buffer-name) visible-buffer:=
+  ;; (get-buffer ecb-examples-bufferinfo-buffer-name)
+
+  ;; 2) The macro `defecb-autocontrol/sync-function' automatically takes care of
+  ;;    the setting of option `ecb-examples-bufferinfo-buffer-sync' and runs the
+  ;;    following code only when the related conditions are true
+
+  ;; 3) The generated function has one optional argument FORCE which can be used
+  ;; in the code below.
+  
+  ;; 4) The macro `defecb-autocontrol/sync-function' makes this synchronizing
+  ;;    function interactive
+
+  ;; For details please read the documentation of
+  ;; `defecb-autocontrol/sync-function'!
+
+  ;; synchronize only when point stays in one of the edit-window.
+  (when (ecb-point-in-edit-window-number)
+
+    ;; we need the file-name of indirect-buffers too (if the base-buffer is a
+    ;; file-buffer), therefore we use `ecb-buffer-file-name' (see the docstring
+    ;; of this function)
+    (let ((filename (ecb-buffer-file-name (current-buffer))))
+    
+      (if (and filename (ecb-buffer-or-file-readable-p filename))
+
+          ;; synchronizing for real filesource-buffers or indirect buffers of
+          ;; real file buffers
+
+            ;; Let us be smart: We synchronize only if sourcebuffer has changed
+            ;; or if the argument FORCE is not nil
+            (when (or force
+                      (not (equal (current-buffer)
+                                  ecb-examples-bufferinfo-last-file-buffer)))
+              ;; set new last-file-buffer so we can check next time if changed
+              (setq ecb-examples-bufferinfo-last-file-buffer (current-buffer))
+              ;; we display the file-infos for current source-buffer
+              (ecb-examples-print-file-attributes visible-buffer filename))
+        
+        ;; what should we do for non file buffers like help-buffers etc...
+        (setq ecb-examples-bufferinfo-last-file-buffer nil)
+        (ecb-examples-print-non-filebuffer visible-buffer
+                                           (buffer-name (current-buffer)))))
+
+    ;; Now lets run the hooks in `ecb-examples-bufferinfo-buffer-sync-hook'
+    (run-hooks 'ecb-examples-bufferinfo-buffer-sync-hook)))
+@end group
+@end lisp
+
+Two conveniance commands for the user:
+
+@lisp
+@group
+(defun ecb-maximize-bufferinfo-window ()
+  "Maximize the bufferinfo-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works
+also if the ECB-analyse-window is not visible in current layout."
+  (interactive)
+  (ecb-display-one-ecb-buffer ecb-examples-bufferinfo-buffer-name))
+
+(defun ecb-goto-bufferinfo-window ()
+  "Make the bufferinfo-window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-examples-bufferinfo-buffer-name))
+@end group
+@end lisp
+
+@subsubsection Synchronizing the bufferinfo-buffer automatically
+
+By using the macro @code{defecb-autocontrol/sync-function} for defining our
+synchronizing function we have already registered this function as a
+synchronizing function managed by ECB:
+
+The only thing we need is to tell ECB when this function should run - for this
+we have already defined the first two options in our example (s.a.).
+ECB offers to functions for 
+
+@itemize
+@item @code{ecb-activate-ecb-autocontrol-function}: Activate/start synchronizing
+@item @code{ecb-stop-autocontrol/sync-function}: Stop synchronizing
+@end itemize
+
+It's smart to activate the synchronizing function within the
+dedicator-function. See the comment within the following function.
+
+The function which makes the bufferinfo-buffer dedicated to a window
+and registers the new special window/buffer at ECB.
+
+@lisp
+@group
+(defecb-window-dedicator ecb-examples-set-bufferinfo-buffer
+    ecb-examples-bufferinfo-buffer-name
+  "Set the buffer in the current window to the bufferinfo-buffer and make this
+window dedicated for this buffer. Makes the buffer read-only."
+
+  ;; activating the synchronization of the bufferinfo-window:
+  ;; `ecb-activate-ecb-autocontrol-function' takes care of the possible
+  ;; settings in `ecb-examples-bufferinfo-buffer-sync-delay'. Therefore we do
+  ;; it here because then changes in ecb-examples-bufferinfo-buffer-sync-delay
+  ;; are taken into account each time the bufferinfo buffer is set in the
+  ;; layout (after each hiding/showing the ecb-window, each redrawing the
+  ;; layout deactivating/activating ECB)
+  (ecb-activate-ecb-autocontrol-function ecb-examples-bufferinfo-buffer-sync-delay
+                                         'ecb-examples-bufferinfo-buffer-sync)
+  
+  (switch-to-buffer (get-buffer-create ecb-examples-bufferinfo-buffer-name))
+  (setq buffer-read-only t))
+@end group
+@end lisp
+
+
+This is all what we need for the special bufferinfo buffer. We have
+demonstrated already three of the important functions/macros of the
+layout-engine API of ECB: @code{ecb-with-readonly-buffer},
+@code{defecb-autocontrol/sync-function} and @code{defecb-window-dedicator}
+(@pxref{The layout-engine API}. Especially the second macro is a MUST for
+programming good synchronizing functions which do not waste CPU-power! We have
+also shown how to start/activate a synchronizing function by
+@code{ecb-activate-ecb-autocontrol-function}. Later we will see how to stop
+it.
+
+@subsubsection The action buffer of the example
+
+The name of the action-buffer:
+
+@lisp
+(defconst ecb-examples-action-buffer-name " *ECB action buffer*")
+@end lisp
+
+Two helper functions for creating a readonly action-buffer with a
+special local key-map for the middle-mouse-button and two buttons
+[prior] and [next]:
+
+@lisp
+@group
+(defun ecb-examples-insert-text-in-action-buffer (text)
+  (let ((p (point)))
+    (insert text)
+    (put-text-property p (+ p (length text)) 'mouse-face
+                                             'highlight)))
+
+(defun ecb-examples-action-buffer-create ()
+  (save-excursion
+    (if (get-buffer ecb-examples-action-buffer-name)
+        (get-buffer ecb-examples-action-buffer-name)
+
+      (set-buffer (get-buffer-create
+                    ecb-examples-action-buffer-name))
+
+      ;; we setup a local key-map and bind middle-mouse-button
+      ;; see ecb-examples.el for the full code        
+
+      ;; insert the action buttons [prior] and [next] and
+      ;; make it read-only
+      
+      (ecb-with-readonly-buffer (current-buffer)
+        (erase-buffer)
+        (ecb-examples-insert-text-in-action-buffer "[prior]")
+        ;; analogous for the [next] button
+        )
+      
+      (current-buffer))))
+@end group
+@end lisp
+
+The function which performs the actions in the action-buffer if
+clicked with the middle-mouse button onto a button [next] or [prior].
+
+@lisp
+@group
+(defun ecb-examples-action-buffer-clicked (e)
+  (interactive "e")
+  (mouse-set-point e)
+  (let ((line (buffer-substring (ecb-line-beginning-pos)
+                                (ecb-line-end-pos))))
+    (cond ((string-match "prior" line)
+           (ecb-select-edit-window)
+           (call-interactively 'scroll-down))
+          ((string-match "next" line)
+           ;; analogous for [next]
+           ))))
+@end group
+@end lisp
+
+Two conveniance-commands for the user:
+
+@lisp
+@group
+(defun ecb-maximize-action-window ()
+  "Maximize the action-window.
+I.e. delete all other ECB-windows, so only one ECB-window and the
+edit-window\(s) are visible \(and maybe a compile-window). Works
+also if the ECB-analyse-window is not visible in current layout."
+  (interactive)
+  (ecb-display-one-ecb-buffer ecb-examples-action-buffer-name))
+
+(defun ecb-goto-action-window ()
+  "Make the action-window the current window."
+  (interactive)
+  (ecb-goto-ecb-window ecb-examples-action-buffer-name))
+@end group
+@end lisp
+
+The function which makes the action-buffer dedicated to a window and
+registers it at ECB.
+
+@lisp
+@group
+(defecb-window-dedicator ecb-examples-set-action-buffer
+    (buffer-name (ecb-examples-action-buffer-create))
+  "Set the buffer in the current window to the action-buffer
+and make this window dedicated for this buffer."
+  (switch-to-buffer (buffer-name (ecb-examples-action-buffer-create))))
+@end group
+@end lisp
+
+We do not need more code for the action buffer. All of the code is
+standard emacs-lisp which would also needed if used without ECB. You
+see that you can use any arbitrary code as second argument for
+@code{defecb-window-dedicator} as long it returns a buffer-name.
+
+@subsubsection Adding the bufferinfo- and action-buffer to a new layout
+
+Now we add the bufferinfo- and the action-buffer to a new layout of
+type top with name ``example-layout1'':
+
+@lisp
+@group
+(ecb-layout-define "example-layout1" top
+  
+  ;; dedicating the bufferinfo window to the bufferinfo-buffer
+  (ecb-examples-set-bufferinfo-buffer)
+
+  ;; creating the action-window
+  (ecb-split-hor 0.75)
+  
+  ;; dedicate the action window to the action-buffer
+  (ecb-examples-set-action-buffer)
+
+  ;; select the edit-window
+  (select-window (next-window)))
+@end group
+@end lisp
+
+This all what we need to define the new layout. See @ref{Programming a
+new layout} for more details of the pure layout-programming task.
+
+@subsubsection Activating and deactivating new layouts
+
+Because a set of new special windows integrated in a new layout is
+often just the GUI of a complete tool (like a graphical debugger) we
+demonstrate here the complete activation and deactivation of such a
+tool or at least of the tool-GUI. We decide that the GUI of our
+example ``tool'' needs a compile-window with height 5 lines and the
+height of the special windows ``row'' on top should be exactly 6 lines
+(normally width and height of the special windows should be a fraction
+of the frame, but here we use 6 lines@footnote{You can change the code
+in the file @file{ecb-examples.el} to use a frame-fraction of 0.2
+instead of 6 hard lines, just try it!}
+
+Here comes the (de)activation code.
+
+The code for saving and restoring the state before activation (the
+full code is available in @file{ecb-examples.el}:
+
+@lisp
+@group
+(defun ecb-examples-preactivation-state(action)
+  (cond ((equal action 'save)
+         ;; code for saving the state
+         )
+        ((equal action 'restore)
+        ;; code for restoring the state
+        )))
+@end group
+@end lisp
+
+The following function activates the GUI of our example tool:
+
+@lisp
+@group
+(defun ecb-examples-activate ()
+  "Activate the new layout \"example-layout1\".
+Acivates the function `ecb-examples-bufferinfo-buffer-sync', set
+`ecb-compile-window-height' to 5 and `ecb-windows-height' to 6. The
+preactivation-state is saved and will be restored by
+`ecb-examples-deactivate'."
+  (interactive)
+
+  (assert (featurep 'ecb) nil
+          "ECB must be loaded!")
+  (assert ecb-minor-mode nil
+          "ECB must be activated!")
+  (assert (equal (selected-frame) ecb-frame) nil
+          "The ECB-frame must be selected!")
+  (assert (not (ecb-string= ecb-layout-name "example-layout1")) nil
+          "The examples-layout1 is already active!")
+  
+  ;; saving the state
+  (ecb-examples-preactivation-state 'save)
+
+  ;; switch to our prefered layout
+  (setq ecb-windows-height 6)
+  (setq ecb-compile-window-height 8)
+  (let ((ecb-change-layout-preserves-compwin-state nil))
+    ;; activating the synchronization of the bufferinfo-window is done in the
+    ;; dedicator-function (see `ecb-examples-set-bufferinfo-buffer' for the
+    ;; reason). So the synchronizing will be activated implicitly with the
+    ;; layout-switch because this redraws the layout and this calls all
+    ;; dedicator-functions.
+    (ecb-layout-switch "example-layout1")))
+@end group
+@end lisp
+
+This function deactivates the GUI of our example-tool and restores the
+state as before activation:
+
+@lisp
+@group
+(defun ecb-examples-deactivate ()
+  "Deactivate the new layout \"example-layout1\".
+Stops `ecb-examples-bufferinfo-buffer-sync' and restore the state
+as before activation."
+  (interactive)
+
+  (assert (featurep 'ecb) nil
+          "ECB must be loaded!")
+  (assert ecb-minor-mode nil
+          "ECB must be activated!")
+  (assert (equal (selected-frame) ecb-frame) nil
+          "The ECB-frame must be selected!")
+  (assert (ecb-string= ecb-layout-name "example-layout1") nil
+          "The example-layout1 is not active!")
+
+  ;; we stop here the synchronization.
+  (ecb-stop-autocontrol/sync-function 'ecb-examples-bufferinfo-buffer-sync)
+  
+  (ecb-examples-preactivation-state 'restore)
+  
+  (ecb-layout-switch ecb-layout-name))
+@end group
+@end lisp
+
+
+Now we have all code for the new layout and the new layout-buffers.
+The example is ready for use; just load @file{ecb-examples.el} (s.a.).
+
+@node Possible layout-outlines, The layout-engine API, Programming special windows, The layout-engine
+@subsection The wide range of possible layout-outlines
+
+In the two previous sections @ref{Programming a new layout} and
+@ref{Programming special windows} we have explained in detail how to
+program new layouts and how to program new special windows/buffers and
+adding them to a new layout.
+
+The intention of this section is to be a summary what are the real
+restrictions for a new layout-outline programmed with
+@code{ecb-layout-define}. This is necessary because until now we just
+programmed ``obvious'' layouts, means layout which are in principle
+very similar to the standard ones which means one big edit-window and
+some special windows ``around'' this edit-window. This section will
+show you that a layout can have also very different outlines.
+
+OK, here are the real restrictions and conditions for a layout
+programmed with @code{ecb-layout-define}:
+@enumerate
+@item
+It must have exactly one edit-window regardless of its size. The user
+of this layout can later split this edit-window in as many
+edit-windows as he like.
+
+@item
+All other windows created within the @var{CREATE-CODE} body of
+@code{ecb-layout-define} (@pxref{Programming a new layout}) must be
+dedicated to their buffers.
+
+@item
+All the dedicated windows must (exclusive!) either reside on the left,
+right, top or left-and-right side of the edit-window. This will be
+defined with the @var{TYPE}-argument of @code{ecb-layout-define}
+(@pxref{Programming a new layout}).
+@end enumerate
+
+You see, there are only three restrictions/conditions. These and only
+these must be fulfilled at layout-programming.
+
+Demonstrating what this really means and how flexible the
+layout-engine of ECB really is, can be done best with some
+``pathological'' layout-outlines. All the following are correct
+layouts (working code is added below each layout):
+
+The following is a top layout with three vertical layered special
+windows.
+
+@example
+@group
+------------------------------------------------------------------
+|                                                                |
+|                 Upper special window                           |
+|                                                                |
+|----------------------------------------------------------------|
+|                                                                |
+|                 Middle special window                          |
+|                                                                |
+|----------------------------------------------------------------|
+|                                                                |
+|                 Lower special window                           |
+|                                                                |
+|================================================================|
+|                                                                |
+|                         Edit-area                              |
+|      (can be splitted by the user in several edit-windows)     |
+------------------------------------------------------------------
+|                                                                |
+|                 Compilation-window (optional)                  |
+|                                                                |
+------------------------------------------------------------------
+@end group
+@end example
+
+Here is the code for that top layout (all buffers are dummy-buffers):
+
+@lisp
+@group
+
+;; The "window dedicator" functions:
+
+(defecb-window-dedicator ecb-set-usw-buffer "Upper special window"
+  (switch-to-buffer (get-buffer-create "Upper special window")))
+
+(defecb-window-dedicator ecb-set-msw-buffer "Middle special window"
+  (switch-to-buffer (get-buffer-create "Middle special window")))
+
+(defecb-window-dedicator ecb-set-lsw-buffer "Lower special window"
+  (switch-to-buffer (get-buffer-create "Lower special window")))
+
+;; The layout itself:
+
+(ecb-layout-define "example-layout3" top
+  nil
+
+  ;; here we have an edit-window and above one top window which we can
+  ;; now split in several other windows. Dependent on the value of
+  ;; `ecb-compile-window-height' we have also a compile-window at the
+  ;; bottom.
+
+  (ecb-set-usw-buffer)
+  (ecb-split-ver 0.33)
+  (ecb-set-msw-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-lsw-buffer)
+
+  ;; select the edit-window.
+  (select-window (next-window)))
+@end group
+@end lisp
+
+
+The following is a left-right layout which has six special windows in
+the left-''column'' and one big special window in the
+right-''column''. For left-right layouts the left-''column'' and the
+right-''column'' have always the same width.
+
+@example
+@group
+------------------------------------------------------------------
+|             |       |                   |                      |
+| Left1       | Left5 |                   |                      |
+|             |       |                   |                      |
+|-------------|       |                   |                      |
+|      |      |       |                   |                      |
+|      |      |       |                   |                      |
+|      |      |       |                   |                      |
+| Left2| Left3|-------|     Edit-area     |   Right1             |
+|      |      |       | (can be splitted  |                      |
+|      |      |       |  in several edit- |                      |
+|      |      |       |      windows)     |                      |
+|-------------|       |                   |                      |
+|             |       |                   |                      |
+| Left4       | Left6 |                   |                      |
+|             |       |                   |                      |
+------------------------------------------------------------------
+|                                                                |
+|                 Compilation-window (optional)                  |
+|                                                                |
+------------------------------------------------------------------
+@end group
+@end example
+
+Here is the code for that left-right layout, again with dummy-buffers
+(depending to your screen-resolution you will need a quite big value
+for @code{ecb-windows-width}, e.g. 0.4):
+
+Here is one of the ``window dedicator''-functions@footnote{The
+``window dedicators'' for all these ecb-windows/buffers are
+not explicitly described - they look all like
+@code{ecb-set-left1-buffer} - of course with different buffer-names!}:
+
+@lisp
+@group
+(defecb-window-dedicator ecb-set-left1-buffer "Left1"
+  (switch-to-buffer (get-buffer-create "Left1")))
+@end group
+@end lisp
+
+Here is the layout-definition itself:
+
+@lisp
+@group
+(ecb-layout-define "example-layout2" left-right
+  nil
+
+  ;; here we have an edit-window and left and right two windows each
+  ;; with width `ecb-windows-width'. Dependent to the value of
+  ;; `ecb-compile-window-height' we have also a compile-window at the
+  ;; bottom.
+
+  (ecb-set-left1-buffer)
+  (ecb-split-hor 0.66 t)
+  (ecb-split-ver 0.75)
+  (ecb-set-left4-buffer)
+  (select-window (previous-window (selected-window) 0))
+  (ecb-split-ver 0.25 nil t)
+  (ecb-set-left2-buffer)
+  (ecb-split-hor 0.5)
+  (ecb-set-left3-buffer)
+  (select-window (next-window (next-window)))
+  (ecb-set-left5-buffer)
+  (ecb-split-ver 0.5)
+  (ecb-set-left6-buffer)
+  (select-window (next-window (next-window)))
+  (ecb-set-right1-buffer))
+
+  ;; select the edit-window
+  (select-window (previous-window (selected-window) 0)))
+@end group
+@end lisp
+
+Especially the last example should demonstrate that even very
+complicated layouts are easy to program with @code{ecb-layout-define}.
+If such layouts are senseful is another topic ;-)
+
+@node The layout-engine API, , Possible layout-outlines, The layout-engine
+@subsection The complete layout-engine API of ECB
+
+This section lists all functions, macros, variables and user-options
+the layout-engine API of ECB offers foreign packages. Call
+@code{describe-function} rsp. @code{describe-variable} to get a
+detailed description.
+
+Functions and macros for programming with layouts and special
+ecb-windows:
+@itemize @minus
+@item @code{defecb-window-dedicator}
+@item @code{ecb-available-layouts-member-p}
+@item @code{ecb-canonical-ecb-windows-list}
+@item @code{ecb-canonical-edit-windows-list}
+@item @code{ecb-compile-window-live-p}
+@item @code{ecb-compile-window-state}
+@item @code{ecb-do-if-buffer-visible-in-ecb-frame}
+@item @code{ecb-exec-in-window}
+@item @code{ecb-get-current-visible-ecb-buffers}
+@item @code{ecb-layout-define}
+@item @code{ecb-layout-switch}
+@item @code{ecb-layout-undefine}
+@item @code{ecb-point-in-compile-window}
+@item @code{ecb-point-in-ecb-window-number}
+@item @code{ecb-point-in-edit-window-number}
+@item @code{ecb-select-edit-window}
+@item @code{ecb-split-hor}
+@item @code{ecb-split-ver}
+@item @code{ecb-where-is-point}
+@item @code{ecb-with-dedicated-window}@footnote{Normally not needed because
+@code{defecb-window-dedicator} does all necessary.}
+@end itemize
+
+Utility functions/macros:
+@itemize @minus
+@item @code{ecb-display-one-ecb-buffer}
+@item @code{ecb-enlarge-window}
+@item @code{ecb-fix-filename}
+@item @code{ecb-goto-ecb-window}
+@item @code{ecb-window-live-p}
+@item @code{ecb-with-readonly-buffer}
+@end itemize
+
+Some other maybe useful functions/macros:
+@itemize @minus
+@item @code{ecb-with-adviced-functions}
+@item @code{ecb-with-original-functions}
+@item @code{ecb-with-some-adviced-functions}
+@end itemize
+
+Some useful @strong{READONLY} variables:
+@itemize @minus
+@item @code{ecb-compile-window}
+@item @code{ecb-last-edit-window-with-point}
+@item @code{ecb-last-source-buffer}
+@end itemize
+
+@strong{Caution}: DO NOT USE THE VARIABLE @code{ecb-edit-window} IN
+YOUR PROGRAMS!
+
+User-options and hooks related to the layout-engine API:
+@itemize @minus
+@item @code{ecb-basic-buffer-sync-hook}
+@item @code{ecb-hide-ecb-windows-after-hook}
+@item @code{ecb-hide-ecb-windows-before-hook}
+@item @code{ecb-redraw-layout-after-hook}
+@item @code{ecb-redraw-layout-before-hook}
+@item @code{ecb-show-ecb-windows-after-hook}
+@item @code{ecb-show-ecb-windows-before-hook}
+@item @code{ecb-windows-height}
+@item @code{ecb-windows-width}
+@item @code{ecb-compile-window-height}
+@end itemize
+
+@node Conflicts and bugs, FAQ, Elisp programming, Top
+@chapter Conflicts and bugs of ECB
+
+This chapter describes what to do when there are conflicts with other
+packages and also the known (and currently unfixed) bugs of ECB. If
+possible (and in most cases it is possible ;-) then a practicable
+solution or workaround is described.
+
+@menu
+* Conflicts::                   Conflicts with other packages
+* Bugs::                        Known bugs
+@end menu
+
+@node Conflicts, Bugs, Conflicts and bugs, Conflicts and bugs
+@section Conflicts with other packages
+
+This chapter contains a list of already known conflict between ECB and
+other packages and how to solve them - in most cases ECB already
+contains a suitable workaround.
+
+That is followed by a general recipe what you can do when you have
+detected a conflict between ECB and a package is not listed in the
+know-conflicts-section.
+
+@subsection Proved workarounds or recommendations for other packages
+
+Here is a list of packages which are proved to work properly with ECB
+and if not (i.e. there are conflicts) then helpful
+solutions/hints/workarounds are offered:
+
+@subsubsection Package bs.el
+
+@cindex bs package
+@cindex bs-show
+The package bs.el offers a nifty buffer-selection buffer. The main
+command of this package is @code{bs-show}. With ECB < 2.20 this
+command does not really working well within activated ECB. But as of
+version 2.20 of ECB there should be no problems using this package.
+
+If you add ``*buffer-selection*'' as buffer-name to the option
+@code{ecb-compilation-buffer-names} then ECB will always display the
+buffer-selection buffer of bs in the compile-window (if there is one).
+Otherwise bs will use the edit-area to do its job.
+
+@subsubsection Package BBDB
+
+@cindex BBDB
+As of ECB 2.21 there should be no conflicts between BBDB and ECB, so
+BBDB can be used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (@pxref{Window-managers and
+ECB}). With such a window-manager ECB and BBDB should work together
+very well under all circumstances!
+
+@subsubsection Package calendar.el
+
+@cindex calendar package
+With activated ECB @code{calendar} does not shrink it“s window to the small
+size but splits the window equally. But if you add this to your
+@file{.emacs} it works:
+
+@example
+@group
+(add-hook 'initial-calendar-window-hook
+          (function (lambda ()
+                      (when (and ecb-minor-mode
+                                 (ecb-point-in-edit-window))
+                        ;; if no horizontal split then nothing
+                        ;; special to do
+                        (or (= (frame-width) (window-width))
+                            (shrink-window (- (window-height) 9))))
+                     )))
+@end group
+@end example
+
+@subsubsection Package cygwin-mount.el
+
+@cindex cygwin-mount package
+There can be a conflict between ECB and cygwin-mount.el if the
+following conditions are true:
+
+@itemize @minus
+@item You are working with cygwin-mount.el (sounds clear :-)
+@item You have set @code{cygwin-mount-build-mount-table-asynch} to not
+nil
+@item ECB is automatically started after starting Emacs (e.g. with
+@code{ecb-auto-activate} or calling @code{ecb-activate} in
+@code{window-setup-hook})
+@item Your Emacs-setup contains a call of @code{cygwin-mount-activate}.
+@end itemize
+
+Under these circumstances Emacs 21.X sometimes eats up the whole CPU (at
+least with Windows XP) and the cygwin-mount-table is never build.
+
+But there is an easy work-around: Call @code{cygwin-mount-activate}
+first *AFTER* ECB is activated. This can be done with the hook
+@code{ecb-activate-hook}:
+
+@example
+@group
+(add-hook 'ecb-activate-hook
+          (function (lambda ()
+                      (require 'cygwin-mount)
+                      (setq cygwin-mount-build-mount-table-asynch t)
+                      (cygwin-mount-activate))))
+
+@end group
+@end example
+
+@subsubsection Package desktop.el
+
+@cindex desktop
+ECB works perfectly with the desktop-saver desktop.el. Normally there should
+be nothing to do for you.
+
+But if you encounter problems (e.g. that desktop tries to activate ECB for
+each buffer it loads) then you should add the following entry to the option
+@code{desktop-minor-mode-table}:
+
+@example
+(ecb-minor-mode nil)
+@end example
+
+If you still encounter problems then you should add entries for all the
+minor-mode of the semantic-package to @code{desktop-minor-mode-table}, so for
+example add also:
+
+@example
+@group
+(semantic-decoration-mode nil)
+(semantic-idle-completions-mode nil)
+(semantic-idle-tag-highlight-mode nil)
+(semantic-idle-summary-mode nil)
+(semantic-idle-scheduler-mode nil)
+(senator-isearch-semantic-mode nil)
+(senator-minor-mode nil)
+(semantic-highlight-func-mode nil)
+(semantic-stickyfunc-mode nil)
+(semantic-show-parser-state-mode nil)
+(semantic-show-unmatched-syntax-mode nil
+(semantic-highlight-edits-mode nil
+@end group
+@end example
+
+Normally this should not be necessary, because semantic is already prepared to
+work perfectly with desktop.el. But if there are problems it's worth a try.
+Which modes you have to add depends on which modes of semantic you use. But to
+get sure you should add all minor-modes of the semantic-package because these
+modes are normally activated by the related ``global'' command (e.g.
+@code{global-semantic-show-unmatched-syntax-mode}) or by adding the minor-mode
+to the related major-mode-hook.
+
+It has also been reported that just disabling the Tip-Of-The-Day
+(option: @code{ecb-tip-of-the-day}) fixes the compatibility-problems
+with desktop.el. Just try it out!
+
+@subsubsection Package edebug (Lisp Debugger)
+
+@cindex edebug
+It is strongly recommended to run edebug only when the ECB-windows are
+hidden. With visible ECB-windows there will probably serious conflicts
+between the ECB-layout and the edebug-window-manager.
+
+@subsubsection Package ediff.el
+
+@cindex ediff
+In most cases ECB works very well with ediff (see option
+@code{ecb-run-ediff-in-ecb-frame}). But currently suspending ediff
+with @code{ediff-suspend} and restoring the ediff-session (e.g. with
+command @code{eregistry}) does confuse the window-management of ECB.
+
+If you often use ediff in a scenario where you suspend ediff and
+reactivate it later then it is recommended to exit ECB first
+(@code{ecb-deactivate} or @code{ecb-minor-mode})!
+
+@subsubsection Package func-menu.el
+
+@cindex func-menu package
+This package has been reported to produce some conflicts under some
+circumstances when ECB is activated. Some of them could be reproduced
+by the ECB-maintainer. So the recommendation is to disable
+func-menu-support when using ECB. Normally using func-menu makes no
+sense in combination with ECB because ECB provides the same and even
+more informations as func-menu - so func-menu is redundant ;-)
+
+@subsubsection Package Gnus (Newsreader)
+
+@cindex Gnus
+As of ECB 2.21 there should be no conflicts between Gnus and ECB, so
+Gnus can be used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (@pxref{Window-managers and
+ECB}). With such a window-manager ECB and Gnus should work together
+very well under all circumstances!
+
+@subsubsection Package JDEE (Java Development Environment)
+
+@cindex JDEE
+JDEE has a lot of ``dialogs'' where the user can select among several
+choices. An example is importing classes via the command
+@code{jde-import-find-and-import}. These dialogs are strongly designed
+to work in an environment where a new temporary window is created, the
+contents of the dialog are displayed in the new window, the user
+select his choice and hits [OK]. After that the new window is deleted
+and the selection is performed (for example the chosen import
+statement are inserted in the source-buffer.
+
+@strong{Caution}: ECB can work very well with this dialogs but only if
+the buffer-name of these dialog-buffers (normally ``Dialog'') is not
+contained in the option @code{ecb-compilation-buffer-names}. So do not
+add the string ``Dialog'' to this option!
+
+@strong{Please Note}: Regardless if a persistent compile-window is used
+(i.e. @code{ecb-compile-window-height} is not nil) or not, these
+JDEE-dialogs will always being displayed by splitting the edit-window
+of ECB and not within the compile-window.
+
+@subsubsection Package scroll-all.el (scroll-all-mode)
+
+@cindex scroll-all-mode
+@cindex scroll-all
+ECB advices @code{scroll-all-mode} so it is working correct during
+running ECB. This means if point stays in an edit-window and the
+edit-window is splitted then all edit-windows are scrolled by
+@code{scroll-all-mode} and no other window! If point stays in any
+other window just this selected window is scrolled. This is the only
+senseful behavior of @code{scroll-all-mode} with ECB.
+
+@subsubsection Package VC (Version Control)
+
+@cindex VC package
+@cindex Version control
+The variable @code{vc-delete-logbuf-window} must be set to nil during
+active ECB. This can be done with the hooks mentioned in @ref{Elisp
+programming}.
+
+@subsubsection Package VM (Emacs Mail-Client)
+
+@cindex VM package
+As of ECB 2.21 there should be no conflicts between VM and ECB, so
+VM can be used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (@pxref{Window-managers and
+ECB}). With such a window-manager ECB and VM should work together very
+well under all circumstances!
+
+
+@subsubsection Package winner.el (winner-mode)
+
+@cindex winner-mode
+@cindex winner
+@code{winner-mode} is autom. disabled as long as ECB is running. ECB
+has its own window-management which is completely incompatible with
+@code{winner-mode}! But @code{winner-mode} makes also not really sense
+with ECB.
+
+@subsubsection Package wb-line-number.el
+@cindex wb-line-number
+
+Do not use the package wb-line-number.el in combination with ECB - it
+will not work and it will not work under any circumstances and there
+is no way to make it work together and there will be no way in the
+future!
+
+The reason behind that is: wb-line-number.el uses additional dedicated
+windows to display the line-numbers. And ECB can not work if there
+there are additional dedicated windows - additional to that ones
+created by ECB.
+
+@subsubsection Application xrefactory
+
+@cindex xrefactory
+Xrefactory (also known as Xref, X-ref and Xref-Speller), the
+refactoring browser for (X)Emacs@footnote{Xrefactory is available at
+@ifhtml
+@uref{http://www.xref-tech.com}
+@end ifhtml
+@ifnothtml
+@url{http://www.xref-tech.com}
+@end ifnothtml
+}, can be used during running ECB regardless if the ECB-windows are
+visible or not. There should be no conflicts as of ECB versions >=
+2.21.
+
+If there are conflicts with the Xref-browser then the most recommended
+way is to use one of the window-manager escreen.el or winring.el (and
+then use different escreens or window-configurations for ECB and
+Xrefactory-browsing - @ref{Window-managers and ECB}).
+
+@subsection What to do for unknown conflicts with other packages
+
+As of version 2.20 the layout-engine of ECB is so flexible that
+normally there should be no conflicts with other packages unless these
+packages have their own complete window-layout-management (e.g. Gnus,
+BBDB, Xrefactory). But these packages can and should be handled very
+well with the window-manager-support of ECB (@pxref{Window-managers
+and ECB}).
+
+So if you detect an unknown (i.e. not listed in the conflicts-list in
+the next subsection) conflict with a small package and some of its
+commands and you have installed an ECB-version < 2.20 the first task
+you have to do is to upgrade to a version >= 2.20!
+
+If this doesn't solve the problem a very probable reason for the
+conflict is that the command fails if called from another window than
+an edit-window of the ecb-frame. So please check if the problem
+disappears if you call the failing command from an edit-window of ECB.
+If this is true then you you can add the following code to your
+.emacs (and of course replace the XXX with the failing command):
+
+@example
+@group
+(defecb-advice XXX before ecb-compatibility-advices
+  "Ensures `XXX' works well when called from another window
+as an edit-window. Does nothing if called in another frame
+as the `ecb-frame'."
+  (when (equal (selected-frame) ecb-frame)
+    (unless (ecb-point-in-edit-window)
+      (ecb-select-edit-window))))
+@end group
+@end example
+
+This before-advice runs before the command XXX and ensures that the
+XXX is called from within an edit-window if the current selected
+window is not an edit-window. It does nothing if called for another
+frame as the ecb-frame.
+
+@strong{Please note}: You have to define such compatibility advices exactly as
+demonstrated in the example above, i.e. you must use the macro
+@code{defecb-advice} and you have to use the advice-set
+@code{ecb-compatibility-advices} (see the documentation of this macro)! The
+advice-class is not necessary @code{before}, it can be @code{after} or
+@code{around} too. Never use @code{defadvice} for ECB-advices!
+
+If such an advice solves the problem then please send a note with the
+solution to the ECB-mailing-list or direct to the ECB-maintainer so
+the solution can be integrated in the next ECB-release
+
+If calling from an edit-window fails too then please file a complete
+bug-report to the ECB-mailing-list (@pxref{Submitting problem
+report}). This report should contain a detailed description which
+command of which package fails under which circumstances!
+
+
+@node Bugs, , Conflicts, Conflicts and bugs
+@section Known bugs
+
+This section describes all currently known bugs of ECB. The
+maintainers of ECB try to fix these bugs as soon as possible.
+
+@subsection Extra history-entries for JDEE source-buffers
+
+ECB on occasions creates an extra edit buffer for entries in the
+history window. For example, let say there are three entries in the
+history window:
+
+@example
+@group
+Test1
+Test2
+Test3
+@end group
+@end example
+
+In the edit window Test1 file is edited. When clicked on Test2 entry
+in history, on occasion instead of switching to the existing buffer for
+Test2, a new edit buffer is opened for Test2 file. At this point, there
+are four entries in the history as follows:
+
+@example
+@group
+Test2
+Test2<2>
+Test1
+Test3
+@end group
+@end example
+
+@node FAQ, Command Index, Conflicts and bugs, Top
+@chapter Frequently asked questions
+
+This is the Emacs Code Browser FAQ.
+
+@c To produce prettier output we make a small empty column between the
+@c question- and the answer-column. Therefore every Q/A-item must look
+@c like:
+@c
+@c    @c an empty line between every Q/A-item
+@c    @item @tab @tab
+@c
+@c    @c The Q/A-item
+@c    @item
+@c    <The text of the question?>
+@c    @tab @tab
+@c    <The text of the answer>
+
+@multitable @columnfractions 0.40 0.01 0.59
+
+@item
+@ifnotinfo
+@strong{Question}
+@end ifnotinfo
+@ifinfo
+QUESTION
+@end ifinfo
+@tab @tab
+@ifnotinfo
+@strong{Answer}
+@end ifnotinfo
+@ifinfo
+ANSWER
+@end ifinfo
+
+@c an empty line between every Q/A-item
+@item @tab @tab
+
+@c The Q/A-item
+@item
+What is the first step i should do if i have problems with ECB?
+@tab @tab
+Read carefully the related sections of the online-help of ECB.
+
+@item @tab @tab
+
+@item
+What should i do, if a have a problem which can not be solved even
+after reading the online-help?
+@tab @tab
+Send a problem-report to the ECB-mailing-list with the command
+@code{ecb-submit-problem-report}.
+@ifinfo
+@*
+@end ifinfo
+See @ref{Submitting problem report}.
+
+@item @tab @tab
+
+@item
+What should i do, if another package seems not to work correct with
+ECB?
+@tab @tab
+Take a look into @ref{Conflicts}. If your package is not listed there
+then submit a problem-report.
+
+@item @tab @tab
+
+@item
+Can ECB parse and display source-contents not supported by semantic?
+@tab @tab
+Yes, in all version >= 1.94. ECB can now parse and display all
+source-contents supported by semantic, imenu or etags - same as
+speedbar. See @ref{Non-semantic sources}.
+
+@item @tab @tab
+
+@item
+Why are the lines in the ECB-, temp- and compilation-buffers not
+wrapped but truncated?
+@tab @tab
+Check the variable @code{truncate-partial-width-windows} and set it to
+nil.
+
+@item @tab @tab
+
+@item
+Why doesn't ECB work correct with VC?
+@tab @tab
+The variable @code{vc-delete-logbuf-window} must be set to nil during
+active ECB. This can be done with the hooks of ECB.
+
+@item @tab @tab
+
+@item
+Does ECB support C++ as well as Java?
+@tab @tab
+In general C++ is supported very well. But it depends on the used
+cedet-version, but cedet-version >= 1.0pre6 support C++ really well.
+
+@item @tab @tab
+
+@item
+Does ECB support Perl?
+@tab @tab
+If perl can be parsed either by imenu, etags or semantic then ECB
+supports perl. Of course ECB would support perl best if perl is
+supported by semantic.
+
+@item @tab @tab
+
+@item
+Does ECB support language XYZ?
+@tab @tab
+See question ``Does ECB support Perl?'' and replace ``Perl'' with
+``XYZ'' in the answer.
+
+@item @tab @tab
+
+@item
+How to add new languages to ECB?
+@tab @tab
+Add the language XYZ to semantic (perform all necessary steps described in
+the semantic-manual) and ECB will automatically support language XYZ!
+There is nothing to do in ECB itself! Same when you write an imenu- or
+etags-support for language XYZ.
+
+@item @tab @tab
+
+@item
+Why does ECB not recognize my source-files for C++?
+@tab @tab
+Your C++-files have probably an extension which is not mapped to
+c++-mode in @code{auto-mode-alist} and/or your own Emacs-setup has
+``destroyed'' the correct value of the hook-variable
+@code{c++-mode-hook}.
+@ifinfo
+@*
+@end ifinfo
+See @ref{Setting up Emacs}.
+
+@item @tab @tab
+
+@item
+Is it possible to make the history of ECB persistent?
+@tab @tab
+You can use the library ``desktop.el'' which works very well with ECB.
+Then all files of your recent Emacs-session will be opened
+automatically after next Emacs-start and will be added automatically
+to the ECB-history after ECB-start.
+
+@item @tab @tab
+
+@item
+Is there an ``Intellisense''-mechanism like with other IDEs?
+@tab @tab
+For Java the JDEE@footnote{
+@ifhtml
+@uref{http://jdee.sunsite.dk/}
+@end ifhtml
+@ifnothtml
+@url{http://jdee.sunsite.dk/}
+@end ifnothtml
+} has this feature and for all other languages
+semantic offer something similar, see
+@ifhtml
+@uref{http://cedet.sourceforge.net/intellisense.shtml}
+@end ifhtml
+@ifnothtml
+@url{http://cedet.sourceforge.net/intellisense.shtml}
+@end ifnothtml
+
+@item @tab @tab
+
+@item
+Can i use ECB in combination with Gnus within one frame?
+@tab @tab
+You can, but for ECB-versions < 1.96 it is not recommended because
+each of them has it's own window-management and probably there will be
+conflicts, so use different frames for ECB and Gnus! But beginning
+with ECB 1.96 you can use either escreen.el or winring.el as
+``window-manager'' which allows you in consequence to use ECB and
+applications like Gnus in one frame!
+@ifinfo
+@*
+@end ifinfo
+@xref{Window-managers and ECB}.
+
+@item @tab @tab
+
+@item
+Can i speed up displaying the contents of big-size directories?
+@tab @tab
+Yes, see the option @code{ecb-cache-directory-contents}. Read the
+section
+@ifinfo
+@*
+@end ifinfo
+@ref{Large directories}.
+
+@item @tab @tab
+
+@item
+Is it possible to create/use other layouts than the built-in ones?
+@tab @tab
+Yes. @ref{Creating a new ECB-layout} and
+@ifinfo
+@*
+@end ifinfo
+@ref{The layout-engine} are the relevant sections. The former one
+describes how to create interactively new layouts where the latter
+one is for Elisp-programmers.
+
+@item @tab @tab
+
+@item
+Can i use speedbar as directory-browser within ECB?
+@tab @tab
+Yes, see @ref{Integrating speedbar}.
+
+@item @tab @tab
+
+@item
+Can i exclude subdirectories from the recursive grep in the directories buffer?
+@tab @tab
+Yes, see @ref{Grepping directories}.
+
+@item @tab @tab
+
+@item
+How can i prevent contaminating each directory with a file @file{semantic-cache}?
+@tab @tab
+Set @code{semanticdb-default-save-directory} to a directory.
+
+@item @tab @tab
+
+@item
+Why ECB displays large portions of current source-file with dark background?
+@tab @tab
+This comes from semantic;
+@ifinfo
+@*
+@end ifinfo
+see @ref{Setting up Emacs}.
+
+@item @tab @tab
+
+@item
+Why ECB underlines some parts of current source-file?
+@tab @tab
+This comes from semantic;
+@ifinfo
+@*
+@end ifinfo
+see @ref{Setting up Emacs}.
+
+@item @tab @tab
+
+@item
+Can i add my own commands to the popup-menus of tree-buffers?
+@tab @tab
+Yes, see @ref{Using the mouse}.
+
+@item @tab @tab
+
+@item
+Can ECB display the compile-window ``on demand''?
+@tab @tab
+Yes, see @ref{Common use-cases}.
+
+@item @tab @tab
+
+@item
+Which buffers are treated as compilation-buffers by ECB?
+@tab @tab
+See the docstring of the function @code{ecb-compilation-buffer-p}.
+
+@item @tab @tab
+
+@item
+How can i change the modeline of an ECB-tree-buffer?
+@tab @tab
+You can change it with the options @code{ecb-mode-line-prefixes},
+@code{ecb-mode-line-data} and
+@code{ecb-mode-line-display-window-number}.
+
+@item @tab @tab
+
+@item
+Can the tree-buffers being selected faster than with the
+standard-keybindings of ECB? 
+@tab @tab
+Yes, see option @code{ecb-mode-line-display-window-number}.
+
+@item @tab @tab
+
+@item
+Can ECB display the window-number in the modeline of the special windows?
+@tab @tab
+Yes, see option @code{ecb-mode-line-display-window-number}.
+
+@item @tab @tab
+
+@item
+How can i change the keybindings of ECB?
+@tab @tab
+You can do this with option @code{ecb-key-map} (@pxref{ecb-general}).
+
+@item @tab @tab
+
+@item
+What can i do if hiding/showing from the methods-buffer does not work?
+@tab @tab
+Either the current @code{major-modes} is not supported by hideshow or
+you have to add an entry to @code{hs-special-modes-alist}
+@ifinfo
+@*
+@end ifinfo
+(@pxref{Hide-show}).
+
+@item @tab @tab
+
+@item
+Can i maximize one of the ECB-windows for better overlook?
+@tab @tab
+Yes, see @ref{Maximizing the ECB windows}.
+
+@item @tab @tab
+
+@item
+Can i hide the ECB-windows for getting more editing-space?
+@tab @tab
+Yes, see @ref{Hiding the ECB windows}.
+
+@item @tab @tab
+
+@item
+Can i define the actions ECB performs after visiting a tag?
+@tab @tab
+Yes, see @ref{Visiting tags}.
+
+@item @tab @tab
+
+@item
+Buffers are not displayed correctly in the compile-window?
+@tab @tab
+See @ref{Problems with the compile window}.
+
+@item @tab @tab
+
+@item
+Can ECB work together with window-managers like escreen.el?
+@tab @tab
+Yes, see @ref{Window-managers and ECB}.
+
+@item @tab @tab
+
+@item
+Can i remove these ``ugly'' vertical lines from a tree-buffer?
+@tab @tab
+Yes, see option @code{ecb-tree-buffer-style}.
+
+@item @tab @tab
+
+@item
+ECB does not display images in the tree-buffers - what can i do?
+@tab @tab
+Customize @code{ecb-tree-buffer-style} and restart ECB. But note: GNU
+Emacs <= 21.3.X for Windows does not support image-display so ECB uses
+always ascii-guide-lines even when here the image-style is set in
+@code{ecb-tree-buffer-style}.
+
+@item @tab @tab
+
+@item
+Do @code{special-display-function} et. al. work with ECB.
+@tab @tab
+Yes, see
+@ifinfo
+@*
+@end ifinfo
+@ref{Using special-display with ECB}.
+
+@item @tab @tab
+
+@item
+Can i activate the popup-menu of a tree-buffer from keyboard?
+@tab @tab
+Yes, see @ref{Using popup-menus}.
+
+@item @tab @tab
+
+@item
+Can i display the popup-menu of a tree-buffer with tmm?
+@tab @tab
+Yes, see @ref{Using popup-menus}.
+
+@item @tab @tab
+
+@item
+Does ECB disable all advices after deactivation?
+@tab @tab
+``Nes''@footnote{Nes is a combination of No and Yes :-)}, see remarks
+in the documentation of the option
+@code{ecb-split-edit-window-after-start}.
+
+@item @tab @tab
+
+@item
+Can ECB preserve the full state of ECB between deactivation and next
+activation?
+@tab @tab
+Yes, see the option @code{ecb-split-edit-window-after-start}.
+
+@item @tab @tab
+
+@item
+Can i change the behavior how ECB chooses another window for selecting
+it or scrolling it.
+@tab @tab
+Yes, see @ref{The other window}.
+
+@item @tab @tab
+
+@item
+Can i increase the allowed depth of nested submenus.
+@tab @tab
+Yes, see the docstring of the option
+@code{ecb-directories-menu-user-extension}.
+
+@item @tab @tab
+
+@item
+Can i apply some filters to the Tree-buffers.
+@tab @tab
+Yes, see @ref{Filtering the tree-buffers}
+
+@item @tab @tab
+
+@item
+With XEmacs i get sometimes an error ``Wrong number of arguments:
+widen (1)''. What can i do?
+@tab @tab
+Disable the func-menu support in your XEmacs-setup. See
+@ref{Conflicts}.
+
+@item @tab @tab
+
+@item
+Can i use desktop.el in combination with ECB?
+@tab @tab
+Yes, see @ref{Conflicts}.
+
+@item @tab @tab
+
+@item
+Opening directories takes a long time - what can i do?
+@tab @tab
+Read @ref{Large directories}.
+
+@item @tab @tab
+
+@item
+ECB seems to be blocked sometimes - what is the reason?
+@tab @tab
+ECB performs some stealthy tasks when idle - this can cause sometimes
+a blocked Emacs but this tasks will be immetiatelly interrupted by any
+user-event so there should be normally no problems. But especially for
+mounted net-drives some of the stealthy tasks can take time up to some
+seconds for each file - and during one file-operation it can not be
+interrupted. See also @code{ecb-stealthy-tasks-delay}.
+
+@item @tab @tab
+
+@item
+Can i exclude certain directories from being checked for emptyness?
+@tab @tab
+Yes, see option @code{ecb-prescan-directories-exclude-regexps}.
+
+@item @tab @tab
+
+@item
+Can i exclude certain directories from checking the VC-state of the
+contained sources?
+@tab @tab
+Yes, see option @code{ecb-vc-directory-exclude-regexps}.
+
+@item @tab @tab
+
+@item
+Can i exclude certain directories from checking the read-only-state of
+the contained sources?
+@tab @tab
+Yes, see option @code{ecb-read-only-check-exclude-regexps}.
+
+@item @tab @tab
+
+@item
+ECB ignores the remote-paths i have added to @code{ecb-source-path}.
+@tab @tab
+Maybe you have to check the option @code{ecb-ping-options}. Ensure
+that this option contains a value suitable for your ping-program (see
+@code{ecb-ping-program}).
+@ifinfo
+@*
+@end ifinfo
+See also @ref{Remote directories}.
+
+@item @tab @tab
+
+@item
+ECB seems to be blocked a long time.
+@tab @tab
+Maybe you use cygwin-XEmacs. Then either the empty-dir-check (see
+option @code{ecb-prescan-directories-for-emptyness}) or the VC-support
+(see @code{ecb-vc-enable-support}) can block ECB. 
+@ifinfo
+@*
+@end ifinfo
+For the latter one see @ref{Known VC-problems}.
+
+@item @tab @tab
+
+@item
+ECB seems to be blocked during the VC-state update in the
+tree-windows.
+@tab @tab
+Maybe the root repository for the current directory is a
+remote-repository. This can result in a long lasting check-time per
+file. 
+@ifinfo
+@*
+@end ifinfo
+See also @ref{Version-control support} for hints what you can do.
+
+@item @tab @tab
+
+@item
+I have encountered some problems with the display of the VC-state in
+the tree-buffers.
+@tab @tab
+See also @ref{Version-control support} for hints what you can do.
+
+@item @tab @tab
+
+@item
+The state of the files under version control seems to be not accurate. What is
+the reason and what can i do?
+@tab @tab
+The option @code{ecb-vc-supported-backends} offers now also a accurate
+recompute-state function. This is by offering @code{ecb-vc-recompute-state} as
+an alias to the function @code{vc-recompute-state} as state-check function for
+this option. See also @ref{Version-control support}
+
+@item @tab @tab
+
+@item
+With Emacs 23 ECB shows a odd split-behavior when calling help or displaying
+completion-output or compilation- or grep-output. What is the reason.
+@tab @tab
+Check the values of the options @code{split-width-threshold} and
+@code{split-height-threshold}. ECBs split-behavior depends fully on the
+Emacs-logic and that one depends mainly on these two options. So adjust them
+to match (at least nearly) the sizes of the edit-area of ECB.
+
+@item @tab @tab
+
+@item
+When using a layout with the special ecb-window for the semantic analyzer then
+Emacs seems to be blocked when typing pauses. What is the reason and what can
+i do?
+@tab @tab
+This comes from the idle-mechanism ECB/semantic uses to offer some
+intellisense like displaying possible completions and local variables
+depending on current context (ie. location of point). So if point stays on a
+location within your code where hundreds (or even thousands) of completions
+are possible then parsing and displaying them can last annoying time. But in
+general a keypress interupts. If not then you have to possibilities offered by
+the options @code{ecb-analyse-buffer-sync} and
+@code{ecb-analyse-buffer-sync-delay}: You can increase the delay of the latter
+one so parsing current context starts later after Emacs goes idle (ie. after
+you pause typing). Or you can disable the automatic synchronizing the
+analyser-window with the former one - see the docstring. Then you have to
+synchronize (ie. start parsing context) on demand via the command
+@code{ecb-analyse-buffer-sync}@footnote{Yes, both the option and the command
+have the same name}.
+
+@item @tab @tab
+
+@item
+How can i change the bucketizing method of the history-window?
+@tab @tab
+Either via popup context-menu (right mouse-button) or with the option
+@code{ecb-history-make-buckets}.
+
+@item @tab @tab
+
+@item
+How can i disable this grey headerline in the tree-buffers?
+@tab @tab
+See the option @code{ecb-tree-make-parent-node-sticky}.
+
+@item @tab @tab
+
+@item
+When clicking onto a parent-node in the methods-window then ECB doesn't jump
+to the definition of this parent-type.
+@tab @tab
+ECB uses completely the smartness of the semanticdb and the semantic-analyzer.
+So if you have customized semantic accordingly to the needs of your project
+(ie. mainly setting up all so semantic can find files in your
+directory-structure) then ECB will find the parent-definition and also jump to
+it. See @ref{ECB Methods-window} and the subsection ``Jumping to the
+definition of external tags'' and see the option
+@code{ecb-find-external-tag-functions}.
+
+@end multitable
+
+@node Command Index, Option Index, FAQ, Top
+@unnumbered Command Index
+
+@noindent
+This index contains all user commands of ECB.
+
+@strong{Please note}: The commands in this index are listed without
+the prefix ``ecb-'' (e.g. the command @code{ecb-activate} is listed
+with name ``activate'').
+
+@printindex fn
+
+@node Option Index, Concept Index, Command Index, Top
+@unnumbered Option Index
+
+@noindent
+This index contains all customizable options of ECB.
+
+@strong{Please note}: All options in this index are listed without the
+prefix ``ecb-'' (e.g. the option @code{ecb-layout-name} is listed with
+name ``layout-name'').
+
+@printindex vr
+
+@node Concept Index, , Option Index, Top
+@unnumbered Concept Index
+
+@printindex cp
+
+@contents
+
+
+@bye
+
+@c  LocalWords:  texinfo Berndl java ECB ecb texi berndl Exp setfilename vr cp
+@c  LocalWords:  settitle syncodeindex fn ifinfo paragraphindent exampleindent
+@c  LocalWords:  footnotestyle frobbed ecbver dircategory direntry titlepage sp
+@c  LocalWords:  titlefont vskip pt Jesper Nordenberg dir ifnottex Elisp imenu
+@c  LocalWords:  etags perl iftex ref tex url ifhtml uref detailmenu eshell API
+@c  LocalWords:  keybindings speedbar Grepping JDEE website eieio xref subdirs
+@c  LocalWords:  loadtime autoloads Bytecompiling bytecompile EMACSINFOPATH hxx
+@c  LocalWords:  pxref alist multitable columnfractions ifnotinfo hh HH cxx cpp
+@c  LocalWords:  CC jde setq RET kbd Alt minibuffer cindex dfn grep ascii popup
+@c  LocalWords:  screenshot splitted sourcecode noindent de itemx rsp CTRL hor
+@c  LocalWords:  senseful modeline subnode uml const gm Ctrl docstring autom lc
+@c  LocalWords:  subsubsection fontify defun asis Hist leftright lr nav dired
+@c  LocalWords:  deffn var CLEARALL cedet sourcepath classpath arg html regexp
+@c  LocalWords:  backtrace def incl defopt cdr keysequence SPC DEL LFD ESC NUL
+@c  LocalWords:  alt abc horiz filenumber rexexp bigdir iff cvsignore lib ini
+@c  LocalWords:  elc obj dll rexexps assoc taglist bovinate toplevel oo CLOS
+@c  LocalWords:  defclass colorized XYZ XYC structs colorizing struct enum adv
+@c  LocalWords:  func comint proc min subdir wget gzip cygwin ifnothtml env iso
+@c  LocalWords:  http defcustom upgradable defconst lw doc ls grepping tempor
+@c  LocalWords:  igrep CVS gen maxout FF hs hideshow JDEbug defmac ver undefine
+@c  LocalWords:  Bufferinfo rw bufferinfo readonly filebuffer filebuffers pos
+@c  LocalWords:  cond buf preactivation usw msw lsw asynch XP Newsreader BBDB
+@c  LocalWords:  VC vc logbuf BNF Intellisense IDEs semanticdb printindex
diff --git a/site/ecb-2.40/html-help/A-new-tree_002dbuffer.html b/site/ecb-2.40/html-help/A-new-tree_002dbuffer.html
new file mode 100644
index 0000000..8b5e00f
--- /dev/null
+++ b/site/ecb-2.40/html-help/A-new-tree_002dbuffer.html
@@ -0,0 +1,587 @@
+<html lang="en">
+<head>
+<title>A new tree-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="Introduction.html#Introduction" title="Introduction">
+<link rel="next" href="A-new-tree_002dnode.html#A-new-tree_002dnode" title="A new tree-node">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="A-new-tree-buffer"></a>
+<a name="A-new-tree_002dbuffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Introduction.html#Introduction">Introduction</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.2 How to create a new tree-buffer</h4>
+
+<p>The creator-function for a new tree-buffer depends on the fact if the
+new tree-buffer should be used as an ECB-window or not. For a new
+ECB-window the macro <code>defecb-tree-buffer-creator</code> has to be
+used, otherwise the function <code>tree-buffer-create</code>. In the end
+both methods use <code>tree-buffer-create</code> because the BODY-argument
+of <code>defecb-tree-buffer-creator</code> must contain a call to this
+function!.
+
+   <p>This section describes all arguments of <code>tree-buffer-create</code>.
+
+   <p>Except the first argument <var>NAME</var> all arguments are key-arguments
+of the form :arg-name arg-value, so for example a call looks like
+
+<pre class="example">   (tree-buffer-create &lt;buffer-name&gt; :frame &lt;frame-object&gt; ...).
+</pre>
+   <p>These key-arguments (all except the first argument <code>NAME</code>) can be
+arranged in any arbitrary order but all of them are not-optional! The
+key-arg-name is always a : followed by the lowercase version of the
+mentioned argument below (e.g. <code>FRAME</code> &ndash;&gt; :frame,
+<code>MOUSE-ACTION-TRIGGER</code> &ndash;&gt; :mouse-action-trigger).
+
+   <p>Here is a description of the arguments of <code>tree-buffer-create</code> -
+also available as docstring for this function (via <kbd>C-h f</kbd>). The
+description below contains also some examples for complex-arguments!
+
+     <dl>
+<dt><code>NAME</code><dd>Buffername of the new tree-buffer.
+
+     <br><dt><var>FRAME</var><dd>Frame in which the tree-buffer is displayed and valid. All
+key-bindings and interactive functions of the tree-buffer work only if
+called in <var>FRAME</var> otherwise nothing is done!
+
+     <br><dt><var>MOUSE-ACTION-TRIGGER</var><dd>When a mouse-action is triggered. Allowed values:
+<code>button-release</code> and <code>button-press</code>.
+
+     <br><dt><var>IS-CLICK-VALID-FN</var><dd><code>tree-buffer-create</code> rebinds <kbd>mouse-1</kbd>, <kbd>mouse-2</kbd>,
+<kbd>RET</kbd> (and <kbd>TAB</kbd>) and also in combination with shift and
+control (not with <kbd>TAB</kbd>). <var>IS-CLICK-VALID-FN</var> is called first
+if a node or an expand-symbol is clicked. This function is called with
+five arguments:
+
+          <ul>
+<li>mouse-button:
+The clicked mouse-button or RET or TAB (0 = RET or TAB, 1 = mouse-1, 2
+= mouse 2)
+<li>shift-pressed:
+Non nil if the SHIFT-key was pressed during mouse-click or RET. 
+<li>control-pressed:
+Non nil if the CONTROL-key was pressed during mouse-click or RET. 
+<li>meta-pressed:
+Non nil if the META-key was pressed during mouse-click or RET. 
+<li>tree-buffer-name:
+The buffer-name of the tree-buffer where the node has been clicked. 
+</ul>
+
+     <p>The function must return not nil iff exactly this click/hit is
+accepted. If the function returns nil then really nothing is done by
+the tree-buffer after this click/hit!
+
+     <p>Here is an example (call <kbd>C-h f</kbd> to see what it does) for this
+callback-function:
+
+     <pre class="example">        (defun ecb-interpret-mouse-click (mouse-button
+                                          shift-pressed
+                                          control-pressed
+                                          meta-pressed
+                                          tree-buffer-name)
+          (if (eq mouse-button 0)
+              (list (if control-pressed 2 1) shift-pressed meta-pressed
+                    'keyboard)
+            (if (and (not (eq mouse-button 1)) (not (eq mouse-button 2)))
+        	nil
+              (case ecb-primary-secondary-mouse-buttons
+                (mouse-1--mouse-2
+                 (if control-pressed
+                     nil
+                   (list mouse-button shift-pressed meta-pressed 'mouse)))
+                (mouse-1--C-mouse-1
+                 (if (not (eq mouse-button 1))
+                     nil
+                   (list (if control-pressed 2 1) shift-pressed meta-pressed
+                         'mouse)))
+                (mouse-2--C-mouse-2
+                 (if (not (eq mouse-button 2))
+                     nil
+                   (list (if control-pressed 2 1) shift-pressed meta-pressed
+                         'mouse)))
+                (otherwise nil)))))
+   </pre>
+     <p>This example would be passed as parameter as follows:
+
+     <pre class="example">        (tree-buffer-create "myname"
+                            :is-click-valid-fn 'ecb-interpret-mouse-click
+                            ...)
+   </pre>
+     <br><dt><var>NODE-SELECTED-FN</var><dd>Function to call if a node has been selected. This function
+is called with the following parameters:
+
+          <ul>
+<li>node: The selected node
+<li>mouse-button (0 = RET, 1 = mouse-1, 2 = mouse 2)
+<li>shift-pressed
+<li>control-pressed
+<li>meta-pressed
+<li>tree-buffer-name
+</ul>
+
+     <p>For the last four arguments see the description above. This function
+has to ensure that the expandable- and expanded-state of the selected
+node is correct after returning.
+
+     <p>Here is an example (call <kbd>C-h f</kbd> to see what it does) for this
+callback-function:
+
+     <pre class="example">        (defun ecb-tree-buffer-node-select-callback (node
+        					     mouse-button
+        					     shift-pressed
+        					     control-pressed
+                                                     meta-pressed
+        					     tree-buffer-name)
+          (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+        						     shift-pressed
+        						     control-pressed
+                                                             meta-pressed
+        						     tree-buffer-name))
+        	 (ecb-button (nth 0 ecb-button-list))
+        	 (shift-mode (nth 1 ecb-button-list))
+                 (meta-mode (nth 2 ecb-button-list))
+                 (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard))
+                 (maximized-p (ecb-buffer-is-maximized-p tree-buffer-name)))
+            ;; now we dispatch to the right action
+            (when ecb-button-list
+              (cond ((ecb-string= tree-buffer-name ecb-directories-buffer-name)
+        	     (ecb-directory-clicked node ecb-button nil shift-mode
+                                            meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-sources-buffer-name)
+        	     (ecb-source-clicked node ecb-button nil shift-mode
+                                         meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-history-buffer-name)
+        	     (ecb-history-clicked node ecb-button nil shift-mode
+                                          meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-methods-buffer-name)
+        	     (ecb-method-clicked node ecb-button nil shift-mode
+                                         meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-analyse-buffer-name)
+        	     (ecb-analyse-node-clicked node ecb-button nil shift-mode
+                                               meta-mode))
+        	    (t nil)))))
+   </pre>
+     <p>This example would be passed as parameter as follows:
+
+     <pre class="example">        (tree-buffer-create "myname"
+                            :node-selected-fn 'ecb-tree-buffer-node-select-callback
+                            ...)
+   </pre>
+     <p><strong>IMPORTANT</strong>: This callback must not modify the slot
+<var>EXPANDED</var> of the passed node because this is done automatically
+by the tree-buffer-library!
+
+     <br><dt><var>NODE-EXPANDED-FN</var><dd>Function to call if a node is expandable, point stays onto the
+expand-symbol and node is not already expanded. This function is
+called with the following parameters:
+
+          <ul>
+<li>node: The selected node
+<li>mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+<li>shift-pressed
+<li>control-pressed
+<li>meta-pressed
+<li>tree-buffer-name
+</ul>
+
+     <p>This function should add all children nodes to this node if not
+already done (if possible). This function has to ensure that the
+expandable- and expanded state of the selected node is correct after
+returning!
+
+     <p><strong>IMPORTANT</strong>: This callback must not modify the slot
+<var>EXPANDED</var> of the passed node because this is done automatically
+by the tree-buffer-library!
+
+     <br><dt><var>NODE-COLLAPSED-FN</var><dd>Function to call if a node is expandable, point stays onto the
+expand-symbol and node is already expanded. This function is called
+with the following parameters:
+
+          <ul>
+<li>node: The selected node
+<li>mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+<li>shift-pressed
+<li>control-pressed
+<li>meta-pressed
+<li>tree-buffer-name
+</ul>
+
+     <p>This function is only a callback to inform the owner/user of this
+tree-buffer that this node has been collapsed. This function must not
+modify the expandable- or expanded state of the selected node!
+
+     <p>Often a sensefull value for this parameter is the function
+<code>ignore</code>.
+
+     <p><strong>IMPORTANT</strong>: This callback must not modify the slot
+<var>EXPANDED</var> of the passed node because this is done automatically
+by the tree-buffer-library!
+
+     <br><dt><var>NODE-MOUSE-OVER-FN</var><dd>Function to call when the mouse is moved over a node. This function is
+called with three arguments: NODE, WINDOW, NO-PRINT, each of them
+related to the current tree-buffer. If NO-PRINT is nil then the
+function must print the text itself in any manner. This function must
+always return the text which either is printed by the function itself
+or by the caller (if NO-PRINT is not nil). The current buffer for this
+function is the tree-buffer itself. With XEmacs this function is only
+called if the tree-buffer track-mouse mechanism is activated (see the
+function <code>tree-buffer-activate-follow-mouse</code>). With GNU Emacs &gt;=
+21 this function is called by the <code>help-echo</code> property added to
+each node.
+
+     <p>Here is an example (call <kbd>C-h f</kbd> to see what it does) for this
+callback-function:
+
+     <pre class="example">        (defun ecb-mouse-over-analyse-node (node &amp;optional window no-message
+                                                 click-force)
+          (let ((str (when (or click-force
+                               (ecb-show-minibuffer-info
+                                node window
+                                (car ecb-analyse-show-node-info)))
+                       (if (equal (cdr ecb-analyse-show-node-info)
+                                  'full-info)
+                           (ecb-analyse-gen-tag-info
+                            (car (tree-node-&gt;data node)))
+                         (tree-node-&gt;name node)))))
+            (prog1 str
+              (unless no-message
+                (ecb-nolog-message str)))))
+   </pre>
+     <br><dt><var>MOUSE-HIGHLIGHT-FN</var><dd>If nil then in this tree-buffer no node is highlighted when the mouse
+moves over it. If t then each node is highlighted when the mouse moves
+over it. If a function then it is called with the node as argument and
+if it returns not nil then the node will be highlighted when the mouse
+moves over it - otherwise no highlighting takes place.
+
+     <br><dt><var>NODE-DATA-EQUAL-FN</var><dd>Function used by the tree-buffer to test if the data of two tree-nodes
+are equal. The function is called with two args: The DATA-slots of the
+two tree-nodes (see <a href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a> for details about the
+data-slots).
+
+     <p>Here is an example (call <kbd>C-h f</kbd> to see what it does) for this
+callback-function:
+
+     <pre class="example">        (defun ecb-analyse-compare-node-data (left right)
+          "Return not nil when LEFT and RIGHT are identical node-datas."
+          (and (equal (nth 2 left) (nth 2 right))
+               (ecb-compare-methods-buffer-node-data (car left)
+                                                     (car right))))
+   </pre>
+     <p>Often a suitable value for this parameter is <code>equal</code>.
+
+     <br><dt><var>MAYBE-EMPTY-NODE-TYPES</var><dd>Nil or a list of node-types (a node-type is an integer which must be
+set with <code>tree-node-new</code>). Nodes with one of these types are
+treated as empty if they are not expandable (i.e. they have no
+children) and will be displayed with the empty-symbol ([x]); for other
+nodes see next argument.
+
+     <br><dt><var>LEAF-NODE-TYPES</var><dd>Nil or a list of node-types (see above). Nodes with one of these types
+are treated as leafs and will be displayed with the leaf-symbol (*).
+
+     <p>Summary for <var>MAYBE-EMPTY-NODE-TYPES</var> and <var>LEAF-NODE-TYPES</var>:
+
+          <ul>
+<li>Expandable nodes will always be displayed either with the open- or
+with the close-symbol.
+
+          <li>Not-expandable nodes with a node-type contained in
+<var>MAYBE-EMPTY-NODE-TYPES</var> will be displayed with the empty-symbol.
+
+          <li>Not-expandable nodes with a node-type contained in
+<var>LEAF-NODE-TYPES</var> will be displayed with the leaf-symbol.
+
+          <li>All other nodes will be displayed with no symbol just with correct
+indentation. 
+</ul>
+
+     <br><dt><var>MENU-CREATOR</var><dd>Nil or function which has to return nil or a list of conses, each cons
+for a known node-type of this tree-buffer (the node-type of a node is
+an integer). Example: ((0 . menu-for-type-0) (1 . menu-for-type-1)). 
+The cdr of a cons must be a menu in the same format
+<code>tree-buffer-create-menu</code> expects as argument - see the
+documentation of this function for details. This function gets two
+arguments: The name of the tree-buffer and the node for which a
+popup-menu should be opened.
+
+     <p>Here is an example for such a menu-creator-callback:
+
+     <pre class="example">        (defconst ecb-analyse-nodedata-tag-with-pos 0)
+        (defconst ecb-analyse-nodedata-tag-without-pos 1)
+        (defconst ecb-analyse-nodedata-no-tag 2)
+        
+        (defconst ecb-analyse-nodetype-bucket 0)
+        (defconst ecb-analyse-nodetype-context 1)
+        (defconst ecb-analyse-nodetype-arguments 2)
+        (defconst ecb-analyse-nodetype-completions 3)
+        (defconst ecb-analyse-nodetype-localvars 4)
+        (defconst ecb-analyse-nodetype-prefix 5)
+        (defconst ecb-analyse-nodetype-assignee 6)
+        (defconst ecb-analyse-nodetype-function 7)
+        (defconst ecb-analyse-nodetype-function-arg 8)
+        
+        (defun ecb-analyse-create-menu (node)
+          "Return a popup-menu suitable for NODE."
+          (let* ((data (tree-node-&gt;data node))
+                 (tag-p (not (equal (nth 1 data) ecb-analyse-nodedata-no-tag)))
+                 (tag-with-pos-p (equal (nth 1 data)
+                                        ecb-analyse-nodedata-tag-with-pos))
+                 (nodetype (nth 2 data)))
+            (delq nil (list (if (equal nodetype ecb-analyse-nodetype-completions)
+                                '(ecb-analyse-complete "Complete"))
+                            (if tag-p
+                                '(ecb-analyse-show-tag-info "Show tag info"))
+                            (if tag-with-pos-p
+                                '(ecb-analyse-jump-to-tag "Jump to tag"))))))
+        
+        (defun ecb-analyse-menu-creator (tree-buffer-name node)
+          "Creates the popup-menus for the analyse-buffer."
+          (let ((nodetype (tree-node-&gt;type node)))
+            (unless (equal nodetype ecb-analyse-nodetype-bucket)
+              (mapcar (function (lambda (type)
+                                  (cons type (ecb-analyse-create-menu node))))
+                      `(,ecb-analyse-nodetype-context
+                        ,ecb-analyse-nodetype-arguments
+                        ,ecb-analyse-nodetype-completions
+                        ,ecb-analyse-nodetype-localvars
+                        ,ecb-analyse-nodetype-prefix
+                        ,ecb-analyse-nodetype-assignee
+                        ,ecb-analyse-nodetype-function
+                        ,ecb-analyse-nodetype-function-arg)))))
+   </pre>
+     <p>This example would be passed as parameter as follows:
+
+     <pre class="example">        (tree-buffer-create "myname"
+                            :menu-creator 'ecb-analyse-menu-creator
+                            ...)
+   </pre>
+     <br><dt><var>MENU-TITLES</var><dd>Nil or a list conses, each cons for a node-type. See
+<var>MENU-CREATOR</var>. The cdr of a cons must be either a string or a
+function which will be called with current node under point and must
+return a string which is displayed as the menu-title.
+
+     <br><dt><var>MODELINE-MENU-CREATOR</var><dd>Nil or a function which has to return nil or a menu in the same format
+<code>tree-buffer-create-menu</code> expects as argument - see the
+documentation of this function for details. This function gets one
+argument: The name of the tree-buffer. If the function returns a menu
+then this menu will be displayed when the user clicks with
+mouse-button 3 at the modeline of the tree-buffer. The menu-title will
+be &ldquo;Tree-buffer modeline-menu&rdquo;.
+
+     <br><dt><var>sticky-parent-p</var><dd>If not nil then with GNU Emacs &gt;= 21 the tree-buffer displays in its
+header-line the unvisible parent-node if there is any. sticky-parent-fn is
+used to get this parent node.
+
+     <br><dt><var>sticky-indent-string</var><dd>String used for indendation of the sticky node in the header-line so it
+matches the tree-display.
+
+     <br><dt><var>sticky-parent-fn</var><dd>Function used to get that parent node which should be sticky. This function
+gets as argument a node and should either return nil (if there is not suitable
+parent node) or a node. This node will be displayed as sticky in the
+header-line of the tree-buffer. If nil is returned and sticky-parent-p is not
+nil then just the node under the header-line is displayed. If this argument is
+nil and sticky-parent-p is not nil then always the next unvisible parent node
+will be displayed in the header-line.
+
+     <br><dt><var>TRUNC-LINES</var><dd>Should lines in this tree buffer be truncated (not nil).
+
+     <br><dt><var>READ-ONLY</var><dd>Should the treebuffer be read-only (not nil).
+
+     <br><dt><var>TREE-INDENT</var><dd>Spaces subnodes should be indented. Ignored if <var>TREE-STYLE</var> is
+<code>image</code> (see below).
+
+     <br><dt><var>INCR-SEARCH-P</var><dd>Should the incremental search be enabled in the tree-buffer. Three
+choices: <code>prefix</code>, <code>substring</code>, <code>nil</code>. See the command
+<code>tree-buffer-incremental-node-search</code>.
+
+     <br><dt><var>INCR-SEARCH-ADDITIONAL-PATTERN</var><dd>Every search-pattern is prefixed with a regexp to jump over not
+important stuff of a displayed node-name at incr. search.. This is per
+default: beginning spaces and guide characters (|`-) and all
+expand/collapse-buttons [+], [x], rsp. [-]!
+
+     <p>If this argument is not nil then it must be a cons-cell where car is a
+string which should be a regexp-pattern which is added to the
+basic-prefix pattern (see above) and both of them prefix the
+incr-search-pattern. The cdr is the number of subexpressions in this
+additoonal pattern.
+
+     <br><dt><var>ARROW-NAVIGATION</var><dd>If not nil then a smart navigation with arrow keys is offered:
+
+          <ul>
+<li>Left-arrow:
+If node is expanded then it will be collapsed otherwise point
+jumps to the next "higher" node in the hierarchical tree (higher means
+the next higher tree-level or - if no higher level available - the next
+higher node on the same level).
+
+          <li>Right-arrow:
+If node is not expanded then it will be expanded.
+
+          <p>Onto a not expandable node the horizontal arrow-keys go one character in the
+senseful correct direction.
+
+          <li>Up- and down-key:
+Point jumps to the first character of the previous (up) rsp. next node
+(down). &ldquo;First&rdquo; character means either the first character of the
+expand-symbol (in case <var>EXPAND-SYMBOL-BEFORE-P</var> is not nil) or of
+the displayed node-name. Or with other words: The first
+non-indentation and non-guide-line (see <var>TREE-STYLE</var>) character of
+a node. 
+</ul>
+
+     <br><dt><var>HOR-SCROLL-STEP</var><dd>Number of columns a hor. scroll in the tree-buffer should scroll. If
+not nil then <kbd>M-mouse-1</kbd> and <kbd>M-mouse-2</kbd> scroll left and right
+and also <kbd>M-&lt;left-arrow&gt;</kbd> and <kbd>M-&lt;right-arrow&gt;</kbd>. Ignored with
+XEmacs.
+
+     <br><dt><var>DEFAULT-IMAGES-DIR</var><dd>Full path where the default images for the tree-buffer can be found. 
+It should contain an image for every name of
+<code>tree-buffer-tree-image-names</code>.
+
+     <br><dt><var>ADDITIONAL-IMAGES-DIR</var><dd>Additional image-dir which should be searched first for images needed
+for current tree-buffer. If the image can not be found in this
+directory then <var>DEFAULT-IMAGES-DIR</var> is searched. If the image can't even
+found here the related ascii-symbol is used.
+
+     <br><dt><var>IMAGE-FILE-PREFIX</var><dd>Common prefix for all image-files for this tree-buffer, e.g. &ldquo;ecb-&rdquo;.
+
+     <br><dt><var>TREE-STYLE</var><dd>There are three different styles available: Image-style (value
+<code>image</code>): Very nice and modern because image-icons are used to display
+the tree-buffer. For this style the arguments <var>TREE-INDENT</var> and
+<var>EXPAND-SYMBOL-BEFORE-P</var> have no effect.
+
+     <p>Ascii-style with guide-lines (value <code>ascii-guides</code>) and
+ascii-style without guidelines (value <code>ascii-no-guides</code>. See
+<a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a> for details about the tree-styles.
+
+     <p>Both ascii-styles are affected by the args <var>TREE-INDENT</var> and
+<var>EXPAND-SYMBOL-BEFORE-P</var>.
+
+     <br><dt><var>ASCII-GUIDE-FACE</var><dd>If <var>TREE-STYLE</var> is <code>ascii-guides</code> then this defines the face
+the guides should be displayed with.
+
+     <br><dt><var>TYPE-FACER</var><code>:</code><dd>Nil or a list of one or more conses, each cons for a node-type (a
+node-type is an integer which must be set with <code>tree-node-new</code>). 
+The cdr of a cons can be:
+
+          <ul>
+<li>a face-symbol
+
+          <li>a function-symbol which gets two arguments (see
+<code>tree-buffer-insert-text</code>). This function can do anything, but
+normally it should face a tree-node.
+
+          <li>the symbol t. Then the tree-buffer assumes that the node-text is
+already faced and therefore it does not face the node, means it does
+nothing then inserting the node-text, if the tree-buffer is updated. 
+</ul>
+
+     <br><dt><var>EXPAND-SYMBOL-BEFORE-P</var><dd>If not nil then the expand-symbol is displayed before the node-text. 
+Ignored when <var>TREE-STYLE</var> is <code>image</code> and Emacs can display
+images.
+
+     <br><dt><var>HIGHLIGHT-NODE-FACE</var><dd>Face used for highlighting current selected node in this
+tree-buffer.
+
+     <br><dt><var>GENERAL-FACE</var><dd>General face in which the whole tree-buffer should be displayed.
+
+     <br><dt><var>AFTER-CREATE-HOOK</var><code>:</code><dd>A function or a list of functions (with no arguments) called directly
+after creating the tree-buffer and defining it's local keymap. For
+example such a function can add additional key-bindings for this
+tree-buffer local keymap (use <code>local-set-key</code> for this).
+
+     <p>Here is an example for such a hook:
+
+     <pre class="example">        (defun ecb-common-after-tree-buffer-create-actions ()
+          "Things which should be performed after creating a tree-buffer.
+        The tree-buffer is the current buffer."
+          (local-set-key (kbd "C-t")
+                         'ecb-toggle-do-not-leave-window-after-select)
+          (if ecb-running-xemacs
+              (define-key modeline-map
+                '(button2up)
+                'ecb-toggle-maximize-ecb-window-with-mouse)
+            (local-set-key [mode-line mouse-2]
+                           'ecb-toggle-maximize-ecb-window-with-mouse)))
+   </pre>
+     <br><dt><var>AFTER-UPDATE-HOOK</var><code>:</code><dd>A function or a list of functions (with no arguments) called each time
+after the tree-buffer has been updated via <code>tree-buffer-update</code>.
+
+   </dl>
+
+   <p>Here is an example how to create a tree-buffer (if you want a
+tree-buffer not for ECB then just strip off the
+<code>defecb-tree-buffer-creator</code> and just call
+<code>tree-buffer-create</code>):
+
+<pre class="example">   (defecb-tree-buffer-creator ecb-create-analyse-tree-buffer
+       ecb-analyse-buffer-name
+     "Create the tree-buffer for analyse-display."
+     (tree-buffer-create
+      ecb-analyse-buffer-name
+      :frame ecb-frame
+      :mouse-action-trigger ecb-tree-mouse-action-trigger
+      :is-click-valid-fn 'ecb-interpret-mouse-click
+      :node-selected-fn 'ecb-tree-buffer-node-select-callback
+      :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+      :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+      :node-mouse-over-fn 'ecb-mouse-over-analyse-node
+      :mouse-highlight-fn 'ecb-analyse-node-mouse-highlighted-p
+      :node-data-equal-fn 'ecb-analyse-compare-node-data
+      :maybe-empty-node-types nil
+      :leaf-node-types nil
+      :menu-creator 'ecb-analyse-menu-creator
+      :menu-titles (ecb-analyse-gen-menu-title-creator)
+      :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+      :trunc-lines (ecb-member-of-symbol/value-list
+                    ecb-analyse-buffer-name
+                    ecb-tree-truncate-lines)
+      :read-only t
+      :tree-indent ecb-tree-indent
+      :incr-search-p t
+      :incr-search-additional-pattern nil
+      :arrow-navigation ecb-tree-navigation-by-arrow
+      :hor-scroll-step ecb-tree-easy-hor-scroll
+      :default-images-dir (car ecb-tree-image-icons-directories)
+      :additional-images-dir (ecb-member-of-symbol/value-list
+                              ecb-analyse-buffer-name
+                              (cdr ecb-tree-image-icons-directories)
+                              'car 'cdr)
+      :image-file-prefix "ecb-"
+      :tree-style ecb-tree-buffer-style
+      :ascii-guide-face ecb-tree-guide-line-face
+      :type-facer nil
+      :expand-symbol-before-p ecb-tree-expand-symbol-before
+      :highlight-node-face ecb-analyse-face
+      :general-face ecb-analyse-general-face
+      :after-create-hook (append
+                          (list (lambda ()
+                                  (ecb-common-after-create-actions)))
+                          ecb-common-tree-buffer-after-create-hook
+                          ecb-analyse-buffer-after-create-hook)
+      :after-update-hook nil))
+</pre>
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/A-new-tree_002dnode.html b/site/ecb-2.40/html-help/A-new-tree_002dnode.html
new file mode 100644
index 0000000..71b7550
--- /dev/null
+++ b/site/ecb-2.40/html-help/A-new-tree_002dnode.html
@@ -0,0 +1,157 @@
+<html lang="en">
+<head>
+<title>A new tree-node - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer" title="A new tree-buffer">
+<link rel="next" href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer" title="Updating a tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="A-new-tree-node"></a>
+<a name="A-new-tree_002dnode"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.3 How to create a new tree-node</h4>
+
+<p>When a new tree-buffer has been created, then the most senseful
+programming-task is adding some tree-nodes to it.
+
+<h5 class="subsubsection">11.3.3.1 Content of a tree-node</h5>
+
+<p>A tree-node is an object which stores in special <dfn>slots</dfn> several
+data necessary to link the node with other nodes, to display the node
+and to hold some associated node-data (e.g. a tag created by the
+semantic-library).
+
+   <p>A tree-node can have the following slots:
+
+     <dl>
+<dt><var>NAME</var><dd>The name of the node. Regardless how the node is displayed; see
+<var>SHRINK-NAME</var> and <var>DISPLAYED-NAME</var>.
+
+     <br><dt><var>TYPE</var><dd>The type of the node; must currently be an interger! The type is used
+to classify the nodes, so for example all nodes of a certain type can
+display the same popup-menu - see <code>tree-buffer-create</code> or <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> which parts of a tree-buffer are distinguished by
+node-types.
+
+     <br><dt><var>DATA</var><dd>The data of the node; This can be any arbitrary emacs-lisp-object. 
+This slots holds that data asscociated with the node and represented
+by the node in the tree-buffer. Example: Assume a tree-buffer
+displaying a directory-tree where each node just displays as its name
+the name of (sub)directories, but not the full path. The full path is
+stored in the <var>DATA</var>-slot of a node so when clicking onto this
+node the asscociated directory can be open for example in a
+dired-buffer.
+
+     <br><dt><var>EXPANDABLE</var><dd>If not nil then the node is expandable means it has children.
+
+     <br><dt><var>EXPANDED</var><dd>If not nil then the node is currently expanded, means its
+children are visible in the tree-buffers as subnodes of the node.
+
+     <br><dt><var>PARENT</var><dd>The parent tree-node. This is the link to the father (rsp. mother ;-)
+of the node. It must be a object of type tree-node!
+
+     <br><dt><var>CHILDREN</var><dd>List of children tree-nodes. They must be all objects of type
+tree-node!
+
+     <br><dt><var>SHRINK-NAME</var><dd>Decides if the <var>NAME</var> can be shortened when displayed in a narrow
+tree buffer window. The following values are valid:
+
+          <ul>
+<li><code>beginning</code>:
+The <var>NAME</var> is truncated at the beginning so the end is always
+visible.
+
+          <li><code>end</code>:
+The <var>NAME</var> is truncated at the end. If the tree-node is EXPANDABLE
+the name is truncated so that the expand symbol is visible.
+
+          <li><code>nil</code>:
+The <var>NAME</var> is never truncated. In this case <var>DISPLAYED-NAME</var>
+is equal to <var>NAME</var>. 
+</ul>
+
+     <br><dt><var>INDENTSTR</var><dd>Containes the full indentation-string for the node. So a single node
+can easily be redrawn.
+
+     <br><dt><var>DISPLAYED-NAME</var><dd>Contains the current displayed name of the node. The
+displayed name can be different from the <var>NAME</var> according to the value of
+<var>SHRINK-NAME</var>.
+
+   </dl>
+
+<h5 class="subsubsection">11.3.3.2 Creating a new tree-node and adding it to the tree</h5>
+
+<p>A new tree-node has to be created with the function
+<code>tree-node-new</code>. This &ldquo;constructor&rdquo; accepts the following
+parameter: <var>NAME</var>, <var>TYPE</var>, <var>DATA</var>, <var>NOT-EXPANDABLE</var>,
+<var>PARENT</var> and <var>SHRINK-NAME</var>.
+
+   <p>For all parameters except <var>NOT-EXPANDABLE</var> the description is
+available in the slot-description in the section above. If
+<var>NOT-EXPANDABLE</var> is set to not nil then the slot <var>EXPANDABLE</var>
+will be set to <code>nil</code>; otherwise to <code>t</code>.
+
+   <p><code>tree-node-new</code> returns a new tree-node.
+
+   <p>The new node can either being added implicitely to the tree via the
+optional <var>PARENT</var>-parameter when calling <code>tree-buffer-new</code> or
+explicitely by first creating the new node without setting the
+parent-node but later setting the parent-node via the according
+accessor (see next section below). Children should only being added
+with <code>tree-node-add-children</code> - see next section.
+
+<h5 class="subsubsection">11.3.3.3 Accessing the slots of a tree-node</h5>
+
+<p>The section above shows which slots a tree-node have.
+
+   <p>A slot with name XXX is getable with the following piece of code:
+
+<pre class="lisp">   (tree-node-&gt;xxx &lt;a tree node&gt;)
+</pre>
+   <p>Here is an example how to get the value of the slot <var>DATA</var>:
+
+<pre class="example">   (tree-node-&gt;data &lt;a tree node&gt;)
+</pre>
+   <p>A slot with name XXX is setable with the following piece of code:
+
+<pre class="lisp">   (setf (tree-node-&gt;xxx &lt;a tree node&gt;) &lt;new value&gt;)
+</pre>
+   <p>Again an example with slot <var>DATA</var> which sets this slot to the
+string &ldquo;~/a_subdir_of_HOME&rdquo;:
+
+<pre class="example">   (setf (tree-node-&gt;data &lt;a tree node&gt;) "~/a_subdir_of_HOME")
+</pre>
+   <p><strong>IMPORTANT</strong>: Adding new children to a node should always being
+done with the function <code>tree-node-add-children</code> because this
+functions encapsulates all the necessary stuff needed to add children
+to a node (mainly adding the children itself and setting the node itself as
+parent for every children).
+
+   <p>See <a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a> for the rest of the API available for
+tree-nodes.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Activation-and-Deactivation.html b/site/ecb-2.40/html-help/Activation-and-Deactivation.html
new file mode 100644
index 0000000..194f0ac
--- /dev/null
+++ b/site/ecb-2.40/html-help/Activation-and-Deactivation.html
@@ -0,0 +1,53 @@
+<html lang="en">
+<head>
+<title>Activation and Deactivation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="ECB_002dwindows.html#ECB_002dwindows" title="ECB-windows">
+<link rel="next" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Activation-and-Deactivation"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">5 Activation and Deactivation</h2>
+
+<p class="noindent">This chapter describes all aspects of activating and deactivating ECB.
+
+<ul class="menu">
+<li><a accesskey="1" href="Standard-activation.html#Standard-activation">Standard activation</a>:          How to manually (de)activate ECB
+<li><a accesskey="2" href="Automatic-activation.html#Automatic-activation">Automatic activation</a>:         Automatically (de)activating ECB
+</ul>
+
+   <p><strong>IMPORTANT</strong>: Regardless of the activation-type (standard or
+automatic) the activation-process of ECB is always completely
+failure-save. This means any error during any step of the
+activation-process forces a complete cleanup (e.g. removing hooks,
+disabling advices etc.) of all settings ECB did (e.g. adding hooks,
+activating advices etc.) until the failure. Therefore if
+ECB-activation stops cause of a failure then you can be sure that your
+Emacs has the same state as before the ECB-activation-start!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Activation-hook_002dsequence.html b/site/ecb-2.40/html-help/Activation-hook_002dsequence.html
new file mode 100644
index 0000000..ec2d6e6
--- /dev/null
+++ b/site/ecb-2.40/html-help/Activation-hook_002dsequence.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=Standard-activation.html#Activation%20hook%2dsequence">
diff --git a/site/ecb-2.40/html-help/Add_002don-ECB_002dwindows.html b/site/ecb-2.40/html-help/Add_002don-ECB_002dwindows.html
new file mode 100644
index 0000000..50e5804
--- /dev/null
+++ b/site/ecb-2.40/html-help/Add_002don-ECB_002dwindows.html
@@ -0,0 +1,46 @@
+<html lang="en">
+<head>
+<title>Add-on ECB-windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="ECB_002dwindows.html#ECB_002dwindows" title="ECB-windows">
+<link rel="prev" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Add-on-ECB-windows"></a>
+<a name="Add_002don-ECB_002dwindows"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>
+<hr>
+</div>
+
+<h3 class="section">4.2 Add-on ECB-windows of ECB</h3>
+
+<p>This chapter gives detailled informations about available add-on
+ECB-windows. This includes basic desciptions what they do as well as
+how to use them.
+
+<ul class="menu">
+<li><a accesskey="1" href="Semantic-analyser.html#Semantic-analyser">Semantic analyser</a>:            Analyses and displays semantic context
+<li><a accesskey="2" href="Symboldefinition.html#Symboldefinition">Symboldefinition</a>:             Displays definition of current symbol
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Add_002don-synchronization.html b/site/ecb-2.40/html-help/Add_002don-synchronization.html
new file mode 100644
index 0000000..9580b9b
--- /dev/null
+++ b/site/ecb-2.40/html-help/Add_002don-synchronization.html
@@ -0,0 +1,73 @@
+<html lang="en">
+<head>
+<title>Add-on synchronization - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link rel="prev" href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows" title="Synchronization of basic ECB-windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Add-on-synchronization"></a>
+<a name="Add_002don-synchronization"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows">Synchronization of basic ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.12.3 Synchronization of add-on ECB-windows</h4>
+
+<p>Currently ECB has a separate synchronization for the add-on ECB-windows
+ECB-analyse and ECB-symboldef and also for the eshell and
+speedbar-integration. Customizing can be done via:
+
+     <ul>
+<li>ECB-analyse:
+<code>ecb-analyse-buffer-sync</code>, <code>ecb-analyse-buffer-sync-delay</code> and
+<code>ecb-analyse-buffer-sync-hook</code>
+
+     <li>ECB-symboldef:
+<code>ecb-symboldef-buffer-sync</code>, <code>ecb-symboldef-buffer-sync-delay</code> and
+<code>ecb-symboldef-buffer-sync-hook</code>
+
+     <li>ECB-eshell:
+<code>ecb-eshell-buffer-sync</code>, <code>ecb-eshell-buffer-sync-delay</code> and
+<code>ecb-eshell-buffer-sync-hook</code>
+
+     <li>ECB-speedbar:
+<code>ecb-speedbar-buffer-sync</code>, <code>ecb-speedbar-buffer-sync-delay</code> and
+<code>ecb-speedbar-buffer-sync-hook</code>
+
+   </ul>
+
+   <p>Each enabling- and delay-option has an additonal special value 'basic which is
+the default for all these options because it allows to use the current setting
+of <code>ecb-basic-buffer-sync</code> rsp. <code>ecb-basic-buffer-sync-delay</code> for
+the add-on synchronization too. Example: If <code>ecb-basic-buffer-sync</code> is
+set to the value <code>(Info-mode dired-mode)</code> then a setting of 'basic for
+<code>ecb-analyse-buffer-sync</code> means that synchronization is always done
+unless the current major-mode is Info-mode or dired-mode. Per default all
+add-on synchronization enabling- and delay-options are set to 'basic with one
+exeption: <code>ecb-analyse-buffer-sync-delay</code>: See the documentation of this
+option for a detailed description.
+
+   <p>In general it is recommended to read the documentation of all these options.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Adding-new-backends.html b/site/ecb-2.40/html-help/Adding-new-backends.html
new file mode 100644
index 0000000..a9cf9bb
--- /dev/null
+++ b/site/ecb-2.40/html-help/Adding-new-backends.html
@@ -0,0 +1,107 @@
+<html lang="en">
+<head>
+<title>Adding new backends - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate" title="Refreshing the VC-state">
+<link rel="next" href="Known-VC_002dproblems.html#Known-VC_002dproblems" title="Known VC-problems">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Adding-new-backends"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Known-VC_002dproblems.html#Known-VC_002dproblems">Known VC-problems</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate">Refreshing the VC-state</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.5 Necessary steps and informations for adding new backends</h4>
+
+<p>There are mainly three necessary steps for adding a new<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> backend BE which should be
+supported by ECB:
+
+     <ol type=1 start=1>
+<li>Adding an identify-backend-function to <code>ecb-vc-supported-backends</code>
+ECB needs a function how to identify the new backend BE for a certain
+directory. If there exists already a library (other then VC)
+supporting this backend then this library propably contains already
+such a function which can be used or can be used at least with a small
+elisp-wrapper. If no elisp-library for backend BE exists then you have
+probably write the full identify-backend-function for your self. This
+function has to be added to <code>ecb-vc-supported-backends</code>.
+
+     <li>Adding an check-state-function to <code>ecb-vc-supported-backends</code>
+Associated to the new identify-backend-function mentioned in step 1 a
+new check-state-function is needed which can be used by ECB to get the
+VC-state for a file. See <a href="Checking-the-state.html#Checking-the-state">Checking the state</a> for a description
+about the needed interface of such a function. In combinatio with the
+identify-backend-function from step 1 this function has to be added to
+<code>ecb-vc-supported-backends</code>.
+
+     <li>Enabling automatic state-update after checkin/out
+
+     <p>This step is not essential if you do not need the displayed VC-state
+automatically updated after a checkin/out of a file via the commands
+available for backend BE (e.g. clearcase.el offers for the backend
+Clearcase elisp-commands to checkin and checkout a file which then
+should also update the displayed state in the ECB-tree-buffers. All
+you need is a way to tell these commands that they should clear the
+ECB-VC-cache for the file and then restart the ECB-VC-check-mechanism. 
+This should be done after these commands have finished their original
+job.
+
+     <p>ECB enables this per default for all backends supported by the
+VC-package with the following code. Maybe this is a good starting
+point.
+
+     <pre class="example">        (defvar ecb-checkedin-file nil
+          "Stored the filename of the most recent checked-in file. Is only set by the
+        after-advice of `vc-checkin' and `ecb-vc-checkin-hook' \(resets it to nil).
+        Evaluated only by `ecb-vc-checkin-hook'.
+        
+        This is the communication-channel between `vc-checkin' and
+        `ecb-vc-checkin-hook' so this hook-function gets the filename of the
+        checked-in file.")
+        
+        (defadvice vc-checkin (after ecb)
+          "Simply stores the filename of the checked-in file in `ecb-checkedin-file'
+        so it is available in the `vc-checkin-hook'."
+          (setq ecb-checkedin-file (ecb-fix-filename (ad-get-arg 0))))
+        
+        (defun ecb-vc-checkin-hook ()
+          "Ensures that the ECB-cache is reset and the entry for the most recent
+        checkedin file is cleared. Uses `ecb-checkedin-file' as last checked-in file."
+          (when ecb-checkedin-file
+            (ecb-vc-cache-remove ecb-checkedin-file)
+            (ecb-vc-reset-vc-stealthy-checks)
+            (setq ecb-checkedin-file nil)))
+   </pre>
+        </ol>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> i.e. 
+not already supported by the VC-package because all these backends are
+automatically supported by ECB too!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Adviced-functions.html b/site/ecb-2.40/html-help/Adviced-functions.html
new file mode 100644
index 0000000..f4acfdd
--- /dev/null
+++ b/site/ecb-2.40/html-help/Adviced-functions.html
@@ -0,0 +1,97 @@
+<html lang="en">
+<head>
+<title>Adviced functions - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="prev" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="next" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Adviced-functions"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>
+<hr>
+</div>
+
+<h3 class="section">11.4 How to deal with the adviced functions</h3>
+
+<p>ECB needs a bunch of advices so ECB can work correctly. ECB has a
+powerful advice-backbone which allows defining sets of adviced
+functions whereas a set means, that all advices of a certain set are
+always enabled or disabled together.
+
+   <p>For this ECB contains four macros:
+
+     <ul>
+<li><code>defecb-advice-set</code>
+<li><code>defecb-advice</code>
+<li><code>ecb-with-original-adviced-function-set</code>
+<li><code>ecb-with-ecb-advice</code> (for this one see below)
+</ul>
+
+   <p>For a detailed explanation of each macro read the documentation with
+<code>describe-function</code>!
+
+   <p>An advice in ECB must not being defined by <code>defadvice</code> but only
+with <code>defecb-advice</code> which in turn needs a previously defined
+advice-set defined by <code>defecb-advice-set</code>.
+
+   <p>So ECB has always full control of all advices. For example ECB
+automatically disables all advices of all advice-sets at load-time of
+ECB and also at deactivation time of ECB. So you can be sure that
+after deactivating ECB all ecb-advices are deactivated/disabled too.
+
+   <p>In addition to the four macros above ECB offers two further macros
+for running code with disabled some ecb-advices:
+
+     <ul>
+<li><code>ecb-with-original-basic-functions</code>
+<li><code>ecb-with-original-permanent-layout-functions</code>
+</ul>
+
+   <p>The advice set <code>ecb-basic-adviced-functions</code> contains most of the
+ecb-advices. See the contents of this variable to see which advices
+are contained in this set. Use
+<code>ecb-with-original-basic-functions</code> when you want evaluating
+elisp-code with disabled basic-advices. 
+<code>ecb-with-original-basic-functions</code> is only a shortcut for
+<code>ecb-with-original-adviced-function-set</code> called for the
+<code>ecb-basic-adviced-functions</code>-set.
+
+   <p>Same for <code>ecb-with-original-permanent-layout-functions</code> which is a
+shortcut for the advice-set <code>ecb-permanent-adviced-layout-functions</code>.
+
+   <p>Last but not least ECB contains an advice-set
+<code>ecb-always-disabled-advices</code>. These advices are always disabled. 
+This advice-set can not be enabled by <code>ecb-enable-advices</code> but
+such an advice has to be activated 'on demand' by the caller. Such an
+advice must be used with the macro <code>ecb-with-ecb-advice</code> (see the
+docstring) and is also enabled within the BODY of the macro-call.
+
+   <p>ECB contains some more advice-sets but don't bother about it.
+
+   <p><strong>Please Note</strong>: See the value of <code>ecb-adviced-function-sets</code> which
+advice-sets are defined and see <code>ecb-adviced-functions</code> for an overview
+for all adviced functions.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Ascii_002dbased-styles.html b/site/ecb-2.40/html-help/Ascii_002dbased-styles.html
new file mode 100644
index 0000000..5391814
--- /dev/null
+++ b/site/ecb-2.40/html-help/Ascii_002dbased-styles.html
@@ -0,0 +1,94 @@
+<html lang="en">
+<head>
+<title>Ascii-based styles - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="prev" href="Style-basics.html#Style-basics" title="Style basics">
+<link rel="next" href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images" title="Tree-buffers with images">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Ascii-based-styles"></a>
+<a name="Ascii_002dbased-styles"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images">Tree-buffers with images</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Style-basics.html#Style-basics">Style basics</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>
+<hr>
+</div>
+
+<h5 class="subsubsection">4.1.2.2 How to customize the ascii-styles</h5>
+
+<p>The ECB-option <code>ecb-tree-buffer-style</code> offers two different
+styles completely drawn with ascii-controls and -guides.
+
+   <p>Ascii-style with guide-lines (value <code>ascii-guides</code>)<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>:
+
+<pre class="example">   [-] ECB
+    |  [+] code-save
+    `- [-] ecb-images
+        |  [-] directories
+        |   |  [-] height-15
+        |   |   |  * close.xpm
+        |   |   |  * empty.xpm
+        |   |   |  * leaf.xpm
+        |   |   `- * open.xpm
+        |   |  [+] height-17
+        |   |  [+] height-19
+        |   `- [+] height-21
+        |  [x] history
+        |  [x] methods
+        `- [x] sources
+</pre>
+   <p>Ascii-style without guide-lines (value <code>ascii-no-guides</code>) - this
+is the style used by ECB &lt;= 1.96:
+
+<pre class="example">   [-] ECB
+       [+] code-save
+       [-] ecb-images
+           [-] directories
+               [-] height-15
+                   * close.xpm
+                   * empty.xpm
+                   * leaf.xpm
+                   * open.xpm
+               [+] height-17
+               [+] height-19
+               [+] height-21
+           [x] history
+           [x] methods
+           [x] sources
+</pre>
+   <p>The tree-layout of both ascii-styles can be affected with the options
+<code>ecb-tree-indent</code> and <code>ecb-tree-expand-symbol-before</code> (the
+examples above have set 4 for the former and true for the latter one). 
+For the guide-style the face and color of the guide- and
+handle-symbols can be customized with the option
+<code>ecb-tree-guide-line-face</code> (default is the equal-named face).
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> For
+a better look&amp;feel of such a tree-buffer ECB displays only the last
+subnode of an opened node with a handle!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Auto_002e-option_002dupgrading.html b/site/ecb-2.40/html-help/Auto_002e-option_002dupgrading.html
new file mode 100644
index 0000000..2a340e5
--- /dev/null
+++ b/site/ecb-2.40/html-help/Auto_002e-option_002dupgrading.html
@@ -0,0 +1,42 @@
+<html lang="en">
+<head>
+<title>Auto. option-upgrading - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Upgrading.html#Upgrading" title="Upgrading">
+<link rel="prev" href="Downloading-new-versions.html#Downloading-new-versions" title="Downloading new versions">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Auto.-option-upgrading"></a>
+<a name="Auto_002e-option_002dupgrading"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Downloading-new-versions.html#Downloading-new-versions">Downloading new versions</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Upgrading.html#Upgrading">Upgrading</a>
+<hr>
+</div>
+
+<h3 class="section">9.2 Automatic upgrading of options</h3>
+
+<ul class="menu">
+<li><a accesskey="1" href="User-interface.html#User-interface">User interface</a>:               Options and commands you should know
+<li><a accesskey="2" href="Background-information.html#Background-information">Background information</a>:       Maybe some interesting informations
+</ul>
+
+</body></html>
+
diff --git a/site/ecb-2.40/html-help/Automatic-activation.html b/site/ecb-2.40/html-help/Automatic-activation.html
new file mode 100644
index 0000000..44117ac
--- /dev/null
+++ b/site/ecb-2.40/html-help/Automatic-activation.html
@@ -0,0 +1,49 @@
+<html lang="en">
+<head>
+<title>Automatic activation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Activation-and-Deactivation.html#Activation-and-Deactivation" title="Activation and Deactivation">
+<link rel="prev" href="Standard-activation.html#Standard-activation" title="Standard activation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Automatic-activation"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Standard-activation.html#Standard-activation">Standard activation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>
+<hr>
+</div>
+
+<h3 class="section">5.2 Automatic activation and deactivation</h3>
+
+<p><a name="index-Automatic-activation-12"></a><a name="index-Automatic-deactivation-13"></a>There are two ways for auto. (de)activation ECB after Emacs-start and
+for different window-configurations.
+
+     <dl>
+<dt><code>ecb-auto-activate</code><dd>This option is for auto. activating ECB after Emacs-startup. Set this
+to not nil and ECB will automatically be started after Emacs comes up.
+
+     <br><dt><code>window-manager support</code><dd>The window-manager support of ECB deactivates ECB when going to
+another window-configuration and reactivates ECB when coming back to
+the ECB-window-configuration. For all details about this see
+<a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>. 
+</dl>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Back_002fforward-navigation.html b/site/ecb-2.40/html-help/Back_002fforward-navigation.html
new file mode 100644
index 0000000..f0ea2bb
--- /dev/null
+++ b/site/ecb-2.40/html-help/Back_002fforward-navigation.html
@@ -0,0 +1,73 @@
+<html lang="en">
+<head>
+<title>Back/forward navigation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows" title="Maximizing the ECB windows">
+<link rel="next" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Back%2fforward-navigation"></a>
+<a name="Back_002fforward-navigation"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">Maximizing the ECB windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.11 Back- and forward navigation like a browser</h3>
+
+<p>With ECB you can &ldquo;browse&rdquo; in your source-files like with a
+web-browser. This means ECB stores the current buffer- and
+window-position relative to the current tag<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> in the edit-window after
+
+     <ul>
+<li>selecting a tag in the ECB-methods buffer or
+<li>selecting a source-file in the ECB-sources/history-buffer. 
+</ul>
+
+   <p>ECB offers two commands <code>ecb-nav-goto-next</code> (<kbd>C-c . n</kbd>) and
+<code>ecb-nav-goto-previous</code> (<kbd>C-c . p</kbd>) to go forward and
+backward within this navigation history-list. These commands are also
+available via the menu &ldquo;ECB &ndash;&gt; Navigate&rdquo;.
+
+   <p>Aside normal &ldquo;location-browsing&rdquo; this is useful for example in a
+scenario where the buffer is narrowed to a tag (see
+<code>ecb-tag-visit-post-actions</code>):
+
+     <ol type=1 start=1>
+<li>You edit a function
+<li>Goto another function above the current in the same file
+<li>Add a few lines
+<li>Call ecb-nav-goto-previous
+
+     <p>Now you will edit at the same place in the function.
+        </ol>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> e.g. a method,
+a variable or any other semantic tag</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Background-information.html b/site/ecb-2.40/html-help/Background-information.html
new file mode 100644
index 0000000..a5f50e0
--- /dev/null
+++ b/site/ecb-2.40/html-help/Background-information.html
@@ -0,0 +1,103 @@
+<html lang="en">
+<head>
+<title>Background information - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading" title="Auto. option-upgrading">
+<link rel="prev" href="User-interface.html#User-interface" title="User interface">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Background-information"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="User-interface.html#User-interface">User interface</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>
+<hr>
+</div>
+
+<h4 class="subsection">9.2.2 Background information</h4>
+
+<p>Big packages like ECB will be enhanced and developed continuously so
+sometimes a new version must be released. Such packages offer in
+general a lot of customizable options so probably some of these
+options change the type or are renamed because the old type and/or
+name of the option makes no sense in the new release.
+
+   <p>Especially options which have changed the type of their value are now
+a problem for the user which want to upgrade to the latest
+ECB-version: If the user has saved a certain value for option X in its
+file <samp><span class="file">.emacs</span></samp> but the type of this saved value doesn't match the
+new defined type in the defcustom-form after an ECB-upgrade then there
+can occur serious problems like ECB can not be started anymore or even
+Emacs can not be started without errors.
+
+   <p>Until now there was only one way to fix these problems: The user must
+manually edit his file <samp><span class="file">.emacs</span></samp> and remove all entries for
+options which have now another type. After this and after restarting
+Emacs the new default-values of the type-changed options in the new
+ECB-release are active and the user can go on using Emacs and ECB. But
+this approach to fix the incompatible-option-problem has two serious
+drawbacks:
+
+     <ol type=1 start=1>
+<li>The user must manually edit the customize-section in his file
+<samp><span class="file">.emacs</span></samp>. This should normally not be done and if then only by
+old-handed Emacs-users.
+
+     <li>The customized value of the option X in the old-release (with the old
+type) is lost because after removing the related entry from the
+file <samp><span class="file">.emacs</span></samp> the new default-value is active, so the user must
+re-customize the option X.
+        </ol>
+
+   <p>OK, this is one half of the option-upgrade-problem but a new ECB-release
+can also rename a option from name X to name Y because the new name Y makes
+much more sense and/or is more mnemonic. If only the name has changed but
+not the type this is not a serious problem like above but also annoying
+because the customized value of the old-option X takes no effect in the new
+release but instead the default-value of the new-option Y is now active. 
+But nevertheless this problem has the drawback number 2 (see above).
+
+   <p>The last category of upgrade-problems is a renamed option which has also
+changed its type.
+
+<p class="noindent">ECB has a solution for all these problems:
+
+     <ul>
+<li>It checks all customized values of all ECB-options if they are still
+type-compatible. If not then it tries to upgrade the old-value to the
+new value-type and if this is not possible then it resets the option
+to the new default value and offers then to store it via customize in
+the .emacs-file (or in any file which is used for customized options). 
+But ECB does not touch any customization-file without asking the user!
+
+     <li>It offers a special constant <code>ecb-upgradable-option-alist</code> which
+allows the ECB-maintainers to define special transformings for renamed
+options so even the value of an old-option X can be savely transformed
+to the new-option Y and the old setting is not lost. 
+</ul>
+
+   <p>All these checks and transformings are done at beginning of activating
+ECB - if the option <code>ecb-auto-compatibility-check</code> is not nil. If
+ECB has recognized incompatible or renamed options it does its
+upgrading/reseting-job so all ECB-options have correct types so ECB
+can start correct. After ECB is started it displays a list of all
+upgraded or reseted option with their old and new values.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Basic-ECB_002dwindows.html b/site/ecb-2.40/html-help/Basic-ECB_002dwindows.html
new file mode 100644
index 0000000..69056d9
--- /dev/null
+++ b/site/ecb-2.40/html-help/Basic-ECB_002dwindows.html
@@ -0,0 +1,59 @@
+<html lang="en">
+<head>
+<title>Basic ECB-windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="ECB_002dwindows.html#ECB_002dwindows" title="ECB-windows">
+<link rel="prev" href="ECB_002dwindows.html#ECB_002dwindows" title="ECB-windows">
+<link rel="next" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows" title="Add-on ECB-windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Basic-ECB-windows"></a>
+<a name="Basic-ECB_002dwindows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>
+<hr>
+</div>
+
+<h3 class="section">4.1 The basic ECB-windows of ECB</h3>
+
+<p>ECB offers basic ECB-windows for browsing directory-structures, files
+of a directory and contents of source-files (e.g. methods and
+variables). These basic ECB-windows are build from a special class of
+ECB-windows, called <dfn>tree-buffer</dfn>. See <a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">Tree-buffer basics</a>
+for more details about the functionality of tree-buffers. See
+<a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a> to get an impression about the look&amp;feel of
+these tree-buffers.
+
+   <p>In the following subsections these basic ECB-windows of ECB will be
+explained in detail.
+
+<ul class="menu">
+<li><a accesskey="1" href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">Tree-buffer basics</a>:           General introduction into tree-buffers
+<li><a accesskey="2" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>:           Displaying the trees with different styles
+<li><a accesskey="3" href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>:       Contents of the ECB Directories-window
+<li><a accesskey="4" href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>:           Contents of the ECB Sources-window
+<li><a accesskey="5" href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>:           Contents of the ECB Methods-window
+<li><a accesskey="6" href="ECB-History_002dwindow.html#ECB-History_002dwindow">ECB History-window</a>:           Contents of the ECB History-window
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Big-screens.html b/site/ecb-2.40/html-help/Big-screens.html
new file mode 100644
index 0000000..06c6110
--- /dev/null
+++ b/site/ecb-2.40/html-help/Big-screens.html
@@ -0,0 +1,52 @@
+<html lang="en">
+<head>
+<title>Big screens - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Small-screens.html#Small-screens" title="Small screens">
+<link rel="next" href="Simulating-speedbar.html#Simulating-speedbar" title="Simulating speedbar">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Big-screens"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Small-screens.html#Small-screens">Small screens</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.3 Working with big screens</h3>
+
+<p>ECB offers a layout type &ldquo;left-right&rdquo; with special ECB-tree-windows
+on the left and right side of the edit-area. The layouts
+&ldquo;leftright1&rdquo; and &ldquo;leftright2&rdquo;are examples for this layout type. 
+See <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a> and <a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>
+for details about how to create or program more layouts of this type.
+
+   <p>Such a layout is eventually the best choice for big screens because
+the several ECB-tree-windows are bigger and can display more
+informations without scrolling.
+
+   <p>With such a layout it can could be senseful to reduce the value of the
+option <code>ecb-windows-width</code> compared to layouts of type left or
+right. A value of max. 0.25 should be enough.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Bugs.html b/site/ecb-2.40/html-help/Bugs.html
new file mode 100644
index 0000000..0e84337
--- /dev/null
+++ b/site/ecb-2.40/html-help/Bugs.html
@@ -0,0 +1,59 @@
+<html lang="en">
+<head>
+<title>Bugs - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Conflicts-and-bugs.html#Conflicts-and-bugs" title="Conflicts and bugs">
+<link rel="prev" href="Conflicts.html#Conflicts" title="Conflicts">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Bugs"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Conflicts.html#Conflicts">Conflicts</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>
+<hr>
+</div>
+
+<h3 class="section">12.2 Known bugs</h3>
+
+<p>This section describes all currently known bugs of ECB. The
+maintainers of ECB try to fix these bugs as soon as possible.
+
+<h4 class="subsection">12.2.1 Extra history-entries for JDEE source-buffers</h4>
+
+<p>ECB on occasions creates an extra edit buffer for entries in the
+history window. For example, let say there are three entries in the
+history window:
+
+<pre class="example">   Test1
+   Test2
+   Test3
+</pre>
+   <p>In the edit window Test1 file is edited. When clicked on Test2 entry
+in history, on occasion instead of switching to the existing buffer for
+Test2, a new edit buffer is opened for Test2 file. At this point, there
+are four entries in the history as follows:
+
+<pre class="example">   Test2
+   Test2&lt;2&gt;
+   Test1
+   Test3
+</pre>
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Changing-faces.html b/site/ecb-2.40/html-help/Changing-faces.html
new file mode 100644
index 0000000..d3e0085
--- /dev/null
+++ b/site/ecb-2.40/html-help/Changing-faces.html
@@ -0,0 +1,108 @@
+<html lang="en">
+<head>
+<title>Changing faces - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="next" href="Small-screens.html#Small-screens" title="Small screens">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Changing-faces"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Small-screens.html#Small-screens">Small screens</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.1 Changing faces in the ECB tree-buffers</h3>
+
+<p><a name="index-Faces-349"></a>There are two basic faces:
+
+     <ul>
+<li><code>ecb-default-general-face</code>:
+Basic face for displaying an ECB-tree-buffer.
+
+     <p>It“s recommended to define the font-family, the font-size, the basic
+color etc. with this face.
+
+     <p>In GNU Emacs 21.X all faces (even the face
+<code>ecb-default-highlight-face</code>) used in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a face used in a tree-buffer can be very easily changed with
+face <code>ecb-default-general-face</code>.
+
+     <p>With XEmacs there is no inheritance-feature but the options
+<code>ecb-directories-general-face</code>, <code>ecb-sources-general-face</code>,
+<code>ecb-methods-general-face</code> and <code>ecb-history-general-face</code>
+offer the choice to use the face <code>ecb-default-general-face</code> so
+also with XEmacs the basic face-settings can be easily changed just by
+customizing the face <code>ecb-default-general-face</code>.
+
+     <li><code>ecb-default-highlight-face</code>:
+Basic face for highlighting the current node in an ECB-tree-buffer.
+
+     <p>In GNU Emacs 21.X all highlighting faces used in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a highlighting face used in a tree-buffer can be very easily
+changed with face <code>ecb-default-highlight-face</code>.
+
+     <p>With XEmacs there is no inheritance-feature but the options
+<code>ecb-directory-face</code>, <code>ecb-source-face</code>,
+<code>ecb-method-face</code> and <code>ecb-history-face</code> offer the choice to
+use the face <code>ecb-default-highlight-face</code> so also with XEmacs the
+basic face-settings can be easily changed just by customizing the face
+<code>ecb-default-highlight-face</code>.
+
+   </ul>
+
+   <p>With these faces you can change the basic attributes easily and fast
+for ALL ECB-tree-buffers. But you are also able to display each
+ECB-tree-buffer with different faces, see the different options for
+every tree-buffer mentioned above.
+
+   <p><strong>Please note</strong> (only for XEmacs users): Cause of the lack of the
+font-inheritance feature using ONE other font for the ECB-methods
+buffer can NOT be achieved just by setting
+<code>ecb-methods-general-face</code> to <code>ecb-default-general-face</code> and
+changing the font of this default face. In addition you have to set
+the same font also for the face <code>ecb-bucket-node-face</code> like in
+the following example:
+
+<pre class="example">   (defconst my-ecb-font
+             "-outline-Courier-normal-normal-13-97-96-96-c-*-iso8859-1")
+   (set-face-font 'ecb-default-general-face my-ecb-font)
+   (set-face-font 'ecb-bucket-node-face my-ecb-font)
+</pre>
+   <p>This code sets the new defined font <code>my-ecb-font</code> as font for
+all<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> ECB-tree-buffers (incl. the methods
+buffer).
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course <code>ecb-directories-general-face</code>,
+<code>ecb-sources-general-face</code>, <code>ecb-methods-general-face</code> and
+<code>ecb-history-general-face</code> must be set to
+<code>ecb-default-general-face</code>!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Changing-the-ECB_002dlayout.html b/site/ecb-2.40/html-help/Changing-the-ECB_002dlayout.html
new file mode 100644
index 0000000..3d71302
--- /dev/null
+++ b/site/ecb-2.40/html-help/Changing-the-ECB_002dlayout.html
@@ -0,0 +1,636 @@
+<html lang="en">
+<head>
+<title>Changing the ECB-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="prev" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="next" href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout" title="Redrawing the ECB-layout">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Changing-the-ECB-layout"></a>
+<a name="Changing-the-ECB_002dlayout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">Redrawing the ECB-layout</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.8.1 Changing and customizing the ECB-layout</h4>
+
+<p>ECB offers several predefined layouts with different sets and also
+different locations of ECB-windows. See below the &ldquo;ascii-screenshot&rdquo;
+of all currently built-in layouts<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+   <p>In addition to these predefined layouts you can either interactively
+create new layouts &ldquo;by example&rdquo; (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>)
+or program new layouts with the macro <code>ecb-layout-define</code>
+(see <a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>). The former method is the recommended
+one!
+
+   <p>There are two ways to interactively change the layout:
+     <ul>
+<li>Changing permanently:
+Customize the option <code>ecb-layout-name</code> and store it for future
+Emacs sessions.
+
+     <li>Switching between several layouts at runtime:
+If you want to switch fast between a certain sequence of layouts see
+the option <code>ecb-toggle-layout-sequence</code> and the command
+<code>ecb-toggle-layout</code> (see <a href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a>). For just
+selecting another layout during current Emacs-session use the command
+<code>ecb-change-layout</code>. 
+</ul>
+
+   <p>With the option <code>ecb-show-sources-in-directories-buffer</code> you can
+define if sources are displayed in the directory-window of a layout
+(see <a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>).
+
+   <p>In addition to the general layout you can specify if the layout should
+contain a persistent compilation-window at the bottom of the frame, see
+<code>ecb-compile-window-height</code> (see <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>).
+
+   <p>Maybe you want also change the look&amp;feel of the tree-buffers. Then you
+can change the general style of the tree-buffers with the option
+<code>ecb-tree-buffer-style</code> and the location of the collapse- and
+expand-symbols and the indentation of sub-nodes in a tree. See
+<code>ecb-tree-indent</code> and <code>ecb-tree-expand-symbol-before</code>. More
+details about the different tree-buffer-styles are described in
+<a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>.
+
+   <p>Here are all currently available layouts (for creating own new layouts
+see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>); just customize the option
+<code>ecb-layout-name</code> to the related name:
+
+     <dl>
+<dt>Layout &ldquo;left1&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |      |       |                                      |
+        | Sour | Hist  |                 Edit                 |
+        |      |       |                                      |
+        |      |       |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left2&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left3&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left4&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |      |       |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        | Sour | Hist  |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left5&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;right1&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |                                      |              |
+        |                                      |  Directories |
+        |                                      |              |
+        |                                      |              |
+        |                                      |--------------|
+        |                                      |              |
+        |                                      |              |
+        |             Edit                     |  Sources     |
+        |                                      |              |
+        |                                      |              |
+        |                                      |--------------|
+        |                                      |              |
+        |                                      |  Methods     |
+        |                                      |              |
+        |                                      |              |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left6&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |  Sources     |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |  History     |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;top1&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |                        |             |              |
+        |                        |             |              |
+        |      Directories       |  Sources    |  Methods     |
+        |                        |             |              |
+        |                        |             |              |
+        |-----------------------------------------------------|
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                    Edit                             |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left7&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left8&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;top2&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |                                                     |
+        |                                                     |
+        |                    Methods                          |
+        |                                                     |
+        |                                                     |
+        |-----------------------------------------------------|
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                    Edit                             |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left9&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |   Methods    |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left10&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |      |       |                                      |
+        | Sou  | Hist  |                                      |
+        |      |       |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left11&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left12&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |   History    |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left13&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        | Directories  |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left14&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        | Directories  |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left15&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;leftright1&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |-------------|          Edit           |             |
+        |             |                         |             |
+        | Sources     |                         |             |
+        |             |                         |             |
+        |-------------|                         |             |
+        |             |                         |             |
+        | History     |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                   Compilation                       |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;leftright2&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |          Edit           |             |
+        |-------------|                         |-------------|
+        |             |                         |             |
+        | Sources     |                         |  History    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                   Compilation                       |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;leftright3&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |          Edit           |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left-dir-plus-speedbar&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |             |                                       |
+        | Directories |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |-------------|                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        | Speedbar    |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left-analyse&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Analyse     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     <br><dt>Layout &ldquo;left-symboldef&rdquo;<dd>
+     <pre class="example">        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Symbol-defs |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+   </pre>
+     </dl>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> The command
+<code>ecb-show-layout-help'</code> shows the outline-picture for all built-in
+layouts.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Changing-window-sizes.html b/site/ecb-2.40/html-help/Changing-window-sizes.html
new file mode 100644
index 0000000..f3a7fb6
--- /dev/null
+++ b/site/ecb-2.40/html-help/Changing-window-sizes.html
@@ -0,0 +1,72 @@
+<html lang="en">
+<head>
+<title>Changing window sizes - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="prev" href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout" title="Redrawing the ECB-layout">
+<link rel="next" href="Fixing-window-sizes.html#Fixing-window-sizes" title="Fixing window sizes">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Changing-window-sizes"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Fixing-window-sizes.html#Fixing-window-sizes">Fixing window sizes</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">Redrawing the ECB-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.8.3 Changing the sizes of the special ECB-windows</h4>
+
+<p>The standard width and height of the special ECB-windows is defined
+with the options <code>ecb-windows-width</code> and
+<code>ecb-windows-height</code>. But changing these options always
+influences all layouts which is not always desired.
+
+   <p>ECB offers to re-adjust the width and height of the ECB-windows (e.g. by
+dragging the windows-borders via the mouse) and then saving exactly
+these current window-sizes for the current layout so after activating
+this layout all windows have autom. the stored sizes.
+
+   <p>This is done via the option <code>ecb-layout-window-sizes</code> and the
+commands <code>ecb-store-window-sizes</code>,
+<code>ecb-restore-window-sizes</code> and
+<code>ecb-restore-default-window-sizes</code>.
+
+   <p>Here is an example how to resize and store the sizes of the
+ECB-windows of layout &ldquo;left1&rdquo;:
+
+     <ol type=1 start=1>
+<li>Switch to layout &ldquo;left1&rdquo; via <code>ecb-change-layout</code> (<kbd>C-c . lc</kbd>)
+<li>Resize the ECB-windows by dragging the window-borders with the mouse
+<li>Call <code>ecb-store-window-sizes</code>
+        </ol>
+
+   <p>After this layout &ldquo;left1&rdquo; will be always drawn with the new sizes
+until you call <code>ecb-restore-default-window-sizes</code> during layout
+&ldquo;left1&rdquo; is active.
+
+   <p><strong>Please note</strong>: <code>ecb-store-window-sizes</code> stores the width
+and height of the windows per default as fractions of the width (rsp. 
+height) of the ECB-frame, so the stored sizes are always correct
+regardless of the current frame-size! But if called with a prefix
+argument then fixed sizes are stored.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Checking-the-state.html b/site/ecb-2.40/html-help/Checking-the-state.html
new file mode 100644
index 0000000..7899658
--- /dev/null
+++ b/site/ecb-2.40/html-help/Checking-the-state.html
@@ -0,0 +1,148 @@
+<html lang="en">
+<head>
+<title>Checking the state - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Identifying-backends.html#Identifying-backends" title="Identifying backends">
+<link rel="next" href="Remote-repositories.html#Remote-repositories" title="Remote repositories">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Checking-the-state"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Remote-repositories.html#Remote-repositories">Remote repositories</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Identifying-backends.html#Identifying-backends">Identifying backends</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.2 How ECB checks the VC-state of a file</h4>
+
+<p>After ECB has identified the VC-backend of a directory it will display
+the VC-state (e.g. up-to-date, edited, needs-mergs etc...) with a
+suitable image-icon in the tree-windows of the ECB-file-browser. To
+get this state for a certain file ECB uses that check-state-function
+stored in the cache for the directory of that file (see <a href="Identifying-backends.html#Identifying-backends">Identifying backends</a>).
+
+   <p>You can add any arbitrary functions as check-state-function to
+<code>ecb-vc-supported-backends</code> as long as they get one
+filename-argument and return a state-symbol (e.g. <code>up-to-date</code>. 
+ECB can understand a certain set of state-values which are then
+mapped to suitable image-icons which will in turn be displayed in
+front of the filename in the file-browser. Because the values a
+check-state-function return can differ from that state-values ECB
+understands, ECB offers an option to define a appropriate
+state-mapping. The name of this option is <code>ecb-vc-state-mapping</code>. 
+See the documentation of this option to get a list of all state-value
+ECB understands.
+
+   <p>Per default ECB uses the function <code>vc-state</code> of the
+VC-package<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> to check the state for the
+backends CVS, RCS, SCCS, Subversion, Git and Monotone. So the default-value of
+<code>ecb-vc-state-mapping</code> contains a mapping between these values
+<code>ecb-vc-state</code> can return and that state-values ECB understands.
+
+   <p>If ECB should support other VC-backends than CVS, RCS, SCCS, Monotone, Git and
+Subversion (e.g. Clearcase) you should add that new backend to the VC-package
+(see the initial comments of vc.el how to do this) then ECB will automatically
+support that new backend. Alternatively it may be sufficient if you write your
+own check-state-function for this backend and add the needed mapping to
+<code>ecb-vc-state-mapping</code> if necessary.
+
+<h5 class="subsubsection">10.8.2.1 Getting heuristic state-values or real ones for a backend</h5>
+
+<p>The interface of Emacs' VC-package offers two different ways to
+get the VC-state of a file:
+
+     <ul>
+<li>The real, fresh and expensive approach
+
+     <p>VC has a function <code>vc-recompute-state</code> which always performs a real
+backend command (e.g. &ldquo;cvs status&rdquo; for CVS) to get a fresh and real state
+for a file. As you can imagine this operation can be very expensive and long
+lasting depending on the location of the repository. But for CVS the
+CVS-backend of VC offers with the option <code>vc-cvs-stay-local</code> a way to
+tell Emacs to stay local even for the sake of getting a real
+state<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>.
+
+     <p>ECB offers <code>ecb-vc-recompute-state</code> for this approach which is an alias
+for <code>vc-recompute-state</code>.
+
+     <li>The heuristic approach:
+
+     <p>The function <code>vc-state</code> always returns a &ldquo;heuristic&rdquo; state
+which should be used when a fresh and real state is not necessary. 
+With <code>vc-state</code> the option <code>vc-cvs-stay-local</code> will never
+take effect.
+
+     <p>ECB offers <code>ecb-vc-state</code> for this approach - see below for the
+difference between <code>vc-state</code> and <code>ecb-vc-state</code>. 
+</ul>
+
+   <p>Example CVS:
+
+   <p>VC/CVS actually does it this way (regardless if ECB is active or
+not): When you visit a file, it always uses just the heuristic to get the
+state (comparing file times), regardless of the setting of
+<code>vc-cvs-stay-local</code>. This is because the "fresh-but-slow" state is
+determined by calling "cvs status" on the file, and this was deemed
+unacceptably slow if done at visiting time under any conditions.
+
+   <p>The state is updated by calling <code>vc-recompute-state</code> prior to
+<code>vc-next-action</code> (C-x v v) which either checks a file in or out. 
+IF <code>vc-cvs-stay-local</code> is nil, then this does in fact call "cvs
+status" to get the "fresh-but-slow-state", but if
+<code>vc-cvs-stay-local</code> is t, then it just compares the file times
+again.
+
+   <p>But under certain conditions (e.g. if called for files not already
+visited or for files their VC-state has been changed from outside
+Emacs, e.g. by checking in the file via command line) <code>vc-state</code>
+does not compute a new heuristic state but returns a cached one
+(cached by the VC-package itself not by ECB) which does not reflect
+the current VC-state. Example: if you have edited a file within Emacs
+and then checked in from outside Emacs <code>vc-state</code> returns a wrong
+state until you call <code>revert-buffer</code> for this file. Therefore ECB
+offers the check-state-function <code>ecb-vc-state</code> which does the
+same as <code>vc-state</code> but it clears the internal caches of the
+VC-package for that file before calling <code>vc-state</code>.
+
+   <p>The bottom line for you is this: If you use <code>ecb-vc-state</code> in
+<code>ecb-vc-supported-backends</code> to get the version control state, then you
+get the same policy that VC uses and you get always a &ldquo;correct&rdquo; heuristic
+state (as correct as possible a heuristic state can be). There should no harm
+if you use <code>ecb-vc-recompute-state</code> (which is an alias for
+<code>vc-recompute-state</code>) as a replacement function if you want to get fresh
+and real state-values, but then (a) you must make sure to set
+<code>vc-cvs-stay-local</code> to nil, and (b) fetching the state over the network
+under all conditions was deemed unacceptably slow in VC.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> The VC-package of Emacs offers a standardised and uniform
+interface for several backends; per default CVS, RCS, SCCS, Subversion, Git
+and Monotone are supported by the VC-package.</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> For other backends you have to check the VC-manual if there is
+equivalent option</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Checking-your-hooks.html b/site/ecb-2.40/html-help/Checking-your-hooks.html
new file mode 100644
index 0000000..8b6d360
--- /dev/null
+++ b/site/ecb-2.40/html-help/Checking-your-hooks.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=Setting-up-CEDET_002fsemantic.html#Checking%20your%20hooks">
diff --git a/site/ecb-2.40/html-help/Command-Index.html b/site/ecb-2.40/html-help/Command-Index.html
new file mode 100644
index 0000000..cccec5a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Command-Index.html
@@ -0,0 +1,127 @@
+<html lang="en">
+<head>
+<title>Command Index - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="FAQ.html#FAQ" title="FAQ">
+<link rel="next" href="Option-Index.html#Option-Index" title="Option Index">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Command-Index"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Option-Index.html#Option-Index">Option Index</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="FAQ.html#FAQ">FAQ</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="unnumbered">Command Index</h2>
+
+<p class="noindent">This index contains all user commands of ECB.
+
+   <p><strong>Please note</strong>: The commands in this index are listed without
+the prefix &ldquo;ecb-&rdquo; (e.g. the command <code>ecb-activate</code> is listed
+with name &ldquo;activate&rdquo;).
+
+<ul class="index-fn" compact>
+<li><a href="Interactive-ECB-commands.html#index-activate-57"><code>activate</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-add_002dall_002dbuffers_002dto_002dhistory-58"><code>add-all-buffers-to-history</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-analyse_002dbuffer_002dsync-59"><code>analyse-buffer-sync</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="The-edit_002darea.html#index-balance_002dwindows-38"><code>balance-windows</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Interactive-ECB-commands.html#index-change_002dlayout-60"><code>change-layout</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-clear_002dhistory-61"><code>clear-history</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-create_002dnew_002dlayout-64"><code>create-new-layout</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-customize-62"><code>customize</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-customize_002dmost_002dimportant-63"><code>customize-most-important</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-cycle_002dmaximized_002decb_002dbuffers-65"><code>cycle-maximized-ecb-buffers</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-cycle_002dthrough_002dcompilation_002dbuffers-66"><code>cycle-through-compilation-buffers</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-deactivate-67"><code>deactivate</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-delete_002dnew_002dlayout-68"><code>delete-new-layout</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="The-edit_002darea.html#index-delete_002dother_002dwindows-29"><code>delete-other-windows</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-delete_002dwindow-28"><code>delete-window</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-delete_002dwindows_002don-30"><code>delete-windows-on</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-display_002dbuffer-34"><code>display-buffer</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Interactive-ECB-commands.html#index-display_002dnews_002dfor_002dupgrade-69"><code>display-news-for-upgrade</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-display_002dupgraded_002doptions-70"><code>display-upgraded-options</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-dump_002dsemantic_002dtoplevel-72"><code>dump-semantic-toplevel</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-eshell_002dcurrent_002dbuffer_002dsync-73"><code>eshell-current-buffer-sync</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-eshell_002drecenter-74"><code>eshell-recenter</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-expand_002ddirectory_002dnodes-75"><code>expand-directory-nodes</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-expand_002dmethods_002dnodes-71"><code>expand-methods-nodes</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002danalyse-76"><code>goto-window-analyse</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dcompilation-77"><code>goto-window-compilation</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002ddirectories-78"><code>goto-window-directories</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002decb_002dby_002dsmart_002dselection-79"><code>goto-window-ecb-by-smart-selection</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dedit_002dby_002dsmart_002dselection-80"><code>goto-window-edit-by-smart-selection</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dedit_002dlast-83"><code>goto-window-edit-last</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dedit1-81"><code>goto-window-edit1</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dedit2-82"><code>goto-window-edit2</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dhistory-84"><code>goto-window-history</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dmethods-85"><code>goto-window-methods</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-goto_002dwindow_002dsources-86"><code>goto-window-sources</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-history_002dfilter-87"><code>history-filter</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-jde_002ddisplay_002dclass_002dat_002dpoint-88"><code>jde-display-class-at-point</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Programming-a-new-layout.html#index-layout_002ddefine-357"><code>layout-define</code></a>: <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a></li>
+<li><a href="Programming-a-new-layout.html#index-layout_002dundefine-358"><code>layout-undefine</code></a>: <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002danalyse-89"><code>maximize-window-analyse</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002ddirectories-90"><code>maximize-window-directories</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002dhistory-93"><code>maximize-window-history</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002dmethods-92"><code>maximize-window-methods</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002dsources-91"><code>maximize-window-sources</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-maximize_002dwindow_002dspeedbar-94"><code>maximize-window-speedbar</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter-95"><code>methods-filter</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dcurrent_002dtype-96"><code>methods-filter-current-type</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002ddelete_002dlast-97"><code>methods-filter-delete-last</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dfunction-98"><code>methods-filter-function</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dnofilter-99"><code>methods-filter-nofilter</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dprotection-100"><code>methods-filter-protection</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dregexp-101"><code>methods-filter-regexp</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-methods_002dfilter_002dtagclass-102"><code>methods-filter-tagclass</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-minor_002dmode-103"><code>minor-mode</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-nav_002dgoto_002dnext-105"><code>nav-goto-next</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-nav_002dgoto_002dprevious-104"><code>nav-goto-previous</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="The-edit_002darea.html#index-other_002dwindow-27"><code>other-window</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-other_002dwindow_002dfor_002dscrolling-37"><code>other-window-for-scrolling</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Interactive-ECB-commands.html#index-rebuild_002dmethods_002dbuffer-106"><code>rebuild-methods-buffer</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-redraw_002dlayout-107"><code>redraw-layout</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-restore_002ddefault_002dwindow_002dsizes-108"><code>restore-default-window-sizes</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-restore_002dwindow_002dsizes-109"><code>restore-window-sizes</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-select_002decb_002dframe-110"><code>select-ecb-frame</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-show_002dhelp-111"><code>show-help</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-show_002dlayout_002dhelp-112"><code>show-layout-help</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-show_002dtip_002dof_002dthe_002dday-113"><code>show-tip-of-the-day</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-sources_002dfilter-114"><code>sources-filter</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="The-edit_002darea.html#index-split_002dwindow-31"><code>split-window</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-split_002dwindow_002dhorizontally-32"><code>split-window-horizontally</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-split_002dwindow_002dvertically-33"><code>split-window-vertically</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Interactive-ECB-commands.html#index-store_002dwindow_002dsizes-115"><code>store-window-sizes</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-submit_002dproblem_002dreport-116"><code>submit-problem-report</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="The-edit_002darea.html#index-switch_002dto_002dbuffer-35"><code>switch-to-buffer</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="The-edit_002darea.html#index-switch_002dto_002dbuffer_002dother_002dwindow-36"><code>switch-to-buffer-other-window</code></a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002dauto_002dexpand_002dtag_002dtree-117"><code>toggle-auto-expand-tag-tree</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002dcompile_002dwindow-118"><code>toggle-compile-window</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002dcompile_002dwindow_002dheight-119"><code>toggle-compile-window-height</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002decb_002dwindows-120"><code>toggle-ecb-windows</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002dlayout-121"><code>toggle-layout</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-toggle_002dscroll_002dother_002dwindow_002dscrolls_002dcompile-122"><code>toggle-scroll-other-window-scrolls-compile</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-update_002ddirectories_002dbuffer-123"><code>update-directories-buffer</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-upgrade_002doptions-124"><code>upgrade-options</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+<li><a href="Interactive-ECB-commands.html#index-window_002dsync-125"><code>window-sync</code></a>: <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a></li>
+</ul>   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Common-use_002dcases.html b/site/ecb-2.40/html-help/Common-use_002dcases.html
new file mode 100644
index 0000000..dc99dc3
--- /dev/null
+++ b/site/ecb-2.40/html-help/Common-use_002dcases.html
@@ -0,0 +1,62 @@
+<html lang="en">
+<head>
+<title>Common use-cases - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Upgrading.html#Upgrading" title="Upgrading">
+<link rel="next" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Common-use-cases"></a>
+<a name="Common-use_002dcases"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Upgrading.html#Upgrading">Upgrading</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">10 Handling of common use-cases</h2>
+
+<!-- TODO: Move some section to the Usage-chapter!! -->
+<p>This chapter lists some common (and also some non-common) use-cases of ECB and
+gives a detailed description for each one. This contains also some tips and
+tricks how to deal best with some situations.
+
+<ul class="menu">
+<li><a accesskey="1" href="Changing-faces.html#Changing-faces">Changing faces</a>:               Changing faces in the ECB tree-buffers
+<li><a accesskey="2" href="Small-screens.html#Small-screens">Small screens</a>:                Working with small screens
+<li><a accesskey="3" href="Big-screens.html#Big-screens">Big screens</a>:                  Working with big screens
+<li><a accesskey="4" href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a>:          Simulating speedbar without an extra frame
+<li><a accesskey="5" href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>:         Integrating speedbar in the ECB-frame
+<li><a accesskey="6" href="Large-directories.html#Large-directories">Large directories</a>:            Working with large directories
+<li><a accesskey="7" href="Remote-directories.html#Remote-directories">Remote directories</a>:           Working with remote directories
+<li><a accesskey="8" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>:      Supporting Version control systems
+<li><a accesskey="9" href="Using-eshell.html#Using-eshell">Using eshell</a>:                 Optimal using of eshell in ECB
+<li><a href="Grepping-directories.html#Grepping-directories">Grepping directories</a>:         Grepping directories with ECB
+<li><a href="Working-with-JDEE.html#Working-with-JDEE">Working with JDEE</a>:            Working best with ECB and JDEE
+<li><a href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand">Compile-window on demand</a>:     Displaying the compile-window on demand
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>:         Parsing and displaying non-semantic sources
+<li><a href="Hide_002dshow.html#Hide_002dshow">Hide-show</a>:                    Using hide-show from the methods-buffer-menu
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>:      Support of several Emacs-window-managers
+<li><a href="Virtual-folders-in-History.html#Virtual-folders-in-History">Virtual folders in History</a>:   Simulating something like virtual folders
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Compile_002dwindow-on-demand.html b/site/ecb-2.40/html-help/Compile_002dwindow-on-demand.html
new file mode 100644
index 0000000..aa70e67
--- /dev/null
+++ b/site/ecb-2.40/html-help/Compile_002dwindow-on-demand.html
@@ -0,0 +1,82 @@
+<html lang="en">
+<head>
+<title>Compile-window on demand - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Working-with-JDEE.html#Working-with-JDEE" title="Working with JDEE">
+<link rel="next" href="Non_002dsemantic-sources.html#Non_002dsemantic-sources" title="Non-semantic sources">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Compile-window-on-demand"></a>
+<a name="Compile_002dwindow-on-demand"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Working-with-JDEE.html#Working-with-JDEE">Working with JDEE</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.12 Displaying the compile-window on demand</h3>
+
+<p>If you like displaying all output of compile/grep/etc. an all
+temp-buffers like *Help*-buffers in an extra compile-window
+(see <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>) but you dislike wasting the space
+of this compile-window if you are just editing then you can get a
+compile-window &ldquo;on demand&rdquo;. Just do the following:
+
+     <ol type=1 start=1>
+<li>Customize <code>ecb-compile-window-height</code> to not nil and save it for
+future sessions. This gives you an extra compile-window at the
+bottom.
+
+     <li>Add the following to your .emacs:
+
+     <pre class="example">        (add-hook 'ecb-activate-hook
+                  (lambda ()
+                    (let ((compwin-buffer (ecb-get-compile-window-buffer)))
+                    (if (not (and compwin-buffer
+                                  (ecb-compilation-buffer-p compwin-buffer)))
+                        (ecb-toggle-compile-window -1)))))
+   </pre>
+     <p>This hides the extra compile-window directly after the start of ECB
+because there is no need for a compile-window at this moment. But the
+hiding will not be done if there is a compile-window and if a
+&ldquo;compile-buffer&rdquo; in the sense of <code>ecb-compilation-buffer-p</code> is
+displayed in this compile-window. Without this additional check the
+compile-window would always be hidden after the ECB-start even when
+ECB is reactivated after a deactivation by the window-manager-support
+of ECB (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>); but in these cases we want
+to preserve the state before deactivation as good as possible (see
+also option <code>ecb-split-edit-window-after-start</code>).
+
+        </ol>
+
+   <p>This is all you have to do. Now if you run <code>compile</code> (or
+<code>grep</code> or other compile-modes) or display temp-buffers like
+*Help*-buffers then ECB autom. displays the compile-window at the
+bottom and display the output there.
+
+   <p>If you have finished with using the compile- or temp-output (e.g. 
+fixing errors) then you can throw away the compile-window just by
+<code>ecb-toggle-compile-window</code> - ECB will reactivate it autom. 
+before next compilation or help-buffer-display.!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Concept-Index.html b/site/ecb-2.40/html-help/Concept-Index.html
new file mode 100644
index 0000000..bb1366a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Concept-Index.html
@@ -0,0 +1,478 @@
+<html lang="en">
+<head>
+<title>Concept Index - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Option-Index.html#Option-Index" title="Option Index">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Concept-Index"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Option-Index.html#Option-Index">Option Index</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="unnumbered">Concept Index</h2>
+
+
+
+<ul class="index-cp" compact>
+<li><a href="Standard-activation.html#index-Activation-hook_002dsequence-10">Activation hook-sequence</a>: <a href="Standard-activation.html#Standard-activation">Standard activation</a></li>
+<li><a href="The-edit_002darea.html#index-Adviced-functions-26">Adviced functions</a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Semantic-analyser.html#index-Analyse-7">Analyse</a>: <a href="Semantic-analyser.html#Semantic-analyser">Semantic analyser</a></li>
+<li><a href="Semantic-analyser.html#index-Analyze-8">Analyze</a>: <a href="Semantic-analyser.html#Semantic-analyser">Semantic analyser</a></li>
+<li><a href="Automatic-activation.html#index-Automatic-activation-12">Automatic activation</a>: <a href="Automatic-activation.html#Automatic-activation">Automatic activation</a></li>
+<li><a href="Automatic-activation.html#index-Automatic-deactivation-13">Automatic deactivation</a>: <a href="Automatic-activation.html#Automatic-activation">Automatic activation</a></li>
+<li><a href="Conflicts.html#index-BBDB-361">BBDB</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-bs-package-359">bs package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-bs_002dshow-360">bs-show</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Submitting-problem-report.html#index-Bug-report-346">Bug report</a>: <a href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a></li>
+<li><a href="Conflicts.html#index-calendar-package-362">calendar package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Navigation_002fSelection.html#index-collapsing-22">collapsing</a>: <a href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a></li>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#index-compilation-buffers-41">compilation buffers</a>: <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a></li>
+<li><a href="Creating-a-new-ECB_002dlayout.html#index-Creating-new-layouts-54">Creating new layouts</a>: <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a></li>
+<li><a href="Conflicts.html#index-cygwin_002dmount-package-363">cygwin-mount package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Standard-activation.html#index-Deactivation-hook_002dsequence-11">Deactivation hook-sequence</a>: <a href="Standard-activation.html#Standard-activation">Standard activation</a></li>
+<li><a href="Conflicts.html#index-desktop-364">desktop</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="ECB-Directories_002dwindow.html#index-Directories-3">Directories</a>: <a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a></li>
+<li><a href="Downloading-new-versions.html#index-Download-348">Download</a>: <a href="Downloading-new-versions.html#Downloading-new-versions">Downloading new versions</a></li>
+<li><a href="The-ECB_002dlayout.html#index-ECB_002dlayout-51">ECB-layout</a>: <a href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a></li>
+<li><a href="Overview.html#index-ECB_002dwindows-2">ECB-windows</a>: <a href="Overview.html#Overview">Overview</a></li>
+<li><a href="Conflicts.html#index-edebug-365">edebug</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-ediff-366">ediff</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="The-edit_002darea.html#index-edit_002dwindow-25">edit-window</a>: <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a></li>
+<li><a href="Window_002dmanagers-and-ECB.html#index-escreen-354">escreen</a>: <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a></li>
+<li><a href="Using-eshell.html#index-eshell-352">eshell</a>: <a href="Using-eshell.html#Using-eshell">Using eshell</a></li>
+<li><a href="Navigation_002fSelection.html#index-expanding-21">expanding</a>: <a href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a></li>
+<li><a href="Changing-faces.html#index-Faces-349">Faces</a>: <a href="Changing-faces.html#Changing-faces">Changing faces</a></li>
+<li><a href="Filtering-the-tree_002dbuffers.html#index-Filter-49">Filter</a>: <a href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a></li>
+<li><a href="Conflicts.html#index-func_002dmenu-package-367">func-menu package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-Gnus-368">Gnus</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#index-grep-buffers-42">grep buffers</a>: <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a></li>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#index-help-buffers-40">help buffers</a>: <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a></li>
+<li><a href="Hiding-the-ECB-windows.html#index-Hide-windows-55">Hide windows</a>: <a href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a></li>
+<li><a href="ECB-History_002dwindow.html#index-History-6">History</a>: <a href="ECB-History_002dwindow.html#ECB-History_002dwindow">ECB History-window</a></li>
+<li><a href="List-of-hooks.html#index-Hooks-356">Hooks</a>: <a href="List-of-hooks.html#List-of-hooks">List of hooks</a></li>
+<li><a href="Incremental-search.html#index-Incremental-search-23">Incremental search</a>: <a href="Incremental-search.html#Incremental-search">Incremental search</a></li>
+<li><a href="Conflicts.html#index-JDEE-369">JDEE</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="The-ECB_002dlayout.html#index-layout-50">layout</a>: <a href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a></li>
+<li><a href="ECB-Methods_002dwindow.html#index-Methods-5">Methods</a>: <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a></li>
+<li><a href="Standard-activation.html#index-minor-mode-9">minor mode</a>: <a href="Standard-activation.html#Standard-activation">Standard activation</a></li>
+<li><a href="Using-the-mouse.html#index-mouse-button-16">mouse button</a>: <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a></li>
+<li><a href="Creating-a-new-ECB_002dlayout.html#index-New-layouts-53">New layouts</a>: <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a></li>
+<li><a href="The-Methods-buffer.html#index-non_002dsemantic_002dsources-46">non-semantic-sources</a>: <a href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a></li>
+<li><a href="The-other-window.html#index-other-window-44">other window</a>: <a href="The-other-window.html#The-other-window">The other window</a></li>
+<li><a href="Using-the-mouse.html#index-POWER_002dclick-18">POWER-click</a>: <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a></li>
+<li><a href="Using-the-mouse.html#index-primary-button-14">primary button</a>: <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a></li>
+<li><a href="Submitting-problem-report.html#index-Problem-report-347">Problem report</a>: <a href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a></li>
+<li><a href="Redrawing-the-ECB_002dlayout.html#index-Redraw-52">Redraw</a>: <a href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">Redrawing the ECB-layout</a></li>
+<li><a href="Navigation_002fSelection.html#index-RETURN-key-19">RETURN key</a>: <a href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a></li>
+<li><a href="Conflicts.html#index-scroll_002dall-371">scroll-all</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-scroll_002dall_002dmode-370">scroll-all-mode</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Using-the-mouse.html#index-secondary-button-15">secondary button</a>: <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a></li>
+<li><a href="Customizing-the-display.html#index-semantic-tag-47">semantic tag</a>: <a href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a></li>
+<li><a href="The-Methods-buffer.html#index-semantic_002dsources-45">semantic-sources</a>: <a href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a></li>
+<li><a href="Using-the-mouse.html#index-SHIFT_002dclick-17">SHIFT-click</a>: <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a></li>
+<li><a href="Hiding-the-ECB-windows.html#index-Show-windows-56">Show windows</a>: <a href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a></li>
+<li><a href="Small-screens.html#index-Small-screen-350">Small screen</a>: <a href="Small-screens.html#Small-screens">Small screens</a></li>
+<li><a href="ECB-Sources_002dwindow.html#index-Sources-4">Sources</a>: <a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a></li>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#index-special_002ddisplay-43">special-display</a>: <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a></li>
+<li><a href="Simulating-speedbar.html#index-Speedbar-351">Speedbar</a>: <a href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a></li>
+<li><a href="Navigation_002fSelection.html#index-TAB-key-20">TAB key</a>: <a href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a></li>
+<li><a href="Customizing-the-display.html#index-tag-48">tag</a>: <a href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a></li>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#index-temporary-buffers-39">temporary buffers</a>: <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a></li>
+<li><a href="Using-popup_002dmenus.html#index-tmm-24">tmm</a>: <a href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a></li>
+<li><a href="Overview.html#index-tree_002dbuffer-1">tree-buffer</a>: <a href="Overview.html#Overview">Overview</a></li>
+<li><a href="Conflicts.html#index-VC-package-372">VC package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-Version-control-373">Version control</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-VM-package-374">VM package</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-wb_002dline_002dnumber-377">wb-line-number</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Window_002dmanagers-and-ECB.html#index-window_002dmanager-355">window-manager</a>: <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a></li>
+<li><a href="Conflicts.html#index-winner-376">winner</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Conflicts.html#index-winner_002dmode-375">winner-mode</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+<li><a href="Window_002dmanagers-and-ECB.html#index-winring-353">winring</a>: <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a></li>
+<li><a href="Conflicts.html#index-xrefactory-378">xrefactory</a>: <a href="Conflicts.html#Conflicts">Conflicts</a></li>
+   </ul>
+<div class="contents">
+<h2>Table of Contents</h2>
+<ul>
+<li><a name="toc_Install-and-first-steps" href="Install-and-first-steps.html#Install-and-first-steps">1 Installation and first steps of ECB</a>
+<ul>
+<li><a href="Installation.html#Installation">1.1 Installation of ECB</a>
+<ul>
+<li><a href="Requirements.html#Requirements">1.1.1 Requirements</a>
+<li><a href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage">1.1.2 Installation of ECB as a XEmacs-package</a>
+<li><a href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation">1.1.3 Standard installation of ECB for (X)Emacs</a>
+</li></ul>
+<li><a href="Setting-up-Emacs.html#Setting-up-Emacs">1.2 How to set up Emacs for file parsing with ECB</a>
+<ul>
+<li><a href="General-hints.html#General-hints">1.2.1 General hints for a correct setup</a>
+<li><a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">1.2.2 Setting up CEDET/semantic</a>
+<li><a href="Non_002dsemantic-files.html#Non_002dsemantic-files">1.2.3 Setup for file types not supported by semantic</a>
+</li></ul>
+<li><a href="First-steps.html#First-steps">1.3 First steps after activating ECB first time</a>
+</li></ul>
+<li><a name="toc_Overview" href="Overview.html#Overview">2 Overview</a>
+<li><a name="toc_Manual-usage" href="Manual-usage.html#Manual-usage">3 How to use this manual</a>
+<li><a name="toc_ECB_002dwindows" href="ECB_002dwindows.html#ECB_002dwindows">4 All ECB-windows of ECB</a>
+<ul>
+<li><a href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">4.1 The basic ECB-windows of ECB</a>
+<ul>
+<li><a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">4.1.1 General introduction into tree-buffers</a>
+<ul>
+<li><a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">4.1.1.1 Content and structure of a tree-buffer</a>
+<li><a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">4.1.1.2 Possible actions for a tree-node</a>
+<li><a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">4.1.1.3 Sticky parent-node for tree-buffers</a>
+</li></ul>
+<li><a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">4.1.2 Displaying the trees with different styles</a>
+<ul>
+<li><a href="Style-basics.html#Style-basics">4.1.2.1 Basic knowledge about the styles</a>
+<li><a href="Ascii_002dbased-styles.html#Ascii_002dbased-styles">4.1.2.2 How to customize the ascii-styles</a>
+<li><a href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images">4.1.2.3 Which images are used for the tree</a>
+<li><a href="Images-for-Methods_002dbuffer.html#Images-for-Methods_002dbuffer">4.1.2.4 Special images for the Methods-buffer</a>
+</li></ul>
+<li><a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">4.1.3 ECB Directories-window</a>
+<ul>
+<li><a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">4.1.3.1 Usage of the directories ECB-window</a>
+<li><a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">4.1.3.2 Activating/Displaying the directories ECB-window</a>
+<li><a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">4.1.3.3 Customizing the directories ECB-window</a>
+</li></ul>
+<li><a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">4.1.4 ECB Sources-window</a>
+<ul>
+<li><a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">4.1.4.1 Usage of the ECB-Sources-window</a>
+<li><a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">4.1.4.2 Activating/Displaying the ECB-Sources-window</a>
+<li><a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">4.1.4.3 Customizing the ECB-Sources-window</a>
+</li></ul>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5 The ECB Methods-window</a>
+<ul>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.1 Usage of the methods ECB-window</a>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.2 Activating/Displaying the methods ECB-window</a>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.3 Synchronizing the Methods-window with current source-buffer</a>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.4 Synchronizing with indirect buffers</a>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.5 Jumping to the definition of external types</a>
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">4.1.5.6 Customizing the methods ECB-window</a>
+</li></ul>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6 The ECB History-window</a>
+<ul>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.1 Usage of the ECB-History-window</a>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.2 Activating/Displaying the ECB-History-window</a>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.3 Dead buffers in the history</a>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.4 Indirect buffers in the history</a>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.5 Bucketizing the history</a>
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">4.1.6.6 Customizing the ECB-History-window</a>
+</li></ul>
+</li></ul>
+<li><a href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">4.2 Add-on ECB-windows of ECB</a>
+<ul>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1 Displaying the current semantic context via analyser</a>
+<ul>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1.1 Usage of the analyser-ECB-window</a>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1.2 Synchronizing the analyse-window</a>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1.3 Interactive commands of the analyser-ECB-window</a>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1.4 Activating/Displaying the analyser-ECB-window</a>
+<li><a href="Semantic-analyser.html#Semantic-analyser">4.2.1.5 Customizing the analyser ECB-window</a>
+</li></ul>
+<li><a href="Symboldefinition.html#Symboldefinition">4.2.2 Displaying the definition of the current symbol under point</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_Activation-and-Deactivation" href="Activation-and-Deactivation.html#Activation-and-Deactivation">5 Activation and Deactivation</a>
+<ul>
+<li><a href="Standard-activation.html#Standard-activation">5.1 Standard activation and deactivation</a>
+<li><a href="Automatic-activation.html#Automatic-activation">5.2 Automatic activation and deactivation</a>
+</li></ul>
+<li><a name="toc_Usage-of-ECB" href="Usage-of-ECB.html#Usage-of-ECB">6 Usage of ECB</a>
+<ul>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1 Working with the mouse in the ECB-windows</a>
+<ul>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1.1 The primary mouse-button</a>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1.2 The POWER- or SHIFT-click</a>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1.3 The secondary mouse-button</a>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1.4 The right mouse-button</a>
+<li><a href="Using-the-mouse.html#Using-the-mouse">6.1.5 Horizontal scrolling with the mouse</a>
+</li></ul>
+<li><a href="Using-the-keyboard.html#Using-the-keyboard">6.2 Working with the keyboard in the ECB-windows</a>
+<ul>
+<li><a href="Navigation_002fSelection.html#Navigation_002fSelection">6.2.1 Navigation and Selection in a tree-buffer</a>
+<li><a href="Incremental-search.html#Incremental-search">6.2.2 Incremental search for a node in current tree-buffer</a>
+<li><a href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings">6.2.3 Adding personal keybindings for the tree-buffers</a>
+<li><a href="Using-popup_002dmenus.html#Using-popup_002dmenus">6.2.4 Using the popup-menu of a tree-buffer from keyboard.</a>
+</li></ul>
+<li><a href="The-edit_002darea.html#The-edit_002darea">6.3 Working with the edit-window(s) of the edit-area</a>
+<ul>
+<li><a href="The-edit_002darea.html#The-edit_002darea">6.3.1 Documentation of the adviced window functions</a>
+</li></ul>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4 Temp- and compile-buffers display in ECB</a>
+<ul>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.1 Standard Emacs behavior</a>
+<ul>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.1.1 Gnu Emacs 21.x, 22.x and XEmacs 21.4:</a>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.1.2 Gnu Emacs 23.x</a>
+</li></ul>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.2 Using a persistent compile window</a>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.3 What to do if there are problems with the compile-window</a>
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">6.4.4 Handling special-display-buffers</a>
+</li></ul>
+<li><a href="The-other-window.html#The-other-window">6.5 How the &ldquo;other window&rdquo; is determined by ECB</a>
+<ul>
+<li><a href="The-other-window.html#The-other-window">6.5.1 &ldquo;Other window&rdquo;-basics in ECB</a>
+<li><a href="The-other-window.html#The-other-window">6.5.2 Builtin &ldquo;other window&rdquo; behaviors of ECB</a>
+<li><a href="The-other-window.html#The-other-window">6.5.3 User-defined &ldquo;other window&rdquo; behavior</a>
+</li></ul>
+<li><a href="The-Methods-buffer.html#The-Methods-buffer">6.6 Using and customizing the ECB-Methods buffer</a>
+<ul>
+<li><a href="Visiting-tags.html#Visiting-tags">6.6.1 Possible actions after visiting a tag</a>
+<li><a href="Expanding.html#Expanding">6.6.2 Explicit and automatic expanding of the ECB-methods-buffer</a>
+<ul>
+<li><a href="Expanding.html#Expanding">6.6.2.1 Explicit expanding all nodes to a certain expansion level</a>
+<li><a href="Expanding.html#Expanding">6.6.2.2 Explicit expanding of the current node to a certain level</a>
+<li><a href="Expanding.html#Expanding">6.6.2.3 Automatic expansion ot tags after buffer-parsing</a>
+<li><a href="Expanding.html#Expanding">6.6.2.4 Automatic expanding the ECB-methods-buffer for current tag</a>
+</li></ul>
+<li><a href="Customizing-the-display.html#Customizing-the-display">6.6.3 Customizing the display of the Methods-buffer</a>
+<li><a href="Rebuilding-the-Methods.html#Rebuilding-the-Methods">6.6.4 Rebuilding the Methods-buffer</a>
+</li></ul>
+<li><a href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">6.7 Applying filters to the special ECB-tree-buffers</a>
+<ul>
+<li><a href="Filtering-Directories.html#Filtering-Directories">6.7.1 Applying filters to the Directories-buffer</a>
+<li><a href="Filtering-Sources.html#Filtering-Sources">6.7.2 Applying filters to the Sources-buffer</a>
+<ul>
+<li><a href="Filtering-Sources.html#Filtering-Sources">6.7.2.1 Interactive Sources-filters</a>
+<li><a href="Filtering-Sources.html#Filtering-Sources">6.7.2.2 Default Sources-filters</a>
+</li></ul>
+<li><a href="Filtering-History.html#Filtering-History">6.7.3 Applying filters to the History-buffer</a>
+<ul>
+<li><a href="Filtering-History.html#Filtering-History">6.7.3.1 Interactive History-filters</a>
+<li><a href="Filtering-History.html#Filtering-History">6.7.3.2 Default History-filters</a>
+</li></ul>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4 Applying filters to the Methods-buffer</a>
+<ul>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4.1 Possible filter-criterias</a>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4.2 Inverse Filters</a>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4.3 Layered filters</a>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4.4 Display of currently applied filters</a>
+<li><a href="Filtering-Methods.html#Filtering-Methods">6.7.4.5 Default filters for certain files.</a>
+</li></ul>
+</li></ul>
+<li><a href="The-ECB_002dlayout.html#The-ECB_002dlayout">6.8 Changing, customizing, redrawing and creating layouts</a>
+<ul>
+<li><a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">6.8.1 Changing and customizing the ECB-layout</a>
+<li><a href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">6.8.2 Redrawing the ECB-layout</a>
+<li><a href="Changing-window-sizes.html#Changing-window-sizes">6.8.3 Changing the sizes of the special ECB-windows</a>
+<li><a href="Fixing-window-sizes.html#Fixing-window-sizes">6.8.4 Fixing the sizes of the special ECB-windows</a>
+<li><a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">6.8.5 Interactively creating new layouts</a>
+</li></ul>
+<li><a href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">6.9 Hiding/Showing the ECB windows</a>
+<li><a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">6.10 Maximizing the ECB windows</a>
+<ul>
+<li><a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">6.10.1 How to maximize and minimize special ecb-tree-windows</a>
+<li><a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">6.10.2 Selecting a node in a maximized ecb-tree-window</a>
+</li></ul>
+<li><a href="Back_002fforward-navigation.html#Back_002fforward-navigation">6.11 Back- and forward navigation like a browser</a>
+<li><a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">6.12 Synchronization of the ECB-windows</a>
+<ul>
+<li><a href="General-synchronization-aspects.html#General-synchronization-aspects">6.12.1 General synchronization aspects</a>
+<li><a href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows">6.12.2 Synchronization of the basic ECB-windows</a>
+<li><a href="Add_002don-synchronization.html#Add_002don-synchronization">6.12.3 Synchronization of add-on ECB-windows</a>
+</li></ul>
+<li><a href="Stealthy-background-tasks.html#Stealthy-background-tasks">6.13 Stealthy background-tasks of ECB</a>
+<li><a href="Interactive-ECB-commands.html#Interactive-ECB-commands">6.14 Interactive ECB commands</a>
+</li></ul>
+<li><a name="toc_Customizing" href="Customizing.html#Customizing">7 Customizing ECB</a>
+<ul>
+<li><a href="General-aspects.html#General-aspects">7.1 General aspects for customizing ECB</a>
+<ul>
+<li><a href="setq-or-customize.html#setq-or-customize">7.1.1 Setq or customize - what should i use?</a>
+<li><a href="Site_002dwide-customizing.html#Site_002dwide-customizing">7.1.2 Site-wide customizing of ECB</a>
+<ul>
+<li><a href="Site_002dwide-customizing.html#Site_002dwide-customizing">7.1.2.1 Storing all option-settings in the users custom-file</a>
+<li><a href="Site_002dwide-customizing.html#Site_002dwide-customizing">7.1.2.2 Using a special setq for site-wide settings</a>
+</li></ul>
+</li></ul>
+<li><a href="Most-important-options.html#Most-important-options">7.2 The most important options of ECB</a>
+<li><a href="Customizable-options.html#Customizable-options">7.3 All customizable options of ECB</a>
+<ul>
+<li><a href="ecb_002dgeneral.html#ecb_002dgeneral">7.3.1 Group ecb-general</a>
+<li><a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">7.3.2 Group ecb-tree-buffer</a>
+<li><a href="ecb_002ddirectories.html#ecb_002ddirectories">7.3.3 Group ecb-directories</a>
+<li><a href="ecb_002dsources.html#ecb_002dsources">7.3.4 Group ecb-sources</a>
+<li><a href="ecb_002dmethods.html#ecb_002dmethods">7.3.5 Group ecb-methods</a>
+<li><a href="ecb_002dhistory.html#ecb_002dhistory">7.3.6 Group ecb-history</a>
+<li><a href="ecb_002danalyse.html#ecb_002danalyse">7.3.7 Group ecb-analyse</a>
+<li><a href="ecb_002dlayout.html#ecb_002dlayout">7.3.8 Group ecb-layout</a>
+<li><a href="ecb_002dcompilation.html#ecb_002dcompilation">7.3.9 Group ecb-compilation</a>
+<li><a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">7.3.10 Group ecb-create-layout</a>
+<li><a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">7.3.11 Group ecb-face-options</a>
+<li><a href="ecb_002dfaces.html#ecb_002dfaces">7.3.12 Group ecb-faces</a>
+<li><a href="ecb_002dhelp.html#ecb_002dhelp">7.3.13 Group ecb-help</a>
+<li><a href="ecb_002deshell.html#ecb_002deshell">7.3.14 Group ecb-eshell</a>
+<li><a href="ecb_002dspeedbar.html#ecb_002dspeedbar">7.3.15 Group ecb-speedbar</a>
+<li><a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">7.3.16 Group ecb-non-semantic</a>
+<li><a href="ecb_002dwinman.html#ecb_002dwinman">7.3.17 Group ecb-winman</a>
+<li><a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">7.3.18 Group ecb-mode-line</a>
+<li><a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">7.3.19 Group ecb-version-control</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_Submitting-problem-report" href="Submitting-problem-report.html#Submitting-problem-report">8 Submitting a problem report</a>
+<li><a name="toc_Upgrading" href="Upgrading.html#Upgrading">9 Upgrading and downloading packages</a>
+<ul>
+<li><a href="Downloading-new-versions.html#Downloading-new-versions">9.1 Downloading new versions of ECB and/or CEDET</a>
+<li><a href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">9.2 Automatic upgrading of options</a>
+<ul>
+<li><a href="User-interface.html#User-interface">9.2.1 User interface for option-upgrading</a>
+<li><a href="Background-information.html#Background-information">9.2.2 Background information</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_Common-use_002dcases" href="Common-use_002dcases.html#Common-use_002dcases">10 Handling of common use-cases</a>
+<ul>
+<li><a href="Changing-faces.html#Changing-faces">10.1 Changing faces in the ECB tree-buffers</a>
+<li><a href="Small-screens.html#Small-screens">10.2 Working with small screens</a>
+<li><a href="Big-screens.html#Big-screens">10.3 Working with big screens</a>
+<li><a href="Simulating-speedbar.html#Simulating-speedbar">10.4 Simulating speedbar without an extra frame</a>
+<li><a href="Integrating-speedbar.html#Integrating-speedbar">10.5 Integrating speedbar in the ECB-frame</a>
+<li><a href="Large-directories.html#Large-directories">10.6 Working with large directories</a>
+<li><a href="Remote-directories.html#Remote-directories">10.7 Working with remote directories</a>
+<ul>
+<li><a href="Remote-directories.html#Remote-directories">10.7.1 General remarks</a>
+<li><a href="Remote-directories.html#Remote-directories">10.7.2 Excluding remote directories from time-consuming tasks</a>
+<li><a href="Remote-directories.html#Remote-directories">10.7.3 Caching the contents of remote directories</a>
+</li></ul>
+<li><a href="Version_002dcontrol-support.html#Version_002dcontrol-support">10.8 Supporting Version control systems</a>
+<ul>
+<li><a href="Identifying-backends.html#Identifying-backends">10.8.1 How ECB identifies the VC-backend of a dir</a>
+<li><a href="Checking-the-state.html#Checking-the-state">10.8.2 How ECB checks the VC-state of a file</a>
+<ul>
+<li><a href="Checking-the-state.html#Checking-the-state">10.8.2.1 Getting heuristic state-values or real ones for a backend</a>
+</li></ul>
+<li><a href="Remote-repositories.html#Remote-repositories">10.8.3 Important informations about remote repositories</a>
+<ul>
+<li><a href="Remote-repositories.html#Remote-repositories">10.8.3.1 Remote paths and the VC-support of ECB</a>
+</li></ul>
+<li><a href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate">10.8.4 How to refresh ECB-state-display when changed outside</a>
+<li><a href="Adding-new-backends.html#Adding-new-backends">10.8.5 Necessary steps and informations for adding new backends</a>
+<li><a href="Known-VC_002dproblems.html#Known-VC_002dproblems">10.8.6 Currently known problems with the VC-support</a>
+</li></ul>
+<li><a href="Using-eshell.html#Using-eshell">10.9 Optimal using of eshell in ECB</a>
+<li><a href="Grepping-directories.html#Grepping-directories">10.10 Grepping directories with ECB</a>
+<li><a href="Working-with-JDEE.html#Working-with-JDEE">10.11 Working best with ECB and JDEE</a>
+<li><a href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand">10.12 Displaying the compile-window on demand</a>
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">10.13 Parsing and displaying non-semantic sources</a>
+<ul>
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">10.13.1 Enabling parsing and displaying of non-semantic-sources</a>
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">10.13.2 Automatic rescanning/reparsing of non-semantic-sources</a>
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">10.13.3 Customizing the display of the tags</a>
+</li></ul>
+<li><a href="Hide_002dshow.html#Hide_002dshow">10.14 Using hide-show from the methods-buffer-menu</a>
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">10.15 Support of several Emacs-window-managers</a>
+<ul>
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">10.15.1 Enabling of the support</a>
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">10.15.2 Usage of a window-manager in combination with ECB</a>
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">10.15.3 Disabling the support</a>
+</li></ul>
+<li><a href="Virtual-folders-in-History.html#Virtual-folders-in-History">10.16 Something like virtual folders with the ECB-history</a>
+</li></ul>
+<li><a name="toc_Elisp-programming" href="Elisp-programming.html#Elisp-programming">11 Entry points for Elisp programmers</a>
+<ul>
+<li><a href="List-of-variables.html#List-of-variables">11.1 Variables for Elisp-programs</a>
+<li><a href="List-of-hooks.html#List-of-hooks">11.2 Available hooks of ECB</a>
+<li><a href="tree_002dbuffer.html#tree_002dbuffer">11.3 The library tree-buffer.el</a>
+<ul>
+<li><a href="Introduction.html#Introduction">11.3.1 General description of tree-buffers</a>
+<ul>
+<li><a href="Introduction.html#Introduction">11.3.1.1 What is a tree-buffer?</a>
+<li><a href="Introduction.html#Introduction">11.3.1.2 General recipe for a tree-buffer</a>
+</li></ul>
+<li><a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">11.3.2 How to create a new tree-buffer</a>
+<li><a href="A-new-tree_002dnode.html#A-new-tree_002dnode">11.3.3 How to create a new tree-node</a>
+<ul>
+<li><a href="A-new-tree_002dnode.html#A-new-tree_002dnode">11.3.3.1 Content of a tree-node</a>
+<li><a href="A-new-tree_002dnode.html#A-new-tree_002dnode">11.3.3.2 Creating a new tree-node and adding it to the tree</a>
+<li><a href="A-new-tree_002dnode.html#A-new-tree_002dnode">11.3.3.3 Accessing the slots of a tree-node</a>
+</li></ul>
+<li><a href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">11.3.4 How to update a tree-buffer-display after changes</a>
+<li><a href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">11.3.5 Default and customizable keybindings of a tree-buffer</a>
+<li><a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">11.3.6 All functions available for tree-buffers and tree-nodes</a>
+<ul>
+<li><a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">11.3.6.1 The API for a tree-buffer:</a>
+<li><a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">11.3.6.2 The API for a tree-node</a>
+</li></ul>
+<li><a href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer">11.3.7 Things which are strictly forbidden</a>
+<li><a href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">11.3.8 How to deal with certain programming-requirements</a>
+<ul>
+<li><a href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">11.3.8.1 Caching the current tree-buffer display</a>
+</li></ul>
+</li></ul>
+<li><a href="Adviced-functions.html#Adviced-functions">11.4 How to deal with the adviced functions</a>
+<li><a href="The-layout_002dengine.html#The-layout_002dengine">11.5 How to program new layouts and new special windows</a>
+<ul>
+<li><a href="Programming-a-new-layout.html#Programming-a-new-layout">11.5.1 How to program a new layout</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2 All aspects of programming special windows</a>
+<ul>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.1 The outline of the example layout:</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.2 The description of the layout-contents</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.3 The example code</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.4 The bufferinfo buffer of the example</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.5 Synchronizing the bufferinfo-buffer automatically</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.6 The action buffer of the example</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.7 Adding the bufferinfo- and action-buffer to a new layout</a>
+<li><a href="Programming-special-windows.html#Programming-special-windows">11.5.2.8 Activating and deactivating new layouts</a>
+</li></ul>
+<li><a href="Possible-layout_002doutlines.html#Possible-layout_002doutlines">11.5.3 The wide range of possible layout-outlines</a>
+<li><a href="The-layout_002dengine-API.html#The-layout_002dengine-API">11.5.4 The complete layout-engine API of ECB</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_Conflicts-and-bugs" href="Conflicts-and-bugs.html#Conflicts-and-bugs">12 Conflicts and bugs of ECB</a>
+<ul>
+<li><a href="Conflicts.html#Conflicts">12.1 Conflicts with other packages</a>
+<ul>
+<li><a href="Conflicts.html#Conflicts">12.1.1 Proved workarounds or recommendations for other packages</a>
+<ul>
+<li><a href="Conflicts.html#Conflicts">12.1.1.1 Package bs.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.2 Package BBDB</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.3 Package calendar.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.4 Package cygwin-mount.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.5 Package desktop.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.6 Package edebug (Lisp Debugger)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.7 Package ediff.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.8 Package func-menu.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.9 Package Gnus (Newsreader)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.10 Package JDEE (Java Development Environment)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.11 Package scroll-all.el (scroll-all-mode)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.12 Package VC (Version Control)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.13 Package VM (Emacs Mail-Client)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.14 Package winner.el (winner-mode)</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.15 Package wb-line-number.el</a>
+<li><a href="Conflicts.html#Conflicts">12.1.1.16 Application xrefactory</a>
+</li></ul>
+<li><a href="Conflicts.html#Conflicts">12.1.2 What to do for unknown conflicts with other packages</a>
+</li></ul>
+<li><a href="Bugs.html#Bugs">12.2 Known bugs</a>
+<ul>
+<li><a href="Bugs.html#Bugs">12.2.1 Extra history-entries for JDEE source-buffers</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_FAQ" href="FAQ.html#FAQ">13 Frequently asked questions</a>
+<li><a name="toc_Command-Index" href="Command-Index.html#Command-Index">Command Index</a>
+<li><a name="toc_Option-Index" href="Option-Index.html#Option-Index">Option Index</a>
+<li><a name="toc_Concept-Index" href="Concept-Index.html#Concept-Index">Concept Index</a>
+</li></ul>
+</div>
+
+</body></html>
+
diff --git a/site/ecb-2.40/html-help/Conflicts-and-bugs.html b/site/ecb-2.40/html-help/Conflicts-and-bugs.html
new file mode 100644
index 0000000..d1eb5c3
--- /dev/null
+++ b/site/ecb-2.40/html-help/Conflicts-and-bugs.html
@@ -0,0 +1,47 @@
+<html lang="en">
+<head>
+<title>Conflicts and bugs - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="next" href="FAQ.html#FAQ" title="FAQ">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Conflicts-and-bugs"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="FAQ.html#FAQ">FAQ</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">12 Conflicts and bugs of ECB</h2>
+
+<p>This chapter describes what to do when there are conflicts with other
+packages and also the known (and currently unfixed) bugs of ECB. If
+possible (and in most cases it is possible ;-) then a practicable
+solution or workaround is described.
+
+<ul class="menu">
+<li><a accesskey="1" href="Conflicts.html#Conflicts">Conflicts</a>:                    Conflicts with other packages
+<li><a accesskey="2" href="Bugs.html#Bugs">Bugs</a>:                         Known bugs
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Conflicts.html b/site/ecb-2.40/html-help/Conflicts.html
new file mode 100644
index 0000000..bbb76ed
--- /dev/null
+++ b/site/ecb-2.40/html-help/Conflicts.html
@@ -0,0 +1,324 @@
+<html lang="en">
+<head>
+<title>Conflicts - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Conflicts-and-bugs.html#Conflicts-and-bugs" title="Conflicts and bugs">
+<link rel="prev" href="Conflicts-and-bugs.html#Conflicts-and-bugs" title="Conflicts and bugs">
+<link rel="next" href="Bugs.html#Bugs" title="Bugs">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Conflicts"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Bugs.html#Bugs">Bugs</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>
+<hr>
+</div>
+
+<h3 class="section">12.1 Conflicts with other packages</h3>
+
+<p>This chapter contains a list of already known conflict between ECB and
+other packages and how to solve them - in most cases ECB already
+contains a suitable workaround.
+
+   <p>That is followed by a general recipe what you can do when you have
+detected a conflict between ECB and a package is not listed in the
+know-conflicts-section.
+
+<h4 class="subsection">12.1.1 Proved workarounds or recommendations for other packages</h4>
+
+<p>Here is a list of packages which are proved to work properly with ECB
+and if not (i.e. there are conflicts) then helpful
+solutions/hints/workarounds are offered:
+
+<h5 class="subsubsection">12.1.1.1 Package bs.el</h5>
+
+<p><a name="index-bs-package-359"></a><a name="index-bs_002dshow-360"></a>The package bs.el offers a nifty buffer-selection buffer. The main
+command of this package is <code>bs-show</code>. With ECB &lt; 2.20 this
+command does not really working well within activated ECB. But as of
+version 2.20 of ECB there should be no problems using this package.
+
+   <p>If you add &ldquo;*buffer-selection*&rdquo; as buffer-name to the option
+<code>ecb-compilation-buffer-names</code> then ECB will always display the
+buffer-selection buffer of bs in the compile-window (if there is one). 
+Otherwise bs will use the edit-area to do its job.
+
+<h5 class="subsubsection">12.1.1.2 Package BBDB</h5>
+
+<p><a name="index-BBDB-361"></a>As of ECB 2.21 there should be no conflicts between BBDB and ECB, so
+BBDB can be used even when the ECB-windows are visible.
+
+   <p>But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>). With such a window-manager ECB and BBDB should work together
+very well under all circumstances!
+
+<h5 class="subsubsection">12.1.1.3 Package calendar.el</h5>
+
+<p><a name="index-calendar-package-362"></a>With activated ECB <code>calendar</code> does not shrink it“s window to the small
+size but splits the window equally. But if you add this to your
+<samp><span class="file">.emacs</span></samp> it works:
+
+<pre class="example">   (add-hook 'initial-calendar-window-hook
+             (function (lambda ()
+                         (when (and ecb-minor-mode
+                                    (ecb-point-in-edit-window))
+                           ;; if no horizontal split then nothing
+                           ;; special to do
+                           (or (= (frame-width) (window-width))
+                               (shrink-window (- (window-height) 9))))
+                        )))
+</pre>
+   <h5 class="subsubsection">12.1.1.4 Package cygwin-mount.el</h5>
+
+<p><a name="index-cygwin_002dmount-package-363"></a>There can be a conflict between ECB and cygwin-mount.el if the
+following conditions are true:
+
+     <ul>
+<li>You are working with cygwin-mount.el (sounds clear :-)
+<li>You have set <code>cygwin-mount-build-mount-table-asynch</code> to not
+nil
+<li>ECB is automatically started after starting Emacs (e.g. with
+<code>ecb-auto-activate</code> or calling <code>ecb-activate</code> in
+<code>window-setup-hook</code>)
+<li>Your Emacs-setup contains a call of <code>cygwin-mount-activate</code>. 
+</ul>
+
+   <p>Under these circumstances Emacs 21.X sometimes eats up the whole CPU (at
+least with Windows XP) and the cygwin-mount-table is never build.
+
+   <p>But there is an easy work-around: Call <code>cygwin-mount-activate</code>
+first *AFTER* ECB is activated. This can be done with the hook
+<code>ecb-activate-hook</code>:
+
+<pre class="example">   (add-hook 'ecb-activate-hook
+             (function (lambda ()
+                         (require 'cygwin-mount)
+                         (setq cygwin-mount-build-mount-table-asynch t)
+                         (cygwin-mount-activate))))
+</pre>
+   <h5 class="subsubsection">12.1.1.5 Package desktop.el</h5>
+
+<p><a name="index-desktop-364"></a>ECB works perfectly with the desktop-saver desktop.el. Normally there should
+be nothing to do for you.
+
+   <p>But if you encounter problems (e.g. that desktop tries to activate ECB for
+each buffer it loads) then you should add the following entry to the option
+<code>desktop-minor-mode-table</code>:
+
+<pre class="example">   (ecb-minor-mode nil)
+</pre>
+   <p>If you still encounter problems then you should add entries for all the
+minor-mode of the semantic-package to <code>desktop-minor-mode-table</code>, so for
+example add also:
+
+<pre class="example">   (semantic-decoration-mode nil)
+   (semantic-idle-completions-mode nil)
+   (semantic-idle-tag-highlight-mode nil)
+   (semantic-idle-summary-mode nil)
+   (semantic-idle-scheduler-mode nil)
+   (senator-isearch-semantic-mode nil)
+   (senator-minor-mode nil)
+   (semantic-highlight-func-mode nil)
+   (semantic-stickyfunc-mode nil)
+   (semantic-show-parser-state-mode nil)
+   (semantic-show-unmatched-syntax-mode nil
+   (semantic-highlight-edits-mode nil
+</pre>
+   <p>Normally this should not be necessary, because semantic is already prepared to
+work perfectly with desktop.el. But if there are problems it's worth a try. 
+Which modes you have to add depends on which modes of semantic you use. But to
+get sure you should add all minor-modes of the semantic-package because these
+modes are normally activated by the related &ldquo;global&rdquo; command (e.g. 
+<code>global-semantic-show-unmatched-syntax-mode</code>) or by adding the minor-mode
+to the related major-mode-hook.
+
+   <p>It has also been reported that just disabling the Tip-Of-The-Day
+(option: <code>ecb-tip-of-the-day</code>) fixes the compatibility-problems
+with desktop.el. Just try it out!
+
+<h5 class="subsubsection">12.1.1.6 Package edebug (Lisp Debugger)</h5>
+
+<p><a name="index-edebug-365"></a>It is strongly recommended to run edebug only when the ECB-windows are
+hidden. With visible ECB-windows there will probably serious conflicts
+between the ECB-layout and the edebug-window-manager.
+
+<h5 class="subsubsection">12.1.1.7 Package ediff.el</h5>
+
+<p><a name="index-ediff-366"></a>In most cases ECB works very well with ediff (see option
+<code>ecb-run-ediff-in-ecb-frame</code>). But currently suspending ediff
+with <code>ediff-suspend</code> and restoring the ediff-session (e.g. with
+command <code>eregistry</code>) does confuse the window-management of ECB.
+
+   <p>If you often use ediff in a scenario where you suspend ediff and
+reactivate it later then it is recommended to exit ECB first
+(<code>ecb-deactivate</code> or <code>ecb-minor-mode</code>)!
+
+<h5 class="subsubsection">12.1.1.8 Package func-menu.el</h5>
+
+<p><a name="index-func_002dmenu-package-367"></a>This package has been reported to produce some conflicts under some
+circumstances when ECB is activated. Some of them could be reproduced
+by the ECB-maintainer. So the recommendation is to disable
+func-menu-support when using ECB. Normally using func-menu makes no
+sense in combination with ECB because ECB provides the same and even
+more informations as func-menu - so func-menu is redundant ;-)
+
+<h5 class="subsubsection">12.1.1.9 Package Gnus (Newsreader)</h5>
+
+<p><a name="index-Gnus-368"></a>As of ECB 2.21 there should be no conflicts between Gnus and ECB, so
+Gnus can be used even when the ECB-windows are visible.
+
+   <p>But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>). With such a window-manager ECB and Gnus should work together
+very well under all circumstances!
+
+<h5 class="subsubsection">12.1.1.10 Package JDEE (Java Development Environment)</h5>
+
+<p><a name="index-JDEE-369"></a>JDEE has a lot of &ldquo;dialogs&rdquo; where the user can select among several
+choices. An example is importing classes via the command
+<code>jde-import-find-and-import</code>. These dialogs are strongly designed
+to work in an environment where a new temporary window is created, the
+contents of the dialog are displayed in the new window, the user
+select his choice and hits [OK]. After that the new window is deleted
+and the selection is performed (for example the chosen import
+statement are inserted in the source-buffer.
+
+   <p><strong>Caution</strong>: ECB can work very well with this dialogs but only if
+the buffer-name of these dialog-buffers (normally &ldquo;Dialog&rdquo;) is not
+contained in the option <code>ecb-compilation-buffer-names</code>. So do not
+add the string &ldquo;Dialog&rdquo; to this option!
+
+   <p><strong>Please Note</strong>: Regardless if a persistent compile-window is used
+(i.e. <code>ecb-compile-window-height</code> is not nil) or not, these
+JDEE-dialogs will always being displayed by splitting the edit-window
+of ECB and not within the compile-window.
+
+<h5 class="subsubsection">12.1.1.11 Package scroll-all.el (scroll-all-mode)</h5>
+
+<p><a name="index-scroll_002dall_002dmode-370"></a><a name="index-scroll_002dall-371"></a>ECB advices <code>scroll-all-mode</code> so it is working correct during
+running ECB. This means if point stays in an edit-window and the
+edit-window is splitted then all edit-windows are scrolled by
+<code>scroll-all-mode</code> and no other window! If point stays in any
+other window just this selected window is scrolled. This is the only
+senseful behavior of <code>scroll-all-mode</code> with ECB.
+
+<h5 class="subsubsection">12.1.1.12 Package VC (Version Control)</h5>
+
+<p><a name="index-VC-package-372"></a><a name="index-Version-control-373"></a>The variable <code>vc-delete-logbuf-window</code> must be set to nil during
+active ECB. This can be done with the hooks mentioned in <a href="Elisp-programming.html#Elisp-programming">Elisp programming</a>.
+
+<h5 class="subsubsection">12.1.1.13 Package VM (Emacs Mail-Client)</h5>
+
+<p><a name="index-VM-package-374"></a>As of ECB 2.21 there should be no conflicts between VM and ECB, so
+VM can be used even when the ECB-windows are visible.
+
+   <p>But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>). With such a window-manager ECB and VM should work together very
+well under all circumstances!
+
+<h5 class="subsubsection">12.1.1.14 Package winner.el (winner-mode)</h5>
+
+<p><a name="index-winner_002dmode-375"></a><a name="index-winner-376"></a><code>winner-mode</code> is autom. disabled as long as ECB is running. ECB
+has its own window-management which is completely incompatible with
+<code>winner-mode</code>! But <code>winner-mode</code> makes also not really sense
+with ECB.
+
+<h5 class="subsubsection">12.1.1.15 Package wb-line-number.el</h5>
+
+<p><a name="index-wb_002dline_002dnumber-377"></a>
+Do not use the package wb-line-number.el in combination with ECB - it
+will not work and it will not work under any circumstances and there
+is no way to make it work together and there will be no way in the
+future!
+
+   <p>The reason behind that is: wb-line-number.el uses additional dedicated
+windows to display the line-numbers. And ECB can not work if there
+there are additional dedicated windows - additional to that ones
+created by ECB.
+
+<h5 class="subsubsection">12.1.1.16 Application xrefactory</h5>
+
+<p><a name="index-xrefactory-378"></a>Xrefactory (also known as Xref, X-ref and Xref-Speller), the
+refactoring browser for (X)Emacs<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>, can be used during running ECB regardless if the ECB-windows are
+visible or not. There should be no conflicts as of ECB versions &gt;=
+2.21.
+
+   <p>If there are conflicts with the Xref-browser then the most recommended
+way is to use one of the window-manager escreen.el or winring.el (and
+then use different escreens or window-configurations for ECB and
+Xrefactory-browsing - <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>).
+
+<h4 class="subsection">12.1.2 What to do for unknown conflicts with other packages</h4>
+
+<p>As of version 2.20 the layout-engine of ECB is so flexible that
+normally there should be no conflicts with other packages unless these
+packages have their own complete window-layout-management (e.g. Gnus,
+BBDB, Xrefactory). But these packages can and should be handled very
+well with the window-manager-support of ECB (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>).
+
+   <p>So if you detect an unknown (i.e. not listed in the conflicts-list in
+the next subsection) conflict with a small package and some of its
+commands and you have installed an ECB-version &lt; 2.20 the first task
+you have to do is to upgrade to a version &gt;= 2.20!
+
+   <p>If this doesn't solve the problem a very probable reason for the
+conflict is that the command fails if called from another window than
+an edit-window of the ecb-frame. So please check if the problem
+disappears if you call the failing command from an edit-window of ECB. 
+If this is true then you you can add the following code to your
+.emacs (and of course replace the XXX with the failing command):
+
+<pre class="example">   (defecb-advice XXX before ecb-compatibility-advices
+     "Ensures `XXX' works well when called from another window
+   as an edit-window. Does nothing if called in another frame
+   as the `ecb-frame'."
+     (when (equal (selected-frame) ecb-frame)
+       (unless (ecb-point-in-edit-window)
+         (ecb-select-edit-window))))
+</pre>
+   <p>This before-advice runs before the command XXX and ensures that the
+XXX is called from within an edit-window if the current selected
+window is not an edit-window. It does nothing if called for another
+frame as the ecb-frame.
+
+   <p><strong>Please note</strong>: You have to define such compatibility advices exactly as
+demonstrated in the example above, i.e. you must use the macro
+<code>defecb-advice</code> and you have to use the advice-set
+<code>ecb-compatibility-advices</code> (see the documentation of this macro)! The
+advice-class is not necessary <code>before</code>, it can be <code>after</code> or
+<code>around</code> too. Never use <code>defadvice</code> for ECB-advices!
+
+   <p>If such an advice solves the problem then please send a note with the
+solution to the ECB-mailing-list or direct to the ECB-maintainer so
+the solution can be integrated in the next ECB-release
+
+   <p>If calling from an edit-window fails too then please file a complete
+bug-report to the ECB-mailing-list (see <a href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>). This report should contain a detailed description which
+command of which package fails under which circumstances!
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Xrefactory is available at
+<a href="http://www.xref-tech.com">http://www.xref-tech.com</a>
+</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Creating-a-new-ECB_002dlayout.html b/site/ecb-2.40/html-help/Creating-a-new-ECB_002dlayout.html
new file mode 100644
index 0000000..bea6cf0
--- /dev/null
+++ b/site/ecb-2.40/html-help/Creating-a-new-ECB_002dlayout.html
@@ -0,0 +1,159 @@
+<html lang="en">
+<head>
+<title>Creating a new ECB-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="prev" href="Fixing-window-sizes.html#Fixing-window-sizes" title="Fixing window sizes">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Creating-a-new-ECB-layout"></a>
+<a name="Creating-a-new-ECB_002dlayout"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Fixing-window-sizes.html#Fixing-window-sizes">Fixing window sizes</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.8.5 Interactively creating new layouts</h4>
+
+<p><a name="index-New-layouts-53"></a><a name="index-Creating-new-layouts-54"></a>
+If you want to create your own ECB-layout then you can do this very
+easy &ldquo;by example&rdquo; with the command <code>ecb-create-new-layout</code>. 
+This command creates a new empty frame and offers a small set of keys
+to create the new layout by splitting windows. 
+<code>ecb-create-new-layout</code> and this couple of keys are your guide
+during the layout-creation-process<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+   <p>After calling <code>ecb-create-new-layout</code> you will be asked which
+type of layout you want to create: &ldquo;left&rdquo;, &ldquo;right&rdquo;, &ldquo;top&rdquo; or
+&ldquo;left-right&rdquo;. Here you specify where the ECB-tree-windows/buffers
+should be located in the ECB-frame:
+
+     <ul>
+<li>left: All ECB-tree-windows are located on the left side
+<li>right: All ECB-tree-windows are located on the right side
+<li>top: All ECB-tree-windows are located on the top side
+<li>left-right: All ECB-tree-windows are located on the left and
+right side
+</ul>
+
+   <p>Depending on the type you choose the window is splitted by the values
+of the options <code>ecb-windows-width</code> (types &ldquo;left&rdquo;, &ldquo;right&rdquo; and
+&ldquo;left-right&rdquo;) or <code>ecb-windows-height</code> (type &ldquo;top&rdquo;).
+
+   <p>Afterwards you will see a frame like follows (here the layout-type is
+&ldquo;left-right&rdquo;):
+
+<pre class="example">   -----------------------------------------------------------------
+   |&lt;point&gt;       |                                   |            |
+   |              | ECB-layout creation mode          |            |
+   |              | ========================          |            |
+   |              |                                   |            |
+   |              | &lt;This is a persistent help-screen&gt;|            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   -----------------------------------------------------------------
+                  |
+                  |   ,---
+                  `---| Splitted by the value of <code>ecb-windows-width</code>.
+                      `---
+</pre>
+   <p>The big window (here the middle window) will be the edit-area of the
+new layout and can not be selected, deleted or splitted during the
+creation process. It displays the help-screen for the layout-creation
+mode. Here all the available commands are displayed.
+
+   <p>The small window(s) (here the left and right windows) can be splitted
+by you wherever you want (<kbd>C-s</kbd>). The left one contains the point. 
+You must give every ECB-tree-window you create a type (<kbd>C-t</kbd>)
+which can be either
+
+     <ul>
+<li>One of the built-in types
+
+     <p>This can be either &ldquo;directories&rdquo;, &ldquo;sources&rdquo;, &ldquo;methods&rdquo;,
+&ldquo;history&rdquo; or &ldquo;speedbar&rdquo;.
+
+     <li>Any user-defined type:
+
+     <p>In this case you insert &ldquo;other&rdquo; after hitting <kbd>C-t</kbd> and you will
+then be asked for the name of the user-defined type. You can insert
+any arbitrary type name X. But to get this layout working you have to
+define a function with name <code>ecb-set-X-buffer</code> whereas X is the
+name of the user-defined type you have specified during
+layout-creation.
+
+     <p>This function <code>ecb-set-X-buffer</code> must be defined with the macro
+<code>defecb-window-dedicator</code> and has to switch to the buffer you
+want to display in this window. This macro automatically ensures that
+this window is dedicated to that buffer.
+
+     <p>Here is an example: Suppose you have inserted as type name &ldquo;example&rdquo;
+then you have to define and load a function
+<code>ecb-set-example-buffer</code> which could be defined like follows:
+
+     <pre class="example">        (defecb-window-dedicator ecb-set-example-buffer " *ECB example-buf*"
+          (switch-to-buffer (get-buffer-create " *ECB example-buf*")))
+   </pre>
+     <p>If you forget to define such a function for the user-defined type then
+nevertheless ECB will draw this layout but it will use the
+default-function <code>ecb-set-default-ecb-buffer</code> instead. 
+</ul>
+
+   <p>If you are satisfied with your new layout just hit <kbd>C-q</kbd>. You will
+be asked for a new layout-name (TAB-completion is offered to get a
+list of all names already in use) and after inserting a new(!) name
+the new layout is saved in the file defined by the option
+<code>ecb-create-layout-file</code>. The new layout is now available via the
+option <code>ecb-layout-name</code>.
+
+   <p>There is no need for you to load the file
+<code>ecb-create-layout-file</code> manually into your Emacs because it's
+automatically loaded by ECB!
+
+   <p><strong>Please note</strong>: During the layout-creation process only the
+commands displayed in the help-screen are available. ALL other
+commands are temporally disabled (even the mouse-commands).
+
+   <p>For programming new layouts with emacs-lisp see <a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>.
+
+   <p>With the command <code>ecb-delete-new-layout</code> you can delete
+previously created layouts (TAB-completion is offered for all names of
+user created layouts).
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> During the creation
+process you will be asked in the minibuffer for several options; here
+you can use TAB-completion and an &ldquo;empty&rdquo; RET chooses always the
+first option!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Customizable-options.html b/site/ecb-2.40/html-help/Customizable-options.html
new file mode 100644
index 0000000..cb7e23d
--- /dev/null
+++ b/site/ecb-2.40/html-help/Customizable-options.html
@@ -0,0 +1,67 @@
+<html lang="en">
+<head>
+<title>Customizable options - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizing.html#Customizing" title="Customizing">
+<link rel="prev" href="Most-important-options.html#Most-important-options" title="Most important options">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Customizable-options"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Most-important-options.html#Most-important-options">Most important options</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizing.html#Customizing">Customizing</a>
+<hr>
+</div>
+
+<h3 class="section">7.3 All customizable options of ECB</h3>
+
+<p class="noindent">All customization of ECB is divided into the following &ldquo;customize
+groups&rdquo;. You can highly customize all the ECB behavior/layout so just
+go to these groups and you will see all well documented ECB-options.
+
+   <p><strong>Please note</strong>: All options in the following subsections are
+listed without the prefix &ldquo;ecb-&rdquo; (e.g. the option
+<code>ecb-layout-name</code> is listed with name &ldquo;layout-name&rdquo;). This has
+been done for a better readable option index. See <a href="Option-Index.html#Option-Index">Option Index</a>.
+
+<ul class="menu">
+<li><a accesskey="1" href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a>:                  General customizing ECB
+<li><a accesskey="2" href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a>:              Customizing the general tree layout
+<li><a accesskey="3" href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a>:              Customizing the ECB-directories-tree
+<li><a accesskey="4" href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a>:                  Customizing the ECB-sources-window
+<li><a accesskey="5" href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a>:                  Customizing the ECB-methods-window
+<li><a accesskey="6" href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a>:                  Customizing the ECB-history-window
+<li><a accesskey="7" href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a>:                  Customizing the ECB-analyse-window
+<li><a accesskey="8" href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a>:                   Customizing the ECB-layout
+<li><a accesskey="9" href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a>:              Customizing the compile-window
+<li><a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a>:            Customizing options for creating layouts
+<li><a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a>:             Customizing options for faces
+<li><a href="ecb_002dfaces.html#ecb_002dfaces">ecb-faces</a>:                    Customizing the faces
+<li><a href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a>:                     Customizing the online help of ECB
+<li><a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a>:                   Customizing the eshell-integration
+<li><a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a>:                 Customizing the speedbar-integration
+<li><a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a>:             Customizing parsing non-semantic sources
+<li><a href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a>:                   Customizing window-manager support
+<li><a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a>:                Customizing the tree-buffer-modelines
+<li><a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a>:          Customizing the version-control-support
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Customizing-the-display.html b/site/ecb-2.40/html-help/Customizing-the-display.html
new file mode 100644
index 0000000..c72f36c
--- /dev/null
+++ b/site/ecb-2.40/html-help/Customizing-the-display.html
@@ -0,0 +1,107 @@
+<html lang="en">
+<head>
+<title>Customizing the display - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="prev" href="Expanding.html#Expanding" title="Expanding">
+<link rel="next" href="Rebuilding-the-Methods.html#Rebuilding-the-Methods" title="Rebuilding the Methods">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Customizing-the-display"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Rebuilding-the-Methods.html#Rebuilding-the-Methods">Rebuilding the Methods</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Expanding.html#Expanding">Expanding</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.6.3 Customizing the display of the Methods-buffer</h4>
+
+<p><a name="index-semantic-tag-47"></a><a name="index-tag-48"></a>The ECB-Methods buffer is probably the most important browsing window
+offered by ECB. It displays all parsing informations of the current
+source-buffer (the buffer displayed in the current active
+edit-window).
+
+   <p>Normally ECB gets all informations displayed in this Methods-buffer from the
+semantic-library - at least for semantic-sources. This library parses auto. 
+the current source-buffer in the edit-window of ECB and returns all
+information in form of <dfn>tags</dfn> to ECB which displays them in a browse-able
+form in its Method-buffer. See <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a> for information how to
+use the Methods-buffer.
+
+   <p>There are several options to customize which tags ECB should display
+in general, if the tags should be collapsed or expanded, how to
+fontify them (i.e. syntax-highlighting) and something more.
+
+     <dl>
+<dt><code>ecb-show-tags</code><dd>With the option <code>ecb-show-tags</code> you specify how ECB should
+display the tags returned by the semantic parser. Semantic divides its
+tags in several so called <dfn>tag classes</dfn>. A tag-class is always a
+symbol and can be for example <code>type</code> (tags which represent a
+class<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>, a interface, an enumeration etc.),
+<code>function</code> (tags which represent function or methods),
+<code>variable</code> (variables and attributes), <code>include</code>
+(import-statements) etc. There is no predefined superset of allowed
+tag-class-symbols because each language-parser can define its own
+tag-classes. But to get an overview of the most common tag-classes see
+the default value of the option <code>ecb-show-tags</code>.
+
+     <p>With the option <code>ecb-show-tags</code> you can now specify how ECB
+should display tags of a certain tag-class in a certain major-mode. 
+You can tell ECB that all tags of a tag-class <code>X</code> should be
+displayed in an expanded bucket and all tags of a tag-class <code>Y</code>
+should be displayed in a collapsed bucket and all tags of a tag-class
+<code>Z</code> should be displayed flattened (means not contained in a
+expandable/collapsable bucket-node). These settings can be made
+separately for each major-mode but you can also define a
+default-display which takes effect when for a major-mode no special
+setting can be found in <code>ecb-show-tags</code>.
+
+     <p>For every tag-class you can tell ECB how the tags should be sorted.
+
+     <br><dt><code>ecb-font-lock-tags</code><dt><code>ecb-type-tag-display</code><dd>How to fontify the tags in the Method-buffer
+
+     <br><dt><code>ecb-tag-display-function</code><dd>ECB and semantic offer several predefined functions for displaying the
+tags. Here you can customize, what informations tags should
+contain (only the method-name or the whole signature or something
+else) and what notation should be used, e.g. UML or not.
+
+   </dl>
+
+   <p>These are the most important options for this topic but it is
+recommended to have a look into the customize-group <code>ecb-methods</code>
+(see <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a>) and check all the options offered there!
+
+   <p>All these options are only relevant for semantic-sources and take no
+effect for non-semantic-sources!
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Do not confuse the term &ldquo;class&rdquo; in the context of a
+tag, which means the class of the tag and which is a semantic-term and
+a &ldquo;class&rdquo; in the context of an object oriented language like Java or
+C++! Normally the surrounding context sould be sufficient to
+understand which type of &ldquo;class&rdquo; is meant whenever the term
+&ldquo;class&rdquo; is used in this manual.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Customizing.html b/site/ecb-2.40/html-help/Customizing.html
new file mode 100644
index 0000000..e273552
--- /dev/null
+++ b/site/ecb-2.40/html-help/Customizing.html
@@ -0,0 +1,49 @@
+<html lang="en">
+<head>
+<title>Customizing - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="next" href="Submitting-problem-report.html#Submitting-problem-report" title="Submitting problem report">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Customizing"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">7 Customizing ECB</h2>
+
+<p>This chapter describes how to customize ECB for your personal taste. 
+The first section introduces some general aspects (which you should
+really know!), the second one gives an overview of the most important
+options and the third one lists all options of ECB (divided into the
+customize groups).
+
+<ul class="menu">
+<li><a accesskey="1" href="General-aspects.html#General-aspects">General aspects</a>:              General aspects for customizing ECB
+<li><a accesskey="2" href="Most-important-options.html#Most-important-options">Most important options</a>:       Which option you must know
+<li><a accesskey="3" href="Customizable-options.html#Customizable-options">Customizable options</a>:         All customizable options of ECB
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Deactivation-hook_002dsequence.html b/site/ecb-2.40/html-help/Deactivation-hook_002dsequence.html
new file mode 100644
index 0000000..fb2d432
--- /dev/null
+++ b/site/ecb-2.40/html-help/Deactivation-hook_002dsequence.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=Standard-activation.html#Deactivation%20hook%2dsequence">
diff --git a/site/ecb-2.40/html-help/Definition-of-semantic_002d-and-non_002dsemantic_002dsources.html b/site/ecb-2.40/html-help/Definition-of-semantic_002d-and-non_002dsemantic_002dsources.html
new file mode 100644
index 0000000..be05df8
--- /dev/null
+++ b/site/ecb-2.40/html-help/Definition-of-semantic_002d-and-non_002dsemantic_002dsources.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=The-Methods-buffer.html#Definition%20of%20semantic%2d%20and%20non%2dsemantic%2dsources">
diff --git a/site/ecb-2.40/html-help/Do-not-with-tree_002dbuffer.html b/site/ecb-2.40/html-help/Do-not-with-tree_002dbuffer.html
new file mode 100644
index 0000000..625398b
--- /dev/null
+++ b/site/ecb-2.40/html-help/Do-not-with-tree_002dbuffer.html
@@ -0,0 +1,55 @@
+<html lang="en">
+<head>
+<title>Do not with tree-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI" title="The tree-buffer-API">
+<link rel="next" href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to" title="Tree-buffer How to">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Do-not-with-tree-buffer"></a>
+<a name="Do-not-with-tree_002dbuffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">Tree-buffer How to</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.7 Things which are strictly forbidden</h4>
+
+<p>Variable <code>tree-buffers</code>: Only for internal use! It contains all
+tree-buffers of current Emacs-instance, means <strong>all</strong>
+tree-buffers of <strong>all</strong> applications which uses currently
+tree-buffers. Every application must store its own collection of
+tree-buffers in an own variable! For example: ECB stores its
+tree-buffer set in <code>ecb-tree-buffers</code>!
+
+   <p>Variable <code>tree-buffer-displayed-nodes</code>: Only for internal use! 
+Contains all the current visible nodes of current tree-buffer in
+top-to-bottom order. This variable is buffer-local in each
+tree-buffer! Do not use it directly! When you want to cache the
+current display, then see <a href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">Tree-buffer How to</a> how to do this.
+
+   <p><strong>IMPORTANT</strong>: An application may only use the API tree-buffer.el
+provides but no internal variables - see <a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a>!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Downloading-new-versions.html b/site/ecb-2.40/html-help/Downloading-new-versions.html
new file mode 100644
index 0000000..c5dfc29
--- /dev/null
+++ b/site/ecb-2.40/html-help/Downloading-new-versions.html
@@ -0,0 +1,95 @@
+<html lang="en">
+<head>
+<title>Downloading new versions - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Upgrading.html#Upgrading" title="Upgrading">
+<link rel="prev" href="Upgrading.html#Upgrading" title="Upgrading">
+<link rel="next" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading" title="Auto. option-upgrading">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Downloading-new-versions"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Upgrading.html#Upgrading">Upgrading</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Upgrading.html#Upgrading">Upgrading</a>
+<hr>
+</div>
+
+<h3 class="section">9.1 Downloading new versions of ECB and/or CEDET</h3>
+
+<p><a name="index-Download-348"></a>
+<strong>Please note</strong>: THE PACKAGE-DOWNLOAD-FEATURE OF ECB IS COMPLETELY
+DEACTIVATED SINCE VERSION 2.33! Please got to the website of ECB and download
+and install &ldquo;by hand&rdquo;:
+
+     <ol type=1 start=1>
+
+     <li>Download ECB
+
+     <p>Go to
+<a href="http://ecb.sourceforge.net">http://ecb.sourceforge.net</a>
+and download the latest release (or if you are brave and tough the latest
+CVS-snapshot) from the download section.
+
+     <p>Save the archive (either *.tar.gz or *.zip) in a suitable location of your disk.
+
+     <li>Extract the downloaded ECB-archive
+
+     <p>Extract the archive with a suitable extraction-tool. The archive will extract
+into a new directory <samp><span class="file">ecb-&lt;version&gt;</span></samp> whereas &lt;version&gt; is either the
+version number of the downloaded release or &ldquo;latest&rdquo; in case of the
+CVS-snapshot. (example for a release: The archive extracts into a new
+subdirectory <samp><span class="file">ecb-2.33</span></samp>.
+
+     <p>The newly created subdirectory contains all files of ECB in the needed
+subdirectory structure.
+
+     <p><strong>Note</strong>: Do not change the subdirectory structure of the extracted archive -
+this will prevent ECB from working correctly!
+
+     <li>Install and setup ECB
+
+     <p>See <a href="Installation.html#Installation">Installation</a>.
+
+     <li>Start ECB
+
+     <p>ECB will perform some requirements checks, especially for CEDET. 
+<strong>Remark</strong>: By setting the option <code>ecb-version-check</code> to
+<code>nil</code> you can prevent ECB from checking correct versions of CEDET but
+it's strongly recommended not to do this!
+
+     <li>(Optional) Download and install a newer version of CEDET
+
+     <p>If the version-check in (4) fails then you have to install a newer version of
+CEDET which fulfill the version-number ECB reports to you after its version
+check.
+
+     <p>See the instruction of CEDET how to do this. You will find CEDET at
+<a href="http://cedet.sourceforge.net">http://cedet.sourceforge.net</a>
+
+     <p>For setting up CEDET see <a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>.
+
+     <p>If you have installed a new CEDET-version you <strong>MUST</strong> re-byte-compile
+ECB unless you run ECB not byte-compiled!
+
+        </ol>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB-Directories_002dwindow.html b/site/ecb-2.40/html-help/ECB-Directories_002dwindow.html
new file mode 100644
index 0000000..50cc6b1
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB-Directories_002dwindow.html
@@ -0,0 +1,99 @@
+<html lang="en">
+<head>
+<title>ECB Directories-window - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="next" href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow" title="ECB Sources-window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-Directories-window"></a>
+<a name="ECB-Directories_002dwindow"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.3 ECB Directories-window</h4>
+
+<p><a name="index-Directories-3"></a>The ECB directories interactor is for browsing directories. The direct
+children of the invisible root-node are called <dfn>source-path</dfn> and
+can be defined with the option <code>ecb-source-path</code>. Each
+source-path is the starting-node of the complete directory-structure
+below this path and can be browsed with the directories-interactor.
+
+   <p>When a sources ECB-window is contained in the current layout then per
+default only directories and subdirectories are displayed in the
+directories tree-buffer (the source-files are displayed in the sources
+tree-buffer - see <a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>) but this can be changed
+with the option <code>ecb-show-sources-in-directories-buffer</code>.
+
+<h5 class="subsubsection">4.1.3.1 Usage of the directories ECB-window</h5>
+
+     <ul>
+<li>Select directories (and - if enabled - source files) in the
+<dfn>ECB-Directories</dfn> buffer by clicking a mouse button on the directory
+name or by hitting RETURN when the cursor is placed on the item line,
+see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>.
+
+     <p>IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+while clicking with the primary mouse button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>)
+or RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>)) on a directory node in the
+this buffer then the directory-contents-cache for this directory will
+be refreshed and actualized.
+
+     <li>Directory names with a &ldquo;[+]&rdquo; symbol after (or before) them can be
+expanded/collapsed by clicking on the symbol, pressing the TAB key
+(see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) when the cursor is placed on the package
+line or clicking a mouse button on the item, see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>.
+
+     <li>Right clicking on an item will open a popup menu where different
+operations on the item under the mouse cursor can be performed. This
+popup-menu offers operations for version-control, dired, grep, some
+file-operations like creating a directory and commands to make a
+directory a source-path in the sense of <code>ecb-source-path</code>.
+
+     <li>Pressing F2 will open the ECB customization group
+(see <a href="Customizing.html#Customizing">Customizing</a>) in the edit window. F3 shows the online help in
+the edit-window. Pressing F4 in the ECB-directories buffer will offer
+adding a new source-path. 
+</ul>
+
+   <p>When source-files-nodes are displayed in the directories-buffer (see
+<code>ecb-show-sources-in-directories-buffer</code>) then for these nodes
+all descriptions of section <a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a> are valid.
+
+<h5 class="subsubsection">4.1.3.2 Activating/Displaying the directories ECB-window</h5>
+
+<p>Either use one of the predefined layouts which contain the directories
+ECB-window (see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>) (e.g. via <kbd>C-c . l
+c</kbd>) or create a new ecb-layout via the command
+<code>ecb-create-new-layout</code> and add a buffer of type &ldquo;directories&rdquo;
+into this new layout (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+<h5 class="subsubsection">4.1.3.3 Customizing the directories ECB-window</h5>
+
+<p>See <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a> for a list of all options currently
+available for customizing this ECB-windows to your needs.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB-History_002dwindow.html b/site/ecb-2.40/html-help/ECB-History_002dwindow.html
new file mode 100644
index 0000000..dd9084f
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB-History_002dwindow.html
@@ -0,0 +1,184 @@
+<html lang="en">
+<head>
+<title>ECB History-window - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow" title="ECB Methods-window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-History-window"></a>
+<a name="ECB-History_002dwindow"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.6 The ECB History-window</h4>
+
+<p><a name="index-History-6"></a>ECB offers a ECB-windows for displaying a history of currently open or
+recently closed source-buffers, regardless of the directory the related file
+belongs to.
+
+   <p>Contrary to the ECB-sources-window the ECB-History-window can be flat but
+needn't. Another difference to the ECB-sources window is that the History
+displays not filenames but buffer-names for buffers which are either directly
+related to a file or which are indirect-buffers with a base-buffer which is
+related to a file. For a description of the indirect-buffer concept see the
+Emacs manual (see command <code>clone-indirect-buffer</code> or
+<code>make-indirect-buffer</code> for XEmacs).
+
+   <p><strong>Please note</strong>: The History of ECB is not meant to be a full replacement
+for the Buffers-menu of (X)Emacs! It only displays buffers which are related
+to a file (either directly or via indirect-buffer). All non-file-related
+buffers (e.g. *Help*, *grep* etc.) will never be displayed in the
+ECB-History-window!
+
+<h5 class="subsubsection">4.1.6.1 Usage of the ECB-History-window</h5>
+
+     <ul>
+<li>Buffers in the history can be selected by clicking with the primary mouse button
+(see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or hitting RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) on
+the buffername-node in the <dfn>ECB-History</dfn>-window. The buffer of the selected
+buffer-name will be displayed in an edit-window - which one depends on the
+setting in <code>ecb-mouse-click-destination</code>.
+
+     <p>IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+clicking with the primary mouse button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or RETURN
+(see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>)) on a node in the ECB-History-window then the
+related buffer will not be displayed in an edit-window but it will be scanned
+in the background and all its contents (e.g. methods and variables) are listed
+in the <dfn>ECB Methods</dfn>-window (see <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>. So you can get an
+overlook over the buffer-contents without changing the buffer in the
+edit-window.
+
+     <li>Clicking on a buffername-node with the secondary mouse button or
+C-RETURN (see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>) will open the buffer in
+another edit window - which one depends on the setting in
+<code>ecb-mouse-click-destination</code>.
+
+     <li>Right clicking on a buffername-node (mouse-button 3) will open a popup menu
+where different operation on the item under the mouse cursor can be performed. 
+This popup-menu offers operations for version-control, dired, grep, filtering
+the buffernames and some file-operations like deleting the related file from
+disk. In addition the ECB-History-window can be maximized or the bucketizing
+type (s.b. &ldquo;Bucketizing the history&rdquo;) can be changed on the fly via
+popup-menu.
+
+</ul>
+
+<h5 class="subsubsection">4.1.6.2 Activating/Displaying the ECB-History-window</h5>
+
+<p>Either use one of the predefined layouts which contain the ECB-History-window
+(see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>) (e.g. via <kbd>C-c . l c</kbd>) or create a new
+ecb-layout via the command <code>ecb-create-new-layout</code> and add a buffer of
+type &ldquo;history&rdquo; into this new layout (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+<h5 class="subsubsection">4.1.6.3 Dead buffers in the history</h5>
+
+<p>You can customize if ECB should remove the related buffername-node from the
+history-window after killing a buffer. This is done with the option
+<code>ecb-kill-buffer-clears-history</code>. See the documentation of this option
+for the possible choices. If you decide that ECB should <strong>not</strong> remove
+the related buffername-node then this is named a &ldquo;dead&rdquo; buffer in the
+history-window. It is displayed with a special face (see
+<code>ecb-history-dead-buffer-face</code>), default is a kind of grey.
+
+   <p>You can use such a dead-buffer-node in the history as all other
+buffername-nodes: ECB will reopen the related file in a buffer and perform the
+action you have choosen (see above section &ldquo;Usage of the
+ECB-History-window&rdquo;).
+
+<h5 class="subsubsection">4.1.6.4 Indirect buffers in the history</h5>
+
+<p>You can work with indirect buffers as well with direct buffers. See the
+(X)Emacs manual for an introduction for indirect buffers (e.g. see the command
+<code>clone-indirect-buffer</code> for GNU Emacs).
+
+   <p>Indirect buffers are displayed with the face
+<code>ecb-history-indirect-buffer-face</code>, default is an italic outline.
+
+   <p>There is an option <code>ecb-history-stick-indirect-buffers-to-basebuffer</code>
+which allows to customize how ECB displays indirect buffers in the
+history-window:
+
+   <p>If this option is <code>nil</code> then indirect-buffers are treated as
+non-indirect-buffers and sorted into the history-buffer-sequence according to
+the setting of <code>ecb-history-sort-method</code>. Then the history contains
+something like this:
+
+<pre class="example">   &lt;base-buffer BB&gt;
+   &lt;indirect-buffer 1 of BB&gt;
+   &lt;indirect-buffer 2 of BB&gt;
+   &lt;indirect-buffer 3 of BB&gt;
+</pre>
+   <p>If not nil then indirect-buffers are always sticked to their base-buffer, ie. 
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history contains something like:
+
+<pre class="example">   [-] &lt;base-buffer BB&gt;
+    |  &lt;indirect-buffer 1 of BB&gt;
+    |  &lt;indirect-buffer 2 of BB&gt;
+    `- &lt;indirect-buffer 3 of BB&gt;
+</pre>
+   <p>Here the buffer with name &ldquo;&lt;base-buffer BB&gt;&rdquo; has three indirect-buffers
+which are display as childrens of their base-buffer.
+
+<h5 class="subsubsection">4.1.6.5 Bucketizing the history</h5>
+
+<p>ECB can display the history-contents &ldquo;flat&rdquo; or it can display buckets to
+bucketize the contens according to certain criterias. This is done with the
+option <code>ecb-history-make-buckets</code>. It allows bucketizing according to the
+directory, the file-extension, the major-mode or a list of regular expression
+- see the documentation of this option for details.
+
+   <p>Here is an example for a history-window bucketized according to the major-mode
+of the related buffers:
+
+<pre class="example">   [-] [c++-mode]
+    |  headerfile-1.h
+    |  headerfile-2.h
+    |  codefile-1.cc
+    `- codefile-2.cc
+   [-] [emacs-lisp-mode]
+    |  elisp-buffer-1.el
+    |  elisp-buffer-1.el
+    `- elisp-buffer-1.el
+   [-] [makefile-mode]
+    `- Makefile
+   [-] [java-mode]
+    |  java-buffer-1.java
+    `- java-buffer-2.java
+</pre>
+   <p><strong>Please note</strong>: If <code>ecb-history-make-buckets</code> is nil then this is
+interpreted as an empty list of regular-expressions and the history is display
+with exactly one bucket. Use the value 'never if you want the? contents of the
+history-window to be displayed &ldquo;flat&rdquo;!
+
+   <p>You can change the bucketizing type on the fly via the popup-menu of the
+history-window.
+
+<h5 class="subsubsection">4.1.6.6 Customizing the ECB-History-window</h5>
+
+<p>See <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a> for a list of all options currently available for
+customizing this ECB-windows to your needs.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB-Methods_002dwindow.html b/site/ecb-2.40/html-help/ECB-Methods_002dwindow.html
new file mode 100644
index 0000000..9b70096
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB-Methods_002dwindow.html
@@ -0,0 +1,375 @@
+<html lang="en">
+<head>
+<title>ECB Methods-window - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow" title="ECB Sources-window">
+<link rel="next" href="ECB-History_002dwindow.html#ECB-History_002dwindow" title="ECB History-window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-Methods-window"></a>
+<a name="ECB-Methods_002dwindow"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB-History_002dwindow.html#ECB-History_002dwindow">ECB History-window</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.5 The ECB Methods-window</h4>
+
+<p><a name="index-Methods-5"></a>The <dfn>ECB-Methods</dfn> ECB-window contains all parsed and recognized tags
+of the current source-buffer. It is called &ldquo;Method-buffer&rdquo; because
+ECB is mostly designed for browsing sourcecode files and for
+programming-languages these tags are often methods (and variables
+etc.) To simplify explanations we talk in the following only about
+methods and variables - but in general the method-buffer can contain
+any kind of tags (e.g. sections and subsections for texinfo
+buffers).
+
+   <p>Per default the content of the methods-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (see <a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>).
+
+<h5 class="subsubsection">4.1.5.1 Usage of the methods ECB-window</h5>
+
+     <ul>
+<li>When a node (e.g. method or variable) is selected with the primary mouse
+button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) the
+buffer in the edit-window (which one depends on the setting in
+<code>ecb-mouse-click-destination</code>) will jump to the method/variable.
+
+     <p>IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+while clicking with the primary mouse button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>)
+or RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>)) on a node in this buffer then
+the edit-buffer will be narrowed to the selected tag (see also
+option <code>ecb-tag-visit-post-actions</code>). But this works only for
+sources parsed by semantic, not by imenu or etags!
+
+     <li>Clicking on a node with the secondary mouse button or C-RETURN
+(see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>) will jump to the method in another edit window
+- which one depends on the setting in
+<code>ecb-mouse-click-destination</code>.
+
+     <li>Right clicking on a node will open a popup menu where
+different operation on the item under the mouse cursor can be
+performed. The popup-menu offers commands for filtering the displayed
+tree-nodes, hiding/narrowing the related tags in the source-buffer and
+expanding/collapsing one/all tree-nodes according to a certain
+expansion-level.
+
+</ul>
+
+<h5 class="subsubsection">4.1.5.2 Activating/Displaying the methods ECB-window</h5>
+
+<p>Either use one of the predefined layouts which contain the methods
+ECB-window (see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>) (e.g. via <kbd>C-c . l
+c</kbd>) or create a new ecb-layout via the command
+<code>ecb-create-new-layout</code> and add a buffer of type &ldquo;methods&rdquo; into
+this new layout (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+<h5 class="subsubsection">4.1.5.3 Synchronizing the Methods-window with current source-buffer</h5>
+
+<p>First a preliminary remark: Do not confuse this chapter with that
+synchronizing described in <a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>. The latter one
+describes the mechanism for synchronizing the ECB-windows when the
+current-buffer in the edit-area has been changed. This chapter describes how
+to synchronize the ECB-methods-window with the contents of the current-buffer
+if the buffer has been modified!
+
+   <p>Now lets start:
+
+   <p>Generally ECB calls semantic to get the list of tags for current source-file
+of current edit-window. Per default ECB does never automatically force a
+reparse of the source-file after this has been changed - this is only done on
+demand by calling the command <code>ecb-rebuild-methods-buffer</code>. So per
+default the idle-scheduler of semantic is responsible for reparsing the
+source-file when this is necessary (see `semantic-idle-scheduler-mode' for
+further details). So this scheduler is also repsonsible in turn for
+updating/sychronizing the methods-window with current buffer-contents. This is
+the most user-resonsible and therefore the recommended approach.
+
+   <p>So it's strongly recommended to enable <code>semantic-idle-scheduler-mode</code> or
+<code>global-semantic-idle-scheduler-mode</code> (see <a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>)
+because then reparsing is always done during idle-time of Emacs and - maybe
+even more important - it is also interruptable.
+
+   <p>But if this idle-scheduler is switched off then ECB offers now two
+possibilities (via <code>ecb-force-reparse-when-semantic-idle-scheduler-off</code>):
+
+     <ul>
+<li>
+Not forcing itself a reparse when tags are needed by ECB: then a user declines
+knowingly Emacs/semantic-driven parsing of code when he/she switches off the
+idle-mode of semantic. This is the default behavior of ECB and the default
+value of this option. But this has also the consequence that the
+methods-buffer is only filed on demand via <code>ecb-rebuild-methods-buffer</code>
+(bound to &lt;C-c . r&gt;)!
+
+     <p>This means also in consequence that the methods-buffer is not
+automatically filled when a source-file is opened but first on demand
+after calling the command <code>ecb-rebuild-methods-buffer</code>!
+
+     <li>
+Forcing a reparse when tags are needed: Then ECB forces semantic to parse
+the source-file when ECB needs tags to display. For this behavior this
+option has to be set to not nil. 
+</ul>
+
+   <p>The term &ldquo;forcing a reparse by semantic&rdquo; is a simplification: ECB uses then
+the function <code>semantic-fetch-tags</code> which can decide that the cached tags
+are up-to-date so no real reparsing is necessary - but it can also run a full
+reparse and this reparse is not being done when Emacs is idle but immediatelly
+and not interruptable (as with the idle-scheduler of semantic), which can be
+quite annoying with big source-files.
+
+   <p>To make a long story short: It is strongly recommended to enable the
+<code>semantic-idle-scheduler-mode</code> or
+<code>global-semantic-idle-scheduler-mode</code>! See <a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>. This will give you in all cases the behavior you would expect
+of en IDE like ECB/semantic.
+
+<h5 class="subsubsection">4.1.5.4 Synchronizing with indirect buffers</h5>
+
+<p>ECB works out of the box with indirect buffers, especially with indirect
+buffer clones created with the command <code>clone-indirect-buffer</code> (only
+available with GNU Emacs &gt;= 21). They will be handled as all other buffers and
+you can work with them with no difference to &ldquo;normal&rdquo; buffers. With one
+exception:
+
+   <p><strong>Please note</strong>: Cause of a bug in Emacs 22 (and maybe also in Emacs 23)
+the propagation of parsing informations from one buffer to all others which are
+in an indirect-buffer relation to the same base-buffer does currently not
+work.
+
+   <p>What does this mean: If you modify a buffer then Emacs propagates this change
+to all buffers with the same base-buffer. ECB/semantic recognize this change
+and do all necessary to automatically reparse the changed buffer (at least if
+you have customized semantic/ECB to do this). So far so good, but: If you
+switch to another buffer with the same base-buffer then you will notice that
+the methods-window of ECB still displays the contents before the change, ie. 
+the need for a reparse has not been propagated to these other buffers. This is
+a bug in Emacs.
+
+   <p>What can you do: As long as this bug is not fixed there is no chance that all
+other affected &ldquo;indirect-related&rdquo; buffers will be reparsed automatically
+after modifying one of them. So you have to do this reparse &ldquo;by hand&rdquo; after
+switching to such an indirect-related buffer, but this is very simple: Just
+call the command <code>ecb-rebuild-methods-buffer</code> with prefix arg or hit
+&lt;C-u C-c . r&gt; (key this command is bound to).
+
+   <p>Lets make an example:
+
+     <ol type=1 start=1>
+
+     <li>
+Suppose we have a sourcefile test.java loaded as a buffer into Emacs and
+suppose further we have created two indirect-buffer clones test-clone1.java and
+test-clone2.java - all of these buffers point to the same file: test.java.
+
+     <li>
+Now lets be the buffer test-clone1.java the current buffer and let us modify
+it (e.g. adding a new method). If you have enabled the idle-reparse mechanism
+of semantic (see <a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>) then this buffer will be
+reparsed automatically and ECBs methods-window will be updated in turn too.
+
+     <li>
+So far so good. But if you now switch to one of the two other buffers, lets
+say to test.java, then you will notice that the change done in
+test-clone1.java is also visible in the buffer test.java but the
+ECB-methods-window for test.java will display the contents before the change. 
+This is cause of the Emacs-bug described above.
+
+     <li>
+To update the methods-window for test.java to the new contents you have to call
+<code>ecb-rebuild-methods-buffer</code> with prefix argument (ie. clear-cache is
+true) or hitting &lt;C-u C-c . r&gt;. Note: Calling this command without prefix
+argument is not enough!
+
+        </ol>
+
+<h5 class="subsubsection">4.1.5.5 Jumping to the definition of external types</h5>
+
+<p>There are two common types of &ldquo;external&rdquo; tags displayed in the
+method-window, mostly with object oriented programing-languages:
+
+     <ol type=1 start=1>
+
+     <li>parent-types
+
+     <p>Tags which represent the type of a parent-class (which can be defined in the
+same file but which is more often defined in another file). All parents
+(regardless if defined internaly or externaly) of a type will be displayed
+under a bucket &ldquo;[Parents]&rdquo; in the methods-window of ECB.
+
+     <li>&ldquo;virtual&rdquo; types
+
+     <p>In OO-languages like CLOS, eieio and C++ there can be nodes with type-tags in
+the method-buffer which are somehow virtual because there is no definition in
+the current source-file. But such a virtual type collects all its outside
+defined members like methods in C++ which are defined in the <samp><span class="file">*.cc</span></samp> file
+whereas the class-definition is defined in the associated header-file.
+
+        </ol>
+
+   <p>In both cases the user wants to jump to the definition of the type if he clicks
+onto the related node in the methods-window of ECB.
+
+   <p>Here is a C++-example for &ldquo;virtual&rdquo; types (2) and parent types (1) which
+explains this in detail:
+
+   <p>Let's say this class is defined in a file <samp><span class="file">ParentClass.h</span></samp>:
+
+<pre class="example">   class ParentClass
+   {
+   protected:
+     int p;
+   };
+</pre>
+   <p>Let's say this class is defined in a file <samp><span class="file">ClassWithExternals.h</span></samp>
+
+<pre class="example">   #include "ParentClass.h"
+   
+   class ClassWithExternals : public ParentClass
+   {
+   private:
+     int i;
+   
+   public:
+     ClassWithExternals();
+     ~ClassWithExternals();
+   };
+</pre>
+   <p>Both the constructor and the destructor of the class
+&ldquo;ClassWithExternals&rdquo; are implemented in a file
+<samp><span class="file">ClassWithExternals.cc</span></samp>:
+
+<pre class="example">   #include "test.h"
+   
+   ClassWithExternals::ClassWithExternals(int i,
+                                          boolean b,
+                                          char c)
+   {
+     return;
+   }
+   
+   void
+   ClassWithExternals::~ClassWithExternals()
+   {
+     return;
+   }
+</pre>
+   <p>ECB displays the contents of <samp><span class="file">ClassWithExternals.cc</span></samp> in its methods-buffer like
+follows:
+
+<pre class="example">   [-] [Includes]
+    `- test.h
+   [-] ClassWithExternals
+    |  +ClassWithExternals (+i:int, +b:class boolean, +c:char):ClassWithExternals
+    `- +~ClassWithExternals ():void
+</pre>
+   <p>Both the constructor and the destructor of the class
+&ldquo;ClassWithExternals&rdquo; are grouped under their class-type. But this class-type
+&ldquo;ClassWithExternals&rdquo; is represented by a so called &ldquo;virtual&rdquo; or &ldquo;faux&rdquo;
+node-tag, i.e. there is no real tag in the current source-buffer for this tag.
+
+   <p>If a user now clicks onto the node of &ldquo;ClassWithExternals&rdquo; then he wants to
+jump to the right location in the right file where &ldquo;ClassWithExternals&rdquo; is
+defined. ECB now uses now some smart mechanisms (see below) to do this. In
+case of success (means ECB has found the definition) it opens the right file
+and point will stay at beginning of the definition of the type
+&ldquo;ClassWithExternals&rdquo;.
+
+   <p>The contents of <samp><span class="file">ClassWithExternals.h</span></samp> are then displayed like
+follows:
+
+<pre class="example">   [-] [Includes]
+    `- ParentClass.h
+   [-] ClassWithExternals:class
+    |  [-] [Parents]
+    |   `- ParentClass
+    |  [-] [Variables]
+    |   `- -i:int
+    |  +ClassWithExternals ():ClassWithExternals
+    |  +~ClassWithExternals ():void
+    `- [+] [Misc]
+</pre>
+   <p>Now let's play it again: Now we want to go to the definition of the
+parent-type &ldquo;ParentClass&rdquo; when we click onto the related node under the
+bucket &ldquo;[Parents]&rdquo;. Again ECB uses its smartness to jump to the definition
+of the class &ldquo;ParentClass&rdquo; when you click onto the node &ldquo;ParentClass&rdquo;.
+
+   <p>Now lets explain the precondition which must be fulfilled so ECB can do its
+job:
+
+     <ul>
+<li>Customizing the semantic analyzer for your needs
+
+     <p>ECB itself is quite stupid concerning finding external tags. But it can use
+the semantic-analyzer of the CEDET-suite (remember: The CEDET-suite is a
+must-requirement of ECB, see <a href="Requirements.html#Requirements">Requirements</a>). But this in turn means that the
+semantic-analyzer must be customized in the right way for the needs of your
+programing projects. Mainly this means activating semanticdb and setting the
+correct include-path etc...
+
+     <p><strong>Please note</strong>: Read the related manuals of semantic and - strongly
+recommended - read in addition the article &ldquo;Gentle introduction to Cedet&rdquo;. 
+It's worth to read it! The website of CEDET contains a link, you find it here:
+<a href="http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html">http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html</a>
+
+     <li>Customize the related options of ECB:
+
+     <p>There is exactly one option you have to take into account:
+<code>ecb-find-external-tag-functions</code>. This defines the method ECB uses to
+find these external tags.
+
+     <p>Mostly there is nothing to do because the default values should do a good job. 
+But if things are running bad then maybe this is the right screw for you.
+
+     <p>Finding such external types can be very complex and there are several roads to
+success. ECB uses per default methods based on the semantic-analyzer. But this
+option allows to define own find-functions and tell ECB to uses them.
+
+     <p>This functionality is set on a major-mode base, i.e. for every major-mode a
+different setting can be used. ECB first performs all find-functions defined
+for current major-mode (if any) anf then all find-functions defined for the
+special symbol 'default (if any).
+
+     <p>ECB offers some predefined senseful finding-functions. Currently there are:
+
+          <ul>
+<li><code>ecb-search-tag-by-semantic-analyzer</code>: The most powerfil one, based
+on the semantic-analyzer
+<li><code>ecb-search-tag-by-semanticdb</code>: A backup for the first one
+<li><code>ecb-jde-show-class-source</code>: For major-mode <code>jde-mode</code> when
+coding in java, uses java-mechanisms - maybe for java the best choice. 
+</ul>
+
+     <p>See the documentation of the option and also of these function for details how
+they work and how to write own finding-functions.
+
+   </ul>
+
+<h5 class="subsubsection">4.1.5.6 Customizing the methods ECB-window</h5>
+
+<p>See <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a> for a list of all options currently available
+for customizing this ECB-window to your needs.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB-Sources_002dwindow.html b/site/ecb-2.40/html-help/ECB-Sources_002dwindow.html
new file mode 100644
index 0000000..ac028dd
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB-Sources_002dwindow.html
@@ -0,0 +1,88 @@
+<html lang="en">
+<head>
+<title>ECB Sources-window - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow" title="ECB Directories-window">
+<link rel="next" href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow" title="ECB Methods-window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-Sources-window"></a>
+<a name="ECB-Sources_002dwindow"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.4 ECB Sources-window</h4>
+
+<p><a name="index-Sources-4"></a>ECB offers a ECB-windows for displaying source-file-names of a certain
+directory: The sources-window. It displays all source-file names of the
+currently selected directory of the directories-ECB-window (see <a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>).
+
+   <p>The history-tree-buffer is a &ldquo;flat&rdquo; tree-buffers means all nodes are direct
+children of the invisible root-node and can not be expanded.
+
+<h5 class="subsubsection">4.1.4.1 Usage of the ECB-Sources-window</h5>
+
+     <ul>
+<li>Source files can be selected by clicking with the primary mouse button
+(see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or hitting RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) on
+the source row in the <dfn>ECB-Sources</dfn>-window. The buffer of the selected
+source-file will be displayed in an edit-window - which one depends on the
+setting in <code>ecb-mouse-click-destination</code>.
+
+     <p>IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+clicking with the primary mouse button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or RETURN
+(see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>)) on a source row in the ECB-Sources-windows then
+the source will not be displayed in an edit-window but it will be scanned in
+the background and all its contents (e.g. methods and variables) are listed in
+the <dfn>ECB Methods</dfn>-window (see <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>. So you can get an
+overlook over the source without changing the buffer in the edit-window.
+
+     <li>Clicking on the source file with the secondary mouse button or
+C-RETURN (see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>) will open the source file in
+another edit window - which one depends on the setting in
+<code>ecb-mouse-click-destination</code>.
+
+     <li>Right clicking on a source file (mouse-button 3) will open a popup menu where
+different operation on the item under the mouse cursor can be performed. This
+popup-menu offers operations for version-control, dired, grep, filtering the
+file-names and some file-operations like deleting the related file from disk. 
+In addition the ECB-Sources-window can be maximized via the popup-menu
+
+</ul>
+
+<h5 class="subsubsection">4.1.4.2 Activating/Displaying the ECB-Sources-window</h5>
+
+<p>Either use one of the predefined layouts which contain the sources ECB-window
+(see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>) (e.g. via <kbd>C-c . l c</kbd>) or create a new
+ecb-layout via the command <code>ecb-create-new-layout</code> and add a buffer of
+type &ldquo;sources&rdquo; into this new layout (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+<h5 class="subsubsection">4.1.4.3 Customizing the ECB-Sources-window</h5>
+
+<p>See <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a> for a list of all options currently available for
+customizing this ECB-window to your needs.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB-as-XEmacs_002dpackage.html b/site/ecb-2.40/html-help/ECB-as-XEmacs_002dpackage.html
new file mode 100644
index 0000000..6d72da7
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB-as-XEmacs_002dpackage.html
@@ -0,0 +1,98 @@
+<html lang="en">
+<head>
+<title>ECB as XEmacs-package - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Installation.html#Installation" title="Installation">
+<link rel="prev" href="Requirements.html#Requirements" title="Requirements">
+<link rel="next" href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation" title="Standard ECB-Installation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-as-XEmacs-package"></a>
+<a name="ECB-as-XEmacs_002dpackage"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation">Standard ECB-Installation</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Requirements.html#Requirements">Requirements</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Installation.html#Installation">Installation</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.1.2 Installation of ECB as a XEmacs-package</h4>
+
+<p>This section is only relevant for XEmacs-users!
+
+   <p>In previous versions of ECB XEmacs-users could use the
+package-management-system of XEmacs for first-time downloading/installing ECB
+or for upgrading to a newer version of ECB.
+
+   <p>Beginning with version 2.33 ECB does no longer support the old versions of
+semantic, eieio and speedbar not part of the CEDET-suite. ECB &gt;= 2.33 requires
+fully installed CEDET-suite with version &gt;= 1.0pre6. This one is not available as
+XEmacs-package. Therefore ECB can also not be run as XEmacs-package. If cedet
+will become a XEmacs-package then probably ECB will come back as
+XEmacs-package. But in the meanwhile you have to install ECB &ldquo;by hand&rdquo; as
+described in the next section (see <a href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation">Standard ECB-Installation</a>).
+
+<!-- @strong{Recommendation}: If you are able to manually install ECB and its -->
+<!-- requirements as described in @ref{Standard ECB-Installation} then go on and -->
+<!-- proceed with that (you will see, it's easy). You will get a much more powerful -->
+<!-- ECB and also CEDET/semantic. -->
+<!-- If you are desperate to use the package-management-system of ECB for -->
+<!-- installing ECB, then here is a short guide (for details about the -->
+<!-- package-manager of XEmacs see the related info-manual): -->
+<!-- @strong{Caution}: If ECB is already installed and you just want -->
+<!-- upgrading to a newer version then it is recommended to deactivate ECB -->
+<!-- before proceeding with the steps below! -->
+<!-- @enumerate -->
+<!-- @item Choose a download-site -->
+<!-- This can be done via the menu ``Tools -> Packages -> Add Download -->
+<!-- Site'': Choose one of the listed sites. Or you can customize the -->
+<!-- option @code{package-get-remote} by hand and save it for future -->
+<!-- sessions. -->
+<!-- @item Activate the packages list -->
+<!-- This can be done either by the menu ``Tools -> Packages -> List and -->
+<!-- Install'' or via the command @code{pui-list-packages}. After that a -->
+<!-- special packages-buffer is displayed where you can interactively -->
+<!-- install or upgrade packages. At the end of this buffer there is a -->
+<!-- short description how to use this buffer. -->
+<!-- @item Install ECB and all required packages -->
+<!-- Mark the package named ``ecb'' for install. Do this also for the -->
+<!-- required packages ``semantic'', ``eieio'' and ``speedbar''. The -->
+<!-- package ``mail-lib'' is needed for easy submitting of problem-reports -->
+<!-- to the ECB-maintainers and the package ``c-support'' is needed for -->
+<!-- easy using hideshow within the Methods-buffer of ECB@footnote{All -->
+<!-- required packages can simply autom. marked by hitting @kbd{r} in the -->
+<!-- packages buffer. But this installs a lot of packages more (e.g. the -->
+<!-- Newsreader Gnus) which are really not essential for ECB. Therefore it -->
+<!-- is recommended to mark the required packages by hand.}. -->
+<!-- After marking all needed packages for installation hit @kbd{x} to -->
+<!-- install them. -->
+<!-- If you have already installed ECB and you want just upgrading to the -->
+<!-- latest available version then proceed as described above - same if you -->
+<!-- want to upgrade one of the required packages. -->
+<!-- @item Start ECB -->
+<!-- Now you can immediately start ECB via the command @code{ecb-activate}; -->
+<!-- there is no need to restart XEmacs! As an alternative you can first -->
+<!-- read the online-help via @code{ecb-show-help}. -->
+<!-- @end enumerate -->
+<!-- If you do not like the package-manager of XEmacs but you want -->
+<!-- installing ECB ``by hand'' direct from the ECB-website then you have -->
+<!-- to follow the instructions in @ref{Standard ECB-Installation}. -->
+</body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB_002dwindow-synchronizing.html b/site/ecb-2.40/html-help/ECB_002dwindow-synchronizing.html
new file mode 100644
index 0000000..cacc5d8
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB_002dwindow-synchronizing.html
@@ -0,0 +1,62 @@
+<html lang="en">
+<head>
+<title>ECB-window synchronizing - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Back_002fforward-navigation.html#Back_002fforward-navigation" title="Back/forward navigation">
+<link rel="next" href="Stealthy-background-tasks.html#Stealthy-background-tasks" title="Stealthy background tasks">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-window-synchronizing"></a>
+<a name="ECB_002dwindow-synchronizing"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.12 Synchronization of the ECB-windows</h3>
+
+<p>Per default ECB synchronizes automatically the contents of the
+ECB-windows (e.g. tree-buffers) with the current active edit-window
+(rsp. the current buffer of the edit window).
+
+   <p>ECB distinguishes between the so called &ldquo;basic&rdquo; ECB-windows (for a general
+description see <a href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>) and add-on
+ECB-windows (see <a href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>). This distinction is also important
+concerning synchronization:
+
+   <p>The basic ECB-windows are always synchronized together whereas for each add-on
+ECB-window a separate synchronization option is offered.
+
+   <p>This section describes at beginning some general synchronization aspects
+(common for all ECB-windows, basic ones as well as add-ons), then the
+synchronization of the basic-ECB-windows and finally the synchronization of
+the add-on ECB-windows.
+
+<ul class="menu">
+<li><a accesskey="1" href="General-synchronization-aspects.html#General-synchronization-aspects">General synchronization aspects</a>:        General synchronization aspects
+<li><a accesskey="2" href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows">Synchronization of basic ECB-windows</a>:   Synchronization of basic ECB-windows
+<li><a accesskey="3" href="Add_002don-synchronization.html#Add_002don-synchronization">Add-on synchronization</a>:                 Synchronization of add-on ECB-windows
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ECB_002dwindows.html b/site/ecb-2.40/html-help/ECB_002dwindows.html
new file mode 100644
index 0000000..bad71b6
--- /dev/null
+++ b/site/ecb-2.40/html-help/ECB_002dwindows.html
@@ -0,0 +1,53 @@
+<html lang="en">
+<head>
+<title>ECB-windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Manual-usage.html#Manual-usage" title="Manual usage">
+<link rel="next" href="Activation-and-Deactivation.html#Activation-and-Deactivation" title="Activation and Deactivation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ECB-windows"></a>
+<a name="ECB_002dwindows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Manual-usage.html#Manual-usage">Manual usage</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">4 All ECB-windows of ECB</h2>
+
+<p>ECB displays a number of informational windows that allow for easy
+source code navigation and overview. These informational windows are
+called <dfn>ECB-windows</dfn>. Each ECB-window is displayed in its own
+special window/buffer which is dedicated and read-only.
+
+   <p>There are some &ldquo;basic&rdquo; ECB-windows (e.g. for browsing directories
+and sources) and some &ldquo;add-on&rdquo; ECB-windows for special purposes like
+displaying the definition of the current symbol under point. This
+chapter describes all ECB-windows of ECB in detail.
+
+<ul class="menu">
+<li><a accesskey="1" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>:            Description of the basic ECB-windows
+<li><a accesskey="2" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>:           Description of additional ECB-windows
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Elisp-programming.html b/site/ecb-2.40/html-help/Elisp-programming.html
new file mode 100644
index 0000000..b1628d4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Elisp-programming.html
@@ -0,0 +1,48 @@
+<html lang="en">
+<head>
+<title>Elisp programming - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="next" href="Conflicts-and-bugs.html#Conflicts-and-bugs" title="Conflicts and bugs">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Elisp-programming"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">11 Entry points for Elisp programmers</h2>
+
+<p>This chapter describes how ECB can be used/programmed/driven by an
+Elisp-program. This contains:
+
+<ul class="menu">
+<li><a accesskey="1" href="List-of-variables.html#List-of-variables">List of variables</a>:            Which variables an Elisp-program can use
+<li><a accesskey="2" href="List-of-hooks.html#List-of-hooks">List of hooks</a>:                All available hooks
+<li><a accesskey="3" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>:                  Full description of the tree-buffer-library
+<li><a accesskey="4" href="Adviced-functions.html#Adviced-functions">Adviced functions</a>:            How to deal with the adviced functions
+<li><a accesskey="5" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>:            Programming new layouts and special windows
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Expanding.html b/site/ecb-2.40/html-help/Expanding.html
new file mode 100644
index 0000000..963c736
--- /dev/null
+++ b/site/ecb-2.40/html-help/Expanding.html
@@ -0,0 +1,172 @@
+<html lang="en">
+<head>
+<title>Expanding - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="prev" href="Visiting-tags.html#Visiting-tags" title="Visiting tags">
+<link rel="next" href="Customizing-the-display.html#Customizing-the-display" title="Customizing the display">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Expanding"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Visiting-tags.html#Visiting-tags">Visiting tags</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.6.2 Explicit and automatic expanding of the ECB-methods-buffer</h4>
+
+<h5 class="subsubsection">6.6.2.1 Explicit expanding all nodes to a certain expansion level</h5>
+
+<p>With the command <code>ecb-expand-methods-nodes</code> (bound to <kbd>C-c . 
+x</kbd>) you can get a fast overlook of the contents of the source-buffer,
+because this command allows precisely expanding all tags with a
+certain indentation-level. So you can either expand no tags (or with
+other words collapse all tags) or expand all tags so see the contents
+of a buffer at one glance. Or you can expand exactly that tags of a
+certain indentation level.
+
+   <p>Which node-types are expanded (rsp. collapsed) by this command
+depends for semantic-sources on the options
+<code>ecb-methods-nodes-expand-spec</code> and
+<code>ecb-methods-nodes-collapse-spec</code>! For non-semantic-sources always
+all node-types are expanded/collapsed, i.e. the two options above
+takes no effect for these files.
+
+<h5 class="subsubsection">6.6.2.2 Explicit expanding of the current node to a certain level</h5>
+
+<p>With the popup-menu of the methods-buffer an even more precise
+expansion is possible because it allows not only expanding all tags
+(see above) but offers in addition expanding only the current-node
+(for which the menu was activated) to an exact level of expansion:
+
+   <p>All menu-entries are label with an expansion-&ldquo;level&rdquo; whereas level
+specifies precisely which level of nodes should be expanded. level
+means the indentation-level of the NODE itself and its (recursive)
+subnodes relative to the NODE itself.
+
+   <p>So a level value X means that all (sub)nodes with an indentation-level
+&lt;= X relative to NODE are expanded and all other are collapsed.
+
+   <p>Examples:
+
+     <ul>
+<li>Expand this node to level 0:
+Expand only the NODE itself because it is the only node which has
+indentation 0 to itself. All deeper indented nodes will be collapsed. 
+This is also the important difference between using this menu compared
+to clicking onto the expand-symbol of the node: The latter one expands
+the NODE to that expansion-state it has before the last collapsing (so
+when deeper nodes has been expanded they will be expanded now to). The
+former one expands exactly(!) to level 0, means expand only the node
+itself and collapse all(!) its subnodes recursively(!).
+
+     <li>Expand this node to level 1:
+Expand the NODE itself and all of its direct subnodes - because only
+the direct subnodes of NODE have indentation-level 1 relativ to NODE. 
+All deeper nodes will be collapsed.
+
+     <li>Collapse this node completely:
+Collapses the current node recursively, means collapse not only the
+node itself but also its subnodes, the subnodes of the subnodes and so
+on! This is very differnt from clicking onto the collapse symbol
+because this action only collapses the node itself but preserves the
+expansion-state of all its subnodes!
+
+   </ul>
+
+   <p>Expanding the current node with the popup-menu ignores the settings in
+the options <code>ecb-methods-nodes-expand-spec</code> and
+<code>ecb-methods-nodes-collapse-spec</code>!
+
+<h5 class="subsubsection">6.6.2.3 Automatic expansion ot tags after buffer-parsing</h5>
+
+<p>With the option <code>ecb-show-tags</code> you tell ECB how to display tags
+of a certain tag-class (see <a href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>). Among other
+things you can tell ECB that a certain tag-class should be combined
+under an expanded or collapsed bucket-node. But such a setting defines
+the expansion-state of such a bucket-node only direct afterwards the
+buffer has been (re)parsed, which can occur after opening a file,
+after autom. reparsing the buffer via semantic or after manually
+rebuilding the methods-buffer of ECB.
+
+   <p>The tag-class <code>type</code> (classes, interfaces, enumerations etc.) is
+divided into several subtypes by semantic. The subtypes are strings
+which names exactly if the tag with tag-class <code>type</code> is a class,
+an interface, an enumeration, a typedef etc. With the option
+<code>ecb-type-tag-expansion</code> you can tell ECB if these type-tags
+should be autom. expanded after (reparsing) a buffer (see above) or if
+they should be displayed collapsed - so all its members (methods,
+variables etc.) are hidden.
+
+<h5 class="subsubsection">6.6.2.4 Automatic expanding the ECB-methods-buffer for current tag</h5>
+
+<p>If the option <code>ecb-highlight-tag-with-point</code> is switched on, then
+always that node in the method-buffer is highlighted which belongs to
+the current semantic-tag under point in the current active
+edit-window. But if this node is invisible (probably because its
+parent node is collapsed) then no node is highlighted if the auto. 
+expanding feature is switched off.
+
+   <p>You can either switch on this feature with the option
+<code>ecb-auto-expand-tag-tree</code> or even easier with the command
+<code>ecb-toggle-auto-expand-tag-tree</code>.
+
+   <p>There is another option
+<code>ecb-expand-methods-switch-off-auto-expand</code> which makes both
+explicit and auto. expanding best working together. See the
+documentation of this option to get the details.
+
+   <p>The autom. expanding feature is only available for semantic-sources!
+
+   <p>Previous versions of ECB have always fully expanded the whole tree in
+the Methods-buffer if the current tag in the source-buffer was not
+visible in the current tree - e.g. because the variables-bucket was
+collapsed or the containing type of a tag (e.g. the class of a method)
+was collapsed. So in most cases much more was expanded as needed to
+make the current tag visible.
+
+   <p>The mechanism of ECB 2.22 and higher only expands the needed parts of
+the tree-buffer to make the related node visible: First we try to
+highlight the current tag with current expansion-state of the
+Methods-buffer. If the node is not visible so the tag can not be
+highlighted then we go upstairs the ladder of type-tags the current
+tag belongs to (e.g. we expand successive the nodes of the whole
+class-hierachy of the current method-tag until the related node
+becomes visible). If there is no containing type for the current tag
+then the node of the tag is probably contained in a toplevel-bucket
+which is currently collapsed; in this case we expand only this
+bucket-node and try highlighting again. Only if this has still no
+success then we expand the full tree-buffer and try to highlight the
+current tag.
+
+   <p>There is another option
+<code>ecb-auto-expand-tag-tree-collapse-other</code>: If this option is set
+then auto. expanding the tag-tree collapses all not related nodes. 
+This means that all nodes which have no relevance for the currently
+highlighted node will be collapsed, because they are not necessary to
+make the highlighted node visible. This feature is switched off by
+default because if always collapses the complete Methods-tree before
+the following highlighting of the node for the current tag expands the
+needed parts of the tree-buffer.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/FAQ.html b/site/ecb-2.40/html-help/FAQ.html
new file mode 100644
index 0000000..5a20184
--- /dev/null
+++ b/site/ecb-2.40/html-help/FAQ.html
@@ -0,0 +1,540 @@
+<html lang="en">
+<head>
+<title>FAQ - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Conflicts-and-bugs.html#Conflicts-and-bugs" title="Conflicts and bugs">
+<link rel="next" href="Command-Index.html#Command-Index" title="Command Index">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="FAQ"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Command-Index.html#Command-Index">Command Index</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">13 Frequently asked questions</h2>
+
+<p>This is the Emacs Code Browser FAQ.
+
+<!-- To produce prettier output we make a small empty column between the -->
+<!-- question- and the answer-column. Therefore every Q/A-item must look -->
+<!-- like: -->
+<!-- @c an empty line between every Q/A-item -->
+<!-- @item @tab @tab -->
+<!-- @c The Q/A-item -->
+<!-- @item -->
+<!-- <The text of the question?> -->
+<!-- @tab @tab -->
+<!-- <The text of the answer> -->
+<p><table summary="">
+<tr align="left"><td valign="top" width="40%"><strong>Question</strong>
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+<strong>Answer</strong>
+
+<!-- an empty line between every Q/A-item -->
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<!-- The Q/A-item -->
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">What is the first step i should do if i have problems with ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Read carefully the related sections of the online-help of ECB.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">What should i do, if a have a problem which can not be solved even
+after reading the online-help? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Send a problem-report to the ECB-mailing-list with the command
+<code>ecb-submit-problem-report</code>. 
+See <a href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">What should i do, if another package seems not to work correct with
+ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Take a look into <a href="Conflicts.html#Conflicts">Conflicts</a>. If your package is not listed there
+then submit a problem-report.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can ECB parse and display source-contents not supported by semantic? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, in all version &gt;= 1.94. ECB can now parse and display all
+source-contents supported by semantic, imenu or etags - same as
+speedbar. See <a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Why are the lines in the ECB-, temp- and compilation-buffers not
+wrapped but truncated? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Check the variable <code>truncate-partial-width-windows</code> and set it to
+nil.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Why doesn't ECB work correct with VC? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+The variable <code>vc-delete-logbuf-window</code> must be set to nil during
+active ECB. This can be done with the hooks of ECB.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Does ECB support C++ as well as Java? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+In general C++ is supported very well. But it depends on the used
+cedet-version, but cedet-version &gt;= 1.0pre6 support C++ really well.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Does ECB support Perl? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+If perl can be parsed either by imenu, etags or semantic then ECB
+supports perl. Of course ECB would support perl best if perl is
+supported by semantic.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Does ECB support language XYZ? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+See question &ldquo;Does ECB support Perl?&rdquo; and replace &ldquo;Perl&rdquo; with
+&ldquo;XYZ&rdquo; in the answer.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How to add new languages to ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Add the language XYZ to semantic (perform all necessary steps described in
+the semantic-manual) and ECB will automatically support language XYZ! 
+There is nothing to do in ECB itself! Same when you write an imenu- or
+etags-support for language XYZ.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Why does ECB not recognize my source-files for C++? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Your C++-files have probably an extension which is not mapped to
+c++-mode in <code>auto-mode-alist</code> and/or your own Emacs-setup has
+&ldquo;destroyed&rdquo; the correct value of the hook-variable
+<code>c++-mode-hook</code>. 
+See <a href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Is it possible to make the history of ECB persistent? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+You can use the library &ldquo;desktop.el&rdquo; which works very well with ECB. 
+Then all files of your recent Emacs-session will be opened
+automatically after next Emacs-start and will be added automatically
+to the ECB-history after ECB-start.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Is there an &ldquo;Intellisense&rdquo;-mechanism like with other IDEs? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+For Java the JDEE<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> has this feature and for all other languages
+semantic offer something similar, see
+<a href="http://cedet.sourceforge.net/intellisense.shtml">http://cedet.sourceforge.net/intellisense.shtml</a>
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i use ECB in combination with Gnus within one frame? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+You can, but for ECB-versions &lt; 1.96 it is not recommended because
+each of them has it's own window-management and probably there will be
+conflicts, so use different frames for ECB and Gnus! But beginning
+with ECB 1.96 you can use either escreen.el or winring.el as
+&ldquo;window-manager&rdquo; which allows you in consequence to use ECB and
+applications like Gnus in one frame! 
+See <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i speed up displaying the contents of big-size directories? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see the option <code>ecb-cache-directory-contents</code>. Read the
+section
+<a href="Large-directories.html#Large-directories">Large directories</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Is it possible to create/use other layouts than the built-in ones? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes. <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a> and
+<a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a> are the relevant sections. The former one
+describes how to create interactively new layouts where the latter
+one is for Elisp-programmers.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i use speedbar as directory-browser within ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i exclude subdirectories from the recursive grep in the directories buffer? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Grepping-directories.html#Grepping-directories">Grepping directories</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How can i prevent contaminating each directory with a file <samp><span class="file">semantic-cache</span></samp>? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Set <code>semanticdb-default-save-directory</code> to a directory.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Why ECB displays large portions of current source-file with dark background? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+This comes from semantic;
+see <a href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Why ECB underlines some parts of current source-file? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+This comes from semantic;
+see <a href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i add my own commands to the popup-menus of tree-buffers? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can ECB display the compile-window &ldquo;on demand&rdquo;? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Which buffers are treated as compilation-buffers by ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+See the docstring of the function <code>ecb-compilation-buffer-p</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How can i change the modeline of an ECB-tree-buffer? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+You can change it with the options <code>ecb-mode-line-prefixes</code>,
+<code>ecb-mode-line-data</code> and
+<code>ecb-mode-line-display-window-number</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can the tree-buffers being selected faster than with the
+standard-keybindings of ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-mode-line-display-window-number</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can ECB display the window-number in the modeline of the special windows? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-mode-line-display-window-number</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How can i change the keybindings of ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+You can do this with option <code>ecb-key-map</code> (see <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a>).
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">What can i do if hiding/showing from the methods-buffer does not work? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Either the current <code>major-modes</code> is not supported by hideshow or
+you have to add an entry to <code>hs-special-modes-alist</code>
+(see <a href="Hide_002dshow.html#Hide_002dshow">Hide-show</a>).
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i maximize one of the ECB-windows for better overlook? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">Maximizing the ECB windows</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i hide the ECB-windows for getting more editing-space? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i define the actions ECB performs after visiting a tag? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Visiting-tags.html#Visiting-tags">Visiting tags</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Buffers are not displayed correctly in the compile-window? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+See <a href="Problems-with-the-compile-window.html#Problems-with-the-compile-window">Problems with the compile window</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can ECB work together with window-managers like escreen.el? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i remove these &ldquo;ugly&rdquo; vertical lines from a tree-buffer? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-tree-buffer-style</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">ECB does not display images in the tree-buffers - what can i do? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Customize <code>ecb-tree-buffer-style</code> and restart ECB. But note: GNU
+Emacs &lt;= 21.3.X for Windows does not support image-display so ECB uses
+always ascii-guide-lines even when here the image-style is set in
+<code>ecb-tree-buffer-style</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Do <code>special-display-function</code> et. al. work with ECB. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see
+<a href="Using-special_002ddisplay-with-ECB.html#Using-special_002ddisplay-with-ECB">Using special-display with ECB</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i activate the popup-menu of a tree-buffer from keyboard? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i display the popup-menu of a tree-buffer with tmm? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Does ECB disable all advices after deactivation? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+&ldquo;Nes&rdquo;<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>, see remarks
+in the documentation of the option
+<code>ecb-split-edit-window-after-start</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can ECB preserve the full state of ECB between deactivation and next
+activation? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see the option <code>ecb-split-edit-window-after-start</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i change the behavior how ECB chooses another window for selecting
+it or scrolling it. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="The-other-window.html#The-other-window">The other window</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i increase the allowed depth of nested submenus. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see the docstring of the option
+<code>ecb-directories-menu-user-extension</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i apply some filters to the Tree-buffers. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">With XEmacs i get sometimes an error &ldquo;Wrong number of arguments:
+widen (1)&rdquo;. What can i do? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Disable the func-menu support in your XEmacs-setup. See
+<a href="Conflicts.html#Conflicts">Conflicts</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i use desktop.el in combination with ECB? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see <a href="Conflicts.html#Conflicts">Conflicts</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Opening directories takes a long time - what can i do? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Read <a href="Large-directories.html#Large-directories">Large directories</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">ECB seems to be blocked sometimes - what is the reason? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+ECB performs some stealthy tasks when idle - this can cause sometimes
+a blocked Emacs but this tasks will be immetiatelly interrupted by any
+user-event so there should be normally no problems. But especially for
+mounted net-drives some of the stealthy tasks can take time up to some
+seconds for each file - and during one file-operation it can not be
+interrupted. See also <code>ecb-stealthy-tasks-delay</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i exclude certain directories from being checked for emptyness? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-prescan-directories-exclude-regexps</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i exclude certain directories from checking the VC-state of the
+contained sources? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-vc-directory-exclude-regexps</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">Can i exclude certain directories from checking the read-only-state of
+the contained sources? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Yes, see option <code>ecb-read-only-check-exclude-regexps</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">ECB ignores the remote-paths i have added to <code>ecb-source-path</code>. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Maybe you have to check the option <code>ecb-ping-options</code>. Ensure
+that this option contains a value suitable for your ping-program (see
+<code>ecb-ping-program</code>). 
+See also <a href="Remote-directories.html#Remote-directories">Remote directories</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">ECB seems to be blocked a long time. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Maybe you use cygwin-XEmacs. Then either the empty-dir-check (see
+option <code>ecb-prescan-directories-for-emptyness</code>) or the VC-support
+(see <code>ecb-vc-enable-support</code>) can block ECB. 
+For the latter one see <a href="Known-VC_002dproblems.html#Known-VC_002dproblems">Known VC-problems</a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">ECB seems to be blocked during the VC-state update in the
+tree-windows. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Maybe the root repository for the current directory is a
+remote-repository. This can result in a long lasting check-time per
+file. 
+See also <a href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a> for hints what you can do.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">I have encountered some problems with the display of the VC-state in
+the tree-buffers. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+See also <a href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a> for hints what you can do.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">The state of the files under version control seems to be not accurate. What is
+the reason and what can i do? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+The option <code>ecb-vc-supported-backends</code> offers now also a accurate
+recompute-state function. This is by offering <code>ecb-vc-recompute-state</code> as
+an alias to the function <code>vc-recompute-state</code> as state-check function for
+this option. See also <a href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">With Emacs 23 ECB shows a odd split-behavior when calling help or displaying
+completion-output or compilation- or grep-output. What is the reason. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Check the values of the options <code>split-width-threshold</code> and
+<code>split-height-threshold</code>. ECBs split-behavior depends fully on the
+Emacs-logic and that one depends mainly on these two options. So adjust them
+to match (at least nearly) the sizes of the edit-area of ECB.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">When using a layout with the special ecb-window for the semantic analyzer then
+Emacs seems to be blocked when typing pauses. What is the reason and what can
+i do? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+This comes from the idle-mechanism ECB/semantic uses to offer some
+intellisense like displaying possible completions and local variables
+depending on current context (ie. location of point). So if point stays on a
+location within your code where hundreds (or even thousands) of completions
+are possible then parsing and displaying them can last annoying time. But in
+general a keypress interupts. If not then you have to possibilities offered by
+the options <code>ecb-analyse-buffer-sync</code> and
+<code>ecb-analyse-buffer-sync-delay</code>: You can increase the delay of the latter
+one so parsing current context starts later after Emacs goes idle (ie. after
+you pause typing). Or you can disable the automatic synchronizing the
+analyser-window with the former one - see the docstring. Then you have to
+synchronize (ie. start parsing context) on demand via the command
+<code>ecb-analyse-buffer-sync</code><a rel="footnote" href="#fn-3" name="fnd-3"><sup>3</sup></a>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How can i change the bucketizing method of the history-window? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+Either via popup context-menu (right mouse-button) or with the option
+<code>ecb-history-make-buckets</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">How can i disable this grey headerline in the tree-buffers? 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+See the option <code>ecb-tree-make-parent-node-sticky</code>.
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%"></td><td valign="top" width="1%"></td><td valign="top" width="59%">
+
+<p><br></td></tr><tr align="left"><td valign="top" width="40%">When clicking onto a parent-node in the methods-window then ECB doesn't jump
+to the definition of this parent-type. 
+</td><td valign="top" width="1%"></td><td valign="top" width="59%">
+ECB uses completely the smartness of the semanticdb and the semantic-analyzer. 
+So if you have customized semantic accordingly to the needs of your project
+(ie. mainly setting up all so semantic can find files in your
+directory-structure) then ECB will find the parent-definition and also jump to
+it. See <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a> and the subsection &ldquo;Jumping to the
+definition of external tags&rdquo; and see the option
+<code>ecb-find-external-tag-functions</code>.
+
+   <br></td></tr></table>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> 
+<a href="http://jdee.sunsite.dk/">http://jdee.sunsite.dk/</a>
+</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> Nes is a combination of No and Yes :-)</p>
+
+   <p class="footnote"><small>[<a name="fn-3" href="#fnd-3">3</a>]</small> Yes, both the option and the command
+have the same name</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Filtering-Directories.html b/site/ecb-2.40/html-help/Filtering-Directories.html
new file mode 100644
index 0000000..4506037
--- /dev/null
+++ b/site/ecb-2.40/html-help/Filtering-Directories.html
@@ -0,0 +1,52 @@
+<html lang="en">
+<head>
+<title>Filtering Directories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="prev" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="next" href="Filtering-Sources.html#Filtering-Sources" title="Filtering Sources">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Filtering-Directories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Filtering-Sources.html#Filtering-Sources">Filtering Sources</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.7.1 Applying filters to the Directories-buffer</h4>
+
+<p>With the option <code>ecb-excluded-directories-regexps</code> certain
+directories can be excluded from being displayed in the
+directories-browser of ECB. This can be done by defining regular
+expressions. If the name of a directory matches at least one of the
+regexps of this option the directory is not displayed in the
+directories-tree-buffer.
+
+   <p>The option <code>ecb-sources-exclude-cvsignore</code> allows to exclude
+source-files from the sources-tree-buffer if their name is listed in a
+so called <samp><span class="file">.cvsignore</span></samp>-file. This option is a list of regular
+expressions and if a directory-name matches at least one of these
+regexps then all files listed in the <samp><span class="file">.cvsignore</span></samp>-file of this
+directory are not displayed in the sources-tree-buffer.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Filtering-History.html b/site/ecb-2.40/html-help/Filtering-History.html
new file mode 100644
index 0000000..8f9f40c
--- /dev/null
+++ b/site/ecb-2.40/html-help/Filtering-History.html
@@ -0,0 +1,61 @@
+<html lang="en">
+<head>
+<title>Filtering History - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="prev" href="Filtering-Sources.html#Filtering-Sources" title="Filtering Sources">
+<link rel="next" href="Filtering-Methods.html#Filtering-Methods" title="Filtering Methods">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Filtering-History"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Filtering-Methods.html#Filtering-Methods">Filtering Methods</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Filtering-Sources.html#Filtering-Sources">Filtering Sources</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.7.3 Applying filters to the History-buffer</h4>
+
+<h5 class="subsubsection">6.7.3.1 Interactive History-filters</h5>
+
+<p>The command <code>ecb-history-filter</code> allows to filter these
+tree-buffer either by a regular expression or by an extension (e.g. 
+java, cc, el for java-, c++- rsp elisp-sources). This functionality is
+also available via the popup-menu of the History-tree-buffer.
+
+   <p>The currently applied filter is indicated in the modeline of the
+related tree-buffer. Applying a new filter replaces an eventually
+already applied filter.
+
+<h5 class="subsubsection">6.7.3.2 Default History-filters</h5>
+
+<p>The option <code>ecb-history-exclude-file-regexps</code> allows to exclude
+source-files from being historized (ie. displayed in the
+History-buffer). Despite the fact that the History-buffer already
+excludes all non-file-buffers there can be still buffers which name
+you do not wat to be displayed in the history. These are file-buffer
+like <samp><span class="file">TAGS</span></samp> or <samp><span class="file">semantic.cache</span></samp> which store
+meta-informations used by Emacs and its tools (etags, semantic etc.). 
+These files can be excluded via
+<code>ecb-history-exclude-file-regexps</code>.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Filtering-Methods.html b/site/ecb-2.40/html-help/Filtering-Methods.html
new file mode 100644
index 0000000..d817f26
--- /dev/null
+++ b/site/ecb-2.40/html-help/Filtering-Methods.html
@@ -0,0 +1,143 @@
+<html lang="en">
+<head>
+<title>Filtering Methods - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="prev" href="Filtering-History.html#Filtering-History" title="Filtering History">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Filtering-Methods"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Filtering-History.html#Filtering-History">Filtering History</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.7.4 Applying filters to the Methods-buffer</h4>
+
+<p>The commands <code>ecb-methods-filter</code>,
+<code>ecb-methods-filter-regexp</code>,
+<code>ecb-methods-filter-protection</code>,
+<code>ecb-methods-filter-tagclass</code>,
+<code>ecb-methods-filter-function</code>,
+<code>ecb-methods-filter-delete-last</code>,
+<code>ecb-methods-filter-nofilter</code> allows to filter the tags/nodes of
+the Methods-buffer by several criterias. As for the Sources- and the
+History-buffer the same functionality is also available via the
+popup-menu of the Methods-buffer.
+
+<h5 class="subsubsection">6.7.4.1 Possible filter-criterias</h5>
+
+     <ul>
+<li>Filter by protection:
+Just insert the protection you want the Methods-buffer being filtered:
+private, protected or public! For sources not supported by semantic
+the protection filter will not be offered because these informations
+are not available for such sources.
+
+     <li>Filter by regexp:
+Insert the filter as regular expression.
+
+     <li>Filter by tag-class:
+You can filter by tag-classes. The popup-menu contains mode-dependend
+tag-filter entries and the command <code>ecb-methods-filter</code> offers
+only the tag-classes of the current mode. This means for sources not
+supported by semantic the tag-class filter will not be offered. And
+for semantic-supported sources exactly these tag-classes are offered
+the semantic-parser for the current major-mode offers. For example
+texi-sources can only be filtered by the tag-classes &ldquo;Definitions&rdquo;
+and &ldquo;Sections&rdquo; and java-sources can be filtered by &ldquo;Methods&rdquo;,
+&ldquo;Variables&rdquo;, &ldquo;Classes&rdquo; etc. In general the semantic-variable
+<code>semantic-symbol-&gt;name-assoc-list</code> is used to get the right
+tag-classes.
+
+     <li>Filter by a filter-function:
+Such a function gets two arguments: a tag and the source-buffer of
+this tag. If the tag should be displayed (i.e. not being filtered out)
+then the function has to return not nil otherwise nil.
+
+     <li>No special filter:
+This means to display all tags specified with the option
+<code>ecb-show-tokens</code>. If currently some of the above filters are
+applied they will be all removed.
+
+     <li>Delete the last added:
+This removes only the topmost filter-layer, means that filter added
+last. 
+</ul>
+
+   <p>Be aware that the tag-list specified by the option
+<code>ecb-show-tags</code> is the basis of all filters, i.e. tags which are
+excluded by that option will never be shown regardless of the filter
+type here!
+
+   <p>All tags which match the applied filter(s) will be displayed in the
+Methods-buffer. Such a filter is only applied to the current
+source-buffer, i.e. each source-buffer can have its own tag-filters.
+
+   <p>These tag-filters can also applied to sources which are not supported
+by the semantic-parser but &ldquo;only&rdquo; by imenu or etags. But because for
+these sources not all information are avaiable the protection- and
+tag-class filter are not offered with such &ldquo;non-semantic&rdquo;-sources. 
+See <a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a> for further details about working with
+source-files not supported by the semantic-parser.
+
+<h5 class="subsubsection">6.7.4.2 Inverse Filters</h5>
+
+<p>But if <code>ecb-methods-filter</code> is called with a prefix-argument then
+an inverse filter is applied to the Methods-buffer, i.e. all tags
+which do <strong>NOT</strong> match the choosen filter will be displayed in
+the Methods-buffer!
+
+<h5 class="subsubsection">6.7.4.3 Layered filters</h5>
+
+<p>Per default the choosen filter will be applied on top of already
+existing filters. This means that filters applied before are combined
+with the new filter. This behavior can changed via the option
+<code>ecb-methods-filter-replace-existing</code>.
+
+<h5 class="subsubsection">6.7.4.4 Display of currently applied filters</h5>
+
+<p>The current active filter will be displayed in the modeline of the
+Methods-buffer [regexp, prot (= protection), tag-class, function (=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is
+applied then always the top-most filter is displayed in the modeline
+but the fact of more than 1 filter is visualized by the number of the
+filters - included in parens. You can see all currently applied
+filters by moving the mouse over the filter-string in modeline of the
+Methods-buffer: They will displayed as help-echo.
+
+<h5 class="subsubsection">6.7.4.5 Default filters for certain files.</h5>
+
+<p>The new option <code>ecb-default-tag-filter</code> allow to define default
+tag-filters for certain files which are applied automatically after
+loading such a file into a buffer. The possible filters are the same
+as offered by the command <code>ecb-methods-filter</code> and they are
+applied in the same manner - the only difference is they are applied
+automatically. The files can be specified on a combined major-mode-
+and filename-regexp-basis.
+
+   <p>Usage-example: This can be used to display in outline-mode files (e.g. 
+<samp><span class="file">NEWS</span></samp>) only the level-1-headings by defining a filter regexp
+&ldquo;^\* .*&rdquo;.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Filtering-Sources.html b/site/ecb-2.40/html-help/Filtering-Sources.html
new file mode 100644
index 0000000..6727e38
--- /dev/null
+++ b/site/ecb-2.40/html-help/Filtering-Sources.html
@@ -0,0 +1,60 @@
+<html lang="en">
+<head>
+<title>Filtering Sources - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="prev" href="Filtering-Directories.html#Filtering-Directories" title="Filtering Directories">
+<link rel="next" href="Filtering-History.html#Filtering-History" title="Filtering History">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Filtering-Sources"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Filtering-History.html#Filtering-History">Filtering History</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Filtering-Directories.html#Filtering-Directories">Filtering Directories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.7.2 Applying filters to the Sources-buffer</h4>
+
+<h5 class="subsubsection">6.7.2.1 Interactive Sources-filters</h5>
+
+<p>The command <code>ecb-sources-filter</code> allows to filter these
+tree-buffer either by a regular expression or by an extension (e.g. 
+java, cc, el for java-, c++- rsp elisp-sources). This functionality is
+also available via the popup-menu of the Sources-tree-buffer.
+
+   <p>The currently applied filter is indicated in the modeline of the
+related tree-buffer. Applying a new filter replaces an eventually
+already applied filter.
+
+<h5 class="subsubsection">6.7.2.2 Default Sources-filters</h5>
+
+<p>The option <code>ecb-source-file-regexps</code> allow to specify which
+source-files should be displayed and which not. This is done on a
+directory-basis, ie. for each directory-regexp the files to display
+can be specified. See the documentation of this option for all
+details.
+
+   <p>In addition to this option you should also know the option
+<code>ecb-sources-exclude-cvsignore</code> (see <a href="Filtering-Directories.html#Filtering-Directories">Filtering Directories</a>).
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Filtering-the-tree_002dbuffers.html b/site/ecb-2.40/html-help/Filtering-the-tree_002dbuffers.html
new file mode 100644
index 0000000..4af7d50
--- /dev/null
+++ b/site/ecb-2.40/html-help/Filtering-the-tree_002dbuffers.html
@@ -0,0 +1,50 @@
+<html lang="en">
+<head>
+<title>Filtering the tree-buffers - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="next" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Filtering-the-tree-buffers"></a>
+<a name="Filtering-the-tree_002dbuffers"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.7 Applying filters to the special ECB-tree-buffers</h3>
+
+<p><a name="index-Filter-49"></a>To get a fast and good overlook of the contents of a tree-buffer ECB
+offers a filter-mechanism for the Directories-, Sources-, the History-
+and the Methods-buffer.
+
+<ul class="menu">
+<li><a accesskey="1" href="Filtering-Directories.html#Filtering-Directories">Filtering Directories</a>:        Applying filters to the Directories-buffer
+<li><a accesskey="2" href="Filtering-Sources.html#Filtering-Sources">Filtering Sources</a>:            Applying filters to the Sources--buffer
+<li><a accesskey="3" href="Filtering-History.html#Filtering-History">Filtering History</a>:            Applying filters to the History-buffer
+<li><a accesskey="4" href="Filtering-Methods.html#Filtering-Methods">Filtering Methods</a>:            Applying filters to the Methods-buffer
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/First-steps.html b/site/ecb-2.40/html-help/First-steps.html
new file mode 100644
index 0000000..7569b78
--- /dev/null
+++ b/site/ecb-2.40/html-help/First-steps.html
@@ -0,0 +1,84 @@
+<html lang="en">
+<head>
+<title>First steps - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link rel="prev" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="First-steps"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>
+<hr>
+</div>
+
+<h3 class="section">1.3 First steps after activating ECB first time</h3>
+
+<p>This section of the ECB online-help is displayed automatically by ECB
+after activating ECB first time and describes what are the first basic
+steps:
+
+     <ol type=1 start=1>
+
+     <li>Configure where ECB can find your sources:
+
+     <p>Call <code>M-x customize-option RET ecb-source-path RET</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>. This lets you customize the option
+<code>ecb-source-path</code> with the customize-feature of Emacs. This opens
+a customize-buffer where you can insert all the directories where ECB
+can find your source-files. Save your changes with the button &ldquo;Save
+for future sessions&rdquo; and then throw away this customize-buffer either
+by killing it with <code>M-x kill-buffer</code> or clicking at the button
+&ldquo;Finish&rdquo;.
+
+     <li>Take a look at the most important options of ECB
+Call <code>M-x ecb-customize-most-important RET</code> and see a list of
+options which you should at least know that these options exist.
+
+     <li>Read the online-help of ECB:
+
+     <p>The online-help of ECB is available via
+
+          <ul>
+<li>calling <code>M-x ecb-show-help</code>,
+<li>pressing <kbd>C-c . h</kbd> or
+<li>using the menu &ldquo;ECB&rdquo;. 
+</ul>
+
+     <p>(The section you are currently reading is part of the online-help of
+ECB)
+
+     <p>The chapter &ldquo;Common use-cases&rdquo; is also very interesting!
+
+     <li>Start working with ECB.
+        </ol>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> This
+means first hitting the keys <kbd>M</kbd> (Meta- or Alt-key) and <kbd>x</kbd>
+simultaneously, inserting &ldquo;customize-option&rdquo; in the minibuffer,
+hitting RETURN, inserting &ldquo;ecb-source-path&rdquo; in the minibuffer and
+finally hitting RETURN again</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Fixing-window-sizes.html b/site/ecb-2.40/html-help/Fixing-window-sizes.html
new file mode 100644
index 0000000..780fc31
--- /dev/null
+++ b/site/ecb-2.40/html-help/Fixing-window-sizes.html
@@ -0,0 +1,71 @@
+<html lang="en">
+<head>
+<title>Fixing window sizes - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="prev" href="Changing-window-sizes.html#Changing-window-sizes" title="Changing window sizes">
+<link rel="next" href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout" title="Creating a new ECB-layout">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Fixing-window-sizes"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Changing-window-sizes.html#Changing-window-sizes">Changing window sizes</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.8.4 Fixing the sizes of the special ECB-windows</h4>
+
+<p>GNU Emacs 21 introduced a new feature which can fix the sizes of a
+window displaying a certain buffer even after resizing the frame. This
+new feature is driven by the new buffer-local variable
+<code>window-size-fixed</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+   <p>ECB offers an option <code>ecb-fix-window-size</code> for fixing the sizes
+of the special ECB-windows/buffers even after frame-resizing. The fix
+type (valid values are <code>nil</code>, <code>t</code>, <code>width</code> and
+<code>height</code>) can either be set on a layout-basis (means a different
+value for each layout) or one value can be set for all layouts. In the
+latter case there is an additional value <code>auto</code> which choose
+autom. the senseful fix-type depending on the current layout-type: For
+top-layouts the fix-type <code>height</code> and for all other layout-types
+the fix-type <code>width</code>.
+
+   <p>Probably the most senseful value is <code>auto</code> for all layouts
+because it makes less sense to fix the height of the ecb-windows in a
+left-, right- or leftright-layout. Same for fixing the width in a
+top-layout.
+
+   <p>Note: With Emacs &lt; 22 there seems to be no distinction between
+<code>width</code>, <code>height</code> and <code>t</code>. Therefore this option takes
+no effect (means all ecb-windows have always unfixed sizes) with Emacs
+&lt; 22 if <code>ecb-compile-window-height</code> is not <code>nil</code>.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Currently XEmacs does not support
+this feature therefore <code>ecb-fix-window-size</code> has no effect with
+XEmacs</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/General-aspects.html b/site/ecb-2.40/html-help/General-aspects.html
new file mode 100644
index 0000000..3651d43
--- /dev/null
+++ b/site/ecb-2.40/html-help/General-aspects.html
@@ -0,0 +1,48 @@
+<html lang="en">
+<head>
+<title>General aspects - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizing.html#Customizing" title="Customizing">
+<link rel="prev" href="Customizing.html#Customizing" title="Customizing">
+<link rel="next" href="Most-important-options.html#Most-important-options" title="Most important options">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="General-aspects"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Most-important-options.html#Most-important-options">Most important options</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Customizing.html#Customizing">Customizing</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizing.html#Customizing">Customizing</a>
+<hr>
+</div>
+
+<h3 class="section">7.1 General aspects for customizing ECB</h3>
+
+<p>This chapter contains all important informations you should know about
+customizing ECB. The first section gives an answer to the question
+&ldquo;<code>setq</code> or <code>customize</code>&rdquo; and the second section describes
+what to do when you have to customize ECB for a lot of people.
+
+<ul class="menu">
+<li><a accesskey="1" href="setq-or-customize.html#setq-or-customize">setq or customize</a>:            Should i use setq or customize? 
+<li><a accesskey="2" href="Site_002dwide-customizing.html#Site_002dwide-customizing">Site-wide customizing</a>:        Site-wide customizing of ECB
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/General-hints.html b/site/ecb-2.40/html-help/General-hints.html
new file mode 100644
index 0000000..bf8b047
--- /dev/null
+++ b/site/ecb-2.40/html-help/General-hints.html
@@ -0,0 +1,84 @@
+<html lang="en">
+<head>
+<title>General hints - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link rel="prev" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link rel="next" href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic" title="Setting up CEDET/semantic">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="General-hints"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.2.1 General hints for a correct setup</h4>
+
+<p>ECB is for browsing files and therefore you have to setup your
+Emacs-configuration properly so the file-parsing engines like semantic, imenu
+or etags can be activated automatically for parsing your Emacs-Lisp, C, C++ or
+Java buffers<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>. For this
+Emacs must activate the correct <code>major-mode</code> for the source-files and
+Emacs can only do this if the option <code>auto-mode-alist</code> is setup
+correctly. The correct major-modes and possible
+file-extensions<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a> are:
+
+   <p><table summary="">
+<tr align="left"><td valign="top" width="20%"><strong>Language</strong>
+</td><td valign="top" width="50%">
+<strong>Major-mode</strong>
+</td><td valign="top" width="30%">
+<strong>Extension(s)</strong>
+
+<p><br></td></tr><tr align="left"><td valign="top" width="20%">Emacs Lisp </td><td valign="top" width="50%"><code>emacs-lisp-mode</code> </td><td valign="top" width="30%">.el
+
+<p><br></td></tr><tr align="left"><td valign="top" width="20%">C </td><td valign="top" width="50%"><code>c-mode</code> </td><td valign="top" width="30%">.h, .c
+
+<p><br></td></tr><tr align="left"><td valign="top" width="20%">C++ </td><td valign="top" width="50%"><code>c++-mode</code> </td><td valign="top" width="30%">.h, .hxx, .hh, .HH, .cxx, .cpp,
+.cc, .CC
+
+<p><br></td></tr><tr align="left"><td valign="top" width="20%">Java </td><td valign="top" width="50%"><code>java-mode</code> or <code>jde-mode</code> (if you use JDEE)
+</td><td valign="top" width="30%">.java
+   <br></td></tr></table>
+
+   <p>Example: If you want files with extension &ldquo;.cpp&rdquo; being c++-parsed by
+semantic and ECB, your <code>auto-mode-alist</code> must contain an entry
+like:
+
+<pre class="example">   ("\\.cpp\\'" . c++-mode)
+</pre>
+   <p>After this ECB will correctly parse your &ldquo;.cpp&rdquo;-sources and display
+all the parsing information in the ECB-methods buffer.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> semantic supports some more &ldquo;languages&rdquo; like Phython,
+Makefiles and some more. But these are the most important ones.</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> Especially for C++ and C you can use any extension
+you want but these are the most common ones!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/General-synchronization-aspects.html b/site/ecb-2.40/html-help/General-synchronization-aspects.html
new file mode 100644
index 0000000..8820548
--- /dev/null
+++ b/site/ecb-2.40/html-help/General-synchronization-aspects.html
@@ -0,0 +1,113 @@
+<html lang="en">
+<head>
+<title>General synchronization aspects - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link rel="prev" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link rel="next" href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows" title="Synchronization of basic ECB-windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="General-synchronization-aspects"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows">Synchronization of basic ECB-windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.12.1 General synchronization aspects</h4>
+
+<p>For each separate ECB-window-synchronization (remember: One common for the basic
+ECB-windows, one for each add-on ECB-window) ECB offers the following
+option-triple (demonstrated for the basic ECB-windows):
+
+     <ul>
+<li><code>ecb-basic-buffer-sync</code>:
+
+     <p>Enables or disables the synchronization in general.
+
+     <p>If active then the synchronization for the related ECB-window-buffers/windows
+takes place whenever a buffer changes in an edit window or if another
+edit-window with another buffer will be selected, if deactivated then never. 
+But you can also set this option to a list of major-modes and then the sync. 
+will only be done if the major-mode of the current buffer does NOT belong to
+this list.
+
+     <p>But in every case the synchronization only takes place if the
+major-mode of the current-buffer in the current selected edit-window
+has a relation to files or directories. Examples for the former one
+are all programming-language-modes like <code>c++-mode</code> or
+<code>java-mode</code>, <code>Info-mode</code> too, an example for the latter one
+is <code>dired-mode</code>. For all major-modes related to
+non-file/directory-buffers like <code>help-mode</code>,
+<code>customize-mode</code> and others a synchronization will never be done!
+
+     <p>It's recommended to exclude at least <code>Info-mode</code> because it makes
+no sense to synchronize the ECB-windows after calling the Info help. 
+Per default also <code>dired-mode</code> is excluded but it can also making
+sense to synchronize the ECB-directories/sources windows with the
+current directory of the dired-buffer in the edit-window.
+
+     <li><code>ecb-basic-buffer-sync-delay</code>:
+
+     <p>This option takes only effect if the synchronization is switched on via
+<code>ecb-basic-buffer-sync</code> and determines when ECB synchronizes.
+
+     <p>This option sets the time in seconds (fractions allowed) Emacs must be idle
+before the related ECB-window(s) are synchronized. If nil then there is no
+delay, means synchronization takes place immediately. A small value of about
+0.25 seconds saves CPU resources and you get even though almost the same
+effect as if you set no delay.
+
+     <p>Per default ECB always synchronizes on idle-basis and it is strongly
+recommened not to change this (ie. not setting the delay-option to nil)
+because this can be very performance consuming (e.g. at least the check if a
+synchronization must be performed is done after <strong>every</strong> key- or
+mouse-button press!
+
+     <p>Some fraction of a second is probably always the best choice, because it does
+not cost cpu-power and nonetheless the synchronization takes place quite
+immediately. So in most cases there is no need to bother with this option,
+just use the default value.
+
+     <li><code>ecb-basic-buffer-sync-hook</code>:
+
+     <p>For each separate synchronization a hook variable is offered where you can
+hook in with some elisp code if you need some tasks performed afterwards the
+synchronization has been finished.
+
+     <p>In most cases no hook will be needed.
+
+   </ul>
+
+   <p>Analogous to the shown options for the basic ECB-windows each add-on
+ECB-window has its own separate triple of these options, named congruent to
+the name of the buffer-name of the add-on ECB-window (e.g. for the analyse
+ECB-window with the buffer-name hold in <code>ecb-analyse-buffer-name</code> these
+three options are named <code>ecb-analyse-buffer-sync</code>,
+<code>ecb-analyse-buffer-sync-delay</code> and <code>ecb-analyse-buffer-sync-hook</code>. 
+For some specialities see <a href="Add_002don-synchronization.html#Add_002don-synchronization">Add-on synchronization</a>.
+
+   <p><strong>Please note</strong>: With the command <code>ecb-window-sync</code> you can
+do a manual synchronization if the automatic one is switched off or
+if you just want to do this! See the documantation of this command.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Grepping-directories.html b/site/ecb-2.40/html-help/Grepping-directories.html
new file mode 100644
index 0000000..e17977d
--- /dev/null
+++ b/site/ecb-2.40/html-help/Grepping-directories.html
@@ -0,0 +1,59 @@
+<html lang="en">
+<head>
+<title>Grepping directories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Using-eshell.html#Using-eshell" title="Using eshell">
+<link rel="next" href="Working-with-JDEE.html#Working-with-JDEE" title="Working with JDEE">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Grepping-directories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Working-with-JDEE.html#Working-with-JDEE">Working with JDEE</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Using-eshell.html#Using-eshell">Using eshell</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.10 Grepping directories with ECB</h3>
+
+<p>ECB offers in the popup-menus in the directories- and
+sources-tree-buffer commands for easy (recursive) grepping the current
+directory under point (directory-buffer) rsp. the current-directory
+(sources-buffer). In every case just the function of the options
+<code>ecb-grep-function</code> rsp. <code>ecb-grep-find-function</code> is called
+and the <code>default-directory</code> is tempor. set to the chosen
+directory so the grep will performed in this directory regardless of
+the <code>default-directory</code> of current buffer in the edit-window.
+
+   <p>Other smart things beyond that are not done by ECB, see also
+<code>ecb-grep-function</code>!
+
+   <p>So, how to exclude some subdirectories or files from the grep?
+
+   <p>Basically this has to be done with the &ldquo;-prune&rdquo; option of the
+find-utility: If the standard-grep facility of Emacs is used then this
+is not easy but with the command <samp><span class="file">igrep.el</span></samp> there is a convenient
+way to exclude things like CVS- or RCS-directories from the find-call:
+See the variable <code>igrep-find-prune-clause</code> of the library
+<samp><span class="file">igrep.el</span></samp>.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Hide_002dshow.html b/site/ecb-2.40/html-help/Hide_002dshow.html
new file mode 100644
index 0000000..7caaf89
--- /dev/null
+++ b/site/ecb-2.40/html-help/Hide_002dshow.html
@@ -0,0 +1,71 @@
+<html lang="en">
+<head>
+<title>Hide-show - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Non_002dsemantic-sources.html#Non_002dsemantic-sources" title="Non-semantic sources">
+<link rel="next" href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB" title="Window-managers and ECB">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Hide-show"></a>
+<a name="Hide_002dshow"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.14 Using hide-show from the methods-buffer-menu</h3>
+
+<p>The popup-menu of the Methods-buffer offer two entries for either
+hiding or showing the block which is related to the selected tag
+(that tag for which the popup-menu was opened):
+
+     <ul>
+<li>&ldquo;Jump to tag and hide block&rdquo;:
+Jumps to the tag and calls <code>hs-hide-block</code> from the
+hideshow-library which is shipped with (X)Emacs. After that the block
+is hidden, i.e. only the header-line of that tag (method, variable
+etc.) is visible, the rest is hidden behind the &ldquo;...&rdquo;.
+
+     <li>&ldquo;Jump to tag and show block&rdquo;:
+Jumps to the tag and calls <code>hs-show-block</code>. This shows the related
+hidden block if the block was hidden via <code>hs-hide-block</code> or the
+menu-entry &ldquo;Jump to tag and hide block&rdquo; (s.a.). 
+</ul>
+
+   <p>For this feature the library <samp><span class="file">hideshow.el</span></samp> is used which should
+normally being included in the (X)Emacs-distribution. If this library
+is not loaded into Emacs, ECB does this automatically before the first
+call to one of these menu-entries.
+
+   <p>IMPORTANT: If in some <code>major-mode</code> hiding and showing does not
+work as you expect it to work then you must probably add an entry for
+this <code>major-mode</code> to the hideshow-variable
+<code>hs-special-modes-alist</code>. See the documentation of this variable
+for further details. One example of such a <code>major-mode</code> is
+<code>jde-mode</code> of the Java Development Environment JDEE; just add an
+entry for it like the already contained entries for <code>c++-mode</code> or
+<code>java-mode</code> and hiding and showing will work for you with JDEE
+too.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Hiding-the-ECB-windows.html b/site/ecb-2.40/html-help/Hiding-the-ECB-windows.html
new file mode 100644
index 0000000..5c8c7b6
--- /dev/null
+++ b/site/ecb-2.40/html-help/Hiding-the-ECB-windows.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<title>Hiding the ECB windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="next" href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows" title="Maximizing the ECB windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Hiding-the-ECB-windows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">Maximizing the ECB windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.9 Hiding/Showing the ECB windows</h3>
+
+<p><a name="index-Hide-windows-55"></a><a name="index-Show-windows-56"></a>With <code>ecb-toggle-ecb-windows</code>, <code>ecb-hide-ecb-windows</code> and
+<code>ecb-show-ecb-windows</code> you can hide/show all the ECB windows
+without changing the activation state of ECB and also without
+deactivating the advices for <code>delete-other-windows</code> and/or
+<code>delete-window</code>. This is most useful if you use a layout like
+&ldquo;top2&rdquo; (see <a href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>) or if you want to have maximum space
+for editing and you don't need the browsing windows all the time.
+
+   <p>The following sequence of hooks is evaluated during showing again the
+hidden ECB-windows:
+     <ol type=1 start=1>
+<li><code>ecb-show-ecb-windows-before-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;Redrawing the layout to show the hidden ECB-windows&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-show-ecb-windows-after-hook</code>
+        </ol>
+
+   <p>The following sequence of hooks is evaluated during hiding the
+ECB-windows:
+     <ol type=1 start=1>
+<li><code>ecb-hide-ecb-windows-before-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;Hiding the ECB-windows&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-hide-ecb-windows-after-hook</code>
+        </ol>
+
+   <p>If the special ECB-windows are hidden (e.g. by
+`ecb-toggle-ecb-windows') all adviced functions behave as their
+originals. So the frame can be used as if ECB would not be active but
+ECB IS still active in the &ldquo;background&rdquo; and all ECB-commands and all
+ECB-keybindings can be used. Of course some of them doesn't make much
+sense but nevertheless they can be called. Toggling the visibility of
+the ECB-windows preserves the splitting-state of the edit-area: If you
+hide the ECB-windows then the frame will be divided in the same
+window-layout the edit-area had before the hiding and if you show the
+ECB-windows again the edit-area will be divided into all the
+edit-windows the ECB-frame had before the showing.
+
+   <p>Therefore it should be enough to hide the ECB-windows to run other
+Emacs-applications which have their own window-layout-managing. There
+should be no conflicts. But nevertheless the most recommended method
+for running ECB and other applications (e.g. xrefactory, Gnus etc.) in
+the same frame is to use a window-manager like winring.el or
+escreen.el (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>).
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Identifying-backends.html b/site/ecb-2.40/html-help/Identifying-backends.html
new file mode 100644
index 0000000..198e232
--- /dev/null
+++ b/site/ecb-2.40/html-help/Identifying-backends.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<title>Identifying backends - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="next" href="Checking-the-state.html#Checking-the-state" title="Checking the state">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Identifying-backends"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Checking-the-state.html#Checking-the-state">Checking the state</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.1 How ECB identifies the VC-backend of a dir</h4>
+
+<p>ECB tries all functions added as identify-backend-funtions to the
+option <code>ecb-vc-supported-backends</code> until one of them returns not
+<code>nil</code> but a symbol which identifies the backend (e.g. 
+<code>CVS</code>). After this check ECB stores the result of this check
+(i.e. either the identified backend or the fact that the directory is
+not managed by a VC-system) for that directory in a special cache, so
+the identify-backend-process will be performed only once per
+directory. If for a directory a VC-backend could be identified ECB
+stores not only the backend itself for that directory but also the
+associated check-state-function defined in
+<code>ecb-vc-supported-backends</code> (see <a href="Checking-the-state.html#Checking-the-state">Checking the state</a>).
+
+   <p>You can add arbitrary functions to this options as long as they get one
+directory-argument and return either nil or a backend-symbol. Per default ECB
+offers the following functions to identify the VC-backend CVS, RCS, SCCS, Git,
+Monotone or Subversion<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>:
+
+     <dl>
+<dt><code>ecb-vc-dir-managed-by-CVS DIRECTORY</code><dd>Return <code>CVS</code> if DIRECTORY is managed by CVS. nil if not.
+
+     <br><dt><code>ecb-vc-dir-managed-by-RCS DIRECTORY</code><dd>Return <code>RCS</code> if DIRECTORY is managed by RCS. nil if not.
+
+     <br><dt><code>ecb-vc-dir-managed-by-SCCS DIRECTORY</code><dd>Return <code>SCCS</code> if DIRECTORY is managed by SCCS. nil if not.
+
+     <br><dt><code>ecb-vc-dir-managed-by-MTN DIRECTORY</code><dd>return <code>MTN</code> if directory is managed by Monotone. nil if not.
+
+     <br><dt><code>ecb-vc-dir-managed-by-GIT DIRECTORY</code><dd>Return <code>GIT</code> if directory is managed by Git. nil if not. 
+Because with Git only the top-most directory of a source-tree has a subdir
+.git this function tries recursively upwards if there is a .git-subdir.
+
+     <br><dt><code>ecb-vc-dir-managed-by-SVN DIRECTORY</code><dd>Return <code>SVN</code> if DIRECTORY is managed by Subversion. nil if not. 
+Returns always nil if the library vc-svn.el can not be found.
+
+   </dl>
+
+   <p>If ECB should support another VC-backend than CVS, RCS, SCCS, Monotone, Git or
+Subversion you have to write your own identify-backend-funtion for the used
+VC-backend (e.g. Clearcase)!
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> For this the most recent version of the VC-package
+(incl. the libraries vc-git.el, vc-mono.el and vc-svn.el) is needed - as
+contained in Emacs &gt;= 22 and XEmacs &gt;= 21.4.22</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Images-for-Methods_002dbuffer.html b/site/ecb-2.40/html-help/Images-for-Methods_002dbuffer.html
new file mode 100644
index 0000000..8f59299
--- /dev/null
+++ b/site/ecb-2.40/html-help/Images-for-Methods_002dbuffer.html
@@ -0,0 +1,45 @@
+<html lang="en">
+<head>
+<title>Images for Methods-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="prev" href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images" title="Tree-buffers with images">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Images-for-Methods-buffer"></a>
+<a name="Images-for-Methods_002dbuffer"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images">Tree-buffers with images</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>
+<hr>
+</div>
+
+<h5 class="subsubsection">4.1.2.4 Special images for the Methods-buffer</h5>
+
+<p>ECB can display all the semantic-tags in the Method-buffer with
+special icons for methods, variables and classes - each of them with a
+different icon dependend of the protection of the tag. This feature
+can be disabled/enabled via the option
+<code>ecb-display-image-icons-for-semantic-tags</code>. All the special
+images are located in that directory where the option
+<code>ecb-tree-image-icons-directories</code> point to for methods.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Incremental-search.html b/site/ecb-2.40/html-help/Incremental-search.html
new file mode 100644
index 0000000..aa109f7
--- /dev/null
+++ b/site/ecb-2.40/html-help/Incremental-search.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<title>Incremental search - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="prev" href="Navigation_002fSelection.html#Navigation_002fSelection" title="Navigation/Selection">
+<link rel="next" href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings" title="Personal tree-keybindings">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Incremental-search"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings">Personal tree-keybindings</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.2.2 Incremental search for a node in current tree-buffer</h4>
+
+<p><a name="index-Incremental-search-23"></a>Each display-able key (e.g. all keys normally bound to <code>self-insert-command</code>)
+is appended to the current search-pattern. The tree-buffer tries to jump to the
+first node which matching the current search-pattern either as substring or as
+prefix (see below). If no match is found then nothing is done. There are some
+special keys:
+
+     <ul>
+<li><kbd>backspace</kbd> and <kbd>delete</kbd>:
+Delete the last character from the search-pattern.
+
+     <li><kbd>home</kbd>:
+Delete the complete search-pattern
+
+     <li><kbd>end</kbd>:
+Expand either to a complete node if current search-pattern is already
+unique or expands to the greatest common substring or prefix of the
+nodes. If there are at least two nodes with the same greatest
+common-prefix than every hit of <kbd>end</kbd> jumps to the next node with this
+common prefix. 
+</ul>
+
+   <p>For better overlooking the current search-pattern is shown in the echo area. 
+After selecting a node with RET the search-pattern is cleared out. With
+<code>ecb-tree-incremental-search</code> you can specify if the current search-pattern
+must be a real prefix of the node (default) or if any substring is matched.
+
+   <p>For faster and easier finding the right node in a ecb-window the incremental
+search ignores the following non interesting stuff:
+
+     <ul>
+<li>any leading spaces
+<li>expand/collapse-buttons: [+] rsp. [-]
+<li>protection-signs (+, -, #) in the method-window if uml-notation is used
+<li>variables types or return-types in front of variable- or method-names. 
+<li>const specifier for variables
+</ul>
+
+   <p>This means: Just type in the prefix (rsp. a substring) of a class-,
+variable-, method-, directory- or filename and ECB will bring you as
+fast as possible to the node you want. Incremental node-search uses
+the value of <code>case-fold-search</code>.
+
+   <p>Tip: The <code>ecb-minor-mode</code> offers you in the <code>ecb-mode-map</code>
+(customizable via <code>ecb-key-map</code>) some keys for selecting every window
+of the ecb-frame. This makes window-selection a child“s play. For
+example you can jump into the method-window by hitting <kbd>C-c . gm</kbd>.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Install-and-first-steps.html b/site/ecb-2.40/html-help/Install-and-first-steps.html
new file mode 100644
index 0000000..cd465db
--- /dev/null
+++ b/site/ecb-2.40/html-help/Install-and-first-steps.html
@@ -0,0 +1,46 @@
+<html lang="en">
+<head>
+<title>Install and first steps - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="ecb.html#Top" title="Top">
+<link rel="next" href="Overview.html#Overview" title="Overview">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Install-and-first-steps"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Overview.html#Overview">Overview</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb.html#Top">Top</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">1 Installation and first steps of ECB</h2>
+
+<p>This chapter describes how to install ECB and setup (X)Emacs correctly
+and what are the first steps after activation of ECB.
+
+<ul class="menu">
+<li><a accesskey="1" href="Installation.html#Installation">Installation</a>:                 Installation of ECB
+<li><a accesskey="2" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>:             How to set up Emacs for file parsing with ECB
+<li><a accesskey="3" href="First-steps.html#First-steps">First steps</a>:                  First steps after activating ECB first time
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Installation.html b/site/ecb-2.40/html-help/Installation.html
new file mode 100644
index 0000000..50a70d2
--- /dev/null
+++ b/site/ecb-2.40/html-help/Installation.html
@@ -0,0 +1,46 @@
+<html lang="en">
+<head>
+<title>Installation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link rel="prev" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link rel="next" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Installation"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>
+<hr>
+</div>
+
+<h3 class="section">1.1 Installation of ECB</h3>
+
+<p>This section describes how to install ECB.
+
+<ul class="menu">
+<li><a accesskey="1" href="Requirements.html#Requirements">Requirements</a>:                 Requirements for ECB
+<li><a accesskey="2" href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage">ECB as XEmacs-package</a>:        Installation of ECB as a XEmacs-package
+<li><a accesskey="3" href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation">Standard ECB-Installation</a>:    Standard installation of ECB for (X)Emacs
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Integrating-speedbar.html b/site/ecb-2.40/html-help/Integrating-speedbar.html
new file mode 100644
index 0000000..9b05bc1
--- /dev/null
+++ b/site/ecb-2.40/html-help/Integrating-speedbar.html
@@ -0,0 +1,128 @@
+<html lang="en">
+<head>
+<title>Integrating speedbar - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Simulating-speedbar.html#Simulating-speedbar" title="Simulating speedbar">
+<link rel="next" href="Large-directories.html#Large-directories" title="Large directories">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Integrating-speedbar"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Large-directories.html#Large-directories">Large directories</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.5 Integrating speedbar in the ECB-frame</h3>
+
+<p>It is very easy to integrate speedbar into ECB. There are two
+different ways to do this:
+
+     <ol type=1 start=1>
+<li>You can either use speedbar in the directories-, sources- or
+methods-window of ECB instead of the built-in directory-, sources- or
+methods-browser of ECB. This can be done via the option
+<code>ecb-use-speedbar-instead-native-tree-buffer</code>.
+
+     <li>Or you can integrate an extra speedbar-window into a layout
+independent of the existence of a directory-, sources- or
+methods-window. For this you can either use the built-in layout
+&ldquo;left-dir-plus-speedbar&rdquo; or you have to create your own layout
+interactively with the command <code>ecb-create-new-layout</code>. This way
+is not described in more details because there is nothing more to
+describe - just create your layout.
+        </ol>
+
+   <p>In general integrating speedbar into the ECB-frame makes sense for
+people...
+
+     <ul>
+<li>...who like the speedbar way of handling directories and source-files
+but also like the ECB-way of displaying the buffer-contents (like
+methods and variables in a source-file). This people should use the
+option <code>ecb-use-speedbar-instead-native-tree-buffer</code> and set it
+to <code>dir</code>.
+
+     <li>...who like the speedbar way of browsing things like directories,
+files, file-contents etc. but who dislike the extra speedbar-frame. 
+</ul>
+
+   <p>Note: It is not necessary to integrate speedbar if you only want
+parsing sources not supported by semantic. From version 1.94 on ECB
+supports native parsing and displaying of such sources
+(see <a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>)!
+
+   <p>Regardless the group you belong, with the speedbar-integration feature
+of ECB you can combine both worlds, the speedbar- and the ECB-world:
+
+     <ol type=1 start=1>
+<li>Choose a layout which either contains a directories- or a
+sources-window but not both of them<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+     <p>Because speedbar has also display-modes for buffers and info-nodes and
+some other useful things (which can be changed by the speedbar-command
+<code>speedbar-change-initial-expansion-list</code> we recommend layouts
+like &ldquo;left15&rdquo; or &ldquo;leftright3&rdquo; for using with speedbar.
+
+     <li>Set the option
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> to not nil. After
+this the chosen window of ECB will contain a full featured speedbar
+(the only difference to standard speedbar is not residing in an extra
+frame).
+        </ol>
+
+   <p>Note: If you belong to the first group of people (s.a.) a similar
+effect and usability is available by setting
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> to nil and setting
+<code>ecb-show-sources-in-directories-buffer</code> to not nil, because this
+combination displays also directories and sources in one window.
+
+   <p>So with the option <code>ecb-use-speedbar-instead-native-tree-buffer</code>
+you have the choice which way of displaying and handling &ldquo;things&rdquo;
+(directories, sources, methods...) you want (the speedbar- or the
+ECB-way).
+
+   <p>During speedbar is running within ECB (i.e. 
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> is not nil) the
+speedbar-command <code>speedbar</code> is disabled and the speedbar-command
+<code>speedbar-get-focus</code> switches between the speedbar-window and the
+edit-window<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>.
+
+   <p><strong>IMPORTANT</strong>: ECB can only integrate speedbar-versions &gt;=
+0.14beta1! If you use lower versions of speedbar
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> has no effect.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Only one of them is
+needed if you use speedbar because speedbar displays directories and
+sources in one window. But if you like wasting space then you can also
+use a layout with both windows...</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> The standard behavior is switching between the
+speedbar-frame and the attached frame, but this make obviously no
+sense during running speedbar with ECB.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Interactive-ECB-commands.html b/site/ecb-2.40/html-help/Interactive-ECB-commands.html
new file mode 100644
index 0000000..5691721
--- /dev/null
+++ b/site/ecb-2.40/html-help/Interactive-ECB-commands.html
@@ -0,0 +1,859 @@
+<html lang="en">
+<head>
+<title>Interactive ECB commands - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Stealthy-background-tasks.html#Stealthy-background-tasks" title="Stealthy background tasks">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Interactive-ECB-commands"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.14 Interactive ECB commands</h3>
+
+<p class="noindent">ECB offers a lot of interactive commands. Some of these commands
+prompt the user in the minibuffer if called with a prefix argument.
+
+   <p>Example: If <code>ecb-clear-history</code> is called with a prefix argument
+then you will be prompted in the minibuffer with:
+
+<pre class="example">   Clear from history: [all, not-existing-buffers, existing-buffers]
+</pre>
+   <p>You can choose one of the options enclosed in brackets with
+TAB-completion; hitting RET direct after the prompt chooses auto. the
+first offered option (in the example above &ldquo;all&rdquo;).
+
+   <p><strong>Please note</strong>: The following interactive commands of ECB are
+listed without the prefix &ldquo;ecb-&rdquo; (e.g. the command
+<code>ecb-activate</code> is listed with name &ldquo;activate&rdquo;). This has been
+done for a better readable command index. See <a href="Command-Index.html#Command-Index">Command Index</a>.
+
+<div class="defun">
+&mdash; Command: <b>activate</b><var><a name="index-activate-57"></a></var><br>
+<blockquote><p>Activates ECB and creates the special buffers for the choosen layout. 
+For the layout see <code>ecb-layout-name</code>. This function always raises
+the ECB-frame if called from another frame. This is the same as
+calling <code>ecb-minor-mode</code> with a positive argument. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>add-all-buffers-to-history</b><var><a name="index-add_002dall_002dbuffers_002dto_002dhistory-58"></a></var><br>
+<blockquote><p>Add all current file-buffers to the history-buffer of ECB. 
+Dependend on the values of <code>ecb-history-make-buckets</code> and
+<code>ecb-history-sort-method</code> afterwards the history is bucketized or
+not and sorted either by name or by extension (if bucketized
+then the sorting is only within each bucket). If
+<code>ecb-history-sort-method</code> is nil the most recently used buffers
+are on the top of the history and the seldom used buffers at the
+bottom (again: when bucketized then this holds only within each
+bucket). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>analyse-buffer-sync</b><var><a name="index-analyse_002dbuffer_002dsync-59"></a></var><br>
+<blockquote><p>Synchronize the analyse buffer with the current buffer and point. This
+means in fact display the current analysis for current point. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>change-layout</b><var> &amp;optional preselect-type<a name="index-change_002dlayout-60"></a></var><br>
+<blockquote><p>Select a layout-name from all current available layouts
+(TAB-completion is offered) and change the layout to the selected
+layout-name. If optional argument PRESELECT-TYPE is not nil then you
+can preselect a layout-type \(TAB-completion is offered too) and then
+you will be asked only for layouts of that preselected type. Note:
+This function works by changing the option <code>ecb-layout-name</code> but
+only for current Emacs-session. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>clear-history</b><var><a name="index-clear_002dhistory-61"></a></var><br>
+<blockquote><p>Clears the history-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>customize</b><var><a name="index-customize-62"></a></var><br>
+<blockquote><p>Open a customize-buffer for all customize-groups of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>customize-most-important</b><var><a name="index-customize_002dmost_002dimportant-63"></a></var><br>
+<blockquote><p>Open a customize-buffer for the most important options of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>create-new-layout</b><var><a name="index-create_002dnew_002dlayout-64"></a></var><br>
+<blockquote><p>Start process for interactively creating a new ECB-layout
+(see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>cycle-maximized-ecb-buffers</b><var><a name="index-cycle_002dmaximized_002decb_002dbuffers-65"></a></var><br>
+<blockquote><p>Cycles through all ecb-buffers of current layout by maximizing exactly
+one of the ecb-windows after every cycle-step. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>cycle-through-compilation-buffers</b><var> &amp;optional choose-buffer<a name="index-cycle_002dthrough_002dcompilation_002dbuffers-66"></a></var><br>
+<blockquote><p>Cycle through all compilation buffers currently open and display them
+within the compilation window <code>ecb-compile-window</code>. If the
+currently opened buffer within the compilation window is not a
+compilation buffer, we jump to the first compilation buffer. If not we
+try to loop through all compilation buffers. If we hit the end we go
+back to the beginning.
+
+        <p>If <var>CHOOSE-BUFFER</var> is not <code>nil</code> then the user will be
+prompted for the compilation-buffer to switch to. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>deactivate</b><var><a name="index-deactivate-67"></a></var><br>
+<blockquote><p>Deactivates the ECB and kills all ECB buffers and windows. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>delete-new-layout</b><var><a name="index-delete_002dnew_002dlayout-68"></a></var><br>
+<blockquote><p>Select a layout-name for a layout created by
+<code>ecb-create-new-layout</code> and delete this layout. This means the
+layout-definition is removed from the file
+<code>ecb-create-layout-file</code> and the layout-function and associated
+aliases are unbound. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>display-news-for-upgrade</b><var> &amp;optional FULL-NEWS<a name="index-display_002dnews_002dfor_002dupgrade-69"></a></var><br>
+<blockquote><p>Display the most important NEWS after an ECB-upgrade. If you call this
+function but no ECB-upgrade has been performed before starting ECB
+then nothing is display unless <var>FULL-NEWS</var> is not nil.
+
+        <p>If <var>FULL-NEWS</var> is not nil then the NEWS-file is displayed in
+another window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>display-upgraded-options</b><var><a name="index-display_002dupgraded_002doptions-70"></a></var><br>
+<blockquote><p>Display a information-buffer which options have been upgraded or
+reset. Offers two buttons where the user can decide if the upgraded
+options should also being saved by ECB for future settings or if the
+buffer should be killed.
+
+        <p>If saving is possible this command display where the options would be
+saved. It is that file Emacs uses to save customize-settings. This
+file is &ldquo;computed&rdquo; from the settings in <code>custom-file</code> and
+<code>user-init-file</code> (see the documentation of these variables).
+
+        <p>ECB automatically makes a backup-file of that file which will be
+modified by storing the upgraded rsp. renamed ECB-options. This backup
+file gets a unique name by adding a suffix &ldquo;.before_ecb_&lt;version&gt;&rdquo;
+to the name of the modified file. If such a file already exists ECB
+adds a unique number to the end of the filename to make the filename
+unique. This is a safety mechanism if something fails during storing
+the upgraded options, so you never lose the contents of your
+customization-file! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>expand-methods-nodes</b><var> &amp;optional force-all<a name="index-expand_002dmethods_002dnodes-71"></a></var><br>
+<blockquote><p>Set the expand level of the nodes in the ECB-methods-buffer.
+
+        <p>This command asks in the minibuffer for an indentation level LEVEL. With this
+LEVEL you can precisely specify which level of nodes should be expanded. LEVEL
+means the indentation-level of the nodes.
+
+        <p>A LEVEL value X means that all nodes with an indentation-level &lt;= X are
+expanded and all other are collapsed. A negative LEVEL value means all visible
+nodes are collapsed.
+
+        <p>Nodes which are not indented have indentation-level 0!
+
+        <p>Which node-types are expanded (rsp. collapsed) by this command
+depends on the options <code>ecb-methods-nodes-expand-spec</code> and
+<code>ecb-methods-nodes-collapse-spec</code>! With optional argument
+<var>FORCE-ALL</var> all tags will be expanded/collapsed regardless of
+the values of these options.
+
+        <p>Examples:
+          <ul>
+<li>LEVEL = 0
+expands only nodes which have no indentation itself. 
+<li>LEVEL = 2
+expands nodes which are either not indented or indented indented once
+or twice
+<li>LEVEL ~ 10
+should normally expand all nodes expect there are nodes which are
+indented deeper than 10. 
+</ul>
+
+        <p>Note 1: This command switches off auto. expanding of the method-buffer
+if <code>ecb-expand-methods-switch-off-auto-expand</code> is not nil. But it
+can be switched on again quickly with
+<code>ecb-toggle-auto-expand-tag-tree</code> or <kbd>[C-c . a]</kbd>.
+
+        <p>Note 2: All this is only valid for file-types parsed by semantic. For
+other file types which are parsed by imenu or etags (see
+<code>ecb-process-non-semantic-files</code>) <var>FORCE-ALL</var> is always true! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>dump-semantic-toplevel</b><var><a name="index-dump_002dsemantic_002dtoplevel-72"></a></var><br>
+<blockquote><p>Dump the current semantic-tags in special buffer and display them. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>eshell-current-buffer-sync</b><var><a name="index-eshell_002dcurrent_002dbuffer_002dsync-73"></a></var><br>
+<blockquote><p>Synchronize the eshell with the directory of current source-buffer. 
+This is only done if the eshell is currently visible in the
+compile-window of ECB and if either this function is called
+interactively or <code>ecb-eshell-buffer-sync</code> is not nil. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>eshell-recenter</b><var><a name="index-eshell_002drecenter-74"></a></var><br>
+<blockquote><p>Recenter the eshell window so that the prompt is at the buffer-end. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>expand-directory-nodes</b><var><a name="index-expand_002ddirectory_002dnodes-75"></a></var><br>
+<blockquote><p>Set the expand level of the nodes in the ECB-directories-buffer. For
+argument LEVEL see <code>ecb-expand-methods-nodes</code>.
+
+        <p>Be aware that for deep structured paths and a lot of source-paths this
+command can last a long time - depending on machine- and
+disk-performance. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-analyse</b><var><a name="index-goto_002dwindow_002danalyse-76"></a></var><br>
+<blockquote><p>Make the ECB-analyse window the current window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-compilation</b><var><a name="index-goto_002dwindow_002dcompilation-77"></a></var><br>
+<blockquote><p>Goto the ecb compilation window <code>ecb-compile-window</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-directories</b><var><a name="index-goto_002dwindow_002ddirectories-78"></a></var><br>
+<blockquote><p>Make the ECB-directories window the current window. If
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> is <code>dir</code> then
+goto to the speedbar-window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-ecb-by-smart-selection</b><var><a name="index-goto_002dwindow_002decb_002dby_002dsmart_002dselection-79"></a></var><br>
+<blockquote><p>selects a special ecb-browsing-window by smart selection. The command offers a
+list of all special ecb-windows by buffer-name. Selecting the buffer-name will
+select the displaying window. Which special ecb-windows are offered depends on
+the currently selected window: If not a special ecb-window is the currently
+selected-window then all edit-windows are offered in canonical order (means
+from top-left to button-right). If an ecb-window is the currently
+selected-window then all other(!) special ecb-windows are offered, beginning
+with the next special ecb-window to the current ecb-window (the following
+special ecb-windows also in canonical order). If there is only one senseful
+destination-ecb-window then this window is immediately selected, without
+confirmation (e.g.: There are two special ecb-windows and point stays in one
+of them. Or there is only one ecb-window and point stays either in one of the
+edit-windows or in the compile-window).
+
+        <p>If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-edit-by-smart-selection</b><var><a name="index-goto_002dwindow_002dedit_002dby_002dsmart_002dselection-80"></a></var><br>
+<blockquote><p>Selects an edit-window by smart selection. The command offers a list of all
+edit-windows by buffer-name. Selecting the buffer-name will select the
+displaying window. Which edit-windows are offered depends on the currently
+selected window: If not an edit-window is the currently selected-window then
+all edit-windows are offered in canonical order (means from top-left to
+button-right). If an edit-window is the currently selected-window then all
+other(!) edit-windows are offered, beginning with the next edit-window to the
+current edit-window (the following edit-windows also in canonical order). If
+there is only one senseful destination-edit-window then this window is
+immediately selected, without confirmation (e.g.: There are two edit-windows
+and point stays in one of them. Or there is only one edit-window and point
+stays either in one of the special ecb-windows or in the compile-window).
+
+        <p>If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+destination-windows are displayed in the message-area and only hitting TAB
+offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all possible
+destinations are immediately shown in a completion-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-edit1</b><var><a name="index-goto_002dwindow_002dedit1-81"></a></var><br>
+<blockquote><p>Make the (first) edit-window window the current window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-edit2</b><var><a name="index-goto_002dwindow_002dedit2-82"></a></var><br>
+<blockquote><p>Make the second edit-window (if available) window the current window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-edit-last</b><var><a name="index-goto_002dwindow_002dedit_002dlast-83"></a></var><br>
+<blockquote><p>Make the last selected edit-window window the current window. This is
+the same as if <code>ecb-mouse-click-destination</code> is set to
+<code>last-point</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-history</b><var><a name="index-goto_002dwindow_002dhistory-84"></a></var><br>
+<blockquote><p>Make the ECB-history window the current window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-methods</b><var><a name="index-goto_002dwindow_002dmethods-85"></a></var><br>
+<blockquote><p>Make the ECB-methods window the current window. If
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> is <code>method</code>
+then goto to the speedbar-window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>goto-window-sources</b><var><a name="index-goto_002dwindow_002dsources-86"></a></var><br>
+<blockquote><p>Make the ECB-sources window the current window. If
+<code>ecb-use-speedbar-instead-native-tree-buffer</code> is <code>source</code>
+then goto to the speedbar-window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>history-filter</b><var><a name="index-history_002dfilter-87"></a></var><br>
+<blockquote><p>Apply a filter to the history-buffer to reduce the number of entries. 
+So you get a better overlooking. There are three choices:
+
+          <ul>
+<li>Filter by extension:
+Just insert the extension you want the History-buffer being filtered. 
+Insert the extension without leading dot!
+
+          <li>Filter by regexp:
+Insert the filter as regular expression.
+
+          <li>No filter:
+This means to display an entry for all currently living file-buffers. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>jde-display-class-at-point</b><var><a name="index-jde_002ddisplay_002dclass_002dat_002dpoint-88"></a></var><br>
+<blockquote><p>Display in the ECB-methods-buffer the contents (methods, attributes
+etc...) of the class which contains the definition of the &ldquo;thing&rdquo;
+under point (this can be a variable-name, class-name, method-name,
+attribute-name). This function needs the same requirements to work as
+the method-completion feature of JDEE (see
+<code>jde-complete</code>)!. The source-file is searched first in
+<code>jde-sourcepath</code>, then in <code>jde-global-classpath</code>, then in
+<var>$CLASSPATH</var>, then in current-directory.
+
+        <p>Works only for classes where the source-code (i.e. the *.java-file) is
+available. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-analyse</b><var><a name="index-maximize_002dwindow_002danalyse-89"></a></var><br>
+<blockquote><p>Maximize the ECB-analyse-window. I.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-analyse-window is not visible
+in current layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-directories</b><var><a name="index-maximize_002dwindow_002ddirectories-90"></a></var><br>
+<blockquote><p>Maximize the ECB-directories-window, i.e. delete all other
+ECB-windows, so only one ECB-window and the edit-window(s) are visible
+(and maybe a compile-window). Works also if the ECB-directories-window
+is not visible in current layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-sources</b><var><a name="index-maximize_002dwindow_002dsources-91"></a></var><br>
+<blockquote><p>Maximize the ECB-sources-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-sources-window is not visible
+in current layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-methods</b><var><a name="index-maximize_002dwindow_002dmethods-92"></a></var><br>
+<blockquote><p>Maximize the ECB-methods-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-methods-window is not visible
+in current layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-history</b><var><a name="index-maximize_002dwindow_002dhistory-93"></a></var><br>
+<blockquote><p>Maximize the ECB-history-window, i.e. delete all other ECB-windows, so
+only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Works also if the ECB-history-window is not visible
+in current layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>maximize-window-speedbar</b><var><a name="index-maximize_002dwindow_002dspeedbar-94"></a></var><br>
+<blockquote><p>Maximize the ECB-speedbar-window, i.e. delete all other ECB-windows,
+so only one ECB-window and the edit-window(s) are visible (and maybe a
+compile-window). Does nothing if the speedbar-window is not visible
+within the ECB-frame. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter</b><var><a name="index-methods_002dfilter-95"></a></var><br>
+<blockquote><p>Apply a filter to the Methods-buffer to reduce the number of entries. 
+So you get a better overlooking. There are six choices:
+
+          <ul>
+<li>Filter by protection:
+Just insert the protection you want the Methods-buffer being filtered:
+private, protected or public!
+
+          <li>Filter by regexp:
+Insert the filter as regular expression.
+
+          <li>Filter by tag-class:
+You can filter by the tag-classes of current major-mode. The available
+tag-classes come from the variable
+<code>semantic--symbol-&gt;name-assoc-list</code>. The are normally methods,
+variables etc.
+
+          <li>Filter by current type:
+In languages which have types like Java or C++ this filter displays
+only the current type and all its members (e.g. attributes and
+methods). If ECB can not identify the current type in the
+source-buffer or in the methods-window then nothing will be done.
+
+          <li>Filter by a filter-function:
+Such a function gets two arguments: a tag and the source-buffer of
+this tag. If the tag should be displayed (i.e. not being filtered out)
+then the function has to return not nil otherwise nil.
+
+          <li>No special filter:
+This means to display all tags specified with the option
+<code>ecb-show-tokens</code>. If currently some of the above filters are
+applied they will be all removed.
+
+          <li>Delete the last added:
+This removes only the topmost filter-layer, means that filter added
+last. 
+</ul>
+
+        <p>The protection-, current-type- and the tag-class-filter are only
+available for semantic-supported sources.
+
+        <p>Be aware that the tag-list specified by the option
+<code>ecb-show-tags</code> is the basis of all filters, i.e. tags which are
+excluded by that option will never be shown regardless of the filter
+type here!
+
+        <p>All tags which match the applied filter(s) will be displayed in the
+Methods-buffer.
+
+        <p>If called with a prefix-argument or when optional arg INVERSE is not
+nil then an inverse filter is applied to the Methods-buffer, i.e. all
+tags which do NOT match the choosen filter will be displayed in the
+Methods-buffer!
+
+        <p>Per default the choosen filter will be applied on top of already
+existing filters. This means that filters applied before are combined
+with the new filter. This behavior can changed via the option
+<code>ecb-methods-filter-replace-existing</code>. But regardless of the
+setting in <code>ecb-methods-filter-replace-existing</code> applying one of
+the not-inverse filters protection, tag-class or current-type always
+replaces exactly already existing filters of that type. On the other
+hand applying more than one inverse tag-class- or protection-filter
+can make sense.
+
+        <p>Such a filter is only applied to the current source-buffer, i.e. each
+source-buffer can have its own tag-filters.
+
+        <p>The current active filter will be displayed in the modeline of the
+Methods-buffer [regexp, prot (= protection), tag-class, function (=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is
+applied then always the top-most filter is displayed in the modeline
+but the fact of more than 1 filter is visualized by the number of the
+filters - included in parens. You can see all currently applied
+filters by moving the mouse over the filter-string in modeline of the
+Methods-buffer: They will displayed as help-echo.
+
+        <p>See the option <code>ecb-default-tag-filter</code> if you search for
+automatically applied default-tag-filters. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-current-type</b><var><a name="index-methods_002dfilter_002dcurrent_002dtype-96"></a></var><br>
+<blockquote><p>Display in the Methods-buffer only the current type and its members. 
+For further details see <code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-delete-last</b><var><a name="index-methods_002dfilter_002ddelete_002dlast-97"></a></var><br>
+<blockquote><p>Remove the most recent filter from the Methods-buffer. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-function</b><var> &amp;optional inverse<a name="index-methods_002dfilter_002dfunction-98"></a></var><br>
+<blockquote><p>Filter the methods-buffer by a function. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-nofilter</b><var><a name="index-methods_002dfilter_002dnofilter-99"></a></var><br>
+<blockquote><p>Remove any filter from the Methods-buffer. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-protection</b><var> &amp;optional inverse<a name="index-methods_002dfilter_002dprotection-100"></a></var><br>
+<blockquote><p>Filter the methods-buffer by protection. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-regexp</b><var> &amp;optional inverse<a name="index-methods_002dfilter_002dregexp-101"></a></var><br>
+<blockquote><p>Filter the methods-buffer by a regexp. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>methods-filter-tagclass</b><var> &amp;optional inverse<a name="index-methods_002dfilter_002dtagclass-102"></a></var><br>
+<blockquote><p>Filter the methods-buffer by tag-class. If INVERSE is not nil (called
+with a prefix arg) then an inverse filter is applied. For further details see
+<code>ecb-methods-filter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>minor-mode</b><var> &amp;optional arg<a name="index-minor_002dmode-103"></a></var><br>
+<blockquote><p>Toggle ECB minor mode. With prefix argument <var>ARG</var>, turn on if
+positive, otherwise off. Return non-<code>nil</code> if the minor mode is
+enabled. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>nav-goto-previous</b><var><a name="index-nav_002dgoto_002dprevious-104"></a></var><br>
+<blockquote><p>Go backward in the navigation history-list, see <a href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>nav-goto-next</b><var><a name="index-nav_002dgoto_002dnext-105"></a></var><br>
+<blockquote><p>Go forward in the navigation history-list, see <a href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>rebuild-methods-buffer</b><var><a name="index-rebuild_002dmethods_002dbuffer-106"></a></var><br>
+<blockquote><p>Updates the methods buffer with the current buffer after deleting the
+complete previous parser-information, means no semantic-cache is used! 
+Point must stay in an edit-window otherwise nothing is done. This
+method is merely needed for semantic parsed buffers if semantic parses
+not the whole buffer because it reaches a not parse-able code or for
+buffers not supported by semantic but by imenu or etags.
+
+        <p>Examples when a call to this function can be necessary:
+
+          <ul>
+<li>If an Elisp-file is parsed which contains in the middle a defun X
+where the closing ) is missing then semantic parses only until this
+defun X is reached and you will get an incomplete ECB-method buffer. 
+In such a case you must complete the defun X and then call this
+function to completely reparse the Elisp-file and rebuild the ECB
+method buffer!
+
+          <li>For not semantic supported buffers which can be parsed by imenu or
+etags (see <code>ecb-process-non-semantic-files</code>) because for these
+buffers there is no built-in auto-rebuild mechanism. For these buffers
+this command calls <code>ecb-rebuild-methods-buffer-for-non-semantic</code>. 
+</ul>
+
+        <p>For non-semantic-sources supported by etags the option
+<code>ecb-auto-save-before-etags-methods-rebuild</code> is checked before
+rescanning the source-buffer and rebuilding the methods-buffer.
+
+        <p>If point is in one of the ecb-windows or in the compile-window then
+this command rebuids the methods-buffer with the contents of the
+source-buffer the last selected edit-window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>redraw-layout</b><var> &amp;optional ARG<a name="index-redraw_002dlayout-107"></a></var><br>
+<blockquote><p>Redraw the ECB screen.
+
+        <p>Do not call this command from elisp-program but only interactively!
+
+        <p>Called without a prefix-argument the state of the ECB-frame-layout
+will preserved. This means:
+
+          <ul>
+<li>The state of compile-window (hidden or visible) will be preserved but
+if visible then the height will be as specified in
+<code>ecb-compile-window-height</code>.
+
+          <li>The state of the ECB-windows will be preserved (hidden or visible) but
+if visible then the sizes will be as specified in the layout (and with
+the options <code>ecb-windows-width</code> and <code>ecb-windows-height</code>) or
+as stored with <code>ecb-store-window-sizes</code>. 
+</ul>
+
+        <p>If called with ONE prefix-argument (<kbd>[C-u]</kbd>) then the layout will
+be drawn with all ECB-windows and also with a visible compile-window
+(when <code>ecb-compile-window-height</code> is not nil). The
+splitting-state of the edit-area will be preserved.
+
+        <p>If called with TWO prefix-arguments (i.e. hitting <kbd>[C-u]</kbd> twice:
+(<kbd>[C-u]</kbd> <kbd>[C-u]</kbd>) then an emergency-redraw will be performed. 
+This means the same as if called with one prefix-argument (s.a.) but
+the splitting-state of the edit-area will NOT be preserved but all
+edit-windows besides the current one will be deleted. Use this only if
+there are some anomalies after standard redraws!
+
+        <p>If the variable <code>ecb-redraw-layout-quickly</code> is not nil then the
+redraw is done by the <code>ecb-redraw-layout-quickly</code> function,
+otherwise by <code>ecb-redraw-layout-full</code>.
+
+        <p>Please not: It's strongly recommended to use the quick redraw only if
+you have really slow machines where a full redraw takes several
+seconds because the quick redraw is not really safe and has some
+annoying drawbacks! On normal machines the full redraw should be done
+in &lt;&lt; 1s so there should be no need for the quick version! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>restore-default-window-sizes</b><var><a name="index-restore_002ddefault_002dwindow_002dsizes-108"></a></var><br>
+<blockquote><p>Resets the sizes of the ECB windows to their default values. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>restore-window-sizes</b><var><a name="index-restore_002dwindow_002dsizes-109"></a></var><br>
+<blockquote><p>Sets the sizes of the ECB windows to their stored values. See option
+<code>ecb-layout-window-sizes</code> and command
+<code>ecb-store-window-sizes</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>select-ecb-frame</b><var><a name="index-select_002decb_002dframe-110"></a></var><br>
+<blockquote><p>Selects the <code>ecb-frame</code> if ECB is activated - otherwise reports
+an error. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>show-help</b><var> &amp;optional format<a name="index-show_002dhelp-111"></a></var><br>
+<blockquote><p>Shows the online help of ECB either in Info or in HTML format
+depending on the value of <code>ecb-show-help-format</code>. If called with
+prefix argument, i.e. if <var>FORMAT</var> is not nil then the user is
+prompted to choose the format of the help (Info or HTML). If an error
+about not finding the needed help-file occurs please take a look at
+the options <code>ecb-help-info-start-file</code> and
+<code>ecb-help-html-start-file</code>!
+
+        <p>Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>show-layout-help</b><var><a name="index-show_002dlayout_002dhelp-112"></a></var><br>
+<blockquote><p>Select a name of a layout and shows the documentation of the
+associated layout-function. At least for the built-in layouts the
+documentation contains a picture of the outline of the chosen layout. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>show-tip-of-the-day</b><var><a name="index-show_002dtip_002dof_002dthe_002dday-113"></a></var><br>
+<blockquote><p>Show tip of the day if <code>ecb-tip-of-the-day</code> is not nil or if
+called interactively. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>sources-filter</b><var><a name="index-sources_002dfilter-114"></a></var><br>
+<blockquote><p>Apply a filter to the sources-buffer to reduce the number of entries. 
+So you get a better overlooking. There are three choices:
+
+          <ul>
+<li>Filter by extension:
+Just insert the extension you want the Sources-buffer being filtered. 
+Insert the extension without leading dot!
+
+          <li>Filter by regexp:
+Insert the filter as regular expression.
+
+          <li>No filter:
+This means to display an entry for every file in the current selected
+directory (all except these filter already filtered out by
+<code>ecb-source-file-regexps</code> and
+<code>ecb-sources-exclude-cvsignore</code>). 
+</ul>
+
+        <p>Such a filter is only applied to the current selected directory, i.e. each
+directory has its own filtered sources-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>store-window-sizes</b><var> &amp;optional FIX<a name="index-store_002dwindow_002dsizes-115"></a></var><br>
+<blockquote><p>Stores the sizes of the ECB windows for the current layout. The size
+of the ECB windows will be set to their stored values when
+<code>ecb-redraw-layout</code> or <code>ecb-restore-window-sizes</code> is called. 
+To reset the window sizes to their default values call
+<code>ecb-restore-default-window-sizes</code>. Please read also the
+documentation of <code>ecb-layout-window-sizes</code>!
+
+        <p>The windows sizes are stored per default as fractions of current
+frame-width and -height of the ecb-frame, so the stored values will
+&ldquo;work&rdquo; for other frame sizes too. If a permanent compile-window is
+visible then ECB will tell you that window-sizes should be stored with
+hidden compile-window and ask you if you want proceed; if you proceed
+then the window-heights will be stored as fractions of current
+(frame-height minus current visible compile-window-height) so you
+should ensure that the current compile-window has its standard-height
+as specified in <code>ecb-compile-window-height</code>!. If <var>FIX</var> is not
+nil (means called with a prefix argument) then always the fixed values
+of current width and height are stored! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>submit-problem-report</b><var><a name="index-submit_002dproblem_002dreport-116"></a></var><br>
+<blockquote><p>Submit a problem report for the ECB to the ECB mailing-list. This
+command generates in the edit-window a problem-report which contains
+already the current values of all ECB options, the current
+backtrace-buffer if there is any and the current message-buffer. You
+will be asked for a problem-report subject and then you must insert a
+description of the problem. Please describe the problem as detailed as
+possible! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-auto-expand-tag-tree</b><var> &amp;optional arg<a name="index-toggle_002dauto_002dexpand_002dtag_002dtree-117"></a></var><br>
+<blockquote><p>Toggle auto expanding of the ECB-methods-buffer. With prefix argument
+<var>ARG</var>, make switch on if positive, otherwise switch off. If the
+effect is that auto-expanding is switched off then the current value
+of <code>ecb-auto-expand-tag-tree</code> is saved so it can be used for
+the next switch on by this command. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-compile-window</b><var> &amp;optional arg<a name="index-toggle_002dcompile_002dwindow-118"></a></var><br>
+<blockquote><p>Toggle the visibility of the compile-window of ECB. With prefix
+argument ARG, make visible if positive, otherwise invisible. The
+height of the compile-window is always the current value of
+<code>ecb-compile-window-height</code>! If called and
+<code>ecb-compile-window-height</code> is nil then ECB asks for the height
+of the compile-window, sets this height as new value of
+<code>ecb-compile-window-height</code> and displays the compile-window (so
+if you have called this command by mistake and you do not want a
+compile-window you have to quit with &lt;C-g&gt;). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-compile-window-height</b><var> &amp;optional arg<a name="index-toggle_002dcompile_002dwindow_002dheight-119"></a></var><br>
+<blockquote><p>Toggle whether the <code>ecb-compile-window</code> is enlarged or not. If
+<var>ARG</var> &gt; 0 then shrink or enlarge the the compile-window according
+to the value of <code>ecb-enlarged-compilation-window-max-height</code>. But
+never shrink below the value of <code>ecb-compile-window-height</code>. If
+<var>ARG</var> &lt;= 0 then shrink <code>ecb-compile-window</code> to
+<code>ecb-compile-window-height</code> and if <var>ARG</var> is nil then toggle
+the enlarge-state. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-ecb-windows</b><var> &amp;optional arg<a name="index-toggle_002decb_002dwindows-120"></a></var><br>
+<blockquote><p>Toggle visibility of the ECB-windows. With prefix argument <var>ARG</var>,
+make visible if positive, otherwise invisible. This has nothing to do
+with (de)activating ECB but only affects the visibility of the ECB
+windows. ECB minor mode remains active! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-layout</b><var> &amp;optional last-one<a name="index-toggle_002dlayout-121"></a></var><br>
+<blockquote><p>Toggles between the layouts defined in
+<code>ecb-toggle-layout-sequence</code> (See also option
+<code>ecb-show-sources-in-directories-buffer</code>). Note: This function
+works by changing the options <code>ecb-layout-name</code> but only for
+current Emacs-session.
+
+        <p>If optional argument <var>LAST-ONE</var> is not nil (e.g. called with a
+prefix-arg) then always the last selected layout was choosen
+regardless of the setting in <code>ecb-toggle-layout-sequence</code>. The
+last selected layout is always that layout which was current direct
+before the most recent layout-switch. So now a user can switch to
+another layout via `ecb-change-layout' and always come back to his
+previous layout via <kbd>[C-u]</kbd> <code>ecb-toggle-layout</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>toggle-scroll-other-window-scrolls-compile</b><var> &amp;optional ARG<a name="index-toggle_002dscroll_002dother_002dwindow_002dscrolls_002dcompile-122"></a></var><br>
+<blockquote><p>Toggle the state of
+<code>ecb-scroll-other-window-scrolls-compile-window</code>. With prefix
+argument <var>ARG</var>, set it to <code>t</code>, otherwise to <code>nil</code>. For
+all details about the scroll-behavior of <code>scroll-other-window</code>
+see the advice documentation of <code>other-window-for-scrolling</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>update-directories-buffer</b><var><a name="index-update_002ddirectories_002dbuffer-123"></a></var><br>
+<blockquote><p>Updates the ECB directories buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>upgrade-options</b><var><a name="index-upgrade_002doptions-124"></a></var><br>
+<blockquote><p>Check for all ECB-options if their current value is compatible to the
+defined type. If not upgrade it to the new type or reset it to the
+default-value of current ECB. Try also to upgrade renamed options. 
+Displays all upgraded or reset options with their old (before the
+upgrade/reset) and new values. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>window-sync</b><var><a name="index-window_002dsync-125"></a></var><br>
+<blockquote><p>ynchronizes all special ECB-buffers with current buffer. 
+Depending on the contents of current buffer this command performs different
+synchronizing tasks but only if ECB is active and point stays in an
+edit-window.
+
+          <ul>
+<li>If current buffer is a file-buffer (or an indirect-buffer with a file-buffer
+as base-buffer) then all basic ECB-windows (directories, sources, methods and
+history) are synchronized with current buffer.
+
+          <li>If current buffer is a dired-buffer then the directory- and
+the sources-tree-buffer are synchronized if visible
+</ul>
+
+        <p>In addition to this the hooks in <code>ecb-basic-buffer-sync-hook</code> run.
+
+        <p>If optional argument ONLY-BASIC-WINDOWS is not nil then only the basic
+tree-buffer directories, sources, methods and history are synchronized. 
+Otherwise all registered special ecb-buffers are synchronized too.
+
+        <p>See <a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>. 
+</p></blockquote></div>
+
+   <p>Most of these functions are also available via the menu &ldquo;ECB&rdquo; and
+also via the ECB key-map with prefix <kbd>C-c .</kbd> (see
+<code>ecb-minor-mode</code> for a complete list of the keybindings).
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Introduction.html b/site/ecb-2.40/html-help/Introduction.html
new file mode 100644
index 0000000..52c9256
--- /dev/null
+++ b/site/ecb-2.40/html-help/Introduction.html
@@ -0,0 +1,142 @@
+<html lang="en">
+<head>
+<title>Introduction - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="next" href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer" title="A new tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Introduction"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.1 General description of tree-buffers</h4>
+
+<p>This subchapter is a general introduction in the main concepts of a
+tree-buffer.
+
+<h5 class="subsubsection">11.3.1.1 What is a tree-buffer?</h5>
+
+<p>A <dfn>tree-buffer</dfn> is meant to display certain informations (e.g. a
+directory-tree) in a tree-structure consisting of <dfn>tree-nodes</dfn>. 
+Every line in a tree-buffer displays exactly one tree-node. Each node
+has exactly one parent-node and can have any arbitrary number of
+<dfn>children</dfn>-nodes. If a tree-node has no children then it is called
+a <dfn>leaf</dfn>. A tree-node contains several &ldquo;slots&rdquo; wheras the most
+important ones are the &ldquo;name&rdquo;, &ldquo;displayed-name&rdquo; and &ldquo;data&rdquo;. See
+<a href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a> for a detailed explanation.
+
+   <p>The difference between a natural tree like a fir and a tree-buffer is
+that the root(-node) of a tree-buffer is not visible but only its
+children. In the example below the nodes parent-node-1 and
+parent-node-2 are the children of the invisible root-node. Each
+tree-buffer has exactly one root-node which is created automatically
+by `tree-buffer-create'.
+
+   <p>If a tree-node contains at least one child it is displayed with a
+special expand/collapse-symbol (see the example below). This symbol
+allows expanding (rsp. collapsing) the tree-node wheras expanding
+means to display the children-nodes and collapsing means to hide the
+childrens of a tree-node.
+
+   <p>Here is an example of a tree-buffer:
+
+<pre class="example">   &lt;root-node&gt;  ------------------------[root-node (invisible)]
+       [+] &lt;parent-node-1&gt;  -------.
+       [-] &lt;parent-node-2&gt;  -------|
+           [-] &lt;expanded&gt;  --------|
+               &lt;leaf-node-1&gt;  -----|
+               &lt;leaf-node-2&gt;  -----|-----[tree-nodes]
+               &lt;leaf-node-3&gt;  -----|
+               &lt;leaf-node-4&gt;  -----|
+           [+] &lt;collapsed&gt;  -------“
+            |
+            `-----------------[expand/collapse-symbol]
+</pre>
+   <p>In most cases an action is triggered when clicking with the mouse onto
+a tree-node<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> (e.g. clicking onto
+&ldquo;leaf-node-1&rdquo; or &ldquo;parent-node-1&rdquo; in the example above). Which
+action is triggered by which key depends on what you specify at
+creation-time of the tree-buffer - see <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> for
+details.
+
+   <p>The creation-interface of a tree-buffer allows defining special
+popup-menus when clicking with the right mouse-button (of course also
+possible via keyboard, see <a href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>) onto a
+tree-node (e.g. some senseful actions possible for directory-nodes
+like grepping this directory or performing version-control actions for
+this directory or something else).
+
+<h5 class="subsubsection">11.3.1.2 General recipe for a tree-buffer</h5>
+
+<p>The following sequence of tasks is the general recipe for a
+tree-buffer beginning from creation and ending with the display.
+
+     <ol type=1 start=1>
+<li>Create the tree-buffer
+Creating a new tree-buffer has to be done with
+<code>tree-buffer-create</code> for non ECB-tree-buffers and with the macro
+<code>defecb-tree-buffer-creator</code> when the tree-buffer should be used
+as an ECB-tree-buffer, so it is an ECB-window. See <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> for all details.
+
+     <li>Add tree-nodes to the tree-buffer
+Adding nodes to the new tree-buffer (means make the new tree-buffer
+the current buffer and call <code>tree-node-new</code> for a new tree-node
+(note that a root-node for this tree-buffer has been autom. created by
+<code>tree-buffer-create</code>!). The first tree-node you add to a
+tree-buffer must have always the root-node (avaliable via
+<code>tree-buffer-get-root</code>) as parent-node. The next nodes can have
+either one of the fromerly added nodes or the root-node too. All
+tree-nodes haveing the root-node as parent will be displayed at the
+toplevel of the tree-buffer. See <a href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a> for all
+details.
+
+     <li>Display the tree-buffer with current nodes and state
+When you are finished building up the tree-node-structure call
+<code>tree-buffer-update</code> to display the current tree-structure (again
+after making the tree-buffer the current-buffer). See <a href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a> for all details.
+        </ol>
+
+   <p><strong>IMPORTANT</strong>: First a call of <code>tree-buffer-update</code> updates
+the <strong>display</strong> of a tree-buffer, means shows all the tree-nodes
+in an emacs-buffer! Neither creating a tree-buffer nor adding
+tree-nodes display anything; this just builds the internal
+tree-structure.
+
+   <p><strong>IMPORTANT</strong>: See <a href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a> for details
+about programming ECB-windows (special windows) regardless if they
+were build as tree or not. There you can find a.o. how to
+automatically synchronizing a special window with the current
+edit-buffer.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course using the keyboard is also possible,
+see <a href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Known-VC_002dproblems.html b/site/ecb-2.40/html-help/Known-VC_002dproblems.html
new file mode 100644
index 0000000..2338f7d
--- /dev/null
+++ b/site/ecb-2.40/html-help/Known-VC_002dproblems.html
@@ -0,0 +1,39 @@
+<html lang="en">
+<head>
+<title>Known VC-problems - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Adding-new-backends.html#Adding-new-backends" title="Adding new backends">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Known-VC-problems"></a>
+<a name="Known-VC_002dproblems"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Adding-new-backends.html#Adding-new-backends">Adding new backends</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.6 Currently known problems with the VC-support</h4>
+
+<p>There are no reported problems concerning the Version Control support of ECB.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Large-directories.html b/site/ecb-2.40/html-help/Large-directories.html
new file mode 100644
index 0000000..630837a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Large-directories.html
@@ -0,0 +1,84 @@
+<html lang="en">
+<head>
+<title>Large directories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Integrating-speedbar.html#Integrating-speedbar" title="Integrating speedbar">
+<link rel="next" href="Remote-directories.html#Remote-directories" title="Remote directories">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Large-directories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Remote-directories.html#Remote-directories">Remote directories</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.6 Working with large directories</h3>
+
+<p>If <code>ecb-source-path</code> contains directories with many files and
+subdirs, especially if these directories are mounted net-drives
+(&ldquo;many&rdquo; means here something &gt; 500, dependent on the speed of the
+net-connection and the machine), actualizing the sources- and/or
+directories- buffer of ECB (if displayed in current layout!) can slow
+down dramatically. If this is a problem the contents of certain
+directories and also the contents of the sources-buffer can be cached
+which increases the speed a lot. See the option
+<code>ecb-cache-directory-contents</code>.
+
+   <p>IMPORTANT: The full speed-advantage of this cache-mechanism is only
+available if <code>ecb-show-sources-in-directories-buffer</code> is
+<code>nil</code>, i.e. sources of a directory are displayed in the
+ECB-sources-window. The reason is that only with a sources window the
+tree-buffer contents for the sources can be cached (i.e. the
+buffer-content of the ECB-sources-window) whereas with sources
+displayed in the directories buffer only the disk-contents of a
+directory are cached - which increases speed too but not so much as
+with sources displayed in the extra window ECB-sources.
+
+   <p>The cache of a directory can be only refreshed by a POWER-click (with
+mouse or keyboard) onto the related directory-node in the
+directories-buffer of ECB (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>).
+
+   <p>See also the option <code>ecb-cache-directory-contents-not</code>. Here are
+some useful settings for both of these options:
+
+     <ul>
+<li>Cache all directories with more than 500 entries:
+Set <code>ecb-cache-directory-contents</code> to ((&ldquo;.*&rdquo; . 500)) and set
+<code>ecb-cache-directory-contents-not</code> to nil.
+
+     <li>Cache only all directories &gt; 200 beginning with /usr/
+Set <code>ecb-cache-directory-contents</code> to ((&ldquo;^/usr/.*&rdquo; . 200)) and
+set <code>ecb-cache-directory-contents-not</code> to nil.
+
+     <li>Cache all directories &gt; 500 but NOT these beginning with /usr/:
+Set <code>ecb-cache-directory-contents</code> to ((&ldquo;.*&rdquo; . 500)) and set
+<code>ecb-cache-directory-contents-not</code> to (&ldquo;^/usr/.*&rdquo;). 
+</ul>
+
+   <p>Another way for getting a faster overlook for large directories with
+many source-entries is to apply an online-filter to the
+sources-buffer. This can be done via the command
+<code>ecb-sources-filter</code> or via the popup-menu of the sources-buffer.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/List-of-hooks.html b/site/ecb-2.40/html-help/List-of-hooks.html
new file mode 100644
index 0000000..a0151d7
--- /dev/null
+++ b/site/ecb-2.40/html-help/List-of-hooks.html
@@ -0,0 +1,69 @@
+<html lang="en">
+<head>
+<title>List of hooks - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="prev" href="List-of-variables.html#List-of-variables" title="List of variables">
+<link rel="next" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="List-of-hooks"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="List-of-variables.html#List-of-variables">List of variables</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>
+<hr>
+</div>
+
+<h3 class="section">11.2 Available hooks of ECB</h3>
+
+<p>The following hooks are available:
+
+   <p><a name="index-Hooks-356"></a>
+     <ul>
+<li><code>ecb-activate-before-new-frame-created-hook</code>
+<li><code>ecb-activate-before-layout-draw-hook</code>
+<li><code>ecb-activate-hook</code>
+<li><code>ecb-after-directory-change-hook</code>
+<li><code>ecb-before-activate-hook</code>
+<li><code>ecb-before-deactivate-hook</code>
+<li><code>ecb-common-tree-buffer-after-create-hook</code>
+<li><code>ecb-basic-buffer-sync-hook</code>
+<li><code>ecb-analyse-buffer-sync-hook</code>
+<li><code>ecb-symboldef-buffer-sync-hook</code>
+<li><code>ecb-speedbar-buffer-sync-hook</code>
+<li><code>ecb-eshell-buffer-sync-hook</code>
+<li><code>ecb-deactivate-hook</code>
+<li><code>ecb-directories-buffer-after-create-hook</code>
+<li><code>ecb-hide-ecb-windows-after-hook</code>
+<li><code>ecb-hide-ecb-windows-before-hook</code>
+<li><code>ecb-history-buffer-after-create-hook</code>
+<li><code>ecb-methods-buffer-after-create-hook</code>
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li><code>ecb-show-ecb-windows-after-hook</code>
+<li><code>ecb-show-ecb-windows-before-hook</code>
+<li><code>ecb-sources-buffer-after-create-hook</code>
+</ul>
+
+   <p>Look at the documentation of these hooks to get a detailed description.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/List-of-variables.html b/site/ecb-2.40/html-help/List-of-variables.html
new file mode 100644
index 0000000..ac92df1
--- /dev/null
+++ b/site/ecb-2.40/html-help/List-of-variables.html
@@ -0,0 +1,47 @@
+<html lang="en">
+<head>
+<title>List of variables - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="prev" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="next" href="List-of-hooks.html#List-of-hooks" title="List of hooks">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="List-of-variables"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="List-of-hooks.html#List-of-hooks">List of hooks</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>
+<hr>
+</div>
+
+<h3 class="section">11.1 Variables for Elisp-programs</h3>
+
+<p>Variables an Elisp-program can use beyond those ones mentioned in
+<a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>:
+
+     <ul>
+<li><code>ecb-source-path-functions</code>
+</ul>
+
+   <p>Look at the documentation of these variables to get a description.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Manual-usage.html b/site/ecb-2.40/html-help/Manual-usage.html
new file mode 100644
index 0000000..52377d9
--- /dev/null
+++ b/site/ecb-2.40/html-help/Manual-usage.html
@@ -0,0 +1,94 @@
+<html lang="en">
+<head>
+<title>Manual usage - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Overview.html#Overview" title="Overview">
+<link rel="next" href="ECB_002dwindows.html#ECB_002dwindows" title="ECB-windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Manual-usage"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Overview.html#Overview">Overview</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">3 How to use this manual</h2>
+
+<p><strong>IMPORTANT</strong>: You should have read the chapter <a href="Overview.html#Overview">Overview</a>
+before going on reading the current chapter.
+
+   <p>This chapter describes shortly the contents of the following chapters
+of this manual so maybe you can find faster what you are searching
+for.
+
+     <dl>
+<dt>All ECB-windows of ECB (see <a href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>)<dd>Gives an introduction into the concept of ECB-windows of ECB, what
+they are, which different types exist, how they look, how they can be
+used and last but not least what they do in detail, i.e. explains
+every ECB-window of ECB in detail.
+
+     <br><dt>Activation and Deactivation (see <a href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>)<dd>Describes how to activate and deactivate ECB and which different types
+of activation are possible.
+
+     <br><dt>Usage of ECB (see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>)<dd>Describes in detail how to use ECB with mouse and keyboard, explains
+the concept of the edit-area and the persistent compile-window,
+describe how to change the window-layout and hide and show special
+windows, which stealthy background-tasks ECB performs and so on...
+
+     <br><dt>Customizing ECB (see <a href="Customizing.html#Customizing">Customizing</a>)<dd>Gives an overview of the most important options of ECB and tell you
+something about do's and don'ts concerning customization of ECB. Lists
+all options of ECB and describe exactly the purpose of them.
+
+     <br><dt>Submitting a problem report (see <a href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>)<dd>Instructions what to do if you encounters problems with ECB.
+
+     <br><dt>Upgrading and downloading ECB (see <a href="Upgrading.html#Upgrading">Upgrading</a>)<dd>Gives an introduction into the automatic option-upgrading-feature of
+ECB and you can download and install a newer ECB-version from within
+ECB.
+
+     <br><dt>Common use-cases (see <a href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>)<dd>How to deal with special situations and circumstances, so e.g. working
+with big and small screens, working with large directories, using the
+builtin version-control-support of ECB, parsing non-semantic-supported
+sources like perl, using hide-show, working best with eshell and JDEE
+and some window-managers of Emacs (like escreen or winring) and many
+more...
+
+     <br><dt>Entry points for Elisp programmers (see <a href="Elisp-programming.html#Elisp-programming">Elisp programming</a>)<dd>All informations needed by programmers when using some ECB-concepts
+from within other elisp-libraries. This includes a full description
+how to use the ECB-independent library tree-buffer.el. Lists also all
+available hooks and describes with full working example how to program
+own layouts.
+
+     <br><dt>Conflicts and bugs of ECB (see <a href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>)<dd>Lists all currently known bugs and problems and gives well working
+work-arounds.
+
+     <br><dt>Frequently asked Questions (see <a href="FAQ.html#FAQ">FAQ</a>)<dd>Take a look...
+
+     <br><dt>Command Index (see <a href="Command-Index.html#Command-Index">Command Index</a>)<dd>List of all interactive commands of ECB
+
+     <br><dt>Option Index (see <a href="Option-Index.html#Option-Index">Option Index</a>)<dd>List of all user-customizable options of ECB
+
+     <br><dt>Concept Index (see <a href="Concept-Index.html#Concept-Index">Concept Index</a>)<dd>List of all concepts introduced by ECB
+
+   </dl>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Maximizing-the-ECB-windows.html b/site/ecb-2.40/html-help/Maximizing-the-ECB-windows.html
new file mode 100644
index 0000000..3ccc378
--- /dev/null
+++ b/site/ecb-2.40/html-help/Maximizing-the-ECB-windows.html
@@ -0,0 +1,127 @@
+<html lang="en">
+<head>
+<title>Maximizing the ECB windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows" title="Hiding the ECB windows">
+<link rel="next" href="Back_002fforward-navigation.html#Back_002fforward-navigation" title="Back/forward navigation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Maximizing-the-ECB-windows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.10 Maximizing the ECB windows</h3>
+
+<h4 class="subsection">6.10.1 How to maximize and minimize special ecb-tree-windows</h4>
+
+<p>To get a better overlook about the contents of a certain ECB-window
+every ECB-window can be &ldquo;maximized&rdquo;, means all other ECB-windows are
+deleted so only the edit-window(s) and this maximized ECB-window are
+visible (and maybe a compile-window if active). There are several ways
+to do this:
+
+     <ul>
+<li>Via the node-popup-menus of the ECB-windows
+
+     <li>Via the main &ldquo;ECB&rdquo;-menu and here &ldquo;Display window maximized&rdquo;
+
+     <li>Via calling the adviced version of
+<code>delete-other-windows</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> (bound to <kbd>C-x 1</kbd>) in one of
+the ECB windows.
+
+     <li>Via one of the commands <code>ecb-maximize-window-directories</code>,
+<code>ecb-maximize-window-sources</code>, <code>ecb-maximize-window-methods</code>,
+<code>ecb-maximize-window-history</code> or
+<code>ecb-maximize-window-speedbar</code> or the bound short-cuts for those
+commands.
+
+     <li>Via the new command <code>ecb-cycle-maximized-ecb-buffers</code> which
+cycles through all ecb-buffers of current layout by maximizing exactly
+one of the ecb-windows after every cycle-step.
+
+     <li>Via the option <code>ecb-maximize-ecb-window-after-selection</code> and then
+just by selecting an ECB-window. &ldquo;Deselecting&rdquo; an ECB-window brings
+back all ECB-windows of current layout.
+
+     <li>Via the default modeline-mechanisms for deleting other windows. GNU
+Emacs binds <kbd>mouse-2</kbd> in its modeline to
+<code>delete-other-window</code>. XEmacs binds a popup-menu with some window
+commands to <kbd>button-3</kbd> in its modeline.
+
+     <p>ECB combines the best of both worlds by supporting both of these
+mechanisms for both Xemacs and Emacs: ECB binds a toggle-command to
+<kbd>mouse-2</kbd> in the modeline of each tree-buffer which maximizes the
+current tree-window if all ECB-windows are visible and displays all
+ECB-windows if current tree-window is maximized. In addition ECB binds
+a popup-menu to <kbd>mouse-3</kbd> which offers exactly 2 commands:
+Maximizing current tree-window and displaying all ECB-windows. 
+</ul>
+
+   <p>&ldquo;Minimizing&rdquo; such a maximized ECB-window, i.e. bringing back to its
+original size and displays all ecb-windows of current layout, can
+simply be done by redrawing the layout via the command
+<code>ecb-redraw-layout</code> (bound to <kbd>C-c . lr</kbd>).
+
+<h4 class="subsection">6.10.2 Selecting a node in a maximized ecb-tree-window</h4>
+
+<p>When you select a node (either via mouse or RET) in a maximized
+tree-window the default behavior of ECB is the following:
+
+   <p>Maximized directories-window: When selecting a directory then first
+automatically the maximized directories-window will be &ldquo;minimized&rdquo;
+(i.e. all ecb-windows of current layout are displayed) if the current
+layout contains a sources-buffer and no sources are shown in the
+directories-window - see <code>ecb-show-sources-in-directories-buffer</code>. 
+So the source-files can be displayed in the sources-window.
+
+   <p>Maximized sources- or history-window: When selecting a source-file in
+one of these buffers then first automatically the maximized window
+will be &ldquo;minimized&rdquo; (i.e. all ecb-windows of current layout are
+displayed) if the current layout contains a methods-buffer. So the
+tag-contents of the selected source-file can be displayed in the
+methods-window.
+
+   <p>For a even smarter behavior ECB offers the option
+<code>ecb-maximize-next-after-maximized-select</code> which automatically
+maximizes the next logical tree-window after a node selection. The
+definition of &ldquo;next logical is&rdquo;: Directories &ndash;&gt; sources,
+sources/history &ndash;&gt; methods. But if the current maximized tree-buffer
+is also contained in the option
+<code>ecb-tree-do-not-leave-window-after-select</code> (see also the
+tree-buffer-command <code>ecb-toggle-do-not-leave-window-after-select</code>
+which is bound to &lt;C-t&gt; in each tree-buffer) then ECB does *not*
+maximize the next logical tree-window but point stays in the currently
+maximized tree-buffer so for example the user can select more than one
+source-file from the sources-buffer.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> This command is adviced per
+default, see <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Most-important-options.html b/site/ecb-2.40/html-help/Most-important-options.html
new file mode 100644
index 0000000..1568c6a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Most-important-options.html
@@ -0,0 +1,73 @@
+<html lang="en">
+<head>
+<title>Most important options - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizing.html#Customizing" title="Customizing">
+<link rel="prev" href="General-aspects.html#General-aspects" title="General aspects">
+<link rel="next" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Most-important-options"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Customizable-options.html#Customizable-options">Customizable options</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="General-aspects.html#General-aspects">General aspects</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizing.html#Customizing">Customizing</a>
+<hr>
+</div>
+
+<h3 class="section">7.2 The most important options of ECB</h3>
+
+<p>Here are the most important options (it is recommended to check at
+least the following options before working with ECB). You can
+customize them via the customize-group &ldquo;ecb-most-important&rdquo; or via
+the command <code>ecb-customize-most-important</code>.
+
+     <dl>
+<dt><code>ecb-source-path</code><dd>Where ECB can find your sources. You must set this option! 
+<br><dt><code>ecb-show-help-format</code><dd>Should the online help of ECB be displayed in the standard Info format
+or in HTML format in a web-browser. 
+<br><dt><code>ecb-auto-activate</code><br><dt><code>ecb-major-modes-show-or-hide</code><dd>Auto. activation of ECB after start (see <a href="Automatic-activation.html#Automatic-activation">Automatic activation</a>) or
+major-mode-based showing or hiding the ecb-windows. 
+<br><dt><code>ecb-winman-escreen-number</code><dt><code>ecb-winman-winring-name</code><dd>Support of several window-managers (see <a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>). 
+<br><dt><code>ecb-key-map</code><dd>All ECB-keybindings incl. a common prefix-key (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>). 
+<br><dt><code>ecb-new-ecb-frame</code><dd>Should ECB create a new frame at activation time. 
+<br><dt><code>ecb-primary-secondary-mouse-buttons</code><dt><code>ecb-mouse-click-destination</code><dd>Define how to use the mouse (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>). 
+<br><dt><code>ecb-tree-buffer-style</code><dt><code>ecb-tree-expand-symbol-before</code><dt><code>ecb-tree-indent</code><dt><code>ecb-truncate-lines</code><dd>The look&amp;feel of the trees in the tree-buffers. The former option
+defines the general style of the tree-buffers and the latter ones
+allow to customize the ascii-style tree-buffers (maybe you like a
+value of 4 for the latter one if you display the expand-symbol before
+(see <a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>). 
+<br><dt><code>ecb-source-file-regexps</code><dd>Which files will (not) be shown in ECB. 
+<br><dt><code>ecb-layout-name</code><dt><code>ecb-compile-window-height</code><dt><code>ecb-compile-window-width</code><dt><code>ecb-other-window-behavior</code><dd>The ECB layout, means which windows you want to be displayed in the
+ECB-frame and also the location of these windows (see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>). 
+<br><dt><code>ecb-compilation-buffer-names</code><dd>Which buffers should be treaten as &ldquo;compilation-buffers&rdquo; and
+therefore displayed in the compile-window of ECB - if there is any. 
+<br><dt><code>ecb-tag-display-function</code><dt><code>ecb-type-tag-display</code><dt><code>ecb-type-tag-expansion</code><dt><code>ecb-show-tags</code><dd>How to display the entries in the ECB-method window for semantic
+supported sources (see <a href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>). These options
+take only effect for semantic-sources (see <a href="Definition-of-semantic_002d-and-non_002dsemantic_002dsources.html#Definition-of-semantic_002d-and-non_002dsemantic_002dsources">Definition of semantic- and non-semantic-sources</a>). 
+<br><dt><code>ecb-process-non-semantic-files</code><dd>Displaying file-contents for not by semantic supported files too, e.g. 
+for LaTeX- and perl-sources (see <a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>). 
+</dl>
+
+   <p>But to make ECB working best for you it is also recommended to have a
+look at <a href="Customizable-options.html#Customizable-options">Customizable options</a>!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Navigation_002fSelection.html b/site/ecb-2.40/html-help/Navigation_002fSelection.html
new file mode 100644
index 0000000..571ec68
--- /dev/null
+++ b/site/ecb-2.40/html-help/Navigation_002fSelection.html
@@ -0,0 +1,84 @@
+<html lang="en">
+<head>
+<title>Navigation/Selection - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="prev" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="next" href="Incremental-search.html#Incremental-search" title="Incremental search">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Navigation%2fSelection"></a>
+<a name="Navigation_002fSelection"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Incremental-search.html#Incremental-search">Incremental search</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.2.1 Navigation and Selection in a tree-buffer</h4>
+
+<p><a name="index-RETURN-key-19"></a><a name="index-TAB-key-20"></a><a name="index-expanding-21"></a><a name="index-collapsing-22"></a>In the ECB-buffers RETURN and TAB are the most important keys:
+
+     <ul>
+<li>RETURN does the same as the primary button and C-RETURN does the same
+as the secondary button. S-RETURN is the same as the SHIFT-click or
+POWER-click. The terms &ldquo;primary&rdquo;, &ldquo;secondary&rdquo;, &ldquo;SHIFT-&rdquo; and
+&ldquo;POWER-click&rdquo; are explained in <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>. See also the
+option <code>ecb-tree-do-not-leave-window-after-select</code> and the
+function <code>ecb-toggle-do-not-leave-window-after-select</code> which is
+bound to <kbd>C-t</kbd> in each tree-buffer of ECB!
+
+     <p>For all RETURN (and S-RETURN and C-RETURN) hits the position of the
+point within the current node-line is irrelevant! This is for
+conveniance.
+
+     <li>TAB always expands or collapses expandable nodes. 
+</ul>
+
+   <p>The RETURN and TAB keys can not be (re)defined with <code>ecb-key-map</code>!
+
+   <p>If you set <code>ecb-tree-navigation-by-arrow</code> to not nil then the
+arrow keys work in the ECB tree-window in the following smart way:
+
+     <ul>
+<li>Left-arrow: If node is expanded then it will be collapsed otherwise
+(i.e. current node is either not expandable or not expanded) point
+jumps to the next &ldquo;higher&rdquo; node in the hierarchical tree (higher
+means the next higher level or - if no higher level available
+- the next higher node on the same level).
+
+     <li>Right-arrow: If node is expandable but not expanded then it will be
+expanded. Otherwise (i.e. current node is either not expandable or
+already expanded) point jumps to the next following node (which is the
+first subnode in case of an already expanded node or simply the next
+node in the following line).
+
+     <li>Up- and down-arrow: Point jumps to the first character of the previous
+(up) rsp. next node (down). &ldquo;First&rdquo; character means either the first
+character of the expand-symbol (in case
+<code>ecb-tree-expand-symbol-before</code> is not nil) or of the displayed
+node-name. Or with other words: The first non-indentation and
+non-guide-line (see <code>ecb-tree-buffer-style</code>) character of a node
+(see <a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>). 
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Non_002dsemantic-files.html b/site/ecb-2.40/html-help/Non_002dsemantic-files.html
new file mode 100644
index 0000000..6838964
--- /dev/null
+++ b/site/ecb-2.40/html-help/Non_002dsemantic-files.html
@@ -0,0 +1,59 @@
+<html lang="en">
+<head>
+<title>Non-semantic files - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link rel="prev" href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic" title="Setting up CEDET/semantic">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Non-semantic-files"></a>
+<a name="Non_002dsemantic-files"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.2.3 Setup for file types not supported by semantic</h4>
+
+<p>From version 1.94 on ECB supports also parsing and displaying
+file-contents for file-types not supported by semantic (i.e. there is
+no semantic-grammar available for such file-types).
+
+   <p>Such non-semantic file-types can often be parsed by imenu and/or
+etags. Both of these parsing methods are now supported: ECB can
+display the results of imenu and/or etags in its Method-buffer. ECB
+uses for this speedbar-logic. Therefore the following speedbar options
+takes effect for this feature:
+
+     <ul>
+<li><code>speedbar-dynamic-tags-function-list</code>
+<li><code>speedbar-tag-split-minimum-length</code>
+<li><code>speedbar-tag-regroup-maximum-length</code>
+<li><code>speedbar-tag-hierarchy-method</code>
+</ul>
+
+   <p>Normally there should be no need for you to bother with these options,
+because the default values are suitable for most situations! But if
+you are not satisfied with the parsing/display results then you can
+change some of these options.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Non_002dsemantic-sources.html b/site/ecb-2.40/html-help/Non_002dsemantic-sources.html
new file mode 100644
index 0000000..5c2c6f4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Non_002dsemantic-sources.html
@@ -0,0 +1,171 @@
+<html lang="en">
+<head>
+<title>Non-semantic sources - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand" title="Compile-window on demand">
+<link rel="next" href="Hide_002dshow.html#Hide_002dshow" title="Hide-show">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Non-semantic-sources"></a>
+<a name="Non_002dsemantic-sources"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Hide_002dshow.html#Hide_002dshow">Hide-show</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand">Compile-window on demand</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.13 Parsing and displaying non-semantic sources</h3>
+
+<p>ECB is mostly designed to display parsing information for files
+supported by semantic. But beginning with version 1.94 it also
+supports other parsing engines like imenu and etags, so also files not
+supported by semantic but by imenu/etags can be displayed in the
+Method-buffer of ECB. See <a href="Definition-of-semantic_002d-and-non_002dsemantic_002dsources.html#Definition-of-semantic_002d-and-non_002dsemantic_002dsources">Definition of semantic- and non-semantic-sources</a> for a description of &ldquo;semantic-sources&rdquo; and
+&ldquo;non-semantic-sources&rdquo;.
+
+   <p>If support of non-semantic-sources is enabled then ECB will display
+the contents of all sources which can be displayed by speedbar too. 
+This comes from the fact that ECB uses speedbar-logic to parse sources
+with imenu or etags.
+
+   <p>In most cases imenu-parsing is preferable over etags-parsing because
+imenu operates on Emacs-buffers and needs no external tool and
+therefore parsing works also if current contents of a buffer are not
+saved to disk.
+
+   <p>This section describes all important aspects about parsing and
+displaying file-contents of file-types not supported by semantic but
+by imenu and/or etags.
+
+<h4 class="subsection">10.13.1 Enabling parsing and displaying of non-semantic-sources</h4>
+
+<p>Enabling is simply done with the option <code>ecb-process-non-semantic-files</code>.
+
+   <p>ECB offers an option <code>ecb-non-semantic-parsing-function</code> to
+specify on a major-mode basis which parsing-method should be used:
+imenu or etags. Normally there should be no need to change this option
+but read the documentation of this option (see <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a>)
+for further details.
+
+   <p>IMPORTANT:
+
+     <ul>
+<li>If imenu-parsing should be used then the option
+<code>speedbar-use-imenu-flag</code> must be set to not <code>nil</code>!
+
+     <li>If some non-semantic-sources are not parsed (i.e. there is an empty
+Methods-buffer) and you think that they should then maybe they are neither
+supported by imenu nor by etags or you have to check the options
+<code>ecb-non-semantic-parsing-function</code> and
+<code>speedbar-dynamic-tags-function-list</code> and - especially for etags -
+<code>speedbar-fetch-etags-parse-list</code>, <code>speedbar-fetch-etags-arguments</code>
+and <code>speedbar-fetch-etags-command</code>.
+
+     <li>Even with support for semantic-, imenu- and etags-parsing there will
+remain some file-types rsp. <code>major-modes</code> which are not
+parse-able, neither by semantic, imenu nor etags. This is no problem
+because these files simply have an empty Methods-buffer. But
+nevertheless you will get a message &ldquo;Sorry, no support for a file of
+that extension&rdquo; which comes from the speedbar-library and can not
+switched off. Therefore if a <code>major-mode</code> is known as not
+parse-able by semantic, imenu or etags it can be added to the option
+<code>ecb-non-semantic-exclude-modes</code> and then it will be excluded
+from being tried to parsed and this (annoying) message will not occur. 
+</ul>
+
+<h4 class="subsection">10.13.2 Automatic rescanning/reparsing of non-semantic-sources</h4>
+
+<p>In contrast to semantic (see <code>global-semantic-auto-parse-mode</code>)
+there is no built-in mechanism for autom. reparsing
+non-semantic-sources and then updating the contents of the
+Methods-buffer.
+
+   <p>For non-semantic-sources you have always at least to call
+<code>ecb-rebuild-methods-buffer</code> (bound to <kbd>C-c . r</kbd>) or saving
+the source-file (if <code>ecb-auto-update-methods-after-save</code> is true)
+to update the Method-buffer<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+   <p>Depending on the parsing-mechanism the following options have to be
+switched on so ECB can rebuild the methods-buffer for
+non-semantic-sources:
+
+     <ul>
+<li>imenu:
+
+     <p>The imenu-option <code>imenu-auto-rescan</code> must be enabled and
+<code>imenu-auto-rescan-maxout</code> has to be set big enough to auto-parse
+big files too! But this results not directly in an autom. updated
+Method-buffer. This is first done after calling the command
+<code>ecb-rebuild-methods-buffer</code> or saving the source-file (if
+<code>ecb-auto-update-methods-after-save</code> is true).
+
+     <li>etags:
+
+     <p>Only if <code>ecb-auto-save-before-etags-methods-rebuild</code> is switched on
+the command <code>ecb-rebuild-methods-buffer</code> rebuilds the
+method-buffer with current source-contents. See description of this
+option for an explanation. 
+</ul>
+
+   <p>Tip: If you want to program your own real. automatic
+rescan/reparse/rebuild mechanism for non-semantic-sources you can do:
+
+   <p>Adding to <code>after-change-functions</code> a function F which either runs
+itself <code>ecb-rebuild-methods-buffer-for-non-semantic</code> or which
+adds only another function FF to an idle-timer and the function FF
+runs <code>ecb-rebuild-methods-buffer-for-non-semantic</code>. The latter
+approach has the advantage that the reparse/rebuild is not performed
+immediately after every change but first after Emacs is idle for a
+senseful interval (e.g. 4 seconds) after last change. Of course the
+function FF has to cancel its own idle-timer at the end, so the next
+idle-timer is first started again after the next change (i.e. by
+function F which is still contained in <code>after-change-functions</code>.
+
+<h4 class="subsection">10.13.3 Customizing the display of the tags</h4>
+
+<p>For non-semantic-sources ECB uses does no special organizing of tags
+in groups and sub-tags but it completely uses the tag-hierarchy the
+imenu- and etags-parsers of speedbar return. So the displayed tag
+hierarchy can only be customized with some options speedbar offers for
+this:
+
+   <p><code>speedbar-tag-hierarchy-method</code>,
+<code>speedbar-tag-group-name-minimum-length</code>,
+<code>speedbar-tag-split-minimum-length</code> and
+<code>speedbar-tag-regroup-maximum-length</code>. See the speedbar
+documentation for details about these options.
+
+   <p>With the option <code>ecb-method-non-semantic-face</code> you can define the
+face used for displaying the tags in the Method-buffer for
+non-semantic-sources.
+
+   <p><code>ecb-non-semantic-methods-initial-expand</code> can be useful too.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Maybe future versions of ECB (&gt;
+1.94) will offer an autom. mechanism for this.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Option-Index.html b/site/ecb-2.40/html-help/Option-Index.html
new file mode 100644
index 0000000..1c5d8e4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Option-Index.html
@@ -0,0 +1,264 @@
+<html lang="en">
+<head>
+<title>Option Index - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Command-Index.html#Command-Index" title="Command Index">
+<link rel="next" href="Concept-Index.html#Concept-Index" title="Concept Index">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Option-Index"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Concept-Index.html#Concept-Index">Concept Index</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Command-Index.html#Command-Index">Command Index</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="unnumbered">Option Index</h2>
+
+<p class="noindent">This index contains all customizable options of ECB.
+
+   <p><strong>Please note</strong>: All options in this index are listed without the
+prefix &ldquo;ecb-&rdquo; (e.g. the option <code>ecb-layout-name</code> is listed with
+name &ldquo;layout-name&rdquo;).
+
+
+
+<ul class="index-vr" compact>
+<li><a href="ecb_002dgeneral.html#index-activate_002dbefore_002dlayout_002ddraw_002dhook-126"><code>activate-before-layout-draw-hook</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dlayout.html#index-activate_002dbefore_002dnew_002dframe_002dcreated_002dhook-260"><code>activate-before-new-frame-created-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-activate_002dhook-127"><code>activate-hook</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-activation_002dselects_002decb_002dframe_002dif_002dalready_002dactive-128"><code>activation-selects-ecb-frame-if-already-active</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002ddirectories.html#index-add_002dpath_002dfor_002dnot_002dmatching_002dfiles-168"><code>add-path-for-not-matching-files</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dlayout.html#index-advice_002dwindow_002dfunctions_002dsignal_002derror-261"><code>advice-window-functions-signal-error</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002ddirectories.html#index-after_002ddirectory_002dchange_002dhook-170"><code>after-directory-change-hook</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbucket_002delement_002dface-246"><code>analyse-bucket-element-face</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbucket_002dnode_002dface-247"><code>analyse-bucket-node-face</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbuffer_002dafter_002dcreate_002dhook-248"><code>analyse-buffer-after-create-hook</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbuffer_002dname-249"><code>analyse-buffer-name</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbuffer_002dsync-250"><code>analyse-buffer-sync</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbuffer_002dsync_002ddelay-251"><code>analyse-buffer-sync-delay</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dbuffer_002dsync_002dhook-252"><code>analyse-buffer-sync-hook</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dcollapsed_002dbuckets-253"><code>analyse-collapsed-buckets</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dface-254"><code>analyse-face</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dfontified_002dbuckets-255"><code>analyse-fontified-buckets</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dgen_002dtag_002dinfo_002dfn-256"><code>analyse-gen-tag-info-fn</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dgeneral_002dface-257"><code>analyse-general-face</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dshow_002dnode_002dinfo-258"><code>analyse-show-node-info</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002danalyse.html#index-analyse_002dshow_002dtag_002dinfo_002dfn-259"><code>analyse-show-tag-info-fn</code></a>: <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a></li>
+<li><a href="ecb_002dgeneral.html#index-auto_002dactivate-129"><code>auto-activate</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-auto_002dcompatibility_002dcheck-130"><code>auto-compatibility-check</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002ddirectories.html#index-auto_002dexpand_002ddirectory_002dtree-169"><code>auto-expand-directory-tree</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dmethods.html#index-auto_002dexpand_002dtag_002dtree-203"><code>auto-expand-tag-tree</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-auto_002dexpand_002dtag_002dtree_002dcollapse_002dother-204"><code>auto-expand-tag-tree-collapse-other</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-auto_002dsave_002dbefore_002detags_002dmethods_002drebuild-328"><code>auto-save-before-etags-methods-rebuild</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dmethods.html#index-auto_002dupdate_002dmethods_002dafter_002dsave-205"><code>auto-update-methods-after-save</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-basic_002dbuffer_002dsync-148"><code>basic-buffer-sync</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-basic_002dbuffer_002dsync_002ddelay-149"><code>basic-buffer-sync-delay</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-basic_002dbuffer_002dsync_002dhook-150"><code>basic-buffer-sync-hook</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dgeneral.html#index-before_002dactivate_002dhook-131"><code>before-activate-hook</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-before_002ddeactivate_002dhook-132"><code>before-deactivate-hook</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-bucket_002dnode_002ddisplay-133"><code>bucket-node-display</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-bucket_002dnode_002ddisplay-151"><code>bucket-node-display</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002ddirectories.html#index-cache_002ddirectory_002dcontents-171"><code>cache-directory-contents</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-cache_002ddirectory_002dcontents_002dnot-172"><code>cache-directory-contents-not</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dcompilation.html#index-change_002dlayout_002dpreserves_002dcompwin_002dstate-294"><code>change-layout-preserves-compwin-state</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dgeneral.html#index-clear_002dcaches_002dbefore_002dactivate-134"><code>clear-caches-before-activate</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-common_002dtree_002dbuffer_002dafter_002dcreate_002dhook-152"><code>common-tree-buffer-after-create-hook</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dcompilation.html#index-compilation_002dbuffer_002dnames-287"><code>compilation-buffer-names</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compilation_002dmajor_002dmodes-288"><code>compilation-major-modes</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compilation_002dpredicates-289"><code>compilation-predicates</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compile_002dwindow_002dheight-290"><code>compile-window-height</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compile_002dwindow_002dprevent_002dshrink_002dbelow_002dheight-291"><code>compile-window-prevent-shrink-below-height</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compile_002dwindow_002dtemporally_002denlarge-292"><code>compile-window-temporally-enlarge</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcompilation.html#index-compile_002dwindow_002dwidth-293"><code>compile-window-width</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dcreate_002dlayout.html#index-create_002dlayout_002dfile-297"><code>create-layout-file</code></a>: <a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-deactivate_002dhook-135"><code>deactivate-hook</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-debug_002dmode-136"><code>debug-mode</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dmethods.html#index-default_002dtag_002dfilter-206"><code>default-tag-filter</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dbuffer_002dafter_002dcreate_002dhook-173"><code>directories-buffer-after-create-hook</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dbuffer_002dname-174"><code>directories-buffer-name</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-directories_002dgeneral_002dface-300"><code>directories-general-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dmenu_002dsorter-175"><code>directories-menu-sorter</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dmenu_002duser_002dextension-176"><code>directories-menu-user-extension</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dmenu_002duser_002dextension_002dfunction-177"><code>directories-menu-user-extension-function</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-directories_002dshow_002dnode_002dinfo-178"><code>directories-show-node-info</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-directory_002dface-301"><code>directory-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-directory_002dnot_002daccessible_002dface-302"><code>directory-not-accessible-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dmethods.html#index-disable_002dsemantic_002dthreshold_002dalist-207"><code>disable-semantic-threshold-alist</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002ddirectories.html#index-display_002ddefault_002ddir_002dafter_002dstart-179"><code>display-default-dir-after-start</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dmethods.html#index-display_002dimage_002dicons_002dfor_002dsemantic_002dtags-208"><code>display-image-icons-for-semantic-tags</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dcreate_002dlayout.html#index-ecb_002dcreate_002dlayout_002dframe_002dheight-298"><code>ecb-create-layout-frame-height</code></a>: <a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a></li>
+<li><a href="ecb_002dcreate_002dlayout.html#index-ecb_002dcreate_002dlayout_002dframe_002dwidth-299"><code>ecb-create-layout-frame-width</code></a>: <a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a></li>
+<li><a href="ecb_002dcompilation.html#index-enlarged_002dcompilation_002dwindow_002dmax_002dheight-295"><code>enlarged-compilation-window-max-height</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002deshell.html#index-eshell_002dauto_002dactivate-319"><code>eshell-auto-activate</code></a>: <a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a></li>
+<li><a href="ecb_002deshell.html#index-eshell_002dbuffer_002dsync-320"><code>eshell-buffer-sync</code></a>: <a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a></li>
+<li><a href="ecb_002deshell.html#index-eshell_002dbuffer_002dsync_002ddelay-321"><code>eshell-buffer-sync-delay</code></a>: <a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a></li>
+<li><a href="ecb_002deshell.html#index-eshell_002denlarge_002dwhen_002deshell-322"><code>eshell-enlarge-when-eshell</code></a>: <a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a></li>
+<li><a href="ecb_002deshell.html#index-eshell_002dfit_002dwindow_002dto_002dcommand_002doutput-323"><code>eshell-fit-window-to-command-output</code></a>: <a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a></li>
+<li><a href="ecb_002dmethods.html#index-exclude_002dparents_002dregexp-209"><code>exclude-parents-regexp</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002ddirectories.html#index-excluded_002ddirectories_002dregexps-180"><code>excluded-directories-regexps</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dmethods.html#index-expand_002dmethods_002dswitch_002doff_002dauto_002dexpand-210"><code>expand-methods-switch-off-auto-expand</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-find_002dexternal_002dtag_002dfunctions-211"><code>find-external-tag-functions</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dlayout.html#index-fix_002dwindow_002dsize-262"><code>fix-window-size</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dmethods.html#index-font_002dlock_002dtags-212"><code>font-lock-tags</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dgeneral.html#index-grep_002dfunction-137"><code>grep-function</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-grep_002drecursive_002dfunction-138"><code>grep-recursive-function</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dhelp.html#index-help_002dhtml_002dpath-316"><code>help-html-path</code></a>: <a href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a></li>
+<li><a href="ecb_002dhelp.html#index-help_002dinfo_002dpath-317"><code>help-info-path</code></a>: <a href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a></li>
+<li><a href="ecb_002dlayout.html#index-hide_002decb_002dwindows_002dafter_002dhook-263"><code>hide-ecb-windows-after-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-hide_002decb_002dwindows_002dbefore_002dhook-264"><code>hide-ecb-windows-before-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dmethods.html#index-highlight_002dtag_002dwith_002dpoint-213"><code>highlight-tag-with-point</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-highlight_002dtag_002dwith_002dpoint_002ddelay-214"><code>highlight-tag-with-point-delay</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-history_002dbucket_002dnode_002dface-303"><code>history-bucket-node-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dbuffer_002dafter_002dcreate_002dhook-233"><code>history-buffer-after-create-hook</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dbuffer_002dname-234"><code>history-buffer-name</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-history_002ddead_002dbuffer_002dface-304"><code>history-dead-buffer-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dexclude_002dfile_002dregexps-235"><code>history-exclude-file-regexps</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-history_002dface-305"><code>history-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-history_002dgeneral_002dface-306"><code>history-general-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-history_002dindirect_002dbuffer_002dface-307"><code>history-indirect-buffer-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002ditem_002dname-236"><code>history-item-name</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dmake_002dbuckets-237"><code>history-make-buckets</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dmenu_002dsorter-238"><code>history-menu-sorter</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dmenu_002duser_002dextension-239"><code>history-menu-user-extension</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dmenu_002duser_002dextension_002dfunction-240"><code>history-menu-user-extension-function</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dshow_002dnode_002dinfo-241"><code>history-show-node-info</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dsort_002dignore_002dcase-242"><code>history-sort-ignore-case</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dsort_002dmethod-243"><code>history-sort-method</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dhistory.html#index-history_002dstick_002dindirect_002dbuffers_002dto_002dbasebuffer-244"><code>history-stick-indirect-buffers-to-basebuffer</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002ddirectories.html#index-host_002daccessible_002dcheck_002dvalid_002dtime-182"><code>host-accessible-check-valid-time</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dlayout.html#index-ignore_002ddisplay_002dbuffer_002dfunction-265"><code>ignore-display-buffer-function</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-ignore_002dpop_002dup_002dframes-266"><code>ignore-pop-up-frames</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-ignore_002dspecial_002ddisplay-267"><code>ignore-special-display</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-key_002dmap-139"><code>key-map</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dhistory.html#index-kill_002dbuffer_002dclears_002dhistory-245"><code>kill-buffer-clears-history</code></a>: <a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a></li>
+<li><a href="ecb_002dlayout.html#index-layout_002dalways_002doperate_002din_002dedit_002dwindow-268"><code>layout-always-operate-in-edit-window</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-layout_002ddebug_002dmode-269"><code>layout-debug-mode</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-layout_002dname-270"><code>layout-name</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-layout_002dwindow_002dsizes-271"><code>layout-window-sizes</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-major_002dmodes_002dshow_002dor_002dhide-140"><code>major-modes-show-or-hide</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dlayout.html#index-maximize_002decb_002dwindow_002dafter_002dselection-272"><code>maximize-ecb-window-after-selection</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-maximize_002dnext_002dafter_002dmaximized_002dselect-274"><code>maximize-next-after-maximized-select</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-method_002dface-308"><code>method-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-method_002dnon_002dsemantic_002dface-309"><code>method-non-semantic-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dbuffer_002dafter_002dcreate_002dhook-215"><code>methods-buffer-after-create-hook</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dbuffer_002dname-216"><code>methods-buffer-name</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dfilter_002dreplace_002dexisting-217"><code>methods-filter-replace-existing</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-methods_002dgeneral_002dface-310"><code>methods-general-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dmenu_002dsorter-218"><code>methods-menu-sorter</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dmenu_002duser_002dextension-219"><code>methods-menu-user-extension</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dmenu_002duser_002dextension_002dfunction-220"><code>methods-menu-user-extension-function</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dnodes_002dcollapse_002dspec-221"><code>methods-nodes-collapse-spec</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dnodes_002dexpand_002dspec-222"><code>methods-nodes-expand-spec</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dseparate_002dprototypes-223"><code>methods-separate-prototypes</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-methods_002dshow_002dnode_002dinfo-224"><code>methods-show-node-info</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dgeneral.html#index-minor_002dmode_002dtext-141"><code>minor-mode-text</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002ddata-336"><code>mode-line-data</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002ddata_002dface-337"><code>mode-line-data-face</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002ddisplay_002dwindow_002dnumber-338"><code>mode-line-display-window-number</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002dprefix_002dface-340"><code>mode-line-prefix-face</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002dprefixes-339"><code>mode-line-prefixes</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dmode_002dline.html#index-mode_002dline_002dwin_002dnr_002dface-341"><code>mode-line-win-nr-face</code></a>: <a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-mouse_002dclick_002ddestination-153"><code>mouse-click-destination</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dlayout.html#index-new_002decb_002dframe-275"><code>new-ecb-frame</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-non_002dsemantic_002dexclude_002dmodes-329"><code>non-semantic-exclude-modes</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-non_002dsemantic_002dmethods_002dinitial_002dexpand-330"><code>non-semantic-methods-initial-expand</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-non_002dsemantic_002dparsing_002dfunction-331"><code>non-semantic-parsing-function</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dlayout.html#index-other_002dwindow_002dbehavior-276"><code>other-window-behavior</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002ddirectories.html#index-ping_002doptions-183"><code>ping-options</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-ping_002dprogram-184"><code>ping-program</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dmethods.html#index-post_002dprocess_002dsemantic_002dtaglist-225"><code>post-process-semantic-taglist</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002ddirectories.html#index-prescan_002ddirectories_002dexclude_002dregexps-185"><code>prescan-directories-exclude-regexps</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002ddirectories.html#index-prescan_002ddirectories_002dfor_002demptyness-181"><code>prescan-directories-for-emptyness</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-primary_002dsecondary_002dmouse_002dbuttons-154"><code>primary-secondary-mouse-buttons</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-process_002dnon_002dsemantic_002dfiles-332"><code>process-non-semantic-files</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dsources.html#index-read_002donly_002dcheck_002dexclude_002dregexps-190"><code>read-only-check-exclude-regexps</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dnon_002dsemantic.html#index-rebuild_002dnon_002dsemantic_002dmethods_002dbefore_002dhook-333"><code>rebuild-non-semantic-methods-before-hook</code></a>: <a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a></li>
+<li><a href="ecb_002dlayout.html#index-redraw_002dlayout_002dafter_002dhook-277"><code>redraw-layout-after-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-redraw_002dlayout_002dbefore_002dhook-278"><code>redraw-layout-before-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-redraw_002dlayout_002dquickly-279"><code>redraw-layout-quickly</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-run_002dediff_002din_002decb_002dframe-142"><code>run-ediff-in-ecb-frame</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dcompilation.html#index-scroll_002dother_002dwindow_002dscrolls_002dcompile_002dwindow-296"><code>scroll-other-window-scrolls-compile-window</code></a>: <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a></li>
+<li><a href="ecb_002dlayout.html#index-select_002dedit_002dwindow_002don_002dredraw-280"><code>select-edit-window-on-redraw</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-show_002decb_002dwindows_002dafter_002dhook-281"><code>show-ecb-windows-after-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-show_002decb_002dwindows_002dbefore_002dhook-282"><code>show-ecb-windows-before-hook</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dhelp.html#index-show_002dhelp_002dformat-318"><code>show-help-format</code></a>: <a href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a></li>
+<li><a href="ecb_002dmethods.html#index-show_002donly_002dpositioned_002dtags-226"><code>show-only-positioned-tags</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dsources.html#index-show_002dsource_002dfile_002dextension-191"><code>show-source-file-extension</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002ddirectories.html#index-show_002dsources_002din_002ddirectories_002dbuffer-186"><code>show-sources-in-directories-buffer</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dmethods.html#index-show_002dtags-227"><code>show-tags</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-source_002dface-311"><code>source-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dsources.html#index-source_002dfile_002dregexps-192"><code>source-file-regexps</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-source_002din_002ddirectories_002dbuffer_002dface-312"><code>source-in-directories-buffer-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002ddirectories.html#index-source_002dpath-187"><code>source-path</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-source_002dread_002donly_002dface-314"><code>source-read-only-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dbuffer_002dafter_002dcreate_002dhook-193"><code>sources-buffer-after-create-hook</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dbuffer_002dname-194"><code>sources-buffer-name</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dexclude_002dcvsignore-195"><code>sources-exclude-cvsignore</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-sources_002dgeneral_002dface-313"><code>sources-general-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dmenu_002dsorter-196"><code>sources-menu-sorter</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dmenu_002duser_002dextension-197"><code>sources-menu-user-extension</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dmenu_002duser_002dextension_002dfunction-198"><code>sources-menu-user-extension-function</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dperform_002dread_002donly_002dcheck-199"><code>sources-perform-read-only-check</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dshow_002dnode_002dinfo-200"><code>sources-show-node-info</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dsort_002dignore_002dcase-201"><code>sources-sort-ignore-case</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dsources.html#index-sources_002dsort_002dmethod-202"><code>sources-sort-method</code></a>: <a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a></li>
+<li><a href="ecb_002dspeedbar.html#index-speedbar_002dbefore_002dactivate_002dhook-324"><code>speedbar-before-activate-hook</code></a>: <a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a></li>
+<li><a href="ecb_002dspeedbar.html#index-speedbar_002dbuffer_002dsync-325"><code>speedbar-buffer-sync</code></a>: <a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a></li>
+<li><a href="ecb_002dspeedbar.html#index-speedbar_002dbuffer_002dsync_002ddelay-326"><code>speedbar-buffer-sync-delay</code></a>: <a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a></li>
+<li><a href="ecb_002dspeedbar.html#index-speedbar_002dbuffer_002dsync_002dhook-327"><code>speedbar-buffer-sync-hook</code></a>: <a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a></li>
+<li><a href="ecb_002dlayout.html#index-split_002dedit_002dwindow_002dafter_002dstart-283"><code>split-edit-window-after-start</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dgeneral.html#index-stealthy_002dtasks_002ddelay-143"><code>stealthy-tasks-delay</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dmethods.html#index-tag_002ddisplay_002dfunction-228"><code>tag-display-function</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dface_002doptions.html#index-tag_002dheader_002dface-315"><code>tag-header-face</code></a>: <a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a></li>
+<li><a href="ecb_002dmethods.html#index-tag_002djump_002dsets_002dmark-229"><code>tag-jump-sets-mark</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-tag_002dvisit_002dpost_002dactions-230"><code>tag-visit-post-actions</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dgeneral.html#index-tip_002dof_002dthe_002dday-144"><code>tip-of-the-day</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dgeneral.html#index-tip_002dof_002dthe_002dday_002dfile-145"><code>tip-of-the-day-file</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dlayout.html#index-toggle_002dlayout_002dsequence-284"><code>toggle-layout-sequence</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dbuffer_002dstyle-155"><code>tree-buffer-style</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002ddo_002dnot_002dleave_002dwindow_002dafter_002dselect-156"><code>tree-do-not-leave-window-after-select</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002deasy_002dhor_002dscroll-157"><code>tree-easy-hor-scroll</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dexpand_002dsymbol_002dbefore-158"><code>tree-expand-symbol-before</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dimage_002dicons_002ddirectories-159"><code>tree-image-icons-directories</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dincremental_002dsearch-160"><code>tree-incremental-search</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dindent-161"><code>tree-indent</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dmake_002dparent_002dnode_002dsticky-162"><code>tree-make-parent-node-sticky</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dmouse_002daction_002dtrigger-163"><code>tree-mouse-action-trigger</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dnavigation_002dby_002darrow-164"><code>tree-navigation-by-arrow</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dstickynode_002dindent_002dstring-165"><code>tree-stickynode-indent-string</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-tree_002dtruncate_002dlines-166"><code>tree-truncate-lines</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dtree_002dbuffer.html#index-truncate_002dlong_002dnames-167"><code>truncate-long-names</code></a>: <a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a></li>
+<li><a href="ecb_002dmethods.html#index-type_002dtag_002ddisplay-231"><code>type-tag-display</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dmethods.html#index-type_002dtag_002dexpansion-232"><code>type-tag-expansion</code></a>: <a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a></li>
+<li><a href="ecb_002dgeneral.html#index-use_002drecursive_002dedit-146"><code>use-recursive-edit</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002ddirectories.html#index-use_002dspeedbar_002dinstead_002dnative_002dtree_002dbuffer-189"><code>use-speedbar-instead-native-tree-buffer</code></a>: <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a></li>
+<li><a href="ecb_002dversion_002dcontrol.html#index-vc_002ddirectory_002dexclude_002dregexps-342"><code>vc-directory-exclude-regexps</code></a>: <a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a></li>
+<li><a href="ecb_002dversion_002dcontrol.html#index-vc_002denable_002dsupport-343"><code>vc-enable-support</code></a>: <a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a></li>
+<li><a href="ecb_002dversion_002dcontrol.html#index-vc_002dstate_002dmapping-344"><code>vc-state-mapping</code></a>: <a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a></li>
+<li><a href="ecb_002dversion_002dcontrol.html#index-vc_002dsupported_002dbackends-345"><code>vc-supported-backends</code></a>: <a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a></li>
+<li><a href="ecb_002dgeneral.html#index-version_002dcheck-147"><code>version-check</code></a>: <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a></li>
+<li><a href="ecb_002dlayout.html#index-windows_002dheight-285"><code>windows-height</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dlayout.html#index-windows_002dwidth-286"><code>windows-width</code></a>: <a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a></li>
+<li><a href="ecb_002dwinman.html#index-winman_002descreen_002dnumber-334"><code>winman-escreen-number</code></a>: <a href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a></li>
+<li><a href="ecb_002dwinman.html#index-winman_002dwinring_002dname-335"><code>winman-winring-name</code></a>: <a href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a></li>
+   </ul>   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Overview.html b/site/ecb-2.40/html-help/Overview.html
new file mode 100644
index 0000000..592a299
--- /dev/null
+++ b/site/ecb-2.40/html-help/Overview.html
@@ -0,0 +1,91 @@
+<html lang="en">
+<head>
+<title>Overview - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link rel="next" href="Manual-usage.html#Manual-usage" title="Manual usage">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Overview"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Manual-usage.html#Manual-usage">Manual usage</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">2 Overview</h2>
+
+<p><a name="index-tree_002dbuffer-1"></a><a name="index-ECB_002dwindows-2"></a>ECB is a global minor-mode which offers a couple of <dfn>ECB-windows</dfn>
+for browsing your sources comfortable with the mouse and the keyboard.
+
+   <p>ECB offers some basic ECB-windows to browse your sources:
+     <ul>
+<li>ECB-Directories for browsing directories
+<li>ECB-Sources for browsing source-files and a file-history
+<li>ECB-Methods for browsing the contents of a source
+</ul>
+
+   <p>See <a href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a> for a detailled description what these
+basic ECB-windows offer. See <a href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a> for a general
+introduction in the ECB-window-concept of ECB.
+
+   <p>In addition to these &ldquo;special&rdquo; ECB-windows you have always an
+<dfn>edit-area</dfn> where you can edit your source-files. The edit-area
+can be divided into several <dfn>edit-windows</dfn> - as many as you need
+(see <a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>). And at the bottom of the ECB-frame a persistent
+<dfn>compilation-window</dfn> (also called <dfn>compile-window</dfn>) can be
+displayed (optional), where all the output of Emacs-compilation
+(compile, grep etc.) is shown (see <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>).
+
+   <p>The following &ldquo;screenshot&rdquo; illustrates the typical layout of the
+ECB-frame<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>:
+
+<pre class="example">   ------------------------------------------------------------------
+   |              |                                                 |
+   |  Directories |                                                 |
+   |              |                                                 |
+   |--------------|                                                 |
+   |              |                                                 |
+   |  Sources     |                                                 |
+   |              |                                                 |
+   |--------------|                   Edit-area                     |
+   |              |   (can be splitted in several edit-windows)     |
+   |  Methods     |                                                 |
+   |              |                                                 |
+   |--------------|                                                 |
+   |              |                                                 |
+   |  History     |                                                 |
+   |              |                                                 |
+   ------------------------------------------------------------------
+   |                                                                |
+   |            Persistent Compilation-window (optional)            |
+   |                                                                |
+   ------------------------------------------------------------------
+</pre>
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> This is only one example of the layouts ECB offers,
+see <a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a></p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Personal-tree_002dkeybindings.html b/site/ecb-2.40/html-help/Personal-tree_002dkeybindings.html
new file mode 100644
index 0000000..da1cf9f
--- /dev/null
+++ b/site/ecb-2.40/html-help/Personal-tree_002dkeybindings.html
@@ -0,0 +1,97 @@
+<html lang="en">
+<head>
+<title>Personal tree-keybindings - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="prev" href="Incremental-search.html#Incremental-search" title="Incremental search">
+<link rel="next" href="Using-popup_002dmenus.html#Using-popup_002dmenus" title="Using popup-menus">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Personal-tree-keybindings"></a>
+<a name="Personal-tree_002dkeybindings"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Incremental-search.html#Incremental-search">Incremental search</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.2.3 Adding personal keybindings for the tree-buffers</h4>
+
+<p>There are five hooks which can be used for adding personal keybindings
+to the ECB tree-buffers:
+
+     <ul>
+<li><code>ecb-common-tree-buffer-after-create-hook</code>
+<li><code>ecb-directories-buffer-after-create-hook</code>
+<li><code>ecb-sources-buffer-after-create-hook</code>
+<li><code>ecb-methods-buffer-after-create-hook</code>
+<li><code>ecb-history-buffer-after-create-hook</code>
+</ul>
+
+   <p>These hooks are called directly after tree-buffer creation so they can
+be used to add personal local keybindings<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> either to all tree-buffers
+(<code>ecb-common-tree-buffer-after-create-hook</code>) or just to a certain
+tree-buffer. Here is a list which keys MUST NOT be rebound:
+
+     <ul>
+<li><kbd>RET</kbd> and all combinations with <kbd>Shift</kbd> and <kbd>Ctrl</kbd>:
+Used for selecting nodes in all tree-buffers. 
+<li><kbd>TAB</kbd>:
+Used for expanding/collapsing nodes in all tree-buffers. 
+<li><kbd>C-t</kbd>:
+Used for toggling &ldquo;do not leave window after selection&rdquo; in all
+tree-buffers, see command
+<code>ecb-toggle-do-not-leave-window-after-select</code>. 
+<li>All self-inserting characters:
+Used for easy and fast navigation in all tree-buffers,
+See <a href="Incremental-search.html#Incremental-search">Incremental search</a>. 
+<li><kbd>F2</kbd>, <kbd>F3</kbd>, <kbd>F4</kbd>:
+Used for customizing ECB, adding source-path in the directories buffer. 
+</ul>
+
+   <p>The following example binds <kbd>C-a</kbd> to some useful code in ALL
+tree-buffers and <kbd>C-d</kbd> to even more useful code ONLY in the
+directories buffer:
+
+<pre class="example">   (add-hook 'ecb-common-tree-buffer-after-create-hook
+             (lambda ()
+                (local-set-key (kbd "C-a")
+                               (lambda ()
+                                  (interactive)
+                                  (message "ECB is great!")))))
+   
+   (add-hook 'ecb-directories-buffer-after-create-hook
+             (lambda ()
+                (local-set-key (kbd "C-d")
+                               (lambda ()
+                                  (interactive)
+                                  (message "ECB is wonderful!")))))
+</pre>
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> To be more general:
+They can be used to run any arbitrary lisp code after a tree-buffer
+creation!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Possible-layout_002doutlines.html b/site/ecb-2.40/html-help/Possible-layout_002doutlines.html
new file mode 100644
index 0000000..37ec2fc
--- /dev/null
+++ b/site/ecb-2.40/html-help/Possible-layout_002doutlines.html
@@ -0,0 +1,213 @@
+<html lang="en">
+<head>
+<title>Possible layout-outlines - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link rel="prev" href="Programming-special-windows.html#Programming-special-windows" title="Programming special windows">
+<link rel="next" href="The-layout_002dengine-API.html#The-layout_002dengine-API" title="The layout-engine API">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Possible-layout-outlines"></a>
+<a name="Possible-layout_002doutlines"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-layout_002dengine-API.html#The-layout_002dengine-API">The layout-engine API</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.5.3 The wide range of possible layout-outlines</h4>
+
+<p>In the two previous sections <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a> and
+<a href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a> we have explained in detail how to
+program new layouts and how to program new special windows/buffers and
+adding them to a new layout.
+
+   <p>The intention of this section is to be a summary what are the real
+restrictions for a new layout-outline programmed with
+<code>ecb-layout-define</code>. This is necessary because until now we just
+programmed &ldquo;obvious&rdquo; layouts, means layout which are in principle
+very similar to the standard ones which means one big edit-window and
+some special windows &ldquo;around&rdquo; this edit-window. This section will
+show you that a layout can have also very different outlines.
+
+   <p>OK, here are the real restrictions and conditions for a layout
+programmed with <code>ecb-layout-define</code>:
+     <ol type=1 start=1>
+<li>It must have exactly one edit-window regardless of its size. The user
+of this layout can later split this edit-window in as many
+edit-windows as he like.
+
+     <li>All other windows created within the <var>CREATE-CODE</var> body of
+<code>ecb-layout-define</code> (see <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a>) must be
+dedicated to their buffers.
+
+     <li>All the dedicated windows must (exclusive!) either reside on the left,
+right, top or left-and-right side of the edit-window. This will be
+defined with the <var>TYPE</var>-argument of <code>ecb-layout-define</code>
+(see <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a>).
+        </ol>
+
+   <p>You see, there are only three restrictions/conditions. These and only
+these must be fulfilled at layout-programming.
+
+   <p>Demonstrating what this really means and how flexible the
+layout-engine of ECB really is, can be done best with some
+&ldquo;pathological&rdquo; layout-outlines. All the following are correct
+layouts (working code is added below each layout):
+
+   <p>The following is a top layout with three vertical layered special
+windows.
+
+<pre class="example">   ------------------------------------------------------------------
+   |                                                                |
+   |                 Upper special window                           |
+   |                                                                |
+   |----------------------------------------------------------------|
+   |                                                                |
+   |                 Middle special window                          |
+   |                                                                |
+   |----------------------------------------------------------------|
+   |                                                                |
+   |                 Lower special window                           |
+   |                                                                |
+   |================================================================|
+   |                                                                |
+   |                         Edit-area                              |
+   |      (can be splitted by the user in several edit-windows)     |
+   ------------------------------------------------------------------
+   |                                                                |
+   |                 Compilation-window (optional)                  |
+   |                                                                |
+   ------------------------------------------------------------------
+</pre>
+   <p>Here is the code for that top layout (all buffers are dummy-buffers):
+
+<pre class="lisp">   
+   ;; The "window dedicator" functions:
+   
+   (defecb-window-dedicator ecb-set-usw-buffer "Upper special window"
+     (switch-to-buffer (get-buffer-create "Upper special window")))
+   
+   (defecb-window-dedicator ecb-set-msw-buffer "Middle special window"
+     (switch-to-buffer (get-buffer-create "Middle special window")))
+   
+   (defecb-window-dedicator ecb-set-lsw-buffer "Lower special window"
+     (switch-to-buffer (get-buffer-create "Lower special window")))
+   
+   ;; The layout itself:
+   
+   (ecb-layout-define "example-layout3" top
+     nil
+   
+     ;; here we have an edit-window and above one top window which we can
+     ;; now split in several other windows. Dependent on the value of
+     ;; `ecb-compile-window-height' we have also a compile-window at the
+     ;; bottom.
+   
+     (ecb-set-usw-buffer)
+     (ecb-split-ver 0.33)
+     (ecb-set-msw-buffer)
+     (ecb-split-ver 0.5)
+     (ecb-set-lsw-buffer)
+   
+     ;; select the edit-window.
+     (select-window (next-window)))
+</pre>
+   <p>The following is a left-right layout which has six special windows in
+the left-&rdquo;column&rdquo; and one big special window in the
+right-&rdquo;column&rdquo;. For left-right layouts the left-&rdquo;column&rdquo; and the
+right-&rdquo;column&rdquo; have always the same width.
+
+<pre class="example">   ------------------------------------------------------------------
+   |             |       |                   |                      |
+   | Left1       | Left5 |                   |                      |
+   |             |       |                   |                      |
+   |-------------|       |                   |                      |
+   |      |      |       |                   |                      |
+   |      |      |       |                   |                      |
+   |      |      |       |                   |                      |
+   | Left2| Left3|-------|     Edit-area     |   Right1             |
+   |      |      |       | (can be splitted  |                      |
+   |      |      |       |  in several edit- |                      |
+   |      |      |       |      windows)     |                      |
+   |-------------|       |                   |                      |
+   |             |       |                   |                      |
+   | Left4       | Left6 |                   |                      |
+   |             |       |                   |                      |
+   ------------------------------------------------------------------
+   |                                                                |
+   |                 Compilation-window (optional)                  |
+   |                                                                |
+   ------------------------------------------------------------------
+</pre>
+   <p>Here is the code for that left-right layout, again with dummy-buffers
+(depending to your screen-resolution you will need a quite big value
+for <code>ecb-windows-width</code>, e.g. 0.4):
+
+   <p>Here is one of the &ldquo;window dedicator&rdquo;-functions<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>:
+
+<pre class="lisp">   (defecb-window-dedicator ecb-set-left1-buffer "Left1"
+     (switch-to-buffer (get-buffer-create "Left1")))
+</pre>
+   <p>Here is the layout-definition itself:
+
+<pre class="lisp">   (ecb-layout-define "example-layout2" left-right
+     nil
+   
+     ;; here we have an edit-window and left and right two windows each
+     ;; with width `ecb-windows-width'. Dependent to the value of
+     ;; `ecb-compile-window-height' we have also a compile-window at the
+     ;; bottom.
+   
+     (ecb-set-left1-buffer)
+     (ecb-split-hor 0.66 t)
+     (ecb-split-ver 0.75)
+     (ecb-set-left4-buffer)
+     (select-window (previous-window (selected-window) 0))
+     (ecb-split-ver 0.25 nil t)
+     (ecb-set-left2-buffer)
+     (ecb-split-hor 0.5)
+     (ecb-set-left3-buffer)
+     (select-window (next-window (next-window)))
+     (ecb-set-left5-buffer)
+     (ecb-split-ver 0.5)
+     (ecb-set-left6-buffer)
+     (select-window (next-window (next-window)))
+     (ecb-set-right1-buffer))
+   
+     ;; select the edit-window
+     (select-window (previous-window (selected-window) 0)))
+</pre>
+   <p>Especially the last example should demonstrate that even very
+complicated layouts are easy to program with <code>ecb-layout-define</code>. 
+If such layouts are senseful is another topic ;-)
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> The
+&ldquo;window dedicators&rdquo; for all these ecb-windows/buffers are
+not explicitly described - they look all like
+<code>ecb-set-left1-buffer</code> - of course with different buffer-names!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Problems-with-the-compile-window.html b/site/ecb-2.40/html-help/Problems-with-the-compile-window.html
new file mode 100644
index 0000000..bc167e7
--- /dev/null
+++ b/site/ecb-2.40/html-help/Problems-with-the-compile-window.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=Temp_002d-and-compile_002dbuffers.html#Problems%20with%20the%20compile%20window">
diff --git a/site/ecb-2.40/html-help/Programming-a-new-layout.html b/site/ecb-2.40/html-help/Programming-a-new-layout.html
new file mode 100644
index 0000000..2017651
--- /dev/null
+++ b/site/ecb-2.40/html-help/Programming-a-new-layout.html
@@ -0,0 +1,215 @@
+<html lang="en">
+<head>
+<title>Programming a new layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link rel="prev" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link rel="next" href="Programming-special-windows.html#Programming-special-windows" title="Programming special windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Programming-a-new-layout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.5.1 How to program a new layout</h4>
+
+<p>If you just want creating a new layout with the standard ECB-windows
+like directories, sources, methods, history and speedbar it's is
+strongly recommended to define the new layout interactively with the
+command <code>ecb-create-new-layout</code> (see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+   <p>If you want creating a new layout and if this layout should contain
+other special windows than the standard ECB-windows then it's still
+recommended to define this layout interactively with
+<code>ecb-create-new-layout</code> and using the option to give the created
+windows user-defined types. For every user defined type you have then
+just to program the necessary buffer-set function. For all the details
+see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>.
+
+   <p>But if you do not like the interactive way (because you are tough and
+brave) but you want programming the new layout with Elisp then use the
+macro <code>ecb-layout-define</code> (the following definition has stripped
+the prefix &ldquo;ecb-&rdquo; for better indexing this manual):
+
+<div class="defun">
+&mdash; Macro: <b>layout-define</b><var> name type doc &amp;rest create-code<a name="index-layout_002ddefine-357"></a></var><br>
+<blockquote><p>Creates a new ECB-layout with name <var>NAME</var>. <var>TYPE</var> is the type
+of the new layout and is literal, i.e. not evaluated. It can be left,
+right, top or left-right. <var>DOC</var> is the docstring for the new
+layout-function &ldquo;ecb-layout-function-&lt;name&gt;&rdquo;. <var>CREATE-CODE</var> is
+all the lisp code which is necessary to define the
+ECB-windows/buffers. This macro adds the layout with <var>NAME</var> and
+<var>TYPE</var>to the internal variable <code>ecb-available-layouts</code>.
+
+        <p>Preconditions for <var>CREATE-CODE</var>:
+          <ol type=1 start=1>
+<li>Current frame is splitted at least in one edit-window and the
+&ldquo;column&rdquo; (for layout types left, right and left-right) rsp. &ldquo;row&rdquo;
+(for a top layout) for the special ECB-windows/buffers. The width of
+the &ldquo;column&rdquo; rsp. the height of the &ldquo;row&rdquo; is always defined with
+the option <code>ecb-windows-width</code> rsp. <code>ecb-windows-height</code>. 
+Depending on the value of the option <code>ecb-compile-window-height</code>
+there is also a compile window at the bottom of the frame which is
+stored in <code>ecb-compile-window</code>.
+
+          <li>All windows are not dedicated.
+
+          <li>Neither the edit-window nor the compile-window (if there is one) are
+selected for types left, right and top. For type left-right the left
+column-window is selected
+
+          <li>All ECB-advices of the advice-sets <code>ecb-basic-adviced-functions</code>
+and <code>ecb-permanent-adviced-functions</code> are disabled.
+             </ol>
+
+        <p>Things <var>CREATE-CODE</var> has to do:
+          <ol type=1 start=1>
+<li>Splitting the ECB-tree-windows-column(s)/row (s.a.) in all the
+ECB-windows the layout should contain (directories, sources, methods
+and history). The split must not be done with other functions than
+<code>ecb-split-hor</code> and <code>ecb-split-ver</code>! It is recommended not to
+to use a &ldquo;hard&rdquo; number of split-lines or -rows but using fractions
+between -0.9 and +0.9! Tip: It is recommended to spilt from right to
+left and from bottom to top or with other words: First create the
+right-most and bottom-most special windows!
+
+          <li>Making each special ECB-window a dedicated window. This can be done with
+one of the following functions:
+               <ul>
+<li><code>ecb-set-directories-buffer</code>
+<li><code>ecb-set-sources-buffer</code>
+<li><code>ecb-set-methods-buffer</code>
+<li><code>ecb-set-history-buffer</code>
+<li><code>ecb-set-speedbar-buffer</code>
+</ul>
+          Each layout can only contain one of each tree-buffer-type!
+
+          <p>In addition to these functions there is a general macro:
+<code>defecb-window-dedicator</code>: This macro defines a so called
+&ldquo;window-dedicator&rdquo; which is a function registered at ECB and called
+by ECB to perform any arbitrary code in current window and makes the
+window autom. dedicated at the end. This can be used by third party
+packages like JDEE to create arbitrary ECB-windows besides the
+standard tree-windows.
+
+          <p>To make a special ECB-window a dedicated window either one of the five
+functions above must be used or a new &ldquo;window-dedicator&rdquo;-function
+has to be defined with `defecb-window-dedicator' and must be used
+within the layout-definition.
+
+          <li>Every(!) special ECB-window must be dedicated as described in 2.
+
+          <li><var>CREATE-CODE</var> must work correctly regardless if there is already a
+compile-window (stored in <code>ecb-compile-window</code>) or not
+(<code>ecb-compile-window</code> is nil).
+             </ol>
+
+        <p>Things <var>CREATE-CODE</var> can do or can use:
+          <ol type=1 start=1>
+<li>The value of <code>ecb-compile-window</code> which contains the compile-window (if
+there is one). Using the values of <code>ecb-compile-window-height</code>,
+<code>ecb-windows-width</code>, <code>ecb-windows-height</code>.
+             </ol>
+
+        <p>Things <var>CREATE-CODE</var> must NOT do:
+          <ol type=1 start=1>
+<li>Splitting the edit-window
+<li>Creating a compile-window
+<li>Deleting the edit-window, the compile-window (if there is any) or the
+ECB-windows-column(s)/row (see Precondition 1.) 
+<li>Referring to the value of <code>ecb-edit-window</code> because this is always nil
+during <var>CREATE-CODE</var>.
+             </ol>
+
+        <p>Postconditions for <var>CREATE-CODE</var>:
+          <ol type=1 start=1>
+<li>The edit-window must be the selected window and must not be dedicated
+and not be splitted.
+
+          <li>Every window besides the edit-window (and the compile-window) must be
+a dedicated window (e.g. a ECB-tree-window).
+             </ol>
+</p></blockquote></div>
+
+   <p>Use this macro to program new layouts within your <samp><span class="file">.emacs</span></samp> or any
+other file which is loaded into your Emacs. After loading the file(s)
+with all the new layout-definitions you can use it by customizing the
+option <code>ecb-layout-name</code> to the appropriate name or with the
+command <code>ecb-change-layout</code>.
+
+   <p>With the function <code>ecb-layout-undefine</code> you can remove a layout
+from the list of available layouts:
+
+<div class="defun">
+&mdash; Function: <b>layout-undefine</b><var> name<a name="index-layout_002dundefine-358"></a></var><br>
+<blockquote><p>Unbind ecb-layout-function-&lt;NAME&gt; and
+ecb-delete-window-ecb-windows-&lt;NAME&gt; and remove <code>NAME</code> from
+<code>ecb-available-layouts</code>. 
+</p></blockquote></div>
+
+   <p>Here is an example for a new layout programmed with
+<code>ecb-layout-define</code>:
+
+<pre class="example">   (ecb-layout-define "my-own-layout" left nil
+     ;; The frame is already splitted side-by-side and point stays in the
+     ;; left window (= the ECB-tree-window-column)
+   
+     ;; Here is the creation code for the new layout
+   
+     ;; 1. Defining the current window/buffer as ECB-methods buffer
+     (ecb-set-methods-buffer)
+     ;; 2. Splitting the ECB-tree-windows-column in two windows
+     (ecb-split-ver 0.75 t)
+     ;; 3. Go to the second window
+     (other-window 1)
+     ;; 4. Defining the current window/buffer as ECB-history buffer
+     (ecb-set-history-buffer)
+     ;; 5. Make the ECB-edit-window current (see Postcondition above)
+     (select-window (next-window)))
+</pre>
+   <p>This layout definition defines a layout with name &ldquo;my-own-layout&rdquo;
+which looks like:
+
+<pre class="example">   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |               Edit                   |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  History     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+</pre>
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Programming-special-windows.html b/site/ecb-2.40/html-help/Programming-special-windows.html
new file mode 100644
index 0000000..78d939a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Programming-special-windows.html
@@ -0,0 +1,541 @@
+<html lang="en">
+<head>
+<title>Programming special windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link rel="prev" href="Programming-a-new-layout.html#Programming-a-new-layout" title="Programming a new layout">
+<link rel="next" href="Possible-layout_002doutlines.html#Possible-layout_002doutlines" title="Possible layout-outlines">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Programming-special-windows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Possible-layout_002doutlines.html#Possible-layout_002doutlines">Possible layout-outlines</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.5.2 All aspects of programming special windows</h4>
+
+<p>ECB offers a flexible programmable layout-engine for other packages to
+display their own contents and informations in special ECB-windows. An
+example could be a graphical debugger which offers a special window for
+displaying local variables and another special window for messages
+from the debugger-process (like JDEbug of JDEE<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>).
+
+   <p>This section explains all aspects of programming new special windows,
+adding them to a new layout and synchronizing them with edit-window of
+ECB. This can be done best with an easy example which nevertheless
+covers all necessary aspects to be a good example and skeleton for
+complex tools (like a graphical debugger) which want to use the
+layout-engine of ECB do display their own information.
+
+   <p><strong>IMPORTANT</strong>: See <a href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a> for a full documentation of
+the library tree-buffer.el which can be used for programming a new
+special window as a tree!
+
+   <p>Here comes the example:
+
+<h5 class="subsubsection">11.5.2.1 The outline of the example layout:</h5>
+
+<pre class="example">   -------------------------------------------------------
+   |Bufferinfo for &lt;filename&gt;:            |[prior]       |
+   |Type: file                            |[next]        |
+   |Size: 23456                           |              |
+   |Modes: rw-rw-rw-                      |              |
+   |-----------------------------------------------------|
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                 edit-window                         |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   -------------------------------------------------------
+   |                                                     |
+   |                 compilation-window                  |
+   |                                                     |
+   -------------------------------------------------------
+</pre>
+<h5 class="subsubsection">11.5.2.2 The description of the layout-contents</h5>
+
+<p>The top-left window always displays informations about the current
+buffer in the selected edit-window. This window demonstrates how
+autom. synchronizing a special window/buffer of a layout with current
+edit-window.
+
+   <p>The top-right window contains an read-only &ldquo;action-buffer&rdquo; and
+offers two buttons which can be used with the middle mouse-button to
+scroll the edit-window. This is not very senseful but it demonstrates
+how to control the edit-window with actions performed in a special
+window/buffer of a layout.
+
+   <p>(If you have not set a compilation-window in
+<code>ecb-compile-window-height</code> then the layout contains no persistent
+compilation window and the other windows get a little more place).
+
+<h5 class="subsubsection">11.5.2.3 The example code</h5>
+
+<p>Now let have us a look at the several parts of the Elisp-program
+needed to program this new example layout. ECB contains a library
+<samp><span class="file">ecb-examples.el</span></samp> which contains the full working code of this
+example. To test this example and to play with it you can load this
+library into Emacs (with <code>load-library</code> for example) and then
+calling <code>ecb-change-layout</code> (bound to <kbd>C-c . lc</kbd>) and
+inserting &ldquo;example-layout1&rdquo; as layout-name. An alternative is
+calling <code>ecb-examples-activate</code> and
+<code>ecb-examples-deactivate</code>. For details see file
+<samp><span class="file">ecb-examples.el</span></samp>.
+
+   <p>The following steps only contain code-skeletons to demonstrate the
+principle. The full working code is available in
+<samp><span class="file">ecb-examples.el</span></samp>.
+
+<h5 class="subsubsection">11.5.2.4 The bufferinfo buffer of the example</h5>
+
+<p>The name of the bufferinfo buffer:
+
+<pre class="lisp">   (defconst ecb-examples-bufferinfo-buffer-name " *ECB buffer info*")
+</pre>
+   <p>Two helper functions for displaying infos in a special buffer:
+
+<pre class="lisp">   (defun ecb-examples-print-file-attributes (buffer filename)
+     (ecb-with-readonly-buffer buffer
+       (erase-buffer)
+       (insert (format "Bufferinfo for %s:\n\n" filename))
+       ;; insert with the function `file-attributes' some
+       ;; informations about FILENAME.
+       ))
+   
+   (defun ecb-examples-print-non-filebuffer (buffer buffer-name)
+     (ecb-with-readonly-buffer buffer
+       (erase-buffer)
+       ;; analogous to `ecb-examples-print-file-attributes'
+       ))
+</pre>
+   <p>For synchronizing the bufferinfo window with the current source-buffer we
+first introduce some three options which are very typical for a special
+ECB-window which should be synchronized with current buffer in the edit-area.
+
+   <p>The :type of the first two options is essential and <strong>MUST NOT</strong> be
+defined differently, because the macro <code>defecb-autocontrol/sync-function</code>
+(s.b.) and the function <code>ecb-activate-ecb-autocontrol-function</code> (s.b.) 
+expects exactly these option-types.
+
+   <p>The third one for an own hook running after synchronizing is not essential but
+mostly useful for users who wants to do some own stuff.
+
+   <p>Here come the three options - for detailled docstrings take a look into the
+file <samp><span class="file">ecb-examples.el</span></samp>:
+
+<pre class="lisp">   (defcustom ecb-examples-bufferinfo-buffer-sync 'basic
+     "*Synchronize the bufferinfo buffer automatically with current edit buffer.
+   
+   If 'always then the synchronization takes place always a buffer changes in the
+   edit window, if nil then never. If a list of major-modes then only if the
+   `major-mode' of the new buffer belongs NOT to this list.
+   
+   If the special value 'basic is set then ECB uses the setting of the option
+   `ecb-basic-buffer-sync'.
+   
+   IMPORTANT NOTE: Every time the synchronization is done the hook
+   `ecb-bufferinfo-buffer-sync-hook' is evaluated."
+     :group 'ecb-examples-bufferinfo
+     :type '(radio :tag "Synchronize ECBs example bufferino buffer"
+                   (const :tag "use basic value" :value basic)
+                   (const :tag "Always" :value always)
+                   (const :tag "Never" nil)
+                   (repeat :tag "Not with these modes"
+                           (symbol :tag "mode"))))
+   
+   (defcustom ecb-examples-bufferinfo-buffer-sync-delay 'basic
+     "*Time Emacs must be idle before the bufferinfo-buffer is synchronized.
+   Synchronizing is done with the current source displayed in the edit window. If
+   nil then there is no delay, means synchronization takes place immediately. A
+   small value of about 0.25 seconds saves CPU resources and you get even though
+   almost the same effect as if you set no delay.
+   
+   If the special value 'basic is set then ECB uses the setting of the option
+   `ecb-basic-buffer-sync-delay'"
+     :group 'ecb-analyse
+     :type '(radio (const :tag "use basic value" :value basic)
+                   (const :tag "No synchronizing delay" :value nil)
+                   (number :tag "Idle time before synchronizing" :value 2))
+     :set (function (lambda (symbol value)
+                      (set symbol value)
+                      (if (and (boundp 'ecb-minor-mode)
+                               (featurep 'ecb-examples)
+                               ecb-minor-mode)
+                          (ecb-activate-ecb-autocontrol-function
+                           value 'ecb-examples-bufferinfo-buffer-sync))))
+     :initialize 'custom-initialize-default)
+   
+   (defcustom ecb-examples-bufferinfo-buffer-sync-hook nil
+     "Hook run at the end of `ecb-examples-bufferinfo-buffer-sync'.
+   See documentation of `ecb-examples-bufferinfo-buffer-sync' for conditions when
+   synchronization takes place and so in turn these hooks are evaluated.
+   
+   ..."
+     :group 'ecb-analyse
+     :type 'hook)
+</pre>
+   <p>Now we define the synchronizing function. <strong>IMPORTANT</strong>: The main
+synchronizing function must be defined with the macro
+<code>defecb-autocontrol/sync-function</code>! See the documentation of this
+function for all details.
+
+   <p>The following function synchronizes the bufferinfo buffer with the current
+buffer of the edit-window if that buffer has changed
+
+   <p>See the comments in the code for explanations.
+
+<pre class="lisp">   (defvar ecb-examples-bufferinfo-last-file-buffer nil)
+   
+   (defecb-autocontrol/sync-function ecb-examples-bufferinfo-buffer-sync
+       ecb-examples-bufferinfo-buffer-name ecb-examples-bufferinfo-buffer-sync t
+     "Synchronizes the buffer-info buffer with current source if changed.
+   Can be called interactively but normally this should not be necessary because
+   it will be called autom. by the internal synchronizing mechanism of ECB."
+   
+     ;; The macro `defecb-autocontrol/sync-function' does a lot for our
+     ;; conveniance:
+   
+     ;; 1) here we can be sure that the buffer with name
+     ;; `ecb-examples-bufferinfo-buffer-name' is displayed in a window of
+     ;; `ecb-frame' because the macro `defecb-autocontrol/sync-function'
+     ;; encapsulates automatically the following code within
+     ;; `ecb-do-if-buffer-visible-in-ecb-frame' and this macro binds locally the
+     ;; variables visible-buffer and visible-window: visible-window:=
+     ;; (get-buffer-window ecb-examples-bufferinfo-buffer-name) visible-buffer:=
+     ;; (get-buffer ecb-examples-bufferinfo-buffer-name)
+   
+     ;; 2) The macro `defecb-autocontrol/sync-function' automatically takes care of
+     ;;    the setting of option `ecb-examples-bufferinfo-buffer-sync' and runs the
+     ;;    following code only when the related conditions are true
+   
+     ;; 3) The generated function has one optional argument FORCE which can be used
+     ;; in the code below.
+   
+     ;; 4) The macro `defecb-autocontrol/sync-function' makes this synchronizing
+     ;;    function interactive
+   
+     ;; For details please read the documentation of
+     ;; `defecb-autocontrol/sync-function'!
+   
+     ;; synchronize only when point stays in one of the edit-window.
+     (when (ecb-point-in-edit-window-number)
+   
+       ;; we need the file-name of indirect-buffers too (if the base-buffer is a
+       ;; file-buffer), therefore we use `ecb-buffer-file-name' (see the docstring
+       ;; of this function)
+       (let ((filename (ecb-buffer-file-name (current-buffer))))
+   
+         (if (and filename (ecb-buffer-or-file-readable-p filename))
+   
+             ;; synchronizing for real filesource-buffers or indirect buffers of
+             ;; real file buffers
+   
+               ;; Let us be smart: We synchronize only if sourcebuffer has changed
+               ;; or if the argument FORCE is not nil
+               (when (or force
+                         (not (equal (current-buffer)
+                                     ecb-examples-bufferinfo-last-file-buffer)))
+                 ;; set new last-file-buffer so we can check next time if changed
+                 (setq ecb-examples-bufferinfo-last-file-buffer (current-buffer))
+                 ;; we display the file-infos for current source-buffer
+                 (ecb-examples-print-file-attributes visible-buffer filename))
+   
+           ;; what should we do for non file buffers like help-buffers etc...
+           (setq ecb-examples-bufferinfo-last-file-buffer nil)
+           (ecb-examples-print-non-filebuffer visible-buffer
+                                              (buffer-name (current-buffer)))))
+   
+       ;; Now lets run the hooks in `ecb-examples-bufferinfo-buffer-sync-hook'
+       (run-hooks 'ecb-examples-bufferinfo-buffer-sync-hook)))
+</pre>
+   <p>Two conveniance commands for the user:
+
+<pre class="lisp">   (defun ecb-maximize-bufferinfo-window ()
+     "Maximize the bufferinfo-window.
+   I.e. delete all other ECB-windows, so only one ECB-window and the
+   edit-window\(s) are visible \(and maybe a compile-window). Works
+   also if the ECB-analyse-window is not visible in current layout."
+     (interactive)
+     (ecb-display-one-ecb-buffer ecb-examples-bufferinfo-buffer-name))
+   
+   (defun ecb-goto-bufferinfo-window ()
+     "Make the bufferinfo-window the current window."
+     (interactive)
+     (ecb-goto-ecb-window ecb-examples-bufferinfo-buffer-name))
+</pre>
+   <h5 class="subsubsection">11.5.2.5 Synchronizing the bufferinfo-buffer automatically</h5>
+
+<p>By using the macro <code>defecb-autocontrol/sync-function</code> for defining our
+synchronizing function we have already registered this function as a
+synchronizing function managed by ECB:
+
+   <p>The only thing we need is to tell ECB when this function should run - for this
+we have already defined the first two options in our example (s.a.). 
+ECB offers to functions for
+
+     <ul>
+<li><code>ecb-activate-ecb-autocontrol-function</code>: Activate/start synchronizing
+<li><code>ecb-stop-autocontrol/sync-function</code>: Stop synchronizing
+</ul>
+
+   <p>It's smart to activate the synchronizing function within the
+dedicator-function. See the comment within the following function.
+
+   <p>The function which makes the bufferinfo-buffer dedicated to a window
+and registers the new special window/buffer at ECB.
+
+<pre class="lisp">   (defecb-window-dedicator ecb-examples-set-bufferinfo-buffer
+       ecb-examples-bufferinfo-buffer-name
+     "Set the buffer in the current window to the bufferinfo-buffer and make this
+   window dedicated for this buffer. Makes the buffer read-only."
+   
+     ;; activating the synchronization of the bufferinfo-window:
+     ;; `ecb-activate-ecb-autocontrol-function' takes care of the possible
+     ;; settings in `ecb-examples-bufferinfo-buffer-sync-delay'. Therefore we do
+     ;; it here because then changes in ecb-examples-bufferinfo-buffer-sync-delay
+     ;; are taken into account each time the bufferinfo buffer is set in the
+     ;; layout (after each hiding/showing the ecb-window, each redrawing the
+     ;; layout deactivating/activating ECB)
+     (ecb-activate-ecb-autocontrol-function ecb-examples-bufferinfo-buffer-sync-delay
+                                            'ecb-examples-bufferinfo-buffer-sync)
+   
+     (switch-to-buffer (get-buffer-create ecb-examples-bufferinfo-buffer-name))
+     (setq buffer-read-only t))
+</pre>
+   <p>This is all what we need for the special bufferinfo buffer. We have
+demonstrated already three of the important functions/macros of the
+layout-engine API of ECB: <code>ecb-with-readonly-buffer</code>,
+<code>defecb-autocontrol/sync-function</code> and <code>defecb-window-dedicator</code>
+(see <a href="The-layout_002dengine-API.html#The-layout_002dengine-API">The layout-engine API</a>. Especially the second macro is a MUST for
+programming good synchronizing functions which do not waste CPU-power! We have
+also shown how to start/activate a synchronizing function by
+<code>ecb-activate-ecb-autocontrol-function</code>. Later we will see how to stop
+it.
+
+<h5 class="subsubsection">11.5.2.6 The action buffer of the example</h5>
+
+<p>The name of the action-buffer:
+
+<pre class="lisp">   (defconst ecb-examples-action-buffer-name " *ECB action buffer*")
+</pre>
+   <p>Two helper functions for creating a readonly action-buffer with a
+special local key-map for the middle-mouse-button and two buttons
+[prior] and [next]:
+
+<pre class="lisp">   (defun ecb-examples-insert-text-in-action-buffer (text)
+     (let ((p (point)))
+       (insert text)
+       (put-text-property p (+ p (length text)) 'mouse-face
+                                                'highlight)))
+   
+   (defun ecb-examples-action-buffer-create ()
+     (save-excursion
+       (if (get-buffer ecb-examples-action-buffer-name)
+           (get-buffer ecb-examples-action-buffer-name)
+   
+         (set-buffer (get-buffer-create
+                       ecb-examples-action-buffer-name))
+   
+         ;; we setup a local key-map and bind middle-mouse-button
+         ;; see ecb-examples.el for the full code
+   
+         ;; insert the action buttons [prior] and [next] and
+         ;; make it read-only
+   
+         (ecb-with-readonly-buffer (current-buffer)
+           (erase-buffer)
+           (ecb-examples-insert-text-in-action-buffer "[prior]")
+           ;; analogous for the [next] button
+           )
+   
+         (current-buffer))))
+</pre>
+   <p>The function which performs the actions in the action-buffer if
+clicked with the middle-mouse button onto a button [next] or [prior].
+
+<pre class="lisp">   (defun ecb-examples-action-buffer-clicked (e)
+     (interactive "e")
+     (mouse-set-point e)
+     (let ((line (buffer-substring (ecb-line-beginning-pos)
+                                   (ecb-line-end-pos))))
+       (cond ((string-match "prior" line)
+              (ecb-select-edit-window)
+              (call-interactively 'scroll-down))
+             ((string-match "next" line)
+              ;; analogous for [next]
+              ))))
+</pre>
+   <p>Two conveniance-commands for the user:
+
+<pre class="lisp">   (defun ecb-maximize-action-window ()
+     "Maximize the action-window.
+   I.e. delete all other ECB-windows, so only one ECB-window and the
+   edit-window\(s) are visible \(and maybe a compile-window). Works
+   also if the ECB-analyse-window is not visible in current layout."
+     (interactive)
+     (ecb-display-one-ecb-buffer ecb-examples-action-buffer-name))
+   
+   (defun ecb-goto-action-window ()
+     "Make the action-window the current window."
+     (interactive)
+     (ecb-goto-ecb-window ecb-examples-action-buffer-name))
+</pre>
+   <p>The function which makes the action-buffer dedicated to a window and
+registers it at ECB.
+
+<pre class="lisp">   (defecb-window-dedicator ecb-examples-set-action-buffer
+       (buffer-name (ecb-examples-action-buffer-create))
+     "Set the buffer in the current window to the action-buffer
+   and make this window dedicated for this buffer."
+     (switch-to-buffer (buffer-name (ecb-examples-action-buffer-create))))
+</pre>
+   <p>We do not need more code for the action buffer. All of the code is
+standard emacs-lisp which would also needed if used without ECB. You
+see that you can use any arbitrary code as second argument for
+<code>defecb-window-dedicator</code> as long it returns a buffer-name.
+
+<h5 class="subsubsection">11.5.2.7 Adding the bufferinfo- and action-buffer to a new layout</h5>
+
+<p>Now we add the bufferinfo- and the action-buffer to a new layout of
+type top with name &ldquo;example-layout1&rdquo;:
+
+<pre class="lisp">   (ecb-layout-define "example-layout1" top
+   
+     ;; dedicating the bufferinfo window to the bufferinfo-buffer
+     (ecb-examples-set-bufferinfo-buffer)
+   
+     ;; creating the action-window
+     (ecb-split-hor 0.75)
+   
+     ;; dedicate the action window to the action-buffer
+     (ecb-examples-set-action-buffer)
+   
+     ;; select the edit-window
+     (select-window (next-window)))
+</pre>
+   <p>This all what we need to define the new layout. See <a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a> for more details of the pure layout-programming task.
+
+<h5 class="subsubsection">11.5.2.8 Activating and deactivating new layouts</h5>
+
+<p>Because a set of new special windows integrated in a new layout is
+often just the GUI of a complete tool (like a graphical debugger) we
+demonstrate here the complete activation and deactivation of such a
+tool or at least of the tool-GUI. We decide that the GUI of our
+example &ldquo;tool&rdquo; needs a compile-window with height 5 lines and the
+height of the special windows &ldquo;row&rdquo; on top should be exactly 6 lines
+(normally width and height of the special windows should be a fraction
+of the frame, but here we use 6 lines<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>
+
+   <p>Here comes the (de)activation code.
+
+   <p>The code for saving and restoring the state before activation (the
+full code is available in <samp><span class="file">ecb-examples.el</span></samp>:
+
+<pre class="lisp">   (defun ecb-examples-preactivation-state(action)
+     (cond ((equal action 'save)
+            ;; code for saving the state
+            )
+           ((equal action 'restore)
+           ;; code for restoring the state
+           )))
+</pre>
+   <p>The following function activates the GUI of our example tool:
+
+<pre class="lisp">   (defun ecb-examples-activate ()
+     "Activate the new layout \"example-layout1\".
+   Acivates the function `ecb-examples-bufferinfo-buffer-sync', set
+   `ecb-compile-window-height' to 5 and `ecb-windows-height' to 6. The
+   preactivation-state is saved and will be restored by
+   `ecb-examples-deactivate'."
+     (interactive)
+   
+     (assert (featurep 'ecb) nil
+             "ECB must be loaded!")
+     (assert ecb-minor-mode nil
+             "ECB must be activated!")
+     (assert (equal (selected-frame) ecb-frame) nil
+             "The ECB-frame must be selected!")
+     (assert (not (ecb-string= ecb-layout-name "example-layout1")) nil
+             "The examples-layout1 is already active!")
+   
+     ;; saving the state
+     (ecb-examples-preactivation-state 'save)
+   
+     ;; switch to our prefered layout
+     (setq ecb-windows-height 6)
+     (setq ecb-compile-window-height 8)
+     (let ((ecb-change-layout-preserves-compwin-state nil))
+       ;; activating the synchronization of the bufferinfo-window is done in the
+       ;; dedicator-function (see `ecb-examples-set-bufferinfo-buffer' for the
+       ;; reason). So the synchronizing will be activated implicitly with the
+       ;; layout-switch because this redraws the layout and this calls all
+       ;; dedicator-functions.
+       (ecb-layout-switch "example-layout1")))
+</pre>
+   <p>This function deactivates the GUI of our example-tool and restores the
+state as before activation:
+
+<pre class="lisp">   (defun ecb-examples-deactivate ()
+     "Deactivate the new layout \"example-layout1\".
+   Stops `ecb-examples-bufferinfo-buffer-sync' and restore the state
+   as before activation."
+     (interactive)
+   
+     (assert (featurep 'ecb) nil
+             "ECB must be loaded!")
+     (assert ecb-minor-mode nil
+             "ECB must be activated!")
+     (assert (equal (selected-frame) ecb-frame) nil
+             "The ECB-frame must be selected!")
+     (assert (ecb-string= ecb-layout-name "example-layout1") nil
+             "The example-layout1 is not active!")
+   
+     ;; we stop here the synchronization.
+     (ecb-stop-autocontrol/sync-function 'ecb-examples-bufferinfo-buffer-sync)
+   
+     (ecb-examples-preactivation-state 'restore)
+   
+     (ecb-layout-switch ecb-layout-name))
+</pre>
+   <p>Now we have all code for the new layout and the new layout-buffers. 
+The example is ready for use; just load <samp><span class="file">ecb-examples.el</span></samp> (s.a.).
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> JDEE is
+available at
+<a href="http://jdee.sunsite.dk/">http://jdee.sunsite.dk/</a>
+</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> You can change the code
+in the file <samp><span class="file">ecb-examples.el</span></samp> to use a frame-fraction of 0.2
+instead of 6 hard lines, just try it!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Rebuilding-the-Methods.html b/site/ecb-2.40/html-help/Rebuilding-the-Methods.html
new file mode 100644
index 0000000..0f897d4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Rebuilding-the-Methods.html
@@ -0,0 +1,78 @@
+<html lang="en">
+<head>
+<title>Rebuilding the Methods - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="prev" href="Customizing-the-display.html#Customizing-the-display" title="Customizing the display">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Rebuilding-the-Methods"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.6.4 Rebuilding the Methods-buffer</h4>
+
+<p>In almost all cases there is <strong>NO</strong> need to manually rebuild the
+method-buffer, because it is always done automatically if necessary;
+the mechanism depends on the sources:
+
+     <ul>
+<li>semantic-sources:
+The command <code>global-semantic-auto-parse-mode</code> switches on autom. 
+reparsing of semantic-sources.
+
+     <li>non-semantic-sources (imenu supported):
+You can switch on autom. rescanning/reparsing with the option
+<code>imenu-auto-rescan</code>. But nevertheless you have to manually
+rebuild the Method-buffer (with the autom. updated imenu-tags) via the
+command <code>ecb-rebuild-methods-buffer</code> (bound to <kbd>C-c . r</kbd>).
+
+     <li>non-semantic-sources (etags supported):
+For these sources there is no built-in auto-rescan mechanism, because
+etags is an external tool it can only operate on the saved
+file-contents. So rescanning the buffer contents would need to save
+the buffer before. Therefore there is no built-in auto-rescan mechanism
+because this would always result in saving the buffer and running an
+external tool. But of course you can program such a an
+etags-auto-rescan mechanism for yourself! 
+</ul>
+
+   <p>Besides for etags-supported non-semantic-sources there exist a few rare
+scenarios also for the other sources where a complete manual rebuild
+can be necessary. Here is one example:
+
+   <p>Depending on the semantic-version: If an Elisp-file is parsed which
+contains a defun X in the middle where the closing ) is missing, then
+semantic parses only until this defun X is reached and you will get an
+incomplete ECB-method buffer. In such a case you must complete the
+defun X and then completely reparse the Elisp-file and rebuild the ECB
+method buffer!
+
+   <p>A complete manually rebuild is done by
+<code>ecb-rebuild-methods-buffer</code>. For etags-parsed
+non-semantic-sources this causes an automatic saving of the
+source-buffer because otherwise etags would not operate with the
+latest contents!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Redrawing-the-ECB_002dlayout.html b/site/ecb-2.40/html-help/Redrawing-the-ECB_002dlayout.html
new file mode 100644
index 0000000..020b8e3
--- /dev/null
+++ b/site/ecb-2.40/html-help/Redrawing-the-ECB_002dlayout.html
@@ -0,0 +1,57 @@
+<html lang="en">
+<head>
+<title>Redrawing the ECB-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-ECB_002dlayout.html#The-ECB_002dlayout" title="The ECB-layout">
+<link rel="prev" href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout" title="Changing the ECB-layout">
+<link rel="next" href="Changing-window-sizes.html#Changing-window-sizes" title="Changing window sizes">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Redrawing-the-ECB-layout"></a>
+<a name="Redrawing-the-ECB_002dlayout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Changing-window-sizes.html#Changing-window-sizes">Changing window sizes</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.8.2 Redrawing the ECB-layout</h4>
+
+<p><a name="index-Redraw-52"></a>If you have unintentionally destroyed the ECB-layout, you can always
+restore the layout with calling <code>ecb-redraw-layout</code>. This is even
+true, if you get messages like &ldquo;wrong-type-argument window-live-p
+#&lt;window 222&gt;&rdquo;.
+
+   <p>If the variable <code>ecb-redraw-layout-quickly</code> is not nil then the redraw
+is done by the <code>ecb-redraw-layout-quickly</code> function, otherwise by
+<code>ecb-redraw-layout-full</code>. But it's strongly recommended to use the
+quick redraw only if you have really slow machines where a full redraw
+takes several seconds because the quick redraw is not really safe and
+may have some drawbacks! On normal machines the full redraw should be
+done in &lt;&lt; 1s!
+
+   <p>Please read the documentation of the command <code>ecb-redraw-layout</code>!
+
+   <p>See also the hooks <code>ecb-redraw-layout-after-hook</code> and
+<code>ecb-redraw-layout-before-hook</code>!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Refreshing-the-VC_002dstate.html b/site/ecb-2.40/html-help/Refreshing-the-VC_002dstate.html
new file mode 100644
index 0000000..e377919
--- /dev/null
+++ b/site/ecb-2.40/html-help/Refreshing-the-VC_002dstate.html
@@ -0,0 +1,86 @@
+<html lang="en">
+<head>
+<title>Refreshing the VC-state - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Remote-repositories.html#Remote-repositories" title="Remote repositories">
+<link rel="next" href="Adding-new-backends.html#Adding-new-backends" title="Adding new backends">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Refreshing-the-VC-state"></a>
+<a name="Refreshing-the-VC_002dstate"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Adding-new-backends.html#Adding-new-backends">Adding new backends</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Remote-repositories.html#Remote-repositories">Remote repositories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.4 How to refresh ECB-state-display when changed outside</h4>
+
+<p>If all actions concerning version controlling of a file are performed
+within Emacs with commands offeres by VC then the displayed state for
+such a file in the tree-buffers of ECB will be always correct - in
+that sense that ECB will always display that state which the
+check-state-function for the file will return. At least with GNU Emacs
+for the backends CVS, RCS, SCCS and Subversion this will be true. With
+XEmacs only for CVS. For other backends see <a href="Adding-new-backends.html#Adding-new-backends">Adding new backends</a>.
+
+   <p>But if the VC-state of a file will be changed outside of Emacs
+(unfortunately PCL-CVS must be called &ldquo;outside&rdquo; too because PCL-CVS
+doesn't use the functions of the VC-package of Emacs for checking-in
+or -out) then ECB can not automatically recognize this and therefore
+it can not aurtomatically update the displayed state-image-icon. You
+have to tell ECB for which files in the tree-buffers the VC-state
+should be recomputed. This can be done via the popup-menus of the
+ECB-tree-buffers - The following popup-commands are offered in the
+submenu &ldquo;Version Control&rdquo;:
+
+     <dl>
+<dt>ECB-directories-buffer (if sources are displayed within):<dd>&ldquo;Recompute state for file&rdquo; and &ldquo;Recompute state for dir&rdquo; whereas
+the latter one recomputes the VC-state for all files of that directory
+the file belongs. 
+<br><dt>ECB-sources-buffer<dd>&ldquo;Recompute state for file&rdquo; and &ldquo;Recompute state for dir&rdquo; whereas
+the latter one recomputes the VC-state for all files currently
+displayed in the sources-buffer. 
+<br><dt>ECB-history-buffer<dd>&ldquo;Recompute state for file&rdquo; and &ldquo;Recompute state for whole history&rdquo;
+whereas the latter one recomputes the VC-state for all file-entries currently
+displayed in the history-buffer. 
+</dl>
+
+   <p><strong>Caution</strong>: The state will only recomputed right under all
+situations if you use either <code>ecb-vc-state</code> or
+<code>vc-recompute-state</code> as check-state-function in
+<code>ecb-vc-supported-backends</code> (see <a href="Checking-the-state.html#Checking-the-state">Checking the state</a>).
+
+   <p>Of course all these commands update the VC-state in all visible
+tree-buffers the file is currently displayed (e.g. often a file is
+displayed in the sources- and the history-buffer)!
+
+   <p>For general informations about the usage of popup-menus in ECB see
+<a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a> (subsection &ldquo;The right mouse button&rdquo;).
+
+   <p>In addition to these popup-commands using the POWER- rsp. Shift-click
+(see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) onto a directory in the directory-window of
+ECB refreshes the VC-state-values of all files contained in this
+directory too.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Remote-directories.html b/site/ecb-2.40/html-help/Remote-directories.html
new file mode 100644
index 0000000..e1d9531
--- /dev/null
+++ b/site/ecb-2.40/html-help/Remote-directories.html
@@ -0,0 +1,117 @@
+<html lang="en">
+<head>
+<title>Remote directories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Large-directories.html#Large-directories" title="Large directories">
+<link rel="next" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Remote-directories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Large-directories.html#Large-directories">Large directories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.7 Working with remote directories</h3>
+
+<p>The term &ldquo;remote&rdquo; means directories which are remote in the sense of
+TRAMP<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>, ANGE-FTP<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a> or EFS<a rel="footnote" href="#fn-3" name="fnd-3"><sup>3</sup></a>. Each of these Emacs-addons is intended to make editing
+directories and files on remote machines as transparent as possible.
+
+<h4 class="subsection">10.7.1 General remarks</h4>
+
+<p>ECB supports such remote directoires out of the box and completely
+transparently, i.e. you can add remote directories to the option
+<code>ecb-source-path</code> without any restriction. ECB will handle these
+directories transparently with the appropriate tool - either TRAMP,
+ANGE-FTP or EFS. So when  working with such a remote directory is
+possible without ECB it will be possible too with active ECB - at
+least as long you are &ldquo;connected&rdquo;!
+
+   <p><strong>Caution</strong>: Suppose you have added a remote dir (e.g. 
+&ldquo;user@host.at.a.server:/dir/&rdquo;) to <code>ecb-source-path</code> and you
+start ECB when you are offline, means there can be no connection
+established to the remote computer (e.g. &ldquo;host.at.a.server&rdquo;). Each
+time ECB has to process a remote path ECB pings via the ping-program
+the remote host (in the example above it would ping the host
+&ldquo;host.at.a.server&rdquo;) to test if it is accessible. If not then this
+path will be ignored by ECB<a rel="footnote" href="#fn-4" name="fnd-4"><sup>4</sup></a>. Ensure that ECB
+calls your ping-program (see <code>ecb-ping-program</code>) with the right
+options (see <code>ecb-ping-options</code>). To avoid to many pings to the
+same host ECB caches the ping result so there should be no performance
+decrease. But to ensure still correct accessible-results and to avoid
+using outdated cache-results ECB discards the cached value of the
+accessible-state of a certain host after a customizable time-interval
+(please read the documentation of
+<code>ecb-host-accessible-check-valid-time</code>!).
+
+<h4 class="subsection">10.7.2 Excluding remote directories from time-consuming tasks</h4>
+
+<p>ECB performs some tasks stealthily and interruptable by the user (see
+the option <code>ecb-stealthy-tasks-delay</code> for additional
+explanations) because these tasks are time-consuming and could
+otherwise ECB block. Especially for remote directories these special
+tasks can cause annoying blocks of Emacs (see <a href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>).
+
+   <p>Therefore it is probably the best to switch on each of the stealthy
+tasks with the <code>unless-remote</code> which is the default activation
+(see <a href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>). So a certain stealthy task will
+be swtiched on for all local directories (and also for all mounted
+drives in the LAN) but not for real remote directories used via TRAMP,
+ANGE-FTP or EFS.
+
+<h4 class="subsection">10.7.3 Caching the contents of remote directories</h4>
+
+<p>ECB caches per default the contents of remote directories to avoid
+annoying delays. The cache is done via the option
+<code>ecb-cache-directory-contents</code> which contains an entry which
+covers the syntax of remote directories. If you do not want this
+caching (which is strongly recommened) you have to remove this entry
+from this option.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> TRAMP stands for 'Transparent Remote (file) Access,
+Multiple Protocol'. This package provides remote file editing, similar
+to ANGE-FTP.</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> This package attempts to make
+accessing files and directories using FTP from within Emacs as simple
+and transparent as possible.</p>
+
+   <p class="footnote"><small>[<a name="fn-3" href="#fnd-3">3</a>]</small> A system for transparent
+file-transfer between remote hosts using the FTP protocol within
+Emacs</p>
+
+   <p class="footnote"><small>[<a name="fn-4" href="#fnd-4">4</a>]</small> This avoids long lasting and
+annoying blocking of ECB when a remote-path is not accessible: Without
+a ping ECB would always try to open this directory through the
+appropriate library (e.g. TRAMP) and it would depend on the
+timeout-mechanism of this library (e.g. TRAMP has 60 seconds) how long
+ECB would be blocked. First after this timeout ECB could start
+working! A fast &ldquo;pre&rdquo;-ping avoids this problem!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Remote-repositories.html b/site/ecb-2.40/html-help/Remote-repositories.html
new file mode 100644
index 0000000..0053641
--- /dev/null
+++ b/site/ecb-2.40/html-help/Remote-repositories.html
@@ -0,0 +1,75 @@
+<html lang="en">
+<head>
+<title>Remote repositories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="prev" href="Checking-the-state.html#Checking-the-state" title="Checking the state">
+<link rel="next" href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate" title="Refreshing the VC-state">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Remote-repositories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate">Refreshing the VC-state</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Checking-the-state.html#Checking-the-state">Checking the state</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>
+<hr>
+</div>
+
+<h4 class="subsection">10.8.3 Important informations about remote repositories</h4>
+
+<p>At least CVS can be used in a mode called &ldquo;Client/Server&rdquo; which
+means the root repository is located on a remote machine. We call a
+repository which can not being mounted by the client-machine (which
+contains the working directory) a <dfn>remote repository</dfn>. In most
+cases getting the fresh and real VC-state for such repositories will
+be unacceptable slow or often users will work offline means with no
+connection available to the remote host. To avoid problems like these
+ECB offers first an option <code>ecb-vc-directory-exclude-regexps</code> to
+exclude such directories with a remote repository from the VC-support
+of ECB and secondary the identify-backend-funtion
+<code>ecb-vc-dir-managed-by-CVS</code> behaves smart with that respect
+(see <a href="Identifying-backends.html#Identifying-backends">Identifying backends</a>). See also
+<code>ecb-vc-xemacs-exclude-remote-cvs-repository</code>!
+
+<h5 class="subsubsection">10.8.3.1 Remote paths and the VC-support of ECB</h5>
+
+<p>ECB supports working with remote directories like TRAMP- or
+EFS-directories (see <a href="Remote-directories.html#Remote-directories">Remote directories</a>). Do not confuse remote
+directories with remote repositories. A local directory located on
+your disk and set in <code>ecb-source-path</code> can have a remote
+repository if managed by a VC-system. A remote directory means a path
+in the format of TRAMP, ANGE-FTP or EFS set in <code>ecb-source-path</code>. 
+Its very likely that getting the VC-state of files contained in such a
+remote directory would be extremly expensive and therefore ECB would
+be blocked quite long even if the VC-check is performed stealthy
+(see <a href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>).
+
+   <p>To avoid problems with such remote directories ECB prevents per
+default such directories from being processed by the VC-support of
+ECB. But if a user is dying to having the VC-state being displayed in
+the tree-buffers ECB offers two ways to switch on the VC-support - see
+the option <code>ecb-vc-enable-support</code>: This option is set per
+default to the value <code>unless-remote</code> which means remote paths
+will not be processed but it can be set to <code>t</code> which means
+process all directories regardless if remote or not. It's strongly
+recommended to use <code>unless-remote</code>!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Requirements.html b/site/ecb-2.40/html-help/Requirements.html
new file mode 100644
index 0000000..32d53bb
--- /dev/null
+++ b/site/ecb-2.40/html-help/Requirements.html
@@ -0,0 +1,70 @@
+<html lang="en">
+<head>
+<title>Requirements - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Installation.html#Installation" title="Installation">
+<link rel="prev" href="Installation.html#Installation" title="Installation">
+<link rel="next" href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage" title="ECB as XEmacs-package">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Requirements"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage">ECB as XEmacs-package</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Installation.html#Installation">Installation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Installation.html#Installation">Installation</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.1.1 Requirements</h4>
+
+<p>This section describes the requirements of ECB. Just follow these steps and
+the requirements of ECB are fulfilled.
+
+     <ol type=1 start=1>
+
+     <li>Emacs-version:
+ECB works only with (X)Emacs &gt;= 21! If you have an older one, please upgrade.
+
+     <li>Install CEDET-suite:
+Get it from <a href="http://cedet.sourceforge.net">http://cedet.sourceforge.net</a>, read the setup-instructions in
+<a href="http://cedet.sourceforge.net/setup.shtml">http://cedet.sourceforge.net/setup.shtml</a> and read also the shipped file
+<samp><span class="file">INSTALL</span></samp>.
+
+     <p><strong>Please note</strong>: ECB requires now a complete CEDET-installation! It will
+not longer work with outdated separate packages semantic 1.4.X, eieio 0.X and
+speedbar 0.X!
+
+     <li>Only for XEmacs-users:
+If you use XEmacs you must have installed the
+package c-support (contains hideshow.el). If you want to read the online-help
+of ECB in HTML-format you must have the library browse-url (part of the
+mail-lib XEmacs package) installed; this package is also needed for submitting
+problem-reports to the ECB-maintainers!
+
+     <li>Optional for Java-coding:
+If Java code is edited the ECB works best when the JDEE package (
+<a href="http://jdee.sourceforge.net">http://jdee.sourceforge.net</a>) is installed.
+
+        </ol>
+
+   <p>Do not install ECB before you have successfully installed the requirements!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Semantic-analyser.html b/site/ecb-2.40/html-help/Semantic-analyser.html
new file mode 100644
index 0000000..c48f5e4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Semantic-analyser.html
@@ -0,0 +1,168 @@
+<html lang="en">
+<head>
+<title>Semantic analyser - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows" title="Add-on ECB-windows">
+<link rel="prev" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows" title="Add-on ECB-windows">
+<link rel="next" href="Symboldefinition.html#Symboldefinition" title="Symboldefinition">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Semantic-analyser"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Symboldefinition.html#Symboldefinition">Symboldefinition</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.2.1 Displaying the current semantic context via analyser</h4>
+
+<p><a name="index-Analyse-7"></a><a name="index-Analyze-8"></a>The CEDET-suite contains the <dfn>semantic analyzer</dfn><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> which is a
+library tool that performs context analysis and can derive useful
+information.
+
+   <p>Please see the related node in the info-manual of cedet/semantic for more
+detailed informations about this tool and how to setup it for best performance
+for your project needs.
+
+   <p>The semantic-analyzer output can be used through a special ECB-window. This
+interface lists details about the analysis, such as the current function,
+local arguments and variables, details on the prefix (the symbol the cursor is
+on), and a list of all possible completions (see
+<code>semantic-analyze-possible-completions</code> for more details about
+completions available via the semantic-analyser).
+
+   <p>The analyser-ECB-window is of type tree-buffer. See <a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">Tree-buffer basics</a> for basic informations how to use such a tree-buffer.
+
+<h5 class="subsubsection">4.2.1.1 Usage of the analyser-ECB-window</h5>
+
+     <ul>
+<li>When a node-name in the &ldquo;Context&rdquo;-bucket is selected with the
+primary mouse button (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>) or RETURN (see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) the buffer in the edit-window (which one depends on the
+setting in <code>ecb-mouse-click-destination</code>) will jump to the
+related entry. For strongly typed languages, this means you will jump
+to the definition of the variable, slot, or type definition.
+
+     <li>Clicking on a node-name in the &ldquo;Context&rdquo;-bucket with the secondary
+mouse button or C-RETURN (see <a href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>) will jump to the
+related entry in another edit window - which one depends on the
+setting in <code>ecb-mouse-click-destination</code>.
+
+     <li>If you click on a node-name in the "Completions"-bucket, then the text
+that was recently analyzed will be replaced with the name of the tag
+that was clicked on in the analyser-ECB-window.
+
+     <li>Right clicking with the mouse (or with the keyboard, see <a href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>) onto a tree-node opens a popup-menu which allows to
+display additional (if available) informations to the current node. 
+</ul>
+
+<h5 class="subsubsection">4.2.1.2 Synchronizing the analyse-window</h5>
+
+<p>Per default the content of the analyser-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (see <code>ecb-analyse-buffer-sync</code> and most notably
+<code>ecb-analyse-buffer-sync-delay</code>) and <a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>).
+
+   <p>In contrary to the sync-options of the basic ECB-windows<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a> the default synchronisation delay of the
+ECB-analyse-window is quite high: 2 seconds (see
+<code>ecb-analyse-buffer-sync</code>).
+
+   <p>What is the reason for this: a small value like 0.25 as for the basic windows
+would make the analyse-window quite unusable because then more or less after
+each type (depends on how fast you are typing) the analyse window would be
+synchronized with current point, which can be really annoying when there would
+be hundreds of completions for the current point.
+
+   <p>Imagine the following scenario: programming in emacs-lisp, typing
+<pre class="example">   (e
+</pre>
+   <p>and then you make a short break, just a moment, but immediately ECB would call
+the semantic-analyzer to analyse the current context for possible completions
+(a.o.). You can imagine that there are even thousands of possible function
+completions in emacs-lisp which beginns with &ldquo;e&rdquo;. Getting all these and
+displaying them in the analyse-window can take some time! Of course the whole
+stuff is interruptable by any key-press so ECB will not be blocked but
+nevertheless the will be a noticeable break in your typing.
+
+   <p>Therefore it is strongly recommended to choose one of the following
+possibilities:
+
+     <ul>
+<li>Automatic synchronizing with long delay
+
+     <p>Set <code>ecb-analyse-buffer-sync-delay</code> to a value which is suitable for your
+programing and typing style, default is already to seconds.
+
+     <li>Manually synchronizing on demand
+
+          <ol type=1 start=1>
+
+          <li>Switch off the automatic synchronizing for the ECB-analyse-window by setting
+the option <code>ecb-analyse-buffer-sync</code> to nil. Use always customize for
+this, never setq! 
+<li>Bind the command <code>ecb-analyse-buffer-sync</code> to a conveniant shortcut
+<li>Synchronize the analyse-window exactly then when you need the
+context informations for current point (e.g. possible local variables or
+completions).
+
+          <p>But note that semantic already offers some intellisense commands which can
+help you on demand too! See the documentation of the semantic analyzer.
+          </ol>
+
+   </ul>
+
+<h5 class="subsubsection">4.2.1.3 Interactive commands of the analyser-ECB-window</h5>
+
+<p>ECB offers the following commands for the analyser-ECB-window:
+
+     <ul>
+<li><code>ecb-analyse-buffer-sync</code>
+<li><code>ecb-goto-window-analyse</code>
+<li><code>ecb-maximize-window-analyse</code>
+</ul>
+
+   <p>See <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a> for details about these commands.
+
+<h5 class="subsubsection">4.2.1.4 Activating/Displaying the analyser-ECB-window</h5>
+
+<p>Either use one of the predefined layouts "left-analyse" or
+&ldquo;leftright-analyse&rdquo; (e.g. via <kbd>C-c . l c</kbd>) or create a new
+ecb-layout via the command <code>ecb-create-new-layout</code> and add a
+buffer of type &ldquo;other&rdquo; and name &ldquo;analyse&rdquo; into this new layout
+(see <a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>).
+
+<h5 class="subsubsection">4.2.1.5 Customizing the analyser ECB-window</h5>
+
+<p>See <a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a> for a list of all options currently available
+for customizing this ECB-window to your needs.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Note that ECB
+uses analyser (with s) whereas semantic uses analyzer (with z).</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> see
+<a href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a> and the options <code>ecb-basic-buffer-sync</code> and
+<code>ecb-basic-buffer-sync-delay</code>.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Setting-up-CEDET_002fsemantic.html b/site/ecb-2.40/html-help/Setting-up-CEDET_002fsemantic.html
new file mode 100644
index 0000000..1d55fd9
--- /dev/null
+++ b/site/ecb-2.40/html-help/Setting-up-CEDET_002fsemantic.html
@@ -0,0 +1,113 @@
+<html lang="en">
+<head>
+<title>Setting up CEDET/semantic - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Setting-up-Emacs.html#Setting-up-Emacs" title="Setting up Emacs">
+<link rel="prev" href="General-hints.html#General-hints" title="General hints">
+<link rel="next" href="Non_002dsemantic-files.html#Non_002dsemantic-files" title="Non-semantic files">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Setting-up-CEDET%2fsemantic"></a>
+<a name="Setting-up-CEDET_002fsemantic"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Non_002dsemantic-files.html#Non_002dsemantic-files">Non-semantic files</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="General-hints.html#General-hints">General hints</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.2.2 Setting up CEDET/semantic</h4>
+
+<p>To ensure ECB and semantic are working correctly for all by semantic
+supported languages you have to pay attention to the following aspects
+concerning your Emacs-setup:
+
+     <ol type=1 start=1>
+<li>Setting up CEDET/semantic itself
+
+     <p>This section implies that you have already successfully installed
+the CEDET-suite and describes how to setup cedet and here mainly
+semantic.
+
+     <p>For all semantic-supported file-types parsing files is done completely
+by semantic. ECB just displays the parsing results. For all needs of
+ECB semantic is completely setup by ECB itself, i.e. ECB sets up
+semantic for you!
+
+     <p><strong>Please note</strong>: Nevertheless you should read carefully the file
+<samp><span class="file">INSTALL</span></samp> shipped with the cedet-suite. In addition the CEDET-website
+offers a link to a &ldquo;Gentle introduction to Cedet&rdquo;. It's worth to read it! 
+You find it here:
+<a href="http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html">http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html</a>
+If CEDET is not correctly installed then ECB can not setup semantic for its
+needs.
+
+     <p><strong>Minimum setup recommendation</strong>: It is very useful to enable the
+<code>global-semantic-idle-scheduler-mode</code> and
+<code>global-semanticdb-minor-mode</code>. Read the manual of cedet/semantic how to
+do this. With CEDET-versions &gt;= 1.0pre6 this can be done by adding
+<code>semantic-load-enable-minimum-features</code> to your startup-file. Please read
+also the subsection &ldquo;Jumping to the definition of external types&rdquo; in
+<a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>.
+
+     <p><a name="Checking-your-hooks"></a>
+<li>Checking your hooks
+
+     <p>If you have already checked point (1.) and if you have still problems
+getting ECB/semantic working properly for your sources you should
+check the related major-mode hook. Every major-mode X has a hook with
+name &ldquo;X-hook&rdquo; which is evaluated after activating the major-mode
+(see above, 2.), e.g. the hook for the major-mode <code>c++-mode</code> is
+<code>c++-mode-hook</code>.
+
+     <p>Semantic adds automatically during load-time a special
+&ldquo;semantic-setup&rdquo; to these major-mode hooks<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> in form of a
+&ldquo;setup-function&rdquo;. Example: For c and c++ modes semantic adds
+<code>semantic-default-c-setup</code> to <code>c-mode-hook</code> and
+<code>c++-mode-hook</code>.
+
+     <p>If your own Emacs-setup (e.g. in <samp><span class="file">.emacs</span></samp> or
+<samp><span class="file">site-lisp/site-start.el</span></samp>) overwrites such a major-mode-hook then
+semantic can not be activated for this major-mode and in consequence
+ECB can not work properly too!
+
+     <p>Check if your Emacs-setup uses somewhere <code>setq</code> for adding code
+to a major-mode-hook. <strong>IMPORTANT</strong>: Use <code>add-hook</code> instead of
+<code>setq</code><a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>!
+
+        </ol>
+
+   <p>If your source-files are &ldquo;running&rdquo; with correct <code>major-mode</code>
+and correct major-mode hooks ECB and semantic will do what you expect
+them doing!
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course only
+for major-modes supported by semantic!</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> <code>setq</code> replaces/overwrites the current
+value of a hook with the new value whereas <code>add-hook</code>
+<strong>adds</strong> the new value to the old-value of the hook!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Setting-up-Emacs.html b/site/ecb-2.40/html-help/Setting-up-Emacs.html
new file mode 100644
index 0000000..248852a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Setting-up-Emacs.html
@@ -0,0 +1,48 @@
+<html lang="en">
+<head>
+<title>Setting up Emacs - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link rel="prev" href="Installation.html#Installation" title="Installation">
+<link rel="next" href="First-steps.html#First-steps" title="First steps">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Setting-up-Emacs"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="First-steps.html#First-steps">First steps</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Installation.html#Installation">Installation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>
+<hr>
+</div>
+
+<h3 class="section">1.2 How to set up Emacs for file parsing with ECB</h3>
+
+<p><strong>Please note</strong>: Normally it should not necessary for you to
+bother with the following stuff unless you have problems getting ECB
+working correctly for you.
+
+<ul class="menu">
+<li><a accesskey="1" href="General-hints.html#General-hints">General hints</a>:                General hints for a correct setup
+<li><a accesskey="2" href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>:    How to setup semantic correctly
+<li><a accesskey="3" href="Non_002dsemantic-files.html#Non_002dsemantic-files">Non-semantic files</a>:           Setup for file types not supported by semantic
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Simulating-speedbar.html b/site/ecb-2.40/html-help/Simulating-speedbar.html
new file mode 100644
index 0000000..f8adbb4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Simulating-speedbar.html
@@ -0,0 +1,62 @@
+<html lang="en">
+<head>
+<title>Simulating speedbar - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Big-screens.html#Big-screens" title="Big screens">
+<link rel="next" href="Integrating-speedbar.html#Integrating-speedbar" title="Integrating speedbar">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Simulating-speedbar"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Big-screens.html#Big-screens">Big screens</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.4 Simulating speedbar without an extra frame</h3>
+
+<p><a name="index-Speedbar-351"></a>You can simulate a speedbar-like layout within ONE frame by doing the
+following:
+
+     <ol type=1 start=1>
+<li>Customize <code>ecb-layout-name</code> to layout name &ldquo;left9&rdquo;, &ldquo;left12&rdquo;,
+&ldquo;left13&rdquo; or &ldquo;left14&rdquo; dependent to what you like.
+
+     <li>Optional: Ensure that <code>ecb-compile-window-height</code> is nil.
+
+     <li>Optional: Adjust the <code>ecb-windows-width</code>.
+
+     <li>Optional: Customize <code>ecb-toggle-layout-sequence</code> and toggle very fast
+between several layouts by <code>ecb-toggle-layout</code>. See the doc-strings!
+
+     <li>Optional: Customize <code>ecb-show-sources-in-directories-buffer</code> to
+not nil if the chosen layout (see 1. and 4.) contains a
+directories-tree-buffer.
+
+     <li>Save your changes.
+        </ol>
+
+   <p>But not only simulating speedbar is possible but also full integrating
+it into the ECB and the ECB-frame, See <a href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Site_002dwide-customizing.html b/site/ecb-2.40/html-help/Site_002dwide-customizing.html
new file mode 100644
index 0000000..b0cb62a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Site_002dwide-customizing.html
@@ -0,0 +1,173 @@
+<html lang="en">
+<head>
+<title>Site-wide customizing - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="General-aspects.html#General-aspects" title="General aspects">
+<link rel="prev" href="setq-or-customize.html#setq-or-customize" title="setq or customize">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Site-wide-customizing"></a>
+<a name="Site_002dwide-customizing"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="setq-or-customize.html#setq-or-customize">setq or customize</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="General-aspects.html#General-aspects">General aspects</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.1.2 Site-wide customizing of ECB</h4>
+
+<p>If you are the administrator for an Emacs-site, means you are
+responsible for the basic customization of a lot of Emacs users, then
+you maybe need a way to customize Emacs and ECB without changing
+everyones <samp><span class="file">.emacs</span></samp>-file and normally you will do this with the
+file <samp><span class="file">site-start.el</span></samp>. You can customize all options of ECB in a
+central <samp><span class="file">site-start.el</span></samp> (even the options mentioned above!) but
+you <strong>MUST NOT</strong> do this via <code>setq</code> but you have to use a
+mechanism like the following<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>!
+
+   <p>This section describes two methods how to pre-customize ECB site-wide. 
+The elisp-code contained in the following two subsections has to be
+copied to the file <samp><span class="file">site-start.el</span></samp> before it can be used.
+
+   <p>But ensure for both methods that you customize the options with the
+correct lisp format. Read carefully the docstrings of the options you
+want to customize from within Elisp-code!
+
+<h5 class="subsubsection">7.1.2.1 Storing all option-settings in the users custom-file</h5>
+
+<p>The mechanism described here defines all site-wide-settings in a file
+<samp><span class="file">site-lisp.el</span></samp> but stores the values in the users
+<code>custom-file</code> which is probably <samp><span class="file">.emacs</span></samp>!
+
+   <p>First two helper functions are needed, namely
+<code>customize-option-get-value</code> and
+<code>customize-save-variable-save</code> whereas the latter one sets the
+value for an option via the customize-mechanism (and is therefore
+allowed for the setq-forbidden options!) but only if the option has no
+saved value until now (i.e. the user has not saved this option for
+future sessions until now)
+
+<pre class="example">   (defun customize-option-get-value (option type)
+     "Return the value of a customizable option OPTION with TYPE, where TYPE
+   can either be 'standard-value \(the default-value of the defcustom) or
+   'saved-value \(the value stored persistent by the user via customize)."
+     (let ((val (car (get option type))))
+       (cond ((not (listp val)) val)
+             ((equal 'quote (car val)) (car (cdr val)))
+             (t (car val)))))
+   
+   (defun customize-save-variable-save (option value &amp;optional override)
+     "Calls `customize-save-variable' with OPTION and VALUE if OPTION is a
+   custom-type and if OPTION has no saved-value until now.
+   If OVERRIDE is a function or lambda-form then it is called with two arguments:
+   - OLD-SAVED-VAL: The saved value of OPTION
+   - NEW-VALUE: see argument VALUE.
+   OVERRIDE is only called if OPTION has already a saved-value. If OVERIDE
+   returns not nil then `customize-save-variable' is called for OPTION with VALUE
+   even if OPTION has no saved-value until now."
+     (and (get option 'custom-type)
+          (or (not (get option 'saved-value))
+              (and (functionp override)
+                   (funcall override
+                            (customize-option-get-value option 'saved-value)
+                            value)))
+          (progn
+            (message "Overriding saved value for option %s with %s" option value)
+            (customize-save-variable option value))))
+</pre>
+   <p>With <code>customize-save-variable-save</code> all ECB-options can be
+site-wide pre-customized like follows:
+
+<pre class="example">   (customize-save-variable-save 'ecb-show-tags
+                                 '((include collapsed nil)
+                                   (parent collapsed nil)
+                                   (type flattened nil)
+                                   (variable collapsed name)
+                                   (function flattened name)
+                                   (rule flattened name)
+                                   (section flattened nil)
+                                   (def collapsed name)
+                                   (t collapsed name)))
+   (customize-save-variable-save 'ecb-font-lock-tags t)
+   ;; add here more options of ECB it you want
+</pre>
+   <h5 class="subsubsection">7.1.2.2 Using a special setq for site-wide settings</h5>
+
+<p>The mechanism above saves the pre-customized values always in the
+users <code>custom-file</code> (probably <samp><span class="file">.emacs</span></samp>). If this is not
+preferred, then you can use the following mechanism but of course the
+offered <code>setq-save</code> is only allowed for options which are not
+setq-forbidden (see <a href="setq-or-customize.html#setq-or-customize">setq or customize</a>).
+
+   <p>The mechanism below does not change the users <code>custom-file</code>. This
+mechanism is needed especially if ECB should be autoloaded and all
+site-wide settings should first loaded when ECB is activated by the
+user. This can be achieved for example via<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>:
+
+<pre class="example">   (require 'ecb-autoloads))
+   (eval-after-load "ecb"
+     '(require 'site-ecb))
+</pre>
+   <p>In such a situation the whole <code>custom-file</code> of a user is mostly
+loaded <strong>before</strong> ECB is activated and therefore before the
+site-wide-settings are loaded. So the users own customizations are
+loaded before the site-wide ones.
+
+   <p>The <code>setq-save</code>-mechanism described below prevents the users own
+customisations contained in his <code>custom-file</code> from being
+overridden by the site-wide setq-settings. If <code>setq</code> would be
+used for the site-wide settings then in an autoload-situation the
+site-wide settings would override the users-settings and this should
+not be done!
+
+   <p>First two helper-macros are needed:
+
+<pre class="example">   (defmacro custom-saved-p (option)
+     "Return only not nil if OPTION is a defcustom-option and has a
+   saved value. Option is a variable and is literal \(not evaluated)."
+     `(and (get (quote ,option) 'custom-type)
+           (get (quote ,option) 'saved-value)))
+   
+   (defmacro setq-save (option value)
+     "Sets OPTION to VALUE if and only if OPTION is not already saved
+   by customize. Option is a variable and is literal \(not evaluated)."
+     `(and (not (custom-saved-p ,option))
+           (set (quote ,option) ,value)))
+</pre>
+   <p>With <code>setq-save</code> all &ldquo;not-setq-forbidden&rdquo;-ECB-options can be
+site-wide pre-customized like follows:
+
+<pre class="example">   (setq-save ecb-tree-indent 4)
+   (setq-save ecb-tree-expand-symbol-before t)
+   (setq-save ecb-primary-secondary-mouse-buttons 'mouse-1--mouse-2)
+</pre>
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> At least for the options for
+which <code>setq</code> is explicitly forbidden, but it is recommended to
+use always such a mechanism</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> The file
+<samp><span class="file">site-ecb.el</span></samp> contains all site-wide settings for ECB</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Small-screens.html b/site/ecb-2.40/html-help/Small-screens.html
new file mode 100644
index 0000000..230b9e1
--- /dev/null
+++ b/site/ecb-2.40/html-help/Small-screens.html
@@ -0,0 +1,73 @@
+<html lang="en">
+<head>
+<title>Small screens - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Changing-faces.html#Changing-faces" title="Changing faces">
+<link rel="next" href="Big-screens.html#Big-screens" title="Big screens">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Small-screens"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Big-screens.html#Big-screens">Big screens</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Changing-faces.html#Changing-faces">Changing faces</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.2 Working with small screens</h3>
+
+<p><a name="index-Small-screen-350"></a>If your screen is very small so you need every square-centimeter for
+displaying the buffer which you want to edit, ECB offers you a special
+layouts, where only the ECB-methods buffer is displayed on top or on
+left-side. Here comes what you should/can do to work best with ECB in
+such a situation:
+
+     <ul>
+<li>First customize your ECB:
+
+          <ol type=1 start=1>
+<li>Customize <code>ecb-layout-name</code> to layout-name &ldquo;top2&rdquo; (on top) or
+&ldquo;left9&rdquo; (on left-side)
+
+          <li>Ensure that <code>ecb-compile-window-height</code> is nil.
+
+          <li>Optional: Adjust the <code>ecb-windows-height</code> rsp. <code>ecb-windows-width</code>.
+
+          <li>Save your changes.
+          </ol>
+
+     <li>To edit your buffers:
+Call <code>ecb-toggle-ecb-windows</code> (also available via the menu &ldquo;ECB&rdquo; and
+by <kbd>C-c . lw</kbd>) or <code>ecb-hide-ecb-windows</code> to hide the ECB-method buffer
+so you get all the place of your screen for editing.
+
+     <li>To browse and select functions:
+Call <code>ecb-toggle-ecb-windows</code> or <code>ecb-show-ecb-windows</code> to
+make the ECB-method buffer visible if not already. If you want select
+a method/variable with the keyboard instead with the mouse you should
+read the section <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a> in this online help! 
+</ul>
+
+   <p>The possibility of hiding temporally the ECB windows like described
+above is also useful for all the other layouts.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Standard-ECB_002dInstallation.html b/site/ecb-2.40/html-help/Standard-ECB_002dInstallation.html
new file mode 100644
index 0000000..c5875b4
--- /dev/null
+++ b/site/ecb-2.40/html-help/Standard-ECB_002dInstallation.html
@@ -0,0 +1,178 @@
+<html lang="en">
+<head>
+<title>Standard ECB-Installation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Installation.html#Installation" title="Installation">
+<link rel="prev" href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage" title="ECB as XEmacs-package">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Standard-ECB-Installation"></a>
+<a name="Standard-ECB_002dInstallation"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage">ECB as XEmacs-package</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Installation.html#Installation">Installation</a>
+<hr>
+</div>
+
+<h4 class="subsection">1.1.3 Standard installation of ECB for (X)Emacs</h4>
+
+<p>Follow exatly these steps to install ECB:
+
+     <ol type=1 start=1>
+
+     <li>Fulfill all requirements ECB needs (see <a href="Requirements.html#Requirements">Requirements</a>)
+
+     <p>ECB performs two autom checks:
+
+          <ul>
+<li>At load-time:
+It checks if cedet is at least installed so ECB can be loaded. If not it
+reports an error.
+
+          <li>At start-time:
+It checks if the correct versions of cedet and semantic are installed and
+gives you proper feedback. 
+</ul>
+
+     <p>So if you are not sure if you have installed the required packages at
+all or if you have installed the correct versions of these packages
+then do not worry about this, just go on with the following
+installation steps: If ECB is missing something it will give you
+proper feedback and support not later than at load-time or start-time!
+
+     <li>Download and unpack the ECB archive (probably you have already done
+this :-)
+
+     <li>Add the new ECB-directory to your <code>load-path</code> variable.
+
+     <p>You <strong>MUST</strong> add the ECB-install-directory to the <code>load-path</code> either
+by changing the <code>load-path</code> variable directly in your <samp><span class="file">.emacs</span></samp> or
+<samp><span class="file">site-lisp/site-start.el</span></samp> or by working with a file
+<samp><span class="file">subdirs.el</span></samp><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+     <p>So for example the needed entry for your <samp><span class="file">.emacs</span></samp>-file could be:
+
+     <pre class="example">        (add-to-list 'load-path
+                     "/path/to/your/ecb/installation/directory")
+   </pre>
+     <p><strong>ATTENTION</strong>:
+ECB is NOT properly installed if it's directory is not added to
+<code>load-path</code> and for example just loaded by
+
+     <pre class="example">        (load-file "/path/to/ecb/ecb.el")
+   </pre>
+     <p>Do not do this! It will not work!
+
+     <li>Load ECB by adding code to your <samp><span class="file">.emacs</span></samp>:
+
+     <p>If you want to load the complete ECB at (X)Emacs-loadtime (Advantage:
+All ECB-options available after loading ECB. Disadvantage: Increasing
+loadtime<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>):
+
+     <pre class="example">        (require 'ecb)
+   </pre>
+     <p>If you want to load the ECB first after starting it by
+<code>ecb-activate</code> (Advantage: Fast loading<a rel="footnote" href="#fn-3" name="fnd-3"><sup>3</sup></a>. 
+Disadvantage: ECB- and semantic-options first available after starting
+ECB):
+
+     <pre class="example">        (require 'ecb-autoloads)
+   </pre>
+     <p>This loads all available autoloads of ECB, e.g. <code>ecb-activate</code>,
+<code>ecb-minor-mode</code>, <code>ecb-byte-compile</code> and
+<code>ecb-show-help</code>.
+
+     <p>Regardless which method you prefer: In both cases the used statement
+must be placed <strong>after</strong> the statement of step 3!
+
+     <li>Restart (X)Emacs.
+        </ol>
+
+   <p>ECB is now ready for use and can be activated by calling <code>M-x
+ecb-activate</code> or <code>ecb-minor-mode</code>. Now you can either starting
+using ECB or you can do these optional installation steps:
+
+     <ol type=1 start=6>
+
+     <li>Reading the online help with <code>ecb-show-help</code>
+
+     <p>Maybe you are interested to read the online-help of ECB before first
+start.
+
+     <li>Bytecompiling ECB with <code>ecb-byte-compile</code>
+
+     <p>This byte compiles ECB. You can safely ignore all messages if there
+are any. (You can also bytecompile ECB from the command-line either by
+using the <samp><span class="file">Makefile</span></samp> or by using the batch-file <samp><span class="file">make.bat</span></samp>;
+just read the comments in that file you choose.)
+
+     <li>Installing the Info-help of ECB
+
+     <p>The ECB distribution contains a subdirectory <samp><span class="file">info-help</span></samp> which
+contains the online-help of ECB in Info-format. You can install this
+online help so it's available in the Top-directory of Info. There are
+two ways to do this:
+
+          <ul>
+<li>Use &ldquo;install-info&rdquo; (recommended):
+
+               <ol type=1 start=1>
+<li>Copy the files of the subdirectory <samp><span class="file">info-help</span></samp> into the
+info-directory of Emacs
+
+               <li>Install the file <samp><span class="file">info-help/ecb.info</span></samp> with the command
+&ldquo;install-info&rdquo; (if available on your system) in the <samp><span class="file">dir</span></samp>-file.
+               </ol>
+
+          <p>The supplied <samp><span class="file">Makefile</span></samp> offers a target <code>install-help</code> which
+does both of these steps. You have just to call <code>make
+install-help</code> with the correct EMACSINFOPATH set (see the comment in
+<samp><span class="file">Makefile</span></samp>). Here is an example:
+
+          <pre class="example">             make EMACSINFOPATH=/path/to/emacs/info install-help
+        </pre>
+          <li>Manual Installation:
+
+          <p>Copy the files of the subdirectory <samp><span class="file">info-help</span></samp> into the
+info-directory of Emacs and modify the file <samp><span class="file">dir</span></samp> manually. 
+</ul>
+
+     <p>But it doesn't matter if you do not execute this step (8.) because the
+online help of ECB is always available though, see
+<code>ecb-show-help</code> (see <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>).
+
+        </ol>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> This works at least for Emacs but XEmacs may have
+slightly different mechanisms; see the XEmacs documentation</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> Cause of full loading of ECB itself and also the
+packages semantic, eieio and speedbar regardless if ECB is started.</p>
+
+   <p class="footnote"><small>[<a name="fn-3" href="#fnd-3">3</a>]</small> ECB, semantic,
+eieio and speedbar are first loaded after starting ECB or with other
+words: ECB and semantic are not loaded if you do not use/need them</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Standard-activation.html b/site/ecb-2.40/html-help/Standard-activation.html
new file mode 100644
index 0000000..8caffc1
--- /dev/null
+++ b/site/ecb-2.40/html-help/Standard-activation.html
@@ -0,0 +1,75 @@
+<html lang="en">
+<head>
+<title>Standard activation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Activation-and-Deactivation.html#Activation-and-Deactivation" title="Activation and Deactivation">
+<link rel="prev" href="Activation-and-Deactivation.html#Activation-and-Deactivation" title="Activation and Deactivation">
+<link rel="next" href="Automatic-activation.html#Automatic-activation" title="Automatic activation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Standard-activation"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Automatic-activation.html#Automatic-activation">Automatic activation</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>
+<hr>
+</div>
+
+<h3 class="section">5.1 Standard activation and deactivation</h3>
+
+<p>Call <kbd>M-x ecb-activate</kbd> and <kbd>M-x ecb-deactivate</kbd> to activate
+or deactivate ECB<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>. If you want ECB started in a
+new frame see the option <code>ecb-new-ecb-frame</code> (default is nil). 
+<code>ecb-activate</code> always raises and selects the ECB-frame even if
+ECB is already started.
+
+   <p><a name="index-minor-mode-9"></a>Because ECB is a global minor-mode it can also be
+(de)activated/toggled by <kbd>M-x ecb-minor-mode</kbd>.
+
+   <p><a name="index-Activation-hook_002dsequence-10"></a><a name="Activation-hook_002dsequence"></a>
+The following sequence of hooks is evaluated during activation of ECB:
+     <ol type=1 start=1>
+<li><code>ecb-before-activate-hook</code>
+<li>&lt;All actions for activation but no layout drawing&gt;
+<li><code>ecb-activate-before-layout-draw-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;Drawing the layout&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-activate-hook</code>
+        </ol>
+
+   <p><a name="Deactivation-hook_002dsequence"></a>
+<a name="index-Deactivation-hook_002dsequence-11"></a>The following sequence of hooks is evaluated during deactivation of
+ECB:
+     <ol type=1 start=1>
+<li><code>ecb-before-deactivate-hook</code>
+<li>&lt;All actions for deactivation of ECB&gt;
+<li><code>ecb-deactivate-hook</code>
+        </ol>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Activation is also possible via the menu
+&ldquo;Tools &ndash;&gt; Start Code Browser (ECB)&rdquo;.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Stealthy-background-tasks.html b/site/ecb-2.40/html-help/Stealthy-background-tasks.html
new file mode 100644
index 0000000..72c0e50
--- /dev/null
+++ b/site/ecb-2.40/html-help/Stealthy-background-tasks.html
@@ -0,0 +1,110 @@
+<html lang="en">
+<head>
+<title>Stealthy background tasks - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link rel="next" href="Interactive-ECB-commands.html#Interactive-ECB-commands" title="Interactive ECB commands">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Stealthy-background-tasks"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.13 Stealthy background-tasks of ECB</h3>
+
+<p>ECB performs some tasks stealthily in the background and also
+interruptable by the user because these tasks can be time-consuming
+and could otherwise block ECB. Currently the following tasks are
+performed stealthily and in the background by ECB:
+
+     <dl>
+<dt>Prescann directories for emptyness<dd>Prescann directories and display them as empty or not-empty in the
+directories-buffer. See the documentation of the option
+<code>ecb-prescan-directories-for-emptyness</code> for a description.
+
+     <br><dt>File is read only<dd>Check if sourcefile-items of the directories- or sources-buffer are
+read-only or not. See documentation of the option
+<code>ecb-sources-perform-read-only-check</code>.
+
+     <br><dt>Version-control-state<dd>Checks the version-control-state of files in directories which are
+managed by a VC-backend. See the option <code>ecb-vc-enable-support</code>.
+
+   </dl>
+
+   <p>All of these tasks (e.g. checking if a directory is empty or not)
+perform a certain action for all directories or sources displayed in
+the current visible tree-buffers of ECB. Normally there should be no
+annoying delay for the user because each of these tasks will be only
+performed when Emacs is idle and will be interrupted immediatelly when
+a user hits a key or clicks the mouse but especially for
+remote-directories one single action (e.g. checking if a certain
+directory is empty or checking the VC-state of a sourcefile in such a
+remote directory) can be very time-consuming and such a single action
+is not interruptable (an interrupt can only occur between the
+single-actions for two directories or sources) For a further
+discussion how to deal best with remote directories see <a href="Remote-directories.html#Remote-directories">Remote directories</a>.!
+
+   <p>ECB offers for all stealthy tasks three steps of activation:
+     <ul>
+<li><code>t</code>:
+Switch on this feature.
+
+     <li><code>unless-remote</code>:
+Switch on this feature but not for remote directories. The term
+&ldquo;remote&rdquo; means here directories which are used via tramp, ange-ftp
+or efs. So mounted directories are counted not as remote directories
+here even if such a directory is maybe hosted on a remote machine. But
+normally only directories in a LAN are mounted so there should be no
+performance-problems with such mounted directories.
+
+     <li><code>nil</code>:
+Switch off this feature completely. 
+</ul>
+
+   <p>In combination with the option <code>ecb-stealthy-tasks-delay</code> these
+three choices already allow adapting the stealthy tasks to most
+needs. But to offer finest granularity for which directories a certain
+stealthy task should be switched on and for which not ECB offers for
+every stealthy task an additional option which allows a finer
+adjustment:
+
+     <ul>
+<li>Prescanning directories for emptyness:
+<code>ecb-prescan-directories-exclude-regexps</code>.
+
+     <li>Checking the read-only-state of a sourcefile:
+<code>ecb-read-only-check-exclude-regexps</code>
+
+     <li>Checking the VC-state of sourcefiles:
+<code>ecb-vc-directory-exclude-regexps</code>
+</ul>
+
+   <p>These options take only effect when the related task is not completely
+switched off. If this is the case they allow excluding certain
+directories (or the sources of directories) from being processed by a
+certain stealthy task.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Style-basics.html b/site/ecb-2.40/html-help/Style-basics.html
new file mode 100644
index 0000000..1840f4c
--- /dev/null
+++ b/site/ecb-2.40/html-help/Style-basics.html
@@ -0,0 +1,90 @@
+<html lang="en">
+<head>
+<title>Style basics - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="prev" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="next" href="Ascii_002dbased-styles.html#Ascii_002dbased-styles" title="Ascii-based styles">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Style-basics"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Ascii_002dbased-styles.html#Ascii_002dbased-styles">Ascii-based styles</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>
+<hr>
+</div>
+
+<h5 class="subsubsection">4.1.2.1 Basic knowledge about the styles</h5>
+
+<p>There are nine image-names which define the control- and guide-symbols
+to draw the tree. Here is the list of the allowed image-names and the
+related corresponding ascii-symbols:
+
+     <ul>
+<li>open (&ldquo;[-]&rdquo;):
+The control-symbol displayed for an opened tree-node which has several
+subnodes. Clicking onto this control closes the node.
+
+     <li>close (&ldquo;[+]&rdquo;):
+The control-symbol displayed for a closed tree-node, i.e. an
+expandable node with subnodes but all subnodes are hidden. Clicking
+onto this control opened the node and displays its subnodes - if
+there are any. If it has no subnodes the empty-symbol will be
+displayed.
+
+     <li>empty (&ldquo;[x]&rdquo;):
+The symbol displayed for an empty node. An empty node is a
+node which could have subnodes but has currently none.
+
+     <li>leaf (&ldquo;*&rdquo;):
+The symbol displayed for a node which can not have any subnodes so it
+is a &ldquo;leaf&rdquo; in the tree.
+
+     <li>guide (&ldquo; |&rdquo;):
+The symbol used for drawing vertical &ldquo;guide-lines&rdquo; for opened nodes. 
+See the example below.
+
+     <li>no-guide (&ldquo;  &rdquo;):
+Sometimes invisible guide-lines are needed to draw the tree.
+
+     <li>end-guide (&ldquo; `&rdquo;):
+The symbol used for the guide-line of the last subnode of an opened
+node.
+
+     <li>handle (&ldquo;-&rdquo;):
+The symbol displayed before every subnode. Each handle is connected to
+a guide-line - either a normal guide or an end-guide.
+
+     <li>no-handle (&ldquo; &rdquo;):
+An invisible handle. 
+</ul>
+
+   <p>A tree will be build-up with these elements like follows:
+
+<pre class="example">   [-] node-with-subnodes      (open)
+    |-[+] not-empty-subnode1   (guide+handle+close)
+    |-[x] empty-subnode        (guide+handle+empty)
+    `-[-] not-empty-subnode2   (end-guide+handle+open)
+       |-* leaf-1              (no-guide+no-handle+guide+handle+leaf)
+       `-* leaf-2              (no-guide+no-handle+end-guide+handle+leaf)
+</pre>
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Submitting-problem-report.html b/site/ecb-2.40/html-help/Submitting-problem-report.html
new file mode 100644
index 0000000..3d11f8a
--- /dev/null
+++ b/site/ecb-2.40/html-help/Submitting-problem-report.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<title>Submitting problem report - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Customizing.html#Customizing" title="Customizing">
+<link rel="next" href="Upgrading.html#Upgrading" title="Upgrading">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Submitting-problem-report"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Upgrading.html#Upgrading">Upgrading</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Customizing.html#Customizing">Customizing</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">8 Submitting a problem report</h2>
+
+<p><a name="index-Bug-report-346"></a><a name="index-Problem-report-347"></a>If you run into problems with ECB you should first take a look into
+
+     <ul>
+<li><a href="FAQ.html#FAQ">FAQ</a> or
+<li><a href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a> or
+<li><a href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a> or
+<li>the appropriate section of this online-manual. 
+</ul>
+
+   <p>If your problem(s) still remain you can/should send a problem report
+to the ECB mailing list <a href="mailto:ecb-list@lists.sourceforge.net">ecb-list@lists.sourceforge.net</a>. ECB
+offers you a command which does all necessary for you to send a
+problem report. Just call <code>ecb-submit-problem-report</code>! Please
+read the documentation of this command, see <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>.
+
+   <p><strong>IMPORTANT</strong>: Cause of extra appearance of SPAM in the
+mailing-lists, SourceForge has changed its policy: Now it is only
+possible to post to the mailing-list for users who have subscribed
+this mailing-list. So please be aware you will not be able to send
+comments, bug reports and improvement suggestions before you have
+subscribed the ECB-mailing-list. See the section "Mailing-list" at the
+ECB-website at
+<a href="http://ecb.sourceforge.net">http://ecb.sourceforge.net</a>
+how to do this.
+
+   <p>If you think there are problems concerning parsing-results for certain
+sources supported by semantic then you should call
+<code>ecb-dump-semantic-toplevel</code> for the problematic source-buffer
+<strong>BEFORE</strong> you call <code>ecb-submit-problem-report</code> because this
+&ldquo;dump&rdquo;-command generates for the current-buffer a new buffer with
+name &ldquo;*ecb-tag-dump*&rdquo; which contains all semantic-tags for this
+source. The contents of this &ldquo;*ecb-tag-dump*&rdquo; will then autom. be
+added to the problem-report generated by
+<code>ecb-submit-problem-report</code>!
+
+   <p>This command creates a problem-report buffer for you. After that you
+get a menu &ldquo;Mail&rdquo; (dependent on the mail-package used, the menu can
+have a different name) with commands to send the problem report. But
+for this the variable <code>mail-user-agent</code> must be configured right for
+your system. If you can“t get working this mechanism you can simply
+copy the whole problem-report buffer after filling it out and sending
+it with your standard mail-client to
+<a href="mailto:ecb-list@lists.sourceforge.net">ecb-list@lists.sourceforge.net</a>!
+
+   <p>Please read also the documentation of the option <code>ecb-debug-mode</code> and
+switch on the debug mode of ECB (also available in the Help-menu of
+ECB!) before submitting a problem-report!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Symboldefinition.html b/site/ecb-2.40/html-help/Symboldefinition.html
new file mode 100644
index 0000000..6b9c8e3
--- /dev/null
+++ b/site/ecb-2.40/html-help/Symboldefinition.html
@@ -0,0 +1,37 @@
+<html lang="en">
+<head>
+<title>Symboldefinition - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows" title="Add-on ECB-windows">
+<link rel="prev" href="Semantic-analyser.html#Semantic-analyser" title="Semantic analyser">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Symboldefinition"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Semantic-analyser.html#Semantic-analyser">Semantic analyser</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.2.2 Displaying the definition of the current symbol under point</h4>
+
+<!-- TODO -->
+</body></html>
+
diff --git a/site/ecb-2.40/html-help/Synchronization-of-basic-ECB_002dwindows.html b/site/ecb-2.40/html-help/Synchronization-of-basic-ECB_002dwindows.html
new file mode 100644
index 0000000..a588b54
--- /dev/null
+++ b/site/ecb-2.40/html-help/Synchronization-of-basic-ECB_002dwindows.html
@@ -0,0 +1,76 @@
+<html lang="en">
+<head>
+<title>Synchronization of basic ECB-windows - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing" title="ECB-window synchronizing">
+<link rel="prev" href="General-synchronization-aspects.html#General-synchronization-aspects" title="General synchronization aspects">
+<link rel="next" href="Add_002don-synchronization.html#Add_002don-synchronization" title="Add-on synchronization">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Synchronization-of-basic-ECB-windows"></a>
+<a name="Synchronization-of-basic-ECB_002dwindows"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Add_002don-synchronization.html#Add_002don-synchronization">Add-on synchronization</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="General-synchronization-aspects.html#General-synchronization-aspects">General synchronization aspects</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.12.2 Synchronization of the basic ECB-windows</h4>
+
+<p>This section describes some special aspects of the synchronizing of the basic
+ECB-windows:
+
+     <ul>
+<li>ECB-directories:
+
+     <p>This windows is synchronized to display the directory where the
+source-file which is displayed in the current active edit-window is
+located. If the source-path (i.e. an element of the option
+<code>ecb-source-path</code>) containing this directory is not expanded it
+will be auto. expanded according to the value of the option
+<code>ecb-auto-expand-directory-tree</code> (see <a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a>).
+
+     <li>ECB-sources:
+
+     <p>The ECB-sources-buffer contains after synchronizing all the sources of
+the directory of the &ldquo;current&rdquo; source-file displayed in the
+edit-window. The entry of the &ldquo;current&rdquo; source-file is highlighted.
+
+     <li>ECB-methods:
+
+     <p>Contains after synchronizing all the tags of the buffer in the current
+selected edit-window, i.e. all methods, variables etc... depending on
+the major-mode.
+
+     <li>ECB-history:
+
+     <p>Highlights the entry of the buffer displayed in the current active
+edit-window if this buffer is a source-file.
+
+   </ul>
+
+   <p>The synchronization can be customized via the option triple
+<code>ecb-basic-buffer-sync</code>, <code>ecb-basic-buffer-sync-delay</code> and
+<code>ecb-basic-buffer-sync-hook</code>. The four basic ECB-windows of ECB are
+always synchonized together, never separate!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Temp_002d-and-compile_002dbuffers.html b/site/ecb-2.40/html-help/Temp_002d-and-compile_002dbuffers.html
new file mode 100644
index 0000000..d04a6c0
--- /dev/null
+++ b/site/ecb-2.40/html-help/Temp_002d-and-compile_002dbuffers.html
@@ -0,0 +1,189 @@
+<html lang="en">
+<head>
+<title>Temp- and compile-buffers - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="The-edit_002darea.html#The-edit_002darea" title="The edit-area">
+<link rel="next" href="The-other-window.html#The-other-window" title="The other window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Temp--and-compile-buffers"></a>
+<a name="Temp_002d-and-compile_002dbuffers"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-other-window.html#The-other-window">The other window</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.4 Temp- and compile-buffers display in ECB</h3>
+
+<p><a name="index-temporary-buffers-39"></a><a name="index-help-buffers-40"></a><a name="index-compilation-buffers-41"></a><a name="index-grep-buffers-42"></a>If you call any help in Emacs, e.g. by calling <code>describe-function</code>, or
+if you do a completion in the minibuffer, then Emacs displays the
+result-buffer in another window. This behavior you have also in ECB.
+
+<h4 class="subsection">6.4.1 Standard Emacs behavior</h4>
+
+<h5 class="subsubsection">6.4.1.1 Gnu Emacs 21.x, 22.x and XEmacs 21.4:</h5>
+
+<p>If the edit-area is already splitted into at least two edit-windows then the
+temp-buffer is displayed in another edit-window otherwise the edit-area will
+be splitted first vertically into two edit-windows, one above the other. The
+variables <code>temp-buffer-max-height</code> and <code>temp-buffer-resize-mode</code>
+(for GNU Emacs) and <code>temp-buffer-shrink-to-fit</code> (for XEmacs) work also
+correctly with ECB.
+
+   <p>Same for all completion-buffer and &ldquo;compile&rdquo;-like output-buffers (e.g. after
+a <code>compile</code> or <code>grep</code>) and the variable
+<code>compilation-window-height</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>.
+
+<h5 class="subsubsection">6.4.1.2 Gnu Emacs 23.x</h5>
+
+<p>Gnu Emacs 23 has a much smarter window-manager for displaying temporary
+buffers (like help-buffers) and &ldquo;compile&rdquo;-buffers (like real compilation
+outputs but also grep-outputs, completions etc.). Therefore ECB uses
+completely the logic of Emacs 23 and does exactly what Emacs 23 would do
+without activated ECB: This means mainly that the split-behavior depends on
+the settings of the options <code>split-width-threshold</code> and
+<code>split-height-threshold</code>.
+
+   <p><strong>Please note</strong>: If you are wondering why displaying temporary-buffers
+(like help, compile, grep, completion etc.) shows different behavior compared
+to deactivated ECB, then you probably have to adjust the values of the options
+<code>split-width-threshold</code> and <code>split-height-threshold</code> to the sizes of
+the edit-area of ECB (at least nearly).
+
+   <p>This is default behavior of ECB. But there is also another way to
+display such buffers: Using a persistent extra window at the bottom of
+the ECB-frame, named the &ldquo;compile-window&rdquo;:
+
+<h4 class="subsection">6.4.2 Using a persistent compile window</h4>
+
+<p>With the option <code>ecb-compile-window-height</code> you can define if the
+ECB layout should contain per default a compile-window at the
+bottom (just specify the number of lines which should be used for the
+compile-window at the bottom of the frame). If &ldquo;yes&rdquo; ECB displays
+all buffers for which the function <code>ecb-compilation-buffer-p</code>
+returns not nil (e.g. all output of compilation-mode (compile, grep
+etc.) or all temp-buffers like *Help*-buffers) in this special
+window.
+
+   <p>In general: With the options <code>ecb-compilation-buffer-names</code>,
+<code>ecb-compilation-major-modes</code> and
+<code>ecb-compilation-predicates</code> you can define which buffers should
+be displayed in the compile-window of ECB (for example if you call
+<code>switch-to-buffer</code> or <code>display-buffer</code> or if you run
+<code>compile</code> or if you display *Help*-buffers). Per default these
+are all temp-buffers like *Help*-buffers, all compile- and grep
+buffers, *Occur*-buffers etc. See the default values of these options.
+
+   <p>With the command <code>ecb-toggle-compile-window</code> (bound to <kbd>C-c . 
+\</kbd>) you can toggle the visibility of the compile-window
+(see <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>).
+
+   <p>There are some more useful options and commands related to the
+compile-window of ECB (to see all options for the compile-window see
+the customization group <a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a>):
+
+     <ul>
+<li>With the option <code>ecb-compile-window-temporally-enlarge</code> you can
+allow Emacs to enlarge temporally the ECB-compile-window in some
+situations. Please read the comment of this option. See also the
+description of the command
+<code>ecb-toggle-compile-window-height</code>.
+
+     <li>With the option <code>ecb-enlarged-compilation-window-max-height</code> you
+specify how <code>ecb-toggle-compile-window-height</code> should
+enlarge the compile-window.
+
+     <li>With the command <code>ecb-cycle-through-compilation-buffers</code>
+(see <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>) you can cycle through all current
+open compilation-buffers (in the sense of
+<code>ecb-compilation-buffer-p</code>) very fast. 
+</ul>
+
+   <p>ECB offers the same compile-window functionality regardless if the
+ECB-window are hidden or not. The state of the compile-window will be
+preserved when toggling the ecb-windows or when maximizing one
+ecb-windows! So you have the advantage of one special window for all
+help-, grep or compile-output (see above) also when the ecb-windows
+are hidden - a window which will not be deleted if you call
+<code>delete-other-windows</code> (bound to <kbd>C-x 1</kbd>) for one of the
+edit-windows. In general: All features of the compile-window work with
+hidden ecb-windows exactly as when the ecb-windows are visible.
+
+   <p><a name="Problems-with-the-compile-window"></a>
+
+<h4 class="subsection">6.4.3 What to do if there are problems with the compile-window</h4>
+
+<p>Normally displaying temp- and compilation-buffers (or more general:
+displaying buffer for which <code>ecb-compilation-buffer-p</code> is not
+nil) should work reliable. But if there are problems which you can not
+handle with the options <code>ecb-compilation-buffer-names</code>,
+<code>ecb-compilation-major-modes</code> or
+<code>ecb-compilation-predicates</code> then please go on like follows:
+
+     <ol type=1 start=1>
+<li>Set the option <code>ecb-layout-debug-mode</code> to not nil.
+
+     <li>Reproduce the wrong behavior exactly by repeating all the operations
+which lead to the problem. If possible then restart Emacs before
+reproducing the problem so you can begin from the beginning!
+
+     <li>Now send immediately a bug report with
+<code>ecb-submit-problem-report</code>.
+
+     <li>Set <code>ecb-layout-debug-mode</code> back to nil if you do not want
+further debugging output in the *Messages* buffer"
+        </ol>
+
+   <p><a name="Using-special_002ddisplay-with-ECB"></a>
+<a name="index-special_002ddisplay-43"></a>
+
+<h4 class="subsection">6.4.4 Handling special-display-buffers</h4>
+
+<p>Emacs offers three options for a special-display-handling of certain
+buffers: <code>special-display-function</code>,
+<code>special-display-buffer-names</code> and
+<code>special-display-regexps</code> (see the Emacs manual for a description
+of these options). ECB offers an option
+<code>ecb-ignore-special-display</code> for specification in which
+situations ECB should take account for the values of these
+special-display-options.
+
+   <p>Default-behavior of ECB is to ignore these special-display-options
+when a persistent compile-window is active (i.e. 
+<code>ecb-compile-window-height</code> is not nil). But with
+<code>ecb-ignore-special-display</code> you can tell ECB, that either always
+the special-display-options should be ignored as long as ECB is active
+or that they should be never igored regardless if a persistent
+compile-window is set or not. In the latter case using
+<code>display-buffer</code> or <code>pop-to-buffer</code> takes always account for
+the values of these options - like the original behavior of Emacs.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> It goes without saying that is is
+also true for <code>grep-window-height</code> and all other &ldquo;compile&rdquo;-modes.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-ECB_002dlayout.html b/site/ecb-2.40/html-help/The-ECB_002dlayout.html
new file mode 100644
index 0000000..615176d
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-ECB_002dlayout.html
@@ -0,0 +1,52 @@
+<html lang="en">
+<head>
+<title>The ECB-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link rel="next" href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows" title="Hiding the ECB windows">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-ECB-layout"></a>
+<a name="The-ECB_002dlayout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.8 Changing, customizing, redrawing and creating layouts</h3>
+
+<p><a name="index-layout-50"></a><a name="index-ECB_002dlayout-51"></a>The term <dfn>ECB-layout</dfn> means in which windows the ECB-frame is
+divided. This chapter describes all aspects concerning this layout,
+especially changing, customizing, redrawing and also creating new
+layouts.
+
+<ul class="menu">
+<li><a accesskey="1" href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>:      How to change and customize the layout
+<li><a accesskey="2" href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">Redrawing the ECB-layout</a>:     How and when redrawing the layout
+<li><a accesskey="3" href="Changing-window-sizes.html#Changing-window-sizes">Changing window sizes</a>:        Changing sizes of the ECB-windows
+<li><a accesskey="4" href="Fixing-window-sizes.html#Fixing-window-sizes">Fixing window sizes</a>:          Fixing sizes of the ECB-windows
+<li><a accesskey="5" href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>:    Interactively creating new layouts
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-Methods-buffer.html b/site/ecb-2.40/html-help/The-Methods-buffer.html
new file mode 100644
index 0000000..216075e
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-Methods-buffer.html
@@ -0,0 +1,71 @@
+<html lang="en">
+<head>
+<title>The Methods buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="The-other-window.html#The-other-window" title="The other window">
+<link rel="next" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers" title="Filtering the tree-buffers">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-Methods-buffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-other-window.html#The-other-window">The other window</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.6 Using and customizing the ECB-Methods buffer</h3>
+
+<p>ECB is mostly designed to display parsing information for files
+supported by semantic. But beginning with version 1.94 it also
+supports other parsing engines like imenu and etags, so also files not
+supported by semantic but by imenu/etags can be displayed in the
+Method-buffer of ECB. Therefore we have to introduce some terminology:
+
+   <p><a name="index-semantic_002dsources-45"></a><a name="Definition-of-semantic_002d-and-non_002dsemantic_002dsources"></a>
+     <ul>
+<li><dfn>semantic-sources</dfn>:
+These are file-types for which a semantic grammar is available, so the
+files are parse-able by semantic. These sources are supported best by
+ECB and most of the following options and descriptions are related to
+these file-types. Examples are programming-sources like C++, C, Java,
+Emacs-Lisp and Texinfo-file and some more.
+
+     <p><a name="index-non_002dsemantic_002dsources-46"></a><li><dfn>non-semantic-sources</dfn>:
+For these files there is no semantic-grammar available so they can not
+be parsed by semantic. Examples are Perl-, LaTeX- and TeX-files. But
+for many of these files imenu and/or etags parsers exist. ECB supports
+now parsing and displaying these file-types too and it uses for this
+some speedbar-logic. 
+</ul>
+
+   <p>This chapter describes how to use and customize the Methods-buffer of
+ECB.
+
+<ul class="menu">
+<li><a accesskey="1" href="Visiting-tags.html#Visiting-tags">Visiting tags</a>:                Possible actions after visiting a tag
+<li><a accesskey="2" href="Expanding.html#Expanding">Expanding</a>:                    Explicit and automatic expanding
+<li><a accesskey="3" href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>:      How to customize the Methods-buffer display
+<li><a accesskey="4" href="Rebuilding-the-Methods.html#Rebuilding-the-Methods">Rebuilding the Methods</a>:       When to rebuild the Methods-buffer
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-edit_002darea.html b/site/ecb-2.40/html-help/The-edit_002darea.html
new file mode 100644
index 0000000..34b01f5
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-edit_002darea.html
@@ -0,0 +1,326 @@
+<html lang="en">
+<head>
+<title>The edit-area - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="next" href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers" title="Temp- and compile-buffers">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-edit-area"></a>
+<a name="The-edit_002darea"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.3 Working with the edit-window(s) of the edit-area</h3>
+
+<p><a name="index-edit_002dwindow-25"></a>ECB offers you all what you need to work with the edit-area as if the
+edit-windows of the edit-area would be the only windows of the
+ECB-frame.
+
+   <p><a name="index-Adviced-functions-26"></a>ECB advices the following user-commands so they work best with ECB:
+
+     <ul>
+<li><code>balance-windows</code>
+<li><code>delete-other-windows</code>
+<li><code>delete-window</code>
+<li><code>delete-windows-on</code>
+<li><code>display-buffer</code>
+<li><code>shrink-window-if-larger-than-buffer</code>
+<li><code>split-window</code>
+<li><code>split-window-horizontally</code>
+<li><code>split-window-vertically</code>
+<li><code>switch-to-buffer</code>
+<li><code>switch-to-buffer-other-window</code>
+<li><code>other-window</code>
+<li><code>other-window-for-scrolling</code>
+</ul>
+
+   <p>The behavior of the adviced functions is (slightly simplified):
+
+     <ul>
+<li>All these adviced functions behaves exactly like their corresponding
+original functions but they always act as if the edit-window(s) of ECB
+would be the only window(s) of the ECB-frame. So the edit-window(s) of
+ECB seems to be a normal Emacs-frame to the user. This means that you
+can split and delete edit-windows without any restriction - ECB
+ensures that neither the special ECB-windows nor the compile-window
+will be damaged.
+
+     <li>If there is a persistent compile-window (see <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>) then all compilation-buffers in the sense of
+<code>ecb-compilation-buffer-p</code> will be displayed in the
+compile-window.
+
+     <li>If called in another frame than the ECB-frame these functions behave
+exactly like the not adviced original versions! 
+</ul>
+
+   <p><strong>Please note</strong>: All these advices are only enabled when ECB is
+enabled.
+
+   <p>Another interesting option in the context of the edit-window and these
+adviced functions is <code>ecb-layout-always-operate-in-edit-window</code>!
+
+<h4 class="subsection">6.3.1 Documentation of the adviced window functions</h4>
+
+<p>This section describes for every adviced window function (s.a.) how it
+differs from the original version. Only the differences are mentioned,
+so if you want the full documentation of such a function call
+<code>describe-function</code> or <kbd>C-h f</kbd>.
+
+<div class="defun">
+&mdash; Command: <b>other-window</b><var> ARG &amp;optional ALL-FRAMES<a name="index-other_002dwindow-27"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of <code>other-window</code>. 
+Works exactly like the original function with the following
+ECB-adjustment: The behavior depends on
+<code>ecb-other-window-behavior</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>delete-window</b><var> &amp;optional WINDOW<a name="index-delete_002dwindow-28"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of <code>delete-window</code>. 
+Works exactly like the original function with the following
+ECB-adjustment:
+
+        <p>If optional argument WINDOW is nil (i.e. probably called
+interactively): If called in a splitted edit-window then it works like
+as if all the edit-windows would be the only windows in the frame. 
+This means the current edit-window which contains the point will be
+destroyed and its place will be occupied from another one. If called
+in an unsplitted edit-window then nothing is done. If called in the
+compile-window of ECB then the compile-window will be hidden (like
+with <code>ecb-toggle-compile-window</code>). If called in an ecb-window
+of the current ECB-layout there are two alternatives:
+
+          <ul>
+<li>If the function is contained in
+<code>ecb-layout-always-operate-in-edit-window</code> the right edit-window
+is selected (depends on the value of the option
+<code>ecb-mouse-click-destination</code>) and does then it“s job.
+
+          <li>Otherwise the behavior depends on the value of the option
+<code>ecb-advice-window-functions-signal-error</code>. 
+</ul>
+
+        <p>If optional argument WINDOW is a living window (i.e. called from
+program): If WINDOW is an edit-window then this window is deleted, if
+WINDOW is the compile-window then it will be hidden and otherwise the
+behavior depends on <code>ecb-advice-window-functions-signal-error</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>delete-other-windows</b><var> &amp;optional WINDOW<a name="index-delete_002dother_002dwindows-29"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of
+<code>delete-other-windows</code>. Works exactly like the original function
+with the following ECB-adjustment:
+
+        <p>If optional argument WINDOW is nil (i.e. probably called
+interactively): If called in a splitted edit-window then it works like
+as if all the edit-windows would be the only windows in the frame. 
+This means all other edit-windows besides the current edit-window
+which contains the point will be destroyed and the current edit-window
+fills the whole edit-area. Neither the special ecb-windows nor the
+compile-window will be destroyed!
+
+          <ul>
+<li>If called in an unsplitted edit-window then either the compile-window
+will be hidden (if there is one) otherwise nothing is done.
+
+          <li>If called in one of the ecb-windows then the current one is maximized,
+i.e. the other ecb-windows (not the edit-windows!) are deleted.
+
+          <li>If called in the compile window there are two alternatives:
+
+               <ul>
+<li>If the function is contained in
+<code>ecb-layout-always-operate-in-edit-window</code> the right edit-window
+is selected (depends on the value of the option
+<code>ecb-mouse-click-destination</code>) and then it does it“s job.
+
+               <li>Otherwise the behavior depends on the value of the option
+<code>ecb-advice-window-functions-signal-error</code>. 
+</ul>
+          </ul>
+
+        <p>If optional argument WINDOW is a living window (i.e. called from
+program): If WINDOW is an edit-window then this window is maximized
+(i.e. the other edit-window is deleted) if there are more at least 2
+edit-windows otherwise the compile-window is deleted (if there is
+one). If WINDOW is an ecb-window then only the other ecb-windows are
+deleted and in all other cases the behavior depends on
+<code>ecb-advice-window-functions-signal-error</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>delete-windows-on</b><var> BUFFER &amp;optional FRAME<a name="index-delete_002dwindows_002don-30"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of <code>delete-windows-on</code>. 
+Works exactly like the original function with the following
+ECB-adjustment:
+
+        <p>An error is reported if <var>BUFFER</var> is an ECB-tree-buffer. These
+windows are not allowed to be deleted. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>split-window</b><var> &amp;optional WINDOW SIZE HORFLAG<a name="index-split_002dwindow-31"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of <code>split-window</code>. 
+Works exactly like the original function with the following
+ECB-adjustment:
+
+        <p>If called for a not-edit-window in the <code>ecb-frame</code> it stops with
+an error if <code>split-window</code> is not contained in the option
+<code>ecb-layout-always-operate-in-edit-window</code>! Besides this (e.g. 
+called for a window in another frame than the <code>ecb-frame</code>) it
+behaves like the original version. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>split-window-horizontally</b><var><a name="index-split_002dwindow_002dhorizontally-32"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of
+<code>split-window-horizontally</code>. Works exactly like the original
+function with the following ECB-adjustment:
+
+        <p>If called in any other window of the current ECB-layout it stops with
+an error if this <code>split-window-horizontally</code> is not contained in
+the option <code>ecb-layout-always-operate-in-edit-window</code>! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>split-window-vertically</b><var><a name="index-split_002dwindow_002dvertically-33"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of
+<code>split-window-vertically</code>. Works exactly like the original
+function with the following ECB-adjustment:
+
+        <p>If called in any other window of the current ECB-layout it stops with
+an error if this <code>split-window-vertically</code> is not contained in
+the option <code>ecb-layout-always-operate-in-edit-window</code>! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>display-buffer</b><var> BUFFER &amp;optional NOT-THIS-WINDOW FRAME<a name="index-display_002dbuffer-34"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: Makes this function compatible with ECB if
+called in or for the ecb-frame. It displays all buffers which are
+&ldquo;compilation-buffers&rdquo; in the sense of
+<code>ecb-compilation-buffer-p</code> in the compile-window of ECB. If the
+compile-window is temporally hidden then it will be displayed first.
+
+        <p>If there is no compile-window (<code>ecb-compile-window-height</code> is
+nil) then it splits the edit-window if unsplitted and displays BUFFER
+in another edit-window but only if <code>pop-up-windows</code> is not nil
+(otherwise the edit-window will not be splitted).
+
+        <p>All buffers which are not &ldquo;compilation-buffers&rdquo; in the sense of
+<code>ecb-compilation-buffer-p</code> will be displayed in one of the
+edit-area and <code>display-buffer</code> behaves as if the edit-windows
+would be the only windows in the frame.
+
+        <p>If BUFFER is contained in <code>special-display-buffer-names</code> or
+matches <code>special-display-regexps</code> then
+<code>special-display-function</code> will be called (if not nil). But this
+behavior depends on the value of the option
+<code>ecb-ignore-special-display</code>. The values of
+<code>same-window-buffer-names</code> and <code>same-window-regexps</code> are
+supported as well.
+
+        <p>See the option <code>ecb-ignore-display-buffer-function</code>!
+
+        <p>If called for other frames it works like the original version. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>switch-to-buffer</b><var> BUFFER &amp;optional NORECORD<a name="index-switch_002dto_002dbuffer-35"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of <code>switch-to-buffer</code>. 
+Works exactly like the original but with the following enhancements
+for ECB:
+
+        <p>&ldquo;compilation-buffers&rdquo; in the sense of
+<code>ecb-compilation-buffer-p</code> will be displayed always in the
+compile-window of ECB (if <code>ecb-compile-window-height</code> is not nil)
+- if the compile-window is temporally hidden then it will be displayed
+first. If you do not want this you have to modify the options
+<code>ecb-compilation-buffer-names</code>,
+<code>ecb-compilation-major-modes</code> or
+<code>ecb-compilation-predicates</code>.
+
+        <p>If called for non &ldquo;compilation-buffers&rdquo; (s.a.) from outside the
+edit-area of ECB it behaves as if called from an edit-window if
+<code>switch-to-buffer</code> is contained in the option
+<code>ecb-layout-always-operate-in-edit-window</code>. Otherwise an error is
+reported. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>switch-to-buffer-other-window</b><var> BUFFER &amp;optional FRAME<a name="index-switch_002dto_002dbuffer_002dother_002dwindow-36"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: The ECB-version of
+<code>switch-to-buffer-other-window</code>. Works exactly like the original
+but with some adaptions for ECB so this function works in a
+&ldquo;natural&rdquo; way:
+
+        <p>If called in any special ecb-window of the current ECB-layout then it
+goes always to an edit-window (which one depends on the setting in
+<code>ecb-mouse-click-destination</code>) and then goes on as if called from
+this edit-window.
+
+        <p>If a compile-window is used (i.e. <code>ecb-compile-window-height</code> is
+not nil) then &ldquo;compilation-buffers&rdquo; in the sense of
+<code>ecb-compilation-buffer-p</code> are always displayed in the
+compile-window. If the compile-window is temporally hidden then it
+will be displayed first. If no compile-window is used it behaves like
+the original.
+
+        <p>If called from within the compile-window then &ldquo;compilation-buffers&rdquo;
+will be displayed still there and all other buffers are displayed in
+one of the edit-windows - if the destination-buffer is already
+displayed in one of the edit-windows then this one is used otherwise
+it behaves like the original.
+
+        <p>If called within an edit-window it behaves like the original function
+except for compilation-buffers (if a compile-window is used, see
+above). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Function: <b>other-window-for-scrolling</b><var><a name="index-other_002dwindow_002dfor_002dscrolling-37"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: This function determines the window which is
+scrolled if any of the &ldquo;other-window-scrolling-functions&rdquo; is called
+(e.g. <code>scroll-other-window</code>):
+
+        <p>If the option <code>ecb-scroll-other-window-scrolls-compile-window</code> is
+not nil (maybe set by
+<code>ecb-toggle-scroll-other-window-scrolls-compile</code>) and a
+compile-window is visible then always the current buffer in the
+compile-window is scrolled!
+
+        <p>Otherwise it depends completely on the setting in
+<code>ecb-other-window-behavior</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; Command: <b>balance-windows</b><var><a name="index-balance_002dwindows-38"></a></var><br>
+<blockquote><p>Around-advice <code>ecb</code>: When called in the <code>ecb-frame</code> then
+only the edit-windows are balanced. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-layout_002dengine-API.html b/site/ecb-2.40/html-help/The-layout_002dengine-API.html
new file mode 100644
index 0000000..120feca
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-layout_002dengine-API.html
@@ -0,0 +1,115 @@
+<html lang="en">
+<head>
+<title>The layout-engine API - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-layout_002dengine.html#The-layout_002dengine" title="The layout-engine">
+<link rel="prev" href="Possible-layout_002doutlines.html#Possible-layout_002doutlines" title="Possible layout-outlines">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-layout-engine-API"></a>
+<a name="The-layout_002dengine-API"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Possible-layout_002doutlines.html#Possible-layout_002doutlines">Possible layout-outlines</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.5.4 The complete layout-engine API of ECB</h4>
+
+<p>This section lists all functions, macros, variables and user-options
+the layout-engine API of ECB offers foreign packages. Call
+<code>describe-function</code> rsp. <code>describe-variable</code> to get a
+detailed description.
+
+   <p>Functions and macros for programming with layouts and special
+ecb-windows:
+     <ul>
+<li><code>defecb-window-dedicator</code>
+<li><code>ecb-available-layouts-member-p</code>
+<li><code>ecb-canonical-ecb-windows-list</code>
+<li><code>ecb-canonical-edit-windows-list</code>
+<li><code>ecb-compile-window-live-p</code>
+<li><code>ecb-compile-window-state</code>
+<li><code>ecb-do-if-buffer-visible-in-ecb-frame</code>
+<li><code>ecb-exec-in-window</code>
+<li><code>ecb-get-current-visible-ecb-buffers</code>
+<li><code>ecb-layout-define</code>
+<li><code>ecb-layout-switch</code>
+<li><code>ecb-layout-undefine</code>
+<li><code>ecb-point-in-compile-window</code>
+<li><code>ecb-point-in-ecb-window-number</code>
+<li><code>ecb-point-in-edit-window-number</code>
+<li><code>ecb-select-edit-window</code>
+<li><code>ecb-split-hor</code>
+<li><code>ecb-split-ver</code>
+<li><code>ecb-where-is-point</code>
+<li><code>ecb-with-dedicated-window</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>
+</ul>
+
+   <p>Utility functions/macros:
+     <ul>
+<li><code>ecb-display-one-ecb-buffer</code>
+<li><code>ecb-enlarge-window</code>
+<li><code>ecb-fix-filename</code>
+<li><code>ecb-goto-ecb-window</code>
+<li><code>ecb-window-live-p</code>
+<li><code>ecb-with-readonly-buffer</code>
+</ul>
+
+   <p>Some other maybe useful functions/macros:
+     <ul>
+<li><code>ecb-with-adviced-functions</code>
+<li><code>ecb-with-original-functions</code>
+<li><code>ecb-with-some-adviced-functions</code>
+</ul>
+
+   <p>Some useful <strong>READONLY</strong> variables:
+     <ul>
+<li><code>ecb-compile-window</code>
+<li><code>ecb-last-edit-window-with-point</code>
+<li><code>ecb-last-source-buffer</code>
+</ul>
+
+   <p><strong>Caution</strong>: DO NOT USE THE VARIABLE <code>ecb-edit-window</code> IN
+YOUR PROGRAMS!
+
+   <p>User-options and hooks related to the layout-engine API:
+     <ul>
+<li><code>ecb-basic-buffer-sync-hook</code>
+<li><code>ecb-hide-ecb-windows-after-hook</code>
+<li><code>ecb-hide-ecb-windows-before-hook</code>
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li><code>ecb-show-ecb-windows-after-hook</code>
+<li><code>ecb-show-ecb-windows-before-hook</code>
+<li><code>ecb-windows-height</code>
+<li><code>ecb-windows-width</code>
+<li><code>ecb-compile-window-height</code>
+</ul>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Normally not needed because
+<code>defecb-window-dedicator</code> does all necessary.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-layout_002dengine.html b/site/ecb-2.40/html-help/The-layout_002dengine.html
new file mode 100644
index 0000000..3744b6e
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-layout_002dengine.html
@@ -0,0 +1,63 @@
+<html lang="en">
+<head>
+<title>The layout-engine - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="prev" href="Adviced-functions.html#Adviced-functions" title="Adviced functions">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-layout-engine"></a>
+<a name="The-layout_002dengine"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Adviced-functions.html#Adviced-functions">Adviced functions</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>
+<hr>
+</div>
+
+<h3 class="section">11.5 How to program new layouts and new special windows</h3>
+
+<p>There are two aspects concerning this topic:
+
+     <ol type=1 start=1>
+<li>Programming a new layout which contains several special ECB-windows
+like directories, sources, methods, history or other special windows
+and arranging them in a new outline.
+
+     <li>Creating complete new special windows (e.g. a local-variable window
+for a graphical debugger like JDEbug of JDEE), adding them to a layout
+and synchronizing them with the current active edit-window.
+        </ol>
+
+   <p>The former one covers merely the layout-programming aspect which is
+explained in the first subsection of this chapter whereas the latter
+one covers all aspects of creating new special windows and what is
+necessary to synchronize it with the current active edit-window of
+ECB. This is explained in the second subsection which will refers to
+the first subsection.
+
+<ul class="menu">
+<li><a accesskey="1" href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a>:     How to program a new layout
+<li><a accesskey="2" href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a>:  Aspects of programming special windows
+<li><a accesskey="3" href="Possible-layout_002doutlines.html#Possible-layout_002doutlines">Possible layout-outlines</a>:     The wide range of possible layouts
+<li><a accesskey="4" href="The-layout_002dengine-API.html#The-layout_002dengine-API">The layout-engine API</a>:        The complete layout-engine API
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-other-window.html b/site/ecb-2.40/html-help/The-other-window.html
new file mode 100644
index 0000000..3d38fa0
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-other-window.html
@@ -0,0 +1,221 @@
+<html lang="en">
+<head>
+<title>The other window - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers" title="Temp- and compile-buffers">
+<link rel="next" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-other-window"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.5 How the &ldquo;other window&rdquo; is determined by ECB</h3>
+
+<p><a name="index-other-window-44"></a>Normally all windows in an Emacs-frame are arranged in a cyclic order
+and window-selecting-commands like <code>other-window</code> or
+window-scrolling-commands like <code>scroll-other-window</code> choose
+simply the next<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> window after the current window as
+&ldquo;other window&rdquo;.
+
+<h4 class="subsection">6.5.1 &ldquo;Other window&rdquo;-basics in ECB</h4>
+
+<p>With a typical window-layout of ECB such a cyclic order of
+<strong>all</strong> windows in the ECB-frame does not make sense because it
+would be not very intuitive and against that what the user wants to
+&ldquo;say&rdquo; when calling <code>other-window</code> or
+<code>scroll-other-window</code>.
+
+   <p>Therefore ECB divides the whole set of windows of the ECB-frame in
+several subsets:
+
+     <ul>
+<li>The edit-windows of the edit-area
+<li>The special tree-windows for browsing-tasks
+<li>The compile-window at the bottom (if there is one)
+<li>The minibuffer-window of the ECB-frame (if active)
+</ul>
+
+   <p>Each of these subsets will be treated as a cyclic ordered subset, i.e. 
+all windows in each of these subsets are ordered as the function
+<code>walk-windows</code> would visit the windows when the windows of a
+subset would be the only windows of a
+frame<a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>.
+
+<h4 class="subsection">6.5.2 Builtin &ldquo;other window&rdquo; behaviors of ECB</h4>
+
+<p>ECB now offers to specify the behavior of commands like
+<code>other-window</code> or <code>scroll-other-window</code> within the
+ECB-frame. This can be done with the option
+<code>ecb-other-window-behavior</code>. This option offers several builtin
+behaviors:
+
+     <ul>
+<li>All windows of the ECB-frame are considered
+
+     <p>ECB will cycle through all windows of the ECB-frame or scroll simply
+the next window in the ECB-frame, means it behaves like the original
+<code>other-window</code> rsp. the original
+<code>other-window-for-scrolling</code>.
+
+     <li>Only the windows of the edit-area are considered
+
+     <p>ECB will only cycle through the edit-windows of ECB or only scroll
+another edit-window. If the selected window is not an edit-window then
+all windows are taken into account.
+
+     <li>The edit-windows and the compile-window are considered
+
+     <p>Like above but the compile-window will be added to the subset of the
+edit-windows.
+
+     <li>Behave as smart and intuitive as possible
+
+     <p>This is the default behavior of ECB. ECB tries to choose the
+<code>other-window</code>-destination or the &ldquo;other window&rdquo; to scroll in a
+smart and intuitive way: If point is in one of the edit-windows and if
+the edit-area is splitted then always the &ldquo;next&rdquo; edit-window is
+choosen (whereas the next edit-window of the last edit-window is the
+first edit-window)- if the edit-area is unsplitted then the
+compile-window is used if there is one. In the context of an
+<code>other-window</code>-call the <var>ARG</var> of <code>other-window</code> will be
+taken into account.
+
+     <p>If one of the special ecb-windows is selected then always the &ldquo;next&rdquo;
+ecb-window is choosen (whereas the next ecb-window of the last
+ecb-window is the first ecb-window). In the context of an
+<code>other-window</code>-call the <var>ARG</var> of <code>other-window</code> will be
+taken into account. If there is only one ecb-window then ECB considers
+also the edit-windows.
+
+     <p>If the compile-window is selected then always the last edit-window
+which had the point will be used unless <code>other-window</code> has been
+called with a prefix-argument unequal 1. 
+</ul>
+
+   <p>Regardless of the different behaviors above ECB handles the situation
+of an active minibuffer during a call to <code>other-window</code> or
+<code>scroll-other-window</code> like follows:
+
+   <p>If the minibuffer-window is selected then ECB always chooses the
+window <code>minibuffer-scroll-window</code> points to (when this variable
+is set, otherwise the compile-window or the last selected edit-window
+is choosen) when the called command is called to choose the 1. next
+window (always true for scrolling another window or true when
+<code>other-window</code> called without prefix-arg or with prefix-arg equal
+1). Otherwise the window ARG steps away is choosen (in case of
+<code>other-window</code>).
+
+   <p>If there is an active minibuffer but the minibuffer-window is not
+selected then <code>other-window</code> and <code>scroll-other-window</code>
+behave like the original version.
+
+<h4 class="subsection">6.5.3 User-defined &ldquo;other window&rdquo; behavior</h4>
+
+<p>In addition to the builtin &ldquo;other window&rdquo; behaviors ECB offers a
+user to completely define for himself how ECB should choose another
+window for scrolling it or selecting it. This can be done with the
+option <code>ecb-other-window-behavior</code> too because this option can
+also have a function-symbol as value:
+
+   <p>Such a function gets seven arguments:
+     <ol type=1 start=1>
+<li>A canonical list of all currently visible windows of the
+<code>ecb-frame</code>
+<li>A canonical list of all currently visible edit-windows
+<li>A canonical list of all currently visible ecb-windows
+<li>The window-object of the compile-window if there is any. 
+<li>The minibuffer-window of the ECB-frame if there is an active
+minibuffer. 
+<li>The result of the function <code>ecb-where-is-point</code> - see the
+documentation of this function for details. 
+<li>An integer which indicates how many steps away from the current
+selected window the &ldquo;other-window&rdquo; is. Is nil when this function is
+called in another context than for <code>other-window</code>.
+        </ol>
+
+   <p>The function has to return a window-object which is then used as
+&ldquo;other window&rdquo; for the command <code>other-window</code> or for scrolling
+another window (e.g. with <code>scroll-other-window</code>). Such a function
+has to handle properly all situation for itself.
+
+   <p>Here is an example for such a function:
+
+<pre class="example">   (defun ecb-get-other-window-smart (win-list
+                                      edit-win-list
+                                      ecb-win-list
+                                      comp-win
+                                      minibuf-win
+                                      point-loc
+                                      nth-window)
+     "Implements the smart-setting of `ecb-other-window-behavior'."
+     (if minibuf-win
+         ;; if we have an active mini-buffer we delegate this to
+         ;; `ecb-get-other-window-minibuf-active'
+         (ecb-get-other-window-minibuf-active win-list
+                                              edit-win-list
+                                              ecb-win-list
+                                              comp-win
+                                              minibuf-win
+                                              point-loc
+                                              nth-window)
+       ;; here we have no active minibuffer!
+       (let ((nth-win (or nth-window 1)))
+         (cond ((equal point-loc 'ecb)
+                (ecb-next-listelem ecb-win-list (selected-window) nth-win))
+               ((equal point-loc 'compile)
+                (if (= nth-win 1)
+                    (or (and ecb-last-edit-window-with-point
+                             (window-live-p ecb-last-edit-window-with-point)
+                             ecb-last-edit-window-with-point)
+                        (car edit-win-list))
+                  (ecb-next-listelem (append edit-win-list
+                                             (list (selected-window)))
+                                     (selected-window)
+                                     nth-win)))
+               (t ;; must be an edit-window
+                (ecb-next-listelem (append edit-win-list
+                                           (if (and comp-win
+                                                    (= (length edit-win-list)
+                                                       1))
+                                               (list comp-win)))
+                                   (selected-window)
+                                   nth-win))))))
+</pre>
+   <p>This example implements the builtin smart behavior described above.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> <code>other-window</code> allows to select ARG'th
+different window, i.e. the window ARG steps away from current window
+in the cyclic order of the windows</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> <code>other-window</code> uses the same window-ordering as
+<code>walk-windows</code></p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/The-tree_002dbuffer_002dAPI.html b/site/ecb-2.40/html-help/The-tree_002dbuffer_002dAPI.html
new file mode 100644
index 0000000..3baf0a1
--- /dev/null
+++ b/site/ecb-2.40/html-help/The-tree_002dbuffer_002dAPI.html
@@ -0,0 +1,114 @@
+<html lang="en">
+<head>
+<title>The tree-buffer-API - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings" title="Tree-buffer keybindings">
+<link rel="next" href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer" title="Do not with tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="The-tree-buffer-API"></a>
+<a name="The-tree_002dbuffer_002dAPI"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer">Do not with tree-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.6 All functions available for tree-buffers and tree-nodes</h4>
+
+<p>This chapter lists the complete API available for tree-buffers and
+tree-nodes.
+
+   <p><strong>IMPORTANT</strong>: These are the only functions and macros of
+tree-buffer.el you are allowed to use for programming with
+tree-buffers and tree-nodes. If you use other - not here listed -
+functions, macros or variables of tree-buffer.el then you run the risk
+of unwanted side-effects or program-behaviors!
+
+<h5 class="subsubsection">11.3.6.1 The API for a tree-buffer:</h5>
+
+<p>See the documentation of these functions (e.g. via <kbd>C-h f</kbd>) to get
+the details how to use it.
+
+     <ul>
+<li><code>tree-buffer-add-image-icon-maybe</code>
+<li><code>tree-buffer-find-image</code>
+<li><code>tree-buffer-create</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>
+<li><code>tree-buffer-defpopup-command</code>
+<li><code>tree-buffer-destroy</code><a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>
+<li><code>tree-buffer-empty-p</code>
+<li><code>tree-buffer-expand-node</code>
+<li><code>tree-buffer-get-node-at-point</code>
+<li><code>tree-buffer-node-data-equal-p</code>
+<li><code>tree-buffer-recenter</code>
+<li><code>tree-buffer-highlight-node-by-data/name</code>
+<li><code>tree-buffer-find-displayed-node-by-data/name</code>
+<li><code>tree-buffer-remove-highlight</code>
+<li><code>tree-buffer-remove-node</code>
+<li><code>tree-buffer-clear-tree</code>
+<li><code>tree-buffer-displayed-nodes-copy</code>
+<li><code>tree-buffer-search-displayed-node-list</code>
+<li><code>tree-buffer-number-of-displayed-nodes</code>
+<li><code>tree-buffer-get-data-store</code>
+<li><code>tree-buffer-set-data-store</code>
+<li><code>tree-buffer-get-root</code>
+<li><code>tree-buffer-set-root</code>
+<li><code>tree-buffer-update</code>
+<li><code>tree-buffer-update-node</code>
+</ul>
+
+<h5 class="subsubsection">11.3.6.2 The API for a tree-node</h5>
+
+<p>See the documentation of these functions (e.g. via <kbd>C-h f</kbd>) to get
+the details how to use it.
+
+     <ul>
+<li><code>tree-node-add-children</code>
+<li><code>tree-node-linelength</code>
+<li><code>tree-node-map-subtree</code>
+<li><code>tree-node-new</code>
+<li><code>tree-node-new-root</code>
+<li><code>tree-node-remove-child</code>
+<li><code>tree-node-remove-child-by-data/name</code>
+<li><code>tree-node-find-child-by-data/name</code>
+<li><code>tree-node-find-child-by-name</code>
+<li><code>tree-node-search-subtree-by-data/name</code>
+<li><code>tree-node-sort-children</code>
+<li><code>tree-node-toggle-expanded</code>
+</ul>
+
+   <p>In addition to these functions the tree-node API contains all accessors
+for a tree-node which are described in <a href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a>.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> If the tree-buffer should be
+used by ECB then you must use <code>defecb-tree-buffer-creator</code> - see
+the documentation!</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> Not needed when
+<code>defecb-tree-buffer-creator</code> has been used for creation.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Tree_002dbuffer-How-to.html b/site/ecb-2.40/html-help/Tree_002dbuffer-How-to.html
new file mode 100644
index 0000000..f1cb48b
--- /dev/null
+++ b/site/ecb-2.40/html-help/Tree_002dbuffer-How-to.html
@@ -0,0 +1,71 @@
+<html lang="en">
+<head>
+<title>Tree-buffer How to - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer" title="Do not with tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Tree-buffer-How-to"></a>
+<a name="Tree_002dbuffer-How-to"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer">Do not with tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.8 How to deal with certain programming-requirements</h4>
+
+<p>This chapter describes in detail how to solve certain
+programming-challenges with tree-buffers.
+
+<h5 class="subsubsection">11.3.8.1 Caching the current tree-buffer display</h5>
+
+<p>Sometimes it can be useful or important to cache the current display
+of a tree-buffer and display later exactly this cached display-state. 
+Here is how to do this:
+
+     <ol type=1 start=1>
+<li>Caching the display:
+You have to do two tasks: First store the current internal structure
+of the tree-buffer; you must do this with the function
+<code>tree-buffer-displayed-nodes-copy</code>. Then store the
+buffer-contents of that tree-buffer you want to cache; you can do this
+for example with <code>buffer-substring</code>. For both tasks you must make
+the tree-buffer the current-buffer.
+
+     <li>Displaying a previous tree-buffer-cache:
+Make the tree-buffer the current buffer, call
+<code>tree-buffer-update</code> and pass as second argument <var>CONTENT</var>
+the data you have stored in step 1. See the documentation of
+<code>tree-buffer-update</code> for details.
+
+     <p>Here is an example:
+
+     <pre class="example">        (tree-buffer-update
+          nil
+          (cons (nth 2 cache-elem) ;; the stored buffer-string
+                (nth 1 cache-elem) ;; the stored tree-structure
+          )))
+   </pre>
+     </ol>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Tree_002dbuffer-basics.html b/site/ecb-2.40/html-help/Tree_002dbuffer-basics.html
new file mode 100644
index 0000000..ff54327
--- /dev/null
+++ b/site/ecb-2.40/html-help/Tree_002dbuffer-basics.html
@@ -0,0 +1,125 @@
+<html lang="en">
+<head>
+<title>Tree-buffer basics - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="next" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Tree-buffer-basics"></a>
+<a name="Tree_002dbuffer-basics"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.1 General introduction into tree-buffers</h4>
+
+<h5 class="subsubsection">4.1.1.1 Content and structure of a tree-buffer</h5>
+
+<p>ECB displays most of its informations (e.g. about directory-structures
+or file-contents) in so called <dfn>tree-buffers</dfn> which means the
+display of such a tree-buffer is structured in a tree consisting of
+<dfn>tree-nodes</dfn>. Every line in a tree-buffer displays exactly one
+tree-node. Each node can have any arbitrary number of
+<dfn>children</dfn>-nodes. If a tree-node has no children then it is called
+a <dfn>leaf</dfn>.
+
+   <p>Each tree-buffer of ECB is displayed in an own special
+ECB-window/buffer which is read-only ie. not editable.
+
+   <p>The difference between a natural tree like a fir and an ECB-tree is
+that the root(-node) of a tree-buffer is not visible but only its
+children. In the example below the nodes parent-node-1 and
+parent-node-2 are the children of the invisible root-node.
+
+   <p>If a tree-node contains at least one child it is displayed with a
+special expand/collapse-symbol (see the example below). This symbol
+allows expanding (rsp. collapsing) the tree-node wheras expanding
+means to display the children-nodes and collapsing means to hide the
+childrens of a tree-node.
+
+   <p>Here is an example of a tree-buffer:
+
+<pre class="example">   [+] parent-node-1  -------.
+   [-] parent-node-2  -------|
+       [-] expanded  --------|
+           leaf-node-1  -----|
+           leaf-node-2  -----|-----[tree-nodes]
+           leaf-node-3  -----|
+           leaf-node-4  -----|
+       [+] collapsed  -------“
+        |
+        `-----------------[expand/collapse-symbol]
+</pre>
+   <h5 class="subsubsection">4.1.1.2 Possible actions for a tree-node</h5>
+
+<p>In most cases an action is triggered when clicking with the mouse onto
+a tree-node<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> (e.g. clicking onto &ldquo;leaf-node-1&rdquo; or
+&ldquo;parent-node-1&rdquo; in the example above). Which actions depends on the
+type of the tree-buffer. For example clicking on a tree-node in the
+ECB-sources-buffer (which is the name of a source-file) opens the
+relelated file in the edit-area of ECB (see <a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>)
+whereas clicking onto a node in the ECB-methods-buffer (which is the
+name of a tag in the current source-file displayed in the edit-area)
+&ldquo;jumps&rdquo; to the location of this tag in the source-buffer in the
+edit-area (see <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>).
+
+   <p>Almost every ECB-window of ECB offers a special popup-menu when
+clicking with the right mouse-button (of course also possible via
+keyboard, see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>) onto a tree-node (e.g. some
+senseful actions possible for directory-nodes like grepping this
+directory or performing version-control actions for this directory or
+something else).
+
+   <p>See <a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>, <a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>, <a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a> and <a href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a> for a detailed description which
+actions are triggered and which popup-menus are offered in all the ECB-windows
+of ECB.
+
+<h5 class="subsubsection">4.1.1.3 Sticky parent-node for tree-buffers</h5>
+
+<p>In the header-line (only for GNU Emacs) of a tree-buffer always the
+current-parent node of the first visible node is displayed (if there is a
+parent node). So a user always has a good overview to which parent a node
+belongs. This sticky node is exactly in the same manner clickable as all other
+nodes (see above).
+
+   <p>There is a option <code>ecb-tree-make-parent-node-sticky</code> which
+enabales/disables this feature (default is enabled).
+
+   <p>There is also an option <code>ecb-tree-stickynode-indent-string</code>. Normally
+there is no need to bother with this option but if you encounter
+alignment-problems with the sticky node in the headerline then take a look at
+this option, because it allows to fix the problem.
+
+   <p>This feature is only available for GNU Emacs &gt;= 21.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course using the keyboard is also possible,
+see <a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Tree_002dbuffer-keybindings.html b/site/ecb-2.40/html-help/Tree_002dbuffer-keybindings.html
new file mode 100644
index 0000000..31fa078
--- /dev/null
+++ b/site/ecb-2.40/html-help/Tree_002dbuffer-keybindings.html
@@ -0,0 +1,111 @@
+<html lang="en">
+<head>
+<title>Tree-buffer keybindings - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer" title="Updating a tree-buffer">
+<link rel="next" href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI" title="The tree-buffer-API">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Tree-buffer-keybindings"></a>
+<a name="Tree_002dbuffer-keybindings"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.5 Default and customizable keybindings of a tree-buffer</h4>
+
+<p>When creating a tree-buffer with <code>tree-buffer-create</code> the
+following keys will automatically being bound:
+
+     <dl>
+<dt><kbd>delete</kbd><dt><kbd>backspace</kbd><dt><kbd>home</kbd><dt><kbd>end</kbd><dt><kbd>a</kbd> (and each other key bound to <code>self-insert-command</code>)<dd>All of these keys are bound to the command
+<code>tree-buffer-incremental-node-search</code> if the argument
+<var>INCR-SEARCH-P</var> of <code>tree-buffer-create</code> was set to not nil. 
+See the documentation of <code>tree-buffer-incremental-node-search</code>
+for all details.
+
+     <br><dt><kbd>RET</kbd><dt><kbd>C-RET</kbd><dt><kbd>S-RET</kbd><dt><kbd>M-RET</kbd><dt><kbd>C-S-RET</kbd><dt><kbd>mouse-1</kbd><dt><kbd>C-mouse-1</kbd><dt><kbd>S-mouse-1</kbd><dt><kbd>M-mouse-1</kbd><dt><kbd>mouse-2</kbd><dt><kbd>C-mouse-2</kbd><dt><kbd>S-mouse-2</kbd><dt><kbd>M-mouse-2</kbd><dd>All these keys are bound to an action-dispatcher which works as
+follows:
+
+     <p>If the callback-function in slot <var>IS-CLICK-VALID-FN</var> of the
+tree-buffer (see <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>) returns nil then nothing is
+done.
+
+     <p>If either <kbd>RET</kbd> has been hitted or point is as the node-name (i.e. 
+the user has clicked with the mouse-1/2 at the node-name) then the
+callback-function in slot <var>NODE-SELECTED-FN</var> is called with the
+needed arguments (see <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>).
+
+     <p>If point is at the expand/collape-button then depending on the
+expansion-state of the node either the callback in slot
+<var>NODE-EXPANDED-FN</var> or <var>NODE-COLLAPSED-FN</var> is called (for
+parameters see again <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>).
+
+     <p><strong>IMPORTANT</strong>: None of these callbacks must modify the slot
+<var>EXPANDED</var> of the passed node because this is done automatically
+by the action-dispatcher!
+
+     <p>At the end the dispatcher updates the tree-buffer-display with
+optimized display of the clicked/selected node - see <a href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>. This means <code>tree-buffer-update</code> is called with that
+node as argument.
+
+     <br><dt><kbd>TAB</kbd><dd>Depending on the expansion-state of the node either the callback in
+slot <var>NODE-EXPANDED-FN</var> or <var>NODE-COLLAPSED-FN</var> is called (for
+parameters see again <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>).
+
+     <p><strong>IMPORTANT</strong>: None of these callbacks must modify the slot
+<var>EXPANDED</var> of the passed node because this is done automatically
+by the action-dispatcher!
+
+     <p>At the end the the tree-buffer-display is updated with optimized
+display of the clicked/selected node - see <a href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>. This means <code>tree-buffer-update</code> is called with that
+node as argument.
+
+     <br><dt><kbd>mouse-3</kbd><dd>Activates the popup-menu for the current tree-buffer for current
+node-type (if defined). See <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> at argument
+<var>MENU-CREATOR</var> and <var>MENU-TITLES</var>. These callbacks are called
+for getting the menu and the menu-title.
+
+     <br><dt><kbd>modeline-mouse-3</kbd><dd>Activates the popup-menu for the modeline of the current tree-buffer
+(if defined). See <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> at argument
+<var>MODELINE-MENU-CREATOR</var>. This callback is called for getting the
+modeline-menu.
+
+     <br><dt><kbd>M-m</kbd><dd>This key is bound to the command
+<code>tree-buffer-show-node-menu-keyboard</code>: Activates the popup-menu
+of current tree-buffer for current node-type via keyboard. If called
+with a prefix-arg then the library <samp><span class="file">tmm.el</span></samp> is used for
+displaying the popup-menu - ignored with XEmacs.
+
+     <br><dt><kbd>&lt;up&gt;</kbd><dt><kbd>&lt;down&gt;</kbd><dt><kbd>&lt;left&gt;</kbd><dt><kbd>&lt;right&gt;</kbd><dd>These keys are bound to the command <code>tree-buffer-arrow-pressed</code>
+which implements the smart arrow-key-navigation described in <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> at argument <var>ARROW-NAVIGATION</var>.
+
+   </dl>
+
+   <p>In addition to these automatically bound keys you can add further
+keybindings to the local-keymap of the tree-buffer with the parameter
+<var>AFTER-CREATE-HOOK</var> of <code>tree-buffer-create</code>. See <a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a> for an example which binds <kbd>C-t</kbd> in this hook.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Tree_002dbuffer-styles.html b/site/ecb-2.40/html-help/Tree_002dbuffer-styles.html
new file mode 100644
index 0000000..fbaa87f
--- /dev/null
+++ b/site/ecb-2.40/html-help/Tree_002dbuffer-styles.html
@@ -0,0 +1,50 @@
+<html lang="en">
+<head>
+<title>Tree-buffer styles - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows" title="Basic ECB-windows">
+<link rel="prev" href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics" title="Tree-buffer basics">
+<link rel="next" href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow" title="ECB Directories-window">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Tree-buffer-styles"></a>
+<a name="Tree_002dbuffer-styles"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">Tree-buffer basics</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>
+<hr>
+</div>
+
+<h4 class="subsection">4.1.2 Displaying the trees with different styles</h4>
+
+<p>ECB offers three different styles for the tree-buffers in the
+ECB-windows. Two of the styles are ascii-based and one style uses
+images for drawing the tree-structure.
+
+<ul class="menu">
+<li><a accesskey="1" href="Style-basics.html#Style-basics">Style basics</a>:                 Basic knowledge about the styles
+<li><a accesskey="2" href="Ascii_002dbased-styles.html#Ascii_002dbased-styles">Ascii-based styles</a>:           How to customize the ascii-styles
+<li><a accesskey="3" href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images">Tree-buffers with images</a>:     Which images are used for the tree
+<li><a accesskey="4" href="Images-for-Methods_002dbuffer.html#Images-for-Methods_002dbuffer">Images for Methods-buffer</a>:    Images for the tags in the Methods-buffer
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Tree_002dbuffers-with-images.html b/site/ecb-2.40/html-help/Tree_002dbuffers-with-images.html
new file mode 100644
index 0000000..577d2de
--- /dev/null
+++ b/site/ecb-2.40/html-help/Tree_002dbuffers-with-images.html
@@ -0,0 +1,97 @@
+<html lang="en">
+<head>
+<title>Tree-buffers with images - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles" title="Tree-buffer styles">
+<link rel="prev" href="Ascii_002dbased-styles.html#Ascii_002dbased-styles" title="Ascii-based styles">
+<link rel="next" href="Images-for-Methods_002dbuffer.html#Images-for-Methods_002dbuffer" title="Images for Methods-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Tree-buffers-with-images"></a>
+<a name="Tree_002dbuffers-with-images"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Images-for-Methods_002dbuffer.html#Images-for-Methods_002dbuffer">Images for Methods-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Ascii_002dbased-styles.html#Ascii_002dbased-styles">Ascii-based styles</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>
+<hr>
+</div>
+
+<h5 class="subsubsection">4.1.2.3 Which images are used for the tree</h5>
+
+<p>Depending on the value of <code>ecb-tree-buffer-style</code> and the
+image-support of (X)Emacs, the tree-buffer try to use images instead
+of strings to draw a nice-looking tree.
+
+   <p>If images can and should be used then the option
+<code>ecb-tree-image-icons-directories</code> tells ECB where to search for
+suitable image-icons for each of the nine image-names (see above). An
+image is used for displaying a control with name &ldquo;XXX&rdquo; if one of the
+directories of <code>ecb-tree-image-icons-directories</code> contains an
+image-file with basename &ldquo;ecb-XXX&rdquo; and an extension which is
+supported by (X)Emacs. Currently supported extensions are &ldquo;.xpm&rdquo;,
+&ldquo;.png&rdquo;, &ldquo;.gif&rdquo;, &ldquo;.jpeg&rdquo;, .&rdquo;jpg&rdquo; and &ldquo;.xbm&rdquo;.
+
+   <p>Example: To display the control with name &ldquo;open&rdquo; with a suitable
+image then one of the directories of
+<code>ecb-tree-image-icons-directories</code> must contain a file with name
+&ldquo;ecb-open.xpm&rdquo; or &ldquo;ecb-open.png&rdquo; etc. See the description of this
+option to get all important details how and in which sequence ECB
+searches the directories of <code>ecb-tree-image-icons-directories</code>.
+
+   <p>ECB comes with predefined default-images usable for every tree-buffer
+and special images for the Directories- and the Methods-tree-buffer. 
+They are defined in several different heights - so for the most
+senseful font-heights of a tree-buffer a fitting image-size should be
+available. The shipped images reside either in the subdirectory
+"ecb-images" of the ECB-installation or - if ECB is installed as
+regular XEmacs-package - in the ECB-etc data-directory (the directory
+returned by evaluating (locate-data-directory "ecb"). If you do not
+want to change the images then you normally have nothing to do because
+the default value of <code>ecb-tree-image-icons-directories</code> points
+already to the correct image-directories.
+
+   <p>A special remark for XEmacs:
+
+   <p>At least XEmacs 21.14 (but probably previous versions too) has a bug
+in its display-engine which prevents adjacent images to be displayed
+correctly. The effect is, that in a row of two or more adjacent images
+(e.g. end-guide+handle+open - see the tree-example above) always all
+images are masked by the last one, means only the last one is visible. 
+If at least one normal character (e.g. a space) is placed between two
+images then the images are displayed correctly. Therefore ECB has
+implemented the following work-around to get best possible results
+with XEmacs: open-, close-, empty-, leaf-, guide-, end-guide- and
+no-guide-images are displayed with images and the handle- and the
+no-handle-images are displayed with the corresponding ascii-symbols
+(which is &ldquo;-&rdquo; rsp. &ldquo; &rdquo;). The face (the color) of the handle-symbol
+is customizable via the option <code>ecb-tree-guide-line-face</code>.
+
+   <p>This bug is already reported to the XEmacs-team. If your XEmacs has
+fixed this bug then add the following to your <samp><span class="file">.emacs</span></samp>-file (or
+whereever your emacs-setup is located):
+
+<pre class="lisp">   (setq tree-buffer-enable-xemacs-image-bug-hack nil)
+</pre>
+   <p>Then ECB uses images without any special work-around with XEmacs too. 
+Just try it - if the tree-buffers look ugly then the XEmacs-bug is
+probably not fixed correctly.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Updating-a-tree_002dbuffer.html b/site/ecb-2.40/html-help/Updating-a-tree_002dbuffer.html
new file mode 100644
index 0000000..e8ce40f
--- /dev/null
+++ b/site/ecb-2.40/html-help/Updating-a-tree_002dbuffer.html
@@ -0,0 +1,80 @@
+<html lang="en">
+<head>
+<title>Updating a tree-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="tree_002dbuffer.html#tree_002dbuffer" title="tree-buffer">
+<link rel="prev" href="A-new-tree_002dnode.html#A-new-tree_002dnode" title="A new tree-node">
+<link rel="next" href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings" title="Tree-buffer keybindings">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Updating-a-tree-buffer"></a>
+<a name="Updating-a-tree_002dbuffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">11.3.4 How to update a tree-buffer-display after changes</h4>
+
+<p>When finished with adding tree-nodes to the tree-structure you mostly
+want to display the current tree and its state in the buffer/window so
+a user can see the current tree and can use it.
+
+   <p>Threre are two ways to update a tree-buffer for display:
+
+     <ol type=1 start=1>
+<li>Updating the whole tree-buffer:
+
+     <p>This is the most used way to update the tree-buffer display. It's
+quite simple, just call <code>tree-buffer-update</code>. In most cases you
+want to call it without arguments.
+
+     <p>If you want to display a certain expanded node and as much as possible
+subnodes of this node then pass this node-object as first argument to
+<code>tree-buffer-update</code>.
+
+     <p>If you do not have the need to display a completely new tree-structure
+but you want only to display a previously cached display-state then
+pass this cached-state as second argument to
+<code>tree-buffer-update</code>. See the documentation of this function and
+also <a href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">Tree-buffer How to</a> for a detailled description how to do
+this.
+
+     <li>Updating only a single node of the tree-buffer:
+
+     <p>Sometimes it can be useful to update only exactly one special node,
+e.g. when your application codes some node-state in the displayed
+node-name (e.g. ECB displays the version-control state of a file as
+part of the related node-name) then it is necessary to update only
+this node if the state has changed.
+
+     <p>This can be done with the function <code>tree-buffer-update-node</code>. For
+this function the mentioning in this section can be misleading because
+this function can not only update the node-display but in general the
+slots <var>NAME</var>, <var>SHRINK-NAME</var>, <var>TYPE</var>, <var>DATA</var> and
+<var>EXPANDABLE</var>. Do <kbd>C-h f</kbd> to see the documentation of this
+function for all details!
+
+        </ol>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Upgrading.html b/site/ecb-2.40/html-help/Upgrading.html
new file mode 100644
index 0000000..6b4292b
--- /dev/null
+++ b/site/ecb-2.40/html-help/Upgrading.html
@@ -0,0 +1,53 @@
+<html lang="en">
+<head>
+<title>Upgrading - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Submitting-problem-report.html#Submitting-problem-report" title="Submitting problem report">
+<link rel="next" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Upgrading"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">9 Upgrading and downloading packages</h2>
+
+<p>This chapter describes all aspects of upgrading to a newer version of
+ECB.
+
+   <p>The first section describes how to download and install a new
+package from the web, where &ldquo;package&rdquo; means either ECB itself or the
+required library CEDET
+
+   <p>After installing a new ECB-version ECB checks if the values of the
+customized ECB-options are still compatible. If not ECB does some
+smart things. This is the topic of the second section.
+
+<ul class="menu">
+<li><a accesskey="1" href="Downloading-new-versions.html#Downloading-new-versions">Downloading new versions</a>:     How to download newer versions of packages
+<li><a accesskey="2" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>:       ECB can auto. upgrade your options
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Usage-of-ECB.html b/site/ecb-2.40/html-help/Usage-of-ECB.html
new file mode 100644
index 0000000..6403759
--- /dev/null
+++ b/site/ecb-2.40/html-help/Usage-of-ECB.html
@@ -0,0 +1,57 @@
+<html lang="en">
+<head>
+<title>Usage of ECB - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="prev" href="Activation-and-Deactivation.html#Activation-and-Deactivation" title="Activation and Deactivation">
+<link rel="next" href="Customizing.html#Customizing" title="Customizing">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Usage-of-ECB"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Customizing.html#Customizing">Customizing</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="ecb.html#Top">Top</a>
+<hr>
+</div>
+
+<h2 class="chapter">6 Usage of ECB</h2>
+
+<p>This chapter describes in a detailed manner all aspects of using the
+Emacs Code Browser.
+
+<ul class="menu">
+<li><a accesskey="1" href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>:              Working with the mouse
+<li><a accesskey="2" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>:           Working with the keyboard
+<li><a accesskey="3" href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>:                How to use the edit-area
+<li><a accesskey="4" href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>:    Displaying temp- and compilation-buffers
+<li><a accesskey="5" href="The-other-window.html#The-other-window">The other window</a>:             How the ``other window'' is determined
+<li><a accesskey="6" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>:           Using and customizing the Methods-buffer
+<li><a accesskey="7" href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>:   Applying filters to the ECB-tree-buffers
+<li><a accesskey="8" href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>:               Changing, customizing, redrawing, creating
+<li><a accesskey="9" href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a>:       Hiding/Showing the ECB-windows
+<li><a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">Maximizing the ECB windows</a>:   Maximizing the ECB-windows
+<li><a href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>:      Back- and forward navigation like a browser
+<li><a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>:     Auto./manual synchronizing the ECB-windows
+<li><a href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>:    Stealthy background-tasks of ECB
+<li><a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>:     All interactive user-commands of ECB
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/User-interface.html b/site/ecb-2.40/html-help/User-interface.html
new file mode 100644
index 0000000..552714e
--- /dev/null
+++ b/site/ecb-2.40/html-help/User-interface.html
@@ -0,0 +1,60 @@
+<html lang="en">
+<head>
+<title>User interface - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading" title="Auto. option-upgrading">
+<link rel="prev" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading" title="Auto. option-upgrading">
+<link rel="next" href="Background-information.html#Background-information" title="Background information">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="User-interface"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Background-information.html#Background-information">Background information</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>
+<hr>
+</div>
+
+<h4 class="subsection">9.2.1 User interface for option-upgrading</h4>
+
+<p>There are two interactive commands (see <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>):
+
+     <ul>
+<li><code>ecb-upgrade-options</code>:
+Does all necessary beginning with a incompatibility-check for all
+options, upgrading/resetting incompatible options and ending with the
+display of all upgraded or reset options.
+
+     <li><code>ecb-display-upgraded-options</code>:
+Displays an information-buffer which options have been upgraded or
+reset. Offers two buttons where the user can decide if the upgraded
+options should also being saved by ECB for future settings or if the
+buffer should be killed. 
+</ul>
+
+   <p>If the option <code>ecb-auto-compatibility-check</code> has a non-nil value
+(which is the default) then ECB does all this stuff automatically at
+startup. This is very recommended!
+
+   <p>If you are interested in some background information, read
+<a href="Background-information.html#Background-information">Background information</a>!
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Using-eshell.html b/site/ecb-2.40/html-help/Using-eshell.html
new file mode 100644
index 0000000..2fbc8c1
--- /dev/null
+++ b/site/ecb-2.40/html-help/Using-eshell.html
@@ -0,0 +1,99 @@
+<html lang="en">
+<head>
+<title>Using eshell - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Version_002dcontrol-support.html#Version_002dcontrol-support" title="Version-control support">
+<link rel="next" href="Grepping-directories.html#Grepping-directories" title="Grepping directories">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Using-eshell"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Grepping-directories.html#Grepping-directories">Grepping directories</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.9 Optimal using of eshell in ECB</h3>
+
+<p><a name="index-eshell-352"></a>ECB offers a very smart integration of the &ldquo;eshell&rdquo; if you are using
+a compile window (see <a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>)<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>
+
+   <p>Here is a short summary of provided features:
+
+     <ul>
+<li>Ability to jump to the eshell buffer within the compilation window by
+simply call <code>eshell</code> (bound to <kbd>C-c . e</kbd>). If the eshell
+isn't running it will be started.
+
+     <li>Expands the compilation window when you run commands. So for example
+it allows you to view the eshell in minimized mode and then when you
+run &ldquo;ls&rdquo; the window automatically expands (but always depending on
+the output of the command you run).
+
+     <li>Synchronizes the current directory of the eshell with the current
+buffer in the current active edit-window of ECB.
+
+     <li>Provides smart window layout of the eshell buffer. This makes sure
+that the eshell is taking up the exact amount of space and that
+nothing is hidden. 
+</ul>
+
+   <p>Here comes a detailed explanation of these features and how to use it
+(all these features are only available if you use a persistent
+compile-window, i.e. if <code>ecb-compile-window-height</code> is not nil):
+
+   <p>You do not have to learn a new command for the eshell-start - just
+call <code>eshell</code> (for convenience also bound to <kbd>C-c . e</kbd>) and
+the eshell will displayed in the compile-window of ECB (if eshell is
+not already alive then it will be started automatically).
+
+   <p>ECB tries to display the contents of the eshell-buffer as best as
+possible, means ECB can autom. enlarge and shrink the compile-window
+so the contents of the eshell are fitting the window. See option
+<code>ecb-eshell-enlarge-when-eshell</code> and
+<code>ecb-eshell-fit-window-to-command-output</code>. Normally this is done
+autom. but you can also you the standard compile-window
+enlarging-command of ECB: <code>ecb-toggle-compile-window-height</code>.
+
+   <p>ECB tries also to recenter the eshell-buffer as best as possible. 
+Normally this is done autom. but you can do it on demand with the
+command <code>ecb-eshell-recenter</code>.
+
+   <p>If option <code>ecb-eshell-buffer-sync</code> is true then ECB always
+synchronizes the command prompt of eshell with the directory of
+current source-buffer of the current active edit-window.
+
+   <p>With the option <code>ecb-eshell-auto-activate</code> you can start eshell
+autom. in the compile-window when ECB is started but of course if a
+compile-window exists.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of
+course you can use eshell also if there is no compile-window. Then it
+is just displayed in the edit-area and there is no special
+integration.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Using-popup_002dmenus.html b/site/ecb-2.40/html-help/Using-popup_002dmenus.html
new file mode 100644
index 0000000..daa71dc
--- /dev/null
+++ b/site/ecb-2.40/html-help/Using-popup_002dmenus.html
@@ -0,0 +1,52 @@
+<html lang="en">
+<head>
+<title>Using popup-menus - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link rel="prev" href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings" title="Personal tree-keybindings">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Using-popup-menus"></a>
+<a name="Using-popup_002dmenus"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings">Personal tree-keybindings</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.2.4 Using the popup-menu of a tree-buffer from keyboard.</h4>
+
+<p><a name="index-tmm-24"></a>A popup-menu of a tree-buffer can be activated from keyboard with the
+command <code>tree-buffer-show-menu-keyboard</code> which is bound to
+<kbd>M-m</kbd> in every tree-buffer. How the popup-menu is displayed
+depends if this command is called with a prefix-argument or not:
+
+   <p>If called without a prefix-arg then the popup-menu is displayed
+graphically as if it would be activated via mouse (for GNU Emacs this
+works perfectly but for XEmacs there is a bug which results in a wrong
+menu-position - but the menu itself works also with XEmacs).
+
+   <p>If called with a prefix-arg (<kbd>C-u M-m</kbd>) then the popup-menu is
+displayed with the tmm-mechanism (like the Emacs-[menu-bar] is
+displayed when `tmm-menubar' is called). This tmm-display is only
+available for GNU Emacs.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Using-special_002ddisplay-with-ECB.html b/site/ecb-2.40/html-help/Using-special_002ddisplay-with-ECB.html
new file mode 100644
index 0000000..d1b5fc6
--- /dev/null
+++ b/site/ecb-2.40/html-help/Using-special_002ddisplay-with-ECB.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=Temp_002d-and-compile_002dbuffers.html#Using%20special%2ddisplay%20with%20ECB">
diff --git a/site/ecb-2.40/html-help/Using-the-keyboard.html b/site/ecb-2.40/html-help/Using-the-keyboard.html
new file mode 100644
index 0000000..ac79522
--- /dev/null
+++ b/site/ecb-2.40/html-help/Using-the-keyboard.html
@@ -0,0 +1,66 @@
+<html lang="en">
+<head>
+<title>Using the keyboard - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Using-the-mouse.html#Using-the-mouse" title="Using the mouse">
+<link rel="next" href="The-edit_002darea.html#The-edit_002darea" title="The edit-area">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Using-the-keyboard"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.2 Working with the keyboard in the ECB-windows</h3>
+
+<p>ECB offers the <code>ecb-mode-map</code> which binds the most important
+functions of ECB to keys so you can easily use ECB in every
+window<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> without
+a mouse.
+
+   <p>IMPORTANT: Do not modify <code>ecb-mode-map</code> directly! The option
+<code>ecb-key-map</code> defines all ECB keybindings, including a common
+prefix-key (This is by default <kbd>C-c .</kbd>). If there are conflicts
+with other minor-modes or packages you can define very easy another
+prefix. Please read carefully the description of <code>ecb-key-map</code>
+(see <a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a>).!
+
+   <p>The following sections describe special topics about using the
+keyboard in the ECB-tree-buffers:
+
+<ul class="menu">
+<li><a accesskey="1" href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a>:         Keyboard navigation/selection in a tree-buffer
+<li><a accesskey="2" href="Incremental-search.html#Incremental-search">Incremental search</a>:           Find nodes as fast as possible
+<li><a accesskey="3" href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings">Personal tree-keybindings</a>:    Adding personal keybindings to a tree-buffer
+<li><a accesskey="4" href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>:            Using the popup-menus from keyboard. 
+</ul>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Regardless if a tree-window or an edit-window</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Using-the-mouse.html b/site/ecb-2.40/html-help/Using-the-mouse.html
new file mode 100644
index 0000000..5235c14
--- /dev/null
+++ b/site/ecb-2.40/html-help/Using-the-mouse.html
@@ -0,0 +1,182 @@
+<html lang="en">
+<head>
+<title>Using the mouse - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="prev" href="Usage-of-ECB.html#Usage-of-ECB" title="Usage of ECB">
+<link rel="next" href="Using-the-keyboard.html#Using-the-keyboard" title="Using the keyboard">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Using-the-mouse"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>
+<hr>
+</div>
+
+<h3 class="section">6.1 Working with the mouse in the ECB-windows</h3>
+
+<p><a name="index-primary-button-14"></a><a name="index-secondary-button-15"></a><a name="index-mouse-button-16"></a>Normally you get best usage if you use ECB with a mouse. ECB
+distinguishes between a <dfn>primary</dfn> and a <dfn>secondary</dfn>
+mouse-button.
+
+   <p>With the option <code>ecb-primary-secondary-mouse-buttons</code> the following
+combinations of primary and secondary mouse-buttons are possible:
+
+     <ul>
+<li>primary: mouse-2, secondary: C-mouse-2<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>. This is the default.
+
+     <li>primary: mouse-1, secondary: C-mouse-1
+
+     <li>primary: mouse-1, secondary: mouse-2
+</ul>
+
+   <p>If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect.
+
+<h4 class="subsection">6.1.1 The primary mouse-button</h4>
+
+<p>A click with the primary button causes the main effect in each ECB-buffer:
+
+     <ul>
+<li>ECB Directories:
+Expanding/collapsing nodes and displaying files in the ECB-Sources
+buffer.
+
+     <li>ECB sources/history:
+Opening the file in that edit-window specified by the option
+<code>ecb-mouse-click-destination</code>.
+
+     <li>ECB Methods:
+Jumping to the method in that edit-window specified by the option
+<code>ecb-mouse-click-destination</code>. 
+</ul>
+
+<h4 class="subsection">6.1.2 The POWER- or SHIFT-click</h4>
+
+<p><a name="index-SHIFT_002dclick-17"></a><a name="index-POWER_002dclick-18"></a>A click with the primary mouse-button while the SHIFT-key is pressed
+is called the POWER-click and does the following (depending on the
+ECB-buffer where the POWER-click occurs):
+
+     <ul>
+<li>ECB Directory:
+Refreshing the directory-contents-cache (see
+<code>ecb-cache-directory-contents</code>).
+
+     <li>ECB sources/history:
+Only displaying the source-contents in the method-buffer but not
+displaying the source-file in an edit-window. This means it opens the
+clicked source only in the background and shows all its
+methods/variables in ECB-Methods; the buffer of the edit-window is not
+changed! This is very useful to get only an overlook for a certain
+source.
+
+     <li>ECB Methods:
+Narrowing to the clicked method/variable/ect... (see
+<code>ecb-tag-visit-post-actions</code>). But this works only for sources
+parsed by semantic, not by imenu or etags! 
+</ul>
+
+   <p>Per default the complete node-name of an item in a tree-buffer is displayed in
+the echo-area if the mouse moves over it, regardless if the related window is
+the active one or not. You get the same effect always after a POWER-click. In
+general: For each tree-buffer there is an option <code>ecb-*-show-node-info</code>
+(replace &ldquo;*&rdquo; with directories, sources, methods, history or analyse, e.g. 
+<code>ecb-directories-show-node-info</code> is the option for the
+ECB-directories-window.): you can specify in a detailed manner for the named
+ECB tree-buffer when and which node-info should be displayed in the
+minibuffer.
+
+<h4 class="subsection">6.1.3 The secondary mouse-button</h4>
+
+<p>The secondary mouse-button is for opening (jumping to) the file in
+another edit-window (see the documentation of the option
+<code>ecb-mouse-click-destination</code>).
+
+<h4 class="subsection">6.1.4 The right mouse-button</h4>
+
+<p>In each ECB-buffer mouse-3 (= right button) opens a special context
+popup-menu for the clicked item where you can choose several senseful
+actions.
+
+   <p>With the options <code>ecb-directories-menu-user-extension</code>,
+<code>ecb-sources-menu-user-extension</code>,
+<code>ecb-methods-menu-user-extension</code> and
+<code>ecb-history-menu-user-extension</code> you can add statically new
+commands to the popup-menus. See the docstring of
+<code>ecb-directories-menu-user-extension</code> for more details.
+
+   <p>With the options <code>ecb-directories-menu-user-extension-function</code>,
+<code>ecb-sources-menu-user-extension-function</code>,
+<code>ecb-methods-menu-user-extension-function</code> and
+<code>ecb-history-menu-user-extension-function</code> you can add new
+commands to the popup-menus in a dynamic manner. See the docstring of
+<code>ecb-directories-menu-user-extension-function</code> for more details.
+
+   <p>With the options <code>ecb-directories-menu-sorter</code>,
+<code>ecb-sources-menu-sorter</code>, <code>ecb-methods-menu-sorter</code> and
+<code>ecb-history-menu-sorter</code> you can even re-arrange all the entries
+of the popup-menus.
+
+<h4 class="subsection">6.1.5 Horizontal scrolling with the mouse</h4>
+
+<p>In each tree-buffer of ECB you can easily scroll left and right with
+the mouse if the option <code>ecb-tree-easy-hor-scroll</code> is not
+<code>nil</code>.
+
+   <p>The reason for this is: XEmacs has horizontal scroll-bars so invisible
+parts beyond the right window-border of a tree-buffer can always made
+visible very easy.
+
+   <p>GNU Emacs does not have hor. scroll-bars so especially with the mouse
+it is quite impossible to scroll smoothly right and left. The
+functions <code>scroll-left</code> and <code>scroll-right</code> can be annoying
+and are also not bound to mouse-buttons.
+
+   <p>ECB offers three ways for smoothly hor. scrolling with GNU Emacs if
+<code>ecb-tree-easy-hor-scroll</code> is a positive integer-value S:
+
+     <ul>
+<li>In all ECB-tree-buffers the keys <kbd>M-mouse-1</kbd> and <kbd>M-mouse-3</kbd>
+are bound to scrolling left rsp. right with scroll-step S.
+
+     <li>Clicking with mouse-1 or mouse-2 onto the edge of the modeline has the
+same effect, i.e. if you click with mouse-1 onto the left \(resp
+right) edge of the modeline you will scroll left \(resp. right) with
+scroll-step S.
+
+     <li>Additionally <kbd>C-M-mouse-1</kbd> and <code>C-M-mouse-3</code> are bound to
+scrolling left rsp. right with scroll-step <code>window-width</code> - 2. 
+</ul>
+
+   <p>This is NOT done for XEmacs cause of its horizontal scrollbars. If you
+want scrolling left and right with the mouse in XEmacs then activate
+the horizontal scrollbars.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> means mouse-2 while CTRL-key
+is pressed.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Version_002dcontrol-support.html b/site/ecb-2.40/html-help/Version_002dcontrol-support.html
new file mode 100644
index 0000000..3f97902
--- /dev/null
+++ b/site/ecb-2.40/html-help/Version_002dcontrol-support.html
@@ -0,0 +1,88 @@
+<html lang="en">
+<head>
+<title>Version-control support - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Remote-directories.html#Remote-directories" title="Remote directories">
+<link rel="next" href="Using-eshell.html#Using-eshell" title="Using eshell">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Version-control-support"></a>
+<a name="Version_002dcontrol-support"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Using-eshell.html#Using-eshell">Using eshell</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Remote-directories.html#Remote-directories">Remote directories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.8 Supporting Version control systems</h3>
+
+<p>Beginning with version 2.30 ECB supports Version-control systems (in
+the following named VC-systems). This means the special tree-buffers
+of ECB display files managed by a VC-system with an appropriate
+image-icon<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> in front
+of the filename.
+
+   <p>The following four options allow full control over this feature (see
+also <a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a>:
+
+     <dl>
+<dt><code>ecb-vc-enable-support</code><dd>Enable or disable this feature. 
+<br><dt><code>ecb-vc-supported-backends</code><dd>The most important option for this feature. Allows to specify how ECB
+should test if a directory is managed by a VC-system (how to identify
+the VC-backend of a directory) and - if yes - how it should check the
+VC-state of a certain file. The former ones are called
+<dfn>identify-backend-functions</dfn> and the latter ones
+<dfn>check-state-functions</dfn>. 
+<br><dt><code>ecb-vc-directory-exclude-regexps</code><dd>Allows excluding certain directories (on a regexp-basis) from the
+VC-support even if they are managed by a VC-system. 
+<br><dt><code>ecb-vc-state-mapping</code><dd>Defines the mapping between the state-values returned by a
+check-state-function (a function set in
+<code>ecb-vc-supported-backends</code> and used for getting the VC-state of
+a file, e.g. <code>vc-state</code>) and the allowed state-values ECB can
+understand. 
+</dl>
+
+   <p>Probably the default settings will fit your needs but to get sure you
+should carefully read the documentation of these options!
+
+   <p>The following subsection give you important informations about
+identify-backend-functions, check-state-functions, about working with
+remote repositories.
+
+<ul class="menu">
+<li><a accesskey="1" href="Identifying-backends.html#Identifying-backends">Identifying backends</a>:         How ECB identifies the VC-backend of a dir
+<li><a accesskey="2" href="Checking-the-state.html#Checking-the-state">Checking the state</a>:           How ECB checks the VC-state of a file
+<li><a accesskey="3" href="Remote-repositories.html#Remote-repositories">Remote repositories</a>:          What you should know about this
+<li><a accesskey="4" href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate">Refreshing the VC-state</a>:      How to refresh when state changed outside
+<li><a accesskey="5" href="Adding-new-backends.html#Adding-new-backends">Adding new backends</a>:          Necessary steps for adding new backends
+<li><a accesskey="6" href="Known-VC_002dproblems.html#Known-VC_002dproblems">Known VC-problems</a>:            Currently known problems of the VC-support
+</ul>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course only when Emacs is capable to display
+images; otherwise a suitable ascii-icon will be displayed.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Virtual-folders-in-History.html b/site/ecb-2.40/html-help/Virtual-folders-in-History.html
new file mode 100644
index 0000000..3f39381
--- /dev/null
+++ b/site/ecb-2.40/html-help/Virtual-folders-in-History.html
@@ -0,0 +1,104 @@
+<html lang="en">
+<head>
+<title>Virtual folders in History - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB" title="Window-managers and ECB">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Virtual-folders-in-History"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.16 Something like virtual folders with the ECB-history</h3>
+
+<p>For example, there is a large project with a huge number of files, and there
+are various tasks in this project (e.g. several different bug-fixing tasks). 
+So it could be convenient to group buffers according to various tasks, or with
+other words: something like virtual folders for the buffers. It can be
+fulfiled through using indirect buffers.
+
+   <p>See the following example:
+
+<pre class="example">   task_1-aaa.pl
+   task_1-bbb.c
+   task_1-ccc.sh
+   task_2-aaa.pl
+   task_2-eee.c
+   task_2-ccc.sh
+   task_3-xxx.java
+   task_3-ccc.sh
+</pre>
+   <p>This means create indirect buffers<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> with a name-part which can be
+used for grouping together buffers with same name-part (here e.g. task_1- ... 
+task_3-). In the example above you would create three indirect buffers for the
+filebuffer ccc.sh because this source is needed in all three tasks, two
+indirect buffers for aaa.pl because it is needed in the task-1 and task-2 and
+so on for the rest of the buffers. Make all this indirect buffers with the
+command <code>clone-indirect-buffer</code><a rel="footnote" href="#fn-2" name="fnd-2"><sup>2</sup></a>, which creates real clones means the indirect buffers have the same
+major-mode etc. as the base-buffer (see the manual of Emas).
+
+   <p>Now remember to the option <code>ecb-history-make-buckets</code> which allows a.o. 
+to define a list of regular expressions to bucketize the buffers of the
+history. Use this to make one bucket for each task. So in our example a value
+
+<pre class="example">   ("^task_1-.+" "^task_2-.+" "^task_3-.+")
+</pre>
+   <p>for <code>ecb-history-make-buckets</code> would satiesfy our needs.
+
+   <p>This option allows to define several criterias for building buckets in the
+history-buffer all the history entries are sorted in (e.g. by major-mode,
+directory, file-extension or regular expressions).
+
+   <p>After that the history-window would display something like the following:
+
+<pre class="example">   [-] [^task_1-.+]
+    |  task_1-aaa.pl
+    |  task_1-bbb.c
+    `- task_1-ccc.sh
+   [-] [^task_2-.+]
+    |  task_2-aaa.pl
+    |  task_2-eee.c
+    `- task_2-ccc.sh
+   [-] [^task_3-.+]
+    |  task_3-xxx.java
+    `- task_3-ccc.sh
+</pre>
+   <p>Hopefully this example could give an impression how the combination of usage
+of indirect buffers and bucketizing the history-window can be used for
+using one sources for different sake and grouping together what belongs
+together.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Remember the most important
+feature of indirect buffers: Changes made in one of them will immediately take
+effect in all others with the same base-buffer</p>
+
+   <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> Currently only available with
+GNU Emacs</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Visiting-tags.html b/site/ecb-2.40/html-help/Visiting-tags.html
new file mode 100644
index 0000000..435a3a5
--- /dev/null
+++ b/site/ecb-2.40/html-help/Visiting-tags.html
@@ -0,0 +1,69 @@
+<html lang="en">
+<head>
+<title>Visiting tags - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="prev" href="The-Methods-buffer.html#The-Methods-buffer" title="The Methods buffer">
+<link rel="next" href="Expanding.html#Expanding" title="Expanding">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Visiting-tags"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Expanding.html#Expanding">Expanding</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>
+<hr>
+</div>
+
+<h4 class="subsection">6.6.1 Possible actions after visiting a tag</h4>
+
+<p>You visit a tag by clicking with either the primary oder secondary
+mouse-button (or by hitting <kbd>RET</kbd> or <kbd>C-RET</kbd> if using the
+keyboard) onto a node in the Methods-tree-buffer of ECB. This simply
+selects the &ldquo;right&rdquo; edit-window (depends if clicked with the primary
+or secondary button, in how many windows the edit-area is splitted and
+the value of <code>ecb-mouse-click-destination</code>) and puts the point
+onto the first line of the clicked tag.
+
+   <p>But you can define if after this &ldquo;basic&rdquo; tag-visit-action more
+additional actions should be performed by ECB. You can either use some
+of the predefined actions (e.g. highlighting the header-line of the
+tag) or define own actions. You can set different actions for
+different major-modes. All this is done via the option
+<code>ecb-tag-visit-post-actions</code>.
+
+   <p>The following actions are currently predefined:
+     <ul>
+<li><code>ecb-tag-visit-highlight-tag-header</code>
+<li><code>ecb-tag-visit-smart-tag-start</code>
+<li><code>ecb-tag-visit-recenter</code>
+<li><code>ecb-tag-visit-recenter-top</code>
+<li><code>ecb-tag-visit-goto-doc-start</code>
+<li><code>ecb-tag-visit-narrow-tag</code>
+</ul>
+
+   <p>See the documentation of these function for details what they do.
+
+   <p>Per default ECB performs the actions
+<code>ecb-tag-visit-smart-tag-start</code> and
+<code>ecb-tag-visit-highlight-tag-header</code> for all major-modes.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Window_002dmanagers-and-ECB.html b/site/ecb-2.40/html-help/Window_002dmanagers-and-ECB.html
new file mode 100644
index 0000000..0d24d9f
--- /dev/null
+++ b/site/ecb-2.40/html-help/Window_002dmanagers-and-ECB.html
@@ -0,0 +1,157 @@
+<html lang="en">
+<head>
+<title>Window-managers and ECB - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Hide_002dshow.html#Hide_002dshow" title="Hide-show">
+<link rel="next" href="Virtual-folders-in-History.html#Virtual-folders-in-History" title="Virtual folders in History">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Window-managers-and-ECB"></a>
+<a name="Window_002dmanagers-and-ECB"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Virtual-folders-in-History.html#Virtual-folders-in-History">Virtual folders in History</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Hide_002dshow.html#Hide_002dshow">Hide-show</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.15 Support of several Emacs-window-managers</h3>
+
+<p><a name="index-winring-353"></a><a name="index-escreen-354"></a><a name="index-window_002dmanager-355"></a>There are several window-managers available which offer an easy
+interface to jump between different window-configurations within the
+same frame. A window configuration is the layout of windows and
+associated buffers within a frame. There is always at least one
+configuration, the current configuration. You can create new
+configurations and cycle through the layouts in either direction. 
+Window configurations are often named or numbered, and you can jump to
+and delete named rsp. numbered configurations.
+
+   <p>Without special support by ECB these window-managers would not work in
+combination with ECB!
+
+   <p>ECB currently supports the following managers:
+
+     <ul>
+<li>winring.el:
+Written by Barry A. Warsaw <a href="mailto:bwarsaw@python.org">bwarsaw@python.org</a>, available at
+<a href="http://www.python.org/emacs/winring">http://www.python.org/emacs/winring</a>
+
+     <li>escreen.el:
+Written by Noah Friedman <a href="mailto:friedman@splode.com">friedman@splode.com</a>, available at
+<a href="http://www.splode.com/~friedman/software/emacs-lisp/#ui">http://www.splode.com/~friedman/software/emacs-lisp/#ui</a>
+</ul>
+
+   <p><strong>IMPORTANT</strong>: With one of these window-managers installed and
+active you can run applications like Gnus, VM or BBDB in the same
+frame as ECB! Just use different window-configurations (winring.el) or
+escreens (escreen.el) for ECB and the other applications. Especially
+with winring.el you can give every configuration a descriptive name
+like &ldquo;ECB&rdquo; or &ldquo;Gnus&rdquo;; afterwards you can jump to a
+window-configuration by name!
+
+   <p>When you go back to the ECB-window-configuration (winring.el) or the
+ECB-escreen (escreen.el) with any of the special
+window-manager-commands then the state of ECB will be restored exactly
+as you have left it when going to another window-configuration rsp. 
+escreen. This includes the whole splitting state of the edit-area and
+the visibilty of the ecb-windows and of the compile-window!
+
+   <p>The rest of this section describes how to enable the special
+ECB-support for these window-managers and how to use them.
+
+<h4 class="subsection">10.15.1 Enabling of the support</h4>
+
+<p>Every support must be enabled explicitly:
+     <ul>
+<li>winring:
+Call <code>ecb-winman-winring-enable-support</code>. This <strong>MUST</strong> be
+done <strong>BEFORE</strong> the first call to any winring-command, so also
+before calling <code>winring-initialize</code>!
+
+     <li>escreen:
+Call <code>ecb-winman-escreen-enable-support</code>. This <strong>MUST</strong> be
+done <strong>BEFORE</strong> the first call to any escreen-command, so also
+before calling <code>escreen-install</code>! 
+</ul>
+
+   <p>If a window-manager-support should be enabled autom. after Emacs-start
+just put the following into your <samp><span class="file">.emacs</span></samp>:
+
+<pre class="lisp">   (ecb-winman-winring-enable-support)
+   (winring-initialize)
+   
+   ;; or - if you like escreen more
+   
+   (ecb-winman-escreen-enable-support)
+   (escreen-install)
+</pre>
+   <h4 class="subsection">10.15.2 Usage of a window-manager in combination with ECB</h4>
+
+<p>After enabling the support of one of the supported window-managers
+just go on as described in the commentary or introduction of the
+respective library-file(s) of the window-manager. Here is a short
+description:
+
+     <ul>
+<li>winring:
+First you have to define how to identify the ECB-window-configuration,
+i.e. the configuration with activated ECB. This done with the option
+<code>ecb-winman-winring-name</code>. There is always only one
+window-configurations with name <code>ecb-winman-winring-name</code>!
+
+     <p>Then run <code>winring-initialize</code>. If ECB is active then the
+resulting window-configuration is the ECB-window-configuration. 
+Otherwise you can create the ECB-window-configuration when you first
+time call <code>winring-new-configuration</code> with name equal to
+<code>ecb-winman-winring-name</code>. In general you can run all commands of
+the winring-library. If you jump to the ECB-window-configuration then
+ECB will be autom. activated and if you leave the
+ECB-window-configuration then ECB will autom. deactivated.
+
+     <li>escreen:
+First you have to define how to identify the ECB-escreen
+i.e. that escreen with activated ECB. This done with the option
+<code>ecb-winman-escreen-number</code>. There is always only one
+escreen with number <code>ecb-winman-escreen-number</code>!
+
+     <p>Then run <code>escreen-install</code> (deactivates ECB if currently
+running). After that you can call <code>escreen-create-screen</code> and
+<code>escreen-goto-screen</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>. These commands autom. activate ECB
+if creating or selecting the escreen with number
+<code>ecb-escreen-number</code> (default = 1) and autom. deactivate ECB if
+leaving the ECB-escreen. 
+</ul>
+
+<h4 class="subsection">10.15.3 Disabling the support</h4>
+
+<p>There is normally no need to do this but nevertheless it can be done
+by <code>ecb-winman-escreen-disable-support</code> rsp. 
+<code>ecb-winman-winring-disable-support</code>.
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> And of course all other
+<code>escreen-goto-*</code> commands!</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/Working-with-JDEE.html b/site/ecb-2.40/html-help/Working-with-JDEE.html
new file mode 100644
index 0000000..ba38166
--- /dev/null
+++ b/site/ecb-2.40/html-help/Working-with-JDEE.html
@@ -0,0 +1,87 @@
+<html lang="en">
+<head>
+<title>Working with JDEE - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Common-use_002dcases.html#Common-use_002dcases" title="Common use-cases">
+<link rel="prev" href="Grepping-directories.html#Grepping-directories" title="Grepping directories">
+<link rel="next" href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand" title="Compile-window on demand">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="Working-with-JDEE"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand">Compile-window on demand</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Grepping-directories.html#Grepping-directories">Grepping directories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>
+<hr>
+</div>
+
+<h3 class="section">10.11 Working best with ECB and JDEE</h3>
+
+<p>ECB is completely language independent, i.e. it works with any
+language supported by semantic (e.g. C, C++, Java, Elisp etc.).
+
+   <p>But there are some special integrations for the great
+Java-Development-Environment JDEE:
+
+     <ul>
+<li>Displaying contents of class under point
+
+     <p>With the command <code>ecb-jde-display-class-at-point</code> you can display
+the contents of the class which contains the definition of the
+&ldquo;thing&rdquo; at point (which can be a method, variable etc.).
+
+     <li>Creating new source-files
+
+     <p>The popup-menus in the directories- and the sources-buffer offer a
+command &ldquo;Create Source&rdquo; which allows easy creating new java-sources
+by calling the command <code>jde-gen-class-buffer</code>.
+
+     <li>Adding user-extensions to the popup-menus
+
+     <p>The options <code>ecb-directories-menu-user-extension</code> and
+<code>ecb-sources-menu-user-extension</code><a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a> allow adding often
+used JDEE-commands to the popup-menus of the directories- or
+sources-buffer. One example is to add building the project of current
+directory. Here is a function which could be added to
+<code>ecb-directories-menu-user-extension</code>:
+
+     <pre class="example">        (defun ecb-dir-popup-jde-build (node)
+          "Build project in directory."
+          (let ((project-file
+        	 (expand-file-name jde-ant-buildfile (tree-node-get-data node))))
+            (jde-ant-build project-file "build")))
+   </pre>
+     <p>Of course you can add entries to the option
+<code>ecb-methods-menu-user-extension</code> and
+<code>ecb-methods-menu-user-extension</code> too.
+
+   </ul>
+
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> If you need a dynamic
+way of menu-extension then you should have a look at the options
+<code>ecb-directories-menu-user-extension-function</code> and
+<code>ecb-sources-menu-user-extension-function</code>.</p>
+
+   <p><hr></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb.html b/site/ecb-2.40/html-help/ecb.html
new file mode 100644
index 0000000..0ef02db
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb.html
@@ -0,0 +1,396 @@
+<html lang="en">
+<head>
+<title>ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="../ecb.html#dir" title="(dir)">
+<link rel="prev" href="../ecb.html#dir" title="(dir)">
+<link rel="next" href="Install-and-first-steps.html#Install-and-first-steps" title="Install and first steps">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<h1 class="settitle">ECB - the Emacs Code Browser</h1>
+<div class="node">
+<p>
+<a name="Top"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="../ecb.html#dir">(dir)</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="../ecb.html#dir">(dir)</a>
+<hr>
+</div>
+
+<!-- node-name,  next,  previous,  up -->
+<p>This is the user manual for ECB version 2.40.
+
+   <p>ECB stands for "Emacs Code Browser". While (X)Emacs already has good
+<strong>editing</strong> support for many modes, its <strong>browsing</strong> support
+is somewhat lacking. That's where ECB comes in: it displays a number
+of informational windows that allow for easy source code navigation
+and overview.
+
+   <p>The informational windows can contain:
+
+     <ul>
+<li>A directory tree,
+<li>a list of source files in the current directory
+(with full support and display of the VC-state),
+<li>a list of functions/classes/methods/... in the current file,
+(ECB uses the CEDET-Semantic, or Imenu, or etags, for getting this
+list so all languages supported by any of these tools are
+automatically supported by ECB too)
+<li>a history of recently visited files
+(groupable by several criterias),
+<li>helpful informations and possible completions according to the current
+context which is computed by the semantic-analyzer for some sort of
+intellisense,
+<li>the Speedbar and
+<li>output from compilation (the "*compilation*" window) and other
+modes like help, grep etc. or whatever a user defines to be displayed
+in this window. 
+</ul>
+
+   <p>As an added bonus, ECB makes sure to keep these informational windows
+visible, even when you use <kbd>C-x 1</kbd> and similar commands.
+
+   <p>It goes without saying that you can configure the layout, ie which
+informational windows should be displayed where. ECB comes with a
+number of ready-made window layouts to choose from.
+
+   <p><strong>Please note</strong>: Experienced ECB users find a complete
+alphabetical list of all commands and user-options in <a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a> and <a href="Customizable-options.html#Customizable-options">Customizable options</a>.
+
+<!-- In the following two paragraphs we distinct between HTML-, info-, -->
+<!-- and tex-format concerning the display of the URLs. -->
+<p>The latest version of ECB can always be found at
+<a href="http://ecb.sourceforge.net">http://ecb.sourceforge.net</a>
+
+   <p>To send bug reports, or participate in discussions about ECB, use the
+mailing list <a href="mailto:ecb-list@lists.sourceforge.net">ecb-list@lists.sourceforge.net</a> via
+<a href="http://lists.sourceforge.net/lists/listinfo/ecb-list">http://lists.sourceforge.net/lists/listinfo/ecb-list</a>
+
+   <p><strong>IMPORTANT</strong>: Cause of extra appearance of SPAM in the
+mailing-lists, SourceForge has changed its policy: Now it is only
+possible to post to the mailing-list for users who have subscribed
+this mailing-list. So please be aware you will not be able to send
+comments, bug reports and improvement suggestions before you have
+subscribed the ECB-mailing-list. See the section "Mailing-list" at the
+ECB-website at
+<a href="http://ecb.sourceforge.net">http://ecb.sourceforge.net</a>
+how to do this.
+
+<ul class="menu">
+<li><a accesskey="1" href="Install-and-first-steps.html#Install-and-first-steps">Install and first steps</a>:      Installing ECB and first steps
+<li><a accesskey="2" href="Overview.html#Overview">Overview</a>:                     Compact introducing of basic concepts
+<li><a accesskey="3" href="Manual-usage.html#Manual-usage">Manual usage</a>:                 How to use this manual
+<li><a accesskey="4" href="ECB_002dwindows.html#ECB_002dwindows">ECB-windows</a>:                  Description of all ECB-windows of ECB
+<li><a accesskey="5" href="Activation-and-Deactivation.html#Activation-and-Deactivation">Activation and Deactivation</a>:  How to start and end ECB
+<li><a accesskey="6" href="Usage-of-ECB.html#Usage-of-ECB">Usage of ECB</a>:                 How to use ECB
+<li><a accesskey="7" href="Customizing.html#Customizing">Customizing</a>:                  How to customize ECB
+<li><a accesskey="8" href="Submitting-problem-report.html#Submitting-problem-report">Submitting problem report</a>:    What to do when problems occur
+<li><a accesskey="9" href="Upgrading.html#Upgrading">Upgrading</a>:                    Upgrading and downloading packages
+<li><a href="Common-use_002dcases.html#Common-use_002dcases">Common use-cases</a>:              Useful hints and tips
+<li><a href="Elisp-programming.html#Elisp-programming">Elisp programming</a>:            Entry points for Elisp programmers
+<li><a href="Conflicts-and-bugs.html#Conflicts-and-bugs">Conflicts and bugs</a>:           Known Conflicts with other packages and bugs
+<li><a href="FAQ.html#FAQ">FAQ</a>:                          Frequently asked questions
+<li><a href="Command-Index.html#Command-Index">Command Index</a>:                Index for interactive commands
+<li><a href="Option-Index.html#Option-Index">Option Index</a>:                 Index for user options
+<li><a href="Concept-Index.html#Concept-Index">Concept Index</a>:                Index for concepts and terms
+<!-- * Index:: -->
+
+</li></ul>
+<p>--- The Detailed Node Listing ---
+
+<p>Installation and first steps of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Installation.html#Installation">Installation</a>:                 Installation of ECB
+<li><a href="Setting-up-Emacs.html#Setting-up-Emacs">Setting up Emacs</a>:             How to set up Emacs for file parsing with ECB
+<li><a href="First-steps.html#First-steps">First steps</a>:                  First steps after activating ECB first time
+
+</li></ul>
+<p>Installation of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Requirements.html#Requirements">Requirements</a>:                 Requirements for ECB
+<li><a href="ECB-as-XEmacs_002dpackage.html#ECB-as-XEmacs_002dpackage">ECB as XEmacs-package</a>:        Installation of ECB as a XEmacs-package
+<li><a href="Standard-ECB_002dInstallation.html#Standard-ECB_002dInstallation">Standard ECB-Installation</a>:    Standard installation of ECB for (X)Emacs
+
+</li></ul>
+<p>How to set up Emacs for file parsing with ECB
+
+</p>
+<ul class="menu">
+<li><a href="General-hints.html#General-hints">General hints</a>:                General hints for a correct setup
+<li><a href="Setting-up-CEDET_002fsemantic.html#Setting-up-CEDET_002fsemantic">Setting up CEDET/semantic</a>:    How to setup semantic correctly
+<li><a href="Non_002dsemantic-files.html#Non_002dsemantic-files">Non-semantic files</a>:           Setup for file types not supported by semantic
+
+</li></ul>
+<p>All ECB-windows of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Basic-ECB_002dwindows.html#Basic-ECB_002dwindows">Basic ECB-windows</a>:            Description of the basic ECB-windows
+<li><a href="Add_002don-ECB_002dwindows.html#Add_002don-ECB_002dwindows">Add-on ECB-windows</a>:           Description of additional ECB-windows
+
+</li></ul>
+<p>The basic ECB-windows of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Tree_002dbuffer-basics.html#Tree_002dbuffer-basics">Tree-buffer basics</a>:           General introduction into tree-buffers
+<li><a href="Tree_002dbuffer-styles.html#Tree_002dbuffer-styles">Tree-buffer styles</a>:           Displaying the trees with different styles
+<li><a href="ECB-Directories_002dwindow.html#ECB-Directories_002dwindow">ECB Directories-window</a>:       Contents of the ECB Directories-window
+<li><a href="ECB-Sources_002dwindow.html#ECB-Sources_002dwindow">ECB Sources-window</a>:           Contents of the ECB Sources-window
+<li><a href="ECB-Methods_002dwindow.html#ECB-Methods_002dwindow">ECB Methods-window</a>:           Contents of the ECB Methods-window
+<li><a href="ECB-History_002dwindow.html#ECB-History_002dwindow">ECB History-window</a>:           Contents of the ECB History-window
+
+</li></ul>
+<p>Displaying the trees with different styles
+
+</p>
+<ul class="menu">
+<li><a href="Style-basics.html#Style-basics">Style basics</a>:                 Basic knowledge about the styles
+<li><a href="Ascii_002dbased-styles.html#Ascii_002dbased-styles">Ascii-based styles</a>:           How to customize the ascii-styles
+<li><a href="Tree_002dbuffers-with-images.html#Tree_002dbuffers-with-images">Tree-buffers with images</a>:     Which images are used for the tree
+<li><a href="Images-for-Methods_002dbuffer.html#Images-for-Methods_002dbuffer">Images for Methods-buffer</a>:    Images for the tags in the Methods-buffer
+
+</li></ul>
+<p>Add-on ECB-windows of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Semantic-analyser.html#Semantic-analyser">Semantic analyser</a>:            Analyses and displays semantic context
+<li><a href="Symboldefinition.html#Symboldefinition">Symboldefinition</a>:             Displays definition of current symbol
+
+</li></ul>
+<p>Activation and Deactivation
+
+</p>
+<ul class="menu">
+<li><a href="Standard-activation.html#Standard-activation">Standard activation</a>:          How to manually (de)activate ECB
+<li><a href="Automatic-activation.html#Automatic-activation">Automatic activation</a>:         Automatically (de)activating ECB
+
+</li></ul>
+<p>Usage of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>:              Working with the mouse
+<li><a href="Using-the-keyboard.html#Using-the-keyboard">Using the keyboard</a>:           Working with the keyboard
+<li><a href="The-edit_002darea.html#The-edit_002darea">The edit-area</a>:                How to use the edit-area
+<li><a href="Temp_002d-and-compile_002dbuffers.html#Temp_002d-and-compile_002dbuffers">Temp- and compile-buffers</a>:    Displaying temp- and compilation-buffers
+<li><a href="The-other-window.html#The-other-window">The other window</a>:             How the ``other window'' is determined
+<li><a href="The-Methods-buffer.html#The-Methods-buffer">The Methods buffer</a>:           Using and customizing the Methods-buffer
+<li><a href="Filtering-the-tree_002dbuffers.html#Filtering-the-tree_002dbuffers">Filtering the tree-buffers</a>:   Applying filters to the ECB-tree-buffers
+<li><a href="The-ECB_002dlayout.html#The-ECB_002dlayout">The ECB-layout</a>:               Changing, customizing, redrawing, creating
+<li><a href="Hiding-the-ECB-windows.html#Hiding-the-ECB-windows">Hiding the ECB windows</a>:       Hiding/Showing the ECB-windows
+<li><a href="Maximizing-the-ECB-windows.html#Maximizing-the-ECB-windows">Maximizing the ECB windows</a>:   Maximizing the ECB-windows
+<li><a href="Back_002fforward-navigation.html#Back_002fforward-navigation">Back/forward navigation</a>:      Back- and forward navigation like a browser
+<li><a href="ECB_002dwindow-synchronizing.html#ECB_002dwindow-synchronizing">ECB-window synchronizing</a>:     Auto./manual synchronizing the ECB-windows
+<li><a href="Stealthy-background-tasks.html#Stealthy-background-tasks">Stealthy background tasks</a>:    Stealthy background-tasks of ECB
+<li><a href="Interactive-ECB-commands.html#Interactive-ECB-commands">Interactive ECB commands</a>:     All interactive user-commands of ECB
+
+</li></ul>
+<p>Working with the keyboard in the ECB-windows
+
+</p>
+<ul class="menu">
+<li><a href="Navigation_002fSelection.html#Navigation_002fSelection">Navigation/Selection</a>:         Keyboard navigation/selection in a tree-buffer
+<li><a href="Incremental-search.html#Incremental-search">Incremental search</a>:           Find nodes as fast as possible
+<li><a href="Personal-tree_002dkeybindings.html#Personal-tree_002dkeybindings">Personal tree-keybindings</a>:    Adding personal keybindings to a tree-buffer
+<li><a href="Using-popup_002dmenus.html#Using-popup_002dmenus">Using popup-menus</a>:            Using the popup-menus from keyboard.
+
+</li></ul>
+<p>Using and customizing the ECB-Methods buffer
+
+</p>
+<ul class="menu">
+<li><a href="Visiting-tags.html#Visiting-tags">Visiting tags</a>:                Possible actions after visiting a tag
+<li><a href="Expanding.html#Expanding">Expanding</a>:                    Explicit and automatic expanding
+<li><a href="Customizing-the-display.html#Customizing-the-display">Customizing the display</a>:      How to customize the Methods-buffer display
+<li><a href="Rebuilding-the-Methods.html#Rebuilding-the-Methods">Rebuilding the Methods</a>:       When to rebuild the Methods-buffer
+
+</li></ul>
+<p>Applying filters to the special ECB-tree-buffers
+
+</p>
+<ul class="menu">
+<li><a href="Filtering-Directories.html#Filtering-Directories">Filtering Directories</a>:        Applying filters to the Directories-buffer
+<li><a href="Filtering-Sources.html#Filtering-Sources">Filtering Sources</a>:            Applying filters to the Sources--buffer
+<li><a href="Filtering-History.html#Filtering-History">Filtering History</a>:            Applying filters to the History-buffer
+<li><a href="Filtering-Methods.html#Filtering-Methods">Filtering Methods</a>:            Applying filters to the Methods-buffer
+
+</li></ul>
+<p>Changing, customizing, redrawing and creating layouts
+
+</p>
+<ul class="menu">
+<li><a href="Changing-the-ECB_002dlayout.html#Changing-the-ECB_002dlayout">Changing the ECB-layout</a>:      How to change and customize the layout
+<li><a href="Redrawing-the-ECB_002dlayout.html#Redrawing-the-ECB_002dlayout">Redrawing the ECB-layout</a>:     How and when redrawing the layout
+<li><a href="Changing-window-sizes.html#Changing-window-sizes">Changing window sizes</a>:        Changing sizes of the ECB-windows
+<li><a href="Fixing-window-sizes.html#Fixing-window-sizes">Fixing window sizes</a>:          Fixing sizes of the ECB-windows
+<li><a href="Creating-a-new-ECB_002dlayout.html#Creating-a-new-ECB_002dlayout">Creating a new ECB-layout</a>:    Interactively creating new layouts
+
+</li></ul>
+<p>Synchronization of the ECB-windows
+
+</p>
+<ul class="menu">
+<li><a href="General-synchronization-aspects.html#General-synchronization-aspects">General synchronization aspects</a>:        General synchronization aspects
+<li><a href="Synchronization-of-basic-ECB_002dwindows.html#Synchronization-of-basic-ECB_002dwindows">Synchronization of basic ECB-windows</a>:   Synchronization of basic ECB-windows
+<li><a href="Add_002don-synchronization.html#Add_002don-synchronization">Add-on synchronization</a>:                 Synchronization of add-on ECB-windows
+
+</li></ul>
+<p>Customizing ECB
+
+</p>
+<ul class="menu">
+<li><a href="General-aspects.html#General-aspects">General aspects</a>:              General aspects for customizing ECB
+<li><a href="Most-important-options.html#Most-important-options">Most important options</a>:       Which option you must know
+<li><a href="Customizable-options.html#Customizable-options">Customizable options</a>:         All customizable options of ECB
+
+</li></ul>
+<p>General aspects for customizing ECB
+
+</p>
+<ul class="menu">
+<li><a href="setq-or-customize.html#setq-or-customize">setq or customize</a>:            Should i use setq or customize? 
+<li><a href="Site_002dwide-customizing.html#Site_002dwide-customizing">Site-wide customizing</a>:        Site-wide customizing of ECB
+
+</li></ul>
+<p>All customizable options of ECB
+
+</p>
+<ul class="menu">
+<li><a href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a>:                  General customizing ECB
+<li><a href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a>:              Customizing the general tree layout
+<li><a href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a>:              Customizing the ECB-directories-tree
+<li><a href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a>:                  Customizing the ECB-sources-window
+<li><a href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a>:                  Customizing the ECB-methods-window
+<li><a href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a>:                  Customizing the ECB-history-window
+<li><a href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a>:                  Customizing the ECB-analyse-window
+<li><a href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a>:                   Customizing the ECB-layout
+<li><a href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a>:              Customizing the compile-window
+<li><a href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a>:            Customizing options for creating layouts
+<li><a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a>:             Customizing options for faces
+<li><a href="ecb_002dfaces.html#ecb_002dfaces">ecb-faces</a>:                    Customizing the faces
+<li><a href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a>:                     Customizing the online help of ECB
+<li><a href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a>:                   Customizing the eshell-integration
+<li><a href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a>:                 Customizing the speedbar-integration
+<li><a href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a>:             Customizing parsing non-semantic sources
+<li><a href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a>:                   Customizing window-manager support
+<li><a href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a>:                Customizing the tree-buffer-modelines
+<li><a href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a>:          Customizing the version-control-support
+
+</li></ul>
+<p>Upgrading and downloading packages
+
+</p>
+<ul class="menu">
+<li><a href="Downloading-new-versions.html#Downloading-new-versions">Downloading new versions</a>:     How to download newer versions of packages
+<li><a href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>:       ECB can auto. upgrade your options
+
+</li></ul>
+<p>Automatic upgrading of options
+
+</p>
+<ul class="menu">
+<li><a href="User-interface.html#User-interface">User interface</a>:               Options and commands you should know
+<li><a href="Background-information.html#Background-information">Background information</a>:       Maybe some interesting informations
+
+</li></ul>
+<p>Handling of common use-cases
+
+</p>
+<ul class="menu">
+<li><a href="Changing-faces.html#Changing-faces">Changing faces</a>:               Changing faces in the ECB tree-buffers
+<li><a href="Small-screens.html#Small-screens">Small screens</a>:                Working with small screens
+<li><a href="Big-screens.html#Big-screens">Big screens</a>:                  Working with big screens
+<li><a href="Simulating-speedbar.html#Simulating-speedbar">Simulating speedbar</a>:          Simulating speedbar without an extra frame
+<li><a href="Integrating-speedbar.html#Integrating-speedbar">Integrating speedbar</a>:         Integrating speedbar in the ECB-frame
+<li><a href="Large-directories.html#Large-directories">Large directories</a>:            Working with large directories
+<li><a href="Remote-directories.html#Remote-directories">Remote directories</a>:           Working with remote directories
+<li><a href="Version_002dcontrol-support.html#Version_002dcontrol-support">Version-control support</a>:      Supporting Version control systems
+<li><a href="Using-eshell.html#Using-eshell">Using eshell</a>:                 Optimal using of eshell in ECB
+<li><a href="Grepping-directories.html#Grepping-directories">Grepping directories</a>:         Grepping directories with ECB
+<li><a href="Working-with-JDEE.html#Working-with-JDEE">Working with JDEE</a>:            Working best with ECB and JDEE
+<li><a href="Compile_002dwindow-on-demand.html#Compile_002dwindow-on-demand">Compile-window on demand</a>:     Displaying the compile-window on demand
+<li><a href="Non_002dsemantic-sources.html#Non_002dsemantic-sources">Non-semantic sources</a>:         Parsing and displaying non-semantic sources
+<li><a href="Hide_002dshow.html#Hide_002dshow">Hide-show</a>:                    Using hide-show from the methods-buffer-menu
+<li><a href="Window_002dmanagers-and-ECB.html#Window_002dmanagers-and-ECB">Window-managers and ECB</a>:      Support of several Emacs-window-managers
+
+</li></ul>
+<p>Supporting Version control systems
+
+</p>
+<ul class="menu">
+<li><a href="Identifying-backends.html#Identifying-backends">Identifying backends</a>:         How ECB identifies the VC-backend of a dir
+<li><a href="Checking-the-state.html#Checking-the-state">Checking the state</a>:           How ECB checks the VC-state of a file
+<li><a href="Remote-repositories.html#Remote-repositories">Remote repositories</a>:          What you should know about this
+<li><a href="Refreshing-the-VC_002dstate.html#Refreshing-the-VC_002dstate">Refreshing the VC-state</a>:      How to refresh when state changed outside
+<li><a href="Adding-new-backends.html#Adding-new-backends">Adding new backends</a>:          Necessary steps for adding new backends
+<li><a href="Known-VC_002dproblems.html#Known-VC_002dproblems">Known VC-problems</a>:            Currently known problems of the VC-support
+
+</li></ul>
+<p>Entry points for Elisp programmers
+
+</p>
+<ul class="menu">
+<li><a href="List-of-variables.html#List-of-variables">List of variables</a>:            Which variables an Elisp-program can use
+<li><a href="List-of-hooks.html#List-of-hooks">List of hooks</a>:                All available hooks
+<li><a href="tree_002dbuffer.html#tree_002dbuffer">tree-buffer</a>:                  Full description of the tree-buffer-library
+<li><a href="Adviced-functions.html#Adviced-functions">Adviced functions</a>:            How to deal with the adviced functions
+<li><a href="The-layout_002dengine.html#The-layout_002dengine">The layout-engine</a>:            Programming new layouts and special windows
+
+</li></ul>
+<p>The library tree-buffer.el
+
+</p>
+<ul class="menu">
+<li><a href="Introduction.html#Introduction">Introduction</a>:                 General description of tree-buffers
+<li><a href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>:            How to create a new tree-buffer
+<li><a href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a>:              How to add new tree-nodes to a tree-buffer
+<li><a href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>:       How to update a tree-buffer after changes
+<li><a href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>:      Default and customizable keybindings
+<li><a href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a>:          All functions for tree-buffers and -nodes
+<li><a href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer">Do not with tree-buffer</a>:      Things which are strictly forbidden
+<li><a href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">Tree-buffer How to</a>:           Dealing with special situations
+
+</li></ul>
+<p>How to program new layouts and new special windows
+
+</p>
+<ul class="menu">
+<li><a href="Programming-a-new-layout.html#Programming-a-new-layout">Programming a new layout</a>:     How to program a new layout
+<li><a href="Programming-special-windows.html#Programming-special-windows">Programming special windows</a>:  Aspects of programming special windows
+<li><a href="Possible-layout_002doutlines.html#Possible-layout_002doutlines">Possible layout-outlines</a>:     The wide range of possible layouts
+<li><a href="The-layout_002dengine-API.html#The-layout_002dengine-API">The layout-engine API</a>:        The complete layout-engine API
+
+</li></ul>
+<p>Conflicts and bugs of ECB
+
+</p>
+<ul class="menu">
+<li><a href="Conflicts.html#Conflicts">Conflicts</a>:                    Conflicts with other packages
+<li><a href="Bugs.html#Bugs">Bugs</a>:                         Known bugs
+
+   </ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002danalyse.html b/site/ecb-2.40/html-help/ecb_002danalyse.html
new file mode 100644
index 0000000..7b08861
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002danalyse.html
@@ -0,0 +1,278 @@
+<html lang="en">
+<head>
+<title>ecb-analyse - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dhistory.html#ecb_002dhistory" title="ecb-history">
+<link rel="next" href="ecb_002dlayout.html#ecb_002dlayout" title="ecb-layout">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-analyse"></a>
+<a name="ecb_002danalyse"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.7 Group ecb-analyse</h4>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-bucket-element-face</b><var><a name="index-analyse_002dbucket_002delement_002dface-246"></a></var><br>
+<blockquote><p>Basic face for displaying elements of buckets in the
+ECB-analyse-buffer. This defines the basic face for the elements of
+category-buckets like Context, Prefix, Completions etc. in the
+ECB-analyse-buffer.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-bucket-node-face</b><var><a name="index-analyse_002dbucket_002dnode_002dface-247"></a></var><br>
+<blockquote><p>Basic face for displaying a bucket-node in the ECB-analyse-buffer. 
+This defines the basic face for the bucket-nodes like Context, Prefix,
+Completions etc. in the ECB-analyse-buffer.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-buffer-after-create-hook</b><var><a name="index-analyse_002dbuffer_002dafter_002dcreate_002dhook-248"></a></var><br>
+<blockquote><p>Local hook running after the creation of the analyse-buffer. Every
+function of this hook is called once without arguments direct after
+creating the analyse-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+<code>local-set-key</code> to define new key-bindings only for the
+analyse-buffer of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-buffer-name</b><var><a name="index-analyse_002dbuffer_002dname-249"></a></var><br>
+<blockquote><p>Name of the ECB analyse buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. &ldquo;*ECB
+Analyse*&rdquo;.
+
+        <p>If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-analyse-buffer by this name, e.g. by a call
+of <code>set-buffer</code>.
+
+        <p>Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-buffer-sync</b><var><a name="index-analyse_002dbuffer_002dsync-250"></a></var><br>
+<blockquote><p>Synchronize the analyse buffer automatically with current edit buffer.
+
+        <p>If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+<code>major-mode</code> of the new buffer belongs NOT to this list.
+
+        <p>Normally it's not necessary to exclude some major-modes because with
+not-semantic supported major-modes simply nothing happens. But maybe it can be
+helpful for certain situations...
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync</code>.
+
+        <p>IMPORTANT NOTE: Every time the synchronization is done the hook
+<code>ecb-analyse-buffer-sync-hook</code> is evaluated. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-buffer-sync-delay</b><var><a name="index-analyse_002dbuffer_002dsync_002ddelay-251"></a></var><br>
+<blockquote><p>Time Emacs must be idle before the analyse-buffer is synchronized. 
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately.
+
+        <p>CAUTION: With analysing a value not too small is strongly recommended because
+it can be very annoying if more or less after each typing the current context
+is analysed. If set to nil then *each* keyboard hit refreshes the
+analyse-buffer which will make ECB quite unusable!
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync-delay</code>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-buffer-sync-hook</b><var><a name="index-analyse_002dbuffer_002dsync_002dhook-252"></a></var><br>
+<blockquote><p>ook run at the end of <code>ecb-analyse-buffer-sync</code>. 
+See documentation of <code>ecb-analyse-buffer-sync</code> for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+        <p>Preconditions for such a hook:
+
+          <ul>
+<li>Current buffer is the buffer of the currently selected
+edit-window.
+
+          <li>The analyse-buffer is displayed in a visible window of the
+ecb-frame (so no check for visibilty of the analyse-buffer in
+the ecb-frame is necessary in a hook function)
+</ul>
+
+        <p>Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+        <p>Important note: If the option <code>ecb-analyse-buffer-sync</code> is not
+nil the function <code>ecb-analyse-buffer-sync</code> is running either
+every time Emacs is idle or even after every command (see
+<code>ecb-analyse-buffer-sync-delay</code>). So if the anaylse-buffer is
+displayed in a window of the ecb-frame (see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-collapsed-buckets</b><var><a name="index-analyse_002dcollapsed_002dbuckets-253"></a></var><br>
+<blockquote><p>Buckets collapsed when displaying the current semantic analysis. The
+semantic analyse-modul offers several categories of analysis which are
+called buckets here. These are for example:
+
+        <p>Context: The current context, which is the current function/method,
+variable, class etc. (what exactly depends on the programming
+language) point is in. This means not the current
+function/method/variable/class-name point stand on but the current
+surrounding context. Example: If point stays somewhere within a
+defun-definition in emacs-lisp or within a java-method then this defun
+rsp. method is the context. In object oriented languages this can be
+the full hierachy, i.e. not only the current method, but the current
+method, the class of this method, the superclass of this class and so
+on!
+
+        <p>Arguments: The arguments of the context if the context is a
+function/method.
+
+        <p>Local Variables: All accessible and bound local variables visible at
+current point.
+
+        <p>Prefix: The currently parsed prefix, which is mostly the current
+identifier point stands on.
+
+        <p>Assignee: See the semantic user-manual
+
+        <p>Function: Current function-name point stands on.
+
+        <p>Argument #: When point is located within a function-call then this is
+the number of the argument point stands on.
+
+        <p>Completions: All possible completions for current prefix (see above). 
+This is probably the most helpful bucket.
+
+        <p>If one of these categories/buckets are not needed per default then add
+the bucket-name (s.a.) to this option and ECB will per default
+collapse this bucket. So most needed buckets are better visible in the
+analyse-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-face</b><var><a name="index-analyse_002dface-254"></a></var><br>
+<blockquote><p>Face used for highlighting current entry in the analyse buffer. If the
+face <code>ecb-default-highlight-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-highlight-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-fontified-buckets</b><var><a name="index-analyse_002dfontified_002dbuckets-255"></a></var><br>
+<blockquote><p>Buckets whose elements should be fontified as in the methods-buffer. 
+If the name of a category/bucket is contained in this option then all
+elements of this bucket will be displayed as in the methods-buffer -
+at least if an element is a semantic-tag. This means if
+<code>ecb-font-lock-tags</code> is not nil these elements will be fontified
+and also displayed with an appropriate icon if possible. The default
+value does this only for the Context-bucket because for most of the
+other buckets this makes not really much sense.
+
+        <p>For available buckets see <code>ecb-analyse-collapsed-buckets</code>.
+
+        <p>For the faces used to display a bucket-node itself or bucket-elements
+not fontified see the options <code>ecb-analyse-bucket-node-face</code> rsp. 
+<code>ecb-analyse-bucket-element-face</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-gen-tag-info-fn</b><var><a name="index-analyse_002dgen_002dtag_002dinfo_002dfn-256"></a></var><br>
+<blockquote><p>Which info should be displayed for a tag of the analyse-buffer. If nil
+then the default information about a tag will be displayed. If a
+function then this function gets as argument the tag for which
+tag-information should be displayed. This function has to return a
+string which will be then display as tag-info. This string has to be
+fully formatted (e.g. must already include line-breaks if the tag-info
+should be displayed in several lines).
+
+        <p>See <code>ecb-analyse-show-tag-info-fn</code> how the tag-info is displayed. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-general-face</b><var><a name="index-analyse_002dgeneral_002dface-257"></a></var><br>
+<blockquote><p>Basic face for the ECB analyse buffer. This defines the basic face the
+whole history buffer should displayed with. If the face
+<code>ecb-default-general-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-general-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-show-node-info</b><var><a name="index-analyse_002dshow_002dnode_002dinfo-258"></a></var><br>
+<blockquote><p>When to display which node-info in the history-buffer. Define which
+node info should displayed after moving the mouse over a node (or
+after a shift click onto the node) in the history-buffer.
+
+        <p>You can define &ldquo;when&rdquo; a node-info should be displayed: See
+<code>ecb-directories-show-node-info</code> for the possible choices.
+
+        <p>You can define what info should be displayed:
+
+          <ul>
+<li>name: The full name of the node
+<li>full-info: All infos available to a node. 
+</ul>
+
+        <p>Do NOT set this option directly via setq but use always customize! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>analyse-show-tag-info-fn</b><var><a name="index-analyse_002dshow_002dtag_002dinfo_002dfn-259"></a></var><br>
+<blockquote><p>How to display the tag-info for a tag of the analyse-buffer. The value
+of this option is a function which will be called with the info-string
+generated for the current tag of the analyse-buffer. This function
+must do all things necessary for displaying this info. When this
+function is called the window stored in
+<code>ecb-last-edit-window-with-point</code> is the selected window!
+
+        <p>ECB offers two builtin ways: Display the info in the echo-area (via
+the function <code>message</code>) or in a temp-buffer in the edit-area (via
+the function <code>ecb-analyse-show-tag-info-in-temp-buffer</code>). Default
+is echo-area-display.
+
+        <p>See also <code>ecb-analyse-gen-tag-info-fn</code>. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dcompilation.html b/site/ecb-2.40/html-help/ecb_002dcompilation.html
new file mode 100644
index 0000000..b8405d0
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dcompilation.html
@@ -0,0 +1,259 @@
+<html lang="en">
+<head>
+<title>ecb-compilation - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dlayout.html#ecb_002dlayout" title="ecb-layout">
+<link rel="next" href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout" title="ecb-create-layout">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-compilation"></a>
+<a name="ecb_002dcompilation"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dlayout.html#ecb_002dlayout">ecb-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.9 Group ecb-compilation</h4>
+
+<p class="noindent">This group contains settings for the compile window of ECB:
+
+<div class="defun">
+&mdash; User Option: <b>compilation-buffer-names</b><var><a name="index-compilation_002dbuffer_002dnames-287"></a></var><br>
+<blockquote><p>Additional buffer names that should be displayed in the
+compile-window. Buffer names can either be defined as strings or as
+regexps. If the buffer-name of a buffer matches one of the defined
+string or regexp then it will be displayed in the compile-window of
+ECB even if <code>compilation-buffer-p</code> says nil for this buffer.
+
+        <p>It is not recommended to add the eshell-buffer-names to this list
+because ECB already handles the eshell-integration as best as
+possible (see <a href="Using-eshell.html#Using-eshell">Using eshell</a>).
+
+        <p>See also the options <code>ecb-compilation-major-modes</code> and
+<code>ecb-compilation-predicates</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compilation-major-modes</b><var><a name="index-compilation_002dmajor_002dmodes-288"></a></var><br>
+<blockquote><p>Additional major-mode that should be displayed in the compile-window. 
+All buffers of a major-mode contained in this list are displayed in
+the compile-window even if <code>compilation-buffer-p</code> says nil for
+such a buffer.
+
+        <p>It is not recommended to add <code>eshell-mode</code> to this list because
+ECB already handles the eshell-integration as best as possible
+(see <a href="Using-eshell.html#Using-eshell">Using eshell</a>). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compilation-predicates</b><var><a name="index-compilation_002dpredicates-289"></a></var><br>
+<blockquote><p>Predicates when a buffer should be treated as compilation-buffer. 
+Every element of this list has to be a function or lambda-expression
+which gets as argument a buffer-object and which has to return not nil
+when this buffer should be treated as compilation-buffer (even if
+<code>compilation-buffer-p</code> says nil) and therefore be displayed in
+the compile-window of ECB (if there is any).
+
+        <p>In combination with the values of <code>ecb-compilation-buffer-names</code>
+and <code>ecb-compilation-major-modes</code> ECB decides when a buffer is
+displayed in the compile-window.
+
+        <p>Default value is the function <code>comint-check-proc</code> which returns
+not nil when the buffer is related to a living process. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compile-window-height</b><var><a name="index-compile_002dwindow_002dheight-290"></a></var><br>
+<blockquote><p>Height of the persistent compilation-window of ECB. If you want a
+compilation window shown at the bottom of the ECB-layout then set here
+the height of it (Default is a height of 5). If you redraw the current
+layout with <code>ecb-redraw-layout</code> then the compilation window (if
+any) has the height you set here. If the number is less than 1.0 the
+height is a fraction of the frame height.
+
+        <p>If you do not set a persistent compilation window then doing a
+compilation or displaying temp-buffers (e.g. *Help*-buffers) splits
+temporally the edit window vertically if the edit window is not
+splitted already or uses another edit window temporally for
+compilation output if the edit window is already splitted. This is the
+recommended value for this option because this is the
+standard-behavior of Emacs.
+
+        <p>Beware: If you set a persistent compilation window then ECB displays all
+buffers for which <code>ecb-compilation-buffer-p</code> returns not nil in
+that persistent compilation window. If a buffer which should being
+displayed there is not displayed there then try to modify the options
+<code>ecb-compilation-buffer-names</code>,
+<code>ecb-compilation-major-modes</code> or
+<code>ecb-compilation-predicates</code> (in this sequence).
+
+        <p>See also the options <code>ecb-compile-window-temporally-enlarge</code> and
+<code>ecb-enlarged-compilation-window-max-height</code> and also the command
+<code>ecb-toggle-compile-window-height</code>!
+
+        <p>ECB offers the functionality of such a persistent compile-window
+regardless if the special ECB-windows are visible or not (see the
+command <code>ecb-toggle-ecb-windows</code>).
+
+        <p>Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to
+this layout with <code>ecb-redraw-layout</code>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compile-window-prevent-shrink-below-height</b><var><a name="index-compile_002dwindow_002dprevent_002dshrink_002dbelow_002dheight-291"></a></var><br>
+<blockquote><p>Allow the compile-window to be shrunken below its height. A non nil
+value means ECB prevents the compile-window from being shrunken below
+the threshold of <code>ecb-compile-window-height</code> by displaying
+temp-buffers (e.g. *Help* etc.) or after running compilations or
+greps. But interactively it is always allowed to shrink it to every
+height!
+
+        <p>If nil then ECB does nothing to prevent being shrunken below the value
+of <code>ecb-compile-window-height</code>.
+
+        <p>Default is t. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compile-window-temporally-enlarge</b><var><a name="index-compile_002dwindow_002dtemporally_002denlarge-292"></a></var><br>
+<blockquote><p>Let Emacs temporally enlarge the compile-window of the ECB-layout. 
+This option has only an effect if <code>ecb-compile-window-height</code> is
+not nil!
+
+        <p>The following values are possible:
+          <ul>
+<li><code>after-display</code>:
+After displaying a &ldquo;compilation-buffer&rdquo; (in the sense of
+<code>ecb-compilation-buffer-p</code>!) in the compile-window of ECB. For
+the max. height of the enlarged compile-window see the option
+<code>ecb-enlarged-compilation-window-max-height</code>.
+
+          <li><code>after-selection</code>:
+Selecting the <code>ecb-compile-window</code> auto. enlarges it and
+de-selecting (means leaving <code>ecb-compile-window</code>) auto. shrinks
+it. Enlarging and shrinking the <code>ecb-compile-window</code> is done with
+<code>ecb-toggle-compile-window-height</code>. See also the
+documentation of this function!
+
+          <li><code>both</code>:
+The combination of 'after-display and 'after-selection.
+
+          <li><code>nil</code>:
+ECB fixes always the height of the <code>ecb-compile-window</code> at the
+value of <code>ecb-compile-window-height</code>. 
+</ul>
+
+        <p>To restore the ECB-layout after such a buffer-enlarge just call
+<code>ecb-toggle-compile-window-height</code> or
+<code>ecb-redraw-layout</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>compile-window-width</b><var><a name="index-compile_002dwindow_002dwidth-293"></a></var><br>
+<blockquote><p>Width of the compile-window.
+
+        <p>Possible values are <code>frame</code> and <code>edit-window</code>. 
+With <code>frame</code> the compile-window looks like:
+
+     <pre class="example">           -------------------------------------------------------
+           |              |                                      |
+           |  Directories |                                      |
+           |              |                                      |
+           |--------------|            edit-window(s)            |
+           |              |                                      |
+           |  Methods     |                                      |
+           |              |                                      |
+           -------------------------------------------------------
+           |                                                     |
+           |                    Compilation                      |
+           |                                                     |
+           -------------------------------------------------------
+   </pre>
+        <p>With <code>edit-window</code> the compile-window looks like:
+
+     <pre class="example">           -------------------------------------------------------
+           |              |                                      |
+           |  Directories |                                      |
+           |              |                                      |
+           |--------------|            edit-window(s)            |
+           |              |                                      |
+           |  Methods     |                                      |
+           |              |                                      |
+           |              |---------------------------------------
+           |              |                                      |
+           |              |            Compilation               |
+           |              |                                      |
+           -------------------------------------------------------
+   </pre>
+        <p>This option takes only effect if <code>ecb-compile-window-height</code> is
+not nil! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>change-layout-preserves-compwin-state</b><var><a name="index-change_002dlayout_002dpreserves_002dcompwin_002dstate-294"></a></var><br>
+<blockquote><p>Changing the layout preserves the state of the compile-window. This is
+for example useful if the user toggles between several layouts (see
+<code>ecb-toggle-layout</code>) and wants to preserve the hidden-state of
+the compile-window. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>enlarged-compilation-window-max-height</b><var><a name="index-enlarged_002dcompilation_002dwindow_002dmax_002dheight-295"></a></var><br>
+<blockquote><p>The max height of the compile-window after enlarging it. The max
+height of the compilation window after enlarged by
+<code>ecb-toggle-compile-window-height</code>. The following values are
+allowed:
+
+        <p><code>best</code>:
+
+        <p>ECB fits the height of the compile-window exactly to the size of its
+current contents but never shrinks below the value of
+<code>ecb-compile-window-height</code> or enlarges over the half of the
+frame-height of the ECB-frame. The values of the options
+<code>compilation-window-height</code> and <code>temp-buffer-max-height</code> are
+taken into account dependent of the current <code>major-mode</code> of the
+buffer in the compile-window: If <code>compilation-mode</code> then
+<code>compilation-window-height</code> is used otherwise
+<code>temp-buffer-max-height</code>.
+
+        <p><code>half</code>:
+
+        <p>1/2 the frame-height of the ECB-frame
+
+        <p>Any number:
+
+        <p>Max height in lines. If the number is less than 1.0 the height is a
+fraction of the frame height (e.g. 0.33 results in a max-height of 1/3
+the frame-height). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>scroll-other-window-scrolls-compile-window</b><var><a name="index-scroll_002dother_002dwindow_002dscrolls_002dcompile_002dwindow-296"></a></var><br>
+<blockquote><p><code>scroll-other-window</code> scrolls always the compile-window. For all
+details about the scroll-behavior of <code>scroll-other-window</code> see
+the advice documentation of <code>other-window-for-scrolling</code>. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dcreate_002dlayout.html b/site/ecb-2.40/html-help/ecb_002dcreate_002dlayout.html
new file mode 100644
index 0000000..252881e
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dcreate_002dlayout.html
@@ -0,0 +1,57 @@
+<html lang="en">
+<head>
+<title>ecb-create-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dcompilation.html#ecb_002dcompilation" title="ecb-compilation">
+<link rel="next" href="ecb_002dface_002doptions.html#ecb_002dface_002doptions" title="ecb-face-options">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-create-layout"></a>
+<a name="ecb_002dcreate_002dlayout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.10 Group ecb-create-layout</h4>
+
+<p class="noindent">This group contains settings for creating new ECB-layouts:
+
+<div class="defun">
+&mdash; User Option: <b>create-layout-file</b><var><a name="index-create_002dlayout_002dfile-297"></a></var><br>
+<blockquote><p>File where all layouts created by <code>ecb-create-new-layout</code> are
+stored. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ecb-create-layout-frame-height</b><var><a name="index-ecb_002dcreate_002dlayout_002dframe_002dheight-298"></a></var><br>
+<blockquote><p>Frame height of the layout creation frame. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ecb-create-layout-frame-width</b><var><a name="index-ecb_002dcreate_002dlayout_002dframe_002dwidth-299"></a></var><br>
+<blockquote><p>Frame width of the layout creation frame. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002ddirectories.html b/site/ecb-2.40/html-help/ecb_002ddirectories.html
new file mode 100644
index 0000000..ffbefd5
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002ddirectories.html
@@ -0,0 +1,498 @@
+<html lang="en">
+<head>
+<title>ecb-directories - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer" title="ecb-tree-buffer">
+<link rel="next" href="ecb_002dsources.html#ecb_002dsources" title="ecb-sources">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-directories"></a>
+<a name="ecb_002ddirectories"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.3 Group ecb-directories</h4>
+
+<p class="noindent">This group contains settings for the directories-buffer in the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>add-path-for-not-matching-files</b><var><a name="index-add_002dpath_002dfor_002dnot_002dmatching_002dfiles-168"></a></var><br>
+<blockquote><p>Add path of a file to <code>ecb-source-path</code> if not already contained. 
+This is done during the auto. windows synchronization which happens if
+a file is opened not via the file/directory-browser of ECB. In such a
+situation ECB adds the path of the new file auto. to
+<code>ecb-source-path</code> at least temporally for the current Emacs
+session. This option defines two things:
+
+          <ol type=1 start=1>
+<li>Should only the root-part (which means for Unix-like systems always
+'/' and for windows-like systems the drive) of the new file be added
+as source-path to <code>ecb-source-path</code> or the whole directory-part? 
+For remote-files (e.g. tramp, ange-ftp- or efs-files) the root-part is
+the complete host-part + the root-dir at that host (example:
+/berndl@ecb.sourceforge.net:/ would be the root-part of
+/berndl@ecb.sourceforge.net:/tmp/test.txt). 
+<li>Should this path be added for future sessions too?
+             </ol>
+
+        <p>The value of this option is a cons-cell where the car is a boolean for
+1. and the cdr is a boolean for 2.
+
+        <p>A value of not nil for the car (1.) is reasonably if a user often
+opens files not via the ECB-browser which are not located in any of
+the paths of <code>ecb-source-path</code> because then only one path for
+each drive (windows) or the root-path (Unix) is added to the directory
+buffer of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>auto-expand-directory-tree</b><var><a name="index-auto_002dexpand_002ddirectory_002dtree-169"></a></var><br>
+<blockquote><p>Automatically expand the directory tree to the current source file. 
+There are three options:
+
+          <ul>
+<li><code>best</code>: Expand the best-matching source-path
+<li><code>first</code>: Expand the first matching source-path
+<li><code>nil</code>: Do not automatically expand the directory tree. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>after-directory-change-hook</b><var><a name="index-after_002ddirectory_002dchange_002dhook-170"></a></var><br>
+<blockquote><p>Hook which run directly after the selected directory has changed. This means
+not onyl after a click onto a directory in the directory-window of ECB but it
+means this hook runs always when the current directory changes regardless of
+the trigger of this change. So for example it runs also when you just switches
+from one buffer to another via <code>switch-to-buffer</code> or
+<code>switch-to-buffer-other-window</code> and the directory of these filebuffers is
+different but only when auto-synchronizing of the ECB-windows is on (see
+<code>ecb-basic-buffer-sync</code>). It runs not when switching between buffers and
+the associated files reside in the same directory.
+
+        <p>Each function added to this hook will be called with two arguments:
+The directory which was current _before_ the directory-change-trigger
+and the directory which was now the current (i.e. after the trigger).
+
+        <p>Example: If you switch from a filebuffer &ldquo;~/.emacs&rdquo; to a filebuffer
+&ldquo;/tmp/test.txt&rdquo; then the functions of this hook will be called with
+the two arguments &ldquo;~&rdquo; and &ldquo;/tmp&rdquo;. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>cache-directory-contents</b><var><a name="index-cache_002ddirectory_002dcontents-171"></a></var><br>
+<blockquote><p>Cache contents of directories.
+
+        <p>This can be useful if <code>ecb-source-path</code> contains directories with
+many files and subdirs, especially if these directories are mounted
+net-drives (&ldquo;many&rdquo; means here something &gt; 500, dependent of the
+speed of the net-connection and the machine). Or if it contains
+remote-source-paths which means paths in the sense of tramp, ange-ftp
+or efs. For these directories actualizing the sources- and/or
+directories- buffer of ECB (if displayed in current layout!) can slow
+down dramatically so a caching increases speed a lot.
+
+        <p>The value of this option is a list where each element is a cons-cell
+and looks like:
+
+     <pre class="example">          (&lt;dir-regexp&gt; . &lt;filenumber threshold&gt;) with
+   </pre>
+          <dl>
+<dt><code>&lt;dir-regexp&gt;:</code><dd>Regular expression a directory must match to be cached. 
+<br><dt><code>&lt;filenumber threshold&gt;:</code><dd>Number of directory contents must exceed this number. 
+</dl>
+
+        <p>A directory will only be cached if and only if the directory-name
+matches at least one rexexp of this option and its content-number
+exceeds the related threshold AND the directory-name matches NOT any
+regexp of <code>ecb-cache-directory-contents-not</code>!
+
+        <p>The cache entry for a certain directory will be refreshed and
+actualized only by using the POWER-click (see
+<code>ecb-primary-secondary-mouse-buttons</code>) in the directories-buffer
+of ECB (see <a href="Using-the-mouse.html#Using-the-mouse">Using the mouse</a>).
+
+        <p>Default-value: ECB caches the contents of all remote directories
+regardless of the size and all other directories if more than 50
+entries are contained.
+
+        <p>Examples:
+
+        <p>An entry <code>("/usr/home/john_smith/bigdir*" . 1000)</code> means the
+contents of every subdirectory of the home-directory of John Smith
+will be cached if the directory contains more than 1000 entries and
+its name begins with &ldquo;bigdir&rdquo;.
+
+        <p>An entry <code>(".*" . 1000)</code> caches every directory which has more
+than 1000 entries.
+
+        <p>An entry <code>("^/\\([^:/]*@\\)?\\([^@:/]*\\):.*" . 0)</code> caches
+every remote (in the sense of tramp, ange-ftp or efs) directory
+regardless of the number of entries."
+
+        <p>Please note: If you want your home-dir being cached then you MUST NOT
+use &ldquo;~&rdquo; because ECB tries always to match full path-names! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>cache-directory-contents-not</b><var><a name="index-cache_002ddirectory_002dcontents_002dnot-172"></a></var><br>
+<blockquote><p>Do not cache the contents of certain directories. The value of this
+option is a list where the each element is a regular expression a
+directory must match if it should not being cached.
+
+        <p>If a directory-name matches at least one of the regexps of this option
+the directory-contents will never being cached. See
+<code>ecb-cache-directory-contents</code> to see when a directory will be
+cached.
+
+        <p>This option can be useful when normally all directories with a certain
+amount of content (files and subdirs) should be cached but some
+special directories not. This can be achieved by:
+
+          <ul>
+<li>Setting <code>ecb-cache-directory-contents</code> to ((&ldquo;.*&rdquo; . 500)):
+Caches all directories with more then 500 entries
+
+          <li>Setting <code>ecb-cache-directory-contents-not</code> to a value which
+matches these directories which should not being cached (e.g. 
+(&ldquo;/usr/home/john_smith&rdquo;) excludes the HOME-directory of John Smith
+from being cached). 
+</ul>
+
+        <p>Please note: If you want your home-dir exclude from being cached then
+you MUST NOT use &ldquo;~&rdquo; because ECB tries always to match full
+path-names! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-buffer-after-create-hook</b><var><a name="index-directories_002dbuffer_002dafter_002dcreate_002dhook-173"></a></var><br>
+<blockquote><p>Local hook running after the creation of the directories-buffer. Every
+function of this hook is called once without arguments direct after
+creating the directories-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+<code>local-set-key</code> to define new keybindings only for the
+directories-buffer of ECB.
+
+        <p>The following keys must not be rebind in the directories-buffer:
+<kbd>F2</kbd>, <kbd>F3</kbd> and <kbd>F4</kbd>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-buffer-name</b><var><a name="index-directories_002dbuffer_002dname-174"></a></var><br>
+<blockquote><p>Name of the ECB directory buffer. Because it is not a normal buffer
+for editing you should enclose the name with stars, e.g. &ldquo; *ECB
+Directories*&rdquo;.
+
+        <p>If it is necessary for you you can get emacs-lisp access to the buffer-object of
+the ECB-directory-buffer by this name, e.g. by a call of <code>set-buffer</code>.
+
+        <p>Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-menu-sorter</b><var><a name="index-directories_002dmenu_002dsorter-175"></a></var><br>
+<blockquote><p>Function which re-sorts the menu-entries of the directories buffer.
+
+        <p>If a function then this function is called to re-arrange the
+menu-entries of the combined menu-entries of the user-menu-extensions
+of <code>ecb-directories-menu-user-extension</code> and the built-in-menu
+<code>ecb-directories-menu</code>. If nil then no special sorting will be
+done and the user-extensions are placed in front of the
+built-in-entries.
+
+        <p>The function get one argument, a list of menu-entries. For the format
+of this argument see <code>ecb-directories-menu-user-extension</code>. The
+function must return a new list in the same format. Of course this
+function can not only re-arrange the entries but also delete entries
+or add new entries. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-menu-user-extension</b><var><a name="index-directories_002dmenu_002duser_002dextension-176"></a></var><br>
+<blockquote><p>Static user extensions for the popup-menu of the directories buffer. 
+Value is a list of elements of the following type: Each element
+defines a new menu-entry and is either:
+
+          <ol type=1 start=1>
+<li>Menu-command:
+A list containing two sub-elements, whereas the first is the function
+(a function symbol) being called if the menu-entry is selected and the
+second is the name of the menu-entry.
+
+          <li>Separator:
+A one-element-list and the element is the string &ldquo;&mdash;&rdquo;: Then a
+non-selectable menu-separator is displayed.
+
+          <li>Submenu:
+A list where the first element is the title of the submenu displayed
+in the main-menu and all other elements are either menu-commands (see
+1) or separators (see 2) or another submenu (see c). This allows deep
+nested menu-submenu-structures. Currently a level of 4 is allowed but
+in general there could be an infinite depth of nesting but it makes no
+sense - if possible at all - to define infinite nested
+defcustom-types. So there is a limit of 4 levels but tis is not a hard
+limit: Just increase the value of the <code>ecb-max-submenu-depth</code>
+<strong>BEFORE</strong> first loading ECB!
+             </ol>
+
+        <p>The function of a menu-command must follow the following guidelines:
+Such a function must be defined with the macro
+<code>tree-buffer-defpopup-command</code>! This macro defines a new
+popup-command whereas the newly defined command gets one argument
+<var>NODE</var>. See the docstring of <code>tree-buffer-defpopup-command</code>
+for further details.
+
+        <p>Example for the definition of such a menu-function:
+
+     <pre class="example">        (tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+          "Prints the name of the directory of the node under point."
+          (let ((node-data=dir (tree-node-get-data node)))
+             (message ``Dir under node: %s'' node-data=dir)))
+   </pre>
+        <p>Per default the static user-extensions are added at the beginning of
+the built-in menu-entries of <code>ecb-directories-menu</code> but the whole
+menu can be re-arranged with <code>ecb-directories-menu-sorter</code>.
+
+        <p>These menu-extensions are static. A dynamic menu-extension can be
+achieved via <code>ecb-directories-menu-user-extension-function</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-menu-user-extension-function</b><var><a name="index-directories_002dmenu_002duser_002dextension_002dfunction-177"></a></var><br>
+<blockquote><p>Dynamic user extensions for the popup-menu of the directories buffer. 
+A function which has to return a list in the same format like the
+option <code>ecb-directories-menu-user-extension</code>. This function is
+called when the user opens the popup-menu for the directories buffer.
+
+        <p>If no dynamically evaluated menu-extensions should be added to the
+directories-buffer the function has to return nil. Therefore the
+default-value of this option is <code>ignore</code>.
+
+        <p>Per default the dynamic user-extensions are added in front of the
+static extensions of <code>ecb-directories-menu-user-extension</code> but
+the whole menu can be re-arranged with
+<code>ecb-directories-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directories-show-node-info</b><var><a name="index-directories_002dshow_002dnode_002dinfo-178"></a></var><br>
+<blockquote><p>When to display which node-info in the directories-buffer. 
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+directories-buffer.
+
+        <p>You can define &ldquo;when&rdquo; a node-info should be displayed:
+          <ul>
+<li>always: Node info is displayed by moving with the mouse over a node. 
+<li>if-too-long: Node info is only displayed by moving with the mouse over a
+node does not fit into the window-width of the tree-buffer window. 
+In the ECB directories buffer this means also if a node is shortend or if
+the node has an alias (see <code>ecb-source-path</code>). 
+<li>shift-click: Node info is only displayed after a shift click with the
+primary mouse button onto the node. 
+<li>never: Node info is never displayed. 
+</ul>
+
+        <p>You can define &ldquo;which&rdquo; info should be displayed:
+          <ul>
+<li>name: Only the full node-name is displayed. 
+<li>path: The full-path of the node is displayed. 
+</ul>
+
+        <p>Do NOT set this option directly via setq but use always customize! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>display-default-dir-after-start</b><var><a name="index-display_002ddefault_002ddir_002dafter_002dstart-179"></a></var><br>
+<blockquote><p>Automatically display current default-directory after activating ECB.
+
+        <p>If a file-buffer is displayed in the current active edit-window then
+ECB synchronizes its basic tree-buffers to this file-buffer - at least if
+the option <code>ecb-basic-buffer-sync</code> it not nil. So for this situation
+<code>ecb-display-default-dir-after-start</code> takes no effect but this
+option is for the case if no file-buffer is displayed in the
+edit-window after startup:
+
+        <p>If true then ECB selects autom. the current default-directory after
+activation even if no file-buffer is displayed in the current active
+edit-window. This is useful if ECB is autom. activated after startup
+of Emacs and Emacs is started without a file-argument. So the
+directory from which the startup has performed is auto. selected in
+the ECB-directories buffer and the ECB-sources buffer displays the
+contents of this directory. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>excluded-directories-regexps</b><var><a name="index-excluded_002ddirectories_002dregexps-180"></a></var><br>
+<blockquote><p>Directories that should not be included in the directories list. The
+value of this variable should be a list of regular expression. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>prescan-directories-for-emptyness</b><var><a name="index-prescan_002ddirectories_002dfor_002demptyness-181"></a></var><br>
+<blockquote><p>Prescan directories for emptyness. ECB does this so directories are
+displayed as empty in the directories-buffer even without
+user-interaction (i.e. in previous ECB-versions the emptyness of a
+directory has been first checked when the user has clicked onto a
+directory). ECB optimizes this check as best as possible but if a
+directory contains a lot of subdirectories which contain in turn a lot
+of entries, then expanding such a directory or selecting it would take
+of course more time as without this check - at least at the first time
+(all following selects of a directory uses the cached information if
+its subdirectories are empty or not). Therefore ECB performs this
+check stealthy (see <code>ecb-stealthy-tasks-delay</code>) so normally there
+should no performance-decrease or additional waiting-time for the
+user. There is one exception: For remote directories (in the sense of
+tramp, ange-ftp, or efs) this check can descrease performance even if
+performed stealthy and interruptable. Therefore this option offers
+three possible settings:
+
+          <ul>
+<li><code>t</code>
+Switch on this feature
+
+          <li><code>unless-remote</code>
+Switch on this feature but not for remote directories. The term
+&ldquo;remote&rdquo; means here directories which are used via tramp, ange-ftp
+or efs. So mounted directories are counted not as remote directories
+here even if such a directory is maybe hosted on a remote machine. But
+normally only directories in a LAN are mounted so there should be no
+performance-problems with such mounted directories.
+
+          <li><code>nil</code>
+Switch off this feature completely. 
+</ul>
+
+        <p>The option <code>ecb-prescan-directories-exclude-regexps</code> offers are
+more fine granularity to exclude certain directories from this
+prescan. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>host-accessible-check-valid-time</b><var><a name="index-host_002daccessible_002dcheck_002dvalid_002dtime-182"></a></var><br>
+<blockquote><p>Time in seconds a cached accessible-state of a remote host is valid. 
+This option is a list where each element specifies how long for a
+certain remote host the cached ping-state (i.e. if the host is
+accessible or not) should be valid. During this time-intervall ECB
+pings such a remote host only once, all other checks use the cached
+value of that real check. But it the cached value is older than the
+value of this option ECB will ping again.
+
+        <p>Per default ECB discards after 1 minute the cached ping-state of each
+remote host. But if you are sure that a certain remote host is always
+accessible (i.e. means in consequence that you are always online when
+working with ECB and remote-paths) then add an entry to this option
+with a high valid-interval.
+
+        <p>Examples: An entry (&ldquo;.*sourceforge.*&rdquo; . 3600) ensures that all
+remote hosts machting the string &ldquo;sourceforge&rdquo; will only once pinged
+during one hour. Or (&ldquo;.*&rdquo; . 300) would ensure that every remote host
+would be pinged only once during 5 minutes. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ping-options</b><var><a name="index-ping_002doptions-183"></a></var><br>
+<blockquote><p>List of options for the ping program. These options can be used to
+limit how many ICMP packets are emitted. Ping is used to test if a
+remote host of a remote path (e.g. a tramp-, ange-ftp- or efs-path) is
+accessible See also <code>ecb-ping-program</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ping-program</b><var><a name="index-ping_002dprogram-184"></a></var><br>
+<blockquote><p>Program to send network test packets to a host. See also
+<code>ecb-ping-options</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>prescan-directories-exclude-regexps</b><var><a name="index-prescan_002ddirectories_002dexclude_002dregexps-185"></a></var><br>
+<blockquote><p>Which directories should be excluded from the empty-prescan. If a
+directory matches any of the regexps of this option it will not be
+prescanned for emptyness - This option takes only effect if
+<code>ecb-prescan-directories-for-emptyness</code> is not nil. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-sources-in-directories-buffer</b><var><a name="index-show_002dsources_002din_002ddirectories_002dbuffer-186"></a></var><br>
+<blockquote><p>Show source files in directories buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-path</b><var><a name="index-source_002dpath-187"></a></var><br>
+<blockquote><p>Paths where to find code sources. Each path can have an optional alias
+that is used as it's display name. If no alias is set, the path is
+used as display name. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-path</b><var><a name="index-source_002dpath-188"></a></var><br>
+<blockquote><p>Paths where to find code sources. Each path can have an optional alias
+that is used as it's display name. If no alias is set, the path is
+used as display name.
+
+        <p>Lisp-type of tis option: The value must be a list L whereas each
+element of L is either
+          <ul>
+<li>a simple string which has to be the full path of a directory (this
+string is displayed in the directory-browser of ECB) or
+
+          <li>a 2-element list whereas the first element is the full path of a
+directory (string) and the second element is an arbitrary alias
+(string) for this directory which is then displayed instead of the
+underlying directory. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>use-speedbar-instead-native-tree-buffer</b><var><a name="index-use_002dspeedbar_002dinstead_002dnative_002dtree_002dbuffer-189"></a></var><br>
+<blockquote><p>If true then uses speedbar for directories, sources or methods. This
+means that speedbar is integrated in the ECB-frame and is displayed in
+that window normally displaying the standard ECB-directories-buffer,
+ECB-sources-buffer or ECB-methods-buffer.
+
+        <p>This option takes effect in all layouts which contain either a
+directory window, a sources window or a method window.
+
+        <p>This option can have four valid values:
+          <ul>
+<li><code>nil</code>: Do not use speedbar (default)
+<li><code>dir</code>: Use speedbar instead of the standard directories-buffer
+<li><code>source</code>: Use speedbar instead of the standard sources-buffer
+<li><code>method</code>: Use speedbar instead of the standard methods-buffer
+</ul>
+
+        <p>Note: For directories and sources a similar effect and usability is
+available by setting this option to <code>nil</code> (or <code>method</code>) and
+setting <code>ecb-show-sources-in-directories-buffer</code> to not
+<code>nil</code>, because this combination displays also directories and
+sources in one window.
+
+        <p><code>ecb-use-speedbar-instead-native-tree-buffer</code> is for people who
+like the speedbar way handling directories and source-files or methods
+and want it in conjunction with ECB. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002deshell.html b/site/ecb-2.40/html-help/ecb_002deshell.html
new file mode 100644
index 0000000..6610026
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002deshell.html
@@ -0,0 +1,91 @@
+<html lang="en">
+<head>
+<title>ecb-eshell - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dhelp.html#ecb_002dhelp" title="ecb-help">
+<link rel="next" href="ecb_002dspeedbar.html#ecb_002dspeedbar" title="ecb-speedbar">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-eshell"></a>
+<a name="ecb_002deshell"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.14 Group ecb-eshell</h4>
+
+<p class="noindent">This group contains settings for eshell integration within the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>eshell-auto-activate</b><var><a name="index-eshell_002dauto_002dactivate-319"></a></var><br>
+<blockquote><p>Startup the eshell and display it in the compile-window. If current
+layout does not display a compile-window (see
+<code>ecb-compile-window-height</code>) then nothing is done. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>eshell-buffer-sync</b><var><a name="index-eshell_002dbuffer_002dsync-320"></a></var><br>
+<blockquote><p>Synchronize eshell with the default-directory of current source-buffer.
+
+        <p>This option takes only effect if a permanant compile-window is used in the
+current layout.
+
+        <p>If 'always then the synchronization takes place always a buffer changes in the
+edit window and if after this the default-directory of the new edit-buffer is
+different from the default-directory of the current eshell-buffer. If value is
+nil then never a synchronization will take place. If a list of major-modes
+then only if the <code>major-mode</code> of the new buffer belongs NOT to this list.
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>eshell-buffer-sync-delay</b><var><a name="index-eshell_002dbuffer_002dsync_002ddelay-321"></a></var><br>
+<blockquote><p>Time Emacs must be idle before the eshell-buffer of ECB is synchronized. 
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync-delay</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>eshell-enlarge-when-eshell</b><var><a name="index-eshell_002denlarge_002dwhen_002deshell-322"></a></var><br>
+<blockquote><p>Enlarge the compile-window if it is selected by <code>eshell</code>. This
+takes only effect if the command <code>eshell</code> is called! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>eshell-fit-window-to-command-output</b><var><a name="index-eshell_002dfit_002dwindow_002dto_002dcommand_002doutput-323"></a></var><br>
+<blockquote><p>Fit the compile-window after an eshell-command to the output. This is
+done by the function <code>ecb-eshell-fit-window-to-output</code> which is
+added to <code>eshell-post-command-hook</code> ie. which is running autom. 
+after each eshell-command. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dface_002doptions.html b/site/ecb-2.40/html-help/ecb_002dface_002doptions.html
new file mode 100644
index 0000000..2e4b203
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dface_002doptions.html
@@ -0,0 +1,177 @@
+<html lang="en">
+<head>
+<title>ecb-face-options - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout" title="ecb-create-layout">
+<link rel="next" href="ecb_002dfaces.html#ecb_002dfaces" title="ecb-faces">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-face-options"></a>
+<a name="ecb_002dface_002doptions"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dfaces.html#ecb_002dfaces">ecb-faces</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dcreate_002dlayout.html#ecb_002dcreate_002dlayout">ecb-create-layout</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.11 Group ecb-face-options</h4>
+
+<p class="noindent">This group contains settings for all faces used in ECB:
+
+<div class="defun">
+&mdash; User Option: <b>directories-general-face</b><var><a name="index-directories_002dgeneral_002dface-300"></a></var><br>
+<blockquote><p>Basic face for the ECB directories buffer. This defines the basic face
+the whole directory buffer should displayed with. If the face
+<code>ecb-default-general-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-general-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directory-face</b><var><a name="index-directory_002dface-301"></a></var><br>
+<blockquote><p>Face used for highlighting current directory in the directories
+buffer. If the face <code>ecb-default-highlight-face</code> is used then the
+display of all ECB-tree-buffers can be changed by modifying only the
+face <code>ecb-default-highlight-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>directory-not-accessible-face</b><var><a name="index-directory_002dnot_002daccessible_002dface-302"></a></var><br>
+<blockquote><p>Face for not accessible dirs in the directories buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-bucket-node-face</b><var><a name="index-history_002dbucket_002dnode_002dface-303"></a></var><br>
+<blockquote><p>Basic face for displaying a bucket-node in the ECB-history-buffer. 
+This defines the basic face for the bucket-nodes used to bucketize the
+history-entries as defined with the option <code>ecb-history-make-buckets</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-dead-buffer-face</b><var><a name="index-history_002ddead_002dbuffer_002dface-304"></a></var><br>
+<blockquote><p>Face for history entries pointing to dead buffers.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-face</b><var><a name="index-history_002dface-305"></a></var><br>
+<blockquote><p>Face used for highlighting current history-entry in the history
+buffer. If the face <code>ecb-default-highlight-face</code> is used then the
+display of all ECB-tree-buffers can be changed by modifying only the
+face <code>ecb-default-highlight-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-general-face</b><var><a name="index-history_002dgeneral_002dface-306"></a></var><br>
+<blockquote><p>Basic face for the ECB directory buffer. This defines the basic face
+the whole history buffer should displayed with. If the face
+<code>ecb-default-general-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-general-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-indirect-buffer-face</b><var><a name="index-history_002dindirect_002dbuffer_002dface-307"></a></var><br>
+<blockquote><p>Face for indirect buffers in the history buffer.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>method-face</b><var><a name="index-method_002dface-308"></a></var><br>
+<blockquote><p>Face used for highlighting current method, class or variable in the
+methods buffer. If the face <code>ecb-default-highlight-face</code> is used
+then the display of all ECB-tree-buffers can be changed by modifying
+only the face <code>ecb-default-highlight-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>method-non-semantic-face</b><var><a name="index-method_002dnon_002dsemantic_002dface-309"></a></var><br>
+<blockquote><p>Face used for for displaying tags of sources not supported by
+semantic.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-general-face</b><var><a name="index-methods_002dgeneral_002dface-310"></a></var><br>
+<blockquote><p>Basic face for the ECB methods buffer. This defines the basic face the
+whole methods buffer should displayed with. If the face
+<code>ecb-default-general-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-general-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-face</b><var><a name="index-source_002dface-311"></a></var><br>
+<blockquote><p>Face used for highlighting current source in the sources buffer. If
+the face <code>ecb-default-highlight-face</code> is used then the display of
+all ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-highlight-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-in-directories-buffer-face</b><var><a name="index-source_002din_002ddirectories_002dbuffer_002dface-312"></a></var><br>
+<blockquote><p>Face for source files in the directories buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-general-face</b><var><a name="index-sources_002dgeneral_002dface-313"></a></var><br>
+<blockquote><p>Basic face for the ECB sources buffer. This defines the basic face the
+whole sources buffer should displayed with. If the face
+<code>ecb-default-general-face</code> is used then the display of all
+ECB-tree-buffers can be changed by modifying only the face
+<code>ecb-default-general-face</code>.
+
+        <p>Changes take first effect after finishing and reactivating ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-read-only-face</b><var><a name="index-source_002dread_002donly_002dface-314"></a></var><br>
+<blockquote><p>Face for read-only sources. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tag-header-face</b><var><a name="index-tag_002dheader_002dface-315"></a></var><br>
+<blockquote><p>Face used for highlighting the tag header after jumping to it by
+clicking onto a node in the methods buffer. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dfaces.html b/site/ecb-2.40/html-help/ecb_002dfaces.html
new file mode 100644
index 0000000..802615b
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dfaces.html
@@ -0,0 +1,172 @@
+<html lang="en">
+<head>
+<title>ecb-faces - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dface_002doptions.html#ecb_002dface_002doptions" title="ecb-face-options">
+<link rel="next" href="ecb_002dhelp.html#ecb_002dhelp" title="ecb-help">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-faces"></a>
+<a name="ecb_002dfaces"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dhelp.html#ecb_002dhelp">ecb-help</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.12 Group ecb-faces</h4>
+
+<p class="noindent">This group contains all faces used in ECB:
+
+     <dl>
+<dt><code>ecb-bucket-node-face:</code><dd>Face which can be used for displaying bucket tags in the methods
+buffer. See also <code>ecb-bucket-node-display</code>.
+
+     <br><dt><code>ecb-default-general-face:</code><dd>Basic face for all ECB tree-buffers. 
+It's recommended to define here the font-family, the font-size, the basic
+color etc.
+
+     <p>In GNU Emacs 21.X all faces (even the face
+<code>ecb-default-highlight-face</code>) used in the ECB tree-buffers inherit
+from this face. Therefore the default attributes like font etc. of a
+face used in a tree-buffer can be very easily changed with face
+<code>ecb-default-general-face</code>.
+
+     <p>With XEmacs there is no inheritance-feature but the options
+<code>ecb-directories-general-face</code>, <code>ecb-sources-general-face</code>,
+<code>ecb-methods-general-face</code> and <code>ecb-history-general-face</code>
+offer the choice to use the face <code>ecb-default-general-face</code> so
+also with XEmacs the basic face-settings can be easily changed just by
+customizing the face <code>ecb-default-general-face</code>!
+
+     <br><dt><code>ecb-default-highlight-face:</code><dd>Define basic face for highlighting the selected node in an ECB
+tree-buffer.
+
+     <p>In GNU Emacs 21.X all highlighting faces in the ECB tree-buffers
+inherit from this face. Therefore the default attributes like font
+etc. of a face used in a tree-buffer for highlighting the current
+tag can be very easily changed with face
+<code>ecb-default-highlight-face</code>.
+
+     <p>With XEmacs there is no inheritance-feature but the options
+<code>ecb-directory-face</code>, <code>ecb-source-face</code>,
+<code>ecb-method-face</code> and <code>ecb-history-face</code> offer the choice to
+use the face <code>ecb-default-highlight-face</code> so also with XEmacs the
+basic face-settings can be easily changed just by customizing the face
+<code>ecb-default-highlight-face</code>!
+
+     <br><dt><code>ecb-directories-general-face:</code><dd>Basic face for the ECB directories buffer. It“s recommended to define
+here the font-family, the font-size, the basic color etc.
+
+     <br><dt><code>ecb-directory-face:</code><dd>Define face used for highlighting current directory in the directories
+buffer.
+
+     <br><dt><code>ecb-directory-not-accessible-face</code><dd>Define a face for not accessible dirs in the directories buffer.
+
+     <br><dt><code>ecb-history-bucket-node-face:</code><dd>Face used for displaying a bucket-node in the ECB-history-buffer.
+
+     <p>In GNU Emacs 21.X this face inherits from the face
+<code>ecb-bucket-node-face</code>. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by <code>ecb-bucket-node-face</code>
+this set of basic attributes have to be set in
+<code>ecb-history-bucket-node-face</code> too!
+
+     <br><dt><code>ecb-history-dead-buffer-face:</code><dd>Face used for history entries pointing to dead buffers.
+
+     <p>In GNU Emacs 21.X this face inherits from the face
+<code>ecb-history-general-face</code>. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by
+<code>ecb-history-general-face</code> this set of basic attributes have to be set in
+<code>ecb-history-dead-buffer-face</code> too!
+
+     <br><dt><code>ecb-history-face:</code><dd>Define face used for highlighting current history-entry in the history
+buffer.
+
+     <br><dt><code>ecb-history-general-face:</code><dd>Basic face for the ECB history buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+     <br><dt><code>ecb-history-indirect-buffer-face:</code><dd>Face used for history entries pointing to dead buffers.
+
+     <p>In GNU Emacs 21.X this face inherits from the face
+<code>ecb-history-general-face</code>. With XEmacs and GNU Emacs 20.X there is no
+inheritance-feature so if the buckets in the ECB-history-buffer should be
+displayed with the same basic attributes set by
+<code>ecb-history-general-face</code> this set of basic attributes have to be set in
+<code>ecb-history-indirect-buffer-face</code> too!
+
+     <br><dt><code>ecb-method-face:</code><dd>Define face used for highlighting current method, class or variable in
+the methods buffer.
+
+     <br><dt><code>ecb-methods-general-face:</code><dd>Basic face for the ECB methods buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+     <br><dt><code>ecb-method-non-semantic-face:</code><dd>Define face used for displaying tags of sources not supported by semantic.
+
+     <br><dt><code>ecb-mode-line-data-face</code><dd>Define face for the data in the mode-line. See
+<code>ecb-mode-line-data</code>.
+
+     <br><dt><code>ecb-mode-line-prefix-face</code><dd>Define face for the prefix in the mode-line. See
+<code>ecb-mode-line-prefixes</code>.
+
+     <br><dt><code>ecb-source-face:</code><dd>Define face used for highlighting current source in the sources
+buffer.
+
+     <br><dt><code>ecb-source-in-directories-buffer-face:</code><dd>Define a face for displaying sources in the directories buffer.
+
+     <br><dt><code>ecb-sources-general-face:</code><dd>Basic face for the ECB sources buffer. It“s recommended to define here
+the font-family, the font-size, the basic color etc.
+
+     <br><dt><code>ecb-source-read-only-face</code><dd>Define a face for read-only sources
+
+     <br><dt><code>ecb-tag-header-face:</code><dd>Define face used for highlighting the tag header after jumping to it
+by clicking onto a node in the methods buffer.
+
+     <br><dt><code>ecb-tree-guide-line-face:</code><dd>Define face for the guide-lines in the tree-buffers. See the option
+<code>ecb-tree-buffer-style</code> for a explanation of guide-lines.
+
+     <br><dt><code>ecb-type-tag-class-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-enum-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-group-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-interface-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-struct-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-typedef-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-type-tag-union-face:</code><dd>Define face used with option <code>ecb-type-tag-display</code>.
+
+     <br><dt><code>ecb-mode-line-win-nr-face</code><dd>Define face for the window-number in the mode-line. See
+<code>ecb-mode-line-display-window-number</code>.
+
+   </dl>
+
+   <p>Just call <code>customize-face &lt;face-name&gt;</code> to customize these faces
+for your personal taste. Or customize the related option in the group
+<a href="ecb_002dface_002doptions.html#ecb_002dface_002doptions">ecb-face-options</a>.
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dgeneral.html b/site/ecb-2.40/html-help/ecb_002dgeneral.html
new file mode 100644
index 0000000..c7cdaa7
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dgeneral.html
@@ -0,0 +1,352 @@
+<html lang="en">
+<head>
+<title>ecb-general - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="next" href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer" title="ecb-tree-buffer">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-general"></a>
+<a name="ecb_002dgeneral"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dtree_002dbuffer.html#ecb_002dtree_002dbuffer">ecb-tree-buffer</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="Customizable-options.html#Customizable-options">Customizable options</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.1 Group ecb-general</h4>
+
+<p class="noindent">This group contains general settings for the Emacs code browser:
+
+<div class="defun">
+&mdash; User Option: <b>activate-before-layout-draw-hook</b><var><a name="index-activate_002dbefore_002dlayout_002ddraw_002dhook-126"></a></var><br>
+<blockquote><p>Normal hook run at the end of activating the ecb-package by running
+<code>ecb-activate</code>. This hooks are run after all the internal setup
+process but directly before(!) drawing the layout specified in
+<code>ecb-layout</code> (means before dividing the frame into several
+windows).
+
+        <p>A senseful using of this hook can be maximizing the Emacs-frame for
+example, because this should be done before the layout is drawn
+because ECB computes the size of the ECB-windows with the current
+frame size! If you need a hook-option for the real end of the
+activating process (i.e. after the layout-drawing) look at
+<code>ecb-activate-hook</code>.
+
+        <p>IMPORTANT: The difference between this hook and
+<code>ecb-redraw-layout-before-hook</code> is that the latter one is
+evaluated always before the layout is redrawn (for example after
+calling <code>ecb-redraw-layout</code>) whereas the former one (this hook)
+is only evaluated exactly once during the activation-process of ECB. 
+So during the activation process there is the following sequence of
+hooks:
+          <ol type=1 start=1>
+<li><code>ecb-activate-before-layout-draw-hook</code> \(this one)
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;Drawing the layout&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-activate-hook</code>
+             </ol>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>activate-hook</b><var><a name="index-activate_002dhook-127"></a></var><br>
+<blockquote><p>Hook run at the end of activating ECB by <code>ecb-activate</code>. This
+hooks are run at the real end of the activating process, means after
+the layout has been drawn!. If you need hooks which are run direct
+before the layout-drawing look at
+<code>ecb-activate-before-layout-draw-hook</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>activation-selects-ecb-frame-if-already-active</b><var><a name="index-activation_002dselects_002decb_002dframe_002dif_002dalready_002dactive-128"></a></var><br>
+<blockquote><p>Trying to activate an already activated ECB selects the ECB-frame. If
+t then the ECB-frame is selected, if nil then it is not. If 'ask then
+ECB asks if the ECB-frame should be selected if the current-frame is
+not the <code>ecb-frame</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>auto-activate</b><var><a name="index-auto_002dactivate-129"></a></var><br>
+<blockquote><p>Automatically startup ECB when Emacs starts up. This should only be
+true if you always want to run <code>ecb-activate</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>auto-compatibility-check</b><var><a name="index-auto_002dcompatibility_002dcheck-130"></a></var><br>
+<blockquote><p>Check at ECB-startup if all ECB-options have correct values. If not
+nil then all ECB-options are checked if their current value have the
+correct type. It the type is incorrect the option is either auto. 
+upgraded to the new type or reset to the default-value of current ECB
+if no upgrade is possible. This feature can also upgrade options which
+are renamed in current ECB and try to transform the old-value to the
+new named option. After startup all upgraded or reset options are
+displayed with their old (before upgrade/reset) and new values. See
+also the commands <code>ecb-upgrade-options</code> and
+<code>ecb-display-upgraded-options</code>. If this option is off then the
+user can perform the check and reset manually with
+<code>ecb-upgrade-options</code>. 
+See <a href="Auto_002e-option_002dupgrading.html#Auto_002e-option_002dupgrading">Auto. option-upgrading</a>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>before-activate-hook</b><var><a name="index-before_002dactivate_002dhook-131"></a></var><br>
+<blockquote><p>Normal hook run at the beginning of activating the ecb-package by
+running <code>ecb-activate</code>. These hooks run before any other tasks of
+the activating process are performed. If any of these hooks returns
+nil then ECB will not be activated!
+
+        <p>This can be used to check some conditions and then only start ECB if
+all conditions are true. For example a function could be added which
+returns only nil if Gnus is running. Then calling <code>ecb-activate</code>
+or <code>ecb-minor-mode</code> will only start ECB if Gnus is not already
+running. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>before-deactivate-hook</b><var><a name="index-before_002ddeactivate_002dhook-132"></a></var><br>
+<blockquote><p>Normal hook run at the beginning of deactivating ECB by running
+<code>ecb-deactivate</code>. These hooks run before any other tasks of the
+deactivating process are performed. If any of these hooks returns nil
+then ECB will not be deactivated! See also
+<code>ecb-before-activate-hook</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>bucket-node-display</b><var><a name="index-bucket_002dnode_002ddisplay-133"></a></var><br>
+<blockquote><p>How ECB displays bucket-nodes in a ECB tree-buffer. Bucket-nodes have
+only one job: Nodes with similar properties will be dropped into one
+bucket for such a common property and all these nodes will be added as
+children to the bucket-node. Besides being expandable and collapsable
+a bucket-node has no senseful action assigned. Examples for
+bucket-nodes are &ldquo;[+] Variables, &ldquo;[+] Dependencies&rdquo; etc. in the
+Methods-buffer or buckets which combine filenames with same extension
+under a bucket-node with name this extension.
+
+        <p>This option defines how bucket-node should be displayed. The name of
+the bucket-node is computed by ECB but you can define a prefix, a
+suffix and a special face for the bucket-node
+
+        <p>The default are empty prefix/suffix-strings and
+<code>ecb-bucket-node-face</code>. But an alternative can be for example
+'(&ldquo;[&rdquo; &ldquo;]&rdquo; nil) which means no special face and a display like
+&ldquo;[+] [&lt;bucket-name&gt;]&rdquo;. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>clear-caches-before-activate</b><var><a name="index-clear_002dcaches_002dbefore_002dactivate-134"></a></var><br>
+<blockquote><p>Clear all ECB internal caches before startup. If t then ECB clears all
+its internal caches before starting up. Caches are used for files- and
+subdirs (see <code>ecb-cache-directory-contents</code> and
+<code>ecb-cache-directory-contents-not</code>) for semantic-tags and for
+the history-filter.
+
+        <p>This caches are completely clean at load-time of the ECB-library!
+
+        <p>Default is nil, because is makes sense not to clear these caches at
+start-time because ECB is often deacticated temporally especially in
+combination with window-managers like escreen.el. In these situations
+the internal state of ECB should be preserved for next activation. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>deactivate-hook</b><var><a name="index-deactivate_002dhook-135"></a></var><br>
+<blockquote><p>Normal hook run at the end of deactivating (but before the ecb-layout
+is cleared!) ECB by running <code>ecb-deactivate</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>debug-mode</b><var><a name="index-debug_002dmode-136"></a></var><br>
+<blockquote><p>If not nil ECB displays debug-information in the Messages-buffer. This
+is done for some critical situations concerning semantic-tags and
+their overlays (or extends for XEmacs). Normally you should not need
+this switched on! But if you get errors like &ldquo;destroyed extend&rdquo; for
+XEmacs or &ldquo;wrong-argument-type&rdquo; concerning overlays for GNU Emacs then
+you should switch on this option and submitting a bug-report to the
+ecb-mailing-list (<code>ecb-submit-problem-report</code>) after getting the
+error again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>grep-function</b><var><a name="index-grep_002dfunction-137"></a></var><br>
+<blockquote><p>Function used for performing a grep. The popup-menu of the
+tree-buffers &ldquo;Directories&rdquo;, &ldquo;Sources&rdquo; and &ldquo;History&rdquo; offer to
+grep the &ldquo;current&rdquo; directory:
+          <ul>
+<li>Directory-buffer: The grep is performed in the current popup-directory
+after clicking the right mouse-button onto a node. 
+<li>Sources-buffer: The grep is performed in the current selected directory. 
+<li>History-buffer: The grep is performed in the directory of the current
+popup-source after clicking the right mouse-button onto a node. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>grep-recursive-function</b><var><a name="index-grep_002drecursive_002dfunction-138"></a></var><br>
+<blockquote><p>Function used for performing a recursive grep. For more Details see
+option `ecb-grep-function' and replace &ldquo;grep&rdquo; with &ldquo;recursive
+grep&rdquo;. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>key-map</b><var><a name="index-key_002dmap-139"></a></var><br>
+<blockquote><p>Specifies all keybindings for the ECB minor-mode key-map. The value is
+a cons-cell where the car is a common-prefix key for all the
+keybindings. The cdr is a list of keybindings each of them a list
+again. A key-binding has the following form:
+
+     <pre class="example">        '(&lt;common-prefix-flag&gt; &lt;keysequence&gt; &lt;function&gt;) where
+   </pre>
+          <dl>
+<dt><code>&lt;common-prefix-flag&gt;</code><dd>If t then the common-prefix-key defined as car of the value (see above)
+is used.
+
+          <br><dt><code>&lt;keysequence&gt;</code><dd>If the common prefix-key is used then the final key-binding is the
+concatenation of the common-prefix-key (see above) and this
+keysequence.
+
+          <br><dt><code>&lt;function&gt;:</code><dd>The function to bind to the key. This can also be a lambda-expression
+. 
+</dl>
+
+        <p>It is highly recommended to use one of the standard keys C-c or C-x as
+first key of your common-prefix-key!
+
+        <p>You MUST change this option via customize to take effect!
+
+        <p>All keysequences must be inserted as a string and must follow the
+syntax needed by <code>read-kbd-macro</code> or <code>kbd</code>. This means you
+can insert the key in the same manner <kbd>C-h k</kbd> displays keysequences. 
+Here is the summary of the syntax:
+
+        <p>Text is divided into &ldquo;words&rdquo; separated by whitespace. Except for the words
+described below, the characters of each word go directly as characters of the
+keysequence. The whitespace that separates words is ignored. Whitespace in the
+macro must be written explicitly, as in <kbd>C-c SPC</kbd>.
+
+          <ul>
+<li>The special words RET, SPC, TAB, DEL, LFD, ESC, and NUL represent
+special control characters. The words must be written in uppercase.
+
+          <li>A word in angle brackets, e.g., &lt;return&gt;, &lt;down&gt;, &lt;left&gt; or &lt;f1&gt;,
+represents a function key. (Note that in the standard configuration,
+the function key &lt;return&gt; and the control key RET are synonymous.). 
+You can use angle brackets on the words RET, SPC, etc., but they are
+not required there.
+
+          <li>Keys can be written by their ASCII code, using a backslash followed by
+up to six octal digits. This is the only way to represent keys with
+codes above ’.
+
+          <li>One or more prefixes M- (meta), C- (control), S- (shift), A- (alt), H-
+(hyper), and s- (super) may precede a character or key notation. For
+function keys, the prefixes may go inside or outside of the brackets:
+C-&lt;down&gt; = &lt;C-down&gt;. The prefixes may be written in any order: M-C-x =
+C-M-x. Prefixes are not allowed on multi-key words, e.g., C-abc,
+except that the Meta prefix is allowed on a sequence of digits and
+optional minus sign: M&ndash;123 = M&ndash; M-1 M-2 M-3.
+
+          <li>The <code>^</code> notation for control characters also works: ^M = C-m. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>major-modes-show-or-hide</b><var><a name="index-major_002dmodes_002dshow_002dor_002dhide-140"></a></var><br>
+<blockquote><p>List of major-modes which show or hide the ecb-windows. The value is a
+cons-cell where the car contains all major-mode-symbols which should
+show the special ecb-windows and the cdr contains all
+major-mode-symbols which should hide the special ecb-windows. If the
+symbol of a major-mode is neither contained in the car-&ldquo;show-list&rdquo;
+nor in the cdr-&ldquo;hide-list&rdquo; then the visibility-state of the
+ecb-windows does not change. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>minor-mode-text</b><var><a name="index-minor_002dmode_002dtext-141"></a></var><br>
+<blockquote><p>String to display in the mode line when ECB minor mode is active. 
+(When the string is not empty, make sure that it has a leading space.)
+
+        <p>Because for ECB it is quite obvious if it is active or not when the
+ECB-windows are visible this text is only display in the modeline if
+the ECB-windows are hidden. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>run-ediff-in-ecb-frame</b><var><a name="index-run_002dediff_002din_002decb_002dframe-142"></a></var><br>
+<blockquote><p>Run ediff-sessions in the same frame as ECB is running. 
+If not nil then ECB ensures that ediff runs in the same frame as ECB and ECB
+restores exactly the &ldquo;before-ediff&rdquo;-window-layout after quiting ediff. If
+nil then ediff decides in which frame it will run - depending on the current
+window-layout (e.g. if the ecb-windows are currently hidden) this can be the
+ecb-frame but this can also be a newly created frame or any other frame. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>stealthy-tasks-delay</b><var><a name="index-stealthy_002dtasks_002ddelay-143"></a></var><br>
+<blockquote><p>Time Emacs must be idle before ECB runs its stealthy tasks. Currently
+ECB performes the following stealthy tasks:
+
+          <dl>
+<dt>Prescann directories for emptyness<dd>Prescann directories and display them as empty or not-empty in the
+directories-buffer. See the documentation of the option
+<code>ecb-prescan-directories-for-emptyness</code> for a description.
+
+          <br><dt>File is read only<dd>Check if sourcefile-items of the directories- or sources-buffer are
+read-only or not. See documentation of the option
+<code>ecb-sources-perform-read-only-check</code>.
+
+          <br><dt>Version-control-state<dd>Checks the version-control-state of files in directories which are
+managed by a VC-backend. See the option <code>ecb-vc-enable-support</code>.
+
+        </dl>
+
+        <p>Here the interval is defined ECB has to be idle before starting with
+these stealthy tasks. It can be a floating-point value in seconds. The
+value can also be changed during running ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tip-of-the-day</b><var><a name="index-tip_002dof_002dthe_002dday-144"></a></var><br>
+<blockquote><p>Show tip of the day at start time of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tip-of-the-day-file</b><var><a name="index-tip_002dof_002dthe_002dday_002dfile-145"></a></var><br>
+<blockquote><p>File where tip-of-the-day cursor is stored. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>use-recursive-edit</b><var><a name="index-use_002drecursive_002dedit-146"></a></var><br>
+<blockquote><p>Tell ECB to use a recursive edit. If set then it can easily be
+deactivated by (keyboard-escape-quit). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>version-check</b><var><a name="index-version_002dcheck-147"></a></var><br>
+<blockquote><p>Checks at start-time if the requirements are fulfilled. It checks if the
+required versions of CEDET is installed and loaded into Emacs.
+
+        <p>It is strongly recommended to set this option to not <code>nil</code>! 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dhelp.html b/site/ecb-2.40/html-help/ecb_002dhelp.html
new file mode 100644
index 0000000..64713d9
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dhelp.html
@@ -0,0 +1,86 @@
+<html lang="en">
+<head>
+<title>ecb-help - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dfaces.html#ecb_002dfaces" title="ecb-faces">
+<link rel="next" href="ecb_002deshell.html#ecb_002deshell" title="ecb-eshell">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-help"></a>
+<a name="ecb_002dhelp"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dfaces.html#ecb_002dfaces">ecb-faces</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.13 Group ecb-help</h4>
+
+<p class="noindent">This group contains settings for the ECB online help:
+
+<div class="defun">
+&mdash; User Option: <b>help-html-path</b><var><a name="index-help_002dhtml_002dpath-316"></a></var><br>
+<blockquote><p>Path where the ECB online help in HTML format resides. This must be
+the location of the <samp><span class="file">ecb.html</span></samp> which comes with the ECB
+distribution. If is installed by unpacking the archive available on
+the ECB website then this is the subdir <code>ecb-help-html-subdir</code> of
+the installation directory of ECB. If it is installed as
+XEmacs-package (e.g. via the package manager of XEmacs) then this is
+probably either the directory &ldquo;../../html/&rdquo; or
+&ldquo;../../etc/ecb/html/&rdquo; (both relative to the Elisp directory of ECB).
+
+        <p>The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+        <p>Normally there should be no need to change this option! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>help-info-path</b><var><a name="index-help_002dinfo_002dpath-317"></a></var><br>
+<blockquote><p>Path where the ECB online help in info format resides. This must be
+the location of the <samp><span class="file">ecb.info</span></samp> which comes with the ECB
+distribution. If is installed by unpacking the archive available on
+the ECB website then this is the subdir <code>ecb-help-info-subdir</code> of
+the installation directory of ECB. If it is installed as
+XEmacs-package (e.g. via the package manager of XEmacs) then this is
+probably the directory &ldquo;../../info/&rdquo; (relative to the Elisp directory
+of ECB).
+
+        <p>The path can either be an absolute path or a path relative to the directory
+where the Elisp files of ECB are.
+
+        <p>Normally there should be no need to change this option! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-help-format</b><var><a name="index-show_002dhelp_002dformat-318"></a></var><br>
+<blockquote><p>The format <code>ecb-show-help</code> shows its online help. Allowed values
+are 'info (for the Info format) and 'html (for HTML format). If the
+value is 'html then <code>browse-url-browser-function</code> says which
+browser is used.
+
+        <p>Note: If you got ECB as a standard XEmacs-package maybe the
+HTML-online-documentation is not included. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dhistory.html b/site/ecb-2.40/html-help/ecb_002dhistory.html
new file mode 100644
index 0000000..c290e8f
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dhistory.html
@@ -0,0 +1,243 @@
+<html lang="en">
+<head>
+<title>ecb-history - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dmethods.html#ecb_002dmethods" title="ecb-methods">
+<link rel="next" href="ecb_002danalyse.html#ecb_002danalyse" title="ecb-analyse">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-history"></a>
+<a name="ecb_002dhistory"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.6 Group ecb-history</h4>
+
+<p class="noindent">This group contains settings for the history-buffer in the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>history-buffer-after-create-hook</b><var><a name="index-history_002dbuffer_002dafter_002dcreate_002dhook-233"></a></var><br>
+<blockquote><p>Local hook running after the creation of the history-buffer. Every
+function of this hook is called once without arguments direct after
+creating the history-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+<code>local-set-key</code> to define new keybindings only for the
+history-buffer of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-buffer-name</b><var><a name="index-history_002dbuffer_002dname-234"></a></var><br>
+<blockquote><p>Name of the ECB history buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. &ldquo;*ECB
+History*&rdquo;.
+
+        <p>If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-history-buffer by this name, e.g. by a call
+of <code>set-buffer</code>.
+
+        <p>Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-exclude-file-regexps</b><var><a name="index-history_002dexclude_002dfile_002dregexps-235"></a></var><br>
+<blockquote><p>List of regexps which exclude source-files from being historized. Be
+aware that each always full filenames (ie. incl. full path) are
+matched against these regexps! Therefore be carefore with regexps
+beginning with ^! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-item-name</b><var><a name="index-history_002ditem_002dname-236"></a></var><br>
+<blockquote><p>The name to use for items in the history buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-make-buckets</b><var><a name="index-history_002dmake_002dbuckets-237"></a></var><br>
+<blockquote><p>Bucketize the entries of the history-buffer.
+
+        <p>There are several options how the bucketizing should be done:
+          <ul>
+<li>'never:
+
+          <p>No bucketizing at all, ie. all entries of the history-buffer we be
+displayed flat.
+
+          <li>'directory:
+
+          <p>All entries with related filesources residing in the same
+directory will be contained in a bucket named with that directory.
+
+          <li>'mode:
+
+          <p>All entries with related buffers have the same
+major-mode will be contained in a bucket named with that major-mode
+
+          <li>'extension:
+
+          <p>All entries with related filesources having the
+same extension will be contained in a bucket named with that extension
+</ul>
+
+        <p>If the value is a list of regular expressions then all entries where the
+buffername matches the same regular expression will be contained in one
+bucket. If the value is nil then this is interpreted as an empty list of
+regular expressions!
+
+        <p>The default value is 'directory. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-menu-sorter</b><var><a name="index-history_002dmenu_002dsorter-238"></a></var><br>
+<blockquote><p>Function which re-sorts the menu-entries of the directories buffer.
+
+        <p>If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+<code>ecb-history-menu-user-extension</code> and the built-in-menu
+<code>ecb-history-menu</code>. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+        <p>For the guidelines for such a sorter-function see
+<code>ecb-directories-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-menu-user-extension</b><var><a name="index-history_002dmenu_002duser_002dextension-239"></a></var><br>
+<blockquote><p>Static user extensions for the popup-menu of the history buffer. 
+For further explanations see <code>ecb-directories-menu-user-extension</code>.
+
+        <p>The node-argument of a menu-function contains as data a cons:
+
+        <p>car is the filename of the source for which the popup-menu has
+been opened. cdr is the related buffer-name; but be careful,
+because the node can point to a dead buffer (see
+<code>ecb-kill-buffer-clears-history</code>). Use always <code>ecb-source-get-*</code>
+to extract whatever you need from the node-data. E.g. use
+<code>ecb-source-get-filename</code> to get the full filename of the source
+of the node and use <code>ecb-source-get-buffername</code> or <code>ecb-source-get-buffer</code> to
+get the buffername rsp. the buffer-object.
+
+        <p>Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of <code>ecb-history-menu</code> but the whole menu can be
+re-arranged with <code>ecb-history-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-menu-user-extension-function</b><var><a name="index-history_002dmenu_002duser_002dextension_002dfunction-240"></a></var><br>
+<blockquote><p>Dynamic user extensions for the popup-menu of the history buffer. A
+function which has to return a list in the same format like the option
+<code>ecb-history-menu-user-extension</code>. This function is called when
+the user opens the popup-menu for the history buffer.
+
+        <p>If no dynamically evaluated menu-extensions should be added to the
+history-buffer the function has to return nil. Therefore the
+default-value of this option is <code>ignore</code>.
+
+        <p>Per default the dynamic user-extensions are added in front of the
+static extensions of <code>ecb-history-menu-user-extension</code> but the
+whole menu can be re-arranged with <code>ecb-history-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-show-node-info</b><var><a name="index-history_002dshow_002dnode_002dinfo-241"></a></var><br>
+<blockquote><p>When to display which node-info in the history-buffer. 
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+history-buffer.
+
+        <p>You can define &ldquo;when&rdquo; a node-info should be displayed:
+See <code>ecb-directories-show-node-info</code> for the possible choices.
+
+        <p>You can define &ldquo;which&rdquo; info should be displayed:
+          <ul>
+<li>name: Only the full node-name is displayed. 
+<li>path: The full-path of the node is displayed. 
+<li>name-path: The full node-name and the full-path is displayed. 
+</ul>
+
+        <p>Do NOT set this option directly via setq but use always customize! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-sort-ignore-case</b><var><a name="index-history_002dsort_002dignore_002dcase-242"></a></var><br>
+<blockquote><p>Ignore case for sorting the history-entries. See also
+<code>ecb-history-sort-method</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-sort-method</b><var><a name="index-history_002dsort_002dmethod-243"></a></var><br>
+<blockquote><p>Defines how the entries in the history-buffer are sorted.
+          <ul>
+<li><code>name</code>:
+Sorting by name (default). 
+<li><code>extension</code>:
+Sorting first by extension and then by name. 
+<li><code>nil</code>:
+No sorting, means the most recently used buffers are on the top of the
+history and the seldom used buffers at the bottom. 
+</ul>
+
+        <p>See also <code>ecb-history-sort-ignore-case</code>.
+
+        <p>If the history is bucketized (see <code>ecb-history-make-buckets</code>) then this
+sorting applies to the sorting within each bucket. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>history-stick-indirect-buffers-to-basebuffer</b><var><a name="index-history_002dstick_002dindirect_002dbuffers_002dto_002dbasebuffer-244"></a></var><br>
+<blockquote><p>Stick all indirect-buffers as subnodes to their base-buffer.
+
+        <p>If nil then indirect-buffers are treated as non-indirect-buffers
+and sorted into the history-buffer-sequence according to the
+setting of <code>ecb-history-sort-method</code>.
+
+        <p>If not nil then indirect-buffers are always sticked to their base-buffer, ie. 
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history looks like:
+
+     <pre class="example">        [-] &lt;base-buffer BB&gt;
+         |  &lt;indirect-buffer 1 of BB&gt;
+         `- &lt;indirect-buffer 2 of BB&gt;
+   </pre>
+        </blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>kill-buffer-clears-history</b><var><a name="index-kill_002dbuffer_002dclears_002dhistory-245"></a></var><br>
+<blockquote><p>Define if <code>kill-buffer</code> should also clear the history. There are
+three options:
+
+          <ul>
+<li><code>auto</code>:
+Removes automatically the corresponding history-entry after the buffer
+has been killed. 
+<li><code>ask</code>:
+Asks, if the history-entry should be removed after the kill. 
+<li><code>nil</code>:
+<code>kill-buffer</code> does not affect the history (this is the default). 
+</ul>
+        </p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dlayout.html b/site/ecb-2.40/html-help/ecb_002dlayout.html
new file mode 100644
index 0000000..2116f8c
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dlayout.html
@@ -0,0 +1,636 @@
+<html lang="en">
+<head>
+<title>ecb-layout - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002danalyse.html#ecb_002danalyse" title="ecb-analyse">
+<link rel="next" href="ecb_002dcompilation.html#ecb_002dcompilation" title="ecb-compilation">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-layout"></a>
+<a name="ecb_002dlayout"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dcompilation.html#ecb_002dcompilation">ecb-compilation</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002danalyse.html#ecb_002danalyse">ecb-analyse</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.8 Group ecb-layout</h4>
+
+<p class="noindent">This group contains settings for the screen-layout of the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>activate-before-new-frame-created-hook</b><var><a name="index-activate_002dbefore_002dnew_002dframe_002dcreated_002dhook-260"></a></var><br>
+<blockquote><p>Normal hook run before the new ECB-frame is created if
+<code>ecb-new-ecb-frame</code> is not nil (otherwise this hook is not
+evaluated). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>advice-window-functions-signal-error</b><var><a name="index-advice_002dwindow_002dfunctions_002dsignal_002derror-261"></a></var><br>
+<blockquote><p>Signal an error if an adviced function can not do its job. If not nil
+then an error is signaled if one of the adviced user-commands can not
+do its job. So for example if the user tries to split the
+compile-window or an ecb-tree-window or if one tries to switch to
+another buffer in one of the ecb-tree-windows. For details see the
+documentation of each of the adviced functions to get info when an
+error is signaled.
+
+        <p>If this option is nil then no error is signaled but the called adviced
+function does simply nothing.
+
+        <p>Default is nil but it can also be useful to signal errors - so you see
+when call a function in a situation which is not supported by this
+function. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>fix-window-size</b><var><a name="index-fix_002dwindow_002dsize-262"></a></var><br>
+<blockquote><p>Fix size of the ECB-windows/buffers even after frame-resizing. The fix
+type (valid values are nil, t, width and height) can either be set on
+a layout-basis (means a different value for each layout) or one value
+can be set for all layouts. For the latter case there is an additional
+value <code>auto</code> which choose autom. the senseful fix-type depending
+on the current layout-type: For top-layouts the fix-type <code>height</code>
+and for all other layout-types the fix-type <code>width</code>.
+
+        <p>For a detailed description of the valid values see documentation of
+<code>window-size-fixed</code> which is newly introduced in GNU Emacs 21 and
+is only available there. Therefore this option takes only effect with
+GNU Emacs &gt;= 21. This option has no effect with XEmacs because it does
+not support the feature <code>window-size-fixed</code>.
+
+        <p>Note1: Manually resizing the ECB-windows via <code>enlarge-window</code>,
+<code>shrink-window</code>, <code>mouse-drag-vertical-line</code> and
+<code>mouse-drag-mode-line</code> is still possible even if the window-sizes
+are fixed for frame-resizing!
+
+        <p>Note2: The description of <code>window-size-fixed</code> in the
+elisp-info-manual is more detailed than the description offered by
+<kbd>C-h v</kbd>!
+
+        <p>Note3: With Emacs &lt; 22 there seems to be no distinction between
+'width, 'height and t. Therefore this option takes no effect (means
+all ecb-windows have always unfixed sizes) with Emacs &lt; 22 if
+<code>ecb-compile-window-height</code> is not nil.
+
+        <p>Per default no window-size fixing has been done. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>hide-ecb-windows-after-hook</b><var><a name="index-hide_002decb_002dwindows_002dafter_002dhook-263"></a></var><br>
+<blockquote><p>Hooks run direct after the ECB windows have been hidden. Hiding was
+done either by <code>ecb-toggle-ecb-windows</code> or
+<code>ecb-hide-ecb-windows</code>.
+
+        <p>IMPORTANT: Hiding the ECB-windows is internally done by calling
+<code>ecb-redraw-layout</code> and therefore also the hooks
+<code>ecb-redraw-layout-before-hook</code> and
+<code>ecb-redraw-layout-after-hook</code> are evaluated. The hook-sequence
+is analogous to that described in
+<code>ecb-show-ecb-windows-after-hook</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>hide-ecb-windows-before-hook</b><var><a name="index-hide_002decb_002dwindows_002dbefore_002dhook-264"></a></var><br>
+<blockquote><p>Hook run direct before the ECB windows will be hidden. Hiding is done
+either by <code>ecb-toggle-ecb-windows</code> or
+<code>ecb-hide-ecb-windows</code>. This means that at runtime of this hook
+all the ECB-tree-windows of current layout are visible.
+
+        <p>IMPORTANT: Hiding the ECB-windows is internally done by calling
+<code>ecb-redraw-layout</code> and therefore also the hooks
+<code>ecb-redraw-layout-before-hook</code> and
+<code>ecb-redraw-layout-after-hook</code> are evaluated. The hook-sequence
+is analogous to that described in
+<code>ecb-show-ecb-windows-before-hook</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ignore-display-buffer-function</b><var><a name="index-ignore_002ddisplay_002dbuffer_002dfunction-265"></a></var><br>
+<blockquote><p>Adviced <code>display-buffer</code> ignores <code>display-buffer-function</code>. 
+This means, that the adviced version of <code>display-buffer</code> ignores
+the value of <code>display-buffer-function</code> when called for the
+<code>ecb-frame</code>. If this variable should not be ignored then the
+function of <code>display-buffer-function</code> is completely responsible
+which window is used for the buffer to display - no smart ECB-logic
+will help to deal best with the ECB-window-layout! You can define if
+and when <code>display-buffer-function</code> should be ignored:
+
+          <ul>
+<li>only when persistent compile window is used - i.e. if
+<code>ecb-compile-window-height</code> is not nil
+
+          <li>always when ECB is active - that means ignore when ECB is active
+otherwise not - this is the default value
+
+          <li>never, the adviced version of <code>display-buffer</code> always uses the
+value of <code>display-buffer-function</code> if the value is a function. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ignore-pop-up-frames</b><var><a name="index-ignore_002dpop_002dup_002dframes-266"></a></var><br>
+<blockquote><p>Ignore setting of option <code>pop-up-frames</code>. 
+This means, that a value of not nil for <code>pop-up-frames</code> is ignored:
+          <ul>
+<li>'compile-window: only when persistent compile window is used - i.e. if
+<code>ecb-compile-window-height</code> is not nil - this is the default value. 
+<li>'always: always when ECB is active - that means no pop-up-frames when ECB is active
+<li><code>nil</code>: pop-up-frames is fully active when set
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>ignore-special-display</b><var><a name="index-ignore_002dspecial_002ddisplay-267"></a></var><br>
+<blockquote><p>Ignore special-display-handling. This means, that all values of
+<code>special-display-function</code>, <code>special-display-buffer-names</code>
+and <code>special-display-regexps</code> are ignored
+
+          <ul>
+<li>only when persistent compile window is used - i.e. if
+<code>ecb-compile-window-height</code> is not nil - this is the default
+value.
+
+          <li>always when ECB is active - that means no special-display-handling of
+buffers when ECB is active
+
+          <li>never, i.e. special-dislay-handling depends on the values of the
+options <code>special-display-function</code>,
+<code>special-display-buffer-names</code> and
+<code>special-display-regexps</code>.
+
+        </ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>layout-always-operate-in-edit-window</b><var><a name="index-layout_002dalways_002doperate_002din_002dedit_002dwindow-268"></a></var><br>
+<blockquote><p>Adviced window functions work always in the edit-window. If we are in
+an ECB special buffer (methods, directories, etc), and any of the
+adviced windowing functions is called interactively, we will select
+first an edit-window according to the value of
+<code>ecb-mouse-click-destination</code>. This is useful if you have any
+functions that use such functions and you don't want them to fail with
+an error complaining that the current buffer can not be split, or
+something similar.
+
+        <p>Because this may not be desirable in all situations and for all
+adviced functions this can be enabled separately for function where it
+is senseful. If the symbol of an adviced function is contained in the
+value of this option, then the edit-window is first selected otherwise
+either an error is reported or some other special reaction (depends on
+<code>ecb-advice-window-functions-signal-error</code>); see the
+documentation of the adviced functions for this.
+
+        <p>Per default this is only enabled for <code>switch-to-buffer</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>layout-debug-mode</b><var><a name="index-layout_002ddebug_002dmode-269"></a></var><br>
+<blockquote><p>Write debug-information about layout-operations in the
+Messages-buffer. Normally there should be no need to set this option
+to true but if there are problems to display buffers in the
+compile-window of ECB (e.g. buffers which should be displayed there
+aren't or the temporally enlarging-mechanism does not do what you
+think it should do etc...) then please do the following steps:
+
+          <ol type=1 start=1>
+<li>Set <code>ecb-layout-debug-mode</code> to not nil
+
+          <li>Reproduce the wrong behavior exactly by repeating all the operations
+which lead to the problem.
+
+          <li>Now send immediately a bug report with
+<code>ecb-submit-problem-report</code>.
+
+          <li>Set <code>ecb-layout-debug-mode</code> back to nil if you do not want
+further debugging output in the *Messages* buffer
+             </ol>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>layout-name</b><var><a name="index-layout_002dname-270"></a></var><br>
+<blockquote><p>Select a window layout of ECB. Value is any arbitrary string. There are
+four different types of layouts: left, right, top and left-right,
+which means the location of the ECB-tree-windows in the ECB-frame. 
+Currently there are 20 predefined layouts; names see below. You can
+savely try out any of them by changing this value and saving it only
+for the current session. If you are sure which layout you want you can
+save it for future sessions. To get a picture of the layout for name
+&lt;name&gt; call `ecb-show-layout-help'. <code>ecb-layout-function-9</code>.
+
+        <p>Currently available layouts:
+
+          <ul>
+<li>Left layouts:
+left1 left2 left3 left4 left5 left6 left7 left8 left9 left10 left11
+left12 left13 left14 left15
+
+          <li>Right layouts:
+right1
+
+          <li>Top layouts:
+top1 top2
+
+          <li>Left-right layouts:
+leftright1 leftright2
+</ul>
+
+        <p>Regardless of the settings you define here: If you have destroyed or
+changed the ECB-screen-layout by any action you can always go back to
+this layout with <code>ecb-redraw-layout</code>
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>layout-window-sizes</b><var><a name="index-layout_002dwindow_002dsizes-271"></a></var><br>
+<blockquote><p>Specifies the sizes of the ECB windows for each layout. The easiest
+way (and also the strongly recommended way) to change this variable is
+to change the window sizes by dragging the window borders using the
+mouse and then store the window sizes by calling the command
+<code>ecb-store-window-sizes</code>. Next time the layout is redrawn the
+values stored in this option will be used.
+
+        <p>If <code>ecb-store-window-sizes</code> is used then the windows sizes are
+stored per default as fractions of current frame-width and -height of
+the ecb-frame, so the stored values will &ldquo;work&rdquo; for other frame
+sizes too. But if you call <code>ecb-store-window-sizes</code> with a
+prefix-argument then the fixed values of current width and height are
+stored!
+
+        <p>If this option is set &ldquo;by hand&rdquo; (i.e. not by
+<code>ecb-store-window-sizes</code>) then the following is important:
+          <ul>
+<li>It is recommended to use fractions of frame-width and -height!. 
+<li>The order of the sequence of the inserted window sizes must be the same as
+<code>other-window</code> (the not-adviced version!) would walk! 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>maximize-ecb-window-after-selection</b><var><a name="index-maximize_002decb_002dwindow_002dafter_002dselection-272"></a></var><br>
+<blockquote><p>If not nil maximize current tree-window after selection. When
+selecting another not-tree-window after such an automatic maximizing
+all tree-windows of current layout are displayed again. But a
+tree-window is not maximized if either a node has been selected via
+primary- oder secondarc mouse-button or the popup-menu of that
+tree-buffer has been opened. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>maximize-next-after-maximized-select</b><var><a name="index-maximize_002dnext_002dafter_002dmaximized_002dselect-273"></a></var><br>
+<blockquote><p>Maximizes the next logical tree-window after a maximized
+node-selection. Selecting a node in a maximized tree-window is handled
+very smart by ECB:
+
+        <p>If a tree-buffer-name is not contained in this option then selecting a
+node in this maximized tree-buffer automatically &ldquo;minimizes&rdquo; that
+tree-window (i.e. displays all windows of the current layout) so the
+user can perform the next logical step (e.g. the next logical step
+after selecting a directory in the directories-buffer is to select a
+source-file - therefore the sources-buffer of current layout has to be
+displayed - if the current layout contains one; the next logical step
+of selecting a source-file is probably to jump to a certain tag via
+the methods-buffer).
+
+        <p>If a tree-buffer-name is contained in this option then selecting a
+node in this tree-buffer automatically maximizes the next logical
+tree-window (e.g. directories &ndash;&gt; sources, sources/history &ndash;&gt;
+methods). But if the current maximized tree-buffer is also contained
+in the option <code>ecb-tree-do-not-leave-window-after-select</code> (see
+also the tree-buffer-command
+<code>ecb-toggle-do-not-leave-window-after-select</code> which is bound to
+<code>C-t</code> in each tree-buffer) then ECB does *not* maximize the next
+logical tree-window but point stays in the currently maximized
+tree-buffer so for example the user can select more than one node
+(e.g. more than one source-file from the sources-buffer.
+
+        <p>The tree-buffer-name can either be defined as plain string or with a
+symbol which contains the buffer-name as value. The latter one is
+recommended for the builtin ECB-tree-buffers because then simply the
+related option-symbol can be used (e.g. 
+<code>ecb-directories-buffer-name</code>, <code>ecb-sources-buffer-name</code> or
+<code>ecb-history-buffer-name</code>).
+
+        <p>In future versions this option will probably also allow to define the
+next logical tree-buffer for a tree-buffer - currently this is
+hard-coded as follows:
+          <ul>
+<li>directories &ndash;next-logical&ndash;&gt; sources
+<li>sources     &ndash;next-logical&ndash;&gt; methods
+<li>history     &ndash;next-logical&ndash;&gt; methods. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>maximize-next-after-maximized-select</b><var><a name="index-maximize_002dnext_002dafter_002dmaximized_002dselect-274"></a></var><br>
+<blockquote><p>Maximizes the next logical tree-window after a maximized
+node-selection. Selecting a node in a maximized tree-window is handled
+very smart by ECB:
+
+        <p>If this option is nil then selecting a node in a maximized
+directories- sources- or history-tree-buffer automatically
+&ldquo;minimizes&rdquo; that tree-window (i.e. displays all windows of the
+current layout) so the user can perform the next logical step (e.g. 
+the next logical step after selecting a directory in the
+directories-buffer is to select a source-file - therefore the
+sources-buffer of current layout has to be displayed - if the current
+layout contains one; the next logical step of selecting a source-file
+is probably to jump to a certain tag via the methods-buffer).
+
+        <p>If this option is not nil then selecting a node in a maximized
+directories- sources- or history-tree-buffer automatically maximizes
+the next logical tree-window (directories &ndash;&gt; sources, sources/history
+&ndash;&gt; methods). But if the current maximized tree-buffer is contained in
+the option <code>ecb-tree-do-not-leave-window-after-select</code> (see also
+the tree-buffer-command
+<code>ecb-toggle-do-not-leave-window-after-select</code> which is bound to
+<code>C-t</code> in each tree-buffer) then ECB does *not* maximize the next
+logical tree-window but point stays in the currently maximized
+tree-buffer so for example the user can select more than one
+source-file from the sources-buffer. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>new-ecb-frame</b><var><a name="index-new_002decb_002dframe-275"></a></var><br>
+<blockquote><p>Create a new frame at activation time of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>other-window-behavior</b><var><a name="index-other_002dwindow_002dbehavior-276"></a></var><br>
+<blockquote><p>The behavior of ECB concerning getting an &ldquo;other window&rdquo;. The
+following settings are possible:
+
+        <p><code>all</code>:
+
+        <p>ECB will cycle through all windows of the ECB-frame or scroll simply
+the next window in the ECB-frame, means it behaves like the original
+<code>other-window</code> rsp. the original
+<code>other-window-for-scrolling</code>.
+
+        <p><code>only-edit</code>:
+
+        <p>ECB will only cycle through the edit-windows of ECB or only scroll
+another edit-window. If the selected window is not an edit-window then
+it behaves like with value <code>all</code>.
+
+        <p><code>edit-and-compile</code>:
+
+        <p>Like <code>only-edit</code> plus the compile window if any. If the selected
+window is neither an edit-window nor the compile-window then it
+behaves like with value <code>all</code>.
+
+        <p><code>smart</code>:
+
+        <p>With this setting ECB tries to choose the
+<code>other-window</code>-destination or the &ldquo;other window&rdquo; to scroll in a
+smart and intuitive way: If point is in one of the edit-windows and if
+the edit-area is splitted then always the &ldquo;next&rdquo; edit-window is
+choosen (whereas the next edit-window of the last edit-window is the
+first edit-window)- if the edit-area is unsplitted then the
+compile-window is used if there is one. In the context of an
+<code>other-window</code>-call the <var>ARG</var> of <code>other-window</code> will be
+taken into account.
+
+        <p>If one of the special ecb-windows is selected then always the &ldquo;next&rdquo;
+ecb-window is choosen (whereas the next ecb-window of the last
+ecb-window is the first ecb-window). In the context of an
+<code>other-window</code>-call the <var>ARG</var> of <code>other-window</code> will be
+taken into account. If there is only one ecb-window then ECB considers
+also the edit-windows
+
+        <p>If the compile-window is selected then always the last edit-window
+which had the point will be used unless <code>other-window</code> has been
+called with a prefix-argument unequal 1.
+
+        <p>If there is an active minibuffer:
+
+        <p>Regardless of the allowed values above ECB handles the situation of an
+active minibuffer during a call to <code>other-window</code> or
+<code>scroll-other-window</code> like follows:
+
+        <p>If the minibuffer-window is selected then ECB always chooses the
+window <code>minibuffer-scroll-window</code> points to (when this variable
+is set, otherwise the compile-window or the last selected edit-window
+is choosen) when the called command is called to choose the 1. next
+window (always true for scrolling another window or true when
+<code>other-window</code> called without prefix-arg or with prefix-arg equal
+1). Otherwise the window ARG steps away is choosen (in case of
+<code>other-window</code>).
+
+        <p>If there is an active minibuffer but the minibuffer-window is not
+selected then <code>other-window</code> and <code>scroll-other-window</code>
+behave like the original version.
+
+        <p>In addition to the allowed values above the value of this option can
+also be a function:
+
+        <p>A function:
+
+        <p>This function gets seven arguments:
+          <ol type=1 start=1>
+<li>A canonical list of all currently visible windows of the
+<code>ecb-frame</code>
+<li>A canonical list of all currently visible edit-windows
+<li>A canonical list of all currently visible ecb-windows
+<li>The window-object of the compile-window if there is any. 
+<li>The minibuffer-window of the ECB-frame if there is an active
+minibuffer. 
+<li>The result of the function <code>ecb-where-is-point</code> - see the
+documentation of this function for details. 
+<li>An integer which indicates how many steps away from the current
+selected window the &ldquo;other-window&rdquo; is. Is nil when this function is
+called in another context then for <code>other-window</code>.
+             </ol>
+
+        <p>The function has to return a window-object which is then used as
+&ldquo;other window&rdquo; for the command <code>other-window</code> or for scrolling
+another window (e.g. with <code>scroll-other-window</code>). Such a function
+has to handle properly all situation for itself. 
+<code>ecb-get-other-window-smart</code> is an example for such a function. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>redraw-layout-after-hook</b><var><a name="index-redraw_002dlayout_002dafter_002dhook-277"></a></var><br>
+<blockquote><p>Hooks run direct before the ECB windows will be shown either by
+<code>ecb-toggle-ecb-windows</code> or <code>ecb-show-ecb-windows</code>. This
+means that at runtime of this hook the ECB-windows are already
+visible. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>redraw-layout-before-hook</b><var><a name="index-redraw_002dlayout_002dbefore_002dhook-278"></a></var><br>
+<blockquote><p>Hooks run direct before the ECB-layout will be redrawn by either
+<code>ecb-redraw-layout</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>redraw-layout-quickly</b><var><a name="index-redraw_002dlayout_002dquickly-279"></a></var><br>
+<blockquote><p>If non-nil, we will attempt to redraw the layout quickly. Please read
+also carefully the documentation of <code>ecb-redraw-layout</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>select-edit-window-on-redraw</b><var><a name="index-select_002dedit_002dwindow_002don_002dredraw-280"></a></var><br>
+<blockquote><p>Select the first edit window on <code>ecb-redraw-layout</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-ecb-windows-after-hook</b><var><a name="index-show_002decb_002dwindows_002dafter_002dhook-281"></a></var><br>
+<blockquote><p>Hooks run direct before the ECB windows will be shown either by
+<code>ecb-toggle-ecb-windows</code> or <code>ecb-show-ecb-windows</code>. This
+means that at runtime of this hook the ECB-windows are already
+visible.
+
+        <p>IMPORTANT: Showing the hidden ECB-windows is internally done by
+calling <code>ecb-redraw-layout</code> and therefore also the hooks
+<code>ecb-redraw-layout-before-hook</code> and
+<code>ecb-redraw-layout-after-hook</code> are evaluated. So there is the
+following sequence of hooks during the process of showing the hidden
+ECB-windows:
+          <ol type=1 start=1>
+<li><code>ecb-show-ecb-windows-before-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;redrawing the layout to show the hidden ECB-windows&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-show-ecb-windows-after-hook</code>
+             </ol>
+So be aware which code you add to which hook! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-ecb-windows-before-hook</b><var><a name="index-show_002decb_002dwindows_002dbefore_002dhook-282"></a></var><br>
+<blockquote><p>Hooks run direct before the ECB windows will be shown either by
+<code>ecb-toggle-ecb-windows</code> or <code>ecb-show-ecb-windows</code>. This
+means that at runtime of this hook the ECB-windows are still hidden.
+
+        <p>IMPORTANT: Showing the hidden ECB-windows is internally done by
+calling <code>ecb-redraw-layout</code> and therefore also the hooks
+<code>ecb-redraw-layout-before-hook</code> and
+<code>ecb-redraw-layout-after-hook</code> are evaluated. So there is the
+following sequence of hooks during the process of showing the hidden
+ECB-windows:
+          <ol type=1 start=1>
+<li><code>ecb-show-ecb-windows-before-hook</code>
+<li><code>ecb-redraw-layout-before-hook</code>
+<li>&lt;redrawing the layout to show the hidden ECB-windows&gt;
+<li><code>ecb-redraw-layout-after-hook</code>
+<li><code>ecb-show-ecb-windows-after-hook</code>
+             </ol>
+So be aware which code you add to which hook! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>split-edit-window-after-start</b><var><a name="index-split_002dedit_002dwindow_002dafter_002dstart-283"></a></var><br>
+<blockquote><p>Sets if and how the edit window should be splitted after ECB-start. 
+But be aware: This option determines only if and how the edit-window
+should be splitted at start-time of ECB. There are five different
+values allowed for this option:
+
+          <ul>
+<li><code>nil</code>:
+Do not split the edit-area of ECB after activation, i.e. there will be
+only one edit-window after starting ECB.
+
+          <li><code>horizontal</code>:
+Split the edit-area in 2 edit-windows side by side.
+
+          <li><code>vertical</code>:
+Split the edit-area in 2 edit-windows, one above the other.
+
+          <li><code>before-activation</code>:
+Split the edit-area as before the ECB-start, i.e. the edit-area will
+have after start a window-layout as the whole frame had before the
+start of ECB.
+
+          <li><code>before-deactivation</code>:
+Split the edit-area into a window-layout ECB had in its edit-area
+direct before the ECB-deactivation. This value preserves the full
+state between activations of ECB, i.e. the visibility of the
+ECB-windows, the visibility of a compile-window and also the full
+split-state of the edit-area. But this can only be done if important
+layout-options have not been changed in the meanwhile. These are the
+options <code>ecb-layout-name</code>, <code>ecb-compile-window-height</code>,
+<code>ecb-compile-window-width</code>, <code>ecb-windows-width</code> and
+<code>ecb-windows-height</code>. 
+</ul>
+
+        <p>Default value is <code>before-deactivation</code>.
+
+        <p>Some remarks to the value <code>before-activation</code>: If this value has
+been set then ECB needs three permanent adivces even when ECB is
+deactivated: <code>split-window</code>, <code>delete-window</code> and
+<code>delete-other-windows</code>. But these advices do not change any
+behavior of these functions but only storing in an internal
+ECB-variable the facts that a window has been splitted or deleted. In
+addition to this these advices are 100% error-save, means the
+functionality of the original functions will be performed in every(!) 
+case even if within the advice an error occurs (but normally there can
+no errors occur in these advices because they are very simple). 
+Conclusion: If you want really all ECB-advices being disabled after
+deactivating ECB then you have to set this option to other values then
+<code>before-activation</code>. But setting this variable to this value is
+really completely save. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>toggle-layout-sequence</b><var><a name="index-toggle_002dlayout_002dsequence-284"></a></var><br>
+<blockquote><p>Toggle sequence for layout toggling with <code>ecb-toggle-layout</code>. 
+Every element of this list has to be a valid layout-name i.e. either
+one of the predefined layouts or one of the user-defined layouts.
+
+        <p>You can add here as many layouts as you want but to use this option
+most effective you should not add more than 2 or 3 layouts so every
+layout can be accessed very fast by toggling with
+<code>ecb-toggle-layout</code>. It is also senseful to add layouts which
+have the same principal outline, i.e. all their tree-buffers are on
+the same side of the frame and the tree-buffer-&rdquo;column&rdquo; (or
+-&rdquo;row&rdquo;) has identical size for the layouts.
+
+        <p>Recommended values are for example:
+
+          <ul>
+<li>(&ldquo;left10&rdquo; &ldquo;left15&rdquo;), toggles between methods and directories/history
+<li>(&ldquo;left10&rdquo; &ldquo;left13&rdquo;), toggles between methods and directories
+<li>(&ldquo;left10&rdquo; &ldquo;left14&rdquo;), toggles between methods and history
+<li>(&ldquo;left10&rdquo; &ldquo;left13&rdquo; &ldquo;left14&rdquo;), toggles between methods, history and directories
+</ul>
+
+        <p>See also option <code>ecb-show-sources-in-directories-buffer</code>.
+
+        <p>This option makes only sense if the value is a list with more than 1
+element! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>windows-height</b><var><a name="index-windows_002dheight-285"></a></var><br>
+<blockquote><p>The height of the ECB windows in lines for top-layouts. If the number
+is less than 1.0 the width is a fraction of the frame height. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>windows-width</b><var><a name="index-windows_002dwidth-286"></a></var><br>
+<blockquote><p>The width of the ECB windows in columns for left- and right layouts. 
+If the number is less than 1.0 the width is a fraction of the frame
+width. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dmethods.html b/site/ecb-2.40/html-help/ecb_002dmethods.html
new file mode 100644
index 0000000..cde5abf
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dmethods.html
@@ -0,0 +1,796 @@
+<html lang="en">
+<head>
+<title>ecb-methods - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dsources.html#ecb_002dsources" title="ecb-sources">
+<link rel="next" href="ecb_002dhistory.html#ecb_002dhistory" title="ecb-history">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-methods"></a>
+<a name="ecb_002dmethods"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dhistory.html#ecb_002dhistory">ecb-history</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dsources.html#ecb_002dsources">ecb-sources</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.5 Group ecb-methods</h4>
+
+<p class="noindent">This group contains settings for the methods-buffer in the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>auto-expand-tag-tree</b><var><a name="index-auto_002dexpand_002dtag_002dtree-203"></a></var><br>
+<blockquote><p>Expand the methods-tag-tree automatically if node invisible.
+
+        <p>This option has only an effect if option <code>ecb-highlight-tag-with-point</code> is
+switched on too. There are three possible choices:
+          <ul>
+<li><code>nil</code>:
+No auto. expanding of the method buffer. 
+<li><code>expand-spec</code>:
+Auto expand the method-buffer nodes if the node belonging to current
+tag under point is invisible because its parent-node is collapsed. 
+But expanding is only done if the type of the tag under point in the
+edit-buffer is contained in <code>ecb-methods-nodes-expand-spec</code>. 
+<li><code>all</code>:
+Like expand-spec but expands all tags regardless of the setting in
+<code>ecb-methods-nodes-expand-spec</code>. 
+</ul>
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>auto-expand-tag-tree-collapse-other</b><var><a name="index-auto_002dexpand_002dtag_002dtree_002dcollapse_002dother-204"></a></var><br>
+<blockquote><p>Auto. expanding the tag-tree collapses all not related nodes. There
+are several choices:
+
+          <ul>
+<li>Only if on tag:
+This means collapsing all nodes which have no relevance for the
+currently highlighted node will be collapsed, because they are not
+necessary to make the highlighted node visible. But do this only if
+point stays onto a tag in the selected edit-window.
+
+          <li>Always:
+Same as before but collapse also when point doesn't stays on a tag
+(e.g. between two defuns in elisp) in the selected edit-window. This
+means in such a situation a full collapsing of the methods-buffer.
+
+          <li>Never:
+Do not automatically collapse the methods-buffer. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>auto-update-methods-after-save</b><var><a name="index-auto_002dupdate_002dmethods_002dafter_002dsave-205"></a></var><br>
+<blockquote><p>Automatically updating the ECB method buffer after saving a source. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>default-tag-filter</b><var><a name="index-default_002dtag_002dfilter-206"></a></var><br>
+<blockquote><p>Default tag-filters for certain files. This option allow to define
+default tag-filters for certain files which are applied automatically
+after loading such a file into a buffer. The possible filters are the
+same as offered by the command <code>ecb-methods-filter</code> and they are
+applied in the same manner - the only difference is they are applied
+automatically. Please be aware that symbol-filters (e.g. 
+protection-symbols like public or private) must not be inserted with
+quotes whereas a filter-regexp has to be inserted with surrounding
+double-quotes! In addition backslashes in a regexp have to be doubled!
+
+        <p>For each file-spec (a major-mode plus a file-regexp which both specify
+a file for which filters should be applied) there can be as much
+filters as needed - they are layered like with
+<code>ecb-methods-filter</code> too.
+
+        <p>Tag-classes which are completely hidden or excluded by the option
+<code>ecb-show-tags</code> will never being displayed in the Methods-buffer
+regardless of the filters of this option! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>disable-semantic-threshold-alist</b><var><a name="index-disable_002dsemantic_002dthreshold_002dalist-207"></a></var><br>
+<blockquote><p>Threshold for disabling semantic-parsing Define a threshold fpr
+buffer-size. Exceeding this threshold disables parsing current buffer
+by semantic.
+
+        <p>This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+          <ul>
+<li>The car is either a major-mode symbol or the special symbol 'default which
+means if no setting for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used. 
+<li>The cdr is an integer which defines the threshold for the buffer-size for
+this major-mode. 
+</ul>
+
+        <p>Example:
+
+     <pre class="example">          ((default . 1000000)
+            (c-mode . 200000))
+   </pre>
+        <p>This example whould not parse c-mode buffers exceeding a buffer-size
+of 200000. And buffers of all other modes would be only parsed if
+smaller than 1000000.
+
+        <p>A setting of <code>((c-mode . 200000))</code> would only restrict c-mode
+buffers to a size of 200000 but would parse all other buffer
+regardless their size. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>display-image-icons-for-semantic-tags</b><var><a name="index-display_002dimage_002dicons_002dfor_002dsemantic_002dtags-208"></a></var><br>
+<blockquote><p>Display nice and pretty icons for semantic-tags in the Methods-buffer. A non
+nil value takes only effect if Emacs can display images and if
+<code>ecb-tree-buffer-style</code> is set to <code>image</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>exclude-parents-regexp</b><var><a name="index-exclude_002dparents_002dregexp-209"></a></var><br>
+<blockquote><p>Regexps which parent classes should not be shown in the methods buffer
+(see also <code>ecb-show-parents</code>). If nil then all parents will be
+shown if <code>ecb-show-parents</code> is not nil.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>expand-methods-switch-off-auto-expand</b><var><a name="index-expand_002dmethods_002dswitch_002doff_002dauto_002dexpand-210"></a></var><br>
+<blockquote><p>Switch off auto expanding in the ECB-method buffer. If on then auto
+expanding is switched off after explicit expanding or collapsing by
+<code>ecb-expand-methods-nodes</code>.
+
+        <p>This is done with <code>ecb-toggle-auto-expand-tag-tree</code> so after
+the switch off the auto expanding feature can again switched on
+quickly.
+
+        <p>But after explicitly expanding/collapsing the methods-buffer to a
+certain level the auto. expanding could undo this when the node
+belonging to current tag under point in the current active edit-window
+is invisible after <code>ecb-expand-methods-nodes</code> - then the auto. 
+expand feature would make this node immediately visible and destroys
+the explicitly set expand-level. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>find-external-tag-functions</b><var><a name="index-find_002dexternal_002dtag_002dfunctions-211"></a></var><br>
+<blockquote><p>Functions used for searching external tags clicked in the methods buffer.
+
+        <p>The methods buffer displays for oo-languages the parents of a type under a
+special bucket &ldquo;Parents&rdquo;. Languages like C++, CLOS and Eieio allow to define
+the implementation of a method outside of the class definition and even in
+another file. In the methods-buffer of ECB such externaly defined methods are
+collected and displayed under a <code>virtual</code> faux type-tag named as the
+class-qualifier of the methods. This faux-tag is virtual because it does not
+extist in the parsed buffer.
+
+        <p>If a user clicks either onto such a faux-type-tag or onto a parent-tag then
+ECB tries to find the definition of the underlying type on a name-basis,
+displaying the containing file as buffer in the current edit-window and
+jumping to the start of the type-definition in this buffer.
+
+        <p>Finding such external types can be very complex and there are several roads to
+success. ECB uses per default methods based on the semantic-analyzer. But this
+option allows to define own find-functions and tell ECB to uses them.
+
+        <p>This functionality is set on a <code>major-mode</code> base, i.e. for every
+<code>major-mode</code> a different setting can be used. The value of this option is
+a list of cons-cells: The car is either a <code>major-mode</code> symbol or the
+special symbol 'default. The cdr is a list of find-functions or nil.
+
+        <p>ECB first performs all find-functions defined for current <code>major-mode</code>
+(if any) anf then all find-functions defined for the special symbol 'default
+(if any).
+
+        <p>ECB offers some predefined senseful finding-functions. Currently there are:
+          <ul>
+<li><code>ecb-search-tag-by-semantic-analyzer</code> (most powerful)
+<li><code>ecb-search-tag-by-semanticdb</code>
+<li><code>ecb-jde-show-class-source</code> (for major-mode <code>jde-mode</code> when
+coding in java)
+</ul>
+
+        <p>This function does not only the searching but displays the founded tag. See
+the documentation of these function for details how they work.
+
+        <p>But you can add any arbitrary function if the following conditions are
+fulfilled:
+
+          <ul>
+<li>The function gets a semantic tag representing the external type which should
+be found. This is a positionless-tag (otherwise it would not be hard to go
+to it) and it's either a faux-tag (for which <code>ecb--semantic-faux-tag-p</code> is
+not nil; the function can use this check if necessary) or a simple tag
+containing only a name an a tag-class. The tag-class for both is 'type.
+
+          <li>The return value of the function must be one of:
+               <ul>
+<li><code>nil</code>: No tag is found
+<li><code>t</code>: A tag has been found and also be displayed in the edit-window (this
+prevents ECB from running further function of this option because the searched
+tag is already displayed. So a function should only return <code>t</code> if all is
+fine and no further actions are needed. 
+<li>A positioned semantic tag (for which <code>ecb--semantic-tag-with-position-p</code>
+returns not <code>nil</code>) which represents the found external type-tag. 
+</ul>
+          </ul>
+
+        <p>It's strongly recommended for the function not to display the found location
+for itself but to return a positioned semantic tag! But sometimes the
+displaying is integrated in a third-party find-function like
+<code>jde-show-class-source</code> which is used by
+<code>ecb-jde-show-class-source</code>. In these cases the function has to return t
+if the searched tag has been successfully displayed.
+
+        <p>Precondition for a find-function:
+Current buffer is the buffer the clicked faux- or parent tag belongs to
+Current point depends on the clicked tag:
+          <ul>
+<li>In case of a faux-tag it's the start of the first child of the
+faux-tag. There must be at least one adopted child-tag because
+otherwise we would not have the faux-tag
+<li>In case of an external parent-tag its the the start of the
+external tag itself. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>font-lock-tags</b><var><a name="index-font_002dlock_002dtags-212"></a></var><br>
+<blockquote><p>Adds font-locking (means highlighting) to the ECB-method buffer.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>highlight-tag-with-point</b><var><a name="index-highlight_002dtag_002dwith_002dpoint-213"></a></var><br>
+<blockquote><p>How to highlight the method or variable under the cursor.
+
+          <ul>
+<li><code>highlight-scroll</code>:
+Always scroll the method buffer, so the current method of the
+edit-window is highlighted in the method-window. 
+<li><code>highlight</code>:
+Only highlight the current method of the edit window in the
+method window if the method is visible in the method-window. 
+<li><code>nil</code>:
+No highlighting is done. 
+</ul>
+
+        <p>See also <code>ecb-highlight-tag-with-point-delay</code>.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>highlight-tag-with-point-delay</b><var><a name="index-highlight_002dtag_002dwith_002dpoint_002ddelay-214"></a></var><br>
+<blockquote><p>Time Emacs must be idle before current tag is highlighted. If nil
+then there is no delay, means current tag is highlighted
+immediately. A small value of about 0.25 seconds saves CPU resources
+and you get even though almost the same effect as if you set no delay. 
+But such a delay prevents also &ldquo;jumping backward/forward&rdquo; during
+scrolling within java-classes if point goes out of method-definition
+into class-definition. Therefore the default value is a delay of 0.25
+seconds.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-buffer-after-create-hook</b><var><a name="index-methods_002dbuffer_002dafter_002dcreate_002dhook-215"></a></var><br>
+<blockquote><p>Local hook running after the creation of the methods-buffer. Every
+function of this hook is called once without arguments direct after
+creating the methods-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+<code>local-set-key</code> to define new keybindings only for the
+methods-buffer of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-buffer-name</b><var><a name="index-methods_002dbuffer_002dname-216"></a></var><br>
+<blockquote><p>Name of the ECB methods buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. &ldquo; *ECB
+Methods*&rdquo;.
+
+        <p>If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-methods-buffer by this name, e.g. by a call
+of <code>set-buffer</code>.
+
+        <p>Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-filter-replace-existing</b><var><a name="index-methods_002dfilter_002dreplace_002dexisting-217"></a></var><br>
+<blockquote><p>How the methods-filter should be applied to existing filters. There
+are three different choices:
+
+          <ul>
+<li><code>never</code>:
+This is the default and means that calling <code>ecb-methods-filter</code>
+always adds the new filter on top of already existing filters. So you
+can combine several filter to one combined like this example: 'Display
+only all public methods having the string &ldquo;test&rdquo; in its name.' With
+this setting the filters can only be cleared by calling
+<code>ecb-methods-filter</code> and then choosing &ldquo;nothing&rdquo;.
+
+          <li><code>always</code>:
+This means that <code>ecb-methods-filter</code> always clears a previous
+filter before applying the new one.
+
+          <li><code>ask</code>:
+ECB asks if the new filter should replace the existing ones. 
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-menu-sorter</b><var><a name="index-methods_002dmenu_002dsorter-218"></a></var><br>
+<blockquote><p>Function which re-sorts the menu-entries of the directories buffer.
+
+        <p>If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+<code>ecb-methods-menu-user-extension</code> and the built-in-menu
+<code>ecb-methods-menu</code>. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+        <p>For the guidelines for such a sorter-function see
+<code>ecb-directories-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-menu-user-extension</b><var><a name="index-methods_002dmenu_002duser_002dextension-219"></a></var><br>
+<blockquote><p>Static user extensions for the popup-menu of the methods buffer. For
+further explanations see <code>ecb-directories-menu-user-extension</code>.
+
+        <p>The node-argument of a menu-function contains as data the semantic-tag
+of the method/variable/tag for which the popup-menu has been opened.
+
+        <p>Per default the static user-extensions are added at the beginning of
+the built-in menu-entries of <code>ecb-methods-menu</code> but the whole
+menu can be re-arranged with <code>ecb-methods-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-menu-user-extension-function</b><var><a name="index-methods_002dmenu_002duser_002dextension_002dfunction-220"></a></var><br>
+<blockquote><p>Dynamic user extensions for the popup-menu of the methods buffer. A
+function which has to return a list in the same format like the option
+<code>ecb-methods-menu-user-extension</code>. This function is called when
+the user opens the popup-menu for the methods buffer. For an example
+how such a function can be programmed see
+<code>ecb-methods-menu-editwin-entries</code>.
+
+        <p>If no dynamically evaluated menu-extensions should be added to the
+methods-buffer the function has to return nil. Therefore the
+default-value of this option is <code>ignore</code>.
+
+        <p>Per default the dynamic user-extensions are added in front of the
+static extensions of <code>ecb-methods-menu-user-extension</code> but the
+whole menu can be re-arranged with <code>ecb-methods-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-nodes-collapse-spec</b><var><a name="index-methods_002dnodes_002dcollapse_002dspec-221"></a></var><br>
+<blockquote><p>Semantic tag-types collapsed by <code>ecb-expand-methods-nodes</code>. 
+For valid values of this option see <code>ecb-methods-nodes-expand-spec</code>!
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-nodes-expand-spec</b><var><a name="index-methods_002dnodes_002dexpand_002dspec-222"></a></var><br>
+<blockquote><p>Semantic tag-types expanded by <code>ecb-expand-methods-nodes</code>.
+
+        <p>The value of this option is either the symbol <code>all</code> (all tags
+are expanded regardless of their type) or a list of symbols where each
+symbol is a valid semantic tag-type. For a description of semantic
+tag types see option <code>ecb-show-tags</code>.
+
+        <p>But this option also defines if bucket-nodes in the ECB-method-buffer
+(e.g. &ldquo;[Variables]&rdquo;) should be expanded. Therefore valid symbols for
+this list are also all cars of the variable returned by
+<code>ecb--semantic-symbol-&gt;name-assoc-list</code>.
+
+        <p>If there is a bucket-name (the node-name stripped of the settings in
+<code>ecb-bucket-node-display</code>) which is not contained as cdr in the
+value returned by <code>ecb--semantic-symbol-&gt;name-assoc-list</code> then
+the symbol with this bucket-name as name is also a valid symbol for
+this list. Example: In ECB there are buckets &ldquo;[Parents]&rdquo;. The
+bucket-name is &ldquo;Parents&rdquo; and the valid symbol-name is then
+<code>Parents</code>.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-separate-prototypes</b><var><a name="index-methods_002dseparate_002dprototypes-223"></a></var><br>
+<blockquote><p>Separate function-prototypes from the real functions. This is for
+example useful for C++ and C because these languages distinct between
+a method-prototype (rsp. function-prototype for C) and the method
+(rsp. function for C) itself. If this option is not nil then ECB
+separates the prototypes from the real function/methods. Then with
+<code>ecb-show-tags</code> the user can define different display-settings
+for each of them. If this option is nil then the prototypes and the
+real functions are filled in the same bucket and displayed plain and
+there is no sorting between prototypes and functions possible. If this
+option is switched on then it is senseful that <code>ecb-show-tags</code>
+contains for all modes which distinct between prototypes and real
+functions/methods two entries for the tag-type 'function - see the
+documentation of this option. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>methods-show-node-info</b><var><a name="index-methods_002dshow_002dnode_002dinfo-224"></a></var><br>
+<blockquote><p>When to display which node-info in the methods-buffer. Define which
+node info should displayed after moving the mouse over a node (or
+after a shift click onto the node) in the methods-buffer.
+
+        <p>You can define &ldquo;when&rdquo; a node-info should be displayed: See
+<code>ecb-directories-show-node-info</code> for the possible choices.
+
+        <p>You can define what info should be displayed:
+          <ul>
+<li>name:
+Only the full node name is displayed.
+
+          <li>name+type:
+The full name + the type of the node (function, class, variable) is
+displayed. 
+</ul>
+
+        <p>Do NOT set this option directly via setq but use always customize! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>post-process-semantic-taglist</b><var><a name="index-post_002dprocess_002dsemantic_002dtaglist-225"></a></var><br>
+<blockquote><p>Define mode-dependent post-processing for the semantic-taglist. This
+is an alist where the car is a major-mode symbol and the cdr is a list
+of function-symbols of functions which should be used for
+post-processing the taglist (returned by
+<code>ecb--semantic-bovinate-toplevel</code>) for a buffer in this
+major-mode. The first function in the list is called with current
+semantic taglist of current buffer and must return a valid taglist
+again. All other functions are called with the result-taglist of its
+preceding function and have to return a new taglist again.
+
+        <p>For oo-programming languages where the methods of a class can be
+defined outside the class-definition (e.g. C++, Eieio) the function
+<code>ecb-group-function-tags-with-parents</code> can be used to get a much
+better method-display in the methods-window of ECB, because all method
+implementations of a class are grouped together.
+
+        <p>Another senseful usage is to filter out certain tags, e.g. prototype
+tags in <code>c-mode</code>. For this you can set
+<code>ecb-filter-c-prototyp-tags</code>.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-only-positioned-tags</b><var><a name="index-show_002donly_002dpositioned_002dtags-226"></a></var><br>
+<blockquote><p>Show only nodes in the method-buffer which are &ldquo;jump-able&rdquo;. If not nil
+then ECB displays in the method-buffer only nodes which are
+&ldquo;jump-able&rdquo;, i.e. after selecting it by clicking or with RET then ECB
+jumps to the corresponding location in the edit-window. Example: With
+CLOS or Eieio source-code there can exist some position-less nodes like
+variable-attributes in a <code>defclass</code> form which are only displayed
+if this option is nil. Displaying such nodes can be senseful even if
+they can not be jumped.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-tags</b><var><a name="index-show_002dtags-227"></a></var><br>
+<blockquote><p>How to show tags in the methods buffer first time after find-file. 
+This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+        <p>The car is either a major-mode symbol or the special symbol 'default
+which means if no setting for a certain major-mode is defined then the
+cdr of the 'default cons-cell is used. This option should always
+contain a default-setting!
+
+        <p>The cdr is a list where each element represents a type of tags:
+
+     <pre class="example">        (&lt;tag type&gt; &lt;display type&gt; &lt;sort method&gt;)
+   </pre>
+        <p>There can be more than 1 element for a certain &lt;tag type&gt;. This is for
+example useful for C++ and C because these languages distinct between
+a method-prototype (rsp. function-prototype for C) and the method
+(rsp. function for C) itself. The default value of these option
+contains two entries for &lt;tag type&gt; is <code>function</code> whereas the
+first one is responsible for the &ldquo;real&rdquo; methods (rsp. functions) and
+the second one for the prototypes. So if the methods should be
+flattened and the prototypes collapsed the show-tags-list for C++ and
+C must contain two entries for &lt;tag type&gt; <code>function</code>, the first
+one defined as <code>flattened</code> and the second one defined as
+<code>collapsed</code>.
+
+        <p>The tags in the methods buffer are displayed in the order as they appear in
+this list.
+
+          <dl>
+<dt><code>&lt;tag type&gt;</code><dd>A Semantic tag type symbol (function, variable, rule, include etc.) 
+or one of the following:
+
+               <ul>
+<li><code>t</code>: All tag types not specified anywhere else in the list. 
+<li><code>parent</code>: The parents of a type. 
+</ul>
+
+          <br><dt><code>&lt;display type&gt;</code><dd>A symbol which describes how the tags of this type shall be shown:
+
+               <ul>
+<li><code>expanded</code>: The tags are shown in an expanded node. 
+<li><code>collapsed</code>: The tags are shown in a collapsed node. 
+<li><code>flattened</code>: The tags are added to the parent node. 
+<li><code>hidden</code>: The tags are not shown. 
+</ul>
+
+          <br><dt><code>&lt;sort method&gt;</code><dd>A symbol describing how to sort the tags of this type:
+
+               <ul>
+<li><code>name</code>:
+Sort by the tag name. 
+<li><code>access</code>:
+Sort by tag access (public, protected, private) and then by name. 
+<li><code>nil</code>:
+Don't sort tags. They appear in the same order as in the source
+buffer. 
+</ul>
+          </dl>
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tag-display-function</b><var><a name="index-tag_002ddisplay_002dfunction-228"></a></var><br>
+<blockquote><p>Function to use for displaying tags in the methods buffer. This
+functionality is set on major-mode base, i.e. for every major-mode a
+different function can be used. The value of this option is a list of
+cons-cells:
+
+          <ul>
+<li>The car is either a major-mode symbol or the special symbol 'default which
+means if no function for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used. 
+<li>The cdr is the function used for displaying a tag in the related
+major-mode. 
+</ul>
+
+        <p>Every function is called with 3 arguments:
+
+          <ol type=1 start=1>
+<li>The tag
+<li>The parent-tag of tag (can be nil)
+<li>The value of <code>ecb-font-lock-tags</code>.
+             </ol>
+
+        <p>Every function must return the display of the tag as string,
+colorized if the third argument is not nil.
+
+        <p>The following functions are predefined:
+
+          <ul>
+<li>For each element E of <code>ecb--semantic-format-function-alist</code>
+exists a function with name &ldquo;ecb&ndash;&lt;(cdr E)&gt;&rdquo;. These functions are
+just aliase to the builtin format-functions of semantic. See the
+docstring of these functions to see what they do. Example:
+(semantic-name-nonterminal . semantic-format-tag-name) is an element
+of <code>ecb--semantic-format-function-alist</code>. Therefore the
+alias-function for this element is named
+<code>ecb--semantic-format-tag-name</code>.
+
+          <li>For every cdr in <code>ecb--semantic-format-function-alist</code> with name
+&ldquo;semantic-XYZ&rdquo; a function with name &ldquo;ecb-XYC&rdquo; is predefined. The
+differences between the semantic- and the ECB-version are:
+
+               <ul>
+<li>The ECB-version displays for type tags only the type-name and nothing
+else (exception: In c++-mode a template specifier is appended to the
+type-name if a template instead a normal class). 
+<li>The ECB-version displays type-tags according to the setting in
+<code>ecb-type-tag-display</code>. This is useful for better recognizing
+different classes, structs etc. in the ECB-method window. 
+</ul>
+
+          <p>For all tags which are not types the display of the ECB-version is
+identical to the semantic version. Example: For
+<code>ecb--semantic-format-tag-name</code> (one of the builtin semantic
+formatters) the pendant is <code>ecb-format-tag-name</code>. 
+</ul>
+
+        <p>This functionality also allows the user to display tags as UML. To
+enable this functionality set the function for a major-mode \(e.g. 
+<code>jde-mode</code>) to
+<code>ecb--semantic-format-tag-uml-concise-prototype</code>,
+<code>ecb--semantic-format-tag-uml-prototype</code>, or
+<code>ecb--semantic-format-tag-uml-abbreviate</code> the ECB-versions of
+these functions.
+
+        <p>If the value is <code>nil</code>, i.e. neither a function for a major-mode
+is defined nor the special 'default, then
+<code>ecb--semantic-format-tag-prototype</code> is used for displaying the
+tags.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tag-jump-sets-mark</b><var><a name="index-tag_002djump_002dsets_002dmark-229"></a></var><br>
+<blockquote><p>Set the mark after jumping to a tag from the ECB-method buffer. If
+set the user can easily jump back. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tag-visit-post-actions</b><var><a name="index-tag_002dvisit_002dpost_002dactions-230"></a></var><br>
+<blockquote><p>Actions to perform after visiting a tag from the Method-buffer. With
+this option actions can be added which will be performed after
+visiting the start of the tag in the source-buffer.
+
+        <p>This functionality is set on a <code>major-mode</code> base, i.e. for every
+<code>major-mode</code> a different setting can be used. The value of this
+option is a list of cons-cells:
+          <ul>
+<li>The car is either a <code>major-mode</code> symbol or the special symbol
+'default.
+
+          <li>The cdr is a list of action-functions or nil. 
+</ul>
+
+        <p>ECB first performs all actions defined for the special symbol 'default
+(if any) and then all actions defined for current <code>major-mode</code>
+(if any).
+
+        <p>ECB offers some predefined senseful action-functions. Currently there
+are: <code>ecb-tag-visit-highlight-tag-header</code>
+<code>ecb-tag-visit-smart-tag-start</code>
+<code>ecb-tag-visit-recenter</code> <code>ecb-tag-visit-recenter-top</code>
+<code>ecb-tag-visit-goto-doc-start</code>
+<code>ecb-tag-visit-narrow-tag</code> See the documentation of these
+function for details what they do.
+
+        <p>But you can add any arbitrary function if the following conditions are
+fulfilled: The function gets the semantic tag as argument, returns the
+(new) point after finishing its job and the function must not put the
+point outside the tag-boundaries of the tag-argument. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>type-tag-display</b><var><a name="index-type_002dtag_002ddisplay-231"></a></var><br>
+<blockquote><p>How to display semantic type-tags in the methods buffer. Normally
+all tag displaying, colorizing and facing is done by semantic
+according to the value returned by
+<code>ecb--semantic-format-face-alist</code> and the semantic
+display-function (e.g. one from
+<code>ecb--semantic-format-tag-functions</code>). But sometimes a finer
+distinction in displaying the different type specifiers of type-tags
+can be useful. For a description when this option is evaluated look at
+<code>ecb-tag-display-function</code>!
+
+        <p>This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+          <ul>
+<li>The car is either a major-mode symbol or the special symbol 'default which
+means if no setting for a certain major-mode is defined then the cdr of
+the 'default cons-cell is used.
+
+          <li>The cdr is a list of 3-element-lists:
+
+               <ol type=1 start=1>
+<li>First entry is a semantic type specifier in string-form. Current
+available type specifiers are for example &ldquo;class&rdquo;, &ldquo;interface&rdquo;,
+&ldquo;struct&rdquo;, &ldquo;typedef&rdquo; and &ldquo;enum&rdquo;. In addition to these ones there
+is also a special ECB type specifier &ldquo;group&rdquo; which is related to
+grouping tags (see <code>ecb-post-process-semantic-taglist</code> and
+<code>ecb-group-function-tags-with-parents</code>). Any arbitrary
+specifier can be set here but if it is not &ldquo;group&rdquo; or not known by
+semantic it will be useless. 
+<li>Second entry is a flag which indicates if the type-specifier string
+from (1.) itself should be removed (if there is any) from the display. 
+<li>Third entry is the face which is used in the ECB-method window to
+display type-tags with this specifier. ECB has some predefined faces
+for this (<code>ecb-type-tag-class-face</code>,
+<code>ecb-type-tag-interface-face</code>, <code>ecb-type-tag-struct-face</code>,
+<code>ecb-type-tag-typedef-face</code>, <code>ecb-type-tag-union-face</code>,
+<code>ecb-type-tag-enum-face</code> and <code>ecb-type-tag-group-face</code>) but
+any arbitrary face can be set here. This face is merged with the faces
+semantic already uses to display a tag,
+i.e. the result is a display where all face-attributes of the ECB-face
+take effect plus all face-attributes of the semantic-faces which are not
+set in the ECB-face (with XEmacs this merge doesn't work so here the
+ECB-face replaces the semantic-faces; this may be fixed in future
+versions).
+               </ol>
+</ul>
+
+        <p>The default value is nil means there is no special ECB-displaying of
+type-tags in addition to the displaying and colorizing semantic
+does. But a value like the following could be a useful setting:
+
+     <pre class="example">        ((default
+           ("class" t ecb-type-tag-class-face)
+           ("group" nil ecb-type-tag-group-face))
+         (c-mode
+          ("struct" nil ecb-type-tag-struct-face)
+          ("typedef" nil ecb-type-tag-typedef-face)))
+   </pre>
+        <p>This means that in <code>c-mode</code> only &ldquo;struct&rdquo;s and &ldquo;typedef&rdquo;s are
+displayed with special faces (the specifiers itself are not removed)
+and in all other modes &ldquo;class&rdquo;s and grouping-tags (see
+<code>ecb-tag-display-function</code>,
+<code>ecb-group-function-tags-with-parents</code>) have special faces and
+the &ldquo;class&rdquo; specifier-string is removed from the display.
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>type-tag-expansion</b><var><a name="index-type_002dtag_002dexpansion-232"></a></var><br>
+<blockquote><p>Default expansion of semantic type-tags. Semantic groups type-tags in
+different type-specifiers. Current available type specifiers are for
+example &ldquo;class&rdquo;, &ldquo;interface&rdquo;, &ldquo;struct&rdquo;, &ldquo;typedef&rdquo;, &ldquo;union&rdquo;
+and &ldquo;enum&rdquo;. In addition to these ones there is also a special ECB
+type-specifier &ldquo;group&rdquo; which is related to grouping tags (see
+<code>ecb-post-process-semantic-taglist</code>).
+
+        <p>This option defines which type-specifiers should be expanded at
+file-open-time. Any arbitrary specifier can be set here but if it is
+not &ldquo;group&rdquo; or not known by semantic it will be useless.
+
+        <p>This functionality is set on a major-mode base, i.e. for every
+major-mode a different setting can be used. The value of this option
+is a list of cons-cells:
+
+          <ul>
+<li>The car is either a major-mode symbol or the special symbol
+<code>default</code> which means if no setting for a certain major-mode is
+defined then the cdr of the <code>default</code> cons-cell is used.
+
+          <li>The cdr is either a list of type-specifiers which should be expanded
+at file-open-time or the symbol <code>all-specifiers</code> (then a type-tag
+is always expanded regardless of its type-specifier). 
+</ul>
+
+        <p>This options takes only effect for semantic-sources - means sources
+supported by semantic! 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dmode_002dline.html b/site/ecb-2.40/html-help/ecb_002dmode_002dline.html
new file mode 100644
index 0000000..502e642
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dmode_002dline.html
@@ -0,0 +1,150 @@
+<html lang="en">
+<head>
+<title>ecb-mode-line - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dwinman.html#ecb_002dwinman" title="ecb-winman">
+<link rel="next" href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol" title="ecb-version-control">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-mode-line"></a>
+<a name="ecb_002dmode_002dline"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dversion_002dcontrol.html#ecb_002dversion_002dcontrol">ecb-version-control</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.18 Group ecb-mode-line</h4>
+
+<p class="noindent">This group contains settings for the modelines of the
+ECB-tree-buffers:
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-data</b><var><a name="index-mode_002dline_002ddata-336"></a></var><br>
+<blockquote><p>Data shown in the modelines of the special ECB-buffers. Everey element
+of this list is a cons-cell where the car is used to define a
+buffer-name and the cdr to define the modeline-data for that buffer. 
+For details about how to defining a buffer-name see
+<code>ecb-mode-line-prefixes</code> - its completely the same.
+
+        <p>The cdr is the data for ths modeline and can either be the symbol
+<code>sel-dir</code> or <code>sel-source</code> whereas the former one displays
+the current selected directory as modeline-data and the latter one the
+current selected source-file (without path).
+
+        <p>In addition to these two predefined values for every special
+ECB-buffer a plain string (which is displayed) or a function can be
+specified which gets three args (name of the buffer, current selected
+directory and current selected source-file) and must return a string
+which will be displayed in the modeline (or nil if no data should be
+displayed). Such a function can add the text-property <code>help-echo</code>
+to the result-string. Then this help-string will be displayed when the
+user moves the mouse over this section of the modeline.
+
+        <p>If a special ECB-buffer should not display special data in its
+modeline then this buffer-name should either not being added to this
+option or added with &ldquo;No data&rdquo; (= nil as cdr).
+
+        <p>The whole modeline of the special ECB-buffer consists of the prefix of
+<code>ecb-mode-line-prefixes</code> and the data of
+<code>ecb-mode-line-data</code> - eventually prepended by the window-number,
+see <code>ecb-mode-line-display-window-number</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-data-face</b><var><a name="index-mode_002dline_002ddata_002dface-337"></a></var><br>
+<blockquote><p>Face used for the data in the mode-line. See
+<code>ecb-mode-line-data</code>. For XEmacs the face should inherit from the
+face <code>modeline</code> (see <code>set-face-parent</code>)! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-display-window-number</b><var><a name="index-mode_002dline_002ddisplay_002dwindow_002dnumber-338"></a></var><br>
+<blockquote><p>Display in the modeline of every special ECB-window the window-number. 
+The left-top-most window in a frame has the window-number 0 and all
+other windows are numbered with increasing numbers in the sequence,
+functions like <code>other-window</code> or <code>next-window</code> would walk
+through the frame.
+
+        <p>This can be used to jump to windows by number with commands like:
+
+     <pre class="lisp">          (defun my-switch-to-window-number (number)
+            ``Switch to the nth window''
+            (interactive ``P'')
+            (if (integerp number)
+                (select-window (nth number (window-list)))))
+   </pre>
+        <p>Currently this feature is only available for GNU Emacs 21.X, because
+neither GNU Emacs &lt; 21 nor XEmacs can evaluate dynamically forms in
+the mode-line. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-prefixes</b><var><a name="index-mode_002dline_002dprefixes-339"></a></var><br>
+<blockquote><p>Prefixes shown in the modelines of the special ECB-buffers. The
+displayed prefix then looks like: &ldquo;[ &lt;PREFIX&gt;[: ]]&rdquo;, means if a
+prefix is defined for an special ECB-buffer then a single space is
+prepended and if there is additional text to display (e.g. the current
+directory in the sources buffer, see <code>ecb-mode-line-data</code>) then
+also the string &ldquo;: &rdquo; is appended.
+
+        <p>Everey element of this list is a cons-cell where the car is used to
+define a buffer-name and the cdr to define the modeline-prefix for
+that buffer.
+
+        <p>The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+to define a prefix for one of the builtin ECB-tree-buffers because
+then simply the related option-symbol can be used. To add a prefix for
+the builtin directories tree-buffer just set the symbol
+<code>ecb-directories-buffer-name</code> as car.
+
+        <p>The cdr is the prefix for a buffer and can either be a string which
+used as it is or a function-symbol which is called with three argument
+(the buffer-name, the current selected directory and the current
+selected source-file) and must return either nil (for no prefix) or a
+string which is then used a prefix. Such a function can add the
+text-property <code>help-echo</code> to the result-string. Then this
+help-string will be displayed when the user moves the mouse over this
+section of the modeline.
+
+        <p>If a special ECB-buffer should not have a prefix in its modeline then
+this buffer-name should either not being added to this option or added
+with &ldquo;No prefix&rdquo; (= nil as cdr). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-prefix-face</b><var><a name="index-mode_002dline_002dprefix_002dface-340"></a></var><br>
+<blockquote><p>Face used for the prefix in the mode-line. See
+<code>ecb-mode-line-prefixes</code>. For XEmacs the face should inherit from
+the face <code>modeline</code> (see <code>set-face-parent</code>)! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mode-line-win-nr-face</b><var><a name="index-mode_002dline_002dwin_002dnr_002dface-341"></a></var><br>
+<blockquote><p>Face used for the window-number in the mode-line. See
+<code>ecb-mode-line-display-window-number</code>. For XEmacs the face should
+inherit from the face <code>modeline</code> (see <code>set-face-parent</code>)! 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dnon_002dsemantic.html b/site/ecb-2.40/html-help/ecb_002dnon_002dsemantic.html
new file mode 100644
index 0000000..891d4ad
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dnon_002dsemantic.html
@@ -0,0 +1,135 @@
+<html lang="en">
+<head>
+<title>ecb-non-semantic - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dspeedbar.html#ecb_002dspeedbar" title="ecb-speedbar">
+<link rel="next" href="ecb_002dwinman.html#ecb_002dwinman" title="ecb-winman">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-non-semantic"></a>
+<a name="ecb_002dnon_002dsemantic"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dwinman.html#ecb_002dwinman">ecb-winman</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dspeedbar.html#ecb_002dspeedbar">ecb-speedbar</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.16 Group ecb-non-semantic</h4>
+
+<p class="noindent">This group contains settings for parsing and displaying non-semantic files:
+
+<div class="defun">
+&mdash; User Option: <b>auto-save-before-etags-methods-rebuild</b><var><a name="index-auto_002dsave_002dbefore_002detags_002dmethods_002drebuild-328"></a></var><br>
+<blockquote><p>Automatic saving of current buffer before rebuilding its methods.
+
+        <p>This option is only relevant for sources which are supported and
+parsed by etags (see <code>ecb-process-non-semantic-files</code>). Because
+etags is an external tool a source-buffer can only be reparsed if the
+buffer is saved to disk. So the command
+<code>ecb-rebuild-methods-buffer</code> checks for sources which are not
+supported by semantic or imenu if either this option is t or if the
+major-mode of the source-buffer is contained in this list: In both
+cases ECB saves the current source-buffer before it re-runs etags for
+reparsing the source. If nil or if the major-mode is not contained
+then no automatic saving will be done!
+
+        <p>For all source supported by semantic or by imenu this option takes no
+effect. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>non-semantic-exclude-modes</b><var><a name="index-non_002dsemantic_002dexclude_002dmodes-329"></a></var><br>
+<blockquote><p>Exclude modes from parsing with imenu or etags. Per default, ECB tries
+to parse all file-types not supported by semantic with imenu or etags
+or some other method (for details see the option
+<code>ecb-non-semantic-parsing-function</code>). If a file-type can not be
+parsed by semantic, imenu or etags than this simply results in an
+empty method-buffer for this file. But nevertheless you will get a
+message &ldquo;Sorry, no support for a file of that extension&rdquo; which comes
+from the speedbar-library and can not switched off. Therefore if a
+<code>major-mode</code> is known as not parse-able by semantic, imenu or etags
+it can be added to this option and then it will be excluded from being
+tried to parsed. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>non-semantic-methods-initial-expand</b><var><a name="index-non_002dsemantic_002dmethods_002dinitial_002dexpand-330"></a></var><br>
+<blockquote><p>Initially expand all tags for not by semantic supported sources. 
+This option can be customized on a major-mode basis, i.e. if a
+<code>major-mode</code> is contained in this option then all tags for this
+modes will be initially expanded - otherwise not. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>non-semantic-parsing-function</b><var><a name="index-non_002dsemantic_002dparsing_002dfunction-331"></a></var><br>
+<blockquote><p>Define mode-dependent parsing functions for non-semantic files. This
+is an alist where the car is a major-mode symbol and the cdr is a
+function-symbol of a function which should be used for parsing a
+non-semantic buffer, i.h. a buffer for which no semantic grammar
+exists. Such a function gets one argument - the filename of current
+buffer - and has to generate and return a tag/tag list which is
+understandable by <code>speedbar-insert-generic-list</code>. speedbar has
+already included two functions <code>speedbar-fetch-dynamic-imenu</code> and
+<code>speedbar-fetch-dynamic-etags</code> which can be used for parsing
+buffers with imenu rsp. etags.
+
+        <p>This option takes only effect if <code>ecb-process-non-semantic-files</code>
+is not nil: Then ECB checks for non-semantic buffers if current
+<code>major-mode</code> is contained in this option and if yes, then the
+specified parsing function is called; if not then the cars of the
+elements of <code>speedbar-dynamic-tags-function-list</code> are called in
+that sequence they are listed in this variable. See option
+<code>speedbar-dynamic-tags-function-list</code> for further details.
+
+        <p>In most cases imenu-parsing is preferable over etags-parsing because
+imenu operates on Emacs-buffers and needs no external tool and
+therefore parsing works also if current contents of a buffer are not
+saved to disk. But maybe sometimes etags may return better parsing
+results
+
+        <p>IMPORTANT: if imenu-parsing should be used then the option
+<code>speedbar-use-imenu-flag</code> must be set to not nil! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>process-non-semantic-files</b><var><a name="index-process_002dnon_002dsemantic_002dfiles-332"></a></var><br>
+<blockquote><p>Display content of non-semantic-files in the ECB-methods-buffer. See
+also <code>ecb-non-semantic-parsing-function</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>rebuild-non-semantic-methods-before-hook</b><var><a name="index-rebuild_002dnon_002dsemantic_002dmethods_002dbefore_002dhook-333"></a></var><br>
+<blockquote><p>Hook running at beginning of the function
+<code>ecb-rebuild-methods-buffer-for-non-semantic</code>. This function is
+always called by the command <code>ecb-rebuild-methods-buffer</code> for not
+semantic supported source-types.
+
+        <p>Every function of this hook gets one argument: The complete filename
+of the current source-buffer in the edit-window. The Method-buffer is
+only rebuild by <code>ecb-rebuild-methods-buffer-for-non-semantic</code> if
+either the hook contains no function (the default) or if no function
+of this hook returns nil! See <code>run-hook-with-args-until-failure</code>
+for description how these function are processed. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dsources.html b/site/ecb-2.40/html-help/ecb_002dsources.html
new file mode 100644
index 0000000..cc3bafa
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dsources.html
@@ -0,0 +1,248 @@
+<html lang="en">
+<head>
+<title>ecb-sources - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002ddirectories.html#ecb_002ddirectories" title="ecb-directories">
+<link rel="next" href="ecb_002dmethods.html#ecb_002dmethods" title="ecb-methods">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-sources"></a>
+<a name="ecb_002dsources"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dmethods.html#ecb_002dmethods">ecb-methods</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.4 Group ecb-sources</h4>
+
+<p class="noindent">This group contains settings for the sources-buffer in the ECB:
+
+<div class="defun">
+&mdash; User Option: <b>read-only-check-exclude-regexps</b><var><a name="index-read_002donly_002dcheck_002dexclude_002dregexps-190"></a></var><br>
+<blockquote><p>Which directories should be excluded from the sources-read-only-check. 
+If a directory matches any of the regexps of this option their sources
+will not be checked if they are writable - This option takes only
+effect if <code>ecb-sources-perform-read-only-check</code> is not nil. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>show-source-file-extension</b><var><a name="index-show_002dsource_002dfile_002dextension-191"></a></var><br>
+<blockquote><p>Show the file extension of source files. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>source-file-regexps</b><var><a name="index-source_002dfile_002dregexps-192"></a></var><br>
+<blockquote><p>Specifies which files are shown as source files.
+
+        <p>This is done on directory-base, which means for each directory-regexp
+the files to display can be specified. If more than one
+directory-regexp matches the current selected directory then always the
+first one (and its related file-exclude/include-regexps) is used! If
+no directory-regexp matches then all files are displayed for the
+currently selected directory.
+
+        <p>Important note: It is recommended that the *LAST* element of this list
+should contain an always matching directory-regexp (<code>".*"</code>)!
+
+        <p>So the value of this option is a list of cons-cells where the car is a
+directory regexp and the cdr is a 2 element list where the first
+element is a list of exclude regexps and the second element is a list
+of include regexps. A file is displayed in the source-buffer of ECB
+iff: The file does not match any of the exclude regexps OR the file
+matches at least one of the include regexps.
+
+        <p>But regardless of the value of this option a file F is never displayed
+in the sources-buffer if the directory matches
+<code>ecb-sources-exclude-cvsignore</code> and the directory contains a file
+.cvsignore which contains F as an entry!
+
+        <p>There are three predefined and useful combinations of an exclude and
+include regexp:
+
+          <ul>
+<li>All files
+
+          <li>All, but no backup, object, lib or ini-files (except .emacs and .gnus). This
+means all files except those starting with &ldquo;.&rdquo;, &ldquo;#&rdquo; or ending with
+&ldquo;~&rdquo;, &ldquo;.elc&rdquo;, &ldquo;.obj&rdquo;, &ldquo;.o&rdquo;, &ldquo;.lib&rdquo;, &ldquo;.dll&rdquo;, &ldquo;.a&rdquo;,
+&ldquo;.so&rdquo;. (but including .emacs and .gnus)
+
+          <li>Common source file types (.c, .java etc.) 
+</ul>
+
+        <p>In addition to these predefined values a custom exclude and include
+combination can be defined.
+
+        <p>Tips for the directory- and file-rexexps: <code>"$^"</code> matches no
+files/directories, <code>".*"</code> matches all files/directories. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-buffer-after-create-hook</b><var><a name="index-sources_002dbuffer_002dafter_002dcreate_002dhook-193"></a></var><br>
+<blockquote><p>Local hook running after the creation of the sources-buffer. Every
+function of this hook is called once without arguments direct after
+creating the sources-buffer of ECB and it's local key-map. So for
+example a function could be added which performs calls of
+<code>local-set-key</code> to define new keybindings only for the
+sources-buffer of ECB. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-buffer-name</b><var><a name="index-sources_002dbuffer_002dname-194"></a></var><br>
+<blockquote><p>Name of the ECB sources buffer. Because it is not a normal buffer for
+editing you should enclose the name with stars, e.g. &ldquo;*ECB Sources*&rdquo;.
+
+        <p>If it is necessary for you you can get emacs-lisp access to the
+buffer-object of the ECB-sources-buffer by this name, e.g. by a call
+of <code>set-buffer</code>.
+
+        <p>Changes for this option at runtime will take affect only after
+deactivating and then activating ECB again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-exclude-cvsignore</b><var><a name="index-sources_002dexclude_002dcvsignore-195"></a></var><br>
+<blockquote><p>Specify if files contained in a <samp><span class="file">.cvsignore</span></samp> should be
+excluded.
+
+        <p>Value is a list of regular expressions or nil. If you want to exclude
+files listed in a <samp><span class="file">.cvsignore</span></samp>-file from being displayed in the
+ecb-sources-buffer then specify a regexp for such a directory.
+
+        <p>If you want to exclude the contents of <samp><span class="file">.cvsignore</span></samp>-files for
+every directory then you should add one regexp &ldquo;.*&rdquo; which matches
+every directory.
+
+        <p>If you never want to exclude the contents of <samp><span class="file">.cvsignore</span></samp>-files
+then set this option to nil. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-menu-sorter</b><var><a name="index-sources_002dmenu_002dsorter-196"></a></var><br>
+<blockquote><p>Function which re-sorts the menu-entries of the directories buffer.
+
+        <p>If a function then this function is called to sort the menu-entries of
+the combined menu-entries of the user-menu-extensions of
+<code>ecb-sources-menu-user-extension</code> and the built-in-menu
+<code>ecb-sources-menu</code>. If nil then no special sorting will be done
+and the user-extensions are placed in front of the built-in-entries.
+
+        <p>For the guidelines for such a sorter-function see
+<code>ecb-directories-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-menu-user-extension</b><var><a name="index-sources_002dmenu_002duser_002dextension-197"></a></var><br>
+<blockquote><p>Static user extensions for the popup-menu of the sources buffer. 
+For further explanations see <code>ecb-directories-menu-user-extension</code>.
+
+        <p>The node-argument of a menu-function contains as data the source
+for which the popup-menu has been opened. Use always
+<code>ecb-source-get-*</code> to extract whatever you need from the
+node-data. E.g. use <code>ecb-source-get-filename</code> to get the full
+filename of the source of the node.
+
+        <p>Per default the static user-extensions are added at the beginning of the
+built-in menu-entries of <code>ecb-sources-menu</code> but the whole menu can be
+re-arranged with <code>ecb-sources-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-menu-user-extension-function</b><var><a name="index-sources_002dmenu_002duser_002dextension_002dfunction-198"></a></var><br>
+<blockquote><p>Dynamic user extensions for the popup-menu of the sources buffer. A
+function which has to return a list in the same format like the option
+<code>ecb-sources-menu-user-extension</code>. This function is called when
+the user opens the popup-menu for the sources buffer.
+
+        <p>If no dynamically evaluated menu-extensions should be added to the
+sources-buffer the function has to return nil. Therefore the
+default-value of this option is <code>ignore</code>.
+
+        <p>Per default the dynamic user-extensions are added in front of the
+static extensions of <code>ecb-sources-menu-user-extension</code> but the
+whole menu can be re-arranged with <code>ecb-sources-menu-sorter</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-perform-read-only-check</b><var><a name="index-sources_002dperform_002dread_002donly_002dcheck-199"></a></var><br>
+<blockquote><p>Check if source-items in the tree-buffers are read-only. If a
+sourcefile is read-only then it will be displayed with that face set
+in the option <code>ecb-source-read-only-face</code>.
+
+        <p>Because this check can be take some time if files are used via a
+mounted net-drive ECB performs this check stealthily (see
+<code>ecb-stealthy-tasks-delay</code>) so normally the user should not see a
+performance-decrease or additional waiting-time. But to get sure this
+option offers three choices: <code>t</code>, <code>unless-remote</code> and
+<code>nil</code>. See <code>ecb-prescan-directories-for-emptyness</code> for an
+explanation for these three choices.
+
+        <p>The option <code>ecb-read-only-check-exclude-regexps</code> offers are more
+fine granularity to exclude the sources of certain directories from
+the read-only state-check. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-show-node-info</b><var><a name="index-sources_002dshow_002dnode_002dinfo-200"></a></var><br>
+<blockquote><p>When to display which node-info in the sources-buffer. 
+Define which node info should be displayed after moving the mouse
+over a node (or after a shift click onto the node) in the
+sources-buffer.
+
+        <p>You can define &ldquo;when&rdquo; a node-info should be displayed:
+See <code>ecb-directories-show-node-info</code> for the possible choices.
+
+          <ul>
+<li>name: Only the full node-name is displayed. 
+<li>file-info: File infos for this file are displayed. 
+<li>file-info-full: Fill infos incl. full path for this file are displayed. 
+</ul>
+
+        <p>Do NOT set this option directly via setq but use always customize! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-sort-ignore-case</b><var><a name="index-sources_002dsort_002dignore_002dcase-201"></a></var><br>
+<blockquote><p>Ignore case for sorting the source-files of the Sources-buffer. See
+also <code>ecb-sources-sort-method</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>sources-sort-method</b><var><a name="index-sources_002dsort_002dmethod-202"></a></var><br>
+<blockquote><p>Defines how the source files are sorted.
+
+          <ul>
+<li><code>name</code>:
+Sorting by name. 
+<li><code>extension</code>:
+Sorting first by extension and then by name. 
+<li><code>nil</code>:
+No sorting, means source files are displayed in the sequence returned
+by <code>directory-files</code> (called without sorting). 
+</ul>
+
+        <p>See also <code>ecb-sources-sort-ignore-case</code>
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dspeedbar.html b/site/ecb-2.40/html-help/ecb_002dspeedbar.html
new file mode 100644
index 0000000..d4ae255
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dspeedbar.html
@@ -0,0 +1,108 @@
+<html lang="en">
+<head>
+<title>ecb-speedbar - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002deshell.html#ecb_002deshell" title="ecb-eshell">
+<link rel="next" href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic" title="ecb-non-semantic">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-speedbar"></a>
+<a name="ecb_002dspeedbar"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002deshell.html#ecb_002deshell">ecb-eshell</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.15 Group ecb-speedbar</h4>
+
+<div class="defun">
+&mdash; User Option: <b>speedbar-before-activate-hook</b><var><a name="index-speedbar_002dbefore_002dactivate_002dhook-324"></a></var><br>
+<blockquote><p>Hook running directly before ECB activates the integrated speedbar.
+
+        <p>For example this hook can be used to change the expansion-mode of the
+integrated speedbar via <code>speedbar-change-initial-expansion-list</code>. 
+Example: (speedbar-change-initial-expansion-list &ldquo;buffers&rdquo;). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>speedbar-buffer-sync</b><var><a name="index-speedbar_002dbuffer_002dsync-325"></a></var><br>
+<blockquote><p>Synchronize the speedbar-buffer of ECB automatically with current
+edit buffer.
+
+        <p>If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+<code>major-mode</code> of the new buffer belongs NOT to this list.
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync</code>.
+
+        <p>IMPORTANT NOTE: Every time the synchronization is done the hook
+<code>ecb-speedbar-buffer-sync-hook</code> is evaluated. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>speedbar-buffer-sync-delay</b><var><a name="index-speedbar_002dbuffer_002dsync_002ddelay-326"></a></var><br>
+<blockquote><p>Time Emacs must be idle before the speedbar-buffer of ECB is synchronized. 
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay.
+
+        <p>If the special value 'basic is set then ECB uses the setting of the option
+<code>ecb-basic-buffer-sync-delay</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>speedbar-buffer-sync-hook</b><var><a name="index-speedbar_002dbuffer_002dsync_002dhook-327"></a></var><br>
+<blockquote><p>ook run at the end of <code>ecb-speedbar-buffer-sync</code>. 
+See documentation of <code>ecb-speedbar-buffer-sync</code> for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+        <p>Preconditions for such a hook:
+
+          <ul>
+<li>Current buffer is the buffer of the currently selected
+edit-window.
+
+          <li>The speedbar-buffer is displayed in a visible window of the
+ecb-frame (so no check for visibilty of the speedbar-buffer in
+the ecb-frame is necessary in a hook function)
+</ul>
+
+        <p>Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+        <p>Important note: If the option <code>ecb-speedbar-buffer-sync</code> is not
+nil the function <code>ecb-speedbar-buffer-sync</code> is running either
+every time Emacs is idle or even after every command (see
+<code>ecb-speedbar-buffer-sync-delay</code>). So if the speedbar-buffer is
+displayed in a window of the ecb-frame (see preconditions above)
+these hooks can be really called very often! Therefore each
+function of this hook should/must check in an efficient way at
+beginning if its task have to be really performed and then do
+them only if really necessary! Otherwise performance of Emacs
+could slow down dramatically! 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dtree_002dbuffer.html b/site/ecb-2.40/html-help/ecb_002dtree_002dbuffer.html
new file mode 100644
index 0000000..dcabde9
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dtree_002dbuffer.html
@@ -0,0 +1,518 @@
+<html lang="en">
+<head>
+<title>ecb-tree-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dgeneral.html#ecb_002dgeneral" title="ecb-general">
+<link rel="next" href="ecb_002ddirectories.html#ecb_002ddirectories" title="ecb-directories">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-tree-buffer"></a>
+<a name="ecb_002dtree_002dbuffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002ddirectories.html#ecb_002ddirectories">ecb-directories</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dgeneral.html#ecb_002dgeneral">ecb-general</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.2 Group ecb-tree-buffer</h4>
+
+<p class="noindent">This group contains general settings related to the tree-buffers of
+ECB:
+
+<div class="defun">
+&mdash; User Option: <b>basic-buffer-sync</b><var><a name="index-basic_002dbuffer_002dsync-148"></a></var><br>
+<blockquote><p>Synchronize the basic ECB-buffers automatically with current edit buffer.
+
+        <p>The basic ECB-buffers are the buffers for directories, sources, methods and
+history.
+
+        <p>If 'always then the synchronization takes place always a buffer changes in the
+edit window, if nil then never. If a list of major-modes then only if the
+<code>major-mode</code> of the new buffer belongs NOT to this list.
+
+        <p>But in every case the synchronization takes only place if the current-buffer
+in the edit-window has a relation to files or directories. Examples for the
+former one are all programming-language-modes, <code>Info-mode</code> too, an
+example for the latter one is <code>dired-mode</code>. For all major-modes related
+to non-file/directory-buffers like <code>help-mode</code>, <code>customize-mode</code> and
+others never an autom. synchronization will be done!
+
+        <p>It's recommended to exclude at least <code>Info-mode</code> because it makes no
+sense to synchronize the ECB-windows after calling the Info help. Per default
+also <code>dired-mode</code> is excluded but it can also making sense to synchronize
+the ECB-directories/sources windows with the current directory in the
+dired-buffer.
+
+        <p>IMPORTANT NOTE: Every time the synchronization is done the hook
+<code>ecb-basic-buffer-sync-hook</code> is evaluated. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>basic-buffer-sync-delay</b><var><a name="index-basic_002dbuffer_002dsync_002ddelay-149"></a></var><br>
+<blockquote><p>Time Emacs must be idle before the special ECB-buffers are synchronized. 
+Synchronizing is done with the current source displayed in the edit window. If
+nil then there is no delay, means synchronization takes place immediately. A
+small value of about 0.25 seconds saves CPU resources and you get even though
+almost the same effect as if you set no delay. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>basic-buffer-sync-hook</b><var><a name="index-basic_002dbuffer_002dsync_002dhook-150"></a></var><br>
+<blockquote><p>Hook run at the end of <code>ecb-basic-buffer-sync</code>. 
+See documentation of <code>ecb-basic-buffer-sync</code> for conditions when
+synchronization takes place and so in turn these hooks are evaluated.
+
+        <p>Precondition for such a hook:
+Current buffer is the buffer of the currently selected edit-window.
+
+        <p>Postcondition for such a hook:
+Point must stay in the same edit-window as before evaluating the hook.
+
+        <p>Important note: If the option <code>ecb-basic-buffer-sync</code> is not nil
+the function <code>ecb-basic-buffer-sync</code> is running either every time
+Emacs is idle or even after every command (see
+<code>ecb-basic-buffer-sync-delay</code>). So these hooks can be really
+called very often! Therefore each function of this hook
+should/must check in an efficient way at beginning if its task
+have to be really performed and then do them only if really
+necessary! Otherwise performance of Emacs could slow down
+dramatically!
+
+        <p>It is strongly recommended that each function added to this hook uses the
+macro <code>ecb-do-if-buffer-visible-in-ecb-frame</code> at beginning! See
+<code>ecb-speedbar-buffer-sync</code> and <code>ecb-eshell-buffer-sync</code> for
+examples how to use this macro! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>bucket-node-display</b><var><a name="index-bucket_002dnode_002ddisplay-151"></a></var><br>
+<blockquote><p>How ECB displays bucket-nodes in a ECB tree-buffer. 
+Bucket-nodes have only one job: Nodes with similar properties will be dropped
+into one bucket for such a common property and all these nodes will be added
+as children to the bucket-node. Besides being expandable and collapsable a
+bucket-node has no senseful action assigned. Examples for bucket-nodes are
+&rdquo;[+] Variables&rdquo;, &ldquo;[+] Dependencies&rdquo; etc. in the Methods-buffer or buckets
+which combine filenames with same extension under a bucket-node with name this
+extension.
+
+        <p>This option defines how bucket-node should be displayed. The name of the
+bucket-node is computed by ECB but you can define a prefix, a suffix and a
+special face for the bucket-node
+
+        <p>The default are empty prefix/suffix-strings and <code>ecb-bucket-node-face</code>. But
+an alternative can be for example '(&rdquo;[&rdquo; &ldquo;]&rdquo; nil) which means no special
+face and a display like &ldquo;[+] [&lt;bucket-name&gt;]&rdquo;. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>common-tree-buffer-after-create-hook</b><var><a name="index-common_002dtree_002dbuffer_002dafter_002dcreate_002dhook-152"></a></var><br>
+<blockquote><p>Local hook running at the end of each tree-buffer creation. Every
+function of this hook is called once without arguments direct after
+creating a tree-buffer of ECB and it's local key-map. So for example a
+function could be added which performs calls of <code>local-set-key</code>
+to define new keybindings for EVERY tree-buffer.
+
+        <p>The following keys must not be rebind in all tree-buffers:
+          <ul>
+<li><kbd>RET</kbd> and all combinations with <kbd>Shift</kbd> and <kbd>Ctrl</kbd>
+<li><kbd>TAB</kbd>
+<li><code>C-t</code>
+</ul>
+        </p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>mouse-click-destination</b><var><a name="index-mouse_002dclick_002ddestination-153"></a></var><br>
+<blockquote><p>Destination of a mouse-button click. Defines in which edit-window (if
+splitted) ECB does the &ldquo;right&rdquo; action (opening a source, jumping to
+a method/variable etc.) after clicking with the primary mouse-button
+(see <code>ecb-primary-secondary-mouse-buttons</code>) onto a node. There
+are two possible choices:
+
+          <ul>
+<li><code>left-top</code>:
+Does the &ldquo;right&rdquo; action always in the left/topmost edit-window. 
+<li><code>last-point</code>:
+Does the &ldquo;right&rdquo; action always in that edit-window which had the point
+before. 
+</ul>
+        This is if the user has clicked either with the primary mouse-button or
+has activated a popup-menu in the tree-buffer.
+
+        <p>If the edit-area is not splitted this setting doesn't matter.
+
+        <p>A click with the secondary mouse-button (see again
+<code>ecb-primary-secondary-mouse-buttons</code> does the &ldquo;right&rdquo; action
+always in another edit-window related to the setting in this option:
+If there are two edit-windows then the &ldquo;other&rdquo; edit-window is used
+and for more than 2 edit-windows the &ldquo;next&rdquo; edit-window is used
+(whereas the next edit-window of the last edit-window is the first
+edit-window).
+
+        <p>Note: If the tree-buffers are used with the keyboard instead with the
+mouse then this option takes effect too because <kbd>RET</kbd> is
+interpreted as primary mouse-button and <kbd>C-RET</kbd> as secondary
+mouse-button! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>primary-secondary-mouse-buttons</b><var><a name="index-primary_002dsecondary_002dmouse_002dbuttons-154"></a></var><br>
+<blockquote><p>Primary- and secondary mouse button for using the ECB-buffers. A click
+with the primary button causes the main effect in each ECB-buffer:
+
+          <ul>
+<li>ECB Directories:
+Expanding/collapsing nodes and displaying files in the ECB
+Sources buffer.
+
+          <li>ECB sources/history:
+Opening the file in that edit-window specified by the option
+<code>ecb-mouse-click-destination</code>.
+
+          <li>ECB Methods:
+Jumping to the method in that edit-window specified by the option
+<code>ecb-mouse-click-destination</code>. 
+</ul>
+
+        <p>A click with the primary mouse-button while the SHIFT-key is pressed called
+the POWER-click and does the following (depending on the ECB-buffer where the
+POWER-click occurs):
+
+          <ul>
+<li>ECB Directories:
+Refreshing the directory-contents-cache (see
+<code>ecb-cache-directory-contents</code>).
+
+          <li>ECB sources/history:
+Only displaying the source-contents in the method-buffer but not
+displaying the source-file in the edit-window.
+
+          <li>ECB Methods:
+Narrowing to the clicked method/variable/ect... (see
+<code>ecb-tag-visit-post-actions</code>). This works only for semantic
+supported sources but not for imenu- or etags-supported ones! 
+</ul>
+
+        <p>In addition always the whole node-name is displayed in the minibuffer after a
+POWER-click (for this see also <code>ecb-methods-show-node-info</code>).
+
+        <p>The secondary mouse-button is for opening (jumping to) the file in
+another edit-window (see the documentation
+<code>ecb-mouse-click-destination</code>).
+
+        <p>The following combinations are possible:
+
+          <ul>
+<li>primary: mouse-2, secondary: C-mouse-2 (means mouse-2 while CTRL-key is
+pressed). This is the default setting. 
+<li>primary: mouse-1, secondary: C-mouse-1
+<li>primary: mouse-1, secondary: mouse-2
+</ul>
+
+        <p>Please note: If the tree-buffers are used with the keyboard instead
+with the mouse then <kbd>RET</kbd> is interpreted as primary mouse-button and
+<kbd>C-RET</kbd> as secondary mouse-button!
+
+        <p>If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-buffer-style</b><var><a name="index-tree_002dbuffer_002dstyle-155"></a></var><br>
+<blockquote><p>The style of the tree-buffers. 
+There are three different styles available:
+
+        <p>Image-style (value <code>image</code>): Very nice and modern - just try it. For this
+style the options <code>ecb-tree-indent</code> and
+<code>ecb-tree-expand-symbol-before</code> have no effect! The value 'image means
+use image-style if images can be displayed with current Emacs-setup
+\(otherwise auto. 'ascii-style is used). Note: GNU Emacs &lt;= 21.3.X for Windows
+does not support image-display so ECB uses always 'ascii-guides even when here
+'image is set!
+
+        <p>Ascii-style with guide-lines (value <code>ascii-guides</code>):
+     <pre class="example">        [-] ECB
+         |  [+] code-save
+         `- [-] ecb-images
+             |  [-] directories
+             |   |  [-] height-15
+             |   |   |  * close.xpm
+             |   |   |  * empty.xpm
+             |   |   |  * leaf.xpm
+             |   |   `- * open.xpm
+             |   |  [+] height-17
+             |   |  [+] height-19
+             |   `- [+] height-21
+             |  [x] history
+             |  [x] methods
+             `- [x] sources
+   </pre>
+        <p>Ascii-style without guide-lines (value <code>ascii-no-guides</code>) - this
+is the style used by ECB &lt;= 1.96:
+     <pre class="example">        [-] ECB
+            [+] code-save
+            [-] ecb-images
+                [-] directories
+                    [-] height-15
+                        * close.xpm
+                        * empty.xpm
+                        * leaf.xpm
+                        * open.xpm
+                    [+] height-17
+                    [+] height-19
+                    [+] height-21
+                [x] history
+                [x] methods
+                [x] sources
+   </pre>
+        <p>With both ascii-styles the tree-layout can be affected with the
+options <code>ecb-tree-indent</code> and
+<code>ecb-tree-expand-symbol-before</code>. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-do-not-leave-window-after-select</b><var><a name="index-tree_002ddo_002dnot_002dleave_002dwindow_002dafter_002dselect-156"></a></var><br>
+<blockquote><p>Tree-buffers which stay selected after a key- or mouse-selection. If a
+buffer (either its name or the variable-symbol which holds the name)
+is contained in this list then selecting a tree-node either by RET or
+by a mouse-click doesn't leave that tree-buffer after the
+node-selection but performes only the appropriate action (opening a
+new source, selecting a method etc.) but point stays in the
+tree-buffer. In tree-buffers not contained in this option normaly a
+node-selection selects as &ldquo;last&rdquo; action the right edit-window or
+maximizes the next senseful tree-buffer in case of a currently
+maximized tree-buffer (see
+<code>ecb-maximize-next-after-maximized-select</code>).
+
+        <p>The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+for the builtin ECB-tree-buffers because then simply the related
+option-symbol can be used.
+
+        <p>A special remark for the <code>ecb-directories-buffer-name</code>: Of course
+here the value of this option is only relevant if the name of the
+current layout is contained in
+<code>ecb-show-sources-in-directories-buffer</code> or if the value of
+<code>ecb-show-sources-in-directories-buffer</code> is 'always and the
+clicked ot hitted node represents a sourcefile (otherwise this would
+not make any sense)!
+
+        <p>The setting in this option is only the default for each tree-buffer. 
+With the command <code>ecb-toggle-do-not-leave-window-after-select</code>
+the behavior of a node-selection can be changed fast and easy in a
+tree-buffer without customizing this option, but of course not for
+future Emacs sessions! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-easy-hor-scroll</b><var><a name="index-tree_002deasy_002dhor_002dscroll-157"></a></var><br>
+<blockquote><p>Scroll step for easy hor. scrolling via mouse-click in tree-buffers. 
+XEmacs has horizontal scroll-bars so invisible parts beyond the right
+window-border of a tree-buffer can always made visible very easy.
+
+        <p>GNU Emacs does not have hor. scroll-bars so especially with the mouse
+it is quite impossible to scroll smoothly right and left. The
+functions <code>scroll-left</code> and <code>scroll-right</code> can be annoying
+and are also not bound to mouse-buttons.
+
+        <p>If this option is a positive integer S then in all ECB-tree-buffers
+the keys <kbd>M-mouse-1</kbd> and <code>M-mouse-3</code> are bound to scrolling
+left rsp. right with scroll-step S - clicking with <kbd>mouse-1</kbd> or
+<kbd>mouse-2</kbd> onto the edge of the modeline has the same effect, i.e. 
+if you click with mouse-1 onto the left (rsp right) edge of the
+modeline you will scroll left (rsp. right).
+
+        <p>Additionally <code>C-M-mouse-1</code> and <code>C-M-mouse-3</code> are bound to
+scrolling left rsp. right with scroll-step <code>window-width</code> - 2.
+
+        <p>Default is a scroll-step of 5. If the value is <code>nil</code> then no keys
+for horizontal scrolling are bound. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-expand-symbol-before</b><var><a name="index-tree_002dexpand_002dsymbol_002dbefore-158"></a></var><br>
+<blockquote><p>Show the expand symbol before the items in a tree. When the
+expand-symbol is located before the items then the tree looks like:
+
+     <pre class="example">        [-] ECB
+            [+] code-save
+            [-] ecb-images
+                [-] directories
+   </pre>
+        <p>When located after then the tree looks like:
+
+     <pre class="example">        ECB [-]
+          code-save [+]
+          ecb-images [-]
+            directories [-]
+   </pre>
+        <p>The after-example above use a value of 2 for <code>ecb-tree-indent</code>
+whereas the before-example uses a value of 4.
+
+        <p>It is recommended to display the expand-symbol before because
+otherwise it could be that with a deep nested item-structure with
+and/or with long item-names (e.g. a deep directory-structure with some
+long subdirectory-names) the expand-symbol is not visible in the
+tree-buffer and the tree-buffer has to be horizontal scrolled to
+expand an item. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-image-icons-directories</b><var><a name="index-tree_002dimage_002dicons_002ddirectories-159"></a></var><br>
+<blockquote><p>Directories where the images for the tree-buffer can be found. This is
+a cons cell where:
+
+        <p>car: Default directory where the default images for the tree-buffer
+can be found. It should contain an image for every name of
+<code>tree-buffer-tree-image-names</code>. The name of an image-file must
+be: &ldquo;ecb-&lt;NAME of TREE-BUFFER-TREE-IMAGE-NAMES&gt;.&lt;ALLOWED
+EXTENSIONS&gt;&rdquo;.
+
+        <p>cdr: This is a list where each element is a cons again with: car is
+the buffer name of the tree-buffer for which a special image-path
+should be used. The buffer-name can either be defined as plain string
+or with a symbol which contains the buffer-name as value. The latter
+one is recommended for the builtin ECB-tree-buffers because then
+simply the related option-symbol can be used (e.g. the symbol
+<code>ecb-directories-buffer-name</code>). The cdr is the the full-path of
+an additional image-directorie which is searched first for images
+needed for the related tree-buffer. If the image can not be found in
+this directory then the default-directory (see above) is searched. If
+the image can't even be found there the related ascii-symbol is used -
+which is defined in <code>tree-buffer-tree-image-names</code>. If a
+tree-buffer is not contained in this list then there is no additional
+special image-directory for it.
+
+        <p>ECB comes with predefined images in several different heights - so for
+the most senseful font-heights of a tree-buffer a fitting image-size
+should be available. The images reside either in the subdirectory
+&ldquo;ecb-images&rdquo; of the ECB-installation or - if ECB is installed as
+regular XEmacs-package - in the ECB-etc data-directory (the directory
+returned by (locate-data-directory &ldquo;ecb&rdquo;). 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-incremental-search</b><var><a name="index-tree_002dincremental_002dsearch-160"></a></var><br>
+<blockquote><p>Enable incremental search in the ECB-tree-buffers. For a detailed
+explanation see the online help section &ldquo;Working with the keyboard in
+the ECB buffers&rdquo;. If you change this during ECB is activated you must
+deactivate and activate ECB again to take effect. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-indent</b><var><a name="index-tree_002dindent-161"></a></var><br>
+<blockquote><p>Indent size for tree buffer. If you change this during ECB is
+activated you must deactivate and activate ECB again to take effect. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-make-parent-node-sticky</b><var><a name="index-tree_002dmake_002dparent_002dnode_002dsticky-162"></a></var><br>
+<blockquote><p>Make the parent-node sticky in the headerline of the tree-buffer.
+
+        <p>If not nil then the first line of the tree-buffer is used as header-line which
+is used to display the next unvisible parent of the first visible node as
+sticky, so always the parent of a node is visible and clickable. If a node has
+no parent then just the next node above is displayed in the header-line. The
+node displayed in the header-line is exactly in the same manner clickable as
+all other nodes.
+
+        <p>See also <code>ecb-tree-stickynode-indent-string</code>.
+
+        <p>This feature is only available with Gnu Emacs, not with XEmacs. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-mouse-action-trigger</b><var><a name="index-tree_002dmouse_002daction_002dtrigger-163"></a></var><br>
+<blockquote><p>When the tree-buffer mouse-action should be triggered. This option
+determines the moment a mouse-action in a tree-buffer is triggered. 
+This can be either direct after pressing a mouse-button (value
+<code>button-press</code>) or not until releasing the mouse-button (value:
+<code>button-release</code>).
+
+        <p>If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-navigation-by-arrow</b><var><a name="index-tree_002dnavigation_002dby_002darrow-164"></a></var><br>
+<blockquote><p>Enable smart navigation in the tree-windows by horiz. arrow-keys. If
+not nil then the left- and right-arrow keys work in the ECB
+tree-window in the following smart way if onto an expandable node:
+
+          <ul>
+<li>Left-arrow:
+If node is expanded then it will be collapsed otherwise point jumps to
+the next &ldquo;higher&rdquo; node in the hierarchical tree (higher means the next
+higher tree-level or - if no higher level available - the next higher
+node on the same level).
+
+          <li>Right-arrow:
+If node is not expanded then it will be expanded. Onto a not
+expandable node the horizontal arrow-keys go one character in the
+senseful correct direction. 
+</ul>
+
+        <p>If this option is changed the new value takes first effect after deactivating
+ECB and then activating it again! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-stickynode-indent-string</b><var><a name="index-tree_002dstickynode_002dindent_002dstring-165"></a></var><br>
+<blockquote><p>String used to indent the stickynode. 
+This string is used to match the space used by scrollbars and
+fringe so it does not appear that the node-name is moving left/right
+when it lands in the sticky line.
+
+        <p>Normally the needed value is computed automatically by ECB. But if the result
+is not matching this option allows to customize the indent-string. The default
+value is computed by the function
+<code>tree-buffer-sticky-default-indent-string</code>, so you can change the needed
+value with that starting-point.
+
+        <p>Changing this option takes only effect after restarting Emacs! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>tree-truncate-lines</b><var><a name="index-tree_002dtruncate_002dlines-166"></a></var><br>
+<blockquote><p>Truncate lines in ECB buffers. If a buffer (either its name or the
+variable-symbol which holds the name) is contained in this list then
+line-truncation is switched on for this buffer otherwise it is off.
+
+        <p>The buffer-name can either be defined as plain string or with a symbol
+which contains the buffer-name as value. The latter one is recommended
+to switch on line-truncation for one of the builtin ECB-tree-buffers
+because then simply the related option-symbol can be used. To truncate
+lines in the builtin directories tree-buffer just add the symbol
+<code>ecb-directories-buffer-name</code> to this option.
+
+        <p>If you change this during ECB is activated you must deactivate and
+activate ECB again to take effect. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>truncate-long-names</b><var><a name="index-truncate_002dlong_002dnames-167"></a></var><br>
+<blockquote><p>Truncate long names that don't fit in the width of the ECB windows. If
+you change this during ECB is activated you must deactivate and
+activate ECB again to take effect. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dversion_002dcontrol.html b/site/ecb-2.40/html-help/ecb_002dversion_002dcontrol.html
new file mode 100644
index 0000000..d1efc4f
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dversion_002dcontrol.html
@@ -0,0 +1,174 @@
+<html lang="en">
+<head>
+<title>ecb-version-control - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dmode_002dline.html#ecb_002dmode_002dline" title="ecb-mode-line">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-version-control"></a>
+<a name="ecb_002dversion_002dcontrol"></a>
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.19 Group ecb-version-control</h4>
+
+<p class="noindent">This group contains settings for the version-control-support of ECB:
+
+<div class="defun">
+&mdash; User Option: <b>vc-directory-exclude-regexps</b><var><a name="index-vc_002ddirectory_002dexclude_002dregexps-342"></a></var><br>
+<blockquote><p>Which directories should be excluded from VC-state-check. If a
+directory matches any of the regexps of this option the VC-state of
+its sources will not be checked - This option takes only effect if
+<code>ecb-vc-enable-support</code> is not nil. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>vc-enable-support</b><var><a name="index-vc_002denable_002dsupport-343"></a></var><br>
+<blockquote><p>Enable support for version-control (VC) systems. If on then in the
+directories-buffer (if the value of the option
+<code>ecb-show-sources-in-directories-buffer</code> is on for current
+layout), the sources-buffer and the history-buffer all file-items are
+displayed with an appropriate icon in front of the item-name to
+indicate the VC-state of this item. If off then no
+version-control-state checking is done.
+
+        <p>Because this check can be take some time if files are managed by a not
+local Version-control-server ECB performs this check stealthy (see
+<code>ecb-stealthy-tasks-delay</code>) so normally there should no
+performance-decrease or additional waiting-time for the user. But to
+get sure this option offers three choices: <code>t</code>,
+<code>unless-remote</code> and <code>nil</code>. See the option
+<code>ecb-prescan-directories-for-emptyness</code> for an explanation for
+these three choices.
+
+        <p>The option <code>ecb-vc-directory-exclude-regexps</code> offers are more
+fine granularity to exclude the sources of certain directories from
+the VC-state-check.
+
+        <p>See <code>ecb-vc-supported-backends</code> and <code>ecb-vc-state-mapping</code>
+how to customize the VC-support itself. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>vc-state-mapping</b><var><a name="index-vc_002dstate_002dmapping-344"></a></var><br>
+<blockquote><p>Mapping between VC-states from the backends and ECB-known VC-states. 
+ECB understands the following state-values:
+
+          <dl>
+<dt><code>up-to-date</code><dd>The working file is unmodified with respect to the latest version on
+the current branch, and not locked.
+
+          <br><dt><code>edited</code><dd>The working file has been edited by the user. If locking is used for
+the file, this state means that the current version is locked by the
+calling user.
+
+          <br><dt><code>needs-patch</code><dd>The file has not been edited by the user, but there is a more recent
+version on the current branch stored in the master file.
+
+          <br><dt><code>needs-merge</code><dd>The file has been edited by the user, and there is also a more recent
+version on the current branch stored in the master file. This state
+can only occur if locking is not used for the file.
+
+          <br><dt><code>added</code><dd>The working file has already been added/registered to the VC-system
+but not yet commited.
+
+          <br><dt><code>unlocked-changes</code><dd>The current version of the working file is not locked, but the working
+file has been changed with respect to that version. This state can
+only occur for files with locking; it represents an erroneous
+condition that should be resolved by the user.
+
+          <br><dt><code>ignored</code><dd>The version-control-system ignores this file (e.g. because included in
+a .cvsignore-file in case of CVS).
+
+          <br><dt><code>unknown</code><dd>The state of the file can not be retrieved; probably the file is not
+under a version-control-system.
+
+        </dl>
+
+        <p>All state-values a check-vc-state-function of
+<code>ecb-vc-supported-backends</code> can return must have a mapping to one
+of the ECB-state-values listed above. If for a certain
+backend-VC-state no mapping can be found then per default 'edited is
+assumed!
+
+        <p>The default value of this option maps already the possible returned
+state-values of <code>vc-state</code> and <code>vc-recompute-state</code> (both
+GNU Emacs) and <code>vc-cvs-status</code> (Xemacs) to the
+ECB-VC-state-values. 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>vc-supported-backends</b><var><a name="index-vc_002dsupported_002dbackends-345"></a></var><br>
+<blockquote><p>Define how to to identify the VC-backend and how to check the state. 
+The value of this option is a list containing cons-cells where the car is a
+function which is called to identify the VC-backend for a DIRECTORY and the
+cdr is a function which is called to check the VC-state of the FILEs contained
+in DIRECTORY.
+
+        <p>Identify-backend-function: It gets a full directory-name as argument - always
+without ending slash (rsp. backslash for native Windows-XEmacs) - and has to
+return a unique symbol for the VC-backend which manages that directory (e.g. 
+'CVS for the CVS-system or 'RCS for the RCS-system) or nil if the file is not
+managed by a version-control-system.
+
+        <p>Check-vc-state-function: It gets a full filename (ie. incl. the complete
+directory-part) and has to return a symbol which indicates the VC-state of
+that file. The possible returned values of such a check-vc-state-function have
+to be mapped with <code>ecb-vc-state-mapping</code> to the allowed ECB-VC-state values.
+
+        <p>ECB runs for a certain DIRECTORY all identify-backend-functions in that order
+they are listed in this option. For the first which returns a value unequal
+nil the associated check-state-function is used to retrieve the VC-state of
+all sourcefiles in that DIRECTORY.
+
+        <p>There is no need for the identify-backend-function or the
+check-vc-state-function to cache any state because ECB automatically caches
+internally all necessary informations for directories and files for best
+possible performance.
+
+        <p>To prepend ECB from checking the VC-state for any file set
+<code>ecb-vc-enable-support</code> to nil.
+
+        <p>Default value: Support for CVS, RCS, SCCS, Subversion, Git and
+Monotone. To identify the VC-backend the functions
+<code>ecb-vc-managed-by-CVS</code>, <code>ecb-vc-managed-by-RCS</code> rsp. 
+<code>ecb-vc-managed-by-SCCS</code> rsp. <code>ecb-vc-managed-by-SVN</code> rsp. 
+<code>ecb-vc-managed-by-GIT</code> rsp. <code>ecb-vc-managed-by-MTN</code>are used.
+
+        <p>For all six backends the function <code>ecb-vc-state</code> of the
+VC-package is used by default (which uses a heuristic and
+therefore faster but less accurate approach), but there is also
+<code>ecb-vc-recompute-state</code> available which is an alias for
+<code>vc-recompute-state</code> (which returns accurate state-values by calling the
+backend which can be slow especialy for remote root-repositories!)
+
+        <p>Example: If <code>ecb-vc-recompute-state</code> (to get real state-values not
+only heuristic ones) should be used to check the state for CVS-managed files
+and <code>ecb-vc-state</code> for all other backends then an element
+(ecb-vc-dir-managed-by-CVS . ecb-vc-recompute-state) should be added at the
+beginning of this option. 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/ecb_002dwinman.html b/site/ecb-2.40/html-help/ecb_002dwinman.html
new file mode 100644
index 0000000..c640412
--- /dev/null
+++ b/site/ecb-2.40/html-help/ecb_002dwinman.html
@@ -0,0 +1,56 @@
+<html lang="en">
+<head>
+<title>ecb-winman - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Customizable-options.html#Customizable-options" title="Customizable options">
+<link rel="prev" href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic" title="ecb-non-semantic">
+<link rel="next" href="ecb_002dmode_002dline.html#ecb_002dmode_002dline" title="ecb-mode-line">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="ecb-winman"></a>
+<a name="ecb_002dwinman"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="ecb_002dmode_002dline.html#ecb_002dmode_002dline">ecb-mode-line</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="ecb_002dnon_002dsemantic.html#ecb_002dnon_002dsemantic">ecb-non-semantic</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Customizable-options.html#Customizable-options">Customizable options</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.3.17 Group ecb-winman</h4>
+
+<p class="noindent">This group contains settings for supporting several window-managers:
+
+<div class="defun">
+&mdash; User Option: <b>winman-escreen-number</b><var><a name="index-winman_002descreen_002dnumber-334"></a></var><br>
+<blockquote><p>Number of the escreen which is reserved for ECB. If you go to the
+escreen with this number you go always to the escreen with activated
+ECB. All other escreen-numbers are escreens with deactivated ECB! 
+</p></blockquote></div>
+
+<div class="defun">
+&mdash; User Option: <b>winman-winring-name</b><var><a name="index-winman_002dwinring_002dname-335"></a></var><br>
+<blockquote><p>Name of the winring-window-configuration reserved for ECB. If you go
+to the window-configuration with this name you go always to the
+window-configuration with activated ECB. All other
+window-configuration are configurations with deactivated ECB! 
+</p></blockquote></div>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/setq-or-customize.html b/site/ecb-2.40/html-help/setq-or-customize.html
new file mode 100644
index 0000000..6730a34
--- /dev/null
+++ b/site/ecb-2.40/html-help/setq-or-customize.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<title>setq or customize - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="General-aspects.html#General-aspects" title="General aspects">
+<link rel="prev" href="General-aspects.html#General-aspects" title="General aspects">
+<link rel="next" href="Site_002dwide-customizing.html#Site_002dwide-customizing" title="Site-wide customizing">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="setq-or-customize"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Site_002dwide-customizing.html#Site_002dwide-customizing">Site-wide customizing</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="General-aspects.html#General-aspects">General aspects</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="General-aspects.html#General-aspects">General aspects</a>
+<hr>
+</div>
+
+<h4 class="subsection">7.1.1 Setq or customize - what should i use?</h4>
+
+<p>The best way to customize all the options of ECB is via the
+customize-feature of (X)Emacs, i.e. means calling the commands
+<code>customize-option</code> or <code>customize-group</code> etc. This is also
+the strongly recommended way!
+
+   <p>But you can also use <code>setq</code> or some Elisp-code to change the values of
+many but not all of the options. The values of the following options
+<strong>MUST NOT</strong> be changed via <code>setq</code> or Elisp-code but only with the
+customize-feature!
+
+     <ul>
+<li><code>ecb-analyse-buffer-sync-delay</code>
+<li><code>ecb-analyse-show-node-info</code>
+<li><code>ecb-basic-buffer-sync-delay</code>
+<li><code>ecb-bucket-node-display</code>
+<li><code>ecb-compile-window-height</code>
+<li><code>ecb-compile-window-temporally-enlarge</code>
+<li><code>ecb-compile-window-width</code>
+<li><code>ecb-directories-show-node-info</code>
+<li><code>ecb-eshell-buffer-sync-delay</code>
+<li><code>ecb-exclude-parents-regexp</code>
+<li><code>ecb-fix-window-size</code>
+<li><code>ecb-font-lock-tags</code>
+<li><code>ecb-highlight-tag-with-point-delay</code>
+<li><code>ecb-history-show-node-info</code>
+<li><code>ecb-key-map</code>
+<li><code>ecb-layout-name</code>
+<li><code>ecb-layout-window-sizes</code>
+<li><code>ecb-methods-show-node-info</code>
+<li><code>ecb-mode-line-data</code>
+<li><code>ecb-mode-line-display-window-number</code>
+<li><code>ecb-mode-line-prefixes</code>
+<li><code>ecb-show-tags</code>
+<li><code>ecb-source-path</code>
+<li><code>ecb-sources-show-node-info</code>
+<li><code>ecb-speedbar-buffer-sync-delay</code>
+<li><code>ecb-symboldef-buffer-sync-delay</code>
+<li><code>ecb-toggle-layout-sequence</code>
+<li><code>ecb-tag-display-function</code>
+<li><code>ecb-tree-do-not-leave-window-after-select</code>
+<li><code>ecb-type-tag-display</code>
+<li><code>ecb-type-tag-expansion</code>
+<li><code>ecb-use-speedbar-instead-native-tree-buffer</code>
+<li><code>ecb-windows-height</code>
+<li><code>ecb-windows-width</code>
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/html-help/tree_002dbuffer.html b/site/ecb-2.40/html-help/tree_002dbuffer.html
new file mode 100644
index 0000000..dc1df0d
--- /dev/null
+++ b/site/ecb-2.40/html-help/tree_002dbuffer.html
@@ -0,0 +1,62 @@
+<html lang="en">
+<head>
+<title>tree-buffer - ECB - the Emacs Code Browser</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="ECB - the Emacs Code Browser">
+<meta name="generator" content="makeinfo 4.8">
+<link title="Top" rel="start" href="ecb.html#Top">
+<link rel="up" href="Elisp-programming.html#Elisp-programming" title="Elisp programming">
+<link rel="prev" href="List-of-hooks.html#List-of-hooks" title="List of hooks">
+<link rel="next" href="Adviced-functions.html#Adviced-functions" title="Adviced functions">
+<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<div class="node">
+<p>
+<a name="tree-buffer"></a>
+<a name="tree_002dbuffer"></a>
+Next:&nbsp;<a rel="next" accesskey="n" href="Adviced-functions.html#Adviced-functions">Adviced functions</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="List-of-hooks.html#List-of-hooks">List of hooks</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="Elisp-programming.html#Elisp-programming">Elisp programming</a>
+<hr>
+</div>
+
+<h3 class="section">11.3 The library tree-buffer.el</h3>
+
+<p>The library tree-buffer.el is an ECB-independent library written
+completely in emacs lisp and can be used also by other applications
+than ECB. But the main purpose of tree-buffer.el is to offer a small
+but powerful API to create new tree-buffers for ECB, add new
+tree-nodes to a tree-buffer and thus use such a tree-buffer to display
+arbitrary information structured by a tree.
+
+   <p>This chapter is for emacs-lisp-programmers and describes how to create
+a new tree-buffer, how to add new tree-nodes to a tree-buffer
+(includes removing and updating already existing tree-nodes) and how
+to use the offered tree-buffer- and tree-node-APIs.
+
+<ul class="menu">
+<li><a accesskey="1" href="Introduction.html#Introduction">Introduction</a>:                 General description of tree-buffers
+<li><a accesskey="2" href="A-new-tree_002dbuffer.html#A-new-tree_002dbuffer">A new tree-buffer</a>:            How to create a new tree-buffer
+<li><a accesskey="3" href="A-new-tree_002dnode.html#A-new-tree_002dnode">A new tree-node</a>:              How to add new tree-nodes to a tree-buffer
+<li><a accesskey="4" href="Updating-a-tree_002dbuffer.html#Updating-a-tree_002dbuffer">Updating a tree-buffer</a>:       How to update a tree-buffer after changes
+<li><a accesskey="5" href="Tree_002dbuffer-keybindings.html#Tree_002dbuffer-keybindings">Tree-buffer keybindings</a>:      Default and customizable keybindings
+<li><a accesskey="6" href="The-tree_002dbuffer_002dAPI.html#The-tree_002dbuffer_002dAPI">The tree-buffer-API</a>:          All functions for tree-buffers and -nodes
+<li><a accesskey="7" href="Do-not-with-tree_002dbuffer.html#Do-not-with-tree_002dbuffer">Do not with tree-buffer</a>:      Things which are strictly forbidden
+<li><a accesskey="8" href="Tree_002dbuffer-How-to.html#Tree_002dbuffer-How-to">Tree-buffer How to</a>:           Dealing with special situations
+</ul>
+
+   </body></html>
+
diff --git a/site/ecb-2.40/info-help/ecb.info b/site/ecb-2.40/info-help/ecb.info
new file mode 100644
index 0000000..82032dd
--- /dev/null
+++ b/site/ecb-2.40/info-help/ecb.info
@@ -0,0 +1,225 @@
+This is ecb.info, produced by makeinfo version 4.8 from ecb.texi.
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* ECB: (ecb).           Emacs Code Browser
+END-INFO-DIR-ENTRY
+
+
+Indirect:
+ecb.info-1: 183
+ecb.info-2: 297118
+ecb.info-3: 575271
+
+Tag Table:
+(Indirect)
+Node: Top183
+Node: Install and first steps13223
+Node: Installation13731
+Node: Requirements14159
+Node: ECB as XEmacs-package15493
+Node: Standard ECB-Installation16456
+Ref: Standard ECB-Installation-Footnote-120871
+Ref: Standard ECB-Installation-Footnote-220986
+Ref: Standard ECB-Installation-Footnote-321108
+Node: Setting up Emacs21264
+Node: General hints21854
+Ref: General hints-Footnote-123307
+Ref: General hints-Footnote-223430
+Node: Setting up CEDET/semantic23531
+Ref: Checking your hooks25191
+Ref: Setting up CEDET/semantic-Footnote-126408
+Ref: Setting up CEDET/semantic-Footnote-226467
+Node: Non-semantic files26616
+Node: First steps27716
+Ref: First steps-Footnote-129163
+Node: Overview29392
+Ref: Overview-Footnote-132094
+Node: Manual usage32187
+Node: ECB-windows35241
+Node: Basic ECB-windows36055
+Node: Tree-buffer basics37171
+Ref: Tree-buffer basics-Footnote-141083
+Node: Tree-buffer styles41167
+Node: Style basics41843
+Node: Ascii-based styles43839
+Ref: Ascii-based styles-Footnote-145504
+Node: Tree-buffers with images45622
+Node: Images for Methods-buffer48891
+Node: ECB Directories-window49509
+Node: ECB Sources-window52748
+Node: ECB Methods-window55564
+Node: ECB History-window70292
+Node: Add-on ECB-windows77067
+Node: Semantic analyser77520
+Ref: Semantic analyser-Footnote-183211
+Ref: Semantic analyser-Footnote-283294
+Node: Symboldefinition83404
+Node: Activation and Deactivation83631
+Node: Standard activation84514
+Ref: Activation hook-sequence85104
+Ref: Deactivation hook-sequence85438
+Ref: Standard activation-Footnote-185651
+Node: Automatic activation85734
+Node: Usage of ECB86481
+Node: Using the mouse87659
+Ref: Using the mouse-Footnote-193108
+Node: Using the keyboard93154
+Ref: Using the keyboard-Footnote-194284
+Node: Navigation/Selection94335
+Node: Incremental search96597
+Node: Personal tree-keybindings98829
+Ref: Personal tree-keybindings-Footnote-1100962
+Node: Using popup-menus101065
+Node: The edit-area102027
+Node: Temp- and compile-buffers113870
+Ref: Problems with the compile window118607
+Ref: Using special-display with ECB119549
+Ref: Temp- and compile-buffers-Footnote-1120600
+Node: The other window120705
+Ref: The other window-Footnote-1128629
+Ref: The other window-Footnote-2128777
+Node: The Methods buffer128845
+Ref: Definition of semantic- and non-semantic-sources129403
+Node: Visiting tags130488
+Node: Expanding131939
+Node: Customizing the display138957
+Ref: Customizing the display-Footnote-1142177
+Node: Rebuilding the Methods142527
+Node: Filtering the tree-buffers144604
+Node: Filtering Directories145297
+Node: Filtering Sources146253
+Node: Filtering History147422
+Node: Filtering Methods148703
+Node: The ECB-layout153714
+Node: Changing the ECB-layout154507
+Ref: Changing the ECB-layout-Footnote-1188739
+Node: Redrawing the ECB-layout188832
+Node: Changing window sizes189833
+Node: Fixing window sizes191436
+Ref: Fixing window sizes-Footnote-1192904
+Node: Creating a new ECB-layout193014
+Ref: Creating a new ECB-layout-Footnote-1198357
+Node: Hiding the ECB windows198531
+Node: Maximizing the ECB windows200830
+Ref: Maximizing the ECB windows-Footnote-1204999
+Node: Back/forward navigation205068
+Ref: Back/forward navigation-Footnote-1206223
+Node: ECB-window synchronizing206280
+Node: General synchronization aspects207534
+Node: Synchronization of basic ECB-windows211452
+Node: Add-on synchronization213037
+Node: Stealthy background tasks214689
+Node: Interactive ECB commands217978
+Node: Customizing250040
+Node: General aspects250678
+Node: setq or customize251264
+Node: Site-wide customizing253066
+Ref: Site-wide customizing-Footnote-1259122
+Ref: Site-wide customizing-Footnote-2259247
+Node: Most important options259315
+Node: Customizable options262155
+Node: ecb-general264039
+Node: ecb-tree-buffer277139
+Node: ecb-directories297118
+Node: ecb-sources316891
+Node: ecb-methods325015
+Node: ecb-history356838
+Node: ecb-analyse364066
+Node: ecb-layout373816
+Node: ecb-compilation398687
+Node: ecb-create-layout408085
+Node: ecb-face-options408632
+Node: ecb-faces413238
+Node: ecb-help419578
+Node: ecb-eshell421622
+Node: ecb-speedbar423814
+Node: ecb-non-semantic426760
+Node: ecb-winman431452
+Node: ecb-mode-line432242
+Node: ecb-version-control437311
+Node: Submitting problem report443920
+Node: Upgrading446259
+Node: Downloading new versions447011
+Node: Auto. option-upgrading449154
+Node: User interface449470
+Node: Background information450520
+Node: Common use-cases454055
+Node: Changing faces455515
+Ref: Changing faces-Footnote-1458342
+Node: Small screens458518
+Node: Big screens459963
+Node: Simulating speedbar460807
+Node: Integrating speedbar461806
+Ref: Integrating speedbar-Footnote-1465295
+Ref: Integrating speedbar-Footnote-2465494
+Node: Large directories465652
+Node: Remote directories468034
+Ref: Remote directories-Footnote-1471193
+Ref: Remote directories-Footnote-2471334
+Ref: Remote directories-Footnote-3471468
+Ref: Remote directories-Footnote-4471569
+Node: Version-control support471979
+Ref: Version-control support-Footnote-1474186
+Node: Identifying backends474298
+Ref: Identifying backends-Footnote-1476542
+Node: Checking the state476718
+Ref: Checking the state-Footnote-1481964
+Ref: Checking the state-Footnote-2482149
+Node: Remote repositories482235
+Node: Refreshing the VC-state484572
+Node: Adding new backends487264
+Ref: Adding new backends-Footnote-1490593
+Node: Known VC-problems490711
+Node: Using eshell490997
+Ref: Using eshell-Footnote-1493507
+Node: Grepping directories493657
+Node: Working with JDEE494842
+Ref: Working with JDEE-Footnote-1496565
+Node: Compile-window on demand496752
+Node: Non-semantic sources498972
+Ref: Non-semantic sources-Footnote-1504933
+Node: Hide-show505017
+Node: Window-managers and ECB506686
+Ref: Window-managers and ECB-Footnote-1511479
+Node: Virtual folders in History511535
+Ref: Virtual folders in History-Footnote-1513982
+Ref: Virtual folders in History-Footnote-2514141
+Node: Elisp programming514186
+Node: List of variables514825
+Node: List of hooks515206
+Node: tree-buffer516395
+Node: Introduction517770
+Ref: Introduction-Footnote-1522508
+Node: A new tree-buffer522597
+Node: A new tree-node547693
+Node: Updating a tree-buffer552462
+Node: Tree-buffer keybindings554438
+Node: The tree-buffer-API558280
+Ref: The tree-buffer-API-Footnote-1560677
+Ref: The tree-buffer-API-Footnote-2560795
+Node: Do not with tree-buffer560873
+Node: Tree-buffer How to561878
+Node: Adviced functions563319
+Node: The layout-engine565847
+Node: Programming a new layout567139
+Node: Programming special windows575271
+Ref: Programming special windows-Footnote-1597178
+Ref: Programming special windows-Footnote-2597230
+Node: Possible layout-outlines597358
+Ref: Possible layout-outlines-Footnote-1605080
+Node: The layout-engine API605257
+Ref: The layout-engine API-Footnote-1607407
+Node: Conflicts and bugs607486
+Node: Conflicts607995
+Ref: Conflicts-Footnote-1620892
+Node: Bugs620951
+Node: FAQ621764
+Ref: FAQ-Footnote-1638403
+Ref: FAQ-Footnote-2638434
+Ref: FAQ-Footnote-3638478
+Node: Command Index638539
+Node: Option Index645495
+Node: Concept Index663063
+
+End Tag Table
diff --git a/site/ecb-2.40/info-help/ecb.info-1 b/site/ecb-2.40/info-help/ecb.info-1
new file mode 100644
index 0000000..779ed02
--- /dev/null
+++ b/site/ecb-2.40/info-help/ecb.info-1
@@ -0,0 +1,6406 @@
+This is ecb.info, produced by makeinfo version 4.8 from ecb.texi.
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* ECB: (ecb).           Emacs Code Browser
+END-INFO-DIR-ENTRY
+
+
+File: ecb.info,  Node: Top,  Next: Install and first steps,  Prev: (dir),  Up: (dir)
+
+This is the user manual for ECB version 2.40.
+
+ECB stands for "Emacs Code Browser". While (X)Emacs already has good
+*editing* support for many modes, its *browsing* support is somewhat lacking.
+That's where ECB comes in: it displays a number of informational windows that
+allow for easy source code navigation and overview.
+
+The informational windows can contain:
+
+   * A directory tree,
+
+   * a list of source files in the current directory (with full support and
+     display of the VC-state),
+
+   * a list of functions/classes/methods/... in the current file, (ECB uses
+     the CEDET-Semantic, or Imenu, or etags, for getting this list so all
+     languages supported by any of these tools are automatically supported by
+     ECB too)
+
+   * a history of recently visited files (groupable by several criterias),
+
+   * helpful informations and possible completions according to the current
+     context which is computed by the semantic-analyzer for some sort of
+     intellisense,
+
+   * the Speedbar and
+
+   * output from compilation (the "*compilation*" window) and other modes
+     like help, grep etc. or whatever a user defines to be displayed in this
+     window.
+
+As an added bonus, ECB makes sure to keep these informational windows
+visible, even when you use `C-x 1' and similar commands.
+
+It goes without saying that you can configure the layout, ie which
+informational windows should be displayed where. ECB comes with a number of
+ready-made window layouts to choose from.
+
+*Please note*: Experienced ECB users find a complete alphabetical list of all
+commands and user-options in *Note Interactive ECB commands:: and *Note
+Customizable options::.
+
+The latest version of ECB can always be found at the URL
+`http://ecb.sourceforge.net'.
+
+To send bug reports, or participate in discussions about ECB, use the mailing
+list <ecb-list@lists.sourceforge.net> via the URL
+`http://lists.sourceforge.net/lists/listinfo/ecb-list'.
+
+*IMPORTANT*: Cause of extra appearance of SPAM in the mailing-lists,
+SourceForge has changed its policy: Now it is only possible to post to the
+mailing-list for users who have subscribed this mailing-list. So please be
+aware you will not be able to send comments, bug reports and improvement
+suggestions before you have subscribed the ECB-mailing-list. See the section
+"Mailing-list" at the ECB-website at `http://ecb.sourceforge.net' how to do
+this.
+
+* Menu:
+
+* Install and first steps::     Installing ECB and first steps
+* Overview::                    Compact introducing of basic concepts
+* Manual usage::                How to use this manual
+* ECB-windows::                 Description of all ECB-windows of ECB
+* Activation and Deactivation:: How to start and end ECB
+* Usage of ECB::                How to use ECB
+* Customizing::                 How to customize ECB
+* Submitting problem report::   What to do when problems occur
+* Upgrading::                   Upgrading and downloading packages
+* Common use-cases::             Useful hints and tips
+* Elisp programming::           Entry points for Elisp programmers
+* Conflicts and bugs::          Known Conflicts with other packages and bugs
+* FAQ::                         Frequently asked questions
+* Command Index::               Index for interactive commands
+* Option Index::                Index for user options
+* Concept Index::               Index for concepts and terms
+
+ --- The Detailed Node Listing ---
+
+Installation and first steps of ECB
+
+* Installation::                Installation of ECB
+* Setting up Emacs::            How to set up Emacs for file parsing with ECB
+* First steps::                 First steps after activating ECB first time
+
+Installation of ECB
+
+* Requirements::                Requirements for ECB
+* ECB as XEmacs-package::       Installation of ECB as a XEmacs-package
+* Standard ECB-Installation::   Standard installation of ECB for (X)Emacs
+
+How to set up Emacs for file parsing with ECB
+
+* General hints::               General hints for a correct setup
+* Setting up CEDET/semantic::   How to setup semantic correctly
+* Non-semantic files::          Setup for file types not supported by semantic
+
+All ECB-windows of ECB
+
+* Basic ECB-windows::           Description of the basic ECB-windows
+* Add-on ECB-windows::          Description of additional ECB-windows
+
+The basic ECB-windows of ECB
+
+* Tree-buffer basics::          General introduction into tree-buffers
+* Tree-buffer styles::          Displaying the trees with different styles
+* ECB Directories-window::      Contents of the ECB Directories-window
+* ECB Sources-window::          Contents of the ECB Sources-window
+* ECB Methods-window::          Contents of the ECB Methods-window
+* ECB History-window::          Contents of the ECB History-window
+
+Displaying the trees with different styles
+
+* Style basics::                Basic knowledge about the styles
+* Ascii-based styles::          How to customize the ascii-styles
+* Tree-buffers with images::    Which images are used for the tree
+* Images for Methods-buffer::   Images for the tags in the Methods-buffer
+
+Add-on ECB-windows of ECB
+
+* Semantic analyser::           Analyses and displays semantic context
+* Symboldefinition::            Displays definition of current symbol
+
+Activation and Deactivation
+
+* Standard activation::         How to manually (de)activate ECB
+* Automatic activation::        Automatically (de)activating ECB
+
+Usage of ECB
+
+* Using the mouse::             Working with the mouse
+* Using the keyboard::          Working with the keyboard
+* The edit-area::               How to use the edit-area
+* Temp- and compile-buffers::   Displaying temp- and compilation-buffers
+* The other window::            How the ``other window'' is determined
+* The Methods buffer::          Using and customizing the Methods-buffer
+* Filtering the tree-buffers::  Applying filters to the ECB-tree-buffers
+* The ECB-layout::              Changing, customizing, redrawing, creating
+* Hiding the ECB windows::      Hiding/Showing the ECB-windows
+* Maximizing the ECB windows::  Maximizing the ECB-windows
+* Back/forward navigation::     Back- and forward navigation like a browser
+* ECB-window synchronizing::    Auto./manual synchronizing the ECB-windows
+* Stealthy background tasks::   Stealthy background-tasks of ECB
+* Interactive ECB commands::    All interactive user-commands of ECB
+
+Working with the keyboard in the ECB-windows
+
+* Navigation/Selection::        Keyboard navigation/selection in a tree-buffer
+* Incremental search::          Find nodes as fast as possible
+* Personal tree-keybindings::   Adding personal keybindings to a tree-buffer
+* Using popup-menus::           Using the popup-menus from keyboard.
+
+Using and customizing the ECB-Methods buffer
+
+* Visiting tags::               Possible actions after visiting a tag
+* Expanding::                   Explicit and automatic expanding
+* Customizing the display::     How to customize the Methods-buffer display
+* Rebuilding the Methods::      When to rebuild the Methods-buffer
+
+Applying filters to the special ECB-tree-buffers
+
+* Filtering Directories::       Applying filters to the Directories-buffer
+* Filtering Sources::           Applying filters to the Sources--buffer
+* Filtering History::           Applying filters to the History-buffer
+* Filtering Methods::           Applying filters to the Methods-buffer
+
+Changing, customizing, redrawing and creating layouts
+
+* Changing the ECB-layout::     How to change and customize the layout
+* Redrawing the ECB-layout::    How and when redrawing the layout
+* Changing window sizes::       Changing sizes of the ECB-windows
+* Fixing window sizes::         Fixing sizes of the ECB-windows
+* Creating a new ECB-layout::   Interactively creating new layouts
+
+Synchronization of the ECB-windows
+
+* General synchronization aspects::       General synchronization aspects
+* Synchronization of basic ECB-windows::  Synchronization of basic ECB-windows
+* Add-on synchronization::                Synchronization of add-on ECB-windows
+
+Customizing ECB
+
+* General aspects::             General aspects for customizing ECB
+* Most important options::      Which option you must know
+* Customizable options::        All customizable options of ECB
+
+General aspects for customizing ECB
+
+* setq or customize::           Should i use setq or customize?
+* Site-wide customizing::       Site-wide customizing of ECB
+
+All customizable options of ECB
+
+* ecb-general::                 General customizing ECB
+* ecb-tree-buffer::             Customizing the general tree layout
+* ecb-directories::             Customizing the ECB-directories-tree
+* ecb-sources::                 Customizing the ECB-sources-window
+* ecb-methods::                 Customizing the ECB-methods-window
+* ecb-history::                 Customizing the ECB-history-window
+* ecb-analyse::                 Customizing the ECB-analyse-window
+* ecb-layout::                  Customizing the ECB-layout
+* ecb-compilation::             Customizing the compile-window
+* ecb-create-layout::           Customizing options for creating layouts
+* ecb-face-options::            Customizing options for faces
+* ecb-faces::                   Customizing the faces
+* ecb-help::                    Customizing the online help of ECB
+* ecb-eshell::                  Customizing the eshell-integration
+* ecb-speedbar::                Customizing the speedbar-integration
+* ecb-non-semantic::            Customizing parsing non-semantic sources
+* ecb-winman::                  Customizing window-manager support
+* ecb-mode-line::               Customizing the tree-buffer-modelines
+* ecb-version-control::         Customizing the version-control-support
+
+Upgrading and downloading packages
+
+* Downloading new versions::    How to download newer versions of packages
+* Auto. option-upgrading::      ECB can auto. upgrade your options
+
+Automatic upgrading of options
+
+* User interface::              Options and commands you should know
+* Background information::      Maybe some interesting informations
+
+Handling of common use-cases
+
+* Changing faces::              Changing faces in the ECB tree-buffers
+* Small screens::               Working with small screens
+* Big screens::                 Working with big screens
+* Simulating speedbar::         Simulating speedbar without an extra frame
+* Integrating speedbar::        Integrating speedbar in the ECB-frame
+* Large directories::           Working with large directories
+* Remote directories::          Working with remote directories
+* Version-control support::     Supporting Version control systems
+* Using eshell::                Optimal using of eshell in ECB
+* Grepping directories::        Grepping directories with ECB
+* Working with JDEE::           Working best with ECB and JDEE
+* Compile-window on demand::    Displaying the compile-window on demand
+* Non-semantic sources::        Parsing and displaying non-semantic sources
+* Hide-show::                   Using hide-show from the methods-buffer-menu
+* Window-managers and ECB::     Support of several Emacs-window-managers
+
+Supporting Version control systems
+
+* Identifying backends::        How ECB identifies the VC-backend of a dir
+* Checking the state::          How ECB checks the VC-state of a file
+* Remote repositories::         What you should know about this
+* Refreshing the VC-state::     How to refresh when state changed outside
+* Adding new backends::         Necessary steps for adding new backends
+* Known VC-problems::           Currently known problems of the VC-support
+
+Entry points for Elisp programmers
+
+* List of variables::           Which variables an Elisp-program can use
+* List of hooks::               All available hooks
+* tree-buffer::                 Full description of the tree-buffer-library
+* Adviced functions::           How to deal with the adviced functions
+* The layout-engine::           Programming new layouts and special windows
+
+The library tree-buffer.el
+
+* Introduction::                General description of tree-buffers
+* A new tree-buffer::           How to create a new tree-buffer
+* A new tree-node::             How to add new tree-nodes to a tree-buffer
+* Updating a tree-buffer::      How to update a tree-buffer after changes
+* Tree-buffer keybindings::     Default and customizable keybindings
+* The tree-buffer-API::         All functions for tree-buffers and -nodes
+* Do not with tree-buffer::     Things which are strictly forbidden
+* Tree-buffer How to::          Dealing with special situations
+
+How to program new layouts and new special windows
+
+* Programming a new layout::    How to program a new layout
+* Programming special windows:: Aspects of programming special windows
+* Possible layout-outlines::    The wide range of possible layouts
+* The layout-engine API::       The complete layout-engine API
+
+Conflicts and bugs of ECB
+
+* Conflicts::                   Conflicts with other packages
+* Bugs::                        Known bugs
+
+
+File: ecb.info,  Node: Install and first steps,  Next: Overview,  Prev: Top,  Up: Top
+
+1 Installation and first steps of ECB
+*************************************
+
+This chapter describes how to install ECB and setup (X)Emacs correctly and
+what are the first steps after activation of ECB.
+
+* Menu:
+
+* Installation::                Installation of ECB
+* Setting up Emacs::            How to set up Emacs for file parsing with ECB
+* First steps::                 First steps after activating ECB first time
+
+
+File: ecb.info,  Node: Installation,  Next: Setting up Emacs,  Prev: Install and first steps,  Up: Install and first steps
+
+1.1 Installation of ECB
+=======================
+
+This section describes how to install ECB.
+
+* Menu:
+
+* Requirements::                Requirements for ECB
+* ECB as XEmacs-package::       Installation of ECB as a XEmacs-package
+* Standard ECB-Installation::   Standard installation of ECB for (X)Emacs
+
+
+File: ecb.info,  Node: Requirements,  Next: ECB as XEmacs-package,  Prev: Installation,  Up: Installation
+
+1.1.1 Requirements
+------------------
+
+This section describes the requirements of ECB. Just follow these steps and
+the requirements of ECB are fulfilled.
+
+  1. Emacs-version: ECB works only with (X)Emacs >= 21! If you have an older
+     one, please upgrade.
+
+  2. Install CEDET-suite: Get it from `http://cedet.sourceforge.net', read
+     the setup-instructions in `http://cedet.sourceforge.net/setup.shtml' and
+     read also the shipped file `INSTALL'.
+
+     *Please note*: ECB requires now a complete CEDET-installation! It will
+     not longer work with outdated separate packages semantic 1.4.X, eieio
+     0.X and speedbar 0.X!
+
+  3. Only for XEmacs-users: If you use XEmacs you must have installed the
+     package c-support (contains hideshow.el). If you want to read the
+     online-help of ECB in HTML-format you must have the library browse-url
+     (part of the mail-lib XEmacs package) installed; this package is also
+     needed for submitting problem-reports to the ECB-maintainers!
+
+  4. Optional for Java-coding: If Java code is edited the ECB works best when
+     the JDEE package ( `http://jdee.sourceforge.net') is installed.
+
+
+Do not install ECB before you have successfully installed the requirements!
+
+
+File: ecb.info,  Node: ECB as XEmacs-package,  Next: Standard ECB-Installation,  Prev: Requirements,  Up: Installation
+
+1.1.2 Installation of ECB as a XEmacs-package
+---------------------------------------------
+
+This section is only relevant for XEmacs-users!
+
+In previous versions of ECB XEmacs-users could use the
+package-management-system of XEmacs for first-time downloading/installing ECB
+or for upgrading to a newer version of ECB.
+
+Beginning with version 2.33 ECB does no longer support the old versions of
+semantic, eieio and speedbar not part of the CEDET-suite. ECB >= 2.33 requires
+fully installed CEDET-suite with version >= 1.0pre6. This one is not
+available as XEmacs-package. Therefore ECB can also not be run as
+XEmacs-package. If cedet will become a XEmacs-package then probably ECB will
+come back as XEmacs-package. But in the meanwhile you have to install ECB "by
+hand" as described in the next section (*note Standard ECB-Installation::).
+
+
+File: ecb.info,  Node: Standard ECB-Installation,  Prev: ECB as XEmacs-package,  Up: Installation
+
+1.1.3 Standard installation of ECB for (X)Emacs
+-----------------------------------------------
+
+Follow exatly these steps to install ECB:
+
+  1. Fulfill all requirements ECB needs (*note Requirements::)
+
+     ECB performs two autom checks:
+
+        - At load-time: It checks if cedet is at least installed so ECB can
+          be loaded. If not it reports an error.
+
+        - At start-time: It checks if the correct versions of cedet and
+          semantic are installed and gives you proper feedback.
+
+     So if you are not sure if you have installed the required packages at
+     all or if you have installed the correct versions of these packages then
+     do not worry about this, just go on with the following installation
+     steps: If ECB is missing something it will give you proper feedback and
+     support not later than at load-time or start-time!
+
+  2. Download and unpack the ECB archive (probably you have already done this
+     :-)
+
+  3. Add the new ECB-directory to your `load-path' variable.
+
+     You *MUST* add the ECB-install-directory to the `load-path' either by
+     changing the `load-path' variable directly in your `.emacs' or
+     `site-lisp/site-start.el' or by working with a file `subdirs.el'(1).
+
+     So for example the needed entry for your `.emacs'-file could be:
+
+        (add-to-list 'load-path
+                     "/path/to/your/ecb/installation/directory")
+
+     *ATTENTION*: ECB is NOT properly installed if it's directory is not
+     added to `load-path' and for example just loaded by
+
+        (load-file "/path/to/ecb/ecb.el")
+
+     Do not do this! It will not work!
+
+  4. Load ECB by adding code to your `.emacs':
+
+     If you want to load the complete ECB at (X)Emacs-loadtime (Advantage:
+     All ECB-options available after loading ECB. Disadvantage: Increasing
+     loadtime(2)):
+
+        (require 'ecb)
+
+     If you want to load the ECB first after starting it by `ecb-activate'
+     (Advantage: Fast loading(3).  Disadvantage: ECB- and semantic-options
+     first available after starting ECB):
+
+        (require 'ecb-autoloads)
+
+     This loads all available autoloads of ECB, e.g. `ecb-activate',
+     `ecb-minor-mode', `ecb-byte-compile' and `ecb-show-help'.
+
+     Regardless which method you prefer: In both cases the used statement
+     must be placed *after* the statement of step 3!
+
+  5. Restart (X)Emacs.
+
+ECB is now ready for use and can be activated by calling `M-x ecb-activate'
+or `ecb-minor-mode'. Now you can either starting using ECB or you can do
+these optional installation steps:
+
+  6. Reading the online help with `ecb-show-help'
+
+     Maybe you are interested to read the online-help of ECB before first
+     start.
+
+  7. Bytecompiling ECB with `ecb-byte-compile'
+
+     This byte compiles ECB. You can safely ignore all messages if there are
+     any. (You can also bytecompile ECB from the command-line either by using
+     the `Makefile' or by using the batch-file `make.bat'; just read the
+     comments in that file you choose.)
+
+  8. Installing the Info-help of ECB
+
+     The ECB distribution contains a subdirectory `info-help' which contains
+     the online-help of ECB in Info-format. You can install this online help
+     so it's available in the Top-directory of Info. There are two ways to do
+     this:
+
+        - Use "install-info" (recommended):
+
+            1. Copy the files of the subdirectory `info-help' into the
+               info-directory of Emacs
+
+            2. Install the file `info-help/ecb.info' with the command
+               "install-info" (if available on your system) in the `dir'-file.
+
+          The supplied `Makefile' offers a target `install-help' which does
+          both of these steps. You have just to call `make install-help' with
+          the correct EMACSINFOPATH set (see the comment in `Makefile'). Here
+          is an example:
+
+             make EMACSINFOPATH=/path/to/emacs/info install-help
+
+        - Manual Installation:
+
+          Copy the files of the subdirectory `info-help' into the
+          info-directory of Emacs and modify the file `dir' manually.
+
+     But it doesn't matter if you do not execute this step (8.) because the
+     online help of ECB is always available though, see `ecb-show-help'
+     (*note Interactive ECB commands::).
+
+
+---------- Footnotes ----------
+
+(1) This works at least for Emacs but XEmacs may have slightly different
+mechanisms; see the XEmacs documentation
+
+(2) Cause of full loading of ECB itself and also the packages semantic, eieio
+and speedbar regardless if ECB is started.
+
+(3) ECB, semantic, eieio and speedbar are first loaded after starting ECB or
+with other words: ECB and semantic are not loaded if you do not use/need them
+
+
+File: ecb.info,  Node: Setting up Emacs,  Next: First steps,  Prev: Installation,  Up: Install and first steps
+
+1.2 How to set up Emacs for file parsing with ECB
+=================================================
+
+*Please note*: Normally it should not necessary for you to bother with the
+following stuff unless you have problems getting ECB working correctly for
+you.
+
+* Menu:
+
+* General hints::               General hints for a correct setup
+* Setting up CEDET/semantic::   How to setup semantic correctly
+* Non-semantic files::          Setup for file types not supported by semantic
+
+
+File: ecb.info,  Node: General hints,  Next: Setting up CEDET/semantic,  Prev: Setting up Emacs,  Up: Setting up Emacs
+
+1.2.1 General hints for a correct setup
+---------------------------------------
+
+ECB is for browsing files and therefore you have to setup your
+Emacs-configuration properly so the file-parsing engines like semantic, imenu
+or etags can be activated automatically for parsing your Emacs-Lisp, C, C++ or
+Java buffers(1). For this Emacs must activate the correct `major-mode' for
+the source-files and Emacs can only do this if the option `auto-mode-alist'
+is setup correctly. The correct major-modes and possible file-extensions(2)
+are:
+
+LANGUAGE         MAJOR-MODE                              EXTENSION(S)
+Emacs Lisp       `emacs-lisp-mode'                       .el
+C                `c-mode'                                .h, .c
+C++              `c++-mode'                              .h, .hxx, .hh, .HH,
+                                                         .cxx, .cpp, .cc, .CC
+Java             `java-mode' or `jde-mode' (if you use   .java
+                 JDEE)                                   
+
+Example: If you want files with extension ".cpp" being c++-parsed by semantic
+and ECB, your `auto-mode-alist' must contain an entry like:
+
+   ("\\.cpp\\'" . c++-mode)
+
+After this ECB will correctly parse your ".cpp"-sources and display all the
+parsing information in the ECB-methods buffer.
+
+---------- Footnotes ----------
+
+(1) semantic supports some more "languages" like Phython, Makefiles and some
+more. But these are the most important ones.
+
+(2) Especially for C++ and C you can use any extension you want but these are
+the most common ones!
+
+
+File: ecb.info,  Node: Setting up CEDET/semantic,  Next: Non-semantic files,  Prev: General hints,  Up: Setting up Emacs
+
+1.2.2 Setting up CEDET/semantic
+-------------------------------
+
+To ensure ECB and semantic are working correctly for all by semantic
+supported languages you have to pay attention to the following aspects
+concerning your Emacs-setup:
+
+  1. Setting up CEDET/semantic itself
+
+     This section implies that you have already successfully installed the
+     CEDET-suite and describes how to setup cedet and here mainly semantic.
+
+     For all semantic-supported file-types parsing files is done completely
+     by semantic. ECB just displays the parsing results. For all needs of ECB
+     semantic is completely setup by ECB itself, i.e. ECB sets up semantic
+     for you!
+
+     *Please note*: Nevertheless you should read carefully the file `INSTALL'
+     shipped with the cedet-suite. In addition the CEDET-website offers a
+     link to a "Gentle introduction to Cedet". It's worth to read it!  You
+     find it here:
+     `http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html' If
+     CEDET is not correctly installed then ECB can not setup semantic for its
+     needs.
+
+     *Minimum setup recommendation*: It is very useful to enable the
+     `global-semantic-idle-scheduler-mode' and
+     `global-semanticdb-minor-mode'. Read the manual of cedet/semantic how to
+     do this. With CEDET-versions >= 1.0pre6 this can be done by adding
+     `semantic-load-enable-minimum-features' to your startup-file. Please read
+     also the subsection "Jumping to the definition of external types" in
+     *Note ECB Methods-window::.
+
+  2. Checking your hooks
+
+     If you have already checked point (1.) and if you have still problems
+     getting ECB/semantic working properly for your sources you should check
+     the related major-mode hook. Every major-mode X has a hook with name
+     "X-hook" which is evaluated after activating the major-mode (see above,
+     2.), e.g. the hook for the major-mode `c++-mode' is `c++-mode-hook'.
+
+     Semantic adds automatically during load-time a special "semantic-setup"
+     to these major-mode hooks(1) in form of a "setup-function". Example: For
+     c and c++ modes semantic adds `semantic-default-c-setup' to
+     `c-mode-hook' and `c++-mode-hook'.
+
+     If your own Emacs-setup (e.g. in `.emacs' or `site-lisp/site-start.el')
+     overwrites such a major-mode-hook then semantic can not be activated for
+     this major-mode and in consequence ECB can not work properly too!
+
+     Check if your Emacs-setup uses somewhere `setq' for adding code to a
+     major-mode-hook. *IMPORTANT*: Use `add-hook' instead of `setq'(2)!
+
+
+If your source-files are "running" with correct `major-mode' and correct
+major-mode hooks ECB and semantic will do what you expect them doing!
+
+---------- Footnotes ----------
+
+(1) Of course only for major-modes supported by semantic!
+
+(2) `setq' replaces/overwrites the current value of a hook with the new value
+whereas `add-hook' *adds* the new value to the old-value of the hook!
+
+
+File: ecb.info,  Node: Non-semantic files,  Prev: Setting up CEDET/semantic,  Up: Setting up Emacs
+
+1.2.3 Setup for file types not supported by semantic
+----------------------------------------------------
+
+From version 1.94 on ECB supports also parsing and displaying file-contents
+for file-types not supported by semantic (i.e. there is no semantic-grammar
+available for such file-types).
+
+Such non-semantic file-types can often be parsed by imenu and/or etags. Both
+of these parsing methods are now supported: ECB can display the results of
+imenu and/or etags in its Method-buffer. ECB uses for this speedbar-logic.
+Therefore the following speedbar options takes effect for this feature:
+
+   - `speedbar-dynamic-tags-function-list'
+
+   - `speedbar-tag-split-minimum-length'
+
+   - `speedbar-tag-regroup-maximum-length'
+
+   - `speedbar-tag-hierarchy-method'
+
+Normally there should be no need for you to bother with these options,
+because the default values are suitable for most situations! But if you are
+not satisfied with the parsing/display results then you can change some of
+these options.
+
+
+File: ecb.info,  Node: First steps,  Prev: Setting up Emacs,  Up: Install and first steps
+
+1.3 First steps after activating ECB first time
+===============================================
+
+This section of the ECB online-help is displayed automatically by ECB after
+activating ECB first time and describes what are the first basic steps:
+
+  1. Configure where ECB can find your sources:
+
+     Call `M-x customize-option RET ecb-source-path RET'(1). This lets you
+     customize the option `ecb-source-path' with the customize-feature of
+     Emacs. This opens a customize-buffer where you can insert all the
+     directories where ECB can find your source-files. Save your changes with
+     the button "Save for future sessions" and then throw away this
+     customize-buffer either by killing it with `M-x kill-buffer' or clicking
+     at the button "Finish".
+
+  2. Take a look at the most important options of ECB Call `M-x
+     ecb-customize-most-important RET' and see a list of options which you
+     should at least know that these options exist.
+
+  3. Read the online-help of ECB:
+
+     The online-help of ECB is available via
+
+        - calling `M-x ecb-show-help',
+
+        - pressing `C-c . h' or
+
+        - using the menu "ECB".
+
+     (The section you are currently reading is part of the online-help of ECB)
+
+     The chapter "Common use-cases" is also very interesting!
+
+  4. Start working with ECB.
+
+---------- Footnotes ----------
+
+(1) This means first hitting the keys `M' (Meta- or Alt-key) and `x'
+simultaneously, inserting "customize-option" in the minibuffer, hitting
+RETURN, inserting "ecb-source-path" in the minibuffer and finally hitting
+RETURN again
+
+
+File: ecb.info,  Node: Overview,  Next: Manual usage,  Prev: Install and first steps,  Up: Top
+
+2 Overview
+**********
+
+ECB is a global minor-mode which offers a couple of "ECB-windows" for
+browsing your sources comfortable with the mouse and the keyboard.
+
+ECB offers some basic ECB-windows to browse your sources:
+   - ECB-Directories for browsing directories
+
+   - ECB-Sources for browsing source-files and a file-history
+
+   - ECB-Methods for browsing the contents of a source
+
+See *Note Basic ECB-windows:: for a detailled description what these basic
+ECB-windows offer. See *Note ECB-windows:: for a general introduction in the
+ECB-window-concept of ECB.
+
+In addition to these "special" ECB-windows you have always an "edit-area"
+where you can edit your source-files. The edit-area can be divided into
+several "edit-windows" - as many as you need (*note The edit-area::). And at
+the bottom of the ECB-frame a persistent "compilation-window" (also called
+"compile-window") can be displayed (optional), where all the output of
+Emacs-compilation (compile, grep etc.) is shown (*note Temp- and
+compile-buffers::).
+
+The following "screenshot" illustrates the typical layout of the ECB-frame(1):
+
+   ------------------------------------------------------------------
+   |              |                                                 |
+   |  Directories |                                                 |
+   |              |                                                 |
+   |--------------|                                                 |
+   |              |                                                 |
+   |  Sources     |                                                 |
+   |              |                                                 |
+   |--------------|                   Edit-area                     |
+   |              |   (can be splitted in several edit-windows)     |
+   |  Methods     |                                                 |
+   |              |                                                 |
+   |--------------|                                                 |
+   |              |                                                 |
+   |  History     |                                                 |
+   |              |                                                 |
+   ------------------------------------------------------------------
+   |                                                                |
+   |            Persistent Compilation-window (optional)            |
+   |                                                                |
+   ------------------------------------------------------------------
+
+---------- Footnotes ----------
+
+(1) This is only one example of the layouts ECB offers, see *Note Changing
+the ECB-layout::
+
+
+File: ecb.info,  Node: Manual usage,  Next: ECB-windows,  Prev: Overview,  Up: Top
+
+3 How to use this manual
+************************
+
+*IMPORTANT*: You should have read the chapter *Note Overview:: before going
+on reading the current chapter.
+
+This chapter describes shortly the contents of the following chapters of this
+manual so maybe you can find faster what you are searching for.
+
+All ECB-windows of ECB (*note ECB-windows::)
+     Gives an introduction into the concept of ECB-windows of ECB, what they
+     are, which different types exist, how they look, how they can be used
+     and last but not least what they do in detail, i.e. explains every
+     ECB-window of ECB in detail.
+
+Activation and Deactivation (*note Activation and Deactivation::)
+     Describes how to activate and deactivate ECB and which different types
+     of activation are possible.
+
+Usage of ECB (*note Usage of ECB::)
+     Describes in detail how to use ECB with mouse and keyboard, explains the
+     concept of the edit-area and the persistent compile-window, describe how
+     to change the window-layout and hide and show special windows, which
+     stealthy background-tasks ECB performs and so on...
+
+Customizing ECB (*note Customizing::)
+     Gives an overview of the most important options of ECB and tell you
+     something about do's and don'ts concerning customization of ECB. Lists
+     all options of ECB and describe exactly the purpose of them.
+
+Submitting a problem report (*note Submitting problem report::)
+     Instructions what to do if you encounters problems with ECB.
+
+Upgrading and downloading ECB (*note Upgrading::)
+     Gives an introduction into the automatic option-upgrading-feature of ECB
+     and you can download and install a newer ECB-version from within ECB.
+
+Common use-cases (*note Common use-cases::)
+     How to deal with special situations and circumstances, so e.g. working
+     with big and small screens, working with large directories, using the
+     builtin version-control-support of ECB, parsing non-semantic-supported
+     sources like perl, using hide-show, working best with eshell and JDEE
+     and some window-managers of Emacs (like escreen or winring) and many
+     more...
+
+Entry points for Elisp programmers (*note Elisp programming::)
+     All informations needed by programmers when using some ECB-concepts from
+     within other elisp-libraries. This includes a full description how to
+     use the ECB-independent library tree-buffer.el. Lists also all available
+     hooks and describes with full working example how to program own layouts.
+
+Conflicts and bugs of ECB (*note Conflicts and bugs::)
+     Lists all currently known bugs and problems and gives well working
+     work-arounds.
+
+Frequently asked Questions (*note FAQ::)
+     Take a look...
+
+Command Index (*note Command Index::)
+     List of all interactive commands of ECB
+
+Option Index (*note Option Index::)
+     List of all user-customizable options of ECB
+
+Concept Index (*note Concept Index::)
+     List of all concepts introduced by ECB
+
+
+
+File: ecb.info,  Node: ECB-windows,  Next: Activation and Deactivation,  Prev: Manual usage,  Up: Top
+
+4 All ECB-windows of ECB
+************************
+
+ECB displays a number of informational windows that allow for easy source
+code navigation and overview. These informational windows are called
+"ECB-windows". Each ECB-window is displayed in its own special window/buffer
+which is dedicated and read-only.
+
+There are some "basic" ECB-windows (e.g. for browsing directories and
+sources) and some "add-on" ECB-windows for special purposes like displaying
+the definition of the current symbol under point. This chapter describes all
+ECB-windows of ECB in detail.
+
+* Menu:
+
+* Basic ECB-windows::           Description of the basic ECB-windows
+* Add-on ECB-windows::          Description of additional ECB-windows
+
+
+File: ecb.info,  Node: Basic ECB-windows,  Next: Add-on ECB-windows,  Prev: ECB-windows,  Up: ECB-windows
+
+4.1 The basic ECB-windows of ECB
+================================
+
+ECB offers basic ECB-windows for browsing directory-structures, files of a
+directory and contents of source-files (e.g. methods and variables). These
+basic ECB-windows are build from a special class of ECB-windows, called
+"tree-buffer". See *Note Tree-buffer basics:: for more details about the
+functionality of tree-buffers. See *Note Tree-buffer styles:: to get an
+impression about the look&feel of these tree-buffers.
+
+In the following subsections these basic ECB-windows of ECB will be explained
+in detail.
+
+* Menu:
+
+* Tree-buffer basics::          General introduction into tree-buffers
+* Tree-buffer styles::          Displaying the trees with different styles
+* ECB Directories-window::      Contents of the ECB Directories-window
+* ECB Sources-window::          Contents of the ECB Sources-window
+* ECB Methods-window::          Contents of the ECB Methods-window
+* ECB History-window::          Contents of the ECB History-window
+
+
+File: ecb.info,  Node: Tree-buffer basics,  Next: Tree-buffer styles,  Prev: Basic ECB-windows,  Up: Basic ECB-windows
+
+4.1.1 General introduction into tree-buffers
+--------------------------------------------
+
+4.1.1.1 Content and structure of a tree-buffer
+..............................................
+
+ECB displays most of its informations (e.g. about directory-structures or
+file-contents) in so called "tree-buffers" which means the display of such a
+tree-buffer is structured in a tree consisting of "tree-nodes". Every line in
+a tree-buffer displays exactly one tree-node. Each node can have any
+arbitrary number of "children"-nodes. If a tree-node has no children then it
+is called a "leaf".
+
+Each tree-buffer of ECB is displayed in an own special ECB-window/buffer
+which is read-only ie. not editable.
+
+The difference between a natural tree like a fir and an ECB-tree is that the
+root(-node) of a tree-buffer is not visible but only its children. In the
+example below the nodes parent-node-1 and parent-node-2 are the children of
+the invisible root-node.
+
+If a tree-node contains at least one child it is displayed with a special
+expand/collapse-symbol (see the example below). This symbol allows expanding
+(rsp. collapsing) the tree-node wheras expanding means to display the
+children-nodes and collapsing means to hide the childrens of a tree-node.
+
+Here is an example of a tree-buffer:
+
+   [+] parent-node-1  -------.
+   [-] parent-node-2  -------|
+       [-] expanded  --------|
+           leaf-node-1  -----|
+           leaf-node-2  -----|-----[tree-nodes]
+           leaf-node-3  -----|
+           leaf-node-4  -----|
+       [+] collapsed  -------“
+        |
+        `-----------------[expand/collapse-symbol]
+
+4.1.1.2 Possible actions for a tree-node
+........................................
+
+In most cases an action is triggered when clicking with the mouse onto a
+tree-node(1) (e.g. clicking onto "leaf-node-1" or "parent-node-1" in the
+example above). Which actions depends on the type of the tree-buffer. For
+example clicking on a tree-node in the ECB-sources-buffer (which is the name
+of a source-file) opens the relelated file in the edit-area of ECB (*note ECB
+Sources-window::) whereas clicking onto a node in the ECB-methods-buffer
+(which is the name of a tag in the current source-file displayed in the
+edit-area) "jumps" to the location of this tag in the source-buffer in the
+edit-area (*note ECB Methods-window::).
+
+Almost every ECB-window of ECB offers a special popup-menu when clicking with
+the right mouse-button (of course also possible via keyboard, see *Note Using
+the keyboard::) onto a tree-node (e.g. some senseful actions possible for
+directory-nodes like grepping this directory or performing version-control
+actions for this directory or something else).
+
+See *Note ECB Directories-window::, *Note ECB Sources-window::, *Note ECB
+Methods-window:: and *Note Add-on ECB-windows:: for a detailed description
+which actions are triggered and which popup-menus are offered in all the
+ECB-windows of ECB.
+
+4.1.1.3 Sticky parent-node for tree-buffers
+...........................................
+
+In the header-line (only for GNU Emacs) of a tree-buffer always the
+current-parent node of the first visible node is displayed (if there is a
+parent node). So a user always has a good overview to which parent a node
+belongs. This sticky node is exactly in the same manner clickable as all other
+nodes (see above).
+
+There is a option `ecb-tree-make-parent-node-sticky' which enabales/disables
+this feature (default is enabled).
+
+There is also an option `ecb-tree-stickynode-indent-string'. Normally there
+is no need to bother with this option but if you encounter alignment-problems
+with the sticky node in the headerline then take a look at this option,
+because it allows to fix the problem.
+
+This feature is only available for GNU Emacs >= 21.
+
+---------- Footnotes ----------
+
+(1) Of course using the keyboard is also possible, see *Note Using the
+keyboard::.
+
+
+File: ecb.info,  Node: Tree-buffer styles,  Next: ECB Directories-window,  Prev: Tree-buffer basics,  Up: Basic ECB-windows
+
+4.1.2 Displaying the trees with different styles
+------------------------------------------------
+
+ECB offers three different styles for the tree-buffers in the ECB-windows.
+Two of the styles are ascii-based and one style uses images for drawing the
+tree-structure.
+
+* Menu:
+
+* Style basics::                Basic knowledge about the styles
+* Ascii-based styles::          How to customize the ascii-styles
+* Tree-buffers with images::    Which images are used for the tree
+* Images for Methods-buffer::   Images for the tags in the Methods-buffer
+
+
+File: ecb.info,  Node: Style basics,  Next: Ascii-based styles,  Prev: Tree-buffer styles,  Up: Tree-buffer styles
+
+4.1.2.1 Basic knowledge about the styles
+........................................
+
+There are nine image-names which define the control- and guide-symbols to
+draw the tree. Here is the list of the allowed image-names and the related
+corresponding ascii-symbols:
+
+   - open ("[-]"): The control-symbol displayed for an opened tree-node which
+     has several subnodes. Clicking onto this control closes the node.
+
+   - close ("[+]"): The control-symbol displayed for a closed tree-node, i.e.
+     an expandable node with subnodes but all subnodes are hidden. Clicking
+     onto this control opened the node and displays its subnodes - if there
+     are any. If it has no subnodes the empty-symbol will be displayed.
+
+   - empty ("[x]"): The symbol displayed for an empty node. An empty node is a
+     node which could have subnodes but has currently none.
+
+   - leaf ("*"): The symbol displayed for a node which can not have any
+     subnodes so it is a "leaf" in the tree.
+
+   - guide (" |"): The symbol used for drawing vertical "guide-lines" for
+     opened nodes.  See the example below.
+
+   - no-guide ("  "): Sometimes invisible guide-lines are needed to draw the
+     tree.
+
+   - end-guide (" `"): The symbol used for the guide-line of the last subnode
+     of an opened node.
+
+   - handle ("-"): The symbol displayed before every subnode. Each handle is
+     connected to a guide-line - either a normal guide or an end-guide.
+
+   - no-handle (" "): An invisible handle.
+
+A tree will be build-up with these elements like follows:
+
+   [-] node-with-subnodes      (open)
+    |-[+] not-empty-subnode1   (guide+handle+close)
+    |-[x] empty-subnode        (guide+handle+empty)
+    `-[-] not-empty-subnode2   (end-guide+handle+open)
+       |-* leaf-1              (no-guide+no-handle+guide+handle+leaf)
+       `-* leaf-2              (no-guide+no-handle+end-guide+handle+leaf)
+
+
+File: ecb.info,  Node: Ascii-based styles,  Next: Tree-buffers with images,  Prev: Style basics,  Up: Tree-buffer styles
+
+4.1.2.2 How to customize the ascii-styles
+.........................................
+
+The ECB-option `ecb-tree-buffer-style' offers two different styles completely
+drawn with ascii-controls and -guides.
+
+Ascii-style with guide-lines (value `ascii-guides')(1):
+
+   [-] ECB
+    |  [+] code-save
+    `- [-] ecb-images
+        |  [-] directories
+        |   |  [-] height-15
+        |   |   |  * close.xpm
+        |   |   |  * empty.xpm
+        |   |   |  * leaf.xpm
+        |   |   `- * open.xpm
+        |   |  [+] height-17
+        |   |  [+] height-19
+        |   `- [+] height-21
+        |  [x] history
+        |  [x] methods
+        `- [x] sources
+
+Ascii-style without guide-lines (value `ascii-no-guides') - this is the style
+used by ECB <= 1.96:
+
+   [-] ECB
+       [+] code-save
+       [-] ecb-images
+           [-] directories
+               [-] height-15
+                   * close.xpm
+                   * empty.xpm
+                   * leaf.xpm
+                   * open.xpm
+               [+] height-17
+               [+] height-19
+               [+] height-21
+           [x] history
+           [x] methods
+           [x] sources
+
+The tree-layout of both ascii-styles can be affected with the options
+`ecb-tree-indent' and `ecb-tree-expand-symbol-before' (the examples above
+have set 4 for the former and true for the latter one).  For the guide-style
+the face and color of the guide- and handle-symbols can be customized with
+the option `ecb-tree-guide-line-face' (default is the equal-named face).
+
+---------- Footnotes ----------
+
+(1) For a better look&feel of such a tree-buffer ECB displays only the last
+subnode of an opened node with a handle!
+
+
+File: ecb.info,  Node: Tree-buffers with images,  Next: Images for Methods-buffer,  Prev: Ascii-based styles,  Up: Tree-buffer styles
+
+4.1.2.3 Which images are used for the tree
+..........................................
+
+Depending on the value of `ecb-tree-buffer-style' and the image-support of
+(X)Emacs, the tree-buffer try to use images instead of strings to draw a
+nice-looking tree.
+
+If images can and should be used then the option
+`ecb-tree-image-icons-directories' tells ECB where to search for suitable
+image-icons for each of the nine image-names (see above). An image is used
+for displaying a control with name "XXX" if one of the directories of
+`ecb-tree-image-icons-directories' contains an image-file with basename
+"ecb-XXX" and an extension which is supported by (X)Emacs. Currently
+supported extensions are ".xpm", ".png", ".gif", ".jpeg", ."jpg" and ".xbm".
+
+Example: To display the control with name "open" with a suitable image then
+one of the directories of `ecb-tree-image-icons-directories' must contain a
+file with name "ecb-open.xpm" or "ecb-open.png" etc. See the description of
+this option to get all important details how and in which sequence ECB
+searches the directories of `ecb-tree-image-icons-directories'.
+
+ECB comes with predefined default-images usable for every tree-buffer and
+special images for the Directories- and the Methods-tree-buffer.  They are
+defined in several different heights - so for the most senseful font-heights
+of a tree-buffer a fitting image-size should be available. The shipped images
+reside either in the subdirectory "ecb-images" of the ECB-installation or -
+if ECB is installed as regular XEmacs-package - in the ECB-etc data-directory
+(the directory returned by evaluating (locate-data-directory "ecb"). If you
+do not want to change the images then you normally have nothing to do because
+the default value of `ecb-tree-image-icons-directories' points already to the
+correct image-directories.
+
+A special remark for XEmacs:
+
+At least XEmacs 21.14 (but probably previous versions too) has a bug in its
+display-engine which prevents adjacent images to be displayed correctly. The
+effect is, that in a row of two or more adjacent images (e.g.
+end-guide+handle+open - see the tree-example above) always all images are
+masked by the last one, means only the last one is visible.  If at least one
+normal character (e.g. a space) is placed between two images then the images
+are displayed correctly. Therefore ECB has implemented the following
+work-around to get best possible results with XEmacs: open-, close-, empty-,
+leaf-, guide-, end-guide- and no-guide-images are displayed with images and
+the handle- and the no-handle-images are displayed with the corresponding
+ascii-symbols (which is "-" rsp. " "). The face (the color) of the
+handle-symbol is customizable via the option `ecb-tree-guide-line-face'.
+
+This bug is already reported to the XEmacs-team. If your XEmacs has fixed
+this bug then add the following to your `.emacs'-file (or whereever your
+emacs-setup is located):
+
+   (setq tree-buffer-enable-xemacs-image-bug-hack nil)
+
+Then ECB uses images without any special work-around with XEmacs too.  Just
+try it - if the tree-buffers look ugly then the XEmacs-bug is probably not
+fixed correctly.
+
+
+File: ecb.info,  Node: Images for Methods-buffer,  Prev: Tree-buffers with images,  Up: Tree-buffer styles
+
+4.1.2.4 Special images for the Methods-buffer
+.............................................
+
+ECB can display all the semantic-tags in the Method-buffer with special icons
+for methods, variables and classes - each of them with a different icon
+dependend of the protection of the tag. This feature can be disabled/enabled
+via the option `ecb-display-image-icons-for-semantic-tags'. All the special
+images are located in that directory where the option
+`ecb-tree-image-icons-directories' point to for methods.
+
+
+File: ecb.info,  Node: ECB Directories-window,  Next: ECB Sources-window,  Prev: Tree-buffer styles,  Up: Basic ECB-windows
+
+4.1.3 ECB Directories-window
+----------------------------
+
+The ECB directories interactor is for browsing directories. The direct
+children of the invisible root-node are called "source-path" and can be
+defined with the option `ecb-source-path'. Each source-path is the
+starting-node of the complete directory-structure below this path and can be
+browsed with the directories-interactor.
+
+When a sources ECB-window is contained in the current layout then per default
+only directories and subdirectories are displayed in the directories
+tree-buffer (the source-files are displayed in the sources tree-buffer - see
+*Note ECB Sources-window::) but this can be changed with the option
+`ecb-show-sources-in-directories-buffer'.
+
+4.1.3.1 Usage of the directories ECB-window
+...........................................
+
+   * Select directories (and - if enabled - source files) in the
+     "ECB-Directories" buffer by clicking a mouse button on the directory
+     name or by hitting RETURN when the cursor is placed on the item line,
+     see *Note Usage of ECB::.
+
+     IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+     while clicking with the primary mouse button (*note Using the mouse::)
+     or RETURN (*note Using the keyboard::)) on a directory node in the this
+     buffer then the directory-contents-cache for this directory will be
+     refreshed and actualized.
+
+   * Directory names with a "[+]" symbol after (or before) them can be
+     expanded/collapsed by clicking on the symbol, pressing the TAB key
+     (*note Using the keyboard::) when the cursor is placed on the package
+     line or clicking a mouse button on the item, see *Note Using the mouse::.
+
+   * Right clicking on an item will open a popup menu where different
+     operations on the item under the mouse cursor can be performed. This
+     popup-menu offers operations for version-control, dired, grep, some
+     file-operations like creating a directory and commands to make a
+     directory a source-path in the sense of `ecb-source-path'.
+
+   * Pressing F2 will open the ECB customization group (*note Customizing::)
+     in the edit window. F3 shows the online help in the edit-window.
+     Pressing F4 in the ECB-directories buffer will offer adding a new
+     source-path.
+
+When source-files-nodes are displayed in the directories-buffer (see
+`ecb-show-sources-in-directories-buffer') then for these nodes all
+descriptions of section *Note ECB Sources-window:: are valid.
+
+4.1.3.2 Activating/Displaying the directories ECB-window
+........................................................
+
+Either use one of the predefined layouts which contain the directories
+ECB-window (*note Changing the ECB-layout::) (e.g. via `C-c . l c') or create
+a new ecb-layout via the command `ecb-create-new-layout' and add a buffer of
+type "directories" into this new layout (*note Creating a new ECB-layout::).
+
+4.1.3.3 Customizing the directories ECB-window
+..............................................
+
+See *Note ecb-directories:: for a list of all options currently available for
+customizing this ECB-windows to your needs.
+
+
+File: ecb.info,  Node: ECB Sources-window,  Next: ECB Methods-window,  Prev: ECB Directories-window,  Up: Basic ECB-windows
+
+4.1.4 ECB Sources-window
+------------------------
+
+ECB offers a ECB-windows for displaying source-file-names of a certain
+directory: The sources-window. It displays all source-file names of the
+currently selected directory of the directories-ECB-window (*note ECB
+Directories-window::).
+
+The history-tree-buffer is a "flat" tree-buffers means all nodes are direct
+children of the invisible root-node and can not be expanded.
+
+4.1.4.1 Usage of the ECB-Sources-window
+.......................................
+
+   * Source files can be selected by clicking with the primary mouse button
+     (*note Using the mouse::) or hitting RETURN (*note Using the keyboard::)
+     on the source row in the "ECB-Sources"-window. The buffer of the selected
+     source-file will be displayed in an edit-window - which one depends on
+     the setting in `ecb-mouse-click-destination'.
+
+     IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+     clicking with the primary mouse button (*note Using the mouse::) or
+     RETURN (*note Using the keyboard::)) on a source row in the
+     ECB-Sources-windows then the source will not be displayed in an
+     edit-window but it will be scanned in the background and all its
+     contents (e.g. methods and variables) are listed in the "ECB
+     Methods"-window (*note ECB Methods-window::. So you can get an overlook
+     over the source without changing the buffer in the edit-window.
+
+   * Clicking on the source file with the secondary mouse button or C-RETURN
+     (*note Usage of ECB::) will open the source file in another edit window
+     - which one depends on the setting in `ecb-mouse-click-destination'.
+
+   * Right clicking on a source file (mouse-button 3) will open a popup menu
+     where different operation on the item under the mouse cursor can be
+     performed. This popup-menu offers operations for version-control, dired,
+     grep, filtering the file-names and some file-operations like deleting
+     the related file from disk.  In addition the ECB-Sources-window can be
+     maximized via the popup-menu
+
+
+4.1.4.2 Activating/Displaying the ECB-Sources-window
+....................................................
+
+Either use one of the predefined layouts which contain the sources ECB-window
+(*note Changing the ECB-layout::) (e.g. via `C-c . l c') or create a new
+ecb-layout via the command `ecb-create-new-layout' and add a buffer of type
+"sources" into this new layout (*note Creating a new ECB-layout::).
+
+4.1.4.3 Customizing the ECB-Sources-window
+..........................................
+
+See *Note ecb-sources:: for a list of all options currently available for
+customizing this ECB-window to your needs.
+
+
+File: ecb.info,  Node: ECB Methods-window,  Next: ECB History-window,  Prev: ECB Sources-window,  Up: Basic ECB-windows
+
+4.1.5 The ECB Methods-window
+----------------------------
+
+The "ECB-Methods" ECB-window contains all parsed and recognized tags of the
+current source-buffer. It is called "Method-buffer" because ECB is mostly
+designed for browsing sourcecode files and for programming-languages these
+tags are often methods (and variables etc.) To simplify explanations we talk
+in the following only about methods and variables - but in general the
+method-buffer can contain any kind of tags (e.g. sections and subsections for
+texinfo buffers).
+
+Per default the content of the methods-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (*note ECB-window synchronizing::).
+
+4.1.5.1 Usage of the methods ECB-window
+.......................................
+
+   * When a node (e.g. method or variable) is selected with the primary mouse
+     button (*note Using the mouse::) or RETURN (*note Using the keyboard::)
+     the buffer in the edit-window (which one depends on the setting in
+     `ecb-mouse-click-destination') will jump to the method/variable.
+
+     IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key
+     while clicking with the primary mouse button (*note Using the mouse::)
+     or RETURN (*note Using the keyboard::)) on a node in this buffer then
+     the edit-buffer will be narrowed to the selected tag (see also option
+     `ecb-tag-visit-post-actions'). But this works only for sources parsed by
+     semantic, not by imenu or etags!
+
+   * Clicking on a node with the secondary mouse button or C-RETURN (*note
+     Usage of ECB::) will jump to the method in another edit window - which
+     one depends on the setting in `ecb-mouse-click-destination'.
+
+   * Right clicking on a node will open a popup menu where different
+     operation on the item under the mouse cursor can be performed. The
+     popup-menu offers commands for filtering the displayed tree-nodes,
+     hiding/narrowing the related tags in the source-buffer and
+     expanding/collapsing one/all tree-nodes according to a certain
+     expansion-level.
+
+
+4.1.5.2 Activating/Displaying the methods ECB-window
+....................................................
+
+Either use one of the predefined layouts which contain the methods ECB-window
+(*note Changing the ECB-layout::) (e.g. via `C-c . l c') or create a new
+ecb-layout via the command `ecb-create-new-layout' and add a buffer of type
+"methods" into this new layout (*note Creating a new ECB-layout::).
+
+4.1.5.3 Synchronizing the Methods-window with current source-buffer
+...................................................................
+
+First a preliminary remark: Do not confuse this chapter with that
+synchronizing described in *Note ECB-window synchronizing::. The latter one
+describes the mechanism for synchronizing the ECB-windows when the
+current-buffer in the edit-area has been changed. This chapter describes how
+to synchronize the ECB-methods-window with the contents of the current-buffer
+if the buffer has been modified!
+
+Now lets start:
+
+Generally ECB calls semantic to get the list of tags for current source-file
+of current edit-window. Per default ECB does never automatically force a
+reparse of the source-file after this has been changed - this is only done on
+demand by calling the command `ecb-rebuild-methods-buffer'. So per default
+the idle-scheduler of semantic is responsible for reparsing the source-file
+when this is necessary (see `semantic-idle-scheduler-mode' for further
+details). So this scheduler is also repsonsible in turn for
+updating/sychronizing the methods-window with current buffer-contents. This is
+the most user-resonsible and therefore the recommended approach.
+
+So it's strongly recommended to enable `semantic-idle-scheduler-mode' or
+`global-semantic-idle-scheduler-mode' (*note Setting up CEDET/semantic::)
+because then reparsing is always done during idle-time of Emacs and - maybe
+even more important - it is also interruptable.
+
+But if this idle-scheduler is switched off then ECB offers now two
+possibilities (via `ecb-force-reparse-when-semantic-idle-scheduler-off'):
+
+   *  Not forcing itself a reparse when tags are needed by ECB: then a user
+     declines knowingly Emacs/semantic-driven parsing of code when he/she
+     switches off the idle-mode of semantic. This is the default behavior of
+     ECB and the default value of this option. But this has also the
+     consequence that the methods-buffer is only filed on demand via
+     `ecb-rebuild-methods-buffer' (bound to <C-c . r>)!
+
+     This means also in consequence that the methods-buffer is not
+     automatically filled when a source-file is opened but first on demand
+     after calling the command `ecb-rebuild-methods-buffer'!
+
+   *  Forcing a reparse when tags are needed: Then ECB forces semantic to
+     parse the source-file when ECB needs tags to display. For this behavior
+     this option has to be set to not nil.
+
+The term "forcing a reparse by semantic" is a simplification: ECB uses then
+the function `semantic-fetch-tags' which can decide that the cached tags are
+up-to-date so no real reparsing is necessary - but it can also run a full
+reparse and this reparse is not being done when Emacs is idle but immediatelly
+and not interruptable (as with the idle-scheduler of semantic), which can be
+quite annoying with big source-files.
+
+To make a long story short: It is strongly recommended to enable the
+`semantic-idle-scheduler-mode' or `global-semantic-idle-scheduler-mode'! See
+*Note Setting up CEDET/semantic::. This will give you in all cases the
+behavior you would expect of en IDE like ECB/semantic.
+
+4.1.5.4 Synchronizing with indirect buffers
+...........................................
+
+ECB works out of the box with indirect buffers, especially with indirect
+buffer clones created with the command `clone-indirect-buffer' (only
+available with GNU Emacs >= 21). They will be handled as all other buffers and
+you can work with them with no difference to "normal" buffers. With one
+exception:
+
+*Please note*: Cause of a bug in Emacs 22 (and maybe also in Emacs 23) the
+propagation of parsing informations from one buffer to all others which are
+in an indirect-buffer relation to the same base-buffer does currently not
+work.
+
+What does this mean: If you modify a buffer then Emacs propagates this change
+to all buffers with the same base-buffer. ECB/semantic recognize this change
+and do all necessary to automatically reparse the changed buffer (at least if
+you have customized semantic/ECB to do this). So far so good, but: If you
+switch to another buffer with the same base-buffer then you will notice that
+the methods-window of ECB still displays the contents before the change, ie.
+the need for a reparse has not been propagated to these other buffers. This is
+a bug in Emacs.
+
+What can you do: As long as this bug is not fixed there is no chance that all
+other affected "indirect-related" buffers will be reparsed automatically
+after modifying one of them. So you have to do this reparse "by hand" after
+switching to such an indirect-related buffer, but this is very simple: Just
+call the command `ecb-rebuild-methods-buffer' with prefix arg or hit <C-u C-c
+. r> (key this command is bound to).
+
+Lets make an example:
+
+  1.  Suppose we have a sourcefile test.java loaded as a buffer into Emacs and
+     suppose further we have created two indirect-buffer clones
+     test-clone1.java and test-clone2.java - all of these buffers point to
+     the same file: test.java.
+
+  2.  Now lets be the buffer test-clone1.java the current buffer and let us
+     modify it (e.g. adding a new method). If you have enabled the
+     idle-reparse mechanism of semantic (*note Setting up CEDET/semantic::)
+     then this buffer will be reparsed automatically and ECBs methods-window
+     will be updated in turn too.
+
+  3.  So far so good. But if you now switch to one of the two other buffers,
+     lets say to test.java, then you will notice that the change done in
+     test-clone1.java is also visible in the buffer test.java but the
+     ECB-methods-window for test.java will display the contents before the
+     change.  This is cause of the Emacs-bug described above.
+
+  4.  To update the methods-window for test.java to the new contents you have
+     to call `ecb-rebuild-methods-buffer' with prefix argument (ie.
+     clear-cache is true) or hitting <C-u C-c . r>. Note: Calling this
+     command without prefix argument is not enough!
+
+
+4.1.5.5 Jumping to the definition of external types
+...................................................
+
+There are two common types of "external" tags displayed in the method-window,
+mostly with object oriented programing-languages:
+
+  1. parent-types
+
+     Tags which represent the type of a parent-class (which can be defined in
+     the same file but which is more often defined in another file). All
+     parents (regardless if defined internaly or externaly) of a type will be
+     displayed under a bucket "[Parents]" in the methods-window of ECB.
+
+  2. "virtual" types
+
+     In OO-languages like CLOS, eieio and C++ there can be nodes with
+     type-tags in the method-buffer which are somehow virtual because there
+     is no definition in the current source-file. But such a virtual type
+     collects all its outside defined members like methods in C++ which are
+     defined in the `*.cc' file whereas the class-definition is defined in
+     the associated header-file.
+
+
+In both cases the user wants to jump to the definition of the type if he
+clicks onto the related node in the methods-window of ECB.
+
+Here is a C++-example for "virtual" types (2) and parent types (1) which
+explains this in detail:
+
+Let's say this class is defined in a file `ParentClass.h':
+
+   class ParentClass
+   {
+   protected:
+     int p;
+   };
+
+Let's say this class is defined in a file `ClassWithExternals.h'
+
+   #include "ParentClass.h"
+
+   class ClassWithExternals : public ParentClass
+   {
+   private:
+     int i;
+
+   public:
+     ClassWithExternals();
+     ~ClassWithExternals();
+   };
+
+Both the constructor and the destructor of the class "ClassWithExternals" are
+implemented in a file `ClassWithExternals.cc':
+
+   #include "test.h"
+
+   ClassWithExternals::ClassWithExternals(int i,
+                                          boolean b,
+                                          char c)
+   {
+     return;
+   }
+
+   void
+   ClassWithExternals::~ClassWithExternals()
+   {
+     return;
+   }
+
+ECB displays the contents of `ClassWithExternals.cc' in its methods-buffer
+like follows:
+
+   [-] [Includes]
+    `- test.h
+   [-] ClassWithExternals
+    |  +ClassWithExternals (+i:int, +b:class boolean, +c:char):ClassWithExternals
+    `- +~ClassWithExternals ():void
+
+Both the constructor and the destructor of the class "ClassWithExternals" are
+grouped under their class-type. But this class-type "ClassWithExternals" is
+represented by a so called "virtual" or "faux" node-tag, i.e. there is no
+real tag in the current source-buffer for this tag.
+
+If a user now clicks onto the node of "ClassWithExternals" then he wants to
+jump to the right location in the right file where "ClassWithExternals" is
+defined. ECB now uses now some smart mechanisms (see below) to do this. In
+case of success (means ECB has found the definition) it opens the right file
+and point will stay at beginning of the definition of the type
+"ClassWithExternals".
+
+The contents of `ClassWithExternals.h' are then displayed like follows:
+
+   [-] [Includes]
+    `- ParentClass.h
+   [-] ClassWithExternals:class
+    |  [-] [Parents]
+    |   `- ParentClass
+    |  [-] [Variables]
+    |   `- -i:int
+    |  +ClassWithExternals ():ClassWithExternals
+    |  +~ClassWithExternals ():void
+    `- [+] [Misc]
+
+Now let's play it again: Now we want to go to the definition of the
+parent-type "ParentClass" when we click onto the related node under the
+bucket "[Parents]". Again ECB uses its smartness to jump to the definition of
+the class "ParentClass" when you click onto the node "ParentClass".
+
+Now lets explain the precondition which must be fulfilled so ECB can do its
+job:
+
+   * Customizing the semantic analyzer for your needs
+
+     ECB itself is quite stupid concerning finding external tags. But it can
+     use the semantic-analyzer of the CEDET-suite (remember: The CEDET-suite
+     is a must-requirement of ECB, see *Note Requirements::). But this in
+     turn means that the semantic-analyzer must be customized in the right
+     way for the needs of your programing projects. Mainly this means
+     activating semanticdb and setting the correct include-path etc...
+
+     *Please note*: Read the related manuals of semantic and - strongly
+     recommended - read in addition the article "Gentle introduction to
+     Cedet".  It's worth to read it! The website of CEDET contains a link,
+     you find it here:
+     `http://xtalk.msk.su/~ott/en/writings/emacs-devenv/EmacsCedet.html'
+
+   * Customize the related options of ECB:
+
+     There is exactly one option you have to take into account:
+     `ecb-find-external-tag-functions'. This defines the method ECB uses to
+     find these external tags.
+
+     Mostly there is nothing to do because the default values should do a
+     good job.  But if things are running bad then maybe this is the right
+     screw for you.
+
+     Finding such external types can be very complex and there are several
+     roads to success. ECB uses per default methods based on the
+     semantic-analyzer. But this option allows to define own find-functions
+     and tell ECB to uses them.
+
+     This functionality is set on a major-mode base, i.e. for every
+     major-mode a different setting can be used. ECB first performs all
+     find-functions defined for current major-mode (if any) anf then all
+     find-functions defined for the special symbol 'default (if any).
+
+     ECB offers some predefined senseful finding-functions. Currently there
+     are:
+
+        - `ecb-search-tag-by-semantic-analyzer': The most powerfil one, based
+          on the semantic-analyzer
+
+        - `ecb-search-tag-by-semanticdb': A backup for the first one
+
+        - `ecb-jde-show-class-source': For major-mode `jde-mode' when coding
+          in java, uses java-mechanisms - maybe for java the best choice.
+
+     See the documentation of the option and also of these function for
+     details how they work and how to write own finding-functions.
+
+
+4.1.5.6 Customizing the methods ECB-window
+..........................................
+
+See *Note ecb-methods:: for a list of all options currently available for
+customizing this ECB-window to your needs.
+
+
+File: ecb.info,  Node: ECB History-window,  Prev: ECB Methods-window,  Up: Basic ECB-windows
+
+4.1.6 The ECB History-window
+----------------------------
+
+ECB offers a ECB-windows for displaying a history of currently open or
+recently closed source-buffers, regardless of the directory the related file
+belongs to.
+
+Contrary to the ECB-sources-window the ECB-History-window can be flat but
+needn't. Another difference to the ECB-sources window is that the History
+displays not filenames but buffer-names for buffers which are either directly
+related to a file or which are indirect-buffers with a base-buffer which is
+related to a file. For a description of the indirect-buffer concept see the
+Emacs manual (see command `clone-indirect-buffer' or `make-indirect-buffer'
+for XEmacs).
+
+*Please note*: The History of ECB is not meant to be a full replacement for
+the Buffers-menu of (X)Emacs! It only displays buffers which are related to a
+file (either directly or via indirect-buffer). All non-file-related buffers
+(e.g. *Help*, *grep* etc.) will never be displayed in the ECB-History-window!
+
+4.1.6.1 Usage of the ECB-History-window
+.......................................
+
+   * Buffers in the history can be selected by clicking with the primary
+     mouse button (*note Using the mouse::) or hitting RETURN (*note Using
+     the keyboard::) on the buffername-node in the "ECB-History"-window. The
+     buffer of the selected buffer-name will be displayed in an edit-window -
+     which one depends on the setting in `ecb-mouse-click-destination'.
+
+     IMPORTANT: If you use the POWER-click (i.e. hold down the SHIFT-key while
+     clicking with the primary mouse button (*note Using the mouse::) or
+     RETURN (*note Using the keyboard::)) on a node in the ECB-History-window
+     then the related buffer will not be displayed in an edit-window but it
+     will be scanned in the background and all its contents (e.g. methods and
+     variables) are listed in the "ECB Methods"-window (*note ECB
+     Methods-window::. So you can get an overlook over the buffer-contents
+     without changing the buffer in the edit-window.
+
+   * Clicking on a buffername-node with the secondary mouse button or
+     C-RETURN (*note Usage of ECB::) will open the buffer in another edit
+     window - which one depends on the setting in
+     `ecb-mouse-click-destination'.
+
+   * Right clicking on a buffername-node (mouse-button 3) will open a popup
+     menu where different operation on the item under the mouse cursor can be
+     performed.  This popup-menu offers operations for version-control,
+     dired, grep, filtering the buffernames and some file-operations like
+     deleting the related file from disk. In addition the ECB-History-window
+     can be maximized or the bucketizing type (s.b. "Bucketizing the
+     history") can be changed on the fly via popup-menu.
+
+
+4.1.6.2 Activating/Displaying the ECB-History-window
+....................................................
+
+Either use one of the predefined layouts which contain the ECB-History-window
+(*note Changing the ECB-layout::) (e.g. via `C-c . l c') or create a new
+ecb-layout via the command `ecb-create-new-layout' and add a buffer of type
+"history" into this new layout (*note Creating a new ECB-layout::).
+
+4.1.6.3 Dead buffers in the history
+...................................
+
+You can customize if ECB should remove the related buffername-node from the
+history-window after killing a buffer. This is done with the option
+`ecb-kill-buffer-clears-history'. See the documentation of this option for
+the possible choices. If you decide that ECB should *not* remove the related
+buffername-node then this is named a "dead" buffer in the history-window. It
+is displayed with a special face (see `ecb-history-dead-buffer-face'),
+default is a kind of grey.
+
+You can use such a dead-buffer-node in the history as all other
+buffername-nodes: ECB will reopen the related file in a buffer and perform the
+action you have choosen (see above section "Usage of the ECB-History-window").
+
+4.1.6.4 Indirect buffers in the history
+.......................................
+
+You can work with indirect buffers as well with direct buffers. See the
+(X)Emacs manual for an introduction for indirect buffers (e.g. see the command
+`clone-indirect-buffer' for GNU Emacs).
+
+Indirect buffers are displayed with the face
+`ecb-history-indirect-buffer-face', default is an italic outline.
+
+There is an option `ecb-history-stick-indirect-buffers-to-basebuffer' which
+allows to customize how ECB displays indirect buffers in the history-window:
+
+If this option is `nil' then indirect-buffers are treated as
+non-indirect-buffers and sorted into the history-buffer-sequence according to
+the setting of `ecb-history-sort-method'. Then the history contains something
+like this:
+
+   <base-buffer BB>
+   <indirect-buffer 1 of BB>
+   <indirect-buffer 2 of BB>
+   <indirect-buffer 3 of BB>
+
+If not nil then indirect-buffers are always sticked to their base-buffer, ie.
+the base-buffer is displayed as expandable node with all its indirect-buffers
+as children-nodes, so the history contains something like:
+
+   [-] <base-buffer BB>
+    |  <indirect-buffer 1 of BB>
+    |  <indirect-buffer 2 of BB>
+    `- <indirect-buffer 3 of BB>
+
+Here the buffer with name "<base-buffer BB>" has three indirect-buffers which
+are display as childrens of their base-buffer.
+
+4.1.6.5 Bucketizing the history
+...............................
+
+ECB can display the history-contents "flat" or it can display buckets to
+bucketize the contens according to certain criterias. This is done with the
+option `ecb-history-make-buckets'. It allows bucketizing according to the
+directory, the file-extension, the major-mode or a list of regular expression
+- see the documentation of this option for details.
+
+Here is an example for a history-window bucketized according to the major-mode
+of the related buffers:
+
+   [-] [c++-mode]
+    |  headerfile-1.h
+    |  headerfile-2.h
+    |  codefile-1.cc
+    `- codefile-2.cc
+   [-] [emacs-lisp-mode]
+    |  elisp-buffer-1.el
+    |  elisp-buffer-1.el
+    `- elisp-buffer-1.el
+   [-] [makefile-mode]
+    `- Makefile
+   [-] [java-mode]
+    |  java-buffer-1.java
+    `- java-buffer-2.java
+
+*Please note*: If `ecb-history-make-buckets' is nil then this is interpreted
+as an empty list of regular-expressions and the history is display with
+exactly one bucket. Use the value 'never if you want the? contents of the
+history-window to be displayed "flat"!
+
+You can change the bucketizing type on the fly via the popup-menu of the
+history-window.
+
+4.1.6.6 Customizing the ECB-History-window
+..........................................
+
+See *Note ecb-history:: for a list of all options currently available for
+customizing this ECB-windows to your needs.
+
+
+File: ecb.info,  Node: Add-on ECB-windows,  Prev: Basic ECB-windows,  Up: ECB-windows
+
+4.2 Add-on ECB-windows of ECB
+=============================
+
+This chapter gives detailled informations about available add-on ECB-windows.
+This includes basic desciptions what they do as well as how to use them.
+
+* Menu:
+
+* Semantic analyser::           Analyses and displays semantic context
+* Symboldefinition::            Displays definition of current symbol
+
+
+File: ecb.info,  Node: Semantic analyser,  Next: Symboldefinition,  Prev: Add-on ECB-windows,  Up: Add-on ECB-windows
+
+4.2.1 Displaying the current semantic context via analyser
+----------------------------------------------------------
+
+The CEDET-suite contains the "semantic analyzer"(1) which is a library tool
+that performs context analysis and can derive useful information.
+
+Please see the related node in the info-manual of cedet/semantic for more
+detailed informations about this tool and how to setup it for best performance
+for your project needs.
+
+The semantic-analyzer output can be used through a special ECB-window. This
+interface lists details about the analysis, such as the current function,
+local arguments and variables, details on the prefix (the symbol the cursor is
+on), and a list of all possible completions (see
+`semantic-analyze-possible-completions' for more details about completions
+available via the semantic-analyser).
+
+The analyser-ECB-window is of type tree-buffer. See *Note Tree-buffer
+basics:: for basic informations how to use such a tree-buffer.
+
+4.2.1.1 Usage of the analyser-ECB-window
+........................................
+
+   * When a node-name in the "Context"-bucket is selected with the primary
+     mouse button (*note Using the mouse::) or RETURN (*note Using the
+     keyboard::) the buffer in the edit-window (which one depends on the
+     setting in `ecb-mouse-click-destination') will jump to the related
+     entry. For strongly typed languages, this means you will jump to the
+     definition of the variable, slot, or type definition.
+
+   * Clicking on a node-name in the "Context"-bucket with the secondary mouse
+     button or C-RETURN (*note Usage of ECB::) will jump to the related entry
+     in another edit window - which one depends on the setting in
+     `ecb-mouse-click-destination'.
+
+   * If you click on a node-name in the "Completions"-bucket, then the text
+     that was recently analyzed will be replaced with the name of the tag
+     that was clicked on in the analyser-ECB-window.
+
+   * Right clicking with the mouse (or with the keyboard, see *Note Using
+     popup-menus::) onto a tree-node opens a popup-menu which allows to
+     display additional (if available) informations to the current node.
+
+4.2.1.2 Synchronizing the analyse-window
+........................................
+
+Per default the content of the analyser-ECB-window is automatically
+synchronized and updated with current point of the current source-buffer in
+the edit-area (see `ecb-analyse-buffer-sync' and most notably
+`ecb-analyse-buffer-sync-delay') and *Note ECB-window synchronizing::).
+
+In contrary to the sync-options of the basic ECB-windows(2) the default
+synchronisation delay of the ECB-analyse-window is quite high: 2 seconds (see
+`ecb-analyse-buffer-sync').
+
+What is the reason for this: a small value like 0.25 as for the basic windows
+would make the analyse-window quite unusable because then more or less after
+each type (depends on how fast you are typing) the analyse window would be
+synchronized with current point, which can be really annoying when there would
+be hundreds of completions for the current point.
+
+Imagine the following scenario: programming in emacs-lisp, typing
+   (e
+and then you make a short break, just a moment, but immediately ECB would call
+the semantic-analyzer to analyse the current context for possible completions
+(a.o.). You can imagine that there are even thousands of possible function
+completions in emacs-lisp which beginns with "e". Getting all these and
+displaying them in the analyse-window can take some time! Of course the whole
+stuff is interruptable by any key-press so ECB will not be blocked but
+nevertheless the will be a noticeable break in your typing.
+
+Therefore it is strongly recommended to choose one of the following
+possibilities:
+
+   * Automatic synchronizing with long delay
+
+     Set `ecb-analyse-buffer-sync-delay' to a value which is suitable for your
+     programing and typing style, default is already to seconds.
+
+   * Manually synchronizing on demand
+
+       1. Switch off the automatic synchronizing for the ECB-analyse-window
+          by setting the option `ecb-analyse-buffer-sync' to nil. Use always
+          customize for this, never setq!
+
+       2. Bind the command `ecb-analyse-buffer-sync' to a conveniant shortcut
+
+       3. Synchronize the analyse-window exactly then when you need the
+          context informations for current point (e.g. possible local
+          variables or completions).
+
+          But note that semantic already offers some intellisense commands
+          which can help you on demand too! See the documentation of the
+          semantic analyzer.
+
+
+4.2.1.3 Interactive commands of the analyser-ECB-window
+.......................................................
+
+ECB offers the following commands for the analyser-ECB-window:
+
+   - `ecb-analyse-buffer-sync'
+
+   - `ecb-goto-window-analyse'
+
+   - `ecb-maximize-window-analyse'
+
+See *Note Interactive ECB commands:: for details about these commands.
+
+4.2.1.4 Activating/Displaying the analyser-ECB-window
+.....................................................
+
+Either use one of the predefined layouts "left-analyse" or
+"leftright-analyse" (e.g. via `C-c . l c') or create a new ecb-layout via the
+command `ecb-create-new-layout' and add a buffer of type "other" and name
+"analyse" into this new layout (*note Creating a new ECB-layout::).
+
+4.2.1.5 Customizing the analyser ECB-window
+...........................................
+
+See *Note ecb-analyse:: for a list of all options currently available for
+customizing this ECB-window to your needs.
+
+---------- Footnotes ----------
+
+(1) Note that ECB uses analyser (with s) whereas semantic uses analyzer (with
+z).
+
+(2) see *Note Basic ECB-windows:: and the options `ecb-basic-buffer-sync' and
+`ecb-basic-buffer-sync-delay'.
+
+
+File: ecb.info,  Node: Symboldefinition,  Prev: Semantic analyser,  Up: Add-on ECB-windows
+
+4.2.2 Displaying the definition of the current symbol under point
+-----------------------------------------------------------------
+
+
+File: ecb.info,  Node: Activation and Deactivation,  Next: Usage of ECB,  Prev: ECB-windows,  Up: Top
+
+5 Activation and Deactivation
+*****************************
+
+This chapter describes all aspects of activating and deactivating ECB.
+
+* Menu:
+
+* Standard activation::         How to manually (de)activate ECB
+* Automatic activation::        Automatically (de)activating ECB
+
+*IMPORTANT*: Regardless of the activation-type (standard or automatic) the
+activation-process of ECB is always completely failure-save. This means any
+error during any step of the activation-process forces a complete cleanup
+(e.g. removing hooks, disabling advices etc.) of all settings ECB did (e.g.
+adding hooks, activating advices etc.) until the failure. Therefore if
+ECB-activation stops cause of a failure then you can be sure that your Emacs
+has the same state as before the ECB-activation-start!
+
+
+File: ecb.info,  Node: Standard activation,  Next: Automatic activation,  Prev: Activation and Deactivation,  Up: Activation and Deactivation
+
+5.1 Standard activation and deactivation
+========================================
+
+Call `M-x ecb-activate' and `M-x ecb-deactivate' to activate or deactivate
+ECB(1). If you want ECB started in a new frame see the option
+`ecb-new-ecb-frame' (default is nil).  `ecb-activate' always raises and
+selects the ECB-frame even if ECB is already started.
+
+Because ECB is a global minor-mode it can also be (de)activated/toggled by
+`M-x ecb-minor-mode'.
+
+The following sequence of hooks is evaluated during activation of ECB:
+  1. `ecb-before-activate-hook'
+
+  2. <All actions for activation but no layout drawing>
+
+  3. `ecb-activate-before-layout-draw-hook'
+
+  4. `ecb-redraw-layout-before-hook'
+
+  5. <Drawing the layout>
+
+  6. `ecb-redraw-layout-after-hook'
+
+  7. `ecb-activate-hook'
+
+The following sequence of hooks is evaluated during deactivation of ECB:
+  1. `ecb-before-deactivate-hook'
+
+  2. <All actions for deactivation of ECB>
+
+  3. `ecb-deactivate-hook'
+
+---------- Footnotes ----------
+
+(1) Activation is also possible via the menu "Tools -> Start Code Browser
+(ECB)".
+
+
+File: ecb.info,  Node: Automatic activation,  Prev: Standard activation,  Up: Activation and Deactivation
+
+5.2 Automatic activation and deactivation
+=========================================
+
+There are two ways for auto. (de)activation ECB after Emacs-start and for
+different window-configurations.
+
+`ecb-auto-activate'
+     This option is for auto. activating ECB after Emacs-startup. Set this to
+     not nil and ECB will automatically be started after Emacs comes up.
+
+`window-manager support'
+     The window-manager support of ECB deactivates ECB when going to another
+     window-configuration and reactivates ECB when coming back to the
+     ECB-window-configuration. For all details about this see *Note
+     Window-managers and ECB::.
+
+
+File: ecb.info,  Node: Usage of ECB,  Next: Customizing,  Prev: Activation and Deactivation,  Up: Top
+
+6 Usage of ECB
+**************
+
+This chapter describes in a detailed manner all aspects of using the Emacs
+Code Browser.
+
+* Menu:
+
+* Using the mouse::             Working with the mouse
+* Using the keyboard::          Working with the keyboard
+* The edit-area::               How to use the edit-area
+* Temp- and compile-buffers::   Displaying temp- and compilation-buffers
+* The other window::            How the ``other window'' is determined
+* The Methods buffer::          Using and customizing the Methods-buffer
+* Filtering the tree-buffers::  Applying filters to the ECB-tree-buffers
+* The ECB-layout::              Changing, customizing, redrawing, creating
+* Hiding the ECB windows::      Hiding/Showing the ECB-windows
+* Maximizing the ECB windows::  Maximizing the ECB-windows
+* Back/forward navigation::     Back- and forward navigation like a browser
+* ECB-window synchronizing::    Auto./manual synchronizing the ECB-windows
+* Stealthy background tasks::   Stealthy background-tasks of ECB
+* Interactive ECB commands::    All interactive user-commands of ECB
+
+
+File: ecb.info,  Node: Using the mouse,  Next: Using the keyboard,  Prev: Usage of ECB,  Up: Usage of ECB
+
+6.1 Working with the mouse in the ECB-windows
+=============================================
+
+Normally you get best usage if you use ECB with a mouse. ECB distinguishes
+between a "primary" and a "secondary" mouse-button.
+
+With the option `ecb-primary-secondary-mouse-buttons' the following
+combinations of primary and secondary mouse-buttons are possible:
+
+   - primary: mouse-2, secondary: C-mouse-2(1). This is the default.
+
+   - primary: mouse-1, secondary: C-mouse-1
+
+   - primary: mouse-1, secondary: mouse-2
+
+If you change this during ECB is activated you must deactivate and activate
+ECB again to take effect.
+
+6.1.1 The primary mouse-button
+------------------------------
+
+A click with the primary button causes the main effect in each ECB-buffer:
+
+   - ECB Directories: Expanding/collapsing nodes and displaying files in the
+     ECB-Sources buffer.
+
+   - ECB sources/history: Opening the file in that edit-window specified by
+     the option `ecb-mouse-click-destination'.
+
+   - ECB Methods: Jumping to the method in that edit-window specified by the
+     option `ecb-mouse-click-destination'.
+
+6.1.2 The POWER- or SHIFT-click
+-------------------------------
+
+A click with the primary mouse-button while the SHIFT-key is pressed is
+called the POWER-click and does the following (depending on the ECB-buffer
+where the POWER-click occurs):
+
+   - ECB Directory: Refreshing the directory-contents-cache (see
+     `ecb-cache-directory-contents').
+
+   - ECB sources/history: Only displaying the source-contents in the
+     method-buffer but not displaying the source-file in an edit-window. This
+     means it opens the clicked source only in the background and shows all
+     its methods/variables in ECB-Methods; the buffer of the edit-window is
+     not changed! This is very useful to get only an overlook for a certain
+     source.
+
+   - ECB Methods: Narrowing to the clicked method/variable/ect... (see
+     `ecb-tag-visit-post-actions'). But this works only for sources parsed by
+     semantic, not by imenu or etags!
+
+Per default the complete node-name of an item in a tree-buffer is displayed in
+the echo-area if the mouse moves over it, regardless if the related window is
+the active one or not. You get the same effect always after a POWER-click. In
+general: For each tree-buffer there is an option `ecb-*-show-node-info'
+(replace "*" with directories, sources, methods, history or analyse, e.g.
+`ecb-directories-show-node-info' is the option for the
+ECB-directories-window.): you can specify in a detailed manner for the named
+ECB tree-buffer when and which node-info should be displayed in the
+minibuffer.
+
+6.1.3 The secondary mouse-button
+--------------------------------
+
+The secondary mouse-button is for opening (jumping to) the file in another
+edit-window (see the documentation of the option
+`ecb-mouse-click-destination').
+
+6.1.4 The right mouse-button
+----------------------------
+
+In each ECB-buffer mouse-3 (= right button) opens a special context
+popup-menu for the clicked item where you can choose several senseful actions.
+
+With the options `ecb-directories-menu-user-extension',
+`ecb-sources-menu-user-extension', `ecb-methods-menu-user-extension' and
+`ecb-history-menu-user-extension' you can add statically new commands to the
+popup-menus. See the docstring of `ecb-directories-menu-user-extension' for
+more details.
+
+With the options `ecb-directories-menu-user-extension-function',
+`ecb-sources-menu-user-extension-function',
+`ecb-methods-menu-user-extension-function' and
+`ecb-history-menu-user-extension-function' you can add new commands to the
+popup-menus in a dynamic manner. See the docstring of
+`ecb-directories-menu-user-extension-function' for more details.
+
+With the options `ecb-directories-menu-sorter', `ecb-sources-menu-sorter',
+`ecb-methods-menu-sorter' and `ecb-history-menu-sorter' you can even
+re-arrange all the entries of the popup-menus.
+
+6.1.5 Horizontal scrolling with the mouse
+-----------------------------------------
+
+In each tree-buffer of ECB you can easily scroll left and right with the
+mouse if the option `ecb-tree-easy-hor-scroll' is not `nil'.
+
+The reason for this is: XEmacs has horizontal scroll-bars so invisible parts
+beyond the right window-border of a tree-buffer can always made visible very
+easy.
+
+GNU Emacs does not have hor. scroll-bars so especially with the mouse it is
+quite impossible to scroll smoothly right and left. The functions
+`scroll-left' and `scroll-right' can be annoying and are also not bound to
+mouse-buttons.
+
+ECB offers three ways for smoothly hor. scrolling with GNU Emacs if
+`ecb-tree-easy-hor-scroll' is a positive integer-value S:
+
+   * In all ECB-tree-buffers the keys `M-mouse-1' and `M-mouse-3' are bound
+     to scrolling left rsp. right with scroll-step S.
+
+   * Clicking with mouse-1 or mouse-2 onto the edge of the modeline has the
+     same effect, i.e. if you click with mouse-1 onto the left \(resp right)
+     edge of the modeline you will scroll left \(resp. right) with
+     scroll-step S.
+
+   * Additionally `C-M-mouse-1' and `C-M-mouse-3' are bound to scrolling left
+     rsp. right with scroll-step `window-width' - 2.
+
+This is NOT done for XEmacs cause of its horizontal scrollbars. If you want
+scrolling left and right with the mouse in XEmacs then activate the
+horizontal scrollbars.
+
+---------- Footnotes ----------
+
+(1) means mouse-2 while CTRL-key is pressed.
+
+
+File: ecb.info,  Node: Using the keyboard,  Next: The edit-area,  Prev: Using the mouse,  Up: Usage of ECB
+
+6.2 Working with the keyboard in the ECB-windows
+================================================
+
+ECB offers the `ecb-mode-map' which binds the most important functions of ECB
+to keys so you can easily use ECB in every window(1) without a mouse.
+
+IMPORTANT: Do not modify `ecb-mode-map' directly! The option `ecb-key-map'
+defines all ECB keybindings, including a common prefix-key (This is by
+default `C-c .'). If there are conflicts with other minor-modes or packages
+you can define very easy another prefix. Please read carefully the
+description of `ecb-key-map' (*note ecb-general::).!
+
+The following sections describe special topics about using the keyboard in
+the ECB-tree-buffers:
+
+* Menu:
+
+* Navigation/Selection::        Keyboard navigation/selection in a tree-buffer
+* Incremental search::          Find nodes as fast as possible
+* Personal tree-keybindings::   Adding personal keybindings to a tree-buffer
+* Using popup-menus::           Using the popup-menus from keyboard.
+
+---------- Footnotes ----------
+
+(1) Regardless if a tree-window or an edit-window
+
+
+File: ecb.info,  Node: Navigation/Selection,  Next: Incremental search,  Prev: Using the keyboard,  Up: Using the keyboard
+
+6.2.1 Navigation and Selection in a tree-buffer
+-----------------------------------------------
+
+In the ECB-buffers RETURN and TAB are the most important keys:
+
+   * RETURN does the same as the primary button and C-RETURN does the same as
+     the secondary button. S-RETURN is the same as the SHIFT-click or
+     POWER-click. The terms "primary", "secondary", "SHIFT-" and
+     "POWER-click" are explained in *Note Using the mouse::. See also the
+     option `ecb-tree-do-not-leave-window-after-select' and the function
+     `ecb-toggle-do-not-leave-window-after-select' which is bound to `C-t' in
+     each tree-buffer of ECB!
+
+     For all RETURN (and S-RETURN and C-RETURN) hits the position of the
+     point within the current node-line is irrelevant! This is for
+     conveniance.
+
+   * TAB always expands or collapses expandable nodes.
+
+The RETURN and TAB keys can not be (re)defined with `ecb-key-map'!
+
+If you set `ecb-tree-navigation-by-arrow' to not nil then the arrow keys work
+in the ECB tree-window in the following smart way:
+
+   * Left-arrow: If node is expanded then it will be collapsed otherwise
+     (i.e. current node is either not expandable or not expanded) point jumps
+     to the next "higher" node in the hierarchical tree (higher means the
+     next higher level or - if no higher level available - the next higher
+     node on the same level).
+
+   * Right-arrow: If node is expandable but not expanded then it will be
+     expanded. Otherwise (i.e. current node is either not expandable or
+     already expanded) point jumps to the next following node (which is the
+     first subnode in case of an already expanded node or simply the next
+     node in the following line).
+
+   * Up- and down-arrow: Point jumps to the first character of the previous
+     (up) rsp. next node (down). "First" character means either the first
+     character of the expand-symbol (in case `ecb-tree-expand-symbol-before'
+     is not nil) or of the displayed node-name. Or with other words: The
+     first non-indentation and non-guide-line (see `ecb-tree-buffer-style')
+     character of a node (*note Tree-buffer styles::).
+
+
+File: ecb.info,  Node: Incremental search,  Next: Personal tree-keybindings,  Prev: Navigation/Selection,  Up: Using the keyboard
+
+6.2.2 Incremental search for a node in current tree-buffer
+----------------------------------------------------------
+
+Each display-able key (e.g. all keys normally bound to `self-insert-command')
+is appended to the current search-pattern. The tree-buffer tries to jump to
+the first node which matching the current search-pattern either as substring
+or as prefix (see below). If no match is found then nothing is done. There
+are some special keys:
+
+   * `backspace' and `delete': Delete the last character from the
+     search-pattern.
+
+   * `home': Delete the complete search-pattern
+
+   * `end': Expand either to a complete node if current search-pattern is
+     already unique or expands to the greatest common substring or prefix of
+     the nodes. If there are at least two nodes with the same greatest
+     common-prefix than every hit of `end' jumps to the next node with this
+     common prefix.
+
+For better overlooking the current search-pattern is shown in the echo area.
+After selecting a node with RET the search-pattern is cleared out. With
+`ecb-tree-incremental-search' you can specify if the current search-pattern
+must be a real prefix of the node (default) or if any substring is matched.
+
+For faster and easier finding the right node in a ecb-window the incremental
+search ignores the following non interesting stuff:
+
+   - any leading spaces
+
+   - expand/collapse-buttons: [+] rsp. [-]
+
+   - protection-signs (+, -, #) in the method-window if uml-notation is used
+
+   - variables types or return-types in front of variable- or method-names.
+
+   - const specifier for variables
+
+This means: Just type in the prefix (rsp. a substring) of a class-,
+variable-, method-, directory- or filename and ECB will bring you as fast as
+possible to the node you want. Incremental node-search uses the value of
+`case-fold-search'.
+
+Tip: The `ecb-minor-mode' offers you in the `ecb-mode-map' (customizable via
+`ecb-key-map') some keys for selecting every window of the ecb-frame. This
+makes window-selection a child“s play. For example you can jump into the
+method-window by hitting `C-c . gm'.
+
+
+File: ecb.info,  Node: Personal tree-keybindings,  Next: Using popup-menus,  Prev: Incremental search,  Up: Using the keyboard
+
+6.2.3 Adding personal keybindings for the tree-buffers
+------------------------------------------------------
+
+There are five hooks which can be used for adding personal keybindings to the
+ECB tree-buffers:
+
+   - `ecb-common-tree-buffer-after-create-hook'
+
+   - `ecb-directories-buffer-after-create-hook'
+
+   - `ecb-sources-buffer-after-create-hook'
+
+   - `ecb-methods-buffer-after-create-hook'
+
+   - `ecb-history-buffer-after-create-hook'
+
+These hooks are called directly after tree-buffer creation so they can be
+used to add personal local keybindings(1) either to all tree-buffers
+(`ecb-common-tree-buffer-after-create-hook') or just to a certain
+tree-buffer. Here is a list which keys MUST NOT be rebound:
+
+   * `RET' and all combinations with `Shift' and `Ctrl': Used for selecting
+     nodes in all tree-buffers.
+
+   * `TAB': Used for expanding/collapsing nodes in all tree-buffers.
+
+   * `C-t': Used for toggling "do not leave window after selection" in all
+     tree-buffers, see command `ecb-toggle-do-not-leave-window-after-select'.
+
+   * All self-inserting characters: Used for easy and fast navigation in all
+     tree-buffers, *Note Incremental search::.
+
+   * `F2', `F3', `F4': Used for customizing ECB, adding source-path in the
+     directories buffer.
+
+The following example binds `C-a' to some useful code in ALL tree-buffers and
+`C-d' to even more useful code ONLY in the directories buffer:
+
+   (add-hook 'ecb-common-tree-buffer-after-create-hook
+             (lambda ()
+                (local-set-key (kbd "C-a")
+                               (lambda ()
+                                  (interactive)
+                                  (message "ECB is great!")))))
+
+   (add-hook 'ecb-directories-buffer-after-create-hook
+             (lambda ()
+                (local-set-key (kbd "C-d")
+                               (lambda ()
+                                  (interactive)
+                                  (message "ECB is wonderful!")))))
+
+---------- Footnotes ----------
+
+(1) To be more general: They can be used to run any arbitrary lisp code after
+a tree-buffer creation!
+
+
+File: ecb.info,  Node: Using popup-menus,  Prev: Personal tree-keybindings,  Up: Using the keyboard
+
+6.2.4 Using the popup-menu of a tree-buffer from keyboard.
+----------------------------------------------------------
+
+A popup-menu of a tree-buffer can be activated from keyboard with the command
+`tree-buffer-show-menu-keyboard' which is bound to `M-m' in every
+tree-buffer. How the popup-menu is displayed depends if this command is
+called with a prefix-argument or not:
+
+If called without a prefix-arg then the popup-menu is displayed graphically
+as if it would be activated via mouse (for GNU Emacs this works perfectly but
+for XEmacs there is a bug which results in a wrong menu-position - but the
+menu itself works also with XEmacs).
+
+If called with a prefix-arg (`C-u M-m') then the popup-menu is displayed with
+the tmm-mechanism (like the Emacs-[menu-bar] is displayed when `tmm-menubar'
+is called). This tmm-display is only available for GNU Emacs.
+
+
+File: ecb.info,  Node: The edit-area,  Next: Temp- and compile-buffers,  Prev: Using the keyboard,  Up: Usage of ECB
+
+6.3 Working with the edit-window(s) of the edit-area
+====================================================
+
+ECB offers you all what you need to work with the edit-area as if the
+edit-windows of the edit-area would be the only windows of the ECB-frame.
+
+ECB advices the following user-commands so they work best with ECB:
+
+   - `balance-windows'
+
+   - `delete-other-windows'
+
+   - `delete-window'
+
+   - `delete-windows-on'
+
+   - `display-buffer'
+
+   - `shrink-window-if-larger-than-buffer'
+
+   - `split-window'
+
+   - `split-window-horizontally'
+
+   - `split-window-vertically'
+
+   - `switch-to-buffer'
+
+   - `switch-to-buffer-other-window'
+
+   - `other-window'
+
+   - `other-window-for-scrolling'
+
+The behavior of the adviced functions is (slightly simplified):
+
+   * All these adviced functions behaves exactly like their corresponding
+     original functions but they always act as if the edit-window(s) of ECB
+     would be the only window(s) of the ECB-frame. So the edit-window(s) of
+     ECB seems to be a normal Emacs-frame to the user. This means that you
+     can split and delete edit-windows without any restriction - ECB ensures
+     that neither the special ECB-windows nor the compile-window will be
+     damaged.
+
+   * If there is a persistent compile-window (*note Temp- and
+     compile-buffers::) then all compilation-buffers in the sense of
+     `ecb-compilation-buffer-p' will be displayed in the compile-window.
+
+   * If called in another frame than the ECB-frame these functions behave
+     exactly like the not adviced original versions!
+
+*Please note*: All these advices are only enabled when ECB is enabled.
+
+Another interesting option in the context of the edit-window and these
+adviced functions is `ecb-layout-always-operate-in-edit-window'!
+
+6.3.1 Documentation of the adviced window functions
+---------------------------------------------------
+
+This section describes for every adviced window function (s.a.) how it
+differs from the original version. Only the differences are mentioned, so if
+you want the full documentation of such a function call `describe-function'
+or `C-h f'.
+
+ -- Command: other-window ARG &optional ALL-FRAMES
+     Around-advice `ecb': The ECB-version of `other-window'.  Works exactly
+     like the original function with the following ECB-adjustment: The
+     behavior depends on `ecb-other-window-behavior'.
+
+ -- Command: delete-window &optional WINDOW
+     Around-advice `ecb': The ECB-version of `delete-window'.  Works exactly
+     like the original function with the following ECB-adjustment:
+
+     If optional argument WINDOW is nil (i.e. probably called interactively):
+     If called in a splitted edit-window then it works like as if all the
+     edit-windows would be the only windows in the frame.  This means the
+     current edit-window which contains the point will be destroyed and its
+     place will be occupied from another one. If called in an unsplitted
+     edit-window then nothing is done. If called in the compile-window of ECB
+     then the compile-window will be hidden (like with
+     `ecb-toggle-compile-window'). If called in an ecb-window of the current
+     ECB-layout there are two alternatives:
+
+        * If the function is contained in
+          `ecb-layout-always-operate-in-edit-window' the right edit-window is
+          selected (depends on the value of the option
+          `ecb-mouse-click-destination') and does then it“s job.
+
+        * Otherwise the behavior depends on the value of the option
+          `ecb-advice-window-functions-signal-error'.
+
+     If optional argument WINDOW is a living window (i.e. called from
+     program): If WINDOW is an edit-window then this window is deleted, if
+     WINDOW is the compile-window then it will be hidden and otherwise the
+     behavior depends on `ecb-advice-window-functions-signal-error'.
+
+ -- Command: delete-other-windows &optional WINDOW
+     Around-advice `ecb': The ECB-version of `delete-other-windows'. Works
+     exactly like the original function with the following ECB-adjustment:
+
+     If optional argument WINDOW is nil (i.e. probably called interactively):
+     If called in a splitted edit-window then it works like as if all the
+     edit-windows would be the only windows in the frame.  This means all
+     other edit-windows besides the current edit-window which contains the
+     point will be destroyed and the current edit-window fills the whole
+     edit-area. Neither the special ecb-windows nor the compile-window will
+     be destroyed!
+
+        * If called in an unsplitted edit-window then either the
+          compile-window will be hidden (if there is one) otherwise nothing
+          is done.
+
+        * If called in one of the ecb-windows then the current one is
+          maximized, i.e. the other ecb-windows (not the edit-windows!) are
+          deleted.
+
+        * If called in the compile window there are two alternatives:
+
+             - If the function is contained in
+               `ecb-layout-always-operate-in-edit-window' the right
+               edit-window is selected (depends on the value of the option
+               `ecb-mouse-click-destination') and then it does it“s job.
+
+             - Otherwise the behavior depends on the value of the option
+               `ecb-advice-window-functions-signal-error'.
+
+     If optional argument WINDOW is a living window (i.e. called from
+     program): If WINDOW is an edit-window then this window is maximized
+     (i.e. the other edit-window is deleted) if there are more at least 2
+     edit-windows otherwise the compile-window is deleted (if there is one).
+     If WINDOW is an ecb-window then only the other ecb-windows are deleted
+     and in all other cases the behavior depends on
+     `ecb-advice-window-functions-signal-error'.
+
+ -- Command: delete-windows-on BUFFER &optional FRAME
+     Around-advice `ecb': The ECB-version of `delete-windows-on'.  Works
+     exactly like the original function with the following ECB-adjustment:
+
+     An error is reported if BUFFER is an ECB-tree-buffer. These windows are
+     not allowed to be deleted.
+
+ -- Command: split-window &optional WINDOW SIZE HORFLAG
+     Around-advice `ecb': The ECB-version of `split-window'.  Works exactly
+     like the original function with the following ECB-adjustment:
+
+     If called for a not-edit-window in the `ecb-frame' it stops with an
+     error if `split-window' is not contained in the option
+     `ecb-layout-always-operate-in-edit-window'! Besides this (e.g.  called
+     for a window in another frame than the `ecb-frame') it behaves like the
+     original version.
+
+ -- Command: split-window-horizontally
+     Around-advice `ecb': The ECB-version of `split-window-horizontally'.
+     Works exactly like the original function with the following
+     ECB-adjustment:
+
+     If called in any other window of the current ECB-layout it stops with an
+     error if this `split-window-horizontally' is not contained in the option
+     `ecb-layout-always-operate-in-edit-window'!
+
+ -- Command: split-window-vertically
+     Around-advice `ecb': The ECB-version of `split-window-vertically'. Works
+     exactly like the original function with the following ECB-adjustment:
+
+     If called in any other window of the current ECB-layout it stops with an
+     error if this `split-window-vertically' is not contained in the option
+     `ecb-layout-always-operate-in-edit-window'!
+
+ -- Command: display-buffer BUFFER &optional NOT-THIS-WINDOW FRAME
+     Around-advice `ecb': Makes this function compatible with ECB if called
+     in or for the ecb-frame. It displays all buffers which are
+     "compilation-buffers" in the sense of `ecb-compilation-buffer-p' in the
+     compile-window of ECB. If the compile-window is temporally hidden then
+     it will be displayed first.
+
+     If there is no compile-window (`ecb-compile-window-height' is nil) then
+     it splits the edit-window if unsplitted and displays BUFFER in another
+     edit-window but only if `pop-up-windows' is not nil (otherwise the
+     edit-window will not be splitted).
+
+     All buffers which are not "compilation-buffers" in the sense of
+     `ecb-compilation-buffer-p' will be displayed in one of the edit-area and
+     `display-buffer' behaves as if the edit-windows would be the only
+     windows in the frame.
+
+     If BUFFER is contained in `special-display-buffer-names' or matches
+     `special-display-regexps' then `special-display-function' will be called
+     (if not nil). But this behavior depends on the value of the option
+     `ecb-ignore-special-display'. The values of `same-window-buffer-names'
+     and `same-window-regexps' are supported as well.
+
+     See the option `ecb-ignore-display-buffer-function'!
+
+     If called for other frames it works like the original version.
+
+ -- Command: switch-to-buffer BUFFER &optional NORECORD
+     Around-advice `ecb': The ECB-version of `switch-to-buffer'.  Works
+     exactly like the original but with the following enhancements for ECB:
+
+     "compilation-buffers" in the sense of `ecb-compilation-buffer-p' will be
+     displayed always in the compile-window of ECB (if
+     `ecb-compile-window-height' is not nil) - if the compile-window is
+     temporally hidden then it will be displayed first. If you do not want
+     this you have to modify the options `ecb-compilation-buffer-names',
+     `ecb-compilation-major-modes' or `ecb-compilation-predicates'.
+
+     If called for non "compilation-buffers" (s.a.) from outside the
+     edit-area of ECB it behaves as if called from an edit-window if
+     `switch-to-buffer' is contained in the option
+     `ecb-layout-always-operate-in-edit-window'. Otherwise an error is
+     reported.
+
+ -- Command: switch-to-buffer-other-window BUFFER &optional FRAME
+     Around-advice `ecb': The ECB-version of `switch-to-buffer-other-window'.
+     Works exactly like the original but with some adaptions for ECB so this
+     function works in a "natural" way:
+
+     If called in any special ecb-window of the current ECB-layout then it
+     goes always to an edit-window (which one depends on the setting in
+     `ecb-mouse-click-destination') and then goes on as if called from this
+     edit-window.
+
+     If a compile-window is used (i.e. `ecb-compile-window-height' is not
+     nil) then "compilation-buffers" in the sense of
+     `ecb-compilation-buffer-p' are always displayed in the compile-window.
+     If the compile-window is temporally hidden then it will be displayed
+     first. If no compile-window is used it behaves like the original.
+
+     If called from within the compile-window then "compilation-buffers" will
+     be displayed still there and all other buffers are displayed in one of
+     the edit-windows - if the destination-buffer is already displayed in one
+     of the edit-windows then this one is used otherwise it behaves like the
+     original.
+
+     If called within an edit-window it behaves like the original function
+     except for compilation-buffers (if a compile-window is used, see above).
+
+ -- Function: other-window-for-scrolling
+     Around-advice `ecb': This function determines the window which is
+     scrolled if any of the "other-window-scrolling-functions" is called
+     (e.g. `scroll-other-window'):
+
+     If the option `ecb-scroll-other-window-scrolls-compile-window' is not
+     nil (maybe set by `ecb-toggle-scroll-other-window-scrolls-compile') and a
+     compile-window is visible then always the current buffer in the
+     compile-window is scrolled!
+
+     Otherwise it depends completely on the setting in
+     `ecb-other-window-behavior'.
+
+ -- Command: balance-windows
+     Around-advice `ecb': When called in the `ecb-frame' then only the
+     edit-windows are balanced.
+
+
+File: ecb.info,  Node: Temp- and compile-buffers,  Next: The other window,  Prev: The edit-area,  Up: Usage of ECB
+
+6.4 Temp- and compile-buffers display in ECB
+============================================
+
+If you call any help in Emacs, e.g. by calling `describe-function', or if you
+do a completion in the minibuffer, then Emacs displays the result-buffer in
+another window. This behavior you have also in ECB.
+
+6.4.1 Standard Emacs behavior
+-----------------------------
+
+6.4.1.1 Gnu Emacs 21.x, 22.x and XEmacs 21.4:
+.............................................
+
+If the edit-area is already splitted into at least two edit-windows then the
+temp-buffer is displayed in another edit-window otherwise the edit-area will
+be splitted first vertically into two edit-windows, one above the other. The
+variables `temp-buffer-max-height' and `temp-buffer-resize-mode' (for GNU
+Emacs) and `temp-buffer-shrink-to-fit' (for XEmacs) work also correctly with
+ECB.
+
+Same for all completion-buffer and "compile"-like output-buffers (e.g. after
+a `compile' or `grep') and the variable `compilation-window-height'(1).
+
+6.4.1.2 Gnu Emacs 23.x
+......................
+
+Gnu Emacs 23 has a much smarter window-manager for displaying temporary
+buffers (like help-buffers) and "compile"-buffers (like real compilation
+outputs but also grep-outputs, completions etc.). Therefore ECB uses
+completely the logic of Emacs 23 and does exactly what Emacs 23 would do
+without activated ECB: This means mainly that the split-behavior depends on
+the settings of the options `split-width-threshold' and
+`split-height-threshold'.
+
+*Please note*: If you are wondering why displaying temporary-buffers (like
+help, compile, grep, completion etc.) shows different behavior compared to
+deactivated ECB, then you probably have to adjust the values of the options
+`split-width-threshold' and `split-height-threshold' to the sizes of the
+edit-area of ECB (at least nearly).
+
+This is default behavior of ECB. But there is also another way to display
+such buffers: Using a persistent extra window at the bottom of the ECB-frame,
+named the "compile-window":
+
+6.4.2 Using a persistent compile window
+---------------------------------------
+
+With the option `ecb-compile-window-height' you can define if the ECB layout
+should contain per default a compile-window at the bottom (just specify the
+number of lines which should be used for the compile-window at the bottom of
+the frame). If "yes" ECB displays all buffers for which the function
+`ecb-compilation-buffer-p' returns not nil (e.g. all output of
+compilation-mode (compile, grep etc.) or all temp-buffers like
+*Help*-buffers) in this special window.
+
+In general: With the options `ecb-compilation-buffer-names',
+`ecb-compilation-major-modes' and `ecb-compilation-predicates' you can define
+which buffers should be displayed in the compile-window of ECB (for example
+if you call `switch-to-buffer' or `display-buffer' or if you run `compile' or
+if you display *Help*-buffers). Per default these are all temp-buffers like
+*Help*-buffers, all compile- and grep buffers, *Occur*-buffers etc. See the
+default values of these options.
+
+With the command `ecb-toggle-compile-window' (bound to `C-c .  \') you can
+toggle the visibility of the compile-window (*note Interactive ECB
+commands::).
+
+There are some more useful options and commands related to the compile-window
+of ECB (to see all options for the compile-window see the customization group
+*Note ecb-compilation::):
+
+   * With the option `ecb-compile-window-temporally-enlarge' you can allow
+     Emacs to enlarge temporally the ECB-compile-window in some situations.
+     Please read the comment of this option. See also the description of the
+     command `ecb-toggle-compile-window-height'.
+
+   * With the option `ecb-enlarged-compilation-window-max-height' you specify
+     how `ecb-toggle-compile-window-height' should enlarge the compile-window.
+
+   * With the command `ecb-cycle-through-compilation-buffers' (*note
+     Interactive ECB commands::) you can cycle through all current open
+     compilation-buffers (in the sense of `ecb-compilation-buffer-p') very
+     fast.
+
+ECB offers the same compile-window functionality regardless if the ECB-window
+are hidden or not. The state of the compile-window will be preserved when
+toggling the ecb-windows or when maximizing one ecb-windows! So you have the
+advantage of one special window for all help-, grep or compile-output (see
+above) also when the ecb-windows are hidden - a window which will not be
+deleted if you call `delete-other-windows' (bound to `C-x 1') for one of the
+edit-windows. In general: All features of the compile-window work with hidden
+ecb-windows exactly as when the ecb-windows are visible.
+
+6.4.3 What to do if there are problems with the compile-window
+--------------------------------------------------------------
+
+Normally displaying temp- and compilation-buffers (or more general:
+displaying buffer for which `ecb-compilation-buffer-p' is not nil) should
+work reliable. But if there are problems which you can not handle with the
+options `ecb-compilation-buffer-names', `ecb-compilation-major-modes' or
+`ecb-compilation-predicates' then please go on like follows:
+
+  1. Set the option `ecb-layout-debug-mode' to not nil.
+
+  2. Reproduce the wrong behavior exactly by repeating all the operations
+     which lead to the problem. If possible then restart Emacs before
+     reproducing the problem so you can begin from the beginning!
+
+  3. Now send immediately a bug report with `ecb-submit-problem-report'.
+
+  4. Set `ecb-layout-debug-mode' back to nil if you do not want further
+     debugging output in the *Messages* buffer"
+
+6.4.4 Handling special-display-buffers
+--------------------------------------
+
+Emacs offers three options for a special-display-handling of certain buffers:
+`special-display-function', `special-display-buffer-names' and
+`special-display-regexps' (see the Emacs manual for a description of these
+options). ECB offers an option `ecb-ignore-special-display' for specification
+in which situations ECB should take account for the values of these
+special-display-options.
+
+Default-behavior of ECB is to ignore these special-display-options when a
+persistent compile-window is active (i.e.  `ecb-compile-window-height' is not
+nil). But with `ecb-ignore-special-display' you can tell ECB, that either
+always the special-display-options should be ignored as long as ECB is active
+or that they should be never igored regardless if a persistent compile-window
+is set or not. In the latter case using `display-buffer' or `pop-to-buffer'
+takes always account for the values of these options - like the original
+behavior of Emacs.
+
+---------- Footnotes ----------
+
+(1) It goes without saying that is is also true for `grep-window-height' and
+all other "compile"-modes.
+
+
+File: ecb.info,  Node: The other window,  Next: The Methods buffer,  Prev: Temp- and compile-buffers,  Up: Usage of ECB
+
+6.5 How the "other window" is determined by ECB
+===============================================
+
+Normally all windows in an Emacs-frame are arranged in a cyclic order and
+window-selecting-commands like `other-window' or window-scrolling-commands
+like `scroll-other-window' choose simply the next(1) window after the current
+window as "other window".
+
+6.5.1 "Other window"-basics in ECB
+----------------------------------
+
+With a typical window-layout of ECB such a cyclic order of *all* windows in
+the ECB-frame does not make sense because it would be not very intuitive and
+against that what the user wants to "say" when calling `other-window' or
+`scroll-other-window'.
+
+Therefore ECB divides the whole set of windows of the ECB-frame in several
+subsets:
+
+   * The edit-windows of the edit-area
+
+   * The special tree-windows for browsing-tasks
+
+   * The compile-window at the bottom (if there is one)
+
+   * The minibuffer-window of the ECB-frame (if active)
+
+Each of these subsets will be treated as a cyclic ordered subset, i.e.  all
+windows in each of these subsets are ordered as the function `walk-windows'
+would visit the windows when the windows of a subset would be the only
+windows of a frame(2).
+
+6.5.2 Builtin "other window" behaviors of ECB
+---------------------------------------------
+
+ECB now offers to specify the behavior of commands like `other-window' or
+`scroll-other-window' within the ECB-frame. This can be done with the option
+`ecb-other-window-behavior'. This option offers several builtin behaviors:
+
+   * All windows of the ECB-frame are considered
+
+     ECB will cycle through all windows of the ECB-frame or scroll simply the
+     next window in the ECB-frame, means it behaves like the original
+     `other-window' rsp. the original `other-window-for-scrolling'.
+
+   * Only the windows of the edit-area are considered
+
+     ECB will only cycle through the edit-windows of ECB or only scroll
+     another edit-window. If the selected window is not an edit-window then
+     all windows are taken into account.
+
+   * The edit-windows and the compile-window are considered
+
+     Like above but the compile-window will be added to the subset of the
+     edit-windows.
+
+   * Behave as smart and intuitive as possible
+
+     This is the default behavior of ECB. ECB tries to choose the
+     `other-window'-destination or the "other window" to scroll in a smart
+     and intuitive way: If point is in one of the edit-windows and if the
+     edit-area is splitted then always the "next" edit-window is choosen
+     (whereas the next edit-window of the last edit-window is the first
+     edit-window)- if the edit-area is unsplitted then the compile-window is
+     used if there is one. In the context of an `other-window'-call the ARG
+     of `other-window' will be taken into account.
+
+     If one of the special ecb-windows is selected then always the "next"
+     ecb-window is choosen (whereas the next ecb-window of the last
+     ecb-window is the first ecb-window). In the context of an
+     `other-window'-call the ARG of `other-window' will be taken into
+     account. If there is only one ecb-window then ECB considers also the
+     edit-windows.
+
+     If the compile-window is selected then always the last edit-window which
+     had the point will be used unless `other-window' has been called with a
+     prefix-argument unequal 1.
+
+Regardless of the different behaviors above ECB handles the situation of an
+active minibuffer during a call to `other-window' or `scroll-other-window'
+like follows:
+
+If the minibuffer-window is selected then ECB always chooses the window
+`minibuffer-scroll-window' points to (when this variable is set, otherwise
+the compile-window or the last selected edit-window is choosen) when the
+called command is called to choose the 1. next window (always true for
+scrolling another window or true when `other-window' called without
+prefix-arg or with prefix-arg equal 1). Otherwise the window ARG steps away
+is choosen (in case of `other-window').
+
+If there is an active minibuffer but the minibuffer-window is not selected
+then `other-window' and `scroll-other-window' behave like the original
+version.
+
+6.5.3 User-defined "other window" behavior
+------------------------------------------
+
+In addition to the builtin "other window" behaviors ECB offers a user to
+completely define for himself how ECB should choose another window for
+scrolling it or selecting it. This can be done with the option
+`ecb-other-window-behavior' too because this option can also have a
+function-symbol as value:
+
+Such a function gets seven arguments:
+  1. A canonical list of all currently visible windows of the `ecb-frame'
+
+  2. A canonical list of all currently visible edit-windows
+
+  3. A canonical list of all currently visible ecb-windows
+
+  4. The window-object of the compile-window if there is any.
+
+  5. The minibuffer-window of the ECB-frame if there is an active minibuffer.
+
+  6. The result of the function `ecb-where-is-point' - see the documentation
+     of this function for details.
+
+  7. An integer which indicates how many steps away from the current selected
+     window the "other-window" is. Is nil when this function is called in
+     another context than for `other-window'.
+
+The function has to return a window-object which is then used as "other
+window" for the command `other-window' or for scrolling another window (e.g.
+with `scroll-other-window'). Such a function has to handle properly all
+situation for itself.
+
+Here is an example for such a function:
+
+   (defun ecb-get-other-window-smart (win-list
+                                      edit-win-list
+                                      ecb-win-list
+                                      comp-win
+                                      minibuf-win
+                                      point-loc
+                                      nth-window)
+     "Implements the smart-setting of `ecb-other-window-behavior'."
+     (if minibuf-win
+         ;; if we have an active mini-buffer we delegate this to
+         ;; `ecb-get-other-window-minibuf-active'
+         (ecb-get-other-window-minibuf-active win-list
+                                              edit-win-list
+                                              ecb-win-list
+                                              comp-win
+                                              minibuf-win
+                                              point-loc
+                                              nth-window)
+       ;; here we have no active minibuffer!
+       (let ((nth-win (or nth-window 1)))
+         (cond ((equal point-loc 'ecb)
+                (ecb-next-listelem ecb-win-list (selected-window) nth-win))
+               ((equal point-loc 'compile)
+                (if (= nth-win 1)
+                    (or (and ecb-last-edit-window-with-point
+                             (window-live-p ecb-last-edit-window-with-point)
+                             ecb-last-edit-window-with-point)
+                        (car edit-win-list))
+                  (ecb-next-listelem (append edit-win-list
+                                             (list (selected-window)))
+                                     (selected-window)
+                                     nth-win)))
+               (t ;; must be an edit-window
+                (ecb-next-listelem (append edit-win-list
+                                           (if (and comp-win
+                                                    (= (length edit-win-list)
+                                                       1))
+                                               (list comp-win)))
+                                   (selected-window)
+                                   nth-win))))))
+
+This example implements the builtin smart behavior described above.
+
+---------- Footnotes ----------
+
+(1) `other-window' allows to select ARG'th different window, i.e. the window
+ARG steps away from current window in the cyclic order of the windows
+
+(2) `other-window' uses the same window-ordering as `walk-windows'
+
+
+File: ecb.info,  Node: The Methods buffer,  Next: Filtering the tree-buffers,  Prev: The other window,  Up: Usage of ECB
+
+6.6 Using and customizing the ECB-Methods buffer
+================================================
+
+ECB is mostly designed to display parsing information for files supported by
+semantic. But beginning with version 1.94 it also supports other parsing
+engines like imenu and etags, so also files not supported by semantic but by
+imenu/etags can be displayed in the Method-buffer of ECB. Therefore we have
+to introduce some terminology:
+
+   - "semantic-sources": These are file-types for which a semantic grammar is
+     available, so the files are parse-able by semantic. These sources are
+     supported best by ECB and most of the following options and descriptions
+     are related to these file-types. Examples are programming-sources like
+     C++, C, Java, Emacs-Lisp and Texinfo-file and some more.
+
+   - "non-semantic-sources": For these files there is no semantic-grammar
+     available so they can not be parsed by semantic. Examples are Perl-,
+     LaTeX- and TeX-files. But for many of these files imenu and/or etags
+     parsers exist. ECB supports now parsing and displaying these file-types
+     too and it uses for this some speedbar-logic.
+
+This chapter describes how to use and customize the Methods-buffer of ECB.
+
+* Menu:
+
+* Visiting tags::               Possible actions after visiting a tag
+* Expanding::                   Explicit and automatic expanding
+* Customizing the display::     How to customize the Methods-buffer display
+* Rebuilding the Methods::      When to rebuild the Methods-buffer
+
+
+File: ecb.info,  Node: Visiting tags,  Next: Expanding,  Prev: The Methods buffer,  Up: The Methods buffer
+
+6.6.1 Possible actions after visiting a tag
+-------------------------------------------
+
+You visit a tag by clicking with either the primary oder secondary
+mouse-button (or by hitting `RET' or `C-RET' if using the keyboard) onto a
+node in the Methods-tree-buffer of ECB. This simply selects the "right"
+edit-window (depends if clicked with the primary or secondary button, in how
+many windows the edit-area is splitted and the value of
+`ecb-mouse-click-destination') and puts the point onto the first line of the
+clicked tag.
+
+But you can define if after this "basic" tag-visit-action more additional
+actions should be performed by ECB. You can either use some of the predefined
+actions (e.g. highlighting the header-line of the tag) or define own actions.
+You can set different actions for different major-modes. All this is done via
+the option `ecb-tag-visit-post-actions'.
+
+The following actions are currently predefined:
+   - `ecb-tag-visit-highlight-tag-header'
+
+   - `ecb-tag-visit-smart-tag-start'
+
+   - `ecb-tag-visit-recenter'
+
+   - `ecb-tag-visit-recenter-top'
+
+   - `ecb-tag-visit-goto-doc-start'
+
+   - `ecb-tag-visit-narrow-tag'
+
+See the documentation of these function for details what they do.
+
+Per default ECB performs the actions `ecb-tag-visit-smart-tag-start' and
+`ecb-tag-visit-highlight-tag-header' for all major-modes.
+
+
+File: ecb.info,  Node: Expanding,  Next: Customizing the display,  Prev: Visiting tags,  Up: The Methods buffer
+
+6.6.2 Explicit and automatic expanding of the ECB-methods-buffer
+----------------------------------------------------------------
+
+6.6.2.1 Explicit expanding all nodes to a certain expansion level
+.................................................................
+
+With the command `ecb-expand-methods-nodes' (bound to `C-c .  x') you can get
+a fast overlook of the contents of the source-buffer, because this command
+allows precisely expanding all tags with a certain indentation-level. So you
+can either expand no tags (or with other words collapse all tags) or expand
+all tags so see the contents of a buffer at one glance. Or you can expand
+exactly that tags of a certain indentation level.
+
+Which node-types are expanded (rsp. collapsed) by this command depends for
+semantic-sources on the options `ecb-methods-nodes-expand-spec' and
+`ecb-methods-nodes-collapse-spec'! For non-semantic-sources always all
+node-types are expanded/collapsed, i.e. the two options above takes no effect
+for these files.
+
+6.6.2.2 Explicit expanding of the current node to a certain level
+.................................................................
+
+With the popup-menu of the methods-buffer an even more precise expansion is
+possible because it allows not only expanding all tags (see above) but offers
+in addition expanding only the current-node (for which the menu was
+activated) to an exact level of expansion:
+
+All menu-entries are label with an expansion-"level" whereas level specifies
+precisely which level of nodes should be expanded. level means the
+indentation-level of the NODE itself and its (recursive) subnodes relative to
+the NODE itself.
+
+So a level value X means that all (sub)nodes with an indentation-level <= X
+relative to NODE are expanded and all other are collapsed.
+
+Examples:
+
+   - Expand this node to level 0: Expand only the NODE itself because it is
+     the only node which has indentation 0 to itself. All deeper indented
+     nodes will be collapsed.  This is also the important difference between
+     using this menu compared to clicking onto the expand-symbol of the node:
+     The latter one expands the NODE to that expansion-state it has before
+     the last collapsing (so when deeper nodes has been expanded they will be
+     expanded now to). The former one expands exactly(!) to level 0, means
+     expand only the node itself and collapse all(!) its subnodes
+     recursively(!).
+
+   - Expand this node to level 1: Expand the NODE itself and all of its
+     direct subnodes - because only the direct subnodes of NODE have
+     indentation-level 1 relativ to NODE.  All deeper nodes will be collapsed.
+
+   - Collapse this node completely: Collapses the current node recursively,
+     means collapse not only the node itself but also its subnodes, the
+     subnodes of the subnodes and so on! This is very differnt from clicking
+     onto the collapse symbol because this action only collapses the node
+     itself but preserves the expansion-state of all its subnodes!
+
+
+Expanding the current node with the popup-menu ignores the settings in the
+options `ecb-methods-nodes-expand-spec' and `ecb-methods-nodes-collapse-spec'!
+
+6.6.2.3 Automatic expansion ot tags after buffer-parsing
+........................................................
+
+With the option `ecb-show-tags' you tell ECB how to display tags of a certain
+tag-class (*note Customizing the display::). Among other things you can tell
+ECB that a certain tag-class should be combined under an expanded or
+collapsed bucket-node. But such a setting defines the expansion-state of such
+a bucket-node only direct afterwards the buffer has been (re)parsed, which
+can occur after opening a file, after autom. reparsing the buffer via
+semantic or after manually rebuilding the methods-buffer of ECB.
+
+The tag-class `type' (classes, interfaces, enumerations etc.) is divided into
+several subtypes by semantic. The subtypes are strings which names exactly if
+the tag with tag-class `type' is a class, an interface, an enumeration, a
+typedef etc. With the option `ecb-type-tag-expansion' you can tell ECB if
+these type-tags should be autom. expanded after (reparsing) a buffer (see
+above) or if they should be displayed collapsed - so all its members (methods,
+variables etc.) are hidden.
+
+6.6.2.4 Automatic expanding the ECB-methods-buffer for current tag
+..................................................................
+
+If the option `ecb-highlight-tag-with-point' is switched on, then always that
+node in the method-buffer is highlighted which belongs to the current
+semantic-tag under point in the current active edit-window. But if this node
+is invisible (probably because its parent node is collapsed) then no node is
+highlighted if the auto.  expanding feature is switched off.
+
+You can either switch on this feature with the option
+`ecb-auto-expand-tag-tree' or even easier with the command
+`ecb-toggle-auto-expand-tag-tree'.
+
+There is another option `ecb-expand-methods-switch-off-auto-expand' which
+makes both explicit and auto. expanding best working together. See the
+documentation of this option to get the details.
+
+The autom. expanding feature is only available for semantic-sources!
+
+Previous versions of ECB have always fully expanded the whole tree in the
+Methods-buffer if the current tag in the source-buffer was not visible in the
+current tree - e.g. because the variables-bucket was collapsed or the
+containing type of a tag (e.g. the class of a method) was collapsed. So in
+most cases much more was expanded as needed to make the current tag visible.
+
+The mechanism of ECB 2.22 and higher only expands the needed parts of the
+tree-buffer to make the related node visible: First we try to highlight the
+current tag with current expansion-state of the Methods-buffer. If the node
+is not visible so the tag can not be highlighted then we go upstairs the
+ladder of type-tags the current tag belongs to (e.g. we expand successive the
+nodes of the whole class-hierachy of the current method-tag until the related
+node becomes visible). If there is no containing type for the current tag
+then the node of the tag is probably contained in a toplevel-bucket which is
+currently collapsed; in this case we expand only this bucket-node and try
+highlighting again. Only if this has still no success then we expand the full
+tree-buffer and try to highlight the current tag.
+
+There is another option `ecb-auto-expand-tag-tree-collapse-other': If this
+option is set then auto. expanding the tag-tree collapses all not related
+nodes.  This means that all nodes which have no relevance for the currently
+highlighted node will be collapsed, because they are not necessary to make
+the highlighted node visible. This feature is switched off by default because
+if always collapses the complete Methods-tree before the following
+highlighting of the node for the current tag expands the needed parts of the
+tree-buffer.
+
+
+File: ecb.info,  Node: Customizing the display,  Next: Rebuilding the Methods,  Prev: Expanding,  Up: The Methods buffer
+
+6.6.3 Customizing the display of the Methods-buffer
+---------------------------------------------------
+
+The ECB-Methods buffer is probably the most important browsing window offered
+by ECB. It displays all parsing informations of the current source-buffer
+(the buffer displayed in the current active edit-window).
+
+Normally ECB gets all informations displayed in this Methods-buffer from the
+semantic-library - at least for semantic-sources. This library parses auto.
+the current source-buffer in the edit-window of ECB and returns all
+information in form of "tags" to ECB which displays them in a browse-able
+form in its Method-buffer. See *Note ECB Methods-window:: for information how
+to use the Methods-buffer.
+
+There are several options to customize which tags ECB should display in
+general, if the tags should be collapsed or expanded, how to fontify them
+(i.e. syntax-highlighting) and something more.
+
+`ecb-show-tags'
+     With the option `ecb-show-tags' you specify how ECB should display the
+     tags returned by the semantic parser. Semantic divides its tags in
+     several so called "tag classes". A tag-class is always a symbol and can
+     be for example `type' (tags which represent a class(1), a interface, an
+     enumeration etc.), `function' (tags which represent function or methods),
+     `variable' (variables and attributes), `include' (import-statements)
+     etc. There is no predefined superset of allowed tag-class-symbols
+     because each language-parser can define its own tag-classes. But to get
+     an overview of the most common tag-classes see the default value of the
+     option `ecb-show-tags'.
+
+     With the option `ecb-show-tags' you can now specify how ECB should
+     display tags of a certain tag-class in a certain major-mode.  You can
+     tell ECB that all tags of a tag-class `X' should be displayed in an
+     expanded bucket and all tags of a tag-class `Y' should be displayed in a
+     collapsed bucket and all tags of a tag-class `Z' should be displayed
+     flattened (means not contained in a expandable/collapsable bucket-node).
+     These settings can be made separately for each major-mode but you can
+     also define a default-display which takes effect when for a major-mode
+     no special setting can be found in `ecb-show-tags'.
+
+     For every tag-class you can tell ECB how the tags should be sorted.
+
+`ecb-font-lock-tags'
+`ecb-type-tag-display'
+     How to fontify the tags in the Method-buffer
+
+`ecb-tag-display-function'
+     ECB and semantic offer several predefined functions for displaying the
+     tags. Here you can customize, what informations tags should contain
+     (only the method-name or the whole signature or something else) and what
+     notation should be used, e.g. UML or not.
+
+
+These are the most important options for this topic but it is recommended to
+have a look into the customize-group `ecb-methods' (*note ecb-methods::) and
+check all the options offered there!
+
+All these options are only relevant for semantic-sources and take no effect
+for non-semantic-sources!
+
+---------- Footnotes ----------
+
+(1) Do not confuse the term "class" in the context of a tag, which means the
+class of the tag and which is a semantic-term and a "class" in the context of
+an object oriented language like Java or C++! Normally the surrounding
+context sould be sufficient to understand which type of "class" is meant
+whenever the term "class" is used in this manual.
+
+
+File: ecb.info,  Node: Rebuilding the Methods,  Prev: Customizing the display,  Up: The Methods buffer
+
+6.6.4 Rebuilding the Methods-buffer
+-----------------------------------
+
+In almost all cases there is *NO* need to manually rebuild the method-buffer,
+because it is always done automatically if necessary; the mechanism depends
+on the sources:
+
+   - semantic-sources: The command `global-semantic-auto-parse-mode' switches
+     on autom.  reparsing of semantic-sources.
+
+   - non-semantic-sources (imenu supported): You can switch on autom.
+     rescanning/reparsing with the option `imenu-auto-rescan'. But
+     nevertheless you have to manually rebuild the Method-buffer (with the
+     autom. updated imenu-tags) via the command `ecb-rebuild-methods-buffer'
+     (bound to `C-c . r').
+
+   - non-semantic-sources (etags supported): For these sources there is no
+     built-in auto-rescan mechanism, because etags is an external tool it can
+     only operate on the saved file-contents. So rescanning the buffer
+     contents would need to save the buffer before. Therefore there is no
+     built-in auto-rescan mechanism because this would always result in
+     saving the buffer and running an external tool. But of course you can
+     program such a an etags-auto-rescan mechanism for yourself!
+
+Besides for etags-supported non-semantic-sources there exist a few rare
+scenarios also for the other sources where a complete manual rebuild can be
+necessary. Here is one example:
+
+Depending on the semantic-version: If an Elisp-file is parsed which contains
+a defun X in the middle where the closing ) is missing, then semantic parses
+only until this defun X is reached and you will get an incomplete ECB-method
+buffer. In such a case you must complete the defun X and then completely
+reparse the Elisp-file and rebuild the ECB method buffer!
+
+A complete manually rebuild is done by `ecb-rebuild-methods-buffer'. For
+etags-parsed non-semantic-sources this causes an automatic saving of the
+source-buffer because otherwise etags would not operate with the latest
+contents!
+
+
+File: ecb.info,  Node: Filtering the tree-buffers,  Next: The ECB-layout,  Prev: The Methods buffer,  Up: Usage of ECB
+
+6.7 Applying filters to the special ECB-tree-buffers
+====================================================
+
+To get a fast and good overlook of the contents of a tree-buffer ECB offers a
+filter-mechanism for the Directories-, Sources-, the History- and the
+Methods-buffer.
+
+* Menu:
+
+* Filtering Directories::       Applying filters to the Directories-buffer
+* Filtering Sources::           Applying filters to the Sources--buffer
+* Filtering History::           Applying filters to the History-buffer
+* Filtering Methods::           Applying filters to the Methods-buffer
+
+
+File: ecb.info,  Node: Filtering Directories,  Next: Filtering Sources,  Prev: Filtering the tree-buffers,  Up: Filtering the tree-buffers
+
+6.7.1 Applying filters to the Directories-buffer
+------------------------------------------------
+
+With the option `ecb-excluded-directories-regexps' certain directories can be
+excluded from being displayed in the directories-browser of ECB. This can be
+done by defining regular expressions. If the name of a directory matches at
+least one of the regexps of this option the directory is not displayed in the
+directories-tree-buffer.
+
+The option `ecb-sources-exclude-cvsignore' allows to exclude source-files
+from the sources-tree-buffer if their name is listed in a so called
+`.cvsignore'-file. This option is a list of regular expressions and if a
+directory-name matches at least one of these regexps then all files listed in
+the `.cvsignore'-file of this directory are not displayed in the
+sources-tree-buffer.
+
+
+File: ecb.info,  Node: Filtering Sources,  Next: Filtering History,  Prev: Filtering Directories,  Up: Filtering the tree-buffers
+
+6.7.2 Applying filters to the Sources-buffer
+--------------------------------------------
+
+6.7.2.1 Interactive Sources-filters
+...................................
+
+The command `ecb-sources-filter' allows to filter these tree-buffer either by
+a regular expression or by an extension (e.g.  java, cc, el for java-, c++-
+rsp elisp-sources). This functionality is also available via the popup-menu
+of the Sources-tree-buffer.
+
+The currently applied filter is indicated in the modeline of the related
+tree-buffer. Applying a new filter replaces an eventually already applied
+filter.
+
+6.7.2.2 Default Sources-filters
+...............................
+
+The option `ecb-source-file-regexps' allow to specify which source-files
+should be displayed and which not. This is done on a directory-basis, ie. for
+each directory-regexp the files to display can be specified. See the
+documentation of this option for all details.
+
+In addition to this option you should also know the option
+`ecb-sources-exclude-cvsignore' (*note Filtering Directories::).
+
+
+File: ecb.info,  Node: Filtering History,  Next: Filtering Methods,  Prev: Filtering Sources,  Up: Filtering the tree-buffers
+
+6.7.3 Applying filters to the History-buffer
+--------------------------------------------
+
+6.7.3.1 Interactive History-filters
+...................................
+
+The command `ecb-history-filter' allows to filter these tree-buffer either by
+a regular expression or by an extension (e.g.  java, cc, el for java-, c++-
+rsp elisp-sources). This functionality is also available via the popup-menu
+of the History-tree-buffer.
+
+The currently applied filter is indicated in the modeline of the related
+tree-buffer. Applying a new filter replaces an eventually already applied
+filter.
+
+6.7.3.2 Default History-filters
+...............................
+
+The option `ecb-history-exclude-file-regexps' allows to exclude source-files
+from being historized (ie. displayed in the History-buffer). Despite the fact
+that the History-buffer already excludes all non-file-buffers there can be
+still buffers which name you do not wat to be displayed in the history. These
+are file-buffer like `TAGS' or `semantic.cache' which store meta-informations
+used by Emacs and its tools (etags, semantic etc.).  These files can be
+excluded via `ecb-history-exclude-file-regexps'.
+
+
+File: ecb.info,  Node: Filtering Methods,  Prev: Filtering History,  Up: Filtering the tree-buffers
+
+6.7.4 Applying filters to the Methods-buffer
+--------------------------------------------
+
+The commands `ecb-methods-filter', `ecb-methods-filter-regexp',
+`ecb-methods-filter-protection', `ecb-methods-filter-tagclass',
+`ecb-methods-filter-function', `ecb-methods-filter-delete-last',
+`ecb-methods-filter-nofilter' allows to filter the tags/nodes of the
+Methods-buffer by several criterias. As for the Sources- and the
+History-buffer the same functionality is also available via the popup-menu of
+the Methods-buffer.
+
+6.7.4.1 Possible filter-criterias
+.................................
+
+   * Filter by protection: Just insert the protection you want the
+     Methods-buffer being filtered: private, protected or public! For sources
+     not supported by semantic the protection filter will not be offered
+     because these informations are not available for such sources.
+
+   * Filter by regexp: Insert the filter as regular expression.
+
+   * Filter by tag-class: You can filter by tag-classes. The popup-menu
+     contains mode-dependend tag-filter entries and the command
+     `ecb-methods-filter' offers only the tag-classes of the current mode.
+     This means for sources not supported by semantic the tag-class filter
+     will not be offered. And for semantic-supported sources exactly these
+     tag-classes are offered the semantic-parser for the current major-mode
+     offers. For example texi-sources can only be filtered by the tag-classes
+     "Definitions" and "Sections" and java-sources can be filtered by
+     "Methods", "Variables", "Classes" etc. In general the semantic-variable
+     `semantic-symbol->name-assoc-list' is used to get the right tag-classes.
+
+   * Filter by a filter-function: Such a function gets two arguments: a tag
+     and the source-buffer of this tag. If the tag should be displayed (i.e.
+     not being filtered out) then the function has to return not nil
+     otherwise nil.
+
+   * No special filter: This means to display all tags specified with the
+     option `ecb-show-tokens'. If currently some of the above filters are
+     applied they will be all removed.
+
+   * Delete the last added: This removes only the topmost filter-layer, means
+     that filter added last.
+
+Be aware that the tag-list specified by the option `ecb-show-tags' is the
+basis of all filters, i.e. tags which are excluded by that option will never
+be shown regardless of the filter type here!
+
+All tags which match the applied filter(s) will be displayed in the
+Methods-buffer. Such a filter is only applied to the current source-buffer,
+i.e. each source-buffer can have its own tag-filters.
+
+These tag-filters can also applied to sources which are not supported by the
+semantic-parser but "only" by imenu or etags. But because for these sources
+not all information are avaiable the protection- and tag-class filter are not
+offered with such "non-semantic"-sources.  See *Note Non-semantic sources::
+for further details about working with source-files not supported by the
+semantic-parser.
+
+6.7.4.2 Inverse Filters
+.......................
+
+But if `ecb-methods-filter' is called with a prefix-argument then an inverse
+filter is applied to the Methods-buffer, i.e. all tags which do *NOT* match
+the choosen filter will be displayed in the Methods-buffer!
+
+6.7.4.3 Layered filters
+.......................
+
+Per default the choosen filter will be applied on top of already existing
+filters. This means that filters applied before are combined with the new
+filter. This behavior can changed via the option
+`ecb-methods-filter-replace-existing'.
+
+6.7.4.4 Display of currently applied filters
+............................................
+
+The current active filter will be displayed in the modeline of the
+Methods-buffer [regexp, prot (= protection), tag-class, function (=
+filter-function)]. If an inverse filter has been applied then this is
+signalized by a preceding caret ^. If currently more than 1 filter is applied
+then always the top-most filter is displayed in the modeline but the fact of
+more than 1 filter is visualized by the number of the filters - included in
+parens. You can see all currently applied filters by moving the mouse over
+the filter-string in modeline of the Methods-buffer: They will displayed as
+help-echo.
+
+6.7.4.5 Default filters for certain files.
+..........................................
+
+The new option `ecb-default-tag-filter' allow to define default tag-filters
+for certain files which are applied automatically after loading such a file
+into a buffer. The possible filters are the same as offered by the command
+`ecb-methods-filter' and they are applied in the same manner - the only
+difference is they are applied automatically. The files can be specified on a
+combined major-mode- and filename-regexp-basis.
+
+Usage-example: This can be used to display in outline-mode files (e.g.
+`NEWS') only the level-1-headings by defining a filter regexp "^\* .*".
+
+
+File: ecb.info,  Node: The ECB-layout,  Next: Hiding the ECB windows,  Prev: Filtering the tree-buffers,  Up: Usage of ECB
+
+6.8 Changing, customizing, redrawing and creating layouts
+=========================================================
+
+The term "ECB-layout" means in which windows the ECB-frame is divided. This
+chapter describes all aspects concerning this layout, especially changing,
+customizing, redrawing and also creating new layouts.
+
+* Menu:
+
+* Changing the ECB-layout::     How to change and customize the layout
+* Redrawing the ECB-layout::    How and when redrawing the layout
+* Changing window sizes::       Changing sizes of the ECB-windows
+* Fixing window sizes::         Fixing sizes of the ECB-windows
+* Creating a new ECB-layout::   Interactively creating new layouts
+
+
+File: ecb.info,  Node: Changing the ECB-layout,  Next: Redrawing the ECB-layout,  Prev: The ECB-layout,  Up: The ECB-layout
+
+6.8.1 Changing and customizing the ECB-layout
+---------------------------------------------
+
+ECB offers several predefined layouts with different sets and also different
+locations of ECB-windows. See below the "ascii-screenshot" of all currently
+built-in layouts(1).
+
+In addition to these predefined layouts you can either interactively create
+new layouts "by example" (*note Creating a new ECB-layout::) or program new
+layouts with the macro `ecb-layout-define' (*note The layout-engine::). The
+former method is the recommended one!
+
+There are two ways to interactively change the layout:
+   * Changing permanently: Customize the option `ecb-layout-name' and store
+     it for future Emacs sessions.
+
+   * Switching between several layouts at runtime: If you want to switch fast
+     between a certain sequence of layouts see the option
+     `ecb-toggle-layout-sequence' and the command `ecb-toggle-layout' (*note
+     Simulating speedbar::). For just selecting another layout during current
+     Emacs-session use the command `ecb-change-layout'.
+
+With the option `ecb-show-sources-in-directories-buffer' you can define if
+sources are displayed in the directory-window of a layout (*note ECB
+Directories-window::).
+
+In addition to the general layout you can specify if the layout should
+contain a persistent compilation-window at the bottom of the frame, see
+`ecb-compile-window-height' (*note Temp- and compile-buffers::).
+
+Maybe you want also change the look&feel of the tree-buffers. Then you can
+change the general style of the tree-buffers with the option
+`ecb-tree-buffer-style' and the location of the collapse- and expand-symbols
+and the indentation of sub-nodes in a tree. See `ecb-tree-indent' and
+`ecb-tree-expand-symbol-before'. More details about the different
+tree-buffer-styles are described in *Note Tree-buffer styles::.
+
+Here are all currently available layouts (for creating own new layouts see
+*Note Creating a new ECB-layout::); just customize the option
+`ecb-layout-name' to the related name:
+
+Layout "left1"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |      |       |                                      |
+        | Sour | Hist  |                 Edit                 |
+        |      |       |                                      |
+        |      |       |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left2"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left3"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left4"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |      |       |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        | Sour | Hist  |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        |      |       |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left5"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "right1"
+        -------------------------------------------------------
+        |                                      |              |
+        |                                      |  Directories |
+        |                                      |              |
+        |                                      |              |
+        |                                      |--------------|
+        |                                      |              |
+        |                                      |              |
+        |             Edit                     |  Sources     |
+        |                                      |              |
+        |                                      |              |
+        |                                      |--------------|
+        |                                      |              |
+        |                                      |  Methods     |
+        |                                      |              |
+        |                                      |              |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left6"
+        -------------------------------------------------------
+        |  Sources     |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |  History     |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "top1"
+        -------------------------------------------------------
+        |                        |             |              |
+        |                        |             |              |
+        |      Directories       |  Sources    |  Methods     |
+        |                        |             |              |
+        |                        |             |              |
+        |-----------------------------------------------------|
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                    Edit                             |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left7"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left8"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "top2"
+        -------------------------------------------------------
+        |                                                     |
+        |                                                     |
+        |                    Methods                          |
+        |                                                     |
+        |                                                     |
+        |-----------------------------------------------------|
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                    Edit                             |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        |                                                     |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left9"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |   Methods    |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left10"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |      |       |                                      |
+        | Sou  | Hist  |                                      |
+        |      |       |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left11"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left12"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |   History    |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left13"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        | Directories  |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left14"
+        -------------------------------------------------------
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        | Directories  |                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  History     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left15"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |              |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "leftright1"
+        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |-------------|          Edit           |             |
+        |             |                         |             |
+        | Sources     |                         |             |
+        |             |                         |             |
+        |-------------|                         |             |
+        |             |                         |             |
+        | History     |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                   Compilation                       |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "leftright2"
+        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |          Edit           |             |
+        |-------------|                         |-------------|
+        |             |                         |             |
+        | Sources     |                         |  History    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                   Compilation                       |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "leftright3"
+        -------------------------------------------------------
+        |             |                         |             |
+        | Directories |                         |  Methods    |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |          Edit           |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        |             |                         |             |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left-dir-plus-speedbar"
+        -------------------------------------------------------
+        |             |                                       |
+        | Directories |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        |-------------|                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        | Speedbar    |                                       |
+        |             |                                       |
+        |             |                                       |
+        |             |                                       |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left-analyse"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Analyse     |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+Layout "left-symboldef"
+        -------------------------------------------------------
+        |              |                                      |
+        |  Directories |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Sources     |                                      |
+        |              |                                      |
+        |--------------|                 Edit                 |
+        |              |                                      |
+        |  Methods     |                                      |
+        |              |                                      |
+        |--------------|                                      |
+        |              |                                      |
+        |  Symbol-defs |                                      |
+        |              |                                      |
+        -------------------------------------------------------
+        |                                                     |
+        |                    Compilation                      |
+        |                                                     |
+        -------------------------------------------------------
+
+
+---------- Footnotes ----------
+
+(1) The command `ecb-show-layout-help'' shows the outline-picture for all
+built-in layouts.
+
+
+File: ecb.info,  Node: Redrawing the ECB-layout,  Next: Changing window sizes,  Prev: Changing the ECB-layout,  Up: The ECB-layout
+
+6.8.2 Redrawing the ECB-layout
+------------------------------
+
+If you have unintentionally destroyed the ECB-layout, you can always restore
+the layout with calling `ecb-redraw-layout'. This is even true, if you get
+messages like "wrong-type-argument window-live-p #<window 222>".
+
+If the variable `ecb-redraw-layout-quickly' is not nil then the redraw is
+done by the `ecb-redraw-layout-quickly' function, otherwise by
+`ecb-redraw-layout-full'. But it's strongly recommended to use the quick
+redraw only if you have really slow machines where a full redraw takes
+several seconds because the quick redraw is not really safe and may have some
+drawbacks! On normal machines the full redraw should be done in << 1s!
+
+Please read the documentation of the command `ecb-redraw-layout'!
+
+See also the hooks `ecb-redraw-layout-after-hook' and
+`ecb-redraw-layout-before-hook'!
+
+
+File: ecb.info,  Node: Changing window sizes,  Next: Fixing window sizes,  Prev: Redrawing the ECB-layout,  Up: The ECB-layout
+
+6.8.3 Changing the sizes of the special ECB-windows
+---------------------------------------------------
+
+The standard width and height of the special ECB-windows is defined with the
+options `ecb-windows-width' and `ecb-windows-height'. But changing these
+options always influences all layouts which is not always desired.
+
+ECB offers to re-adjust the width and height of the ECB-windows (e.g. by
+dragging the windows-borders via the mouse) and then saving exactly these
+current window-sizes for the current layout so after activating this layout
+all windows have autom. the stored sizes.
+
+This is done via the option `ecb-layout-window-sizes' and the commands
+`ecb-store-window-sizes', `ecb-restore-window-sizes' and
+`ecb-restore-default-window-sizes'.
+
+Here is an example how to resize and store the sizes of the ECB-windows of
+layout "left1":
+
+  1. Switch to layout "left1" via `ecb-change-layout' (`C-c . lc')
+
+  2. Resize the ECB-windows by dragging the window-borders with the mouse
+
+  3. Call `ecb-store-window-sizes'
+
+After this layout "left1" will be always drawn with the new sizes until you
+call `ecb-restore-default-window-sizes' during layout "left1" is active.
+
+*Please note*: `ecb-store-window-sizes' stores the width and height of the
+windows per default as fractions of the width (rsp.  height) of the
+ECB-frame, so the stored sizes are always correct regardless of the current
+frame-size! But if called with a prefix argument then fixed sizes are stored.
+
+
+File: ecb.info,  Node: Fixing window sizes,  Next: Creating a new ECB-layout,  Prev: Changing window sizes,  Up: The ECB-layout
+
+6.8.4 Fixing the sizes of the special ECB-windows
+-------------------------------------------------
+
+GNU Emacs 21 introduced a new feature which can fix the sizes of a window
+displaying a certain buffer even after resizing the frame. This new feature
+is driven by the new buffer-local variable `window-size-fixed'(1).
+
+ECB offers an option `ecb-fix-window-size' for fixing the sizes of the
+special ECB-windows/buffers even after frame-resizing. The fix type (valid
+values are `nil', `t', `width' and `height') can either be set on a
+layout-basis (means a different value for each layout) or one value can be
+set for all layouts. In the latter case there is an additional value `auto'
+which choose autom. the senseful fix-type depending on the current
+layout-type: For top-layouts the fix-type `height' and for all other
+layout-types the fix-type `width'.
+
+Probably the most senseful value is `auto' for all layouts because it makes
+less sense to fix the height of the ecb-windows in a left-, right- or
+leftright-layout. Same for fixing the width in a top-layout.
+
+Note: With Emacs < 22 there seems to be no distinction between `width',
+`height' and `t'. Therefore this option takes no effect (means all
+ecb-windows have always unfixed sizes) with Emacs < 22 if
+`ecb-compile-window-height' is not `nil'.
+
+---------- Footnotes ----------
+
+(1) Currently XEmacs does not support this feature therefore
+`ecb-fix-window-size' has no effect with XEmacs
+
+
+File: ecb.info,  Node: Creating a new ECB-layout,  Prev: Fixing window sizes,  Up: The ECB-layout
+
+6.8.5 Interactively creating new layouts
+----------------------------------------
+
+If you want to create your own ECB-layout then you can do this very easy "by
+example" with the command `ecb-create-new-layout'.  This command creates a
+new empty frame and offers a small set of keys to create the new layout by
+splitting windows.  `ecb-create-new-layout' and this couple of keys are your
+guide during the layout-creation-process(1).
+
+After calling `ecb-create-new-layout' you will be asked which type of layout
+you want to create: "left", "right", "top" or "left-right". Here you specify
+where the ECB-tree-windows/buffers should be located in the ECB-frame:
+
+   - left: All ECB-tree-windows are located on the left side
+
+   - right: All ECB-tree-windows are located on the right side
+
+   - top: All ECB-tree-windows are located on the top side
+
+   - left-right: All ECB-tree-windows are located on the left and right side
+
+Depending on the type you choose the window is splitted by the values of the
+options `ecb-windows-width' (types "left", "right" and "left-right") or
+`ecb-windows-height' (type "top").
+
+Afterwards you will see a frame like follows (here the layout-type is
+"left-right"):
+
+   -----------------------------------------------------------------
+   |<point>       |                                   |            |
+   |              | ECB-layout creation mode          |            |
+   |              | ========================          |            |
+   |              |                                   |            |
+   |              | <This is a persistent help-screen>|            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   |              |                                   |            |
+   -----------------------------------------------------------------
+                  |
+                  |   ,---
+                  `---| Splitted by the value of `ecb-windows-width'.
+                      `---
+
+The big window (here the middle window) will be the edit-area of the new
+layout and can not be selected, deleted or splitted during the creation
+process. It displays the help-screen for the layout-creation mode. Here all
+the available commands are displayed.
+
+The small window(s) (here the left and right windows) can be splitted by you
+wherever you want (`C-s'). The left one contains the point.  You must give
+every ECB-tree-window you create a type (`C-t') which can be either
+
+   * One of the built-in types
+
+     This can be either "directories", "sources", "methods", "history" or
+     "speedbar".
+
+   * Any user-defined type:
+
+     In this case you insert "other" after hitting `C-t' and you will then be
+     asked for the name of the user-defined type. You can insert any
+     arbitrary type name X. But to get this layout working you have to define
+     a function with name `ecb-set-X-buffer' whereas X is the name of the
+     user-defined type you have specified during layout-creation.
+
+     This function `ecb-set-X-buffer' must be defined with the macro
+     `defecb-window-dedicator' and has to switch to the buffer you want to
+     display in this window. This macro automatically ensures that this
+     window is dedicated to that buffer.
+
+     Here is an example: Suppose you have inserted as type name "example"
+     then you have to define and load a function `ecb-set-example-buffer'
+     which could be defined like follows:
+
+        (defecb-window-dedicator ecb-set-example-buffer " *ECB example-buf*"
+          (switch-to-buffer (get-buffer-create " *ECB example-buf*")))
+
+     If you forget to define such a function for the user-defined type then
+     nevertheless ECB will draw this layout but it will use the
+     default-function `ecb-set-default-ecb-buffer' instead.
+
+If you are satisfied with your new layout just hit `C-q'. You will be asked
+for a new layout-name (TAB-completion is offered to get a list of all names
+already in use) and after inserting a new(!) name the new layout is saved in
+the file defined by the option `ecb-create-layout-file'. The new layout is
+now available via the option `ecb-layout-name'.
+
+There is no need for you to load the file `ecb-create-layout-file' manually
+into your Emacs because it's automatically loaded by ECB!
+
+*Please note*: During the layout-creation process only the commands displayed
+in the help-screen are available. ALL other commands are temporally disabled
+(even the mouse-commands).
+
+For programming new layouts with emacs-lisp see *Note The layout-engine::.
+
+With the command `ecb-delete-new-layout' you can delete previously created
+layouts (TAB-completion is offered for all names of user created layouts).
+
+---------- Footnotes ----------
+
+(1) During the creation process you will be asked in the minibuffer for
+several options; here you can use TAB-completion and an "empty" RET chooses
+always the first option!
+
+
+File: ecb.info,  Node: Hiding the ECB windows,  Next: Maximizing the ECB windows,  Prev: The ECB-layout,  Up: Usage of ECB
+
+6.9 Hiding/Showing the ECB windows
+==================================
+
+With `ecb-toggle-ecb-windows', `ecb-hide-ecb-windows' and
+`ecb-show-ecb-windows' you can hide/show all the ECB windows without changing
+the activation state of ECB and also without deactivating the advices for
+`delete-other-windows' and/or `delete-window'. This is most useful if you use
+a layout like "top2" (*note Common use-cases::) or if you want to have
+maximum space for editing and you don't need the browsing windows all the
+time.
+
+The following sequence of hooks is evaluated during showing again the hidden
+ECB-windows:
+  1. `ecb-show-ecb-windows-before-hook'
+
+  2. `ecb-redraw-layout-before-hook'
+
+  3. <Redrawing the layout to show the hidden ECB-windows>
+
+  4. `ecb-redraw-layout-after-hook'
+
+  5. `ecb-show-ecb-windows-after-hook'
+
+The following sequence of hooks is evaluated during hiding the ECB-windows:
+  1. `ecb-hide-ecb-windows-before-hook'
+
+  2. `ecb-redraw-layout-before-hook'
+
+  3. <Hiding the ECB-windows>
+
+  4. `ecb-redraw-layout-after-hook'
+
+  5. `ecb-hide-ecb-windows-after-hook'
+
+If the special ECB-windows are hidden (e.g. by `ecb-toggle-ecb-windows') all
+adviced functions behave as their originals. So the frame can be used as if
+ECB would not be active but ECB IS still active in the "background" and all
+ECB-commands and all ECB-keybindings can be used. Of course some of them
+doesn't make much sense but nevertheless they can be called. Toggling the
+visibility of the ECB-windows preserves the splitting-state of the edit-area:
+If you hide the ECB-windows then the frame will be divided in the same
+window-layout the edit-area had before the hiding and if you show the
+ECB-windows again the edit-area will be divided into all the edit-windows the
+ECB-frame had before the showing.
+
+Therefore it should be enough to hide the ECB-windows to run other
+Emacs-applications which have their own window-layout-managing. There should
+be no conflicts. But nevertheless the most recommended method for running ECB
+and other applications (e.g. xrefactory, Gnus etc.) in the same frame is to
+use a window-manager like winring.el or escreen.el (*note Window-managers and
+ECB::).
+
+
+File: ecb.info,  Node: Maximizing the ECB windows,  Next: Back/forward navigation,  Prev: Hiding the ECB windows,  Up: Usage of ECB
+
+6.10 Maximizing the ECB windows
+===============================
+
+6.10.1 How to maximize and minimize special ecb-tree-windows
+------------------------------------------------------------
+
+To get a better overlook about the contents of a certain ECB-window every
+ECB-window can be "maximized", means all other ECB-windows are deleted so
+only the edit-window(s) and this maximized ECB-window are visible (and maybe
+a compile-window if active). There are several ways to do this:
+
+   * Via the node-popup-menus of the ECB-windows
+
+   * Via the main "ECB"-menu and here "Display window maximized"
+
+   * Via calling the adviced version of `delete-other-windows'(1) (bound to
+     `C-x 1') in one of the ECB windows.
+
+   * Via one of the commands `ecb-maximize-window-directories',
+     `ecb-maximize-window-sources', `ecb-maximize-window-methods',
+     `ecb-maximize-window-history' or `ecb-maximize-window-speedbar' or the
+     bound short-cuts for those commands.
+
+   * Via the new command `ecb-cycle-maximized-ecb-buffers' which cycles
+     through all ecb-buffers of current layout by maximizing exactly one of
+     the ecb-windows after every cycle-step.
+
+   * Via the option `ecb-maximize-ecb-window-after-selection' and then just
+     by selecting an ECB-window. "Deselecting" an ECB-window brings back all
+     ECB-windows of current layout.
+
+   * Via the default modeline-mechanisms for deleting other windows. GNU
+     Emacs binds `mouse-2' in its modeline to `delete-other-window'. XEmacs
+     binds a popup-menu with some window commands to `button-3' in its
+     modeline.
+
+     ECB combines the best of both worlds by supporting both of these
+     mechanisms for both Xemacs and Emacs: ECB binds a toggle-command to
+     `mouse-2' in the modeline of each tree-buffer which maximizes the
+     current tree-window if all ECB-windows are visible and displays all
+     ECB-windows if current tree-window is maximized. In addition ECB binds a
+     popup-menu to `mouse-3' which offers exactly 2 commands: Maximizing
+     current tree-window and displaying all ECB-windows.
+
+"Minimizing" such a maximized ECB-window, i.e. bringing back to its original
+size and displays all ecb-windows of current layout, can simply be done by
+redrawing the layout via the command `ecb-redraw-layout' (bound to `C-c .
+lr').
+
+6.10.2 Selecting a node in a maximized ecb-tree-window
+------------------------------------------------------
+
+When you select a node (either via mouse or RET) in a maximized tree-window
+the default behavior of ECB is the following:
+
+Maximized directories-window: When selecting a directory then first
+automatically the maximized directories-window will be "minimized" (i.e. all
+ecb-windows of current layout are displayed) if the current layout contains a
+sources-buffer and no sources are shown in the directories-window - see
+`ecb-show-sources-in-directories-buffer'.  So the source-files can be
+displayed in the sources-window.
+
+Maximized sources- or history-window: When selecting a source-file in one of
+these buffers then first automatically the maximized window will be
+"minimized" (i.e. all ecb-windows of current layout are displayed) if the
+current layout contains a methods-buffer. So the tag-contents of the selected
+source-file can be displayed in the methods-window.
+
+For a even smarter behavior ECB offers the option
+`ecb-maximize-next-after-maximized-select' which automatically maximizes the
+next logical tree-window after a node selection. The definition of "next
+logical is": Directories -> sources, sources/history -> methods. But if the
+current maximized tree-buffer is also contained in the option
+`ecb-tree-do-not-leave-window-after-select' (see also the tree-buffer-command
+`ecb-toggle-do-not-leave-window-after-select' which is bound to <C-t> in each
+tree-buffer) then ECB does *not* maximize the next logical tree-window but
+point stays in the currently maximized tree-buffer so for example the user
+can select more than one source-file from the sources-buffer.
+
+---------- Footnotes ----------
+
+(1) This command is adviced per default, see *Note The edit-area::.
+
+
+File: ecb.info,  Node: Back/forward navigation,  Next: ECB-window synchronizing,  Prev: Maximizing the ECB windows,  Up: Usage of ECB
+
+6.11 Back- and forward navigation like a browser
+================================================
+
+With ECB you can "browse" in your source-files like with a web-browser. This
+means ECB stores the current buffer- and window-position relative to the
+current tag(1) in the edit-window after
+
+   - selecting a tag in the ECB-methods buffer or
+
+   - selecting a source-file in the ECB-sources/history-buffer.
+
+ECB offers two commands `ecb-nav-goto-next' (`C-c . n') and
+`ecb-nav-goto-previous' (`C-c . p') to go forward and backward within this
+navigation history-list. These commands are also available via the menu "ECB
+-> Navigate".
+
+Aside normal "location-browsing" this is useful for example in a scenario
+where the buffer is narrowed to a tag (see `ecb-tag-visit-post-actions'):
+
+  1. You edit a function
+
+  2. Goto another function above the current in the same file
+
+  3. Add a few lines
+
+  4. Call ecb-nav-goto-previous
+
+     Now you will edit at the same place in the function.
+
+---------- Footnotes ----------
+
+(1) e.g. a method, a variable or any other semantic tag
+
+
+File: ecb.info,  Node: ECB-window synchronizing,  Next: Stealthy background tasks,  Prev: Back/forward navigation,  Up: Usage of ECB
+
+6.12 Synchronization of the ECB-windows
+=======================================
+
+Per default ECB synchronizes automatically the contents of the ECB-windows
+(e.g. tree-buffers) with the current active edit-window (rsp. the current
+buffer of the edit window).
+
+ECB distinguishes between the so called "basic" ECB-windows (for a general
+description see *Note Basic ECB-windows::) and add-on ECB-windows (*note
+Add-on ECB-windows::). This distinction is also important concerning
+synchronization:
+
+The basic ECB-windows are always synchronized together whereas for each add-on
+ECB-window a separate synchronization option is offered.
+
+This section describes at beginning some general synchronization aspects
+(common for all ECB-windows, basic ones as well as add-ons), then the
+synchronization of the basic-ECB-windows and finally the synchronization of
+the add-on ECB-windows.
+
+* Menu:
+
+* General synchronization aspects::       General synchronization aspects
+* Synchronization of basic ECB-windows::  Synchronization of basic ECB-windows
+* Add-on synchronization::                Synchronization of add-on ECB-windows
+
+
+File: ecb.info,  Node: General synchronization aspects,  Next: Synchronization of basic ECB-windows,  Prev: ECB-window synchronizing,  Up: ECB-window synchronizing
+
+6.12.1 General synchronization aspects
+--------------------------------------
+
+For each separate ECB-window-synchronization (remember: One common for the
+basic ECB-windows, one for each add-on ECB-window) ECB offers the following
+option-triple (demonstrated for the basic ECB-windows):
+
+   * `ecb-basic-buffer-sync':
+
+     Enables or disables the synchronization in general.
+
+     If active then the synchronization for the related
+     ECB-window-buffers/windows takes place whenever a buffer changes in an
+     edit window or if another edit-window with another buffer will be
+     selected, if deactivated then never.  But you can also set this option
+     to a list of major-modes and then the sync.  will only be done if the
+     major-mode of the current buffer does NOT belong to this list.
+
+     But in every case the synchronization only takes place if the major-mode
+     of the current-buffer in the current selected edit-window has a relation
+     to files or directories. Examples for the former one are all
+     programming-language-modes like `c++-mode' or `java-mode', `Info-mode'
+     too, an example for the latter one is `dired-mode'. For all major-modes
+     related to non-file/directory-buffers like `help-mode', `customize-mode'
+     and others a synchronization will never be done!
+
+     It's recommended to exclude at least `Info-mode' because it makes no
+     sense to synchronize the ECB-windows after calling the Info help.  Per
+     default also `dired-mode' is excluded but it can also making sense to
+     synchronize the ECB-directories/sources windows with the current
+     directory of the dired-buffer in the edit-window.
+
+   * `ecb-basic-buffer-sync-delay':
+
+     This option takes only effect if the synchronization is switched on via
+     `ecb-basic-buffer-sync' and determines when ECB synchronizes.
+
+     This option sets the time in seconds (fractions allowed) Emacs must be
+     idle before the related ECB-window(s) are synchronized. If nil then
+     there is no delay, means synchronization takes place immediately. A
+     small value of about 0.25 seconds saves CPU resources and you get even
+     though almost the same effect as if you set no delay.
+
+     Per default ECB always synchronizes on idle-basis and it is strongly
+     recommened not to change this (ie. not setting the delay-option to nil)
+     because this can be very performance consuming (e.g. at least the check
+     if a synchronization must be performed is done after *every* key- or
+     mouse-button press!
+
+     Some fraction of a second is probably always the best choice, because it
+     does not cost cpu-power and nonetheless the synchronization takes place
+     quite immediately. So in most cases there is no need to bother with this
+     option, just use the default value.
+
+   * `ecb-basic-buffer-sync-hook':
+
+     For each separate synchronization a hook variable is offered where you
+     can hook in with some elisp code if you need some tasks performed
+     afterwards the synchronization has been finished.
+
+     In most cases no hook will be needed.
+
+
+Analogous to the shown options for the basic ECB-windows each add-on
+ECB-window has its own separate triple of these options, named congruent to
+the name of the buffer-name of the add-on ECB-window (e.g. for the analyse
+ECB-window with the buffer-name hold in `ecb-analyse-buffer-name' these three
+options are named `ecb-analyse-buffer-sync', `ecb-analyse-buffer-sync-delay'
+and `ecb-analyse-buffer-sync-hook'.  For some specialities see *Note Add-on
+synchronization::.
+
+*Please note*: With the command `ecb-window-sync' you can do a manual
+synchronization if the automatic one is switched off or if you just want to
+do this! See the documantation of this command.
+
+
+File: ecb.info,  Node: Synchronization of basic ECB-windows,  Next: Add-on synchronization,  Prev: General synchronization aspects,  Up: ECB-window synchronizing
+
+6.12.2 Synchronization of the basic ECB-windows
+-----------------------------------------------
+
+This section describes some special aspects of the synchronizing of the basic
+ECB-windows:
+
+   * ECB-directories:
+
+     This windows is synchronized to display the directory where the
+     source-file which is displayed in the current active edit-window is
+     located. If the source-path (i.e. an element of the option
+     `ecb-source-path') containing this directory is not expanded it will be
+     auto. expanded according to the value of the option
+     `ecb-auto-expand-directory-tree' (*note ecb-directories::).
+
+   * ECB-sources:
+
+     The ECB-sources-buffer contains after synchronizing all the sources of
+     the directory of the "current" source-file displayed in the edit-window.
+     The entry of the "current" source-file is highlighted.
+
+   * ECB-methods:
+
+     Contains after synchronizing all the tags of the buffer in the current
+     selected edit-window, i.e. all methods, variables etc... depending on
+     the major-mode.
+
+   * ECB-history:
+
+     Highlights the entry of the buffer displayed in the current active
+     edit-window if this buffer is a source-file.
+
+
+The synchronization can be customized via the option triple
+`ecb-basic-buffer-sync', `ecb-basic-buffer-sync-delay' and
+`ecb-basic-buffer-sync-hook'. The four basic ECB-windows of ECB are always
+synchonized together, never separate!
+
+
+File: ecb.info,  Node: Add-on synchronization,  Prev: Synchronization of basic ECB-windows,  Up: ECB-window synchronizing
+
+6.12.3 Synchronization of add-on ECB-windows
+--------------------------------------------
+
+Currently ECB has a separate synchronization for the add-on ECB-windows
+ECB-analyse and ECB-symboldef and also for the eshell and
+speedbar-integration. Customizing can be done via:
+
+   * ECB-analyse: `ecb-analyse-buffer-sync', `ecb-analyse-buffer-sync-delay'
+     and `ecb-analyse-buffer-sync-hook'
+
+   * ECB-symboldef: `ecb-symboldef-buffer-sync',
+     `ecb-symboldef-buffer-sync-delay' and `ecb-symboldef-buffer-sync-hook'
+
+   * ECB-eshell: `ecb-eshell-buffer-sync', `ecb-eshell-buffer-sync-delay' and
+     `ecb-eshell-buffer-sync-hook'
+
+   * ECB-speedbar: `ecb-speedbar-buffer-sync',
+     `ecb-speedbar-buffer-sync-delay' and `ecb-speedbar-buffer-sync-hook'
+
+
+Each enabling- and delay-option has an additonal special value 'basic which is
+the default for all these options because it allows to use the current setting
+of `ecb-basic-buffer-sync' rsp. `ecb-basic-buffer-sync-delay' for the add-on
+synchronization too. Example: If `ecb-basic-buffer-sync' is set to the value
+`(Info-mode dired-mode)' then a setting of 'basic for
+`ecb-analyse-buffer-sync' means that synchronization is always done unless
+the current major-mode is Info-mode or dired-mode. Per default all add-on
+synchronization enabling- and delay-options are set to 'basic with one
+exeption: `ecb-analyse-buffer-sync-delay': See the documentation of this
+option for a detailed description.
+
+In general it is recommended to read the documentation of all these options.
+
+
+File: ecb.info,  Node: Stealthy background tasks,  Next: Interactive ECB commands,  Prev: ECB-window synchronizing,  Up: Usage of ECB
+
+6.13 Stealthy background-tasks of ECB
+=====================================
+
+ECB performs some tasks stealthily in the background and also interruptable
+by the user because these tasks can be time-consuming and could otherwise
+block ECB. Currently the following tasks are performed stealthily and in the
+background by ECB:
+
+Prescann directories for emptyness
+     Prescann directories and display them as empty or not-empty in the
+     directories-buffer. See the documentation of the option
+     `ecb-prescan-directories-for-emptyness' for a description.
+
+File is read only
+     Check if sourcefile-items of the directories- or sources-buffer are
+     read-only or not. See documentation of the option
+     `ecb-sources-perform-read-only-check'.
+
+Version-control-state
+     Checks the version-control-state of files in directories which are
+     managed by a VC-backend. See the option `ecb-vc-enable-support'.
+
+
+All of these tasks (e.g. checking if a directory is empty or not) perform a
+certain action for all directories or sources displayed in the current
+visible tree-buffers of ECB. Normally there should be no annoying delay for
+the user because each of these tasks will be only performed when Emacs is
+idle and will be interrupted immediatelly when a user hits a key or clicks
+the mouse but especially for remote-directories one single action (e.g.
+checking if a certain directory is empty or checking the VC-state of a
+sourcefile in such a remote directory) can be very time-consuming and such a
+single action is not interruptable (an interrupt can only occur between the
+single-actions for two directories or sources) For a further discussion how
+to deal best with remote directories see *Note Remote directories::.!
+
+ECB offers for all stealthy tasks three steps of activation:
+   * `t': Switch on this feature.
+
+   * `unless-remote': Switch on this feature but not for remote directories.
+     The term "remote" means here directories which are used via tramp,
+     ange-ftp or efs. So mounted directories are counted not as remote
+     directories here even if such a directory is maybe hosted on a remote
+     machine. But normally only directories in a LAN are mounted so there
+     should be no performance-problems with such mounted directories.
+
+   * `nil': Switch off this feature completely.
+
+In combination with the option `ecb-stealthy-tasks-delay' these three choices
+already allow adapting the stealthy tasks to most needs. But to offer finest
+granularity for which directories a certain stealthy task should be switched
+on and for which not ECB offers for every stealthy task an additional option
+which allows a finer adjustment:
+
+   * Prescanning directories for emptyness:
+     `ecb-prescan-directories-exclude-regexps'.
+
+   * Checking the read-only-state of a sourcefile:
+     `ecb-read-only-check-exclude-regexps'
+
+   * Checking the VC-state of sourcefiles: `ecb-vc-directory-exclude-regexps'
+
+These options take only effect when the related task is not completely
+switched off. If this is the case they allow excluding certain directories
+(or the sources of directories) from being processed by a certain stealthy
+task.
+
+
+File: ecb.info,  Node: Interactive ECB commands,  Prev: Stealthy background tasks,  Up: Usage of ECB
+
+6.14 Interactive ECB commands
+=============================
+
+ECB offers a lot of interactive commands. Some of these commands prompt the
+user in the minibuffer if called with a prefix argument.
+
+Example: If `ecb-clear-history' is called with a prefix argument then you
+will be prompted in the minibuffer with:
+
+   Clear from history: [all, not-existing-buffers, existing-buffers]
+
+You can choose one of the options enclosed in brackets with TAB-completion;
+hitting RET direct after the prompt chooses auto. the first offered option
+(in the example above "all").
+
+*Please note*: The following interactive commands of ECB are listed without
+the prefix "ecb-" (e.g. the command `ecb-activate' is listed with name
+"activate"). This has been done for a better readable command index. *Note
+Command Index::.
+
+ -- Command: activate
+     Activates ECB and creates the special buffers for the choosen layout.
+     For the layout see `ecb-layout-name'. This function always raises the
+     ECB-frame if called from another frame. This is the same as calling
+     `ecb-minor-mode' with a positive argument.
+
+ -- Command: add-all-buffers-to-history
+     Add all current file-buffers to the history-buffer of ECB.  Dependend on
+     the values of `ecb-history-make-buckets' and `ecb-history-sort-method'
+     afterwards the history is bucketized or not and sorted either by name or
+     by extension (if bucketized then the sorting is only within each
+     bucket). If `ecb-history-sort-method' is nil the most recently used
+     buffers are on the top of the history and the seldom used buffers at the
+     bottom (again: when bucketized then this holds only within each bucket).
+
+ -- Command: analyse-buffer-sync
+     Synchronize the analyse buffer with the current buffer and point. This
+     means in fact display the current analysis for current point.
+
+ -- Command: change-layout &optional preselect-type
+     Select a layout-name from all current available layouts (TAB-completion
+     is offered) and change the layout to the selected layout-name. If
+     optional argument PRESELECT-TYPE is not nil then you can preselect a
+     layout-type \(TAB-completion is offered too) and then you will be asked
+     only for layouts of that preselected type. Note: This function works by
+     changing the option `ecb-layout-name' but only for current Emacs-session.
+
+ -- Command: clear-history
+     Clears the history-buffer.
+
+ -- Command: customize
+     Open a customize-buffer for all customize-groups of ECB.
+
+ -- Command: customize-most-important
+     Open a customize-buffer for the most important options of ECB.
+
+ -- Command: create-new-layout
+     Start process for interactively creating a new ECB-layout (*note
+     Creating a new ECB-layout::).
+
+ -- Command: cycle-maximized-ecb-buffers
+     Cycles through all ecb-buffers of current layout by maximizing exactly
+     one of the ecb-windows after every cycle-step.
+
+ -- Command: cycle-through-compilation-buffers &optional choose-buffer
+     Cycle through all compilation buffers currently open and display them
+     within the compilation window `ecb-compile-window'. If the currently
+     opened buffer within the compilation window is not a compilation buffer,
+     we jump to the first compilation buffer. If not we try to loop through
+     all compilation buffers. If we hit the end we go back to the beginning.
+
+     If CHOOSE-BUFFER is not `nil' then the user will be prompted for the
+     compilation-buffer to switch to.
+
+ -- Command: deactivate
+     Deactivates the ECB and kills all ECB buffers and windows.
+
+ -- Command: delete-new-layout
+     Select a layout-name for a layout created by `ecb-create-new-layout' and
+     delete this layout. This means the layout-definition is removed from the
+     file `ecb-create-layout-file' and the layout-function and associated
+     aliases are unbound.
+
+ -- Command: display-news-for-upgrade &optional FULL-NEWS
+     Display the most important NEWS after an ECB-upgrade. If you call this
+     function but no ECB-upgrade has been performed before starting ECB then
+     nothing is display unless FULL-NEWS is not nil.
+
+     If FULL-NEWS is not nil then the NEWS-file is displayed in another
+     window.
+
+ -- Command: display-upgraded-options
+     Display a information-buffer which options have been upgraded or reset.
+     Offers two buttons where the user can decide if the upgraded options
+     should also being saved by ECB for future settings or if the buffer
+     should be killed.
+
+     If saving is possible this command display where the options would be
+     saved. It is that file Emacs uses to save customize-settings. This file
+     is "computed" from the settings in `custom-file' and `user-init-file'
+     (see the documentation of these variables).
+
+     ECB automatically makes a backup-file of that file which will be
+     modified by storing the upgraded rsp. renamed ECB-options. This backup
+     file gets a unique name by adding a suffix ".before_ecb_<version>" to
+     the name of the modified file. If such a file already exists ECB adds a
+     unique number to the end of the filename to make the filename unique.
+     This is a safety mechanism if something fails during storing the
+     upgraded options, so you never lose the contents of your
+     customization-file!
+
+ -- Command: expand-methods-nodes &optional force-all
+     Set the expand level of the nodes in the ECB-methods-buffer.
+
+     This command asks in the minibuffer for an indentation level LEVEL. With
+     this LEVEL you can precisely specify which level of nodes should be
+     expanded. LEVEL means the indentation-level of the nodes.
+
+     A LEVEL value X means that all nodes with an indentation-level <= X are
+     expanded and all other are collapsed. A negative LEVEL value means all
+     visible nodes are collapsed.
+
+     Nodes which are not indented have indentation-level 0!
+
+     Which node-types are expanded (rsp. collapsed) by this command depends
+     on the options `ecb-methods-nodes-expand-spec' and
+     `ecb-methods-nodes-collapse-spec'! With optional argument FORCE-ALL all
+     tags will be expanded/collapsed regardless of the values of these
+     options.
+
+     Examples:
+        - LEVEL = 0 expands only nodes which have no indentation itself.
+
+        - LEVEL = 2 expands nodes which are either not indented or indented
+          indented once or twice
+
+        - LEVEL ~ 10 should normally expand all nodes expect there are nodes
+          which are indented deeper than 10.
+
+     Note 1: This command switches off auto. expanding of the method-buffer
+     if `ecb-expand-methods-switch-off-auto-expand' is not nil. But it can be
+     switched on again quickly with `ecb-toggle-auto-expand-tag-tree' or
+     `[C-c . a]'.
+
+     Note 2: All this is only valid for file-types parsed by semantic. For
+     other file types which are parsed by imenu or etags (see
+     `ecb-process-non-semantic-files') FORCE-ALL is always true!
+
+ -- Command: dump-semantic-toplevel
+     Dump the current semantic-tags in special buffer and display them.
+
+ -- Command: eshell-current-buffer-sync
+     Synchronize the eshell with the directory of current source-buffer.
+     This is only done if the eshell is currently visible in the
+     compile-window of ECB and if either this function is called
+     interactively or `ecb-eshell-buffer-sync' is not nil.
+
+ -- Command: eshell-recenter
+     Recenter the eshell window so that the prompt is at the buffer-end.
+
+ -- Command: expand-directory-nodes
+     Set the expand level of the nodes in the ECB-directories-buffer. For
+     argument LEVEL see `ecb-expand-methods-nodes'.
+
+     Be aware that for deep structured paths and a lot of source-paths this
+     command can last a long time - depending on machine- and
+     disk-performance.
+
+ -- Command: goto-window-analyse
+     Make the ECB-analyse window the current window.
+
+ -- Command: goto-window-compilation
+     Goto the ecb compilation window `ecb-compile-window'.
+
+ -- Command: goto-window-directories
+     Make the ECB-directories window the current window. If
+     `ecb-use-speedbar-instead-native-tree-buffer' is `dir' then goto to the
+     speedbar-window.
+
+ -- Command: goto-window-ecb-by-smart-selection
+     selects a special ecb-browsing-window by smart selection. The command
+     offers a list of all special ecb-windows by buffer-name. Selecting the
+     buffer-name will select the displaying window. Which special ecb-windows
+     are offered depends on the currently selected window: If not a special
+     ecb-window is the currently selected-window then all edit-windows are
+     offered in canonical order (means from top-left to button-right). If an
+     ecb-window is the currently selected-window then all other(!) special
+     ecb-windows are offered, beginning with the next special ecb-window to
+     the current ecb-window (the following special ecb-windows also in
+     canonical order). If there is only one senseful destination-ecb-window
+     then this window is immediately selected, without confirmation (e.g.:
+     There are two special ecb-windows and point stays in one of them. Or
+     there is only one ecb-window and point stays either in one of the
+     edit-windows or in the compile-window).
+
+     If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+     destination-windows are displayed in the message-area and only hitting
+     TAB offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all
+     possible destinations are immediately shown in a completion-buffer.
+
+ -- Command: goto-window-edit-by-smart-selection
+     Selects an edit-window by smart selection. The command offers a list of
+     all edit-windows by buffer-name. Selecting the buffer-name will select
+     the displaying window. Which edit-windows are offered depends on the
+     currently selected window: If not an edit-window is the currently
+     selected-window then all edit-windows are offered in canonical order
+     (means from top-left to button-right). If an edit-window is the
+     currently selected-window then all other(!) edit-windows are offered,
+     beginning with the next edit-window to the current edit-window (the
+     following edit-windows also in canonical order). If there is only one
+     senseful destination-edit-window then this window is immediately
+     selected, without confirmation (e.g.: There are two edit-windows and
+     point stays in one of them. Or there is only one edit-window and point
+     stays either in one of the special ecb-windows or in the compile-window).
+
+     If optional argument USE-IMMEDIATE-COMPLETION is nil then all possible
+     destination-windows are displayed in the message-area and only hitting
+     TAB offers completion. If USE-IMMEDIATE-COMPLETION is not nil then all
+     possible destinations are immediately shown in a completion-buffer.
+
+ -- Command: goto-window-edit1
+     Make the (first) edit-window window the current window.
+
+ -- Command: goto-window-edit2
+     Make the second edit-window (if available) window the current window.
+
+ -- Command: goto-window-edit-last
+     Make the last selected edit-window window the current window. This is
+     the same as if `ecb-mouse-click-destination' is set to `last-point'.
+
+ -- Command: goto-window-history
+     Make the ECB-history window the current window.
+
+ -- Command: goto-window-methods
+     Make the ECB-methods window the current window. If
+     `ecb-use-speedbar-instead-native-tree-buffer' is `method' then goto to
+     the speedbar-window.
+
+ -- Command: goto-window-sources
+     Make the ECB-sources window the current window. If
+     `ecb-use-speedbar-instead-native-tree-buffer' is `source' then goto to
+     the speedbar-window.
+
+ -- Command: history-filter
+     Apply a filter to the history-buffer to reduce the number of entries.
+     So you get a better overlooking. There are three choices:
+
+        - Filter by extension: Just insert the extension you want the
+          History-buffer being filtered.  Insert the extension without
+          leading dot!
+
+        - Filter by regexp: Insert the filter as regular expression.
+
+        - No filter: This means to display an entry for all currently living
+          file-buffers.
+
+ -- Command: jde-display-class-at-point
+     Display in the ECB-methods-buffer the contents (methods, attributes
+     etc...) of the class which contains the definition of the "thing" under
+     point (this can be a variable-name, class-name, method-name,
+     attribute-name). This function needs the same requirements to work as
+     the method-completion feature of JDEE (see `jde-complete')!. The
+     source-file is searched first in `jde-sourcepath', then in
+     `jde-global-classpath', then in $CLASSPATH, then in current-directory.
+
+     Works only for classes where the source-code (i.e. the *.java-file) is
+     available.
+
+ -- Command: maximize-window-analyse
+     Maximize the ECB-analyse-window. I.e. delete all other ECB-windows, so
+     only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Works also if the ECB-analyse-window is not visible in
+     current layout.
+
+ -- Command: maximize-window-directories
+     Maximize the ECB-directories-window, i.e. delete all other ECB-windows,
+     so only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Works also if the ECB-directories-window is not visible
+     in current layout.
+
+ -- Command: maximize-window-sources
+     Maximize the ECB-sources-window, i.e. delete all other ECB-windows, so
+     only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Works also if the ECB-sources-window is not visible in
+     current layout.
+
+ -- Command: maximize-window-methods
+     Maximize the ECB-methods-window, i.e. delete all other ECB-windows, so
+     only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Works also if the ECB-methods-window is not visible in
+     current layout.
+
+ -- Command: maximize-window-history
+     Maximize the ECB-history-window, i.e. delete all other ECB-windows, so
+     only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Works also if the ECB-history-window is not visible in
+     current layout.
+
+ -- Command: maximize-window-speedbar
+     Maximize the ECB-speedbar-window, i.e. delete all other ECB-windows, so
+     only one ECB-window and the edit-window(s) are visible (and maybe a
+     compile-window). Does nothing if the speedbar-window is not visible
+     within the ECB-frame.
+
+ -- Command: methods-filter
+     Apply a filter to the Methods-buffer to reduce the number of entries.
+     So you get a better overlooking. There are six choices:
+
+        * Filter by protection: Just insert the protection you want the
+          Methods-buffer being filtered: private, protected or public!
+
+        * Filter by regexp: Insert the filter as regular expression.
+
+        * Filter by tag-class: You can filter by the tag-classes of current
+          major-mode. The available tag-classes come from the variable
+          `semantic--symbol->name-assoc-list'. The are normally methods,
+          variables etc.
+
+        * Filter by current type: In languages which have types like Java or
+          C++ this filter displays only the current type and all its members
+          (e.g. attributes and methods). If ECB can not identify the current
+          type in the source-buffer or in the methods-window then nothing
+          will be done.
+
+        * Filter by a filter-function: Such a function gets two arguments: a
+          tag and the source-buffer of this tag. If the tag should be
+          displayed (i.e. not being filtered out) then the function has to
+          return not nil otherwise nil.
+
+        * No special filter: This means to display all tags specified with
+          the option `ecb-show-tokens'. If currently some of the above
+          filters are applied they will be all removed.
+
+        * Delete the last added: This removes only the topmost filter-layer,
+          means that filter added last.
+
+     The protection-, current-type- and the tag-class-filter are only
+     available for semantic-supported sources.
+
+     Be aware that the tag-list specified by the option `ecb-show-tags' is
+     the basis of all filters, i.e. tags which are excluded by that option
+     will never be shown regardless of the filter type here!
+
+     All tags which match the applied filter(s) will be displayed in the
+     Methods-buffer.
+
+     If called with a prefix-argument or when optional arg INVERSE is not nil
+     then an inverse filter is applied to the Methods-buffer, i.e. all tags
+     which do NOT match the choosen filter will be displayed in the
+     Methods-buffer!
+
+     Per default the choosen filter will be applied on top of already
+     existing filters. This means that filters applied before are combined
+     with the new filter. This behavior can changed via the option
+     `ecb-methods-filter-replace-existing'. But regardless of the setting in
+     `ecb-methods-filter-replace-existing' applying one of the not-inverse
+     filters protection, tag-class or current-type always replaces exactly
+     already existing filters of that type. On the other hand applying more
+     than one inverse tag-class- or protection-filter can make sense.
+
+     Such a filter is only applied to the current source-buffer, i.e. each
+     source-buffer can have its own tag-filters.
+
+     The current active filter will be displayed in the modeline of the
+     Methods-buffer [regexp, prot (= protection), tag-class, function (=
+     filter-function)]. If an inverse filter has been applied then this is
+     signalized by a preceding caret ^. If currently more than 1 filter is
+     applied then always the top-most filter is displayed in the modeline but
+     the fact of more than 1 filter is visualized by the number of the
+     filters - included in parens. You can see all currently applied filters
+     by moving the mouse over the filter-string in modeline of the
+     Methods-buffer: They will displayed as help-echo.
+
+     See the option `ecb-default-tag-filter' if you search for automatically
+     applied default-tag-filters.
+
+ -- Command: methods-filter-current-type
+     Display in the Methods-buffer only the current type and its members.
+     For further details see `ecb-methods-filter'.
+
+ -- Command: methods-filter-delete-last
+     Remove the most recent filter from the Methods-buffer. For further
+     details see `ecb-methods-filter'.
+
+ -- Command: methods-filter-function &optional inverse
+     Filter the methods-buffer by a function. If INVERSE is not nil (called
+     with a prefix arg) then an inverse filter is applied. For further
+     details see `ecb-methods-filter'.
+
+ -- Command: methods-filter-nofilter
+     Remove any filter from the Methods-buffer. For further details see
+     `ecb-methods-filter'.
+
+ -- Command: methods-filter-protection &optional inverse
+     Filter the methods-buffer by protection. If INVERSE is not nil (called
+     with a prefix arg) then an inverse filter is applied. For further
+     details see `ecb-methods-filter'.
+
+ -- Command: methods-filter-regexp &optional inverse
+     Filter the methods-buffer by a regexp. If INVERSE is not nil (called
+     with a prefix arg) then an inverse filter is applied. For further
+     details see `ecb-methods-filter'.
+
+ -- Command: methods-filter-tagclass &optional inverse
+     Filter the methods-buffer by tag-class. If INVERSE is not nil (called
+     with a prefix arg) then an inverse filter is applied. For further
+     details see `ecb-methods-filter'.
+
+ -- Command: minor-mode &optional arg
+     Toggle ECB minor mode. With prefix argument ARG, turn on if positive,
+     otherwise off. Return non-`nil' if the minor mode is enabled.
+
+ -- Command: nav-goto-previous
+     Go backward in the navigation history-list, see *Note Back/forward
+     navigation::.
+
+ -- Command: nav-goto-next
+     Go forward in the navigation history-list, see *Note Back/forward
+     navigation::.
+
+ -- Command: rebuild-methods-buffer
+     Updates the methods buffer with the current buffer after deleting the
+     complete previous parser-information, means no semantic-cache is used!
+     Point must stay in an edit-window otherwise nothing is done. This method
+     is merely needed for semantic parsed buffers if semantic parses not the
+     whole buffer because it reaches a not parse-able code or for buffers not
+     supported by semantic but by imenu or etags.
+
+     Examples when a call to this function can be necessary:
+
+        * If an Elisp-file is parsed which contains in the middle a defun X
+          where the closing ) is missing then semantic parses only until this
+          defun X is reached and you will get an incomplete ECB-method buffer.
+          In such a case you must complete the defun X and then call this
+          function to completely reparse the Elisp-file and rebuild the ECB
+          method buffer!
+
+        * For not semantic supported buffers which can be parsed by imenu or
+          etags (see `ecb-process-non-semantic-files') because for these
+          buffers there is no built-in auto-rebuild mechanism. For these
+          buffers this command calls
+          `ecb-rebuild-methods-buffer-for-non-semantic'.
+
+     For non-semantic-sources supported by etags the option
+     `ecb-auto-save-before-etags-methods-rebuild' is checked before
+     rescanning the source-buffer and rebuilding the methods-buffer.
+
+     If point is in one of the ecb-windows or in the compile-window then this
+     command rebuids the methods-buffer with the contents of the
+     source-buffer the last selected edit-window.
+
+ -- Command: redraw-layout &optional ARG
+     Redraw the ECB screen.
+
+     Do not call this command from elisp-program but only interactively!
+
+     Called without a prefix-argument the state of the ECB-frame-layout will
+     preserved. This means:
+
+        - The state of compile-window (hidden or visible) will be preserved
+          but if visible then the height will be as specified in
+          `ecb-compile-window-height'.
+
+        - The state of the ECB-windows will be preserved (hidden or visible)
+          but if visible then the sizes will be as specified in the layout
+          (and with the options `ecb-windows-width' and `ecb-windows-height')
+          or as stored with `ecb-store-window-sizes'.
+
+     If called with ONE prefix-argument (`[C-u]') then the layout will be
+     drawn with all ECB-windows and also with a visible compile-window (when
+     `ecb-compile-window-height' is not nil). The splitting-state of the
+     edit-area will be preserved.
+
+     If called with TWO prefix-arguments (i.e. hitting `[C-u]' twice:
+     (`[C-u]' `[C-u]') then an emergency-redraw will be performed.  This
+     means the same as if called with one prefix-argument (s.a.) but the
+     splitting-state of the edit-area will NOT be preserved but all
+     edit-windows besides the current one will be deleted. Use this only if
+     there are some anomalies after standard redraws!
+
+     If the variable `ecb-redraw-layout-quickly' is not nil then the redraw
+     is done by the `ecb-redraw-layout-quickly' function, otherwise by
+     `ecb-redraw-layout-full'.
+
+     Please not: It's strongly recommended to use the quick redraw only if
+     you have really slow machines where a full redraw takes several seconds
+     because the quick redraw is not really safe and has some annoying
+     drawbacks! On normal machines the full redraw should be done in << 1s so
+     there should be no need for the quick version!
+
+ -- Command: restore-default-window-sizes
+     Resets the sizes of the ECB windows to their default values.
+
+ -- Command: restore-window-sizes
+     Sets the sizes of the ECB windows to their stored values. See option
+     `ecb-layout-window-sizes' and command `ecb-store-window-sizes'.
+
+ -- Command: select-ecb-frame
+     Selects the `ecb-frame' if ECB is activated - otherwise reports an error.
+
+ -- Command: show-help &optional format
+     Shows the online help of ECB either in Info or in HTML format depending
+     on the value of `ecb-show-help-format'. If called with prefix argument,
+     i.e. if FORMAT is not nil then the user is prompted to choose the format
+     of the help (Info or HTML). If an error about not finding the needed
+     help-file occurs please take a look at the options
+     `ecb-help-info-start-file' and `ecb-help-html-start-file'!
+
+     Note: If you got ECB as a standard XEmacs-package maybe the
+     HTML-online-documentation is not included.
+
+ -- Command: show-layout-help
+     Select a name of a layout and shows the documentation of the associated
+     layout-function. At least for the built-in layouts the documentation
+     contains a picture of the outline of the chosen layout.
+
+ -- Command: show-tip-of-the-day
+     Show tip of the day if `ecb-tip-of-the-day' is not nil or if called
+     interactively.
+
+ -- Command: sources-filter
+     Apply a filter to the sources-buffer to reduce the number of entries.
+     So you get a better overlooking. There are three choices:
+
+        - Filter by extension: Just insert the extension you want the
+          Sources-buffer being filtered.  Insert the extension without
+          leading dot!
+
+        - Filter by regexp: Insert the filter as regular expression.
+
+        - No filter: This means to display an entry for every file in the
+          current selected directory (all except these filter already
+          filtered out by `ecb-source-file-regexps' and
+          `ecb-sources-exclude-cvsignore').
+
+     Such a filter is only applied to the current selected directory, i.e.
+     each directory has its own filtered sources-buffer.
+
+ -- Command: store-window-sizes &optional FIX
+     Stores the sizes of the ECB windows for the current layout. The size of
+     the ECB windows will be set to their stored values when
+     `ecb-redraw-layout' or `ecb-restore-window-sizes' is called.  To reset
+     the window sizes to their default values call
+     `ecb-restore-default-window-sizes'. Please read also the documentation
+     of `ecb-layout-window-sizes'!
+
+     The windows sizes are stored per default as fractions of current
+     frame-width and -height of the ecb-frame, so the stored values will
+     "work" for other frame sizes too. If a permanent compile-window is
+     visible then ECB will tell you that window-sizes should be stored with
+     hidden compile-window and ask you if you want proceed; if you proceed
+     then the window-heights will be stored as fractions of current
+     (frame-height minus current visible compile-window-height) so you should
+     ensure that the current compile-window has its standard-height as
+     specified in `ecb-compile-window-height'!. If FIX is not nil (means
+     called with a prefix argument) then always the fixed values of current
+     width and height are stored!
+
+ -- Command: submit-problem-report
+     Submit a problem report for the ECB to the ECB mailing-list. This
+     command generates in the edit-window a problem-report which contains
+     already the current values of all ECB options, the current
+     backtrace-buffer if there is any and the current message-buffer. You
+     will be asked for a problem-report subject and then you must insert a
+     description of the problem. Please describe the problem as detailed as
+     possible!
+
+ -- Command: toggle-auto-expand-tag-tree &optional arg
+     Toggle auto expanding of the ECB-methods-buffer. With prefix argument
+     ARG, make switch on if positive, otherwise switch off. If the effect is
+     that auto-expanding is switched off then the current value of
+     `ecb-auto-expand-tag-tree' is saved so it can be used for the next
+     switch on by this command.
+
+ -- Command: toggle-compile-window &optional arg
+     Toggle the visibility of the compile-window of ECB. With prefix argument
+     ARG, make visible if positive, otherwise invisible. The height of the
+     compile-window is always the current value of
+     `ecb-compile-window-height'! If called and `ecb-compile-window-height'
+     is nil then ECB asks for the height of the compile-window, sets this
+     height as new value of `ecb-compile-window-height' and displays the
+     compile-window (so if you have called this command by mistake and you do
+     not want a compile-window you have to quit with <C-g>).
+
+ -- Command: toggle-compile-window-height &optional arg
+     Toggle whether the `ecb-compile-window' is enlarged or not. If ARG > 0
+     then shrink or enlarge the the compile-window according to the value of
+     `ecb-enlarged-compilation-window-max-height'. But never shrink below the
+     value of `ecb-compile-window-height'. If ARG <= 0 then shrink
+     `ecb-compile-window' to `ecb-compile-window-height' and if ARG is nil
+     then toggle the enlarge-state.
+
+ -- Command: toggle-ecb-windows &optional arg
+     Toggle visibility of the ECB-windows. With prefix argument ARG, make
+     visible if positive, otherwise invisible. This has nothing to do with
+     (de)activating ECB but only affects the visibility of the ECB windows.
+     ECB minor mode remains active!
+
+ -- Command: toggle-layout &optional last-one
+     Toggles between the layouts defined in `ecb-toggle-layout-sequence' (See
+     also option `ecb-show-sources-in-directories-buffer'). Note: This
+     function works by changing the options `ecb-layout-name' but only for
+     current Emacs-session.
+
+     If optional argument LAST-ONE is not nil (e.g. called with a prefix-arg)
+     then always the last selected layout was choosen regardless of the
+     setting in `ecb-toggle-layout-sequence'. The last selected layout is
+     always that layout which was current direct before the most recent
+     layout-switch. So now a user can switch to another layout via
+     `ecb-change-layout' and always come back to his previous layout via
+     `[C-u]' `ecb-toggle-layout'.
+
+ -- Command: toggle-scroll-other-window-scrolls-compile &optional ARG
+     Toggle the state of `ecb-scroll-other-window-scrolls-compile-window'.
+     With prefix argument ARG, set it to `t', otherwise to `nil'. For all
+     details about the scroll-behavior of `scroll-other-window' see the
+     advice documentation of `other-window-for-scrolling'.
+
+ -- Command: update-directories-buffer
+     Updates the ECB directories buffer.
+
+ -- Command: upgrade-options
+     Check for all ECB-options if their current value is compatible to the
+     defined type. If not upgrade it to the new type or reset it to the
+     default-value of current ECB. Try also to upgrade renamed options.
+     Displays all upgraded or reset options with their old (before the
+     upgrade/reset) and new values.
+
+ -- Command: window-sync
+     ynchronizes all special ECB-buffers with current buffer.  Depending on
+     the contents of current buffer this command performs different
+     synchronizing tasks but only if ECB is active and point stays in an
+     edit-window.
+
+        * If current buffer is a file-buffer (or an indirect-buffer with a
+          file-buffer as base-buffer) then all basic ECB-windows
+          (directories, sources, methods and history) are synchronized with
+          current buffer.
+
+        * If current buffer is a dired-buffer then the directory- and the
+          sources-tree-buffer are synchronized if visible
+
+     In addition to this the hooks in `ecb-basic-buffer-sync-hook' run.
+
+     If optional argument ONLY-BASIC-WINDOWS is not nil then only the basic
+     tree-buffer directories, sources, methods and history are synchronized.
+     Otherwise all registered special ecb-buffers are synchronized too.
+
+     See *Note ECB-window synchronizing::.
+
+Most of these functions are also available via the menu "ECB" and also via
+the ECB key-map with prefix `C-c .' (see `ecb-minor-mode' for a complete list
+of the keybindings).
+
+
+File: ecb.info,  Node: Customizing,  Next: Submitting problem report,  Prev: Usage of ECB,  Up: Top
+
+7 Customizing ECB
+*****************
+
+This chapter describes how to customize ECB for your personal taste.  The
+first section introduces some general aspects (which you should really
+know!), the second one gives an overview of the most important options and
+the third one lists all options of ECB (divided into the customize groups).
+
+* Menu:
+
+* General aspects::             General aspects for customizing ECB
+* Most important options::      Which option you must know
+* Customizable options::        All customizable options of ECB
+
+
+File: ecb.info,  Node: General aspects,  Next: Most important options,  Prev: Customizing,  Up: Customizing
+
+7.1 General aspects for customizing ECB
+=======================================
+
+This chapter contains all important informations you should know about
+customizing ECB. The first section gives an answer to the question "`setq' or
+`customize'" and the second section describes what to do when you have to
+customize ECB for a lot of people.
+
+* Menu:
+
+* setq or customize::           Should i use setq or customize?
+* Site-wide customizing::       Site-wide customizing of ECB
+
+
+File: ecb.info,  Node: setq or customize,  Next: Site-wide customizing,  Prev: General aspects,  Up: General aspects
+
+7.1.1 Setq or customize - what should i use?
+--------------------------------------------
+
+The best way to customize all the options of ECB is via the customize-feature
+of (X)Emacs, i.e. means calling the commands `customize-option' or
+`customize-group' etc. This is also the strongly recommended way!
+
+But you can also use `setq' or some Elisp-code to change the values of many
+but not all of the options. The values of the following options *MUST NOT* be
+changed via `setq' or Elisp-code but only with the customize-feature!
+
+   - `ecb-analyse-buffer-sync-delay'
+
+   - `ecb-analyse-show-node-info'
+
+   - `ecb-basic-buffer-sync-delay'
+
+   - `ecb-bucket-node-display'
+
+   - `ecb-compile-window-height'
+
+   - `ecb-compile-window-temporally-enlarge'
+
+   - `ecb-compile-window-width'
+
+   - `ecb-directories-show-node-info'
+
+   - `ecb-eshell-buffer-sync-delay'
+
+   - `ecb-exclude-parents-regexp'
+
+   - `ecb-fix-window-size'
+
+   - `ecb-font-lock-tags'
+
+   - `ecb-highlight-tag-with-point-delay'
+
+   - `ecb-history-show-node-info'
+
+   - `ecb-key-map'
+
+   - `ecb-layout-name'
+
+   - `ecb-layout-window-sizes'
+
+   - `ecb-methods-show-node-info'
+
+   - `ecb-mode-line-data'
+
+   - `ecb-mode-line-display-window-number'
+
+   - `ecb-mode-line-prefixes'
+
+   - `ecb-show-tags'
+
+   - `ecb-source-path'
+
+   - `ecb-sources-show-node-info'
+
+   - `ecb-speedbar-buffer-sync-delay'
+
+   - `ecb-symboldef-buffer-sync-delay'
+
+   - `ecb-toggle-layout-sequence'
+
+   - `ecb-tag-display-function'
+
+   - `ecb-tree-do-not-leave-window-after-select'
+
+   - `ecb-type-tag-display'
+
+   - `ecb-type-tag-expansion'
+
+   - `ecb-use-speedbar-instead-native-tree-buffer'
+
+   - `ecb-windows-height'
+
+   - `ecb-windows-width'
+
+
+File: ecb.info,  Node: Site-wide customizing,  Prev: setq or customize,  Up: General aspects
+
+7.1.2 Site-wide customizing of ECB
+----------------------------------
+
+If you are the administrator for an Emacs-site, means you are responsible for
+the basic customization of a lot of Emacs users, then you maybe need a way to
+customize Emacs and ECB without changing everyones `.emacs'-file and normally
+you will do this with the file `site-start.el'. You can customize all options
+of ECB in a central `site-start.el' (even the options mentioned above!) but
+you *MUST NOT* do this via `setq' but you have to use a mechanism like the
+following(1)!
+
+This section describes two methods how to pre-customize ECB site-wide.  The
+elisp-code contained in the following two subsections has to be copied to the
+file `site-start.el' before it can be used.
+
+But ensure for both methods that you customize the options with the correct
+lisp format. Read carefully the docstrings of the options you want to
+customize from within Elisp-code!
+
+7.1.2.1 Storing all option-settings in the users custom-file
+............................................................
+
+The mechanism described here defines all site-wide-settings in a file
+`site-lisp.el' but stores the values in the users `custom-file' which is
+probably `.emacs'!
+
+First two helper functions are needed, namely `customize-option-get-value' and
+`customize-save-variable-save' whereas the latter one sets the value for an
+option via the customize-mechanism (and is therefore allowed for the
+setq-forbidden options!) but only if the option has no saved value until now
+(i.e. the user has not saved this option for future sessions until now)
+
+   (defun customize-option-get-value (option type)
+     "Return the value of a customizable option OPTION with TYPE, where TYPE
+   can either be 'standard-value \(the default-value of the defcustom) or
+   'saved-value \(the value stored persistent by the user via customize)."
+     (let ((val (car (get option type))))
+       (cond ((not (listp val)) val)
+             ((equal 'quote (car val)) (car (cdr val)))
+             (t (car val)))))
+
+   (defun customize-save-variable-save (option value &optional override)
+     "Calls `customize-save-variable' with OPTION and VALUE if OPTION is a
+   custom-type and if OPTION has no saved-value until now.
+   If OVERRIDE is a function or lambda-form then it is called with two arguments:
+   - OLD-SAVED-VAL: The saved value of OPTION
+   - NEW-VALUE: see argument VALUE.
+   OVERRIDE is only called if OPTION has already a saved-value. If OVERIDE
+   returns not nil then `customize-save-variable' is called for OPTION with VALUE
+   even if OPTION has no saved-value until now."
+     (and (get option 'custom-type)
+          (or (not (get option 'saved-value))
+              (and (functionp override)
+                   (funcall override
+                            (customize-option-get-value option 'saved-value)
+                            value)))
+          (progn
+            (message "Overriding saved value for option %s with %s" option value)
+            (customize-save-variable option value))))
+
+With `customize-save-variable-save' all ECB-options can be site-wide
+pre-customized like follows:
+
+   (customize-save-variable-save 'ecb-show-tags
+                                 '((include collapsed nil)
+                                   (parent collapsed nil)
+                                   (type flattened nil)
+                                   (variable collapsed name)
+                                   (function flattened name)
+                                   (rule flattened name)
+                                   (section flattened nil)
+                                   (def collapsed name)
+                                   (t collapsed name)))
+   (customize-save-variable-save 'ecb-font-lock-tags t)
+   ;; add here more options of ECB it you want
+
+7.1.2.2 Using a special setq for site-wide settings
+...................................................
+
+The mechanism above saves the pre-customized values always in the users
+`custom-file' (probably `.emacs'). If this is not preferred, then you can use
+the following mechanism but of course the offered `setq-save' is only allowed
+for options which are not setq-forbidden (*note setq or customize::).
+
+The mechanism below does not change the users `custom-file'. This mechanism
+is needed especially if ECB should be autoloaded and all site-wide settings
+should first loaded when ECB is activated by the user. This can be achieved
+for example via(2):
+
+   (require 'ecb-autoloads))
+   (eval-after-load "ecb"
+     '(require 'site-ecb))
+
+In such a situation the whole `custom-file' of a user is mostly loaded
+*before* ECB is activated and therefore before the site-wide-settings are
+loaded. So the users own customizations are loaded before the site-wide ones.
+
+The `setq-save'-mechanism described below prevents the users own
+customisations contained in his `custom-file' from being overridden by the
+site-wide setq-settings. If `setq' would be used for the site-wide settings
+then in an autoload-situation the site-wide settings would override the
+users-settings and this should not be done!
+
+First two helper-macros are needed:
+
+   (defmacro custom-saved-p (option)
+     "Return only not nil if OPTION is a defcustom-option and has a
+   saved value. Option is a variable and is literal \(not evaluated)."
+     `(and (get (quote ,option) 'custom-type)
+           (get (quote ,option) 'saved-value)))
+
+   (defmacro setq-save (option value)
+     "Sets OPTION to VALUE if and only if OPTION is not already saved
+   by customize. Option is a variable and is literal \(not evaluated)."
+     `(and (not (custom-saved-p ,option))
+           (set (quote ,option) ,value)))
+
+With `setq-save' all "not-setq-forbidden"-ECB-options can be site-wide
+pre-customized like follows:
+
+   (setq-save ecb-tree-indent 4)
+   (setq-save ecb-tree-expand-symbol-before t)
+   (setq-save ecb-primary-secondary-mouse-buttons 'mouse-1--mouse-2)
+
+---------- Footnotes ----------
+
+(1) At least for the options for which `setq' is explicitly forbidden, but it
+is recommended to use always such a mechanism
+
+(2) The file `site-ecb.el' contains all site-wide settings for ECB
+
+
+File: ecb.info,  Node: Most important options,  Next: Customizable options,  Prev: General aspects,  Up: Customizing
+
+7.2 The most important options of ECB
+=====================================
+
+Here are the most important options (it is recommended to check at least the
+following options before working with ECB). You can customize them via the
+customize-group "ecb-most-important" or via the command
+`ecb-customize-most-important'.
+
+`ecb-source-path'
+     Where ECB can find your sources. You must set this option!
+
+`ecb-show-help-format'
+     Should the online help of ECB be displayed in the standard Info format
+     or in HTML format in a web-browser.
+
+`ecb-auto-activate'
+
+`ecb-major-modes-show-or-hide'
+     Auto. activation of ECB after start (*note Automatic activation::) or
+     major-mode-based showing or hiding the ecb-windows.
+
+`ecb-winman-escreen-number'
+`ecb-winman-winring-name'
+     Support of several window-managers (*note Window-managers and ECB::).
+
+`ecb-key-map'
+     All ECB-keybindings incl. a common prefix-key (*note Using the
+     keyboard::).
+
+`ecb-new-ecb-frame'
+     Should ECB create a new frame at activation time.
+
+`ecb-primary-secondary-mouse-buttons'
+`ecb-mouse-click-destination'
+     Define how to use the mouse (*note Using the mouse::).
+
+`ecb-tree-buffer-style'
+`ecb-tree-expand-symbol-before'
+`ecb-tree-indent'
+`ecb-truncate-lines'
+     The look&feel of the trees in the tree-buffers. The former option
+     defines the general style of the tree-buffers and the latter ones allow
+     to customize the ascii-style tree-buffers (maybe you like a value of 4
+     for the latter one if you display the expand-symbol before (*note
+     Tree-buffer styles::).
+
+`ecb-source-file-regexps'
+     Which files will (not) be shown in ECB.
+
+`ecb-layout-name'
+`ecb-compile-window-height'
+`ecb-compile-window-width'
+`ecb-other-window-behavior'
+     The ECB layout, means which windows you want to be displayed in the
+     ECB-frame and also the location of these windows (*note Changing the
+     ECB-layout::).
+
+`ecb-compilation-buffer-names'
+     Which buffers should be treaten as "compilation-buffers" and therefore
+     displayed in the compile-window of ECB - if there is any.
+
+`ecb-tag-display-function'
+`ecb-type-tag-display'
+`ecb-type-tag-expansion'
+`ecb-show-tags'
+     How to display the entries in the ECB-method window for semantic
+     supported sources (*note Customizing the display::). These options take
+     only effect for semantic-sources (*note Definition of semantic- and
+     non-semantic-sources::).
+
+`ecb-process-non-semantic-files'
+     Displaying file-contents for not by semantic supported files too, e.g.
+     for LaTeX- and perl-sources (*note Non-semantic sources::).
+
+But to make ECB working best for you it is also recommended to have a look at
+*Note Customizable options::!
+
+
+File: ecb.info,  Node: Customizable options,  Prev: Most important options,  Up: Customizing
+
+7.3 All customizable options of ECB
+===================================
+
+All customization of ECB is divided into the following "customize groups".
+You can highly customize all the ECB behavior/layout so just go to these
+groups and you will see all well documented ECB-options.
+
+*Please note*: All options in the following subsections are listed without
+the prefix "ecb-" (e.g. the option `ecb-layout-name' is listed with name
+"layout-name"). This has been done for a better readable option index. *Note
+Option Index::.
+
+* Menu:
+
+* ecb-general::                 General customizing ECB
+* ecb-tree-buffer::             Customizing the general tree layout
+* ecb-directories::             Customizing the ECB-directories-tree
+* ecb-sources::                 Customizing the ECB-sources-window
+* ecb-methods::                 Customizing the ECB-methods-window
+* ecb-history::                 Customizing the ECB-history-window
+* ecb-analyse::                 Customizing the ECB-analyse-window
+* ecb-layout::                  Customizing the ECB-layout
+* ecb-compilation::             Customizing the compile-window
+* ecb-create-layout::           Customizing options for creating layouts
+* ecb-face-options::            Customizing options for faces
+* ecb-faces::                   Customizing the faces
+* ecb-help::                    Customizing the online help of ECB
+* ecb-eshell::                  Customizing the eshell-integration
+* ecb-speedbar::                Customizing the speedbar-integration
+* ecb-non-semantic::            Customizing parsing non-semantic sources
+* ecb-winman::                  Customizing window-manager support
+* ecb-mode-line::               Customizing the tree-buffer-modelines
+* ecb-version-control::         Customizing the version-control-support
+
+
+File: ecb.info,  Node: ecb-general,  Next: ecb-tree-buffer,  Prev: Customizable options,  Up: Customizable options
+
+7.3.1 Group ecb-general
+-----------------------
+
+This group contains general settings for the Emacs code browser:
+
+ -- User Option: activate-before-layout-draw-hook
+     Normal hook run at the end of activating the ecb-package by running
+     `ecb-activate'. This hooks are run after all the internal setup process
+     but directly before(!) drawing the layout specified in `ecb-layout'
+     (means before dividing the frame into several windows).
+
+     A senseful using of this hook can be maximizing the Emacs-frame for
+     example, because this should be done before the layout is drawn because
+     ECB computes the size of the ECB-windows with the current frame size! If
+     you need a hook-option for the real end of the activating process (i.e.
+     after the layout-drawing) look at `ecb-activate-hook'.
+
+     IMPORTANT: The difference between this hook and
+     `ecb-redraw-layout-before-hook' is that the latter one is evaluated
+     always before the layout is redrawn (for example after calling
+     `ecb-redraw-layout') whereas the former one (this hook) is only
+     evaluated exactly once during the activation-process of ECB.  So during
+     the activation process there is the following sequence of hooks:
+       1. `ecb-activate-before-layout-draw-hook' \(this one)
+
+       2. `ecb-redraw-layout-before-hook'
+
+       3. <Drawing the layout>
+
+       4. `ecb-redraw-layout-after-hook'
+
+       5. `ecb-activate-hook'
+
+ -- User Option: activate-hook
+     Hook run at the end of activating ECB by `ecb-activate'. This hooks are
+     run at the real end of the activating process, means after the layout
+     has been drawn!. If you need hooks which are run direct before the
+     layout-drawing look at `ecb-activate-before-layout-draw-hook'.
+
+ -- User Option: activation-selects-ecb-frame-if-already-active
+     Trying to activate an already activated ECB selects the ECB-frame. If t
+     then the ECB-frame is selected, if nil then it is not. If 'ask then ECB
+     asks if the ECB-frame should be selected if the current-frame is not the
+     `ecb-frame'.
+
+ -- User Option: auto-activate
+     Automatically startup ECB when Emacs starts up. This should only be true
+     if you always want to run `ecb-activate'.
+
+ -- User Option: auto-compatibility-check
+     Check at ECB-startup if all ECB-options have correct values. If not nil
+     then all ECB-options are checked if their current value have the correct
+     type. It the type is incorrect the option is either auto.  upgraded to
+     the new type or reset to the default-value of current ECB if no upgrade
+     is possible. This feature can also upgrade options which are renamed in
+     current ECB and try to transform the old-value to the new named option.
+     After startup all upgraded or reset options are displayed with their old
+     (before upgrade/reset) and new values. See also the commands
+     `ecb-upgrade-options' and `ecb-display-upgraded-options'. If this option
+     is off then the user can perform the check and reset manually with
+     `ecb-upgrade-options'.  *Note Auto. option-upgrading::.
+
+ -- User Option: before-activate-hook
+     Normal hook run at the beginning of activating the ecb-package by
+     running `ecb-activate'. These hooks run before any other tasks of the
+     activating process are performed. If any of these hooks returns nil then
+     ECB will not be activated!
+
+     This can be used to check some conditions and then only start ECB if all
+     conditions are true. For example a function could be added which returns
+     only nil if Gnus is running. Then calling `ecb-activate' or
+     `ecb-minor-mode' will only start ECB if Gnus is not already running.
+
+ -- User Option: before-deactivate-hook
+     Normal hook run at the beginning of deactivating ECB by running
+     `ecb-deactivate'. These hooks run before any other tasks of the
+     deactivating process are performed. If any of these hooks returns nil
+     then ECB will not be deactivated! See also `ecb-before-activate-hook'.
+
+ -- User Option: bucket-node-display
+     How ECB displays bucket-nodes in a ECB tree-buffer. Bucket-nodes have
+     only one job: Nodes with similar properties will be dropped into one
+     bucket for such a common property and all these nodes will be added as
+     children to the bucket-node. Besides being expandable and collapsable a
+     bucket-node has no senseful action assigned. Examples for bucket-nodes
+     are "[+] Variables, "[+] Dependencies" etc. in the Methods-buffer or
+     buckets which combine filenames with same extension under a bucket-node
+     with name this extension.
+
+     This option defines how bucket-node should be displayed. The name of the
+     bucket-node is computed by ECB but you can define a prefix, a suffix and
+     a special face for the bucket-node
+
+     The default are empty prefix/suffix-strings and `ecb-bucket-node-face'.
+     But an alternative can be for example '("[" "]" nil) which means no
+     special face and a display like "[+] [<bucket-name>]".
+
+ -- User Option: clear-caches-before-activate
+     Clear all ECB internal caches before startup. If t then ECB clears all
+     its internal caches before starting up. Caches are used for files- and
+     subdirs (see `ecb-cache-directory-contents' and
+     `ecb-cache-directory-contents-not') for semantic-tags and for the
+     history-filter.
+
+     This caches are completely clean at load-time of the ECB-library!
+
+     Default is nil, because is makes sense not to clear these caches at
+     start-time because ECB is often deacticated temporally especially in
+     combination with window-managers like escreen.el. In these situations
+     the internal state of ECB should be preserved for next activation.
+
+ -- User Option: deactivate-hook
+     Normal hook run at the end of deactivating (but before the ecb-layout is
+     cleared!) ECB by running `ecb-deactivate'.
+
+ -- User Option: debug-mode
+     If not nil ECB displays debug-information in the Messages-buffer. This
+     is done for some critical situations concerning semantic-tags and their
+     overlays (or extends for XEmacs). Normally you should not need this
+     switched on! But if you get errors like "destroyed extend" for XEmacs or
+     "wrong-argument-type" concerning overlays for GNU Emacs then you should
+     switch on this option and submitting a bug-report to the
+     ecb-mailing-list (`ecb-submit-problem-report') after getting the error
+     again!
+
+ -- User Option: grep-function
+     Function used for performing a grep. The popup-menu of the tree-buffers
+     "Directories", "Sources" and "History" offer to grep the "current"
+     directory:
+        - Directory-buffer: The grep is performed in the current
+          popup-directory after clicking the right mouse-button onto a node.
+
+        - Sources-buffer: The grep is performed in the current selected
+          directory.
+
+        - History-buffer: The grep is performed in the directory of the
+          current popup-source after clicking the right mouse-button onto a
+          node.
+
+ -- User Option: grep-recursive-function
+     Function used for performing a recursive grep. For more Details see
+     option `ecb-grep-function' and replace "grep" with "recursive grep".
+
+ -- User Option: key-map
+     Specifies all keybindings for the ECB minor-mode key-map. The value is a
+     cons-cell where the car is a common-prefix key for all the keybindings.
+     The cdr is a list of keybindings each of them a list again. A
+     key-binding has the following form:
+
+        '(<common-prefix-flag> <keysequence> <function>) where
+
+    `<common-prefix-flag>'
+          If t then the common-prefix-key defined as car of the value (see
+          above) is used.
+
+    `<keysequence>'
+          If the common prefix-key is used then the final key-binding is the
+          concatenation of the common-prefix-key (see above) and this
+          keysequence.
+
+    `<function>:'
+          The function to bind to the key. This can also be a
+          lambda-expression .
+
+     It is highly recommended to use one of the standard keys C-c or C-x as
+     first key of your common-prefix-key!
+
+     You MUST change this option via customize to take effect!
+
+     All keysequences must be inserted as a string and must follow the syntax
+     needed by `read-kbd-macro' or `kbd'. This means you can insert the key
+     in the same manner `C-h k' displays keysequences.  Here is the summary
+     of the syntax:
+
+     Text is divided into "words" separated by whitespace. Except for the
+     words described below, the characters of each word go directly as
+     characters of the keysequence. The whitespace that separates words is
+     ignored. Whitespace in the macro must be written explicitly, as in `C-c
+     SPC'.
+
+        * The special words RET, SPC, TAB, DEL, LFD, ESC, and NUL represent
+          special control characters. The words must be written in uppercase.
+
+        * A word in angle brackets, e.g., <return>, <down>, <left> or <f1>,
+          represents a function key. (Note that in the standard configuration,
+          the function key <return> and the control key RET are synonymous.).
+          You can use angle brackets on the words RET, SPC, etc., but they are
+          not required there.
+
+        * Keys can be written by their ASCII code, using a backslash followed
+          by up to six octal digits. This is the only way to represent keys
+          with codes above ’.
+
+        * One or more prefixes M- (meta), C- (control), S- (shift), A- (alt),
+          H- (hyper), and s- (super) may precede a character or key notation.
+          For function keys, the prefixes may go inside or outside of the
+          brackets: C-<down> = <C-down>. The prefixes may be written in any
+          order: M-C-x = C-M-x. Prefixes are not allowed on multi-key words,
+          e.g., C-abc, except that the Meta prefix is allowed on a sequence
+          of digits and optional minus sign: M-123 = M- M-1 M-2 M-3.
+
+        * The `^' notation for control characters also works: ^M = C-m.
+
+ -- User Option: major-modes-show-or-hide
+     List of major-modes which show or hide the ecb-windows. The value is a
+     cons-cell where the car contains all major-mode-symbols which should
+     show the special ecb-windows and the cdr contains all major-mode-symbols
+     which should hide the special ecb-windows. If the symbol of a major-mode
+     is neither contained in the car-"show-list" nor in the cdr-"hide-list"
+     then the visibility-state of the ecb-windows does not change.
+
+ -- User Option: minor-mode-text
+     String to display in the mode line when ECB minor mode is active.  (When
+     the string is not empty, make sure that it has a leading space.)
+
+     Because for ECB it is quite obvious if it is active or not when the
+     ECB-windows are visible this text is only display in the modeline if the
+     ECB-windows are hidden.
+
+ -- User Option: run-ediff-in-ecb-frame
+     Run ediff-sessions in the same frame as ECB is running.  If not nil then
+     ECB ensures that ediff runs in the same frame as ECB and ECB restores
+     exactly the "before-ediff"-window-layout after quiting ediff. If nil
+     then ediff decides in which frame it will run - depending on the current
+     window-layout (e.g. if the ecb-windows are currently hidden) this can be
+     the ecb-frame but this can also be a newly created frame or any other
+     frame.
+
+ -- User Option: stealthy-tasks-delay
+     Time Emacs must be idle before ECB runs its stealthy tasks. Currently
+     ECB performes the following stealthy tasks:
+
+    Prescann directories for emptyness
+          Prescann directories and display them as empty or not-empty in the
+          directories-buffer. See the documentation of the option
+          `ecb-prescan-directories-for-emptyness' for a description.
+
+    File is read only
+          Check if sourcefile-items of the directories- or sources-buffer are
+          read-only or not. See documentation of the option
+          `ecb-sources-perform-read-only-check'.
+
+    Version-control-state
+          Checks the version-control-state of files in directories which are
+          managed by a VC-backend. See the option `ecb-vc-enable-support'.
+
+
+     Here the interval is defined ECB has to be idle before starting with
+     these stealthy tasks. It can be a floating-point value in seconds. The
+     value can also be changed during running ECB.
+
+ -- User Option: tip-of-the-day
+     Show tip of the day at start time of ECB.
+
+ -- User Option: tip-of-the-day-file
+     File where tip-of-the-day cursor is stored.
+
+ -- User Option: use-recursive-edit
+     Tell ECB to use a recursive edit. If set then it can easily be
+     deactivated by (keyboard-escape-quit).
+
+ -- User Option: version-check
+     Checks at start-time if the requirements are fulfilled. It checks if the
+     required versions of CEDET is installed and loaded into Emacs.
+
+     It is strongly recommended to set this option to not `nil'!
+
+
+File: ecb.info,  Node: ecb-tree-buffer,  Next: ecb-directories,  Prev: ecb-general,  Up: Customizable options
+
+7.3.2 Group ecb-tree-buffer
+---------------------------
+
+This group contains general settings related to the tree-buffers of ECB:
+
+ -- User Option: basic-buffer-sync
+     Synchronize the basic ECB-buffers automatically with current edit buffer.
+
+     The basic ECB-buffers are the buffers for directories, sources, methods
+     and history.
+
+     If 'always then the synchronization takes place always a buffer changes
+     in the edit window, if nil then never. If a list of major-modes then
+     only if the `major-mode' of the new buffer belongs NOT to this list.
+
+     But in every case the synchronization takes only place if the
+     current-buffer in the edit-window has a relation to files or
+     directories. Examples for the former one are all
+     programming-language-modes, `Info-mode' too, an example for the latter
+     one is `dired-mode'. For all major-modes related to
+     non-file/directory-buffers like `help-mode', `customize-mode' and others
+     never an autom. synchronization will be done!
+
+     It's recommended to exclude at least `Info-mode' because it makes no
+     sense to synchronize the ECB-windows after calling the Info help. Per
+     default also `dired-mode' is excluded but it can also making sense to
+     synchronize the ECB-directories/sources windows with the current
+     directory in the dired-buffer.
+
+     IMPORTANT NOTE: Every time the synchronization is done the hook
+     `ecb-basic-buffer-sync-hook' is evaluated.
+
+ -- User Option: basic-buffer-sync-delay
+     Time Emacs must be idle before the special ECB-buffers are synchronized.
+     Synchronizing is done with the current source displayed in the edit
+     window. If nil then there is no delay, means synchronization takes place
+     immediately. A small value of about 0.25 seconds saves CPU resources and
+     you get even though almost the same effect as if you set no delay.
+
+ -- User Option: basic-buffer-sync-hook
+     Hook run at the end of `ecb-basic-buffer-sync'.  See documentation of
+     `ecb-basic-buffer-sync' for conditions when synchronization takes place
+     and so in turn these hooks are evaluated.
+
+     Precondition for such a hook: Current buffer is the buffer of the
+     currently selected edit-window.
+
+     Postcondition for such a hook: Point must stay in the same edit-window
+     as before evaluating the hook.
+
+     Important note: If the option `ecb-basic-buffer-sync' is not nil the
+     function `ecb-basic-buffer-sync' is running either every time Emacs is
+     idle or even after every command (see `ecb-basic-buffer-sync-delay'). So
+     these hooks can be really called very often! Therefore each function of
+     this hook should/must check in an efficient way at beginning if its task
+     have to be really performed and then do them only if really necessary!
+     Otherwise performance of Emacs could slow down dramatically!
+
+     It is strongly recommended that each function added to this hook uses the
+     macro `ecb-do-if-buffer-visible-in-ecb-frame' at beginning! See
+     `ecb-speedbar-buffer-sync' and `ecb-eshell-buffer-sync' for examples how
+     to use this macro!
+
+ -- User Option: bucket-node-display
+     How ECB displays bucket-nodes in a ECB tree-buffer.  Bucket-nodes have
+     only one job: Nodes with similar properties will be dropped into one
+     bucket for such a common property and all these nodes will be added as
+     children to the bucket-node. Besides being expandable and collapsable a
+     bucket-node has no senseful action assigned. Examples for bucket-nodes
+     are "[+] Variables", "[+] Dependencies" etc. in the Methods-buffer or
+     buckets which combine filenames with same extension under a bucket-node
+     with name this extension.
+
+     This option defines how bucket-node should be displayed. The name of the
+     bucket-node is computed by ECB but you can define a prefix, a suffix and
+     a special face for the bucket-node
+
+     The default are empty prefix/suffix-strings and `ecb-bucket-node-face'.
+     But an alternative can be for example '("[" "]" nil) which means no
+     special face and a display like "[+] [<bucket-name>]".
+
+ -- User Option: common-tree-buffer-after-create-hook
+     Local hook running at the end of each tree-buffer creation. Every
+     function of this hook is called once without arguments direct after
+     creating a tree-buffer of ECB and it's local key-map. So for example a
+     function could be added which performs calls of `local-set-key' to
+     define new keybindings for EVERY tree-buffer.
+
+     The following keys must not be rebind in all tree-buffers:
+        - `RET' and all combinations with `Shift' and `Ctrl'
+
+        - `TAB'
+
+        - `C-t'
+
+ -- User Option: mouse-click-destination
+     Destination of a mouse-button click. Defines in which edit-window (if
+     splitted) ECB does the "right" action (opening a source, jumping to a
+     method/variable etc.) after clicking with the primary mouse-button (see
+     `ecb-primary-secondary-mouse-buttons') onto a node. There are two
+     possible choices:
+
+        - `left-top': Does the "right" action always in the left/topmost
+          edit-window.
+
+        - `last-point': Does the "right" action always in that edit-window
+          which had the point before.
+     This is if the user has clicked either with the primary mouse-button or
+     has activated a popup-menu in the tree-buffer.
+
+     If the edit-area is not splitted this setting doesn't matter.
+
+     A click with the secondary mouse-button (see again
+     `ecb-primary-secondary-mouse-buttons' does the "right" action always in
+     another edit-window related to the setting in this option: If there are
+     two edit-windows then the "other" edit-window is used and for more than
+     2 edit-windows the "next" edit-window is used (whereas the next
+     edit-window of the last edit-window is the first edit-window).
+
+     Note: If the tree-buffers are used with the keyboard instead with the
+     mouse then this option takes effect too because `RET' is interpreted as
+     primary mouse-button and `C-RET' as secondary mouse-button!
+
+ -- User Option: primary-secondary-mouse-buttons
+     Primary- and secondary mouse button for using the ECB-buffers. A click
+     with the primary button causes the main effect in each ECB-buffer:
+
+        * ECB Directories: Expanding/collapsing nodes and displaying files in
+          the ECB Sources buffer.
+
+        * ECB sources/history: Opening the file in that edit-window specified
+          by the option `ecb-mouse-click-destination'.
+
+        * ECB Methods: Jumping to the method in that edit-window specified by
+          the option `ecb-mouse-click-destination'.
+
+     A click with the primary mouse-button while the SHIFT-key is pressed
+     called the POWER-click and does the following (depending on the
+     ECB-buffer where the POWER-click occurs):
+
+        * ECB Directories: Refreshing the directory-contents-cache (see
+          `ecb-cache-directory-contents').
+
+        * ECB sources/history: Only displaying the source-contents in the
+          method-buffer but not displaying the source-file in the edit-window.
+
+        * ECB Methods: Narrowing to the clicked method/variable/ect... (see
+          `ecb-tag-visit-post-actions'). This works only for semantic
+          supported sources but not for imenu- or etags-supported ones!
+
+     In addition always the whole node-name is displayed in the minibuffer
+     after a POWER-click (for this see also `ecb-methods-show-node-info').
+
+     The secondary mouse-button is for opening (jumping to) the file in
+     another edit-window (see the documentation
+     `ecb-mouse-click-destination').
+
+     The following combinations are possible:
+
+        - primary: mouse-2, secondary: C-mouse-2 (means mouse-2 while
+          CTRL-key is pressed). This is the default setting.
+
+        - primary: mouse-1, secondary: C-mouse-1
+
+        - primary: mouse-1, secondary: mouse-2
+
+     Please note: If the tree-buffers are used with the keyboard instead with
+     the mouse then `RET' is interpreted as primary mouse-button and `C-RET'
+     as secondary mouse-button!
+
+     If you change this during ECB is activated you must deactivate and
+     activate ECB again to take effect
+
+ -- User Option: tree-buffer-style
+     The style of the tree-buffers.  There are three different styles
+     available:
+
+     Image-style (value `image'): Very nice and modern - just try it. For this
+     style the options `ecb-tree-indent' and `ecb-tree-expand-symbol-before'
+     have no effect! The value 'image means use image-style if images can be
+     displayed with current Emacs-setup \(otherwise auto. 'ascii-style is
+     used). Note: GNU Emacs <= 21.3.X for Windows does not support
+     image-display so ECB uses always 'ascii-guides even when here 'image is
+     set!
+
+     Ascii-style with guide-lines (value `ascii-guides'):
+        [-] ECB
+         |  [+] code-save
+         `- [-] ecb-images
+             |  [-] directories
+             |   |  [-] height-15
+             |   |   |  * close.xpm
+             |   |   |  * empty.xpm
+             |   |   |  * leaf.xpm
+             |   |   `- * open.xpm
+             |   |  [+] height-17
+             |   |  [+] height-19
+             |   `- [+] height-21
+             |  [x] history
+             |  [x] methods
+             `- [x] sources
+
+     Ascii-style without guide-lines (value `ascii-no-guides') - this is the
+     style used by ECB <= 1.96:
+        [-] ECB
+            [+] code-save
+            [-] ecb-images
+                [-] directories
+                    [-] height-15
+                        * close.xpm
+                        * empty.xpm
+                        * leaf.xpm
+                        * open.xpm
+                    [+] height-17
+                    [+] height-19
+                    [+] height-21
+                [x] history
+                [x] methods
+                [x] sources
+
+     With both ascii-styles the tree-layout can be affected with the options
+     `ecb-tree-indent' and `ecb-tree-expand-symbol-before'.
+
+ -- User Option: tree-do-not-leave-window-after-select
+     Tree-buffers which stay selected after a key- or mouse-selection. If a
+     buffer (either its name or the variable-symbol which holds the name) is
+     contained in this list then selecting a tree-node either by RET or by a
+     mouse-click doesn't leave that tree-buffer after the node-selection but
+     performes only the appropriate action (opening a new source, selecting a
+     method etc.) but point stays in the tree-buffer. In tree-buffers not
+     contained in this option normaly a node-selection selects as "last"
+     action the right edit-window or maximizes the next senseful tree-buffer
+     in case of a currently maximized tree-buffer (see
+     `ecb-maximize-next-after-maximized-select').
+
+     The buffer-name can either be defined as plain string or with a symbol
+     which contains the buffer-name as value. The latter one is recommended
+     for the builtin ECB-tree-buffers because then simply the related
+     option-symbol can be used.
+
+     A special remark for the `ecb-directories-buffer-name': Of course here
+     the value of this option is only relevant if the name of the current
+     layout is contained in `ecb-show-sources-in-directories-buffer' or if
+     the value of `ecb-show-sources-in-directories-buffer' is 'always and the
+     clicked ot hitted node represents a sourcefile (otherwise this would not
+     make any sense)!
+
+     The setting in this option is only the default for each tree-buffer.
+     With the command `ecb-toggle-do-not-leave-window-after-select' the
+     behavior of a node-selection can be changed fast and easy in a
+     tree-buffer without customizing this option, but of course not for
+     future Emacs sessions!
+
+ -- User Option: tree-easy-hor-scroll
+     Scroll step for easy hor. scrolling via mouse-click in tree-buffers.
+     XEmacs has horizontal scroll-bars so invisible parts beyond the right
+     window-border of a tree-buffer can always made visible very easy.
+
+     GNU Emacs does not have hor. scroll-bars so especially with the mouse it
+     is quite impossible to scroll smoothly right and left. The functions
+     `scroll-left' and `scroll-right' can be annoying and are also not bound
+     to mouse-buttons.
+
+     If this option is a positive integer S then in all ECB-tree-buffers the
+     keys `M-mouse-1' and `M-mouse-3' are bound to scrolling left rsp. right
+     with scroll-step S - clicking with `mouse-1' or `mouse-2' onto the edge
+     of the modeline has the same effect, i.e.  if you click with mouse-1
+     onto the left (rsp right) edge of the modeline you will scroll left
+     (rsp. right).
+
+     Additionally `C-M-mouse-1' and `C-M-mouse-3' are bound to scrolling left
+     rsp. right with scroll-step `window-width' - 2.
+
+     Default is a scroll-step of 5. If the value is `nil' then no keys for
+     horizontal scrolling are bound.
+
+ -- User Option: tree-expand-symbol-before
+     Show the expand symbol before the items in a tree. When the
+     expand-symbol is located before the items then the tree looks like:
+
+        [-] ECB
+            [+] code-save
+            [-] ecb-images
+                [-] directories
+
+     When located after then the tree looks like:
+
+        ECB [-]
+          code-save [+]
+          ecb-images [-]
+            directories [-]
+
+     The after-example above use a value of 2 for `ecb-tree-indent' whereas
+     the before-example uses a value of 4.
+
+     It is recommended to display the expand-symbol before because otherwise
+     it could be that with a deep nested item-structure with and/or with long
+     item-names (e.g. a deep directory-structure with some long
+     subdirectory-names) the expand-symbol is not visible in the tree-buffer
+     and the tree-buffer has to be horizontal scrolled to expand an item.
+
+ -- User Option: tree-image-icons-directories
+     Directories where the images for the tree-buffer can be found. This is a
+     cons cell where:
+
+     car: Default directory where the default images for the tree-buffer can
+     be found. It should contain an image for every name of
+     `tree-buffer-tree-image-names'. The name of an image-file must be:
+     "ecb-<NAME of TREE-BUFFER-TREE-IMAGE-NAMES>.<ALLOWED EXTENSIONS>".
+
+     cdr: This is a list where each element is a cons again with: car is the
+     buffer name of the tree-buffer for which a special image-path should be
+     used. The buffer-name can either be defined as plain string or with a
+     symbol which contains the buffer-name as value. The latter one is
+     recommended for the builtin ECB-tree-buffers because then simply the
+     related option-symbol can be used (e.g. the symbol
+     `ecb-directories-buffer-name'). The cdr is the the full-path of an
+     additional image-directorie which is searched first for images needed
+     for the related tree-buffer. If the image can not be found in this
+     directory then the default-directory (see above) is searched. If the
+     image can't even be found there the related ascii-symbol is used - which
+     is defined in `tree-buffer-tree-image-names'. If a tree-buffer is not
+     contained in this list then there is no additional special
+     image-directory for it.
+
+     ECB comes with predefined images in several different heights - so for
+     the most senseful font-heights of a tree-buffer a fitting image-size
+     should be available. The images reside either in the subdirectory
+     "ecb-images" of the ECB-installation or - if ECB is installed as regular
+     XEmacs-package - in the ECB-etc data-directory (the directory returned
+     by (locate-data-directory "ecb").
+
+ -- User Option: tree-incremental-search
+     Enable incremental search in the ECB-tree-buffers. For a detailed
+     explanation see the online help section "Working with the keyboard in
+     the ECB buffers". If you change this during ECB is activated you must
+     deactivate and activate ECB again to take effect.
+
+ -- User Option: tree-indent
+     Indent size for tree buffer. If you change this during ECB is activated
+     you must deactivate and activate ECB again to take effect.
+
+ -- User Option: tree-make-parent-node-sticky
+     Make the parent-node sticky in the headerline of the tree-buffer.
+
+     If not nil then the first line of the tree-buffer is used as header-line
+     which is used to display the next unvisible parent of the first visible
+     node as sticky, so always the parent of a node is visible and clickable.
+     If a node has no parent then just the next node above is displayed in
+     the header-line. The node displayed in the header-line is exactly in the
+     same manner clickable as all other nodes.
+
+     See also `ecb-tree-stickynode-indent-string'.
+
+     This feature is only available with Gnu Emacs, not with XEmacs.
+
+ -- User Option: tree-mouse-action-trigger
+     When the tree-buffer mouse-action should be triggered. This option
+     determines the moment a mouse-action in a tree-buffer is triggered.
+     This can be either direct after pressing a mouse-button (value
+     `button-press') or not until releasing the mouse-button (value:
+     `button-release').
+
+     If you change this during ECB is activated you must deactivate and
+     activate ECB again to take effect!
+
+ -- User Option: tree-navigation-by-arrow
+     Enable smart navigation in the tree-windows by horiz. arrow-keys. If not
+     nil then the left- and right-arrow keys work in the ECB tree-window in
+     the following smart way if onto an expandable node:
+
+        * Left-arrow: If node is expanded then it will be collapsed otherwise
+          point jumps to the next "higher" node in the hierarchical tree
+          (higher means the next higher tree-level or - if no higher level
+          available - the next higher node on the same level).
+
+        * Right-arrow: If node is not expanded then it will be expanded. Onto
+          a not expandable node the horizontal arrow-keys go one character in
+          the senseful correct direction.
+
+     If this option is changed the new value takes first effect after
+     deactivating ECB and then activating it again!
+
+ -- User Option: tree-stickynode-indent-string
+     String used to indent the stickynode.  This string is used to match the
+     space used by scrollbars and fringe so it does not appear that the
+     node-name is moving left/right when it lands in the sticky line.
+
+     Normally the needed value is computed automatically by ECB. But if the
+     result is not matching this option allows to customize the
+     indent-string. The default value is computed by the function
+     `tree-buffer-sticky-default-indent-string', so you can change the needed
+     value with that starting-point.
+
+     Changing this option takes only effect after restarting Emacs!
+
+ -- User Option: tree-truncate-lines
+     Truncate lines in ECB buffers. If a buffer (either its name or the
+     variable-symbol which holds the name) is contained in this list then
+     line-truncation is switched on for this buffer otherwise it is off.
+
+     The buffer-name can either be defined as plain string or with a symbol
+     which contains the buffer-name as value. The latter one is recommended
+     to switch on line-truncation for one of the builtin ECB-tree-buffers
+     because then simply the related option-symbol can be used. To truncate
+     lines in the builtin directories tree-buffer just add the symbol
+     `ecb-directories-buffer-name' to this option.
+
+     If you change this during ECB is activated you must deactivate and
+     activate ECB again to take effect.
+
+ -- User Option: truncate-long-names
+     Truncate long names that don't fit in the width of the ECB windows. If
+     you change this during ECB is activated you must deactivate and activate
+     ECB again to take effect.
+
diff --git a/site/ecb-2.40/info-help/ecb.info-2 b/site/ecb-2.40/info-help/ecb.info-2
new file mode 100644
index 0000000..fd6c967
--- /dev/null
+++ b/site/ecb-2.40/info-help/ecb.info-2
@@ -0,0 +1,6148 @@
+This is ecb.info, produced by makeinfo version 4.8 from ecb.texi.
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* ECB: (ecb).           Emacs Code Browser
+END-INFO-DIR-ENTRY
+
+
+File: ecb.info,  Node: ecb-directories,  Next: ecb-sources,  Prev: ecb-tree-buffer,  Up: Customizable options
+
+7.3.3 Group ecb-directories
+---------------------------
+
+This group contains settings for the directories-buffer in the ECB:
+
+ -- User Option: add-path-for-not-matching-files
+     Add path of a file to `ecb-source-path' if not already contained.  This
+     is done during the auto. windows synchronization which happens if a file
+     is opened not via the file/directory-browser of ECB. In such a situation
+     ECB adds the path of the new file auto. to `ecb-source-path' at least
+     temporally for the current Emacs session. This option defines two things:
+
+       1. Should only the root-part (which means for Unix-like systems always
+          '/' and for windows-like systems the drive) of the new file be added
+          as source-path to `ecb-source-path' or the whole directory-part?
+          For remote-files (e.g. tramp, ange-ftp- or efs-files) the root-part
+          is the complete host-part + the root-dir at that host (example:
+          /berndl@ecb.sourceforge.net:/ would be the root-part of
+          /berndl@ecb.sourceforge.net:/tmp/test.txt).
+
+       2. Should this path be added for future sessions too?
+
+     The value of this option is a cons-cell where the car is a boolean for
+     1. and the cdr is a boolean for 2.
+
+     A value of not nil for the car (1.) is reasonably if a user often opens
+     files not via the ECB-browser which are not located in any of the paths
+     of `ecb-source-path' because then only one path for each drive (windows)
+     or the root-path (Unix) is added to the directory buffer of ECB.
+
+ -- User Option: auto-expand-directory-tree
+     Automatically expand the directory tree to the current source file.
+     There are three options:
+
+        - `best': Expand the best-matching source-path
+
+        - `first': Expand the first matching source-path
+
+        - `nil': Do not automatically expand the directory tree.
+
+ -- User Option: after-directory-change-hook
+     Hook which run directly after the selected directory has changed. This
+     means not onyl after a click onto a directory in the directory-window of
+     ECB but it means this hook runs always when the current directory
+     changes regardless of the trigger of this change. So for example it runs
+     also when you just switches from one buffer to another via
+     `switch-to-buffer' or `switch-to-buffer-other-window' and the directory
+     of these filebuffers is different but only when auto-synchronizing of
+     the ECB-windows is on (see `ecb-basic-buffer-sync'). It runs not when
+     switching between buffers and the associated files reside in the same
+     directory.
+
+     Each function added to this hook will be called with two arguments: The
+     directory which was current _before_ the directory-change-trigger and
+     the directory which was now the current (i.e. after the trigger).
+
+     Example: If you switch from a filebuffer "~/.emacs" to a filebuffer
+     "/tmp/test.txt" then the functions of this hook will be called with the
+     two arguments "~" and "/tmp".
+
+ -- User Option: cache-directory-contents
+     Cache contents of directories.
+
+     This can be useful if `ecb-source-path' contains directories with many
+     files and subdirs, especially if these directories are mounted
+     net-drives ("many" means here something > 500, dependent of the speed of
+     the net-connection and the machine). Or if it contains
+     remote-source-paths which means paths in the sense of tramp, ange-ftp or
+     efs. For these directories actualizing the sources- and/or directories-
+     buffer of ECB (if displayed in current layout!) can slow down
+     dramatically so a caching increases speed a lot.
+
+     The value of this option is a list where each element is a cons-cell and
+     looks like:
+
+          (<dir-regexp> . <filenumber threshold>) with
+
+    `<dir-regexp>:'
+          Regular expression a directory must match to be cached.
+
+    `<filenumber threshold>:'
+          Number of directory contents must exceed this number.
+
+     A directory will only be cached if and only if the directory-name
+     matches at least one rexexp of this option and its content-number
+     exceeds the related threshold AND the directory-name matches NOT any
+     regexp of `ecb-cache-directory-contents-not'!
+
+     The cache entry for a certain directory will be refreshed and actualized
+     only by using the POWER-click (see
+     `ecb-primary-secondary-mouse-buttons') in the directories-buffer of ECB
+     (*note Using the mouse::).
+
+     Default-value: ECB caches the contents of all remote directories
+     regardless of the size and all other directories if more than 50 entries
+     are contained.
+
+     Examples:
+
+     An entry `("/usr/home/john_smith/bigdir*" . 1000)' means the contents of
+     every subdirectory of the home-directory of John Smith will be cached if
+     the directory contains more than 1000 entries and its name begins with
+     "bigdir".
+
+     An entry `(".*" . 1000)' caches every directory which has more than 1000
+     entries.
+
+     An entry `("^/\\([^:/]*@\\)?\\([^@:/]*\\):.*" . 0)' caches every remote
+     (in the sense of tramp, ange-ftp or efs) directory regardless of the
+     number of entries."
+
+     Please note: If you want your home-dir being cached then you MUST NOT
+     use "~" because ECB tries always to match full path-names!
+
+ -- User Option: cache-directory-contents-not
+     Do not cache the contents of certain directories. The value of this
+     option is a list where the each element is a regular expression a
+     directory must match if it should not being cached.
+
+     If a directory-name matches at least one of the regexps of this option
+     the directory-contents will never being cached. See
+     `ecb-cache-directory-contents' to see when a directory will be cached.
+
+     This option can be useful when normally all directories with a certain
+     amount of content (files and subdirs) should be cached but some special
+     directories not. This can be achieved by:
+
+        - Setting `ecb-cache-directory-contents' to ((".*" . 500)): Caches
+          all directories with more then 500 entries
+
+        - Setting `ecb-cache-directory-contents-not' to a value which matches
+          these directories which should not being cached (e.g.
+          ("/usr/home/john_smith") excludes the HOME-directory of John Smith
+          from being cached).
+
+     Please note: If you want your home-dir exclude from being cached then
+     you MUST NOT use "~" because ECB tries always to match full path-names!
+
+ -- User Option: directories-buffer-after-create-hook
+     Local hook running after the creation of the directories-buffer. Every
+     function of this hook is called once without arguments direct after
+     creating the directories-buffer of ECB and it's local key-map. So for
+     example a function could be added which performs calls of
+     `local-set-key' to define new keybindings only for the
+     directories-buffer of ECB.
+
+     The following keys must not be rebind in the directories-buffer: `F2',
+     `F3' and `F4'
+
+ -- User Option: directories-buffer-name
+     Name of the ECB directory buffer. Because it is not a normal buffer for
+     editing you should enclose the name with stars, e.g. " *ECB
+     Directories*".
+
+     If it is necessary for you you can get emacs-lisp access to the
+     buffer-object of the ECB-directory-buffer by this name, e.g. by a call
+     of `set-buffer'.
+
+     Changes for this option at runtime will take affect only after
+     deactivating and then activating ECB again!
+
+ -- User Option: directories-menu-sorter
+     Function which re-sorts the menu-entries of the directories buffer.
+
+     If a function then this function is called to re-arrange the
+     menu-entries of the combined menu-entries of the user-menu-extensions of
+     `ecb-directories-menu-user-extension' and the built-in-menu
+     `ecb-directories-menu'. If nil then no special sorting will be done and
+     the user-extensions are placed in front of the built-in-entries.
+
+     The function get one argument, a list of menu-entries. For the format of
+     this argument see `ecb-directories-menu-user-extension'. The function
+     must return a new list in the same format. Of course this function can
+     not only re-arrange the entries but also delete entries or add new
+     entries.
+
+ -- User Option: directories-menu-user-extension
+     Static user extensions for the popup-menu of the directories buffer.
+     Value is a list of elements of the following type: Each element defines
+     a new menu-entry and is either:
+
+       1. Menu-command: A list containing two sub-elements, whereas the first
+          is the function (a function symbol) being called if the menu-entry
+          is selected and the second is the name of the menu-entry.
+
+       2. Separator: A one-element-list and the element is the string "--":
+          Then a non-selectable menu-separator is displayed.
+
+       3. Submenu: A list where the first element is the title of the submenu
+          displayed in the main-menu and all other elements are either
+          menu-commands (see 1) or separators (see 2) or another submenu (see
+          c). This allows deep nested menu-submenu-structures. Currently a
+          level of 4 is allowed but in general there could be an infinite
+          depth of nesting but it makes no sense - if possible at all - to
+          define infinite nested defcustom-types. So there is a limit of 4
+          levels but tis is not a hard limit: Just increase the value of the
+          `ecb-max-submenu-depth' *BEFORE* first loading ECB!
+
+     The function of a menu-command must follow the following guidelines:
+     Such a function must be defined with the macro
+     `tree-buffer-defpopup-command'! This macro defines a new popup-command
+     whereas the newly defined command gets one argument NODE. See the
+     docstring of `tree-buffer-defpopup-command' for further details.
+
+     Example for the definition of such a menu-function:
+
+        (tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+          "Prints the name of the directory of the node under point."
+          (let ((node-data=dir (tree-node-get-data node)))
+             (message ``Dir under node: %s'' node-data=dir)))
+
+     Per default the static user-extensions are added at the beginning of the
+     built-in menu-entries of `ecb-directories-menu' but the whole menu can
+     be re-arranged with `ecb-directories-menu-sorter'.
+
+     These menu-extensions are static. A dynamic menu-extension can be
+     achieved via `ecb-directories-menu-user-extension-function'.
+
+ -- User Option: directories-menu-user-extension-function
+     Dynamic user extensions for the popup-menu of the directories buffer.  A
+     function which has to return a list in the same format like the option
+     `ecb-directories-menu-user-extension'. This function is called when the
+     user opens the popup-menu for the directories buffer.
+
+     If no dynamically evaluated menu-extensions should be added to the
+     directories-buffer the function has to return nil. Therefore the
+     default-value of this option is `ignore'.
+
+     Per default the dynamic user-extensions are added in front of the static
+     extensions of `ecb-directories-menu-user-extension' but the whole menu
+     can be re-arranged with `ecb-directories-menu-sorter'.
+
+ -- User Option: directories-show-node-info
+     When to display which node-info in the directories-buffer.  Define which
+     node info should be displayed after moving the mouse over a node (or
+     after a shift click onto the node) in the directories-buffer.
+
+     You can define "when" a node-info should be displayed:
+        - always: Node info is displayed by moving with the mouse over a node.
+
+        - if-too-long: Node info is only displayed by moving with the mouse
+          over a node does not fit into the window-width of the tree-buffer
+          window.  In the ECB directories buffer this means also if a node is
+          shortend or if the node has an alias (see `ecb-source-path').
+
+        - shift-click: Node info is only displayed after a shift click with
+          the primary mouse button onto the node.
+
+        - never: Node info is never displayed.
+
+     You can define "which" info should be displayed:
+        - name: Only the full node-name is displayed.
+
+        - path: The full-path of the node is displayed.
+
+     Do NOT set this option directly via setq but use always customize!
+
+ -- User Option: display-default-dir-after-start
+     Automatically display current default-directory after activating ECB.
+
+     If a file-buffer is displayed in the current active edit-window then ECB
+     synchronizes its basic tree-buffers to this file-buffer - at least if
+     the option `ecb-basic-buffer-sync' it not nil. So for this situation
+     `ecb-display-default-dir-after-start' takes no effect but this option is
+     for the case if no file-buffer is displayed in the edit-window after
+     startup:
+
+     If true then ECB selects autom. the current default-directory after
+     activation even if no file-buffer is displayed in the current active
+     edit-window. This is useful if ECB is autom. activated after startup of
+     Emacs and Emacs is started without a file-argument. So the directory
+     from which the startup has performed is auto. selected in the
+     ECB-directories buffer and the ECB-sources buffer displays the contents
+     of this directory.
+
+ -- User Option: excluded-directories-regexps
+     Directories that should not be included in the directories list. The
+     value of this variable should be a list of regular expression.
+
+ -- User Option: prescan-directories-for-emptyness
+     Prescan directories for emptyness. ECB does this so directories are
+     displayed as empty in the directories-buffer even without
+     user-interaction (i.e. in previous ECB-versions the emptyness of a
+     directory has been first checked when the user has clicked onto a
+     directory). ECB optimizes this check as best as possible but if a
+     directory contains a lot of subdirectories which contain in turn a lot
+     of entries, then expanding such a directory or selecting it would take
+     of course more time as without this check - at least at the first time
+     (all following selects of a directory uses the cached information if its
+     subdirectories are empty or not). Therefore ECB performs this check
+     stealthy (see `ecb-stealthy-tasks-delay') so normally there should no
+     performance-decrease or additional waiting-time for the user. There is
+     one exception: For remote directories (in the sense of tramp, ange-ftp,
+     or efs) this check can descrease performance even if performed stealthy
+     and interruptable. Therefore this option offers three possible settings:
+
+        * `t' Switch on this feature
+
+        * `unless-remote' Switch on this feature but not for remote
+          directories. The term "remote" means here directories which are
+          used via tramp, ange-ftp or efs. So mounted directories are counted
+          not as remote directories here even if such a directory is maybe
+          hosted on a remote machine. But normally only directories in a LAN
+          are mounted so there should be no performance-problems with such
+          mounted directories.
+
+        * `nil' Switch off this feature completely.
+
+     The option `ecb-prescan-directories-exclude-regexps' offers are more
+     fine granularity to exclude certain directories from this prescan.
+
+ -- User Option: host-accessible-check-valid-time
+     Time in seconds a cached accessible-state of a remote host is valid.
+     This option is a list where each element specifies how long for a
+     certain remote host the cached ping-state (i.e. if the host is
+     accessible or not) should be valid. During this time-intervall ECB pings
+     such a remote host only once, all other checks use the cached value of
+     that real check. But it the cached value is older than the value of this
+     option ECB will ping again.
+
+     Per default ECB discards after 1 minute the cached ping-state of each
+     remote host. But if you are sure that a certain remote host is always
+     accessible (i.e. means in consequence that you are always online when
+     working with ECB and remote-paths) then add an entry to this option with
+     a high valid-interval.
+
+     Examples: An entry (".*sourceforge.*" . 3600) ensures that all remote
+     hosts machting the string "sourceforge" will only once pinged during one
+     hour. Or (".*" . 300) would ensure that every remote host would be
+     pinged only once during 5 minutes.
+
+ -- User Option: ping-options
+     List of options for the ping program. These options can be used to limit
+     how many ICMP packets are emitted. Ping is used to test if a remote host
+     of a remote path (e.g. a tramp-, ange-ftp- or efs-path) is accessible
+     See also `ecb-ping-program'.
+
+ -- User Option: ping-program
+     Program to send network test packets to a host. See also
+     `ecb-ping-options'.
+
+ -- User Option: prescan-directories-exclude-regexps
+     Which directories should be excluded from the empty-prescan. If a
+     directory matches any of the regexps of this option it will not be
+     prescanned for emptyness - This option takes only effect if
+     `ecb-prescan-directories-for-emptyness' is not nil.
+
+ -- User Option: show-sources-in-directories-buffer
+     Show source files in directories buffer.
+
+ -- User Option: source-path
+     Paths where to find code sources. Each path can have an optional alias
+     that is used as it's display name. If no alias is set, the path is used
+     as display name.
+
+ -- User Option: source-path
+     Paths where to find code sources. Each path can have an optional alias
+     that is used as it's display name. If no alias is set, the path is used
+     as display name.
+
+     Lisp-type of tis option: The value must be a list L whereas each element
+     of L is either
+        - a simple string which has to be the full path of a directory (this
+          string is displayed in the directory-browser of ECB) or
+
+        - a 2-element list whereas the first element is the full path of a
+          directory (string) and the second element is an arbitrary alias
+          (string) for this directory which is then displayed instead of the
+          underlying directory.
+
+ -- User Option: use-speedbar-instead-native-tree-buffer
+     If true then uses speedbar for directories, sources or methods. This
+     means that speedbar is integrated in the ECB-frame and is displayed in
+     that window normally displaying the standard ECB-directories-buffer,
+     ECB-sources-buffer or ECB-methods-buffer.
+
+     This option takes effect in all layouts which contain either a directory
+     window, a sources window or a method window.
+
+     This option can have four valid values:
+        - `nil': Do not use speedbar (default)
+
+        - `dir': Use speedbar instead of the standard directories-buffer
+
+        - `source': Use speedbar instead of the standard sources-buffer
+
+        - `method': Use speedbar instead of the standard methods-buffer
+
+     Note: For directories and sources a similar effect and usability is
+     available by setting this option to `nil' (or `method') and setting
+     `ecb-show-sources-in-directories-buffer' to not `nil', because this
+     combination displays also directories and sources in one window.
+
+     `ecb-use-speedbar-instead-native-tree-buffer' is for people who like the
+     speedbar way handling directories and source-files or methods and want
+     it in conjunction with ECB.
+
+
+File: ecb.info,  Node: ecb-sources,  Next: ecb-methods,  Prev: ecb-directories,  Up: Customizable options
+
+7.3.4 Group ecb-sources
+-----------------------
+
+This group contains settings for the sources-buffer in the ECB:
+
+ -- User Option: read-only-check-exclude-regexps
+     Which directories should be excluded from the sources-read-only-check.
+     If a directory matches any of the regexps of this option their sources
+     will not be checked if they are writable - This option takes only effect
+     if `ecb-sources-perform-read-only-check' is not nil.
+
+ -- User Option: show-source-file-extension
+     Show the file extension of source files.
+
+ -- User Option: source-file-regexps
+     Specifies which files are shown as source files.
+
+     This is done on directory-base, which means for each directory-regexp
+     the files to display can be specified. If more than one directory-regexp
+     matches the current selected directory then always the first one (and
+     its related file-exclude/include-regexps) is used! If no
+     directory-regexp matches then all files are displayed for the currently
+     selected directory.
+
+     Important note: It is recommended that the *LAST* element of this list
+     should contain an always matching directory-regexp (`".*"')!
+
+     So the value of this option is a list of cons-cells where the car is a
+     directory regexp and the cdr is a 2 element list where the first element
+     is a list of exclude regexps and the second element is a list of include
+     regexps. A file is displayed in the source-buffer of ECB iff: The file
+     does not match any of the exclude regexps OR the file matches at least
+     one of the include regexps.
+
+     But regardless of the value of this option a file F is never displayed
+     in the sources-buffer if the directory matches
+     `ecb-sources-exclude-cvsignore' and the directory contains a file
+     .cvsignore which contains F as an entry!
+
+     There are three predefined and useful combinations of an exclude and
+     include regexp:
+
+        * All files
+
+        * All, but no backup, object, lib or ini-files (except .emacs and
+          .gnus). This means all files except those starting with ".", "#" or
+          ending with "~", ".elc", ".obj", ".o", ".lib", ".dll", ".a", ".so".
+          (but including .emacs and .gnus)
+
+        * Common source file types (.c, .java etc.)
+
+     In addition to these predefined values a custom exclude and include
+     combination can be defined.
+
+     Tips for the directory- and file-rexexps: `"$^"' matches no
+     files/directories, `".*"' matches all files/directories.
+
+ -- User Option: sources-buffer-after-create-hook
+     Local hook running after the creation of the sources-buffer. Every
+     function of this hook is called once without arguments direct after
+     creating the sources-buffer of ECB and it's local key-map. So for
+     example a function could be added which performs calls of
+     `local-set-key' to define new keybindings only for the sources-buffer of
+     ECB.
+
+ -- User Option: sources-buffer-name
+     Name of the ECB sources buffer. Because it is not a normal buffer for
+     editing you should enclose the name with stars, e.g. "*ECB Sources*".
+
+     If it is necessary for you you can get emacs-lisp access to the
+     buffer-object of the ECB-sources-buffer by this name, e.g. by a call of
+     `set-buffer'.
+
+     Changes for this option at runtime will take affect only after
+     deactivating and then activating ECB again!
+
+ -- User Option: sources-exclude-cvsignore
+     Specify if files contained in a `.cvsignore' should be excluded.
+
+     Value is a list of regular expressions or nil. If you want to exclude
+     files listed in a `.cvsignore'-file from being displayed in the
+     ecb-sources-buffer then specify a regexp for such a directory.
+
+     If you want to exclude the contents of `.cvsignore'-files for every
+     directory then you should add one regexp ".*" which matches every
+     directory.
+
+     If you never want to exclude the contents of `.cvsignore'-files then set
+     this option to nil.
+
+ -- User Option: sources-menu-sorter
+     Function which re-sorts the menu-entries of the directories buffer.
+
+     If a function then this function is called to sort the menu-entries of
+     the combined menu-entries of the user-menu-extensions of
+     `ecb-sources-menu-user-extension' and the built-in-menu
+     `ecb-sources-menu'. If nil then no special sorting will be done and the
+     user-extensions are placed in front of the built-in-entries.
+
+     For the guidelines for such a sorter-function see
+     `ecb-directories-menu-sorter'.
+
+ -- User Option: sources-menu-user-extension
+     Static user extensions for the popup-menu of the sources buffer.  For
+     further explanations see `ecb-directories-menu-user-extension'.
+
+     The node-argument of a menu-function contains as data the source for
+     which the popup-menu has been opened. Use always `ecb-source-get-*' to
+     extract whatever you need from the node-data. E.g. use
+     `ecb-source-get-filename' to get the full filename of the source of the
+     node.
+
+     Per default the static user-extensions are added at the beginning of the
+     built-in menu-entries of `ecb-sources-menu' but the whole menu can be
+     re-arranged with `ecb-sources-menu-sorter'.
+
+ -- User Option: sources-menu-user-extension-function
+     Dynamic user extensions for the popup-menu of the sources buffer. A
+     function which has to return a list in the same format like the option
+     `ecb-sources-menu-user-extension'. This function is called when the user
+     opens the popup-menu for the sources buffer.
+
+     If no dynamically evaluated menu-extensions should be added to the
+     sources-buffer the function has to return nil. Therefore the
+     default-value of this option is `ignore'.
+
+     Per default the dynamic user-extensions are added in front of the static
+     extensions of `ecb-sources-menu-user-extension' but the whole menu can
+     be re-arranged with `ecb-sources-menu-sorter'.
+
+ -- User Option: sources-perform-read-only-check
+     Check if source-items in the tree-buffers are read-only. If a sourcefile
+     is read-only then it will be displayed with that face set in the option
+     `ecb-source-read-only-face'.
+
+     Because this check can be take some time if files are used via a mounted
+     net-drive ECB performs this check stealthily (see
+     `ecb-stealthy-tasks-delay') so normally the user should not see a
+     performance-decrease or additional waiting-time. But to get sure this
+     option offers three choices: `t', `unless-remote' and `nil'. See
+     `ecb-prescan-directories-for-emptyness' for an explanation for these
+     three choices.
+
+     The option `ecb-read-only-check-exclude-regexps' offers are more fine
+     granularity to exclude the sources of certain directories from the
+     read-only state-check.
+
+ -- User Option: sources-show-node-info
+     When to display which node-info in the sources-buffer.  Define which
+     node info should be displayed after moving the mouse over a node (or
+     after a shift click onto the node) in the sources-buffer.
+
+     You can define "when" a node-info should be displayed: See
+     `ecb-directories-show-node-info' for the possible choices.
+
+        - name: Only the full node-name is displayed.
+
+        - file-info: File infos for this file are displayed.
+
+        - file-info-full: Fill infos incl. full path for this file are
+          displayed.
+
+     Do NOT set this option directly via setq but use always customize!
+
+ -- User Option: sources-sort-ignore-case
+     Ignore case for sorting the source-files of the Sources-buffer. See also
+     `ecb-sources-sort-method'.
+
+ -- User Option: sources-sort-method
+     Defines how the source files are sorted.
+
+        - `name': Sorting by name.
+
+        - `extension': Sorting first by extension and then by name.
+
+        - `nil': No sorting, means source files are displayed in the sequence
+          returned by `directory-files' (called without sorting).
+
+     See also `ecb-sources-sort-ignore-case'
+
+
+File: ecb.info,  Node: ecb-methods,  Next: ecb-history,  Prev: ecb-sources,  Up: Customizable options
+
+7.3.5 Group ecb-methods
+-----------------------
+
+This group contains settings for the methods-buffer in the ECB:
+
+ -- User Option: auto-expand-tag-tree
+     Expand the methods-tag-tree automatically if node invisible.
+
+     This option has only an effect if option `ecb-highlight-tag-with-point'
+     is switched on too. There are three possible choices:
+        - `nil': No auto. expanding of the method buffer.
+
+        - `expand-spec': Auto expand the method-buffer nodes if the node
+          belonging to current tag under point is invisible because its
+          parent-node is collapsed.  But expanding is only done if the type
+          of the tag under point in the edit-buffer is contained in
+          `ecb-methods-nodes-expand-spec'.
+
+        - `all': Like expand-spec but expands all tags regardless of the
+          setting in `ecb-methods-nodes-expand-spec'.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: auto-expand-tag-tree-collapse-other
+     Auto. expanding the tag-tree collapses all not related nodes. There are
+     several choices:
+
+        - Only if on tag: This means collapsing all nodes which have no
+          relevance for the currently highlighted node will be collapsed,
+          because they are not necessary to make the highlighted node
+          visible. But do this only if point stays onto a tag in the selected
+          edit-window.
+
+        - Always: Same as before but collapse also when point doesn't stays
+          on a tag (e.g. between two defuns in elisp) in the selected
+          edit-window. This means in such a situation a full collapsing of
+          the methods-buffer.
+
+        - Never: Do not automatically collapse the methods-buffer.
+
+ -- User Option: auto-update-methods-after-save
+     Automatically updating the ECB method buffer after saving a source.
+
+ -- User Option: default-tag-filter
+     Default tag-filters for certain files. This option allow to define
+     default tag-filters for certain files which are applied automatically
+     after loading such a file into a buffer. The possible filters are the
+     same as offered by the command `ecb-methods-filter' and they are applied
+     in the same manner - the only difference is they are applied
+     automatically. Please be aware that symbol-filters (e.g.
+     protection-symbols like public or private) must not be inserted with
+     quotes whereas a filter-regexp has to be inserted with surrounding
+     double-quotes! In addition backslashes in a regexp have to be doubled!
+
+     For each file-spec (a major-mode plus a file-regexp which both specify a
+     file for which filters should be applied) there can be as much filters
+     as needed - they are layered like with `ecb-methods-filter' too.
+
+     Tag-classes which are completely hidden or excluded by the option
+     `ecb-show-tags' will never being displayed in the Methods-buffer
+     regardless of the filters of this option!
+
+ -- User Option: disable-semantic-threshold-alist
+     Threshold for disabling semantic-parsing Define a threshold fpr
+     buffer-size. Exceeding this threshold disables parsing current buffer by
+     semantic.
+
+     This functionality is set on a major-mode base, i.e. for every
+     major-mode a different setting can be used. The value of this option is
+     a list of cons-cells:
+
+        - The car is either a major-mode symbol or the special symbol
+          'default which means if no setting for a certain major-mode is
+          defined then the cdr of the 'default cons-cell is used.
+
+        - The cdr is an integer which defines the threshold for the
+          buffer-size for this major-mode.
+
+     Example:
+
+          ((default . 1000000)
+            (c-mode . 200000))
+
+     This example whould not parse c-mode buffers exceeding a buffer-size of
+     200000. And buffers of all other modes would be only parsed if smaller
+     than 1000000.
+
+     A setting of `((c-mode . 200000))' would only restrict c-mode buffers to
+     a size of 200000 but would parse all other buffer regardless their size.
+
+ -- User Option: display-image-icons-for-semantic-tags
+     Display nice and pretty icons for semantic-tags in the Methods-buffer. A
+     non nil value takes only effect if Emacs can display images and if
+     `ecb-tree-buffer-style' is set to `image'.
+
+ -- User Option: exclude-parents-regexp
+     Regexps which parent classes should not be shown in the methods buffer
+     (see also `ecb-show-parents'). If nil then all parents will be shown if
+     `ecb-show-parents' is not nil.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: expand-methods-switch-off-auto-expand
+     Switch off auto expanding in the ECB-method buffer. If on then auto
+     expanding is switched off after explicit expanding or collapsing by
+     `ecb-expand-methods-nodes'.
+
+     This is done with `ecb-toggle-auto-expand-tag-tree' so after the switch
+     off the auto expanding feature can again switched on quickly.
+
+     But after explicitly expanding/collapsing the methods-buffer to a
+     certain level the auto. expanding could undo this when the node
+     belonging to current tag under point in the current active edit-window
+     is invisible after `ecb-expand-methods-nodes' - then the auto.  expand
+     feature would make this node immediately visible and destroys the
+     explicitly set expand-level.
+
+ -- User Option: find-external-tag-functions
+     Functions used for searching external tags clicked in the methods buffer.
+
+     The methods buffer displays for oo-languages the parents of a type under
+     a special bucket "Parents". Languages like C++, CLOS and Eieio allow to
+     define the implementation of a method outside of the class definition
+     and even in another file. In the methods-buffer of ECB such externaly
+     defined methods are collected and displayed under a `virtual' faux
+     type-tag named as the class-qualifier of the methods. This faux-tag is
+     virtual because it does not extist in the parsed buffer.
+
+     If a user clicks either onto such a faux-type-tag or onto a parent-tag
+     then ECB tries to find the definition of the underlying type on a
+     name-basis, displaying the containing file as buffer in the current
+     edit-window and jumping to the start of the type-definition in this
+     buffer.
+
+     Finding such external types can be very complex and there are several
+     roads to success. ECB uses per default methods based on the
+     semantic-analyzer. But this option allows to define own find-functions
+     and tell ECB to uses them.
+
+     This functionality is set on a `major-mode' base, i.e. for every
+     `major-mode' a different setting can be used. The value of this option is
+     a list of cons-cells: The car is either a `major-mode' symbol or the
+     special symbol 'default. The cdr is a list of find-functions or nil.
+
+     ECB first performs all find-functions defined for current `major-mode'
+     (if any) anf then all find-functions defined for the special symbol
+     'default (if any).
+
+     ECB offers some predefined senseful finding-functions. Currently there
+     are:
+        * `ecb-search-tag-by-semantic-analyzer' (most powerful)
+
+        * `ecb-search-tag-by-semanticdb'
+
+        * `ecb-jde-show-class-source' (for major-mode `jde-mode' when coding
+          in java)
+
+     This function does not only the searching but displays the founded tag.
+     See the documentation of these function for details how they work.
+
+     But you can add any arbitrary function if the following conditions are
+     fulfilled:
+
+        * The function gets a semantic tag representing the external type
+          which should be found. This is a positionless-tag (otherwise it
+          would not be hard to go to it) and it's either a faux-tag (for
+          which `ecb--semantic-faux-tag-p' is not nil; the function can use
+          this check if necessary) or a simple tag containing only a name an
+          a tag-class. The tag-class for both is 'type.
+
+        * The return value of the function must be one of:
+             - `nil': No tag is found
+
+             - `t': A tag has been found and also be displayed in the
+               edit-window (this prevents ECB from running further function
+               of this option because the searched tag is already displayed.
+               So a function should only return `t' if all is fine and no
+               further actions are needed.
+
+             - A positioned semantic tag (for which
+               `ecb--semantic-tag-with-position-p' returns not `nil') which
+               represents the found external type-tag.
+
+     It's strongly recommended for the function not to display the found
+     location for itself but to return a positioned semantic tag! But
+     sometimes the displaying is integrated in a third-party find-function
+     like `jde-show-class-source' which is used by
+     `ecb-jde-show-class-source'. In these cases the function has to return t
+     if the searched tag has been successfully displayed.
+
+     Precondition for a find-function: Current buffer is the buffer the
+     clicked faux- or parent tag belongs to Current point depends on the
+     clicked tag:
+        * In case of a faux-tag it's the start of the first child of the
+          faux-tag. There must be at least one adopted child-tag because
+          otherwise we would not have the faux-tag
+
+        * In case of an external parent-tag its the the start of the external
+          tag itself.
+
+ -- User Option: font-lock-tags
+     Adds font-locking (means highlighting) to the ECB-method buffer.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: highlight-tag-with-point
+     How to highlight the method or variable under the cursor.
+
+        - `highlight-scroll': Always scroll the method buffer, so the current
+          method of the edit-window is highlighted in the method-window.
+
+        - `highlight': Only highlight the current method of the edit window
+          in the method window if the method is visible in the method-window.
+
+        - `nil': No highlighting is done.
+
+     See also `ecb-highlight-tag-with-point-delay'.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: highlight-tag-with-point-delay
+     Time Emacs must be idle before current tag is highlighted. If nil then
+     there is no delay, means current tag is highlighted immediately. A small
+     value of about 0.25 seconds saves CPU resources and you get even though
+     almost the same effect as if you set no delay.  But such a delay
+     prevents also "jumping backward/forward" during scrolling within
+     java-classes if point goes out of method-definition into
+     class-definition. Therefore the default value is a delay of 0.25 seconds.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: methods-buffer-after-create-hook
+     Local hook running after the creation of the methods-buffer. Every
+     function of this hook is called once without arguments direct after
+     creating the methods-buffer of ECB and it's local key-map. So for
+     example a function could be added which performs calls of
+     `local-set-key' to define new keybindings only for the methods-buffer of
+     ECB.
+
+ -- User Option: methods-buffer-name
+     Name of the ECB methods buffer. Because it is not a normal buffer for
+     editing you should enclose the name with stars, e.g. " *ECB Methods*".
+
+     If it is necessary for you you can get emacs-lisp access to the
+     buffer-object of the ECB-methods-buffer by this name, e.g. by a call of
+     `set-buffer'.
+
+     Changes for this option at runtime will take affect only after
+     deactivating and then activating ECB again!
+
+ -- User Option: methods-filter-replace-existing
+     How the methods-filter should be applied to existing filters. There are
+     three different choices:
+
+        - `never': This is the default and means that calling
+          `ecb-methods-filter' always adds the new filter on top of already
+          existing filters. So you can combine several filter to one combined
+          like this example: 'Display only all public methods having the
+          string "test" in its name.' With this setting the filters can only
+          be cleared by calling `ecb-methods-filter' and then choosing
+          "nothing".
+
+        - `always': This means that `ecb-methods-filter' always clears a
+          previous filter before applying the new one.
+
+        - `ask': ECB asks if the new filter should replace the existing ones.
+
+ -- User Option: methods-menu-sorter
+     Function which re-sorts the menu-entries of the directories buffer.
+
+     If a function then this function is called to sort the menu-entries of
+     the combined menu-entries of the user-menu-extensions of
+     `ecb-methods-menu-user-extension' and the built-in-menu
+     `ecb-methods-menu'. If nil then no special sorting will be done and the
+     user-extensions are placed in front of the built-in-entries.
+
+     For the guidelines for such a sorter-function see
+     `ecb-directories-menu-sorter'.
+
+ -- User Option: methods-menu-user-extension
+     Static user extensions for the popup-menu of the methods buffer. For
+     further explanations see `ecb-directories-menu-user-extension'.
+
+     The node-argument of a menu-function contains as data the semantic-tag
+     of the method/variable/tag for which the popup-menu has been opened.
+
+     Per default the static user-extensions are added at the beginning of the
+     built-in menu-entries of `ecb-methods-menu' but the whole menu can be
+     re-arranged with `ecb-methods-menu-sorter'.
+
+ -- User Option: methods-menu-user-extension-function
+     Dynamic user extensions for the popup-menu of the methods buffer. A
+     function which has to return a list in the same format like the option
+     `ecb-methods-menu-user-extension'. This function is called when the user
+     opens the popup-menu for the methods buffer. For an example how such a
+     function can be programmed see `ecb-methods-menu-editwin-entries'.
+
+     If no dynamically evaluated menu-extensions should be added to the
+     methods-buffer the function has to return nil. Therefore the
+     default-value of this option is `ignore'.
+
+     Per default the dynamic user-extensions are added in front of the static
+     extensions of `ecb-methods-menu-user-extension' but the whole menu can
+     be re-arranged with `ecb-methods-menu-sorter'.
+
+ -- User Option: methods-nodes-collapse-spec
+     Semantic tag-types collapsed by `ecb-expand-methods-nodes'.  For valid
+     values of this option see `ecb-methods-nodes-expand-spec'!
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: methods-nodes-expand-spec
+     Semantic tag-types expanded by `ecb-expand-methods-nodes'.
+
+     The value of this option is either the symbol `all' (all tags are
+     expanded regardless of their type) or a list of symbols where each
+     symbol is a valid semantic tag-type. For a description of semantic tag
+     types see option `ecb-show-tags'.
+
+     But this option also defines if bucket-nodes in the ECB-method-buffer
+     (e.g. "[Variables]") should be expanded. Therefore valid symbols for
+     this list are also all cars of the variable returned by
+     `ecb--semantic-symbol->name-assoc-list'.
+
+     If there is a bucket-name (the node-name stripped of the settings in
+     `ecb-bucket-node-display') which is not contained as cdr in the value
+     returned by `ecb--semantic-symbol->name-assoc-list' then the symbol with
+     this bucket-name as name is also a valid symbol for this list. Example:
+     In ECB there are buckets "[Parents]". The bucket-name is "Parents" and
+     the valid symbol-name is then `Parents'.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: methods-separate-prototypes
+     Separate function-prototypes from the real functions. This is for
+     example useful for C++ and C because these languages distinct between a
+     method-prototype (rsp. function-prototype for C) and the method (rsp.
+     function for C) itself. If this option is not nil then ECB separates the
+     prototypes from the real function/methods. Then with `ecb-show-tags' the
+     user can define different display-settings for each of them. If this
+     option is nil then the prototypes and the real functions are filled in
+     the same bucket and displayed plain and there is no sorting between
+     prototypes and functions possible. If this option is switched on then it
+     is senseful that `ecb-show-tags' contains for all modes which distinct
+     between prototypes and real functions/methods two entries for the
+     tag-type 'function - see the documentation of this option.
+
+ -- User Option: methods-show-node-info
+     When to display which node-info in the methods-buffer. Define which node
+     info should displayed after moving the mouse over a node (or after a
+     shift click onto the node) in the methods-buffer.
+
+     You can define "when" a node-info should be displayed: See
+     `ecb-directories-show-node-info' for the possible choices.
+
+     You can define what info should be displayed:
+        - name: Only the full node name is displayed.
+
+        - name+type: The full name + the type of the node (function, class,
+          variable) is displayed.
+
+     Do NOT set this option directly via setq but use always customize!
+
+ -- User Option: post-process-semantic-taglist
+     Define mode-dependent post-processing for the semantic-taglist. This is
+     an alist where the car is a major-mode symbol and the cdr is a list of
+     function-symbols of functions which should be used for post-processing
+     the taglist (returned by `ecb--semantic-bovinate-toplevel') for a buffer
+     in this major-mode. The first function in the list is called with current
+     semantic taglist of current buffer and must return a valid taglist
+     again. All other functions are called with the result-taglist of its
+     preceding function and have to return a new taglist again.
+
+     For oo-programming languages where the methods of a class can be defined
+     outside the class-definition (e.g. C++, Eieio) the function
+     `ecb-group-function-tags-with-parents' can be used to get a much better
+     method-display in the methods-window of ECB, because all method
+     implementations of a class are grouped together.
+
+     Another senseful usage is to filter out certain tags, e.g. prototype
+     tags in `c-mode'. For this you can set `ecb-filter-c-prototyp-tags'.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: show-only-positioned-tags
+     Show only nodes in the method-buffer which are "jump-able". If not nil
+     then ECB displays in the method-buffer only nodes which are "jump-able",
+     i.e. after selecting it by clicking or with RET then ECB jumps to the
+     corresponding location in the edit-window. Example: With CLOS or Eieio
+     source-code there can exist some position-less nodes like
+     variable-attributes in a `defclass' form which are only displayed if
+     this option is nil. Displaying such nodes can be senseful even if they
+     can not be jumped.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: show-tags
+     How to show tags in the methods buffer first time after find-file.  This
+     functionality is set on a major-mode base, i.e. for every major-mode a
+     different setting can be used. The value of this option is a list of
+     cons-cells:
+
+     The car is either a major-mode symbol or the special symbol 'default
+     which means if no setting for a certain major-mode is defined then the
+     cdr of the 'default cons-cell is used. This option should always contain
+     a default-setting!
+
+     The cdr is a list where each element represents a type of tags:
+
+        (<tag type> <display type> <sort method>)
+
+     There can be more than 1 element for a certain <tag type>. This is for
+     example useful for C++ and C because these languages distinct between a
+     method-prototype (rsp. function-prototype for C) and the method (rsp.
+     function for C) itself. The default value of these option contains two
+     entries for <tag type> is `function' whereas the first one is
+     responsible for the "real" methods (rsp. functions) and the second one
+     for the prototypes. So if the methods should be flattened and the
+     prototypes collapsed the show-tags-list for C++ and C must contain two
+     entries for <tag type> `function', the first one defined as `flattened'
+     and the second one defined as `collapsed'.
+
+     The tags in the methods buffer are displayed in the order as they appear
+     in this list.
+
+    `<tag type>'
+          A Semantic tag type symbol (function, variable, rule, include etc.)
+          or one of the following:
+
+             - `t': All tag types not specified anywhere else in the list.
+
+             - `parent': The parents of a type.
+
+    `<display type>'
+          A symbol which describes how the tags of this type shall be shown:
+
+             - `expanded': The tags are shown in an expanded node.
+
+             - `collapsed': The tags are shown in a collapsed node.
+
+             - `flattened': The tags are added to the parent node.
+
+             - `hidden': The tags are not shown.
+
+    `<sort method>'
+          A symbol describing how to sort the tags of this type:
+
+             - `name': Sort by the tag name.
+
+             - `access': Sort by tag access (public, protected, private) and
+               then by name.
+
+             - `nil': Don't sort tags. They appear in the same order as in
+               the source buffer.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: tag-display-function
+     Function to use for displaying tags in the methods buffer. This
+     functionality is set on major-mode base, i.e. for every major-mode a
+     different function can be used. The value of this option is a list of
+     cons-cells:
+
+        - The car is either a major-mode symbol or the special symbol
+          'default which means if no function for a certain major-mode is
+          defined then the cdr of the 'default cons-cell is used.
+
+        - The cdr is the function used for displaying a tag in the related
+          major-mode.
+
+     Every function is called with 3 arguments:
+
+       1. The tag
+
+       2. The parent-tag of tag (can be nil)
+
+       3. The value of `ecb-font-lock-tags'.
+
+     Every function must return the display of the tag as string, colorized
+     if the third argument is not nil.
+
+     The following functions are predefined:
+
+        * For each element E of `ecb--semantic-format-function-alist' exists
+          a function with name "ecb-<(cdr E)>". These functions are just
+          aliase to the builtin format-functions of semantic. See the
+          docstring of these functions to see what they do. Example:
+          (semantic-name-nonterminal . semantic-format-tag-name) is an element
+          of `ecb--semantic-format-function-alist'. Therefore the
+          alias-function for this element is named
+          `ecb--semantic-format-tag-name'.
+
+        * For every cdr in `ecb--semantic-format-function-alist' with name
+          "semantic-XYZ" a function with name "ecb-XYC" is predefined. The
+          differences between the semantic- and the ECB-version are:
+
+             - The ECB-version displays for type tags only the type-name and
+               nothing else (exception: In c++-mode a template specifier is
+               appended to the type-name if a template instead a normal
+               class).
+
+             - The ECB-version displays type-tags according to the setting in
+               `ecb-type-tag-display'. This is useful for better recognizing
+               different classes, structs etc. in the ECB-method window.
+
+          For all tags which are not types the display of the ECB-version is
+          identical to the semantic version. Example: For
+          `ecb--semantic-format-tag-name' (one of the builtin semantic
+          formatters) the pendant is `ecb-format-tag-name'.
+
+     This functionality also allows the user to display tags as UML. To
+     enable this functionality set the function for a major-mode \(e.g.
+     `jde-mode') to `ecb--semantic-format-tag-uml-concise-prototype',
+     `ecb--semantic-format-tag-uml-prototype', or
+     `ecb--semantic-format-tag-uml-abbreviate' the ECB-versions of these
+     functions.
+
+     If the value is `nil', i.e. neither a function for a major-mode is
+     defined nor the special 'default, then
+     `ecb--semantic-format-tag-prototype' is used for displaying the tags.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: tag-jump-sets-mark
+     Set the mark after jumping to a tag from the ECB-method buffer. If set
+     the user can easily jump back.
+
+ -- User Option: tag-visit-post-actions
+     Actions to perform after visiting a tag from the Method-buffer. With
+     this option actions can be added which will be performed after visiting
+     the start of the tag in the source-buffer.
+
+     This functionality is set on a `major-mode' base, i.e. for every
+     `major-mode' a different setting can be used. The value of this option
+     is a list of cons-cells:
+        - The car is either a `major-mode' symbol or the special symbol
+          'default.
+
+        - The cdr is a list of action-functions or nil.
+
+     ECB first performs all actions defined for the special symbol 'default
+     (if any) and then all actions defined for current `major-mode' (if any).
+
+     ECB offers some predefined senseful action-functions. Currently there
+     are: `ecb-tag-visit-highlight-tag-header' `ecb-tag-visit-smart-tag-start'
+     `ecb-tag-visit-recenter' `ecb-tag-visit-recenter-top'
+     `ecb-tag-visit-goto-doc-start' `ecb-tag-visit-narrow-tag' See the
+     documentation of these function for details what they do.
+
+     But you can add any arbitrary function if the following conditions are
+     fulfilled: The function gets the semantic tag as argument, returns the
+     (new) point after finishing its job and the function must not put the
+     point outside the tag-boundaries of the tag-argument.
+
+ -- User Option: type-tag-display
+     How to display semantic type-tags in the methods buffer. Normally all
+     tag displaying, colorizing and facing is done by semantic according to
+     the value returned by `ecb--semantic-format-face-alist' and the semantic
+     display-function (e.g. one from `ecb--semantic-format-tag-functions').
+     But sometimes a finer distinction in displaying the different type
+     specifiers of type-tags can be useful. For a description when this
+     option is evaluated look at `ecb-tag-display-function'!
+
+     This functionality is set on a major-mode base, i.e. for every
+     major-mode a different setting can be used. The value of this option is
+     a list of cons-cells:
+
+        * The car is either a major-mode symbol or the special symbol
+          'default which means if no setting for a certain major-mode is
+          defined then the cdr of the 'default cons-cell is used.
+
+        * The cdr is a list of 3-element-lists:
+
+            1. First entry is a semantic type specifier in string-form.
+               Current available type specifiers are for example "class",
+               "interface", "struct", "typedef" and "enum". In addition to
+               these ones there is also a special ECB type specifier "group"
+               which is related to grouping tags (see
+               `ecb-post-process-semantic-taglist' and
+               `ecb-group-function-tags-with-parents'). Any arbitrary
+               specifier can be set here but if it is not "group" or not
+               known by semantic it will be useless.
+
+            2. Second entry is a flag which indicates if the type-specifier
+               string from (1.) itself should be removed (if there is any)
+               from the display.
+
+            3. Third entry is the face which is used in the ECB-method window
+               to display type-tags with this specifier. ECB has some
+               predefined faces for this (`ecb-type-tag-class-face',
+               `ecb-type-tag-interface-face', `ecb-type-tag-struct-face',
+               `ecb-type-tag-typedef-face', `ecb-type-tag-union-face',
+               `ecb-type-tag-enum-face' and `ecb-type-tag-group-face') but
+               any arbitrary face can be set here. This face is merged with
+               the faces semantic already uses to display a tag, i.e. the
+               result is a display where all face-attributes of the ECB-face
+               take effect plus all face-attributes of the semantic-faces
+               which are not set in the ECB-face (with XEmacs this merge
+               doesn't work so here the ECB-face replaces the semantic-faces;
+               this may be fixed in future versions).
+
+     The default value is nil means there is no special ECB-displaying of
+     type-tags in addition to the displaying and colorizing semantic does.
+     But a value like the following could be a useful setting:
+
+        ((default
+           ("class" t ecb-type-tag-class-face)
+           ("group" nil ecb-type-tag-group-face))
+         (c-mode
+          ("struct" nil ecb-type-tag-struct-face)
+          ("typedef" nil ecb-type-tag-typedef-face)))
+
+     This means that in `c-mode' only "struct"s and "typedef"s are displayed
+     with special faces (the specifiers itself are not removed) and in all
+     other modes "class"s and grouping-tags (see `ecb-tag-display-function',
+     `ecb-group-function-tags-with-parents') have special faces and the
+     "class" specifier-string is removed from the display.
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+ -- User Option: type-tag-expansion
+     Default expansion of semantic type-tags. Semantic groups type-tags in
+     different type-specifiers. Current available type specifiers are for
+     example "class", "interface", "struct", "typedef", "union" and "enum".
+     In addition to these ones there is also a special ECB type-specifier
+     "group" which is related to grouping tags (see
+     `ecb-post-process-semantic-taglist').
+
+     This option defines which type-specifiers should be expanded at
+     file-open-time. Any arbitrary specifier can be set here but if it is not
+     "group" or not known by semantic it will be useless.
+
+     This functionality is set on a major-mode base, i.e. for every
+     major-mode a different setting can be used. The value of this option is
+     a list of cons-cells:
+
+        * The car is either a major-mode symbol or the special symbol
+          `default' which means if no setting for a certain major-mode is
+          defined then the cdr of the `default' cons-cell is used.
+
+        * The cdr is either a list of type-specifiers which should be expanded
+          at file-open-time or the symbol `all-specifiers' (then a type-tag
+          is always expanded regardless of its type-specifier).
+
+     This options takes only effect for semantic-sources - means sources
+     supported by semantic!
+
+
+File: ecb.info,  Node: ecb-history,  Next: ecb-analyse,  Prev: ecb-methods,  Up: Customizable options
+
+7.3.6 Group ecb-history
+-----------------------
+
+This group contains settings for the history-buffer in the ECB:
+
+ -- User Option: history-buffer-after-create-hook
+     Local hook running after the creation of the history-buffer. Every
+     function of this hook is called once without arguments direct after
+     creating the history-buffer of ECB and it's local key-map. So for
+     example a function could be added which performs calls of
+     `local-set-key' to define new keybindings only for the history-buffer of
+     ECB.
+
+ -- User Option: history-buffer-name
+     Name of the ECB history buffer. Because it is not a normal buffer for
+     editing you should enclose the name with stars, e.g. "*ECB History*".
+
+     If it is necessary for you you can get emacs-lisp access to the
+     buffer-object of the ECB-history-buffer by this name, e.g. by a call of
+     `set-buffer'.
+
+     Changes for this option at runtime will take affect only after
+     deactivating and then activating ECB again!
+
+ -- User Option: history-exclude-file-regexps
+     List of regexps which exclude source-files from being historized. Be
+     aware that each always full filenames (ie. incl. full path) are matched
+     against these regexps! Therefore be carefore with regexps beginning with
+     ^!
+
+ -- User Option: history-item-name
+     The name to use for items in the history buffer.
+
+ -- User Option: history-make-buckets
+     Bucketize the entries of the history-buffer.
+
+     There are several options how the bucketizing should be done:
+        * 'never:
+
+          No bucketizing at all, ie. all entries of the history-buffer we be
+          displayed flat.
+
+        * 'directory:
+
+          All entries with related filesources residing in the same directory
+          will be contained in a bucket named with that directory.
+
+        * 'mode:
+
+          All entries with related buffers have the same major-mode will be
+          contained in a bucket named with that major-mode
+
+        * 'extension:
+
+          All entries with related filesources having the same extension will
+          be contained in a bucket named with that extension
+
+     If the value is a list of regular expressions then all entries where the
+     buffername matches the same regular expression will be contained in one
+     bucket. If the value is nil then this is interpreted as an empty list of
+     regular expressions!
+
+     The default value is 'directory.
+
+ -- User Option: history-menu-sorter
+     Function which re-sorts the menu-entries of the directories buffer.
+
+     If a function then this function is called to sort the menu-entries of
+     the combined menu-entries of the user-menu-extensions of
+     `ecb-history-menu-user-extension' and the built-in-menu
+     `ecb-history-menu'. If nil then no special sorting will be done and the
+     user-extensions are placed in front of the built-in-entries.
+
+     For the guidelines for such a sorter-function see
+     `ecb-directories-menu-sorter'.
+
+ -- User Option: history-menu-user-extension
+     Static user extensions for the popup-menu of the history buffer.  For
+     further explanations see `ecb-directories-menu-user-extension'.
+
+     The node-argument of a menu-function contains as data a cons:
+
+     car is the filename of the source for which the popup-menu has been
+     opened. cdr is the related buffer-name; but be careful, because the node
+     can point to a dead buffer (see `ecb-kill-buffer-clears-history'). Use
+     always `ecb-source-get-*' to extract whatever you need from the
+     node-data. E.g. use `ecb-source-get-filename' to get the full filename
+     of the source of the node and use `ecb-source-get-buffername' or
+     `ecb-source-get-buffer' to get the buffername rsp. the buffer-object.
+
+     Per default the static user-extensions are added at the beginning of the
+     built-in menu-entries of `ecb-history-menu' but the whole menu can be
+     re-arranged with `ecb-history-menu-sorter'.
+
+ -- User Option: history-menu-user-extension-function
+     Dynamic user extensions for the popup-menu of the history buffer. A
+     function which has to return a list in the same format like the option
+     `ecb-history-menu-user-extension'. This function is called when the user
+     opens the popup-menu for the history buffer.
+
+     If no dynamically evaluated menu-extensions should be added to the
+     history-buffer the function has to return nil. Therefore the
+     default-value of this option is `ignore'.
+
+     Per default the dynamic user-extensions are added in front of the static
+     extensions of `ecb-history-menu-user-extension' but the whole menu can
+     be re-arranged with `ecb-history-menu-sorter'.
+
+ -- User Option: history-show-node-info
+     When to display which node-info in the history-buffer.  Define which
+     node info should be displayed after moving the mouse over a node (or
+     after a shift click onto the node) in the history-buffer.
+
+     You can define "when" a node-info should be displayed: See
+     `ecb-directories-show-node-info' for the possible choices.
+
+     You can define "which" info should be displayed:
+        * name: Only the full node-name is displayed.
+
+        * path: The full-path of the node is displayed.
+
+        * name-path: The full node-name and the full-path is displayed.
+
+     Do NOT set this option directly via setq but use always customize!
+
+ -- User Option: history-sort-ignore-case
+     Ignore case for sorting the history-entries. See also
+     `ecb-history-sort-method'.
+
+ -- User Option: history-sort-method
+     Defines how the entries in the history-buffer are sorted.
+        - `name': Sorting by name (default).
+
+        - `extension': Sorting first by extension and then by name.
+
+        - `nil': No sorting, means the most recently used buffers are on the
+          top of the history and the seldom used buffers at the bottom.
+
+     See also `ecb-history-sort-ignore-case'.
+
+     If the history is bucketized (see `ecb-history-make-buckets') then this
+     sorting applies to the sorting within each bucket.
+
+ -- User Option: history-stick-indirect-buffers-to-basebuffer
+     Stick all indirect-buffers as subnodes to their base-buffer.
+
+     If nil then indirect-buffers are treated as non-indirect-buffers and
+     sorted into the history-buffer-sequence according to the setting of
+     `ecb-history-sort-method'.
+
+     If not nil then indirect-buffers are always sticked to their
+     base-buffer, ie.  the base-buffer is displayed as expandable node with
+     all its indirect-buffers as children-nodes, so the history looks like:
+
+        [-] <base-buffer BB>
+         |  <indirect-buffer 1 of BB>
+         `- <indirect-buffer 2 of BB>
+
+ -- User Option: kill-buffer-clears-history
+     Define if `kill-buffer' should also clear the history. There are three
+     options:
+
+        - `auto': Removes automatically the corresponding history-entry after
+          the buffer has been killed.
+
+        - `ask': Asks, if the history-entry should be removed after the kill.
+
+        - `nil': `kill-buffer' does not affect the history (this is the
+          default).
+
+
+File: ecb.info,  Node: ecb-analyse,  Next: ecb-layout,  Prev: ecb-history,  Up: Customizable options
+
+7.3.7 Group ecb-analyse
+-----------------------
+
+ -- User Option: analyse-bucket-element-face
+     Basic face for displaying elements of buckets in the ECB-analyse-buffer.
+     This defines the basic face for the elements of category-buckets like
+     Context, Prefix, Completions etc. in the ECB-analyse-buffer.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: analyse-bucket-node-face
+     Basic face for displaying a bucket-node in the ECB-analyse-buffer.  This
+     defines the basic face for the bucket-nodes like Context, Prefix,
+     Completions etc. in the ECB-analyse-buffer.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: analyse-buffer-after-create-hook
+     Local hook running after the creation of the analyse-buffer. Every
+     function of this hook is called once without arguments direct after
+     creating the analyse-buffer of ECB and it's local key-map. So for
+     example a function could be added which performs calls of
+     `local-set-key' to define new key-bindings only for the analyse-buffer
+     of ECB.
+
+ -- User Option: analyse-buffer-name
+     Name of the ECB analyse buffer. Because it is not a normal buffer for
+     editing you should enclose the name with stars, e.g. "*ECB Analyse*".
+
+     If it is necessary for you you can get emacs-lisp access to the
+     buffer-object of the ECB-analyse-buffer by this name, e.g. by a call of
+     `set-buffer'.
+
+     Changes for this option at runtime will take affect only after
+     deactivating and then activating ECB again!
+
+ -- User Option: analyse-buffer-sync
+     Synchronize the analyse buffer automatically with current edit buffer.
+
+     If 'always then the synchronization takes place always a buffer changes
+     in the edit window, if nil then never. If a list of major-modes then
+     only if the `major-mode' of the new buffer belongs NOT to this list.
+
+     Normally it's not necessary to exclude some major-modes because with
+     not-semantic supported major-modes simply nothing happens. But maybe it
+     can be helpful for certain situations...
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync'.
+
+     IMPORTANT NOTE: Every time the synchronization is done the hook
+     `ecb-analyse-buffer-sync-hook' is evaluated.
+
+ -- User Option: analyse-buffer-sync-delay
+     Time Emacs must be idle before the analyse-buffer is synchronized.
+     Synchronizing is done with the current source displayed in the edit
+     window. If nil then there is no delay, means synchronization takes place
+     immediately.
+
+     CAUTION: With analysing a value not too small is strongly recommended
+     because it can be very annoying if more or less after each typing the
+     current context is analysed. If set to nil then *each* keyboard hit
+     refreshes the analyse-buffer which will make ECB quite unusable!
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync-delay'
+
+ -- User Option: analyse-buffer-sync-hook
+     ook run at the end of `ecb-analyse-buffer-sync'.  See documentation of
+     `ecb-analyse-buffer-sync' for conditions when synchronization takes
+     place and so in turn these hooks are evaluated.
+
+     Preconditions for such a hook:
+
+        * Current buffer is the buffer of the currently selected edit-window.
+
+        * The analyse-buffer is displayed in a visible window of the
+          ecb-frame (so no check for visibilty of the analyse-buffer in the
+          ecb-frame is necessary in a hook function)
+
+     Postcondition for such a hook: Point must stay in the same edit-window
+     as before evaluating the hook.
+
+     Important note: If the option `ecb-analyse-buffer-sync' is not nil the
+     function `ecb-analyse-buffer-sync' is running either every time Emacs is
+     idle or even after every command (see `ecb-analyse-buffer-sync-delay').
+     So if the anaylse-buffer is displayed in a window of the ecb-frame (see
+     preconditions above) these hooks can be really called very often!
+     Therefore each function of this hook should/must check in an efficient
+     way at beginning if its task have to be really performed and then do
+     them only if really necessary! Otherwise performance of Emacs could slow
+     down dramatically!
+
+ -- User Option: analyse-collapsed-buckets
+     Buckets collapsed when displaying the current semantic analysis. The
+     semantic analyse-modul offers several categories of analysis which are
+     called buckets here. These are for example:
+
+     Context: The current context, which is the current function/method,
+     variable, class etc. (what exactly depends on the programming language)
+     point is in. This means not the current
+     function/method/variable/class-name point stand on but the current
+     surrounding context. Example: If point stays somewhere within a
+     defun-definition in emacs-lisp or within a java-method then this defun
+     rsp. method is the context. In object oriented languages this can be the
+     full hierachy, i.e. not only the current method, but the current method,
+     the class of this method, the superclass of this class and so on!
+
+     Arguments: The arguments of the context if the context is a
+     function/method.
+
+     Local Variables: All accessible and bound local variables visible at
+     current point.
+
+     Prefix: The currently parsed prefix, which is mostly the current
+     identifier point stands on.
+
+     Assignee: See the semantic user-manual
+
+     Function: Current function-name point stands on.
+
+     Argument #: When point is located within a function-call then this is
+     the number of the argument point stands on.
+
+     Completions: All possible completions for current prefix (see above).
+     This is probably the most helpful bucket.
+
+     If one of these categories/buckets are not needed per default then add
+     the bucket-name (s.a.) to this option and ECB will per default collapse
+     this bucket. So most needed buckets are better visible in the
+     analyse-buffer.
+
+ -- User Option: analyse-face
+     Face used for highlighting current entry in the analyse buffer. If the
+     face `ecb-default-highlight-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-highlight-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: analyse-fontified-buckets
+     Buckets whose elements should be fontified as in the methods-buffer.  If
+     the name of a category/bucket is contained in this option then all
+     elements of this bucket will be displayed as in the methods-buffer - at
+     least if an element is a semantic-tag. This means if
+     `ecb-font-lock-tags' is not nil these elements will be fontified and
+     also displayed with an appropriate icon if possible. The default value
+     does this only for the Context-bucket because for most of the other
+     buckets this makes not really much sense.
+
+     For available buckets see `ecb-analyse-collapsed-buckets'.
+
+     For the faces used to display a bucket-node itself or bucket-elements
+     not fontified see the options `ecb-analyse-bucket-node-face' rsp.
+     `ecb-analyse-bucket-element-face'.
+
+ -- User Option: analyse-gen-tag-info-fn
+     Which info should be displayed for a tag of the analyse-buffer. If nil
+     then the default information about a tag will be displayed. If a
+     function then this function gets as argument the tag for which
+     tag-information should be displayed. This function has to return a
+     string which will be then display as tag-info. This string has to be
+     fully formatted (e.g. must already include line-breaks if the tag-info
+     should be displayed in several lines).
+
+     See `ecb-analyse-show-tag-info-fn' how the tag-info is displayed.
+
+ -- User Option: analyse-general-face
+     Basic face for the ECB analyse buffer. This defines the basic face the
+     whole history buffer should displayed with. If the face
+     `ecb-default-general-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-general-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: analyse-show-node-info
+     When to display which node-info in the history-buffer. Define which node
+     info should displayed after moving the mouse over a node (or after a
+     shift click onto the node) in the history-buffer.
+
+     You can define "when" a node-info should be displayed: See
+     `ecb-directories-show-node-info' for the possible choices.
+
+     You can define what info should be displayed:
+
+        - name: The full name of the node
+
+        - full-info: All infos available to a node.
+
+     Do NOT set this option directly via setq but use always customize!
+
+ -- User Option: analyse-show-tag-info-fn
+     How to display the tag-info for a tag of the analyse-buffer. The value
+     of this option is a function which will be called with the info-string
+     generated for the current tag of the analyse-buffer. This function must
+     do all things necessary for displaying this info. When this function is
+     called the window stored in `ecb-last-edit-window-with-point' is the
+     selected window!
+
+     ECB offers two builtin ways: Display the info in the echo-area (via the
+     function `message') or in a temp-buffer in the edit-area (via the
+     function `ecb-analyse-show-tag-info-in-temp-buffer'). Default is
+     echo-area-display.
+
+     See also `ecb-analyse-gen-tag-info-fn'.
+
+
+File: ecb.info,  Node: ecb-layout,  Next: ecb-compilation,  Prev: ecb-analyse,  Up: Customizable options
+
+7.3.8 Group ecb-layout
+----------------------
+
+This group contains settings for the screen-layout of the ECB:
+
+ -- User Option: activate-before-new-frame-created-hook
+     Normal hook run before the new ECB-frame is created if
+     `ecb-new-ecb-frame' is not nil (otherwise this hook is not evaluated).
+
+ -- User Option: advice-window-functions-signal-error
+     Signal an error if an adviced function can not do its job. If not nil
+     then an error is signaled if one of the adviced user-commands can not do
+     its job. So for example if the user tries to split the compile-window or
+     an ecb-tree-window or if one tries to switch to another buffer in one of
+     the ecb-tree-windows. For details see the documentation of each of the
+     adviced functions to get info when an error is signaled.
+
+     If this option is nil then no error is signaled but the called adviced
+     function does simply nothing.
+
+     Default is nil but it can also be useful to signal errors - so you see
+     when call a function in a situation which is not supported by this
+     function.
+
+ -- User Option: fix-window-size
+     Fix size of the ECB-windows/buffers even after frame-resizing. The fix
+     type (valid values are nil, t, width and height) can either be set on a
+     layout-basis (means a different value for each layout) or one value can
+     be set for all layouts. For the latter case there is an additional value
+     `auto' which choose autom. the senseful fix-type depending on the
+     current layout-type: For top-layouts the fix-type `height' and for all
+     other layout-types the fix-type `width'.
+
+     For a detailed description of the valid values see documentation of
+     `window-size-fixed' which is newly introduced in GNU Emacs 21 and is
+     only available there. Therefore this option takes only effect with GNU
+     Emacs >= 21. This option has no effect with XEmacs because it does not
+     support the feature `window-size-fixed'.
+
+     Note1: Manually resizing the ECB-windows via `enlarge-window',
+     `shrink-window', `mouse-drag-vertical-line' and `mouse-drag-mode-line'
+     is still possible even if the window-sizes are fixed for frame-resizing!
+
+     Note2: The description of `window-size-fixed' in the elisp-info-manual
+     is more detailed than the description offered by `C-h v'!
+
+     Note3: With Emacs < 22 there seems to be no distinction between 'width,
+     'height and t. Therefore this option takes no effect (means all
+     ecb-windows have always unfixed sizes) with Emacs < 22 if
+     `ecb-compile-window-height' is not nil.
+
+     Per default no window-size fixing has been done.
+
+ -- User Option: hide-ecb-windows-after-hook
+     Hooks run direct after the ECB windows have been hidden. Hiding was done
+     either by `ecb-toggle-ecb-windows' or `ecb-hide-ecb-windows'.
+
+     IMPORTANT: Hiding the ECB-windows is internally done by calling
+     `ecb-redraw-layout' and therefore also the hooks
+     `ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+     evaluated. The hook-sequence is analogous to that described in
+     `ecb-show-ecb-windows-after-hook'.
+
+ -- User Option: hide-ecb-windows-before-hook
+     Hook run direct before the ECB windows will be hidden. Hiding is done
+     either by `ecb-toggle-ecb-windows' or `ecb-hide-ecb-windows'. This means
+     that at runtime of this hook all the ECB-tree-windows of current layout
+     are visible.
+
+     IMPORTANT: Hiding the ECB-windows is internally done by calling
+     `ecb-redraw-layout' and therefore also the hooks
+     `ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+     evaluated. The hook-sequence is analogous to that described in
+     `ecb-show-ecb-windows-before-hook'.
+
+ -- User Option: ignore-display-buffer-function
+     Adviced `display-buffer' ignores `display-buffer-function'.  This means,
+     that the adviced version of `display-buffer' ignores the value of
+     `display-buffer-function' when called for the `ecb-frame'. If this
+     variable should not be ignored then the function of
+     `display-buffer-function' is completely responsible which window is used
+     for the buffer to display - no smart ECB-logic will help to deal best
+     with the ECB-window-layout! You can define if and when
+     `display-buffer-function' should be ignored:
+
+        - only when persistent compile window is used - i.e. if
+          `ecb-compile-window-height' is not nil
+
+        - always when ECB is active - that means ignore when ECB is active
+          otherwise not - this is the default value
+
+        - never, the adviced version of `display-buffer' always uses the
+          value of `display-buffer-function' if the value is a function.
+
+ -- User Option: ignore-pop-up-frames
+     Ignore setting of option `pop-up-frames'.  This means, that a value of
+     not nil for `pop-up-frames' is ignored:
+        * 'compile-window: only when persistent compile window is used - i.e.
+          if `ecb-compile-window-height' is not nil - this is the default
+          value.
+
+        * 'always: always when ECB is active - that means no pop-up-frames
+          when ECB is active
+
+        * `nil': pop-up-frames is fully active when set
+
+ -- User Option: ignore-special-display
+     Ignore special-display-handling. This means, that all values of
+     `special-display-function', `special-display-buffer-names' and
+     `special-display-regexps' are ignored
+
+        * only when persistent compile window is used - i.e. if
+          `ecb-compile-window-height' is not nil - this is the default value.
+
+        * always when ECB is active - that means no special-display-handling
+          of buffers when ECB is active
+
+        * never, i.e. special-dislay-handling depends on the values of the
+          options `special-display-function', `special-display-buffer-names'
+          and `special-display-regexps'.
+
+
+ -- User Option: layout-always-operate-in-edit-window
+     Adviced window functions work always in the edit-window. If we are in an
+     ECB special buffer (methods, directories, etc), and any of the adviced
+     windowing functions is called interactively, we will select first an
+     edit-window according to the value of `ecb-mouse-click-destination'.
+     This is useful if you have any functions that use such functions and you
+     don't want them to fail with an error complaining that the current
+     buffer can not be split, or something similar.
+
+     Because this may not be desirable in all situations and for all adviced
+     functions this can be enabled separately for function where it is
+     senseful. If the symbol of an adviced function is contained in the value
+     of this option, then the edit-window is first selected otherwise either
+     an error is reported or some other special reaction (depends on
+     `ecb-advice-window-functions-signal-error'); see the documentation of
+     the adviced functions for this.
+
+     Per default this is only enabled for `switch-to-buffer'.
+
+ -- User Option: layout-debug-mode
+     Write debug-information about layout-operations in the Messages-buffer.
+     Normally there should be no need to set this option to true but if there
+     are problems to display buffers in the compile-window of ECB (e.g.
+     buffers which should be displayed there aren't or the temporally
+     enlarging-mechanism does not do what you think it should do etc...) then
+     please do the following steps:
+
+       1. Set `ecb-layout-debug-mode' to not nil
+
+       2. Reproduce the wrong behavior exactly by repeating all the operations
+          which lead to the problem.
+
+       3. Now send immediately a bug report with `ecb-submit-problem-report'.
+
+       4. Set `ecb-layout-debug-mode' back to nil if you do not want further
+          debugging output in the *Messages* buffer
+
+ -- User Option: layout-name
+     Select a window layout of ECB. Value is any arbitrary string. There are
+     four different types of layouts: left, right, top and left-right, which
+     means the location of the ECB-tree-windows in the ECB-frame.  Currently
+     there are 20 predefined layouts; names see below. You can savely try out
+     any of them by changing this value and saving it only for the current
+     session. If you are sure which layout you want you can save it for
+     future sessions. To get a picture of the layout for name <name> call
+     `ecb-show-layout-help'. `ecb-layout-function-9'.
+
+     Currently available layouts:
+
+        * Left layouts: left1 left2 left3 left4 left5 left6 left7 left8 left9
+          left10 left11 left12 left13 left14 left15
+
+        * Right layouts: right1
+
+        * Top layouts: top1 top2
+
+        * Left-right layouts: leftright1 leftright2
+
+     Regardless of the settings you define here: If you have destroyed or
+     changed the ECB-screen-layout by any action you can always go back to
+     this layout with `ecb-redraw-layout'
+
+ -- User Option: layout-window-sizes
+     Specifies the sizes of the ECB windows for each layout. The easiest way
+     (and also the strongly recommended way) to change this variable is to
+     change the window sizes by dragging the window borders using the mouse
+     and then store the window sizes by calling the command
+     `ecb-store-window-sizes'. Next time the layout is redrawn the values
+     stored in this option will be used.
+
+     If `ecb-store-window-sizes' is used then the windows sizes are stored
+     per default as fractions of current frame-width and -height of the
+     ecb-frame, so the stored values will "work" for other frame sizes too.
+     But if you call `ecb-store-window-sizes' with a prefix-argument then the
+     fixed values of current width and height are stored!
+
+     If this option is set "by hand" (i.e. not by `ecb-store-window-sizes')
+     then the following is important:
+        - It is recommended to use fractions of frame-width and -height!.
+
+        - The order of the sequence of the inserted window sizes must be the
+          same as `other-window' (the not-adviced version!) would walk!
+
+ -- User Option: maximize-ecb-window-after-selection
+     If not nil maximize current tree-window after selection. When selecting
+     another not-tree-window after such an automatic maximizing all
+     tree-windows of current layout are displayed again. But a tree-window is
+     not maximized if either a node has been selected via primary- oder
+     secondarc mouse-button or the popup-menu of that tree-buffer has been
+     opened.
+
+ -- User Option: maximize-next-after-maximized-select
+     Maximizes the next logical tree-window after a maximized node-selection.
+     Selecting a node in a maximized tree-window is handled very smart by ECB:
+
+     If a tree-buffer-name is not contained in this option then selecting a
+     node in this maximized tree-buffer automatically "minimizes" that
+     tree-window (i.e. displays all windows of the current layout) so the
+     user can perform the next logical step (e.g. the next logical step after
+     selecting a directory in the directories-buffer is to select a
+     source-file - therefore the sources-buffer of current layout has to be
+     displayed - if the current layout contains one; the next logical step of
+     selecting a source-file is probably to jump to a certain tag via the
+     methods-buffer).
+
+     If a tree-buffer-name is contained in this option then selecting a node
+     in this tree-buffer automatically maximizes the next logical tree-window
+     (e.g. directories -> sources, sources/history -> methods). But if the
+     current maximized tree-buffer is also contained in the option
+     `ecb-tree-do-not-leave-window-after-select' (see also the
+     tree-buffer-command `ecb-toggle-do-not-leave-window-after-select' which
+     is bound to `C-t' in each tree-buffer) then ECB does *not* maximize the
+     next logical tree-window but point stays in the currently maximized
+     tree-buffer so for example the user can select more than one node (e.g.
+     more than one source-file from the sources-buffer.
+
+     The tree-buffer-name can either be defined as plain string or with a
+     symbol which contains the buffer-name as value. The latter one is
+     recommended for the builtin ECB-tree-buffers because then simply the
+     related option-symbol can be used (e.g.  `ecb-directories-buffer-name',
+     `ecb-sources-buffer-name' or `ecb-history-buffer-name').
+
+     In future versions this option will probably also allow to define the
+     next logical tree-buffer for a tree-buffer - currently this is
+     hard-coded as follows:
+        - directories -next-logical-> sources
+
+        - sources     -next-logical-> methods
+
+        - history     -next-logical-> methods.
+
+ -- User Option: maximize-next-after-maximized-select
+     Maximizes the next logical tree-window after a maximized node-selection.
+     Selecting a node in a maximized tree-window is handled very smart by ECB:
+
+     If this option is nil then selecting a node in a maximized directories-
+     sources- or history-tree-buffer automatically "minimizes" that
+     tree-window (i.e. displays all windows of the current layout) so the
+     user can perform the next logical step (e.g.  the next logical step
+     after selecting a directory in the directories-buffer is to select a
+     source-file - therefore the sources-buffer of current layout has to be
+     displayed - if the current layout contains one; the next logical step of
+     selecting a source-file is probably to jump to a certain tag via the
+     methods-buffer).
+
+     If this option is not nil then selecting a node in a maximized
+     directories- sources- or history-tree-buffer automatically maximizes the
+     next logical tree-window (directories -> sources, sources/history ->
+     methods). But if the current maximized tree-buffer is contained in the
+     option `ecb-tree-do-not-leave-window-after-select' (see also the
+     tree-buffer-command `ecb-toggle-do-not-leave-window-after-select' which
+     is bound to `C-t' in each tree-buffer) then ECB does *not* maximize the
+     next logical tree-window but point stays in the currently maximized
+     tree-buffer so for example the user can select more than one source-file
+     from the sources-buffer.
+
+ -- User Option: new-ecb-frame
+     Create a new frame at activation time of ECB.
+
+ -- User Option: other-window-behavior
+     The behavior of ECB concerning getting an "other window". The following
+     settings are possible:
+
+     `all':
+
+     ECB will cycle through all windows of the ECB-frame or scroll simply the
+     next window in the ECB-frame, means it behaves like the original
+     `other-window' rsp. the original `other-window-for-scrolling'.
+
+     `only-edit':
+
+     ECB will only cycle through the edit-windows of ECB or only scroll
+     another edit-window. If the selected window is not an edit-window then
+     it behaves like with value `all'.
+
+     `edit-and-compile':
+
+     Like `only-edit' plus the compile window if any. If the selected window
+     is neither an edit-window nor the compile-window then it behaves like
+     with value `all'.
+
+     `smart':
+
+     With this setting ECB tries to choose the `other-window'-destination or
+     the "other window" to scroll in a smart and intuitive way: If point is
+     in one of the edit-windows and if the edit-area is splitted then always
+     the "next" edit-window is choosen (whereas the next edit-window of the
+     last edit-window is the first edit-window)- if the edit-area is
+     unsplitted then the compile-window is used if there is one. In the
+     context of an `other-window'-call the ARG of `other-window' will be
+     taken into account.
+
+     If one of the special ecb-windows is selected then always the "next"
+     ecb-window is choosen (whereas the next ecb-window of the last
+     ecb-window is the first ecb-window). In the context of an
+     `other-window'-call the ARG of `other-window' will be taken into
+     account. If there is only one ecb-window then ECB considers also the
+     edit-windows
+
+     If the compile-window is selected then always the last edit-window which
+     had the point will be used unless `other-window' has been called with a
+     prefix-argument unequal 1.
+
+     If there is an active minibuffer:
+
+     Regardless of the allowed values above ECB handles the situation of an
+     active minibuffer during a call to `other-window' or
+     `scroll-other-window' like follows:
+
+     If the minibuffer-window is selected then ECB always chooses the window
+     `minibuffer-scroll-window' points to (when this variable is set,
+     otherwise the compile-window or the last selected edit-window is
+     choosen) when the called command is called to choose the 1. next window
+     (always true for scrolling another window or true when `other-window'
+     called without prefix-arg or with prefix-arg equal 1). Otherwise the
+     window ARG steps away is choosen (in case of `other-window').
+
+     If there is an active minibuffer but the minibuffer-window is not
+     selected then `other-window' and `scroll-other-window' behave like the
+     original version.
+
+     In addition to the allowed values above the value of this option can
+     also be a function:
+
+     A function:
+
+     This function gets seven arguments:
+       1. A canonical list of all currently visible windows of the `ecb-frame'
+
+       2. A canonical list of all currently visible edit-windows
+
+       3. A canonical list of all currently visible ecb-windows
+
+       4. The window-object of the compile-window if there is any.
+
+       5. The minibuffer-window of the ECB-frame if there is an active
+          minibuffer.
+
+       6. The result of the function `ecb-where-is-point' - see the
+          documentation of this function for details.
+
+       7. An integer which indicates how many steps away from the current
+          selected window the "other-window" is. Is nil when this function is
+          called in another context then for `other-window'.
+
+     The function has to return a window-object which is then used as "other
+     window" for the command `other-window' or for scrolling another window
+     (e.g. with `scroll-other-window'). Such a function has to handle
+     properly all situation for itself.  `ecb-get-other-window-smart' is an
+     example for such a function.
+
+ -- User Option: redraw-layout-after-hook
+     Hooks run direct before the ECB windows will be shown either by
+     `ecb-toggle-ecb-windows' or `ecb-show-ecb-windows'. This means that at
+     runtime of this hook the ECB-windows are already visible.
+
+ -- User Option: redraw-layout-before-hook
+     Hooks run direct before the ECB-layout will be redrawn by either
+     `ecb-redraw-layout'.
+
+ -- User Option: redraw-layout-quickly
+     If non-nil, we will attempt to redraw the layout quickly. Please read
+     also carefully the documentation of `ecb-redraw-layout'.
+
+ -- User Option: select-edit-window-on-redraw
+     Select the first edit window on `ecb-redraw-layout'.
+
+ -- User Option: show-ecb-windows-after-hook
+     Hooks run direct before the ECB windows will be shown either by
+     `ecb-toggle-ecb-windows' or `ecb-show-ecb-windows'. This means that at
+     runtime of this hook the ECB-windows are already visible.
+
+     IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+     `ecb-redraw-layout' and therefore also the hooks
+     `ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+     evaluated. So there is the following sequence of hooks during the
+     process of showing the hidden ECB-windows:
+       1. `ecb-show-ecb-windows-before-hook'
+
+       2. `ecb-redraw-layout-before-hook'
+
+       3. <redrawing the layout to show the hidden ECB-windows>
+
+       4. `ecb-redraw-layout-after-hook'
+
+       5. `ecb-show-ecb-windows-after-hook'
+          So be aware which code you add to which hook!
+
+ -- User Option: show-ecb-windows-before-hook
+     Hooks run direct before the ECB windows will be shown either by
+     `ecb-toggle-ecb-windows' or `ecb-show-ecb-windows'. This means that at
+     runtime of this hook the ECB-windows are still hidden.
+
+     IMPORTANT: Showing the hidden ECB-windows is internally done by calling
+     `ecb-redraw-layout' and therefore also the hooks
+     `ecb-redraw-layout-before-hook' and `ecb-redraw-layout-after-hook' are
+     evaluated. So there is the following sequence of hooks during the
+     process of showing the hidden ECB-windows:
+       1. `ecb-show-ecb-windows-before-hook'
+
+       2. `ecb-redraw-layout-before-hook'
+
+       3. <redrawing the layout to show the hidden ECB-windows>
+
+       4. `ecb-redraw-layout-after-hook'
+
+       5. `ecb-show-ecb-windows-after-hook'
+          So be aware which code you add to which hook!
+
+ -- User Option: split-edit-window-after-start
+     Sets if and how the edit window should be splitted after ECB-start.  But
+     be aware: This option determines only if and how the edit-window should
+     be splitted at start-time of ECB. There are five different values
+     allowed for this option:
+
+        - `nil': Do not split the edit-area of ECB after activation, i.e.
+          there will be only one edit-window after starting ECB.
+
+        - `horizontal': Split the edit-area in 2 edit-windows side by side.
+
+        - `vertical': Split the edit-area in 2 edit-windows, one above the
+          other.
+
+        - `before-activation': Split the edit-area as before the ECB-start,
+          i.e. the edit-area will have after start a window-layout as the
+          whole frame had before the start of ECB.
+
+        - `before-deactivation': Split the edit-area into a window-layout ECB
+          had in its edit-area direct before the ECB-deactivation. This value
+          preserves the full state between activations of ECB, i.e. the
+          visibility of the ECB-windows, the visibility of a compile-window
+          and also the full split-state of the edit-area. But this can only
+          be done if important layout-options have not been changed in the
+          meanwhile. These are the options `ecb-layout-name',
+          `ecb-compile-window-height', `ecb-compile-window-width',
+          `ecb-windows-width' and `ecb-windows-height'.
+
+     Default value is `before-deactivation'.
+
+     Some remarks to the value `before-activation': If this value has been
+     set then ECB needs three permanent adivces even when ECB is deactivated:
+     `split-window', `delete-window' and `delete-other-windows'. But these
+     advices do not change any behavior of these functions but only storing
+     in an internal ECB-variable the facts that a window has been splitted or
+     deleted. In addition to this these advices are 100% error-save, means the
+     functionality of the original functions will be performed in every(!)
+     case even if within the advice an error occurs (but normally there can
+     no errors occur in these advices because they are very simple).
+     Conclusion: If you want really all ECB-advices being disabled after
+     deactivating ECB then you have to set this option to other values then
+     `before-activation'. But setting this variable to this value is really
+     completely save.
+
+ -- User Option: toggle-layout-sequence
+     Toggle sequence for layout toggling with `ecb-toggle-layout'.  Every
+     element of this list has to be a valid layout-name i.e. either one of
+     the predefined layouts or one of the user-defined layouts.
+
+     You can add here as many layouts as you want but to use this option most
+     effective you should not add more than 2 or 3 layouts so every layout
+     can be accessed very fast by toggling with `ecb-toggle-layout'. It is
+     also senseful to add layouts which have the same principal outline, i.e.
+     all their tree-buffers are on the same side of the frame and the
+     tree-buffer-"column" (or -"row") has identical size for the layouts.
+
+     Recommended values are for example:
+
+        - ("left10" "left15"), toggles between methods and directories/history
+
+        - ("left10" "left13"), toggles between methods and directories
+
+        - ("left10" "left14"), toggles between methods and history
+
+        - ("left10" "left13" "left14"), toggles between methods, history and
+          directories
+
+     See also option `ecb-show-sources-in-directories-buffer'.
+
+     This option makes only sense if the value is a list with more than 1
+     element!
+
+ -- User Option: windows-height
+     The height of the ECB windows in lines for top-layouts. If the number is
+     less than 1.0 the width is a fraction of the frame height.
+
+ -- User Option: windows-width
+     The width of the ECB windows in columns for left- and right layouts.  If
+     the number is less than 1.0 the width is a fraction of the frame width.
+
+
+File: ecb.info,  Node: ecb-compilation,  Next: ecb-create-layout,  Prev: ecb-layout,  Up: Customizable options
+
+7.3.9 Group ecb-compilation
+---------------------------
+
+This group contains settings for the compile window of ECB:
+
+ -- User Option: compilation-buffer-names
+     Additional buffer names that should be displayed in the compile-window.
+     Buffer names can either be defined as strings or as regexps. If the
+     buffer-name of a buffer matches one of the defined string or regexp then
+     it will be displayed in the compile-window of ECB even if
+     `compilation-buffer-p' says nil for this buffer.
+
+     It is not recommended to add the eshell-buffer-names to this list
+     because ECB already handles the eshell-integration as best as possible
+     (*note Using eshell::).
+
+     See also the options `ecb-compilation-major-modes' and
+     `ecb-compilation-predicates'.
+
+ -- User Option: compilation-major-modes
+     Additional major-mode that should be displayed in the compile-window.
+     All buffers of a major-mode contained in this list are displayed in the
+     compile-window even if `compilation-buffer-p' says nil for such a buffer.
+
+     It is not recommended to add `eshell-mode' to this list because ECB
+     already handles the eshell-integration as best as possible (*note Using
+     eshell::).
+
+ -- User Option: compilation-predicates
+     Predicates when a buffer should be treated as compilation-buffer.  Every
+     element of this list has to be a function or lambda-expression which
+     gets as argument a buffer-object and which has to return not nil when
+     this buffer should be treated as compilation-buffer (even if
+     `compilation-buffer-p' says nil) and therefore be displayed in the
+     compile-window of ECB (if there is any).
+
+     In combination with the values of `ecb-compilation-buffer-names' and
+     `ecb-compilation-major-modes' ECB decides when a buffer is displayed in
+     the compile-window.
+
+     Default value is the function `comint-check-proc' which returns not nil
+     when the buffer is related to a living process.
+
+ -- User Option: compile-window-height
+     Height of the persistent compilation-window of ECB. If you want a
+     compilation window shown at the bottom of the ECB-layout then set here
+     the height of it (Default is a height of 5). If you redraw the current
+     layout with `ecb-redraw-layout' then the compilation window (if any) has
+     the height you set here. If the number is less than 1.0 the height is a
+     fraction of the frame height.
+
+     If you do not set a persistent compilation window then doing a
+     compilation or displaying temp-buffers (e.g. *Help*-buffers) splits
+     temporally the edit window vertically if the edit window is not splitted
+     already or uses another edit window temporally for compilation output if
+     the edit window is already splitted. This is the recommended value for
+     this option because this is the standard-behavior of Emacs.
+
+     Beware: If you set a persistent compilation window then ECB displays all
+     buffers for which `ecb-compilation-buffer-p' returns not nil in that
+     persistent compilation window. If a buffer which should being displayed
+     there is not displayed there then try to modify the options
+     `ecb-compilation-buffer-names', `ecb-compilation-major-modes' or
+     `ecb-compilation-predicates' (in this sequence).
+
+     See also the options `ecb-compile-window-temporally-enlarge' and
+     `ecb-enlarged-compilation-window-max-height' and also the command
+     `ecb-toggle-compile-window-height'!
+
+     ECB offers the functionality of such a persistent compile-window
+     regardless if the special ECB-windows are visible or not (see the
+     command `ecb-toggle-ecb-windows').
+
+     Regardless of the settings you define here: If you have destroyed or
+     changed the ECB-screen-layout by any action you can always go back to
+     this layout with `ecb-redraw-layout'
+
+ -- User Option: compile-window-prevent-shrink-below-height
+     Allow the compile-window to be shrunken below its height. A non nil
+     value means ECB prevents the compile-window from being shrunken below
+     the threshold of `ecb-compile-window-height' by displaying temp-buffers
+     (e.g. *Help* etc.) or after running compilations or greps. But
+     interactively it is always allowed to shrink it to every height!
+
+     If nil then ECB does nothing to prevent being shrunken below the value
+     of `ecb-compile-window-height'.
+
+     Default is t.
+
+ -- User Option: compile-window-temporally-enlarge
+     Let Emacs temporally enlarge the compile-window of the ECB-layout.  This
+     option has only an effect if `ecb-compile-window-height' is not nil!
+
+     The following values are possible:
+        - `after-display': After displaying a "compilation-buffer" (in the
+          sense of `ecb-compilation-buffer-p'!) in the compile-window of ECB.
+          For the max. height of the enlarged compile-window see the option
+          `ecb-enlarged-compilation-window-max-height'.
+
+        - `after-selection': Selecting the `ecb-compile-window' auto.
+          enlarges it and de-selecting (means leaving `ecb-compile-window')
+          auto. shrinks it. Enlarging and shrinking the `ecb-compile-window'
+          is done with `ecb-toggle-compile-window-height'. See also the
+          documentation of this function!
+
+        - `both': The combination of 'after-display and 'after-selection.
+
+        - `nil': ECB fixes always the height of the `ecb-compile-window' at
+          the value of `ecb-compile-window-height'.
+
+     To restore the ECB-layout after such a buffer-enlarge just call
+     `ecb-toggle-compile-window-height' or `ecb-redraw-layout'.
+
+ -- User Option: compile-window-width
+     Width of the compile-window.
+
+     Possible values are `frame' and `edit-window'.  With `frame' the
+     compile-window looks like:
+
+           -------------------------------------------------------
+           |              |                                      |
+           |  Directories |                                      |
+           |              |                                      |
+           |--------------|            edit-window(s)            |
+           |              |                                      |
+           |  Methods     |                                      |
+           |              |                                      |
+           -------------------------------------------------------
+           |                                                     |
+           |                    Compilation                      |
+           |                                                     |
+           -------------------------------------------------------
+
+     With `edit-window' the compile-window looks like:
+
+           -------------------------------------------------------
+           |              |                                      |
+           |  Directories |                                      |
+           |              |                                      |
+           |--------------|            edit-window(s)            |
+           |              |                                      |
+           |  Methods     |                                      |
+           |              |                                      |
+           |              |---------------------------------------
+           |              |                                      |
+           |              |            Compilation               |
+           |              |                                      |
+           -------------------------------------------------------
+
+     This option takes only effect if `ecb-compile-window-height' is not nil!
+
+ -- User Option: change-layout-preserves-compwin-state
+     Changing the layout preserves the state of the compile-window. This is
+     for example useful if the user toggles between several layouts (see
+     `ecb-toggle-layout') and wants to preserve the hidden-state of the
+     compile-window.
+
+ -- User Option: enlarged-compilation-window-max-height
+     The max height of the compile-window after enlarging it. The max height
+     of the compilation window after enlarged by
+     `ecb-toggle-compile-window-height'. The following values are allowed:
+
+     `best':
+
+     ECB fits the height of the compile-window exactly to the size of its
+     current contents but never shrinks below the value of
+     `ecb-compile-window-height' or enlarges over the half of the
+     frame-height of the ECB-frame. The values of the options
+     `compilation-window-height' and `temp-buffer-max-height' are taken into
+     account dependent of the current `major-mode' of the buffer in the
+     compile-window: If `compilation-mode' then `compilation-window-height'
+     is used otherwise `temp-buffer-max-height'.
+
+     `half':
+
+     1/2 the frame-height of the ECB-frame
+
+     Any number:
+
+     Max height in lines. If the number is less than 1.0 the height is a
+     fraction of the frame height (e.g. 0.33 results in a max-height of 1/3
+     the frame-height).
+
+ -- User Option: scroll-other-window-scrolls-compile-window
+     `scroll-other-window' scrolls always the compile-window. For all details
+     about the scroll-behavior of `scroll-other-window' see the advice
+     documentation of `other-window-for-scrolling'.
+
+
+File: ecb.info,  Node: ecb-create-layout,  Next: ecb-face-options,  Prev: ecb-compilation,  Up: Customizable options
+
+7.3.10 Group ecb-create-layout
+------------------------------
+
+This group contains settings for creating new ECB-layouts:
+
+ -- User Option: create-layout-file
+     File where all layouts created by `ecb-create-new-layout' are stored.
+
+ -- User Option: ecb-create-layout-frame-height
+     Frame height of the layout creation frame.
+
+ -- User Option: ecb-create-layout-frame-width
+     Frame width of the layout creation frame.
+
+
+File: ecb.info,  Node: ecb-face-options,  Next: ecb-faces,  Prev: ecb-create-layout,  Up: Customizable options
+
+7.3.11 Group ecb-face-options
+-----------------------------
+
+This group contains settings for all faces used in ECB:
+
+ -- User Option: directories-general-face
+     Basic face for the ECB directories buffer. This defines the basic face
+     the whole directory buffer should displayed with. If the face
+     `ecb-default-general-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-general-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: directory-face
+     Face used for highlighting current directory in the directories buffer.
+     If the face `ecb-default-highlight-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-highlight-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: directory-not-accessible-face
+     Face for not accessible dirs in the directories buffer.
+
+ -- User Option: history-bucket-node-face
+     Basic face for displaying a bucket-node in the ECB-history-buffer.  This
+     defines the basic face for the bucket-nodes used to bucketize the
+     history-entries as defined with the option `ecb-history-make-buckets'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: history-dead-buffer-face
+     Face for history entries pointing to dead buffers.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: history-face
+     Face used for highlighting current history-entry in the history buffer.
+     If the face `ecb-default-highlight-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-highlight-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: history-general-face
+     Basic face for the ECB directory buffer. This defines the basic face the
+     whole history buffer should displayed with. If the face
+     `ecb-default-general-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-general-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: history-indirect-buffer-face
+     Face for indirect buffers in the history buffer.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: method-face
+     Face used for highlighting current method, class or variable in the
+     methods buffer. If the face `ecb-default-highlight-face' is used then
+     the display of all ECB-tree-buffers can be changed by modifying only the
+     face `ecb-default-highlight-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: method-non-semantic-face
+     Face used for for displaying tags of sources not supported by semantic.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: methods-general-face
+     Basic face for the ECB methods buffer. This defines the basic face the
+     whole methods buffer should displayed with. If the face
+     `ecb-default-general-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-general-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: source-face
+     Face used for highlighting current source in the sources buffer. If the
+     face `ecb-default-highlight-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-highlight-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: source-in-directories-buffer-face
+     Face for source files in the directories buffer.
+
+ -- User Option: sources-general-face
+     Basic face for the ECB sources buffer. This defines the basic face the
+     whole sources buffer should displayed with. If the face
+     `ecb-default-general-face' is used then the display of all
+     ECB-tree-buffers can be changed by modifying only the face
+     `ecb-default-general-face'.
+
+     Changes take first effect after finishing and reactivating ECB!
+
+ -- User Option: source-read-only-face
+     Face for read-only sources.
+
+ -- User Option: tag-header-face
+     Face used for highlighting the tag header after jumping to it by
+     clicking onto a node in the methods buffer.
+
+
+File: ecb.info,  Node: ecb-faces,  Next: ecb-help,  Prev: ecb-face-options,  Up: Customizable options
+
+7.3.12 Group ecb-faces
+----------------------
+
+This group contains all faces used in ECB:
+
+`ecb-bucket-node-face:'
+     Face which can be used for displaying bucket tags in the methods buffer.
+     See also `ecb-bucket-node-display'.
+
+`ecb-default-general-face:'
+     Basic face for all ECB tree-buffers.  It's recommended to define here
+     the font-family, the font-size, the basic color etc.
+
+     In GNU Emacs 21.X all faces (even the face `ecb-default-highlight-face')
+     used in the ECB tree-buffers inherit from this face. Therefore the
+     default attributes like font etc. of a face used in a tree-buffer can be
+     very easily changed with face `ecb-default-general-face'.
+
+     With XEmacs there is no inheritance-feature but the options
+     `ecb-directories-general-face', `ecb-sources-general-face',
+     `ecb-methods-general-face' and `ecb-history-general-face' offer the
+     choice to use the face `ecb-default-general-face' so also with XEmacs
+     the basic face-settings can be easily changed just by customizing the
+     face `ecb-default-general-face'!
+
+`ecb-default-highlight-face:'
+     Define basic face for highlighting the selected node in an ECB
+     tree-buffer.
+
+     In GNU Emacs 21.X all highlighting faces in the ECB tree-buffers inherit
+     from this face. Therefore the default attributes like font etc. of a
+     face used in a tree-buffer for highlighting the current tag can be very
+     easily changed with face `ecb-default-highlight-face'.
+
+     With XEmacs there is no inheritance-feature but the options
+     `ecb-directory-face', `ecb-source-face', `ecb-method-face' and
+     `ecb-history-face' offer the choice to use the face
+     `ecb-default-highlight-face' so also with XEmacs the basic face-settings
+     can be easily changed just by customizing the face
+     `ecb-default-highlight-face'!
+
+`ecb-directories-general-face:'
+     Basic face for the ECB directories buffer. It“s recommended to define
+     here the font-family, the font-size, the basic color etc.
+
+`ecb-directory-face:'
+     Define face used for highlighting current directory in the directories
+     buffer.
+
+`ecb-directory-not-accessible-face'
+     Define a face for not accessible dirs in the directories buffer.
+
+`ecb-history-bucket-node-face:'
+     Face used for displaying a bucket-node in the ECB-history-buffer.
+
+     In GNU Emacs 21.X this face inherits from the face
+     `ecb-bucket-node-face'. With XEmacs and GNU Emacs 20.X there is no
+     inheritance-feature so if the buckets in the ECB-history-buffer should be
+     displayed with the same basic attributes set by `ecb-bucket-node-face'
+     this set of basic attributes have to be set in
+     `ecb-history-bucket-node-face' too!
+
+`ecb-history-dead-buffer-face:'
+     Face used for history entries pointing to dead buffers.
+
+     In GNU Emacs 21.X this face inherits from the face
+     `ecb-history-general-face'. With XEmacs and GNU Emacs 20.X there is no
+     inheritance-feature so if the buckets in the ECB-history-buffer should be
+     displayed with the same basic attributes set by
+     `ecb-history-general-face' this set of basic attributes have to be set in
+     `ecb-history-dead-buffer-face' too!
+
+`ecb-history-face:'
+     Define face used for highlighting current history-entry in the history
+     buffer.
+
+`ecb-history-general-face:'
+     Basic face for the ECB history buffer. It“s recommended to define here
+     the font-family, the font-size, the basic color etc.
+
+`ecb-history-indirect-buffer-face:'
+     Face used for history entries pointing to dead buffers.
+
+     In GNU Emacs 21.X this face inherits from the face
+     `ecb-history-general-face'. With XEmacs and GNU Emacs 20.X there is no
+     inheritance-feature so if the buckets in the ECB-history-buffer should be
+     displayed with the same basic attributes set by
+     `ecb-history-general-face' this set of basic attributes have to be set in
+     `ecb-history-indirect-buffer-face' too!
+
+`ecb-method-face:'
+     Define face used for highlighting current method, class or variable in
+     the methods buffer.
+
+`ecb-methods-general-face:'
+     Basic face for the ECB methods buffer. It“s recommended to define here
+     the font-family, the font-size, the basic color etc.
+
+`ecb-method-non-semantic-face:'
+     Define face used for displaying tags of sources not supported by
+     semantic.
+
+`ecb-mode-line-data-face'
+     Define face for the data in the mode-line. See `ecb-mode-line-data'.
+
+`ecb-mode-line-prefix-face'
+     Define face for the prefix in the mode-line. See
+     `ecb-mode-line-prefixes'.
+
+`ecb-source-face:'
+     Define face used for highlighting current source in the sources buffer.
+
+`ecb-source-in-directories-buffer-face:'
+     Define a face for displaying sources in the directories buffer.
+
+`ecb-sources-general-face:'
+     Basic face for the ECB sources buffer. It“s recommended to define here
+     the font-family, the font-size, the basic color etc.
+
+`ecb-source-read-only-face'
+     Define a face for read-only sources
+
+`ecb-tag-header-face:'
+     Define face used for highlighting the tag header after jumping to it by
+     clicking onto a node in the methods buffer.
+
+`ecb-tree-guide-line-face:'
+     Define face for the guide-lines in the tree-buffers. See the option
+     `ecb-tree-buffer-style' for a explanation of guide-lines.
+
+`ecb-type-tag-class-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-enum-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-group-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-interface-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-struct-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-typedef-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-type-tag-union-face:'
+     Define face used with option `ecb-type-tag-display'.
+
+`ecb-mode-line-win-nr-face'
+     Define face for the window-number in the mode-line. See
+     `ecb-mode-line-display-window-number'.
+
+
+Just call `customize-face <face-name>' to customize these faces for your
+personal taste. Or customize the related option in the group *Note
+ecb-face-options::.
+
+
+File: ecb.info,  Node: ecb-help,  Next: ecb-eshell,  Prev: ecb-faces,  Up: Customizable options
+
+7.3.13 Group ecb-help
+---------------------
+
+This group contains settings for the ECB online help:
+
+ -- User Option: help-html-path
+     Path where the ECB online help in HTML format resides. This must be the
+     location of the `ecb.html' which comes with the ECB distribution. If is
+     installed by unpacking the archive available on the ECB website then
+     this is the subdir `ecb-help-html-subdir' of the installation directory
+     of ECB. If it is installed as XEmacs-package (e.g. via the package
+     manager of XEmacs) then this is probably either the directory
+     "../../html/" or "../../etc/ecb/html/" (both relative to the Elisp
+     directory of ECB).
+
+     The path can either be an absolute path or a path relative to the
+     directory where the Elisp files of ECB are.
+
+     Normally there should be no need to change this option!
+
+ -- User Option: help-info-path
+     Path where the ECB online help in info format resides. This must be the
+     location of the `ecb.info' which comes with the ECB distribution. If is
+     installed by unpacking the archive available on the ECB website then
+     this is the subdir `ecb-help-info-subdir' of the installation directory
+     of ECB. If it is installed as XEmacs-package (e.g. via the package
+     manager of XEmacs) then this is probably the directory "../../info/"
+     (relative to the Elisp directory of ECB).
+
+     The path can either be an absolute path or a path relative to the
+     directory where the Elisp files of ECB are.
+
+     Normally there should be no need to change this option!
+
+ -- User Option: show-help-format
+     The format `ecb-show-help' shows its online help. Allowed values are
+     'info (for the Info format) and 'html (for HTML format). If the value is
+     'html then `browse-url-browser-function' says which browser is used.
+
+     Note: If you got ECB as a standard XEmacs-package maybe the
+     HTML-online-documentation is not included.
+
+
+File: ecb.info,  Node: ecb-eshell,  Next: ecb-speedbar,  Prev: ecb-help,  Up: Customizable options
+
+7.3.14 Group ecb-eshell
+-----------------------
+
+This group contains settings for eshell integration within the ECB:
+
+ -- User Option: eshell-auto-activate
+     Startup the eshell and display it in the compile-window. If current
+     layout does not display a compile-window (see
+     `ecb-compile-window-height') then nothing is done.
+
+ -- User Option: eshell-buffer-sync
+     Synchronize eshell with the default-directory of current source-buffer.
+
+     This option takes only effect if a permanant compile-window is used in
+     the current layout.
+
+     If 'always then the synchronization takes place always a buffer changes
+     in the edit window and if after this the default-directory of the new
+     edit-buffer is different from the default-directory of the current
+     eshell-buffer. If value is nil then never a synchronization will take
+     place. If a list of major-modes then only if the `major-mode' of the new
+     buffer belongs NOT to this list.
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync'.
+
+ -- User Option: eshell-buffer-sync-delay
+     Time Emacs must be idle before the eshell-buffer of ECB is synchronized.
+     Synchronizing is done with the current source displayed in the edit
+     window. If nil then there is no delay, means synchronization takes place
+     immediately. A small value of about 0.25 seconds saves CPU resources and
+     you get even though almost the same effect as if you set no delay.
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync-delay'.
+
+ -- User Option: eshell-enlarge-when-eshell
+     Enlarge the compile-window if it is selected by `eshell'. This takes
+     only effect if the command `eshell' is called!
+
+ -- User Option: eshell-fit-window-to-command-output
+     Fit the compile-window after an eshell-command to the output. This is
+     done by the function `ecb-eshell-fit-window-to-output' which is added to
+     `eshell-post-command-hook' ie. which is running autom.  after each
+     eshell-command.
+
+
+File: ecb.info,  Node: ecb-speedbar,  Next: ecb-non-semantic,  Prev: ecb-eshell,  Up: Customizable options
+
+7.3.15 Group ecb-speedbar
+-------------------------
+
+ -- User Option: speedbar-before-activate-hook
+     Hook running directly before ECB activates the integrated speedbar.
+
+     For example this hook can be used to change the expansion-mode of the
+     integrated speedbar via `speedbar-change-initial-expansion-list'.
+     Example: (speedbar-change-initial-expansion-list "buffers").
+
+ -- User Option: speedbar-buffer-sync
+     Synchronize the speedbar-buffer of ECB automatically with current edit
+     buffer.
+
+     If 'always then the synchronization takes place always a buffer changes
+     in the edit window, if nil then never. If a list of major-modes then
+     only if the `major-mode' of the new buffer belongs NOT to this list.
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync'.
+
+     IMPORTANT NOTE: Every time the synchronization is done the hook
+     `ecb-speedbar-buffer-sync-hook' is evaluated.
+
+ -- User Option: speedbar-buffer-sync-delay
+     Time Emacs must be idle before the speedbar-buffer of ECB is
+     synchronized.  Synchronizing is done with the current source displayed
+     in the edit window. If nil then there is no delay, means synchronization
+     takes place immediately. A small value of about 0.25 seconds saves CPU
+     resources and you get even though almost the same effect as if you set
+     no delay.
+
+     If the special value 'basic is set then ECB uses the setting of the
+     option `ecb-basic-buffer-sync-delay'.
+
+ -- User Option: speedbar-buffer-sync-hook
+     ook run at the end of `ecb-speedbar-buffer-sync'.  See documentation of
+     `ecb-speedbar-buffer-sync' for conditions when synchronization takes
+     place and so in turn these hooks are evaluated.
+
+     Preconditions for such a hook:
+
+        * Current buffer is the buffer of the currently selected edit-window.
+
+        * The speedbar-buffer is displayed in a visible window of the
+          ecb-frame (so no check for visibilty of the speedbar-buffer in the
+          ecb-frame is necessary in a hook function)
+
+     Postcondition for such a hook: Point must stay in the same edit-window
+     as before evaluating the hook.
+
+     Important note: If the option `ecb-speedbar-buffer-sync' is not nil the
+     function `ecb-speedbar-buffer-sync' is running either every time Emacs
+     is idle or even after every command (see
+     `ecb-speedbar-buffer-sync-delay'). So if the speedbar-buffer is
+     displayed in a window of the ecb-frame (see preconditions above) these
+     hooks can be really called very often! Therefore each function of this
+     hook should/must check in an efficient way at beginning if its task have
+     to be really performed and then do them only if really necessary!
+     Otherwise performance of Emacs could slow down dramatically!
+
+
+File: ecb.info,  Node: ecb-non-semantic,  Next: ecb-winman,  Prev: ecb-speedbar,  Up: Customizable options
+
+7.3.16 Group ecb-non-semantic
+-----------------------------
+
+This group contains settings for parsing and displaying non-semantic files:
+
+ -- User Option: auto-save-before-etags-methods-rebuild
+     Automatic saving of current buffer before rebuilding its methods.
+
+     This option is only relevant for sources which are supported and parsed
+     by etags (see `ecb-process-non-semantic-files'). Because etags is an
+     external tool a source-buffer can only be reparsed if the buffer is
+     saved to disk. So the command `ecb-rebuild-methods-buffer' checks for
+     sources which are not supported by semantic or imenu if either this
+     option is t or if the major-mode of the source-buffer is contained in
+     this list: In both cases ECB saves the current source-buffer before it
+     re-runs etags for reparsing the source. If nil or if the major-mode is
+     not contained then no automatic saving will be done!
+
+     For all source supported by semantic or by imenu this option takes no
+     effect.
+
+ -- User Option: non-semantic-exclude-modes
+     Exclude modes from parsing with imenu or etags. Per default, ECB tries
+     to parse all file-types not supported by semantic with imenu or etags or
+     some other method (for details see the option
+     `ecb-non-semantic-parsing-function'). If a file-type can not be parsed
+     by semantic, imenu or etags than this simply results in an empty
+     method-buffer for this file. But nevertheless you will get a message
+     "Sorry, no support for a file of that extension" which comes from the
+     speedbar-library and can not switched off. Therefore if a `major-mode'
+     is known as not parse-able by semantic, imenu or etags it can be added
+     to this option and then it will be excluded from being tried to parsed.
+
+ -- User Option: non-semantic-methods-initial-expand
+     Initially expand all tags for not by semantic supported sources.  This
+     option can be customized on a major-mode basis, i.e. if a `major-mode'
+     is contained in this option then all tags for this modes will be
+     initially expanded - otherwise not.
+
+ -- User Option: non-semantic-parsing-function
+     Define mode-dependent parsing functions for non-semantic files. This is
+     an alist where the car is a major-mode symbol and the cdr is a
+     function-symbol of a function which should be used for parsing a
+     non-semantic buffer, i.h. a buffer for which no semantic grammar exists.
+     Such a function gets one argument - the filename of current buffer - and
+     has to generate and return a tag/tag list which is understandable by
+     `speedbar-insert-generic-list'. speedbar has already included two
+     functions `speedbar-fetch-dynamic-imenu' and
+     `speedbar-fetch-dynamic-etags' which can be used for parsing buffers
+     with imenu rsp. etags.
+
+     This option takes only effect if `ecb-process-non-semantic-files' is not
+     nil: Then ECB checks for non-semantic buffers if current `major-mode' is
+     contained in this option and if yes, then the specified parsing function
+     is called; if not then the cars of the elements of
+     `speedbar-dynamic-tags-function-list' are called in that sequence they
+     are listed in this variable. See option
+     `speedbar-dynamic-tags-function-list' for further details.
+
+     In most cases imenu-parsing is preferable over etags-parsing because
+     imenu operates on Emacs-buffers and needs no external tool and therefore
+     parsing works also if current contents of a buffer are not saved to
+     disk. But maybe sometimes etags may return better parsing results
+
+     IMPORTANT: if imenu-parsing should be used then the option
+     `speedbar-use-imenu-flag' must be set to not nil!
+
+ -- User Option: process-non-semantic-files
+     Display content of non-semantic-files in the ECB-methods-buffer. See
+     also `ecb-non-semantic-parsing-function'.
+
+ -- User Option: rebuild-non-semantic-methods-before-hook
+     Hook running at beginning of the function
+     `ecb-rebuild-methods-buffer-for-non-semantic'. This function is always
+     called by the command `ecb-rebuild-methods-buffer' for not semantic
+     supported source-types.
+
+     Every function of this hook gets one argument: The complete filename of
+     the current source-buffer in the edit-window. The Method-buffer is only
+     rebuild by `ecb-rebuild-methods-buffer-for-non-semantic' if either the
+     hook contains no function (the default) or if no function of this hook
+     returns nil! See `run-hook-with-args-until-failure' for description how
+     these function are processed.
+
+
+File: ecb.info,  Node: ecb-winman,  Next: ecb-mode-line,  Prev: ecb-non-semantic,  Up: Customizable options
+
+7.3.17 Group ecb-winman
+-----------------------
+
+This group contains settings for supporting several window-managers:
+
+ -- User Option: winman-escreen-number
+     Number of the escreen which is reserved for ECB. If you go to the
+     escreen with this number you go always to the escreen with activated
+     ECB. All other escreen-numbers are escreens with deactivated ECB!
+
+ -- User Option: winman-winring-name
+     Name of the winring-window-configuration reserved for ECB. If you go to
+     the window-configuration with this name you go always to the
+     window-configuration with activated ECB. All other window-configuration
+     are configurations with deactivated ECB!
+
+
+File: ecb.info,  Node: ecb-mode-line,  Next: ecb-version-control,  Prev: ecb-winman,  Up: Customizable options
+
+7.3.18 Group ecb-mode-line
+--------------------------
+
+This group contains settings for the modelines of the ECB-tree-buffers:
+
+ -- User Option: mode-line-data
+     Data shown in the modelines of the special ECB-buffers. Everey element
+     of this list is a cons-cell where the car is used to define a
+     buffer-name and the cdr to define the modeline-data for that buffer.
+     For details about how to defining a buffer-name see
+     `ecb-mode-line-prefixes' - its completely the same.
+
+     The cdr is the data for ths modeline and can either be the symbol
+     `sel-dir' or `sel-source' whereas the former one displays the current
+     selected directory as modeline-data and the latter one the current
+     selected source-file (without path).
+
+     In addition to these two predefined values for every special ECB-buffer
+     a plain string (which is displayed) or a function can be specified which
+     gets three args (name of the buffer, current selected directory and
+     current selected source-file) and must return a string which will be
+     displayed in the modeline (or nil if no data should be displayed). Such
+     a function can add the text-property `help-echo' to the result-string.
+     Then this help-string will be displayed when the user moves the mouse
+     over this section of the modeline.
+
+     If a special ECB-buffer should not display special data in its modeline
+     then this buffer-name should either not being added to this option or
+     added with "No data" (= nil as cdr).
+
+     The whole modeline of the special ECB-buffer consists of the prefix of
+     `ecb-mode-line-prefixes' and the data of `ecb-mode-line-data' -
+     eventually prepended by the window-number, see
+     `ecb-mode-line-display-window-number'.
+
+ -- User Option: mode-line-data-face
+     Face used for the data in the mode-line. See `ecb-mode-line-data'. For
+     XEmacs the face should inherit from the face `modeline' (see
+     `set-face-parent')!
+
+ -- User Option: mode-line-display-window-number
+     Display in the modeline of every special ECB-window the window-number.
+     The left-top-most window in a frame has the window-number 0 and all
+     other windows are numbered with increasing numbers in the sequence,
+     functions like `other-window' or `next-window' would walk through the
+     frame.
+
+     This can be used to jump to windows by number with commands like:
+
+          (defun my-switch-to-window-number (number)
+            ``Switch to the nth window''
+            (interactive ``P'')
+            (if (integerp number)
+                (select-window (nth number (window-list)))))
+
+     Currently this feature is only available for GNU Emacs 21.X, because
+     neither GNU Emacs < 21 nor XEmacs can evaluate dynamically forms in the
+     mode-line.
+
+ -- User Option: mode-line-prefixes
+     Prefixes shown in the modelines of the special ECB-buffers. The
+     displayed prefix then looks like: "[ <PREFIX>[: ]]", means if a prefix
+     is defined for an special ECB-buffer then a single space is prepended
+     and if there is additional text to display (e.g. the current directory
+     in the sources buffer, see `ecb-mode-line-data') then also the string ":
+     " is appended.
+
+     Everey element of this list is a cons-cell where the car is used to
+     define a buffer-name and the cdr to define the modeline-prefix for that
+     buffer.
+
+     The buffer-name can either be defined as plain string or with a symbol
+     which contains the buffer-name as value. The latter one is recommended
+     to define a prefix for one of the builtin ECB-tree-buffers because then
+     simply the related option-symbol can be used. To add a prefix for the
+     builtin directories tree-buffer just set the symbol
+     `ecb-directories-buffer-name' as car.
+
+     The cdr is the prefix for a buffer and can either be a string which used
+     as it is or a function-symbol which is called with three argument (the
+     buffer-name, the current selected directory and the current selected
+     source-file) and must return either nil (for no prefix) or a string
+     which is then used a prefix. Such a function can add the text-property
+     `help-echo' to the result-string. Then this help-string will be
+     displayed when the user moves the mouse over this section of the
+     modeline.
+
+     If a special ECB-buffer should not have a prefix in its modeline then
+     this buffer-name should either not being added to this option or added
+     with "No prefix" (= nil as cdr).
+
+ -- User Option: mode-line-prefix-face
+     Face used for the prefix in the mode-line. See `ecb-mode-line-prefixes'.
+     For XEmacs the face should inherit from the face `modeline' (see
+     `set-face-parent')!
+
+ -- User Option: mode-line-win-nr-face
+     Face used for the window-number in the mode-line. See
+     `ecb-mode-line-display-window-number'. For XEmacs the face should
+     inherit from the face `modeline' (see `set-face-parent')!
+
+
+File: ecb.info,  Node: ecb-version-control,  Prev: ecb-mode-line,  Up: Customizable options
+
+7.3.19 Group ecb-version-control
+--------------------------------
+
+This group contains settings for the version-control-support of ECB:
+
+ -- User Option: vc-directory-exclude-regexps
+     Which directories should be excluded from VC-state-check. If a directory
+     matches any of the regexps of this option the VC-state of its sources
+     will not be checked - This option takes only effect if
+     `ecb-vc-enable-support' is not nil.
+
+ -- User Option: vc-enable-support
+     Enable support for version-control (VC) systems. If on then in the
+     directories-buffer (if the value of the option
+     `ecb-show-sources-in-directories-buffer' is on for current layout), the
+     sources-buffer and the history-buffer all file-items are displayed with
+     an appropriate icon in front of the item-name to indicate the VC-state
+     of this item. If off then no version-control-state checking is done.
+
+     Because this check can be take some time if files are managed by a not
+     local Version-control-server ECB performs this check stealthy (see
+     `ecb-stealthy-tasks-delay') so normally there should no
+     performance-decrease or additional waiting-time for the user. But to get
+     sure this option offers three choices: `t', `unless-remote' and `nil'.
+     See the option `ecb-prescan-directories-for-emptyness' for an
+     explanation for these three choices.
+
+     The option `ecb-vc-directory-exclude-regexps' offers are more fine
+     granularity to exclude the sources of certain directories from the
+     VC-state-check.
+
+     See `ecb-vc-supported-backends' and `ecb-vc-state-mapping' how to
+     customize the VC-support itself.
+
+ -- User Option: vc-state-mapping
+     Mapping between VC-states from the backends and ECB-known VC-states.
+     ECB understands the following state-values:
+
+    `up-to-date'
+          The working file is unmodified with respect to the latest version on
+          the current branch, and not locked.
+
+    `edited'
+          The working file has been edited by the user. If locking is used for
+          the file, this state means that the current version is locked by the
+          calling user.
+
+    `needs-patch'
+          The file has not been edited by the user, but there is a more recent
+          version on the current branch stored in the master file.
+
+    `needs-merge'
+          The file has been edited by the user, and there is also a more
+          recent version on the current branch stored in the master file.
+          This state can only occur if locking is not used for the file.
+
+    `added'
+          The working file has already been added/registered to the VC-system
+          but not yet commited.
+
+    `unlocked-changes'
+          The current version of the working file is not locked, but the
+          working file has been changed with respect to that version. This
+          state can only occur for files with locking; it represents an
+          erroneous condition that should be resolved by the user.
+
+    `ignored'
+          The version-control-system ignores this file (e.g. because included
+          in a .cvsignore-file in case of CVS).
+
+    `unknown'
+          The state of the file can not be retrieved; probably the file is not
+          under a version-control-system.
+
+
+     All state-values a check-vc-state-function of
+     `ecb-vc-supported-backends' can return must have a mapping to one of the
+     ECB-state-values listed above. If for a certain backend-VC-state no
+     mapping can be found then per default 'edited is assumed!
+
+     The default value of this option maps already the possible returned
+     state-values of `vc-state' and `vc-recompute-state' (both GNU Emacs) and
+     `vc-cvs-status' (Xemacs) to the ECB-VC-state-values.
+
+ -- User Option: vc-supported-backends
+     Define how to to identify the VC-backend and how to check the state.
+     The value of this option is a list containing cons-cells where the car
+     is a function which is called to identify the VC-backend for a DIRECTORY
+     and the cdr is a function which is called to check the VC-state of the
+     FILEs contained in DIRECTORY.
+
+     Identify-backend-function: It gets a full directory-name as argument -
+     always without ending slash (rsp. backslash for native Windows-XEmacs) -
+     and has to return a unique symbol for the VC-backend which manages that
+     directory (e.g.  'CVS for the CVS-system or 'RCS for the RCS-system) or
+     nil if the file is not managed by a version-control-system.
+
+     Check-vc-state-function: It gets a full filename (ie. incl. the complete
+     directory-part) and has to return a symbol which indicates the VC-state
+     of that file. The possible returned values of such a
+     check-vc-state-function have to be mapped with `ecb-vc-state-mapping' to
+     the allowed ECB-VC-state values.
+
+     ECB runs for a certain DIRECTORY all identify-backend-functions in that
+     order they are listed in this option. For the first which returns a
+     value unequal nil the associated check-state-function is used to
+     retrieve the VC-state of all sourcefiles in that DIRECTORY.
+
+     There is no need for the identify-backend-function or the
+     check-vc-state-function to cache any state because ECB automatically
+     caches internally all necessary informations for directories and files
+     for best possible performance.
+
+     To prepend ECB from checking the VC-state for any file set
+     `ecb-vc-enable-support' to nil.
+
+     Default value: Support for CVS, RCS, SCCS, Subversion, Git and Monotone.
+     To identify the VC-backend the functions `ecb-vc-managed-by-CVS',
+     `ecb-vc-managed-by-RCS' rsp.  `ecb-vc-managed-by-SCCS' rsp.
+     `ecb-vc-managed-by-SVN' rsp.  `ecb-vc-managed-by-GIT' rsp.
+     `ecb-vc-managed-by-MTN'are used.
+
+     For all six backends the function `ecb-vc-state' of the VC-package is
+     used by default (which uses a heuristic and therefore faster but less
+     accurate approach), but there is also `ecb-vc-recompute-state' available
+     which is an alias for `vc-recompute-state' (which returns accurate
+     state-values by calling the backend which can be slow especialy for
+     remote root-repositories!)
+
+     Example: If `ecb-vc-recompute-state' (to get real state-values not only
+     heuristic ones) should be used to check the state for CVS-managed files
+     and `ecb-vc-state' for all other backends then an element
+     (ecb-vc-dir-managed-by-CVS . ecb-vc-recompute-state) should be added at
+     the beginning of this option.
+
+
+File: ecb.info,  Node: Submitting problem report,  Next: Upgrading,  Prev: Customizing,  Up: Top
+
+8 Submitting a problem report
+*****************************
+
+If you run into problems with ECB you should first take a look into
+
+   - *Note FAQ:: or
+
+   - *Note Conflicts and bugs:: or
+
+   - *Note Common use-cases:: or
+
+   - the appropriate section of this online-manual.
+
+If your problem(s) still remain you can/should send a problem report to the
+ECB mailing list <ecb-list@lists.sourceforge.net>. ECB offers you a command
+which does all necessary for you to send a problem report. Just call
+`ecb-submit-problem-report'! Please read the documentation of this command,
+see *Note Interactive ECB commands::.
+
+*IMPORTANT*: Cause of extra appearance of SPAM in the mailing-lists,
+SourceForge has changed its policy: Now it is only possible to post to the
+mailing-list for users who have subscribed this mailing-list. So please be
+aware you will not be able to send comments, bug reports and improvement
+suggestions before you have subscribed the ECB-mailing-list. See the section
+"Mailing-list" at the ECB-website at `http://ecb.sourceforge.net' how to do
+this.
+
+If you think there are problems concerning parsing-results for certain
+sources supported by semantic then you should call
+`ecb-dump-semantic-toplevel' for the problematic source-buffer *BEFORE* you
+call `ecb-submit-problem-report' because this "dump"-command generates for
+the current-buffer a new buffer with name "*ecb-tag-dump*" which contains all
+semantic-tags for this source. The contents of this "*ecb-tag-dump*" will
+then autom. be added to the problem-report generated by
+`ecb-submit-problem-report'!
+
+This command creates a problem-report buffer for you. After that you get a
+menu "Mail" (dependent on the mail-package used, the menu can have a
+different name) with commands to send the problem report. But for this the
+variable `mail-user-agent' must be configured right for your system. If you
+can“t get working this mechanism you can simply copy the whole problem-report
+buffer after filling it out and sending it with your standard mail-client to
+<ecb-list@lists.sourceforge.net>!
+
+Please read also the documentation of the option `ecb-debug-mode' and switch
+on the debug mode of ECB (also available in the Help-menu of ECB!) before
+submitting a problem-report!
+
+
+File: ecb.info,  Node: Upgrading,  Next: Common use-cases,  Prev: Submitting problem report,  Up: Top
+
+9 Upgrading and downloading packages
+************************************
+
+This chapter describes all aspects of upgrading to a newer version of ECB.
+
+The first section describes how to download and install a new package from
+the web, where "package" means either ECB itself or the required library CEDET
+
+After installing a new ECB-version ECB checks if the values of the customized
+ECB-options are still compatible. If not ECB does some smart things. This is
+the topic of the second section.
+
+* Menu:
+
+* Downloading new versions::    How to download newer versions of packages
+* Auto. option-upgrading::      ECB can auto. upgrade your options
+
+
+File: ecb.info,  Node: Downloading new versions,  Next: Auto. option-upgrading,  Prev: Upgrading,  Up: Upgrading
+
+9.1 Downloading new versions of ECB and/or CEDET
+================================================
+
+*Please note*: THE PACKAGE-DOWNLOAD-FEATURE OF ECB IS COMPLETELY DEACTIVATED
+SINCE VERSION 2.33! Please got to the website of ECB and download and install
+"by hand":
+
+  1. Download ECB
+
+     Go to `http://ecb.sourceforge.net' and download the latest release (or
+     if you are brave and tough the latest CVS-snapshot) from the download
+     section.
+
+     Save the archive (either *.tar.gz or *.zip) in a suitable location of
+     your disk.
+
+  2. Extract the downloaded ECB-archive
+
+     Extract the archive with a suitable extraction-tool. The archive will
+     extract into a new directory `ecb-<version>' whereas <version> is either
+     the version number of the downloaded release or "latest" in case of the
+     CVS-snapshot. (example for a release: The archive extracts into a new
+     subdirectory `ecb-2.33'.
+
+     The newly created subdirectory contains all files of ECB in the needed
+     subdirectory structure.
+
+     *Note*: Do not change the subdirectory structure of the extracted
+     archive - this will prevent ECB from working correctly!
+
+  3. Install and setup ECB
+
+     See *Note Installation::.
+
+  4. Start ECB
+
+     ECB will perform some requirements checks, especially for CEDET.
+     *Remark*: By setting the option `ecb-version-check' to `nil' you can
+     prevent ECB from checking correct versions of CEDET but it's strongly
+     recommended not to do this!
+
+  5. (Optional) Download and install a newer version of CEDET
+
+     If the version-check in (4) fails then you have to install a newer
+     version of CEDET which fulfill the version-number ECB reports to you
+     after its version check.
+
+     See the instruction of CEDET how to do this. You will find CEDET at
+     `http://cedet.sourceforge.net'
+
+     For setting up CEDET see *Note Setting up CEDET/semantic::.
+
+     If you have installed a new CEDET-version you *MUST* re-byte-compile ECB
+     unless you run ECB not byte-compiled!
+
+
+
+File: ecb.info,  Node: Auto. option-upgrading,  Prev: Downloading new versions,  Up: Upgrading
+
+9.2 Automatic upgrading of options
+==================================
+
+* Menu:
+
+* User interface::              Options and commands you should know
+* Background information::      Maybe some interesting informations
+
+
+File: ecb.info,  Node: User interface,  Next: Background information,  Prev: Auto. option-upgrading,  Up: Auto. option-upgrading
+
+9.2.1 User interface for option-upgrading
+-----------------------------------------
+
+There are two interactive commands (*note Interactive ECB commands::):
+
+   - `ecb-upgrade-options': Does all necessary beginning with a
+     incompatibility-check for all options, upgrading/resetting incompatible
+     options and ending with the display of all upgraded or reset options.
+
+   - `ecb-display-upgraded-options': Displays an information-buffer which
+     options have been upgraded or reset. Offers two buttons where the user
+     can decide if the upgraded options should also being saved by ECB for
+     future settings or if the buffer should be killed.
+
+If the option `ecb-auto-compatibility-check' has a non-nil value (which is
+the default) then ECB does all this stuff automatically at startup. This is
+very recommended!
+
+If you are interested in some background information, read *Note Background
+information::!
+
+
+File: ecb.info,  Node: Background information,  Prev: User interface,  Up: Auto. option-upgrading
+
+9.2.2 Background information
+----------------------------
+
+Big packages like ECB will be enhanced and developed continuously so
+sometimes a new version must be released. Such packages offer in general a
+lot of customizable options so probably some of these options change the type
+or are renamed because the old type and/or name of the option makes no sense
+in the new release.
+
+Especially options which have changed the type of their value are now a
+problem for the user which want to upgrade to the latest ECB-version: If the
+user has saved a certain value for option X in its file `.emacs' but the type
+of this saved value doesn't match the new defined type in the defcustom-form
+after an ECB-upgrade then there can occur serious problems like ECB can not
+be started anymore or even Emacs can not be started without errors.
+
+Until now there was only one way to fix these problems: The user must
+manually edit his file `.emacs' and remove all entries for options which have
+now another type. After this and after restarting Emacs the new
+default-values of the type-changed options in the new ECB-release are active
+and the user can go on using Emacs and ECB. But this approach to fix the
+incompatible-option-problem has two serious drawbacks:
+
+  1. The user must manually edit the customize-section in his file `.emacs'.
+     This should normally not be done and if then only by old-handed
+     Emacs-users.
+
+  2. The customized value of the option X in the old-release (with the old
+     type) is lost because after removing the related entry from the file
+     `.emacs' the new default-value is active, so the user must re-customize
+     the option X.
+
+OK, this is one half of the option-upgrade-problem but a new ECB-release can
+also rename a option from name X to name Y because the new name Y makes much
+more sense and/or is more mnemonic. If only the name has changed but not the
+type this is not a serious problem like above but also annoying because the
+customized value of the old-option X takes no effect in the new release but
+instead the default-value of the new-option Y is now active.  But
+nevertheless this problem has the drawback number 2 (see above).
+
+The last category of upgrade-problems is a renamed option which has also
+changed its type.
+
+ECB has a solution for all these problems:
+
+   * It checks all customized values of all ECB-options if they are still
+     type-compatible. If not then it tries to upgrade the old-value to the
+     new value-type and if this is not possible then it resets the option to
+     the new default value and offers then to store it via customize in the
+     .emacs-file (or in any file which is used for customized options).  But
+     ECB does not touch any customization-file without asking the user!
+
+   * It offers a special constant `ecb-upgradable-option-alist' which allows
+     the ECB-maintainers to define special transformings for renamed options
+     so even the value of an old-option X can be savely transformed to the
+     new-option Y and the old setting is not lost.
+
+All these checks and transformings are done at beginning of activating ECB -
+if the option `ecb-auto-compatibility-check' is not nil. If ECB has
+recognized incompatible or renamed options it does its upgrading/reseting-job
+so all ECB-options have correct types so ECB can start correct. After ECB is
+started it displays a list of all upgraded or reseted option with their old
+and new values.
+
+
+File: ecb.info,  Node: Common use-cases,  Next: Elisp programming,  Prev: Upgrading,  Up: Top
+
+10 Handling of common use-cases
+*******************************
+
+This chapter lists some common (and also some non-common) use-cases of ECB and
+gives a detailed description for each one. This contains also some tips and
+tricks how to deal best with some situations.
+
+* Menu:
+
+* Changing faces::              Changing faces in the ECB tree-buffers
+* Small screens::               Working with small screens
+* Big screens::                 Working with big screens
+* Simulating speedbar::         Simulating speedbar without an extra frame
+* Integrating speedbar::        Integrating speedbar in the ECB-frame
+* Large directories::           Working with large directories
+* Remote directories::          Working with remote directories
+* Version-control support::     Supporting Version control systems
+* Using eshell::                Optimal using of eshell in ECB
+* Grepping directories::        Grepping directories with ECB
+* Working with JDEE::           Working best with ECB and JDEE
+* Compile-window on demand::    Displaying the compile-window on demand
+* Non-semantic sources::        Parsing and displaying non-semantic sources
+* Hide-show::                   Using hide-show from the methods-buffer-menu
+* Window-managers and ECB::     Support of several Emacs-window-managers
+* Virtual folders in History::  Simulating something like virtual folders
+
+
+File: ecb.info,  Node: Changing faces,  Next: Small screens,  Prev: Common use-cases,  Up: Common use-cases
+
+10.1 Changing faces in the ECB tree-buffers
+===========================================
+
+There are two basic faces:
+
+   * `ecb-default-general-face': Basic face for displaying an ECB-tree-buffer.
+
+     It“s recommended to define the font-family, the font-size, the basic
+     color etc. with this face.
+
+     In GNU Emacs 21.X all faces (even the face `ecb-default-highlight-face')
+     used in the ECB tree-buffers inherit from this face. Therefore the
+     default attributes like font etc. of a face used in a tree-buffer can be
+     very easily changed with face `ecb-default-general-face'.
+
+     With XEmacs there is no inheritance-feature but the options
+     `ecb-directories-general-face', `ecb-sources-general-face',
+     `ecb-methods-general-face' and `ecb-history-general-face' offer the
+     choice to use the face `ecb-default-general-face' so also with XEmacs
+     the basic face-settings can be easily changed just by customizing the
+     face `ecb-default-general-face'.
+
+   * `ecb-default-highlight-face': Basic face for highlighting the current
+     node in an ECB-tree-buffer.
+
+     In GNU Emacs 21.X all highlighting faces used in the ECB tree-buffers
+     inherit from this face. Therefore the default attributes like font etc.
+     of a highlighting face used in a tree-buffer can be very easily changed
+     with face `ecb-default-highlight-face'.
+
+     With XEmacs there is no inheritance-feature but the options
+     `ecb-directory-face', `ecb-source-face', `ecb-method-face' and
+     `ecb-history-face' offer the choice to use the face
+     `ecb-default-highlight-face' so also with XEmacs the basic face-settings
+     can be easily changed just by customizing the face
+     `ecb-default-highlight-face'.
+
+
+With these faces you can change the basic attributes easily and fast for ALL
+ECB-tree-buffers. But you are also able to display each ECB-tree-buffer with
+different faces, see the different options for every tree-buffer mentioned
+above.
+
+*Please note* (only for XEmacs users): Cause of the lack of the
+font-inheritance feature using ONE other font for the ECB-methods buffer can
+NOT be achieved just by setting `ecb-methods-general-face' to
+`ecb-default-general-face' and changing the font of this default face. In
+addition you have to set the same font also for the face
+`ecb-bucket-node-face' like in the following example:
+
+   (defconst my-ecb-font
+             "-outline-Courier-normal-normal-13-97-96-96-c-*-iso8859-1")
+   (set-face-font 'ecb-default-general-face my-ecb-font)
+   (set-face-font 'ecb-bucket-node-face my-ecb-font)
+
+This code sets the new defined font `my-ecb-font' as font for all(1)
+ECB-tree-buffers (incl. the methods buffer).
+
+---------- Footnotes ----------
+
+(1) Of course `ecb-directories-general-face', `ecb-sources-general-face',
+`ecb-methods-general-face' and `ecb-history-general-face' must be set to
+`ecb-default-general-face'!
+
+
+File: ecb.info,  Node: Small screens,  Next: Big screens,  Prev: Changing faces,  Up: Common use-cases
+
+10.2 Working with small screens
+===============================
+
+If your screen is very small so you need every square-centimeter for
+displaying the buffer which you want to edit, ECB offers you a special
+layouts, where only the ECB-methods buffer is displayed on top or on
+left-side. Here comes what you should/can do to work best with ECB in such a
+situation:
+
+   * First customize your ECB:
+
+       1. Customize `ecb-layout-name' to layout-name "top2" (on top) or
+          "left9" (on left-side)
+
+       2. Ensure that `ecb-compile-window-height' is nil.
+
+       3. Optional: Adjust the `ecb-windows-height' rsp. `ecb-windows-width'.
+
+       4. Save your changes.
+
+   * To edit your buffers: Call `ecb-toggle-ecb-windows' (also available via
+     the menu "ECB" and by `C-c . lw') or `ecb-hide-ecb-windows' to hide the
+     ECB-method buffer so you get all the place of your screen for editing.
+
+   * To browse and select functions: Call `ecb-toggle-ecb-windows' or
+     `ecb-show-ecb-windows' to make the ECB-method buffer visible if not
+     already. If you want select a method/variable with the keyboard instead
+     with the mouse you should read the section *Note Using the keyboard:: in
+     this online help!
+
+The possibility of hiding temporally the ECB windows like described above is
+also useful for all the other layouts.
+
+
+File: ecb.info,  Node: Big screens,  Next: Simulating speedbar,  Prev: Small screens,  Up: Common use-cases
+
+10.3 Working with big screens
+=============================
+
+ECB offers a layout type "left-right" with special ECB-tree-windows on the
+left and right side of the edit-area. The layouts "leftright1" and
+"leftright2"are examples for this layout type.  See *Note Creating a new
+ECB-layout:: and *Note The layout-engine:: for details about how to create or
+program more layouts of this type.
+
+Such a layout is eventually the best choice for big screens because the
+several ECB-tree-windows are bigger and can display more informations without
+scrolling.
+
+With such a layout it can could be senseful to reduce the value of the option
+`ecb-windows-width' compared to layouts of type left or right. A value of
+max. 0.25 should be enough.
+
+
+File: ecb.info,  Node: Simulating speedbar,  Next: Integrating speedbar,  Prev: Big screens,  Up: Common use-cases
+
+10.4 Simulating speedbar without an extra frame
+===============================================
+
+You can simulate a speedbar-like layout within ONE frame by doing the
+following:
+
+  1. Customize `ecb-layout-name' to layout name "left9", "left12", "left13"
+     or "left14" dependent to what you like.
+
+  2. Optional: Ensure that `ecb-compile-window-height' is nil.
+
+  3. Optional: Adjust the `ecb-windows-width'.
+
+  4. Optional: Customize `ecb-toggle-layout-sequence' and toggle very fast
+     between several layouts by `ecb-toggle-layout'. See the doc-strings!
+
+  5. Optional: Customize `ecb-show-sources-in-directories-buffer' to not nil
+     if the chosen layout (see 1. and 4.) contains a directories-tree-buffer.
+
+  6. Save your changes.
+
+But not only simulating speedbar is possible but also full integrating it
+into the ECB and the ECB-frame, *Note Integrating speedbar::.
+
+
+File: ecb.info,  Node: Integrating speedbar,  Next: Large directories,  Prev: Simulating speedbar,  Up: Common use-cases
+
+10.5 Integrating speedbar in the ECB-frame
+==========================================
+
+It is very easy to integrate speedbar into ECB. There are two different ways
+to do this:
+
+  1. You can either use speedbar in the directories-, sources- or
+     methods-window of ECB instead of the built-in directory-, sources- or
+     methods-browser of ECB. This can be done via the option
+     `ecb-use-speedbar-instead-native-tree-buffer'.
+
+  2. Or you can integrate an extra speedbar-window into a layout independent
+     of the existence of a directory-, sources- or methods-window. For this
+     you can either use the built-in layout "left-dir-plus-speedbar" or you
+     have to create your own layout interactively with the command
+     `ecb-create-new-layout'. This way is not described in more details
+     because there is nothing more to describe - just create your layout.
+
+In general integrating speedbar into the ECB-frame makes sense for people...
+
+   * ...who like the speedbar way of handling directories and source-files
+     but also like the ECB-way of displaying the buffer-contents (like
+     methods and variables in a source-file). This people should use the
+     option `ecb-use-speedbar-instead-native-tree-buffer' and set it to `dir'.
+
+   * ...who like the speedbar way of browsing things like directories, files,
+     file-contents etc. but who dislike the extra speedbar-frame.
+
+Note: It is not necessary to integrate speedbar if you only want parsing
+sources not supported by semantic. From version 1.94 on ECB supports native
+parsing and displaying of such sources (*note Non-semantic sources::)!
+
+Regardless the group you belong, with the speedbar-integration feature of ECB
+you can combine both worlds, the speedbar- and the ECB-world:
+
+  1. Choose a layout which either contains a directories- or a sources-window
+     but not both of them(1).
+
+     Because speedbar has also display-modes for buffers and info-nodes and
+     some other useful things (which can be changed by the speedbar-command
+     `speedbar-change-initial-expansion-list' we recommend layouts like
+     "left15" or "leftright3" for using with speedbar.
+
+  2. Set the option `ecb-use-speedbar-instead-native-tree-buffer' to not nil.
+     After this the chosen window of ECB will contain a full featured speedbar
+     (the only difference to standard speedbar is not residing in an extra
+     frame).
+
+Note: If you belong to the first group of people (s.a.) a similar effect and
+usability is available by setting
+`ecb-use-speedbar-instead-native-tree-buffer' to nil and setting
+`ecb-show-sources-in-directories-buffer' to not nil, because this combination
+displays also directories and sources in one window.
+
+So with the option `ecb-use-speedbar-instead-native-tree-buffer' you have the
+choice which way of displaying and handling "things" (directories, sources,
+methods...) you want (the speedbar- or the ECB-way).
+
+During speedbar is running within ECB (i.e.
+`ecb-use-speedbar-instead-native-tree-buffer' is not nil) the
+speedbar-command `speedbar' is disabled and the speedbar-command
+`speedbar-get-focus' switches between the speedbar-window and the
+edit-window(2).
+
+*IMPORTANT*: ECB can only integrate speedbar-versions >= 0.14beta1! If you
+use lower versions of speedbar `ecb-use-speedbar-instead-native-tree-buffer'
+has no effect.
+
+---------- Footnotes ----------
+
+(1) Only one of them is needed if you use speedbar because speedbar displays
+directories and sources in one window. But if you like wasting space then you
+can also use a layout with both windows...
+
+(2) The standard behavior is switching between the speedbar-frame and the
+attached frame, but this make obviously no sense during running speedbar with
+ECB.
+
+
+File: ecb.info,  Node: Large directories,  Next: Remote directories,  Prev: Integrating speedbar,  Up: Common use-cases
+
+10.6 Working with large directories
+===================================
+
+If `ecb-source-path' contains directories with many files and subdirs,
+especially if these directories are mounted net-drives ("many" means here
+something > 500, dependent on the speed of the net-connection and the
+machine), actualizing the sources- and/or directories- buffer of ECB (if
+displayed in current layout!) can slow down dramatically. If this is a
+problem the contents of certain directories and also the contents of the
+sources-buffer can be cached which increases the speed a lot. See the option
+`ecb-cache-directory-contents'.
+
+IMPORTANT: The full speed-advantage of this cache-mechanism is only available
+if `ecb-show-sources-in-directories-buffer' is `nil', i.e. sources of a
+directory are displayed in the ECB-sources-window. The reason is that only
+with a sources window the tree-buffer contents for the sources can be cached
+(i.e. the buffer-content of the ECB-sources-window) whereas with sources
+displayed in the directories buffer only the disk-contents of a directory are
+cached - which increases speed too but not so much as with sources displayed
+in the extra window ECB-sources.
+
+The cache of a directory can be only refreshed by a POWER-click (with mouse
+or keyboard) onto the related directory-node in the directories-buffer of ECB
+(*note Using the mouse::).
+
+See also the option `ecb-cache-directory-contents-not'. Here are some useful
+settings for both of these options:
+
+   * Cache all directories with more than 500 entries: Set
+     `ecb-cache-directory-contents' to ((".*" . 500)) and set
+     `ecb-cache-directory-contents-not' to nil.
+
+   * Cache only all directories > 200 beginning with /usr/ Set
+     `ecb-cache-directory-contents' to (("^/usr/.*" . 200)) and set
+     `ecb-cache-directory-contents-not' to nil.
+
+   * Cache all directories > 500 but NOT these beginning with /usr/: Set
+     `ecb-cache-directory-contents' to ((".*" . 500)) and set
+     `ecb-cache-directory-contents-not' to ("^/usr/.*").
+
+Another way for getting a faster overlook for large directories with many
+source-entries is to apply an online-filter to the sources-buffer. This can
+be done via the command `ecb-sources-filter' or via the popup-menu of the
+sources-buffer.
+
+
+File: ecb.info,  Node: Remote directories,  Next: Version-control support,  Prev: Large directories,  Up: Common use-cases
+
+10.7 Working with remote directories
+====================================
+
+The term "remote" means directories which are remote in the sense of
+TRAMP(1), ANGE-FTP(2) or EFS(3). Each of these Emacs-addons is intended to
+make editing directories and files on remote machines as transparent as
+possible.
+
+10.7.1 General remarks
+----------------------
+
+ECB supports such remote directoires out of the box and completely
+transparently, i.e. you can add remote directories to the option
+`ecb-source-path' without any restriction. ECB will handle these directories
+transparently with the appropriate tool - either TRAMP, ANGE-FTP or EFS. So
+when  working with such a remote directory is possible without ECB it will be
+possible too with active ECB - at least as long you are "connected"!
+
+*Caution*: Suppose you have added a remote dir (e.g.
+"user@host.at.a.server:/dir/") to `ecb-source-path' and you start ECB when
+you are offline, means there can be no connection established to the remote
+computer (e.g. "host.at.a.server"). Each time ECB has to process a remote
+path ECB pings via the ping-program the remote host (in the example above it
+would ping the host "host.at.a.server") to test if it is accessible. If not
+then this path will be ignored by ECB(4). Ensure that ECB calls your
+ping-program (see `ecb-ping-program') with the right options (see
+`ecb-ping-options'). To avoid to many pings to the same host ECB caches the
+ping result so there should be no performance decrease. But to ensure still
+correct accessible-results and to avoid using outdated cache-results ECB
+discards the cached value of the accessible-state of a certain host after a
+customizable time-interval (please read the documentation of
+`ecb-host-accessible-check-valid-time'!).
+
+10.7.2 Excluding remote directories from time-consuming tasks
+-------------------------------------------------------------
+
+ECB performs some tasks stealthily and interruptable by the user (see the
+option `ecb-stealthy-tasks-delay' for additional explanations) because these
+tasks are time-consuming and could otherwise ECB block. Especially for remote
+directories these special tasks can cause annoying blocks of Emacs (*note
+Stealthy background tasks::).
+
+Therefore it is probably the best to switch on each of the stealthy tasks
+with the `unless-remote' which is the default activation (*note Stealthy
+background tasks::). So a certain stealthy task will be swtiched on for all
+local directories (and also for all mounted drives in the LAN) but not for
+real remote directories used via TRAMP, ANGE-FTP or EFS.
+
+10.7.3 Caching the contents of remote directories
+-------------------------------------------------
+
+ECB caches per default the contents of remote directories to avoid annoying
+delays. The cache is done via the option `ecb-cache-directory-contents' which
+contains an entry which covers the syntax of remote directories. If you do
+not want this caching (which is strongly recommened) you have to remove this
+entry from this option.
+
+---------- Footnotes ----------
+
+(1) TRAMP stands for 'Transparent Remote (file) Access, Multiple Protocol'.
+This package provides remote file editing, similar to ANGE-FTP.
+
+(2) This package attempts to make accessing files and directories using FTP
+from within Emacs as simple and transparent as possible.
+
+(3) A system for transparent file-transfer between remote hosts using the FTP
+protocol within Emacs
+
+(4) This avoids long lasting and annoying blocking of ECB when a remote-path
+is not accessible: Without a ping ECB would always try to open this directory
+through the appropriate library (e.g. TRAMP) and it would depend on the
+timeout-mechanism of this library (e.g. TRAMP has 60 seconds) how long ECB
+would be blocked. First after this timeout ECB could start working! A fast
+"pre"-ping avoids this problem!
+
+
+File: ecb.info,  Node: Version-control support,  Next: Using eshell,  Prev: Remote directories,  Up: Common use-cases
+
+10.8 Supporting Version control systems
+=======================================
+
+Beginning with version 2.30 ECB supports Version-control systems (in the
+following named VC-systems). This means the special tree-buffers of ECB
+display files managed by a VC-system with an appropriate image-icon(1) in
+front of the filename.
+
+The following four options allow full control over this feature (see also
+*Note ecb-version-control:::
+
+`ecb-vc-enable-support'
+     Enable or disable this feature.
+
+`ecb-vc-supported-backends'
+     The most important option for this feature. Allows to specify how ECB
+     should test if a directory is managed by a VC-system (how to identify
+     the VC-backend of a directory) and - if yes - how it should check the
+     VC-state of a certain file. The former ones are called
+     "identify-backend-functions" and the latter ones "check-state-functions".
+
+`ecb-vc-directory-exclude-regexps'
+     Allows excluding certain directories (on a regexp-basis) from the
+     VC-support even if they are managed by a VC-system.
+
+`ecb-vc-state-mapping'
+     Defines the mapping between the state-values returned by a
+     check-state-function (a function set in `ecb-vc-supported-backends' and
+     used for getting the VC-state of a file, e.g. `vc-state') and the
+     allowed state-values ECB can understand.
+
+Probably the default settings will fit your needs but to get sure you should
+carefully read the documentation of these options!
+
+The following subsection give you important informations about
+identify-backend-functions, check-state-functions, about working with remote
+repositories.
+
+* Menu:
+
+* Identifying backends::        How ECB identifies the VC-backend of a dir
+* Checking the state::          How ECB checks the VC-state of a file
+* Remote repositories::         What you should know about this
+* Refreshing the VC-state::     How to refresh when state changed outside
+* Adding new backends::         Necessary steps for adding new backends
+* Known VC-problems::           Currently known problems of the VC-support
+
+---------- Footnotes ----------
+
+(1) Of course only when Emacs is capable to display images; otherwise a
+suitable ascii-icon will be displayed.
+
+
+File: ecb.info,  Node: Identifying backends,  Next: Checking the state,  Prev: Version-control support,  Up: Version-control support
+
+10.8.1 How ECB identifies the VC-backend of a dir
+-------------------------------------------------
+
+ECB tries all functions added as identify-backend-funtions to the option
+`ecb-vc-supported-backends' until one of them returns not `nil' but a symbol
+which identifies the backend (e.g.  `CVS'). After this check ECB stores the
+result of this check (i.e. either the identified backend or the fact that the
+directory is not managed by a VC-system) for that directory in a special
+cache, so the identify-backend-process will be performed only once per
+directory. If for a directory a VC-backend could be identified ECB stores not
+only the backend itself for that directory but also the associated
+check-state-function defined in `ecb-vc-supported-backends' (*note Checking
+the state::).
+
+You can add arbitrary functions to this options as long as they get one
+directory-argument and return either nil or a backend-symbol. Per default ECB
+offers the following functions to identify the VC-backend CVS, RCS, SCCS, Git,
+Monotone or Subversion(1):
+
+`ecb-vc-dir-managed-by-CVS DIRECTORY'
+     Return `CVS' if DIRECTORY is managed by CVS. nil if not.
+
+`ecb-vc-dir-managed-by-RCS DIRECTORY'
+     Return `RCS' if DIRECTORY is managed by RCS. nil if not.
+
+`ecb-vc-dir-managed-by-SCCS DIRECTORY'
+     Return `SCCS' if DIRECTORY is managed by SCCS. nil if not.
+
+`ecb-vc-dir-managed-by-MTN DIRECTORY'
+     return `MTN' if directory is managed by Monotone. nil if not.
+
+`ecb-vc-dir-managed-by-GIT DIRECTORY'
+     Return `GIT' if directory is managed by Git. nil if not.  Because with
+     Git only the top-most directory of a source-tree has a subdir .git this
+     function tries recursively upwards if there is a .git-subdir.
+
+`ecb-vc-dir-managed-by-SVN DIRECTORY'
+     Return `SVN' if DIRECTORY is managed by Subversion. nil if not.  Returns
+     always nil if the library vc-svn.el can not be found.
+
+
+If ECB should support another VC-backend than CVS, RCS, SCCS, Monotone, Git or
+Subversion you have to write your own identify-backend-funtion for the used
+VC-backend (e.g. Clearcase)!
+
+---------- Footnotes ----------
+
+(1) For this the most recent version of the VC-package (incl. the libraries
+vc-git.el, vc-mono.el and vc-svn.el) is needed - as contained in Emacs >= 22
+and XEmacs >= 21.4.22
+
+
+File: ecb.info,  Node: Checking the state,  Next: Remote repositories,  Prev: Identifying backends,  Up: Version-control support
+
+10.8.2 How ECB checks the VC-state of a file
+--------------------------------------------
+
+After ECB has identified the VC-backend of a directory it will display the
+VC-state (e.g. up-to-date, edited, needs-mergs etc...) with a suitable
+image-icon in the tree-windows of the ECB-file-browser. To get this state for
+a certain file ECB uses that check-state-function stored in the cache for the
+directory of that file (*note Identifying backends::).
+
+You can add any arbitrary functions as check-state-function to
+`ecb-vc-supported-backends' as long as they get one filename-argument and
+return a state-symbol (e.g. `up-to-date'.  ECB can understand a certain set
+of state-values which are then mapped to suitable image-icons which will in
+turn be displayed in front of the filename in the file-browser. Because the
+values a check-state-function return can differ from that state-values ECB
+understands, ECB offers an option to define a appropriate state-mapping. The
+name of this option is `ecb-vc-state-mapping'.  See the documentation of this
+option to get a list of all state-value ECB understands.
+
+Per default ECB uses the function `vc-state' of the VC-package(1) to check
+the state for the backends CVS, RCS, SCCS, Subversion, Git and Monotone. So
+the default-value of `ecb-vc-state-mapping' contains a mapping between these
+values `ecb-vc-state' can return and that state-values ECB understands.
+
+If ECB should support other VC-backends than CVS, RCS, SCCS, Monotone, Git and
+Subversion (e.g. Clearcase) you should add that new backend to the VC-package
+(see the initial comments of vc.el how to do this) then ECB will automatically
+support that new backend. Alternatively it may be sufficient if you write your
+own check-state-function for this backend and add the needed mapping to
+`ecb-vc-state-mapping' if necessary.
+
+10.8.2.1 Getting heuristic state-values or real ones for a backend
+..................................................................
+
+The interface of Emacs' VC-package offers two different ways to get the
+VC-state of a file:
+
+   * The real, fresh and expensive approach
+
+     VC has a function `vc-recompute-state' which always performs a real
+     backend command (e.g. "cvs status" for CVS) to get a fresh and real state
+     for a file. As you can imagine this operation can be very expensive and
+     long lasting depending on the location of the repository. But for CVS the
+     CVS-backend of VC offers with the option `vc-cvs-stay-local' a way to
+     tell Emacs to stay local even for the sake of getting a real state(2).
+
+     ECB offers `ecb-vc-recompute-state' for this approach which is an alias
+     for `vc-recompute-state'.
+
+   * The heuristic approach:
+
+     The function `vc-state' always returns a "heuristic" state which should
+     be used when a fresh and real state is not necessary.  With `vc-state'
+     the option `vc-cvs-stay-local' will never take effect.
+
+     ECB offers `ecb-vc-state' for this approach - see below for the
+     difference between `vc-state' and `ecb-vc-state'.
+
+Example CVS:
+
+VC/CVS actually does it this way (regardless if ECB is active or not): When
+you visit a file, it always uses just the heuristic to get the state
+(comparing file times), regardless of the setting of `vc-cvs-stay-local'.
+This is because the "fresh-but-slow" state is determined by calling "cvs
+status" on the file, and this was deemed unacceptably slow if done at
+visiting time under any conditions.
+
+The state is updated by calling `vc-recompute-state' prior to
+`vc-next-action' (C-x v v) which either checks a file in or out.  IF
+`vc-cvs-stay-local' is nil, then this does in fact call "cvs status" to get
+the "fresh-but-slow-state", but if `vc-cvs-stay-local' is t, then it just
+compares the file times again.
+
+But under certain conditions (e.g. if called for files not already visited or
+for files their VC-state has been changed from outside Emacs, e.g. by
+checking in the file via command line) `vc-state' does not compute a new
+heuristic state but returns a cached one (cached by the VC-package itself not
+by ECB) which does not reflect the current VC-state. Example: if you have
+edited a file within Emacs and then checked in from outside Emacs `vc-state'
+returns a wrong state until you call `revert-buffer' for this file. Therefore
+ECB offers the check-state-function `ecb-vc-state' which does the same as
+`vc-state' but it clears the internal caches of the VC-package for that file
+before calling `vc-state'.
+
+The bottom line for you is this: If you use `ecb-vc-state' in
+`ecb-vc-supported-backends' to get the version control state, then you get
+the same policy that VC uses and you get always a "correct" heuristic state
+(as correct as possible a heuristic state can be). There should no harm if
+you use `ecb-vc-recompute-state' (which is an alias for `vc-recompute-state')
+as a replacement function if you want to get fresh and real state-values, but
+then (a) you must make sure to set `vc-cvs-stay-local' to nil, and (b)
+fetching the state over the network under all conditions was deemed
+unacceptably slow in VC.
+
+---------- Footnotes ----------
+
+(1) The VC-package of Emacs offers a standardised and uniform interface for
+several backends; per default CVS, RCS, SCCS, Subversion, Git and Monotone
+are supported by the VC-package.
+
+(2) For other backends you have to check the VC-manual if there is equivalent
+option
+
+
+File: ecb.info,  Node: Remote repositories,  Next: Refreshing the VC-state,  Prev: Checking the state,  Up: Version-control support
+
+10.8.3 Important informations about remote repositories
+-------------------------------------------------------
+
+At least CVS can be used in a mode called "Client/Server" which means the
+root repository is located on a remote machine. We call a repository which
+can not being mounted by the client-machine (which contains the working
+directory) a "remote repository". In most cases getting the fresh and real
+VC-state for such repositories will be unacceptable slow or often users will
+work offline means with no connection available to the remote host. To avoid
+problems like these ECB offers first an option
+`ecb-vc-directory-exclude-regexps' to exclude such directories with a remote
+repository from the VC-support of ECB and secondary the
+identify-backend-funtion `ecb-vc-dir-managed-by-CVS' behaves smart with that
+respect (*note Identifying backends::). See also
+`ecb-vc-xemacs-exclude-remote-cvs-repository'!
+
+10.8.3.1 Remote paths and the VC-support of ECB
+...............................................
+
+ECB supports working with remote directories like TRAMP- or EFS-directories
+(*note Remote directories::). Do not confuse remote directories with remote
+repositories. A local directory located on your disk and set in
+`ecb-source-path' can have a remote repository if managed by a VC-system. A
+remote directory means a path in the format of TRAMP, ANGE-FTP or EFS set in
+`ecb-source-path'.  Its very likely that getting the VC-state of files
+contained in such a remote directory would be extremly expensive and
+therefore ECB would be blocked quite long even if the VC-check is performed
+stealthy (*note Stealthy background tasks::).
+
+To avoid problems with such remote directories ECB prevents per default such
+directories from being processed by the VC-support of ECB. But if a user is
+dying to having the VC-state being displayed in the tree-buffers ECB offers
+two ways to switch on the VC-support - see the option
+`ecb-vc-enable-support': This option is set per default to the value
+`unless-remote' which means remote paths will not be processed but it can be
+set to `t' which means process all directories regardless if remote or not.
+It's strongly recommended to use `unless-remote'!
+
+
+File: ecb.info,  Node: Refreshing the VC-state,  Next: Adding new backends,  Prev: Remote repositories,  Up: Version-control support
+
+10.8.4 How to refresh ECB-state-display when changed outside
+------------------------------------------------------------
+
+If all actions concerning version controlling of a file are performed within
+Emacs with commands offeres by VC then the displayed state for such a file in
+the tree-buffers of ECB will be always correct - in that sense that ECB will
+always display that state which the check-state-function for the file will
+return. At least with GNU Emacs for the backends CVS, RCS, SCCS and
+Subversion this will be true. With XEmacs only for CVS. For other backends
+see *Note Adding new backends::.
+
+But if the VC-state of a file will be changed outside of Emacs (unfortunately
+PCL-CVS must be called "outside" too because PCL-CVS doesn't use the
+functions of the VC-package of Emacs for checking-in or -out) then ECB can
+not automatically recognize this and therefore it can not aurtomatically
+update the displayed state-image-icon. You have to tell ECB for which files
+in the tree-buffers the VC-state should be recomputed. This can be done via
+the popup-menus of the ECB-tree-buffers - The following popup-commands are
+offered in the submenu "Version Control":
+
+ECB-directories-buffer (if sources are displayed within):
+     "Recompute state for file" and "Recompute state for dir" whereas the
+     latter one recomputes the VC-state for all files of that directory the
+     file belongs.
+
+ECB-sources-buffer
+     "Recompute state for file" and "Recompute state for dir" whereas the
+     latter one recomputes the VC-state for all files currently displayed in
+     the sources-buffer.
+
+ECB-history-buffer
+     "Recompute state for file" and "Recompute state for whole history"
+     whereas the latter one recomputes the VC-state for all file-entries
+     currently displayed in the history-buffer.
+
+*Caution*: The state will only recomputed right under all situations if you
+use either `ecb-vc-state' or `vc-recompute-state' as check-state-function in
+`ecb-vc-supported-backends' (*note Checking the state::).
+
+Of course all these commands update the VC-state in all visible tree-buffers
+the file is currently displayed (e.g. often a file is displayed in the
+sources- and the history-buffer)!
+
+For general informations about the usage of popup-menus in ECB see *Note
+Using the mouse:: (subsection "The right mouse button").
+
+In addition to these popup-commands using the POWER- rsp. Shift-click (*note
+Using the mouse::) onto a directory in the directory-window of ECB refreshes
+the VC-state-values of all files contained in this directory too.
+
+
+File: ecb.info,  Node: Adding new backends,  Next: Known VC-problems,  Prev: Refreshing the VC-state,  Up: Version-control support
+
+10.8.5 Necessary steps and informations for adding new backends
+---------------------------------------------------------------
+
+There are mainly three necessary steps for adding a new(1) backend BE which
+should be supported by ECB:
+
+  1. Adding an identify-backend-function to `ecb-vc-supported-backends' ECB
+     needs a function how to identify the new backend BE for a certain
+     directory. If there exists already a library (other then VC) supporting
+     this backend then this library propably contains already such a function
+     which can be used or can be used at least with a small elisp-wrapper. If
+     no elisp-library for backend BE exists then you have probably write the
+     full identify-backend-function for your self. This function has to be
+     added to `ecb-vc-supported-backends'.
+
+  2. Adding an check-state-function to `ecb-vc-supported-backends' Associated
+     to the new identify-backend-function mentioned in step 1 a new
+     check-state-function is needed which can be used by ECB to get the
+     VC-state for a file. See *Note Checking the state:: for a description
+     about the needed interface of such a function. In combinatio with the
+     identify-backend-function from step 1 this function has to be added to
+     `ecb-vc-supported-backends'.
+
+  3. Enabling automatic state-update after checkin/out
+
+     This step is not essential if you do not need the displayed VC-state
+     automatically updated after a checkin/out of a file via the commands
+     available for backend BE (e.g. clearcase.el offers for the backend
+     Clearcase elisp-commands to checkin and checkout a file which then
+     should also update the displayed state in the ECB-tree-buffers. All you
+     need is a way to tell these commands that they should clear the
+     ECB-VC-cache for the file and then restart the ECB-VC-check-mechanism.
+     This should be done after these commands have finished their original
+     job.
+
+     ECB enables this per default for all backends supported by the
+     VC-package with the following code. Maybe this is a good starting point.
+
+        (defvar ecb-checkedin-file nil
+          "Stored the filename of the most recent checked-in file. Is only set by the
+        after-advice of `vc-checkin' and `ecb-vc-checkin-hook' \(resets it to nil).
+        Evaluated only by `ecb-vc-checkin-hook'.
+
+        This is the communication-channel between `vc-checkin' and
+        `ecb-vc-checkin-hook' so this hook-function gets the filename of the
+        checked-in file.")
+
+        (defadvice vc-checkin (after ecb)
+          "Simply stores the filename of the checked-in file in `ecb-checkedin-file'
+        so it is available in the `vc-checkin-hook'."
+          (setq ecb-checkedin-file (ecb-fix-filename (ad-get-arg 0))))
+
+        (defun ecb-vc-checkin-hook ()
+          "Ensures that the ECB-cache is reset and the entry for the most recent
+        checkedin file is cleared. Uses `ecb-checkedin-file' as last checked-in file."
+          (when ecb-checkedin-file
+            (ecb-vc-cache-remove ecb-checkedin-file)
+            (ecb-vc-reset-vc-stealthy-checks)
+            (setq ecb-checkedin-file nil)))
+
+
+---------- Footnotes ----------
+
+(1) i.e.  not already supported by the VC-package because all these backends
+are automatically supported by ECB too!
+
+
+File: ecb.info,  Node: Known VC-problems,  Prev: Adding new backends,  Up: Version-control support
+
+10.8.6 Currently known problems with the VC-support
+---------------------------------------------------
+
+There are no reported problems concerning the Version Control support of ECB.
+
+
+File: ecb.info,  Node: Using eshell,  Next: Grepping directories,  Prev: Version-control support,  Up: Common use-cases
+
+10.9 Optimal using of eshell in ECB
+===================================
+
+ECB offers a very smart integration of the "eshell" if you are using a
+compile window (*note Temp- and compile-buffers::)(1)
+
+Here is a short summary of provided features:
+
+   * Ability to jump to the eshell buffer within the compilation window by
+     simply call `eshell' (bound to `C-c . e'). If the eshell isn't running
+     it will be started.
+
+   * Expands the compilation window when you run commands. So for example it
+     allows you to view the eshell in minimized mode and then when you run
+     "ls" the window automatically expands (but always depending on the
+     output of the command you run).
+
+   * Synchronizes the current directory of the eshell with the current buffer
+     in the current active edit-window of ECB.
+
+   * Provides smart window layout of the eshell buffer. This makes sure that
+     the eshell is taking up the exact amount of space and that nothing is
+     hidden.
+
+Here comes a detailed explanation of these features and how to use it (all
+these features are only available if you use a persistent compile-window,
+i.e. if `ecb-compile-window-height' is not nil):
+
+You do not have to learn a new command for the eshell-start - just call
+`eshell' (for convenience also bound to `C-c . e') and the eshell will
+displayed in the compile-window of ECB (if eshell is not already alive then
+it will be started automatically).
+
+ECB tries to display the contents of the eshell-buffer as best as possible,
+means ECB can autom. enlarge and shrink the compile-window so the contents of
+the eshell are fitting the window. See option
+`ecb-eshell-enlarge-when-eshell' and
+`ecb-eshell-fit-window-to-command-output'. Normally this is done autom. but
+you can also you the standard compile-window enlarging-command of ECB:
+`ecb-toggle-compile-window-height'.
+
+ECB tries also to recenter the eshell-buffer as best as possible.  Normally
+this is done autom. but you can do it on demand with the command
+`ecb-eshell-recenter'.
+
+If option `ecb-eshell-buffer-sync' is true then ECB always synchronizes the
+command prompt of eshell with the directory of current source-buffer of the
+current active edit-window.
+
+With the option `ecb-eshell-auto-activate' you can start eshell autom. in the
+compile-window when ECB is started but of course if a compile-window exists.
+
+---------- Footnotes ----------
+
+(1) Of course you can use eshell also if there is no compile-window. Then it
+is just displayed in the edit-area and there is no special integration.
+
+
+File: ecb.info,  Node: Grepping directories,  Next: Working with JDEE,  Prev: Using eshell,  Up: Common use-cases
+
+10.10 Grepping directories with ECB
+===================================
+
+ECB offers in the popup-menus in the directories- and sources-tree-buffer
+commands for easy (recursive) grepping the current directory under point
+(directory-buffer) rsp. the current-directory (sources-buffer). In every case
+just the function of the options `ecb-grep-function' rsp.
+`ecb-grep-find-function' is called and the `default-directory' is tempor. set
+to the chosen directory so the grep will performed in this directory
+regardless of the `default-directory' of current buffer in the edit-window.
+
+Other smart things beyond that are not done by ECB, see also
+`ecb-grep-function'!
+
+So, how to exclude some subdirectories or files from the grep?
+
+Basically this has to be done with the "-prune" option of the find-utility:
+If the standard-grep facility of Emacs is used then this is not easy but with
+the command `igrep.el' there is a convenient way to exclude things like CVS-
+or RCS-directories from the find-call: See the variable
+`igrep-find-prune-clause' of the library `igrep.el'.
+
+
+File: ecb.info,  Node: Working with JDEE,  Next: Compile-window on demand,  Prev: Grepping directories,  Up: Common use-cases
+
+10.11 Working best with ECB and JDEE
+====================================
+
+ECB is completely language independent, i.e. it works with any language
+supported by semantic (e.g. C, C++, Java, Elisp etc.).
+
+But there are some special integrations for the great
+Java-Development-Environment JDEE:
+
+   * Displaying contents of class under point
+
+     With the command `ecb-jde-display-class-at-point' you can display the
+     contents of the class which contains the definition of the "thing" at
+     point (which can be a method, variable etc.).
+
+   * Creating new source-files
+
+     The popup-menus in the directories- and the sources-buffer offer a
+     command "Create Source" which allows easy creating new java-sources by
+     calling the command `jde-gen-class-buffer'.
+
+   * Adding user-extensions to the popup-menus
+
+     The options `ecb-directories-menu-user-extension' and
+     `ecb-sources-menu-user-extension'(1) allow adding often used
+     JDEE-commands to the popup-menus of the directories- or sources-buffer.
+     One example is to add building the project of current directory. Here is
+     a function which could be added to `ecb-directories-menu-user-extension':
+
+        (defun ecb-dir-popup-jde-build (node)
+          "Build project in directory."
+          (let ((project-file
+        	 (expand-file-name jde-ant-buildfile (tree-node-get-data node))))
+            (jde-ant-build project-file "build")))
+
+     Of course you can add entries to the option
+     `ecb-methods-menu-user-extension' and `ecb-methods-menu-user-extension'
+     too.
+
+
+---------- Footnotes ----------
+
+(1) If you need a dynamic way of menu-extension then you should have a look
+at the options `ecb-directories-menu-user-extension-function' and
+`ecb-sources-menu-user-extension-function'.
+
+
+File: ecb.info,  Node: Compile-window on demand,  Next: Non-semantic sources,  Prev: Working with JDEE,  Up: Common use-cases
+
+10.12 Displaying the compile-window on demand
+=============================================
+
+If you like displaying all output of compile/grep/etc. an all temp-buffers
+like *Help*-buffers in an extra compile-window (*note Temp- and
+compile-buffers::) but you dislike wasting the space of this compile-window
+if you are just editing then you can get a compile-window "on demand". Just
+do the following:
+
+  1. Customize `ecb-compile-window-height' to not nil and save it for future
+     sessions. This gives you an extra compile-window at the bottom.
+
+  2. Add the following to your .emacs:
+
+        (add-hook 'ecb-activate-hook
+                  (lambda ()
+                    (let ((compwin-buffer (ecb-get-compile-window-buffer)))
+                    (if (not (and compwin-buffer
+                                  (ecb-compilation-buffer-p compwin-buffer)))
+                        (ecb-toggle-compile-window -1)))))
+
+     This hides the extra compile-window directly after the start of ECB
+     because there is no need for a compile-window at this moment. But the
+     hiding will not be done if there is a compile-window and if a
+     "compile-buffer" in the sense of `ecb-compilation-buffer-p' is displayed
+     in this compile-window. Without this additional check the compile-window
+     would always be hidden after the ECB-start even when ECB is reactivated
+     after a deactivation by the window-manager-support of ECB (*note
+     Window-managers and ECB::); but in these cases we want to preserve the
+     state before deactivation as good as possible (see also option
+     `ecb-split-edit-window-after-start').
+
+
+This is all you have to do. Now if you run `compile' (or `grep' or other
+compile-modes) or display temp-buffers like *Help*-buffers then ECB autom.
+displays the compile-window at the bottom and display the output there.
+
+If you have finished with using the compile- or temp-output (e.g.  fixing
+errors) then you can throw away the compile-window just by
+`ecb-toggle-compile-window' - ECB will reactivate it autom.  before next
+compilation or help-buffer-display.!
+
+
+File: ecb.info,  Node: Non-semantic sources,  Next: Hide-show,  Prev: Compile-window on demand,  Up: Common use-cases
+
+10.13 Parsing and displaying non-semantic sources
+=================================================
+
+ECB is mostly designed to display parsing information for files supported by
+semantic. But beginning with version 1.94 it also supports other parsing
+engines like imenu and etags, so also files not supported by semantic but by
+imenu/etags can be displayed in the Method-buffer of ECB. See *Note
+Definition of semantic- and non-semantic-sources:: for a description of
+"semantic-sources" and "non-semantic-sources".
+
+If support of non-semantic-sources is enabled then ECB will display the
+contents of all sources which can be displayed by speedbar too.  This comes
+from the fact that ECB uses speedbar-logic to parse sources with imenu or
+etags.
+
+In most cases imenu-parsing is preferable over etags-parsing because imenu
+operates on Emacs-buffers and needs no external tool and therefore parsing
+works also if current contents of a buffer are not saved to disk.
+
+This section describes all important aspects about parsing and displaying
+file-contents of file-types not supported by semantic but by imenu and/or
+etags.
+
+10.13.1 Enabling parsing and displaying of non-semantic-sources
+---------------------------------------------------------------
+
+Enabling is simply done with the option `ecb-process-non-semantic-files'.
+
+ECB offers an option `ecb-non-semantic-parsing-function' to specify on a
+major-mode basis which parsing-method should be used: imenu or etags.
+Normally there should be no need to change this option but read the
+documentation of this option (*note ecb-non-semantic::) for further details.
+
+IMPORTANT:
+
+   * If imenu-parsing should be used then the option
+     `speedbar-use-imenu-flag' must be set to not `nil'!
+
+   * If some non-semantic-sources are not parsed (i.e. there is an empty
+     Methods-buffer) and you think that they should then maybe they are
+     neither supported by imenu nor by etags or you have to check the options
+     `ecb-non-semantic-parsing-function' and
+     `speedbar-dynamic-tags-function-list' and - especially for etags -
+     `speedbar-fetch-etags-parse-list', `speedbar-fetch-etags-arguments' and
+     `speedbar-fetch-etags-command'.
+
+   * Even with support for semantic-, imenu- and etags-parsing there will
+     remain some file-types rsp. `major-modes' which are not parse-able,
+     neither by semantic, imenu nor etags. This is no problem because these
+     files simply have an empty Methods-buffer. But nevertheless you will get
+     a message "Sorry, no support for a file of that extension" which comes
+     from the speedbar-library and can not switched off. Therefore if a
+     `major-mode' is known as not parse-able by semantic, imenu or etags it
+     can be added to the option `ecb-non-semantic-exclude-modes' and then it
+     will be excluded from being tried to parsed and this (annoying) message
+     will not occur.
+
+10.13.2 Automatic rescanning/reparsing of non-semantic-sources
+--------------------------------------------------------------
+
+In contrast to semantic (see `global-semantic-auto-parse-mode') there is no
+built-in mechanism for autom. reparsing non-semantic-sources and then
+updating the contents of the Methods-buffer.
+
+For non-semantic-sources you have always at least to call
+`ecb-rebuild-methods-buffer' (bound to `C-c . r') or saving the source-file
+(if `ecb-auto-update-methods-after-save' is true) to update the
+Method-buffer(1).
+
+Depending on the parsing-mechanism the following options have to be switched
+on so ECB can rebuild the methods-buffer for non-semantic-sources:
+
+   * imenu:
+
+     The imenu-option `imenu-auto-rescan' must be enabled and
+     `imenu-auto-rescan-maxout' has to be set big enough to auto-parse big
+     files too! But this results not directly in an autom. updated
+     Method-buffer. This is first done after calling the command
+     `ecb-rebuild-methods-buffer' or saving the source-file (if
+     `ecb-auto-update-methods-after-save' is true).
+
+   * etags:
+
+     Only if `ecb-auto-save-before-etags-methods-rebuild' is switched on the
+     command `ecb-rebuild-methods-buffer' rebuilds the method-buffer with
+     current source-contents. See description of this option for an
+     explanation.
+
+Tip: If you want to program your own real. automatic rescan/reparse/rebuild
+mechanism for non-semantic-sources you can do:
+
+Adding to `after-change-functions' a function F which either runs itself
+`ecb-rebuild-methods-buffer-for-non-semantic' or which adds only another
+function FF to an idle-timer and the function FF runs
+`ecb-rebuild-methods-buffer-for-non-semantic'. The latter approach has the
+advantage that the reparse/rebuild is not performed immediately after every
+change but first after Emacs is idle for a senseful interval (e.g. 4 seconds)
+after last change. Of course the function FF has to cancel its own idle-timer
+at the end, so the next idle-timer is first started again after the next
+change (i.e. by function F which is still contained in
+`after-change-functions'.
+
+10.13.3 Customizing the display of the tags
+-------------------------------------------
+
+For non-semantic-sources ECB uses does no special organizing of tags in
+groups and sub-tags but it completely uses the tag-hierarchy the imenu- and
+etags-parsers of speedbar return. So the displayed tag hierarchy can only be
+customized with some options speedbar offers for this:
+
+`speedbar-tag-hierarchy-method', `speedbar-tag-group-name-minimum-length',
+`speedbar-tag-split-minimum-length' and
+`speedbar-tag-regroup-maximum-length'. See the speedbar documentation for
+details about these options.
+
+With the option `ecb-method-non-semantic-face' you can define the face used
+for displaying the tags in the Method-buffer for non-semantic-sources.
+
+`ecb-non-semantic-methods-initial-expand' can be useful too.
+
+---------- Footnotes ----------
+
+(1) Maybe future versions of ECB (> 1.94) will offer an autom. mechanism for
+this.
+
+
+File: ecb.info,  Node: Hide-show,  Next: Window-managers and ECB,  Prev: Non-semantic sources,  Up: Common use-cases
+
+10.14 Using hide-show from the methods-buffer-menu
+==================================================
+
+The popup-menu of the Methods-buffer offer two entries for either hiding or
+showing the block which is related to the selected tag (that tag for which
+the popup-menu was opened):
+
+   * "Jump to tag and hide block": Jumps to the tag and calls `hs-hide-block'
+     from the hideshow-library which is shipped with (X)Emacs. After that the
+     block is hidden, i.e. only the header-line of that tag (method, variable
+     etc.) is visible, the rest is hidden behind the "...".
+
+   * "Jump to tag and show block": Jumps to the tag and calls
+     `hs-show-block'. This shows the related hidden block if the block was
+     hidden via `hs-hide-block' or the menu-entry "Jump to tag and hide
+     block" (s.a.).
+
+For this feature the library `hideshow.el' is used which should normally
+being included in the (X)Emacs-distribution. If this library is not loaded
+into Emacs, ECB does this automatically before the first call to one of these
+menu-entries.
+
+IMPORTANT: If in some `major-mode' hiding and showing does not work as you
+expect it to work then you must probably add an entry for this `major-mode'
+to the hideshow-variable `hs-special-modes-alist'. See the documentation of
+this variable for further details. One example of such a `major-mode' is
+`jde-mode' of the Java Development Environment JDEE; just add an entry for it
+like the already contained entries for `c++-mode' or `java-mode' and hiding
+and showing will work for you with JDEE too.
+
+
+File: ecb.info,  Node: Window-managers and ECB,  Next: Virtual folders in History,  Prev: Hide-show,  Up: Common use-cases
+
+10.15 Support of several Emacs-window-managers
+==============================================
+
+There are several window-managers available which offer an easy interface to
+jump between different window-configurations within the same frame. A window
+configuration is the layout of windows and associated buffers within a frame.
+There is always at least one configuration, the current configuration. You
+can create new configurations and cycle through the layouts in either
+direction.  Window configurations are often named or numbered, and you can
+jump to and delete named rsp. numbered configurations.
+
+Without special support by ECB these window-managers would not work in
+combination with ECB!
+
+ECB currently supports the following managers:
+
+   * winring.el: Written by Barry A. Warsaw <bwarsaw@python.org>, available at
+     `http://www.python.org/emacs/winring'
+
+   * escreen.el: Written by Noah Friedman <friedman@splode.com>, available at
+     `http://www.splode.com/~friedman/software/emacs-lisp/#ui'
+
+*IMPORTANT*: With one of these window-managers installed and active you can
+run applications like Gnus, VM or BBDB in the same frame as ECB! Just use
+different window-configurations (winring.el) or escreens (escreen.el) for ECB
+and the other applications. Especially with winring.el you can give every
+configuration a descriptive name like "ECB" or "Gnus"; afterwards you can
+jump to a window-configuration by name!
+
+When you go back to the ECB-window-configuration (winring.el) or the
+ECB-escreen (escreen.el) with any of the special window-manager-commands then
+the state of ECB will be restored exactly as you have left it when going to
+another window-configuration rsp.  escreen. This includes the whole splitting
+state of the edit-area and the visibilty of the ecb-windows and of the
+compile-window!
+
+The rest of this section describes how to enable the special ECB-support for
+these window-managers and how to use them.
+
+10.15.1 Enabling of the support
+-------------------------------
+
+Every support must be enabled explicitly:
+   * winring: Call `ecb-winman-winring-enable-support'. This *MUST* be done
+     *BEFORE* the first call to any winring-command, so also before calling
+     `winring-initialize'!
+
+   * escreen: Call `ecb-winman-escreen-enable-support'. This *MUST* be done
+     *BEFORE* the first call to any escreen-command, so also before calling
+     `escreen-install'!
+
+If a window-manager-support should be enabled autom. after Emacs-start just
+put the following into your `.emacs':
+
+   (ecb-winman-winring-enable-support)
+   (winring-initialize)
+
+   ;; or - if you like escreen more
+
+   (ecb-winman-escreen-enable-support)
+   (escreen-install)
+
+10.15.2 Usage of a window-manager in combination with ECB
+---------------------------------------------------------
+
+After enabling the support of one of the supported window-managers just go on
+as described in the commentary or introduction of the respective
+library-file(s) of the window-manager. Here is a short description:
+
+   * winring: First you have to define how to identify the
+     ECB-window-configuration, i.e. the configuration with activated ECB.
+     This done with the option `ecb-winman-winring-name'. There is always
+     only one window-configurations with name `ecb-winman-winring-name'!
+
+     Then run `winring-initialize'. If ECB is active then the resulting
+     window-configuration is the ECB-window-configuration.  Otherwise you can
+     create the ECB-window-configuration when you first time call
+     `winring-new-configuration' with name equal to
+     `ecb-winman-winring-name'. In general you can run all commands of the
+     winring-library. If you jump to the ECB-window-configuration then ECB
+     will be autom. activated and if you leave the ECB-window-configuration
+     then ECB will autom. deactivated.
+
+   * escreen: First you have to define how to identify the ECB-escreen i.e.
+     that escreen with activated ECB. This done with the option
+     `ecb-winman-escreen-number'. There is always only one escreen with
+     number `ecb-winman-escreen-number'!
+
+     Then run `escreen-install' (deactivates ECB if currently running). After
+     that you can call `escreen-create-screen' and `escreen-goto-screen'(1).
+     These commands autom. activate ECB if creating or selecting the escreen
+     with number `ecb-escreen-number' (default = 1) and autom. deactivate ECB
+     if leaving the ECB-escreen.
+
+10.15.3 Disabling the support
+-----------------------------
+
+There is normally no need to do this but nevertheless it can be done by
+`ecb-winman-escreen-disable-support' rsp.
+`ecb-winman-winring-disable-support'.
+
+---------- Footnotes ----------
+
+(1) And of course all other `escreen-goto-*' commands!
+
+
+File: ecb.info,  Node: Virtual folders in History,  Prev: Window-managers and ECB,  Up: Common use-cases
+
+10.16 Something like virtual folders with the ECB-history
+=========================================================
+
+For example, there is a large project with a huge number of files, and there
+are various tasks in this project (e.g. several different bug-fixing tasks).
+So it could be convenient to group buffers according to various tasks, or with
+other words: something like virtual folders for the buffers. It can be
+fulfiled through using indirect buffers.
+
+See the following example:
+
+   task_1-aaa.pl
+   task_1-bbb.c
+   task_1-ccc.sh
+   task_2-aaa.pl
+   task_2-eee.c
+   task_2-ccc.sh
+   task_3-xxx.java
+   task_3-ccc.sh
+
+This means create indirect buffers(1) with a name-part which can be used for
+grouping together buffers with same name-part (here e.g. task_1- ...
+task_3-). In the example above you would create three indirect buffers for the
+filebuffer ccc.sh because this source is needed in all three tasks, two
+indirect buffers for aaa.pl because it is needed in the task-1 and task-2 and
+so on for the rest of the buffers. Make all this indirect buffers with the
+command `clone-indirect-buffer'(2), which creates real clones means the
+indirect buffers have the same major-mode etc. as the base-buffer (see the
+manual of Emas).
+
+Now remember to the option `ecb-history-make-buckets' which allows a.o.  to
+define a list of regular expressions to bucketize the buffers of the history.
+Use this to make one bucket for each task. So in our example a value
+
+   ("^task_1-.+" "^task_2-.+" "^task_3-.+")
+
+for `ecb-history-make-buckets' would satiesfy our needs.
+
+This option allows to define several criterias for building buckets in the
+history-buffer all the history entries are sorted in (e.g. by major-mode,
+directory, file-extension or regular expressions).
+
+After that the history-window would display something like the following:
+
+   [-] [^task_1-.+]
+    |  task_1-aaa.pl
+    |  task_1-bbb.c
+    `- task_1-ccc.sh
+   [-] [^task_2-.+]
+    |  task_2-aaa.pl
+    |  task_2-eee.c
+    `- task_2-ccc.sh
+   [-] [^task_3-.+]
+    |  task_3-xxx.java
+    `- task_3-ccc.sh
+
+Hopefully this example could give an impression how the combination of usage
+of indirect buffers and bucketizing the history-window can be used for using
+one sources for different sake and grouping together what belongs together.
+
+---------- Footnotes ----------
+
+(1) Remember the most important feature of indirect buffers: Changes made in
+one of them will immediately take effect in all others with the same
+base-buffer
+
+(2) Currently only available with GNU Emacs
+
+
+File: ecb.info,  Node: Elisp programming,  Next: Conflicts and bugs,  Prev: Common use-cases,  Up: Top
+
+11 Entry points for Elisp programmers
+*************************************
+
+This chapter describes how ECB can be used/programmed/driven by an
+Elisp-program. This contains:
+
+* Menu:
+
+* List of variables::           Which variables an Elisp-program can use
+* List of hooks::               All available hooks
+* tree-buffer::                 Full description of the tree-buffer-library
+* Adviced functions::           How to deal with the adviced functions
+* The layout-engine::           Programming new layouts and special windows
+
+
+File: ecb.info,  Node: List of variables,  Next: List of hooks,  Prev: Elisp programming,  Up: Elisp programming
+
+11.1 Variables for Elisp-programs
+=================================
+
+Variables an Elisp-program can use beyond those ones mentioned in *Note The
+layout-engine:::
+
+   * `ecb-source-path-functions'
+
+Look at the documentation of these variables to get a description.
+
+
+File: ecb.info,  Node: List of hooks,  Next: tree-buffer,  Prev: List of variables,  Up: Elisp programming
+
+11.2 Available hooks of ECB
+===========================
+
+The following hooks are available:
+
+   * `ecb-activate-before-new-frame-created-hook'
+
+   * `ecb-activate-before-layout-draw-hook'
+
+   * `ecb-activate-hook'
+
+   * `ecb-after-directory-change-hook'
+
+   * `ecb-before-activate-hook'
+
+   * `ecb-before-deactivate-hook'
+
+   * `ecb-common-tree-buffer-after-create-hook'
+
+   * `ecb-basic-buffer-sync-hook'
+
+   * `ecb-analyse-buffer-sync-hook'
+
+   * `ecb-symboldef-buffer-sync-hook'
+
+   * `ecb-speedbar-buffer-sync-hook'
+
+   * `ecb-eshell-buffer-sync-hook'
+
+   * `ecb-deactivate-hook'
+
+   * `ecb-directories-buffer-after-create-hook'
+
+   * `ecb-hide-ecb-windows-after-hook'
+
+   * `ecb-hide-ecb-windows-before-hook'
+
+   * `ecb-history-buffer-after-create-hook'
+
+   * `ecb-methods-buffer-after-create-hook'
+
+   * `ecb-redraw-layout-after-hook'
+
+   * `ecb-redraw-layout-before-hook'
+
+   * `ecb-show-ecb-windows-after-hook'
+
+   * `ecb-show-ecb-windows-before-hook'
+
+   * `ecb-sources-buffer-after-create-hook'
+
+Look at the documentation of these hooks to get a detailed description.
+
+
+File: ecb.info,  Node: tree-buffer,  Next: Adviced functions,  Prev: List of hooks,  Up: Elisp programming
+
+11.3 The library tree-buffer.el
+===============================
+
+The library tree-buffer.el is an ECB-independent library written completely
+in emacs lisp and can be used also by other applications than ECB. But the
+main purpose of tree-buffer.el is to offer a small but powerful API to create
+new tree-buffers for ECB, add new tree-nodes to a tree-buffer and thus use
+such a tree-buffer to display arbitrary information structured by a tree.
+
+This chapter is for emacs-lisp-programmers and describes how to create a new
+tree-buffer, how to add new tree-nodes to a tree-buffer (includes removing
+and updating already existing tree-nodes) and how to use the offered
+tree-buffer- and tree-node-APIs.
+
+* Menu:
+
+* Introduction::                General description of tree-buffers
+* A new tree-buffer::           How to create a new tree-buffer
+* A new tree-node::             How to add new tree-nodes to a tree-buffer
+* Updating a tree-buffer::      How to update a tree-buffer after changes
+* Tree-buffer keybindings::     Default and customizable keybindings
+* The tree-buffer-API::         All functions for tree-buffers and -nodes
+* Do not with tree-buffer::     Things which are strictly forbidden
+* Tree-buffer How to::          Dealing with special situations
+
+
+File: ecb.info,  Node: Introduction,  Next: A new tree-buffer,  Prev: tree-buffer,  Up: tree-buffer
+
+11.3.1 General description of tree-buffers
+------------------------------------------
+
+This subchapter is a general introduction in the main concepts of a
+tree-buffer.
+
+11.3.1.1 What is a tree-buffer?
+...............................
+
+A "tree-buffer" is meant to display certain informations (e.g. a
+directory-tree) in a tree-structure consisting of "tree-nodes".  Every line
+in a tree-buffer displays exactly one tree-node. Each node has exactly one
+parent-node and can have any arbitrary number of "children"-nodes. If a
+tree-node has no children then it is called a "leaf". A tree-node contains
+several "slots" wheras the most important ones are the "name",
+"displayed-name" and "data". See *Note A new tree-node:: for a detailed
+explanation.
+
+The difference between a natural tree like a fir and a tree-buffer is that
+the root(-node) of a tree-buffer is not visible but only its children. In the
+example below the nodes parent-node-1 and parent-node-2 are the children of
+the invisible root-node. Each tree-buffer has exactly one root-node which is
+created automatically by `tree-buffer-create'.
+
+If a tree-node contains at least one child it is displayed with a special
+expand/collapse-symbol (see the example below). This symbol allows expanding
+(rsp. collapsing) the tree-node wheras expanding means to display the
+children-nodes and collapsing means to hide the childrens of a tree-node.
+
+Here is an example of a tree-buffer:
+
+   <root-node>  ------------------------[root-node (invisible)]
+       [+] <parent-node-1>  -------.
+       [-] <parent-node-2>  -------|
+           [-] <expanded>  --------|
+               <leaf-node-1>  -----|
+               <leaf-node-2>  -----|-----[tree-nodes]
+               <leaf-node-3>  -----|
+               <leaf-node-4>  -----|
+           [+] <collapsed>  -------“
+            |
+            `-----------------[expand/collapse-symbol]
+
+In most cases an action is triggered when clicking with the mouse onto a
+tree-node(1) (e.g. clicking onto "leaf-node-1" or "parent-node-1" in the
+example above). Which action is triggered by which key depends on what you
+specify at creation-time of the tree-buffer - see *Note A new tree-buffer::
+for details.
+
+The creation-interface of a tree-buffer allows defining special popup-menus
+when clicking with the right mouse-button (of course also possible via
+keyboard, see *Note Tree-buffer keybindings::) onto a tree-node (e.g. some
+senseful actions possible for directory-nodes like grepping this directory or
+performing version-control actions for this directory or something else).
+
+11.3.1.2 General recipe for a tree-buffer
+.........................................
+
+The following sequence of tasks is the general recipe for a tree-buffer
+beginning from creation and ending with the display.
+
+  1. Create the tree-buffer Creating a new tree-buffer has to be done with
+     `tree-buffer-create' for non ECB-tree-buffers and with the macro
+     `defecb-tree-buffer-creator' when the tree-buffer should be used as an
+     ECB-tree-buffer, so it is an ECB-window. See *Note A new tree-buffer::
+     for all details.
+
+  2. Add tree-nodes to the tree-buffer Adding nodes to the new tree-buffer
+     (means make the new tree-buffer the current buffer and call
+     `tree-node-new' for a new tree-node (note that a root-node for this
+     tree-buffer has been autom. created by `tree-buffer-create'!). The first
+     tree-node you add to a tree-buffer must have always the root-node
+     (avaliable via `tree-buffer-get-root') as parent-node. The next nodes
+     can have either one of the fromerly added nodes or the root-node too. All
+     tree-nodes haveing the root-node as parent will be displayed at the
+     toplevel of the tree-buffer. See *Note A new tree-node:: for all details.
+
+  3. Display the tree-buffer with current nodes and state When you are
+     finished building up the tree-node-structure call `tree-buffer-update'
+     to display the current tree-structure (again after making the
+     tree-buffer the current-buffer). See *Note Updating a tree-buffer:: for
+     all details.
+
+*IMPORTANT*: First a call of `tree-buffer-update' updates the *display* of a
+tree-buffer, means shows all the tree-nodes in an emacs-buffer! Neither
+creating a tree-buffer nor adding tree-nodes display anything; this just
+builds the internal tree-structure.
+
+*IMPORTANT*: See *Note Programming special windows:: for details about
+programming ECB-windows (special windows) regardless if they were build as
+tree or not. There you can find a.o. how to automatically synchronizing a
+special window with the current edit-buffer.
+
+---------- Footnotes ----------
+
+(1) Of course using the keyboard is also possible, see *Note Tree-buffer
+keybindings::.
+
+
+File: ecb.info,  Node: A new tree-buffer,  Next: A new tree-node,  Prev: Introduction,  Up: tree-buffer
+
+11.3.2 How to create a new tree-buffer
+--------------------------------------
+
+The creator-function for a new tree-buffer depends on the fact if the new
+tree-buffer should be used as an ECB-window or not. For a new ECB-window the
+macro `defecb-tree-buffer-creator' has to be used, otherwise the function
+`tree-buffer-create'. In the end both methods use `tree-buffer-create'
+because the BODY-argument of `defecb-tree-buffer-creator' must contain a call
+to this function!.
+
+This section describes all arguments of `tree-buffer-create'.
+
+Except the first argument NAME all arguments are key-arguments of the form
+:arg-name arg-value, so for example a call looks like
+
+   (tree-buffer-create <buffer-name> :frame <frame-object> ...).
+
+These key-arguments (all except the first argument `NAME') can be arranged in
+any arbitrary order but all of them are not-optional! The key-arg-name is
+always a : followed by the lowercase version of the mentioned argument below
+(e.g. `FRAME' -> :frame, `MOUSE-ACTION-TRIGGER' -> :mouse-action-trigger).
+
+Here is a description of the arguments of `tree-buffer-create' - also
+available as docstring for this function (via `C-h f'). The description below
+contains also some examples for complex-arguments!
+
+``NAME''
+     Buffername of the new tree-buffer.
+
+`FRAME'
+     Frame in which the tree-buffer is displayed and valid. All key-bindings
+     and interactive functions of the tree-buffer work only if called in
+     FRAME otherwise nothing is done!
+
+`MOUSE-ACTION-TRIGGER'
+     When a mouse-action is triggered. Allowed values: `button-release' and
+     `button-press'.
+
+`IS-CLICK-VALID-FN'
+     `tree-buffer-create' rebinds `mouse-1', `mouse-2', `RET' (and `TAB') and
+     also in combination with shift and control (not with `TAB').
+     IS-CLICK-VALID-FN is called first if a node or an expand-symbol is
+     clicked. This function is called with five arguments:
+
+        - mouse-button: The clicked mouse-button or RET or TAB (0 = RET or
+          TAB, 1 = mouse-1, 2 = mouse 2)
+
+        - shift-pressed: Non nil if the SHIFT-key was pressed during
+          mouse-click or RET.
+
+        - control-pressed: Non nil if the CONTROL-key was pressed during
+          mouse-click or RET.
+
+        - meta-pressed: Non nil if the META-key was pressed during
+          mouse-click or RET.
+
+        - tree-buffer-name: The buffer-name of the tree-buffer where the node
+          has been clicked.
+
+     The function must return not nil iff exactly this click/hit is accepted.
+     If the function returns nil then really nothing is done by the
+     tree-buffer after this click/hit!
+
+     Here is an example (call `C-h f' to see what it does) for this
+     callback-function:
+
+        (defun ecb-interpret-mouse-click (mouse-button
+                                          shift-pressed
+                                          control-pressed
+                                          meta-pressed
+                                          tree-buffer-name)
+          (if (eq mouse-button 0)
+              (list (if control-pressed 2 1) shift-pressed meta-pressed
+                    'keyboard)
+            (if (and (not (eq mouse-button 1)) (not (eq mouse-button 2)))
+        	nil
+              (case ecb-primary-secondary-mouse-buttons
+                (mouse-1--mouse-2
+                 (if control-pressed
+                     nil
+                   (list mouse-button shift-pressed meta-pressed 'mouse)))
+                (mouse-1--C-mouse-1
+                 (if (not (eq mouse-button 1))
+                     nil
+                   (list (if control-pressed 2 1) shift-pressed meta-pressed
+                         'mouse)))
+                (mouse-2--C-mouse-2
+                 (if (not (eq mouse-button 2))
+                     nil
+                   (list (if control-pressed 2 1) shift-pressed meta-pressed
+                         'mouse)))
+                (otherwise nil)))))
+
+     This example would be passed as parameter as follows:
+
+        (tree-buffer-create "myname"
+                            :is-click-valid-fn 'ecb-interpret-mouse-click
+                            ...)
+
+`NODE-SELECTED-FN'
+     Function to call if a node has been selected. This function is called
+     with the following parameters:
+
+        - node: The selected node
+
+        - mouse-button (0 = RET, 1 = mouse-1, 2 = mouse 2)
+
+        - shift-pressed
+
+        - control-pressed
+
+        - meta-pressed
+
+        - tree-buffer-name
+
+     For the last four arguments see the description above. This function has
+     to ensure that the expandable- and expanded-state of the selected node
+     is correct after returning.
+
+     Here is an example (call `C-h f' to see what it does) for this
+     callback-function:
+
+        (defun ecb-tree-buffer-node-select-callback (node
+        					     mouse-button
+        					     shift-pressed
+        					     control-pressed
+                                                     meta-pressed
+        					     tree-buffer-name)
+          (let* ((ecb-button-list (ecb-interpret-mouse-click mouse-button
+        						     shift-pressed
+        						     control-pressed
+                                                             meta-pressed
+        						     tree-buffer-name))
+        	 (ecb-button (nth 0 ecb-button-list))
+        	 (shift-mode (nth 1 ecb-button-list))
+                 (meta-mode (nth 2 ecb-button-list))
+                 (keyboard-p (equal (nth 3 ecb-button-list) 'keyboard))
+                 (maximized-p (ecb-buffer-is-maximized-p tree-buffer-name)))
+            ;; now we dispatch to the right action
+            (when ecb-button-list
+              (cond ((ecb-string= tree-buffer-name ecb-directories-buffer-name)
+        	     (ecb-directory-clicked node ecb-button nil shift-mode
+                                            meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-sources-buffer-name)
+        	     (ecb-source-clicked node ecb-button nil shift-mode
+                                         meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-history-buffer-name)
+        	     (ecb-history-clicked node ecb-button nil shift-mode
+                                          meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-methods-buffer-name)
+        	     (ecb-method-clicked node ecb-button nil shift-mode
+                                         meta-mode))
+        	    ((ecb-string= tree-buffer-name ecb-analyse-buffer-name)
+        	     (ecb-analyse-node-clicked node ecb-button nil shift-mode
+                                               meta-mode))
+        	    (t nil)))))
+
+     This example would be passed as parameter as follows:
+
+        (tree-buffer-create "myname"
+                            :node-selected-fn 'ecb-tree-buffer-node-select-callback
+                            ...)
+
+     *IMPORTANT*: This callback must not modify the slot EXPANDED of the
+     passed node because this is done automatically by the
+     tree-buffer-library!
+
+`NODE-EXPANDED-FN'
+     Function to call if a node is expandable, point stays onto the
+     expand-symbol and node is not already expanded. This function is called
+     with the following parameters:
+
+        - node: The selected node
+
+        - mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+
+        - shift-pressed
+
+        - control-pressed
+
+        - meta-pressed
+
+        - tree-buffer-name
+
+     This function should add all children nodes to this node if not already
+     done (if possible). This function has to ensure that the expandable- and
+     expanded state of the selected node is correct after returning!
+
+     *IMPORTANT*: This callback must not modify the slot EXPANDED of the
+     passed node because this is done automatically by the
+     tree-buffer-library!
+
+`NODE-COLLAPSED-FN'
+     Function to call if a node is expandable, point stays onto the
+     expand-symbol and node is already expanded. This function is called with
+     the following parameters:
+
+        - node: The selected node
+
+        - mouse-button (0 = TAB, 1 = mouse-1, 2 = mouse 2)
+
+        - shift-pressed
+
+        - control-pressed
+
+        - meta-pressed
+
+        - tree-buffer-name
+
+     This function is only a callback to inform the owner/user of this
+     tree-buffer that this node has been collapsed. This function must not
+     modify the expandable- or expanded state of the selected node!
+
+     Often a sensefull value for this parameter is the function `ignore'.
+
+     *IMPORTANT*: This callback must not modify the slot EXPANDED of the
+     passed node because this is done automatically by the
+     tree-buffer-library!
+
+`NODE-MOUSE-OVER-FN'
+     Function to call when the mouse is moved over a node. This function is
+     called with three arguments: NODE, WINDOW, NO-PRINT, each of them
+     related to the current tree-buffer. If NO-PRINT is nil then the function
+     must print the text itself in any manner. This function must always
+     return the text which either is printed by the function itself or by the
+     caller (if NO-PRINT is not nil). The current buffer for this function is
+     the tree-buffer itself. With XEmacs this function is only called if the
+     tree-buffer track-mouse mechanism is activated (see the function
+     `tree-buffer-activate-follow-mouse'). With GNU Emacs >= 21 this function
+     is called by the `help-echo' property added to each node.
+
+     Here is an example (call `C-h f' to see what it does) for this
+     callback-function:
+
+        (defun ecb-mouse-over-analyse-node (node &optional window no-message
+                                                 click-force)
+          (let ((str (when (or click-force
+                               (ecb-show-minibuffer-info
+                                node window
+                                (car ecb-analyse-show-node-info)))
+                       (if (equal (cdr ecb-analyse-show-node-info)
+                                  'full-info)
+                           (ecb-analyse-gen-tag-info
+                            (car (tree-node->data node)))
+                         (tree-node->name node)))))
+            (prog1 str
+              (unless no-message
+                (ecb-nolog-message str)))))
+
+`MOUSE-HIGHLIGHT-FN'
+     If nil then in this tree-buffer no node is highlighted when the mouse
+     moves over it. If t then each node is highlighted when the mouse moves
+     over it. If a function then it is called with the node as argument and
+     if it returns not nil then the node will be highlighted when the mouse
+     moves over it - otherwise no highlighting takes place.
+
+`NODE-DATA-EQUAL-FN'
+     Function used by the tree-buffer to test if the data of two tree-nodes
+     are equal. The function is called with two args: The DATA-slots of the
+     two tree-nodes (see *Note A new tree-node:: for details about the
+     data-slots).
+
+     Here is an example (call `C-h f' to see what it does) for this
+     callback-function:
+
+        (defun ecb-analyse-compare-node-data (left right)
+          "Return not nil when LEFT and RIGHT are identical node-datas."
+          (and (equal (nth 2 left) (nth 2 right))
+               (ecb-compare-methods-buffer-node-data (car left)
+                                                     (car right))))
+
+     Often a suitable value for this parameter is `equal'.
+
+`MAYBE-EMPTY-NODE-TYPES'
+     Nil or a list of node-types (a node-type is an integer which must be set
+     with `tree-node-new'). Nodes with one of these types are treated as
+     empty if they are not expandable (i.e. they have no children) and will
+     be displayed with the empty-symbol ([x]); for other nodes see next
+     argument.
+
+`LEAF-NODE-TYPES'
+     Nil or a list of node-types (see above). Nodes with one of these types
+     are treated as leafs and will be displayed with the leaf-symbol (*).
+
+     Summary for MAYBE-EMPTY-NODE-TYPES and LEAF-NODE-TYPES:
+
+        * Expandable nodes will always be displayed either with the open- or
+          with the close-symbol.
+
+        * Not-expandable nodes with a node-type contained in
+          MAYBE-EMPTY-NODE-TYPES will be displayed with the empty-symbol.
+
+        * Not-expandable nodes with a node-type contained in LEAF-NODE-TYPES
+          will be displayed with the leaf-symbol.
+
+        * All other nodes will be displayed with no symbol just with correct
+          indentation.
+
+`MENU-CREATOR'
+     Nil or function which has to return nil or a list of conses, each cons
+     for a known node-type of this tree-buffer (the node-type of a node is an
+     integer). Example: ((0 . menu-for-type-0) (1 . menu-for-type-1)).  The
+     cdr of a cons must be a menu in the same format
+     `tree-buffer-create-menu' expects as argument - see the documentation of
+     this function for details. This function gets two arguments: The name of
+     the tree-buffer and the node for which a popup-menu should be opened.
+
+     Here is an example for such a menu-creator-callback:
+
+        (defconst ecb-analyse-nodedata-tag-with-pos 0)
+        (defconst ecb-analyse-nodedata-tag-without-pos 1)
+        (defconst ecb-analyse-nodedata-no-tag 2)
+
+        (defconst ecb-analyse-nodetype-bucket 0)
+        (defconst ecb-analyse-nodetype-context 1)
+        (defconst ecb-analyse-nodetype-arguments 2)
+        (defconst ecb-analyse-nodetype-completions 3)
+        (defconst ecb-analyse-nodetype-localvars 4)
+        (defconst ecb-analyse-nodetype-prefix 5)
+        (defconst ecb-analyse-nodetype-assignee 6)
+        (defconst ecb-analyse-nodetype-function 7)
+        (defconst ecb-analyse-nodetype-function-arg 8)
+
+        (defun ecb-analyse-create-menu (node)
+          "Return a popup-menu suitable for NODE."
+          (let* ((data (tree-node->data node))
+                 (tag-p (not (equal (nth 1 data) ecb-analyse-nodedata-no-tag)))
+                 (tag-with-pos-p (equal (nth 1 data)
+                                        ecb-analyse-nodedata-tag-with-pos))
+                 (nodetype (nth 2 data)))
+            (delq nil (list (if (equal nodetype ecb-analyse-nodetype-completions)
+                                '(ecb-analyse-complete "Complete"))
+                            (if tag-p
+                                '(ecb-analyse-show-tag-info "Show tag info"))
+                            (if tag-with-pos-p
+                                '(ecb-analyse-jump-to-tag "Jump to tag"))))))
+
+        (defun ecb-analyse-menu-creator (tree-buffer-name node)
+          "Creates the popup-menus for the analyse-buffer."
+          (let ((nodetype (tree-node->type node)))
+            (unless (equal nodetype ecb-analyse-nodetype-bucket)
+              (mapcar (function (lambda (type)
+                                  (cons type (ecb-analyse-create-menu node))))
+                      `(,ecb-analyse-nodetype-context
+                        ,ecb-analyse-nodetype-arguments
+                        ,ecb-analyse-nodetype-completions
+                        ,ecb-analyse-nodetype-localvars
+                        ,ecb-analyse-nodetype-prefix
+                        ,ecb-analyse-nodetype-assignee
+                        ,ecb-analyse-nodetype-function
+                        ,ecb-analyse-nodetype-function-arg)))))
+
+     This example would be passed as parameter as follows:
+
+        (tree-buffer-create "myname"
+                            :menu-creator 'ecb-analyse-menu-creator
+                            ...)
+
+`MENU-TITLES'
+     Nil or a list conses, each cons for a node-type. See MENU-CREATOR. The
+     cdr of a cons must be either a string or a function which will be called
+     with current node under point and must return a string which is
+     displayed as the menu-title.
+
+`MODELINE-MENU-CREATOR'
+     Nil or a function which has to return nil or a menu in the same format
+     `tree-buffer-create-menu' expects as argument - see the documentation of
+     this function for details. This function gets one argument: The name of
+     the tree-buffer. If the function returns a menu then this menu will be
+     displayed when the user clicks with mouse-button 3 at the modeline of
+     the tree-buffer. The menu-title will be "Tree-buffer modeline-menu".
+
+`STICKY-PARENT-P'
+     If not nil then with GNU Emacs >= 21 the tree-buffer displays in its
+     header-line the unvisible parent-node if there is any. sticky-parent-fn
+     is used to get this parent node.
+
+`STICKY-INDENT-STRING'
+     String used for indendation of the sticky node in the header-line so it
+     matches the tree-display.
+
+`STICKY-PARENT-FN'
+     Function used to get that parent node which should be sticky. This
+     function gets as argument a node and should either return nil (if there
+     is not suitable parent node) or a node. This node will be displayed as
+     sticky in the header-line of the tree-buffer. If nil is returned and
+     sticky-parent-p is not nil then just the node under the header-line is
+     displayed. If this argument is nil and sticky-parent-p is not nil then
+     always the next unvisible parent node will be displayed in the
+     header-line.
+
+`TRUNC-LINES'
+     Should lines in this tree buffer be truncated (not nil).
+
+`READ-ONLY'
+     Should the treebuffer be read-only (not nil).
+
+`TREE-INDENT'
+     Spaces subnodes should be indented. Ignored if TREE-STYLE is `image'
+     (see below).
+
+`INCR-SEARCH-P'
+     Should the incremental search be enabled in the tree-buffer. Three
+     choices: `prefix', `substring', `nil'. See the command
+     `tree-buffer-incremental-node-search'.
+
+`INCR-SEARCH-ADDITIONAL-PATTERN'
+     Every search-pattern is prefixed with a regexp to jump over not
+     important stuff of a displayed node-name at incr. search.. This is per
+     default: beginning spaces and guide characters (|`-) and all
+     expand/collapse-buttons [+], [x], rsp. [-]!
+
+     If this argument is not nil then it must be a cons-cell where car is a
+     string which should be a regexp-pattern which is added to the
+     basic-prefix pattern (see above) and both of them prefix the
+     incr-search-pattern. The cdr is the number of subexpressions in this
+     additoonal pattern.
+
+`ARROW-NAVIGATION'
+     If not nil then a smart navigation with arrow keys is offered:
+
+        - Left-arrow: If node is expanded then it will be collapsed otherwise
+          point jumps to the next "higher" node in the hierarchical tree
+          (higher means the next higher tree-level or - if no higher level
+          available - the next higher node on the same level).
+
+        - Right-arrow: If node is not expanded then it will be expanded.
+
+          Onto a not expandable node the horizontal arrow-keys go one
+          character in the senseful correct direction.
+
+        - Up- and down-key: Point jumps to the first character of the
+          previous (up) rsp. next node (down). "First" character means either
+          the first character of the expand-symbol (in case
+          EXPAND-SYMBOL-BEFORE-P is not nil) or of the displayed node-name.
+          Or with other words: The first non-indentation and non-guide-line
+          (see TREE-STYLE) character of a node.
+
+`HOR-SCROLL-STEP'
+     Number of columns a hor. scroll in the tree-buffer should scroll. If not
+     nil then `M-mouse-1' and `M-mouse-2' scroll left and right and also
+     `M-<left-arrow>' and `M-<right-arrow>'. Ignored with XEmacs.
+
+`DEFAULT-IMAGES-DIR'
+     Full path where the default images for the tree-buffer can be found.  It
+     should contain an image for every name of `tree-buffer-tree-image-names'.
+
+`ADDITIONAL-IMAGES-DIR'
+     Additional image-dir which should be searched first for images needed
+     for current tree-buffer. If the image can not be found in this directory
+     then DEFAULT-IMAGES-DIR is searched. If the image can't even found here
+     the related ascii-symbol is used.
+
+`IMAGE-FILE-PREFIX'
+     Common prefix for all image-files for this tree-buffer, e.g. "ecb-".
+
+`TREE-STYLE'
+     There are three different styles available: Image-style (value `image'):
+     Very nice and modern because image-icons are used to display the
+     tree-buffer. For this style the arguments TREE-INDENT and
+     EXPAND-SYMBOL-BEFORE-P have no effect.
+
+     Ascii-style with guide-lines (value `ascii-guides') and ascii-style
+     without guidelines (value `ascii-no-guides'. See *Note Tree-buffer
+     styles:: for details about the tree-styles.
+
+     Both ascii-styles are affected by the args TREE-INDENT and
+     EXPAND-SYMBOL-BEFORE-P.
+
+`ASCII-GUIDE-FACE'
+     If TREE-STYLE is `ascii-guides' then this defines the face the guides
+     should be displayed with.
+
+`TYPE-FACER:'
+     Nil or a list of one or more conses, each cons for a node-type (a
+     node-type is an integer which must be set with `tree-node-new').  The
+     cdr of a cons can be:
+
+        - a face-symbol
+
+        - a function-symbol which gets two arguments (see
+          `tree-buffer-insert-text'). This function can do anything, but
+          normally it should face a tree-node.
+
+        - the symbol t. Then the tree-buffer assumes that the node-text is
+          already faced and therefore it does not face the node, means it does
+          nothing then inserting the node-text, if the tree-buffer is updated.
+
+`EXPAND-SYMBOL-BEFORE-P'
+     If not nil then the expand-symbol is displayed before the node-text.
+     Ignored when TREE-STYLE is `image' and Emacs can display images.
+
+`HIGHLIGHT-NODE-FACE'
+     Face used for highlighting current selected node in this tree-buffer.
+
+`GENERAL-FACE'
+     General face in which the whole tree-buffer should be displayed.
+
+`AFTER-CREATE-HOOK:'
+     A function or a list of functions (with no arguments) called directly
+     after creating the tree-buffer and defining it's local keymap. For
+     example such a function can add additional key-bindings for this
+     tree-buffer local keymap (use `local-set-key' for this).
+
+     Here is an example for such a hook:
+
+        (defun ecb-common-after-tree-buffer-create-actions ()
+          "Things which should be performed after creating a tree-buffer.
+        The tree-buffer is the current buffer."
+          (local-set-key (kbd "C-t")
+                         'ecb-toggle-do-not-leave-window-after-select)
+          (if ecb-running-xemacs
+              (define-key modeline-map
+                '(button2up)
+                'ecb-toggle-maximize-ecb-window-with-mouse)
+            (local-set-key [mode-line mouse-2]
+                           'ecb-toggle-maximize-ecb-window-with-mouse)))
+
+`AFTER-UPDATE-HOOK:'
+     A function or a list of functions (with no arguments) called each time
+     after the tree-buffer has been updated via `tree-buffer-update'.
+
+
+Here is an example how to create a tree-buffer (if you want a tree-buffer not
+for ECB then just strip off the `defecb-tree-buffer-creator' and just call
+`tree-buffer-create'):
+
+   (defecb-tree-buffer-creator ecb-create-analyse-tree-buffer
+       ecb-analyse-buffer-name
+     "Create the tree-buffer for analyse-display."
+     (tree-buffer-create
+      ecb-analyse-buffer-name
+      :frame ecb-frame
+      :mouse-action-trigger ecb-tree-mouse-action-trigger
+      :is-click-valid-fn 'ecb-interpret-mouse-click
+      :node-selected-fn 'ecb-tree-buffer-node-select-callback
+      :node-expanded-fn 'ecb-tree-buffer-node-expand-callback
+      :node-collapsed-fn 'ecb-tree-buffer-node-collapsed-callback
+      :node-mouse-over-fn 'ecb-mouse-over-analyse-node
+      :mouse-highlight-fn 'ecb-analyse-node-mouse-highlighted-p
+      :node-data-equal-fn 'ecb-analyse-compare-node-data
+      :maybe-empty-node-types nil
+      :leaf-node-types nil
+      :menu-creator 'ecb-analyse-menu-creator
+      :menu-titles (ecb-analyse-gen-menu-title-creator)
+      :modeline-menu-creator 'ecb-common-tree-buffer-modeline-menu-creator
+      :trunc-lines (ecb-member-of-symbol/value-list
+                    ecb-analyse-buffer-name
+                    ecb-tree-truncate-lines)
+      :read-only t
+      :tree-indent ecb-tree-indent
+      :incr-search-p t
+      :incr-search-additional-pattern nil
+      :arrow-navigation ecb-tree-navigation-by-arrow
+      :hor-scroll-step ecb-tree-easy-hor-scroll
+      :default-images-dir (car ecb-tree-image-icons-directories)
+      :additional-images-dir (ecb-member-of-symbol/value-list
+                              ecb-analyse-buffer-name
+                              (cdr ecb-tree-image-icons-directories)
+                              'car 'cdr)
+      :image-file-prefix "ecb-"
+      :tree-style ecb-tree-buffer-style
+      :ascii-guide-face ecb-tree-guide-line-face
+      :type-facer nil
+      :expand-symbol-before-p ecb-tree-expand-symbol-before
+      :highlight-node-face ecb-analyse-face
+      :general-face ecb-analyse-general-face
+      :after-create-hook (append
+                          (list (lambda ()
+                                  (ecb-common-after-create-actions)))
+                          ecb-common-tree-buffer-after-create-hook
+                          ecb-analyse-buffer-after-create-hook)
+      :after-update-hook nil))
+
+
+File: ecb.info,  Node: A new tree-node,  Next: Updating a tree-buffer,  Prev: A new tree-buffer,  Up: tree-buffer
+
+11.3.3 How to create a new tree-node
+------------------------------------
+
+When a new tree-buffer has been created, then the most senseful
+programming-task is adding some tree-nodes to it.
+
+11.3.3.1 Content of a tree-node
+...............................
+
+A tree-node is an object which stores in special "slots" several data
+necessary to link the node with other nodes, to display the node and to hold
+some associated node-data (e.g. a tag created by the semantic-library).
+
+A tree-node can have the following slots:
+
+`NAME'
+     The name of the node. Regardless how the node is displayed; see
+     SHRINK-NAME and DISPLAYED-NAME.
+
+`TYPE'
+     The type of the node; must currently be an interger! The type is used to
+     classify the nodes, so for example all nodes of a certain type can
+     display the same popup-menu - see `tree-buffer-create' or *Note A new
+     tree-buffer:: which parts of a tree-buffer are distinguished by
+     node-types.
+
+`DATA'
+     The data of the node; This can be any arbitrary emacs-lisp-object.  This
+     slots holds that data asscociated with the node and represented by the
+     node in the tree-buffer. Example: Assume a tree-buffer displaying a
+     directory-tree where each node just displays as its name the name of
+     (sub)directories, but not the full path. The full path is stored in the
+     DATA-slot of a node so when clicking onto this node the asscociated
+     directory can be open for example in a dired-buffer.
+
+`EXPANDABLE'
+     If not nil then the node is expandable means it has children.
+
+`EXPANDED'
+     If not nil then the node is currently expanded, means its children are
+     visible in the tree-buffers as subnodes of the node.
+
+`PARENT'
+     The parent tree-node. This is the link to the father (rsp. mother ;-) of
+     the node. It must be a object of type tree-node!
+
+`CHILDREN'
+     List of children tree-nodes. They must be all objects of type tree-node!
+
+`SHRINK-NAME'
+     Decides if the NAME can be shortened when displayed in a narrow tree
+     buffer window. The following values are valid:
+
+        - `beginning': The NAME is truncated at the beginning so the end is
+          always visible.
+
+        - `end': The NAME is truncated at the end. If the tree-node is
+          EXPANDABLE the name is truncated so that the expand symbol is
+          visible.
+
+        - `nil': The NAME is never truncated. In this case DISPLAYED-NAME is
+          equal to NAME.
+
+`INDENTSTR'
+     Containes the full indentation-string for the node. So a single node can
+     easily be redrawn.
+
+`DISPLAYED-NAME'
+     Contains the current displayed name of the node. The displayed name can
+     be different from the NAME according to the value of SHRINK-NAME.
+
+
+11.3.3.2 Creating a new tree-node and adding it to the tree
+...........................................................
+
+A new tree-node has to be created with the function `tree-node-new'. This
+"constructor" accepts the following parameter: NAME, TYPE, DATA,
+NOT-EXPANDABLE, PARENT and SHRINK-NAME.
+
+For all parameters except NOT-EXPANDABLE the description is available in the
+slot-description in the section above. If NOT-EXPANDABLE is set to not nil
+then the slot EXPANDABLE will be set to `nil'; otherwise to `t'.
+
+`tree-node-new' returns a new tree-node.
+
+The new node can either being added implicitely to the tree via the optional
+PARENT-parameter when calling `tree-buffer-new' or explicitely by first
+creating the new node without setting the parent-node but later setting the
+parent-node via the according accessor (see next section below). Children
+should only being added with `tree-node-add-children' - see next section.
+
+11.3.3.3 Accessing the slots of a tree-node
+...........................................
+
+The section above shows which slots a tree-node have.
+
+A slot with name XXX is getable with the following piece of code:
+
+   (tree-node->xxx <a tree node>)
+
+Here is an example how to get the value of the slot DATA:
+
+   (tree-node->data <a tree node>)
+
+A slot with name XXX is setable with the following piece of code:
+
+   (setf (tree-node->xxx <a tree node>) <new value>)
+
+Again an example with slot DATA which sets this slot to the string
+"~/a_subdir_of_HOME":
+
+   (setf (tree-node->data <a tree node>) "~/a_subdir_of_HOME")
+
+*IMPORTANT*: Adding new children to a node should always being done with the
+function `tree-node-add-children' because this functions encapsulates all the
+necessary stuff needed to add children to a node (mainly adding the children
+itself and setting the node itself as parent for every children).
+
+See *Note The tree-buffer-API:: for the rest of the API available for
+tree-nodes.
+
+
+File: ecb.info,  Node: Updating a tree-buffer,  Next: Tree-buffer keybindings,  Prev: A new tree-node,  Up: tree-buffer
+
+11.3.4 How to update a tree-buffer-display after changes
+--------------------------------------------------------
+
+When finished with adding tree-nodes to the tree-structure you mostly want to
+display the current tree and its state in the buffer/window so a user can see
+the current tree and can use it.
+
+Threre are two ways to update a tree-buffer for display:
+
+  1. Updating the whole tree-buffer:
+
+     This is the most used way to update the tree-buffer display. It's quite
+     simple, just call `tree-buffer-update'. In most cases you want to call
+     it without arguments.
+
+     If you want to display a certain expanded node and as much as possible
+     subnodes of this node then pass this node-object as first argument to
+     `tree-buffer-update'.
+
+     If you do not have the need to display a completely new tree-structure
+     but you want only to display a previously cached display-state then pass
+     this cached-state as second argument to `tree-buffer-update'. See the
+     documentation of this function and also *Note Tree-buffer How to:: for a
+     detailled description how to do this.
+
+  2. Updating only a single node of the tree-buffer:
+
+     Sometimes it can be useful to update only exactly one special node, e.g.
+     when your application codes some node-state in the displayed node-name
+     (e.g. ECB displays the version-control state of a file as part of the
+     related node-name) then it is necessary to update only this node if the
+     state has changed.
+
+     This can be done with the function `tree-buffer-update-node'. For this
+     function the mentioning in this section can be misleading because this
+     function can not only update the node-display but in general the slots
+     NAME, SHRINK-NAME, TYPE, DATA and EXPANDABLE. Do `C-h f' to see the
+     documentation of this function for all details!
+
+
+
+File: ecb.info,  Node: Tree-buffer keybindings,  Next: The tree-buffer-API,  Prev: Updating a tree-buffer,  Up: tree-buffer
+
+11.3.5 Default and customizable keybindings of a tree-buffer
+------------------------------------------------------------
+
+When creating a tree-buffer with `tree-buffer-create' the following keys will
+automatically being bound:
+
+`delete'
+`backspace'
+`home'
+`end'
+`a' (and each other key bound to `self-insert-command')
+     All of these keys are bound to the command
+     `tree-buffer-incremental-node-search' if the argument INCR-SEARCH-P of
+     `tree-buffer-create' was set to not nil.  See the documentation of
+     `tree-buffer-incremental-node-search' for all details.
+
+`RET'
+`C-RET'
+`S-RET'
+`M-RET'
+`C-S-RET'
+`mouse-1'
+`C-mouse-1'
+`S-mouse-1'
+`M-mouse-1'
+`mouse-2'
+`C-mouse-2'
+`S-mouse-2'
+`M-mouse-2'
+     All these keys are bound to an action-dispatcher which works as follows:
+
+     If the callback-function in slot IS-CLICK-VALID-FN of the tree-buffer
+     (*note A new tree-buffer::) returns nil then nothing is done.
+
+     If either `RET' has been hitted or point is as the node-name (i.e.  the
+     user has clicked with the mouse-1/2 at the node-name) then the
+     callback-function in slot NODE-SELECTED-FN is called with the needed
+     arguments (*note A new tree-buffer::).
+
+     If point is at the expand/collape-button then depending on the
+     expansion-state of the node either the callback in slot NODE-EXPANDED-FN
+     or NODE-COLLAPSED-FN is called (for parameters see again *Note A new
+     tree-buffer::).
+
+     *IMPORTANT*: None of these callbacks must modify the slot EXPANDED of
+     the passed node because this is done automatically by the
+     action-dispatcher!
+
+     At the end the dispatcher updates the tree-buffer-display with optimized
+     display of the clicked/selected node - see *Note Updating a
+     tree-buffer::. This means `tree-buffer-update' is called with that node
+     as argument.
+
+`TAB'
+     Depending on the expansion-state of the node either the callback in slot
+     NODE-EXPANDED-FN or NODE-COLLAPSED-FN is called (for parameters see
+     again *Note A new tree-buffer::).
+
+     *IMPORTANT*: None of these callbacks must modify the slot EXPANDED of
+     the passed node because this is done automatically by the
+     action-dispatcher!
+
+     At the end the the tree-buffer-display is updated with optimized display
+     of the clicked/selected node - see *Note Updating a tree-buffer::. This
+     means `tree-buffer-update' is called with that node as argument.
+
+`mouse-3'
+     Activates the popup-menu for the current tree-buffer for current
+     node-type (if defined). See *Note A new tree-buffer:: at argument
+     MENU-CREATOR and MENU-TITLES. These callbacks are called for getting the
+     menu and the menu-title.
+
+`modeline-mouse-3'
+     Activates the popup-menu for the modeline of the current tree-buffer (if
+     defined). See *Note A new tree-buffer:: at argument
+     MODELINE-MENU-CREATOR. This callback is called for getting the
+     modeline-menu.
+
+`M-m'
+     This key is bound to the command `tree-buffer-show-node-menu-keyboard':
+     Activates the popup-menu of current tree-buffer for current node-type
+     via keyboard. If called with a prefix-arg then the library `tmm.el' is
+     used for displaying the popup-menu - ignored with XEmacs.
+
+`<up>'
+`<down>'
+`<left>'
+`<right>'
+     These keys are bound to the command `tree-buffer-arrow-pressed' which
+     implements the smart arrow-key-navigation described in *Note A new
+     tree-buffer:: at argument ARROW-NAVIGATION.
+
+
+In addition to these automatically bound keys you can add further keybindings
+to the local-keymap of the tree-buffer with the parameter AFTER-CREATE-HOOK
+of `tree-buffer-create'. See *Note A new tree-buffer:: for an example which
+binds `C-t' in this hook.
+
+
+File: ecb.info,  Node: The tree-buffer-API,  Next: Do not with tree-buffer,  Prev: Tree-buffer keybindings,  Up: tree-buffer
+
+11.3.6 All functions available for tree-buffers and tree-nodes
+--------------------------------------------------------------
+
+This chapter lists the complete API available for tree-buffers and tree-nodes.
+
+*IMPORTANT*: These are the only functions and macros of tree-buffer.el you
+are allowed to use for programming with tree-buffers and tree-nodes. If you
+use other - not here listed - functions, macros or variables of
+tree-buffer.el then you run the risk of unwanted side-effects or
+program-behaviors!
+
+11.3.6.1 The API for a tree-buffer:
+...................................
+
+See the documentation of these functions (e.g. via `C-h f') to get the
+details how to use it.
+
+   * `tree-buffer-add-image-icon-maybe'
+
+   * `tree-buffer-find-image'
+
+   * `tree-buffer-create'(1)
+
+   * `tree-buffer-defpopup-command'
+
+   * `tree-buffer-destroy'(2)
+
+   * `tree-buffer-empty-p'
+
+   * `tree-buffer-expand-node'
+
+   * `tree-buffer-get-node-at-point'
+
+   * `tree-buffer-node-data-equal-p'
+
+   * `tree-buffer-recenter'
+
+   * `tree-buffer-highlight-node-by-data/name'
+
+   * `tree-buffer-find-displayed-node-by-data/name'
+
+   * `tree-buffer-remove-highlight'
+
+   * `tree-buffer-remove-node'
+
+   * `tree-buffer-clear-tree'
+
+   * `tree-buffer-displayed-nodes-copy'
+
+   * `tree-buffer-search-displayed-node-list'
+
+   * `tree-buffer-number-of-displayed-nodes'
+
+   * `tree-buffer-get-data-store'
+
+   * `tree-buffer-set-data-store'
+
+   * `tree-buffer-get-root'
+
+   * `tree-buffer-set-root'
+
+   * `tree-buffer-update'
+
+   * `tree-buffer-update-node'
+
+11.3.6.2 The API for a tree-node
+................................
+
+See the documentation of these functions (e.g. via `C-h f') to get the
+details how to use it.
+
+   * `tree-node-add-children'
+
+   * `tree-node-linelength'
+
+   * `tree-node-map-subtree'
+
+   * `tree-node-new'
+
+   * `tree-node-new-root'
+
+   * `tree-node-remove-child'
+
+   * `tree-node-remove-child-by-data/name'
+
+   * `tree-node-find-child-by-data/name'
+
+   * `tree-node-find-child-by-name'
+
+   * `tree-node-search-subtree-by-data/name'
+
+   * `tree-node-sort-children'
+
+   * `tree-node-toggle-expanded'
+
+In addition to these functions the tree-node API contains all accessors for a
+tree-node which are described in *Note A new tree-node::.
+
+---------- Footnotes ----------
+
+(1) If the tree-buffer should be used by ECB then you must use
+`defecb-tree-buffer-creator' - see the documentation!
+
+(2) Not needed when `defecb-tree-buffer-creator' has been used for creation.
+
+
+File: ecb.info,  Node: Do not with tree-buffer,  Next: Tree-buffer How to,  Prev: The tree-buffer-API,  Up: tree-buffer
+
+11.3.7 Things which are strictly forbidden
+------------------------------------------
+
+Variable `tree-buffers': Only for internal use! It contains all tree-buffers
+of current Emacs-instance, means *all* tree-buffers of *all* applications
+which uses currently tree-buffers. Every application must store its own
+collection of tree-buffers in an own variable! For example: ECB stores its
+tree-buffer set in `ecb-tree-buffers'!
+
+Variable `tree-buffer-displayed-nodes': Only for internal use!  Contains all
+the current visible nodes of current tree-buffer in top-to-bottom order. This
+variable is buffer-local in each tree-buffer! Do not use it directly! When
+you want to cache the current display, then see *Note Tree-buffer How to::
+how to do this.
+
+*IMPORTANT*: An application may only use the API tree-buffer.el provides but
+no internal variables - see *Note The tree-buffer-API::!
+
+
+File: ecb.info,  Node: Tree-buffer How to,  Prev: Do not with tree-buffer,  Up: tree-buffer
+
+11.3.8 How to deal with certain programming-requirements
+--------------------------------------------------------
+
+This chapter describes in detail how to solve certain programming-challenges
+with tree-buffers.
+
+11.3.8.1 Caching the current tree-buffer display
+................................................
+
+Sometimes it can be useful or important to cache the current display of a
+tree-buffer and display later exactly this cached display-state.  Here is how
+to do this:
+
+  1. Caching the display: You have to do two tasks: First store the current
+     internal structure of the tree-buffer; you must do this with the function
+     `tree-buffer-displayed-nodes-copy'. Then store the buffer-contents of
+     that tree-buffer you want to cache; you can do this for example with
+     `buffer-substring'. For both tasks you must make the tree-buffer the
+     current-buffer.
+
+  2. Displaying a previous tree-buffer-cache: Make the tree-buffer the
+     current buffer, call `tree-buffer-update' and pass as second argument
+     CONTENT the data you have stored in step 1. See the documentation of
+     `tree-buffer-update' for details.
+
+     Here is an example:
+
+        (tree-buffer-update
+          nil
+          (cons (nth 2 cache-elem) ;; the stored buffer-string
+                (nth 1 cache-elem) ;; the stored tree-structure
+          )))
+
+
+File: ecb.info,  Node: Adviced functions,  Next: The layout-engine,  Prev: tree-buffer,  Up: Elisp programming
+
+11.4 How to deal with the adviced functions
+===========================================
+
+ECB needs a bunch of advices so ECB can work correctly. ECB has a powerful
+advice-backbone which allows defining sets of adviced functions whereas a set
+means, that all advices of a certain set are always enabled or disabled
+together.
+
+For this ECB contains four macros:
+
+   - `defecb-advice-set'
+
+   - `defecb-advice'
+
+   - `ecb-with-original-adviced-function-set'
+
+   - `ecb-with-ecb-advice' (for this one see below)
+
+For a detailed explanation of each macro read the documentation with
+`describe-function'!
+
+An advice in ECB must not being defined by `defadvice' but only with
+`defecb-advice' which in turn needs a previously defined advice-set defined
+by `defecb-advice-set'.
+
+So ECB has always full control of all advices. For example ECB automatically
+disables all advices of all advice-sets at load-time of ECB and also at
+deactivation time of ECB. So you can be sure that after deactivating ECB all
+ecb-advices are deactivated/disabled too.
+
+In addition to the four macros above ECB offers two further macros for
+running code with disabled some ecb-advices:
+
+   - `ecb-with-original-basic-functions'
+
+   - `ecb-with-original-permanent-layout-functions'
+
+The advice set `ecb-basic-adviced-functions' contains most of the
+ecb-advices. See the contents of this variable to see which advices are
+contained in this set. Use `ecb-with-original-basic-functions' when you want
+evaluating elisp-code with disabled basic-advices.
+`ecb-with-original-basic-functions' is only a shortcut for
+`ecb-with-original-adviced-function-set' called for the
+`ecb-basic-adviced-functions'-set.
+
+Same for `ecb-with-original-permanent-layout-functions' which is a shortcut
+for the advice-set `ecb-permanent-adviced-layout-functions'.
+
+Last but not least ECB contains an advice-set `ecb-always-disabled-advices'.
+These advices are always disabled.  This advice-set can not be enabled by
+`ecb-enable-advices' but such an advice has to be activated 'on demand' by
+the caller. Such an advice must be used with the macro `ecb-with-ecb-advice'
+(see the docstring) and is also enabled within the BODY of the macro-call.
+
+ECB contains some more advice-sets but don't bother about it.
+
+*Please Note*: See the value of `ecb-adviced-function-sets' which advice-sets
+are defined and see `ecb-adviced-functions' for an overview for all adviced
+functions.
+
+
+File: ecb.info,  Node: The layout-engine,  Prev: Adviced functions,  Up: Elisp programming
+
+11.5 How to program new layouts and new special windows
+=======================================================
+
+There are two aspects concerning this topic:
+
+  1. Programming a new layout which contains several special ECB-windows like
+     directories, sources, methods, history or other special windows and
+     arranging them in a new outline.
+
+  2. Creating complete new special windows (e.g. a local-variable window for
+     a graphical debugger like JDEbug of JDEE), adding them to a layout and
+     synchronizing them with the current active edit-window.
+
+The former one covers merely the layout-programming aspect which is explained
+in the first subsection of this chapter whereas the latter one covers all
+aspects of creating new special windows and what is necessary to synchronize
+it with the current active edit-window of ECB. This is explained in the
+second subsection which will refers to the first subsection.
+
+* Menu:
+
+* Programming a new layout::    How to program a new layout
+* Programming special windows:: Aspects of programming special windows
+* Possible layout-outlines::    The wide range of possible layouts
+* The layout-engine API::       The complete layout-engine API
+
+
+File: ecb.info,  Node: Programming a new layout,  Next: Programming special windows,  Prev: The layout-engine,  Up: The layout-engine
+
+11.5.1 How to program a new layout
+----------------------------------
+
+If you just want creating a new layout with the standard ECB-windows like
+directories, sources, methods, history and speedbar it's is strongly
+recommended to define the new layout interactively with the command
+`ecb-create-new-layout' (*note Creating a new ECB-layout::).
+
+If you want creating a new layout and if this layout should contain other
+special windows than the standard ECB-windows then it's still recommended to
+define this layout interactively with `ecb-create-new-layout' and using the
+option to give the created windows user-defined types. For every user defined
+type you have then just to program the necessary buffer-set function. For all
+the details see *Note Creating a new ECB-layout::.
+
+But if you do not like the interactive way (because you are tough and brave)
+but you want programming the new layout with Elisp then use the macro
+`ecb-layout-define' (the following definition has stripped the prefix "ecb-"
+for better indexing this manual):
+
+ -- Macro: layout-define name type doc &rest create-code
+     Creates a new ECB-layout with name NAME. TYPE is the type of the new
+     layout and is literal, i.e. not evaluated. It can be left, right, top or
+     left-right. DOC is the docstring for the new layout-function
+     "ecb-layout-function-<name>". CREATE-CODE is all the lisp code which is
+     necessary to define the ECB-windows/buffers. This macro adds the layout
+     with NAME and TYPEto the internal variable `ecb-available-layouts'.
+
+     Preconditions for CREATE-CODE:
+       1. Current frame is splitted at least in one edit-window and the
+          "column" (for layout types left, right and left-right) rsp. "row"
+          (for a top layout) for the special ECB-windows/buffers. The width of
+          the "column" rsp. the height of the "row" is always defined with
+          the option `ecb-windows-width' rsp. `ecb-windows-height'.
+          Depending on the value of the option `ecb-compile-window-height'
+          there is also a compile window at the bottom of the frame which is
+          stored in `ecb-compile-window'.
+
+       2. All windows are not dedicated.
+
+       3. Neither the edit-window nor the compile-window (if there is one) are
+          selected for types left, right and top. For type left-right the left
+          column-window is selected
+
+       4. All ECB-advices of the advice-sets `ecb-basic-adviced-functions'
+          and `ecb-permanent-adviced-functions' are disabled.
+
+     Things CREATE-CODE has to do:
+       1. Splitting the ECB-tree-windows-column(s)/row (s.a.) in all the
+          ECB-windows the layout should contain (directories, sources, methods
+          and history). The split must not be done with other functions than
+          `ecb-split-hor' and `ecb-split-ver'! It is recommended not to to
+          use a "hard" number of split-lines or -rows but using fractions
+          between -0.9 and +0.9! Tip: It is recommended to spilt from right to
+          left and from bottom to top or with other words: First create the
+          right-most and bottom-most special windows!
+
+       2. Making each special ECB-window a dedicated window. This can be done
+          with one of the following functions:
+             - `ecb-set-directories-buffer'
+
+             - `ecb-set-sources-buffer'
+
+             - `ecb-set-methods-buffer'
+
+             - `ecb-set-history-buffer'
+
+             - `ecb-set-speedbar-buffer'
+          Each layout can only contain one of each tree-buffer-type!
+
+          In addition to these functions there is a general macro:
+          `defecb-window-dedicator': This macro defines a so called
+          "window-dedicator" which is a function registered at ECB and called
+          by ECB to perform any arbitrary code in current window and makes the
+          window autom. dedicated at the end. This can be used by third party
+          packages like JDEE to create arbitrary ECB-windows besides the
+          standard tree-windows.
+
+          To make a special ECB-window a dedicated window either one of the
+          five functions above must be used or a new
+          "window-dedicator"-function has to be defined with
+          `defecb-window-dedicator' and must be used within the
+          layout-definition.
+
+       3. Every(!) special ECB-window must be dedicated as described in 2.
+
+       4. CREATE-CODE must work correctly regardless if there is already a
+          compile-window (stored in `ecb-compile-window') or not
+          (`ecb-compile-window' is nil).
+
+     Things CREATE-CODE can do or can use:
+       1. The value of `ecb-compile-window' which contains the compile-window
+          (if there is one). Using the values of `ecb-compile-window-height',
+          `ecb-windows-width', `ecb-windows-height'.
+
+     Things CREATE-CODE must NOT do:
+       1. Splitting the edit-window
+
+       2. Creating a compile-window
+
+       3. Deleting the edit-window, the compile-window (if there is any) or
+          the ECB-windows-column(s)/row (see Precondition 1.)
+
+       4. Referring to the value of `ecb-edit-window' because this is always
+          nil during CREATE-CODE.
+
+     Postconditions for CREATE-CODE:
+       1. The edit-window must be the selected window and must not be
+          dedicated and not be splitted.
+
+       2. Every window besides the edit-window (and the compile-window) must
+          be a dedicated window (e.g. a ECB-tree-window).
+
+Use this macro to program new layouts within your `.emacs' or any other file
+which is loaded into your Emacs. After loading the file(s) with all the new
+layout-definitions you can use it by customizing the option `ecb-layout-name'
+to the appropriate name or with the command `ecb-change-layout'.
+
+With the function `ecb-layout-undefine' you can remove a layout from the list
+of available layouts:
+
+ -- Function: layout-undefine name
+     Unbind ecb-layout-function-<NAME> and
+     ecb-delete-window-ecb-windows-<NAME> and remove `NAME' from
+     `ecb-available-layouts'.
+
+Here is an example for a new layout programmed with `ecb-layout-define':
+
+   (ecb-layout-define "my-own-layout" left nil
+     ;; The frame is already splitted side-by-side and point stays in the
+     ;; left window (= the ECB-tree-window-column)
+
+     ;; Here is the creation code for the new layout
+
+     ;; 1. Defining the current window/buffer as ECB-methods buffer
+     (ecb-set-methods-buffer)
+     ;; 2. Splitting the ECB-tree-windows-column in two windows
+     (ecb-split-ver 0.75 t)
+     ;; 3. Go to the second window
+     (other-window 1)
+     ;; 4. Defining the current window/buffer as ECB-history buffer
+     (ecb-set-history-buffer)
+     ;; 5. Make the ECB-edit-window current (see Postcondition above)
+     (select-window (next-window)))
+
+This layout definition defines a layout with name "my-own-layout" which looks
+like:
+
+   -------------------------------------------------------
+   |              |                                      |
+   |              |                                      |
+   |              |                                      |
+   |  Methods     |                                      |
+   |              |                                      |
+   |              |                                      |
+   |              |               Edit                   |
+   |              |                                      |
+   |              |                                      |
+   |--------------|                                      |
+   |              |                                      |
+   |  History     |                                      |
+   |              |                                      |
+   -------------------------------------------------------
+   |                                                     |
+   |                    Compilation                      |
+   |                                                     |
+   -------------------------------------------------------
+
diff --git a/site/ecb-2.40/info-help/ecb.info-3 b/site/ecb-2.40/info-help/ecb.info-3
new file mode 100644
index 0000000..c66fc8e
--- /dev/null
+++ b/site/ecb-2.40/info-help/ecb.info-3
@@ -0,0 +1,1882 @@
+This is ecb.info, produced by makeinfo version 4.8 from ecb.texi.
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* ECB: (ecb).           Emacs Code Browser
+END-INFO-DIR-ENTRY
+
+
+File: ecb.info,  Node: Programming special windows,  Next: Possible layout-outlines,  Prev: Programming a new layout,  Up: The layout-engine
+
+11.5.2 All aspects of programming special windows
+-------------------------------------------------
+
+ECB offers a flexible programmable layout-engine for other packages to
+display their own contents and informations in special ECB-windows. An
+example could be a graphical debugger which offers a special window for
+displaying local variables and another special window for messages from the
+debugger-process (like JDEbug of JDEE(1)).
+
+This section explains all aspects of programming new special windows, adding
+them to a new layout and synchronizing them with edit-window of ECB. This can
+be done best with an easy example which nevertheless covers all necessary
+aspects to be a good example and skeleton for complex tools (like a graphical
+debugger) which want to use the layout-engine of ECB do display their own
+information.
+
+*IMPORTANT*: See *Note tree-buffer:: for a full documentation of the library
+tree-buffer.el which can be used for programming a new special window as a
+tree!
+
+Here comes the example:
+
+11.5.2.1 The outline of the example layout:
+...........................................
+
+   -------------------------------------------------------
+   |Bufferinfo for <filename>:            |[prior]       |
+   |Type: file                            |[next]        |
+   |Size: 23456                           |              |
+   |Modes: rw-rw-rw-                      |              |
+   |-----------------------------------------------------|
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                 edit-window                         |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   |                                                     |
+   -------------------------------------------------------
+   |                                                     |
+   |                 compilation-window                  |
+   |                                                     |
+   -------------------------------------------------------
+
+11.5.2.2 The description of the layout-contents
+...............................................
+
+The top-left window always displays informations about the current buffer in
+the selected edit-window. This window demonstrates how autom. synchronizing a
+special window/buffer of a layout with current edit-window.
+
+The top-right window contains an read-only "action-buffer" and offers two
+buttons which can be used with the middle mouse-button to scroll the
+edit-window. This is not very senseful but it demonstrates how to control the
+edit-window with actions performed in a special window/buffer of a layout.
+
+(If you have not set a compilation-window in `ecb-compile-window-height' then
+the layout contains no persistent compilation window and the other windows
+get a little more place).
+
+11.5.2.3 The example code
+.........................
+
+Now let have us a look at the several parts of the Elisp-program needed to
+program this new example layout. ECB contains a library `ecb-examples.el'
+which contains the full working code of this example. To test this example
+and to play with it you can load this library into Emacs (with `load-library'
+for example) and then calling `ecb-change-layout' (bound to `C-c . lc') and
+inserting "example-layout1" as layout-name. An alternative is calling
+`ecb-examples-activate' and `ecb-examples-deactivate'. For details see file
+`ecb-examples.el'.
+
+The following steps only contain code-skeletons to demonstrate the principle.
+The full working code is available in `ecb-examples.el'.
+
+11.5.2.4 The bufferinfo buffer of the example
+.............................................
+
+The name of the bufferinfo buffer:
+
+   (defconst ecb-examples-bufferinfo-buffer-name " *ECB buffer info*")
+
+Two helper functions for displaying infos in a special buffer:
+
+   (defun ecb-examples-print-file-attributes (buffer filename)
+     (ecb-with-readonly-buffer buffer
+       (erase-buffer)
+       (insert (format "Bufferinfo for %s:\n\n" filename))
+       ;; insert with the function `file-attributes' some
+       ;; informations about FILENAME.
+       ))
+
+   (defun ecb-examples-print-non-filebuffer (buffer buffer-name)
+     (ecb-with-readonly-buffer buffer
+       (erase-buffer)
+       ;; analogous to `ecb-examples-print-file-attributes'
+       ))
+
+For synchronizing the bufferinfo window with the current source-buffer we
+first introduce some three options which are very typical for a special
+ECB-window which should be synchronized with current buffer in the edit-area.
+
+The :type of the first two options is essential and *MUST NOT* be defined
+differently, because the macro `defecb-autocontrol/sync-function' (s.b.) and
+the function `ecb-activate-ecb-autocontrol-function' (s.b.)  expects exactly
+these option-types.
+
+The third one for an own hook running after synchronizing is not essential but
+mostly useful for users who wants to do some own stuff.
+
+Here come the three options - for detailled docstrings take a look into the
+file `ecb-examples.el':
+
+   (defcustom ecb-examples-bufferinfo-buffer-sync 'basic
+     "*Synchronize the bufferinfo buffer automatically with current edit buffer.
+
+   If 'always then the synchronization takes place always a buffer changes in the
+   edit window, if nil then never. If a list of major-modes then only if the
+   `major-mode' of the new buffer belongs NOT to this list.
+
+   If the special value 'basic is set then ECB uses the setting of the option
+   `ecb-basic-buffer-sync'.
+
+   IMPORTANT NOTE: Every time the synchronization is done the hook
+   `ecb-bufferinfo-buffer-sync-hook' is evaluated."
+     :group 'ecb-examples-bufferinfo
+     :type '(radio :tag "Synchronize ECBs example bufferino buffer"
+                   (const :tag "use basic value" :value basic)
+                   (const :tag "Always" :value always)
+                   (const :tag "Never" nil)
+                   (repeat :tag "Not with these modes"
+                           (symbol :tag "mode"))))
+
+   (defcustom ecb-examples-bufferinfo-buffer-sync-delay 'basic
+     "*Time Emacs must be idle before the bufferinfo-buffer is synchronized.
+   Synchronizing is done with the current source displayed in the edit window. If
+   nil then there is no delay, means synchronization takes place immediately. A
+   small value of about 0.25 seconds saves CPU resources and you get even though
+   almost the same effect as if you set no delay.
+
+   If the special value 'basic is set then ECB uses the setting of the option
+   `ecb-basic-buffer-sync-delay'"
+     :group 'ecb-analyse
+     :type '(radio (const :tag "use basic value" :value basic)
+                   (const :tag "No synchronizing delay" :value nil)
+                   (number :tag "Idle time before synchronizing" :value 2))
+     :set (function (lambda (symbol value)
+                      (set symbol value)
+                      (if (and (boundp 'ecb-minor-mode)
+                               (featurep 'ecb-examples)
+                               ecb-minor-mode)
+                          (ecb-activate-ecb-autocontrol-function
+                           value 'ecb-examples-bufferinfo-buffer-sync))))
+     :initialize 'custom-initialize-default)
+
+   (defcustom ecb-examples-bufferinfo-buffer-sync-hook nil
+     "Hook run at the end of `ecb-examples-bufferinfo-buffer-sync'.
+   See documentation of `ecb-examples-bufferinfo-buffer-sync' for conditions when
+   synchronization takes place and so in turn these hooks are evaluated.
+
+   ..."
+     :group 'ecb-analyse
+     :type 'hook)
+
+Now we define the synchronizing function. *IMPORTANT*: The main synchronizing
+function must be defined with the macro `defecb-autocontrol/sync-function'!
+See the documentation of this function for all details.
+
+The following function synchronizes the bufferinfo buffer with the current
+buffer of the edit-window if that buffer has changed
+
+See the comments in the code for explanations.
+
+   (defvar ecb-examples-bufferinfo-last-file-buffer nil)
+
+   (defecb-autocontrol/sync-function ecb-examples-bufferinfo-buffer-sync
+       ecb-examples-bufferinfo-buffer-name ecb-examples-bufferinfo-buffer-sync t
+     "Synchronizes the buffer-info buffer with current source if changed.
+   Can be called interactively but normally this should not be necessary because
+   it will be called autom. by the internal synchronizing mechanism of ECB."
+
+     ;; The macro `defecb-autocontrol/sync-function' does a lot for our
+     ;; conveniance:
+
+     ;; 1) here we can be sure that the buffer with name
+     ;; `ecb-examples-bufferinfo-buffer-name' is displayed in a window of
+     ;; `ecb-frame' because the macro `defecb-autocontrol/sync-function'
+     ;; encapsulates automatically the following code within
+     ;; `ecb-do-if-buffer-visible-in-ecb-frame' and this macro binds locally the
+     ;; variables visible-buffer and visible-window: visible-window:=
+     ;; (get-buffer-window ecb-examples-bufferinfo-buffer-name) visible-buffer:=
+     ;; (get-buffer ecb-examples-bufferinfo-buffer-name)
+
+     ;; 2) The macro `defecb-autocontrol/sync-function' automatically takes care of
+     ;;    the setting of option `ecb-examples-bufferinfo-buffer-sync' and runs the
+     ;;    following code only when the related conditions are true
+
+     ;; 3) The generated function has one optional argument FORCE which can be used
+     ;; in the code below.
+
+     ;; 4) The macro `defecb-autocontrol/sync-function' makes this synchronizing
+     ;;    function interactive
+
+     ;; For details please read the documentation of
+     ;; `defecb-autocontrol/sync-function'!
+
+     ;; synchronize only when point stays in one of the edit-window.
+     (when (ecb-point-in-edit-window-number)
+
+       ;; we need the file-name of indirect-buffers too (if the base-buffer is a
+       ;; file-buffer), therefore we use `ecb-buffer-file-name' (see the docstring
+       ;; of this function)
+       (let ((filename (ecb-buffer-file-name (current-buffer))))
+
+         (if (and filename (ecb-buffer-or-file-readable-p filename))
+
+             ;; synchronizing for real filesource-buffers or indirect buffers of
+             ;; real file buffers
+
+               ;; Let us be smart: We synchronize only if sourcebuffer has changed
+               ;; or if the argument FORCE is not nil
+               (when (or force
+                         (not (equal (current-buffer)
+                                     ecb-examples-bufferinfo-last-file-buffer)))
+                 ;; set new last-file-buffer so we can check next time if changed
+                 (setq ecb-examples-bufferinfo-last-file-buffer (current-buffer))
+                 ;; we display the file-infos for current source-buffer
+                 (ecb-examples-print-file-attributes visible-buffer filename))
+
+           ;; what should we do for non file buffers like help-buffers etc...
+           (setq ecb-examples-bufferinfo-last-file-buffer nil)
+           (ecb-examples-print-non-filebuffer visible-buffer
+                                              (buffer-name (current-buffer)))))
+
+       ;; Now lets run the hooks in `ecb-examples-bufferinfo-buffer-sync-hook'
+       (run-hooks 'ecb-examples-bufferinfo-buffer-sync-hook)))
+
+Two conveniance commands for the user:
+
+   (defun ecb-maximize-bufferinfo-window ()
+     "Maximize the bufferinfo-window.
+   I.e. delete all other ECB-windows, so only one ECB-window and the
+   edit-window\(s) are visible \(and maybe a compile-window). Works
+   also if the ECB-analyse-window is not visible in current layout."
+     (interactive)
+     (ecb-display-one-ecb-buffer ecb-examples-bufferinfo-buffer-name))
+
+   (defun ecb-goto-bufferinfo-window ()
+     "Make the bufferinfo-window the current window."
+     (interactive)
+     (ecb-goto-ecb-window ecb-examples-bufferinfo-buffer-name))
+
+11.5.2.5 Synchronizing the bufferinfo-buffer automatically
+..........................................................
+
+By using the macro `defecb-autocontrol/sync-function' for defining our
+synchronizing function we have already registered this function as a
+synchronizing function managed by ECB:
+
+The only thing we need is to tell ECB when this function should run - for this
+we have already defined the first two options in our example (s.a.).  ECB
+offers to functions for
+
+   * `ecb-activate-ecb-autocontrol-function': Activate/start synchronizing
+
+   * `ecb-stop-autocontrol/sync-function': Stop synchronizing
+
+It's smart to activate the synchronizing function within the
+dedicator-function. See the comment within the following function.
+
+The function which makes the bufferinfo-buffer dedicated to a window and
+registers the new special window/buffer at ECB.
+
+   (defecb-window-dedicator ecb-examples-set-bufferinfo-buffer
+       ecb-examples-bufferinfo-buffer-name
+     "Set the buffer in the current window to the bufferinfo-buffer and make this
+   window dedicated for this buffer. Makes the buffer read-only."
+
+     ;; activating the synchronization of the bufferinfo-window:
+     ;; `ecb-activate-ecb-autocontrol-function' takes care of the possible
+     ;; settings in `ecb-examples-bufferinfo-buffer-sync-delay'. Therefore we do
+     ;; it here because then changes in ecb-examples-bufferinfo-buffer-sync-delay
+     ;; are taken into account each time the bufferinfo buffer is set in the
+     ;; layout (after each hiding/showing the ecb-window, each redrawing the
+     ;; layout deactivating/activating ECB)
+     (ecb-activate-ecb-autocontrol-function ecb-examples-bufferinfo-buffer-sync-delay
+                                            'ecb-examples-bufferinfo-buffer-sync)
+
+     (switch-to-buffer (get-buffer-create ecb-examples-bufferinfo-buffer-name))
+     (setq buffer-read-only t))
+
+This is all what we need for the special bufferinfo buffer. We have
+demonstrated already three of the important functions/macros of the
+layout-engine API of ECB: `ecb-with-readonly-buffer',
+`defecb-autocontrol/sync-function' and `defecb-window-dedicator' (*note The
+layout-engine API::. Especially the second macro is a MUST for programming
+good synchronizing functions which do not waste CPU-power! We have also shown
+how to start/activate a synchronizing function by
+`ecb-activate-ecb-autocontrol-function'. Later we will see how to stop it.
+
+11.5.2.6 The action buffer of the example
+.........................................
+
+The name of the action-buffer:
+
+   (defconst ecb-examples-action-buffer-name " *ECB action buffer*")
+
+Two helper functions for creating a readonly action-buffer with a special
+local key-map for the middle-mouse-button and two buttons [prior] and [next]:
+
+   (defun ecb-examples-insert-text-in-action-buffer (text)
+     (let ((p (point)))
+       (insert text)
+       (put-text-property p (+ p (length text)) 'mouse-face
+                                                'highlight)))
+
+   (defun ecb-examples-action-buffer-create ()
+     (save-excursion
+       (if (get-buffer ecb-examples-action-buffer-name)
+           (get-buffer ecb-examples-action-buffer-name)
+
+         (set-buffer (get-buffer-create
+                       ecb-examples-action-buffer-name))
+
+         ;; we setup a local key-map and bind middle-mouse-button
+         ;; see ecb-examples.el for the full code
+
+         ;; insert the action buttons [prior] and [next] and
+         ;; make it read-only
+
+         (ecb-with-readonly-buffer (current-buffer)
+           (erase-buffer)
+           (ecb-examples-insert-text-in-action-buffer "[prior]")
+           ;; analogous for the [next] button
+           )
+
+         (current-buffer))))
+
+The function which performs the actions in the action-buffer if clicked with
+the middle-mouse button onto a button [next] or [prior].
+
+   (defun ecb-examples-action-buffer-clicked (e)
+     (interactive "e")
+     (mouse-set-point e)
+     (let ((line (buffer-substring (ecb-line-beginning-pos)
+                                   (ecb-line-end-pos))))
+       (cond ((string-match "prior" line)
+              (ecb-select-edit-window)
+              (call-interactively 'scroll-down))
+             ((string-match "next" line)
+              ;; analogous for [next]
+              ))))
+
+Two conveniance-commands for the user:
+
+   (defun ecb-maximize-action-window ()
+     "Maximize the action-window.
+   I.e. delete all other ECB-windows, so only one ECB-window and the
+   edit-window\(s) are visible \(and maybe a compile-window). Works
+   also if the ECB-analyse-window is not visible in current layout."
+     (interactive)
+     (ecb-display-one-ecb-buffer ecb-examples-action-buffer-name))
+
+   (defun ecb-goto-action-window ()
+     "Make the action-window the current window."
+     (interactive)
+     (ecb-goto-ecb-window ecb-examples-action-buffer-name))
+
+The function which makes the action-buffer dedicated to a window and
+registers it at ECB.
+
+   (defecb-window-dedicator ecb-examples-set-action-buffer
+       (buffer-name (ecb-examples-action-buffer-create))
+     "Set the buffer in the current window to the action-buffer
+   and make this window dedicated for this buffer."
+     (switch-to-buffer (buffer-name (ecb-examples-action-buffer-create))))
+
+We do not need more code for the action buffer. All of the code is standard
+emacs-lisp which would also needed if used without ECB. You see that you can
+use any arbitrary code as second argument for `defecb-window-dedicator' as
+long it returns a buffer-name.
+
+11.5.2.7 Adding the bufferinfo- and action-buffer to a new layout
+.................................................................
+
+Now we add the bufferinfo- and the action-buffer to a new layout of type top
+with name "example-layout1":
+
+   (ecb-layout-define "example-layout1" top
+
+     ;; dedicating the bufferinfo window to the bufferinfo-buffer
+     (ecb-examples-set-bufferinfo-buffer)
+
+     ;; creating the action-window
+     (ecb-split-hor 0.75)
+
+     ;; dedicate the action window to the action-buffer
+     (ecb-examples-set-action-buffer)
+
+     ;; select the edit-window
+     (select-window (next-window)))
+
+This all what we need to define the new layout. See *Note Programming a new
+layout:: for more details of the pure layout-programming task.
+
+11.5.2.8 Activating and deactivating new layouts
+................................................
+
+Because a set of new special windows integrated in a new layout is often just
+the GUI of a complete tool (like a graphical debugger) we demonstrate here
+the complete activation and deactivation of such a tool or at least of the
+tool-GUI. We decide that the GUI of our example "tool" needs a compile-window
+with height 5 lines and the height of the special windows "row" on top should
+be exactly 6 lines (normally width and height of the special windows should
+be a fraction of the frame, but here we use 6 lines(2)
+
+Here comes the (de)activation code.
+
+The code for saving and restoring the state before activation (the full code
+is available in `ecb-examples.el':
+
+   (defun ecb-examples-preactivation-state(action)
+     (cond ((equal action 'save)
+            ;; code for saving the state
+            )
+           ((equal action 'restore)
+           ;; code for restoring the state
+           )))
+
+The following function activates the GUI of our example tool:
+
+   (defun ecb-examples-activate ()
+     "Activate the new layout \"example-layout1\".
+   Acivates the function `ecb-examples-bufferinfo-buffer-sync', set
+   `ecb-compile-window-height' to 5 and `ecb-windows-height' to 6. The
+   preactivation-state is saved and will be restored by
+   `ecb-examples-deactivate'."
+     (interactive)
+
+     (assert (featurep 'ecb) nil
+             "ECB must be loaded!")
+     (assert ecb-minor-mode nil
+             "ECB must be activated!")
+     (assert (equal (selected-frame) ecb-frame) nil
+             "The ECB-frame must be selected!")
+     (assert (not (ecb-string= ecb-layout-name "example-layout1")) nil
+             "The examples-layout1 is already active!")
+
+     ;; saving the state
+     (ecb-examples-preactivation-state 'save)
+
+     ;; switch to our prefered layout
+     (setq ecb-windows-height 6)
+     (setq ecb-compile-window-height 8)
+     (let ((ecb-change-layout-preserves-compwin-state nil))
+       ;; activating the synchronization of the bufferinfo-window is done in the
+       ;; dedicator-function (see `ecb-examples-set-bufferinfo-buffer' for the
+       ;; reason). So the synchronizing will be activated implicitly with the
+       ;; layout-switch because this redraws the layout and this calls all
+       ;; dedicator-functions.
+       (ecb-layout-switch "example-layout1")))
+
+This function deactivates the GUI of our example-tool and restores the state
+as before activation:
+
+   (defun ecb-examples-deactivate ()
+     "Deactivate the new layout \"example-layout1\".
+   Stops `ecb-examples-bufferinfo-buffer-sync' and restore the state
+   as before activation."
+     (interactive)
+
+     (assert (featurep 'ecb) nil
+             "ECB must be loaded!")
+     (assert ecb-minor-mode nil
+             "ECB must be activated!")
+     (assert (equal (selected-frame) ecb-frame) nil
+             "The ECB-frame must be selected!")
+     (assert (ecb-string= ecb-layout-name "example-layout1") nil
+             "The example-layout1 is not active!")
+
+     ;; we stop here the synchronization.
+     (ecb-stop-autocontrol/sync-function 'ecb-examples-bufferinfo-buffer-sync)
+
+     (ecb-examples-preactivation-state 'restore)
+
+     (ecb-layout-switch ecb-layout-name))
+
+Now we have all code for the new layout and the new layout-buffers.  The
+example is ready for use; just load `ecb-examples.el' (s.a.).
+
+---------- Footnotes ----------
+
+(1) JDEE is available at `http://jdee.sunsite.dk/'
+
+(2) You can change the code in the file `ecb-examples.el' to use a
+frame-fraction of 0.2 instead of 6 hard lines, just try it!
+
+
+File: ecb.info,  Node: Possible layout-outlines,  Next: The layout-engine API,  Prev: Programming special windows,  Up: The layout-engine
+
+11.5.3 The wide range of possible layout-outlines
+-------------------------------------------------
+
+In the two previous sections *Note Programming a new layout:: and *Note
+Programming special windows:: we have explained in detail how to program new
+layouts and how to program new special windows/buffers and adding them to a
+new layout.
+
+The intention of this section is to be a summary what are the real
+restrictions for a new layout-outline programmed with `ecb-layout-define'.
+This is necessary because until now we just programmed "obvious" layouts,
+means layout which are in principle very similar to the standard ones which
+means one big edit-window and some special windows "around" this edit-window.
+This section will show you that a layout can have also very different
+outlines.
+
+OK, here are the real restrictions and conditions for a layout programmed
+with `ecb-layout-define':
+  1. It must have exactly one edit-window regardless of its size. The user of
+     this layout can later split this edit-window in as many edit-windows as
+     he like.
+
+  2. All other windows created within the CREATE-CODE body of
+     `ecb-layout-define' (*note Programming a new layout::) must be dedicated
+     to their buffers.
+
+  3. All the dedicated windows must (exclusive!) either reside on the left,
+     right, top or left-and-right side of the edit-window. This will be
+     defined with the TYPE-argument of `ecb-layout-define' (*note Programming
+     a new layout::).
+
+You see, there are only three restrictions/conditions. These and only these
+must be fulfilled at layout-programming.
+
+Demonstrating what this really means and how flexible the layout-engine of
+ECB really is, can be done best with some "pathological" layout-outlines. All
+the following are correct layouts (working code is added below each layout):
+
+The following is a top layout with three vertical layered special windows.
+
+   ------------------------------------------------------------------
+   |                                                                |
+   |                 Upper special window                           |
+   |                                                                |
+   |----------------------------------------------------------------|
+   |                                                                |
+   |                 Middle special window                          |
+   |                                                                |
+   |----------------------------------------------------------------|
+   |                                                                |
+   |                 Lower special window                           |
+   |                                                                |
+   |================================================================|
+   |                                                                |
+   |                         Edit-area                              |
+   |      (can be splitted by the user in several edit-windows)     |
+   ------------------------------------------------------------------
+   |                                                                |
+   |                 Compilation-window (optional)                  |
+   |                                                                |
+   ------------------------------------------------------------------
+
+Here is the code for that top layout (all buffers are dummy-buffers):
+
+
+   ;; The "window dedicator" functions:
+
+   (defecb-window-dedicator ecb-set-usw-buffer "Upper special window"
+     (switch-to-buffer (get-buffer-create "Upper special window")))
+
+   (defecb-window-dedicator ecb-set-msw-buffer "Middle special window"
+     (switch-to-buffer (get-buffer-create "Middle special window")))
+
+   (defecb-window-dedicator ecb-set-lsw-buffer "Lower special window"
+     (switch-to-buffer (get-buffer-create "Lower special window")))
+
+   ;; The layout itself:
+
+   (ecb-layout-define "example-layout3" top
+     nil
+
+     ;; here we have an edit-window and above one top window which we can
+     ;; now split in several other windows. Dependent on the value of
+     ;; `ecb-compile-window-height' we have also a compile-window at the
+     ;; bottom.
+
+     (ecb-set-usw-buffer)
+     (ecb-split-ver 0.33)
+     (ecb-set-msw-buffer)
+     (ecb-split-ver 0.5)
+     (ecb-set-lsw-buffer)
+
+     ;; select the edit-window.
+     (select-window (next-window)))
+
+The following is a left-right layout which has six special windows in the
+left-"column" and one big special window in the right-"column". For
+left-right layouts the left-"column" and the right-"column" have always the
+same width.
+
+   ------------------------------------------------------------------
+   |             |       |                   |                      |
+   | Left1       | Left5 |                   |                      |
+   |             |       |                   |                      |
+   |-------------|       |                   |                      |
+   |      |      |       |                   |                      |
+   |      |      |       |                   |                      |
+   |      |      |       |                   |                      |
+   | Left2| Left3|-------|     Edit-area     |   Right1             |
+   |      |      |       | (can be splitted  |                      |
+   |      |      |       |  in several edit- |                      |
+   |      |      |       |      windows)     |                      |
+   |-------------|       |                   |                      |
+   |             |       |                   |                      |
+   | Left4       | Left6 |                   |                      |
+   |             |       |                   |                      |
+   ------------------------------------------------------------------
+   |                                                                |
+   |                 Compilation-window (optional)                  |
+   |                                                                |
+   ------------------------------------------------------------------
+
+Here is the code for that left-right layout, again with dummy-buffers
+(depending to your screen-resolution you will need a quite big value for
+`ecb-windows-width', e.g. 0.4):
+
+Here is one of the "window dedicator"-functions(1):
+
+   (defecb-window-dedicator ecb-set-left1-buffer "Left1"
+     (switch-to-buffer (get-buffer-create "Left1")))
+
+Here is the layout-definition itself:
+
+   (ecb-layout-define "example-layout2" left-right
+     nil
+
+     ;; here we have an edit-window and left and right two windows each
+     ;; with width `ecb-windows-width'. Dependent to the value of
+     ;; `ecb-compile-window-height' we have also a compile-window at the
+     ;; bottom.
+
+     (ecb-set-left1-buffer)
+     (ecb-split-hor 0.66 t)
+     (ecb-split-ver 0.75)
+     (ecb-set-left4-buffer)
+     (select-window (previous-window (selected-window) 0))
+     (ecb-split-ver 0.25 nil t)
+     (ecb-set-left2-buffer)
+     (ecb-split-hor 0.5)
+     (ecb-set-left3-buffer)
+     (select-window (next-window (next-window)))
+     (ecb-set-left5-buffer)
+     (ecb-split-ver 0.5)
+     (ecb-set-left6-buffer)
+     (select-window (next-window (next-window)))
+     (ecb-set-right1-buffer))
+
+     ;; select the edit-window
+     (select-window (previous-window (selected-window) 0)))
+
+Especially the last example should demonstrate that even very complicated
+layouts are easy to program with `ecb-layout-define'.  If such layouts are
+senseful is another topic ;-)
+
+---------- Footnotes ----------
+
+(1) The "window dedicators" for all these ecb-windows/buffers are not
+explicitly described - they look all like `ecb-set-left1-buffer' - of course
+with different buffer-names!
+
+
+File: ecb.info,  Node: The layout-engine API,  Prev: Possible layout-outlines,  Up: The layout-engine
+
+11.5.4 The complete layout-engine API of ECB
+--------------------------------------------
+
+This section lists all functions, macros, variables and user-options the
+layout-engine API of ECB offers foreign packages. Call `describe-function'
+rsp. `describe-variable' to get a detailed description.
+
+Functions and macros for programming with layouts and special ecb-windows:
+   - `defecb-window-dedicator'
+
+   - `ecb-available-layouts-member-p'
+
+   - `ecb-canonical-ecb-windows-list'
+
+   - `ecb-canonical-edit-windows-list'
+
+   - `ecb-compile-window-live-p'
+
+   - `ecb-compile-window-state'
+
+   - `ecb-do-if-buffer-visible-in-ecb-frame'
+
+   - `ecb-exec-in-window'
+
+   - `ecb-get-current-visible-ecb-buffers'
+
+   - `ecb-layout-define'
+
+   - `ecb-layout-switch'
+
+   - `ecb-layout-undefine'
+
+   - `ecb-point-in-compile-window'
+
+   - `ecb-point-in-ecb-window-number'
+
+   - `ecb-point-in-edit-window-number'
+
+   - `ecb-select-edit-window'
+
+   - `ecb-split-hor'
+
+   - `ecb-split-ver'
+
+   - `ecb-where-is-point'
+
+   - `ecb-with-dedicated-window'(1)
+
+Utility functions/macros:
+   - `ecb-display-one-ecb-buffer'
+
+   - `ecb-enlarge-window'
+
+   - `ecb-fix-filename'
+
+   - `ecb-goto-ecb-window'
+
+   - `ecb-window-live-p'
+
+   - `ecb-with-readonly-buffer'
+
+Some other maybe useful functions/macros:
+   - `ecb-with-adviced-functions'
+
+   - `ecb-with-original-functions'
+
+   - `ecb-with-some-adviced-functions'
+
+Some useful *READONLY* variables:
+   - `ecb-compile-window'
+
+   - `ecb-last-edit-window-with-point'
+
+   - `ecb-last-source-buffer'
+
+*Caution*: DO NOT USE THE VARIABLE `ecb-edit-window' IN YOUR PROGRAMS!
+
+User-options and hooks related to the layout-engine API:
+   - `ecb-basic-buffer-sync-hook'
+
+   - `ecb-hide-ecb-windows-after-hook'
+
+   - `ecb-hide-ecb-windows-before-hook'
+
+   - `ecb-redraw-layout-after-hook'
+
+   - `ecb-redraw-layout-before-hook'
+
+   - `ecb-show-ecb-windows-after-hook'
+
+   - `ecb-show-ecb-windows-before-hook'
+
+   - `ecb-windows-height'
+
+   - `ecb-windows-width'
+
+   - `ecb-compile-window-height'
+
+---------- Footnotes ----------
+
+(1) Normally not needed because `defecb-window-dedicator' does all necessary.
+
+
+File: ecb.info,  Node: Conflicts and bugs,  Next: FAQ,  Prev: Elisp programming,  Up: Top
+
+12 Conflicts and bugs of ECB
+****************************
+
+This chapter describes what to do when there are conflicts with other
+packages and also the known (and currently unfixed) bugs of ECB. If possible
+(and in most cases it is possible ;-) then a practicable solution or
+workaround is described.
+
+* Menu:
+
+* Conflicts::                   Conflicts with other packages
+* Bugs::                        Known bugs
+
+
+File: ecb.info,  Node: Conflicts,  Next: Bugs,  Prev: Conflicts and bugs,  Up: Conflicts and bugs
+
+12.1 Conflicts with other packages
+==================================
+
+This chapter contains a list of already known conflict between ECB and other
+packages and how to solve them - in most cases ECB already contains a
+suitable workaround.
+
+That is followed by a general recipe what you can do when you have detected a
+conflict between ECB and a package is not listed in the
+know-conflicts-section.
+
+12.1.1 Proved workarounds or recommendations for other packages
+---------------------------------------------------------------
+
+Here is a list of packages which are proved to work properly with ECB and if
+not (i.e. there are conflicts) then helpful solutions/hints/workarounds are
+offered:
+
+12.1.1.1 Package bs.el
+......................
+
+The package bs.el offers a nifty buffer-selection buffer. The main command of
+this package is `bs-show'. With ECB < 2.20 this command does not really
+working well within activated ECB. But as of version 2.20 of ECB there should
+be no problems using this package.
+
+If you add "*buffer-selection*" as buffer-name to the option
+`ecb-compilation-buffer-names' then ECB will always display the
+buffer-selection buffer of bs in the compile-window (if there is one).
+Otherwise bs will use the edit-area to do its job.
+
+12.1.1.2 Package BBDB
+.....................
+
+As of ECB 2.21 there should be no conflicts between BBDB and ECB, so BBDB can
+be used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (*note Window-managers and ECB::).
+With such a window-manager ECB and BBDB should work together very well under
+all circumstances!
+
+12.1.1.3 Package calendar.el
+............................
+
+With activated ECB `calendar' does not shrink it“s window to the small size
+but splits the window equally. But if you add this to your `.emacs' it works:
+
+   (add-hook 'initial-calendar-window-hook
+             (function (lambda ()
+                         (when (and ecb-minor-mode
+                                    (ecb-point-in-edit-window))
+                           ;; if no horizontal split then nothing
+                           ;; special to do
+                           (or (= (frame-width) (window-width))
+                               (shrink-window (- (window-height) 9))))
+                        )))
+
+12.1.1.4 Package cygwin-mount.el
+................................
+
+There can be a conflict between ECB and cygwin-mount.el if the following
+conditions are true:
+
+   - You are working with cygwin-mount.el (sounds clear :-)
+
+   - You have set `cygwin-mount-build-mount-table-asynch' to not nil
+
+   - ECB is automatically started after starting Emacs (e.g. with
+     `ecb-auto-activate' or calling `ecb-activate' in `window-setup-hook')
+
+   - Your Emacs-setup contains a call of `cygwin-mount-activate'.
+
+Under these circumstances Emacs 21.X sometimes eats up the whole CPU (at
+least with Windows XP) and the cygwin-mount-table is never build.
+
+But there is an easy work-around: Call `cygwin-mount-activate' first *AFTER*
+ECB is activated. This can be done with the hook `ecb-activate-hook':
+
+   (add-hook 'ecb-activate-hook
+             (function (lambda ()
+                         (require 'cygwin-mount)
+                         (setq cygwin-mount-build-mount-table-asynch t)
+                         (cygwin-mount-activate))))
+
+12.1.1.5 Package desktop.el
+...........................
+
+ECB works perfectly with the desktop-saver desktop.el. Normally there should
+be nothing to do for you.
+
+But if you encounter problems (e.g. that desktop tries to activate ECB for
+each buffer it loads) then you should add the following entry to the option
+`desktop-minor-mode-table':
+
+   (ecb-minor-mode nil)
+
+If you still encounter problems then you should add entries for all the
+minor-mode of the semantic-package to `desktop-minor-mode-table', so for
+example add also:
+
+   (semantic-decoration-mode nil)
+   (semantic-idle-completions-mode nil)
+   (semantic-idle-tag-highlight-mode nil)
+   (semantic-idle-summary-mode nil)
+   (semantic-idle-scheduler-mode nil)
+   (senator-isearch-semantic-mode nil)
+   (senator-minor-mode nil)
+   (semantic-highlight-func-mode nil)
+   (semantic-stickyfunc-mode nil)
+   (semantic-show-parser-state-mode nil)
+   (semantic-show-unmatched-syntax-mode nil
+   (semantic-highlight-edits-mode nil
+
+Normally this should not be necessary, because semantic is already prepared to
+work perfectly with desktop.el. But if there are problems it's worth a try.
+Which modes you have to add depends on which modes of semantic you use. But to
+get sure you should add all minor-modes of the semantic-package because these
+modes are normally activated by the related "global" command (e.g.
+`global-semantic-show-unmatched-syntax-mode') or by adding the minor-mode to
+the related major-mode-hook.
+
+It has also been reported that just disabling the Tip-Of-The-Day (option:
+`ecb-tip-of-the-day') fixes the compatibility-problems with desktop.el. Just
+try it out!
+
+12.1.1.6 Package edebug (Lisp Debugger)
+.......................................
+
+It is strongly recommended to run edebug only when the ECB-windows are
+hidden. With visible ECB-windows there will probably serious conflicts
+between the ECB-layout and the edebug-window-manager.
+
+12.1.1.7 Package ediff.el
+.........................
+
+In most cases ECB works very well with ediff (see option
+`ecb-run-ediff-in-ecb-frame'). But currently suspending ediff with
+`ediff-suspend' and restoring the ediff-session (e.g. with command
+`eregistry') does confuse the window-management of ECB.
+
+If you often use ediff in a scenario where you suspend ediff and reactivate
+it later then it is recommended to exit ECB first (`ecb-deactivate' or
+`ecb-minor-mode')!
+
+12.1.1.8 Package func-menu.el
+.............................
+
+This package has been reported to produce some conflicts under some
+circumstances when ECB is activated. Some of them could be reproduced by the
+ECB-maintainer. So the recommendation is to disable func-menu-support when
+using ECB. Normally using func-menu makes no sense in combination with ECB
+because ECB provides the same and even more informations as func-menu - so
+func-menu is redundant ;-)
+
+12.1.1.9 Package Gnus (Newsreader)
+..................................
+
+As of ECB 2.21 there should be no conflicts between Gnus and ECB, so Gnus can
+be used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (*note Window-managers and ECB::).
+With such a window-manager ECB and Gnus should work together very well under
+all circumstances!
+
+12.1.1.10 Package JDEE (Java Development Environment)
+.....................................................
+
+JDEE has a lot of "dialogs" where the user can select among several choices.
+An example is importing classes via the command `jde-import-find-and-import'.
+These dialogs are strongly designed to work in an environment where a new
+temporary window is created, the contents of the dialog are displayed in the
+new window, the user select his choice and hits [OK]. After that the new
+window is deleted and the selection is performed (for example the chosen
+import statement are inserted in the source-buffer.
+
+*Caution*: ECB can work very well with this dialogs but only if the
+buffer-name of these dialog-buffers (normally "Dialog") is not contained in
+the option `ecb-compilation-buffer-names'. So do not add the string "Dialog"
+to this option!
+
+*Please Note*: Regardless if a persistent compile-window is used (i.e.
+`ecb-compile-window-height' is not nil) or not, these JDEE-dialogs will
+always being displayed by splitting the edit-window of ECB and not within the
+compile-window.
+
+12.1.1.11 Package scroll-all.el (scroll-all-mode)
+.................................................
+
+ECB advices `scroll-all-mode' so it is working correct during running ECB.
+This means if point stays in an edit-window and the edit-window is splitted
+then all edit-windows are scrolled by `scroll-all-mode' and no other window!
+If point stays in any other window just this selected window is scrolled.
+This is the only senseful behavior of `scroll-all-mode' with ECB.
+
+12.1.1.12 Package VC (Version Control)
+......................................
+
+The variable `vc-delete-logbuf-window' must be set to nil during active ECB.
+This can be done with the hooks mentioned in *Note Elisp programming::.
+
+12.1.1.13 Package VM (Emacs Mail-Client)
+........................................
+
+As of ECB 2.21 there should be no conflicts between VM and ECB, so VM can be
+used even when the ECB-windows are visible.
+
+But if you encounter problems then it is recommened to use one of the
+window-managers escreen.el or winring.el (*note Window-managers and ECB::).
+With such a window-manager ECB and VM should work together very well under
+all circumstances!
+
+12.1.1.14 Package winner.el (winner-mode)
+.........................................
+
+`winner-mode' is autom. disabled as long as ECB is running. ECB has its own
+window-management which is completely incompatible with `winner-mode'! But
+`winner-mode' makes also not really sense with ECB.
+
+12.1.1.15 Package wb-line-number.el
+...................................
+
+Do not use the package wb-line-number.el in combination with ECB - it will
+not work and it will not work under any circumstances and there is no way to
+make it work together and there will be no way in the future!
+
+The reason behind that is: wb-line-number.el uses additional dedicated
+windows to display the line-numbers. And ECB can not work if there there are
+additional dedicated windows - additional to that ones created by ECB.
+
+12.1.1.16 Application xrefactory
+................................
+
+Xrefactory (also known as Xref, X-ref and Xref-Speller), the refactoring
+browser for (X)Emacs(1), can be used during running ECB regardless if the
+ECB-windows are visible or not. There should be no conflicts as of ECB
+versions >= 2.21.
+
+If there are conflicts with the Xref-browser then the most recommended way is
+to use one of the window-manager escreen.el or winring.el (and then use
+different escreens or window-configurations for ECB and Xrefactory-browsing -
+*Note Window-managers and ECB::).
+
+12.1.2 What to do for unknown conflicts with other packages
+-----------------------------------------------------------
+
+As of version 2.20 the layout-engine of ECB is so flexible that normally
+there should be no conflicts with other packages unless these packages have
+their own complete window-layout-management (e.g. Gnus, BBDB, Xrefactory).
+But these packages can and should be handled very well with the
+window-manager-support of ECB (*note Window-managers and ECB::).
+
+So if you detect an unknown (i.e. not listed in the conflicts-list in the
+next subsection) conflict with a small package and some of its commands and
+you have installed an ECB-version < 2.20 the first task you have to do is to
+upgrade to a version >= 2.20!
+
+If this doesn't solve the problem a very probable reason for the conflict is
+that the command fails if called from another window than an edit-window of
+the ecb-frame. So please check if the problem disappears if you call the
+failing command from an edit-window of ECB.  If this is true then you you can
+add the following code to your .emacs (and of course replace the XXX with the
+failing command):
+
+   (defecb-advice XXX before ecb-compatibility-advices
+     "Ensures `XXX' works well when called from another window
+   as an edit-window. Does nothing if called in another frame
+   as the `ecb-frame'."
+     (when (equal (selected-frame) ecb-frame)
+       (unless (ecb-point-in-edit-window)
+         (ecb-select-edit-window))))
+
+This before-advice runs before the command XXX and ensures that the XXX is
+called from within an edit-window if the current selected window is not an
+edit-window. It does nothing if called for another frame as the ecb-frame.
+
+*Please note*: You have to define such compatibility advices exactly as
+demonstrated in the example above, i.e. you must use the macro
+`defecb-advice' and you have to use the advice-set
+`ecb-compatibility-advices' (see the documentation of this macro)! The
+advice-class is not necessary `before', it can be `after' or `around' too.
+Never use `defadvice' for ECB-advices!
+
+If such an advice solves the problem then please send a note with the
+solution to the ECB-mailing-list or direct to the ECB-maintainer so the
+solution can be integrated in the next ECB-release
+
+If calling from an edit-window fails too then please file a complete
+bug-report to the ECB-mailing-list (*note Submitting problem report::). This
+report should contain a detailed description which command of which package
+fails under which circumstances!
+
+---------- Footnotes ----------
+
+(1) Xrefactory is available at `http://www.xref-tech.com'
+
+
+File: ecb.info,  Node: Bugs,  Prev: Conflicts,  Up: Conflicts and bugs
+
+12.2 Known bugs
+===============
+
+This section describes all currently known bugs of ECB. The maintainers of
+ECB try to fix these bugs as soon as possible.
+
+12.2.1 Extra history-entries for JDEE source-buffers
+----------------------------------------------------
+
+ECB on occasions creates an extra edit buffer for entries in the history
+window. For example, let say there are three entries in the history window:
+
+   Test1
+   Test2
+   Test3
+
+In the edit window Test1 file is edited. When clicked on Test2 entry in
+history, on occasion instead of switching to the existing buffer for Test2, a
+new edit buffer is opened for Test2 file. At this point, there are four
+entries in the history as follows:
+
+   Test2
+   Test2<2>
+   Test1
+   Test3
+
+
+File: ecb.info,  Node: FAQ,  Next: Command Index,  Prev: Conflicts and bugs,  Up: Top
+
+13 Frequently asked questions
+*****************************
+
+This is the Emacs Code Browser FAQ.
+
+QUESTION                          ANSWER
+
+What is the first step i          Read carefully the related sections of the
+should do if i have problems      online-help of ECB.
+with ECB?                         
+
+What should i do, if a have a     Send a problem-report to the ECB-mailing-list
+problem which can not be          with the command `ecb-submit-problem-report'.
+solved even after reading the     See *Note Submitting problem report::.
+online-help?                      
+
+What should i do, if another      Take a look into *Note Conflicts::. If your
+package seems not to work         package is not listed there then submit a
+correct with ECB?                 problem-report.
+
+Can ECB parse and display         Yes, in all version >= 1.94. ECB can now
+source-contents not supported     parse and display all source-contents
+by semantic?                      supported by semantic, imenu or etags - same
+                                  as speedbar. See *Note Non-semantic sources::.
+
+Why are the lines in the ECB-,    Check the variable
+temp- and compilation-buffers     `truncate-partial-width-windows' and set it to
+not wrapped but truncated?        nil.
+
+Why doesn't ECB work correct      The variable `vc-delete-logbuf-window' must
+with VC?                          be set to nil during active ECB. This can be
+                                  done with the hooks of ECB.
+
+Does ECB support C++ as well      In general C++ is supported very well. But it
+as Java?                          depends on the used cedet-version, but
+                                  cedet-version >= 1.0pre6 support C++ really
+                                  well.
+
+Does ECB support Perl?            If perl can be parsed either by imenu, etags
+                                  or semantic then ECB supports perl. Of course
+                                  ECB would support perl best if perl is
+                                  supported by semantic.
+
+Does ECB support language XYZ?    See question "Does ECB support Perl?" and
+                                  replace "Perl" with "XYZ" in the answer.
+
+How to add new languages to       Add the language XYZ to semantic (perform all
+ECB?                              necessary steps described in the
+                                  semantic-manual) and ECB will automatically
+                                  support language XYZ!  There is nothing to do
+                                  in ECB itself! Same when you write an imenu-
+                                  or etags-support for language XYZ.
+
+Why does ECB not recognize my     Your C++-files have probably an extension
+source-files for C++?             which is not mapped to c++-mode in
+                                  `auto-mode-alist' and/or your own Emacs-setup
+                                  has "destroyed" the correct value of the
+                                  hook-variable `c++-mode-hook'.
+                                  See *Note Setting up Emacs::.
+
+Is it possible to make the        You can use the library "desktop.el" which
+history of ECB persistent?        works very well with ECB.  Then all files of
+                                  your recent Emacs-session will be opened
+                                  automatically after next Emacs-start and will
+                                  be added automatically to the ECB-history
+                                  after ECB-start.
+
+Is there an                       For Java the JDEE(1) has this feature and for
+"Intellisense"-mechanism like     all other languages semantic offer something
+with other IDEs?                  similar, see
+                                  `http://cedet.sourceforge.net/intellisense.shtml'
+
+Can i use ECB in combination      You can, but for ECB-versions < 1.96 it is
+with Gnus within one frame?       not recommended because each of them has it's
+                                  own window-management and probably there will
+                                  be conflicts, so use different frames for ECB
+                                  and Gnus! But beginning with ECB 1.96 you can
+                                  use either escreen.el or winring.el as
+                                  "window-manager" which allows you in
+                                  consequence to use ECB and applications like
+                                  Gnus in one frame!
+                                  *Note Window-managers and ECB::.
+
+Can i speed up displaying the     Yes, see the option
+contents of big-size              `ecb-cache-directory-contents'. Read the
+directories?                      section
+                                  *Note Large directories::.
+
+Is it possible to create/use      Yes. *Note Creating a new ECB-layout:: and
+other layouts than the            *Note The layout-engine:: are the relevant
+built-in ones?                    sections. The former one describes how to
+                                  create interactively new layouts where the
+                                  latter one is for Elisp-programmers.
+
+Can i use speedbar as             Yes, see *Note Integrating speedbar::.
+directory-browser within ECB?     
+
+Can i exclude subdirectories      Yes, see *Note Grepping directories::.
+from the recursive grep in the    
+directories buffer?               
+
+How can i prevent                 Set `semanticdb-default-save-directory' to a
+contaminating each directory      directory.
+with a file `semantic-cache'?     
+
+Why ECB displays large            This comes from semantic;
+portions of current               see *Note Setting up Emacs::.
+source-file with dark             
+background?                       
+
+Why ECB underlines some parts     This comes from semantic;
+of current source-file?           see *Note Setting up Emacs::.
+
+Can i add my own commands to      Yes, see *Note Using the mouse::.
+the popup-menus of                
+tree-buffers?                     
+
+Can ECB display the               Yes, see *Note Common use-cases::.
+compile-window "on demand"?       
+
+Which buffers are treated as      See the docstring of the function
+compilation-buffers by ECB?       `ecb-compilation-buffer-p'.
+
+How can i change the modeline     You can change it with the options
+of an ECB-tree-buffer?            `ecb-mode-line-prefixes',
+                                  `ecb-mode-line-data' and
+                                  `ecb-mode-line-display-window-number'.
+
+Can the tree-buffers being        Yes, see option
+selected faster than with the     `ecb-mode-line-display-window-number'.
+standard-keybindings of ECB?      
+
+Can ECB display the               Yes, see option
+window-number in the modeline     `ecb-mode-line-display-window-number'.
+of the special windows?           
+
+How can i change the              You can do this with option `ecb-key-map'
+keybindings of ECB?               (*note ecb-general::).
+
+What can i do if                  Either the current `major-modes' is not
+hiding/showing from the           supported by hideshow or you have to add an
+methods-buffer does not work?     entry to `hs-special-modes-alist'
+                                  (*note Hide-show::).
+
+Can i maximize one of the         Yes, see *Note Maximizing the ECB windows::.
+ECB-windows for better            
+overlook?                         
+
+Can i hide the ECB-windows for    Yes, see *Note Hiding the ECB windows::.
+getting more editing-space?       
+
+Can i define the actions ECB      Yes, see *Note Visiting tags::.
+performs after visiting a tag?    
+
+Buffers are not displayed         See *Note Problems with the compile window::.
+correctly in the                  
+compile-window?                   
+
+Can ECB work together with        Yes, see *Note Window-managers and ECB::.
+window-managers like              
+escreen.el?                       
+
+Can i remove these "ugly"         Yes, see option `ecb-tree-buffer-style'.
+vertical lines from a             
+tree-buffer?                      
+
+ECB does not display images in    Customize `ecb-tree-buffer-style' and restart
+the tree-buffers - what can i     ECB. But note: GNU Emacs <= 21.3.X for
+do?                               Windows does not support image-display so ECB
+                                  uses always ascii-guide-lines even when here
+                                  the image-style is set in
+                                  `ecb-tree-buffer-style'.
+
+Do `special-display-function'     Yes, see
+et. al. work with ECB.            *Note Using special-display with ECB::.
+
+Can i activate the popup-menu     Yes, see *Note Using popup-menus::.
+of a tree-buffer from keyboard?   
+
+Can i display the popup-menu      Yes, see *Note Using popup-menus::.
+of a tree-buffer with tmm?        
+
+Does ECB disable all advices      "Nes"(2), see remarks in the documentation of
+after deactivation?               the option
+                                  `ecb-split-edit-window-after-start'.
+
+Can ECB preserve the full         Yes, see the option
+state of ECB between              `ecb-split-edit-window-after-start'.
+deactivation and next             
+activation?                       
+
+Can i change the behavior how     Yes, see *Note The other window::.
+ECB chooses another window for    
+selecting it or scrolling it.     
+
+Can i increase the allowed        Yes, see the docstring of the option
+depth of nested submenus.         `ecb-directories-menu-user-extension'.
+
+Can i apply some filters to       Yes, see *Note Filtering the tree-buffers::
+the Tree-buffers.                 
+
+With XEmacs i get sometimes an    Disable the func-menu support in your
+error "Wrong number of            XEmacs-setup. See *Note Conflicts::.
+arguments: widen (1)". What       
+can i do?                         
+
+Can i use desktop.el in           Yes, see *Note Conflicts::.
+combination with ECB?             
+
+Opening directories takes a       Read *Note Large directories::.
+long time - what can i do?        
+
+ECB seems to be blocked           ECB performs some stealthy tasks when idle -
+sometimes - what is the reason?   this can cause sometimes a blocked Emacs but
+                                  this tasks will be immetiatelly interrupted
+                                  by any user-event so there should be normally
+                                  no problems. But especially for mounted
+                                  net-drives some of the stealthy tasks can
+                                  take time up to some seconds for each file -
+                                  and during one file-operation it can not be
+                                  interrupted. See also
+                                  `ecb-stealthy-tasks-delay'.
+
+Can i exclude certain             Yes, see option
+directories from being checked    `ecb-prescan-directories-exclude-regexps'.
+for emptyness?                    
+
+Can i exclude certain             Yes, see option
+directories from checking the     `ecb-vc-directory-exclude-regexps'.
+VC-state of the contained         
+sources?                          
+
+Can i exclude certain             Yes, see option
+directories from checking the     `ecb-read-only-check-exclude-regexps'.
+read-only-state of the            
+contained sources?                
+
+ECB ignores the remote-paths i    Maybe you have to check the option
+have added to                     `ecb-ping-options'. Ensure that this option
+`ecb-source-path'.                contains a value suitable for your
+                                  ping-program (see `ecb-ping-program').
+                                  See also *Note Remote directories::.
+
+ECB seems to be blocked a long    Maybe you use cygwin-XEmacs. Then either the
+time.                             empty-dir-check (see option
+                                  `ecb-prescan-directories-for-emptyness') or
+                                  the VC-support (see `ecb-vc-enable-support')
+                                  can block ECB.
+                                  For the latter one see *Note Known
+                                  VC-problems::.
+
+ECB seems to be blocked during    Maybe the root repository for the current
+the VC-state update in the        directory is a remote-repository. This can
+tree-windows.                     result in a long lasting check-time per file.
+                                  See also *Note Version-control support:: for
+                                  hints what you can do.
+
+I have encountered some           See also *Note Version-control support:: for
+problems with the display of      hints what you can do.
+the VC-state in the               
+tree-buffers.                     
+
+The state of the files under      The option `ecb-vc-supported-backends' offers
+version control seems to be       now also a accurate recompute-state function.
+not accurate. What is the         This is by offering `ecb-vc-recompute-state'
+reason and what can i do?         as an alias to the function
+                                  `vc-recompute-state' as state-check function
+                                  for this option. See also *Note
+                                  Version-control support::
+
+With Emacs 23 ECB shows a odd     Check the values of the options
+split-behavior when calling       `split-width-threshold' and
+help or displaying                `split-height-threshold'. ECBs split-behavior
+completion-output or              depends fully on the Emacs-logic and that one
+compilation- or grep-output.      depends mainly on these two options. So
+What is the reason.               adjust them to match (at least nearly) the
+                                  sizes of the edit-area of ECB.
+
+When using a layout with the      This comes from the idle-mechanism
+special ecb-window for the        ECB/semantic uses to offer some intellisense
+semantic analyzer then Emacs      like displaying possible completions and
+seems to be blocked when          local variables depending on current context
+typing pauses. What is the        (ie. location of point). So if point stays on
+reason and what can i do?         a location within your code where hundreds
+                                  (or even thousands) of completions are
+                                  possible then parsing and displaying them can
+                                  last annoying time. But in general a keypress
+                                  interupts. If not then you have to
+                                  possibilities offered by the options
+                                  `ecb-analyse-buffer-sync' and
+                                  `ecb-analyse-buffer-sync-delay': You can
+                                  increase the delay of the latter one so
+                                  parsing current context starts later after
+                                  Emacs goes idle (ie. after you pause typing).
+                                  Or you can disable the automatic
+                                  synchronizing the analyser-window with the
+                                  former one - see the docstring. Then you have
+                                  to synchronize (ie. start parsing context) on
+                                  demand via the command
+                                  `ecb-analyse-buffer-sync'(3).
+
+How can i change the              Either via popup context-menu (right
+bucketizing method of the         mouse-button) or with the option
+history-window?                   `ecb-history-make-buckets'.
+
+How can i disable this grey       See the option
+headerline in the tree-buffers?   `ecb-tree-make-parent-node-sticky'.
+
+When clicking onto a              ECB uses completely the smartness of the
+parent-node in the                semanticdb and the semantic-analyzer.  So if
+methods-window then ECB           you have customized semantic accordingly to
+doesn't jump to the definition    the needs of your project (ie. mainly setting
+of this parent-type.              up all so semantic can find files in your
+                                  directory-structure) then ECB will find the
+                                  parent-definition and also jump to it. See
+                                  *Note ECB Methods-window:: and the subsection
+                                  "Jumping to the definition of external tags"
+                                  and see the option
+                                  `ecb-find-external-tag-functions'.
+
+---------- Footnotes ----------
+
+(1) `http://jdee.sunsite.dk/'
+
+(2) Nes is a combination of No and Yes :-)
+
+(3) Yes, both the option and the command have the same name
+
+
+File: ecb.info,  Node: Command Index,  Next: Option Index,  Prev: FAQ,  Up: Top
+
+Command Index
+*************
+
+This index contains all user commands of ECB.
+
+*Please note*: The commands in this index are listed without the prefix
+"ecb-" (e.g. the command `ecb-activate' is listed with name "activate").
+
+[index]
+* Menu:
+
+* activate:                              Interactive ECB commands.  (line  24)
+* add-all-buffers-to-history:            Interactive ECB commands.  (line  30)
+* analyse-buffer-sync:                   Interactive ECB commands.  (line  39)
+* balance-windows:                       The edit-area.             (line 254)
+* change-layout:                         Interactive ECB commands.  (line  43)
+* clear-history:                         Interactive ECB commands.  (line  51)
+* create-new-layout:                     Interactive ECB commands.  (line  60)
+* customize:                             Interactive ECB commands.  (line  54)
+* customize-most-important:              Interactive ECB commands.  (line  57)
+* cycle-maximized-ecb-buffers:           Interactive ECB commands.  (line  64)
+* cycle-through-compilation-buffers:     Interactive ECB commands.  (line  68)
+* deactivate:                            Interactive ECB commands.  (line  78)
+* delete-new-layout:                     Interactive ECB commands.  (line  81)
+* delete-other-windows:                  The edit-area.             (line 100)
+* delete-window:                         The edit-area.             (line  73)
+* delete-windows-on:                     The edit-area.             (line 138)
+* display-buffer:                        The edit-area.             (line 172)
+* display-news-for-upgrade:              Interactive ECB commands.  (line  87)
+* display-upgraded-options:              Interactive ECB commands.  (line  95)
+* dump-semantic-toplevel:                Interactive ECB commands.  (line 152)
+* eshell-current-buffer-sync:            Interactive ECB commands.  (line 155)
+* eshell-recenter:                       Interactive ECB commands.  (line 161)
+* expand-directory-nodes:                Interactive ECB commands.  (line 164)
+* expand-methods-nodes:                  Interactive ECB commands.  (line 115)
+* goto-window-analyse:                   Interactive ECB commands.  (line 172)
+* goto-window-compilation:               Interactive ECB commands.  (line 175)
+* goto-window-directories:               Interactive ECB commands.  (line 178)
+* goto-window-ecb-by-smart-selection:    Interactive ECB commands.  (line 183)
+* goto-window-edit-by-smart-selection:   Interactive ECB commands.  (line 204)
+* goto-window-edit-last:                 Interactive ECB commands.  (line 230)
+* goto-window-edit1:                     Interactive ECB commands.  (line 224)
+* goto-window-edit2:                     Interactive ECB commands.  (line 227)
+* goto-window-history:                   Interactive ECB commands.  (line 234)
+* goto-window-methods:                   Interactive ECB commands.  (line 237)
+* goto-window-sources:                   Interactive ECB commands.  (line 242)
+* history-filter:                        Interactive ECB commands.  (line 247)
+* jde-display-class-at-point:            Interactive ECB commands.  (line 260)
+* layout-define:                         Programming a new layout.  (line  24)
+* layout-undefine:                       Programming a new layout.  (line 125)
+* maximize-window-analyse:               Interactive ECB commands.  (line 272)
+* maximize-window-directories:           Interactive ECB commands.  (line 278)
+* maximize-window-history:               Interactive ECB commands.  (line 296)
+* maximize-window-methods:               Interactive ECB commands.  (line 290)
+* maximize-window-sources:               Interactive ECB commands.  (line 284)
+* maximize-window-speedbar:              Interactive ECB commands.  (line 302)
+* methods-filter:                        Interactive ECB commands.  (line 308)
+* methods-filter-current-type:           Interactive ECB commands.  (line 380)
+* methods-filter-delete-last:            Interactive ECB commands.  (line 384)
+* methods-filter-function:               Interactive ECB commands.  (line 388)
+* methods-filter-nofilter:               Interactive ECB commands.  (line 393)
+* methods-filter-protection:             Interactive ECB commands.  (line 397)
+* methods-filter-regexp:                 Interactive ECB commands.  (line 402)
+* methods-filter-tagclass:               Interactive ECB commands.  (line 407)
+* minor-mode:                            Interactive ECB commands.  (line 412)
+* nav-goto-next:                         Interactive ECB commands.  (line 420)
+* nav-goto-previous:                     Interactive ECB commands.  (line 416)
+* other-window:                          The edit-area.             (line  68)
+* other-window-for-scrolling:            The edit-area.             (line 241)
+* rebuild-methods-buffer:                Interactive ECB commands.  (line 424)
+* redraw-layout:                         Interactive ECB commands.  (line 455)
+* restore-default-window-sizes:          Interactive ECB commands.  (line 494)
+* restore-window-sizes:                  Interactive ECB commands.  (line 497)
+* select-ecb-frame:                      Interactive ECB commands.  (line 501)
+* show-help:                             Interactive ECB commands.  (line 504)
+* show-layout-help:                      Interactive ECB commands.  (line 515)
+* show-tip-of-the-day:                   Interactive ECB commands.  (line 520)
+* sources-filter:                        Interactive ECB commands.  (line 524)
+* split-window:                          The edit-area.             (line 145)
+* split-window-horizontally:             The edit-area.             (line 155)
+* split-window-vertically:               The edit-area.             (line 164)
+* store-window-sizes:                    Interactive ECB commands.  (line 542)
+* submit-problem-report:                 Interactive ECB commands.  (line 562)
+* switch-to-buffer:                      The edit-area.             (line 199)
+* switch-to-buffer-other-window:         The edit-area.             (line 216)
+* toggle-auto-expand-tag-tree:           Interactive ECB commands.  (line 571)
+* toggle-compile-window:                 Interactive ECB commands.  (line 578)
+* toggle-compile-window-height:          Interactive ECB commands.  (line 588)
+* toggle-ecb-windows:                    Interactive ECB commands.  (line 596)
+* toggle-layout:                         Interactive ECB commands.  (line 602)
+* toggle-scroll-other-window-scrolls-compile: Interactive ECB commands.
+                                                                    (line 616)
+* update-directories-buffer:             Interactive ECB commands.  (line 622)
+* upgrade-options:                       Interactive ECB commands.  (line 625)
+* window-sync:                           Interactive ECB commands.  (line 632)
+
+
+File: ecb.info,  Node: Option Index,  Next: Concept Index,  Prev: Command Index,  Up: Top
+
+Option Index
+************
+
+This index contains all customizable options of ECB.
+
+*Please note*: All options in this index are listed without the prefix "ecb-"
+(e.g. the option `ecb-layout-name' is listed with name "layout-name").
+
+[index]
+* Menu:
+
+* activate-before-layout-draw-hook:      ecb-general.               (line   9)
+* activate-before-new-frame-created-hook: ecb-layout.               (line   9)
+* activate-hook:                         ecb-general.               (line  37)
+* activation-selects-ecb-frame-if-already-active: ecb-general.      (line  43)
+* add-path-for-not-matching-files:       ecb-directories.           (line   9)
+* advice-window-functions-signal-error:  ecb-layout.                (line  13)
+* after-directory-change-hook:           ecb-directories.           (line  44)
+* analyse-bucket-element-face:           ecb-analyse.               (line   7)
+* analyse-bucket-node-face:              ecb-analyse.               (line  14)
+* analyse-buffer-after-create-hook:      ecb-analyse.               (line  21)
+* analyse-buffer-name:                   ecb-analyse.               (line  29)
+* analyse-buffer-sync:                   ecb-analyse.               (line  40)
+* analyse-buffer-sync-delay:             ecb-analyse.               (line  57)
+* analyse-buffer-sync-hook:              ecb-analyse.               (line  71)
+* analyse-collapsed-buckets:             ecb-analyse.               (line  97)
+* analyse-face:                          ecb-analyse.               (line 136)
+* analyse-fontified-buckets:             ecb-analyse.               (line 144)
+* analyse-gen-tag-info-fn:               ecb-analyse.               (line 160)
+* analyse-general-face:                  ecb-analyse.               (line 171)
+* analyse-show-node-info:                ecb-analyse.               (line 180)
+* analyse-show-tag-info-fn:              ecb-analyse.               (line 196)
+* auto-activate:                         ecb-general.               (line  49)
+* auto-compatibility-check:              ecb-general.               (line  53)
+* auto-expand-directory-tree:            ecb-directories.           (line  34)
+* auto-expand-tag-tree:                  ecb-methods.               (line   9)
+* auto-expand-tag-tree-collapse-other:   ecb-methods.               (line  28)
+* auto-save-before-etags-methods-rebuild: ecb-non-semantic.         (line   9)
+* auto-update-methods-after-save:        ecb-methods.               (line  45)
+* basic-buffer-sync:                     ecb-tree-buffer.           (line   9)
+* basic-buffer-sync-delay:               ecb-tree-buffer.           (line  36)
+* basic-buffer-sync-hook:                ecb-tree-buffer.           (line  43)
+* before-activate-hook:                  ecb-general.               (line  66)
+* before-deactivate-hook:                ecb-general.               (line  77)
+* bucket-node-display <1>:               ecb-general.               (line  83)
+* bucket-node-display:                   ecb-tree-buffer.           (line  67)
+* cache-directory-contents:              ecb-directories.           (line  64)
+* cache-directory-contents-not:          ecb-directories.           (line 118)
+* change-layout-preserves-compwin-state: ecb-compilation.           (line 155)
+* clear-caches-before-activate:          ecb-general.               (line 101)
+* common-tree-buffer-after-create-hook:  ecb-tree-buffer.           (line  85)
+* compilation-buffer-names:              ecb-compilation.           (line   9)
+* compilation-major-modes:               ecb-compilation.           (line  23)
+* compilation-predicates:                ecb-compilation.           (line  32)
+* compile-window-height:                 ecb-compilation.           (line  47)
+* compile-window-prevent-shrink-below-height: ecb-compilation.      (line  81)
+* compile-window-temporally-enlarge:     ecb-compilation.           (line  93)
+* compile-window-width:                  ecb-compilation.           (line 117)
+* create-layout-file:                    ecb-create-layout.         (line   9)
+* deactivate-hook:                       ecb-general.               (line 115)
+* debug-mode:                            ecb-general.               (line 119)
+* default-tag-filter:                    ecb-methods.               (line  48)
+* directories-buffer-after-create-hook:  ecb-directories.           (line 142)
+* directories-buffer-name:               ecb-directories.           (line 153)
+* directories-general-face:              ecb-face-options.          (line   9)
+* directories-menu-sorter:               ecb-directories.           (line 165)
+* directories-menu-user-extension:       ecb-directories.           (line 180)
+* directories-menu-user-extension-function: ecb-directories.        (line 222)
+* directories-show-node-info:            ecb-directories.           (line 236)
+* directory-face:                        ecb-face-options.          (line  18)
+* directory-not-accessible-face:         ecb-face-options.          (line  26)
+* disable-semantic-threshold-alist:      ecb-methods.               (line  67)
+* display-default-dir-after-start:       ecb-directories.           (line 261)
+* display-image-icons-for-semantic-tags: ecb-methods.               (line  95)
+* ecb-create-layout-frame-height:        ecb-create-layout.         (line  12)
+* ecb-create-layout-frame-width:         ecb-create-layout.         (line  15)
+* enlarged-compilation-window-max-height: ecb-compilation.          (line 161)
+* eshell-auto-activate:                  ecb-eshell.                (line   9)
+* eshell-buffer-sync:                    ecb-eshell.                (line  14)
+* eshell-buffer-sync-delay:              ecb-eshell.                (line  30)
+* eshell-enlarge-when-eshell:            ecb-eshell.                (line  40)
+* eshell-fit-window-to-command-output:   ecb-eshell.                (line  44)
+* exclude-parents-regexp:                ecb-methods.               (line 100)
+* excluded-directories-regexps:          ecb-directories.           (line 279)
+* expand-methods-switch-off-auto-expand: ecb-methods.               (line 108)
+* find-external-tag-functions:           ecb-methods.               (line 123)
+* fix-window-size:                       ecb-layout.                (line  28)
+* font-lock-tags:                        ecb-methods.               (line 206)
+* grep-function:                         ecb-general.               (line 129)
+* grep-recursive-function:               ecb-general.               (line 143)
+* help-html-path:                        ecb-help.                  (line   9)
+* help-info-path:                        ecb-help.                  (line  24)
+* hide-ecb-windows-after-hook:           ecb-layout.                (line  57)
+* hide-ecb-windows-before-hook:          ecb-layout.                (line  67)
+* highlight-tag-with-point:              ecb-methods.               (line 212)
+* highlight-tag-with-point-delay:        ecb-methods.               (line 228)
+* history-bucket-node-face:              ecb-face-options.          (line  29)
+* history-buffer-after-create-hook:      ecb-history.               (line   9)
+* history-buffer-name:                   ecb-history.               (line  17)
+* history-dead-buffer-face:              ecb-face-options.          (line  36)
+* history-exclude-file-regexps:          ecb-history.               (line  28)
+* history-face:                          ecb-face-options.          (line  41)
+* history-general-face:                  ecb-face-options.          (line  49)
+* history-indirect-buffer-face:          ecb-face-options.          (line  58)
+* history-item-name:                     ecb-history.               (line  34)
+* history-make-buckets:                  ecb-history.               (line  37)
+* history-menu-sorter:                   ecb-history.               (line  68)
+* history-menu-user-extension:           ecb-history.               (line  80)
+* history-menu-user-extension-function:  ecb-history.               (line  98)
+* history-show-node-info:                ecb-history.               (line 112)
+* history-sort-ignore-case:              ecb-history.               (line 129)
+* history-sort-method:                   ecb-history.               (line 133)
+* history-stick-indirect-buffers-to-basebuffer: ecb-history.        (line 147)
+* host-accessible-check-valid-time:      ecb-directories.           (line 315)
+* ignore-display-buffer-function:        ecb-layout.                (line  79)
+* ignore-pop-up-frames:                  ecb-layout.                (line  98)
+* ignore-special-display:                ecb-layout.                (line 110)
+* key-map:                               ecb-general.               (line 147)
+* kill-buffer-clears-history:            ecb-history.               (line 162)
+* layout-always-operate-in-edit-window:  ecb-layout.                (line 126)
+* layout-debug-mode:                     ecb-layout.                (line 145)
+* layout-name:                           ecb-layout.                (line 163)
+* layout-window-sizes:                   ecb-layout.                (line 188)
+* major-modes-show-or-hide:              ecb-general.               (line 207)
+* maximize-ecb-window-after-selection:   ecb-layout.                (line 209)
+* maximize-next-after-maximized-select:  ecb-layout.                (line 257)
+* method-face:                           ecb-face-options.          (line  63)
+* method-non-semantic-face:              ecb-face-options.          (line  71)
+* methods-buffer-after-create-hook:      ecb-methods.               (line 240)
+* methods-buffer-name:                   ecb-methods.               (line 248)
+* methods-filter-replace-existing:       ecb-methods.               (line 259)
+* methods-general-face:                  ecb-face-options.          (line  76)
+* methods-menu-sorter:                   ecb-methods.               (line 276)
+* methods-menu-user-extension:           ecb-methods.               (line 288)
+* methods-menu-user-extension-function:  ecb-methods.               (line 299)
+* methods-nodes-collapse-spec:           ecb-methods.               (line 314)
+* methods-nodes-expand-spec:             ecb-methods.               (line 321)
+* methods-separate-prototypes:           ecb-methods.               (line 344)
+* methods-show-node-info:                ecb-methods.               (line 358)
+* minor-mode-text:                       ecb-general.               (line 215)
+* mode-line-data:                        ecb-mode-line.             (line   9)
+* mode-line-data-face:                   ecb-mode-line.             (line  39)
+* mode-line-display-window-number:       ecb-mode-line.             (line  44)
+* mode-line-prefix-face:                 ecb-mode-line.             (line  95)
+* mode-line-prefixes:                    ecb-mode-line.             (line  63)
+* mode-line-win-nr-face:                 ecb-mode-line.             (line 100)
+* mouse-click-destination:               ecb-tree-buffer.           (line  99)
+* new-ecb-frame:                         ecb-layout.                (line 282)
+* non-semantic-exclude-modes:            ecb-non-semantic.          (line  25)
+* non-semantic-methods-initial-expand:   ecb-non-semantic.          (line  37)
+* non-semantic-parsing-function:         ecb-non-semantic.          (line  43)
+* other-window-behavior:                 ecb-layout.                (line 285)
+* ping-options:                          ecb-directories.           (line 335)
+* ping-program:                          ecb-directories.           (line 341)
+* post-process-semantic-taglist:         ecb-methods.               (line 374)
+* prescan-directories-exclude-regexps:   ecb-directories.           (line 345)
+* prescan-directories-for-emptyness:     ecb-directories.           (line 283)
+* primary-secondary-mouse-buttons:       ecb-tree-buffer.           (line 127)
+* process-non-semantic-files:            ecb-non-semantic.          (line  71)
+* read-only-check-exclude-regexps:       ecb-sources.               (line   9)
+* rebuild-non-semantic-methods-before-hook: ecb-non-semantic.       (line  75)
+* redraw-layout-after-hook:              ecb-layout.                (line 377)
+* redraw-layout-before-hook:             ecb-layout.                (line 382)
+* redraw-layout-quickly:                 ecb-layout.                (line 386)
+* run-ediff-in-ecb-frame:                ecb-general.               (line 223)
+* scroll-other-window-scrolls-compile-window: ecb-compilation.      (line 187)
+* select-edit-window-on-redraw:          ecb-layout.                (line 390)
+* show-ecb-windows-after-hook:           ecb-layout.                (line 393)
+* show-ecb-windows-before-hook:          ecb-layout.                (line 414)
+* show-help-format:                      ecb-help.                  (line  38)
+* show-only-positioned-tags:             ecb-methods.               (line 396)
+* show-source-file-extension:            ecb-sources.               (line  15)
+* show-sources-in-directories-buffer:    ecb-directories.           (line 351)
+* show-tags:                             ecb-methods.               (line 409)
+* source-face:                           ecb-face-options.          (line  85)
+* source-file-regexps:                   ecb-sources.               (line  18)
+* source-in-directories-buffer-face:     ecb-face-options.          (line  93)
+* source-path:                           ecb-directories.           (line 354)
+* source-read-only-face:                 ecb-face-options.          (line 105)
+* sources-buffer-after-create-hook:      ecb-sources.               (line  61)
+* sources-buffer-name:                   ecb-sources.               (line  69)
+* sources-exclude-cvsignore:             ecb-sources.               (line  80)
+* sources-general-face:                  ecb-face-options.          (line  96)
+* sources-menu-sorter:                   ecb-sources.               (line  94)
+* sources-menu-user-extension:           ecb-sources.               (line 106)
+* sources-menu-user-extension-function:  ecb-sources.               (line 120)
+* sources-perform-read-only-check:       ecb-sources.               (line 134)
+* sources-show-node-info:                ecb-sources.               (line 151)
+* sources-sort-ignore-case:              ecb-sources.               (line 168)
+* sources-sort-method:                   ecb-sources.               (line 172)
+* speedbar-before-activate-hook:         ecb-speedbar.              (line   7)
+* speedbar-buffer-sync:                  ecb-speedbar.              (line  14)
+* speedbar-buffer-sync-delay:            ecb-speedbar.              (line  28)
+* speedbar-buffer-sync-hook:             ecb-speedbar.              (line  39)
+* split-edit-window-after-start:         ecb-layout.                (line 435)
+* stealthy-tasks-delay:                  ecb-general.               (line 232)
+* tag-display-function:                  ecb-methods.               (line 471)
+* tag-header-face:                       ecb-face-options.          (line 108)
+* tag-jump-sets-mark:                    ecb-methods.               (line 538)
+* tag-visit-post-actions:                ecb-methods.               (line 542)
+* tip-of-the-day:                        ecb-general.               (line 255)
+* tip-of-the-day-file:                   ecb-general.               (line 258)
+* toggle-layout-sequence:                ecb-layout.                (line 479)
+* tree-buffer-style:                     ecb-tree-buffer.           (line 177)
+* tree-do-not-leave-window-after-select: ecb-tree-buffer.           (line 227)
+* tree-easy-hor-scroll:                  ecb-tree-buffer.           (line 257)
+* tree-expand-symbol-before:             ecb-tree-buffer.           (line 280)
+* tree-image-icons-directories:          ecb-tree-buffer.           (line 305)
+* tree-incremental-search:               ecb-tree-buffer.           (line 336)
+* tree-indent:                           ecb-tree-buffer.           (line 342)
+* tree-make-parent-node-sticky:          ecb-tree-buffer.           (line 346)
+* tree-mouse-action-trigger:             ecb-tree-buffer.           (line 360)
+* tree-navigation-by-arrow:              ecb-tree-buffer.           (line 370)
+* tree-stickynode-indent-string:         ecb-tree-buffer.           (line 387)
+* tree-truncate-lines:                   ecb-tree-buffer.           (line 400)
+* truncate-long-names:                   ecb-tree-buffer.           (line 415)
+* type-tag-display:                      ecb-methods.               (line 569)
+* type-tag-expansion:                    ecb-methods.               (line 636)
+* use-recursive-edit:                    ecb-general.               (line 261)
+* use-speedbar-instead-native-tree-buffer: ecb-directories.         (line 374)
+* vc-directory-exclude-regexps:          ecb-version-control.       (line   9)
+* vc-enable-support:                     ecb-version-control.       (line  15)
+* vc-state-mapping:                      ecb-version-control.       (line  38)
+* vc-supported-backends:                 ecb-version-control.       (line  88)
+* version-check:                         ecb-general.               (line 265)
+* windows-height:                        ecb-layout.                (line 507)
+* windows-width:                         ecb-layout.                (line 511)
+* winman-escreen-number:                 ecb-winman.                (line   9)
+* winman-winring-name:                   ecb-winman.                (line  14)
+
+
+File: ecb.info,  Node: Concept Index,  Prev: Option Index,  Up: Top
+
+Concept Index
+*************
+
+[index]
+* Menu:
+
+* Activation hook-sequence:              Standard activation.       (line  14)
+* Adviced functions:                     The edit-area.             (line   9)
+* Analyse:                               Semantic analyser.         (line   6)
+* Analyze:                               Semantic analyser.         (line   6)
+* Automatic activation:                  Automatic activation.      (line   6)
+* Automatic deactivation:                Automatic activation.      (line   6)
+* BBDB:                                  Conflicts.                 (line  37)
+* bs package:                            Conflicts.                 (line  24)
+* bs-show:                               Conflicts.                 (line  24)
+* Bug report:                            Submitting problem report. (line   6)
+* calendar package:                      Conflicts.                 (line  48)
+* collapsing:                            Navigation/Selection.      (line   6)
+* compilation buffers:                   Temp- and compile-buffers. (line   6)
+* Creating new layouts:                  Creating a new ECB-layout. (line   6)
+* cygwin-mount package:                  Conflicts.                 (line  64)
+* Deactivation hook-sequence:            Standard activation.       (line  29)
+* desktop:                               Conflicts.                 (line  91)
+* Directories:                           ECB Directories-window.    (line   6)
+* Download:                              Downloading new versions.  (line   6)
+* ECB-layout:                            The ECB-layout.            (line   6)
+* ECB-windows:                           Overview.                  (line   6)
+* edebug:                                Conflicts.                 (line 132)
+* ediff:                                 Conflicts.                 (line 139)
+* edit-window:                           The edit-area.             (line   6)
+* escreen:                               Window-managers and ECB.   (line   6)
+* eshell:                                Using eshell.              (line   6)
+* expanding:                             Navigation/Selection.      (line   6)
+* Faces:                                 Changing faces.            (line   6)
+* Filter:                                Filtering the tree-buffers.
+                                                                    (line   6)
+* func-menu package:                     Conflicts.                 (line 151)
+* Gnus:                                  Conflicts.                 (line 161)
+* grep buffers:                          Temp- and compile-buffers. (line   6)
+* help buffers:                          Temp- and compile-buffers. (line   6)
+* Hide windows:                          Hiding the ECB windows.    (line   6)
+* History:                               ECB History-window.        (line   6)
+* Hooks:                                 List of hooks.             (line   8)
+* Incremental search:                    Incremental search.        (line   6)
+* JDEE:                                  Conflicts.                 (line 172)
+* layout:                                The ECB-layout.            (line   6)
+* Methods:                               ECB Methods-window.        (line   6)
+* minor mode:                            Standard activation.       (line  11)
+* mouse button:                          Using the mouse.           (line   6)
+* New layouts:                           Creating a new ECB-layout. (line   6)
+* non-semantic-sources:                  The Methods buffer.        (line  18)
+* other window:                          The other window.          (line   6)
+* POWER-click:                           Using the mouse.           (line  38)
+* primary button:                        Using the mouse.           (line   6)
+* Problem report:                        Submitting problem report. (line   6)
+* Redraw:                                Redrawing the ECB-layout.  (line   6)
+* RETURN key:                            Navigation/Selection.      (line   6)
+* scroll-all:                            Conflicts.                 (line 193)
+* scroll-all-mode:                       Conflicts.                 (line 193)
+* secondary button:                      Using the mouse.           (line   6)
+* semantic tag:                          Customizing the display.   (line   6)
+* semantic-sources:                      The Methods buffer.        (line  12)
+* SHIFT-click:                           Using the mouse.           (line  38)
+* Show windows:                          Hiding the ECB windows.    (line   6)
+* Small screen:                          Small screens.             (line   6)
+* Sources:                               ECB Sources-window.        (line   6)
+* special-display:                       Temp- and compile-buffers. (line 116)
+* Speedbar:                              Simulating speedbar.       (line   6)
+* TAB key:                               Navigation/Selection.      (line   6)
+* tag:                                   Customizing the display.   (line   6)
+* temporary buffers:                     Temp- and compile-buffers. (line   6)
+* tmm:                                   Using popup-menus.         (line   6)
+* tree-buffer:                           Overview.                  (line   6)
+* VC package:                            Conflicts.                 (line 202)
+* Version control:                       Conflicts.                 (line 202)
+* VM package:                            Conflicts.                 (line 208)
+* wb-line-number:                        Conflicts.                 (line 226)
+* window-manager:                        Window-managers and ECB.   (line   6)
+* winner:                                Conflicts.                 (line 219)
+* winner-mode:                           Conflicts.                 (line 219)
+* winring:                               Window-managers and ECB.   (line   6)
+* xrefactory:                            Conflicts.                 (line 237)
+
+
diff --git a/site/ecb-2.40/make.bat b/site/ecb-2.40/make.bat
new file mode 100755
index 0000000..c9703b2
--- /dev/null
+++ b/site/ecb-2.40/make.bat
@@ -0,0 +1,69 @@
+@echo off
+REM This batchfile byte-compiles the ECB lisp files.
+
+REM Copyright (C) 2000 - 2005 Jesper Nordenberg,
+REM                           Klaus Berndl,
+REM                           Kevin A. Burton,
+REM                           Free Software Foundation, Inc.
+
+REM Author: Jesper Nordenberg <mayhem@home.se>
+REM         Klaus Berndl <klaus.berndl@sdm.de>
+REM         Kevin A. Burton <burton@openprivacy.org>
+REM Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+REM Keywords: browser, code, programming, tools
+REM Created: 2001
+
+REM This program is free software; you can redistribute it and/or modify it under
+REM the terms of the GNU General Public License as published by the Free Software
+REM Foundation; either version 2, or (at your option) any later version.
+
+REM This program is distributed in the hope that it will be useful, but WITHOUT
+REM ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+REM FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+REM details.
+
+REM You should have received a copy of the GNU General Public License along with
+REM GNU Emacs; see the file COPYING.  If not, write to the Free Software
+REM Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+REM $Id: make.bat,v 1.29 2009/04/21 15:23:22 berndl Exp $
+
+
+REM Make sure you byte-compile ECB with the semantic, eieio and
+REM speedbar-version you load into (X)Emacs (see below)!
+
+REM =======================================================================
+REM user configurable section
+
+REM Define here the correct paths to your (X)Emacs-executable and the
+REM required CEDET-package (use always FORWARD SLASHES in the paths!)
+
+
+set EMACS=C:/Programme/emacs-22.3/bin/emacs.exe
+set CEDET=../cedet
+
+REM Call "make" to byte-compile the ECB.
+REM If there are any warning messages during byte-compilation (normally
+REM there aren't any) you can savely ignore them!
+
+REM end of user configurable section
+REM =======================================================================
+
+
+REM Do not change anything below!
+
+echo Byte-compiling ECB with LOADPATH= %SEMANTIC% %EIEIO% %SPEEDBAR%
+
+if exist ecb-compile-script-init del ecb-compile-script-init
+if exist ecb.elc del *.elc
+
+echo (add-to-list 'load-path nil) > ecb-compile-script-init
+echo (load-file "%CEDET%/common/cedet.el") >> ecb-compile-script-init
+echo (require 'ecb) >> ecb-compile-script-init
+echo (setq debug-on-error t) >> ecb-compile-script-init
+
+%EMACS% -batch -no-site-file -l ecb-compile-script-init --eval "(ecb-byte-compile t)"
+
+del ecb-compile-script-init
+
+REM End of make.bat
diff --git a/site/ecb-2.40/silentcomp.el b/site/ecb-2.40/silentcomp.el
new file mode 100755
index 0000000..285e7be
--- /dev/null
+++ b/site/ecb-2.40/silentcomp.el
@@ -0,0 +1,210 @@
+;;; silentcomp.el --- compile time setup for proper compilation
+
+;; Copyright (C) 2000 - 2005 Klaus Berndl,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: bytecompiling
+;; Created: 2002
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: silentcomp.el,v 1.5 2005/02/28 11:31:51 berndl Exp $
+
+;;; Location
+
+;; The latest version of this package is always available at
+;; http://www.emacswiki.org/elisp/index.html
+
+;;; Commentary:
+
+;; This file provides features to defeat the compiler warnings for selected
+;; symbols.
+;;
+;; This functionality ought to be provided by the byte compilers or some
+;; accompanying library. To use it from some package "foo.el", begin by
+;; putting the following code at the top of the file:
+;;
+;;   (eval-when-compile
+;;       (require 'silentcomp))
+;;
+;; At the end of foo.el there should normally be a "(provide 'foo)". Replace
+;; it with "(silentcomp-provide 'foo)"; that is necessary to restore the
+;; environment after the byte compilation. If you don't have a `provide' at
+;; the end, you have to add the following as the very last form in the file:
+;;
+;;   (eval-when-compile (silentcomp-restore-environment))
+;;
+;; Now everything is set to use the various macros in this package.
+;;
+;; To suppress byte compiler warnings, use the macros `silentcomp-defun',
+;; `silentcomp-defvar'
+;;
+;;
+;; Example:
+;;
+;; Suppose a file foo.el with the following code:
+;;
+;;     (defun nolog-message (&rest args)
+;;       "Works exactly like `message' but does not log the message"
+;;       (let ((msg (cond ((or (null args)
+;;                             (null (car args)))
+;;                         nil)
+;;                        ((null (cdr args))
+;;                         (car args))
+;;                        (t
+;;                         (apply 'format args)))))
+;;         ;; Now message is either nil or the formated string.
+;;         (if running-xemacs
+;;             ;; XEmacs way of preventing log messages.
+;;             (if msg
+;;                 (display-message 'no-log msg)
+;;               (clear-message 'no-log))
+;;           ;; Emacs way of preventing log messages.
+;;           (let ((message-log-max nil)
+;;                 (message-truncate-lines nil))
+;;             (if msg
+;;                 (message "%s" msg)
+;;               (message nil))))
+;;         msg))
+;;
+;; foo.el should be work for both of Emacs and XEmacs, so we use the functions
+;; `display-message' and `clear-message' for the XEmacs stuff and the
+;; variables `message-log-max' and `message-truncate-lines' for Emacs. The
+;; XEmacs-symbols are unbound in Emacs and vice versa. Therefore the
+;; bytecompiler throws warnings about undefined symbols. These warnings can
+;; savely be ignored but are nevertheless annoying and ugly especially if you
+;; have a lot of symbols existing in only one version of (X)Emacs.
+;;
+;; With silentcomp.el you can silence the bytecompiler for foo.el:
+;;
+;;      ,----
+;;      | foo.el
+;;      |
+;;      | (eval-when-compile
+;;      |     (require 'silentcomp))
+;;      | 
+;;      | ;; XEmacs
+;;      | (silentcomp-defun display-message)
+;;      | (silentcomp-defun clear-message)
+;;      | ;; Emacs
+;;      | (silentcomp-defvar message-log-max)
+;;      | (silentcomp-defvar message-truncate-lines)
+;;      |
+;;      | ;; Code
+;;      | (defun nolog-message (&rest args)
+;;      |    ...
+;;      | )
+;;      | 
+;;      | (silentcomp-provide 'foo)
+;;      | ;; foo.el ends here
+;;      `----
+
+
+;; This package is stolen from original cc-bytecomp.el from Martin Stjernholm
+;; who is the maintainer of cc-mode.
+
+
+
+;;; Code:
+
+(defvar silentcomp-unbound-variables nil)
+(defvar silentcomp-original-functions nil)
+(defvar silentcomp-environment-set nil)
+
+(defun silentcomp-restore-environment ()
+  ;; Eval'ed during compilation to restore variables, functions etc
+  ;; declared with `silentcomp-defvar' et al.
+  (if (not load-in-progress)
+      (let (p)
+	(setq p silentcomp-unbound-variables)
+	(while p
+	  (let ((var (car p)))
+	    (if (and (boundp var)
+		     (eq (intern (concat "silentcomp-ignore-var:"
+					 (symbol-name var)))
+			 var))
+		(makunbound var)))
+	  (setq p (cdr p)))
+	(setq p silentcomp-original-functions)
+	(while p
+	  (let ((fun (car (car p)))
+		(def (car (cdr (cdr (car p))))))
+	    (if (and (fboundp fun)
+		     (eq (intern (concat "silentcomp-ignore-fun:"
+					 (symbol-name fun)))
+			 (symbol-function fun)))
+		(if (eq def 'unbound)
+		    (fmakunbound fun)
+		  (fset fun def))))
+	  (setq p (cdr p)))
+	(setq silentcomp-environment-set nil))))
+
+(defun silentcomp-is-compiling ()
+  "Return non-nil if eval'ed during compilation.  Don't use outside
+`eval-when-compile'."
+  (and (boundp 'byte-compile-dest-file)
+       (stringp byte-compile-dest-file)))
+
+(defmacro silentcomp-defvar (var)
+  "Binds the symbol as a variable during compilation of the file,
+to silence the byte compiler.  Don't use within `eval-when-compile'."
+  `(eval-when-compile
+     (if (boundp ',var)
+	 nil
+       (if (not (memq ',var silentcomp-unbound-variables))
+	   (setq silentcomp-unbound-variables
+		 (cons ',var silentcomp-unbound-variables)))
+       (if (and (silentcomp-is-compiling)
+		(not load-in-progress))
+	   (progn
+	     (defvar ,var)
+	     (set ',var (intern (concat "silentcomp-ignore-var:"
+					(symbol-name ',var)))))))))
+
+(defmacro silentcomp-defun (fun)
+  "Bind the symbol as a function during compilation of the file,
+to silence the byte compiler.  Don't use within `eval-when-compile'.
+
+If the symbol already is bound as a function, it will keep that
+definition.  That means that this macro will not shut up warnings
+about incorrect number of arguments.  It's dangerous to try to replace
+existing functions since the byte compiler might need the definition
+at compile time, e.g. for macros and inline functions."
+  `(eval-when-compile
+     (if (not (assq ',fun silentcomp-original-functions))
+	 (setq silentcomp-original-functions
+	       (cons (list ',fun
+			   nil
+			   (if (fboundp ',fun)
+			       (symbol-function ',fun)
+			     'unbound))
+		     silentcomp-original-functions)))
+     (if (and (silentcomp-is-compiling)
+	      (not load-in-progress)
+	      (not (fboundp ',fun)))
+	 (fset ',fun (intern (concat "silentcomp-ignore-fun:"
+				     (symbol-name ',fun)))))))
+
+(defmacro silentcomp-provide (feature)
+  "A replacement for the `provide' form that restores the environment
+after the compilation.  Don't use within `eval-when-compile'."
+  `(progn
+     (eval-when-compile (silentcomp-restore-environment))
+     (provide ,feature)))
+
+(provide 'silentcomp)
+
+;;; silentcomp.el ends here
diff --git a/site/ecb-2.40/tree-buffer.el b/site/ecb-2.40/tree-buffer.el
new file mode 100644
index 0000000..cba3e25
--- /dev/null
+++ b/site/ecb-2.40/tree-buffer.el
@@ -0,0 +1,3379 @@
+;;; tree-buffer.el --- functions for tree buffers
+
+;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
+
+;; Author: Jesper Nordenberg <mayhem@home.se>
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;; Keywords: browser, code, programming, tools, tree
+;; Created: 2000
+
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
+
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+;; $Id: tree-buffer.el,v 1.180 2009/05/13 17:17:32 berndl Exp $
+
+;;; Commentary:
+
+;; Functions for tree buffers.
+;;
+;; This file is part of the ECB package which can be found at:
+;; http://ecb.sourceforge.net
+
+;;; History
+;;
+;; For the ChangeLog of this file see the CVS-repository. For a complete
+;; history of the ECB-package see the file NEWS.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'silentcomp))
+
+(eval-when-compile
+  ;; to avoid compiler grips
+  (require 'cl))
+
+;; XEmacs stuff
+(silentcomp-defun button-release-event-p)
+(silentcomp-defun button-press-event-p)
+(silentcomp-defun event-key)
+(silentcomp-defun extent-end-position)
+(silentcomp-defun event-glyph-extent)
+(silentcomp-defun event-over-glyph-p)
+(silentcomp-defun display-message)
+(silentcomp-defun clear-message)
+(silentcomp-defun locate-data-directory)
+(silentcomp-defun make-image-specifier)
+(silentcomp-defun make-glyph)
+(silentcomp-defun popup-menu-and-execute-in-window)
+(silentcomp-defun valid-image-instantiator-format-p)
+(silentcomp-defvar modeline-map)
+;; Emacs
+(silentcomp-defvar header-line-format)
+(silentcomp-defvar message-log-max)
+(silentcomp-defvar message-truncate-lines)
+(silentcomp-defun posn-window)
+(silentcomp-defun window-fringes)
+(silentcomp-defun frame-parameter)
+(silentcomp-defun frame-char-width)
+(silentcomp-defun event-start)
+(silentcomp-defun posn-point)
+(silentcomp-defun event-basic-type)
+(silentcomp-defun display-images-p)
+(silentcomp-defun image-type-available-p)
+(silentcomp-defun count-screen-lines)
+(silentcomp-defun tmm-prompt)
+(silentcomp-defun font-lock-add-keywords)
+(silentcomp-defvar cursor-in-non-selected-windows)
+;; timer stuff for XEmacs
+(silentcomp-defun delete-itimer)
+(silentcomp-defun start-itimer)
+
+(defconst tree-buffer-running-xemacs (featurep 'xemacs))
+
+;; miscellaneous differences
+
+(if tree-buffer-running-xemacs
+    ;; XEmacs
+    (progn
+      (defun tree-buffer-facep (face)
+        (memq face (face-list)))
+      (defalias 'tree-buffer-line-beginning-pos 'point-at-bol)
+      (defalias 'tree-buffer-line-end-pos 'point-at-eol)
+      (defun tree-buffer-frame-char-width (&optional frame)
+        (/ (frame-pixel-width frame) (frame-width frame)))
+      (defalias 'tree-buffer-window-display-height 'window-displayed-height)
+      (defun tree-buffer-event-to-key (event)
+        (typecase event
+          (button-release-event 'mouse-release)
+          (button-press-event 'mouse-press)
+          (otherwise
+           ;; the ignore-errors is a little hack because i don't know all
+           ;; events of XEmacs so sometimes event-key produces a
+           ;; wrong-type-argument error.
+           (ignore-errors (event-key event)))))
+      (defalias 'tree-buffer-event-window 'event-window)
+      (defalias 'tree-buffer-event-point 'event-point)
+      ;; stolen from dframe.el of the speedbar-library.
+      (defun tree-buffer-mouse-set-point (e)
+        "Set POINT based on event E. Handles clicking on images in XEmacs."
+        (mouse-set-point e)
+        (if (and (fboundp 'event-over-glyph-p) (event-over-glyph-p e))
+            ;; We are in XEmacs, and clicked on a picture
+            (let ((ext (event-glyph-extent e)))
+              ;; This position is back inside the extent where the
+              ;; junk we pushed into the property list lives.
+              (if (extent-end-position ext)
+                  (goto-char (1- (extent-end-position ext))))))))
+
+  ;; GNU Emacs
+  (defalias 'tree-buffer-facep 'facep)
+  (defalias 'tree-buffer-line-beginning-pos 'line-beginning-position)
+  (defalias 'tree-buffer-line-end-pos 'line-end-position)
+  ;; Klaus Berndl <klaus.berndl@sdm.de>: Is not really the same as
+  ;; `window-displayed-height' of XEmacs, because if the buffer-end is before
+  ;; the window-end (i.e. there are "empty" lines between window-end and last
+  ;; char of the buffer) then these empty-lines are not counted. But in the
+  ;; situations this function is used (only in tree-buffer-recenter) this
+  ;; doesn't matter.
+  (defalias 'tree-buffer-frame-char-width 'frame-char-width)
+  (defalias 'tree-buffer-window-display-height 'window-text-height)
+  (defun tree-buffer-event-window (event)
+    (posn-window (event-start event)))
+  (defun tree-buffer-event-point (event)
+    (posn-point (event-start event)))
+  (defalias 'tree-buffer-mouse-set-point 'mouse-set-point)
+  (defun tree-buffer-event-to-key (event)
+    (let ((type (event-basic-type event)))
+      (case type
+        ((mouse-1 mouse-2 mouse-3) 'mouse-release)
+        ((down-mouse-1 down-mouse-2 down-mouse-3) 'mouse-press)
+        (otherwise (event-basic-type event)))))
+  )
+
+;; overlay/extend stuff
+
+(if (not tree-buffer-running-xemacs)
+    (progn
+      (defalias 'tree-buffer-make-overlay   'make-overlay)
+      (defalias 'tree-buffer-overlay-put    'overlay-put)
+      (defalias 'tree-buffer-overlay-move   'move-overlay)
+      (defalias 'tree-buffer-overlay-delete 'delete-overlay)
+      (defalias 'tree-buffer-overlay-kill   'delete-overlay))
+  ;; XEmacs
+  (defalias 'tree-buffer-make-overlay   'make-extent)
+  (defalias 'tree-buffer-overlay-put    'set-extent-property)
+  (defalias 'tree-buffer-overlay-move   'set-extent-endpoints)
+  (defalias 'tree-buffer-overlay-delete 'detach-extent)
+  (defalias 'tree-buffer-overlay-kill   'delete-extent))
+
+
+;; timer stuff
+
+(if (not tree-buffer-running-xemacs)
+    (progn
+      (defalias 'tree-buffer-run-with-idle-timer 'run-with-idle-timer)
+      (defalias 'tree-buffer-cancel-timer 'cancel-timer))
+  ;; XEmacs
+  (if (fboundp 'run-with-idle-timer)
+      (defalias 'tree-buffer-run-with-idle-timer 'run-with-idle-timer)
+    (defun tree-buffer-run-with-idle-timer (secs repeat function &rest args)
+      "Perform an action the next time Emacs is idle for SECS seconds.
+If REPEAT is non-nil, do this each time Emacs is idle for SECS seconds.
+SECS may be an integer or a floating point number.
+The action is to call FUNCTION with arguments ARGS.
+
+This function returns a timer object which you can use in
+`tree-buffer-cancel-timer'."
+      (start-itimer "tree-buffer-idle-timer"
+                    function secs (if repeat secs nil)
+                    t (if args t nil) args)))
+
+  (if (fboundp 'cancel-timer)
+      (defalias 'tree-buffer-cancel-timer 'cancel-timer)
+    (defun tree-buffer-cancel-timer (timer)
+      "Remove TIMER from the list of active timers."
+      (delete-itimer timer))))  
+
+
+;; basic utilities
+
+(defun tree-buffer-copy-list (list)
+  "Return a copy of a LIST, which may be a dotted list.
+The elements of the list are not copied, just the list structure itself."
+  (if (fboundp 'copy-sequence)
+      (copy-sequence list)
+    (if (consp list)
+        (let ((res nil))
+          (while (consp list) (push (pop list) res))
+          (prog1 (nreverse res) (setcdr res list)))
+      (car list))))
+
+(defun tree-buffer-member (item list &optional test-fcn)
+  "Find the first occurrence of ITEM in LIST.
+Return the sublist of LIST whose car is ITEM. Comparison is done with `equal'
+unless TEST-FCN is not nil: In this case TEST-FCN will be used to compare ITEM
+with the elements of LIST. If TEST-FCN is `eq' then `memq' is called for
+optimization."
+  (if test-fcn
+      (if (eq test-fcn 'eq)
+          ;; some optimization
+          (memq item list)
+        (progn
+          (while (and list (not (funcall test-fcn item (car list))))
+            (setq list (cdr list)))
+          list))
+    (member item list)))
+
+(defun tree-buffer-position (seq elem &optional test-fcn)
+  "Return the position of ELEM within SEQ counting from 0. Comparison is done
+with `equal' unless TEST-FCN is not nil: In this case TEST-FCN will be used to
+compare ITEM with the elements of SEQ."
+  (if (listp seq)
+      (let ((pos (- (length seq) (length (tree-buffer-member elem seq test-fcn)))))
+        (if (= pos (length seq))
+            nil
+          pos))
+    (catch 'found
+      (dotimes (i (length seq))
+        (if (funcall (or test-fcn 'equal) elem (aref seq i))
+            (throw 'found i)))
+      nil)))
+
+(defun tree-buffer-last (seq)
+  "Return the last elem of the sequence SEQ."
+  (if (listp seq)
+      (car (last seq))
+    (if (> (length seq) 0)
+        (aref seq (1- (length seq)))
+      nil)))
+
+(defun tree-buffer-first (seq)
+  "Return the first elem of the sequence SEQ."
+  (if (listp seq)
+      (car seq)
+    (if (> (length seq) 0)
+        (aref seq 0)
+      nil)))
+  
+
+(defun tree-buffer-set-elt (seq n val)
+  "Set VAL as new N-th element of SEQ. SEQ can be any sequence. SEQ will be
+changed because this is desctructive function. SEQ is returned."
+  (if (listp seq)
+      (setcar (nthcdr n seq) val)
+    (aset seq n val))
+  seq)
+
+(defun tree-buffer-remove-elt (seq n)
+  "Remove N-th element from SEQ. SEQ can be any sequence. SEQ will be
+changed because this is desctructive function. SEQ is returned."
+  (delq 'tree-buffer-remove-marker
+        (tree-buffer-set-elt seq n 'tree-buffer-remove-marker)))
+
+(defsubst tree-buffer-aset (array idx newelt)
+  "Same as `aset' but returns changed ARRAY."
+  (aset array idx newelt)
+  array)
+
+(defun tree-buffer-nolog-message (&rest args)
+  "Works exactly like `message' but does not log the message"
+  (let ((msg (cond ((or (null args)
+                        (null (car args)))
+                    nil)
+                   ((null (cdr args))
+                    (car args))
+                   (t
+                    (apply 'format args)))))
+    ;; Now message is either nil or the formated string.
+    (if tree-buffer-running-xemacs
+        ;; XEmacs way of preventing log messages.
+        (if msg
+            (display-message 'no-log msg)
+          (clear-message 'no-log))
+      ;; Emacs way of preventing log messages.
+      (let ((message-log-max nil)
+            (message-truncate-lines nil))
+        (if msg
+            (message "%s" msg)
+          (message nil))))
+    msg))
+
+(defsubst tree-buffer-current-line ()
+  "Return the current line-number - the first line in a buffer has number 1."
+  (+ (count-lines 1 (point)) (if (= (current-column) 0) 1 0)))
+
+(defun tree-buffer-goto-line (line)
+  "Goto LINE, counting from line 1 at beginning of buffer.
+
+This function doesn't set the mark."
+  ;; Move to the specified line number in that buffer.
+  (save-restriction
+    (widen)
+    (goto-char 1)
+    (if (eq selective-display t)
+        (re-search-forward "[\n\C-m]" nil 'end (1- line))
+      (forward-line (1- line)))))
+
+;; debugging
+
+(defvar tree-buffer-debug-mode nil
+  "If not nil then all functions of tree-buffer which are debug-able write
+debug-messages to the message-log of Emacs. Ensure that this variable is opnlx
+not nil if you want find or report an error!")
+
+(defun tree-buffer-debug-error (&rest args)
+  "Run ARGS through `format' and write it to the *Messages*-buffer.
+Do nothing if `tree-buffer-debug-mode' is nil!"
+  (when tree-buffer-debug-mode
+    (message (concat (format "Tree-buffer-debug: [%s] "
+                             (format-time-string "%H:%M:%S"))
+                     (apply 'format args)))))
+
+;; tree-node
+
+(defstruct (tree-node
+            (:constructor -tree-node-new)
+            (:copier nil)
+            (:conc-name tree-node->))
+  name
+  type
+  data
+  children
+  parent
+  shrink-name
+  expandable
+  expanded
+  displayed-name
+  indentstr)
+
+(defun tree-node-new (name type data &optional not-expandable parent
+                           shrink-name)
+  "Create a new tree-node which can be displayed in a tree-buffer.
+A tree-node can have the following slots:
+
+  NAME: The name of the node. Regardless how the node is displayed; see
+  SHRINK-NAME and DISPLAYED-NAME.
+
+  TYPE: The type of the node; must currently be an interger!
+
+  DATA: The data of the node; can be arbitrary lisp-structures.
+
+  EXPANDED: If not nil then the node is currently expanded, means its children
+  are visible.
+
+  PARENT: The parent tree-node.
+
+  SHRINK-NAME: Decides if the NAME can be shortened when displayed in a
+  narrow tree buffer window. The following values are valid:
+  - beginning: The NAME is truncated at the beginning so the end is always
+    visible.
+  - end: The NAME is truncated at the end. If the tree-node is EXPANDABLE the
+    name is truncated so that the expand symbol is visible.
+  - nil: The NAME is never truncated. In this case DISPLAYED-NAME is equal to
+    NAME.
+
+  CHILDREN: List of children tree-nodes.
+
+  EXPANDABLE: If not nil then the node is expandable means has children.
+
+  INDENTSTR: Containes the full indentation-string for the node. So a single
+  node can easily be redrawn.
+
+  DISPLAYED-NAME: Contains the current displayed name of the node. The
+  displayed name can be different from the NAME according to the value of
+  SHRINK-NAME.
+
+For all parameters except NOT-EXPANDABLE the description is available in the
+slot-list above. If the first optional argument NOT-EXPANDABLE is set to not
+nil then the slot EXPANDABLE will be set to nil; otherwise to t.
+
+See Info node `(ecb)tree-buffer' for all details of using tree-nodes."
+  (let ((n (-tree-node-new :name name
+                           :type type
+                           :data data
+                           :expandable (not not-expandable)
+                           :parent parent
+                           :shrink-name shrink-name
+                           :children nil
+                           :expanded nil
+                           :displayed-name nil
+                           :indentstr nil)))
+    (when (and parent (tree-node-p parent))
+      (tree-node-add-children parent n))
+    n))
+
+(defsubst tree-node-indentlength (node)
+  "Return the length of slot INDENTSTR."
+  (length (tree-node->indentstr node)))
+
+(defsubst tree-node-linelength (node)
+  "Return the length of the full node display in current tree-buffer.
+This is the length of the indentation \(slot INDENTSTR) plus the length of the
+slot DISPLAYED-NAME of NODE."
+  (+ (length (tree-node->displayed-name node))
+     (tree-node-indentlength node)))
+
+(defsubst tree-node-toggle-expanded (node)
+  "Toggle the value of slot EXPANDED."
+  (setf (tree-node->expanded node) (not (tree-node->expanded node))))
+
+(defun tree-node-indent-level (node)
+  "Return indentation-level of NODE.
+Top-level nodes \(children of the root-node) have level 0."
+  (let ((parent (tree-node->parent node)))
+    (if (eq parent (tree-buffer-get-root))
+        0
+      (1+ (tree-node-indent-level parent)))))
+
+(defun tree-node-new-root ()
+  "Creates a new root node.
+The root node has always NAME=\"root\", TYPE=-1 and DATA=nil. The root node
+will not be displayed. Only the root-node is allowed to have as TYPE -1!"
+  (tree-node-new "root" -1 nil))
+
+(defun tree-node-update (node name type data expandable shrink-name)
+  "Update NODE with setable datas.
+Each of the arguments NAME, SHRINK-NAME, TYPE, DATA and EXPANDABLE can have
+the special value 'use-old-value\; this means that this attribute/slot of NODE
+will not be updated."
+  (unless (eq name 'use-old-value)
+    (setf (tree-node->name node) name))
+  (unless (eq shrink-name 'use-old-value)
+    (setf (tree-node->shrink-name node) shrink-name))
+  (unless (eq type 'use-old-value)
+    (setf (tree-node->type node) type))
+  (unless (eq data 'use-old-value)
+    (setf (tree-node->data node) data))
+  (unless (eq expandable 'use-old-value)
+    (setf (tree-node->expandable node) expandable)))
+
+(defun tree-node-add-children (node children &optional at-beginning)
+  "Add new CHILDREN to the already existing children of NODE.
+If the optional arg AT_BEGINNING is not nil then the new CHILDREN will be
+added to the beginning of the existing children of NODE otherwise to the end
+\(default). CHILDREN must be either a single tree-node object or a list of
+tree-nodes."
+  (let ((c-list (typecase children
+                  (tree-node (list children))
+                  (list children)
+                  (otherwise
+                   (error "Children must be either a single tree-node or a list of tree-nodes.")))))
+    ;; set NODE as parent of all new CHILDREN
+    (dolist (c c-list)
+      (setf (tree-node->parent c) node))
+    ;; add the new CHILDREN to the existing ones
+    (setf (tree-node->children node)
+          (if at-beginning
+              (append c-list (tree-node->children node))
+            (append (tree-node->children node) c-list)))))
+
+(defsubst tree-node-sort-children (node sortfn)
+  "Run `sort' for the children of NODE with SORTFN as sorting-function.
+SORTFN must be a function acceptable by `sort'. The sorted children-list
+become the new children of NODE."
+  (setf (tree-node->children node)
+        (sort (tree-node->children node) sortfn)))
+
+(defsubst tree-node-remove-child (node child)
+  "Removes the CHILD from the childrens of NODE."
+  (setf (tree-node->parent child) nil)
+  (setf (tree-node->children node)
+        (delq child (tree-node->children node))))
+
+(defun tree-node-find-child-by-data/name (node child-data &optional child-name)
+  "Finds the first child with the given CHILD-DATA.
+CHILD-DATA will be compared with the data of each children of NODE by calling
+`tree-buffer-node-data-equal-p'.
+If CHILD-NAME is set then also the name of the child will be compared with
+CHILD-NAME and must match."
+  (catch 'exit
+    (dolist (child (tree-node->children node))
+      (when (and (tree-buffer-node-data-equal-p (tree-node->data child)
+                                                child-data)
+                 (or (null child-name)
+                     (string= child-name (tree-node->name child))))
+        (throw 'exit child)))))
+
+(defun tree-node-remove-child-by-data/name (node child-data &optional child-name)
+  "Removes the first child with the given CHILD-DATA.
+Returns the removed child. CHILD-DATA will be compared with the data of each
+children of NODE by calling `tree-buffer-node-data-equal-p'.
+If CHILD-NAME is set then also the name of the child will be compared with
+CHILD-NAME and must match."
+  (catch 'exit
+    (let ((last-cell nil)
+	  (cell (tree-node->children node)))
+      (while cell
+	(when (and (tree-buffer-node-data-equal-p (tree-node->data (car cell))
+                                                  child-data)
+                   (or (null child-name)
+                       (string= child-name (tree-node->name (car cell)))))
+	  (if last-cell
+	      (setcdr last-cell (cdr cell))
+	    (setf (tree-node->children node) (cdr cell)))
+	  (setcdr cell nil)
+	  (setf (tree-node->parent (car cell)) nil)
+	  (throw 'exit cell))
+	(setq last-cell cell)
+	(setq cell (cdr cell))))))
+
+(defun tree-node-find-child-by-name (node child-name)
+  "Return the first child of NODE with name CHILD-NAME."
+  (catch 'exit
+    (dolist (child (tree-node->children node))
+      (when (equal (tree-node->name child) child-name)
+        (throw 'exit child)))))
+
+(defun tree-node-search-subtree-by-data/name (start-node data &optional name)
+  "Search the full subtree of START-NODE for the first \(sub-)node with DATA.
+If NAME is set then not only the data but also the name must match.
+The \"full subtree\" means the START-NODE itself, its children, their grandchildren
+etc. The search is done by a depth-first-search. Data-comparison is performed
+with `tree-buffer-node-data-equal-p', name-comparison with `string='."
+  (if (and (tree-buffer-node-data-equal-p data (tree-node->data start-node))
+           (or (null name) (string= name (tree-node->name start-node))))
+      start-node
+    (catch 'exit
+      (dolist (child (tree-node->children start-node))
+	(let ((n (tree-node-search-subtree-by-data/name child data name)))
+	  (when n
+	    (throw 'exit n)))))))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: add this to texi
+(defun tree-node-map-subtree (start-node map-fcn)
+  "Apply MAP-FCN to full subtree of START-NODE and make a list of the results.
+MAP-FCN is a function which gets a node of this subtree as argument.
+
+Full subtree means the START-NODE itself and all its children and
+all the grandchildren and so on; to each of these nodes MAP-FCN
+is applied. If START-NODE is the root-node of current tree-buffer
+then the START-NODE itself is not passed to MAP-FCN.
+
+Often it is recommendable to apply a `delq' nil to the result
+when the MAP-FCN does only perform for certain nodes, i.e. return
+not nil only for certain nodes.
+
+The subtree is walked by a depth-first-walk."
+  (let ((result (unless (equal start-node (tree-buffer-get-root))
+                  (mapcar map-fcn (list start-node)))))
+    (dolist (child (tree-node->children start-node))
+      (setq result
+            (append result (tree-node-map-subtree child map-fcn))))
+    result))
+
+;; (defun tree-node-map-subtree-test ()
+;;   (save-excursion
+;;     (set-buffer ecb-methods-buffer-name)
+;;     (let ((reslist (tree-node-map-subtree
+;;                     (tree-buffer-get-root)
+;;                     (function
+;;                      (lambda (node)
+;;                        (when (= (tree-node->type node)
+;;                                 ecb-methods-nodetype-tag)
+;;                          (ecb--semantic-tag-name (tree-node->data node))))))))
+;;       reslist)))
+
+
+;; ------- tree-buffer local variables ----------------------------------
+
+(defvar tree-buffer-root nil
+  "The \(not displayed) root-node of each tree-buffer.
+The value is buffer-local in each tree-buffer.")
+
+(defvar tree-buffer-displayed-nodes nil
+  "Contains all the current visible nodes of current tree-buffer in
+top-to-bottom order. This variable is buffer-local in each tree-buffer!")
+
+(defsubst tree-buffer-initialize-displayed-nodes ()
+  "Initialize the `tree-buffer-displayed-nodes' with nil."
+  (setq tree-buffer-displayed-nodes nil))
+
+(defsubst tree-buffer-number-of-displayed-nodes ()
+  "Return the number of current displayed nodes."
+  (length tree-buffer-displayed-nodes))
+
+(defsubst tree-buffer-nth-displayed-node (n)
+  "Return the N-th displayed node of current tree-buffer.
+Counts from 0 whereas the 0-th node is the topmost displayed node."
+  (nth n tree-buffer-displayed-nodes))
+
+(defun tree-buffer-find-displayed-node-by-data/name (node-data &optional
+                                                               node-name start-node)
+  "Find the first displayed node in current tree-buffer having data NODA-DATA.
+When START-NODE is nil then all currently visible nodes are searched beginning
+with the first one otherwise START-NODE is the startpoint for the search.
+
+If NODE-NAME is not nil then it must be A STRING and only a node
+is found which has the same node-NAME.
+
+If the search has success then the found node is returend."
+  (catch 'exit
+    (let ((node-list (if (or (null start-node)
+                             (eq start-node (tree-buffer-get-root)))
+                         tree-buffer-displayed-nodes
+                       ;; we need that sub-list of tree-buffer-displayed-nodes
+                       ;; which has the start-node as first elem. But we can
+                       ;; not calling `member' for this search because this
+                       ;; can result in a stack-overflow in equal for large
+                       ;; node-lists especially with complex-data (e.g.
+                       ;; semantic tags). Therefore we use `memq'.
+                       (or (tree-buffer-member start-node
+                                               tree-buffer-displayed-nodes
+                                               'eq)
+                           tree-buffer-displayed-nodes))))
+      (dolist (node node-list)
+        (when (and (tree-buffer-node-data-equal-p (tree-node->data node)
+                                                  node-data)
+                   (or (null node-name)
+                       (and (stringp node-name)
+                            (string= (tree-node->name node) node-name))))
+          (throw 'exit node))))))
+
+(defun tree-buffer-search-displayed-node-list (search-fcn)
+  "Call SEARCH-FCN for each currently visible node in current tree-buffer.
+Return the first node for which SEARCH-FCN returns not nil."
+  (catch 'exit
+    (dolist (node tree-buffer-displayed-nodes)
+      (when (funcall search-fcn node)
+        (throw 'exit node)))))
+
+(defun tree-buffer-displayed-node-nr (node)
+  "Return the number of NODE in the node-sequence of current tree-buffer.
+Nodes are compared by `eq'! Number is counted from 0 whereas the topmost
+displayed node ha number 0."
+  (tree-buffer-position tree-buffer-displayed-nodes node 'eq))
+
+(defun tree-buffer-displayed-node-linenr (node)
+  "Return the line-number of NODE in current tree-buffer.
+Nodes are compared by `eq'."
+  (1+ (tree-buffer-displayed-node-nr node)))
+
+(defsubst tree-buffer-add-to-displayed-nodes (node)
+  "Add NODE at the end of the displayed nodes `tree-buffer-displayed-nodes'."
+  (setq tree-buffer-displayed-nodes
+        (append tree-buffer-displayed-nodes (list node))))
+
+(defsubst tree-buffer-displayed-nodes-remove-nth (n)
+  "Remove the N-th node from the displayed nodes `tree-buffer-displayed-nodes'."
+  (tree-buffer-remove-elt tree-buffer-displayed-nodes n))
+
+(defsubst tree-buffer-displayed-nodes-remove-node (node)
+  "Remove NODE from the displayed nodes `tree-buffer-displayed-nodes'."
+  (setq tree-buffer-displayed-nodes
+        (delq node tree-buffer-displayed-nodes)))
+
+(defsubst tree-buffer-displayed-nodes-replace-nth (n new-node)
+  "Replace the N-th node with NEW-NODE in `tree-buffer-displayed-nodes'.
+Return the updated list."
+  (tree-buffer-set-elt tree-buffer-displayed-nodes n new-node))
+
+(defun tree-buffer-displayed-nodes-replace-node (node new-node)
+  "Replace NODE with NEW-NODE in `tree-buffer-displayed-nodes'.
+Return the updated list."
+  (let ((memq-list (tree-buffer-member node tree-buffer-displayed-nodes 'eq)))
+    (if memq-list
+        (setcar memq-list new-node)))
+  tree-buffer-displayed-nodes)
+
+(defsubst tree-buffer-set-displayed-nodes (displayed-nodes)
+  "Set `tree-buffer-displayed-nodes' to DISPLAYED-NODES.
+DISPLAYED-NODES which has to be a list of node-objects. Replaces the old list
+of displayed-nodes."
+  (setq tree-buffer-displayed-nodes displayed-nodes))
+
+(defsubst tree-buffer-displayed-nodes-copy ()
+  "Return a copy of the displayed-nodes-list `tree-buffer-displayed-nodes'.
+Only the list-structure is copied not the elements itself."
+  (tree-buffer-copy-list tree-buffer-displayed-nodes))
+
+(defsubst tree-buffer-map-displayed-nodes (function)
+  "Apply function to each node of `tree-buffer-displayed-nodes'.
+Make a list of the results. The result is a list just as long as
+`tree-buffer-displayed-nodes'."
+  (mapcar (function (lambda (n)
+                      (funcall function n)))
+          tree-buffer-displayed-nodes))
+
+;; rest of tree-buffer local variables
+
+(defvar tree-buffer-frame nil
+  "The frame the tree-buffer lives in.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-key-map nil
+  "The local keymap of current tree-buffer.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-highlighted-node nil
+  "The data of that node which is currently highlighted.
+It's a list with three elements: The first element is the data-slot of the
+node, the second one is the name-slot and the third one is the node object
+itself.
+
+This variable is only set by `tree-buffer-highlight-node-by-data/name'.
+
+The value is buffer-local in current tree-buffer.")
+
+(defun tree-buffer-highlighted-node-matches-data/name-p (data name)
+  "return not nil iff currently highlighted node matches passed data and name.
+
+Currently highlighted node is stored in `tree-buffer-highlighted-node'."
+  (and (tree-buffer-node-data-equal-p data (nth 0 tree-buffer-highlighted-node))
+       ;; if stored name is nil then it has not been set by
+       ;; `tree-buffer-highlight-node-by-data/name' and is therefore not
+       ;; valid to compare. If set it must match the passed name.
+       (or (null (nth 1 tree-buffer-highlighted-node))
+           (and (stringp name)
+                (string= name (nth 1 tree-buffer-highlighted-node))))))
+
+
+(defvar tree-buffer-highlight-overlay nil
+  "Overlay \(rsp. extent for XEmacs) used for highlighting current node.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-general-overlay nil
+  "Overlay \(rsp. extent for XEmacs) used for displaying the whole content.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-spec nil
+  "A Buffer local object of type tree-buffer-spec.")
+
+(defvar tree-buffer-hscroll-number 0
+  "Current value of horizontal tree-buffer-scrolling'.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-sticky-parent-node-function nil
+  "Function used to get that parent node which should be sticky.
+This function gets as argument a node and should either return nil \(if there
+is not suitable parent node) or node. This node will be display as sticky in
+the header-line of the tree-buffer.")
+
+
+;; tree-buffer specification
+
+(defstruct (tree-buffer-spec
+            (:constructor -tree-buffer-spec-new)
+            (:copier nil)
+            (:conc-name tree-buffer-spec->))
+  (tree-indent nil :read-only t)
+  (menu-creator nil :read-only t)
+  (menu-titles nil :read-only t)
+  (modeline-menu-creator :read-only t)
+  (sticky-parent-p :read-only t)
+  (sticky-indent-string :read-only t)
+  (sticky-parent-fn :read-only t)
+  (type-facer nil :read-only t)
+  (expand-symbol-before-p nil :read-only t)
+  (mouse-action-trigger nil :read-only t)
+  (is-click-valid-fn nil :read-only t)
+  (node-selected-fn nil :read-only t)
+  (node-expanded-fn nil :read-only t)
+  (node-collapsed-fn nil :read-only t)
+  (node-mouse-over-fn nil :read-only t)
+  (mouse-highlight-fn nil :read-only t)
+  (node-data-equal-fn nil :read-only t)
+  (after-update-hook nil :read-only t)
+  (maybe-empty-node-types nil :read-only t)
+  (leaf-node-types nil :read-only t)
+  (general-face nil :read-only t)
+  (incr-search-additional-pattern nil :read-only t)
+  (incr-search-p nil :read-only t)
+  (reduce-tree-for-incr-search-fn :read-only t)
+  (hor-scroll-step nil :read-only t)
+  (default-images-dir nil :read-only t)
+  (additional-images-dir nil :read-only t)
+  (image-file-prefix nil :read-only t)
+  (style nil :read-only t)
+  (ascii-guide-face nil :read-only t))
+
+(defun* tree-buffer-spec-new (&key
+                              tree-indent
+                              menu-creator
+                              menu-titles
+                              modeline-menu-creator
+                              sticky-parent-p
+                              sticky-indent-string
+                              sticky-parent-fn
+                              type-facer
+                              expand-symbol-before-p
+                              mouse-action-trigger
+                              is-click-valid-fn
+                              node-selected-fn
+                              node-expanded-fn
+                              node-collapsed-fn
+                              node-mouse-over-fn
+                              mouse-highlight-fn
+                              node-data-equal-fn
+                              after-update-hook
+                              maybe-empty-node-types
+                              leaf-node-types
+                              general-face
+                              incr-search-additional-pattern
+                              incr-search-p
+                              reduce-tree-for-incr-search-fn
+                              hor-scroll-step
+                              default-images-dir
+                              additional-images-dir
+                              image-file-prefix
+                              style
+                              ascii-guide-face)
+  "Creates and returns a new specification object for current tree-buffer.
+
+The arguments are key-arguments of the form :arg-name arg-value, so for
+example a call looks like \(tree-buffer-spec-new :menu-creator 'creator...)
+The key-arguments can be arranged in any arbitrary order but all of them are
+not-optional! The key-arg-name is always a : followed by the lowercase version
+of the mentioned argument \(e.g. MENU-CREATOR --> :menu-creator)
+
+See `tree-buffer-create' for a description of the arguments."
+  (let ((my-style (tree-buffer-real-style style)))
+    (-tree-buffer-spec-new :menu-creator menu-creator
+                           :menu-titles menu-titles
+                           :modeline-menu-creator modeline-menu-creator
+                           :sticky-parent-p sticky-parent-p
+                           :sticky-indent-string sticky-indent-string
+                           :sticky-parent-fn sticky-parent-fn
+                           :type-facer type-facer
+                           :mouse-action-trigger mouse-action-trigger
+                           :is-click-valid-fn is-click-valid-fn
+                           :node-selected-fn node-selected-fn
+                           :node-expanded-fn node-expanded-fn
+                           :node-collapsed-fn node-collapsed-fn
+                           :node-mouse-over-fn node-mouse-over-fn
+                           :mouse-highlight-fn mouse-highlight-fn
+                           :node-data-equal-fn node-data-equal-fn
+                           :after-update-hook
+                           (if (functionp after-update-hook)
+                               (list after-update-hook)
+                             after-update-hook)
+                           :maybe-empty-node-types maybe-empty-node-types
+                           :leaf-node-types leaf-node-types
+                           :general-face general-face
+                           :incr-search-additional-pattern incr-search-additional-pattern
+                           :incr-search-p incr-search-p
+                           :reduce-tree-for-incr-search-fn
+                           (or (and (functionp reduce-tree-for-incr-search-fn)
+                                    reduce-tree-for-incr-search-fn)
+                               'ignore)
+                           :hor-scroll-step hor-scroll-step
+                           :default-images-dir default-images-dir
+                           :additional-images-dir additional-images-dir
+                           :image-file-prefix image-file-prefix
+                           :style my-style
+                           :expand-symbol-before-p (if (equal 'image my-style)
+                                                       t
+                                                     expand-symbol-before-p)
+                           :tree-indent
+                           (cond ((equal 'image my-style)
+                                  tree-buffer-indent-with-images)
+                                 (expand-symbol-before-p
+                                  (if (< tree-indent
+                                         tree-buffer-indent-w/o-images-before-min)
+                                      tree-buffer-indent-w/o-images-before-min
+                                    tree-indent))
+                                 (t ;; after
+                                  (if (< tree-indent
+                                         tree-buffer-indent-w/o-images-after-min)
+                                      tree-buffer-indent-w/o-images-after-min
+                                    tree-indent)))
+                           :ascii-guide-face ascii-guide-face)))
+
+;; incremental search in a tree-buffer 
+
+(defconst tree-buffer-incr-searchpattern-expand-prefix
+  "\\(\\[[^][]+\\] ?\\)?\\[?"
+  "The prefix ignores all expand/collapse-buttons: \[+], \[x], rsp. \[-]")
+
+(defvar tree-buffer-incr-searchpattern nil
+  "Current search pattern when a inremental search is active.
+The value is buffer-local in current tree-buffer.")
+
+(defvar tree-buffer-last-incr-searchpattern nil
+  "Most recent used search-pattern for incremental search.
+Used to compared with the value of `tree-buffer-incr-searchpattern'.
+The value is buffer-local in current tree-buffer.")
+
+;; This can not be part of `tree-buffer-spec' because then a call to
+;; `tree-buffer-gen-searchpattern-indent-prefix' would be necessary *before*
+;; the tree-buffer-spec object is created and this would cause a cyclic
+;; dependency in `tree-buffer-real-style'.
+(defvar tree-buffer-incr-searchpattern-indent-prefix nil
+  "Prefix-pattern which ignores all not interesting basic stuff of a displayed
+tag at incr. search. The following contents of a displayed tag are ignored
+by this pattern:
+- beginning spaces and guide characters \(|`-)
+This prefix is computed by `tree-buffer-gen-searchpattern-indent-prefix'!
+The value is buffer-local in current tree-buffer.")
+
+;; --- tree-buffer-local data-storage with get- and set-function --------
+
+(defvar tree-buffer-data-store nil
+  "Arbitrary data-storage which is buffer-local for each tree-buffer.
+Use `tree-buffer-set-data-store' and `tree-buffer-get-data-store' to set and
+get the data.")
+
+(defsubst tree-buffer-set-data-store (data)
+  "Set `tree-buffer-data-store' to DATA."
+  (setq tree-buffer-data-store data))
+
+(defsubst tree-buffer-get-data-store ()
+  "Return the current value of `tree-buffer-data-store'."
+  tree-buffer-data-store)
+
+;; ------- image support ------------------------------------------------
+
+(defvar tree-buffer-local-image-cache nil
+  "Alist with car is one of the names in
+`tree-buffer-tree-image-names' and cdr is an associated image-object.")
+
+(defvar tree-buffer-images-can-be-used nil
+  "INTERNAL - DO NOT USE AND CHANGE!")
+(defvar tree-buffer-images-can-be-used-init-p nil
+  "INTERNAL - DO NOT USE AND CHANGE!")
+
+(defun tree-buffer-images-can-be-used ()
+  "Not nil if images can be used with current Emacs setup."
+  (if tree-buffer-images-can-be-used-init-p
+      tree-buffer-images-can-be-used
+    (setq tree-buffer-images-can-be-used-init-p t)
+    (setq tree-buffer-images-can-be-used
+          (and (or (fboundp 'defimage)
+                   (fboundp 'make-image-specifier))
+               (if (fboundp 'display-images-p)
+                   (display-images-p)
+                 window-system)))))
+
+(defvar tree-buffer-image-properties-emacs
+  '(:ascent center :mask (heuristic t))
+  "Properties of GNU Emacs images.")
+
+(defvar tree-buffer-image-properties-xemacs
+  nil
+  "Properties of XEmacs images.")
+
+(defvar tree-buffer-enable-xemacs-image-bug-hack
+  tree-buffer-running-xemacs
+  "If true then tree-buffer tries to deal best with the XEmacs-bug to display
+adjacent images not correctly. Set this to nil if your XEmacs-version has fixed
+this bug.")
+
+(defconst tree-buffer-image-formats
+  '((xpm ".xpm") (png ".png") (gif ".gif") (jpeg ".jpg" ".jpeg")
+    (xbm ".xbm")))
+
+(defconst tree-buffer-expand-symbol-length 3)
+(defconst tree-buffer-indent-with-images 3)
+(defconst tree-buffer-indent-w/o-images-before-min 3)
+(defconst tree-buffer-indent-w/o-images-after-min 2)
+
+(defconst tree-buffer-tree-image-names
+  '(("open"      . ((after . "[-]") (before . "[-]")))
+    ("close"     . ((after . "[+]") (before . "[+]")))
+    ("empty"     . ((after . "[x]") (before . "[x]")))
+    ("leaf"      . ((after . "*")   (before . "*")))
+    ("guide"     . ((after . "|")   (before . " |")))
+    ("no-guide"  . ((after . " ")   (before . "  ")))
+    ("end-guide" . ((after . "`")   (before . " `")))
+    ("handle"    . ((after . "-")   (before . "-")))
+    ("no-handle" . ((after . " ")   (before . " "))))
+  "This alist contains all allowed tree-image-names and their corresponding
+ascii-representation. Currently allowed names for tree-images and current
+ascii-symbols are: open, close, empty, leaf, guide, noguide, end-guide,
+handle, no-handle. See the value of this constant for the ascii-symbols
+related to the names.")
+
+(if tree-buffer-running-xemacs
+    (progn
+      (defsubst tree-buffer-create-image (file type)
+        "Create an image of type TYPE from FILE. Return the new image."
+        (apply 'make-glyph
+               `([,type :file ,file
+                        ,@tree-buffer-image-properties-xemacs])))
+      (defsubst tree-buffer-image-type-available-p (type)
+        "Return non-nil if image type TYPE is available.
+Image types are symbols like `xbm' or `jpeg'."
+        (valid-image-instantiator-format-p type)))
+  (defsubst tree-buffer-create-image (file type)
+    (apply 'create-image
+           `(,file ,type nil
+                   ,@tree-buffer-image-properties-emacs)))
+  (defsubst tree-buffer-image-type-available-p (type)
+    "Return non-nil if image type TYPE is available.
+Image types are symbols like `xbm' or `jpeg'."
+    (image-type-available-p type)))
+
+(defun tree-buffer-real-style (&optional style)
+  "Return the currently used style of the tree-buffer. If \X)Emacs allows
+displaying images then this is simply the value of the slot STYLE of
+`tree-buffer-spec'. Otherwise the style 'image is replaced by 'ascii-guides.
+If the optional arg STYLE is not nil then this is used instead of the slot
+STYLE of `tree-buffer-spec'. Allowed values of STYLE are nil, 'image,
+'ascii-guides, ascii-no-guides."
+  (let ((my-style (or style (tree-buffer-spec->style tree-buffer-spec))))
+    (if (tree-buffer-images-can-be-used)
+        my-style
+      (if (equal my-style 'image)
+          'ascii-guides
+        my-style))))
+
+(defsubst tree-buffer-ascii-symbol-4-image-name (name)
+  "Return the ascii-symbol which displays the tree-image NAME. This is done
+according to the value of the slot EXPAND-SYMBOL-BEFORE-P of
+`tree-buffer-spec'. It always returns a copy of the registered string in
+`tree-buffer-tree-image-names'!"
+  (let ((sym (if (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec)
+                 'before
+               'after)))
+    ;; Klaus Berndl <klaus.berndl@sdm.de>: If there are performance issues
+    ;; concerning the tree-buffer-redisplay then maybe this copy-sequence is
+    ;; the reason. But must be profiled! If yes, then an alternative could be
+    ;; not to return copies but references and write a function which removes
+    ;; all text-properties from the strings in `tree-buffer-tree-image-names'.
+    ;; This function has either to be called once or within
+    ;; `tree-buffer-create'. But for the moment we use copies.
+    ;; Background: Without copies or without removing the text-properties from
+    ;; the strings in `tree-buffer-tree-image-names' before using tree-buffers
+    ;; we also get some images if we switch from image- to ascii-display
+    ;; without restarting emacs.
+    (copy-sequence
+     (cdr (assoc sym (cdr (assoc name tree-buffer-tree-image-names)))))))
+
+
+(defun tree-buffer-add-image-icon-maybe (start len str image-icon)
+  "Add IMAGE-ICON to STR between START \(incl.) and START+LEN \(excl.). If
+IMAGE-ICON is not nil \(which must be an image-object in the sense of
+\(X)Emacs) then add this image to STR otherwise do nothing. Normally
+IMAGE-ICON should be either nil or an image-object returned by
+`tree-buffer-find-image'. Always return STR. If IMAGE-ICON is nil or
+`tree-buffer-real-style' returns not 'image then START and LEN are ignored!
+If an image is added then two text-properties are added to the full length of
+STR: 'tree-buffer-image-start which holds START as value and
+'tree-buffer-image-length which holds LEN as value."
+  (when (equal 'image (tree-buffer-real-style))
+    ;; Regular images (created with `insert-image' are intangible
+    ;; which (I suppose) make them more compatible with XEmacs 21.
+    ;; Unfortunately, there is a giant pile of code dependent on the
+    ;; underlying text.  This means if we leave it tangible, then I
+    ;; don't have to change said giant piles of code.
+    (when image-icon
+      (if tree-buffer-running-xemacs
+          (add-text-properties (+ start len) start
+                               (list 'end-glyph image-icon
+                                     'rear-nonsticky (list 'display)
+                                     'invisible t
+                                     'detachable t)
+                               str)
+        (add-text-properties start (+ start len)
+                             (list 'display image-icon
+                                   'rear-nonsticky (list 'display))
+                             str))
+      (add-text-properties 0 (length str)
+                           (list 'tree-buffer-image-start start
+                                 'tree-buffer-image-length len)
+                           str)))
+  str)
+
+(defsubst tree-buffer-image-cache-get (tree-image-name)
+  (cdr (assoc tree-image-name
+              tree-buffer-local-image-cache)))
+
+(defsubst tree-buffer-image-cache-put (tree-image-name image)
+  (setq tree-buffer-local-image-cache
+        (cons (cons tree-image-name image)
+              tree-buffer-local-image-cache)))
+
+(defun tree-buffer-find-image (tree-image-name)
+  "Return an image-object for the TREE-IMAGE-NAME. The needed image-file with
+name \"<prefix><TREE-IMAGE-NAME>.<a supported image-file-extension>\" is first
+searched in the dir of slot ADDITIONAL-IMAGES-DIR of `tree-buffer-spec' \(if
+not nil) and then - if there is no image found for this name - in the dir of
+slot DEFAULT-IMAGES-DIR of `tree-buffer-spec'. <prefix> is the value of the
+slot IMAGE-FILE-PREFIX of `tree-buffer-spec'. All found and created
+image-objectes will be cached so every image is only created once! Returns the
+image-object for TREE-IMAGE-NAME."
+  (and (equal 'image (tree-buffer-real-style))
+       ;; Klaus Berndl <klaus.berndl@sdm.de>: This comes from the XEmacs-bug
+       ;; not able to display adjacent images.
+       (or (not tree-buffer-enable-xemacs-image-bug-hack)
+           (not (member tree-image-name
+                        '("handle" "no-handle"))))
+       (or (tree-buffer-image-cache-get tree-image-name)
+           (let ((dirs (mapcar 'expand-file-name
+                               (if (tree-buffer-spec->additional-images-dir
+                                    tree-buffer-spec)
+                                   (list (tree-buffer-spec->additional-images-dir
+                                          tree-buffer-spec)
+                                         (tree-buffer-spec->default-images-dir
+                                          tree-buffer-spec))
+                                 (list (tree-buffer-spec->default-images-dir
+                                        tree-buffer-spec)))))
+                 (fmt-specs tree-buffer-image-formats)
+                 fmt fmt-exts file file-name image loc-dirs)
+             (while (and fmt-specs (not file))
+               (setq fmt (car (car fmt-specs))
+                     fmt-exts (cdr (car fmt-specs))
+                     fmt-specs (cdr fmt-specs))
+               (when (tree-buffer-image-type-available-p fmt)
+                 (while (and fmt-exts (not file))
+                   (setq loc-dirs dirs)
+                   (while (and loc-dirs (not file))
+                     (setq file-name (concat (car loc-dirs) "/"
+                                             (tree-buffer-spec->image-file-prefix
+                                              tree-buffer-spec)
+                                             tree-image-name
+                                             (car fmt-exts)))
+                     (when (file-readable-p file-name)
+                       (setq file file-name))
+                     (setq loc-dirs (cdr loc-dirs)))
+                   (setq fmt-exts (cdr fmt-exts)))))
+             (when file
+               (setq image (tree-buffer-create-image file fmt))
+               (tree-buffer-image-cache-put tree-image-name
+                                            image)
+               image)))))
+
+;; ------ tree-buffer global variables -----------------------------------
+
+(defvar tree-buffers nil)
+
+(defvar tree-buffer-syntax-table nil
+  "Syntax-table used in a tree-buffer.")
+
+(if tree-buffer-syntax-table
+    nil
+  (setq tree-buffer-syntax-table (make-syntax-table))
+  ;; turn off paren matching around here.
+  (modify-syntax-entry ?\' " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\" " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\( " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\) " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\{ " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\} " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\[ " " tree-buffer-syntax-table)
+  (modify-syntax-entry ?\] " " tree-buffer-syntax-table))
+
+;; ------- utilities --------------------------------------------------
+
+(defun tree-buffer-get-node-name-start-column (node)
+  "Returns the buffer column where the name of the node starts."
+  (+ (tree-node-indentlength node)
+     (if (and (tree-buffer-spec->expand-symbol-before-p
+               tree-buffer-spec)
+              (or (tree-node->expandable node)
+                  (member (tree-node->type node)
+                          (tree-buffer-spec->maybe-empty-node-types
+                           tree-buffer-spec))))
+         (if (or tree-buffer-enable-xemacs-image-bug-hack
+                 (not (equal 'image (tree-buffer-real-style))))
+             4 3)
+       0)
+     (if (and (tree-buffer-spec->expand-symbol-before-p
+               tree-buffer-spec)
+              (not (tree-node->expandable node))
+              (member (tree-node->type node)
+                      (tree-buffer-spec->leaf-node-types tree-buffer-spec)))
+         (if (or tree-buffer-enable-xemacs-image-bug-hack
+                 (not (equal 'image (tree-buffer-real-style))))
+             2 1)
+       0)))
+     
+
+(defun tree-buffer-get-node-name-start-point (node)
+  "Returns the buffer point where the name of the NODE starts."
+  (let ((linenr (tree-buffer-displayed-node-linenr node)))
+    (tree-buffer-debug-error "tree-buffer-get-node-name-start-point: Cur-buf: %s, linenr: %d"
+                             (current-buffer) linenr)
+    (when linenr
+      (save-excursion
+        (tree-buffer-goto-line linenr)
+        (beginning-of-line)
+        (+ (point) (tree-buffer-get-node-name-start-column node))))))
+
+(defun tree-buffer-get-node-name-end-point (node)
+  "Returns the buffer point where the name of the NODE ends."
+  (tree-buffer-debug-error "tree-buffer-get-node-name-end-point: Cur-buf: %s"
+                           (current-buffer))
+  (+ (tree-buffer-get-node-name-start-point node)
+     (length (tree-node->displayed-name node))))
+
+(defun tree-buffer-point-at-expand-symbol-p (node p)
+  "Return not nil if point P is located at the expand-symbol of NODE."
+  (tree-buffer-debug-error "tree-buffer-point-at-expand-symbol-p: Cur-buf: %s, p: %d, exp-sym-before: %s"
+                           (current-buffer)
+                           p (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec))
+  (when (or (tree-node->expandable node)
+            ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe it would be
+            ;; better to handle such nodes as if point can not stay at the
+            ;; empty-symbol... 
+            (member (tree-node->type node)
+                    (tree-buffer-spec->maybe-empty-node-types tree-buffer-spec)))
+    (let ((start-point (tree-buffer-get-node-name-start-point node))
+          (end-point (tree-buffer-get-node-name-end-point node)))
+      (if (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec)
+          (and (>= p (- start-point 4))
+               (< p (1- start-point)))
+        (and (> p end-point)
+             (<= p (+ end-point 4)))))))
+
+(defun tree-buffer-point-at-node-name-p (node p)
+  "Return not nil if point P is located at the displayed-name of NODE."
+  (tree-buffer-debug-error "tree-buffer-point-at-node-name-p: Cur-buf: %s, p: %d"
+                           (current-buffer) p)
+  (and (>= p (tree-buffer-get-node-name-start-point node))
+       (< p (tree-buffer-get-node-name-end-point node))))
+
+(defun tree-buffer-get-node-at-point (&optional p)
+  "Returns the node at point P. If p is nil the current point is used."
+  (save-excursion
+    (if p (goto-char p))
+    (tree-buffer-nth-displayed-node (1- (tree-buffer-current-line)))))
+
+(defun tree-buffer-select (mouse-button additional-key-list)
+  "If the callback-function in slot IS-CLICK-VALID-FN of `tree-buffer-spec'
+returns nil then nothing is done. Otherwise: If either the MOUSE-BUTTON is 0
+or point is as the node-name then the callback-function in slot
+NODE-SELECTED-FN is called with the needed arguments \(see
+`tree-buffer-create'). If point is at the expand/collape-button depending of
+the expansion-state either the callback in slot NODE-EXPANDED-FN or
+NODE-COLLAPSED-FN is called \(for parameters see again `tree-buffer-create').
+None of these callbacks must modify the slot EXPANDED of the passed node
+because this is done automatically by this function.
+ADDITIONAL-KEY-LIST is either nil or a list of additonal keys pressed. If not
+nil only the symbols 'shift, 'control and 'meta are recognized."
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let ((shift-pressed (member 'shift additional-key-list))
+          (control-pressed (member 'control additional-key-list))
+          (meta-pressed (member 'meta additional-key-list)))
+      (when (and (tree-buffer-spec->is-click-valid-fn tree-buffer-spec)
+                 (funcall (tree-buffer-spec->is-click-valid-fn tree-buffer-spec)
+                          mouse-button shift-pressed control-pressed meta-pressed
+                          (buffer-name)))
+        (tree-buffer-debug-error "tree-buffer-select-1: Cur-buf: %s"
+                                 (current-buffer))
+        (let ((node (tree-buffer-get-node-at-point)))
+          (when node
+            (tree-buffer-debug-error "tree-buffer-select-2: Cur-buf: %s"
+                                     (current-buffer))
+            ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Is this the right place
+            ;; for this? probably it can cause some erros...... Yep - it causes
+            ;; serious XEmacs-sideeffects: clicking into tree-buffer doesn't
+            ;; work anymore when doing this during an active isearch! Seems that
+            ;; isearch-exit switches the current buffer so the buffer after the
+            ;; isearch-exit is not the same as before!! So we comment this out!!
+            ;;           (ignore-errors
+            ;;             (let ((search-nonincremental-instead nil))
+            ;;               (isearch-exit)))
+            (tree-buffer-debug-error "tree-buffer-select-3: Cur-buf: %s"
+                                     (current-buffer))
+            (cond ((or (= mouse-button 0)
+                       (tree-buffer-point-at-node-name-p node (point)))
+                   (setq tree-buffer-incr-searchpattern "")
+                   (when (tree-buffer-spec->node-selected-fn tree-buffer-spec)
+                     (funcall (tree-buffer-spec->node-selected-fn tree-buffer-spec)
+                              node mouse-button shift-pressed control-pressed meta-pressed
+                              (buffer-name))))
+                  ((tree-buffer-point-at-expand-symbol-p node (point))
+                   (when (and (not (tree-node->expanded node))
+                              (tree-buffer-spec->node-expanded-fn tree-buffer-spec))
+                     (funcall (tree-buffer-spec->node-expanded-fn tree-buffer-spec)
+                              node mouse-button
+                              shift-pressed control-pressed meta-pressed
+                              (buffer-name)))
+                   (when (tree-node->expandable node)
+                     (when (and (tree-node->expanded node)
+                                (tree-buffer-spec->node-collapsed-fn tree-buffer-spec))
+                       (funcall (tree-buffer-spec->node-collapsed-fn tree-buffer-spec)
+                                node mouse-button
+                                shift-pressed control-pressed meta-pressed
+                                (buffer-name)))
+                     (tree-node-toggle-expanded node))
+                   ;; Update the tree-buffer with optimized display of NODE
+                   (tree-buffer-update node)))))))))
+
+
+(defun tree-buffer-node-data-equal-p (node-data-1 node-data-2)
+  "Calls the function stored in slot NODE-DATA-EQUAL-FN of `tree-buffer-spec'
+to test NODE-DATA-1 and NODE-DATA-2 for equality."
+  (and node-data-1 node-data-2
+       ;; if this comparison-function runs into an error we handle this as
+       ;; non-equality!
+       (ignore-errors
+         (funcall (tree-buffer-spec->node-data-equal-fn tree-buffer-spec)
+                  node-data-1 node-data-2))))
+
+(defun tree-buffer-get-node-facer (node)
+  (let ((facer (cdr (assoc (tree-node->type node)
+                           (tree-buffer-spec->type-facer tree-buffer-spec)))))
+    (if facer
+        facer
+      nil)))
+
+(defun tree-buffer-pos-hor-visible-p (pos window)
+  "Return non nil if POS is horizontal visible in WINDOW otherwise nil."
+  (save-excursion
+    (goto-char pos)
+    (and (>= (- (current-column) (window-hscroll window)) 0)
+         (< (- (current-column) (window-hscroll window))
+            (window-width window)))))
+
+(defun tree-buffer-get-event-column (e &optional include-fringe-scrollbar)
+  "Return the clicked column on a char-base."
+  (let* ((x-point (car (nth 2 (car (cdr e)))))
+	 (pixels-per-10-col (/ (* 10 (frame-pixel-width))
+			       (frame-width)))
+	 (click-col (+ (/ (* 10 x-point) pixels-per-10-col)
+                       (if include-fringe-scrollbar
+                           (length (tree-buffer-spec->sticky-indent-string
+                                    tree-buffer-spec))
+                         0))))
+    click-col))
+
+(defun tree-buffer-hscroll (amount)
+  (ignore-errors
+    (let ((current-prefix-arg amount))
+      (call-interactively 'scroll-left))))
+
+;; Stolen from dframe.el from the speedbar-library
+;; XEmacs: this can be implemented using modeline key-maps, but there
+;; is no use, as we have horizontal scrollbar (as the docstring
+;; hints.)
+(defun tree-buffer-mouse-hscroll (e)
+  "Read a mouse event E from the mode line and scroll horizontally.
+If the mouse is being clicked on the far left, or far right of the
+mode-line.  This is only useful for non-XEmacs"
+  (interactive "e")
+  (let* ((click-col (tree-buffer-get-event-column e t)))
+    (cond ((< click-col 4)
+	   (tree-buffer-hscroll (- (tree-buffer-spec->hor-scroll-step tree-buffer-spec))))
+	  ((> click-col (- (window-width) 4))
+	   (tree-buffer-hscroll (tree-buffer-spec->hor-scroll-step tree-buffer-spec)))
+          (t (tree-buffer-nolog-message
+	      "Click on the edge of the modeline to scroll left/right")))
+    ))
+
+(defun tree-buffer-count-subnodes-to-display (node)
+  "Returns the number of ALL subnodes of NODE which will currently be displayed
+if NODE is expanded, means the number of all the children of NODE \(if NODE is
+expanded) plus recursive the number of the children of each expanded child.
+Example:
+\[-] NODE
+    \[+] child 1
+    \[-] child 2
+        \[+] child 2.1
+        \[-] child 2.2
+            \[+] child 2.2.1
+            \[+] child 2.2.2
+        \[+] child 2.3
+    \[-] child 3
+        \[+] child 3.1
+    \[+] child 4
+The result for NODE here is 10"
+  (let ((result 0))
+    (when (and (tree-node->expandable node)
+               (tree-node->expanded node))
+      (setq result (+ result (length (tree-node->children node))))
+      (dolist (child (tree-node->children node))
+        (setq result (+ result (tree-buffer-count-subnodes-to-display child)))))
+    result))
+
+(defun tree-buffer-recenter (node window)
+  "If NODE is not visible then first recenter the window WINDOW so NODE is
+best visible, means NODE is displayed in the middle of the window if possible.
+If NODE is expanded then recenter the WINDOW so as much as possible subnodes
+of NODE will be visible. If NODE is not expandable then WINDOW is always
+displayed without empty-lines at the end, means WINDOW is always best filled."
+  (let* ((node-points (save-excursion
+                        (tree-buffer-goto-line (tree-buffer-displayed-node-linenr node))
+                        (cons (tree-buffer-line-beginning-pos)
+                              (tree-buffer-line-end-pos))))
+         (node-point (car node-points))
+         (point-lines-before (count-lines (point-min) node-point))
+         (point-lines-after (1- (count-lines node-point (point-max)))))
+    ;; first make point best visible, means display node in the middle of the
+    ;; window if possible (if there are enough lines before/after the node).
+    (when (not (pos-visible-in-window-p node-point window))
+      (if (< node-point (window-start window))
+          (set-window-start
+           window
+           (save-excursion
+             (goto-char node-point)
+             (forward-line
+              (* -1 (min point-lines-before
+                         (/ (tree-buffer-window-display-height window) 2))))
+             (tree-buffer-line-beginning-pos)))
+        (set-window-start window
+                          (save-excursion
+                            (goto-char (window-start window))
+                            (forward-line
+                             (- (+ 1
+                                   (count-lines (window-start window) node-point)
+                                   (min point-lines-after
+                                        (/ (tree-buffer-window-display-height window) 2)))
+                                (tree-buffer-window-display-height window)))
+                            (tree-buffer-line-beginning-pos)))
+        ))
+    ;; now optimize the window display for displaying as much possible
+    ;; subnodes of node.
+    (if (tree-node->expanded node)
+        (let ((exp-node-children-count (1+ (tree-buffer-count-subnodes-to-display node)))
+              (point-window-line (count-lines (window-start window) node-point)))
+          ;; if the current node is not already displayed in the first line of
+          ;; the window (= condition 1) and if not all of it“s children are
+          ;; visible in the window then we can do some optimization.
+          (if (and (save-excursion
+                     (goto-char node-point)
+                     (forward-line -1)
+                     (pos-visible-in-window-p (point) window))
+                   (not (save-excursion
+                          (goto-char node-point)
+                          (forward-line exp-node-children-count)
+                          (pos-visible-in-window-p (point) window))))
+              ;; optimize the display of NODE and it“s children so as much as
+              ;; possible are visible.
+              (set-window-start window
+                                (save-excursion
+                                  (goto-char (window-start window))
+                                  (forward-line
+                                   (min point-window-line
+                                        (- (+ 1
+                                              ;; Cause of a bug in GNU Emacs
+                                              ;; <= 21.3 we would need here an
+                                              ;; extra +1 to display all
+                                              ;; subnodes (otherwise the last
+                                              ;; one is not displayed). But
+                                              ;; this extra +1 would only be
+                                              ;; needed if the tree-buffer is
+                                              ;; not completely displayed in
+                                              ;; the frames default font. But
+                                              ;; we accept this because with
+                                              ;; GNU Emacs >= 21.4 it seems to
+                                              ;; be fixed.
+                                              point-window-line
+                                              exp-node-children-count)
+                                           (tree-buffer-window-display-height window))))
+                                  (tree-buffer-line-beginning-pos)))))
+      ;; maybe there are empty lines in the window after the last non-empty
+      ;; line. If they are we scroll until the whole window is filled with
+      ;; non-empty lines.
+      (if nil; (not (tree-node->expandable node))
+          (let ((w-height (tree-buffer-window-display-height window))
+                (full-lines-in-window (count-lines (window-start window)
+                                                   (window-end window t))))
+            (if (< full-lines-in-window
+                   w-height)
+                (set-window-start window
+                                  (save-excursion
+                                    (goto-char (window-start window))
+                                    (forward-line (- full-lines-in-window w-height))
+                                    (tree-buffer-line-beginning-pos)))))))
+    (unless tree-buffer-running-xemacs
+      (ignore-errors (tree-buffer-hscroll -1000)))
+    ;; KB: testcode
+;;     (if (and (not tree-buffer-running-xemacs)
+;;              (not (tree-buffer-pos-hor-visible-p (cdr node-points) window)))
+;;         (ignore-errors (tree-buffer-hscroll -1000)))
+    ))
+
+(defun tree-buffer-remove-highlight ()
+  "Unhighlight the currently highlighted tree-node."
+  (when tree-buffer-highlighted-node
+    (tree-buffer-overlay-delete tree-buffer-highlight-overlay))
+  (setq tree-buffer-highlighted-node nil))
+
+(defun tree-buffer-highlight-node-by-data/name (node-data &optional node-name start-node
+                                                          dont-make-visible)
+  "Highlights in current tree-buffer the node which has as data NODE-DATA. If
+START-NODE is nil or equal to the root-node then all nodes of current
+tree-buffer are searched from beginning until the node with data NODE-DATA has
+been found otherwise the search starts with START-NODE. If DONT-MAKE-VISIBLE
+is true then no tree-buffer recentering has been done to make this node
+visible.
+
+If optional argument NODE-NAME is not nil then it must be string
+and a node will only be highlighted if not only NODE-DATA matches
+but also NODE-NAME.
+
+If either NODE-DATA is nil or if the node belonging to NODE-DATA
+\(and NODE-NAME, if set) can not be found because it is invisible
+\(probably because its parent-node is not expanded) then no
+highlighting takes place but the existing highlighting is removed
+and nil is returned. Otherwise the node is highlighted and not
+nil is returned."
+  (if node-data
+      (let ((node (tree-buffer-find-displayed-node-by-data/name node-data
+                                                                node-name start-node))
+            (w (get-buffer-window (current-buffer))))
+        (if (null node)
+            (progn
+              ;; node can not be found because maybe the node is a subnode and
+              ;; it's parent is not expanded --> then there is no node for
+              ;; NODE-DATA; therefore we must remove the highlighting
+              (tree-buffer-remove-highlight)
+              nil)
+          (setq tree-buffer-highlighted-node (list node-data node-name node))
+          (save-excursion
+            (tree-buffer-overlay-move tree-buffer-highlight-overlay
+                                      (tree-buffer-get-node-name-start-point node)
+                                      (tree-buffer-get-node-name-end-point node)))
+          (when (not dont-make-visible)
+            ;; make node visible if not and optimize the windows display for
+            ;; the node.
+            (tree-buffer-recenter node w))
+          ;; we have highlighted the node so we return not nil.
+          t))
+    (tree-buffer-remove-highlight)
+    nil))
+
+(defun tree-buffer-help-echo-fn (win obj pos)
+  "This function is the value of the `help-echo' property of each
+tree-node. This is only used with GNU Emacs 21!"
+  (let* ((window win)
+         (position pos)
+         (buffer (window-buffer window))
+         node)
+    (save-excursion
+      (set-buffer buffer)
+      (setq node (tree-buffer-get-node-at-point position))
+      (and (tree-buffer-spec->node-mouse-over-fn tree-buffer-spec)
+           node
+           (funcall (tree-buffer-spec->node-mouse-over-fn tree-buffer-spec)
+                    node window 'no-print)))))
+
+(defun tree-buffer-merge-face-into-text (face start end &optional text)
+  "Merge FACE to the already precolored TEXT so the values of all
+face-attributes of FACE take effect and the values of all face-attributes
+of TEXT which are not set by FACE are preserved."
+  (if (null face)
+      text
+    (if tree-buffer-running-xemacs
+        (put-text-property start end 'face
+                           (let* ((current-face (get-text-property 0
+                                                                   'face
+                                                                   text))
+                                  (cf
+                                   (typecase current-face
+                                     (tree-buffer-face (list current-face))
+                                     (list current-face)
+                                     (otherwise nil)))
+                                  (nf
+                                   (typecase face
+                                     (tree-buffer-face (list face))
+                                     (list face)
+                                     (otherwise nil))))
+                             ;; we must add the new-face in front of
+                             ;; current-face to get the right merge!
+                              (if (member face cf)
+                                  cf
+                                (append nf cf)
+                                )
+                              )
+                           text)
+      (alter-text-property start end 'face
+                           (lambda (current-face)
+                             (let ((cf
+                                    (typecase current-face
+                                      (tree-buffer-face (list current-face))
+                                      (list current-face)
+                                      (otherwise nil)))
+                                   (nf
+                                    (typecase face
+                                      (tree-buffer-face (list face))
+                                      (list face)
+                                      (otherwise nil))))
+                               ;; we must add the new-face in front of
+                               ;; current-face to get the right merge!
+                               (if (member face cf)
+                                   cf
+                                 (append nf cf))))
+                           text))))
+
+(defun tree-buffer-insert-text (text &optional facer help-echo mouse-highlight)
+  "Insert TEXT at point and faces it with FACER. FACER can be a face then the
+text gets this face or it can be a function-symbol which is called to face the
+inserted TEXT. Such a function gets two arguments: Point where TEXT has been
+inserted and the TEXT itself"
+  (when (stringp text)
+    (let ((p (point)))
+      (insert text)
+      (if mouse-highlight
+          (put-text-property p (point) 'mouse-face 'highlight))
+      (if (and help-echo (not tree-buffer-running-xemacs))
+          (put-text-property p (point) 'help-echo
+                             'tree-buffer-help-echo-fn))
+      (if facer
+          (if (functionp facer)
+              (funcall facer p text)
+            (tree-buffer-merge-face-into-text facer p (point))))
+      )))
+
+
+(defun tree-buffer-node-display-name (node)
+  "Computes that string which is used to display the name of NODE. The
+display-name will be set in the slot DISPLAYED-NAME of NODE and also
+returned."
+  (let* ((ww (window-width))
+	 (display-name (tree-node->name node))
+	 (width (+ (tree-node-indentlength node)
+		   (length display-name)
+		   (if (tree-node->expandable node) 4 0))))
+    ;; Truncate name if necessary
+    (when (and (>= width ww)
+               (> (length display-name)
+                  (+ (if tree-buffer-running-xemacs 5 4) ;; for the "..." + space
+                     (- width ww)
+                     3))) ;; there should at least remain 3 visible chars of name
+      (if (eq 'beginning (tree-node->shrink-name node))
+	  (setq display-name
+                (concat "..."
+                        (substring display-name (+ (if tree-buffer-running-xemacs 5 4)
+                                                   (- width ww)))))
+	(if (and (not (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec))
+		 (tree-node->expandable node)
+		 (eq 'end (tree-node->shrink-name node)))
+	    (setq display-name
+                  (concat (substring display-name 0
+                                     (- (+ (if tree-buffer-running-xemacs 5 4)
+                                           (- width ww))))
+                          "...")))))
+    (setf (tree-node->displayed-name node) display-name)
+    display-name))
+  
+(defun tree-buffer-insert-node-display (node &optional no-newline)
+  "Insert NODE into the tree-buffer with all necessary buttons before or after
+the name of the NODE. This function computes also the name how the NODE has to
+be displayed and returns this name. If optional arg NO-NEWLINE is not nil then
+no final newline is displayed after inserting the node. Otherwise always a
+newline is inserted after the node."
+  (let* ((node-type (tree-node->type node))
+         (tree-image-name (if (and (tree-node->expanded node)
+                                   (tree-node->expandable node))
+                              "open"
+                            (if (not (tree-node->expandable node))
+                                (if (member node-type
+                                            (tree-buffer-spec->maybe-empty-node-types
+                                             tree-buffer-spec))
+                                    "empty"
+                                  (if (member node-type
+                                              (tree-buffer-spec->leaf-node-types tree-buffer-spec))
+                                      "leaf"
+                                    nil))
+                              "close")))
+         (ascii-symbol (tree-buffer-ascii-symbol-4-image-name tree-image-name))
+         (display-name (tree-buffer-node-display-name node))
+         (mouse-highlight (or (equal t (tree-buffer-spec->mouse-highlight-fn tree-buffer-spec))
+                              (and (tree-buffer-spec->mouse-highlight-fn tree-buffer-spec)
+                                   (funcall (tree-buffer-spec->mouse-highlight-fn tree-buffer-spec)
+                                            node)))))
+    (when (and (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec)
+	       ascii-symbol tree-image-name)
+      (tree-buffer-insert-text 
+       (tree-buffer-add-image-icon-maybe
+        0 (length ascii-symbol)
+        ascii-symbol (tree-buffer-find-image tree-image-name))
+       nil nil mouse-highlight)
+      (if (or tree-buffer-enable-xemacs-image-bug-hack
+              (not (equal 'image (tree-buffer-real-style))))
+          (insert " ")))
+    (tree-buffer-insert-text display-name
+                             (tree-buffer-get-node-facer node)
+                             t mouse-highlight)
+    (when (and (not (tree-buffer-spec->expand-symbol-before-p tree-buffer-spec))
+	       ascii-symbol)
+      (insert " ")
+      (tree-buffer-insert-text ascii-symbol nil nil mouse-highlight))
+    (unless no-newline (insert "\n"))
+    display-name))
+
+(defun tree-buffer-gen-guide-strings ()
+  "Returns a list with four elements - the correct guide-strings for current
+tree-buffer: \(guide-str-handle guide-str-no-handle guide-end-str no-guide-str)"
+  (if (equal 'ascii-no-guides (tree-buffer-real-style))
+      (make-list 4 (make-string (tree-buffer-spec->tree-indent
+                                 tree-buffer-spec) ? ))
+    (let* ((indent-fill-up (make-string
+                          (- (tree-buffer-spec->tree-indent tree-buffer-spec)
+                             (cond ((equal 'image (tree-buffer-real-style))
+                                    tree-buffer-indent-with-images)
+                                   ((tree-buffer-spec->expand-symbol-before-p
+                                     tree-buffer-spec)
+                                    tree-buffer-indent-w/o-images-before-min)
+                                   (t
+                                    tree-buffer-indent-w/o-images-after-min)))
+                          ? ))
+           (guide-str-handle (concat (tree-buffer-ascii-symbol-4-image-name
+                                      "guide")
+                                     (tree-buffer-ascii-symbol-4-image-name
+                                      "handle")
+                                     indent-fill-up))
+           (guide-str-no-handle (concat (tree-buffer-ascii-symbol-4-image-name
+                                         "guide")
+                                        (tree-buffer-ascii-symbol-4-image-name
+                                         "no-handle")
+                                        indent-fill-up))
+           (guide-end-str (concat (tree-buffer-ascii-symbol-4-image-name
+                                   "end-guide")
+                                  (tree-buffer-ascii-symbol-4-image-name
+                                   "handle")
+                                  indent-fill-up))
+           (no-guide-str (concat (tree-buffer-ascii-symbol-4-image-name
+                                  "no-guide")
+                                 (tree-buffer-ascii-symbol-4-image-name
+                                  "no-handle")
+                                 indent-fill-up)))
+      (list guide-str-handle guide-str-no-handle guide-end-str no-guide-str))))
+
+(defun tree-buffer-add-node (node indent-str-first-segs indent-str-last-seg
+                                  &optional last-children)
+  "Insert NODE in current tree-buffer at point.
+The indentation is the concatenation of INDENT-STR-FIRST-SEGS and
+INDENT-STR-LAST-SEG. If LAST-CHILDREN is not nil then NODE is the last
+children of its parent-node; this means it must be displayed with an
+end-guide."
+  ;; here we save the indentstr in the node itself - we do this as first step
+  ;; so all following steps can use the indentstr from the node itself
+  (when (tree-buffer-spec->ascii-guide-face tree-buffer-spec)
+    (put-text-property 0 (length indent-str-first-segs)
+                       'face (tree-buffer-spec->ascii-guide-face tree-buffer-spec)
+                       indent-str-first-segs)
+    (put-text-property 0 (length indent-str-last-seg)
+                       'face (tree-buffer-spec->ascii-guide-face tree-buffer-spec)
+                       indent-str-last-seg))
+  (setf (tree-node->indentstr node)
+        (concat indent-str-first-segs indent-str-last-seg))
+
+  ;; insert the node indentation
+  (insert (tree-node->indentstr node))
+  ;; insert the node with all its symbols - either as image or ascii and add
+  ;; the node to the `tree-buffer-displayed-nodes'
+  (tree-buffer-insert-node-display node)
+  (tree-buffer-add-to-displayed-nodes node)
+  
+  ;; compute the indentation-strings for the children and run recursive for
+  ;; each child
+  (if (tree-node->expanded node)
+      (let* ((number-of-childs (length (tree-node->children node)))
+             (counter 0)
+             (guide-strings (tree-buffer-gen-guide-strings))
+             (guide-str (if (and (equal 'image (tree-buffer-real-style))
+                                 tree-buffer-enable-xemacs-image-bug-hack)
+                            (nth 0 guide-strings)
+                          (nth 1 guide-strings)))
+             (guide-end-str (nth 2 guide-strings))
+             (no-guide-str (nth 3 guide-strings))
+             (indent-str-last-seg-copy (copy-sequence indent-str-last-seg))
+             (next-indent-str-first-segs
+              (if (= 0 (length indent-str-last-seg-copy))
+                  ""
+                (concat indent-str-first-segs
+                        (if last-children
+                            (tree-buffer-add-image-icon-maybe
+                             2 1
+                             (tree-buffer-add-image-icon-maybe
+                              0 2 no-guide-str
+                              (tree-buffer-find-image "no-guide"))
+                             (tree-buffer-find-image "no-handle"))
+                          (tree-buffer-add-image-icon-maybe
+                           2 1
+                           (tree-buffer-aset
+                            indent-str-last-seg-copy
+                            (1- (cond ((equal 'image (tree-buffer-real-style))
+                                       tree-buffer-indent-with-images)
+                                      ((tree-buffer-spec->expand-symbol-before-p
+                                        tree-buffer-spec)
+                                       tree-buffer-indent-w/o-images-before-min)
+                                      (t
+                                       tree-buffer-indent-w/o-images-after-min)))
+                            ? )
+                           (tree-buffer-find-image "no-handle"))))))
+             (next-indent-str-last-seg-std
+              (tree-buffer-add-image-icon-maybe
+               2 1
+               (tree-buffer-add-image-icon-maybe
+                0 2 guide-str
+                (tree-buffer-find-image "guide"))
+               (tree-buffer-find-image "handle")))
+             (next-indent-str-last-seg-end
+              (tree-buffer-add-image-icon-maybe
+               2 1
+               (tree-buffer-add-image-icon-maybe
+                0 2 guide-end-str
+                (tree-buffer-find-image "end-guide"))
+               (tree-buffer-find-image "handle"))))
+        (dolist (node (tree-node->children node))
+          (setq counter (1+ counter))
+          (tree-buffer-add-node node
+                                next-indent-str-first-segs
+                                (if (= counter number-of-childs )
+                                    next-indent-str-last-seg-end
+                                  next-indent-str-last-seg-std)
+                                (= counter number-of-childs ))))))
+
+(defun tree-buffer-update-node (node name shrink-name type data expandable
+                                     &optional redisplay)
+  "This function updates the NODE with the new datas NAME, SHRINK-NAME, TYPE,
+DATA and EXPANDABLE. If NODE is nil then the node at current point will be
+updated. Each of the arguments NAME, SHRINK-NAME, TYPE, DATA and EXPANDABLE
+can have the special value 'use-old-value\; this means that attribute of NODE
+will not be updated. If first optional arg REDISLAY is not nil then NODE will
+be completely redisplayed according to its new data. Nil for REDISLAY makes
+sense for example if the caller wants to update a bunch of nodes but wants to
+update the display itself first at the end of all node-updates \(for
+efficiency). In that case the caller has to ensure that `tree-buffer-update'
+is called after updating all needed nodes."
+  (let* ((my-node (or node (tree-buffer-get-node-at-point)))
+         (node-line (when redisplay
+                      ;; Klaus Berndl <klaus.berndl@sdm.de>: We could simply
+                      ;; here call (tree-buffer-displayed-node-linenr
+                      ;; my-node) but for best possible performance we just
+                      ;; use the current linenumber if NODE is nil (means we
+                      ;; stay already at the right point and there is no need
+                      ;; to waste performance by searching a node we have
+                      ;; already "found"...maybe paranoid ;-)
+                      (if node
+                          (tree-buffer-displayed-node-linenr node)
+                        (tree-buffer-current-line))))
+         (old-node-data (tree-node->data my-node))
+         (old-node-name (tree-node->name my-node))
+         (buffer-read-only nil))
+    (tree-node-update my-node name type data expandable shrink-name)
+    (when node-line ;; we want a redisplay
+      (save-excursion
+        (tree-buffer-goto-line node-line)
+        (beginning-of-line)
+        (delete-region (tree-buffer-line-beginning-pos)
+                       (tree-buffer-line-end-pos))
+        (insert (tree-node->indentstr my-node))
+        (tree-buffer-insert-node-display my-node 'no-newline)
+        ;; There is no need to update the displayed-node list because we have
+        ;; already updated the node-object and this node-object is part of the
+        ;; displayed-node list ==> this list is automatically up-to-date now.
+        
+        ;; rehighlight here the current highlighted node again - this is
+        ;; necessary if we have unpdated and redisplayed the currently
+        ;; highlighted node. For this check we have to compare the
+        ;; old-node-data/name (before the update!) with that node-data/name
+        ;; stored in `tree-buffer-highlighted-node' - but the rehighlight has
+        ;; to be done with the new node-data/name (after the update) because the
+        ;; node is already updated so the node is only findable via the new
+        ;; node-data/name!
+        (when (tree-buffer-highlighted-node-matches-data/name-p old-node-data old-node-name)
+          (tree-buffer-highlight-node-by-data/name (tree-node->data my-node)
+                                                   (tree-node->name my-node)
+                                                   nil t))))
+    ))
+
+(defun tree-buffer-clear-tree ()
+  "Clear current tree-buffer, i.e. remove all children of the root-node"
+  (dolist (child (tree-node->children (tree-buffer-get-root)))
+    (tree-buffer-remove-node child)))
+
+(defun tree-buffer-remove-node (node &optional redisplay empty-parent-types)
+  "Remove NODE from current tree-buffer. If NODE is nil then the node at
+current point will be removed. If NODE equal the node returned by
+`tree-buffer-get-root' then nothing will be done. If first optional arg
+REDISLAY is not nil then NODE will be also completely removed from the
+tree-display otherwise only from the internal tree-structure. If second
+optional arg EMPTY-PARENT-TYPES is not nil and a list of node-types \(see
+`tree-buffer-create') and if the node-type of the parent of NODE is contained
+in EMPTY-PARENT-TYPES and if NODE is the only children of its parent then its
+parent is recursively removed too."
+  (let ((my-node (or node (tree-buffer-get-node-at-point))))
+    (when (and my-node (not (eq (tree-buffer-get-root) my-node)))
+      (let* ((parent (tree-node->parent my-node))
+             (parent-type (tree-node->type parent)))
+        ;; If parent is the root-node then its type is always -1 (only the
+        ;; root-node has type -1) and therefore then the recursion stops here
+        ;; savely.
+        (if (and (member parent-type empty-parent-types)
+                 (= (length (tree-node->children parent)) 1))
+            (tree-buffer-remove-node parent redisplay empty-parent-types)
+          (tree-node-remove-child parent my-node)
+          (when redisplay
+            (let ((buffer-read-only nil)
+                  (node-line (when redisplay
+                               (if node
+                                   (tree-buffer-displayed-node-linenr my-node)
+                                 (tree-buffer-current-line)))))
+              (when node-line
+                (save-excursion
+                  (tree-buffer-goto-line node-line)
+                  (beginning-of-line)
+                  (delete-region (tree-buffer-line-beginning-pos)
+                                 (1+ (tree-buffer-line-end-pos))))
+                (tree-buffer-displayed-nodes-remove-node my-node)
+                ))))))))
+
+(defun tree-buffer-build-tree-buffer-display ()
+  "Rebuild the variable `tree-buffer-displayed-nodes' from the current
+children of `tree-buffer-root'. This also builds the display of current
+tree-buffer from scratch. This functions expects the current tree-buffer to be
+empty!"
+  (tree-buffer-initialize-displayed-nodes)
+  (dolist (node (tree-node->children tree-buffer-root))
+    (tree-buffer-add-node node "" "")))
+
+(defun tree-buffer-display-in-general-face ()
+  "Apply the face in slot GENERAL-FACE of `tree-buffer-spec' of current
+tree-buffer to current tree-buffer."
+  (when (tree-buffer-spec->general-face tree-buffer-spec)
+    (tree-buffer-overlay-move tree-buffer-general-overlay
+                              (point-min) (point-max))))
+
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: Should be also check if
+;; tree-buffer-displayed-nodes is nil - if all things run well this check must
+;; not fail.
+(defun tree-buffer-empty-p ()
+  "Return not nil if current tree-buffer is empty."
+  (= (point-min) (point-max)))
+
+(defun tree-buffer-run-after-update-hook ()
+  "Run all functions of slot AFTER-UPDATE-HOOK of `tree-buffer-spec'."
+  (dolist (f (tree-buffer-spec->after-update-hook tree-buffer-spec))
+    (funcall f)))
+
+(defun tree-buffer-update (&optional node content)
+  "Updates the current tree-buffer. The buffer will be completely rebuild with
+it's current nodes. Window-start and point will be preserved. If NODE is not
+nil and a valid and expanded node with at least one child then the display of
+this node is optimized so the node itself and as much as possible of it's
+children \(and also recursive the children of a child if it's already
+expanded, see `tree-buffer-count-subnodes-to-display') are visible in current
+tree-buffer. If CONTENT is not nil then it must be a cons-cell where the car
+is the whole string of the tree-buffer and the cdr is the value of
+`tree-buffer-displayed-nodes'. Then the content of the tree-buffer will not be
+rebuild by reinserting all nodes from the tree-node-structure but just by
+inserting the car of CONTENT in the tree-buffer and setting
+`tree-buffer-displayed-nodes' to cdr of CONTENT."
+  (let* ((w (get-buffer-window (current-buffer)))
+         (ws (window-start w))
+         (p (point))
+         (buffer-read-only nil)
+         (next-line-add-newlines nil))
+    (erase-buffer)
+    (if (consp content)
+        (progn
+          (insert (car content))
+          (tree-buffer-set-displayed-nodes (cdr content)))
+      (tree-buffer-build-tree-buffer-display))
+    (tree-buffer-display-in-general-face)
+    (tree-buffer-highlight-node-by-data/name
+     (or nil ;;(and node (tree-node->data node))
+         (nth 0 tree-buffer-highlighted-node))
+     (nth 1 tree-buffer-highlighted-node)
+     (nth 2 tree-buffer-highlighted-node)
+     nil)
+    (goto-char p)
+    (set-window-start w ws)
+    ;; let's optimize the display of the expanded node NODE and it's children.
+    (when node
+      (tree-buffer-recenter node w))
+    (tree-buffer-run-after-update-hook)))
+
+
+(defun tree-buffer-scroll-window (point window-start)
+  "Scrolls current tree-buffer. The window will start at WINDOW-START and
+point will stay on POINT."
+  (goto-char point)
+  (set-window-start (get-buffer-window (current-buffer)) window-start))
+
+(defun tree-buffer-expand-node (node level
+                                     &optional expand-pred-fn collapse-pred-fn)
+  "Expand the NODE up to an expand-level of LEVEL.
+
+LEVEL specifies precisely which level of nodes should be expanded. LEVEL means
+the indentation-level of the NODE itself and its \(recursive) subnodes
+relative to the NODE itself.
+
+A LEVEL value X means that all \(sub)nodes with an indentation-level <= X
+relative to NODE are expanded and all other are collapsed. A negative LEVEL
+value means that NODE is collapsed.
+
+Examples:
+
+- LEVEL = 0: If NODE is the root-node then this means expand only all nodes
+  with no indentation at all. If NODE is any other node then this means expand
+  only the NODE itself because it is the only node which has indentation 0 to
+  itself. All deeper indented nodes will be collapsed.
+
+- LEVEL = 1: If NODE is the root-node then this means expand all nodes with no
+  indentation at all and all subnodes of these nodes - all deeper indented
+  nodes will be collapsed. If NODE is any other node then this means expand
+  the NODE itself and all of its direct subnodes - because only the direct
+  subnodes of NODE have indentation-level 1 relativ to NODE.
+
+This function expands beginning from NODE the NODE itself and all subnodes of
+NODE with level <= LEVEL, so the subnodes of these nodes get visible and
+collapses all their \(recursive) subnodes with indentation-level > LEVEL.
+
+If a node has to be expanded then first the function in SLOT NODE-EXPANDED-FN
+of `tree-buffer-spec' of current tree-buffer \(see `tree-buffer-create') is
+called with the argument-values \[node 0 nil nil \(buffer-name)\].
+
+This function gets two optional function-arguments which are called to test if
+a node should be excluded from expanding or collapsing; both functions are
+called with two arguments, where the first one is the expandable/collapsable
+node and the second one is the current level of indentation of this node
+relativ to the startnode NODE: EXPAND-PRED-FN is called if a node has to be
+expanded and must return nil if this node should not be expanded even if its
+indentation level is <= LEVEL and COLLAPSE-PRED-FN is called analogous for a
+node which has to be collapsed and must return nil if the node should not be
+collapsed even if its indentation level is > then LEVEL.
+
+Examples:
+- LEVEL = -1 collapses the NODE.
+- LEVEL = 0 expands only the NODE itself because it is the only node which can
+  have no indentation relativ to itself.
+- LEVEL = 2 expands the NODE itself, its children and its grandchildren -
+  these are the nodes which are either not indented \(the NODE itself) or
+  indented once \(the children) or twice \(the grandchildren)."
+  (if (not (equal (tree-buffer-get-root) node))
+      (tree-buffer-expand-node-internal node 0 level
+                                        expand-pred-fn collapse-pred-fn)))
+
+(defun tree-buffer-expand-node-internal (node current-level level
+                                              expand-pred-fn collapse-pred-fn)
+  "Expand NODE if CURRENT-LEVEL \(the indentation-level of NODE) <= LEVEL or
+collapses NODE if CURRENT-LEVEL > LEVEL. Do this recursive for subnodes of
+NODE with incremented CURRENT-LEVEL. For EXPAND-PRED-FN and COLLAPSE-PRED-FN
+see `tree-buffer-expand-node'. This function is not for external usage; use
+`tree-buffer-expand-node' instead."
+  (when (tree-node->expandable node)
+    (when (and (tree-buffer-spec->node-expanded-fn tree-buffer-spec)
+               (not (tree-node->expanded node)))
+      (funcall (tree-buffer-spec->node-expanded-fn tree-buffer-spec)
+               node 0 nil nil nil (buffer-name)))
+    (when (or (and (not (tree-node->expanded node))
+                   (or (not (functionp expand-pred-fn))
+                       (funcall expand-pred-fn node current-level))
+                   (<= current-level level))
+              (and (tree-node->expanded node)
+                   (or (not (functionp collapse-pred-fn))
+                       (funcall collapse-pred-fn node current-level))
+                   (> current-level level)))
+      (tree-node-toggle-expanded node))
+    (dolist (child (tree-node->children node))
+      (tree-buffer-expand-node-internal child (1+ current-level) level
+                                        expand-pred-fn collapse-pred-fn))))
+
+(defun tree-buffer-set-root (root)
+  "Set the root-node of current tree-buffer to ROOT.
+ROOT must be either that root-node automatically created by
+`tree-buffer-create' or a node returned by `tree-node-new-root'!"
+  (setq tree-buffer-root root)
+  (setf (tree-node->expanded tree-buffer-root) t))
+
+(defun tree-buffer-get-root ()
+  "Return the root-node of current tree-buffer."
+  tree-buffer-root)
+
+(defun tree-buffer-gen-searchpattern-indent-prefix (&optional count)
+  (let ((guide-strings (tree-buffer-gen-guide-strings)))
+    (concat "^\\("
+            (mapconcat (function (lambda (e)
+                                   (format "\\(%s\\)" e)))
+                       (list (nth 1 guide-strings)
+                             (nth 3 guide-strings)
+                             (nth 0 guide-strings)
+                             (nth 2 guide-strings))
+                       "\\|")
+            "\\)"
+            (if (integerp count)
+                (format "\\{%d\\}" count)
+              "*"))))
+
+
+;; idea is stolen from ido.el, written by Kim F. Storm <stormware@get2net.dk>
+(defun tree-buffer-find-common-substring (lis subs &optional only-prefix)
+  "Return common substring beginning with SUBS in each element of LIS. If
+ONLY-PREFIX is not nil then only common prefix is returned."
+  (let ((change-word-sub (concat (if only-prefix
+                                     (concat "^"
+                                             (car (tree-buffer-spec->incr-search-additional-pattern
+                                                   tree-buffer-spec)))
+                                   "")
+                                 "\\(" (regexp-quote subs) "\\)"))
+        res alist)
+    (setq res
+          (mapcar (function (lambda (word)
+                              (save-match-data
+                                (if (string-match change-word-sub word)
+                                    (substring word
+                                               (match-beginning
+                                                (if (and only-prefix
+                                                         (cdr (tree-buffer-spec->incr-search-additional-pattern
+                                                               tree-buffer-spec)))
+                                                    (1+ (cdr (tree-buffer-spec->incr-search-additional-pattern
+                                                              tree-buffer-spec)))
+                                                  1)))
+                                  ;; else no match
+                                  nil))))
+                  lis))
+    (setq res (delq nil res)) ;; remove any nil elements (shouldn't happen)
+    (setq alist (mapcar (function (lambda (r)
+                                    (cons r 1)))
+                        res)) ;; could use an  OBARRAY
+    ;; try-completion returns t if there is an exact match.
+    (let ((completion-ignore-case t))
+      (try-completion subs alist))))
+
+(defun tree-buffer-incremental-node-search ()
+  "Incremental search for a node in current tree-buffer.
+Each display-able key \(e.g. all keys normally bound to `self-insert-command')
+is appended to the current search-pattern. The tree-buffer tries to jump to
+the current search-pattern. If no match is found then nothing is done. Some
+special keys:
+- \[backspace] and \[delete]: Delete the last character from the search-pattern.
+- \[home]: Delete the complete search-pattern
+- \[end]: Expand either to a complete node if current search-pattern is
+         already unique or expands to the greatest common prefix of the nodes.
+         If there are at least two nodes with the same greatest common-prefix
+         than every hit of \[end] jumps to the next node with this common
+         prefix.
+
+The current search-pattern is shown in the echo area.
+After selecting a node with RET the search-pattern is cleared out.
+
+Do NOT call this function directly. It works only if called from the binding
+mentioned above!"
+  (interactive)
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let ((last-comm (tree-buffer-event-to-key last-command-event))
+          (full-search-regexp nil))
+      (case last-comm
+        ((delete backspace)
+         ;; reduce by one from the end
+         (setq tree-buffer-incr-searchpattern
+               (substring tree-buffer-incr-searchpattern
+                          0
+                          (max 0 (1- (length tree-buffer-incr-searchpattern))))))
+        ;; delete the complete search-pattern
+        (home
+         (setq tree-buffer-incr-searchpattern ""))
+        ;; expand to the max. common prefix
+        (end
+         (let* ((node-name-list (tree-buffer-map-displayed-nodes
+                                 'tree-node->name))
+                (common-prefix (tree-buffer-find-common-substring
+                                node-name-list tree-buffer-incr-searchpattern
+                                (if (equal (tree-buffer-spec->incr-search-p tree-buffer-spec)
+                                           'prefix)
+                                    t))))
+           (if (stringp common-prefix)
+               (setq tree-buffer-incr-searchpattern common-prefix))))
+        ((nil) nil) ;; do nothing
+        (otherwise
+         ;; add the last command to the end
+         (setq tree-buffer-incr-searchpattern
+               (concat tree-buffer-incr-searchpattern
+                       (char-to-string last-comm)))))
+      (setq full-search-regexp
+            (concat tree-buffer-incr-searchpattern-indent-prefix
+                    tree-buffer-incr-searchpattern-expand-prefix
+                    (car (tree-buffer-spec->incr-search-additional-pattern
+                          tree-buffer-spec))
+                    (if (equal (tree-buffer-spec->incr-search-p tree-buffer-spec)
+                               'substring)
+                        "[^()\n]*"
+                      "")
+                    (regexp-quote tree-buffer-incr-searchpattern)))
+      (setq tree-buffer-incr-searchpattern
+            (or (funcall (tree-buffer-spec->reduce-tree-for-incr-search-fn tree-buffer-spec)
+                         tree-buffer-incr-searchpattern full-search-regexp)
+                ;; Only if the reduce-function is 'ignore we get nil and then
+                ;; we do not change the `tree-buffer-incr-searchpattern'
+                tree-buffer-incr-searchpattern))
+      (tree-buffer-nolog-message
+       "%s node search: [%s]%s"
+       (buffer-name (current-buffer))
+       tree-buffer-incr-searchpattern
+       (if (save-excursion
+             (if (not (and (equal last-comm 'end)
+                           (string= tree-buffer-incr-searchpattern
+                                    tree-buffer-last-incr-searchpattern)))
+                 (goto-char (point-min)))
+             (re-search-forward full-search-regexp nil t))
+           ;; we have found a matching ==> jump to it
+           (progn
+             (goto-char (match-end 0))
+             "")
+         " - no match"))
+      ;; lets save the search-pattern so we can compare it with the next one.
+      (setq tree-buffer-last-incr-searchpattern tree-buffer-incr-searchpattern))))
+
+(defun tree-buffer-create-menu-emacs (menu-def menu-name)
+  "Create an Emacs-menu for MENU-DEF with name MENU-NAME.
+MENU-DEF must have the same format as the first argument of
+`tree-buffer-create-menu'."
+  (let ((map (make-sparse-keymap menu-name))
+        (counter 0)
+        (menu-items (reverse menu-def)))
+    (dolist (item menu-items)
+      (cond ((string= (car item) "---")
+             (define-key map
+               (make-vector 1
+                            (setq counter (1+ counter)))
+               (list "---")))
+            ((stringp (cadr item)) ;; menu-entry
+             (define-key map
+               (make-vector 1
+                            (setq counter (1+ counter)))
+               (cons (cadr item) (car item))))
+            (t ;; submenu
+             (define-key map
+               (make-vector 1
+                            (setq counter (1+ counter)))
+               (cons (car item)
+                     (tree-buffer-create-menu-emacs (cdr item) (car item)))))))
+    map))
+
+
+(defun tree-buffer-create-menu-xemacs (menu-def &optional node-commands-p)
+  "Create a XEmacs-menu for MENU-DEF.
+If optional arg NODE-COMMANDS-P is not nil then the menu-commands will be
+called with the current node at point. Otherwise the menu-commands will be
+called with no argument. MENU-DEF must have the same format as the first
+argument of `tree-buffer-create-menu'."
+  (when menu-def
+    (let ((item (car menu-def)))
+      (cons (cond ((string= (car item) "---")
+		   (car item))
+		  ((stringp (cadr item)) ;; menu-entry
+                   (let ((v (make-vector 3 t)))
+                     (aset v 0 (cadr item))
+                     (aset v 1 (delq nil
+                                     (list (car item)
+                                           (and node-commands-p
+                                                '(tree-buffer-get-node-at-point)))))
+                     (aset v 2 t)
+                     v))
+		  (t ;; submenu
+                   `(,(car item)
+                     ,@(tree-buffer-create-menu-xemacs (cdr item)
+                                                       node-commands-p))))
+	    (tree-buffer-create-menu-xemacs (cdr menu-def) node-commands-p)))))
+
+(defun tree-buffer-create-menu (menu-items &optional node-commands-p)
+  "Creates a popup menu from the list MENU-ITEMS.
+MENU-ITEMS is a list of elements of the following type: Each element defines a
+new menu-entry and is either:
+
+a) Menu-command: A list containing two sub-elements, whereas the first is the
+   function \(a function symbol) being called if the menu-entry is selected
+   and the second is the name of the menu-entry.
+b) Separator: A one-element-list and the element is the string \"---\": Then a
+   non-selectable menu-separator is displayed.
+c) Submenu: A list where the first element is the title of the submenu
+   displayed in the main-menu and all other elements are either menu-commands
+   \(see a) or separators \(see b) or another submenu \(see c). This allows
+   deep nested menu-submenu-structures!
+
+If optional arg NODE-COMMANDS-P is not nil then the function of a
+menu-commands will be called with a tree-node argument. Otherwise the
+menu-commands will be called with no argument.
+
+If NODE-COMMANDS-P is not nil then the function of a menu-command must follow
+the following guidelines: Such a function must be defined with the macro
+`tree-buffer-defpopup-command'! This macro defines a new popup-command whereas
+the newly defined command gets one argument NODE. See the docstring of
+`tree-buffer-defpopup-command' for further details.
+
+Example for the definition of such a popupmenu-command:
+
+\(tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+  \"Prints the name of the directory of the node under point.\"
+  \(let \(\(node-data=dir \(tree-node->data node)))
+     \(message \"Dir under node: %s\" node-data=dir)))"
+  (when menu-items
+    (if tree-buffer-running-xemacs
+        (tree-buffer-create-menu-xemacs menu-items node-commands-p)
+      (tree-buffer-create-menu-emacs menu-items "dummy-name"))))
+
+
+(defun tree-buffer-create-menus (menus &optional node-commands-p)
+  "Creates a popup menus from an assoc list with menus.
+MENUS is an assoc list containing cons-cells of the form:
+The car is a node-type \(see slot TYPE of a tree-node) and the cdr is a menu
+in the sense of `tree-buffer-create-menu', i.e. the cdr is a list of
+menu-items expected as argument by `tree-buffer-create-menu'.
+
+For a description of NODE-COMMAND-P see `tree-buffer-create-menu'."
+  (when menus
+    (cons (cons (caar menus)
+		(tree-buffer-create-menu (cdar menus) node-commands-p))
+	  (tree-buffer-create-menus (cdr menus) node-commands-p))))
+
+;; Klaus Berndl <klaus.berndl@sdm.de>: Seems that the docstring of
+;; x-popup-menu is wrong because it seems this function needs offsets related
+;; to current window not to frame!
+;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: For XEmacs this does not work!
+(defun tree-buffer-show-node-menu-keyboard (&optional use-tmm)
+  "Activate the popup-menu of current tree-buffer via keyboard. If called with
+a prefix-arg then the library tmm.el is used for displaying the popup-menu -
+ignored with XEmacs."
+  (interactive "P")
+  (if use-tmm
+      (unless (not (equal (selected-frame) tree-buffer-frame))
+        (when (tree-buffer-spec->menu-creator tree-buffer-spec)
+          (let ((node (tree-buffer-get-node-at-point)))
+            (when (and (not tree-buffer-running-xemacs)
+                       node
+                       (locate-library "tmm"))
+              (let ((menu (cdr (assoc (tree-node->type node)
+                                      (tree-buffer-create-menus
+                                       (funcall (tree-buffer-spec->menu-creator
+                                                 tree-buffer-spec)
+                                                (buffer-name) node))))))
+                (tmm-prompt menu))))))
+    (if tree-buffer-running-xemacs
+        (tree-buffer-show-node-menu (get-buffer-window (current-buffer)
+                                                       tree-buffer-frame))
+      (let ((curr-frame-ypos (* (/ (frame-pixel-height) (frame-height))
+                                (count-lines (window-start) (point))))
+            (curr-frame-xpos (* (/ (frame-pixel-width) (frame-width))
+                                (current-column))))
+        (tree-buffer-show-node-menu (list (list curr-frame-xpos curr-frame-ypos)
+                                          (selected-window)))))))
+
+(defun tree-buffer-popup-menu (event menu menu-title &optional node)
+  "Popup a a context menu.
+EVENT is the event which has triggered the menu-popup. Note that EVENT is
+different for XEmacs and Emacs. For the former one it is an event as needed by
+`popup-menu' and for the latter one as needed by `x-popup-menu'. MENU-TITLE is
+the string which should be displayed as menu-title. If optional arg NODE is a
+tree-node then the selected menu-command will be called with that node as
+argument. If NODE is nil then the selected menu-command will be called with no
+argument otherwise with NODE as the only argument."
+  (if tree-buffer-running-xemacs
+      (if (windowp event)
+          (popup-menu-and-execute-in-window (cons menu-title menu)
+                                            event)
+        (popup-menu (cons menu-title menu)))
+    ;; we must set the title for the menu-keymap
+    (setcar (member (nth (1- (length menu)) menu) menu)
+            menu-title)
+    (let* ((menu-selection (apply 'vector
+                                  (x-popup-menu event menu)))
+           (fn (if (and menu-selection
+                        (> (length menu-selection) 0))
+                   (lookup-key menu menu-selection))))
+      (when (functionp fn)
+        (if node
+            (funcall fn node)
+          (funcall fn))))))
+
+(defun tree-buffer-show-node-menu (event)
+  "Display a popup-menu for the node at point.
+For an description of EVENT see `tree-buffer-popup-menu'."
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let ((node (tree-buffer-get-node-at-point))
+          (menu-creator (tree-buffer-spec->menu-creator tree-buffer-spec)))
+      (when (and node (functionp menu-creator))
+        (let* ((menu (cdr (assoc (tree-node->type node)
+                                 (tree-buffer-create-menus
+                                  (funcall (tree-buffer-spec->menu-creator
+                                            tree-buffer-spec)
+                                           (buffer-name) node)
+                                  t))))
+               (menu-title-creator
+                (cdr (assoc (tree-node->type node)
+                            (tree-buffer-spec->menu-titles tree-buffer-spec))))
+               (menu-title (typecase menu-title-creator
+                             (string menu-title-creator)
+                             (function (funcall menu-title-creator node))
+                             (otherwise "Tree-buffer-nodemenu"))))
+          (when menu
+            (tree-buffer-popup-menu event menu menu-title node)))))))
+
+(defun tree-buffer-show-modeline-menu (event)
+  "Display a popup-menu for the modeline of current tree-buffer.
+For an description of EVENT see `tree-buffer-popup-menu'."
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let* ((menu-creator (tree-buffer-spec->modeline-menu-creator tree-buffer-spec))
+           (menu (and menu-creator (funcall menu-creator (buffer-name)))))
+      (when menu
+        (tree-buffer-popup-menu event
+                                (tree-buffer-create-menu menu)
+                                "Tree-buffer modeline-menu")))))
+
+(defmacro tree-buffer-defpopup-command (name docstring &rest body)
+  "Define a new popup-command for a tree-buffer.
+NAME is the name of the popup-command to create. It will get one optional
+argument NODE \(s.b.) and a list of zero or more extra arguments called
+REST-ARG-LIST, so the argument-signature of the generated command is
+\(&optional node &rest rest-arg-list). DOCSTRING is a documentation string to
+describe the function. BODY is the code evaluated when this command is called
+from a popup-menu of a tree-buffer.
+
+BODY can refer to NODE which is bound to the node for which this popup-command
+is called \(i.h. that node with the point at call-time of this command) and to
+REST-ARG-LIST which is a list of zero or more extra arguments. If the
+generated command is called by ECB via the popup-mechanism \(or the
+tmm-mechanism) then REST-ARG-LIST is always nil. This argument list is to have
+the freedom to program such a command more generally so it can not only be
+called via popup but also called from some arbitrary elisp-code which can then
+call this command with more arguments than only a NODE - if necessary.
+
+With the function `tree-node->data' the related data of NODE is accessible
+and returns for example in case of the directories buffer the directory for
+which the popup-menu has been opened. The BODY can do any arbitrary things
+with this node-data. In general all accessors \(tree-node->*) for a node
+can be used.
+
+Example for the usage of this macro:
+
+\(tree-buffer-defpopup-command ecb-my-special-dir-popup-function
+   \"Prints the name of the directory of the node under point.\"
+  \(let \(\(node-data=dir \(tree-node->data node))
+          \(first-arg-of-rest-args \(car rest-arg-list)))
+    \(message \"Dir under node: %s\" node-data=dir)))"
+  `(eval-and-compile
+     (defun ,name (&optional node &rest rest-arg-list)
+       ,(concat docstring
+                "\n\n"
+                "This is a generated command intended to be called via the popup-menu of ECB.\n"
+                "The arguments NODE and REST-ARG-LIST can not be inserted in an interactive\n"
+                "way by the end-user but are passed from ECB to this command.\n"
+                "NODE is that node-object for which this command is called. If NODE is nil\n"
+                "then the current node at point in the currently selected tree-buffer is used.\n"
+                "REST-ARG-LIST is a list of zero or more extra arguments passed to this command.")
+       (interactive)
+       (let ((node (if (and (interactive-p) (null node))
+                       (tree-buffer-get-node-at-point)
+                     node)))
+         (when node
+           ,@body)))))
+
+(put 'tree-buffer-defpopup-command 'lisp-indent-function 1)
+
+
+;; mouse tracking stuff for XEmacs - GNU Emacs uses help-echo!
+
+(defun tree-buffer-follow-mouse (event)
+  (interactive "e")
+  (when tree-buffer-running-xemacs
+    (let ((window (tree-buffer-event-window event))
+          (current-window (get-buffer-window (current-buffer))))
+      (when (and (or (not (window-minibuffer-p current-window))
+                     (not (minibuffer-window-active-p current-window)))
+                 (windowp window)
+                 (member (window-buffer window) tree-buffers))
+        (set-buffer (window-buffer window))
+        (let ((p (tree-buffer-event-point event)))
+          (when (integer-or-marker-p p)
+            ;; (unless (not (equal (selected-frame) tree-buffer-frame))
+            (let ((node (tree-buffer-get-node-at-point p)))
+              (when (and (tree-buffer-spec->node-mouse-over-fn tree-buffer-spec)
+                         node)
+                (funcall (tree-buffer-spec->node-mouse-over-fn tree-buffer-spec)
+                         node (get-buffer-window (current-buffer)))))))))))
+
+(defun tree-buffer-activate-follow-mouse ()
+  "Activates that in all tree-buffer-windows - regardless if the active window
+or not - a mouse-over-node-function is called if mouse moves over a node. See
+also the NODE-MOUSE-OVER-FN argument of `tree-buffer-create'.
+
+This function does nothing for GNU Emacs; with this version this
+functionality is done with the `help-echo'-property and the function
+`tree-buffer-help-echo-fn'!"
+  (when tree-buffer-running-xemacs
+    (dolist (buf tree-buffers)
+      (save-excursion
+        (set-buffer buf)
+        (add-hook 'mode-motion-hook 'tree-buffer-follow-mouse)))))
+
+(defun tree-buffer-deactivate-follow-mouse ()
+  "Complementary function to `tree-buffer-activate-follow-mouse'."
+  (when tree-buffer-running-xemacs
+    (dolist (buf tree-buffers)
+      (save-excursion
+        (set-buffer buf)
+        (remove-hook 'mode-motion-hook 'tree-buffer-follow-mouse)))))
+
+;; pressed keys
+
+(defun tree-buffer-tab-pressed ()
+  "Perform the defined action after a TAB-hit."
+  (interactive)
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let ((node (tree-buffer-get-node-at-point)))
+      (when (tree-node->expandable node)
+	(when (and (tree-buffer-spec->node-expanded-fn tree-buffer-spec)
+		   (not (tree-node->expanded node)))
+	  (funcall (tree-buffer-spec->node-expanded-fn tree-buffer-spec)
+                   node 0 nil nil nil (buffer-name)))
+        (when (tree-node->expandable node)
+          (when (and (tree-node->expanded node)
+                     (tree-buffer-spec->node-collapsed-fn tree-buffer-spec))
+            (funcall (tree-buffer-spec->node-collapsed-fn tree-buffer-spec)
+                     node 0 nil
+                     nil nil (buffer-name)))
+          (tree-node-toggle-expanded node))
+	;; Update the tree-buffer with optimized display of NODE           
+	(tree-buffer-update node)))))
+
+(defun tree-buffer-arrow-pressed ()
+  "Perform smart arrow-key navigation/movement."
+  (interactive)
+  (unless (not (equal (selected-frame) tree-buffer-frame))
+    (let ((node (tree-buffer-get-node-at-point))
+          (arrow-key (tree-buffer-event-to-key last-command-event)))
+      (case arrow-key
+        (up
+         (forward-line -1)
+         (beginning-of-line)
+         (re-search-forward tree-buffer-incr-searchpattern-indent-prefix nil t))
+        (down
+         (forward-line 1)
+         (beginning-of-line)
+         (re-search-forward tree-buffer-incr-searchpattern-indent-prefix nil t))
+        (right
+         (if (and (tree-node->expandable node)
+                  (not (tree-node->expanded node)))
+             (tree-buffer-tab-pressed)
+           ;; jump to the first subnode
+           (forward-line 1)
+           (beginning-of-line)
+           (re-search-forward tree-buffer-incr-searchpattern-indent-prefix nil t)))
+        (left
+         (if (tree-node->expanded node)
+             (tree-buffer-tab-pressed)
+           ;; jump to next higher node
+           (let* ((new-indent-factor (/ (max 0 (- (tree-node-indentlength node)
+                                                  (tree-buffer-spec->tree-indent
+                                                   tree-buffer-spec)))
+                                        (tree-buffer-spec->tree-indent tree-buffer-spec)))
+                  (search-string
+                   (concat (tree-buffer-gen-searchpattern-indent-prefix new-indent-factor)
+                           "[^ `|]")))
+             (re-search-backward search-string nil t)
+             (beginning-of-line)
+             (re-search-forward tree-buffer-incr-searchpattern-indent-prefix nil t))))))))
+
+
+;; headerline stuff
+;; stolen from cedets stickyfunc-minor-mode - thanks to Eric ;-)
+
+(defun tree-buffer-sticky-default-indent-string ()
+  (if (and window-system (not tree-buffer-running-xemacs))
+      (concat
+       (condition-case nil
+	   ;; Test scroll bar location
+	   (let ((charwidth (tree-buffer-frame-char-width))
+		 (scrollpos (frame-parameter (selected-frame)
+					     'vertical-scroll-bars))
+		 )
+	     (if (or (eq scrollpos 'left)
+		     ;; Now wait a minute.  If you turn scroll-bar-mode
+		     ;; on, then off, the new value is t, not left.
+		     ;; Will this mess up older emacs where the default
+		     ;; was on the right?  I don't think so since they don't
+		     ;; support a header line.
+		     (eq scrollpos t))
+		 (let ((w (when (boundp 'scroll-bar-width)
+			    (symbol-value 'scroll-bar-width))))
+		 
+		   (if (not w)
+		       (setq w (frame-parameter (selected-frame)
+						'scroll-bar-width)))
+
+		   ;; in 21.2, the frame parameter is sometimes empty
+		   ;; so we need to get the value here.
+		   (if (not w)
+		       (setq w (+ (get 'scroll-bar-width 'x-frame-parameter)
+				  ;; In 21.4, or perhaps 22.1 the x-frame
+				  ;; parameter is different from the frame
+				  ;; parameter by only 1 pixel.
+				  1)))
+
+		   (if (not w)
+		       "   "
+		     (setq w (+ charwidth w))   ; Some sort of border around
+					        ; the scrollbar.
+		     (make-string (/ w charwidth) ? )))
+	       ""))
+	 (error ""))
+       (condition-case nil
+	   ;; Test fringe size.
+	   (let* ((f (window-fringes))
+		  (fw (car f))
+		  (numspace (/ fw (tree-buffer-frame-char-width)))
+		  )
+	     (make-string numspace ? ))
+	 (error
+	  ;; Well, the fancy new Emacs functions failed.  Try older
+	  ;; tricks.
+	  (condition-case nil
+	      ;; I'm not so sure what's up with the 21.1-21.3 fringe.
+	      ;; It looks to be about 1 space wide.
+	      (if (get 'fringe 'face)
+		  " "
+		"")
+	    (error ""))))
+       )
+    ;; Not Emacs or a window system means no scrollbar or fringe,
+    ;; and perhaps not even a header line to worry about.
+    ""))
+
+
+(defconst tree-buffer-stickynode-header-line-format
+  (cond (tree-buffer-running-xemacs
+	 nil)
+;; 	((>= emacs-major-version 22)
+;; 	 '(:eval (list
+;; 		  ;; Magic bit I found on emacswiki.
+;; 		  (propertize " "
+;;                               'display
+;;                               '((space :align-to 0)))
+;; 		  (tree-buffer-stickynode-fetch-stickyline))))
+	((>= emacs-major-version 21)
+	 '(:eval (list (tree-buffer-spec->sticky-indent-string tree-buffer-spec)
+		       (tree-buffer-stickynode-fetch-stickyline))))
+	(t nil))
+  "The header line format used by sticky func mode.")
+
+(defun tree-buffer-goto-sticky-node ()
+  "Go in current tree-buffer to that node which should be sticky.
+Returns the line-number of the sticky node."
+  (goto-char (window-start))
+  (forward-line -1)
+  (end-of-line)
+  ;; This is the node under the header-line
+  (let* ((node-under-header-line (tree-buffer-get-node-at-point))
+         (node-at-window-start (save-excursion
+                                 (forward-line 1)
+                                 (tree-buffer-get-node-at-point)))
+         (parent-node (and node-at-window-start
+                           (tree-node->parent node-at-window-start)))
+         (node-to-go (if (eq parent-node (tree-buffer-get-root))
+                         node-under-header-line
+                       parent-node)))
+    ;; we must go the node itself so we can get the whole
+    ;; line - otherwise we would not get the right icons etc...
+    (tree-buffer-goto-line (tree-buffer-displayed-node-linenr node-to-go)))
+  (tree-buffer-current-line))
+
+
+(defun tree-buffer-stickynode-fetch-stickyline ()
+  "Make the parent-node at the top of the current tree-window sticky."
+  (let ((str
+         (if (= 0 (count-lines (point-min) (window-start)))
+             ""
+           (save-excursion
+             ;; here we have at least one node under the header-line
+             (tree-buffer-goto-sticky-node)
+             (buffer-substring (tree-buffer-line-beginning-pos) (tree-buffer-line-end-pos)))))
+	(start 0))
+    ;; we must handle the special sign % of head-line-format!
+    (save-match-data
+      (while (string-match "%" str start)
+        (setq str (replace-match "%%" t t str 0)
+              start (1+ (match-end 0)))
+        ))
+    ;; In 21.4 (or 22.1) the heder doesn't expand tabs.  Hmmmm.
+    ;; We should replace them here.
+    ;;
+    ;; This hack assumes that tabs are kept smartly at tab boundaries
+    ;; instead of in a tab boundary where it might only represent 4 spaces.
+    (save-match-data
+      (while (string-match "\t" str start)
+        (setq str (replace-match "        " t t str 0))))
+    str))
+
+
+;; tree-buffer creation
+
+(defun tree-buffer-create-mouse-key (button trigger &optional modifier key-qualifier)
+  "Create a mouse-key which can be bound to a command via `define-key'.
+BUTTON is the number of the mouse-button which can be 1, 2 or 3. TRIGGER
+determines when the command is triggered, values can be 'button-press and
+'button-release. The third optional modifier can be one of the symbols 'shift,
+'control or 'meta. The fourth optional argument KEY-QUALIFIER is only used by
+GUN Emacs and can be an additional key-qualifier symbol like 'mode-line or
+'header-line."
+  (let ((mouse-button (if tree-buffer-running-xemacs
+                          (format "button%d%s"
+                                  button
+                                  (if (equal trigger 'button-press)
+                                      ""
+                                    "up"))
+                        (format "%smouse-%d"
+                                (if (equal trigger 'button-press)
+                                    "down-"
+                                  "")
+                                button)))
+        (modifier-elem (if tree-buffer-running-xemacs
+                           modifier
+                         (case modifier
+                           (shift "S-")
+                           (control "C-")
+                           (meta "M-")
+                           (otherwise "")))))
+    (if tree-buffer-running-xemacs
+        (delete nil (list modifier-elem (intern mouse-button)))
+      (if (and key-qualifier (symbolp key-qualifier))
+          (vector key-qualifier (intern (concat modifier-elem mouse-button)))
+        (vector (intern (concat modifier-elem mouse-button)))))))
+
+(defun* tree-buffer-create (name
+                            &key
+                            frame
+                            mouse-action-trigger
+                            is-click-valid-fn
+                            node-selected-fn
+                            node-expanded-fn
+                            node-collapsed-fn
+                            node-mouse-over-fn
+                            mouse-highlight-fn
+                            node-data-equal-fn
+                            maybe-empty-node-types
+                            leaf-node-types
+                            menu-creator
+                            menu-titles
+                            modeline-menu-creator
+                            sticky-parent-p
+                            sticky-indent-string
+                            sticky-parent-fn
+                            trunc-lines
+                            read-only
+                            tree-indent
+                            incr-search-p
+                            incr-search-additional-pattern
+                            reduce-tree-for-incr-search-fn
+                            arrow-navigation
+                            hor-scroll-step
+                            default-images-dir
+                            additional-images-dir
+                            image-file-prefix
+                            tree-style
+                            ascii-guide-face
+                            type-facer
+                            expand-symbol-before-p
+                            highlight-node-face
+                            general-face
+                            after-create-hook
+                            after-update-hook)
+  "Creates a new tree buffer and returns the newly created buffer.
+This function creates also a special data-storage for this tree-buffer which
+can be accessed via `tree-buffer-set-data-store' and `tree-buffer-get-data-store'.
+The user of this tree-buffer can store any arbitrary data in this storage.
+Before using the accessor-functions above the tree-buffer has to be the
+current buffer!
+
+NAME: Buffername of the new tree-buffer.
+
+The rest of the arguments are key-arguments of the form :arg-name arg-value,
+so for example a call looks like \(tree-buffer-create <buffer-name> :frame
+<frame-object> ...). The following key-arguments can be arranged in any
+arbitrary order but all of them are not-optional! The key-arg-name is always a
+: followed by the lowercase version of the mentioned argument below \(e.g.
+FRAME --> :frame, MOUSE-ACTION-TRIGGER --> :mouse-action-trigger)
+
+FRAME: Frame in which the tree-buffer is displayed and valid. All key-bindings
+       and interactive functions of the tree-buffer work only if called in
+       FRAME otherwise nothing is done!
+MOUSE-ACTION-TRIGGER: When a mouse-action is triggered. Allowed values:
+                      'button-release and 'button-press.
+IS-CLICK-VALID-FN: `tree-buffer-create' rebinds mouse-1, mouse-2, RET \(and
+                   TAB) and also in combination with shift and control \(not
+                   with TAB). IS-CLICK-VALID-FN is called first if a node or
+                   an expand-symbol is clicked. This function is called with
+                   five arguments:
+                   - mouse-button: The clicked mouse-button or RET or TAB \(0
+                     = RET or TAB, 1 = mouse-1, 2 = mouse 2)
+                   - shift-pressed: non nil if the SHIFT-key was pressed
+                     during mouse-click or RET.
+                   - control-pressed: non nil if the CONTROL-key was pressed
+                     during mouse-click or RET.
+                   - meta-pressed: non nil if the META-key was pressed during
+                     mouse-click or RET.
+                   - tree-buffer-name: The buffer-name of the tree-buffer
+                     where the node has been clicked.
+                   The function must return not nil iff exactly this click/hit
+                   is accepted. If the function returns nil then really
+                   nothing is done by the tree-buffer after this click/hit!
+NODE-SELECTED-FN: Function to call if a node has been selected. This function
+                  is called with the following parameters:
+                  - node: The selected node
+                  - mouse-button \(0 = RET, 1 = mouse-1, 2 = mouse 2)
+                  - shift-pressed
+                  - control-pressed
+                  - meta-pressed
+                  - tree-buffer-name
+                  For the last four arguments see the description above. This
+                  function has to ensure that the expandable- and
+                  expanded-state of the selected node is correct after
+                  returning.
+NODE-EXPANDED-FN: Function to call if a node is expandable, point stays onto
+                  the expand-symbol and node is not already expanded. This
+                  function is called with the following parameters:
+                  - node: The selected node
+                  - mouse-button \(0 = TAB, 1 = mouse-1, 2 = mouse 2)
+                  - shift-pressed
+                  - control-pressed
+                  - meta-pressed
+                  - tree-buffer-name
+                  This function should add all children nodes to this node if
+                  not already done \(if possible). This function has to ensure
+                  that the expandable- and expanded state of the selected node
+                  is correct after returning!
+NODE-COLLAPSED-FN: Function to call if a node is expandable, point stays
+                   onto the expand-symbol and node is already expanded.
+                   This function is called with the following parameters:
+                   - node: The selected node
+                   - mouse-button \(0 = TAB, 1 = mouse-1, 2 = mouse 2)
+                   - shift-pressed
+                   - control-pressed
+                   - meta-pressed
+                   - tree-buffer-name
+                   This function is only a callback to inform the owner/user
+                   of this tree-buffer that this node has been collapsed. This
+                   function must not modify the expandable- or expanded state
+                   of the selected node!
+NODE-MOUSE-OVER-FN: Function to call when the mouse is moved over a node. This
+                    function is called with three arguments: NODE, WINDOW,
+                    NO-PRINT, each of them related to the current tree-buffer.
+                    If NO-PRINT is nil then the function must print the text
+                    itself in any manner. This function must always return the
+                    text which either is printed by the function itself or by
+                    the caller \(if NO-PRINT is not nil). The current buffer
+                    for this function is the tree-buffer itself. With XEmacs
+                    this function is only called if the tree-buffer
+                    track-mouse mechanism is activated \(see the function
+                    `tree-buffer-activate-follow-mouse'). With GNU Emacs 21
+                    this function is called by the `help-echo' property added
+                    to each node.
+MOUSE-HIGHLIGHT-FN: If nil then in this tree-buffer no node is highlighted
+                    when the mouse moves over it. If t then each node is
+                    highlighted when the mouse moves over it. If a function
+                    then it is called with the node as argument and if it
+                    returns not nil then the node will be highlighted when the
+                    mouse moves over it - otherwise no highlighting takes place.
+NODE-DATA-EQUAL-FN: Function used by the tree-buffer to test if the data of
+                    two tree-nodes are equal. The function is called with two
+                    args: The DATA-slots of the two tree-nodes.
+MAYBE-EMPTY-NODE-TYPES: Nil or a list of node-types \(a node-type is an
+                        integer which must be set for `tree-node-new'). Nodes
+                        with one of these types are treated as empty if they
+                        are not expandable \(i.e. they have no children) and
+                        will be displayed with the empty-symbol \(\[x]); for
+                        other nodes see next argument.
+LEAF-NODE-TYPES: Nil or a list of node-types \(see above). Nodes
+                 with one of these types are treated as leafs and will be
+                 displayed with the leaf-symbol \(*). Summary for
+                 MAYBE-EMPTY-NODE-TYPES and LEAF-NODE-TYPES:
+                 * Expandable nodes will always be displayed either with the
+                   open- or with the close-symbol.
+                 * Not-expandable nodes with a node-type contained in
+                   MAYBE-EMPTY-NODE-TYPES will be displayed with the
+                   empty-symbol.
+                 * Not-expandable nodes with a node-type contained in
+                   LEAF-NODE-TYPES will be displayed with the leaf-symbol.
+                 * All other nodes will be displayed with no symbol just with
+                   correct indentation.
+MENU-CREATOR: Nil or function which has to return nil or a list of conses,
+              each cons for a known node-type of this tree-buffer \(the
+              node-type of a node is an integer). Example: \(\(0 .
+              menu-for-type-0) \(1 . menu-for-type-1)). The cdr of a cons must
+              be a menu in the same format `tree-buffer-create-menu' expects
+              as argument - see the documentation of this function for
+              details. This function gets two argument: The name of the
+              tree-buffer and the node for which a popup-menu should be
+              opened.
+MENU-TITLES: Nil or a list conses, each cons for a node-type. See
+             MENU-CREATOR. The cdr of a cons must be either a string or a
+             function which will be called with current node under point and
+             must return a string which is displayed as the menu-title.
+MODELINE-MENU-CREATOR: Nil or a function which has to return nil or a menu in
+                       the same format `tree-buffer-create-menu' expects as
+                       argument - see the documentation of this function for
+                       details. This function gets one argument: The name of
+                       the tree-buffer. If the function returns a menu then
+                       this menu will be displayed when the user clicks with
+                       mouse-button 3 at the modeline of the tree-buffer. The
+                       menu-title will be \"Tree-buffer modeline-menu\".
+STICKY-PARENT-P: If not nil then with GNU Emacs >= 21 the tree-buffer displays
+                 in its header-line the unvisible parent-node if there is any.
+                 STICKY-PARENT-FN is used to get this parent node.
+STICKY-INDENT-STRING: String used for indendation of the sticky node in the
+                      header-line so it matches the tree-display.
+STICKY-PARENT-FN: Function used to get that parent node which should be sticky.
+                  This function gets as argument a node and
+                  should either return nil \(if there is not
+                  suitable parent node) or a node. This node will
+                  be displayed as sticky in the header-line of the
+                  tree-buffer. If nil is returned and STICKY-PARENT-P is not
+                  nil then just the node under the header-line is displayed.
+                  If this argument is nil and STICKY-PARENT-P is not nil then
+                  always the next unvisible parent node will be displayed in
+                  the header-line.
+TRUNC-LINES: Should lines in this tree buffer be truncated \(not nil).
+READ-ONLY: Should the treebuffer be read-only \(not nil).
+TREE-INDENT: Spaces subnodes should be indented. Ignored if TREE-STYLE is
+             'image \(see below).
+INCR-SEARCH-P: Should the incremental search be enabled in the tree-buffer.
+               Three choices: 'prefix, 'substring, nil. See the command
+               `tree-buffer-incremental-node-search'.
+INCR-SEARCH-ADDITIONAL-PATTERN: Every search-pattern is prefixed at least with
+                                `tree-buffer-incr-searchpattern-indent-prefix'
+                                and `tree-buffer-incr-searchpattern-expand-prefix'
+                                to jump over not important stuff. If this
+                                argument is not nil then it must be a
+                                cons-cell where car is a string which should
+                                be a regexp-pattern which is added to the
+                                basic-prefix pattern and both of them prefix
+                                the incr-search-pattern. The cdr is the number
+                                of subexpressions in this pattern.
+REDUCE-TREE-FOR-INCR-SEARCH-FN: Nil or a function which is called
+                                directly after changing the current
+                                incremental search-pattern by typing and
+                                directly before the tree-buffer performes this
+                                new search. The function gets two arguments:
+                                The current search-pattern as typed in by the
+                                user and the full serch-regexp build by
+                                tree-buffer based on the plain search-pattern.
+                                The purpose of such a function is to apply the
+                                passed search-pattern as a filter to the
+                                tree-contents to reduce the tree to tree-nodes
+                                matching this filter. The passed full
+                                search-regexp \(the second argument) is build
+                                and used by tree-buffer itself to exclude some
+                                stuff not relevant for the search \(e.g.
+                                guide-lines etc..., see also the argument
+                                INCR-SEARCH-ADDITIONAL-PATTERN above). The
+                                function can change the search-pattern typed
+                                in by the user \(the first argument) if this
+                                is necessary. So the function must always
+                                return the finaly applied search-pattern based
+                                on the first argument passed to the function.
+                                The returned value must be a string but can be
+                                the empty string \(means no filter has been
+                                applied). Current buffer is the tree-buffer.
+ARROW-NAVIGATION: If not nil then a smart navigation with arrow keys is offered.
+HOR-SCROLL-STEP: Number of columns a hor. scroll in the tree-buffer should scroll.
+                 If not nil then M-mouse-1 and M-mouse-2 scroll left and right
+                 and also M-<left-arrow> and M-<right-arrow>. Ignored with XEmacs.
+DEFAULT-IMAGES-DIR: Full path where the default images for the tree-buffer can
+                    be found. It should contain an image for every name of
+                    `tree-buffer-tree-image-names'.
+ADDITIONAL-IMAGES-DIR: Additional image-dir which should be searched first for
+                       images needed for current tree-buffer. If the image can
+                       not be found in this directory then DEFAULT-IMAGES-DIR
+                       is searched. If the image can't even found here the
+                       related ascii-symbol is used.
+IMAGE-FILE-PREFIX: Common prefix for all image-files for this tree-buffer,
+                   e.g. \"ecb-\".
+TREE-STYLE: There are three different styles available:
+            Image-style \(value 'image): Very nice and modern because
+            image-icons are used to display the tree-buffer. For this style
+            the arguments TREE-INDENT and EXPAND-SYMBOL-BEFORE-P have no
+            effect!
+            
+            Ascii-style with guide-lines \(value 'ascii-guides):
+            \[-] ECB
+             |  \[+] code-save
+             `- \[-] ecb-images
+                 |  \[-] directories
+                 |   |  \[-] height-15
+                 |   |   |  * close.xpm
+                 |   |   |  * empty.xpm
+                 |   |   |  * leaf.xpm
+                 |   |   `- * open.xpm
+                 |   |  \[+] height-17
+                 |   |  \[+] height-19
+                 |   `- \[+] height-21
+                 |  \[x] history
+                 |  \[x] methods
+                 `- \[x] sources
+            
+            Ascii-style without guide-lines \(value 'ascii-no-guides):
+            \[-] ECB
+                \[+] code-save
+                \[-] ecb-images
+                    \[-] directories
+                        \[-] height-15
+                            * close.xpm
+                            * empty.xpm
+                            * leaf.xpm
+                            * open.xpm
+                        \[+] height-17
+                        \[+] height-19
+                        \[+] height-21
+                    \[x] history
+                    \[x] methods
+                    \[x] sources
+            
+            Both ascii-styles are affected by the args TREE-INDENT and
+            EXPAND-SYMBOL-BEFORE-P..
+ASCII-GUIDE-FACE: If TREE-STYLE is 'ascii-guides then this defines the face
+                  the guides should be displayed with.
+TYPE-FACER: Nil or a list of one or more conses, each cons for a node-type \(a
+            node-type is an integer which must be set for `tree-node-new').
+            The cdr of a cons can be:
+            - a face-symbol
+            - a function-symbol which gets two arguments \(see
+              `tree-buffer-insert-text'). This function can do anything, but
+              normally it should face a tree-node.
+            - the symbol t. Then the tree-buffer assumes that the node-text is
+              already faced and therefore it does not face the node, means it
+              does nothing then inserting the node-text, if the tree-buffer is
+              updated.
+EXPAND-SYMBOL-BEFORE-P: If not nil then the expand-symbol is displayed before
+                        the node-text. Ignored when TREE-STYLE is 'image and
+                        Emacs can display images.
+HIGHLIGHT-NODE-FACE: Face used for highlighting current selected node in this
+                     tree-buffer.
+GENERAL-FACE: General face in which the whole tree-buffer should be displayed.
+AFTER-CREATE-HOOK: A function or a list of functions \(with no arguments)
+                   called directly after creating the tree-buffer and defining
+                   it's local keymap. For example such a function can add
+                   additional key-bindings for this tree-buffer local keymap
+                   \(use `local-set-key' for this).
+AFTER-UPDATE-HOOK: A function or a list of functions \(with no arguments)
+                   called each time after the tree-buffer has been updated via
+                   `tree-buffer-update'.
+
+See Info node `(ecb)tree-buffer' for all details of using tree-buffers."
+  (let ((nop (function (lambda(e) (interactive "e"))))
+        (a-c-h (if (functionp after-create-hook)
+                   (list after-create-hook)
+                 after-create-hook))
+        (mouse-action-trigger-not (if (equal mouse-action-trigger
+                                             'button-press)
+                                      'button-release
+                                    'button-press)))
+        
+    (set-buffer (get-buffer-create name))
+
+    (make-local-variable 'truncate-lines)
+    (make-local-variable 'truncate-partial-width-windows)
+    (setq truncate-lines trunc-lines)
+    (setq truncate-partial-width-windows trunc-lines)
+
+    (setq cursor-in-non-selected-windows nil)
+
+    (setq buffer-read-only read-only)
+
+    (make-local-variable 'tree-buffer-key-map)
+    (setq tree-buffer-key-map (make-sparse-keymap))
+
+    (make-local-variable 'tree-buffer-frame)
+    (setq tree-buffer-frame frame)
+
+    (make-local-variable 'tree-buffer-root)
+    (setq tree-buffer-root (tree-node-new-root))
+
+    (make-local-variable 'tree-buffer-displayed-nodes)
+    (tree-buffer-initialize-displayed-nodes)
+    
+    (make-local-variable 'tree-buffer-spec)
+    (setq tree-buffer-spec
+          (tree-buffer-spec-new :tree-indent tree-indent
+                                :menu-creator menu-creator
+                                :menu-titles menu-titles
+                                :modeline-menu-creator modeline-menu-creator
+                                :sticky-parent-p sticky-parent-p
+                                :sticky-indent-string sticky-indent-string
+                                :sticky-parent-fn sticky-parent-fn
+                                :type-facer type-facer
+                                :expand-symbol-before-p expand-symbol-before-p
+                                :mouse-action-trigger mouse-action-trigger
+                                :is-click-valid-fn is-click-valid-fn
+                                :node-selected-fn node-selected-fn
+                                :node-expanded-fn node-expanded-fn
+                                :node-collapsed-fn node-collapsed-fn
+                                :node-mouse-over-fn node-mouse-over-fn
+                                :mouse-highlight-fn mouse-highlight-fn
+                                :node-data-equal-fn node-data-equal-fn
+                                :after-update-hook after-update-hook
+                                :maybe-empty-node-types maybe-empty-node-types
+                                :leaf-node-types leaf-node-types
+                                :general-face general-face
+                                :incr-search-p incr-search-p
+                                :incr-search-additional-pattern incr-search-additional-pattern
+                                :reduce-tree-for-incr-search-fn reduce-tree-for-incr-search-fn
+                                :hor-scroll-step hor-scroll-step
+                                :default-images-dir default-images-dir
+                                :additional-images-dir additional-images-dir
+                                :image-file-prefix image-file-prefix
+                                :style tree-style
+                                :ascii-guide-face ascii-guide-face))
+
+    (make-local-variable 'tree-buffer-incr-searchpattern)
+    (make-local-variable 'tree-buffer-last-incr-searchpattern)
+    (make-local-variable 'tree-buffer-incr-searchpattern-indent-prefix)
+    (setq tree-buffer-incr-searchpattern "")
+    (setq tree-buffer-last-incr-searchpattern "")
+    (setq tree-buffer-incr-searchpattern-indent-prefix
+          (tree-buffer-gen-searchpattern-indent-prefix))
+
+    (make-local-variable 'tree-buffer-highlight-overlay)
+    (setq tree-buffer-highlight-overlay (tree-buffer-make-overlay 1 1))
+    (tree-buffer-overlay-put tree-buffer-highlight-overlay
+                             'face highlight-node-face)
+
+    (make-local-variable 'tree-buffer-general-overlay)
+    (setq tree-buffer-general-overlay (tree-buffer-make-overlay 1 1))
+    (tree-buffer-overlay-put tree-buffer-general-overlay 'face
+                             general-face)
+
+  
+    (make-local-variable 'tree-buffer-highlighted-node)
+    (setq tree-buffer-highlighted-node nil)
+    (make-local-variable 'tree-buffer-hscroll-number)
+    (setq tree-buffer-hscroll-number 0)
+    
+    ;; initialize the user-data-storage for this tree-buffer.
+    (set (make-local-variable 'tree-buffer-data-store) nil)
+    ;; initialize the local image-cache for this tree-buffer
+    (set (make-local-variable 'tree-buffer-local-image-cache) nil)
+
+    ;; set a special syntax table for tree-buffers
+    (set-syntax-table tree-buffer-syntax-table)
+    
+    ;; keyboard setting
+    (when incr-search-p
+      ;; settings for the incremental search.
+      ;; for all keys which are bound to `self-insert-command' in `global-map'
+      ;; we change this binding to `tree-buffer-incremental-node-search'.
+      (substitute-key-definition 'self-insert-command
+                                 'tree-buffer-incremental-node-search
+                                 tree-buffer-key-map
+                                 global-map)
+      (define-key tree-buffer-key-map [delete]
+        'tree-buffer-incremental-node-search)
+      (define-key tree-buffer-key-map [backspace]
+        'tree-buffer-incremental-node-search)
+      (define-key tree-buffer-key-map [home]
+        'tree-buffer-incremental-node-search)
+      (define-key tree-buffer-key-map [end]
+        'tree-buffer-incremental-node-search))
+    
+    (define-key tree-buffer-key-map (kbd "<RET>")
+      (function (lambda ()
+                  (interactive)
+                  (tree-buffer-select 0 nil))))
+    (define-key tree-buffer-key-map (kbd "<S-return>")
+      (function (lambda ()
+                  (interactive)
+                  (tree-buffer-select 0 '(shift)))))
+    (define-key tree-buffer-key-map (kbd "<C-return>")
+      (function (lambda ()
+                  (interactive)
+                  (tree-buffer-select 0 '(control)))))
+    (define-key tree-buffer-key-map (kbd "<M-return>")
+      (function (lambda ()
+                  (interactive)
+                  (tree-buffer-select 0 '(meta)))))
+    (define-key tree-buffer-key-map (kbd "<C-S-return>")
+      (function (lambda ()
+                  (interactive)
+                  (tree-buffer-select 0 '(shift control)))))
+    
+    (define-key tree-buffer-key-map (kbd "TAB") 'tree-buffer-tab-pressed)
+
+    (when arrow-navigation
+      (define-key tree-buffer-key-map (kbd "<up>") 'tree-buffer-arrow-pressed)
+      (define-key tree-buffer-key-map (kbd "<down>") 'tree-buffer-arrow-pressed)
+      (define-key tree-buffer-key-map (kbd "<right>") 'tree-buffer-arrow-pressed)
+      (define-key tree-buffer-key-map (kbd "<left>") 'tree-buffer-arrow-pressed))
+    
+    (define-key tree-buffer-key-map (kbd "M-m")
+      'tree-buffer-show-node-menu-keyboard)
+
+;;     (mapc (function
+;;            (lambda (key)
+;;              (tree-buffer-define-mouse-key 1 key)))
+;;           '(nil shift control meta))
+
+    (macrolet ((tbc-define-mouse-key-1/2 (button key)
+                `(progn
+                   (define-key tree-buffer-key-map
+                     (tree-buffer-create-mouse-key ,button mouse-action-trigger ,key)
+                     (function (lambda(e)
+                                 (interactive "e")
+                                 (tree-buffer-mouse-set-point e)
+                                 (tree-buffer-select ,button (list ,key)))))
+                   (define-key tree-buffer-key-map
+                     (tree-buffer-create-mouse-key ,button mouse-action-trigger-not ,key)
+                     nop)))
+               (tbc-define-mouse-key-1/2-header
+                (button key)
+                `(progn
+                   (define-key tree-buffer-key-map
+                     (tree-buffer-create-mouse-key ,button mouse-action-trigger ,key 'header-line)
+                     (function (lambda(e)
+                                 (interactive "e")
+                                 (tree-buffer-mouse-set-point e)
+                                 (when (< 0 (count-lines (point-min) (window-start)))
+                                   ;; we have at least one node under the header-line
+                                   (let ((click-col (tree-buffer-get-event-column e)))
+                                     ;; go to the sticky node
+                                     (tree-buffer-goto-sticky-node)
+                                     ;; go to beginning of current line
+                                     (forward-line 0)
+                                     ;; move right
+                                     (forward-char click-col))
+                                   (tree-buffer-select ,button (list ,key))))))
+                   (define-key tree-buffer-key-map
+                     (tree-buffer-create-mouse-key ,button mouse-action-trigger-not ,key 'header-line)
+                     nop))))
+
+      ;; mouse-1
+      (tbc-define-mouse-key-1/2 1 nil)
+      (tbc-define-mouse-key-1/2 1 'shift)
+      (tbc-define-mouse-key-1/2 1 'control)
+      (tbc-define-mouse-key-1/2 1 'meta)
+      (define-key tree-buffer-key-map [drag-mouse-1] nop)
+      (define-key tree-buffer-key-map [double-mouse-1] nop)
+      (define-key tree-buffer-key-map [triple-mouse-1] nop)
+
+      ;; mouse-2
+      (tbc-define-mouse-key-1/2 2 nil)
+      (tbc-define-mouse-key-1/2 2 'shift)
+      (tbc-define-mouse-key-1/2 2 'control)
+      (tbc-define-mouse-key-1/2 2 'meta)
+      (define-key tree-buffer-key-map [double-mouse-2] nop)
+      (define-key tree-buffer-key-map [triple-mouse-2] nop)
+
+      (when (and (not tree-buffer-running-xemacs) sticky-parent-p)
+        (setq header-line-format
+              tree-buffer-stickynode-header-line-format)
+        ;; mouse-1 header-line
+        (tbc-define-mouse-key-1/2-header 1 nil)
+        (tbc-define-mouse-key-1/2-header 1 'shift)
+        (tbc-define-mouse-key-1/2-header 1 'control)
+        (tbc-define-mouse-key-1/2-header 1 'meta)
+        
+        ;; mouse-2 header-line
+        (tbc-define-mouse-key-1/2-header 2 nil)
+        (tbc-define-mouse-key-1/2-header 2 'shift)
+        (tbc-define-mouse-key-1/2-header 2 'control)
+        (tbc-define-mouse-key-1/2-header 2 'meta)
+        )
+      )
+    
+    ;; mouse-3 - here we use hard button-press because this is consitent to
+    ;; standard popup-behavior of (X)Emacs
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-press nil)
+      (function (lambda(e)
+		  (interactive "e")
+                  (tree-buffer-mouse-set-point e)
+                  (tree-buffer-show-node-menu e))))
+    (when (and (not tree-buffer-running-xemacs) sticky-parent-p)
+      (define-key tree-buffer-key-map
+        (tree-buffer-create-mouse-key 3 'button-press nil 'header-line)
+        (function (lambda(e)
+                    (interactive "e")
+                    (tree-buffer-mouse-set-point e)
+                    (let ((click-col (tree-buffer-get-event-column e)))
+                      ;; go to the sticky node
+                      (tree-buffer-goto-sticky-node)
+                      ;; go to beginning of current line
+                      (forward-line 0)
+                      ;; move right
+                      (forward-char click-col))
+                    (tree-buffer-show-node-menu e)))))
+
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-press 'shift) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-press 'control) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-press 'meta) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-release nil) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-release 'shift) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-release 'control) nop)
+    (define-key tree-buffer-key-map
+      (tree-buffer-create-mouse-key 3 'button-release 'meta) nop)
+    (define-key tree-buffer-key-map [double-mouse-3] nop)
+    (define-key tree-buffer-key-map [triple-mouse-3] nop)
+
+    ;; modeline bindings....here we use hard coded button-press too - s.a.
+    
+    (if tree-buffer-running-xemacs
+        (progn
+          (set (make-local-variable 'modeline-map)
+               (make-sparse-keymap 'modeline-map))
+          ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should use
+          ;; here mouse-action-trigger-not instead of hard button-press?! But
+          ;; at least when mouse-action-trigger is button-release then it
+          ;; works now also for XEmacs... and it is consistent to Emacs and
+          ;; standard popup-menu trigger (which is button-press)... so we
+          ;; first change this when problems are reported.......
+          (define-key modeline-map
+            (tree-buffer-create-mouse-key 3 'button-press nil)
+            (function (lambda (e)
+                        (interactive "e")
+                        (tree-buffer-mouse-set-point e)
+                        (tree-buffer-show-modeline-menu e))))
+          (define-key modeline-map
+            (tree-buffer-create-mouse-key 1 'button-press nil)
+            'mouse-drag-modeline)
+          )
+      (define-key tree-buffer-key-map
+        (tree-buffer-create-mouse-key 3 'button-press nil 'mode-line)
+        (function (lambda (e)
+                    (interactive "e")
+                    (tree-buffer-mouse-set-point e)
+                    (tree-buffer-show-modeline-menu e)))))
+    
+    ;; scrolling horiz.
+    (when (and (not tree-buffer-running-xemacs) hor-scroll-step)
+      ;; This lets the GNU Emacs user scroll as if we had a horiz.
+      ;; scrollbar...
+      (define-key tree-buffer-key-map
+        (tree-buffer-create-mouse-key 1 'button-press nil 'mode-line)
+        'tree-buffer-mouse-hscroll))
+
+    (use-local-map tree-buffer-key-map)
+
+    (setq tree-buffers (cons (current-buffer) tree-buffers))
+
+    (prog1
+        (current-buffer)
+      (dolist (f a-c-h)
+        (funcall f)))))
+
+(defun tree-buffer-destroy (tree-buffer-name)
+  "Destroy the tree-buffer with name TREE-BUFFER-NAME. Does nothing if either
+tree-buffer-name is not alive or if it is not a tree-buffer created with
+`tree-buffer-create'."
+  (when (and tree-buffer-name (member (get-buffer tree-buffer-name) tree-buffers))
+    (setq tree-buffers (delq (get-buffer tree-buffer-name) tree-buffers))
+    (ignore-errors (kill-buffer tree-buffer-name))))
+
+
+;; editor goodies
+(defconst tree-buffer-font-lock-keywords
+  (eval-when-compile
+    (let* (
+           ;; Function declarations
+	   (vf '(
+                 "tree-buffer-defpopup-command"
+		 ))
+           (kf (if vf (regexp-opt vf t) ""))
+           ;; Regexp depths
+           (kf-depth (if kf (regexp-opt-depth kf) nil))
+           (full (concat
+                  ;; Declarative things
+                  "(\\(" kf "\\)"
+                  ;; Whitespaces & name
+                  "\\>[ \t]*\\(\\sw+\\)?"
+                  ))
+           )
+      `((,full
+         (1 font-lock-keyword-face)
+         (,(+ 1 kf-depth 1)
+          font-lock-function-name-face
+          nil t)))
+      ))
+  "Highlighted tree-buffer keywords.")
+
+(when (fboundp 'font-lock-add-keywords)
+  (font-lock-add-keywords 'emacs-lisp-mode
+                          tree-buffer-font-lock-keywords)
+  )
+
+
+(silentcomp-provide 'tree-buffer)
+
+;;; tree-buffer.el ends here
diff --git a/site/elib/.cvsignore b/site/elib/.cvsignore
new file mode 100644
index 0000000..cd9895a
--- /dev/null
+++ b/site/elib/.cvsignore
@@ -0,0 +1,13 @@
+elib.aux
+elib.cp
+elib.dvi
+elib.fn
+elib.info
+elib.info-1
+elib.info-2
+elib.ky
+elib.log
+elib.pg
+elib.toc
+elib.tp
+elib.vr
diff --git a/site/elib/COPYING b/site/elib/COPYING
new file mode 100644
index 0000000..916d1f0
--- /dev/null
+++ b/site/elib/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/site/elib/ChangeLog b/site/elib/ChangeLog
new file mode 100644
index 0000000..36eda7f
--- /dev/null
+++ b/site/elib/ChangeLog
@@ -0,0 +1,420 @@
+Mon Dec 11 00:21:02 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* Released version 1.0.
+
+	* gpl.texi: New file.
+	* Makefile (OTHERS): Added gpl.texi.
+	* elib.texi: Include gpl.texi; removed gpl version 1.
+	* Makefile (install-info): Install all info files, not only the
+	directory.
+
+	* elib.texi: Lots of index entries added.
+
+	* All .el-files: Added conventional headers for emacs libraries.
+
+Sun Dec 10 21:46:38 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* elib-test-all.el (elib-test-all): Set load-path to ".", not to
+	"./library", when doing the tests.
+	(test-stack-f): Likewise.
+	(test-stack-m): Likewise.
+	(test-queue-f): Likewise.
+	(test-queue-m): Likewise.
+	(test-string): Likewise.
+	(test-dll): Likewise.
+	(test-dll-debug): Likewise.
+	(test-cookie): Likewise.
+
+Mon Dec 11 00:14:54 1995  Inge Wallin  <inge@lysator.liu.se>
+
+	* RELEASING: Fix a spelling error.
+
+	* elib-test.el: Require backquote explicitely since we set the
+	load-path to (".") in all the tests.
+
+	* INSTALL: Change all mentioning of elib.texinfo to elib.texi.
+
+	* All .el-files, Makefile: Changed header to contain correct
+	address of the FSF and the correct copyright notice.
+
+Sun Dec 10 23:26:21 1995  Inge Wallin  <inge@lysator.liu.se>
+
+	* elib-test.el: Now contains all tests for the library.
+	* elib-test-all.el: Removed.
+	* Makefile(OTHERS): elib-test-all.el is removed.
+
+Sun Dec 10 21:46:38 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* Makefile: Rewritten according to GNU Coding standards.
+	(OTHERS): Don't forget to distribute .cvsignore, RELEASING, TODO,
+	elib-test.el and elib-test-all.el.
+
+	* dist-makefile: Removed.  We now distribute our internal
+	Makefile, so that the entire world can make new releases of this
+	package.
+
+	* elib.texi: New name for former elib.texinfo.
+
+	* avltree.el, bintree.el, cookie.el, dll-debug.el, dll.el,
+ 	elib-node.el, queue-f.el, queue-m.el, read.el, stack-f.el,
+ 	stack-m.el, string.el: Moved from the library subdirectory to the
+ 	top directory.
+
+Sun Dec 10 16:30:26 1995  Inge Wallin  <inge@lysator.liu.se>
+
+	* elib.texinfo: Removed the installation chapter.
+
+	* elib.texinfo: Some minor spelling corrections.
+
+	* INSTALL: Better description of how to do it.
+	* dist-makefile: Change standard installation path.
+
+Sun Dec 10 16:10:02 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* Makefile (dist): Was formerly known as distribution.
+
+	* RELEASING: Translated to English.
+
+	* library/cookie.el: Renamed the prefix "icookie-" to "elib-".
+	Since these are private entities, nobody should be affected by the
+	change.
+	* elib.texinfo (Cookie conventions): Changed the documentation
+	accordingly.
+
+Sun Dec 10 16:02:58 1995  Inge Wallin  <inge@lysator.liu.se>
+
+	* README: Modernized it.
+
+	* COPYING: Use GPL version 1 to version 2.
+
+Sun Feb 19 00:42:03 1995  Inge Wallin  <inge@lysator.liu.se>
+
+	* Id 20: Error in 'make clean': now remove all .elc files.
+	dist-makefile: Call library/Makefile
+	library/Makefile: New file.
+
+Tue Jun  1 01:47:02 1993  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* Released version 0.07.
+
+	* startup-template.el: Insert the Elib directory first on
+	load-path, so that our cookie.el is used even if Emacs 19 is
+	used.
+
+Sun May  2 13:52:45 1993  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* cookie.el (tin-goto): Set collection->last-tin.
+	* cookie.el (icookie-delete-tin-internal): Clear
+	collection->last-tin if we are deleting it.
+	* cookie.el (tin-delete): Rely on icookie-delete-tin-internal to
+	clear collection->last-tin, and don't do it here.
+
+	* elib-test-all.el: Wrote some tests for the cookie package. A lot
+	of more tests need to be written.
+
+Tue Apr 27 00:45:22 1993  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* cookie.el (collection-length, collection-refresh): Fixed fatal typos.
+
+Sun Jan 24 20:21:29 1993  Inge Wallin  (inge@ruben)
+
+	* Released version 0.06.
+
+	* elib.texinfo: Fixed a number of spelling and grammatical errors
+	  in the documentation of dlls.
+
+Sun Jan 24 15:13:24 1993  Per Cederqvist  (ceder@robin)
+
+	* elib.texinfo: Talk about debugging cookie applications.
+
+	* dll-debug.el: New file, moved here from the pcl-cvs project.
+	  Some comments updated.
+	* elib.texinfo: Documented dll-debug.  Revisited the documentation
+	  on dll.
+	* Makefile, dist-makefile, elib-compile-all.el: Updated to know
+	  about dll-debug.el.
+	* elib-test-all.el: Added test cases for dll and dll-debug.
+
+	* elib-test-all.el (elib-test-library): Load the library, don't
+	  only require it.
+	* elib-test-all.el (test-a-case): Print the test when something
+	  goes wrong.
+
+	* dll-debug.el (dll-previous, dll-last): Don't return the dummy node.
+	* dll-debug.el (dll-delete, dll-delete-fisrt, dll-delete-last):
+	  Fixed return value.
+
+Mon Jan 18 00:12:35 1993  Per Cederqvist  (ceder@mauritz)
+
+	* Release 0.05.1 (not released to the world).
+
+	* cookie.el: Require dll, not elib-dll.
+
+	* cookie.el (tin-goto-previous): Handle empty collections.
+
+	* cookie.el (icookie-abs): Fixed typo.
+
+	* string.el (string-split): Fixed typo.
+	* string.el (string-replace-match): Fix the doc string. Groups are
+	  contained inside \( \), not ( ).
+	* elib-test-all.el (string): Wrote some test cases.
+
+Sat Jan 16 16:26:53 1993  Inge Wallin  (inge@robin)
+
+	* Released version 0.05.
+
+	* elib.texinfo: Changed file name of info file to elib.info.
+
+Sat Jan 16 15:59:45 1993  Per Cederqvist  (ceder@konrad)
+
+	* cookie.el (tin-goto): New function.
+	* elib.texinfo: Document it.
+
+	* elib.texinfo: changed all references to parameters of functions
+	  to use @var{}.
+
+	* dist-makefile (ELFILES, ELCFILES): Added dll and cookie.
+
+Thu Jan 14 17:10:03 1993  Per Cederqvist  (ceder@konrad)
+
+	* elib.texinfo: Documented dll.el.
+
+	* Makefile (ELFILES): Added dll.el.
+
+Sun Jan  3 23:22:18 1993  Per Cederqvist  (ceder@konrad)
+
+	* dll.el: New file. This has been used extensively in pcl-cvs, so
+	  it might be relatively bugfree.
+	* dll.el: Provide dll, not elib-dll.
+
+Wed Dec 30 02:42:19 1992  Per Cederqvist  (ceder@konrad)
+
+	* elib.texinfo (Cookie package): Documented the cookie package.
+	  Phew.  All information from the doc-strings are included.  More
+	  examples and explanations are needed.
+
+Tue Dec 29 21:43:28 1992  Per Cederqvist  (ceder@konrad)
+
+	* cookie.el, elib.texinfo: Renamed all functions, since RMS
+	  doesn't like the prefix convention "cookie:function".  This is
+	  the list of function names before and after:
+
+cookie::abs                             -> icookie-abs
+cookie::collection->buffer              -> icookie-collection->buffer
+cookie::collection->dll                 -> icookie-collection->dll
+cookie::collection->footer              -> icookie-collection->footer
+cookie::collection->header              -> icookie-collection->header
+cookie::collection->last-tin            -> icookie-collection->last-tin
+cookie::collection->pretty-printer      -> icookie-collection->pretty-printer
+cookie::create-collection               -> icookie-create-collection
+cookie::create-wrapper                  -> icookie-create-wrapper
+cookie::create-wrapper-and-insert       -> icookie-create-wrapper-and-insert
+cookie::create-wrapper-and-pretty-print
+			-> icookie-create-wrapper-and-pretty-print
+cookie::delete-tin-internal             -> icookie-delete-tin-internal
+cookie::filter-hf                       -> icookie-filter-hf
+cookie::pos-before-middle-p             -> icookie-pos-before-middle-p
+cookie::refresh-tin                     -> icookie-refresh-tin
+cookie::set-buffer-bind-dll             -> icookie-set-buffer-bind-dll
+cookie::set-buffer-bind-dll-let*        -> icookie-set-buffer-bind-dll-let*
+cookie::set-collection->buffer          -> icookie-set-collection->buffer
+cookie::set-collection->dll             -> icookie-set-collection->dll
+cookie::set-collection->footer          -> icookie-set-collection->footer
+cookie::set-collection->header          -> icookie-set-collection->header
+cookie::set-collection->last-tin        -> icookie-set-collection->last-tin
+cookie::set-collection->pretty-printer
+			-> icookie-set-collection->pretty-printer
+cookie::wrapper->cookie                 -> icookie-wrapper->cookie
+cookie::wrapper->cookie-safe            -> icookie-wrapper->cookie-safe
+cookie::wrapper->start-marker           -> icookie-wrapper->start-marker
+cookie:all                              -> collection-list-cookies
+cookie:buffer                           -> collection-buffer
+cookie:clear                            -> collection-clear
+cookie:collect-cookies                  -> collection-collect-cookie
+cookie:collect-tins                     -> collection-collect-tin
+cookie:create                           -> collection-create
+cookie:delete-first                     -> cookie-delete-first
+cookie:delete-last                      -> cookie-delete-last
+cookie:delete-tin                       -> tin-delete
+cookie:empty                            -> collection-empty
+cookie:enter-after                      -> cookie-enter-after-tin
+cookie:enter-before                     -> cookie-enter-before-tin
+cookie:enter-cookies                    -> collection-append-cookies
+cookie:enter-first                      -> cookie-enter-first
+cookie:enter-last                       -> cookie-enter-last
+cookie:filter                           -> collection-filter-cookies
+cookie:first                            -> cookie-first
+cookie:goto-next-tin                    -> tin-goto-next
+cookie:goto-previous-tin                -> tin-goto-previous
+cookie:invalidate-tins                  -> tin-invalidate
+cookie:last                             -> cookie-last
+cookie:length                           -> collection-length
+cookie:map                              -> cookie-map
+cookie:map-reverse                      -> cookie-map-reverse
+cookie:next-tin                         -> tin-next
+cookie:nth-cookie                       -> cookie-nth
+cookie:nth-tin                          -> tin-nth
+cookie:previous-tin                     -> tin-previous
+cookie:refresh-all                      -> collection-refresh
+cookie:set-goal-column                  -> collection-set-goal-column
+cookie:sort                             -> cookie-sort
+cookie:tin->cookie                      -> tin-cookie
+cookie:tin-filter                       -> collection-filter-tins
+cookie:tin-get-selection                -> tin-locate
+
+	* Makefile (ELFILES): Added cookie.el.
+
+	* Makefile (tags): New target.
+
+Sat Aug 22 00:54:26 1992  Inge Wallin  (inge@ruben)
+
+	* string.el(string-replace-match): Fixed the doc string.
+
+	* BUGS and BUGMAILS: New files for tracking bugs with the emacs
+	  bugtrack package.
+
+Sat Aug 22 00:11:37 1992  Per Cederqvist  (ceder@maskros)
+
+	* string.el (string-replace-match, string-split): Save and restore
+	match-data.
+
+Fri Aug 21 12:50:55 1992  Per Cederqvist  (ceder@maskros)
+
+	* cookie.el: Beautified a lot of comments.
+
+	* cookie.el (cookie::abs): New function. This should exist
+	elsewhere in elib!
+
+	* cookie.el (cookie:filter, cookie:tin-filter): Allow some extra
+	args for predicate.
+
+	* cookie.el (cookie:tin-get-selection): Omit the FORCE-GUESS arg.
+	Rewrote the code that finds the best guess so that it always uses
+	collection->last-tin as a guess.
+
+	* cookie.el (tin-start-marker, tin-end-marker): Commented out.
+
+	* cookie.el (Local Variables): Added. Sets the lisp-indent-hook
+	for some functions.
+
+Thu Aug 20 05:53:59 1992  Per Cederqvist  (ceder@robin)
+
+	* cookie.el: The pretty-printer should now insert the string in
+	the buffer, not return the string.
+	* cookie.el (cookie::create-wrapper-and-pretty-print): New
+	function.
+	* cookie.el (cookie::refresh-tin, cookie::pos-before-middle-p,
+	cookie:enter-first, cookie:enter-last, cookie:enter-after,
+	cookie:enter-before, cookie:next-tin, cookie:refresh-all):
+	Updated.
+
+Wed Aug 19 03:50:11 1992  Per Cederqvist  (ceder@robert)
+
+	* Merged in some changes made by Inge Wallin:
+	* elib-compile-all.el (compile-elib): Bind load-path locally.
+
+Mon Jul 27 21:08:27 1992  Inge Wallin  (inge@lysator)
+
+	* Changed all copyright notices to read:
+	  Copyright 1991, 1992 Free Software Foundation
+
+Sun Mar 15 00:01:12 1992  Per Cederqvist  (ceder@robin)
+
+	* Added RCS Id keywords to most of the files.
+
+Thu Jul 25 18:32:21 1991  Inge Wallin  (inge at lysator)
+
+	* elib-avltree.el -> avltree.el
+
+	* elib.texinfo: Changed all function names (dropped elib- prefix).
+
+Wed Jul 24 01:10:09 1991  Inge Wallin  (inge at lysator)
+
+	* elib-bintree.el -> bintree.el
+	  elib-read.el	  -> read.el
+          elib-string.el  -> string.el
+	  elib-stack-f.el -> stack-f.el
+	  elib-stack-m.el -> stack-m.el
+          Also the functions intended for the user to call lost their
+	  elib- prefix. 
+
+	* Function silent-read -> read-silent for consistency.
+
+Sun Jun 16 02:30:08 1991  Inge Wallin  (inge at robert)
+
+	* Released version 0.03.
+
+	* elib.texinfo: Fixed the node index.
+
+	* New file: elib-compile-all. This file byte-compiles those files
+	  in elib which needs recompiling.
+
+	* New file: elib-avltree.el. Added AVL trees and documentation to
+	  the library.
+
+Tue Jun  4 21:13:33 1991  Inge Wallin  (inge at laila)
+
+	* Finished and tested all functions in elib-bintree.el.
+
+Thu May 30 23:57:12 1991  Inge Wallin  (inge at laila)
+
+	* Fixed a few errors in the documentation.
+
+Tue May 28 01:43:02 1991  Inge Wallin  (inge at lave)
+
+	* Documented the functions in elib-bintree in elib.texinfo. 
+
+Tue May 21 21:43:03 1991  Inge Wallin  (inge at lave)
+
+	* New file: elib-bintree.el containing functions for ordinary
+	  (not balanced) binary trees.
+
+	* Corrected a bug in elib-node.el
+
+Mon May 20 23:03:36 1991  Inge Wallin  (inge at laila)
+
+	* New file: elib-node.el. Contains a number of macros for creating
+	  and handling nodes for binary trees and doubly linked lists.
+
+Wed May 15 22:17:53 1991  Inge Wallin  (inge at lave)
+
+	* Made elib-stack-f.el delete elib-stack-m.el from the features
+	  variable and vice versa. Same for queue.
+
+	* Changed a few things in elib.texinfo.
+
+Sun May 12 19:31:54 1991  Inge Wallin  (inge at laila)
+
+	* Added a macro implementation of elib-queue. New file:
+	  elib-queue-m.el. The old file elib-queue.el changed name to
+	  elib-queue-f.el. Also changed Makefile.  Documented.
+
+	* Added a macro implementation of elib-stack. New file:
+	  elib-stack-m.el. The old file elib-stack.el changed name to
+	  elib-stack-f.el. Also changed dist-makefile.  Documented.
+
+	* Added the functions elib-stack-copy and elib-queue-copy to
+	  elib-stack.el and elib-queue.el, resp.
+
+Sat May 11 03:36:30 1991  Inge Wallin  (inge at laila)
+
+	* New file in the library: elib-read.el, containing a few functions
+	  for reading data from the minibuffer.  Documented them in
+	  elib.texinfo. 
+
+	* Fixed a number of bugs in the documentation reported by
+	  Sebastian Kremer.
+
+Fri May 10 03:28:04 1991  Inge Wallin  (inge at laila)
+
+	* Documented the new container type AVL tree.  Also added it to
+	  Makefile. 
+
+	* Done some small changes in elib.texinfo regarding classes in
+	  version 0.01.
+
+Thu May  9 23:07:02 1991  Inge Wallin  (inge at laila)
+
+	* version 0.01 released. Contents: 2 string functions, a stack and
+	  a queue.
+
diff --git a/site/elib/INSTALL b/site/elib/INSTALL
new file mode 100644
index 0000000..bb8e607
--- /dev/null
+++ b/site/elib/INSTALL
@@ -0,0 +1,73 @@
+$Id: INSTALL,v 0.8 1995/12/11 00:49:56 ceder Exp $
+
+This file describes the installation of Elib, the GNU emacs lisp
+library.  You should install not only the library but also the on-line
+documentation so that your users will know how to use it.  You can
+also create written documentation from the file elib.texi as well
+as an on-line info file.
+
+
+I. Installation
+
+ 1) Edit the Makefile to reflect the situation at your site. The only
+    things you will have to change at this stage is the definition of
+    locallisppath and infodir.  In the locallisppath directory, a
+    subdirectory with the name `elib' will be created.  All elisp
+    files of the library will be copied there when you do the actual
+    installation (see step 2. below).
+
+    We suggest you use the directory which is intended for this in the
+    emacs distribution (usually /usr/local/share/emacs/site-lisp or
+    something similar) for this. 
+
+ 2) Type `make install' in the source directory. This will
+    byte-compile all .el-files of the library and create the
+    subdirectory `elib' in the directory you specified in step 1.
+    It will also copy both the .el and the .elc files of the library
+    there.
+
+    If you only want to create the compiled elisp files, but don't
+    want to install them,  you can type `make' instead. 
+
+ 3) Edit the file `default.el' in your emacs lisp directory (usually
+    /usr/gnu/emacs/lisp or something similar) and enter the contents
+    of the file `elib-startup.el' into it.  This file was created from
+    the file `startup_template.el' by the make in step 2. 
+
+
+II. Installation of the on-line manual.
+
+ 1) Create the info file `elib.info' from elib.texi.  This is done if
+    you use `make' or `make install'.
+
+ 2) Move the info file `elib.info' to your standard info directory.
+    Usually this is /usr/local/share/info or something similar. See
+    step I.3 above.
+
+ 3) Edit the file `dir' in the info directory and enter one line
+    containing a pointer to the info file elib.  The line can, for
+    instance, look like this:
+
+    * Elib: (elib.info).	The Emacs Lisp Library.
+
+
+III. How to make written documentation from elib.texi
+
+You can also make a typeset manual from the file elib.texi.  Just
+follow these steps:
+
+ 1) If the file texinfo.tex is not properly installed in the path
+    given by the environment variable $TEXINPUTS, get it and put it in
+    the same directory as elib.texi.  This file contains macros
+    used by the TeX formatting program to produce typeset output from
+    a texinfo file. You can get this for instance from from
+    prep.ai.mit.edu in the US or from ftp.isy.liu.se in Europe.
+
+ 2) Run TeX by typing `tex elib.texi'.  You might need to do this
+    twice to get correct cross references.
+
+ 3) Convert the resulting device independent file `elib.dvi' to a form
+    which your printer can output and print it.  If you have
+    postscript printers there is a program, dvi2ps, which can do this.
+    There is also a program which comes with TeX, dvips, which you can
+    use.
diff --git a/site/elib/Makefile b/site/elib/Makefile
new file mode 100644
index 0000000..2f490d0
--- /dev/null
+++ b/site/elib/Makefile
@@ -0,0 +1,118 @@
+# $Id: Makefile,v 0.21 1995/12/11 00:50:43 ceder Exp $
+# Makefile for the GNU Emacs lisp library, Elib
+# Copyright (C) 1991-1995 Free Software Foundation
+#
+# This file is part of the GNU Emacs lisp library, Elib.
+#
+# GNU Elib is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Elib is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+# ================================================================
+# Change the following to reflect the situation at your site:
+
+prefix = /usr/local
+datadir = $(prefix)/share
+locallisppath = $(datadir)/emacs/site-lisp
+# This will fail if locallisppath is anything but a single directory.
+# That is all right, since that is the default behaviour of Emacs; those
+# that know how to change it, should know how to change this file.  And
+# if this is accepted into GNU Emacs, the files should end up inside
+# the normal lisp directory.
+ELIBDIR = $(locallisppath)/elib
+infodir = $(prefix)/info
+
+EMACS = emacs
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+SHELL = /bin/sh
+INSTALL_DATA = cp
+
+# ================================================================
+# You shouldn't change anything below this line.
+#
+
+VERSION = 1.0
+
+ELFILES = stack-f.el stack-m.el queue-f.el queue-m.el \
+elib-node.el bintree.el avltree.el string.el read.el cookie.el dll.el \
+dll-debug.el
+
+ELCFILES = stack-f.elc stack-m.elc queue-f.elc queue-m.elc\
+elib-node.elc bintree.elc avltree.elc string.elc read.elc cookie.elc dll.elc \
+dll-debug.elc
+
+all: elcfiles elib-startup.el info
+
+elib-startup.el: startup-template.el Makefile
+	sed s,ELIB_PATH,\"$(ELIBDIR)\", < startup-template.el > elib-startup.el
+
+install: all installdirs install-info
+	$(INSTALL_DATA) $(ELFILES) $(ELIBDIR)
+	$(INSTALL_DATA) $(ELCFILES) $(ELIBDIR)
+	@echo Please merge elib-startup.el into $(locallisppath)/default.el
+
+installdirs:
+	-mkdir $(ELIBDIR)
+
+install-info: elib.info
+	$(INSTALL_DATA) elib.info* $(infodir)
+	if $(SHELL) -c 'install-info --version' \
+		>/dev/null 2>&1; then \
+		install-info --infodir=$(infodir) elib.info; \
+	else true; fi
+
+clean:
+	$(RM) *~ elib-startup.el core $(ELCFILES)
+	$(RM) -r $(DISTDIR) $(DISTDIR).tar.gz $(DISTDIR).tar.gz.uu
+
+
+info: elib.info
+
+elib.info: elib.texi
+	$(MAKEINFO) elib.texi
+
+dvi: elib.dvi
+
+elib.dvi: elib.texi
+	$(TEXI2DVI) $(srcdir)/elib.texi
+
+.PHONY: elcfiles
+elcfiles:
+	$(EMACS) -batch -l elib-compile-all.el -f compile-elib
+
+TAGS tags:
+	etags $(ELFILES)
+
+# Below this point is rules for release management.
+
+OTHERS = README INSTALL COPYING ChangeLog elib.texi gpl.texi \
+	startup-template.el elib-compile-all.el Makefile \
+	.cvsignore RELEASING TODO NEWS elib-test.el
+
+
+DISTDIR = elib-$(VERSION)
+
+dist: disttree
+	rm -f $(DISTDIR).tar.gz $(DISTDIR).tar.gz.uu
+	tar cvf $(DISTDIR).tar $(DISTDIR)
+	gzip $(DISTDIR).tar
+
+disttree:
+	rm -rf $(DISTDIR) || exit 0
+	mkdir $(DISTDIR)
+	cp $(ELFILES) $(DISTDIR)
+	cp $(OTHERS) $(DISTDIR)
+
+# eof
diff --git a/site/elib/NEWS b/site/elib/NEWS
new file mode 100644
index 0000000..f8e334d
--- /dev/null
+++ b/site/elib/NEWS
@@ -0,0 +1,46 @@
+Elib NEWS -- history of changes.  10 Dec 1995
+Copyright (C) 1995 Free Software Foundation, Inc.
+See the end for copying conditions.
+
+* Changes in Elib 1.0.
+
+** This is a clean-up release.  No new features exists.
+
+** The Makefile and overall structure of the package has been changed
+to make it simpler and more in accordance with the GNU Coding
+Standards.  We now distribute all the files needed to make a new
+distribution.  Several files has moved or changed names; see the
+ChangeLog for details.
+
+** The library is now distributed under GPL 2, not GPL 1.
+
+** The documentation is improved.
+
+* Changes in Elib 0.07.
+
+** Some bugs in the cookie package were fixed.
+
+** Some test cases for the cooke package were added.
+
+* Changes in Elib 0.06
+
+** A number of bugs were fixed.
+
+** Debug code for the doubly linked list, dll.  Now you can use
+dll-debug while developing your code, and when finished switch to
+dll. 
+
+----------------------------------------------------------------------
+Copyright information:
+
+Copyright (C) 1995 Free Software Foundation, Inc.
+
+   Permission is granted to anyone to make or distribute verbatim copies
+   of this document as received, in any medium, provided that the
+   copyright notice and this permission notice are preserved,
+   thus giving the recipient permission to redistribute in turn.
+
+   Permission is granted to distribute modified versions
+   of this document, or of portions of it,
+   under the above conditions, provided also that they
+   carry prominent notices stating who last changed them.
diff --git a/site/elib/README b/site/elib/README
new file mode 100644
index 0000000..c5ea9d5
--- /dev/null
+++ b/site/elib/README
@@ -0,0 +1,46 @@
+		     This is the README file for
+
+				 ELIB
+				  -
+			The Emacs Lisp Library
+
+			   Version 1.0
+
+		  Inge Wallin <inge@lysator.liu.se>
+		Per Cederqvist <ceder@lysator.liu.se>
+
+================================================================
+
+This is the source directory for the GNU emacs lisp library Elib
+version 1.0.  Elib is designed to be for Elisp programs what libg++ is
+for C++ programs:  a collection of useful routines which don't have to
+be reinvented each time a new program is written.
+
+Elib contains code for:
+ - container data structures (queues, stacks, AVL trees, etc)
+ - string handling functions missing in standard emacs
+ - minibuffer handling functions missing in standard emacs
+ - routines for handling lists of so called cookies in a buffer. 
+
+Information about how to install the library and the documentation is
+in the file INSTALL.  Licensing terms are in the file COPYING.
+Further documentation is in the Texinfo file elib.texi. 
+
+Please send bug reports, suggestions and comments to
+elib-maintainers@lysator.liu.se.  
+
+Known bugs:
+  + The documentation could be better. It lacks an index, among 
+    other things.
+  + The stack-m and stack-f should probably both (provide 'stack).
+    stack-m.el should maybe be renamed stack.el, and stack-f.el
+    should maybe only be used while debugging.  We are still 
+    thinking about this. Suggestions are welcome.
+  + The cookie package has a number of inconsistencies regarding
+    handling of (point).
+
+Enjoy!
+
+	Linköping 10-dec-1995
+	Inge Wallin
+	Per Cederqvist
diff --git a/site/elib/RELEASING b/site/elib/RELEASING
new file mode 100644
index 0000000..b316a5d
--- /dev/null
+++ b/site/elib/RELEASING
@@ -0,0 +1,20 @@
+Step-by-step instructions for how to make a release of Elib.
+
+  + Update all Copyright lines in all files.
+  + Run all testcases.
+  + Makefile: VERSION: set it correctly.
+  + Makefile: Check ELFILES and ELCFILES.
+  + elib.texi: Search for --version-- and fix it.
+  + elib.texi: Search for --site-- and fix it.
+  + elib.texi: Search for --date-- and fix it.
+  + elib-compile-all.el: Check that elib-files contains all the elisp
+    files that should be compiled.
+  + README: Update it.
+  + INSTALL: Update it.
+  + ChangeLog: Write an entry.
+  + Check in everything into CVS (which is used to maintain Elib).
+  + Do "make dist"
+  + Test unpacking and installing Elib.
+  + Run "cvs tag elib_0_04" (with the appropriate version number).
+  + Install the tar file in ftp@lysator:pub/emacs/elib-0.04.tar.Z
+		        and ftp@isy:pub/gnu/elisp-programms/
diff --git a/site/elib/TODO b/site/elib/TODO
new file mode 100644
index 0000000..65a27d6
--- /dev/null
+++ b/site/elib/TODO
@@ -0,0 +1,19 @@
+This file lists a number of things that should be done to the library
+in the future.
+================================================================
+
+* Automated tests for the following files:
+   - elib-node.el
+   - avltree.el
+   - bintree.el
+   - string.el
+   - read.el
+   - dll.el
+   - cookie.el
+
+* Documentation of the automated test procedure
+
+* Priority queue
+
+* Debug variants of the container types which check everything on
+  run-time.  This would be very slow but could also be a great help.
diff --git a/site/elib/avltree.el b/site/elib/avltree.el
new file mode 100644
index 0000000..81220e6
--- /dev/null
+++ b/site/elib/avltree.el
@@ -0,0 +1,587 @@
+;;;; $Id: avltree.el,v 0.8 1995/12/11 00:10:54 ceder Exp $
+;;;; This file implements balanced binary trees, AVL-trees.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;;	Thomas Bellman <bellman@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 10 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Initial author:	 Thomas Bellman	       
+;;;;			 Lysator Computer Club 
+;;;;		 	 Linkoping University  
+;;;;		 	 Sweden		       
+;;;;
+;;;; Bugfixes and completion: Inge Wallin
+;;;;
+
+
+;;; Commentary:
+;;;
+;;; An AVL tree is a nearly-perfect balanced binary tree.  A tree
+;;; consists of two cons cells, the first one holding the tag
+;;; 'AVLTREE in the car cell, and the second one having the tree
+;;; in the car and the compare function in the cdr cell.  The tree has
+;;; a dummy node as its root with the real tree in the left pointer.
+;;; 
+;;; Each node of the tree consists of one data element, one left
+;;; sub-tree and one right sub-tree.  Each node also has a balance
+;;; count, which is the difference in depth of the left and right
+;;; sub-trees. 
+;;;
+
+;;; Code:
+
+(require 'elib-node)
+(require 'stack-m)
+
+(provide 'avltree)
+
+
+;;; ================================================================
+;;;        Functions and macros handling an AVL tree node.
+
+;;
+;; The rest of the functions needed here can be found in
+;; elib-node.el.
+;;
+
+
+(defmacro elib-avl-node-create (left right data balance)
+
+  ;; Create and return an avl-tree node.
+  (` (vector (, left) (, right) (, data) (, balance))))
+
+
+(defmacro elib-avl-node-balance (node)
+
+  ;; Return the balance field of a node.
+  (` (aref (, node) 3)))
+
+
+(defmacro elib-avl-node-set-balance (node newbal)
+
+  ;; Set the balance field of a node.
+  (` (aset (, node) 3 (, newbal))))
+
+
+
+;;; ================================================================
+;;;       Internal functions for use in the AVL tree package
+
+;;;
+;;; The functions and macros in this section all start with `elib-avl-'.
+;;;
+
+
+(defmacro elib-avl-root (tree)
+
+  ;; Return the root node for an avl-tree.  INTERNAL USE ONLY.
+  (` (elib-node-left (car (cdr (, tree))))))
+
+
+(defmacro elib-avl-dummyroot (tree)
+
+  ;; Return the dummy node of an avl-tree.  INTERNAL USE ONLY.
+
+  (` (car (cdr (, tree)))))
+
+
+(defmacro elib-avl-cmpfun (tree)
+
+  ;; Return the compare function of AVL tree TREE.  INTERNAL USE ONLY.
+  (` (cdr (cdr (, tree)))))
+
+
+;; ----------------------------------------------------------------
+;;                          Deleting data
+
+
+(defun elib-avl-del-balance1 (node branch)
+
+  ;; Rebalance a tree and return t if the height of the tree has shrunk.
+  (let* ((br (elib-node-branch node branch))
+	 p1
+	 b1
+	 p2
+	 b2 
+	 result)
+    (cond
+     ((< (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br 0)
+      t)
+
+     ((= (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br +1)
+      nil)
+
+     (t					; Rebalance
+      (setq p1 (elib-node-right br)
+	    b1 (elib-avl-node-balance p1))
+      (if (>= b1 0)
+	  ;; Single RR rotation
+	  (progn
+	    (elib-node-set-right br (elib-node-left p1))
+	    (elib-node-set-left p1 br)
+	    (if (= 0 b1)
+		(progn
+		  (elib-avl-node-set-balance br +1)
+		  (elib-avl-node-set-balance p1 -1)
+		  (setq result nil))
+	      (elib-avl-node-set-balance br 0)
+	      (elib-avl-node-set-balance p1 0)
+	      (setq result t))
+	    (elib-node-set-branch node branch p1)
+	    result)
+
+	;; Double RL rotation
+	(setq p2 (elib-node-left p1)
+	      b2 (elib-avl-node-balance p2))
+	(elib-node-set-left p1 (elib-node-right p2))
+	(elib-node-set-right p2 p1)
+	(elib-node-set-right br (elib-node-left p2))
+	(elib-node-set-left p2 br)
+	(if (> b2 0)
+	    (elib-avl-node-set-balance br -1)
+	  (elib-avl-node-set-balance br 0))
+	(if (< b2 0)
+	    (elib-avl-node-set-balance p1 +1)
+	  (elib-avl-node-set-balance p1 0))
+	(elib-node-set-branch node branch p2)
+	(elib-avl-node-set-balance p2 0)
+	t)
+      ))
+    ))
+
+
+(defun elib-avl-del-balance2 (node branch)
+
+  (let* ((br (elib-node-branch node branch))
+	 p1
+	 b1
+	 p2 
+	 b2 
+	 result)
+    (cond
+     ((> (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br 0)
+      t)
+
+     ((= (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br -1)
+      nil)
+
+     (t					; Rebalance
+      (setq p1 (elib-node-left br)
+	    b1 (elib-avl-node-balance p1))
+      (if (<= b1 0)
+	  ;; Single LL rotation
+	  (progn
+	    (elib-node-set-left br (elib-node-right p1))
+	    (elib-node-set-right p1 br)
+	    (if (= 0 b1)
+		(progn
+		  (elib-avl-node-set-balance br -1)
+		  (elib-avl-node-set-balance p1 +1)
+		  (setq result nil))
+	      (elib-avl-node-set-balance br 0)
+	      (elib-avl-node-set-balance p1 0)
+	      (setq result t))
+	    (elib-node-set-branch node branch p1)
+	    result)
+
+	;; Double LR rotation
+	(setq p2 (elib-node-right p1)
+	      b2 (elib-avl-node-balance p2))
+	(elib-node-set-right p1 (elib-node-left p2))
+	(elib-node-set-left p2 p1)
+	(elib-node-set-left br (elib-node-right p2))
+	(elib-node-set-right p2 br)
+	(if (< b2 0)
+	    (elib-avl-node-set-balance br +1)
+	  (elib-avl-node-set-balance br 0))
+	(if (> b2 0)
+	    (elib-avl-node-set-balance p1 -1)
+	  (elib-avl-node-set-balance p1 0))
+	(elib-node-set-branch node branch p2)
+	(elib-avl-node-set-balance p2 0)
+	t)
+      ))
+    ))
+
+
+(defun elib-avl-do-del-internal (node branch q)
+
+  (let* ((br (elib-node-branch node branch)))
+      (if (elib-node-right br)
+	  (if (elib-avl-do-del-internal br +1 q)
+	      (elib-avl-del-balance2 node branch))
+	(elib-node-set-data q (elib-node-data br))
+	(elib-node-set-branch node branch
+			      (elib-node-left br))
+	t)))
+
+
+
+(defun elib-avl-do-delete (cmpfun root branch data)
+
+  ;; Return t if the height of the tree has shrunk.
+  (let* ((br (elib-node-branch root branch)))
+    (cond
+     ((null br)
+      nil)
+
+     ((funcall cmpfun data (elib-node-data br))
+      (if (elib-avl-do-delete cmpfun br 0 data)
+	  (elib-avl-del-balance1 root branch)))
+
+     ((funcall cmpfun (elib-node-data br) data)
+      (if (elib-avl-do-delete cmpfun br 1 data)
+	  (elib-avl-del-balance2 root branch)))
+
+     (t
+      ;; Found it.  Let's delete it.
+      (cond
+       ((null (elib-node-right br))
+	(elib-node-set-branch root branch (elib-node-left br))
+	t)
+
+       ((null (elib-node-left br))
+	(elib-node-set-branch root branch (elib-node-right br))
+	t)
+
+       (t
+	(if (elib-avl-do-del-internal br 0 br)
+	    (elib-avl-del-balance1 root branch)))))
+     )))
+
+
+;; ----------------------------------------------------------------
+;;                           Entering data
+
+
+
+(defun elib-avl-enter-balance1 (node branch)
+
+  ;; Rebalance a tree and return t if the height of the tree has grown.
+  (let* ((br (elib-node-branch node branch))
+	 p1
+	 p2
+	 b2 
+	 result)
+    (cond
+     ((< (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br 0)
+      nil)
+
+     ((= (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br +1)
+      t)
+
+     (t
+      ;; Tree has grown => Rebalance
+      (setq p1 (elib-node-right br))
+      (if (> (elib-avl-node-balance p1) 0)
+	  ;; Single RR rotation
+	  (progn
+	    (elib-node-set-right br (elib-node-left p1))
+	    (elib-node-set-left p1 br)
+	    (elib-avl-node-set-balance br 0)
+	    (elib-node-set-branch node branch p1))
+
+	;; Double RL rotation
+	(setq p2 (elib-node-left p1)
+	      b2 (elib-avl-node-balance p2))
+	(elib-node-set-left p1 (elib-node-right p2))
+	(elib-node-set-right p2 p1)
+	(elib-node-set-right br (elib-node-left p2))
+	(elib-node-set-left p2 br)
+	(if (> b2 0)
+	    (elib-avl-node-set-balance br -1)
+	  (elib-avl-node-set-balance br 0))
+	(if (< b2 0)
+	    (elib-avl-node-set-balance p1 +1)
+	  (elib-avl-node-set-balance p1 0))
+	(elib-node-set-branch node branch p2))
+      (elib-avl-node-set-balance (elib-node-branch node branch) 0)
+      nil))
+    ))
+
+
+(defun elib-avl-enter-balance2 (node branch)
+
+  ;; Return t if the tree has grown.
+  (let* ((br (elib-node-branch node branch))
+	 p1
+	 p2 
+	 b2)
+    (cond
+     ((> (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br 0)
+      nil)
+
+     ((= (elib-avl-node-balance br) 0)
+      (elib-avl-node-set-balance br -1)
+      t)
+
+     (t	
+      ;; Balance was -1 => Rebalance
+      (setq p1 (elib-node-left br))
+      (if (< (elib-avl-node-balance p1) 0)
+	  ;; Single LL rotation
+	  (progn
+	    (elib-node-set-left br (elib-node-right p1))
+	    (elib-node-set-right p1 br)
+	    (elib-avl-node-set-balance br 0)
+	    (elib-node-set-branch node branch p1))
+
+	;; Double LR rotation
+	(setq p2 (elib-node-right p1)
+	      b2 (elib-avl-node-balance p2))
+	(elib-node-set-right p1 (elib-node-left p2))
+	(elib-node-set-left p2 p1)
+	(elib-node-set-left br (elib-node-right p2))
+	(elib-node-set-right p2 br)
+	(if (< b2 0)
+	    (elib-avl-node-set-balance br +1)
+	  (elib-avl-node-set-balance br 0))
+	(if (> b2 0)
+	    (elib-avl-node-set-balance p1 -1)
+	  (elib-avl-node-set-balance p1 0))
+	(elib-node-set-branch node branch p2))
+      (elib-avl-node-set-balance (elib-node-branch node branch) 0)
+      nil))
+    ))
+
+
+(defun elib-avl-do-enter (cmpfun root branch data)
+
+  ;; Return t if height of tree ROOT has grown.  INTERNAL USE ONLY.
+  (let ((br (elib-node-branch root branch)))
+    (cond
+     ((null br)
+      ;; Data not in tree, insert it
+      (elib-node-set-branch root branch
+			    (elib-avl-node-create nil nil data 0))
+      t)
+
+     ((funcall cmpfun data (elib-node-data br))
+      (and (elib-avl-do-enter cmpfun
+			      br
+			      0 data)
+	   (elib-avl-enter-balance2 root branch)))
+
+     ((funcall cmpfun (elib-node-data br) data)
+      (and (elib-avl-do-enter cmpfun
+			      br
+			      1 data)
+	   (elib-avl-enter-balance1 root branch)))
+
+     (t
+      (elib-node-set-data br data)
+      nil))))
+
+
+;; ----------------------------------------------------------------
+
+
+(defun elib-avl-mapc (map-function root)
+  ;; Apply MAP-FUNCTION to all nodes in the tree starting with ROOT.
+  ;; The function is applied in-order.
+  ;;
+  ;; Note: MAP-FUNCTION is applied to the node and not to the data itself.
+  ;; INTERNAL USE ONLY.
+
+  (let ((node root)
+	(stack (elib-stack-create))
+	(go-left t))
+    (elib-stack-push stack nil)
+    (while node
+      (if (and go-left
+	       (elib-node-left node))
+	  (progn				   ; Do the left subtree first.
+	    (elib-stack-push stack node)
+	    (setq node (elib-node-left node)))
+	(funcall map-function node)		   ; Apply the function...
+	(if (elib-node-right node)		   ; and do the right subtree.
+	    (setq node (elib-node-right node)
+		  go-left t)
+	  (setq node (elib-stack-pop stack)
+		go-left nil))))))
+
+
+(defun elib-avl-do-copy (root)
+  ;; Copy the tree with ROOT as root.
+  ;; Highly recursive. INTERNAL USE ONLY.
+  (if (null root) 
+      nil
+    (elib-avl-node-create (elib-avl-do-copy (elib-node-left root))
+			  (elib-avl-do-copy (elib-node-right root))
+			  (elib-node-data root)
+			  (elib-avl-node-balance root))))
+
+
+
+;;; ================================================================
+;;;       The public functions which operate on AVL trees.
+
+
+(defun avltree-create (compare-function)
+  "Create an empty avl tree.
+COMPARE-FUNCTION is a function which takes two arguments, A and B,
+and returns non-nil if A is less than B, and nil otherwise."
+  (cons 'AVLTREE
+	(cons (elib-avl-node-create nil nil nil 0)
+	      compare-function)))
+
+
+(defun avltree-p (obj)
+  "Return t if OBJ is an avl tree, nil otherwise."
+  (eq (car-safe obj) 'AVLTREE))
+
+
+(defun avltree-compare-function (tree)
+  "Return the comparision function for the avl tree TREE."
+  (elib-avl-cmpfun tree))
+
+
+(defun avltree-empty (tree)
+  "Return t if TREE is emtpy, otherwise return nil."
+  (null (elib-avl-root tree)))
+
+
+(defun avltree-enter (tree data)
+  "In the avl tree TREE insert DATA.
+Return DATA."
+
+  (elib-avl-do-enter (elib-avl-cmpfun tree)
+		     (elib-avl-dummyroot tree)
+		     0
+		     data)
+  data)
+
+
+(defun avltree-delete (tree data)
+  "From the avl tree TREE, delete DATA.
+Return the element in TREE which matched DATA, nil if no element matched."
+
+  (elib-avl-do-delete (elib-avl-cmpfun tree)
+		      (elib-avl-dummyroot tree)
+		      0
+		      data))
+
+
+(defun avltree-member (tree data)
+  "Return the element in the avl tree TREE which matches DATA.
+Matching uses the compare function previously specified in `avltree-create'
+when TREE was created.
+
+If there is no such element in the tree, the value is nil."
+
+  (let ((node (elib-avl-root tree))
+	(compare-function (elib-avl-cmpfun tree))
+	found)
+    (while (and node 
+		(not found))
+      (cond
+       ((funcall compare-function data (elib-node-data node))
+	(setq node (elib-node-left node)))
+       ((funcall compare-function (elib-node-data node) data)
+	(setq node (elib-node-right node)))
+       (t 
+	(setq found t))))
+
+    (if node
+	(elib-node-data node)
+      nil)))
+
+
+
+(defun avltree-map (__map-function__ tree)
+  "Apply MAP-FUNCTION to all elements in the avl tree TREE."
+  (elib-avl-mapc
+   (function (lambda (node)
+	       (elib-node-set-data node
+				   (funcall __map-function__
+					    (elib-node-data node)))))
+   (elib-avl-root tree)))
+
+
+
+(defun avltree-first (tree)
+  "Return the first element in TREE, or nil if TREE is empty."
+
+  (let ((node (elib-avl-root tree)))
+    (if node
+	(progn
+	  (while (elib-node-left node)
+	    (setq node (elib-node-left node)))
+	  (elib-node-data node))
+      nil)))
+
+
+(defun avltree-last (tree)
+  "Return the last element in TREE, or nil if TREE is empty."
+  (let ((node (elib-avl-root tree)))
+    (if node
+	(progn
+	  (while (elib-node-right node)
+	    (setq node (elib-node-right node)))
+	  (elib-node-data node))
+      nil)))
+
+
+(defun avltree-copy (tree)
+  "Return a copy of the avl tree TREE."
+  (let ((new-tree (avltree-create 
+		   (elib-avl-cmpfun tree))))
+    (elib-node-set-left (elib-avl-dummyroot new-tree)
+			(elib-avl-do-copy (elib-avl-root tree)))
+    new-tree))
+
+
+(defun avltree-flatten (tree)
+  "Return a sorted list containing all elements of TREE."
+  (nreverse
+   (let ((treelist nil))
+     (elib-avl-mapc (function (lambda (node)
+				(setq treelist (cons (elib-node-data node)
+						     treelist))))
+		    (elib-avl-root tree))
+     treelist)))
+
+
+(defun avltree-size (tree)
+  "Return the number of elements in TREE."
+  (let ((treesize 0))
+    (elib-avl-mapc (function (lambda (data)
+			       (setq treesize (1+ treesize))
+			       data))
+		   (elib-avl-root tree))
+    treesize))
+
+
+(defun avltree-clear (tree)
+  "Clear the avl tree TREE."
+  (elib-node-set-left (elib-avl-dummyroot tree) nil))
+
+;;; avltree.el ends here
diff --git a/site/elib/bintree.el b/site/elib/bintree.el
new file mode 100644
index 0000000..690e25b
--- /dev/null
+++ b/site/elib/bintree.el
@@ -0,0 +1,353 @@
+;;;; $Id: bintree.el,v 0.8 1995/12/11 00:10:59 ceder Exp $
+;;; This file implements binary trees.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 21 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Author:  Inge Wallin
+;;;;
+
+;;; Commentary:
+
+;;;
+;;; A binary tree consists of two cons cells, the first one holding
+;;; the tag 'BINTREE in the car cell and the second one having
+;;; the tree in the car and the compare function in the cdr cell. The
+;;; tree has a dummy node as its root with the real tree in the left
+;;; pointer.  The compare function must take two arguments of the type
+;;; which is to be stored in the tree and must return non-nil if
+;;; the first argument is "less than" the second argument and nil 
+;;; otherwise.
+;;;
+;;; For example, use
+;;;    (bintree-create '<)
+;;; if the tree is going to store integers.
+;;; 
+;;;
+;;; This package uses the macros in the file elib-node.el and
+;;; a stack from stack.el.
+;;;
+
+;;; Code:
+
+(require 'elib-node)
+(require 'stack-m)
+
+(provide 'bintree)
+
+
+;;; ================================================================
+;;;      Internal functions for use in the binary tree package
+
+
+(defmacro elib-bintree-root (tree)
+
+  ;; Return the root node for a binary tree.  INTERNAL USE ONLY.
+  (` (elib-node-left (car (cdr (, tree))))))
+
+
+(defmacro elib-bintree-dummyroot (tree)
+
+  ;; Return the dummy node of a binary tree.  INTERNAL USE ONLY.
+  (` (car (cdr (, tree)))))
+
+
+(defmacro elib-bintree-cmpfun (tree)
+
+  ;; Return the compare function of binary tree TREE.  INTERNAL USE ONLY."
+  (` (cdr (cdr (, tree)))))
+
+
+
+(defun elib-bintree-mapc (map-function root)
+
+  ;; Apply MAP-FUNCTION to all nodes in the tree starting with ROOT.
+  ;; The function is applied in-order.
+  ;;
+  ;; Note: MAP-FUNCTION is applied to the node and not to the data itself.
+  ;;
+  ;; INTERNAL USE ONLY."
+
+  (let ((node root)
+	(stack (elib-stack-create))
+	(go-left t))
+    (elib-stack-push stack nil)
+    (while node
+      (if (and go-left
+	       (elib-node-left node))
+	  (progn				   ; Do the left subtree first.
+	    (elib-stack-push stack node)
+	    (setq node (elib-node-left node)))
+	(funcall map-function node)		   ; Apply the function...
+	(if (elib-node-right node)		   ; and do the right subtree.
+	    (setq node (elib-node-right node)
+		  go-left t)
+	  (setq node (elib-stack-pop stack)
+		go-left nil))))))
+
+
+(defun elib-bintree-do-copy (root)
+
+  ;; Copy the tree with ROOT as root.  Highly recursive. INTERNAL USE ONLY.
+  (if (null root) 
+      nil
+    (elib-node-create (elib-bintree-do-copy (elib-node-left root))
+		      (elib-bintree-do-copy (elib-node-right root))
+		      (elib-node-data root))))
+
+
+;;; ================================================================
+;;;       The public functions which operate on binary trees.
+
+
+(defun bintree-create (compare-function)
+  "Create an empty binary tree using COMPARE-FUNCTION as the compare function.
+COMPARE-FUNCTION is a function which takes two arguments, A and B, and 
+returns non-nil if A is less than B, and nil otherwise."
+  
+  (cons 'BINTREE
+	(cons (elib-node-create nil nil nil)
+	      compare-function)))
+
+
+
+(defun bintree-p (obj)
+  "return t if OBJ is a binary tree, nil otherwise."
+  (eq (car-safe obj) 'BINTREE))
+
+
+
+(defun bintree-compare-function (tree)
+  "Return the comparision function for the binary tree TREE."
+  (elib-bintree-cmpfun tree))
+
+
+
+(defun bintree-empty (tree)
+  "Return t if the binary tree TREE is empty, otherwise return nil."
+  (null (elib-bintree-root tree)))
+
+
+
+(defun bintree-enter (tree data)
+  "In the binary tree TREE, insert DATA."
+
+  (let ((cmpfun (elib-bintree-cmpfun tree))
+	(node (elib-bintree-dummyroot tree))
+	(new-node (elib-node-create nil nil data)))
+    (if (null (elib-node-left node))
+	(elib-node-set-left node new-node)
+      (setq node (elib-node-left node))
+      (while node
+	(cond
+	 ((funcall cmpfun data (elib-node-data node))
+	  (if (elib-node-left node)
+	      (setq node (elib-node-left node))
+	    (elib-node-set-left node new-node)
+	    (setq node nil)))
+
+	 ((funcall cmpfun (elib-node-data node) data)
+	  (if (elib-node-right node)
+	      (setq node (elib-node-right node))
+	    (elib-node-set-right node new-node)
+	    (setq node nil)))
+
+	 (t
+	  (elib-node-set-data node data)
+	  (setq node nil)))))))
+
+
+
+(defun bintree-delete (tree data)
+  "From the binary tree TREE, delete DATA.
+Return the element in TREE which matched DATA, or nil if no element matched."
+
+  (let* ((cmpfun (elib-bintree-cmpfun tree))
+	 (upper-node (elib-bintree-dummyroot tree)) ; Start with the dummy node
+	 (branch 0)				   ; Left branch
+	 (branch-node (elib-node-left upper-node))
+	 node-data
+	 right-node)				   ; Only used while deleting,
+						   ; not while searching
+    (if (null branch-node)
+	nil
+      (while upper-node
+	(setq node-data (elib-node-data branch-node))
+	(cond 
+	 ((funcall cmpfun data node-data)	   ; data<node-data => go left
+	  (setq upper-node branch-node
+		branch-node (elib-node-left upper-node)
+		branch 0))
+	 
+	 ((funcall cmpfun node-data data)	   ; data>node-data => go right
+	  (setq upper-node branch-node
+		branch-node (elib-node-right upper-node)
+		branch 1))
+	 
+	 (t					   ; This is the node we want 
+						   ; to delete.
+	  (cond
+	   ((null (elib-node-left branch-node))	   ; Empty left node?
+	    (elib-node-set-branch upper-node branch
+				  (elib-node-right branch-node)))
+	   
+	   ((null (elib-node-right branch-node))   ; Empty right node?
+	    (elib-node-set-branch upper-node branch
+				  (elib-node-left branch-node)))
+	   
+	   (t					   ; Both branches occupied.
+
+	    ;; At this point `branch-node' points at the node we want
+	    ;; to delete.  Both the right and the left branches are
+	    ;; non-nil, so we will take the data of the rightmost node
+	    ;; of the left subtree and put into `branch-node'.
+	    (setq right-node branch-node
+		  branch 0)
+	    (while (elib-node-right (elib-node-branch right-node branch))
+	      (setq right-node (elib-node-branch right-node branch)
+		    branch 1))
+	    (elib-node-set-data branch-node 
+				(elib-node-data (elib-node-branch right-node
+								  branch)))
+	    (elib-node-set-branch right-node branch
+				  (elib-node-left
+				   (elib-node-branch right-node branch)))))
+	  (setq upper-node nil)))))))
+
+
+
+(defun bintree-member (tree data)
+  "Return the element in the binary tree TREE which matches DATA.
+Matching uses the compare function previously specified in `bintree-create'
+when TREE was created.
+
+If there is no such element in the tree, the value is nil."
+  
+  (let ((node (elib-bintree-root tree))
+	(compare-function (elib-bintree-cmpfun tree))
+	found)
+    (while (and node 
+		(not found))
+      (cond
+       ((funcall compare-function data (elib-node-data node))
+	(setq node (elib-node-left node)))
+       ((funcall compare-function (elib-node-data node) data)
+	(setq node (elib-node-right node)))
+       (t 
+	(setq found t))))
+
+    (if node
+	(elib-node-data node)
+      nil)))
+
+
+
+(defun bintree-map (__map-function__ tree)
+  "Apply MAP-FUNCTION to all elements in the binary tree TREE."
+
+  (elib-bintree-mapc
+   (function (lambda (node)
+	       (elib-node-set-data node
+				   (funcall __map-function__
+					    (elib-node-data node)))))
+   (elib-bintree-root tree)))
+
+
+
+(defun bintree-first (tree)
+  "Return the first element in the binary tree TREE, or nil if TREE is empty."
+
+  (let ((node (elib-bintree-root tree)))
+    (if node
+	(progn
+	  (while (elib-node-left node)
+	    (setq node (elib-node-left node)))
+	  (elib-node-data node))
+      nil)))
+
+
+
+(defun bintree-last (tree)
+  "Return the last element in the binary tree TREE, or nil if TREE is empty."
+
+  (let ((node (elib-bintree-root tree)))
+    (if node
+	(progn
+	  (while (elib-node-right node)
+	    (setq node (elib-node-right node)))
+	  (elib-node-data node))
+      nil)))
+
+
+
+(defun bintree-copy (tree)
+  "Return a copy of the binary tree TREE.
+
+Note: This function is recursive and might result in an 
+      `max eval depth exceeded' error."
+
+  (let ((new-tree (bintree-create 
+		   (elib-bintree-cmpfun tree))))
+    (elib-node-set-left (elib-bintree-dummyroot new-tree)
+			(elib-bintree-do-copy (elib-bintree-root tree)))
+    new-tree))
+
+  
+
+;;
+;; Not the fastest way to do this.
+;;
+(defun bintree-flatten (tree)
+  "Return a sorted list containing all elements of the binary tree TREE."
+
+  (nreverse 
+   (let ((treelist nil))
+     (elib-bintree-mapc (function (lambda (node)
+				    (setq treelist (cons (elib-node-data node)
+							 treelist))))
+			(elib-bintree-root tree))
+     treelist)))
+
+
+
+;;
+;; Not the fastest way to do this:
+;;
+(defun bintree-size (tree)
+  "Return the number of elements in the binary tree TREE."
+
+  (let ((treesize 0))
+    (elib-bintree-mapc (function (lambda (data)
+				   (setq treesize (1+ treesize))))
+		       (elib-bintree-root tree))
+    treesize))
+
+
+
+(defun bintree-clear (tree)
+  "Clear the binary tree TREE."
+
+  (elib-node-set-left (elib-bintree-dummyroot tree) nil))
+
+;;; bintree.el ends here
diff --git a/site/elib/cookie.el b/site/elib/cookie.el
new file mode 100644
index 0000000..b18f7af
--- /dev/null
+++ b/site/elib/cookie.el
@@ -0,0 +1,1137 @@
+;;; $Id: cookie.el,v 1.32 1995/12/11 00:11:04 ceder Exp $
+;;; cookie.el -- Utility to display cookies in buffers
+
+;; Copyright (C) 1991-1995   Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;;	Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 3 Aug 1992
+;; Keywords: extensions, lisp
+
+;;; This program is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 2 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;; Boston, MA 02111-1307, USA
+;;;
+
+
+;;; Commentary:
+
+;;;     Introduction
+;;;     ============
+;;;
+;;; Cookie is a package that implements a connection between an
+;;; dll (a doubly linked list) and the contents of a buffer.
+;;; Possible uses are dired (have all files in a list, and show them),
+;;; buffer-list, kom-prioritize (in the LysKOM elisp client) and
+;;; others.  pcl-cvs.el uses cookie.el.
+;;;
+;;; A `cookie' can be any lisp object.  When you use the cookie
+;;; package you specify a pretty-printer, a function that inserts
+;;; a printable representation of the cookie in the buffer.  (The
+;;; pretty-printer should use "insert" and not
+;;; "insert-before-markers").
+;;;
+;;; A `collection' consists of a doubly linked list of cookies, a
+;;; header, a footer and a pretty-printer.  It is displayed at a
+;;; certain point in a certain buffer.  (The buffer and point are
+;;; fixed when the collection is created).  The header and the footer
+;;; are constant strings.  They appear before and after the cookies.
+;;; (Currently, once set, they can not be changed).
+;;;
+;;; Cookie does not affect the mode of the buffer in any way. It
+;;; merely makes it easy to connect an underlying data representation
+;;; to the buffer contents.
+;;;
+;;; A `tin' is an object that contains one cookie.  There are
+;;; functions in this package that given a tin extracts the cookie, or
+;;; gives the next or previous tin.  (All tins are linked together in
+;;; a doubly linked list.  The 'previous' tin is the one that appears
+;;; before the other in the buffer.)  You should not do anything with
+;;; a tin except pass it to the functions in this package.
+;;;
+;;; A collection is a very dynamic thing.  You can easily add or
+;;; delete cookies.  You can sort all cookies in a collection (you
+;;; have to supply a function that compares two cookies).  You can
+;;; apply a function to all cookies in a collection, et c, et c.
+;;;
+;;; Remember that a cookie can be anything.  Your imagination is the
+;;; limit!  It is even possible to have another collection as a
+;;; cookie.  In that way some kind of tree hierarchy can be created.
+;;;
+;;; Full documentation will, God willing, soon be available in a
+;;; Texinfo manual.
+
+
+
+;;;     Coding conventions
+;;;     ==================
+;;;
+;;; All functions that are intended for external use begin with one of
+;;; the prefixes "cookie-", "collection-" or "tin-".  The prefix
+;;; "elib-" is used for internal functions and macros.  There are
+;;; currently no global or buffer-local variables used.
+;;;
+;;; Many function operate on `tins' instead of `cookies'.  To avoid
+;;; confusion most of the function names include the string "cookie"
+;;; or "tin" to show this.
+;;;
+;;; Most doc-strings contains an "Args:" line that lists the
+;;; arguments.
+;;;
+;;; The internal functions don't contain any doc-strings.  RMS thinks
+;;; this is a good way to save space.
+
+
+
+;;; INTERNAL DOCUMENTATION (Your understanding of this package might
+;;; increase if you read it, but you should not exploit the knowledge
+;;; you gain. The internal details might change without notice).
+;;;
+;;; A collection is implemented as an dll (a doubly linked list).
+;;; The first and last element on the list are always the header and
+;;; footer (as strings). Any remaining entries are `wrappers'.
+;;;
+;;; At the implementation level a `tin' is really an elib-node that
+;;; consists of
+;;;      left        Pointer to previous tin
+;;;      right       Pointer to next tin
+;;;      data        Holder of a `wrapper'.
+;;; These internals of an elib-node are in fact unknown to cookie.el.
+;;; It uses dll.el to handle everything that deals with the
+;;; doubly linked list.
+;;;
+;;; The wrapper data type contains
+;;;      start-marker    Position of the printed representation of the
+;;;                      cookie in the buffer. 
+;;;      cookie          The user-supplied cookie.
+;;;
+;;; The wrapper is not accessible to the user of this package.
+
+;;; Code:
+
+(require 'dll)
+(provide 'cookie)
+
+
+;;; ================================================================
+;;;      Internal   macros   for use in the cookie package
+
+
+(put 'elib-set-buffer-bind-dll 'lisp-indent-hook 1)
+
+(defmacro elib-set-buffer-bind-dll (collection &rest forms)
+
+  ;; Execute FORMS with collection->buffer selected as current buffer,
+  ;; and dll bound to collection->dll.
+  ;; Return value of last form in FORMS.  INTERNAL USE ONLY.
+
+  (let ((old-buffer (make-symbol "old-buffer"))
+	(hnd (make-symbol "collection")))
+    (` (let* (((, old-buffer) (current-buffer))
+	      ((, hnd) (, collection))
+	      (dll (elib-collection->dll (, hnd))))
+	 (set-buffer (elib-collection->buffer (, hnd)))
+	 (unwind-protect
+	     (progn (,@ forms))
+	   (set-buffer (, old-buffer)))))))
+
+
+(put 'elib-set-buffer-bind-dll-let* 'lisp-indent-hook 2)
+
+(defmacro elib-set-buffer-bind-dll-let* (collection varlist &rest forms)
+
+  ;; Execute FORMS with collection->buffer selected as current buffer,
+  ;; dll bound to collection->dll, and VARLIST bound as in a let*.
+  ;; dll will be bound when VARLIST is initialized, but the current
+  ;; buffer will *not* have been changed.
+  ;; Return value of last form in FORMS.  INTERNAL USE ONLY.
+
+  (let ((old-buffer (make-symbol "old-buffer"))
+	(hnd (make-symbol "collection")))
+    (` (let* (((, old-buffer) (current-buffer))
+	      ((, hnd) (, collection))
+	      (dll (elib-collection->dll (, hnd)))
+	      (,@ varlist))
+	 (set-buffer (elib-collection->buffer (, hnd)))
+	 (unwind-protect
+	     (progn (,@ forms))
+	   (set-buffer (, old-buffer)))))))
+
+
+(defmacro elib-filter-hf (collection tin)
+
+  ;; Evaluate TIN once and return it. BUT if it is
+  ;; the header or the footer in COLLECTION return nil instead.
+  ;; Args: COLLECTION TIN
+  ;; INTERNAL USE ONLY.
+
+  (let ((tempvar (make-symbol "tin"))
+	(tmpcoll (make-symbol "tmpcollection")))
+    (` (let (((, tempvar) (, tin))
+	     ((, tmpcoll) (, collection)))
+	 (if (or (eq (, tempvar) (elib-collection->header (, tmpcoll)))
+		 (eq (, tempvar) (elib-collection->footer (, tmpcoll))))
+	     nil
+	   (, tempvar))))))
+
+
+
+;;; ================================================================
+;;;      Internal   data types   for use in the cookie package
+
+;;; Yes, I know about cl.el, but I don't like it.   /ceder
+
+;;; The wrapper data type.
+
+(defun elib-create-wrapper (start-marker cookie)
+  ;; Create a wrapper.   INTERNAL USE ONLY.
+  (cons 'WRAPPER (vector start-marker cookie)))
+
+(defun elib-wrapper->start-marker (wrapper)
+  ;; Get start-marker from wrapper.    INTERNAL USE ONLY.
+  (elt (cdr wrapper) 0))
+
+(defun elib-wrapper->cookie-safe (wrapper)
+  ;; Get cookie from wrapper.   INTERNAL USE ONLY.
+  ;; Returns nil if given nil as input.
+  ;; Since (elt nil 1) returns nil in emacs version 18.57 and 18.58
+  ;; this can be defined in this way. The documentation in the info
+  ;; file says that elt should signal an error in that case. I think
+  ;; it is the documentation that is buggy. (The bug is reported).
+  (elt (cdr wrapper) 1))
+
+(defun elib-wrapper->cookie (wrapper)
+  ;; Get cookie from wrapper.   INTERNAL USE ONLY.
+  (elt (cdr wrapper) 1))
+
+
+
+;;; The collection data type
+
+(defun elib-create-collection (buffer pretty-printer 
+					 header-wrapper footer-wrapper
+					 dll)
+  ;; Create a collection. INTERNAL USE ONLY.
+  (cons 'COLLECTION
+	;; The last element is a pointer to the last tin
+	;; the cursor was at, or nil if that is unknown.  
+	(vector buffer
+		pretty-printer 
+		header-wrapper footer-wrapper
+		dll nil)))
+
+
+(defun elib-collection->buffer (collection)
+  ;; Get buffer from COLLECTION.
+  (elt (cdr collection) 0))
+
+(defun elib-collection->pretty-printer (collection)
+  ;; Get pretty-printer from COLLECTION.
+  (elt (cdr collection) 1))
+
+(defun elib-collection->header (collection)
+  ;; Get header from COLLECTION.
+  (elt (cdr collection) 2))
+
+(defun elib-collection->footer (collection)
+  ;; Get footer from COLLECTION.
+  (elt (cdr collection) 3))
+
+(defun elib-collection->dll (collection)
+  ;; Get dll from COLLECTION.
+  (elt (cdr collection) 4))
+
+(defun elib-collection->last-tin (collection)
+  ;; Get last-tin from COLLECTION.
+  (elt (cdr collection) 5))
+
+
+
+(defun elib-set-collection->buffer (collection buffer)
+  ;; Change the buffer. Args: COLLECTION BUFFER.
+  (aset (cdr collection) 0 buffer))
+
+(defun elib-set-collection->pretty-printer (collection pretty-printer)
+  ;; Change the pretty-printer. Args: COLLECTION PRETTY-PRINTER.
+  (aset (cdr collection) 1 pretty-printer))
+
+(defun elib-set-collection->header (collection header)
+  ;; Change the header. Args: COLLECTION HEADER.
+  (aset (cdr collection) 2 header))
+
+(defun elib-set-collection->footer (collection footer)
+  ;; Change the footer. Args: COLLECTION FOOTER.
+  (aset (cdr collection) 3 footer))
+
+(defun elib-set-collection->dll (collection dll)
+  ;; Change the dll. Args: COLLECTION DLL.
+  (aset (cdr collection) 4 dll))
+
+(defun elib-set-collection->last-tin (collection last-tin)
+  ;; Change the last-tin. Args: COLLECTION LAST-TIN.
+  (aset (cdr collection) 5 last-tin))
+
+
+;;; ================================================================
+;;;      Internal   functions   for use in the cookie package
+
+(defun elib-abs (x)
+  ;; Return the absolute value of x
+  (max x (- x)))
+
+(defun elib-create-wrapper-and-insert (cookie string pos)
+  ;; Insert STRING at POS in current buffer. Remember the start
+  ;; position. Create a wrapper containing that start position and the
+  ;; COOKIE.
+  ;;    INTERNAL USE ONLY.
+
+  (save-excursion
+    (goto-char pos)
+    ;; Remember the position as a number so that it doesn't move
+    ;; when we insert the string.
+    (let ((start (if (markerp pos)
+		     (marker-position pos)
+		   pos))
+	  (buffer-read-only nil))
+      ;; Use insert-before-markers so that the marker for the
+      ;; next cookie is updated.
+      (insert-before-markers string)
+
+      ;; Always insert a newline. You want invisible cookies? You
+      ;; lose. (At least in this version). FIXME-someday. (It is
+      ;; harder to fix than it might seem. All markers have to point
+      ;; to the right place all the time...)
+      (insert-before-markers ?\n)
+      (elib-create-wrapper (copy-marker start) cookie))))
+
+
+(defun elib-create-wrapper-and-pretty-print (cookie
+						pretty-printer pos)
+  ;; Call PRETTY-PRINTER with point set at POS in current buffer.
+  ;; Remember the start position. Create a wrapper containing that
+  ;; start position and the COOKIE.
+  ;;    INTERNAL USE ONLY.
+
+  (save-excursion
+    (goto-char pos)
+    ;; Remember the position as a number so that it doesn't move
+    ;; when we insert the string.
+    (let ((start (if (markerp pos)
+		     (marker-position pos)
+		   pos))
+	  (buffer-read-only nil))
+      ;; Insert the trailing newline using insert-before-markers
+      ;; so that the start position for the next cookie is updated.
+      (insert-before-markers ?\n)
+      ;; Move back, and call the pretty-printer.
+      (backward-char 1)
+      (funcall pretty-printer cookie)
+      (elib-create-wrapper (copy-marker start) cookie))))
+
+
+(defun elib-delete-tin-internal (collection tin)
+  ;; Delete a cookie string from COLLECTION.  INTERNAL USE ONLY.
+  ;; Can not be used on the footer. Returns the wrapper that is deleted.
+  ;; The start-marker in the wrapper is set to nil, so that it doesn't
+  ;; consume any more resources.
+  (let ((dll (elib-collection->dll collection))
+	(buffer-read-only nil))
+    ;; If we are about to delete the tin pointed at by last-tin,
+    ;; set last-tin to nil.
+    (if (eq (elib-collection->last-tin collection) tin)
+	(elib-set-collection->last-tin collection nil))
+
+    (delete-region (elib-wrapper->start-marker (dll-element dll tin))
+		   (elib-wrapper->start-marker
+		    (dll-element dll (dll-next dll tin))))
+    (set-marker (elib-wrapper->start-marker (dll-element dll tin)) nil)
+    ;; Delete the tin, and return the wrapper.
+    (dll-delete dll tin)))
+
+(defun elib-refresh-tin (collection tin)
+  ;; Redisplay the cookie represented by TIN. INTERNAL USE ONLY.
+  ;; Args: COLLECTION TIN
+  ;; Can not be used on the footer. dll *must* be bound to
+  ;; (elib-collection->dll collection).
+
+  (let ((buffer-read-only nil))
+    (save-excursion
+      ;; First, remove the string from the buffer:
+      (delete-region (elib-wrapper->start-marker (dll-element dll tin))
+		     (1- (marker-position
+			  (elib-wrapper->start-marker
+			   (dll-element dll (dll-next dll tin))))))
+
+      ;; Calculate and insert the string.
+
+      (goto-char (elib-wrapper->start-marker (dll-element dll tin)))
+      (funcall (elib-collection->pretty-printer collection)
+	       (elib-wrapper->cookie (dll-element dll tin))))))
+
+
+(defun elib-pos-before-middle-p (collection pos tin1 tin2)
+
+  ;; Return true if for the cookies in COLLECTION, POS is in the first
+  ;; half of the region defined by TIN1 and TIN2.
+
+  (let ((dll (elib-collection->dll collection)))
+    (< pos (/ (+ (elib-wrapper->start-marker (dll-element dll tin1))
+		 (elib-wrapper->start-marker (dll-element dll tin2)))
+	      2))))
+
+
+;;; ===========================================================================
+;;;                  Public members of the cookie package
+
+
+(defun collection-create (buffer pretty-printer 
+			     &optional header footer pos)
+  "Create an empty collection of cookies.
+Args: BUFFER PRETTY-PRINTER &optional HEADER FOOTER POS.
+
+The collection will be inserted in BUFFER. BUFFER may be a
+buffer or a buffer name. It is created if it does not exist.
+
+PRETTY-PRINTER should be a function that takes one argument, a
+cookie, and inserts a string representing it in the buffer (at
+point). The string PRETTY-PRINTER inserts may be empty or span
+several linse. A trailing newline will always be inserted
+automatically. The PRETTY-PRINTER should use insert, and not
+insert-before-markers.
+
+Optional third argument HEADER is a string that will always be
+present at the top of the collection. HEADER should end with a
+newline.  Optionaly fourth argument FOOTER is similar, and will
+always be inserted at the bottom of the collection.
+
+Optional fifth argument POS is a buffer position, specifying
+where the collection will be inserted. It defaults to the
+begining of the buffer."
+
+  (let ((new-collection
+	 (elib-create-collection (get-buffer-create buffer)
+				    pretty-printer nil nil (dll-create))))
+
+    (elib-set-buffer-bind-dll new-collection
+      ;; Set default values
+      (if (not header)
+	  (setq header ""))
+      (if (not footer)
+	  (setq footer ""))
+      (if (not pos)
+	  (setq pos (point-min))
+	(if (markerp pos)
+	    (set pos (marker-position pos)))) ;Force header to be above footer.
+
+      (let ((foot (elib-create-wrapper-and-insert footer footer pos))
+	    (head (elib-create-wrapper-and-insert header header pos)))
+
+	(dll-enter-first dll head)
+	(dll-enter-last  dll foot)
+	(elib-set-collection->header new-collection (dll-nth dll 0))
+	(elib-set-collection->footer new-collection (dll-nth dll -1))))
+
+    ;; Return the collection
+    new-collection))
+
+
+(defun tin-cookie (collection tin)
+  "Get the cookie from a TIN. Args: COLLECTION TIN."
+  (elib-wrapper->cookie (dll-element (cookie->dll collection) tin)))
+
+(defun cookie-enter-first (collection cookie)
+  "Enter a COOKIE first in the cookie collection COLLECTION.
+Args: COLLECTION COOKIE."
+
+  (elib-set-buffer-bind-dll collection
+
+    ;; It is always safe to insert an element after the first element,
+    ;; because the header is always present. (dll-nth dll 0) should
+    ;; therefore never return nil.
+
+    (dll-enter-after
+     dll
+     (dll-nth dll 0)
+     (elib-create-wrapper-and-pretty-print
+      cookie
+      (elib-collection->pretty-printer collection)
+      (elib-wrapper->start-marker
+       (dll-element dll (dll-nth dll 1)))))))
+
+
+(defun cookie-enter-last (collection cookie)
+  "Enter a COOKIE last in the cookie-collection COLLECTION.
+Args: COLLECTION COOKIE."
+
+  (elib-set-buffer-bind-dll collection
+
+    ;; Remember that the header and footer are always present. There
+    ;; is no need to check if (dll-nth dll -1) returns nil - it never
+    ;; does.
+
+    (dll-enter-before
+     dll
+     (dll-nth dll -1)
+     (elib-create-wrapper-and-pretty-print
+      cookie
+      (elib-collection->pretty-printer collection)
+      (elib-wrapper->start-marker (dll-last dll))))))
+
+
+(defun cookie-enter-after-tin (collection tin cookie)
+  "Enter a new COOKIE after TIN.
+Args: COLLECTION TIN COOKIE."
+  (elib-set-buffer-bind-dll collection
+    (dll-enter-after
+     dll tin
+     (elib-create-wrapper-and-pretty-print
+      cookie
+      (elib-collection->pretty-printer collection)
+      (elib-wrapper->start-marker (dll-element dll (dll-next dll tin)))))))
+
+
+(defun cookie-enter-before-tin (collection tin cookie)
+  "Enter a new COOKIE before TIN.
+Args: COLLECTION TIN COOKIE."
+  (elib-set-buffer-bind-dll collection
+    (dll-enter-before
+     dll tin
+     (elib-create-wrapper-and-pretty-print
+      cookie
+      (elib-collection->pretty-printer collection)
+      (elib-wrapper->start-marker (dll-element dll tin))))))
+
+
+(defun tin-next (collection tin)
+  "Get the next tin. Args: COLLECTION TIN.
+Returns nil if TIN is nil or the last cookie."
+  (if tin
+      (elib-filter-hf
+       collection (dll-next (elib-collection->dll collection) tin))
+    nil))
+
+(defun tin-previous (collection tin)
+  "Get the previous tin. Args: COLLECTION TIN.
+Returns nil if TIN is nil or the first cookie."
+  (if tin
+      (elib-filter-hf
+       collection
+       (dll-previous (elib-collection->dll collection) tin))
+    nil))
+
+
+(defun tin-nth (collection n)
+  "Return the Nth tin. Args: COLLECTION N.
+N counts from zero. Nil is returned if there is less than N cookies.
+If N is negative, return the -(N+1)th last element.
+Thus, (tin-nth dll 0) returns the first node,
+and (tin-nth dll -1) returns the last node.
+
+Use tin-cookie to extract the cookie from the tin (or use
+cookie-nth instead)."
+
+    ;; Skip the header (or footer, if n is negative).
+    (if (< n 0)
+	(setq n (1- n))
+      (setq n (1+ n)))
+
+    (elib-filter-hf collection
+		       (dll-nth (elib-collection->dll collection) n)))
+
+(defun cookie-nth (collection n)
+  "Return the Nth cookie. Args: COLLECTION N.
+N counts from zero. Nil is returned if there is less than N cookies.
+If N is negative, return the -(N+1)th last element.
+Thus, (cookie-nth dll 0) returns the first cookie,
+and (cookie-nth dll -1) returns the last cookie."
+
+    ;; Skip the header (or footer, if n is negative).
+    (if (< n 0)
+	(setq n (1- n))
+      (setq n (1+ n)))
+
+    (let* ((dll (elib-collection->dll collection))
+	   (tin (elib-filter-hf collection (dll-nth dll n))))
+      (if tin
+	  (elib-wrapper->cookie (dll-element dll tin))
+	nil)))
+
+(defun tin-delete (collection tin)
+  "Delete a tin from a collection. Args: COLLECTION TIN.
+The cookie in the tin is returned."
+
+  (elib-set-buffer-bind-dll collection
+    (elib-wrapper->cookie
+     (elib-delete-tin-internal collection tin))))
+
+
+(defun cookie-delete-first (collection)
+  "Delete first cookie and return it. Args: COLLECTION.
+Returns nil if there are no cookies left in the collection."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (dll-nth dll 1)))         ;Skip the header.
+
+    ;; We have to check that we do not try to delete the footer.
+    (if (eq tin (elib-collection->footer collection))
+	nil
+      (elib-wrapper->cookie (elib-delete-tin-internal collection tin)))))
+
+
+(defun cookie-delete-last (collection)
+  "Delete last cookie and return it. Args: COLLECTION.
+Returns nil if there is no cookie left in the collection."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (dll-nth dll -2)))		;Skip the footer.
+    ;; We have to check that we do not try to delete the header.
+    (if (eq tin (elib-collection->header collection))
+	nil
+      (elib-wrapper->cookie (elib-delete-tin-internal collection tin)))))
+
+(defun cookie-first (collection)
+  "Return the first cookie in COLLECTION. The cookie is not removed."
+
+  (let* ((dll (elib-collection->dll collection))
+	 (tin (elib-filter-hf collection (dll-nth dll -1))))
+    (if tin
+	(elib-wrapper->cookie (dll-element dll tin)))))
+
+
+
+(defun cookie-last (collection)
+  "Return the last cookie in COLLECTION. The cookie is not removed."
+
+  (let* ((dll (elib-collection->dll collection))
+	 (tin (elib-filter-hf collection (dll-nth dll -2))))
+      (if tin
+	  (elib-wrapper->cookie (dll-element dll tin)))))
+
+
+(defun collection-empty (collection)
+  "Return true if there are no cookies in COLLECTION."
+
+  (eq (dll-nth (elib-collection->dll collection) 1) 
+      (elib-collection->footer collection)))
+
+
+(defun collection-length (collection)
+  "Return the number of cookies in COLLECTION."
+
+  ;; Don't count the footer and header.
+  (- (dll-length (elib-collection->dll collection)) 2))
+
+
+(defun collection-list-cookies (collection)
+  "Return a list of all cookies in COLLECTION."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((result nil)
+       (header (elib-collection->header collection))
+       (tin (dll-nth dll -2)))
+    (while (not (eq tin header))
+      (setq result (cons (elib-wrapper->cookie (dll-element dll tin))
+			 result))
+      (setq tin (dll-previous dll tin)))
+    result))
+
+
+(defun collection-clear (collection)
+  "Remove all cookies in COLLECTION."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((header (elib-collection->header collection))
+       (footer (elib-collection->footer collection)))
+
+    ;; We have to bind buffer-read-only separately, so that the
+    ;; current buffer is correct.
+    (let ((buffer-read-only nil))
+      (delete-region (elib-wrapper->start-marker
+		      (dll-element dll (dll-nth dll 1)))
+		     (elib-wrapper->start-marker
+		      (dll-element dll footer))))
+    (setq dll (dll-create-from-list (list (dll-element dll header)
+					  (dll-element dll footer))))
+    (elib-set-collection->dll collection dll)
+
+    ;; Re-set the header and footer, since they are now new objects.
+    ;; elib-filter-hf uses eq to compare objects to them...
+    (elib-set-collection->header collection (dll-nth dll 0))
+    (elib-set-collection->footer collection (dll-nth dll -1))))
+
+
+(defun cookie-map (map-function collection &rest map-args)
+  "Apply MAP-FUNCTION to all cookies in COLLECTION.
+MAP-FUNCTION is applied to the first element first.
+If MAP-FUNCTION returns non-nil the cookie will be refreshed (its
+pretty-printer will be called once again).
+
+Note that the buffer for COLLECTION will be current buffer when MAP-FUNCTION 
+is called.  MAP-FUNCTION must restore the current buffer to BUFFER before 
+it returns, if it changes it.
+
+If more than two arguments are given to cookie-map, remaining
+arguments will be passed to MAP-FUNCTION."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((footer (elib-collection->footer collection))
+       (tin (dll-nth dll 1)))
+
+    (while (not (eq tin footer))
+
+      (if (apply map-function
+		 (elib-wrapper->cookie (dll-element dll tin))
+		 map-args)
+	  (elib-refresh-tin collection tin))
+
+      (setq tin (dll-next dll tin)))))
+
+
+
+(defun cookie-map-reverse (map-function collection &rest map-args)
+  "Apply MAP-FUNCTION to all cookies in COLLECTION.
+MAP-FUNCTION is applied to the last cookie first.
+If MAP-FUNCTION returns non-nil the cookie will be refreshed.
+
+Note that the buffer for COLLECTION will be current buffer when MAP-FUNCTION 
+is called.  MAP-FUNCTION must restore the current buffer to BUFFER before 
+it returns, if it changes the current buffer.
+
+If more than two arguments are given to cookie-map, remaining
+arguments will be passed to MAP-FUNCTION."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((header (elib-collection->header collection))
+       (tin (dll-nth dll -2)))
+
+    (while (not (eq tin header))
+
+      (if (apply map-function
+		 (elib-wrapper->cookie (dll-element dll tin))
+		 map-args)
+	  (elib-refresh-tin collection tin))
+
+      (setq tin (dll-previous dll tin)))))
+
+
+
+(defun collection-append-cookies (collection cookie-list)
+  "Insert all cookies in the list COOKIE-LIST last in COLLECTION.
+Args: COLLECTION COOKIE-LIST."
+
+  (while cookie-list
+    (cookie-enter-last collection (car cookie-list))
+    (setq cookie-list (cdr cookie-list))))
+
+
+(defun collection-filter-cookies (collection predicate &rest extra-args)
+  "Remove all cookies in COLLECTION for which PREDICATE returns nil.
+Args: COLLECTION PREDICATE &rest EXTRA-ARGS.
+Note that the buffer for COLLECTION will be current-buffer when PREDICATE 
+is called. PREDICATE must restore the current buffer before it returns
+if it changes it.
+
+The PREDICATE is called with the cookie as its first argument. If any
+EXTRA-ARGS are given to collection-filter-cookies they will be passed to the
+PREDICATE."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (dll-nth dll 1))
+       (footer (elib-collection->footer collection))
+       (next nil))
+    (while (not (eq tin footer))
+      (setq next (dll-next dll tin))
+      (if (apply predicate
+		 (elib-wrapper->cookie (dll-element dll tin))
+		 extra-args)
+	  nil
+	(elib-delete-tin-internal collection tin))
+      (setq tin next))))
+
+
+(defun collection-filter-tins (collection predicate &rest extra-args)
+  "Remove all cookies in COLLECTION for which PREDICATE returns nil.
+Note that the buffer for COLLECTION will be current-buffer when PREDICATE 
+is called. PREDICATE must restore the current buffer before it returns
+if it changes it.
+
+The PREDICATE is called with one argument, the tin. If any EXTRA-ARGS
+are given to collection-filter-cookies they will be passed to the PREDICATE."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (dll-nth dll 1))
+       (footer (elib-collection->footer collection))
+       (next nil))
+    (while (not (eq tin footer))
+      (setq next (dll-next dll tin))
+      (if (apply predicate tin extra-args)
+	  nil
+	(elib-delete-tin-internal collection tin))
+      (setq tin next))))
+
+
+(defun tin-locate (collection pos &optional guess)
+  "Return the tin that POS (a buffer position) is within.
+Args: COLLECTION POS &optional GUESS.
+POS may be a marker or an integer.
+GUESS should be a tin that it is likely that POS is near.
+
+If POS points before the first cookie, the first cookie is returned.
+If POS points after the last cookie, the last cookie is returned.
+If the COLLECTION is empty, nil is returned."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((footer (elib-collection->footer collection)))
+
+    (cond
+     ;; No cookies present?
+     ((eq (dll-nth dll 1) (dll-nth dll -1))
+      nil)
+
+     ;; Before first cookie?
+     ((< pos (elib-wrapper->start-marker
+	      (dll-element dll (dll-nth dll 1))))
+      (dll-nth dll 1))
+
+     ;; After last cookie?
+     ((>= pos (elib-wrapper->start-marker (dll-last dll)))
+      (dll-nth dll -2))
+
+     ;; We now now that pos is within a cookie.
+     (t
+      ;; Make an educated guess about which of the three known
+      ;; cookies (the first, the last, or GUESS) is nearest.
+      (let* ((best-guess (dll-nth dll 1))
+	     (distance (elib-abs (- pos (elib-wrapper->start-marker
+					 (dll-element dll best-guess))))))
+	(if guess
+	    (let* ((g guess)		;Check the guess, if given.
+		   (d (elib-abs
+		       (- pos (elib-wrapper->start-marker
+			       (dll-element dll g))))))
+	      (cond
+	       ((< d distance)
+		(setq distance d)
+		(setq best-guess g)))))
+
+	(let* ((g (dll-nth dll -1))	;Check the last cookie
+	       (d (elib-abs
+		   (- pos (elib-wrapper->start-marker
+			   (dll-element dll g))))))
+	  (cond
+	   ((< d distance)
+	    (setq distance d)
+	    (setq best-guess g))))
+
+	(if (elib-collection->last-tin collection) ;Check "previous".
+	    (let* ((g (elib-collection->last-tin collection)) 
+		   (d (elib-abs
+		       (- pos (elib-wrapper->start-marker
+			       (dll-element dll g))))))
+	      (cond
+	       ((< d distance)
+		(setq distance d)
+		(setq best-guess g)))))
+
+	;; best-guess is now a "best guess".
+     
+	;; Find the correct cookie. First determine in which direction
+	;; it lies, and then move in that direction until it is found.
+    
+	(cond
+	 ;; Is pos after the guess?
+	 ((>= pos
+	      (elib-wrapper->start-marker (dll-element dll best-guess)))
+
+	  ;; Loop until we are exactly one cookie too far down...
+	  (while (>= pos (elib-wrapper->start-marker
+			  (dll-element dll best-guess)))
+	    (setq best-guess (dll-next dll best-guess)))
+
+	  ;; ...and return the previous cookie.
+	  (dll-previous dll best-guess))
+
+	 ;; Pos is before best-guess
+	 (t
+
+	  (while (< pos (elib-wrapper->start-marker
+			 (dll-element dll best-guess)))
+	    (setq best-guess (dll-previous dll best-guess)))
+
+	  best-guess)))))))
+
+
+;;(defun tin-start-marker (collection tin)
+;;  "Return start-position of a cookie in COLLECTION.
+;;Args: COLLECTION TIN.
+;;The marker that is returned should not be modified in any way,
+;;and is only valid until the contents of the cookie buffer changes."
+;;
+;;  (elib-wrapper->start-marker 
+;;   (dll-element (elib-collection->dll collection) tin)))
+
+
+;;(defun tin-end-marker (collection tin)
+;;  "Return end-position of a cookie in COLLECTION.
+;;Args: COLLECTION TIN.
+;;The marker that is returned should not be modified in any way,
+;;and is only valid until the contents of the cookie buffer changes."
+;;
+;;  (let ((dll (elib-collection->dll collection)))
+;;    (elib-wrapper->start-marker
+;;     (dll-element dll (dll-next dll tin)))))
+
+
+
+(defun collection-refresh (collection)
+  "Refresh all cookies in COLLECTION.
+
+The pretty-printer that was specified when the COLLECTION was created
+will be called for all cookies in COLLECTION.
+
+Note that tin-invalidate is more efficient if only a small
+number of cookies needs to be refreshed."
+
+  (elib-set-buffer-bind-dll-let* collection
+
+      ((header (elib-collection->header collection))
+       (footer (elib-collection->footer collection)))
+
+    (let ((buffer-read-only nil))
+      (delete-region (elib-wrapper->start-marker
+		      (dll-element dll (dll-nth dll 1)))
+		     (elib-wrapper->start-marker
+		      (dll-element dll footer)))
+
+      (goto-char (elib-wrapper->start-marker
+		  (dll-element dll footer)))
+    
+      (let ((tin (dll-nth dll 1)))
+	(while (not (eq tin footer))
+
+	  (set-marker (elib-wrapper->start-marker (dll-element dll tin))
+		      (point))
+	  (funcall (elib-collection->pretty-printer collection)
+		   (elib-wrapper->cookie (dll-element dll tin)))
+	  (insert "\n")
+	  (setq tin (dll-next dll tin)))))
+    
+    (set-marker (elib-wrapper->start-marker (dll-element dll footer))
+		(point))))
+
+
+(defun tin-invalidate (collection &rest tins)
+  "Refresh some cookies. Args: COLLECTION &rest TINS.
+The pretty-printer that for COLLECTION will be called for all TINS."
+
+  (elib-set-buffer-bind-dll collection
+    
+    (while tins
+      (elib-refresh-tin collection (car tins))
+      (setq tins (cdr tins)))))
+
+
+(defun collection-set-goal-column (collection goal)
+  "Set goal-column for COLLECTION.
+Args: COLLECTION GOAL.
+goal-column is made buffer-local.
+
+There will eventually be a better way to specify the cursor position."
+  (elib-set-buffer-bind-dll collection 
+    (make-local-variable 'goal-column)
+    (setq goal-column goal)))
+
+
+(defun tin-goto-previous (collection pos arg)
+  "Move point to the ARGth previous cookie.
+Don't move if we are at the first cookie, or if COLLECTION is empty.
+Args: COLLECTION POS ARG.
+Returns the tin we move to."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (tin-locate
+	     collection pos (elib-collection->last-tin collection))))
+
+    (cond
+     (tin
+      (while (and tin (> arg 0))
+	(setq arg (1- arg))
+	(setq tin (dll-previous dll tin)))
+
+      ;; Never step above the first cookie.
+
+      (if (null (elib-filter-hf collection tin))
+	  (setq tin (dll-nth dll 1)))
+
+      (goto-char
+       (elib-wrapper->start-marker
+	(dll-element dll tin)))
+
+      (if goal-column
+	  (move-to-column goal-column))
+      (elib-set-collection->last-tin collection tin)
+      tin))))
+
+
+(defun tin-goto-next (collection pos arg)
+  "Move point to the ARGth next cookie.
+Don't move if we are at the last cookie.
+Args: COLLECTION POS ARG.
+Returns the tin."
+
+  ;;Need to do something clever with (current-buffer)...
+  ;;Previously, when the buffer was used instead of the collection, this line
+  ;;did the trick. No longer so... This is hard to do right! Remember that a
+  ;;cookie can contain a collection!
+  ;;(interactive (list (current-buffer) (point)
+  ;;		     (prefix-numeric-value current-prefix-arg)))
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((tin (tin-locate
+	     collection pos (elib-collection->last-tin collection))))
+
+    (while (and tin (> arg 0))
+      (setq arg (1- arg))
+      (setq tin (dll-next dll tin)))
+
+    ;; Never step below the first cookie.
+
+    (if (null (elib-filter-hf collection tin))
+	(setq tin (dll-nth dll -2)))
+
+    (goto-char
+     (elib-wrapper->start-marker
+      (dll-element dll tin)))
+
+    (if goal-column
+	(move-to-column goal-column))
+
+    (elib-set-collection->last-tin collection tin)
+    tin))
+
+
+(defun tin-goto (collection tin)
+  "Move point to TIN.  Args: COLLECTION TIN."
+  (elib-set-buffer-bind-dll collection
+    (goto-char
+     (elib-wrapper->start-marker
+      (dll-element dll tin)))
+
+    (if goal-column
+	(move-to-column goal-column))
+
+    (elib-set-collection->last-tin collection tin)))
+
+
+(defun collection-collect-tin (collection predicate &rest predicate-args)
+  "Select cookies from COLLECTION using PREDICATE.
+Return a list of all selected tins.
+
+PREDICATE is a function that takes a cookie as its first argument.
+
+The tins on the returned list will appear in the same order as in the
+buffer.  You should not rely on in which order PREDICATE is called.
+
+Note that the buffer the COLLECTION is displayed in is current-buffer
+when PREDICATE is called.  If PREDICATE must restore current-buffer if
+it changes it.
+
+If more than two arguments are given to collection-collect-tin the remaining
+arguments will be passed to PREDICATE."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((header (elib-collection->header collection))
+       (tin (dll-nth dll -2))
+       (result nil))
+
+    ;; Collect the tins, starting at the last one, so that they
+    ;; appear in the correct order in the result (which is cons'ed
+    ;; together).
+
+    (while (not (eq tin header))
+
+      (if (apply predicate
+		 (elib-wrapper->cookie (dll-element dll tin))
+		 predicate-args)
+	  (setq result (cons tin result)))
+
+      (setq tin (dll-previous dll tin)))
+    result))
+
+
+(defun collection-collect-cookie (collection predicate &rest predicate-args)
+  "Select cookies from COLLECTION using PREDICATE.
+Return a list of all selected cookies.
+
+PREDICATE is a function that takes a cookie as its first argument.
+
+The cookies on the returned list will appear in the same order as in
+the buffer.  You should not rely on in which order PREDICATE is
+called.
+
+Note that the buffer the COLLECTION is displayed in is current-buffer
+when PREDICATE is called.  If PREDICATE must restore current-buffer if
+it changes it.
+
+If more than two arguments are given to collection-collect-cookie the
+remaining arguments will be passed to PREDICATE."
+
+  (elib-set-buffer-bind-dll-let* collection
+      ((header (elib-collection->header collection))
+       (tin (dll-nth dll -2))
+       result)
+
+    (while (not (eq tin header))
+
+      (if (apply predicate
+		 (elib-wrapper->cookie (dll-element dll tin))
+		 predicate-args)
+	  (setq result (cons (elib-wrapper->cookie (dll-element dll tin))
+			     result)))
+
+      (setq tin (dll-previous dll tin)))
+    result))
+
+
+(defun cookie-sort (collection predicate)
+  "Sort the cookies in COLLECTION, stably, comparing elements using PREDICATE.
+PREDICATE is called with two cookies, and should return T
+if the first cookie is \"less\" than the second.
+
+All cookies will be refreshed when the sort is complete."
+
+  (elib-set-collection->last-tin collection nil)
+
+  (collection-append-cookies
+   collection
+   (prog1 (sort (collection-list-cookies collection) predicate)
+     (collection-clear collection))))
+
+
+(defun collection-buffer (collection)
+  "Return the buffer that is associated with COLLECTION.
+Returns nil if the buffer has been deleted."
+  (let ((buf (elib-collection->buffer collection)))
+    (if (buffer-name buf)
+	buf
+      nil)))
+
+
+;;; Local Variables:
+;;; eval: (put 'elib-set-buffer-bind-dll 'lisp-indent-hook 1)
+;;; eval: (put 'elib-set-buffer-bind-dll-let* 'lisp-indent-hook 2)
+;;; End:
+
+;;; cookie.el ends here
diff --git a/site/elib/dll-debug.el b/site/elib/dll-debug.el
new file mode 100644
index 0000000..fcf90a2
--- /dev/null
+++ b/site/elib/dll-debug.el
@@ -0,0 +1,315 @@
+;;; dll-debug -- A slow implementation of dll for debugging.
+;;; $Id: dll-debug.el,v 1.9 1995/12/11 00:11:09 ceder Exp $
+
+;; Copyright (C) 1991-1995  Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 24 Sep 1991
+;; Keywords: extensions, lisp
+
+;;; This program is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 2 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;; Boston, MA 02111-1307, USA
+
+;;; Commentary:
+
+;;; This is a plug-in replacement for dll.el.  It is dreadfully
+;;; slow, but it facilitates debugging.  Don't trust the comments in
+;;; this file too much.
+(provide 'dll)
+
+;;;
+;;; A doubly linked list consists of one cons cell which holds the tag
+;;; 'DL-LIST in the car cell and the list in the cdr 
+;;; cell. The doubly linked list is implemented as a normal list. You
+;;; should use dll.el and not this package in debugged code. This
+;;; package is not written for speed...
+;;;
+
+;;; Code:
+
+;;; ================================================================
+;;;      Internal functions for use in the doubly linked list package
+
+(defun dll-get-dummy-node (dll)
+
+  ;; Return the dummy node.   INTERNAL USE ONLY.
+  dll)
+
+(defun dll-list-nodes (dll)
+
+  ;; Return a list of all nodes in DLL.   INTERNAL USE ONLY.
+
+  (cdr dll))
+
+(defun dll-set-from-node-list (dll list)
+
+  ;; Set the contents of DLL to the nodes in LIST.
+  ;; INTERNAL USE ONLY.
+
+  (setcdr dll list))
+
+(defun dll-get-node-before (dll node)
+  ;; Return the node in DLL that points to NODE. Use
+  ;; (dll-get-node-before some-list nil) to get the last node.
+  ;; INTERNAL USE ONLY.
+  (while (and dll (not (eq (cdr dll) node)))
+    (setq dll (cdr dll)))
+  (if (not dll)
+      (error "Node not on list"))
+  dll)
+
+(defmacro dll-insert-after (node element)
+  (let ((node-v (make-symbol "node"))
+	(element-v (make-symbol "element")))
+    (` (let (((, node-v) (, node))
+	     ((, element-v) (, element)))
+	 (setcdr (, node-v) (cons (, element-v) (cdr (, node-v))))))))
+
+;;; ===================================================================
+;;;       The public functions which operate on doubly linked lists.
+
+(defmacro dll-element (dll node)
+
+  "Get the element of a NODE in a doubly linked list DLL.
+Args: DLL NODE."
+
+  (` (car (, node))))
+
+
+(defun dll-create ()
+  "Create an empty doubly linked list."
+  (cons 'DL-LIST nil))
+
+
+(defun dll-p (object)
+  "Return t if OBJECT is a doubly linked list, otherwise return nil."
+  (eq (car-safe object) 'DL-LIST))
+
+
+(defun dll-enter-first (dll element)
+  "Add an element first on a doubly linked list.
+Args: DLL ELEMENT."
+  (setcdr dll (cons element (cdr dll))))
+
+
+(defun dll-enter-last (dll element)
+  "Add an element last on a doubly linked list.
+Args: DLL ELEMENT."
+  (dll-insert-after (dll-get-node-before dll nil) element))
+
+
+(defun dll-enter-after (dll node element)
+  "In the doubly linked list DLL, insert a node containing ELEMENT after NODE.
+Args: DLL NODE ELEMENT."
+
+  (dll-get-node-before dll node)
+  (dll-insert-after node element))
+
+
+(defun dll-enter-before (dll node element)
+  "In the doubly linked list DLL, insert a node containing ELEMENT before NODE.
+Args: DLL NODE ELEMENT."
+
+  (dll-insert-after (dll-get-node-before dll node) element))
+
+
+
+(defun dll-next (dll node)
+  "Return the node after NODE, or nil if NODE is the last node.
+Args: DLL NODE."
+
+  (dll-get-node-before dll node)
+  (cdr node))
+
+
+(defun dll-previous (dll node)
+  "Return the node before NODE, or nil if NODE is the first node.
+Args: DLL NODE."
+
+  (let ((prev (dll-get-node-before dll node)))
+    (if (eq dll prev)
+	nil
+      prev)))
+
+
+(defun dll-delete (dll node)
+
+  "Delete NODE from the doubly linked list DLL.
+Args: DLL NODE. Return the element of node."
+
+  (setcdr (dll-get-node-before dll node) (cdr node))
+  (car node))
+
+
+(defun dll-delete-first (dll)
+
+  "Delete the first NODE from the doubly linked list DLL.
+Return the element. Args: DLL. Returns nil if the DLL was empty."
+
+  (prog1
+      (car (cdr dll))
+    (setcdr dll (cdr (cdr dll)))))
+
+
+(defun dll-delete-last (dll)
+
+  "Delete the last NODE from the doubly linked list DLL.
+Return the element. Args: DLL. Returns nil if the DLL was empty."
+
+  (let* ((last (dll-get-node-before dll nil))
+	 (semilast (dll-get-node-before dll last)))
+    (if (eq last dll)
+	nil
+      (setcdr semilast nil)
+      (car last))))
+
+
+(defun dll-first (dll)
+
+  "Return the first element on the doubly linked list DLL.
+Return nil if the list is empty. The element is not removed."
+
+  (car (cdr dll)))
+
+
+
+
+(defun dll-last (dll)
+
+  "Return the last element on the doubly linked list DLL.
+Return nil if the list is empty. The element is not removed."
+
+  (let ((last (dll-get-node-before dll nil)))
+    (if (eq last dll)
+	nil
+      (car last))))
+
+
+
+(defun dll-nth (dll n)
+
+  "Return the Nth node from the doubly linked list DLL.
+ Args: DLL N
+N counts from zero. If DLL is not that long, nil is returned.
+If N is negative, return the -(N+1)th last element.
+Thus, (dll-nth dll 0) returns the first node,
+and (dll-nth dll -1) returns the last node."
+
+  ;; Branch 0 ("follow left pointer") is used when n is negative.
+  ;; Branch 1 ("follow right pointer") is used otherwise.
+
+  (if (>= n 0)
+      (nthcdr n (cdr dll))
+    (unwind-protect
+	(progn (setcdr dll (nreverse (cdr dll)))
+	       (nthcdr (- n) dll))
+      (setcdr dll (nreverse (cdr dll))))))
+
+(defun dll-empty (dll)
+
+  "Return t if the doubly linked list DLL is empty, nil otherwise"
+
+  (not (cdr dll)))
+
+(defun dll-length (dll)
+
+  "Returns the number of elements in the doubly linked list DLL."
+
+  (length (cdr dll)))
+
+
+
+(defun dll-copy (dll &optional element-copy-fnc)
+
+  "Return a copy of the doubly linked list DLL.
+If optional second argument ELEMENT-COPY-FNC is non-nil it should be
+a function that takes one argument, an element, and returns a copy of it.
+If ELEMENT-COPY-FNC is not given the elements are not copied."
+
+  (if element-copy-fnc
+      (cons 'DL-LIST (mapcar element-copy-fnc (cdr dll)))
+    (copy-sequence dll)))
+
+
+(defun dll-all (dll)
+
+  "Return all elements on the double linked list DLL as an ordinary list."
+
+  (cdr dll))
+
+
+(defun dll-clear (dll)
+
+  "Clear the doubly linked list DLL, i.e. make it completely empty."
+
+  (setcdr dll nil))
+
+
+(defun dll-map (map-function dll)
+
+  "Apply MAP-FUNCTION to all elements in the doubly linked list DLL.
+The function is applied to the first element first."
+
+  (mapcar map-function (cdr dll)))
+
+
+(defun dll-map-reverse (map-function dll)
+
+  "Apply MAP-FUNCTION to all elements in the doubly linked list DLL.
+The function is applied to the last element first."
+
+  (unwind-protect
+      (setcdr dll (nreverse (cdr dll)))
+    (mapcar map-function (cdr dll))
+    (setcdr dll (nreverse (cdr dll)))))
+
+
+(defun dll-create-from-list (list)
+
+  "Given an elisp LIST create a doubly linked list with the same elements."
+
+  (cons 'DL-LIST list))
+
+
+
+(defun dll-sort (dll predicate)
+
+  "Sort the doubly linked list DLL, stably, comparing elements using PREDICATE.
+Returns the sorted list. DLL is modified by side effects.
+PREDICATE is called with two elements of DLL, and should return T
+if the first element is \"less\" than the second."
+
+  (setcdr dll (sort (cdr dll) predicate))
+  dll)
+
+
+(defun dll-filter (dll predicate)
+
+  "Remove all elements in the doubly linked list DLL for which PREDICATE
+return nil."
+
+  (let* ((prev dll)
+	 (node (cdr dll)))
+
+    (while node
+      (cond
+       ((funcall predicate (car node))
+	(setq prev node))
+       (t
+	(setcdr prev (cdr node))))
+      (setq node (cdr node)))))
+
+;; dll-debug.el ends here
diff --git a/site/elib/dll.el b/site/elib/dll.el
new file mode 100644
index 0000000..58729a2
--- /dev/null
+++ b/site/elib/dll.el
@@ -0,0 +1,399 @@
+;;; $Id: dll.el,v 1.8 1995/12/11 00:11:13 ceder Exp $
+;;; elib-dll.el -- Some primitives for Doubly linked lists.
+
+;; Copyright (C) 1991-1995  Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 24 Sep 1991
+;; Keywords: extensions, lisp
+
+;;; This program is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 2 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;; Boston, MA 02111-1307, USA
+;;;
+;;; Author: Per Cederqvist
+;;;         ceder@lysator.liu.se.
+
+(require 'elib-node)
+(provide 'dll)
+
+;;; Commentary:
+
+;;; A doubly linked list consists of one cons cell which holds the tag
+;;; 'DL-LIST in the car cell and a pointer to a dummy node in the cdr
+;;; cell. The doubly linked list is implemented as a circular list
+;;; with the dummy node first and last. The dummy node is recognized
+;;; by comparing it to the node which the cdr of the cons cell points
+;;; to.
+;;;
+
+;;; Code:
+
+;;; ================================================================
+;;;      Internal functions for use in the doubly linked list package
+
+(defun dll-get-dummy-node (dll)
+
+  ;; Return the dummy node.   INTERNAL USE ONLY.
+  (cdr dll))
+
+(defun dll-list-nodes (dll)
+
+  ;; Return a list of all nodes in DLL.   INTERNAL USE ONLY.
+
+  (let* ((result nil)
+	 (dummy  (dll-get-dummy-node dll))
+	 (node   (elib-node-left dummy)))
+
+    (while (not (eq node dummy))
+      (setq result (cons node result))
+      (setq node (elib-node-left node)))
+
+    result))
+
+(defun dll-set-from-node-list (dll list)
+
+  ;; Set the contents of DLL to the nodes in LIST.
+  ;; INTERNAL USE ONLY.
+
+  (dll-clear dll)
+  (let* ((dummy (dll-get-dummy-node dll))
+	 (left  dummy))
+    (while list
+      (elib-node-set-left (car list) left)
+      (elib-node-set-right left (car list))
+      (setq left (car list))
+      (setq list (cdr list)))
+
+    (elib-node-set-right left dummy)
+    (elib-node-set-left dummy left)))
+
+
+;;; ===================================================================
+;;;       The public functions which operate on doubly linked lists.
+
+(defmacro dll-element (dll node)
+
+  "Get the element of a NODE in a doubly linked list DLL.
+Args: DLL NODE."
+
+  (` (elib-node-data (, node))))
+
+
+(defun dll-create ()
+  "Create an empty doubly linked list."
+  (let ((dummy-node (elib-node-create nil nil nil)))
+    (elib-node-set-right dummy-node dummy-node)
+    (elib-node-set-left dummy-node dummy-node)
+    (cons 'DL-LIST dummy-node)))
+
+(defun dll-p (object)
+  "Return t if OBJECT is a doubly linked list, otherwise return nil."
+  (eq (car-safe object) 'DL-LIST))
+
+(defun dll-enter-first (dll element)
+  "Add an element first on a doubly linked list.
+Args: DLL ELEMENT."
+  (dll-enter-after
+   dll
+   (dll-get-dummy-node dll)
+   element))
+
+
+(defun dll-enter-last (dll element)
+  "Add an element last on a doubly linked list.
+Args: DLL ELEMENT."
+  (dll-enter-before
+   dll
+   (dll-get-dummy-node dll)
+   element))
+
+
+(defun dll-enter-after (dll node element)
+  "In the doubly linked list DLL, insert a node containing ELEMENT after NODE.
+Args: DLL NODE ELEMENT."
+
+  (let ((new-node (elib-node-create
+		   node (elib-node-right node)
+		   element)))
+    (elib-node-set-left (elib-node-right node) new-node)
+    (elib-node-set-right node new-node)))
+
+
+(defun dll-enter-before (dll node element)
+  "In the doubly linked list DLL, insert a node containing ELEMENT before NODE.
+Args: DLL NODE ELEMENT."
+  
+  (let ((new-node (elib-node-create
+		   (elib-node-left node) node
+		   element)))
+    (elib-node-set-right (elib-node-left node) new-node)
+    (elib-node-set-left node new-node)))
+
+
+
+(defun dll-next (dll node)
+  "Return the node after NODE, or nil if NODE is the last node.
+Args: DLL NODE."
+
+  (if (eq (elib-node-right node) (dll-get-dummy-node dll))
+      nil
+    (elib-node-right node)))
+
+
+(defun dll-previous (dll node)
+  "Return the node before NODE, or nil if NODE is the first node.
+Args: DLL NODE."
+
+  (if (eq (elib-node-left node) (dll-get-dummy-node dll))
+      nil
+    (elib-node-left node)))
+
+
+(defun dll-delete (dll node)
+
+  "Delete NODE from the doubly linked list DLL.
+Args: DLL NODE. Return the element of node."
+
+  ;; This is a no-op when applied to the dummy node. This will return
+  ;; nil if applied to the dummy node since it always contains nil.
+
+  (elib-node-set-right (elib-node-left node) (elib-node-right node))
+  (elib-node-set-left (elib-node-right node) (elib-node-left node))
+  (dll-element dll node))
+
+
+
+(defun dll-delete-first (dll)
+
+  "Delete the first NODE from the doubly linked list DLL.
+Return the element. Args: DLL. Returns nil if the DLL was empty."
+
+  ;; Relies on the fact that dll-delete does nothing and
+  ;; returns nil if given the dummy node.
+
+  (dll-delete dll (elib-node-right (dll-get-dummy-node dll))))
+
+
+(defun dll-delete-last (dll)
+
+  "Delete the last NODE from the doubly linked list DLL.
+Return the element. Args: DLL. Returns nil if the DLL was empty."
+
+  ;; Relies on the fact that dll-delete does nothing and
+  ;; returns nil if given the dummy node.
+
+  (dll-delete dll (elib-node-left (dll-get-dummy-node dll))))
+
+
+(defun dll-first (dll)
+
+  "Return the first element on the doubly linked list DLL.
+Return nil if the list is empty. The element is not removed."
+
+  (if (eq (elib-node-right (dll-get-dummy-node dll))
+	  (dll-get-dummy-node dll))
+      nil
+    (elib-node-data (elib-node-right (dll-get-dummy-node dll)))))
+
+
+
+
+(defun dll-last (dll)
+
+  "Return the last element on the doubly linked list DLL.
+Return nil if the list is empty. The element is not removed."
+
+  (if (eq (elib-node-left (dll-get-dummy-node dll))
+	  (dll-get-dummy-node dll))
+      nil
+    (elib-node-data (elib-node-left (dll-get-dummy-node dll)))))
+
+
+
+(defun dll-nth (dll n)
+
+  "Return the Nth node from the doubly linked list DLL.
+ Args: DLL N
+N counts from zero. If DLL is not that long, nil is returned.
+If N is negative, return the -(N+1)th last element.
+Thus, (dll-nth dll 0) returns the first node,
+and (dll-nth dll -1) returns the last node."
+
+  ;; Branch 0 ("follow left pointer") is used when n is negative.
+  ;; Branch 1 ("follow right pointer") is used otherwise.
+
+  (let* ((dummy  (dll-get-dummy-node dll))
+	 (branch (if (< n 0) 0 1))
+	 (node   (elib-node-branch dummy branch)))
+	 
+    (if (< n 0)
+	(setq n (- -1 n)))
+
+    (while (and (not (eq dummy node))
+		(> n 0))
+      (setq node (elib-node-branch node branch))
+      (setq n (1- n)))
+
+    (if (eq dummy node)
+	nil
+      node)))
+
+
+(defun dll-empty (dll)
+
+  "Return t if the doubly linked list DLL is empty, nil otherwise"
+
+  (eq (elib-node-left (dll-get-dummy-node dll))
+      (dll-get-dummy-node dll)))
+
+(defun dll-length (dll)
+
+  "Returns the number of elements in the doubly linked list DLL."
+
+  (let*  ((dummy (dll-get-dummy-node dll))
+	  (node  (elib-node-right dummy))
+	  (n     0))
+
+    (while (not (eq node dummy))
+      (setq node (elib-node-right node))
+      (setq n (1+ n)))
+
+    n))
+
+
+
+(defun dll-copy (dll &optional element-copy-fnc)
+
+  "Return a copy of the doubly linked list DLL.
+If optional second argument ELEMENT-COPY-FNC is non-nil it should be
+a function that takes one argument, an element, and returns a copy of it.
+If ELEMENT-COPY-FNC is not given the elements are not copied."
+
+  (let ((result (dll-create))
+	(node (dll-nth dll 0)))
+    (if element-copy-fnc
+
+	;; Copy the elements with the user-supplied function.
+	(while node
+	  (dll-enter-last result
+			  (funcall element-copy-fnc
+				   (dll-element dll node)))
+	  (setq node (dll-next dll node)))
+
+      ;; Don't try to copy the elements - they might be
+      ;; circular lists, or anything at all...
+      (while node
+	(dll-enter-last result (dll-element dll node))
+	(setq node (dll-next dll node))))
+    
+    result))
+
+
+
+(defun dll-all (dll)
+
+  "Return all elements on the double linked list DLL as an ordinary list."
+
+  (let* ((result nil)
+	 (dummy  (dll-get-dummy-node dll))
+	 (node   (elib-node-left dummy)))
+
+    (while (not (eq node dummy))
+      (setq result (cons (dll-element dll node) result))
+      (setq node (elib-node-left node)))
+
+    result))
+
+
+(defun dll-clear (dll)
+
+  "Clear the doubly linked list DLL, i.e. make it completely empty."
+
+  (elib-node-set-left (dll-get-dummy-node dll) (dll-get-dummy-node dll))
+  (elib-node-set-right (dll-get-dummy-node dll) (dll-get-dummy-node dll)))
+
+
+(defun dll-map (map-function dll)
+
+  "Apply MAP-FUNCTION to all elements in the doubly linked list DLL.
+The function is applied to the first element first."
+
+  (let*  ((dummy (dll-get-dummy-node dll))
+	  (node  (elib-node-right dummy)))
+
+    (while (not (eq node dummy))
+      (funcall map-function (dll-element dll node))
+      (setq node (elib-node-right node)))))
+
+
+(defun dll-map-reverse (map-function dll)
+
+  "Apply MAP-FUNCTION to all elements in the doubly linked list DLL.
+The function is applied to the last element first."
+
+  (let*  ((dummy (dll-get-dummy-node dll))
+	  (node  (elib-node-left dummy)))
+
+    (while (not (eq node dummy))
+      (funcall map-function (dll-element dll node))
+      (setq node (elib-node-left node)))))
+
+
+(defun dll-create-from-list (list)
+
+  "Given an elisp LIST create a doubly linked list with the same elements."
+
+  (let ((dll (dll-create)))
+    (while list
+      (dll-enter-last dll (car list))
+      (setq list (cdr list)))
+    dll))
+
+
+
+(defun dll-sort (dll predicate)
+
+  "Sort the doubly linked list DLL, stably, comparing elements using PREDICATE.
+Returns the sorted list. DLL is modified by side effects.
+PREDICATE is called with two elements of DLL, and should return T
+if the first element is \"less\" than the second."
+
+  (dll-set-from-node-list
+   dll (sort (dll-list-nodes dll)
+	     (function (lambda (x1 x2)
+			 (funcall predicate
+				  (dll-element dll x1)
+				  (dll-element dll x2))))))
+  dll)
+
+
+(defun dll-filter (dll predicate)
+
+  "Remove all elements in the doubly linked list DLL for which PREDICATE
+returns nil."
+
+  (let* ((dummy (dll-get-dummy-node dll))
+	 (node  (elib-node-right dummy))
+	 next)
+
+    (while (not (eq node dummy))
+      (setq next (elib-node-right node))
+      (if (funcall predicate (dll-element dll node))
+	  nil
+	(dll-delete dll node))
+      (setq node next))))
+
+;; dll.el ends here
diff --git a/site/elib/elib-compile-all.el b/site/elib/elib-compile-all.el
new file mode 100644
index 0000000..fa37d55
--- /dev/null
+++ b/site/elib/elib-compile-all.el
@@ -0,0 +1,70 @@
+;;;; $Id: elib-compile-all.el,v 0.10 1995/12/11 00:11:17 ceder Exp $
+;;;; This file byte-compiles all .el files in elib.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;;	Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 14 Mar 1992
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+
+;;; Code:
+
+(setq elib-files '("stack-f"
+		   "stack-m"
+		   "queue-f"
+		   "queue-m"
+		   "elib-node"
+		   "dll"
+		   "dll-debug"
+		   "bintree"
+		   "avltree"
+		   "cookie"
+		   "string"
+		   "read"))
+
+
+(defun compile-file-if-necessary (file)
+  "Compile the Elib file FILE if necessary.
+
+This is done if FILE.el is newer than FILE.elc or if FILE.elc doesn't exist."
+  (let ((el-name (concat file ".el"))
+	(elc-name (concat file ".elc")))
+    (if (or (not (file-exists-p elc-name))
+	    (file-newer-than-file-p el-name elc-name))
+	(progn
+	  (message (format "Byte-compiling %s..." el-name))
+	  (byte-compile-file el-name)))))
+
+
+(defun compile-elib ()
+  "Byte-compile all uncompiled files of elib."
+
+  ;; Be sure to have . in load-path since a number of files in elib
+  ;; depend on other files and we always want the newer one even if
+  ;; a previous version of elib exists.
+
+  (interactive)
+  (let ((load-path (append '(".") load-path)))
+    (mapcar (function compile-file-if-necessary)
+	    elib-files)))
+
+;; elib-compile-all.el ends here
diff --git a/site/elib/elib-node.el b/site/elib/elib-node.el
new file mode 100644
index 0000000..531428e
--- /dev/null
+++ b/site/elib/elib-node.el
@@ -0,0 +1,109 @@
+;;;; $Id: elib-node.el,v 0.8 1995/12/11 00:11:19 ceder Exp $
+;;;; Nodes used in binary trees and doubly linked lists.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;;	Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 20 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Author: Inge Wallin
+;;;; 
+
+;;; Commentary:
+
+;;; A node is implemented as an array with three elements, using
+;;; (elt node 0) as the left pointer
+;;; (elt node 1) as the right pointer
+;;; (elt node 2) as the data
+;;;
+;;; Some types of trees, e.g. AVL trees, need bigger nodes, but 
+;;; as long as the first three parts are the left pointer, the 
+;;; right pointer and the data field, these macros can be used.
+;;;
+
+;;; Code:
+
+(provide 'elib-node)
+
+
+(defmacro elib-node-create (left right data)
+
+  ;; Create a tree node from LEFT, RIGHT and DATA.
+  (` (vector (, left) (, right) (, data))))
+
+
+(defmacro elib-node-left (node)
+
+  ;; Return the left pointer of NODE.
+  (` (aref (, node) 0)))
+
+
+(defmacro elib-node-right (node)
+
+  ;; Return the right pointer of NODE.
+  (` (aref (, node) 1)))
+
+
+(defmacro elib-node-data (node)
+
+  ;; Return the data of NODE.
+  (` (aref (, node) 2)))
+
+
+(defmacro elib-node-set-left (node newleft)
+
+  ;; Set the left pointer of NODE to NEWLEFT.
+  (` (aset (, node) 0 (, newleft))))
+
+
+(defmacro elib-node-set-right (node newright)
+
+  ;; Set the right pointer of NODE to NEWRIGHT.
+  (` (aset (, node) 1 (, newright))))
+
+
+(defmacro elib-node-set-data (node newdata)
+  ;; Set the data of NODE to NEWDATA.
+  (` (aset (, node) 2 (, newdata))))
+
+
+
+(defmacro elib-node-branch (node branch)
+
+  ;; Get value of a branch of a node.
+  ;; 
+  ;; NODE is the node, and BRANCH is the branch.
+  ;; 0 for left pointer, 1 for right pointer and 2 for the data."
+  (` (aref (, node) (, branch))))
+
+
+(defmacro elib-node-set-branch (node branch newval)
+
+  ;; Set value of a branch of a node.
+  ;;
+  ;; NODE is the node, and BRANCH is the branch.
+  ;; 0 for left pointer, 1 for the right pointer and 2 for the data.
+  ;; NEWVAL is new value of the branch."
+  (` (aset (, node) (, branch) (, newval))))
+
+;;; elib-node.el ends here.
diff --git a/site/elib/elib-test.el b/site/elib/elib-test.el
new file mode 100644
index 0000000..f36570e
--- /dev/null
+++ b/site/elib/elib-test.el
@@ -0,0 +1,573 @@
+;;;; $Id: elib-test.el,v 0.11 1995/12/11 00:14:05 ceder Exp $
+;;;; This file contains functions for testing all packages in ELIB.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Per Cederqvist <ceder@lysator.liu.se>
+;;	Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 3 Aug 1992
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+
+;;; Code:
+
+(require 'backquote)
+
+;;; ================================================================
+;;; Routines common to all the ELIB packages.
+
+
+(defun test-package (package-test-suite)
+  "Run through a list of test cases.
+Each test case is a list of one of the following types:
+ (test-case error expected-error)
+ (test-case result expected-result)
+ (test-case dont-care)"
+
+  (interactive "Xtest suite: ")
+  (let ((testno 0)
+	(all-is-ok t))
+    (mapcar (function 
+	     (lambda (ele)
+	       (if (not (test-a-case ele testno))
+		   (setq all-is-ok nil))
+	       (setq testno (1+ testno))))
+	    package-test-suite)
+    (if all-is-ok
+	(princ "None of the errors have been found.\n"))))
+
+
+(defun test-a-case (test-case testno)
+  ;; Return t if ok and nil if error.
+
+  (let* ((test-data (car test-case))
+	 (result-type (car (cdr test-case)))
+	 (expected-result (if (eq result-type 'dont-care)
+			      nil
+			    (car (cdr (cdr test-case)))))
+	 result)
+    (cond
+     ((eq result-type 'error)
+
+      ;; An error expected:
+      (condition-case error
+	  (progn
+	    (setq result (eval test-data))
+	    (princ (format "%3d: An error should have occured here: %s\n"
+			   testno test-case))
+	    (princ (format "     The result was: %s\n" result))
+	    nil)
+	(error (if (equal error expected-result)
+		   t
+		 (princ (format "%3d: Wrong error.\n" testno))
+		 (princ (format "     %s\n" error))
+		 (princ (format "     The error should have been:\n     %s\n"
+				expected-result))
+		 nil))))
+
+     ((or (eq result-type 'result)
+	  (eq result-type 'dont-care))
+
+      ;; No error expected:
+      (condition-case error
+	  (let ((result (eval test-data)))
+	    (if (or (eq result-type 'dont-care)
+		    (equal result expected-result))
+		t
+	      (princ
+	       (format
+		"%3d: Wrong result while evaluating\n%s\nThe result: %s\n"
+		testno test-case result))
+	      (princ (format "     The result should have been: %s\n" 
+			     expected-result))
+	      nil))
+	(error  
+	 (princ
+	  (format
+	   "%3d: An error occured while evaluating\n%s\nThe error:\n     %s\n"
+	   testno test-case error))
+	 (if (eq result-type 'result)
+	     (princ (format "     The result should have been:\n     %s\n"
+			    expected-result)))
+	 nil)))
+     (t
+      (princ (format "%3d: Misformed test case:\n     %s\n"
+		     testno test-case))))))
+
+
+;;; ================================================================
+;;;         Tests for the function variety of the stack.
+
+
+(setq stack-f-tests
+      '(((setq stk (stack-create)) result (STACK))
+	((setq xyz 'xyz) result xyz)
+
+	((stack-p stk) result t)
+	((stack-empty stk) result t)
+	((stack-pop stk) result nil)
+	((stack-top stk) result nil)
+	((stack-length stk) result 0)
+	((stack-all stk) result nil)
+
+	((stack-p xyz) result nil)
+	((stack-empty xyz) error (wrong-type-argument listp xyz))
+	((stack-pop xyz) error (wrong-type-argument listp xyz))
+	((stack-top xyz) error (wrong-type-argument listp xyz))
+	((stack-length xyz) error (wrong-type-argument listp xyz))
+	((stack-all xyz) error (wrong-type-argument listp xyz))
+
+	((setq stk2 (stack-copy stk)) result (STACK))
+	((eq stk stk2) result nil)
+	((equal stk stk2) result t)
+
+	((stack-push stk 'a) result (a))
+	((stack-top stk) result a)
+	((stack-all stk) result (a))
+	((stack-empty stk) result nil)
+	((stack-length stk) result 1)
+
+	((stack-push stk 'b) result (b a))
+	((stack-all stk) result (b a))
+	((stack-length stk) result 2)
+	((stack-nth stk -1) result b)
+	((stack-nth stk 0) result b)
+	((stack-nth stk 1) result a)
+	((stack-nth stk 2) result nil)
+	((stack-nth stk 3) result nil)
+
+	((setq stk2 (stack-copy stk)) result (STACK b a))
+	((eq stk stk2) result nil)
+	((equal stk stk2) result t)
+
+	((stack-pop stk) result b)
+	((stack-all stk) result (a))
+	((stack-pop stk) result a)
+	((stack-all stk) result nil)
+	((stack-empty stk) result t)
+
+	((stack-push stk 'a) result (a))
+	((stack-push stk 'b) result (b a))
+	((stack-clear stk) result nil) 
+	((stack-p stk) result t)		
+	((stack-empty stk) result t)		
+	((stack-pop stk) result nil)	     
+	((stack-top stk) result nil)
+	((stack-length stk) result 0)
+	((stack-all stk) result nil)
+	))
+(setq stack-m-tests stack-f-tests)
+
+
+(defun test-stack-f ()
+    (interactive)
+    (let ((load-path '(".")))
+      (require 'stack-f)
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "stack-f:\n")
+	(test-package stack-f-tests))))
+
+
+;;
+;; Use the same tests for stack-m as for stack-f
+;;
+(defun test-stack-m ()
+    (interactive)
+    (let ((load-path '(".")))
+      (require 'stack-m)
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "stack-m:\n")
+	(test-package stack-m-tests))))
+
+
+
+
+;;; ================================================================
+;;;         Tests for the function variety of the queue.
+
+
+(setq queue-f-tests
+      '(((setq que (queue-create)) result (QUEUE nil))
+	((setq xyz 'xyz) result xyz)
+
+	((queue-p que) result t)
+	((queue-empty que) result t)
+	((queue-dequeue que) result nil)
+	((queue-first que) result nil)
+	((queue-length que) result 0)
+	((queue-all que) result nil)
+
+	((queue-p xyz) result nil)
+	((queue-empty xyz) error (wrong-type-argument listp xyz))
+	((queue-dequeue xyz) error (wrong-type-argument listp xyz))
+	((queue-first xyz) error (wrong-type-argument listp xyz))
+	((queue-length xyz) error (wrong-type-argument listp xyz))
+	((queue-all xyz) error (wrong-type-argument listp xyz))
+
+	((setq que2 (queue-copy que)) result (QUEUE nil))
+	((eq que que2) result nil)
+	((equal que que2) result t)
+
+	((queue-enqueue que 'a) result (a))
+	((queue-first que) result a)
+	((queue-all que) result (a))
+	((queue-empty que) result nil)
+	((queue-length que) result 1)
+
+	((queue-enqueue que 'b) result (b))
+	((queue-all que) result (a b))
+	((queue-length que) result 2)
+	((queue-nth que -1) result a)
+	((queue-nth que 0) result a)
+	((queue-nth que 1) result b)
+	((queue-nth que 2) result nil)
+	((queue-nth que 3) result nil)
+
+	((setq que2 (queue-copy que)) result (QUEUE (a b) b))
+	((eq que que2) result nil)
+	((equal que que2) result t)
+
+	((queue-dequeue que) result a)
+	((queue-all que) result (b))
+	((queue-dequeue que) result b)
+	((queue-all que) result nil)
+	((queue-empty que) result t)
+
+	((queue-enqueue que 'a) dont-care)
+	((queue-enqueue que 'b) dont-care)
+	((queue-clear que) dont-care) 
+	((queue-p que) result t)		
+	((queue-empty que) result t)		
+	((queue-dequeue que) result nil)	     
+	((queue-first que) result nil)
+	((queue-length que) result 0)
+	((queue-all que) result nil)
+	))
+(setq queue-m-tests queue-f-tests)
+
+
+(defun test-queue-f ()
+    (interactive)
+    (let ((load-path '(".")))
+      (require 'queue-f)
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "queue-f:\n")
+	(test-package queue-f-tests))))
+
+;;
+;; Use the same tests for queue-m as for queue-f
+;;
+(defun test-queue-m ()
+    (interactive)
+    (let ((load-path '(".")))
+      (require 'queue-m)
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "queue-m:\n")
+	(test-package queue-m-tests))))
+
+
+;;; ================================================================
+;;;         Tests for the string package.
+
+(setq string-tests
+      '(((string-replace-match "foo" "kallefoopelle" "bar")
+	 result "kallebarpelle")
+	((string-replace-match "[0-9]" "le127" "bar\\\\\\&\\\\")
+	 result "lebar\\1\\27")
+	((string-replace-match "f\\([^f]*\\)f\\([^f]*\\)f"
+			       "abcdefghijfdddfojsan" "\\2\\1")
+	 result "abcdedddghijojsan")
+	((string-split "," "foo,bar,baz") result ("foo" "bar" "baz"))
+	((string-split "," "foo,bar,baz" 2) result ("foo" "bar"))))
+	
+	 
+(defun test-string ()
+    (interactive)
+    (let ((load-path '(".")))
+      (require 'string)
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "string:\n")
+	(test-package string-tests))))
+
+;;; ================================================================
+;;;         Tests for the doubly linked list.
+
+(setq dll-tests
+      '(
+	((setq a (dll-create)) dont-care)
+	((dll-p a) result t)
+	((dll-p nil) result nil)
+	((setq b (dll-create-from-list (list 'a 'b 'c))) dont-care)
+	((setq c (dll-copy b)) dont-care)
+	((dll-enter-first c 'f) dont-care)
+	((dll-enter-last c 'l) dont-care)
+	((setq n (dll-nth c 2)) dont-care)
+	((dll-element c n) result b)
+	((dll-enter-after c n 'after) dont-care)
+	((dll-element c n) result b)
+	((dll-enter-before c n 'before) dont-care)
+	((dll-element c n) result b)
+	((dll-first a) result nil)
+	((dll-first b) result a)
+	((dll-first c) result f)
+	((dll-empty b) result nil)
+	((dll-last a) result nil)
+	((dll-last b) result c)
+	((dll-last c) result l)
+	((dll-element c n) result b)
+	((dll-all c) result (f a before b after c l))
+	((dll-element c (dll-next c n)) result after)
+	((dll-element c (dll-previous c n)) result before)
+	((dll-next b (dll-nth b 2)) result nil)
+	((dll-next b (dll-nth b -1)) result nil)
+	((dll-previous c (dll-nth c 0)) result nil)
+	((dll-all a) result nil)
+	((dll-all b) result (a b c))
+	((dll-all c) result (f a before b after c l))
+	((dll-delete c n) result b)
+	((dll-all c) result (f a before after c l))
+	((setq d (dll-copy c)) dont-care)
+	((dll-delete-first b) result a)
+	((dll-all b) result (b c))
+	((dll-delete-last b) result c)
+	((dll-all b) result (b))
+	((dll-delete-last b) result b)
+	((dll-all b) result nil)
+	((dll-clear c) dont-care)
+	((dll-all c) result nil)
+	((dll-clear c) dont-care)
+	((dll-all c) result nil)
+	((dll-p n) result nil)
+	((dll-p a) result t)
+	((dll-p b) result t)
+	((dll-empty a) result t)
+	((dll-empty b) result t)
+	((dll-all d) result (f a before after c l))
+	((dll-previous d (dll-nth d 0)) result nil)
+	((let (xxx)
+	   (dll-map-reverse (function (lambda (x) (setq xxx (cons x xxx)))) d)
+	   xxx) result (f a before after c l))
+	((let (xxx)
+	   (dll-map (function (lambda (x) (setq xxx (cons x xxx)))) d)
+	   xxx) result (l c after before a f))
+	((dll-filter d (function (lambda (x)
+				   (or (equal x 'after)
+				       (equal x 'before))))) dont-care)
+	((dll-all d) result (before after))
+	((dll-length a) result 0)
+	((dll-length d) result 2)
+	((setq a (dll-create-from-list (list 7 2 843 2 8 19 7 289))) dont-care)
+	((dll-sort a (function <)) dont-care)
+	((dll-all a) result (2 2 7 7 8 19 289 843))
+	))
+
+(setq dll-debug-tests dll-tests)
+
+(defun test-dll ()
+    (interactive)
+    (let ((load-path '(".")))
+      (load-library "dll")
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "dll:\n")
+	(test-package dll-tests))))
+
+(defun test-dll-debug ()
+    (interactive)
+    (let ((load-path '(".")))
+      (load-library "dll-debug")
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "dll-debug:\n")
+	(test-package dll-debug-tests))))
+
+;;; ================================================================
+;;;         Tests for the cookie mode.
+
+(setq cookie-tests
+      '(
+	((kill-buffer (get-buffer-create "*Cookie-buffer*")) dont-care)
+	((setq a (collection-create "*Cookie-buffer*"
+				    (function insert)
+				    "Header" "Footer"))
+	 dont-care)
+	((collection-empty a) result t)
+	((collection-length a) result 0)
+	((collection-list-cookies a) result nil)
+	((cookie-enter-first a "1") dont-care)
+	((cookie-enter-last a "2") dont-care)
+	((collection-append-cookies a '("3" "4")) dont-care)
+	((collection-empty a) result nil)
+	((collection-length a) result 4)
+	((collection-list-cookies a) result ("1" "2" "3" "4"))
+	((eq (collection-buffer a) (get-buffer "*Cookie-buffer*"))
+	 result t)
+	((save-window-excursion
+	   (set-buffer (collection-buffer a))
+	   (buffer-string))
+	 result "Header\n1\n2\n3\n4\nFooter\n")
+      ((eq (tin-locate a 1) (tin-nth a 0)) result t)
+      ((eq (tin-locate a 2) (tin-nth a 0)) result t)
+      ((eq (tin-locate a 7) (tin-nth a 0)) result t)
+      ((eq (tin-locate a 8) (tin-nth a 0)) result t)
+      ((eq (tin-locate a 9) (tin-nth a 0)) result t)
+      ((eq (tin-locate a 9) (tin-nth a 1)) result nil)
+      ((eq (tin-locate a 10) (tin-nth a 0)) result nil)
+      ((eq (tin-locate a 10) (tin-nth a 1)) result t)
+      ((eq (tin-locate a 12) (tin-nth a 2)) result t)
+      ((eq (tin-locate a 14) (tin-nth a 3)) result t)
+      ((eq (tin-locate a 16) (tin-nth a 3)) result t)
+      ((eq (tin-locate a 18) (tin-nth a 3)) result t)
+
+      ;; Test that last-tin is reset when collection-filter-cookies is called.
+      ((tin-goto a (tin-locate a 12)) dont-care)
+      ((collection-filter-cookies
+	a (function (lambda (x) (not (string= x "3"))))) dont-care)
+      ((collection-list-cookies a) result ("1" "2" "4"))
+      ((tin-goto-previous a 13 1) dont-care)
+      
+))
+
+(defun test-cookie ()
+    (interactive)
+    (save-some-buffers)
+    (let ((load-path '(".")))
+      (load-library "cookie")
+      (with-output-to-temp-buffer "*Elib-test*"
+	(princ "cookie:\n")
+	(test-package cookie-tests))))
+
+
+;;; ================================================================
+;;;            Functions for testing a binary tree.
+;;;            (not yet working)
+
+
+(require 'bintree)
+
+
+(defun bintree-print (tree)
+  "Print the binary tree TREE on stdout."
+  (princ "\n")
+  (do-bintree-print (elib-bintree-root tree) 0)
+  nil)
+
+
+(defun do-bintree-print (root level)
+  "Print the binary tre starting with the root node ROOT at level LEVEL."
+  (if (null root)
+      (princ "empty tree")
+    (if (elib-node-left root)
+	(do-bintree-print (elib-node-left root) (1+ level)))
+    (let ((lvl level))
+      (while (> lvl 0)
+	(princ "   ")
+	(setq lvl (1- lvl))))
+    (princ (elib-node-data root))
+    (princ "\n")
+    (if (elib-node-right root)
+	(do-bintree-print (elib-node-right root) (1+ level)))))
+
+
+(defun bintree-enter-list (tree list)
+  "Enter into TREE all elements of LIST."
+  (mapcar (function (lambda (x) (elib-bintree-enter tree x)))
+	  list))
+
+
+;;; ================================================================
+;;;            Functions for testing an AVL tree.
+;;;            (not yet working)
+
+
+(require 'avltree)
+
+
+(defun avltree-print (tree)
+  "Print the binary tree TREE on stdout."
+  (princ "\n")
+  (do-avltree-print (elib-avl-root tree) 0)
+  nil)
+
+
+(defun do-avltree-print (root level)
+  "Print the binary tre starting with the root node ROOT at level LEVEL."
+  (if (null root)
+      (princ "empty tree")
+    (if (elib-node-left root)
+	(do-avltree-print (elib-node-left root) (1+ level)))
+    (let ((lvl level))
+      (while (> lvl 0)
+	(princ "   ")
+	(setq lvl (1- lvl))))
+    (princ (elib-node-data root))
+    (princ " ")
+    (princ (elib-avl-node-balance root))
+    (princ "\n")
+    (if (elib-node-right root)
+	(do-avltree-print (elib-node-right root) (1+ level)))))
+
+
+(defun avltree-enter-list (tree list)
+  "Enter into TREE all elements of LIST."
+  (mapcar (function (lambda (x) (elib-avltree-enter tree x)))
+	  list))
+
+
+;;; ================================================================
+;;;                      Test the entire Elib.
+
+
+;; Note that some tests are commented away.  That is because they
+;; are not yet written.
+
+
+(setq elib-packages
+      '("stack-f"
+	"stack-m"
+	"queue-f"
+	"queue-m"
+	"dll-debug"
+	;; Check cookie immediately after dll-debug, so that we can
+	;; see the output.
+	"cookie"
+	"dll"
+	;; Check cookie again, in case dll-debug behaves differently.
+	"cookie"
+;;;	"elib-node"
+;;;	"bintree"
+;;;	"avltree"
+	"string"
+;;;	"read"
+	))
+	
+
+(defun elib-test-all ()
+  "Test all packages within ELIB for errors."
+  (interactive)
+  (let ((load-path '(".")))
+    (with-output-to-temp-buffer "*Elib-test*"
+      (mapcar (function
+	       (lambda (package-name)
+		 (load-library package-name)
+		 (princ (format "%s:\n" package-name))
+		 (test-package (eval (intern (concat package-name 
+						     "-tests"))))))
+	      elib-packages))))
+
+;;; elib-test.el ends here
diff --git a/site/elib/elib.texi b/site/elib/elib.texi
new file mode 100644
index 0000000..48c4653
--- /dev/null
+++ b/site/elib/elib.texi
@@ -0,0 +1,1484 @@
+\input texinfo   @c -*-texinfo-*-
+
+@comment $Id: elib.texi,v 0.29 1995/12/11 00:35:52 ceder Exp $
+@comment Documentation for the GNU Emacs lisp library, Elib
+@comment Copyright (C) 1991, 1992 Free Software Foundation
+
+@comment This file is part of the GNU Emacs lisp library, Elib.
+
+@comment GNU Elib is free software; you can redistribute it and/or modify
+@comment it under the terms of the GNU General Public License as published by
+@comment the Free Software Foundation; either version 2, or (at your option)
+@comment any later version.
+
+@comment GNU Elib is distributed in the hope that it will be useful,
+@comment but WITHOUT ANY WARRANTY; without even the implied warranty of
+@comment MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+@comment GNU General Public License for more details.
+
+@comment You should have received a copy of the GNU General Public License
+@comment along with GNU Emacs; see the file COPYING.  If not, write to
+@comment the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+@setfilename elib.info
+@settitle Elib - The Emacs Lisp Library
+@setchapternewpage odd
+@syncodeindex fn cp
+     
+@ifinfo
+Copyright @copyright{} 1991, 1992 Free Software Foundation
+@end ifinfo
+     
+@comment The titlepage section does not appear in the Info file.
+@titlepage
+@sp 4
+@comment The title is printed in a large font.
+@center @titlefont{User's Guide}
+@sp
+@center @titlefont{to}
+@sp
+@center @titlefont{Elib - The Emacs Lisp Library}
+@sp 2
+@center version 1.0
+@c --version--
+@sp 3
+@center Inge Wallin
+@sp 3
+@center last updated 10 dec 1995
+@c --date--
+
+@comment  The following two commands start the copyright page
+@comment  for the printed manual.  This will not appear in the Info file.
+@page
+@vskip 0pt plus 1filll
+Copyright @copyright{} 1991, 1992 Free Software Foundation
+
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions that the section entitled ``GNU ELIB GENERAL
+PUBLIC LICENSE'' is included exactly as in the original, and provided
+that the entire resulting derived work is distributed under the terms of
+a permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual
+into another language under the above conditions for modified versions,
+except that the section entitled ``GNU ELIB GENERAL PUBLIC LICENSE'' may
+be included in a translation approved by the author instead of in the
+original English.
+@end titlepage
+
+@comment ================================================================
+@comment                   The real text starts here
+@comment ================================================================
+
+@ifinfo
+@node    Top, License information, (dir), (dir)
+@comment node-name, next,          previous, up
+@cindex Introduction
+
+
+This manual describes Elib, the GNU emacs lisp library version 1.0.
+@c --version--
+The functions and data types in Elib are supposed to be a common
+base for all kinds of other elisp packages and are not programs, modes
+or packages of their own.
+
+@end ifinfo
+@menu
+* License information::         Information about terms for copying Elib.
+* What is Elib?::               What is Elib?
+* Container data types::        Data types which can contain other data.
+* Cookie package::              The Cookie package.
+* String functions::            A number of string functions.
+* Read functions::              Read data from the minibuffer.
+
+* Future enhancements::         Future enhancements of Elib.
+* Reporting bugs::              Where do you report a bug you have found?
+
+* Node index::                  Index over important all the nodes 
+                                  in this manual.
+@end menu
+
+@node   License information, What is Elib?, Top, Top
+@comment  node-name,    next,   previous,       up
+@include gpl.texi
+
+@node     What is Elib?, Container data types, License information, Top
+@comment  node-name,     next, previous, up
+@chapter What is Elib?
+@cindex What is Elib?
+@cindex Elib, introduction
+@cindex Introduction to Elib
+@cindex Require
+
+Elib, the GNU Emacs lisp library, is a collection of elisp
+functions which you can use as parts of your own elisp programs.
+Each file contains functions which have something in common, e.g.
+they handle a certain data type.  
+
+Elib is designed to be both as efficient and as easy to use as
+possible.  Each file in Elib uses the elisp function @code{provide}
+to tell emacs when it has been loaded.  To use the functions in
+the file @code{foo}, you just have to put a line such as:  
+
+@example
+(require 'foo)
+@end example
+
+into your own elisp file.  This will cause emacs to load the file
+@code{foo.elc} and evaluate the functions in it.  This, of course,
+requires that your system manager has installed Elib properly on your
+system.
+
+@menu
+* Contributors::                Contributors to GNU Elib.
+* Archives::                    Where can I get a copy of Elib?
+@end menu
+
+@node     Contributors, Archives, What is Elib?, What is Elib?
+@comment  node-name,  next,  previous,  up
+@section Contributors to Elib
+@cindex Contributors
+@cindex Inge Wallin
+@cindex Wallin, Inge
+@cindex Kremer, Sebastian
+@cindex Sebastian Kremer
+@cindex Bellman, Thomas
+@cindex Thomas Bellman
+@cindex Cederqvist, Per
+@cindex Per Cederqvist
+
+The following persons have made contributions to GNU Elib.
+
+@itemize @bullet
+@item
+Inge Wallin wrote most of the otherwise unattributed functions in
+Elib as well as all documentation.
+
+@item
+Sebastian Kremer contributed the string functions.
+
+@item
+Thomas Bellman wrote some of the code for AVL trees.
+
+@item
+Per Cederqvist wrote the cookie package and the doubly linked list.  The
+first design of @file{cookie.el} was made by Inge Wallin.
+@end itemize
+
+
+@node     Archives,  , Contributors, What is Elib?
+@comment  node-name,  next,  previous,  up
+@section Where can I get Elib?
+@cindex sites
+@cindex Archives
+@cindex Ftp
+@cindex Lysator
+@cindex ftp.lysator.liu.se
+
+There will probably be a number of sites archiving Elib.
+Currently the latest release can always be fetched via anonymos
+ftp from @code{ftp.lysator.liu.se} 
+in @file{pub/emacs}.
+@c --site--
+
+@node     Container data types, Cookie package, What is Elib?, Top
+@comment  node-name,  next,  previous,  up
+@chapter Container Data Types
+@cindex Container Data Types
+@cindex Conventions
+
+Container data types are data types which are used to hold and organize
+other data.  Since lisp is a dynamically typed language, any container
+data type can hold any other data type or a mix of other data types.
+This is contrary to the case for @code{C} or @code{C++} where all data in
+a typical container must be of the same type.
+
+As a convention do all names of the functions handling a certain
+container data type begin in @code{<type>-}, i.e. the functions 
+implementing the container data type @code{foo} all start with
+@code{foo-}. 
+
+@menu
+* Stack::                       The Stack data type.
+* Queue::                       The Queue data type.
+* Doubly Linked List::          The Doubly Linked List Data Type.
+* Binary tree::                 An ordinary binary tree.
+* AVL tree::                    A balanced binary tree (AVL tree).
+@end menu
+
+@node     Stack, Queue, Container data types, Container data types
+@comment  node-name,  next,  previous,  up
+@section The Stack Data Type
+@cindex Stack
+@cindex LIFO Stack
+@cindex stack-f
+@cindex stack-m
+
+The stack data type provides a simple LIFO stack.  There are two
+implementations of a stack in Elib, one using macros and one using
+functions.  The names of the functions/macros in the two implementations
+are the same, but the efficiency of using one or the other vary greatly
+under different circumstances.
+
+The implementation using macros should be used when you want to
+byte-compile your own elisp program.  This will be most efficient since
+byte-compiling an elisp function using macros has the same effect as
+using inline code in @code{C}.
+
+To use the stack data type, put the line
+
+@example
+(require 'stack-f)
+@end example
+
+in your own elisp source file if you want to use the implementation
+using functions or
+
+@example
+(require 'stack-m)
+@end example
+
+if you want to use the implementation using macros.  This is the only
+difference between them, so it is easy to switch between them during
+debugging.
+
+The following functions are provided by the stack:
+
+@table @code
+@item (stack-create)
+@findex stack-create
+Create a new empty stack.
+
+@item (stack-p stack)
+@findex stack-p
+Return @code{t} if @var{stack} is a stack, otherwise return @code{nil}.
+
+@item (stack-push stack element)
+@findex stack-push
+Push @var{element} onto @var{stack}.
+
+@item (stack-pop stack)
+@findex stack-pop
+Remove the topmost element from @var{stack} and return it. If
+@var{stack} is empty, return @code{nil}.
+
+@item (stack-empty stack)
+@findex stack-empty
+Return @code{t} if @var{stack} is empty, otherwise return @code{nil}.
+
+@item (stack-top stack)
+@findex stack-top
+Return the top element of @var{stack}, but don't remove it from the stack.
+Return @code{nil} if @var{stack} is empty.
+
+@item (stack-nth stack n)
+@findex stack-nth
+Return the @var{n}th element of @var{stack} where the top stack element
+has number 0.  If @var{stack} is not that long, return @code{nil}.  The
+element is not removed from the stack.
+
+@item (stack-all stack)
+@findex stack-all
+Return a list of all entries in @var{stack} with the topmost element first.
+
+@item (stack-copy stack)
+@findex stack-copy
+Return a copy of @var{stack}.  All entries in @var{stack} are also copied.
+
+@item (stack-length stack)
+@findex stack-length
+Return the number of elements in @var{stack}.
+
+@item (stack-clear stack)
+@findex stack-clear
+Remove all elements from @var{stack}.
+
+@end table
+
+
+@node     Queue, Doubly Linked List, Stack, Container data types
+@comment  node-name,  next,  previous,  up
+@section The Queue Data Type
+@cindex Queue
+@cindex FIFO Queue
+@cindex queue-f
+@cindex queue-m
+
+The queue data type provides a simple FIFO queue.  There are two 
+implementations of a queue in Elib, one using macros and one using
+functions.  The names of the functions/macros in the two implementations
+are the same, but the efficiency of using one or the other vary greatly
+under different circumstances.
+
+The implementation using macros should be used when you want to
+byte-compile your own elisp program.  This will be most efficient since
+byte-compiling an elisp function using macros has the same effect as
+using inline code in @code{C}.  
+
+To use the queue data type, put the line
+
+@example
+(require 'queue-f)
+@end example
+
+in your own elisp source file if you want to use the implementation
+using functions or
+
+@example
+(require 'queue-m)
+@end example
+
+if you want to use the implementation using macros.  This is the only
+difference between them, so it is easy to switch between them during
+debugging.
+
+Not all functions in @file{queue-m.el} are implemented as macros,
+only the short ones.  This does not make it less recommendable to use
+the macro version in your compiled code.
+
+The following functions are provided by the queue:
+
+@table @code
+@item (queue-create)
+@findex queue-create
+Create a new empty queue.
+
+@item (queue-p queue)
+@findex queue-p
+Return @code{t} if @var{queue} is a queue, otherwise return @code{nil}.
+
+@item (queue-enqueue queue element)
+@findex queue-enqueue
+Enter @var{element} last into @var{queue}.
+
+@item (queue-dequeue queue)
+@findex queue-dequeue
+Remove the first element from @var{queue} and return it.
+
+@item (queue-empty queue)
+@findex queue-empty
+Return @code{t} if @var{queue} is empty, otherwise return @code{nil}.
+
+@item (queue-first queue)
+@findex queue-first
+Return the first element of @var{queue} or @code{nil} if it is empty.  The
+element is not removed from the queue.
+
+@item (queue-nth queue n)
+@findex queue-nth
+Return the @var{n}th element of @var{queue}, where the first element of
+@var{queue} has number 0.  If the length of @var{queue} is less than
+@var{n}, return @code{nil}.  The element is not removed from the queue.
+
+@item (queue-last queue)
+@findex queue-last
+Return the last element of @var{queue} or @code{nil} if it is empty.  The
+element is not removed from the queue. 
+
+@item (queue-all queue)
+@findex queue-all
+Return a list of all elements in @var{queue}.  Return @code{nil} if
+@var{queue} is empty.  The oldest element in the queue is the first in
+the list.
+
+@item (queue-copy queue)
+@findex queue-copy
+Return a copy of @var{queue}.  All entries in @var{queue} are also copied.
+
+@item (queue-length queue)
+@findex queue-length
+Return the number of elements in @var{queue}.
+
+@item (queue-clear queue)
+@findex queue-clear
+Remove all elements from @var{queue}.
+
+@end table
+
+@node Doubly Linked List, Binary tree, Queue, Container data types
+@comment  node-name,  next,  previous,  up
+@section The Doubly Linked List Data Type
+@cindex Doubly linked list
+@cindex List, doubly linked
+@cindex dll
+
+The doubly linked list is an efficient data structure if you need to
+traverse the elements on the list in two directions, and maybe insert
+new elements in the middle of the list.  You can efficiently delete any
+element, and insert new elements, anywhere on the list.
+
+A doubly linked list (@dfn{dll} for short) consists of a number of
+@dfn{nodes}, each containing exactly one @dfn{element}.  Some of the
+functions operate directly on the elements, while some manipulate nodes.
+For instance, all of the functions that let you step forward and
+backwards in the list handle nodes.  Use the function @dfn{dll-element}
+to extract the element of a node.
+
+To use the doubly linked list provided by Elib you must put the line
+
+@example
+(require 'dll)
+@end example
+
+in your elisp source file.
+
+@menu
+* Creating a dll::              Creating a Doubly Linked List
+* Entering elements::           Entering elements in a dll
+* Accessing elements::          Accessing elements of a dll
+* Removing nodes::              Removing nodes from a dll
+* Predicates::                  Predicates on a dll
+* Maps and Filters::            Maps and Filters on a dll
+* Misc dll operations::         Miscellaneous dll operations
+* Debugging dll applications::  Debugging dll applications
+@end menu
+
+@node Creating a dll, Entering elements, Doubly Linked List, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Creating a Doubly Linked List
+
+@table @code
+@item (dll-create)
+@findex dll-create
+Create an empty doubly linked list.
+
+@item (dll-create-from-list list)
+@findex dll-create-from-list
+Given the ordinary lisp list @var{list}, create a doubly linked list
+with the same elements.
+
+@item (dll-copy dll &optional element-copy-fnc)
+@findex dll-copy
+Return a copy of the doubly linked list @var{dll}.  If optional second
+argument @var{element-copy-fnc} is non-@code{nil} it should be a
+function that takes one argument, an element, and returns a copy of it.
+If @var{element-copy-fnc} is not given the elements themselves are not
+copied.
+@end table
+
+@node Entering elements, Accessing elements, Creating a dll, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Entering elements in a dll
+
+@table @code
+@item (dll-enter-first dll element)
+@findex dll-enter-first
+Add an element first on a doubly linked list.
+
+@item (dll-enter-last dll element)
+@findex dll-enter-last
+Add an element last on a doubly linked list.
+
+@item (dll-enter-after dll node element)
+@findex dll-enter-after
+In the doubly linked list @var{dll}, insert a node containing
+@var{element} after @var{node}.
+
+@item (dll-enter-before dll node element)
+@findex dll-enter-before
+In the doubly linked list @var{dll}, insert a node containing
+@var{element} before @var{node}.
+@end table
+
+@node Accessing elements, Removing nodes, Entering elements, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Accessing elements of a dll
+
+@table @code
+@item (dll-element dll node)
+@findex dll-element
+Get the element of a @var{node} in a doubly linked list @var{dll}.
+
+@item (dll-first dll)
+@findex dll-first
+Return the first element on the doubly linked list @var{dll}.  Return
+@code{nil} if the list is empty. The element is not removed.
+
+@item (dll-nth dll n)
+@findex dll-nth
+Return the @var{n}th node from the doubly linked list @var{dll}.
+@var{n} counts from zero. If @var{dll} is not that long, @code{nil} is
+returned.  If @var{n} is negative, return the -(@var{n}+1)th last
+element.  Thus, @code{(dll-nth dll 0)} returns the first node, and
+@code{(dll-nth dll -1)} returns the last node.
+
+@item (dll-last dll)
+@findex dll-last
+Return the last element on the doubly linked list @var{dll}.  Return
+@code{nil} if the list is empty. The element is not removed.
+
+@item (dll-next dll node)
+@findex dll-next
+Return the last element on the doubly linked list @var{dll}.  Return
+@code{nil} if the list is empty. The element is not removed.
+
+@item (dll-previous dll node)
+@findex dll-previous
+Return the node before @var{node}, or @code{nil} if @var{node} is the
+first node.
+
+@item (dll-all dll)
+@findex dll-all
+Return all elements on the double linked list @var{dll} as an ordinary list.
+
+@end table
+
+@node Removing nodes, Predicates, Accessing elements, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Removing nodes from a dll
+
+@table @code
+@item (dll-delete dll node)
+@findex dll-delete
+Delete @var{node} from the doubly linked list @var{dll}.  Return the
+element of @var{node}.
+
+@item (dll-delete-first dll)
+@findex dll-delete-first
+Delete the first @var{node} from the doubly linked list @var{dll}.
+Return the element. Returns @code{nil} if @var{dll} was empty.
+
+@item (dll-delete-last dll)
+@findex dll-delete-last
+Delete the last @var{node} from the doubly linked list @var{dll}.
+Return the element. Returns @code{nil} if @var{dll} was empty.
+
+@item (dll-clear dll)
+@findex dll-clear
+Clear the doubly linked list @var{dll}, i.e. make it completely empty.
+@end table
+
+@node Predicates, Maps and Filters, Removing nodes, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Predicates on a dll
+
+@table @code
+@item (dll-p object)
+@findex dll-p
+Return @code{t} if @var{object} is a doubly linked list, otherwise return
+@code{nil}.
+
+@item (dll-empty dll)
+@findex dll-empty
+Return @code{t} if the doubly linked list @var{dll} is empty, @code{nil}
+otherwise.
+@end table
+
+@node Maps and Filters, Misc dll operations, Predicates, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Maps and Filters on a dll
+
+@table @code
+@item (dll-map map-function dll)
+@findex dll-map
+Apply @var{map-function} to all elements in the doubly linked list @var{dll}.
+The function is applied to the first element first.
+
+@item (dll-map-reverse map-function dll)
+@findex dll-map-reverse
+Apply @var{map-function} to all elements in the doubly linked list
+@var{dll}.  The function is applied to the last element first.
+
+@item (dll-filter dll predicate)
+@findex dll-filter
+Remove all elements in the doubly linked list @var{dll} for which
+@var{predicate} returns @code{nil}.
+@end table
+
+@node Misc dll operations, Debugging dll applications, Maps and Filters, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Miscellaneous dll operations
+
+@table @code
+@item (dll-length dll)
+@findex dll-length
+Returns the number of elements in the doubly linked list @var{dll}.
+
+@item (dll-sort dll predicate)
+@findex dll-sort
+Sort the doubly linked list @var{dll}, stably, comparing elements using
+@var{predicate}.  Returns the sorted list. @var{dll} is modified by side
+effects.  @var{predicate} is called with two elements of @var{dll}, and
+should return @code{t} if the first element is ``less'' than the second.
+@end table
+
+@node Debugging dll applications,  , Misc dll operations, Doubly Linked List
+@comment  node-name,  next,  previous,  up
+@subsection Debugging dll applications
+@cindex Debugging dll
+@cindex Doubly linked lists, debugging
+@cindex dll-debug
+@cindex Circular lists
+@cindex Error: circular lists
+
+The data structure used by the dll package contains both forward and
+backward pointers.  The primitives in Emacs, such as @code{print}, know
+nothing about dlls, so when Emacs tries to print out a dll it will think
+that it found a circular structure.  Fortunately it detects this 
+situation and gives an error message, instead of getting stuck in an
+eternal loop.
+
+The error message can be quite annoying when you are developing an
+application that uses dlls.  Suppose your code has an error, and you
+type @samp{(setq debug-on-error t)} to try to figure out exactly what
+the error is.  If any function in the backtrace has a dll as an
+argument, Emacs will abort printing the entire backtrace and only
+respond with a "Back at top level" message (or something similar,
+depending on exactly what you are doing) in the echo area.
+
+There are two solutions to this problem: patch your emacs so that it
+detects circular structures (there have been patches for this floating
+around the net) or use @file{dll-debug.el}.
+
+The file @file{dll-debug.el} implements all of the functionality that
+are present in @file{dll.el}, but it uses a normal, singly linked list
+instead.  This makes some operations, like @samp{dll-previous},
+dreadfully slow, but it makes it possible to debug dll applications.
+@file{dll-debug.el} also has more built-in sanity tests than
+@file{dll.el}.
+
+@strong{NOTE:} To use the debug package, you must load the library
+@file{dll-debug} before you load any of the libraries (such as cookie)
+or your program that use dll.  You must also make sure that you don't
+load any byte-compiled version of any file that was compiled with the
+normal dll library.  Since it contains some macros very strange results
+will occur otherwise...
+
+When the debug package is loaded, you simply run your code normally,
+and any bugs should be easier to trace.
+
+@node     Binary tree, AVL tree, Doubly Linked List, Container data types
+@comment  node-name,  next,  previous,  up
+@section The Binary Tree Data Type
+@cindex Binary tree
+@cindex bintree
+
+The binary tree is sometimes an efficient way to store data.  When a
+binary tree is created a compare function is given to the create
+function (@code{bintree-create}).  This function is used throughout
+all data entry and deletions into and out of the tree.
+
+To use the binary tree in Elib you must put the line 
+
+@example
+(require 'bintree)
+@end example
+
+in your elisp source file.
+
+The following functions are provided by the binary tree in the library:
+
+@table @code
+@item (bintree-create compare-function)
+@findex bintree-create
+Create a new empty binary tree.  The argument @var{compare-function} is a
+function which compares two instances of the data type which is to be
+entered into the tree.  The call @code{(compare-function data1 data2)}
+should return non-@code{nil} if @code{data1} is less than @code{data2},
+and @code{nil} otherwise.
+
+@item (bintree-p tree)
+@findex bintree-p
+Return @code{t} if @var{tree} is an bintree, otherwise return @code{nil}.
+
+@item (bintree-compare-function tree)
+@findex bintree-compare-function
+Return @code{compare-function} given to @code{bintree-create} when
+@var{tree} was created.
+
+@item (bintree-empty tree)
+@findex bintree-empty
+Return @code{t} if @var{tree} is empty, otherwise return @code{nil}.
+
+@item (bintree-enter tree data)
+@findex bintree-enter
+Enter @var{data} into @var{tree}.  If there already is a data element
+which is considered equal to @var{data} by @code{compare-function} given
+to @code{bintree-create}, the new element will replace the old one in
+the tree.
+
+@item (bintree-delete tree data)
+@findex bintree-delete
+Delete the element which is considered equal to @var{data} by
+@code{compare-function} given to @code{bintree-create}.  If there
+is no matching element within the tree, nothing is done to the tree.
+
+@item (bintree-member tree data)
+@findex bintree-member
+Return the element in @var{tree} which is considered equal to @var{data} by
+@code{compare-function} given to @code{bintree-create}.  If there
+is no such element in the tree, return @code{nil}.
+
+@item (bintree-map map-function tree)
+@findex bintree-map
+Apply @var{map-function} to all elements in @var{tree}.  The function is applied in
+the order in which the tree is sorted.
+
+@item (bintree-first tree)
+@findex bintree-first
+Return the first element of @var{tree}, i.e. the one who is considered first
+by @code{compare-function} given to @code{bintree-create}.  If the
+tree is empty, return @code{nil}.
+
+@item (bintree-last tree)
+@findex bintree-last
+Return the last element of @var{tree}, i.e. the one who is considered last
+by @code{compare-function} given to @code{bintree-create}.  If the
+tree is empty, return @code{nil}.
+
+@item (bintree-copy tree)
+@findex bintree-copy
+Return a copy of @var{tree}.
+
+@item (bintree-flatten tree)
+@findex bintree-flatten
+Return a sorted list containing all elements of @var{tree}.
+
+@item (bintree-size tree)
+@findex bintree-size
+Return the number of elements in @var{tree}.
+
+@item (bintree-clear tree)
+@findex bintree-clear
+Clear @var{tree}, i.e. make it totally empty.
+
+@end table
+
+
+@node     AVL tree,  , Binary tree, Container data types
+@comment  node-name,  next,  previous,  up
+@section The AVL Tree Data Type
+@cindex AVL tree
+@cindex Balanced binary tree
+@cindex Binary tree, balanced
+@cindex avltree
+
+The AVL tree data types provides a balanced binary tree.  The tree will
+remain balanced throughout its entire life time, regardless of in which
+order elements are entered into or deleted from the tree.
+
+Although an AVL tree is not perfectly balanced, it has almost the same
+performance as if it was.  The definition of an AVL tree is that the
+difference in depth of the two branches of a particular node is at most
+1.  This criterium is enough to make the performance of searching in an
+AVL tree very close to a perfectly balanced tree, but will simplify the
+entering and deleting of data significantly.
+
+All data that is entered into an AVL tree should be of the same type.
+If they are not, there are no way to compare two elements and this is
+essential for entering and deleting data from the tree.  When a tree is
+created, a compare function is given to the create function.  This
+function is used throughout the life of the tree in all subsequent
+insertions and deletions.
+
+To use the Elib AVL tree, you must put the line
+
+@example
+(require 'avltree)
+@end example
+
+in your elisp source file.
+
+The following functions are provided by the AVL tree in the library:
+
+@table @code
+@item (avltree-create compare-function)
+@findex avltree-create
+Create a new empty AVL tree.  The argument @var{compare-function} is a
+function which compares two instances of the data type which is to be
+entered into the tree.  The call @code{(compare-function data1 data2)}
+should return non-@code{nil} if @code{data1} is less than @code{data2},
+and @code{nil} otherwise.
+
+@item (avltree-p tree)
+@findex avltree-p
+Return @code{t} if @var{tree} is an avltree, otherwise return @code{nil}.
+
+@item (avltree-compare-function tree)
+@findex avltree-compare-function
+Return @code{compare-function} given to @code{avltree-create} when
+@var{tree} was created.
+
+@item (avltree-empty tree)
+@findex avltree-empty
+Return @code{t} if @var{tree} is empty, otherwise return @code{nil}.
+
+@item (avltree-enter tree data)
+@findex avltree-enter
+Enter @var{data} into @var{tree}.  If there already is a data element
+which is considered equal to @var{data} by @code{compare-function} given to
+@code{avltree-create}, the new element will replace the old one in the
+tree.
+
+@item (avltree-delete tree data)
+@findex avltree-delete
+Delete the element which is considered equal to @var{data} by
+@code{compare-function} given to @code{avltree-create}.  If there
+is no matching element within the tree, nothing is done to the tree.
+
+@item (avltree-member tree data)
+@findex avltree-member
+Return the element in @var{tree} which is considered equal to @var{data} by
+@code{compare-function} given to @code{avltree-create}.  If there
+is no such element in the tree, return @code{nil}.
+
+@item (avltree-map map-function tree)
+@findex avltree-map
+Apply @var{map-function} to all elements in @var{tree}.  The function is
+applied in the order in which the tree is sorted.
+
+@item (avltree-first tree)
+@findex avltree-first
+Return the first element of @var{tree}, i.e. the one who is considered first
+by @code{compare-function} given to @code{avltree-create}.  If the
+tree is empty, return @code{nil}.
+
+@item (avltree-last tree)
+@findex avltree-last
+Return the last element of @var{tree}, i.e. the one who is considered last
+by @code{compare-function} given to @code{avltree-create}.  If the
+tree is empty, return @code{nil}.
+
+@item (avltree-copy tree)
+@findex avltree-copy
+Return a copy of @var{tree}.
+
+@item (avltree-flatten tree)
+@findex avltree-flatten
+Return a sorted list containing all elements of @var{tree}.
+
+@item (avltree-size tree)
+@findex avltree-size
+Return the number of elements in @var{tree}.
+
+@item (avltree-clear tree)
+@findex avltree-clear
+Clear @var{tree}, i.e. make it totally empty.
+
+@end table
+
+@node Cookie package, String functions, Container data types, Top
+@comment  node-name,  next,  previous,  up
+@chapter The Cookie package---nodal data in a buffer
+@cindex Cookie
+@cindex Nodal data
+
+If you want to have structured nodal data in a buffer, the cookie
+package can be a help to you.
+
+Cookie is a package that implements a connection between a
+dll (a doubly linked list) and the contents of a buffer.
+Possible uses are @code{dired} (have all files in a list, and show them),
+@code{buffer-list}, @code{kom-prioritize} (in the LysKOM elisp client) and
+others.  The CVS control package @file{pcl-cvs.el} uses @file{cookie.el}.
+
+@menu
+* Cookie terminology::          Introduction to cookies.
+* Cookie conventions::          Coding conventions used in the cookie package.
+* Collection::                  Manipulating the entire collection.
+* Inserting cookies::           Inserting cookies in the collection.
+* Tins and cookies::            Tins and cookies.
+* Deleting cookies::            Deleting cookies.
+* Collection as a DLL::         Treating the collection as a 
+                                  doubly linked list.
+* Scanning the list::           Scanning the list.
+* In the buffer::               Operations that affect the buffer.
+* Debugging cookie applications::  Debugging cookie applications
+@end menu
+
+@node Cookie terminology, Cookie conventions, Cookie package, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Introduction to cookie terminology
+@cindex Cookie definitions
+@cindex Collection
+@cindex Tin
+
+The cookie package uses its own terminology.  Here are some important
+definitions.
+
+@table @dfn
+@item cookie
+A @dfn{cookie} can be any lisp object.  When you use the cookie
+package you specify a pretty-printer, a function that inserts
+a printable representation of the cookie in the buffer.
+
+@item collection
+
+A @dfn{collection} consists of a doubly linked list of
+cookies, a header, a footer and a pretty-printer.  It is
+displayed at a certain point in a certain buffer.  (The
+buffer and point are selected when the collection is
+created).  The header and the footer are constant strings.
+They appear before and after the cookies.  (Currently,
+once set, they can not be changed).
+
+@item tin
+A @dfn{tin} is an object that contains one cookie.  There
+are functions in this package that given a tin extracts
+the cookie, or gives the next or previous tin.  (All tins
+are linked together in a doubly linked list.  The
+previous tin is the one that appears before the other in
+the buffer.)  You should not do anything with a tin except
+pass it to the functions in this package.
+
+@end table
+
+Cookie does not affect the mode of the buffer in any way.
+It merely makes it easy to connect an underlying data
+representation to the buffer contents.
+
+A collection is a very dynamic thing.  You can easily add or
+delete cookies.  You can sort all cookies in a collection (you
+have to supply a function that compares two cookies).  You can
+apply a function to all cookies in a collection, etc, etc.
+
+Remember that a cookie can be anything.  Your imagination is the
+limit!  It is even possible to have another collection as a
+cookie.  In that way some kind of tree hierarchy can be created.
+
+@node Cookie conventions, Collection, Cookie terminology, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Coding conventions used in the cookie package
+@cindex Cookie conventions
+@cindex Prefixes
+
+All functions that are intended for external use begin
+with one of the prefixes @samp{cookie-},
+@samp{collection-} or @samp{tin-}.  The prefix
+@samp{elib-} is used for internal functions
+and macros.  Currently, no global or buffer-local
+variables are used.
+
+Many functions operate on tins instead of cookies.  For
+most functions, the prefix used should help tell which
+kind of object the function uses.
+
+Most doc-strings contains an "Args:" line that lists the
+arguments.
+
+@node Collection, Inserting cookies, Cookie conventions, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Manipulating the entire collection
+
+@table @code
+@item (collection-create buffer pretty-printer &optional header footer pos)
+@findex collection-create
+Create a collection that is displayed in @var{buffer}.
+@var{buffer} may be a buffer or a buffer name. It is created if
+it does not exist.
+
+@var{pretty-printer} should be a function that takes one
+argument, a cookie, and inserts a string representing it
+in the buffer (at point). The string @var{pretty-printer}
+inserts may be empty or span several lines. A trailing
+newline will always be inserted automatically. The
+@var{pretty-printer} should use @code{insert}, and not
+@code{insert-before-markers}.
+
+Optional third argument @var{header} is a string that will
+always be present at the top of the collection.
+@var{header} should end with a newline.  Optionaly fourth
+argument @var{footer} is similar, and will always be
+inserted at the bottom of the collection.
+
+Optional fifth argument @var{pos} is a buffer position,
+specifying where the collection will be inserted.  It
+defaults to the begining of the buffer.  @var{pos} will probably default
+to the current value of @code{(point)} in future releases of Elib, so
+you should not depend on this default in cases where it matters.
+
+@item (collection-empty collection)
+@findex collection-empty
+Return true if there are no cookies in @var{collection}.
+
+@item (collection-length collection)
+@findex collection-length
+Return the number of cookies in @var{collection}.
+
+@item (collection-list-cookies collection)
+@findex collection-list-cookies
+Return a list of all cookies in @var{collection}.
+@end table
+
+@node Inserting cookies, Tins and cookies, Collection, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Inserting cookies in the collection
+
+These functions can be used to insert one or more cookies
+into a collection.  The printed representation will
+immediately and automatically be updated by the cookie
+package.  (It will call the pretty-printer that was
+specified to @code{collection-create}).
+
+@table @code
+@item (cookie-enter-first collection cookie)
+@findex cookie-enter-first
+Enter @var{cookie} first in the cookie collection @var{collection}.
+
+@item (cookie-enter-last collection cookie)
+@findex cookie-enter-last
+Enter @var{cookie} last in the cookie collection @var{collection}.
+
+@item (cookie-enter-after-tin collection tin cookie)
+@findex cookie-enter-after-tin
+Enter @var{cookie} into @var{collection}, immediately
+after @var{tin}.
+
+@item (cookie-enter-before-tin collection tin cookie)
+@findex cookie-enter-before-tin
+Enter @var{cookie} into @var{collection}, immediately
+before @var{tin}.
+
+@item (collection-append-cookies (collection cookie-list))
+@findex collection-append-cookies
+Insert all cookies in the list @var{cookie-list} last in
+@var{collection}.
+@end table
+
+@node Tins and cookies, Deleting cookies, Inserting cookies, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Tins and cookies
+
+@table @code
+@item (tin-cookie collection tin)
+@findex tin-cookie
+This function can be used to extract a cookie from
+@var{tin}.  The collection that @var{tin} is present in
+must also be specified as @var{collection}.
+@end table
+
+@node Deleting cookies, Collection as a DLL, Tins and cookies, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Deleting cookies
+
+There are a couple of different ways to delete cookies
+from the collection.
+
+@table @code
+@item (tin-delete collection tin)
+@findex tin-delete
+Delete @var{tin} from @var{collection}. The cookie that is
+stored in @var{tin} is returned.
+
+@item (cookie-delete-first collection)
+@findex cookie-delete-first
+Delete first cookie in @var{collection} and return it.
+Returns @code{nil} if there are no cookies left in
+@var{collection}.
+
+@item (cookie-delete-last collection)
+@findex cookie-delete-last
+Delete last cookie in @var{collection} and return it.
+Returns @code{nil} if there are no cookies left in
+@var{collection}.
+@end table
+
+The following two functions can be used to delete several
+cookies that fulfills certain criteria.
+
+@table @code
+@item (collection-filter-cookies collection predicate &rest extra-args)
+@findex collection-filter-cookies
+Remove all cookies in @var{collection} for which
+@var{predicate} returns nil.  Note that the buffer for
+@var{collection} will be current-buffer when
+@var{predicate} is called. @var{predicate} must restore
+the current buffer before it returns if it changes it.
+
+The @var{predicate} is called with @var{cookie} as its
+first argument. If any @var{extra-args} are given to
+@code{collection-filter-cookies} they will be passed
+unmodified to @var{predicate}.
+
+@item (collection-filter-tins collection predicate &rest extra-args)
+@findex collection-filter-tins
+This is like @code{collection-filter-cookies}, but
+@var{predicate} is called with a tin instead of a cookie.
+@end table
+
+And finally, a way to delete all cookies in one swift
+function call:
+
+@table @code
+@item (collection-clear collection)
+@findex collection-clear
+Remove all cookies in @var{collection}.
+@end table
+
+@node Collection as a DLL, Scanning the list, Deleting cookies, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Collection as a Doubly linked list
+
+The functions in this section treat the collection as a
+doubly linked list.
+
+@table @code
+@item (tin-nth collection n)
+@findex tin-nth
+Return the @var{n}th tin.  @var{n} counts from zero.
+@code{nil} is returned if there is less than @var{n}
+cookies.  If @var{n} is negative, return the
+-(@var{n}+1)th last element.  Thus, @code{(tin-nth dll 0)}
+returns the first node, and @code{(tin-nth dll -1)}
+returns the last node.
+
+Use @code{tin-cookie} to extract the cookie from the tin (or use
+@code{cookie-nth} instead).
+
+@item (cookie-nth collection n)
+@findex cookie-nth
+Like @code{tin-nth}, but the cookie is returned instead of
+the tin.
+
+@item (tin-next collection tin)
+@findex tin-next
+Get the next tin.  Returns nil if @var{tin} is @code{nil}
+or refers to the last cookie in @var{collection}.
+
+@item (tin-previous collection tin)
+@findex tin-previous
+Get the previous tin.  Returns nil if @var{tin} is
+@code{nil} or refers to the first cookie in
+@var{collection}.
+
+@item (cookie-sort collection predicate)
+@findex cookie-sort
+Sort the cookies in @var{collection}, stably, comparing
+elements using @var{predicate}.  @var{predicate} is called
+with two cookies, and should return @samp{t} if the first
+cookie is @dfn{less} than the second.
+
+The screen representaion of the collection will refreshed after the sort
+is complete.
+
+@item (cookie-first collection)
+@findex cookie-first
+Return the first cookie in @var{collection}. The cookie is
+not removed.
+
+@item (cookie-last collection)
+@findex cookie-last
+Return the last cookie in @var{collection}. The cookie is
+not removed.
+@end table
+
+@node Scanning the list, In the buffer, Collection as a DLL, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Scanning the list
+
+@table @code
+@item (cookie-map map-function collection &rest map-args)
+@findex cookie-map
+Apply @var{map-function} to all cookies in
+@var{collection}.  @var{map-function} is applied to the
+first element first.  If @var{map-function} returns
+non-@code{nil} the cookie will be refreshed (its
+pretty-printer will be called once again).
+
+Note that the buffer for @var{collection} will be current
+buffer when @var{map-function} is called.
+@var{map-function} must restore the current buffer to
+@var{buffer} before it returns, if it changes it.
+
+If more than two arguments are given to @code{cookie-map}, remaining
+arguments will be passed to @var{map-function}.
+
+@item (cookie-map-reverse map-function collection &rest map-args)
+@findex cookie-map-reverse
+Like @code{cookie-map}, but @var{map-function} will be
+applied to the last cookie first.
+
+@item (collection-collect-tin collection predicate &rest predicate-args)
+@findex collection-collect-tin
+Select cookies from @var{collection} using @var{predicate}.
+Return a list of all selected tins.
+
+@var{predicate} is a function that takes a cookie as its
+first argument.
+
+The tins on the returned list will appear in the same
+order as in the buffer.  You should not rely on in which
+order @var{predicate} is called.
+
+Note that the buffer the @var{collection} is displayed in
+is current-buffer when @var{predicate} is called.
+@var{predicate} must restore current-buffer if it changes
+it.
+
+If more than two arguments are given to
+@code{collection-collect-tin} the remaining arguments will
+be passed to @var{predicate}.
+
+@item (collection-collect-cookie collection predicate &rest predicate-args)
+@findex collection-collect-cookie
+Like @code{collection-collect-tin}, but a list of cookies
+is returned.
+@end table
+
+@node In the buffer, Debugging cookie applications, Scanning the list, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Operations that affect the buffer
+
+@table @code
+@item (collection-buffer collection)
+@findex collection-buffer
+Return the buffer that @var{collection} is displayed in.
+
+@item (collection-refresh collection)
+@findex collection-refresh
+Refresh all cookies in @var{collection}.
+
+The pretty-printer that was specified when the
+@var{collection} was created will be called for all
+cookies in @var{collection}.
+
+Note that @code{tin-invalidate} is more efficient if only
+a small number of cookies needs to be refreshed.
+
+@item (tin-invalidate collection &rest tins)
+@findex tin-invalidate
+Refresh some cookies.  The pretty-printer for
+@var{collection} will be called for all @var{tins}.
+
+@item (collection-set-goal-column collection goal)
+@findex collection-set-goal-column
+Set goal-column for @var{collection}.  goal-column is made buffer-local.
+This function will be obsoleted in the next release of Elib.  Instead,
+there is going to be a function that given a cookie will return a
+position where the cursor should be stored.  The details are not yet
+decided.
+
+@item (tin-goto-previous collection pos arg)
+@findex tin-goto-previous
+Move point to the @var{arg}th previous cookie.  Don't move if we are at
+the first cookie, or if @var{collection} is empty.  Returns the tin we
+move to.
+
+@item (tin-goto-next collection pos arg)
+@findex tin-goto-next
+Like @code{tin-goto-previous}, but move towards the end of
+the buffer instead.
+
+@item (tin-goto collection tin)
+@findex tin-goto
+Move point to @var{tin}.
+
+@item (tin-locate collection pos &optional guess)
+@findex tin-locate
+Return the tin that @var{pos} (a buffer position) is within.
+
+@var{pos} may be a marker or an integer.  @var{guess}
+should be a tin that it is likely that @var{pos} is near.
+
+If @var{pos} points before the first cookie, the first
+cookie is returned.  If @var{pos} points after the last
+cookie, the last cookie is returned.  If @var{collection}
+is empty, @code{nil} is returned.
+@end table
+
+@node Debugging cookie applications,  , In the buffer, Cookie package
+@comment  node-name,  next,  previous,  up
+@section Debugging cookie applications
+
+Since the cookie package uses dll, cookie applications can be hard to
+debug.  Fortunately, the same technique can be used here---just load
+dll-debug prior to loading cookie. @xref{Debugging dll applications}.
+
+@emph{Warning!}  Don't load a byte-compiled @file{cookie.elc} that was
+compiled using dll (as opposed to dll-debug) when you have dll-debug in
+memory.  Your Emacs will be seriously confused.
+
+@node     String functions, Read functions, Cookie package, Top
+@comment  node-name,  next,  previous,  up
+@chapter String functions
+@cindex String functions
+@cindex string
+
+To use the string functions in Elib you have to put the following line
+into your elisp source file:  
+
+@example
+(require 'string)
+@end example
+
+The following string functions are provided with Elib.
+
+@table @code
+@item (string-replace-match regexp string newtext &optional literal global)
+@findex string-replace-match
+
+This function tries to be a string near-equivalent to the elisp function
+@code{replace-match}.  It returns a string with the first text matched
+by @var{regexp} in @var{string} replaced by @var{newtext}.  If no match
+is found, @code{nil} is returned.  If optional argument @var{global} is
+non-@code{nil}, all occurances matching @var{regexp} are replaced
+instead of only the first one.
+
+If optional argument @var{literal} is non-@code{nil}, then @var{newtext}
+is inserted exactly as it is.  If it is @code{nil} (which is the
+default), then the character @kbd{\} is treated specially.  If a @kbd{\}
+appears in @var{newtext}, it can start any one of the following sequences:
+
+@table @kbd
+@item \&
+@kbd{\&} stands for the entire text being replaced.
+
+@item \@var{n}
+@kbd{\@var{n}} stands for the @var{n}th subexpression in the original regexp.
+Subexpressions are those expressions grouped inside of @code{\(...\)}.
+@var{n} is a digit.
+
+@item \\
+@kbd{\\} stands for a single @kbd{\} in @var{newtext}.
+@end table
+
+Any other character after the @key{\} will just be copied into the
+string. 
+
+@item (string-split pattern string &optional limit)
+
+Split the string @var{string} on the regexp @var{pattern} and return a
+list of the strings between the matches.  If the optional numerical
+argument @var{limit} is >= 1, only the first @var{limit} elements of the list are
+returned.
+
+For example, the call
+
+@example
+(string-split "[ \t]+" "Elisp programming is fun.")
+@end example
+
+will return @code{("Elisp" "programming" "is" "fun.")}, but the call
+
+@example
+(string-split " " "Elisp programming is fun." 3)
+@end example
+
+will return @code{("Elisp" "programming" "is")}.
+
+@end table
+
+@node Read functions, Future enhancements, String functions, Top
+@comment  node-name,  next,  previous,  up
+@chapter Read functions
+@cindex Read functions
+@cindex read
+
+Elib provides a number of functions for reading data from the
+minibuffer.  To use them in your own elisp programs, put the following
+line into you source file:
+
+@example
+(require 'read)
+@end example
+
+The following functions are provided by @file{read}.
+
+@table @code
+@item (read-number &optional prompt default)
+@findex read-number
+Read a number from the minibuffer. If optional argument @var{prompt} is
+non-@code{nil}, the user is prompted using @var{prompt}, otherwise the
+prompt string @code{Enter a number:} is used.  If optional argument
+@var{default} is non-@code{nil}, it is written within parenthesis after
+the prompt string.  @var{default} can be either a number or of the type which
+@code{(interactive "P")} generates.
+
+@item (read-num-range low high &optional prompt show-range)
+@findex read-num-range
+Read a number from the minibuffer.  The number returned will be forced
+to lie between @var{low} and @var{high}.  If @var{prompt} is
+non-@code{nil}, the user is prompted using @var{prompt}, otherwise the
+prompt string @code{Enter a number:} is used.  If @var{show-range} is
+non-@code{nil}, the prompt will show the range within parenthesis to the
+user.
+
+@item (read-silent prompt &optional showchar)
+@findex read-silent
+Read a string in the minibuffer without echoing.  The following
+characters are special when entering the string:
+
+@table @kbd
+@item DEL
+Delete the last character in the input buffer.
+
+@item C-u
+Clear the input buffer.
+
+@item RET
+End the reading of the string.
+
+@item Newline
+Same as @kbd{RET}.
+
+@end table
+
+If optional argument @var{showchar} is non-@code{nil}, one of these characters
+will be displayed for each character input by the user.
+
+This function is well suited to read a password from the user, but
+beware of the function @code{(view-lossage)} which displays the last 100
+keystrokes, even hidden ones.
+
+@end table
+
+
+@node     Future enhancements, Reporting bugs, Read functions, Top
+@comment  node-name,  next,  previous,  up
+@chapter Future enhancements
+@cindex Enhancements
+
+Elib needs a number of enhancements to be
+called complete.  Here is a list of wishes of functions and data
+types which we would like to enter into Elib in future releases:
+
+@itemize @bullet
+@item
+More container data types such as Priority queues, 2-3-trees, Hash
+tables, Sets, etc.  Much inspiration can be gotten from libg++ and the
+standard C++ library, STL.
+
+@item
+Other implementations of old container data types.  For instance, are
+vector implementations of stacks and queues faster than the current ones
+using cons cells?
+
+@item
+Miscellaneous other small functions.
+
+@item
+More tests for all code in the library, especially the untested
+container data types.  See the TODO file.
+@end itemize
+
+
+@section Contributions
+
+We are grateful for all donations of code that we can receive.  However,
+your code will be still more useful if you also provide documentation
+and code to test your new library functions.
+
+
+@node     Reporting bugs, Node index, Future enhancements, Top
+@comment  node-name,  next,  previous,  up
+@chapter Reporting bugs
+@cindex Reporting bugs
+
+Undoubtedly there are numerous bugs remaining, both in the elisp source
+code and in the documentation.  If you find a bug in either, please send
+a bug report to @code{elib-maintainers@@lysator.liu.se}.  We will try to
+be as quick as possible in fixing the bugs and redistributing the fixes.
+
+@ifinfo
+@node    Node index,  , Reporting bugs, Top
+@comment node-name,    next,  previous,      up
+@unnumbered Node index
+
+@printindex cp
+@end ifinfo
+
+@contents
+@bye
diff --git a/site/elib/gpl.texi b/site/elib/gpl.texi
new file mode 100644
index 0000000..5b0da1a
--- /dev/null
+++ b/site/elib/gpl.texi
@@ -0,0 +1,396 @@
+@setfilename gpl.info
+
+@unnumbered GNU GENERAL PUBLIC LICENSE
+@center Version 2, June 1991
+
+@display
+Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
+675 Mass Ave, Cambridge, MA 02139, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+
+@unnumberedsec Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software---to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+@iftex
+@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end iftex
+@ifinfo
+@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end ifinfo
+
+@enumerate
+@item
+This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The ``Program'', below,
+refers to any such program or work, and a ``work based on the Program''
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term ``modification''.)  Each licensee is addressed as ``you''.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+@item
+You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+@item
+You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+@enumerate a
+@item
+You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+@item
+You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+@item
+If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License.  (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+@end enumerate
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+@item
+You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+@enumerate a
+@item
+Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+@item
+Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+@item
+Accompany it with the information you received as to the offer
+to distribute corresponding source code.  (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+@end enumerate
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+@item
+You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+@item
+You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+@item
+Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+@item
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+@item
+If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+@item
+The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and ``any
+later version'', you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+@item
+If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+@iftex
+@heading NO WARRANTY
+@end iftex
+@ifinfo
+@center NO WARRANTY
+@end ifinfo
+
+@item
+BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+@item
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+@end enumerate
+
+@iftex
+@heading END OF TERMS AND CONDITIONS
+@end iftex
+@ifinfo
+@center END OF TERMS AND CONDITIONS
+@end ifinfo
+
+@page
+@unnumberedsec How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the ``copyright'' line and a pointer to where the full notice is found.
+
+@smallexample
+@var{one line to give the program's name and an idea of what it does.}
+Copyright (C) 19@var{yy}  @var{name of author}
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+@end smallexample
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+@smallexample
+Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+type `show w'.  This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c' 
+for details.
+@end smallexample
+
+The hypothetical commands @samp{show w} and @samp{show c} should show
+the appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than @samp{show w} and
+@samp{show c}; they could even be mouse-clicks or menu items---whatever
+suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a ``copyright disclaimer'' for the program, if
+necessary.  Here is a sample; alter the names:
+
+@smallexample
+@group
+Yoyodyne, Inc., hereby disclaims all copyright
+interest in the program `Gnomovision'
+(which makes passes at compilers) written 
+by James Hacker.
+
+@var{signature of Ty Coon}, 1 April 1989
+Ty Coon, President of Vice
+@end group
+@end smallexample
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/site/elib/queue-f.el b/site/elib/queue-f.el
new file mode 100644
index 0000000..d61408b
--- /dev/null
+++ b/site/elib/queue-f.el
@@ -0,0 +1,137 @@
+;;;; $Id: queue-f.el,v 0.8 1995/12/11 00:11:23 ceder Exp $
+;;;; This file implements a simple FIFO queue.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 9 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Author: Inge Wallin
+;;;; 
+
+;;; Commentary:
+
+;;; The queue is implemented as a two cons cell list, the first 
+;;; containing the tag 'QUEUE.  The car of the the second cons
+;;; cell points at the first element of the queue and the cdr points
+;;; at the last.  All entries and removals are done using destructive
+;;; functions.
+;;;
+
+
+;;; Code:
+
+;; Provide the function version and remove the macro version
+(provide 'queue-f)
+(setq features (delq 'queue-m features))
+
+
+;;; ================================================================
+
+
+(defun queue-create ()
+  "Create an empty fifo queue."
+  (cons 'QUEUE (cons nil nil)))
+
+
+(defun queue-p (queue)
+  "Return t if QUEUE is a queue, otherwise return nil."
+  (eq (car-safe queue) 'QUEUE))
+
+
+(defun queue-enqueue (queue element)
+  "Enter an element into a queue.
+Args: QUEUE ELEMENT"
+  (let ((elementcell (cons element nil)))
+    (if (null (car (cdr queue)))
+	;; QUEUE is empty
+	(setcar (cdr queue)
+		(setcdr (cdr queue) 
+			elementcell))
+      (setcdr (cdr (cdr queue))
+	      elementcell)
+      (setcdr (cdr queue)
+	      elementcell))))
+
+
+(defun queue-dequeue (queue)
+  "Remove the first element of QUEUE and return it.
+If QUEUE is empty, return nil and do nothing."
+  (if (not (null (car (cdr queue))))
+      (prog1
+	  (car (car (cdr queue)))
+	(setcar (cdr queue)
+		(cdr (car (cdr queue))))
+	(if (null (car (cdr queue)))
+	    (setcdr (cdr queue) nil)))))
+
+
+(defun queue-empty (queue)
+  "Return t if QUEUE is empty, otherwise return nil."
+  (null (car (cdr queue))))
+
+
+(defun queue-first (queue)
+  "Return the first element of QUEUE or nil if it is empty.
+The element is not removed."
+  (car-safe (car (cdr queue))))
+
+
+(defun queue-nth (queue n)
+  "Return the nth element of a queue, but don't remove it.
+Args: QUEUE N
+If the length of the queue is less than N, return nil.
+
+The oldest element (the first one) has number 0."
+  (nth n (car (cdr queue))))
+
+
+(defun queue-last (queue)
+  "Return the last element of QUEUE or nil if it is empty."
+  (car-safe (cdr (cdr queue))))
+
+
+(defun queue-all (queue)
+  "Return a list of all elements of QUEUE or nil if it is empty.
+The oldest element in the queue is the first in the list."
+  (car (cdr queue)))
+
+
+(defun queue-copy (queue)
+  "Return a copy of QUEUE.  All entries in QUEUE are also copied."
+  (let* ((first  (copy-sequence (car (cdr queue))))
+	 (last first))
+    (while (cdr last)
+      (setq last (cdr last)))
+    (cons 'QUEUE (cons first last))))
+
+
+(defun queue-length (queue)
+  "Return the number of elements in QUEUE."
+  (length (car (cdr queue))))
+
+
+(defun queue-clear (queue)
+  "Remove all elements from QUEUE."
+  (setcdr queue (cons nil nil)))
+
+;;; queue-f.el ends here
diff --git a/site/elib/queue-m.el b/site/elib/queue-m.el
new file mode 100644
index 0000000..4a0f88f
--- /dev/null
+++ b/site/elib/queue-m.el
@@ -0,0 +1,141 @@
+;;;; $Id: queue-m.el,v 0.8 1995/12/11 00:11:26 ceder Exp $
+;;;; This file implements a simple FIFO queue using macros.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 12 May 1991
+;; Keywords: extensions, lisp
+
+;;;;
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Author: Inge Wallin
+;;;; 
+
+;;; Commentary:
+
+;;; The queue is implemented as a two cons cell list, the first 
+;;; containing the tag 'QUEUE.  The car of the the second cons
+;;; cell points at the first element of the queue and the cdr points
+;;; at the last.  All entries and removals are done using destructive
+;;; functions.
+;;;
+;;; This file implements the short functions as macros for speed in 
+;;; compiled code.
+;;;
+
+
+;;; Code:
+
+;; Provide the function version and remove the macro version
+(provide 'queue-m)
+(setq features (delq 'queue-f features))
+
+
+;;; ================================================================
+
+
+(defmacro queue-create ()
+  "Create an empty fifo queue."
+  (` (cons 'QUEUE (cons nil nil))))
+
+
+(defmacro queue-p (queue)
+  "Return t if QUEUE is a queue, otherwise return nil."
+  (` (eq (car-safe (, queue)) 'QUEUE)))
+
+
+(defun queue-enqueue (queue element)
+  "Enter an element into a queue.
+Args: QUEUE ELEMENT"
+  (let ((elementcell (cons element nil)))
+    (if (null (car (cdr queue)))
+	;; QUEUE is empty
+	(setcar (cdr queue)
+		(setcdr (cdr queue) 
+			elementcell))
+      (setcdr (cdr (cdr queue))
+	      elementcell)
+      (setcdr (cdr queue)
+	      elementcell))))
+
+
+(defun queue-dequeue (queue)
+  "Remove the first element of QUEUE and return it.
+If QUEUE is empty, return nil and do nothing."
+  (if (not (null (car (cdr queue))))
+      (prog1
+	  (car (car (cdr queue)))
+	(setcar (cdr queue)
+		(cdr (car (cdr queue))))
+	(if (null (car (cdr queue)))
+	    (setcdr (cdr queue) nil)))))
+
+
+(defmacro queue-empty (queue)
+  "Return t if QUEUE is empty, otherwise return nil."
+  (` (null (car (cdr (, queue))))))
+
+
+(defmacro queue-first (queue)
+  "Return the first element of QUEUE or nil if it is empty.
+The element is not removed."
+  (` (car-safe (car (cdr (, queue))))))
+
+
+(defmacro queue-nth (queue n)
+  "Return the nth element of a queue, but don't remove it.
+Args: QUEUE N
+If the length of the queue is less than N, return nil.
+
+The oldest element (the first one) has number 0."
+  (` (nth (, n) (car (cdr (, queue))))))
+
+
+(defmacro queue-last (queue)
+  "Return the last element of QUEUE or nil if it is empty."
+  (` (car-safe (cdr (cdr (, queue))))))
+
+
+(defmacro queue-all (queue)
+  "Return a list of all elements of QUEUE or nil if it is empty.
+The oldest element in the queue is the first in the list."
+  (` (car (cdr (, queue)))))
+
+
+(defun queue-copy (queue)
+  "Return a copy of QUEUE.  All entries in QUEUE are also copied."
+  (let* ((first  (copy-sequence (car (cdr queue))))
+	 (last first))
+    (while (cdr last)
+      (setq last (cdr last)))
+    (cons 'QUEUE (cons first last))))
+
+
+(defmacro queue-length (queue)
+  "Return the number of elements in QUEUE."
+  (` (length (car (cdr (, queue))))))
+
+
+(defmacro queue-clear (queue)
+  "Remove all elements from QUEUE."
+  (` (setcdr (, queue) (cons nil nil))))
+
+;;; queue-m.el ends here
diff --git a/site/elib/read.el b/site/elib/read.el
new file mode 100644
index 0000000..d3bab70
--- /dev/null
+++ b/site/elib/read.el
@@ -0,0 +1,123 @@
+;;;; $Id: read.el,v 0.8 1995/12/11 00:11:29 ceder Exp $
+;;;; This file contains a number of functions for reading from the
+;;;; minibuffer.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;;	Lars Willför <willfor@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 11 May 1991
+;; Keywords: extensions, lisp
+
+;;;;
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Authors: Inge Wallin, Lars Willf|r
+;;;;
+
+
+(provide 'read)
+
+;;; Code:
+
+(defun read-number (&optional prompt default)
+  "Read a number from the minibuffer. 
+Optional arguments: PROMPT DEFAULT.
+
+If DEFAULT is non-nil, it is written within parenthesis after the prompt.
+DEFAULT can be either a number, or of the type which `(interactive P)'
+generates." 
+  (let ((numdefault (cond ((null default) nil)
+			  ((integerp default) default)
+			  ((listp default) (car default))
+			  (t nil)))
+	(number nil)
+	(numstr nil))
+
+    (while (not number)
+      (setq numstr (read-string
+		    (concat (if prompt 
+				prompt
+			      "Enter a number: ")
+			    (if numdefault 
+				(format "(%d) " numdefault)))))
+      (cond ((and (string= numstr "") 
+		  numdefault)
+	     (setq number numdefault))
+	    ((string-match "\\`[0-9]+\\'" numstr)
+	     (setq number (string-to-int numstr)))
+	    (t (beep))))
+    number))
+
+
+(defun read-num-range (low high &optional prompt show-range)
+  "Read a number within an interval from the minibuffer.
+Args: LOW HIGH &optional PROMPT SHOW-RANGE.
+
+The number read must be within the range [LOW HIGH].
+If SHOW-RANGE is non-nil, the prompt will include the range for information
+to the user."
+  (let ((number (1- low)))
+    (while (or (< number low)
+	       (> number high))
+      (setq number (read-number 
+		    (concat (if prompt
+				prompt
+			      "Enter a number: ")
+			    (if show-range
+				(format "(%d-%d) " low high)
+			      "")))))
+    number))
+
+
+(defun read-silent (prompt &optional outchar)
+  "Read a string in the minibuffer without echoing.
+Args: PROMPT &optional OUTCHAR.
+
+For each character the user writes, one OUTCHAR is displayed."
+  (message prompt)
+  (let ((input-string "")
+	(input-char)
+	(cursor-in-echo-area t)
+	(showstring ""))
+    (while (not (or (eq (setq input-char (read-char)) ?\r)
+		    (eq input-char ?\n)))
+      (cond
+       ((eq input-char ?\C-?)
+	(if (equal (length input-string)
+		   0)
+	    nil
+	  (setq showstring (substring showstring 0 -1))
+	  (setq input-string (substring input-string 0 -1))))
+       ((eq input-char ?\C-u)
+	(setq showstring "")
+	(setq input-string ""))
+       (t
+	(if outchar
+	    (setq showstring 
+		  (concat showstring (char-to-string outchar))))
+	(setq input-string
+	      (concat input-string (char-to-string input-char)))))
+      (message (concat prompt (if outchar
+				  showstring
+				nil))))
+    (message "")
+    input-string))
+
+;; read.el ends here
diff --git a/site/elib/stack-f.el b/site/elib/stack-f.el
new file mode 100644
index 0000000..a6524eb
--- /dev/null
+++ b/site/elib/stack-f.el
@@ -0,0 +1,113 @@
+;;;; $Id: stack-f.el,v 0.8 1995/12/11 00:11:31 ceder Exp $
+;;;; This file implements a simple LIFO stack.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 9 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;;
+;;;; Author: Inge Wallin
+;;;; 
+
+;;; Commentary:
+
+;;; The stack is implemented as a linked list with a tag 'STACK
+;;; as the first element.  All entries and removals are done using
+;;; destructive functions.
+;;;
+
+;;; Code:
+
+;; Provide the function version and remove the macro version.
+
+(provide 'stack-f)
+(setq features (delq 'stack-m features))
+
+
+;;; ================================================================
+
+
+(defun stack-create ()
+  "Create an empty lifo stack."
+  (cons 'STACK nil))
+
+
+(defun stack-p (stack)
+  "Return t if STACK is a stack, otherwise return nil."
+  (eq (car-safe stack) 'STACK))
+
+
+(defun stack-push (stack element)
+  "Push an element onto the stack.
+Args: STACK ELEMENT"
+  (setcdr stack (cons element (cdr stack))))
+
+
+(defun stack-pop (stack)
+  "Remove the topmost element from STACK and return it. 
+If the stack is empty, return nil."
+  (prog1
+      (car-safe (cdr stack))
+    (setcdr stack (cdr-safe (cdr stack)))))
+
+
+(defun stack-empty (stack)
+  "Return t if STACK is empty, otherwise return nil."
+  (null (cdr stack)))
+
+
+(defun stack-top (stack)
+  "Return the topmost element of STACK or nil if it is empty."
+  (car-safe (cdr stack)))
+
+
+(defun stack-nth (stack n)
+  "Return nth element of a stack, but don't remove it.
+Args: STACK N
+If the length of the stack is less than N, return nil.
+
+The top stack element has number 0."
+  (nth n (cdr stack)))
+
+
+(defun stack-all (stack)
+  "Return a list of all entries in STACK.
+The element last pushed is first in the list."
+  (cdr stack))
+
+
+(defun stack-copy (stack)
+  "Return a copy of STACK.
+All entries in STACK are also copied."
+  (cons 'STACK (copy-sequence (cdr stack))))
+
+
+(defun stack-length (stack)
+  "Return the number of elements on STACK."
+  (length (cdr stack)))
+
+
+(defun stack-clear (stack)
+  "Remove all elements from STACK."
+  (setcdr stack nil))
+
+;;; stack-f.el ends here
diff --git a/site/elib/stack-m.el b/site/elib/stack-m.el
new file mode 100644
index 0000000..c5655cc
--- /dev/null
+++ b/site/elib/stack-m.el
@@ -0,0 +1,116 @@
+;;;; $Id: stack-m.el,v 0.8 1995/12/11 00:11:34 ceder Exp $
+;;;; This file implements a simple LIFO stack using macros.
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: 12 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;; 
+;;;; Author: Inge Wallin
+;;;; 
+
+;;; Commentary:
+
+;;; The stack is implemented as a linked list with a tag 'STACK
+;;; as the first element.  All entries and removals are done using
+;;; destructive functions.
+;;;
+;;; This file implements the functions as macros for speed in compiled 
+;;; code.
+;;;
+
+
+;;; Code:
+
+;; Provide the function version and remove the macro version
+(provide 'stack-m)
+(setq features (delq 'stack-f features))
+
+
+;;; ================================================================
+
+
+(defmacro stack-create ()
+  "Create an empty lifo stack."
+  (` (cons 'STACK nil)))
+
+
+(defmacro stack-p (stack)
+  "Return t if STACK is a stack, otherwise return nil."
+  (` (eq (car-safe (, stack)) 'STACK)))
+
+
+(defmacro stack-push (stack element)
+  "Push an element onto the stack.
+Args: STACK ELEMENT"
+  (` (setcdr (, stack) (cons (, element) (cdr (, stack))))))
+
+
+(defmacro stack-pop (stack)
+  "Remove the topmost element from STACK and return it. 
+If the stack is empty, return nil."
+  (` (prog1
+	 (car-safe (cdr (, stack)))
+       (setcdr (, stack) (cdr-safe (cdr (, stack)))))))
+
+
+(defmacro stack-empty (stack)
+  "Return t if STACK is empty, otherwise return nil."
+  (` (null (cdr (, stack)))))
+
+
+(defmacro stack-top (stack)
+  "Return the topmost element of STACK or nil if it is empty."
+  (` (car-safe (cdr (, stack)))))
+
+
+(defmacro stack-nth (stack n)
+  "Return nth element of a stack, but don't remove it.
+Args: STACK N
+If the length of the stack is less than N, return nil.
+
+The top stack element has number 0."
+  (` (nth (, n) (cdr (, stack)))))
+
+
+(defmacro stack-all (stack)
+  "Return a list of all entries in STACK.
+The element last pushed is first in the list."
+  (` (cdr (, stack))))
+
+
+(defmacro stack-copy (stack)
+  "Return a copy of STACK.
+All entries in STACK are also copied."
+  (` (cons 'STACK (copy-sequence (cdr (, stack))))))
+
+
+(defmacro stack-length (stack)
+  "Return the number of elements on STACK."
+  (` (length (cdr (, stack)))))
+
+
+(defmacro stack-clear (stack)
+  "Remove all elements from STACK."
+  (` (setcdr (, stack) nil)))
+
+;;; stack-m.el ends here
diff --git a/site/elib/startup-template.el b/site/elib/startup-template.el
new file mode 100644
index 0000000..181fdb1
--- /dev/null
+++ b/site/elib/startup-template.el
@@ -0,0 +1,4 @@
+;;; $Id: startup-template.el,v 0.5 1993/05/31 23:49:29 ceder Exp $
+;;; Support for the elisp library elib.
+(setq load-path (append (list ELIB_PATH)
+			load-path))
diff --git a/site/elib/string.el b/site/elib/string.el
new file mode 100644
index 0000000..0edd69f
--- /dev/null
+++ b/site/elib/string.el
@@ -0,0 +1,160 @@
+;;;; $Id: string.el,v 0.11 1995/12/11 00:11:37 ceder Exp $
+;;;; This file contains some miscellaneous string functions
+
+;; Copyright (C) 1991-1995 Free Software Foundation
+
+;; Author: Sebastian Kremer <sk@thp.Uni-Koeln.DE>
+;;	Per Cederqvist <ceder@lysator.liu.se>
+;;	Inge Wallin <inge@lysator.liu.se>
+;; Maintainer: elib-maintainers@lysator.liu.se
+;; Created: before 9 May 1991
+;; Keywords: extensions, lisp
+
+;;;; This file is part of the GNU Emacs lisp library, Elib.
+;;;;
+;;;; GNU Elib is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; GNU Elib is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GNU Elib; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;;;; Boston, MA 02111-1307, USA
+;;;; 
+;;;; Author: Sebastian Kremer
+;;;;         sk@thp.Uni-Koeln.DE
+;;;; 
+
+
+;;; Commentary:
+
+;;;
+;;; This file is part of the elisp library Elib.
+;;; It implements simple generic string functions for use in other 
+;;; elisp code: replace regexps in strings, split strings on regexps.
+;;; 
+
+
+;;; Code:
+
+(provide 'string)
+
+
+;; This function is a near-equivalent of the elisp function replace-match
+;; which work on strings instead of a buffer.  The FIXEDCASE parameter
+;; of replace-match is not implemented.
+
+(defun string-replace-match (regexp string newtext &optional literal global)
+  "Replace first match of REGEXP in STRING with NEWTEXT.
+If no match is found, nil is returned instead of the new string.
+
+Optional arg LITERAL non-nil means to take NEWTEXT literally. If LITERAL is 
+nil, character `\\' is the start of one of the following sequences:
+  \\\\   will be replaced by a single \\.
+  \\&   will be replaced by the text which matched the regexp.
+  \\N   where N is a number and 1 <= N <= 9, will be replaced
+       by the Nth subexpression in REGEXP. Subexpressions are grouped
+       inside \\( \\).
+
+Optional arg GLOBAL means to replace all matches instead of only the first."
+
+  (let ((data (match-data)))
+    (unwind-protect
+
+	(if global
+	    (let ((result "") 
+		  (start 0)
+		  matchbeginning
+		  matchend)
+	      (while (string-match regexp string start)
+		(setq matchbeginning (match-beginning 0)
+		      matchend (match-end 0)
+		      result (concat result
+				     (substring string start matchbeginning)
+				     (if literal
+					 newtext
+				       (elib-string-expand-newtext)))
+		      start matchend))
+
+	      (if matchbeginning	; matched at least once
+		  (concat result (substring string start))
+		nil))
+
+	  ;; not GLOBAL
+	  (if (not (string-match regexp string 0))
+	      nil
+	    (concat (substring string 0 (match-beginning 0))
+		    (if literal newtext (elib-string-expand-newtext))
+		    (substring string (match-end 0)))))
+      (store-match-data data))))
+
+
+(defun elib-string-expand-newtext ()
+  ;; Expand \& and \1..\9 (referring to STRING) in NEWTEXT.
+  ;; Uses match data and fluid vars `newtext', `string'.
+  ;; Note that in Emacs 18 match data are clipped to current buffer
+  ;; size...so the buffer should better not be smaller than STRING.
+  (let ((pos 0)
+	(len (length newtext))
+	(expanded-newtext ""))
+    (while (< pos len)
+      (setq expanded-newtext
+	    (concat expanded-newtext
+		    (let ((c (aref newtext pos)))
+		      (if (= ?\\ c)
+			  (cond ((= ?\& (setq c (aref newtext
+						      (setq pos (1+ pos)))))
+				 (substring string
+					    (match-beginning 0)
+					    (match-end 0)))
+				((and (>= c ?1) 
+				      (<= c ?9))
+				 ;; return empty string if N'th
+				 ;; sub-regexp did not match:
+				 (let ((n (- c ?0)))
+				   (if (match-beginning n)
+				       (substring string
+						  (match-beginning n)
+						  (match-end n))
+				     "")))
+				(t (char-to-string c)))
+			(char-to-string c)))))
+      (setq pos (1+ pos)))
+    expanded-newtext))
+
+
+(defun string-split (pattern string &optional limit)
+  "Splitting on regexp PATTERN, turn string STRING into a list of substrings.
+Optional third arg LIMIT (>= 1) is a limit to the length of the
+resulting list."
+
+  (let ((data (match-data)))
+    (unwind-protect
+	(let* ((start (string-match pattern string))
+	       (result (list (substring string 0 start)))
+	       (count 1)
+	       (end (if start (match-end 0))))
+	  (if end			; else nothing left
+	      (while (and (or (not (integerp limit))
+			      (< count limit))
+			  (string-match pattern string end))
+		(setq start (match-beginning 0)
+		      count (1+ count)
+		      result (cons (substring string end start) result)
+		      end (match-end 0)
+		      start end)))
+	  (if (and (or (not (integerp limit))
+		       (< count limit))
+		   end)			; else nothing left
+	      (setq result
+		    (cons (substring string end) result)))
+	  (nreverse result))
+      (store-match-data data))))
+
+;;; string.el ends here
diff --git a/site/git-emacs/Makefile b/site/git-emacs/Makefile
new file mode 100644
index 0000000..3d908e8
--- /dev/null
+++ b/site/git-emacs/Makefile
@@ -0,0 +1,34 @@
+# Simple makefile. We make no particular effort to optimize dependencies,
+# since compiling all files in a run is very fast anyway.
+
+# This might not be needed on newer emacs versions, but it doesn't hurt.
+# Note: newer git doesn't ship vc-git since it's been included in emacs,
+# but that's only v23+. Oops. If that's your situation, add a path to
+# your vc-git.el here (I store mine in .emacs.d now).
+VC_GIT_PATH="-L /usr/share/doc/git-core/contrib/emacs -L ~/.emacs.d/"
+
+EMACS_BATCH=emacs -Q --batch "$(VC_GIT_PATH)" -L .
+
+.PHONY: all compile tags test clean
+
+all: compile tags test
+
+compile: *.el
+	@echo; echo ">>> Compiling"
+	rm -f *.elc
+	$(EMACS_BATCH) -f batch-byte-compile *.el
+
+tags: *.el
+	@echo; echo ">>> Updating tags"
+	etags *.el
+
+test: *.el
+	@echo; echo ">>> Running tests"
+	$(EMACS_BATCH) -l git--test.el -f git-regression
+	@echo; echo "Testing autoloads..."
+	$(EMACS_BATCH) --eval "(require 'git-emacs-autoloads)" \
+	  --visit "Makefile" \
+	  --eval "(unless (functionp 'git-diff-baseline) (error \"autoload malfunctioned\"))"
+
+clean:
+	rm -f *.elc
diff --git a/site/git-emacs/docs/branch1.png b/site/git-emacs/docs/branch1.png
new file mode 100644
index 0000000..324fd0d
Binary files /dev/null and b/site/git-emacs/docs/branch1.png differ
diff --git a/site/git-emacs/docs/branch10.png b/site/git-emacs/docs/branch10.png
new file mode 100644
index 0000000..d81e0cf
Binary files /dev/null and b/site/git-emacs/docs/branch10.png differ
diff --git a/site/git-emacs/docs/branch11.png b/site/git-emacs/docs/branch11.png
new file mode 100644
index 0000000..25e4a86
Binary files /dev/null and b/site/git-emacs/docs/branch11.png differ
diff --git a/site/git-emacs/docs/branch2.png b/site/git-emacs/docs/branch2.png
new file mode 100644
index 0000000..ccb99a1
Binary files /dev/null and b/site/git-emacs/docs/branch2.png differ
diff --git a/site/git-emacs/docs/branch3.png b/site/git-emacs/docs/branch3.png
new file mode 100644
index 0000000..f8543ca
Binary files /dev/null and b/site/git-emacs/docs/branch3.png differ
diff --git a/site/git-emacs/docs/branch4.png b/site/git-emacs/docs/branch4.png
new file mode 100644
index 0000000..a61244b
Binary files /dev/null and b/site/git-emacs/docs/branch4.png differ
diff --git a/site/git-emacs/docs/branch5.png b/site/git-emacs/docs/branch5.png
new file mode 100644
index 0000000..ed8c0b9
Binary files /dev/null and b/site/git-emacs/docs/branch5.png differ
diff --git a/site/git-emacs/docs/branch6.png b/site/git-emacs/docs/branch6.png
new file mode 100644
index 0000000..bf0adde
Binary files /dev/null and b/site/git-emacs/docs/branch6.png differ
diff --git a/site/git-emacs/docs/branch7.png b/site/git-emacs/docs/branch7.png
new file mode 100644
index 0000000..4a42c49
Binary files /dev/null and b/site/git-emacs/docs/branch7.png differ
diff --git a/site/git-emacs/docs/branch8.png b/site/git-emacs/docs/branch8.png
new file mode 100644
index 0000000..89841f0
Binary files /dev/null and b/site/git-emacs/docs/branch8.png differ
diff --git a/site/git-emacs/docs/branch9.png b/site/git-emacs/docs/branch9.png
new file mode 100644
index 0000000..87b6cc2
Binary files /dev/null and b/site/git-emacs/docs/branch9.png differ
diff --git a/site/git-emacs/docs/clone0.png b/site/git-emacs/docs/clone0.png
new file mode 100644
index 0000000..daeaeae
Binary files /dev/null and b/site/git-emacs/docs/clone0.png differ
diff --git a/site/git-emacs/docs/clone1.png b/site/git-emacs/docs/clone1.png
new file mode 100644
index 0000000..73e0f92
Binary files /dev/null and b/site/git-emacs/docs/clone1.png differ
diff --git a/site/git-emacs/docs/clone2.png b/site/git-emacs/docs/clone2.png
new file mode 100644
index 0000000..813b417
Binary files /dev/null and b/site/git-emacs/docs/clone2.png differ
diff --git a/site/git-emacs/docs/clone3.png b/site/git-emacs/docs/clone3.png
new file mode 100644
index 0000000..7991a6d
Binary files /dev/null and b/site/git-emacs/docs/clone3.png differ
diff --git a/site/git-emacs/docs/clone4.png b/site/git-emacs/docs/clone4.png
new file mode 100644
index 0000000..0ae1df9
Binary files /dev/null and b/site/git-emacs/docs/clone4.png differ
diff --git a/site/git-emacs/docs/clone5.png b/site/git-emacs/docs/clone5.png
new file mode 100644
index 0000000..81a5221
Binary files /dev/null and b/site/git-emacs/docs/clone5.png differ
diff --git a/site/git-emacs/docs/commit1.png b/site/git-emacs/docs/commit1.png
new file mode 100644
index 0000000..7a1f919
Binary files /dev/null and b/site/git-emacs/docs/commit1.png differ
diff --git a/site/git-emacs/docs/commit2.png b/site/git-emacs/docs/commit2.png
new file mode 100644
index 0000000..08256cb
Binary files /dev/null and b/site/git-emacs/docs/commit2.png differ
diff --git a/site/git-emacs/docs/commit3.png b/site/git-emacs/docs/commit3.png
new file mode 100644
index 0000000..9476b45
Binary files /dev/null and b/site/git-emacs/docs/commit3.png differ
diff --git a/site/git-emacs/docs/commit4.png b/site/git-emacs/docs/commit4.png
new file mode 100644
index 0000000..67de72f
Binary files /dev/null and b/site/git-emacs/docs/commit4.png differ
diff --git a/site/git-emacs/docs/config-init.png b/site/git-emacs/docs/config-init.png
new file mode 100644
index 0000000..ebfdb4c
Binary files /dev/null and b/site/git-emacs/docs/config-init.png differ
diff --git a/site/git-emacs/docs/config-init2.png b/site/git-emacs/docs/config-init2.png
new file mode 100644
index 0000000..f4748e4
Binary files /dev/null and b/site/git-emacs/docs/config-init2.png differ
diff --git a/site/git-emacs/docs/delete1.png b/site/git-emacs/docs/delete1.png
new file mode 100644
index 0000000..b37f05b
Binary files /dev/null and b/site/git-emacs/docs/delete1.png differ
diff --git a/site/git-emacs/docs/delete2.png b/site/git-emacs/docs/delete2.png
new file mode 100644
index 0000000..5d86c26
Binary files /dev/null and b/site/git-emacs/docs/delete2.png differ
diff --git a/site/git-emacs/docs/diff1.png b/site/git-emacs/docs/diff1.png
new file mode 100644
index 0000000..820f9f9
Binary files /dev/null and b/site/git-emacs/docs/diff1.png differ
diff --git a/site/git-emacs/docs/diff2.png b/site/git-emacs/docs/diff2.png
new file mode 100644
index 0000000..6ad1064
Binary files /dev/null and b/site/git-emacs/docs/diff2.png differ
diff --git a/site/git-emacs/docs/diff3.png b/site/git-emacs/docs/diff3.png
new file mode 100644
index 0000000..f3d7e43
Binary files /dev/null and b/site/git-emacs/docs/diff3.png differ
diff --git a/site/git-emacs/docs/diff4.png b/site/git-emacs/docs/diff4.png
new file mode 100644
index 0000000..7fd38eb
Binary files /dev/null and b/site/git-emacs/docs/diff4.png differ
diff --git a/site/git-emacs/docs/diff5.png b/site/git-emacs/docs/diff5.png
new file mode 100644
index 0000000..b747f50
Binary files /dev/null and b/site/git-emacs/docs/diff5.png differ
diff --git a/site/git-emacs/docs/git-blame.el.html b/site/git-emacs/docs/git-blame.el.html
new file mode 100644
index 0000000..fb55955
--- /dev/null
+++ b/site/git-emacs/docs/git-blame.el.html
@@ -0,0 +1,508 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Created by htmlize-1.34 in css mode. -->
+<html>
+  <head>
+    <title>git-blame.el</title>
+    <style type="text/css">
+    <!--
+      body {
+        color: #000000;
+        background-color: #ffffff;
+      }
+      .builtin {
+        /* font-lock-builtin-face */
+        color: #da70d6;
+      }
+      .comment {
+        /* font-lock-comment-face */
+        color: #b22222;
+      }
+      .comment-delimiter {
+        /* font-lock-comment-delimiter-face */
+        color: #b22222;
+      }
+      .constant {
+        /* font-lock-constant-face */
+        color: #5f9ea0;
+      }
+      .doc {
+        /* font-lock-doc-face */
+        color: #bc8f8f;
+      }
+      .function-name {
+        /* font-lock-function-name-face */
+        color: #0000ff;
+      }
+      .keyword {
+        /* font-lock-keyword-face */
+        color: #a020f0;
+      }
+      .regexp-grouping-backslash {
+        /* font-lock-regexp-grouping-backslash */
+        font-weight: bold;
+      }
+      .regexp-grouping-construct {
+        /* font-lock-regexp-grouping-construct */
+        font-weight: bold;
+      }
+      .string {
+        /* font-lock-string-face */
+        color: #bc8f8f;
+      }
+      .type {
+        /* font-lock-type-face */
+        color: #228b22;
+      }
+      .variable-name {
+        /* font-lock-variable-name-face */
+        color: #b8860b;
+      }
+      .warning {
+        /* font-lock-warning-face */
+        color: #ff0000;
+        font-weight: bold;
+      }
+
+      a {
+        color: inherit;
+        background-color: inherit;
+        font: inherit;
+        text-decoration: inherit;
+      }
+      a:hover {
+        text-decoration: underline;
+      }
+    -->
+    </style>
+  </head>
+  <body>
+    <pre>
+<span class="comment-delimiter">;;; </span><span class="comment">git-blame.el --- Minor mode for incremental blame for Git  -*- coding: utf-8 -*-
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Copyright (C) 2007  David K&#229;gedal
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Authors:    David K&#229;gedal &lt;<a href="mailto:davidk&#64;lysator.liu.se">davidk&#64;lysator.liu.se</a>&gt;
+</span><span class="comment-delimiter">;; </span><span class="comment">Created:    31 Jan 2007
+</span><span class="comment-delimiter">;; </span><span class="comment">Message-ID: &lt;<a href="mailto:87iren2vqx.fsf&#64;morpheus.local">87iren2vqx.fsf&#64;morpheus.local</a>&gt;
+</span><span class="comment-delimiter">;; </span><span class="comment">License:    GPL
+</span><span class="comment-delimiter">;; </span><span class="comment">Keywords:   git, version control, release management
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Compatibility: Emacs21, Emacs22 and EmacsCVS
+</span><span class="comment-delimiter">;;                </span><span class="comment">Git 1.5 and up
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This file is *NOT* part of GNU Emacs.
+</span><span class="comment-delimiter">;; </span><span class="comment">This file is distributed under the same terms as GNU Emacs.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This program is free software; you can redistribute it and/or
+</span><span class="comment-delimiter">;; </span><span class="comment">modify it under the terms of the GNU General Public License as
+</span><span class="comment-delimiter">;; </span><span class="comment">published by the Free Software Foundation; either version 2 of
+</span><span class="comment-delimiter">;; </span><span class="comment">the License, or (at your option) any later version.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This program is distributed in the hope that it will be
+</span><span class="comment-delimiter">;; </span><span class="comment">useful, but WITHOUT ANY WARRANTY; without even the implied
+</span><span class="comment-delimiter">;; </span><span class="comment">warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+</span><span class="comment-delimiter">;; </span><span class="comment">PURPOSE.  See the GNU General Public License for more details.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">You should have received a copy of the GNU General Public
+</span><span class="comment-delimiter">;; </span><span class="comment">License along with this program; if not, write to the Free
+</span><span class="comment-delimiter">;; </span><span class="comment">Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+</span><span class="comment-delimiter">;; </span><span class="comment">MA 02111-1307 USA
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">http://www.fsf.org/copyleft/gpl.html
+</span>
+
+<span class="comment-delimiter">;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</span><span class="comment">
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;; </span><span class="comment">Commentary:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Here is an Emacs implementation of incremental git-blame.  When you
+</span><span class="comment-delimiter">;; </span><span class="comment">turn it on while viewing a file, the editor buffer will be updated by
+</span><span class="comment-delimiter">;; </span><span class="comment">setting the background of individual lines to a color that reflects
+</span><span class="comment-delimiter">;; </span><span class="comment">which commit it comes from.  And when you move around the buffer, a
+</span><span class="comment-delimiter">;; </span><span class="comment">one-line summary will be shown in the echo area.
+</span>
+<span class="comment-delimiter">;;; </span><span class="comment">Installation:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">To use this package, put it somewhere in `</span><span class="comment"><span class="constant">load-path</span></span><span class="comment">' (or add
+</span><span class="comment-delimiter">;; </span><span class="comment">directory with git-blame.el to `</span><span class="comment"><span class="constant">load-path</span></span><span class="comment">'), and add the following
+</span><span class="comment-delimiter">;; </span><span class="comment">line to your .emacs:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;    </span><span class="comment">(require 'git-blame)
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">If you do not want to load this package before it is necessary, you
+</span><span class="comment-delimiter">;; </span><span class="comment">can make use of the `</span><span class="comment"><span class="constant">autoload</span></span><span class="comment">' feature, e.g. by adding to your .emacs
+</span><span class="comment-delimiter">;; </span><span class="comment">the following lines
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;    </span><span class="comment">(autoload 'git-blame-mode "git-blame"
+</span><span class="comment-delimiter">;;              </span><span class="comment">"Minor mode for incremental blame for Git." t)
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Then first use of `M-x git-blame-mode' would load the package.
+</span>
+<span class="comment-delimiter">;;; </span><span class="comment">Compatibility:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">It requires GNU Emacs 21 or later and Git 1.5.0 and up
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">If you'are using Emacs 20, try changing this:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;            </span><span class="comment">(overlay-put ovl 'face (list :background
+</span><span class="comment-delimiter">;;                                         </span><span class="comment">(cdr (assq 'color (cddddr info)))))
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">to
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;            </span><span class="comment">(overlay-put ovl 'face (cons 'background-color
+</span><span class="comment-delimiter">;;                                         </span><span class="comment">(cdr (assq 'color (cddddr info)))))
+</span>
+
+<span class="comment-delimiter">;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</span><span class="comment">
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;; </span><span class="comment">Code:
+</span>
+(<span class="keyword">eval-when-compile</span> (<span class="keyword">require</span> '<span class="constant">cl</span>))                 <span class="comment-delimiter">; </span><span class="comment">to use `</span><span class="comment"><span class="constant">push</span></span><span class="comment">', `</span><span class="comment"><span class="constant">pop</span></span><span class="comment">'
+</span>
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-color-scale</span> (<span class="type">&amp;rest</span> elements)
+  <span class="doc">"Given a list, returns a list of triples formed with each
+elements of the list.
+
+a b =&gt; bbb bba bab baa abb aba aaa aab"</span>
+  (<span class="keyword">let</span> (result)
+    (<span class="keyword">dolist</span> (a elements)
+      (<span class="keyword">dolist</span> (b elements)
+        (<span class="keyword">dolist</span> (c elements)
+          (setq result (cons (format <span class="string">"#%s%s%s"</span> a b c) result)))))
+    result))
+
+<span class="comment-delimiter">;; </span><span class="comment">(git-blame-color-scale "0c" "04" "24" "1c" "2c" "34" "14" "3c") =&gt;
+</span><span class="comment-delimiter">;; </span><span class="comment">("#3c3c3c" "#3c3c14" "#3c3c34" "#3c3c2c" "#3c3c1c" "#3c3c24"
+</span><span class="comment-delimiter">;; </span><span class="comment">"#3c3c04" "#3c3c0c" "#3c143c" "#3c1414" "#3c1434" "#3c142c" ...)
+</span>
+(<span class="keyword">defmacro</span> <span class="function-name">git-blame-random-pop</span> (l)
+  <span class="doc">"Select a random element from L and returns it. Also remove
+selected element from l."</span>
+  <span class="comment-delimiter">;; </span><span class="comment">only works on lists with unique elements
+</span>  `(<span class="keyword">let</span> ((e (elt ,l (random (length ,l)))))
+     (setq ,l (remove e ,l))
+     e))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-dark-colors</span>
+  (git-blame-color-scale <span class="string">"0c"</span> <span class="string">"04"</span> <span class="string">"24"</span> <span class="string">"1c"</span> <span class="string">"2c"</span> <span class="string">"34"</span> <span class="string">"14"</span> <span class="string">"3c"</span>)
+  <span class="doc">"*List of colors (format #RGB) to use in a dark environment.
+
+To check out the list, evaluate (list-colors-display git-blame-dark-colors)."</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-light-colors</span>
+  (git-blame-color-scale <span class="string">"c4"</span> <span class="string">"d4"</span> <span class="string">"cc"</span> <span class="string">"dc"</span> <span class="string">"f4"</span> <span class="string">"e4"</span> <span class="string">"fc"</span> <span class="string">"ec"</span>)
+  <span class="doc">"*List of colors (format #RGB) to use in a light environment.
+
+To check out the list, evaluate (list-colors-display git-blame-light-colors)."</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-colors</span> '()
+  <span class="doc">"Colors used by git-blame. The list is built once when activating git-blame
+minor mode."</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-ancient-color</span> <span class="string">"dark green"</span>
+  <span class="doc">"*Color to be used for ancient commit."</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-autoupdate</span> t
+  <span class="doc">"*Automatically update the blame display while editing"</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-proc</span> nil
+  <span class="doc">"The running git-blame process"</span>)
+(make-variable-buffer-local 'git-blame-proc)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-overlays</span> nil
+  <span class="doc">"The git-blame overlays used in the current buffer."</span>)
+(make-variable-buffer-local 'git-blame-overlays)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-cache</span> nil
+  <span class="doc">"A cache of git-blame information for the current buffer"</span>)
+(make-variable-buffer-local 'git-blame-cache)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-idle-timer</span> nil
+  <span class="doc">"An idle timer that updates the blame"</span>)
+(make-variable-buffer-local 'git-blame-cache)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-update-queue</span> nil
+  <span class="doc">"A queue of update requests"</span>)
+(make-variable-buffer-local 'git-blame-update-queue)
+
+<span class="comment-delimiter">;; </span><span class="comment"><span class="warning">FIXME</span></span><span class="comment">: docstrings
+</span>(<span class="keyword">defvar</span> <span class="variable-name">git-blame-file</span> nil)
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-current</span> nil)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-mode</span> nil)
+(make-variable-buffer-local 'git-blame-mode)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-mode-line-string</span> <span class="string">" blame"</span>
+  <span class="doc">"String to display on the mode line when git-blame is active."</span>)
+
+(or (assq 'git-blame-mode minor-mode-alist)
+    (setq minor-mode-alist
+      (cons '(git-blame-mode git-blame-mode-line-string) minor-mode-alist)))
+
+<span class="comment-delimiter">;;;</span><span class="comment">###</span><span class="comment"><span class="warning">autoload</span></span><span class="comment">
+</span>(<span class="keyword">defun</span> <span class="function-name">git-blame-mode</span> (<span class="type">&amp;optional</span> arg)
+  <span class="doc">"Toggle minor mode for displaying Git blame
+
+With prefix ARG, turn the mode on if ARG is positive."</span>
+  (interactive <span class="string">"P"</span>)
+  (<span class="keyword">cond</span>
+   ((null arg)
+    (<span class="keyword">if</span> git-blame-mode (git-blame-mode-off) (git-blame-mode-on)))
+   ((&gt; (prefix-numeric-value arg) 0) (git-blame-mode-on))
+   (t (git-blame-mode-off))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-mode-on</span> ()
+  <span class="doc">"Turn on git-blame mode.
+
+See also function `</span><span class="doc"><span class="constant">git-blame-mode</span></span><span class="doc">'."</span>
+  (make-local-variable 'git-blame-colors)
+  (<span class="keyword">if</span> git-blame-autoupdate
+      (add-hook 'after-change-functions 'git-blame-after-change nil t)
+    (remove-hook 'after-change-functions 'git-blame-after-change t))
+  (git-blame-cleanup)
+  (<span class="keyword">let</span> ((bgmode (cdr (assoc 'background-mode (frame-parameters)))))
+    (<span class="keyword">if</span> (eq bgmode 'dark)
+    (setq git-blame-colors git-blame-dark-colors)
+      (setq git-blame-colors git-blame-light-colors)))
+  (setq git-blame-cache (make-hash-table <span class="builtin">:test</span> 'equal))
+  (setq git-blame-mode t)
+  (git-blame-run))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-mode-off</span> ()
+  <span class="doc">"Turn off git-blame mode.
+
+See also function `</span><span class="doc"><span class="constant">git-blame-mode</span></span><span class="doc">'."</span>
+  (git-blame-cleanup)
+  (<span class="keyword">if</span> git-blame-idle-timer (cancel-timer git-blame-idle-timer))
+  (setq git-blame-mode nil))
+
+<span class="comment-delimiter">;;;</span><span class="comment">###</span><span class="comment"><span class="warning">autoload</span></span><span class="comment">
+</span>(<span class="keyword">defun</span> <span class="function-name">git-reblame</span> ()
+  <span class="doc">"Recalculate all blame information in the current buffer"</span>
+  (interactive)
+  (<span class="keyword">unless</span> git-blame-mode
+    (<span class="warning">error</span> <span class="string">"Git-blame is not active"</span>))
+
+  (git-blame-cleanup)
+  (git-blame-run))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-run</span> (<span class="type">&amp;optional</span> startline endline)
+  (<span class="keyword">if</span> git-blame-proc
+      <span class="comment-delimiter">;; </span><span class="comment">Should maybe queue up a new run here
+</span>      (message <span class="string">"Already running git blame"</span>)
+    (<span class="keyword">let</span> ((display-buf (current-buffer))
+          (blame-buf (get-buffer-create
+                      (concat <span class="string">" git blame for "</span> (buffer-name))))
+          (args '(<span class="string">"--incremental"</span> <span class="string">"--contents"</span> <span class="string">"-"</span>)))
+      (<span class="keyword">if</span> startline
+          (setq args (append args
+                             (list <span class="string">"-L"</span> (format <span class="string">"%d,%d"</span> startline endline)))))
+      (setq args (append args
+                         (list (file-name-nondirectory buffer-file-name))))
+      (setq git-blame-proc
+            (apply 'start-process
+                   <span class="string">"git-blame"</span> blame-buf
+                   <span class="string">"git"</span> <span class="string">"blame"</span>
+                   args))
+      (<span class="keyword">with-current-buffer</span> blame-buf
+        (erase-buffer)
+        (make-local-variable 'git-blame-file)
+        (make-local-variable 'git-blame-current)
+        (setq git-blame-file display-buf)
+        (setq git-blame-current nil))
+      (set-process-filter git-blame-proc 'git-blame-filter)
+      (set-process-sentinel git-blame-proc 'git-blame-sentinel)
+      (process-send-region git-blame-proc (point-min) (point-max))
+      (process-send-eof git-blame-proc))))
+
+(<span class="keyword">defun</span> <span class="function-name">remove-git-blame-text-properties</span> (start end)
+  (<span class="keyword">let</span> ((modified (buffer-modified-p))
+        (inhibit-read-only t))
+    (remove-text-properties start end '(point-entered nil))
+    (set-buffer-modified-p modified)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-cleanup</span> ()
+  <span class="doc">"Remove all blame properties"</span>
+    (mapcar 'delete-overlay git-blame-overlays)
+    (setq git-blame-overlays nil)
+    (remove-git-blame-text-properties (point-min) (point-max)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-update-region</span> (start end)
+  <span class="doc">"Rerun blame to get updates between START and END"</span>
+  (<span class="keyword">let</span> ((overlays (overlays-in start end)))
+    (<span class="keyword">while</span> overlays
+      (<span class="keyword">let</span> ((overlay (pop overlays)))
+        (<span class="keyword">if</span> (&lt; (overlay-start overlay) start)
+            (setq start (overlay-start overlay)))
+        (<span class="keyword">if</span> (&gt; (overlay-end overlay) end)
+            (setq end (overlay-end overlay)))
+        (setq git-blame-overlays (delete overlay git-blame-overlays))
+        (delete-overlay overlay))))
+  (remove-git-blame-text-properties start end)
+  <span class="comment-delimiter">;; </span><span class="comment">We can be sure that start and end are at line breaks
+</span>  (git-blame-run (1+ (count-lines (point-min) start))
+                 (count-lines (point-min) end)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-sentinel</span> (proc status)
+  (<span class="keyword">with-current-buffer</span> (process-buffer proc)
+    (<span class="keyword">with-current-buffer</span> git-blame-file
+      (setq git-blame-proc nil)
+      (<span class="keyword">if</span> git-blame-update-queue
+          (git-blame-delayed-update))))
+  <span class="comment-delimiter">;;</span><span class="comment">(kill-buffer (process-buffer proc))
+</span>  <span class="comment-delimiter">;;</span><span class="comment">(message "git blame finished")
+</span>  )
+
+(<span class="keyword">defvar</span> <span class="variable-name">in-blame-filter</span> nil)
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-filter</span> (proc str)
+  (<span class="keyword">save-excursion</span>
+    (set-buffer (process-buffer proc))
+    (goto-char (process-mark proc))
+    (insert-before-markers str)
+    (goto-char 0)
+    (<span class="keyword">unless</span> in-blame-filter
+      (<span class="keyword">let</span> ((more t)
+            (in-blame-filter t))
+        (<span class="keyword">while</span> more
+          (setq more (git-blame-parse)))))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-parse</span> ()
+  (<span class="keyword">cond</span> ((looking-at <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9a-f]\\{40\\}</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string"> </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string"> </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string"> </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">\n"</span>)
+         (<span class="keyword">let</span> ((hash (match-string 1))
+               (src-line (string-to-number (match-string 2)))
+               (res-line (string-to-number (match-string 3)))
+               (num-lines (string-to-number (match-string 4))))
+           (setq git-blame-current
+                 (<span class="keyword">if</span> (string= hash <span class="string">"0000000000000000000000000000000000000000"</span>)
+                     nil
+                   (git-blame-new-commit
+                    hash src-line res-line num-lines))))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at <span class="string">"filename </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">.+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">\n"</span>)
+         (<span class="keyword">let</span> ((filename (match-string 1)))
+           (git-blame-add-info <span class="string">"filename"</span> filename))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[a-z-]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string"> </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">.+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">\n"</span>)
+         (<span class="keyword">let</span> ((key (match-string 1))
+               (value (match-string 2)))
+           (git-blame-add-info key value))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at <span class="string">"boundary\n"</span>)
+         (setq git-blame-current nil)
+         (delete-region (point) (match-end 0))
+         t)
+        (t
+         nil)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-new-commit</span> (hash src-line res-line num-lines)
+  (<span class="keyword">save-excursion</span>
+    (set-buffer git-blame-file)
+    (<span class="keyword">let</span> ((info (gethash hash git-blame-cache))
+          (inhibit-point-motion-hooks t)
+          (inhibit-modification-hooks t))
+      (<span class="keyword">when</span> (not info)
+    <span class="comment-delimiter">;; </span><span class="comment">Assign a random color to each new commit info
+</span>    <span class="comment-delimiter">;; </span><span class="comment">Take care not to select the same color multiple times
+</span>    (<span class="keyword">let</span> ((color (<span class="keyword">if</span> git-blame-colors
+             (git-blame-random-pop git-blame-colors)
+               git-blame-ancient-color)))
+          (setq info (list hash src-line res-line num-lines
+                           (git-describe-commit hash)
+                           (cons 'color color))))
+        (puthash hash info git-blame-cache))
+      (goto-line res-line)
+      (<span class="keyword">while</span> (&gt; num-lines 0)
+        (<span class="keyword">if</span> (get-text-property (point) 'git-blame)
+            (forward-line)
+          (<span class="keyword">let*</span> ((start (point))
+                 (end (<span class="keyword">progn</span> (forward-line 1) (point)))
+                 (ovl (make-overlay start end)))
+            (push ovl git-blame-overlays)
+            (overlay-put ovl 'git-blame info)
+            (overlay-put ovl 'help-echo hash)
+            (overlay-put ovl 'face (list <span class="builtin">:background</span>
+                                         (cdr (assq 'color (nthcdr 5 info)))))
+            <span class="comment-delimiter">;; </span><span class="comment">the point-entered property doesn't seem to work in overlays
+</span>            <span class="comment-delimiter">;;</span><span class="comment">(overlay-put ovl 'point-entered
+</span>            <span class="comment-delimiter">;;             </span><span class="comment">`(lambda (x y) (git-blame-identify ,hash)))
+</span>            (<span class="keyword">let</span> ((modified (buffer-modified-p)))
+              (put-text-property (<span class="keyword">if</span> (= start 1) start (1- start)) (1- end)
+                                 'point-entered
+                                 `(<span class="keyword">lambda</span> (x y) (git-blame-identify ,hash)))
+              (set-buffer-modified-p modified))))
+        (setq num-lines (1- num-lines))))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-add-info</span> (key value)
+  (<span class="keyword">if</span> git-blame-current
+      (nconc git-blame-current (list (cons (intern key) value)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-current-commit</span> ()
+  (<span class="keyword">let</span> ((info (get-char-property (point) 'git-blame)))
+    (<span class="keyword">if</span> info
+        (car info)
+      (<span class="warning">error</span> <span class="string">"No commit info"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-describe-commit</span> (hash)
+  (<span class="keyword">with-temp-buffer</span>
+    (call-process <span class="string">"git"</span> nil t nil
+                  <span class="string">"log"</span> <span class="string">"-1"</span> <span class="string">"--pretty=oneline"</span>
+                  hash)
+    (buffer-substring (point-min) (1- (point-max)))))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-last-identification</span> nil)
+(make-variable-buffer-local 'git-blame-last-identification)
+(<span class="keyword">defun</span> <span class="function-name">git-blame-identify</span> (<span class="type">&amp;optional</span> hash)
+  (interactive)
+  (<span class="keyword">let</span> ((info (gethash (or hash (git-blame-current-commit)) git-blame-cache)))
+    (<span class="keyword">when</span> (and info (not (eq info git-blame-last-identification)))
+      (message <span class="string">"%s"</span> (nth 4 info))
+      (setq git-blame-last-identification info))))
+
+<span class="comment-delimiter">;; </span><span class="comment">(defun git-blame-after-save ()
+</span><span class="comment-delimiter">;;   </span><span class="comment">(when git-blame-mode
+</span><span class="comment-delimiter">;;     </span><span class="comment">(git-blame-cleanup)
+</span><span class="comment-delimiter">;;     </span><span class="comment">(git-blame-run)))
+</span><span class="comment-delimiter">;; </span><span class="comment">(add-hook 'after-save-hook 'git-blame-after-save)
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git-blame-after-change</span> (start end length)
+  (<span class="keyword">when</span> git-blame-mode
+    (git-blame-enq-update start end)))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git-blame-last-update</span> nil)
+(make-variable-buffer-local 'git-blame-last-update)
+(<span class="keyword">defun</span> <span class="function-name">git-blame-enq-update</span> (start end)
+  <span class="doc">"Mark the region between START and END as needing blame update"</span>
+  <span class="comment-delimiter">;; </span><span class="comment">Try to be smart and avoid multiple callouts for sequential
+</span>  <span class="comment-delimiter">;; </span><span class="comment">editing
+</span>  (<span class="keyword">cond</span> ((and git-blame-last-update
+              (= start (cdr git-blame-last-update)))
+         (setcdr git-blame-last-update end))
+        ((and git-blame-last-update
+              (= end (car git-blame-last-update)))
+         (setcar git-blame-last-update start))
+        (t
+         (setq git-blame-last-update (cons start end))
+         (setq git-blame-update-queue (nconc git-blame-update-queue
+                                             (list git-blame-last-update)))))
+  (<span class="keyword">unless</span> (or git-blame-proc git-blame-idle-timer)
+    (setq git-blame-idle-timer
+          (run-with-idle-timer 0.5 nil 'git-blame-delayed-update))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-blame-delayed-update</span> ()
+  (setq git-blame-idle-timer nil)
+  (<span class="keyword">if</span> git-blame-update-queue
+      (<span class="keyword">let</span> ((first (pop git-blame-update-queue))
+            (inhibit-point-motion-hooks t))
+        (git-blame-update-region (car first) (cdr first)))))
+
+(<span class="keyword">provide</span> '<span class="constant">git-blame</span>)
+
+<span class="comment-delimiter">;;; </span><span class="comment">git-blame.el ends here
+</span></pre>
+  </body>
+</html>
diff --git a/site/git-emacs/docs/git-emacs.el.html b/site/git-emacs/docs/git-emacs.el.html
new file mode 100644
index 0000000..c78780e
--- /dev/null
+++ b/site/git-emacs/docs/git-emacs.el.html
@@ -0,0 +1,2231 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Created by htmlize-1.34 in css mode. -->
+<html>
+  <head>
+    <title>git-emacs.el</title>
+    <style type="text/css">
+    <!--
+      body {
+        color: #000000;
+        background-color: #ffffff;
+      }
+      .builtin {
+        /* font-lock-builtin-face */
+        color: #da70d6;
+      }
+      .comment {
+        /* font-lock-comment-face */
+        color: #b22222;
+      }
+      .comment-delimiter {
+        /* font-lock-comment-delimiter-face */
+        color: #b22222;
+      }
+      .constant {
+        /* font-lock-constant-face */
+        color: #5f9ea0;
+      }
+      .doc {
+        /* font-lock-doc-face */
+        color: #bc8f8f;
+      }
+      .function-name {
+        /* font-lock-function-name-face */
+        color: #0000ff;
+      }
+      .keyword {
+        /* font-lock-keyword-face */
+        color: #a020f0;
+      }
+      .negation-char {
+      }
+      .regexp-grouping-backslash {
+        /* font-lock-regexp-grouping-backslash */
+        font-weight: bold;
+      }
+      .regexp-grouping-construct {
+        /* font-lock-regexp-grouping-construct */
+        font-weight: bold;
+      }
+      .string {
+        /* font-lock-string-face */
+        color: #bc8f8f;
+      }
+      .type {
+        /* font-lock-type-face */
+        color: #228b22;
+      }
+      .variable-name {
+        /* font-lock-variable-name-face */
+        color: #b8860b;
+      }
+      .warning {
+        /* font-lock-warning-face */
+        color: #ff0000;
+        font-weight: bold;
+      }
+
+      a {
+        color: inherit;
+        background-color: inherit;
+        font: inherit;
+        text-decoration: inherit;
+      }
+      a:hover {
+        text-decoration: underline;
+      }
+    -->
+    </style>
+  </head>
+  <body>
+    <pre>
+<span class="comment-delimiter">;;; </span><span class="comment">git-emacs (v.1.0) : yet another git emacs mode for newbies
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Copyright (C) 2008  TSKim (tsgatesv@gmail.com)
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Authors    : TSKim : Kim Taesoo(tsgatesv@gmail.com)
+</span><span class="comment-delimiter">;; </span><span class="comment">Created    : 24 March 2007
+</span><span class="comment-delimiter">;; </span><span class="comment">License    : GPL
+</span><span class="comment-delimiter">;; </span><span class="comment">Keywords   : git, version control, release management
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">Compatibility: Emacs22 and EmacsCVS (developed on 23.0.60.2)
+</span><span class="comment-delimiter">;;                </span><span class="comment">Git 1.5 and up
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This file is *NOT* part of GNU Emacs.
+</span><span class="comment-delimiter">;; </span><span class="comment">This file is distributed under the same terms as GNU Emacs.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This program is free software; you can redistribute it and/or
+</span><span class="comment-delimiter">;; </span><span class="comment">modify it under the terms of the GNU General Public License as
+</span><span class="comment-delimiter">;; </span><span class="comment">published by the Free Software Foundation; either version 2 of
+</span><span class="comment-delimiter">;; </span><span class="comment">the License, or (at your option) any later version.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">This program is distributed in the hope that it will be
+</span><span class="comment-delimiter">;; </span><span class="comment">useful, but WITHOUT ANY WARRANTY; without even the implied
+</span><span class="comment-delimiter">;; </span><span class="comment">warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+</span><span class="comment-delimiter">;; </span><span class="comment">PURPOSE.  See the GNU General Public License for more details.
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">You should have received a copy of the GNU General Public
+</span><span class="comment-delimiter">;; </span><span class="comment">License along with this program; if not, write to the Free
+</span><span class="comment-delimiter">;; </span><span class="comment">Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+</span><span class="comment-delimiter">;; </span><span class="comment">MA 02111-1307 USA
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">http://tsgates.cafe24.com/git/git-emacs.html
+</span>
+<span class="comment-delimiter">;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</span><span class="comment">
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;; </span><span class="comment">Commentary:
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">I referenced a lot of codes such as under
+</span><span class="comment-delimiter">;;   </span><span class="comment">- psvn.el (Stefan Reichoer)
+</span><span class="comment-delimiter">;;   </span><span class="comment">- vc-git.el (Alexandre Julliard)
+</span><span class="comment-delimiter">;;   </span><span class="comment">- git.el (Alexandre Julliard)
+</span><span class="comment-delimiter">;;   </span><span class="comment">- ido.el (Kim F. Storm)
+</span><span class="comment-delimiter">;;   </span><span class="comment">- ... 
+</span><span class="comment-delimiter">;;   </span><span class="comment">
+</span><span class="comment-delimiter">;;; </span><span class="comment">Installation
+</span><span class="comment-delimiter">;; </span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">(add-to-list 'load-path "/home/tsgates/Skills/git/git-emacs")
+</span><span class="comment-delimiter">;; </span><span class="comment">(require 'git-emacs)
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</span><span class="comment">
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;; </span><span class="comment">BUG FIXES
+</span><span class="comment-delimiter">;; </span><span class="comment">2008.03.28 : git-diff just work on git root
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</span><span class="comment">
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : delete temporary log file
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : separate branch-mode &amp; status-view-mode to other files
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : fetching 
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : regular exp selecting
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : enhance config! &amp; tag!
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : save -&gt; status-view update
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : git-log -&gt; C-u command :=&gt; cmd
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : remote branch list
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : status-mode function -&gt; add status prefix
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : git set config
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : () -&gt; fording/unfording for detail
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : show ignored files
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : locally flyspell
+</span><span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : C-x v b -&gt; branch
+</span><span class="comment-delimiter">;; </span><span class="comment">
+</span>
+(<span class="keyword">eval-when-compile</span> (<span class="keyword">require</span> '<span class="constant">cl</span>))
+
+(<span class="keyword">require</span> '<span class="constant">ewoc</span>)                         <span class="comment-delimiter">; </span><span class="comment">view
+</span>(<span class="keyword">require</span> '<span class="constant">vc-git</span>)                       <span class="comment-delimiter">; </span><span class="comment">vc-git advises
+</span>(<span class="keyword">require</span> '<span class="constant">ido</span>)                          <span class="comment-delimiter">; </span><span class="comment">ido readline
+</span>(<span class="keyword">require</span> '<span class="constant">electric</span>)                     <span class="comment-delimiter">; </span><span class="comment">branch mode
+</span>(<span class="keyword">require</span> '<span class="constant">time-stamp</span>)                   <span class="comment-delimiter">; </span><span class="comment">today
+</span>
+(<span class="keyword">require</span> '<span class="constant">git-blame</span>)                    <span class="comment-delimiter">; </span><span class="comment">git blame
+</span>(<span class="keyword">require</span> '<span class="constant">git-modeline</span>)                 <span class="comment-delimiter">; </span><span class="comment">modeline dot
+</span>
+(<span class="keyword">defalias</span> '<span class="function-name">electric-pop-up-window</span> 'Electric-pop-up-window)
+(<span class="keyword">defalias</span> '<span class="function-name">electric-command-loop</span>  'Electric-command-loop)
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">faces
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defgroup</span> <span class="type">git</span> nil
+  <span class="doc">"A user interface for the git versioning system."</span>
+  <span class="builtin">:group</span> 'tools)
+
+(<span class="keyword">defmacro</span> <span class="function-name">git--face</span> (name fore1 prop1 fore2 prop2)
+  `(<span class="keyword">defface</span> ,(intern (concat <span class="string">"git--"</span> (symbol-name name) <span class="string">"-face"</span>))
+     '((((class color) (background light)) (<span class="builtin">:foreground</span> ,fore1 ,@prop1))
+       (((class color) (background dark))  (<span class="builtin">:foreground</span> ,fore2 ,@prop2)))
+    ,(concat <span class="string">"git "</span> (symbol-name name) <span class="string">" face in status buffer mode"</span>)
+    <span class="builtin">:group</span> 'git))
+
+(git--face mark       <span class="string">"red"</span>    (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face mark-tree  <span class="string">"blue"</span>   (<span class="builtin">:bold</span> t) <span class="string">"yellow"</span> (<span class="builtin">:bold</span> t))
+(git--face mark-blob  <span class="string">"black"</span>  () <span class="string">"white"</span> ())
+(git--face unknown    <span class="string">"black"</span>  (<span class="builtin">:bold</span> t) <span class="string">"white"</span>  (<span class="builtin">:bold</span> t))
+(git--face ignored    <span class="string">"gray"</span>   (<span class="builtin">:bold</span> t) <span class="string">"gray"</span>   (<span class="builtin">:bold</span> t))
+(git--face bold       <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face modified   <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face unmerged   <span class="string">"red"</span>    (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face uptodate   <span class="string">"gray"</span>   (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face added      <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face deleted    <span class="string">"red"</span>    (<span class="builtin">:bold</span> t) <span class="string">"tomato"</span> (<span class="builtin">:bold</span> t))
+(git--face log-line   <span class="string">"gray"</span>   (<span class="builtin">:bold</span> t <span class="builtin">:italic</span> t) <span class="string">"gray"</span>(<span class="builtin">:bold</span> t <span class="builtin">:italic</span> t))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--bold-face</span> (str) (propertize str 'face 'git--bold-face))
+
+(<span class="keyword">defconst</span> <span class="variable-name">git--msg-error</span>     (propertize <span class="string">"Error"</span> 'face 'git--bold-face))
+(<span class="keyword">defconst</span> <span class="variable-name">git--msg-critical</span>  (propertize <span class="string">"Critical Error"</span> 'face 'git--bold-face))
+(<span class="keyword">defconst</span> <span class="variable-name">git--msg-failed</span>    (propertize <span class="string">"Failed"</span> 'face 'git--bold-face))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">internal variable
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defvar</span> <span class="variable-name">git--commit-log-buffer</span> <span class="string">"*git-log*"</span>)
+(<span class="keyword">defvar</span> <span class="variable-name">git--log-flyspell-mode</span> t <span class="doc">"enable flyspell-mode when editing log"</span>)
+(<span class="keyword">defvar</span> <span class="variable-name">git--repository-bookmarks</span>
+  '(<span class="string">"~/Skills/git/checkouttest"</span>
+    <span class="string">"git://git.kernel.org/pub/scm/git/git.git"</span>
+    <span class="string">"git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git"</span>
+    )
+  <span class="doc">"repository bookmarks"</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git--repository-history</span> nil)
+(<span class="keyword">defvar</span> <span class="variable-name">git--status-mode-hook</span>   nil)
+(<span class="keyword">defvar</span> <span class="variable-name">git--status-mode-map</span>    nil)
+(<span class="keyword">defvar</span> <span class="variable-name">git--status-view</span>        nil)
+
+(<span class="keyword">defconst</span> <span class="variable-name">git--repository-dir</span> <span class="string">".git"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--status-header-format</span> <span class="string">"     %-2s %-10s %-5s %-5s %s"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--status-line-column</span> 30)
+
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-space</span>   <span class="string">" "</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-status</span>  <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[A-Z?]</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-tab</span>     <span class="string">"\t"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-blank</span>   <span class="string">"[\t\0 ]+"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-eof</span>     <span class="string">"\0"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-perm</span>    <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-7]\\{6\\}</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-type</span>    <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[</span><span class="string"><span class="negation-char">^</span></span><span class="string"> ]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-sha1</span>    <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9a-f]\\{40\\}</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-file</span>    <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[</span><span class="string"><span class="negation-char">^</span></span><span class="string">\0]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-branch</span>  <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[</span><span class="string"><span class="negation-char">^</span></span><span class="string">\n]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--reg-stage</span>   <span class="string">"</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[0-9]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+
+(<span class="keyword">defconst</span> <span class="variable-name">git--log-sep-line</span>
+  <span class="string">"# ----------------------------- log -----------------------------"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--log-file-line</span>
+  <span class="string">"# ---------------------------- files ----------------------------"</span>)
+(<span class="keyword">defconst</span> <span class="variable-name">git--log-header-line</span>
+  <span class="string">"# ----------------------------- info ----------------------------"</span>)
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-header</span> ()
+  (format (concat <span class="string">" "</span> git--status-header-format)
+          <span class="string">"M"</span> <span class="string">"STATUS"</span> <span class="string">"PERM"</span> <span class="string">"SIZE"</span> <span class="string">"FILE"</span>))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">fork git process
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--exec</span> (cmd outbuf inbuf <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git' clumsily"</span>
+
+  (apply #'call-process
+         (concat <span class="string">"git-"</span> cmd)            <span class="comment-delimiter">; </span><span class="comment">cmd
+</span>         inbuf                          <span class="comment-delimiter">; </span><span class="comment">in buffer
+</span>         outbuf                         <span class="comment-delimiter">; </span><span class="comment">out buffer
+</span>         nil                            <span class="comment-delimiter">; </span><span class="comment">display
+</span>         args))                         <span class="comment-delimiter">; </span><span class="comment">args
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--exec-pipe</span> (cmd input <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'echo input | git cmd args' and return result string"</span>
+
+  (<span class="keyword">with-output-to-string</span>
+    (<span class="keyword">with-current-buffer</span> standard-output
+      (<span class="keyword">let</span> ((tmp (make-temp-file <span class="string">"git-tmp"</span>)))
+        (<span class="keyword">with-temp-buffer</span>
+          (insert input)
+          (write-file tmp)
+
+          <span class="comment-delimiter">;; </span><span class="comment">tricky hide write to file message
+</span>          (message <span class="string">""</span>))
+        (apply #'git--exec cmd t tmp args)))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--exec-buffer</span> (cmd <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git' within the buffer"</span>
+  
+  (apply #'git--exec cmd t nil args))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--exec-string</span> (cmd <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git' and return result string"</span>
+
+  (<span class="keyword">with-output-to-string</span>
+    (<span class="keyword">with-current-buffer</span> standard-output
+      (apply #'git--exec-buffer cmd args))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--exec-cmd</span> (cmd)
+  <span class="doc">"Execute 'git-cmd' with args which comes from user"</span>
+
+  (apply #'git--exec-string
+         cmd
+         (split-string (read-from-minibuffer (concat <span class="string">"&gt;&gt; git "</span> cmd <span class="string">" "</span>)))))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">utilities
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--trim-string</span> (str)
+  <span class="doc">"Trim the front and rear part of the string"</span>
+  
+  (<span class="keyword">let</span> ((begin 0) (end (- (length str) 1)))
+
+    <span class="comment-delimiter">;; </span><span class="comment">trim front
+</span>    (<span class="keyword">while</span> (and (&lt; begin end)
+                (memq (aref str begin) '(? ?\n)))
+      (incf begin))
+
+    <span class="comment-delimiter">;; </span><span class="comment">trim rear
+</span>    (<span class="keyword">while</span> (and (&lt;= begin end)
+                (memq (aref str end) '(? ?\n)))
+      (decf end))
+
+    (substring str begin (+ end 1))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--trim-tail</span> (str)
+  <span class="doc">"Trim only the tail of the string"</span>
+  
+  (<span class="keyword">let</span> ((end (- (length str) 1)))
+
+    (<span class="keyword">while</span> (and (&lt; 0 end)
+                (memq (aref str end) '(? ?\n)))
+      (decf end))
+
+    (substring str 0 (+ end 1))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--join</span> (seq <span class="type">&amp;optional</span> sep)
+  <span class="doc">"' '.join( seq ) in python"</span>
+
+  (mapconcat #'identity seq (<span class="keyword">if</span> sep sep <span class="string">" "</span>)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--concat-path-only</span> (path added)
+  <span class="doc">"Concatenate the path with proper separator"</span>
+  
+  (concat (file-name-as-directory path) added))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--concat-path</span> (path added)
+  (expand-file-name (git--concat-path-only path added)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--expand-to-repository-dir</span> (dir)
+  (git--concat-path dir git--repository-dir))
+
+(<span class="keyword">defun</span> <span class="function-name">git--quit-buffer</span> ()
+  <span class="doc">"Delete the window and kill the current buffer"</span>
+
+  (interactive)
+  (<span class="keyword">let</span> ((buffer (current-buffer)))
+    (delete-window)
+    (kill-buffer buffer)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--select-from-user</span> (prompt choices)
+  <span class="doc">"Select from choices"</span>
+
+  (ido-completing-read prompt choices))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">git execute command
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--init</span> (dir)
+  <span class="doc">"Execute 'git-init' at 'dir' directory"</span>
+  
+  (<span class="keyword">with-temp-buffer</span>
+    (<span class="keyword">when</span> dir (cd dir))
+    (git--exec-string <span class="string">"init"</span>)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--checkout</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"git checkout 'git-checkout' with 'args'"</span>
+
+  (apply #'git--exec-string <span class="string">"checkout"</span> args))
+
+(<span class="keyword">defun</span> <span class="function-name">git--clone-sentinal</span> (proc stat)
+  <span class="doc">"git clone process sentinal"</span>
+  
+  (<span class="keyword">let</span> ((cmd (git--join (process-command proc))))
+    (<span class="keyword">cond</span> ((string= stat <span class="string">"finished\n"</span>)
+           (message <span class="string">"%s : %s"</span> (git--bold-face <span class="string">"Cloned"</span>) cmd))
+          <span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : popup or state
+</span>          ((string= stat <span class="string">"killed\n"</span>)
+           (message <span class="string">"%s : %s"</span> git--msg-failed cmd))
+          (t
+           (message <span class="string">"%s : %s"</span> git--msg-critical cmd)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--clone</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-clone' with 'args' and set sentinal
+and finally 'git--clone-sentinal' is called"</span>
+
+  (<span class="keyword">let</span> ((proc (apply #'start-process <span class="string">"git-clone"</span> nil <span class="string">"git-clone"</span> args)))
+    (set-process-sentinel proc 'git--clone-sentinal)
+    (message <span class="string">"%s : %s"</span>
+             (git--bold-face <span class="string">"Run"</span>)
+             (git--join (process-command proc)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--commit</span> (msg <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-commit' with 'args' and pipe the 'msg' string"</span>
+
+  (git--trim-string
+   (apply #'git--exec-pipe <span class="string">"commit"</span> msg <span class="string">"-F"</span> <span class="string">"-"</span> args)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--reset</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-rest' with 'args' and return the result as string"</span>
+  
+  (apply #'git--exec-string <span class="string">"reset"</span> args))
+
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--config</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute git-config with args"</span>
+
+  (git--trim-string (apply #'git--exec-string <span class="string">"config"</span> args)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--add</span> (files)
+  <span class="doc">"Execute git-add for each files"</span>
+  
+  (<span class="keyword">when</span> (stringp files) (setq files (list files)))
+  (apply #'git--exec-string <span class="string">"add"</span> files))
+
+(<span class="keyword">defun</span> <span class="function-name">git--mv</span> (src dst)
+  <span class="doc">"Execute git-mv for src and dst"</span>
+
+  (<span class="keyword">let</span> ((msg (git--exec-string <span class="string">"mv"</span> src dst)))
+    (<span class="keyword">unless</span> (string-match <span class="string">""</span> (git--trim-string msg))
+      (<span class="warning">error</span> msg))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--rm</span> (file)
+  <span class="doc">"Execute git-rm for file"</span>
+
+  (<span class="keyword">let</span> ((msg (git--exec-string <span class="string">"rm"</span> <span class="string">"--quiet"</span> file)))
+    (<span class="keyword">unless</span> (string-match <span class="string">""</span> (git--trim-string msg))
+      (<span class="warning">error</span> msg))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--tag</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-tag' with 'args' and return the result as string"</span>
+
+  (apply #'git--exec-string <span class="string">"tag"</span> args))
+
+(<span class="keyword">defalias</span> '<span class="function-name">git-snapshot</span> 'git-tag)
+(<span class="keyword">defun</span> <span class="function-name">git-tag</span> (name)
+  <span class="doc">"Make the new git same as 'git-snapshot"</span>
+
+  (interactive <span class="string">"sNew Tag Name &gt;&gt; "</span>)
+
+  (<span class="keyword">let</span> ((msg (git--trim-string (git--tag name))))
+    (<span class="keyword">if</span> (string= <span class="string">""</span> msg)
+        (message <span class="string">"Success to make %s"</span> (git--bold-face name))
+      (<span class="warning">error</span> msg))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--tag-list</span> ()
+  <span class="doc">"Get the tag list"</span>
+
+  (split-string (git--tag <span class="string">"-l"</span>) <span class="string">"\n"</span> t))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--diff-index</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-diff' with 'args' at current buffer"</span>
+  
+  (apply #'git--exec-buffer <span class="string">"diff-index"</span> <span class="string">"-z"</span> <span class="string">"--full-index"</span> args))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-index</span> (<span class="type">&amp;rest</span> files)
+  <span class="doc">"Execute 'git-status-index' and return list of 'git--fileinfo'"</span>
+
+  <span class="comment-delimiter">;; </span><span class="comment">update fileinfo -&gt; unmerged index
+</span>  (<span class="keyword">let</span> ((fileinfo nil)
+        (unmerged-info (make-hash-table <span class="builtin">:test</span> 'equal))
+        (regexp (git--build-reg git--reg-status  <span class="comment-delimiter">; </span><span class="comment">matched-1
+</span>                                git--reg-eof
+                                git--reg-file))) <span class="comment-delimiter">; </span><span class="comment">matched-2
+</span>
+    (<span class="keyword">dolist</span> (fi (git--ls-unmerged))
+      (puthash (git--fileinfo-&gt;name fi)
+               (git--fileinfo-&gt;stat fi)
+               unmerged-info))
+
+    (<span class="keyword">with-temp-buffer</span>
+      (apply #'git--diff-index <span class="string">"--name-status"</span>  <span class="string">"HEAD"</span> <span class="string">"--"</span> files)
+
+      (goto-char (point-min))
+
+      (<span class="keyword">while</span> (re-search-forward regexp nil t)
+        (<span class="keyword">let</span> ((stat (git--interprete-to-state-symbol (match-string 1)))
+              (file (match-string 2)))
+
+          <span class="comment-delimiter">;; </span><span class="comment">if unmerged file
+</span>          (<span class="keyword">when</span> (gethash file unmerged-info) (setq stat 'unmerged))
+
+          <span class="comment-delimiter">;; </span><span class="comment">assume all listed elements are 'blob
+</span>          (push (git--create-fileinfo file 'blob nil nil nil stat) fileinfo))))
+
+    fileinfo))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--symbolic-ref</span> (arg)
+  <span class="doc">"Execute git-symbolic-ref with 'arg' and return sha1 string"</span>
+
+  (car (split-string (git--exec-string <span class="string">"symbolic-ref"</span> arg) <span class="string">"\n"</span>)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--current-branch</span> ()
+  <span class="doc">"Execute git-symbolic-ref of 'HEAD' and return branch name string"</span>
+
+  (<span class="keyword">let</span> ((branch (git--symbolic-ref <span class="string">"HEAD"</span>)))
+    (<span class="keyword">if</span> (string-match <span class="string">"^refs/heads/"</span> branch)
+        (substring branch (match-end 0))
+      branch)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--rev-list</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute git-rev-list with 'arg' and print the result to the current buffer"</span>
+  
+  (apply #'git--exec-buffer <span class="string">"rev-list"</span> args))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--log</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute git-log with 'arg' and return result string"</span>
+
+  (apply #'git--exec-string <span class="string">"log"</span> <span class="string">"-z"</span> args))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--last-log</span> ()
+  <span class="doc">"Get the last log"</span>
+  
+  (git--log <span class="string">"--max-count=1"</span> <span class="string">"--pretty=full"</span>))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--last-log-short</span> ()
+  <span class="doc">"Get the last log as short form"</span>
+  
+  (git--trim-string (git--log <span class="string">"--max-count=1"</span> <span class="string">"--pretty=oneline"</span>)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--refresh-desc</span> ()
+  <span class="doc">"Refresh the git-status-mode header description"</span>
+  
+  (ewoc-set-hf git--status-view
+               (concat (git--bold-face <span class="string">"Directory"</span>) <span class="string">" : "</span> default-directory     <span class="string">"\n"</span>
+                       (git--bold-face <span class="string">"Branch   "</span>) <span class="string">" : "</span> (git--current-branch) <span class="string">"\n"</span>
+                       (git--bold-face <span class="string">"Last Log "</span>) <span class="string">" : "</span> (git--last-log-short) <span class="string">"\n"</span>)
+               <span class="string">""</span>))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--rev-parse</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-rev-parse' with args and return as string"</span>
+
+  (apply #'git--exec-string <span class="string">"rev-parse"</span> args))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--get-top-dir</span> (dir)
+  <span class="doc">"Get the top directory of the current git repository"</span>
+  
+  (<span class="keyword">with-temp-buffer</span>
+    (<span class="keyword">when</span> (stringp dir) (cd dir))
+
+    (<span class="keyword">let</span> ((cdup (git--rev-parse <span class="string">"--show-cdup"</span>)))
+      (git--concat-path dir (car (split-string cdup <span class="string">"\n"</span>))))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--ls-unmerged</span> ()
+  <span class="doc">"Get the list of 'git--fileinfo' of the unmerged files"</span>
+  
+  (<span class="keyword">let</span> (fileinfo)
+    (<span class="keyword">with-temp-buffer</span>
+      (git--exec-buffer <span class="string">"ls-files"</span> <span class="string">"-t"</span> <span class="string">"-u"</span> <span class="string">"-z"</span>)
+      (goto-char (point-min))
+
+      (<span class="keyword">let</span> ((regexp (git--build-reg git--reg-perm    <span class="comment-delimiter">; </span><span class="comment">matched-1
+</span>                                    git--reg-space
+                                    git--reg-sha1    <span class="comment-delimiter">; </span><span class="comment">matched-2
+</span>                                    git--reg-blank
+                                    git--reg-stage   <span class="comment-delimiter">; </span><span class="comment">matched-3
+</span>                                    git--reg-blank
+                                    git--reg-file))) <span class="comment-delimiter">; </span><span class="comment">matched-4
+</span>
+        (<span class="keyword">while</span> (re-search-forward regexp nil t)
+          (<span class="keyword">let</span> ((perm (match-string 1))
+                (sha1 (match-string 2))
+                (file (match-string 4)))
+
+            (<span class="keyword">unless</span> (and fileinfo
+                         (string= file (git--fileinfo-&gt;name (car (last fileinfo)))))
+              (push (git--create-fileinfo file 'blob sha1 perm nil 'unmerged)
+                    fileinfo))))))
+    (sort fileinfo 'git--fileinfo-lessp)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--ls-files</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute 'git-ls-files' with 'args' and return the list of the 'git--fileinfo'"</span>
+
+  (<span class="keyword">let</span> (fileinfo)
+    (<span class="keyword">with-temp-buffer</span>
+      (apply #'git--exec-buffer <span class="string">"ls-files"</span> <span class="string">"-t"</span> <span class="string">"-z"</span> args)
+      (goto-char (point-min))
+
+      (<span class="keyword">let</span> ((regexp (git--build-reg git--reg-status <span class="comment-delimiter">; </span><span class="comment">matched-1
+</span>                                    git--reg-blank
+                                    git--reg-file))) <span class="comment-delimiter">; </span><span class="comment">matched-2
+</span>
+        (<span class="keyword">while</span> (re-search-forward regexp nil t)
+          (<span class="keyword">let</span> ((stat (match-string 1))
+                (file (match-string 2)))
+
+            (push (git--create-fileinfo file 'blob nil nil nil
+                                        (<span class="keyword">case</span> (string-to-char stat)
+                                          (?H 'uptodate )
+                                          (?M 'unmerged )
+                                          (?R 'deleted  )
+                                          (?C 'modified )
+                                          (?K 'killed   )
+                                          (?? 'unknown  )
+                                          (t nil        )))
+                  fileinfo)))))
+    (sort fileinfo 'git--fileinfo-lessp)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--to-type-sym</span> (type)
+  <span class="doc">"Change string symbol type to 'blob or 'tree"</span>
+  
+  (<span class="keyword">cond</span> ((string= type <span class="string">"blob"</span>) 'blob)
+        ((string= type <span class="string">"tree"</span>) 'tree)
+        (t (<span class="warning">error</span> <span class="string">"strange type : %s"</span> type))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--ls-tree</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute git-ls-tree with args and return the result as the list of 'git--fileinfo'"</span>
+  
+  (<span class="keyword">let</span> (fileinfo)
+    (<span class="keyword">with-temp-buffer</span>
+      (apply #'git--exec-buffer <span class="string">"ls-tree"</span> <span class="string">"-z"</span> args)
+      (goto-char (point-min))
+
+      (<span class="keyword">let</span> ((regexp (git--build-reg git--reg-perm    <span class="comment-delimiter">; </span><span class="comment">matched-1
+</span>                                    git--reg-space
+                                    git--reg-type    <span class="comment-delimiter">; </span><span class="comment">matched-2
+</span>                                    git--reg-space
+                                    git--reg-sha1    <span class="comment-delimiter">; </span><span class="comment">matched-3
+</span>                                    git--reg-tab
+                                    git--reg-file))) <span class="comment-delimiter">; </span><span class="comment">matched-4
+</span>
+        (<span class="keyword">while</span> (re-search-forward regexp nil t)
+          (<span class="keyword">let</span> ((perm (match-string 1))
+                (type (match-string 2))
+                (sha1 (match-string 3))
+                (file (match-string 4)))
+
+            (push (git--create-fileinfo file
+                                        (git--to-type-sym type)
+                                        sha1
+                                        perm
+                                        nil
+                                        'uptodate)
+                  fileinfo)))))
+    (sort fileinfo 'git--fileinfo-lessp)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-buffer-name</span> (dir)
+  (format <span class="string">"*git-status on %s*"</span> (expand-file-name dir)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--create-status-buffer</span> (dir)
+  (<span class="keyword">let*</span> ((status-buffer-name (git--status-buffer-name dir))
+         (status-buffer (get-buffer status-buffer-name)))
+    (or status-buffer (get-buffer-create status-buffer-name))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--kill-status-buffer</span> (dir)
+  (kill-buffer (git--status-buffer-name dir)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--revert</span> (<span class="type">&amp;rest</span> args)
+  (apply #'git--exec-string <span class="string">"revert"</span> args))
+
+(<span class="keyword">defun</span> <span class="function-name">git--merge</span> (<span class="type">&amp;rest</span> args)
+  (apply #'git--exec-string <span class="string">"merge"</span> args))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--branch</span> (<span class="type">&amp;rest</span> args)
+  (apply #'git--exec-string <span class="string">"branch"</span> args))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status miscellaneous
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--today</span> ()
+  (time-stamp-string <span class="string">"%:y-%02m-%02d %02H:%02M:%02S"</span>))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--interprete-to-state-symbol</span> (stat)
+  <span class="doc">"Interpret git state string to state symbol"</span>
+
+  (<span class="keyword">case</span> (string-to-char stat)
+    (?M 'modified )
+    (?? 'unknown  )
+    (?A 'added    )
+    (?D 'deleted  )
+    (?U 'unmerged )
+    (?T 'modified )
+    (t nil)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--interprete-state-mode-color</span> (stat)
+  <span class="doc">"Interpret git state symbol to mode line color"</span>
+
+  (<span class="keyword">case</span> stat
+    ('modified <span class="string">"tomato"</span>      )
+    ('unknown  <span class="string">"gray"</span>        )
+    ('added    <span class="string">"blue"</span>        )
+    ('deleted  <span class="string">"red"</span>         )
+    ('unmerged <span class="string">"purple"</span>      )
+    ('uptodate <span class="string">"GreenYellow"</span> )
+    (t <span class="string">"red"</span>)))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view &amp; render
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+<span class="comment-delimiter">;; </span><span class="comment">status view on one node
+</span><span class="comment-delimiter">;;            </span><span class="comment">+-&gt; perm     +-&gt; name
+</span><span class="comment-delimiter">;; </span><span class="comment">M STATUS   PERM   SIZE  FILE
+</span><span class="comment-delimiter">;; </span><span class="comment">+-&gt; mark          +-&gt; size
+</span><span class="comment-delimiter">;;   </span><span class="comment">+-&gt; stat
+</span><span class="comment-delimiter">;;                   </span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">* Modified 100644 4564 |test.c
+</span><span class="comment-delimiter">;; </span><span class="comment">* New      100644 4564  test.c
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-node-mark</span> (info)
+  <span class="doc">"Render status view node mark"</span>
+
+  (propertize (<span class="keyword">if</span> (git--fileinfo-&gt;marked info) <span class="string">"*"</span> <span class="string">" "</span>)
+              'face
+              'git--mark-face))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-node-stat</span> (info)
+  <span class="doc">"Render status view node state"</span>
+  
+  (<span class="keyword">let</span> ((stat (git--fileinfo-&gt;stat info)))
+    (propertize (capitalize (symbol-name stat))
+                'face
+                (<span class="keyword">case</span> stat
+                  ('modified 'git--modified-face )
+                  ('uptodate 'git--uptodate-face )
+                  ('unknown  'git--unknown-face  )
+                  ('added    'git--added-face    )
+                  ('deleted  'git--deleted-face  )
+                  ('unmerged 'git--unmerged-face )
+                  (t nil)))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-node-perm</span> (info)
+  <span class="doc">"Render status view node permission"</span>
+  
+  (or (git--fileinfo-&gt;perm info) <span class="string">"------"</span>))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-node-size</span> (info)
+  <span class="doc">"Render status view node size"</span>
+
+  (<span class="keyword">let</span> ((size (git--fileinfo-&gt;size info)))
+    (<span class="keyword">if</span> (numberp size)
+        (number-to-string size)
+      <span class="string">""</span>)))
+      
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-node-name</span> (info)
+  <span class="doc">"Render status view node name"</span>
+  
+  (<span class="keyword">let</span> ((name (git--fileinfo-&gt;name info))
+        (type (git--fileinfo-&gt;type info)))
+
+    (setq name (replace-regexp-in-string <span class="string">"[</span><span class="string"><span class="negation-char">^</span></span><span class="string">/]+/"</span> <span class="string">"    "</span> name))
+    (propertize name 'face
+                (<span class="keyword">case</span> type
+                  ('tree 'git--mark-tree-face)
+                  ('blob 'git--mark-blob-face)
+                  (t (<span class="warning">error</span> <span class="string">"Can't be!"</span>))))))
+                  
+(<span class="keyword">defun</span> <span class="function-name">git--render-file-status</span> (info)
+  <span class="doc">"Render status view node, call in order
+ mark       : 'git--status-node-mark
+ state      : 'git--status-node-stat
+ permission : 'git--status-node-perm
+ size       : 'git--status-node-size
+ name       : 'git--status-node-name"</span>
+  
+  (insert (format git--status-header-format
+                  (git--status-node-mark info)
+                  (git--status-node-stat info)
+                  (git--status-node-perm info)
+                  (git--status-node-size info)
+                  (git--status-node-name info))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-mode</span> ()
+  <span class="doc">"git-status mode for editing state-view for git"</span>
+  
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+
+  <span class="comment-delimiter">;; </span><span class="comment">set major mode
+</span>  (setq mode-name <span class="string">"git status"</span>)
+  (setq major-mode 'git-status-mode)
+
+  (use-local-map git--status-mode-map)
+
+  (setq buffer-read-only t)
+  (setq header-line-format (git--status-header))
+
+  <span class="comment-delimiter">;; </span><span class="comment">create ewoc for current git-status buffer
+</span>  (set (make-local-variable 'git--status-view)
+       (ewoc-create 'git--render-file-status <span class="string">""</span> <span class="string">""</span>))
+
+  (set (make-local-variable 'revert-buffer-function)
+       'git--status-mode-revert-buffer)
+
+  (run-hooks 'git--status-mode-hook))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-mode-revert-buffer</span> (ignore-auto noconfirm)
+  <span class="doc">"Revert buffer to refresh!"</span>
+
+  <span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> refresh status-mode-buffer
+</span>  (git--status-new)
+  (git--status-view-first-line))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">fileinfo in view
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--build-reg</span> (<span class="type">&amp;rest</span> args)
+  (apply #'concat (add-to-list 'args <span class="string">"\0"</span> t)))
+
+<span class="comment-delimiter">;; </span><span class="comment">ewoc file info structure for each list element
+</span>(<span class="keyword">defstruct</span> (<span class="type">git--fileinfo</span> 
+            (<span class="builtin">:copier</span> nil)
+            (<span class="builtin">:constructor</span> git--create-fileinfo-core
+                          (name type <span class="type">&amp;optional</span> sha1 perm marked stat size refresh lessp))
+            (<span class="builtin">:conc-name</span> git--fileinfo-&gt;))
+  marked   <span class="comment-delimiter">;; </span><span class="comment">t/nil
+</span>  expanded <span class="comment-delimiter">;; </span><span class="comment">t/nil
+</span>  refresh  <span class="comment-delimiter">;; </span><span class="comment">t/nil
+</span>  lessp    <span class="comment-delimiter">;; </span><span class="comment">sort priority (tree=3, sub=2, blob=1)
+</span>  stat     <span class="comment-delimiter">;; </span><span class="comment">'unknown/'modified/'uptodate
+</span>  type     <span class="comment-delimiter">;; </span><span class="comment">'blob/'tree
+</span>  name     <span class="comment-delimiter">;; </span><span class="comment">filename
+</span>  size     <span class="comment-delimiter">;; </span><span class="comment">size
+</span>  perm     <span class="comment-delimiter">;; </span><span class="comment">permission
+</span>  sha1)    <span class="comment-delimiter">;; </span><span class="comment">sha1
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--create-fileinfo</span> (name type <span class="type">&amp;optional</span> sha1 perm marked stat size refresh)
+  <span class="doc">"Create fileinfo through this function instead using 'git--create-fileinfo-core'"</span>
+  
+  (git--create-fileinfo-core name type sha1 perm marked stat size refresh
+                             (<span class="keyword">if</span> (eq type 'tree) 3 (<span class="keyword">if</span> (string-match <span class="string">"/"</span> name) 2 1))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--fileinfo-lessp</span> (info1 info2)
+  <span class="doc">"Sorting rules of 'git--fileinfo' ref to 'git--create-fileinfo'"</span>
+
+  (<span class="keyword">let</span> ((info1-level (git--fileinfo-&gt;lessp info1))
+        (info2-level (git--fileinfo-&gt;lessp info2)))
+
+    (<span class="keyword">if</span> (eq info1-level info2-level)
+        (string-lessp (git--fileinfo-&gt;name info1)
+                      (git--fileinfo-&gt;name info2))
+      (&gt; info1-level info2-level))))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">git-status-view features
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--clear-status</span> ()
+  <span class="doc">"Clear the git-status-view"</span>
+
+  (ewoc-filter git--status-view #'(<span class="keyword">lambda</span> (info) nil))
+  (ewoc-refresh git--status-view)
+  (<span class="keyword">let</span> ((buffer-read-only nil)) (erase-buffer)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-tree</span> () (git--ls-tree <span class="string">"HEAD"</span>))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-map</span> (node pred)
+  <span class="doc">"Iterating 'git--status-view' by using 'ewoc-next and return the next node.
+The predicate function should get 'node and 'data arguments and it return 't or nil.
+If predicate return nil continue to scan, otherwise stop and return the node"</span>
+  
+  (<span class="keyword">let</span> ((data nil)
+        (cont t))
+
+    (<span class="keyword">while</span> (and node cont)
+      (setq data (ewoc-data node))
+      (setq cont (not (funcall pred node data)))
+      (setq node (ewoc-next git--status-view node)))
+
+    node))
+
+<span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> -&gt; binary search
+</span>(<span class="keyword">defun</span> <span class="function-name">git--status-view-dumb-update-element</span> (fi)
+  <span class="doc">"Add update 'fi' to 'git--status-view' thoughtlessly!"</span>
+  
+  (<span class="keyword">unless</span> (git--status-map (ewoc-nth git--status-view 0)
+                           #'(<span class="keyword">lambda</span> (node data)
+                               (<span class="keyword">when</span> (git--fileinfo-lessp fi data)
+                                 (ewoc-enter-before git--status-view node fi))))
+    (ewoc-enter-last git--status-view fi)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-update-state</span> (fileinfo)
+  <span class="doc">"Update the state-view elements in fileinfo"</span>
+
+  (<span class="keyword">let</span> ((hashed-info (make-hash-table <span class="builtin">:test</span> 'equal <span class="builtin">:size</span> (length fileinfo))))
+    (<span class="keyword">dolist</span> (fi fileinfo)
+      (puthash (git--fileinfo-&gt;name fi) fi hashed-info))
+
+    (ewoc-collect git--status-view
+                  #'(<span class="keyword">lambda</span> (node)
+                      (<span class="keyword">let*</span> ((name (git--fileinfo-&gt;name node))
+                             (fi (gethash name hashed-info)))
+                        (<span class="keyword">when</span> fi
+                          (setf (git--fileinfo-&gt;stat node)
+                                (git--fileinfo-&gt;stat fi))
+                          (remhash name hashed-info)))))
+
+    (maphash #'(<span class="keyword">lambda</span> (k v) (git--status-view-dumb-update-element v)) hashed-info)))
+
+<span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : need refactoring
+</span>(<span class="keyword">defun</span> <span class="function-name">git--status-view-update-expand-tree</span> (fileinfo)
+  <span class="doc">"Expand the interesting tree nodes containing one of fileinfos"</span>
+
+  (<span class="keyword">let</span> ((node (ewoc-nth git--status-view 0)))
+    
+    (<span class="keyword">dolist</span> (fi fileinfo)
+      (<span class="keyword">let*</span> ((paths (split-string (git--fileinfo-&gt;name fi) <span class="string">"/"</span>))
+             (matched-name nil))
+
+        (<span class="keyword">when</span> (&lt; 1 (length paths))
+
+          (setq matched-name (car paths))
+          (setq paths (cdr paths))
+
+          (setq node (git--status-map node
+                                      (<span class="keyword">lambda</span> (cur-node data)
+                                        (<span class="keyword">when</span> (and (eq (git--fileinfo-&gt;type data) 'tree)
+                                                   (string= (git--fileinfo-&gt;name data) matched-name))
+
+                                          (git--expand-tree cur-node)
+                                          (<span class="keyword">if</span> paths
+                                              (<span class="keyword">progn</span>
+                                                (setq matched-name (concat matched-name <span class="string">"/"</span> (car paths)))
+                                                (setq paths (cdr paths))
+                                                nil)
+                                            t))))))))))
+                                          
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-update</span> ()
+  <span class="doc">"Friendly update view function"</span>
+  
+  (<span class="keyword">let</span> ((fileinfo (git--status-index)))
+    (git--status-view-update-expand-tree fileinfo)
+    (git--status-view-update-state fileinfo)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-new</span> ()
+  <span class="doc">"Create new status-view buffer in current buffer"</span>
+
+  (git--clear-status)
+  (git--refresh-desc)
+
+  <span class="comment-delimiter">;; </span><span class="comment">add new file infos
+</span>  (<span class="keyword">dolist</span> (info (git--status-tree)) (ewoc-enter-last git--status-view info))
+
+  <span class="comment-delimiter">;; </span><span class="comment">add modified/renamed etc file infos
+</span>  (git--status-view-update)
+
+  <span class="comment-delimiter">;; </span><span class="comment">add unknown file
+</span>  (<span class="keyword">let</span> ((fileinfo (git--ls-files <span class="string">"-o"</span> <span class="string">"--exclude-per-directory=.gitignore"</span>
+                                 <span class="string">"--exclude-from=.git/info/exclude"</span>)))
+    
+    (git--status-view-update-expand-tree fileinfo)
+
+    (<span class="keyword">let</span> ((iter (ewoc-nth git--status-view 0)))
+      (<span class="keyword">dolist</span> (fi fileinfo)
+        (setq iter (git--status-map iter (<span class="keyword">lambda</span> (node data)
+                                           (<span class="keyword">when</span> (git--fileinfo-lessp fi data)
+                                             (ewoc-enter-before git--status-view node fi))))))))
+  (git--status-refresh))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-delete</span> (node)
+  
+  (<span class="keyword">let</span> ((buffer-read-only nil)) 
+    (ewoc-delete git--status-view node)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-refresh</span> ()
+  (<span class="keyword">let</span> ((pos (point)))
+    (ewoc-refresh git--status-view)
+    (goto-char pos)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-delete-afer-regex</span> (node regex)
+  (<span class="keyword">while</span> node
+    (<span class="keyword">let</span> ((next-node (ewoc-next git--status-view node))
+          (node-data (ewoc-data node)))
+
+      (<span class="keyword">if</span> (string-match regex (git--fileinfo-&gt;name node-data))
+          (git--status-delete node)
+        <span class="comment-delimiter">;; </span><span class="comment">finish if not matched
+</span>        (setq next-node nil))
+
+      (setq node next-node)))
+  (git--status-refresh))
+
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">key/menu map
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">unless</span> git--status-mode-map
+  (<span class="keyword">let</span> ((map (make-keymap)))
+    (suppress-keymap map)
+
+    (define-key map <span class="string">"n"</span> 'git--status-view-next-line)
+    (define-key map <span class="string">"p"</span> 'git--status-view-prev-line)
+    (define-key map <span class="string">"N"</span> 'git--status-view-next-meaningfull-line)
+    (define-key map <span class="string">"P"</span> 'git--status-view-prev-meaningfull-line)
+    (define-key map <span class="string">"m"</span> 'git--status-view-mark-and-next)
+    (define-key map <span class="string">"u"</span> 'git--status-view-unmark-and-next)
+    (define-key map <span class="string">" "</span> 'git--status-view-toggle-and-next)
+    (define-key map <span class="string">"q"</span> 'git--status-view-quit)
+    (define-key map <span class="string">"&lt;"</span> 'git--status-view-first-line)
+    (define-key map <span class="string">"&gt;"</span> 'git--status-view-last-line)
+
+    (define-key map <span class="string">"e"</span> 'git--status-view-expand-tree-toggle)
+    (define-key map <span class="string">"v"</span> 'git--status-view-view-file)
+    (define-key map <span class="string">"o"</span> 'git--status-view-open-file)
+    (define-key map <span class="string">"="</span> 'git--status-view-diff-file)
+    (define-key map <span class="string">"b"</span> 'git--status-view-switch-branch)
+    (define-key map <span class="string">"!"</span> 'git--status-view-resolve-merge)
+    (define-key map <span class="string">"."</span> 'git--status-view-git-cmd)
+    (define-key map <span class="string">"k"</span> 'git--status-view-gitk)
+    (define-key map <span class="string">"g"</span> 'git--status-view-refresh)
+    (define-key map <span class="string">"a"</span> 'git--status-view-add)
+    (define-key map <span class="string">"i"</span> 'git--status-view-add-ignore)
+    (define-key map <span class="string">"r"</span> 'git--status-view-rename)
+    (define-key map <span class="string">"?"</span> 'git--status-view-blame)
+    (define-key map <span class="string">"d"</span> 'git--status-view-rm)
+    (define-key map <span class="string">"*"</span> 'git--status-view-mark-reg)
+    (define-key map <span class="string">"s"</span> 'git--status-view-summary)
+
+    <span class="comment-delimiter">;; </span><span class="comment">ok for commiting
+</span>    (define-key map <span class="string">"c"</span> 'git-commit-all)
+    
+    (define-key map <span class="string">"\C-m"</span> 'git--status-view-do-propriate)
+
+    (setq git--status-mode-map map)))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view tree expanding
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--expand-tree</span> (node)
+  <span class="doc">"Expand 'node' in 'git--status-view', but node-&gt;type should be 'tree"</span>
+
+  (<span class="keyword">let*</span> ((data (ewoc-data node))
+         (name (git--fileinfo-&gt;name data))
+         (type (git--fileinfo-&gt;type data))
+         (fileinfo (git--ls-tree (git--fileinfo-&gt;sha1 data))))
+
+    (<span class="keyword">unless</span> (eq type 'tree) (<span class="warning">error</span> <span class="string">"type should be 'tree"</span>))
+
+    (<span class="keyword">unless</span> (git--fileinfo-&gt;expanded data)
+
+      (<span class="keyword">dolist</span> (fi fileinfo)
+        (<span class="keyword">let</span> ((fi-name (git--fileinfo-&gt;name fi)))
+          <span class="comment-delimiter">;; </span><span class="comment">update fileinfo name as "path/name"
+</span>          (setf (git--fileinfo-&gt;name fi)
+                (git--concat-path-only name fi-name))
+
+          <span class="comment-delimiter">;; </span><span class="comment">update lessp by force
+</span>          (setf (git--fileinfo-&gt;lessp fi) 2)
+
+          (setq node (ewoc-enter-after git--status-view node fi))))
+    
+      (setf (git--fileinfo-&gt;expanded data) t))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--shrink-tree</span> (node)
+  <span class="doc">"Shrink 'node' in 'git--status-view', but node-&gt;type should be 'tree"</span>
+  
+  (<span class="keyword">let*</span> ((data (ewoc-data node))
+         (type (git--fileinfo-&gt;type data))
+         (name (git--fileinfo-&gt;name data)))
+
+    (<span class="keyword">unless</span> (eq type 'tree) (<span class="warning">error</span> <span class="string">"type should be 'tree"</span>))
+  
+    (<span class="keyword">when</span> (git--fileinfo-&gt;expanded data)
+      <span class="comment-delimiter">;; </span><span class="comment">make regexp "node-&gt;name/"
+</span>      (git--status-delete-afer-regex (ewoc-next git--status-view node)
+                                     (file-name-as-directory name))
+      (setf (git--fileinfo-&gt;expanded data) nil))))
+
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-expand-tree-toggle</span> ()
+  <span class="doc">"Expand if tree is not expanded otherwise close the tree"</span>
+
+  (interactive)
+
+  (<span class="keyword">let*</span> ((node (ewoc-locate git--status-view))
+         (node-info (ewoc-data node)))
+    (<span class="keyword">when</span> (and node node-info
+               (eq (git--fileinfo-&gt;type node-info) 'tree))
+      (<span class="keyword">if</span> (git--fileinfo-&gt;expanded node-info)
+          (git--shrink-tree node)
+        (git--expand-tree node)))))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view moving
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-forward-line</span> (n)
+  <span class="doc">"Move to forward on the status view item"</span>
+
+  (interactive <span class="string">"p"</span>)
+  
+  (<span class="keyword">let</span> ((dir (/ n (abs n))))
+    (forward-line n)
+
+    (<span class="keyword">while</span> (or (looking-at <span class="string">"^[\n\t ]+$"</span>)
+               (looking-at <span class="string">"^[</span><span class="string"><span class="negation-char">^</span></span><span class="string"> ]"</span>))
+      (forward-line dir)))
+
+  (move-to-column git--status-line-column))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-first-line</span> ()
+  <span class="doc">"Move to the first item"</span>
+  
+  (interactive)
+  (goto-char (point-min))
+  (git--status-view-forward-line 1))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-last-line</span> ()
+  <span class="doc">"Move to the last item"</span>
+  
+  (interactive)
+  (goto-char (point-max))
+  (git--status-view-forward-line -1))
+
+(<span class="keyword">defun</span> <span class="function-name">git--forward-meaningfull-line</span> (move)
+  <span class="doc">"Implementation of forward meaningful line"</span>
+
+  (<span class="keyword">let</span> ((start-node (ewoc-locate git--status-view)))
+    (funcall move 1)
+
+    (<span class="keyword">while</span> (and (eq 'uptodate
+                    (git--fileinfo-&gt;stat (ewoc-data (ewoc-locate git--status-view))))
+                (not (eq start-node (ewoc-locate git--status-view))))
+      (funcall move 1))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-next-line</span> (<span class="type">&amp;optional</span> n)
+  <span class="doc">"Move to the next line"</span>
+
+  (interactive <span class="string">"p"</span>)
+
+  (<span class="keyword">if</span> (eql (ewoc-locate git--status-view)
+           (ewoc-nth git--status-view -1))
+      (git--status-view-first-line)
+    (git--status-view-forward-line 1)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-next-meaningfull-line</span> ()
+  <span class="doc">"Move to the meaningful next line"</span>
+
+  (interactive)
+  (git--forward-meaningfull-line 'git--status-view-next-line))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-prev-line</span> (<span class="type">&amp;optional</span> n)
+  <span class="doc">"Move to the previous line"</span>
+  
+  (interactive <span class="string">"p"</span>)
+
+  (<span class="keyword">if</span> (eql (ewoc-locate git--status-view)
+           (ewoc-nth git--status-view 0))
+      (git--status-view-last-line)
+    (git--status-view-forward-line -1)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-prev-meaningfull-line</span> ()
+  <span class="doc">"Move the the meaningful previous line"</span>
+  
+  (interactive)
+  (git--forward-meaningfull-line 'git--status-view-prev-line))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view marking
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--mark-line</span> (marked)
+  <span class="doc">"Implementation of marking"</span>
+
+  (<span class="keyword">let</span> ((node (ewoc-locate git--status-view)))
+    (setf (git--fileinfo-&gt;marked (ewoc-data node)) marked)
+    (ewoc-invalidate git--status-view node)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-mark-and-next</span> ()
+  <span class="doc">"Mark and go to the next line"</span>
+
+  (interactive)
+  (git--mark-line t)
+  (git--status-view-next-line))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-unmark-and-next</span> ()
+  <span class="doc">"Unmark and go to the next line"</span>
+  
+  (interactive)
+  (git--mark-line nil)
+  (git--status-view-next-line))
+
+(<span class="keyword">defun</span> <span class="function-name">git--toggle-line</span> ()
+  <span class="doc">"Implementation of toggle line"</span>
+  
+  (<span class="keyword">let*</span> ((node (ewoc-locate git--status-view))
+         (data (ewoc-data node))
+         (mark (git--fileinfo-&gt;marked data)))
+    (setf (git--fileinfo-&gt;marked data) (not mark))
+    (ewoc-invalidate git--status-view node)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-toggle-and-next</span> ()
+  <span class="doc">"Toggle the mark and go to next line"</span>
+
+  (interactive)
+  (git--toggle-line)
+  (git--status-view-next-line))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view independent command
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-quit</span> ()
+  <span class="doc">"Quit"</span>
+
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-switch-branch</span> ()
+  <span class="doc">"Switch branch"</span>
+
+  (interactive)
+  (call-interactively 'git-switch-branch))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-git-cmd</span> ()
+  <span class="doc">"Direct git command"</span>
+
+  (interactive)
+  (call-interactively 'git-cmd))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-gitk</span> ()
+  <span class="doc">"Launch gitk"</span>
+
+  (interactive)
+  (call-interactively 'gitk))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-refresh</span> ()
+  <span class="doc">"Refresh view"</span>
+
+  (interactive)
+  (revert-buffer))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-mark-reg</span> (reg)
+  <span class="doc">"Mark with regular expression"</span>
+
+  (interactive <span class="string">"sRegexp &gt;&gt; "</span>)
+  (ewoc-collect git--status-view
+                #'(<span class="keyword">lambda</span> (data)
+                    (<span class="keyword">when</span> (string-match reg (git--fileinfo-&gt;name data))
+                      (setf (git--fileinfo-&gt;marked data) t))))
+
+  (ewoc-refresh git--status-view)
+  (git--status-view-first-line)
+  (git--status-view-next-meaningfull-line))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-summary</span> ()
+  <span class="doc">"To the summary mode with occur"</span>
+  
+  (interactive)
+  (occur <span class="string">"[\t* ]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">Deleted</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">Modified</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">Unknown</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">Added</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>)
+  
+  (message <span class="string">"Move with 'next-error and 'previous-error"</span>))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view for one selected file
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-view-select-filename</span> ()
+  <span class="doc">"Return current filename of view item"</span>
+
+  (git--fileinfo-&gt;name (ewoc-data (ewoc-locate git--status-view))))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-view-select-type</span> ()
+  <span class="doc">"Return current type of view item"</span>
+
+  (git--fileinfo-&gt;type (ewoc-data (ewoc-locate git--status-view))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-view-file</span> ()
+  <span class="doc">"View the selected file"</span>
+
+  (interactive)
+  (view-file (git--status-view-select-filename)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-open-file</span> ()
+  <span class="doc">"Open the selected file"</span>
+
+  (interactive)
+  (find-file (git--status-view-select-filename)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-diff-file</span> ()
+  <span class="doc">"Diff the selected file"</span>
+
+  (interactive)
+  (git-diff-cmd (git--status-view-select-filename)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-resolve-merge</span> ()
+  <span class="doc">"Resolve the conflict if necessary"</span>
+  
+  (interactive)
+
+  (<span class="keyword">let</span> ((file (git--status-view-select-filename)))
+    (<span class="keyword">if</span> (eq 'unmerged (git--status-file file))
+        (<span class="keyword">progn</span>
+          (find-file (git--status-view-select-filename))
+          (git--resolve-merge-buffer (current-buffer)))
+      (<span class="warning">error</span> <span class="string">"Selected file is not unmerged state"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-do-propriate</span> ()
+  <span class="doc">"If 'tree selected -&gt; expand or un-expand otherwise open it"</span>
+
+  (interactive)
+
+  (<span class="keyword">case</span> (git--status-view-select-type)
+    ('tree (git--status-view-expand-tree-toggle))
+    ('blob (git--status-view-open-file))
+    (t (<span class="warning">error</span> <span class="string">"Not supported type"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-blame</span> ()
+  <span class="doc">"Open the file as blame-mode"</span>
+
+  (interactive)
+
+  (<span class="keyword">when</span> (eq (git--status-view-select-type) 'blob)
+    (find-file (git--status-view-select-filename))
+    (git-blame-mode t)))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">status view for all marked files or selected
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-view-marked-files</span> ()
+  <span class="doc">"Scrap the all marked files"</span>
+
+  (<span class="keyword">let</span> (files)
+    (ewoc-collect git--status-view
+                  #'(<span class="keyword">lambda</span> (node)
+                      (<span class="keyword">when</span> (git--fileinfo-&gt;marked node)
+                        (push (git--fileinfo-&gt;name node) files))))
+    files))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--status-view-makred-or-file</span> ()
+  <span class="doc">"If not marked -&gt; rename for current file"</span>
+
+  (<span class="keyword">let</span> ((files (git--status-view-marked-files)))
+    (<span class="keyword">when</span> (null files)
+      (setq files (list (git--status-view-select-filename))))
+    files))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-rm</span> ()
+  <span class="doc">"Delete the whole marked files"</span>
+
+  (interactive)
+
+  (<span class="keyword">let*</span> ((files (git--status-view-makred-or-file))
+         (msg (format <span class="string">"total %s files including '%s'"</span>
+                      (length files)
+                      (file-name-nondirectory (car files)))))
+    
+    (<span class="keyword">unless</span> (y-or-n-p (format <span class="string">"Really want to %s %s?"</span>
+                              (git--bold-face <span class="string">"delete"</span>)
+                              msg))
+      (<span class="warning">error</span> <span class="string">"Aborted deletion"</span>))
+                      
+    (<span class="keyword">dolist</span> (file files)
+      (git--rm file)))
+
+  (revert-buffer))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-rename</span> ()
+  <span class="doc">"Renamed the whole marked files"</span>
+
+  (interactive)
+
+  (<span class="keyword">let</span> ((files (git--status-view-makred-or-file)))
+    (<span class="keyword">dolist</span> (src files)
+      (<span class="keyword">let</span> ((msg (format <span class="string">"%s '%s' to &gt;&gt; "</span> (git--bold-face <span class="string">"Rename"</span>) src)))
+        (git--mv src (file-relative-name (read-from-minibuffer msg src))))))
+
+  (revert-buffer))
+  
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-add</span> ()
+  <span class="doc">"Add the selected files"</span>
+
+  (interactive)
+  (git--add (git--status-view-makred-or-file))
+  (revert-buffer))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-view-add-ignore</span> ()
+  <span class="doc">"Add the selected file to .gitignore"</span>
+
+  (interactive)
+
+  (<span class="keyword">let</span> ((files (git--status-view-marked-files)))
+    (<span class="keyword">unless</span> files (list (read-from-minibuffer <span class="string">"Add Ignore &gt;&gt; "</span>)))
+
+    (<span class="keyword">dolist</span> (file files)
+      (git-ignore file)))
+
+  (revert-buffer))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">git application
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defsubst</span> <span class="function-name">git--managed-on-git?</span> ()
+  <span class="doc">"Check see if vc-git mode is on the vc-git"</span>
+
+  (not (string-match <span class="string">"fatal: Not a git repository"</span>
+                     (git--rev-parse <span class="string">"HEAD"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--status-file</span> (file)
+  <span class="doc">"Return the status of the file"</span>
+  
+  (<span class="keyword">let</span> ((fileinfo (git--status-index file)))
+    (<span class="keyword">unless</span> fileinfo (setq fileinfo (git--ls-files file)))
+    (<span class="keyword">when</span> (= 1 (length fileinfo))
+      (git--fileinfo-&gt;stat (car fileinfo)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-list</span> ()
+  <span class="doc">"Get branch list"</span>
+
+  (<span class="keyword">let</span> ((branchs)
+        (regexp (concat <span class="string">"[ *]+"</span> git--reg-branch <span class="string">"\n"</span>)))
+    
+    (<span class="keyword">with-temp-buffer</span>
+      (git--exec-buffer <span class="string">"branch"</span> <span class="string">"-l"</span>)
+      (goto-char (point-min))
+
+      (<span class="keyword">while</span> (re-search-forward regexp nil t)
+        (<span class="keyword">let</span> ((branch (match-string 1)))
+          (<span class="keyword">unless</span> (string= branch <span class="string">"(no branch)"</span>)
+            (push branch branchs)))))
+
+
+    branchs))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--select-branch</span> (<span class="type">&amp;rest</span> excepts)
+  <span class="doc">"Select the branch"</span>
+
+  (<span class="keyword">let</span> ((branchs (git--branch-list)))
+    (git--select-from-user <span class="string">"Select Branch : "</span>
+                           (remove-if (<span class="keyword">lambda</span> (b) (member b excepts)) branchs))))
+                         
+(<span class="keyword">defsubst</span> <span class="function-name">git--select-tag</span> ()
+  <span class="doc">"Select the tag"</span>
+
+  (git--select-from-user <span class="string">"Select Tag : "</span> (git--tag-list)))
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--select-revision</span> ()
+  <span class="doc">"Select the revision"</span>
+  
+  (git--select-from-user <span class="string">"Select : "</span> (append (git--branch-list)
+                                             (git--tag-list))))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git--switch-branch-auto-msg</span> nil <span class="doc">"confirm the auto-generated message"</span>)
+
+(<span class="keyword">defun</span> <span class="function-name">git--switch-branch</span> (branch)
+  <span class="doc">"Implementation of switch-branch"</span>
+  
+  (<span class="keyword">let*</span> ((current (git--current-branch))
+         (msg (format <span class="string">"Switch from '%s' to '%s'"</span> current branch)))
+
+    (<span class="keyword">unless</span> git--switch-branch-auto-msg
+      (setq msg (read-from-minibuffer <span class="string">"Commit Log &gt;&gt; "</span> msg)))
+
+    <span class="comment-delimiter">;; </span><span class="comment">commit with a automatically generated msg
+</span>    (git--commit msg <span class="string">"-a"</span>)
+
+    <span class="comment-delimiter">;; </span><span class="comment">switch to different branch
+</span>    (git-checkout branch)))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">vc-git integration
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--update-modeline</span> ()
+  <span class="doc">"Update modeline state dot mark properly"</span>
+  
+  <span class="comment-delimiter">;; </span><span class="comment">mark depending on the fileinfo state
+</span>  (<span class="keyword">when</span> (and buffer-file-name (git--in-vc-mode?))
+    (git--update-state-mark
+     (git--interprete-state-mode-color
+      (git--status-file (file-relative-name buffer-file-name))))))
+
+<span class="comment-delimiter">;; </span><span class="comment">simple highlighting for log view
+</span>(font-lock-add-keywords 'vc-git-log-view-mode
+                        '((<span class="string">"^</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[Aa]uthor</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">[Cc]ommit</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">[Dd]ate</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">"</span>
+                           1 font-lock-keyword-face prepend)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-log</span> ()
+  <span class="doc">"Launch the git log view for the file you opened"</span>
+
+  (interactive)
+
+  (<span class="keyword">if</span> (git--in-vc-mode?)
+      (<span class="keyword">progn</span>
+        <span class="comment-delimiter">;; </span><span class="comment">call vc-log
+</span>        (call-interactively 'vc-print-log)
+
+        <span class="comment-delimiter">;; </span><span class="comment">close window with key 'q'
+</span>        (local-set-key <span class="string">"q"</span> 'git--quit-buffer))
+    (git-log-all)))
+  
+(<span class="keyword">defvar</span> <span class="variable-name">git--log-view-buffer</span> <span class="string">"*git-log-view*"</span>)
+
+(<span class="keyword">defun</span> <span class="function-name">git-log-all</span> ()
+  <span class="doc">"Launch the git log view for the whole project"</span>
+  
+  <span class="comment-delimiter">;; </span><span class="comment">vc-git-log-view-mode
+</span>  (interactive)
+
+  (<span class="keyword">let</span> ((buffer (get-buffer-create git--log-view-buffer)))
+    (<span class="keyword">with-current-buffer</span> buffer
+      (<span class="keyword">let</span> ((buffer-read-only nil)) (erase-buffer))
+
+      (local-set-key <span class="string">"q"</span> 'git--quit-buffer)
+
+      (vc-git-log-view-mode)
+
+      (<span class="keyword">save-excursion</span> 
+        (git--rev-list <span class="string">"--pretty=full"</span> <span class="string">"HEAD"</span>))
+
+      (message <span class="string">"Please 'q' to quit"</span>))
+    (pop-to-buffer buffer)))
+
+(<span class="keyword">defalias</span> '<span class="function-name">git-history</span> 'git-log-all)
+
+(<span class="keyword">defsubst</span> <span class="function-name">git--in-vc-mode?</span> ()
+  <span class="doc">"Check see if in vc-git is under vc-git"</span>
+  
+  (and vc-mode (string-match <span class="string">"^ Git"</span> (substring-no-properties vc-mode))))
+
+(<span class="keyword">defadvice</span> <span class="function-name">vc-find-file-hook</span> (after git--vc-git-find-file-hook activate)
+  <span class="doc">"vc-find-file-hook advice for synchronizing with vc-git interface"</span>
+
+  (<span class="keyword">when</span> (git--in-vc-mode?) (git--update-modeline)))
+
+(<span class="keyword">defadvice</span> <span class="function-name">vc-after-save</span> (after git--vc-git-after-save activate)
+  <span class="doc">"vc-after-save advice for synchronizing when saving buffer"</span>
+
+  (<span class="keyword">when</span> (git--in-vc-mode?) (git--update-modeline)))
+
+(<span class="keyword">defadvice</span> <span class="function-name">vc-next-action</span> (around git--vc-git-next-action activate)
+  <span class="doc">"vc-next-action advice for synchronizing when committing"</span>
+
+  <span class="comment-delimiter">;; </span><span class="comment">vc-mode if nil -&gt; fork git and ask
+</span>  <span class="comment-delimiter">;;         </span><span class="comment">else try to parse git -&gt; if "git" -&gt; ok
+</span>  <span class="comment-delimiter">;;                                  </span><span class="comment">else -&gt; no
+</span>
+  (<span class="keyword">let</span> ((on-git? (or (git--in-vc-mode?)
+                     (<span class="keyword">unless</span> vc-mode (git--managed-on-git?))))
+        (filename <span class="string">""</span>))
+
+    (<span class="keyword">when</span> buffer-file-name
+      (setq filename (file-relative-name buffer-file-name)))
+
+    (<span class="keyword">if</span> on-git?
+      (<span class="keyword">case</span> (git--status-file filename)
+        ('modified (git-commit-all))    <span class="comment-delimiter">; </span><span class="comment">modified -&gt; commit
+</span>        ('unknown (git--add filename))  <span class="comment-delimiter">; </span><span class="comment">unknown  -&gt; add
+</span>        ('unmerged (git--add filename)) <span class="comment-delimiter">; </span><span class="comment">unmerged -&gt; add
+</span>        (t (git--add filename)))        <span class="comment-delimiter">; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : add more
+</span>      ad-do-it)))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">public functions
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--config-get-author</span> ()
+  <span class="doc">"Find appropriate user.name"</span>
+
+  (<span class="keyword">let</span> ((config-user-name (git--config <span class="string">"user.name"</span>)))
+      (or (and (not (string= config-user-name <span class="string">""</span>)) config-user-name)
+          (and (fboundp 'user-full-name) (user-full-name))
+          (and (boundp  'user-full-name) user-full-name))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--config-get-email</span> ()
+  <span class="doc">"Find appropriate user.email"</span>
+  
+  (<span class="keyword">let</span> ((config-user-email (git--config <span class="string">"user.email"</span>)))
+    (or (and (not (string= config-user-email <span class="string">""</span>)) config-user-email)
+        (and (fboundp 'user-mail-address) (user-mail-address))
+        (and (boundp 'user-mail-address) user-mail-address))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--insert-log-header-info</span> ()
+  <span class="doc">"Insert the log header to the buffer"</span>
+
+  (insert (propertize git--log-header-line 'face 'git--log-line-face)  <span class="string">"\n"</span>
+          (git--bold-face <span class="string">"# Branch  : "</span>) (git--current-branch)        <span class="string">"\n"</span>
+          (git--bold-face <span class="string">"# Author  : "</span>) (git--config-get-author)     <span class="string">"\n"</span>
+          (git--bold-face <span class="string">"# Email   : "</span>) (git--config-get-email)      <span class="string">"\n"</span>
+          (git--bold-face <span class="string">"# Date    : "</span>) (git--today)                 <span class="string">"\n"</span>))
+
+(<span class="keyword">defun</span> <span class="function-name">git--insert-log-files-status</span> ()
+  <span class="doc">"Insert log file status to the buffer"</span>
+  
+  (insert (propertize git--log-file-line 'face 'git--log-line-face) <span class="string">"\n"</span>)
+
+  (<span class="keyword">dolist</span> (fi (git--status-index))
+    (insert (format <span class="string">"#  %-15s : %s\n"</span>
+                    (git--status-node-stat fi)
+                    (git--fileinfo-&gt;name fi)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--insert-log-status</span> ()
+  <span class="doc">"Insert log status to the buffer"</span>
+  
+  (insert (propertize git--log-sep-line 'face 'git--log-line-face) <span class="string">"\n"</span>)
+  (git--exec-buffer <span class="string">"status"</span>))
+
+(<span class="keyword">defun</span> <span class="function-name">git--commit-buffer</span> ()
+  <span class="doc">"When you press C-cC-c after editing log, this function is called
+Trim the buffer log and commit"</span>
+  
+  (interactive)
+
+  <span class="comment-delimiter">;; </span><span class="comment">check buffer
+</span>  (<span class="keyword">unless</span> (string= (buffer-name (current-buffer))
+                   git--commit-log-buffer)
+    (<span class="warning">error</span> <span class="string">"Execute git commit on %s buffer"</span> git--commit-log-buffer))
+
+  <span class="comment-delimiter">;; </span><span class="comment">trail and commit
+</span>  (<span class="keyword">save-excursion</span>
+    (goto-char (point-min))
+
+    (<span class="keyword">let</span> ((begin (search-forward git--log-sep-line nil t))
+          (end   (search-forward git--log-sep-line nil t)))
+      (<span class="keyword">when</span> (and begin end)
+        (setq end (- end (length git--log-sep-line)))
+        <span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> sophisticated message
+</span>        (message (git--commit (git--trim-string (buffer-substring begin end)) <span class="string">"-a"</span>)))))
+
+  <span class="comment-delimiter">;; </span><span class="comment">close window
+</span>  (delete-window)
+  (kill-buffer git--commit-log-buffer)
+
+  <span class="comment-delimiter">;; </span><span class="comment">update
+</span>  (git--update-modeline))
+
+(<span class="keyword">defun</span> <span class="function-name">git--resolve-fill-buffer</span> (template side)
+  <span class="doc">"Make the new buffer based on the conflicted template on each side(working and checkedin)"</span>
+
+  (<span class="keyword">let*</span> ((filename (file-relative-name (buffer-file-name template)))
+         (buffer-name (concat <span class="string">"*"</span> filename <span class="string">": "</span> (capitalize (symbol-name side)) <span class="string">"*"</span>))
+         (buffer (get-buffer-create buffer-name))
+         (msg <span class="string">"Malformed conflict marker"</span>))
+
+    (<span class="keyword">with-current-buffer</span> buffer
+      (<span class="keyword">let</span> ((buffer-read-only nil) (erase-buffer)))
+      (insert-buffer-substring template)
+
+      <span class="comment-delimiter">;; </span><span class="comment">find first mark
+</span>      (goto-char (point-min))
+      (<span class="keyword">while</span> (re-search-forward <span class="string">"^&lt;&lt;&lt;&lt;&lt;&lt;&lt; </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[</span><span class="string"><span class="negation-char">^</span></span><span class="string">\n]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">\n"</span> nil t)
+        (replace-match <span class="string">""</span>)
+
+        (<span class="keyword">let</span> (conflict-begin conflict-sep conflict-end)
+          (setq conflict-begin (match-beginning 0))
+
+          <span class="comment-delimiter">;; </span><span class="comment">find mid mark
+</span>          (<span class="keyword">unless</span> (re-search-forward <span class="string">"^=======\n"</span> nil t) (<span class="warning">error</span> msg))
+          (replace-match <span class="string">""</span>)
+
+          (setq conflict-sep (match-beginning 0))
+
+          <span class="comment-delimiter">;; </span><span class="comment">find last mark
+</span>          (<span class="keyword">unless</span> (re-search-forward <span class="string">"^&gt;&gt;&gt;&gt;&gt;&gt;&gt; </span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[</span><span class="string"><span class="negation-char">^</span></span><span class="string">\n]+</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">\n"</span> nil t) (<span class="warning">error</span> msg))
+          (replace-match <span class="string">""</span>)
+
+          (setq conflict-end (match-beginning 0))
+
+          (<span class="keyword">case</span> side
+            ('workfile (delete-region conflict-sep conflict-end))
+            ('checked-in (delete-region conflict-begin conflict-sep))
+            (t (<span class="warning">error</span> <span class="string">"Side argument have to be one of 'workfile or 'checked-in"</span>))))))
+    buffer-name))
+
+(<span class="keyword">defun</span> <span class="function-name">git-merge</span> ()
+  <span class="doc">"Git merge"</span>
+
+  (interactive)
+
+  (<span class="keyword">let</span> ((branch (git--select-branch (git--current-branch))))
+    (git--merge branch)
+    (git-status <span class="string">"."</span>)))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git--resolve-window-config</span>)
+(<span class="keyword">defvar</span> <span class="variable-name">git--resolve-buffer</span>)
+
+(<span class="keyword">defun</span> <span class="function-name">git--resolve-merge-buffer</span> (result-buffer)
+  <span class="doc">"Implementation of resolving conflicted buffer"</span>
+
+  (setq result-buffer (current-buffer))
+  
+  (interactive)
+  (<span class="keyword">let*</span> ((filename (file-relative-name buffer-file-name))
+         (your-buffer (git--resolve-fill-buffer result-buffer 'workfile))
+         (other-buffer (git--resolve-fill-buffer result-buffer 'checked-in))
+         (config (current-window-configuration))
+         (ediff-default-variant 'default-B))
+
+    <span class="comment-delimiter">;; </span><span class="comment">set merge buffer first
+</span>    (set-buffer (ediff-merge-buffers your-buffer other-buffer))
+
+    (set (make-local-variable 'git--resolve-buffer) result-buffer)
+    (set (make-local-variable 'git--resolve-window-config) config)
+    (set (make-local-variable 'ediff-quit-hook)
+         #'(<span class="keyword">lambda</span> ()
+             (<span class="keyword">let</span> ((buffer-A ediff-buffer-A)
+                   (buffer-B ediff-buffer-B)
+                   (buffer-C ediff-buffer-C)
+                   (windows git--resolve-window-config)
+                   (result git--resolve-buffer))
+               (ediff-cleanup-mess)
+               (set-buffer result)
+               (erase-buffer)
+               (insert-buffer-substring buffer-C)
+               (kill-buffer buffer-A)
+               (kill-buffer buffer-B)
+               (kill-buffer buffer-C)
+               (set-window-configuration windows)
+               (message <span class="string">"Conflict resolution finished, you may save the buffer"</span>))))
+    (message <span class="string">"Please resolve conflicts now, exit ediff when done"</span>)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-resolve-merge</span> ()
+  <span class="doc">"Resolve merge for the current buffer"</span>
+  
+  (interactive)
+  (git--resolve-merge-buffer (current-buffer)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-commit-all</span> ()
+  <span class="doc">"git commit -a like commit command"</span>
+
+  (interactive)
+  
+  (<span class="keyword">let</span> ((cur-pos nil)
+        (buffer (get-buffer-create git--commit-log-buffer)))
+    (<span class="keyword">with-current-buffer</span> buffer
+      (local-set-key <span class="string">"\C-c\C-c"</span> 'git--commit-buffer)
+      (erase-buffer)
+
+      <span class="comment-delimiter">;; </span><span class="comment">insert info
+</span>      (git--insert-log-header-info)
+      (git--insert-log-files-status)
+
+      <span class="comment-delimiter">;; </span><span class="comment">real log space
+</span>      (insert (propertize git--log-sep-line 'face 'git--log-line-face) <span class="string">"\n"</span>)
+
+      (insert <span class="string">"\n"</span>)
+      (setq cur-pos (point))
+      (insert <span class="string">"\n\n"</span>)
+
+      <span class="comment-delimiter">;; </span><span class="comment">git status
+</span>      (git--insert-log-status)
+      
+      <span class="comment-delimiter">;; </span><span class="comment">set cursor 
+</span>      (goto-char cur-pos)
+
+      <span class="comment-delimiter">;; </span><span class="comment">flyspell-mode
+</span>      (<span class="keyword">when</span> git--log-flyspell-mode (flyspell-mode t))
+
+      <span class="comment-delimiter">;; </span><span class="comment">hello~
+</span>      (message <span class="string">"Please 'C-cC-c' to commit"</span>))
+    (pop-to-buffer buffer)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-init</span> (dir)
+  <span class="doc">"Initialize the git repository"</span>
+
+  (interactive <span class="string">"DGit Repository: "</span>)
+  (message (git--trim-string (git--init dir)))
+  (git-config-init))
+
+(<span class="keyword">defun</span> <span class="function-name">git-init-from-archive</span> (file)
+  <span class="doc">"Initialize the git repository based on the archive"</span>
+  
+  (interactive <span class="string">"fSelect archive: "</span>)
+
+  <span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> dirty enough
+</span>  <span class="comment-delimiter">;; </span><span class="comment">simple rule to uncompress -&gt; dired-compress not working propery
+</span>  (<span class="keyword">with-temp-buffer</span>
+    (cd (file-name-directory file))
+    
+    (<span class="keyword">when</span> (file-exists-p file)
+      (<span class="keyword">let</span> ((ext (file-name-extension file)))
+        (<span class="keyword">cond</span>
+         ((string= ext <span class="string">"tar"</span>)
+          (shell-command (format <span class="string">"tar xf \"%s\""</span> (file-relative-name file))))
+         ((string= ext <span class="string">"gz"</span>)
+          (shell-command (format <span class="string">"tar xzf \"%s\""</span> (file-relative-name file))))
+         (t (<span class="warning">error</span> (concat ext <span class="string">" is not supported"</span>))))))
+
+    (<span class="keyword">let</span> ((dir (file-name-sans-extension
+                (file-name-sans-extension file))))
+      <span class="comment-delimiter">;; </span><span class="comment">move to git repository
+</span>      (cd dir)
+
+      <span class="comment-delimiter">;; </span><span class="comment">init
+</span>      (git-init dir)
+      (git--add <span class="string">"."</span>)
+      (git-commit-all))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-clone</span> (dir)
+  <span class="doc">"Clone from repository"</span>
+  
+  (interactive <span class="string">"DLocal Directory : "</span>)
+  (<span class="keyword">let</span> ((repository (ido-completing-read <span class="string">"Repository : "</span>
+                                         git--repository-bookmarks
+                                         nil
+                                         nil
+                                         <span class="string">""</span>
+                                         git--repository-history)))
+    (<span class="keyword">with-temp-buffer</span>
+      (cd dir)
+      (git--clone repository))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-reset-hard</span> (<span class="type">&amp;rest</span> args)
+  <span class="doc">"Reset hard"</span>
+
+  (interactive)
+  (message (git--trim-string (git--reset <span class="string">"--hard"</span> (git--select-tag)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-revert</span> ()
+  <span class="doc">"Revert to other revision"</span>
+
+  (interactive)
+  (message (git--trim-string (git--revert (git--select-revision))))
+
+  <span class="comment-delimiter">;; </span><span class="comment">revert buffer
+</span>  (revert-buffer))
+
+(<span class="keyword">defun</span> <span class="function-name">gitk</span> ()
+  <span class="doc">"Launch gitk in emacs"</span>
+
+  (interactive)
+  (start-process <span class="string">"gitk"</span> nil <span class="string">"gitk"</span>))
+    
+(<span class="keyword">defun</span> <span class="function-name">git-checkout</span> (<span class="type">&amp;optional</span> rev)
+  <span class="doc">"Checkout from 'tag' &amp; 'branch' list when 'rev' is null"</span>
+
+  (interactive)
+  (<span class="keyword">unless</span> rev (setq rev (git--select-revision)))
+
+  <span class="comment-delimiter">;; </span><span class="comment"><span class="warning">TODO</span></span><span class="comment"> : sophisticated message control
+</span>  (message (git--trim-string (git--checkout rev))))
+
+(<span class="keyword">defalias</span> '<span class="function-name">git-create-branch</span> 'git-checkout-to-new-branch)
+
+(<span class="keyword">defun</span> <span class="function-name">git-checkout-to-new-branch</span> (branch)
+  <span class="doc">"Checkout to new list based on tag"</span>
+
+  (interactive <span class="string">"sNew Branch : "</span>)
+  (<span class="keyword">let*</span> ((tag (git--select-revision))
+         (msg (git--checkout <span class="string">"-b"</span> branch tag)))
+    (<span class="keyword">if</span> (string-match <span class="string">"^Switched"</span> msg)
+        (message <span class="string">"%s to the new branch '%s'"</span>
+                 (git--bold-face <span class="string">"Switched"</span>)
+                 (git--bold-face branch))
+      (message <span class="string">"%s on creating '%s' from '%s'"</span>
+               git--msg-critical
+               (git--bold-face branch)
+               (git--bold-face tag))))
+
+  <span class="comment-delimiter">;; </span><span class="comment">refresh buffer content
+</span>  (revert-buffer))
+
+
+(<span class="keyword">defun</span> <span class="function-name">git-delete-branch</span> (<span class="type">&amp;optional</span> branch)
+  <span class="doc">"Delete branch after selecting branch"</span>
+
+  (interactive)
+
+  <span class="comment-delimiter">;; </span><span class="comment">select branch if not assigned
+</span>  (<span class="keyword">unless</span> branch (setq branch (git--select-branch <span class="string">"master"</span>)))
+  
+  (<span class="keyword">let*</span> ((msg (git--branch <span class="string">"-d"</span> branch)))
+    (<span class="keyword">if</span> (string-match <span class="string">"^Deleted"</span> msg)
+        (message <span class="string">"%s '%s' branch"</span> (git--bold-face <span class="string">"Deleted"</span>) branch)
+      (message <span class="string">"%s on %s '%s' branch in '%s' branch"</span>
+               git--msg-critical
+               (git--bold-face <span class="string">"deleting"</span>)
+               (git--bold-face branch)
+               (git--current-branch)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-delete-tag</span> ()
+  <span class="doc">"Delete tag after selecting tag"</span>
+  
+  (interactive)
+  (<span class="keyword">let</span> ((tag (git--select-tag)))
+    (<span class="keyword">if</span> (string-match <span class="string">"^Deleted"</span> (git--tag <span class="string">"-d"</span> tag))
+        (message <span class="string">"%s '%s' Tag"</span> (git--bold-face <span class="string">"Deleted"</span>) tag)
+      (message <span class="string">"%s on %s '%s' Tag"</span>
+               git--msg-critical
+               (git--bold-face <span class="string">"deleting"</span>)
+               tag))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-status</span> (dir)
+  <span class="doc">"Launch git-status mode at the directory if it is under 'git'"</span>
+
+  (interactive <span class="string">"DSelect directory: "</span>)
+
+  (setq dir (git--get-top-dir dir))
+  (<span class="keyword">if</span> (file-directory-p (git--expand-to-repository-dir dir))
+      (<span class="keyword">progn</span>
+        (switch-to-buffer (git--create-status-buffer dir))
+        (cd dir)
+        (git--status-mode)
+        (git--status-new)
+        (git--status-view-first-line))
+    <span class="comment-delimiter">;; </span><span class="comment">(add-hook 'after-save-hook 'git-update-saved-file)))
+</span>    (message <span class="string">"%s is not a git working tree."</span> dir)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-regression</span> ()
+  <span class="doc">"Regression tests on git-emacs, but have to enhance it!"</span>
+
+  (interactive)
+
+  <span class="comment-delimiter">;; </span><span class="comment">git exec
+</span>  (<span class="warning">assert</span> (string= <span class="string">"\n"</span> (git--exec-string <span class="string">"rev-parse"</span> <span class="string">"--show-cdup"</span>)))
+  (<span class="warning">assert</span> (string= (expand-file-name <span class="string">"./"</span>) (git--get-top-dir <span class="string">"."</span>)))
+
+  <span class="comment-delimiter">;; </span><span class="comment">create status buffer
+</span>  (<span class="warning">assert</span> (string= (buffer-name (git--create-status-buffer <span class="string">"."</span>))
+                   (git--status-buffer-name <span class="string">"."</span>)))
+
+  <span class="comment-delimiter">;; </span><span class="comment">open status buffer
+</span>  (<span class="warning">assert</span> (string= (buffer-name (git--create-status-buffer <span class="string">"."</span>))
+                   (git--status-buffer-name <span class="string">"."</span>)))
+
+  (git--kill-status-buffer <span class="string">"."</span>)
+
+  <span class="comment-delimiter">;; </span><span class="comment">testing
+</span>  (<span class="warning">assert</span> (null (string-match <span class="string">"asdf/"</span> <span class="string">"asdf"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-cmd</span> (str)
+  <span class="doc">"git-cmd for user"</span>
+
+  (interactive <span class="string">"s&gt;&gt; git "</span>)
+  (message (git--trim-tail
+            (apply #'git--exec-string (split-string str)))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--cat-file</span> (buffer-name <span class="type">&amp;rest</span> args)
+  <span class="doc">"Execute git-cat-file and return the buffer with the file content"</span>
+  
+  (<span class="keyword">let</span> ((buffer (get-buffer-create buffer-name)))
+    (<span class="keyword">with-current-buffer</span> buffer
+
+      <span class="comment-delimiter">;; </span><span class="comment">set buffer writable
+</span>      (setq buffer-read-only nil)
+      (erase-buffer)
+
+      <span class="comment-delimiter">;; </span><span class="comment">set tricky auto mode for highlighting
+</span>      (<span class="keyword">let</span> ((buffer-file-name buffer-name)) (set-auto-mode))
+
+      <span class="comment-delimiter">;; </span><span class="comment">ok cat file to buffer
+</span>      (apply #'git--exec-buffer <span class="string">"cat-file"</span> args)
+
+      <span class="comment-delimiter">;; </span><span class="comment">set buffer readonly &amp; quit
+</span>      (setq buffer-read-only t)
+
+      <span class="comment-delimiter">;; </span><span class="comment">check see if failed
+</span>      (goto-char (point-min))
+      (<span class="keyword">when</span> (looking-at <span class="string">"^</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">(</span></span><span class="string">[Ff]atal</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">[Ff]ailed</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">|</span></span><span class="string">[Ee]rror</span><span class="string"><span class="regexp-grouping-backslash">\\</span></span><span class="string"><span class="regexp-grouping-construct">)</span></span><span class="string">:"</span>)
+        (<span class="keyword">let</span> ((msg (buffer-string)))
+          (kill-buffer nil)
+          (setq buffer nil)
+          (<span class="warning">error</span> (git--trim-tail msg)))))
+    buffer))
+
+(<span class="keyword">defvar</span> <span class="variable-name">git--diff-buffer</span> nil <span class="doc">"locally saved buffer for ediffing"</span>)
+(<span class="keyword">defvar</span> <span class="variable-name">git--diff-window</span> nil <span class="doc">"locally saved windows for ediffing"</span>)
+
+(<span class="keyword">defun</span> <span class="function-name">git--diff</span> (file rev <span class="type">&amp;rest</span> args)
+  <span class="doc">"Implementation of git-diff, it should be called with file and revision"</span>
+
+  (setq abspath (expand-file-name file))
+  
+  (<span class="keyword">let*</span> ((buf1 (find-file-noselect file))
+     (buf2 nil)
+     (config (current-window-configuration)))
+  
+    <span class="comment-delimiter">;; </span><span class="comment">build buf2
+</span>    (<span class="keyword">with-temp-buffer</span> 
+      (<span class="keyword">let</span> ((abspath (expand-file-name file))
+        (filename nil))
+
+    <span class="comment-delimiter">;; </span><span class="comment">get relative to git root dir
+</span>    (cd (git--get-top-dir (file-name-directory file)))
+    (setq rev (concat rev (file-relative-name abspath)))
+    (setq buf2 (git--cat-file rev <span class="string">"blob"</span> rev))))
+
+    <span class="comment-delimiter">;; </span><span class="comment">set ediff type
+</span>    (setq ediff-split-window-function 'split-window-horizontally)
+    (set-buffer (ediff-buffers buf1 buf2))
+ 
+    (set (make-local-variable 'git--diff-buffer) buf2)
+    (set (make-local-variable 'git--diff-window) config)
+    (set (make-local-variable 'ediff-quit-hook)
+         #'(<span class="keyword">lambda</span> ()
+             (<span class="keyword">let</span> ((buffer git--diff-buffer)
+                   (window git--diff-window))
+               
+               (ediff-cleanup-mess)               
+               (set-buffer buffer)
+               (kill-buffer buffer)
+               (set-window-configuration window))))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-diff-head</span> (file)
+  <span class="doc">"Simple diffing with the previous HEAD"</span>
+  
+  (interactive <span class="string">"fSelect Diff Target : "</span>)
+  (git--diff file <span class="string">"HEAD:"</span>))
+
+(<span class="keyword">defun</span> <span class="function-name">git-diff</span> (file)
+  <span class="doc">"Diffing with the target file and revision user selected"</span>
+
+  (interactive <span class="string">"fSelect Diff Target : "</span>)
+
+  (<span class="keyword">let</span> ((prompt (format <span class="string">"git diff [rev]:%s &gt;&gt; "</span> (file-relative-name file))))
+    (git--diff file (concat (read-from-minibuffer prompt <span class="string">"HEAD"</span>) <span class="string">":"</span>))))
+
+(<span class="keyword">defun</span> <span class="function-name">git-config-init</span> ()
+  <span class="doc">"Set initial configuration, it query the logined user information"</span>
+
+  (interactive)
+
+  (<span class="keyword">let</span> ((name (git--trim-string (git--config <span class="string">"user.name"</span>)))
+        (email (git--trim-string (git--config <span class="string">"user.email"</span>))))
+
+    (<span class="keyword">when</span> (or (null name) (string= <span class="string">""</span> name))
+      (setq name (read-from-minibuffer <span class="string">"User Name : "</span>
+                                       (git--config-get-author)))
+
+      (git--config <span class="string">"--global"</span> <span class="string">"user.name"</span> name))
+    
+    (<span class="keyword">when</span> (or (null email) (string= <span class="string">""</span> email))
+      (setq email (read-from-minibuffer <span class="string">"User Email : "</span>
+                                        (git--config-get-email)))
+
+      (git--config <span class="string">"--global"</span> <span class="string">"user.email"</span> email))
+
+    (message <span class="string">"Set user.name(%s) and user.email(%s)"</span> name email)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-ignore</span> (ignored-opt)
+  <span class="doc">"Add ignore file"</span>
+  
+  (interactive <span class="string">"sIgnore Option : "</span>)
+
+  (<span class="keyword">with-temp-buffer</span>
+    (insert ignored-opt <span class="string">"\n"</span>)
+    (append-to-file (point-min) (point-max) <span class="string">".gitignore"</span>)))
+  
+(<span class="keyword">defun</span> <span class="function-name">git-switch-branch</span> ()
+  <span class="doc">"Git switch branch, user have to select the branch which you will move on"</span>
+  
+  (interactive)
+  (git--switch-branch (git--select-branch (git--current-branch)))
+  (revert-buffer))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span><span class="comment-delimiter">;; </span><span class="comment">branch mode
+</span><span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">defvar</span> <span class="variable-name">git--branch-mode-map</span> nil)
+(<span class="keyword">defvar</span> <span class="variable-name">git--branch-mode-hook</span> nil)
+
+(<span class="keyword">unless</span> git--branch-mode-map
+  (<span class="keyword">let</span> ((map (make-keymap)))
+    (suppress-keymap map)
+
+    (define-key map <span class="string">"q"</span>     'git--branch-mode-quit)
+    (define-key map <span class="string">"n"</span>     'next-line)
+    (define-key map <span class="string">"p"</span>     'previous-line)
+
+    (define-key map <span class="string">"d"</span>     'git--branch-mode-delete)
+    (define-key map <span class="string">"c"</span>     'git--branch-mode-checkout)
+    (define-key map <span class="string">"s"</span>     'git--branch-mode-switch)
+    (define-key map <span class="string">"\C-m"</span>  'git--branch-mode-switch)
+
+    (setq git--branch-mode-map map)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-throw</span> (data)
+  <span class="doc">"Git branch mode template to exit buffer"</span>
+
+  (<span class="keyword">let</span> ((branch (buffer-substring (point) (line-end-position))))
+    (<span class="keyword">throw</span> '<span class="constant">git--branch-mode-selected</span> (cons data branch))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-quit</span> ()
+  <span class="doc">"Git branch mode quit"</span>
+
+  (interactive)
+  (<span class="keyword">throw</span> '<span class="constant">git--branch-mode-selected</span> nil))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-delete</span> ()
+  <span class="doc">"Git branch mode delete"</span>
+
+  (interactive)
+  (git--branch-mode-throw 'delete))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-switch</span> ()
+  <span class="doc">"Git branch mode switch"</span>
+
+  (interactive)
+  (git--branch-mode-throw 'switch))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-checkout</span> ()
+  <span class="doc">"Git branch mode checkout"</span>
+
+  (interactive)
+  (git--branch-mode-throw 'checkout))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode</span> ()
+  <span class="doc">"Set current buffer as branch-mode"</span>
+  
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+
+  <span class="comment-delimiter">;; </span><span class="comment">set major mode
+</span>  (setq mode-name <span class="string">"git branch"</span>)
+  (setq major-mode 'git-branch-mode)
+
+  (use-local-map git--branch-mode-map)
+
+  <span class="comment-delimiter">;; </span><span class="comment">delete buffer
+</span>  (<span class="keyword">let</span> ((buffer-read-only nil)) (erase-buffer))
+
+  (setq buffer-read-only t)
+  (setq header-line-format <span class="string">"Branch List"</span>)
+
+  (run-hooks 'git--branch-mode-hook))
+
+<span class="comment-delimiter">;; </span><span class="comment">copied from electric buffer
+</span>(<span class="keyword">defvar</span> <span class="variable-name">git--branch-mode-overlay</span> nil)
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-highlight</span> ()
+  <span class="doc">"Highlight the one line, it is copied from electric buffer"</span>
+  
+  (<span class="keyword">when</span> (eq major-mode 'git-branch-mode)
+    (or git--branch-mode-overlay
+        (<span class="keyword">progn</span>
+          (make-local-variable 'git--branch-mode-overlay)
+          (setq git--branch-mode-overlay (make-overlay (point) (point)))))
+
+    (move-overlay git--branch-mode-overlay
+                  (<span class="keyword">save-excursion</span> (beginning-of-line) (point))
+                  (<span class="keyword">save-excursion</span> (end-of-line) (+ 1 (point))))
+
+    (overlay-put git--branch-mode-overlay 'face 'highlight)))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-view</span> ()
+  <span class="doc">"Display the branch list to branch-mode buffer and return the end mark of the buffer"</span>
+  
+  <span class="comment-delimiter">;; </span><span class="comment">beginning of buffer name position
+</span>  (setq goal-column 3)
+
+  (<span class="keyword">let</span> ((current-branch (git--current-branch))
+        (branch-list (git--branch-list))
+        (buffer-read-only nil))
+
+    (<span class="keyword">dolist</span> (branch branch-list)
+      (insert (format <span class="string">"%2s %s\n"</span>
+                      (<span class="keyword">if</span> (string= current-branch branch)
+                          (git--bold-face <span class="string">"*"</span>) <span class="string">" "</span>)
+                      branch)))
+
+    (goto-char (point-min))
+    (length branch-list)))
+
+(<span class="keyword">defun</span> <span class="function-name">git-branch</span> ()
+  <span class="doc">"Launch git-branch mode"</span>
+
+  (interactive)
+
+  (<span class="keyword">let</span> ((selected-branch nil)
+        (buffer (get-buffer-create <span class="string">"*git-branch*"</span>))
+        (windows (current-window-configuration))
+        (nbranchs 0))
+
+    (<span class="keyword">with-current-buffer</span> buffer
+      <span class="comment-delimiter">;; </span><span class="comment">set branch mode 
+</span>      (git--branch-mode)
+
+      <span class="comment-delimiter">;; </span><span class="comment">set branch mode view
+</span>      (setq nbranchs (git--branch-mode-view))
+
+      <span class="comment-delimiter">;; </span><span class="comment">pop up
+</span>      (electric-pop-up-window buffer)
+      (git--branch-mode-loop nbranchs nil)
+      
+      (<span class="keyword">unwind-protect</span>
+          (setq selected-branch
+                (<span class="keyword">catch</span> '<span class="constant">git--branch-mode-selected</span>
+                  (electric-command-loop 'git--branch-mode-selected
+                                         nil
+                                         t
+                                         'git--branch-mode-loop
+                                         nbranchs))))
+
+      <span class="comment-delimiter">;; </span><span class="comment">exit buffer and restore configuration of the windows
+</span>      (set-window-configuration windows)
+      (kill-buffer buffer)
+
+      <span class="comment-delimiter">;; </span><span class="comment">interpret command 
+</span>      (git--branch-mode-interprete selected-branch))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-interprete</span> (selected-branch)
+  <span class="doc">"git-branch command interpreter,
+if 'delete -&gt; call 'git-delete-branch
+if 'switch -&gt; call 'git-switch-branch
+if 'checkout -&gt; call git-checkout-to-new-branch"</span>
+
+  (<span class="keyword">when</span> selected-branch
+    (<span class="keyword">let</span> ((command (car selected-branch))
+          (branch (cdr selected-branch)))
+    (<span class="keyword">case</span> command
+      ('delete
+       (<span class="keyword">when</span> (y-or-n-p (format <span class="string">"Would you like to %s the branch, %s? "</span>
+                               (git--bold-face <span class="string">"delete"</span>)
+                               (git--bold-face branch)))
+         (git-delete-branch branch)))
+      ('switch
+       (<span class="keyword">when</span> (y-or-n-p (format <span class="string">"Would you like to %s from %s to %s branch? "</span>
+                               (git--bold-face <span class="string">"switch"</span>)
+                               (git--bold-face (git--current-branch))
+                               (git--bold-face branch)))
+         (git--switch-branch branch)
+         (revert-buffer)))
+      ('checkout (call-interactively 'git-checkout-to-new-branch))))))
+
+(<span class="keyword">defun</span> <span class="function-name">git--branch-mode-loop</span> (stat cond)
+  <span class="doc">"git-branch mode loop interpreter, update the highlight"</span>
+
+  (interactive)
+
+  <span class="comment-delimiter">;; </span><span class="comment">adjust when end of the branches
+</span>  (<span class="keyword">if</span> (&gt; (line-number-at-pos) stat)
+      (previous-line))
+
+  <span class="comment-delimiter">;; </span><span class="comment">adjust column
+</span>  (beginning-of-line)
+  (forward-char goal-column)
+
+  <span class="comment-delimiter">;; </span><span class="comment">highlight
+</span>  (git--branch-mode-highlight))
+
+<span class="comment-delimiter">;;</span><span class="comment">-----------------------------------------------------------------------------
+</span>
+(<span class="keyword">provide</span> '<span class="constant">git-emacs</span>)</pre>
+  </body>
+</html>
diff --git a/site/git-emacs/docs/git-emacs.html b/site/git-emacs/docs/git-emacs.html
new file mode 100644
index 0000000..f77e756
--- /dev/null
+++ b/site/git-emacs/docs/git-emacs.html
@@ -0,0 +1,1020 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <title>A Guided Tour of emacs-git (by TSKim)</title>
+    <meta name="generator" content="muse.el">
+    <meta http-equiv="Content-Type"
+          content="text/html; charset=utf-8">
+  </head>
+  <body>
+    <h1>A Guided Tour of emacs-git (by TSKim)</h1>
+    <!-- Page published by Emacs Muse begins here -->
+<div class="contents">
+<dl>
+<dt>
+<a href="#sec1">Installation</a>
+</dt>
+<dt>
+<a href="#sec2">Configuration</a>
+</dt>
+<dt>
+<a href="#sec3">Cloning</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec4">1. Run 'git-clone'</a>
+</dt>
+<dt>
+<a href="#sec5">2. Select local directory</a>
+</dt>
+<dt>
+<a href="#sec6">3. Select repository</a>
+</dt>
+<dt>
+<a href="#sec7">4. All things done</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec8">Importing</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec9">1. run 'git-init-from-archive'</a>
+</dt>
+<dt>
+<a href="#sec10">2. Select archive file</a>
+</dt>
+<dt>
+<a href="#sec11">3. If necessary, set config user.name and user.email</a>
+</dt>
+<dt>
+<a href="#sec12">4. Initial commit</a>
+</dt>
+<dt>
+<a href="#sec13">5. Commited result</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec14">Making changes</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec15">1. Open the file which is under the git</a>
+</dt>
+<dt>
+<a href="#sec16">2. Editing sources and saving the changes</a>
+</dt>
+<dt>
+<a href="#sec17">3. Commit your changes with 'C-x v v' key or 'git-commit-all'</a>
+</dt>
+<dt>
+<a href="#sec18">4. All things done</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec19">Viewing project history</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec20">1. Run 'git-history' for project or 'git-log' for each file</a>
+</dt>
+<dt>
+<a href="#sec21">2. 'vc-log' history browser with fancy color</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec22">Managing Branches</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec23">1. Show branchs with 'git-branch'</a>
+</dt>
+<dt>
+<a href="#sec24">2. Create new branch with 'c' in git-branch buffer</a>
+</dt>
+<dt>
+<a href="#sec25">3. Select the base branch</a>
+</dt>
+<dt>
+<a href="#sec26">4. All things done</a>
+</dt>
+<dt>
+<a href="#sec27">5. Topic : Switch to other branch</a>
+</dt>
+<dt>
+<a href="#sec28">6. Topic : Delete branches</a>
+</dt>
+<dt>
+<a href="#sec29">7. Topic : gitk</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec30">Tagging</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec31">1. Create new tag 'git-tag' or 'git-snapshot'</a>
+</dt>
+<dt>
+<a href="#sec32">2. Input the tag</a>
+</dt>
+<dt>
+<a href="#sec33">3.  All things done</a>
+</dt>
+<dt>
+<a href="#sec34">4. Checking out</a>
+</dt>
+<dt>
+<a href="#sec35">5. Checking out to new branch</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec36">Diffing</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec37">1.  Run  'git-diff'</a>
+</dt>
+<dt>
+<a href="#sec38">2. Select diffing target</a>
+</dt>
+<dt>
+<a href="#sec39">3. Select diffing revision</a>
+</dt>
+<dt>
+<a href="#sec40">4. Ediff</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec41">Merging</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec42">1. Try to merge from other branch with 'git-merge'</a>
+</dt>
+<dt>
+<a href="#sec43">2. Select target branch</a>
+</dt>
+<dt>
+<a href="#sec44">3. After merge</a>
+</dt>
+<dt>
+<a href="#sec45">4. 3 way merge</a>
+</dt>
+<dt>
+<a href="#sec46">5. After resolving conflicts</a>
+</dt>
+</dl>
+</dd>
+<dt>
+<a href="#sec47">Checking the status of the project</a>
+</dt>
+<dd>
+<dl>
+<dt>
+<a href="#sec48">Run 'git-status'</a>
+</dt>
+<dt>
+<a href="#sec49">Inspecting Directory</a>
+</dt>
+<dt>
+<a href="#sec50">Naive command on git with '.'</a>
+</dt>
+<dt>
+<a href="#sec51">Rename with 'r'</a>
+</dt>
+<dt>
+<a href="#sec52">Marking with '*'</a>
+</dt>
+<dt>
+<a href="#sec53">Add .gitignore with 'i'</a>
+</dt>
+<dt>
+<a href="#sec54">Switching branch with 'b'</a>
+</dt>
+<dt>
+<a href="#sec55">Sarcastic blame! with '?'</a>
+</dt>
+<dt>
+<a href="#sec56">Summary mode with 's'</a>
+</dt>
+</dl>
+</dd>
+</dl>
+</div>
+
+
+<h2><a name="sec1" id="sec1"></a>
+Installation</h2>
+
+<ul>
+<li><a href="./git-emacs-1.1.tar.gz">Download git-emacs-1.1.tar.gz</a> [git clone git://github.com/tsgates/git-emacs.git] </li>
+<li><a href="./git-emacs.el.html">git-emacs.el</a>/<a href="./git-emacs.el">raw</a></li>
+<li><a href="./git-modeline.el.html">git-modeline.el</a>/<a href="./git-modeline.el">raw</a></li>
+<li><a href="./git-blame.el.html">git-blame.el</a>/<a href="./git-blame.el">raw</a></li>
+</ul>
+
+<pre class="src">
+(add-to-list 'load-path <span style="color: #bc8f8f;">"/home/tsgates/Skills/git/git-emacs-1.0"</span>)
+(<span style="color: #a020f0;">require</span> '<span style="color: #5f9ea0;">git-emacs</span>)
+</pre>
+
+
+<h2><a name="sec2" id="sec2"></a>
+Configuration</h2>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./config-init.png" alt="git-config-init command"></td></tr>
+  <tr><td align="center" class="image-caption">git-config-init command</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./config-init2.png" alt="Automatically set current user.name &amp; user.email"></td></tr>
+  <tr><td align="center" class="image-caption">Automatically set current user.name &amp; user.email</td></tr>
+</table>
+
+<ul>
+<li>Set <u>user.name</u> &amp; <u>user.email</u> if it is not set yet</li>
+<li>But, git-emacs recommends the <u>full name</u> and <u>email address</u> of the <u>user logged in</u></li>
+</ul>
+
+
+<h2><a name="sec3" id="sec3"></a>
+Cloning</h2>
+
+<h3><a name="sec4" id="sec4"></a>
+1. Run 'git-clone'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone0.png" alt="Run 'git-clone'"></td></tr>
+  <tr><td align="center" class="image-caption">Run 'git-clone'</td></tr>
+</table>
+
+<ul>
+<li>Run 'git-clone'</li>
+</ul>
+
+
+<h3><a name="sec5" id="sec5"></a>
+2. Select local directory</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone1.png" alt="Move directory"></td></tr>
+  <tr><td align="center" class="image-caption">Move directory</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone2.png" alt="Select the directory to be cloned"></td></tr>
+  <tr><td align="center" class="image-caption">Select the directory to be cloned</td></tr>
+</table>
+
+<ul>
+<li>With <em>'ido'</em> interface, you can change directory</li>
+<li>Create directory with <em>'C-m'</em> (<em>'M-n'</em>, <em>'M-p'</em> to search history, reference to <em>'ido'</em>)</li>
+</ul>
+
+
+<h3><a name="sec6" id="sec6"></a>
+3. Select repository</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone3.png" alt="Select repository"></td></tr>
+  <tr><td align="center" class="image-caption">Select repository</td></tr>
+</table>
+
+<ul>
+<li>Select repositories from <u>history</u> and your <u>bookmarks</u> or type new one</li>
+</ul>
+
+
+<h3><a name="sec7" id="sec7"></a>
+4. All things done</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone4.png" alt="Start to clone from repository"></td></tr>
+  <tr><td align="center" class="image-caption">Start to clone from repository</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./clone5.png" alt="All things done"></td></tr>
+  <tr><td align="center" class="image-caption">All things done</td></tr>
+</table>
+
+<ul>
+<li>Support <u>asynchronous</u> downloading from the repository</li>
+<li>All things ok, you can see message <em>&quot;Cloned&quot;</em>!</li>
+</ul>
+
+
+
+<h2><a name="sec8" id="sec8"></a>
+Importing</h2>
+
+<h3><a name="sec9" id="sec9"></a>
+1. run 'git-init-from-archive'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./init-archive1.png" alt="Init from archive"></td></tr>
+  <tr><td align="center" class="image-caption">Init from archive</td></tr>
+</table>
+
+<ul>
+<li>Run 'git-init-from-archive'</li>
+</ul>
+
+
+<h3><a name="sec10" id="sec10"></a>
+2. Select archive file</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./init-archive2.png" alt="Selecting archive file"></td></tr>
+  <tr><td align="center" class="image-caption">Selecting archive file</td></tr>
+</table>
+
+<ul>
+<li>Select the project file</li>
+<li>And then create git repository</li>
+</ul>
+
+
+<h3><a name="sec11" id="sec11"></a>
+3. If necessary, set config user.name and user.email</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./init-archive3.png" alt="Then, setting config user.name and user.email"></td></tr>
+  <tr><td align="center" class="image-caption">Then, setting config user.name and user.email</td></tr>
+</table>
+
+<ul>
+<li>It comes from OS user information</li>
+</ul>
+
+
+<h3><a name="sec12" id="sec12"></a>
+4. Initial commit</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./init-archive4.png" alt="Inital commit log"></td></tr>
+  <tr><td align="center" class="image-caption">Inital commit log</td></tr>
+</table>
+
+<ul>
+<li><em>'C-cC-c'</em> to actually commit the revisions</li>
+</ul>
+
+
+<h3><a name="sec13" id="sec13"></a>
+5. Commited result</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./init-archive5.png" alt="After commiting"></td></tr>
+  <tr><td align="center" class="image-caption">After commiting</td></tr>
+</table>
+
+
+
+<h2><a name="sec14" id="sec14"></a>
+Making changes</h2>
+
+<h3><a name="sec15" id="sec15"></a>
+1. Open the file which is under the git</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./commit1.png" alt="Open the file"></td></tr>
+  <tr><td align="center" class="image-caption">Open the file</td></tr>
+</table>
+
+<ul>
+<li>The <strong>green</strong> dot in the modeline indicates the state of this source file is <u>uptodate</u>
+(<strong>gray</strong> : <u>unknown</u>, <strong>tomato</strong> : <u>modified</u>, <strong>red</strong> : <u>deleted</u>, <strong>purple</strong> : <u>unmerged</u>)</li>
+
+<li>As you saw in the <em>modeline</em>, <em>'vc-git'</em> is still working also</li>
+</ul>
+
+
+<h3><a name="sec16" id="sec16"></a>
+2. Editing sources and saving the changes</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./commit2.png" alt="After saving the changes"></td></tr>
+  <tr><td align="center" class="image-caption">After saving the changes</td></tr>
+</table>
+
+<ul>
+<li>After saving the changes, the state of the file also change from <u>uptodate</u> to <u>modified</u>
+(<strong>tomato</strong> dot in the modeline)</li>
+</ul>
+
+
+<h3><a name="sec17" id="sec17"></a>
+3. Commit your changes with <strong>'C-x v v'</strong> key or <strong>'git-commit-all'</strong></h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./commit3.png" alt="Commit your changes after editing log"></td></tr>
+  <tr><td align="center" class="image-caption">Commit your changes after editing log</td></tr>
+</table>
+
+<ul>
+<li>Of course <strong>'C-x v v'</strong> key is well-known <strong><em>'next action'</em></strong> in <em>vc-mode</em> in emacs</li>
+<li>It works depending on the state of the file you are editing
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;(&quot;<u>modified</u> -&gt; commmit&quot; &amp; &quot;<u>unmerged</u> -&gt; merge&quot; &amp; &quot;<u>unknown</u> -&gt; add&quot;, etc)</p>
+</blockquote></li>
+<li>Edit your log and then press <em>'C-c C-c'</em> in <strong><em>git-log</em></strong> buffer</li>
+</ul>
+
+
+<h3><a name="sec18" id="sec18"></a>
+4. All things done</h3>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./commit4.png" alt="After commit"></td></tr>
+  <tr><td align="center" class="image-caption">After commit</td></tr>
+</table></p>
+</blockquote>
+
+<ul>
+<li>The state of the buffer turns to <u>uptodate</u> also</li>
+</ul>
+
+
+
+<h2><a name="sec19" id="sec19"></a>
+Viewing project history</h2>
+
+<h3><a name="sec20" id="sec20"></a>
+1. Run 'git-history' for project or 'git-log' for each file</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./history1.png" alt="History view"></td></tr>
+  <tr><td align="center" class="image-caption">History view</td></tr>
+</table>
+
+<ul>
+<li>Run <em>'git-history'</em></li>
+</ul>
+
+
+<h3><a name="sec21" id="sec21"></a>
+2. 'vc-log' history browser with fancy color</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./history2.png" alt="History browsing"></td></tr>
+  <tr><td align="center" class="image-caption">History browsing</td></tr>
+</table>
+
+<ul>
+<li>Actually, it is <em>'vc-log'</em> with fancy <em>advises</em></li>
+<li><em>'p'</em>, <em>'n'</em> with a convenient per log up/down moving</li>
+<li><em>'q'</em> with a simple quit</li>
+</ul>
+
+
+
+<h2><a name="sec22" id="sec22"></a>
+Managing Branches</h2>
+
+<h3><a name="sec23" id="sec23"></a>
+1. Show branchs with 'git-branch'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch1.png" alt="Display branch list"></td></tr>
+  <tr><td align="center" class="image-caption">Display branch list</td></tr>
+</table>
+
+<ul>
+<li>Since we did not create any buffers, we are simply in the <strong><em>master</em></strong> branch (marked with a asterisk, '<em>')</li>
+<li>If you want simply checkout only, run </em>'git-checkout'* instead</li>
+</ul>
+
+
+<h3><a name="sec24" id="sec24"></a>
+2. Create new branch with 'c' in <em>git-branch</em> buffer</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch2.png" alt="After pressing 'c', input the new name of the branch"></td></tr>
+  <tr><td align="center" class="image-caption">After pressing 'c', input the new name of the branch</td></tr>
+</table>
+
+<ul>
+<li>run <em>'git-create-branch'</em> or <em>'git-checkout-to-new-branch'</em> if you are not in <strong><em>'git branch'</em></strong> buffer</li>
+</ul>
+
+
+<h3><a name="sec25" id="sec25"></a>
+3. Select the base branch</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch3.png" alt="Select the branch you want to base on"></td></tr>
+  <tr><td align="center" class="image-caption">Select the branch you want to base on</td></tr>
+</table>
+
+<ul>
+<li>Only <strong>master</strong> branch exists</li>
+</ul>
+
+
+<h3><a name="sec26" id="sec26"></a>
+4. All things done</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch4.png" alt="Reload current buffer"></td></tr>
+  <tr><td align="center" class="image-caption">Reload current buffer</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch5.png" alt="Check see if switched to the new branch"></td></tr>
+  <tr><td align="center" class="image-caption">Check see if switched to the new branch</td></tr>
+</table>
+
+<ul>
+<li>Everything seems to be fine, and <em>modeline</em> in the &quot;test.c&quot; also changed to <em>'new-branch'</em>!</li>
+</ul>
+
+
+<h3><a name="sec27" id="sec27"></a>
+5. Topic : Switch to other branch</h3>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch6.png" alt="Switch to other branch after selecting branch"></td></tr>
+  <tr><td align="center" class="image-caption">Switch to other branch after selecting branch</td></tr>
+</table></p>
+</blockquote>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch7.png" alt="Generate automatic commit log"></td></tr>
+  <tr><td align="center" class="image-caption">Generate automatic commit log</td></tr>
+</table></p>
+</blockquote>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch8.png" alt="Finally switched to 'mater'"></td></tr>
+  <tr><td align="center" class="image-caption">Finally switched to 'mater'</td></tr>
+</table></p>
+</blockquote>
+
+<ul>
+<li>With a <em>'RET'</em> key in <strong>'git-branch'</strong>, you can switch to selected other branch</li>
+<li>If this buffer is not <u>uptodate</u>, commit with a <u>automatically generated log</u></li>
+</ul>
+
+
+<h3><a name="sec28" id="sec28"></a>
+6. Topic : Delete branches</h3>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch9.png" alt="Delete 'new-branch' in 'git-branch'"></td></tr>
+  <tr><td align="center" class="image-caption">Delete 'new-branch' in 'git-branch'</td></tr>
+</table></p>
+</blockquote>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch10.png" alt="Finally delete a 'new-branch'"></td></tr>
+  <tr><td align="center" class="image-caption">Finally delete a 'new-branch'</td></tr>
+</table></p>
+</blockquote>
+
+<ul>
+<li>Isn't it simple?</li>
+</ul>
+
+
+<h3><a name="sec29" id="sec29"></a>
+7. Topic : gitk</h3>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./branch11.png" alt="Launching gitk in emacs"></td></tr>
+  <tr><td align="center" class="image-caption">Launching gitk in emacs</td></tr>
+</table></p>
+</blockquote>
+
+<ul>
+<li>Run <em>gitk</em> with a <em>'gitk'</em> command in the buffer!</li>
+</ul>
+
+
+
+<h2><a name="sec30" id="sec30"></a>
+Tagging</h2>
+
+<h3><a name="sec31" id="sec31"></a>
+1. Create new tag 'git-tag' or 'git-snapshot'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag1.png" alt="Create new tag"></td></tr>
+  <tr><td align="center" class="image-caption">Create new tag</td></tr>
+</table>
+
+<ul>
+<li>Run <em>'git-tag'</em> or <em>'git-snapshot'</em></li>
+</ul>
+
+
+<h3><a name="sec32" id="sec32"></a>
+2. Input the tag</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag2.png" alt="Input tag name"></td></tr>
+  <tr><td align="center" class="image-caption">Input tag name</td></tr>
+</table>
+
+<ul>
+<li>Input new tag name</li>
+</ul>
+
+
+<h3><a name="sec33" id="sec33"></a>
+3.  All things done</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag3.png" alt="All things done"></td></tr>
+  <tr><td align="center" class="image-caption">All things done</td></tr>
+</table>
+
+<ul>
+<li>ok</li>
+</ul>
+
+
+<h3><a name="sec34" id="sec34"></a>
+4. Checking out</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag4.png" alt="Checking out"></td></tr>
+  <tr><td align="center" class="image-caption">Checking out</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag5.png" alt="Checking out to new branch"></td></tr>
+  <tr><td align="center" class="image-caption">Checking out to new branch</td></tr>
+</table>
+
+<ul>
+<li>Checking out may cause the branch to be dangle</li>
+<li>Better to checkout to new branch</li>
+</ul>
+
+
+<h3><a name="sec35" id="sec35"></a>
+5. Checking out to new branch</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag6.png" alt="Checking out to new branch"></td></tr>
+  <tr><td align="center" class="image-caption">Checking out to new branch</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag7.png" alt="Input the new branch name"></td></tr>
+  <tr><td align="center" class="image-caption">Input the new branch name</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag8.png" alt="Based on what?"></td></tr>
+  <tr><td align="center" class="image-caption">Based on what?</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./tag9.png" alt="Ok on new 'wild-idea' branch"></td></tr>
+  <tr><td align="center" class="image-caption">Ok on new 'wild-idea' branch</td></tr>
+</table>
+
+<ul>
+<li>You can make new branch based on tags and other branches!</li>
+</ul>
+
+
+
+<h2><a name="sec36" id="sec36"></a>
+Diffing</h2>
+
+<h3><a name="sec37" id="sec37"></a>
+1.  Run  'git-diff'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./diff1.png" alt="Run 'git-diff'"></td></tr>
+  <tr><td align="center" class="image-caption">Run 'git-diff'</td></tr>
+</table>
+
+<ul>
+<li>Run 'git-diff'</li>
+</ul>
+
+
+<h3><a name="sec38" id="sec38"></a>
+2. Select diffing target</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./diff2.png" alt="Select diffing target"></td></tr>
+  <tr><td align="center" class="image-caption">Select diffing target</td></tr>
+</table>
+
+<ul>
+<li>Select the target</li>
+</ul>
+
+
+<h3><a name="sec39" id="sec39"></a>
+3. Select diffing revision</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./diff3.png" alt="Select revision"></td></tr>
+  <tr><td align="center" class="image-caption">Select revision</td></tr>
+</table>
+
+<ul>
+<li><strong>HEAD</strong> means diffing against <u>HEAD</u> vs <u>cached file</u> you selected at step 2</li>
+<li><strong>HEAD~2</strong> means diffing against <u>second parent of HEAD</u> (referencing to git manual)</li>
+</ul>
+
+
+<h3><a name="sec40" id="sec40"></a>
+4. Ediff</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./diff4.png" alt="Diffing with ediff"></td></tr>
+  <tr><td align="center" class="image-caption">Diffing with ediff</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./diff5.png" alt="Diffing against HEAD~2"></td></tr>
+  <tr><td align="center" class="image-caption">Diffing against HEAD~2</td></tr>
+</table>
+
+<ul>
+<li>Move with <em>'p'</em>, <em>'n'</em> keys to the next/previous different region</li>
+<li>Of course <em>'q'</em> to quit and restore previous windows</li>
+</ul>
+
+
+
+<h2><a name="sec41" id="sec41"></a>
+Merging</h2>
+
+<h3><a name="sec42" id="sec42"></a>
+1. Try to merge from other branch with 'git-merge'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./merge1.png" alt="Run 'git-merge'"></td></tr>
+  <tr><td align="center" class="image-caption">Run 'git-merge'</td></tr>
+</table>
+
+<ul>
+<li>Run 'git-merge'</li>
+</ul>
+
+
+<h3><a name="sec43" id="sec43"></a>
+2. Select target branch</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./merge2.png" alt="Select the branch to be merged"></td></tr>
+  <tr><td align="center" class="image-caption">Select the branch to be merged</td></tr>
+</table>
+
+<ul>
+<li>In <em>'git-merge'</em>, you can easily select with a <em>'ido'</em> interface you may be familiar</li>
+</ul>
+
+
+<h3><a name="sec44" id="sec44"></a>
+3. After merge</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./merge3.png" alt="After merge, it will launch git-status mode"></td></tr>
+  <tr><td align="center" class="image-caption">After merge, it will launch git-status mode</td></tr>
+</table>
+
+<ul>
+<li>As you see in above, there is a <u>conflict</u> in 'test.c'</li>
+<li>Try to resolve conflict(merged) with <em>'!'</em> key</li>
+</ul>
+
+
+<h3><a name="sec45" id="sec45"></a>
+4. 3 way merge</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./merge4.png" alt="3 way merge similar to famous 'psvn.el'"></td></tr>
+  <tr><td align="center" class="image-caption">3 way merge similar to famous 'psvn.el'</td></tr>
+</table>
+
+<ul>
+<li>ediff-merge works fantastically</li>
+</ul>
+
+
+<h3><a name="sec46" id="sec46"></a>
+5. After resolving conflicts</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./merge5.png" alt="Return to the merged 'test.c'"></td></tr>
+  <tr><td align="center" class="image-caption">Return to the merged 'test.c'</td></tr>
+</table>
+
+<ul>
+<li>But, as you know, you have to commit to reflect your changes with <em>'C-x v v'</em>
+(<u>purple</u> dot in modeline indicates 'test.c' is unmerged(conflict))</li>
+<li><u>Submit the commit log</u> to complete the job</li>
+</ul>
+
+
+
+<h2><a name="sec47" id="sec47"></a>
+Checking the status of the project</h2>
+
+<h3><a name="sec48" id="sec48"></a>
+Run 'git-status'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status1.png" alt="Git cloned directory right after cloning"></td></tr>
+  <tr><td align="center" class="image-caption">Git cloned directory right after cloning</td></tr>
+</table>
+
+<ul>
+<li>Display current status of tree!</li>
+<li><em>'m'</em>, <em>'u'</em> for selecting(marking) and unselecting and <em>'SPACE'</em> to toggle mark</li>
+</ul>
+
+
+<h3><a name="sec49" id="sec49"></a>
+Inspecting Directory</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status4.png" alt="Expanding tree or open file"></td></tr>
+  <tr><td align="center" class="image-caption">Expanding tree or open file</td></tr>
+</table>
+
+<ul>
+<li><em>'q'</em>   : quit status mode</li>
+<li><em>'RET'</em> : open file/expand tree</li>
+<li><em>'v'</em>   : view file</li>
+<li><em>'n'</em>   : next item</li>
+<li><em>'p'</em>   : previous item</li>
+<li><em>'N'</em>   : next meaningful item</li>
+<li><em>'P'</em>   : previous meaningful item</li>
+<li>'&lt;'   : first item</li>
+<li>'&gt;'   : last item</li>
+<li>'g'   : refresh</li>
+<li><em>'='</em>   : diffing (ref.Diffing)</li>
+<li><em>'!'</em>   : resolving conflict (ref.Merging)</li>
+<li><em>'k'</em>   : gitk (ref. gitk)</li>
+</ul>
+
+
+<h3><a name="sec50" id="sec50"></a>
+Naive command on git with '.'</h3>
+
+<blockquote>
+<p class="quoted">&nbsp;&nbsp;<table class="image" width="100%">
+  <tr><td align="center"><img src="./status5.png" alt="Git naive command"></td></tr>
+  <tr><td align="center" class="image-caption">Git naive command</td></tr>
+</table>
+<ul>
+<li><em>'.'</em>   : git command</p>
+</blockquote></li>
+</ul>
+
+
+<h3><a name="sec51" id="sec51"></a>
+Rename with 'r'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status7.png" alt="Rename on marks or current item"></td></tr>
+  <tr><td align="center" class="image-caption">Rename on marks or current item</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status8.png" alt="After renaming all!"></td></tr>
+  <tr><td align="center" class="image-caption">After renaming all!</td></tr>
+</table>
+
+<ul>
+<li>You can see the <u>newly added</u> test2.c</li>
+<li>In order to reflect the changes the repository, commit!</li>
+</ul>
+
+
+<h3><a name="sec52" id="sec52"></a>
+Marking with '*'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./regexp-select1.png" alt="Regular expression marking"></td></tr>
+  <tr><td align="center" class="image-caption">Regular expression marking</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./regexp-select2.png" alt="After marking with regexp &quot;RegNotes.*&quot;"></td></tr>
+  <tr><td align="center" class="image-caption">After marking with regexp &quot;RegNotes.*&quot;</td></tr>
+</table>
+
+<ul>
+<li>Support regular expression marking with '<em>'</li>
+</ul>
+
+</em>* Deleting with 'd'
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./delete1.png" alt="Delete the selected files"></td></tr>
+  <tr><td align="center" class="image-caption">Delete the selected files</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./delete2.png" alt="After deleting"></td></tr>
+  <tr><td align="center" class="image-caption">After deleting</td></tr>
+</table>
+
+<ul>
+<li>Select the files to be deleted with <em>'d'</em></li>
+</ul>
+
+
+<h3><a name="sec53" id="sec53"></a>
+Add .gitignore with 'i'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status-ignore.png" alt="Select files you want to ignore"></td></tr>
+  <tr><td align="center" class="image-caption">Select files you want to ignore</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status-ignore1.png" alt="After ignoring"></td></tr>
+  <tr><td align="center" class="image-caption">After ignoring</td></tr>
+</table>
+
+<ul>
+<li><u>Select the files</u> that you want to ignore</li>
+<li>Add the selected files or ask you the pattern to be ignored</li>
+</ul>
+
+
+<h3><a name="sec54" id="sec54"></a>
+Switching branch with 'b'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status2.png" alt="Switching branch"></td></tr>
+  <tr><td align="center" class="image-caption">Switching branch</td></tr>
+</table>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status3.png" alt="After switching branch"></td></tr>
+  <tr><td align="center" class="image-caption">After switching branch</td></tr>
+</table>
+
+<ul>
+<li>You can switch to other branch with 'b' key</li>
+</ul>
+
+
+<h3><a name="sec55" id="sec55"></a>
+Sarcastic blame! with '?'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status6.png" alt="Open in blame mode"></td></tr>
+  <tr><td align="center" class="image-caption">Open in blame mode</td></tr>
+</table>
+
+<ul>
+<li>Git blame! from official git-blame.el(David KĆ„gedal)</li>
+</ul>
+
+
+<h3><a name="sec56" id="sec56"></a>
+Summary mode with 's'</h3>
+
+<table class="image" width="100%">
+  <tr><td align="center"><img src="./status-summary.png" alt="Summary the view"></td></tr>
+  <tr><td align="center" class="image-caption">Summary the view</td></tr>
+</table>
+
+<ul>
+<li>Summary with <em>'Occur'</em></li>
+<li>Iterate with 'next-error and 'previous-error key binding</li>
+</ul>
+
+
+
+
+<!-- Page published by Emacs Muse ends here -->
+  </body>
+</html>
diff --git a/site/git-emacs/docs/git-emacs.muse b/site/git-emacs/docs/git-emacs.muse
new file mode 100644
index 0000000..9e5031c
--- /dev/null
+++ b/site/git-emacs/docs/git-emacs.muse
@@ -0,0 +1,340 @@
+#created 2008-03-23 [22:34]
+#date 2008-03-24 [21:24]
+#title A Guided Tour of emacs-git
+#author TSKim
+
+<contents>
+
+* Installation
+ - [[./git-emacs-1.0.tar.gz][Download git-emacs-1.0.tar.gz]]
+ - [[./git-emacs.el.html][git-emacs.el]]/[[./git-emacs.el][raw]]
+ - [[./git-modeline.el.html][git-modeline.el]]/[[./git-modeline.el][raw]]
+ - [[./git-blame.el.html][git-blame.el]]/[[./git-blame.el][raw]]
+ 
+<src lang="emacs-lisp">
+(add-to-list 'load-path "/home/tsgates/Skills/git/git-emacs-1.0")
+(require 'git-emacs)
+</src>
+
+* Configuration
+
+[[./config-init.png][git-config-init command]]
+
+[[./config-init2.png][Automatically set current user.name & user.email]]
+
+ - Set _user.name_ & _user.email_ if it is not set yet
+ - But, git-emacs recommends the _full name_ and _email address_ of the _user logged in_
+
+* Cloning
+
+** 1. Run 'git-clone'
+[[./clone0.png][Run 'git-clone']]
+
+ - Run 'git-clone'
+
+** 2. Select local directory
+[[./clone1.png][Move directory]]
+
+[[./clone2.png][Select the directory to be cloned]]
+
+ - With *'ido'* interface, you can change directory
+ - Create directory with *'C-m'* (*'M-n'*, *'M-p'* to search history, reference to *'ido'*)
+
+** 3. Select repository
+[[./clone3.png][Select repository]]
+
+ - Select repositories from _history_ and your _bookmarks_ or type new one
+
+** 4. All things done
+[[./clone4.png][Start to clone from repository]]
+
+[[./clone5.png][All things done]]
+
+ - Support _asynchronous_ downloading from the repository
+ - All things ok, you can see message *"Cloned"*!
+
+* Importing
+
+** 1. run 'git-init-from-archive'
+[[./init-archive1.png][Init from archive]]
+
+ - Run 'git-init-from-archive'
+
+** 2. Select archive file
+[[./init-archive2.png][Selecting archive file]]
+
+ - Select the project file
+ - And then create git repository
+
+** 3. If necessary, set config user.name and user.email
+[[./init-archive3.png][Then, setting config user.name and user.email]]
+
+ - It comes from OS user information
+
+** 4. Initial commit
+[[./init-archive4.png][Inital commit log]]
+
+ - *'C-cC-c'* to actually commit the revisions
+
+** 5. Commited result
+[[./init-archive5.png][After commiting]]
+
+* Making changes
+
+** 1. Open the file which is under the git
+[[./commit1.png][Open the file]]
+
+ - The **green** dot in the modeline indicates the state of this source file is _uptodate_
+   (**gray** : _unknown_, **tomato** : _modified_, **red** : _deleted_, **purple** : _unmerged_)
+
+ - As you saw in the *modeline*, *'vc-git'* is still working also
+
+** 2. Editing sources and saving the changes
+[[./commit2.png][After saving the changes]]
+
+ - After saving the changes, the state of the file also change from _uptodate_ to _modified_
+   (**tomato** dot in the modeline)
+
+** 3. Commit your changes with **'C-x v v'** key or **'git-commit-all'**
+[[./commit3.png][Commit your changes after editing log]]
+
+ - Of course **'C-x v v'** key is well-known ***'next action'*** in *vc-mode* in emacs
+ - It works depending on the state of the file you are editing
+    ("_modified_ -> commmit" & "_unmerged_ -> merge" & "_unknown_ -> add", etc)
+ - Edit your log and then press *'C-c C-c'* in ***git-log*** buffer
+
+** 4. All things done
+ [[./commit4.png][After commit]]
+
+ - The state of the buffer turns to _uptodate_ also
+
+* Viewing project history
+
+** 1. Run 'git-history' for project or 'git-log' for each file
+[[./history1.png][History view]]
+
+ - Run *'git-history'*
+
+** 2. 'vc-log' history browser with fancy color
+[[./history2.png][History browsing]]
+
+ - Actually, it is *'vc-log'* with fancy *advises*
+ - *'p'*, *'n'* with a convenient per log up/down moving
+ - *'q'* with a simple quit
+
+* Managing Branches
+** 1. Show branchs with 'git-branch'
+[[./branch1.png][Display branch list]]
+
+ - Since we did not create any buffers, we are simply in the ***master*** branch (marked with a asterisk, '*')
+ - If you want simply checkout only, run *'git-checkout'* instead
+
+** 2. Create new branch with 'c' in *git-branch* buffer
+[[./branch2.png][After pressing 'c', input the new name of the branch]]
+
+ - run *'git-create-branch'* or *'git-checkout-to-new-branch'* if you are not in ***'git branch'*** buffer
+
+** 3. Select the base branch
+[[./branch3.png][Select the branch you want to base on]]
+
+ - Only **master** branch exists
+
+** 4. All things done
+[[./branch4.png][Reload current buffer]]
+
+[[./branch5.png][Check see if switched to the new branch]]
+
+ - Everything seems to be fine, and *modeline* in the "test.c" also changed to *'new-branch'*!
+
+** 5. Topic : Switch to other branch
+
+ [[./branch6.png][Switch to other branch after selecting branch]]
+
+ [[./branch7.png][Generate automatic commit log]]
+
+ [[./branch8.png][Finally switched to 'mater']]
+ 
+ - With a *'RET'* key in **'git-branch'**, you can switch to selected other branch
+ - If this buffer is not _uptodate_, commit with a _automatically generated log_
+
+** 6. Topic : Delete branches
+ [[./branch9.png][Delete 'new-branch' in 'git-branch']]
+ 
+ [[./branch10.png][Finally delete a 'new-branch']]
+
+ - Isn't it simple?
+
+** 7. Topic : gitk
+ [[./branch11.png][Launching gitk in emacs]]
+
+ - Run *gitk* with a *'gitk'* command in the buffer!
+
+* Tagging
+
+** 1. Create new tag 'git-tag' or 'git-snapshot'
+[[./tag1.png][Create new tag]]
+
+ - Run *'git-tag'* or *'git-snapshot'*
+
+** 2. Input the tag
+[[./tag2.png][Input tag name]]
+
+ - Input new tag name
+
+** 3.  All things done
+[[./tag3.png][All things done]]
+
+ - ok
+
+** 4. Checking out
+[[./tag4.png][Checking out]]
+
+[[./tag5.png][Checking out to new branch]]
+
+ - Checking out may cause the branch to be dangle
+ - Better to checkout to new branch
+
+** 5. Checking out to new branch
+[[./tag6.png][Checking out to new branch]]
+
+[[./tag7.png][Input the new branch name]]
+
+[[./tag8.png][Based on what?]]
+
+[[./tag9.png][Ok on new 'wild-idea' branch]]
+
+ - You can make new branch based on tags and other branches!
+
+* Diffing
+
+** 1.  Run  'git-diff'
+[[./diff1.png][Run 'git-diff']]
+
+ - Run 'git-diff'
+
+** 2. Select diffing target
+[[./diff2.png][Select diffing target]]
+
+ - Select the target
+
+** 3. Select diffing revision
+[[./diff3.png][Select revision]]
+
+ - **HEAD** means diffing against _HEAD_ vs _cached file_ you selected at step 2
+ - **HEAD~2** means diffing against _second parent of HEAD_ (referencing to git manual)
+
+** 4. Ediff
+[[./diff4.png][Diffing with ediff]]
+
+[[./diff5.png][Diffing against HEAD~2]]
+
+ - Move with *'p'*, *'n'* keys to the next/previous different region
+ - Of course *'q'* to quit and restore previous windows
+
+* Merging
+
+** 1. Try to merge from other branch with 'git-merge'
+[[./merge1.png][Run 'git-merge']]
+
+ - Run 'git-merge'
+
+** 2. Select target branch
+[[./merge2.png][Select the branch to be merged]]
+
+ - In *'git-merge'*, you can easily select with a *'ido'* interface you may be familiar
+
+** 3. After merge
+[[./merge3.png][After merge, it will launch git-status mode]]
+
+ - As you see in above, there is a _conflict_ in 'test.c'
+ - Try to resolve conflict(merged) with *'!'* key
+
+** 4. 3 way merge
+[[./merge4.png][3 way merge similar to famous 'psvn.el']]
+
+ - ediff-merge works fantastically
+
+** 5. After resolving conflicts
+[[./merge5.png][Return to the merged 'test.c']]
+
+ - But, as you know, you have to commit to reflect your changes with *'C-x v v'*
+  (_purple_ dot in modeline indicates 'test.c' is unmerged(conflict))
+ - _Submit the commit log_ to complete the job
+
+* Checking the status of the project
+
+** Run 'git-status'
+[[./status1.png][Git cloned directory right after cloning]]
+
+ - Display current status of tree!
+ - *'m'*, *'u'* for selecting(marking) and unselecting and *'SPACE'* to toggle mark
+
+** Inspecting Directory
+[[./status4.png][Expanding tree or open file]]
+
+ - *'q'*   : quit status mode
+ - *'RET'* : open file/expand tree
+ - *'v'*   : view file
+ - *'n'*   : next item
+ - *'p'*   : previous item
+ - *'N'*   : next meaningful item
+ - *'P'*   : previous meaningful item
+ - '<'   : first item
+ - '>'   : last item
+ - 'g'   : refresh
+ - *'='*   : diffing (ref.Diffing)
+ - *'!'*   : resolving conflict (ref.Merging)
+ - *'k'*   : gitk (ref. gitk)
+
+** Naive command on git with '.'
+ [[./status5.png][Git naive command]]
+ - *'.'*   : git command
+
+** Rename with 'r'
+[[./status7.png][Rename on marks or current item]]
+
+[[./status8.png][After renaming all!]]
+
+ - You can see the _newly added_ test2.c
+ - In order to reflect the changes the repository, commit!
+
+** Marking with '*'
+[[./regexp-select1.png][Regular expression marking]]
+
+[[./regexp-select2.png][After marking with regexp "RegNotes.*"]]
+
+ - Support regular expression marking with '*'
+
+** Deleting with 'd'
+[[./delete1.png][Delete the selected files]]
+
+[[./delete2.png][After deleting]]
+
+ - Select the files to be deleted with *'d'*
+ 
+** Add .gitignore with 'i'
+[[./status-ignore.png][Select files you want to ignore]]
+
+[[./status-ignore1.png][After ignoring]]
+
+ - _Select the files_ that you want to ignore
+ - Add the selected files or ask you the pattern to be ignored
+
+** Switching branch with 'b'
+[[./status2.png][Switching branch]]
+
+[[./status3.png][After switching branch]]
+
+ - You can switch to other branch with 'b' key
+
+** Sarcastic blame! with '?'
+[[./status6.png][Open in blame mode]]
+
+ - Git blame! from official git-blame.el(David KĆ„gedal)
+
+** Summary mode with 's'
+[[./status-summary.png][Summary the view]]
+
+ - Summary with *'Occur'*
+ - Iterate with 'next-error and 'previous-error key binding
+
diff --git a/site/git-emacs/docs/git-modeline.el.html b/site/git-emacs/docs/git-modeline.el.html
new file mode 100644
index 0000000..8bcbefa
--- /dev/null
+++ b/site/git-emacs/docs/git-modeline.el.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Created by htmlize-1.34 in css mode. -->
+<html>
+  <head>
+    <title>git-modeline.el</title>
+    <style type="text/css">
+    <!--
+      body {
+        color: #000000;
+        background-color: #ffffff;
+      }
+      .ATTRLIST {
+        /* (foreground-color . "firebrick1") */
+        color: #ff3030;
+      }
+      .ATTRLIST-1 {
+        /* (foreground-color . "IndianRed4") */
+        color: #8b3a3a;
+      }
+      .ATTRLIST-2 {
+        /* (foreground-color . "IndianRed") */
+        color: #cd5c5c;
+      }
+      .builtin {
+        /* font-lock-builtin-face */
+        color: #da70d6;
+      }
+      .comment {
+        /* font-lock-comment-face */
+        color: #b22222;
+      }
+      .comment-delimiter {
+        /* font-lock-comment-delimiter-face */
+        color: #b22222;
+      }
+      .constant {
+        /* font-lock-constant-face */
+        color: #5f9ea0;
+      }
+      .function-name {
+        /* font-lock-function-name-face */
+        color: #0000ff;
+      }
+      .keyword {
+        /* font-lock-keyword-face */
+        color: #a020f0;
+      }
+      .string {
+        /* font-lock-string-face */
+        color: #bc8f8f;
+      }
+      .variable-name {
+        /* font-lock-variable-name-face */
+        color: #b8860b;
+      }
+
+      a {
+        color: inherit;
+        background-color: inherit;
+        font: inherit;
+        text-decoration: inherit;
+      }
+      a:hover {
+        text-decoration: underline;
+      }
+    -->
+    </style>
+  </head>
+  <body>
+    <pre>
+<span class="comment-delimiter">;; </span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">ref. "test-runner-image.el" posted at
+</span><span class="comment-delimiter">;; </span><span class="comment">"http://nschum.de/src/emacs/test-runner/"
+</span><span class="comment-delimiter">;;</span><span class="comment">
+</span>
+(<span class="keyword">provide</span> '<span class="constant">git-modeline</span>)
+
+(<span class="keyword">defvar</span> <span class="variable-name">git--state-mark-modeline</span> t)     <span class="comment-delimiter">; </span><span class="comment">modeline mark display or not
+</span>(<span class="keyword">defvar</span> <span class="variable-name">git--state-mark-tooltip</span> nil)    <span class="comment-delimiter">; </span><span class="comment">modeline tooltip display
+</span>
+(<span class="keyword">defun</span> <span class="function-name">git--state-mark-modeline-dot</span> (color)
+  <span class="ATTRLIST-2">(</span>propertize <span class="string">"    "</span>
+              'help-echo 'git--state-mark-tooltip
+              'display
+              `<span class="ATTRLIST-1">(</span>image <span class="builtin">:type</span> xpm
+                      <span class="builtin">:data</span> ,<span class="ATTRLIST">(</span>format <span class="string">"/* XPM */
+static char * data[] = {
+\"18 13 3 1\",
+\"  c None\",
+\"+ c #000000\",
+\". c %s\",
+\"                  \",
+\"       +++++      \",
+\"      +.....+     \",
+\"     +.......+    \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"     +.......+    \",
+\"      +.....+     \",
+\"       +++++      \",
+\"                  \"};"</span>
+                                     color<span class="ATTRLIST">)</span>
+                      <span class="builtin">:ascent</span> center<span class="ATTRLIST-1">)</span><span class="ATTRLIST-2">)</span>)
+
+(<span class="keyword">defun</span> <span class="function-name">git--install-state-mark-modeline</span> (color)
+  (push `(git--state-mark-modeline
+          ,(git--state-mark-modeline-dot color))
+        mode-line-format)
+  (force-mode-line-update t))
+
+(<span class="keyword">defun</span> <span class="function-name">git--uninstall-state-mark-modeline</span> ()
+  (setq mode-line-format
+        (remove-if #'(<span class="keyword">lambda</span> (mode) (eq (car-safe mode)
+                                        'git--state-mark-modeline))
+                   mode-line-format))
+  (force-mode-line-update t))
+
+(<span class="keyword">defun</span> <span class="function-name">git--update-state-mark-tooltip</span> (tooltip)
+  (setq git--state-mark-tooltip tooltip))
+
+(<span class="keyword">defun</span> <span class="function-name">git--update-state-mark</span> (color)
+  (git--uninstall-state-mark-modeline)
+  (git--install-state-mark-modeline color))
+
+<span class="comment-delimiter">;; </span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">example on state-modeline-mark
+</span><span class="comment-delimiter">;; </span><span class="comment">
+</span><span class="comment-delimiter">;; </span><span class="comment">(git--install-state-mark-modeline "red")
+</span><span class="comment-delimiter">;; </span><span class="comment">(git--uninstall-state-mark-modeline)
+</span><span class="comment-delimiter">;; </span><span class="comment">(setq git--state-mark-tooltip "testsetset")</span></pre>
+  </body>
+</html>
diff --git a/site/git-emacs/docs/history1.png b/site/git-emacs/docs/history1.png
new file mode 100644
index 0000000..7c3a638
Binary files /dev/null and b/site/git-emacs/docs/history1.png differ
diff --git a/site/git-emacs/docs/history2.png b/site/git-emacs/docs/history2.png
new file mode 100644
index 0000000..38bf4ea
Binary files /dev/null and b/site/git-emacs/docs/history2.png differ
diff --git a/site/git-emacs/docs/init-archive1.png b/site/git-emacs/docs/init-archive1.png
new file mode 100644
index 0000000..5b25756
Binary files /dev/null and b/site/git-emacs/docs/init-archive1.png differ
diff --git a/site/git-emacs/docs/init-archive2.png b/site/git-emacs/docs/init-archive2.png
new file mode 100644
index 0000000..17f99ff
Binary files /dev/null and b/site/git-emacs/docs/init-archive2.png differ
diff --git a/site/git-emacs/docs/init-archive3.png b/site/git-emacs/docs/init-archive3.png
new file mode 100644
index 0000000..e7f81ff
Binary files /dev/null and b/site/git-emacs/docs/init-archive3.png differ
diff --git a/site/git-emacs/docs/init-archive4.png b/site/git-emacs/docs/init-archive4.png
new file mode 100644
index 0000000..23f5bd8
Binary files /dev/null and b/site/git-emacs/docs/init-archive4.png differ
diff --git a/site/git-emacs/docs/init-archive5.png b/site/git-emacs/docs/init-archive5.png
new file mode 100644
index 0000000..92d4868
Binary files /dev/null and b/site/git-emacs/docs/init-archive5.png differ
diff --git a/site/git-emacs/docs/init-archive6.png b/site/git-emacs/docs/init-archive6.png
new file mode 100644
index 0000000..1e707c8
Binary files /dev/null and b/site/git-emacs/docs/init-archive6.png differ
diff --git a/site/git-emacs/docs/init-archive7.png b/site/git-emacs/docs/init-archive7.png
new file mode 100644
index 0000000..0110774
Binary files /dev/null and b/site/git-emacs/docs/init-archive7.png differ
diff --git a/site/git-emacs/docs/merge1.png b/site/git-emacs/docs/merge1.png
new file mode 100644
index 0000000..435ec6b
Binary files /dev/null and b/site/git-emacs/docs/merge1.png differ
diff --git a/site/git-emacs/docs/merge2.png b/site/git-emacs/docs/merge2.png
new file mode 100644
index 0000000..8f97366
Binary files /dev/null and b/site/git-emacs/docs/merge2.png differ
diff --git a/site/git-emacs/docs/merge3.png b/site/git-emacs/docs/merge3.png
new file mode 100644
index 0000000..aa5c03f
Binary files /dev/null and b/site/git-emacs/docs/merge3.png differ
diff --git a/site/git-emacs/docs/merge4.png b/site/git-emacs/docs/merge4.png
new file mode 100644
index 0000000..009d247
Binary files /dev/null and b/site/git-emacs/docs/merge4.png differ
diff --git a/site/git-emacs/docs/merge5.png b/site/git-emacs/docs/merge5.png
new file mode 100644
index 0000000..3081826
Binary files /dev/null and b/site/git-emacs/docs/merge5.png differ
diff --git a/site/git-emacs/docs/regexp-select1.png b/site/git-emacs/docs/regexp-select1.png
new file mode 100644
index 0000000..96adbec
Binary files /dev/null and b/site/git-emacs/docs/regexp-select1.png differ
diff --git a/site/git-emacs/docs/regexp-select2.png b/site/git-emacs/docs/regexp-select2.png
new file mode 100644
index 0000000..40d0852
Binary files /dev/null and b/site/git-emacs/docs/regexp-select2.png differ
diff --git a/site/git-emacs/docs/status-ignore.png b/site/git-emacs/docs/status-ignore.png
new file mode 100644
index 0000000..2308142
Binary files /dev/null and b/site/git-emacs/docs/status-ignore.png differ
diff --git a/site/git-emacs/docs/status-ignore1.png b/site/git-emacs/docs/status-ignore1.png
new file mode 100644
index 0000000..efc42f0
Binary files /dev/null and b/site/git-emacs/docs/status-ignore1.png differ
diff --git a/site/git-emacs/docs/status-summary.png b/site/git-emacs/docs/status-summary.png
new file mode 100644
index 0000000..a1e7e7a
Binary files /dev/null and b/site/git-emacs/docs/status-summary.png differ
diff --git a/site/git-emacs/docs/status1.png b/site/git-emacs/docs/status1.png
new file mode 100644
index 0000000..ed7abe8
Binary files /dev/null and b/site/git-emacs/docs/status1.png differ
diff --git a/site/git-emacs/docs/status2.png b/site/git-emacs/docs/status2.png
new file mode 100644
index 0000000..37bd32c
Binary files /dev/null and b/site/git-emacs/docs/status2.png differ
diff --git a/site/git-emacs/docs/status3.png b/site/git-emacs/docs/status3.png
new file mode 100644
index 0000000..cdf5a5a
Binary files /dev/null and b/site/git-emacs/docs/status3.png differ
diff --git a/site/git-emacs/docs/status4.png b/site/git-emacs/docs/status4.png
new file mode 100644
index 0000000..aa4ef92
Binary files /dev/null and b/site/git-emacs/docs/status4.png differ
diff --git a/site/git-emacs/docs/status5.png b/site/git-emacs/docs/status5.png
new file mode 100644
index 0000000..2760017
Binary files /dev/null and b/site/git-emacs/docs/status5.png differ
diff --git a/site/git-emacs/docs/status6.png b/site/git-emacs/docs/status6.png
new file mode 100644
index 0000000..17f38a7
Binary files /dev/null and b/site/git-emacs/docs/status6.png differ
diff --git a/site/git-emacs/docs/status7.png b/site/git-emacs/docs/status7.png
new file mode 100644
index 0000000..d131a21
Binary files /dev/null and b/site/git-emacs/docs/status7.png differ
diff --git a/site/git-emacs/docs/status8.png b/site/git-emacs/docs/status8.png
new file mode 100644
index 0000000..0aa3d20
Binary files /dev/null and b/site/git-emacs/docs/status8.png differ
diff --git a/site/git-emacs/docs/tag1.png b/site/git-emacs/docs/tag1.png
new file mode 100644
index 0000000..da87f48
Binary files /dev/null and b/site/git-emacs/docs/tag1.png differ
diff --git a/site/git-emacs/docs/tag2.png b/site/git-emacs/docs/tag2.png
new file mode 100644
index 0000000..5b22d48
Binary files /dev/null and b/site/git-emacs/docs/tag2.png differ
diff --git a/site/git-emacs/docs/tag3.png b/site/git-emacs/docs/tag3.png
new file mode 100644
index 0000000..c7ba025
Binary files /dev/null and b/site/git-emacs/docs/tag3.png differ
diff --git a/site/git-emacs/docs/tag4.png b/site/git-emacs/docs/tag4.png
new file mode 100644
index 0000000..db2ffb0
Binary files /dev/null and b/site/git-emacs/docs/tag4.png differ
diff --git a/site/git-emacs/docs/tag5.png b/site/git-emacs/docs/tag5.png
new file mode 100644
index 0000000..74f0850
Binary files /dev/null and b/site/git-emacs/docs/tag5.png differ
diff --git a/site/git-emacs/docs/tag6.png b/site/git-emacs/docs/tag6.png
new file mode 100644
index 0000000..60333fa
Binary files /dev/null and b/site/git-emacs/docs/tag6.png differ
diff --git a/site/git-emacs/docs/tag7.png b/site/git-emacs/docs/tag7.png
new file mode 100644
index 0000000..2b20cc8
Binary files /dev/null and b/site/git-emacs/docs/tag7.png differ
diff --git a/site/git-emacs/docs/tag8.png b/site/git-emacs/docs/tag8.png
new file mode 100644
index 0000000..af296a8
Binary files /dev/null and b/site/git-emacs/docs/tag8.png differ
diff --git a/site/git-emacs/docs/tag9.png b/site/git-emacs/docs/tag9.png
new file mode 100644
index 0000000..7f7fb69
Binary files /dev/null and b/site/git-emacs/docs/tag9.png differ
diff --git a/site/git-emacs/git--test.el b/site/git-emacs/git--test.el
new file mode 100644
index 0000000..e71422a
--- /dev/null
+++ b/site/git-emacs/git--test.el
@@ -0,0 +1,290 @@
+;; See git-emacs.el for license and versioning.
+
+(require 'git-emacs)
+(require 'git-status)
+(require 'dired)
+
+(defun git--test-with-temp-repo (function)
+  "Run FUNCTION inside a temporary git repository"
+  ;; DO NOT REASSIGN the temp dir variable below under any circumstances. We
+  ;; wouldn't want to remove recursively some arbitrary dir.
+  (let* ((git--test-tmp-dir-DONT-REASSIGN (make-temp-file "git-emacs-test-" t))
+         (git--test-tmp-dir git--test-tmp-dir-DONT-REASSIGN) ; Here, change this
+         (default-directory                                  ; or this
+           (file-name-as-directory git--test-tmp-dir))) 
+    (unwind-protect
+        (progn
+          (message "Created temporary test dir %s" default-directory)
+          (git-init default-directory)  ; part of the suite, kind of
+          (funcall function))
+      (dired-delete-file git--test-tmp-dir-DONT-REASSIGN 'always)
+      (message "Deleted temporary test dir %s"
+               git--test-tmp-dir-DONT-REASSIGN))))
+
+(defun git--test-typical-repo-ops ()
+  ;; git exec
+  (assert (string= "\n" (git--exec-string "rev-parse" "--show-cdup")))
+  (assert (string= (expand-file-name "./") (git--get-top-dir ".")))
+  (assert (string= (expand-file-name "./")
+                   (git--get-top-dir "./nO/sUCH/dIrectory/Exists")))
+
+  ;; Create a file, and commit something.
+  (with-temp-buffer
+    (insert "sample text")
+    (write-file "f1"))
+  (assert (eq nil (git--status-file "f1")))
+  (let ((fi (git--ls-files "--others")))
+    (assert (eq 1 (length fi)))
+    (assert (eq 'unknown (git--fileinfo->stat (car fi))))
+    (assert (string= "f1" (git--fileinfo->name (car fi)))))
+  
+  (git--add "f1")
+  (git--commit "test commit 1")
+  (assert (eq 'uptodate (git--status-file "f1")))
+
+  ;; create status buffer
+  (assert (string= (buffer-name (git--create-status-buffer "."))
+                   (git--status-buffer-name ".")))
+
+  ;; open status buffer
+  (assert (string= (buffer-name (git--create-status-buffer "."))
+                   (git--status-buffer-name ".")))
+
+  (git--kill-status-buffer ".")
+
+  ;; tag stuff
+  (assert (null (git-tag "at-first-commit")))
+  (assert (stringp (git-tag "at-first-commit")))
+
+  ;; test some of the buffer handling functions
+  (with-temp-buffer
+   (insert-file-contents "f1" t)        ; visit
+   (vc-find-file-hook)
+   (assert (equal (list (current-buffer)) (git--find-buffers-in-dir ".")))
+   (assert (equal (list (current-buffer))
+                  (git--find-buffers-from-file-list '("f1"))))
+   (assert (eq 0 (git--maybe-ask-save)))
+   (git--require-buffer-in-git)
+   (git--if-in-status-mode (error "guess again"))
+
+   (insert "something else")
+   (save-buffer)
+   )
+
+  (assert (eq 'modified (git--status-file "f1")))
+
+  ;; Try some gui commits
+  (let ((git--commit-log-buffer "*git commit for unittest*")
+        (first-commit-id (git--rev-parse "at-first-commit"))
+        (second-commit-id nil))
+    (unwind-protect
+        (progn
+          (condition-case err
+              (progn (git-commit) (error "Expected error not raised"))
+            (error
+             (unless (string-match "^Nothing to commit"
+                                   (error-message-string err))
+               (signal (car err) (cdr err)))))
+          (git-commit-all)
+          (assert (equal '("-a") git--commit-args))
+          (insert "another test commit")
+          (git--commit-buffer)
+          (assert (not (buffer-live-p (get-buffer git--commit-log-buffer))))
+          (assert (eq 'uptodate (git--status-file "f1")))
+          (assert (string-match "^[0-9a-f.]* *another test commit"
+                                (git--last-log-short)))
+          ;; Should be one above last commit
+          (setq second-commit-id (git--rev-parse "HEAD"))
+          (assert (equal first-commit-id (git--rev-parse "HEAD^1")))
+          ;; Do an amend commit
+          (git-commit t)
+          (assert (equal '("--amend") git--commit-args))
+          (insert "Now amended")
+          (git--commit-buffer)
+          (assert (eq 'uptodate (git--status-file "f1")))
+          ;; Unfortunately, git 1.6 has taken to mangling messages according
+          ;; to the subject/body distinctions. This stinks and we'll need to
+          ;; fix it; but there is simply no good way to do this now.
+          (assert (equal "another test commit Now amended "
+                         (replace-regexp-in-string "\n" " "
+                                                   (git--last-log-message))))
+          (assert (not (equal second-commit-id (git--rev-parse "HEAD"))))
+          ;; Should still be one commit above the first
+          (assert (equal first-commit-id (git--rev-parse "HEAD^1"))))
+      (ignore-errors (kill-buffer git--commit-log-buffer))))
+
+  ;; Some baseline testing. The usual suspects (git-svn, origin), won't exist.
+  (let ((git-baseline-candidates '("git-svn" "origin" "at-first-commit"))
+        git--test-func-was-called git-baseline-alist)
+    (assert (equal "at-first-commit" (git-baseline)))
+    ;; Now add a couple of functions into the mix
+    (flet ((git--test-baseline-not-ok ()
+                                     (setq git--test-func-was-called t)
+                                     nil)
+           (git--test-baseline-ok () "some-commit")
+           (git--select-revision (&rest args) (error "%S" args)))
+      (add-to-list 'git-baseline-candidates 'git--test-baseline-not-ok)
+      (setcar (last git-baseline-candidates) 'git--test-baseline-ok)
+      (assert (equal "some-commit" (git-baseline)))
+      (assert git--test-func-was-called)
+      ;; Now test interactive call. Fake some interactive functions
+      (add-to-list 'git-baseline-candidates "at-first-commit" t)
+      (flet ((git--select-revision
+              (prompt prepend except)
+              (assert (equal '("(git--test-baseline-ok)" "at-first-commit")
+                             prepend))
+              (assert (equal prepend except))
+              "(git--test-baseline-ok)")
+             (y-or-n-p (prompt) t)
+             (customize-save-variable
+              (symbol value)
+              (assert (eq 'git-baseline-alist symbol))
+              (assert (equal git-baseline-alist value))))
+        (setq git--test-func-was-called nil)
+        (assert (equal "some-commit" (call-interactively 'git-baseline)))
+        (assert git--test-func-was-called)
+        (assert (equal (list (cons default-directory 'git--test-baseline-ok))
+                       git-baseline-alist))
+        ;; if we call again (non-interactively), the value should be cached
+        (setq git--test-func-was-called nil)
+        (fset 'git--select-revision 'error)
+        (assert (equal "some-commit" (git-baseline)))
+        (assert (not git--test-func-was-called))
+        ))
+    )
+
+  ;; Try a new branch.
+  (flet ((git--select-revision (ignored-prompt prepend-choices excepts)
+           (assert (equal '("master") prepend-choices))
+           (assert (equal '("master") excepts))
+          "master"))
+    (let (seen-checkout-func-args)
+      (git-checkout-to-new-branch "newbranch" "master"
+                                  (lambda (&rest args)
+                                    (setq seen-checkout-func-args args))
+                                  "arg1" nil 'arg2)
+      (assert (equal '("arg1" nil arg2) seen-checkout-func-args)))
+    (let* ((branch-list-and-current (git--branch-list))
+           (sorted-branch-list (sort (car branch-list-and-current) 'string<)))
+      (assert (equal '("master" "newbranch") sorted-branch-list))
+      (assert (equal "newbranch" (cdr branch-list-and-current))))
+    ;; git--current-branch should return the same result.
+    (assert (equal "newbranch" (git--current-branch))))
+
+  ;; Check git-stash.
+  (with-temp-buffer
+    (insert "contents for stash")
+    (write-file "f1"))
+  (assert (eq 'modified (git--status-file "f1")))
+  (let (saved-suggested-cmd cmd-to-return)
+    (flet ((read-string (ignored-prompt suggested &rest ignored)
+             (setq saved-suggested-cmd suggested)
+             cmd-to-return)
+           (sleep-for (&rest args) t))
+      (setq cmd-to-return "save")
+      (call-interactively 'git-stash)
+      (message "suggested: %s" saved-suggested-cmd)
+      (assert (equal "save" saved-suggested-cmd))
+      (assert (eq 'uptodate (git--status-file "f1")))
+      ;; Now it should suggest popping the stash.
+      (setq cmd-to-return "pop")
+      (call-interactively 'git-stash)
+      (assert (equal "pop" saved-suggested-cmd))
+      (assert (eq 'modified (git--status-file "f1")))
+      ;; Contents should be restored too.
+      (assert (string= "contents for stash"
+                       (git--trim-string
+                        (with-temp-buffer
+                          (insert-file-contents "f1")
+                          (buffer-string)))))
+      ))
+  ;; Check that git-stash buffer is deleted on error exit
+  (let (saved-buffer)
+    (flet ((read-string (&rest ignored)
+             (setq saved-buffer (current-buffer))
+             (error "test error")))
+      (ignore-errors (call-interactively 'git-stash)))
+    (assert saved-buffer)
+    (assert (not (buffer-live-p saved-buffer))))
+      
+  ;; Do some more fun stuff here...
+  
+  )
+
+(defun git--test-standalone-functions ()
+   ;; Human-readable size
+  (require 'git-status)
+  (assert (equal "8" (git--status-human-readable-size 8)))
+  (assert (equal "1023" (git--status-human-readable-size 1023)))
+  (assert (equal "1.0K" (git--status-human-readable-size 1024)))
+  (assert (equal "25K" (git--status-human-readable-size 25902)))
+  (assert (equal "382K" (git--status-human-readable-size 391475)))
+  (assert (equal "1.0M" (git--status-human-readable-size (* 1023 1024))))
+  (assert (equal "2.5M" (git--status-human-readable-size (* 2570 1024))))
+
+  ;; Some tests of fileinfo-lessp
+  (flet ((check-compare (name1 type1 name2 type2 isless12 isless21)
+           (let ((info1 (git--create-fileinfo name1 type1))
+                 (info2 (git--create-fileinfo name2 type2)))
+             (assert (eq isless12 (git--fileinfo-lessp info1 info2)))
+             (assert (eq isless21 (git--fileinfo-lessp info2 info1))))))
+    (check-compare "abc" 'blob "def" 'blob t nil)
+    (check-compare "abc" 'tree "def" 'tree t nil)
+    (check-compare "abc" 'blob "abc" 'blob nil nil)
+
+    (check-compare "abc" 'blob "def/foo" 'blob nil t)
+    (check-compare "def/foo" 'blob "def/foo" 'blob nil nil)
+    (check-compare "abc/foo" 'blob "def" 'blob t nil)
+    (check-compare "abc/def" 'tree "abc/def/aaa" 'blob t nil)
+    (check-compare "abc/def" 'tree "abc/def/aaa" 'tree t nil)
+    ;; This is the situation where an Unknown file comes in low in the tree
+    (check-compare "abc/def" 'tree "abc/def/aaa/bbb" 'blob t nil)
+    (check-compare "abc/hij" 'tree "abc/def/aaa/bbb" 'blob nil t)
+    )
+
+  )
+
+(defun git--test-branch-mode ()
+  ;; Virtualize git repo functions.
+  (flet ((git--branch-list () '(("aa" "master" "foobar") . "master")))
+    ;; Get rid of user hooks.
+    (let (git--branch-mode-hook git-branch-annotator-functions)
+      (unwind-protect
+          (save-window-excursion
+            (git-branch)
+            (assert (looking-at "master"))
+            (assert (string= (buffer-string) "   aa\n * master\n   foobar\n"))
+            (assert (equal "master" (git-branch-mode-selected)))
+            (forward-line)  ;; next-line errors out in batch for some reason
+            (assert (equal "foobar" (git-branch-mode-selected)))
+            ;; Let's try some annotations
+            (setq git-branch-annotator-functions
+                  (list (lambda (branch-list)
+                          (assert (equal branch-list '("aa" "master" "foobar")))
+                          '(("aa" . "an-aa-1")))
+                        (lambda (branch-list)
+                          (assert (equal branch-list '("aa" "master" "foobar")))
+                          '(("aa" . "an-aa-2") ("foobar" . "an-foobar-1")))))
+            (flet ((window-width () 80)) (git--branch-mode-refresh))
+            ;; Point should stay the same
+            (assert (looking-at "foobar"))
+            (assert (string= (buffer-string)
+                             (concat "   aa       - an-aa-1 an-aa-2\n"
+                                     " * master\n"
+                                     "   foobar   - an-foobar-1\n")))
+          )
+      (kill-buffer "*git-branch*"))
+    )))
+;; (git--test-branch-mode)
+
+(defun git-regression ()
+  (interactive)
+  ;; (setq debug-on-error t)  ;; uncomment to debug test run from make
+  (message "Running unittest suite...")
+  (git--test-standalone-functions)
+  (save-window-excursion                ; some bufs might pop up, e.g. commit
+    (git--test-with-temp-repo #'git--test-typical-repo-ops))
+  (git--test-branch-mode)
+
+  (message "git-regression passed"))
+  
\ No newline at end of file
diff --git a/site/git-emacs/git-blame.el b/site/git-emacs/git-blame.el
new file mode 100644
index 0000000..c63ea0c
--- /dev/null
+++ b/site/git-emacs/git-blame.el
@@ -0,0 +1,426 @@
+;;; git-blame.el --- Minor mode for incremental blame for Git  -*- coding: utf-8 -*-
+;;
+;; Copyright (C) 2007  David KĆ„gedal
+;;
+;; Authors:    David KĆ„gedal <davidk@lysator.liu.se>
+;; Created:    31 Jan 2007
+;; Message-ID: <87iren2vqx.fsf@morpheus.local>
+;; License:    GPL
+;; Keywords:   git, version control, release management
+;;
+;; Compatibility: Emacs21, Emacs22 and EmacsCVS
+;;                Git 1.5 and up
+
+;; This file is *NOT* part of GNU Emacs.
+;; This file is distributed under the same terms as GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+;; MA 02111-1307 USA
+
+;; http://www.fsf.org/copyleft/gpl.html
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Here is an Emacs implementation of incremental git-blame.  When you
+;; turn it on while viewing a file, the editor buffer will be updated by
+;; setting the background of individual lines to a color that reflects
+;; which commit it comes from.  And when you move around the buffer, a
+;; one-line summary will be shown in the echo area.
+
+;;; Installation:
+;;
+;; To use this package, put it somewhere in `load-path' (or add
+;; directory with git-blame.el to `load-path'), and add the following
+;; line to your .emacs:
+;;
+;;    (require 'git-blame)
+;;
+;; If you do not want to load this package before it is necessary, you
+;; can make use of the `autoload' feature, e.g. by adding to your .emacs
+;; the following lines
+;;
+;;    (autoload 'git-blame-mode "git-blame"
+;;              "Minor mode for incremental blame for Git." t)
+;;
+;; Then first use of `M-x git-blame-mode' would load the package.
+
+;;; Compatibility:
+;;
+;; It requires GNU Emacs 21 or later and Git 1.5.0 and up
+;;
+;; If you'are using Emacs 20, try changing this:
+;;
+;;            (overlay-put ovl 'face (list :background
+;;                                         (cdr (assq 'color (cddddr info)))))
+;;
+;; to
+;;
+;;            (overlay-put ovl 'face (cons 'background-color
+;;                                         (cdr (assq 'color (cddddr info)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(eval-when-compile (require 'cl))			      ; to use `push', `pop'
+
+
+(defun git-blame-color-scale (&rest elements)
+  "Given a list, returns a list of triples formed with each
+elements of the list.
+
+a b => bbb bba bab baa abb aba aaa aab"
+  (let (result)
+    (dolist (a elements)
+      (dolist (b elements)
+        (dolist (c elements)
+          (setq result (cons (format "#%s%s%s" a b c) result)))))
+    result))
+
+;; (git-blame-color-scale "0c" "04" "24" "1c" "2c" "34" "14" "3c") =>
+;; ("#3c3c3c" "#3c3c14" "#3c3c34" "#3c3c2c" "#3c3c1c" "#3c3c24"
+;; "#3c3c04" "#3c3c0c" "#3c143c" "#3c1414" "#3c1434" "#3c142c" ...)
+
+(defmacro git-blame-random-pop (l)
+  "Select a random element from L and returns it. Also remove
+selected element from l."
+  ;; only works on lists with unique elements
+  `(let ((e (elt ,l (random (length ,l)))))
+     (setq ,l (remove e ,l))
+     e))
+
+(defvar git-blame-dark-colors
+  (git-blame-color-scale "0c" "04" "24" "1c" "2c" "34" "14" "3c")
+  "*List of colors (format #RGB) to use in a dark environment.
+
+To check out the list, evaluate (list-colors-display git-blame-dark-colors).")
+
+(defvar git-blame-light-colors
+  (git-blame-color-scale "c4" "d4" "cc" "dc" "f4" "e4" "fc" "ec")
+  "*List of colors (format #RGB) to use in a light environment.
+
+To check out the list, evaluate (list-colors-display git-blame-light-colors).")
+
+(defvar git-blame-colors '()
+  "Colors used by git-blame. The list is built once when activating git-blame
+minor mode.")
+
+(defvar git-blame-ancient-color "dark green"
+  "*Color to be used for ancient commit.")
+
+(defvar git-blame-autoupdate t
+  "*Automatically update the blame display while editing")
+
+(defvar git-blame-proc nil
+  "The running git-blame process")
+(make-variable-buffer-local 'git-blame-proc)
+
+(defvar git-blame-overlays nil
+  "The git-blame overlays used in the current buffer.")
+(make-variable-buffer-local 'git-blame-overlays)
+
+(defvar git-blame-cache nil
+  "A cache of git-blame information for the current buffer")
+(make-variable-buffer-local 'git-blame-cache)
+
+(defvar git-blame-idle-timer nil
+  "An idle timer that updates the blame")
+(make-variable-buffer-local 'git-blame-cache)
+
+(defvar git-blame-update-queue nil
+  "A queue of update requests")
+(make-variable-buffer-local 'git-blame-update-queue)
+
+;; FIXME: docstrings
+(defvar git-blame-file nil)
+(defvar git-blame-current nil)
+
+(defvar git-blame-mode nil)
+(make-variable-buffer-local 'git-blame-mode)
+
+(defvar git-blame-mode-line-string " blame"
+  "String to display on the mode line when git-blame is active.")
+
+(or (assq 'git-blame-mode minor-mode-alist)
+    (setq minor-mode-alist
+	  (cons '(git-blame-mode git-blame-mode-line-string) minor-mode-alist)))
+
+;;;###autoload
+(defun git-blame-mode (&optional arg)
+  "Toggle minor mode for displaying Git blame
+
+With prefix ARG, turn the mode on if ARG is positive."
+  (interactive "P")
+  (cond
+   ((null arg)
+    (if git-blame-mode (git-blame-mode-off) (git-blame-mode-on)))
+   ((> (prefix-numeric-value arg) 0) (git-blame-mode-on))
+   (t (git-blame-mode-off))))
+
+(defun git-blame-mode-on ()
+  "Turn on git-blame mode.
+
+See also function `git-blame-mode'."
+  (make-local-variable 'git-blame-colors)
+  (if git-blame-autoupdate
+      (add-hook 'after-change-functions 'git-blame-after-change nil t)
+    (remove-hook 'after-change-functions 'git-blame-after-change t))
+  (git-blame-cleanup)
+  (let ((bgmode (cdr (assoc 'background-mode (frame-parameters)))))
+    (if (eq bgmode 'dark)
+	(setq git-blame-colors git-blame-dark-colors)
+      (setq git-blame-colors git-blame-light-colors)))
+  (setq git-blame-cache (make-hash-table :test 'equal))
+  (setq git-blame-mode t)
+  (git-blame-run))
+
+(defun git-blame-mode-off ()
+  "Turn off git-blame mode.
+
+See also function `git-blame-mode'."
+  (git-blame-cleanup)
+  (if git-blame-idle-timer (cancel-timer git-blame-idle-timer))
+  (setq git-blame-mode nil))
+
+;;;###autoload
+(defun git-reblame ()
+  "Recalculate all blame information in the current buffer"
+  (interactive)
+  (unless git-blame-mode
+    (error "Git-blame is not active"))
+
+  (git-blame-cleanup)
+  (git-blame-run))
+
+(defun git-blame-run (&optional startline endline)
+  (if git-blame-proc
+      ;; Should maybe queue up a new run here
+      (message "Already running git blame")
+    (let ((display-buf (current-buffer))
+          (blame-buf (get-buffer-create
+                      (concat " git blame for " (buffer-name))))
+          (args '("--incremental" "--contents" "-")))
+      (if startline
+          (setq args (append args
+                             (list "-L" (format "%d,%d" startline endline)))))
+      (setq args (append args
+                         (list (file-name-nondirectory buffer-file-name))))
+      (setq git-blame-proc
+            (apply 'start-process
+                   "git-blame" blame-buf
+                   "git" "blame"
+                   args))
+      (with-current-buffer blame-buf
+        (erase-buffer)
+        (make-local-variable 'git-blame-file)
+        (make-local-variable 'git-blame-current)
+        (setq git-blame-file display-buf)
+        (setq git-blame-current nil))
+      (set-process-filter git-blame-proc 'git-blame-filter)
+      (set-process-sentinel git-blame-proc 'git-blame-sentinel)
+      (process-send-region git-blame-proc (point-min) (point-max))
+      (process-send-eof git-blame-proc))))
+
+(defun remove-git-blame-text-properties (start end)
+  (let ((modified (buffer-modified-p))
+        (inhibit-read-only t))
+    (remove-text-properties start end '(point-entered nil))
+    (set-buffer-modified-p modified)))
+
+(defun git-blame-cleanup ()
+  "Remove all blame properties"
+    (mapc 'delete-overlay git-blame-overlays)
+    (setq git-blame-overlays nil)
+    (remove-git-blame-text-properties (point-min) (point-max)))
+
+(defun git-blame-update-region (start end)
+  "Rerun blame to get updates between START and END"
+  (let ((overlays (overlays-in start end)))
+    (while overlays
+      (let ((overlay (pop overlays)))
+        (if (< (overlay-start overlay) start)
+            (setq start (overlay-start overlay)))
+        (if (> (overlay-end overlay) end)
+            (setq end (overlay-end overlay)))
+        (setq git-blame-overlays (delete overlay git-blame-overlays))
+        (delete-overlay overlay))))
+  (remove-git-blame-text-properties start end)
+  ;; We can be sure that start and end are at line breaks
+  (git-blame-run (1+ (count-lines (point-min) start))
+                 (count-lines (point-min) end)))
+
+(defun git-blame-sentinel (proc status)
+  (with-current-buffer (process-buffer proc)
+    (with-current-buffer git-blame-file
+      (setq git-blame-proc nil)
+      (if git-blame-update-queue
+          (git-blame-delayed-update))))
+  ;;(kill-buffer (process-buffer proc))
+  ;;(message "git blame finished")
+  )
+
+(defvar in-blame-filter nil)
+
+(defun git-blame-filter (proc str)
+  (save-excursion
+    (set-buffer (process-buffer proc))
+    (goto-char (process-mark proc))
+    (insert-before-markers str)
+    (goto-char 0)
+    (unless in-blame-filter
+      (let ((more t)
+            (in-blame-filter t))
+        (while more
+          (setq more (git-blame-parse)))))))
+
+(defun git-blame-parse ()
+  (cond ((looking-at "\\([0-9a-f]\\{40\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)\n")
+         (let ((hash (match-string 1))
+               (src-line (string-to-number (match-string 2)))
+               (res-line (string-to-number (match-string 3)))
+               (num-lines (string-to-number (match-string 4))))
+           (setq git-blame-current
+                 (if (string= hash "0000000000000000000000000000000000000000")
+                     nil
+                   (git-blame-new-commit
+                    hash src-line res-line num-lines))))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "filename \\(.+\\)\n")
+         (let ((filename (match-string 1)))
+           (git-blame-add-info "filename" filename))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "\\([a-z-]+\\) \\(.+\\)\n")
+         (let ((key (match-string 1))
+               (value (match-string 2)))
+           (git-blame-add-info key value))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "boundary\n")
+         (setq git-blame-current nil)
+         (delete-region (point) (match-end 0))
+         t)
+        (t
+         nil)))
+
+(defun git-blame-new-commit (hash src-line res-line num-lines)
+  (save-excursion
+    (set-buffer git-blame-file)
+    (let ((info (gethash hash git-blame-cache))
+          (inhibit-point-motion-hooks t)
+          (inhibit-modification-hooks t))
+      (when (not info)
+	;; Assign a random color to each new commit info
+	;; Take care not to select the same color multiple times
+	(let ((color (if git-blame-colors
+			 (git-blame-random-pop git-blame-colors)
+		       git-blame-ancient-color)))
+          (setq info (list hash src-line res-line num-lines
+                           (git-describe-commit hash)
+                           (cons 'color color))))
+        (puthash hash info git-blame-cache))
+      (goto-line res-line)
+      (while (> num-lines 0)
+        (if (get-text-property (point) 'git-blame)
+            (forward-line)
+          (let* ((start (point))
+                 (end (progn (forward-line 1) (point)))
+                 (ovl (make-overlay start end)))
+            (push ovl git-blame-overlays)
+            (overlay-put ovl 'git-blame info)
+            (overlay-put ovl 'help-echo hash)
+            (overlay-put ovl 'face (list :background
+                                         (cdr (assq 'color (nthcdr 5 info)))))
+            ;; the point-entered property doesn't seem to work in overlays
+            ;;(overlay-put ovl 'point-entered
+            ;;             `(lambda (x y) (git-blame-identify ,hash)))
+            (let ((modified (buffer-modified-p)))
+              (put-text-property (if (= start 1) start (1- start)) (1- end)
+                                 'point-entered
+                                 `(lambda (x y) (git-blame-identify ,hash)))
+              (set-buffer-modified-p modified))))
+        (setq num-lines (1- num-lines))))))
+
+(defun git-blame-add-info (key value)
+  (if git-blame-current
+      (nconc git-blame-current (list (cons (intern key) value)))))
+
+(defun git-blame-current-commit ()
+  (let ((info (get-char-property (point) 'git-blame)))
+    (if info
+        (car info)
+      (error "No commit info"))))
+
+(defun git-describe-commit (hash)
+  (with-temp-buffer
+    (call-process "git" nil t nil
+                  "log" "-1" "--pretty=oneline"
+                  hash)
+    (buffer-substring (point-min) (1- (point-max)))))
+
+(defvar git-blame-last-identification nil)
+(make-variable-buffer-local 'git-blame-last-identification)
+(defun git-blame-identify (&optional hash)
+  (interactive)
+  (let ((info (gethash (or hash (git-blame-current-commit)) git-blame-cache)))
+    (when (and info (not (eq info git-blame-last-identification)))
+      (message "%s" (nth 4 info))
+      (setq git-blame-last-identification info))))
+
+;; (defun git-blame-after-save ()
+;;   (when git-blame-mode
+;;     (git-blame-cleanup)
+;;     (git-blame-run)))
+;; (add-hook 'after-save-hook 'git-blame-after-save)
+
+(defun git-blame-after-change (start end length)
+  (when git-blame-mode
+    (git-blame-enq-update start end)))
+
+(defvar git-blame-last-update nil)
+(make-variable-buffer-local 'git-blame-last-update)
+(defun git-blame-enq-update (start end)
+  "Mark the region between START and END as needing blame update"
+  ;; Try to be smart and avoid multiple callouts for sequential
+  ;; editing
+  (cond ((and git-blame-last-update
+              (= start (cdr git-blame-last-update)))
+         (setcdr git-blame-last-update end))
+        ((and git-blame-last-update
+              (= end (car git-blame-last-update)))
+         (setcar git-blame-last-update start))
+        (t
+         (setq git-blame-last-update (cons start end))
+         (setq git-blame-update-queue (nconc git-blame-update-queue
+                                             (list git-blame-last-update)))))
+  (unless (or git-blame-proc git-blame-idle-timer)
+    (setq git-blame-idle-timer
+          (run-with-idle-timer 0.5 nil 'git-blame-delayed-update))))
+
+(defun git-blame-delayed-update ()
+  (setq git-blame-idle-timer nil)
+  (if git-blame-update-queue
+      (let ((first (pop git-blame-update-queue))
+            (inhibit-point-motion-hooks t))
+        (git-blame-update-region (car first) (cdr first)))))
+
+(provide 'git-blame)
+
+;;; git-blame.el ends here
diff --git a/site/git-emacs/git-emacs-autoloads.el b/site/git-emacs/git-emacs-autoloads.el
new file mode 100644
index 0000000..6745db9
--- /dev/null
+++ b/site/git-emacs/git-emacs-autoloads.el
@@ -0,0 +1,36 @@
+;; See git-emacs.el for project and license information.
+
+;; Autoloads for git-emacs.
+;;
+;; Loads git-emacs in the following situations:
+;;
+;; 1) git-init
+;; 2) git-status
+;; 3) git-log-from-cmdline
+;; 4) opening a git-controlled file
+
+(eval-when-compile (require 'vc))
+(eval-when-compile (require 'vc-git))
+(add-to-list 'vc-handled-backends 'git)
+
+(autoload 'git-status "git-status"
+  "Launch git-emacs's status mode on the specified directory.")
+(autoload 'git-init             "git-emacs"
+  "Initialize a git repository." t)
+(autoload 'git-log-from-cmdline "git-log"
+  "Launch a git log view from emacs --eval or gnuclient --eval")
+(autoload 'git--update-modeline "git-emacs")
+
+;; A couple of functions are needed to support autoload on opening a git file.
+(defsubst git--in-vc-mode? ()
+  "Returns true if the current buffer is under vc-git."
+  
+  (and vc-mode (string-match "^ Git" (substring-no-properties vc-mode))))
+
+;; vc-hook to check whether to load git-emacs or not
+(defadvice vc-find-file-hook (after git--vc-git-find-file-hook activate)
+  "vc-find-file-hook advice for synchronizing with vc-git interface"
+
+  (when (git--in-vc-mode?) (git--update-modeline)))
+
+(provide 'git-emacs-autoloads)
diff --git a/site/git-emacs/git-emacs.el b/site/git-emacs/git-emacs.el
new file mode 100644
index 0000000..22e9991
--- /dev/null
+++ b/site/git-emacs/git-emacs.el
@@ -0,0 +1,2602 @@
+;;; git-emacs (v.1.4.3) : yet another git emacs mode for newbies
+;;
+;; Copyright (C) 2008  TSKim (tsgatesv@gmail.com)
+;;
+;; v.1.4.3 Modified by ovy            @ 20 September 2009
+;; v.1.4   Modified by ovy            @ 22 March 2009
+;; v.1.3   Modified by Con Digitalpit @ 29 March 2008
+;;
+;; Authors    : TSKim : Kim Taesoo(tsgatesv@gmail.com)
+;; Created    : 24 March 2007
+;; License    : GPL
+;; Keywords   : git, version control, release management
+;;
+;; Compatibility: Emacs22 and EmacsCVS (developed on 23.0.60.2)
+;;                Git 1.5 and up
+
+;; This file is *NOT* part of GNU Emacs.
+;; This file is distributed under the same terms as GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+;; MA 02111-1307 USA
+
+;; http://tsgates.cafe24.com/git/git-emacs.html
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;; Some related packages were used directly or as inspiration:
+;;   - psvn.el (Stefan Reichoer)
+;;   - vc-git.el (Alexandre Julliard)
+;;   - git.el (Alexandre Julliard)
+;;   - ido.el (Kim F. Storm)
+;;   - ...
+;;
+;;; Installation
+;;
+;; First, make sure that vc-git.el is in your load path. Emacs 23 ships it by
+;; default, for older versions you can get it from git distributions prior
+;; to 1.6.x.
+;; 
+;; 1) Load at startup (simplest)
+;;
+;; (add-to-list 'load-path "~/.emacs.d/git-emacs")  ; or your installation path
+;; (require 'git-emacs)
+;;
+;; 2) Autoload (slimmer statup footprint, will activate when visiting a git
+;;   file or running some top-level functions)
+;;
+;; (add-to-list 'load-path "~/.emacs.d/git-emacs") ; or your installation path
+;; (fmakunbound 'git-status)   ; Possibly remove Debian's autoloaded version
+;; (require 'git-emacs-autoloads)
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; TODO : check git environment
+;; TODO : status -> index
+;; TODO : pull/patch
+;; TODO : fetching
+;; TODO : regular exp selecting
+;; TODO : enhance config! & tag!
+;; TODO : save -> status-view update
+;; TODO : git-log -> C-u command :=> cmd
+;; TODO : status-mode function -> add status prefix
+;; TODO : git set config
+;; TODO : () -> fording/unfording for detail
+;; TODO : show ignored files
+;; TODO : locally flyspell
+;;
+;; DONE : turn off ido-mode globally
+;; DONE : git-add
+;; DONE : remote branch list
+;; DONE : separate branch-mode & status-view-mode to other files
+
+
+(require 'cl)                           ; common lisp
+(require 'ediff)                        ; we use this a lot
+(require 'vc)                           ; vc
+(require 'vc-git)                       ; vc-git advises
+(add-to-list 'vc-handled-backends 'git) ; set backend management
+(require 'time-stamp)                   ; today
+
+(require 'git-global-keys)              ; global keyboard mappings
+(require 'git-emacs-autoloads)          ; the minimal autoloads
+
+;; Autoloaded submodules, those not declared in git-emacs-autoloads
+
+(autoload 'git-blame-mode "git-blame"
+  "Minor mode for incremental blame for Git" t)
+
+(autoload 'git--update-state-mark "git-modeline"
+  "Update modeline of git buffers with a customizable state marker" t)
+(autoload 'git--update-all-state-marks "git-modeline"
+  "Update the modelines of all git buffers" t)
+
+(autoload 'git-log-files "git-log"
+  "Launch the git log view for the current file or the selected files in git-status-mode" t)
+(autoload 'git-log "git-log"
+  "Launch the git log view for whole repository" t)
+(autoload 'git-log-other "git-log"
+  "Launch the git log view for an arbitrary branch or tag" t)
+
+
+
+;;-----------------------------------------------------------------------------
+;; Global preferences.
+;;-----------------------------------------------------------------------------
+(defgroup git-emacs nil
+  "A user interface for the git versioning system."
+  :group 'tools)
+
+(defcustom git--use-ido t
+  "Whether to use ido completion for git-emacs prompts."
+  :type '(boolean)
+  :group 'git-emacs)
+
+(defvar git--completing-read
+  (if git--use-ido
+      (progn
+        (require 'ido)
+        ;; But this is not enough apparently. We need to strobe ido-mode
+        ;; for ido-completing-read to work. Ugh.
+        (unless ido-mode (ido-mode t) (ido-mode -1))
+        #'ido-completing-read)
+    #'completing-read)
+  "Function to use for git-emacs minibuffer prompts with choices. It should have
+the signature of `completing-read'.")
+
+(defgroup git-emacs-faces nil
+  "Face customizations for git-emacs."
+  :group 'git-emacs)
+
+;; Face definition macros. Used mostly in git-status.
+(defmacro git--face (name fore1 prop1 fore2 prop2)
+  `(defface ,(intern (concat "git--" (symbol-name name) "-face"))
+     '((((class color) (background light)) (:foreground ,fore1 ,@prop1))
+       (((class color) (background dark))  (:foreground ,fore2 ,@prop2)))
+    ,(concat "git " (symbol-name name) " face in status buffer mode")
+    :group 'git-emacs-faces))
+
+(git--face bold       "tomato" (:bold t) "tomato"  (:bold t))
+
+(defsubst git--bold-face (str) (propertize str 'face 'git--bold-face))
+
+(defconst git--msg-critical (propertize "Critical Error" 'face 'git--bold-face))
+(defconst git--msg-failed (propertize "Failed" 'face 'git--bold-face))
+
+;;-----------------------------------------------------------------------------
+;; Internal variables.
+;;-----------------------------------------------------------------------------
+
+
+(defvar git--executable "git" "Main git executable")
+(defvar git--commit-log-buffer "*git commit*")
+(defvar git--log-flyspell-mode t "enable flyspell-mode when editing log")
+(defvar git--repository-bookmarks
+  '("git://github.com/tsgates/git-emacs.git"
+    "git://git.kernel.org/pub/scm/git/git.git"
+    "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git"
+    )
+  "repository bookmarks")
+
+(defvar git--repository-history nil)
+(defconst git--repository-dir ".git")
+
+(defconst git--reg-space   " ")
+(defconst git--reg-status  "\\([A-Z?]\\)")
+(defconst git--reg-tab     "\t")
+(defconst git--reg-blank   "[\t\0 ]+")
+(defconst git--reg-eof     "\0")
+(defconst git--reg-perm    "\\([0-7]\\{6\\}\\)")
+(defconst git--reg-type    "\\([^ ]+\\)")
+(defconst git--reg-sha1    "\\([0-9a-f]\\{40\\}\\)")
+(defconst git--reg-file    "\\([^\0]+\\)")
+(defconst git--reg-branch  "\\([^\n]+\\)")
+(defconst git--reg-stage   "\\([0-9]+\\)")
+
+(defconst git--log-sep-line
+  "# --------------------------- message ---------------------------")
+(defconst git--log-file-line
+  "# ---------------------------- files ----------------------------")
+(defconst git--log-header-line
+  "# ----------------------------- info ----------------------------")
+
+
+;;-----------------------------------------------------------------------------
+;; Low-level execution functions.
+;;-----------------------------------------------------------------------------
+
+(defsubst git--exec (cmd outbuf infile &rest args)
+  "Low level function for calling git. CMD is the main git subcommand, args
+are the remaining args. See `call-process' for the meaning of OUTBUF and
+INFILE. Reeturns git's exit code."
+  (apply #'call-process git--executable infile outbuf nil (cons cmd args)))
+
+(defun git--exec-pipe (cmd input &rest args)
+  "Execute 'git cmd args', piping INPUT (which can be a buffer or string).
+Return result string."
+  (with-output-to-string
+    (with-current-buffer standard-output
+      (let ((tmp (make-temp-file "git-emacs-tmp")))
+        (unwind-protect
+            (progn
+              (if (bufferp input)
+                  (with-current-buffer input
+                    (write-file tmp))
+                (with-temp-buffer
+                  (insert input)
+                  (write-file tmp)))
+              (message "")              ;hide write to file message
+              (apply #'git--exec cmd t tmp args))
+          (delete-file tmp))))))
+
+(defsubst git--exec-buffer (cmd &rest args)
+  "Execute 'git' within the buffer. Return the exit code."
+  (apply #'git--exec cmd t nil args))
+
+(defsubst git--exec-string-no-error (cmd &rest args)
+  "Execute 'git CMD ARGS' and return result string, which may be
+a failure message."
+  (with-output-to-string
+    (with-current-buffer standard-output
+      (apply #'git--exec-buffer cmd args))))
+
+(defun git--trim-string (str)
+  "Trim the spaces / newlines from the beginning and end of STR."
+  (let ((begin 0) (end (- (length str) 1)))
+    ;; trim front
+    (while (and (< begin end)
+                (memq (aref str begin) '(? ?\n)))
+      (incf begin))
+    ;; trim rear
+    (while (and (<= begin end)
+                (memq (aref str end) '(? ?\n)))
+      (decf end))
+    (substring str begin (+ end 1))))
+
+(defun git--exec-string (cmd &rest args)
+  "Executes the specified git command, raises an error with the git output
+if it fails. If the command succeeds, returns the git output."
+  (with-output-to-string
+    (with-current-buffer standard-output
+      (unless (eq 0
+                  (apply #'git--exec-buffer cmd args))
+        (error "%s" (git--trim-string (buffer-string)))))))
+
+
+;; This is nasty: the git devs changed the meaning of "git status" in git
+;; 1.7, but commit --dry-run is not available in older git. Thanks much
+;; guys -- I get to learn to learn how to do horrible hacks like this.
+;; Hopefully the messages aren't translated or something.
+(defun git--commit-dryrun-compat(outbuf &rest args)
+  "Executes commit --dry-run with the specified args, falls back to the
+older git status if that command is not present. If OUTBUF is not nil, puts
+the standard output there. Returns the git return code."
+  ;; Going forward, this will simply succeed.
+  (let ((rc (apply #'git--exec "commit" (list outbuf nil) nil
+                   "--dry-run" args)))
+    (when (eq rc 129)
+      ;; gotta distinguish between bad args or no --dry-run.
+      (let ((has-dry-run
+             (string-match
+              "--dry-run"
+              (git--exec-string-no-error "commit" "--no-such-arg-show-help"))))
+        (unless has-dry-run
+          (setq rc (apply #'git--exec "status" outbuf nil args)))))
+    rc))
+
+
+;;-----------------------------------------------------------------------------
+;; utilities
+;;-----------------------------------------------------------------------------
+
+(defun git--trim-tail (str)
+  "Trim spaces / newlines from the end of STR."
+  (let ((end (- (length str) 1)))
+    (while (and (< 0 end)
+                (memq (aref str end) '(? ?\n)))
+      (decf end))
+    (substring str 0 (+ end 1))))
+
+(defun git--pop-to-buffer(buffer)
+  "Wrapper around `pop-to-buffer', stores window configuration
+from before `pop-to-buffer' call for later restoration. Every
+buffer popped to with this function will have a local
+`kill-buffer-hook' to restore previous window configuration."
+  (let ((git--saved-window-configuration (current-window-configuration))
+        (popped-buffer (pop-to-buffer buffer)))
+    (with-current-buffer popped-buffer
+      (add-hook 'kill-buffer-hook
+                (lexical-let ((saved-config git--saved-window-configuration))
+                  #'(lambda()
+                      (set-window-configuration saved-config)
+                      )) nil t)) ;; !append local
+    popped-buffer))
+
+(defsubst git--join (seq &optional sep)
+  "Joins the strings in SEQ with the SEP (defaults to blank)."
+  (mapconcat #'identity seq (if sep sep " ")))
+
+(defsubst git--concat-path-only (path added)
+  "Concatenate the path with proper separator"
+  (concat (file-name-as-directory path) added))
+
+(defsubst git--concat-path (path added)
+  (expand-file-name (git--concat-path-only path added)))
+
+(defsubst git--expand-to-repository-dir (dir)
+  (git--concat-path dir git--repository-dir))
+
+(defun git--quit-buffer ()
+  "Kill the current buffer, calls `kill-buffer'. Every
+  buffer popped with `git--pop-to-buffer' will restore previous
+  window-configuration when killed."
+  (interactive)
+  (kill-buffer))
+
+(defsubst git--rev-parse (&rest args)
+  "Execute 'git rev-parse ARGS', return result string."
+  (apply #'git--exec-string "rev-parse" args))
+
+(defmacro git-in-lowest-existing-dir (dir &rest BODY)
+  "Runs \"BODY\" with `default-directory' set to the nearest
+existing parent of DIR; useful because git directories can come
+and go when switching parents, and Emacs refuses to execute
+commands in a non-existing directory.  If DIR is nil, defaults to
+`default-directory'. Only use this for commands that don't take
+filenames, such as git branch, because relative filenames may
+become invalid when we walk up -- in that case, it's better to
+let the user see the invalid directory error."
+   `(let ((default-directory (file-name-as-directory
+                              (if ,dir (expand-file-name ,dir)
+                                default-directory))))
+      ;; The default-directory might be gone if a branch was switched! Walk up.
+      (let (parent)
+        (while (not (or (file-exists-p default-directory)
+                        (eq (setq parent (file-name-as-directory
+                                          (expand-file-name "..")))
+                            default-directory)))
+          (setq default-directory parent)))
+      ,@BODY))
+
+(defmacro git--if-in-status-mode (THEN &rest ELSE)
+  "Macro that evaluates THEN when in git-status-mode, ELSE otherwise. Used to
+grab status-mode filelists without the compiler complaining about the
+autoloading which we know has already happened."
+  `(if (eq major-mode 'git-status-mode)
+       (progn (eval-when-compile (require 'git-status)) ,THEN)
+     ,@ELSE))
+
+(defun git--get-top-dir (&optional dir)
+  "Get the top-level git directory above DIR. If nil, use default-directory."
+  (git-in-lowest-existing-dir dir
+   (let ((cdup (git--rev-parse "--show-cdup")))
+     (git--concat-path default-directory (car (split-string cdup "\n"))))))
+
+(defsubst git--interpret-to-state-symbol (stat)
+  "Interpret a one-letter git state string to our state symbols."
+  (case (string-to-char stat)
+    (?H 'uptodate )
+    (?M 'modified )
+    (?? 'unknown  )
+    (?A 'added    )
+    (?D 'deleted  )
+    (?U 'unmerged )
+    (?T 'modified )
+    (?K 'killed   )
+    (t nil)))
+
+(defsubst git--build-reg (&rest args)
+  (apply #'concat (add-to-list 'args "\0" t)))
+
+(defsubst git--select-from-user (prompt choices &optional history default)
+  "Select from choices. Shortcut to git--completing-read."
+  (funcall git--completing-read prompt choices nil nil nil history default))
+
+(defmacro git--please-wait (msg &rest body)
+  "Macro to give feedback around actions that may take a long
+time. Prints MSG..., executes BODY, then prints MSG...done (as per the elisp
+style guidelines)."
+  `(let ((git--please-wait-msg (concat ,msg "...")))
+     (message git--please-wait-msg)
+     ,@body
+     (message (concat git--please-wait-msg "done"))))
+
+(defun git--find-buffers-in-dir (repo &optional predicate)
+  "Finds buffers corresponding to files in the given directory,
+optionally satisfying PREDICATE (which should take a buffer object as
+argument)."
+  (let* ((absolute-repo (expand-file-name (file-name-as-directory repo)))
+         (absolute-repo-length (length absolute-repo))
+         (buffers))
+    (dolist (buffer (buffer-list))
+      (let ((filename (buffer-file-name buffer)))
+        (when filename
+          (when (and (eq t (compare-strings filename
+                                            0 absolute-repo-length
+                                            absolute-repo
+                                            0 absolute-repo-length))
+                     (or (not predicate) (funcall predicate buffer)))
+              (add-to-list 'buffers buffer)))))
+    buffers))
+
+(defun git--find-buffers-from-file-list (filelist &optional predicate)
+  "Finds buffers corresponding to files in the given list,
+optionally satisfying the predicate."
+  (let (buffers)
+    (dolist (filename filelist)
+      (let ((buffer (find-buffer-visiting filename predicate)))
+        (when buffer (add-to-list 'buffers buffer))))
+    buffers))
+
+(defun git--find-buffers (&optional repo-or-filelist predicate)
+  "Find buffers satisfying PREDICATE in the given
+REPO-OR-FILELIST, which can be a string (path within a git
+repository), a list (filelist) or nil (current git repository)."
+  (cond
+   ((eq nil repo-or-filelist) (git--find-buffers-in-dir
+                               (git--get-top-dir default-directory)
+                               predicate))
+   ((stringp repo-or-filelist) (git--find-buffers-in-dir
+                                (git--get-top-dir repo-or-filelist) predicate))
+   (t (git--find-buffers-from-file-list repo-or-filelist predicate))))
+
+(defun git--maybe-ask-save (&optional repo-or-filelist)
+  "If there are modified buffers which visit files in the given
+REPO-OR-FILELIST,ask to save them. If REPO-OR-FILELIST is nil,
+look for buffers in the current git repo. Returns the number of
+buffers saved."
+  (let ((buffers (git--find-buffers repo-or-filelist  #'buffer-modified-p)))
+    (map-y-or-n-p
+     (lambda(buffer) (format "Save %s? " (buffer-name buffer)))
+     (lambda(buffer) (with-current-buffer buffer (save-buffer)))
+     buffers
+     '("buffer" "buffers" "save"))))
+
+(defcustom git-working-dir-change-behaviour
+  'git-ask-for-all-saved
+  "Controls the buffer-refreshing behaviour after a git working dir change
+ (e.g. branch switch), when there are buffers visiting files that
+ have been modified by the change."
+  :type '(radio (const :tag "Ask about refreshing all saved buffers"
+                       git-ask-for-all-saved)
+                (const :tag "Refresh all saved buffers"
+                       git-refresh-all-saved)
+                (const :tag "Don't refresh" nil))
+  :group 'git-emacs)
+
+(defun git-after-working-dir-change (&optional repo-or-filelist)
+  "This function should be called after a change to the git working dir.
+If there are buffers visiting files in the given REPO-OR-FILELIST that
+have changed (buffer modtime != file modtime), ask the user whether to refresh
+those buffers. Updates the state mark of all the buffers not reverted
+\(since revert updates the ones reverted anyway). If currently in status
+buffer, refreshes the status buffer. Warns the user if there are any buffers
+visiting files that no longer exist."
+  (interactive)
+  (let ((buffers (git--find-buffers
+                  repo-or-filelist
+                  #'(lambda(buffer)
+                      (not (verify-visited-file-modtime buffer)))))
+        (buffers-that-exist nil) (buffers-that-dont-exist nil)
+        (num-buffers-refreshed 0))
+    (dolist (buffer buffers)
+      (if (file-exists-p (buffer-file-name buffer))
+          (push buffer buffers-that-exist)
+        (push buffer buffers-that-dont-exist)))
+    ;; Revert buffers that exist
+    (unwind-protect
+        (let ((buffers-not-reverted (copy-sequence buffers-that-exist))
+              buffers-that-exist-unsaved buffers-that-exist-saved)
+          (flet ((buffer-refresh-func (buffer)
+                  (with-current-buffer buffer (revert-buffer t t))
+                  ;; A hash table is probably not worth it here.
+                  (setq buffers-not-reverted
+                        (delq buffer buffers-not-reverted))
+                  (incf num-buffers-refreshed)))
+            ;; Filter buffers by their saved status.
+            (dolist (buffer buffers-that-exist)
+              (if (buffer-modified-p buffer)
+                  (push buffer buffers-that-exist-unsaved)
+                (push buffer buffers-that-exist-saved)))
+            ;; Do the state mark update if the user quits the revert prompts.
+            ;; Or, on all unsaved buffers.
+            (unwind-protect
+                (case git-working-dir-change-behaviour
+                  ('git-ask-for-all-saved
+                   (map-y-or-n-p
+                    (lambda(buffer) (format "%s has changed, refresh buffer? "
+                                            (buffer-name buffer)))
+                    #'buffer-refresh-func
+                    buffers-that-exist-saved
+                    '("buffer" "buffers" "refresh")))
+                  ('git-refresh-all-saved
+                   (mapc #'buffer-refresh-func buffers-that-exist-saved)))
+              (when buffers-not-reverted
+                (git--update-all-state-marks (mapcar #'buffer-file-name
+                                                   buffers-not-reverted)))))
+          ;; Refresh status buffer
+          (git--if-in-status-mode (git--status-view-refresh)))
+      ;; But display the [important] files don't exist / buffers refreshed
+      ;; warnings on failure / quit
+      (let ((submessages
+             (append
+              (when (> num-buffers-refreshed 0)
+                (list (format "%d buffers refreshed" num-buffers-refreshed)))
+              (when buffers-that-dont-exist
+                (list
+                 (format "some open files no longer exist: %s"
+                   (git--join
+                    (let ((numfiles (length buffers-that-dont-exist)))
+                      (if (> numfiles 2)
+                       (list (buffer-name (first buffers-that-dont-exist))
+                             (format "%d others" (- numfiles 1)))
+                       (mapcar #'buffer-name buffers-that-dont-exist)))
+                    ", ")))))))
+        (when submessages
+          (message "Note: %s" (git--join submessages "; ")))))))
+
+;; This belongs later with all the commit functions, but the compiler complains
+;; in git-log if we don't define it before its first use.
+(defun git-commit-all (&optional amend)
+  "Runs git commit -a, prompting for a commit message. With a prefix argument,
+runs git commit --amend -a, alowing an update of the previous commit."
+  (interactive "P")
+  (git-commit amend t))
+
+;;-----------------------------------------------------------------------------
+;; fileinfo structure
+;;-----------------------------------------------------------------------------
+
+;; ewoc file info structure for each list element
+(defstruct (git--fileinfo
+            (:copier nil)
+            (:constructor git--create-fileinfo
+                          (name type &optional sha1 perm marked
+                                               stat size refresh))
+            (:conc-name git--fileinfo->))
+  marked   ;; t/nil
+  expanded ;; t/nil
+  refresh  ;; t/nil
+  stat     ;; 'unknown/'modified/'uptodate/'staged  etc.
+  type     ;; 'blob/'tree/'commit (i.e. submodule)
+  name     ;; filename
+  size     ;; size
+  perm     ;; permission
+  sha1)    ;; sha1
+
+(defsubst git--fileinfo-is-dir (info)
+  "Returns true if a file info is directory-like (expandable, sorted first)"
+  (not (eq 'blob (git--fileinfo->type info))))
+
+(defsubst git--fileinfo-dir (info)
+  "Returns the directory component of a fileinfo's path. If the fileinfo is
+directory-like, the directory is the path itself, with a slash appended."
+  (if (git--fileinfo-is-dir info)
+      (file-name-as-directory (git--fileinfo->name info))
+    (or (file-name-directory (git--fileinfo->name info)) "")))
+
+(defun git--fileinfo-lessp (info1 info2)
+  "Sorting rule for git--fileinfos, such that the ordering in git-status is
+right. The rule is rather complicated, but it basically results in a
+properly expanded tree."
+  (let ((info1-dir (git--fileinfo-dir info1))
+        (info2-dir (git--fileinfo-dir info2)))
+    (let ((cmp (compare-strings info1-dir 0 nil info2-dir 0 nil)))
+      (if (not (eq t cmp))
+          ;; A file in a subdirectory should always come before a file
+          ;; in the parent directory.
+          (if (< cmp 0)
+              ;; info1-dir < info2-dir
+              (if (eq (length info1-dir) (- -1 cmp))
+                  ;; info1-dir is a subdir of info2-dir. less == false,
+                  ;; unless info1 is a directory itself.
+                  (git--fileinfo-is-dir info1)
+                t)
+            ;; info1-dir > info2-dir
+            (if (eq (length info2-dir) (- cmp 1))
+                ;; info2-dir is a subdir of info1-dir. less == true, unless
+                ;; info2 is a directory itself.
+                (not (git--fileinfo-is-dir info2))
+              nil))
+        ;; same directory, straight-up comparison
+        (string< (git--fileinfo->name info1)
+                 (git--fileinfo->name info2))))))
+
+
+;;-----------------------------------------------------------------------------
+;; git commands
+;;-----------------------------------------------------------------------------
+
+(defun git--init (dir)
+  "Execute 'git init' in DIR (current dir, if unspecified)."
+  (with-temp-buffer
+    (when dir (cd dir))
+    (git--exec-string "init")))
+
+(defun git--checkout (&rest args)
+  "Execute 'git checkout ARGS' and return resulting string."
+  (apply #'git--exec-string "checkout" args))
+
+(defun git--clone-sentinel (proc stat)
+  "Process sentinel for 'git clone' processes."
+  (let ((cmd (git--join (process-command proc))))
+    (cond ((string= stat "finished\n")
+           (message "%s : %s" (git--bold-face "Cloned") cmd))
+          ;; TODO : popup or state
+          ((string= stat "killed\n")
+           (message "%s : %s" git--msg-failed cmd))
+          (t
+           (message "%s : %s" git--msg-critical cmd)))))
+
+(defun git--clone (&rest args)
+  "Execute 'git clone ARGS', with a process sentinel showing status."
+  (let ((proc (apply #'start-process "git-clone" nil "git" "clone" args)))
+    (set-process-sentinel proc 'git--clone-sentinel)
+    (message "%s : %s"
+             (git--bold-face "Run")
+             (git--join (process-command proc)))))
+
+(defun git--commit (msg &rest args)
+  "Execute 'git commit ARGS',  pipe the MSG string"
+  (git--trim-string
+   (apply #'git--exec-pipe "commit" msg "-F" "-" args)))
+
+(defun git--reset (&rest args)
+  "Execute 'git reset ARGS', return the result string."
+  (apply #'git--exec-string "reset" args))
+
+(defun git--config (&rest args)
+  "Execute 'git config ARGS', return the result string. Return empty
+if git config fails (behaviour if unconfigured as of version 1.7.1)."
+  (condition-case nil
+      (git--trim-string (apply #'git--exec-string "config" args))
+    (error "")))
+
+(defun git--add (files)
+  "Execute 'git add' with the sequence FILES."
+  (when (stringp files) (setq files (list files)))
+  (apply #'git--exec-string "add" files))
+
+(defun git--mv (src dst)
+  "Execute git mv for SRC and DST files."
+  (git--exec-string "mv" src dst))
+
+(defun git--tag (&rest args)
+  "Execute 'git tag ARGS', return the result as string."
+  (apply #'git--exec-string "tag" args))
+
+(defvar git--tag-history nil "History variable for tags entered by user.")
+
+(defalias 'git-snapshot 'git-tag)
+(defun git-tag (&optional tag-name commit)
+  "Create a new tag for the current commit, or a specified one.
+git-snapshot is an alias to this. Returns the previous target of the tag,
+nil if none."
+  (interactive)
+  (let* ((friendly-commit (if commit (git--bold-face commit)
+                            "current tree"))
+        ;; Don't use ido here, since the user will often select a new one
+         (tag-name (or tag-name
+                       (completing-read (format "Tag %s as: " friendly-commit)
+                                        (git--tag-list)
+                                        nil nil nil 'git--tag-history)))
+         (old-tag-target (ignore-errors
+                           (git--trim-string
+                            (git--rev-parse "--short" tag-name)))))
+    (apply #'git--tag (delq nil (list "-f" tag-name commit)))
+    (message "Tagged %s with %s%s"
+             friendly-commit (git--bold-face tag-name)
+             (if old-tag-target (format " (previously %s)"
+                                        (git--bold-face old-tag-target))
+               ""))
+    old-tag-target))
+
+(defun git--tag-list ()
+  "Get the list of known git tags, which may not always refer to commit objects"
+  (split-string (git--tag "-l") "\n" t))
+
+(defsubst git--diff-raw (args &rest files)
+  "Execute 'git diff --raw' with 'args' and 'files' at current buffer. This
+gives, essentially, file status."
+  ;; git-diff abbreviates by default, and also produces a diff.
+  (apply #'git--exec-buffer "diff" "-z" "--full-index" "--raw" "--abbrev=40"
+         (append args (list "--") files)))
+
+(defun git--status-index (&rest files)
+  "Execute 'git-status-index' and return list of 'git--fileinfo'"
+
+  ;; update fileinfo -> unmerged index
+  (let ((fileinfo nil)
+        (unmerged-info (make-hash-table :test 'equal))
+        (regexp (git--build-reg ":"
+                                git--reg-perm    ; matched-1: HEAD perms
+                                git--reg-blank
+                                git--reg-perm    ; matched-2: index perms
+                                git--reg-blank
+                                git--reg-sha1    ; matched-3: HEAD sha1
+                                git--reg-blank
+                                git--reg-sha1    ; matched-4: index sha1
+                                git--reg-blank
+                                git--reg-status  ; matched-5
+                                git--reg-eof
+                                git--reg-file    ; matched-6
+                                )))
+
+    (dolist (stage-and-fi (git--ls-unmerged))
+      ;; ignore the different stages, since we're not using the sha1s
+      (puthash (git--fileinfo->name (cdr stage-and-fi))
+               (git--fileinfo->stat (cdr stage-and-fi))
+               unmerged-info))
+
+    (with-temp-buffer
+      (apply #'git--diff-raw (list "HEAD") files)
+
+      (goto-char (point-min))
+
+      (while (re-search-forward regexp nil t)
+        (let ((perm (match-string 2))
+              (stat (git--interpret-to-state-symbol (match-string 5)))
+              (file (match-string 6)))
+
+          ;; if unmerged file
+          (when (gethash file unmerged-info) (setq stat 'unmerged))
+          ;; modified vs. staged: the latter has a nonzero sha1
+          (when (and (eq stat 'modified)
+                     (not (equal (match-string 4)
+                                 "0000000000000000000000000000000000000000")))
+            (setq stat 'staged))
+
+          ;; assume all listed elements are 'blob
+          (push (git--create-fileinfo file 'blob nil perm nil stat) fileinfo))))
+
+    fileinfo))
+
+(defun git--symbolic-ref (arg)
+  "Execute 'git symbolic-ref ARG' and return the sha1 string, or nil if the
+arg is not a symbolic ref."
+  (let ((commit (git--exec-string-no-error "symbolic-ref" "-q" arg)))
+    (when  (> (length commit) 0)
+      (car (split-string commit"\n")))))
+
+(defun git--current-branch ()
+  "Execute 'git symbolic-ref'HEAD' and return branch name string. Returns
+nil if there is no current branch."
+  (let ((branch (git-in-lowest-existing-dir nil (git--symbolic-ref "HEAD"))))
+    (when branch
+      (if (string-match "^refs/heads/" branch)
+          (substring branch (match-end 0))
+        branch))))
+
+(defsubst git--log (&rest args)
+  "Execute 'git log ARGS' and return result string"
+  (apply #'git--exec-string "log" "-z" args))
+
+(defsubst git--last-log-short ()
+  "Get the last log, as one line: <short_commit> <short_msg>"
+  (git--trim-string (git--log "--max-count=1" "--pretty=oneline"
+                              "--abbrev-commit")))
+
+(defsubst git--last-log-message ()
+  "Return the last commit message, as a possibly multiline string, with an "
+  "ending newline,"
+  (git--log "--max-count=1" "--pretty=format:%s%n%b"))
+
+(defun git--get-relative-to-top(filename)
+  (file-relative-name filename
+                      (git--get-top-dir (file-name-directory filename))))
+
+(defun git--get-top-dir-or-prompt (prompt &optional dir)
+  "Returns the top-level git directory above DIR (or default-directory). Prompts
+the user with PROMPT if not a git repository, or if DIR is t."
+  (or (unless (eq dir t) (ignore-errors (git--get-top-dir dir)))
+      (git--get-top-dir (read-directory-name prompt (unless (eq dir t) dir)))))
+
+(defun git--ls-unmerged (&rest files)
+  "Get the list of unmerged files. Returns an association list of
+\(stage . git--fileinfo), where stage is one of 1, 2, 3. If FILES is specified,
+only checks the specified files. The list is sorted by filename."
+
+  (let (fileinfo)
+    (with-temp-buffer
+      (apply #'git--exec-buffer "ls-files" "-t" "-u" "-z" files)
+      (goto-char (point-min))
+
+      (let ((regexp (git--build-reg git--reg-perm    ; matched-1
+                                    git--reg-space
+                                    git--reg-sha1    ; matched-2
+                                    git--reg-blank
+                                    git--reg-stage   ; matched-3
+                                    git--reg-blank
+                                    git--reg-file))) ; matched-4
+
+        (while (re-search-forward regexp nil t)
+          (let ((perm (match-string 1))
+                (sha1 (match-string 2))
+                (stage (match-string 3))
+                (file (match-string 4)))
+
+              (push
+               (cons (string-to-number stage)
+                     (git--create-fileinfo file 'blob sha1 perm nil 'unmerged))
+               fileinfo)))))
+    (sort fileinfo #'(lambda(cell1 cell2)
+                       (git--fileinfo-lessp (cdr cell1) (cdr cell2))))))
+
+(defun git--ls-files (&rest args)
+  "Execute 'git-ls-files' with 'args' and return the list of the
+'git--fileinfo'. Does not differentiate between 'modified and
+'staged."
+
+  (let (fileinfo)
+    (with-temp-buffer
+      (apply #'git--exec-buffer "ls-files" "-t" "-z" args)
+      (goto-char (point-min))
+
+      (let ((regexp (git--build-reg git--reg-status ; matched-1
+                                    git--reg-blank
+                                    git--reg-file))) ; matched-2
+
+        (while (re-search-forward regexp nil t)
+          (let* ((stat (match-string 1))
+                 (name (match-string 2))
+                 (file-name (directory-file-name name)))
+            ;; Files listed with e.g "-o" might be directories
+            (push (git--create-fileinfo file-name
+                                        (if (equal name file-name) 'blob
+                                          'tree)
+                                        nil nil nil
+                                        (git--interpret-to-state-symbol stat))
+                  fileinfo)))))
+    (sort fileinfo 'git--fileinfo-lessp)))
+
+(defsubst git--to-type-sym (type)
+  "Convert a string type from git to 'blob, 'tree or 'commit (i.e. submodule)"
+  (cond ((string= type "blob") 'blob)
+        ((string= type "tree") 'tree)
+        ((string= type "commit") 'commit)
+        (t (error "strange type : %s" type))))
+
+(defun git--ls-tree (&rest args)
+  "Execute 'git ls-tree ARGS', return a list of git--fileinfo structs."
+
+  (let (fileinfo)
+    (with-temp-buffer
+      (apply #'git--exec-buffer "ls-tree" "-z" args)
+      (goto-char (point-min))
+
+      (let ((regexp (git--build-reg git--reg-perm    ; matched-1
+                                    git--reg-space
+                                    git--reg-type    ; matched-2
+                                    git--reg-space
+                                    git--reg-sha1    ; matched-3
+                                    git--reg-tab
+                                    git--reg-file))) ; matched-4
+
+        (while (re-search-forward regexp nil t)
+          (let ((perm (match-string 1))
+                (type (match-string 2))
+                (sha1 (match-string 3))
+                (file (match-string 4)))
+
+            (push (git--create-fileinfo file
+                                        (git--to-type-sym type)
+                                        sha1
+                                        perm
+                                        nil
+                                        'uptodate)
+                  fileinfo)))))
+    (sort fileinfo 'git--fileinfo-lessp)))
+
+(defun git--merge (&rest args)
+  "Run 'git merge ARGS', output the return message to the user."
+  (message "%s" (git--trim-string (apply #'git--exec-string "merge" args))))
+
+(defsubst git--branch (&rest args)
+  (apply #'git--exec-string "branch" args))
+
+(defun git--abbrev-commit(commit &optional size)
+  "Returns a short yet unambiguous SHA1 checksum for a commit. The default
+SIZE is 5, but it will be longer if needed (due to conflicts)."
+  (git--trim-string
+   (git--exec-string "rev-list" "--abbrev-commit"  "--max-count=1"
+                     (format "--abbrev=%d" (or size 5)) commit)))
+
+(defsubst git--today ()
+  (time-stamp-string "%:y-%02m-%02d %02H:%02M:%02S"))
+
+
+;;-----------------------------------------------------------------------------
+;; git application
+;;-----------------------------------------------------------------------------
+
+(defsubst git--managed-on-git? ()
+  "Returns true if we're in a git repository."
+  (not (string-match "fatal: Not a git repository"
+                     (git--rev-parse "HEAD"))))
+
+(defun git--status-file (file)
+  "Return the git status of FILE, as a symbol."
+  (let ((fileinfo (git--status-index file)))
+    (unless fileinfo (setq fileinfo (git--ls-files file)))
+    (when (= 1 (length fileinfo))
+      (git--fileinfo->stat (car fileinfo)))))
+
+(defun git--branch-list ()
+  "Get branch list, in the order returned by 'git branch'. Returns a cons cell
+\(list-of-branches . current-branch), where current-branch may be nil."
+
+  (let ((branches) (current-branch)
+        (regexp (concat " *\\([*]\\)? *" git--reg-branch "\n")))
+
+    (with-temp-buffer
+      (git-in-lowest-existing-dir
+       nil
+       (unless (eq 0 (git--exec-buffer "branch" "-l"))
+         (error "%s" (git--trim-string (buffer-string)))))
+      (goto-char (point-min))
+
+      (while (re-search-forward regexp nil t)
+        (let ((branch (match-string 2)))
+          (unless (string= branch "(no branch)")
+            (push branch branches))
+          (when (and (not current-branch) (string= "*" (match-string 1)))
+            (setq current-branch branch)))))
+    (cons (nreverse branches) current-branch)))
+
+(defun git--cat-file (buffer-name &rest args)
+  "Execute 'git cat-file ARGS' and return a new buffer named BUFFER-NAME
+with the file content"
+  (let ((buffer (get-buffer-create buffer-name)))
+    (with-current-buffer buffer
+      (setq buffer-read-only nil)
+      (erase-buffer)
+
+      ;; auto mode, for highlighting
+      (let ((buffer-file-name buffer-name)) (set-auto-mode))
+      (apply #'git--exec-buffer "cat-file" args)
+
+      ;; set buffer readonly & quit
+      (setq buffer-read-only t)
+
+      ;; Failed?
+      (goto-char (point-min))
+      (when (looking-at "^\\([Ff]atal\\|[Ff]ailed\\|[Ee]rror\\):")
+        (let ((msg (buffer-string)))
+          (kill-buffer nil)
+          (setq buffer nil)
+          (error "%s" (git--trim-tail msg)))))
+    buffer))
+
+(defun git--select-branch (&rest excepts)
+  "Prompts the user for a branch name. Offers all the branches for completion,
+except EXCEPTS. Returns the user's selection."
+  (let ((branches (car (git--branch-list))))
+    (git--select-from-user
+     "Select branch: "
+     (delq nil (mapcar (lambda (b) (unless (member b excepts) b))
+                       branches)))))
+
+;; ================================================================================
+;; I will revise this code laster this week
+;; ================================================================================
+(defun git-pull-ff-only ()
+  "Interactive git pull. Prompts user for a remote branch, and pulls from it.
+  This command will fail if we can not do a ff-only pull from the remote branch."
+  (interactive)
+  (let ((remote (git--select-remote 
+                 (concat "Select remote for pull (local branch:" 
+                         (git--current-branch) 
+                         "): "))))
+    (message (git--pull-ff-only remote))))
+
+;; XXX. should this be implemented list this way? umm..
+(defsubst git--select-remote (prompt &rest excepts)
+  "Select remote branch interactively."
+  (let ((remotes (git--symbolic-commits '("remotes"))))
+    (git--select-from-user prompt
+                           (delq nil (mapcar (lambda (b) (unless (member b excepts) b))
+                                             remotes)))))
+
+(defun git--pull-ff-only (remote)
+  "Pull from remote into current branch, but only on a fast-forward pull."
+  (let ((split-remote (split-string remote "/"))
+        (parse-success-string (lambda (resultstring) ;; Parses success string
+                                (let ((lines (split-string resultstring "\n")))
+                                  (if (string-equal (nth 2 lines) "Already up-to-date.")
+                                      "Already up-to-date."
+                                    (let ((revision-change 
+                                           (split-string (cadr (split-string (nth 2 lines) )) 
+                                                         "\\.\\.")))
+                                      (concat "Pulled revisions from " 
+                                              (car revision-change) 
+                                              " to " 
+                                              (cadr revision-change) 
+                                              "." (nth (- (length lines) 2) lines))))))))
+    (let ((remote-name (car split-remote))
+          (remote-branch (car (cdr split-remote))))
+      (condition-case err
+          (progn
+            (funcall parse-success-string 
+                     (git--exec-string "pull" "--ff-only" remote-name (concat remote-branch))))
+        (error (error-message-string err))))))
+
+(defun git--split-porcelain (resultstring)
+  (mapcar (lambda (s) (split-string s "\t")) (split-string resultstring "\n")))
+
+(defun git--n-n-th (i j arr)
+  "Given a 2-d list, access the i,j 'th element"
+  (nth j (nth i arr)))
+
+(defun git--actual-push (remote-name remote-branch)
+  (let ((actual-run-output 
+         (git--split-porcelain 
+          (git--exec-string "push" "--porcelain" 
+                            remote-name 
+                            (concat (git--current-branch) ":" remote-branch)))))
+    (message (concat "Pushed changes " 
+                     (git--n-n-th 1 2 dry-run-output) 
+                     " to remote " 
+                     remote-name 
+                     "/" 
+                     remote-branch))))
+
+(defun git--push-ff-only (remote)
+  "Pushes from current branch into remote, fast-forward only."
+  (let ((split-remote (split-string remote "/")))
+    (let ((dry-run-output (git--split-porcelain 
+                           (git--exec-string "push" "--dry-run" "--porcelain" 
+                                             (car split-remote) 
+                                             (concat (git--current-branch) ":" (cadr split-remote))))))
+      (let ((newbranch (string-equal (git--n-n-th 1 2 dry-run-output) "[new branch]"))
+            (change-diff (git--n-n-th 1 2 dry-run-output))
+            (up-to-date (string-equal (git--n-n-th 1 0 dry-run-output) "Everything up-to-date")))
+        (cond (newbranch (if (y-or-n-p (concat "Pushing will create branch " 
+                                               (cadr split-remote) 
+                                               " in remote. Continue? "))
+                             (git--actual-push (car split-remote) (cadr split-remote))
+                           (message "Did not push.")))
+              (up-to-date (message "Remote branch is up to date."))
+              ((not newbranch) (git--actual-push (car split-remote) (cadr split-remote)))
+              (t (message "Did not push.")))))))
+;; --------------------------------------------------------------------------------
+
+(defun git--symbolic-commits (&optional reftypes)
+  "Find symbolic names referring to commits, using 'git for-each-ref'.
+REFTYPES is a list of types of refs under .git/refs ; by default,
+ (\"heads\" \"tags\" \"remotes\") , which gives branches, tags and remote
+branches. Returns a list of the refs found (as strings), in the order
+dictated by REFTYPES, then alphabetical."
+  (let* ((reftypes (or reftypes '("heads" "tags" "remotes")))
+         (git-ref-args (mapcar #'(lambda(reftype) (concat "refs/" reftype))
+                               reftypes))
+         ;; assoc list of reftype -> list of matches in reverse order
+         (results (mapcar #'(lambda(reftype) (cons reftype nil)) reftypes)))
+  (with-temp-buffer
+    (apply #'git--exec-buffer "for-each-ref" "--format=%(objecttype) %(refname)"
+           " --" git-ref-args)
+    (goto-char (point-min))
+    (while (re-search-forward "^commit refs/\\([^/]*\\)/\\(.*\\)$" nil t)
+      ;; omit e.g. remotes/origin/HEAD, which is a confusing duplicate
+      (unless (and (equal "remotes" (match-string 1))
+                   (string-match "/HEAD$" (match-string 2)))
+        (let ((result-cell (assoc (match-string 1) results)))
+          (setcdr result-cell (cons (match-string 2) (cdr result-cell))))))
+    )
+  ;; reverse (destructively) each result type, then concatenate
+  (apply #'append (mapcar #'(lambda(result-cell) (nreverse (cdr result-cell)))
+                          results))))
+
+(defvar git--revision-history nil "History for selecting revisions")
+
+(defun git--select-revision (prompt &optional prepend-choices excepts)
+  "Offer the user a list of human-readable revisions to choose from. By default,
+it shows branches, tags and remotes; additional choices can be
+specified as a list. If EXCEPTS is specified, don't show any choices `equal'
+to those in the list, unless they were specified in PREPEND-CHOICES explicitly."
+  (git--select-from-user prompt
+                         (append
+                          prepend-choices
+                          (delq nil
+                                (mapcar #'(lambda (revision)
+                                            (unless (member revision excepts)
+                                              revision))
+                                        (git--symbolic-commits)))
+                          git--revision-history)))
+
+(defun git--maybe-ask-and-commit(after-func)
+  "Helper for functions that switch trees. If there are pending
+changes, asks the user whether they want to commit, then pops up
+a commit buffer (and returns). Once the user has committed (or
+immediately, if they chose not to or there are no pending
+changes), AFTER-FUNC is called, which should do the tree
+switching along with any confirmations. The return value is either the
+pending commit buffer or nil if the buffer wasn't needed."
+  ;; git status -a tells us if there's anything to commit
+  (if (and (eq 0 (git--commit-dryrun-compat nil "-a"))
+           (y-or-n-p "Commit your pending changes first? (if not, they will be merged into the new tree) "))
+      (with-current-buffer (git-commit-all)
+        (add-hook 'git--commit-after-hook after-func t t) ; append, local
+        (current-buffer))
+    (funcall after-func)
+    nil))
+
+
+;;-----------------------------------------------------------------------------
+;; vc-git integration
+;;-----------------------------------------------------------------------------
+
+(defun git--update-modeline ()
+  "Update the current's buffer modeline state display."
+  ;; mark depending on the fileinfo state
+  (when (and buffer-file-name (git--in-vc-mode?))
+    (git--update-state-mark
+     (git--status-file (file-relative-name buffer-file-name)))))
+
+(defalias 'git-history 'git-log)
+
+(defadvice vc-after-save (after git--vc-git-after-save activate)
+  "vc-after-save advice for updating status"
+
+  (when (git--in-vc-mode?) (git--update-modeline)))
+
+(defadvice vc-next-action (around git--vc-git-next-action activate)
+  "vc-next-action advice for synchronizing when committing"
+
+  ;; vc-mode if nil -> fork git and ask
+  ;;         else try to parse git -> if "git" -> ok
+  ;;                                  else -> no
+
+  (let ((on-git? (or (git--in-vc-mode?)
+                     (unless vc-mode (git--managed-on-git?))))
+        (filename ""))
+
+    (when buffer-file-name
+      (setq filename (file-relative-name buffer-file-name)))
+
+    (if on-git?
+      (case (git--status-file filename)
+        ('modified (git-commit-all))    ; modified -> commit
+        ('staged (git-commit-all))      ; staged -> commit
+        ('unknown (git--add filename))  ; unknown  -> add
+        ('unmerged (git--add filename)) ; unmerged -> add
+        (t (git--add filename)))        ; TODO : add more
+      ad-do-it)))
+
+;;-----------------------------------------------------------------------------
+;; Low-level commit support.
+;;-----------------------------------------------------------------------------
+
+(defun git--config-get-author ()
+  "Returns the user's name, either from git or from emacs's config."
+
+  (let ((config-user-name (git--config "user.name")))
+      (or (and (not (string= config-user-name "")) config-user-name)
+          (and (fboundp 'user-full-name) (user-full-name))
+          (and (boundp  'user-full-name) user-full-name))))
+
+(defun git--config-get-email ()
+  "Returns the user's email, either from git or from emacs's config."
+  (let ((config-user-email (git--config "user.email")))
+    (or (and (not (string= config-user-email "")) config-user-email)
+        (and (fboundp 'user-mail-address) (user-mail-address))
+        (and (boundp 'user-mail-address) user-mail-address))))
+
+(defun git--insert-log-header-info (amend)
+  "Insert the log header to the buffer. If AMEND, grab the info from the last
+commit, like git commit --amend will do once we commit."
+
+  ;; TODO: we should make git always use this info, even if its config
+  ;; has changed. Otherwise this is misleading.
+  (insert git--log-header-line  "\n"
+          "# Branch : " (or (git--current-branch) "<none>")     "\n")
+  (if amend
+      (insert (git--log "--max-count=1"
+                        (concat "--pretty=format:"
+                                "# Author : %an%n"
+                                "# Email  : %ae%n"
+                                "# Date   : %ci%n"
+                                "# Amend  : %h%n")))
+    (insert
+     "# Author : " (git--config-get-author)  "\n"
+     "# Email  : " (git--config-get-email)   "\n"
+     "# Date   : " (git--today)              "\n")))
+
+;; Internal variables for commit
+(defvar git--commit-after-hook nil
+  "Hooks to run after comitting (and killing) the commit buffer.")
+(defvar git--commit-args nil
+  "Args to be passed to the current git commit once done editing.")
+(make-variable-buffer-local 'git--commit-args)
+(defvar git--commit-targets nil
+  "Records the targets parameter of `git-commit' in the current commit buffer")
+(make-variable-buffer-local 'git--commit-targets)
+(defvar git--commit-last-diff-file-buffer nil
+  "Stores last diff buffer launched from a commit buffer.")
+(make-variable-buffer-local 'git--commit-targets)
+(defvar git--commit-amend nil
+  "Records whether the current commit buffer is for a commit --amend")
+(make-variable-buffer-local 'git--commit-amend)
+
+(defun git--commit-buffer ()
+  "Called when the user commits, in the commit buffer (C-cC-c).
+Trim the buffer log, commit runs any after-commit functions."
+  (interactive)
+
+  ;; check buffer
+  (unless (string= (buffer-name (current-buffer))
+                   git--commit-log-buffer)
+    (error "Execute git commit on %s buffer" git--commit-log-buffer))
+
+  ;; trail and commit
+  (save-excursion
+    (goto-char (point-min))
+
+    (let ((begin (search-forward git--log-sep-line nil t))
+          (end   (search-forward git--log-sep-line nil t)))
+      (when (and begin end)
+        (setq end (- end (length git--log-sep-line)))
+        ;; TODO sophisticated message
+        (message "%s" (apply #'git--commit
+                             (git--trim-string (buffer-substring begin end))
+                             git--commit-args)))))
+
+  ;; update state marks, either for the files committed or the whole repo
+  (git--update-all-state-marks
+   (if (eq t git--commit-targets) nil git--commit-targets))
+
+  ;; close window and kill buffer. Some gymnastics are needed to preserve
+  ;; the buffer-local value of the after-hook.
+  (let ((local-git--commit-after-hook
+         (when (local-variable-p 'git--commit-after-hook)
+           (cdr git--commit-after-hook)))) ; skip the "t" for local
+    (kill-buffer git--commit-log-buffer)
+
+    ;; hooks (e.g. switch branch)
+    (run-hooks 'local-git--commit-after-hook 'git--commit-after-hook)))
+
+;;-----------------------------------------------------------------------------
+;; Merge support.
+;;-----------------------------------------------------------------------------
+
+(defun git--resolve-fill-buffer (template side)
+  "Make a buffer showing a SIDE ('local or 'remote) of the conflict
+buffer TEMPLATE. Returns the buffer."
+
+  (let* ((filename (file-relative-name (buffer-file-name template)))
+         (buffer-name (format "*%s*: %s"
+                              (capitalize (symbol-name side)) filename))
+         (buffer (get-buffer-create buffer-name))
+         (msg "Malformed conflict marker"))
+
+    (with-current-buffer buffer
+      (buffer-disable-undo)
+      (let ((buffer-read-only nil) (erase-buffer)))
+      (insert-buffer-substring template)
+
+      ;; find first mark
+      (goto-char (point-min))
+      (while (re-search-forward "^<<<<<<< \\([^\n]+\\)\n" nil t)
+        (replace-match "")
+
+        (let (conflict-begin conflict-sep conflict-end)
+          (setq conflict-begin (match-beginning 0))
+
+          ;; find mid mark
+          (unless (re-search-forward "^=======\n" nil t) (error msg))
+          (replace-match "")
+
+          (setq conflict-sep (match-beginning 0))
+
+          ;; find last mark
+          (unless (re-search-forward "^>>>>>>> \\([^\n]+\\)\n" nil t) (error msg))
+          (replace-match "")
+
+          (setq conflict-end (match-beginning 0))
+
+          (case side
+            ('local (delete-region conflict-sep conflict-end))
+            ('remote (delete-region conflict-begin conflict-sep))
+            (t (error "Side must be one of 'local or 'remote"))))))
+    buffer))
+
+(defun git--resolve-fill-base()
+  "Assumes that the current buffer is an unmerged file, gets its \"base\"
+revision from git into a buffer named \"*Base*: filename\" and returns that
+buffer. If there is no common base, returns nil."
+  (let* ((rel-filename (file-relative-name buffer-file-name))
+         (stage-and-fileinfo (git--ls-unmerged rel-filename))
+         (base-fileinfo (cdr-safe (assq 1 stage-and-fileinfo)))
+         (base-buffer (when base-fileinfo
+                        (git--cat-file (format "*Base*: %s" rel-filename)
+                                       "blob"
+                                       (git--fileinfo->sha1 base-fileinfo)))))
+    base-buffer))
+
+(defun git--merge-ask ()
+  "Prompts the user for a branch or tag to merge. Returns t if the merge
+succeeded, nil if it had conflicts, raises an error if the merge failed for
+unknown reasons."
+  (let ((branch (git--select-revision "Merge: " nil
+                                      (list (git--current-branch))))
+        (merge-success t))
+    (condition-case err
+        (git--merge branch)
+      (error
+       (setq merge-success nil)
+       (let ((err-msg (error-message-string err)))
+         ;; Often because of conflicts
+         (if (string-match "^CONFLICT" err-msg)
+               (message "%s" err-msg)
+           ;; otherwise, reraise
+           (signal (car err) (cdr err))))))
+    merge-success))
+
+(defun git-merge ()
+  "Prompts the user for a branch or tag to merge. On success, asks for
+buffer revert. On conflicts, pulls up a status buffer"
+  (interactive)
+  (if (git--merge-ask) (git-after-working-dir-change)
+    (git-status ".")))
+
+(defun git--resolve-merge-buffer (&optional success-callback)
+  "Implementation of resolving a conflicted buffer, which must be current.
+If SUCCESS-CALLBACk is specified, it will be called if the merge is successful
+and the user accepts the result."
+  (interactive)
+
+  (let* ((result-buffer (current-buffer))
+         (filename (file-relative-name buffer-file-name))
+         (our-buffer (git--resolve-fill-buffer result-buffer 'local))
+         (their-buffer (git--resolve-fill-buffer result-buffer 'remote))
+         (base-buffer (git--resolve-fill-base))
+         (config (current-window-configuration))
+         (ediff-default-variant 'combined)
+         (ediff-combination-pattern '("<<<<<<< Local" A "=======" B
+                                      ">>>>>>> Remote")))
+    ;; Set the major mode of all the buffers based on the current buffer
+    (let ((default-major-mode nil))
+      (mapc #'set-buffer-major-mode
+            (delq nil (list our-buffer their-buffer base-buffer))))
+
+    ;; set merge buffer
+    (set-buffer (if base-buffer
+                    (ediff-merge-buffers-with-ancestor
+                     our-buffer their-buffer base-buffer)
+                  (ediff-merge-buffers our-buffer their-buffer)))
+
+    (add-hook
+     'ediff-quit-hook
+     (lexical-let ((saved-config config)
+                   (saved-result-buffer result-buffer)
+                   (saved-base-buffer base-buffer)
+                   (saved-success-callback success-callback))
+         #'(lambda ()
+             (let ((buffer-A ediff-buffer-A)
+                   (buffer-B ediff-buffer-B)
+                   (buffer-C ediff-buffer-C))
+               (ediff-cleanup-mess)
+               (set-buffer saved-result-buffer)
+               (erase-buffer)
+               (insert-buffer-substring buffer-C)
+               (kill-buffer buffer-A)
+               (kill-buffer buffer-B)
+               (kill-buffer buffer-C)
+               (when saved-base-buffer (kill-buffer saved-base-buffer))
+               (set-window-configuration saved-config))))
+     nil t)                             ; hook is prepend, local
+    ;; Add the -after function after ediff does its thing.
+    (add-hook 'ediff-quit-hook
+              (lexical-let ((saved-success-callback success-callback))
+                #'(lambda () (git--resolve-merge-after saved-success-callback)))
+                t t)
+
+    (message "Please resolve conflicts now, exit ediff when done")))
+
+(defun git--resolve-has-merge-markers ()
+  "Returns non-nil if the current buffer has any merge markers, nil otherwise."
+  (save-excursion
+    (goto-char (point-min))
+    (re-search-forward "^<<<<<<< " nil t)))
+
+(defun git--resolve-merge-after (&optional success-callback)
+  "Function called after a git-resolve-merge. Called with the
+merged buffer current. Checks for remaining merge markers, if
+none ask the user whether to accept the merge results"
+  (if (git--resolve-has-merge-markers)
+      (message "Conflicts remain; resolve manually or hit undo to restore the buffer")
+    (if (y-or-n-p "Conflicts resolved, save merge result? ")
+        (progn
+          (save-buffer)
+          (git--add (file-relative-name buffer-file-name))
+          (git--update-modeline)
+          (when success-callback (funcall success-callback)))
+      (message "You can hit undo once to restore the buffer")
+      )))
+
+(defun git-merge-next-action ()
+  "Auto-pilot function to guide the user through a git merge. If none in
+progress, prompts for a revision to merge. If there are unresolved conflicts,
+prompts for resolving the next one. If all conflicts have been resolved, pulls
+up a commit buffer. The function continues with the above logic until either
+the user quits or the merge is successfully committed."
+  (interactive)
+  ;; First, check for any unmerged files. We must go to the top every time,
+  ;; because the default-dir might change on us.
+  (let* ((default-directory (git--get-top-dir))
+         (unmerged-files (git--ls-unmerged)))
+    (if unmerged-files
+        (progn
+          (switch-to-buffer
+           (let ((resolve-next-file
+                  (git--select-from-user
+                   "Resolve next conflict: "
+                   (delq nil (mapcar
+                              #'(lambda (stage-and-fi)
+                                  (when (eq 2 (car stage-and-fi))
+                                    (file-relative-name (git--fileinfo->name
+                                                         (cdr stage-and-fi)))))
+                              unmerged-files)))))
+             ;; find-file-noselect will nicely prompt about refreshing
+             (find-file-noselect resolve-next-file)))
+          (redisplay t)                 ;force refontification, show buffer
+          (if (git--resolve-has-merge-markers)
+              ;; tell resolve-merge to schedule us if the resolution succeeded.
+              ;; Avoid running another ediff from the ediff hook, though
+              (git--resolve-merge-buffer
+               #'(lambda()
+                   (run-at-time "0 sec" nil 'git-merge-next-action)))
+            (if (y-or-n-p "Conflicts seem resolved, save merge result to git? ")
+                (progn
+                  (save-buffer)
+                  (git--add (file-relative-name buffer-file-name))
+                  (git--update-modeline)))
+            (git-merge-next-action)))
+
+      ;; else branch, no unmerged files remaining
+      ;; Perhaps we should commit (staged files only!)
+      (if (file-exists-p (expand-file-name ".git/MERGE_HEAD"))
+          (git-commit nil nil "Merge finished ")    ; And we're done!
+        ;; else branch, no sign of a merge. Ask for another.
+        (if (git--merge-ask)
+            (progn
+              (git-after-working-dir-change)
+              (message "Merge successful"))
+          (sit-for 1.5)            ; for the user to digest message
+          (message "")             ; fixes odd v23 interaction with ediff's msgs
+          (git-merge-next-action)) ; start processing conflicts
+))))
+
+
+(defun git-resolve-merge ()
+  "Resolve git merge conflicts in the current buffer with ediff."
+  (interactive)
+  (git--resolve-merge-buffer))
+
+
+;;-----------------------------------------------------------------------------
+;; High-level commit functions.
+;;-----------------------------------------------------------------------------
+
+(defconst git--commit-status-font-lock-keywords
+  '(("^#\t\\([^:]+\\): +[^ ]+$"
+     (1 'git--bold-face))
+    ("^# \\(Branch\\|Author\\|Email\\|Date\\|Amend\\) +:" (1 'git--bold-face))
+    ("^# \\(-----*[^-]+-----*\\).*$" (1 'git--log-line-face))))
+;; (makunbound 'git--commit-status-font-lock-keywords)
+
+(define-button-type 'git--commit-diff-committed-link
+  'help-echo "mouse-2, RET: view changes that will be committed"
+  'action 'git--commit-diff-file)
+(define-button-type 'git--commit-diff-uncomitted-link
+  'help-echo "mouse-2, RET: view changes that will NOT be committed"
+  'action 'git--commit-diff-file)
+
+(defun git--commit-buttonize-filenames (single-block type)
+  "Makes clickable buttons (aka hyperlinks) from filenames in git-status
+outputs. The filenames are found with a simple regexp.
+If SINGLE-BLOCK, stops after the first \"block\" of files, i.e.
+when it would move forward more than one line after a filename. The buttons
+created are of the given TYPE. Leaves the cursor at the end of the last
+button, or at the end of the file if it didn't create any."
+  (let (last-match-pos)
+    (while (and (re-search-forward "^#\t[^:]+: +\\(.*\\)" nil t)
+                (or (not single-block)
+                    (not last-match-pos)
+                    (<= (count-lines last-match-pos (point)) 2)))
+      (make-text-button (match-beginning 1) (match-end 1)
+                        'type type)
+      (setq last-match-pos (point)))
+    (when last-match-pos (goto-char last-match-pos))))
+
+(defun git--commit-diff-file (button)
+  "Click handler for filename links in the commit buffer"
+  (with-current-buffer git--commit-log-buffer
+    ; Compute rev1, rev2 inputs to diff--many
+    (let ((diff-from (if git--commit-amend "HEAD^1" "HEAD"))
+          (diff-to nil))
+      ;; the commit-index case is the complicated one, adjust.
+      (if (eq nil git--commit-targets)
+          (if (eq (button-type button) 'git--commit-diff-committed-link)
+              (setq diff-to t)          ; diff HEAD -> index
+            (setq diff-from nil))       ; diff index -> working
+        )
+      ;; Use diff--many which is much less intrusive than ediff. Reuse the
+      ;; same buffer so the user can easily look at multiple files in turn.
+      (let ((buffer
+            (git--diff-many (list (button-label button)) diff-from diff-to t
+                            git--commit-last-diff-file-buffer)))
+        ;; Subtle: git-diff-many switched buffers
+        (with-current-buffer git--commit-log-buffer
+          (set (make-local-variable 'git--commit-last-diff-file-buffer)
+               buffer)))
+    )))
+
+(defun git-commit (&optional amend targets prepend-status-msg)
+  "Does git commit with a temporary prompt buffer. If AMEND or a prefix argument
+is specified, does git commit --amend. TARGETS can be nil (commit staged files)
+, t (commit all) or a list of files. If PREPEND-STATUS-MSG is specified,
+adds it in front of the help message (Type C-c C-c ...).
+
+Returns the buffer."
+
+  (interactive "P")
+  ;; Don't save anything on commit-index
+  (when targets (git--maybe-ask-save (if (eq t targets) nil targets)))
+
+  (let ((cur-pos nil)
+        (buffer (get-buffer-create git--commit-log-buffer))
+        (current-dir default-directory))
+    (with-current-buffer buffer
+      ;; Tell git--commit-buffer what to do
+      (setq git--commit-targets targets
+            git--commit-args (append
+                              (when amend '("--amend"))
+                              (cond ((eq nil targets) '())
+                                    ((eq t targets) '("-a"))
+                                    ((listp targets) (cons "--" targets))
+                                    (t (error "Invalid targets: %S" targets))))
+            git--commit-amend amend)
+
+      (local-set-key "\C-c\C-c" 'git--commit-buffer)
+      (local-set-key "\C-c\C-q" 'git--quit-buffer)
+      (erase-buffer)
+      (flyspell-mode 0)               ; disable for the text we insert
+      (cd current-dir)                ; if we reused the buffer
+
+      (set (make-local-variable 'font-lock-defaults)
+           (list 'git--commit-status-font-lock-keywords t))
+      (when global-font-lock-mode (font-lock-mode t))
+      ;; insert info
+      (git--insert-log-header-info amend)
+
+      ;; real log space
+      (insert (propertize git--log-sep-line 'face 'git--log-line-face) "\n")
+
+      (insert "\n")
+      ;; If amend, insert last commit msg.
+      (when amend (insert (git--last-log-message)))
+      ;; Insert .git/MERGE_MSG if exists
+      (let ((merge-msg-file
+             (expand-file-name ".git/MERGE_MSG" (git--get-top-dir))))
+        (when (file-readable-p merge-msg-file)
+          (git--please-wait (format "Reading %s" merge-msg-file)
+            (insert-file-contents merge-msg-file)
+            (goto-char (point-max))        ; insert-file didn't move point
+            (insert "\n"))))
+      (setq cur-pos (point))
+      (insert "\n\n")
+
+      ;;git commit --dryrun or git status -- give same args as to commit
+      (insert git--log-sep-line "\n")
+      (git--please-wait "Reading git status"
+        (unless (eq 0 (apply #'git--commit-dryrun-compat t git--commit-args))
+          (kill-buffer nil)
+          (error "Nothing to commit%s"
+                 (if (eq t targets) "" ", try git-commit-all"))))
+
+      ;; Remove "On branch blah" it's redundant
+      (goto-char cur-pos)
+      (when (re-search-forward "^# On branch.*$" nil t)
+        (delete-region (line-beginning-position) (line-beginning-position 2)))
+
+      ;; Buttonize files to be committed, with action=diff. Assume
+      ;; that the first block of files is the one to be committed, and all
+      ;; others won't be committed.
+      (goto-char cur-pos)
+      (git--commit-buttonize-filenames t 'git--commit-diff-committed-link)
+      (git--commit-buttonize-filenames nil 'git--commit-diff-uncomitted-link)
+      ;; Delete diff buffers when we're gone
+      (add-hook 'kill-buffer-hook
+                #'(lambda()
+                    (ignore-errors
+                      (when git--commit-last-diff-file-buffer
+                          (kill-buffer git--commit-last-diff-file-buffer))))
+                t t)                    ; append, local
+
+      ;; Set cursor to message area
+      (goto-char cur-pos)
+
+      (when git--log-flyspell-mode (flyspell-mode t))
+
+      ;; comment hook
+      (run-hooks 'git-comment-hook)
+
+      (message "%sType 'C-c C-c' to commit, 'C-c C-q' to cancel"
+               (or prepend-status-msg "")))
+    (git--pop-to-buffer buffer)
+    buffer))
+
+(defun git-commit-file (&optional amend)
+  "Runs git commit with the file in the current buffer, or with the selected
+files in git-status. Only changes to those files will be committed. If the
+current buffer is not in git, it will get added automatically. If AMEND, or
+a prefix argument, is specified, does a commit --amend."
+  (interactive "P")
+  ;; Here and in other functions below we rely on the fact that git-status has
+  ;; surely been loaded if the current major mode is git-status.
+  (git--if-in-status-mode
+      (git-commit amend (git--status-view-marked-or-file))
+    (unless buffer-file-name (error "Not a file buffer"))
+    (unless (git--in-vc-mode?)
+      (git--add (file-relative-name buffer-file-name))
+      (vc-find-file-hook))
+    (git-commit amend (list (file-relative-name buffer-file-name)))))
+
+(defun git-init (dir)
+  "Initialize a git repository."
+
+  (interactive "DGit Repository: ")
+  (message "%s" (git--trim-string (git--init dir)))
+  (git-config-init))
+
+(defun git-init-from-archive (file)
+  "Initialize the git repository based on the archive"
+
+  (interactive "fSelect archive: ")
+
+  ;; TODO dirty enough
+  ;; simple rule to uncompress -> dired-compress not working propery
+  (with-temp-buffer
+    (cd (file-name-directory file))
+
+    (when (file-exists-p file)
+      (let ((ext (file-name-extension file)))
+        (cond
+         ((string= ext "tar")
+          (shell-command (format "tar xf \"%s\"" (file-relative-name file))))
+         ((string= ext "gz")
+          (shell-command (format "tar xzf \"%s\"" (file-relative-name file))))
+         (t (error "%s is not supported " ext)))))
+
+    (let ((dir (file-name-sans-extension
+                (file-name-sans-extension file))))
+      ;; move to git repository
+      (cd dir)
+
+      ;; init
+      (git-init dir)
+      (git--add ".")
+      (git-commit-all))))
+
+;;-----------------------------------------------------------------------------
+;; Miscellaneous high-level functions.
+;;-----------------------------------------------------------------------------
+
+(defun git-clone (dir)
+  "Clone a repository (prompts for the URL) into the local directory DIR (
+prompts if unspecified)."
+  
+  (interactive "DLocal destination directory: ")
+
+  (let ((repository
+         (git--select-from-user "Clone repository: "
+                                git--repository-bookmarks
+                                git--repository-history
+                                "")))
+    (with-temp-buffer
+      (cd dir)
+      (git--clone repository))))
+
+(defun git-reset (commit)
+  "Reset the current branch to the given COMMIT (prompts the user if not
+specified). Prompts the user whether to reset --hard."
+
+  (interactive
+      ;; We might be operating with a detached HEAD.
+   (let ((current-branch (git--current-branch)))
+     (list (git--select-revision
+            (format "Reset %s to: "
+                    (if current-branch
+                        (concat "branch " (git--bold-face current-branch))
+                      "current state"))
+            '("HEAD")))))               ; frequent usage
+  (let ((saved-head (git--abbrev-commit "HEAD" 10))
+        (reset-hard (y-or-n-p
+                     "Reset working directory as well (reset --hard)? ")))
+    (apply #'git--reset (delq nil
+                              (list (when reset-hard "--hard") commit "--")))
+    (unwind-protect
+        (if reset-hard (git-after-working-dir-change)
+          (git--update-all-state-marks)
+          (git--if-in-status-mode (git--status-view-refresh)))
+      ;; I nearly lost my HEAD to an accidental reset --hard
+      (message "You can recover the old HEAD as %s" saved-head))))
+
+(defun git-revert (commit)
+  "Revert a commit, prompting the user if unspecified. Does not commit the
+revert operation, instead popping up a commit buffer."
+  (interactive
+   ;; TODO: for this to really make sense we need some SHA1 completion
+   (list (git--select-revision "Revert commit: ")))
+  ;; Save MERGE_MSG, in case the user is doing multiple reverts.
+  (let ((merge-msg-file (expand-file-name ".git/MERGE_MSG" (git--get-top-dir)))
+        (actual-revert #'(lambda()
+                           (git--trim-string
+                            (git--exec-string "revert" "-n" commit)))))
+    (let ((output
+           (if (file-exists-p merge-msg-file)
+               (with-temp-buffer
+                 (buffer-disable-undo)
+                 (insert-file-contents-literally merge-msg-file)
+                 (delete-file merge-msg-file)
+                 ;; append the new MERGE_MSG
+                 (unwind-protect (funcall actual-revert)
+                   (when (file-exists-p merge-msg-file)
+                     (goto-char (point-max))
+                     (insert "\n")
+                     (insert-file-contents-literally merge-msg-file))
+                   (write-region (point-min) (point-max) merge-msg-file nil
+                                 'dont-notify-user)))
+             (funcall actual-revert))))    ; no existing msg, just run it
+    (unwind-protect
+        (git-after-working-dir-change)
+      (git-commit nil nil output)))))
+
+(defcustom gitk-program "gitk"
+  "The command used to launch gitk."
+  :type '(string)
+  :group 'git-emacs)
+
+(defun gitk ()
+  "Launch gitk in the current directory."
+  (interactive)
+  (start-process "gitk" nil gitk-program))
+
+(defun git-checkout (&optional commit confirm-prompt after-checkout-func
+                     &rest after-checkout-func-args)
+  "Checkout a commit, fully. When COMMIT is nil, shows tags and branches
+for selection. May pop up a commit buffer to commit pending
+changes; in this case, the function is asynchronous and returns
+that commit buffer. If CONFIRM-PROMPT is non-nil, ask for
+confirmation, replacing %s in CONFIRM-PROMPT with the commit.
+If AFTER-CHECKOUT-FUNC is specified, runs it with AFTER-CHECKOUT-FUNC-ARGS,
+once the checkout is complete."
+  (interactive)
+  (git--maybe-ask-save)
+  (git--maybe-ask-and-commit
+   (lexical-let ((commit (or commit (git--select-revision "Checkout: ")))
+                 (confirm-prompt confirm-prompt)
+                 (repo-dir default-directory)
+                 (after-checkout-func after-checkout-func)
+                 (after-checkout-func-args after-checkout-func-args))
+     (lambda()
+       (when (or (not confirm-prompt)
+                 (y-or-n-p (format confirm-prompt commit)))
+         (git--checkout commit)
+         (when after-checkout-func
+           (apply after-checkout-func after-checkout-func-args))
+         (git-after-working-dir-change repo-dir))))))
+
+
+(defalias 'git-create-branch 'git-checkout-to-new-branch)
+
+(defun git-checkout-to-new-branch (&optional branch suggested-start
+                                             after-checkout-func
+                                   &rest after-checkout-func-args)
+  "Checkout new branch. Unless BRANCH is specified, prompts for the new branch
+name. Also prompts for the starting point of the new branch, with either
+SUGGESTED-START (if specified) or the current branch as the first suggestion.
+If AFTER-CHECKOUT-FUNC is specified, runs it with AFTER-CHECKOUT-FUNC-ARGS,
+once the checkout is complete."
+  (interactive)
+  (git--maybe-ask-save)
+  (git--maybe-ask-and-commit
+   (lexical-let ((branch branch)
+                 (repo-dir default-directory)
+                 (after-checkout-func after-checkout-func)
+                 (after-checkout-func-args after-checkout-func-args))
+     (lambda()
+       (let* ((branch (or branch (read-from-minibuffer "Create new branch: ")))
+              (suggested-start (or suggested-start
+                                   (git--current-branch)))
+              ;; put current branch as the first option to be based on.
+              (commit (git--select-revision
+                       (format "Create %s based on: "
+                               (git--bold-face branch))
+                       ;; Move the suggestion from the end to the beginning.
+                       (when suggested-start (list suggested-start))
+                       (when suggested-start (list suggested-start)))))
+         (git--checkout "-b" branch commit)
+         (when after-checkout-func
+           (apply after-checkout-func after-checkout-func-args))
+         (git-after-working-dir-change repo-dir))))))
+
+(defun git-delete-branch (&optional branch)
+  "Delete BRANCH, prompt the user if unspecified."
+  (interactive)
+  (unless branch (setq branch (git--select-branch "master")))
+
+  (let ((saved-head (git--abbrev-commit branch 10))) ; safer abbrev
+    (git--branch "-D" branch)              ; we've asked already
+    (message "You can recover the deleted branch %s as %s"
+             (git--bold-face branch) saved-head)))
+
+(defun git-delete-tag (tag)
+  "Delete TAG, prompt the user if unspecified."
+  (interactive
+   (list (git--select-from-user "Delete tag: " (git--tag-list))))
+  (let ((saved-tag-target
+         (ignore-errors
+           (git--trim-string (git--exec-string "rev-parse" "--short" tag)))))
+    (git--tag "-d" tag)
+    (message "%s tag '%s'; you can recover it as %s"
+             (git--bold-face "Deleted") tag saved-tag-target)))
+
+(defvar git--cmd-history nil
+  "History variable for commands ran through git-cmd")
+
+(defun git-cmd (str)
+  "Runs an arbitrary git command, prompting in interactive mode. Displays
+the result as a message."
+  (interactive (list (read-string "git >> " nil 'git--cmd-history)))
+  ;; The command may or may not affect the working dir or work with files we
+  ;; are editing.
+  (git--maybe-ask-save)
+  (message "%s" (git--trim-tail
+                 (apply #'git--exec-string (split-string str))))
+  ; let the user digest message, then check for modified files.
+  (sit-for 2)
+  (git-after-working-dir-change))
+
+
+
+(defun git-config-init ()
+  "Set initial configuration, it query the logined user information"
+
+  (interactive)
+
+  (let ((name (git--trim-string (git--config "user.name")))
+        (email (git--trim-string (git--config "user.email"))))
+
+    (when (or (null name) (string= "" name))
+      (setq name (read-from-minibuffer "User Name : "
+                                       (git--config-get-author)))
+
+      (git--config "--global" "user.name" name))
+    
+    (when (or (null email) (string= "" email))
+      (setq email (read-from-minibuffer "User Email : "
+                                        (git--config-get-email)))
+
+      (git--config "--global" "user.email" email))
+
+    (message "Set user.name(%s) and user.email(%s)" name email)))
+
+(defun git-ignore (file-or-glob)
+  "Add FILE-OR-GLOB to .gitignore. Prompts the user if interactive."
+  (interactive "sIgnore file or glob: ")
+  (with-temp-buffer
+    (insert file-or-glob "\n")
+    (append-to-file (point-min) (point-max)
+                    (expand-file-name ".gitignore" (git--get-top-dir)))))
+  
+(defun git-switch-branch (&optional branch)
+  "Git switch branch, selecting from a list of branches."
+  (interactive)
+  (git--maybe-ask-save)
+  (git--maybe-ask-and-commit
+   (lexical-let ((branch branch)
+                 (repo-dir default-directory))
+     (lambda()
+       (let ((branch (or branch (git--select-branch (git--current-branch)))))
+         (git--checkout branch)
+         (git-after-working-dir-change repo-dir))))))
+
+(defun git-add ()
+  "Add files to index. If executed in a buffer currently under git control,
+adds the current contents of that file to the index. Otherwise, prompts
+for new files to add to git."
+  (interactive)
+  (if (not (and buffer-file-name (git--in-vc-mode?)))
+      (git-add-new)
+    (let ((rel-filename (file-relative-name buffer-file-name)))
+      (if (not (git--ls-files "--modified" "--" rel-filename))
+          (error "%s is already current in the index" rel-filename)
+        (when (y-or-n-p (format "Add the current contents of %s to the index? "
+                                rel-filename))
+          (git--add rel-filename)
+          (git--update-modeline))))))
+
+(defun git-add-new ()
+  "Add new files to the index, prompting the user for filenames or globs"
+  (interactive)
+  ;; TODO: ido doesn't give good feedback on globs
+  (let* ((choices (mapcar #'(lambda (fi)
+                              (git--fileinfo->name fi))
+                          (git--ls-files "--others" "--exclude-standard")))
+         (default-choice  ;; the current file, if it's a choice
+           (when buffer-file-name
+             (let ((current-file (file-relative-name buffer-file-name)))
+               (when (member current-file choices)
+                 (message "default: %S" current-file) current-file))))
+         (files (git--select-from-user "Add new files (glob) >> " 
+                                       choices nil default-choice))
+         (matched-files (mapcar #'(lambda (fi) (git--fileinfo->name fi))
+                                (git--ls-files "--others" "--exclude-standard"
+                                               "--" files))))
+    (if (not matched-files) (error "No files matched \"%s\"" files)
+      (let ((output (replace-regexp-in-string "[\s\n]+$" ""
+                                             (git--add matched-files))))
+        (if (not (equal output ""))
+            (error "git: %s" output)
+          (message "Added %s to git" (git--join matched-files ", "))
+          ;; refresh vc-git.
+          (dolist (filename matched-files)
+            (let ((added-file-buffer (get-file-buffer filename)))
+              (when added-file-buffer
+                (with-current-buffer added-file-buffer (vc-find-file-hook))))))
+      ))))
+
+;;-----------------------------------------------------------------------------
+;; Low-level diff functions
+;;-----------------------------------------------------------------------------
+
+(defun git--diff (file rev &optional before-ediff-hook after-ediff-hook)
+  "Starts an ediff session between the FILE and its specified revision.
+REVISION should not include the filename, e.g. \"HEAD:\". If
+BEFORE-EDIFF-HOOK is specified, it is executed as an ediff setup
+hook. If AFTER-EDIFF-HOOK is specified, it is executed as an
+ediff quit hook. Both hooks run in the ediff context, i.e. with
+valid ediff-buffer-A and B variables, among others. If the
+versions are identical, error out without executing either type
+of hook."
+  (let* ((buf1 (find-file-noselect file))
+	 (buf2 nil)
+	 (config (current-window-configuration)))
+
+    ;; build buf2
+    (with-temp-buffer
+      (let ((abspath (expand-file-name file))
+	    (filename nil))
+
+	;; get relative to git root dir
+	(cd (git--get-top-dir (file-name-directory abspath)))
+	(let ((filerev (concat rev (file-relative-name abspath))))
+              (setq buf2 (git--cat-file (if (equal rev ":")
+                                            (concat "<index>" filerev)
+                                          filerev)
+                                        "blob" filerev)))))
+    (when (eq 0 (compare-buffer-substrings buf1 nil nil buf2 nil nil))
+      (kill-buffer buf2)
+      (error "No differences vs. %s"
+             (or (car-safe (split-string rev ":" t)) "index")))
+
+    (set-buffer
+     (ediff-buffers buf1 buf2
+                    (append
+                     (when before-ediff-hook (list before-ediff-hook)))))
+
+    (add-hook 'ediff-quit-hook
+              (lexical-let ((saved-config config)
+                            (saved-after-ediff-hook after-ediff-hook))
+                #'(lambda ()
+                    (let ((buffer-B ediff-buffer-B))
+                      (unwind-protect ; an error here is a real mess
+                          (when saved-after-ediff-hook
+                            (funcall saved-after-ediff-hook))
+                        (ediff-cleanup-mess)
+                        (kill-buffer buffer-B)
+                        (set-window-configuration saved-config)))))
+              nil t)                     ; prepend, buffer-local
+    ))
+
+
+(defun git--diff-many (files &optional rev1 rev2 dont-ask-save reuse-buffer)
+  "Shows a diff window for the specified files and revisions, since we can't
+do ediff on multiple files. FILES is a list of files, if empty the whole
+git repository is diffed. REV1 and REV2 are strings, interpreted roughly the
+same as in git diff REV1..REV2. If REV1 is unspecified, we use the index.
+If REV2 is unspecified, we use the working dir. If REV2 is t, we use the index.
+If DONT-ASK-SAVE is true, does not ask to save modified buffers under the
+tree (e.g. old revisions). If REUSE-BUFFER is non-nil and alive, uses that
+buffer instead of a new one."
+  (unless dont-ask-save (git--maybe-ask-save files))
+  (when (and (not rev1) (eq t rev2) (error "Invalid diff index->index")))
+  (let* ((rel-filenames (mapcar #'file-relative-name files))
+         (friendly-rev1 (or rev1 "<index>"))
+         (friendly-rev2 (if (eq t rev2) "<index>" (or rev2 "<working>")))
+         (diff-buffer-name (format "*git diff: %s %s..%s*"
+                                   (case (length files)
+                                     (0 (abbreviate-file-name
+                                         (git--get-top-dir)))
+                                     (1 (file-relative-name (first files)))
+                                     (t (format "%d files" (length files))))
+                                   friendly-rev1 friendly-rev2))
+         (buffer (if (buffer-live-p reuse-buffer)
+                     (with-current-buffer reuse-buffer
+                       (rename-buffer diff-buffer-name t)
+                       reuse-buffer)
+                   (get-buffer-create diff-buffer-name))))
+    (with-current-buffer buffer
+      (buffer-disable-undo)
+      (let ((buffer-read-only nil)) (erase-buffer))
+      (setq buffer-read-only t)
+      (diff-mode)
+      ;; See diff-mode.el, search for "neat trick", for why this is necessary
+      (let ((diff-readonly-map (assq 'buffer-read-only
+                                     minor-mode-overriding-map-alist)))
+        (when diff-readonly-map
+          (setcdr diff-readonly-map (copy-keymap (cdr diff-readonly-map)))
+          (define-key (cdr diff-readonly-map) "q" 'git--quit-buffer)))
+      (let ((diff-qualifier
+             (if rev1
+                 (if (eq t rev2) (list "--cached" rev1)
+                   (if rev2 (list (format "%s..%s" rev1 rev2))
+                     (list rev1)))
+               ;; rev1 is index. swap sides of git diff when diffing
+               ;; against the index, for consistency (rev1 -> rev2)
+               (if rev2 (list "--cached" "-R" rev2)
+                 '()))))
+        (apply #'vc-do-command buffer 'async "git" nil "diff"
+               (append diff-qualifier (list "--") rel-filenames)))
+      (vc-exec-after `(goto-char (point-min))))
+    (git--pop-to-buffer buffer)))
+
+;;-----------------------------------------------------------------------------
+;; branch mode
+;;-----------------------------------------------------------------------------
+
+(defvar git--branch-mode-map nil)
+(defvar git--branch-mode-hook nil
+  "Hooks to run after branch mode initialization, after the branches have
+been displayed.")
+
+(let ((map (make-keymap)))
+  (suppress-keymap map)
+
+  (define-key map "q"     'git--quit-buffer)
+  (define-key map "n"     'next-line)
+  (define-key map "p"     'previous-line)
+
+  (define-key map "d"     'git--branch-mode-delete)
+  (define-key map (kbd "<delete>") 'git--branch-mode-delete)
+  (define-key map "c"     'git--branch-mode-create)
+  (define-key map "s"     'git--branch-mode-switch)
+  (define-key map "\C-m"  'git--branch-mode-switch)
+  (define-key map "g"     'git--branch-mode-refresh)
+
+  (setq git--branch-mode-map map))
+
+(easy-menu-define gitemacs-menu-branch git--branch-mode-map
+  "Git-Branch"
+  `("Git-Branch"
+    ["Next Line" next-line t]
+    ["Previous Line" previous-line t]
+    ["Switch To Branch" git--branch-mode-switch t]
+    ["Create New Branch..." git--branch-mode-create t]
+    ["Delete Branch" git--branch-mode-delete t]
+    ["Refresh" git--branch-mode-refresh t]
+    ["Quit" git--quit-buffer t]))
+
+
+(defun git--branch-mode ()
+  "Initialize branch mode buffer."
+
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+
+  ;; set major mode
+  (setq mode-name "git branch")
+  (setq major-mode 'git-branch-mode)
+
+  (use-local-map git--branch-mode-map)
+
+  (setq buffer-read-only t)
+  ;; annotations can be long, so request horizontal scrolling
+  (setq truncate-lines t)
+  ;; beginning of buffer name position
+  (setq goal-column 3)
+  (setq header-line-format
+        (concat (make-string (+ (scroll-bar-columns 'left)
+                                (fringe-columns 'left))
+                             ? )
+                "Branch List"))
+  (when (require 'hl-line nil t) (hl-line-mode)))
+
+
+(defun git--branch-mode-annotate-changes-pending (branch-list)
+  "Branch annotator function: display \"changes pending\" next
+to the current branch, if applicable. Enabled by default."
+  (let ((current-branch (git--current-branch)))
+    (when (and (member current-branch branch-list)
+               ;; "git commit --dryrun -a" returns ok if pending changes.
+               (eq 0 (git--commit-dryrun-compat nil "-a")))
+      (list (cons current-branch (git--bold-face "changes pending"))))))
+
+
+(defvar git-branch-annotator-functions
+  (list 'git--branch-mode-annotate-changes-pending)
+  "List of functions that provide branch annotations in `git-branch' buffers.
+Each function is called with a list of branches and the git-branch-mode
+buffer current (i.e., default-directory is in git), and should return an
+association list of (branch-name . annotation) for the branches that can
+be annotated. The annotation is a string that will be displayed next
+to the branch. See `git--branch-mode-annotate-changes-pending' for an
+example.")
+;; (makunbound 'git-branch-annotator-functions)   <-- C-x C-e for testing
+
+(defvar git--branch-mode-branch-list nil
+  "Stores the list of branches, in the order displayed in the branch-mode
+buffer")
+(make-variable-buffer-local 'git--branch-mode-branch-list)
+
+(defun git--branch-mode-refresh (&optional position-on-current)
+  "Displays or refreshes the branch list in the branch-mode buffer.
+If POSITION-ON-CURRENT is true, put the cursor on the current branch; otherwise
+preserve the cursor position."
+  (interactive)
+
+  ;; Set the working dir to the top-level dir. Otherwise it might have gone
+  ;; away from under us.
+  (setq default-directory (git--get-top-dir))
+
+  ;; find annotations
+  (let* ((branch-list-and-current (git--branch-list))
+         (branch-list (car branch-list-and-current))
+         (current-branch (cdr branch-list-and-current))
+         (branch-annotations (make-hash-table :test 'equal))
+         (buffer-read-only nil)
+         ;; Complex decision on where to leave the cursor
+         (line-number-after
+          ;; Select either the current branch or the previously selected one.
+          ;; Note that the buffer-pos and even line no could change wildly.
+          (+ 1 (or (position (if position-on-current current-branch
+                               (git-branch-mode-selected t))
+                             branch-list :test 'equal)
+                   ;; If not found, just stay on the same line or the first.
+                   (- (line-number-at-pos) 1)))))
+    (erase-buffer)
+    (dolist (annotator git-branch-annotator-functions)
+      (dolist (branch-annotation
+               (ignore-errors (funcall annotator branch-list)))
+        (let* ((branch (car branch-annotation))
+               (annotation (cdr branch-annotation))
+               (lookup (gethash branch branch-annotations)))
+            (puthash branch (add-to-list 'lookup annotation t)
+                     branch-annotations))))
+
+    ;; Display annotations either 3 chars after the longest branch name,
+    ;; or at half window width, whichever is smaller.
+    (let ((annotation-column
+           (when (> (hash-table-count branch-annotations) 0)
+             (min (/ (window-width) 2)
+                  (+ goal-column 3
+                     (reduce #'max (mapcar #'length branch-list)))))))
+      (dolist (branch branch-list)
+        (let ((annotations (gethash branch branch-annotations))
+              (branch-is-current (string= current-branch branch)))
+          (insert (format "%2s "
+                          (if branch-is-current (git--bold-face "*") " ")))
+          (insert branch)
+          (when annotations
+            (insert (make-string
+                     (max 1 (- annotation-column (current-column)))
+                     ?\s))
+            (insert "-")
+            (dolist (annotation annotations)
+              (insert " ")
+              (insert annotation)))
+          (insert "\n"))))
+
+    ;; reposition
+    (ignore-errors (goto-line line-number-after))
+    (if (> (line-number-at-pos) (length branch-list))
+        (previous-line)
+      (next-line 0))   ;; side-effect: moves to goal-column :)
+
+    (setq git--branch-mode-branch-list branch-list)))
+
+
+(defun git-branch ()
+  "Pop up a git branch mode buffer and return it."
+
+  (interactive)
+
+  (let ((buffer (get-buffer-create "*git-branch*"))
+        (windows (current-window-configuration))
+        ;; Subtle: a pre-existing *git-branch* buffer might have the wrong dir
+        (directory default-directory))
+    (with-current-buffer buffer
+      (setq default-directory directory)
+      ;; set branch mode
+      (git--branch-mode)
+      (git--branch-mode-refresh t)
+      )
+    ;; pop up
+    (git--pop-to-buffer buffer)
+    (fit-window-to-buffer)
+    (run-hooks 'git--branch-mode-hook)
+    buffer))
+
+(defcustom git-branch-buffer-closes-after-action 'on-branch-switch
+  "Whether to close the `git-branch' buffer after a user action. May be
+t, nil, or the symbol on-branch-switch, which causes the buffer to be closed
+only after branch switch actions."
+  :type '(choice (const :tag "Always" t)
+                 (const :tag "Never" nil)
+                 (const :tag "On branch switch" on-branch-switch))
+  :group 'git-emacs)
+
+
+(defun git--branch-mode-after-action (was-branch-switch &optional buffer)
+  "Refreshes or closes the `git-branch' buffer after a user action, depending
+on `git-branch-buffer-closes-after-action'. WAS-BRANCH-SWITCH is a boolean,
+self-explanatory. BUFFER is the git-branch buffer, which may not be current
+anymore; if unspecified, we operate on the current buffer."
+  (let ((buffer (or buffer (current-buffer))))
+    (when (buffer-live-p buffer)
+      (if (or (eq t git-branch-buffer-closes-after-action)
+              (and was-branch-switch
+                   (eq 'on-branch-switch
+                       git-branch-buffer-closes-after-action)))
+          (kill-buffer buffer)
+        ;; Just refresh. If this was a branch switch is seems OK to move
+        ;; the cursor to the new branch.
+        (with-current-buffer buffer
+          (git--branch-mode-refresh was-branch-switch))))))
+
+
+;; Branch mode actions
+(defun git-branch-mode-selected (&optional noerror)
+  "Returns the branch on the current line in a `git-branch'
+buffer. Depending on NOERROR, it errors out or returns nil if
+none. It's safe to call this outside a `git-branch' buffer: it will
+behave as if there is no curent branch (error or nil)."
+  (or (nth (- (line-number-at-pos) 1) git--branch-mode-branch-list)
+      (unless noerror (error "No branch selected"))))
+
+
+(defun git--branch-mode-delete ()
+  "Delete the branch that point is on."
+  (interactive)
+  (let ((branch (git-branch-mode-selected)))
+    (when (y-or-n-p (format "%s the branch %s? "
+                            (git--bold-face "Delete")
+                            (git--bold-face branch)))
+      (git-delete-branch branch)
+      (git--branch-mode-after-action nil))))
+
+
+(defun git--branch-mode-switch ()
+  "Switch to the branch that point is on."
+  (interactive)
+  (let ((branch (git-branch-mode-selected))
+        (current-branch (git--current-branch)))
+    (when (string= branch current-branch)
+      (error "Already on branch %s" branch))
+    (git-checkout branch
+                  (format "Switch from branch %s to %s? "
+                          (git--bold-face current-branch)
+                          (git--bold-face "%s")) ; checkout replaces this
+                  #'git--branch-mode-after-action
+                  t (current-buffer))
+     ))
+
+
+(defun git--branch-mode-create ()
+  "Create a branch, prompting for the name and the base branch."
+  (interactive)
+  (git-checkout-to-new-branch nil (git-branch-mode-selected t)
+                              #'git--branch-mode-after-action
+                              t (current-buffer)))
+
+;;-----------------------------------------------------------------------------
+;; Expanded diff functions
+;;-----------------------------------------------------------------------------
+
+(defun git--require-buffer-in-git ()
+  "Error out from interactive if current buffer is not in git revision control,
+and it's not a git-status-buffer."
+  (if (not (or (and buffer-file-name (git--in-vc-mode?))
+               (eq major-mode 'git-status-mode)))
+      (error "Current buffer must be a file under git revision control")))
+
+;; The git-diff-* family of functions diffs a buffer or the selected file
+;; in git status against HEAD, the index, etc..
+
+(defun git-diff-head()
+  "Diff current buffer, or current file in git-status,  against HEAD version,
+using ediff."
+  (interactive)
+  (git--require-buffer-in-git)
+  (git--diff (git--if-in-status-mode
+                 (git--status-view-select-filename)
+               buffer-file-name)
+             "HEAD:"))
+
+(defun git-diff-index()
+  "Diff current buffer, or current file in git-status,  against version
+in index, using ediff"
+  (interactive)
+  (git--require-buffer-in-git)
+  (git--diff (git--if-in-status-mode
+                 (git--status-view-select-filename)
+               buffer-file-name)
+             ;; luckily ":file" means file as currently in the index
+             ":"))
+
+;; baseline stuff
+(defvar git-baseline-alist '()
+  "Association list of (REPOSITORY-DIR . BASELINE-COMMIT). Both
+REPOSITORY-DIR and BASELINE-COMMIT are strings. The BASELINE-COMMIT determines
+what to diff against, in this repository, when git-diff-baseline is used; it
+is either a string or a function, see also `git-baseline-candidates'.")
+;; (makunbound 'git-baseline-commit)  ;;eval to clear variable
+
+(defvar git-baseline-candidates '("git-svn" "origin")
+  "List of strings and functions that might be good choices for baseline commits
+in git (i.e., the state of an upstream repository). A string item is interpreted
+as a git symbolic ref, and it will be used if it exists in the current
+repository. A function item will be called with default-directory set to the
+root repository, and if it completes successfully and returns non-nil its
+string result will be used as the baseline. Normally, the first string or
+function that matches will be used, but you can select a baseline manually
+by calling `git-baseline' interactively.")
+
+(defun git-baseline (&optional always-prompt-user)
+  "Select the baseline commit used in `git-diff-baseline' and friends, for the
+current repository. Tries to find the repo in `git-baseline-alist'; if not
+found, tries all of `git-baseline-candidates'. If the above attempts fail, or
+ALWAYS-PROMPT-USER is specified, or it was called interactively, prompts the
+user for a baseline commit, saves it to `git-baseline-alist' and offers to save
+that variable in .emacs.
+  Returns either a string (git symbolic ref) or a function that returns one."
+  (interactive '(t))
+  ;; This function is a bit too long. Consider extracting parts that may
+  ;; be useful elsewhere.
+  (let* ((repo-dir
+          ;; either the repo of the current buffer
+          (git--get-top-dir-or-prompt "Set baseline for repository: "))
+         ;; canonicalize, for storage / lookup
+         (canonical-repo-dir
+          (expand-file-name (file-name-as-directory repo-dir)))
+         (previous-baseline-assoc
+          (assoc canonical-repo-dir git-baseline-alist)))
+    ;; found among previous associations?
+    (if (and (not always-prompt-user) previous-baseline-assoc)
+        (if (functionp (cdr previous-baseline-assoc))
+            (funcall (cdr previous-baseline-assoc))
+          (cdr previous-baseline-assoc))
+      ;; prompt for new one, possibly a function
+      (let ((default-directory canonical-repo-dir)
+            candidate-strings candidate-function-alist)
+        (catch 'found-one
+          (dolist (candidate git-baseline-candidates)
+            (cond ((stringp candidate)
+                   (when (ignore-errors (git--rev-parse candidate))
+                     (if (not always-prompt-user)
+                         (throw 'found-one candidate)
+                       (add-to-list 'candidate-strings candidate t))))
+                  ((functionp candidate)
+                   (let ((result (ignore-errors (funcall candidate))))
+                     (when result
+                       (if (not always-prompt-user)
+                           (throw 'found-one result)
+                         (let ((readable-form (format "(%S)" candidate)))
+                           (add-to-list 'candidate-strings readable-form t)
+                           (add-to-list 'candidate-function-alist
+                                        (cons readable-form candidate)))))))
+                  (t (error "Invalid git-baseline-candidate: %S" candidate))))
+          ;; Maybe prompt user
+          (let* ((new-baseline-str
+                  ;; Show the viable candidates first, but allow arbitrary revs
+                  (git--select-revision "Select baseline commit: "
+                                        candidate-strings candidate-strings))
+                 (new-baseline (or (cdr-safe
+                                    (assoc new-baseline-str
+                                           candidate-function-alist))
+                               new-baseline-str)))
+            ;; store in variable
+            (if previous-baseline-assoc
+                (setcdr previous-baseline-assoc new-baseline)
+              (add-to-list 'git-baseline-alist
+                           (cons canonical-repo-dir new-baseline))
+              ;; ... which we possibly save in .emacs
+              (when (y-or-n-p "Save for future sessions? ")
+                (customize-save-variable 'git-baseline-alist
+                                         git-baseline-alist)))
+            (if (functionp new-baseline) (funcall new-baseline)
+              new-baseline)))))))
+
+(defun git-diff-baseline()
+  "Diff current buffer against a selectable \"baseline\" commit"
+  (interactive)
+  (git--require-buffer-in-git)
+  (git--diff (git--if-in-status-mode
+              (git--status-view-select-filename)
+              buffer-file-name)
+             (concat (git-baseline) ":")))
+
+(defun git-diff-other(commit)
+  "Diff current buffer against an arbitrary commit"
+  (interactive
+   (progn
+     (git--require-buffer-in-git)
+     (list (git--select-revision "Diff against commit: "))))
+  (git--require-buffer-in-git)
+  (git--diff (git--if-in-status-mode
+                 (git--status-view-select-filename)
+               buffer-file-name)
+             (concat commit ":")))
+
+;; git-diff-all variants
+(defun git-diff-all-head (&optional files)
+  "Diff all of the repository, or just FILES, against HEAD."
+  (interactive)
+  (git--diff-many files "HEAD"))
+
+(defun git-diff-all-index (&optional files)
+  "Diff all of the repository, or just FILES, against the index."
+  (interactive)
+  (git--diff-many files))
+
+(defun git-diff-all-baseline (&optional files)
+  "Diff all of the repository, or just FILES, against the \"baseline\" commit."
+  (interactive)
+  (git--diff-many files (git-baseline)))
+
+(defun git-diff-all-other (commit &optional files)
+  (interactive
+   (list (git--select-revision "Diff against commit: ")))
+  (git--diff-many files commit))
+
+;;-----------------------------------------------------------------------------
+;; Add interactively
+;;-----------------------------------------------------------------------------
+(defun git-add-interactively()
+  "A friendly replacement for git add -i, using ediff"
+  (interactive)                         ; haha
+  (git--require-buffer-in-git)
+  (git--diff
+   (git--if-in-status-mode
+       (git--status-view-select-filename)
+     buffer-file-name )
+   ":"                                  ; index
+   ;; before ediff
+   (lambda()
+     (with-current-buffer ediff-buffer-B
+       (setq buffer-read-only nil)
+       (set-buffer-modified-p nil))
+     (message "Your changes to the second buffer will be added to the index"))
+   ;; after ediff
+   (lambda()
+     (let ((file-buf ediff-buffer-A)
+           (index-buf ediff-buffer-B))
+       (if (not (buffer-modified-p index-buf))
+           (message "No changes to the index")
+         (with-current-buffer file-buf
+           (let ((filename (file-relative-name buffer-file-name)))
+             (when (y-or-n-p "Add changes to the git index? ")
+               ;; insert index-buf as blob object,  get its hash
+               (let ((new-content-hash
+                      (git--trim-string (git--exec-pipe
+                                         "hash-object"
+                                         index-buf
+                                         "-t" "blob" "-w" "--stdin")))
+                     (fileinfo (car-safe (git--status-index filename))))
+                 ;; update index with the new object
+                 (git--exec-string
+                  "update-index" "--cacheinfo"
+                  (git--fileinfo->perm fileinfo)
+                  new-content-hash
+                  (git--get-relative-to-top buffer-file-name))))))))
+   )))
+
+;;-----------------------------------------------------------------------------
+;;grep
+;;-----------------------------------------------------------------------------
+
+(defvar git--grep-history nil "History for git-grep")
+(defun git-grep (args)
+  "Runs git grep with the given ARGS (a string) and output to a buffer"
+  (interactive
+   (let ((default (find-tag-default)))  ; often, user looks up an identifier
+     (list (read-string (format "git grep %s>> "
+                                (if default (format "(default %s) " default)
+                                  ""))
+                        nil 'git--grep-history default))))
+
+  (require 'grep)
+  (let ((default-directory (git--get-top-dir default-directory))
+        (git-grep-setup-hook (lambda() (setenv "GIT_PAGER" "")))
+        (compilation-buffer-name-function
+         (lambda (&rest ignore) "*git grep*"))
+        (grep-use-null-device nil))
+    (add-hook 'grep-setup-hook git-grep-setup-hook)
+    (unwind-protect
+         (grep (concat "git grep -n " args))
+      (remove-hook 'grep-setup-hook git-grep-setup-hook))))
+
+
+;;-----------------------------------------------------------------------------
+;; Minimalistic stash support.
+;;-----------------------------------------------------------------------------
+(defconst git--stash-list-font-lock-keywords
+  '(("^\\(stash@{\\([^}]*\\)}\\):"
+     (1 font-lock-function-name-face prepend)
+     (2 font-lock-variable-name-face prepend))
+    ("^\\(Branch\\): \\([^(\n]+\\)\\( (\\(changes pending\\))\\| ([^\n]*\\)?\n"
+     ;; Actually, too much decoration looks ugly.
+     ;;(1 'git--bold-face prepend)
+     ;;(2 font-lock-variable-name-face prepend)
+     (4 'git--bold-face prepend)
+     )))
+;; (makunbound 'git--stash-list-font-lock-keywords)
+
+(defun git--prepare-stash-list-buffer (buffer)
+  "Prepares and pops the stash list buffer."
+  (let ((directory default-directory))
+    (with-current-buffer buffer
+      (setq default-directory directory) ; in case it was different before
+      (setq buffer-read-only t)
+      (setq cursor-type nil)
+      (buffer-disable-undo)
+      (set (make-local-variable 'font-lock-defaults)
+           (list 'git--stash-list-font-lock-keywords t))
+      (when global-font-lock-mode (font-lock-mode t)))
+    (git--pop-to-buffer buffer)))
+
+
+(defvar git--stash-history nil "History for git-stash")
+(defun git-stash (&optional cmd)
+  "Simple interface to \"git stash\". Without args, pops up a list of the
+available stashes and prompts for the stash command, with a reasonable
+suggestion. If CMD is specified, just runs \"git stash cmd\", with the
+usual pre / post work: ask for save, ask for refresh."
+  (interactive)
+  (git--maybe-ask-save)                 ; affects "changes pending"
+  (unless cmd
+   (let ((stash-list-str (git--exec-string "stash" "list"))
+         (buffer (get-buffer-create "*git-stash*"))
+         (changes-pending-point))
+     (unwind-protect
+         (let ((stashes-exist (> (length stash-list-str) 0)))
+           (git--prepare-stash-list-buffer buffer)
+           (let ((inhibit-read-only t))
+             (erase-buffer)
+             (insert "Branch: " (or (git--current-branch) "<none>"))
+             (setq changes-pending-point (point))
+             (insert "\n\n")
+             (if (not stashes-exist) (insert "(no stashes)")
+               ;; Display arrow next to first stash.
+               (set (make-local-variable 'overlay-arrow-position)
+                    (point-marker))
+               (insert stash-list-str)))
+           (fit-window-to-buffer)
+           (message "Checking tree status...")
+           (redisplay t)                ; this might take a little bit
+           (let ((changes-pending (eq 0 (git--commit-dryrun-compat nil "-a"))))
+             (let ((inhibit-read-only t))
+               (save-excursion
+                 (goto-char changes-pending-point)
+                 (insert (if changes-pending " (changes pending)"
+                           " (no changes pending)"))))
+             (let ((suggested-cmd
+                    ;; "save" if there are pending changes, "pop" if there
+                    ;; are no pending changes and stashes present, else nothing
+                    (cond
+                     (changes-pending "save") (stashes-exist "pop") (t ""))))
+               (setq cmd (read-string "git stash >> "
+                                      suggested-cmd 'git--stash-history)))))
+         (kill-buffer buffer))))
+  (message "%s" (git--trim-string (git--exec-string "stash" cmd)))
+  (redisplay t)
+  (sleep-for 1.5)                       ; let the user digest message
+  (git-after-working-dir-change))
+
+
+(provide 'git-emacs)
\ No newline at end of file
diff --git a/site/git-emacs/git-global-keys.el b/site/git-emacs/git-global-keys.el
new file mode 100644
index 0000000..a84e8ad
--- /dev/null
+++ b/site/git-emacs/git-global-keys.el
@@ -0,0 +1,90 @@
+;; Global keys for git-emacs.
+;;
+;; See git-emacs.el for license and versioning.
+
+(require 'easymenu)
+
+(defcustom git-keyboard-prefix "\C-xg"
+  "Keyboard prefix to use for global git keyboard commands."
+  :type 'string
+  :group 'git-emacs)
+
+(define-prefix-command 'git-global-map)
+(define-key global-map git-keyboard-prefix 'git-global-map)
+
+(define-key git-global-map "a" 'git-add)
+(define-key git-global-map "b" 'git-branch)
+
+(define-prefix-command 'git--commit-map nil "Commit")
+(define-key git-global-map "c" 'git--commit-map)
+(define-key git--commit-map "f" '("[f]ile" . git-commit-file))
+(define-key git--commit-map "i" '("[i]ndex" . git-commit))
+(define-key git--commit-map "a" '("[a]ll" . git-commit-all))
+(define-key git--commit-map (kbd "RET") 'git-commit-all)
+
+(define-prefix-command 'git--diff-buffer-map nil "Diff against")
+(define-key git-global-map "d" 'git--diff-buffer-map)
+(define-key git--diff-buffer-map "o" '("[o]ther" . git-diff-other))
+(define-key git--diff-buffer-map "i" '("[i]ndex" . git-diff-index))
+(define-key git--diff-buffer-map "b" '("[b]aseline" . git-diff-baseline))
+(define-key git--diff-buffer-map "h" '("[H]ead" . git-diff-head))
+(define-key git--diff-buffer-map (kbd "RET") 'git-diff-head)
+
+(define-prefix-command 'git--diff-all-map nil "Diff repo against")
+(define-key git-global-map "D" 'git--diff-all-map)
+(define-key git--diff-all-map "o" '("[o]ther" . git-diff-all-other))
+(define-key git--diff-all-map "i" '("[i]ndex" . git-diff-all-index))
+(define-key git--diff-all-map "b" '("[b]aseline" . git-diff-all-baseline))
+(define-key git--diff-all-map "h" '("[H]ead" . git-diff-all-head))
+(define-key git--diff-all-map (kbd "RET") 'git-diff-all-head)
+
+(define-key git-global-map "g" 'git-grep)
+(define-key git-global-map "h" 'git-stash)
+(define-key git-global-map "i" 'git-add-interactively)
+
+(define-key git-global-map "l" 'git-log)
+(define-key git-global-map "L" 'git-log-files)
+(define-key git-global-map "\C-l" 'git-log-other)
+
+(define-key git-global-map "m" 'git-merge-next-action)
+
+(define-key git-global-map "R" 'git-reset)
+
+(define-key git-global-map "s" 'git-status)
+(define-key git-global-map "." 'git-cmd)
+
+(easy-menu-add-item nil '("tools" "vc") "---")
+(easy-menu-add-item nil '("tools" "vc")
+  `("Git"
+    ("Add to Index"
+     ["Current File" git-add t]
+     ["Select Changes in Current File..." git-add-interactively t]
+     ["New Files..." git-add-new t])
+    ("Commit"
+     ["All Changes" git-commit-all t]
+     ["Index" git-commit t]
+     ["Current File" git-commit-file t])
+    ("Diff Current Buffer against"
+      ["HEAD" git-diff-head t]
+      ["Index" git-diff-index t]
+      ["Baseline" git-diff-baseline t]
+      ["Other..." git-diff-other t]
+      )
+    ("Diff Repository against"
+     ["HEAD" git-diff-all-head t]
+     ["Index" git-diff-all-index t]
+     ["Baseline" git-diff-all-baseline t]
+     ["Other..." git-diff-all-other t])
+    ["Log for Entire Project" git-log t]
+    ["Log for Current File" git-log-files t]
+    ["Log for Branch or Tag..." git-log-other t]
+    ["Branch List" git-branch t]
+    ["Merge (start or continue)..." git-merge-next-action t]
+    ["Reset..." git-reset t]
+    ["Stash..." git-stash t]
+    ["Status" git-status t]
+    ["Grep..." git-grep t]
+    ["Git Command..." git-cmd t]))
+
+
+(provide 'git-global-keys)
diff --git a/site/git-emacs/git-load-example.eh b/site/git-emacs/git-load-example.eh
new file mode 100644
index 0000000..7c65704
--- /dev/null
+++ b/site/git-emacs/git-load-example.eh
@@ -0,0 +1,8 @@
+;;============================================================ 
+;; git-emacs mode
+;;------------------------------------------------------------
+(eval-when-compile (require 'soo-load))
+(setq git-state-modeline-decoration 'git-state-decoration-large-dot)
+(require 'git-emacs-autoloads)
+;;------------------------------------------------------------
+
diff --git a/site/git-emacs/git-log.el b/site/git-emacs/git-log.el
new file mode 100644
index 0000000..6b15e5b
--- /dev/null
+++ b/site/git-emacs/git-log.el
@@ -0,0 +1,293 @@
+;; Git log mode support, part of git-emacs
+;;
+;; See git-emacs.el for license information
+
+(require 'log-view)
+(require 'git-emacs)
+
+;; Based off of log-view-mode, which has some nice functionality, like
+;; moving between comits
+(define-derived-mode git-log-view-mode
+  log-view-mode "Git-Log" "Major mode for viewing git logs"
+  :group 'git
+  ;; Customize log-view-message-re to be the git commits
+  (set (make-local-variable 'log-view-message-re)
+       "^[Cc]ommit[: ]*\\([0-9a-f]+\\)")
+  ;; As for the file re, there is no such thing -- make it impossible
+  (set (make-local-variable 'log-view-file-re)
+       "^No_such_text_really$")
+  (set (make-local-variable 'font-lock-defaults)
+       (list 'git-log-view-font-lock-keywords t))
+  (set (make-local-variable 'transient-mark-mode) t)
+
+  ;; A long git log might still be running when we die. Avoid "deleted buffer".
+  (add-hook 'kill-buffer-hook
+            #'(lambda()
+                (let ((proc (get-buffer-process (current-buffer))))
+                  (when proc (delete-process proc))))
+            nil t)                      ; prepend, local
+  )
+
+
+;; Highlighting. We could allow customizable faces, but that's a little
+;; much right now.
+(defvar git-log-view-font-lock-keywords
+  '(("^\\([Cc]ommit\\|[Mm]erge\\):?\\(.*\\)$"
+     (1 font-lock-keyword-face prepend)
+     (2 font-lock-function-name-face prepend))
+    ("^\\(Author\\):?\\(.*?\\([^<( \t]+@[^>) \t]+\\).*\\)$"
+     (1 font-lock-keyword-face prepend) (2 font-lock-constant-face prepend)
+     (3 font-lock-variable-name-face prepend))
+    ("^\\(Date\\):?\\(.*\\)$"
+     (1 font-lock-keyword-face prepend) (2 font-lock-doc-face prepend))
+    )
+  "Font lock expressions for git log view mode")
+;; (makunbound 'git-log-view-font-lock-keywords)  ; <-- C-x C-e to reset
+
+
+;; Keys
+(let ((map git-log-view-mode-map))
+  (define-key map "N" 'git-log-view-interesting-commit-next)
+  (define-key map "P" 'git-log-view-interesting-commit-prev)
+
+  (define-key map "m" 'set-mark-command) ; came with log-view-mode, nice idea
+  (define-key map "d" 'git-log-view-diff-preceding)
+  (define-key map "D" 'git-log-view-diff-current)
+  
+  (define-key map "c" 'git-log-view-cherry-pick)
+  (define-key map "k" 'git-log-view-checkout)
+  (define-key map "r" 'git-log-view-reset)
+  (define-key map "v" 'git-log-view-revert)
+  (define-key map "t" 'git-log-view-tag)
+
+  (define-key map "g" 'git-log-view-refresh)
+  (define-key map "q" 'git--quit-buffer))
+
+
+;; Menu
+(easy-menu-define
+ git-log-view-menu git-log-view-mode-map
+ "Git"
+ `("Git-Log"
+   ["Next Commit" log-view-msg-next t]
+   ["Previous Commit" log-view-msg-prev t]
+   ["Next Interesting Commit" git-log-view-interesting-commit-next t]
+   ["Previous Interesting Commit" git-log-view-interesting-commit-prev t]
+   "---"
+   ["Mark Commits for Diff" set-mark-command t]
+   ["Diff Commit(s)" git-log-view-diff-preceding t]
+   ["Diff against Current" git-log-view-diff-current t]
+   "---"
+   ["Reset Branch to Commit" git-log-view-reset t]
+   ["Checkout" git-log-view-checkout t]
+   ["Cherry-pick" git-log-view-cherry-pick t]
+   ["Revert Commit" git-log-view-revert t]
+   ["Tag this Commit..." git-log-view-tag t]
+   "---"
+   ["Refresh" git-log-view-refresh t]
+   ["Quit" git--quit-buffer t]))
+
+
+;; Extra navigation
+;; Right now this just moves between merges, but it would be nice to move
+;; to the next/prev commit by a different author. But it's harder than a
+;; simple RE.
+(defvar git-log-view-interesting-commit-re "^Merge[: ]?"
+  "Regular expression defining \"interesting commits\" for easy navigation")
+(easy-mmode-define-navigation
+ git-log-view-interesting-commit git-log-view-interesting-commit-re
+ "interesting commit")
+
+
+;; Implementation
+(defvar git-log-view-filenames nil
+  "List of filenames that this log is about, nil if the whole repository.")
+(defvar git-log-view-qualifier nil
+  "A short string representation of `git-log-view-filenames', e.g. \"2 files\"")
+(defvar git-log-view-start-commit nil
+  "Records the starting commit (e.g. branch name) of the current log view")
+
+
+(defun git--log-view (&optional files start-commit dont-pop-buffer)
+  "Show a log window for the given FILES; if none, the whole
+repository. If START-COMMIT is nil, use the current branch, otherwise the
+given commit. Assumes it is being run from a buffer whose
+default-directory is inside the repo."
+  (let* ((rel-filenames (mapcar #'file-relative-name files))
+         (log-qualifier (case (length files)
+                               (0 (abbreviate-file-name (git--get-top-dir)))
+                               (1 (first rel-filenames))
+                               (t (format "%d files" (length files)))))
+         (log-buffer-name (format "*git log: %s%s*"
+                                  log-qualifier
+                                  (if start-commit (format " from %s"
+                                                           start-commit)
+                                    "")))
+         (buffer (get-buffer-create log-buffer-name))
+         (saved-default-directory default-directory))
+    (with-current-buffer buffer
+      ;; Subtle: a previous git process might still be running
+      (let ((proc (get-buffer-process (current-buffer))))
+        (when proc (delete-process proc)))
+      (buffer-disable-undo)
+      (let ((buffer-read-only nil)) (erase-buffer))
+      (git-log-view-mode)
+      ;; Tell git-log-view-mode what this log is all about
+      (set (make-local-variable 'git-log-view-qualifier) log-qualifier)
+      (set (make-local-variable 'git-log-view-start-commit) start-commit)
+      (set (make-local-variable 'git-log-view-filenames) rel-filenames)
+      ;; Subtle: the buffer may already exist and have the wrong directory
+      (cd saved-default-directory)
+      ;; vc-do-command does almost everything right. Beware, it misbehaves
+      ;; if not called with current buffer (undoes our setup)
+      (apply #'vc-do-command buffer 'async "git" nil "log"
+             (append (when start-commit (list start-commit))
+                     (list "--")
+                     rel-filenames))
+      ;; vc sometimes goes to the end of the buffer, for unknown reasons
+      (vc-exec-after `(goto-char (point-min))))
+    (if dont-pop-buffer
+        buffer
+      (pop-to-buffer buffer))))
+
+;; Entry points
+(defun git-log-files ()
+  "Launch the git log view for the current file, or the selected files in
+git-status-mode."
+  (interactive)
+  (git--require-buffer-in-git)
+  (git--log-view (git--if-in-status-mode
+                     (git--status-view-marked-or-file)
+                   (list buffer-file-name))))
+ 
+(defun git-log ()
+  "Launch the git log view for the whole repository"
+  (interactive)
+  ;; TODO: maybe ask user for a git repo if they're not in one
+  (git--log-view))
+
+(defun git-log-other (&optional commit)
+  "Launch the git log view for another COMMIT, which is prompted for if
+unspecified. You can then cherrypick commits from e.g. another branch
+using the `git-log-view-cherrypick'."
+  (interactive (list (git--select-revision "View log for: ")))
+  (git--log-view nil commit))
+
+;; Take advantage of the nice git-log-view from the command line.
+;; Recipes:
+;; function gl() { gnuclient --batch --eval "(git-log-from-cmdline \"$DISPLAY\" \"$(pwd)\" \"$1\")"; }
+;;
+;; If you prefer a separate emacs instance:
+;; function gl() { emacs -l ~/.emacs --eval "(git-log-from-cmdline nil nil \"$1\")"; }
+;;
+;; Then you can just run "gl" or "gl another-branch", for example.
+(defun git-log-from-cmdline (&optional display directory start-commit)
+  "Launch a git log view from emacs --eval or gnuclient --eval. If DISPLAY
+is specified, create a frame on the specified display. If DIRECTORY is
+specified, do git log for that directory (a good idea in gnuclient)
+. If START-COMMIT if specified, log starting backwards from that commit, e.g.
+a branch."
+  (let ((default-directory (or directory default-directory))
+        (frame (when display (select-frame (make-frame-on-display display)))))
+    (switch-to-buffer
+     (git--log-view nil (when (> (length start-commit) 0) start-commit) t))
+    (when display
+      ;; Delete the frame on quit if we created it and nothing else displayed
+      (add-hook 'kill-buffer-hook
+              (lexical-let ((git-log-gnuserv-frame frame))
+                #'(lambda()
+                    (dolist (window (get-buffer-window-list (current-buffer)))
+                      (when (and (eq (next-window window) window)
+                                 (eq (window-frame window)
+                                     git-log-gnuserv-frame))
+                          (delete-frame (window-frame window))))))
+              t t))                      ; hook is append, local
+  ""))
+
+;; Actions
+(defun git-log-view-checkout ()
+  "Checkout the commit that the mark is currently in."
+  (interactive)
+  (let ((commit (substring-no-properties (log-view-current-tag))))
+    (when (y-or-n-p (format "Checkout %s from %s? "
+                            git-log-view-qualifier commit))
+      (if git-log-view-filenames
+          (progn
+            (apply #'git--exec-string "checkout" commit "--"
+                   git-log-view-filenames)
+            (git-after-working-dir-change git-log-view-filenames))
+        (git-checkout commit)))))     ;special handling for whole-tree checkout
+
+(defun git-log-view-cherry-pick ()
+  "Cherry-pick the commit that the cursor is currently in on top of the current
+branch."
+  (interactive)
+  (let ((commit (substring-no-properties (log-view-current-tag)))
+        (current-branch (git--current-branch)))
+    (when (y-or-n-p (format "Cherry-pick commit %s on top of %s? "
+                            commit (git--bold-face current-branch)))
+      (git--exec-string "cherry-pick" commit "--")
+      (git-after-working-dir-change))))
+
+(defun git-log-view-reset ()
+  "Reset the current branch to the commit that the cursor is currently in."
+  (interactive)
+  (let ((commit (substring-no-properties (log-view-current-tag)))
+        (current-branch (ignore-errors (git--current-branch))))
+    (when (y-or-n-p (format "Reset %s to commit %s? "
+                            (if current-branch (git--bold-face current-branch)
+                              "current state")
+                            (git--abbrev-commit commit)))
+      (git-reset commit))))
+
+(defun git-log-view-diff-preceding ()
+  "Diff the commit the cursor is currently on against the preceding commits.
+If a region is active, diff the first and last commits in the region."
+  (interactive)
+  (let* ((commit (git--abbrev-commit
+                 (log-view-current-tag (when mark-active (region-beginning)))))
+        (preceding-commit
+         (git--abbrev-commit
+          (save-excursion
+            (when mark-active
+              (goto-char (region-end))
+              ;; Go back one to get before the lowest commit, then
+              ;; msg-next will find it properly. Unless the region is empty.
+              (unless (equal (region-beginning) (region-end))
+                (backward-char 1)))
+            (log-view-msg-next)
+            (log-view-current-tag)))))
+    ;; TODO: ediff if single file, but git--ediff does not allow revisions
+    ;; for both files
+    (git--diff-many git-log-view-filenames preceding-commit commit t)))
+
+(defun git-log-view-diff-current ()
+  "Diff the commit the cursor is currently on against the current state of
+the working dir."
+  (interactive)
+  (let* ((commit (git--abbrev-commit (log-view-current-tag))))
+    (if (eq 1 (length git-log-view-filenames))
+        (git--diff (first git-log-view-filenames)
+                   (concat commit ":" ))
+      (git--diff-many git-log-view-filenames commit nil))))
+
+(defun git-log-view-revert ()
+  "Revert the commit that the cursor is currently on"
+  (interactive)
+  (let ((commit (substring-no-properties (log-view-current-tag))))
+    (when (y-or-n-p (format "Revert %s? " commit))
+      (git-revert commit))))
+
+(defun git-log-view-refresh ()
+  "Refresh log view"
+  (interactive)
+  (unless (boundp 'git-log-view-start-commit) (error "Not in git log view"))
+  (git--log-view git-log-view-filenames git-log-view-start-commit))
+
+(defun git-log-view-tag (&optional tag-name)
+  "Create a new tag for commit that the cursor is on."
+
+  (interactive)
+  (git-tag tag-name (git--abbrev-commit (log-view-current-tag))))
+
+(provide 'git-log)
diff --git a/site/git-emacs/git-modeline.el b/site/git-emacs/git-modeline.el
new file mode 100644
index 0000000..0d607ec
--- /dev/null
+++ b/site/git-emacs/git-modeline.el
@@ -0,0 +1,197 @@
+;; Mode line decoration support, part of git-emacs.
+;;
+;; See git-emacs.el for license and versioning.
+;; 
+;; ref. "test-runner-image.el" posted at
+;; "http://nschum.de/src/emacs/test-runner/"
+
+(require 'git-emacs)
+
+;; Modeline decoration customization
+(defcustom git-state-modeline-decoration
+  'git-state-decoration-letter
+  "How to indicate the status of files in the modeline. The value
+must be a function that takes a single arg: a symbol denoting file status,
+e.g. 'unmerged. The return value of the function will be added at the beginning
+of mode-line-format."
+  :type '(choice (function-item :tag "Small colored dot"
+                                git-state-decoration-small-dot)
+                 (function-item :tag "Large colored dot"
+                                git-state-decoration-large-dot)
+                 (function-item :tag "Status letter"
+                                git-state-decoration-letter)
+                 (function-item :tag "Colored status letter"
+                                git-state-decoration-colored-letter)
+                 (const :tag "No decoration" nil)
+                 (function :tag "Other"))
+  :group 'git-emacs
+)
+
+(defun git--interpret-state-mode-color (stat)
+  "Return a mode line status color appropriate for STAT (a state symbol)."
+  (case stat
+    ('modified "tomato"      )
+    ('unknown  "gray"        )
+    ('added    "blue"        )
+    ('deleted  "red"         )
+    ('unmerged "purple"      )
+    ('uptodate "GreenYellow" )
+    ('staged   "yellow"      )
+    (t "red")))
+
+
+;; Modeline decoration options
+(defun git-state-decoration-small-dot(stat)
+  (git--state-mark-modeline-dot
+   (git--interpret-state-mode-color stat) stat
+"/* XPM */
+static char * data[] = {
+\"14 7 3 1\",
+\" 	c None\",
+\"+	c #202020\",
+\".	c %s\",
+\"      +++     \",
+\"     +...+    \",
+\"    +.....+   \",
+\"    +.....+   \",
+\"    +.....+   \",
+\"     +...+    \",
+\"      +++     \"};"))
+
+(defun git-state-decoration-large-dot(stat)
+  (git--state-mark-modeline-dot
+   (git--interpret-state-mode-color stat) stat
+"/* XPM */
+static char * data[] = {
+\"18 13 3 1\",
+\" 	c None\",
+\"+	c #000000\",
+\".	c %s\",
+\"                  \",
+\"       +++++      \",
+\"      +.....+     \",
+\"     +.......+    \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"    +.........+   \",
+\"     +.......+    \",
+\"      +.....+     \",
+\"       +++++      \",
+\"                  \"};"))
+
+(defun git--interpret-state-mode-letter(stat)
+   (case stat
+     ('modified "M")
+     ('unknown  "?")
+     ('added    "A")
+     ('deleted  "D")
+     ('unmerged "!")
+     ('uptodate "U")
+     ('staged   "S")
+     (t "")))
+
+(defsubst git--state-mark-tooltip(stat)
+  (format "File status in git: %s" stat))
+
+(defun git-state-decoration-letter(stat)
+  (propertize
+   (concat (git--interpret-state-mode-letter stat) " ")
+   'help-echo (git--state-mark-tooltip stat)))
+
+(defun git-state-decoration-colored-letter(stat)
+  (propertize
+   (concat 
+    (propertize 
+     (git--interpret-state-mode-letter stat)
+     'face (list ':foreground (git--interpret-state-mode-color stat)))
+    " ")
+   'help-echo (git--state-mark-tooltip stat)))
+
+;; Modeline decoration implementation
+(defvar git--state-mark-modeline t)     ; marker for our entry in mode-line-fmt
+
+(defun git--state-mark-modeline-dot (color stat img)
+  (propertize "    "
+              'help-echo (git--state-mark-tooltip stat)
+              'display
+              `(image :type xpm
+                      :data ,(format img color)
+                      :ascent center)))
+
+(defun git--state-decoration-dispatch(stat)
+  (if (functionp git-state-modeline-decoration)
+      (funcall git-state-modeline-decoration stat)))
+
+(defun git--install-state-mark-modeline (stat)
+  (push `(git--state-mark-modeline
+          ,(git--state-decoration-dispatch stat))
+        mode-line-format)
+  )
+
+(defun git--uninstall-state-mark-modeline ()
+  (setq mode-line-format
+        (delq nil (mapcar #'(lambda (mode)
+                              (unless (eq (car-safe mode)
+                                          'git--state-mark-modeline)
+                                mode))
+                   mode-line-format)))
+  )
+
+;; autoload entry point
+(defun git--update-state-mark (stat)
+  (git--uninstall-state-mark-modeline)
+  (git--install-state-mark-modeline stat))
+
+;; autoload entry point
+(defun git--update-all-state-marks (&optional repo-or-filelist)
+  "Updates the state marks of all the buffers visiting the REPO-OR-FILELIST,
+which is a repository dir or a list of files. This is more efficient than
+doing update--state-mark for each buffer."
+  (let ((buffers (git--find-buffers repo-or-filelist)))
+    (when (and buffers git-state-modeline-decoration)
+      ;; Use a hash table to find buffers after status-index and ls-files.
+      ;; There could be many, and we're doing all these ops with no user
+      ;; intervention. The hash table is filename -> (buffer . stat).
+      (let ((file-index (make-hash-table :test #'equal :size (length buffers)))
+            (default-directory
+              (git--get-top-dir
+                (if repo-or-filelist
+                    (file-name-directory (first repo-or-filelist))
+                  default-directory)))
+            (all-relative-names nil))
+        (dolist (buffer buffers)
+          (let ((relative-name
+                 (file-relative-name (buffer-file-name buffer)
+                                     default-directory)))
+            (puthash relative-name (cons buffer nil) file-index)
+            (push relative-name all-relative-names)))
+        ;; Execute status-index to find out the changed files
+        (dolist (fi (apply #'git--status-index all-relative-names))
+          (setcdr (gethash (git--fileinfo->name fi) file-index)
+                  (git--fileinfo->stat fi)))
+        ;; The remaining files are probably unchanged, do ls-files
+        (let (remaining-files)
+          (maphash #'(lambda (filename buffer-stat)
+                       (unless (cdr buffer-stat)
+                         (push filename remaining-files)))
+                   file-index)
+          (when remaining-files
+            (dolist (fi (apply #'git--ls-files remaining-files))
+              (setcdr (gethash (git--fileinfo->name fi) file-index)
+                      (git--fileinfo->stat fi)))))
+        ;; Now set all stats
+        (maphash #'(lambda (filename buffer-stat)
+                     (when (cdr buffer-stat)
+                       (with-current-buffer (car buffer-stat)
+                         (git--update-state-mark (cdr buffer-stat)))))
+                 file-index)))))
+      
+;; example on state-modeline-mark
+;; 
+;;(git--install-state-mark-modeline 'modified)
+;; (git--uninstall-state-mark-modeline)
+;; (git--update-all-state-marks)
+
+(provide 'git-modeline)
diff --git a/site/git-emacs/git-status.el b/site/git-emacs/git-status.el
new file mode 100644
index 0000000..8a14621
--- /dev/null
+++ b/site/git-emacs/git-status.el
@@ -0,0 +1,922 @@
+;; Git status buffer support, part of git-emacs.
+;;
+;; See git-emacs.el for license and versioning.
+
+(require 'git-emacs)                    ; main module
+(require 'ewoc)                         ; view
+
+;;-----------------------------------------------------------------------------
+;; Variables and utility functions
+;;-----------------------------------------------------------------------------
+
+(defvar git-status-mode-hook  nil
+  "Hooks to run upon entering git-status-mode")
+(defvar git-status-mode-map nil
+  "Keymap for git-status-mode")
+(defvar git--status-view nil
+  "EWOC for git-status-mode")
+
+
+(defconst git--status-header-format "     %-2s %-10s %-5s %4s  %s")
+(defconst git--status-line-column 32)
+
+(defsubst git--status-header ()
+  ;; Put spaces above the scrollbar and the fringe
+  (format
+   (concat (make-string (+ (scroll-bar-columns 'left) (fringe-columns 'left))
+                        ? )
+           git--status-header-format)
+   "M" "STATUS" "PERM" "SIZE" "FILE"))
+
+(defun git--refresh-desc ()
+  "Refresh the git-status-mode header description"
+  (ewoc-set-hf
+   git--status-view
+   (concat (git--bold-face "Directory") " : " default-directory     "\n"
+           (git--bold-face "Branch   ") " : "
+           (or (git--current-branch) "<none>") "\n"
+           (git--bold-face "Last Log ") " : " (git--last-log-short) "\n")
+   ""))
+
+(defsubst git--status-buffer-name (dir)
+  (format "*git-status on %s*" (abbreviate-file-name (expand-file-name dir))))
+
+(defsubst git--create-status-buffer (dir)
+  (let* ((status-buffer-name (git--status-buffer-name dir))
+         (status-buffer (get-buffer status-buffer-name)))
+    (or status-buffer (get-buffer-create status-buffer-name))))
+
+(defsubst git--kill-status-buffer (dir)
+  (kill-buffer (git--status-buffer-name dir)))
+
+;;-----------------------------------------------------------------------------
+;; faces
+;;-----------------------------------------------------------------------------
+
+(defmacro git--face (name fore1 prop1 fore2 prop2)
+  `(defface ,(intern (concat "git--" (symbol-name name) "-face"))
+     '((((class color) (background light)) (:foreground ,fore1 ,@prop1))
+       (((class color) (background dark))  (:foreground ,fore2 ,@prop2)))
+    ,(concat "git " (symbol-name name) " face in status buffer mode")
+    :group 'git-emacs-faces))
+
+(git--face mark       "red"    (:bold t) "tomato"  (:bold t))
+(git--face mark-tree  "blue"   (:bold t) "yellow"  (:bold t))
+(git--face mark-blob  "black"  () "white" ())
+(git--face mark-submodule "cyan" ()      "cyan"    ())
+(git--face unknown    "black"  (:bold t) "white"   (:bold t))
+(git--face ignored    "gray"   (:bold t) "gray"    (:bold t))
+(git--face modified   "tomato" (:bold t) "tomato"  (:bold t))
+(git--face unmerged   "red"    (:bold t) "magenta" (:bold t))
+(git--face uptodate   "gray"   (:bold t) "green"   ())
+(git--face added      "tomato" (:bold t) "cyan"    (:bold t))
+(git--face deleted    "red"    (:bold t) "red"     (:bold t))
+(git--face staged     "yellow" (:bold t) "yellow"  (:bold t))
+(git--face log-line   "gray"   (:bold t :italic t) "gray"(:bold t :italic t))
+
+
+;;-----------------------------------------------------------------------------
+;; status view rendering
+;;-----------------------------------------------------------------------------
+
+;; status view on one node
+;;            +-> perm     +-> name
+;; M STATUS   PERM   SIZE  FILE
+;; +-> mark          +-> size
+;;   +-> stat
+;;                   
+;; * Modified 100644 4564 |test.c
+;; * New      100644 4564  test.c
+
+
+(defsubst git--status-node-mark (info)
+  "Render status view node mark"
+  (propertize (if (git--fileinfo->marked info) "*" " ")
+              'face
+              'git--mark-face))
+
+(defsubst git--status-node-stat (info)
+  "Render status view node state"
+  (let ((stat (git--fileinfo->stat info)))
+    (propertize (capitalize (symbol-name stat))
+                'face
+                (case stat
+                  ('modified 'git--modified-face )
+                  ('uptodate 'git--uptodate-face )
+                  ('unknown  'git--unknown-face  )
+                  ('added    'git--added-face    )
+                  ('deleted  'git--deleted-face  )
+                  ('unmerged 'git--unmerged-face )
+                  ('staged   'git--staged-face   )
+                  (t nil)))))
+
+(defsubst git--status-node-perm (info)
+  "Render status view node permission"
+  (or (git--fileinfo->perm info) "------"))
+
+(defun git--status-human-readable-size (size)
+  "Given a size in bytes, returns a string size of at most four chars, similar
+to ls -sh; e.g. 29152 -> 28K."
+  (if (< size 1024)
+      (format "%d" size)
+    (let ((suffixes "KMGT") (i 0))
+      (while (and (< i (length suffixes))
+                  (>= size 1000))       ; 1023K would be 5 chars
+        (setq size (/ size 1024.0))
+        (incf i))
+      (format (if (< size 10) "%.1f%c" "%.0f%c")
+              size (elt suffixes (- i 1))))))
+
+(defsubst git--status-node-size (info)
+  "Render status view node size"
+  (let ((size (git--fileinfo->size info)))
+    (if (not size) ""
+      (git--status-human-readable-size size))))
+      
+(defsubst git--status-node-name (info)
+  "Render status view node name"
+  (let ((name (git--fileinfo->name info))
+        (type (git--fileinfo->type info)))
+
+    (setq name (replace-regexp-in-string "[^/]+/" "    " name))
+    (format
+     (if (eq type 'commit) "%s  [submodule>]" "%s")
+     (propertize name 'face
+                 (case type
+                   ('tree 'git--mark-tree-face)
+                   ('blob 'git--mark-blob-face)
+                   ('commit 'git--mark-submodule-face)
+                   (t (error "Unknown node type: %S" type)))))))
+                  
+(defun git--render-file-status (info)
+  "Render status view node, call in order
+ mark       : 'git--status-node-mark
+ state      : 'git--status-node-stat
+ permission : 'git--status-node-perm
+ size       : 'git--status-node-size
+ name       : 'git--status-node-name"
+  
+  (insert (format git--status-header-format
+                  (git--status-node-mark info)
+                  (git--status-node-stat info)
+                  (git--status-node-perm info)
+                  (git--status-node-size info)
+                  (git--status-node-name info))))
+
+;;-----------------------------------------------------------------------------
+;; status mode definition
+;;-----------------------------------------------------------------------------
+
+(defun git-status-mode ()
+  "Major mode for viewing and editing the state of a git directory."
+  
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+
+  ;; set major mode
+  (setq mode-name "git status")
+  (setq major-mode 'git-status-mode)
+
+  (use-local-map git-status-mode-map)
+
+  (setq buffer-read-only t)
+  (setq header-line-format (git--status-header))
+
+  ;; create ewoc for current git-status buffer
+  (set (make-local-variable 'git--status-view)
+       (ewoc-create 'git--render-file-status "" ""))
+
+  (set (make-local-variable 'revert-buffer-function)
+       'git-status-mode-revert-buffer)
+
+  (run-hooks 'git-status-mode-hook))
+
+(defun git-status-mode-revert-buffer (ignore-auto noconfirm)
+  "Refresh status information."
+
+  (let* ((current-node (ewoc-locate git--status-view))
+         (current-fi (when current-node (ewoc-data current-node)))
+         new-current)
+    (git--please-wait "Reading git status" (git--status-new))
+    (when current-fi
+      (git--status-view-update-expand-tree (list current-fi) t)
+      (setq new-current
+            (git--status-map (ewoc-nth git--status-view 0)
+                             (lambda (node data)
+                               (or (string= (git--fileinfo->name data)
+                                            (git--fileinfo->name current-fi))
+                                   (git--fileinfo-lessp current-fi data))))))
+    (if (not new-current)
+        (git--status-view-first-line)
+      (ewoc-goto-node git--status-view new-current)
+      (move-to-column git--status-line-column))))
+      
+
+;; autoloaded entry point
+(defun git-status (dir)
+  "Launch git-status-mode on the specified directory. With a prefix
+argument (C-u), always prompts."
+  (interactive (list (git--get-top-dir-or-prompt
+                      "Select directory: " (when current-prefix-arg t))))
+
+  (setq dir (git--get-top-dir dir))
+  (if (file-directory-p (git--expand-to-repository-dir dir))
+      (progn
+        (switch-to-buffer (git--create-status-buffer dir))
+        (cd dir)
+        (git-status-mode)
+        (git--please-wait "Reading git status"
+                          (git--status-new))
+        (git--status-view-first-line))
+    ;; (add-hook 'after-save-hook 'git-update-saved-file)))
+    (message "%s is not a git working tree." dir)))
+
+;;-----------------------------------------------------------------------------
+;; git-status-view features
+;;-----------------------------------------------------------------------------
+
+(defsubst git--clear-status ()
+  "Clear the git-status-view"
+  (ewoc-filter git--status-view #'(lambda (info) nil))
+  (ewoc-refresh git--status-view)
+  (let ((buffer-read-only nil)) (erase-buffer)))
+
+(defsubst git--status-tree () (git--ls-tree "HEAD"))
+
+(defsubst git--status-map (node pred)
+  "Iterate over git--status-view nodes by using 'ewoc-next. Stops
+when PRED returns t and returns that node. The predicate function
+should get 'node and 'data arguments and it should return t or
+nil.  If predicate returned nil we continue to scan, otherwise
+stop and return the node."
+  (let ((data nil)
+        (cont t))
+
+    (while (and node cont)
+      (setq data (ewoc-data node))
+      (setq cont (not (funcall pred node data)))
+      (when cont (setq node (ewoc-next git--status-view node))))
+
+    node))
+
+(defun git--status-view-dumb-update-element (fi)
+  "Add updated fileinfo FI to `git--status-view'. Slow, right now."
+  
+  (unless (git--status-map (ewoc-nth git--status-view 0)
+                           #'(lambda (node data)
+                               (when (git--fileinfo-lessp fi data)
+                                 (ewoc-enter-before git--status-view node fi))))
+    (ewoc-enter-last git--status-view fi)))
+
+(defun git--status-view-update-state (fileinfos)
+  "Update the state of the status view nodes corresponding to  FILEINFOS."
+
+  (let ((hashed-info (make-hash-table :test 'equal :size (length fileinfos))))
+    (dolist (fi fileinfos)
+      (puthash (git--fileinfo->name fi) fi hashed-info))
+
+    (ewoc-collect git--status-view
+                  #'(lambda (node)
+                      (let* ((name (git--fileinfo->name node))
+                             (fi (gethash name hashed-info)))
+                        (when fi
+                          (setf (git--fileinfo->stat node)
+                                (git--fileinfo->stat fi))
+                          (remhash name hashed-info)))))
+
+    (maphash #'(lambda (k v) (git--status-view-dumb-update-element v)) hashed-info)))
+
+(defun git--status-view-update-expand-tree (fileinfos
+                                            &optional dont-add-unknown-dirs)
+  "Expand the tree nodes containing one of FILEINFOS, which must be sorted.
+Does not add unknown files within the expanded dirs, that must be
+an additional merge step. If DONT-ADD-UNKNOWN-DIRS is specified,
+does not add additional directories to accommodate fileinfos that
+are very deep (used when repositioning mark on refresh)."
+  (let ((node (ewoc-nth git--status-view 0))
+        (last-path-expanded '()))
+    (dolist (fi fileinfos)
+      (let* ((components (nbutlast
+                          (split-string (git--fileinfo->name fi) "/")))
+             (paths-to-expand components) ; advancing pointer inside components
+             (matched-name nil) (cont-iteration t))
+
+        (while (and paths-to-expand last-path-expanded
+                    (string= (car paths-to-expand) (car last-path-expanded)))
+          (setq paths-to-expand (cdr paths-to-expand))
+          (setq last-path-expanded (cdr last-path-expanded)))
+
+        (setq last-path-expanded components)
+        
+        ;; Paths inside root or an expanded path are already handled.
+        (when paths-to-expand
+          (let ((remaining-paths (cdr paths-to-expand)))
+            (setcdr paths-to-expand nil)          ; splice off beginning path
+            (setq matched-name (git--join components "/"))
+            (setcdr paths-to-expand remaining-paths) ; relink last-path-expanded
+            (setq paths-to-expand remaining-paths))
+          
+          (while cont-iteration
+            (let ((data (ewoc-data node)) (found-it nil))
+              (if (and (git--fileinfo-is-dir data)
+                       (string= (git--fileinfo->name data) matched-name))
+                  (progn
+                    (unless (git--fileinfo->expanded data)
+                      (git--expand-tree node t))
+                    (setq found-it t))
+                ;; Have we passed our insertion point? This can happen when
+                ;; merging unknown files in unknown subdirs.
+                (when (git--fileinfo-lessp fi data)
+                  (if dont-add-unknown-dirs
+                      (setq cont-iteration nil)
+                    ;; Add the subdir we were looking for here. Don't advance.
+                    (setq node (ewoc-enter-before
+                                git--status-view node
+                                (git--create-fileinfo
+                                 matched-name 'tree nil nil nil 'unknown)))
+                    ;; This new node is being expanded as we speak.
+                    (setf (git--fileinfo->expanded (ewoc-data node)) t)
+                    (setq found-it t))))
+              (if found-it
+                  ;; Do we need to expand even lower?
+                  (if paths-to-expand
+                    (progn
+                      (setq matched-name
+                            (concat matched-name "/"
+                                    (car paths-to-expand)))
+                      (setq paths-to-expand (cdr paths-to-expand))
+                      ;; Continue iteration from next node
+                      (setq node (ewoc-next git--status-view node)))
+                    (setq cont-iteration nil))   ;; No, stop at this node.
+                (setq node (ewoc-next git--status-view node))) ;; advance
+              ))
+          ;; This was very useful while debugging. Please leave it in.
+          ;; (message "node: %s paths-to-expand %S matched-name %S fi-name %S" (when node (git--fileinfo->name (ewoc-data node))) paths-to-expand matched-name (git--fileinfo->name fi))
+          )))))
+                                          
+
+(defun git--status-view-update ()
+  "Update the state of all changed files."
+  
+  (let ((fileinfos (sort (git--status-index) #'git--fileinfo-lessp)))
+    (git--status-view-update-expand-tree fileinfos)
+    (git--status-view-update-state fileinfos)))
+
+(defsubst git--status-refresh ()
+  (let ((pos (point)))
+    (ewoc-refresh git--status-view)
+    (goto-char pos)))
+
+(defun git--status-add-size (fileinfo)
+  "Fill in the size field of a fileinfo"
+  (let ((attrs (file-attributes (git--fileinfo->name fileinfo))))
+    (when (and attrs (not (first attrs)))
+      (setf (git--fileinfo->size fileinfo) (elt attrs 7)))))
+    
+(defun git--status-new ()
+  "Create new status-view buffer in current buffer"
+
+  (git--clear-status)
+  (git--refresh-desc)
+
+  ;; add new file infos
+  (dolist (info (git--status-tree))
+    (git--status-add-size info)
+    (ewoc-enter-last git--status-view info))
+
+  ;; add modified/renamed etc file infos
+  (git--status-view-update)
+
+  ;; add unknown file
+  (let ((fileinfo (git--ls-files "-o" "--exclude-standard")))
+    (git--status-view-update-expand-tree fileinfo)
+
+    ;; Use the file sorting to merge into the list.
+    (let ((iter (ewoc-nth git--status-view 0)))
+      (dolist (fi fileinfo)
+        (git--status-add-size fi)
+        ;; Find the lowest node that's larger, or enter at the end.
+        (let (enter-before)
+          (git--status-map
+           iter
+           (lambda (node data)
+             (when (git--fileinfo-lessp fi data)
+               (setq enter-before node))))
+          (if enter-before
+              (setq iter (ewoc-enter-before git--status-view enter-before fi))
+            (setq iter (ewoc-enter-last git--status-view fi)))))))
+
+  (git--status-refresh))
+
+(defsubst git--status-delete (node)
+  
+  (let ((buffer-read-only nil)) 
+    (ewoc-delete git--status-view node)))
+
+(defun git--status-delete-after-regex (node regex)
+  (while node
+    (let ((next-node (ewoc-next git--status-view node))
+          (node-data (ewoc-data node)))
+
+      (if (string-match regex (git--fileinfo->name node-data))
+          (git--status-delete node)
+        ;; finish if not matched
+        (setq next-node nil))
+
+      (setq node next-node)))
+  (git--status-refresh))
+
+;;-----------------------------------------------------------------------------
+;; key/menu map
+;;-----------------------------------------------------------------------------
+
+(let ((map (make-keymap)))
+  (suppress-keymap map)
+
+  (define-key map "n" 'git--status-view-next-line)
+  (define-key map "p" 'git--status-view-prev-line)
+  (define-key map "N" 'git--status-view-next-meaningful-line)
+  (define-key map "P" 'git--status-view-prev-meaningful-line)
+  (define-key map "l" 'git-log)
+  (define-key map "m" 'git--status-view-mark-and-next)
+  (define-key map "u" 'git--status-view-unmark-and-next)
+  (define-key map " " 'git--status-view-toggle-and-next)
+  (define-key map "q" 'git--status-view-quit)
+  (define-key map "<" 'git--status-view-first-line)
+  (define-key map ">" 'git--status-view-last-line)
+
+  (define-key map "e" 'git--status-view-expand-tree-toggle)
+  (define-key map "v" 'git--status-view-view-file)
+  (define-key map "o" 'git--status-view-open-file)
+  ;; Use the sub-maps from git-global-keys for diffs.
+  (define-key map "d" (copy-keymap git--diff-buffer-map))
+  (define-key map "D" (copy-keymap git--diff-all-map))
+  (define-key map "b" 'git-switch-branch)
+  (define-key map "!" 'git--status-view-resolve-merge)
+  (define-key map "." 'git-cmd)
+  (define-key map "k" 'gitk)
+  (define-key map "L" 'git-log-files)
+  (define-key map "g" 'git--status-view-refresh)
+  (define-key map "a" 'git--status-view-add)
+  (define-key map "i" 'git--status-view-add-ignore)
+  (define-key map "r" 'git--status-view-rename)
+  (define-key map "?" 'git--status-view-blame)
+  (define-key map (kbd "<delete>") 'git--status-view-rm)
+  (define-key map "*" 'git--status-view-mark-reg)
+  (define-key map "s" 'git--status-view-summary)
+  (define-key map "z" 'git-branch)
+
+  (define-key map "c" (copy-keymap git--commit-map))
+  (define-key map "R" 'git-reset)
+
+  (define-key map "\C-m" 'git--status-view-open-or-expand)
+
+  (setq git-status-mode-map map))
+
+(easy-menu-define gitemacs-menu git-status-mode-map
+  "Git"
+  `("Git-Emacs"
+    ["Refresh" git--status-view-refresh t]
+    ["First Line" git--status-view-first-line t]
+    ["Last Line" git--status-view-last-line t]
+    ["Next Line" git--status-view-next-line t]
+    ["Previous Line" git--status-view-prev-line t]
+    ["Next Meaningful Line" git--status-view-next-meaningful-line t]
+    ["Previous Meaningful Line" git--status-view-prev-meaningful-line t]
+    ["Expand Tree" git--status-view-expand-tree-toggle]
+    "----" 
+    ["Add File" git--status-view-add t]
+    ["Ignore File" git--status-view-add-ignore t]
+    ["Rename File" git--status-view-rename t]
+    ["Open File" git--status-view-open-file t]
+    ["View File" git--status-view-view-file t]
+    ("Diff File against"
+     ;; We want the short keys to appear here rather than the global keys
+      ["HEAD" git-diff-head :keys "d RET" :active t]
+      ["Index" git-diff-index :keys "d i" :active t]
+      ["Baseline" git-diff-baseline :keys "d b" :active t]
+      ["Other..." git-diff-other :keys "d o" :active t])
+    ("Diff Repository against"
+     ["HEAD" git-diff-all-head :keys "D RET" :active t]
+     ["Index" git-diff-all-index :keys "D i" :active t]
+     ["Baseline" git-diff-all-baseline :keys "D b" :active t]
+     ["Other..." git-diff-all-other :keys "D o" :active t])
+    ["Delete File" git--status-view-rm]
+    ["View Summary" git--status-view-summary t]
+    ["Log for Selected File(s)" git-log-files :keys "L" :active t]
+    ["Mark" git--status-view-mark-and-next t]
+    ["Unmark" git--status-view-unmark-and-next t]
+    "----"
+    ["Branch Mode" git-branch t]
+    ["Switch to Branch..." git-switch-branch t]      
+    ("Commit"
+     ["All Changes" git-commit-all :keys "c RET" :active t]
+     ["Index" git-commit :keys "c i" :active t]
+     ["Selected File(s)" git-commit-file :keys "c f" :active t])
+    ["Reset..." git-reset :keys "R" :active t]
+    ["Resolve Merge" git--status-view-resolve-merge t]
+    ["Merge..." git-merge t]
+    ["Revert" git-revert t]
+    ["Log for Project" git-log t]
+    "----"
+    ["Git Command" git-cmd t]
+    ["GitK" gitk t]
+    "----"
+    ["Quit" git--status-view-quit t]))
+
+
+;;-----------------------------------------------------------------------------
+;; status view tree expanding
+;;-----------------------------------------------------------------------------
+
+(defun git--expand-tree (node &optional dont-add-unknown)
+  "Expand 'node' in 'git--status-view'.  node->type should be 'tree. If
+DONT-ADD-UNKOWN is true, does not add unknown files (if we're about to merge
+them)."
+
+  (let* ((data (ewoc-data node))
+         (name (git--fileinfo->name data))
+         (type (git--fileinfo->type data))
+         (tree-sha1 (git--fileinfo->sha1 data))
+         ;; We need some duplicate removal later on. Hashtable? not now.
+         (known-subdirs '())
+         (massage-fileinfo
+          (lambda (fi)
+            (let ((subfname (git--fileinfo->name fi)))
+              (setf (git--fileinfo->name fi)
+                    (git--concat-path-only name subfname))
+              (when (git--fileinfo-is-dir fi) (push subfname known-subdirs)))
+            fi))
+         ;; The node may or may not be in git (e.g. unknown files onl)
+         (fileinfos
+          (sort (append
+                 (when tree-sha1
+                   (let ((fileinfos (git--ls-tree tree-sha1)))
+                     (mapc massage-fileinfo fileinfos) ; modify them
+                     fileinfos))
+                 ;; Add unknown files, but just at the top-level. Note
+                 ;; that git would give them to us *with* name, if we
+                 ;; didn't cd.
+                 (unless dont-add-unknown
+                   (let ((unknown-files
+                          (let ((default-directory
+                                  (concat default-directory "/"
+                                          (file-name-as-directory name))))
+                            (git--ls-files "-o" "--exclude-standard")))
+                         (filtered-unknown '()))
+                     (dolist (fi unknown-files)
+                       (let* ((subfname (git--fileinfo->name fi))
+                              (components (split-string subfname "/" t)))
+                         (if (eq 1 (length components))
+                             (push (funcall massage-fileinfo fi)
+                                   filtered-unknown)
+                           ;; insert just the first component, if not seen
+                           (unless (member (car components) known-subdirs)
+                             (push
+                              (funcall massage-fileinfo
+                                       (git--create-fileinfo
+                                        (car components)
+                                        'tree nil nil nil 'unknown))
+                              filtered-unknown)))))
+                     filtered-unknown)))
+                 #'git--fileinfo-lessp)))
+
+    (unless (eq type 'tree) (error "type should be 'tree"))
+
+    (unless (git--fileinfo->expanded data)
+
+      (dolist (fi fileinfos)
+        (git--status-add-size fi)
+        (setq node (ewoc-enter-after git--status-view node fi)))
+    
+      (setf (git--fileinfo->expanded data) t))))
+
+(defun git--shrink-tree (node)
+  "Shrink 'node' in 'git--status-view'. node->type should be 'tree"
+  (let* ((data (ewoc-data node))
+         (name (git--fileinfo->name data)))
+    (unless (git--fileinfo-is-dir data) (error "type should be 'tree"))
+    (when (git--fileinfo->expanded data)
+      ;; make regexp "node->name/"
+      (git--status-delete-after-regex
+       (ewoc-next git--status-view node)
+       (concat "^" (regexp-quote (file-name-as-directory name))))
+      (setf (git--fileinfo->expanded data) nil))))
+
+
+(defun git--status-view-expand-tree-toggle ()
+  "Expand if tree is not expanded otherwise close the tree"
+  (interactive)
+  (let* ((node (ewoc-locate git--status-view))
+         (node-info (ewoc-data node)))
+    (when (and node node-info
+               (eq (git--fileinfo->type node-info) 'tree))
+      (if (git--fileinfo->expanded node-info)
+          (git--shrink-tree node)
+        (git--expand-tree node)))))
+
+;;-----------------------------------------------------------------------------
+;; status view moving
+;;-----------------------------------------------------------------------------
+
+(defun git--status-view-forward-line (n)
+  "Move forward by N lines in the status view."
+
+  (interactive "p")
+  
+  (let ((dir (/ n (abs n))))
+    (forward-line n)
+
+    (while (or (looking-at "^[\n\t ]+$")
+               (looking-at "^[^ ]"))
+      (forward-line dir)))
+
+  (move-to-column git--status-line-column))
+
+(defun git--status-view-first-line ()
+  "Move to the first item in the status view."
+  
+  (interactive)
+  (goto-char (point-min))
+  (git--status-view-forward-line 1))
+
+(defun git--status-view-last-line ()
+  "Move to the last item in the status view."
+  
+  (interactive)
+  (goto-char (point-max))
+  (git--status-view-forward-line -1))
+
+(defun git--forward-meaningful-line (move)
+  "Call MOVE until we end up on a meaningful line (i.e. one with updates)."
+
+  (let ((start-node (ewoc-locate git--status-view)))
+    (funcall move 1)
+
+    (while (and (eq 'uptodate
+                    (git--fileinfo->stat (ewoc-data (ewoc-locate git--status-view))))
+                (not (eq start-node (ewoc-locate git--status-view))))
+      (funcall move 1))))
+
+(defun git--status-view-next-line (&optional n)
+  "Move to the next line in the status view."
+  (interactive "p")
+  (if (eql (ewoc-locate git--status-view)
+           (ewoc-nth git--status-view -1))
+      (git--status-view-first-line)
+    (git--status-view-forward-line 1)))
+
+(defun git--status-view-next-meaningful-line ()
+  "Move to the next meaningful line in the status view."
+  (interactive)
+  (git--forward-meaningful-line 'git--status-view-next-line))
+
+(defun git--status-view-prev-line (&optional n)
+  "Move to the previous line in the status view."
+  (interactive "p")
+  (if (eql (ewoc-locate git--status-view)
+           (ewoc-nth git--status-view 0))
+      (git--status-view-last-line)
+    (git--status-view-forward-line -1)))
+
+(defun git--status-view-prev-meaningful-line ()
+  "Move to the previous meaningful line in the status view."
+  (interactive)
+  (git--forward-meaningful-line 'git--status-view-prev-line))
+
+;;-----------------------------------------------------------------------------
+;; Marking.
+;;-----------------------------------------------------------------------------
+
+(defun git--mark-line (marked)
+  "Sets the mark flag of the current line to MARK. Updates the view."
+
+  (let ((node (ewoc-locate git--status-view)))
+    (setf (git--fileinfo->marked (ewoc-data node)) marked)
+    (ewoc-invalidate git--status-view node)))
+
+(defun git--status-view-mark-and-next ()
+  "Mark and go to the next line."
+  (interactive)
+  (git--mark-line t)
+  (git--status-view-next-line))
+
+(defun git--status-view-unmark-and-next ()
+  "Unmark and go to the next line."
+  (interactive)
+  (git--mark-line nil)
+  (git--status-view-next-line))
+
+(defun git--toggle-line ()
+  "Toggles the marked state of the current line."
+  (let* ((node (ewoc-locate git--status-view))
+         (data (ewoc-data node))
+         (mark (git--fileinfo->marked data)))
+    (setf (git--fileinfo->marked data) (not mark))
+    (ewoc-invalidate git--status-view node)))
+
+(defun git--status-view-toggle-and-next ()
+  "Toggle the marked state of the current line and move to the next."
+  (interactive)
+  (git--toggle-line)
+  (git--status-view-next-line))
+
+;;-----------------------------------------------------------------------------
+;; Commands
+;;-----------------------------------------------------------------------------
+
+(defun git--status-view-quit ()
+  "Quit the git status buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defun git--status-view-refresh ()
+  "Refresh git status buffer."
+  (interactive)
+  (git--please-wait "Reading git status" (revert-buffer)))
+
+(defun git--status-view-mark-reg (reg)
+  "Prompt for a regular expression, mark the files that match."
+
+  (interactive "sRegexp >> ")
+  (ewoc-collect git--status-view
+                #'(lambda (data)
+                    (when (string-match reg (git--fileinfo->name data))
+                      (setf (git--fileinfo->marked data) t))))
+
+  (ewoc-refresh git--status-view)
+  (git--status-view-first-line)
+  (git--status-view-next-meaningful-line))
+
+(defun git--status-view-summary ()
+  "Pops up an 'occur' summary of the changed files."
+  (interactive)
+  (occur "[\t* ]+\\(Deleted\\|Modified\\|Unknown\\|Added\\|Staged\\)")
+  (message "Move with 'next-error and 'previous-error"))
+
+;;-----------------------------------------------------------------------------
+;; Operations on single files.
+;;-----------------------------------------------------------------------------
+
+(defsubst git--status-view-select-filename ()
+  "Return the filename of the current status view item."
+  (let ((filename (git--fileinfo->name (ewoc-data (ewoc-locate git--status-view)))))
+    (when (file-directory-p filename)
+      (error "Not a file"))
+    filename))
+
+(defsubst git--status-view-select-type ()
+  "Return the type of the current view item."
+  (git--fileinfo->type (ewoc-data (ewoc-locate git--status-view))))
+
+(defun git--status-view-view-file ()
+  "View the selected file."
+  (interactive)
+  (view-file (git--status-view-select-filename)))
+
+(defun git--status-view-open-file ()
+  "Open the selected file."
+  (interactive)
+  (find-file (git--status-view-select-filename)))
+
+(defun git--status-view-descend-submodule ()
+  "Opens a status view on the selected submodule."
+  (let ((submodule-dir (git--fileinfo->name
+                        (ewoc-data (ewoc-locate git--status-view)))))
+    (git-status submodule-dir)
+    (message "Viewing submodule \"%s\", close buffer to return"
+             submodule-dir)))
+
+(defun git--status-view-resolve-merge ()
+  "Resolve merge conflicts in the currently selected file (must be unmerged)."
+  (interactive)
+  (let ((file (git--status-view-select-filename)))
+    (if (eq 'unmerged (git--status-file file))
+        (progn
+          (find-file (git--status-view-select-filename))
+          (git--resolve-merge-buffer))
+      (error "File is not unmerged"))))
+
+(defun git--status-view-open-or-expand ()
+  "Open or expands the current file / directory / submodule."
+  (interactive)
+  (case (git--status-view-select-type)
+    ('tree (git--status-view-expand-tree-toggle))
+    ('blob (git--status-view-open-file))
+    ('commit (git--status-view-descend-submodule))
+    (t (error "Not supported type"))))
+
+(defun git--status-view-blame ()
+  "Open the current file and enable blame mode."
+  (interactive)
+  (when (eq (git--status-view-select-type) 'blob)
+    (find-file (git--status-view-select-filename))
+    (git-blame-mode t)))
+
+;;-----------------------------------------------------------------------------
+;; status view for all marked files or selected
+;;-----------------------------------------------------------------------------
+
+(defsubst git--status-view-marked-files ()
+  "Return a list of the marked files. Usually,
+`git--status-view-marked-or-file' is what you want instead."
+  (let (files)
+    (ewoc-collect git--status-view
+                  #'(lambda (node)
+                      (when (git--fileinfo->marked node)
+                        (push (git--fileinfo->name node) files))))
+    files))
+
+(defsubst git--status-view-marked-or-file ()
+  "Return a list of the marked files, or if none, the file on the
+current line. You can think of this as the \"selected files\"."
+  (let ((files (git--status-view-marked-files)))
+    (when (null files)
+      (setq files (list (git--status-view-select-filename))))
+    files))
+
+(defun git--status-view-rm ()
+  "Delete the selected files."
+  (interactive)
+  (let* ((files (git--status-view-marked-or-file))
+         ;; We can't afford to use stale fileinfos here, the warnings
+         ;; are crucial.
+         (fresh-fileinfos (append (apply #'git--status-index files)
+                                  (apply #'git--ls-files "-o" "--" files)))
+         (untracked-files nil) (pending-files nil))
+    (dolist (fi fresh-fileinfos)
+      (let ((stat (git--fileinfo->stat fi)) (name (git--fileinfo->name fi)))
+        (if (member stat '(unknown ignored)) ;although ignored aren't really vis
+            (push name untracked-files)
+          (unless (eq stat 'uptodate) (push name pending-files)))))
+    ;; We really have to be careful about this -- elaborate warning message
+    (let* ((untracked-warn (git--bold-face "untracked"))
+           (pending-warn (concat "with " (git--bold-face "pending changes")))
+           (status-warning
+            (cond
+             ((eq (length files) (length untracked-files)) untracked-warn)
+             ((eq (length files) (length pending-files)) pending-warn)
+             (t (git--join
+                 (delq nil
+                       (list (when untracked-files
+                               (format "%d %s"
+                                       (length untracked-files) untracked-warn))
+                             (when pending-files
+                               (format "%d %s"
+                                       (length pending-files) pending-warn))))
+                 ", "))))
+           (status-warning-include (if (> (length status-warning) 0)
+                                      (format " (%s)" status-warning)
+                                     ""))
+           (msg (if (eq 1 (length files))
+                    (format "%s%s" (first files) status-warning-include)
+                  (format "%s files%s" (length files) status-warning-include))))
+      (unless (y-or-n-p (format "Really %s %s? "
+                                (git--bold-face "delete")
+                                msg))
+        (error "Aborted deletion"))
+
+      ;; do git rm -f on all the tracked files
+      (let ((tracked-files
+             (delq nil (mapcar #'(lambda(file)
+                                   (unless (member file untracked-files) file))
+                               files)))
+            (num-deleted 0))
+        (when tracked-files
+          (apply #'git--exec-string "rm" "-f" "--" tracked-files))
+        (incf num-deleted (length tracked-files))
+        ;; Remove other files directly
+        (unwind-protect
+            (dolist (file untracked-files)
+              (delete-file file)
+              (incf num-deleted))
+          (message "Deleted %d files" num-deleted)))))
+                                        
+  (revert-buffer))
+
+(defun git--status-view-rename ()
+  "Rename the selected file(s)."
+  (interactive)
+  (let ((files (git--status-view-marked-or-file)))
+    (dolist (src files)
+      (let ((msg (format "%s '%s' to >> " (git--bold-face "Rename") src)))
+        (git--mv src (file-relative-name (read-from-minibuffer msg src))))))
+  (revert-buffer))
+  
+(defun git--status-view-add ()
+  "Add the selected file(s) to the index."
+  (interactive)
+  (git--add (git--status-view-marked-or-file))
+  (revert-buffer))
+
+(defun git--status-view-add-ignore ()
+  "Add the selected file(s) to .gitignore"
+  (interactive)
+  (let ((files (git--status-view-marked-or-file)))
+    (dolist (file files)
+      (git-ignore file)))
+  (revert-buffer))
+
+;;-----------------------------------------------------------------------------
+
+(provide 'git-status)
diff --git a/site/jdee/java/lib/LICENSE.apache b/site/jdee/java/lib/LICENSE.apache
new file mode 100644
index 0000000..1c4b4d4
--- /dev/null
+++ b/site/jdee/java/lib/LICENSE.apache
@@ -0,0 +1,60 @@
+/*
+ * $Header: /cvsroot/checkstyle/checkstyle/LICENSE.apache,v 1.2 2002/02/04 12:40:53 oburn Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/04 12:40:53 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Jakarta-Regexp", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
diff --git a/site/jdee/java/lib/LICENSE.checkstyle b/site/jdee/java/lib/LICENSE.checkstyle
new file mode 100644
index 0000000..cbee875
--- /dev/null
+++ b/site/jdee/java/lib/LICENSE.checkstyle
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/site/jdee/java/lib/RIGHTS.antlr b/site/jdee/java/lib/RIGHTS.antlr
new file mode 100644
index 0000000..c5a0120
--- /dev/null
+++ b/site/jdee/java/lib/RIGHTS.antlr
@@ -0,0 +1,32 @@
+
+SOFTWARE RIGHTS
+$Id: RIGHTS.antlr,v 1.1 2001/06/22 13:11:01 oburn Exp $
+
+ANTLR 1989-2000 Developed by jGuru.com (MageLang Institute), 
+http://www.ANTLR.org  and http://www.jGuru.com
+
+We reserve no legal rights to the ANTLR--it is fully in the
+public domain. An individual or company may do whatever
+they wish with source code distributed with ANTLR or the
+code generated by ANTLR, including the incorporation of
+ANTLR, or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However,
+we do ask that credit is given to us for developing
+ANTLR. By "credit", we mean that if you use ANTLR or
+incorporate any source code into one of your programs
+(commercial product, research project, or otherwise) that
+you acknowledge this fact somewhere in the documentation,
+research report, etc... If you like ANTLR and have
+developed a nice tool with the output, please mention that
+you developed it using ANTLR. In addition, we ask that the
+headers remain intact in our source code. As long as these
+guidelines are kept, we expect to continue enhancing this
+system and expect to make other tools available as they are
+completed.
+
+The primary ANTLR guy:
+
+Terence Parr
+http://www.jGuru.com
+parrt@jguru.com
diff --git a/site/jdee/java/lib/bsh.jar b/site/jdee/java/lib/bsh.jar
new file mode 100644
index 0000000..36fe03d
Binary files /dev/null and b/site/jdee/java/lib/bsh.jar differ
diff --git a/site/jdee/java/lib/checkstyle-all.jar b/site/jdee/java/lib/checkstyle-all.jar
new file mode 100644
index 0000000..373027f
Binary files /dev/null and b/site/jdee/java/lib/checkstyle-all.jar differ
diff --git a/site/jdee/java/lib/jde.jar b/site/jdee/java/lib/jde.jar
new file mode 100644
index 0000000..37759bb
Binary files /dev/null and b/site/jdee/java/lib/jde.jar differ
diff --git a/site/jdee/java/lib/junit.jar b/site/jdee/java/lib/junit.jar
new file mode 100644
index 0000000..674d71e
Binary files /dev/null and b/site/jdee/java/lib/junit.jar differ
diff --git a/site/jdee/java/lib/sun_checks.xml b/site/jdee/java/lib/sun_checks.xml
new file mode 100644
index 0000000..6ff3e50
--- /dev/null
+++ b/site/jdee/java/lib/sun_checks.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!--
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+
+    <module name="TreeWalker">
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+
+        <!-- Checks for Headers  -->                           
+        <!-- See http://checkstyle.sf.net/config_header.html -->
+        <!--  <module name="Header"> -->
+            <!-- The follow property value demonstrates the ability     -->
+            <!-- to have access to ANT properties. In this case it uses -->
+            <!-- the ${basedir} property to allow Checkstyle to be run  -->
+            <!-- from any directory within a project.                   -->
+            <!--   <property name="headerFile" value="${basedir}/java.header"/> -->         
+        <!--  </module> -->
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="FileLength"/>
+        <module name="LineLength"/>
+        <module name="MethodLength"/>
+        <module name="ParameterNumber"/>
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad">
+        <property name="option" value="nospace"/>
+        </module>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces"/>
+        <module name="RightCurly"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="AvoidInlineConditionals"/>
+        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField"/>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="DesignForExtension"/>
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier"/>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="FinalParameters"/>
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>
diff --git a/site/jdee/lisp/beanshell.el b/site/jdee/lisp/beanshell.el
new file mode 100644
index 0000000..e0928f9
--- /dev/null
+++ b/site/jdee/lisp/beanshell.el
@@ -0,0 +1,941 @@
+;;; beanshell.el
+;; $Id: beanshell.el 175 2009-12-24 02:59:33Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This package is intended to serve as an interface between Emacs and
+;; Pat Neimeyer's BeanShell, a Java source code interpreter (see
+;; http://www.beanshell.org/).
+
+;; This package is intended to serve both interactive users and Emacs
+;; applications that want to use Java as an extension language for
+;; Emacs. To facilitate this dual usage, this package implements the
+;; BeanShell interface as an eieio class named bsh. This class is
+;; intended to serve as a base class for classes tailored to specific
+;; applications. This class defines the following methods:
+;;
+;; bsh               Constructs an instance of the bsh class.
+;; bsh-launch        Launches the BeanShell and creates an Emacs buffer
+;;                   for interacting with the BeanShell.
+;; bsh-eval          Sends a Java expression to the BeanShell for evaluation and
+;;                   waits for a response.
+;; bsh-eval-r        Sends a Java expression to the BeanShell for evaluation
+;;                   and then evaluates the resulting BeanShell output
+;;                   as a Lisp expression.
+;; bsh-async-eval    Sends a Java expression to the BeanShell for evaluation
+;;                   and sets a listener to evaluate the response as a Lisp
+;;                   expression
+;;
+;; bsh-eval and bsh-eval-r synchronous functions. After sending a Java
+;; expression to the BeanShell, they suspend Emacs until the BeanShell
+;; responds. bsh-async-eval does not suspend Emacs. It does, however,
+;; set a listener that evaluates any responses from the BeanShell as
+;; Lisp expressions.
+;;
+;; See bsh-demo-eval for an example of how to use bsh-async-eval to evaluate a
+;; Java expression.
+
+;;
+;; The bsh class also defines fields that specify the path of the
+;; BeanShell jar file, the Java vm used to run the BeanShell, a
+;; startup classpath and directory, vm arguments, etc. Emacs package
+;; developers can easily extend this base class to tailor the BeanShell
+;; to specific applications.
+;; This package provides one such derived class named
+;; bsh-standalone-bsh.  This is a BeanShell implementation intended
+;; for use by interactive users.
+
+;; To use the standalone BeanShell, download the BeanShell jar file
+;; from http://www.beanshell.org/ and install it on your system.
+;; Set bsh-jar to the path of the BeanShell jar. Set bsh-vm to
+;; the path of a Java vm on your system (this is necessary only
+;; if the java vm is not on your system's command path). Execute
+;; M-x bsh to start the BeanShell. To terminate the BeanShell,
+;; execute M-x bsh-exit.
+;;
+
+(require 'eieio)
+(require 'comint)
+(require 'lmenu)
+
+(declare-function jde-find-jde-doc-directory "jde" nil)
+
+(defgroup bsh nil
+  "Customizations for the Emacs inteface to Pat Neimeyer's Java
+interpreter, the Beanshell."
+  :group 'tools
+  :prefix "bsh-")
+
+(defcustom bsh-jar "bsh.jar"
+  "Path to the jar file containing the BeanShell classes."
+  :group 'bsh
+  :type 'file)
+
+;; (makunbound 'bsh-vm)
+(defcustom bsh-vm nil
+  "Java vm to be used to run the standalone BeanShell. By default,
+bsh uses the first vm that it finds on the Emacs
+`exec-path' (usually the same as your system's command
+path). To specify a vm, select Path and enter the
+path to the vm. "
+  :group 'bsh
+  :type '(choice
+	  (const :tag "Default" :value nil)
+	  (file :tag "Path")))
+
+(defcustom bsh-classpath nil
+  "Startup classpath for the BeanShell."
+  :group 'bsh
+  :type '(repeat (file :tag "Path")))
+
+;; (makunbound 'bsh-startup-timeout)
+(defcustom bsh-startup-timeout 10
+  "*Length of time Emacs waits for the Beanshell to startup.
+Increase the value of this variable if you get Lisp errors on
+BeanShell startup on Unix. Setting this value on some versions of
+XEmacs, e.g., Windows, seems to cause premature timeouts.  If you keep
+getting timeout errors no matter how large a value you set, try
+setting this variable to no timeout (nil)."
+  :group 'bsh
+  :type '(choice (const :tag "No timeout" :value nil)
+		 (number :tag "Length")))
+
+;; (makunbound 'bsh-eval-timeout)
+(defcustom bsh-eval-timeout 30
+  "*Length of time in seconds Emacs waits for the Beanshell to
+evaluate a Java expression before giving up and signaling an
+error. Setting this value on some versions of XEmacs, e.g., Windows,
+seems to cause premature timeouts. If you keep getting timeout errors
+no matter how large a value you set, try setting this variable to no
+timeout (nil)."
+  :group 'bsh
+  :type '(choice (const :tag "No timeout" :value nil)
+		 (number :tag "Length")))
+
+(defcustom bsh-vm-args nil
+  "*Specify arguments to be passed to the Java vm.
+This option allows you to specify one or more arguments to be passed
+to the Java vm that runs the BeanShell. Note that the value of this
+variable should be a list of strings, each of which represents an
+argument. When customizing this variable, use a separate text field
+for each argument."
+  :group 'bsh
+  :type '(repeat (string :tag "Argument")))
+
+(defcustom bsh-startup-directory ""
+  "Path of directory in which to start the beanshell.
+The path may start with a tilde (~) indication your
+home directory and may include environment variables.
+If this variable is the null string (the default),
+the beanshell starts in the directory of the current
+buffer."
+  :group 'bsh
+  :type 'directory)
+
+(defvar bsh-the-bsh nil
+  "The BeanShell instance associated with the current BeanShell buffer.")
+(make-variable-buffer-local 'bsh-the-bsh)
+
+(defclass bsh-buffer ()
+  ((buffer-name   :initarg :buffer-name
+		  :initform "*bsh*"
+		  :type string
+		  :documentation
+		  "Name of buffer used to interact with BeanShell process.")
+   (buffer        :initarg :buffer
+		  :type buffer
+		  :documentation
+		  "Buffer used to interact with BeanShell process.")
+
+   (process       :initarg :process
+		  :documentation
+		  "Beanshell process.")
+
+   (filter        :initarg :filter
+		  :type function
+		  :documentation
+		  "Function used to propcess buffer output."))
+  "Buffer that displays BeanShell output.")
+
+
+(defmethod initialize-instance ((this bsh-buffer) &rest fields)
+  "Constructor for BeanShell buffer instance."
+  (call-next-method)
+
+  (oset this buffer (get-buffer-create (oref this buffer-name))))
+
+(defmethod bsh-buffer-live-p ((this bsh-buffer))
+  "Return t if this buffer has not been killed."
+  (buffer-live-p (oref this buffer)))
+
+(defmethod bsh-buffer-display ((this bsh-buffer))
+  "Display this buffer."
+  (pop-to-buffer (oref this buffer-name)))
+
+
+(defclass bsh-comint-buffer (bsh-buffer)
+  ()
+  "BeanShell buffer that runs in `comint-mode'.")
+
+(defmethod initialize-instance ((this bsh-comint-buffer) &rest fields)
+  "Constructor for BeanShell buffer instance."
+  (call-next-method)
+  (with-current-buffer (oref this buffer)
+    (comint-mode)
+    (setq comint-prompt-regexp "bsh % ")))
+
+(defmethod bsh-comint-buffer-exec ((this bsh-comint-buffer) vm vm-args)
+  (let ((win32-start-process-show-window t)
+	(w32-start-process-show-window t)
+	(w32-quote-process-args ?\")   ;; Emacs
+	(win32-quote-process-args ?\") ;; XEmacs
+	(windowed-process-io t)
+	(process-connection-type nil)
+	;; XEmacs addition
+	(coding-system-for-read
+	 (if (or (member system-type '(cygwin32 cygwin))
+		 (eq system-type 'windows-nt))
+	     'raw-text-dos)))
+    (comint-exec (oref this buffer) "bsh"  vm  nil vm-args))
+
+  (oset this process (get-buffer-process (oref this buffer)))
+  (oset this filter (process-filter (oref this process)))
+
+  ;; moved to `process-query-on-exit-flag' per compile warning hint: 
+  ;; `process-kill-without-query' is an obsolete function (as of Emacs 22.1);
+  ;; use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'.
+  ;;
+  ;;(process-kill-without-query (oref this process))
+  (set-process-query-on-exit-flag (oref this process) nil)
+
+  (if (eq system-type 'windows-nt)
+      (accept-process-output (oref this process) bsh-startup-timeout 0)
+    (while (accept-process-output (oref this process) bsh-startup-timeout 0))))
+
+
+(defclass bsh-compilation-buffer (bsh-buffer)
+  ()
+  "Implements a `compilation-mode' buffer for BeanShell output.")
+
+(defmethod initialize-instance ((this bsh-compilation-buffer) &rest fields)
+  "Constructor for BeanShell compilation buffer instance."
+
+  (bsh-compilation-buffer-create-native-buffer this)
+
+  (oset
+   this
+   filter
+   (lexical-let ((this-buf this))
+     (lambda (process output)
+       (bsh-compilation-buffer-filter this-buf process output))))
+
+  ;; This buffer does not have its own process.
+  (oset this process nil)
+  (bsh-compilation-buffer-set-mode this))
+
+(defmethod bsh-compilation-buffer-create-native-buffer ((this bsh-compilation-buffer))
+  "Creates the native Emacs buffer encapsulated by this eieio object."
+  (oset this buffer-name "*bsh compilation*")
+  (oset this buffer (get-buffer-create (oref this buffer-name))))
+
+(defmethod bsh-compilation-buffer-set-mode ((this bsh-compilation-buffer))
+  "Define buffer mode."
+  (let ((thisdir default-directory))
+    (with-current-buffer (oref this buffer)
+      (let ((buf (oref this buffer))
+	    ;; Some or all of these variables may not be defined by
+	    ;; the various versions of compile.el shipped with Emacs
+	    ;; and XEmacs.
+	    (error-regexp-alist
+	     (if (boundp  'compilation-error-regexp-alist)
+		 compilation-error-regexp-alist))
+	    (enter-regexp-alist
+	     (if (boundp 'compilation-enter-directory-regexp-alist)
+		 compilation-enter-directory-regexp-alist))
+	    (leave-regexp-alist
+	     (if (boundp 'compilation-leave-directory-regexp-alist)
+		 compilation-leave-directory-regexp-alist))
+	    (file-regexp-alist
+	     (if (boundp 'compilation-file-regexp-alist)
+		 compilation-file-regexp-alist))
+	    (nomessage-regexp-alist
+	     (if (boundp 'compilation-nomessage-regexp-alist)
+		 compilation-nomessage-regexp-alist))
+	    (parser
+	     (if (boundp 'compilation-parse-errors-function)
+		 compilation-parse-errors-function))
+	    (error-message "No further errors"))
+
+	;; In case the compilation buffer is current, make sure we get the
+	;; global values of compilation-error-regexp-alist, etc.
+	(kill-all-local-variables)
+
+	;; Clear out the compilation buffer and make it writable.
+	(setq buffer-read-only nil)
+	(buffer-disable-undo (current-buffer))
+	(erase-buffer)
+	(buffer-enable-undo (current-buffer))
+
+	(compilation-mode)
+	(setq buffer-read-only nil)
+
+	(if (boundp 'compilation-parse-errors-function)
+	    (set (make-local-variable 'compilation-parse-errors-function) parser))
+	(if (boundp 'compilation-error-message)
+	    (set (make-local-variable 'compilation-error-message) error-message))
+	(set (make-local-variable 'compilation-error-regexp-alist)
+	     error-regexp-alist)
+
+	(when (not (featurep 'xemacs))
+	  (dolist (elt `((compilation-enter-directory-regexp-alist
+			  ,enter-regexp-alist)
+			 (compilation-leave-directory-regexp-alist
+			  ,leave-regexp-alist)
+			 (compilation-file-regexp-alist
+			  ,file-regexp-alist)
+			 (compilation-nomessage-regexp-alist
+			  ,nomessage-regexp-alist)))
+	    (if (boundp (car elt))
+		(set (make-local-variable (car elt)) (second elt)))))
+
+	(setq default-directory thisdir)
+	(if (boundp 'compilation-directory-stack)
+	    (setq compilation-directory-stack (list default-directory)))))))
+
+(defmethod bsh-compilation-buffer-filter ((this bsh-compilation-buffer) proc string)
+  "This filter prints out the result of the process without buffering.
+The result is inserted as it comes in the compilation buffer."
+  (with-current-buffer (oref this buffer)
+    (let ((end-of-result (string-match ".*bsh % " string))
+	  (win (get-buffer-window (oref this buffer)))
+	  output len (status " "))
+      (save-excursion
+	;;Insert the text, advancing the process marker
+	(goto-char (point-max))
+	(if end-of-result
+	    (progn
+	      (setq output (substring string 0 end-of-result))
+	      (set-buffer-modified-p nil)
+
+	      ;;Searching backwards for the status code
+	      (while (member status '(" " "\r" "\n"))
+		(setq len (length output))
+		(if (not (= len 0))
+		    (progn
+		      (setq status (substring output (- len 1)))
+		      (setq output (substring output 0 (- len 1))))
+		  (progn
+		    (setq status (buffer-substring (- (point-max) 1)
+						   (point-max)))
+		    (delete-region (- (point-max) 1) (point-max)))))
+
+	      (insert output)
+	      (compilation-handle-exit
+	       'exit (string-to-number status)
+	       (if (string= "0" status)
+		   "finished\n"
+		 (format "exited abnormally with code %s\n"
+			 status))))
+	  (insert string)))
+      (if (not (featurep 'xemacs))
+	  (if compilation-scroll-output
+	      (save-selected-window
+		(if win
+		    (progn
+		      (select-window win)
+		      (goto-char (point-max))))
+		(sit-for 0)))))))
+
+
+
+(defclass bsh ()
+  ((buffer        :initarg :buffer
+		  :type bsh-comint-buffer
+		  :documentation
+		  "Buffer used to interact with BeanShell process.")
+
+
+   (eval-buffer   :initarg :eval-buffer
+		  :type (or null bsh-buffer)
+		  :initform nil
+		  :documentation
+		  "Buffer used to display evaluation result.")
+
+   (eval-filter   :initarg :eval-filter
+		  :type function
+		  :documentation
+		  "Function used to capture Lisp output from the BeanShell.")
+
+   (async-filter  :initarg :async-filter
+		  :type function
+		  :documentation
+		  "Function used to capture and evaluate BeanShell Lisp output.")
+
+   (redir-filter  :initarg :redir-filter
+		  :type function
+		  :documentation
+		  "Redirects BeanShell output to eval-buffer.")
+
+   (java-expr     :initarg :java-expr
+		  :initform ""
+		  :type string
+		  :documentation
+		  "Last Java expression evaluated in the BeanShell.")
+
+   (lisp-output   :initarg :lisp-output
+		  :initform ""
+		  :type string
+		  :documentation
+		  "Lisp output from the BeanShell.")
+
+   (vm            :initarg :vm
+		  :initform "java"
+		  :type string
+		  :documentation
+		  "Path of Java vm used to run the BeanShell.")
+
+   (vm-args       :initarg :vm-args
+		  :initform nil
+		  :type list
+		  :documentation
+		  "List of arguments to be passed to the Beanshell vm.")
+
+   (startup-dir   :initarg :startup-dir
+		  :initform ""
+		  :type string
+		  :documentation
+		  "Directory in which to start the BeanShell")
+
+   (cp            :initarg :cp
+		  :type list
+		  :documentation
+		  "Startup classpath for BeanShell")
+
+   (jar           :initarg :jar
+		  :initform "bsh.jar"
+		  :type string
+		  :documentation
+		  "Path of the BeanShell jar file.")
+
+   (class-name    :initarg :class-name
+		  :initform "bsh.Interpreter"
+		  :type string
+		  :documentation
+		  "Name of BeanShell class.")
+
+   (separate-error-buffer :initarg :separate-error-buffer
+			  :initform nil
+			  :type boolean
+			  :documentation
+			  "Whether or not to use a separate error buffer."))
+"Defines an instance of a BeanShell process.")
+
+(defmethod initialize-instance ((this bsh) &rest fields)
+  "Constructor for BeanShell instance."
+
+  (call-next-method)
+
+  (bsh-create-buffer this)
+
+  (lexical-let ((this-bsh this))
+    ;; Filter for synchronous evaluations.
+    (oset
+     this eval-filter
+     (lambda (process output)
+       (with-current-buffer (process-buffer process)
+	 (bsh-snag-lisp-output this-bsh process output))))
+
+    ;; Filter for asynchronous Java statement evaluations.
+    (oset
+     this async-filter
+     (lambda (process output)
+       (with-current-buffer (process-buffer process)
+	 (bsh-snag-and-eval-lisp-output this-bsh process output))))
+
+    ;; Filter for redirecting result of evaluating an expression to the
+    ;; buffer specified by eval-buffer. This is typically used to
+    ;; redirect compiler like output to a compilation-mode buffer.
+    (oset
+     this redir-filter
+     (lambda (process output)
+       (with-current-buffer (process-buffer process)
+	 (bsh-redirect-eval-output this-bsh process output))))))
+
+(defmethod bsh-create-buffer ((this bsh))
+  "Creates the buffer used by this beanshell instance."
+    (oset this buffer (bsh-comint-buffer "bsh main buffer")))
+
+
+(defmethod bsh-build-classpath-argument ((this bsh))
+  "Convert the list of classes specified by the cp slot
+to the string form required by the vm."
+  (mapconcat
+   'identity
+   (append
+    (and (slot-boundp this 'cp) (oref this cp))
+    (list (oref this jar)))
+   path-separator))
+
+(defmethod bsh-running-p ((this bsh))
+  "Return t if this instance of a BeanShell is running; otherwise nil"
+  (let* ((buffer (oref this buffer))
+	 (process
+	  (if (slot-boundp buffer  'process)
+	      (oref buffer process))))
+    (and
+     process
+     (processp process)
+     (eq (process-status process) 'run))))
+
+(defmethod bsh-get-process ((this bsh))
+  "Return the Lisp object representing the Beanshell process."
+  (if (bsh-running-p this)
+      (oref (oref this buffer) process)))
+
+(defmethod bsh-launch ((this bsh) &optional display-buffer)
+
+  (assert
+   (or (file-exists-p (oref this vm))
+       (executable-find (oref this vm)))
+   nil "Specified vm does not exist: %s" (oref this vm))
+
+  (assert
+   (file-exists-p (oref this jar))
+   nil
+   "Specified BeanShell jar filed does not exist: %s" (oref this jar))
+
+
+  (if (not (bsh-running-p this))
+      (let*  ((dir
+		 (cond
+		  ((not (string= (oref this startup-dir) ""))
+		   (expand-file-name (oref this startup-dir)))
+		  ((buffer-file-name)
+		   (file-name-directory (buffer-file-name)))
+		  (t
+		   default-directory)))
+		(vm-args (list "-classpath" (bsh-build-classpath-argument this)))
+		(buffer
+		 (let ((buf (oref this buffer)))
+		   (if (bsh-buffer-live-p buf)
+		       buf
+		     (bsh-create-buffer this))))
+		(native-buff (oref buffer buffer)))
+
+
+	  (setq vm-args (append vm-args (oref this vm-args)))
+	  (setq vm-args (append vm-args bsh-vm-args))
+	  (setq vm-args (append vm-args (list (oref this class-name))))
+
+	  (with-current-buffer native-buff
+	    (erase-buffer)
+
+	    (cd dir)
+	    (insert (concat "cd " dir "\n"))
+	    (insert
+	     (concat (oref this vm) " "
+		     (mapconcat (lambda (x) x) vm-args " ") "\n\n"))
+
+	    (setq bsh-the-bsh this))
+
+	  (message "%s" "Starting the BeanShell. Please wait...")
+	  (bsh-comint-buffer-exec buffer (oref this vm) vm-args)
+
+	  (if display-buffer
+	      (bsh-buffer-display buffer)))
+    (when display-buffer
+      (message "The BeanShell is already running.")
+      (bsh-buffer-display (oref this buffer)))))
+
+(defmethod bsh-snag-lisp-output ((this bsh) process output)
+  "Assemble Lisp OUTPUT from the BeanShell."
+    (let ((end-of-output (string-match ".*bsh % " output)))
+      ;; Check for case
+      ;;   %bsh\n...eval output...%bsh\n
+      ;; This can happen because the beanshell outputs two or more
+      ;; prompts after evaluating some expressions.
+      ;; Thanks to Stephane Nicolas.
+      ;; (if (eq end-of-result 0)
+      ;; (accept-process-output process 0 5))
+      (if end-of-output
+	(oset
+	 this
+	 lisp-output
+	 (concat (oref this lisp-output) (substring output 0 end-of-output)))
+	(oset this lisp-output (concat (oref this lisp-output) output))
+	(accept-process-output process bsh-eval-timeout 5))))
+
+(defmethod bsh-detect-java-eval-error ((this bsh) bsh-output)
+  (if (string-match "// Error:" bsh-output)
+      (if (oref this separate-error-buffer)
+	  (save-excursion
+	    (set-buffer (get-buffer-create "*Beanshell Error*"))
+	    (erase-buffer)
+	    (insert (format "Expression: %s" (oref this java-expr)))
+	    (newline)
+	    (insert (format "Error: %s" bsh-output))
+	    (goto-char (point-min))
+	    (display-buffer (current-buffer))
+	    (error "Beanshell eval error."))
+	(message
+	 "Beanshell expression evaluation error.\n  Expression: %s\n  Error: %s"
+	 (oref this java-expr) bsh-output)
+	(error "Beanshell eval error. See messages buffer for details."))))
+
+(defmethod bsh-eval-lisp-output ((this bsh))
+  (if (not (string= (oref this lisp-output) ""))
+      (flet ((format-error-msg (error-symbols)
+	       (mapconcat (lambda (s) (symbol-name s)) error-symbols " ")))
+	(condition-case eval-error
+	    (eval (read (oref this lisp-output)))
+	  (error
+	    (message "Error evaluating Lisp result of Java expression evaluation.")
+	    (message "  Java expression: %s." (oref this java-expr))
+	    (message "  Java evaluation result: %s." (oref this lisp-output))
+	    ;; The following causes an unreadable object error on XEmacs when
+	    ;; trying to load the byte-compiled file:
+	    ;;
+	    ;; (message "  Error from evaluating result as Lisp: %s"
+	    ;;	  (mapconcat (lambda (s) (symbol-name s)) eval-error " ")
+	    (message "  Error from evaluating result as Lisp: %s"
+		     (format-error-msg eval-error))
+	    (error "Error evaluating Java expresson. See *Messages* buffer."))))
+    (progn
+      (message "bsh-eval-r error: Beanshell result is null. Cannot evaluate.")
+      (message "  Expression: %s" (oref this java-expr)))))
+
+(defmethod bsh-snag-and-eval-lisp-output ((this bsh) process output)
+  "Assemble and parse Lisp OUTPUT from the BeanShell PROCESS."
+  (bsh-snag-lisp-output this process output)
+  (bsh-detect-java-eval-error this output)
+  (bsh-eval-lisp-output this))
+
+
+(defmethod bsh-redirect-eval-output ((this bsh) process output)
+  (let ((eval-buffer (oref this eval-buffer)))
+    (assert eval-buffer)
+    (funcall (oref eval-buffer filter) process output)
+    ;; Restore the Beanshell's standard output filter when
+    ;; the Beanshell prompt reappears.
+    (if (string-match ".*bsh % " output)
+       (progn
+	(set-process-filter process (oref (oref this buffer) filter))
+	 (oset this eval-buffer nil)))))
+
+(defmethod bsh-eval ((this bsh) expr &optional eval-return)
+  "Uses the BeanShell Java interpreter to evaluate the Java expression
+EXPR.  This function returns any text output by the Java interpreter's
+standard out or standard error pipes.  If EVAL-RETURN is non-nil, this
+function returns the result of evaluating the Java output as a Lisp
+expression."
+
+  (unless (bsh-running-p this)
+    (bsh-launch this))
+
+  (when (bsh-running-p this)
+    (oset this java-expr expr)
+    (oset this lisp-output "")
+    (set-process-filter (oref (oref this buffer) process) (oref this eval-filter))
+    ;; (message "Evaluating: %s" expr)
+    (process-send-string (oref (oref this buffer) process) (concat expr "\n"))
+
+    (if (not (accept-process-output (oref (oref this buffer) process) bsh-eval-timeout))
+	(progn
+	  (set-process-filter (oref (oref this buffer) process) (oref (oref this buffer) filter))
+	  (error "No reply from BeanShell")))
+
+    (set-process-filter (oref (oref this buffer) process) (oref (oref this buffer) filter))
+
+    (bsh-detect-java-eval-error this (oref this lisp-output))
+    ;; (if eval-return (message "Evaluating reply: %s" (oref this lisp-output)))
+    (if eval-return
+	(bsh-eval-lisp-output this)
+      (oref this lisp-output))))
+
+(defmethod bsh-eval-r ((this bsh) java-statement)
+  "Convenience method for evaluating Java statements
+that return Lisp expressions as output. This function
+invokes bsh-eval with the evaluate-return option set to
+t."
+  (bsh-eval this java-statement t))
+
+(defmethod bsh-async-eval ((this bsh) expr)
+  "Send the Java statement EXPR to the BeanShell for
+evaluation. Do not wait for a response."
+  (unless (bsh-running-p this)
+    (bsh-launch this))
+
+  (oset this lisp-output "")
+  (oset this java-expr expr)
+  (set-process-filter (oref (oref this buffer) process) (oref this async-filter))
+
+  (when (bsh-running-p this)
+    (process-send-string (oref (oref this buffer) process) (concat expr "\n"))))
+
+(defmethod bsh-buffer-eval ((this bsh) expr buffer)
+  "Evaluate EXPR and displays its output in BUFFER. BUFFER
+must be an instance of `bsh-buffer' class. A typical use for this
+method is to invoke a Java application whose output is compiler-like,
+e.g., javac, ant, or checkstyle. In this case, BUFFER would be
+an instance of a subclass of `bsh-compiler-buffer'."
+  (assert (typep expr 'string))
+  (assert (typep buffer 'bsh-buffer))
+  (unless (bsh-running-p this)
+    (bsh-launch this))
+  (let* ((comint-buffer (oref this buffer))
+	 (bsh-process (oref comint-buffer process)))
+    (oset this eval-buffer buffer)
+    (set-process-filter bsh-process (oref this redir-filter))
+    (process-send-string bsh-process expr)))
+
+(defmethod bsh-kill-process ((this bsh))
+  "Terminates the BeanShell process."
+  (process-send-string  (oref (oref this buffer) process) "exit();\n"))
+
+(defun get-bsh(buffer-name)
+  "Get the `bsh' object associated
+with the buffer named BUFFER-NAME."
+  (let (bsh-object
+	(buffer (get-buffer buffer-name)))
+    (if buffer
+	(save-excursion
+	  (set-buffer buffer)
+	  (setq bsh-object bsh-the-bsh)))
+    bsh-object))
+
+
+(defun bsh-demo-eval ()
+  "This command demonstrates use of the BeanShell to
+execute Java code. It assumes that
+`bsh-jar' points to the location of the BeanShell
+jar file on your system and that either `exec-path'
+or `bsh-vm' point to a Java vm on your system."
+   (interactive)
+
+   (assert
+    (file-exists-p (expand-file-name bsh-jar))
+    nil
+    (concat
+     "Cannot find the BeanShell jar file at "
+     (expand-file-name bsh-jar)
+     ". Type C-h bsh-jar for more info."))
+
+   (if bsh-vm
+       (assert
+	(or
+	 (executable-find bsh-vm)
+	 (file-exists-p bsh-vm))
+	nil
+	"The vm specified by bsh-vm does not exist: %s." bsh-vm)
+     (assert
+      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))
+      nil
+      "Cannot find a Java vm on exec-path."))
+
+
+   (let ((beanshell  (get-bsh "*bsh demo*"))
+	 (demo-script
+	  (concat
+	   "demo() {"
+	     "name = JOptionPane.showInputDialog(\"Enter your name.\");"
+	     "print(\"(message \\\"Your name is \" + name + \"\\\")\");"
+	   "};")
+	 ))
+
+     (if (not beanshell)
+	 (progn
+
+	   ;; Create a BeanShell wrapper object
+	   (setq beanshell (bsh "BeanShell"))
+
+	   (oset (oref beanshell buffer) buffer-name "*bsh demo*")
+
+	   ;; Set the wrapper's jar slot (eieio/CLOS speak for field) to
+	   ;; point to the location of the BeanShell on the user's
+	   ;; system.
+	   (oset beanshell jar (expand-file-name bsh-jar))
+
+	   ;; Set the wrapper's vm slot to point to the location
+	   ;; of a vm on the user's system. The wrapper's launch
+	   ;; method (see below) uses the specified vm to launch
+	   ;; the BeanShell.
+	   (oset
+	    beanshell
+	    vm
+	    (if bsh-vm
+		(or
+		 (executable-find bsh-vm)
+		 bsh-vm)
+	      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))))
+
+     (unless (bsh-running-p beanshell)
+       (bsh-launch beanshell)
+       (bsh-async-eval beanshell demo-script))
+     (bsh-async-eval beanshell "demo();")))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Standalone BeanShell                                                      ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass bsh-standalone-bsh (bsh)
+  ((the-bsh        :type bsh-standalone-bsh
+		   :allocation :class
+		   :documentation
+		   "The single instance of the standalone BeanShell."))
+  "BeanShell intended to be used independently of any other
+Emacs package.")
+
+(defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
+  "Constructor for the standard bsh BeanShell instance."
+  (call-next-method)
+
+  (assert
+   (file-exists-p (expand-file-name bsh-jar))
+   nil
+   (concat
+    "Cannot find the BeanShell jar file at "
+    (expand-file-name bsh-jar)
+    ". Type C-h bsh-jar for more info."))
+
+   (if bsh-vm
+       (assert
+	(or
+	 (executable-find bsh-vm)
+	 (file-exists-p bsh-vm))
+	nil
+	"The vm specified by bsh-vm does not exist: %s." bsh-vm)
+     (assert
+      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))
+      nil
+      "Cannot find a Java vm on exec-path."))
+
+
+  (oset this jar (expand-file-name bsh-jar))
+
+  (oset
+   this
+   vm
+   (if bsh-vm
+       (or
+	(executable-find bsh-vm)
+	bsh-vm)
+     (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
+
+  (oset this cp bsh-classpath)
+
+  (oset this startup-dir bsh-startup-directory))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Beanshell commands                                                        ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun bsh-run()
+  "*Starts the standalone version of the BeanShell, a Java interpreter developed
+by Pat Niemeyer."
+  (interactive)
+  (oset-default 'bsh-standalone-bsh the-bsh (bsh-standalone-bsh "Standalone BeanShell"))
+  (bsh-launch (oref bsh-standalone-bsh the-bsh) t))
+
+(defun bsh-exit ()
+  "Closes the standalone version of the BeanShell."
+  (interactive)
+  (let ((bsh
+	 (if (slot-boundp 'bsh-standalone-bsh 'the-bsh)
+	     (oref 'bsh-standalone-bsh the-bsh))))
+    (if (and bsh (bsh-running-p bsh))
+	(bsh-kill-process bsh)
+      (message "The beanshell is not running"))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Beanshell mode                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-derived-mode
+  bsh-script-mode java-mode "bsh script"
+  "Major mode for developing Beanshell scripts.
+  \\(bsh-script-mode-map)"
+
+  (set (make-local-variable 'font-lock-defaults)
+       (if (featurep 'xemacs)
+	   (get 'java-mode 'font-lock-defaults)
+	 (cdr (assq 'java-mode font-lock-defaults))))
+  (set (make-local-variable 'font-lock-maximum-decoration) t)
+  (set (make-local-variable 'font-lock-multiline) t)
+  (turn-on-font-lock))
+
+(add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode))
+
+;;;###autoload
+(defun bsh-script-help ()
+  "Display BeanShell User's Guide."
+  (interactive)
+  (let* ((jde-dir (jde-find-jde-doc-directory))
+	 (bsh-help
+	  (if jde-dir
+	      (expand-file-name "doc/html/bsh-ug/bsh-ug.html" jde-dir))))
+    (if (and
+	 bsh-help
+	 (file-exists-p bsh-help))
+	(browse-url (concat "file://" bsh-help))
+      (signal 'error '("Cannot find BeanShell help file.")))))
+
+(defcustom bsh-script-menu-definition
+  (list "Bsh"
+	["Help" bsh-script-help t])
+  "Definition of menu for BeanShell script buffers."
+  :group 'bsh
+  :type 'sexp
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  ; Define Bsh script menu for FSF Emacs.
+	  (if (or (not (featurep 'xemacs))
+		  (featurep 'infodock))
+	      (easy-menu-define bsh-script-menu
+				bsh-script-mode-map
+				"Menu for BeanShell Script Buffer."
+				val))
+	  (if (and (featurep 'xemacs)
+		   (eq major-mode 'bsh-script-mode))
+	      (bsh-script-insert-menu-in-xemacs-menubar))))
+
+(defun bsh-script-insert-menu-in-xemacs-menubar ()
+  "Insert BeanShell script menu in the XEmacs menu bar."
+  (if (and
+       (not (featurep 'infodock))
+       (boundp 'c-emacs-features)
+       (not (memq 'infodock c-emacs-features))
+       (boundp 'current-menubar)
+       current-menubar)
+      (if (fboundp 'add-submenu)
+	  (add-submenu nil bsh-script-menu-definition)
+	(add-menu nil "Bsh" (cdr bsh-script-menu-definition)))))
+
+(provide 'beanshell)
+
+;; End of beanshell.el
diff --git a/site/jdee/lisp/beanshell.elc b/site/jdee/lisp/beanshell.elc
new file mode 100644
index 0000000..11bf494
Binary files /dev/null and b/site/jdee/lisp/beanshell.elc differ
diff --git a/site/jdee/lisp/efc.el b/site/jdee/lisp/efc.el
new file mode 100644
index 0000000..b265117
--- /dev/null
+++ b/site/jdee/lisp/efc.el
@@ -0,0 +1,704 @@
+;;; efc.el -- Emacs Foundation Classes
+;; $Id: efc.el 174 2009-12-24 02:46:18Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: lisp, tools, classes
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, US
+;;; Commentary:
+
+;; This package contains a set of eieio-based foundation classes
+;; for Emacs.
+
+;;; Code:
+
+(require 'eieio)
+(require 'wid-edit)
+
+(defcustom efc-query-options-function 'efc-query-options-function-dialog
+  "If non-nil the function to use for interactively querying options.
+If nil then the default efc custom-based dialogs will be used."
+  :type '(choice :tag "Options Query Function"
+		 (const :tag "Dialog" efc-query-options-function-dialog)
+		 (const :tag "Mini-Buffer" efc-query-options-function-minibuf)
+		 (function :tag "Specify Function"
+			   efc-query-options-function-dialog))
+  :group 'jde)
+
+(defun efc-query-options-function-dialog (options prompt title history default)
+  (let ((dialog
+	 (efc-option-dialog
+	  (or title "option dialog")
+	  :text (or prompt "Select option:")
+	  :options options)))
+    (efc-dialog-show dialog)
+    (oref dialog selection)))
+
+(defun efc-query-options-function-minibuf (options prompt title history default)
+  (let (sel)
+    ;; efc doesn't add the end colon
+    (setq prompt (format "%s%s" 
+			 (or prompt "Select option")
+			 (if default
+			     (format " (default %s): " default)
+			   ": ")))
+    (setq sel (completing-read prompt options nil t nil history default))
+    (if (= (length sel) 0) (error "Input required"))
+    sel))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Dialog Class                                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass efc-dialog ()
+  ((title     :initarg :title
+	      :type string
+	      :initform "Dialog"
+	      :documentation
+	      "Title of dialog")
+   (buf       :initarg :buf
+	      :type buffer
+	      :documentation
+	      "Dialog buffer")
+   (initbuf   :initarg :initbuf
+	      :type buffer
+	      :documentation
+	      "Buffer from which dialog was called.")
+   )
+  "Super class of EFC dialogs."
+  )
+
+(defmethod initialize-instance ((this efc-dialog) &rest fields)
+  "Constructor for dialog."
+  ;; Call parent initializer.
+  (call-next-method))
+
+
+(defmethod efc-dialog-create ((this efc-dialog)))
+
+(defmethod efc-dialog-ok ((this efc-dialog))
+  "Invoked when the user clicks the dialog's okay button. The
+default method kills the dialog buffer."
+  (kill-buffer (current-buffer)))
+
+(defmethod efc-dialog-cancel ((this efc-dialog))
+  "Invoked when the user clicks the dialog's Cancel button. The
+default method kills the dialog buffer."
+  (delete-window)
+  (set-buffer (oref this initbuf))
+  (pop-to-buffer (oref this initbuf))
+  (kill-buffer (oref this buf)))
+
+(defmethod efc-dialog-show ((this efc-dialog))
+  (oset this initbuf (current-buffer))
+
+  (oset this buf (get-buffer-create (oref this title)))
+  (set-buffer (oref this buf))
+
+  (efc-dialog-create this)
+
+  (widget-put
+   (widget-create
+    'push-button
+    :notify
+    (lambda (button &rest ignore) (efc-dialog-ok (widget-get button :dialog)))
+    "Ok")
+   :dialog this)
+
+  (widget-insert "  ")
+
+  (widget-put
+   (widget-create
+    'push-button
+    :notify (lambda (button &rest ignore) (efc-dialog-cancel (widget-get button :dialog)))
+    "Cancel")
+   :dialog this)
+
+  (use-local-map widget-keymap)
+  (widget-setup)
+
+  ;; Position cursor over the first choice.
+  (goto-char (point-min))
+  (widget-forward 1)
+
+  (pop-to-buffer (oref this buf)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Option Dialog                                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; silence the compiler warnings
+(defun efc-option-dialog (&rest a))
+
+(defclass efc-option-dialog (efc-dialog)
+  ((options        :initarg :options
+		   :documentation
+		   "Options from from which to choose.")
+   (radio-buttons  :initarg :radio-buttons
+		   :documentation
+		   "Buttons for selecting options.")
+   (text           :initarg :text
+		   :type string
+		   :initform "Select option."
+		   :documentation
+		   "Text to be inserted at top of dialog.")
+   (selection      :initarg :selection
+		   :documentation
+		   "Option chosen by the user."))
+   "This dialog allows a user to choose one of a set of OPTIONS by clicking
+a radio button next to the option. The dialog sets SELECTION to the option
+chosen by the user when the user selects the OK button on the dialog. This
+dialog uses recursive edit to emulate a modal dialog.")
+
+(defmethod initialize-instance ((this efc-option-dialog) &rest fields)
+  "Dialog constructor."
+  (call-next-method))
+
+(defmethod efc-dialog-create ((this efc-option-dialog))
+  (widget-insert (oref this text))
+  (widget-insert "\n\n")
+  (oset this radio-buttons
+	(widget-create
+	 (list
+	  'radio-button-choice
+	  :value (car (oref this options))
+	  :dialog this
+	  :notify (lambda (button &rest ignore)
+		    (efc-dialog-ok (widget-get button :dialog)))
+	  :args (mapcar
+		 (lambda (x) (list 'item x))
+		 (oref this options)))))
+  (widget-insert "\n"))
+
+(defmethod efc-dialog-show ((this efc-option-dialog))
+  "Shows the options dialog buffer. After showing the dialog buffer,
+this method invokes recursive-edit to emulate the behavior of a modal
+dialog. This suspends the current command until the user has selected
+an option or canceled the dialog. See `efc-dialog-ok' and
+`efc-dialog-cancel' for more information."
+  (save-window-excursion
+    (call-next-method)
+    (recursive-edit)))
+
+(defmethod efc-dialog-ok ((this efc-option-dialog))
+  "Invoked when the user selects the OK button on the options
+dialog. Sets the :selection field of THIS to the option chosen by the
+user, kills the dialog buffer, and exits recursive-edit mode."
+  (oset this
+	selection
+	(widget-value (oref this radio-buttons)))
+  (delete-window)
+  (set-buffer (oref this initbuf))
+  (pop-to-buffer (oref this initbuf))
+  (kill-buffer (oref this buf))
+  (exit-recursive-edit))
+
+(defmethod efc-dialog-cancel ((this efc-option-dialog))
+  "Invoked when the user clicks the dialog's Cancel button.  Invokes
+the default cancel method, sets the :selection field of THIS to nil,
+and then exits recursive edit mode."
+  (call-next-method)
+  (oset this selection nil)
+  (exit-recursive-edit))
+
+(defun efc-query-options (options &optional prompt title history default)
+  "Ask user to choose among a set of options."
+  (funcall efc-query-options-function options prompt title history default))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Multiple Option Dialog                                                     ;;
+;;                                                                            ;;
+;; Contributed by Philip Lord.                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-multi-option-dialog (efc-option-dialog)
+  ((build-message :initarg :text
+		  :type string
+		  :initform "Building Dialog"
+		  :documentation
+		  "Warning message while building dialog, as this can be slow"))
+  "Provides a dialog with several sets of OPTIONS.
+The dialog sets SELECTION to the options selected by the user.")
+
+(defmethod initialize-instance ((this efc-multi-option-dialog) &rest fields)
+   "Dialog constructor."
+   (call-next-method))
+
+(defmethod efc-dialog-create ((this efc-multi-option-dialog))
+  (message "%s..." (oref this build-message))
+  (widget-insert (oref this text))
+  (widget-insert "\n\n")
+  ;; use radio buttons slot as list of radio buttons rather than.
+  (oset this radio-buttons
+	(mapcar
+	 (lambda(list)
+	   (prog1
+	       (widget-create
+		(list
+		 'radio-button-choice
+		 :value
+		 (efc-multi-option-dialog-default this list)
+		 :args (mapcar
+			(lambda (x)
+			  (list 'item x))
+			list)))
+	     (widget-insert "\n")))
+	 (efc-multi-option-dialog-sort this
+				       (oref this options))))
+  (widget-insert "\n")
+  (message "%s...done" (oref this text)))
+
+(defmethod efc-dialog-ok((this efc-multi-option-dialog))
+  ;; set the selection up as a list rather a simple result
+  (oset this selection
+	(mapcar
+	 (lambda(widget)
+	   (widget-value widget))
+	 (oref this radio-buttons)))
+  (delete-window)
+  (set-buffer (oref this initbuf))
+  (pop-to-buffer (oref this initbuf))
+  (kill-buffer (oref this buf))
+  (exit-recursive-edit))
+
+
+(defmethod efc-multi-option-dialog-default ((this efc-multi-option-dialog) list)
+  "Pick the default from a collection of options."
+  (if (= 1 (length list))
+      (car list)))
+
+(defmethod efc-multi-option-dialog-sort ((this efc-multi-option-dialog) list)
+  "Sort the options."
+  ;; sort the ones with the most options first...
+  (sort list
+	(lambda(a b)
+	  (> (length a)
+	     (length b)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Compiler Class                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass efc-compiler ()
+  ((name             :initarg :name
+		     :type string
+		     :documentation "Compiler name.")
+   (buffer           :initarg :buffer
+		     :type buffer
+		     :documentation
+		     "Compilation buffer")
+   (window           :initarg :window
+		     :type window
+		     :documentation
+		     "Window that displays the compilation buffer.")
+   (exec-path        :initarg :exec-path
+		     :type string
+		     :documentation "Path of compiler executable.")
+   (comp-finish-fcn  :initarg :comp-finish-fcn
+		     :type function
+		     :documentation "\
+A list of function to invoke at end of compilation.  Each
+function is called with two arguments: the compilation buffer,
+and a string describing how the process finished."))
+  "Class of compiler-like applications.")
+
+(defmethod create-buffer ((this efc-compiler))
+  "Create a buffer to display the output of a compiler process."
+  (save-excursion
+    (let ((buf (get-buffer-create (format "*%s*" (oref this name))))
+	  (error-regexp-alist compilation-error-regexp-alist)
+	  (enter-regexp-alist (if (boundp 'compilation-enter-directory-regexp-alist)
+				  compilation-enter-directory-regexp-alist))
+	  (leave-regexp-alist (if (boundp 'compilation-leave-directory-regexp-alist)
+				  compilation-leave-directory-regexp-alist))
+	  (file-regexp-alist (if (boundp 'compilation-file-regexp-alist)
+				 compilation-file-regexp-alist))
+	  (nomessage-regexp-alist
+	   ;; silence the compiler warnings
+	   (if (boundp 'compilation-nomessage-regexp-alist)
+	       (if (not jde-xemacsp) compilation-nomessage-regexp-alist)))
+	  (parser compilation-parse-errors-function)
+	  (error-message "No further errors")
+	  (thisdir default-directory))
+
+      (oset this :buffer buf)
+
+      (set-buffer buf)
+
+      ;; Make sure a compiler process is not
+      ;; already running.
+      (let ((compiler-proc (get-buffer-process (current-buffer))))
+	(if compiler-proc
+	    (if (or (not (eq (process-status compiler-proc) 'run))
+		    (yes-or-no-p
+			 (format "A %s process is running; kill it?" (oref this name))))
+		(condition-case ()
+		    (progn
+		      (interrupt-process compiler-proc)
+		      (sit-for 1)
+		      (delete-process compiler-proc))
+		  (error nil))
+	      (error "Cannot have two processes in `%s' at once"
+			 (buffer-name)))))
+
+      ;; In case the compiler buffer is current, make sure we get the global
+      ;; values of compilation-error-regexp-alist, etc.
+      (kill-all-local-variables)
+
+      ;; Clear out the compilation buffer and make it writable.
+      (buffer-disable-undo (current-buffer))
+      (erase-buffer)
+      (buffer-enable-undo (current-buffer))
+
+      (compilation-mode (oref this name))
+      (setq buffer-read-only nil)
+
+      (if (boundp 'compilation-parse-errors-function)
+	  (set (make-local-variable 'compilation-parse-errors-function) parser))
+      (if (boundp 'compilation-error-message)
+	  (set (make-local-variable 'compilation-error-message) error-message))
+      (set (make-local-variable 'compilation-error-regexp-alist)
+	   error-regexp-alist)
+
+      (when (not (featurep 'xemacs))
+	(dolist (elt `((compilation-enter-directory-regexp-alist
+			,enter-regexp-alist)
+		       (compilation-leave-directory-regexp-alist
+			,leave-regexp-alist)
+		       (compilation-file-regexp-alist
+			,file-regexp-alist)
+		       (compilation-nomessage-regexp-alist
+			,nomessage-regexp-alist)))
+	  (if (boundp (car elt))
+	      (set (make-local-variable (car elt)) (second elt)))))
+
+      (if (slot-boundp this 'comp-finish-fcn)
+	  (set (make-local-variable 'compilation-finish-functions)
+	       (oref this comp-finish-fcn)))
+
+      (if (boundp 'compilation-directory-stack)
+	  (setq default-directory thisdir
+		compilation-directory-stack (list default-directory))))))
+
+(defmethod get-args ((this efc-compiler))
+  "Get a list of command-line arguments to pass to the
+compiler process.")
+
+
+(defmethod exec ((this efc-compiler))
+  "Start the compiler process."
+
+  (create-buffer this)
+
+  ;; Pop to checker buffer.
+  (let ((outwin (display-buffer (oref this :buffer))))
+    (compilation-set-window-height outwin)
+    (oset this :window outwin))
+
+  (if (not (featurep 'xemacs))
+      (if compilation-process-setup-function
+	  (funcall compilation-process-setup-function)))
+
+  (let* ((outbuf (oref this :buffer))
+	 (executable-path (oref this exec-path))
+	 (args (get-args this)))
+
+    (save-excursion
+      (set-buffer outbuf)
+
+      (insert (format "cd %s\n" default-directory))
+
+      (insert (concat
+	       executable-path
+	       " "
+	       (mapconcat 'identity args " ")
+	       "\n\n"))
+
+      (let* ((process-environment (cons "EMACS=t" process-environment))
+	     (w32-quote-process-args ?\")
+	     (win32-quote-process-args ?\") ;; XEmacs
+	     (proc (apply 'start-process
+			  (downcase mode-name)
+			  outbuf
+			  executable-path
+			  args)))
+	(set-process-sentinel proc 'compilation-sentinel)
+	(set-process-filter proc 'compilation-filter)
+	(set-marker (process-mark proc) (point) outbuf)
+	(setq compilation-in-progress
+	      (cons proc compilation-in-progress)))
+
+      (set-buffer-modified-p nil)
+      (setq compilation-last-buffer (oref this :buffer)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Collection Class                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass efc-collection ()
+  ((elem-type :initarg :elem-type
+	      :type (or null symbol)
+	      :initform nil
+	      :documentation "Type of element that this collection contains."))
+  "A collection of objects. The collection can be either homogeneous, i.e.,
+composed of elements of one type, or heterogeneous. The ELEM-TYPE property of
+a heterogeneous collection is nil.")
+
+(defmethod efc-coll-type-compatible-p ((this efc-collection) item)
+  "Returns t if ITEM is type-compatible with this collection. An item is
+type-compatible with a collection if the collection is heterogeneous or
+the item's type is the same as the collection's element type."
+  (let ((element-type (oref this elem-type)))
+    (or (eq element-type nil)
+	(typep item element-type))))
+
+(defmethod efc-coll-iterator ((this efc-collection))
+  "Returns an iterator for this collection."
+  (error "Abstract method."))
+
+(defmethod efc-coll-visit ((this efc-collection) visitor)
+  "Maps VISITOR to each element of the collection. VISITOR
+is an object of efc-visitor class."
+  (let ((iter (efc-coll-iterator this)))
+    (while (efc-iter-has-next iter)
+      (efc-visitor-visit visitor (efc-iter-next iter)))))
+
+(defmethod efc-coll-memberp ((this efc-collection) member)
+  "Returns nonil if this contains item."
+  (error "Abstract method."))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Iterator Class                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass efc-iterator ()
+  ()
+  "Iterates over a collection.")
+
+(defmethod efc-iter-has-next ((this efc-iterator))
+  "Returns nonnil if the iterator has not returned all of the collection's elements."
+  (error "Abstract method."))
+
+(defmethod efc-iter-next ((this efc-iterator))
+  "Return the next element of the collection."
+  (error "Abstract method."))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Visitor Class                                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-visitor ()
+  ()
+  "Visits each member of a collection.")
+
+(defmethod efc-visitor-visit ((this efc-visitor) member)
+  "Visits MEMBER, a member of a collection."
+  (error "Abstract method."))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; List Class                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass efc-list (efc-collection)
+  ((items  :initarg :items
+	   :type list
+	   :initform nil
+	   :documentation "List of items."))
+  "List of items.")
+
+(defmethod initialize-instance ((this efc-list) &rest fields)
+  "Iterator constructor."
+  (call-next-method))
+
+(defmethod efc-coll-add ((this efc-list) item)
+  "Adds an item to the list."
+  (if (efc-coll-type-compatible-p this item)
+      (oset this items (append (oref this items) (list item)))
+    (error "Tried to add an item of type %s to a list of items of type %s"
+	   (type-of item) (oref this elem-type))))
+
+(defmethod efc-coll-iterator ((this efc-list))
+  "Return an iterator for this list."
+  (efc-list-iterator "list iterator" :list-obj this))
+
+
+(defmethod efc-coll-memberp ((this efc-list) item)
+  "Returns nonil if this list contains item."
+  (member item (oref this items)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; List Iterator Class                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; silence the compiler warnings
+(defun efc-list-iterator (&rest a))
+
+(defclass efc-list-iterator (efc-iterator)
+  ((list-obj :initarg :list-obj
+	     :type efc-list
+	     :documentation "List that this iterator iterates.")
+   (list     :type list
+	     :documentation "Lisp list."))
+  "Iterates over a list.")
+
+(defmethod initialize-instance ((this efc-list-iterator) &rest fields)
+  "Iterator constructor."
+  (call-next-method)
+  (assert (oref this list-obj))
+  (assert (typep (oref this list-obj) efc-list))
+  (oset this list (oref (oref this list-obj) items)))
+
+(defmethod efc-iter-has-next ((this efc-list-iterator))
+  "Returns true if this iterator has another list item to return."
+  (oref this list))
+
+(defmethod efc-iter-next ((this efc-list-iterator))
+  "Get next item in the list."
+  (let* ((list (oref this list))
+	 (next (car list)))
+    (oset this list (cdr list))
+    next))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; List Set Class                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-list-set (efc-list)
+  ()
+  "List that contains no duplicates.")
+
+
+(defmethod efc-coll-add ((this efc-list-set) item)
+  "Adds an item to a set only if the set does not
+already contain the item."
+  (if (efc-coll-memberp this item)
+      (error "This set already contains %s" item)
+    (call-next-method)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Association Class                                                          ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-assoc (efc-list)
+  ()
+  "Association")
+
+(defmethod efc-coll-put ((this efc-assoc) key value)
+  "Put an item into the association list."
+  (oset this items (append (oref this items) (list (cons key value)))))
+
+(defmethod efc-coll-get ((this efc-assoc) key)
+  "Get an item from the association list."
+  (cdr (assq  key (oref this items))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Association Set Class                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-assoc-set (efc-assoc)
+  ()
+  "Association that contains no duplicate keys.")
+
+(defmethod efc-coll-put ((this efc-assoc-set) key value)
+  "Adds an item to a set only if the set does not
+already contain the item."
+  (if (efc-coll-get this key)
+      (error "This set already contains %s" key)
+    (call-next-method)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Hash Table Class                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass efc-hash-table (efc-collection)
+  ((table :type hash-table
+	  :documentation "Lisp table object."))
+  "Hash table.")
+
+
+(defmethod initialize-instance ((this efc-hash-table) &rest fields)
+  "Hash table constructor."
+  (call-next-method)
+  (oset this table (make-hash-table)))
+
+(defmethod efc-coll-put ((this efc-hash-table) key value)
+  "Put an item into the table."
+  (if (efc-coll-type-compatible-p this value)
+      (puthash key value (oref this table))
+    (error "Tried to add an item of type %s to a hash table of items of type %s"
+	   (type-of value) (oref this elem-type))))
+
+(defmethod efc-coll-get ((this efc-hash-table) key)
+  "Get an item from the table."
+  (gethash key (oref this table)))
+
+(defmethod efc-coll-visit ((this efc-hash-table) visitor)
+  "Visit each item in the hash table. VISITOR is an instance
+of efc-visitor class."
+  (maphash
+   (lambda (key value)
+     (efc-visitor-visit visitor value))
+   (oref this table)))
+
+(defmethod efc-coll-iterator ((this efc-hash-table))
+  "Return an iterator for this hash table."
+  (efc-list-iterator
+   "hash table iterator"
+   :list-obj (let (values)
+	       (maphash
+		(lambda (key value)
+		  (setq values (append values (list value))))
+		(oref this table))
+	       values)))
+
+(provide 'efc)
+
+;; End of efc.el
diff --git a/site/jdee/lisp/efc.elc b/site/jdee/lisp/efc.elc
new file mode 100644
index 0000000..86672b3
Binary files /dev/null and b/site/jdee/lisp/efc.elc differ
diff --git a/site/jdee/lisp/jcomplete.el b/site/jdee/lisp/jcomplete.el
new file mode 100644
index 0000000..c5ca971
--- /dev/null
+++ b/site/jdee/lisp/jcomplete.el
@@ -0,0 +1,320 @@
+;;; jdecompletion.el -- Smart completion for the JDE
+;; $Id: jcomplete.el 139 2009-09-08 05:25:17Z paullandes $
+
+;; Author: Rodrigo Reyes <reyes@chez.com>
+;; Maintainer: Rodrigo Reyes
+;; Keywords: java, intellisense, completion
+
+;; Copyright (C) 1999 Rodrigo Reyes
+;; Copyright (C) 2009 by Paul Landes
+
+;; This package follows the GNU General Public Licence (GPL), see the
+;; COPYING file that comes along with GNU Emacs. This is free software,
+;; you can redistribute it and/or modify it under the GNU GPL terms.
+;;
+;; Java is a registered trademark of Sun Microsystem, Inc.
+;;
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;;
+;; This package adds smart completion to the JDE. How it works is
+;; simple : put the cursor at the end of a statement "under
+;; construction", eg. "myVariable.rem<CURSOR HERE> and call the
+;; prf2-complete-at-point emacs-lisp function (this is by default
+;; C-.). A completion is then inserted. If multiple completions are
+;; possible, calling the completion function again will cycle through
+;; all the possibilities (as dabbrev-mode does).
+
+;; To retrieve all the possible completions, it uses the java code in
+;; jde.util.Completion.getClassInfo(), called by beanshell. That
+;; need the class to be compiled (but that's not worst than an etag
+;; call).
+
+;; Known bugs/problems :
+
+;; - The first call to the bsh function is bugged, and part of the
+;; output is trashed. Starting the bsh before completing, or just
+;; ignoring the first error and call the completion again, work fine.
+;; - Due to the way the JVM works, it is not possible to explicitly
+;; unload a class. So, if major changes are done in a class, the
+;; beanshell must be restarted in order to reload the class.
+
+;;
+;; TODO :
+;;
+;; - [EASY] Check for the variables,
+;; - [EASY] Check for the static classes
+;; - [NOT THAT EASY] Keep the completion information in the minibuffer
+;; (it is currently erased after the user presses a key).
+;; - [AVERAGE] Add a cache for the class informations.
+
+;;; Code:
+
+(require 'beanshell)
+
+(defvar prf2-current-list nil
+"The list of all the completion. Each element of the list is a list
+which car is the possible completion, and the cdr is an additional
+information about this completion.")
+
+(defvar prf2-current-list-index nil
+"An index to an element in prf2-current-list. This is used to
+cycle the list.")
+
+(defvar prf2-current-beginning (make-marker)
+"The beginning of the region where the last completion was inserted.")
+
+(defvar prf2-current-end (make-marker)
+"The end of the region where the last completion was inserted.")
+
+(defun prf2-import-list ()
+  "Build the list of java package declared in the current buffer.
+It mostly scans the buffer for 'import' statements, and return the
+resulting list. It impliciyly adds the java.lang.* package."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (let (lst first second)
+      (while (not (null
+		   (re-search-forward "import[ \t\n\r]+\\(\\([a-zA-Z0-9]+[.]\\)+\\)\\([*]\\|[a-zA-Z0-9]+\\)" nil t) ))
+	(setq first (match-string 1))
+	(setq second (match-string 3))
+	(if (string= "*" second)
+	    (setq lst (append lst
+			      (list (list first second))))
+	  (setq lst (append (list (list first second))
+			    lst))))
+      (if (not (member "java.lang.*" lst))
+	  (setq lst (append lst (list (list "java.lang." "*")))))
+      lst)))
+
+(defun prf2-valid-java-declaration-at (point varname)
+"Verify that a POINT starts a valid java declaration
+for the VARNAME variable."
+(save-excursion
+  (goto-char point)
+  (if (looking-at (concat "\\([A-Za-z_.]+\\)[ \t\n\r]+" varname "[ \t\n\r]*[;=]"))
+      (match-string 1)
+    nil)))
+
+(defun prf2-declared-type-of (name)
+"Find in the current buffer the java type of the variable NAME.  The
+function returns a string containing the name of the class, or nil
+otherwise. This function does not give the fully-qualified java class
+name, it just returns the type as it is declared."
+(interactive)
+(save-excursion
+    (let (found res pos orgpt resname)
+      (while (and (not found)
+		  (search-backward name nil t))
+	(setq pos (point))
+	(backward-word 1)
+	(setq resname (prf2-valid-java-declaration-at (point) name))
+	(goto-char pos)
+	(forward-char -1)
+	(if (not (null resname))
+	    (progn (setq res resname)
+		   (setq found t))))
+    res)))
+
+(defun prf2-filter-fqn (importlist)
+"Filter all the fully-qualified classnames in the import list. It uses
+the knowledge that those classnames are at the beginning of the list,
+so that it can stops at the first package import (with a star `*' at
+the end of the declaration)."
+  (if (not (null importlist))
+      (if (string= "*" (car (cdr (car importlist))))
+	  importlist
+	(prf2-filter-fqn (cdr importlist)))))
+
+
+
+(defun prf2-guess-type-of (name)
+
+"Guess the fully qualified name of the class NAME, using the import
+list. It returns a string if the fqn was found, or a list of possible
+packages otherwise."
+
+  (let ((importlist (prf2-import-list)) shortname fullname tmp result)
+    (while (and (not (null importlist)) (null result))
+      (setq tmp (car importlist))
+      (setq shortname (car (cdr tmp)))
+      (setq fullname (concat (car tmp) name))
+      (cond
+       ((string= "*" shortname)
+	(setq result importlist))
+       ((string= name shortname)
+	(setq result fullname))
+       (t
+	(setq importlist (cdr importlist)))))
+    result))
+
+(defun prf2-get-classinfo (name)
+"Return the class info list for the class NAME (possibly the short
+java name). This list contains lists of elements, which car is a
+possible completion, and the cdr gives additional informations on the
+car."
+  (let ((guessed (prf2-guess-type-of name)) result)
+    (if (stringp guessed)
+	(setq result (bsh-eval
+		      (oref 'jde-bsh the-bsh)
+		      (concat "jde.util.Completion.getClassInfo(\"" guessed "\");")))
+      (if (not (null name))
+	  (setq result (bsh-eval
+			(oref 'jde-bsh the-bsh)
+			(prf2-get-classinfo-javacode name guessed)))))
+    (if (not (null result))
+	(eval (read result))
+      nil)))
+
+
+(defun prf2-get-classinfo-javacode (name import)
+"Return the java code that calls the
+jde.util.Completion.getClassInfo function with the short java class
+name NAME and the package list IMPORT where to look at."
+  (interactive)
+  (save-excursion
+    (concat "{ "
+	      "String[] lst = new String[" (length import) "];\n"
+	      (let ((count -1))
+		(mapconcat (function (lambda (x)
+				       (setq count (+ 1 count))
+					   (concat "lst[" count "]=\""
+						   (car (nth count import)) "\";\n")))
+			   import
+			   " "))
+	      "jde.util.Completion.getClassInfo(\"" name "\",lst);\n"
+	      "}")))
+
+
+(defun prf2-java-variable-at-point ()
+  "Return the current word, according to java syntax.
+A '.' is  part of a name."
+  (interactive)
+  (save-excursion
+    (let (start varname curcar found
+		(original-point (point))
+		intermediate-point beg-point)
+      (setq curcar (char-before))
+      (while (null found)
+	(cond
+	 ((or (and (>= curcar ?a) (<= curcar ?z))
+		    (and (>= curcar ?A) (<= curcar ?Z))
+		    (member curcar '(?_)))
+	  (forward-char -1))
+	 ((eq ?. curcar)
+	  (setq found (point)))
+	 (t
+	  (setq found t)))
+	(setq curcar (char-before)))
+      ;;
+      (setq intermediate-point (point))
+      (if (not (eq t found))
+	  (progn
+	    (setq curcar (char-before))
+	    (while (or (and (>= curcar ?a) (<= curcar ?z))
+		       (and (>= curcar ?A) (<= curcar ?Z))
+		       (member curcar '(?. ?_)))
+	      (forward-char -1)
+	      (setq curcar (char-before)))
+	    (setq beg-point (point))
+	    (set-marker prf2-current-beginning intermediate-point)
+	    (set-marker prf2-current-end original-point)
+	    (list (buffer-substring beg-point (- intermediate-point 1))
+		  (buffer-substring intermediate-point original-point)))
+	nil))))
+
+(defun prf2-build-completion-list (classinfo)
+"Build a completion list from the CLASSINFO list, as returned by the
+jde.util.Completion.getClassInfo function."
+  (let ((result nil) (tmp nil))
+    ;; get the variable fields
+    (setq tmp (car classinfo))
+    (while (not (null tmp))
+      (setq result (append (list (list (car tmp))) result))
+      (setq tmp (cdr tmp)))
+    ;; get the methods
+    (setq tmp (nth 2 classinfo))
+    (while (not (null tmp))
+      (setq result (append (list (list (concat (car (car tmp))"(")
+				       (prf2-build-information-for-completion (car tmp))
+				       ;; (car tmp)
+				       )) result))
+      (setq tmp (cdr tmp)))
+    result))
+
+(defun prf2-build-information-for-completion (lst)
+  (let ((result (concat (car (cdr lst)) " " (car lst) "(")))
+    (setq lst (cdr (cdr lst)))
+    (while (not (null lst))
+      (setq result (concat result (car lst)))
+      (setq lst (cdr lst))
+      (if (not (null lst))
+	  (setq result (concat result ", "))))
+    (setq result (concat result ")"))
+    result))
+
+(defun prf2-complete-cycle ()
+  "Replace the previous completion by the next one in the list."
+  (let (elem)
+    (setq prf2-current-list-index (+ 1 prf2-current-list-index))
+    (if (>= prf2-current-list-index (length prf2-current-list))
+	(setq prf2-current-list-index 0))
+    (setq elem (nth prf2-current-list-index prf2-current-list))
+    (if (not (null (car elem)))
+	(progn
+	  (delete-region prf2-current-beginning prf2-current-end)
+	  (insert (car elem))))
+    (set-marker prf2-current-end (+ (marker-position prf2-current-beginning) (length (car elem))))
+    (message (car (cdr elem)))
+  ;;  (goto-char (marker-position prf2-current-end))
+    ))
+
+(defun prf2-all-completions (pat lst)
+  (let ((result nil))
+    (while (not (null lst))
+      (if (equal 0 (string-match pat (car (car lst))))
+	  (setq result (append (list (car lst)) result)))
+      (setq lst (cdr lst)))
+    result))
+
+(defun prf2-complete-at-point ()
+"Smart-complete the method at point."
+  (interactive)
+    (if (and
+	 (not (null prf2-current-list))
+	 (markerp prf2-current-beginning)
+	 (markerp prf2-current-end)
+	 (marker-position prf2-current-beginning)
+	 (marker-position prf2-current-end)
+	 (>= (point) (marker-position prf2-current-beginning))
+	 (<= (point) (marker-position prf2-current-end))
+	 (eq last-command this-command))
+	(progn
+	  (prf2-complete-cycle))
+      (let* ((pair (prf2-java-variable-at-point))
+	     txt classinfo fulllist
+	     )
+	(if (not (null pair))
+	    (progn
+	      (setq classinfo (prf2-get-classinfo (prf2-declared-type-of (car pair))))
+	      (setq fulllist (prf2-build-completion-list classinfo))
+	      (setq prf2-current-list (prf2-all-completions (car (cdr pair)) fulllist))
+	      (setq prf2-current-list-index -1)
+	      (prf2-complete-cycle))
+	  (progn
+	    (setq prf2-current-list nil)
+	    (message "No completion at this point."))))))
+
+
+;;
+;; A default binding, as exemple.
+(global-set-key [(control \.)] 'prf2-complete-at-point)
+
+(provide 'jcomplete)
+
+;; end of jdecompletion.el
diff --git a/site/jdee/lisp/jcomplete.elc b/site/jdee/lisp/jcomplete.elc
new file mode 100644
index 0000000..a817387
Binary files /dev/null and b/site/jdee/lisp/jcomplete.elc differ
diff --git a/site/jdee/lisp/jde-annotations.el b/site/jdee/lisp/jde-annotations.el
new file mode 100644
index 0000000..0415dac
--- /dev/null
+++ b/site/jdee/lisp/jde-annotations.el
@@ -0,0 +1,148 @@
+;;; jde-annotations.el --- Indentation for Java 5 annotations.
+;; $Id: jde-annotations.el 125 2009-08-12 06:40:52Z paullandes $
+
+;; Copyright (C) 2006 by Suraj Acharya
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Suraj Acharya <sacharya@cs.indiana.edu>
+;; Maintainer: Suraj Acharya <sacharya@cs.indiana.edu>
+;; Created: 22 Feb 2006
+;; Keywords: cc-mode java annotations indentation
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This library tries to indent java annotations
+;; (http://java.sun.com/j2se/1.5.0/docs/guide/language/annotations.html)
+;; like the code examples listed in the webpage.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cc-mode))
+
+(defun c-preprend-offset (symbol offset)
+  "Find the offset entry for SYMBOL and add OFFSET at the front of the list.
+See `c-set-offset' for a description of OFFSET and SYMBOL."
+  (let ((old-offset (cdr-safe (or (assq symbol c-offsets-alist)
+				  (assq symbol (get 'c-offsets-alist
+						      'c-stylevar-fallback))))))
+    (if old-offset
+	(if (listp old-offset)
+	    (c-set-offset symbol (cons offset old-offset))
+	  (c-set-offset symbol (list offset old-offset)))
+      (c-set-offset symbol offset))))
+
+(defun jde-annotations-setup ()
+  "Set up java mode indent function to handle java 1.5 annotations.
+The setup function adds one of the custom indentation functions
+`c-single-indent-after-java-annotations' or `c-no-indent-after-java-annotations'
+to the offset lists of the symbols `arglist-intro', `topmost-intro-cont', `arglist-intro',
+`arglist-close', `statement-cont' and `func-decl-cont'.
+This function should be called after any calls to `c-set-style'."
+  (c-preprend-offset 'arglist-intro 'c-single-indent-after-java-annotations)
+  (c-preprend-offset 'topmost-intro-cont 'c-no-indent-after-java-annotations)
+  (c-preprend-offset 'arglist-close 'c-no-indent-after-java-annotations)
+  (c-preprend-offset 'statement-cont 'c-no-indent-after-java-annotations)
+  (c-preprend-offset 'func-decl-cont 'c-no-indent-after-java-annotations))
+
+(defun c-only-java-annotations-p (langelem)
+  "Check if there are only java annotations before the current line.
+It does this by moving across the region from the start of
+LANGELEM to the beginning of this line one sexp at a time.  If
+during this traversal, this function only sees whitespaces
+followed by either a '@' or a '(' then it returns t."
+  (save-excursion
+    (condition-case err ;; return nil if  any errors are thrown by forward-sexp
+	(let* ((lim (1- (c-point 'bol)))
+	       (throws (catch 'notAnno
+		     (goto-char (cdr langelem))
+		     (while (< (point) lim)
+		       (if (not (looking-at "\\(\\s \\|\n\\)*\\(@\\|(\\)"))
+			   (throw 'notAnno t))
+		       (forward-sexp 1)))))
+	  (if (not throws)
+	      t)))))
+
+(defun c-no-indent-after-java-annotations (langelem)
+  "If preceeded by java annotations, indent this line the same as the previous.
+Works with topmost-intro-cont, statement-cont, arglist-close and func-decl-cont.
+
+With topmost-intro-cont, indents as
+@Id
+Long foo;
+
+instead of
+@Id
+<-->Long foo;
+Also for method and class declarations instead of the field foo.
+With statement-cont, indents local variables with annotations as above.
+
+With statement-cont, indents as
+@Id(
+    arg=\"value\"
+)
+Long foo;
+
+instead of
+@Id(
+    arg=\"value\"
+)
+<-->Long foo;
+
+
+With arglist-close, indents as
+@RequestForEnhancement(
+...
+)
+
+Instead of
+@RequestForEnhancement(
+...
+<-->)
+
+Argument LANGELEM The language element being indented."
+  (if (c-only-java-annotations-p langelem)
+      0))
+
+
+(defun c-single-indent-after-java-annotations (langelem)
+  "If preceeded by java annotations, indent this line more than previous.
+This function indents this line by `c-basic-offset' columns more
+than the previous line.
+
+Works with arglist-intro.
+
+Indents as
+@RequestForEnhancement(
+    id	     = 2868724,
+...
+
+instead of
+@RequestForEnhancement(
+		       id	     = 2868724,
+...
+
+Argument LANGELEM The language element being indented."
+    (if (c-only-java-annotations-p langelem)
+      c-basic-offset))
+
+(provide 'jde-annotations)
+
+;;; jde-annotations.el ends here
diff --git a/site/jdee/lisp/jde-annotations.elc b/site/jdee/lisp/jde-annotations.elc
new file mode 100644
index 0000000..7fe75b1
Binary files /dev/null and b/site/jdee/lisp/jde-annotations.elc differ
diff --git a/site/jdee/lisp/jde-ant.el b/site/jdee/lisp/jde-ant.el
new file mode 100644
index 0000000..28c4c13
--- /dev/null
+++ b/site/jdee/lisp/jde-ant.el
@@ -0,0 +1,743 @@
+;; jde-ant.el --- Use Apache Ant to build your JDE projects
+;; $Id: jde-ant.el 176 2009-12-24 03:05:35Z lenbok $
+
+;; Copyright (C) 2009 by Paul Landes
+;; Author: Jason Stell | jason.stell@globalone.net
+;; Author: Kevin A. Burton ( burton@openprivacy.org )
+;; Created: 19 Oct 2000
+;; Version 1.4.4
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;; Commentary:
+;; This file defines jde-ant-build and some helper functions.
+;; jde-ant-build uses the specified ant program/shell script to
+;; execute a specified build file (in the project root).
+;;
+;;
+;; TODO:
+;;
+;; Notes:
+;; -- The JDE (Java Development Environment for Emacs) can be
+;;    downloaded at http://jdee.sourceforge.net
+;;
+;; -- Apache Ant is a Java & XML build system that can be downloaded
+;;    at http://jakarta.apache.org/ant/
+;;
+;;
+;;; History:
+;;
+;; - Version 1.4.4 Thu Jan 17 2002 03:51 PM (burton@openprivacy.org):
+;;
+;;    - We now have `jde-ant-build-hook' that runs hooks after a build is
+;;      started.
+;;
+;; - Version 1.4.3 Thu Jan 17 2002 03:37 PM (burton@openprivacy.org):
+;;
+;;    - fixed a bug with target completion.  We were not using initial-input
+;;      correctly.
+;;
+;;    - fixed a bug with jde-ant-build-classpath which wasn't using ant-home
+;;      correctly.  (Thanks to Javier S. Lopez)
+;;
+;; - Version 1.4.2 Wed Jan 16 2002 05:46 PM (burton@openprivacy.org): added
+;; `jde-ant-use-global-classpath' (which is disabled by default) so that the
+;; `jde-global-classpath' can be used.
+;;
+;; -- Version 1.3 (19 June 2001)
+;;    : Addition of jde-ant-projecthelp to display list of targets for
+;;      the current buildfile.
+;; -- Version 1.2 (4 June 2001)
+;;    : Addition of jde-ant-read-buildfile option to prompt for the buildfile
+;;      name -- contributed by Rob Shaw <shaw@servidium.com>
+;;    : Various Bug fixes contributed by Rob Shaw <shaw@servidium.com>
+;;        - The setting of the system property in a format other
+;;          than -Dname=value had the side effect of negating the -emacs
+;;          command line argument.
+;;        - The setting of the current directory to the location of the
+;;          JDE project file is now taking place when
+;;          jde-ant-enable-find is nil.
+;;        - The ant target is now the last thing to be appended to
+;;          ant command to avoid any possible confusion for ANT
+;;          as to what is the desired target.
+;; -- Version 1.2b2 (25 May 2001)
+;;    : Fix to properly use the -find <buildfile> Ant switch--contributed
+;;      by Rob Shaw <shaw@servidium.com>.
+;; -- Version 1.2b1 (23 May 2001)
+;;    : Added jde-ant-enable-find custom flag to use the -find switch
+;;      available in Ant. This overrides the requirement for a JDE
+;;      project file
+;;    : Fixed minor bug missing whitespace before -buildfile switch
+;;      when building the ant compile command
+;; -- Version 1.1 (20 October 2000)
+;;    : Added interactive prompts (optional, based on customizable
+;;      toggles) for Ant target and additional args. Removed the
+;;      jde-ant-target custom variable, since this is really
+;;      represented by the default target in the build file.
+;;    : The -f switch seems to be causing problems. Removed it from
+;;      the default jde-ant-args.
+;;    : Basic changes to the way the ant command is assembled.
+;;
+;; -- Version 1.0 (19 October 2000)
+;;    Initial Version
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(declare-function jde-normalize-path "jde" (path &optional sym))
+(declare-function jde-get-jdk-prog "jde" (progname))
+(declare-function jde-get-tools-jar "jde" nil)
+(declare-function jde-build-classpath "jde" (path &optional sym quote-path-p))
+(declare-function jde-create-prj-values-str "jde" nil)
+(declare-function jde-root-dir-p "jde" (dir))
+(declare-function jde-update-autoloaded-symbols "jde-project-file" nil)
+(declare-function jde-bsh-running-p "jde-bsh" nil)
+
+(defgroup jde-ant nil
+  "JDE Ant"
+  :group 'jde
+  :prefix "jde-ant-")
+
+;;; start of Douglas WF Acheson mod
+;;; The next three custom variables and defun added by Douglas WF Acheson to
+;;; allow a user to select how ant is invoked, either by script or via Java
+
+(defcustom jde-ant-invocation-method (list "Script")
+  "*Specifies how to invoke ant. Ant can be invoked in one of three
+ways. The first is via the ant script/program that comes with ant.
+The second is via java and the third is via the Ant Server."
+  :group 'jde-ant
+  :type '(list
+	   (radio-button-choice
+	     (const "Script")
+	     (const "Java")
+	     (const "Ant Server"))))
+
+(defcustom jde-ant-home ""
+  "*Directory where ant is installed."
+  :group 'jde-ant
+  :type  'file)
+
+(defcustom jde-ant-user-jar-files nil
+  "*Specifies jar files that hold user-defined tasks."
+  :group 'jde-ant
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-ant-program "ant"
+  "*Specifies name of ant program/script."
+ :group 'jde-ant
+ :type 'string)
+
+(defcustom jde-ant-args "-emacs"
+  "*Specifies arguments to be passed to make program."
+  :group 'jde-ant
+  :type 'string)
+
+(defcustom jde-ant-buildfile "build.xml"
+  "*Specifies the default buildfile to use."
+  :group 'jde-ant
+  :type 'string)
+
+(defcustom jde-ant-read-buildfile nil
+"*Specify whether to prompt for a buildfile. If non-nil, the jde-ant-build
+command prompts you for an ant buildfile.  Note that when `jde-ant-enable-find'
+is enable the value entered for `jde-ant-read-buildfile' is used as a
+default. If no value is entered, or the file is non-existent, or is a
+directory, the code tries to find the buildfile."
+
+  :group 'jde-ant
+  :type 'boolean)
+
+(defcustom jde-ant-read-target nil
+"*Specify whether to prompt for a build target. If non-nil, the
+jde-ant-build command prompts you for an ant target."
+  :group 'jde-ant
+  :type 'boolean)
+
+(defvar jde-ant-interactive-buildfile nil
+  "Defauilt buildfile to use when prompting interactively.")
+
+(defvar jde-ant-interactive-target-history nil
+  "History of targets entered in the minibuffer.")
+
+(defcustom jde-ant-read-args nil
+"*Specify whether to prompt for additional arguments to pass to ant. If
+non-nil, the jde-ant-build command prompts you for the additional arguments."
+  :group 'jde-ant
+  :type 'boolean)
+
+(defvar jde-ant-interactive-args-history nil
+"History of targets entered in the minibuffer.")
+
+(defvar jde-ant-buildfile-history nil
+ "History of targets entered in the minibuffer.")
+
+(defvar jde-ant-passed-security-exception nil
+  "This variable is used to indicate that we have passed the
+java.lang.SecurityException in the output. The JDESecurityManager throws an
+exception when ANT tries exiting the JVM using System.exit(0). This exception
+causes an stack trace in the compilation buffer. This variable is used to
+indicate the start of the exception, therefore no more output should be
+inserted into the buffer")
+
+(defvar jde-ant-build-status nil
+  "Used to indicated the status of build, success or failure")
+
+
+(defcustom jde-ant-enable-find nil
+"*Specify whether jde-ant find the build.xml file based on your current
+directory. If non-nil, we will search up the directory hierarchy from the
+current directory for the build definition file. Also note that, if non-nil,
+this will relax the requirement for an explicit jde project file.  If
+`jde-ant-read-buildfile' is enable that value is used as a default if valid."
+   :group 'jde-ant
+   :type 'boolean)
+
+(defcustom jde-ant-complete-target t
+  "*Specify whether to enable completion of build target names in the
+minibuffer.
+
+If non-nil, the jde-ant-build command allows you to use tab completion
+in the minibuffer to specify the build target name.  This list of
+valid build targets is determined by parsing the Ant build file.  This
+option has no effect if jde-ant-read-target is nil."
+  :group 'jde-ant
+  :type 'boolean)
+
+(defcustom jde-ant-use-global-classpath nil
+  "*Specify whether to enable use of `jde-global-classpath' when running jde-ant."
+  :group 'jde-ant
+  :type 'boolean)
+
+(defcustom jde-ant-target-regexp "<\\s-*target\\s-[^...]*?name\\s-*=\\s-*\"\\s-*\\([^\"]+\\)"
+  "*Regular expression used to match target names in Ant build files."
+  :group 'jde-ant
+  :type 'string)
+
+(defcustom jde-ant-build-hook '(jde-compile-finish-kill-buffer
+				jde-compile-finish-refresh-speedbar
+				jde-compile-finish-update-class-info)
+  "*List of hook functions run by `jde-ant-build' (see `run-hooks'). Each
+function should accept two arguments: the compilation buffer and a string
+describing how the compilation finished"
+  :group 'jde-ant
+  :type 'hook)
+
+(defcustom jde-ant-working-directory ""
+  "*Path of the working directory to use in 'ant' build mode. This string must
+end in a slash, for example, c:/foo/bar/ or ./ . If this string is empty, the
+'ant' build mode uses the current file location as its working directory."
+  :group 'jde-ant
+  :type 'string)
+
+(defun jde-build-ant-command (target more-args &optional buildfile)
+  "Constructs the java ant command. The variable `jde-ant-home' is used
+if it is set, otherwise it gets the ant home from the environment
+variable ANT_HOME."
+
+  ;;provide a default buildfile.
+  (when (null buildfile)
+    (setq buildfile jde-ant-buildfile))
+
+  (let* ((ant-home (jde-ant-get-ant-home))
+	 (delimiter (if (or
+			 (string= (car jde-ant-invocation-method) "Java")
+			 (and (string= (car jde-ant-invocation-method)
+				       "Script")
+			      (not (featurep 'xemacs))))
+			"'"
+		      "\""))
+	 (classpath-delimiter  (if (and (or (eq system-type 'windows-nt)
+			 (eq system-type 'cygwin32))
+		     (string-match "sh$" shell-file-name))
+		delimiter))
+	 (buildfile-delimiter  (if (eq system-type 'windows-nt)
+				   "\"" delimiter))
+	 (ant-program (if (or (string-match "\\\\" jde-ant-program)
+			      (string-match "/" jde-ant-program))
+			  (jde-normalize-path jde-ant-program)
+			jde-ant-program))
+	 (ant-command
+	  (concat
+	   (if (string= (car jde-ant-invocation-method) "Script") ant-program)
+	   (if (string= (car jde-ant-invocation-method) "Java")
+	       (concat
+		(jde-get-jdk-prog 'java)
+		" -classpath "
+		classpath-delimiter
+		(jde-ant-build-classpath)
+		classpath-delimiter))
+	   (if ant-home
+	       (concat
+		" -Dant.home="
+		(if (or
+		     (string-match " " ant-home) ;; Quote path if it
+		     (string-match "." ant-home));; contains a space
+		    (concat delimiter ant-home delimiter)  ;; or period.
+		  ant-home)))
+	  (if (string= (car jde-ant-invocation-method) "Java")
+	      (concat
+	       " "
+	       "org.apache.tools.ant.Main")))))
+
+    (if (not (string= buildfile ""))
+	(setq ant-command
+	      (concat ant-command
+		      " -buildfile " buildfile-delimiter
+		      (jde-normalize-path buildfile)
+		      buildfile-delimiter)))
+
+    (if (not (string= jde-ant-args ""))
+	(setq ant-command (concat ant-command " " jde-ant-args)))
+
+    (if (and (not (null more-args))
+	     (not (string= more-args "")))
+	(setq ant-command (concat ant-command " " more-args)))
+
+    (if (not (string= target ""))
+	(setq ant-command (concat ant-command " " target " ")))
+
+    ant-command))
+
+(defun jde-ant-build-classpath()
+  "Build the classpath we should use when running ant.  This returns a
+classpath normalized with `jde-build-classpath'."
+
+  (let* ((ant-home (jde-ant-get-ant-home))
+	 classpath)
+
+    (setq classpath (append (list (expand-file-name "lib" ant-home)
+				  (jde-get-tools-jar))
+			    jde-ant-user-jar-files))
+
+    ;; silence the compiler
+    ;; TODO: remove this boundp and require 'jde after resolving jde
+    ;; compilation warnings
+    (with-no-warnings
+      (when jde-ant-use-global-classpath
+	(setq classpath (append classpath jde-global-classpath))))
+
+    (jde-build-classpath classpath)))
+
+(defun jde-ant-get-ant-home ()
+  "Calculate an appropriate ant home."
+  (let ((ant-home
+	 (if (string= jde-ant-home "")
+	     (getenv "ANT_HOME")
+	   jde-ant-home)))
+    (if ant-home
+	(jde-normalize-path ant-home))))
+
+(defun jde-ant-interactive-get-buildfile ()
+  "Get a buildfile interactively.  This is used so that code that needs to read
+  a buildfile from interactive can share the same type of behavior.  This will
+  return a new filename which points to the build.xml file to use."
+
+  (let (buildfile)
+
+    (if jde-ant-read-buildfile
+	;;read the buildfile from the user.
+
+	;;figure out which directory to execute from.
+	(let (prompt-directory prompt-filename)
+
+	  (if jde-ant-interactive-buildfile
+	      (progn
+		(setq prompt-directory
+		      (file-name-directory jde-ant-interactive-buildfile))
+		(setq prompt-filename
+		      (file-name-nondirectory jde-ant-interactive-buildfile)))
+
+	    (setq prompt-directory (jde-ant-get-default-directory))
+	    (setq prompt-filename ""))
+
+	  (setq buildfile
+		(read-file-name "Buildfile: " prompt-directory nil t
+				prompt-filename))))
+    (if (or (and jde-ant-enable-find (not jde-ant-read-buildfile)) ;enable only
+	    (and jde-ant-enable-find jde-ant-read-buildfile
+		 (or (null buildfile)   ;no buildfile
+		     (string= "" buildfile)
+		     (and (file-exists-p buildfile) ;buildfile is a directory
+			  (file-directory-p buildfile)))))
+	(progn
+	  (setq buildfile (jde-ant-find-build-file
+			   (jde-ant-get-default-directory)))
+
+	  (when (null buildfile)
+	    (error "Could not find Ant build file"))
+
+	  (when (not (file-exists-p buildfile))
+	    (error "File does not exist %s " buildfile))))
+
+    (if (and (not jde-ant-enable-find)
+	     (not jde-ant-read-buildfile))
+	;;use the default buildfile.
+	(setq buildfile (jde-normalize-path jde-ant-buildfile)))
+    buildfile))
+
+;;;###autoload
+(defun jde-ant-build (buildfile target &optional interactive-args)
+  "Build the current project using Ant.  If interactive, we try to prompt the
+  user for certain variables.."
+  (interactive
+   (let* ((buildfile (jde-ant-interactive-get-buildfile))
+	  (build-history (jde-ant-get-from-history buildfile))
+	  (targets
+	   (if jde-ant-read-target
+	       (if jde-ant-complete-target
+		   (if (fboundp 'completing-read-multiple)
+		       (completing-read-multiple
+			"Target to build: "
+			(jde-ant-get-target-alist buildfile)
+			nil
+			nil
+			(car build-history)
+			'build-history)
+		     (list (completing-read
+			    "Target to build: "
+			    (jde-ant-get-target-alist buildfile)
+			    nil
+			    t
+			    (car build-history)
+			    'build-history)))
+		 (list (read-from-minibuffer
+			"Target to build: "
+			(car build-history)
+			nil
+			nil
+			'build-history)))))
+	  (target
+	   (jde-ant-escape (mapconcat 'identity targets " ")))
+	  (interactive-args
+	   (if jde-ant-read-args
+	       (read-from-minibuffer
+		"Additional build args: "
+		(nth 0 jde-ant-interactive-args-history)
+		nil nil
+		'(jde-ant-interactive-args-history . 1)))))
+
+
+     ;; Setting the history for future use
+     (jde-ant-add-to-history buildfile build-history)
+
+
+     ;;some of these global variables are defaults.  We should restore then for
+     ;;every request.  IE jde-ant-interactive-target and
+     ;;jde-ant-interactive-args
+
+     (setq jde-ant-interactive-buildfile buildfile)
+
+     ;;return our new arguments.
+     ;;This should be a list of buildfile, target and optional-args.
+     (list buildfile target interactive-args)))
+
+  (let ((compile-command
+	 (jde-build-ant-command target interactive-args buildfile))
+	process-connection-type)
+
+    (when compile-command
+      ;; Force save-some-buffers to use the minibuffer
+      ;; to query user about whether to save modified buffers.
+      ;; Otherwise, when user invokes the command from
+      ;; menu, save-some-buffers tries to popup a menu
+      ;; which seems not to be supported--at least on
+      ;; the PC.
+      (if (and (eq system-type 'windows-nt)
+	       (not jde-xemacsp))
+	  (let ((temp last-nonmenu-event))
+	    ;; The next line makes emacs think that the command
+	    ;; was invoked from the minibuffer, even when it
+	    ;; is actually invoked from the menu-bar.
+	    (setq last-nonmenu-event t)
+	    (save-some-buffers (not compilation-ask-about-save) nil)
+	    (setq last-nonmenu-event temp))
+	(save-some-buffers (not compilation-ask-about-save) nil))
+
+      (setq compilation-finish-functions
+	    (lambda (buf msg)
+	      (run-hook-with-args 'jde-ant-build-hook buf msg)
+	      (setq compilation-finish-functions nil)))
+
+      (if (string= (car jde-ant-invocation-method) "Ant Server")
+	  (progn
+	    (while (string-match "\"" compile-command)
+	      (setq compile-command (replace-match "" nil nil
+						   compile-command)))
+	    (jde-ant-compile-internal compile-command
+				      "No more errors"))
+	(let ((default-directory (jde-ant-get-default-directory)))
+	  (compilation-start compile-command))))))
+
+(defvar jde-ant-comint-filter nil)
+
+(defun jde-ant-escape (target)
+  "Looks for \ characters and escape them, i.e. \\"
+  (if (not (null target))
+      (let (temp c)
+	(while (not (string= target ""))
+	  (setq c (substring target 0 1))
+	  (if (string= c "\\")
+	      (setq temp (concat temp c)))
+	  (setq temp (concat temp c))
+	  (setq target (substring target 1)))
+	temp)))
+
+(defun jde-ant-compile-internal (command error-message)
+  "This method displays ant output in a compilation buffer.
+error-message is a string to print if the user asks to see another error
+and there are no more errors. "
+  (let* (error-regexp-alist
+	 enter-regexp-alist
+	 leave-regexp-alist
+	 file-regexp-alist
+	 nomessage-regexp-alist
+	 (parser compilation-parse-errors-function)
+	  outbuf)
+
+    (save-excursion				       ;;getting or creating
+      (setq outbuf (get-buffer-create "*compilation*"));;the compilation buffer
+      (set-buffer outbuf) ;;setting the compilation buffer
+
+      ;; In case the compilation buffer is current, make sure we get the global
+      ;; values of compilation-error-regexp-alist, etc.
+      (kill-all-local-variables))
+	(setq error-regexp-alist compilation-error-regexp-alist)
+	(setq enter-regexp-alist
+	      (if (boundp 'compilation-enter-directory-regexp-alist)
+		  compilation-enter-directory-regexp-alist))
+	(setq leave-regexp-alist
+	      (if (boundp 'compilation-leave-directory-regexp-alist)
+		  compilation-leave-directory-regexp-alist))
+	(setq file-regexp-alist
+	      (if (boundp 'compilation-file-regexp-alist)
+		  compilation-file-regexp-alist))
+	(setq nomessage-regexp-alist
+	      (if (boundp 'compilation-nomessage-regexp-alist)
+		  compilation-nomessage-regexp-alist))
+
+	(let* (proc (thisdir (jde-ant-get-default-directory)) outwin)
+	  (save-excursion
+	    ;; Clear out the compilation buffer and make it writable.
+	    (if (not (jde-bsh-running-p))
+		(progn
+		  (bsh-launch (oref 'jde-bsh the-bsh))
+		  (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+	    (setq proc (bsh-get-process (oref 'jde-bsh the-bsh)))
+	    (set-buffer outbuf)
+	    (compilation-mode)
+	    (setq buffer-read-only nil)
+	    (buffer-disable-undo (current-buffer))
+	    (erase-buffer)
+	    (buffer-enable-undo (current-buffer))
+	    (display-buffer outbuf)
+	    (insert "AntServer output:\n")
+	    (insert command "\n")
+	    (set-buffer-modified-p nil)
+	    (setq jde-ant-comint-filter (process-filter proc))
+	    (set-process-filter proc 'jde-ant-filter)
+	    ;;resets the jde-ant-passed-security-exception flag
+	    (setq jde-ant-passed-security-exception nil)
+	    (process-send-string proc (concat "jde.util.AntServer.start(\""
+					      command "\");" "\n")))
+	  (setq outwin (display-buffer outbuf))
+	  (save-excursion
+	    ;; (setq buffer-read-only t)  ;;; Non-ergonomic.
+	    (set (make-local-variable 'compilation-parse-errors-function)
+		 parser)
+	    (if (boundp 'compilation-error-message)
+		(set (make-local-variable 'compilation-error-message)
+		     error-message))
+	    (set (make-local-variable 'compilation-error-regexp-alist)
+		 error-regexp-alist)
+
+	    (when (not (featurep 'xemacs))
+	      (dolist (elt `((compilation-enter-directory-regexp-alist
+			      ,enter-regexp-alist)
+			     (compilation-leave-directory-regexp-alist
+			      ,leave-regexp-alist)
+			     (compilation-file-regexp-alist
+			      ,file-regexp-alist)
+			     (compilation-nomessage-regexp-alist
+			      ,nomessage-regexp-alist)))
+		(if (boundp (car elt))
+		    (set (make-local-variable (car elt)) (second elt)))))
+
+	    (if (boundp 'compilation-directory-stack)
+		(setq default-directory thisdir
+		      compilation-directory-stack (list default-directory)))
+	    (compilation-set-window-height outwin)
+
+	    (if (not jde-xemacsp)
+		(if compilation-process-setup-function
+		    (funcall compilation-process-setup-function)))))
+	;; Make it so the next C-x ` will use this buffer.
+	(setq compilation-last-buffer outbuf)))
+
+(defun jde-ant-filter (proc string)
+  "This filter prints out the result of the process without buffering.
+The result is inserted as it comes in the compilation buffer."
+  (let ((compilation-buffer (get-buffer "*compilation*")))
+    (if (not (null compilation-buffer))
+	(with-current-buffer compilation-buffer
+	  (let ((stack-trace
+		 (string-match "java.lang.SecurityException" string))
+		(end-of-result (string-match ".*bsh % " string))
+		(win (get-buffer-window "*compilation*")))
+
+	    (save-excursion
+	      ;;Insert the text, advancing the process marker
+	      (goto-char (point-max))
+
+	      ;;if the security exception has been thrown set the
+	      ;;jde-ant-passed-security-exception flag and filter the stack
+	      ;;trace out of the ouput
+	      (if stack-trace
+		  (progn
+		    (setq jde-ant-passed-security-exception t)
+		    (insert (substring string 0 stack-trace))
+		    (set-buffer-modified-p nil)
+		    (compilation-mode)
+		    (jde-ant-set-build-status (buffer-string))
+		    (jde-ant-handle-exit)))
+
+	      (if end-of-result
+		  (progn
+		    (if (not jde-ant-passed-security-exception)
+			(progn
+			  (insert (substring string 0 end-of-result))
+			  (set-buffer-modified-p nil)
+			  (compilation-mode)
+			  (jde-ant-set-build-status (buffer-string))
+			  (jde-ant-handle-exit)))
+		    (set-process-filter proc jde-ant-comint-filter)))
+	      (if (and (not end-of-result)
+		       (not jde-ant-passed-security-exception))
+		  (insert string)))
+	    (if (not jde-xemacsp)
+		(if compilation-scroll-output
+		    (save-selected-window
+		      (if win
+			  (progn
+			    (select-window win)
+			    (goto-char (point-max))))))))))))
+
+(defun jde-ant-handle-exit ()
+  "Handles the compilation exit"
+  (compilation-handle-exit
+   'exit jde-ant-build-status
+   (if (string= "0" jde-ant-build-status)
+       "finished\n"
+     "exited abnormally with code 1\n")))
+
+(defun jde-ant-set-build-status (buffer-contents)
+  "Sets the build status based on the BUFFER-CONTENTS"
+  (if (string-match ".*BUILD SUCCESSFUL.*" buffer-contents)
+      (setq jde-ant-build-status "0"))
+  (if (string-match ".*BUILD FAILED.*" buffer-contents)
+      (setq jde-ant-build-status "1")))
+
+;;;###autoload
+(defun jde-ant-projecthelp(buildfile)
+  "Display Ant project help for the current project.
+This will execute the Ant program with the `-projecthelp' switch to output
+available targets with their descriptions for the current buildfile. This
+function uses the same rules as `jde-ant-build' for finding the buildfile."
+  (interactive
+   (list
+    (jde-ant-interactive-get-buildfile)))
+
+  (jde-ant-build buildfile nil "-projecthelp"))
+
+(defun jde-ant-find-build-file (dir)
+  "Find the next Ant build file upwards in the directory tree from DIR.
+Returns nil if it cannot find a project file in DIR or an ascendant directory."
+  (let ((file (find (cond ((string= jde-ant-buildfile "") "build.xml")
+			  (t jde-ant-buildfile))
+		    (directory-files dir) :test 'string=)))
+
+    (if file
+	(setq file (expand-file-name file dir))
+      (if (not (jde-root-dir-p dir))
+	  (setq file (jde-ant-find-build-file (concat dir "../")))))
+
+    file))
+
+(defun jde-ant-get-target-alist (buildfile)
+  "Returns asociation list of valid Ant project targets."
+
+  (let ((targets nil )
+	(temp-buf (get-buffer-create "*jde-ant-get-target-list-temp-buffer*")))
+    (unwind-protect
+	(save-excursion
+	  (set-buffer temp-buf)
+	  (erase-buffer)
+	  (insert-file-contents buildfile)
+	  (goto-char (point-min))
+	  (while (re-search-forward jde-ant-target-regexp (point-max) t)
+	    (setq targets (append targets (list (list (match-string 1)))))))
+      (kill-buffer temp-buf))
+
+    targets))
+
+;;;###autoload
+(defun jde-ant-show-options ()
+  "Show the JDE Ant Options panel."
+  (interactive)
+  (customize-apropos "jde-ant" 'groups))
+
+(defun jde-ant-get-default-directory ()
+  "Gets the default-directory according to the value of
+'jde-ant-working-directory."
+  (if (string= jde-ant-working-directory "")
+      default-directory
+    jde-ant-working-directory))
+
+(defun jde-ant-add-to-history (buildfile build-history)
+  (let ((temp (nth 0 jde-ant-interactive-target-history))
+	(index -1) (found nil))
+    (while (and temp (not found))
+      (setq index (1+ index))
+      (setq temp (nth index jde-ant-interactive-target-history))
+      (if (string= (car temp) buildfile)
+	  (setq found t)))
+    (if found
+	(setcdr temp build-history)
+      (setq jde-ant-interactive-target-history
+	    (append
+	     jde-ant-interactive-target-history
+	     (list (list buildfile (car build-history))))))))
+
+(defun jde-ant-get-from-history (buildfile)
+  (let ((temp (nth 0 jde-ant-interactive-target-history))
+	(index -1) (found nil))
+    (while (and temp (not found))
+      (setq index (1+ index))
+      (setq temp (nth index jde-ant-interactive-target-history))
+      (if (string= (car temp) buildfile)
+	  (setq found t)))
+    (if found
+	(cdr temp)
+      nil)))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-ant)
+
+;; End of jde-ant.el
diff --git a/site/jdee/lisp/jde-ant.elc b/site/jdee/lisp/jde-ant.elc
new file mode 100644
index 0000000..53ef032
Binary files /dev/null and b/site/jdee/lisp/jde-ant.elc differ
diff --git a/site/jdee/lisp/jde-autoload.el b/site/jdee/lisp/jde-autoload.el
new file mode 100644
index 0000000..8faeb04
--- /dev/null
+++ b/site/jdee/lisp/jde-autoload.el
@@ -0,0 +1,1293 @@
+
+;;;### (autoloads (bsh-script-help) "beanshell" "beanshell.el" (19289
+;;;;;;  5860))
+;;; Generated autoloads from beanshell.el
+
+(autoload (quote bsh-script-help) "beanshell" "\
+Display BeanShell User's Guide.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-ant-show-options jde-ant-projecthelp jde-ant-build)
+;;;;;;  "jde-ant" "jde-ant.el" (19289 5860))
+;;; Generated autoloads from jde-ant.el
+
+(autoload (quote jde-ant-build) "jde-ant" "\
+Build the current project using Ant.  If interactive, we try to prompt the
+  user for certain variables..
+
+\(fn BUILDFILE TARGET &optional INTERACTIVE-ARGS)" t nil)
+
+(autoload (quote jde-ant-projecthelp) "jde-ant" "\
+Display Ant project help for the current project.
+This will execute the Ant program with the `-projecthelp' switch to output
+available targets with their descriptions for the current buildfile. This
+function uses the same rules as `jde-ant-build' for finding the buildfile.
+
+\(fn BUILDFILE)" t nil)
+
+(autoload (quote jde-ant-show-options) "jde-ant" "\
+Show the JDE Ant Options panel.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-bookmark-list jde-bookmark-add jde-bookmark-visit)
+;;;;;;  "jde-bookmark" "jde-bookmark.el" (19289 5860))
+;;; Generated autoloads from jde-bookmark.el
+
+(autoload (quote jde-bookmark-visit) "jde-bookmark" "\
+Visit a class by bookmark name.
+
+\(fn KEY)" t nil)
+
+(autoload (quote jde-bookmark-add) "jde-bookmark" "\
+Add the current visited class as a bookmark.
+
+\(fn KEY &optional FQ-CLASS)" t nil)
+
+(autoload (quote jde-bookmark-list) "jde-bookmark" "\
+List bookmarks.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-bsh-quote-expr jde-bsh-run jde-jeval) "jde-bsh"
+;;;;;;  "jde-bsh.el" (19289 5860))
+;;; Generated autoloads from jde-bsh.el
+
+(autoload (quote jde-jeval) "jde-bsh" "\
+Uses the JDEE's instance of the BeanShell
+Java interpreter to evaluate the Java expression EXPR.  If the
+BeanShell is not running, the JDEE starts an instance. This function
+returns any text output by the Java interpreter's standard out or
+standard error pipes.  If EVAL-RETURN is non-nil, this function
+returns the result of evaluating the Java output as a Lisp
+expression.
+
+NO-PRINT-P, if non-nil, don't wrap JAVA-STATEMENT with a `print'
+command yeilding the output.  This is going to need to be true
+for most things since unless `show()' was invoked and output
+prints out, Emacs has nothing to evaluate or report.
+
+\(fn JAVA-STATEMENT &optional EVAL-RETURN NO-PRINT-P)" t nil)
+
+(autoload (quote jde-bsh-run) "jde-bsh" "\
+*Starts the JDEE version of the BeanShell.
+
+\(fn)" t nil)
+
+(autoload (quote jde-bsh-quote-expr) "jde-bsh" "\
+Add necessary syntax for a beanshell string (parameter) in the current
+buffer.  This is useful for quoting a whole buffer or strings with newlines,
+etc.  This gives the outside double quotes as well.
+
+NO-PARAM-P if non-nil, don't split string (surround double quotes) using string
+concatentation.  The only way to get quotes in strings is to split them up and
+concatenate the quote (') char using the plus (+) operator.  This doesn't do
+this syntax change.
+
+NO-QUOTE-WRAP-P, if non-nil, don't add double quotes around the whole statement.
+
+\(fn &optional START END NO-PARAM-P NO-QUOTE-WRAP-P)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-bug-debug-app) "jde-bug" "jde-bug.el" (19289
+;;;;;;  5860))
+;;; Generated autoloads from jde-bug.el
+
+(autoload (quote jde-bug-debug-app) "jde-bug" "\
+Runs the debugger on the application in the current source buffer.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-checkstyle jde-checkstyle-customize) "jde-checkstyle"
+;;;;;;  "jde-checkstyle.el" (19289 5860))
+;;; Generated autoloads from jde-checkstyle.el
+
+(autoload (quote jde-checkstyle-customize) "jde-checkstyle" "\
+Set Java style checking options.
+
+\(fn)" t nil)
+
+(autoload (quote jde-checkstyle) "jde-checkstyle" "\
+Checks the Java program in the current buffer.
+This command invokes the style checker specified by `jde-checkstyle-class'
+with the options specif2ied by the JDEE customization variables
+that begin with `jde-checkstyle'. If the variable
+`jde-checkstyle-read-args' is non-nil, this command reads
+additional compilation options from the minibuffer, with
+history enabled.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "jde-compat" "jde-compat.el" (19289 5860))
+;;; Generated autoloads from jde-compat.el
+
+(defconst jde-xemacsp (string-match "XEmacs" (emacs-version)) "\
+Non-nil if we are running in the XEmacs environment.")
+
+;;;***
+
+;;;### (autoloads (jde-compile jde-set-compile-options) "jde-compile"
+;;;;;;  "jde-compile.el" (19289 5860))
+;;; Generated autoloads from jde-compile.el
+
+(autoload (quote jde-set-compile-options) "jde-compile" "\
+Sets the compile options.
+Enter the options as you would on the command line, e.g.,
+-depend -verbose.
+
+\(fn OPTIONS)" t nil)
+
+(autoload (quote jde-compile) "jde-compile" "\
+Compile the Java program in the current buffer.
+This command invokes the compiler specified by `jde-compiler'
+with the options specified by the JDE customization variables
+that begin with `jde-compile'. If the variable
+`jde-read-compile-args' is non-nil, this command reads
+additional compilation options from the minibuffer, with
+history enabled. If `jde-compiler' specifies the JDE compile
+server, this command uses the compile server. Otherwise, it
+uses the compiler executable specified by
+`jde-compiler' to compile.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-customize-option) "jde-custom" "jde-custom.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-custom.el
+
+(defalias (quote jde-customize-variable) (quote jde-customize-option))
+
+(autoload (quote jde-customize-option) "jde-custom" "\
+Customize SYMBOL, which must be a JDEE option variable.
+
+\(fn SYMBOL)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-debug-applet jde-debug jde-db-set-app-args
+;;;;;;  jde-db-set-args jde-db-set-debugger) "jde-db" "jde-db.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-db.el
+
+(autoload (quote jde-db-set-debugger) "jde-db" "\
+Specify the pathname of the debugger, if an executable, or the
+debugger's fully qualified class name, if a class.
+
+\(fn NAME IS-EXECUTABLE)" t nil)
+
+(autoload (quote jde-db-set-args) "jde-db" "\
+Specify the arguments (except -classpath) to be passed to the debugger.
+
+\(fn ARGS)" t nil)
+
+(autoload (quote jde-db-set-app-args) "jde-db" "\
+Specify the arguments to be passed to the Java application class.
+
+\(fn ARGS)" t nil)
+
+(autoload (quote jde-debug) "jde-db" "\
+Run the debugger specified by `jde-debugger' on the Java application
+whose source resides in the current buffer. This command determines
+the main class of the application either from the variable
+`jde-run-application-class' or from the source in the current
+buffer. If `jde-run-application-class' does not specify a class, the
+main class is assumed to be the class defined by the current source
+buffer. This command creates a command buffer for the debug session.
+
+\(fn)" t nil)
+
+(autoload (quote jde-debug-applet) "jde-db" "\
+Runs an applet in the jdb debugger. This function prompts you to enter
+the path of an html document that displays the applet. If you
+do not enter a path, this function next checks
+whether `jde-run-applet-doc' specifies a document. If so, it displays
+that specified document. Next, it checks whether the current directory
+contains any html files. If so, it displays the first html file that
+it finds. If if cannot find an html file, it signals an error.  This
+function runs appletviewer in jdb to permit debugging. On startup, it
+sets a breakpoint in the init method of the class specified by
+`jde-run-application-class' or in the class corresponding to the Java
+file in the current buffer.
+
+\(fn &optional DOC)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-ejb-entity-bean-buffer jde-ejb-session-bean-buffer)
+;;;;;;  "jde-ejb" "jde-ejb.el" (19289 5860))
+;;; Generated autoloads from jde-ejb.el
+
+(autoload (quote jde-ejb-session-bean-buffer) "jde-ejb" "\
+Create a new Java buffer containing an EJB session bean class of the same name.
+This command also creates buffers with the EJB Home and EJB Remote interfaces
+and the XML Deployment descriptor defined
+by the jde-ejb templates.  This includes naming the files according
+to the EJB naming convention.
+
+\(fn EJB-NAME)" t nil)
+
+(autoload (quote jde-ejb-entity-bean-buffer) "jde-ejb" "\
+Create a new Java buffer containing an EJB entity bean class of the same name.
+This command also creates buffers with the EJB Home and EJB Remote interfaces
+and the XML Deployment descriptor defined
+by the jde-ejb templates.  This includes naming the files according
+to the EJB naming convention.
+
+\(fn EJB-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-gen-exception-buffer jde-gen-exception-buffer-template
+;;;;;;  jde-gen-object-methods jde-gen-tostring-return jde-gen-tostring-method-template
+;;;;;;  jde-gen-hashcode-body jde-gen-hashcode-method-template jde-gen-equals-return
+;;;;;;  jde-gen-equals-method-template jde-gen-equals-parens-around-expression
+;;;;;;  jde-gen-equals-trailing-and-operators jde-gen-buffer jde-gen-jfc-app-buffer
+;;;;;;  jde-gen-bean-buffer jde-gen-console-buffer jde-gen-interface-buffer
+;;;;;;  jde-gen-class-buffer) "jde-gen" "jde-gen.el" (19289 5860))
+;;; Generated autoloads from jde-gen.el
+
+(autoload (quote jde-gen-class-buffer) "jde-gen" "\
+Create a new Java buffer containing a class of the same name.
+This command inserts the class template generated by `jde-gen-class'.
+
+\(fn FILE)" t nil)
+
+(autoload (quote jde-gen-interface-buffer) "jde-gen" "\
+Create a new Java buffer containing an interface of the same name.
+This command inserts the interface template generated by `jde-gen-interface'.
+It then moves the point to the location of the first method.
+
+\(fn FILE)" t nil)
+
+(autoload (quote jde-gen-console-buffer) "jde-gen" "\
+Create a new Java buffer containing a console class of the same name.
+This command inserts the class template generated by `jde-gen-class'.
+It then moves the point to the location to the constructor.
+
+\(fn FILE)" t nil)
+
+(autoload (quote jde-gen-bean-buffer) "jde-gen" "\
+Create a new Java buffer containing a Java bean of the same name.
+This command inserts the class template generated by `jde-gen-bean'.
+It then moves the point to the location of the constructor.
+
+\(fn FILE)" t nil)
+
+(autoload (quote jde-gen-jfc-app-buffer) "jde-gen" "\
+Create a new Java buffer containing a JFC application class.
+This command inserts the class template generated by `jde-gen-jfc-app'.
+It then moves the point to the location to the constructor.
+
+\(fn FILE)" t nil)
+
+(autoload (quote jde-gen-buffer) "jde-gen" "\
+Create a new Java buffer containing a code template.
+This command inserts the specified template at the beginning
+of the buffer.
+
+\(fn TEMPLATE FILE)" t nil)
+
+(defvar jde-gen-equals-trailing-and-operators nil "\
+Specifies whether the '&&' operators in a generated equals
+method are added at the end of the line or at the beginning.  If
+this variable is t, the operator will be added at the end of the
+line, else on the next line before the comparison.  With
+`jde-gen-equals-trailing-and-operators' set to nil:
+
+    return (a == o.a)
+	&& (b == o.b)
+	&& (s == null ? o.s == null : s.equals(o.s));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+
+    return (a == o.a) &&
+	(b == o.b) &&
+	(s == null ? o.s == null : s.equals(o.s));
+")
+
+(custom-autoload (quote jde-gen-equals-trailing-and-operators) "jde-gen" t)
+
+(defvar jde-gen-equals-parens-around-expression nil "\
+Specifies whether the generated equals expression should be
+surrounded by parentheses.
+With `jde-gen-equals-trailing-and-operators' set to nil:
+
+    return ((a == o.a)
+	    && (b == o.b)
+	    && (s == null ? o.s == null : s.equals(o.s)));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+
+    return ((a == o.a) &&
+	    (b == o.b) &&
+	    (s == null ? o.s == null : s.equals(o.s)));
+")
+
+(custom-autoload (quote jde-gen-equals-parens-around-expression) "jde-gen" t)
+
+(defvar jde-gen-equals-method-template (quote ("'>" "\"/**\" '> 'n" "\" * Check if this object is equal (equivalent) to another object.\" '> 'n" "\" */\" '> 'n" "(jde-gen-method-signature \"public\" \"boolean\" \"equals\" \"Object obj\")" "(jde-gen-electric-brace)" "\"if (obj == this) return true;\" '> 'n" "\"if ((obj == null) || !getClass().equals(obj.getClass())) return false;\" '> 'n" "'> 'n" "(jde-gen-equals-return \"obj\" \"o\") '> 'n" "\"}\" '> 'n '>))")) "\
+*Template for creating an equals method.
+Setting this variable defines a template instantiation command
+`jde-gen-equals-method', as a side-effect.")
+
+(custom-autoload (quote jde-gen-equals-method-template) "jde-gen" nil)
+
+(autoload (quote jde-gen-equals-return) "jde-gen" "\
+Generate a body of an appropriate override for the
+java.lang.Object#equals(Object) function. This function gets the
+list of member variables from`jde-parse-get-serializable-members'.
+
+The first optional parameter `parm-name' is the parameter name of
+the Object argument of the equals function.  Default is \"obj\".
+
+The second optional parameter `var-name' denotes the variable
+name used to cast the \"obj\" argument to. The default is \"o\".
+
+The third optional parameter `class' can be a semantic tag, which
+is then used instead of the result of `semantic-current-tag'.
+
+Example:
+    class Bean {
+	int a;
+	long b;
+	String s;
+    }
+
+Result:
+    Bean o = (Bean) obj;
+
+    return (a == o.a)
+	&& (b == o.b)
+	&& (s == null ? o.s == null : s.equals(o.s));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+    Bean o = (Bean) obj;
+
+    return (a == o.a) &&
+	(b == o.b) &&
+	(s == null ? o.s == null : s.equals(o.s));
+
+\(fn &optional PARM-NAME VAR-NAME CLASS)" t nil)
+
+(defvar jde-gen-hashcode-method-template (quote ("'>" "\"/**\" '> 'n" "\" * Calculate the hash code for this object.\" '> 'n" "\" * \" '> 'n" "\" * <p>The rules laid out in J. Blosh's Effective Java are used\" '> 'n" "\" * for the hash code calculation.</p>\" '> 'n" "\" * \" '> 'n" "\" * @return the hash code.\" '> 'n" "\" * \" '> 'n" "\" * @see java.lang.Object#hashCode\" '> 'n" "\" */\" '> 'n" "(jde-gen-method-signature \"public\"\"int\" \"hashCode\" nil)" "(jde-gen-electric-brace)" "(jde-gen-hashcode-body) '> 'n" "\"}\" '> 'n '>")) "\
+*Template for creating a hashCode method.
+Setting this variable defines a template instantiation command
+`jde-gen-hashcode-method', as a side-effect.")
+
+(custom-autoload (quote jde-gen-hashcode-method-template) "jde-gen" nil)
+
+(autoload (quote jde-gen-hashcode-body) "jde-gen" "\
+Generate a body of a hashCode function.
+This function gets the list of member variables of the current
+class from `jde-parse-get-serializable-members'.
+
+The first optional parameter `var-name' denotes the variable name used
+to calculate the hash code, the default is \"code\".
+
+The second optional parameter `class' can be a semantic tag, which is
+then used instead of the result of `semantic-current-tag'.
+
+\(fn &optional VAR-NAME CLASS)" t nil)
+
+(defvar jde-gen-tostring-method-template (quote ("'>" "(when jde-gen-create-javadoc" "'(l " "\"/**\" '> 'n" "\" * Get a string representation of this object.\" '> 'n" "\" * \" '> 'n" "\" * @return a string representation of this object.\" '> 'n" "\" * \" '> 'n" "\" * @see java.lang.Object#toString\" '> 'n" "\" */\" '> 'n))" "(jde-gen-method-signature \"public\" \"String\" \"toString\" \"\")" "(jde-gen-electric-brace)" "(jde-gen-tostring-return) '> 'n" "\"}\" '>")) "\
+*Template for creating an toString method.
+Setting this variable defines a template instantiation
+command `jde-gen-tostring-method', as a side-effect.")
+
+(custom-autoload (quote jde-gen-tostring-method-template) "jde-gen" nil)
+
+(autoload (quote jde-gen-tostring-return) "jde-gen" "\
+Generate a body of an appropriate override for the
+java.lang.Object#toString function. This gets the member variables
+of the current class from semantic via `semantic-current-tag'.
+
+\(fn &optional CLASS)" t nil)
+
+(autoload (quote jde-gen-object-methods) "jde-gen" "\
+Generates an equals(), a hashCode() and a toString method.
+
+\(fn)" t nil)
+
+(defvar jde-gen-exception-buffer-template (list "(open-line 1) (funcall jde-gen-boilerplate-function)" "(jde-gen-get-package-statement)" "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))" "\" * Exception <code>\" (jde-parse-get-buffer-unqualified-class) \"</code>.\" '> 'n" "\" \" (jde-javadoc-insert-empty-line)" "\" * Created: \" (current-time-string) '> 'n" "\" \" (jde-javadoc-insert-empty-line)" "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag))" "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag))" "\" \" (jde-javadoc-insert-end-block)" "\"public class \"" "(jde-parse-get-buffer-unqualified-class)" "\" \" (jde-gen-get-extend-class)" "(jde-gen-electric-brace)" "'p'n" "'> (jde-javadoc-insert-start-block)" "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n" "\"* <code>null</code> as its detail message.\" '>'n" "'> (jde-javadoc-insert-end-block)" "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) nil)" "(jde-gen-electric-brace)" "\"}\"'>'n" "'n" "'> (jde-javadoc-insert-start-block)" "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n" "\"* the specified detail message.\" '>'n" "'> (jde-javadoc-insert-empty-line)" "\"* @param message the detail message string.\" '> 'n" "'> (jde-javadoc-insert-end-block)" "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"String message\")" "(jde-gen-electric-brace)" "\"super(message);\" '> 'n" "\"}\" '> 'n" "'n" "'> (jde-javadoc-insert-start-block)" "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n" "\"* the specified cause and a detail message of\" '> 'n" "\"* <code>(cause == null ? null : cause.toString())</code>\" '> 'n" "\"* (which typically contains the class and detail message of cause).\" '> 'n" "'> (jde-javadoc-insert-empty-line)" "\"* @param cause the causing throwable. A null value is permitted\" '> 'n" "\"*     and indicates that the cause is nonexistent or unknown.\" '> 'n" "'> (jde-javadoc-insert-end-block)" "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"Throwable cause\")" "(jde-gen-electric-brace)" "\"super(cause == null ? (String) null : cause.toString());\" '> 'n" "\"initCause(cause);\" '> 'n" "\"}\" '> 'n" "'n" "'> (jde-javadoc-insert-start-block)" "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n" "\"* the specified cause and message.\" '> 'n" "'> (jde-javadoc-insert-empty-line)" "\"* @param message the detail message string.\" '> 'n" "\"* @param cause the causing throwable. A null value is permitted\" '> 'n" "\"*     and indicates that the cause is nonexistent or unknown.\" '> 'n" "'> (jde-javadoc-insert-end-block)" "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"String message,Throwable cause\")" "(jde-gen-electric-brace)" "\"super(message);\" '> 'n" "\"initCause(cause);\" '> 'n" "\"}\" '> 'n" "\"}\" '>" "(if jde-gen-comments (concat \" // \" (jde-parse-get-buffer-unqualified-class)))" "'>'n") "\
+*Template for a new exception class.
+Setting this variable defines a template instantiation
+command `jde-gen-exception', as a side-effect.")
+
+(custom-autoload (quote jde-gen-exception-buffer-template) "jde-gen" nil)
+
+(autoload (quote jde-gen-exception-buffer) "jde-gen" "\
+Create a new Java buffer containing an exception class of the same name.
+This command inserts the template generated by `jde-gen-exception'.
+It then moves the point to the location of the first method.
+
+\(fn FILE)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-help-browse-jdk-doc jde-help-beanshell) "jde-help"
+;;;;;;  "jde-help.el" (19289 5860))
+;;; Generated autoloads from jde-help.el
+
+(autoload (quote jde-help-beanshell) "jde-help" "\
+Displays the BeanShell documentation.
+
+\(fn)" t nil)
+
+(autoload (quote jde-help-browse-jdk-doc) "jde-help" "\
+Displays the JDK doc in a web browser. This function uses the URL
+stored in the variable jde-jdk-doc-url to locate the JDK documentation.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-import-at-point jde-import-organize) "jde-import"
+;;;;;;  "jde-import.el" (19289 5860))
+;;; Generated autoloads from jde-import.el
+
+(autoload (quote jde-import-organize) "jde-import" "\
+Organize import statements of the current Java source buffer.
+If optional FORCE is non-nil force reordering even if imports are
+already organized.
+
+Imports are organized into groups returned by the function specified
+by `jde-import-group-function'.  Groups are inserted in the order they
+are found unless `jde-import-sorted-groups' requires that they must be
+alphabetically sorted.  In each group imports are sorted by name
+alphabetically or in reverse order if `jde-import-reverse-sort-group'
+is non-nil.  A blank line is inserted between groups.
+
+Usage:
+  \\[jde-import-organize] group and sort import statements.
+  \\[universal-argument] \\[jde-import-organize] to force reordering.
+
+The current buffer must be in `jde-mode'.  This command requires a
+version of the JDE with the semantic parser.
+
+\(fn &optional FORCE)" t nil)
+
+(autoload (quote jde-import-at-point) "jde-import" "\
+Import a class at the current point.
+The fully qualified class is received from user input.
+
+\(fn CLASS)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-java-font-lock-setup-keywords) "jde-java-font-lock"
+;;;;;;  "jde-java-font-lock.el" (19289 5860))
+;;; Generated autoloads from jde-java-font-lock.el
+
+(autoload (quote jde-java-font-lock-setup-keywords) "jde-java-font-lock" "\
+Setup font lock keywords in `java-font-lock-keywords-4'.
+If optional REBUILD flag is non-nil create a new cache of regular
+expressions.
+
+\(fn &optional REBUILD)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-java-properties-validate jde-java-properties-mode)
+;;;;;;  "jde-java-properties" "jde-java-properties.el" (19289 5860))
+;;; Generated autoloads from jde-java-properties.el
+
+(autoload (quote jde-java-properties-mode) "jde-java-properties" "\
+Major mode for Java properties files buffer.
+
+\(fn)" t nil)
+
+(autoload (quote jde-java-properties-validate) "jde-java-properties" "\
+Determine whether or not the properties file conforms to the Sun
+java.util.Properties format.  Only the first invalid line is found.
+
+GOTO indicates whether or not to put the point at the first invalid line
+found.
+
+\(fn &optional GOTO)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-javadoc-make-buffer jde-javadoc-make jde-javadoc-make-internal)
+;;;;;;  "jde-javadoc-gen" "jde-javadoc-gen.el" (19289 5860))
+;;; Generated autoloads from jde-javadoc-gen.el
+
+(autoload (quote jde-javadoc-make-internal) "jde-javadoc-gen" "\
+Generates javadoc for the current project if MAKE-PACKAGES-P
+and `jde-javadoc-gen-packages' are nonnil; otherwise, make doc
+for the current buffer. This command runs the
+currently selected javadoc's program to generate the documentation.
+It uses `jde-get-jdk-dir' to determine the location of
+the currentlyh selected JDK. The variable `jde-global-classpath' specifies
+the javadoc -classpath argument. The variable `jde-sourcepath'
+specifies the javadoc  -sourcepath argument. You can specify all
+other javadoc options via JDE customization variables. To specify the
+options, select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-gen-packages' to specify the packages, classes, or source
+files for which you want to generate javadoc. If this variable is nil,
+this command generates javadoc for the Java source file in the current
+buffer. If `jde-javadoc-display-doc' is nonnil, this command displays
+the generated documentation in a browser.
+
+\(fn &optional MAKE-PACKAGES-P)" nil nil)
+
+(autoload (quote jde-javadoc-make) "jde-javadoc-gen" "\
+Generates javadoc for the current project. This command runs the
+currently selected JDK's javadoc program to generate the documentation.
+It uses `jde-get-jdk-dir' to determine the location of the currently
+selected JDK. The variable `jde-global-classpath' specifies the javadoc
+-classpath argument. The variable `jde-sourcepath'
+specifies the javadoc  -sourcepath argument. You can specify all
+other javadoc options via JDE customization variables. To specify the
+options, select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-gen-packages' to specify the packages, classes, or source
+files for which you want to generate javadoc. If this variable is nil,
+this command generates javadoc for the Java source file in the current
+buffer. If `jde-javadoc-display-doc' is nonnil, this command displays
+the generated documentation in a browser.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-make-buffer) "jde-javadoc-gen" "\
+Generates javadoc for the current buffer. This command runs the
+currently selected JDK's javadoc program to generate the
+documentation. It uses `jde-get-jdk-dir' to determine the location of the currently
+selected JDK.  The variable `jde-global-classpath' specifies the
+javadoc -classpath argument. The variable `jde-sourcepath' specifies
+the javadoc -sourcepath argument. You can specify all other javadoc
+options via JDE customization variables. To specify the options,
+select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-make' to generate doc for the files and packages
+specified by `jde-javadoc-gen-packages'. If `jde-javadoc-display-doc'
+is nonnil, this command displays the generated documentation in a
+browser.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-javadoc-enable-menu-p jde-javadoc-remove jde-javadoc-checkdoc
+;;;;;;  jde-javadoc-checkdoc-at-line jde-javadoc-remdoc-at-line jde-javadoc-autodoc-at-line
+;;;;;;  jde-javadoc-customize jde-javadoc-checker-quit jde-javadoc-checker-fix
+;;;;;;  jde-javadoc-checker-next jde-javadoc-checker-previous) "jde-javadoc"
+;;;;;;  "jde-javadoc.el" (19289 5860))
+;;; Generated autoloads from jde-javadoc.el
+
+(autoload (quote jde-javadoc-checker-previous) "jde-javadoc" "\
+Go to the previous tag with doc errors.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-checker-next) "jde-javadoc" "\
+Goto the next tag with doc errors.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-checker-fix) "jde-javadoc" "\
+Fix documentation of checked tag.
+Used in `jde-javadoc-checker-report-mode'.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-checker-quit) "jde-javadoc" "\
+Quit the `jde-javadoc-checker' report buffer.
+Used in `jde-javadoc-checker-report-mode'.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-customize) "jde-javadoc" "\
+Show the jde-javadoc options panel.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-autodoc-at-line) "jde-javadoc" "\
+Update javadoc comment block for declaration at current line.
+
+Uses the semantic bovinator parser table to find declarations (see
+`jde-javadoc-nonterminal-at-line').
+
+BEFORE EXECUTING THE COMMAND, THE POINT MUST BE LOCATED AT THE FIRST
+LINE OF THE CLASS OR METHOD DECLARATION.  IF NOT RESULT IS UNCERTAIN.
+
+In the following examples, point is located at the beginning of the
+line, before the word 'public' (but it could be anywhere on this
+line):
+
+1- Class example:
+   -------------
+
+-|-  public class MyClass
+       extends MySuperClass implements Runnable, java.io.Serializable
+     {
+       ...
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe class <code>MyClass</code> here.
++     *
++     * @author \"David Ponce\" <david.ponce@wanadoo.fr>
++     * @version 1.0
++     * @since 1.0
++     * @see MySuperClass
++     * @see Runnable
++     * @see java.io.Serializable
++     */
+     public class MyClass
+       extends MySuperClass implements Runnable, java.io.Serializable
+     {
+       ...
+
+2- Method example:
+   --------------
+
+-|-  public
+     void   myMethod( int  x,  int y )
+       throws Exception
+     {
+       ...
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe <code>myMethod</code> method here.
++     *
++     * @param x an <code>int</code> value
++     * @param y a <code>long</code> value
++     * @exception Exception if an error occurs
++     */
+     public
+     void   myMethod( int  x,  long y )
+       throws Exception
+     {
+       ...
+
+3- Field example:
+   --------------
+
+-|-  private static final int SIZE = 10;
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe constant <code>SIZE</code> here.
++     */
+     private static final int SIZE = 10;
+
+
+`tempo' templates are used for each category of javadoc line.  The
+following templates are currently defined and fully customizable (see
+`tempo-define-template' for the different items that can be used in a
+tempo template):
+
+- - `jde-javadoc-author-tag-template'
+- - `jde-javadoc-describe-class-template'
+- - `jde-javadoc-describe-constructor-template'
+- - `jde-javadoc-describe-interface-template'
+- - `jde-javadoc-describe-method-template'
+- - `jde-javadoc-describe-field-template'
+- - `jde-javadoc-exception-tag-template'
+- - `jde-javadoc-param-tag-template'
+- - `jde-javadoc-return-tag-template'
+- - `jde-javadoc-version-tag-template'
+
+For example if you customize `jde-javadoc-describe-class-template'
+with the following value:
+
+'(\"* \" (P \"Class description: \"))
+
+you will be asked to enter the class description in the minibuffer.
+See also the `jde-javadoc-field-type', `jde-javadoc-a' and
+`jde-javadoc-code' helper functions.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-remdoc-at-line) "jde-javadoc" "\
+Remove javadoc comment block for declaration at current line.
+Require confirmation if optional NOCONFIRM is non-nil.
+Return non-nil if done.
+This uses `jde-javadoc-nonterminal-at-line' to find declarations.
+
+\(fn &optional NOCONFIRM)" t nil)
+
+(autoload (quote jde-javadoc-checkdoc-at-line) "jde-javadoc" "\
+Check javadoc comment block of declaration at current line.
+
+Uses the semantic bovinator parser table to find declarations (see
+`jde-javadoc-nonterminal-at-line').
+
+BEFORE EXECUTING THE COMMAND, THE POINT MUST BE LOCATED AT THE FIRST
+LINE OF THE CLASS OR METHOD DECLARATION.  IF NOT RESULT IS UNCERTAIN.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-checkdoc) "jde-javadoc" "\
+Check doc comments of tags in the current buffer.
+Report the next tag with documentation errors.
+
+\(fn)" t nil)
+
+(autoload (quote jde-javadoc-remove) "jde-javadoc" "\
+Remove all Javadoc from the region (if one is active) or the buffer.
+START, the start position in the buffer.
+END, the end position in the buffer.
+
+\(fn START END)" t nil)
+
+(autoload (quote jde-javadoc-enable-menu-p) "jde-javadoc" "\
+Return non-nil if corresponding doc menu item is enabled.
+That is point is on the first line of a class, method, or field
+definition.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (jde-junit-show-options jde-junit-run jde-junit-add-test-to-suite
+;;;;;;  jde-junit4-test-class-buffer jde-junit-test-class-buffer
+;;;;;;  jde-junit4-test-class jde-junit-test-class) "jde-junit" "jde-junit.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-junit.el
+
+(autoload (quote jde-junit-test-class) "jde-junit" "\
+Instantiate a test class template.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit4-test-class) "jde-junit" "\
+Instantiate a test class template.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit-test-class-buffer) "jde-junit" "\
+Create a buffer containing a skeleton unit test class having the same name as the
+root name of the buffer. This command prompts you to enter the file name
+of the test class. It assumes that the file name has the form CLASSTest.java
+where CLASS is the name of the class to be tested, e.g., MyAppTest.java. Use
+`jde-gen-junit-add-test-to-suite' to add tests to the test suite. Use of
+tests generated with this template requires the JUnit test framework. For
+more information, see http://www.junit.org.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit4-test-class-buffer) "jde-junit" "\
+Create a buffer containing a skeleton unit test class having
+the same name as the root name of the buffer. This command
+prompts you to enter the file name of the test class. It assumes
+that the file name has the form CLASSTest.java where CLASS is the
+name of the class to be tested, e.g., MyAppTest.java. Use of
+tests generated with this template requires the JUnit test
+framework. For more information, see http://www.junit.org.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit-add-test-to-suite) "jde-junit" "\
+Instantiate an addTest method.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit-run) "jde-junit" "\
+Starts junit testrunner with buffer corresponding class name.
+
+\(fn)" t nil)
+
+(autoload (quote jde-junit-show-options) "jde-junit" "\
+Show the JDE JUnit Options panel.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-make-show-options jde-make) "jde-make" "jde-make.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-make.el
+
+(autoload (quote jde-make) "jde-make" "\
+Run the make program specified by `jde-make-program' with the
+command-line arguments specified by `jde-make-args'. If
+`jde-read-make-args' is nonnil, this command also prompts you to enter
+make arguments in the minibuffer and passes any arguments that you
+enter to the make program along with the arguments specified by
+`jde-make-args'.
+
+\(fn)" t nil)
+
+(autoload (quote jde-make-show-options) "jde-make" "\
+Show the JDE Make Options panel.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-find-class-source jde-read-class) "jde-open-source"
+;;;;;;  "jde-open-source.el" (19289 5860))
+;;; Generated autoloads from jde-open-source.el
+
+(autoload (quote jde-read-class) "jde-open-source" "\
+Select a class interactively.  PROMPT is used to prompt the user for the
+first class name, FQ-PROMPT is used only if the class name expands into more
+than one fully qualified name.
+
+PROMPT text used to prompt the user for the simple class name, or
+\"Class\" as the default.  Don't add the colon/space at the end
+of this prompt as a default will be added if it exists.
+
+FQ-PROMPT text used to prompt the fully qualified class name, or
+\"Select qualified class\" as the default.  Don't add the
+colon/space at the end of this prompt as a default will be added
+if it exists.
+
+THIS-CLASS-P, if non-nil, use the current class name if no class name at point
+and we are in a JDEE buffer.
+
+CONFIRM-FQ-P, if non-nil, confirm the class name even when there
+is only one unique fully qualified class found for the simple
+class name (that is the class without the package part in the
+name).
+
+NO-CONFIRM-NFQ-P, if non-nil, don't confirm the class to check for fully
+qualified classes if it is obtainable from either the point or this class (see
+THIS-CLASS-P).  If obtained from the point, then the class name is parsed with
+`jde-parse-class-name' for the input.
+
+VALIDATE-FN is a function to validate the class.  This function takes an
+argument the output from `jde-parse-class-name' given from the first user input
+class name query.  The function should raise an error if there is anything
+wrong with the class.  If this is `nil', then no validate is done.
+
+When called interactively, select the class and copy it to the kill ring.
+
+\(fn &optional PROMPT FQ-PROMPT THIS-CLASS-P CONFIRM-FQ-P NO-CONFIRM-NFQ-P VALIDATE-FN)" t nil)
+
+(autoload (quote jde-find-class-source) "jde-open-source" "\
+*Find the source file for a specified fully qualified class.
+Calls `jde-find-class-source-file' to do the search.
+If it finds the source file, it opens the file in a buffer.
+
+\(fn CLASS &optional OTHER-WINDOW)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-package-update) "jde-package" "jde-package.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-package.el
+
+(autoload (quote jde-package-update) "jde-package" "\
+Create or update the package statement in the current Java source
+file buffer based on the file's location relative to the root of
+the package directory as specified by one of the entries in
+`jde-package-search-classpath-variables' or `jde-sourcepath'.
+If these variables do not specify the root of the package directory,
+this command does nothing. This command signals an error if the
+ major mode of the current buffer is not `jde-mode'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-member-to-attribute jde-camel-to-lisp jde-camel-to-c-const
+;;;;;;  jde-camel-to-sql jde-hungarian-to-reverse-camel-notation)
+;;;;;;  "jde-parse-expr" "jde-parse-expr.el" (19289 5860))
+;;; Generated autoloads from jde-parse-expr.el
+
+(autoload (quote jde-hungarian-to-reverse-camel-notation) "jde-parse-expr" "\
+Converts Hungarian (i.e. m_sMyApp) to reverse camel notation (i.e. myApp).
+Hungarian notation is used, for example, in most Microsoft visual C++ code
+whereas reverse camel notation is used as the Sun Java standard style.
+
+START the start of the buffer region
+END is the end of the buffer region
+LOCAL-REPLACEMENT-P, if non-nil, replace expecting a local variable
+replacement.  This adds a `this.' to each replacment.
+
+\(fn START END LOCAL-REPLACEMENT-P)" t nil)
+
+(autoload (quote jde-camel-to-sql) "jde-parse-expr" "\
+Convert from reverse camel notation to the SQL underscore convention.
+
+\(fn START END)" t nil)
+
+(autoload (quote jde-camel-to-c-const) "jde-parse-expr" "\
+Convert from reverse camel notation to the C constant convention.
+
+\(fn START END)" t nil)
+
+(autoload (quote jde-camel-to-lisp) "jde-parse-expr" "\
+Convert from reverse camel notation to the lisp symbol convention.
+
+\(fn START END)" t nil)
+
+(autoload (quote jde-member-to-attribute) "jde-parse-expr" "\
+Convert Java member to a getter or setter syntax.
+
+MEMBER-NAME is member to convret.  This is taken as the current word at point
+when called interactively.
+
+GETTERP, if non-nil, make it a getter, otherwise make it a setter.  If
+\\[universal-argument] is used while calling interactively, then make it a
+setter, otherwise, make a getter.
+
+\(fn MEMBER-NAME GETTERP)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-parse-get-buffer-class) "jde-parse" "jde-parse.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-parse.el
+
+(autoload (quote jde-parse-get-buffer-class) "jde-parse" "\
+Get the fully qualified name of the class of this buffer.
+
+NO-PACKAGE-P, if non-`nil', return only the class name (sans
+package name), otherwise, include the package name.
+
+If called interactively, add the name in the mini-buffer.
+
+\(fn &optional NO-PACKAGE-P)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-create-new-project jde-save-project jde-open-project-file)
+;;;;;;  "jde-project-file" "jde-project-file.el" (19289 5860))
+;;; Generated autoloads from jde-project-file.el
+
+(autoload (quote jde-open-project-file) "jde-project-file" "\
+Opens the project file for the Java source file in the
+current buffer.
+
+\(fn)" t nil)
+
+(autoload (quote jde-save-project) "jde-project-file" "\
+Saves source file buffer options in one or more project files.
+This command provides an easy way to create and update a project file
+for a Java project. Simply open a source file, set the desired
+options, using the JDE Options menu, then save the settings in the
+project file, using this command.  Now, whenever you open a source
+file from the same directory tree, the saved settings will be restored
+for that file.
+
+\(fn)" t nil)
+
+(autoload (quote jde-create-new-project) "jde-project-file" "\
+Creates a new JDE project file in directory NEW-DIR, saving any
+current customized variables.  If a project file already exists in the
+given directory, the project is simply re-saved.  This functions the
+same as `jde-save-project' when no project files can be found for the
+current source file.  But, if there already exist projects somewhere
+along the path, this command unconditionally creates a project file in
+the directory specified, thus allowing the user to create and maintain
+hierarchical projects.
+
+\(fn NEW-DIR)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-describe-path jde-project-create-project)
+;;;;;;  "jde-project" "jde-project.el" (19289 5860))
+;;; Generated autoloads from jde-project.el
+
+(autoload (quote jde-project-create-project) "jde-project" "\
+Creates a JDE project.
+
+\(fn)" t nil)
+
+(autoload (quote jde-describe-path) "jde-project" "\
+Prints and gives file existance for each path.
+PATH-TYPE is either `global classpath' for `jde-global-classpath' or
+`source path' for `jde-sourcepath'.
+
+\(fn PATH-TYPE)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-replace-fully-qualified-class-at-point jde-rename-class)
+;;;;;;  "jde-refactor" "jde-refactor.el" (19289 5860))
+;;; Generated autoloads from jde-refactor.el
+
+(autoload (quote jde-rename-class) "jde-refactor" "\
+Rename the current class to another class name.  This does a class name
+string replace, changes the buffer name, and changes the file name.
+
+\(fn NEW-CLASS-NAME)" t nil)
+
+(autoload (quote jde-replace-fully-qualified-class-at-point) "jde-refactor" "\
+Replace the unqualified class at the current point with the fully qualified
+class.
+
+\(fn CLASS)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-run-applet jde-run jde-run-set-applet-doc
+;;;;;;  jde-run-set-applet-viewer jde-run-set-app-args jde-run-set-args
+;;;;;;  jde-run-set-app) "jde-run" "jde-run.el" (19289 5860))
+;;; Generated autoloads from jde-run.el
+
+(autoload (quote jde-run-set-app) "jde-run" "\
+Specify the name of the application class to run.
+
+\(fn APP)" t nil)
+
+(autoload (quote jde-run-set-args) "jde-run" "\
+Specify arguments to be passed to the Java vm.
+This command serves as an alternative to using the JDE Run Options
+panel to specify command-line arguments for the Java interpreter.
+
+\(fn ARGS)" t nil)
+
+(autoload (quote jde-run-set-app-args) "jde-run" "\
+Specify the arguments to be passed to the Java application class.
+This command provides an alternative to using the JDE Run Options panel
+to specify command-line arguments to pass to the application when starting
+the application.
+
+\(fn ARGS)" t nil)
+
+(autoload (quote jde-run-set-applet-viewer) "jde-run" "\
+Sets the viewer to be used to view an applet. The default is
+appletviewer.
+
+\(fn VIEWER)" t nil)
+
+(autoload (quote jde-run-set-applet-doc) "jde-run" "\
+Specify the doc to be used to view an applet.
+This command provides an alternative to using the JDE Options
+panel to specifying the applet document.
+
+\(fn DOC)" t nil)
+
+(autoload (quote jde-run) "jde-run" "\
+Run the Java application specified by `jde-run-executable', if
+not the null string. Otherwise run the class specified by
+`jde-run-application-class', if non-null; otherwise the class in the
+current buffer. Specifying a prefix argument, e.g., C-u C-c C-v C-r,
+causes this command to prompt you to enter arguments to be passed to
+the application's main method.  Specifying a minus prefix argument,
+i.e., C-u - C-c C-v C-r, causes this command to prompt you to also
+enter the name of the application's main class.  Note that you can use
+`jde-run-read-app-args' to cause the command to prompt you for
+application arguments by default (i.e., without having to specify a
+prefix argument). This command creates a comint buffer to allow you to
+interact with the program.
+
+\(fn PREFIX)" t nil)
+
+(autoload (quote jde-run-applet) "jde-run" "\
+Runs an applet. This function prompts you to enter the path of an
+html document that displays the applet. If you enter return without
+specifying a document, this function next checks whether
+`jde-run-applet-doc' specifies a document. If so, it displays that
+specified document. Next, it checks whether the current directory
+contains any html files. If the current directory contains an html
+file with the same root name as the Java file in the current buffer,
+it displays the file. If not, it displays the first html file that it
+finds in the current directory. If if cannot find an html file, it
+signals an error.  This function uses the viewer specified by
+`jde-run-applet-viewer' to display the specified document. Note that
+if you run two html applet files successively with the same name, you
+must kill the buffer created to run the first file before running the
+second file. Otherwise, this command will simply redisplay the first
+file.
+
+\(fn &optional DOC)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-stat-loc-report-directory jde-stat-loc-report-project
+;;;;;;  jde-stat-loc-report) "jde-stat" "jde-stat.el" (19289 5860))
+;;; Generated autoloads from jde-stat.el
+
+(autoload (quote jde-stat-loc-report) "jde-stat" "\
+Generates a report showing the number of code, comment,
+javadoc, and blank lines in the current Java source buffer. Optionally
+a total count could be passed to be displayes, as well as the number of
+processed files.
+
+\(fn &optional COUNT &optional TOTAL-FILES)" t nil)
+
+(autoload (quote jde-stat-loc-report-project) "jde-stat" "\
+Generates a report showing the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory and subdirectories. This method will kill any
+buffer containing a java file contained in dir.
+
+\(fn DIR)" t nil)
+
+(autoload (quote jde-stat-loc-report-directory) "jde-stat" "\
+Generates a report showing the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory. This method will kill any buffer containing a java file
+contained in dir.
+
+\(fn DIR)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-htmlize-code jde-exception-goto jde-require)
+;;;;;;  "jde-util" "jde-util.el" (19289 5860))
+;;; Generated autoloads from jde-util.el
+
+(autoload (quote jde-require) "jde-util" "\
+Require FEATURE, either pre-installed or from the distribution.
+ That is, first try to load the FEATURE library. Then try to load the
+ jde-FEATURE library from the JDEE's distribution.
+ Signal an error if FEATURE can't be found.
+
+\(fn FEATURE)" nil nil)
+
+(autoload (quote jde-exception-goto) "jde-util" "\
+Go to the Java source file and line indicated by an exception stack trace.
+
+\(fn)" t nil)
+
+(autoload (quote jde-htmlize-code) "jde-util" "\
+Write the current code region as an HTML document.
+Line numbers are added as well.
+
+See `jde-htmlize-code-destinations'.
+
+\(fn START END &optional NO-LINE-NUMBERS-P)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-which-method-mode) "jde-which-method" "jde-which-method.el"
+;;;;;;  (19289 5860))
+;;; Generated autoloads from jde-which-method.el
+
+(defvar jde-which-method-mode t "\
+Enables the JDE's which method mode.
+When which method mode is enabled, the current method name is
+displayed in the mode line.")
+
+(custom-autoload (quote jde-which-method-mode) "jde-which-method" t)
+
+;;;***
+
+;;;### (autoloads (jde-xref-customize jde-xref-update jde-xref-list-uncalled-functions
+;;;;;;  jde-xref-display-call-tree jde-xref-next-caller jde-xref-first-caller
+;;;;;;  jde-xref-make-xref-db) "jde-xref" "jde-xref.el" (19289 5860))
+;;; Generated autoloads from jde-xref.el
+
+(autoload (quote jde-xref-make-xref-db) "jde-xref" "\
+Create a database of caller to callee (and the reverse) from the
+classes in `jde-built-class-path' and store the data in the location
+specified by `jde-xref-db-file'
+
+\(fn)" t nil)
+
+(autoload (quote jde-xref-first-caller) "jde-xref" "\
+Put the list of who calls the current function on the stack and
+display the first caller.  Subsequent callers are displayed through
+`jde-xref-show-next-caller'.  STRICT should be true if the callers of
+interfaces to a function, or calls to a superclass which may result in
+a virtual function call to the subclass should not be considered.  In
+other words, if STRICT is true, then only calls that are definitely to
+the requested function are considered.
+
+\(fn STRICT)" t nil)
+
+(autoload (quote jde-xref-next-caller) "jde-xref" "\
+If there are items still on the caller stack, pop the first one off
+and show it
+
+\(fn)" t nil)
+
+(autoload (quote jde-xref-display-call-tree) "jde-xref" "\
+Display an interactive call tree of which function call the current
+  function, which can be expanded outward.  STRICT should be true if
+  the callers of interfaces to a function, or calls to a superclass
+  which may result in a virtual function call to the subclass should
+  not be considered.  In other words, if STRICT is true, then only
+  calls that are definitely to the requested function are considered. 
+
+\(fn STRICT)" t nil)
+
+(autoload (quote jde-xref-list-uncalled-functions) "jde-xref" "\
+Displays a simple list of function that are never called, at least
+not directly.  Do not assume that this means this code can never be
+reached, since reflection could always call any method.  Use this list
+and your best judgement to figure out what are good candidates for
+code cleanup.  STRICT should be true if the callers of interfaces to a
+function, or calls to a superclass which may result in a virtual
+function call to the subclass should not be considered.  In other
+words, if STRICT is true, then only calls that are definitely to the
+requested function are considered.  This function could take a
+while. If it does, you might want to consider increasing
+`jde-xref-cache-size'.
+
+\(fn STRICT)" t nil)
+
+(autoload (quote jde-xref-update) "jde-xref" "\
+Update the caller table after a recompile.  This can be called by
+the user when they recompile outside of emacs.  It will update the
+call list of all files modified in emacs
+
+\(fn &rest IGNORED)" t nil)
+
+(autoload (quote jde-xref-customize) "jde-xref" "\
+Display the customization buffer for the xref package.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (jde-compile-jde jde-show-help jde-mode jde-build
+;;;;;;  jde-set-global-classpath jde-version) "jde" "jde.el" (19289
+;;;;;;  5861))
+;;; Generated autoloads from jde.el
+
+(defconst jde-version "2.4.0.1" "\
+JDE version number.")
+
+(autoload (quote jde-version) "jde" "\
+Get the version of JDEE.
+
+\(fn)" t nil)
+
+(autoload (quote jde-set-global-classpath) "jde" "\
+Set the value of `jde-global-classpath'.
+It specifies the -classpath argument for the Java compiler and
+interpreter.
+
+\(fn CLASSPATH)" t nil)
+
+(autoload (quote jde-build) "jde" "\
+Rebuild the entire project.
+This command invokes the function defined by `jde-build-function'.
+
+\(fn)" t nil)
+
+(autoload (quote jde-mode) "jde" "\
+Major mode for developing Java applications and applets.
+\\{jde-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list (quote auto-mode-alist) (quote ("\\.java\\'" . jde-mode)))
+
+(autoload (quote jde-show-help) "jde" "\
+Displays the JDE User's Guide in a browser.
+
+\(fn)" t nil)
+
+(autoload (quote jde-compile-jde) "jde" "\
+Byte-compile all uncompiled files of jde.
+
+\(fn)" t nil)
+
+;;;***
+
+(provide 'jde-autoload)
diff --git a/site/jdee/lisp/jde-autoload.elc b/site/jdee/lisp/jde-autoload.elc
new file mode 100644
index 0000000..3db9f63
Binary files /dev/null and b/site/jdee/lisp/jde-autoload.elc differ
diff --git a/site/jdee/lisp/jde-bookmark.el b/site/jdee/lisp/jde-bookmark.el
new file mode 100644
index 0000000..184744a
--- /dev/null
+++ b/site/jdee/lisp/jde-bookmark.el
@@ -0,0 +1,117 @@
+;;; jde-bookmark.el -- Organize bookmarked classes.
+;; $Id: $
+
+;; Author: Paul Landes <landes <at> mailc dt net>
+;; Maintainer: Paul Landes
+;; Keywords: java bookmark
+
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Like bookmark.el but classes are bookmarked instead of files.  No file
+;; information is kept, everything uses JDEE project information to find
+;; bookmarked classes.
+
+;;; Code:
+
+(require 'jde-parse)
+(require 'jde-util)
+
+(declare-function jde-assert-mode "jde" (&optional no-raise-p))
+
+(defgroup jde-bookmark nil
+  "JDEE Bookmarks"
+  :group 'jde
+  :prefix "jde-bookmark-")
+
+(defcustom jde-bookmark-class-bookmarks nil
+  "*A list of fully qualified class names to quickly visit.
+Function `jde-find-class-source' is used to visit these Java source files (see
+`jde-bookmark-visit')."
+  :group 'jde-bookmark
+  :type '(repeat (cons :tag "Entry"
+		       (string :tag "Name")
+		       (string :tag "Class"))))
+
+(defvar jde-bookmark-history nil
+  "History item list for `jde-bookmark-prompt'.")
+
+(defun jde-bookmark-prompt (&optional prompt)
+  (let ((default (car jde-bookmark-history)))
+    (setq prompt (or prompt 
+		     (format "Class%s"
+			     (if default
+				 (format " (default %s): " default)
+			       ": "))))
+    (completing-read prompt
+		     (mapcar #'car jde-bookmark-class-bookmarks)
+		     nil t nil 'jde-bookmark-history
+		     (car jde-bookmark-history))))
+
+(defun jde-bookmark-class (key)
+  (cdr (assoc key jde-bookmark-class-bookmarks)))
+
+;;;###autoload
+(defun jde-bookmark-visit (key)
+  "Visit a class by bookmark name."
+  (interactive (list (jde-bookmark-prompt)))
+  (let ((class (jde-bookmark-class key)))
+    (message (format "Finding class `%s'..." class))
+    (jde-find-class-source class)))
+
+;;;###autoload
+(defun jde-bookmark-add (key &optional fq-class)
+  "Add the current visited class as a bookmark."
+  (interactive
+   (list (read-string "Class entry: " (jde-parse-get-buffer-class t))))
+  (jde-assert-mode)
+  (setq fq-class (or fq-class (jde-parse-get-buffer-class)))
+  (message (format "Adding bookmark `%s' as class `%s'"
+		   key fq-class))
+  (customize-save-variable 'jde-bookmark-class-bookmarks
+			   (append jde-bookmark-class-bookmarks
+				   (list (cons key fq-class)))))
+
+;;;###autoload
+(defun jde-bookmark-list ()
+  "List bookmarks."
+  (interactive)
+  ;; a more dynamnic display is needed, like what's currently in bookmark.el
+  ;; would be nice
+  (let ((max-name-len (apply #'max
+			     (mapcar #'(lambda (arg)
+					 (length (car arg)))
+				     jde-bookmark-class-bookmarks))))
+    (save-excursion
+      (set-buffer (get-buffer-create "*JDEE Bookmarks*"))
+      (setq buffer-read-only nil)
+      (erase-buffer)
+      (dolist (entry jde-bookmark-class-bookmarks)
+	(insert (format "%s:%s%s\n"
+			(car entry)
+			(make-string (+ 1 (- max-name-len
+					     (length (car entry)))) ? )
+			(cdr entry))))
+      (setq buffer-read-only t)
+      (set-buffer-modified-p nil)
+      (display-buffer (current-buffer)))))
+
+(provide 'jde-bookmark)
+
+;; End of jde-bookmark.el
diff --git a/site/jdee/lisp/jde-bookmark.elc b/site/jdee/lisp/jde-bookmark.elc
new file mode 100644
index 0000000..10e20bd
Binary files /dev/null and b/site/jdee/lisp/jde-bookmark.elc differ
diff --git a/site/jdee/lisp/jde-bsh.el b/site/jdee/lisp/jde-bsh.el
new file mode 100644
index 0000000..e43fd9e
--- /dev/null
+++ b/site/jdee/lisp/jde-bsh.el
@@ -0,0 +1,393 @@
+;;; jde-bsh.el -- Beanshell JDEE integration.
+;; $Id: jde.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <pkinnucan@attbi.com>
+;; Maintainer: Paul Landes
+;; Keywords: java, tools, bsh, beanshell
+
+;; Copyright (C) 1997-2008 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This library has beanshell specific functionality.  Most of it was taken
+;; from jde.el and placed here in an attempt to make jde.el a little skinner
+;; and make a home for beanshell specific code.
+
+;;; Code:
+
+(require 'eieio)
+(require 'beanshell)
+(require 'jde-parse-expr)
+
+(declare-function jde-build-classpath "jde" (path &optional sym quote-path-p))
+(declare-function jde-get-tools-jar "jde" nil)
+(declare-function jde-get-project "jde-project-file" (sym proj))
+(declare-function jde-run-get-vm "jde-run" nil)
+(declare-function jde-pi-get-bsh-classpath "jde-plugins" nil)
+(declare-function jde-expand-classpath "jde" (classpath &optional sym))
+(declare-function jde-get-global-classpath "jde" nil)
+(declare-function jde-create-prj-values-str "jde" nil)
+(defvar jde-current-project)
+(defvar jde-devel-debug)
+
+
+(defcustom jde-bsh-separate-buffer nil
+  "*Whether or not to use a separate buffer for errors."
+  :group 'jde
+  :type 'boolean)
+
+(defclass jde-bsh-buffer (bsh-comint-buffer) ()
+  "JDEE's beanshell buffer")
+
+(defmethod initialize-instance ((this jde-bsh-buffer) &rest fields)
+  (oset this buffer-name "*JDEE bsh*")
+  (call-next-method))
+
+(defclass jde-bsh (bsh)
+  ((bsh-cmd-dir      :initarg :bsh-cmd-dir
+		     :type string
+		     :documentation
+		     "Path of the BeanShell commmand directory.")
+
+   (checkstyle-jar  :initarg :checkstyle-jar
+		    :type string
+		    :documentation
+		    "Path of the Checkstyle jar.")
+
+   (regexp-jar      :initarg :regexp-jar
+		    :type string
+		    :documentation
+		    "Path of the Jakarta regexp jar.")
+
+   (jde-jar         :initarg :jde-jar
+		    :type string
+		    :documentation
+		    "Path of the JDEE jar.")
+
+   (jde-classes-dir :initarg :jde-classes-dir
+		    :type string
+		    :documentation
+		    "Path of the JDEE classes directory.")
+
+   (the-bsh        :type jde-bsh
+		   :allocation :class
+		   :documentation
+		   "The single instance of the JDEE's BeanShell."))
+  "Class of JDEE BeanShells. There is only one per Emacs session.")
+
+(defmethod initialize-instance ((this jde-bsh) &rest fields)
+  "Constructor for the JDEE BeanShell instance."
+  (call-next-method)
+  (let* ((jde-java-directory
+	  (concat
+	   (jde-find-jde-data-directory)
+	   "java/")))
+
+    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
+    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
+    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+    (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
+    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
+    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
+    (oset this separate-error-buffer jde-bsh-separate-buffer)
+    (oset-default 'jde-bsh the-bsh this)))
+
+(defmethod bsh-create-buffer ((this jde-bsh))
+  "Creates the JDEE's beanshell buffer."
+  (oset this buffer (jde-bsh-buffer "JDEE bsh buffer")))
+
+(defmethod bsh-build-classpath-argument ((this jde-bsh))
+  (jde-build-classpath (oref this cp) 'jde-global-classpath t))
+
+(defmethod bsh-launch :BEFORE ((this jde-bsh) &optional display-buffer)
+  "Sets the vm and classpath to the vm and classpath for the current project before
+the PRIMARY launch method is invoked."
+  (let* ((project-ant-home
+	  ;; Code referring to jde-ant variables uses symbols to
+	  ;; avoid causing compilation errors since jde-ant is not required.
+	  (jde-get-project 'jde-ant-home jde-current-project))
+	 (ant-home (if (and (boundp 'jde-ant-home)
+			    (not (string= (symbol-value 'jde-ant-home) "")))
+		       (symbol-value 'jde-ant-home)     ;jde-ant loaded
+		     (if (and project-ant-home
+			      (not (string= project-ant-home "")))
+			 project-ant-home ; jde-ant not loaded but
+					; jde-ant-home set in project
+					; file
+		       (getenv "ANT_HOME")))) ; jde-ant-home not set in
+					; project file and not
+					; customized
+	 )
+
+    (oset this vm (oref (jde-run-get-vm) :path))
+    (oset  this  cp (delq
+		     nil
+		     (append
+		      (list
+		       (oref this jar)
+		       (oref this bsh-cmd-dir)
+		       (oref this checkstyle-jar)
+		       (oref this regexp-jar)
+		       (if jde-devel-debug
+			   (oref this jde-classes-dir))
+		       (oref this jde-jar)
+		       (jde-get-tools-jar)
+		       (if ant-home (expand-file-name "lib" ant-home)))
+		      (jde-pi-get-bsh-classpath)
+		      (jde-expand-classpath (jde-get-global-classpath)))))))
+
+;; Create the BeanShell wrapper object.
+(jde-bsh "JDEE BeanShell")
+
+(defun jde-bsh-running-p ()
+  "Returns t if the JDEE's BeanShell instance is running."
+  (bsh-running-p (oref 'jde-bsh the-bsh)))
+
+(defvar java-bsh-read-java-expression-history nil)
+
+(defun jde-bsh-read-java-expression ()
+  "Read an expression as input guessing initial input at the current point."
+  (if mark-active
+      (progn
+	(setq java-bsh-read-java-expression-history
+	      (cons (buffer-substring (region-beginning)
+				      (region-end))
+		    java-bsh-read-java-expression-history))
+	(jde-bsh-quote-expr (region-beginning) (region-end) t t))
+    (let ((bnd (if (eq major-mode 'jde-mode)
+		   (bounds-of-thing-at-point 'java-expression)))
+	  initial)
+      (if bnd (setq initial (buffer-substring (car bnd) (cdr bnd))))
+      (if (and initial
+	       (or (>= (length initial) 80)
+		   (save-match-data (string-match "\n" initial))))
+	  (setq initial nil))
+      (read-string "Expression: " initial
+		   'java-bsh-read-java-expression-history))))
+
+(defvar jde-jeval-debug nil
+  "*Whether or not turn on debug logging.
+This logs requests and responses to *Bsh Debug Log*")
+
+;;;###autoload
+(defun jde-jeval (java-statement &optional eval-return no-print-p)
+  "Uses the JDEE's instance of the BeanShell
+Java interpreter to evaluate the Java expression EXPR.  If the
+BeanShell is not running, the JDEE starts an instance. This function
+returns any text output by the Java interpreter's standard out or
+standard error pipes.  If EVAL-RETURN is non-nil, this function
+returns the result of evaluating the Java output as a Lisp
+expression.
+
+NO-PRINT-P, if non-nil, don't wrap JAVA-STATEMENT with a `print'
+command yeilding the output.  This is going to need to be true
+for most things since unless `show()' was invoked and output
+prints out, Emacs has nothing to evaluate or report."
+  (interactive (list (jde-bsh-read-java-expression)))
+  (flet ((log
+	  (msg logtype)
+	  (when jde-jeval-debug
+	    (save-excursion
+	      (set-buffer (get-buffer-create "*Bsh Debug Log*"))
+	      (goto-char (point-max))
+	      (insert (format "%S<" logtype))
+	      (insert (if (stringp msg) msg (prin1-to-string msg)))
+	      (insert ">")
+	      (newline)))))
+    (let ((the-bsh (oref 'jde-bsh the-bsh)))
+      (when (not (bsh-running-p the-bsh))
+	(bsh-launch the-bsh)
+	(bsh-eval the-bsh (jde-create-prj-values-str)))
+      (when (not no-print-p)
+	(if (string= (substring java-statement -1) ";")
+	    (setq java-statement (substring java-statement 0 -1)))
+	(setq java-statement (format "\
+{
+  boolean _prevShowValue = this.interpreter.getShowResults();
+  Object _retVal = null;
+  this.interpreter.setShowResults(false);
+  _jdeCustEvalFn() { %s; };
+  try { _retVal = eval(\"_jdeCustEvalFn();\"); }
+  finally {
+    this.interpreter.setShowResults(_prevShowValue);
+  }
+  if (_retVal != null) print(_retVal);
+}" java-statement)))
+      (log java-statement 'request)
+      (let ((output (bsh-eval the-bsh java-statement eval-return))
+	    len)
+	(when (stringp output) 
+	  (when (> (length output) 0)
+	    (setq len (length output))
+	    (if (eq ?\n (elt output (1- len)))
+		(setq output (substring output 0 (1- len)))))
+	  (if (= 0 (length output)) (setq output nil)))
+	(log output 'response)
+	(when (interactive-p)
+	  (if output (kill-new output))
+	  (message (if output
+		       (concat "Copied `"
+			       (replace-regexp-in-string "%" "%%" output t t)
+			       "'")
+		     "No result")))
+	output))))
+
+(defun jde-jeval-r (java-statement)
+  "Uses the JDEE's instance of the BeanShell to
+evaluate JAVA-STATEMENT and then uses the Emacs Lisp
+interpreter to evaluate the result. This function
+is intended to be used to implement Emacs extensions
+coded in Java and executed by the BeanShell. The function
+assumes that the Java extension interacts with Emacs
+by printing Lisp forms to the BeanShell's standard output \
+port."
+  (jde-jeval java-statement t))
+
+(defun jde-jeval-cm (java-expr &optional buffer-head finish-fcn)
+  "Evaluate JAVA-EXPR and display the result in a compilation-mode buffer.
+The optional argument BUFFER-HEAD specifies text to appear at the head of
+the compilation buffer. The optional argument FINISH-FCN specifies a
+function to be called when the compilation is finished. This function
+is intended to be used to invoke Java development utilities, such as
+source code style checkers, that emit compiler-like error messages.
+Displaying the output in a compilation-mode buffer enables the user to
+use compilation-mode's error message navigation and hyperlinking
+capabilities.
+
+The following example uses this function to invoke the javac compiler on
+a file in the current directory:
+
+ (jde-bsh-compile-mode-eval \"jde.util.CompileServer.compile(\\\"Test.java\\\");\"
+   \"Compile Test.java\" 'jde-compile-finish-kill-buffer)"
+  (let* ((buffer-obj (bsh-compilation-buffer "buffer"))
+	 (native-buf (oref buffer-obj buffer))
+	 (bufwin (display-buffer native-buf)))
+
+    (compilation-set-window-height bufwin)
+
+    (save-some-buffers (not compilation-ask-about-save) nil)
+
+    (if finish-fcn
+	(lexical-let ((finish finish-fcn))
+	  (setq compilation-finish-function
+		(lambda (buf msg)
+		  (funcall finish buf msg)
+		  (setq compilation-finish-function nil)))))
+
+
+    (if (not (featurep 'xemacs))
+	(if compilation-process-setup-function
+	  (funcall compilation-process-setup-function)))
+
+
+    (if (not (featurep 'xemacs))
+	(if compilation-process-setup-function
+	  (funcall compilation-process-setup-function)))
+
+
+    (save-excursion
+      (set-buffer native-buf)
+
+      (if buffer-head
+	  (insert buffer-head)
+	(insert java-expr))
+
+      (insert "\n")
+
+
+      (if (not (jde-bsh-running-p))
+	  (progn
+	    (bsh-launch (oref 'jde-bsh the-bsh))
+	    (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+
+
+      (bsh-buffer-eval
+       (oref 'jde-bsh the-bsh)
+       java-expr
+       buffer-obj)
+
+    (set-buffer-modified-p nil)
+    (setq compilation-last-buffer native-buf))))
+
+;;;###autoload
+(defun jde-bsh-run()
+  "*Starts the JDEE version of the BeanShell."
+  (interactive)
+  (bsh-launch (oref 'jde-bsh the-bsh) t))
+
+(defun jde-bsh-exit ()
+  "Closes the existing beanshell process"
+  (interactive)
+  (if (jde-bsh-running-p)
+      (let ((process (bsh-get-process (oref 'jde-bsh the-bsh))))
+	(if (and
+	     (boundp 'jde-ant-invocation-method) ;; ant package may not be loaded.
+	     (string= (car (symbol-value 'jde-ant-invocation-method)) "Ant Server"))
+	    (process-send-string process "jde.util.JdeUtilities.exit();\n")
+	  (process-send-string process "exit();\n")))
+    (message "The beanshell is not running")))
+
+
+;;; interactive evaluation
+
+;;;###autoload
+(defun jde-bsh-quote-expr (&optional start end no-param-p no-quote-wrap-p)
+  "Add necessary syntax for a beanshell string (parameter) in the current
+buffer.  This is useful for quoting a whole buffer or strings with newlines,
+etc.  This gives the outside double quotes as well.
+
+NO-PARAM-P if non-nil, don't split string (surround double quotes) using string
+concatentation.  The only way to get quotes in strings is to split them up and
+concatenate the quote (') char using the plus (+) operator.  This doesn't do
+this syntax change.
+
+NO-QUOTE-WRAP-P, if non-nil, don't add double quotes around the whole statement."
+  (interactive "r")
+  (setq start (or start (point-min))
+	end (or end (point-max)))
+  (let ((expr (buffer-substring-no-properties start end))
+	(repls (append '(("\\" . "\\\\"))
+		       (if (not no-param-p)
+			   '(("\n" . "\\n"))))))
+    (save-match-data
+      (if (not no-param-p)
+	  (setq expr (mapconcat #'identity (split-string expr "\"")
+				"\" + '\"' + \"")))
+      (setq expr (with-temp-buffer
+		   (insert expr)
+		   (dolist (repl repls)
+		     (goto-char (point-min))
+		     (while (search-forward (car repl) nil t)
+		       (replace-match (cdr repl) nil t)))
+		   (when (not no-quote-wrap-p)
+		     (goto-char (point-min))
+		     (insert "\"")
+		     (goto-char (point-max))
+		     (insert "\""))
+		   (buffer-substring (point-min) (point-max))))
+      (when (interactive-p)
+	(save-excursion
+	  (delete-region start end)
+	  (goto-char start)
+	  (insert expr)))
+      expr)))
+
+(provide 'jde-bsh)
+
+;; End of jde-bsh.el
diff --git a/site/jdee/lisp/jde-bsh.elc b/site/jdee/lisp/jde-bsh.elc
new file mode 100644
index 0000000..358f40f
Binary files /dev/null and b/site/jdee/lisp/jde-bsh.elc differ
diff --git a/site/jdee/lisp/jde-bug.el b/site/jdee/lisp/jde-bug.el
new file mode 100644
index 0000000..ecf3e27
--- /dev/null
+++ b/site/jdee/lisp/jde-bug.el
@@ -0,0 +1,2491 @@
+;;; jde-bug.el -- JDEbug Interface
+;; $Id: jde-bug.el 176 2009-12-24 03:05:35Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+;; The latest version of the JDE is available at
+;; <URL:http://jdee.sourceforge.net/>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at paulk@mathworks.com.
+
+;;; Code:
+
+(require 'cl)
+(require 'jde-parse)
+(require 'jde-dbs)
+(require 'jde-dbo)
+(require 'jde-db)
+(require 'efc)
+
+
+(defgroup jde-bug nil
+  "JDEbug General Options"
+  :group 'jde
+  :prefix "jde-bug")
+
+
+(defcustom jde-bug-debug nil
+"*IMPORTANT!!!! Leave this switch in its default state (off) unless
+you need to modify the *JDEbug* Java source code. Setting this switch
+on causes the JDE to load *JDEbug* from its java/classes directory
+instead of from jde.jar. It also causes the JDE to run the debugger in
+debug server mode. This allows you to use *JDEbug* to debug itself."
+  :group 'jde-bug
+  :type 'boolean)
+
+(defcustom jde-bug-jpda-directory ""
+  "*Pathname of the directory containing Sun's Java Platform Debug Architecture
+distribution. You need to set this variable only if this project uses a JDK 1.2 vm."
+  :group 'jde-bug
+  :type 'file)
+
+
+(defun jde-bug-vm-includes-jpda-p ()
+  "Returns t if the current JDK provides built-in support for JPDA."
+  (or
+   (> (jde-java-major-version) 1)
+   (> (jde-java-minor-version) 2)))
+
+
+(defcustom jde-bug-jre-home ""
+"*Home directory of the JRE containing the executable used to
+run debuggee processes.
+This variable specifies the home directory of the Java runtime
+environment containing the executable, e.g., java, to be used to
+launch processes (see `jde-bug-vm-executable'). If you do not specify
+a home directory, the home directory is the same as that of the
+executable used to run the debugger itself."
+  :group 'jde-bug :type 'string)
+
+
+(defcustom jde-bug-vm-executable (list (if (eq system-type 'windows-nt) "javaw" "java"))
+  "*Name of the executable used to launch target processes.
+This defaults to java on Unix platforms and javaw on Windows platforms"
+  :group 'jde-bug
+  :type '(list
+	  (radio-button-choice
+	  (const "java")
+	  (const "javaw")
+	  (const "java_g"))))
+
+(defcustom jde-bug-raise-frame-p t
+  "*Raise frame when a breakpoint is hit."
+  :group 'jde-bug
+  :type 'boolean)
+
+(defcustom jde-bug-server-socket (cons t "2112")
+  "*Socket where debugger listens for apps needing debugger services.
+You can arrange for a vm to connect to JDEbug via a socket by starting it with the
+options -Xdebug and -Xrunjdwp:transport=dt_socket,address=MYHOST:NNNN,
+where MYHOST is the name of the machine running the debugger and
+NNNN is the socket specified by this variable. To connect via shared
+memory, start the debuggee process with the options -Xdebug and
+-Xrunjdwp:transport=dt_shmem,address=ANYSTRING, where ANYSTRING is
+the value of this variable. If you are running JDK 1.2, you must also
+specifiy the options  -Xnoagent and -Djava.compiler=NONE."
+  :group 'jde-bug
+  :type '(cons
+	  (boolean :tag "Prompt for")
+	  (string :tag "Address")))
+
+(defcustom jde-bug-server-shmem-name (cons t "JDEbug")
+  "*Shared memory name under which the debugger listens for apps
+needing debugger services. To connect via shared
+memory, start the debuggee process with the options -Xdebug and
+-Xrunjdwp:transport=dt_shmem,address=ANYSTRING, where ANYSTRING is
+the value of this variable. If you are running JDK 1.2, you must also
+specifiy the options  -Xnoagent and -Djava.compiler=NONE."
+  :group 'jde-bug
+  :type '(cons
+	  (boolean :tag "Prompt for")
+	  (string :tag "Name")))
+
+
+(defcustom jde-bug-debugger-host-address (if jde-xemacsp (system-name) system-name)
+  "*Address of system on which JDEbug is running.
+The default value is the value of the standard Emacs variable `system-name'.
+The JDE uses the host address to connect to JDEBug during startup. On some Windows
+systems, the JDE is unable to connect to the debugger socket under the system name.
+If this happens, you can try setting this variable to the absolute address of
+a local host: 127.0.0.1 ."
+  :group 'jde-bug
+  :type 'string)
+
+
+(defcustom jde-bug-debugger-command-timeout 30
+  "*Length of time in seconds the JDE waits for a response from the debugger to a command."
+  :group 'jde-bug
+  :type 'integer)
+
+(defcustom jde-bug-saved-breakpoints nil
+"*Breakpoints to be set for the current project."
+  :group 'jde-bug
+  :type '(repeat
+	  (cons :tag "Break at"
+	   (string :tag "File Name")
+	   (integer :tag "Line Number"))))
+
+
+(defcustom jde-bug-breakpoint-cursor-colors (cons "cyan" "brown")
+"*Specifies the foreground and background colors of the debugger's
+breakpoint cursor."
+  :group 'jde-bug
+  :type '(cons
+	  (string :tag "Foreground Color")
+	  (string :tag "Background Color"))
+  :set '(lambda (sym val)
+	  (make-face 'jde-bug-breakpoint-cursor)
+	  (set-face-foreground 'jde-bug-breakpoint-cursor (car val))
+	  (set-face-background 'jde-bug-breakpoint-cursor (cdr val))
+	  (set-default sym val)))
+
+
+(defgroup jde-bug-window nil
+  "JDEbug Window Preferences"
+  :group 'jde-bug
+  :prefix "jde-bug-window")
+
+(defcustom jde-bug-window-message nil
+  "Message buffer window preferences."
+  :group 'jde-bug-window
+  :type 'list)
+
+(defcustom jde-bug-local-variables nil "A non nil values makes the JDEBug
+retrieve the local variables after every step command. It is recommended to
+enable this feature just when is needed since retrieving the local variables
+is time consuming and slow down stepping through the code."
+  :group 'jde-bug
+  :type 'boolean)
+
+(defcustom jde-bug-stack-info nil "A non nil values makes the JDEBug retrieve
+the stack info every step command. It is recommended to enable
+this feature just when is needed since retrieving the stack info is time
+consuming and slows down stepping through the code."
+  :group 'jde-bug
+  :type 'boolean)
+
+(defvar jde-bug-minor-mode-hook nil
+  "Hook to run when entering or leaving jde-bug-minor-mode.")
+
+(defvar jde-bug-menu-spec
+  (list "JDEbug"
+
+	["Step Over"
+	 jde-bug-step-over
+	 (jde-dbs-target-process-steppable-p)]
+
+	["Step Into"
+	 jde-bug-step-into
+	 (jde-dbs-target-process-steppable-p)]
+
+	["Step Into All"
+	 jde-bug-step-into-all
+	 (jde-dbs-target-process-steppable-p)]
+
+	["Step Out"
+	 jde-bug-step-out
+	 (jde-dbs-target-process-steppable-p)]
+
+	["Run"
+	 jde-debug
+	 :active                    t
+	 :included                  (null (jde-dbs-debugger-running-p)) ]
+
+	["Continue"
+	 jde-bug-continue
+	 :active                    (jde-dbs-target-process-runnable-p)
+	 :included                  (jde-dbs-debugger-running-p)        ]
+
+	["Exit Debugger"
+	 jde-bug-exit
+	 (jde-dbs-debugger-running-p)]
+
+	"-"
+	;; Added by lea
+	["Toggle Breakpoint"
+	 jde-bug-toggle-breakpoint t]
+	["Set Conditional Breakpoint"
+	 jde-bug-set-conditional-breakpoint nil]
+	["Break on exception"
+	 jde-bug-break-on-exception
+	 :active (and
+		  (jde-dbs-debugger-running-p)
+		  (jde-dbs-get-target-process))]
+	["Save Breakpoints"
+	 jde-bug-save-breakpoints nil]
+	(list
+	 "Watch for Field"
+
+	 ["Access"
+	  jde-bug-watch-field-access
+	  :style    nil
+	  :active   (and
+		     (jde-dbs-debugger-running-p)
+		     (jde-dbs-get-target-process))]
+
+
+	 ["Modification"
+	  jde-bug-watch-field-modification
+	  :style   nil
+	  :active  (and
+		    (jde-dbs-debugger-running-p)
+		    (jde-dbs-get-target-process))]
+
+	 ["Cancel"
+	  jde-bug-cancel-watch
+	  :style     nil
+	  :active    (and
+		      (jde-dbs-debugger-running-p)
+		      (jde-dbs-get-target-process)
+		      (slot-boundp
+		       (jde-dbs-get-target-process)
+		       'watch-req))]
+
+	 )
+
+	(list
+	 "Trace"
+
+	 ["Class Prep..."
+	  jde-bug-trace-class-prep
+	  :style    nil
+	  :active	 (and
+			  (jde-dbs-debugger-running-p)
+			  (jde-dbs-get-target-process))]
+
+	 ["Class Unload..."
+	  jde-bug-trace-class-unload
+	  :style    nil
+	  :active	 (and
+			  (jde-dbs-debugger-running-p)
+			  (jde-dbs-get-target-process))]
+
+
+	 ["Method Entry..."
+	  jde-bug-trace-method-entry
+	  :style    nil
+	  :active	 (and
+			  (jde-dbs-debugger-running-p)
+			  (jde-dbs-get-target-process))]
+
+	 ["Method Exit..."
+	  jde-bug-trace-method-exit
+	  :style    nil
+	  :active	 (and
+			  (jde-dbs-debugger-running-p)
+			  (jde-dbs-get-target-process))]
+
+	 ["Exceptions..."
+	  jde-bug-trace-exceptions
+	  :style    nil
+	  :active	 (and
+			  (jde-dbs-debugger-running-p)
+			  (jde-dbs-get-target-process))]
+
+
+	 ["Cancel..."
+	  jde-bug-cancel-trace
+	  :style     nil
+	  :active    (and
+		      (jde-dbs-debugger-running-p)
+		      (jde-dbs-get-target-process)
+		      (slot-boundp
+		       (jde-dbs-get-target-process)
+		       'trace-req))]
+
+	 )
+
+	"-"
+
+	(list
+	 "Display"
+
+	 ["Loaded Classes"
+	  jde-bug-display-loaded-classes
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["Object Monitors"
+	  jde-bug-show-object-monitors
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["Path Info"
+	  jde-bug-display-path-info
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+	 )
+
+	["Display Variable At Point"
+	 jde-bug-display-variable
+	 (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	["Evaluate Expression"
+	 jde-bug-evaluate-expression
+	 (and
+	  (jde-dbs-debugger-running-p)
+	  (jde-dbs-get-target-process))]
+
+	(list
+	 "Stack"
+	 `["Enable"
+	   jde-bug-toggle-stack-info
+	   ,(if jde-xemacsp :active :enable) t
+	   :style radio
+	   :selected jde-bug-stack-info]
+	 ["Up"
+	  jde-bug-up-stack
+	  (and
+	   (jde-dbs-target-process-steppable-p)
+	   (let* ((process (jde-dbs-get-target-process))
+		  (stack-max
+		   (if (slot-boundp process 'stack)
+		       (1- (length (oref process stack)))
+		     0))
+		  (stack-ptr (oref process stack-ptr)))
+	     (< stack-ptr stack-max)))]
+
+	 ["Down"
+	  jde-bug-down-stack
+	  (and
+	   (jde-dbs-target-process-steppable-p)
+	   (let* ((process (jde-dbs-get-target-process))
+		  (stack-ptr (oref process stack-ptr)))
+	     (> stack-ptr 0)))]
+
+	 )
+	(list
+	 "Thread"
+
+	 ["Suspend"
+	  jde-bug-suspend-thread
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+
+	 ["Resume"
+	  jde-bug-resume-thread
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["Interrupt"
+	  jde-bug-interrupt-thread
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["Stop"
+	  jde-bug-stop-thread
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+				       ; ["Show Thread Info"
+			      ;   jde-bug-thread-show-thread-info nil]
+	 )
+
+	(list
+	 "Processes"
+	 ["Start Debugger"
+	  jde-bug-start-debugger
+	  (not (jde-dbs-debugger-running-p))]
+
+	 ["Launch Process"
+	  jde-bug-launch-process
+	  (jde-dbs-debugger-running-p)]
+
+	 ["Suspend Process"
+	  jde-bug-suspend-process
+	  (let ((process (jde-dbs-get-target-process)))
+	    (and
+	     (jde-dbs-debugger-running-p)
+	     process
+	     (not (oref process suspendedp))))]
+
+	 ["Resume Process"
+	  jde-bug-resume-process
+	  (let ((process (jde-dbs-get-target-process)))
+	    (and
+	     (jde-dbs-debugger-running-p)
+	     process
+	     (oref process suspendedp)))]
+
+	 ["Finish Process"
+	  jde-bug-finish-process
+	  (let ((process (jde-dbs-get-target-process)))
+	    (and
+	     (jde-dbs-debugger-running-p)
+	     process
+	     (not (oref process attachedp))))]
+
+	 "-"
+
+	 (list
+	  "Attach Process"
+	  ["Via Shared Memory"
+	   jde-bug-attach-via-shared-memory
+	   (and
+	    (eq system-type 'windows-nt)
+	    (jde-dbs-debugger-running-p))]
+
+	  ["On Local Host"
+	   jde-bug-attach-local-host
+	   (jde-dbs-debugger-running-p)]
+
+	  ["On Remote Host"
+	   jde-bug-attach-remote-host
+	   (jde-dbs-debugger-running-p)]
+	  )
+
+	 (list
+	  "Listen on"
+	  ["Shared Memory"
+	   jde-bug-listen-shmem
+	   (and
+	    (eq system-type 'windows-nt)
+	    (jde-dbs-debugger-running-p))]
+
+	  ["Socket"
+	   jde-bug-listen-socket
+	   (jde-dbs-debugger-running-p)]
+	  )
+
+	 ["Detach Process"
+	  jde-bug-detach-process
+	  (let ((process (jde-dbs-get-target-process)))
+	    (and
+	     (jde-dbs-debugger-running-p)
+	     process
+	     (oref process attachedp)))]
+
+
+	 "-"
+
+	 ["Set Target Process"
+	  jde-bug-set-target-process
+	  (> (jde-dbs-proc-set-get-size
+	      jde-dbs-the-process-registry)
+	     0)]
+
+	 ["Show Processes"
+	  jde-bug-set-show-processes nil]
+
+	 ["Remove Dead Processes"
+	  jde-bug-remove-dead-processes
+	  (oref jde-dbs-the-process-morgue proc-alist)]
+
+	 )
+	(list
+	 "Show Buffer"
+
+	 ["Locals"
+	  jde-bug-show-locals-buf
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["CLI"
+	  jde-bug-show-cli-buf
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+
+	 ["Threads"
+	  jde-bug-show-threads-buf
+	  (and
+	   (jde-dbs-debugger-running-p)
+	   (jde-dbs-get-target-process))]
+	 )
+	["Show Debug Frame"
+	 jde-bug-show-debug-frame
+	 (and (jde-dbs-debugger-running-p)
+	      (jde-dbs-get-target-process))]
+	"-"
+	["Preferences"
+	 jde-bug-show-preferences t]
+	"-"
+	["Help"
+	 jde-bug-help t]
+	)
+  "JDEbug menu specification")
+
+
+(defvar jde-bug-mode-map
+  (let ((km (make-sparse-keymap)))
+    (easy-menu-define jde-bug-menu km "JDEbug Minor Mode Menu"
+		      jde-bug-menu-spec)
+    km)
+  "Keymap for JDEbug minor mode.")
+
+(defvar jde-bug-minor-mode nil
+  "Non-nil if JDEBug minor mode is enabled.")
+(make-variable-buffer-local 'jde-bug-minor-mode)
+
+(defun jde-bug-minor-mode (&optional arg)
+  "Toggle JDEbug minor mode.
+With prefix argument ARG, turn on if positive, otherwise off.
+
+\\{jde-bug-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+	     (if jde-bug-minor-mode 0 1))))
+
+  (setq jde-bug-minor-mode
+	(if arg
+	    (> (prefix-numeric-value arg) 0)
+	  (not jde-bug-minor-mode)))
+
+  (run-hook-with-args 'jde-bug-minor-mode-hook jde-bug-minor-mode))
+
+(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug" jde-bug-mode-map)
+
+;; (fmakunbound 'jde-bug-key-bindings)
+(defcustom jde-bug-key-bindings
+  (list (cons "[?\C-c ?\C-z ?\C-s]" 'jde-bug-step-over)
+	(cons "[?\C-c ?\C-z ?\C-x]" 'jde-bug-step-into)
+	(cons "[?\C-c ?\C-z ?\C-a]" 'jde-bug-step-into-all)
+	(cons "[?\C-c ?\C-z ?\C-w]" 'jde-bug-step-out)
+	(cons "[?\C-c ?\C-z ?\C-c]" 'jde-bug-continue)
+	(cons "[?\C-c ?\C-z ?\C-b]" 'jde-bug-toggle-breakpoint))
+  "*Specifies key bindings for JDEbug.
+The value of this variable is an association list. The car of
+each element specifies a key sequence. The cdr specifies
+an interactive command that the key sequence executes. To enter
+a key with a modifier, type C-q followed by the desired modified
+keystroke. For example, to enter C-s (Control s) as the key to be
+bound, type C-q C-s in the key field in the customization buffer.
+You can use the notation [f1], [f2], etc., to specify function keys."
+  :group 'jde-bug
+  :type '(repeat
+	  (cons :tag "Key binding"
+	   (string :tag "Key")
+	   (function :tag "Command")))
+  :set '(lambda (sym val)
+	  ;; Unmap existing key bindings
+	  (if (and
+	       (boundp 'jde-bug-key-bindings)
+	       jde-bug-key-bindings)
+	      (mapc
+	       (lambda (binding)
+		 (let ((key (car binding))
+		       (fcn (cdr binding)))
+		   (if (string-match "\\[.+]"key)
+		       (setq key (car (read-from-string key))))
+		   (define-key jde-bug-mode-map key nil)))
+	       jde-bug-key-bindings))
+	  ;; Map new key bindings.
+	  (mapc
+	   (lambda (binding)
+	     (let ((key (car binding))
+		   (fcn (cdr binding)))
+	       (if (string-match "\\[.+]"key)
+		   (setq key (car (read-from-string key))))
+	       (define-key jde-bug-mode-map key fcn)))
+	   val)
+	  (set-default sym val)))
+
+
+(defun jde-bug-step-over ()
+  "Advances the process to the next line in the current method."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-step "step over" :process process)))
+    (jde-dbs-cmd-exec cmd)))
+
+(defun jde-bug-step-into ()
+  "Advances to the next step in the method at point except if the method
+   belongs to the java, javax, or sun packages."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-step "step into" :process process :step-type "into")))
+    (jde-dbs-cmd-exec cmd)))
+
+(defun jde-bug-step-into-all ()
+  "Advances the process into the function invoked at point."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-step "step into" :process process :step-type "into-all")))
+    (jde-dbs-cmd-exec cmd)))
+
+(defun jde-bug-step-out ()
+  "Advances the process to the next line in the invoking method."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-step "step into" :process process :step-type "out")))
+    (jde-dbs-cmd-exec cmd)))
+
+
+(defun jde-bug-continue ()
+  "Runs the target process. Execution continues from the current breakpoint."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (run (jde-dbs-run-process
+	       (format "run %d" (oref process id))
+		  :process process)))
+    (oset process startupp nil)
+    (oset process suspendedp nil)
+    (oset process steppablep nil)
+    (setq overlay-arrow-position nil)
+    (jde-dbs-cmd-exec run)))
+
+
+
+(defun jde-bug-exit ()
+  (interactive)
+  (if (jde-dbs-debugger-running-p)
+      (progn
+	(mapc
+	 (lambda (assoc-x)
+	   (let* ((process (cdr assoc-x))
+		  (finish-cmd (jde-dbs-finish-process
+			       (format "finish %d" (oref process id))
+			       :process process))
+		  (result (jde-dbs-cmd-exec finish-cmd)))
+	     (jde-dbs-proc-move-to-morgue process)))
+	 (oref jde-dbs-the-process-registry proc-alist))
+	(slot-makeunbound jde-dbs-the-process-registry :target-process)
+	(jde-dbs-debugger-quit jde-dbs-the-debugger))
+    (error "Debugger is not running.")))
+
+
+(add-hook
+ 'jde-mode-hook
+ (lambda ()
+   (if (buffer-file-name)
+       (let ((this-file (file-name-nondirectory (buffer-file-name))))
+	 (mapc
+	  (lambda (spec)
+	    (let* ((file (car spec))
+		   (line (cdr spec))
+		   (bp (jde-db-find-breakpoint file line)))
+	      (when (not bp)
+		(setq jde-db-breakpoint-id-counter (1+ jde-db-breakpoint-id-counter))
+		(setq bp
+		      (jde-db-breakpoint
+		       (format "breakpoint%d" jde-db-breakpoint-id-counter)
+		       :id jde-db-breakpoint-id-counter
+		       :file file
+		       :line line))
+		(jde-db-breakpoints-add bp))
+	      (if (string-match file this-file)
+		  (jde-db-mark-breakpoint-specified file line))))
+	  jde-bug-saved-breakpoints)))))
+
+
+(defun jde-bug-set-breakpoint()
+  "Sets a breakpoint at the current line in the current buffer."
+  (interactive)
+  (let* ((file (buffer-file-name))
+	 (line (jde-get-line-at-point))
+	 (bp (jde-db-find-breakpoint file line))
+	 (proc (jde-dbs-get-target-process)))
+    (unless bp
+      (setq bp (jde-db-spec-breakpoint))
+      (oset bp line line)
+      (jde-db-breakpoints-add bp))
+    (if (and bp proc)
+	(let* ((set-breakpoint (jde-dbs-set-breakpoint
+				"set breakpoint"
+				:process proc
+				:breakpoint bp))
+	       (result (jde-dbs-cmd-exec set-breakpoint)))
+	  (message "Breakpoint set at line %d in class %s." line file)))))
+
+
+(defun jde-bug-set-conditional-breakpoint ()
+  (interactive)
+  (message "not implemented"))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Clear Breakpoint Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defun jde-bug-clear-breakpoint()
+  "Clear the breakpoint at the current line in the current buffer."
+  (interactive)
+  (let* ((file (buffer-file-name))
+	 (line (jde-get-line-at-point))
+	 (bp (jde-db-find-breakpoint file line))
+	 (proc (jde-dbs-get-target-process)))
+    (if (and bp proc)
+	(let* ((clear-breakpoint
+		(jde-dbs-clear-breakpoint
+		 "clear breakpoint"
+		 :process proc
+		 :breakpoint bp))
+	       (result (jde-dbs-cmd-exec clear-breakpoint)))))
+    (if bp
+	(jde-db-delete-breakpoint bp))))
+
+;; test by lea
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Toggle Breakpoint Command                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-toggle-breakpoint ()
+  "Toggles the breakpoint on the current line."
+  (interactive)
+
+  (assert (equal major-mode 'jde-mode)
+	  nil "You can only toggle a breakpoint within jde-mode")
+
+  (assert (jde-db-src-dir-matches-file-p (buffer-file-name))
+	  nil "The current buffer is not in the source path.  See `jde-sourcepath' for more information.")
+
+  (let*  ((file (buffer-file-name))
+	  (line (jde-get-line-at-point))
+	  (bp (jde-db-find-breakpoint file line)))
+    (if bp
+	(jde-bug-clear-breakpoint)
+      (jde-bug-set-breakpoint))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Save Breakpoints Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-save-breakpoints ()
+  "Save breakpoints in project file."
+  (interactive)
+  (message "not implemented"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Methods Command                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-bug-trace-methods-dialog (efc-dialog)
+  ((trace-type               :initarg :trace-type
+			     :type string
+			     :initform "entry"
+			     :documentation
+			     "Values may be entry or exit.")
+   (thread-restriction-field :initarg :thread-restriction-field
+			     :documentation
+			     "Text field that contains thread restriction.")
+   (suspend-policy-field     :initarg :suspend-policy-field
+			     :documentation
+			     "Text field that specifies the thread suspension policy.")
+   (class-inclusion-field    :initarg :class-inclusion-field
+			     :documentation
+			     "Specifies class inclusion filters.")
+   (class-exclusion-field    :initarg :class-exclusion-field
+			     :documentation
+			     "Specifies class exclusion filters.")
+   )
+  "Class of trace methods dialogs."
+)
+
+(defmethod initialize-instance ((this jde-bug-trace-methods-dialog) &rest fields)
+  "Constructor for trace methods dialog."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (or (string= (oref this trace-type) "entry")
+	      (string= (oref this trace-type) "exit")))
+)
+
+
+(defmethod efc-dialog-create ((this jde-bug-trace-methods-dialog))
+
+  (widget-insert (concat "Trace method "
+			 (oref this trace-type)
+			 "\n\n"))
+
+  (oset this thread-restriction-field
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Thread restriction"
+	 :doc "Restrict trace to the specified thread."))
+
+  (oset this suspend-policy-field
+	(widget-create
+	 '(choice
+	   :tag "Thread Suspension Policy"
+	   :value "none"
+	   :format "  %t: %[Options%] %v  %h\n\n"
+	   :doc "Specify which thread to suspend on method entry or exit."
+	   (const "all")
+	   (const "thread")
+	   (const "none"))))
+
+
+  (oset this class-inclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class inclusion filters"
+	   :doc "Regular expressions that specify classes whose methods should be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+
+    (oset this class-exclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class exclusion filters"
+	   :doc "Regular expressions that specify classes whose methods should not be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+  )
+
+(defmethod efc-dialog-ok ((this jde-bug-trace-methods-dialog))
+  (let* ((thread-restriction (widget-value (oref this thread-restriction-field)))
+	 (thread-suspension-policy (widget-value (oref this suspend-policy-field)))
+	 (class-inclusion-filters (widget-value (oref this class-inclusion-field)))
+	 (class-exclusion-filters (widget-value (oref this class-exclusion-field)))
+	 (process (jde-dbs-get-target-process))
+	 (request (jde-dbs-trace-methods-request "trace methods request"
+						 :trace-type (oref this trace-type)))
+	 (cmd  (jde-dbs-trace-methods
+		"trace methods command"
+		:process process :trace-request request)))
+
+    (if (and thread-restriction (not (string= thread-restriction "")))
+	(oset request :thread-restriction thread-restriction))
+
+    (if (and thread-suspension-policy (not (string= thread-suspension-policy "")))
+	(oset request :suspend-policy thread-suspension-policy))
+
+    (if class-inclusion-filters
+	(oset request :inclusion-filters class-inclusion-filters))
+
+    (if class-exclusion-filters
+	(oset request :exclusion-filters class-exclusion-filters))
+
+    (jde-dbs-cmd-exec cmd)
+    (call-next-method)))
+
+
+(defun jde-bug-trace-method-entry ()
+  "Displays the trace method entry dialog."
+  (interactive)
+  (let ((dialog (jde-bug-trace-methods-dialog "trace method entry dialog")))
+    (efc-dialog-show dialog)))
+
+(defun jde-bug-trace-method-exit ()
+  "Displays the trace method exit dialog."
+  (interactive)
+  (let ((dialog (jde-bug-trace-methods-dialog
+		 "trace method exit dialog" :trace-type "exit")))
+    (efc-dialog-show dialog)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Classes Command                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defclass jde-bug-trace-classes-dialog (efc-dialog)
+  ((trace-type               :initarg :trace-type
+			     :type string
+			     :initform "preparation"
+			     :documentation
+			     "Values may be preparation or unloading.")
+   (suspend-policy-field     :initarg :suspend-policy-field
+			     :documentation
+			     "Text field that specifies the thread suspension policy.")
+   (class-inclusion-field    :initarg :class-inclusion-field
+			     :documentation
+			     "Specifies class inclusion filters.")
+   (class-exclusion-field    :initarg :class-exclusion-field
+			     :documentation
+			     "Specifies class exclusion filters.")
+   )
+  "Class of trace classes dialogs."
+)
+
+(defmethod initialize-instance ((this jde-bug-trace-classes-dialog) &rest fields)
+  "Constructor for trace classes dialog."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (or (string= (oref this trace-type) "preparation")
+	      (string= (oref this trace-type) "unloading")))
+)
+
+
+(defmethod efc-dialog-create ((this jde-bug-trace-classes-dialog))
+
+  (widget-insert (concat "Trace class "
+			 (oref this trace-type)
+			 "\n\n"))
+
+  (oset this suspend-policy-field
+	(widget-create
+	 '(choice
+	   :tag "Thread Suspension Policy"
+	   :value "none"
+	   :format "  %t: %[Options%] %v  %h\n\n"
+	   :doc "Specify which thread to suspend on class preparation or unloading."
+	   (const "all")
+	   (const "thread")
+	   (const "none"))))
+
+
+  (oset this class-inclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class inclusion filters"
+	   :doc "Regular expressions that specify classes whose preparation or unloading should be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+
+    (oset this class-exclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class exclusion filters"
+	   :doc "Regular expressions that specify classes whose preparation or unloading should not be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+  )
+
+(defmethod efc-dialog-ok ((this jde-bug-trace-classes-dialog))
+  (let* ((thread-suspension-policy (widget-value (oref this suspend-policy-field)))
+	 (class-inclusion-filters (widget-value (oref this class-inclusion-field)))
+	 (class-exclusion-filters (widget-value (oref this class-inclusion-field)))
+	 (process (jde-dbs-get-target-process))
+	 (request (jde-dbs-trace-classes-request "trace classes request"
+						 :trace-type (oref this trace-type)))
+	 (cmd  (jde-dbs-trace-classes
+		"trace classes command"
+		:process process :trace-request request)))
+
+    (if (and thread-suspension-policy (not (string= thread-suspension-policy "")))
+	(oset request :suspend-policy thread-suspension-policy))
+
+    (if class-inclusion-filters
+	(oset request :inclusion-filters class-inclusion-filters))
+
+    (if class-exclusion-filters
+	(oset request :exclusion-filters class-exclusion-filters))
+
+    (jde-dbs-cmd-exec cmd)
+    (call-next-method)))
+
+
+(defun jde-bug-trace-class-prep ()
+  "Displays the trace class preparation dialog."
+  (interactive)
+  (let ((dialog (jde-bug-trace-classes-dialog "trace class prep dialog")))
+    (efc-dialog-show dialog)))
+
+(defun jde-bug-trace-class-unload ()
+  "Displays the trace class unloading dialog."
+  (interactive)
+  (let ((dialog (jde-bug-trace-classes-dialog
+		 "trace class unloading dialog" :trace-type "unloading")))
+    (efc-dialog-show dialog)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Exceptions Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defclass jde-bug-trace-exceptions-dialog (efc-dialog)
+  ((exception-class-field    :initarg :exception-class
+			     :documentation
+			     "Class of exception to trace.")
+   (trace-type-field         :initarg :trace-type
+			     :documentation
+			     "Values may be caught, uncaught, or both.")
+   (thread-restriction-field :initarg :thread-restriction-field
+			     :documentation
+			     "Text field that contains thread restriction.")
+   (suspend-policy-field     :initarg :suspend-policy-field
+			     :documentation
+			     "Text field that specifies the thread suspension policy.")
+   (class-inclusion-field    :initarg :class-inclusion-field
+			     :documentation
+			     "Specifies class inclusion filters.")
+   (class-exclusion-field    :initarg :class-exclusion-field
+			     :documentation
+			     "Specifies class exclusion filters.")
+   )
+  "Defines a trace exception dialog."
+)
+
+(defmethod initialize-instance ((this jde-bug-trace-exceptions-dialog) &rest fields)
+  "Constructor for trace exceptions dialog."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+)
+
+
+(defmethod efc-dialog-create ((this jde-bug-trace-exceptions-dialog))
+
+  (widget-insert (concat "Trace exception\n\n"))
+
+  (oset this exception-class-field
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Exception class"
+	 :doc "Name of class of exception to trace. May be a wild card pattern of the form *.name. This allows you to omit a package qualifier from a class name. For example, to trace occurences of java.io.IOException, specify *.IOException."))
+
+  (oset this trace-type-field
+	(widget-create
+	 '(choice
+	   :tag "Exception type"
+	   :value "both"
+	   :format "  %t: %[Options%] %v  %h\n\n"
+	   :doc "Specify the type of exception to trace."
+	   (const "caught")
+	   (const "uncaught")
+	   (const "both"))))
+
+  (oset this thread-restriction-field
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Thread restriction"
+	 :doc "Restrict trace to the specified thread."))
+
+  (oset this suspend-policy-field
+	(widget-create
+	 '(choice
+	   :tag "Thread Suspension Policy"
+	   :value "none"
+	   :format "  %t: %[Options%] %v  %h\n\n"
+	   :doc "Specify which thread to suspend on class preparation or unloading."
+	   (const "all")
+	   (const "thread")
+	   (const "none"))))
+
+
+  (oset this class-inclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class inclusion filters"
+	   :doc "Regular expressions that specify classes whose preparation or unloading should be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+
+    (oset this class-exclusion-field
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class exclusion filters"
+	   :doc "Regular expressions that specify classes whose preparation or unloading should not be traced."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+  )
+
+(defmethod efc-dialog-ok ((this jde-bug-trace-exceptions-dialog))
+  (let* ((exception-class (widget-value (oref this exception-class-field)))
+	 (trace-type (widget-value (oref this trace-type-field)))
+	 (thread-restriction (widget-value (oref this thread-restriction-field)))
+	 (thread-suspension-policy (widget-value (oref this suspend-policy-field)))
+	 (class-inclusion-filters (widget-value (oref this class-inclusion-field)))
+	 (class-exclusion-filters (widget-value (oref this class-inclusion-field)))
+	 (process (jde-dbs-get-target-process))
+	 (request (jde-dbs-trace-exceptions-request
+		   "trace exceptions request"
+		   :exception-class exception-class
+		   :trace-type trace-type))
+	 (cmd  (jde-dbs-trace-exceptions
+		"trace exceptions command"
+		:process process :trace-request request)))
+
+    (if (and thread-restriction (not (string= thread-restriction "")))
+	(oset request :thread-restriction thread-restriction))
+
+    (if (and thread-suspension-policy (not (string= thread-suspension-policy "")))
+	(oset request :suspend-policy thread-suspension-policy))
+
+    (if class-inclusion-filters
+	(oset request :inclusion-filters class-inclusion-filters))
+
+    (if class-exclusion-filters
+	(oset request :exclusion-filters class-exclusion-filters))
+
+    (jde-dbs-cmd-exec cmd)
+    (call-next-method)))
+
+(defun jde-bug-break-on-exception (exception-class)
+  (interactive "sFully qualified exception: ")
+  (let* ((process (jde-dbs-get-target-process))
+	 (request (jde-dbs-trace-exceptions-request
+		   "break on exceptions request"
+		   :exception-class exception-class
+		   :trace-type "both"
+		   :suspend-policy "all"))
+	 (cmd (jde-dbs-trace-exceptions
+	       "break on exceptions command"
+	       :process process :trace-request request)))
+    (jde-dbs-cmd-exec cmd)
+    (jde-dbs-proc-display-debug-message process "Use JDEbug->Trace->Cancel to remove this breakpoint")))
+
+
+(defun jde-bug-trace-exceptions ()
+  "Displays the trace exceptions dialog."
+  (interactive)
+  (let ((dialog (jde-bug-trace-exceptions-dialog "trace exceptions dialog")))
+    (efc-dialog-show dialog)))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Cancel Trace Request Command                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-cancel-trace-request (process request)
+  "Cancels a specified trace request on a specified process."
+  (let ((cmd (jde-dbs-cancel-trace "cancel trace" :process process
+				  :trace-request request)))
+    (jde-dbs-cmd-exec cmd)))
+
+(defclass jde-bug-cancel-trace-dialog (efc-dialog)
+  ((process          :initarg :process
+		     :type jde-dbs-proc)
+   (requests         :initarg :requests
+		     :type list)
+   (check-boxes      :initarg :check-boxes))
+)
+
+(defmethod efc-dialog-create ((this jde-bug-cancel-trace-dialog))
+  (let ((items
+	 (mapcar
+	  (lambda (x)
+	    (let ((request (cdr x)))
+	      (list
+	       'const
+	       :format "%t %v  %d"
+	       :tag "Request"
+	       :doc
+	       (concat
+		(if (typep request 'jde-dbs-trace-methods-request)
+		    (progn
+		      (concat
+		      (format "Trace method %s." (oref request trace-type))
+		      (if (slot-boundp request 'thread-restriction)
+			  (format " Thread restriction: %s."
+				  (oref request thread-restriction)))))
+		  (format "Trace class %s." (oref request trace-type)))
+		(if (slot-boundp request 'suspend-policy)
+		    (format " Suspend policy: %s." (oref request suspend-policy)))
+		(if (slot-boundp request 'inclusion-filters)
+		    (format " Inclusion filters: %s." (oref request inclusion-filters)))
+		(if (slot-boundp request 'exclusion-filters)
+		    (format " Exclusion filters: %s." (oref request exclusion-filters)))
+		)
+	       (car x))))
+	  (oref this requests))))
+
+  (widget-insert "Check the trace requests you want to cancel.\n\n")
+
+  (oset this check-boxes
+	(widget-create
+	 (list
+	  'checklist
+	  :entry-format "  %b %v\n"
+	  :args items
+	   )))
+  ))
+
+(defmethod efc-dialog-ok ((this jde-bug-cancel-trace-dialog))
+  (message (format "Check boxes: %s)" (widget-value (oref this check-boxes))))
+  (mapc
+   (lambda (id-x)
+     (let ((request
+	    (cdr
+	     (find-if
+	      (lambda (x) (= (car x) id-x))
+	     (oref this requests)))))
+     (jde-bug-cancel-trace-request  (oref this process) request)))
+   (widget-value (oref this check-boxes)))
+  (call-next-method))
+
+
+(defun jde-bug-cancel-trace ()
+  "Cancels method and class trace requests for the target process.
+If only one trace request is outstanding, this command cancels that request.
+Otherwise, this command displays a cancel dialog that lets you choose the
+requests to cancel."
+ (interactive)
+ (let* ((process (jde-dbs-get-target-process)))
+   (if process
+       (if (slot-boundp process 'trace-req)
+	   (let ((trace-requests (oref process :trace-req)))
+	     (if (= (length trace-requests) 1)
+		 (jde-bug-cancel-trace-request process (cdr (car trace-requests)))
+	       (let ((dialog
+		      (jde-bug-cancel-trace-dialog "cancel trace dialog"
+						   :process process
+						   :requests trace-requests)))
+		 (efc-dialog-show dialog))))
+	 (error "The target process has no outstanding trace requests"))
+     (error "There is no active process."))))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Watch Field Command                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defclass jde-bug-watch-field-dialog (efc-dialog)
+  ((watch-type                :initarg :watch-type
+			      :type string
+			      :initform "access"
+			      :documentation
+			      "Watch type: field access or modification.")
+   (object-class              :initarg :object-class
+			      :type string
+			      :initform ""
+			      :documentation
+			      "Default value of class to watch.")
+   (field                     :initarg :field
+			      :type string
+			      :initform ""
+			      :documentation
+			      "Default value of the field to watch.")
+   (object-class-widget       :initarg :object-class-widget
+			      :documentation
+			      "Widget specifying class of objects to watch.")
+   (field-name-widget         :initarg :field-name-widget
+			      :documentation
+			      "Widget specify name of field to watch.")
+   (expression-widget         :initarg :expression-widget
+			      :documentation
+			      "Widget specify watch restriction expression.")
+   (object-id-widget          :initarg :object-id-widget
+			      :documentation
+			      "Widget specify id of object to watch.")
+   (thread-restriction-widget :initarg :thread-restriction-widget
+			      :documentation
+			      "Text field that contains thread restriction.")
+   (suspend-policy-widget     :initarg :suspend-policy-widget
+			      :documentation
+			      "Text field that specifies the thread suspension policy.")
+   (class-inclusion-widget    :initarg :class-inclusion-widget
+			      :documentation
+			     "Specifies class inclusion filters.")
+   (class-exclusion-widget    :initarg :class-exclusion-widget
+			     :documentation
+			     "Specifies class exclusion filters.")
+   )
+  "Defines a watch field dialog."
+)
+
+(defmethod initialize-instance ((this jde-bug-watch-field-dialog) &rest fields)
+  "Constructor for watch field dialog."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+)
+
+
+(defmethod efc-dialog-create ((this jde-bug-watch-field-dialog))
+
+  (widget-insert (format "Watch for field %s\n\n" (oref this watch-type)))
+
+  (oset this object-class-widget
+	(widget-create
+	 'editable-field
+	 :value (oref this object-class)
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Class"
+	 :doc "Class of object or objects to watch.
+May be a wild card pattern of the form *.name. This allows you to omit a package qualifier from a class name. For example, to watch a field of java.io.IOException, specify *.IOException."))
+
+
+  (oset this field-name-widget
+	(widget-create
+	 'editable-field
+	 :value (oref this field)
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Field name"
+	 :doc "Name of field to watch."))
+
+  (oset this expression-widget
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Watch expression"
+	 :doc "A boolean expression.
+Execution of the process is suspended only if the expression is true. The expression can contain any variable that is in scope when a field changes."))
+
+  (oset this object-id-widget
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Object ID"
+	 :doc "ID of the object to watch."))
+
+  (oset this thread-restriction-widget
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Thread restriction"
+	 :doc "Restrict watch to the specified thread."))
+
+  (oset this suspend-policy-widget
+	(widget-create
+	 '(choice
+	   :tag "Thread Suspension Policy"
+	   :value "all"
+	   :format "  %t: %[Options%] %v  %h\n\n"
+	   :doc "Specify which threads to suspend on field access or modification."
+	   (const "all")
+	   (const "thread")
+	   (const "none"))))
+
+
+  (oset this class-inclusion-widget
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class inclusion filters"
+	   :doc "Regular expressions that specify classes whose field should be watched."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter"))))
+
+    (oset this class-exclusion-widget
+	(widget-create
+	 '(editable-list
+	   :format "  %t:\n  %i\n%v  %h\n\n"
+	   :entry-format "  %i %d %v\n"
+	   :tag "Class exclusion filters"
+	   :doc "Regular expressions that specify classes whose fields should not be watched."
+	   (string
+	    :format "%t: %v"
+	    :size 40
+	    :tag "Filter")))))
+
+(defmethod efc-dialog-ok ((this jde-bug-watch-field-dialog))
+  (let* ((obj-class (widget-value (oref this object-class-widget)))
+	 (field-name (widget-value (oref this field-name-widget)))
+	 (expression (widget-value (oref this expression-widget)))
+	 (object-id (widget-value (oref this object-id-widget)))
+	 (thread-restriction (widget-value (oref this thread-restriction-widget)))
+	 (thread-suspension-policy (widget-value (oref this suspend-policy-widget)))
+	 (class-inclusion-filters (widget-value (oref this class-inclusion-widget)))
+	 (class-exclusion-filters (widget-value (oref this class-inclusion-widget)))
+	 (process (jde-dbs-get-target-process))
+	 (request (jde-dbs-watch-field-request
+		   "watch field request"
+		   :watch-type (oref this watch-type)
+		   :object-class obj-class
+		   :field-name field-name))
+	 (cmd  (jde-dbs-watch-field
+		"watch field command"
+		:process process :watch-request request)))
+
+    (if (and expression (not (string= expression "")))
+	(oset request :expression expression))
+
+    (if (and object-id (not (string= object-id "")))
+	(oset request :object-id object-id))
+
+    (if (and thread-restriction (not (string= thread-restriction "")))
+	(oset request :thread-restriction thread-restriction))
+
+    (if (and thread-suspension-policy (not (string= thread-suspension-policy "")))
+	(oset request :suspend-policy thread-suspension-policy))
+
+    (if class-inclusion-filters
+	(oset request :inclusion-filters class-inclusion-filters))
+
+    (if class-exclusion-filters
+	(oset request :exclusion-filters class-exclusion-filters))
+
+    (jde-dbs-cmd-exec cmd)
+    (call-next-method)))
+
+
+(defun jde-bug-watch-field-access ()
+  "Request that the debugger watch for access of a
+field of an object or class of objects."
+  (interactive)
+  (let ((dialog
+	 (jde-bug-watch-field-dialog
+	  "watch field dialog"
+	  :object-class (concat
+			 "*."
+			 (car (jde-parse-get-innermost-class-at-point)))
+	  :field (thing-at-point 'symbol))))
+    (efc-dialog-show dialog)))
+
+(defun jde-bug-watch-field-modification ()
+  "Request that the debugger watch for modifiction of a
+field of an object or class of objects."
+  (interactive)
+  (let ((dialog (jde-bug-watch-field-dialog
+		 "watch field dialog"
+		 :watch-type "modification"
+		 :object-class (concat
+				"*."
+				(car (jde-parse-get-innermost-class-at-point)))
+		 :field (thing-at-point 'symbol))))
+    (efc-dialog-show dialog)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Cancel Watch Request Command                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-cancel-watch-request (process request)
+  "Cancels a specified watch field request on a specified process."
+  (let ((cmd (jde-dbs-cancel-watch "cancel watch" :process process
+				  :watch-request request)))
+    (jde-dbs-cmd-exec cmd)))
+
+(defclass jde-bug-cancel-watch-dialog (efc-dialog)
+  ((process          :initarg :process
+		     :type jde-dbs-proc)
+   (requests         :initarg :requests
+		     :type list)
+   (check-boxes      :initarg :check-boxes))
+)
+
+(defmethod efc-dialog-create ((this jde-bug-cancel-watch-dialog))
+  (let ((items
+	 (mapcar
+	  (lambda (x)
+	    (let ((request (cdr x)))
+	      (list
+	       'const
+	       :format "%t %v  %d"
+	       :tag "Request"
+	       :doc
+	       (concat
+		(format "Watch type: %s. Class: %s. Field: %s."
+		       (oref request watch-type)
+		       (oref request object-class)
+		       (oref request field-name))
+		(if (slot-boundp request 'object-id)
+		    (concat " Object id: " (oref request object-id) "."))
+		(if (slot-boundp request 'expression)
+		    (concat " Expression: " (oref request expression) ".")))
+	       (car x))))
+	  (oref this requests))))
+
+  (widget-insert "Check the watch requests you want to cancel.\n\n")
+
+  (oset this check-boxes
+	(widget-create
+	 (list
+	  'checklist
+	  :entry-format "  %b %v\n"
+	  :args items
+	   )))
+  ))
+
+(defmethod efc-dialog-ok ((this jde-bug-cancel-watch-dialog))
+  (message (format "Check boxes: %s)" (widget-value (oref this check-boxes))))
+  (mapc
+   (lambda (id-x)
+     (let ((request
+	    (cdr
+	     (find-if
+	      (lambda (x) (= (car x) id-x))
+	     (oref this requests)))))
+     (jde-bug-cancel-watch-request  (oref this process) request)))
+   (widget-value (oref this check-boxes)))
+  (call-next-method))
+
+
+(defun jde-bug-cancel-watch ()
+  "Cancels watch requests for the target process.
+If only one watch request is outstanding, this command cancels that request.
+Otherwise, this command displays a cancel dialog that lets you choose the
+requests to cancel."
+ (interactive)
+ (let* ((process (jde-dbs-get-target-process)))
+   (if process
+       (if (slot-boundp process 'watch-req)
+	   (let ((watch-requests (oref process :watch-req)))
+	     (if (= (length watch-requests) 1)
+		 (jde-bug-cancel-watch-request process (cdr (car watch-requests)))
+	       (let ((dialog
+		      (jde-bug-cancel-watch-dialog "cancel watch dialog"
+						   :process process
+						   :requests watch-requests)))
+		 (efc-dialog-show dialog))))
+	 (error "The target process has no outstanding watch requests"))
+     (error "There is no active process."))))
+
+(defun jde-make-frame-names-alist ()
+  (let* ((current-frame (selected-frame))
+	 (falist
+	  (cons
+	   (cons (if jde-xemacsp
+		     (frame-property current-frame 'name)
+		   (frame-parameter current-frame 'name))
+		 current-frame) nil))
+	 (frame (next-frame nil t)))
+    (while (not (eq frame current-frame))
+      (progn
+	(setq falist (cons (cons
+			    (if jde-xemacsp
+				(frame-property frame 'name)
+			      (frame-parameter frame 'name))
+			    frame) falist))
+	(setq frame (next-frame frame t))))
+    falist))
+
+(defun jde-bug-show-debug-frame ()
+  "Show or open a new frame with the locals, thread, and CLI buffer."
+  (interactive)
+  (let* ((existing-frame (cdr (assoc "JDebug" (jde-make-frame-names-alist)))))
+    (if existing-frame
+      (progn
+	(make-frame-visible existing-frame)
+	(raise-frame existing-frame)
+	(select-frame existing-frame))
+      (let* ((process (jde-dbs-get-target-process))
+	     (cli-buffer (when (slot-boundp process 'cli-buf)
+			(oref process cli-buf)))
+	     (locals-buffer (when (slot-boundp process 'locals-buf)
+			   (oref process locals-buf)))
+	     (threads-buffer (when (slot-boundp process 'threads-buf)
+			    (oref process threads-buf)))
+	     (msg-buffer (when (slot-boundp process 'msg-buf)
+			(oref process msg-buf)))
+	     (frame (new-frame '((name . "JDebug") (minibuffer . nil))))
+	     (height (/ (frame-height frame) (count-if 'identity
+						       (list cli-buffer
+							     locals-buffer
+							     threads-buffer
+							     msg-buffer))))
+	     (init-frame (selected-frame))
+	     (init-config (current-window-configuration))
+	     (prev-window))
+	(save-excursion
+	  (select-frame frame)
+	  ;; msg buffer should always be there, if not this could break
+	  (switch-to-buffer msg-buffer)
+	  (setq prev-window (get-buffer-window msg-buffer))
+	  (when locals-buffer
+	    (let ((locals-win (split-window prev-window height)))
+	      (setq prev-window locals-win)
+	      (when (not jde-bug-local-variables)
+		(jde-bug-toggle-local-variables)
+		(if (featurep 'xemacs)
+		  (sleep-for 0.1)
+		  (sleep-for 0 100)))
+	      (set-window-buffer locals-win locals-buffer)))
+	  (when threads-buffer
+	    (let ((threads-win (split-window prev-window height)))
+	      (setq prev-window threads-win)
+	      (jde-bug-show-threads)
+	      (set-window-buffer threads-win threads-buffer)))
+	  (when cli-buffer
+	    (let ((cli-win (split-window prev-window height)))
+	      (set-window-buffer cli-win cli-buffer)))
+	  (select-frame init-frame)
+	  (set-window-configuration init-config))))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Display Variable Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-display-variable ()
+  (interactive)
+  (if (not (jde-dbs-target-process-runnable-p))
+      (error "No target process or process is not suspended."))
+  ;; Previously we used semantic. I recently have been having problems
+  ;; with it, so I just replaced it with word-at-point
+  (let ((qualified-expr (thing-at-point 'word)))
+    (jde-bug-evaluate-expression qualified-expr)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Evaluate Expression Command                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-evaluate-expression (expression)
+"Evaluates a Java expression. The Java expression may include
+any variables in scope in the program being debugged."
+  (interactive
+   "sExpression: ")
+
+  (if (not (jde-dbs-target-process-runnable-p))
+      (error "No target process or process is not suspended."))
+
+  (if  (string= expression "")
+      (error "Empty expression."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (state-info (oref process state-info))
+	 (thread-id (oref state-info thread-id))
+	 (evaluate-command
+	  (jde-dbs-evaluate
+	   (format "Evaluate %s" expression)
+	   :process process
+	   :expression expression
+	   :thread-id thread-id))
+	 (result
+	  (jde-dbs-cmd-exec evaluate-command)))
+    (if result
+	(let* ((type  (nth 0 result))
+	       (value (nth 1 result))
+	       (buf (get-buffer-create (concat "Expression: " expression))))
+	    (jde-dbo-view-var-in-buf (jde-dbs-objectify-value result)
+				     expression process t buf t)
+	    (pop-to-buffer buf (split-window nil (- (window-height) 4))))
+      (message "Error: could not evaluate \"%s\"." expression))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Display Loaded Classes Command                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-display-loaded-classes ()
+  "Displays the classes currently loaded by the target process."
+  (interactive)
+
+  (if (not (jde-dbs-target-process-runnable-p))
+      (error "No target process or process is not suspended."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-get-loaded-classes
+	   "get_loaded_classes"
+	   :process process))
+	 (result
+	  (jde-dbs-cmd-exec cmd)))
+    (if (not result)
+      (error "Could not get loaded classes."))))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Show Threads Command                                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-show-threads ()
+"Shows all threads and thread-groups running in the target process.
+This command displays the threads as a tree structure. To expand
+a node of the tree, click the + sign next to the node, using mouse
+button 2."
+  (interactive)
+
+  (if (not (jde-dbs-get-target-process))
+      (error "No target process."))
+
+  (if (not jde-bug-stack-info)
+      (progn
+	(jde-bug-toggle-stack-info)
+	(if (featurep 'xemacs)
+	    (sleep-for 0.1)
+	  (sleep-for 0 100))))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (get-threads-command
+	  (jde-dbs-get-threads
+	   "get_threads"
+	   :process process))
+	 (result
+	  (jde-dbs-cmd-exec get-threads-command)))
+    (if (not result)
+      (error "Could not get threads"))))
+
+(defun jde-bug-thread-show-thread-info ()
+  (interactive)
+  (message "not implemented"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Show Object Monitors                                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-show-object-monitors (object-id)
+"Shows the threads that are monitoring a specified object, including the thread
+that currently owns the object and threads that are waiting to access the object."
+  (interactive
+   "nObject ID: ")
+
+  (if (not (jde-dbs-target-process-runnable-p))
+      (error "No target process or process is not suspended."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (get-monitors-command
+	  (jde-dbs-get-object-monitors
+	   "get_object_monitors"
+	   :process process :object-id object-id))
+	 (result
+	  (jde-dbs-cmd-exec get-monitors-command)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Display Path Info Command                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-display-path-info ()
+  "Displays the base directory, boot classpath, and classpath of the target process."
+  (interactive)
+
+  (if (not (jde-dbs-target-process-runnable-p))
+      (error "No target process or process is not suspended."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (cmd
+	  (jde-dbs-get-path-info
+	   "get_path_info"
+	   :process process))
+	 (result
+	  (jde-dbs-cmd-exec cmd)))
+    (if (not result)
+      (error "Could not get path info."))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Clear Watchpoint Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-clear-watchpoint ()
+  (interactive)
+  (message "not implemented"))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Up Stack Command                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-up-stack ()
+  "Moves the source cursor up one frame in the call stack and displays the local
+variables at that point in the stack. This command works only for the stack of
+the thread at a breakpoint or step point."
+  (interactive)
+
+  (if (not (jde-dbs-target-process-steppable-p))
+      (error "The target process is not suspended at a breakpoint or steppoint."))
+
+  (if (not
+       (let* ((process (jde-dbs-get-target-process))
+	      (stack-max (1- (length (oref process stack))))
+	      (stack-ptr (oref process stack-ptr)))
+	 (< stack-ptr stack-max)))
+      (error "The debugger is displaying the top of the stack."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (state-info (oref process :state-info))
+	 (thread-id (oref state-info :thread-id))
+	 (stack (oref process stack))
+	 (stack-ptr (1+ (oref process stack-ptr)))
+	 (frame (nth stack-ptr stack))
+	 (class (nth 1 frame))
+	 (file (nth 2 frame))
+	 (line (nth 3 frame)))
+
+    (oset process :stack-ptr stack-ptr)
+    (jde-db-set-debug-cursor class file line)
+    (jde-dbo-update-locals-buf process thread-id stack-ptr)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Down Stack Command                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-down-stack ()
+  "Moves the source cursor down one frame in the call stack and displays the local
+variables at that point in the stack. This command works only for the stack of
+the thread at a breakpoint or step point."
+  (interactive)
+
+  (if (not (jde-dbs-target-process-steppable-p))
+      (error "The target process is not suspended at a breakpoint or steppoint."))
+
+  (if (not (let* ((process (jde-dbs-get-target-process))
+		  (stack-ptr (oref process stack-ptr)))
+	     (> stack-ptr 0)))
+      (error "The debugger is displaying the bottom of the stack."))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (state-info (oref process :state-info))
+	 (thread-id (oref state-info :thread-id))
+	 (stack (oref process stack))
+	 (stack-ptr (1- (oref process stack-ptr)))
+	 (frame (nth stack-ptr stack))
+	 (class (nth 1 frame))
+	 (file (nth 2 frame))
+	 (line (nth 3 frame)))
+
+    (oset process :stack-ptr stack-ptr)
+    (jde-db-set-debug-cursor class file line)
+    (jde-dbo-update-locals-buf process thread-id stack-ptr)))
+
+
+
+(defun jde-bug-suspend-thread (thread-id)
+"Suspends the thread or group of threads specified by THREAD-ID.
+If the thread or group is already suspended, this command increments
+the thread's suspend count. Use JDEBug->Threads->Show Threads (`jde-bug-thread-show-threads')
+to display the IDs of all threads and thread groups running in the
+target process. Use JDEBug->Processes->Suspend Process
+(`jde-bug-suspend-process') to suspend the entire process. Use
+Threads->Resume Thread (`jde-bug-resume-thread') to resume the thread."
+  (interactive
+   "nThread ID: ")
+  (let* ((process (jde-dbs-get-target-process))
+	 (suspend-command
+	  (jde-dbs-suspend-thread
+	       (format "suspend thread %d" thread-id)
+	       :process process
+	       :thread-id thread-id)))
+    (jde-dbs-cmd-exec suspend-command)))
+
+
+(defun jde-bug-resume-thread (thread-id)
+"Resumes the previously suspended thread or group of threads specified
+by THREAD-ID.  This command has no effect if the specified thread or
+thread-group is running or was not suspended by you, using the
+JDEBug->Threads->Suspend Thread command (`jde-bug-suspend-thread').
+If you suspended the thread more than once, this command reduces the
+suspend count by 1. The thread resumes only when the suspend count
+reaches 0. Use JDEBug->Threads->Show Threads
+(`jde-bug-thread-show-threads') to display the IDs of all threads and
+thread groups running in the target process. Use
+JDEBug->Processes->Resume Process (`jde-bug-resume-process') to resume
+the entire process."
+  (interactive
+   "nThread ID: ")
+  (let* ((process (jde-dbs-get-target-process))
+	 (resume-command
+	  (jde-dbs-resume-thread
+	       (format "resume thread %d" thread-id)
+	       :process process
+	       :thread-id thread-id)))
+    (jde-dbs-cmd-exec resume-command)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Interrupt Thread Command                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-interrupt-thread (thread-id)
+"Interrupts the thread specified by THREAD-ID. The thread cannot be
+resumed. Use JDEBug->Threads->Show Threads
+(`jde-bug-thread-show-threads') to display the IDs of all threads
+running in the target process. Use Threads->Suspend Thread
+(`jde-bug-suspend-thread') to suspend a thread temporarily."
+  (interactive
+   "nThread ID: ")
+  (let* ((process (jde-dbs-get-target-process))
+	 (interrupt-command
+	  (jde-dbs-interrupt-thread
+	       (format "interrupt thread %d" thread-id)
+	       :process process
+	       :thread-id thread-id)))
+    (jde-dbs-cmd-exec interrupt-command)))
+
+
+(defun jde-bug-stop-thread (thread-id exception-id)
+"Stops a thread and throws an exception. THREAD-ID is the id of the thread you want
+to stop. EXCEPTION-ID is the id of the exception object you want to throw. Use
+JDEBug->Threads->Show Threads (`jde-bug-thread-show-threads') to display the IDs of
+all threads and thread groups running in the target process. Use JDEBug->Evaluate Expression
+to creae the exception object."
+ (interactive
+   "nThread ID: \nnException Id: ")
+  (let* ((process (jde-dbs-get-target-process))
+	 (stop-command
+	  (jde-dbs-stop-thread
+	       (format "stop thread %d" thread-id)
+	       :process process
+	       :thread-id thread-id
+	       :exception-id exception-id)))
+    (jde-dbs-cmd-exec stop-command)))
+
+(defun jde-bug-jpda-installed-p ()
+  "Returns t if the jpda is installed."
+  (interactive)
+  (cond
+   ((jde-bug-vm-includes-jpda-p)
+    t)
+   ((string= jde-bug-jpda-directory "")
+    (error "jde-bug-jpda-directory variable is not set.")
+    nil)
+   ((not (file-exists-p
+	  (expand-file-name "lib/jpda.jar" (jde-normalize-path
+					    'jde-bug-jpda-directory))))
+    (error "Cannot find JPDA jar file at %s"
+	     (expand-file-name "lib/jpda.jar" jde-bug-jpda-directory))
+    nil)
+   (t
+    t)))
+
+
+(defun jde-bug-start-debugger ()
+  "Starts the debugger."
+  (interactive)
+  (if (not (jde-dbs-debugger-running-p))
+      (if (and (jde-bug-jpda-installed-p)
+	   (jde-dbs-debugger-start jde-dbs-the-debugger))
+      (message "Debugger started successfully." )
+      (message "Could not start debugger."))
+    (message "Debugger is already started")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Launch Process Command                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-launch-process ()
+  "Starts a virtual machine to run the application
+in the current source buffer. Halts at the beginning
+of the process to let you set breakpoints. The started
+process becomes the target process for debugger
+commands. Select Processes->Set Target Process from the JDEBug
+menu or run the `jde-bug-set-target-process' command
+to set another process as the target process."
+  (interactive)
+  (let* ((main-class (jde-run-get-main-class)))
+    (unless (and
+	     (jde-dbs-proc-set-find jde-dbs-the-process-registry
+				    :main-class main-class)
+	     (not (yes-or-no-p
+		   (format "An instance of %s is already running. Continue?" main-class))))
+      (let* ((process
+	      (jde-dbs-proc (format "process%d"
+				    (setq jde-dbs-proc-counter
+					  (1+ jde-dbs-proc-counter)))
+			    :id jde-dbs-proc-counter :main-class main-class))
+	     (old-target (jde-dbs-get-target-process))
+	     (launch (jde-dbs-launch-process
+		      (format "Launch %s" main-class)
+		      :process process
+		      :vmexec (car jde-bug-vm-executable)
+		      ;; :vmexec "xyz"
+		      ))
+	     (succeededp t))
+	(jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+	(if (not (string= jde-bug-jre-home ""))
+	    (oset launch :jre-home (jde-normalize-path 'jde-bug-jre-home)))
+	(oset jde-dbs-the-process-registry :target-process process)
+	(when (not (jde-dbs-cmd-exec launch))
+	  (jde-dbs-proc-move-to-morgue process)
+	  (if old-target
+	      (oset jde-dbs-the-process-registry :target-process old-target))
+	  (jde-dbs-proc-set-state process "unknown")
+	  (jde-dbs-proc-set-state-reason process "Error launching process.")
+	  (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+	  (setq succeededp nil))
+	succeededp))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Attach Local Process Command                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-bug-attach-via-shared-memory (process-name)
+  "Attaches the debugger to a process running on the same machine via shared
+memory. This command works only on Windows."
+  (interactive
+   "sProcess name: ")
+  (let* ((process
+	  (jde-dbs-proc (format "process%d"
+				(setq jde-dbs-proc-counter
+				      (1+ jde-dbs-proc-counter)))
+			:id jde-dbs-proc-counter :main-class process-name))
+	 (old-target (jde-dbs-get-target-process))
+	 (attach (jde-dbs-attach-shmem
+		  (format "Attach %s" process-name)
+		  :process process
+		  :process-name process-name)))
+    (jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+    (oset jde-dbs-the-process-registry :target-process process)
+    (if (not (jde-dbs-cmd-exec attach))
+	(progn
+	  (jde-dbs-proc-move-to-morgue process)
+	  (if old-target
+	      (oset jde-dbs-the-process-registry :target-process old-target))
+	  (jde-dbs-proc-set-state process "unknown")
+	  (jde-dbs-proc-set-state-reason process "Error launching process.")
+	  (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+	  nil)
+      (jde-bug-set-breakpoints process jde-db-breakpoints))
+    t))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Attach Process on Local Host Command                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun jde-bug-attach-local-host (process-port)
+  "Attaches the debugger to a process running on local host. This command connects
+to the process via a socket."
+  (interactive
+   "sProcess Port: ")
+  (let* ((process
+	  (jde-dbs-proc (format "process%d"
+				(setq jde-dbs-proc-counter
+				      (1+ jde-dbs-proc-counter)))
+			:id jde-dbs-proc-counter :main-class process-port))
+	     (old-target (jde-dbs-get-target-process))
+	     (attach (jde-dbs-attach-socket
+		      (format "Attach %s" process-port)
+		      :process process
+		      :port process-port)))
+    (jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+    (oset jde-dbs-the-process-registry :target-process process)
+    (if (not (jde-dbs-cmd-exec attach))
+	(progn
+	  (jde-dbs-proc-move-to-morgue process)
+	  (if old-target
+	      (oset jde-dbs-the-process-registry :target-process old-target))
+	  (jde-dbs-proc-set-state process "unknown")
+	  (jde-dbs-proc-set-state-reason process "Error launching process.")
+	  (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+	  nil)
+      (jde-bug-set-breakpoints process jde-db-breakpoints))
+    t))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Attach Process on Remote Host Command                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun jde-bug-attach-remote-host (process-host process-port)
+  "Attaches the debugger to a process running on a remote host. This command connects
+to the process via a socket."
+ (interactive
+   "sHost: \nsProcess Port: ")
+  (let* ((process
+	  (jde-dbs-proc (format "process%d"
+				(setq jde-dbs-proc-counter
+				      (1+ jde-dbs-proc-counter)))
+			:id jde-dbs-proc-counter :main-class process-port))
+	     (old-target (jde-dbs-get-target-process))
+	     (attach (jde-dbs-attach-socket
+		      (format "Attach %s" process-port)
+		      :process process
+		      :host process-host
+		      :port process-port)))
+    (jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+    (oset jde-dbs-the-process-registry :target-process process)
+    (if (not (jde-dbs-cmd-exec attach))
+	(progn
+	  (jde-dbs-proc-move-to-morgue process)
+	  (if old-target
+	      (oset jde-dbs-the-process-registry :target-process old-target))
+	  (jde-dbs-proc-set-state process "unknown")
+	  (jde-dbs-proc-set-state-reason process "Error launching process.")
+	  (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+	  nil)
+      (jde-bug-set-breakpoints process jde-db-breakpoints))
+    t))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Listen for Process on Shared Memory Command                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar jde-bug-server-shmem-name-history nil
+  "History of shared memory names for debugger.")
+
+(defun jde-bug-listen-shmem (shmem-name)
+  "Listens on shared memory for a vm requiring debugging services."
+  (interactive
+   (list
+    (if (car jde-bug-server-shmem-name)
+	(read-from-minibuffer "Name: "
+			      (car jde-bug-server-shmem-name-history)
+			      nil nil
+			      'jde-bug-server-shmem-name-history)
+      (cdr jde-bug-server-shmem-name))))
+  (let* ((process
+	  (jde-dbs-proc (format "process%d"
+				(setq jde-dbs-proc-counter
+				      (1+ jde-dbs-proc-counter)))
+			:id jde-dbs-proc-counter :main-class shmem-name))
+	     (old-target (jde-dbs-get-target-process))
+	     (listen (jde-dbs-listen-for-process
+		      (format "Listen %s" shmem-name)
+		      :process process
+		      :address shmem-name)))
+    (jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+    (oset jde-dbs-the-process-registry :target-process process)
+    (when (not (jde-dbs-cmd-exec listen))
+      (jde-dbs-proc-move-to-morgue process)
+      (if old-target
+	  (oset jde-dbs-the-process-registry :target-process old-target))
+      (jde-dbs-proc-set-state process "unknown")
+      (jde-dbs-proc-set-state-reason process "Error listening for process.")
+      (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+      nil)
+    t))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Listen for Process on Socket Command                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar jde-bug-server-socket-history nil
+  "History of sockets used by debugger to listen for debuggee vms.")
+
+(defun jde-bug-listen-socket (socket)
+  "Listens on socket for a vm requiring debugging services.
+If `jde-bug-server-socket' is set to \"prompt for,\" this command
+prompts you to enter the socket on which to listen. Otherwise, it
+listens on the socket specified by `jde-bug-server-socket'."
+  (interactive
+   (list
+    (if (car jde-bug-server-socket)
+	(read-from-minibuffer "Socket: "
+			      (car jde-bug-server-socket-history)
+			      nil nil
+			      'jde-bug-server-socket-history)
+      (cdr jde-bug-server-socket))))
+  (let* ((process
+	  (jde-dbs-proc (format "process%d"
+				(setq jde-dbs-proc-counter
+				      (1+ jde-dbs-proc-counter)))
+			:id jde-dbs-proc-counter :main-class socket))
+	     (old-target (jde-dbs-get-target-process))
+	     (listen (jde-dbs-listen-for-process
+		      (format "Listen %s" socket)
+		      :process process
+		      :address socket
+		      :transport "socket")))
+    (jde-dbs-proc-set-add jde-dbs-the-process-registry process)
+    (oset jde-dbs-the-process-registry :target-process process)
+    (when (not (jde-dbs-cmd-exec listen))
+      (jde-dbs-proc-move-to-morgue process)
+      (if old-target
+	  (oset jde-dbs-the-process-registry :target-process old-target))
+      (jde-dbs-proc-set-state process "unknown")
+      (jde-dbs-proc-set-state-reason process "Error listening for process.")
+      (jde-dbs-proc-set-add jde-dbs-the-process-morgue process)
+      nil)
+    t))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Detach Process Command                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun jde-bug-detach-process ()
+  "Detaches the debugger from the target process. The target process continues
+to run."
+  (interactive)
+  (jde-bug-finish-process))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Suspend Process Command                                                    ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun jde-bug-suspend-process ()
+"Suspends the target process. To suspend a particular thread or thread group,
+use JDEbug->Threads->Suspend Thread (`jde-bug-suspend-thread')."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (suspend-command
+	  (jde-dbs-suspend-thread "suspend process" :process process)))
+    (jde-dbs-cmd-exec suspend-command)))
+
+
+(defun jde-bug-resume-process ()
+"Resumes the target process. To resume a particular thread or thread group,
+use JDEbug->Threads->Resume Thread (`jde-bug-resume-thread')."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (resume-command
+	  (jde-dbs-resume-thread "resume process" :process process)))
+    (jde-dbs-cmd-exec resume-command)))
+
+
+(defun jde-bug-finish-process ()
+  "Terminates the target process."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	 (finish (jde-dbs-finish-process
+		  (format "finish %d" (oref process id))
+		  :process process))
+	 (result (jde-dbs-cmd-exec finish)))
+    (jde-dbs-proc-move-to-morgue process)
+    (slot-makeunbound jde-dbs-the-process-registry :target-process)
+    (jde-dbs-proc-set-state-reason process "finish")))
+
+(defun jde-bug-set-target-process (process-id)
+  "Sets the process whose process-id is PROCESS-ID to be
+the focus of debugger commands."
+  (interactive
+   "nEnter process id: ")
+  (jde-dbs-proc-registry-set-target-proc
+   jde-dbs-the-process-registry process-id))
+
+
+(defun jde-bug-show-processes ()
+  (interactive)
+  (message "not implemented"))
+
+
+(defun jde-bug-remove-dead-processes ()
+  "Remove dead processes and their associated buffers from the Emacs environment."
+  (interactive)
+  (if (oref jde-dbs-the-process-morgue proc-alist)
+      (jde-dbs-proc-morgue-bury-the-dead jde-dbs-the-process-morgue)))
+
+
+(defun jde-bug-show-locals-buf ()
+  "Show the local variables buffer of the target process.
+This command splits the window and shows the locals buffer."
+  (interactive)
+  (if (not jde-bug-local-variables)
+      (progn
+	(jde-bug-toggle-local-variables)
+	(if (featurep 'xemacs)
+	    (sleep-for 0.1)
+	  (sleep-for 0 100))))
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (locals-buf (oref process locals-buf))
+	 (source-window (selected-window))
+	 locals-window)
+    (if (one-window-p)
+	(progn
+	  (setq locals-window (split-window source-window))
+	  (set-window-buffer locals-window locals-buf)))
+    (set-window-buffer (next-window source-window) locals-buf)
+    (select-window source-window)))
+
+(defun jde-bug-show-cli-buf ()
+  "Show the command-line interface (CLI) buffer of the target process."
+  (interactive)
+  (let* ((process (jde-dbs-get-target-process))
+	(cli-buf (oref process cli-buf))
+	(source-window (selected-window))
+	cli-window)
+    (if (one-window-p)
+	(progn
+	  (setq cli-window (split-window source-window))
+	  (set-window-buffer cli-window cli-buf)))
+    (set-window-buffer (next-window source-window) cli-buf)
+    (select-window source-window)))
+
+
+(defun jde-bug-show-threads-buf ()
+  "Show the threads buffer of the target process."
+  (interactive)
+
+  ;;Updating the threads buffer
+  (jde-bug-show-threads)
+
+  (let* ((process (jde-dbs-get-target-process))
+	 (threads-buf (oref process threads-buf))
+	 (source-window (selected-window))
+	 threads-window)
+    (if (one-window-p)
+	(progn
+	  (setq threads-window (split-window source-window))
+	  (set-window-buffer threads-window threads-buf)))
+    (set-window-buffer (next-window source-window) threads-buf)
+    (select-window source-window)))
+
+
+(defun jde-bug-show-preferences ()
+  (interactive)
+  (customize-apropos "jde-bug" 'groups))
+
+
+(defun jde-bug-set-breakpoints (process breakpoints)
+  "Sets BREAKPOINTS in PROCESS."
+  (mapc
+   (lambda (assoc-x)
+     (let* ((breakpoint (cdr assoc-x))
+	    (set-breakpoint (jde-dbs-set-breakpoint
+			     (format "set breakpoint%d"
+				     (oref breakpoint id))
+			     :process process
+			     :breakpoint breakpoint))
+	    (result (jde-dbs-cmd-exec set-breakpoint)))))
+   breakpoints))
+
+;;;###autoload
+(defun jde-bug-debug-app ()
+  "Runs the debugger on the application in the current source buffer."
+  (interactive)
+  (if (and
+       (jde-bug-jpda-installed-p)
+       (not (jde-dbs-debugger-running-p)))
+      (jde-dbs-debugger-start jde-dbs-the-debugger))
+  (if (jde-dbs-debugger-running-p)
+      (let ((result (jde-bug-launch-process)))
+	(if result
+	    (let ((process (oref jde-dbs-the-process-registry :target-process)))
+	      (jde-bug-set-breakpoints process jde-db-breakpoints)
+	      (setq result (jde-bug-continue)))))))
+
+(defun jde-bug-help ()
+  "Displays the JDEbug User's Guide."
+  (interactive)
+  (let* ((jde-dir (jde-find-jde-doc-directory))
+	 (jdebug-help
+	  (if jde-dir
+	      (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir))))
+    (if (and
+	 jdebug-help
+	 (file-exists-p jdebug-help))
+	(browse-url (concat "file://" (jde-convert-cygwin-path jdebug-help)))
+      (signal 'error '("Cannot find JDEbug User's Guide.")))))
+
+(defun jde-bug-keys ()
+  "Displays JDEbug keybindings. Use `jde-keys' to display JDE keybindings."
+  (interactive)
+  (jde-describe-map 'jde-bug-keymap))
+
+(defun jde-bug-toggle-local-variables ()
+  "Enables and disables the retrieval of the local variables. It toggles
+the value of the variable `jde-bug-local-variables'"
+  (interactive)
+  (setq jde-bug-local-variables (not jde-bug-local-variables))
+  (if (and jde-dbo-current-process
+	   jde-dbo-current-thread-id
+	   jde-bug-local-variables)
+      (jde-dbo-update-locals-buf jde-dbo-current-process
+				 jde-dbo-current-thread-id 0)
+    (save-excursion
+      (if jde-dbo-current-process
+	  (progn
+	    (set-buffer (oref jde-dbo-current-process locals-buf))
+	    (kill-all-local-variables))))))
+
+(defun jde-bug-toggle-stack-info ()
+  "Enables and disables the retrieval of stack info. It toggles the value
+of the variable `jde-bug-stack-info'"
+  (interactive)
+  (setq jde-bug-stack-info (not jde-bug-stack-info))
+  (if (and jde-dbo-current-process
+	   jde-dbo-current-thread-id
+	   jde-bug-stack-info)
+      (jde-dbo-update-stack jde-dbo-current-process
+			    jde-dbo-current-thread-id)
+    (save-excursion
+      (if jde-dbo-current-process
+	  (progn
+	    (set-buffer (oref jde-dbo-current-process threads-buf))
+	    (kill-all-local-variables)
+	    (erase-buffer))))))
+
+(provide 'jde-bug)
+
+;; End of jde-bug.el
diff --git a/site/jdee/lisp/jde-bug.elc b/site/jdee/lisp/jde-bug.elc
new file mode 100644
index 0000000..c6cdaf0
Binary files /dev/null and b/site/jdee/lisp/jde-bug.elc differ
diff --git a/site/jdee/lisp/jde-checkstyle.el b/site/jdee/lisp/jde-checkstyle.el
new file mode 100644
index 0000000..def18a2
--- /dev/null
+++ b/site/jdee/lisp/jde-checkstyle.el
@@ -0,0 +1,436 @@
+;;; jde-checkstyle.el --- Checkstyle interface for JDE
+;; $Id: jde-checkstyle.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Copyright (C) 2001, 2002, 2003, 2004 Markus Mohnen and Paul Kinnucan
+;; Copyright (C) 2009 by Paul Landes
+
+;; Authors: Markus Mohnen and Paul Kinnucan
+;; Maintainers: Markus Mohnen and Paul Landes
+;; Created: 06 Jun 2001
+;;
+;;
+;; Keywords: Java coding standard checker Emacs
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; A copy of the GNU General Public License can be obtained from this
+;; program's author (send electronic mail to
+;; ) or from the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;; LCD Archive Entry:
+;; jde-checkstyle|Markus Mohnen|
+;; |Checkstyle interface for JDE
+;; |$Date: 2009-12-26 19:58:29 -0600 (Sat, 26 Dec 2009) $|$Revision: 179 $|~/packages/jde-checkstyle.el
+
+;;; Commentary:
+
+;;; This package provides an interface from JDE (see
+;;; http://jdee.sourceforge.net/) to Oliver Burn's CheckStyle (see
+;;; http://checkstyle.sourceforge.net/) a development tool
+;;; to help programmers write Java code that adheres to a coding
+;;; standard.
+
+;;; Installation:
+;;
+;;  Put this file on your Emacs-Lisp load path and add following into your
+;;  ~/.emacs startup file
+;;
+;;      (require 'jde-checkstyle)
+
+;;; Usage:
+;;
+;;  M-x `jde-checkstyle' to check the java file in the current buffer.
+;;
+
+;;; Customization:
+;;
+;;  M-x `jde-checkstyle-customize' to customize all the jde-checkstyle options.
+
+;;; Code:
+
+(require 'jde-compile)
+
+(defconst jde-checkstyle-version "3.1")
+
+(defgroup jde-checkstyle nil
+  "This group specifies options for the JDEE's interface to the CheckStyle
+package (http://checkstyle.sourceforge.net). The CheckStyle package
+checks Java source files for conformity to a specified coding
+style."
+  :group 'jde)
+
+(defcustom jde-checkstyle-class "com.puppycrawl.tools.checkstyle.Main"
+  "*Java checker class.
+Specifies the class of the the program to be used to check the source
+in the current buffer. The default is the checkstyle program."
+  :group 'jde-checkstyle
+  :type 'string)
+
+(defcustom jde-checkstyle-classpath nil
+  "*Specify paths of classes required to run the jde-checkstyle application.
+The JDE uses the specified paths to construct a -classpath
+argument to pass to the Java interpreter. This option overrides the
+`jde-global-classpath' option."
+  :group 'jde-checkstyle
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-checkstyle-read-args nil
+  "*Specify whether to prompt for additional checker arguments.
+If this variable is non-nil, the jde-checkstyle command prompts
+you to enter additional checker arguments in the minibuffer.
+These arguments are appended to those specified by customization
+variables. The JDE maintains a history list of arguments
+entered in the minibuffer."
+  :group 'jde-checkstyle
+  :type 'boolean)
+
+(defvar jde-checkstyle-interactive-args ""
+  "String of checker arguments entered in the minibuffer.")
+
+(defvar jde-checkstyle-interactive-arg-history nil
+  "History of checker arguments entered in the minibuffer.")
+
+;; (makunbound 'jde-checkstyle-style)
+(defcustom jde-checkstyle-style nil
+  "*Style used to check this project's Java code. \"Sun\"
+checks for conformity to the Java code style standard established by
+Sun Microsystems. \"Custom\" specifies a a user-defined
+style. Selecting this option causes Emacs to display an edit
+field. Enter the path of a CheckStyle configuration file that defines
+the custom coding style in this field (see the CheckStyle
+documentation for information on configuration files). Use
+`jde-checkstyle-properties' to specify the values of properties that
+the configuration file reads from the CheckStyle command line."
+   :group 'jde-checkstyle
+   :type '(choice (const :tag "Sun" :value nil)
+		 (file :menu-tag "Custom" :tag "Config. File")))
+
+
+(defcustom jde-checkstyle-expanded-properties nil
+  "*Specify the values of the expanded properties specified by the
+`jde-checkstyle-style' configuration file. (See the CheckStyle
+documentation for information about expanded properties.) To enter a
+property, select the INS button. Emacs displays a Property Name field
+and a Property Value field for the property. Enter the name of the
+property, for example, checkstyle.header.file, in the Property Name
+field; enter its value, for example, docs/java.header, in the Property
+Value field.  Repeat this process to display additional
+properties. You can specify as many properties as you like in
+this way. To delete a property, select the DEL button next
+to the property."
+  :group 'jde-checkstyle
+  :type '(repeat (cons
+		  (string :tag "Property Name")
+		  (string :tag "Property Value"))))
+
+;; (makunbound 'jde-checkstyle-expanded-properties-file)
+(defcustom jde-checkstyle-expanded-properties-file nil
+  "*Path of a file that specifies the values of a configuration
+file's expanded properties. If this option is set, the JDEE ignores
+the settings of the `jde-checkstyle-expanded-properties' variable."
+   :group 'jde-checkstyle
+   :type '(choice (const :tag "None" :value nil)
+		  (file :menu-tag "Properties File" :tag "Path")))
+
+;; (makunbound 'jde-checkstyle-module-package-names-file)
+(defcustom jde-checkstyle-module-package-names-file nil
+  "*Path of a file that specifies the package names of
+custom style checking modules used by this project."
+   :group 'jde-checkstyle
+   :type '(choice (const :tag "None" :value nil)
+		  (file :menu-tag "Package Names File" :tag "Path")))
+
+;; (makunbound 'jde-checkstyle-output-file)
+(defcustom jde-checkstyle-output-file nil
+  "*Path of a file to store CheckStyle's output."
+   :group 'jde-checkstyle
+   :type '(choice (const :tag "None" :value nil)
+		  (file :menu-tag "Output File" :tag "Path")))
+
+
+;; (makunbound 'jde-checkstyle-output-format)
+(defcustom jde-checkstyle-output-format nil
+  "*Format of CheckStyle's output. Options are plain or XML."
+  :group 'jde-checkstyle
+  :type '(choice (const :tag "Plain" :value nil)
+		 (const :tag "XML" :value "xml")))
+
+
+;; (makunbound 'jde-checkstyle-source-dir)
+(defcustom jde-checkstyle-source-dir nil
+  "*Path of a directory to check. If you specify a
+path, CheckStyle checks all the files in the specified
+directory. Otherwise, it checks the file in the current
+buffer."
+   :group 'jde-checkstyle
+   :type '(choice (const :tag "None" :value nil)
+		  (file :menu-tag "Source Directory" :tag "Path")))
+
+
+;; (makunbound 'jde-checkstyle-finish-hook)
+(defcustom jde-checkstyle-finish-hook
+  '(jde-compile-finish-kill-buffer)
+  "List of functions to be invoked when CheckStyle terminates.  Each
+function should accept two arguments: the compilation buffer and a
+string describing how the compilation finished."
+  :group 'jde-checkstyle
+  :type 'hook)
+
+
+;; (makunbound 'jde-checkstyle-source-file-extension)
+(defcustom jde-checkstyle-source-file-extension nil
+  "*Extension of Java source files (if not java)."
+  :group 'jde-checkstyle
+  :type '(choice (const :tag "java" :value nil)
+		 (string :menu-tag "other" :tag "Extension")))
+
+
+(defmethod jde-checkstyle-get-property-args ((this jde-run-vm))
+    "Get property arguments."
+    (mapcar
+     (lambda (prop)
+       (format "-D%s=%s" (car prop) (cdr prop)))
+     jde-run-option-properties))
+
+
+;;;###autoload
+(defun jde-checkstyle-customize ()
+  "Set Java style checking options."
+  (interactive)
+  (customize-group "jde-checkstyle"))
+
+
+(defclass jde-checkstyle-checker ()
+  ((buffer           :initarg :buffer
+		     :type buffer
+		     :documentation
+		     "Compilation buffer")
+   (window           :initarg :window
+		     :type window
+		     :documentation
+		     "Window that displays the compilation buffer.")
+   (interactive-args :initarg :interactive-args
+		     :type list
+		     :documentation
+		     "Arguments entered in the minibuffer."))
+  "Class of Java style checkers.")
+
+(defmethod jde-checkstyle-create-checker-buffer ((this jde-checkstyle-checker))
+  (save-excursion
+    (let ((buf (get-buffer-create "*check style*"))
+	  (error-regexp-alist compilation-error-regexp-alist)
+	  (enter-regexp-alist (if (boundp 'compilation-enter-directory-regexp-alist)
+				  compilation-enter-directory-regexp-alist))
+	  (leave-regexp-alist (if (boundp 'compilation-leave-directory-regexp-alist)
+				  compilation-leave-directory-regexp-alist))
+	  (file-regexp-alist (if (boundp 'compilation-file-regexp-alist)
+				 compilation-file-regexp-alist))
+	  (nomessage-regexp-alist (if (boundp 'compilation-nomessage-regexp-alist)
+				      compilation-nomessage-regexp-alist))
+	  (parser compilation-parse-errors-function)
+	  (error-message "No further errors")
+	  (thisdir default-directory))
+
+      (oset this :buffer buf)
+
+      (set-buffer buf)
+
+      ;; Make sure a style checker process is not
+      ;; already running.
+      (let ((check-proc (get-buffer-process (current-buffer))))
+	(if check-proc
+	    (if (or (not (eq (process-status check-proc) 'run))
+		    (yes-or-no-p
+			 "A check style process is running; kill it?"))
+		(condition-case ()
+		    (progn
+		      (interrupt-process check-proc)
+		      (sit-for 1)
+		      (delete-process check-proc))
+		  (error nil))
+	      (error "Cannot have two processes in `%s' at once"
+			 (buffer-name)))))
+
+      ;; In case the checker buffer is current, make sure we get the global
+      ;; values of compilation-error-regexp-alist, etc.
+      (kill-all-local-variables)
+
+      ;; Clear out the compilation buffer and make it writable.
+      (buffer-disable-undo (current-buffer))
+      (erase-buffer)
+      (buffer-enable-undo (current-buffer))
+
+      (compilation-mode)
+      (setq buffer-read-only nil)
+
+      (set (make-local-variable 'compilation-finish-function)
+	   (lambda (buf msg)
+	     (run-hook-with-args 'jde-checkstyle-finish-hook buf msg)
+	     (setq compilation-finish-function nil)))
+      (if (boundp 'compilation-parse-errors-function)
+	  (set (make-local-variable 'compilation-parse-errors-function) parser))
+      (if (boundp 'compilation-error-message)
+	  (set (make-local-variable 'compilation-error-message) error-message))
+      (set (make-local-variable 'compilation-error-regexp-alist)
+	     error-regexp-alist)
+      (when (not (featurep 'xemacs))
+	(dolist (elt `((compilation-enter-directory-regexp-alist
+			,enter-regexp-alist)
+		       (compilation-leave-directory-regexp-alist
+			,leave-regexp-alist)
+		       (compilation-file-regexp-alist
+			,file-regexp-alist)
+		       (compilation-nomessage-regexp-alist
+			,nomessage-regexp-alist)))
+	  (if (boundp (car elt))
+	      (set (make-local-variable (car elt)) (second elt)))))
+
+      (if (boundp 'compilation-directory-stack)
+	  (setq default-directory thisdir
+		compilation-directory-stack (list default-directory))))))
+
+(defmethod jde-checkstyle-get-property-args ((this jde-checkstyle-checker))
+    "Get property arguments."
+    (mapcar
+     (lambda (prop)
+       (format "-D%s=%s" (car prop) (cdr prop)))
+     jde-checkstyle-expanded-properties))
+
+(defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
+
+  (jde-checkstyle-create-checker-buffer this)
+
+  ;; Pop to checker buffer.
+  (let ((outwin (display-buffer (oref this :buffer))))
+    (compilation-set-window-height outwin)
+    (oset this :window outwin))
+
+  (if (not jde-xemacsp)
+      (if compilation-process-setup-function
+	  (funcall compilation-process-setup-function)))
+
+  (let* ((outbuf (oref this :buffer))
+	 (vm-path (oref (jde-run-get-vm) :path))
+	 (source-file
+	  (concat (file-name-nondirectory buffer-file-name)))
+	 (jde-java-directory
+	  (concat
+	   (jde-find-jde-data-directory)
+	   "java/"))
+	 (args (append
+		(unless jde-checkstyle-expanded-properties-file
+		  (jde-checkstyle-get-property-args this))
+		(oref this :interactive-args)
+		(list "-classpath"
+		      (if jde-checkstyle-classpath
+			  (jde-build-classpath jde-checkstyle-classpath)
+			(jde-normalize-path
+			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
+		(list jde-checkstyle-class)
+		(list "-c"
+		      (if jde-checkstyle-style
+			  (jde-normalize-path jde-checkstyle-style)
+			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
+		(if jde-checkstyle-expanded-properties-file
+		    (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
+		(if jde-checkstyle-module-package-names-file
+		    (list "-n" (jde-normalize-path jde-checkstyle-module-package-names-file)))
+		(if jde-checkstyle-output-format
+		    (list "-f" jde-checkstyle-output-format))
+		(if jde-checkstyle-output-file
+		    (list "-o" (jde-normalize-path jde-checkstyle-output-file)))
+		(if jde-checkstyle-source-file-extension
+		    (list "-e" jde-checkstyle-source-file-extension))
+		(if jde-checkstyle-source-dir
+		    (list "-r" (jde-normalize-path jde-checkstyle-source-dir))
+		  (list source-file)))))
+
+    (save-excursion
+      (set-buffer outbuf)
+
+      (insert (format "cd %s\n" default-directory))
+
+      (insert (concat
+	       vm-path
+	       " "
+	       (mapconcat 'identity args " ")
+	       "\n\n"))
+
+      (let* ((process-environment (cons "EMACS=t" process-environment))
+	     (w32-quote-process-args ?\")
+	     (win32-quote-process-args ?\") ;; XEmacs
+	     (proc (apply 'start-process
+			  (downcase mode-name)
+			  outbuf
+			  vm-path
+			  args)))
+	(set-process-sentinel proc 'compilation-sentinel)
+	(set-process-filter proc 'compilation-filter)
+	(set-marker (process-mark proc) (point) outbuf)
+	(setq compilation-in-progress
+	      (cons proc compilation-in-progress)))
+
+      (set-buffer-modified-p nil)
+      (setq compilation-last-buffer (oref this :buffer)))))
+
+
+
+;;;###autoload
+(defun jde-checkstyle ()
+  "Checks the Java program in the current buffer.
+This command invokes the style checker specified by `jde-checkstyle-class'
+with the options specif2ied by the JDEE customization variables
+that begin with `jde-checkstyle'. If the variable
+`jde-checkstyle-read-args' is non-nil, this command reads
+additional compilation options from the minibuffer, with
+history enabled."
+  (interactive)
+
+  (if jde-checkstyle-read-args
+      (setq jde-checkstyle-interactive-args
+	    (read-from-minibuffer
+	     "Check args: "
+	     jde-checkstyle-interactive-args
+	     nil nil
+	     '(jde-checkstyle-interactive-arg-history . 1))))
+
+  (let ((checker (jde-checkstyle-checker
+		  "checker"
+		  :interactive-args (if jde-checkstyle-read-args
+					jde-checkstyle-interactive-args))))
+
+    ;; Force save-some-buffers to use the minibuffer
+    ;; to query user about whether to save modified buffers.
+    ;; Otherwise, when user invokes jde-checkstyle from
+    ;; menu, save-some-buffers tries to popup a menu
+    ;; which seems not to be supported--at least on
+    ;; the PC.
+    (if (and (eq system-type 'windows-nt)
+	     (not jde-xemacsp))
+	(let ((temp last-nonmenu-event))
+	  ;; The next line makes emacs think that jde-checkstyle
+	  ;; was invoked from the minibuffer, even when it
+	  ;; is actually invoked from the menu-bar.
+	  (setq last-nonmenu-event t)
+	  (save-some-buffers (not compilation-ask-about-save) nil)
+	  (setq last-nonmenu-event temp))
+      (save-some-buffers (not compilation-ask-about-save) nil))
+
+    (jde-checkstyle-exec checker)))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-checkstyle)
+
+;; End of jde-checkstyle.el
diff --git a/site/jdee/lisp/jde-checkstyle.elc b/site/jdee/lisp/jde-checkstyle.elc
new file mode 100644
index 0000000..4042f5f
Binary files /dev/null and b/site/jdee/lisp/jde-checkstyle.elc differ
diff --git a/site/jdee/lisp/jde-class.el b/site/jdee/lisp/jde-class.el
new file mode 100644
index 0000000..bd90df4
--- /dev/null
+++ b/site/jdee/lisp/jde-class.el
@@ -0,0 +1,223 @@
+;; jde-class.el --- Class usage commands for the JDEE.
+;; $Id: jde-class.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Copyright (C) 2003 Andrew Hyatt
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Andrew Hyatt <andy_jde@thehyatts.net>
+;; Maintainers: Andrew Hyatt and Paul Landes
+;; Keywords: java, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; A copy of the GNU General Public License can be obtained from this
+;; program's author (send electronic mail to
+;; ) or from the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;; Commentary:
+
+;; This is a package that contains various utility classes that are
+;; useful when dealing with class files.  There are several macros to
+;; enable one to write code that looks through all compiled class
+;; files, such as `with-all-class-files', which calls some code for
+;; every class files in the `jde-built-class-path'.  There is also
+;; `with-all-class-infos-when', which tests each class file with some
+;; predicate, and if it passes then makes the class-info available to
+;; the code in the body.  `with-all-corresponding-class-infos' will
+;; execte for classes that are compiled from a certain Java source file.
+;;
+;; There are also a few helper utilities here.
+
+(require 'jde-parse-class)
+
+(defcustom jde-built-class-path nil
+  "Similar to `jde-global-classpath', except this path should only
+have those places where compile files live.  This list of paths could
+contain both directories and jar files.  Each of these should
+correspond to the root of the build tree, in other words the
+directories under it should correpond to packages."
+  :group 'jde-project
+  :type '(repeat (file :tag "Path")))
+
+(defmacro with-all-class-files (spec &rest body)
+  "Call BODY for every class file found in `jde-built-class-path'.
+Pass in the variable that the class filename will be substituted for,
+and optionally a value to use as the return value (similar to
+`dotimes'), otherwise `nil' will be returned.  Another optional
+argument in the SPEC is the package to restrict processing to.
+
+\(fn (VAR [RESULT] [PACKAGE]) BODY...)"
+
+  (let ((class-var-sym (car spec))
+	(old-dir-sym (gensym "--with-all-class-files-old-dir"))
+	(normalized-path-sym (gensym "--with-all-class-files-npath"))
+	(dir-sym (gensym "--with-all-class-files-dir-sym"))
+	(dir2-sym (gensym "--with-all-class-files-dir2-sym"))
+	(path-sym (gensym "--with-all-class-files-path"))
+	(buf-sym (gensym "--with-all-class-files-buf"))
+	(rec-descend (gensym "--with-all-class-files-rec-descend"))
+	(process-files (gensym "--with-all-class-files-process-files"))
+	(process-class (gensym "--with-all-class-files-process-class"))
+	(child-path (gensym "--with-all-class-files-child-path"))
+	(package (nth 2 spec)))
+	`(labels ((,process-class (,class-var-sym)
+				 (when (string-match "\.[Cc][Ll][Aa][Ss][Ss]$" ,class-var-sym)
+				   ,@body))
+		  (,process-files (,dir2-sym)
+				  (when (file-exists-p ,dir2-sym)
+					(dolist (,class-var-sym (directory-files ,dir2-sym
+										 t "[^.]$"))
+					  (,process-class ,class-var-sym))))
+		  (,rec-descend (,dir2-sym)
+				(if (file-directory-p ,dir2-sym)
+				    (dolist (,child-path (directory-files ,dir2-sym
+									 t "[^.]$"))
+				      (,rec-descend ,child-path))
+				  (,process-class ,dir2-sym))))
+	   (let ((,old-dir-sym default-directory))
+	     (unwind-protect
+		 (save-excursion
+		   (dolist (,path-sym jde-built-class-path)
+		     (let ((,normalized-path-sym (jde-normalize-path ,path-sym)))
+		       (unless (file-exists-p ,normalized-path-sym)
+			 (error (concat "Could not find file or directory "
+					,normalized-path-sym)))
+		       (if (file-directory-p ,normalized-path-sym)
+			   (if ,package
+			       (,process-files
+				(concat ,normalized-path-sym "/" (subst-char-in-string ?. ?/ ,package)))
+			     (,rec-descend ,normalized-path-sym))
+			 ;; we're not a directory, assume we are a jar file
+			 (let ((,dir-sym (concat (jde-temp-directory) "/"
+						 (make-temp-name "jde-classes-temp"))))
+			   (make-directory ,dir-sym)
+			   (cd ,dir-sym)
+			   (let ((,buf-sym (get-buffer-create "*Jar output*")))
+			     (unless (eq (call-process (jde-get-jdk-prog 'jar) nil
+						       ,buf-sym nil "-xf"
+						       (expand-file-name
+							,normalized-path-sym)) 0)
+			       (error
+				(concat "Could not unjar file "
+					(expand-file-name ,normalized-path-sym)
+					".  See *Jar output* buffer for details")))
+			     (kill-buffer ,buf-sym))
+			   (unwind-protect
+			       (if ,package
+				   (,process-files
+				    (concat ,dir-sym "/" (subst-char-in-string ?. ?/ ,package)))
+				 (,rec-descend ,dir-sym))
+			     (jde-remove-all-from-directory ,dir-sym)))))))
+	       (cd ,old-dir-sym)))
+	   ;; return val
+	   ,(nth 1 spec))))
+
+(defmacro with-all-class-infos-when (spec pred &rest body)
+  "Call BODY with the parsed class information of each file found in
+`jde-built-class-path' which passes PRED.  PRED is called on the file
+name, not the info.  Also, in contrast to `with-all-classes', the BODY
+won't get called on the same class twice.  Pass in the variable that
+the class info will be substituted for, and optionally a value to use
+as the return value (similar to `dotimes').  Otherwise `nil' will be
+returned.  The second optional parameter is the optional package
+parameter, to restrict processing to a particular package.
+Example:(with-all-class-infos-when (info) (lambda (x)
+(some-pred-p x)) (do-stuff info))"
+
+(let ((parsed-class-sym (gensym "--with-all-class-infos-pclasses"))
+      (class-file-sym (gensym "--with-all-class-infos-cfile"))
+      (var-sym (car spec)))
+  `(let ((,parsed-class-sym '()))
+     (with-all-class-files (,class-file-sym ,@(cdr spec))
+			   (when (and (not (jde-class-path-in-classes-p ,class-file-sym ,parsed-class-sym))
+				      (funcall ,pred ,class-file-sym))
+			     (let ((,var-sym (jde-parse-class ,class-file-sym)))
+			       ,@body
+			       (add-to-list (quote ,parsed-class-sym)
+					    (jde-parse-class-extract-classname info)))))
+     ,(cadr spec))))
+
+(defmacro with-all-corresponding-class-infos (spec &rest body)
+  "Do BODY with all the class files that correspond to the given
+source file.  SPEC is a list of the variable name to store the class
+info, the package name of the source file, the source name of the source file, and the optional return val.
+\((with-all-corresponding-class-infos (VAR PACKAGE FILENAME [RESULT]) BODY...)"
+  `(with-all-class-infos-when (,(nth 0 spec) ,(nth 3 spec) ,(nth 1 spec))
+     (lambda (class-file)
+       (string-match ,(nth 1 spec)
+		     (replace-regexp-in-string "/" "." (file-name-directory class-file))))
+     (when (equal (jde-parse-class-extract-sourcefile info) ,(nth 2 spec))
+       ,@body)))
+
+(defun jde-class-path-in-classes-p (path classes)
+  "Returns true if the PATH looks like it represents a class in CLASSES"
+  (jde-class-partial-match-member
+   (replace-regexp-in-string "\\.[Cc][Ll][Aa][Ss][Ss]$" ""
+			     (replace-regexp-in-string "/\\|\\$" "." path))
+   classes))
+
+(defun jde-class-partial-match-member (str list)
+  "Like `member' but works with strings and will return true if any of
+the strings in LIST exist at the end of STR"
+  (member-if (lambda (item) (string-match (concat (regexp-quote item) "$")
+					  str)) list))
+
+(defun jde-remove-all-from-directory (dir)
+  (if (file-directory-p dir)
+    (progn
+      (mapcar 'jde-remove-all-from-directory
+	      (directory-files dir t "[^\\.]$"))
+      (delete-directory dir))
+    (delete-file dir)))
+
+(defun append-to-list (var list &optional accept-nil)
+  "Appends everything in LIST to the list in VAR.  Use similar to
+add-to-list, but instead of adding one things, adds a bunch.
+ACCEPT-NIL determines if 'nil's are to be added.  By default, they
+will not be."
+  (dolist (item list)
+    (when (or accept-nil item)
+      (add-to-list var item))))
+
+(defun jde-class-get-all-classes-used-by-source (package source-file)
+  (let ((primitives '("boolean" "int" "void" "float" "double"))
+	(classes '()))
+    (with-all-corresponding-class-infos (info package source-file classes)
+					;;a. super class type
+					(add-to-list 'classes (jde-parse-class-extract-superclass info))
+					;;b. super interfaces type
+					(append-to-list 'classes (jde-parse-class-extract-interfaces info))
+					;;c. types of declared fields
+					;;d. local variable types
+					;; (all called types should wrk for this...)
+					(append-to-list 'classes (mapcar (lambda(item) (caadr item))
+									 (jde-parse-class-extract-method-calls info)))
+					;;e. method return type
+					;;f. method parameter type
+					(dolist (sig (jde-parse-class-extract-method-signatures info))
+					  (when (and (nth 1 sig) (not (member (nth 1 sig) primitives)))
+					    (add-to-list 'classes (nth 1 sig)))
+					  (append-to-list 'classes
+							  (mapcar (lambda (c) (when (and c (not (member c primitives)) c)))
+								  (nth 2 sig))))
+					;;g. method exception types
+					(dolist (exceptions (mapcar (lambda (method-exceptions) (nth 1 method-exceptions))
+								    (jde-parse-class-extract-thrown-exception-types info)))
+					  (append-to-list 'classes exceptions))
+					;;h. type of exceptions in 'catch' statements.
+					(dolist (exceptions (mapcar (lambda (method-exceptions) (nth 1 method-exceptions))
+								    (jde-parse-class-extract-caught-exception-types info)))
+					  (append-to-list 'classes exceptions)))))
+
+(provide 'jde-class)
+
+;; End of jde-class.el
diff --git a/site/jdee/lisp/jde-class.elc b/site/jdee/lisp/jde-class.elc
new file mode 100644
index 0000000..ec51580
Binary files /dev/null and b/site/jdee/lisp/jde-class.elc differ
diff --git a/site/jdee/lisp/jde-compat.el b/site/jdee/lisp/jde-compat.el
new file mode 100644
index 0000000..db0cf9a
--- /dev/null
+++ b/site/jdee/lisp/jde-compat.el
@@ -0,0 +1,135 @@
+;;; jde-compat.el -- Integrated Development Environment for Java.
+;; $Id: jde-compat.el 175 2009-12-24 02:59:33Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This library is intended to eliminate compiler warnings caused
+;; by reference to variables that are defined only in Emacs or
+;; only in XEmacs or in a particular version of either.
+;; This library is required only for compilation.
+
+;;; Code:
+
+;;;###autoload
+(defconst jde-xemacsp (string-match "XEmacs" (emacs-version))
+  "Non-nil if we are running in the XEmacs environment.")
+
+(defconst jde-xemacs20p (and jde-xemacsp (>= emacs-major-version 20)))
+
+(defconst jde-emacs21p (and (string-match "\\bEmacs\\b" (emacs-version))
+			    (>= emacs-major-version 21)))
+
+;; Define XEmacs- and Emacs-only variables
+;; and functions to avoid compiler warnings.
+  (if jde-xemacsp
+      (progn
+	(defvar w32-start-process-show-window nil)
+	(defvar w32-quote-process-args nil)
+	(defvar last-nonmenu-event nil)
+	(defvar tags-table-format-hooks nil)
+	(defvar auto-insert nil)
+	(defvar message-log-max nil)
+	(defun easy-menu-create-menu (&rest args))
+	(defun define-key-after (&rest args))
+	(defun ange-ftp-ftp-name (&rest args))
+	(defun ange-ftp-get-file-entry (&rest args))
+	(defun make-overlay (beg end &optional buffer front-advance rear-advance))
+	(defun delete-overlay (overlay))
+	(defun overlay-start (overlay))
+	(defun overlay-end (overlay))
+	(defun overlay-lists ())
+	(defun event-start (ev))
+	(defun posn-point (p))
+	(defun posn-window (p))
+	(defalias 'frame-char-width 'frame-width)
+	(defalias 'frame-char-height 'frame-height))
+    (progn
+      ;; These are XEmacs-only functions
+      (defvar current-menubar nil)
+      (defvar tags-table-format-hooks nil)
+      (defvar windowed-process-io nil)
+      (unless (fboundp 'add-submenu)
+	(defun add-submenu (&rest args)))
+      (defun frame-property (&rest args))
+      (defun frame-highest-window (&rest args))
+      (defun mswindows-cygwin-to-win32-path (&rest args))
+      (defun ange-ftp-ftp-name (&rest args))
+      (defun ange-ftp-get-file-entry (&rest args))
+      (defun mswindows-cygwin-to-win32-path (&rest args))
+      (defun add-submenu (&rest args))
+      (defun add-menu (&rest args))
+      (defun easy-menu-create-keymaps (&rest args))
+      (defun locate-data-directory (&rest args))
+      (defun temp-directory (&rest args))
+      (defun extent-at (&rest args))
+      (defun make-extent (&rest args))
+      (defun set-extent-face (&rest args))
+      (defun set-extent-priority (&rest args))
+      (defun extent-property (&rest args))
+      (defun delete-extent (&rest args))
+      (defun map-extents (&rest args))
+      (defun extent-start-position (&rest args))))
+
+
+;; Define XEmacs- and Emacs-only variables
+;; and functions to avoid compiler warnings.
+(if (not jde-xemacsp)
+    (defun make-event (&rest args)))
+
+(if jde-emacs21p
+    (progn
+      (defun hscroll-window-column (&rest args))))
+
+;; Avoid undefined function error when compiling jde-help.
+(defun url-file-exists (&args))
+
+;; Required to compile jde-java-font-lock.el in versions
+;; of Emacs that lack the cc-fonts package.
+(eval-when-compile
+  (if (not (fboundp 'c-make-font-lock-search-function))
+      (defun c-make-font-lock-search-function (&rest args))))
+
+;; From custom web page for compatibility between versions of custom:
+(condition-case ()
+    (require 'custom)
+  (error nil))
+(if (and (featurep 'custom) (fboundp 'custom-declare-variable))
+    nil	;; We've got what we needed
+  ;; We have the old custom-library, hack around it!
+  (defmacro defgroup (&rest args)
+    nil)
+  (defmacro defface (var values doc &rest args)
+    `(progn
+       (defvar ,var (quote ,var))
+       ;; To make colors for your faces you need to set your .Xdefaults
+       ;; or set them up ahead of time in your .emacs file.
+       (make-face ,var)
+       ))
+  (defmacro defcustom (var value doc &rest args)
+    `(defvar ,var ,value ,doc)))
+
+(provide 'jde-compat)
+
+;; End of jde-compat.el
diff --git a/site/jdee/lisp/jde-compat.elc b/site/jdee/lisp/jde-compat.elc
new file mode 100644
index 0000000..b2ca18d
Binary files /dev/null and b/site/jdee/lisp/jde-compat.elc differ
diff --git a/site/jdee/lisp/jde-compile.el b/site/jdee/lisp/jde-compile.el
new file mode 100644
index 0000000..41f99bc
--- /dev/null
+++ b/site/jdee/lisp/jde-compile.el
@@ -0,0 +1,1380 @@
+;;; jde-compile.el -- Integrated Development Environment for Java.
+;; $Id: jde-compile.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2008 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;; The latest version of the JDE is available at
+;; <URL:http://jdee.sourceforge.net/>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at paulk@mathworks.com.
+
+;;; Code:
+
+(require 'eieio)
+(require 'cl)
+(require 'compile)
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-complete-last-compiled-class)
+(defvar jde-classpath-separator)
+
+
+(defgroup jde-compile-options nil
+  "JDE Compiler Options"
+  :group 'jde
+  :prefix "jde-compile-option-")
+
+;; (makunbound 'jde-compiler)
+(defcustom jde-compiler '("javac server" "")
+  "Specify the type, and if necessary, the location of the compiler to
+be used to compile source files for the current project. The JDE
+supports three compilers: javac server, javac executable, and
+jikes. The javac server runs the com.sun.tools.javac package included
+with the JDK in the Beanshell. The javac executable shipped with the
+JDK also uses this package. The advantage of the javac server is that
+it avoids the vm startup time that accounts for most of the
+compilation time consumed by the javac executable. The javac server
+uses the version of com.sun.tools.javac included in the JDK for the
+current project. See `jde-jdk' for more information. If you want to
+use the javac executable to compile your project's source files,
+select \"javac\" as the compiler type and, optionally, specify
+the path to the executable in the \"Path\" field. If you do
+not specify a path, the JDE uses the javac executable included in the
+JDK for the current project. Similarly, to use jikes, select \"jikes\"
+and, if jikes is not on the command path of the Emacs
+environment, specify the path of the jikes executable."
+  :group 'jde-project
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Compiler type"
+	   (item "javac server")
+	   (item "javac")
+	   (item "jikes"))
+	  (file
+	   :tag "Path")))
+
+
+(defcustom jde-read-compile-args nil
+"*Specify whether to prompt for additional compiler arguments.
+If this variable is non-nil, the jde-compile command prompts
+you to enter additional compiler arguments in the minibuffer.
+These arguments are appended to those specified by customization
+variables. The JDE maintains a history list of arguments
+entered in the minibuffer."
+  :group 'jde-project
+  :type 'boolean)
+
+(defvar jde-interactive-compile-args ""
+"String of compiler arguments entered in the minibuffer.")
+
+(defvar jde-interactive-compile-arg-history nil
+"History of compiler arguments entered in the minibuffer.")
+
+;; (makunbound 'jde-compile-finish-hook)
+(defcustom jde-compile-finish-hook
+  '(jde-compile-finish-kill-buffer
+    jde-compile-finish-refresh-speedbar
+    jde-compile-finish-update-class-info)
+  "List of functions to be invoked when compilation of a
+Java source file terminates. Each function should accept
+two arguments: the compilation buffer and a string
+describing how the compilation finished."
+  :group 'jde
+  :type 'hook)
+
+(defcustom jde-compile-option-hide-classpath nil
+  "Substitute the classpath in the compilation window for
+..."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+(defun jde-compile-update-class-list ()
+  (let ((class-dir
+	 (if (string= jde-compile-option-directory "")
+	     (expand-file-name ".")
+	   (jde-normalize-path
+	    jde-compile-option-directory
+	    'jde-compile-option-directory))))
+    (message (concat "Updating class list for " class-dir))
+    (jde-jeval (concat
+		"jde.util.JdeUtilities.updateClassList(\""
+		class-dir
+	       "\");"))
+    (message "Updating class list...done.")))
+
+(defun jde-compile-finish-update-class-info (buf msg)
+  "Flush the classinfo cache and update the class list used by
+JDEE wizards at the end of compilation.  Flush the entire cache as we
+don't know which classes were recompiled."
+  ;;Setting the last java buffer as the current buffer
+  (condition-case nil
+      (progn
+	(if jde-xemacsp
+	    (set-buffer (cadr (buffer-list)))
+	  (set-buffer (car (buffer-list))))
+	(if (eq major-mode 'jde-mode)
+	    (progn
+	      (setq jde-complete-last-compiled-class (jde-parse-get-buffer-class))
+	      (jde-complete-flush-classes-in-cache (list jde-complete-last-compiled-class))
+	      (message "Flushed completion cache.")
+	      (setq jde-complete-last-compiled-class nil)
+	      (jde-compile-update-class-list))))
+    (error nil)))
+
+(defun jde-compile-finish-refresh-speedbar (buf msg)
+  "Refresh speedbar at the end of a compilation."
+  (if (and (frame-live-p speedbar-frame)
+	    (frame-visible-p speedbar-frame))
+       (speedbar-refresh)))
+
+
+(defcustom jde-compile-jump-to-first-error t
+  "*Automatically jump to the first error when a compilation process completes."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+(defun jde-compile-kill-buffer (buf)
+  (delete-windows-on buf)
+  (kill-buffer buf))
+
+;; Thanks to Jack Donohue <donohuej@synovation.com>.
+(defun jde-compile-finish-kill-buffer (buf msg)
+  "Removes the jde-compile window after a few seconds if no errors."
+  (save-excursion
+    (set-buffer buf)
+    (if (null (or (string-match ".*exited abnormally.*" msg)
+		  (string-match ".*BUILD FAILED.*" (buffer-string))))
+	;;no errors, make the compilation window go away in a few seconds
+	(if (or (and (numberp jde-compile-enable-kill-buffer)
+		     (not (minusp jde-compile-enable-kill-buffer)))
+		jde-compile-enable-kill-buffer)
+	    (lexical-let ((compile-buffer buf))
+	      (run-at-time
+	       (format "%d sec" (if (numberp jde-compile-enable-kill-buffer)
+				    jde-compile-enable-kill-buffer 2))
+	       nil 'jde-compile-kill-buffer
+	       compile-buffer)
+	      (message "No compilation errors")))
+      ;;there were errors, so jump to the first error
+      (if jde-compile-jump-to-first-error (next-error 1)))))
+
+
+(defcustom jde-compile-option-command-line-args nil
+  "*Specify options as a string of command-line arguments.
+The value of this variable should be a list of switches understood
+by the compiler, for example, -depend -g. This variable is intended to
+be used to set compile options not otherwise defined by the JDE, in
+particular, options not defined by javac but used by another compiler
+that you might want to use with the JDE."
+  :group 'jde-compile-options
+  :type '(repeat (string :tag "Argument:")))
+
+(defcustom jde-compile-option-classpath nil
+"*Specify paths of classes required to compile this project.
+The JDEE uses the specified paths to construct a -classpath
+argument to pass to the compiler. If you do not specify this
+option, the JDEE uses the value of the `jde-global-classpath'
+option to compile this project.
+
+Starting in JDK 1.6, a class path element containing a basename
+of * is considered equivalent to specifying a list of all the
+files in the directory with the extension .jar or .JAR.  For
+example, if directory foo contains a.jar and b.JAR, then the
+class path element foo/* is expanded to A.jar;b.JAR, except that
+the order of jar files is unspecified. All jar files in the
+specified directory, even hidden ones, are included in the
+list. A classpath entry consisting simply of * expands to a list
+of all the jar files in the current directory. The CLASSPATH
+environment variable, where defined, will be similarly
+expanded. Note: Depending of the configuration of your command
+line environment, you may have to quote the wild card character,
+for example, javac -cp \"*.jar\" MyClass.java."
+  :group 'jde-compile-options
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-compile-option-sourcepath nil
+"*Specify the source code path to search for class or interface definitions.
+
+As with the user class path, source path entries  can be directories, JAR
+archives, or ZIP archives. If packages are used, the local path name within
+the directory or archive must reflect the package name.
+
+Note that classes found through the classpath are subject to automatic
+recompilation if their sources are found."
+  :group 'jde-compile-options
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-compile-option-directory ""
+  "*Specifies the root directory of the class file hierarchy.
+The compiler places compiled classes in the specified
+directory. For example, specifying the class
+directory as:
+
+  C:\\users\\dac\\classes
+
+causes the class files for the classes in the MyProgram.java source
+file to be saved in the directory C:\\users\\dac\\classes. If your class
+is in the package demos\\awt, the class files would be placed in directory
+C:\\users\\dac\\classes\\demos\\awt."
+  :group 'jde-compile-options
+  :type 'directory)
+
+(defcustom jde-compile-option-deprecation nil
+  "*Warn use or override of a deprecated member or class.
+A member or class is deprecated if its documentation comment contains
+the @deprecated tag. The compiler will emit a warning at the end of
+compilation whether or not the deprecation option is on; this option
+causes the location of each individual use or override to be noted.
+
+Deprecated members or classes are deliberately not mentioned if the
+source file containing the deprecation is being recompiled.  This can
+happen because the file is on the command line or because the depend
+option is on and the source file is out of date.
+"
+  :group 'jde-compile-options
+  :type 'boolean)
+
+
+(defcustom jde-compile-option-debug
+  (list "selected" (list t nil nil))
+  "*Include debug information in classes.
+The compiler includes line number information by default.
+
+Before JDK 1.2, the the debug and optimize options were
+mutually exclusive. In JDK 1.2, it is possible to combine debug and
+optimize, but the shortcuts taken by optimized code may occasionally
+produce surprising debugging results. For example, declared variables
+may not exist and code may appear to move or not be executed at all.
+
+The JDK 1.1.x versions of javac do not support inclusion of selected
+debug information."
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Debug info to include in class:"
+	   (const "all")
+	   (const "none")
+	   (const "selected"))
+	  (list
+	   :tag "    info"
+	   :indent 4
+	   (checkbox :format "%[%v%] %t \n"
+		     :tag "Line Numbers")
+	   (checkbox :format "%[%v%] %t \n"
+		     :tag "Variables")
+	   (checkbox :format "%[%v%] %t \n"
+		     :tag "Source")))
+
+)
+
+
+(defcustom jde-compile-option-optimize nil
+"*Directs the compiler to try to generate faster code.
+This may slow down compilation, make larger class files, and/or make
+it difficult to debug.
+
+Prior to 1.2, the optimize option tried to inline methods across
+classes. This created compatibility problems and sometimes generated
+illegal bytecode. The optimize option also implicitly turned on the
+depend option and implicitly turned off the debug option.
+
+In JDK 1.2, the optimize option no longer inlines across classes and
+so may safely be used for any java compilation. Optimize no longer
+implicitly turns on depend or implicitly turns off debug."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+
+(defcustom jde-compile-option-depend nil
+"*Analyze dependencies.
+Causes recompilation of class files on which the source files given as
+command line arguments recursively depend. Without this option, only
+files that are directly depended on and missing or out-of-date will be
+recompiled. Recompilation does not extend to missing or out-of-date
+files only depended on by already up-to-date class files.
+
+Note: if you are using a compiler other than post JDK 1.1.6 versions
+of javac, you may need to specify the command-line switch used by
+the compiler to specify dependency checking. See
+`jde-compile-option-depend-switch' for more information."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+(defcustom jde-compile-option-depend-switch (list "-Xdepend")
+"*Specify command line switch for depend option.
+This option is necessary because the command-line switch for
+dependency checking differs among Java compilers. Choose
+from the following options:
+
+  -Xdepend  Full dependency checking (post JDK 1.1.6)
+  -depend   Full dependency checking (jikes and pre-JDK 1.1.6)
+  +F        Check everything except jar and zip files (jikes only)
+  +U        Check everything including jar and zip files (jikes only)"
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Select -Xdepend (javac) or -depend (jikes):"
+	   (const "-Xdepend")
+	   (const "-depend")
+	   (const "+F")
+	   (const "+U"))))
+
+(defcustom jde-compile-option-vm-args nil
+"*Specify command-line arguments for Java interpreter.
+Passes the specified arguments to the Java interpreter that runs the
+compiler. The argument should not contain spaces. This is useful for
+adjusting the compiler's execution environment or memory usage."
+  :group 'jde-compile-options
+  :type '(repeat (string :tag "Option")))
+
+(defcustom jde-compile-option-verbose nil
+"*Print verbose messages.
+Causes the compiler and linker to print out messages about what source
+files are being compiled and what class files are being loaded."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+(defcustom jde-compile-option-nowarn nil
+"*Turn off warnings.
+If this option is specified, the compiler does not print out any
+warnings."
+  :group 'jde-compile-options
+  :type 'boolean)
+
+
+;;(makunbound 'jde-compile-option-annotation-processors)
+(defcustom jde-compile-option-annotation-processors nil
+"*Names of the annotation processors to run. This bypasses the default discovery process."
+  :group 'jde-compile-options
+  :type '(repeat (string :tag "Name")))
+
+;;(makunbound 'jde-compile-option-annotation-processing)
+(defcustom jde-compile-option-annotation-processing
+  (list "compile and process annotations")
+"*Controls whether annotation processing and/or compilation is done."
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Processing:"
+	   (const "compile and process annotations")
+	   (const "compile only")
+	   (const "process annotations only"))))
+
+;;(makunbound 'jde-compile-option-annotation-processor-options)
+(defcustom jde-compile-option-annotation-processor-options nil
+"*Options to pass to annotation processors. These are not
+interpreted by javac directly, but are made available for use by
+individual processors. key should be one or more identifiers
+separated by \".\"."
+  :group 'jde-compile-options
+  :type '(repeat
+	  (cons :tag "Option"
+	   (string :tag "Key")
+	   (string :tag "Value"))))
+
+(defcustom jde-compile-option-encoding ""
+"*Specify the source file encoding name, such as EUCJIS\\SJIS.
+If this option is not specified, the platform default converter
+is used."
+  :group 'jde-compile-options
+  :type 'string)
+
+;;(makunbound 'jde-compile-option-implicit)
+(defcustom jde-compile-option-implicit
+  (list "Generate and warn")
+"*Specify whether to generate class files for source files loaded in
+order to get type information needed to compile and/or process
+annotations in other files. Options are:
+
+  * Generate and warn
+
+    Generate class files for source files loaded to get type info for other files.
+    Do not generate class files for source files needed only to process
+    annotations. Instead issue a warning.
+
+  * Generate and do not warn
+
+    Generate class files for source files needed to compile other files. Do
+    not generate class files for source needed for processing annotions
+    in other files and do not warn that class files are not generated.
+
+  * Do not generate
+
+    Do not generate class files for implicitly loaded source files.
+"
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Processing:"
+	   (const "Generate and warn")
+	   (const "Generate and do not warn")
+	   (const "Do not generate"))))
+
+
+;;(makunbound 'jde-compile-option-source)
+(defcustom jde-compile-option-source (list "default")
+"*Enables JDK version-specific features to be used in
+source files.
+
+  1.3	  The compiler does not support assertions
+
+  1.4     The compiler accepts code containing assertions.
+
+  1.5     Enables 1.5-specific features.
+
+  1.6     Enables 1.6-specific features.
+
+  Select \"default\" to use the source features that
+  the compiler supports by default, i.e., to not include the -source
+  switch on the compiler command line. For example, the javac compiler
+  defaults to 1.3 source features if the -source flag is not
+  used.
+
+   ***NOTE***
+
+   This option is supported only by versions of javac shipped
+   starting with J2SDK 1.4."
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Source release:"
+	   (const "default")
+	   (const "1.3")
+	   (const "1.4")
+	   (const "1.5")
+	   (const "1.6"))))
+
+;;(makunbound 'jde-compile-option-target)
+(defcustom jde-compile-option-target (list "1.1")
+"*Generate class files that will work on VMs with the specified version.
+
+The default is to generate class files to be compatible with both
+1.1 and 1.2 VMs. The versions supported by javac in JDK1.2 are:
+
+  1.1     Ensure that generated class files will be compatible
+	  with 1.1 and 1.2 VMs. This is the default.
+
+  1.2     Generate class files that will run on 1.2 VMs, but
+	  not on 1.1 VMs.
+
+  1.3     Generate class files that will run on VMs in the
+	  Java 2 SDK, v 1.3 and later, but will not run
+	  on 1.1 or 1.2 VMs
+
+  1.4     Generate class files that are compatible only with
+	  1.4 VMs.
+
+By default, classes are compiled against the bootstrap and extension classes
+of the JDK that javac shipped with. But javac also supports cross-compiling,
+where classes are compiled against a bootstrap and extension classes of a
+different Java platform implementation. It is important to use
+`jde-compile-option-bootclasspath' and `jde-compile-option-extdirs' when
+cross-compiling."
+  :group 'jde-compile-options
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Target VM:"
+	   (const "1.1")
+	   (const "1.2")
+	   (const "1.3")
+	   (const "1.4"))))
+
+(defcustom jde-compile-option-bootclasspath nil
+"*Cross-compile against the specified set of boot classes.
+As with the user class path, boot class path entries can be
+directories, JAR archives, or ZIP archives."
+  :group 'jde-compile-options
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-compile-option-extdirs nil
+"*Cross-compile against the specified extension directories.
+Each JAR archive in the specified directories is searched for class files."
+  :group 'jde-compile-options
+  :type '(repeat (file :tag "Path")))
+
+;;(makunbound 'jde-compile-option-verbose-path)
+(defcustom jde-compile-option-verbose-path nil
+"*Describe how paths and standard extensions were searched to find
+source and class files.
+
+   ***NOTE***
+
+   This option is supported only by the versions of javac shipped
+   with JDK 1.1.x and 1.2.x and oldjavac in JDK 1.3."
+
+  :group 'jde-compile-options
+  :type 'boolean)
+
+(defcustom jde-compile-enable-kill-buffer -1
+  "* Time in seconds to display the compilation buffer before 
+'jde-compile-finish-kill-buffer will kill the compilation buffer.
+
+If less than zero (or nil), do not kill the compilation buffer.
+If t (or other non-nil non-number) then kill in 2 secs."
+  :group 'jde-compile-options
+  :type 'number)
+
+(defun jde-compile-show-options-buffer ()
+  "Show the JDE Compile Options panel."
+  (interactive)
+  (customize-apropos "jde-compile-options" 'groups))
+
+(defclass jde-compile-server-buffer (bsh-compilation-buffer) ()
+  "Compiler server buffer.")
+
+(defmethod bsh-compilation-buffer-create-native-buffer ((this jde-compile-server-buffer))
+  "Creates the native Emacs buffer for the JDEE compile server."
+  (oset this buffer-name "*JDEE Compile Server*")
+  (oset this buffer (get-buffer-create (oref this buffer-name))))
+
+(defclass jde-compile-exec-buffer (bsh-compilation-buffer) ()
+  "Compiler exec buffer.")
+
+(defmethod initialize-instance ((this jde-compile-exec-buffer) &rest fields)
+  "Constructor for exec compilation buffer instance."
+
+  (bsh-compilation-buffer-create-native-buffer this)
+
+  (oset
+   this
+   filter
+   (lexical-let ((this-buf this))
+     (lambda (process output)
+       (bsh-compilation-buffer-filter this-buf process output))))
+
+  (oset this process (get-buffer-process (oref this buffer)))
+
+  ;; Make sure this buffer is not associated with a compiler process that is
+  ;; already running.
+  (if (oref this process)
+      (if (or (not (eq (process-status (oref this process)) 'run))
+	      (yes-or-no-p
+	       "A compilation process is running; kill it?"))
+	  (condition-case ()
+	      (progn
+		(interrupt-process (oref this process))
+		(sit-for 1)
+		(delete-process (oref this process)))
+	    (error nil))
+	(error "Cannot have two processes in `%s' at once"
+	       (oref this buffer-name))))
+
+  (bsh-compilation-buffer-set-mode this))
+
+(defmethod bsh-compilation-buffer-create-native-buffer ((this jde-compile-exec-buffer))
+  "Creates the native Emacs buffer for the JDEE compile server."
+  (oset this buffer-name "*compilation*")
+  (oset this buffer (get-buffer-create (oref this buffer-name))))
+
+
+(defclass jde-compile-compiler ()
+  ((name             :initarg :name
+		     :type string
+		     :documentation
+		     "Name of compiler")
+   (version          :initarg :version
+		     :type string
+		     :documentation
+		     "Compiler version.")
+   (path             :initarg :path
+		     :type string
+		     :documentation
+		     "Path of the compiler executable.")
+   (buffer           :initarg :buffer
+		     :type bsh-compilation-buffer
+		     :documentation
+		     "Compilation buffer")
+   (window           :initarg :window
+		     :type window
+		     :documentation
+		     "Window that displays the compilation buffer.")
+   (interactive-args :initarg :interactive-args
+		     :type list
+		     :documentation
+		     "Arguments entered in the minibuffer.")
+   (use-server-p     :initarg :use-server-p
+		     :type boolean
+		     :documentation
+		     "Run as a compile server in the Beanshell."))
+  "Class of Java compilers.")
+
+(defmethod jde-compile-classpath-arg ((this jde-compile-compiler))
+  "Returns the classpath argument for this compiler."
+  (let ((classpath
+	 (if jde-compile-option-classpath
+	     jde-compile-option-classpath
+	   (jde-get-global-classpath)))
+	(symbol
+	 (if jde-compile-option-classpath
+	     'jde-compile-option-classpath
+	   'jde-global-classpath)))
+    (if classpath
+	(list
+	 "-classpath"
+	 (jde-build-classpath
+	  classpath
+	  symbol)
+	 ))))
+
+(defmethod jde-compile-sourcepath-arg ((this jde-compile-compiler))
+  "Get the source path argument for this compiler."
+    (if jde-compile-option-sourcepath
+	(list
+	 "-sourcepath"
+	 (jde-build-classpath
+	  jde-compile-option-sourcepath
+	  'jde-compile-option-sourcepath))))
+
+(defmethod jde-compile-bootclasspath-arg ((this jde-compile-compiler))
+  "Get the boot classpath argument for this compiler."
+  (if jde-compile-option-bootclasspath
+      (list
+       "-bootclasspath"
+       (jde-build-classpath jde-compile-option-bootclasspath
+			    'jde-compile-option-bootclasspath))))
+
+(defmethod jde-compile-extdirs-arg ((this jde-compile-compiler))
+  "Get the extdirs argument for this compiler."
+  (if jde-compile-option-extdirs
+      (list
+       "-extdirs"
+       (jde-build-classpath
+	jde-compile-option-extdirs
+	'jde-compile-option-extdirs))))
+
+
+(defmethod jde-compile-encoding-arg ((this jde-compile-compiler))
+  (if (not (string= jde-compile-option-encoding ""))
+      (list
+       "-encoding"
+       jde-compile-option-encoding)))
+
+(defmethod jde-compile-debug-arg ((this jde-compile-compiler))
+  "Get the debug arg for this compiler."
+  (let* ((include-option (nth 0 jde-compile-option-debug))
+	 (selected (nth 1 jde-compile-option-debug))
+	 (lines (nth 0 selected))
+	 (vars (nth 1 selected))
+	 (src (nth 2 selected)))
+    (cond
+     ((and
+       (string= include-option "selected")
+       lines
+       (not vars)
+       (not src))
+      nil)
+     ((string= include-option "all")
+      (list "-g"))
+     ((string= include-option "none")
+      (list "-g:none"))
+     ((and
+       (string= include-option "selected")
+       (or lines vars src))
+      (list
+       (concat
+	"-g:"
+	(if lines
+	    (if (or vars src) "lines,"
+	      "lines"))
+	(if vars
+	    (if vars
+		(if src "vars," "vars")))
+	(if src "source")))))))
+
+(defmethod jde-compile-output-dir-arg ((this jde-compile-compiler))
+  "Get the ouput directory arg for this compiler."
+    (if (not (string= jde-compile-option-directory ""))
+	(list
+	 "-d"
+	 (jde-normalize-path 'jde-compile-option-directory))))
+
+(defmethod jde-compile-deprecation-arg ((this jde-compile-compiler))
+  "Get deprecation argument for this compiler."
+    (if jde-compile-option-deprecation
+	(list "-deprecation")))
+
+(defmethod jde-compile-optimize-arg ((this jde-compile-compiler))
+  "Get optimization argument for this compiler."
+    (if jde-compile-option-optimize
+	(list "-O")))
+
+(defmethod jde-compile-depend-arg ((this jde-compile-compiler))
+  "Get dependency-checking argument for this compiler."
+  (if jde-compile-option-depend
+    (list (car jde-compile-option-depend-switch))))
+
+(defmethod jde-compile-vm-args ((this jde-compile-compiler))
+  "Get arguments to pass to the vm used to run this compiler."
+    (if jde-compile-option-vm-args
+	(mapcan
+	 (lambda (arg)
+	   (list (concat "-J" arg)))
+	 jde-compile-option-vm-args)))
+
+(defmethod jde-compile-verbose-arg ((this jde-compile-compiler))
+  "Get verbosity level argument for this compiler."
+    (if jde-compile-option-verbose
+	(list "-verbose")))
+
+(defmethod jde-compile-verbose-path-arg ((this jde-compile-compiler))
+  "Get verbose path argument for this compiler."
+    (if jde-compile-option-verbose-path
+	(list "-Xverbosepath")))
+
+(defmethod jde-compile-nowarn-arg ((this jde-compile-compiler))
+  "Get no warning argument for this compiler."
+    (if jde-compile-option-nowarn
+	(list "-nowarn")))
+
+(defmethod jde-compile-command-line-args ((this jde-compile-compiler))
+  "Get additional command line arguments for this compiler."
+	jde-compile-option-command-line-args)
+
+(defmethod jde-compile-target-arg ((this jde-compile-compiler))
+  "Get compiler target argument for this compiler."
+    (let ((target (car jde-compile-option-target)))
+      (if (not (string= target "1.1"))
+	  (list "-target" target))))
+
+(defmethod jde-compile-source-arg ((this jde-compile-compiler))
+  "Get compiler source argument for this compiler."
+  (let ((source (car jde-compile-option-source)))
+    (if (not (string= source "default"))
+	(list "-source" source))))
+
+(defmethod jde-compile-get-args ((this jde-compile-compiler))
+  (append
+   (jde-compile-classpath-arg this)
+   (jde-compile-sourcepath-arg this)
+   (jde-compile-bootclasspath-arg this)
+   (jde-compile-extdirs-arg this)
+   (jde-compile-encoding-arg this)
+   (jde-compile-debug-arg this)
+   (jde-compile-output-dir-arg this)
+   (jde-compile-deprecation-arg this)
+   (jde-compile-optimize-arg this)
+   (jde-compile-depend-arg this)
+   (jde-compile-vm-args this)
+   (jde-compile-verbose-arg this)
+   (jde-compile-verbose-path-arg this)
+   (jde-compile-nowarn-arg this)
+   (jde-compile-target-arg this)
+   (jde-compile-source-arg this)
+   (jde-compile-command-line-args this)))
+
+
+(defmethod jde-compile-run-exec ((this jde-compile-compiler))
+  (let* ((outbuf (oref (oref this buffer) buffer))
+	 (compiler-path (oref this :path))
+	 (source-file (file-name-nondirectory buffer-file-name))
+	 (flag nil)
+	 (args (append
+		(jde-compile-get-args this)
+		(oref this :interactive-args)
+		(list source-file))))
+
+    (save-excursion
+      (set-buffer outbuf)
+
+      (let ((inhibit-read-only t)) ; make compilation buffer temporarily writable
+	(insert (format "cd %s\n" default-directory))
+	(insert (concat
+	       compiler-path
+	       " "
+	       (mapconcat (lambda (x)
+			    (if (and flag
+				     jde-compile-option-hide-classpath)
+				(progn
+				  (setq flag nil)
+				  "...")
+			      (if (not (string= x "-classpath"))
+				  x
+				(progn
+				  (setq flag t)
+				  x)))) args " ")
+	       "\n\n")))
+
+      (let* ((process-environment (cons "EMACS=t" process-environment))
+	     (w32-quote-process-args ?\")
+	     (win32-quote-process-args ?\") ;; XEmacs
+	     (proc (apply 'start-process
+			  (downcase mode-name)
+			  outbuf
+			  compiler-path
+			  args)))
+	(set-process-sentinel proc 'compilation-sentinel)
+	(set-process-filter proc 'compilation-filter)
+	(set-marker (process-mark proc) (point) outbuf)
+	(setq compilation-in-progress
+	      (cons proc compilation-in-progress))))))
+
+(defmethod jde-compile-run-server ((this jde-compile-compiler))
+  (let* ((directory-sep-char ?/)
+	   (args
+	    (append
+	    (jde-compile-get-args this)))
+	   (source-path
+	    (jde-normalize-path buffer-file-name))
+	   (arg-array (concat "new String[] {\"" source-path "\"")))
+
+    (if args
+	(setq arg-array
+	      (concat
+	       arg-array
+	       ","
+	       (mapconcat
+		(lambda (arg)
+		  (concat "\"" arg "\""))
+		args
+		","))))
+
+      (setq arg-array (concat arg-array "}"))
+
+      (save-excursion
+	(set-buffer (oref (oref this buffer) buffer))
+
+	(let* ((inhibit-read-only t)
+	       flag
+	       (arg-string
+		(mapconcat
+		 (lambda (x)
+		   (if (and flag
+			    jde-compile-option-hide-classpath)
+		       (progn
+			 (setq flag nil)
+			 "...")
+		     (if (not (string= x "-classpath"))
+			 x
+		       (progn
+			 (setq flag t)
+			 x))))
+		 args " ")))
+
+	  (insert "CompileServer output:\n\n")
+	  (insert arg-string " " source-path "\n")))
+
+      (if (not (jde-bsh-running-p))
+	  (progn
+	    (bsh-launch (oref 'jde-bsh the-bsh))
+	    (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+
+      (bsh-buffer-eval
+       (oref 'jde-bsh the-bsh)
+       (concat
+	(format
+	 "jde.util.CompileServer.compile(%s);"
+	 arg-array)
+	"\n")
+       (oref this buffer))))
+
+
+(defmethod jde-compile-launch ((this jde-compile-compiler))
+
+  (if (oref this :use-server-p)
+      (jde-compile-run-server this)
+    (jde-compile-run-exec this))
+
+  (set-buffer-modified-p nil))
+
+(defmethod jde-compile-compile ((this jde-compile-compiler))
+
+  (if (oref this :use-server-p)
+      (oset this buffer (jde-compile-server-buffer "compilation buffer"))
+    (oset this buffer (jde-compile-exec-buffer "compilation buffer")))
+
+
+  ;; Pop to compilation buffer.
+  (let* ((outbuf (oref (oref this buffer) buffer))
+	  (outwin (display-buffer outbuf)))
+    (compilation-set-window-height outwin)
+    (oset this :window outwin)
+
+    (if (not jde-xemacsp)
+	(if compilation-process-setup-function
+	  (funcall compilation-process-setup-function)))
+
+    (jde-compile-launch this)
+
+    (setq compilation-last-buffer outbuf)))
+
+
+(defclass jde-compile-javac (jde-compile-compiler)
+  ()
+  "Class of javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler name.
+  (oset this name "javac")
+
+)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.1 Compiler                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-11 (jde-compile-compiler)
+  ()
+  "Class of JDK 1.1 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-11) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.1"))
+
+(defmethod jde-compile-debug-arg ((this jde-compile-javac-11))
+  "Get the debug arg for this compiler."
+   (let ((include-option (nth 0 jde-compile-option-debug)))
+     (cond
+      ((string= include-option "all")
+       (list "-g"))
+      ((string= include-option "selected")
+       (error "JDK 1.1 version of javac does not support selected debug info.")))))
+
+(defmethod jde-compile-depend-arg ((this jde-compile-javac-11))
+  "Get dependency-checking argument for this compiler."
+  (if jde-compile-option-depend
+    (list "-depend")))
+
+(defmethod jde-compile-get-args ((this jde-compile-javac-11))
+  (append
+   (jde-compile-classpath-arg this)
+   (jde-compile-encoding-arg this)
+   (jde-compile-debug-arg this)
+   (jde-compile-output-dir-arg this)
+   (jde-compile-deprecation-arg this)
+   (jde-compile-optimize-arg this)
+   (jde-compile-depend-arg this)
+   (jde-compile-vm-args this)
+   (jde-compile-verbose-arg this)
+   (jde-compile-nowarn-arg this)
+   (jde-compile-command-line-args this)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.2 Compiler                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-12 (jde-compile-compiler)
+  ()
+  "Class of JDK 1.2 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-12) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.2"))
+
+(defmethod jde-compile-depend-arg ((this jde-compile-javac-12))
+  "Get dependency-checking argument for this compiler."
+  (if jde-compile-option-depend
+    (list "-Xdepend")))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.3 Compiler                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-13 (jde-compile-javac-12)
+  ()
+  "Class of JDK 1.3 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-13) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.3"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.4 Compiler                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-14 (jde-compile-javac-13)
+  ()
+  "Class of JDK 1.4 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-14) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.4"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; J2SDK 1.5 Compiler                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-15 (jde-compile-javac-14)
+  ()
+  "Class of J2SDK 1.5 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-15) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.5"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; J2SDK 1.6 Compiler                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-javac-16 (jde-compile-javac-15)
+  ()
+  "Class of JDK 1.6 javac compilers.")
+
+(defmethod initialize-instance ((this jde-compile-javac-16) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler version.
+  (oset this version "1.6"))
+
+(defmethod jde-compile-annotation-processors-arg ((this jde-compile-javac-16))
+  "Get the annotation processors argument for this compiler."
+  (if jde-compile-option-annotation-processors
+    (list
+     "-processor"
+     (mapconcat 'identity
+		jde-compile-option-annotation-processors
+		","))))
+
+(defmethod jde-compile-annotation-processing-arg ((this jde-compile-javac-16))
+  (let ((option (car jde-compile-option-annotation-processing)))
+    (cond
+     ((string= option "compile and process annotations")
+      nil)
+     ((string= option "compile only")
+      (list "-proc:none"))
+     ((string= option "process annotations only")
+      (list "-proc:only")))))
+
+(defmethod jde-compile-annotation-processor-options-args ((this jde-compile-javac-16))
+    "Get property arguments."
+    (mapcar
+     (lambda (option)
+       (let ((key (car option))
+	     (value (cdr option)))
+	 (if (string= value "")
+	     (format "-A%s" key)
+	   (format "-A%s=%s" key value))))
+     jde-compile-option-annotation-processor-options))
+
+(defmethod jde-compile-implicit-arg ((this jde-compile-javac-16))
+  (let ((option (car jde-compile-option-implicit)))
+    (cond
+     ((string= option "Generate and warn")
+      nil)
+     ((string= option "Generate and do not warn")
+      (list "-implicit:class"))
+     ((string= option "Do not generate")
+      (list "-implicit:none")))))
+
+(defmethod jde-compile-get-args ((this jde-compile-javac-16))
+  (append
+   (jde-compile-classpath-arg this)
+   (jde-compile-encoding-arg this)
+   (jde-compile-debug-arg this)
+   (jde-compile-output-dir-arg this)
+   (jde-compile-deprecation-arg this)
+   (jde-compile-optimize-arg this)
+   (jde-compile-depend-arg this)
+   (jde-compile-annotation-processing-arg this)
+   (jde-compile-annotation-processors-arg this)
+   (jde-compile-annotation-processor-options-args this)
+   (jde-compile-implicit-arg this)
+   (jde-compile-vm-args this)
+   (jde-compile-verbose-arg this)
+   (jde-compile-nowarn-arg this)
+   (jde-compile-command-line-args this)))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Jikes Compiler                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-compile-jikes (jde-compile-compiler)
+  ()
+  "Class of jikes compilers.")
+
+(defmethod initialize-instance ((this jde-compile-jikes) &rest fields)
+ ;; Call parent initializer.
+
+  (call-next-method)
+
+  ;; Set compiler name.
+  (oset this :name "jikes")
+
+  ;; Set compiler version.
+  (oset this version "1.14"))
+
+(defmethod jde-compile-debug-arg ((this jde-compile-jikes))
+  "Get the debug arg for this compiler."
+  (let ((include-option (nth 0 jde-compile-option-debug)))
+    (cond
+     ((string= include-option "all")
+      (list "-g"))
+     ((string= include-option "selected")
+      (error "Jikes does not support jde-compile-option-debug's selected debug info option.")))))
+
+(defmethod jde-compile-depend-arg ((this jde-compile-jikes))
+  "Get dependency-checking argument for this compiler."
+  (if jde-compile-option-depend
+    (list "-depend")))
+
+(defmethod jde-compile-command-line-args ((this jde-compile-jikes))
+  "Get additional command line arguments for this compiler."
+	(append
+	 (list "+E")
+	 jde-compile-option-command-line-args))
+
+(defmethod jde-compile-classpath-arg ((this jde-compile-jikes))
+  "Returns the classpath argument for this compiler."
+  (let ((classpath (call-next-method))
+	(rt        (expand-file-name "jre/lib/rt.jar" (jde-get-jdk-dir))))
+    (if (file-exists-p rt)
+	(if classpath
+	    (or (string-match "jre/lib/rt\.jar" (cadr classpath))
+		(setcar (cdr classpath)
+			(concat (cadr classpath)
+				jde-classpath-separator
+				rt)))
+	  (setq classpath (list "-classpath" rt))))
+    classpath))
+
+(defmethod jde-compile-get-args ((this jde-compile-jikes))
+  (append
+   (jde-compile-classpath-arg this)
+   (jde-compile-sourcepath-arg this)
+   (jde-compile-bootclasspath-arg this)
+   (jde-compile-extdirs-arg this)
+   (jde-compile-encoding-arg this)
+   (jde-compile-debug-arg this)
+   (jde-compile-output-dir-arg this)
+   (jde-compile-deprecation-arg this)
+   (jde-compile-source-arg this)
+   (jde-compile-optimize-arg this)
+   (jde-compile-depend-arg this)
+   (jde-compile-verbose-arg this)
+   (jde-compile-verbose-path-arg this)
+   (jde-compile-nowarn-arg this)
+   (jde-compile-target-arg this)
+   (jde-compile-command-line-args this)))
+
+
+(defvar jde-compile-javac-compilers
+  (list
+   (jde-compile-javac-11 "javac 1.1.x")
+   (jde-compile-javac-12 "javac 1.2.x")
+   (jde-compile-javac-13 "javac 1.3.x")
+   (jde-compile-javac-14 "javac 1.4.x")
+   (jde-compile-javac-15 "javac 1.5.x")
+   (jde-compile-javac-16 "javac 1.6.x"))
+  "List of supported javac compilers.")
+
+(defun jde-compile-get-javac ()
+  (let* ((jdk-version (jde-java-version))
+	 (jdk-split-version (split-string jdk-version "[.]"))
+	 (jdk-major-version (nth 0 jdk-split-version))
+	 (jdk-minor-version (nth 1 jdk-split-version))
+	 (compiler
+	  (find-if
+	   (lambda (compiler-x)
+	     (let* ((compiler-split-version (split-string (oref compiler-x :version) "[.]"))
+		    (compiler-major-version (nth 0 compiler-split-version))
+		    (compiler-minor-version (nth 1 compiler-split-version)))
+	       (and
+		(string= jdk-major-version compiler-major-version)
+		(string= jdk-minor-version compiler-minor-version))))
+	   jde-compile-javac-compilers)))
+    (unless compiler
+      (let ((latest-javac (car (last jde-compile-javac-compilers))))
+	(if
+	    (yes-or-no-p
+	     (format "The JDE does not recognize JDK %s javac. Assume JDK %s javac?"
+		     jdk-version (oref latest-javac :version)))
+	    (setq compiler latest-javac))))
+    (if compiler
+	(if (string= (car jde-compiler) "javac server")
+	    (oset compiler :use-server-p t)
+	  (progn
+	    (oset compiler :use-server-p nil)
+	    (oset compiler
+		  :path
+		  (let ((compiler-path
+			 (substitute-in-file-name (nth 1 jde-compiler))))
+		    (if (string= compiler-path "")
+			(setq compiler-path (jde-get-jdk-prog 'javac))
+		      (if (file-exists-p compiler-path)
+			  compiler-path
+			(error (format "Invalid compiler path %s"
+				       compiler-path)))))))))
+    compiler))
+
+
+(defun jde-compile-get-jikes ()
+  (let ((compiler-path
+		(substitute-in-file-name (nth 1 jde-compiler))))
+
+    (if (string= compiler-path "")
+	(if (executable-find "jikes")
+	    (setq compiler-path "jikes")
+	  (error "Cannot find jikes."))
+      (unless
+	  (or
+	   (file-exists-p
+	    (if (and
+		 (eq system-type 'windows-nt)
+		 (not (string-match "[.]exe$" compiler-path)))
+		(concat compiler-path ".exe")
+	      compiler-path))
+	   (executable-find compiler-path))
+	(error "Invalid compiler path: %s" compiler-path)))
+
+  (jde-compile-jikes
+     "Jikes"
+     :use-server-p nil
+     :path compiler-path)))
+
+(defun jde-compile-get-the-compiler ()
+  "Get a compiler object that represents the compiler specified
+by `jde-compiler'."
+  (let ((compiler-name (car jde-compiler)))
+    (cond
+     ((string-match "javac" compiler-name)
+       (jde-compile-get-javac))
+     ((string-match "jikes" compiler-name)
+      (jde-compile-get-jikes))
+     (t
+      (error "The JDEE does not support a compiler named %s" compiler-name)))))
+
+
+;;;###autoload
+(defun jde-set-compile-options (options)
+  "Sets the compile options.
+Enter the options as you would on the command line, e.g.,
+-depend -verbose."
+  (interactive
+   "sEnter options: ")
+  (setq jde-compile-option-command-line-args (split-string options " ")))
+
+;;;###autoload
+(defun jde-compile ()
+  "Compile the Java program in the current buffer.
+This command invokes the compiler specified by `jde-compiler'
+with the options specified by the JDE customization variables
+that begin with `jde-compile'. If the variable
+`jde-read-compile-args' is non-nil, this command reads
+additional compilation options from the minibuffer, with
+history enabled. If `jde-compiler' specifies the JDE compile
+server, this command uses the compile server. Otherwise, it
+uses the compiler executable specified by
+`jde-compiler' to compile."
+  (interactive)
+
+  (if jde-read-compile-args
+      (setq jde-interactive-compile-args
+	      (read-from-minibuffer
+	       "Compile args: "
+	       jde-interactive-compile-args
+	       nil nil
+	       '(jde-interactive-compile-arg-history . 1))))
+
+    ;; Force save-some-buffers to use the minibuffer
+    ;; to query user about whether to save modified buffers.
+    ;; Otherwise, when user invokes jde-compile from
+    ;; menu, save-some-buffers tries to popup a menu
+    ;; which seems not to be supported--at least on
+    ;; the PC.
+    (if (and (eq system-type 'windows-nt)
+	     (not jde-xemacsp))
+	(let ((temp last-nonmenu-event))
+	  ;; The next line makes emacs think that jde-compile
+	  ;; was invoked from the minibuffer, even when it
+	  ;; is actually invoked from the menu-bar.
+	  (setq last-nonmenu-event t)
+	  (save-some-buffers (not compilation-ask-about-save) nil)
+	  (setq last-nonmenu-event temp))
+      (save-some-buffers (not compilation-ask-about-save) nil))
+
+    (setq compilation-finish-function
+      (lambda (buf msg)
+	(run-hook-with-args 'jde-compile-finish-hook buf msg)
+	(setq compilation-finish-function nil)))
+
+    (let ((compiler (jde-compile-get-the-compiler)))
+      (if compiler
+	  (progn
+	    (oset compiler
+		  :interactive-args
+		  (if (and jde-interactive-compile-args
+			   (not (string= jde-interactive-compile-args "")))
+		      (split-string jde-interactive-compile-args " ")))
+	    (jde-compile-compile compiler))
+	(error "Unknown compiler. Aborting compilation."))))
+
+
+
+(provide 'jde-compile)
+
+;; End of jde-compile.el
diff --git a/site/jdee/lisp/jde-compile.elc b/site/jdee/lisp/jde-compile.elc
new file mode 100644
index 0000000..c0bebbe
Binary files /dev/null and b/site/jdee/lisp/jde-compile.elc differ
diff --git a/site/jdee/lisp/jde-complete.el b/site/jdee/lisp/jde-complete.el
new file mode 100644
index 0000000..58360d9
--- /dev/null
+++ b/site/jdee/lisp/jde-complete.el
@@ -0,0 +1,1003 @@
+;; jde-complete.el -- Smart completion for the JDE
+;; $Id: jde-complete.el 176 2009-12-24 03:05:35Z lenbok $
+
+;; Author: Rodrigo Reyes <reyes@chez.com>
+;; Maintainers: Rodrigo Reyes
+;;              Paul Landes
+;;              David Ponce
+;;              Howard Spector
+;;              Stephane Nicolas <s.nicolas@videotron.ca>
+;;              Javier Lopez <jlopez@forumsys.com>
+
+;; Keywords: java, intellisense, completion
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Rodrigo Reyes, Paul Kinnucan,
+;;                          Stephane Nicolas, David Ponce, Javier Lopez
+;; Copyright (C) 2009 by Paul Landes
+
+;; This package follows the GNU General Public Licence (GPL), see the
+;; COPYING file that comes along with GNU Emacs. This is free software,
+;; you can redistribute it and/or modify it under the GNU GPL terms.
+
+;; Java is a registered trademark of Sun Microsystem, Inc.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment for Emacs (JDEE). See the
+;; JDEE User's Guide for more information.
+
+
+;; This package adds smart completion to the JDE. How it works is
+;; simple : put the cursor at the end of a statement "under
+;; construction", eg. "myVariable.rem<CURSOR HERE> and call the
+;; jde-complete-at-point emacs-lisp function (this is by default
+;; C-.). A completion is then inserted. If multiple completions are
+;; possible, calling the completion function again will cycle through
+;; all the possibilities (as dabbrev-mode does).
+
+;; To retrieve all the possible completions, it uses the java code in
+;; jde.util.Completion.getClassInfo(), called by beanshell. That
+;; need the class to be compiled (but that's not worst than an etag
+;; call).
+
+;; Known bugs/problems :
+
+;; TODO
+;; Move all the strings manipulation to the java side so that
+;; class info can be loaded in the background.
+
+;; The latest version of the JDEE is available at
+;; <URL:http://jdee.sourceforge.net>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at pkinnucan@attbi.com
+
+;;jde-eldoc for completion signatures
+
+(require 'eldoc)
+(require 'semantic-idle)
+
+(defgroup jde-complete nil
+  "JDE Completion"
+  :group 'jde
+  :prefix "jde-complete-")
+
+(defconst jde-complete-public 0 "Represent a public java modifiers")
+
+(defconst jde-complete-protected 1 "Represent a protected java modifiers")
+
+(defconst jde-complete-package 2 "Represent a package java modifiers")
+
+(defconst jde-complete-private 3 "Represent a private java modifiers")
+
+(defconst jde-complete-fields 0 "Represents the positions
+where the fields are placed.")
+
+(defconst jde-complete-constructors 1 "Represents the positions
+where the constructors are placed.")
+
+(defconst jde-complete-methods 2 "Represents the positions
+where the methods are placed.")
+
+(defconst jde-complete-classes 3 "Represents the positions
+where the classes are placed.")
+
+(defvar jde-complete-temp-process "*Temp*"
+  "Used as the name of a temporary process")
+
+(defvar jde-complete-last-compiled-class nil
+  "Contains the name of the class that was compiled last")
+
+(defvar jde-complete-current-signature nil
+  "Contains the signature of the last method inserted by
+either `jde-complete-in-line' or `jde-complete-menu'")
+
+(defconst jde-complete-signature-buffer "*Signature*"
+  "Buffer to display signatures")
+
+(defvar jde-complete-display-signature nil
+  "If non nil it displays the `jde-complete-current-signaure' in
+the minibuffer")
+
+(defcustom jde-complete-signature-display (list "Eldoc")
+  "Display modes used to show the method signature after a completion.
+The display modes choices are using eldoc-mode(the signature shows in the
+minibuffer), a buffer(a one line buffer shows the signature and then
+dissapears), or none."
+  :group 'jde-complete
+  :type '(list
+	  (radio-button-choice
+	   (const "Eldoc")
+	   (const "Buffer")
+	   (const "None"))))
+
+(defcustom jde-complete-signature-display-time 5
+  "Amount of time in seconds to display the method signature
+in the minibuffer after a completion."
+  :group 'jde-complete
+  :type 'integer)
+
+(defcustom jde-complete-add-space-after-method nil
+  "*If non nil it will add a space between the method
+name and the first parenthesis. i.e foo () instead of foo() when using
+the completion methods `jde-complete-in-line' and `jde-complete-menu'
+After customizing this variable, be sure to use
+`jde-complete-flush-classinfo-cache', any class information that was
+previously cache is not going to be affected by this setting."
+  :group 'jde-complete
+  :type 'boolean)
+
+(defcustom jde-complete-unique-method-names nil
+  "If non nil it will display methods with the same name
+ but with different signature only once, the signature for ths methods
+ will be the signature of the first method in the list of completions
+The list of completion is sorted in alphabetical order.
+This variable modifies the completion for `jde-complete-menu'
+and `jde-complete-in-line'. After customizing this variable,
+be sure to use `jde-complete-flush-classinfo-cache',
+any class information that was previously cache is not going to be affected by
+this setting"
+  :group 'jde-complete
+  :type 'boolean)
+
+(defcustom jde-complete-insert-method-signature t
+  "If non nil it will insert the method signature when using
+`jde-complete-in-line' and `jde-complete-menu'
+i.e. v.get(int, java.lang.String). If `jde-complete-unique-method-names'
+is non nil methods with the same name will get the signature of the first one
+in the completion list. After customizing this variable, be sure to use
+`jde-complete-flush-classinfo-cache', any class information that was
+previously cache is not going to be affected by this setting"
+  :group 'jde-complete
+  :type 'boolean)
+
+(defcustom jde-complete-display-qualified-types t
+  "If non nil use fully qualified types when displaying methods for selection,
+i.e. v.get(int, java.lang.String). If nil, use unqualified types, i.e.
+v.get(int, String). After customizing this variable, be sure to use
+`jde-complete-flush-classinfo-cache', any class information that was
+previously cache is not going to be affected by this setting."
+  :group 'jde-complete
+  :type 'boolean)
+
+(defcustom jde-complete-display-result-type t
+  "If non nil include result type when displaying methods for selection.
+After customizing this variable, be sure to use
+`jde-complete-flush-classinfo-cache', any class information that was
+previously cache is not going to be affected by this setting."
+  :group 'jde-complete
+  :type 'boolean)
+
+(defcustom jde-complete-display-throws t
+  "If non nil include thrown exceptions when displaying methods for selection.
+After customizing this variable, be sure to use
+`jde-complete-flush-classinfo-cache', any class information that was
+previously cache is not going to be affected by this setting."
+  :group 'jde-complete
+  :type 'boolean)
+
+;; (makunbound 'jde-complete-function)
+(defcustom jde-complete-function 'jde-complete-menu
+  "*Function that will be invoked by the `jde-complete-select' command.
+The `jde-complete-menu' function displays completions for
+the symbol at point in a popup menu. The `jde-complete-minibuf' function
+displays completions in the minibuffer. You may also
+specify a custom function to use. The custom function must
+be an interactive function that can be called by
+`call-interactively'."
+  :group 'jde-project
+  :type '(choice
+	   (function-item jde-complete-menu)
+	   (function-item jde-complete-minibuf)
+	   (function-item jde-complete-in-line)
+	   (function :format "%t %v" :tag "Custom:")))
+
+(defvar jde-complete-current-list nil
+  "The list of all the completion. Each element of the list is a list
+which car is the possible completion, and the cdr is an additional
+information about this completion.")
+
+(defvar jde-complete-current-list-index nil
+  "An index to an element in jde-complete-current-list. This is used to
+cycle the list.")
+
+(defun jde-complete-valid-java-declaration-at (point varname)
+  "Verify that a POINT starts a valid java declaration
+for the VARNAME variable."
+  (save-excursion
+    (goto-char point)
+    (if (looking-at
+	 (concat "\\([A-Za-z0-9_.\177-\377]+\\)[ \t\n\r]+"
+		 (jde-complete-double-backquotes varname)
+		 "[ \t\n\r]*[;=]"))
+	(match-string 1)
+      nil)))
+
+(defun jde-complete-double-backquotes (varname)
+  "Build a new string identical to VARNAME, except that every backquote
+`\' is doubled, so that it can be used in a regex expression"
+  (let (result (idx 0) (len (length varname)) curcar)
+    (while (< idx len)
+      (setq curcar (elt varname idx))
+      (setq result (concat result (if (eq curcar ?\\)
+				      "\\\\"
+				    (make-string 1 curcar))))
+      (setq idx (1+ idx)))
+    result))
+
+(defun jde-complete-declared-type-of (name)
+  "Find in the current buffer the java type of the variable NAME.  The
+function returns a string containing the name of the class, or nil
+otherwise. This function does not give the fully-qualified java class
+name, it just returns the type as it is declared."
+  (save-excursion
+    (let (found res pos orgpt resname)
+      (while (and (not found)
+		  (search-backward name nil t))
+	(setq pos (point))
+	(backward-word 1)
+	(setq resname (jde-complete-valid-java-declaration-at (point) name))
+	(goto-char pos)
+	(forward-char -1)
+	(if resname
+	    (progn (setq res resname)
+		   (setq found t))))
+      res)))
+
+(defun jde-complete-filter-fqn (importlist)
+  "Filter all the fully-qualified classnames in the import list. It uses
+the knowledge that those classnames are at the beginning of the list,
+so that it can stops at the first package import (with a star `*' at
+the end of the declaration)."
+  (if importlist
+      (if (string= "*" (car (cdr (car importlist))))
+	  importlist
+	(jde-complete-filter-fqn (cdr importlist)))))
+
+(defun jde-complete-guess-type-of (name)
+  "Guess the fully qualified name of the class NAME, using the import
+list. It returns a string if the fqn was found, or a list of possible
+packages otherwise."
+  (let ((importlist (jde-parse-import-list)) shortname fullname tmp result)
+    (while (and importlist (null result))
+      (setq tmp (car importlist))
+      (setq shortname (car (cdr tmp)))
+      (setq fullname (concat (car tmp) name))
+      (cond
+       ((string= "*" shortname)
+	(setq result importlist))
+       ((string= name shortname)
+	(setq result fullname))
+       (t
+	(setq importlist (cdr importlist)))))
+    result))
+
+
+(defvar jde-complete-classinfo-cache nil)
+
+(defcustom jde-complete-classinfo-cache-size 50
+  "The max size of completion's cache.")
+
+(defun jde-complete-flush-classinfo-cache ()
+  "Flushes all entries in the completion cache"
+  (interactive)
+  (setq jde-complete-classinfo-cache nil))
+
+(defun jde-complete-flush-classes-in-cache (class-list)
+  "Flushes all the classes in CLASS-LIST as entries of cache."
+  (let ((temp (nth 0 jde-complete-classinfo-cache))
+	(index -1)
+	(found nil)
+	(class (car class-list)))
+    (while class
+      (while (and temp (not found))
+	(setq index (1+ index))
+	(setq temp (nth index jde-complete-classinfo-cache))
+	(if (string= (car temp) class)
+	    (setq found t)))
+      (if found
+	  (setq jde-complete-classinfo-cache
+		(nthcdr (1+ index) jde-complete-classinfo-cache)))
+      (setq class-list (cdr class-list))
+      (setq class (car class-list))
+      (setq found nil))))
+
+(defun jde-complete-add-to-classinfo-cache (name classinfo)
+  (let (new-entry new-list)
+    (if (nth jde-complete-classinfo-cache-size jde-complete-classinfo-cache)
+	(progn
+	  (setq new-entry (list name classinfo))
+	  (setq new-list (list new-entry nil))
+	  (setcdr new-list (cdr jde-complete-classinfo-cache))
+	  (setq jde-complete-classinfo-cache new-list)
+	  (message "cache is full"))
+      ;;else
+      (setq jde-complete-classinfo-cache
+	    (append
+	     jde-complete-classinfo-cache
+	     (list (list name classinfo)))))))
+
+(defun jde-complete-get-from-cache (name)
+  (let ((temp (nth 0 jde-complete-classinfo-cache)) (index -1) (found nil))
+    (while (and temp (not found))
+      (setq index (1+ index))
+      (setq temp (nth index jde-complete-classinfo-cache))
+      (if (string= (car temp) name)
+	  (setq found t)))
+    (if found
+	(nth 1 temp)
+      nil)))
+
+(defun jde-complete-get-classinfo (name &optional access-level)
+  "Return the class info list for the class NAME and the ACCESS-LEVEL.
+Allowed values for access level are 0 for protected 1 for private. This
+function first checks to see if the class info is cached. If so, it returns the
+cached class info. Otherwise, it creates the class info list. Each
+element of the list returned by this function is itself a list whose
+car is a possible completion and whose cdr gives additional
+informations on the completion."
+  ;;replacing double quotes by empty strings double quotes seems to break the
+  ;;beanshell
+  (while (string-match "\"" name)
+    (setq name (replace-match "" nil nil name)))
+
+  ;;replacing back slaches by empty strings backlashes causes beanshell problem
+  (while (string-match "\\\\" name)
+    (setq name (replace-match "" nil nil name)))
+
+  ;;checking that access-level is not nil
+  (if (not access-level)
+      (setq access-level jde-complete-public))
+
+  (let ((class-info (jde-complete-get-from-cache name))
+	public-methods protected-methods private-methods
+	package-methods)
+    (when (not class-info)
+      ;;Getting public class info
+      (setq public-methods
+	    (jde-complete-invoke-get-class-info
+	     name jde-complete-public))
+
+      ;;Getting protected class info
+      (setq protected-methods
+	    (jde-complete-invoke-get-class-info
+	     name jde-complete-protected))
+
+      ;;Getting package class info
+      (setq package-methods
+	    (jde-complete-invoke-get-class-info
+	     name jde-complete-package))
+
+      ;;Getting private class info
+      (setq private-methods
+	    (jde-complete-invoke-get-class-info
+	     name jde-complete-private))
+      (setq class-info (append public-methods
+			       protected-methods
+			       package-methods
+			       private-methods))
+      (if class-info
+	  (jde-complete-add-to-classinfo-cache name class-info)))
+
+    ;;Getting the class info depending on the access level
+    (setq class-info
+	  (jde-complete-get-accessible-info class-info access-level name))
+    (setq class-info (jde-complete-build-completion-list class-info))
+
+    ;;Removing duplicates
+    (setq class-info (jde-complete-remove-duplicates class-info))
+
+    ;;Sorting the list
+    (setq class-info (sort class-info 'jde-complete-sort-comparison))
+    class-info))
+
+(defun jde-complete-remove-duplicates (class-list)
+  "Removes duplicates from class-list"
+  (let (answer temp)
+    (while class-list
+      (setq temp (car class-list))
+       (if (not (jde-complete-memberp (car temp) answer))
+	   (setq answer (append answer (list temp))))
+      (setq class-list (cdr class-list)))
+    answer))
+
+(defun jde-complete-memberp (elt lst)
+  "Returns t if elt is a memver of lst"
+  (let (answer tmp)
+    (while lst
+      (setq tmp (caar lst))
+      (if (string= tmp elt)
+	  (progn
+	   (setq answer t)
+	   (setq lst nil))
+	(setq lst (cdr lst))))
+    answer))
+
+(defun jde-complete-get-accessible-info (class-info access name)
+  "Takes a list of class info in this format \(list \(list public
+info\) \(list protected info\) \(list package info\) \(list private
+info\)\).  Each info list is in the format \(list \(list fields\)
+\(list constructors\) \(list methods\) \(list inner classes\)\).  This
+method will return a list concatenating the fields, methods, and inner
+classes for the access level."
+  (let* ((public (nth jde-complete-public class-info))
+	(protected (nth jde-complete-protected class-info))
+	(package (nth jde-complete-package class-info))
+	(private (nth jde-complete-private class-info))
+	(package-name (jde-parse-get-package-name))
+	(this (concat (if package-name
+			  (concat package-name "." ))
+		      (jde-parse-get-class-at-point)))
+	answer fields constructors methods classes packagep)
+    (if (null package-name)
+	(setq package-name ""))
+    (if package-name
+	(setq packagep (string-match package-name name)))
+    (setq fields (append (nth jde-complete-fields public)
+			 (if (>= access jde-complete-protected)
+			     (nth jde-complete-fields protected))
+			 (if packagep
+			     (nth jde-complete-fields package))
+			 (if (or (>= access jde-complete-private)
+				 (string= name this))
+			     (nth jde-complete-fields private))))
+    (setq constructors (append (nth jde-complete-constructors public)
+			       (if (>= access jde-complete-protected)
+				   (nth jde-complete-constructors protected))
+			       (if packagep
+				   (nth jde-complete-constructors package))
+			       (if (or (>= access jde-complete-private)
+				       (string= name this))
+				   (nth jde-complete-constructors private))))
+    (setq methods (append (nth jde-complete-methods public)
+			  (if (>= access jde-complete-protected)
+			      (nth jde-complete-methods protected))
+			  (if packagep
+			      (nth jde-complete-methods package))
+			  (if (or (>= access jde-complete-private)
+				  (string= name this))
+			      (nth jde-complete-methods private))))
+    (setq classes (append (nth jde-complete-classes public)
+			  (if (>= access jde-complete-protected)
+			     (nth jde-complete-classes protected))
+			  (if packagep
+			      (nth jde-complete-classes package))
+			  (if (or (>= access jde-complete-private)
+				  (string= name this))
+			      (nth jde-complete-classes private))))
+    (setq answer (list fields constructors methods classes))
+    answer))
+
+(defun jde-complete-invoke-get-class-info (name access)
+  "Invoke the method jde.util.Completion.getClassInfo(String, int)"
+  (jde-jeval-r
+   (format "jde.util.Completion.getClassInfo(\"%s\",%d);" name access)))
+
+
+(defun jde-complete-get-classinfo-javacode (name import access-level)
+  "Return the java code that calls the
+jde.util.Completion.getClassInfo function with the short java class
+name NAME and the package list IMPORT where to look at."
+  (save-excursion
+    (concat
+     "{ "
+     "String[] lst = new String[" (number-to-string (length import)) "];\n"
+     (let ((count -1))
+       (mapconcat
+	(function
+	 (lambda (x)
+	   (setq count (+ 1 count))
+	   (concat "lst[" (int-to-string count) "]=\""
+		   (car (nth count import)) "\";\n")))
+	import
+	" "))
+     "jde.util.Completion.getClassInfo(\"" name "\",lst,"
+     (number-to-string access-level) ");\n"
+     "}")))
+
+
+(defun jde-complete-sort-comparison (first second)
+  (string< (car first) (car second)))
+
+(defun jde-complete-get-variables (variables)
+  "Transform a list of the type (\"var\" \"java.lang.String\")
+into (\"var\" \"java.lang.String\ var\")"
+  (let (result current prev)
+    (if (null jde-complete-unique-method-names)
+	(while variables
+	  (setq current (car (car variables)))
+	  (setq result
+		(append
+		 (list (cons (concat current
+				     (if jde-complete-display-result-type
+					 (concat
+					  " : "
+					  (jde-complete-maybe-unqualify
+					   (nth 1 (car variables))))))
+			     current))
+		 result))
+	  (setq variables (cdr variables)))
+      (while variables
+	(if (not (string= prev current))
+	    (progn
+	      (setq prev current)
+	      (setq result
+		    (append
+		     (list (cons (concat current
+					 (if jde-complete-display-result-type
+					     (concat " : "
+						     (jde-complete-maybe-unqualify
+						      (nth 1 (car variables))))))
+				 current))
+		     result))))
+	(setq variables (cdr variables))))
+    result))
+
+(defun jde-complete-build-completion-list (classinfo)
+  "Build a completion list from the CLASSINFO list, as returned by the
+jde.util.Completion.getClassInfo function."
+  (let (result tmp)
+    ;; get the variable fields
+    (setq tmp (nth jde-complete-fields classinfo))
+    (setq result (jde-complete-get-variables tmp))
+
+    ;;get the constructors
+    (setq tmp (jde-complete-get-methods
+	       (nth jde-complete-constructors classinfo) t))
+    (if tmp (setq result (append tmp result)))
+
+    ;; get the methods
+    (setq tmp (jde-complete-get-methods (nth jde-complete-methods classinfo)))
+    (if tmp (setq result (append tmp result)))
+
+    ;; get inner classes
+    (setq tmp (jde-complete-get-inner-classes
+	       (nth jde-complete-classes classinfo)))
+    (if tmp (setq result (append tmp result)))
+
+    result))
+
+(defun jde-complete-get-methods (classinfo &optional constructor)
+  (let ((end-paren (if (null jde-complete-add-space-after-method) "(" " ("))
+	(end-parens (if (null jde-complete-insert-method-signature)
+			(if (null jde-complete-add-space-after-method)
+			    "()"
+			  " ()") ""))
+	prev tmp current)
+    (while classinfo
+      (let* ((type (car (cdr (car classinfo))));;method type i.e. boolean
+	     (exceptions (jde-get-exceptions (car (last (car classinfo)))))
+	     (method (jde-complete-build-information-for-completion
+		      (car classinfo) end-paren))
+	     (display (jde-complete-build-display-for-completion
+		      (car classinfo) end-paren constructor)))
+	(setq current (jde-parse-get-unqualified-name (car (car classinfo))))
+	(if (not (and jde-complete-unique-method-names
+		      (string= prev current)))
+	    (progn
+	      (setq prev current)
+	      (setq tmp (append
+			 (list
+			  (cons
+			   display
+			   (concat
+			    (if (null jde-complete-insert-method-signature)
+				current
+			      method)
+			    end-parens)))
+			 tmp))))
+	(setq classinfo (cdr classinfo))))
+    tmp))
+
+(defun jde-complete-get-inner-classes(class-info)
+  "Takes as an argument a list of inner classes an return a string of
+them or nil"
+  (let (tmp fullname pos name)
+    (if class-info
+	(while class-info
+	  (let* ((fullname (caar class-info))
+		 (pos (string-match "\\$" fullname))
+		 (name (substring fullname (+ 1 pos))))
+	    (setq tmp
+		  (append
+		   (list (cons (concat name " : " fullname)
+			       name))
+		   tmp)))
+	  (setq class-info (cdr class-info))))
+    tmp))
+
+(defun jde-get-exceptions (exceptions)
+  "Takes as an argument a list of EXCEPTIONS and return a string of them
+or nil"
+  (if (and (listp exceptions) (car exceptions))
+      (let ((exs ""))
+	(while exceptions
+	  (setq exs (concat exs (car exceptions)))
+	  (setq exceptions (cdr exceptions))
+	  (if exceptions (setq exs (concat exs ", "))))
+	exs)
+    nil))
+
+(defun jde-complete-maybe-unqualify (type)
+  (if jde-complete-display-qualified-types
+      type
+    (jde-parse-get-unqualified-name type)))
+
+(defun jde-complete-build-display-for-completion (lst
+						  end-parens
+						  &optional constructor)
+  "Builds the string that describes a method in a menu for selecting a completion."
+  (let ((result (concat
+		 (jde-parse-get-unqualified-name (car lst))
+		 end-parens))
+	(rettype (car (cdr lst)))
+	(exceptions (if (and (listp (last lst)) (car (last lst)))
+			(car (last lst)))))
+    (if constructor
+	(setq lst (cdr lst))
+      (setq lst (cdr (cdr lst))))
+    (while (and lst
+		(not (listp (car lst))))
+      (setq result (concat result (jde-complete-maybe-unqualify (car lst))))
+      (setq lst (cdr lst))
+      (if (and lst
+	       (not (listp (car lst))))
+	  (setq result (concat result ", "))))
+    (setq result (concat result ")"))
+    (concat result
+	    (if (or (and (not constructor) rettype jde-complete-display-result-type)
+		    (and exceptions jde-complete-display-throws)) " : ")
+	    (if (and (not constructor) rettype jde-complete-display-result-type)
+		(jde-complete-maybe-unqualify rettype))
+	    (if (and exceptions jde-complete-display-throws)
+		(concat " throws "
+			(jde-get-exceptions
+			 (mapcar 'jde-complete-maybe-unqualify exceptions)))))))
+
+(defun jde-complete-build-information-for-completion (lst
+						      end-parens
+						      &optional constructor)
+  "Builds the text that is inserted in the code for a particular completion."
+  (let ((result (concat
+		 (jde-parse-get-unqualified-name (car lst))
+		 end-parens)))
+    (if constructor
+	(setq lst (cdr lst))
+      (setq lst (cdr (cdr lst))))
+    (while (and lst
+		(not (listp (car lst))))
+      (setq result (concat result (car lst)))
+      (setq lst (cdr lst))
+      (if (and lst
+	       (not (listp (car lst))))
+	  (setq result (concat result ", "))))
+    (setq result (concat result ")"))
+    result))
+
+(defun jde-complete-complete-cycle ()
+  "Replace the previous completion by the next one in the list."
+ (let (elem tmp)
+    (setq jde-complete-current-list-index (1+ jde-complete-current-list-index))
+    (if (>= jde-complete-current-list-index (length jde-complete-current-list))
+	(setq jde-complete-current-list-index 0))
+    (setq elem (nth jde-complete-current-list-index jde-complete-current-list))
+    (setq tmp (cdr elem))
+    (if tmp
+	(progn
+	  (delete-region jde-parse-current-beginning
+			 jde-parse-current-end)
+	  (insert tmp)
+	  (setq jde-complete-current-signature (car elem))
+	  (jde-complete-place-cursor)
+	  (set-marker jde-parse-current-end
+		      (+ (marker-position jde-parse-current-beginning)
+			 (length tmp)))
+	  (jde-complete-display-current-signature));;displaying the signature
+      (message (format "No completion at this point!(cycle)")))
+    ;;  (goto-char (marker-position jde-complete-current-end))
+    ))
+
+(defun jde-complete-insert-completion (item)
+  (if item
+      (progn
+	(delete-region jde-parse-current-beginning
+		       jde-parse-current-end)
+	(insert item)
+	(jde-complete-place-cursor)
+	(jde-complete-display-current-signature)
+	(set-marker jde-parse-current-end
+		    (+ (marker-position jde-parse-current-beginning)
+		       (length item))))))
+
+(defun jde-complete-find-all-completions (pair lst &optional exact-match)
+  (let* (tmp
+	 chop-pos
+	 (args (nth 2 pair))
+	 (pat (nth 1 pair))
+	 (result nil)
+	 (first-char (substring pat 0 1)))
+
+    (if (null args)
+	(setq exact-match nil)
+      (setq pat (concat pat args)))
+
+    (if (string= pat "$")
+	(setq pat "\\$"))
+
+    (while lst
+      (setq tmp (car (car lst)))
+      (setq chop-pos (string-match " : " tmp))
+      (setq tmp (substring tmp 0 chop-pos))
+      (if (if exact-match
+	      (string= pat tmp)
+	    (equal 0 (string-match pat tmp)))
+	  (setq result (append result (list (car lst)))))
+      (setq lst (cdr lst)))
+    result))
+
+
+(defun jde-complete-find-completion-for-pair (pair &optional exact-completion
+						   access-level)
+  (let ((type (jde-parse-eval-type-of (car pair))))
+    (if type
+	(cond ((member type jde-parse-primitive-types)
+	       (error "Cannot complete primitive type: %s" type))
+	      ((string= type "void")
+	       (error "Cannot complete return type of %s is void." (car pair)))
+	      (access-level
+	       (let ((classinfo (jde-complete-get-classinfo
+				 type access-level)))
+		 (if classinfo
+		     (if (and (string= (nth 1 pair) "")
+			      (not exact-completion))
+			 (setq jde-complete-current-list classinfo)
+		       (setq jde-complete-current-list
+			     (jde-complete-find-all-completions
+			      pair classinfo exact-completion))))))
+	      (t
+	       (let ((classinfo (jde-complete-get-classinfo type)))
+		 (if classinfo
+		     (if (and (string= (nth 1 pair) "")
+			      (not exact-completion))
+			 (setq jde-complete-current-list classinfo)
+		       (setq jde-complete-current-list
+			     (jde-complete-find-all-completions
+			      pair classinfo exact-completion)))))))
+      nil)))
+
+(defun jde-complete-in-line ()
+  "Completes the method or field name at point.  Repeating the command
+cycles through all potential completions for the name.  This function
+displays the signature of a method completion as specified by
+`jde-complete-display-current-signature' This command uses the
+Beanshell to run Java code that in turn uses Java reflection to
+determine the methods and fields defined by the class of the object at
+point. This command starts the Beanshell if necessary. Hence, you may
+experience a slight delay when using this command for the first time
+in a session or when completing a field or method of an object that
+has many methods and fields. See `jde-complete-menu' for a version of
+this command that lets you select the desired completion from a popup
+menu."
+  (interactive)
+  (if (and
+       jde-complete-current-list
+       (markerp jde-parse-current-beginning)
+       (markerp jde-parse-current-end)
+       (marker-position jde-parse-current-beginning)
+       (marker-position jde-parse-current-end)
+       (>= (point) (marker-position jde-parse-current-beginning))
+       (<= (point) (marker-position jde-parse-current-end))
+       (eq last-command this-command))
+      (jde-complete-complete-cycle)
+    ;;else
+    (jde-complete-generic "in-line")))
+
+(defun jde-complete-choose-completion (&optional title initial-input use-menu)
+  "Display completions for the object at point in a menu if USE-MENU
+is nonil, otherwise in the minibuffer. The display comprises all of
+the possible completions for the object it was invoked on.  To
+automatically split large menus this function use `imenu--mouse-menu'
+to handle the popup menu. initial-input, whatever the user typed
+before invoking the completion"
+  (let (index-alist pair name)
+    (setq index-alist jde-complete-current-list)
+    (setq pair
+	  (if (= (length index-alist) 1)
+	      ;; if only one item match, return it
+	      (car index-alist)
+	    (if use-menu
+		;; delegates menu handling to imenu :-)
+		(imenu--mouse-menu
+		 index-alist
+		 ;; Popup window at text cursor
+		 (jde-cursor-posn-as-event)
+		 (or title "Completion"))
+	      (assoc (completing-read (or title "Completion: ")
+				      index-alist
+				      nil ;;predicate
+				      nil ;;required-match
+				      initial-input) ;;initial-input
+				      index-alist))))
+    (setq name (cdr pair))
+    (setq jde-complete-current-signature (car pair))
+    (jde-complete-insert-completion name)))
+
+(defun jde-cursor-posn-as-event()
+  "Returns the text cursor position as an EVENT on Emacs and the mouse
+cursor position on XEmacs."
+  (if jde-xemacsp
+      (let* ((mouse-pos (mouse-pixel-position))
+	     (x (car (cdr mouse-pos)))
+	     (y (cdr (cdr mouse-pos))))
+	(make-event 'button-press `(button 1 modifiers nil x ,x y ,y)))
+    (let ((x (* (if jde-xemacsp (frame-width) (frame-char-width))
+		(if (and
+		     (boundp 'hscroll-mode)
+		     (fboundp 'hscroll-window-column))
+		    (hscroll-window-column)
+		  (mod (current-column) (window-width)))))
+	  (y  (* (if jde-xemacsp (frame-height) (frame-char-height))
+		 (- (count-lines (point-min) (point))
+		    (count-lines (point-min) (window-start)))))
+	  (window (get-buffer-window (current-buffer))))
+      (list (list x y) window))))
+
+(defun jde-complete-menu ()
+  "Completes the method or field name at point.  This command displays
+a popup menu listing the potential completions for the name at
+point. Selecting a completion causes the command to use the completion
+to complete the name at point. See `jde-complete-in-line' for a
+version of this command that lets you cycle throught the potential
+completions at point."
+  (interactive)
+  (jde-complete-generic t))
+
+(defun jde-complete-minibuf ()
+  "Completes the method or field name at point.  This command displays
+a popup menu listing the potential completions for the name at
+point. Selecting a completion causes the command to use the completion
+to complete the name at point. See `jde-complete-in-line' for a
+version of this command that lets you cycle throught the potential
+completions at point."
+  (interactive)
+  (jde-complete-generic nil))
+
+(defun jde-complete-generic (completion-type)
+  "Generic implementation for jde-complete methods"
+  (let* ((pair (jde-parse-java-variable-at-point))
+	 jde-parse-attempted-to-import)
+    ;;resetting jde-complete-current-list
+    (setq jde-complete-current-list nil)
+    (if pair
+	(condition-case err
+	    (jde-complete-pair (jde-complete-get-pair pair nil) completion-type)
+	  (error (condition-case err
+		     (jde-complete-pair (jde-complete-get-pair pair t)
+					completion-type))
+		 (error (message "%s" (error-message-string err)))))
+      (message "No completion at this point"))))
+
+(defun jde-complete-pair (pair completion-type)
+  (let ((access (jde-complete-get-access pair))
+	completion-list)
+    (progn
+      (if access
+	  (setq completion-list
+		(jde-complete-find-completion-for-pair pair nil access))
+	(setq completion-list (jde-complete-find-completion-for-pair pair)))
+      ;;if the completion list is nil check if the method is in the current
+      ;;class(this)
+      (if (null completion-list)
+	  (setq completion-list (jde-complete-find-completion-for-pair
+				 (list (concat "this." (car pair)) "")
+				 nil jde-complete-private)))
+      ;;if completions is still null check if the method is in the
+      ;;super class
+      (if (null completion-list)
+	  (setq completion-list (jde-complete-find-completion-for-pair
+				 (list (concat "super." (car pair)) "")
+				 nil jde-complete-protected)))
+
+      (if completion-list
+	  (let ((title (concat (car pair) "."
+			       (car (cdr pair)) "[...]")))
+	    (if (null completion-type)
+		(jde-complete-choose-completion title (car (cdr pair)))
+	      (if (string= completion-type "in-line")
+		  (progn
+		    (setq jde-complete-current-list-index -1)
+		    (jde-complete-complete-cycle))
+		(jde-complete-choose-completion title (car (cdr pair)) t))))
+	(error "No completion at this point")))))
+
+(defun jde-complete-get-access (pair)
+  (let (access)
+    (if (string= (car pair) "this")
+	(setq access jde-complete-private)
+      (if (string= (car pair) "super")
+	  (setq access jde-complete-protected)))
+    access))
+
+(defun jde-complete-get-pair (pair op)
+  (let ((tmp (list (car pair) (cadr pair))))
+    (if (and op
+	     (string= (car tmp) "" )
+	     (not (string= (cadr tmp) "")))
+	(setcar tmp (cadr tmp)))
+    (if (string= (car tmp) "" )
+	(setcar tmp "this"))
+    tmp))
+
+(defun jde-complete ()
+  "Displays completions for the Java symbol at point.  This command
+delegates the task of displaying completions to the function specified
+by `jde-complete-function'. This allows you to select or specify the
+default method for displaying completions."
+  (interactive)
+  (call-interactively jde-complete-function))
+
+(define-mode-overload-implementation
+   semantic-idle-summary-current-symbol-info jde-mode ()
+   "Collect information on current symbol."
+   (or jde-complete-display-signature
+      (semantic-idle-summary-current-symbol-info-default)))
+
+(defun jde-complete-popup-message (message buffer-or-name)
+  "Split up the current window horizontally, the new buffer is exactly
+2 lines in height. Message is inserted in the new buffer.  Succesive
+calls to this method with the same buffer-or-name will delete the text
+inside the buffer and replace it with message. Message should not be
+longer than a line."
+  (interactive)
+  (let* ((popup (get-buffer-window buffer-or-name));;last popup window
+	 (new (get-buffer-create buffer-or-name));;new popup window
+	 (current (current-buffer));;current buffer
+	 (min window-min-height);;current window-min-height
+	 (w (selected-window));;selected window
+	 (height (window-height w));;window height
+	 w2)
+    (if popup (delete-window popup));;deleting previous windows
+    (set-window-buffer w new);;set buffer of current window to be the new
+    (erase-buffer)
+    (insert message);;insert message
+    (setq window-min-height 2);;set the minimum height
+    (setq w2 (split-window w (- height 2)));;split windows
+    (set-window-buffer w current);;restore the buffer in the current window
+    (if (> (window-height w2) 2);;if the popup window is larger than 2
+	(enlarge-window (- (window-height w2) 2)));;resize it to 2
+    (setq window-min-height min);; restore window-min-height
+    (run-at-time jde-complete-signature-display-time
+		 nil 'delete-window w2)));;set timer to delete popup window
+
+(defun jde-complete-display-current-signature()
+  "Displays the current signature: `jde-complete-current-signature'. The
+display mode will depend on the variable `jde-complete-signature-display'"
+  (interactive)
+  (if jde-complete-current-signature
+      (let ((display (car jde-complete-signature-display)))
+	(cond ((string= display "Eldoc") ;;eldoc
+	       (setq jde-complete-display-signature t)
+	       (run-at-time jde-complete-signature-display-time
+			    nil `set-variable
+			    `jde-complete-display-signature nil)
+	       (eldoc-message jde-complete-current-signature))
+	      ;;use buffer
+	      ((string= display "Buffer")
+	       (jde-complete-popup-message jde-complete-current-signature
+					   jde-complete-signature-buffer))
+	      (t));; do nothing
+	)))
+
+(defun jde-complete-place-cursor ()
+  "Places the cursor in between the parenthesis after a
+completion. This is only done for methods that contain parameters, for
+all the other completions the cursor is place at the end."
+  (let ((end-paren (string-match ")" jde-complete-current-signature))
+	(start-paren (string-match "(" jde-complete-current-signature)))
+    (if (and end-paren start-paren (not (= start-paren (- end-paren 1))))
+	(goto-char (- (point) 1)))))
+
+(provide 'jde-complete)
+
+;; End of jde-complete.el
diff --git a/site/jdee/lisp/jde-complete.elc b/site/jdee/lisp/jde-complete.elc
new file mode 100644
index 0000000..429e560
Binary files /dev/null and b/site/jdee/lisp/jde-complete.elc differ
diff --git a/site/jdee/lisp/jde-custom.el b/site/jdee/lisp/jde-custom.el
new file mode 100644
index 0000000..2b338d5
--- /dev/null
+++ b/site/jdee/lisp/jde-custom.el
@@ -0,0 +1,162 @@
+;;; jde-custom.el -- Integrated Development Environment for Java.
+;; $Id: jde-custom.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Keywords: java, tools
+
+;; Copyright (C) 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;;; Code:
+
+(require 'jde-project-file)
+
+(defun jde-custom-variable-set (widget)
+  "Set the current value for the variable being edited by WIDGET."
+  (let ((symbol (widget-value widget)))
+    (custom-variable-set widget)
+    (jde-save-project)
+    (add-to-list 'jde-dirty-variables symbol)))
+
+(defun jde-custom-variable-reset-standard (widget)
+  "Restore the standard setting for the variable being edited by WIDGET.
+This operation eliminates any saved setting for the variable,
+restoring it to the state of a variable that has never been customized."
+  (custom-variable-reset-standard widget)
+  (jde-save-project))
+
+(defvar jde-custom-variable-menu
+  '(("Save in JDEE Project File" jde-custom-variable-set
+     (lambda (widget)
+       (and
+	(eq (widget-get widget :custom-state) 'modified)
+	(string-match "^jde-" (symbol-name (widget-value widget))))))
+    ("Set for Current Session" custom-variable-set
+     (lambda (widget)
+       (eq (widget-get widget :custom-state) 'modified)))
+    ("Save for Future Sessions" custom-variable-save
+     (lambda (widget)
+       (memq (widget-get widget :custom-state) '(modified set changed rogue))))
+    ("Reset to Current" custom-redraw
+     (lambda (widget)
+       (and (default-boundp (widget-value widget))
+	    (memq (widget-get widget :custom-state) '(modified changed)))))
+    ("Reset to Saved" custom-variable-reset-saved
+     (lambda (widget)
+       (and (or (get (widget-value widget) 'saved-value)
+		(get (widget-value widget) 'saved-variable-comment))
+	    (memq (widget-get widget :custom-state)
+		  '(modified set changed rogue)))))
+    ("Erase Customization" jde-custom-variable-reset-standard
+     (lambda (widget)
+       (and (get (widget-value widget) 'standard-value)
+	    (memq (widget-get widget :custom-state)
+		  '(modified set changed saved rogue)))))
+    ("---" ignore ignore)
+    ("Add Comment" custom-comment-show custom-comment-invisible-p)
+    ("---" ignore ignore)
+    ("Don't show as Lisp expression" custom-variable-edit
+     (lambda (widget)
+       (eq (widget-get widget :custom-form) 'lisp)))
+    ("Show initial Lisp expression" custom-variable-edit-lisp
+     (lambda (widget)
+       (eq (widget-get widget :custom-form) 'edit))))
+  "Alist of actions for the `jde-custom-variable' widget.
+Each entry has the form (NAME ACTION FILTER) where NAME is the name of
+the menu entry, ACTION is the function to call on the widget when the
+menu is selected, and FILTER is a predicate which takes a `jde-custom-variable'
+widget as an argument, and returns non-nil if ACTION is valid on that
+widget.  If FILTER is nil, ACTION is always valid.")
+
+
+(defun jde-custom-variable-action (widget &optional event)
+  "Show the menu for `jde-custom-variable' WIDGET.
+Optional EVENT is the location for the menu."
+  (if (eq (widget-get widget :custom-state) 'hidden)
+      (custom-toggle-hide widget)
+    (unless (eq (widget-get widget :custom-state) 'modified)
+      (custom-variable-state-set widget))
+    (custom-redraw-magic widget)
+    (let* ((completion-ignore-case t)
+	   (answer (widget-choose (concat "Operation on "
+					  (custom-unlispify-tag-name
+					   (widget-get widget :value)))
+				  (custom-menu-filter jde-custom-variable-menu
+						      widget)
+				  event)))
+      (if answer
+	  (funcall answer widget)))))
+
+
+(define-widget 'jde-custom-variable 'custom
+  "Customize a JDEE variable."
+  :format "%v"
+  :help-echo "Set or reset this variable."
+  :documentation-property 'variable-documentation
+  :custom-category 'option
+  :custom-state nil
+  :custom-menu 'custom-variable-menu-create
+  :custom-form nil ; defaults to value of `custom-variable-default-form'
+  :value-create 'custom-variable-value-create
+  :action 'jde-custom-variable-action
+  :custom-set 'custom-variable-set
+  :custom-save 'custom-variable-save
+  :custom-reset-current 'custom-redraw
+  :custom-reset-saved 'custom-variable-reset-saved
+  :custom-reset-standard 'custom-variable-reset-standard)
+
+;;;###autoload
+(defalias 'jde-customize-variable 'jde-customize-option)
+
+;;;###autoload
+(defun jde-customize-option (symbol)
+  "Customize SYMBOL, which must be a JDEE option variable."
+  (interactive (custom-variable-prompt))
+  (unless (get symbol 'custom-type)
+    (error "Variable %s cannot be customized" symbol))
+  (custom-buffer-create (list (list symbol 'jde-custom-variable))
+			(format "*Customize Option: %s*"
+				(custom-unlispify-tag-name symbol))))
+
+
+(defun jde-custom-adjust-groups ()
+  "Change the symbol type in the symbol spec lists for all
+JDEE groups from `custom-variable' to `jde-custom-variable'.
+This causes the save-to-project-file menu item to appear
+for JDEE variables in group customization buffers."
+  (flet ((adjust-group
+	  (group)
+	  (let ((symbol-specs (get group 'custom-group)))
+	    (dolist (spec symbol-specs)
+	      (let ((symbol (nth 0 spec))
+		    (symbol-type (nth 1 spec)))
+		(if (eq symbol-type 'custom-group)
+		    (adjust-group symbol)
+		  (setcdr spec (list 'jde-custom-variable))))))))
+    (adjust-group 'jde)))
+
+
+(provide 'jde-custom)
+
+;; End of jde-custom.el
diff --git a/site/jdee/lisp/jde-custom.elc b/site/jdee/lisp/jde-custom.elc
new file mode 100644
index 0000000..7287ab9
Binary files /dev/null and b/site/jdee/lisp/jde-custom.elc differ
diff --git a/site/jdee/lisp/jde-db.el b/site/jdee/lisp/jde-db.el
new file mode 100644
index 0000000..a741ba7
--- /dev/null
+++ b/site/jdee/lisp/jde-db.el
@@ -0,0 +1,2017 @@
+;;; jde-db.el -- Debugger mode for jdb.
+;; $Id: jde-db.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, US
+
+;; Commentary:
+
+;; This package interfaces emacs to jdb, the debugger
+;; distributed as part of JavaSoft's Java
+;; Development Kit (JDK).
+
+;;; Code:
+
+(require 'jde-parse)
+(require 'eieio)
+(require 'jde-util)
+(require 'widget)
+
+(eval-when-compile
+  (require 'wid-edit))
+
+(unless (fboundp 'make-overlay)
+  (require 'overlay))
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-global-classpath)
+(defvar jde-sourcepath)
+(defvar jde-debugger)
+
+
+;; ======================================================================
+;; jde-db variables
+
+
+(defcustom jde-db-query-missing-source-files t
+  "If nonnil, this variable causes the debugger to query you
+for the path of a class source file that it cannot find in
+`jde-sourcepath'."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-db-mode-hook nil
+  "*Customization hook for jde-db inferior mode."
+  :group 'jde-project
+  :type 'hook
+)
+
+(defcustom jde-db-initial-step-p t
+  "*If non-nil, this option causes the debugger
+to issue a step-into command after launching
+a program. This causes the vm to step to the
+first line of the debuggee program."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-db-read-vm-args nil
+"*Read vm arguments from the minibuffer.
+If this variable is non-nil, the jde-db command reads vm arguments
+from the minibuffer and appends them to those specified by
+the `jde-db-option' variable group."
+  :group 'jde-project
+  :type 'boolean)
+
+(defvar jde-db-interactive-vm-arg-history nil
+"History of vm arguments read from the minibuffer")
+
+(defcustom jde-db-read-app-args nil
+"*Read arguments to be passed to application from the minibuffer."
+  :group 'jde-project
+  :type 'boolean)
+
+(defvar jde-db-interactive-app-arg-history nil
+"History of application arguments read from the minibuffer")
+
+(defcustom jde-db-classic-mode-vm nil
+"Runs applications in the classic (i.e., not HotSpot) mode when
+debugging."
+  :group 'jde-project
+  :type 'boolean)
+
+(defgroup jde-db-options nil
+  "JDE Debugger Options"
+  :group 'jde
+  :prefix "jde-db-option-")
+
+(defcustom jde-db-option-classpath nil
+"*Specify paths of classes required to run this application.
+The JDE uses the specified paths to construct a -classpath
+argument to pass to the Java interpreter. This option overrides the
+`jde-global-classpath' option."
+  :group 'jde-db-options
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-db-option-verbose (list nil nil nil)
+  "*Print messages about the running process.
+The messages are printed in the run buffer."
+  :group 'jde-db-options
+  :type '(list :indent 2
+	       (checkbox :format "\n  %[%v%] %h \n"
+			 :doc "Print classes loaded.
+Prints a message in the run buffer each time a class is loaded.")
+	       (checkbox :format "%[%v%] %h \n"
+			 :doc "Print memory freed.
+Prints a message in the run buffer each time the garbage collector
+frees memory.")
+	       (checkbox :format "%[%v%] %h \n"
+			 :doc "Print JNI info.
+Prints JNI-related messages including information about which native
+methods have been linked and warnings about excessive creation of
+local references.")))
+
+(defcustom jde-db-option-properties nil
+  "*Specify property values.
+Enter the name of the property, for example, awt.button.color, in the
+Property Name field; enter its value, for example, green, in the
+Property Value field. You can specify as many properties as you like."
+  :group 'jde-db-options
+  :type '(repeat (cons
+		  (string :tag "Property Name")
+		  (string :tag "Property Value"))))
+
+(defcustom jde-db-option-heap-size (list
+				    (cons 1 "megabytes")
+				    (cons 16 "megabytes"))
+"*Specify the initial and maximum size of the interpreter heap."
+:group 'jde-db-options
+:type '(list
+	(cons (integer :tag "Start")
+	     (radio-button-choice (const "bytes")
+				  (const "kilobytes")
+				  (const "megabytes")
+				  (const "gigabytes")))
+	(cons (integer :tag "Max")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))))
+
+
+(defcustom jde-db-option-stack-size (list
+				     (cons 128 "kilobytes")
+				     (cons 400 "kilobytes"))
+  "*Specify size of the C and Java stacks."
+  :group 'jde-db-options
+  :type '(list
+	  (cons (integer :tag "C Stack")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))
+	  (cons (integer :tag "Java Stack")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))))
+
+(defcustom jde-db-option-garbage-collection (list t t)
+  "*Specify garbage collection options."
+  :group 'jde-db-options
+  :type '(list :indent 2
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Collect garbage asynchronously.")
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Collect unused classes.")))
+
+(defcustom jde-db-option-java-profile (cons nil "./java.prof")
+  "*Enable Java profiling."
+  :group 'jde-db-options
+  :type '(cons boolean
+	       (file :tag "File"
+		     :help-echo
+"Specify where to put profile results here.")))
+
+(defcustom jde-db-option-heap-profile (cons nil
+					    (list "./java.hprof"
+						  5
+						  20
+						  "Allocation objects"))
+"*Output heap profiling data."
+  :group 'jde-db-options
+  :type '(cons boolean
+	       (list
+		(string :tag "Output File Path")
+		(integer :tag "Stack Trace Depth")
+		(integer :tag "Allocation Sites")
+		(radio-button-choice :format "%t \n%v"
+				     :tag "Sort output based on:"
+		 (const "Allocation objects")
+		 (const "Live objects")))))
+
+(defcustom jde-db-option-verify (list nil t)
+  "*Verify classes."
+  :group 'jde-db-options
+  :type '(list :indent 2
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Executed code in all classes.")
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Classes loaded by a classloader.")))
+
+(defcustom jde-db-option-host ""
+  "Host of a remote process to which you wish to attach. This
+option is invalid for JDK verions greater than JDK 1.1.x."
+  :group 'jde-db-options
+  :type 'string)
+
+
+;; (makunbound 'jde-db-option-connect-socket)
+(defcustom jde-db-option-connect-socket (list nil "4444")
+  "Specify address of socket to be used to connect the debugger and a
+debuggee process. Selecting \"Prompt\" from the customization value
+menu causes the debugger to prompt you to enter the shared memory name
+when you command it to attach to or listen for an existing
+process. Selecting \"Specify\" allows you to specify a default socket
+host and port to be used by the debugger. "
+  :group 'jde-db-options
+  :type '(choice
+	  (const :menu-tag "Prompt" nil)
+	  (list
+	   :menu-tag "Specify" :tag "Socket Address" :inline nil
+	   (choice
+	    :tag "Host"
+	    (const :menu-tag "Local" nil)
+	    (string :menu-tag "Remote" :tag "Name"))
+	   (choice
+	    :tag "Port"
+	    (const :menu-tag "Default" "4444")
+	    (string :menu-tag "Custom")))))
+
+
+
+
+;; (makunbound 'jde-db-option-connect-shared-memory-name)
+(defcustom jde-db-option-connect-shared-memory-name "javadebug"
+  "Specify name to use to establish a shared memory connection
+between the debugger and a debuggee process. Selecting \"Prompt\" from
+the customization value menu causes a debugger attach or listen
+command, e.g., `jde-jdb-attach-via-shared-memory', to prompt you to
+enter the shared memory name. Selecting \"Specify\" allows you to
+specify a name of your choosing."
+  :group 'jde-db-options
+  :type '(choice
+	  (const :menu-tag "Prompt" nil)
+	  (string :menu-tag "Specify" :tag "Name")))
+
+
+(defcustom jde-db-option-vm-args nil
+  "*Specify arguments to be passed to the Java vm.
+This option allows you to specify one or more arguments to be passed
+to the Java interpreter. It is an alternative to using JDE Run Option
+variables, such as `jde-run-option-stack-size', to specify Java
+interpreter options. Also, it makes it possible to use the JDE with
+interpreters that accept command line arguments not supported by
+the JDE Run Option variable set."
+  :group 'jde-db-options
+  :type '(repeat (string :tag "Argument")))
+
+
+(defcustom jde-db-option-application-args nil
+  "*Specify command-line arguments to pass to the application.
+The JDE passes the specified arguments to the application on
+the command line."
+  :group 'jde-db-options
+  :type '(repeat (string :tag "Argument")))
+
+(defmacro jde-assert-source-or-debug-buffer ()
+  "Asserts that the current buffer is a
+Java source or a debug buffer."
+  '(assert
+    (or
+     (eq major-mode 'jde-mode)
+     (and (slot-boundp 'jde-db-debugger 'the-debugger)
+	  (eq (current-buffer)
+	      (oref (oref 'jde-db-debugger the-debugger) buffer))))
+    nil
+    "This command works only in a Java source or debug buffer."))
+
+(defcustom jde-db-log-debugger-output-flag nil
+  "Log raw debugger output to a buffer. This variable is intended
+to be used for debugging the JDEE's debuggers."
+  :group 'jde-db-options
+  :type 'boolean)
+
+(defun jde-db-log-debugger-output (output)
+  (if jde-db-log-debugger-output-flag
+      (let ((buf (get-buffer "debugger output")))
+	(when (not buf)
+	  (setq buf (get-buffer-create  "debugger output"))
+	  (pop-to-buffer buf))
+	(save-excursion
+	  (set-buffer buf)
+	  (goto-char (point-max))
+	  (insert-string output)))))
+
+(defun jde-db-get-debuggee-status ()
+  "Get the`jde-db-debuggee-status' of the
+current debuggee process."
+  (if (slot-boundp 'jde-db-debugger 'the-debugger)
+      (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	     (debuggee (oref debugger debuggee)))
+	(oref debuggee status))))
+
+
+(defun jde-db-debuggee-stopped-p ()
+  "Return t if current debuggee process is stopped."
+  (let ((status (jde-db-get-debuggee-status)))
+     (if status
+	 (oref status stopped-p))))
+
+(defun jde-db-debuggee-suspended-p ()
+  "Return t if current debuggee process is suspended."
+  (let ((status (jde-db-get-debuggee-status)))
+     (if status
+	 (oref status suspended-p))))
+
+(defun jde-db-debuggee-running-p ()
+  "Return t if current debuggee process is running."
+  (let ((status (jde-db-get-debuggee-status)))
+     (if status
+	 (oref status running-p))))
+
+
+;;;###autoload
+(defun jde-db-set-debugger (name is-executable)
+  "Specify the pathname of the debugger, if an executable, or the
+debugger's fully qualified class name, if a class."
+  (interactive
+   "sEnter name of Java interpreter: \nsIs %s executable? (yes): ")
+  (let ((db name)
+	(type
+	 (if (stringp is-executable)
+	     (if (or
+		  (string= is-executable "")
+		  (eq (aref is-executable 0) ?y))
+		 "Executable"
+	       "Class")
+	   "Executable")))
+    (setq jde-db-debugger (cons "Other" (cons db type)))))
+
+;;;###autoload
+(defun jde-db-set-args (args)
+  "Specify the arguments (except -classpath) to be passed to the debugger."
+  (interactive
+   "sEnter arguments: ")
+  (setq jde-db-option-vm-args (jde-run-parse-args args)))
+
+;;;###autoload
+(defun jde-db-set-app-args (args)
+  "Specify the arguments to be passed to the Java application class."
+  (interactive
+   "sEnter arguments: ")
+  (setq jde-db-option-application-args (jde-run-parse-args args)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Breakpoints                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom jde-db-spec-breakpoint-face-colors (cons "black" "green")
+"*Specifies the foreground and background colors used to highlight
+the line at which you have specified that a breakpoint to be set."
+  :group 'jde-project
+  :type '(cons :tag "Colors"
+	  (string :tag "Foreground")
+	  (string :tag "Background"))
+  :set '(lambda (sym val)
+	  (make-face 'jde-db-spec-breakpoint-face)
+	  (set-face-foreground 'jde-db-spec-breakpoint-face (car val))
+	  (set-face-background 'jde-db-spec-breakpoint-face (cdr val))
+	  (set-default sym val)))
+
+(defcustom jde-db-requested-breakpoint-face-colors (cons "black" "yellow")
+"*Specifies the foreground and background colors used to highlight
+the line at which you have requested a breakpoint to be set."
+  :group 'jde-project
+  :type '(cons :tag "Colors"
+	  (string :tag "Foreground")
+	  (string :tag "Background"))
+  :set '(lambda (sym val)
+	  (make-face 'jde-db-requested-breakpoint-face)
+	  (set-face-foreground 'jde-db-requested-breakpoint-face (car val))
+	  (set-face-background 'jde-db-requested-breakpoint-face (cdr val))
+	  (set-default sym val)))
+
+(defcustom jde-db-active-breakpoint-face-colors (cons "black" "red")
+"*Specifies the foreground and background colors used to highlight
+a line where an active breakpoint exists."
+  :group 'jde-project
+  :type '(cons :tag "Colors"
+	  (string :tag "Foreground")
+	  (string :tag "Background"))
+  :set '(lambda (sym val)
+	  (make-face 'jde-db-active-breakpoint-face)
+	  (set-face-foreground 'jde-db-active-breakpoint-face (car val))
+	  (set-face-background 'jde-db-active-breakpoint-face (cdr val))
+	  (set-default sym val)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Breakpoint Marker Class                                                    ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-db-breakpoint-marker ()
+  ((marker :initarg :marker
+	   :documentation
+	   "Overlay in Emacs, extent in XEmacs"))
+  "Indicates the location of breakpoints in a source buffer. This class
+uses overlays as markers in Emacs and extents in XEmacs.")
+
+(defmethod initialize-instance ((this jde-db-breakpoint-marker) &rest fields)
+  "Create a breakpoint overlay at LINE in FILE."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this marker
+	(if (featurep 'xemacs)
+	    (if (or (not (extent-at (jde-line-beginning-position)))
+		    (not (jde-db-breakpoint-marker-p
+			   (extent-at (jde-line-beginning-position)))))
+		(make-extent
+		 (jde-line-beginning-position)
+		 (1+ (jde-line-end-position))))
+	  (make-overlay
+	   (jde-line-beginning-position)
+	   (1+ (jde-line-end-position))
+	   (current-buffer) nil t))))
+
+
+(defmethod jde-db-breakpoint-marker-set-face ((this jde-db-breakpoint-marker) face)
+  "Apply FACE to OVERLAY."
+  (let ((marker (oref this marker)))
+    (if (featurep 'xemacs)
+	(progn
+	  (set-extent-face marker face)
+	  (set-extent-priority marker 98))
+      (progn
+	(overlay-put marker  'face face)
+	(overlay-put marker 'priority 98)))))
+
+(defun jde-db-breakpoint-marker-p (marker)
+  "Return t if overlay is a breakpoint marker overlay."
+    (let ((marker-face
+	   (if (featurep 'xemacs)
+	       (extent-property marker 'face nil)
+	     (overlay-get marker 'face))))
+      (or
+       (eq marker-face 'jde-db-spec-breakpoint-face)
+       (eq marker-face 'jde-db-requested-breakpoint-face)
+       (eq marker-face 'jde-db-active-breakpoint-face))))
+
+(defmethod jde-db-breakpoint-marker-delete ((this jde-db-breakpoint-marker))
+  "Remove breakpoint overlay at LINE in FILE."
+  (if (featurep 'xemacs)
+      (delete-extent (oref this marker))
+    (delete-overlay (oref this marker))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Breakpoint Class                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-breakpoint ()
+  ((id       :initarg :id
+	     :type integer
+	     :documentation
+	     "Identifies this breakpoint.")
+   (file     :initarg :file
+	     :initform ""
+	     :type string
+	     :documentation
+	     "Pathname of file containing this breakpoint.")
+   (line     :initarg :line
+	     :type integer
+	     :documentation
+	     "Number of line at which breakpoint is set.")
+   (marker   :initarg :marker
+	     :type (or null jde-db-breakpoint-marker)
+	     :initform nil
+	     :documentation
+	     "Marker used to highlight breakpoint line.")
+   (class    :initarg :class
+	     :type string
+	     :documentation
+	     "Qualified name of class containing breakpoint.")
+   (status   :initarg status
+	     :type symbol
+	     :initform specified
+	     :documentation
+	     "Status of this breakpoint. Legal values are `specified', `requested', `active'."))
+  (:allow-nil-initform t)
+  "Class of breakpoints.")
+
+
+(defmethod initialize-instance ((this jde-db-breakpoint) &rest fields)
+  "Constructor for a breakpoint specification."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this file))
+
+  (oset this
+	marker
+	(jde-db-breakpoint-marker "breakpoint marker"))
+
+  (jde-db-breakpoint-marker-set-face
+   (oref this marker) 'jde-db-spec-breakpoint-face))
+
+(defmethod jde-db-breakpoint-get-line ((this jde-db-breakpoint))
+  "Get the number of the line at which this breakpoint is set."
+  (save-excursion
+    (set-buffer (find-file-noselect (oref this file)))
+    (if (oref this marker)
+	(let ((marker-start
+	       (if (featurep 'xemacs)
+		   (extent-start-position (oref (oref this marker) marker))
+		 (overlay-start (oref (oref this marker) marker)))))
+	  (jde-get-line-at-point marker-start))
+      (oref this line))))
+
+(defvar jde-db-breakpoints nil
+"Current breakpoints.")
+
+
+(defun jde-db-get-breakpoint-marker (file line)
+  "Get breakpoint marker at FILE and LINE."
+  (let ((bp (jde-db-find-breakpoint file line)))
+    (if bp
+	(oref bp marker))))
+
+(defun jde-db-mark-breakpoint-specified (file line)
+  "Changes the face of the breakpoint marker at LINE in FILE
+to the specified face."
+  (let ((marker (jde-db-get-breakpoint-marker file line)))
+    (if marker
+	(jde-db-breakpoint-marker-set-face marker 'jde-db-spec-breakpoint-face))))
+
+(defun jde-db-mark-breakpoint-active (file line)
+  "Changes the face of the breakpoint marker at LINE in FILE
+to the active face."
+  (let ((marker (jde-db-get-breakpoint-marker file line)))
+    (if marker
+	(jde-db-breakpoint-marker-set-face marker 'jde-db-active-breakpoint-face))))
+
+(defun jde-db-mark-breakpoint-requested (file line)
+  "Changes the face of the breakpoint marker at LINE in FILE
+to the active face."
+  (let ((marker (jde-db-get-breakpoint-marker file line)))
+    (if marker
+	(jde-db-breakpoint-marker-set-face marker 'jde-db-requested-breakpoint-face))))
+
+(defun jde-db-set-all-breakpoints-specified ()
+  "Changes the face of all breakpoints to `jde-db-spec-breakpoint-face'
+and sets the status of all breakpoints to `specified'."
+  (loop for bp-assoc in jde-db-breakpoints do
+	(let* ((bp (cdr bp-assoc))
+	       (marker (oref bp marker)))
+	  (oset bp status 'specified)
+	  (if marker
+	      (jde-db-breakpoint-marker-set-face marker 'jde-db-spec-breakpoint-face)))))
+
+(defun jde-db-delete-breakpoint (bp)
+  "Delete the breakpoint at LINE in FILE."
+  (setq jde-db-breakpoints
+	;; bp will be in the list so don't run the risk of using a
+	;; deleted extent.
+	(let ((bpline (jde-db-breakpoint-get-line bp)))
+	  (remove-if
+	   (lambda (assoc-x)
+	     (let* ((xbp (cdr assoc-x))
+		    (xfile (oref xbp file))
+		    (deletep
+		     (and
+		      (string= (oref bp file) xfile)
+		      (equal bpline (jde-db-breakpoint-get-line  xbp)))))
+	       (if deletep
+		   (jde-db-breakpoint-marker-delete
+		    (oref bp marker)))
+	       deletep))
+	   jde-db-breakpoints))))
+
+(defun jde-db-clear-breakpoints ()
+  "Clear all breakpoints from all buffers."
+  (mapc
+   (lambda (assoc-x)
+     (let* ((xbp (cdr assoc-x))
+	    (file (oref xbp file))
+	    (buf (find-buffer-visiting file)))
+       (if buf
+	   (save-excursion
+	     (set-buffer buf)
+	     (let ((xmarker (oref xbp marker)))
+	       (jde-db-breakpoint-marker-delete xmarker))))))
+      jde-db-breakpoints)
+  (setq jde-db-breakpoints nil))
+
+(defvar jde-db-bp-list nil)
+(defun jde-debug-list-breakpoints (&optional active)
+  "Brings a list of all set breakpoints. It allows the user to jump to a
+particular breakpoint and to select breakpoints to be clear."
+  (interactive "i")
+  (if jde-db-breakpoints
+      (progn
+	(switch-to-buffer "*Breakpoints List*")
+	(kill-all-local-variables)
+	(make-local-variable 'jde-db-bp-list)
+	(setq jde-db-bp-list nil)
+	(let ((inhibit-read-only t))
+	  (erase-buffer))
+	(setq active (not active))
+	(widget-insert "Breakpoints:\n\n")
+	(mapc
+	 (lambda (assoc-x)
+	   (let* ((xbp (cdr assoc-x))
+		  (id (oref xbp id))
+		  (class (oref xbp class))
+		  (file (oref xbp file))
+		  (line (oref xbp line))
+		  (status (oref xbp status)))
+	     (widget-create
+	      'checkbox
+	      :notify (lambda (widget &rest ignore)
+			(if (widget-value widget)
+			    (setq jde-db-bp-list
+				  (delete (widget-get widget :id)
+					  jde-db-bp-list))
+			  (setq jde-db-bp-list
+				(append jde-db-bp-list
+					(list (widget-get widget :id))))))
+	      :id id
+	      active)
+	   (if (not active)
+		(setq jde-db-bp-list (append jde-db-bp-list (list id))))
+	    (widget-insert " ")
+	    (widget-create 'push-button
+			   :notify (lambda (widget &rest ignore)
+				     (progn
+				       (find-file-other-window
+					(widget-get widget :file))
+				       (goto-line
+					(widget-get widget :line))))
+
+			   :button-face
+			    (cond
+			     ((eq status 'specified)
+			      'jde-db-spec-breakpoint-face)
+			     ((eq status 'active)
+			      'jde-db-active-breakpoint-face)
+			     (t 'jde-db-requested-breakpoint-face))
+			   :file file
+			   :line line
+			   (format "%s:%d" class line))
+	    (widget-insert "\n")))
+	 jde-db-breakpoints)
+	(widget-insert "\n")
+	(widget-create 'push-button
+		       :notify (lambda (&rest ignore)
+				 (jde-debug-list-breakpoints t))
+		       "Clear All")
+	(widget-insert " ")
+	(widget-create 'push-button
+		       :notify (lambda (&rest ignore)
+				 (progn
+				   (jde-db-process-breakpoints)
+				   (kill-buffer "*Breakpoints List*")))
+		       "Apply Form")
+	(use-local-map widget-keymap)
+	(widget-insert "\n")
+	(widget-setup))
+    (message "No breakpoints")))
+
+(defun jde-db-process-breakpoints ()
+  "Deletes all the breakpoints found in `jde-db-bp-list'"
+  (if jde-db-bp-list
+      (if (jde-db-debuggee-running-p)
+	  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+		 (bp-cmd (oref (oref debugger cmd-set) clear-bp)))
+	    (oset
+	     bp-cmd
+	     breakpoints
+	     (mapcar
+	      (lambda (assoc-x)
+		(jde-db-find-breakpoint-by-id assoc-x))
+	      jde-db-bp-list))
+	    (jde-db-exec-cmd debugger bp-cmd))
+	(loop for bp-assoc in jde-db-bp-list do
+	      (let ((bp (jde-db-find-breakpoint-by-id bp-assoc)))
+		(jde-db-delete-breakpoint bp))))))
+
+(defun jde-db-breakpoints-add (bp)
+  "Adds this breakpoint to the list of breakpoints."
+  (setq jde-db-breakpoints
+	(cons (cons (oref bp id) bp)
+	      jde-db-breakpoints)))
+
+
+(defun jde-db-find-breakpoint-by-id (id)
+  "Finds the breakpoint object with ID"
+  (cdr (find-if
+	(lambda (assoc-x)
+	  (let ((bp (cdr assoc-x)))
+	    (= (oref bp id) id)))
+	jde-db-breakpoints)))
+
+(defun jde-db-find-breakpoint (file line)
+  "Finds the breakpoint object for the breakpoint at FILE and LINE."
+  (cdr (find-if
+	(lambda (assoc-x)
+	  (let ((bp (cdr assoc-x)))
+	       (and (string= (oref bp file) file)
+		    (equal (jde-db-breakpoint-get-line bp) line))))
+	jde-db-breakpoints)))
+
+
+(defvar jde-db-breakpoint-id-counter 0
+"Counter for generating breakpoint ids")
+
+(defun jde-db-nullify-breakpoint-markers ()
+  "Set the marker field for each breakpoint
+in the current buffer to nil."
+ (when (eq major-mode 'jde-mode)
+   (let ((file (buffer-file-name)))
+     (loop for bp-assoc in jde-db-breakpoints do
+	   (let ((bp (cdr bp-assoc)))
+	     (when (string= (oref bp file) file)
+	       (oset bp line (jde-db-breakpoint-get-line bp))
+	       (oset bp marker nil)))))))
+
+(add-hook 'kill-buffer-hook 'jde-db-nullify-breakpoint-markers)
+
+(defun jde-db-remark-breakpoints ()
+  "Highlights all breakpoints in the current buffer if not
+already highlighted."
+  (save-excursion
+    (loop for bp-assoc in jde-db-breakpoints do
+	  (let* ((bp (cdr bp-assoc))
+		 (file (buffer-file-name))
+		 (line (oref bp line))
+		 (status (oref bp status)))
+	    (if (string-equal file (oref bp file))
+		(progn
+		  (goto-line line)
+		  (oset bp
+			marker
+			(jde-db-breakpoint-marker "breakpoint marker"))
+		  (cond
+		   ((eq status 'specified)
+		    (jde-db-mark-breakpoint-specified file line))
+		   ((eq status 'requested)
+		    (jde-db-mark-breakpoint-requested file line))
+		   ((eq status 'active)
+		    (jde-db-mark-breakpoint-active file line))
+		   (t
+		    (error "Unknown breakpoint status: %s"
+			   (symbol-name status))))))))
+    ))
+
+
+(add-hook 'jde-mode-hook 'jde-db-remark-breakpoints)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debug Cursor Handling                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-db-query-source-file (class)
+  (let ((source-file
+	 (read-file-name
+	  (format "Cannot find %s source. Enter path: " class))))
+  (if (and
+       source-file
+       (file-exists-p source-file)
+       (not (file-directory-p source-file)))
+      (find-file-noselect source-file))))
+
+(defun jde-db-find-class-source (class)
+  "Find and open the source file for a class. CLASS is the fully
+qualified name of the class. If this function is unable to find the
+source for CLASS in `jde-sourcepath' and
+`jde-db-query-missing-source-files' is nonnil, this function queries
+the user for the path to the source file. If successful, this function
+returns an unselected buffer containing the source file for the
+class. Otherwise, it returns nil."
+  (let* ((source-file (jde-find-class-source-file class))
+	 (source-buffer
+	  (if source-file
+	      (find-file-noselect source-file)
+	    (if jde-db-query-missing-source-files
+		(jde-db-query-source-file class)))))
+    source-buffer))
+
+(defun jde-db-set-debug-cursor (class file line)
+  "Shows the source at LINE in CLASS."
+  (let* ((buffer (jde-db-find-class-source class))
+	 (window
+	  (and buffer
+	       (or (get-buffer-window buffer)
+		   (selected-window))))
+	  pos)
+    (if buffer
+	(progn
+	  (if (not (get-buffer-window buffer))
+	      (set-window-buffer window buffer))
+	  (save-excursion
+	    (set-buffer buffer)
+	    (save-restriction
+	      (widen)
+	      (goto-line line)
+	      (setq pos (point))
+	      (setq overlay-arrow-string "=>")
+	      (or overlay-arrow-position
+		  (setq overlay-arrow-position (make-marker)))
+	      (set-marker overlay-arrow-position (point) (current-buffer)))
+	    (cond ((or (< pos (point-min)) (> pos (point-max)))
+		   (widen)
+		   (goto-char pos))))
+	  (set-window-point window overlay-arrow-position)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debuggee Process Status Class                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-debuggee-status ()
+  ((running-p   :initarg :running-p
+		:type boolean
+		:initform nil
+		:documentation
+		"Non-nil if debuggee process is running.")
+   (stopped-p   :initarg :stopped-p
+		:type boolean
+		:initform nil
+		:documentation
+		"Non-nil if debuggee process is stopped.")
+   (suspended-p :initarg :suspended-p
+		:type boolean
+		:initform nil
+		:documentation
+		"Non-nil if debuggee process is suspended."))
+  "Status of debuggee process.")
+
+(defmethod initialize-instance ((this jde-db-debuggee-status) &rest fields)
+  "Status of debuggee process."
+  (call-next-method))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debuggee Process Class                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-connector () ()
+  "Proxy for debugger connectors.")
+
+(defclass jde-db-launch-connector (jde-db-connector) ()
+  "Launched by the debugger.")
+
+(defclass jde-db-socket-connector (jde-db-connector)
+  ((port :initarg :port
+	 :type (or null string)
+	 :initform nil
+	 :documentation
+	 "Port to the debuggee process."))
+  "Connect via a socket.")
+
+(defclass jde-db-shared-memory-connector (jde-db-connector)
+  ((name  :initarg :name
+	  :type (or null string)
+	  :initform nil
+	  :documentation
+	  "Shared memory name of debuggee process."))
+  "Connect via a shared-memory transport (Windows only).")
+
+
+(defclass jde-db-attach-connector (jde-db-connector) ()
+  "Attaches to debuggee.")
+
+(defclass jde-db-listen-connector (jde-db-connector) ()
+  "Listens for debuggee.")
+
+
+(defclass jde-db-socket-attach-connector (jde-db-socket-connector
+					  jde-db-attach-connector)
+  ((host        :initarg :host
+		:type (or null string)
+		:initform nil
+		:documentation
+		"Host on which the debuggee process runs."))
+  "Attach via a socket.")
+
+(defclass jde-db-shared-memory-attach-connector (jde-db-shared-memory-connector
+						 jde-db-attach-connector)
+  ()
+  "Attach via a shared memory connection.")
+
+(defclass jde-db-socket-listen-connector (jde-db-socket-connector
+					  jde-db-listen-connector)
+  ()
+  "Listen via a socket.")
+
+(defclass jde-db-shared-memory-listen-connector (jde-db-shared-memory-connector
+						 jde-db-listen-connector)
+  ()
+  "Listen via a shared memory connection.")
+
+
+(defclass jde-db-debuggee ()
+  ((status      :initarg :status
+		:type jde-db-debuggee-status
+		:documentation
+		"Status of debuggee process.")
+
+  (stack-depth  :initarg :stack-depth
+		:type string
+		:initform ""
+		:documentation
+		"Stack depth."))
+  "Program being debugged.")
+
+(defmethod initialize-instance ((this jde-db-debuggee) &rest fields)
+  "Constructs an instance of a debuggee."
+  (call-next-method))
+
+
+(defclass jde-db-debuggee-app (jde-db-debuggee)
+  ((main-class  :initarg :main-class
+		:type string
+		:documentation
+		"Qualified name of debuggee main class.")
+
+   (connector   :initarg :connector
+		:type jde-db-connector
+		:documentation
+		"Type of connector between this debuggee and the debugger."))
+  "Application being debugged.")
+
+(defclass jde-db-debuggee-applet (jde-db-debuggee)
+  ((doc :initarg :doc
+	:type string
+	:documentation
+	"Path of applet HTML document."))
+  "Applet being debugged.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debugger Command Line Commands                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-cmd ()
+  ((name           :initarg :name
+		   :type string
+		   :documentation
+		   "Name of command.")
+   (debugger       :initarg :debugger
+		   :type jde-db-debugger
+		   :documentation
+		   "Debugger."))
+  "Super class of debugger commands.")
+
+
+(defmethod initialize-instance ((this jde-db-cmd) &rest fields)
+  "Constructor for debugger commands."
+  (call-next-method))
+
+(defmethod jde-db-cmd-init ((this jde-db-cmd))
+  "The debugger invokes this method before executing the
+command.")
+
+(defmethod jde-db-cmd-make-command-line ((this jde-db-cmd))
+  "Creates the command line for this command."
+  (oref this name))
+
+(defmethod jde-db-cmd-notify-response ((this jde-db-cmd) response)
+  "Invoked when the debugger responds to the command. RESPONSE
+is the response.")
+
+(defmethod jde-db-cmd-response-p ((this jde-db-cmd) output)
+  "Returns nonnil if external debugger's output is a
+response to this command."
+  t)
+
+
+(defclass jde-db-cmd-breakpoint (jde-db-cmd)
+  ((breakpoints :initarg :breakpoints
+		:type list
+		:documentation
+		"List of breakpoint specification."))
+  "Class of breakpoint commands.")
+
+(defclass jde-db-cmd-launch (jde-db-cmd)
+  ()
+   "Launch a debuggee process.")
+
+(defclass jde-db-cmd-launch-app (jde-db-cmd-launch)
+  ((main-class :initarg :main-class
+	       :type string
+	       :documentation
+	       "Main class of applications to be debugged."))
+   "Launch an application in debug mode.")
+
+(defmethod initialize-instance ((this jde-db-cmd-launch-app) &rest fields)
+  (call-next-method)
+  (oset this name "launch application"))
+
+(defclass jde-db-cmd-launch-applet (jde-db-cmd-launch)
+  ((doc  :initarg :doc
+	 :type string
+	 :documentation
+	 "Path of applet document."))
+   "Launch an applet in debug mode.")
+
+(defmethod initialize-instance ((this jde-db-cmd-launch-applet) &rest fields)
+  (call-next-method)
+  (oset this name "launch applet"))
+
+;; Generic Debugger Command Set.
+
+(defclass jde-db-cmd-set ()
+  ((debugger          :initarg :debugger
+		      :type jde-db-debugger
+		      :documentation
+		      "Debugger that owns this command set.")
+   (launch-app        :initarg :launch-app
+		      :type jde-db-cmd-launch-app
+		      :documentation
+		      "Launch debuggee application")
+   (launch-applet     :initarg :launch-applet
+		      :type jde-db-cmd-launch-applet
+		      :documentation
+		      "Launch debuggee applet")
+   (run               :initarg :run
+		      :type jde-db-cmd
+		      :documentation
+		      "Starts the current debuggee application.")
+   (cont              :initarg :cont
+		      :type jde-db-cmd
+		      :documentation
+		      "Continues the current debuggee application.")
+   (quit              :initarg :quit
+		      :type jde-db-cmd
+		      :documentation
+		      "Quit debugging the current application.")
+   (step-over         :initarg :step-over
+		      :type jde-db-cmd
+		      :documentation
+		      "Step to the next line in the current frame.")
+   (step-into         :initarg :step-into
+		      :type jde-db-cmd
+		      :documentation
+		      "Step to the next line in the current program.")
+   (step-out          :initarg :step-out
+		      :type jde-db-cmd
+		      :documentation
+		      "Continue to the end of the current method.")
+   (up                :initarg :up
+		      :type jde-db-cmd
+		      :documentation
+		      "Move up the stack.")
+   (down              :initarg :down
+		      :type jde-db-cmd
+		      :documentation
+		      "Move down the stack.")
+   (where             :initarg :where
+		      :type jde-db-cmd
+		      :documentation
+		      "Point to the current stopping point.")
+   (set-bp            :initarg :set-bp
+		      :type jde-db-cmd
+		      :documentation
+		      "Cmd that asks debugger to set a breakpoint.")
+   (clear-bp          :initarg :clear-bp
+		      :type jde-db-cmd
+		      :documentation
+		      "Cmd that asks debugger to set a breakpoint."))
+  "Set of debugger commands implemented by this debugger.")
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debug Process Listener                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-listener ()
+  ((debugger   :initarg :debugger
+	       :type jde-db-debugger
+	       :documentation
+	       "The debugger"))
+  "Listens to the output from the debugger.")
+
+(defmethod jde-db-listener-filter-output ((this jde-db-listener) output)
+  "Filters the output of the debugger."
+  output)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Class of JDE Debuggers                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-debugger ()
+  ((name          :initarg :name
+		  :type string
+		  :initform "Java debugger"
+		  :documentation
+		  "Name of this Java debugger.")
+   (buffer-name   :initarg :buffer-name
+		  :initform "Java Debugger"
+		  :type string
+		  :documentation
+		  "Name of buffer used to interact with debugger.")
+   (buffer        :initarg :buffer
+		  :type buffer
+		  :documentation
+		  "Buffer used to interact with debugger.")
+
+   (process       :initarg :process
+		  :documentation
+		  "Debugger process.")
+
+   (running-p     :initarg :process
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "Non-nil if debugger process is running.")
+
+   (proc-filter   :initarg :proc-filter
+		  :type function
+		  :documentation
+		  "Function used to parse debug output.")
+
+   (listeners     :initarg :listeners
+		  :type list
+		  :initform nil
+		  :documentation
+		  "List of debugger output listeners.")
+
+   (cmd-set       :initarg :cmd-set
+		  :type jde-db-cmd-set
+		  :documentation
+		  "Commands implemented by this debugger.")
+
+   (next-cmd      :initarg :next-cmd
+		  :type list
+		  :initform nil
+		  :documentation
+		  "Next command(s) to execute.")
+
+   (last-cmd      :initarg :last-cmd
+		  :type (or null jde-db-cmd)
+		  :documentation
+		  "Last command send to the debugger.")
+
+   (debuggee      :initarg :debuggee
+		  :type jde-db-debuggee
+		  :documentation
+		  "Application process being debugged.")
+
+   (the-debugger  :type jde-db-debugger
+		  :allocation :class
+		  :documentation
+		  "The currently active debugger."))
+   "Class of Java debuggers.")
+
+(defmethod initialize-instance ((this jde-db-debugger) &rest fields)
+  "Constructor for generic debugger."
+  (oset this cmd-set
+	(jde-db-cmd-set "Generic commands" :debugger this))
+  (oset this last-cmd nil))
+
+
+(defmethod jde-db-create-debuggee-app ((this jde-db-debugger) main-class))
+
+(defmethod jde-db-create-debuggee-applet ((this jde-db-debugger applet-doc)))
+
+(defmethod jde-db-ready-p ((this jde-db-debugger) output)
+  "Nonnil if OUTPUT indicates that the debugger is
+ready to accept the next command."
+  (and output
+       (or
+	(string-match ">[ ]*$" output)
+	(string-match "[a-zA-Z0-9]+\[[0-9]+\][ ]*$" output)
+	(string-match "VM Started:[ ]*$" output))))
+
+
+(defmethod jde-db-process-debugger-output ((this jde-db-debugger) output)
+  "Process debugger output."
+  (jde-db-log-debugger-output (concat "<<" output ">>"))
+  (let ((proc (oref this process))
+	(listeners (oref this listeners))
+	(response output)
+	(last-cmd (oref this last-cmd)))
+
+    (loop for listener in listeners do
+	  (setq output
+		(jde-db-listener-filter-output listener output)))
+
+    (comint-output-filter proc output)
+
+    (if last-cmd
+	(jde-db-cmd-notify-response last-cmd response))
+
+    (if (jde-db-ready-p this (car (last (split-string output "\n"))))
+	(jde-db-exec-next-cmd this))))
+
+(defmethod jde-db-add-listener ((this jde-db-debugger) listener)
+  "Adds LISTENER to the list of listeners listening for response
+from the debugger. LISTENER must be an object of type
+`jde-db-listener'."
+  (assert (typep listener jde-db-listener))
+  (oset this listeners (cons listener (oref this listeners))))
+
+(defmethod jde-db-remove-listener ((this jde-db-debugger) listener)
+  "Removes LISTENER from the list of listeners listening for a
+response from the debugger.  LISTENER must be an object of type
+`jde-db-listener'."
+  (assert (typep listener jde-db-listener))
+  (oset this listeners (remove listener (oref this listeners))))
+
+(defmethod jde-db-set-process-filter ((this jde-db-debugger))
+  "Set debugger process output filter. The default method sets a
+function that invokes `jde-db-process-debugger-output'."
+  (set-process-filter
+   (oref this process)
+   (lambda (process output)
+     (jde-db-process-debugger-output
+      (oref 'jde-db-debugger the-debugger) output))))
+
+(defmethod jde-db-notify-process-exit ((this jde-db-debugger) msg)
+  "The default debugger process sentinel invokes this method
+when the debugger process terminates."
+  (let ((proc (oref this process)))
+    (cond ((null (buffer-name (process-buffer proc)))
+	 ;; buffer killed
+	 ;; Stop displaying an arrow in a source file.
+	   (setq overlay-arrow-position nil)
+	   (set-process-buffer proc nil))
+	  ((memq (process-status proc) '(signal exit))
+	   ;; Stop displaying an arrow in a source file.
+	   (setq overlay-arrow-position nil)
+	   (let* ((obuf (current-buffer)))
+	     ;; save-excursion isn't the right thing if
+	     ;;  process-buffer is current-buffer
+	     (unwind-protect
+		 (progn
+		   ;; Write something in debugger buffer and hack its mode line,
+		   (set-buffer (process-buffer proc))
+		   ;; Fix the mode line.
+		   (setq mode-line-process
+			 (concat ":"
+				 (symbol-name (process-status proc))))
+		   (force-mode-line-update)
+		   (if (eobp)
+		       (insert ?\n mode-name " " msg)
+		     (save-excursion
+		       (goto-char (point-max))
+		       (insert ?\n mode-name " " msg)))
+		 ;; If buffer and mode line will show that the process
+		 ;; is dead, we can delete it now.  Otherwise it
+		 ;; will stay around until M-x list-processes.
+		 (delete-process proc))
+	     ;; Restore old buffer, but don't restore old point
+	     ;; if obuf is the command buffer.
+	     (set-buffer obuf)))))))
+
+
+(defmethod jde-db-notify-process-status-change ((this jde-db-debugger) msg)
+  "The debugger process sentinel invokes this method when the status of
+the debugger process changes. The default method invokes
+`jde-db-notify-process-exit'."
+  (jde-db-notify-process-exit this msg))
+
+
+(defmethod jde-db-set-process-sentinel ((this jde-db-debugger))
+  (set-process-sentinel
+   (oref this process)
+   (lambda (process msg)
+       (jde-db-notify-process-status-change
+	(oref 'jde-db-debugger the-debugger) msg))))
+
+(defmethod jde-db-exec-next-cmd ((this jde-db-debugger))
+  "Executes the next command on the debugger's pending
+command list."
+  (let ((curr-cmd (car (oref this next-cmd))))
+    (if curr-cmd
+	(progn
+	  (oset this next-cmd (cdr (oref this next-cmd)))
+	  (oset this last-cmd curr-cmd)
+	  (jde-db-cmd-init curr-cmd)
+	  (save-excursion
+	    (set-buffer (oref this buffer))
+	    (let ((proc (oref this process))
+		  (cmd-line (jde-db-cmd-make-command-line curr-cmd)))
+	      (if cmd-line
+		  (progn
+		    (goto-char (point-max))
+		    (insert cmd-line)
+		    (comint-send-input)))))))))
+
+(defmethod jde-db-exec-cmds ((this jde-db-debugger) cmds)
+  "Executes list of debugger CMDS."
+  (oset this next-cmd cmds)
+  (jde-db-exec-next-cmd this))
+
+(defmethod jde-db-exec-cmd ((this jde-db-debugger) cmd)
+  "Executes CMD."
+  (assert (and cmd (typep cmd 'jde-db-cmd)))
+  (jde-db-exec-cmds this (list cmd)))
+
+(defmethod jde-db-classpath-arg ((this jde-db-debugger))
+  "Generate the -classpath command line argument for jdb."
+
+  ;; Set the classpath option. Use the local
+  ;; classpath, if set; otherwise, the global
+  ;; classpath.
+  (let ((classpath
+	 (if jde-db-option-classpath
+	     jde-db-option-classpath
+	   jde-global-classpath))
+	(symbol
+	 (if jde-db-option-classpath
+	     'jde-db-option-classpath
+	   'jde-global-classpath)))
+    (if classpath
+	(list
+	 "-classpath"
+	 (jde-build-classpath
+	  classpath symbol)))))
+
+(defmethod jde-db-classic-mode-arg ((this jde-db-debugger))
+  "Generate the classic mode command-line argument for jdb."
+  (if jde-db-classic-mode-vm
+      (list "-classic")))
+
+(defmethod jde-db-property-args ((this jde-db-debugger))
+  "Generate property arguments."
+  (if jde-db-option-properties
+      (mapcar
+       (lambda (prop)
+	 (concat "-D" (car prop) "=" (cdr prop)))
+       jde-db-option-properties)))
+
+
+(defmethod jde-db-verbose-args ((this jde-db-debugger))
+  "Get the debugger verbosity arguments for jdb."
+  (let ((print-classes-loaded
+	 (nth 0 jde-db-option-verbose))
+	(print-memory-freed
+	 (nth 1 jde-db-option-verbose))
+	(print-jni-info
+	 (nth 2 jde-db-option-verbose))
+	options)
+
+    (if print-classes-loaded
+	(add-to-list 'options "-verbose:class"))
+
+    (if print-memory-freed
+	(add-to-list 'options "-verbosegc"))
+
+    (if print-jni-info
+	(add-to-list options "-verbosejni"))
+
+    options))
+
+(defmethod jde-db-heap-size-args ((this jde-db-debugger))
+  "Generate heap size options."
+  (let* ((memory-unit-abbrevs
+	 (list (cons "bytes" "")
+	       (cons "kilobytes" "k")
+	       (cons "megabytes" "m")
+	       (cons "gigabytes" "g")))
+	 (start-cons (nth 0 jde-db-option-heap-size))
+	 (start-size (format "%d%s" (car start-cons)
+			     (cdr (assoc (cdr start-cons)
+					 memory-unit-abbrevs))))
+	 (max-cons (nth 1 jde-db-option-heap-size))
+	 (max-size (format "%d%s" (car max-cons)
+			   (cdr (assoc (cdr max-cons)
+				       memory-unit-abbrevs))))
+	 options)
+    (if (not (string= start-size "1m"))
+	(setq options
+	      (append options (list (concat "-Xms" start-size)))))
+    (if (not (string= max-size "16m"))
+	(setq options
+	      (append options (list (concat "-Xmx" max-size)))))
+    options))
+
+(defmethod jde-db-stack-size-args ((this jde-db-debugger))
+  "Generate stack size arguments."
+  (let* ((memory-unit-abbrevs
+	 (list (cons "bytes" "")
+	       (cons "kilobytes" "k")
+	       (cons "megabytes" "m")
+	       (cons "gigabytes" "g")))
+	 (c-cons (nth 0 jde-db-option-stack-size))
+	 (c-size (format "%d%s" (car c-cons)
+			 (cdr (assoc (cdr c-cons)
+				     memory-unit-abbrevs))))
+	 (java-cons (nth 1 jde-db-option-stack-size))
+	 (java-size (format "%d%s" (car java-cons)
+			    (cdr (assoc (cdr java-cons)
+					memory-unit-abbrevs))))
+	 option)
+
+    (if (not (string= c-size "128k"))
+	(setq option
+	      (append option (list (concat "-Xss" c-size)))))
+
+    (if (not (string= java-size "400k"))
+	(setq option
+	      (append option (list (concat "-Xoss" java-size)))))
+    option))
+
+(defmethod jde-db-garbage-collection-args ((this jde-db-debugger))
+  "Set garbage collection options."
+  (let ((no-gc-asynch (not
+		       (nth 0 jde-db-option-garbage-collection)))
+	(no-gc-classes (not
+			(nth 1 jde-db-option-garbage-collection)))
+	options)
+
+    (if no-gc-asynch
+	(setq options (append options '("-Xnoasyncgc"))))
+
+    (if no-gc-classes
+	(setq options (append options '("-Xnoclassgc"))))
+
+    options))
+
+(defmethod jde-db-garbage-collection-arg ((this jde-db-debugger))
+  "Generate Java profile arg."
+  (let ((profilep (car jde-db-option-java-profile))
+	(file (cdr jde-db-option-java-profile)))
+
+    (if profilep
+	(if (string= file "./java.prof")
+	    (list "-Xprof")
+	  (list (concat "-Xprof:" file))))))
+
+
+(defmethod jde-db-heap-profile-arg ((this jde-db-debugger))
+  "Generate heap profile option."
+  (let* ((profilep (car jde-db-option-heap-profile))
+	 (prof-options (cdr jde-db-option-heap-profile))
+	 (file (nth 0 prof-options))
+	 (depth (nth 1 prof-options))
+	 (top (nth 2 prof-options))
+	 (sort
+	  (downcase (substring (nth 3 prof-options) 0 1))))
+    (if profilep
+	(if (and (string= file "./java.hprof")
+		 (equal depth 5)
+		 (equal top 20)
+		 (string= sort "a"))
+	    (list "-Xhprof")
+	  (list
+	   (format
+	    "-Xhprof:file=%s,depth=%d,top=%d,sort=%s"
+	    file depth top sort))))))
+
+(defmethod jde-db-verify-arg ((this jde-db-debugger))
+  ;; Set verify options.
+  (let ((verify-all (nth 0 jde-db-option-verify))
+	(verify-remote (nth 1 jde-db-option-verify)))
+    (if verify-all
+	(list"-Xverify")
+      ;      (if verify-remote
+      ;	  (list "-Xverifyremote"))
+      (if (and
+	   (not verify-all)
+	   (not verify-remote))
+	  (list "-Xnoverify")))))
+
+
+(defmethod jde-db-command-line-args ((this jde-db-debugger))
+  "Generate command line args."
+  (if jde-db-option-vm-args
+      (mapcar
+       (lambda (arg)
+	 arg)
+       jde-db-option-vm-args)))
+
+
+(defmethod jde-db-host-arg ((this jde-db-debugger))
+  (if (not (string= jde-db-option-host ""))
+      (list "-host" jde-db-option-host)))
+
+(defmethod jde-db-launch-arg ((this jde-db-debugger))
+  "Argument that tells the debugger to launch the
+debuggee vm immediately instead of waiting for a
+run command. Only the new (JDK 1.3) version of jdb
+provides this option."
+  nil)
+
+(defmethod jde-db-get-vm-args ((this jde-db-debugger))
+  (append
+   (jde-db-classic-mode-arg this)
+   (jde-db-launch-arg this)
+   (jde-db-classpath-arg this)
+   (jde-db-property-args this)
+   (jde-db-verbose-args this)
+   (jde-db-heap-size-args this)
+   (jde-db-command-line-args this)))
+
+(defmethod jde-db-debugger-get-working-dir ((this jde-db-debugger))
+  (if (string= jde-run-working-directory "")
+      default-directory
+    (jde-normalize-path 'jde-run-working-directory)))
+
+(defmethod jde-db-debugger-get-prog-args ((this jde-db-debugger))
+  )
+
+(defmethod jde-db-debugger-start ((this jde-db-debugger))
+  "Start the debugger.")
+
+
+(defmethod jde-db-debugger-launch ((this jde-db-debugger) main-class)
+  "Launch the application whose main class is MAIN-CLASS in debug mode.")
+
+
+(defmethod jde-db-debugger-connect ((this jde-db-debugger) &optional listenp)
+  "Connect the debugger to an existing process.")
+
+
+(defun jde-db-get-the-debugger ()
+  "Get the currently selected debugger. This function
+returns an eieio object of type `jde-db-debugger'."
+  (if (string= (car jde-debugger) "JDEbug")
+      jde-dbs-the-debugger
+    (jde-jdb-get-jdb)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Generic Debug Commands                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; The following commands serve as a generalized interface between the
+;; JDE user and JDE-supported debuggers, e.g., jdb or JDEbug.
+
+;; This section is a work in progress. It entails generalizing the
+;; existing jdb and JDEbug commands and replacing those commands
+;; with the generalized commands.
+
+;;;###autoload
+(defun jde-debug ()
+  "Run the debugger specified by `jde-debugger' on the Java application
+whose source resides in the current buffer. This command determines
+the main class of the application either from the variable
+`jde-run-application-class' or from the source in the current
+buffer. If `jde-run-application-class' does not specify a class, the
+main class is assumed to be the class defined by the current source
+buffer. This command creates a command buffer for the debug session."
+  (interactive)
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; This is a temporary hack until I
+  ;; wire up the JDEbug to this command.
+  (if (string= (car jde-debugger) "JDEbug")
+      (jde-bug-debug-app)
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    (let* ((debugger (jde-db-get-the-debugger))
+	   (application-main-class
+	    (let ((main-class jde-run-application-class))
+	      (if (or
+		   (not main-class)
+		   (string= main-class ""))
+		  (setq main-class
+			(if (buffer-file-name)
+			    (concat (jde-db-get-package)
+				    (file-name-sans-extension
+				     (file-name-nondirectory (buffer-file-name))))
+			  (read-string "Java class to debug: "))))
+	      main-class))
+	   (cmd-set (oref debugger cmd-set))
+	   (launch-cmd (oref cmd-set launch-app)))
+
+
+      (jde-db-create-debuggee-app debugger application-main-class)
+
+      (if (not (oref debugger running-p))
+	  (jde-db-debugger-start debugger))
+
+      (oset-default 'jde-db-debugger the-debugger debugger)
+
+      ;; Forward to the debugger any breakpoint requests made
+      ;; by the user before launching the application.
+      (if jde-db-breakpoints
+	  (let ((bp-cmd (oref (oref debugger cmd-set) set-bp)))
+	    (oset
+	     bp-cmd
+	     breakpoints
+	     (mapcar (lambda (assoc-x) (cdr assoc-x)) jde-db-breakpoints))
+	    (jde-db-exec-cmds debugger (list launch-cmd bp-cmd)))
+	(jde-db-exec-cmd debugger launch-cmd)))))
+
+(defun jde-debugger-running-p ()
+  "Returns nonnil if the debugger is running."
+  (or
+   (and
+    (string= (car jde-debugger) "JDEbug")
+    (jde-dbs-debugger-running-p)
+    (jde-dbs-get-target-process))
+   (let ((debugger
+	  (if (slot-boundp (jde-db-get-the-debugger) 'the-debugger)
+	      (oref (jde-db-get-the-debugger) the-debugger))))
+    (and debugger
+	 (oref debugger running-p)))))
+
+(defun jde-debug-applet-init (applet-class applet-doc-path)
+  (let* ((debugger (jde-db-get-the-debugger))
+	 (cmd-set (oref debugger cmd-set))
+	 (launch-cmd (oref cmd-set launch-applet))
+	 (debug-buf-name (concat "*debug-" applet-class "*"))
+	 (applet-doc (file-name-nondirectory applet-doc-path))
+	 (applet-doc-directory (file-name-directory applet-doc-path))
+	 (source-directory default-directory)
+	 (working-directory
+	  (if applet-doc-directory
+	      applet-doc-directory
+	    source-directory)))
+
+    (jde-db-create-debuggee-applet debugger applet-doc-path)
+
+    (oset-default 'jde-db-debugger the-debugger debugger)
+
+    ;; Forward to the debugger any breakpoint requests made
+    ;; by the user before launching the application.
+    (if jde-db-breakpoints
+	(let ((bp-cmd (oref (oref debugger cmd-set) set-bp)))
+	  (oset
+	   bp-cmd
+	   breakpoints
+	   (mapcar (lambda (assoc-x) (cdr assoc-x)) jde-db-breakpoints))
+	  (jde-db-exec-cmds debugger (list launch-cmd bp-cmd)))
+      (jde-db-exec-cmd debugger launch-cmd))))
+
+
+
+
+(defun jde-debug-applet-internal (applet-doc)
+  (let ((applet-class jde-run-application-class))
+    (if (or
+	 (not applet-class)
+	 (string= applet-class ""))
+	(setq applet-class
+	      (concat (jde-db-get-package)
+		      (file-name-sans-extension
+		       (file-name-nondirectory (buffer-file-name))))))
+    (jde-debug-applet-init applet-class  applet-doc)))
+
+;;;###autoload
+(defun jde-debug-applet (&optional doc)
+  "Runs an applet in the jdb debugger. This function prompts you to enter
+the path of an html document that displays the applet. If you
+do not enter a path, this function next checks
+whether `jde-run-applet-doc' specifies a document. If so, it displays
+that specified document. Next, it checks whether the current directory
+contains any html files. If so, it displays the first html file that
+it finds. If if cannot find an html file, it signals an error.  This
+function runs appletviewer in jdb to permit debugging. On startup, it
+sets a breakpoint in the init method of the class specified by
+`jde-run-application-class' or in the class corresponding to the Java
+file in the current buffer."
+  (interactive
+   (let ((insert-default-directory nil))
+     (list (read-file-name "Applet doc: " nil nil nil jde-run-applet-last-doc))))
+  (setq jde-run-applet-last-doc doc)
+  (let ((applet-doc-path
+	 (if doc
+	     doc
+	   (if (and jde-run-applet-doc
+		    (not (string= jde-run-applet-doc "")))
+	       jde-run-applet-doc
+	     (car (jde-run-find-html-files))))))
+    (if applet-doc-path
+	(jde-debug-applet-internal applet-doc-path)
+      (signal 'error "Could not find html document to display applet."))))
+
+
+
+(defun jde-debug-run ()
+  "Start the current debuggee application."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status running-p))
+	(error "Application %s is already running."
+	       (oref debuggee main-class))
+      (let* ((cmd-set (oref debugger cmd-set))
+	     (run (oref cmd-set run)))
+	(oset debuggee-status running-p t)
+	(oset debuggee-status stopped-p nil)
+	(oset debuggee-status suspended-p nil)
+	(jde-db-exec-cmd debugger run)))))
+
+
+(defun jde-debug-cont ()
+  "Continues the current debuggee application from its current
+stopping point."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (or
+	      (oref debuggee-status stopped-p)
+	      (oref debuggee-status suspended-p)))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (cont (oref cmd-set cont)))
+	  (oset debuggee-status stopped-p nil)
+	  (oset debuggee-status suspended-p nil)
+	  (jde-db-exec-cmd debugger cont))
+      (let ((class (oref debuggee main-class)))
+	(message "Application %s is not stopped" class)))))
+
+
+(defun jde-debug-quit ()
+  "Quit debugging the current application."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status running-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (quit (oref cmd-set quit)))
+	  (jde-db-exec-cmd debugger quit))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not running" class)))))
+
+(defun jde-debug-step-over ()
+  "Step to the next line in the current stack frame."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (step-over (oref cmd-set step-over)))
+	  (oset debuggee-status stopped-p nil)
+	  (jde-db-exec-cmd debugger step-over))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-debug-step-into ()
+  "Step to the next line in the current program."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (step-into (oref cmd-set step-into)))
+	  (oset debuggee-status stopped-p nil)
+	  (jde-db-exec-cmd debugger step-into))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-debug-step-out ()
+  "Continue execution to the end of the current method."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (step-out (oref cmd-set step-out)))
+	  (oset debuggee-status stopped-p nil)
+	  (jde-db-exec-cmd debugger step-out))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+
+(defun jde-debug-up ()
+  "Move up the stack."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (up (oref cmd-set up)))
+	  (jde-db-exec-cmd debugger up))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-debug-down ()
+  "Move down the stack."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (down (oref cmd-set down)))
+	  (jde-db-exec-cmd debugger down))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-debug-where ()
+  "Show current stopping point."
+  (interactive)
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       (where (oref cmd-set where)))
+	  (jde-db-exec-cmd debugger where))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-db-spec-breakpoint ()
+  "Creates a specification for the breakpoint at the
+current line in the current file. Returns an object of
+type `jde-db-breakpoint'."
+  (let ((file (buffer-file-name)))
+    (setq jde-db-breakpoint-id-counter
+	  (1+ jde-db-breakpoint-id-counter))
+    (jde-db-breakpoint
+     (format "breakpoint: %s %d"
+	     (file-name-nondirectory file)
+	     jde-db-breakpoint-id-counter)
+     :id   jde-db-breakpoint-id-counter
+     :file file
+     :class (concat (jde-db-get-package)
+		    (jde-db-get-class)))))
+
+
+(defun jde-debug-set-breakpoint ()
+  "Ask debugger to set a breakpoint at the current line
+in the current buffer."
+  (interactive)
+  (let* ((file (buffer-file-name))
+	 (line (jde-get-line-at-point))
+	 (bp (jde-db-find-breakpoint file line)))
+    (unless bp
+      (setq bp (jde-db-spec-breakpoint))
+      (oset bp line line)
+      (jde-db-breakpoints-add bp)
+      (if (jde-db-debuggee-running-p)
+	  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+		 (bp-cmd (oref (oref debugger cmd-set) set-bp)))
+	    (oset bp-cmd breakpoints (list bp))
+	    (jde-db-exec-cmd debugger bp-cmd))))))
+
+(defun jde-debug-clear-breakpoint()
+  "Clear the breakpoint at the current line in the current buffer."
+  (interactive)
+  (jde-assert-source-buffer)
+  (let* ((file (buffer-file-name))
+	 (line (jde-get-line-at-point))
+	 (bp (jde-db-find-breakpoint file line)))
+    (if bp
+	(if (jde-db-debuggee-running-p)
+	    (let* ((debugger (oref 'jde-db-debugger the-debugger))
+		   (bp-cmd (oref (oref debugger cmd-set) clear-bp)))
+	      (oset bp-cmd breakpoints (list bp))
+	      (jde-db-exec-cmd debugger bp-cmd))
+	  (jde-db-delete-breakpoint bp)))))
+
+(defun jde-debug-toggle-breakpoint ()
+  "Sets or clears a breakpoint at the current line."
+  (interactive)
+  (assert (eq major-mode 'jde-mode) nil
+	  "This command works only in a Java source buffer.")
+  (let*  ((file (buffer-file-name))
+	  (line (jde-get-line-at-point))
+	  (bp (jde-db-find-breakpoint file line)))
+    (assert (jde-db-src-dir-matches-file-p file) nil
+	    "You cannot set a breakpoint in a file that is not in `jde-sourcepath'.")
+    (if bp
+	(jde-debug-clear-breakpoint)
+      (jde-debug-set-breakpoint))))
+
+(defun jde-debug-clear-breakpoints()
+  "Clear all existing breakpoints."
+  (interactive)
+  (if jde-db-breakpoints
+      (if (jde-db-debuggee-running-p)
+	  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+		 (bp-cmd (oref (oref debugger cmd-set) clear-bp)))
+	    (oset
+	     bp-cmd
+	     breakpoints
+	     (mapcar
+	      (lambda (assoc-x) (cdr assoc-x))
+	      jde-db-breakpoints))
+	    (jde-db-exec-cmd debugger bp-cmd))
+	(loop for bp-assoc in jde-db-breakpoints do
+	      (let ((bp (cdr bp-assoc)))
+		(jde-db-delete-breakpoint bp))))))
+
+
+(defvar jde-db-minibuffer-local-map nil
+  "Keymap for minibuffer prompting of jdb startup command.")
+(if jde-db-minibuffer-local-map
+    ()
+  (setq jde-db-minibuffer-local-map (copy-keymap minibuffer-local-map))
+  (define-key
+    jde-db-minibuffer-local-map "\C-i" 'comint-dynamic-complete-filename))
+
+
+(defun class-from-file-name (file-name)
+  (file-name-sans-extension (file-name-nondirectory file-name)))
+
+
+(defun jde-db-get-vm-args-from-user ()
+  (if jde-db-read-vm-args
+      (jde-run-parse-args
+       (read-from-minibuffer
+	"Vm args: "
+	(car jde-db-interactive-vm-arg-history)
+	nil nil
+	'jde-db-interactive-vm-arg-history))))
+
+(defun jde-db-get-app-args-from-user ()
+  (if jde-db-read-app-args
+      (jde-run-parse-args
+       (read-from-minibuffer
+	"Application args: "
+	(car jde-db-interactive-app-arg-history)
+	nil nil
+	'jde-db-interactive-app-arg-history))))
+
+
+(defun jde-db-get-package ()
+  "Return the package of the class whose source file resides in the current
+buffer."
+  (save-excursion
+    (goto-char (point-min))
+    (if (re-search-forward "^[ \t]*\\<\\(package\\) +\\([^ \t\n]*\\) *;" (point-max) t)
+	(concat (buffer-substring-no-properties (match-beginning 2) (match-end 2))
+		"."))))
+
+(defun jde-db-get-class () "Lookups and return fully qualified class
+name, e.g. A$B if point is in inner class B of A."
+  (interactive)
+  (let ((class-info (jde-parse-get-innermost-class-at-point)))
+    (if class-info
+      (save-excursion
+	(goto-char (cdr class-info))
+	(let ((parent (jde-db-get-class)))
+	(if (not parent)
+	    (car class-info)
+	    (concat parent "$" (car class-info))))))))
+
+
+(defun jde-db-src-dir-matches-file-p (file)
+  "Return true if one of `jde-sourcepath'
+matches FILE."
+  (let* ((directory-sep-char ?/)
+	 (filename (jde-normalize-path file)))
+    (find-if
+     (lambda (dir-x)
+       (string-match
+	(concat
+	 "^"
+	 (jde-normalize-path
+	  dir-x
+	  'jde-sourcepath))
+	filename))
+     jde-sourcepath)))
+
+(provide 'jde-db)
+
+;;; End of jde-db.el
diff --git a/site/jdee/lisp/jde-db.elc b/site/jdee/lisp/jde-db.elc
new file mode 100644
index 0000000..567fd96
Binary files /dev/null and b/site/jdee/lisp/jde-db.elc differ
diff --git a/site/jdee/lisp/jde-dbo.el b/site/jdee/lisp/jde-dbo.el
new file mode 100644
index 0000000..b7cb6f5
--- /dev/null
+++ b/site/jdee/lisp/jde-dbo.el
@@ -0,0 +1,576 @@
+;;; jde-dbo.el -- JDEbug output functions
+;; $Id: jde-dbo.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;; The latest version of the JDE is available at
+;; <URL:http://jdee.sourceforge.net/>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at paulk@mathworks.com.
+
+;;; Code:
+
+(require 'eieio)
+(jde-require 'tree-widget)
+(require 'jde-widgets)
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-bug-local-variables)
+(defvar jde-bug-stack-info)
+(defvar jde-bug-raise-frame-p)
+
+
+(defclass jde-dbo-thread ()
+  ((id      :initarg :id)
+   (name    :initarg :name)
+   (state   :initarg :state)
+   (status  :initarg :status))
+  "Process thread.")
+
+(defun jde-dbo-make-thread-obj (thread-spec)
+  (jde-dbo-thread "thread"
+		  :id     (nth 1 thread-spec)
+		  :name   (nth 2 thread-spec)
+		  :state  (nth 3 thread-spec)
+		  :status (nth 4 thread-spec)))
+
+
+(defun jde-dbo-command-result (id &rest args)
+"Returns the result of normally executing command specified by ID.
+The result consists of a list whose first element is the command ID,
+whose second element is the symbol `normal' to indicate a normal
+result and whose remaining element is a list of optional result data."
+ (list id 'normal args))
+
+(defun jde-dbo-command-error (id &rest args)
+"Returns a command error result. The result consists of list whose first
+element is the command's id, whose second element is the symbol `error'
+ to indicate that an error occured and whose third element is a list
+of optional error data."
+ (list id 'error args))
+
+(defun jde-dbo-command-result-id (result)
+  (nth 0 result))
+
+(defun jde-dbo-command-succeeded-p (result)
+  (equal (nth 1 result) 'normal))
+
+(defun jde-dbo-command-result-data (result)
+  (nth 2 result))
+
+(defun jde-dbo-report-ids-in-use (id-count)
+  (message "%d object ids in use." id-count))
+
+(defun jde-dbo-init-debug-session ()
+  (oset jde-dbs-the-debugger started-p t))
+
+(defun jde-dbo-debug (debug-info)
+  (message "Debug message: %s" debug-info))
+
+(defun jde-dbo-spec-resolved (proc-id spec-id)
+  "Notifies resolution of breakpoint, watchpoint, or
+exception spec."
+  (let* ((proc (jde-dbs-get-process proc-id))
+	 (bpspec (if proc (jde-dbs-proc-get-bpspec proc spec-id)))
+	 (bp (if bpspec (oref bpspec breakpoint)))
+	 (file (if bp (oref bp file)))
+	 (line (if bp (jde-db-breakpoint-get-line bp))))
+    (and proc file line
+	 (progn
+	   (oset bp status 'active)
+	   (jde-db-mark-breakpoint-active file line)
+	   (jde-dbs-proc-display-debug-message
+	    proc
+	    (format "Resolved breakpoint set in %s at line %s." file line))))))
+
+(defun jde-dbo-error (proc-id message)
+  (jde-dbs-display-debug-message proc-id message))
+
+(defun jde-dbo-message (proc-id message)
+  (jde-dbs-display-debug-message proc-id message))
+
+
+(defun jde-dbo-unknown-exception (exception)
+  (jde-dbs-proc-display-debug-message
+   (jde-dbs-get-target-process) exception))
+
+(defun jde-dbo-vm-start-event (process-id process-status process-state)
+  (let* ((process (jde-dbs-get-process process-id))
+	 (thread-id (nth 1 process-state))
+	 (thread-name (nth 2 process-state))
+	 (state (nth 3 process-state))
+	 (reason (nth 4 process-state)))
+    (if process
+	(let ((state-info (oref process state-info)))
+	  (jde-dbs-proc-state-info-set state-info state reason thread-id thread-name)
+	  (oset process startupp t)
+	  (jde-dbs-proc-display-debug-message process "vm started...")
+	  (cond
+	   ((string= process-status "all")
+	    (jde-dbs-proc-display-debug-message process "All threads suspended...")))
+	  ;; Sometimes the debugger is tardy responding to a launch command and thus the JDE thinks the
+	  ;; process is dead. In this case, move the process back to the registry and
+	  ;; make it the target process.
+	  (when (jde-dbs-proc-set-contains-p jde-dbs-the-process-morgue process)
+	    (jde-dbs-proc-move-to-registry process)
+	    (oset jde-dbs-the-process-registry :target-process process)))
+      (message "Start Event Error: can't find process object for process id %d" process-id))))
+
+(defun jde-dbo-break (process state-info state reason thread-id thread-name
+			      message proc-id class file line-no)
+  (jde-dbs-proc-state-info-set state-info state reason
+			       thread-id thread-name)
+  (setq jde-dbo-current-process process)
+  (setq jde-dbo-current-thread-id thread-id)
+  (if jde-bug-local-variables
+    (jde-dbo-update-locals-buf process
+			       thread-id 0))
+  (if jde-bug-stack-info (jde-dbo-update-stack process thread-id))
+  (oset process steppablep t)
+  (jde-dbs-display-debug-message proc-id message)
+  (jde-db-set-debug-cursor class file line-no)
+  (when jde-bug-raise-frame-p (raise-frame)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Breakpoint Event Handler                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar jde-dbo-locals-open-nodes nil
+  "List of name of tree nodes opened.")
+
+(defun jde-dbo-locals-open-p (node-name)
+  "Return non-nil if NODE-NAME is the name of an open tree node."
+  (member node-name jde-dbo-locals-open-nodes))
+
+(defun jde-dbo-locals-update-open-nodes (tree)
+  "Update the list of open nodes `jde-dbo-locals-open-nodes'.
+Called after each folding/unfolding of the `tree-widget' TREE.
+See also the hook `tree-widget-after-toggle-fucntions'."
+  (let ((node-name (widget-get tree :node-name))
+	(open      (widget-get tree :open)))
+    (if open
+	(add-to-list 'jde-dbo-locals-open-nodes node-name)
+      (setq jde-dbo-locals-open-nodes
+	    (delete node-name jde-dbo-locals-open-nodes)))))
+
+
+(defun jde-dbo-update-locals-buf (process thread frame)
+  (let* ((cmd (jde-dbs-get-locals
+	      "get locals"
+	      :process process
+	      :thread-id thread
+	      :stack-frame-index frame))
+	 (locals (jde-dbs-cmd-exec cmd))
+	 var)
+
+    (save-excursion
+      (set-buffer (oref process locals-buf))
+      (kill-all-local-variables)
+      (let ((inhibit-read-only t))
+	(erase-buffer))
+
+      (if jde-xemacsp
+	  (map-extents (lambda (extent ignore)
+		 (delete-extent extent)
+		 nil))
+	(let ((all (overlay-lists)))
+	  (mapcar 'delete-overlay (car all))
+	  (mapcar 'delete-overlay (cdr all))))
+
+      (make-local-hook 'tree-widget-after-toggle-functions)
+      (add-hook 'tree-widget-after-toggle-functions
+		'jde-dbo-locals-update-open-nodes nil t)
+
+      (goto-char (point-min))
+
+      ;; Insert the this object for this stack frame.
+      (let* ((cmd (jde-dbs-get-this
+		   "get this"
+		   :process process
+		   :thread-id thread
+		   :stack-frame-index frame))
+	     (this-obj (jde-dbs-cmd-exec cmd)))
+	(if (not (typep this-obj 'jde-dbs-java-null))
+	    (progn
+	      (let* ((id (oref this-obj :id))
+		     (open (concat "this" (number-to-string id))))
+	      (widget-create 'jde-widget-java-obj
+			     :tag "this"
+			     :node-name open
+			     :open (jde-dbo-locals-open-p open)
+			     :process process
+			     :object-id (oref this-obj :id))))))
+
+      ;; Insert the local variables for this stack frame.
+      (dolist (local-var locals)
+	(jde-dbo-view-var-in-buf (oref local-var value)
+				 (oref local-var name) process
+				 'jde-dbo-locals-open-p (current-buffer))))))
+
+(defun jde-dbo-update-stack (process thread-id)
+  (let* ((cmd  (jde-dbs-get-thread "get_thread"
+				   :process process
+				   :thread-id thread-id))
+	 (thread-info (jde-dbs-cmd-exec cmd))
+	 (stack (nth 5 thread-info)))
+    (oset process :stack stack)
+    (oset process :stack-ptr 0)))
+
+(defvar jde-dbo-current-process nil "Used to keep track of the process
+used in the last breakpoint hit event, and watch point hit event.")
+
+(defvar jde-dbo-current-thread-id nil "Used to keep track of the thread id
+used in the last breakpoint hit event, and watch point hit event.")
+
+(defun jde-dbo-breakpoint-hit-event (process-id process-status process-state spec-id location a2 a3)
+  (let ((process (jde-dbs-get-process process-id)))
+    (if process
+	(let ((class (nth 0 location))
+	      (file (nth 1 location))
+	      (line-no (nth 2 location))
+	      (thread-id (nth 1 process-state))
+	      (thread-name (nth 2 process-state))
+	      (state (nth 3 process-state))
+	      (reason (nth 4 process-state))
+	      (state-info (oref process state-info)))
+	  (if state-info
+	      (jde-dbo-break process state-info state reason thread-id
+			     thread-name
+			     (format "Breakpoint hit at line %d in %s (%s) on thread %s. All threads suspended." line-no class file thread-name)
+			     process-id class file line-no)
+	    (message "Breakpoint hit event error: state info object missing for process %d." process-id)))
+      (message "Breakpoint hit event error: process object for process %d is missing." process-id))))
+
+(defun jde-dbo-step-event (proc-id status process-state location)
+  "Handler for step events."
+  (let ((process (jde-dbs-get-process proc-id)))
+    (if process
+	(let ((class (nth 0 location))
+	      (file (nth 1 location))
+	      (line-no (nth 2 location))
+	      (thread-id (nth 1 process-state))
+	      (thread-name (nth 2 process-state))
+	      (state (nth 3 process-state))
+	      (reason (nth 4 process-state))
+	      (state-info (oref process state-info)))
+	  (if state-info
+	    (jde-dbo-break process state-info state reason thread-id
+			   thread-name
+			   (format "Stepped to line %d in %s (%s) on thread %s. All threads suspended."
+				   line-no class file thread-name)
+			   proc-id class file line-no)
+	    (message "Step event error: state info missing for process %d" proc-id)))
+      (message "Step event error: could not find process %d." proc-id))))
+
+
+(defun jde-dbo-exception-event (proc-id status process-state spec-id exception-spec a3)
+  (let ((process (jde-dbs-get-process proc-id)))
+    (if process
+	(let ((exception-class (nth 0 exception-spec))
+	      (exception-object (nth 1 exception-spec))
+	      (thread-id (nth 1 process-state))
+	      (thread-name (nth 2 process-state))
+	      (state (nth 3 process-state))
+	      (reason (nth 4 process-state))
+	      (location (nth 5 process-state))
+	      (state-info (oref process state-info)))
+	  (if (not (equal status "none"))
+	    ;; Then it's a break, not a trace
+	    (let ((class (nth 1 (car location)))
+		  (file (nth 2 (car location)))
+		  (line-no (nth 3 (car location))))
+		  (if state-info
+		    (jde-dbo-break process state-info state reason thread-id
+				   thread-name
+				   (format "Exception encountered at line %d in %s (%s) on thread %s. All threads suspended."
+					   line-no class file thread-name)
+				   proc-id class file line-no)
+		    (message "Exception event error: state info missing for process %d" proc-id)))
+	  (jde-dbs-display-debug-message
+	   proc-id
+	   (format "Exception of class %s occurred on thread %s"
+			 exception-class thread-name)))))))
+
+
+(defun jde-dbo-vm-disconnected-event (process-id process-status thread)
+  (let ((process (jde-dbs-get-process process-id)))
+    (when process
+	(jde-dbs-proc-display-debug-message process "vm disconnected...")
+	(setq overlay-arrow-position nil)
+	(jde-db-set-all-breakpoints-specified)
+	(jde-dbs-proc-set-state process "vm disconnected")
+	(when (jde-dbs-proc-set-contains-p jde-dbs-the-process-registry process)
+	  (jde-dbs-proc-move-to-morgue process)
+	  (slot-makeunbound jde-dbs-the-process-registry :target-process)))))
+
+(defun jde-dbo-invalid-break (process-id arg2 reason)
+  (jde-dbs-proc-display-debug-message
+   (jde-dbs-get-process process-id)
+   (concat "Invalid break error.\n  Reason: " reason)))
+
+(defun jde-dbo-vm-death-event (process-id process-status thread)
+  (let* ((process (jde-dbs-get-process process-id))
+	 (main-class (oref process main-class)))
+    (jde-dbs-proc-display-debug-message
+     process
+     (format "%s process ended." main-class))
+    (when (jde-dbs-proc-set-contains-p jde-dbs-the-process-registry process)
+      (jde-dbs-proc-move-to-morgue process)
+      (slot-makeunbound jde-dbs-the-process-registry :target-process))
+    (setq overlay-arrow-position nil)))
+
+(defclass jde-dbo-method ()
+  ((class    :initarg :class
+	     :type string)
+   (name     :initarg :name
+	     :type string)
+   (returns  :initarg :returns
+	     :type string)
+   (args     :initarg :args
+	     :type list)
+   (kind     :initarg :kind
+	     :type string))
+  "Method")
+
+(defmethod jde-dbo-to-string ((this jde-dbo-method))
+  (format "<%s %s.%s(%s)>"
+	  (oref this :returns)
+	  (oref this :class)
+	  (oref this :name)
+	  (mapconcat (lambda (x) x) (oref this :args) ",")))
+
+(defun jde-dbo-make-method (spec)
+  (let ((m
+	 (jde-dbo-method "method"
+			 :class   (nth 0 spec)
+			 :name    (nth 1 spec)
+			 :returns (nth 2 spec)
+			 :args    (nth 3 spec))))
+    (if (nth 4 spec)
+	(oset m :kind (nth 4 spec)))
+    m))
+
+(defun jde-dbo-class-prepare-event (process-id process-status thread-spec class-name)
+  (let* ((thread (jde-dbo-make-thread-obj thread-spec))
+	 (process (jde-dbs-get-process process-id)))
+    (jde-dbs-proc-display-debug-message
+     process
+     (format "Preparing class %s.\n  Thread: %s. Status: %s.\n"
+	     class-name
+	     (oref thread name)
+	     (oref thread status)))))
+
+(defun jde-dbo-class-unload-event (process-id process-status thread-spec class-name)
+  (let* ((thread (jde-dbo-make-thread-obj thread-spec))
+	 (process (jde-dbs-get-process process-id)))
+    (jde-dbs-proc-display-debug-message
+     process
+     (format "Unloading class %s.\n  Thread: %s. Status: %s.\n"
+	     class-name
+	     (oref thread name)
+	     (oref thread status)))))
+
+(defun jde-dbo-method-entry-event (process-id process-status thread-spec method-spec)
+  (let* ((thread (jde-dbo-make-thread-obj thread-spec))
+	 (method (jde-dbo-make-method method-spec))
+	 (method-sig (jde-dbo-to-string method))
+	 (process (jde-dbs-get-process process-id)))
+    (jde-dbs-proc-display-debug-message
+     process
+     (format "Entering %s.%s\n  Thread: %s\n  Signature: %s\n"
+	     (oref method class)
+	     (oref method name)
+	     (oref thread name)
+	     method-sig))))
+
+(defun jde-dbo-method-exit-event (process-id process-status thread-spec method-spec)
+  (let* ((thread (jde-dbo-make-thread-obj thread-spec))
+	 (method (jde-dbo-make-method method-spec))
+	 (method-sig (jde-dbo-to-string method))
+	 (process (jde-dbs-get-process process-id)))
+    (jde-dbs-proc-display-debug-message
+     process
+     (format "Exiting %s.%s\n  Thread: %s\n  Signature: %s\n"
+	     (oref method class)
+	     (oref method name)
+	     (oref thread name)
+	     method-sig))))
+
+(defun jde-dbo-watchpoint-hit-event (process-id process-status thread-spec request-id &rest data)
+  (let ((process (jde-dbs-get-process process-id)))
+    (if process
+	(let* ((thread (jde-dbo-make-thread-obj thread-spec))
+	       (thread-id (oref thread id))
+	       (thread-name (oref thread name))
+	       (thread-state (oref thread state))
+	       (thread-status (oref thread status))
+
+	       ;; Object whose field was accessed or modified.
+	       (obj-spec (nth 0 data))
+	       (obj-class (nth 0 obj-spec))
+	       (obj-id (nth 1 obj-spec))
+	       (obj-gc-flag  (nth 2 obj-spec))
+	       ;; Field that was accessed or modified.
+	       (field-spec (nth 1 data))
+	       (field-decl (nth 0 field-spec))
+	       (field-name (nth 0 field-decl))
+	       (field-type (nth 1 field-decl))
+	       (field-qual (if (> (length field-decl) 3) (nth 2 field-decl)))
+	       (field-value-type (nth 1 field-spec))
+	       (field-value (nth 2 field-spec))
+	       ;; Breakpoint data
+	       (breakpoint-spec (nth 2 data))
+	       (breakpoint-class (nth 0 breakpoint-spec))
+	       (breakpoint-file (nth 1 breakpoint-spec))
+	       (breakpoint-line (nth 2 breakpoint-spec))
+	       ;; Object match data
+	       (obj-match (nth 3 data))
+	       ;; Thread match data
+	       (thread-match (nth 4 data))
+	       ;; Expression true data
+	       (expression-true (nth 5 data)))
+
+	  (jde-dbs-proc-display-debug-message
+	   process
+	   (format "<%s:%s> accessed or modified at line %s in %s.\n  Watched field: %s %s %s = %s\n"
+		   obj-class obj-id breakpoint-line breakpoint-file
+		   (if field-qual field-qual "") field-type field-name field-value))
+
+	  (if (string= thread-status "suspended by debugger")
+	      (let ((state-info (oref process state-info)))
+		(if state-info
+		    (progn
+		      (jde-dbs-proc-state-info-set
+		       state-info thread-state
+		       thread-status thread-id thread-name)
+		      (setq jde-dbo-current-process process)
+		      (setq jde-dbo-current-thread-id thread-id)
+		      (if jde-bug-local-variables
+			  (jde-dbo-update-locals-buf process
+						     thread-id 0))
+		      (if jde-bug-stack-info (jde-dbo-update-stack process
+								   thread-id))
+		      (oset process steppablep t)
+		      (jde-db-set-debug-cursor breakpoint-class breakpoint-file
+					 breakpoint-line)
+		      (when jde-bug-raise-frame-p (raise-frame))
+
+		      (jde-dbs-display-debug-message
+		       process-id
+		       (format "Stopping at line %d in %s (%s) on thread %s."
+			       breakpoint-line breakpoint-class breakpoint-file thread-name)))
+		  (message "Watchpoint event error: state info object missing for process %d."
+			   process-id)))))
+      (message "Watchpoint event error: process object for process %d is missing." process-id))))
+
+
+(defun jde-dbo-event-set (process-id process-status thread &rest events)
+  "Invoked when a set of debugger events occurs. EVENTS is a list of
+lists. The first element is the name of a function that handles the event.
+The remaining elements are arguments to pass to the handler."
+   (mapc
+    (lambda (event)
+      (let ((handler (car event))
+	   (args (cdr event)))
+	(apply handler
+	       (append (list process-id process-status thread) args))))
+    events))
+
+(defun jde-dbo-view-var-in-buf (var-value name process open buf
+					  &optional clear)
+  "Create a tree-widget representing variable VAR-VALUE (a
+  jde-dbs-java-null/primitive/udci type), whose name is NAME and in
+  process PROCESS, and place that tree-widget in buffer BUF.  OPEN is
+  either a variable or a function.  If it is a variable, then the
+  tree-widget is open if true.  If it is a function, then the function
+  is called with name to return a true or false value (this is used
+  for caching the state). If CLEAR is true then the buffer is cleared
+  before creating the tree-widget."
+  (save-excursion
+    (set-buffer buf)
+    (when clear
+      (erase-buffer))
+    (let* ((var-tag (format "%s %s [id: %s]" (oref var-value jtype) name
+			   (if (or (typep var-value 'jde-dbs-java-primitive)
+				    (typep var-value 'jde-dbs-java-null))
+			     "-"
+			     (oref var-value id))))
+	  (openp (if (functionp open)
+		   (funcall open var-tag)
+		   open)))
+      (cond
+	((typep var-value 'jde-dbs-java-udci)
+	  (if (string= (oref var-value :jtype) "java.lang.String")
+	    (let* ((cmd (jde-dbs-get-string
+			 "get string"
+			 :process process
+			 :object-id (oref var-value id)))
+		   (str-val (jde-dbs-cmd-exec cmd)))
+	      (widget-create 'tree-widget
+			     :tag var-tag
+			     :node-name var-tag
+			     :open openp
+			     :value t
+			     (list 'tree-widget :tag str-val)))
+	    (widget-create 'jde-widget-java-obj
+			   :tag var-tag
+			   :node-name var-tag
+			   :open openp
+			   :process process
+			   :object-id (oref var-value :id))))
+	   ((typep var-value 'jde-dbs-java-array)
+	    (widget-create 'jde-widget-java-array
+			   :tag var-tag
+			   :node-name var-tag
+			   :open openp
+			   :process process
+			   :object var-value))
+	   ((typep var-value 'jde-dbs-java-primitive)
+	    (widget-create 'tree-widget
+			   :tag var-tag
+			   :node-name var-tag
+			   :open openp
+			   :value t
+			   (list 'tree-widget
+				 :tag (format "%s" (oref var-value value)))))
+	   ((typep var-value 'jde-dbs-java-null)
+	    (widget-create 'tree-widget :tag var-tag :value t
+			   (list 'tree-widget :tag "null")))
+	   (t
+	    (error "Unidentified type of variable: %s" var-tag))))
+    (use-local-map widget-keymap)
+    (widget-setup)))
+
+(provide 'jde-dbo)
+
+;; End of jde-dbo.el
diff --git a/site/jdee/lisp/jde-dbo.elc b/site/jdee/lisp/jde-dbo.elc
new file mode 100644
index 0000000..474c8de
Binary files /dev/null and b/site/jdee/lisp/jde-dbo.elc differ
diff --git a/site/jdee/lisp/jde-dbs.el b/site/jdee/lisp/jde-dbs.el
new file mode 100644
index 0000000..3ca06fa
--- /dev/null
+++ b/site/jdee/lisp/jde-dbs.el
@@ -0,0 +1,3344 @@
+;;; jde-dbs.el -- JDEbug Session Interface Functions
+;; $Id: jde-dbs.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;; The latest version of the JDE is available at
+;; <URL:http://jdee.sourceforge.net/>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at paulk@mathworks.com.
+
+;;; Code:
+
+(require 'regress)
+(require 'jde-dbo)
+(require 'jde-db)
+(require 'eieio)
+(require 'jde-widgets)
+(jde-require 'tree-widget)
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-bug-debug)
+(defvar jde-bug-debugger-command-timeout)
+(defvar jde-bug-debugger-host-address)
+
+
+;; Need jde-run only to get the definition for
+;; save-w32-show-window macro.
+(eval-when-compile
+  (require 'jde-run))
+
+(defcustom jde-bug-sio-connect-delay 1
+  "Length of time in seconds that the JDE waits
+before attempting to connect to the
+debuggee application's standard I/O. This delay
+is intended to give JDEbug time to create the
+SIO socket. Try increasing this variable if JDEbug
+hangs while launching an application. If your
+system never hangs, you can reduce this setting
+to 0 to eliminate the connection delay."
+  :group 'jde-bug
+  :type 'integer)
+
+(defvar jde-dbs-comint-filter nil
+  "Standard comint filter for debugger buffer.")
+
+(defvar jde-dbs-debugger-process-name "jdebug"
+"Name of debugger process.")
+
+(defun jde-dbs-get-debugger-process ()
+  (get-process jde-dbs-debugger-process-name))
+
+
+(defvar jde-dbs-debugger-output-buffer-name "*JDEbug Messages*"
+"Name of buffer used to display messages from the debugger.")
+
+(defvar jde-dbs-debugger-socket-process-name "jdebug-socket"
+"Name of debugger socket process.")
+
+(defvar jde-dbs-debugger-hook nil
+  "Hook to run when starting or stopping the debugger.
+The hook is run with a single argument which is non-nil when the
+debugger is starting and nil when it is quitting.")
+
+(defun jde-dbs-get-debugger-socket-process ()
+  (get-process jde-dbs-debugger-socket-process-name))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Process Set                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-set ()
+  ((proc-alist     :initarg :proc-alist
+		   :type list
+		   :initform nil
+		   :documentation
+		   "List of active debugee processes"))
+  "Class of debuggee process sets.")
+
+(defmethod jde-dbs-proc-set-add ((this jde-dbs-proc-set) process)
+  "Adds a process to this debuggee process set."
+  (oset this :proc-alist
+	(cons
+	 (cons (oref process :id) process)
+	 (oref this :proc-alist))))
+
+(defmethod jde-dbs-proc-set-remove ((this jde-dbs-proc-set) process)
+  (oset this :proc-alist
+	(remove-if
+	 (lambda (assoc-x)
+	   (let* ((xproc (cdr assoc-x))
+		  (xid (oref xproc id))
+		  (id (oref process id)))
+	     (equal xid id)))
+	 (oref this proc-alist))))
+
+(defmethod jde-dbs-proc-set-get-proc ((this jde-dbs-proc-set) id)
+  (cdr (assq id (oref this :proc-alist))))
+
+(defmethod jde-dbs-proc-set-find ((this jde-dbs-proc-set) field value)
+  "Finds the process in the set whose FIELD is equal to VALUE."
+  (if (slot-boundp this :proc-alist)
+      (cdr (find-if
+	(lambda (assoc-x)
+	  (let ((process-x (cdr assoc-x)))
+	    (equal (eieio-oref process-x field) value)))
+	(oref this :proc-alist)))))
+
+(defmethod jde-dbs-proc-set-contains-p ((this jde-dbs-proc-set) process)
+  (assq (oref process :id) (oref this :proc-alist)))
+
+(defmethod jde-dbs-proc-set-get-size ((this jde-dbs-proc-set))
+  "Gets the number of processes in this set."
+  (if (slot-boundp this 'proc-alist)
+      (length (oref this proc-alist))
+    0))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Process Registry                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-registry (jde-dbs-proc-set)
+  ((target-process :initarg :target-process
+		   :type jde-dbs-proc
+		   :documentation
+		   "Process that currently has the debugger command focus."))
+  "Class of process registries.")
+
+
+(defmethod jde-dbs-proc-registry-set-target-proc ((this jde-dbs-proc-registry) &optional id)
+  "Sets process specified by ID to be the target process. If ID is not specified, the first
+registered process becomes the target process"
+  (let ((target-process
+	  (if id
+	      (let ((process (jde-dbs-proc-set-get-proc this id)))
+		(if process
+		    (if (jde-dbs-proc-set-contains-p this process)
+			process
+		      (message "Error: process %s is dead." id)
+		      nil)
+		  (message "Error: process %s does not exist." id)
+		  nil))
+	    (let ((existing-processes
+		   (oref jde-dbs-the-process-registry :proc-alist)))
+	      (if existing-processes (cdr (nth 0 existing-processes)))))))
+    (when target-process
+      (oset this target-process target-process)
+      (set-window-configuration (oref target-process win-cfg)))
+    target-process))
+
+
+(defvar jde-dbs-the-process-registry
+  (jde-dbs-proc-registry "Process Registry")
+  "The debuggee process registry.")
+
+(defun jde-dbs-get-target-process ()
+  (and jde-dbs-the-process-registry
+       (slot-boundp jde-dbs-the-process-registry :target-process)
+       (oref jde-dbs-the-process-registry :target-process)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Process Morgue                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-morgue (jde-dbs-proc-set) ()
+  "Class of process morgues. A process morgue contains dead or dying processes.
+Their carcasses must be kept around until the debugger stops sending messages
+concerning them." )
+
+(defmethod jde-dbs-proc-morgue-bury-the-dead ((this jde-dbs-proc-morgue))
+  (mapc
+   (lambda (dead-proc-assoc)
+     (let* ((dead-proc (cdr dead-proc-assoc))
+	    (cli-buffer (if (slot-boundp dead-proc 'cli-buf) (oref dead-proc cli-buf)))
+	    (msg-buffer (if (slot-boundp dead-proc 'msg-buf) (oref dead-proc msg-buf)))
+	    (locals-buffer (if (slot-boundp dead-proc 'locals-buf) (oref dead-proc locals-buf)))
+	    (threads-buffer (if (slot-boundp dead-proc 'threads-buf) (oref dead-proc threads-buf))))
+       (if cli-buffer (kill-buffer cli-buffer))
+       (if msg-buffer (kill-buffer msg-buffer))
+       (if locals-buffer (kill-buffer locals-buffer))
+       (if threads-buffer (kill-buffer threads-buffer))))
+   (oref this proc-alist))
+  (oset this proc-alist nil))
+
+
+(defvar jde-dbs-the-process-morgue
+  (jde-dbs-proc-morgue "Process Morgue")
+  "The JDE process morgue. This morgue contains processes that are dead or
+dying, for example, because they have been terminated by the user or the
+debugger. Their corpses must be kept around until it is clear they are dead and
+the debugger ceases sending messages concerning them.")
+
+
+(defun jde-dbs-get-process (id)
+"Get the process whose id is ID. This function looks first in the process registry
+and then in the process morgue for the process."
+  (let ((process
+	 (jde-dbs-proc-set-get-proc jde-dbs-the-process-registry id)))
+    (if (not process)
+	(setq process (jde-dbs-proc-set-get-proc jde-dbs-the-process-morgue id)))
+    process))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Process State Info                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-state-info ()
+  ((state       :initarg :state)
+   (reason      :initarg :reason)
+   (thread-id   :initarg :thread-id)
+   (thread-name :initarg :thread-name))
+  "Class of process state information objects.")
+
+
+(defmethod jde-dbs-proc-state-info-set ((this jde-dbs-proc-state-info)
+					state reason thread-id thread-name)
+  (oset this reason reason)
+  (oset this state state)
+  (oset this thread-id thread-id)
+  (oset this thread-name thread-name))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Breakpoint Specification                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-bpspec ()
+  ((id         :initarg :id
+	       :type integer
+	       :documentation
+	       "Id assigned to this breakpoint by the debugger.")
+   (breakpoint :initarg :breakpoint
+	       :type jde-db-breakpoint
+	       :documentation
+	       "Instance of `jde-db-breakpoint'.")
+   (resolved   :initarg :resolved))
+  (:allow-nil-initform t)
+  "Class of breakpoint specifications. A breakpoint specification contains
+process-specific information about a breakpoint")
+
+
+;; Defines a class of containers for breakpoint specs.
+;; Each container lists the process specs for breakpoints set in a
+;; particular process.
+
+(defun jde-dbs-proc-bpspecs-add (bpspecs bpspec)
+  "Adds BPSPEC to BPSPECS, a process's breakpoint spec list."
+  (cons
+   (cons (oref bpspec id) bpspec)
+   bpspecs))
+
+(defun jde-dbs-proc-bpspecs-remove (bpspecs bpspec)
+  "Removes BPSPEC from BPSPECS"
+  (remove-if (lambda (x)
+	       (equal (car x) (oref bpspec id) ))
+	     bpspecs))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Request Class                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-request ()
+  ((id                  :initarg :id
+			:type integer
+			:documentation
+			"Trace request id")
+   (suspend-policy      :initarg :suspend-policy
+			:type string
+			:initform "none"
+			:documentation
+			"Valid values are all (all threads), thread (current thread), or none")
+   (inclusion-filters   :initarg :inclusion-filters
+			:type list
+			:documentation
+			"List of regular expressions specifying classes to include in trace.")
+   (exclusion-filters   :initarg :exclusion-filters
+			:type list
+			:documentation
+			"List of regular expressions specifying classes to exclude from trace.")
+   (cancel-command      :initarg :cancel-command
+			:type string
+			:documentation
+			"Name of command used to cancel this request.")
+   )
+"Super class of trace requests."
+)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Method Request Class                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-methods-request (jde-dbs-trace-request)
+   ((trace-type         :initarg :trace-type
+			:type string
+			:initform "entry"
+			:documentation
+			"Entry or exit.")
+   (thread-restriction  :initarg :thread-restriction
+			:type string
+			:documentation
+			"Thread to trace."))
+   "Trace methods request."
+)
+
+(defmethod initialize-instance ((this jde-dbs-trace-methods-request) &rest fields)
+  "Constructor for objects of `jde-dbs-trace-methods-request' class."
+  (call-next-method)
+  (oset this cancel-command "cancel_trace_methods"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Classes Request Class                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-classes-request (jde-dbs-trace-request)
+   ((trace-type         :initarg :trace-type
+			:type string
+			:initform "preparation"
+			:documentation
+			"Valid values are preparation or unloading."))
+   "Trace classes request."
+)
+
+(defmethod initialize-instance ((this jde-dbs-trace-classes-request) &rest fields)
+  "Constructor for objects of `jde-dbs-trace-classes-request' class."
+  (call-next-method)
+  (oset this cancel-command "cancel_trace_classes"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Exceptions Request Class                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-exceptions-request (jde-dbs-trace-request)
+  ((exception-class    :initarg :exception-class
+		       :type string
+		       :documentation
+		       "Class of exceptions to trace. Can be a wild card pattern.")
+   (trace-type         :initarg :trace-type
+		       :type string
+		       :initform "both"
+		       :documentation
+			"Valid values are caught, uncaught, or both."))
+   "Trace exceptions request."
+)
+
+(defmethod initialize-instance ((this jde-dbs-trace-exceptions-request) &rest fields)
+  "Constructor for objects of `jde-dbs-trace-exceptions-request' class."
+  (call-next-method)
+  (oset this cancel-command "clear"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Watch Field Request Class                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-watch-field-request (jde-dbs-trace-request)
+  ((watch-type         :initarg :watch-type
+		       :type string
+		       :documentation
+		       "Valid values are \"access\" and \"modification\".")
+   (object-class       :initarg :object-class
+		       :type string
+		       :documentation
+		       "Class of object to watch. Can be a wild card pattern.")
+   (field-name         :initarg :field-name
+		       :type string
+		       :documentation
+			"Name of field to watch.")
+   (expression         :initarg :expression
+		       :type string
+		       :documentation
+		       "Boolean expression that must be satisfied to suspend execution.")
+   (object-id          :initarg :object-id
+		       :type string
+		       :documentation
+		       "Id of object to watch."))
+   "Watch field request."
+)
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debuggee Process Status                                                    ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc-status (jde-db-debuggee-status)
+   ((startup-p     :initarg :startupp
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "Non-nil if this process is in the startup state.")
+    (steppable-p  :initarg :steppablep
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "Non-nil if this process can be single-stepped."))
+  "Status of process being debugged with JDEbug.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debuggee Process Class                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-proc (jde-db-debuggee-app)
+  ((id            :initarg :id
+		  :type integer
+		  :documentation
+		  "Id assigned by the JDE.")
+   (cli-socket    :initarg :cli-socket
+		  :type integer
+		  :documentation
+		  "Number of socket used by the process's command line interface.")
+   (cli-buf       :initarg :cli-buf
+		  :type buffer
+		  :documentation
+		  "Buffer for the process's command-line interface.")
+   (msg-buf       :initarg :msf-buf
+		  :type buffer
+		  :documentation
+		  "Buffer used to display debugger output for this process")
+   (threads-buf   :initarg :threads-buf
+		  :type buffer
+		  :documentation
+		  "Buffer used to display threads.")
+   (locals-buf    :initarg :locals-buf
+		  :type buffer
+		  :documentation
+		  "Buffer used to display local variables.")
+   (startupp       :initarg :startupp
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "non-nil if this process is in the startup state.")
+   (suspendedp    :initarg :suspendedp
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "non-nil if this process has been suspended by the debugger.")
+   (steppablep    :initarg :steppablep
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "non-nil if this process can be single-stepped.")
+   (state-info    :initarg :state-info
+		  :type jde-dbs-proc-state-info
+		  :documentation
+		  "Process state information.")
+   (stack         :initarg :stack
+		  :type list
+		  :documentation
+		  "Lists stack frames for thread of current step or breakpoint.")
+   (stack-ptr     :initarg :stack-ptr
+		  :type integer
+		  :initform 0
+		  :documentation
+		  "Points to the current frame on the stack.")
+   (trace-req     :initarg :trace-req
+		  :type list
+		  :documentation
+		  "List of outstanding trace requests.")
+   (watch-req     :initarg :watch-req
+		  :type list
+		  :documentation
+		  "List of outstanding watch field requests.")
+   (object-refs   :initarg :object-refs
+		  :type list
+		  :initform nil
+		  :documentation
+		  "IDs of debuggee objects currently referenced by the debugger.")
+   (bpspecs       :initarg :bpspecs
+		  :type list
+		  :documentation
+		  "Breakpoints set in this process.")
+   (last-cmd      :initarg :last-cmd
+		  :type jde-dbs-cmd
+		  :documentation
+		  "Most recent command targeting this process.")
+   (win-cfg       :initarg :win-cfg
+		  :type window-configuration
+		  :documentation
+		  "Desired window configuration for this process.")
+   (attachedp     :initarg :attachedp
+		  :type boolean
+		  :initform nil
+		  :documentation
+		  "Non-nil if the debugger was attached to this process."))
+  (:allow-nil-initform t)
+  "Class of debuggee processes.")
+
+(defmethod initialize-instance ((this jde-dbs-proc) &rest fields)
+  "Constructor for objects of `jde-dbs-proc' class."
+  (call-next-method)
+
+  (if (not (slot-boundp this 'state-info))
+      (oset this state-info
+	    (jde-dbs-proc-state-info
+	     (format "State Info %d" (oref this id)))))
+
+  (assert (slot-boundp this 'main-class))
+  (assert (slot-boundp this 'id))
+
+  (oset this msg-buf (get-buffer-create
+		      (format "*Process %s(%d)*"
+			      (oref this main-class)
+			      (oref this id))))
+  (save-excursion
+    (set-buffer (oref this msg-buf))
+    (erase-buffer)
+    (goto-char (point-min))
+    (insert
+       (format "*** Debugger Output for Process %s(%d) ***\n\n"
+	       (oref this main-class)
+	       (oref this id))))
+
+  (oset this locals-buf (get-buffer-create
+			 (format "*%s(%d) Local Variables*"
+				 (oref this main-class)
+				 (oref this id))))
+
+  (oset this threads-buf (get-buffer-create
+			  (format "*%s(%d) Threads*"
+				  (oref this main-class)
+				  (oref this id)))))
+
+
+(defmethod jde-dbs-proc-set-state ((this jde-dbs-proc) state)
+  (let ((state-info (oref this state-info)))
+    (oset state-info state state)))
+
+(defmethod jde-dbs-proc-set-state-reason ((this jde-dbs-proc) reason)
+  (let ((state-info (oref this state-info)))
+    (oset state-info reason reason)))
+
+(defmethod jde-dbs-proc-get-state ((this jde-dbs-proc))
+  (oref (oref this state-info) state))
+
+(defmethod jde-dbs-proc-get-state-reason ((this jde-dbs-proc))
+  (oref (oref this state-info) reason))
+
+(defmethod jde-dbs-proc-display-debug-message ((this jde-dbs-proc)
+					       message
+					       &optional pop-buffer)
+  (let ((buffer
+	 (oref this msg-buf)))
+    (if buffer
+	(save-excursion
+	  (let ((source-window (selected-window))
+		(currbuffp (equal buffer (current-buffer)))
+		win)
+	    (if (not currbuffp) (other-window -1))
+	    (set-buffer buffer)
+	    (goto-char (point-max))
+	    (insert (concat message "\n"))
+	    (goto-char (point-max))
+	    (if (not currbuffp) (other-window 1))
+	    (if (and pop-buffer (one-window-p))
+		(progn
+		  (setq win (split-window source-window))
+		  (set-window-buffer win buffer)))
+	    (if pop-buffer
+		(progn
+		  (set-window-buffer (next-window source-window) buffer)
+		  (select-window source-window))
+	      (if (not currbuffp)
+		  (message message))))))))
+
+(defmethod jde-dbs-proc-move-to-morgue ((this jde-dbs-proc))
+  "Moves this process from the process registry to the process morgue."
+  (jde-dbs-proc-set-remove jde-dbs-the-process-registry this)
+  (jde-dbs-proc-set-add jde-dbs-the-process-morgue this))
+
+(defmethod jde-dbs-proc-move-to-registry ((this jde-dbs-proc))
+  "Moves this process from the registry to the morgue."
+  (jde-dbs-proc-set-remove jde-dbs-the-process-morgue this)
+  (jde-dbs-proc-set-add jde-dbs-the-process-registry this))
+
+
+(defmethod jde-dbs-proc-get-bpspec ((this jde-dbs-proc) bp)
+  "Gets the process specification for a breakpoint. BP may be either
+an instance of `jde-db-breakpoint' or the debugger-assigned id
+for the breakpoint."
+  (if (slot-boundp this 'bpspecs)
+      (let ((bpspecs (oref this bpspecs)))
+	(if (and (object-p bp) (jde-db-breakpoint-p bp))
+	    (let* ((jde-id (oref bp id)))
+	      (cdr
+	       (find-if
+		(lambda (assoc-x)
+		  (let ((spec (cdr assoc-x)))
+		    (equal (oref (oref spec breakpoint) id) jde-id)))
+		bpspecs)))
+	  (cdr (assoc bp bpspecs))))))
+
+(defmethod jde-dbs-proc-runnable-p ((this jde-dbs-proc))
+  (or
+   (oref this startupp)
+   (oref this suspendedp)
+   (oref this steppablep)))
+
+(defun jde-dbs-target-process-runnable-p ()
+  (interactive)
+  (let ((target (jde-dbs-get-target-process)))
+    (and target (jde-dbs-proc-runnable-p target))))
+
+(defun jde-dbs-target-process-steppable-p ()
+  (interactive)
+  (let ((target (jde-dbs-get-target-process)))
+    (and target (oref target steppablep))))
+
+(defun jde-dbs-display-debug-message (proc-id message)
+  (let ((process (jde-dbs-get-process proc-id)))
+    (if process
+	(jde-dbs-proc-display-debug-message process message)
+      (message message))))
+
+(defvar jde-dbs-proc-counter 0
+  "Process counter. Used to generate process IDs.")
+
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (put 'test-jde-dbs-proc 'regression-suite t)
+  (setq test-jde-dbs-proc
+   '("test-jde-dbs-proc"
+     ;; Each test in the suite is of the form:
+     ;;   ([description] probe grader)
+     ;;   DESCRIPTION - string
+     ;;   PROBE -  a sexp which runs the actual test
+     ;;   GRADER - the desired result or a sexp which determines
+     ;;   how we did
+     ("Test creation of a jde-dbs-proc instance"
+      (jde-dbs-proc
+       (format "process%d" 100) :id 100 :main-class "jmath.Test")
+      :test t)
+     )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java Object                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-java-obj ()
+  ((jtype  :initarg :jtype
+	   :type string
+	   :documentation
+	  "Type of this object."))
+  "Superclass of Java objects.")
+
+(defmethod jde-dbs-java-obj-to-string ((this jde-dbs-java-obj))
+  "")
+
+
+(defclass jde-dbs-java-primitive (jde-dbs-java-obj)
+  ((value :initarg :value
+	  :type (or string number)
+	  :documentation
+	  "Value of this primitive object."))
+  "Class of Java primitives.")
+
+(defmethod jde-dbs-java-obj-to-string ((this jde-dbs-java-primitive))
+  (format "%s" (oref this value)))
+
+(defclass jde-dbs-java-null (jde-dbs-java-obj) ()
+  "Java null object.")
+
+(defmethod initialize-instance ((this jde-dbs-java-null) &rest fields)
+  "Constructor for run process command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this jtype "null"))
+
+
+(defmethod jde-dbs-java-obj-to-string ((this jde-dbs-java-null))
+  "null")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java Variable                                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-java-variable ()
+  ((name         :initarg :name
+		 :type string
+		 :documentation
+		 "Name of this variable")
+   (jtype        :initarg :jtype
+		 :type string
+		 :documentation
+		 "Type of this variable.")
+   (value        :initarg :value
+		 :type jde-dbs-java-obj
+		 :documentation
+		 "Value of this variable."))
+  "Class that defines the JDE's representation of a Java variable.")
+
+(defmethod jde-dbs-java-variable-to-string ((this jde-dbs-java-variable))
+  (format "%s %s = %s"
+	  (oref this jtype)
+	  (oref this name)
+	  (jde-dbs-java-obj-to-string (oref this value))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java Class Instance                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-java-class-instance (jde-dbs-java-obj)
+  ((id           :initarg :id
+		 :type integer
+		 :documentation
+		 "Id assigned to this object by the debugger.")
+   (gc-flag      :initarg :gc-flag
+		 :type boolean
+		 :documentation
+		 "t if this object has been garbage collected."))
+  "Instance of a Java class accessed via the debugger.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java Array                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-java-array (jde-dbs-java-class-instance)
+  ((length     :initarg :length
+	       :type integer
+	       :documentation
+	       "Length of this array.")
+   (elements   :initarg :elements
+	       :type list
+	       :initform nil
+	       :documentation
+	       "Elements of this array."))
+  "Class of Lisp objects representing instances of Java arrays.")
+
+
+
+(defmethod jde-dbs-java-obj-to-string ((this jde-dbs-java-array))
+  (let ((str (format "<%s:%d%s> %d"
+		     (if (slot-boundp this :jtype)
+			 (oref this jtype))
+		     (if (slot-boundp this :id)
+			 (oref this id))
+		     (if (slot-boundp this :gc-flag)
+			 (if (oref this gc-flag) ":gc" ""))
+		     (if (slot-boundp this :length)
+			 (oref this length)
+		       0)))
+	(elements (if (slot-boundp this :elements)
+		      (oref this elements))))
+    (if elements
+	(let ((sep "\n |- "))
+	  (concat
+	   str
+	   sep
+	   (mapconcat
+	    (lambda (element)
+	      (jde-dbs-java-obj-to-string element))
+	    elements sep)))
+      str)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java User-Defined Class Instance                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-java-udci (jde-dbs-java-class-instance)
+  ((fields       :initarg :fields
+		 :type list
+		 :initform nil
+		 :documentation
+		 "Fields of this object."))
+  "Class of Lisp objects representing instances of user-defined Java classes.")
+
+
+(defmethod jde-dbs-java-udci-add-field ((this jde-dbs-java-udci) field)
+  (oset this fields
+	(nconc (oref this fields) (list (cons (oref field name) field)))))
+
+
+(defmethod jde-dbs-java-obj-to-string ((this jde-dbs-java-udci))
+  (let ((str (format "<%s:%d%s>"
+		     (oref this jtype)
+		     (oref this id)
+		     (if (oref this gc-flag) ":gc" "")))
+	(fields (oref this fields)))
+    (if fields
+	(let ((sep "\n |- "))
+	  (concat
+	   str
+	   sep
+	   (mapconcat
+	    (lambda (assoc-x)
+	      (jde-dbs-java-variable-to-string (cdr assoc-x)))
+	    fields sep)))
+      str)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debugger Class                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-debugger (jde-db-debugger)
+  ((comint-filter :initarg :comint-filter)
+   (started-p     :initarg :started-p
+		  :initform nil
+		  :type boolean
+		  :documentation
+		  "True if debugger started successfully."))
+  "Class of JDEbug debuggers.")
+
+(defmethod initialize-instance ((this jde-dbs-debugger) &rest fields)
+  "Constructor for JDEbug."
+  (oset this :name "JDEbug")
+  (oset this :buffer-name "*JDEbug*"))
+
+
+(defmethod jde-dbs-debugger-register-process-filter ((debugger jde-dbs-debugger) filter)
+  "Set the process filter for the debugger to FILTER."
+  (set-process-filter  (oref debugger process) filter))
+
+
+(defmethod jde-dbs-debugger-display-message ((debugger jde-dbs-debugger) message)
+  "Displays message in the debugger process buffer."
+ (let ((buffer
+	 (oref debugger buffer)))
+    (if buffer
+	(save-excursion
+	  (set-buffer buffer)
+	  (goto-char (process-mark (get-buffer-process buffer)))
+	  (insert-before-markers (concat message "\n"))))))
+
+(defmethod jde-dbs-debugger-start ((this jde-dbs-debugger))
+  "Starts the debugger."
+  (if (jde-dbs-debugger-running-p)
+      (progn
+	(message "An instance of the debugger is running.")
+	(pop-to-buffer (jde-dbs-get-app-buffer-name))
+	nil)
+    (let* ((debugger-buffer-name
+	      (oref this buffer-name))
+	     (debugger-buffer
+	      (let ((old-buf (get-buffer debugger-buffer-name)))
+		    (if old-buf (kill-buffer old-buf))
+		    (get-buffer-create debugger-buffer-name)))
+	     (win32-p (eq system-type 'windows-nt))
+	     (w32-quote-process-args ?\")
+	     (win32-quote-process-args ?\") ;; XEmacs
+	     (source-directory default-directory)
+	     (working-directory
+	      (if (and
+		   jde-run-working-directory
+		   (not (string= jde-run-working-directory "")))
+		  (jde-normalize-path 'jde-run-working-directory)
+		source-directory))
+	     (vm (oref (jde-run-get-vm) :path))
+	     (jde-java-directory
+	      (expand-file-name "java"
+	       (jde-find-jde-data-directory)))
+	     (vm-args
+		(let (args)
+		  (setq args
+			(append
+			 args
+			 (list
+			  "-classpath"
+			  (jde-build-classpath
+			       (list
+				 (expand-file-name
+				  (if jde-bug-debug "classes" "lib/jde.jar")
+				  jde-java-directory)
+				 (if (jde-bug-vm-includes-jpda-p)
+				   (jde-get-tools-jar)
+				   (expand-file-name
+				    "lib/jpda.jar" (jde-normalize-path
+						    'jde-bug-jpda-directory))))))))
+		  (if jde-bug-debug
+		      (setq args
+			    (append args
+			     (list "-Xdebug"
+				   "-Xnoagent"
+				   "-Xrunjdwp:transport=dt_socket,address=2112,server=y,suspend=n"))))
+		  (setq args (append args (list "jde.debugger.Main")))
+		  args))
+	     (command-string
+	      (concat
+	       vm " "
+	       (jde-run-make-arg-string
+		vm-args)
+	       "\n\n"))
+	     debugger-process)
+	(run-hook-with-args 'jde-dbs-debugger-hook t)
+	(oset this started-p nil)
+	(setq jde-dbs-debugger-output nil)
+
+
+	(save-excursion
+	  (set-buffer debugger-buffer)
+	  (erase-buffer)
+	  ;; Set working directory
+	  (if (and
+	       (file-exists-p working-directory)
+	       (file-directory-p working-directory))
+	      (cd working-directory)
+	    (error "Invalid working directory: %s" working-directory))
+	  (insert (concat "cd " working-directory "\n"))
+	  (insert command-string)
+	  (jde-run-mode))
+
+	(save-w32-show-window
+	 (comint-exec debugger-buffer debugger-buffer-name vm nil vm-args)
+	 (setq debugger-process (get-process debugger-buffer-name))
+	 (oset this process debugger-process)
+	 (oset this buffer debugger-buffer)
+	 (oset this comint-filter (process-filter debugger-process))
+	 (jde-dbs-debugger-register-process-filter this 'jde-dbs-asynch-output-listener)
+	 )
+
+	(cd source-directory)
+
+	(bury-buffer debugger-buffer)
+
+	(setq jde-dbs-proc-counter 0)
+
+	(setq jde-dbs-cmd-counter 0)
+
+	;; Wait for response from debugger
+	(if (not (accept-process-output debugger-process jde-bug-debugger-command-timeout 0))
+	    (progn
+	      (message "Error: debugger failed to start.")
+	      nil)
+	  (oref this started-p))
+
+	;; Create a process registry for registering debuggee processes
+	;; started by the debugger.
+	(setq jde-dbs-the-process-registry
+	      (jde-dbs-proc-registry "Process Registry"))
+
+	;; Create a registry for debuggee processes that have died but
+	;; still may be getting messages from the debugger.
+	(setq jde-dbs-the-process-morgue
+	      (jde-dbs-proc-morgue "Process Morgue")))))
+
+
+
+
+(defmethod jde-dbs-debugger-quit ((debugger jde-dbs-debugger))
+  (jde-dbs-do-command -1 "quit")
+  (run-hook-with-args 'jde-dbs-debugger-hook nil)
+  (slot-makeunbound debugger :process)
+  (slot-makeunbound debugger :buffer)
+  (slot-makeunbound debugger :comint-filter))
+
+(defun jde-dbs-debugger-running-p ()
+  "*Returns t if the debugger is running."
+  (and (slot-boundp jde-dbs-the-debugger 'buffer)
+       (oref jde-dbs-the-debugger started-p)
+       (comint-check-proc (oref jde-dbs-the-debugger buffer))))
+
+(defmethod jde-db-debugger-launch ((this jde-dbs-debugger) main-class)
+  "Launch the application whose main class is MAIN-CLASS in debug mode."
+  )
+
+(defvar jde-dbs-the-debugger (jde-dbs-debugger "JDEbug")
+  "The debugger.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDEbug Command Line Commands                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-cmd (jde-db-cmd)
+  ((process    :initarg :process
+	       :type jde-dbs-proc
+	       :documentation
+	       "Process that this command targets.")
+   (id         :initarg :id
+	       :type integer
+	       :documentation
+	       "Command id.")
+   (name       :initarg :name
+	       :type string
+	       :documentation
+	       "Name of command.")
+   (result     :initarg :result
+	       :documentation
+	       "Result of executing command.")
+   (data       :initarg :data
+	       :documentation
+	       "Data returned by command.")
+   (msg        :initarg :msg
+	       :type string
+	       :documentation
+	       "Message to display to user in debug buffer.")
+   )
+  "Super class of debugger commands.")
+
+
+(defmethod initialize-instance ((this jde-dbs-cmd) &rest fields)
+  "Constructor for debugger commands. Generates a unique id for this command."
+  (call-next-method)
+  (setq jde-dbs-cmd-counter (+ jde-dbs-cmd-counter 1))
+  (oset this id jde-dbs-cmd-counter))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-cmd))
+  "Creates the command line for this command by concatentating
+the process id, command id, and command name. If there is no
+process, specifies the process id as -1. Derived classes can
+extend this method to specify command arguments."
+  (let* ((process (oref this process))
+	 (process-id (if process (oref process id) -1))
+	 (command-id (oref this id))
+	 (command-name (oref this name)))
+    (format "%s %s %s" process-id command-id command-name)))
+
+(defvar jde-dbs-debugger-output nil
+  "Contains output from the debugger.")
+
+(defvar jde-dbs-command-reply nil
+  "Contains reply to a debugger command.")
+
+(defvar jde-dbs-pending-command 0
+"Number of the current command.")
+
+(defun jde-dbs-eval-debugger-output (lisp-form)
+  (condition-case error-desc
+      (eval (read lisp-form))
+    (error
+     (let* ((process (jde-dbs-get-target-process)))
+       (if process
+	   (jde-dbs-proc-display-debug-message
+	    process
+	    (concat
+	     "Error: evaluating debugger output caused a Lisp error.\n"
+	     "  See *messages* buffer for details.")))
+       (message "Error: evaluating output from the debugger caused a Lisp error.")
+       (message "Debugger output: %s." lisp-form)
+       (message "Lisp error: %s" error-desc)))))
+
+(defun jde-dbs-extract-exception (debugger-output)
+  (let ((lisp-form "")
+	(remainder "")
+	(output-length (length debugger-output))
+	(re "\\(.*Exception:.*[\n]\\)+\\(.*at[^\n]*[\n]\\)+"))
+    (if (string-match re debugger-output)
+	(let ((start (match-beginning 0))
+	      (end (match-end 0)))
+	  (setq lisp-form (format "(jde-dbo-unknown-exception \"%s\")"
+				  (substring debugger-output 0 end)))
+	  (if (< end output-length)
+	      (setq remainder (substring debugger-output end output-length))))
+      (setq remainder debugger-output))
+    (cons lisp-form remainder)))
+
+(defun jde-dbs-extract-lisp-form (debugger-output)
+"Extract first complete Lisp form from debugger output.
+Returns (FORM . REMAINDER) where FORM is the Lisp form
+or the null string and REMAINDER is the remainder of the
+debugger output following the Lisp form."
+  (let ((lisp-form "")
+	(remainder "")
+	(level 0)
+	in-string-p
+	in-escape-p
+	(curr-pos 1)
+	(output-length (length debugger-output))
+	command-end
+	lisp-form-end)
+    (setq
+     lisp-form-end
+     (catch 'found-lisp-form
+       ;; skip over any inital white space.
+       (string-match "^[\n\t ]*(" debugger-output)
+       (setq curr-pos (match-end 0))
+
+       (while (< curr-pos output-length)
+
+	 (cond
+
+	  ;; Current character = left slash (escape)
+	  ((equal (aref debugger-output curr-pos) ?\\)
+	   (if in-string-p
+	       (setq in-escape-p (not in-escape-p))))
+
+	  ;; Current character = quotation mark
+	  ((equal (aref debugger-output curr-pos) ?\")
+	   (if in-string-p
+	       (if in-escape-p
+		   (progn
+		     (setq in-escape-p nil)
+		     (setq in-string-p nil))
+		 (setq in-string-p nil))
+	     (setq in-string-p t)))
+
+	  ;; Current character = right paren
+	  ((and
+	    (not in-string-p)
+	    (equal (aref debugger-output curr-pos) ?\)))
+	   (if (= level 0)
+	       (throw 'found-lisp-form curr-pos)
+	     (setq level (1- level))
+	     (if (< level 0)
+		 (error "Error parsing debugger output.")))
+	   ;; (prin1 (format ") lev = %d pos = %d" level curr-pos) (current-buffer))
+	   )
+
+	  ;; Current character = left paren
+	  ((and
+	    (not in-string-p)
+	    (equal (aref debugger-output curr-pos) ?\()
+	       (setq level (1+ level)))
+	   ;; (prin1 (format "( lev = %d pos = %d" level curr-pos) (current-buffer))
+	   )
+	  (t
+	   (if in-escape-p
+	       (setq in-escape-p nil))))
+
+	 (setq curr-pos (1+ curr-pos)))
+
+       -1))
+    (if (> lisp-form-end 1)
+	(progn
+	  (setq lisp-form (substring debugger-output 0 (1+ lisp-form-end)))
+	  (when (< lisp-form-end (1- output-length))
+	    (setq remainder (substring debugger-output (1+ lisp-form-end) output-length))
+	    (if (string-match "(" remainder)
+		(setq remainder (substring remainder (string-match "(" remainder)))
+	      (setq remainder ""))))
+      (setq remainder debugger-output))
+    (cons lisp-form remainder)))
+
+(defun jde-dbs-reply-p (form)
+  "Returns t if FORM is a command response form."
+  (or
+   (string-match "jde-dbo-command-result" form)
+   (string-match "jde-dbo-command-error" form)))
+
+(defvar jde-dbs-reply-received nil
+"Value to let us know a reply to a command has been received")
+
+(defvar jde-dbs-pending-event-queue nil
+"Queue of events that occurred before receiving a reply to the last command.")
+
+(defun jde-dbs-command-reply-listener (process output)
+  "Listens for a reply to the command specified by
+`jde-dbs-pending-command'."
+  ;; (message "entering command reply listener")
+  (let* ((combined-output (concat jde-dbs-debugger-output output))
+	 (parsed-output
+	  (if (string-match "^[\n\t ]*(" combined-output)
+	      (jde-dbs-extract-lisp-form combined-output)
+	    (jde-dbs-extract-exception combined-output)))
+	 (form (car parsed-output))
+	 (remainder (cdr parsed-output)))
+
+    ;; (message "form: %s" form)
+    ;; (message "remainder: %s" remainder)
+
+    ;; Insert debugger output into the *JDEbug* buffer.
+    (funcall (oref jde-dbs-the-debugger  comint-filter)
+	 process output)
+
+    ;; Process the Lisp forms extracted from the debugger output.
+    (while (not (string= form ""))
+
+      (if (jde-dbs-reply-p form)
+
+	  ;; The current form is a reply to a debugger command.
+	  (progn
+	    (setq jde-dbs-command-reply form)
+	    (setq jde-dbs-reply-received t))
+
+	;; The form is an event. Postpone processing the event
+	;; until we receive a reply to the last command.
+	;; (message "   appending %s to pending event queue" form)
+	(setq jde-dbs-pending-event-queue
+	      (append jde-dbs-pending-event-queue (list form))))
+
+      ;; Extract the next Lisp form from the debugger output.
+      ;; The car of parsed-output is the next form. The cdr
+      ;; is the remaining unprocessed debugger output.
+      (setq parsed-output
+	    (jde-dbs-extract-lisp-form remainder))
+
+      (setq form (car parsed-output))
+      (setq remainder (cdr parsed-output))) ;; End of form processing loop.
+
+    (setq jde-dbs-debugger-output remainder)
+
+    (if (not jde-dbs-reply-received)
+	(when (not (accept-process-output process jde-bug-debugger-command-timeout 0))
+	    (message "No response to command %d. (process = %s; timeout = %s sec.)"
+		     jde-dbs-pending-command
+		     (if (jde-dbs-get-target-process)
+			 (oref (jde-dbs-get-target-process) id)
+		       "?")
+		     jde-bug-debugger-command-timeout)
+		    (setq jde-dbs-command-reply nil)))))
+
+(defun jde-dbs-asynch-output-listener (process output)
+  "Listens for asynchronous debugger output."
+  (let* ((combined-output (concat jde-dbs-debugger-output output))
+	 (parsed-output
+	  (if (string-match "^[\n\t ]*(" combined-output)
+	      (jde-dbs-extract-lisp-form combined-output)
+	    (jde-dbs-extract-exception combined-output)))
+	 (lisp-form (car parsed-output))
+	 (remainder (cdr parsed-output))
+	 events)
+
+    ;; (message "asynch form: %s" lisp-form)
+    ;; (message "asynch remainder: %s" remainder)
+
+    (funcall (oref  jde-dbs-the-debugger comint-filter)
+	     process output)
+    ;; Extract events from debugger output.
+    (while (not (string= lisp-form ""))
+      ;; (message "   evaluating %s" lisp-form)
+      ;; (jde-dbs-eval-debugger-output lisp-form)
+      (setq events (append events (list lisp-form)))
+      (setq parsed-output
+	    (jde-dbs-extract-lisp-form remainder))
+      (setq lisp-form (car parsed-output))
+      (setq remainder (cdr parsed-output)))
+    (setq jde-dbs-debugger-output remainder)
+    (if events
+	(mapc (lambda (event) (jde-dbs-eval-debugger-output event))
+	      events))))
+
+(defun jde-dbs-do-command (vm command)
+  "Posts the specified command to the debugger and returns its response."
+  (let* ((debugger-process
+	  (oref jde-dbs-the-debugger process))
+	 (previous-listener (process-filter debugger-process))
+	 cmd)
+    (setq jde-dbs-debugger-output "")
+    (setq jde-dbs-command-reply "")
+    (setq jde-dbs-reply-received nil)
+    (setq jde-dbs-pending-event-queue nil)
+    (setq jde-dbs-cmd-counter (+ jde-dbs-cmd-counter 1))
+    (setq jde-dbs-pending-command (number-to-string jde-dbs-cmd-counter))
+    (setq cmd (concat (number-to-string vm) " " jde-dbs-pending-command " " command "\n\n"))
+    (jde-dbs-debugger-display-message jde-dbs-the-debugger (concat "JDE> " cmd))
+    (set-process-filter debugger-process 'jde-dbs-command-reply-listener)
+    (process-send-string debugger-process cmd)
+    (when (not (accept-process-output debugger-process jde-bug-debugger-command-timeout 0))
+		(message "Error: debugger didn't respond to command:\n%s" cmd)
+		(setq jde-dbs-command-reply nil))
+    (set-process-filter debugger-process previous-listener)
+    (if jde-dbs-command-reply
+	(let ((result (jde-dbs-eval-debugger-output jde-dbs-command-reply)))
+	  ;; evaluate any events that occurred between issuance and
+	  ;; acknowledgement of this command
+	  (mapc (lambda (event) (jde-dbs-eval-debugger-output event))
+		jde-dbs-pending-event-queue)
+	  (setq jde-dbs-pending-event-queue nil)
+	  result))))
+
+
+
+(defvar jde-dbs-debugger-socket-number nil
+"Number of socket used to communicate with debugger.")
+
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-cmd)))
+
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-cmd)))
+
+
+(defmethod jde-dbs-cmd-display-response ((this jde-dbs-cmd))
+  (if (slot-boundp this 'msg)
+      (jde-dbs-proc-display-debug-message
+       (oref this process)
+       (oref this msg))))
+
+(defmethod jde-dbs-cmd-execute-pending-events ((this jde-dbs-cmd))
+  "Evaluate any events that occurred between issuance and
+   acknowledgement of this command"
+  (let ((events jde-dbs-pending-event-queue))
+    ;; Empty queue to avoid recursion if commands are executed
+    ;; as a result of processing these events.
+    (setq jde-dbs-pending-event-queue nil)
+    (mapc (lambda (event) (jde-dbs-eval-debugger-output event))
+		events)))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-cmd))
+  "Posts the specified command to the debugger and returns its response."
+  (let* ((debugger-process
+	  (oref jde-dbs-the-debugger process))
+	 (previous-listener (process-filter debugger-process))
+	 (target-process (oref this process))
+	 (command-line (format "%s\n" (jde-dbs-cmd-make-command-line this))))
+
+    (setq jde-dbs-debugger-output "")
+    (setq jde-dbs-command-reply "")
+    (setq jde-dbs-reply-received nil)
+    (setq jde-dbs-pending-event-queue nil)
+    (setq jde-dbs-pending-command (oref this id))
+
+    (if target-process (oset target-process last-cmd this))
+    (jde-dbs-debugger-display-message jde-dbs-the-debugger (concat "JDE> " command-line))
+    (set-process-filter debugger-process 'jde-dbs-command-reply-listener)
+    (process-send-string debugger-process command-line)
+    (process-send-string debugger-process "\n")
+
+    (when (not (accept-process-output debugger-process jde-bug-debugger-command-timeout 0))
+		(message "Error: debugger didn't respond to command:\n%s" command-line)
+		(setq jde-dbs-command-reply nil))
+
+    (process-send-string debugger-process "\n")
+
+    (set-process-filter debugger-process previous-listener)
+
+    (if jde-dbs-command-reply
+	(let ((result (jde-dbs-eval-debugger-output jde-dbs-command-reply)))
+
+	  (oset this :result result)
+
+	  (oset this :data (car (jde-dbo-command-result-data (oref this result))))
+
+	  (if (jde-dbo-command-succeeded-p result)
+	      (jde-dbs-cmd-success-action this)
+	    (jde-dbs-cmd-failure-action this))
+
+	  (jde-dbs-cmd-display-response this)
+
+	  (jde-dbs-cmd-execute-pending-events this)
+	  (oref this :result)))))
+
+(defvar jde-dbs-cmd-counter 0
+ "Count of the number of commands issued in this session.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Launch Process Command                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-launch-process (jde-dbs-cmd)
+  ((main-class  :initarg :main-class
+		:type string
+		:documentation
+		"Class containing this process's main method.")
+   (jre-home    :initarg :jre-home
+		:type string
+		:documentation
+		"Home directory of JRE used to launch this process.")
+   (vmexec     :initarg :vmexec
+		:type string
+		:initform "java"
+		:documentation
+		"Name of vm executable used to run process.")
+   (vm-args     :initarg :args
+		:type string
+		:initform ""
+		:documentation
+		"Command line arguments to be passed to vm's main method.")
+   (app-args    :initarg :app-args
+		:type string
+		:initform ""
+		:documentation
+		"Command line arguments to be passed to app's main method."))
+  "Command to launch a debuggee process.")
+
+(defun jde-dbs-get-app-buffer-name ()
+  (concat "*" (jde-run-get-main-class) "*"))
+
+(defmethod initialize-instance ((this jde-dbs-launch-process) &rest fields)
+  "Constructor for debugger commands. Generates a unique id for this command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "launch")
+
+  ;; You must specify a process to launch when constructing a launch command."
+  (assert (slot-boundp this :process))
+
+  ;; Set main class.
+  (if (not (slot-boundp this :main-class))
+    (oset this :main-class
+	  (oref (oref this :process) :main-class)))
+
+  ;; Set vm.
+  ;; (oset this vm (jde-dbs-choose-vm))
+
+  ;; Set vm args
+  (oset this vm-args
+	(concat (mapconcat (lambda (s) s) (jde-db-get-vm-args jde-dbs-the-debugger) " ")
+		" "
+		(mapconcat (lambda (s) s) (jde-db-get-vm-args-from-user) " ")))
+
+
+  ;; Set application arguments.
+  (oset this app-args
+	(concat
+	 (if jde-db-option-application-args
+	     (mapconcat (lambda (s) s) jde-db-option-application-args " ")
+	   "")
+	 " "
+	 (mapconcat (lambda (s) s) (jde-db-get-app-args-from-user) " "))))
+
+
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-launch-process))
+  "Creates the command line for the launch command."
+  (let ((cmd (format "-1 %s %s %s -vmexec %s"
+		     (oref this id)                    ;; cid
+		     (oref this name)                  ;; launch
+		     (oref (oref this process) id)     ;; pid
+		     (oref this vmexec))))
+
+    (if (slot-boundp this 'jre-home)
+	(setq cmd (concat cmd " -home " (oref this jre-home))))
+
+    (setq cmd
+	  (format "%s %s %s %s"
+		  cmd
+		  (oref this vm-args)            ;; vm args
+		  (oref this main-class)         ;; main class
+		  (oref this app-args)))         ;; command line args
+
+    (oset this msg
+	  (format "Launch command line:\n  %s %s %s %s\n"
+		  (oref this vmexec)
+		  (oref this vm-args)            ;; vm args
+		  (oref this main-class)         ;; main class
+		  (oref this app-args)))         ;; command line args
+    cmd))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-launch-process))
+  (call-next-method)
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (main-class (oref this main-class))
+	 (source-buffer (current-buffer))
+	 (cli-socket
+	  (car (jde-dbo-command-result-data (oref this result))))
+	 (cli-buffer-name
+	  (format "%s(%d) CLI" main-class (oref process id))))
+
+    (oset process cli-socket cli-socket)
+
+    ;; Connect to socket used by debugger to transport the
+    ;; standard I/O of the debuggee process.
+    (sleep-for jde-bug-sio-connect-delay)
+    (oset
+     process
+     cli-buf
+     (make-comint
+      cli-buffer-name
+      (cons jde-bug-debugger-host-address cli-socket)))
+
+    (oset this msg
+	  (format "%s\nEmacs connected to standard IO port %d for process %s."
+		  (oref this msg)
+		  cli-socket
+		  (oref this main-class)))
+
+    (pop-to-buffer (oref process msg-buf))
+    (pop-to-buffer source-buffer)
+    (pop-to-buffer source-buffer)
+    (oset process win-cfg (current-window-configuration))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-launch-process))
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (source-buffer (current-buffer)))
+    (oset this  msg
+	  (format "%s\nError: debugger unable to launch %s.\n  Reason: %s"
+		  (oref this msg)
+		  (oref this main-class)
+		  (oref this data)))
+      (split-window-vertically)
+      (pop-to-buffer (oref process msg-buf))
+      (pop-to-buffer source-buffer)
+      (oset process win-cfg (current-window-configuration))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Attach Shared Memory                                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-attach-shmem (jde-dbs-cmd)
+  ((process-name  :initarg :process-name
+		  :type string
+		  :documentation
+		  "Name of process to attach."))
+  "Attach debugger to a running process via shared memory.")
+
+(defmethod initialize-instance ((this jde-dbs-attach-shmem) &rest fields)
+  "Constructor for attach_shmem command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  (assert (slot-boundp this 'process-name))
+
+  ;; Set command name.
+  (oset this name "attach_shmem"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-attach-shmem))
+  "Creates the command line for the attach_shmem command."
+  (format "-1 %s %s %s %s"
+	  (oref this id)
+	  (oref this name)                 ;; command name
+	  (oref (oref this process) id)    ;; process id
+	  (oref this process-name)))       ;; process name
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-attach-shmem))
+  (call-next-method)
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (source-buffer (current-buffer)))
+    (oset process :attachedp t)
+    (oset process :startupp t)
+    (oset this msg  (format "Attached to process %s."
+			    (oref this process-name)))
+    (split-window-vertically)
+    (pop-to-buffer (oref process msg-buf))
+    (pop-to-buffer source-buffer)
+    (oset process win-cfg (current-window-configuration))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-attach-shmem))
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (source-buffer (current-buffer)))
+    (oset this  msg
+     (format "Error: cannot attach process %s.\n Reason: %s."
+		    (oref this process-name)
+		    (oref this data)))
+      (split-window-vertically)
+      (pop-to-buffer (oref process msg-buf))
+      (pop-to-buffer source-buffer)
+      (oset process win-cfg (current-window-configuration))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Attach Process via Socket                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-attach-socket (jde-dbs-cmd)
+  ((port  :initarg :port
+	  :type string
+	  :documentation
+	  "Name of port on which existing process is listening.")
+   (host  :initarg :host
+	  :type string
+	  :documentation
+	  "Name of host on which existing process is listening."))
+  "Attach debugger to a running process via a socket connection.")
+
+(defmethod initialize-instance ((this jde-dbs-attach-socket) &rest fields)
+  "Constructor for attach_socket command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  (assert (slot-boundp this 'port))
+
+  ;; Set command name.
+  (oset this name "attach_socket"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-attach-socket))
+  "Creates the command line for the attach_socket command."
+  (let ((cmd
+	 (format "-1 %s %s %s -port %s"
+	  (oref this id)
+	  (oref this name)                 ;; command name
+	  (oref (oref this process) id)    ;; process id
+	  (oref this port))))              ;; process name
+    (if (slot-boundp this 'host)
+	(setq cmd (format "%s -host %s" cmd (oref this host))))
+    cmd))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-attach-socket))
+  (call-next-method)
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	(source-buffer (current-buffer)))
+    (oset process attachedp t)
+    (oset process startupp t)
+    (oset this msg  (format "Attached to process on port %s of %s."
+			    (oref this port)
+			    (if (slot-boundp this 'host)
+				(oref this host)
+			      "local host")))
+    (split-window-vertically)
+    (pop-to-buffer (oref process msg-buf))
+    (pop-to-buffer source-buffer)
+    (oset process win-cfg (current-window-configuration))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-attach-socket))
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (source-buffer (current-buffer)))
+    (oset this  msg
+     (format "Error: cannot attach to process on port %s of %s.\n Reason: %s."
+	     (oref this port)
+	     (if (slot-boundp this 'host)
+		 (oref this host)
+	       "local host")
+	     (oref this data)))
+      (split-window-vertically)
+      (pop-to-buffer (oref process msg-buf))
+      (pop-to-buffer source-buffer)
+      (oset process win-cfg (current-window-configuration))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Listen for Process                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-listen-for-process (jde-dbs-cmd)
+  ((address   :initarg :address
+	      :type string
+	      :documentation
+	      "Address at which to listen for a debuggee process.")
+   (transport :initarg :transport
+	      :type string
+	      :initform "shmem"
+	      :documentation
+	      "Transport mechanism used to interact with debuggee process."))
+  "Listen for a process requesting debugger services.")
+
+(defmethod initialize-instance ((this jde-dbs-listen-for-process) &rest fields)
+  "Constructor for listen command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  (assert (slot-boundp this 'address))
+
+  (assert (not
+	   (and
+	    (not (eq system-type 'windows-nt))
+	    (string= (oref this transport) "shmem"))))
+
+  ;; Set command name.
+  (oset this name
+	(concat "listen_"
+		(oref this transport))))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-listen-for-process))
+  "Creates the command line for the listen command."
+  (format "-1 %s %s %s %s"
+	  (oref this id)
+	  (oref this name)                 ;; command name
+	  (oref (oref this process) id)    ;; process id
+	  (oref this address)))            ;; process address
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-listen-for-process))
+  (call-next-method)
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	(source-buffer (current-buffer)))
+    (oset this msg  (format "Listening for process at %s address: %s."
+			    (if (string= (oref this transport) "shmem")
+				"shared memory" "socket")
+			    (oref this address)))
+    (oset process startupp t)
+    (split-window-vertically)
+    (pop-to-buffer (oref process msg-buf))
+    (pop-to-buffer source-buffer)
+    (oset process win-cfg (current-window-configuration))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-listen-for-process))
+  (delete-other-windows)
+  (let* ((process (oref this process))
+	 (source-buffer (current-buffer)))
+    (oset this  msg
+     (format "Error: cannot listen for process at %s address: %s.\n Reason: %s."
+	     (if (string= (oref this transport) "shmem")
+		 "shared memory" "socket")
+	     (oref this address)
+	     (oref this data)))
+      (split-window-vertically)
+      (pop-to-buffer (oref process msg-buf))
+      (pop-to-buffer source-buffer)
+      (oset process win-cfg (current-window-configuration))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Run Process Command Class                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-run-process (jde-dbs-cmd) ()
+  "Run process command.")
+
+(defmethod initialize-instance ((this jde-dbs-run-process) &rest fields)
+  "Constructor for run process command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  ;; Set command name.
+  (oset this name "run"))
+
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-run-process))
+  (call-next-method)
+  (oset this msg (format "Running %s."
+			 (oref (oref this process)  main-class))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-run-process))
+  (oset this msg
+	(format "Error: unable to run %s..\n  Reason: %s."
+		(oref (oref this process) main-class)
+		(oref this result))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Finish Process Command Class                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-finish-process (jde-dbs-cmd) ()
+  "Finish process command.")
+
+(defmethod initialize-instance ((this jde-dbs-finish-process) &rest fields)
+  "Constructor for finish process command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this :process))
+
+  ;; Set command name.
+  (oset this name "finish"))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-finish-process))
+  "Executes the finish process command."
+  (let* ((process (oref this :process))
+	 (main-class (oref process :main-class))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(progn
+	  (jde-dbs-proc-display-debug-message process
+	   (concat "Terminating " main-class)))
+      (jde-dbs-proc-display-debug-message process
+       (concat "Error: debugger unable to terminate: "
+	       main-class
+	       ".\n  Reason: "
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Set Breakpoint Command Class                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-set-breakpoint (jde-dbs-cmd)
+  ((breakpoint    :initarg :breakpoint
+		  :type jde-db-breakpoint
+		  :documentation
+		  "Breakpoint specification."))
+  "Set breakpoint command.")
+
+(defmethod initialize-instance ((this jde-dbs-set-breakpoint) &rest fields)
+  "Constructor for set breakpoint command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+  (assert (oref this breakpoint))
+
+  ;; Set command name.
+  (oset this name "break absolute"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-set-breakpoint))
+  "Creates the command line for the set breakpoint command."
+  (let* ((bp-spec (oref this breakpoint))
+	 (file (file-name-nondirectory (oref bp-spec file)))
+	 (line (jde-db-breakpoint-get-line bp-spec)))
+    (format "%s %s %s"
+	    (call-next-method)
+	    file     ;; File
+	    line)))  ;; Line number
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-set-breakpoint))
+  (call-next-method)
+  (let*  ((process (oref this process))
+	  (bp-procid (oref this data))
+	  (bp-spec (oref this breakpoint))
+	  (file (oref bp-spec file))
+	  (line (jde-db-breakpoint-get-line bp-spec))
+	  (bpspec (jde-dbs-proc-bpspec "spec" :id bp-procid :breakpoint bp-spec))
+	  (bpspecs (if (slot-boundp process :bpspecs) (oref process :bpspecs))))
+    (if bpspecs
+	(oset process bpspecs (jde-dbs-proc-bpspecs-add bpspecs bpspec))
+      (oset process bpspecs (jde-dbs-proc-bpspecs-add nil bpspec)))
+    (oset this msg (format "Setting breakpoint at line %s in %s." line file))))
+
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-set-breakpoint))
+  (let* ((bp-spec (oref this breakpoint))
+	 (file (oref bp-spec file))
+	 (line (jde-db-breakpoint-get-line bp-spec)))
+    (oset this msg  (format "Error: cannot set breakpoint at line %s in file %s.\n  Reason:"
+			    file line (oref this data)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Clear Breakpoint Command Class                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-clear-breakpoint (jde-dbs-cmd)
+  ((breakpoint    :initarg :breakpoint
+		  :type jde-db-breakpoint
+		  :documentation
+		  "Breakpoint specification."))
+  "Set breakpoint command.")
+
+(defmethod initialize-instance ((this jde-dbs-clear-breakpoint) &rest fields)
+  "Constructor for clear breakpoint command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+  (assert (oref this breakpoint))
+
+  ;; Set command name.
+  (oset this name "clear"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-clear-breakpoint))
+  "Creates the command line for the clear breakpoint command."
+  (let* ((process (oref this process))
+	 (breakpoint (oref this breakpoint))
+	 (bpspec (jde-dbs-proc-get-bpspec process breakpoint))
+	 (bp-procid (oref bpspec id)))
+    (format "%s %s"              ;; PID CID clear BPID
+	    (call-next-method)
+	    bp-procid)))         ;; Id assigned by debugger to this breakpoint
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-clear-breakpoint))
+  "Execute clear breakpoint command."
+  (let* ((process (oref this process))
+	 (breakpoint (oref this breakpoint))
+	 (file (oref breakpoint file))
+	 (line (jde-db-breakpoint-get-line breakpoint))
+	 (proc-id (oref process id))
+	 (bpspec (jde-dbs-proc-get-bpspec process breakpoint)))
+    (if bpspec
+	(let ((bp-procid (oref bpspec id))
+	      (result (call-next-method)))
+	  (if (jde-dbo-command-succeeded-p result)
+	      (let ((bpspecs (oref process bpspecs)))
+		(oset process bpspecs
+		      (jde-dbs-proc-bpspecs-remove bpspecs bpspec))
+		(jde-dbs-proc-display-debug-message
+		 process
+		 (format "Cleared breakpoint at line %s in file %s" line file)))
+	    (jde-dbs-proc-display-debug-message
+	     process
+	     (format "Error: cannot clear breakpoint at line %s in file %s.\n Reason: %s."
+		     line file (car (jde-dbo-command-result-data result))))
+	    nil)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Step Over/Into/Out Command Class                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-dbs-step (jde-dbs-cmd)
+  ((step-type :initarg :step-type
+	      :type string
+	      :initform "over"
+	      :documentation
+	      "Type of step operation: over, into, into-all, out"))
+  "Step command.")
+
+(defmethod initialize-instance ((this jde-dbs-step) &rest fields)
+  "Constructor for step command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+
+  ;; Set command name.
+  (oset this name (concat "step " (oref this step-type))))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-step))
+  "Creates the command line for the step command."
+  (format "%s %d" (call-next-method)
+	  (oref (oref (oref this process) state-info) thread-id)))
+
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-step))
+  (oset this msg
+	(format "Error: unable to step %s.\n Reason: %s"
+		(oref this step-type) (oref this data))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Step Into Command Class                                                    ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defmethod jde-dbs-proc-step-into ((this jde-dbs-proc))
+  (let* ((proc-id (oref this id))
+	 (thread-id
+	  (oref (oref this state-info) thread-id))
+	 (result (jde-dbs-do-command proc-id  (format "step into %s" thread-id))))
+    (when (not (jde-dbo-command-succeeded-p result))
+      (jde-dbs-proc-display-debug-message this
+       (format "Error: unable to step into... .\n  Reason: %s"
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Step Out Command Class                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defmethod jde-dbs-proc-step-out ((this jde-dbs-proc))
+  (let* ((proc-id (oref this id))
+	 (thread-id
+	  (oref (oref this state-info) thread-id))
+	 (result (jde-dbs-do-command proc-id  (format "step out %s" thread-id))))
+    (when (not (jde-dbo-command-succeeded-p result))
+      (jde-dbs-proc-display-debug-message this
+       (format "Error: unable to step into... .\n  Reason: %s"
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Evaluate Command Class                                                     ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-evaluate (jde-dbs-cmd)
+  ((expression    :initarg :expression
+		  ;; :type string
+		  :documentation
+		  "Expression to be evaluate. Required.")
+   (thread-id     :initarg :thread-id
+		  ;; :type integer
+		  :documentation
+		  "Id of thread that scopes this expression. Required."))
+  "Evaluate expression command.")
+
+(defmethod initialize-instance ((this jde-dbs-evaluate) &rest fields)
+  "Constructor for evaluate command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+  (assert (oref this expression))
+  (assert (oref this thread-id))
+
+  ;; Set command name.
+  (oset this name "evaluate"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-evaluate))
+  "Creates the command line for the clear breakpoint command."
+    (format "%s %s 0 \"%s\""         ;; PID CID evaluate THREAD-ID 0 "EXPRESSION"
+	    (call-next-method)       ;; PID CID evaluate
+	    (oref this thread-id)    ;; thread id
+	    (oref this expression))) ;; expression to be evaluated.
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-evaluate))
+  "Execute evaluate expression command. Returns
+(TYPE VALUE GCFLAG) where TYPE is the type of the result,
+VALUE is the value, and GCFLAG is t if the result has been
+garbage collected."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(car (jde-dbo-command-result-data result))
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot evaluate \"%s\".\n Reason: %s."
+	       (oref this expression)
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Array                                                                  ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-array (jde-dbs-cmd)
+  ((array    :initarg :array
+	     :type jde-dbs-java-array
+	     :documentation
+	     "Object to represent the array. Required.")
+   (index    :initarg :index
+	     :type integer
+	     :documentation
+	     "Index of array slice to be returned.")
+   (length   :initarg :length
+	     :type integer
+	     :documentation "Length of slice to be returned."))
+  "Get a slice of the array object specified by ARRAY. INDEX and LENGTH are
+the index and length of the slice to be returned. If omitted, this command returns
+the length of the first slice of the array. Note that each element of this array
+can be another array or some other object.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-array) &rest fields)
+  "Constructor for get array command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this :process))
+  (assert (slot-boundp this :array))
+
+  (if (slot-boundp this :index)
+      (assert (slot-boundp this :length)))
+
+  ;; Set command name.
+  (oset this name "get_array"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-get-array))
+  "Creates the command line for the get-object command."
+  (let ((cl
+	 (format "%s %d" (call-next-method) (oref (oref this array) id)))
+	(index (if (slot-boundp this :index) (oref this :index))))
+    (if index
+	(setq cl
+	      (format "%s %d %d"                ;; PID CID get_array OBJ-ID INDEX LENGTH
+		      cl
+		      index                     ;; index of slice to be returned.
+		      (oref this length))))    ;; length of slice to be returned.
+    cl))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-array))
+  "Executes the get-array command. If a slice is specified,
+returns the slice as a list of elements. Otherwise, return
+the length of the array."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((array (oref this array))
+	       (data   (nth 0 (jde-dbo-command-result-data result)))
+	       (type (nth 0 data))
+	       (id (nth 1 data))
+	       (gc-flag (nth 2 data))
+	       (length (nth 3 data))
+	       (elements (if (> (length data) 4)
+			     (cdr (cdr (cdr (cdr data)))))))
+	  (or elements length)
+	  (oset array jtype type)
+	  (oset array id id)
+	  (oset array gc-flag gc-flag)
+	  (oset array length length)
+	  (oset array elements
+		(mapcar
+		 (lambda (element)
+		   (jde-dbs-objectify-value element))
+		 elements))
+	  array)
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot get array %d.\n Reason: %s."
+	       (oref this object-id)
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Abstract Get Object                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-abstract-get-object (jde-dbs-cmd)
+  ((object-id     :initarg :object-id
+		  :type integer
+		  :documentation
+		  "Id of object. Required."))
+  "Parent class of get object commands.")
+
+
+(defmethod initialize-instance ((this jde-dbs-abstract-get-object) &rest fields)
+  "Constructor for get-object command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this :process))
+  (assert (slot-boundp this :object-id)))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-abstract-get-object))
+  "Creates the command line for the get-object command."
+
+  (format "%s %d" (call-next-method) (oref this object-id)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Object                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-object (jde-dbs-abstract-get-object) ()
+  "Class of generic get-object commands. These commands return the fields of
+the object.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-object) &rest fields)
+  "Constructor for get-object command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "get_object"))
+
+(defun jde-dbs-objectify-value (value-form)
+  (let ((lvf        (length value-form))
+	(value-type (car value-form)))
+    (cond
+     ((and (= lvf 1) (string= value-type "null"))
+      (jde-dbs-java-null "null"))
+     ((= lvf 2)
+      (jde-dbs-java-primitive
+       "primitive"
+       :jtype  value-type
+       :value  (nth 1 value-form)))
+     ((= lvf 3)
+      (if (string-match "\\[\\]" value-type)
+	  (jde-dbs-java-array
+	   (format "array %d" (nth 1 value-form))
+	   :jtype value-type
+	   :id (nth 1 value-form)
+	   :gc-flag (nth 2 value-form))
+	(jde-dbs-java-udci
+	 (format "obj %d" (nth 1 value-form))
+	 :jtype    value-type
+	 :id       (nth 1 value-form)
+	 :gc-flag  (nth 2 value-form)))))))
+
+(defun jde-dbs-objectify-variable (variable-form)
+  (let* ((var-name   (car (car variable-form)))
+	 (var-type   (cdr (car variable-form)))
+	 (value-form (cdr variable-form))
+	 (value      (jde-dbs-objectify-value
+		      value-form)))
+    (jde-dbs-java-variable
+     (format "variable %s" var-name)
+     :name var-name
+     :jtype (mapconcat (lambda (x) x) (nreverse var-type) " ")
+     :value value)))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-object))
+  "Executes the get-object command. Returns a Lisp object of type
+`jde-dbs-java-class-instance' that represents the Java object."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((obj     (car (jde-dbo-command-result-data result)))
+	       (type    (nth 0 obj))
+	       (id      (nth 1 obj))
+	       (gc-flag (nth 2 obj))
+	       (fields  (if (> (length obj) 3)
+			    (nth 3 obj)))
+	       (object  (jde-dbs-java-udci
+			 (format "obj %d" id)
+			 :jtype type
+			 :id id
+			 :gc-flag gc-flag)))
+	  (if fields
+	      (mapc
+	       (lambda (variable-form)
+		 (let ((field
+			(jde-dbs-objectify-variable variable-form)))
+		   (jde-dbs-java-udci-add-field object field)))
+	       fields))
+	  object)
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot get object %d.\n Reason: %s."
+	       (oref this object-id)
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get String                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-string (jde-dbs-abstract-get-object) ()
+  "Get the value of a string object.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-string) &rest fields)
+  "Constructor for get-string command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "get_string"))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-string))
+  "Executes the get_string command. Returns the string."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(nth 3 (car (jde-dbo-command-result-data result)))
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot get string %d.\n Reason: %s."
+	       (oref this object-id)
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Locals                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-locals (jde-dbs-cmd)
+  ((thread-id         :initarg :thread-id
+		      :type integer
+		      :documentation
+		      "ID of thread whose local variables are being queried.")
+   (stack-frame-index :initarg :stack-frame-index
+		      :type integer
+		      :initform 0
+		      :documentation
+		      "Index of stack frame containing requested local variables."))
+  "Get variables local to a specified thread and stack frame.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-locals) &rest fields)
+  "Constructor for get-string command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this 'thread-id))
+
+  ;; Set command name.
+  (oset this name "get_locals"))
+
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-get-locals))
+  "Creates the command line for the get-locals command."
+  (format "%s %d %d"
+	  (call-next-method)
+	  (oref this thread-id)
+	  (oref this stack-frame-index)))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-locals))
+  "Executes the get-locals command. Returns a list of Lisp objects of type
+`jde-dbs-java-variable' that represents the local variables."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((variable-forms (car (jde-dbo-command-result-data result)))
+	       (variables      (if variable-forms
+				   (mapcar
+				    (lambda (variable-form)
+					(jde-dbs-objectify-variable variable-form))
+				    variable-forms))))
+	  variables)
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot get local variables.\n Reason: %s."
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get This                                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-this (jde-dbs-cmd)
+  ((thread-id         :initarg :thread-id
+		      :type integer
+		      :documentation
+		      "ID of thread of stack frame whose this object is required.")
+   (stack-frame-index :initarg :stack-frame-index
+		      :type integer
+		      :initform 0
+		      :documentation
+		      "Index of stack frame whose this object is required."))
+  "Get this object of a specified stack frame.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-this) &rest fields)
+  "Constructor for get_this command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this 'process))
+  (assert (slot-boundp this 'thread-id))
+  (assert (slot-boundp this 'stack-frame-index))
+
+  ;; Set command name.
+  (oset this name "get_this"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-get-this))
+  "Creates the command line for the get_this command."
+  (format "%s %d %d"
+	  (call-next-method)
+	  (oref this thread-id)
+	  (oref this stack-frame-index)))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-get-this))
+  (call-next-method)
+  (let ((this-obj (oref this :data)))
+    (oset
+     this
+     :result
+     (if (string= (nth 0 this-obj) "null")
+	 (jde-dbs-java-null "null")
+       (jde-dbs-java-udci
+	  "this object"
+	  :jtype (nth 0 this-obj)
+	  :id (nth 1 this-obj))))))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-get-this))
+ (oset
+  this
+  msg
+  (format
+   "Error: unable to get this object for stack frame %s on thread %d.\n Reason: %s."
+   (oref this stack-frame-index)
+   (oref this thread-id)
+   (oref this result))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Loaded Classes Command Class                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-loaded-classes (jde-dbs-cmd) ()
+  "Gets the classes loaded by a specified process.")
+
+(defmethod initialize-instance ((this jde-dbs-get-loaded-classes) &rest fields)
+  "Constructor for get_loaded_classes command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  ;; Set command name.
+  (oset this name "get_loaded_classes"))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-loaded-classes))
+  "Executes the get_loaded_classes command."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let ((classes (car (jde-dbo-command-result-data result))))
+	  (jde-dbs-proc-display-debug-message
+	   process
+	   (format "Loaded classes:\n  %s."
+		   (mapconcat (lambda (x) x) classes "\n  ")) t)
+	  t)
+      (jde-dbs-proc-display-debug-message process
+	     (format "Error: unable to list loaded classes.\n  Reason: %s."
+		     (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Path Info Command Class                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-path-info (jde-dbs-cmd) ()
+  "Gets the base directory, boot classpath, and classpath of the specified process.")
+
+(defmethod initialize-instance ((this jde-dbs-get-path-info) &rest fields)
+  "Constructor for get_path_information command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (oref this process))
+
+  ;; Set command name.
+  (oset this name "get_path_information"))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-path-info))
+  "Executes the get_path_info command."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((data (jde-dbo-command-result-data result))
+	       (base-dir (nth 0 data))
+	       (boot-classpath (nth 1 data))
+	       (classpath (nth 2 data)))
+	  (jde-dbs-proc-display-debug-message
+	   process
+	   (format (concat
+		    "\nPath information\n\n  Base directory:\n    %s\n\n  "
+		    "Boot classpath:\n    %s\n\n  Application Classpath:\n    %s\n")
+		   base-dir
+		   (mapconcat (lambda (x) x) boot-classpath "\n    ")
+		   (mapconcat (lambda (x) x) classpath "\n    ")))
+	  t)
+      (jde-dbs-proc-display-debug-message process
+	     (format "Error: unable to display path information.\n  Reason: %s."
+		     (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Threads                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-threads (jde-dbs-cmd) ()
+  "Get all the threads for this process.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-threads) &rest fields)
+  "Constructor for suspend-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "get_threads"))
+
+(defun jde-dbs-map-thread-to-tree (thread)
+  (list (quote tree-widget) :tag (concat (nth 2 thread) " thread")
+	:value nil
+	(list (quote tree-widget) :tag (concat "id: " (number-to-string (nth 1 thread))))
+	(list (quote tree-widget) :tag (concat "status: " (nth 3 thread)))
+	(list (quote tree-widget) :tag (concat "state: " (nth 4 thread)))
+	(jde-dbs-map-stack-to-tree (nth 5 thread))))
+
+
+(defun jde-dbs-map-threadgroup-to-tree (threadgroup)
+  (nconc
+   (list (quote tree-widget) :tag (concat (nth 2 threadgroup) " thread group")
+	:value nil)
+   (mapcar
+    (lambda (x)
+      (jde-dbs-map-thread-to-tree x))
+    (nth 3 threadgroup))
+   (mapcar
+    (lambda (x)
+      (jde-dbs-map-threadgroup-to-tree x))
+    (nth 4 threadgroup))))
+
+(defun jde-dbs-map-stack-to-tree (stack)
+  (nconc
+   (list (quote tree-widget) :tag "Stack")
+   (if (listp stack)
+       (mapcar
+	(lambda (x)
+	  (list (quote tree-widget) :tag
+		(format "%s.%s(%s:%s)" (nth 1 x) (nth 4 x) (nth 2 x)
+			(nth 3 x))))
+	stack))))
+
+(defun jde-dbs-map-threads-to-tree (threads)
+  (nconc
+   (list (quote tree-widget) :tag "Threads")
+	(mapcar
+	 (lambda (x)
+	   (if (string= (nth 0 x) "Thread")
+	       (jde-dbs-map-thread-to-tree x)
+	     (if (string= (nth 0 x) "ThreadGroup")
+		 (jde-dbs-map-threadgroup-to-tree x))))
+	 threads)))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-threads))
+  "Executes the get-threads command. Returns a list of thread information."
+  (let* ((process (oref this process))
+	 (result (call-next-method)))
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((thread-list (car (jde-dbo-command-result-data result)))
+	       (buf (oref process threads-buf)))
+	  (set-window-configuration (oref process win-cfg))
+	  (set-window-buffer
+	   (next-window
+	    (if (featurep 'xemacs)
+		(frame-highest-window)
+	      (frame-first-window)))
+	   buf)
+	  (set-buffer buf)
+	  (kill-all-local-variables)
+	  (let ((inhibit-read-only t))
+	    (erase-buffer))
+	  (if (not jde-xemacsp)
+	      (let ((all (overlay-lists)))
+		(mapcar 'delete-overlay (car all))
+		(mapcar 'delete-overlay (cdr all))))
+	  (apply 'widget-create (jde-dbs-map-threads-to-tree thread-list))
+	  (use-local-map widget-keymap)
+	  (widget-setup))
+      (jde-dbs-proc-display-debug-message
+       process
+       (format "Error: cannot get local variables.\n Reason: %s."
+	       (car (jde-dbo-command-result-data result))))
+      nil)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Thread                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-thread (jde-dbs-cmd)
+  ((thread-id     :initarg :thread-id
+		  :type integer
+		  :documentation
+		  "Id of thread to be queried."))
+  "Gets information about a thread, including the method call stack.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-thread) &rest fields)
+  "Constructor for suspend-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this 'process))
+  (assert (slot-boundp this 'thread-id))
+
+  ;; Set command name.
+  (oset this name "get_thread"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-get-thread))
+  "Creates the command line for the get_thread command."
+  (format "%s %d" (call-next-method) (oref this thread-id)))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-get-thread))
+  (call-next-method)
+  (oset this :result (oref this :data)))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-get-thread))
+ (oset this msg (format "Error: unable to get info for thread %d.\n Reason: %s."
+			(oref this thread-id)
+			(oref this result))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Get Object Monitors                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-get-object-monitors (jde-dbs-cmd)
+  ((object-id     :initarg :object-id
+		  :type integer
+		  :documentation
+		  "Id of object. Required."))
+  "Get threads that are monitoring the specified object.")
+
+
+(defmethod initialize-instance ((this jde-dbs-get-object-monitors) &rest fields)
+  "Constructor for get_object_monitors command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (assert (slot-boundp this :object-id))
+
+  ;; Set command name.
+  (oset this name "get_object_monitors"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-get-object-monitors))
+  "Creates the command line for the get_object_monitors command."
+
+  (format "%s %d" (call-next-method) (oref this object-id)))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-get-object-monitors))
+  "Executes the get_object_monitors command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 msg)
+    (if (jde-dbo-command-succeeded-p result)
+	(let* ((data (car (jde-dbo-command-result-data result)))
+	       (obj-id (nth 0 data))
+	       (obj-type (nth 1 data))
+	       (obj-gc (nth 2 data))
+	       (owner (nth 3 data))
+	       (waiting (nth 4 data)))
+
+	  (setq msg (format "\nThe following threads are monitoring <%s:%s>:\n"
+			    obj-type obj-id))
+
+	  (setq
+	   msg
+	   (concat
+	    msg
+	    "  Current owner:"
+	    (if (listp owner)
+		(concat
+		 "\n"
+		 "    Name:   " (nth 1 owner) "\n"
+		 "    Id:     " (nth 2 owner) "\n"
+		 "    Status: " (nth 3 owner) "\n"
+		 "    State:  " (nth 4 owner) "\n")
+	      (if (stringp owner)
+		  (concat " " owner)))))
+
+	  (if waiting
+	      (setq
+	       msg
+	       (concat
+		msg
+		"\n  Waiting threads:"
+		(if (listp waiting)
+		    (progn
+		      "\n"
+		      (mapconcat
+		      (lambda (thread)
+			(concat
+			 "    Name:   " (nth 1 thread) "\n"
+			 "    Id:     " (nth 2 thread) "\n"
+			 "    Status: " (nth 3 thread) "\n"
+			 "    State:  " (nth 4 thread) "\n"))
+		      waiting "\n"))
+		  (if (stringp waiting) (concat " " waiting "\n")))))))
+      (setq msg
+	    (format "Error: cannot get object monitors for  %d.\n Reason: %s."
+		    (oref this object-id)
+		    (car (jde-dbo-command-result-data result)))))
+    (jde-dbs-proc-display-debug-message process msg)
+    nil))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Suspend Thread                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-suspend-thread (jde-dbs-cmd)
+  ((thread-id     :initarg :thread-id
+		  :type integer
+		  :documentation
+		  "Id of thread or thread-group to be suspended. If omitted, all threads are suspended."))
+  "Suspend a thread of this process.")
+
+
+(defmethod initialize-instance ((this jde-dbs-suspend-thread) &rest fields)
+  "Constructor for suspend-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "suspend"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-suspend-thread))
+  "Creates the command line for the suspend_thread command."
+    (if (slot-boundp this 'thread-id)
+	(format "%s %d" (call-next-method) (oref this thread-id))
+      (call-next-method)))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-suspend-thread))
+  (call-next-method)
+  (if (slot-boundp this 'thread-id)
+	(oset this msg (format "Thread %d suspended." (oref this thread-id)))
+    (oset this msg "All threads suspended.")
+    (oset (oref this process) suspendedp t)))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-suspend-thread))
+ (oset this msg (format "Error: unable to suspend thread.\n Reason: %s."
+	       (oref this result))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Resume Thread                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-resume-thread (jde-dbs-cmd)
+  ((thread-id     :initarg :thread-id
+		  :type integer
+		  :documentation
+		  "Id of thread or thread-group to be resumed. If omitted, all threads are resumed."))
+  "Resume a thread of this process.")
+
+
+(defmethod initialize-instance ((this jde-dbs-resume-thread) &rest fields)
+  "Constructor for resume-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  ;; Set command name.
+  (oset this name "resume"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-resume-thread))
+  "Creates the command line for the resume_thread command."
+    (if (slot-boundp this 'thread-id)
+	(format "%s %d" (call-next-method) (oref this thread-id))
+      (call-next-method)))
+
+(defmethod jde-dbs-cmd-success-action ((this jde-dbs-resume-thread))
+  (call-next-method)
+  (if (slot-boundp this 'thread-id)
+	(oset this msg (format "Thread %d resumed." (oref this thread-id)))
+    (oset this msg "All threads resumed.")
+    (oset (oref this process) suspendedp nil)))
+
+(defmethod jde-dbs-cmd-failure-action ((this jde-dbs-resume-thread))
+  (oset this msg
+	(format "Error: unable to resume thread.\n Reason: %s."
+		(oref this result))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Stop Thread                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-stop-thread (jde-dbs-cmd)
+  ((thread-id     :initarg :thread-id
+		  :type integer
+		  :documentation
+		  "Id of thread to be stopped.")
+   (exception-id  :initarg :exception-id
+		  :type integer
+		  :documentation
+		  "Id of thread to be stopped."))
+  "Stops the specified thread in the target process and throw the specified
+exception. You can use the evaluate expression command to create the exception
+object.")
+
+
+(defmethod initialize-instance ((this jde-dbs-stop-thread) &rest fields)
+  "Constructor for stop-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (slot-boundp this 'thread-id))
+ (assert (slot-boundp this 'exception-id))
+
+  ;; Set command name.
+  (oset this name "stop"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-stop-thread))
+  "Creates the command line for the resume_thread command."
+
+  (format "%s %d %d" (call-next-method) (oref this thread-id)
+	  (oref this exception-id)))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-stop-thread))
+  "Executes the stop_thread command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result)))
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Thread %d stopped." (oref this thread-id))
+	   (format "Error: unable to stop thread %d.\n Reason: %s."
+		   (oref this thread-id)
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Interrupt Thread                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-interrupt-thread (jde-dbs-cmd)
+  ((thread-id     :initarg :thread-id
+		  :type integer
+		  :documentation
+		  "Id of thread to be interrupted."))
+  "Interrupt a thread of this process. An interrupted thread cannot be resumed.")
+
+
+(defmethod initialize-instance ((this jde-dbs-interrupt-thread) &rest fields)
+  "Constructor for suspend-thread command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (slot-boundp this 'thread-id))
+
+  ;; Set command name.
+  (oset this name "interrupt"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-interrupt-thread))
+  "Creates the command line for the interrupt_thread command."
+  (format "%s %d" (call-next-method) (oref this thread-id)))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-interrupt-thread))
+  "Executes the interrupt_thread command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result)))
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Thread %d interrupted." (oref this thread-id))
+	   (format "Error: unable to interrupt thread %d.\n Reason: %s."
+		   (oref this thread-id)
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Methods                                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-methods (jde-dbs-cmd)
+  ((trace-request  :initarg :trace-request
+		   :type jde-dbs-trace-methods-request
+		   :documentation
+		   "Trace method request."))
+  "Trace method entries or exits.")
+
+
+(defmethod initialize-instance ((this jde-dbs-trace-methods) &rest fields)
+  "Constructor for trace_methods command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (or
+	  (string= (oref (oref this trace-request) trace-type) "entry")
+	  (string= (oref (oref this trace-request) trace-type) "exit")))
+
+  ;; Set command name.
+  (oset this name "trace_methods"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-trace-methods))
+  "Creates the command line for the trace_methods command."
+  (let* ((request (oref this trace-request))
+	 (cmd (format "%s %s" (call-next-method) (oref request trace-type))))
+
+    (if (slot-boundp request 'thread-restriction)
+	(setq cmd (format "%s -tname %s" cmd (oref request thread-restriction))))
+
+    (if (slot-boundp request 'suspend-policy)
+	(setq cmd (format "%s -sp %s" cmd (oref request suspend-policy))))
+
+    (if (slot-boundp request 'inclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cf \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request inclusion-filters) " "))))
+
+    (if (slot-boundp request 'exclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cef \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request exclusion-filters) " "))))
+
+    cmd))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-trace-methods))
+  "Executes the trace_methods command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result))
+	 (request (oref this trace-request))
+	 (request-id (car (jde-dbo-command-result-data result))))
+
+    (when command-succeeded-p
+      (oset request id request-id)
+      (if (slot-boundp process 'trace-req)
+	  (oset
+	   process
+	   trace-req
+	   (nconc (oref process trace-req)
+		  (list (cons request-id request))))
+	(oset process trace-req (list (cons request-id request)))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Trace method %s enabled. Use request id %s to cancel."
+		     (oref request trace-type) request-id)
+	   (format "Error: unable to enable trace.\n Reason: %s."
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Classes                                                              ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-classes (jde-dbs-cmd)
+  ((trace-request  :initarg :trace-request
+		   :type jde-dbs-trace-classes-request
+		   :documentation
+		   "Trace classes request."))
+  "Trace class preparations or unloadings.")
+
+
+(defmethod initialize-instance ((this jde-dbs-trace-classes) &rest fields)
+  "Constructor for trace_classes command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (or
+	  (string= (oref (oref this trace-request) trace-type) "preparation")
+	  (string= (oref (oref this trace-request) trace-type) "unloading")))
+
+  ;; Set command name.
+  (oset this name "trace_classes"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-trace-classes))
+  "Creates the command line for the trace_methods command."
+  (let* ((request (oref this trace-request))
+	 (cmd (format "%s %s" (call-next-method) (oref request trace-type))))
+
+    (if (slot-boundp request 'suspend-policy)
+	(setq cmd (format "%s -sp %s" cmd (oref request suspend-policy))))
+
+    (if (slot-boundp request 'inclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cf \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request inclusion-filters) " "))))
+
+    (if (slot-boundp request 'exclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cef \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request exclusion-filters) " "))))
+
+    cmd))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-trace-classes))
+  "Executes the trace_classes command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result))
+	 (request (oref this trace-request))
+	 (request-id (car (jde-dbo-command-result-data result))))
+
+    (when command-succeeded-p
+      (oset request id request-id)
+      (if (slot-boundp process 'trace-req)
+	  (oset
+	   process
+	   trace-req
+	   (nconc (oref process trace-req)
+		  (list (cons request-id request))))
+	(oset process trace-req (list (cons request-id request)))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Trace class %s enabled. Use request id %s to cancel."
+		     (oref request trace-type) request-id)
+	   (format "Error: unable to enable trace.\n Reason: %s."
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Trace Exceptions                                                           ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-trace-exceptions (jde-dbs-cmd)
+  ((trace-request  :initarg :trace-request
+		   :type jde-dbs-trace-exceptions-request
+		   :documentation
+		   "Trace exceptions request."))
+  "Trace exceptions.")
+
+
+(defmethod initialize-instance ((this jde-dbs-trace-exceptions) &rest fields)
+  "Constructor for trace_exceptions command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (or
+	  (string= (oref (oref this trace-request) trace-type) "both")
+	  (string= (oref (oref this trace-request) trace-type) "caught")
+	  (string= (oref (oref this trace-request) trace-type) "uncaught")))
+
+  ;; Set command name.
+  (oset this name "trace_exceptions"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-trace-exceptions))
+  "Creates the command line for the trace_exceptions command."
+  (let* ((request (oref this trace-request))
+	 (cmd (format "%s %s %s"
+		      (call-next-method)
+		      (oref request exception-class)
+		      (oref request trace-type))))
+
+    (if (slot-boundp request 'suspend-policy)
+	(setq cmd (format "%s -sp %s" cmd (oref request suspend-policy))))
+
+    (if (slot-boundp request 'inclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cf \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request inclusion-filters) " "))))
+
+    (if (slot-boundp request 'exclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cef \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request exclusion-filters) " "))))
+
+    cmd))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-trace-exceptions))
+  "Executes the trace_exceptions command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result))
+	 (request (oref this trace-request))
+	 (request-id (car (jde-dbo-command-result-data result))))
+
+    (when command-succeeded-p
+      (oset request id request-id)
+      (if (slot-boundp process 'trace-req)
+	  (oset
+	   process
+	   trace-req
+	   (nconc (oref process trace-req)
+		  (list (cons request-id request))))
+	(oset process trace-req (list (cons request-id request)))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Trace exception %s enabled. Use request id %s to cancel."
+		     (oref request exception-class) request-id)
+	   (format "Error: unable to enable trace.\n Reason: %s."
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Cancel Trace Requests                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-cancel-trace (jde-dbs-cmd)
+  ((trace-request  :initarg :trace-request
+		   :type jde-dbs-trace-request
+		   :documentation
+		   "Trace request."))
+  "Cancel a trace request.")
+
+
+(defmethod initialize-instance ((this jde-dbs-cancel-trace) &rest fields)
+  "Constructor for cancel_trace command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (slot-boundp this 'trace-request))
+
+  ;; Set command name.
+ (oset this name (oref (oref this trace-request) cancel-command)))
+
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-cancel-trace))
+  "Creates the command line for the cancel_trace command."
+  (format "%s %s" (call-next-method) (oref (oref this trace-request) id)))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-cancel-trace))
+  "Executes the cancel_trace command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result)))
+
+    (if command-succeeded-p
+	(let* ((canceled-request-id (oref (oref this trace-request) id))
+	       (requests
+		(remove-if
+		 (lambda (r)
+		   (= (car r) canceled-request-id))
+		 (oref process trace-req))))
+	  (if requests
+	      (oset process trace-req requests)
+	    (slot-makeunbound process 'trace-req))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Canceled trace request %s."
+		     (oref (oref this trace-request) id))
+	   (format "Error: unable to cancel trace %s.\n Reason: %s."
+		   (oref (oref this trace-request) id)
+		   (car (jde-dbo-command-result-data result)))))
+
+    command-succeeded-p))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Watch Field                                                                ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-watch-field (jde-dbs-cmd)
+  ((watch-request  :initarg :watch-request
+		   :type jde-dbs-watch-field-request
+		   :documentation
+		   "Watch field request."))
+  "Watch a field of an object or a specified class of objects.")
+
+
+(defmethod initialize-instance ((this jde-dbs-watch-field) &rest fields)
+  "Constructor for watch field command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (let ((request (oref this watch-request)))
+
+    (assert (or
+	     (string= (oref request watch-type) "access")
+	     (string= (oref request watch-type) "modification")))
+
+    (assert (slot-boundp request 'object-class))
+    (assert (slot-boundp request 'field-name)))
+
+  ;; Set command name.
+  (oset this name "watch"))
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-watch-field))
+  "Creates the command line for the watch-field command."
+  (let* ((request (oref this watch-request))
+	 (cmd (format
+	       "%s %s %s %s"
+	       (call-next-method)
+	       (oref request object-class)
+	       (oref request field-name)
+	       (concat "for_" (oref request watch-type)))))
+
+    (if (slot-boundp request 'object-id)
+	(setq cmd (format "%s -oid %s" cmd (oref request object-id))))
+
+    (if (slot-boundp request 'expression)
+	(setq cmd (format "%s -if %s" cmd (oref request expression))))
+
+    (if (slot-boundp request 'suspend-policy)
+	(setq cmd (format "%s -sp %s" cmd (oref request suspend-policy))))
+
+    (if (slot-boundp request 'inclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cf \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request inclusion-filters) " "))))
+
+    (if (slot-boundp request 'exclusion-filters)
+	(setq cmd
+	      (format
+	       "%s -cef \"%s\""
+	       cmd
+	       (mapconcat (lambda (x) x) (oref request exclusion-filters) " "))))
+
+    cmd))
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-watch-field))
+  "Executes the watch-field command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result))
+	 (request (oref this watch-request))
+	 (request-id (car (jde-dbo-command-result-data result))))
+
+    (when command-succeeded-p
+      (oset request id request-id)
+      (if (slot-boundp process 'watch-req)
+	  (oset
+	   process
+	   watch-req
+	   (nconc (oref process watch-req)
+		  (list (cons request-id request))))
+	(oset process watch-req (list (cons request-id request)))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Watch request field for field %s of %s instance of class %s is enabled. Use request id %s to cancel."
+		     (oref request field-name)
+		     (if (slot-boundp request 'object-id)
+			 (oref request object-id)
+		       "any")
+		     (oref request object-class)
+		     request-id)
+	   (format "Error: unable to enable watch request.\n Reason: %s."
+		   (car (jde-dbo-command-result-data result)))))
+    command-succeeded-p))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Cancel Watch Requests                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-dbs-cancel-watch (jde-dbs-cmd)
+  ((watch-request  :initarg :watch-request
+		   :type jde-dbs-watch-field-request
+		   :documentation
+		   "Watch request."))
+  "Cancel a watch request.")
+
+
+(defmethod initialize-instance ((this jde-dbs-cancel-watch) &rest fields)
+  "Constructor for cancel_watch command."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+ (assert (slot-boundp this 'watch-request))
+
+  ;; Set command name.
+ (oset this name "clear"))
+
+
+(defmethod jde-dbs-cmd-make-command-line ((this jde-dbs-cancel-watch))
+  "Creates the command line for the clear command."
+  (format "%s %s" (call-next-method) (oref (oref this watch-request) id)))
+
+
+(defmethod jde-dbs-cmd-exec ((this jde-dbs-cancel-watch))
+  "Executes the cancel watch command."
+  (let* ((process (oref this process))
+	 (result (call-next-method))
+	 (command-succeeded-p (jde-dbo-command-succeeded-p result)))
+
+    (if command-succeeded-p
+	(let* ((canceled-request-id (oref (oref this watch-request) id))
+	       (requests
+		(remove-if
+		 (lambda (r)
+		   (= (car r) canceled-request-id))
+		 (oref process watch-req))))
+	  (if requests
+	      (oset process watch-req requests)
+	    (slot-makeunbound process 'watch-req))))
+
+    (jde-dbs-proc-display-debug-message
+	 process
+	 (if command-succeeded-p
+	     (format "Canceled watch request %s."
+		     (oref (oref this watch-request) id))
+	   (format "Error: unable to cancel watch request %s.\n Reason: %s."
+		   (oref (oref this watch-request) id)
+		   (car (jde-dbo-command-result-data result)))))
+
+    command-succeeded-p))
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (defun jde-dbs-self-test ()
+    "Runs jde-dbs self tests."
+    (interactive)
+    (apply 'regress
+	   (list test-jde-dbs-proc))))
+
+(provide 'jde-dbs)
+
+;; End of jde-dbs.el
diff --git a/site/jdee/lisp/jde-dbs.elc b/site/jdee/lisp/jde-dbs.elc
new file mode 100644
index 0000000..069c63e
Binary files /dev/null and b/site/jdee/lisp/jde-dbs.elc differ
diff --git a/site/jdee/lisp/jde-ejb.el b/site/jdee/lisp/jde-ejb.el
new file mode 100644
index 0000000..f672965
--- /dev/null
+++ b/site/jdee/lisp/jde-ejb.el
@@ -0,0 +1,744 @@
+;;; jde-ejb.el -- EJB Extensions to Java Development Environment for Emacs
+;; $Id: jde-ejb.el 157 2009-09-24 04:36:40Z lenbok $
+
+;; Author: David T. Smith
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools, ejb
+
+;; Copyright (C) 2002, 2003, 2004, David T. Smith
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; Gnu Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;
+;; This module uses the concept of an Enterprise Java Bean as a component
+;; comprised of a class (xxxBean.java), a Remote Interface (xxx.java), a home
+;; interface (xxxHome.java), and a deployment descriptor (xxxEJB.xml).  These
+;; files are all interrelated and therefore, changes to one should be
+;; propagated to all.  The obvious thing is to treat it as an entity
+;; with appropriate linkages between the files.  In this version however,
+;; I will simply provide a wizard to create all three elements and
+;; leave referential integrity alone.
+
+(require 'jde-wiz)
+(require 'jde-gen)
+
+
+(defgroup jde-ejb nil
+  "JDE EJB Electric Class Builder"
+  :group 'jde
+  :prefix "jde-ejb-")
+
+(defvar jde-current-ejb-name ""
+"Name used by all EJB components.")
+
+(defvar jde-current-ejb-package ""
+"Package that contains all EJB components.")
+
+(defvar jde-ejb-dir nil
+  "Directory containing all EJB components.")
+
+
+;; (makunbound 'jde-ejb-remote-format)
+(defcustom jde-ejb-remote-format "%s.java"
+  "*Default format for EJB Remote Interface"
+  :type 'string
+  :group 'jde-ejb)
+
+;; (makunbound 'jde-ejb-home-format)
+(defcustom jde-ejb-home-format "%sHome.java"
+  "*Default format for EJB Home Interface
+Setting this also resets jde-ejb-home to the
+name portion of the filename string."
+  :type 'string
+  :group 'jde-ejb
+  :set '(lambda (sym val)
+	  (set-default 'jde-ejb-home
+		      (file-name-sans-extension val))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-ejb-local-format)
+(defcustom jde-ejb-local-format "%sLocal.java"
+  "*Default format for EJB Local Interface"
+  :type 'string
+  :group 'jde-ejb
+  :set '(lambda (sym val)
+	  (set-default 'jde-ejb-local
+		      (file-name-sans-extension val))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-ejb-local-home-format)
+(defcustom jde-ejb-local-home-format "%sLocalHome.java"
+  "*Default format for EJB LocalHome Interface
+Setting this also resets jde-ejb-local-home to the
+name portion of the filename string."
+  :type 'string
+  :group 'jde-ejb
+  :set '(lambda (sym val)
+	  (set-default 'jde-ejb-local-home
+		      (file-name-sans-extension val))
+	  (set-default sym val)))
+
+
+;; (makunbound 'jde-ejb-class-format)
+(defcustom jde-ejb-class-format "%sBean.java"
+  "*Default format for EJB Class.
+Setting this also resets jde-ejb-class to the
+name portion of the filename string."
+  :type 'string
+  :group 'jde-ejb
+  :set '(lambda (sym val)
+	  (set-default 'jde-ejb-class
+		      (file-name-sans-extension val))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-ejb-descriptor-format)
+(defcustom jde-ejb-descriptor-format "%sEJB.xml"
+  "*Default format for EJB Deployment Descriptor"
+  :type 'string
+  :group 'jde-ejb)
+
+(defun jde-ejb-format-filename (fmt name &optional dir)
+  (let ((thisdir (or dir default-directory)))
+    (format "%s/%s" thisdir  (format fmt name))))
+
+;; (makunbound 'jde-ejb-remote-buffer-template)
+(defcustom jde-ejb-remote-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+   "'>'n"
+   "\"public interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends javax.ejb.EJBObject \""
+
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n"
+
+;;;Add standard interface components for Remote Interface
+   "'>'n"
+   "\"}\">"
+   "\" // \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new EJB Remote interface.
+This is the interface that contains all user methods.
+Setting this variable defines a template instantiation
+command `jde-ejb-remote', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-remote
+	    (tempo-define-template "java-ejb-remote-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Java class buffer skeleton."))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-ejb-home-buffer-template)
+(defcustom jde-ejb-home-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+   "'>'n"
+   "\"public interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends javax.ejb.EJBHome \""
+
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n"
+
+;;;Add standard interface components for Home Interface
+   "'>'n"
+   "\"}\">"
+   "\" // \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new EJB Home interface.
+This interface defines the create/find (for entity beans)/remove
+methods. Setting this variable defines a template instantiation
+command `jde-ejb-home', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-home
+	    (tempo-define-template "java-ejb-home-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Java class buffer skeleton."))
+	  (set-default sym val)))
+
+;;;;;;; start - by yoonforh 2003-01-15 17:09:14
+;; (makunbound 'jde-ejb-local-buffer-template)
+(defcustom jde-ejb-local-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+   "'>'n"
+   "\"public interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends javax.ejb.EJBLocalObject \""
+
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n"
+
+;;;Add standard interface components for Remote Interface
+   "'>'n"
+   "\"}\">"
+   "\" // \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new EJB Local interface.
+This is the interface that contains all user methods.
+Setting this variable defines a template instantiation
+command `jde-ejb-local', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-local
+	    (tempo-define-template "java-ejb-local-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Java class buffer skeleton."))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-ejb-local-home-buffer-template)
+(defcustom jde-ejb-local-home-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+   "'>'n"
+   "\"public interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends javax.ejb.EJBLocalHome \""
+
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n"
+
+;;;Add standard interface components for LocalHome Interface
+   "'>'n"
+   "\"}\">"
+   "\" // \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new EJB LocalHome interface.
+This interface defines the create/find (for entity beans)/remove
+methods. Setting this variable defines a template instantiation
+command `jde-ejb-local-home', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-local-home
+	    (tempo-define-template "java-ejb-local-home-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Java class buffer skeleton."))
+	  (set-default sym val)))
+
+
+;;;;;;;;;;; end - by yoonforh 2003-01-15 17:09:19
+
+;; (makunbound 'jde-ejb-entity-bean-template)
+(defcustom jde-ejb-entitiy-bean-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+    "'>"
+   "'>'n"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   " \" implements EntityBean \" "
+
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n'n"
+   "'>'p'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbCreate\""
+    "  nil"
+    "  \"CreateException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+
+    "(jde-gen-method-signature"
+    "   \"public\""
+    "  \"void\""
+    "  \"ejbActivate\""
+    "  nil"
+    "  nil"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbPassivate\""
+    "  nil"
+    "  nil"
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbLoad\""
+    "  nil"
+    "  nil"
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbStore\""
+    "  nil"
+    "  nil"
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbRemove\""
+    "  nil"
+    "  \"RemoveException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"setEntityContext\""
+    "  \"EntityContext ctx\""
+    "  nil"
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"unsetEntityContext\""
+    "  nil"
+    "  nil"
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n '>"
+   "\"}\">"
+   "\" // \""
+
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new Entity Bean class.
+Entity beans must have  a Find method using a primary key.
+The method is defined in the Home interface and implemented
+here under a slightly different name (see EJB specifications for details.
+Similarly, any create methods defined in the Home interface
+will also be instantiated here, but under a slightly different name.
+Setting this variable defines a template instantiation
+command `jde-ejb-entity-bean', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-entity-bean
+	    (tempo-define-template "java-ejb-entity-bean-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Entity Bean skeleton."))
+	  (set-default sym val)))
+
+
+;; (makunbound 'jde-ejb-session-bean-template)
+(defcustom jde-ejb-session-bean-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "jde-ejb-package '>'n"
+    "'>"
+   "'>'n"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   " \" implements SessionBean \" "
+
+    ;;we open the bracket according to k&r style or not
+   "(if jde-gen-k&r "
+   " ()"
+   " '>'n)"
+   "\"{\"'>'n'n"
+   "'>'p'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbCreate\""
+    "  nil"
+    "  \"CreateException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbActivate\""
+    "  nil"
+    "  nil"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbPassivate\""
+    "  nil"
+    "  nil"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbRemove\""
+    "  nil"
+    "  nil"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"setSessionContext\""
+    "  \"SessionContext ctx\""
+    "  nil"
+    " )"
+    "'>"
+
+;;     ;;we open the bracket according to k&r style or not
+;;     "(if jde-gen-k&r "
+;;     " ()"
+;;     " 'n)"
+;;     "\"{\"'>'n"
+;;     "\"}\"'>'n 'n"
+
+;;     "(jde-gen-method-signature"
+;;     "  \"public\""
+;;     "  \"void\""
+;;     "  \"unsetSessionContext\""
+;;     "  nil"
+;;     "  \"RemoteException\""
+;;     " )"
+;;     "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+    "'>"
+   "\"}\">"
+   "\" // \""
+
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new Session Bean class.
+This creates the class for a session bean.  It includes the
+necessary interface implementations.
+Setting this variable defines a template instantiation
+command `jde-ejb-session-bean', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-ejb-session-bean
+	    (tempo-define-template "java-ejb-session-bean-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert a generic Session Bean skeleton."))
+	  (set-default sym val)))
+
+
+;; (makunbound 'jde-ejb-session-descriptor-buffer-template)
+(defcustom jde-ejb-session-descriptor-buffer-template
+  (list
+   "\"<?xml version=\\\"1.0\\\"?>\"'n"
+   "\"<!DOCTYPE ejb-jar PUBLIC \\\"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\\\" \" "
+   "\" \\\"http://java.sun.com/dtd/ejb-jar_2_0.dtd\\\" > \"'>'n'n"
+   "\"<ejb-jar>\"'>'n"
+   "\"<enterprise-beans>\" '>'n"
+   "\"<session> \"'>'n"
+   "\"<ejb-name>\""
+   "(format jde-ejb-class  jde-current-ejb-name)"
+   "\"</ejb-name>\"'>'n"
+   "\"<home>\""
+   "(format (concat \"%s.\" jde-ejb-home) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</home>\"'>'n"
+   "\"<remote>\""
+   "(format \"%s.%s\" jde-current-ejb-package jde-current-ejb-name)"
+   "\"</remote>\"'>'n"
+   "\"<local-home>\""
+   "(format (concat \"%s.\" jde-ejb-local-home) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</local-home>\"'>'n"
+   "\"<local>\""
+   "(format (concat \"%s.\" jde-ejb-local) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</local>\"'>'n"
+   "\"<ejb-class>\""
+   "(format \"%s.%s\" jde-current-ejb-package (format jde-ejb-class  jde-current-ejb-name))"
+   "\"</ejb-class>\"'>'n"
+   "\"<session-type>Stateless</session-type>\"'>'n"
+   "\"<transaction-type>Container</transaction-type>\"'>'n"
+   "\"</session>\"'>'n"
+   "\"</enterprise-beans>\"'>'n"
+   "\"<ejb-client-jar>\""
+   "(format \"%sClient.jar\" jde-current-ejb-name )"
+   "\"</ejb-client-jar>\"'>'n"
+   "\"</ejb-jar>\"'>'n"
+   "'>'n")
+  "*Template for new EJB Session Bean Deployment Descriptor interface.
+This template uses internal functions to get the package and ejb names
+interpolated when the XML file is generated from the template.
+Setting this variable defines a template instantiation
+command `jde-ejb-session-descriptor', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	    (defalias 'jde-ejb-session-descriptor
+	      (tempo-define-template "java-ejb-session-descriptor-buffer-template"
+				     (jde-gen-read-template val)
+				     nil
+				     "Insert a generic XML Deployment Descriptor buffer skeleton."))
+	    (set-default sym val)))
+
+;; (makunbound 'jde-ejb-entity-descriptor-buffer-template)
+(defcustom jde-ejb-entity-descriptor-buffer-template
+  (list
+   "\"<?xml version=\\\"1.0\\\"?>\"'n"
+   "\"<!DOCTYPE ejb-jar PUBLIC \\\"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\\\" \" "
+   "\" \\\"http://java.sun.com/dtd/ejb-jar_2_0.dtd\\\" > \"'>'n'n"
+   "\"<ejb-jar>\"'>'n"
+   "\"<enterprise-beans>\" '>'n"
+   "\"<entity> \"'>'n"
+   "\"<ejb-name>\""
+   "(format jde-ejb-class  jde-current-ejb-name)"
+   "\"</ejb-name>\"'>'n"
+   "\"<home>\""
+   "(format (concat \"%s.\" jde-ejb-home) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</home>\"'>'n"
+   "\"<remote>\""
+   "(format \"%s.%s\" jde-current-ejb-package jde-current-ejb-name)"
+   "\"</remote>\"'>'n"
+   "\"<local-home>\""
+   "(format (concat \"%s.\" jde-ejb-local-home) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</local-home>\"'>'n"
+   "\"<local>\""
+   "(format (concat \"%s.\" jde-ejb-local) jde-current-ejb-package jde-current-ejb-name)"
+   "\"</local>\"'>'n"
+   "\"<ejb-class>\""
+   "(format \"%s.%s\" jde-current-ejb-package (format jde-ejb-class  jde-current-ejb-name))"
+   "\"</ejb-class>\"'>'n"
+   "\"<persistence-type>Container</persistence-type>\"'>'n"
+   "\"<prim-key-class>\""
+   "(format \"%s.%sPK\" jde-current-ejb-package jde-current-ejb-name)"
+   "\"</prim-key-class>\"'>'n"
+   "\"<reentrant>False</reentrant>\"'>'n"
+   "\"</entity>\"'>'n"
+   "\"</enterprise-beans>\"'>'n"
+   "\"<assembly-descriptor>\"'>'n"
+   "\"<container-transaction>\"'>'n"
+   "\"<method>\"'>'n"
+   "\"<ejb-name>\""
+   "(format jde-ejb-class  jde-current-ejb-name)"
+   "\"</ejb-name>\"'>'n"
+   "\"<method-intf>Local</method-intf>\"'>'n"
+   "\"<method-name>*</method-name>\"'>'n"
+   "\"</method>\"'>'n"
+   "\"<method>\"'>'n"
+   "\"<ejb-name>\""
+   "(format jde-ejb-class  jde-current-ejb-name)"
+   "\"</ejb-name>\"'>'n"
+   "\"<method-intf>Remote</method-intf>\"'>'n"
+   "\"<method-name>*</method-name>\"'>'n"
+   "\"</method>\"'>'n"
+   "\"<trans-attribute>Required</trans-attribute>\"'>'n"
+   "\"</container-transaction>\"'>'n"
+   "\"</assembly-descriptor>\"'>'n"
+   "\"</ejb-jar>\"'>'n"
+   "'>'n")
+  "*Template for new EJB Entity Bean Deployment Descriptor interface.
+This template uses internal functions to get the package and ejb names
+interpolated when the XML file is generated from the template.
+Setting this variable defines a template instantiation
+command `jde-ejb-session-descriptor', as a side-effect."
+  :group 'jde-ejb
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	    (defalias 'jde-ejb-entity-descriptor
+	      (tempo-define-template "java-ejb-entity-descriptor-buffer-template"
+				     (jde-gen-read-template val)
+				     nil
+				     "Insert a generic XML Deployment Descriptor buffer skeleton."))
+	    (set-default sym val)))
+
+;;;###autoload
+(defun jde-ejb-session-bean-buffer (ejb-name)
+  "Create a new Java buffer containing an EJB session bean class of the same name.
+This command also creates buffers with the EJB Home and EJB Remote interfaces
+and the XML Deployment descriptor defined
+by the jde-ejb templates.  This includes naming the files according
+to the EJB naming convention."
+  (interactive
+   (let* ((insert-default-directory t)
+	  (file (read-file-name "EJB Name (no extension): ")))
+     (setq jde-ejb-dir  (file-name-directory file))
+     (list (file-name-sans-extension (file-name-nondirectory file)))))
+
+  ;; Find the package name
+  (setq jde-current-ejb-name ejb-name)
+  (jde-ejb-gen-bean 'session))
+
+;;;###autoload
+(defun jde-ejb-entity-bean-buffer ( ejb-name)
+  "Create a new Java buffer containing an EJB entity bean class of the same name.
+This command also creates buffers with the EJB Home and EJB Remote interfaces
+and the XML Deployment descriptor defined
+by the jde-ejb templates.  This includes naming the files according
+to the EJB naming convention."
+  (interactive
+   (let* ((insert-default-directory t)
+	  (file (read-file-name "EJB Name (no extension): ")))
+     (setq jde-ejb-dir  (file-name-directory file))
+     (list (file-name-sans-extension (file-name-nondirectory file)))))
+
+  ;; Find the package name
+  (setq jde-current-ejb-name ejb-name)
+  (jde-ejb-gen-bean 'entity))
+
+(defun jde-ejb-gen-bean (beantype)
+  "Internal function used by session and entity bean creators.
+This command uses jde package wizards and template commands to build
+the bean skeleton using the Bean name and package name supplied by the
+Bean-specific interactive function"
+(let* ((jde-ejb-package (jde-gen-get-package-statement))
+       (jde-bean (format "jde-ejb-%s-bean" beantype))
+       (jde-desc (format "jde-ejb-%s-descriptor" beantype)))
+
+;; We use the package to generate a default directory
+  (setq jde-current-ejb-package   (cadr (split-string jde-ejb-package "[ ;]+")))
+  (find-file (jde-ejb-format-filename jde-ejb-remote-format jde-current-ejb-name jde-ejb-dir))
+  (tempo-template-java-ejb-remote-buffer-template)
+  (find-file (jde-ejb-format-filename jde-ejb-home-format jde-current-ejb-name jde-ejb-dir ))
+  (tempo-template-java-ejb-home-buffer-template)
+  (find-file (jde-ejb-format-filename jde-ejb-local-format jde-current-ejb-name jde-ejb-dir))
+  (tempo-template-java-ejb-local-buffer-template)
+  (find-file (jde-ejb-format-filename jde-ejb-local-home-format jde-current-ejb-name jde-ejb-dir ))
+  (tempo-template-java-ejb-local-home-buffer-template)
+  (find-file (jde-ejb-format-filename jde-ejb-descriptor-format jde-current-ejb-name jde-ejb-dir))
+  (funcall (intern-soft jde-desc))
+  (find-file (jde-ejb-format-filename jde-ejb-class-format jde-current-ejb-name jde-ejb-dir))
+  (funcall (intern-soft jde-bean))
+  (goto-char (point-min))
+  (search-forward "{")
+  (backward-char 1)
+  (c-indent-exp)
+  (tempo-forward-mark)))
+
+(provide 'jde-ejb)
+
+;; End of jde-ejb.el
diff --git a/site/jdee/lisp/jde-ejb.elc b/site/jdee/lisp/jde-ejb.elc
new file mode 100644
index 0000000..ab85f0e
Binary files /dev/null and b/site/jdee/lisp/jde-ejb.elc differ
diff --git a/site/jdee/lisp/jde-gen.el b/site/jdee/lisp/jde-gen.el
new file mode 100644
index 0000000..df7f7d4
--- /dev/null
+++ b/site/jdee/lisp/jde-gen.el
@@ -0,0 +1,3938 @@
+;;; jde-gen.el -- Integrated Development Environment for Java.
+;; $Id: jde-gen.el 209 2010-01-22 02:59:00Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; Gnu Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;
+
+(require 'tempo)
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-package-unknown-package-name)
+
+
+;; Allow tempo to understand ~ as destination of point
+;; http://www.emacswiki.org/emacs/TempoMode#toc3
+(defvar tempo-initial-pos nil
+  "Initial position in template after expansion")
+
+(defadvice tempo-insert( around tempo-insert-pos act )
+  "Define initial position."
+  (if (eq element '~)
+      (setq tempo-initial-pos (point-marker))
+    ad-do-it))
+
+(defadvice tempo-insert-template( around tempo-insert-template-pos act )
+  "Set initial position when defined using ~."
+  (setq tempo-initial-pos nil)
+  ad-do-it
+  (if tempo-initial-pos
+      (progn
+        (put template 'no-self-insert t)
+        (goto-char tempo-initial-pos))
+    (put template 'no-self-insert nil)))
+
+
+
+(defgroup jde-gen nil
+  "JDE Autocoder"
+  :group 'jde
+  :prefix "jde-gen-")
+
+(defcustom jde-gen-k&r t
+  "*If non-nil, use braces in Original Kernighan & Ritchie Style.
+The Creators of C started using brace placement style:
+
+    class Some {
+
+    }
+
+But there is also the alternative line-up style:
+
+    class Some
+    {
+
+    }
+
+Setting this variable to t, uses K&R style in skeletons and tempaltes.
+
+Note: According to the Java Code Convention [section 6.4], this value should
+      be non-nil."
+  :group 'jde-gen
+  :type  'boolean)
+
+(defcustom jde-gen-create-javadoc t
+  "*If non-nil, generate Javadoc for all jde-gen-* code generation functions."
+  :group 'jde-gen
+  :type  'boolean)
+
+(defcustom jde-gen-space-after-castings t
+  "*If non-nil, add space between a class casting and what comes after it."
+  :group 'jde-gen
+  :type  'boolean)
+
+; There must be some cleverer way to do this ...
+(defun jde-gen-delete-preceding-whitespace ()
+  "Delete any syntactical whitespace (including newlines)
+before point."
+  (while (and (not (bobp))
+	      (or (bolp)
+		  (re-search-backward "\\s-\\=" nil t)))
+    (delete-char -1)))
+
+(defun jde-gen-extract-ids-from-params (params)
+  "Given a parameter lsit \"Type1 id1, Type2, id2, ...\" extract the
+ids and return as \"id1, id2, ...\"."
+  (mapconcat
+   (lambda (arg)
+     (nth 1 (split-string
+	     (replace-in-string
+	      (replace-in-string arg "^[ \t\n\f\l]+" "")
+	      "[ \t\n\f\l]+$" ""))))
+   (split-string params "[,]") ", "))
+
+(defun jde-gen-lookup-named (name)
+  "Lookup some saved data under the name NAME.
+Returns the data if NAME was found, and nil otherwise."
+  (cdr (assq name tempo-named-insertions)))
+
+(defun jde-gen-read-template (strings)
+  "Converts an autocode template represented as a list
+of strings to a list of Lisp objects as required by
+tempo."
+  (let ((template-string "")
+	(n (length strings))
+	(i 0))
+    (while (< i n)
+      (setq template-string
+	    (concat template-string (nth i strings) "\n"))
+      (setq i (1+ i)))
+    (setq template-string
+	  (concat "'(" template-string ")"))
+    (eval (car (read-from-string template-string)))))
+
+(defcustom jde-gen-buffer-boilerplate nil
+  "*Lines of boilerplate text to put at the head of a buffer template."
+  :group 'jde-gen
+  :type '(repeat (string :tag "Line")))
+
+(defcustom jde-gen-boilerplate-function 'jde-gen-create-buffer-boilerplate
+  "*Specifes buffer boilerplate text function.
+This variable specifies a function to create boilerplate text for
+insertion at the head of Java source buffers generated by JDE
+templates. The specified function should take no arguments and should
+return a text string.  The default value is
+`jde-gen-create-buffer-boilerplate', which returns the lines of text
+specified by `jde-gen-buffer-boilerplate'."
+  :group 'jde-gen
+  :type 'function)
+
+(defun jde-gen-create-buffer-boilerplate ()
+  "This function creates buffer boilerplate from the
+variable `jde-gen-buffer-boilerplate'."
+  (if jde-gen-buffer-boilerplate
+      (let ((bp "")
+	    (n (length jde-gen-buffer-boilerplate))
+	    (i 0))
+	(while (< i n)
+	  (setq bp
+		(concat bp (elt jde-gen-buffer-boilerplate i) "\n"))
+	  (setq i (1+ i)))
+	bp)))
+
+(defun jde-gen-get-extend-class ()
+  (let ((super-class (read-from-minibuffer "extends: ")))
+    (if (not (string= super-class ""))
+	(progn
+	  (jde-import-find-and-import super-class)
+	  (concat "extends " super-class " ")))))
+
+(defcustom jde-gen-final-arguments t
+  "Specifies whether to add final modifiers to method arguments.
+If this variable is t, `jde-gen-method-signature' automatically
+adds final modifiers to each method argument."
+  :group 'jde-gen
+  :type 'boolean)
+
+(defcustom jde-gen-final-methods t
+  "Specifies whether to add final method modifier.
+If this variable is t, `jde-gen-method-signature' automatically adds
+the final method modifier. This option is ignored within final classes.
+Note that anonymous classes are implicitly final."
+  :group 'jde-gen
+  :type 'boolean)
+
+(defun jde-gen-final-argument-modifier (method-args)
+  "Inserts the final modifier depending on `jde-gen-final-arguments'."
+  (if jde-gen-final-arguments
+      (let ((comma nil)
+	    (arg-list (split-string method-args ",")))
+	(setq method-args "")
+	(mapcar
+	 (lambda (arg)
+	   (if (string-match "\\<final\\>" arg)
+	       (setq method-args (concat method-args comma arg))
+	     (setq method-args
+		   (concat method-args
+			   comma
+			   (if (string-match "^[ \t]" arg) " ")
+			   "final"
+			   (if (string-match "^[^ \t]" arg) " ")
+			   arg)))
+	   (setq comma ","))
+	 arg-list)))
+  method-args)
+
+(defun jde-gen-final-method-modifier (method-modifiers)
+  "Insert final modifier according to `jde-gen-final-methods'."
+  (let ((class-info (jde-parse-get-class-modifiers)))
+    ;; Anonymous classes are implicitly final. See:
+    ;; Java Language specification, section 15.9.5.
+    ;; http://java.sun.com/docs/books/jls/second_edition/html/classes.doc.html
+    (unless (or (member "final" class-info) ; explicit final modifier?
+		(save-excursion
+		  (and class-info
+		       (goto-char (cdar class-info))
+		       (looking-at "new")))) ; anonymous class?
+      (if (and jde-gen-final-methods
+	       (not (string-match "final" method-modifiers))
+	       (not (string-match "private" method-modifiers))
+	       (not (string-match "abstract" method-modifiers)))
+	  ;; Find correct position according to
+	  ;; Java Language specification, section 8.4.3.
+	  ;; http://java.sun.com/docs/books/jls/second_edition/html/classes.doc.html
+	  (let* ((pos (max (if (string-match "public" method-modifiers) (match-end 0) 0)
+			   (if (string-match "protected" method-modifiers) (match-end 0) 0)
+			   (if (string-match "static" method-modifiers) (match-end 0) 0)))
+		 (left (substring method-modifiers 0 pos))
+		 (right (substring method-modifiers pos)))
+	    (setq method-modifiers (concat
+			     left
+			     (if (> (length left) 0) " ")
+			     "final"
+			     (if (and (= (length left) 0) (> (length right) 0)) " ")
+			     right))))))
+  method-modifiers)
+
+(defmacro jde-gen-save-excursion (&rest body)
+  "Evaluate BODY within a let form.
+Protects `tempo-marks', `tempo-named-insertions', `tempo-region-start'
+and `tempo-region-stop' against modifications by invoked template.
+Those tempo vars will be set to their default values.
+This allows to invoke tempo-templates within tempo-templates
+without having mutual interference of those templates.
+Returns nil."
+  `(progn
+     (let ((tempo-marks)
+	   (tempo-named-insertions)
+	   (tempo-region-start (make-marker))
+	   (tempo-region-stop (make-marker)))
+       (progn ,@body))
+     nil))
+
+(defun jde-gen-electric-brace (&optional padding)
+  "Insert a brace according to `jde-gen-k&r'.
+Optional argument PADDING is inserted before brace
+if jde-gen-k&r is enabled."
+  (if jde-gen-k&r
+      (if padding (insert padding))
+    (progn
+      (indent-according-to-mode)
+      (insert "\n")))
+  (insert "{")
+  (indent-according-to-mode)
+  (insert "\n")
+  nil)
+
+(defun jde-gen-indent ()
+  "Indent current line if it is not empty.
+Removes indentation if the current line contains only whitespaces.
+The purpose of this function is to avoid trailing whitespaces
+in generated java code. Returns nil."
+  (if (save-excursion
+	(beginning-of-line)
+	(looking-at "\\s-+$"))
+      (replace-match ""))
+  (if (not (and (bolp) (eolp)))
+      (c-indent-line))
+  nil) ;; must return nil to prevent template insertion.
+
+(defun jde-gen-blank-lines (n &optional m)
+  "Ensure exactly N blank lines.
+Leaves point at the beginning of the line following blank lines.
+If M is non-nil, (`forward-line' M) will be called after inserting.
+If point is at the beginning of a non-blank line, blank lines will appear before that line.
+If point is at the end of a non-blank line, blank lines will appear after that line.
+If point is in the middle of a non-blank line, this line will be split at point.
+Indentation and trailing whitespace of surrounding non-blank lines will stay unchanged.
+Returns nil."
+  (interactive "*")
+  (if (or (bolp) (eolp)
+	  (save-excursion
+	    (beginning-of-line)
+	    (looking-at "\\s-*$")))
+      (delete-region
+       (+ (point) (skip-chars-backward " \t\n") (skip-chars-forward  " \t"))
+       (+ (point) (skip-chars-forward  " \t\n") (skip-chars-backward " \t"))))
+  (while (>= n 0)
+    (insert "\n")
+    (setq n (1- n)))
+  (if m
+      (forward-line m))
+  nil)
+
+; In order to avoid problems with recursive tempo-template invocations
+; interface generation has been split in two parts.
+; jde-gen-get-interface-implementation prompts for the
+; interface and stores point-marker and interface name in buffer local
+; variables.  jde-gen-insert-interface-implementation is invoked after
+; the template for class or inner class and generates the interface
+; implementation.
+
+(defvar jde-gen-interface-to-gen nil
+  "Insertion marker and name (MARKER . NAME) of interface
+implemented by the most recently generated class template.
+Used by `jde-gen-get-interface-implementation' to
+store name and location of interface to be inserted
+by `jde-gen-insert-interface-implementation'.")
+
+(defun jde-gen-get-interface-implementation (&optional insert-immediately)
+  "Prompts the user to enter the name of an interface
+implemented by a class being generated by a tempo template.
+If the user enters a name, stores the current point as marker in
+the buffer and the interface name as a cons (MARKER . NAME)
+in the global variable `jde-gen-interface-to-gen'. Otherwise
+it sets this variable to nil. If INSERT-IMMEDIATELY is non-nil,
+`jde-gen-insert-interface-implementation' will be called immediately
+and jde-gen-interface-to-gen will be set to nil."
+  (let ((interface (read-from-minibuffer "implements: ")))
+    (if (not (string= interface ""))
+	(progn
+	  (setq jde-gen-interface-to-gen
+		(cons (point-marker) interface))
+	  (if insert-immediately
+	      (progn
+		(jde-gen-insert-interface-implementation)
+		(setq jde-gen-interface-to-gen nil))))
+      (setq jde-gen-interface-to-gen nil)))
+  nil) ;; must return nil to prevent template insertion.
+
+(defun jde-gen-insert-interface-implementation ()
+  "Generates the interface specified by the cdr of `jde-gen-interface-to-gen'
+and inserts it in the current buffer at the location specified
+by the car of `jde-gen-interface-to-gen'."
+  (if jde-gen-interface-to-gen
+      (let ((ins-pos (marker-position (car jde-gen-interface-to-gen)))
+	    (interface (cdr jde-gen-interface-to-gen)))
+	(save-excursion
+	  (goto-char ins-pos)
+	  (jde-wiz-implement-interface-internal interface)))))
+
+(defun jde-gen-get-package-statement ()
+  (require 'jde-package)
+  (let* ((package-dir (jde-package-get-package-directory))
+	 (suggested-package-name
+	  (if (or
+	       (string= package-dir jde-package-unknown-package-name)
+	       (string= package-dir ""))
+	      nil
+	    (jde-package-convert-directory-to-package package-dir)))
+	 (package-name
+	  (read-from-minibuffer "Package: " suggested-package-name)))
+    (if (and
+	 package-name
+	 (not (string= package-name "")))
+	(format "package %s;\n\n" package-name))))
+
+
+(defcustom jde-gen-method-signature-padding-1 ""
+  "String that comes just after the function name and just before
+the opening parenthesis of the argument list for a method call or definition.
+For example, if set to a single space [\" \"], then a generated method might
+look like:
+
+    void setXxxx () {
+		^
+If not set, the same generated method would look like:
+
+    void setXxxx() {
+		^
+Note: According to the Java Code Convention [section 6.4], this value should
+      be the empty string."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defcustom jde-gen-method-signature-padding-2 ""
+  "String which comes just after the opening parenthesis and just before
+the closing parenthesis of an argument list for a method call or definition.
+For example, if set to a single space [\" \"], then a generated method might
+look like:
+
+    void setXxxx( boolean newValue ) {
+		 ^                ^
+If not set, the same generated method would look like:
+
+    void setXxxx(boolean newValue) {
+		 ^              ^
+Note: According to the Java Code Convention [section 6.4], this value should
+      be the empty string."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defcustom jde-gen-method-signature-padding-3 " "
+  "String which comes just after the closing parenthesis of an
+argument list for a method call or definition.  For example, if set to
+a single space [\" \"], then a generated method might look like:
+
+    void setXxxx(boolean newValue) {
+				  ^
+If not set, the same generated method would look like:
+
+    void setXxxx(boolean newValue){
+				  ^
+Note: According to the Java Code Convention [section 6.4], this value should
+      be a single space."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defcustom jde-gen-conditional-padding-1 " "
+  "The string to be inserted between a conditional keyword (if, while, etc.)
+and the opening parenthesis for its conditional expression:
+
+    <keyword><1>(<2><expression><2>)<3>{
+
+also:  <3>else<3>{
+
+where <1> is jde-gen-conditional-padding-1
+  and <2> is jde-gen-conditional-padding-2
+  and <3> is jde-gen-conditional-padding-3.
+
+For example, if <1> is a space, <2> is nil and <3> is a space, then a while
+clause might look like:
+
+    while (true) {
+
+Note: According to the Java Code Convention [section 7.4], this value should
+      be a single space."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defcustom jde-gen-conditional-padding-2 ""
+  "The string to be inserted before and after a conditional expression
+between the parentheses.  See `jde-gen-conditional-padding-1' for details.
+
+Note: According to the Java Code Convention [section 7.4], this value should
+      be the empty string."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defcustom jde-gen-conditional-padding-3 " "
+  "The string to be inserted after the closing parenthesis of the
+conditional expression and before the opening brace.  See
+`jde-gen-conditional-padding-1' for details.
+
+Note: According to the Java Code Convention [section 7.4], this value should
+      be a single space."
+  :group 'jde-gen
+  :type 'string)
+
+
+(defun jde-gen-method-signature (access type name arglist &optional throwslist)
+  "This function generates method signatures with a consistent format.
+All jde-gen functions and/or templates should use this function when
+creating Java methods and constructors.
+
+The signature is of the format:
+
+  <access> <type> <name><1>(<2><arglist><2>) throws <throwslist><3>
+
+where <1> is the value of jde-gen-method-signature-padding-1
+  and <2> is the value of jde-gen-method-signature-padding-2
+  and <3> is the value of jde-gen-method-signature-padding-3.
+
+<3> will not be used if `jde-gen-k&r' is nil.
+
+This function takes care of `jde-gen-final-methods' and
+`jde-gen-final-arguments'. final modifiers will be added
+according to those flags.
+
+If a parameter to this function is empty or nil, then it is omitted
+(as well as the corresponding padding, whitespace and/or Java keywords)."
+
+(if (> (length type) 0) ; ordinary method?
+    (setq access (jde-gen-final-method-modifier access)))
+(let ((sig
+       (concat
+	(if (> (length access) 0)
+	    (concat access " ")
+	  ());; if no access (e.g. "public static"), then nothing
+	(if (> (length type) 0)
+	    (concat type " ")
+	  ());; if no type (e.g. "boolean" or "void"), then nothing
+	name
+	jde-gen-method-signature-padding-1
+	"("
+	(if (> (length arglist) 0)
+	    (concat jde-gen-method-signature-padding-2 (jde-gen-final-argument-modifier arglist)
+		    jde-gen-method-signature-padding-2 )
+	  ())
+	")"
+	(if (> (length throwslist) 0)
+	    (concat " throws " throwslist)
+	  ())
+	(if jde-gen-k&r
+	    jde-gen-method-signature-padding-3
+	  ()))))
+  sig))
+
+;;(makunbound 'jde-gen-class-buffer-template)
+(defcustom jde-gen-class-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "(when jde-gen-create-javadoc"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "'(l \" * Describe class \""
+   "    (file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "    \" here.\" 'n"
+   "    \" \" (jde-javadoc-insert-empty-line)"
+   "    \" \" (jde-javadoc-insert-empty-line)"
+   "    \" * Created: \" (current-time-string) 'n"
+   "    \" \" (jde-javadoc-insert-empty-line)"
+   "    \" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag))"
+   "    \" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag))"
+   "    \" \" (jde-javadoc-insert-end-block)))"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" \" (jde-gen-get-extend-class)"
+   "(jde-gen-electric-brace)"
+   "'p'n"
+   "\"}\">"
+   "(if jde-gen-comments (concat \" // \""
+   "  (file-name-sans-extension (file-name-nondirectory buffer-file-name))))"
+   "'>'n"
+   ";; Here comes the stuff that needs a fully generated class."
+   ";; We jump back and add those things retrospectively."
+   "(progn (tempo-backward-mark)"
+   " (jde-gen-save-excursion"
+   "  (jde-gen-get-interface-implementation t))"
+   " (jde-gen-save-excursion"
+   "  (jde-wiz-gen-method \"public\" \"\""
+   "   (file-name-sans-extension (file-name-nondirectory buffer-file-name)) \"\" \"\" \"\")))"
+   ";; Move to constructor body. Set tempo-marks to nil in order to prevent tempo moving to mark."
+   "(progn (re-search-forward \"^[ \\t]*$\") (setq tempo-marks nil) nil)")
+  "*Template for new Java class.
+Setting this variable defines a template instantiation
+command `jde-gen-class', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (tempo-define-template "java-class-buffer-template"
+				 (jde-gen-read-template val)
+				 nil
+				 "Insert a generic Java class buffer skeleton.")
+	  (defalias 'jde-gen-class
+	    (list 'lambda (list)
+		  (list 'interactive)
+		  (list 'tempo-template-java-class-buffer-template)
+		  (list 'jde-gen-insert-interface-implementation)))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-class-buffer (file)
+  "Create a new Java buffer containing a class of the same name.
+This command inserts the class template generated by `jde-gen-class'.
+"
+  (interactive "F")
+  (find-file file)
+  (jde-gen-class))
+
+;;(makunbound 'jde-gen-interface-buffer-template)
+(defcustom jde-gen-interface-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * Describe interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" here.\" 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag))"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag))"
+   "\" \" (jde-javadoc-insert-end-block)"
+   "\"public interface \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" \" (jde-gen-get-extend-class)"
+   "(jde-gen-electric-brace)"
+   "'p'n"
+   "\"}\">"
+   "(if jde-gen-comments (concat \" // \""
+   "  (file-name-sans-extension (file-name-nondirectory buffer-file-name))))"
+   "'>'n")
+  "*Template for new Java interface.
+Setting this variable defines a template instantiation
+command `jde-gen-interface', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (tempo-define-template "java-interface-buffer-template"
+				 (jde-gen-read-template val)
+				 nil
+				 "Insert a generic Java interface buffer skeleton.")
+	  (defalias 'jde-gen-interface
+	    (list 'lambda (list)
+		  (list 'interactive)
+		  (list 'tempo-template-java-interface-buffer-template)))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-interface-buffer (file)
+  "Create a new Java buffer containing an interface of the same name.
+This command inserts the interface template generated by `jde-gen-interface'.
+It then moves the point to the location of the first method."
+  (interactive "F")
+  (find-file file)
+  (jde-gen-interface))
+
+;;(makunbound 'jde-gen-console-buffer-template)
+(defcustom jde-gen-console-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * Describe class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" here.\" 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag))"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag))"
+   "\" \" (jde-javadoc-insert-end-block)"
+   "\"public final class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "(jde-gen-electric-brace \" \")"
+   "'p'n"
+   "\"}\">"
+   "(if jde-gen-comments (concat \" // \""
+   "  (file-name-sans-extension (file-name-nondirectory buffer-file-name))))"
+   "'>'n"
+   ";; Here comes the stuff that needs a fully generated class."
+   ";; We jump back and add those things retrospectively."
+   "(progn (tempo-backward-mark)"
+   " (jde-gen-save-excursion"
+   "  (jde-gen-main-method))"
+   " (tempo-backward-mark)"
+   " (jde-gen-save-excursion"
+   "  (jde-wiz-gen-method \"private\" \"\""
+   "   (file-name-sans-extension (file-name-nondirectory buffer-file-name)) \"\" \"\" \"\")))"
+   ";; Move to constructor body. Set tempo-marks to nil in order to prevent tempo moving to mark."
+   "(progn (re-search-forward \"^[ \\t]*$\") (setq tempo-marks nil) nil)")
+  "*Template for new Java console app main class buffer.
+Setting this variable defines a template instantiation
+command `jde-gen-console', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-console
+	    (tempo-define-template "java-console-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert skeleton for a new Java console buffer"))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-console-buffer (file)
+  "Create a new Java buffer containing a console class of the same name.
+This command inserts the class template generated by `jde-gen-class'.
+It then moves the point to the location to the constructor."
+  (interactive "F")
+  (find-file file)
+  (jde-gen-console))
+
+;;(makunbound 'jde-gen-deep-clone-template)
+(defcustom jde-gen-deep-clone-template
+  '(
+    "(jde-wiz-generate-interface \"java.lang.Cloneable\")"
+
+    "'&'> (progn (require 'jde-javadoc) nil)"
+
+    ;; create the javadoc (todo: only generate if turned on)
+    "(when jde-gen-create-javadoc "
+    "'(l (jde-javadoc-insert-start-block)"
+    "\"* Create a deep clone of this object.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @return a deep clone of this object.\" '>'n"
+    "'> (jde-javadoc-insert-end-block)))"
+
+    ;; create method declaration
+    "(let (jde-gen-final-methods)"
+    " (jde-gen-method-signature"
+    "   \"public\""
+    "   \"Object\""
+    "   \"clone\""
+    "   nil"
+    " ))"
+    "'>"
+    "(jde-gen-electric-brace)"
+
+    ;; return declaration
+    "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+    "\" ret = null;\" '>'n'n"
+
+    ;; must catch CloneNotSupported exception
+    "(let ((beg (point)))"
+    "  (insert \"ret = (\")"
+    "  (insert (file-name-sans-extension"
+    "    (file-name-nondirectory buffer-file-name)))"
+    "  (insert \")\") "
+    "  (if jde-gen-space-after-castings (insert \" \"))"
+    "  (insert \"super.clone();\")"
+    "  (jde-gen-try-catch-wrapper beg (point))"
+    ;; at this point we are at the place to add what exception to catch
+    "  (insert \"CloneNotSupportedException\")"
+    "  nil)"
+
+    "(progn"
+    ;; first go out of the catch exception ()s
+    " (goto-char (scan-lists (point) 1 1))"
+    ;; now go into the catch {}s definition part
+    " (goto-char (scan-lists (point) 1 -1))"
+    " (end-of-line)"
+    " 'n)"
+    "\"throw new InternalError(\\\"clone should be supported (forgot?)\\\");\""
+    "'>'%"
+
+    "(progn (goto-char (scan-lists (point) 1 1)) (end-of-line) '(l n))"
+
+    ;; todo: detect which members need cloning and generate assignments
+    "(if jde-gen-comments "
+    " '(l \" // add non-immutable member clone assignments here\" '>'n))"
+    "'p'n"
+    ;; add return statement and finish method
+    "\"return ret;\" '>'n"
+    "\"}\" '>'n"
+    )
+  "*Template for creating a deep clone method.
+Setting this variable defines a template instantiation
+command `jde-gen-deep-clone', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-deep-clone
+	    (tempo-define-template
+	     "java-deep-clone-method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Create a deep clone method at the current point."))
+	  (set-default sym val)))
+
+;; TO DO: Add support for style that puts member declarations at the bottom
+;; of a class.
+(defun jde-gen-get-next-member-pos (modifiers &optional no-move-to-point)
+  "Return the position to add the next member in a class.  Return
+the point at end of a group of modifiers at the end of the line in a class
+definition, or the top of the class if there are no variables with the
+modifiers we supply.  This assumes a style where modifiers always are at the
+top of the class like:
+
+public class Person {
+
+  public static final String RACE = \"HUMAN\";
+
+  private String name;
+  private int age;
+...
+
+MODIFIERS is a set of modifiers to put the point after.
+NO-MOVE-POINT if nil move the point, either way, we return the position.
+"
+  (if (stringp modifiers) (setq modifiers (split-string modifiers ",")))
+  (let* ((pair (jde-parse-get-innermost-class-at-point))
+	 (class-name (if pair (car pair)))
+	 pos)
+    (if (null pair) (error "point is not in a class definition"))
+    (semantic-fetch-tags)
+    (setq pos (jde-parse-get-nth-member class-name modifiers
+					nil -1 nil 'subset))
+
+    (if (null pos) (setq pos (jde-parse-get-top-of-class class-name)))
+    (if (and pos (not no-move-to-point)) (goto-char pos))
+    pos))
+
+
+(defun jde-gen-insert-at-class-top (&optional class-regexp
+						     no-move-point)
+  "Position point at top of class, inserting space if needed.
+
+CLASS-REGEXP the symbol used to find the class to find the top of.  See
+`jde-parse-get-top-of-class' for more information.
+
+NO-MOVE-POINT if non-nil just the position is returned, otherwise the point is
+moved also."
+  (if (= (point) (jde-parse-get-top-of-class class-regexp no-move-point))
+      (insert "\n"))
+  (insert "\n")
+  (backward-char 1))
+
+;;(makunbound 'jde-gen-get-set-var-template)
+(defcustom jde-gen-get-set-var-template
+  '(
+    ;; position point at top of class, inserting space if needed
+    "(jde-gen-insert-at-class-top nil t)"
+
+    ;; remember where we are for later, then go to the end of the private
+    ;; declarations first found from the top of the class
+    "(progn (tempo-save-named 'mypos (point-marker)) nil)"
+    "(progn"
+    "  (jde-gen-get-next-member-pos '(\"private\")) nil)"
+
+    ;; add class member
+    "(P \"Variable type: \" type t)"
+    "(P \"Variable name: \" name t)"
+    "'&'n'>"
+    "(when jde-gen-create-javadoc "
+    " (progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+    " '(l \"* Describe \" (s name) \" here.\" '>'n"
+    "'> (jde-javadoc-insert-end-block)))"
+    "'& \"private \" (s type) \" \""
+    "(s name) \";\" '>"
+    "(progn (goto-char (marker-position (tempo-lookup-named 'mypos))) nil)"
+
+    "(jde-gen-blank-lines 2 -1)"
+    ;;we begin by the getter
+    "(when jde-gen-create-javadoc "
+    "'(l '> (jde-javadoc-insert-start-block)"
+    "\"* Get the <code>\" (jde-gen-lookup-and-capitalize 'name) \"</code> value.\" '>'n"
+    "'> (jde-javadoc-insert-empty-line)"
+    "'>"
+    "(let ((type (tempo-lookup-named 'type)))"
+    "  (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-return-tag)))"
+    "'> (jde-javadoc-insert-end-block)))"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  (jde-gen-lookup-named 'type)"
+    "  (if (string= \"boolean\" (jde-gen-lookup-named 'type) ) "
+    "    (concat \"is\" (jde-gen-lookup-and-capitalize 'name))"
+    "   (concat \"get\" (jde-gen-lookup-and-capitalize 'name)))"
+    "  nil"
+    " )"
+
+    "(jde-gen-electric-brace)"
+
+    "\"return \" (s name) \";\" '>'n \"}\"'>'n"
+    ;; leave a blank line with no indentation
+    "'n"
+
+    ;;we continue with the setter
+    "(when jde-gen-create-javadoc "
+    "'(l '> (jde-javadoc-insert-start-block)"
+    "\"* Set the <code>\" (jde-gen-lookup-and-capitalize 'name) \"</code> value.\" '>'n"
+    "\"*\" '>'n"
+    ;; ToDo: use jde-wiz-get-set-variable-prefix
+    "\"* @param new\" (jde-gen-lookup-and-capitalize 'name)"
+    "\" The new \" (jde-gen-lookup-and-capitalize 'name) \" value.\" '>'n"
+    "'> (jde-javadoc-insert-end-block)))"
+
+    ;; name the method
+    "(jde-gen-method-signature "
+    "  \"public\""
+    "  \"void\""
+    "  (concat \"set\" (jde-gen-lookup-and-capitalize 'name))"
+    "  (concat (jde-gen-lookup-named 'type) \" new\" "
+    "          (jde-gen-lookup-and-capitalize 'name))"
+    " )"
+
+   "(jde-gen-electric-brace)"
+
+    "'>\"this.\" (s name) \" = new\" (jde-gen-lookup-and-capitalize 'name)"
+    "\";\" '>'n \"}\" '>"
+    "(when (looking-at \"\\\\s-*\\n\\\\s-*$\")"
+    "  (forward-line 1) (end-of-line) nil)"
+    )
+  "*Template for creating a variable at the top of the class and
+a get/set method pair for the variable at point.
+Setting this variable defines a template instantiation
+command `jde-gen-get-set', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-get-set
+	    (tempo-define-template
+	     "java-get-set-pair"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert variable at the top of the class and get-set method pair at point."))
+	  (set-default sym val)))
+
+(defalias 'jde-gen-property 'jde-gen-get-set)
+
+(defun jde-gen-get-set-methods (duples)
+  "Generate variables at the top of the class and get and set methods for
+the variables at point.
+
+DUPLES is either a list of list type name pairs or a string.  If it is a
+string, the string has the form:
+
+  type1,name1;type2,name2;...;typeN,nameN
+
+where type is the primitive or class name of the getter setter and name is the
+name of the property (getter/setter).
+
+If DUPLES is a lisp object it must a list with the form:
+
+  ((\"type1\" \"name1\") (\"type2\" \"name2\") ... )"
+  (interactive "sGets/Sets (type1,name1;type2,name2;...): ")
+  (if (stringp duples) (setq duples (split-string duples "[ \t]*;[ \t]*")))
+  (dolist (elt duples)
+    (let ((pair (if (stringp elt) (split-string elt "[ \t]*,[ \t]*") elt)))
+      (tempo-save-named 'type (car pair))
+      (tempo-save-named 'name (car (cdr pair)))
+      (jde-gen-get-set))))
+
+;; (makunbound 'jde-gen-bean-template)
+(defcustom jde-gen-bean-template
+  '(
+    ;; add class shell
+    ";; generate class and save point which is in body of the constructor"
+    "(jde-gen-class) 'p"
+
+    ;; position point at end of class.
+    "(progn (end-of-buffer) (search-backward \"}\") (backward-char 1)) 'n"
+    "(jde-gen-blank-lines 2 -1)"
+
+    "(jde-gen-save-excursion"
+
+    ;; import Java, per spec, bean stuff
+    " (jde-wiz-generate-interface \"java.io.Serializable\")"
+    " (jde-import-insert-import '(\"java.io.Serializable\"))"
+
+    ;; add getters and setters
+    " (call-interactively 'jde-gen-get-set-methods))"
+    )
+  "*Template for creating a Java bean.
+Setting this variable defines a template instantiation
+command `jde-gen-bean', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-bean
+	    (tempo-define-template
+	     "java-bean-template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Create a Java bean."))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-bean-buffer (file)
+  "Create a new Java buffer containing a Java bean of the same name.
+This command inserts the class template generated by `jde-gen-bean'.
+It then moves the point to the location of the constructor."
+  (interactive "F")
+  (find-file file)
+  (jde-gen-bean))
+
+(defcustom jde-gen-jfc-app-buffer-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "\"import java.awt.Dimension;\" '>'n"
+   "\"import java.awt.Graphics;\" '>'n"
+   "\"import java.awt.Graphics2D;\" '>'n"
+   "\"import java.awt.Color;\" '>'n"
+   "\"import java.awt.geom.Ellipse2D;\" '>'n"
+   "\"import java.awt.event.WindowAdapter;\" '>'n"
+   "\"import java.awt.event.WindowEvent;\" '>'n"
+   "\"import javax.swing.JFrame;\" '>'n"
+   "\"import javax.swing.JPanel;\" '>'n"
+   "\"import javax.swing.JScrollPane;\" '>'n"
+   "\"import javax.swing.JMenuBar;\" '>'n"
+   "\"import javax.swing.JMenu;\" '>'n"
+   "\"import java.awt.event.ActionEvent;\" '>'n"
+   "\"import javax.swing.AbstractAction;\" '>'n '>'n"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * \""
+   "(file-name-nondirectory buffer-file-name) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-end-block \"*/\")"
+   "'>'n"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends JFrame\""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+   "\"class Canvas extends JPanel\""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+   "(jde-gen-method-signature"
+   "  \"public\""
+   "  \"\""
+   "  \"Canvas\""
+   "  \"\""
+   " )"
+   "'>"
+
+   "(if jde-gen-k&r "
+   " ()"
+   " 'n)"
+   "\"{\"'>'n"
+
+   "\"setSize(getPreferredSize());\" '>'n"
+   "\"Canvas.this.setBackground(Color.white);\" '>'n"
+   "\"}\"'>'n '>'n"
+
+   "(jde-gen-method-signature"
+   "  \"public\""
+   "  \"Dimension\""
+   "  \"getPreferredSize\""
+   "  \"\""
+   " )"
+   "'>"
+
+   "(if jde-gen-k&r "
+   " ()"
+   " 'n)"
+   "\"{\"'>'n"
+
+   "\"return new Dimension(600, 600);\" '>'n"
+   "\"}\"'>'n '>'n"
+
+   "(jde-gen-method-signature"
+   "  \"public\""
+   "  \"void\""
+   "  \"paintComponent\""
+   "  \"Graphics g\""
+   " )"
+   "'>"
+
+   "(if jde-gen-k&r "
+   " ()"
+   " 'n)"
+   "\"{\"'>'n"
+
+   "\"super.paintComponent(g);\" '>'n"
+   "\"Graphics2D g2d = (Graphics2D) g;\" '>'n"
+   "\"Ellipse2D circle = new Ellipse2D.Double(0d, 0d, 100d, 100d);\" '>'n"
+   "\"g2d.setColor(Color.red);\" '>'n"
+   "\"g2d.translate(10, 10);\" '>'n"
+   "\"g2d.draw(circle);\" '>'n"
+   "\"g2d.fill(circle);\" '>'n"
+   "\"}\"'>'n "
+
+   "\"}\"'>'n '>'n"
+
+
+   ;; Constructor
+   "(jde-gen-method-signature"
+   "  \"public\""
+   "  \"\""
+   "  (file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "  \"\""
+   " )"
+   "'>"
+
+   "(if jde-gen-k&r "
+   " ()"
+   " 'n)"
+   "\"{\"'>'n"
+
+
+   "\"super(\\\"\" (P \"Enter app title: \") \"\\\");\" '>'n"
+   "\"setSize(300, 300);\" '>'n"
+   "\"addWindowListener(new WindowAdapter() \""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+
+   "\"public void windowClosing(WindowEvent e) {System.exit(0);}\" '>'n"
+   "\"public void windowOpened(WindowEvent e) {}\" '>'n"
+   "\"});\"'>'n"
+
+
+   "\"setJMenuBar(createMenu());\" '>'n"
+   "\"getContentPane().add(new JScrollPane(new Canvas()));\" '>'n"
+   "\"}\"'>'n"
+   "'>'n"
+
+   ;; Main method
+   "(jde-gen-method-signature"
+   "   \"public static\""
+   "   \"void\""
+   "   \"main\""
+   "   \"String[] args\""
+   " )"
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+   "'>'n"
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" f = new \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\"();\" '>'n"
+   "\"f.show();\" '>'n"
+   "\"}\"'>'n '>'n"
+   ;; createMenu method
+   "\"protected JMenuBar createMenu() \""
+
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+
+   "\"JMenuBar mb = new JMenuBar();\" '>'n"
+   "\"JMenu menu = new JMenu(\\\"File\\\");\" '>'n"
+   "\"menu.add(new AbstractAction(\\\"Exit\\\") \""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+
+   "(jde-gen-method-signature"
+   "  \"public\""
+   "  \"void\""
+   "  \"actionPerformed\""
+   "  \"ActionEvent e\""
+   " )"
+   "'>"
+
+   "(if jde-gen-k&r "
+   " ()"
+   " 'n)"
+   "\"{\"'>'n"
+
+
+   "\"System.exit(0);\" '>'n"
+   "\"}\" '>'n"
+   "\"});\" '>'n"
+   "\"mb.add(menu);\" '>'n"
+   "\"return mb;\" '>'n"
+   "\"}\"'>'n "
+   "\"} // \"'>"
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for JFC (Swing) application buffer.
+Setting this variable defines a template instantiation
+command `jde-gen-jfc-app', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-jfc-app
+	    (tempo-define-template "java-jfc-app-buffer-template"
+				   (jde-gen-read-template val)
+				   nil
+				   "Insert skeleton for a JFC app buffer"))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-jfc-app-buffer (file)
+  "Create a new Java buffer containing a JFC application class.
+This command inserts the class template generated by `jde-gen-jfc-app'.
+It then moves the point to the location to the constructor."
+  (interactive "F")
+  (find-file file)
+  (jde-gen-jfc-app)
+  (goto-char (point-min))
+  (search-forward "{")
+  (backward-char 1)
+  (c-indent-exp)
+  (tempo-forward-mark))
+
+(defcustom jde-gen-makefile-buffer-template
+  (list
+    "\"################################################################################\" 'n"
+    "\"#\" 'n"
+    "\"# Generic Makefile for java\" 'n"
+    "\"#\" 'n"
+    "\"# Author: \" user-full-name 'n"
+    "\"################################################################################\" 'n"
+    "\"\" 'n"
+    "\"# Common Properties\" 'n"
+    "\"SRCDIR = \"  (or (car jde-sourcepath) \"src\") 'n"
+    "\"OBJDIR = \"  (if (string= jde-compile-option-directory \"\") \"classes\" jde-compile-option-directory) 'n"
+    "\"JAVA_HOME = \" (jde-get-jdk-dir) 'n"
+    "\"JAVAC = $\\\(JAVA_HOME\\\)/bin/javac\" 'n"
+    "\"JAR = $\\\(JAVA_HOME\\\)/bin/jar\" 'n"
+    "\"JVM_OPTION = -g\" (if (not (string= jde-compile-option-encoding \"\")) (concat \" -encoding \" jde-compile-option-encoding)) 'n"
+    "\"CLASSPATH = \\\"\" (if (string= (jde-build-classpath jde-global-classpath) \"\") \".\" (jde-build-classpath jde-global-classpath)) \"\\\"\" 'n"
+    "\"PKG = \" jde-project-name \".jar\" 'n"
+    "\"RES_EXT = properties xml\" 'n"
+    "\"\" 'n"
+    "\"# Java Compiler Args\" 'n"
+    "\"JAVACFLAGS := -bootclasspath $\\\(JAVA_HOME\\\)/jre/lib/rt.jar \\\\\" 'n"
+    "\"	-classpath $\\\(CLASSPATH\\\) \\\\\" 'n"
+    "\"	-sourcepath $\\\(SRCDIR\\\) \\\\\" 'n"
+    "\"	-d $\\\(OBJDIR\\\) \\\\\" 'n"
+    "\"	$\\\(JVM_OPTION\\\)\" 'n"
+    "\"\" 'n"
+    "\"# Sources\" 'n"
+    "\"SOURCES = $\\\(shell find $\\\(SRCDIR\\\) \\\\\" 'n"
+    "\"	-name *.java \\\\\" 'n"
+    "\"	$\\\(foreach x, $\\\(RES_EXT\\\), -o -name \\\"*.$\\\(x\\\)\\\"\\\) \\\\\" 'n"
+    "\"\\\)\" 'n"
+    "\"# Obj files\" 'n"
+    "\"OBJS = $\\\(patsubst $\\\(SRCDIR\\\)/%, $\\\(OBJDIR\\\)/%, $\\\(patsubst %.java, %.class, $\\\(SOURCES\\\)\\\)\\\)\" 'n"
+    "\"\" 'n"
+    "\".PHONY: all compile jar clean rebuild\" 'n"
+    "\"\" 'n"
+    "\"# Default target\" 'n"
+    "\"all : jar\" 'n"
+    "\"\" 'n"
+    "\"# Jar\" 'n"
+    "\"jar : compile $\\\(PKG\\\)\" 'n"
+    "\"$\\\(PKG\\\) : $\\\(OBJS\\\)\" 'n"
+    "\"	$\\\(JAR\\\) cf $\\\(PKG\\\) -C $\\\(OBJDIR\\\) .\" 'n"
+    "\"\" 'n"
+    "\"# Compile\" 'n"
+    "\"compile : $\\\(OBJDIR\\\) $\\\(OBJS\\\)\" 'n"
+    "\"# Javac\" 'n"
+    "\"$\\\(OBJDIR\\\)/%.class : $\\\(SRCDIR\\\)/%.java\" 'n"
+    "\"	@echo compile $<\" 'n"
+    "\"	@$\\\(JAVAC\\\) $\\\(JAVACFLAGS\\\) $<\" 'n"
+    "\"ifneq \\\($\\\(OBJDIR\\\),$\\\(SRCDIR\\\)\\\)\" 'n"
+    "\"# Resource file\" 'n"
+    "\"$\\\(OBJDIR\\\)/% : $\\\(SRCDIR\\\)/%\" 'n"
+    "\"	@mkdir -p $\\\(dir $@\\\)\" 'n"
+    "\"	cp $< $@\" 'n"
+    "\"endif\" 'n"
+    "\"\" 'n"
+    "\"\" 'n"
+    "\"# Create obj directory\" 'n"
+    "\"$\\\(OBJDIR\\\) :\" 'n"
+    "\"	mkdir -p $\\\(OBJDIR\\\)\" 'n"
+    "\"\" 'n"
+    "\"# Clean up\" 'n"
+    "\"clean :\" 'n"
+    "\"	rm -fr $\\\(PKG\\\) \" 'n"
+    "\"ifeq \\\($\\\(OBJDIR\\\),$\\\(SRCDIR\\\)\\\)\" 'n"
+    "\"	find $\\\(OBJDIR\\\) -name *.class -exec rm {} \\\\\;\" 'n"
+    "\"else\" 'n"
+    "\"	rm -fr $\\\(OBJDIR\\\) \" 'n"
+    "\"endif\" 'n"
+    "\"\" 'n"
+    "\"# Rebuild\" 'n"
+    "\"rebuild : clean jar\" 'n"
+    )
+  "*Template for creating a Makefile for jde project.
+Setting this variable defines a template instantiation command
+`jde-gen-makefile', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-makefile
+	    (tempo-define-template
+	     "jde-makefile"
+	     (jde-gen-read-template val)
+	     nil
+	     "insert makefile buffer."))
+	  (set-default sym val)))
+
+(defun jde-gen-makefile-buffer ()
+  "Create a new Makefile buffer.
+This command a makefile for jde project using template generated by `jde-gen-makefile'."
+  (interactive)
+  (let* ((default-directory
+	   (file-name-directory
+	    (if (string= jde-current-project "")
+		(or (jde-find-project-file ".") (expand-file-name "./prj.el"))
+	      jde-current-project)))
+	 (file (read-file-name "Makefile " default-directory "Makefile")))
+    (if (file-directory-p file)
+	(setq file (concat file "/Makefile")))
+    (when (or (not (file-exists-p file))
+	      (yes-or-no-p "Makefile exist, do you want to overwrite it? "))
+      (find-file file)
+      (makefile-mode)
+      (delete-region (point-min) (point-max))
+      (jde-gen-makefile))))
+
+(defcustom jde-gen-ant-buildfile-buffer-template
+  (list
+     "\"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?>\" 'n"
+     "\"<project name=\\\"\" jde-project-name \"\\\" default=\\\"compile\\\" basedir=\\\".\\\">\" 'n"
+     "\"\" 'n"
+     "\"  <!-- If you want use ecj compiler, uncomment the next line  -->\" 'n"
+     "\"  <!--   <property name=\\\"build.compiler\\\" value=\\\"org.eclipse.jdt.core.JDTCompilerAdapter\\\"/> -->\" 'n"
+     "\"\" 'n"
+     "\"  <!-- set global properties for this build -->\" 'n"
+     "\"  <property name=\\\"src\\\"     location=\\\"\" (or (car jde-sourcepath) \"src\") \"\\\"/>\" 'n"
+     "\"  <property name=\\\"classes\\\" location=\\\"\" (if (string= jde-compile-option-directory \"\") \"classes\" jde-compile-option-directory) \"\\\"/>\" 'n"
+     "\"  <property name=\\\"pkg\\\"     location=\\\"\" jde-project-name \".jar\\\"/>\" 'n"
+     "\"  <property name=\\\"docs\\\"    location=\\\"docs\\\"/>\" 'n"
+     "\"\" 'n"
+     "\"  <property name=\\\"compile.debug\\\"       value=\\\"true\\\"/>\" 'n"
+     "\"  <property name=\\\"compile.encoding\\\"    value=\\\"\" (if (not (string= jde-compile-option-encoding \"\")) jde-compile-option-encoding) \"\\\"/>\" 'n"
+     "\"  <property name=\\\"compile.deprecation\\\" value=\\\"false\\\"/>\" 'n"
+     "\"  <property name=\\\"compile.optimize\\\"    value=\\\"true\\\"/>\" 'n"
+     "\"\" 'n"
+     "\"  <path id=\\\"compile.classpath\\\">\" 'n"
+     "\"    <pathelement path=\\\"\" (if (string= (jde-build-classpath jde-global-classpath) \"\") \".\" (jde-build-classpath jde-global-classpath)) \"\\\"/>\" 'n"
+     "\"  </path>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"init\\\">\" 'n"
+     "\"    <mkdir dir=\\\"${classes}\\\"/>\" 'n"
+     "\"    <mkdir dir=\\\"${docs}\\\"/>\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"compile\\\" depends=\\\"init\\\" description=\\\"Compile the source\\\">\" 'n"
+     "\"    <javac srcdir=\\\"${src}\\\"\" 'n"
+     "\"           destdir=\\\"${classes}\\\"\" 'n"
+     "(if (not (string= jde-compile-option-encoding \"\")) \"           encoding=\\\"${compile.encoding}\\\"\")"
+     "(if (not (string= jde-compile-option-encoding \"\")) 'n)"
+     "\"           debug=\\\"${compile.debug}\\\"\" 'n"
+     "\"           deprecation=\\\"${compile.deprecation}\\\"\" 'n"
+     "\"           optimize=\\\"${compile.optimize}\\\">\" 'n"
+     "\"      <classpath refid=\\\"compile.classpath\\\"/>\" 'n"
+     "\"      <!-- If you want use ecj compiler ant want setting compile options,\" 'n"
+     "\"           you can uncomment the following and modify compile options\" 'n"
+     "\"      -->\" 'n"
+     "\"      <!--       <compilerarg  -->\" 'n"
+     "\"      <!--           compiler=\\\"org.eclipse.jdt.core.JDTCompilerAdapter\\\"  -->\" 'n"
+     "\"      <!--           line=\\\"-warn:+unused -Xemacs\\\"/> -->\" 'n"
+     "\"    </javac>\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"build\\\" depends=\\\"compile\\\"\" 'n"
+     "\"          description=\\\"Generate the distribution\\\">\" 'n"
+     "\"    <jar jarfile=\\\"${pkg}\\\" basedir=\\\"${classes}\\\"/>\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"clean\\\" description=\\\"Clean up\\\" >\" 'n"
+     "\"    <delete file=\\\"${build}/${pkg}\\\"/>\" 'n"
+     "\"    <delete dir=\\\"${classes}\\\"/>\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"rebuild\\\" depends=\\\"clean, build\\\" description=\\\"Rebuild\\\">\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"  <target name=\\\"javadoc\\\" depends=\\\"init\\\" description=\\\"Create java doc\\\">\" 'n"
+     "\"    <javadoc destdir=\\\"${docs}\\\">\" 'n"
+     "\"      <fileset dir=\\\"${src}\\\">\" 'n"
+     "\"        <include name=\\\"**/*.java\\\"/>\" 'n"
+     "\"        <!--         <exclude name=\\\"**/*Test*\\\"/> -->\" 'n"
+     "\"      </fileset>\" 'n"
+     "\"      <classpath refid=\\\"compile.classpath\\\"/>\" 'n"
+     "\"    </javadoc>\" 'n"
+     "\"  </target>\" 'n"
+     "\"\" 'n"
+     "\"</project>   \" 'n"
+    )
+  "*Template for creating a ant buildfile for jde project.
+Setting this variable defines a template instantiation command
+`jde-gen-ant-buildfile', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-ant-buildfile
+	    (tempo-define-template
+	     "jde-ant-buildfile"
+	     (jde-gen-read-template val)
+	     nil
+	     "insert ant buildfile buffer."))
+	  (set-default sym val)))
+
+(defun jde-gen-ant-buildfile-buffer ()
+  "Create a new Makefile buffer.
+This command a makefile for jde project using template generated by `jde-gen-ant-buildfile'."
+  (interactive)
+  (let* ((default-directory
+	   (file-name-directory
+	    (if (string= jde-current-project "")
+		(or (jde-find-project-file ".") (expand-file-name "./prj.el"))
+	      jde-current-project)))
+	 (jde-ant-buildfile (or (and (boundp 'jde-ant-buildfile) jde-ant-buildfile)
+			     "build.xml"))
+	 (file (read-file-name
+		(concat jde-ant-buildfile " ")
+		default-directory
+		jde-ant-buildfile)))
+    (if (file-directory-p file)
+	(setq file (concat file "/" jde-ant-buildfile)))
+    (when (or (not (file-exists-p file))
+	      (yes-or-no-p "Buildfile exist, do you want to overwrite it? "))
+      (find-file file)
+      (delete-region (point-min) (point-max))
+      (jde-gen-ant-buildfile))))
+
+
+(defcustom jde-gen-buffer-templates
+  (list (cons "Class" 'jde-gen-class)
+	(cons "Interface" 'jde-gen-interface)
+	(cons "Exception Class" 'jde-gen-exception)
+	(cons "Console" 'jde-gen-console)
+	(cons "Swing App" 'jde-gen-jfc-app)
+	(cons "Unit Test" 'jde-junit-test-class))
+  "*Specifies available autocode templates for creating buffers.
+The value of this variable is an association list. The car of
+each element specifies the template's title. The cdr specifies
+a command that inserts the template into a buffer. See the function
+`tempo-define-template' for any easy way to create a template
+insertion command."
+  :group 'jde-gen
+  :type '(repeat
+	  (cons :tag "Template"
+		(string :tag "Title")
+		(function :tag "Command")))
+  :set '(lambda (sym val)
+	  (let ((n (length val))
+		(i 0))
+	    (setq jde-gen-buffer-template-names (list))
+	    (while (< i n)
+	      (setq jde-gen-buffer-template-names
+		    (append
+		     jde-gen-buffer-template-names
+		     (list (cons (car (nth i val)) (1+ i)))))
+	      (setq i (1+ i))))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-buffer (template file)
+  "Create a new Java buffer containing a code template.
+This command inserts the specified template at the beginning
+of the buffer."
+  (interactive
+   (list (completing-read "Template: " jde-gen-buffer-template-names)
+	 (read-file-name "File: ")))
+  (find-file file)
+  (funcall (cdr (assoc template jde-gen-buffer-templates)))
+  (goto-char (point-min))
+  (search-forward "{")
+  (backward-char 1)
+  (c-indent-exp))
+
+
+(defun jde-gen-lookup-and-capitalize (val)
+  "If the given value (val) is the name of saved data, the data is
+stripped of its prefix/suffix (see `jde-wiz-get-name') and it is
+capitalized.  Otherwise, the given value is stripped and capitalized."
+  (if (jde-gen-lookup-named val)
+      (upcase-initials (jde-wiz-get-name (jde-gen-lookup-named val)))
+    (upcase-initials (jde-wiz-get-name val))))
+
+
+(defcustom jde-gen-section-comment-template
+  '(
+    "(p \"Comment: \" comment-line 'noinsert)"
+    "'n"
+    "\"// \" (s comment-line) '>'n'n'>"
+    )
+  "*Template for generating a section comment. Used as an introductory
+comment to a source code section by code generating functions."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-section-comment
+	    (tempo-define-template
+	     "section comment"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert section comment."))
+	  (set-default sym val)))
+
+(defcustom jde-gen-inner-class-template
+  '(
+    "(end-of-line) '& \"class \" (P \"Class name: \" class) '>"
+    "\" \" (jde-gen-get-extend-class)"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " '>'n)"
+    "\"{\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  nil"
+    "  (jde-gen-lookup-named 'class)"
+    "  nil"
+    " )"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " '>'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "'>'n"
+    "(jde-gen-get-interface-implementation)"
+    "'>'n"
+
+    "\"}\" '>'n'>"
+    )
+  "*Template that creates an empty private class at point."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (tempo-define-template "java-inner-class"
+				 (jde-gen-read-template val)
+				 nil
+				 "Insert inner class.")
+	  (defalias 'jde-gen-inner-class-internal
+	    (list 'lambda (list)
+		  (list 'tempo-template-java-inner-class)
+		  (list 'jde-gen-insert-interface-implementation)))
+	  (set-default sym val)))
+
+(defun jde-gen-inner-class ()
+  (interactive)
+  (jde-gen-inner-class-internal)
+  (goto-char (scan-lists (point) -1 0))
+  (c-indent-exp))
+
+(defcustom jde-gen-action-listener-template
+  '(
+    "'& (P \"Component name: \")"
+    "\".addActionListener(\" jde-gen-method-signature-padding-2 "
+    "\"new ActionListener\" jde-gen-method-signature-padding-1 \"()\" '>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " jde-gen-method-signature-padding-3"
+    " 'n)"
+
+    "\"{\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"actionPerformed\""
+    "  \"ActionEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "\"}\" jde-gen-method-signature-padding-2 \");\"'>'n'>'n'>"
+    )
+  "*Template for generating an action listener.
+Setting this variable defines a template instantiation
+command, `jde-gen-action-listener', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-action-listener
+	    (tempo-define-template
+	     "java-action-listener"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton action listener."))
+	  (set-default sym val)))
+
+(defcustom jde-gen-window-listener-template
+  '(
+    "(end-of-line) '& (P \"Window name: \")"
+    "\".addWindowListener(\" jde-gen-method-signature-padding-2 "
+    "\"new WindowAdapter\" jde-gen-method-signature-padding-1 \"()\"'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " jde-gen-method-signature-padding-3"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowActivated\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowClosed\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowClosing\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    " \"System.exit(0);\" '>'n \"}\""
+    "'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowDeactivated\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowDeiconified\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowIconified\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"windowOpened\""
+    "  \"WindowEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "\"}\" jde-gen-method-signature-padding-2 \");\" '>'n'>"
+    )
+  "*Template for generating a window listener.
+Setting this variable defines a template instantiation
+command, `jde-gen-window-listener', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-window-listener
+	    (tempo-define-template
+	     "java-window-listener"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton window listener."))
+	  (set-default sym val)))
+
+
+
+(defcustom jde-gen-mouse-listener-template
+  '(
+    "(end-of-line) '& (P \"Component name: \")"
+    "\".addMouseListener(\" jde-gen-method-signature-padding-2 "
+    "\"new MouseAdapter\" jde-gen-method-signature-padding-1 \"()\" '>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " jde-gen-method-signature-padding-3"
+    " 'n)"
+    "\"{\"'>'n "
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseClicked\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseEntered\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseExited\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mousePressed\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseReleased\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "\"}\" jde-gen-method-signature-padding-2 \");\"'>'n'>"
+    )
+  "*Template for generating a mouse listener.
+Setting this variable defines a template instantiation
+command, `jde-gen-mouse-listener', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-mouse-listener
+	    (tempo-define-template
+	     "java-mouse-listener"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton mouse listener."))
+	  (set-default sym val)))
+
+(defcustom jde-gen-mouse-motion-listener-template
+  '(
+    "(end-of-line) '& (P \"Component name: \")"
+    "\".addMouseMotionListener(\" jde-gen-method-signature-padding-2 "
+    "\"new MouseMotionAdapter\" jde-gen-method-signature-padding-1 \"()\" '>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " jde-gen-method-signature-padding-3"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseDragged\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"mouseMoved\""
+    "  \"MouseEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "\"}\" jde-gen-method-signature-padding-2 \");\"'>'n'>"
+    )
+  "*Template for generating a mouse listener.
+Setting this variable defines a template instantiation
+command, `jde-gen-mouse-motion-listener', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-mouse-motion-listener
+	    (tempo-define-template
+	     "java-mouse-motion-listener"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton mouse motion listener."))
+	  (set-default sym val)))
+
+(defcustom jde-gen-change-listener-template
+  '(
+    "'& (P \"Component name: \")"
+    "\".addChangeListener(\" jde-gen-method-signature-padding-2 "
+    "\"new ChangeListener\" jde-gen-method-signature-padding-1 \"()\" '>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " jde-gen-method-signature-padding-3"
+    " 'n)"
+
+    "\"{\"'>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"stateChanged\""
+    "  \"ChangeEvent e\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n"
+
+    "\"}\" jde-gen-method-signature-padding-2 \");\"'>'n'>'n'>"
+    )
+  "*Template for generating a change listener.
+Setting this variable defines a template instantiation
+command, `jde-gen-change-listener', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-change-listener
+	    (tempo-define-template
+	     "java-change-listener"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton change listener."))
+	  (set-default sym val)))
+
+(defcustom jde-gen-main-method-template
+  '(
+    "(jde-gen-save-excursion"
+    " (jde-wiz-gen-method"
+    "   \"public static\""
+    "   \"void\""
+    "   \"main\""
+    "   \"String[] args\""
+    "   \"\" \"\"))"
+    ";; don't move point"
+    "(setq tempo-marks nil)"
+    )
+  "Template for generating the main method.
+Setting this variable defines a template instantiation
+command, `jde-gen-main-method', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-main-method
+	    (tempo-define-template
+	     "main-method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton main method."))
+	  (set-default sym val)))
+
+
+(defcustom  jde-gen-println
+  '(
+    "(beginning-of-line)"
+    "\"System.out.println(\" ~ \");\" '>'n'>"
+    )
+  "*Template for generating a System.out.println statement."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-println
+	    (tempo-define-template
+	     "println"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert println statement."))
+	  (set-default sym val)))
+
+(defcustom  jde-gen-beep
+  '(
+    "(end-of-line) '&"
+    "\"Toolkit.getDefaultToolkit().beep();\"'>'n'>"
+    )
+  "*Template for generating a Toolkit.getDefaultToolkit().beep() statement."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-beep
+	    (tempo-define-template
+	     "beep statement"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert beep statement."))
+	  (set-default sym val)))
+
+(defcustom  jde-gen-property-change-support
+  '(
+    "(end-of-line) '&"
+
+    "\"protected PropertyChangeSupport pcs =  new PropertyChangeSupport(this);\" '>'n '>'n"
+
+
+    "\"/**\" '>'n"
+    "\"* Adds a PropertyChangeListener to the listener list.\" '>'n"
+    "\"* The listener is registered for all properties.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param listener The PropertyChangeListener to be added\" '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"addPropertyChangeListener\""
+    "  \"PropertyChangeListener listener\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "\"pcs.addPropertyChangeListener(listener);\" '>'n \"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Removes a PropertyChangeListener from the listener list.\" '>'n"
+    "\"* This removes a PropertyChangeListener that was registered\" '>'n"
+    "\"* for all properties.\" '>'n"
+    "\"*\" '>'n "
+    "\"* @param listener The PropertyChangeListener to be removed\" '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"removePropertyChangeListener\""
+    "  \"PropertyChangeListener listener\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'>\"pcs.removePropertyChangeListener(listener);\" '>'n \"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Adds a PropertyChangeListener for a specific property.\" '>'n"
+    "\"* The listener will be invoked only when a call on firePropertyChange\" '>'n"
+    "\"* names that specific property.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param propertyName The name of the property to listen on\" '>'n"
+    "\"* @param listener The PropertyChangeListener to be added\" '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"addPropertyChangeListener\""
+    "  \"String propertyName, PropertyChangeListener listener\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.addPropertyChangeListener(propertyName, listener);\" '>'n"
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Removes a PropertyChangeListener for a specific property.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param propertyName The name of the property that was listened on\" '>'n"
+    "\"* @param listener The PropertyChangeListener to be removed\"'>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"removePropertyChangeListener\""
+    "  \"String propertyName, PropertyChangeListener listener\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.removePropertyChangeListener(propertyName, listener);\" '>'n"
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Reports a bound property update to any registered listeners. \" '>'n"
+    "\"* No event is fired if old and new are equal and non-null.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param propertyName The programmatic name of the property\" '>'n"
+    "\"*                     that was changed\" '>'n"
+    "\"* @param oldValue The old value of the property\" '>'n"
+    "\"* @param newValue The new value of the property.\" '>'n \"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"firePropertyChange\""
+    "  \"String propertyName, Object oldValue, Object newValue\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.firePropertyChange(propertyName, oldValue, newValue);\" '>'n"
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Reports a bound property update to any registered listeners. \" '>'n"
+    "\"* No event is fired if old and new are equal and non-null.\" '>'n"
+    "\"* This is merely a convenience wrapper around the more general\" '>'n"
+    "\"* firePropertyChange method that takes Object values.\" '>'n"
+    "\"* No event is fired if old and new are equal and non-null.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param propertyName The programmatic name of the property\" '>'n"
+    "\"*                     that was changed\" '>'n"
+    "\"* @param oldValue The old value of the property\" '>'n"
+    "\"* @param newValue The new value of the property.\" '>'n \"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"firePropertyChange\""
+    "  \"String propertyName, int oldValue, int newValue\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.firePropertyChange(propertyName, oldValue, newValue);\" '>'n"
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Reports a bound property update to any registered listeners. \" '>'n"
+    "\"* No event is fired if old and new are equal and non-null.\" '>'n"
+    "\"* This is merely a convenience wrapper around the more general\" '>'n"
+    "\"* firePropertyChange method that takes Object values.\" '>'n"
+    "\"* No event is fired if old and new are equal and non-null.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param propertyName The programmatic name of the property\" '>'n"
+    "\"*                     that was changed\" '>'n"
+    "\"* @param oldValue The old value of the property\" '>'n"
+    "\"* @param newValue The new value of the property.\" '>'n \"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"firePropertyChange\""
+    "  \"String propertyName, boolean oldValue, boolean newValue\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.firePropertyChange(propertyName, oldValue, newValue);\" '>'n"
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Fires an existing PropertyChangeEvent to any registered listeners.\" '>'n"
+    "\"* No event is fired if the given event's old and new values are\"'>'n"
+    "\"* equal and non-null. \" '>'n"
+    "\"*\" '>'n"
+    "\"* @param evt The PropertyChangeEvent object.\" '>'n\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"firePropertyChange\""
+    "  \"PropertyChangeEvent evt\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"pcs.firePropertyChange(evt);\" '>'n \"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* Checks if there are any listeners for a specific property.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @param evt The PropertyChangeEvent object.\" '>'n"
+    "\"* @return <code>true</code>if there are one or more listeners\"'>'n"
+    "\"*             for the given property\" '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"boolean\""
+    "  \"hasListeners\""
+    "  \"String propertyName\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "'> \"return pcs.hasListeners(propertyName);\" '>'n \"}\" '>'n '>'n'>"
+    )
+  "*Template for adding property change support to a class."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-property-change-support
+	    (tempo-define-template
+	     "property change support template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert property change support template."))
+	  (set-default sym val)))
+
+(defcustom  jde-gen-listener-registry
+  '(
+    "(p \"Listener class (fully qualified): \" listenerFQN 'noinsert)"
+    "(tempo-save-named 'listener-class "
+    " (replace-in-string (tempo-lookup-named 'listenerFQN)"
+    "                    \"[^\\\\.]+\\\\.\" \"\"))"
+    "(tempo-save-named 'listener-vector "
+    " (concat (jde-wiz-downcase-initials (tempo-lookup-named 'listener-class))"
+    "         \"s\"))"
+
+    "(end-of-line) '&"
+    "\"protected Vector \" (s listener-vector) \" = new Vector();\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* The method <CODE>add\" (s listener-class)"
+    "\"</CODE> allows to \" '>'n"
+    "\"* add a new <CODE>\" (s listener-class) \"</CODE>\" '>'n"
+    "\"* that will be notified of incoming events.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @see \" (s listenerFQN) '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  (concat \"add\" (tempo-lookup-named 'listener-class))"
+    "  (concat (tempo-lookup-named 'listener-class) \" l\")"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "(s listener-vector) \".addElement(l);\" '> 'n"
+
+    "\"}\" '>'n '>'n"
+
+    "\"/**\" '>'n"
+    "\"* The method <CODE>remove\" (s listener-class)"
+    "\"</CODE> allows to \" '>'n"
+    "\"* remove a <CODE>\" (s listener-class) \"</CODE> that was\" '>'n"
+    "\"* previously registered to be notified of incoming events.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @see \" (s listenerFQN) '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  (concat \"remove\" (tempo-lookup-named 'listener-class))"
+    "  (concat (tempo-lookup-named 'listener-class) \" l\")"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    "(s listener-vector) \".removeElement(l);\" '> 'n"
+
+    "\"}\" '>'n '>'n"
+    )
+  "*Template for adding a registry for a class of listeners."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-listener-registry
+	    (tempo-define-template
+	     "listener registry template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert listener registry template."))
+	  (set-default sym val)))
+
+(defcustom  jde-gen-event-source-fire-method-template
+  '(
+    "(p \"Listener class (fully qualified): \" listenerFQN 'noinsert)"
+    "(p \"Listener method name: \" method-name 'noinsert)"
+    "(p \"Method name: \" return-type 'noinsert)"
+    "(p \"Method name: \" params 'noinsert)"
+    "(tempo-save-named 'listener-class "
+    " (replace-in-string (tempo-lookup-named 'listenerFQN)"
+    "                    \"[^\\\\.]+\\\\.\" \"\"))"
+    "(tempo-save-named 'listener-vector "
+    " (concat (jde-wiz-downcase-initials (tempo-lookup-named 'listener-class))"
+    "         \"s\"))"
+    "(tempo-save-named 'fire-method "
+    " (concat \"fire\" (upcase-initials (tempo-lookup-named 'method-name))))"
+    "(tempo-save-named 'param-ids "
+    " (jde-gen-extract-ids-from-params (tempo-lookup-named 'params)))"
+
+    "(end-of-line) '&"
+    "\"/**\" '>'n"
+    "\"* The method <CODE>\" (s fire-method)"
+    "\"</CODE> is used \" '>'n"
+    "\"* to call the <CODE>\" (s method-name) \"</CODE> method of\" '>'n"
+    "\"* every previously registered <CODE>\" (s listener-class) \"</CODE>.\" '>'n"
+    "\"*\" '>'n"
+    "\"* @see \" (s listenerFQN) '>'n"
+    "\"*/\" '>'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  (tempo-lookup-named 'return-type)"
+    "  (tempo-lookup-named 'fire-method)"
+    "  (tempo-lookup-named 'params)"
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+
+    " \"for(int i = 0; i < \" (s listener-vector) \".size(); i++)\" '>"
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"((\" (s listener-class) \")\" (s listener-vector)"
+    "\".elementAt (i)).\" (s method-name) \" (\" (s param-ids) \");\" '> 'n"
+    "\"}\" '>'n"
+
+    "\"}\" '>'n '>'n"
+    )
+  "*Template for adding a registry for a class of listeners."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-event-source-fire-method
+	    (tempo-define-template
+	     "event source fire method template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert event source fire method template."))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-gen-enity-bean-template)
+(defcustom jde-gen-entity-bean-template
+  '(
+    "(jde-import-insert-imports-into-buffer "
+    "  (list \"javax.ejb.*\""
+    "        \"java.rmi.RemoteException\"))"
+    "'>"
+
+    "(jde-gen-method-signature"
+    "   \"public\""
+    "  \"void\""
+    "  \"ejbActivate\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbPassivate\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbLoad\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbStore\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbRemove\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"setEntityContext\""
+    "  \"EntityContext ctx\""
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "'>"
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"unsetEntityContext\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n '>"
+    )
+  "*Template that creates an empty implementation of an EJB Entity Bean."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-entity-bean
+	    (tempo-define-template
+	     "ejb-entity-bean"
+	     (jde-gen-read-template val)
+	     nil
+	     "Adds an implementation of the EJB Entity Bean interface to the
+class in the current buffer at the current point in the buffer. Before invoking
+this command,  position point at the point in the buffer where you want the first
+Entity Bean method to appear. Use `jde-ejb-entity-bean-buffer' to create a complete
+skeleton entity bean implementation from scratch."))
+	  (set-default sym val)))
+
+
+;; (makunbound 'jde-gen-session-bean-template)
+(defcustom jde-gen-session-bean-template
+  '(
+    "(jde-import-insert-imports-into-buffer "
+    "  (list \"javax.ejb.*\""
+    "        \"java.rmi.RemoteException\"))"
+    "'>"
+
+    "(jde-wiz-update-implements-clause \"SessionBean\")"
+    "'>"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbActivate\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbPassivate\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"ejbRemove\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"setSessionContext\""
+    "  \"SessionContext ctx\""
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+
+    "(jde-gen-method-signature"
+    "  \"public\""
+    "  \"void\""
+    "  \"unsetSessionContext\""
+    "  nil"
+    "  \"RemoteException\""
+    " )"
+    "'>"
+
+    ;;we open the bracket according to k&r style or not
+    "(if jde-gen-k&r "
+    " ()"
+    " 'n)"
+    "\"{\"'>'n"
+    "\"}\"'>'n 'n"
+    "'>"
+    )
+  "*Template that creates an empty implementation of an EJB Session Bean."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-session-bean
+	    (tempo-define-template
+	     "ejb-session-bean"
+	     (jde-gen-read-template val)
+	     nil
+	     "Adds an implementation of the EJB Session Bean interface to the
+class in the current buffer at the current point in the buffer. Before invoking
+this command,  position point at the point in the buffer where you want the first
+Session Bean method to appear. Use `jde-ejb-session-bean-buffer' to create a complete
+skeleton session bean implementation from scratch."))
+	  (set-default sym val)))
+
+
+
+;; (makunbound 'jde-gen-method-javadoc-comment)
+(defcustom jde-gen-method-javadoc-comment "template"
+  "Specifies the type of javadoc comment generated by
+the `jde-gen-method-template'. The choices are
+
+   * Template
+
+     Uses `jde-javadoc-autodoc-at-line' function to generate
+     the documentation.
+
+   * Inherit
+
+     Generates a javadoc comment containing only the
+     javadoc (@inheritDoc) tag. This tag causes javadoc
+     to copy the javadoc comment from the abstract
+     method that the generated method implements but
+     only if the javadoc for the abstract method is
+     also being generated.
+
+   * None
+
+     Specifies that the method template not generate
+     a javadoc comment. In this case, javadoc copies
+     the comment from the abstract method if its doc
+     is also being generated in the same run."
+  :group 'jde-gen
+  :type '(choice
+	  (const :tag "Template" "template")
+	  (const :tag "Inherit Tag" "inherit")
+	  (const :tag "None" "none")))
+
+
+;; (makunbound 'jde-gen-method-template)
+(defcustom jde-gen-method-template
+  '(
+    "(p \"Method modifiers: \" modifiers 'noinsert)"
+    "(p \"Method return type: \" return-type 'noinsert)"
+    "(p \"Method name: \" name 'noinsert)"
+    "(p \"Method parameters: \" parameters 'noinsert)"
+    "(p \"Method exceptions: \" exceptions 'noinsert)"
+    "(p \"Method body: \" default-body 'noinsert)"
+    "(jde-gen-delete-preceding-whitespace) 'n 'n 'p"
+
+    ;; Insert inherit javadoc comment if specified.
+    "(if (string= jde-gen-method-javadoc-comment \"inherit\")"
+    "'(l \"/*\" 'n>"
+    "\"* (@inheritDoc)\" 'n>"
+    "\"*/\" 'n>"
+    "))"
+
+    ;; Insert method signature.
+    "(jde-gen-method-signature"
+    "  (tempo-lookup-named 'modifiers)"
+    "  (tempo-lookup-named 'return-type)"
+    "  (tempo-lookup-named 'name)"
+    "  (tempo-lookup-named 'parameters)"
+    "  (tempo-lookup-named 'exceptions)"
+    " )"
+    "'>"
+
+    "(jde-gen-electric-brace)"
+    "(s default-body) (jde-gen-indent) 'p'n"
+    "\"}\"'>'n"
+    "(if (string= jde-gen-method-javadoc-comment \"template\")"
+    " (progn (tempo-backward-mark) (tempo-backward-mark) (beginning-of-line)"
+    "   (jde-gen-save-excursion (jde-javadoc-autodoc-at-line))"
+    "   (tempo-forward-mark) nil)"
+    "  (progn (tempo-backward-mark) nil))"
+    "(setq tempo-marks nil) ;; prevent tempo from moving point"
+    )
+  "*Template for generating a skeleton method. The
+`jde-gen-method-javadoc-comment' variable controls whether this
+template generates a javadoc comment for the method, and, if so, what
+kind of comment. Setting this variable defines a template
+instantiation command, `jde-gen-method', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-method
+	    (tempo-define-template
+	     "method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert skeleton method."))
+	  (set-default sym val)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;_* equals method generator
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defcustom jde-gen-equals-trailing-and-operators nil
+  "Specifies whether the '&&' operators in a generated equals
+method are added at the end of the line or at the beginning.  If
+this variable is t, the operator will be added at the end of the
+line, else on the next line before the comparison.  With
+`jde-gen-equals-trailing-and-operators' set to nil:
+
+    return (a == o.a)
+	&& (b == o.b)
+	&& (s == null ? o.s == null : s.equals(o.s));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+
+    return (a == o.a) &&
+	(b == o.b) &&
+	(s == null ? o.s == null : s.equals(o.s));
+"
+  :group 'jde-gen
+  :type 'boolean)
+
+;;;###autoload
+(defcustom jde-gen-equals-parens-around-expression nil
+  "Specifies whether the generated equals expression should be
+surrounded by parentheses.
+With `jde-gen-equals-trailing-and-operators' set to nil:
+
+    return ((a == o.a)
+	    && (b == o.b)
+	    && (s == null ? o.s == null : s.equals(o.s)));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+
+    return ((a == o.a) &&
+	    (b == o.b) &&
+	    (s == null ? o.s == null : s.equals(o.s)));
+"
+  :group 'jde-gen
+  :type 'boolean)
+
+;;;###autoload
+(defcustom jde-gen-equals-method-template
+  '("'>"
+    "\"/**\" '> 'n"
+    "\" * Check if this object is equal (equivalent) to another object.\" '> 'n"
+    "\" */\" '> 'n"
+    "(jde-gen-method-signature \"public\" \"boolean\" \"equals\" \"Object obj\")"
+    "(jde-gen-electric-brace)"
+    "\"if (obj == this) return true;\" '> 'n"
+    "\"if ((obj == null) || !getClass().equals(obj.getClass())) return false;\" '> 'n"
+    "'> 'n"
+    "(jde-gen-equals-return \"obj\" \"o\") '> 'n"
+    "\"}\" '> 'n '>))"
+    )
+  "*Template for creating an equals method.
+Setting this variable defines a template instantiation command
+`jde-gen-equals-method', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-equals-method
+	    (tempo-define-template
+	     "java-equals-method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Create an equals method at the current point."))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-equals-return (&optional parm-name var-name class)
+  "Generate a body of an appropriate override for the
+java.lang.Object#equals(Object) function. This function gets the
+list of member variables from`jde-parse-get-serializable-members'.
+
+The first optional parameter `parm-name' is the parameter name of
+the Object argument of the equals function.  Default is \"obj\".
+
+The second optional parameter `var-name' denotes the variable
+name used to cast the \"obj\" argument to. The default is \"o\".
+
+The third optional parameter `class' can be a semantic tag, which
+is then used instead of the result of `semantic-current-tag'.
+
+Example:
+    class Bean {
+	int a;
+	long b;
+	String s;
+    }
+
+Result:
+    Bean o = (Bean) obj;
+
+    return (a == o.a)
+	&& (b == o.b)
+	&& (s == null ? o.s == null : s.equals(o.s));
+
+Or, with `jde-gen-equals-trailing-and-operators' set to t:
+    Bean o = (Bean) obj;
+
+    return (a == o.a) &&
+	(b == o.b) &&
+	(s == null ? o.s == null : s.equals(o.s));
+"
+  (interactive)
+  (let* ((parm (or parm-name "obj"))
+	 (var (or var-name "o"))
+	 (class-tag (or class (semantic-current-tag)))
+	 (class-name (semantic-tag-name class-tag))
+	 (members (sort (jde-parse-get-serializable-members class-tag)
+			'jde-parse-compare-member-types))
+	 (super (car (semantic-tag-type-superclasses class-tag)))
+	 (extends (and super (not (string= "Object" super)))))
+    (list 'l '>
+	  class-name " " var " = (" class-name ") " parm ";" '>'n '>'n
+	  "return "
+	  (if jde-gen-equals-parens-around-expression "(")
+	  (if extends (list 'l "super.equals(" var ")")) '>
+	  (cons 'l (mapcar
+	      (lambda (tag)
+		(let ((name (semantic-tag-name tag))
+		      (type (semantic-tag-type tag)))
+		  (list 'l (if extends (jde-gen-equals-add-and-operator)
+			     (setq extends t) nil)
+			(cond
+			 ;; primitive arrays
+			 ((and (string-match "\\`\\(byte\\|char\\|short\\|int\\|long\\|float\\|double\\|boolean\\)" type)
+			     (or (string-match "\\[.*\\]" name) (string-match "\\[.*\\]" type)))
+			  (let ((array (replace-regexp-in-string "\\[.*\\]" "" name)))
+			    (concat "java.util.Arrays.equals(" array ", " var "." array ")")))
+
+			 ;; object arrays
+			 ((or (string-match "\\[.*\\]" name) (string-match "\\[.*\\]" type))
+			  (let ((array (replace-regexp-in-string "\\[.*\\]" "" name)))
+			    (concat "java.util.Arrays.deepEquals(" array ", " var "." array ")")))
+
+			 ;; primitives
+			 ((or (semantic-tag-of-type-p tag "byte")
+			      (semantic-tag-of-type-p tag "char")
+			      (semantic-tag-of-type-p tag "short")
+			      (semantic-tag-of-type-p tag "int")
+			      (semantic-tag-of-type-p tag "long")
+			      (semantic-tag-of-type-p tag "boolean"))
+			  (concat "(" name " == " var "." name ")"))
+
+			 ;; floating point; use epsilon?
+			 ((or (semantic-tag-of-type-p tag "float")
+			      (semantic-tag-of-type-p tag "double"))
+			  (concat "(" name " == " var "." name ")"))
+
+			 ;; object references
+			 (t (concat "(" name " == null ? " var "." name " == null : "
+				    name ".equals(" var "." name "))" )))
+			'>))) members))
+	  (if jde-gen-equals-parens-around-expression ")") ";")))
+
+(defun jde-gen-equals-add-and-operator ()
+  (if jde-gen-equals-trailing-and-operators
+      (list 'l " &&" '> 'n '>)
+    (list 'l '> 'n '> "&& ")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;_* hashCode method generator
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defcustom jde-gen-hashcode-method-template
+  '("'>"
+    "\"/**\" '> 'n"
+    "\" * Calculate the hash code for this object.\" '> 'n"
+    "\" * \" '> 'n"
+    "\" * <p>The rules laid out in J. Blosh's Effective Java are used\" '> 'n"
+    "\" * for the hash code calculation.</p>\" '> 'n"
+    "\" * \" '> 'n"
+    "\" * @return the hash code.\" '> 'n"
+    "\" * \" '> 'n"
+    "\" * @see java.lang.Object#hashCode\" '> 'n"
+    "\" */\" '> 'n"
+    "(jde-gen-method-signature \"public\"\ \"int\" \"hashCode\" nil)"
+    "(jde-gen-electric-brace)"
+    "(jde-gen-hashcode-body) '> 'n"
+    "\"}\" '> 'n '>" )
+  "*Template for creating a hashCode method.
+Setting this variable defines a template instantiation command
+`jde-gen-hashcode-method', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-hashcode-method
+	    (tempo-define-template
+	     "java-hashcode-method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Create a hashCode method at the current point."))
+	  (set-default sym val)))
+
+(defvar jde-gen-hashcode-primes
+  '(11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97)
+    "a list of all two digit prime numbers")
+
+(defvar jde-gen-hashcode-current-prime 0
+  "a prime number")
+
+(defun jde-gen-hashcode-next-prime ()
+  "Get the next prime number"
+  (let ((last jde-gen-hashcode-current-prime))
+    (setq jde-gen-hashcode-current-prime (% (+ 1 last)
+					    (length jde-gen-hashcode-primes)))
+    (int-to-string (nth last jde-gen-hashcode-primes))))
+
+;;;###autoload
+(defun jde-gen-hashcode-body (&optional var-name class)
+  "Generate a body of a hashCode function.
+This function gets the list of member variables of the current
+class from `jde-parse-get-serializable-members'.
+
+The first optional parameter `var-name' denotes the variable name used
+to calculate the hash code, the default is \"code\".
+
+The second optional parameter `class' can be a semantic tag, which is
+then used instead of the result of `semantic-current-tag'.
+"
+  (interactive)
+  (let* ((var (or var-name "code"))
+	 (class-tag (or class (semantic-current-tag)))
+	 (members (sort (jde-parse-get-serializable-members class-tag)
+			'jde-parse-compare-member-types))
+	 (super (car (semantic-tag-type-superclasses class-tag)))
+	 (extends (and super (not (string= "Object" super)))))
+    (list 'l "int " var " = "
+	  (if extends "super.hashCode()" (jde-gen-hashcode-next-prime)) ";"
+	  '> 'n '> 'n
+	  (cons
+	   'l
+	   (mapcar
+	    (lambda (tag)
+	      (let ((name (semantic-tag-name tag))
+		    (type (semantic-tag-type tag)))
+		(list 'l var " = " var " * 37 + "
+		      (cond
+		       ;; arrays must be first
+
+		       ;; primitive arrays
+		       ((and (string-match "\\`\\(byte\\|char\\|short\\|int\\|long\\|float\\|double\\|boolean\\)" type)
+			     (or (string-match "\\[.*\\]" name) (string-match "\\[.*\\]" type)))
+			(let ((array (replace-regexp-in-string "\\[.*\\]" "" name)))
+			  (concat "java.util.Arrays.hashCode(" array ")")))
+		       ;; object arrays
+		       ((or (string-match "\\[.*\\]" name) (string-match "\\[\\]" type))
+			(let ((array (replace-regexp-in-string "\\[.*\\]" "" name)))
+			  (concat "java.util.Arrays.deepHashCode(" array ")")))
+
+		       ;; smaller types
+		       ((or (semantic-tag-of-type-p tag "byte")
+			    (semantic-tag-of-type-p tag "char")
+			    (semantic-tag-of-type-p tag "short"))
+			(concat "(int) " name))
+		       ;; integers
+		       ((semantic-tag-of-type-p tag "int") name)
+		       ((semantic-tag-of-type-p tag "long")
+			(concat "(int) (" name " ^ (" name " >> 32))" ))
+		       ;; booleans
+		       ((semantic-tag-of-type-p tag "boolean")
+			(concat "(" name " ? 1 : 0)"))
+
+		       ;; floating point
+		       ((semantic-tag-of-type-p tag "float")
+			(concat "Float.floatToIntBits(" name ")" ))
+		       ((semantic-tag-of-type-p tag "double")
+			(concat "(int) (Double.doubleToLongBits(" name ") ^ (Double.doubleToLongBits(" name ") >> 32))" ))
+
+
+		       ;; object references
+		       (t
+			(concat "(" name " == null ? " (jde-gen-hashcode-next-prime)
+				" : " name ".hashCode())"))) ";"
+		      '> 'n))) members))
+	  '> 'n
+	  "return " var ";")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;_* toString method generator
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defcustom jde-gen-tostring-method-template
+  '("'>"
+    "(when jde-gen-create-javadoc"
+    "'(l "
+    "\"/**\" '> 'n"
+    "\" * Get a string representation of this object.\" '> 'n"
+    "\" * \" '> 'n"
+    "\" * @return a string representation of this object.\" '> 'n"
+    "\" * \" '> 'n"
+    "\" * @see java.lang.Object#toString\" '> 'n"
+    "\" */\" '> 'n))"
+    "(jde-gen-method-signature \"public\" \"String\" \"toString\" \"\")"
+    "(jde-gen-electric-brace)"
+    "(jde-gen-tostring-return) '> 'n"
+    "\"}\" '>"
+    )
+  "*Template for creating an toString method.
+Setting this variable defines a template instantiation
+command `jde-gen-tostring-method', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-gen-tostring-method
+	    (tempo-define-template
+	     "java-tostring-method"
+	     (jde-gen-read-template val)
+	     nil
+	     "Create an toString method at the current point."))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-tostring-return (&optional class)
+  "Generate a body of an appropriate override for the
+java.lang.Object#toString function. This gets the member variables
+of the current class from semantic via `semantic-current-tag'."
+  (interactive)
+  (let* ((class-tag (or class (semantic-current-tag)))
+	 (class-name (semantic-tag-name class-tag))
+	 (members (jde-parse-get-member-variables class-tag))
+	 (super (car (semantic-tag-type-superclasses class-tag)))
+	 (extends (and super (not (string= "Object" super))))
+	 (first t)
+	 (str-bld-type (if (< 1.4 (string-to-number (caar jde-jdk-registry)))
+			   "StringBuilder"
+			 "StringBuffer")))
+    (list 'l '>
+	  (format "return new %s(" str-bld-type)
+	  (cons 'l (mapcar
+		    (lambda (tag)
+		      (let ((name (semantic-tag-name tag)))
+			(prog1
+			    (list 'l (concat (if (not first) ".append(")
+					     "\""
+					     (if (not first) ", "))
+				  name "=\" + " name ")"
+				  '> 'n)
+			  (setq first nil))))
+		    members))
+	  ".toString();")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;_* Generate all object methods
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun jde-gen-object-methods ()
+  "Generates an equals(), a hashCode() and a toString method."
+  (interactive)
+  (jde-gen-equals-method)
+  (newline-and-indent)
+  (jde-gen-hashcode-method)
+  (newline-and-indent)
+  (jde-gen-tostring-method))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;_* Exception class wizard
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defcustom jde-gen-exception-buffer-template
+  (list
+   "(open-line 1) (funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * Exception <code>\" (jde-parse-get-buffer-unqualified-class) \"</code>.\" '> 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) '> 'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag))"
+   "\" \" (jde-gen-save-excursion (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag))"
+   "\" \" (jde-javadoc-insert-end-block)"
+   "\"public class \""
+   "(jde-parse-get-buffer-unqualified-class)" "\" \" (jde-gen-get-extend-class)"
+   "(jde-gen-electric-brace)"
+   "'p'n"
+
+   ;; Default constructor
+   "'> (jde-javadoc-insert-start-block)"
+    "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n"
+    "\"* <code>null</code> as its detail message.\" '>'n"
+    "'> (jde-javadoc-insert-end-block)"
+    "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) nil)"
+    "(jde-gen-electric-brace)"
+    "\"}\"'>'n"
+    ;; leave a blank line with no indentation
+    "'n"
+
+   ;; Constructor with message
+   "'> (jde-javadoc-insert-start-block)"
+    "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n"
+    "\"* the specified detail message.\" '>'n"
+    "'> (jde-javadoc-insert-empty-line)"
+    "\"* @param message the detail message string.\" '> 'n"
+    "'> (jde-javadoc-insert-end-block)"
+    "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"String message\")"
+    "(jde-gen-electric-brace)"
+    "\"super(message);\" '> 'n"
+    "\"}\" '> 'n"
+    ;; leave a blank line with no indentation
+    "'n"
+
+   ;; Constructor with a cause
+   "'> (jde-javadoc-insert-start-block)"
+    "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n"
+    "\"* the specified cause and a detail message of\" '> 'n"
+    "\"* <code>(cause == null ? null : cause.toString())</code>\" '> 'n"
+    "\"* (which typically contains the class and detail message of cause).\" '> 'n"
+    "'> (jde-javadoc-insert-empty-line)"
+    "\"* @param cause the causing throwable. A null value is permitted\" '> 'n"
+    "\"*     and indicates that the cause is nonexistent or unknown.\" '> 'n"
+    "'> (jde-javadoc-insert-end-block)"
+    "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"Throwable cause\")"
+    "(jde-gen-electric-brace)"
+    "\"super(cause == null ? (String) null : cause.toString());\" '> 'n"
+    "\"initCause(cause);\" '> 'n"
+    "\"}\" '> 'n"
+    ;; leave a blank line with no indentation
+    "'n"
+
+    ;; Constructor with a message and a cause
+   "'> (jde-javadoc-insert-start-block)"
+    "\"* Constructs a new <code>\" (jde-parse-get-buffer-unqualified-class) \"</code> with\" '>'n"
+    "\"* the specified cause and message.\" '> 'n"
+    "'> (jde-javadoc-insert-empty-line)"
+    "\"* @param message the detail message string.\" '> 'n"
+    "\"* @param cause the causing throwable. A null value is permitted\" '> 'n"
+    "\"*     and indicates that the cause is nonexistent or unknown.\" '> 'n"
+    "'> (jde-javadoc-insert-end-block)"
+    "(jde-gen-method-signature \"public\" nil (jde-parse-get-buffer-unqualified-class) \"String message,Throwable cause\")"
+    "(jde-gen-electric-brace)"
+    "\"super(message);\" '> 'n"
+    "\"initCause(cause);\" '> 'n"
+    "\"}\" '> 'n"
+    ;; leave a blank line with no indentation
+
+    "\"}\" '>" "(if jde-gen-comments (concat \" // \" (jde-parse-get-buffer-unqualified-class)))"
+   "'>'n")
+  "*Template for a new exception class.
+Setting this variable defines a template instantiation
+command `jde-gen-exception', as a side-effect."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (tempo-define-template "java-exception-buffer-template"
+				 (jde-gen-read-template val)
+				 nil
+				 "Insert a generic Java exception buffer skeleton.")
+	  (defalias 'jde-gen-exception
+	    (list 'lambda (list)
+		  (list 'interactive)
+		  (list 'tempo-template-java-exception-buffer-template)))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-gen-exception-buffer (file)
+  "Create a new Java buffer containing an exception class of the same name.
+This command inserts the template generated by `jde-gen-exception'.
+It then moves the point to the location of the first method."
+  (interactive "F")
+  (find-file file)
+  (jde-gen-exception))
+
+
+(defcustom jde-gen-code-templates
+  (list (cons "Get Set Pair" 'jde-gen-get-set)
+	(cons "main method" 'jde-gen-main-method)
+	(cons "toString Method (Apache)" 'jde-gen-tostring-method)
+	(cons "Equals Method" 'jde-gen-equals-method)
+	(cons "Hash Code Method" 'jde-gen-hashcode-method)
+	(cons "Deep clone" 'jde-gen-deep-clone)
+	(cons "Action Listener" 'jde-gen-action-listener)
+	(cons "Change Listener" 'jde-gen-change-listener)
+	(cons "Window Listener" 'jde-gen-window-listener)
+	(cons "Mouse Listener" 'jde-gen-mouse-listener)
+	(cons "Mouse Motion Listener" 'jde-gen-mouse-motion-listener)
+	(cons "Inner Class" 'jde-gen-inner-class)
+	(cons "println" 'jde-gen-println)
+	(cons "beep" 'jde-gen-beep)
+	(cons "property change support" 'jde-gen-property-change-support)
+	(cons "EJB Entity Bean" 'jde-gen-entity-bean)
+	(cons "EJB Session Bean" 'jde-gen-session-bean)
+	)
+  "*Specifies available autocode templates.
+The value of this variable is an association list. The car of
+each element specifies a template name. The cdr specifies
+a command that inserts the template into a buffer. See the function
+`tempo-define-template' for any easy way to create a template
+insertion command."
+  :group 'jde-gen
+  :type '(repeat
+	  (cons :tag "Template"
+		(string :tag "Name")
+		(function :tag "Command")))
+  :set '(lambda (sym val)
+	  (let ((n (length val))
+		(i 0))
+	    (setq jde-gen-template-names (list))
+	    (while (< i n)
+	      (setq jde-gen-template-names
+		    (append
+		     jde-gen-template-names
+		     (list (cons (car (nth i val)) (1+ i)))))
+	      (setq i (1+ i))))
+	  (set-default sym val)))
+
+(defun jde-gen-code (name)
+  "Insert the code template specified by NAME at point.
+The template must be one of those specified by the
+variable `jde-gen-code-templates'."
+  (interactive
+   (list
+    (completing-read "Template name: " jde-gen-template-names)))
+  (funcall (cdr (assoc name jde-gen-code-templates))))
+
+
+
+;;; Control Flow Templates
+;;; Contributed by Eric D. Friedman <friedman@lmi.net>
+
+(defvar jde-gen-abbrev-templates nil
+  "List of abbreviation templates defined by
+`jde-gen-define-abbrev-template'.")
+
+(defun jde-gen-define-abbrev-template (abbrev template)
+  "Defines a TEMPLATE that replaces ABBREV when you type ABBREV
+in a JDE source buffer. TEMPLATE is a list of tempo template
+elements. See `tempo-define-template' for information on
+template elements. The resulting template is added to the
+list bound to `jde-gen-abbrev-templates'. "
+  (let ((template-name (concat "jde-gen-" abbrev)))
+    (defalias (intern template-name)
+      (tempo-define-template
+       template-name
+       template
+       abbrev
+       (format "JDE template for %s control flow abbreviation." abbrev)
+       'jde-gen-abbrev-templates))))
+
+(defcustom jde-gen-cflow-enable t
+  "Enables abbreviations for Java control flow constructs."
+  :group 'jde-gen
+  :type 'boolean)
+
+
+(defcustom jde-gen-comments nil
+  "*If no-nil, use comments, else do not use comments.
+with comments:
+
+      try {
+
+      } catch (Exception e) {
+
+      } // end of try-catch
+
+
+witout comments:
+
+      try {
+
+      } catch (Exception e) {
+
+      }
+
+Setting this variable to t, uses comments in skeletons and templates."
+  :group 'jde-gen
+  :type 'boolean)
+
+;; (makunbound 'jde-gen-cflow-if)
+(defcustom jde-gen-cflow-if
+  '(
+    "'> \"if\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"if-clause: \" clause)"
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    "'(l \" // end of if (\" (s clause) \")\"))"
+    "'>'n"
+    )
+  "Skeleton if statement. To insert the if statement at point, type if
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode'"
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "if"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-else
+  '(
+    "'> \"else\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of else\"))"
+    "'>'n"
+    )
+  "Skeleton else statement. To insert the statement at point, type else
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "else"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-if-else
+  '(
+    "'> \"if\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"if-clause: \" clause)"
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\" '>"
+    "(if jde-gen-comments "
+    " '(l \" // end of if (\" (s clause) \")\" '>'n)"
+    " (if jde-gen-k&r "
+    "  jde-gen-conditional-padding-3 "
+    "  'n))"
+    "'> \"else\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of if (\" (s clause) \") else\"))"
+    "'>'n"
+    )
+  "Skeleton if-else statement. To insert the statement at point, type ife
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "ife"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-else-if
+  '(
+    "'> \"else if\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"else-if-clause: \" clause) "
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of else if (\" (s clause) \")\"))"
+    "'>'n"
+    )
+  "Skeleton else-if statement. To insert the statement at point, type eif
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "eif"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-gen-cflow-while)
+(defcustom jde-gen-cflow-while
+  '(
+    "'> \"while\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"while-clause: \" clause) "
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of while (\" (s clause) \")\"))"
+    "'>'n"
+    )
+  "Skeleton while statement. To insert the statement at point, type while
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "while"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-for
+  '(
+    "'> \"for\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"for-clause: \" clause) "
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of for (\" (s clause) \")\"))"
+    "'>'n"
+    )
+  "Skeleton for statement. To insert the statement at point, type for
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "for"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-for-i
+  '(
+    "'> \"for\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 \"int \" (p \"variable: \" var) "
+    "\" = 0; \" (s var) \" < \" (p \"upper bound: \" upper-bound) \"; \" (s var) \"++\""
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of for (int \" (s var) \" = 0; \""
+    "(s var) \" < \" (s upper-bound) \"; \" (s var) \"++)\"))"
+    "'>'n"
+    )
+  "Skeleton for i statement. To insert the statement at point, type fori
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information.
+
+Note: `tempo-interactive' must be set to a non-nil value to be prompted
+      for variable name and upper-bounds information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "fori"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-for-iter
+  '(
+    "'> \"for\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 \"Iterator \" (p \"variable: \" var) "
+    "\" = \" (p \"collection: \" coll) \".iterator(); \""
+    "(s var) \".hasNext();\""
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r"
+    "(s var) \".next();\" '>'n'>"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of for (Iterator \" (s var) \" = \" (s coll)"
+    " \".iterator(); \" (s var) \".hasNext();)\"))"
+    "'>'n"
+    )
+  "Skeleton for iterator statement. To insert the statement at point,
+type foriter and then space.  Note that abbrev mode must be
+enabled. See `jde-enable-abbrev-mode' for more information.
+
+Note: `tempo-interactive' must be set to a non-nil value to be prompted
+      for variable name and collection name information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "foriter"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-switch
+  '(
+    "'> \"switch\" jde-gen-conditional-padding-1 "
+    " \"(\" jde-gen-conditional-padding-2 (p \"switch-condition: \" clause) "
+    "       jde-gen-conditional-padding-2 \")\""
+    "'>"
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "\"case \" (p \"first value: \" first-value) \":\"'>'n"
+    "'p'n"            ;; point will end up here
+    "\"break;\"'>'n"
+    "\"default:\"'>'n'>"
+    "\"break;\"'>'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of switch (\" (s clause) \")\"))"
+    "'>'n"
+    )
+  "Skeleton switch statement. To insert the statement at point, type switch
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "switch"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-case
+  '(
+    "\"case \" (p \"value: \" value) \":\"'>'n"
+    "'p'n"           ;; point will end up here
+    "\"break;\"'>"
+    )
+  "Skeleton case statement. To insert the statement at point, type case
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "case"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+;; (makunbound 'jde-gen-cflow-try-catch)
+(defcustom jde-gen-cflow-try-catch
+  '(
+    "'> \"try \""
+    "(jde-gen-electric-brace)"
+    "'r'n"
+    "\"}\" '>"
+
+    ;; "(if jde-gen-k&r "
+    ;; "  jde-gen-conditional-padding-3 "
+    ;; " 'n)"
+
+    "(if jde-gen-comments "
+    " '(l \" // end of try\" '>'n)"
+    " (if jde-gen-k&r "
+    "  jde-gen-conditional-padding-3 "
+    "  'n))"
+
+    "\"catch\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"catch what: \" clause) \" e\""
+    "      jde-gen-conditional-padding-2 \")\" '>"
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'p'n"
+    "\"}\""
+    " (if jde-gen-comments "
+    "	'(l \" // end of try-catch\"))"
+    "'>'n"
+    )
+  "Skeleton try-catch statement. To insert the statement at point, type try
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "try"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-catch
+  '(
+    "'> \"catch\" jde-gen-conditional-padding-1  "
+    "\"(\" jde-gen-conditional-padding-2 (p \"catch what: \" clause) \" e\""
+    "      jde-gen-conditional-padding-2 \")\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of catch\"))"
+    "'>'n"
+    )
+  "Skeleton catch statement. To insert the statement at point, type catch
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "catch"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-try-finally
+  '(
+    "'> \"try \""
+    "(jde-gen-electric-brace)"
+    "'r'n"
+    "\"}\" '>"
+    "(if jde-gen-k&r "
+    "  jde-gen-conditional-padding-3 "
+    " 'n)"
+    "\"catch\" jde-gen-conditional-padding-1 "
+    "\"(\" jde-gen-conditional-padding-2 (p \"catch what: \" clause) \" e\""
+    "      jde-gen-conditional-padding-2 \")\" '>"
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\" '> "
+    "(if jde-gen-k&r "
+    "  jde-gen-conditional-padding-3 "
+    " 'n)"
+    "\"finally\" '>"
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of try-finally\"))"
+    "'>'n"
+    )
+  "Skeleton try-catch-finally statement. To insert the statement at point, type
+tryf and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "tryf"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defcustom jde-gen-cflow-finally
+  '(
+    "'> \"finally\""
+    "(jde-gen-electric-brace jde-gen-conditional-padding-3)"
+    "'r'n"
+    "\"}\""
+    "(if jde-gen-comments "
+    " '(l \" // end of finally\"))"
+    "'>'n"
+    )
+  "Skeleton finally statement. To insert the statement at point, type finally
+and then space. Note that abbrev mode must be enabled. See
+`jde-enable-abbrev-mode' for more information."
+  :group 'jde-gen
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (jde-gen-define-abbrev-template
+	   "finally"
+	   (jde-gen-read-template val))
+	  (set-default sym val)))
+
+(defun jde-gen-abbrev-hook ()
+  "Abbreviation hook. Inserts an abbreviation template.
+Abbreviation name is deleted from buffer before the template is inserted.
+This function does nothing, if point is in a comment or string.
+Returns t, if the template has been inserted, otherwise nil."
+  (unless (jde-parse-comment-or-quoted-p)
+    (let* ((abbrev-start
+	    (or abbrev-start-location
+		(save-excursion (re-search-backward "\\<.*\\="))))
+	   (abbrev
+	    (buffer-substring-no-properties abbrev-start (point)))
+	   (template (assoc-string abbrev jde-gen-abbrev-templates t)))
+      (if template
+	  (progn
+	    (delete-backward-char (length abbrev))
+	    ;; Following let avoids infinite expansion.
+	    ;; Infinite expansions could be caused by
+	    ;; (newline) in templates.
+	    ;; e.g. "else" (newline)
+	    (let (local-abbrev-table)
+	      (funcall (cdr template)))
+	    t) ; don't insert self-inserting input character that triggered the expansion.
+	(error "Template for abbreviation %s not found!" abbrev)))))
+
+;; The following enables the hook to control the treatment of the
+;; self-inserting input character that triggered the expansion.
+(put 'jde-gen-abbrev-hook 'no-self-insert t)
+
+(defun jde-gen-load-abbrev-templates ()
+  "Defines jde-mode abbrevs for the control flow templates."
+  (loop for template in jde-gen-abbrev-templates do
+	(let ((abbrev (car template)))
+	  (define-abbrev
+	    local-abbrev-table
+	    abbrev
+	    (if (featurep 'xemacs) abbrev t) ;; Hack (see note below)
+	    'jde-gen-abbrev-hook
+	    0))))
+
+;; Note: the previous function uses the following hack to address the
+;; problem of preventing expansion of control flow abbreviations in
+;; comments and strings. The hack defines the abbreviation such that
+;; abbrev-mode doesn't replace the abbreviation.
+;; If the abbreviation is not in a string or comment, the hook
+;; then erases the abbreviation and replaces it with the corresponding
+;; control flow expansion. If the abbreviation is in a string or
+;; comment, the hook does nothing, simply leaving the abbreviation
+;; as the user typed it.
+
+(defun jde-gen-test-cflow-templates ()
+   (interactive)
+   (set-buffer (get-buffer-create "*jde-cflow-test*"))
+   (jde-mode)
+   (erase-buffer)
+   (insert "public class Test {\n\n}")
+   (backward-char 2)
+   (loop for flags in '((t . t) (t . nil) (nil . t) (nil . nil)) do
+	 (let ((jde-gen-k&r (car flags))
+	       (jde-gen-comments (cdr flags)))
+	   (insert (format "/**** jde-gen-comments: %S jde-gen-k&r: %S ****/\n\n"
+			   jde-gen-comments jde-gen-k&r))
+	   (loop for abbrev in
+		 '(("if"      (clause . "true"))
+		   ("else")
+		   ("ife"     (clause . "true"))
+		   ("eif"     (clause . "true"))
+		   ("while"   (clause . "true"))
+		   ("for"     (clause . "int i = 0; i < 10; i++"))
+		   ("fori"    (var . "i") (upper-bound . "10"))
+		   ("foriter" (var . "iter") (coll . "list"))
+		   ("switch"  (clause . "digit") (first-value . "1"))
+		   ("case"    (value . "2"))
+		   ("try"     (clause . "Exception"))
+		   ("catch"   (clause . "Exception"))
+		   ("tryf"    (clause . "Exception"))
+		   ("finally"))
+		 do
+		 (let (insertations
+		       (abbrev-start-location (point)))
+		   (insert (car abbrev))
+		   (while (setq abbrev (cdr abbrev))
+		     (setq insertations (car abbrev))
+		     (tempo-save-named (car insertations) (cdr insertations)))
+		   (jde-gen-abbrev-hook)
+		   (goto-char (- (point-max) 2))
+		   (insert "\n"))))))
+
+
+
+(defun jde-gen-try-catch-wrapper (beg end)
+  "Wrap the region from BEG to END into a try/catch block.
+BEG and END are modified so the region only contains complete lines."
+  (interactive "r")
+  (jde-gen-generic-wrapper beg end "try" "catch"))
+
+(defun jde-gen-try-finally-wrapper (beg end)
+  "Wrap the region from BEG to END into a try/finally block.
+BEG and END are modified so the region only contains complete lines."
+  (interactive "r")
+  (jde-gen-generic-wrapper beg end "try" "finally"))
+
+(defun jde-gen-if-wrapper (beg end)
+  "Wraps the region from beg to end into an if block."
+  (interactive "r")
+  (jde-gen-generic-wrapper beg end "if"))
+
+(defun jde-gen-if-else-wrapper (beg end)
+  "Wraps the region from beg to end into an if block."
+  (interactive "r")
+  (jde-gen-generic-wrapper beg end "if" "else"))
+
+;;This code is a modified version of the method qflib-make-try-wrapper
+(defun jde-gen-generic-wrapper (beg end expr1 &optional expr2)
+  "Wrap the region from BEG to END into a EXPR1 and EXPR2 block. if EXPR2 is
+nil it is omitted. BEG and END are modified so the region only contains
+complete lines."
+  (let ((to (make-marker))
+	indent-region-function)
+    (set-marker to
+		(save-excursion
+		  (goto-char end)
+		  (if (and (bolp)
+			   (not (= beg end)))
+		      (point)
+		    (end-of-line)
+		    (1+ (point)))))
+    (goto-char beg)
+    (beginning-of-line)
+    (insert expr1)
+    (if (string= expr1 "if")
+	(insert (concat jde-gen-conditional-padding-1
+			"(" jde-gen-conditional-padding-2 ")")))
+    (if jde-gen-k&r
+	(insert " ")
+      (insert "\n"))
+    (insert "{\n")
+    (if jde-gen-k&r
+	(forward-char -1)
+      (forward-char -4))
+    (indent-for-tab-command)
+    (indent-region (point) to nil)
+    (goto-char to)
+    (insert "}")
+    (if expr2
+	(progn
+	  (if jde-gen-k&r
+	      (insert jde-gen-conditional-padding-3)
+	    (insert "\n"))
+	  (if (string= expr2 "catch")
+	      (insert (concat expr2 jde-gen-conditional-padding-1
+			      "(" jde-gen-conditional-padding-2 " e"
+			      jde-gen-conditional-padding-2 ")"))
+	    (insert expr2))
+	  (if jde-gen-k&r
+	      (insert jde-gen-conditional-padding-3)
+	    (insert "\n"))
+	  (insert "{\n}")
+	  (if jde-gen-comments
+	      (insert " // end of " expr1
+		      (if expr2
+			  (concat "-" expr2))))))
+    (insert "\n")
+    (indent-region (marker-position to) (point) nil)
+    (goto-char to)
+    (if (string= expr1 "if")
+	(search-backward (concat "(" jde-gen-conditional-padding-2 ")")))
+    (if (string= expr2 "catch")
+	(search-forward "("))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                           ;;
+;;  Electric Return Mode                                                     ;;
+;;                                                                           ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom jde-electric-return-p nil
+  "Specifies whether the JDEE's electric return mode is
+enabled for this session or project. This mode causes the JDEE to
+match an open brace at the end of a line with a closing
+brace. You can use `jde-toggle-electric-return' at any
+time to enable or disable eelctric return mode."
+  :group 'jde-gen
+  :type 'boolean
+  :set '(lambda (sym val)
+	  (if (featurep 'jde)
+	    (let ((curr-project
+		   (with-current-buffer jde-current-buffer
+		     jde-current-project)))
+	      (mapc
+	       (lambda (buf)
+		 (with-current-buffer buf
+		   (let ((key (car (read-from-string "[return]"))))
+		       (if val
+			   (define-key (current-local-map) key 'jde-electric-return)
+			 (local-unset-key key)))))
+	       (jde-get-project-source-buffers))))
+	  (setq jde-electric-return-mode val)
+	  (set-default sym val)))
+
+(defcustom jde-newline-function  '(newline)
+  "Indent command that `jde-electric-return' calls."
+  :group 'jde-gen
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Function: "
+	   :entry-format " %b %v"
+	   (const newline)
+	   (const newline-and-indent)
+	   (const align-newline-and-indent)
+	   (function my-custom-newline-function))))
+
+(defun jde-gen-embrace()
+  "Match an open brace at the end of a line
+with a closing brace (if required), put point on a
+empty line between the braces, and indent the new lines.
+
+So if before
+you had:
+
+   pubic void function () {
+			   ^
+You now have:
+
+   pubic void function () {
+
+   } ^
+
+Point must be at the end of the line, or at a } character
+followed by the end of the line.
+
+If it thinks a matching close brace already exists a new one is not inserted.
+Before:
+   pubic void function () {
+   }                       ^
+After:
+   pubic void function () {
+
+   } ^"
+  (interactive)
+  (if (or (eq (point) (point-min))
+	  (save-excursion
+	    (backward-char)
+	    (not (looking-at "{}?$"))))
+      (newline-and-indent)
+    ;; else
+    (progn
+      (newline-and-indent)
+      (newline-and-indent)
+      (when (not (looking-at "}"))
+	(insert "}")
+	(c-indent-command))
+      (forward-line -1)
+      (c-indent-command))))
+
+(defun jde-electric-return ()
+"Invokes `jde-gen-embrace' to close an open brace at the end of a line."
+  (interactive)
+  (if  ;; the current line ends at an open brace.
+       (and
+	(save-excursion
+	  (re-search-backward "{\\s-*" (line-beginning-position) t))
+	(looking-at "}?\\s-*$"))
+      (jde-gen-embrace)
+    (call-interactively (car jde-newline-function))))
+
+(defvar jde-electric-return-mode nil
+  "Nonnil indicates that electric return mode is on.")
+
+(defun jde-electric-return-mode ()
+  "Toggles the JDEE's electric return mode. In electric
+return mode, pressing the Enter key causes the JDEE to
+close open braces at the end of a line. This command enables
+eletric return mode by binding `jde-electric-return' to the
+Return key on your keyboard. It disables electric return mode
+by rebinding the Return key to its original binding."
+  (interactive)
+  (when (boundp 'jde-mode-map)
+    (let ((key (car (read-from-string "[return]"))))
+	   (if jde-electric-return-mode
+	       (local-unset-key key)
+	     (define-key (current-local-map) key 'jde-electric-return))))
+  (setq jde-electric-return-mode (not jde-electric-return-mode))
+  (if jde-electric-return-mode
+      (message "electric return mode on")
+    (message "electric return mode off")))
+
+(provide 'jde-gen)
+
+;; End of jde-gen.el
diff --git a/site/jdee/lisp/jde-gen.elc b/site/jdee/lisp/jde-gen.elc
new file mode 100644
index 0000000..cfa358f
Binary files /dev/null and b/site/jdee/lisp/jde-gen.elc differ
diff --git a/site/jdee/lisp/jde-help.el b/site/jdee/lisp/jde-help.el
new file mode 100644
index 0000000..764a212
--- /dev/null
+++ b/site/jdee/lisp/jde-help.el
@@ -0,0 +1,549 @@
+;;; jde-help.el
+;; $Id: jde-help.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;;         Phillip Lord <plord@hgmp.mrc.ac.uk>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(require 'beanshell)
+(require 'jde-widgets)
+(require 'eieio)
+(require 'jde-util)
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-jdk-doc-url)
+
+
+(defcustom jde-help-docsets
+  (list (list "JDK API"
+	      "http://java.sun.com/javase/6/docs/api"
+	      nil)
+	)
+  "*Lists collections of HTML files documenting Java classes.
+This list is used by the `jde-help-class' command to find help for
+a class. You can specify the following information for each docset:
+
+Docset type
+
+  The following types are valid:
+
+  * JDK API
+
+    JDK API documentation created by JDK developer (e.g., Sun)
+
+  * User (javadoc)
+
+    User collection in javadoc format.
+
+  * User (not javadoc)
+
+    User collection not in javadoc format.
+
+Docset directory
+
+   Directory containing the collection, e.g., d:/jdk1.3/docs/api.  If
+   the docset type is `JDK API' and this field is the empty string, the
+   JDE looks for the docset in the `docs/api' subdirectory of the directory
+   returned by `jde-get-jdk-dir'. The docset directory may be located on
+   a remote system in which case this field should specify the URL of the
+   docset directory, e.g., http://www.javasoft.com/j2se/1.3/docs/api. The
+   GNU utility, wget, or the w3 function `url-file-exists' must be
+   installed on your system to find javadoc pages located on remote
+   systems. Native Windows and cygwin ports of wget are readily available
+   on the Internet. Make sure that wget is in Emacs `exec-path' before
+   attempting to access documentation on remote systems. See
+   `jde-help-remote-file-exists-function' for more information.
+
+Doc lookup function
+
+   Should specify a function that accepts a fully qualified class name,
+   e.g., java.awt.String, and a docset directory and returns a path to
+   an HTML file that documents that class, e.g.,
+   d:/jdk1.2/docs/api/java/awt/String.html. This field must be specified
+   for non-javadoc collections. It is ignored for javadoc colletions.
+"
+  :group 'jde-project
+  :type '(repeat
+	  (list
+	   (radio-button-choice
+	    :format "%t \n%v"
+	    :tag "Docset type:"
+	    (const "JDK API")
+	    (const "User (javadoc)")
+	    (const "User (not javadoc)"))
+	   (file :tag "Docset directory")
+	   ;;(symbol :tag "Doc lookup function")
+	   (choice :tag "Doc lookup function"
+		   (const nil)
+		   function))))
+
+(defcustom jde-help-use-frames t
+   "A non-nil value makes the functions:`jde-help-symbol',
+ `jde-help-class-member' and `jde-help-class' use frames when displaying
+ the html javadocs."
+   :group 'jde-project
+   :type 'boolean)
+
+(defcustom jde-help-remote-file-exists-function (list "wget")
+  "Specifies the function the jde uses to retrieve remote documents.
+wget is a Unix utility available on Windows as part of the Cygwin
+package. `url-file-exists' is part of the url Emacs Lisp library,
+which is included in the Emacs w3 package."
+  :group 'jde-project
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Function:"
+	   (const "wget")
+	   (const "url-file-exists")))
+  :set '(lambda (sym val)
+	  (if (and
+	       (string= (car val) "url-file-exists")
+	       (locate-library "url"))
+	       (autoload 'url-file-exists "url" nil nil nil))
+	  (set-default sym val)))
+
+(defcustom jde-help-wget-tries nil
+  "Specifies the number of times that the JDEE should try getting
+documentation from a remote site This option applies only if wget is
+the`jde-help-remote-file-exists-function'. It sets wget's --tries
+command-line option. It is helpful in situations where
+one of the the sites in `jde-help-docsets' is not always reachable."
+  :group 'jde-project
+  :type '(choice (const :tag "Try once" :value nil)
+		 (const :tag "Never stop trying" :value 0)
+		 (integer :tag "Number of retries" :value 1)))
+
+(defcustom jde-help-wget-timeout nil
+  "Specifies the length of time that the JDEE should wait for a remote site
+to respond to a request for a document. This option applies only if wget is
+the`jde-help-remote-file-exists-function'. It sets wget's --timeout
+command-line option. It is helpful in situations where
+one of the the sites in `jde-help-docsets' is not always reachable."
+  :group 'jde-project
+  :type '(choice (const :tag "Default (900 s.)" :value nil)
+		 (const :tag "Disable timeout checking" :value 0)
+		 (integer :tag "Timeout (seconds)" :value 900)))
+
+(defcustom jde-help-wget-command-line-options "--quiet"
+  "Specifies additional options (beyond --spider, --tries and
+--timeout) to pass to wget, if wget is used for
+`jde-help-remote-file-exists-function'."
+  :group 'jde-project
+  :type 'string)
+
+(defcustom jde-help-browser-function "browse-url"
+  "Specifies the function that the JDEE uses to display
+HTML pages."
+  :group 'jde-project
+  :type '(choice
+	  (const :tag "browse-url" :value "browse-url")
+	  (const :tag "w3m-browse-url" :value "w3m-browse-url")
+	  (function :tag "Other" :value identity)))
+
+
+(defun jde-file-to-url (file)
+  "Convert FILE path to a URL. If FILE is a DOS path, this
+function replaces the colon in the drive specifier with a
+vertical bar (|) because both Internet Explorer and Netscape
+accept the resulting URL whereas Netscape does not accept
+a drive specifier with a colon."
+  (if (or (string-match "http:" file)
+	  (string-match "file:" file))
+      file
+    (format "file://localhost%s"
+	    (let ((file (jde-convert-cygwin-path file)))
+	      ;; Check for DOS path.
+	      (if (string-match "[a-zA-Z]:" file)
+		  (concat "/" (substitute ?| ?: file))
+		file)))))
+
+
+(defun jde-help-docset-get-type (docset)
+  (nth 0 docset))
+
+(defun jde-help-docset-get-dir (docset)
+  (let ((path (nth 1 docset)))
+    (if (or (string-match "http:" path)
+	    (string= path ""))
+	path
+      (jde-normalize-path path 'jde-help-docsets))))
+
+(defun jde-help-docset-get-lookup-function (docset)
+  (nth 2 docset))
+
+(defun jde-help-find-javadoc (class docset-dir)
+  "Searches DOCSET-DIR for the javadoc HTML page
+for CLASS and, if found, returns the URL of the
+javadoc page for CLASS. This function uses the function
+specified by `jde-help-remote-file-exists-function'
+to verify the existence of pages located on remote systems."
+  (let ((class-path
+	 (concat (substitute ?/ ?. class) ".html"))
+	url)
+    (cond
+     ((string-match "http:" docset-dir)
+      (setq url (concat docset-dir "/" class-path))
+	     (if (string=
+		  (car jde-help-remote-file-exists-function)
+		  "url-file-exists")
+	  (if (fboundp 'url-file-exists)
+	      (if (not
+		   (url-file-exists url))
+		  (setq url nil))
+	    (error "Cannot find url-file-exists function"))
+	(if (executable-find
+	     (if (eq system-type 'windows-nt) "wget.exe" "wget"))
+	    (let ((cmd (concat "wget --spider "
+			   (if jde-help-wget-tries
+			       (concat "--tries=" jde-help-wget-tries))
+			   (if jde-help-wget-timeout
+			       (concat "--timeout=" jde-help-wget-timeout))
+			   jde-help-wget-command-line-options
+			       " " url)))
+	      (unless (= 0 (shell-command cmd))
+		(setq url nil)))
+	  (error
+	   (concat "Cannot find wget. This utility is needed "
+		   "to access javadoc on remote systems.")))))
+     (t
+      (let ((doc-path
+	     (expand-file-name class-path docset-dir)))
+	(if (file-exists-p doc-path)
+	    (setq url (jde-file-to-url doc-path))))))
+    url))
+
+(defun jde-help-get-root-dir (docfile)
+  "Returns the javadoc root directory of docfile"
+  (if jde-help-docsets
+      (let ((docsets jde-help-docsets)
+	    dir)
+	(while docsets
+	  (let ((docset (car docsets)))
+	    (setq dir (jde-help-docset-get-dir docset))
+	    (if (and
+		 (or (not dir)
+		     (string= dir ""))
+		 (string= (jde-help-docset-get-type docset) "JDK API"))
+		(setq dir (expand-file-name "docs/api" (jde-get-jdk-dir))))
+	    (setq dir (jde-file-to-url (concat dir "/")))
+	    (if (string-match dir docfile)
+		(setq docsets nil)
+	      (setq docsets (cdr docsets)))))
+	  dir)))
+
+(defun jde-help-get-doc (class)
+"Gets URL to the HTML file for CLASS where CLASS is a
+qualified class name."
+  (if class
+      (if jde-help-docsets
+	(let ((paths
+	       (mapcar
+		(lambda (docset)
+		  (cond
+		   ((string= (jde-help-docset-get-type docset) "JDK API")
+		    (let ((dir (jde-help-docset-get-dir docset)))
+		      (if (string= dir "")
+			  (progn
+			    (setq dir (expand-file-name "docs/api" (jde-get-jdk-dir)))
+			    (if (not (file-exists-p dir))
+				(error "Cannot find default JDK API doc directory: %s"
+				       dir))))
+		      (jde-help-find-javadoc class dir)))
+		   ((string= (jde-help-docset-get-type docset) "User (javadoc)")
+		    (jde-help-find-javadoc
+		     class
+		      (jde-help-docset-get-dir docset)))
+		   (t
+		    (apply
+		     (jde-help-docset-get-lookup-function docset)
+		     class
+		     (list (jde-help-docset-get-dir docset))))))
+		jde-help-docsets)))
+	  (setq paths (delq nil paths))
+	  ;; Return first file found.
+	  (if paths (car paths) paths))
+	(error "%s" "Help error: No docsets available. See jde-help-docsets."))))
+
+
+(defun jde-help-symbol-internal (class &optional method-name)
+  (let ((classinfo (jde-complete-get-classinfo class))
+	(doc-file (jde-help-get-doc class))
+	method-signature member pos)
+    (if (and method-name classinfo)
+	(setq method-signature (jde-complete-find-all-completions
+				(list class method-name)
+				classinfo)))
+    (if method-signature
+	(progn
+	  (setq member (caar method-signature))
+	  (setq pos (string-match " : " member))
+	  (if pos
+	      (setq member (substring member 0 pos)))))
+    (if doc-file
+	(jde-help-show-class-member-doc doc-file member)
+      (message "Error: cannot find documentation for class %s " class))))
+
+(defun jde-help-symbol ()
+  "Displays help for a symbol. The symbol may reference an object, a
+class, or a method or field. If the symbol references a class, this
+function displays the javadoc for the class. If the symbol references
+an object, this method displays the javadoc for the class of the
+object. If the symbol references a field or a method, this function
+displays the javadoc for the class of the object of which the field or
+method is a member at the point where the method of field is
+documented."
+  (interactive)
+  (condition-case err
+      (let* ((parse-result (jde-help-parse-symbol-at-point))
+	     (unqualified-name (thing-at-point 'symbol))
+	     (class-name (jde-parse-get-qualified-name unqualified-name t))
+	     (pair (jde-parse-java-variable-at-point)))
+	(if (not class-name)
+	    (if parse-result
+		(progn
+		  (setq unqualified-name  (car parse-result))
+		  (setq class-name (jde-parse-get-qualified-name unqualified-name t)))))
+	(if class-name
+	    (jde-help-symbol-internal class-name (cdr parse-result))
+	  (if (not (string= (car pair) ""))
+	      (progn
+		(setq class-name (jde-parse-get-qualified-name (car pair) t))
+		(jde-help-symbol-internal class-name unqualified-name))
+	    (message "Error: cannot find class '%s' on the current classpath." unqualified-name))))
+    (error
+     (message "%s" (error-message-string err)))))
+
+
+(defun jde-help-show-document (doc-url &rest args)
+  "Displays DOC-URL in the browser specified by `jde-help-browser-function'."
+  (let ((browser-function
+	 (cond
+	  ((functionp jde-help-browser-function)
+	   jde-help-browser-function)
+	  ((string= jde-help-browser-function "w3m-browse-url")
+	   'w3m-browse-url)
+	  (t
+	   'browse-url))))
+  (apply browser-function doc-url args)))
+
+(defun jde-help-parse-symbol-at-point ()
+  "Returns (cons TYPE MEMBER) where TYPE is the declared type of
+the object referenced by the (qualified) name at point and MEMBER is the
+field or method referenced by the name if qualified."
+  (let ((parse-result (jde-parse-qualified-name-at-point)))
+    (if parse-result
+	(let* ((qualifier (car parse-result))
+	       (name (cdr parse-result))
+	       (obj (if qualifier qualifier name))
+	       (member (if qualifier name)))
+	  (if (not
+	       (and
+		qualifier
+		(string-match "[.]" qualifier)))
+	      (let ((declared-type (car (jde-parse-declared-type-of obj))))
+		(if declared-type
+		    (cons declared-type  member))))))))
+
+(defun jde-help-class (&optional class-name)
+  "Return help for CLASS."
+  (interactive)
+  (let* ((class
+	  (or class-name
+	     (read-from-minibuffer "Class: " (thing-at-point 'symbol))))
+	 (fq-class-name
+	  (jde-parse-select-qualified-class-name class))
+	 (doc-file
+	  (if fq-class-name
+	      (jde-help-get-doc fq-class-name))))
+    (if doc-file
+	(jde-help-show-class-member-doc doc-file)
+      (message "Error: cannot find documentation for %s" class))))
+
+
+(defun jde-help-show-class-member-doc (docfile &optional member)
+  "Show DOCFILE in the browser defined by `jde-help-browser-function'
+where DOCFILE is the class and MEMBER is the anchor for a class
+member. If the `jde-help-browser-function' is is not w3m-browse-url,
+this function creates a temporary HTML file that redirects the
+browser to DOCFILE. This is a workaround made necessary by the fact
+that the default browser function for Windows uses the Windows
+ShellExecute function to invoke Internet Explorer and for some reason
+ShellExecute does not pass the anchor to IE. If `jde-help-use-frames'
+is nonnil, this function creates a metafile that displays the
+multiframe version of the standard Javadoc page."
+  (let* ((anchor (if member (concat docfile "#" member)
+		  docfile))
+	 (doc-url (jde-file-to-url anchor)))
+    (unless (string= jde-help-browser-function "w3m-browse-url")
+      (let* ((temp-directory (jde-temp-directory))
+	     (metafile (expand-file-name "jde_meta.html" temp-directory))
+	     (buff (find-file-noselect metafile nil t))
+	     (standard-output buff)
+	     (pos (string-match "[^/]*$" docfile))
+	     (root (jde-help-get-root-dir docfile)))
+	(if buff
+	    (progn
+	      (save-excursion
+		(set-buffer buff)
+		(erase-buffer)
+		(if jde-help-use-frames
+		    (progn
+		      (princ "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\">\n")
+		      (princ "<html>\n<head>\n")
+		      (princ "<title>JDE javadoc window</title>\n</head>\n")
+		      (princ "<frameset cols=\"20%,80%\" onload=\"window.focus()\">\n")
+		      (princ "<frameset rows=\"30%,70%\">\n")
+		      (princ
+		       (format "<frame src=\"%soverview-frame.html\" name=\"packageListFrame\">\n"
+			       root))
+		      (princ
+		       (format "<frame src=\"%spackage-frame.html\" name=\"packageFrame\">\n"
+			       (substring docfile 0 pos)))
+		      (princ
+		       (format "<frame src=\"%sallclasses-frame.html\" name=\"packageFrame\">\n"
+			     root))
+		      (princ "</frameset>\n")
+		      (princ
+		       (format "<frame src=\"%s\" name=\"classFrame\">\n" doc-url))
+		      (princ "</frameset>\n")
+		      (princ "</html>\n"))
+		  (progn
+		    (princ "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n")
+		    (princ "<html>\n<head>\n")
+		    (princ
+		     (format "<meta http-equiv=\"Refresh\" content=\"0; URL=%s\">\n"  doc-url))
+			     (princ "</head>\n<body onload=\"window.focus()\">\n</body>\n</html>")))
+		(save-buffer)
+		(kill-buffer buff))
+	      (setq doc-url metafile))
+	  (error "Unable to create a temporary file in %s directory."
+		 temporary-file-directory))))
+    (jde-help-show-document doc-url)))
+
+(defun jde-help-popup-class-member-menu (class &optional title)
+  "Popup a menu of the fields and methods defined by CLASS.
+Return the member selected by the user."
+  (let ((classinfo
+	  (jde-complete-get-classinfo class)))
+    (if classinfo
+	(let (pos
+	      (pair
+	       (if (= (length classinfo) 1)
+		   ;; if only one item match, return it
+		   (car classinfo)
+
+		 (if (eq jde-complete-function 'jde-complete-menu)
+		     ;; delegates menu handling to imenu :-) Popup window at
+		     ;; text cursor
+		     (imenu--mouse-menu classinfo
+					(jde-cursor-posn-as-event)
+					(or title "Class Members"))
+		   (assoc (completing-read (or title "Completion: ")
+					   classinfo)
+			  classinfo)))))
+	  (setq pos (string-match " : " (car pair)))
+	  (if pos
+	      (substring (car pair) 0 pos)
+	    (cdr pair)))
+      (message "Class %s has no members." class))))
+
+(defun jde-help-class-member (&optional class-name)
+  "Pop up a menu of the fields and methods of CLASS.
+Then search `jde-help-docsets' for javadoc for CLASS. If found,
+point the browser to the doc for the selected method or
+field. Note: this command does not check whether the doc
+for CLASS actually documents the selected class member."
+  (interactive)
+  (let* ((class
+	 (or class-name
+	     (read-from-minibuffer "Class: " (thing-at-point 'symbol))))
+	 (fq-class-name
+	  (jde-parse-select-qualified-class-name class))
+	 (doc-file (jde-help-get-doc fq-class-name)))
+    (if doc-file
+	(let ((member (jde-help-popup-class-member-menu fq-class-name)))
+	  (if member
+	      (jde-help-show-class-member-doc doc-file member)))
+      (message "Error: cannot find documentation for %s" fq-class-name))))
+
+
+(defun jde-help-get-jdk-doc-url ()
+  "Gets a URL for the JDK documentation."
+  (cond
+   ((string= jde-jdk-doc-url "")
+    (let ((path (expand-file-name "docs/index.html" (jde-get-jdk-dir))))
+      (if (file-exists-p path)
+	  path
+	(error "Cannot find JDK documentation at default location: "
+	       path))))
+   ((string-match "http:" jde-jdk-doc-url)
+    (if (or (and
+	     (fboundp 'url-file-exists)
+	     (not (url-file-exists jde-jdk-doc-url)))
+	    (and
+	     (executable-find (if (eq system-type 'windows-nt) "wget.exe" "wget"))
+	     (not (string-match "200"
+				(shell-command-to-string
+				 (concat "wget --spider "
+					 (if jde-help-wget-tries
+					     (concat "--tries=" jde-help-wget-tries))
+					 (if jde-help-wget-timeout
+					     (concat "--timeout=" jde-help-wget-timeout))
+					 jde-help-wget-command-line-options
+					 " " jde-jdk-doc-url))))))
+	(error "JDK doc does not exist at jde-jdk-doc-url value: %s" jde-jdk-doc-url))
+    jde-jdk-doc-url)
+   ((string-match "file://" jde-jdk-doc-url)
+    (let ((path (substring jde-jdk-doc-url 7)))
+      (if (file-exists-p path)
+	  path
+	(error "JDK doc does not exist at jde-jdk-doc-url value file://%s" path))))
+   ((not (string-match jde-jdk-doc-url ""))
+    (let ((path (jde-normalize-path jde-jdk-doc-url)))
+      (if (file-exists-p path)
+	  path
+	(error "JDK doc does not exist at jde-jdk-doc-url value %s" path))))
+   (t
+    (let ((path (expand-file-name "docs/index.html"
+				  (jde-normalize-path (jde-get-jdk-dir)))))
+      (if (file-exists-p path)
+	  path
+	(error "Cannot find JDK doc. Please set jde-jdk-directory or jde-jdk-doc-url"))))))
+
+;;;###autoload
+(defun jde-help-beanshell ()
+  "Displays the BeanShell documentation."
+  (interactive)
+  (browse-url "http://www.beanshell.org/manual/contents.html"))
+
+;;;###autoload
+(defun jde-help-browse-jdk-doc ()
+  "Displays the JDK doc in a web browser. This function uses the URL
+stored in the variable jde-jdk-doc-url to locate the JDK documentation."
+  (interactive)
+  (browse-url (jde-help-get-jdk-doc-url)))
+
+(provide 'jde-help)
+
+;; End of jde-help.el
diff --git a/site/jdee/lisp/jde-help.elc b/site/jdee/lisp/jde-help.elc
new file mode 100644
index 0000000..fd4dd03
Binary files /dev/null and b/site/jdee/lisp/jde-help.elc differ
diff --git a/site/jdee/lisp/jde-imenu.el b/site/jdee/lisp/jde-imenu.el
new file mode 100644
index 0000000..fdd5790
--- /dev/null
+++ b/site/jdee/lisp/jde-imenu.el
@@ -0,0 +1,439 @@
+;;; jde-imenu.el --- imenu setup for the JDE
+;; $Id: jde-imenu.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>,
+;;         David Ponce <david@dponce.com>
+;; Maintainer: David Ponce, Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2000, 2001, 2002, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'semantic-java)
+(require 'semantic-imenu)
+(require 'regexp-opt)
+
+;;; Compatibility
+(cond
+ ((fboundp 'char-valid-p)
+  (defalias 'jde-imenu-char-valid-p 'char-valid-p))
+ ((fboundp 'char-int-p)
+  (defalias 'jde-imenu-char-valid-p 'char-int-p))
+ (t
+  (defun jde-imenu-char-valid-p (object)
+    "Return t if OBJECT is a valid normal character."
+    (condition-case nil
+	(progn
+	  (char-to-string object)
+	  t)
+      (error nil))))
+ )
+
+;;;;
+;;;; Global options
+;;;;
+
+(defcustom jde-imenu-enable t
+  "*Enables creation of a classes index menu in the Emacs menubar."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-imenu-create-index-function 'semantic-create-imenu-index
+  "*Function used to create the \"Classes\" imenu.
+Files must be reopened to update the imenu when this option is
+changed. The default is the generic `semantic-create-imenu-index'."
+  :group 'jde-project
+  :type 'function)
+
+(defcustom jde-imenu-include-signature t
+  "*If non-nil imenu displays full method signatures and field types.
+Use *Rescan* to rebuild the imenu when you have changed this option."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-imenu-include-modifiers nil
+  "*If non-nil imenu shows abbreviations for Java modifiers.
+Use *Rescan* to rebuild the imenu when you have changed this option.
+See also `jde-imenu-modifier-abbrev-alist'."
+  :group 'jde-project
+  :type 'boolean)
+
+(defconst jde-imenu-default-modifier-abbrev-alist
+  '(
+    ("public"        . ?+)              ; +
+    ("protected"     . 177)             ; ±
+    ("private"       . 172)             ; ¬
+
+    ("static"        . ?§)              ; §
+    ("transient"     . ?#)              ; #
+    ("volatile"      . ?~)              ; ~
+
+    ("abstract"      . 170)             ; Ŗ
+    ("final"         . 182)             ; ¶
+    ("native"        . ?$)              ; $
+
+    ("synchronized"  . ?@)              ; @
+    ("strictfp"      . ?%)              ; %
+    )
+  "Default value of `jde-imenu-modifier-abbrev-alist'.")
+
+(defconst jde-imenu-valid-modifiers-regexp
+  (concat "\\b"
+	  (regexp-opt
+	   (mapcar #'car jde-imenu-default-modifier-abbrev-alist) t)
+	  "\\b")
+  "Regexp of valid Java modifiers used by
+`jde-imenu-modifier-field-validate'.")
+
+(defun jde-imenu-modifier-field-validate (widget)
+  "Validate a Java modifier value.
+Used by `jde-imenu-modifier-abbrev-alist' customization."
+  (save-excursion
+    (let ((value (widget-value widget)))
+      (if (and (stringp value)
+	       (string-match jde-imenu-valid-modifiers-regexp value))
+	  nil
+	(widget-put widget :error (format "Invalid modifier: %S" value))
+	widget))))
+
+(defun jde-imenu-abbrev-field-validate (widget)
+  "Validate a character abbreviation.
+ Used by `jde-imenu-modifier-abbrev-alist' customization."
+  (save-excursion
+    (let ((value (widget-value widget)))
+      (if (jde-imenu-char-valid-p value)
+	  nil
+	(widget-put widget :error
+		    (format "Invalid character value: %S" value))
+	widget))))
+
+(defcustom jde-imenu-modifier-abbrev-alist
+  jde-imenu-default-modifier-abbrev-alist
+  "*Alist of character abbreviations for Java modifiers.
+Each association has the form (MODIFIER . CHARACTER) where MODIFIER is
+a valid Java modifier string (see `jde-imenu-valid-modifiers-regexp')
+and CHARACTER any valid character. Modifiers without any valid
+association are not displayed (see also `jde-imenu-include-modifiers')."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "Abbrev"
+		(string :tag "Modifier"
+			:validate
+			(lambda (widget)
+			  (jde-imenu-modifier-field-validate widget))
+			"")
+		(choice :tag "Abbreviation"
+			(const     :tag "None" nil)
+			(character :tag "Character")
+			(integer   :tag "Character value"
+				   :validate
+				   (lambda (widget)
+				     (jde-imenu-abbrev-field-validate widget))
+				   ))
+		)))
+
+(defcustom jde-imenu-sort nil
+  "*If non-nil sorts items in the index menu.
+You can choose:
+
+- - 'asc   to sort by tag name ascending (ignoring case).
+- - 'desc  to sort by tag name descending (ignoring case).
+
+Use *Rescan* to rebuild the imenu when you have changed this option."
+  :group 'jde-project
+  :type '(choice (const :tag "No sort"    nil )
+		 (const :tag "Ascending"  asc )
+		 (const :tag "Descending" desc))
+  :set '(lambda (sym val)
+	  ;; setup sorting for `semantic-create-imenu-index'
+	  ;; buffer local
+	  (setq semantic-imenu-sort-bucket-function
+		(cond ((eq val 'asc)
+		       'semantic-sort-tokens-by-name-increasing-ci)
+		      ((eq val 'desc)
+		       'semantic-sort-tokens-by-name-decreasing-ci)
+		      (t
+		       nil)))
+	  ;; global
+	  (set-default 'semantic-imenu-sort-bucket-function
+		       semantic-imenu-sort-bucket-function)
+	  (set-default sym val)))
+
+;;;;
+;;;; Helper functions
+;;;;
+
+(defun jde-imenu-abbreviate-modifiers (modifiers)
+  "Return a string of character abbreviations for MODIFIERS or \"\" if
+not found. This string is prepended to each type, function and
+variable prototype, giving a synthetic view of their modifiers (See
+also `jde-imenu-include-modifiers')."
+  (if (not jde-imenu-include-modifiers)
+      ""
+    (let ((alist jde-imenu-modifier-abbrev-alist)
+	  (abbrevs "")
+	  entry modifier)
+      (while alist
+	(setq entry (car alist)
+	      alist (cdr alist))
+	(if (member (car entry) modifiers)
+	    (setq abbrevs
+		  (concat abbrevs (if (jde-imenu-char-valid-p (cdr entry))
+				      (char-to-string (cdr entry))
+				    "")))))
+      (if (> (length abbrevs) 0)
+	  (concat abbrevs " ")         ; trailing whitespace separator
+	abbrevs))))
+
+;;;;
+;;;; Universal `semantic-imenu' stuff adapted to JDE's needs
+;;;;
+
+(defun jde-imenu-prototype-nonterminal (tag &optional parent color)
+  "Return a prototype for TAG.
+See also `semantic-prototype-nonterminal'."
+  (let* ((tag-cat  (semantic-tag-class tag))
+	 (prototyper (intern-soft (format "jde-imenu-prototype-%s"
+					  tag-cat))))
+    (if (fboundp prototyper)
+	(funcall prototyper tag parent color)
+      (semantic-format-prototype-tag-java-mode tag parent color))))
+
+(defun jde-imenu-prototype-function (tag &optional parent color)
+  "Return a function (method) prototype for TAG.
+See also `semantic-java-prototype-function'."
+  (let ((sign (if jde-imenu-include-signature
+		  (semantic-java-prototype-function tag parent color)
+		(concat (if color
+			    (semantic--format-colorize-text
+			     (semantic-tag-name tag) 'function)
+			  (semantic-tag-name tag))
+			"()"))))
+    (concat (jde-imenu-abbreviate-modifiers
+	     (semantic-tag-modifiers tag))
+	    sign)))
+
+(defun jde-imenu-prototype-variable (tag &optional parent color)
+  "Return a variable (field) prototype for TAG.
+See also `semantic-java-prototype-variable'."
+  (let ((sign (if jde-imenu-include-signature
+		  (semantic-java-prototype-variable tag parent color)
+		(if color
+		    (semantic--format-colorize-text
+		     (semantic-tag-name tag) 'variable)
+		  (semantic-tag-name tag)))))
+    (concat (jde-imenu-abbreviate-modifiers
+	     (semantic-tag-modifiers tag))
+	    sign)))
+
+(defun jde-imenu-prototype-type (tag &optional parent color)
+  "Return a type (class/interface) prototype for TAG.
+See also `semantic-prototype-nonterminal'."
+  (let ((sign (semantic-java-prototype-type tag parent color)))
+    (concat (jde-imenu-abbreviate-modifiers
+	     (semantic-tag-modifiers tag))
+	    sign)))
+
+;;;;
+;;;; Specific JDE's imenu (to be replaced by semantic-imenu stuff)
+;;;;
+
+(defcustom jde-imenu-include-classdef t
+  "*If non-nil `jde-imenu-index-class' adds *class def* items in imenu
+index to go to class definition."
+  :group 'jde-project
+  :type 'boolean)
+
+(defun jde-imenu-sort-tags (tags)
+  "Sorts the tag list TAGS depending on `jde-imenu-sort' value."
+  (cond ((eq jde-imenu-sort 'asc)
+	 (sort tags
+	       (function
+		(lambda (tag1 tag2)
+		  (string-lessp (upcase (semantic-tag-name tag1))
+				(upcase (semantic-tag-name tag2)))))))
+	((eq jde-imenu-sort 'desc)
+	 (sort tags
+	       (function
+		(lambda (tag1 tag2)
+		  (string-lessp (upcase (semantic-tag-name tag2))
+				(upcase (semantic-tag-name tag1)))))))
+	(t
+	 tags)))
+
+(defun jde-imenu-index-class  (class-tag)
+  "Creates an imenu index for a class in CLASS-TAG."
+  (let* ((class-name  (semantic-tag-name       class-tag))
+	 (class-type  (semantic-tag-type       class-tag))
+	 (class-start (semantic-tag-start      class-tag))
+	 (class-parts (semantic-tag-type-members class-tag))
+	 (class-index (jde-imenu-index-class-parts class-parts)))
+
+    (if jde-imenu-include-classdef
+	;; If requested adds a *class def* item to go to the class def.
+	(setq class-index (cons (cons "*class def*" class-start)
+				class-index))
+      ;; Else adds an *empty* item to go to the class def. only
+      ;; when there is not parts
+      (or class-index
+	  (setq class-index
+		(list (cons "*empty*"
+			    class-start)))))
+
+    (list (cons (format "%s %s" class-type class-name)
+		class-index))))
+
+(defun jde-imenu-index-class-parts (tags)
+  "Creates an imenu index for class parts in TAGS.
+When`jde-imenu-include-signature' is non-nil the
+index menu displays full method signatures and field types."
+  (let ((methods (semantic-find-nonterminal-by-token 'function tags))
+	(fields  (semantic-find-nonterminal-by-token 'variable tags))
+	(classes (semantic-find-nonterminal-by-token 'type     tags))
+	index)
+
+    (setq methods (jde-imenu-sort-tags methods))
+    (while methods
+      (let* ((method-tag (car methods))
+	     (method-name  (semantic-tag-name method-tag))
+	     (method-pos   (semantic-tag-start method-tag))
+	     method-sig)
+	(if jde-imenu-include-signature
+	    (let ((method-type  (semantic-tag-type method-tag))
+		  (method-args  (semantic-tag-function-arguments method-tag)))
+	      (setq method-sig (if method-type
+				   (format "%s %s(" method-type method-name)
+				 (format "%s(" method-name)))
+	      (while method-args
+		(let ((method-arg-tag (car method-args))
+		      method-arg-type)
+		  (when (semantic-tag-p method-arg-tag)
+		    (setq method-arg-type (semantic-tag-type method-arg-tag))
+		    (setq method-sig (concat method-sig method-arg-type ",")))
+		  (setq method-args (cdr method-args))))
+	      ;; remove the extra comma at end
+	      (if (char-equal ?, (aref method-sig (1- (length method-sig))))
+		  (setq method-sig (substring method-sig 0 -1)))
+	      (setq method-sig (concat method-sig ")")))
+	  (setq method-sig (format "%s()" method-name)))
+	(setq index
+	      (append
+	       index (list (cons method-sig method-pos)))))
+      (setq methods (cdr methods)))
+
+    ;; Add a separator between method and field index
+    (if fields
+	(setq index (append index '(("-")))))
+
+    (setq fields (jde-imenu-sort-tags fields))
+    (while fields
+      (let* ((field-tag (car fields))
+	     (field-name  (semantic-tag-name  field-tag))
+	     (field-pos   (semantic-tag-start field-tag)))
+	(if jde-imenu-include-signature
+	    (setq field-name (concat (semantic-tag-type field-tag)
+				     " " field-name)))
+	(setq index
+	      (append
+	       index (list (cons field-name field-pos)))))
+      (setq fields (cdr fields)))
+
+    (setq classes (jde-imenu-sort-tags classes))
+    (while classes
+      (let* ((class-tag  (car classes))
+	     (class-index  (jde-imenu-index-class class-tag)))
+	(setq index (append index class-index)))
+      (setq classes (cdr classes)))
+    index))
+
+(defun jde-create-imenu-index ()
+  "Creates an imenu index for a Java source buffer.
+This function uses the semantic bovinator to index the buffer."
+
+    (semantic-fetch-tags)
+
+    (let* ((tags   (semantic-fetch-tags))
+	   (packages (semantic-find-nonterminal-by-token 'package tags))
+	   (depends  (semantic-find-nonterminal-by-token 'include tags))
+	   (classes  (semantic-find-nonterminal-by-token 'type tags))
+	   depend-index
+	   index)
+
+
+      (setq classes (jde-imenu-sort-tags classes))
+      (while classes
+	(let* ((class-tag  (car classes))
+	       (class-index  (jde-imenu-index-class class-tag)))
+	  (setq index (append index class-index)))
+	(setq classes (cdr classes)))
+
+      (setq depends (jde-imenu-sort-tags depends))
+      (while depends
+	(let* ((depend-tag (car depends))
+	       (depend-name  (semantic-tag-name  depend-tag))
+	       (depend-pos   (semantic-tag-start depend-tag)))
+	  (setq depend-index (append depend-index (list (cons depend-name depend-pos)))))
+	(setq depends (cdr depends)))
+      (if depend-index
+	  (setq index (append index (list (cons "imports" depend-index)))))
+
+      (setq packages (jde-imenu-sort-tags packages))
+      (while packages
+	(let* ((package-tag (car packages))
+	       (package-name  (semantic-tag-name  package-tag))
+	       (package-pos   (semantic-tag-start package-tag)))
+	  (setq index
+		(append
+		 index
+		 (list (cons (concat "package " package-name) package-pos)))))
+	(setq packages (cdr packages)))
+      index))
+
+;;;;
+;;;; JDE's imenu setup
+;;;;
+
+(defun jde-imenu-setup ()
+  "Setup the JDE's \"Classes\" imenu when entering jde-mode."
+  (when jde-imenu-enable
+
+    ;; semantic overloaded functions
+    (semantic-install-function-overrides
+     (if (fboundp 'semantic-format-tag-prototype)
+	 '((format-tag-prototype . jde-imenu-prototype-nonterminal))
+       '((prototype-nonterminal . jde-imenu-prototype-nonterminal))
+       ))
+
+    ;; function to use for creating the imenu
+    (setq imenu-create-index-function
+	  (if (fboundp jde-imenu-create-index-function)
+	      jde-imenu-create-index-function
+	    'semantic-create-imenu-index))
+
+    ;; add the imenu to the menu bar for the current buffer
+    (imenu-add-to-menubar "Classes")
+
+    ))
+
+(provide 'jde-imenu)
+
+;; End of jde-imenu.el
diff --git a/site/jdee/lisp/jde-imenu.elc b/site/jdee/lisp/jde-imenu.elc
new file mode 100644
index 0000000..43e49c3
Binary files /dev/null and b/site/jdee/lisp/jde-imenu.elc differ
diff --git a/site/jdee/lisp/jde-import.el b/site/jdee/lisp/jde-import.el
new file mode 100644
index 0000000..57b23ab
--- /dev/null
+++ b/site/jdee/lisp/jde-import.el
@@ -0,0 +1,1107 @@
+;; jde-import.el --- Organize Java imports
+;; $Id: jde-import.el 191 2010-01-08 08:29:48Z paullandes $
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004 by David Ponce
+;; Copyright (C) 2004 by Philip Lord
+;; Copyright (C) 2009 by Paul Landes
+
+;; Authors:     David Ponce <david@dponce.com>
+;;              Paul Kinnucan <paulk@mathworks.com>
+;; Maintainers: David Ponce <david@dponce.com>
+;;              Paul Landes <landes <at> mailc dt net>
+;;              Martin Schwamberger <mschw@web.de>
+;; Created: 15 Nov 2000
+;; Keywords: java, tools
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This library adds commands to the JDE to insert and organize Java import
+;; statements.
+
+;;; Code:
+
+(require 'efc)
+(require 'semantic-fw)
+(require 'semantic-find)
+(require 'semantic-util)
+(jde-require 'sregex)
+
+;;;;
+;;;; Customization
+;;;;
+
+(defcustom jde-import-excluded-classes
+  '(("^bsh\\..*" . nil)
+    ("^java\\.lang\\.[^.]*$" . t)
+    ("^sun\\..*" . nil)
+    ("^com\\.sun\\..*" . nil)
+    (jde-import-current-package-p . t))
+  "*Specifies classes that should not be imported into a source file.
+\"Exclude test\" should be either a regular expression or a function
+whose only argument is the fully qualified class name.
+Import commands excludes any classes whose fully qualified name matches
+\"Regexp\" and any classes for which the \"Test function\" returns non-nil.
+If \"Exclude synonyms\" is non-nil, all classes with the same unqualified name
+will also be excluded. This is useful for classes of packages which will be
+imported implicitly (i.e. java.lang.* and the package of the importing class).
+If more than one fully qualified class names match the unqualified name that you specify,
+the command prompts you to select only the classes that are not excluded."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "Exclude rule"
+		(choice :tag "Exclude test"
+			(regexp :tag "Regexp")
+			(function :tag "Test function"))
+		(boolean :tag "Exclude synonyms"))))
+
+;; auto sorting of import statements
+(defcustom jde-import-auto-sort nil
+  "*Automatically resort import statements after a `jde-import-import'.
+If non-nil, the JDE automatically resorts the import statements when a new import statement is added using `jde-import-import' or `jde-import-find-and-import'."
+  :group 'jde-project
+  :type 'boolean
+)
+
+(defcustom jde-import-auto-sort-function 'jde-import-sort
+  "*Function to call to automatically  sort imports statements after a `jde-import-import'.
+Usually `jde-import-sort' or `jde-import-organize'.  Enabled if  `jde-import-auto-sort' is not nil."
+  :group 'jde-project
+  :type 'function)
+
+(defcustom jde-import-reverse-sort-group nil
+  "*Non-nil to sort each import group's packages in reverse alphabetic
+order.  See command `jde-import-organize'.  Note: For sorting the
+groups, see variable `jde-import-sorted-groups'."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-import-sorted-groups nil
+  "*Non-nil to sort import groups in alphabetic order. Order may
+be specified as alphabetic, reverse alphabetical or as implicitly
+specified by `jde-import-group-of-rules'. In the latter case the
+order of groups is the same as their appearance in
+`jde-import-group-of-rules'.
+See command `jde-import-organize'. Note: For sorting the packages
+within each group, see variable `jde-import-reverse-sort-group'."
+  :group 'jde-project
+  :type '(choice :tag "Order"
+		 (const :tag "No sort"                  nil)
+		 (const :tag "group-of-rules order"     gor)
+		 (const :tag "alphabetic order"         asc)
+		 (const :tag "reverse alphabetic order" desc)))
+
+(defcustom jde-import-group-function 'jde-import-group-of
+  "*Function used to associate an import token to a group.
+It receives one argument, the import token and must return a group
+name string or nil if the import does not belong to any group.  The
+function `jde-import-group-of' is the default value."
+  :group 'jde-project
+  :type 'function)
+
+(defcustom jde-import-group-of-rules
+  '(
+    ("^javax?\\.")
+    )
+  "*Import group definitions used by `jde-import-group-of'.
+Each group definition is a pair (REGEXP . GROUP) where:
+- - REGEXP is a regexp that import names of this group must match.
+- - GROUP is a group name or the index of the match data returned as
+    group name or nil if REGEXP is the group name."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "Group Rule"
+		regexp
+		(choice :tag "Group Name"
+			(string  :tag "A String")
+			(integer :tag "Match data at")
+			(const   :tag "The Regexp" nil))))
+  :set '(lambda (sym val)
+	  ;; delete empty entries!
+	  (set-default sym (delete '("") val))))
+
+(defcustom jde-import-default-group-name nil
+  "*Default group name if no group name is found.
+If a group name is not found in `jde-import-group-of-rules' then this
+group name is used.  If nil no default group name is used."
+  :group 'jde-project
+  :type '(choice (string  :tag "A String")
+		 (const :tag "none" nil)))
+
+(defcustom jde-import-insert-group-names nil
+  "*If non-nil `jde-import-organize' inserts group name before imports.
+See also the options `jde-import-group-of-rules' and
+`jde-import-default-group-name'."
+  :group 'jde-project
+  :type 'boolean)
+
+;; (makunbound 'jde-import-blank-line-between-groups)
+(defcustom jde-import-blank-line-between-groups t
+  "*If non-nil `jde-import-organize' inserts a blank line between groups.
+See also the options `jde-import-group-of-rules' and
+`jde-import-default-group-name'."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-import-auto-collapse-imports nil
+  "*If non-nil jde will automatically collapse imports when imports are
+inserted."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-import-exclude-inner-imports t
+  "Exclude imports for classes that appear to be included as inner-classes or by import some.package.*
+This avoids offers for some.package.Outer.Inner when some.package.Outer is already imported.
+Which is correct if your code refers to Outer.Inner, rather than just Inner;
+in the latter case, supplying the no-exclude argument to `jde-import-all' will find all the classes."
+  :group 'jde-project
+  :type 'boolean)
+
+
+(defun jde-import-current-package-p (class)
+  "Returns non-nil if the fully qualified classname CLASS belongs to
+the same package as the class in the current buffer."
+  (let ((pkg (jde-parse-get-package-name)))
+    (if pkg
+	(string= pkg (jde-parse-get-package-from-name class)))))
+
+(defun jde-import-get-qualified-names (unqualified-class)
+  "Returns a list containing all qualified name for UNQUALIFIED-CLASS."
+  (jde-jeval-r
+   (concat
+    "jde.util.JdeUtilities.getQualifiedName(\""
+    unqualified-class "\");")))
+
+(defun jde-import-get-imports ()
+  "Returns a list containing all imported classes."
+  (let* (imports
+	 (tags  (semantic-fetch-tags))
+	 (import-tags (semantic-brute-find-tag-by-class 'include tags)))
+    (dolist (import-tag import-tags)
+      (setq imports
+	    (cons
+	     (semantic-tag-name import-tag)
+	     imports)))
+    (nreverse imports)))
+
+(defun jde-import-get-import (unqualified-class)
+  "Get imported name for unqualified name UNQUALIFIED-CLASS.
+This name may have the form \"package.*\". Returns nil,
+if there is no import statement for UNQUALIFIED-CLASS."
+  (let (import
+	(imports (jde-import-get-imports))
+	(qualified-names (jde-import-get-qualified-names unqualified-class)))
+    (catch 'found
+      (dolist (class qualified-names)
+	(if (setq import (jde-import-already-imports-class class imports))
+	    (throw 'found import))))))
+
+(defun jde-import-get-import-insertion-point ()
+   "Determine where to insert an import statement.
+If the buffer contains an import statement, return
+the beginning of the next line; otherwise, if
+the buffer contains a package statement, insert
+three empty lines and return the beginning of
+the second empty line; otherwise, if the buffer
+contains a class definition, return the beginning
+of the line before the class definition; otherwise,
+return the beginning of the buffer."
+   (let* ((tags (semantic-fetch-tags))
+	  (import-tag
+	   (car (last (semantic-brute-find-tag-by-class
+		       'include tags))))
+	  (package-tag (car (semantic-brute-find-tag-by-class
+			     'package tags)))
+	  (class-tag (car (semantic-brute-find-tag-by-class
+			   'type tags)))
+	  insertion-point)
+     (cond (import-tag
+	    (setq insertion-point (+ (semantic-tag-end import-tag) 1)))
+	   (package-tag
+	    (save-excursion
+	      (goto-char (semantic-tag-end package-tag))
+	      (forward-line)
+	      (insert "\n")
+	      (setq insertion-point (point))))
+	   (class-tag
+	    (setq insertion-point
+		  (let ((comment-token (semantic-documentation-for-tag
+					class-tag 'lex)))
+		    (if comment-token
+			(semantic-lex-token-start comment-token)
+		      (semantic-tag-start class-tag)))))
+	   (t
+	    (setq insertion-point 1)))
+     (save-excursion
+       (goto-char insertion-point)
+       (unless (and (bolp) (eolp)) (insert "\n")))
+     insertion-point))
+
+(defun jde-import-import (class)
+  "*Insert an import statement for a class in the current buffer.
+CLASS is the fully qualified name of the class to be imported. This
+function allows you to enter an import at the head of your buffer
+from any point in the buffer. The function does nothing if an
+import statement for the specified class already exists.
+The function does not exclude classes defined by `jde-import-excluded-classes'."
+  (interactive
+   "sClass: ")
+  (jde-import-insert-import (list class)))
+
+(defun jde-import-one-class (class)
+  "Insert an import into the buffer if not already there."
+  (interactive "s")
+  (if (not (jde-import-already-imports-class class (jde-import-get-imports)))
+      (jde-import-insert-imports-into-buffer (list class))))
+
+;; Contributed by David Ponce <david_ponce@mail.schneider.fr>
+(defun jde-import-sort (&optional reverse)
+  "Sort Java import statements alphabetically. In reverse order if
+REVERSE is non-nil.
+
+Usage:
+  \\[jde-import-sort] sort import statements ascending.
+  \\[universal-argument] \\[jde-import-sort] sort descending.
+
+The the current buffer must be in `jde-mode'. This command uses the
+semantic Java parser and requires JDE 2.1.6-beta24 and above."
+  (interactive "P")
+  (or (eq major-mode 'jde-mode)
+      (error "Invalid major mode found. Must be 'jde-mode'."))
+  (or (and (local-variable-p 'semantic--parse-table (current-buffer))
+	   (symbol-value 'semantic--parse-table))
+      (error "Semantic Java parser not found."))
+  (and (interactive-p)
+       (consp current-prefix-arg)
+       (setq reverse t))
+  (let* ((tags  (semantic-fetch-tags))
+	 (depends (semantic-brute-find-tag-by-class 'include tags)))
+    (if depends
+	(let* ((first-import-tag (car depends))
+	       (last-import-tag  (nth (1- (length depends)) depends))
+	       (start (semantic-tag-start first-import-tag))
+	       (end   (semantic-tag-end   last-import-tag)))
+	  (when (and start end)
+	    (require 'sort)
+	    (let (sort-fold-case)
+		(sort-lines reverse start end)
+		(goto-char start)))))))
+
+(defun jde-import-find-and-import (class &optional no-errors no-exclude qualifiedp)
+  "*Insert an import statement for a class in the current buffer.
+CLASS is an unqualified class name. This function searches
+the classpath for a class (or classes) that match CLASS. If it
+finds only one, it inserts an import statements for the class at the
+head of the current buffer. If it finds more than one class that matches
+CLASS, it prompts you to select which class to import. You can customize
+the variable `jde-import-excluded-classes' to prevent specified classes
+from being imported or considered for import. If the prefix argument NO-EXCLUDE
+is non-nil, jde-import-excluded-classes will be ignored.
+This command uses the JDE's BeanShell interpreter. It starts the interpreter
+if it is not already running so there may be a short delay generating the first
+import statement in the session. Note that you must explicitly include
+any directories or jars that you want the command to search in your
+classpath, except jars implicitly included by the jvm, e.g.,
+rt.jar. The NO-ERRORS is used to avoid showing erros to the user."
+  (interactive
+   (flet ((vfn
+	   (class)
+	   (let ((existing-import (jde-import-get-import (third class))))
+	     (if (null existing-import)
+		 class
+	       (message "Skipping: already imported %s" existing-import)
+	       'pass))))
+     (list (jde-read-class nil nil nil nil nil 'vfn) nil current-prefix-arg t)))
+  (if qualifiedp
+      (unless (eq class 'pass)
+	(jde-parse-class-exists "java.util.List")
+	(jde-import-insert-import (list class) (not no-exclude)))
+    (let (existing-import)
+      (setq existing-import (jde-import-get-import class))
+      (if (not (null existing-import))
+	  (message "Skipping: already imported %s" existing-import)
+	(let ((imports (jde-import-get-qualified-names class)))
+	  (setq imports (remove-duplicates imports :test 'equal))
+	  (if imports
+	      (jde-import-insert-import imports (not no-exclude))
+	    (if (not no-errors)
+		(message "Error: could not find %s." class))))))))
+
+(defun jde-import-exclude-imports (imports)
+  "Remove imports from IMPORTS according to `jde-import-excluded-classes'."
+  (if jde-import-excluded-classes
+      (let (synonym-list ; synonyms to be excluded
+	    remaining-imports)
+	;; Exclude all imports matching an element of jde-import-excluded-classes
+	;; and collect all synonyms to be excluded.
+	(setq remaining-imports
+	      (mapcar
+	       (lambda (import)
+		 (catch 'found
+		   (dolist (rule jde-import-excluded-classes)
+		     (when (and
+			    (string-match "[.]" import)
+			    (if (functionp (car rule))
+				(funcall (car rule) import)
+			      (string-match (car rule) import)))
+		       (message "Excluding %s." import)
+		       (when (cdr rule)    ; exclude all classes having same name?
+			 (setq synonym-list
+			       (cons (jde-parse-get-unqualified-name import) synonym-list)))
+		       (throw 'found nil)))
+		   import))
+	       imports))
+	;; Exclude all synonyms contained in synonym-list.
+	(setq remaining-imports
+	      (mapcar
+	       (lambda (import)
+		 (if import
+		     (catch 'found
+		       (dolist (synonym synonym-list)
+			 (when (string-match (concat (regexp-quote synonym) "$") import)
+			   (message "Excluding synonym %s." import)
+			   (throw 'found nil)))
+		       import)))
+	       remaining-imports))
+	;; Remove all nil inserted instead of excluded classes.
+	(delq nil remaining-imports))
+    imports))
+
+(defun jde-import-insert-import (new-imports &optional exclude)
+  "Asks user, if necessary, to choose one of NEW-IMPORTS and
+inserts the selected import in the buffer."
+  (let* ((existing-imports (jde-import-get-imports))
+	 (candidate-imports (if exclude
+				(jde-import-exclude-imports new-imports)
+			      new-imports))
+	 (new-import
+	  (if (> (length candidate-imports) 1)
+	      (jde-import-choose-import candidate-imports)
+	    (car candidate-imports))))
+    (if new-import
+	(if (jde-import-already-imports-class new-import existing-imports)
+	    (message "This buffer already imports %s" new-import)
+	  (jde-import-insert-imports-into-buffer (list new-import))))))
+
+(defun jde-import-insert-imports-into-buffer (new-imports &optional exclude)
+  "Inserts imports into the correct place in the buffer."
+  (save-excursion
+    (goto-char (jde-import-get-import-insertion-point))
+    (if (not jde-xemacsp) (deactivate-mark))
+    (if exclude
+      (setq new-imports (jde-import-exclude-imports new-imports)))
+    (loop for new-import in new-imports do
+	  (when (> (length new-import) 0) ;; added to avoid insert empty import statements.
+	    (insert
+	     (concat "import " new-import ";\n"))
+	    (message "Imported %s" new-import)))
+    (if jde-import-auto-collapse-imports
+	(let (jde-import-auto-collapse-imports) ;; setting this to avoid infinite recursion
+	  (jde-import-collapse-imports)))
+    (if jde-import-auto-sort
+	(funcall jde-import-auto-sort-function))))
+
+
+(defun jde-import-already-imports-class (class-name existing-imports)
+  "Determine if a class is already being imported."
+  (find
+   class-name
+   existing-imports
+   :test (lambda (new existing)
+		   (let ((new-package (jde-parse-get-package-from-name new))
+			 (new-class (jde-parse-get-unqualified-name new))
+			 (existing-package (jde-parse-get-package-from-name existing))
+			 (existing-class (jde-parse-get-unqualified-name existing)))
+		     (and
+		      (string= new-package existing-package)
+		      (or
+		       (string= new-class existing-class)
+		       (string= existing-class "*")))))))
+
+(defun jde-import-strip-existing-imports (new-imports existing-imports)
+  "Exclude classes that have already been imported."
+  (delq
+   nil
+   (mapcar
+    (lambda (new-import)
+      (unless  (jde-import-already-imports-class new-import existing-imports)
+	new-import)
+      new-imports))))
+
+(defun jde-import-choose-import (new-imports)
+  "Prompts the user to select a class to import from a list of similarly
+ named candidates."
+  (jde-choose-class new-imports "Import class"))
+
+(defun jde-import-kill-extra-imports (&optional comment)
+  "Delete extra Java import statements.
+An import statement is considered extra if it is a duplicate,
+imports a class from the package to which this file belongs,
+it is not referenced in the file,
+or imports a class belonging to an already imported package, i.e.,
+a package already imported by an import statement ending in .*.
+If optional argument COMMENT is non-nil, the extra import statements
+are commented out instead of deleted.
+
+Usage:
+  \\[jde-import-kill-extra-imports]
+  to kills extra imports.
+  \\[universal-argument] \\[jde-import-kill-extra-imports]
+  to comment out extra imports.
+
+The current buffer must be in `jde-mode'."
+  (interactive "P")
+  (or (eq major-mode 'jde-mode)
+      (error "Major mode must be 'jde-mode'"))
+  (and (interactive-p)
+       (consp current-prefix-arg)
+       (setq comment t))
+  (let* ((tags    (semantic-fetch-tags))
+	 (imports (semantic-brute-find-tag-by-class 'include tags)))
+    (if (not imports)
+	(message "No import found")
+      (let* ((packages (semantic-brute-find-tag-by-class 'package tags))
+	     (package-imports
+	      (append
+	       (mapcar
+		(lambda (package)
+		  ;; Return a global import name from PACKAGE tag.
+		  ;; That is add ".*" at end of tag name.
+		  (concat (semantic-tag-name package) ".*"))
+		packages)
+	       (delq nil
+		     (mapcar
+		      (lambda (import)
+			;; Return tag name if IMPORT is global or nil if not.
+			;; IMPORT is global if its name ends with ".*".
+			(let ((name (semantic-tag-name import)))
+			  (and (string-match "[.][*]\\'" name)
+			       name)))
+		      imports))))
+	     (first-import (car imports))
+	     extra-imports
+	     required-imports)
+	(save-excursion
+	  ;; Get the list of extra imports
+	  ;; Going to character zero so the the count-matches method work.
+	  (goto-char 0)
+	  (while imports
+	    (let* ((import (car imports))
+		   (name (semantic-tag-name import))
+		   (classname (jde-import-get-classname name))
+		   (case-fold-search nil)
+		   (number-of-matches
+		    (count-matches
+				(concat "\\b" classname "\\b"))))
+	      (if (or
+		   ;; If name is already listed in the set
+		   ;; of required imports...
+		   (member name required-imports)
+		   ;;or the class is not reference in the file
+		   ;;and is not an import of the whole package i.e. .*
+		   (and (< number-of-matches 2)
+			(not (string= classname "*")))
+		   ;; or imports a class in the current package...
+		   (and
+		    ;; make sure name is not a package import, e.g., foo.bar.*
+		    (not (string-match "[.][*]\\'" name))
+		    (member
+		     ;; convert class import to equivalent package import
+		     ;; e.g., foo.barClass to foo.*
+		     (concat
+		      (substring
+		       name
+		       0
+		       (or (string-match "[.][^.]+\\'" name)
+			   (length name)))
+		      ".*")
+		     package-imports)))
+		  ;; add name to the list of extra imports...
+		  (setq extra-imports (cons import extra-imports))
+		;; otherwise add to the list or required  imports
+		(setq required-imports (cons name required-imports))))
+	    (setq imports (cdr imports)))
+	  (if (not extra-imports)
+	      (message "No extra imports found")
+	    (let ((count 0))
+	      ;; Move the point at the beginning of the first import
+	      (goto-char (semantic-tag-start first-import))
+	      ;; Kill or comment out extra imports
+	      (while extra-imports
+		(let* ((extra-import (car extra-imports))
+		       (start (semantic-tag-start extra-import))
+		       (end (semantic-tag-end extra-import)))
+		  (setq count  (1+ count))
+		  (if comment
+		      (comment-region start end)
+		    ;; The following assumes that there is only one import
+		    ;; statement on the same line. Line end comments are deleted
+		    ;; too.
+		    (kill-region start
+				 (progn
+				   (goto-char end)
+				   (forward-line)
+				   (point))))
+		  (setq extra-imports (cdr extra-imports))))
+	      (message "%d extra import%s removed"
+		       count (if (= count 1) "" "s")))))))))
+
+;;;;
+;;;; Helper functions
+;;;;
+
+(defun jde-import-get-classname(import)
+  "Takes as an argument an import i.e. java.util.Vector.
+And returns the class name. In the above example it will
+return Vector"
+  (let ((pieces (split-string import "\\.")) class)
+    (setq class (car (last pieces)))
+    (setq pieces (split-string class "\\$"))
+    (setq class (car (last pieces)))
+    class))
+
+(defun jde-import-group-of (import-tag)
+  "Return the group IMPORT-TAG belongs to or nil if not found.
+A group is found as soon as the import name matches a regexp in
+`jde-import-group-of-rules'.  The returned group name depends on the
+corresponding group definition in `jde-import-group-of-rules'."
+  (let ((import-name (semantic-tag-name import-tag))
+	(groups      jde-import-group-of-rules)
+	match rule regexp group)
+    (while (and groups (not match))
+      (setq rule    (car groups)
+	    groups  (cdr groups)
+	    regexp  (car rule)
+	    group   (cdr rule)
+	    match   (and (string-match regexp import-name)
+			 (cond ((stringp  group)
+				group)
+			       ((integerp group)
+				(match-string group import-name))
+			       (t
+				regexp)))))
+    match))
+
+(defun jde-import-bucketize (imports)
+  "Bucketize IMPORTS tags.
+Return a vector of buckets.  Each bucket is sorted alphabetically by
+import name or in reverse order if `jde-import-reverse-sort-group' is
+non-nil.  There is a bucket for each different group the function
+specified by `jde-import-group-function' returns.  The last extra
+bucket contains imports that do not belong to any group."
+  (let (import group others bins bin i n)
+    ;; Sort imports into an alist of groups.  Build a separate list
+    ;; for imports not in any group.
+    (while imports
+      (setq import  (car imports)
+	    imports (cdr imports)
+	    group   (funcall (or jde-import-group-function
+				 #'jde-import-group-of)
+			     import))
+      (if (not group)
+	  (setq others (cons import others))
+	(setq bin (assoc group bins))
+	(if bin
+	    (setcdr bin (cons import (cdr bin)))
+	  (setq bins (cons (cons group (list import)) bins)))))
+    ;; If required sort the bins by group name
+    ;; Remember that bins are in reverse order at this point.
+    (cond ((eq jde-import-sorted-groups 'asc)
+	   (setq bins (sort bins
+			    (function
+			     (lambda (bin1 bin2)
+			       (string-lessp (car bin2)
+					     (car bin1)))))))
+	  ((eq jde-import-sorted-groups 'desc)
+	   (setq bins (sort bins
+			    (function
+			     (lambda (bin1 bin2)
+			       (string-lessp (car bin1)
+					     (car bin2)))))))
+	  ((eq jde-import-sorted-groups 'gor)
+	   (let* ((group-list (mapcar (function
+				       (lambda (item) (cdr item)))
+				      jde-import-group-of-rules)))
+	     (setq bins
+		   (sort bins
+			 (function
+			  (lambda (bin1 bin2)
+			    (let* ((name1 (car bin1))
+				   (name2 (car bin2))
+				   (idx1 (length (member name1 group-list)))
+				   (idx2 (length (member name2 group-list))))
+			      (< idx1 idx2)))))))))
+    ;; Build the vector of buckets.
+    (setq bins (vconcat
+		(delq nil
+		      (nreverse
+		       (cons (cons jde-import-default-group-name
+				   others)
+			     bins))))
+	  n    (length bins)
+	  i    0)
+    ;; Sort each bucket.
+    (while (< i n)
+      (setq bin (aref bins i))
+      (setcdr bin (if jde-import-reverse-sort-group
+		      (semantic-sort-tags-by-name-decreasing (cdr bin))
+		    (semantic-sort-tags-by-name-increasing (cdr bin))))
+      (setq i (1+ i)))
+    bins))
+
+(defun jde-import-insert-group (group &optional skip-line name)
+  "Insert a GROUP of import texts in the current buffer.
+If optional SKIP-LINE is non-nil skip a line before the group.
+If optional NAME is non-nil add it as comment just before the group."
+  (when group
+    (when skip-line
+      (newline)
+      (if jde-import-blank-line-between-groups
+	  (newline)))
+    (when (and jde-import-insert-group-names name)
+      (insert comment-start name)
+      (newline))
+    (insert (car group))
+    (setq group (cdr group))
+    (while group
+      (newline)
+      (insert (car group))
+      (setq group (cdr group)))))
+
+;;;;
+;;;; Commands
+;;;;
+
+;;;###autoload
+(defun jde-import-organize (&optional force)
+  "Organize import statements of the current Java source buffer.
+If optional FORCE is non-nil force reordering even if imports are
+already organized.
+
+Imports are organized into groups returned by the function specified
+by `jde-import-group-function'.  Groups are inserted in the order they
+are found unless `jde-import-sorted-groups' requires that they must be
+alphabetically sorted.  In each group imports are sorted by name
+alphabetically or in reverse order if `jde-import-reverse-sort-group'
+is non-nil.  A blank line is inserted between groups.
+
+Usage:
+  \\[jde-import-organize] group and sort import statements.
+  \\[universal-argument] \\[jde-import-organize] to force reordering.
+
+The current buffer must be in `jde-mode'.  This command requires a
+version of the JDE with the semantic parser."
+  (interactive "P")
+  (or (eq major-mode 'jde-mode)
+      (error "Major mode must be 'jde-mode'"))
+  (and (interactive-p)
+       (consp current-prefix-arg)
+       (setq force t))
+  (save-excursion
+    (let* ((tags  (semantic-fetch-tags))
+	   (imports (semantic-brute-find-tag-by-class 'include tags)))
+      (if imports
+	  (let* ((bins (jde-import-bucketize imports))
+		 (n    (length bins))
+		 i l sl changed group bin)
+	    (if force
+		(setq changed t)
+	      ;; Check if imports already ordered
+	      (setq sl (apply #'append (mapcar #'cdr bins))
+		    l  imports)
+	      (while (and (not changed) l)
+		(setq changed (not (string-equal
+				    (semantic-tag-name (car l))
+				    (semantic-tag-name (car sl))))
+		      l  (cdr l)
+		      sl (cdr sl))))
+	    (if (not changed)
+		(message "Import statements already ordered")
+	      ;; Imports need to be reordered.
+	      ;; 1- Get ordered import texts
+	      (setq i 0)
+	      (while (< i n)
+		(setq bin (aref bins i))
+		(setcdr bin (mapcar (function
+				     (lambda (import)
+				       (buffer-substring-no-properties
+					(semantic-tag-start import)
+					(progn
+					  (goto-char (semantic-tag-end import))
+					  (end-of-line)	; keep any line comment
+					  (point)))))
+				    (cdr bin)))
+		(setq i (1+ i)))
+	      ;; 2- Keep the point at the beginning of the first import
+	      (goto-char (semantic-tag-start (car imports)))
+	      ;; 2b- But check if the previous line already contains the
+	      ;; group name for the first group
+	      (when jde-import-insert-group-names
+		(setq i 0)
+		(while (and (< i n) (not group))
+		  (setq group (aref bins i)
+			i     (1+ i)))
+		(when (car group)
+		  (forward-line -1)
+		  (if (not (string< (concat comment-start (car group))
+				    (thing-at-point 'line)))
+		      (forward-line 1)))
+		(setq group nil))
+	      ;; 3- Kill current imports
+	      (kill-region (point)
+			   (progn
+			     (goto-char (semantic-tag-end
+					 (car (reverse imports))))
+			     (end-of-line)
+			     (point)))
+	      ;; 4- Insert ordered imports
+	      ;; Insert the first group found
+	      (setq i 0)
+	      (while (and (< i n) (not group))
+		(setq group (aref bins i)
+		      i     (1+ i)))
+	      (jde-import-insert-group (cdr group) nil (car group))
+	      ;; Insert the others with a blank line before each group
+	      (while (< i n)
+		(setq group (aref bins i)
+		      i (1+ i))
+		(jde-import-insert-group (cdr group) 'skip-line (car group)))))))))
+
+(defcustom jde-import-collapse-imports-threshold 2
+  "Threshold level used by `jde-import-collapse-imports' to decide when a
+package star import is used instead of single imports. If N is the number of
+classes imported by the current buffer from a package and N is >= to the
+threshhold, the JDEE replaces the class imports with a package import.
+Setting the threshold to 0 causes the JDE to not collapse anything at
+all."
+  :group 'jde-project
+  :type 'number)
+
+(defun jde-import-collapse-imports (&optional comments)
+"Function that collapse multiple class imports from the same package
+into a single .* package import. Uses
+`jde-import-collapse-imports-threshold' to decide when a .* statement
+is generated. Implemented by adding the package statements and then
+invoking `jde-import-kill-extra-imports' to clean up."
+  (interactive "P")
+  (or (eq major-mode 'jde-mode)
+      (error "Major mode must be 'jde-mode'"))
+  (let* ((tags    (semantic-fetch-tags))
+	 (imports (semantic-brute-find-tag-by-class 'include tags)))
+    (if (<= jde-import-collapse-imports-threshold 0)
+	(message "Collapse threshold set to zero. No collapsing will occur.")
+    (if (not imports)
+	(message "No import found")
+      (let* ((package-buckets (jde-import-collapse-imports-bucketize imports))
+	     (extra-imports   nil)
+	     (required-imports nil)
+	     (new-imports nil))
+	(while package-buckets
+	  (let*
+	      ((bucket (car package-buckets)))
+	    (if (>= (length bucket) jde-import-collapse-imports-threshold)
+		(progn
+		  (add-to-list 'extra-imports (cdr bucket))
+		  ;; Add the collapsing package statement
+		  (add-to-list 'new-imports (concat (car bucket) ".*")))
+	      (add-to-list 'required-imports (cdr bucket))))
+	  (setq package-buckets (cdr package-buckets)))
+	(jde-import-insert-imports-into-buffer new-imports)
+	(jde-import-kill-extra-imports comments))))))
+
+
+;; Contributed by Martin Schwamberger.
+(defun jde-import-expand-imports (&optional no-exclude)
+   "Delete all package imports and replace them by their respective
+class imports. The replacement is done by `jde-import-all'.
+`jde-import-auto-collapse-imports' is temporarily disabled during the
+execution of `jde-import-all'. The optional prefix argumet NO-EXCLUDE
+is used by `jde-import-all'. This function is roughly the opposite of
+`jde-import-collapse-imports'."
+   (interactive "P")
+   (let* ((tags  (semantic-fetch-tags))
+	  (imports (semantic-brute-find-tag-by-class 'include tags))
+	  import-all
+	  package-import-start
+	  package-import-end
+	  jde-import-auto-collapse-imports) ; disable auto collapse
+     (dolist (import imports)
+       (when package-import-start
+	 ;; kill from start of package-import to beginning of following import
+	 (kill-region package-import-start (semantic-tag-start import))
+	 (setq import-all t)
+	 (setq package-import-start nil))
+       (when (string-match "\\.\\*" (semantic-tag-name import)) ; package-import?
+	 (setq package-import-start (semantic-tag-start import))
+	 (setq package-import-end (semantic-tag-end import))))
+     ;; kill last import?
+     (when package-import-start
+       ;; kill from start of package-import to end of line
+       (kill-region package-import-start
+		    (save-excursion
+		      (goto-char package-import-end)
+		      (end-of-line)
+		      (or (eobp) (forward-char))
+		      (point)))
+       (setq import-all t))
+     (if import-all
+	 (jde-import-all no-exclude))))
+
+
+(defun jde-import-collapse-imports-bucketize (imports)
+  "Put all imports into a bucket named as the package they belong to."
+  (let ((package-buckets))
+    (while imports
+      (let* ((import (car imports))
+	     (name (semantic-tag-name import))
+	     (packagename (jde-parse-get-package-from-name name))
+	     (packagebin))
+	(setq packagebin (assoc packagename package-buckets))
+	(if packagebin
+	    (setcdr packagebin (cons import (cdr packagebin)))
+	  (setq package-buckets (cons (cons packagename (list import)) package-buckets)))
+	(setq imports (cdr imports))))
+  package-buckets))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                                   ;;
+;;  Import All                                                                       ;;
+;;                                                                                   ;;
+;;  Thanks to Philip Lord for the original idea for this command and for             ;;
+;;  contributing the initial implementation.                                         ;;
+;;                                                                                   ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-import-all-find-classes-to-import ()
+  "Returns a list of unqualified class names to import into this
+buffer. This function returns all the identifiers in the current
+buffer that start with an uppercase character, have at least one lower
+case character, and that are not included in an import statement and
+are not the names of inner or outer classes declared in this buffer."
+  (let (declared-classes
+	imported-classes
+	classes-to-import)
+
+    ;; Get the names of classes that are already imported into this buffer.
+    (let ((import-tags (semantic-brute-find-tag-by-class 'include (current-buffer))))
+      (setq
+	imported-classes
+	(mapcar
+	 (lambda (import-tag)
+	   (jde-parse-get-unqualified-name (semantic-tag-name import-tag)))
+	 import-tags)))
+
+    ;; Get the names of classes declared in this buffer.
+    (let ((buffer-class-tags (semantic-brute-find-tag-by-class 'type (current-buffer))))
+      (flet ((find-declared-classes
+	      (class-tag)
+	      (let ((members (semantic-tag-get-attribute class-tag :members)))
+		(dolist (member members)
+		  (if (eq (semantic-tag-class member) 'type)
+		      (progn
+			(setq declared-classes
+			      (append declared-classes (list (semantic-tag-name member))))
+			(find-declared-classes member)))))))
+      (dolist (class-tag buffer-class-tags)
+	 (setq declared-classes (append declared-classes  (list (semantic-tag-name class-tag))))
+	 (find-declared-classes class-tag))))
+
+    ;; Sort through the Java tokens in this buffer, looking
+    ;; for identifiers that start with an uppercase character and
+    ;; do not appear in an import statement or a toplevel
+    ;; class declaration.
+    (let ((tokens (semantic-lex-buffer 1000)))
+	     (dolist (token tokens classes-to-import)
+      (let ((type (car token))
+	    (start (cadr token))
+	    (end (cddr token)))
+	(if (eq type 'IDENTIFIER)
+	    (let (case-fold-search
+		  (name (buffer-substring-no-properties start end)))
+	      (unless (or
+		       (string-match "^[a-z]" name)
+		       (not (string-match "[a-z]" name))
+		       (member name declared-classes)
+		       (member name imported-classes))
+		(add-to-list 'classes-to-import  name t)))))))))
+
+(defun jde-import-is-included0 (name import0)
+  "check single qualified name against a single qualified class name."
+  (and import0 
+       (let* ((len0 (length import0))
+	      (dotstar (eq t (compare-strings import0 (- len0 2) len0 ".*" nil nil nil)))
+	      (import (if dotstar (substring import0 0 (- len0 2)) import0))
+	      (len (length import)))
+	 (or
+	  (string-equal import name)	; name.equals(import)
+	  (and 
+	   (eq t (compare-strings name 0 len import nil nil nil))  ; name.startsWith(import)
+	   (eq t (compare-strings name len (1+ len) "." nil nil )) ; name[len] == "."
+	   ))
+	 )))
+
+(defun jde-import-is-included1 (name classes) 
+  "check single qualified name against list of qualified classes"
+  (and name
+       (do* ((imports classes (cdr imports))
+	     (import (car imports) (car imports))
+	     (incl (jde-import-is-included0 name import) (jde-import-is-included0 name import)))
+	   ((or (null import) incl) incl)
+	 )))
+
+(defun jde-import-is-included (names classes) 
+  "check single or list of qualified names against qualified classes"
+  (if (listp names) 
+      (do* ((nlist names (cdr nlist))
+	    (name (car nlist) (car nlist))
+	    (incl (jde-import-is-included1 name classes) (jde-import-is-included1 name classes))
+	    )
+	  ((or (null name) incl) incl))
+    (jde-import-is-included1 names classes)
+    ))
+
+(defun jde-import-filter-inner-imports (qualified-names) 
+  "remove names that are imported by outer classes or some.package.*" 
+  (let* ((import-tags (semantic-brute-find-tag-by-class 'include (current-buffer)))
+	 (imported-classes (mapcar (lambda (import-tag) (semantic-tag-name import-tag)) import-tags))
+	 (imports nil))
+    (dolist (qnames qualified-names imports)
+      (if (not (jde-import-is-included qnames imported-classes)) 
+	  (setq imports (cons qnames imports))))
+    ))
+
+(defun jde-import-all-show ()
+  "Display a list of the class names referenced in this
+buffer that are not declared or explicitly imported into this
+buffer and hence may need to be imported."
+  (interactive)
+  (let ((candidate-imports
+	 (jde-import-all-find-classes-to-import)))
+    (with-output-to-temp-buffer "*jde import*"
+      (mapcar
+       (lambda(match)
+	 (princ match)
+	 (princ "\n"))
+       candidate-imports))))
+
+(defun jde-import-all-filter (unqualified-imports &optional no-exclude)
+  "Generate a list of fully qualified names of classes to
+import from UNQUALIFIED-IMPORTS, excluding classes specified
+by `jde-import-exclude-imports' if NO-EXCLUDE is nil.
+If `jde-import-exclude-inner-imports' is non-nil, then also remove
+any classes that appear to be included by outer-class imports."
+  (let ((imports
+  (mapcar
+   (lambda (unqualified-class)
+     (let ((qualified-imports (jde-import-get-qualified-names unqualified-class)))
+       (if no-exclude
+	   qualified-imports
+	 (jde-import-exclude-imports qualified-imports))))
+   unqualified-imports))
+	)
+    (if (or no-exclude (not jde-import-exclude-inner-imports))
+	imports
+      (jde-import-filter-inner-imports imports))))
+
+(defun jde-import-all-unique ()
+  "Import all classes uniquely referenced by unqualified class
+names in the current buffer, i.e., all referenced classes for
+which there is only one fully qualified name on the current
+classpath."
+  (interactive)
+  (let ((list
+	 (jde-import-all-filter (jde-import-all-find-classes-to-import)))
+	(retn))
+    (delq nil
+	  ;; take single length sublists, and return item..
+	  (mapcar
+	   (lambda(item)
+	     (if (= 1 (length item))
+		 (add-to-list 'retn
+			      (car item))))
+	   list))
+    (if (< 0 (length retn))
+	(jde-import-insert-imports-into-buffer retn))))
+
+(defclass jde-import-all-dialog(efc-multi-option-dialog) nil)
+
+(defmethod initialize-instance ((this jde-import-all-dialog) &rest fields)
+  "Dialog constructor."
+  (call-next-method))
+
+(defmethod efc-multi-option-dialog-sort ((this jde-import-all-dialog) list)
+  "Sort the options."
+  ;; sort the ones with the most options first...
+  (sort list
+	(lambda(a b)
+	  ;; sort lexically
+	  (if (= (length a)
+		 (length b))
+	      (string< (car a)
+		       (car b))
+	    ;; or by length
+	    (> (length a)
+	       (length b))))))
+
+(defun jde-import-all (&optional no-exclude)
+  "Imports all classes that need to be imported into the current buffer.
+If any of the required imports are ambiguous, this command displays a dialog
+box that allows you to disambiguate the references.
+Classes specified by `jde-import-excluded-classes' will be excluded,
+unless the prefix argument NO-EXCLUDE is non-nil."
+  (interactive "P")
+  (let* ((imports
+	  (jde-import-all-filter
+	   (jde-import-all-find-classes-to-import) no-exclude))
+	 (unique-imports
+	  (delq
+	   nil
+	   (mapcar
+	   (lambda (import) (if (= (length import) 1) (car import)))
+	   imports)))
+	 (ambiguous-imports
+	  (delq
+	   nil
+	   (mapcar
+	   (lambda (import) (if (> (length import) 1) import))
+	   imports)))
+	 (dialog
+	  (if ambiguous-imports
+	      (jde-import-all-dialog
+	       "Multi Classes Option"
+	       :options ambiguous-imports
+	       :text "Select imports to insert."))))
+    (if dialog
+	(progn
+	  (efc-dialog-show dialog)
+	  (setq unique-imports
+		(append unique-imports (oref dialog selection)))))
+    (jde-import-insert-imports-into-buffer unique-imports)))
+
+;;;###autoload
+(defun jde-import-at-point (class)
+  "Import a class at the current point.
+The fully qualified class is received from user input."
+  (interactive (list (jde-read-class)))
+  (insert (format "import %s;" class))
+  (indent-according-to-mode))
+
+(provide 'jde-import)
+
+;; End of jde-import.el
diff --git a/site/jdee/lisp/jde-import.elc b/site/jdee/lisp/jde-import.elc
new file mode 100644
index 0000000..3ce054c
Binary files /dev/null and b/site/jdee/lisp/jde-import.elc differ
diff --git a/site/jdee/lisp/jde-java-font-lock.el b/site/jdee/lisp/jde-java-font-lock.el
new file mode 100644
index 0000000..ae0b4fe
--- /dev/null
+++ b/site/jdee/lisp/jde-java-font-lock.el
@@ -0,0 +1,1155 @@
+;;; jde-java-font-lock.el -- Extra level font locking for java
+;; $Id: jde-java-font-lock.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by David Ponce
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;;             Paul Landes <landes <at> mailc dt net>
+;; Created: September 28 1998
+;; Keywords: java, tools
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; Adds some extra level font locking for java in `jde-mode'.
+;;
+;; - Numbers are fontified with `jde-java-font-lock-number-face'.
+;;
+;; - Packages in package and import statements are fontified with
+;;   `jde-java-font-lock-package-face'.  Last '*' of imported packages
+;;   are fontified with `jde-java-font-lock-number-face'.  Last type
+;;   identifiers of imported packages are fontified with
+;;   `font-lock-type-face'.
+;;
+;; - Modifiers are fontified with `jde-java-font-lock-modifier-face'.
+;;
+;; - Keywords const and goto are fontified with
+;;   `font-lock-warning-face'.  These keywords are reserved, even
+;;   though they are not currently used.
+;;
+;; - Keywords super, this and default are fontified with
+;;   `font-lock-keyword-face'.
+;;
+;; - User's defined identifiers (see variable
+;;   `jde-java-font-lock-api-file') are fontified with
+;;   `jde-java-font-lock-api-face'.
+;;
+;; - Capitalized identifiers and special constants null, true and
+;;   false are fontified with `jde-java-font-lock-constant-face'.
+;;
+;; - Text between `' in comments and javadoc tags (including non
+;;   official javadoc tags) are fontified with
+;;   `jde-java-font-lock-doc-tag-face'.
+;;
+;; - Javadoc links (following @link tags or enclosed in HTML <a> tags)
+;;   are fontified with `jde-java-font-lock-link-face'
+;;
+;; - Javadoc code samples (enclosed in HTML <code> tags or following
+;;   @see tags) are fontified with `jde-java-font-lock-code-face'.
+;;
+;; - Javadoc HTML bold and strong styles are fontified with
+;;   `jde-java-font-lock-bold-face'.
+;;
+;; - Javadoc HTML italic and emphasized styles are fontified with
+;;   `jde-java-font-lock-italic-face'.
+;;
+;; - Javadoc HTML underlined style is fontified with
+;;   `jde-java-font-lock-underline-face'.
+;;
+;; - Javadoc HTML preformatted style is fontified with
+;;   `jde-java-font-lock-pre-face'.
+;;
+;; All font-lock and jde-java-font-lock faces are individually
+;; customizable.  jde-java-font-lock faces are in the customization
+;; group `jde-java-font-lock-faces' which is a sub group of
+;; `font-lock-highlighting-faces' (Emacs) or `font-lock-faces'
+;; (XEmacs).
+
+;; This code has been tested with GNU Emacs 20.7, 21.0 and XEmacs
+;; 21.1.  Any comments, suggestions, bug reports or upgrade requests
+;; are welcome.  Please send them to the maintainers.
+
+;; WARNING: It seems there is byte-code compatibility issues between
+;; Emacs and XEmacs.  When using Emacs byte-code on XEmacs font
+;; locking don't work correctly for some complex matchers like those
+;; used to highlight imported package name :-)
+
+;;; History:
+;;
+;; See at end of this file.
+
+;;; Code:
+(require 'font-lock)
+(require 'regexp-opt)
+(condition-case nil
+    (require 'cc-fonts)
+  (error nil))
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-java-font-lock-javadoc-tag-keyword)
+(defvar jde-java-font-lock-javadoc-param-name-keyword)
+(defvar jde-java-font-lock-javadoc-exception-type-keyword)
+(defvar jde-java-font-lock-javadoc-docroot-keyword)
+(defvar jde-java-font-lock-javadoc-link-keyword)
+(defvar jde-java-font-lock-javadoc-see-ref-keyword)
+(defvar jde-java-font-lock-html-keywords)
+
+
+(defcustom jde-use-font-lock t
+  "*Turn on font-locking if non-nil.
+Set to nil to disable the use of font-locking."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-java-font-lock-max-names-by-regexp
+  100
+  "*Maximum number of user defined names that one regexp can match.
+No limit if less than 1.  For speed, the default value of 100 seems to
+be a good compromize between the number of font lock keyword regexps
+to match and the complexity of each regexp.
+
+WARNING: It seems XEmacs search fails with a very long regexp.  So if
+you have a lot of user's defined names don't use a value less than 1!"
+  :group 'jde-project
+  :type 'integer)
+
+;;;;
+;;;; Define the faces
+;;;;
+
+(defgroup jde-java-font-lock-faces nil
+  "Specific JDE faces for highlighting Java sources."
+  :prefix "jde-java-font-lock-"
+  :group (if (featurep 'xemacs)
+	     'font-lock-faces
+	   'font-lock-highlighting-faces))
+
+(defface jde-java-font-lock-number-face
+  '((((class grayscale) (background light)) (:foreground "DimGray" :italic t))
+    (((class grayscale) (background dark)) (:foreground "LightGray" :italic t))
+    (((class color) (background light)) (:foreground "RosyBrown"))
+    (((class color) (background dark)) (:foreground "LightSalmon"))
+    (t (:italic t)))
+  "Font Lock mode face used to highlight numbers."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-operator-face
+  '((((class grayscale)) (:foreground "grey"))
+    (((class color)) (:foreground "medium blue"))
+    (t (:bold t)))
+  "Font Lock mode face used to highlight operators."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-constant-face
+  '((((type tty) (class color)) (:foreground "magenta"))
+    (((class grayscale) (background light))
+     (:foreground "LightGray" :bold t :underline t))
+    (((class grayscale) (background dark))
+     (:foreground "Gray50" :bold t :underline t))
+    (((class color) (background light)) (:foreground "CadetBlue"))
+    (((class color) (background dark)) (:foreground "Aquamarine"))
+    (t (:bold t :underline t)))
+  "Font Lock mode face used to highlight constants."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-api-face
+  '((((class grayscale) (background light)) (:foreground "DimGray"))
+    (((class grayscale) (background dark)) (:foreground "LightGray"))
+    (((class color) (background light)) (:foreground "dark goldenrod"))
+    (((class color) (background dark)) (:foreground "light goldenrod")))
+  "Font Lock mode face used to highlight user's defined names."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-link-face
+  '((t (:foreground "blue" :italic nil :underline t)))
+  "Font Lock mode face used to highlight links."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-package-face
+  '((((class color) (background dark)) (:foreground "steelblue1"))
+    (((class color) (background light)) (:foreground "blue3"))
+    (t (:underline t)))
+  "Font Lock Mode face used to highlight packages."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-javadoc-face
+  '((t :inherit font-lock-doc-face))
+  "Font Lock Mode face used to highlight javadoc (sans tags etc)."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-doc-tag-face
+  '((((class color) (background dark)) (:foreground "light coral"))
+    (((class color) (background light)) (:foreground "green4"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight doc tags."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-modifier-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "Orchid"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight modifiers."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-private-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "Orchid"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight private access."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-protected-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "Orchid"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight protected access."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-public-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "Orchid"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight public access."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-constructor-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "DarkBlue"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Font Lock Mode face used to highlight protected access."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-bold-face
+  '((t (:bold t)))
+  "Font Lock Mode face used to highlight HTML bold text style."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-italic-face
+  '((t (:italic t)))
+  "Font Lock Mode face used to highlight HTML italic text style."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-underline-face
+  '((t (:underline t)))
+  "Font Lock Mode face used to highlight HTML underlined text style."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-pre-face
+  '((t nil))
+  "Font Lock Mode face used to highlight HTML preformatted text style."
+  :group 'jde-java-font-lock-faces)
+
+(defface jde-java-font-lock-code-face
+  '((t nil))
+  "Font Lock Mode face used to highlight HTML program code style."
+  :group 'jde-java-font-lock-faces)
+
+;; Define the extra font lock faces
+(defvar jde-java-font-lock-number-face    'jde-java-font-lock-number-face
+  "Face name to use for numbers.")
+(defvar jde-java-font-lock-operator-face  'jde-java-font-lock-operator-face
+  "Face name to use for operators.")
+(defvar jde-java-font-lock-constant-face  'jde-java-font-lock-constant-face
+  "Face name to use for constants.")
+(defvar jde-java-font-lock-package-face   'jde-java-font-lock-package-face
+  "Face name to use for packages.")
+(defvar jde-java-font-lock-javadoc-face   'jde-java-font-lock-javadoc-face
+  "Face name to use for javadocs (sans tags etc).")
+(defvar jde-java-font-lock-modifier-face  'jde-java-font-lock-modifier-face
+  "Face name to use for modifiers.")
+(defvar jde-java-font-lock-private-face	  'jde-java-font-lock-private-face
+  "Face name to use for private modifiers.")
+(defvar jde-java-font-lock-protected-face 'jde-java-font-lock-protected-face
+  "Face name to use for protected modifiers.")
+(defvar jde-java-font-lock-public-face    'jde-java-font-lock-public-face
+  "Face name to use for public modifiers.")
+(defvar jde-java-font-lock-constructor-face 'jde-java-font-lock-constructor-face
+  "Face name to use for constructors.")
+(defvar jde-java-font-lock-api-face       'jde-java-font-lock-api-face
+  "Face name to use for user's defined names.")
+(defvar jde-java-font-lock-doc-tag-face   'jde-java-font-lock-doc-tag-face
+  "Face name to use for doc tags.")
+(defvar jde-java-font-lock-link-face      'jde-java-font-lock-link-face
+  "Face name to use for links.")
+(defvar jde-java-font-lock-bold-face      'jde-java-font-lock-bold-face
+  "Face name to use for HTML bold text style.")
+(defvar jde-java-font-lock-italic-face    'jde-java-font-lock-italic-face
+  "Face name to use for HTML italic text style.")
+(defvar jde-java-font-lock-underline-face 'jde-java-font-lock-underline-face
+  "Face name to use for HTML underlined text style.")
+(defvar jde-java-font-lock-pre-face       'jde-java-font-lock-pre-face
+  "Face name to use for HTML preformatted text style.")
+(defvar jde-java-font-lock-code-face      'jde-java-font-lock-code-face
+  "Face name to use for HTML program code style.")
+
+;;;;
+;;;; Useful constants
+;;;;
+
+(eval-and-compile
+  (defconst jde-java-font-lock-capital-letter
+    "A-Z\300-\326\330-\337_$"
+    "Java identifier capital letter.")
+
+  (defconst jde-java-font-lock-letter
+    (eval-when-compile
+      (concat jde-java-font-lock-capital-letter "a-z"))
+    "Java identifier letter.")
+
+  (defconst jde-java-font-lock-capital-letter-or-digit
+    (eval-when-compile
+      (concat jde-java-font-lock-capital-letter "0-9"))
+    "Java identifier capital letter or digit.")
+
+  (defconst jde-java-font-lock-letter-or-digit
+    (eval-when-compile
+      (concat jde-java-font-lock-letter "0-9"))
+    "Java identifier letter or digit.")
+  )
+
+(defconst jde-java-font-lock-modifier-regexp
+  (eval-when-compile
+    (concat "\\<\\("
+	    (regexp-opt '("abstract"
+			  "const"
+			  "final"
+			  "native"
+			  ;;; removed after making each its own font -PaulL
+			  ;;"private"
+			  ;;"protected"
+			  ;;"public"
+			  "static"
+			  "strictfp"
+			  "synchronized"
+			  "transient"
+			  "volatile"
+			  ))
+	    "\\)\\>"))
+  "Regular expression to match Java modifiers.")
+
+(defconst jde-java-font-lock-number-regexp
+  (eval-when-compile
+    (concat "\\("
+	    "\\<[0-9]+[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+	    "\\|"
+	    "\\<[0-9]+[.][eE][-+]?[0-9]+[fFdD]?\\>"
+	    "\\|"
+	    "\\<[0-9]+[.][fFdD]\\>"
+	    "\\|"
+	    "\\<[0-9]+[.]"
+	    "\\|"
+	    "[.][0-9]+\\([eE][-+]?[0-9]+\\)?[fFdD]?\\>"
+	    "\\|"
+	    "\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
+	    "\\|"
+	    "\\<0[xX][0-9a-fA-F]+[lL]?\\>"
+	    "\\|"
+	    "\\<[0-9]+[lLfFdD]?\\>"
+	    "\\)"
+	    ))
+  "Regular expression to match Java numbers.")
+
+(defconst jde-java-font-lock-operator-regexp
+  "[<>=|/*&!%:?~^]+"
+  "Regular expression to match Java operators.")
+
+(defconst jde-java-font-lock-capital-id-regexp
+  (eval-when-compile
+    (concat "\\(\\b[" jde-java-font-lock-capital-letter
+	    "]+[" jde-java-font-lock-capital-letter-or-digit
+	    "]*\\b\\)"))
+  "Regular expression to match capitalised identifiers.")
+
+;;;;
+;;;; Support for fontification inside javadocs and comments.
+;;;;
+
+(eval-and-compile
+  (defun jde-java-font-lock-html-tag-regexp (tag &rest aliases)
+    "Return a regexp that matches HTML tag TAG.
+The string between <TAG> and </TAG> is the second parenthesized
+expression in the returned regexp.  ALIASES are other names for TAG."
+    (let* ((tag-re (mapconcat
+		    #'(lambda (tag)
+			(mapconcat #'(lambda (c)
+				       (format "[%c%c]"
+					       (upcase c)
+					       (downcase c)))
+				   tag
+				   ""))
+		    (cons tag aliases)
+		    "\\|"))
+	   (hit-re (if (or (and (featurep 'xemacs)
+				(or (< emacs-major-version 21)
+				    (and (= emacs-major-version 21)
+					 (< emacs-minor-version 4))))
+			   (< emacs-major-version 21))
+		       ".*"
+		     ;; In GNU Emacs 21 use the "non-greedy" variant of
+		     ;; the operator `*' to match the smallest possible
+		     ;; substring.
+		     "\\(.\\|[\r\n]\\)*?")))
+      (format "<\\(%s\\)>\\(%s\\)</\\(%s\\)>" tag-re hit-re tag-re)
+      )))
+
+(defconst jde-java-font-lock-comment-faces
+  '(font-lock-comment-face font-lock-doc-face)
+  "List of faces font-lock uses for comments.")
+
+(defmacro jde-java-font-lock-at-comment (pos)
+  "Return non-nil if POS is in a comment."
+  `(memq (get-text-property ,pos 'face)
+	 jde-java-font-lock-comment-faces))
+
+(defsubst jde-java-font-lock-search-in-comment (regexp end)
+  "Search forward from point for regular expression REGEXP.
+Ensure matching occurs in a java comment.  Buffer position END bounds
+the search.  The match found must not extend after that position."
+  (let ((here (point))
+	ok b p)
+    (while (and (not ok)
+		(setq p (re-search-forward regexp end t)))
+      (setq b (match-beginning 0))
+      (setq ok (and (jde-java-font-lock-at-comment b)
+		    (< p (next-single-property-change
+			  b 'face nil (point-max))))))
+    (if ok
+	(point)
+      (goto-char here)
+      nil)))
+
+(defsubst jde-java-font-lock-search-in-javadoc (regexp end)
+  "Search forward from point for regular expression REGEXP.
+Ensure matching occurs in a javadoc comment.  Buffer position END
+bounds the search.  The match found must not extend after that
+position."
+  (let ((here (point))
+	b c ok md p)
+    (while (and (not ok) (setq p (re-search-forward regexp end t)))
+      (setq b  (match-beginning 0)
+	    md (match-data)
+	    ok (and (re-search-backward "^\\s-*\\(/[*][*]\\)" nil t)
+		    (jde-java-font-lock-at-comment
+		     (goto-char (setq c (match-beginning 1))))
+		    (forward-comment 1)
+		    (< p (point))
+		    (>= b c)
+		    (setq here p)))
+      (goto-char p))
+    (set-match-data md)
+    (goto-char here)
+    ok))
+
+(defun jde-java-font-lock-quote-matcher (end)
+  "Font lock matcher for comment enclosed in \`\'.
+Limit search to END position."
+  (jde-java-font-lock-search-in-comment
+   "`\\([^']*\\)'"
+   end))
+
+(defconst jde-java-font-lock-quote-keyword
+  '(jde-java-font-lock-quote-matcher
+    1 jde-java-font-lock-doc-tag-face t)
+  "Font lock keyword for comment enclosed in \`\'.")
+
+(defun jde-java-font-lock-html-ahref-matcher (end)
+  "Font lock matcher for HTML A HREF anchor in javadoc comments.
+Limit search to END position."
+  (jde-java-font-lock-search-in-javadoc
+   "<[Aa]\\s-+[Hh][Rr][Ee][Ff][^>]*>\\([^>]+\\)</[Aa]>"
+   end))
+
+(defconst jde-java-font-lock-html-ahref-keyword
+  '(jde-java-font-lock-html-ahref-matcher
+    1 jde-java-font-lock-link-face t)
+  "Font lock keyword for javadoc HTML A HREF anchor.")
+
+(eval-and-compile
+  (if (featurep 'cc-fonts)
+
+      ;; Highlight javadoc comments through cc-fonts.
+      (defconst jde-java-font-lock-doc-comments
+	`(
+	  ;; Fontify javadoc tags (including non official ones)
+	  (,(concat "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*"
+		    "\\(@[" jde-java-font-lock-letter-or-digit "]+\\)")
+	   2 jde-java-font-lock-doc-tag-face t)
+	  ;; Fontify @param variable name
+	  ("^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*@param\\>[ \t]*\\(\\sw+\\)?"
+	   2 font-lock-variable-name-face prepend t)
+	  ;; Fontify @exception or @throws exception type
+	  ("^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*\
+@\\(exception\\|throws\\)\\>[ \t]*\\(\\S-+\\)?"
+	   3 font-lock-type-face prepend t)
+	  ;; Fontify @docRoot
+	  ("{\\(@docRoot\\)}"
+	   1 jde-java-font-lock-doc-tag-face t)
+	  ;; Fontify @link
+	  ("{\\(@link\\)\\>[ \t]+\\([^}]*\\)}"
+	   (1 jde-java-font-lock-doc-tag-face t)
+	   (2 jde-java-font-lock-link-face t))
+	  ;; Fontify @see reference
+	  (,(concat "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*"
+		    "@see\\>[ \t]*"
+		    "\\([.#" jde-java-font-lock-letter-or-digit "]+\\)")
+	   2 jde-java-font-lock-code-face t)
+	  ;; Fontify the text of a HREF anchor
+	  ("<[Aa]\\s-+[Hh][Rr][Ee][Ff][^>]*>\\([^>]+\\)</[Aa]>"
+	   1 jde-java-font-lock-link-face t)
+	  ;; Fontify other HTML tags
+	  (,(jde-java-font-lock-html-tag-regexp "b")
+	   2 jde-java-font-lock-bold-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "strong")
+	   2 jde-java-font-lock-bold-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "i")
+	   2 jde-java-font-lock-italic-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "em")
+	   2 jde-java-font-lock-italic-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "u")
+	   2 jde-java-font-lock-underline-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "code")
+	   2 jde-java-font-lock-code-face t)
+	  (,(jde-java-font-lock-html-tag-regexp "pre")
+	   2 jde-java-font-lock-pre-face t)
+	  )
+	"Keywords highlighted in javadoc comments.")
+
+    ;; Highlight javadoc comments through JDEE's own support
+    (defun jde-java-font-lock-remove-javadoc-keywords (keywords)
+      "Remove existing javadoc font lock keywords from KEYWORDS.
+That is those with \"@\" in their matcher regexp."
+      (let (kw matcher)
+	(while keywords
+	  (setq matcher  (car keywords)
+		keywords (cdr keywords))
+	  (if (not (and (consp matcher)
+			(stringp (car matcher))
+			(string-match "@" (car matcher))))
+	      (setq kw (cons matcher kw))))
+	(nreverse kw)))
+
+    (defconst jde-java-font-lock-html-ahref-keyword
+      '(jde-java-font-lock-html-ahref-matcher
+	1 jde-java-font-lock-link-face t)
+      "Font lock keyword for javadoc HTML A HREF anchor.")
+
+    (defvar jde-java-font-lock-html-keywords nil
+      "List of HTML keywords defined so far.")
+
+    (defmacro jde-java-font-lock-def-html-keyword (tag face)
+      "Define a font-lock keyword for HTML TAG.
+Data inside TAG will be highlighted with FACE.
+A new keyword is pushed into `jde-java-font-lock-html-keywords'."
+      (let* ((matcher (intern (format "jde-java-font-lock-html-%s-matcher" tag))))
+	`(progn
+	   (add-to-list 'jde-java-font-lock-html-keywords '(,matcher 2 ,face t))
+	   (defun ,matcher (end)
+	     (jde-java-font-lock-search-in-javadoc
+	      ,(jde-java-font-lock-html-tag-regexp tag) end)))))
+
+    (jde-java-font-lock-def-html-keyword "b" jde-java-font-lock-bold-face)
+    (jde-java-font-lock-def-html-keyword "strong" jde-java-font-lock-bold-face)
+    (jde-java-font-lock-def-html-keyword "i" jde-java-font-lock-italic-face)
+    (jde-java-font-lock-def-html-keyword "em" jde-java-font-lock-italic-face)
+    (jde-java-font-lock-def-html-keyword "u" jde-java-font-lock-underline-face)
+    (jde-java-font-lock-def-html-keyword "code" jde-java-font-lock-code-face)
+    (jde-java-font-lock-def-html-keyword "pre" jde-java-font-lock-pre-face)
+
+    (defun jde-java-font-lock-javadoc-tag-matcher (end)
+      "Font lock matcher for javadoc tags.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       (eval-when-compile
+	 (concat "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*"
+		 "\\(@[" jde-java-font-lock-letter-or-digit "]+\\)"))
+       end))
+
+    (defconst jde-java-font-lock-javadoc-tag-keyword
+      '(jde-java-font-lock-javadoc-tag-matcher
+	2 jde-java-font-lock-doc-tag-face t)
+      "Font lock keyword for javadoc tags.")
+
+    (defun jde-java-font-lock-javadoc-docroot-matcher (end)
+      "Font lock matcher for javadoc @docRoot tags.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       "{\\(@docRoot\\)}"
+       end))
+
+    (defconst jde-java-font-lock-javadoc-docroot-keyword
+      '(jde-java-font-lock-javadoc-docroot-matcher
+	1 jde-java-font-lock-doc-tag-face t)
+      "Font lock keyword for javadoc @docRoot tags.")
+
+    (defun jde-java-font-lock-javadoc-link-matcher (end)
+      "Font lock matcher for javadoc @link tags.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       "{\\(@link\\)\\>[ \t]+\\([^}]*\\)}"
+       end))
+
+    (defconst jde-java-font-lock-javadoc-link-keyword
+      '(jde-java-font-lock-javadoc-link-matcher
+	(1 jde-java-font-lock-doc-tag-face t)
+	(2 jde-java-font-lock-link-face t))
+      "Font lock keyword for javadoc @link tags.")
+
+    (defun jde-java-font-lock-javadoc-see-ref-matcher (end)
+      "Font lock matcher for javadoc @see references.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       (eval-when-compile
+	 (concat "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*"
+		 "@see\\>[ \t]*"
+		 "\\([.#" jde-java-font-lock-letter-or-digit "]+\\)"))
+       end))
+
+    (defconst jde-java-font-lock-javadoc-see-ref-keyword
+      '(jde-java-font-lock-javadoc-see-ref-matcher
+	2 jde-java-font-lock-code-face t)
+      "Font lock keyword for javadoc @see references.")
+
+    (defun jde-java-font-lock-javadoc-param-name-matcher (end)
+      "Font lock matcher for javadoc @param names.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*@param\\>[ \t]*\\(\\sw+\\)?"
+       end))
+
+    (defconst jde-java-font-lock-javadoc-param-name-keyword
+      '(jde-java-font-lock-javadoc-param-name-matcher
+	2 font-lock-variable-name-face prepend t)
+      "Font lock keyword for javadoc @param names.")
+
+    (defun jde-java-font-lock-javadoc-exception-type-matcher (end)
+      "Font lock matcher for javadoc exception types.
+Limit search to END position."
+      (jde-java-font-lock-search-in-javadoc
+       "^[ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*\
+@\\(exception\\|throws\\)\\>[ \t]*\\(\\S-+\\)?"
+       end))
+
+    (defconst jde-java-font-lock-javadoc-exception-type-keyword
+      '(jde-java-font-lock-javadoc-exception-type-matcher
+	3 font-lock-type-face prepend t)
+      "Font lock keyword for javadoc exception types.")
+
+    ))
+
+
+
+;;;;
+;;;; Support for fontification of user's defined names.
+;;;;
+
+(defcustom jde-java-font-lock-api-file
+  (expand-file-name "~/jde-java-font-lock.api")
+  "*File which contains a list of user's defined names to fontify.
+If nil no name fontification occurs.  Otherwise the specified file must
+contain one name by line.  Lines not beginning with a letter are
+ignored.  When you change this file or modify its content a new cache
+of font lock regular expressions will be rebuilt when restarting
+Emacs.  Also, you can manually rebuild the cache and update font lock
+keywords by entering the command:
+
+\\[universal-argument] \\[jde-java-font-lock-setup-keywords]."
+  :group 'jde-project
+  :type '(choice :tag "Names"
+		 (const :tag "No" nil)
+		 (file  :tag "In file" :format "%t\n%v")))
+
+(defcustom jde-java-font-lock-api-name-filter nil
+  "*Function used to filter a name."
+  :group 'jde-project
+  :type 'function)
+
+(defconst jde-java-font-lock-api-entry-regexp
+  (eval-when-compile
+    (concat "^[" jde-java-font-lock-letter "]"
+	    "[" jde-java-font-lock-letter-or-digit "]+$"))
+  "Regexp to match a valid entry in `jde-java-font-lock-api-file'.")
+
+(defconst jde-java-font-lock-api-entry-match 0
+  "Index of the match data in `jde-java-font-lock-api-entry-regexp'.")
+
+(defun jde-java-font-lock-api-names (&optional filter)
+  "Return the list of names in `jde-java-font-lock-api-file'.
+If optional FILTER function is non-nil it is called for each name
+found and must return non-nil to include it in the result list."
+  (let (k kl)
+    (if (and jde-java-font-lock-api-file
+	     (file-readable-p jde-java-font-lock-api-file))
+	(with-temp-buffer
+	  (erase-buffer)
+	  (insert-file-contents jde-java-font-lock-api-file)
+	  (goto-char (point-min))
+	  (while (re-search-forward jde-java-font-lock-api-entry-regexp nil t)
+	    (setq k (match-string jde-java-font-lock-api-entry-match))
+	    ;; Allow filtering of names
+	    (if (or (null filter) (funcall filter k))
+		(setq kl (cons k kl))))))
+    kl))
+
+(defun jde-java-font-lock-api-split-list (l n)
+  "Split list L in sub listes of N elements.
+If L is nil return nil.  If N is less than 1 all elements will be in
+one sub list."
+  (if l
+      (if (<= n 0)
+	  (list l)
+	(let (split-list sub-list i)
+	  (while l
+	    (setq i 0 sub-list nil)
+	    (while (and l (< i n))
+	      (setq sub-list (cons (car l) sub-list)
+		    i        (1+ i)
+		    l        (cdr l)))
+	    (if sub-list
+		(setq split-list (cons sub-list split-list))))
+	  split-list))))
+
+(defun jde-java-font-lock-api-build-regexps (max-matches)
+  "Build regular expressions matching names to fontify.
+MAX-MATCHES is the maximum number of names that one regular expression
+will match.  If MAX-MATCHES is less than 1 one regular expression will
+match all the names."
+  (let ((max-specpdl-size 2000)) ;; Prevent errors in `regexp-opt'
+				 ;; when processing long string listes
+    (mapcar (function
+	     (lambda (k)
+	       (concat "\\<" (regexp-opt k t) "\\>")))
+	    (jde-java-font-lock-api-split-list
+	     (jde-java-font-lock-api-names
+	      jde-java-font-lock-api-name-filter)
+	     max-matches))))
+
+(defvar jde-java-font-lock-api-cache nil
+  "Cache of regular expressions matching names to fontify..")
+
+(defun jde-java-font-lock-api-cache-file ()
+  "Return the filename of the regular expressions cache.
+There is a different cache file for each major version of (X)Emacs
+because of incompatible regular expressions returned by `regexp-opt'."
+  (and jde-java-font-lock-api-file
+       (format "%s.%semacs-%d.apicache"
+	       jde-java-font-lock-api-file
+	       (if (featurep 'xemacs) "x" "")
+	       emacs-major-version)))
+
+(defconst jde-java-font-lock-api-cache-file-header
+  ";;; Regular expressions matching names to fontify.
+;;; Automatically generated by `jde-java-font-lock' on %s.
+"
+  "Header to be written into the cache file.")
+
+(defun jde-java-font-lock-api-regexps (&optional rebuild)
+  "Return regular expressions matching names to fontify.
+The list is cached in variable `jde-java-font-lock-api-cache'.  If it
+is nil try to initialize it from the cache file (see function
+`jde-java-font-lock-api-cache-file').  If optional REBUILD flag is
+non-nil or there is no cache file or the cache file is older than the
+names file (see variable `jde-java-font-lock-api-file'), a new cache
+is created."
+  (let ((cache (jde-java-font-lock-api-cache-file)))
+    (cond
+
+     ;; Inconditionnal rebuild
+     (rebuild
+      ;; Clear the cache to rebuild
+      (setq jde-java-font-lock-api-cache nil))
+
+     ;; No names file exists
+     ((null cache)
+      ;; Clear the cache (no fontification)
+      (setq jde-java-font-lock-api-cache nil))
+
+     ;; A cache file exists
+     ((file-readable-p cache)
+      (if (file-newer-than-file-p jde-java-font-lock-api-file cache)
+	  (progn
+	    (message
+	     "jde-java-font-lock: names file %s newer than cache file %s"
+	     jde-java-font-lock-api-file cache)
+	    ;; The api file has been modified since the cache was
+	    ;; created, so clear the cache to rebuild
+	    (setq jde-java-font-lock-api-cache nil))
+	;; Try to load the existing cache if needed
+	(or jde-java-font-lock-api-cache
+	    (condition-case nil
+		(load-file cache)
+	      ;; If load fails clear the cache to rebuild
+	      (error
+	       (setq jde-java-font-lock-api-cache nil)))))))
+
+    (or jde-java-font-lock-api-cache
+	(not cache)
+	;; Build a new cache if it is empty and available
+	(progn
+	  (message "jde-java-font-lock: building names cache...")
+	  (when (setq jde-java-font-lock-api-cache
+		      (jde-java-font-lock-api-build-regexps
+		       jde-java-font-lock-max-names-by-regexp))
+	    ;; Save regexps in cache
+	    (with-current-buffer (find-file-noselect cache)
+	      (erase-buffer)
+	      (insert
+	       (format jde-java-font-lock-api-cache-file-header
+		       (current-time-string))
+	       (format "(setq jde-java-font-lock-api-cache '%S)"
+		       jde-java-font-lock-api-cache))
+	      (save-buffer)
+	      (kill-buffer (current-buffer))))
+	  (message "jde-java-font-lock: building names cache...%s"
+		   (if jde-java-font-lock-api-cache "done" "empty"))))
+	  jde-java-font-lock-api-cache))
+
+(defun jde-java-font-lock-api-keywords (&optional rebuild)
+  "Return a list of font lock keywords for user's defined names.
+If optional REBUILD flag is non-nil create a new cache of regular
+expressions."
+  (mapcar (function
+	   (lambda (k)
+	     (cons k 'jde-java-font-lock-api-face)))
+	  (jde-java-font-lock-api-regexps rebuild)))
+
+;;;;
+;;;; Font lock setup.
+;;;;
+
+(defvar java-font-lock-keywords-4 nil
+  "Extra level fontification keywords for JDE mode.")
+
+(defun jde-java-font-lock-refontify ()
+  "Re-fontify buffers in `java-mode' and `jde-mode'."
+  (dolist (b (buffer-list))
+    (when (buffer-live-p b)
+      (with-current-buffer b
+	(when (and font-lock-mode
+		   (memq major-mode '(java-mode jde-mode)))
+	  (message "JDEE refontify buffer %s..." b)
+	  (font-lock-mode -1)
+	  (font-lock-mode 1)
+	  (message "JDEE refontify  buffer %s...done" b))))))
+
+(defun jde-java-font-lock-keywords (&optional rebuild)
+  "JDEE's extra level font lock keywords.
+If optional REBUILD flag is non-nil create a new cache of regular
+expressions."
+  (if (featurep 'cc-fonts)
+
+      ;; Through cc-fonts support.
+      (append
+       java-font-lock-keywords-3
+       ;; Fontify user's defined names
+       (mapcar #'(lambda (e)
+		   (list
+		    (c-make-font-lock-search-function
+		     (car e)
+		     (list 0 (cdr e) t))))
+	       (jde-java-font-lock-api-keywords rebuild))
+       (list
+	;; Fontify modifiers.
+	`(,(c-make-font-lock-search-function
+	    jde-java-font-lock-modifier-regexp
+	    '(0 jde-java-font-lock-modifier-face t)))
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(false\\|null\\|true\\)\\>"
+	    '(1 jde-java-font-lock-constant-face t)))
+	;; Fontify default and assert as keywords
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(default\\|assert\\)\\>"
+	    '(1 'font-lock-keyword-face t)))
+	;; Fontify const and goto with warning face. These keywords are
+	;; reserved, even though they are not currently used.
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(const\\|goto\\)\\>"
+	    '(1 'font-lock-warning-face t)))
+	;; package and imports
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(package\\|import\\(?:\\s-+static\\)?\\)\\s-+\\(\\(?:[a-z*][a-zA-Z0-9]*\\.?\\)*\\)"
+	    '(1 'font-lock-keyword-face t)
+	    '(2 'jde-java-font-lock-package-face t)))
+	;; constructor
+	`(,(c-make-font-lock-search-function
+	    (concat
+	     "^\\s-*\\<\\(?:public\\|private\\|protected\\)\\>?\\s-*"
+	     "\\([" jde-java-font-lock-capital-letter "]\\sw*\\)"
+	     "(.*?)")
+	    '(1 'jde-java-font-lock-constructor-face t)))
+	;; class names
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(new\\|instanceof\\)\\>[ \t]+\\(\\sw+\\)"
+	    '(2 font-lock-type-face t)))
+
+	;; modifier protections
+	 `(,(c-make-font-lock-search-function
+	    "\\<\\(private\\)\\>"
+	    '(1 'jde-java-font-lock-private-face t)))
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(protected\\)\\>"
+	    '(1 'jde-java-font-lock-protected-face t)))
+	`(,(c-make-font-lock-search-function
+	    "\\<\\(public\\)\\>"
+	    '(1 'jde-java-font-lock-public-face t)))
+	;; Fontify numbers
+	`(,(c-make-font-lock-search-function
+	    jde-java-font-lock-number-regexp
+	    '(0 jde-java-font-lock-number-face t)))
+	;; Fontify operators
+;;;     `(,(c-make-font-lock-search-function
+;;;         jde-java-font-lock-operator-regexp
+;;;         '(0 jde-java-font-lock-operator-face t)))
+	;; Fontify capitalised identifiers as constant
+	`(,jde-java-font-lock-capital-id-regexp
+	  1 jde-java-font-lock-constant-face)
+	;; Fontify text between `' in comments
+	jde-java-font-lock-quote-keyword
+	;; Fontify javadoc comments
+	'((lambda (limit)
+	    (c-font-lock-doc-comments
+		"/\\*\\*" limit
+	      jde-java-font-lock-doc-comments)))
+	)
+       )
+
+    ;; Through JDEE's own support
+    (append
+     ;; Feature scoping: These must come first or the Special
+     ;; constants, Modifiers and Packages from keywords-1 will catch
+     ;; them.
+;;; Compatibility
+     (if (featurep 'xemacs)
+	 (list
+
+	  ;; Special keywords and constants
+	  '("\\<\\(this\\|super\\)\\>"
+	    (1 font-lock-keyword-face))
+	  '("\\<\\(false\\|null\\|true\\)\\>"
+	    (1 jde-java-font-lock-constant-face))
+	  ))
+
+     (list
+      ;; Fontify default as keyword
+      '("\\<\\(default\\)\\>" (1 font-lock-keyword-face))
+      ;; Fontify assert as keyword
+      '("\\<\\(assert\\)\\>" (1 font-lock-keyword-face))
+      ;; Fontify const and goto with warning face. These keywords are
+      ;; reserved, even though they are not currently used.
+      '("\\<\\(const\\|goto\\)\\>" (1 font-lock-warning-face))
+      ;; Fontify modifiers.
+      (cons jde-java-font-lock-modifier-regexp
+	    'jde-java-font-lock-modifier-face)
+      ;; Fontify package directives
+      '("\\<\\(package\\)\\>\\s-+\\(\\sw+\\)"
+	(1 font-lock-keyword-face)
+	(2 jde-java-font-lock-package-face nil t)
+	("\\=\\.\\(\\sw+\\)" nil nil
+	 (1 jde-java-font-lock-package-face nil t)))
+      ;; Fontify import directives
+      '("\\<\\(import\\)\\>\\s-+\\(\\sw+\\)"
+	(1 font-lock-keyword-face)
+	(2 (if (equal (char-after (match-end 0)) ?\.)
+	       'jde-java-font-lock-package-face
+	     'font-lock-type-face))
+	("\\=\\.\\(\\*\\|\\sw+\\)" nil nil
+	 (1 (if (equal (char-after (match-end 0)) ?\.)
+		'jde-java-font-lock-package-face
+	      (if (equal (char-before (match-end 0)) ?\*)
+		  'jde-java-font-lock-number-face
+		'font-lock-type-face)))))
+      ;; modifier protections
+      '("\\<\\(private\\)\\>" (1 jde-java-font-lock-private-face))
+      '("\\<\\(protected\\)\\>" (1 jde-java-font-lock-protected-face))
+      '("\\<\\(public\\)\\>" (1 jde-java-font-lock-public-face))
+      )
+     ;; Fontify user's defined names
+     (jde-java-font-lock-api-keywords rebuild)
+
+;;; Compatibility
+     (if (featurep 'xemacs)
+	 java-font-lock-keywords-2
+       ;; Remove existing javadoc font lock keywords from GNU Emacs
+       ;; `java-font-lock-keywords-3'
+       (jde-java-font-lock-remove-javadoc-keywords
+	java-font-lock-keywords-3))
+
+;;; Compatibility
+     (unless (featurep 'xemacs)
+       ;; GNU Emacs don't fontify capitalized types so do it
+       (list
+	(list
+	 (concat "\\<\\([" jde-java-font-lock-capital-letter "]\\sw*\\)\\>"
+		 "\\([ \t]*\\[[ \t]*\\]\\)*"
+		 "\\([ \t]*\\sw\\)")
+	 '(font-lock-match-c-style-declaration-item-and-skip-to-next
+	   (goto-char (match-beginning 3))
+	   (goto-char (match-beginning 3))
+	   (1 (if (match-beginning 2)
+		  font-lock-function-name-face
+		font-lock-variable-name-face))))
+	(cons
+	 (concat "\\<\\([" jde-java-font-lock-capital-letter "]\\sw*\\)\\>"
+		 "\\([ \t]*\\[[ \t]*\\]\\)*"
+		 "\\([ \t]*\\sw\\)")
+	 '(1 font-lock-type-face))
+	'("\\<\\(new\\|instanceof\\)\\>[ \t]+\\(\\sw+\\)"
+	  2 font-lock-type-face)))
+
+     ;; Some extra fontification
+     (list
+      ;; Fontify numbers
+      (cons jde-java-font-lock-number-regexp
+	    'jde-java-font-lock-number-face)
+      ;; Fontify operators
+;;;      (cons jde-java-font-lock-operator-regexp
+;;;            'jde-java-font-lock-operator-face)
+      ;; Fontify capitalised identifiers as constant
+      (cons jde-java-font-lock-capital-id-regexp
+	    '(1 jde-java-font-lock-constant-face))
+      ;; Fontify text between `' in comments
+      jde-java-font-lock-quote-keyword
+      ;; Fontify javadoc tags (including non official ones)
+      jde-java-font-lock-javadoc-tag-keyword
+      ;; Fontify @param variable name
+      jde-java-font-lock-javadoc-param-name-keyword
+      ;; Fontify @exception or @throws exception type
+      jde-java-font-lock-javadoc-exception-type-keyword
+      ;; Fontify @docRoot
+      jde-java-font-lock-javadoc-docroot-keyword
+      ;; Fontify @link
+      jde-java-font-lock-javadoc-link-keyword
+      ;; Fontify @see reference
+      jde-java-font-lock-javadoc-see-ref-keyword
+      ;; Fontify the text of a HREF anchor
+      jde-java-font-lock-html-ahref-keyword
+      )
+     ;; Fontify other HTML tags
+     jde-java-font-lock-html-keywords
+     )
+    ))
+
+;;;###autoload
+(defun jde-java-font-lock-setup-keywords (&optional rebuild)
+  "Setup font lock keywords in `java-font-lock-keywords-4'.
+If optional REBUILD flag is non-nil create a new cache of regular
+expressions."
+  (interactive "P")
+  (and (interactive-p)
+       (consp current-prefix-arg)
+       (setq rebuild t))
+
+  ;; Setup the JDEE's extra font lock keywords.
+  (setq java-font-lock-keywords-4 (jde-java-font-lock-keywords rebuild))
+
+  ;; Update fontification of buffers in `java-mode' and `jde-mode'.
+  (when (interactive-p)
+    (jde-java-font-lock-refontify)))
+
+;; Setup `java-font-lock-keywords-4'
+(jde-java-font-lock-setup-keywords)
+
+;; Define new defaults for Font Lock mode
+(defconst jde-java-font-lock-defaults
+  (let ((java-defaults
+	 (if (featurep 'xemacs)
+	     (get 'java-mode 'font-lock-defaults)
+	   ;;; To avoid compilation warning, replace obsolete variable,
+	   ;;; font-lock-defaults-alist, with its value for java-mode.
+	   ;;; (cdr (assq 'java-mode font-lock-defaults-alist)))))
+	   ;;; Paul Kinnucan.
+	   '((java-font-lock-keywords
+	      java-font-lock-keywords-1
+	      java-font-lock-keywords-2
+	      java-font-lock-keywords-3)
+	     nil nil ((?_ . "w") (?$ . "w")) nil
+	     (font-lock-mark-block-function . mark-defun)))))
+    (cons (append (car java-defaults) '(java-font-lock-keywords-4))
+	  (cdr java-defaults)))
+  "Defaults for coloring Java keywords in jde-mode. The defaults
+consist of the java-mode defaults plus `java-font-lock-keywords-4'.")
+
+;;;;
+;;;; Mode hook to setup syntax coloring.
+;;;;
+
+(defun jde-setup-syntax-coloring ()
+  "Mode hook to setup syntax coloring in `java-mode' and `jde-mode'.
+When `jde-use-font-lock' is non-nil syntax coloring is always turned
+on and uses `java-font-lock-keywords-4' extra level of fontification.
+If `jde-use-font-lock' is nil syntax coloring rules are those of
+standard `java-mode'."
+  (when (or (featurep 'xemacs)          ; XEmacs and Emacs 21 support
+	    (> emacs-major-version 20)  ; colors on ordinary terminal.
+	    window-system)              ; Others only on `window-system'.
+    ;; If `jde-use-font-lock' is non-nil setup
+    ;; `java-font-lock-keywords-4' extra level of fontification.
+    (when jde-use-font-lock
+      ;; Setup `font-lock-defaults'
+      (set (make-local-variable 'font-lock-defaults)
+	   jde-java-font-lock-defaults)
+      ;; Use the maximum decoration available
+      (set (make-local-variable 'font-lock-maximum-decoration) t)
+      ;; Handle multiline
+      (set (make-local-variable 'font-lock-multiline) t)
+      )
+    ;; Turn on Font Lock Mode as needed (based on parent `java-mode'
+    ;; if `jde-use-font-lock' is nil).
+    (let ((major-mode (if jde-use-font-lock major-mode 'java-mode)))
+      (if (featurep 'xemacs)
+	  ;; The following is intended to avoid a byte-compilation warning
+	  ;; when compiling this file under Emacs. The Emacs version of
+	  ;; font-lock-set-defaults accepts no arguments.
+	  (apply 'font-lock-set-defaults (list t))
+	(if global-font-lock-mode
+	    (if (fboundp 'turn-on-font-lock-if-enabled)
+		(turn-on-font-lock-if-enabled)
+	      (turn-on-font-lock-if-desired)))))  ;; Newer emacs renamed -if-enabled to -if-desired
+    ;; Always turn on font locking if `jde-use-font-lock' is non-nil.
+    (if jde-use-font-lock
+	(turn-on-font-lock))))
+
+;; Java has a different font for comments than Emacs Lisp, but by default,
+;; `jde-java-font-lock-javadoc-face' inherits from `font-lock-doc-face', which
+;; is the mapping for `c-doc-face-name' Emacs 22 and up
+(defconst c-doc-face-name 'jde-java-font-lock-javadoc-face)
+
+;; By default, enable extra fontification in `jde-mode'.
+(add-hook 'jde-mode-hook #'jde-setup-syntax-coloring)
+
+(provide 'jde-java-font-lock)
+
+;; End of jde-java-font-lock.el
diff --git a/site/jdee/lisp/jde-java-font-lock.elc b/site/jdee/lisp/jde-java-font-lock.elc
new file mode 100644
index 0000000..895f54e
Binary files /dev/null and b/site/jdee/lisp/jde-java-font-lock.elc differ
diff --git a/site/jdee/lisp/jde-java-grammar.el b/site/jdee/lisp/jde-java-grammar.el
new file mode 100644
index 0000000..d68def4
--- /dev/null
+++ b/site/jdee/lisp/jde-java-grammar.el
@@ -0,0 +1,92 @@
+;;; jde-java-grammar.el
+;; $Id: jde-java-grammar.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2000, 2001, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(require 'semantic-java)
+(require 'jde-parse)
+(eval-when-compile
+  (require 'senator)
+  (require 'jde-which-method))
+
+
+;; quiet "reference to free variable" build-time warnings
+(defvar jde-enable-senator)
+
+
+(defun jde-parse-semantic-default-setup ()
+  "Setup the semantic bovinator for the JDE.
+Should be run when Semantic is ready to parse, that is, via
+`semantic-init-hooks'."
+
+  ;; Remove me from `semantic-init-hooks'
+  (remove-hook 'semantic-init-hooks 'jde-parse-semantic-default-setup)
+
+  (when jde-auto-parse-enable
+    ;; JDE delegates auto-parse to Semantic if possible.  Since
+    ;; version 1.4beta12, Semantic uses an idle timer to
+    ;; reparse modified buffers if the corresponding minor mode is
+    ;; enabled. Activate Semantic auto-parse in this buffer, unless
+    ;; it is already enabled globally.
+    (cond
+     ;; Since Semantic 2.0beta2
+     ((boundp 'global-semantic-idle-scheduler-mode)
+      (or global-semantic-idle-scheduler-mode
+	  (semantic-idle-scheduler-mode 1)))
+     (t
+      ;; Default to JDE's auto-parse
+      (make-local-hook 'semantic-change-hooks)
+      (add-hook 'semantic-change-hooks
+		'jde-parse-buffer-changed-hook t t))))
+
+  ;; Track full reparses
+  (make-local-hook 'semantic-after-toplevel-cache-change-hook)
+  (add-hook 'semantic-after-toplevel-cache-change-hook
+	    'jde-parse-update-after-parse nil t)
+
+  ;; Track partial reparses
+  (make-local-hook 'semantic-after-partial-cache-change-hook)
+  (add-hook 'semantic-after-partial-cache-change-hook
+	    'jde-parse-update-after-partial-parse nil t)
+
+  (when jde-enable-senator
+    ;; Enable `senator-minor-mode' in this buffer, unless it is
+    ;; already enabled globally (since Semantic 1.4beta12).
+    (or (and (boundp 'global-senator-minor-mode)
+	     global-senator-minor-mode)
+	(senator-minor-mode 1)))
+
+  ;; imenu & speedbar setup
+  (jde-imenu-setup)
+
+  (if (and jde-which-method-mode
+	   (not jde-which-method-idle-timer))
+      (setq jde-which-method-idle-timer
+	    (run-with-idle-timer .25 t 'jde-which-method-update)))
+
+  ;; initial parsing of the current buffer
+  (semantic-fetch-tags))
+
+(provide 'jde-java-grammar)
+
+;; End of jde-java-grammar.el
diff --git a/site/jdee/lisp/jde-java-grammar.elc b/site/jdee/lisp/jde-java-grammar.elc
new file mode 100644
index 0000000..8cb16ae
Binary files /dev/null and b/site/jdee/lisp/jde-java-grammar.elc differ
diff --git a/site/jdee/lisp/jde-java-properties.el b/site/jdee/lisp/jde-java-properties.el
new file mode 100644
index 0000000..19db198
--- /dev/null
+++ b/site/jdee/lisp/jde-java-properties.el
@@ -0,0 +1,204 @@
+;;; jde-properties.el --- Java properties major mode
+
+;; Copyright (C) 2003-2010  Paul Landes
+
+;; Maintainer: Paul Landes landes at mailc dot net
+;; Keywords: Java properties JDEE
+
+;; This file is part of Emacs.
+
+;; Emacs is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; Emacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with Emacs; see the file COPYING.  If not, write to the 
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;; Provides a major mode for Sun's java.util.Properties file format.
+;; Includes typical major mode stuff (font lock), pagination, and file
+;; format validation.  Ant style properties and class names
+;; fontification is supported.
+;;
+;; Paragraphs are comment/property group blocks with no space in
+;; between the comments and the property lines.
+;;
+;; Currently, only regular expressions are used for fontification and
+;; because the properties format can span multiple lines (with ending
+;; escaped back slash (\)) multi-line fontification doesn't work.  In
+;; these cases, use `font-lock-fontify-buffer' to re-fontify
+;; everything.  When I have the time, I will go back and fix this,
+;; but if someone wants to fix it...(hint, hint :).
+
+;;; Code:
+
+(defgroup jde-java-properties-font-lock-faces nil
+  "JDE Autocoder"
+  :group 'jde
+  :prefix "jde-java-properties-font-lock-")
+
+;; face definitions
+(defface jde-java-properties-font-lock-key-face
+  '((t (:foreground "darkcyan")))
+  "Font Lock mode face used to highlight keys."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-value-face
+  '((t (:foreground "forest green")))
+  "Font Lock mode face used to highlight values."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-equal-face
+  '((t (:foreground "darkorange")))
+  "Font Lock mode face used to highlight equals."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-substitution-face
+  '((t (:foreground "blue3")))
+  "Font Lock mode face used to highlight substitutions."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-class-name-face
+  '((t (:foreground "purple")))
+  "Font Lock mode face used to highlight class names."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-backslash-face
+  '((t (:foreground "red")))
+  "Font Lock mode face used to highlight backslashes."
+  :group 'jde-java-properties-font-lock-faces)
+(defface jde-java-properties-font-lock-comment-face
+  '((t (:foreground "red3")))
+  "Font Lock mode face used to highlight comments."
+  :group 'jde-java-properties-font-lock-faces)
+
+;; font variables
+(defvar jde-java-properties-font-lock-key-face
+  'jde-java-properties-font-lock-key-face
+  "Face name to use for keys.")
+(defvar jde-java-properties-font-lock-value-face
+  'jde-java-properties-font-lock-value-face
+  "Face name to use for values.")
+(defvar jde-java-properties-font-lock-equal-face
+  'jde-java-properties-font-lock-equal-face
+  "Face name to use for equals.")
+(defvar jde-java-properties-font-lock-substitution-face
+  'jde-java-properties-font-lock-substitution-face
+  "Face name to use for substitutions.")
+(defvar jde-java-properties-font-lock-class-name-face
+  'jde-java-properties-font-lock-class-name-face
+  "Face name to use for class names.")
+(defvar jde-java-properties-font-lock-backslash-face
+  'jde-java-properties-font-lock-backslash-face
+  "Face name to use for backslashes.")
+(defvar jde-java-properties-font-lock-comment-face
+  'jde-java-properties-font-lock-comment-face
+  "Face name to use for comments.")
+
+(defvar jde-java-properties-mode-map (make-keymap)
+  "Keymap for Java-Properties mode.")
+
+
+;;;###autoload
+(defun jde-java-properties-mode ()
+  "Major mode for Java properties files buffer."
+  (interactive)
+  (kill-all-local-variables)
+
+  (setq major-mode 'jde-java-properties-mode
+        mode-name "Java-Props")
+
+  (set (make-local-variable 'paragraph-start) (concat "$\\|" page-delimiter))
+  (set (make-local-variable 'paragraph-separate) paragraph-start)
+  (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
+  (set (make-local-variable 'fill-prefix) "# ")
+  (set (make-local-variable 'comment-start) "# ")
+  (set (make-local-variable 'comment-start-skip) "\\(^\\|\\s-\\)#+ *")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-column) 32)
+
+  (if (not (featurep 'xemacs))
+      (set (make-local-variable 'font-lock-defaults)
+	   '(jde-java-properties-font-lock-keywords t)))
+
+  (use-local-map jde-java-properties-mode-map)
+  (font-lock-mode t)
+  (run-hooks 'jde-java-properties-mode-hook))
+
+
+(defvar jde-java-properties-font-lock-keywords
+  '(
+    ;; property keys
+    ("^\\([^\n]+\\)[ \t]*=" 1 jde-java-properties-font-lock-key-face t)
+    ;; property values
+    ;;
+    ;; Property values are tricky: we must allow for \ escaping multiple
+    ;; lines.  This is not the ideal implementation since line by line doesn't
+    ;; work here, functions need to be implemented and used
+    ("^[\t ]*\\([^\n\t=]+?\\)\\\\$" 1
+     jde-java-properties-font-lock-value-face t)
+    ("^[^\n]+?\\(=\\).*\\\\?$" 1 jde-java-properties-font-lock-equal-face t)
+    ("^[^\n]+?=\\(.*\\)\\\\?$" 1 jde-java-properties-font-lock-value-face t)
+    ("\\(\\\\\n.+\\)\\\\$" 1 jde-java-properties-font-lock-value-face t)
+    ("\\(\\\\\n[^\\\\\n]+\\)$" 1 jde-java-properties-font-lock-value-face t)
+    ;; Jakarata Ant like substitution properties
+    ("\\(\\${[^}]+?}\\)" 1 jde-java-properties-font-lock-substitution-face t)
+    ;; Java fully qualified class names
+    ("^.*=.*?\\([a-z][0-9a-z.-]*\\.[A-Z][0-9A-Za-z-]*\\)" 1
+     jde-java-properties-font-lock-class-name-face t)
+    ;; make the ending slashes nice and visible
+    ("\\(\\\\\\)$" 1 jde-java-properties-font-lock-backslash-face t)
+    ;; comments
+    ("^[\n\t ]*\\(#.*\\)$" 1
+     jde-java-properties-font-lock-comment-face t)
+    )
+  "Additional expressions to highlight in Java-Props mode.")
+(if (featurep 'xemacs)
+    (put 'jde-java-properties-mode 'font-lock-defaults
+	 '(jde-java-properties-font-lock-keywords t)))
+
+(defun jde-java-properties-parse (&optional buffer)
+  "Parse a file of Java properties and return them as an alist.
+BUFFER is the buffer to get the properties and defaults the current buffer."
+  (let (prop-alist)
+    (save-excursion
+      (if buffer (set-buffer buffer))
+      (save-match-data
+	(goto-char (point-min))
+	(while (re-search-forward "^\\(.*?\\)=\\(.*\\)$" nil t)
+	  (let ((key (match-string 1))
+		(val (match-string 2)))
+	    (set-text-properties 0 (length key) nil key)
+	    (set-text-properties 0 (length val) nil val)
+	    (setq prop-alist (append prop-alist (list (cons key val))))))))
+    prop-alist))
+
+;;;###autoload
+(defun jde-java-properties-validate (&optional goto)
+  "Determine whether or not the properties file conforms to the Sun
+java.util.Properties format.  Only the first invalid line is found.
+
+GOTO indicates whether or not to put the point at the first invalid line
+found."
+  (interactive "P")
+  (let (dangle-pos)
+    (save-match-data
+      (save-excursion
+        (goto-char (point-min))
+        (if (re-search-forward "\\(\\\\\\)\n[\t ]*$" nil t)
+            (setq dangle-pos (match-beginning 1)))
+
+        (if (not dangle-pos)
+            (message "Properties file is valid")
+          (goto-char dangle-pos)
+          (message (format "Found dangling continuation on line %d"
+                           (line-number-at-pos))))))
+    (if goto (goto-char dangle-pos))
+    dangle-pos))
+
+(provide 'jde-properties)
+
+;;; jde-properties.el ends here
diff --git a/site/jdee/lisp/jde-java-properties.elc b/site/jdee/lisp/jde-java-properties.elc
new file mode 100644
index 0000000..9da1bf8
Binary files /dev/null and b/site/jdee/lisp/jde-java-properties.elc differ
diff --git a/site/jdee/lisp/jde-javadoc-gen.el b/site/jdee/lisp/jde-javadoc-gen.el
new file mode 100644
index 0000000..addefae
--- /dev/null
+++ b/site/jdee/lisp/jde-javadoc-gen.el
@@ -0,0 +1,628 @@
+;;; jde-javadoc-gen.el -- Javadoc builder
+;; $Id: jde-javadoc-gen.el 182 2009-12-30 21:03:16Z lenbok $
+
+;; Author: Sergey A Klibanov <sakliban@cs.wustl.edu>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>, Sergey A Klibanov
+;; Keywords: java, tools
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+;; quiet "reference to free variable" build-time warnings
+(defvar browse-url-new-window-p)
+(defvar jde-global-classpath)
+(defvar jde-sourcepath)
+
+(defgroup jde-javadoc nil
+  "Javadoc template generator"
+  :group 'jde
+  :prefix "jde-javadoc-")
+
+(defcustom jde-javadoc-display-doc t
+  "*Display the documentation generated by the `jde-javadoc-make' command. ."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-detail-switch (list "-protected")
+  "Specifies what access level switch to use.
+  -public will show only public classes and members
+  -protected will show protected and public classes and members
+  -package will show package, protected, and public classes and members
+  -private will show all classes and members"
+  :group 'jde-javadoc
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Select the detail level switch you want:"
+	   (const "-public")
+	   (const "-protected")
+	   (const "-package")
+	   (const "-private"))))
+
+(defcustom jde-javadoc-gen-packages nil
+  "Specifies which packages or files javadoc should be run on.
+"
+  :group 'jde-javadoc
+  :type '(repeat (string :tag "Path")))
+
+(defcustom jde-javadoc-gen-destination-directory "JavaDoc"
+  "Specifies the directory where javadoc will put the generated files.
+The path may start with a tilde (~) or period (.) and may include
+environment variables. The JDEE replaces a ~ with your home directory.
+If `jde-resolve-relative-paths-p' is nonnil, the JDEE replaces the
+. with the path of the current project file. The JDEE replaces each
+instance of an environment variable with its value before inserting it
+into the javadoc command line."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-link-URL nil
+  "Specifies what URL's to link the generated files to.
+   For more information, look at the -link option of the javadoc tool."
+  :group 'jde-javadoc
+  :type '(repeat (string :tag "URL")))
+
+(defcustom jde-javadoc-gen-link-online nil
+  "Specifies whether or not to use jde-javadoc-gen-link-URL."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-link-offline nil
+  "Specifies URLs to link to and the local path to the directory holding the package-list for each URL.
+   The second argument can be a URL (http: or file:). If it is a relative file name, it is relative to the directory
+   from which javadoc is run."
+  :group 'jde-javadoc
+  :type '(repeat
+	  (cons :tag "Remote URL and directory holding package-list for that URL"
+		(string :tag "URL")
+		(string :tag "Path"))))
+
+(defcustom jde-javadoc-gen-group nil
+  "Specifies groups of packages with a group heading and package pattern.
+   The heading is usually a string like Extension Packages. The pattern is
+   any package name or wildcard matching that name. You can specify several
+   packages by separating the package names by a semicolon."
+  :group 'jde-javadoc
+  :type '(repeat
+	  (cons :tag "Package group name and contents"
+		(string :tag "Heading")
+		(string :tag "Package Pattern"))))
+
+(defcustom jde-javadoc-gen-doc-title ""
+  "Specifies the title to be placed near the top of the overview summary file."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-window-title ""
+  "Specifies what should be placed in the HTML <title> tag.
+   Quotations inside the title should be escaped."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-overview ""
+  "Specifies where to get an alternate overview-summary.html.
+   The path is relative to the sourcepath."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-doclet ""
+  "Specifies the class file that starts an alternate doclet
+   to generate the html files. This path is relative to docletpath"
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-docletpath nil
+  "Specifies the path in which the doclet should be searched for."
+  :group 'jde-javadoc
+  :type '(repeat (string :tag "Path")))
+
+(defcustom jde-javadoc-gen-header ""
+  "Specifies what html code should be placed at the top of each output file."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-footer ""
+  "Specifies what html code should be placed at the bottom of each output file."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-bottom ""
+  "Specifies what text or html code should be placed at the bottom
+   below the navigation bar."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-helpfile ""
+  "Specifies the help file to be used for the Help link in the Navigation bar."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-stylesheetfile ""
+  "Specifies the path to an alternate HTML stylesheet file."
+  :group 'jde-javadoc
+  :type 'string)
+
+(defcustom jde-javadoc-gen-split-index nil
+  "Specifies whether or not the index should be split alphabetically
+   one file per letter."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-use nil
+  "Specifies whether or not to create \"Use\" pages"
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-author t
+  "Specifies whether or not to use @author tags"
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-version t
+  "Specifies whether or not to use @version tags"
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-serialwarn nil
+  "Specifies whether or not to generate compile-time errors for missed @serial tags"
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-nodeprecated nil
+  "Specifies whether or not to remove all references to deprecated code"
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-nodeprecatedlist nil
+  "Specifies whether or not to remove references to deprecated code
+   from the navigation bar, but not the rest of the documents."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-notree nil
+  "Specifies whether or not to omit generating the class/interface hierarchy."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-noindex nil
+  "Specifies whether or not to omit generating the index."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-nohelp nil
+  "Specifies whether or not to omit the HELP link in the navigation bar of each page."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-nonavbar nil
+  "Specifies whether or not to omit generating the navigation bar at the top of each page."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defcustom jde-javadoc-gen-verbose nil
+  "Specifies whether or not javadoc should be verbose about what it is doing."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+
+(defcustom jde-javadoc-gen-args nil
+  "Specifies any other arguments that you want to pass to javadoc."
+  :group 'jde-javadoc
+  :type '(repeat (string :tag "Argument")))
+
+(defclass jde-javadoc-maker (efc-compiler)
+  ((make-packages-p  :initarg :make-packages-p
+		     :type boolean
+		     :initform t
+		     :documentation "Nonnil generates doc for packages."))
+  "Class of Javadoc generators.")
+
+(defmethod initialize-instance ((this jde-javadoc-maker) &rest fields)
+  "Initialize the Javadoc generator."
+
+  (oset this name "javadoc")
+
+  (oset
+   this
+   comp-finish-fcn
+   (lambda (buf msg)
+     (message msg)
+     (if (and
+	  jde-javadoc-display-doc
+	  (string-match "finished" msg))
+	 (browse-url-of-file
+	  (expand-file-name
+	   "index.html"
+	   (jde-normalize-path
+	    jde-javadoc-gen-destination-directory
+	    'jde-javadoc-gen-destination-directory))))))
+
+  (oset
+   this
+   exec-path
+   (jde-cygpath (expand-file-name "bin/javadoc" (jde-get-jdk-dir)) t)))
+
+(defmethod get-args ((this jde-javadoc-maker))
+  "Get the arguments to pass to the javadoc process as specified
+by the jde-javadoc-gen variables."
+  (let* ((destination-directory
+	  (jde-normalize-path
+	   jde-javadoc-gen-destination-directory
+	   'jde-javadoc-gen-destination-directory))
+	 (args
+	  (list
+	   "-d" destination-directory
+	   (car jde-javadoc-gen-detail-switch))))
+
+    (if (not (file-exists-p destination-directory))
+	(make-directory destination-directory))
+
+    ;;Insert online links
+    (if jde-javadoc-gen-link-online
+	(setq args
+	      (append
+	       args
+	       (mapcan
+		(lambda (link)  (list "-link" link))
+		jde-javadoc-gen-link-URL))))
+
+    ;;Insert offline links
+    (if jde-javadoc-gen-link-offline
+	(setq args
+	      (append
+	       args
+	       (mapcan
+		(lambda (link)
+		  (list "-linkoffline" (car  link) (cdr link)))
+		jde-javadoc-gen-link-offline))))
+
+    ;;Insert -group
+    (if jde-javadoc-gen-group
+	(setq args
+	      (append
+	       args
+	       (mapcan
+		(lambda (group)
+		  (list "-group" (car group) (cdr group)))
+		jde-javadoc-gen-group))))
+
+
+     ;; Insert classpath
+    (if jde-global-classpath
+	(setq args
+	      (append
+	       args
+	       (list
+		"-classpath"
+		(jde-build-classpath
+		 (jde-get-global-classpath)
+		 'jde-global-classpath)))))
+
+
+    ;; Insert sourcepath
+    (if jde-sourcepath
+	(setq args
+	      (append
+	       args
+	       (list
+		"-sourcepath"
+		(jde-build-classpath
+		 jde-sourcepath
+		 'jde-sourcepath)))))
+
+
+    ;; Insert bootclasspath
+    (if jde-compile-option-bootclasspath
+	(setq args
+	      (append
+	       args
+	       (list
+		"-bootclasspath"
+	       (jde-build-classpath
+		jde-compile-option-bootclasspath
+		'jde-compile-option-bootclasspath)))))
+
+    ;; Insert extdirs
+    (if jde-compile-option-extdirs
+	(setq args
+	      (append
+	       args
+	       (list
+		"-extdirs"
+	       (jde-build-classpath
+		jde-compile-option-extdirs
+		'jde-compile-option-extdirs)))))
+
+    ;; Insert windowtitle
+    (if (not (equal "" jde-javadoc-gen-window-title))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-windowtitle"
+		jde-javadoc-gen-window-title))))
+
+    ;; Insert doctitle
+    (if (not (equal "" jde-javadoc-gen-doc-title))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-doctitle"
+		jde-javadoc-gen-doc-title))))
+
+    ;; Insert header
+    (if (not (equal "" jde-javadoc-gen-header))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-header"
+		jde-javadoc-gen-header))))
+
+    ;; Insert footer
+    (if (not (equal "" jde-javadoc-gen-footer))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-footer"
+		jde-javadoc-gen-footer))))
+
+    ;; Insert bottom
+    (if (not (equal "" jde-javadoc-gen-bottom))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-bottom"
+		jde-javadoc-gen-bottom))))
+
+    ;; Insert helpfile
+    (if (not (equal "" jde-javadoc-gen-helpfile))
+	(setq args
+	      (append
+	       args
+	       (list
+	       "-helpfile"
+	       (jde-normalize-path 'jde-javadoc-gen-helpfile)))))
+
+    ;; Insert stylesheet
+    (if (not (equal "" jde-javadoc-gen-stylesheetfile))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-stylesheetfile"
+		(jde-normalize-path 'jde-javadoc-gen-stylesheetfile)))))
+
+    ;; Insert -overview
+    (if (not (equal "" jde-javadoc-gen-overview))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-overview"
+		jde-javadoc-gen-overview))))
+
+    ;; Insert -doclet
+    (if (not (equal "" jde-javadoc-gen-doclet))
+	(setq args
+	      (append
+	       args
+	       (list
+		"-doclet"
+		jde-javadoc-gen-doclet))))
+
+    ;; Insert -docletpath
+    (if jde-javadoc-gen-docletpath
+	(setq args
+	      (append
+	       args
+	       (list
+		"-docletpath"
+	       (jde-build-classpath
+		jde-javadoc-gen-docletpath
+		'jde-javadoc-gen-docletpath)))))
+
+    ;; Inser -use
+    (if jde-javadoc-gen-use
+	(setq args
+	      (append
+	       args
+	       (list "-use"))))
+
+    ;;Insert -author
+    (if jde-javadoc-gen-author
+	(setq args
+	      (append
+	       args
+	       (list "-author"))))
+
+    ;;Insert -version
+    (if jde-javadoc-gen-version
+	(setq args
+	      (append
+	       args
+	       (list "-version"))))
+
+    ;;Insert -splitindex
+    (if jde-javadoc-gen-split-index
+	(setq args
+	      (append
+	       args
+	       (list "-splitindex"))))
+
+    ;;Insert -nodeprecated
+    (if jde-javadoc-gen-nodeprecated
+	(setq args
+	      (append
+	       args
+	       (list "-nodeprecated"))))
+
+    ;;Insert -nodeprecatedlist
+    (if jde-javadoc-gen-nodeprecatedlist
+	(setq args
+	      (append
+	       args
+	       (list "-nodeprecatedlist"))))
+
+    ;;Insert -notree
+    (if jde-javadoc-gen-notree
+	(setq args
+	      (append
+	       args
+	       (list "-notree"))))
+
+    ;;Insert -noindex
+    (if jde-javadoc-gen-noindex
+	(setq args
+	      (append
+	       args
+	       (list "-noindex"))))
+
+    ;;Insert -nohelp
+    (if jde-javadoc-gen-nohelp
+	(setq args
+	      (append
+	       args
+	       (list "-nohelp"))))
+
+    ;;Insert -nonavbar
+    (if jde-javadoc-gen-nonavbar
+	(setq args
+	      (append
+	       args
+	       (list "-nonavbar"))))
+
+    ;;Insert -serialwarn
+    (if jde-javadoc-gen-serialwarn
+	(setq args
+	      (append
+	       args
+	       (list  "-serialwarn"))))
+
+    ;;Insert -verbose
+    (if jde-javadoc-gen-verbose
+	(setq args
+	      (append
+	       args
+	       (list  "-verbose"))))
+
+    ;;Insert other tags
+    (if jde-javadoc-gen-args
+	(setq args
+	      (append
+	       args
+	       jde-javadoc-gen-args)))
+
+    ;;Insert packages/files
+    (if (and (oref this make-packages-p) jde-javadoc-gen-packages)
+	(setq args
+	      (append
+	       args
+	       (mapcar
+		(lambda (packagename) packagename)
+		jde-javadoc-gen-packages)))
+      (setq
+       args
+       (append args (list (buffer-file-name)))))))
+
+
+;;;###autoload
+(defun jde-javadoc-make-internal (&optional make-packages-p)
+  "Generates javadoc for the current project if MAKE-PACKAGES-P
+and `jde-javadoc-gen-packages' are nonnil; otherwise, make doc
+for the current buffer. This command runs the
+currently selected javadoc's program to generate the documentation.
+It uses `jde-get-jdk-dir' to determine the location of
+the currentlyh selected JDK. The variable `jde-global-classpath' specifies
+the javadoc -classpath argument. The variable `jde-sourcepath'
+specifies the javadoc  -sourcepath argument. You can specify all
+other javadoc options via JDE customization variables. To specify the
+options, select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-gen-packages' to specify the packages, classes, or source
+files for which you want to generate javadoc. If this variable is nil,
+this command generates javadoc for the Java source file in the current
+buffer. If `jde-javadoc-display-doc' is nonnil, this command displays
+the generated documentation in a browser."
+  (save-some-buffers)
+  (let ((generator
+	 (jde-javadoc-maker
+	  "javadoc generator"
+	  :make-packages-p make-packages-p)))
+    (exec generator)))
+
+
+
+;;;###autoload
+(defun jde-javadoc-make ()
+  "Generates javadoc for the current project. This command runs the
+currently selected JDK's javadoc program to generate the documentation.
+It uses `jde-get-jdk-dir' to determine the location of the currently
+selected JDK. The variable `jde-global-classpath' specifies the javadoc
+-classpath argument. The variable `jde-sourcepath'
+specifies the javadoc  -sourcepath argument. You can specify all
+other javadoc options via JDE customization variables. To specify the
+options, select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-gen-packages' to specify the packages, classes, or source
+files for which you want to generate javadoc. If this variable is nil,
+this command generates javadoc for the Java source file in the current
+buffer. If `jde-javadoc-display-doc' is nonnil, this command displays
+the generated documentation in a browser."
+  (interactive)
+  (jde-javadoc-make-internal t))
+
+;;;###autoload
+(defun jde-javadoc-make-buffer ()
+  "Generates javadoc for the current buffer. This command runs the
+currently selected JDK's javadoc program to generate the
+documentation. It uses `jde-get-jdk-dir' to determine the location of the currently
+selected JDK.  The variable `jde-global-classpath' specifies the
+javadoc -classpath argument. The variable `jde-sourcepath' specifies
+the javadoc -sourcepath argument. You can specify all other javadoc
+options via JDE customization variables. To specify the options,
+select Project->Options->Javadoc from the JDE menu. Use
+`jde-javadoc-make' to generate doc for the files and packages
+specified by `jde-javadoc-gen-packages'. If `jde-javadoc-display-doc'
+is nonnil, this command displays the generated documentation in a
+browser."
+  (interactive)
+  (jde-javadoc-make-internal))
+
+(defun jde-javadoc-browse-tool-doc ()
+  "Displays the documentation for the javadoc tool in a browser."
+  (interactive)
+  (let* ((jdk-url (jde-help-get-jdk-doc-url))
+	 (javadoc-url
+	  (concat
+	   (substring jdk-url 0 (string-match "index" jdk-url))
+	   (if (eq system-type 'windows-nt) "tooldocs/windows/" "tooldocs/solaris/")
+	   "javadoc.html")))
+    (browse-url javadoc-url)))
+
+
+(provide 'jde-javadoc-gen)
+
+;;; End of jde-javadoc-gen.el
diff --git a/site/jdee/lisp/jde-javadoc-gen.elc b/site/jdee/lisp/jde-javadoc-gen.elc
new file mode 100644
index 0000000..1260373
Binary files /dev/null and b/site/jdee/lisp/jde-javadoc-gen.elc differ
diff --git a/site/jdee/lisp/jde-javadoc.el b/site/jdee/lisp/jde-javadoc.el
new file mode 100644
index 0000000..f05c359
--- /dev/null
+++ b/site/jdee/lisp/jde-javadoc.el
@@ -0,0 +1,1912 @@
+;;; jde-javadoc.el --- JDE javadoc autodoc
+;; $Id: jde-javadoc.el 157 2009-09-24 04:36:40Z lenbok $
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce
+;;             Paul Landes <landes <at> mailc dt net>
+
+;; Copyright (C) 1998-2004 by David Ponce
+;; Copyright (C) 2009 by Paul Landes
+
+;; Keywords: java, tools
+;;
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This library provides a javadoc comment checker and generator to
+;; help handling of Java source documentation.
+
+;;; Code:
+
+(require 'tempo)
+(require 'semantic-java)
+(require 'regexp-opt)
+
+(eval-when-compile
+  (require 'jde)
+  (require 'jde-parse))
+
+;;;; Customization
+;;;; -------------
+
+(defgroup jde-javadoc nil
+  "JDE javadoc utilities"
+  :group 'jde
+  :prefix "jde-javadoc-")
+
+;; IMPORTANT: This function must be defined before the following
+;; defcustoms because it is used in their :set clause.
+(defun jde-javadoc-define-template (sym val)
+  "Define a template (see `tempo-define-template').
+The template name is the `symbol-name' of SYM from which the
+'-template' suffix has been removed, prefixed by 'tempo-template-'.
+VAL is the template value.  If VAL is a string it is converted to a
+list of template elements."
+  (let* ((name (symbol-name sym))
+	 (template-name
+	  (if (string-match "\\(.*\\)-template$" name)
+	      (match-string 1 name)
+	    (error "Invalid template variable name: %S" name)))
+	 (template-val
+	  (if (stringp val)
+	      (car (read-from-string (format "(%s)" val)))
+	    val)))
+    (tempo-define-template template-name template-val nil name)
+    (set-default sym val)))
+
+(defcustom jde-javadoc-describe-class-template
+  "\"* Describe class \" (jde-javadoc-code name) \" here.\""
+  "*Line template used to describe a class.
+If nil the line is not inserted.
+The variable 'name' is set to the class name.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-describe-class'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-describe-interface-template
+  "\"* Describe interface \" (jde-javadoc-code name) \" here.\""
+  "*Line template used to describe an interface.
+If nil the line is not inserted.
+The variable 'name' is set to the interface name.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-describe-interface'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-describe-constructor-template
+  "\"* Creates a new \" (jde-javadoc-code name) \" instance.\""
+  "*Line template used to describe a constructor.
+If nil the line is not inserted.
+The variable 'name' is set to the constructor name (that is the class
+name).  See `jde-javadoc-autodoc-at-line' for usage.  Define the
+template variable `tempo-template-jde-javadoc-describe-constructor'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-describe-method-template
+  "\"* Describe \" (jde-javadoc-code name) \" method here.\""
+  "*Line template used to describe a method.
+If nil the line is not inserted.
+The variable 'name' is set to the method name.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-describe-method'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-describe-field-template
+  "\"* Describe \" (jde-javadoc-field-type modifiers)
+ \" \" (jde-javadoc-code name) \" here.\""
+  "*Line template used to describe a method.
+If nil the line is not inserted.
+The variable 'name' is set to the field name.
+The variable 'type' is set to the field type.
+The variable 'modifiers' is set to the field modifiers.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-describe-field'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-param-tag-template
+  "\"* @param \" name \" \" (jde-javadoc-a type)
+ \" \" (jde-javadoc-code type) \" value\""
+  "*Line template used to describe a parameter.
+If nil the line is not inserted.
+The variable 'name' is set to the parameter name.
+The variable 'type' is set to the parameter type.
+A line is inserted for each parameter.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-param-tag'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-return-tag-template
+  "\"* @return \" (jde-javadoc-a type)
+ \" \" (jde-javadoc-code type) \" value\""
+  "*Line template used to describe a returned value.
+If nil the line is not inserted.
+The variable 'type' is set to the returned type.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-return-tag'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-exception-tag-template
+  "\"* @exception \" type \" if an error occurs\""
+  "*Line template used to describe an exception.
+If nil the line is not inserted.
+The variable 'type' is set to the exception type.
+A line is inserted for each exception in the 'throws' clause.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-exception-tag'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-author-tag-template
+  "\"* @author <a href=\\\"mailto:\" user-mail-address
+ \"\\\">\" user-full-name \"</a>\""
+  "*Line template used to give an author.
+If nil the line is not inserted.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-author-tag'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-version-tag-template
+  "\"* @version 1.0\""
+  "*Line template used to give a version.
+If nil the line is not inserted.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-version-tag'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+;; (defcustom jde-javadoc-see-tag-template
+;;   '("* @see " ref)
+;;   "*Line template used to give a reference.
+;; If nil the line is not inserted.
+;; The variable 'ref' is set to the class or interface name.
+;; A line is inserted for each name in the 'extends' then 'implements'
+;; clauses.  See `jde-javadoc-autodoc-at-line' for usage.  Define the
+;; template variable `tempo-template-jde-javadoc-see-tag'."
+;;   :group 'jde-javadoc
+;;   :type '(choice :tag "Template form"
+;;                  (text :format "%t\n%v" :tag "String")
+;;                  (repeat :tag "Lisp Expressions" (sexp :tag "")))
+;;   :set 'jde-javadoc-define-template)
+
+;; (defcustom jde-javadoc-since-tag-template
+;;   '("* @since 1.0")
+;;   "*Line template used to give a since reference.
+;; If nil the line is not inserted.
+;; See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+;; variable `tempo-template-jde-javadoc-since-tag'."
+;;   :group 'jde-javadoc
+;;   :type '(choice :tag "Template form"
+;;                  (text :format "%t\n%v" :tag "String")
+;;                  (repeat :tag "Lisp Expressions" (sexp :tag "")))
+;;   :set 'jde-javadoc-define-template)
+
+(defcustom jde-javadoc-end-block-template
+  nil
+  "*Javadoc end comment block characters.
+If nil \"*/\" is inserted.
+See `jde-javadoc-autodoc-at-line' for usage.  Define the template
+variable `tempo-template-jde-javadoc-end-block'."
+  :group 'jde-javadoc
+  :type '(choice :tag "Template form"
+		 (text :format "%t\n%v" :tag "String")
+		 (repeat :tag "Lisp Expressions" (sexp :tag "")))
+  :set 'jde-javadoc-define-template)
+
+;;;; Utilities
+;;;; ---------
+(defmacro jde-javadoc-status-forms (message donestr &rest forms)
+  "Wrapper for `working-status-forms'.
+See `working-status-forms' for details on MESSAGE, DONESTR and FORMS
+arguments.  Does not override an outer `working-status-forms'
+MESSAGE."
+  `(working-status-forms (or working-message ,message) ,donestr
+     ,@forms))
+
+(defun jde-javadoc-dynamic-status (&rest args)
+  "Wrapper for `working-dynamic-status'.
+Does nothing if not called within the macro `working-status-forms'.
+See `working-dynamic-status' for meaning of ARGS."
+  (and working-message
+       (apply #'working-dynamic-status args)))
+
+(defalias 'jde-javadoc-skip-spaces-forward
+  'semantic-java-skip-spaces-forward)
+
+(defalias 'jde-javadoc-indent-line 'c-indent-line)
+
+(defun jde-javadoc-indent-region (start end)
+  "Indent region between START and END."
+  (save-excursion
+    (goto-char end)
+    (setq end (point-marker))
+    (goto-char start)
+    (while (< (point) end)
+      (jde-javadoc-dynamic-status)
+      (or (and (bolp) (eolp))
+	  (jde-javadoc-indent-line))
+      (forward-line 1))
+    (move-marker end nil)))
+
+(defun jde-javadoc-map (f l &rest args)
+  "Apply F to each element of L.
+F receives optional ARGS after the current element of L."
+  (while l
+    (apply f (car l) args)
+    (setq l (cdr l))))
+
+(defun jde-javadoc-window-lines ()
+  "Return the number of lines of the selected window.
+This number may be greater than the number of actual lines in the
+buffer if any wrap on the display due to their length."
+  (let ((start (point-min))
+	(end   (point-max)))
+    (if (= start end)
+	0
+      (save-excursion
+	(save-restriction
+	  (widen)
+	  (narrow-to-region start end)
+	  (goto-char start)
+	  (vertical-motion (buffer-size)))))))
+
+(defun jde-javadoc-adjust-window (window)
+  "Adjust WINDOW height to fit its buffer contents."
+  (save-selected-window
+    (select-window window)
+    (let ((height (window-height))
+	  (lines  (+ 3 (jde-javadoc-window-lines))))
+      ;; ensure window will not be deleted if too small
+      (if (< lines window-min-height)
+	  (setq lines window-min-height))
+      (enlarge-window (- lines height)))))
+
+(defsubst jde-javadoc-variable-name (name)
+  "Return canonical variable name from NAME.
+That is strip any array brackets from NAME."
+  (if (string-match "\\`\\([^[]+\\)[[]" name)
+      (match-string 1 name)
+    name))
+
+(defcustom jde-javadoc-check-undeclared-exception-flag nil
+  "*non-nil means to check for undeclared exceptions.
+When an exception is implicitly declared (inherits from
+RuntimeException) any associated @exception/@throws tag that already
+exists will be just kept without issuing a warning.  Other extra tags
+are automatically removed.
+
+If nil extra @exception/@throws tags are never removed but warnings
+are issued for (maybe) undeclared exceptions."
+  :group 'jde-javadoc
+  :type 'boolean)
+
+(defun jde-javadoc-implicit-exception-p (type)
+  "Return non-nil if TYPE is an implicitly declared exception.
+That is if TYPE inherits from java.lang.RuntimeException or if Java
+reflection failed to process TYPE."
+  (condition-case nil
+      (jde-jeval-r
+       (format "jde.util.Completion.isAncestorOf(%S,%S);"
+	       "java.lang.RuntimeException"
+	       (jde-parse-get-qualified-name type)))
+    (error t)))
+
+;;;; Text helpers
+;;;; ------------
+
+(defun jde-javadoc-field-type (modifiers)
+  "Return field category.
+That is \"constant\" if field MODIFIERS contains \"static\" and
+\"final\" or \"variable\" otherwise.  Useful to generate field
+description."
+  (if (and (member "static" modifiers) (member "final" modifiers))
+      "constant"
+    "variable"))
+
+(defun jde-javadoc-a (word)
+  "Return \"an\" if WORD begin with a vowel or \"a\" otherwise.
+Useful to generate description like \"an int value\" or \"a long value\"."
+  (if (string-match "^[aeiouyAEIOUY]" word)
+      "an" "a"))
+
+(defun jde-javadoc-code (text)
+  "Return \"<code>TEXT</code>\".
+Useful to generate HTML code style."
+  (concat "<code>" text "</code>"))
+
+;;;; Javadoc comment parser
+;;;; ----------------------
+
+;; tags and matchers (many are provided by Semantic)
+;;
+(defconst jde-javadoc-desc-tag
+  "*DESCRIPTION*"
+  "Special internal tag associated to descriptions.")
+
+(defconst jde-javadoc-start-tag-regexp
+  "[\r\n][ \t]*\\(/\\*\\*\\|\\*?\\)[ \t]*@"
+  "Regexp matching the beginning of a tag.")
+
+(defconst jde-javadoc-end-tag-regexp
+  (concat "\\(" jde-javadoc-start-tag-regexp
+	  "\\|[ \n\r\t]*\\*/\\)")
+  "Regexp matching the end of a tag or description.")
+
+;; Core comment parser
+;;
+(defun jde-javadoc-normalize-description (desc)
+  "Ensure DESC text begins with '\\n* ' and ends with '\\n*\\n'."
+  (let ((i (string-match "[^ *\n\r\t]" desc)))
+    (if i
+	(setq desc (concat "\n* " (substring desc i))))
+    ;; TODO: ensure empty line at end
+    desc))
+
+(defun jde-javadoc-normalize-ref (val)
+  "Strip any [* \\n\\r\\t] from VAL."
+  (let* ((keep "[^* \n\r\t]+")
+	 (ref  "")
+	 (i    (string-match keep val))
+	 j)
+    (while i
+      (jde-javadoc-dynamic-status)
+      (setq j   (match-end 0)
+	    ref (concat ref (substring val i j))
+	    i   (string-match keep val j)))
+    ref))
+
+(defun jde-javadoc-parse-description (docstring)
+  "Return the description from DOCSTRING or nil if not found.
+The returned value has the form ((DESC)).  See also
+`jde-javadoc-parse-tag-values'."
+  (let ((matcher "/\\*\\*")
+	(i 0)
+	j tag-val)
+    (when (string-match matcher docstring)
+      (jde-javadoc-dynamic-status)
+      (setq j (match-end 0))
+      (setq i (string-match jde-javadoc-end-tag-regexp docstring j))
+      (setq tag-val (if i
+			(substring docstring j i)
+		      (substring docstring j)))
+      ;; Ensure that a valid description exists
+      (if (not (string-equal ""
+			     (jde-javadoc-normalize-ref tag-val)))
+	  (list (list tag-val))))))
+
+(defun jde-javadoc-parse-tag-values (docstring tag &optional with-key)
+  "Return from DOCSTRING the list of TAG values or nil if not found.
+Each value is a pair (VALUE-STRING . VALUE-KEY).  If optional WITH-KEY
+is 'name VALUE-KEY is the first word of VALUE-STRING.  If optional
+WITH-KEY is 'ref VALUE-KEY is a normalized VALUE-STRING reference (see
+`jde-javadoc-normalize-ref').  Otherwise VALUE-KEY is nil."
+  (let ((matcher (concat jde-javadoc-start-tag-regexp tag))
+	(i 0)
+	j tag-val key tag-list)
+    (while (string-match matcher docstring i)
+      (jde-javadoc-dynamic-status)
+      (setq j (match-end 0))
+      (setq i (or (string-match
+		   jde-javadoc-end-tag-regexp docstring j)
+		  (length docstring)))
+      (setq tag-val (substring docstring j i))
+      (cond ((eq with-key 'name)
+	     (setq key (and (string-match
+			     "[* \n\r\t]*\\([^ \n\r\t]+\\)" tag-val)
+			    (jde-javadoc-variable-name
+			     (match-string 1 tag-val)))))
+	    ((eq with-key 'ref)
+	     (setq key (jde-javadoc-normalize-ref tag-val))))
+      (setq tag-list (cons (cons tag-val key) tag-list)))
+    (nreverse tag-list)))
+
+(defun jde-javadoc-parse-tag (tag docstring)
+  "Return the TAG documentation from DOCSTRING or nil if not found.
+Documentation has the form (TAG VALUE-LIST).  See also
+`jde-javadoc-parse-tag-values'."
+  (cond ((string-equal tag jde-javadoc-desc-tag)
+	 (jde-javadoc-parse-description docstring))
+	((member tag semantic-java-doc-with-name-tags)
+	 (jde-javadoc-parse-tag-values docstring tag 'name))
+	((member tag semantic-java-doc-with-ref-tags)
+	 (jde-javadoc-parse-tag-values docstring tag 'ref))
+	(t
+	 (jde-javadoc-parse-tag-values docstring tag))
+	))
+
+(defun jde-javadoc-parse-tag-list (docstring)
+  "Return the list of tag found in DOCSTRING."
+  (let* ((matcher (concat jde-javadoc-start-tag-regexp
+			  "\\([^ \n\r\t]+\\)"))
+	 (depth (regexp-opt-depth matcher))
+	 (i (string-match matcher docstring))
+	 j tag-list)
+    (while i
+      (jde-javadoc-dynamic-status)
+      (setq tag-list (cons (match-string depth docstring) tag-list))
+      (setq i (string-match matcher docstring (match-end depth))))
+    (nreverse tag-list)))
+
+(defun jde-javadoc-parse-docstring (docstring)
+  "Return the parsed documentation tree from DOCSTRING.
+Result has the following form: (DOCSTRING TAG-LIST TAG-VALUE-ALIST)."
+  (if docstring
+      (let (tag-list
+	    tag-alist l tag
+	    throws-assoc except-assoc merged-values)
+	(jde-javadoc-status-forms "Parsing" "done"
+	  (jde-javadoc-dynamic-status)
+	  (setq tag-list (jde-javadoc-parse-tag-list docstring))
+	  (setq l (cons jde-javadoc-desc-tag tag-list))
+	  (while l
+	    (jde-javadoc-dynamic-status)
+	    (setq tag (car l))
+	    (if (assoc tag tag-alist)
+		nil                     ; tag already processed
+	      (setq tag-alist
+		    (cons (cons tag
+				(jde-javadoc-parse-tag tag docstring))
+			  tag-alist)))
+	    (setq l (cdr l)))
+	  ;; The 'throws' and 'exception' tags are equivalent, so
+	  ;; their values are merged to allow access to 'exception'
+	  ;; tag using 'throws' and vice versa.
+	  (jde-javadoc-dynamic-status)
+	  (setq throws-assoc (assoc "throws"    tag-alist))
+	  (jde-javadoc-dynamic-status)
+	  (setq except-assoc (assoc "exception" tag-alist))
+	  (when (or throws-assoc except-assoc)
+	    (jde-javadoc-dynamic-status)
+	    (setq merged-values (append (cdr throws-assoc)
+					(cdr except-assoc)))
+	    (jde-javadoc-dynamic-status)
+	    (if throws-assoc
+		(setcdr throws-assoc merged-values)
+	      (setq tag-alist (cons (cons "throws"    merged-values)
+				    tag-alist)))
+	    (jde-javadoc-dynamic-status)
+	    (if except-assoc
+		(setcdr except-assoc merged-values)
+	      (setq tag-alist (cons (cons "exception" merged-values)
+				    tag-alist))))
+	  (jde-javadoc-dynamic-status t))
+	(list docstring tag-list tag-alist))))
+
+;; Handling of javadoc comment parsed tree
+;;
+(defmacro jde-javadoc-doctree-docstring (doctree)
+  "Return the docstring part of DOCTREE."
+  `(car ,doctree))
+
+(defmacro jde-javadoc-doctree-tag-list (doctree)
+  "Return the tag-list part of DOCTREE."
+  `(car (cdr ,doctree)))
+
+(defmacro jde-javadoc-doctree-tag-value-alist (doctree)
+  "Return the tag-value-alist part of DOCTREE."
+  `(car (cdr (cdr ,doctree))))
+
+(defun jde-javadoc-doctree-tag (doctree tag &optional name)
+  "Return from DOCTREE the list of TAG values.
+If optional NAME is non-nil return its specific value."
+  (let ((doc (cdr
+	      (assoc
+	       tag
+	       (jde-javadoc-doctree-tag-value-alist doctree)))))
+    (and doc
+	 name
+	 (setq doc (rassoc name doc))
+	 (setq doc (list doc)))
+    doc))
+
+(defun jde-javadoc-doctree-known-tag-list (doctree)
+  "Return the list of known tags in DOCTREE .
+That is tags in `semantic-java-doc-line-tags'."
+  (delq nil
+	(mapcar (function
+		 (lambda (tag)
+		   (and (member tag semantic-java-doc-line-tags)
+			tag)))
+		(jde-javadoc-doctree-tag-list doctree))))
+
+(defun jde-javadoc-doctree-unknown-tag-list (doctree)
+  "Return the list of unknown tags in DOCTREE .
+That is tags not in `semantic-java-doc-line-tags'."
+  (delq nil
+	(mapcar (function
+		 (lambda (tag)
+		   (and (not (member tag semantic-java-doc-line-tags))
+			tag)))
+		(jde-javadoc-doctree-tag-list doctree))))
+
+;;;; semantic tags stuff
+;;;; ---------------------
+
+(defun jde-javadoc-tag-doctree (tag)
+  "Return the parsed documentation tree from TAG."
+  (jde-javadoc-parse-docstring
+   (semantic-documentation-for-tag tag t)))
+
+(defun jde-javadoc-replace-documentation (tag &optional docstring)
+  "Replace TAG documentation with DOCSTRING.
+If DOCSTRING is nil just delete the existing documentation."
+  (let* ((comment (semantic-documentation-for-tag tag 'flex))
+	 start end)
+    (when comment
+      (set-buffer (semantic-tag-buffer tag))
+      (setq start (semantic-lex-token-start comment))
+      (setq end   (semantic-lex-token-end   comment))
+      (goto-char start)
+      (save-excursion
+	(goto-char end)
+	(jde-javadoc-skip-spaces-forward)
+	(delete-region start (point))
+	(when docstring
+	  (insert docstring)
+	  (jde-javadoc-indent-documentation tag))))))
+
+(defun jde-javadoc-delete-documentation (tag &optional noconfirm)
+  "Delete TAG documentation.
+Require confirmation if optional NOCONFIRM is non-nil.  Return non-nil
+if done."
+  (if (or noconfirm
+	  (y-or-n-p (format "Delete '%s' previous documentation? "
+			    (semantic-tag-name tag))))
+      (progn
+	(jde-javadoc-replace-documentation tag)
+	t)))
+
+(defun jde-javadoc-recenter-documentation (tag &optional arg)
+  "Center TAG documentation in window and redisplay frame.
+With ARG, put point on line ARG.  See also `recenter'."
+  (let ((comment (semantic-documentation-for-tag tag 'flex))
+	start)
+    (if (not comment)
+	(setq start (semantic-tag-start tag))
+      (set-buffer (semantic-tag-buffer tag))
+      (setq start (semantic-lex-token-start comment)))
+    (goto-char start)
+    (recenter arg)))
+
+(defun jde-javadoc-indent-documentation (tag)
+  "Indent TAG documentation."
+  (save-excursion
+    (let ((comment (semantic-documentation-for-tag tag 'flex))
+	  start end)
+      (when comment
+	(set-buffer (semantic-tag-buffer tag))
+	(setq start (semantic-lex-token-start comment))
+	(setq end   (semantic-lex-token-end   comment))
+	(goto-char end)
+	(jde-javadoc-skip-spaces-forward)
+	(jde-javadoc-indent-region start (point))))))
+
+;;;; Doc checker
+;;;; -----------
+
+(defconst jde-javadoc-checker-report-buffer "*jde-javadoc-checker*"
+  "Name of the checker report buffer.")
+
+(defvar jde-javadoc-checker-tag nil
+  "Current checked tag.
+Local to checker report buffer.")
+
+(defvar jde-javadoc-checker-buffer nil
+  "Current checked buffer.
+Local to checker report buffer.")
+
+(condition-case nil
+    (require 'jde-java-font-lock)
+  (error nil))
+
+(defvar jde-javadoc-checker-report-font-lock-keywords
+  (list
+   ;; References
+   (list "`\\(.*\\)'"
+	 1 'font-lock-warning-face)
+   ;; Javadoc tags
+   (list "\\(@[^ \n\r\t]+\\)"
+	 1 (cond ((boundp 'jde-java-font-lock-doc-tag-face)
+		  'jde-java-font-lock-doc-tag-face)
+		 ((featurep 'xemacs)
+		  'font-lock-keyword-face)
+		 (t
+		  'font-lock-constant-face)))
+   ;; Misc.
+   (list "\\[\\([fnpq]\\)\\]"
+	 1 'font-lock-keyword-face)
+   )
+  "Keywords used to highlight the checker report buffer.")
+
+(defvar jde-javadoc-checker-report-mode-map nil
+  "Keymap used in `jde-javadoc-checker-report-mode'.")
+
+(if jde-javadoc-checker-report-mode-map
+    ()
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "q" 'jde-javadoc-checker-quit)
+    (define-key keymap "p" 'jde-javadoc-checker-previous)
+    (define-key keymap "n" 'jde-javadoc-checker-next)
+    (setq jde-javadoc-checker-report-mode-map keymap)))
+
+(defun jde-javadoc-checker-report-mode ()
+  "Mode used in checker report buffer.
+\\{jde-javadoc-checker-report-mode-map}"
+  (kill-all-local-variables)
+  (setq major-mode 'jde-javadoc-checker-report-mode)
+  (setq mode-name "jde-javadoc-checker")
+  (set (make-local-variable 'paragraph-start)
+       "[ \t]*$")
+  (set (make-local-variable 'paragraph-separate)
+       paragraph-start)
+  (set (make-local-variable 'font-lock-defaults)
+       '((jde-javadoc-checker-report-font-lock-keywords)
+	 t t ((?_ . "w"))))
+  (use-local-map jde-javadoc-checker-report-mode-map)
+  (turn-on-font-lock))
+
+(defun jde-javadoc-checker-show-report (report tag)
+  "Show the `jde-javadoc-checker' REPORT for TAG."
+  (let ((buffer (semantic-tag-buffer tag)))
+    (with-current-buffer
+	(get-buffer-create jde-javadoc-checker-report-buffer)
+      (setq buffer-read-only nil)
+      (erase-buffer)
+      (jde-javadoc-checker-report-mode)
+      (set (make-local-variable 'jde-javadoc-checker-buffer) buffer)
+      (set (make-local-variable 'jde-javadoc-checker-tag)  tag)
+      (cond
+       (report
+	(define-key (current-local-map) "f" 'jde-javadoc-checker-fix)
+	(insert (car report))
+	(newline 2)
+	(mapcar (function
+		 (lambda (line)
+		   (let* ((from (point))
+			  (to (progn
+				(fill-region
+				 (point)
+				 (progn
+				   (insert "  " line)
+				   (newline)
+				   (point)))
+				(point))))
+		     (goto-char from)
+		     (delete-char 1)
+		     (insert-char ?\* 1)
+		     (goto-char to))))
+		(cdr report))
+	(newline)
+	(insert "[f]-try to fix  ")
+	)
+       (t
+	(define-key (current-local-map) "f" nil)
+	(insert "Documentation is up-to-date")
+	(newline 2)))
+      (insert "[p]-check previous  [n]-check next  [q]-quit")
+      (goto-char (point-min))
+      (setq buffer-read-only t)
+      (pop-to-buffer (current-buffer))
+      (jde-javadoc-adjust-window
+       (get-buffer-window (current-buffer)))
+      (sit-for 0)
+      (save-selected-window
+	(let ((window (get-buffer-window buffer)))
+	  (if (not window)
+	      nil
+	    (select-window window)
+	    (goto-char (semantic-tag-start tag))
+	    (jde-javadoc-skip-spaces-forward)
+	    (when (looking-at "/\\*\\*")
+	      (forward-comment 1)
+	      (jde-javadoc-skip-spaces-forward))
+	    (recenter -4))))
+      (semantic-momentary-highlight-tag tag))))
+
+(defun jde-javadoc-check-add-summary (report type name)
+  "Add a summary to REPORT error list, using tag TYPE and NAME."
+  (and (setq report (delq nil report))  ;; Clear empty entries
+       (let* ((count (length report))
+	      (eword (if (= count 1) "error" "errors")))
+	 (cons (format "%s `%s' has %d documentation %s:"
+		       type name count eword)
+	       (nreverse report)))))
+
+;; Basic doc checkers
+;;
+(defun jde-javadoc-check-description (doctree)
+  "Return a message if DOCTREE does not contain a description."
+  (if (jde-javadoc-doctree-tag doctree jde-javadoc-desc-tag)
+      nil
+    "Missing description"))
+
+(defun jde-javadoc-check-required-tags (doctree allowed extra
+						&rest nocheck)
+  "Return a message if DOCTREE is missing a required tag.
+ALLOWED and EXTRA are respectively the listes of allowed tags and
+optional ones.  Optional arguments NOCHECK can be a listes of tags
+that are not checked."
+  (let (tag missing)
+    (while allowed
+      (setq tag     (car allowed)
+	    allowed (cdr allowed))
+      (or (member tag extra)
+	  (member tag nocheck)
+	  (let ((ignored nocheck) ignore)
+	    (while (and (not ignore) ignored)
+	      (setq ignore  (member tag (car ignored))
+		    ignored (cdr ignored)))
+	    ignore)
+;;          (member tag semantic-java-doc-with-name-tags)
+	  (jde-javadoc-doctree-tag doctree tag)
+	  (setq missing (cons tag missing))))
+    (if missing
+	(concat "Missing tag"
+		(if (> (length missing) 1) "s @" " @")
+		(mapconcat 'identity missing ", @")))))
+
+(defun jde-javadoc-check-suggest-tag-order (tag-list reference)
+  "Return a list of tags in suggested order from TAG-LIST.
+REFERENCE is the list of tags allowed."
+  (let (otl utl)
+    (while tag-list
+      (if (member (car tag-list) semantic-java-doc-line-tags)
+	  (and (member (car tag-list) reference)
+	       (add-to-list 'otl (car tag-list)))
+	(add-to-list 'utl (car tag-list)))
+      (setq tag-list (cdr tag-list)))
+    (append (sort otl #'semantic-java-doc-keyword-before-p)
+	    (nreverse utl))))
+
+(defun jde-javadoc-check-tag-ordered (doctree reference)
+  "Return a message if tags in DOCTREE are not correctly ordered.
+REFERENCE is the list of allowed tags in correct order.  See variable
+`semantic-java-doc-line-tags'."
+  (let* ((tag-list (jde-javadoc-doctree-tag-list doctree))
+	 (tag      (car tag-list))
+	 (l        (cdr tag-list))
+	 (ok       t))
+    (while (and l ok)
+      (jde-javadoc-dynamic-status)
+      (setq ok  (semantic-java-doc-keyword-before-p tag (car l))
+	    tag (car l)
+	    l   (cdr l)))
+    (if ok
+	nil
+      (concat "Recommended tag order is @"
+	      (mapconcat 'identity
+			 (jde-javadoc-check-suggest-tag-order
+			  tag-list reference)
+			 ", @")))))
+
+(defun jde-javadoc-check-tag-allowed (doctree allowed)
+  "Return a message if some tags in DOCTREE are not in ALLOWED.
+Third party tags (not in `semantic-java-doc-line-tags') are allways
+allowed."
+  (let ((invalids
+	 (delq nil
+	       (mapcar
+		(function
+		 (lambda (tag)
+		   (jde-javadoc-dynamic-status)
+		   (and (member tag semantic-java-doc-line-tags)
+			(not (member tag allowed))
+			tag)))
+		(jde-javadoc-doctree-tag-list doctree)))))
+    (if (not invalids)
+	nil
+      (concat "Invalid tag"
+	      (if (> (length invalids) 1) "s @" " @")
+	      (mapconcat 'identity invalids ", @")))))
+
+;; Tag based doc checkers
+;;
+(defun jde-javadoc-check-type (tag doctree)
+  "Check doc of 'type' (class or interface) TAG.
+DOCTREE is the current doctree of TAG.  Return a non-nil report if
+errors were found."
+  (let ((name (semantic-tag-name tag))
+	(type (semantic-tag-type tag))
+	(main (jde-javadoc-checker-main-type-p tag))
+	report)
+    ;; Check for missing description
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-description doctree)
+	   report))
+    ;; Check for missing tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-required-tags
+	    doctree semantic-java-doc-type-tags
+	    semantic-java-doc-extra-type-tags
+	    (if main
+		nil
+	      ;; Don't check these tags if internal type.
+	      '("author" "version" "since")))
+	   report))
+    ;; Check for incorrect tag order
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-ordered
+	    doctree semantic-java-doc-type-tags)
+	   report))
+    ;; Check for invalid tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-allowed
+	    doctree semantic-java-doc-type-tags)
+	   report))
+    ;; Setup the error summary
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-check-add-summary report type name)))
+
+(defun jde-javadoc-check-variable (tag doctree)
+  "Check doc of 'variable' (field) TAG.
+DOCTREE is the current doctree of TAG.  Return a non-nil report if
+errors were found."
+  (let ((name (semantic-tag-name tag))
+	report)
+    ;; Check for missing description
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-description doctree)
+	   report))
+    ;; Check for missing tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-required-tags
+	    doctree semantic-java-doc-variable-tags
+	    semantic-java-doc-extra-variable-tags)
+	   report))
+    ;; Check for incorrect tag order
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-ordered
+	    doctree semantic-java-doc-variable-tags)
+	   report))
+    ;; Check for invalid tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-allowed
+	    doctree semantic-java-doc-variable-tags)
+	   report))
+    ;; Setup the error summary
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-check-add-summary report "variable" name)))
+
+(defun jde-javadoc-check-function (tag doctree)
+  "Check doc of 'function' (method or constructor) TAG.
+DOCTREE is the current doctree of TAG.  Return a non-nil report if
+errors were found."
+  (let ((name   (semantic-tag-name               tag))
+	(type   (semantic-tag-type               tag))
+	(args   (semantic-tag-function-arguments      tag))
+	(throws (semantic-tag-function-throws    tag))
+	report items item)
+    ;; Check for missing description
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-description doctree)
+	   report))
+    ;; Check for missing tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-required-tags
+	    doctree semantic-java-doc-function-tags
+	    semantic-java-doc-extra-function-tags
+	    ;; Don't check return, param and exception/throws tags.
+	    '("return") semantic-java-doc-with-name-tags)
+	   report))
+    ;; Check for missing @param tags
+    (setq items nil)
+    (while args
+      (jde-javadoc-dynamic-status)
+      (if (semantic-tag-p (car args))
+	  (progn
+	    (setq item (jde-javadoc-variable-name
+			(semantic-tag-name (car args))))
+	    (setq items (cons item items))
+	    (or (jde-javadoc-doctree-tag doctree "param" item)
+		(setq report
+		      (cons
+		       (format "Missing @param tag for `%s'" item)
+		       report)))))
+      (setq args (cdr args)))
+    ;; Check for extra @param tags
+    (setq args (jde-javadoc-doctree-tag doctree "param"))
+    (while args
+      (jde-javadoc-dynamic-status)
+      (setq item (jde-javadoc-variable-name (cdr (car args))))
+      (or (member item items)
+	  (setq report (cons (format "Invalid @param tag `%s'" item)
+			     report)))
+      (setq args (cdr args)))
+    ;; Check for missing @exception tags
+    (setq items nil)
+    (while throws
+      (jde-javadoc-dynamic-status)
+      (setq item (car throws))
+      (setq items (cons item items))
+      (setq throws (cdr throws))
+      (or (jde-javadoc-doctree-tag doctree "exception" item)
+	  (setq report
+		(cons
+		 (format "Missing @exception tag for `%s'" item)
+		 report))))
+    ;; Check for extra @exception tags
+    (setq args (jde-javadoc-doctree-tag doctree "exception"))
+    (while args
+      (jde-javadoc-dynamic-status)
+      (setq item (cdr (car args)))
+      (or (member item items)
+	  (and jde-javadoc-check-undeclared-exception-flag
+	       (jde-javadoc-implicit-exception-p item))
+	  (setq report
+		(cons
+		 (format
+		  "Extra @exception tag `%s' (maybe not an error)"
+		  item)
+		 report)))
+      (setq args (cdr args)))
+    ;; Check for missing or extra @return tag
+    (setq item (jde-javadoc-doctree-tag doctree "return"))
+    (jde-javadoc-dynamic-status)
+    (cond ((and (not type) item)
+	   (setq report (cons "Invalid @return tag for constructor"
+			      report)))
+	  ((and type (string-equal type "void") item)
+	   (setq report (cons "Invalid @return tag for void method"
+			      report)))
+	  ((and type (not (string-equal type "void")) (not item))
+	   (setq report (cons "Missing @return tag"
+			      report))))
+    ;; Check for incorrect tag order
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-ordered
+	    doctree semantic-java-doc-function-tags)
+	   report))
+    ;; Check for invalid tags
+    (jde-javadoc-dynamic-status)
+    (setq report
+	  (cons
+	   (jde-javadoc-check-tag-allowed
+	    doctree semantic-java-doc-function-tags)
+	   report))
+    ;; Setup the error summary
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-check-add-summary report
+				   (if type "method" "constructor")
+				   name)))
+
+(defun jde-javadoc-checker (tag &optional noreport)
+  "Call the javadoc checker associated to TAG.
+If optional NOREPORT is non-nil does not show error report.  Return a
+non-nil report if errors were found."
+  (let* ((type    (semantic-tag-class tag))
+	 (checker (intern (format "jde-javadoc-check-%s" type))))
+    (or (fboundp checker)
+	(error "No checker found to process '%S' tag" type))
+    (goto-char (semantic-tag-start tag))
+    (recenter 1)
+    (let (doctree report)
+      (jde-javadoc-status-forms "Checking" "done"
+	(jde-javadoc-dynamic-status)
+	(setq doctree (jde-javadoc-tag-doctree tag))
+	(setq report  (funcall checker tag doctree))
+	(or noreport
+	    (jde-javadoc-checker-show-report report tag))
+	(jde-javadoc-dynamic-status t))
+      report)))
+
+(defcustom jde-javadoc-checker-level 'protected
+  "*Accessibility level to check.
+Only 'type, 'function or 'variable tags with this level will be
+checked.  The level is defined to be consistent with the javadoc show
+options.  That is:
+
+- - public    - check only public classes and members.
+- - protected - check only protected and public classes and
+		members.  This is the default.
+- - package   - check only package, protected, and public classes
+		and members.
+- - private   - check all classes and members."
+  :group 'jde-javadoc
+  :type  '(choice :tag "level"
+		  (const :tag "public"    public)
+		  (const :tag "protected" protected)
+		  (const :tag "package"   package)
+		  (const :tag "private"   private)))
+
+(defconst jde-javadoc-access-level-weights
+  '((public    . 8)
+    (protected . 4)
+    (package   . 2)
+    (private   . 0))
+  "Java access level weights.")
+
+(defun jde-javadoc-access-level-lower-p (l1 l2)
+  "Return non-nil if access level L1 is lower than L2."
+  (< (cdr (assq l1 jde-javadoc-access-level-weights))
+     (cdr (assq l2 jde-javadoc-access-level-weights))))
+
+(defun jde-javadoc-tag-access-level (tag)
+  "Return the access level of TAG.
+That is 'public 'package 'protected or 'private.  If TAG is included
+in other ones its access level is the lowest one found in the
+hierarchy."
+  (let ((deps (semantic-find-tag-by-overlay
+	       (semantic-tag-start tag)
+	       (semantic-tag-buffer tag)))
+	last-type tag categ modifiers levels)
+    (while deps
+      (setq tag (car deps))
+      (setq deps  (cdr deps))
+      (setq categ (semantic-tag-class tag))
+      (setq modifiers
+	    (cond
+	     ((eq categ 'type)
+	      (setq last-type (semantic-tag-type tag))
+	      (semantic-tag-modifiers tag))
+	     ((eq categ 'function)
+	      (if (string-equal last-type "interface")
+		  (list "public") ;; interface members are always public
+		(semantic-tag-modifiers tag)))
+	     ((eq categ 'variable)
+	      (if (string-equal last-type "interface")
+		  (list "public") ;; interface members are always public
+		(semantic-tag-modifiers tag)))
+	     (t ;; must never occurs
+	      (error "Invalid %s tag" categ))))
+      (setq levels
+	    (cons (cond ((member "public" modifiers)
+			 'public)
+			((member "protected" modifiers)
+			 'protected)
+			((member "private" modifiers)
+			 'private)
+			(t
+			 'package))
+		  levels)))
+    (car (sort levels 'jde-javadoc-access-level-lower-p))))
+
+(defun jde-javadoc-checker-at-level-p (tag)
+  "Return non-nil if checking is allowed for TAG.
+That is TAG accessibility level is greater than or equal to the one
+specified by `jde-javadoc-checker-level'.  TAG category must be
+'type, 'function or 'variable."
+  (let ((level (or jde-javadoc-checker-level 'protected)))
+    ;; if level is 'private check all
+    (or (eq level 'private)
+	;; else check if tag access level >= checker level
+	(not (jde-javadoc-access-level-lower-p
+	      (jde-javadoc-tag-access-level tag)
+	      level)))))
+
+(defun jde-javadoc-checker-main-type-p (&optional tag)
+  "Return non-nil if TAG is a main type one.
+That is not an internal class or interface."
+  (setq tag (or tag (semantic-current-tag)))
+  (and (eq (semantic-tag-class tag) 'type)
+       (memq tag (semantic-brute-find-tag-by-class
+		    'type (current-buffer)))))
+
+(defun jde-javadoc-checker-do-find-previous-tag (tags &optional
+							  tag prev)
+  "Visit TAGS and return the tag before TAG.
+PREV is the last tag visited or nil at start.  If TAG is nil
+return the last tag found.  Return only a 'type 'function or
+'variable tag."
+  (let (current categ)
+    (while tags
+      (setq current (car tags))
+      (setq tags  (cdr tags))
+      (setq categ   (semantic-tag-class current))
+      (if (memq categ '(type function variable))
+	  (cond
+	   ((null tag)
+	    (if (null tags)
+		(throw 'found prev)))
+	   ((>= (semantic-tag-start current)
+		(semantic-tag-start tag))
+	    (throw 'found prev))
+	   (t
+	    (setq prev
+		  (if (eq categ 'type)
+		      (jde-javadoc-checker-do-find-previous-tag
+		       (semantic-tag-type-members current)
+		       tag current)
+		    current))))
+	))
+    prev))
+
+(defun jde-javadoc-checker-find-previous-tag (tags
+						&optional tag)
+  "Visit TAGS and return the tag before TAG.
+If TAG is nil return the last tag found.  Return only a 'type
+'function or 'variable tag."
+  (catch 'found
+    (jde-javadoc-checker-do-find-previous-tag tags tag)))
+
+(defun jde-javadoc-checker-find-next-tag (tags &optional tag)
+  "Visit TAGS and return the tag following TAG.
+If TAG is nil return the first tag found.  Return only a 'type
+'function or 'variable tag."
+  (let (current next categ)
+    (while (and tags (not next))
+      (setq current (car tags))
+      (setq categ   (semantic-tag-class current))
+      (if (memq categ '(type function variable))
+	  (if (or (null tag)
+		  (> (semantic-tag-start current)
+		     (semantic-tag-start tag)))
+	      (setq next current)
+	    (if (eq categ 'type)
+		(setq next (jde-javadoc-checker-find-next-tag
+			    (semantic-tag-type-members current)
+			    tag)))))
+      (setq tags (cdr tags)))
+    next))
+
+(defun jde-javadoc-checker-previous-tag (buffer &optional tag)
+  "Report the previous tag in BUFFER with documentation errors.
+Start checking before TAG if non-nil or at the last tag found."
+  (pop-to-buffer buffer)
+  (let* ((tags (semantic-fetch-tags))
+	 (prev   (jde-javadoc-checker-find-previous-tag
+		  tags tag))
+	 (report (and prev
+		      (jde-javadoc-checker-at-level-p prev)
+		      (jde-javadoc-checker prev t))))
+    (while (and prev (not report))
+      (setq prev   (jde-javadoc-checker-find-previous-tag
+		    tags prev))
+      (setq report (and prev
+			(jde-javadoc-checker-at-level-p prev)
+			(jde-javadoc-checker prev t))))
+    (if report
+	(jde-javadoc-checker-show-report report prev)
+      (if tag
+	  (if (y-or-n-p "No more doc error found.  Quit? ")
+	      (jde-javadoc-checker-quit)
+	    (jde-javadoc-checker tag))
+	(message "No doc errors found")
+	(jde-javadoc-checker-quit)))))
+
+(defun jde-javadoc-checker-next-tag (buffer &optional tag)
+  "Report the next tag in BUFFER with documentation errors.
+Start checking after TAG if non-nil or at the first tag found."
+  (pop-to-buffer buffer)
+  (let* ((tags (semantic-fetch-tags))
+	 (next   (jde-javadoc-checker-find-next-tag tags tag))
+	 (report (and next
+		      (jde-javadoc-checker-at-level-p next)
+		      (jde-javadoc-checker next t))))
+    (while (and next (not report))
+      (setq next   (jde-javadoc-checker-find-next-tag tags next))
+      (setq report (and next
+			(jde-javadoc-checker-at-level-p next)
+			(jde-javadoc-checker next t))))
+    (if report
+	(jde-javadoc-checker-show-report report next)
+      (if tag
+	  (if (y-or-n-p "No more doc error found.  Quit? ")
+	      (jde-javadoc-checker-quit)
+	    (jde-javadoc-checker tag))
+	(message "No doc errors found")
+	(jde-javadoc-checker-quit)))))
+
+;;;; Doc generator
+;;;; -------------
+
+(defun jde-javadoc-insert (*name* &rest *texts*)
+  "Insert the template *NAME* or *TEXTS* and a newline.
+If *NAME* value is nil *TEXTS* are inserted if non-nil.  If *NAME* and
+*TEXTS* are nil the function does nothing.
+The name of variables local to this function are enclosed between
+\"*\" to avoid conflicts with variables used in templates."
+  (cond ((and *name* (symbolp *name*) (symbol-value *name*))
+	 (tempo-insert-template *name* nil)
+	 (newline))
+	(*texts*
+	 (apply #'insert *texts*)
+	 (newline))))
+
+;; Basic generators
+;;
+(defun jde-javadoc-insert-start-block ()
+  "Insert a javadoc comment block start '/**' at point."
+  (jde-javadoc-insert nil "/**"))
+
+(defun jde-javadoc-insert-empty-line ()
+  "Insert an empty javadoc line '*'."
+  (jde-javadoc-insert nil "*"))
+
+(defun jde-javadoc-insert-end-block (&optional indent)
+  "Insert a javadoc end comment block."
+  (jde-javadoc-insert 'tempo-template-jde-javadoc-end-block "*/")
+  (if indent
+      (jde-javadoc-indent-line))
+  nil) ;; must return nil to prevent template insertion.
+
+(defun jde-javadoc-insert-previous-description (doctree)
+  "Insert a javadoc description if it already exists in DOCTREE."
+  (let ((previous (jde-javadoc-doctree-tag
+		   doctree jde-javadoc-desc-tag)))
+    (if previous
+	(jde-javadoc-insert
+	 nil
+	 "/**"
+	 (jde-javadoc-normalize-description (car (car previous)))))
+    previous))
+
+(defun jde-javadoc-insert-previous-tag (doctree tag &optional key)
+  "If it already exists in DOCTREE, insert javadoc TAG value(s).
+If optional KEY is non-nil insert its specific value."
+  (let ((previous (jde-javadoc-doctree-tag doctree tag key)))
+    (if previous
+	(jde-javadoc-map
+	 (function
+	  (lambda (item)
+	    (jde-javadoc-dynamic-status)
+	    (jde-javadoc-insert nil "* @" tag (car item))))
+	 previous))
+    previous))
+
+(defun jde-javadoc-insert-unknown-tags (doctree)
+  "Insert unknown tags found in DOCTREE.
+See `jde-javadoc-doctree-unknown-tag-list'."
+  (jde-javadoc-map
+   (function
+    (lambda (tag)
+      (jde-javadoc-dynamic-status)
+      (jde-javadoc-insert-previous-tag doctree tag)))
+   (jde-javadoc-doctree-unknown-tag-list doctree)))
+
+(defun jde-javadoc-insert-author-tag (doctree)
+  "Insert javadoc @author tags.
+If tags already exist in DOCTREE keep them, else insert a new default
+one."
+  (or (jde-javadoc-insert-previous-tag doctree "author")
+      (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag)))
+
+;; (defun jde-javadoc-insert-since-tag (doctree)
+;;   "Insert a javadoc @since tag.
+;; If tag already exists in DOCTREE keep it, else insert a new default
+;; one."
+;;   (or (jde-javadoc-insert-previous-tag doctree "since")
+;;       (jde-javadoc-insert 'tempo-template-jde-javadoc-since-tag)))
+
+(defun jde-javadoc-insert-version-tag (doctree)
+  "Insert a javadoc @version tag.
+If tag already exists in DOCTREE keep it, else insert a new default
+one."
+  (or (jde-javadoc-insert-previous-tag doctree "version")
+      (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag)))
+
+;; (defun jde-javadoc-insert-see-tag (doctree refs)
+;;   "Insert javadoc @see tags.
+;; If tags already exist in DOCTREE keep them, else insert a new
+;; default one for each item in REFS."
+;;   (or (jde-javadoc-insert-previous-tag doctree "see")
+;;       (jde-javadoc-map
+;;        (function
+;;         (lambda (ref)
+;;           (and ref (not (string= ref ""))
+;;                (jde-javadoc-insert
+;;                 'tempo-template-jde-javadoc-see-tag))))
+;;        refs)))
+
+(defun jde-javadoc-insert-param-tag (doctree type name)
+  "Insert a javadoc @param tag.
+If tag already exists in DOCTREE keep it, else insert a new default
+one using parameter TYPE and NAME."
+  (or (jde-javadoc-insert-previous-tag doctree "param" name)
+      (and type (not (string= type ""))
+	   name (not (string= name ""))
+	   (jde-javadoc-insert
+	    'tempo-template-jde-javadoc-param-tag))))
+
+(defun jde-javadoc-insert-exception-tag (doctree types)
+  "Insert javadoc @exception tags.
+If tags already exist in DOCTREE keep them, else insert a new default
+one for each exception in TYPES."
+  (jde-javadoc-map
+   (function
+    (lambda (type)
+      (jde-javadoc-dynamic-status)
+      (or (jde-javadoc-insert-previous-tag doctree "exception" type)
+	  (and type (not (string= type ""))
+	       (jde-javadoc-insert
+		'tempo-template-jde-javadoc-exception-tag)))))
+   types)
+  ;; Keep extra exception tags (maybe not invalid tags)
+  (jde-javadoc-map
+   (function
+    (lambda (type)
+      (jde-javadoc-dynamic-status)
+      (setq type (cdr type))
+      (or (member type types)
+	  (if (or (not jde-javadoc-check-undeclared-exception-flag)
+		  (jde-javadoc-implicit-exception-p type))
+	      (jde-javadoc-insert-previous-tag
+	       doctree "exception" type)))))
+   (jde-javadoc-doctree-tag doctree "exception")))
+
+(defun jde-javadoc-insert-return-tag (doctree type)
+  "Insert a javadoc @return tag.
+If tag already exists in DOCTREE keep it, else insert a new default
+one using return TYPE."
+  (and type (not (string= type "void"))
+       (or (jde-javadoc-insert-previous-tag doctree "return")
+	   (jde-javadoc-insert
+	    'tempo-template-jde-javadoc-return-tag))))
+
+(defun jde-javadoc-insert-field-desc (doctree modifiers type name)
+  "Insert a field description.
+If a description already exists in DOCTREE keep it, else insert a
+default one using field MODIFIERS TYPE and NAME."
+  (if (jde-javadoc-insert-previous-description doctree)
+      nil
+    (jde-javadoc-insert-start-block)
+    (jde-javadoc-insert 'tempo-template-jde-javadoc-describe-field)
+    (jde-javadoc-insert-empty-line)))
+
+(defun jde-javadoc-insert-function-desc (doctree type name)
+  "Insert a method or constructor description.
+If a description already exists in DOCTREE keep it, else insert a
+default one using method TYPE and NAME.  If TYPE is nil insert a
+default constructor description."
+  (if (jde-javadoc-insert-previous-description doctree)
+      nil
+    (jde-javadoc-insert-start-block)
+    (if (and name (not (string= name "")))
+	(jde-javadoc-insert
+	 (if (and type (not (string= type "")))
+	     'tempo-template-jde-javadoc-describe-method
+	   'tempo-template-jde-javadoc-describe-constructor)))
+    (jde-javadoc-insert-empty-line)))
+
+(defun jde-javadoc-insert-class-desc (doctree name)
+  "Insert a class description.
+If a description already exists in DOCTREE keep it, else insert a
+default one using class NAME."
+  (if (jde-javadoc-insert-previous-description doctree)
+      nil
+    (jde-javadoc-insert-start-block)
+    (jde-javadoc-insert 'tempo-template-jde-javadoc-describe-class)
+    (jde-javadoc-insert-empty-line)))
+
+(defun jde-javadoc-insert-interface-desc (doctree name)
+  "Insert an interface description.
+If a description already exists in DOCTREE keep it, else insert a
+default one using interface NAME."
+  (if (jde-javadoc-insert-previous-description doctree)
+      nil
+    (jde-javadoc-insert-start-block)
+    (jde-javadoc-insert
+     'tempo-template-jde-javadoc-describe-interface)
+    (jde-javadoc-insert-empty-line)))
+
+;; Main generators
+;;
+(defun jde-javadoc-type-doc (modifiers type name parents main
+				       &optional doctree)
+  "Document a class or interface using MODIFIERS TYPE NAME PARENTS.
+If MAIN is non-nil this is a main class or interface (not internal).
+If description and tags already exist in DOCTREE keep them."
+  ;; description
+  (jde-javadoc-dynamic-status)
+  (if (string-equal type "interface")
+      (jde-javadoc-insert-interface-desc doctree name)
+    (jde-javadoc-insert-class-desc doctree name))
+  (when main
+    ;; author
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-insert-author-tag doctree)
+    ;; version
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-insert-version-tag doctree))
+  ;; Keep extra optional tags if they already exist
+  (jde-javadoc-dynamic-status)
+  (jde-javadoc-map (function
+		    (lambda (tag)
+		      (jde-javadoc-insert-previous-tag doctree tag)))
+		   semantic-java-doc-extra-type-tags)
+  ;; Keep unknown (not Sun's) tags
+  (jde-javadoc-insert-unknown-tags doctree)
+  ;; The end of comment block
+  (jde-javadoc-dynamic-status)
+  (jde-javadoc-insert-end-block t))
+
+(defun jde-javadoc-variable-doc (modifiers type name
+					   &optional doctree)
+  "Document a field using MODIFIERS TYPE NAME.
+If description and tags already exist in DOCTREE keep them."
+  ;; description
+  (jde-javadoc-insert-field-desc doctree modifiers type name)
+  ;; Keep extra optional tags if they already exist
+  (jde-javadoc-map (function
+		    (lambda (tag)
+		      (jde-javadoc-insert-previous-tag doctree tag)))
+		   semantic-java-doc-extra-variable-tags)
+  ;; Keep unknown (not Sun's) tags
+  (jde-javadoc-insert-unknown-tags doctree)
+  ;; The end of comment block
+  (jde-javadoc-insert-end-block t))
+
+(defun jde-javadoc-function-args-doc (tags &optional doctree)
+  "Document function arguments in TAGS.
+If tags already exist in DOCTREE keep them."
+  (jde-javadoc-map
+   (function
+    (lambda (tag)
+      (if (semantic-tag-p tag)      ; because TAGS can be (nil)
+	  (let ((modifiers (semantic-tag-modifiers tag))
+		(type      (semantic-tag-type               tag))
+		(name      (semantic-tag-name               tag)))
+	    (jde-javadoc-insert-param-tag doctree type name)))))
+   tags))
+
+(defun jde-javadoc-function-doc (modifiers type name args throws
+					   &optional doctree)
+  "Document a function using MODIFIERS TYPE NAME ARGS THROWS.
+If description and tags already exist in DOCTREE keep them."
+  ;; description
+  (jde-javadoc-insert-function-desc doctree type name)
+  ;; param
+  (jde-javadoc-function-args-doc args doctree)
+  ;; return
+  (jde-javadoc-insert-return-tag doctree type)
+  ;; exception
+  (jde-javadoc-insert-exception-tag doctree throws)
+  ;; Keep extra optional tags if they already exist
+  (jde-javadoc-map (function
+		    (lambda (tag)
+		      (jde-javadoc-insert-previous-tag doctree tag)))
+		   semantic-java-doc-extra-function-tags)
+  ;; Keep unknown (not Sun's) tags
+  (jde-javadoc-insert-unknown-tags doctree)
+  ;; The end of comment block
+  (jde-javadoc-insert-end-block t))
+
+;; Main tag based generators
+;;
+(defun jde-javadoc-type (tag doctree)
+  "Document a 'type' (class or interface) TAG.
+DOCTREE is the current doctree of TAG."
+  (let ((modifiers  (semantic-tag-modifiers tag))
+	(type       (semantic-tag-type               tag))
+	(name       (semantic-tag-name               tag))
+	(parents    (semantic-tag-type-superclasses  tag))
+	(main       (jde-javadoc-checker-main-type-p tag)))
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-type-doc modifiers type name parents main doctree)))
+
+(defun jde-javadoc-variable (tag doctree)
+  "Document a 'variable' (field) TAG.
+DOCTREE is the current doctree of TAG."
+  (let ((modifiers  (semantic-tag-modifiers tag))
+	(type       (semantic-tag-type               tag))
+	(name       (semantic-tag-name               tag)))
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-variable-doc modifiers type name doctree)))
+
+(defun jde-javadoc-function (tag doctree)
+  "Document a 'function' (method or constructor) TAG.
+DOCTREE is the current doctree of TAG."
+  (let ((modifiers  (semantic-tag-modifiers tag))
+	(type       (semantic-tag-type               tag))
+	(name       (semantic-tag-name               tag))
+	(args       (semantic-tag-function-arguments tag))
+	(throws     (semantic-tag-function-throws    tag)))
+    (jde-javadoc-dynamic-status)
+    (jde-javadoc-function-doc
+     modifiers type name args throws doctree)))
+
+(defun jde-javadoc-generator (tag &optional noconfirm)
+  "Call the javadoc generator associated to TAG.
+Require confirmation to delete existing documentation if optional
+NOCONFIRM is non-nil."
+  (let* ((type      (semantic-tag-class tag))
+	 (generator (intern (format "jde-javadoc-%s" type)))
+	 (checker   (intern (format "jde-javadoc-check-%s" type))))
+    (or (fboundp generator)
+	(error "No generator found to process '%S' tag" type))
+    (goto-char (semantic-tag-start tag))
+    (let ((report t) doctree)
+      (jde-javadoc-status-forms "Updating" "done"
+	(jde-javadoc-dynamic-status)
+	(setq doctree (jde-javadoc-tag-doctree tag))
+	(if (and (fboundp checker)
+		 (not (funcall checker tag doctree)))
+	    (setq report nil)
+	  (let ((seas semantic-edits-are-safe))
+	    (make-local-variable 'semantic-edits-are-safe)
+	    (unwind-protect
+		(progn
+		  (setq semantic-edits-are-safe t)
+		  (when (or (not doctree)
+			    (jde-javadoc-delete-documentation
+			     tag noconfirm))
+		    (funcall generator tag doctree)
+		    (jde-javadoc-indent-documentation tag)))
+	      (setq semantic-edits-are-safe seas))))
+	(jde-javadoc-dynamic-status t))
+      (or report
+	  (message "Documentation is up-to-date")))))
+
+;;;; Misc command auxiliaries
+;;;; ------------------------
+
+(defun jde-javadoc-nonterminal-at-line ()
+  "Search the bovine table for the tag at the current line."
+  (save-excursion
+    ;; Preserve current tags when the lexer fails (when there is an
+    ;; unclosed block or an unterminated string for example).
+    (let ((semantic-flex-unterminated-syntax-end-function
+	   #'(lambda (syntax &rest ignore)
+	       (throw 'jde-javadoc-flex-error syntax))))
+      (catch 'jde-javadoc-flex-error
+	(semantic-fetch-tags))))
+  (save-excursion
+    ;; Move the point to the first non-blank character found.  Skip
+    ;; spaces, tabs and newlines.
+    (beginning-of-line)
+;;    (jde-javadoc-skip-spaces-forward)
+    (forward-comment (point-max))
+    (semantic-current-tag)))
+
+(defvar jde-javadoc-checkdoc-excursion nil
+  "Window configuration and point before running doc checker.")
+;; Maybe `jde-javadoc-checkdoc-excursion' could be made buffer local?
+;;(make-variable-buffer-local 'jde-javadoc-checkdoc-excursion)
+
+(defun jde-javadoc-checkdoc-clear-excursion ()
+  "Clear saved window configuration and point.
+See also variable `jde-javadoc-checkdoc-excursion'."
+  (setq jde-javadoc-checkdoc-excursion nil))
+
+(defun jde-javadoc-checkdoc-save-excursion ()
+  "Save window configuration and point.
+See also function `jde-javadoc-checkdoc-restore-excursion'."
+  (setq jde-javadoc-checkdoc-excursion
+	(vector (current-window-configuration)
+		(point))))
+
+(defun jde-javadoc-checkdoc-restore-excursion ()
+  "Restore window configuration and point.
+See also function `jde-javadoc-checkdoc-save-excursion'."
+  (let ((ex jde-javadoc-checkdoc-excursion))
+    (and (vectorp ex)
+	 (window-configuration-p (aref ex 0))
+	 (integer-or-marker-p    (aref ex 1))
+	 (condition-case nil
+	     (progn
+	       (set-window-configuration (aref ex 0))
+	       (goto-char                (aref ex 1)))
+	   (error nil)))
+    (jde-javadoc-checkdoc-clear-excursion)))
+
+;;;; Commands
+;;;; --------
+
+;;;###autoload
+(defun jde-javadoc-checker-previous ()
+  "Go to the previous tag with doc errors."
+  (interactive)
+  (and (eq major-mode 'jde-javadoc-checker-report-mode)
+       (jde-javadoc-checker-previous-tag
+	jde-javadoc-checker-buffer jde-javadoc-checker-tag)))
+
+;;;###autoload
+(defun jde-javadoc-checker-next ()
+  "Goto the next tag with doc errors."
+  (interactive)
+  (and (eq major-mode 'jde-javadoc-checker-report-mode)
+       (jde-javadoc-checker-next-tag jde-javadoc-checker-buffer
+				       jde-javadoc-checker-tag)))
+;;;###autoload
+(defun jde-javadoc-checker-fix ()
+  "Fix documentation of checked tag.
+Used in `jde-javadoc-checker-report-mode'."
+  (interactive)
+  (and (eq major-mode 'jde-javadoc-checker-report-mode)
+       (let ((tag  jde-javadoc-checker-tag)
+	     (buffer jde-javadoc-checker-buffer))
+	 (when (and tag buffer)
+	   (pop-to-buffer buffer)
+	   (goto-char (semantic-tag-start tag))
+	   ;; do the fix (THE POINT STAY AT TAG START POSITION)
+	   (jde-javadoc-generator tag t)
+	   ;; recheck the tag
+	   (jde-javadoc-checker tag)))))
+
+;;;###autoload
+(defun jde-javadoc-checker-quit ()
+  "Quit the `jde-javadoc-checker' report buffer.
+Used in `jde-javadoc-checker-report-mode'."
+  (interactive)
+  (let ((buffer (get-buffer jde-javadoc-checker-report-buffer)))
+    (if (bufferp buffer)
+	(kill-buffer buffer))
+    (jde-javadoc-checkdoc-restore-excursion)))
+
+;;;###autoload
+(defun jde-javadoc-customize ()
+  "Show the jde-javadoc options panel."
+  (interactive)
+  (customize-group "jde-javadoc"))
+
+;;;###autoload
+(defun jde-javadoc-autodoc-at-line ()
+  "Update javadoc comment block for declaration at current line.
+
+Uses the semantic bovinator parser table to find declarations (see
+`jde-javadoc-nonterminal-at-line').
+
+BEFORE EXECUTING THE COMMAND, THE POINT MUST BE LOCATED AT THE FIRST
+LINE OF THE CLASS OR METHOD DECLARATION.  IF NOT RESULT IS UNCERTAIN.
+
+In the following examples, point is located at the beginning of the
+line, before the word 'public' (but it could be anywhere on this
+line):
+
+1- Class example:
+   -------------
+
+-|-  public class MyClass
+       extends MySuperClass implements Runnable, java.io.Serializable
+     {
+       ...
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe class <code>MyClass</code> here.
++     *
++     * @author \"David Ponce\" <david.ponce@wanadoo.fr>
++     * @version 1.0
++     * @since 1.0
++     * @see MySuperClass
++     * @see Runnable
++     * @see java.io.Serializable
++     */
+     public class MyClass
+       extends MySuperClass implements Runnable, java.io.Serializable
+     {
+       ...
+
+2- Method example:
+   --------------
+
+-|-  public
+     void   myMethod( int  x,  int y )
+       throws Exception
+     {
+       ...
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe <code>myMethod</code> method here.
++     *
++     * @param x an <code>int</code> value
++     * @param y a <code>long</code> value
++     * @exception Exception if an error occurs
++     */
+     public
+     void   myMethod( int  x,  long y )
+       throws Exception
+     {
+       ...
+
+3- Field example:
+   --------------
+
+-|-  private static final int SIZE = 10;
+
+\\[jde-javadoc-autodoc-at-line] inserts:
+
++    /**
++     * Describe constant <code>SIZE</code> here.
++     */
+     private static final int SIZE = 10;
+
+
+`tempo' templates are used for each category of javadoc line.  The
+following templates are currently defined and fully customizable (see
+`tempo-define-template' for the different items that can be used in a
+tempo template):
+
+- - `jde-javadoc-author-tag-template'
+- - `jde-javadoc-describe-class-template'
+- - `jde-javadoc-describe-constructor-template'
+- - `jde-javadoc-describe-interface-template'
+- - `jde-javadoc-describe-method-template'
+- - `jde-javadoc-describe-field-template'
+- - `jde-javadoc-exception-tag-template'
+- - `jde-javadoc-param-tag-template'
+- - `jde-javadoc-return-tag-template'
+- - `jde-javadoc-version-tag-template'
+
+For example if you customize `jde-javadoc-describe-class-template'
+with the following value:
+
+'(\"* \" (P \"Class description: \"))
+
+you will be asked to enter the class description in the minibuffer.
+See also the `jde-javadoc-field-type', `jde-javadoc-a' and
+`jde-javadoc-code' helper functions."
+  (interactive)
+  (or (eq major-mode 'jde-mode)
+      (error "Major mode must be 'jde-mode'"))
+  (let ((found (jde-javadoc-nonterminal-at-line)))
+    (if found
+	(jde-javadoc-generator found)
+      (error "No tag found at point"))))
+
+;;;###autoload
+(defun jde-javadoc-remdoc-at-line (&optional noconfirm)
+  "Remove javadoc comment block for declaration at current line.
+Require confirmation if optional NOCONFIRM is non-nil.
+Return non-nil if done.
+This uses `jde-javadoc-nonterminal-at-line' to find declarations."
+  (interactive "P")
+  (jde-assert-source-buffer)
+  (let ((found (jde-javadoc-nonterminal-at-line)))
+    (if (not found)
+	(error "No tag found at point")
+      (jde-javadoc-delete-documentation found current-prefix-arg))))
+
+;;;###autoload
+(defun jde-javadoc-checkdoc-at-line ()
+  "Check javadoc comment block of declaration at current line.
+
+Uses the semantic bovinator parser table to find declarations (see
+`jde-javadoc-nonterminal-at-line').
+
+BEFORE EXECUTING THE COMMAND, THE POINT MUST BE LOCATED AT THE FIRST
+LINE OF THE CLASS OR METHOD DECLARATION.  IF NOT RESULT IS UNCERTAIN."
+  (interactive)
+  (jde-assert-source-buffer)
+  (let ((found (jde-javadoc-nonterminal-at-line)))
+    (if (not found)
+	(error "No tag found at point")
+      (jde-javadoc-checkdoc-save-excursion)
+      (jde-javadoc-checker found))))
+
+;;;###autoload
+(defun jde-javadoc-checkdoc ()
+  "Check doc comments of tags in the current buffer.
+Report the next tag with documentation errors."
+  (interactive)
+  (jde-assert-source-buffer)
+  (semantic-fetch-tags)
+  (jde-javadoc-checkdoc-save-excursion)
+  (jde-javadoc-checker-next-tag (current-buffer)))
+
+(defalias 'jde-javadoc-autodoc 'jde-javadoc-checkdoc)
+
+;;; Compatibility
+;;
+(defalias 'jde-javadoc-generate-javadoc-template
+  'jde-javadoc-autodoc-at-line)
+
+;; Load the javadoc builder
+(require 'jde-javadoc-gen)
+
+;;;###autoload
+(defun jde-javadoc-remove (start end)
+  "Remove all Javadoc from the region (if one is active) or the buffer.
+START, the start position in the buffer.
+END, the end position in the buffer."
+  (interactive (if mark-active
+		   (list (region-beginning) (region-end))
+		 (list (point-min) (point-max))))
+  (save-excursion
+    (save-restriction
+      (narrow-to-region start end)
+      (goto-char (point-min))
+      (while (re-search-forward
+	      "^\\([ \t]*\\/\\*\\(?:.\\|[.\n]\\)*?\\*\\/[ \t]*\n\\)"
+	      nil t)
+	(replace-match ""))
+      (while (re-search-forward "^[ \t]*\\/\\/.*\n" nil t)
+	(replace-match "")))))
+
+;;;###autoload
+(defun jde-javadoc-enable-menu-p ()
+  "Return non-nil if corresponding doc menu item is enabled.
+That is point is on the first line of a class, method, or field
+definition."
+  (let ((p (save-excursion (beginning-of-line) (point)))
+	(tag-at-line (jde-javadoc-nonterminal-at-line))
+	start end)
+    (and tag-at-line
+	 (memq (semantic-tag-class tag-at-line)
+	       '(function type variable))
+	 (save-excursion
+	   (setq start
+		 (progn
+		   (goto-char (semantic-tag-start tag-at-line))
+		   (beginning-of-line)
+		   (point)))
+	   (setq end (or (re-search-forward "[;={]")
+			 (progn
+			   (goto-char p)
+			   (end-of-line)
+			   (point))))
+	   (and (>= p start) (<= p end))))))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-javadoc)
+
+;; End of jde-javadoc.el
diff --git a/site/jdee/lisp/jde-javadoc.elc b/site/jdee/lisp/jde-javadoc.elc
new file mode 100644
index 0000000..96d2a16
Binary files /dev/null and b/site/jdee/lisp/jde-javadoc.elc differ
diff --git a/site/jdee/lisp/jde-jdb.el b/site/jdee/lisp/jde-jdb.el
new file mode 100644
index 0000000..0c3fe95
--- /dev/null
+++ b/site/jdee/lisp/jde-jdb.el
@@ -0,0 +1,1871 @@
+;;; jde-jdb.el -- Debugger mode for jdb.
+;; $Id: jde-jdb.el 175 2009-12-24 02:59:33Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>x
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, US
+;;; Commentary:
+
+;; This package interfaces emacs to jdb, the debugger
+;; distributed as part of JavaSoft's Java
+;; Development Kit (JDK).
+
+;;; Code:
+
+(require 'jde-db)
+
+
+;; Thanks to "David J. Biesack" <sasdjb@unx.sas.com> for this function
+;; and its use in jde-db-marker-filter.
+;; Amended by "Patrick J. McNerthney" <pat@mcnerthney.com> to allow
+;; package names to begin with underscores.
+(defun jde-jdb-make-qualified-class-name-regexp (class)
+  "Constructs a regular expression to extract a qualified class name from a jdb
+breakpoint message."
+  (concat "\\(\\(\\(\\(\\w\\|[_]\\)*\\.\\)*\\)" class "\\)\\(\\b\\|\\$\\)"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; jdb Debugger Commands                                                      ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Launch debuggee command
+
+
+(defclass jde-jdb-cmd-launch (jde-db-cmd-launch) ()
+  "Asks jdb to launch a debuggee process.")
+
+(defmethod jde-db-cmd-launch-buffer-name ((this jde-jdb-cmd-launch))
+  "Return the name of the buffer for this process. Descendant
+classes should override this method to create a name that is appropriate
+for the process being launched, e.g., an applet or application." nil)
+
+(defmethod jde-db-cmd-launch-cmd-path ((this jde-jdb-cmd-launch))
+  "Return the path of the command to be used to launch the process. Descendant
+classes should override this method to return a path appropriate to
+the command to be used to launch the debuggee process, e.g., jdb or
+appletviewer." nil)
+
+
+(defmethod jde-db-cmd-launch-startup-cmds ((this jde-jdb-cmd-launch))
+  "Add commands to debugger's initial command queue. Derived classes
+should override this method to specify commands that should be
+executed immediately after the debugger starts, e.g., an initial
+step command." nil)
+
+
+(defmethod jde-db-cmd-init ((this jde-jdb-cmd-launch))
+  "The debugger invokes this method before executing the launch
+command. Launch the debuggee process."
+  (let ((debugger (oref this debugger)))
+    (if (or
+	 (not (slot-boundp debugger 'buffer))
+	 (not (oref debugger :buffer))
+	 (not (comint-check-proc (oref debugger :buffer))))
+	(let* ((debuggee
+		(oref debugger debuggee))
+	       (source-directory default-directory)
+	       (working-directory
+		(jde-db-debugger-get-working-dir debugger))
+	       (prog-args (jde-db-debugger-get-prog-args debugger))
+	       (cmd-path (jde-db-cmd-launch-cmd-path this))
+	       (command-string
+		(concat
+		 cmd-path " "
+		 (jde-run-make-arg-string prog-args) "\n\n")))
+
+	(oset debugger :buffer-name (jde-db-cmd-launch-buffer-name this))
+	(oset debugger :buffer (get-buffer-create (oref debugger :buffer-name)))
+
+	(jde-db-cmd-launch-startup-cmds this)
+
+	(oset debugger :path cmd-path)
+	(jde-db-jdb-start debugger prog-args command-string)
+
+	(let ((debuggee-status (oref debuggee status)))
+	  (oset debuggee-status running-p t)
+	  (oset debuggee-status stopped-p t)))
+    (progn
+      (message "An instance of %s is running." (oref this :buffer-name))
+      (pop-to-buffer (oref this :buffer-name))))))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-launch))
+  "Returns nil because jdb launches the debuggee application automatically
+when it is started." nil)
+
+
+;; Launch application command
+
+(defclass jde-jdb-cmd-launch-app (jde-jdb-cmd-launch
+				  jde-db-cmd-launch-app) ()
+  "Asks jdb to launch the debuggee application.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-launch-app) &rest fields)
+  (call-next-method)
+  (oset this name "launch application in jdb debug mode"))
+
+(defmethod jde-db-cmd-launch-cmd-path ((this jde-jdb-cmd-launch-app))
+  "Return the path of the jdb command."
+  (let* ((debugger (oref this :debugger)))
+    (oref debugger :path)))
+
+(defmethod jde-db-cmd-launch-buffer-name ((this jde-jdb-cmd-launch-app))
+  (let* ((debugger (oref this :debugger))
+	 (debuggee (oref debugger :debuggee))
+	 (main-class (oref debuggee :main-class)))
+    (concat  "*debug"  main-class "*")))
+
+(defmethod jde-db-cmd-launch-startup-cmds ((this jde-jdb-cmd-launch-app))
+  "If `jde-db-initial-step-p' is nonnil, add a step command to the
+debugger's startup command queue."
+  (if jde-db-initial-step-p
+      (let*  ((debugger (oref this debugger))
+	      (step-cmd (oref (oref debugger cmd-set) step-into)))
+	(oset debugger next-cmd
+		    (append (oref debugger next-cmd) (list step-cmd))))))
+
+
+;; Launch applet command
+
+(defclass jde-jdb-cmd-launch-applet (jde-jdb-cmd-launch
+				     jde-db-cmd-launch-applet) ()
+  "Asks jdb to launch the debuggee applet.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-launch-applet) &rest fields)
+  (call-next-method)
+  (oset this name "launch applet in jdb debug mode"))
+
+(defmethod jde-db-cmd-launch-cmd-path ((this jde-jdb-cmd-launch-applet))
+  "Return the path of the command to be used to launch the process. Descendant
+classes should override this method to return a path appropriate to
+the command to be used to launch the debuggee process, e.g., jdb or
+appletviewer."
+  (let* ((debugger (oref this :debugger))
+	 (jdb-path (oref debugger :path))
+	 (jdb-dir (file-name-directory jdb-path)))
+    (expand-file-name "appletviewer" jdb-dir)))
+
+(defmethod jde-db-cmd-launch-buffer-name ((this jde-jdb-cmd-launch-applet))
+  (let* ((debugger (oref this :debugger))
+	 (debuggee (oref debugger :debuggee))
+	 (doc (oref debuggee :doc)))
+    (concat  "*debug"  (file-name-nondirectory doc) "*")))
+
+(defmethod jde-db-cmd-launch-startup-cmds ((this jde-jdb-cmd-launch-applet))
+  "If `jde-db-initial-step-p' is nonnil, add a run command followed by a
+step command to the debugger's startup command queue."
+  (if jde-db-initial-step-p
+      (let*  ((debugger (oref this debugger))
+	      (cmd-set (oref debugger cmd-set))
+	      (run-cmd (oref cmd-set run))
+	      (step-cmd (oref cmd-set step-into)))
+	(oset debugger next-cmd
+		    (append
+		     (oref debugger next-cmd)
+		     (list run-cmd)
+		     (list step-cmd))))))
+
+
+
+;; Run command
+
+(defclass jde-jdb-cmd-run (jde-db-cmd) ()
+  "Asks jdb to start the debuggee application.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-run) &rest fields)
+  (call-next-method)
+  (oset this name "run"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-run))
+  "Creates command line for jdb run command."
+  "run")
+
+;; Cont command
+
+(defclass jde-jdb-cmd-cont (jde-db-cmd) ()
+  "Asks jdb to continue the debuggee application from its current
+stopping point.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-cont) &rest fields)
+  (call-next-method)
+  (oset this name "cont"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-cont))
+  "Creates command line for jdb cont command."
+  "cont")
+
+;; Quit command
+
+(defclass jde-jdb-cmd-quit (jde-db-cmd) ()
+  "Quit debugging the current application.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-quit) &rest fields)
+  (call-next-method)
+  (oset this name "quit"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-quit))
+  "Creates command line for jdb quit command."
+  "quit")
+
+;; Step-over command
+
+(defclass jde-jdb-cmd-step-over (jde-db-cmd) ()
+  "Step to the next line in the current frame.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-step-over) &rest fields)
+  (call-next-method)
+  (oset this name "next"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-step-over))
+  "Creates command line for jdb step-over command."
+  "next")
+
+;; Step-into command
+
+(defclass jde-jdb-cmd-step-into (jde-db-cmd) ()
+  "Step to the next line in the current program.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-step-into) &rest fields)
+  (call-next-method)
+  (oset this name "step"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-step-into))
+  "Creates command line for jdb step-into command."
+  "step")
+
+;; Step-out command
+
+(defclass jde-jdb-cmd-step-out (jde-db-cmd) ()
+  "Continue to the end of the current method.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-step-out) &rest fields)
+  (call-next-method)
+  (oset this name "step up"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-step-out))
+  "Creates command line for jdb step-out command."
+  "step up")
+
+
+;; Up stack command
+
+(defclass jde-jdb-cmd-up (jde-db-cmd) ()
+  "Move up one stack frame.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-up) &rest fields)
+  (call-next-method)
+  (oset this name "up"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-up))
+  "Creates command line for jdb up command."
+  "up")
+
+(defmethod jde-db-cmd-notify-response ((this jde-jdb-cmd-up) response)
+  "Invoked when the debugger responds to the command. RESPONSE
+is the response. This method invokes the jdb where
+command in order to position the debug pointer at the
+current stack location."
+  ;; (jde-debug-where)
+  (let* ((jdb (oref this debugger))
+	 (cmds (oref jdb cmd-set))
+	 (cmd (oref cmds where)))
+    (jde-db-exec-cmd jdb cmd)))
+
+;; Down stack command
+
+(defclass jde-jdb-cmd-down (jde-db-cmd) ()
+  "Move down one stack frame.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-down) &rest fields)
+  (call-next-method)
+  (oset this name "down"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-down))
+  "Creates command line for jdb down command."
+  "down")
+
+(defmethod jde-db-cmd-notify-response ((this jde-jdb-cmd-down) response)
+  "Invoked when the debugger responds to the command. RESPONSE
+is the response. This method invokes the jdb where
+command in order to position the debug pointer at the
+current stack location."
+  ;;(jde-debug-where)
+  (let* ((jdb (oref this debugger))
+	 (cmds (oref jdb cmd-set))
+	 (cmd (oref cmds where)))
+    (jde-db-exec-cmd jdb cmd)))
+
+
+;; Where stack command
+
+(defclass jde-jdb-cmd-where (jde-db-cmd) ()
+  "Point to current location on the stack.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-where) &rest fields)
+  (call-next-method)
+  (oset this name "where"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-where))
+  "Creates command line for jdb where command."
+  "where")
+
+(defmethod jde-db-cmd-notify-response ((this jde-jdb-cmd-where) output)
+"Processes the output of the jdb where
+ command, which lists the current stack. An example of the output
+ is
+
+      [1] jmath.LinearSystem$InnerClass.print (LinearSystem.java:36)
+      [2] jmath.LinearSystem.<init> (LinearSystem.java:52)
+      [3] jmath.Test.main (Test.java:38)
+
+ This method positions the source line cursor at the position that
+ matches the current location of the debugger in the program's
+ stack (set by the jdb up and down stack commands)."
+  (let* ((jdb (oref this debugger))
+	 (debuggee (oref jdb debuggee)))
+    ;; if the stack depth is not set default to 1
+    (if (string-equal "" (oref debuggee :stack-depth))
+	(oset debuggee :stack-depth "1"))
+    (if (string-match
+	 (concat "^  \\["
+		 (oref debuggee :stack-depth)
+		 "\\] .*(\\([^\$\n]*\\).*:\\([0-9]*[^[:digit:]]?[0-9]+\\))")
+	 output)
+	(let ((marker (match-string 0 output))
+	      (class (match-string 1 output))
+	      (line-no (jde-jdb-string-to-int (match-string 2 output)))
+	      (package ""))
+
+	  (if (equal ".java" (substring class -5))
+	      (setq class (substring class 0 -5)))
+
+	  ;; Extract package path from input.
+	  (let ((case-fold-search nil))	;; Make sure search is case-sensitive
+	    (and (string-match (jde-jdb-make-qualified-class-name-regexp class) marker)
+		 (setq package
+		       (substring marker (match-beginning 2) (match-end 2)))))
+	  (jde-db-set-debug-cursor
+	   (if package (concat package class) class)
+	   (concat class ".java") line-no)))
+    output))
+
+;; Set Breakpoint command
+
+(defclass jde-jdb-cmd-set-breakpoint (jde-db-cmd-breakpoint) ()
+  "Asks jdb to set the breakpoint specified by the
+breakpoint field.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-set-breakpoint) &rest fields)
+  (call-next-method)
+  (oset this name "stop at"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-set-breakpoint))
+  "Creates command line for jdb set breakpoint command."
+  (let* ((bps (oref this breakpoints))
+	 (bp (car bps)))
+    (format "stop at %s:%d"
+	    (oref bp class)
+	    (jde-db-breakpoint-get-line bp))))
+
+(defmethod jde-db-cmd-notify-response ((this jde-jdb-cmd-set-breakpoint) output)
+  "Called when the debugger responds to the last set-breakpoint
+  command. Invokes `jde-db-mark-breakpoint-requested' on the breakpoint and
+updates the breakpoint to `requested' status.  Removes the breakpoint
+from the command's breakpoint list. If the list contains more
+breakpoints, this method reissues the command on the next breakpoint
+on the list."
+  ;; (message "set-bp resp <<%s>>" output)
+  (if (or
+       (string-match "Deferring breakpoint" output)
+       (string-match "Set breakpoint" output)
+       (string-match "Unable to set" output))
+      (let* ((bps (oref this breakpoints))
+	     (bp (car bps)) file line)
+	(if (not (null bp))
+	    (progn
+	      (setq file (oref bp file))
+	      (setq line (jde-db-breakpoint-get-line bp))
+	      (if (string-match "Unable to set breakpoint" output)
+		  (jde-db-delete-breakpoint bp)
+		(if (string-match "Unable to set deferred breakpoint" output)
+		    (if (jde-db-debuggee-running-p)
+			(let* ((debugger (oref 'jde-db-debugger the-debugger))
+			       (bp-cmd
+				(oref (oref debugger cmd-set) clear-bp)))
+			  (oset bp-cmd breakpoints (list bp))
+			  (jde-db-exec-cmd debugger bp-cmd))
+		      (jde-db-delete-breakpoint bp))
+		  (if (string-match "Deferring breakpoint" output)
+		      (progn
+			(oset bp status 'requested)
+			(jde-db-mark-breakpoint-requested file line))
+		    (if (string-match "Set breakpoint" output)
+			(progn
+			  (oset bp status 'active)
+			  (jde-db-mark-breakpoint-active file line))))))
+	      (setq bps (cdr bps))
+	      (oset this breakpoints bps)
+	      (if bps
+		  (let ((jdb (oref this debugger)))
+		    (jde-db-exec-cmd jdb this))))))))
+
+;; Clear Breakpoint command
+
+(defclass jde-jdb-cmd-clear-breakpoint (jde-db-cmd-breakpoint) ()
+  "Asks jdb to clear the breakpoint specified by the
+breakpoint field.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-clear-breakpoint) &rest fields)
+  (call-next-method)
+  (oset this name "clear"))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-clear-breakpoint))
+  "Creates command line for jdb clear breakpoint command."
+  (let* ((bps (oref this breakpoints))
+	 (bp (car bps)))
+    (format "clear %s:%d"
+	    (oref bp class)
+	    (jde-db-breakpoint-get-line bp))))
+
+(defmethod jde-db-cmd-notify-response ((this jde-jdb-cmd-clear-breakpoint) output)
+  "Called when the debugger responds to the last clear-breakpoint command.
+Removes the breakpoint from the command's breakpoint list. If the list contains
+more breakpoints, this method reissues the clear command on the next breakpoint
+on the list."
+  (let* ((bps (oref this breakpoints))
+	 (bp (car bps)))
+    (jde-db-delete-breakpoint bp)
+    (setq bps (cdr bps))
+    (oset this breakpoints bps)
+    (if bps
+	(let ((jdb (oref this debugger)))
+	  (jde-db-exec-cmd jdb this)))))
+
+;; Print command
+(defvar jde-jdb-cmd-print-history  nil)
+
+(defclass jde-jdb-cmd-print (jde-db-cmd)
+  ((expr	:initarg :expr
+		:type string
+		:initform ""
+		:documentation
+		"Expression passed to jdb"))
+  "Asks jdb to print value of expression at point")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-print) &rest fields)
+  (call-next-method)
+  (oset this name "print")
+  (oset this expr ""))
+
+(defmethod jde-db-cmd-init ((this jde-jdb-cmd-print))
+  "The debugger invokes this method before executing the
+command."
+  (oset this expr (read-from-minibuffer "expr: " (thing-at-point 'word)
+					nil nil 'jde-jdb-cmd-print-history)))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-print))
+  "Creates a command line for jdb print command."
+  (format "%s %s"
+	  (oref this name)
+	  (oref this expr)))
+
+;; Dump command
+(defclass jde-jdb-cmd-dump (jde-jdb-cmd-print) ()
+  "Asks jdb to print all object information of the expression at point")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-dump) &rest fields)
+  (call-next-method)
+  (oset this name "dump"))
+
+;; Eval command
+(defclass jde-jdb-cmd-eval (jde-jdb-cmd-print) ()
+  "Ask jdb to evaluate the expression(Same as the print command)")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-eval) &rest fields)
+  (call-next-method)
+  (oset this name "eval"))
+
+;; Set command
+(defclass jde-jdb-cmd-set-var (jde-jdb-cmd-print)
+  ((value :initarg :value
+	  :type string
+	  :initform "null"
+	  :document
+	  "Value to assign to the variable"))
+  "Ask jdb to assign new value to a field/variable/array element")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-set-var) &rest fields)
+  (call-next-method)
+  (oset this name "set"))
+
+(defmethod jde-db-cmd-init ((this jde-jdb-cmd-set-var))
+  "The debugger invokes this method before executing the
+command."
+  (oset this expr (read-from-minibuffer "variable: " (thing-at-point 'word)
+					nil nil 'jde-jdb-cmd-print-history))
+  (oset this value (read-from-minibuffer "value: " nil
+					nil nil '(null))))
+
+(defmethod jde-db-cmd-make-command-line ((this jde-jdb-cmd-set-var))
+  "Creates a command line for jdb print command."
+  (format "%s %s = %s"
+	  (oref this name)
+	  (oref this expr)
+	  (oref this value)))
+
+;; Locals commands
+(defclass jde-jdb-cmd-locals (jde-jdb-cmd-print) ()
+  "Ask jdb to print al local variables in current stack frame")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-locals) &rest fields)
+  (call-next-method)
+  (oset this name "locals"))
+
+(defmethod jde-db-cmd-init ((this jde-jdb-cmd-locals))
+  "The debugger invokes this method before executing the
+command."
+  (oset this expr ""))
+
+;; jdb Command Set
+
+(defclass jde-jdb-cmd-set (jde-db-cmd-set)
+  ((print :initarg :print
+	  :type jde-jdb-cmd-print
+	  :documentation
+	  "Asks jdb to print the value of expression at point")
+   (dump :initarg :dump
+	 :type jde-jdb-cmd-dump
+	 :documentation
+	 "Ask jdb to print all object information from the
+expression at poing")
+   (eval :initarg :eval
+	 :type jde-jdb-cmd-eval
+	 :documentation
+	 "Ask jdb to evaluate the expression at point")
+   (set-var :initarg :set-var
+	    :type jde-jdb-cmd-set-var
+	    :documentation
+	    "Ask jdb to assign a new value to the expression at point")
+   (locals :initarg :locals
+	 :type jde-jdb-cmd-locals
+	 :documentation
+	 "Ask jdb to print all local variables in current stack frame")
+   )
+  "Set of debugger commands implemented by jdb.")
+
+(defmethod initialize-instance ((this jde-jdb-cmd-set) &rest fields)
+  "Construct jdb command set."
+  (call-next-method)
+  (let ((jdb (oref this debugger)))
+    (oset this launch-app
+	  (jde-jdb-cmd-launch-app "launch" :debugger jdb))
+    (oset this launch-applet
+	  (jde-jdb-cmd-launch-applet "launch" :debugger jdb))
+    (oset this run
+	  (jde-jdb-cmd-run "run" :debugger jdb))
+    (oset this cont
+	  (jde-jdb-cmd-cont "cont" :debugger jdb))
+    (oset this quit
+	  (jde-jdb-cmd-quit "jdb quit" :debugger jdb))
+    (oset this step-over
+	  (jde-jdb-cmd-step-over "jdb step-over cmd" :debugger jdb))
+    (oset this step-into
+	  (jde-jdb-cmd-step-into "jdb step-into cmd" :debugger jdb))
+    (oset this step-out
+	  (jde-jdb-cmd-step-out "jdb step-out cmd" :debugger jdb))
+    (oset this up
+	  (jde-jdb-cmd-up "jdb up cmd" :debugger jdb))
+    (oset this down
+	  (jde-jdb-cmd-down "jdb down cmd" :debugger jdb))
+    (oset this where
+	  (jde-jdb-cmd-where "jdb where cmd" :debugger jdb))
+    (oset this set-bp
+	  (jde-jdb-cmd-set-breakpoint "jdb set breakpoint" :debugger jdb))
+    (oset this clear-bp
+	  (jde-jdb-cmd-clear-breakpoint "jdb clear breakpoint" :debugger jdb))
+    (oset this print
+	  (jde-jdb-cmd-print "jdb print cmd" :debugger jdb))
+    (oset this dump
+	  (jde-jdb-cmd-dump "jdb dump cmd" :debugger jdb))
+    (oset this eval
+	  (jde-jdb-cmd-eval "jdb eval cmd" :debugger jdb))
+    (oset this set-var
+	  (jde-jdb-cmd-set-var "jdb set cmd" :debugger jdb))
+    (oset this locals
+	  (jde-jdb-cmd-locals "jdb locals cmd" :debugger jdb))
+    ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; jdb Breakpoint Listener                                                    ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-jdb-breakpoint-listener (jde-db-listener)
+  ((marker-regexp   :initarg :marker-regexp
+		    :type string
+		    :documentation
+		    "Regular expression for parsing breakpoint messages.")
+   (class-index     :initarg :class-index
+		    :type integer
+		    :initform 3
+		    :documentation
+		    "Index of class name parsed by marker-regex")
+   (line-index      :initarg :line-index
+		    :type integer
+		    :initform 5
+		    :documentation
+		    "Index of line number parsed by marker-regex")
+   (noline-regexp   :initarg :noline-regexp
+		    :type string
+		    :documentation
+		    "Regular expression for parsing breakpoint messages without line numbers.")
+   ;; There's no guarantee that Emacs will hand the filter the entire
+   ;; marker at once; it could be broken up across several strings.  We
+   ;; might even receive a big chunk with several markers in it.  If we
+   ;; receive a chunk of text which looks like it might contain the
+   ;; beginning of a marker, we save it here between calls to the
+   ;; filter.
+   (marker-acc      :initarg :marker-acc
+		    :type string
+		    :initform ""
+		    :documentation
+		    "Debug output accumulator")
+
+   )
+  "Handles jdb breakpoint events.")
+
+
+(defmethod initialize-instance ((this jde-jdb-breakpoint-listener) &rest fields)
+  "Construct breakpoint listener."
+
+  (call-next-method)
+
+  ;; Regular expression used to find a jdb breakpoint position marker.
+  ;; The regular expression must have two subexpressions. The first matches
+  ;; the name of the class in which the breakpoint occurs; the second, the
+  ;; line number at which the breakpoint occurs. The default expression
+  ;; matches breakpoint messages emitted by jdb. You may need to change
+  ;; the expression to accommodate other debuggers."
+  (oset
+   this
+   :marker-regexp
+   "^.*: thread=.*, \\(\\(.*[.]\\)*\\)\\([^\$]*\\)\\(\$.*\\)*[.].+(), line=\\([0-9,.]*\\),")
+  ;; Regular expression to match a breakpoint message that lacks a line
+  ;; number because the breakpoint occurs in a class compiled without deug
+  ;; information.
+  (oset
+   this
+   :noline-regexp
+   "^Breakpoint hit: .*(pc \\([0-9]*\\))"))
+
+
+
+(defmethod jde-jdb-fixup-output ((this jde-jdb-breakpoint-listener))
+    ;; This is a hack to accommodate reorder of message chunks
+    ;; on Solaris at debugger startup.
+    (if (string-match "running ...\n" (oref this :marker-acc))
+	(oset this :marker-acc
+	      (concat "running ...\n"
+		      (substring (oref this :marker-acc) 0 (match-beginning 0))
+		      (substring (oref this :marker-acc) (match-end 0)))))
+
+
+    ;; This is a hack to fix reordering of message chunks on Windows 2000
+    ;; The problem is the debugger prompt - the thread name with the stack
+    ;; depth (eg main[1]) - sometimes shows up in the middle of the output
+    ;; from the command sent to the debugger.
+    ;; This seems to show up most often with step commands.
+    ;;(message "checking string %s" (oref jdb :marker-acc))
+    (if (string-match "^.*: \\([-a-zA-Z0-9_$]+\\[[0-9]+\\] \\)thread="
+		      (oref this :marker-acc))
+	(oset this :marker-acc
+	      (concat (match-string 1 (oref this :marker-acc))
+		      (substring (oref this :marker-acc) 0 (match-beginning 1))
+		      (substring (oref this :marker-acc) (match-end 1)))))
+    ;; (message "fixed string is %s" jde-db-marker-acc)
+    )
+
+
+(defmethod jde-jdb-set-breakpoint-listener ((this jde-jdb-breakpoint-listener) output)
+  "Listens for set breakpoint messages."
+  (let ((msgs (split-string output "\n")))
+    (loop for msg in msgs do
+	  (if (and (string-match
+		    "^.*Set .*breakpoint \\(.*\\):\\([0-9]+\\)"
+		    msg)
+		   (not (string-match "Unable to set.*" msg)))
+	      (let* ((class (substring
+			     msg
+			     (match-beginning 1)
+			     (match-end 1)))
+		     (line (string-to-int
+			    (substring
+			     msg
+			     (match-beginning 2)
+			     (match-end 2))))
+		     (source-buffer (jde-db-find-class-source class))
+		     (path (buffer-file-name source-buffer))
+		     (bp (jde-db-find-breakpoint path line)))
+		(oset bp status 'active)
+		(jde-db-mark-breakpoint-active path  line))))))
+
+(defmethod jde-db-listener-filter-output ((this jde-jdb-breakpoint-listener) input)
+  "Filters the output of the debugger."
+  (let ((jdb (oref this debugger))
+	(output ""))
+
+    ;; Accumulate next chunk of debugger output.
+    (oset this
+	  :marker-acc (concat
+		       (oref this :marker-acc)
+		       input))
+
+    ;; (message (format "<acc-start>%s<acc-end>" (oref this :marker-acc)))
+
+    (jde-jdb-fixup-output this)
+
+    (let* ((marker-regexp (oref this :marker-regexp))
+	   (marker-regexp-class-index (oref this :class-index))
+	   (marker-regexp-line-index (oref this :line-index)))
+
+      ;; (message (concat "jdb output:" input))
+      ;; (message (concat "acc = " jde-db-marker-acc))
+
+      ;; Process all the complete markers in this chunk.
+      (if (string-match marker-regexp (oref this :marker-acc))
+	  ;; Extract the frame position from the marker.
+	  (let ((premarker (substring
+			    (oref this :marker-acc) 0 (match-beginning 0)))
+		(marker (substring (oref this :marker-acc)
+				   (match-beginning 0) (match-end 0)))
+		(rest (substring (oref this :marker-acc) (match-end 0)))
+		(class (substring
+			(oref this :marker-acc)
+			(match-beginning marker-regexp-class-index)
+			(match-end marker-regexp-class-index)))
+		(line-no (jde-jdb-string-to-int
+			  (substring
+			   (oref this :marker-acc)
+			   (match-beginning marker-regexp-line-index)
+			   (match-end marker-regexp-line-index))))
+		(package ""))
+	    ;; Extract package path from input.
+	    (let ((case-fold-search nil)) ;; Make sure search is case-sensitive
+	      (and (string-match (jde-jdb-make-qualified-class-name-regexp class) marker)
+		   (setq package
+			 (substring marker (match-beginning 2) (match-end 2))))
+
+	       ;; (message "jde-db package: %s. marker = %s" jde-db-last-package marker)
+	       ;;(message "case-fold-search = %s" (if case-fold-search "true" "false"))
+	      )
+
+	    ;; Insert debugger output into debugger buffer.
+	    (setq output (concat premarker marker))
+
+	    ;; Set the accumulator to the remaining text.
+	    (oset this :marker-acc rest)
+
+	    (jde-db-set-debug-cursor
+	     (concat package class) (concat class ".java") line-no)
+
+	    (let* ((debuggee (oref jdb debuggee))
+		   (status (oref debuggee status)))
+	      (oset status stopped-p t)))))
+
+   ;; Handle case where there is no line number info in current class.
+    (if (string-match (oref this noline-regexp) (oref this marker-acc))
+	(let ((premarker (substring
+			  (oref this :marker-acc) 0 (match-beginning 0)))
+	      (marker (substring (oref this :marker-acc)
+				 (match-beginning 0) (match-end 0)))
+	      (pc (substring (oref this :marker-acc)
+			     (match-beginning 1) (match-end 1)))
+	      (rest (substring (oref this :marker-acc) (match-end 0))))
+
+	  (setq output (concat premarker marker))
+	  (oset this :marker-acc rest)))
+
+    ;; Does the remaining text look like it might end with the
+    ;; beginning of another marker?  If it does, then keep it in
+    ;; marker-acc until we receive the rest of it.  Since we
+    ;; know the full marker regexp above failed, it's pretty simple to
+    ;; test for marker starts.
+    (if (string-match "\\(^Breakpoint hit:\\)\\|\\(^Step completed:\\)"
+		      (oref this :marker-acc))
+	(progn
+	;; Everything before the potential marker start can be output.
+	  (setq output (concat output
+			       (substring (oref this :marker-acc)
+					  0 (match-beginning 0))))
+
+	  ;; Everything after, we save, to combine with later input.
+	  (oset this
+		:marker-acc
+		(substring (oref this :marker-acc) (match-beginning 0))))
+      (setq output
+	    (concat output (oref this :marker-acc)))
+      (oset this :marker-acc ""))
+
+    (jde-jdb-set-breakpoint-listener this output)
+    output))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; jdb Stack Listener                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-jdb-stack-listener (jde-db-listener)
+  ((stack-depth     :initarg :stack-depth
+		    :type string
+		    :initform ""
+		    :documentation
+		    "Stack depth."))
+  "Listens for changes in the current stack frame.")
+
+
+;; Thanks to Michael Ernst <mernst@cs.washington.edu> for the following
+;; stack-related code.
+;;
+;; Extract the index of the current stack frame from the jdb prompt, where
+;; the prompt is of the form
+;;
+;;   thread[stack_index]
+;;
+;; e.g.,
+;;
+;;   main[1]
+;;
+;; The user can move the debugger up and down the stack via the up and
+;; down commands. The debugger indicates the current location by the
+;; stack index portion of its prompt.
+(defmethod jde-db-listener-filter-output ((this jde-jdb-stack-listener) output)
+  (let* ((jdb (oref this debugger))
+	 (debuggee (oref jdb debuggee)))
+    (if (string-match "^[-a-zA-Z0-9_$ -]+\\[\\([0-9]*,?[0-9]+\\)\\] " output)
+	(oset debuggee :stack-depth (match-string 1 output)))
+    output))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; jdb Application Debuggee                                                   ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-jdb-debuggee-app (jde-db-debuggee-app) ()
+  "Application process being debugged with jdb.")
+
+(defmethod initialize-instance ((this jde-jdb-debuggee-app) &rest fields)
+  "Constructs an instance of a jdb debuggee."
+  (call-next-method)
+  (oset  this  status  (jde-db-debuggee-status "jdb status")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; jdb Applet Debuggee                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-jdb-debuggee-applet (jde-db-debuggee-applet) ()
+  "Application process being debugged with jdb.")
+
+(defmethod initialize-instance ((this jde-jdb-debuggee-applet) &rest fields)
+  "Constructs an instance of a jdb debuggee."
+  (call-next-method)
+  (oset  this  status  (jde-db-debuggee-status "jdb status")))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Class of JDE Debuggers based on jdb.                                       ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-jdb (jde-db-debugger)
+  ((exec-name       :initarg :exec-name
+		    :type string
+		    :initform "jdb"
+		    :documentation
+		    "Name of the jdb executable.")
+   (path            :initarg :path
+		    :type string
+		    :initform "jdb"
+		    :documentation
+		    "Path of the jdb executable.")
+   (bp-listener     :initarg :bp-listener
+		    :type jde-jdb-breakpoint-listener
+		    :documentation "Breakpoint listener."))
+  (:allow-nil-initform t)
+"Class of generic jdb debuggers")
+
+(defmethod initialize-instance ((this jde-db-jdb) &rest fields)
+  "Constructor for generic jdb debugger."
+  (call-next-method)
+  (oset this :name "jdb")
+
+  ;; Install jdb versions of debugger commands.
+  (oset this cmd-set (jde-jdb-cmd-set "jdb commands" :debugger this))
+
+  (oset this bp-listener
+   (jde-jdb-breakpoint-listener
+    "jdb breakpoint listener"
+    :debugger this))
+
+  (jde-db-add-listener this (oref this bp-listener))
+
+  (jde-db-add-listener
+   this
+   (jde-jdb-stack-listener
+    "jdb stack listener"
+    :debugger this)))
+
+(defmethod jde-db-create-debuggee-app ((this jde-db-jdb) main-class)
+  (oset
+   this
+   :debuggee (jde-jdb-debuggee-app
+	      (concat "Application: " main-class)
+	      :main-class main-class)))
+
+(defmethod jde-db-create-debuggee-applet ((this jde-db-jdb) applet-doc)
+  (oset
+   this
+   :debuggee (jde-jdb-debuggee-applet
+	      (concat "Applet: " applet-doc)
+	      :doc applet-doc)))
+
+(defmethod jde-db-jdb-start ((this jde-db-jdb) prog-args cmdstr)
+  "Start the debugger."
+  (let ((w32-quote-process-args ?\")
+	(win32-quote-process-args ?\") ;; XEmacs
+	(source-directory default-directory)
+	(working-directory
+	 (jde-db-debugger-get-working-dir this)))
+
+    (oset this :buffer (get-buffer-create (oref this :buffer-name)))
+
+    (save-excursion
+      (set-buffer (oref this :buffer))
+      ;; Do not erase the last transcript; user may wish to view it.
+      ;; (erase-buffer)
+      (goto-char (point-max))
+      (cd working-directory)
+      (insert (concat "cd " working-directory "\n"))
+      (insert cmdstr)
+      (comint-mode)
+      (make-local-variable 'comint-prompt-regexp)
+      (setq comint-prompt-regexp "\\(^> *\\)\\|\\(^.*\\[[0-9]+\\] *\\)")
+      (make-local-variable 'paragraph-start)
+      (setq paragraph-start comint-prompt-regexp)
+
+      (let ((process-connection-type nil))
+       (comint-exec (oref this :buffer)
+		   (oref this :buffer-name)
+		   (oref this :path)
+		   nil
+		   prog-args))
+
+      (oset this process
+	    (get-buffer-process (oref this buffer)))
+
+      (cd source-directory)
+
+      (jde-db-set-process-filter this)
+      (jde-db-set-process-sentinel this)
+      (run-hooks 'jde-jdb-mode-hook)
+      (pop-to-buffer (oref this buffer))
+
+      (oset-default 'jde-db-debugger the-debugger this)
+      (oset this running-p t))))
+
+
+(defmethod jde-jdb-connect ((this jde-db-jdb))
+  "Connect the debugger to an existing process."
+  (if (or
+       (not (slot-boundp this 'buffer))
+       (not (oref this :buffer))
+       (not (comint-check-proc (oref this :buffer))))
+      (let* ((debuggee (oref this debuggee))
+	     (source-directory default-directory)
+	     (connector (oref debuggee connector))
+	     (working-directory
+	      (jde-db-debugger-get-working-dir this))
+	     (prog-args
+	      (if (typep connector 'jde-db-listen-connector)
+		  (if (typep connector 'jde-db-socket-connector)
+		      (list
+		       "-connect"
+		       (format
+			"com.sun.jdi.SocketListen:port=%s"
+			(oref connector port)))
+		    (if (typep connector 'jde-db-shared-memory-connector)
+			(list
+			 "-connect"
+			 (format
+			  "com.sun.jdi.SharedMemoryListen:name=%s"
+			  (oref connector name)))
+		      (error "Invalid connector type.")))
+		(if (typep connector 'jde-db-attach-connector)
+		    (if (typep connector 'jde-db-socket-connector)
+			(let ((host (oref connector host))
+			      (port (oref connector port)))
+			  (if host
+			      (list
+			       "-connect"
+			       (format
+				"com.sun.jdi.SocketAttach:hostname=%s,port=%s"
+				host port))
+			  (list
+			   "-connect"
+			   (format
+			    "com.sun.jdi.SocketAttach:port=%s"
+			    port))))
+		    (if (typep connector 'jde-db-shared-memory-connector)
+			(list
+			 "-connect"
+			 (format
+			  "com.sun.jdi.SharedMemoryAttach:name=%s"
+			  (oref connector name)))
+		      (error "Invalid connector type."))))))
+	     (command-string
+	      (format "%s %s\n\n"
+	       (oref this :path)
+	       (mapconcat (lambda (x) x) prog-args " "))))
+
+	(oset
+	 this
+	 :buffer-name
+	 (if (typep connector 'jde-db-shared-memory-connector)
+	     (format "*debug %s* debugee-shmem-name" (oref connector name))
+	   (format
+	    "*debug %s:%s*"
+	    (if (or (typep connector 'jde-db-listen-connector)
+		    (not (oref connector port)))
+		"localhost" (oref connector host))
+	    (oref connector port))))
+
+	(oset this :buffer (get-buffer-create (oref this :buffer-name)))
+
+	;; Forward to the debugger any breakpoint requests made
+	;; by the user before launching the application.
+	(if jde-db-breakpoints
+	    (let ((bp-cmd (oref (oref this cmd-set) set-bp)))
+	      (oset
+	       bp-cmd
+	       breakpoints
+	       (mapcar (lambda (assoc-x) (cdr assoc-x)) jde-db-breakpoints))
+
+	      (oset this next-cmd
+		    (append (oref this next-cmd) (list bp-cmd)))))
+
+	(jde-db-jdb-start this prog-args command-string)
+
+	(let* ((debuggee (oref this debuggee))
+	       (debuggee-status (oref debuggee status)))
+	  (oset debuggee-status running-p t)
+	  (oset debuggee-status stopped-p t)))
+    (progn
+      (message "An instance of %s is running." (oref this :buffer-name))
+      (pop-to-buffer (oref this :buffer-name)))))
+
+
+(defmethod jde-db-notify-process-exit ((this jde-db-jdb) msg)
+  "The default debugger process sentinel invokes this method
+when the jdb process terminates."
+  (call-next-method)
+  (let* ((debuggee (oref this debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (oset this running-p nil)
+    (oset debuggee-status running-p nil)
+    (oset debuggee-status stopped-p nil)
+    (jde-db-set-all-breakpoints-specified)))
+
+(defmethod jde-db-launch-arg ((this jde-db-jdb))
+  "Generate the -launch option for jdb."
+  (list "-launch"))
+
+
+(defmethod jde-db-debugger-get-prog-args ((this jde-db-jdb))
+  (cond
+   ((typep (oref this debuggee) 'jde-db-debuggee-app)
+    (append
+     (jde-db-get-vm-args this)
+     (jde-db-get-vm-args-from-user)
+     (list (oref (oref this debuggee) main-class))
+     jde-db-option-application-args
+     (jde-db-get-app-args-from-user)))
+   ((typep (oref this debuggee) 'jde-db-debuggee-applet)
+    (list "-debug"
+	  (oref (oref this debuggee) doc)))
+   (t
+    (error "Unrecognized jdb debuggee type."))))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.1.x Support                                                          ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-db-jdb-1-1 (jde-db-jdb)
+  ()
+  (:allow-nil-initform t)
+"Class of jdb shipped with JDK 1.1.x.")
+
+
+(defmethod initialize-instance ((this jde-db-jdb-1-1) &rest fields)
+  "Constructor for jdb-1.1."
+  (call-next-method)
+  (oset (oref this bp-listener)
+   :marker-regexp
+   "^Breakpoint hit: .*(\\([^\$]*\\).*:\\([0-9]*\\))")
+  (oset (oref this bp-listener) :class-index 1)
+  (oset (oref this bp-listener) :line-index 2))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.3.1 Support                                                          ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-old-jdb (jde-db-jdb-1-1)
+  ()
+  (:allow-nil-initform t)
+"Class of pre-JPDA jdb shipped with post-JPDA versions of the
+JDK.")
+
+(defmethod initialize-instance ((this jde-db-old-jdb) &rest fields)
+  "Constructor for old jdb."
+
+  (call-next-method)
+  (oset this :exec-name "oldjdb"))
+
+
+(defclass jde-db-jdb-1-3 (jde-db-jdb)
+  ()
+  (:allow-nil-initform t)
+  "Class of JPDA-based jdb shipped with JDK 1.3.")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; JDK 1.4.0 Support                                                          ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defclass jde-db-jdb-1-4 (jde-db-jdb)
+  ()
+  (:allow-nil-initform t)
+  "Class of JPDA-based jdb shipped with J2SDK 1.4")
+
+(defmethod initialize-instance ((this jde-db-jdb-1-4) &rest fields)
+  "Constructor for jdb-1.4."
+  (call-next-method)
+  ;; Regular expression used to find a jdb breakpoint position marker.
+  ;; The regular expression has two subexpressions. The first matches
+  ;; the name of the class in which the breakpoint occurs; the second, the
+  ;; line number at which the breakpoint occurs."
+  (oset (oref this bp-listener)
+   :marker-regexp
+   "^.*: \"thread=.*\", \\(\\(.*[.]\\)*\\)\\([^$]*\\)\\($.*\\)*[.].+(), line=\\([0-9,.]*\\)"))
+
+(defun jde-jdb-get-jdb ()
+  "Gets the version of jdb specified for the
+current project."
+  (let (jdb)
+    (cond
+     ((string= (car jde-debugger) "jdb")
+      (cond
+       ((and (< (jde-java-major-version) 2)
+	     (< (jde-java-minor-version) 2))
+	(setq jdb (jde-db-jdb-1-1 "jdb 1.1")))
+       ((and (< (jde-java-major-version) 2)
+	     (= (jde-java-minor-version) 3))
+	(setq jdb (jde-db-jdb-1-3 "jdb 1.3")))
+       (t
+	(setq jdb (jde-db-jdb-1-4 "jdb 1.4")))))
+     ((string= (car jde-debugger) "old jdb")
+      (if (and (< (jde-java-major-version) 2)
+	       (< (jde-java-minor-version) 2))
+	  (setq jdb (jde-db-jdb-1-1 "jdb 1.1"))
+	(setq jdb (jde-db-old-jdb "old jdb"))))
+     (t
+      (error "%s is not a valid jdb debugger choice."
+	     (car jde-debugger))))
+    (oset
+     jdb
+     :path (jde-get-jdk-prog (oref jdb :exec-name)))
+    jdb))
+
+(defun jde-jdb-get-socket-address ()
+  (if jde-db-option-connect-socket
+      jde-db-option-connect-socket
+    (let ((host
+	   (read-from-minibuffer  "Debuggee host: " "local"))
+	  (port
+	   (read-from-minibuffer "Debuggee port: " "4444")))
+      (list
+       (if (not (string= host "local"))
+	   host)
+       port))))
+
+
+
+(defun jde-jdb-attach-via-socket ()
+  "Launch jdb in attach mode. In this mode, jdb connects itself to an
+existing debuggee process via a socket. The debuggee process itself must have been
+launched in debugger server mode. The JDK vm accepts command line
+arguments that starts the vm in the appropriate mode, e.g.,
+
+java -Xdebug -Xrunjdwp:transport=dt_socket,address=4444,server=y,suspend=n MyClass
+
+starts MyClass in debugger server mode at the socket address
+4444. See jdb in the tools section of the JDK documentation for
+more information on these arguments.
+
+Selecting the Server mode option of the `jde-run-option-debug' customization
+variable causes the JDEE to specify the appropriate command-line
+arguments when launching the debuggee process.
+
+The attach command connects the debugger to the debuggee at the
+address specified by `jde-db-option-connect-socket'. If this variable
+is nil, this command prompts you to enter the address."
+  (interactive)
+  (let* ((socket (jde-jdb-get-socket-address))
+	 (host (nth 0 socket))
+	 (port (nth 1 socket)))
+    (if (string= port "")
+	(error "You must specify the port of the debuggee process.")
+      (let* ((debugger (jde-jdb-get-jdb))
+	     (connector
+	      (jde-db-socket-attach-connector
+	       "connector"
+	       :host host
+	       :port port))
+	     (debuggee
+	      (jde-jdb-debuggee-app
+	      "debuggee"
+	      :main-class (format
+			   "Attached to socket %s:%s"
+			   (if host host "localhost")
+			   port)
+	      :connector connector)))
+	(oset debugger the-debugger debugger)
+	(oset debugger :debuggee debuggee)
+	(jde-jdb-connect debugger)))))
+
+
+(defun jde-jdb-get-shared-memory-name ()
+  (if jde-db-option-connect-shared-memory-name
+      jde-db-option-connect-shared-memory-name
+    (read-from-minibuffer  "Shared memory name: " "javadebug")))
+
+
+(defun jde-jdb-attach-via-shared-memory ()
+  "Launch jdb in attach mode. In this mode, jdb connects itself to an
+existing debuggee process. This command specifies use of shared memory
+as the connection transport. The debuggee process itself must have
+been launched in debugger server mode. The JDK vm accepts command line
+arguments that starts the vm in the appropriate mode, e.g.,
+
+java -Xdebug -Xrunjdwp:transport=dt_shmem,address=javadebug,server=y,suspend=n MyClass
+
+starts MyClass in debugger server mode, specifying \"javadebug\" as
+the name of the shared memory transport. See jdb in the tools section
+of the JDK documentation for more information on these arguments.
+
+Selecting the Server mode option of the `jde-run-option-debug' customization
+variable causes the JDEE to specify the appropriate command-line
+arguments when launching the debuggee process.
+
+The attach command connects the debugger to the debuggee at the
+address specified by `jde-db-option-connect-shared-memory', or, if
+this variable is nil, this command prompts you to enter a name."
+  (interactive)
+  (assert
+   (eq system-type 'windows-nt)
+   "The debugger does not support shared memory connections on this platform.")
+  (let ((shmem-name (jde-jdb-get-shared-memory-name)))
+    (if (string= shmem-name "")
+	(error "Shared memory name required.")
+      (let* ((debugger (jde-jdb-get-jdb))
+	     (connector
+	      (jde-db-shared-memory-attach-connector
+	       "connector"
+	       :name shmem-name))
+	     (debuggee
+	      (jde-jdb-debuggee-app
+	       "debuggee"
+	       :main-class (format
+			    "Attached via shared memory: %s."
+			    shmem-name)
+	       :connector connector)))
+	(oset debugger the-debugger debugger)
+	(oset debugger :debuggee debuggee)
+	(jde-jdb-connect debugger)))))
+
+
+(defun jde-jdb-get-socket-listen-port ()
+  (if jde-db-option-connect-socket
+      (nth 1 jde-db-option-connect-socket)
+    (read-from-minibuffer "Listen port: " "4444")))
+
+(defun jde-jdb-listen-via-socket ()
+  "Launch jdb in listen mode. In this mode, jdb launches itself and
+connects itself to a subsequently launched debuggee process. This
+command uses a socket as the method for connecting to the debuggee
+process. The debuggee process itself must be launched in debugger
+client mode The JDK vm accepts command line arguments that starts the
+vm in the appropriate mode, e.g.,
+
+java -Xdebug -Xrunjdwp:transport=dt_socket,address=4444,server=n,suspend=n MyClass
+
+starts MyClass in debugger client mode at the socket port 4444. See jdb in
+the tools section of the JDK documentation for
+more information.
+
+Selecting the Client mode option of the `jde-run-option-debug' customization
+variable causes the JDEE to specify the appropriate command-line
+arguments when launching the debuggee process.
+
+The listen command listens for the debugger at the
+address specified by `jde-db-option-connect-socket'. If this variable
+is nil, this command prompts you to enter the address. You can enter
+either the address that you plan to start the debuggee process at
+(e.g., jdbconn) or a null string.  If you enter a null string, this
+command startes the debugger in a mode that accepts connections from
+any debuggee process started in debugger client mode, regardless of
+address."
+  (interactive)
+  (let* ((debugger (jde-jdb-get-jdb))
+	 (port (jde-jdb-get-socket-listen-port))
+	 (connector
+	   (jde-db-socket-listen-connector
+	       "connector"
+	       :port port))
+	 (debuggee
+	  (jde-jdb-debuggee-app
+	   "debuggee"
+	  :main-class (concat "Listening at port " port)
+	  :connector connector)))
+    (oset debugger the-debugger debugger)
+    (oset debugger :debuggee debuggee)
+    (jde-jdb-connect debugger)))
+
+(defun jde-jdb-listen-via-shared-memory ()
+  "Launch jdb in listen mode. In this mode, a subsequently
+launched debuggee process connects itself to jdb. This command uses
+Windows shared memory primitives as the method of communications
+between jdb andthe debuggee process. The debuggee process itself must
+be launched in debugger client mode. The JDK vm accepts command line
+arguments that starts the vm in the appropriate mode, e.g.,
+
+java -Xdebug
+-Xrunjdwp:transport=dt_shmem,address=javadebug,server=n,suspend=n
+MyClass
+
+starts MyClass in debugger client mode at the shared memory address
+javadebug. See jdb in the tools section of the JDK documentation for
+more information.
+
+Selecting the Client mode option of the `jde-run-option-debug' customization
+variable causes the JDEE to specify the appropriate command-line
+arguments when launching the debuggee process.
+
+The listen command listens for the debugger at the
+address specified by `jde-db-option-connect-shared-memory'. If this variable
+is nil, this command prompts you to enter the address that you plan to start
+the debuggee process at (e.g., jdbconn)."
+  (interactive)
+  (assert
+   (eq system-type 'windows-nt)
+   "The debugger does not support shared memory connections on this platform.")
+  (let* ((debugger (jde-jdb-get-jdb))
+	 (name (jde-jdb-get-shared-memory-name))
+	 (connector
+	   (jde-db-shared-memory-listen-connector
+	       "connector"
+	       :name name))
+	 (debuggee
+	  (jde-jdb-debuggee-app
+	   "debuggee"
+	  :main-class (concat "Listening to " name)
+	  :connector connector)))
+    (oset debugger the-debugger debugger)
+    (oset debugger :debuggee debuggee)
+    (jde-jdb-connect debugger)))
+
+(defun jde-jdb-display (key)
+  "Print expression at point."
+  (interactive "sExpression: ")
+  (jde-assert-source-or-debug-buffer)
+  (let* ((debugger (oref 'jde-db-debugger the-debugger))
+	 (debuggee (oref debugger debuggee))
+	 (debuggee-status (oref debuggee status)))
+    (if (and (oref debugger running-p)
+	     (oref debuggee-status stopped-p))
+	(let* ((cmd-set (oref debugger cmd-set))
+	       cmd)
+	  (if (string= "print" key)
+	      (setq cmd (oref cmd-set print))
+	    (if (string= "dump" key)
+		(setq cmd (oref cmd-set dump))
+	      (if (string= "eval" key)
+		  (setq cmd (oref cmd-set eval))
+		(if (string= "set" key)
+		    (setq cmd (oref cmd-set set-var))
+		  (if (string= "locals" key)
+		      (setq cmd (oref cmd-set locals)))))))
+	  (jde-db-exec-cmd debugger cmd))
+      (let ((class (oref debuggee main-class)))
+	(error "Application %s is not stopped" class)))))
+
+(defun jde-jdb-print ()
+  (interactive)
+  (jde-jdb-display "print"))
+
+(defun jde-jdb-dump ()
+  (interactive)
+  (jde-jdb-display "dump"))
+
+(defun jde-jdb-eval ()
+  (interactive)
+  (jde-jdb-display "eval"))
+
+(defun jde-jdb-locals ()
+  (interactive)
+  (jde-jdb-display "locals"))
+
+(defun jde-jdb-set ()
+  (interactive)
+  (jde-jdb-display "set"))
+
+(defun jde-jdb-help ()
+  (interactive)
+  (let* ((jde-dir (jde-find-jde-doc-directory))
+	 (jdb-ug-path
+	  (if jde-dir
+	      (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir))))
+    (if (and
+	 jdb-ug-path
+	 (file-exists-p jdb-ug-path))
+	(browse-url (concat "file://" (jde-convert-cygwin-path jdb-ug-path)))
+      (signal 'error '("Cannot find jdb user guide.")))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Debug Commands                                                             ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defvar jde-jdb-emacs-menu-spec
+  (list "Jdb"
+
+	["Step Over"
+	     jde-debug-step-over
+	     :active (jde-db-debuggee-stopped-p)
+	     :help "Step over the next method."]
+
+
+	["Step Into"
+	 jde-debug-step-into
+	 :active (jde-db-debuggee-stopped-p)
+	 :help "Step into the next method."]
+
+	["Step Out"
+	 jde-debug-step-out
+	 :active (jde-db-debuggee-stopped-p)
+	 :help "Step out of the current method."]
+
+	["Run"
+	 jde-debug-run
+	 :active   (and
+		    (slot-boundp 'jde-db-debugger 'the-debugger)
+		    (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			   (debuggee (oref debugger debuggee))
+			   (debuggee-status (oref debuggee status)))
+		      (and (oref debugger running-p)
+			   (not (oref debuggee-status running-p)))))
+
+	 :included (or
+		    (not (slot-boundp 'jde-db-debugger 'the-debugger))
+		    (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			   (debuggee (oref debugger debuggee))
+			   (debuggee-status (oref debuggee status)))
+		      (or (not (oref debugger running-p))
+			  (not (oref debuggee-status running-p)))))
+	 :help "Start the current program."]
+
+	["Continue"
+	 jde-debug-cont
+	 :active   (or
+		    (jde-db-debuggee-stopped-p)
+		    (jde-db-debuggee-suspended-p))
+
+	 :included  (jde-db-debuggee-running-p)
+	 :help "Continue the current program."]
+
+	["Quit"
+	 jde-debug-quit
+	 :active  (jde-db-debuggee-running-p)
+	 :help "Terminate the current debugging session."]
+
+	"-"
+
+	["Toggle Breakpoint"
+	 jde-debug-toggle-breakpoint
+	 :active t
+	 :help "Set (or remove) a breakpoint at the current line."]
+
+	["Clear Breakpoints"
+	 jde-debug-clear-breakpoints
+	 :active  jde-db-breakpoints
+	 :help "Remove all breakpoints."]
+
+	["List Breakpoints"
+	 jde-debug-list-breakpoints
+	 :active  jde-db-breakpoints
+	 :help "Display a list of breakpoints."]
+
+	"-"
+
+	(list
+	 "Display"
+
+	 ["Expression"
+	  jde-jdb-print
+	  :active  (jde-db-debuggee-stopped-p)
+	  :help "Evaluate an expression and display the results."]
+
+	 ["Object"
+	  jde-jdb-dump
+	  :active  (jde-db-debuggee-stopped-p)
+	  :help "Display the fields of an object referenced by a variable."]
+
+
+	 ["Locals"
+	  jde-jdb-locals
+	  :active  (jde-db-debuggee-stopped-p)
+	  :help "Display the variables in scope at the current line."]
+	 )
+
+	 ["Set Variable"
+	  jde-jdb-set
+	  :active  (jde-db-debuggee-stopped-p)
+	  :help "Change the value of an in-scope variable."]
+
+	(list
+	 "Stack"
+
+	 ["Up"
+	  jde-debug-up
+	  :active  (jde-db-debuggee-stopped-p)
+	  :help "Move the debug cursor up the method call stack."]
+
+	 ["Down"
+	  jde-debug-down
+	  :active (and
+		   (jde-db-debuggee-stopped-p)
+		   (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			  (debuggee (oref debugger debuggee)))
+		     (> (jde-jdb-string-to-int
+			 (oref debuggee :stack-depth)) 1)))
+	  :help "Move the debug cursor down the method call stack." ]
+
+	 ["Where"
+	  jde-debug-where
+	  :active (jde-db-debuggee-stopped-p)
+	  :help "Display the call stack."]
+
+	 )
+	"-"
+	(list
+	 "External Process"
+	 ["Attach Via Socket"
+	  jde-jdb-attach-via-socket
+	  :active (not (jde-db-debuggee-running-p))
+	  :help "Attach the debugger to an external process via a socket."]
+	 ["Attach Via Shared Memory"
+	  jde-jdb-attach-via-shared-memory
+	  :active (and
+		   (eq system-type 'windows-nt)
+		   (not (jde-db-debuggee-running-p)))
+	  :help "Attach the debugger to an external process via a shared memory connection."]
+	 ["Listen Via Socket"
+	  jde-jdb-listen-via-socket
+	  :active (not (jde-db-debuggee-running-p))
+	  :help "Listen at a socket for an external process."]
+	 ["Listen Via Shared Memory"
+	  jde-jdb-listen-via-shared-memory
+	  :active (and
+		   (eq system-type 'windows-nt)
+		   (not (jde-db-debuggee-running-p)))
+	  :help "Listen in shared memory for an external process."]
+	 )
+	"-"
+
+	["Preferences"
+	 jde-bug-show-preferences
+	 :active nil
+	 :help "Not yet implemented."]
+
+	"-"
+	["Help"
+	 jde-jdb-help
+	 :active t
+	 :help "Display the JDEE's jdb user's guide in an HTML browser."]
+	)
+  "Defines the Jdb menu for Emacs.")
+
+(defvar jde-jdb-xemacs-menu-spec
+  (list "Jdb"
+
+	["Step Over"
+	     jde-debug-step-over
+	     :active (jde-db-debuggee-stopped-p)]
+
+
+	["Step Into"
+	 jde-debug-step-into
+	 :active (jde-db-debuggee-stopped-p)
+	 ]
+
+	["Step Out"
+	 jde-debug-step-out
+	 :active (jde-db-debuggee-stopped-p)]
+
+	["Run"
+	 jde-debug-run
+	 :active   (and
+		    (slot-boundp 'jde-db-debugger 'the-debugger)
+		    (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			   (debuggee (oref debugger debuggee))
+			   (debuggee-status (oref debuggee status)))
+		      (and (oref debugger running-p)
+			   (not (oref debuggee-status running-p)))))
+
+	 :included (or
+		    (not (slot-boundp 'jde-db-debugger 'the-debugger))
+		    (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			   (debuggee (oref debugger debuggee))
+			   (debuggee-status (oref debuggee status)))
+		      (or (not (oref debugger running-p))
+			  (not (oref debuggee-status running-p)))))]
+
+	["Continue"
+	 jde-debug-cont
+	 :active   (or
+		    (jde-db-debuggee-stopped-p)
+		    (jde-db-debuggee-suspended-p))
+
+	 :included  (jde-db-debuggee-running-p)]
+
+	["Quit"
+	 jde-debug-quit
+	 :active  (jde-db-debuggee-running-p)]
+
+	"-"
+
+	["Toggle Breakpoint"
+	 jde-debug-toggle-breakpoint
+	 t]
+
+	["Clear Breakpoints"
+	 jde-debug-clear-breakpoints
+	 jde-db-breakpoints]
+
+	["List Breakpoints"
+	 jde-debug-list-breakpoints
+	 jde-db-breakpoints]
+	"-"
+
+	(list
+	 "Display"
+
+	 ["Expression"
+	  jde-jdb-print
+	  :active  (jde-db-debuggee-stopped-p)]
+
+	 ["Object"
+	  jde-jdb-dump
+	  :active  (jde-db-debuggee-stopped-p)]
+
+
+	 ["Locals"
+	  jde-jdb-locals
+	  :active  (jde-db-debuggee-stopped-p)]
+	 )
+
+	 ["Set Variable"
+	  jde-jdb-set
+	  :active  (jde-db-debuggee-stopped-p)]
+
+	(list
+	 "Stack"
+
+	 ["Up"
+	  jde-debug-up
+	  :active  (jde-db-debuggee-stopped-p)]
+
+	 ["Down"
+	  jde-debug-down
+	  :active (and
+		   (jde-db-debuggee-stopped-p)
+		   (let* ((debugger (oref 'jde-db-debugger the-debugger))
+			  (debuggee (oref debugger debuggee)))
+		     (> (jde-jdb-string-to-int
+			 (oref debuggee :stack-depth)) 1)))]
+
+	 ["Where"
+	  jde-debug-where
+	  :active (jde-db-debuggee-stopped-p)]
+
+	 )
+	"-"
+	(list
+	 "External Process"
+	 ["Attach Via Socket"
+	  jde-jdb-attach-via-socket
+	  :active (not (jde-db-debuggee-running-p))]
+	 ["Attach Via Shared Memory"
+	  jde-jdb-attach-via-shared-memory
+	  :active (and
+		   (eq system-type 'windows-nt)
+		   (not (jde-db-debuggee-running-p)))]
+	 ["Listen Via Socket"
+	  jde-jdb-listen-via-socket
+	  :active (not (jde-db-debuggee-running-p))]
+	 ["Listen Via Shared Memory"
+	  jde-jdb-listen-via-shared-memory
+	  :active (and
+		   (eq system-type 'windows-nt)
+		   (not (jde-db-debuggee-running-p)))]
+
+	 )
+	"-"
+	["Preferences"
+	 jde-bug-show-preferences nil]
+	"-"
+	["Help"
+	 jde-jdb-help t]
+	)
+  "Defines the JDE's menu of jdb commands.")
+
+
+(defvar jde-jdb-mode-map
+  (let ((km (make-sparse-keymap)))
+    (easy-menu-define jde-jdb-menu km "Jdb Minor Mode Menu"
+		      jde-jdb-emacs-menu-spec)
+    km)
+  "Keymap for Jdb minor mode.")
+
+(defvar jde-jdb-minor-mode nil
+  "Non-nil if jdb minor mode is enabled.")
+(make-variable-buffer-local 'jde-jdb-minor-mode)
+
+(defun jde-jdb-minor-mode (&optional arg)
+  "Toggle jdb minor mode.
+With prefix argument ARG, turn on if positive, otherwise off..
+
+\\{jde-jdb-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+	     (if jde-jdb-minor-mode 0 1))))
+
+  (setq jde-jdb-minor-mode
+	(if arg
+	    (>
+	     (prefix-numeric-value arg)
+	     0)
+	  (not jde-jdb-minor-mode)))
+
+  (if jde-jdb-minor-mode
+      (if (featurep 'xemacs)
+	    (easy-menu-add jde-jdb-xemacs-menu-spec jde-jdb-mode-map))
+    (if (featurep 'xemacs)
+      (easy-menu-remove jde-jdb-xemacs-menu-spec))))
+
+(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb" jde-jdb-mode-map)
+
+
+;; (fmakunbound 'jde-jdb-key-bindings)
+(defcustom jde-jdb-key-bindings
+  (list (cons "[?\C-c ?\C-a ?\C-s]" 'jde-debug-step-over)
+	(cons "[?\C-c ?\C-a ?\C-n]" 'jde-debug-step-into)
+	(cons "[?\C-c ?\C-a ?\C-o]" 'jde-debug-step-out)
+	(cons "[?\C-c ?\C-a ?\C-c]" 'jde-debug-cont)
+	(cons "[?\C-c ?\C-a ?\C-r]" 'jde-debug-run)
+	(cons "[?\C-c ?\C-a ?\C-b]" 'jde-debug-toggle-breakpoint)
+	(cons "[?\C-c ?\C-a ?\C-u]" 'jde-debug-up)
+	(cons "[?\C-c ?\C-a ?\C-d]" 'jde-debug-down)
+	(cons "[?\C-c ?\C-a ?\C-p]" 'jde-jdb-print)
+	(cons "[?\C-c ?\C-a ?\C-d]" 'jde-jdb-dump)
+	(cons "[?\C-c ?\C-a ?\C-e]" 'jde-jdb-eval)
+	(cons "[?\C-c ?\C-a ?\C-v]" 'jde-jdb-set)
+	(cons "[?\C-c ?\C-a ?\C-l]" 'jde-jdb-locals))
+  "*Specifies key bindings for jdb debug commands.
+The value of this variable is an association list. The car of
+each element specifies a key sequence. The cdr specifies
+an interactive command that the key sequence executes. To enter
+a key with a modifier, type C-q followed by the desired modified
+keystroke. For example, to enter C-s (Control s) as the key to be
+bound, type C-q C-s in the key field in the customization buffer.
+You can use the notation [f1], [f2], etc., to specify function keys."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "Key binding"
+	   (string :tag "Key")
+	   (function :tag "Command")))
+  :set '(lambda (sym val)
+	  ;; Unmap existing key bindings
+	  (if (and
+	       (boundp 'jde-jdb-key-bindings)
+	       jde-jdb-key-bindings)
+	      (mapc
+	       (lambda (binding)
+		 (let ((key (car binding))
+		       (fcn (cdr binding)))
+		   (if (string-match "\\[.+]" key)
+		       (setq key (car (read-from-string key))))
+		   (define-key jde-jdb-mode-map key nil)))
+	       jde-jdb-key-bindings))
+	  ;; Map new key bindings.
+	  (mapc
+	   (lambda (binding)
+	     (let ((key (car binding))
+		   (fcn (cdr binding)))
+	       (if (string-match "\\[.+]" key)
+		   (setq key (car (read-from-string key))))
+	       (define-key jde-jdb-mode-map key fcn)))
+	   val)
+	  (set-default sym val)))
+
+(defun jde-jdb-string-to-int(number)
+  "This method removes punctuation from a string, e.g, 1,200 (1.200 in Danish),
+and converts the result to an integer."
+  (if (string-match "[^[:digit:]]" number)
+      (setq number (replace-match "" nil nil number)))
+  (string-to-int number))
+
+(provide 'jde-jdb)
+
+;; End of jde-jdb.el
diff --git a/site/jdee/lisp/jde-jdb.elc b/site/jdee/lisp/jde-jdb.elc
new file mode 100644
index 0000000..76ad8f2
Binary files /dev/null and b/site/jdee/lisp/jde-jdb.elc differ
diff --git a/site/jdee/lisp/jde-juci.el b/site/jdee/lisp/jde-juci.el
new file mode 100644
index 0000000..b6fa2dd
--- /dev/null
+++ b/site/jdee/lisp/jde-juci.el
@@ -0,0 +1,337 @@
+;;; jde-juci.el --- JDEE Universal Communication Interface
+;; $Id: jde-juci.el 125 2009-08-12 06:40:52Z paullandes $
+
+;; Copyright (C) 2002, 2003 by Nick Sieger
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Nick Sieger <nsieger@bitstream.net>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: processes, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+;;; Commentary:
+
+;; Declaratively connect the elisp side of the JDEE with the java
+;; engine.
+
+;; To call Java from Elisp, use one of the following functions:
+;;
+;; 1) `jde-juci-invoke-java' for calling methods on java
+;; interface/implementation pairs;
+;; 2) `jde-juci-invoke-script' for calling Beanshell command scripts.
+;;
+;; See the documentation for these two functions for details.
+;;
+;; For further information about JUCI, see the package Javadoc
+;; (package.html) for the jde.juci package.
+
+;;; Code:
+
+(require 'jde)
+
+;;; These aren't really user-customizable variables, hence the
+;;; defvar's.
+
+(defvar jde-juci-java-connection-name "juciConn"
+  "*Name of beanshell symbol to hold the JUCI connection object.")
+
+(defvar jde-juci-logger-filename nil
+  "*Filename where JUCI connection logging is sent if non-nil.")
+
+(defvar jde-juci-has-proxy nil
+  "*Non-nil if the underlying JDK in which the beanshell is run
+supports the java.lang.reflect.Proxy mechanism.  Without it, JUCI is
+unavailable.")
+
+(defvar jde-juci-checked-proxy nil
+  "*Non-nil if we already checked for java.lang.reflect.Proxy.")
+
+(defun jde-juci-check-proxy ()
+  "Ensure that the proxy mechanism is available before JUCI
+invocation."
+  (or jde-juci-has-proxy
+      (and (not jde-juci-checked-proxy)
+	   (condition-case nil
+	       (progn
+		 (setq jde-juci-checked-proxy t)
+		 (jde-jeval "java.lang.reflect.Proxy.class;")
+		 (setq jde-juci-has-proxy t))
+	     (error (setq jde-juci-has-proxy nil))))
+      (error "JDK version 1.3 or higher required for JUCI (needs java.lang.reflect.Proxy)")))
+
+(defun jde-juci-invoke-java (java-class method-name &rest method-args)
+  "Invoke METHOD-NAME (with METHOD-ARGS) on JAVA-CLASS declaratively
+through JUCI.  Example: you have a java interface `Ticker' with a
+method called `getStockPrice' (and an implementation in `TickerImpl'):
+
+  package my.finance;
+
+  public interface Ticker {
+      double getStockPrice(String symbol);
+  }
+
+  public class TickerImpl implements Ticker {
+      public TickerImpl() {}
+
+      public double getStockPrice(String symbol) {
+	  double price;
+	  // implementation details ...
+	  return price;
+      }
+  }
+
+\(Note that the declaration of the callable method(s) in an interface
+is necessary because of how JUCI operates.)  Calling this java class
+through JUCI is as simple as defining an elisp function as follows:
+
+  \(defun my-finance-ticker-stock-price (symbol)
+    (jde-juci-invoke-java \"my.finance.TickerImpl\" \"getStockPrice\" symbol))
+
+The arguments to `my-finance-ticker-stock-price' are automatically
+passed to the java method.  Translation of lisp objects into beanshell
+script is done by the function `jde-juci-bshify-object'."
+;;; If JAVA-CLASS is null, the special behavior is that METHOD-NAME is
+;;; interpreted to be a Beanshell script name.  Arguments are still
+;;; processed and passed to the script.  But, this behavior shouldn't
+;;; be publicly documented, because `jde-juci-invoke-script' should be
+;;; used for those cases.
+  (jde-juci-check-proxy)
+  (let ((cnt 0) converted-args arg-ptr)
+    (jde-juci-eval (concat jde-juci-java-connection-name
+			   " = jde.juci.ConnectionFactory.getConnection("
+			   (jde-juci-connection-class java-class)
+			   ", this, \""
+			   jde-juci-java-connection-name "\");"))
+    (condition-case err
+	(progn
+	  (jde-juci-eval (concat jde-juci-java-connection-name ".begin();"))
+	  (jde-juci-setup-logger)
+	  (setq arg-ptr method-args)
+	  (while arg-ptr
+	    (setq converted-args (nconc converted-args
+					(list (jde-juci-setup-method-arg (car arg-ptr) cnt))))
+	    (setq arg-ptr (cdr arg-ptr))
+	    (setq cnt (1+ cnt)))
+	  (if (null java-class)
+	      (jde-juci-eval-r (concat jde-juci-java-connection-name ".evalBshScript(\"" method-name
+				     "(" (mapconcat 'identity converted-args ",") ");\");"))
+	    (jde-juci-eval-r (concat jde-juci-java-connection-name "." method-name
+				   "(" (mapconcat 'identity converted-args ",") ");")))
+	  (jde-juci-eval-r (concat jde-juci-java-connection-name ".end();")))
+      (error
+       (progn
+	 (jde-log-msg "juci-invoke-java: error signaled %S" err)
+	 (jde-juci-eval (concat jde-juci-java-connection-name ".reset();"))
+	 (signal (car err) (cdr err)))))))
+
+(defun jde-juci-invoke-script (script-name &rest script-args)
+  "Invoke a Beanshell command script via JUCI, returning the result to
+Emacs.  This must be a command script in the bsh/commands path on the
+classpath; not any arbitrary script statement.  SCRIPT-NAME must match
+the name of the command script filename, minus the .bsh extension.
+Any provided SCRIPT-ARGS are converted and passed through to the
+script."
+  (jde-juci-invoke-java nil script-name script-args))
+
+(defun jde-juci-invoke-elisp (form)
+  "Function used by JUCI connection infrastructure to call/eval an
+elisp form and return the result to the java code.  Any elisp code may
+be invoked EXCEPT that which could eventually call back to the
+beanshell.  JUCI only allows at most a inter-boundary call stack of
+depth 2, i.e., elisp calls java/java calls elisp."
+  (let (result arg-name)
+    (condition-case err
+	(progn
+	  (setq result (eval form))
+	  (setq arg-name (jde-juci-setup-method-arg result 0)))
+      (error
+       (setq arg-name "error")
+       (jde-juci-eval (concat arg-name " = new jde.juci.ElispError("
+			      (jde-juci-bshify-object err) ");"))))
+    (jde-juci-eval (concat jde-juci-java-connection-name
+			   ".pushResult(" arg-name ");"))))
+
+(defun jde-juci-connection-class (java-class)
+  "Prepare the connection class argument to the JUCI
+ConnectionFactory.getConnection() call."
+  (cond
+   ((stringp java-class)
+    (concat java-class ".class"))
+   ((listp java-class)
+    (concat "new Class[] {"
+	    (mapconcat #'(lambda (cls)
+			   (concat cls ".class"))
+		       java-class ",")
+	    "}"))
+   (t
+    (error "java-class must be a string or a list of strings"))))
+
+(defun jde-juci-setup-method-arg (arg arg-num)
+  "Setup and save a JUCI java method argument inside of a beanshell
+variable.  Returns the name of the beanshell variable assigned to."
+  (let ((arg-name (concat jde-juci-java-connection-name "Arg"
+			  (number-to-string arg-num))))
+    (jde-juci-eval (concat arg-name " = " (jde-juci-bshify-object arg) ";"))
+    arg-name))
+
+(defun jde-juci-setup-logger ()
+  "Setup the JUCI connection logger file name, if
+`jde-juci-logger-filename' is non-nil."
+  (if jde-juci-logger-filename
+      (jde-juci-eval (concat jde-juci-java-connection-name
+			     ".setLoggerFilename(\"" jde-juci-logger-filename "\");"))))
+
+(defun jde-juci-eval (expr &optional eval-return)
+  "Evaluate a JUCI expression in the JDEE's beanshell."
+  (let (result)
+    (prog1
+	(setq result (jde-jeval expr eval-return))
+      (if eval-return
+	  (jde-log-msg "juci-eval: %s produced result: %S" expr result)
+	(jde-log-msg "juci-eval: %s" expr)))))
+
+(defun jde-juci-eval-r (expr)
+  "Evaluate a JUCI expression in the JDEE's beanshell."
+  (jde-juci-eval expr t))
+
+(defun jde-juci-bshify-object (arg)
+  "Convert a lisp object to a java object representation in BeanShell
+script.  Conversion of lisp types is done as follows:
+
+  Elisp             Java
+  =====             ====
+  t                 true (Boolean.TRUE)
+  nil               false (Boolean.FALSE)
+  'null             null
+  number            no conversion
+  string            no conversion
+  any symbol        jde.juci.Symbol
+  dotted-pair       jde.juci.Cons
+  any sequence      java.util.List"
+  (cond
+   ((eq arg 'null)
+    "null")
+   ((eq arg nil)
+    "false")
+   ((eq arg t)
+    "true")
+   ((numberp arg)
+    (number-to-string arg))
+   ((stringp arg)
+    (concat "\"" (jde-juci-escape-string arg) "\""))
+   ((symbolp arg)
+    (concat "new jde.juci.Symbol(\"" (symbol-name arg) "\")"))
+   ((and (consp arg)			; dotted-pair cons cell
+	 (not (consp (cdr arg))))
+    (concat "new jde.juci.Cons("
+	    (jde-juci-bshify-object (car arg)) ","
+	    (jde-juci-bshify-object (cdr arg))
+	    ")"))
+   ((sequencep arg)
+    (concat "Arrays.asList(new Object[] {" (mapconcat 'jde-juci-bshify-object arg ",") "})"))))
+
+(defun jde-juci-escape-string (string)
+  "Escape a string for transport across the JUCI boundary."
+  (mapconcat #'(lambda (c)
+		 (cond
+		  ;; TODO: more escapes here?
+		  ((eq c ?\\)
+		   "\\\\")
+		  ((eq c ?\")
+		   "\\\"")
+		  ((eq c ?\')
+		   "\\\'")
+		  ((eq c ?\n)
+		   "\\n")
+		  ((eq c ?\t)
+		   "\\t")
+		  ((eq c ?\b)
+		   "\\b")
+		  ((eq c ?\f)
+		   "\\f")
+		  ((eq c ?\r)
+		   "\\r")
+		  (t
+		   (char-to-string c))))
+	     (string-to-sequence string 'list) ""))
+
+
+
+;;; Some test functions -- everything below here is only for either
+;;; testing or sample usage.
+
+(defun jde-juci-test-echo (message)
+  (jde-juci-invoke-java "jde.juci.test.EchoImpl" "ack" message))
+
+(defun jde-juci-test-roundtrip (object)
+  (jde-juci-invoke-java "jde.juci.test.EchoImpl" "roundTrip" object))
+
+(defun jde-juci-test-callback-get-message ()
+  (jde-juci-invoke-java "jde.juci.test.CallbackImpl" "getMessage"))
+
+(defun jde-juci-test-callback-get-buffer-contents ()
+  (jde-juci-invoke-java "jde.juci.test.CallbackImpl" "getBufferContents"))
+
+(defun jde-juci-test-prompt-user-input ()
+  (read-from-minibuffer "Input: "))
+
+(defun jde-juci-test-prompt-buffer-contents ()
+  (buffer-string))
+
+(defun jde-juci-xunit-assert-equal (expected actual &optional msg)
+  "xUnit-style assertion function to be used by unit tests.  Assert
+that EXPECTED is `equal' to ACTUAL.  Signal an error if not."
+  (or (equal expected actual)
+      (error "expected:<%S> but was:<%S>.  %s" expected actual (or msg ""))))
+
+(defmacro jde-juci-xunit-assert-error (form &optional msg)
+  "xUnit-style assertion function to be used by unit tests.  Assert
+that a FORM, when executed, produces an error.  If no error is
+signaled, then signal an error."
+  `(condition-case nil
+       (let ((message-log-max))	;; quiet (message)
+	 ,form
+	 (error "No error generated.  %S" (or ,msg "")))
+     (error (message nil) t)))
+
+(defun jde-juci-test-roundtrips ()
+  (jde-juci-xunit-assert-equal "hello" (jde-juci-test-echo "hello") "1a")
+  (jde-juci-xunit-assert-error (jde-juci-test-echo nil) "Argument type mismatch 1b")
+  (jde-juci-xunit-assert-equal 'null (jde-juci-test-echo 'null) "1c")
+  (jde-juci-xunit-assert-equal "hello" (jde-juci-test-roundtrip "hello") "2a")
+  (jde-juci-xunit-assert-equal nil (jde-juci-test-roundtrip nil) "2b")
+  (jde-juci-xunit-assert-equal t (jde-juci-test-roundtrip t) "2c")
+  (jde-juci-xunit-assert-equal '(1 2 3 4) (jde-juci-test-roundtrip '(1 2 3 4)) "3a")
+  (jde-juci-xunit-assert-equal '(1 2 3 4 (5 6 (7 8))) (jde-juci-test-roundtrip '(1 2 3 4 (5 6 (7 8)))) "3b")
+  (jde-juci-xunit-assert-equal 'null (jde-juci-test-roundtrip 'null) "3c"))
+
+(defun jde-juci-test-unit-tests ()
+  "Run all JUCI Elisp unit tests."
+  (interactive)
+  (jde-juci-test-roundtrips)
+  (message "All unit tests completed successfully."))
+
+(defun jde-juci-test-bean-info-maker (class-name)
+  "Example command that invokes the JDEE's beanInfoMaker.bsh script through JUCI."
+  (interactive "sClass Name: ")
+  (with-output-to-temp-buffer "*bean-info*"
+    (princ (jde-juci-invoke-script "beanInfoMaker" class-name)))
+  (with-current-buffer "*bean-info*"
+    (jde-mode)))
+
+(provide 'jde-juci)
+
+;;; jde-juci.el ends here
diff --git a/site/jdee/lisp/jde-juci.elc b/site/jdee/lisp/jde-juci.elc
new file mode 100644
index 0000000..5050757
Binary files /dev/null and b/site/jdee/lisp/jde-juci.elc differ
diff --git a/site/jdee/lisp/jde-junit.el b/site/jdee/lisp/jde-junit.el
new file mode 100644
index 0000000..66f118a
--- /dev/null
+++ b/site/jdee/lisp/jde-junit.el
@@ -0,0 +1,455 @@
+;; jde-junit.el --- runs the junit test in the current buffer.
+;; $Id: jde-junit.el 157 2009-09-24 04:36:40Z lenbok $
+
+;; Author: Paul Kinnucan
+;; Author: Torsten Geise <torsten.geise@freenet.de>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: tools, processes
+
+;; Copyright (C) 2004, 2005, 2006 Paul Kinnucan, Torsten Geise
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This package is developed to perform junit test cases from within the
+;; current buffer. Most defuns are copied from jde sources and modified to
+;; do the right things to JUnit.
+;; This package should be best integrated to the JDEE. That means this
+;; package uses the jde project files to store junit specific settings and
+;; so on.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Torsten Geise at torsten.geise@freenet.de.
+
+
+(require 'jde)
+
+(defgroup jde-junit nil
+  "JDE JUnit"
+  :group 'jde
+  :prefix "jde-junit-")
+
+(defcustom jde-junit-working-directory ""
+  "*Path of the working directory for the test run.
+If you specify a path, the JDE launches the test run from the
+directory specified by the path. Otherwise the test run will be launched
+from the current buffer's directory"
+  :group 'jde-junit
+  :type 'file)
+
+;; (makunbound 'jde-junit-testrunner-type)
+(defcustom jde-junit-testrunner-type "junit.textui.TestRunner"
+  "Defines the test runner to be used. If you specify a custom
+test runner, enter the class name of the test runner in the
+edit field."
+  :group 'jde-junit
+  :tag "Test Runner"
+  :type '(choice
+	  (const :tag "Text UI" :value "junit.textui.TestRunner")
+	  (const :tag "Swing GUI" :value "junit.swingui.TestRunner")
+	  (const :tag "AWT GUI" :value "junit.awtui.TestRunner")
+	  (string :tag "Custom UI")))
+
+;; (makunbound 'jde-junit-tester-name-tag)
+(defcustom jde-junit-tester-name-tag (cons "T" "prefix")
+  "Specifies a tag appended or prefixed to the name of a testee class to
+create the name of the corresponding tester class, e.g., T or Test, as
+in TFoo or FooTest."
+  :group 'jde-junit
+  :tag "Test Class Name Tag"
+  :type '(cons
+	  (string :tag "Tag" :value "T")
+	  (choice :tag "Tag Type"
+	   (const :tag "Prefix" :value t)
+	   (const :tag "Suffix" :value nil))))
+
+
+;;JUnit templates
+
+(defun jde-junit-get-tester-name (testee-name)
+  "Gets the name of a tester class from the name
+of the testee class by appending or prefixing
+`jde-junit-tester-name-tag'."
+  (let ((tag (car jde-junit-tester-name-tag))
+	(prefixp (cdr jde-junit-tester-name-tag)))
+  (if prefixp
+      (concat tag testee-name)
+    (concat testee-name tag))))
+
+(defun jde-junit-get-testee-name (tester-name)
+  "Gets the name of a testee class from the name
+of the tester class by removing prefixed or
+affixed `jde-junit-tester-name-tag'."
+  (let ((tag (car jde-junit-tester-name-tag))
+	(prefixp (cdr jde-junit-tester-name-tag)))
+    (if prefixp
+	(progn
+	  (string-match
+	   (concat "^" tag "\\(.*\\)")
+	   tester-name))
+      (progn
+	(string-match
+	 (concat "\\(.*\\)" tag "$")
+	 tester-name)))
+    (substring tester-name (match-beginning 1) (match-end 1))))
+
+
+(defcustom jde-junit-test-class-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "\"import junit.framework.Test;\" '>'n"
+   "\"import junit.framework.TestCase;\" '>'n"
+   "\"import junit.framework.TestSuite;\" '>'n"
+   "'n"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * \""
+   "\" Unit Test for class \""
+   "(jde-junit-get-testee-name (file-name-sans-extension (file-name-nondirectory buffer-file-name))) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-end-block \"*/\")"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" extends TestCase \" "
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+   "'n"
+
+   " \" /** \" '>'n"
+   " \"* Creates a new <code>\""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\"</code> instance.\" '>'n"
+   " \"*\" '>'n"
+   " \"* @param name test name\" '>'n"
+   " \"*/\"'>'n"
+
+   "\"public \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" (String name)\""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+   "\"super(name);\"'>'n"
+
+   "\"}\"'>"
+   "'>'n"
+   "'n"
+
+   "\"/**\" '>'n"
+   "\"* @return a <code>TestSuite</code>\" '>'n"
+   "\"*/\" '>'n"
+   "\"public static TestSuite suite() \" '>"
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+   "\"TestSuite suite = new TestSuite ();\" '>'n"
+   "'>'n"
+   "\"return suite;\" '>'n"
+   "\"}\"'>'n'n"
+
+   "\"/** \" '>'n"
+   "\"* Entry point \" '>'n"
+   "\"*/ \" '>'n"
+   "\"public static void main(String[] args) \""
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+   "\"junit.textui.TestRunner.run(suite());\"'>'n"
+   "\"}\"'>'n"
+
+   "\"}\">"
+   "\"// \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new Java class.
+Setting this variable defines a template instantiation
+command `jde-junit-test-class', as a side-effect."
+  :group 'jde-junit
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-junit-test-class-internal
+	    (tempo-define-template
+	     "java-junit-test-class-buffer-template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert a generic JUnit test class buffer skeleton."))
+	  (set-default sym val)))
+
+(defcustom jde-junit4-test-class-template
+  (list
+   "(funcall jde-gen-boilerplate-function)"
+   "(jde-gen-get-package-statement)"
+   "\"import junit.framework.JUnit4TestAdapter;\" '>'n"
+   "\"import org.junit.Assert;\" '>'n"
+   "\"import static org.junit.Assert.*;\" '>'n"
+   "\"import org.junit.Test;\" '>'n"
+   "'n"
+   "(progn (require 'jde-javadoc) (jde-javadoc-insert-start-block))"
+   "\" * \""
+   "\" Unit Test for class \""
+   "(jde-junit-get-testee-name (file-name-sans-extension (file-name-nondirectory buffer-file-name))) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" * Created: \" (current-time-string) '>'n"
+   "\" \" (jde-javadoc-insert-empty-line)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-author-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-version-tag)"
+   "\" \" (jde-javadoc-insert 'tempo-template-jde-javadoc-end-block \"*/\")"
+   "\"public class \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\" \" "
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+   "'n"
+
+   " \" /** \" '>'n"
+   " \"* Creates a new <code>\""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\"</code> instance.\" '>'n"
+   " \"*\" '>'n"
+   " \"* @param name test name\" '>'n"
+   " \"*/\"'>'n"
+
+   "\"public \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\"() \""
+
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+
+   "\"}\"'>"
+   "'>'n"
+   "'n"
+   "\"/**\" '>'n"
+   "\"* @return a <code>TestMethod</code>\" '>'n"
+   "\"*/\" '>'n"
+   "\"@Test\" '>'n"
+   "\"public void testMethod() \" '>"
+
+   "(if jde-gen-k&r "
+   "() "
+   "'>'n)"
+   "\"{\"'>'n"
+   "\"}\"'>'n'n"
+
+   "\"/** \" '>'n"
+   "\"* Test Adapter \" '>'n"
+   "\"*/ \" '>'n"
+   "\"public static junit.framework.Test suite() \""
+   "(if jde-gen-k&r "
+   "()"
+   "'>'n)"
+   "\"{\"'>'n"
+   "\"return new JUnit4TestAdapter(\""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "\".class);\"'>'n"
+   "\"}\"'>'n"
+
+   "\"}\">"
+   "\"// \""
+   "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+   "'>'n")
+  "*Template for new Java class.
+Setting this variable defines a template instantiation
+command `jde-junit4-test-class', as a side-effect."
+  :group 'jde-junit
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-junit4-test-class-internal
+	    (tempo-define-template
+	     "java-junit4-test-class-buffer-template"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert a generic JUnit 4 test class buffer skeleton."))
+	  (set-default sym val)))
+
+;;;###autoload
+(defun jde-junit-test-class ()
+  "Instantiate a test class template."
+  (interactive)
+  (jde-junit-test-class-internal))
+
+;;;###autoload
+(defun jde-junit4-test-class ()
+  "Instantiate a test class template."
+  (interactive)
+  (jde-junit4-test-class-internal))
+
+;;;###autoload
+(defun jde-junit-test-class-buffer ()
+  "Create a buffer containing a skeleton unit test class having the same name as the
+root name of the buffer. This command prompts you to enter the file name
+of the test class. It assumes that the file name has the form CLASSTest.java
+where CLASS is the name of the class to be tested, e.g., MyAppTest.java. Use
+`jde-gen-junit-add-test-to-suite' to add tests to the test suite. Use of
+tests generated with this template requires the JUnit test framework. For
+more information, see http://www.junit.org."
+  (interactive)
+  (let ((tester-name
+	 (jde-junit-get-tester-name
+	  (file-name-sans-extension
+	   (file-name-nondirectory buffer-file-name)))))
+    (find-file (concat tester-name ".java"))
+    (jde-junit-test-class-internal)
+    (goto-char (point-min))
+    (search-forward "{")
+    (backward-char 1)
+    (c-indent-exp)
+    (tempo-forward-mark)))
+
+;;;###autoload
+(defun jde-junit4-test-class-buffer ()
+  "Create a buffer containing a skeleton unit test class having
+the same name as the root name of the buffer. This command
+prompts you to enter the file name of the test class. It assumes
+that the file name has the form CLASSTest.java where CLASS is the
+name of the class to be tested, e.g., MyAppTest.java. Use of
+tests generated with this template requires the JUnit test
+framework. For more information, see http://www.junit.org."
+  (interactive)
+  (let ((tester-name
+	 (jde-junit-get-tester-name
+	  (file-name-sans-extension
+	   (file-name-nondirectory buffer-file-name)))))
+    (find-file (concat tester-name ".java"))
+    (jde-junit4-test-class-internal)
+    (goto-char (point-min))
+    (search-forward "{")
+    (backward-char 1)
+    (c-indent-exp)
+    (tempo-forward-mark)))
+
+(defcustom jde-junit-add-test-to-suite-template
+  '(
+    "\"suite.addTest(new \""
+    "(file-name-sans-extension (file-name-nondirectory buffer-file-name))"
+    "\"(\\\"\" (P \"Test Name: \") \"\\\") \""
+
+    "(if jde-gen-k&r "
+    "()"
+    "'>'n)"
+    "\"{\"'>'n"
+
+    "\"public void runTest()\""
+
+    "(if jde-gen-k&r "
+    "()"
+    "'>'n)"
+    "\"{\"'>'n"
+
+    "(P \"Method to call: \") \"();\"'>'n"
+    "\"}\"'>'n"
+    "\"});\"'>'n"
+   )
+  "*Template for generating a test case for suite."
+  :group 'jde-junit
+  :type '(repeat string)
+  :set '(lambda (sym val)
+	  (defalias 'jde-junit-add-test-to-suite-internal
+	    (tempo-define-template
+	     "Adding JUnit test to suit"
+	     (jde-gen-read-template val)
+	     nil
+	     "Insert JUnit test to suite."))
+	  (set-default sym val)))
+
+
+;;;###autoload
+(defun jde-junit-add-test-to-suite ()
+  "Instantiate an addTest method."
+  (interactive)
+  (jde-junit-add-test-to-suite-internal))
+
+
+;;;###autoload
+(defun jde-junit-run ()
+  "Starts junit testrunner with buffer corresponding class name."
+  (interactive)
+   (if (equal major-mode 'jde-mode)
+       (let ((vm (jde-run-get-vm))
+	     (working-directory
+	      (if (string= jde-junit-working-directory "")
+		  default-directory
+		(jde-normalize-path 'jde-junit-working-directory))))
+	 (oset vm :main-class jde-junit-testrunner-type )
+	 (jde-run-set-app-args (concat (jde-db-get-package)
+				       (file-name-sans-extension
+					(file-name-nondirectory (buffer-file-name)))))
+	 (cd working-directory)
+	 (jde-run-vm-launch vm))
+     (error "The jde-junit-run command works only in a Java source buffer.")))
+
+;;;###autoload
+(defun jde-junit-show-options ()
+  "Show the JDE JUnit Options panel."
+  (interactive)
+  (customize-apropos "jde-junit" 'groups))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (put 'test-jde-junit 'regression-suite t)
+  (setq test-jde-junit
+   '("test-jde-junit"
+     ;; Each test in the suite is of the form:
+     ;;   ([description] probe grader)
+     ;;   DESCRIPTION - string
+     ;;   PROBE -  a sexp which runs the actual test
+     ;;   GRADER - the desired result or a sexp which determines
+     ;;   how we did
+     ("Test jde-junit-get-tester-name function"
+      (jde-junit-get-tester-name "DynamicClassLoader")
+      "TDynamicClassLoader"
+      )
+      )))
+
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (defun jde-junit-self-test ()
+    "Runs jde-dbs self tests."
+    (interactive)
+    (apply 'regress
+	   (list test-jde-dbs-proc))))
+
+(provide 'jde-junit)
+
+;; End of jde-junit.el
diff --git a/site/jdee/lisp/jde-junit.elc b/site/jdee/lisp/jde-junit.elc
new file mode 100644
index 0000000..1b2d7fb
Binary files /dev/null and b/site/jdee/lisp/jde-junit.elc differ
diff --git a/site/jdee/lisp/jde-make.el b/site/jdee/lisp/jde-make.el
new file mode 100644
index 0000000..c10a622
--- /dev/null
+++ b/site/jdee/lisp/jde-make.el
@@ -0,0 +1,175 @@
+;;; jde-make.el -- Integrated Development Environment for Java.
+;; $Id: jde-make.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <pkinnucan@attbi.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(require 'compile)
+
+(defgroup jde-make nil
+  "JDE Make Interface"
+  :group 'jde
+  :prefix "jde-make-")
+
+(defcustom jde-make-program "make"
+  "*Specifies name of make program."
+ :group 'jde-make
+ :type 'string)
+
+(defcustom jde-make-working-directory ""
+  "*Path of the working directory to use in 'make' build mode. This
+string must end in a slash, for example, c:/foo/bar/ or ./  .
+If this string is empty, the 'make' build mode uses the current file
+location as its working directory."
+  :group 'jde-make
+  :type 'string)
+
+(defcustom jde-make-enable-find nil
+"*Specify whether jde-make find the Makefile based on your current
+directory. If non-nil, we will search up the directory hierarchy from the
+current directory for the build definition file. Also note that, if non-nil,
+this will relax the requirement for an explicit jde project file."
+   :group 'jde-make
+   :type 'boolean)
+
+(defcustom jde-make-args ""
+  "*Specifies arguments to be passed to make program."
+  :group 'jde-make
+  :type 'string)
+
+(defcustom jde-make-finish-hook
+  '(jde-compile-finish-refresh-speedbar jde-compile-finish-update-class-info)
+  "List of functions to be invoked when compilation of a
+Java source file terminates. Each function should accept
+two arguments: the compilation buffer and a string
+describing how the compilation finished."
+  :group 'jde-make
+  :type 'hook)
+
+(defvar jde-interactive-make-args ""
+"String of compiler arguments entered in the minibuffer.")
+
+(defcustom jde-read-make-args nil
+"*Specify whether to prompt for additional make arguments.
+If this variable is non-nil, and if `jde-build-use-make' is non nil
+the jde-build command prompts you to enter additional make
+arguments in the minibuffer. These arguments are appended to those
+specified by customization variables. The JDE maintains a history
+list of arguments entered in the minibuffer."
+  :group 'jde-make
+  :type 'boolean
+)
+
+
+(defun jde-make-make-command (more-args)
+  "Constructs the java compile command as: jde-compiler + options + buffer file name."
+  (concat jde-make-program " " jde-make-args
+	  (if (not (string= more-args ""))
+	      (concat " " more-args))
+	  " "))
+
+(defun jde-make-find-build-file (dir)
+  "Find the next Makefile upwards in the directory tree from DIR.
+Returns nil if it cannot find a project file in DIR or an ascendmake directory."
+  (let ((file (find "Makefile"
+		    (directory-files dir) :test 'string=)))
+
+    (if file
+	(setq file (expand-file-name file dir))
+      (if (not (jde-root-dir-p dir))
+	  (setq file (jde-make-find-build-file (concat dir "../")))))
+
+    file))
+
+;;;###autoload
+(defun jde-make ()
+  "Run the make program specified by `jde-make-program' with the
+command-line arguments specified by `jde-make-args'. If
+`jde-read-make-args' is nonnil, this command also prompts you to enter
+make arguments in the minibuffer and passes any arguments that you
+enter to the make program along with the arguments specified by
+`jde-make-args'."
+  (interactive)
+  (if jde-read-make-args
+      (setq jde-interactive-make-args
+	      (read-from-minibuffer
+	       "Make args: "
+	       jde-interactive-make-args
+	       nil nil
+	       '(jde-interactive-make-arg-history . 1)))
+    (setq jde-interactive-make-args ""))
+
+  (let ((make-command
+	 (jde-make-make-command
+	  jde-interactive-make-args))
+	(save-default-directory default-directory)
+	(default-directory
+	  (if (string= jde-make-working-directory "")
+	      (if jde-make-enable-find
+		  (let ((jde-make-buildfile
+			 (jde-make-find-build-file default-directory)))
+		    (if jde-make-buildfile
+			(file-name-directory jde-make-buildfile)
+		      default-directory))
+		default-directory)
+	    (jde-normalize-path 'jde-make-working-directory))))
+
+
+    ;; Force save-some-buffers to use the minibuffer
+    ;; to query user about whether to save modified buffers.
+    ;; Otherwise, when user invokes jde-make from
+    ;; menu, save-some-buffers tries to popup a menu
+    ;; which seems not to be supported--at least on
+    ;; the PC.
+    (if (and (eq system-type 'windows-nt)
+	     (not jde-xemacsp))
+	(let ((temp last-nonmenu-event))
+	  ;; The next line makes emacs think that jde-make
+	  ;; was invoked from the minibuffer, even when it
+	  ;; is actually invoked from the menu-bar.
+	  (setq last-nonmenu-event t)
+	  (save-some-buffers (not compilation-ask-about-save) nil)
+	  (setq last-nonmenu-event temp))
+      (save-some-buffers (not compilation-ask-about-save) nil))
+
+    (setq compilation-finish-function
+      (lambda (buf msg)
+	(run-hook-with-args 'jde-make-finish-hook buf msg)
+	(setq compilation-finish-function nil)))
+
+    (cd default-directory)
+    (compile-internal make-command "No more errors")
+    (cd save-default-directory)))
+
+;;;###autoload
+(defun jde-make-show-options ()
+  "Show the JDE Make Options panel."
+  (interactive)
+  (customize-apropos "jde-make" 'groups))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-make)
+
+;; End of jde-make.el
diff --git a/site/jdee/lisp/jde-make.elc b/site/jdee/lisp/jde-make.elc
new file mode 100644
index 0000000..16da2ea
Binary files /dev/null and b/site/jdee/lisp/jde-make.elc differ
diff --git a/site/jdee/lisp/jde-open-source.el b/site/jdee/lisp/jde-open-source.el
new file mode 100644
index 0000000..710b0a9
--- /dev/null
+++ b/site/jdee/lisp/jde-open-source.el
@@ -0,0 +1,518 @@
+;; jde-open-source.el -- Open class source files
+;; $Id: jde-open-source.el 179 2009-12-27 01:58:29Z lenbok $
+;;
+;; Author: Klaus Berndl
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, open files
+
+;; Copyright (C) 2002, 2003, 2004 Klaus Berndl
+;; Copyright (C) 2009 by Paul Landes
+
+;; This package follows the GNU General Public Licence (GPL), see the
+;; COPYING file that comes along with GNU Emacs. This is free software,
+;; you can redistribute it and/or modify it under the GNU GPL terms.
+;;
+;; Java is a registered trademark of Sun Microsystem, Inc.
+;;
+;;; Commentary:
+
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;; This package allows to open the class at point.
+
+(require 'jde-parse)
+(require 'jde-util)
+(require 'jde-bsh)
+(require 'senator)
+
+(defcustom jde-open-class-at-point-find-file-function 'find-file-other-window
+  "Define the function for opening the class at point. See
+`jde-open-class-at-point'`. Default is `find-file-other-window'. A function
+defined here must have the same signature as `find-file' means the first
+argument is the filename and the second optional argument is a
+wildcard-pattern."
+  :group 'jde-project
+  :type '(function :tag "Function to open class at point"))
+
+(defvar jde-open-cap-ff-function-temp-override nil
+  "Maybe some tools needs to temporally override the value of
+`jde-open-class-at-point-find-file-function'. Cause of the auto. resetting
+mechanism of JDE for defcustom-variables this is not possible with the
+defcustom version. So, if you need to override the value of
+`jde-open-class-at-point-find-file-function' from within your elisp code you
+can use the variable `jde-open-cap-ff-function-temp-override'.
+`jde-open-class-at-point' checks first if this variable is not nil and uses
+then this value. Only if this variable is nil it uses the value of
+`jde-open-class-at-point'!
+This variable is NOT for user customizing, but only for use within elisp!")
+
+(defmacro jde-with-file-contents (file &rest body)
+  "If FILE exists and is readable creates a temporary buffer with the contents
+of FILE, points to beginning of buffer, evaluates BODY and return the value of
+the last form of BODY. If FILE does not exist or is not readable nil is
+returned.
+Note: No major/minor-mode is activated and no local variables are evaluated
+for FILE, but proper EOL-conversion and charcater interpretation is done!"
+  (let ((exp-filename (make-symbol "exp-filename")))
+    `(let ((,exp-filename (expand-file-name ,file)))
+       (if (and (file-exists-p ,exp-filename)
+		(file-readable-p ,exp-filename))
+	   (with-temp-buffer
+	     (insert-file-contents ,exp-filename)
+	     (goto-char (point-min))
+	     ,@body)
+	 nil))))
+
+(defun jde-open-get-class-to-open (pair parsed-symbol)
+  "Evaluates PARSE-SYMBOL to check if it is a variable name or a class name.
+If this fails point is on a method or an attribute of a class in the current
+buffer or in a superclass. In this cases we check first if the parsed-symbol
+is a possible member of the current class(\"this\") and if this fails it
+checks if it is a member of the base class(\"super\")."
+ (if (and (stringp (car pair))
+	  (> (length (car pair)) 0))
+     ;; if we got a pair all should work fine.
+     (jde-parse-eval-type-of (car pair))
+   (or (condition-case ()
+	   (jde-parse-eval-type-of parsed-symbol)
+	 (error nil))
+       (if (jde-parse-find-completion-for-pair
+	    `("this" ,parsed-symbol) nil jde-complete-private)
+	   (jde-parse-eval-type-of "this")
+	 nil)
+       (if (jde-parse-find-completion-for-pair
+	    `("super" ,parsed-symbol) nil jde-complete-private)
+	   (jde-parse-eval-type-of "super")
+	 nil))))
+
+
+(defun jde-open-functions-exist ()
+  "Checks if the functions `jde-parse-java-variable-at-point',
+`jde-parse-eval-type-of', and `jde-parse-find-completion-for-pair' are defined"
+  (and (fboundp 'jde-parse-java-variable-at-point)
+       (fboundp 'jde-parse-eval-type-of)
+       (fboundp 'jde-parse-find-completion-for-pair)))
+
+
+(defun jde-open-jump-to-class (parsed-symbol class-name) 
+  "Place the cursor in the parsed variable"
+  (let* (tags super-class (first-time t))
+    ;; Searching only for the symbol '{' is not good enough. We can
+    ;; have, for example, '{@link }' in the javadoc before the class
+    ;; definition.
+    (search-forward-regexp "^[^\\*]*?{" nil t)
+    (setq tags (jde-get-parents))
+    (setq super-class (car tags))
+    (message "Superclass of %s is %s" class-name super-class)
+    ;; Now let“s jump to the thing-of-interest. If this is a
+    ;; variable-name then we will not find this with senator in
+    ;; the opened java-file so we search for the definiton of
+    ;; the class itself. This feature is only available if we
+    ;; have senator!
+    (when (and (fboundp 'senator-search-forward) (not (string= parsed-symbol "")))
+      (goto-char (point-min))
+      (semantic-fetch-tags)
+      (senator-parse)
+      (setq parsed-symbol (concat "\\b" parsed-symbol "\\b"))
+      (while (not (senator-re-search-forward parsed-symbol nil t))
+	(message "Could not find %s in %s" parsed-symbol (buffer-name))
+        ;; searching for the thing-of-interest has failed 
+        ;; let's try in the base class
+        (progn
+          (if (not super-class)
+              (error "Method not found"))
+          (let ((jde-open-cap-ff-function-temp-override 'find-file))
+            (jde-show-superclass-source-2 tags))
+          (goto-char (point-min))
+          (senator-parse)
+          (search-forward-regexp "^[^\\*]*?{" nil t)
+          (setq tags (jde-get-parents))
+          ;;if it is the first time try in the class definition
+          ;;itself.
+          (if first-time
+              (progn 
+                (setq first-time nil)
+                (senator-re-search-forward
+                 (progn
+                   (string-match ".*\\.\\([^.]+\\)$"
+                                 (concat "." class-name))
+                   (match-string 1 (concat "." class-name)))
+                 nil t)))
+          (setq super-class (car tags)))))))
+
+(defun jde-get-parents ()
+  "Returns a list with all the parents (super class and interfaces,
+if any) of the current class or interface."
+  (jde-remove-type 
+   (append (semantic-tag-type-superclasses
+	    (semantic-current-tag-of-class 'type))
+	   (semantic-tag-type-interfaces (semantic-current-tag-of-class 
+					  'type)))))
+
+(defun jde-remove-type (list) 
+  "Removes generics '<Type>' declaration from every given
+class/interface name."
+  (mapcar '(lambda(s) (replace-regexp-in-string "<.*>" "" s)) list))
+
+(defun jde-open-class-at-event (event)
+  "Like `jde-open-class-at-point', but is mouse-bindable.
+
+Preserves point."
+  (interactive "e")
+  (jde-open-class-at-point
+   (posn-point (event-end event))))
+
+(defun jde-open-class-at-point (&optional position)
+  "Opens the source file that defines the class of the symbol at point and
+scrolls the source file to the definition of the symbol, which can be the name of
+a variable, class, method, or attribute. This function has the
+same requirements as the JDEE's field/method completion commands. See, for example,
+`jde-complete-menu'. The JDEE searches for the source file first in
+`jde-sourcepath', then in `jde-global-classpath', then in
+$CLASSPATH, then in the current directory."
+  (interactive)
+  (if (jde-open-functions-exist)
+      (let* ((old-point (if position
+			    (prog1
+				(point)
+			      (goto-char position))))
+	     (thing-of-interest (thing-at-point 'symbol))
+	     (pair (save-excursion
+		     (end-of-thing 'symbol)
+		     (jde-parse-java-variable-at-point)))
+	     (class-to-open (jde-open-get-class-to-open
+			     pair thing-of-interest)))
+	(if old-point
+	    (goto-char old-point))
+	(if (and class-to-open
+		 (stringp class-to-open))
+	    ;; Handle the case where the definition of the symbol is in the current buffer.
+	    (let ((pos
+		   (and
+		    (string= (car pair) "")
+		    (jde-parse-find-declaration-of thing-of-interest))))
+	      (ring-insert find-tag-marker-ring (point-marker))
+	      (if pos
+		  (goto-char pos)
+		;; Handle the case where the definition is in another buffer or an
+		;; unopened source file.
+		(let ((source
+		       (jde-find-class-source-file class-to-open)))
+		  (if source
+		      ;; we have found the source file. So let“s open it and
+		      ;; then jump to the thing-of-interest
+		      (progn
+			(if (typep source 'buffer)
+			    (let ((pop-up-frames t))
+			      (set-buffer source)
+			      (display-buffer source)
+			      ;; (jde-mode)
+			      ;; (semantic-new-buffer-fcn)
+			      ;; (semantic-fetch-tags)
+			      )
+			  ;; (switch-to-buffer source)
+			  ;; (pop-to-buffer source other-window)
+			  ;; if the current buffer contains java-file-name do not try to
+			  ;; open the file
+			  (if (not (string-equal (buffer-file-name) source))
+			      (funcall (or jde-open-cap-ff-function-temp-override
+					   jde-open-class-at-point-find-file-function)
+				       source)))
+			(jde-open-jump-to-class thing-of-interest class-to-open))
+		    (message "Can not find the source for \"%s\"." class-to-open)))))
+	  (message "Cannot determine the class of \"%s\"." thing-of-interest)))
+    (message "You need JDEE >= 2.2.6 and Senator to use this command.")))
+
+(defun jde-open-class-source ( &optional unqual-class )
+  "Displays source of the class whose name appears at point in the current
+Java buffer. This command finds only classes that reside in the source paths
+specified by `jde-sourcepath'. You should provide a global setting
+for this variable in your .emacs file to accommodate source files that are
+not associated with any project."
+  (interactive)
+  (condition-case err
+      (let* ((unqualified-name
+	      (or unqual-class
+		  (read-from-minibuffer "Class: " (thing-at-point 'symbol))))
+	     (class-names
+	      ;;expand the names into full names, or a list of names
+	      (jde-jeval-r
+	       (concat
+		"jde.util.JdeUtilities.getQualifiedName(\""
+		unqualified-name "\");"))))
+	;;Check return value of QualifiedName
+	(if (or (eq class-names nil)
+		(not (listp class-names)))
+	    (error "Cannot find %s" unqualified-name))
+	(ring-insert find-tag-marker-ring (point-marker))
+	;; Turn off switching project settings to avoid
+	;; resetting jde-sourcepath.
+	(let ((old-value jde-project-context-switching-enabled-p))
+	  (setq jde-project-context-switching-enabled-p nil)
+	  ;;If the list is only one long
+	  (if (eq 1 (length class-names))
+	      ;;then show it
+	      (progn(other-window 1)
+		    (jde-find-class-source (car class-names)))
+		  ;;else let the user choose
+	    (let ((class (efc-query-options class-names "Which class?")))
+		  (if class
+		      (jde-find-class-source class))))
+	  (setq jde-project-context-switching-enabled-p old-value)))
+    (error
+     (message "%s" (error-message-string err)))))
+
+(defalias 'jde-show-class-source 'jde-open-class-source)
+
+;; Thanks to Sandip Chitale <sandip.chitale@blazesoft.com>
+(defun jde-show-superclass-source-2 (tags)
+  (if tags
+      (if (= (length tags) 1)
+	  (jde-show-class-source (car tags))
+	(let ((parent (efc-query-options tags "Which super class?")))
+	  (if parent
+	      (jde-show-class-source parent))))
+    (error "Superclass not available")))
+
+(defun jde-show-superclass-source ()
+  "Show the source for the parent of the class at point."
+  (interactive)
+  (let ((tags (semantic-tag-type-superclasses
+		 (semantic-current-tag-of-class 'type))))
+    (jde-show-superclass-source-2 tags)))
+;; Thanks to Sandip Chitale <sandip.chitale@blazesoft.com>
+
+(defun jde-show-interface-source ()
+  "Show the source for the interface implemented by the class at point.
+If the class implements more than one interface, this command prompts
+you to select one of the interfaces to show."
+  (interactive)
+  (let ((tags (semantic-tag-type-interfaces
+		 (semantic-current-tag-of-class 'type))))
+    (if tags
+	(if (= (length tags) 1)
+	    (jde-show-class-source (car tags))
+	  (let ((interface (efc-query-options tags "Which interface?")))
+	    (if interface
+		(jde-show-class-source interface)))))))
+
+(defun jde-find-class-source-file (class)
+  "Find the source file for a specified class.
+CLASS is the fully qualified name of the class. This function searchs
+the directories and source file archives (i.e., jar or zip files)
+specified by `jde-sourcepath' for the source file corresponding to
+CLASS. If it finds the source file in a directory, it returns the
+file's path. If it finds the source file in an archive, it returns a
+buffer containing the contents of the file. If this function does not
+find the source for the class, it returns nil."
+  (let ((verified-name (jde-parse-class-exists class))
+	outer-class file package)
+    (if (null verified-name)
+	(error "Class not found: %s" class))
+    (setq outer-class (car (split-string verified-name "[$]"))
+	  file (concat
+		(jde-parse-get-unqualified-name outer-class)
+		".java")
+	  package (jde-parse-get-package-from-name outer-class))
+    (catch 'found
+      (loop for path in jde-sourcepath do
+	    (progn
+	      (setq path (jde-normalize-path path 'jde-sourcepath))
+	      (if (and (file-exists-p path)
+		       (or (string-match "\.jar$" path)
+			   (string-match "\.zip$" path)))
+		  (let* ((bufname (concat file " (" (file-name-nondirectory path) ")"))
+			 (buffer (get-buffer bufname)))
+		    (if buffer
+			(throw 'found buffer)
+		      (let* ((pkg-path (subst-char-in-string ?. ?/ package))
+			     (class-file-name (concat  pkg-path "/" file))
+			     success)
+			(setq buffer (get-buffer-create bufname))
+			(save-excursion
+			  (set-buffer buffer)
+			  (setq buffer-file-name (expand-file-name (concat path ":" class-file-name)))
+			  (setq buffer-file-truename file)
+			  (let ((exit-status
+				 (archive-extract-by-stdout path class-file-name archive-zip-extract)))
+			    (if (and (numberp exit-status) (= exit-status 0))
+				(progn
+				  (jde-mode)
+				  (goto-char (point-min))
+				  (setq buffer-undo-list nil)
+				  (setq buffer-saved-size (buffer-size))
+				  (set-buffer-modified-p nil)
+				  (setq buffer-read-only t)
+				  (throw 'found buffer))
+			      (progn
+				(set-buffer-modified-p nil)
+				(kill-buffer buffer))))))))
+		(if (file-exists-p (expand-file-name file path))
+		    (throw 'found (expand-file-name file path))
+		  (let* ((pkg-path (subst-char-in-string ?. ?/ package))
+			 (pkg-dir (expand-file-name pkg-path path))
+			 (file-path (expand-file-name file pkg-dir)))
+		    (if (file-exists-p file-path)
+			(throw 'found file-path))))))))))
+
+(defcustom jde-preferred-packages
+  '("java.util" "java" "javax")
+  "Classes from these packages will appear first when reading from user input."
+  :group 'jde-project
+  :type '(repeat string))
+
+(defun jde-choose-class (classes &optional prompt uq-name confirm-fq-p)
+  "Choose a class from user input.
+
+CLASSES are a list of fully qualified classes that are presetned to user as
+choices for input.
+
+PROMPT the prompt the user sees.  Don't add the `: ' at the end to this.
+
+UQ-NAME the unqualified name, which is used for the initial input if found as
+an import in the buffer.
+
+CONFIRM-FQ-P, if non-nil, confirm the class name even when there
+is only one unique fully qualified class found for the simple
+class name \(that is the class without the package part in the
+name)."
+  (flet ((sort-helper
+	  (a b)
+	  (dolist (pkg jde-preferred-packages)
+	    (let ((len (length pkg)))
+	      (cond ((eq t (compare-strings pkg 0 len a 0 len))
+		     (return t))
+		    ((eq t (compare-strings pkg 0 len b 0 len))
+		     (return nil))
+		    (t (string< a b)))))))
+    (setq classes (sort classes 'sort-helper))
+    (setq prompt (or prompt "Class"))
+    (let ((default (if uq-name
+		       (jde-import-get-import uq-name))))
+      (setq default (or default (car classes)))
+      (if (and (not confirm-fq-p) (= 1 (length classes)))
+	  (car classes)
+	(efc-query-options classes prompt "Class" jde-read-class-fq-items default)))))
+
+(defvar jde-read-class-items nil
+  "*History for `jde-read-class' read items.")
+
+(defvar jde-read-class-fq-items nil
+  "*History for `jde-read-class' read items (second part of fully
+qualified classes).")
+
+;;;###autoload
+(defun jde-read-class (&optional prompt fq-prompt
+				 this-class-p confirm-fq-p no-confirm-nfq-p
+				 validate-fn)
+  "Select a class interactively.  PROMPT is used to prompt the user for the
+first class name, FQ-PROMPT is used only if the class name expands into more
+than one fully qualified name.
+
+PROMPT text used to prompt the user for the simple class name, or
+\"Class\" as the default.  Don't add the colon/space at the end
+of this prompt as a default will be added if it exists.
+
+FQ-PROMPT text used to prompt the fully qualified class name, or
+\"Select qualified class\" as the default.  Don't add the
+colon/space at the end of this prompt as a default will be added
+if it exists.
+
+THIS-CLASS-P, if non-nil, use the current class name if no class name at point
+and we are in a JDEE buffer.
+
+CONFIRM-FQ-P, if non-nil, confirm the class name even when there
+is only one unique fully qualified class found for the simple
+class name \(that is the class without the package part in the
+name).
+
+NO-CONFIRM-NFQ-P, if non-nil, don't confirm the class to check for fully
+qualified classes if it is obtainable from either the point or this class (see
+THIS-CLASS-P).  If obtained from the point, then the class name is parsed with
+`jde-parse-class-name' for the input.
+
+VALIDATE-FN is a function to validate the class.  This function takes an
+argument the output from `jde-parse-class-name' given from the first user input
+class name query.  The function should raise an error if there is anything
+wrong with the class.  If this is `nil', then no validate is done.
+
+When called interactively, select the class and copy it to the kill ring."
+  (interactive (list nil nil t))
+  (setq fq-prompt (or fq-prompt "Select qualified class"))
+  (let ((ctup (jde-parse-class-name 'point))
+	uinput uq-name classes initial-input fqc default)
+    (if (and (null ctup)
+	     (eq major-mode 'jde-mode)
+	     this-class-p)
+	(setq ctup
+	      (jde-parse-class-name (jde-parse-get-buffer-class))))
+    (setq default (cond ((null ctup) nil)
+			((first ctup) (first ctup))
+			(t (third ctup))))
+    (setq prompt (concat (or prompt "Class")
+			 (if default
+			     (format " (default %s): " default)
+			   ": ")))
+    (setq uinput
+	  (if (and default no-confirm-nfq-p)
+	      (prog1
+		  default
+		(setq fq-prompt (format "%s" fq-prompt)))
+	    (read-string prompt nil 'jde-read-class-items default)))
+    (setq ctup (jde-parse-class-name uinput))
+    (if (null ctup)
+	(error "Doesn't appear to be a classname: `%s'" uinput))
+    (if validate-fn
+	(setq fqc (funcall validate-fn ctup)))
+    (when (not (eq 'pass fqc))
+      (setq fqc (first ctup)
+	    uq-name (third ctup))
+      (if fqc
+	  (if (not (jde-jeval-r (concat "jde.util.JdeUtilities."
+					"classExists(\""
+					fqc "\");")))
+	      (error "No match for %s" uq-name))
+	(setq classes (jde-jeval-r (concat "jde.util.JdeUtilities."
+					   "getQualifiedName(\""
+					   uq-name "\");")))
+	(if (= 0 (length classes))
+	    (error "Not match for %s" uq-name))
+	(setq fqc (jde-choose-class classes fq-prompt uq-name confirm-fq-p))))
+    (when (interactive-p)
+      (kill-new fqc)
+      (message "Copied `%s'" fqc))
+    fqc))
+
+;;;###autoload
+(defun jde-find-class-source (class &optional other-window)
+  "*Find the source file for a specified fully qualified class.
+Calls `jde-find-class-source-file' to do the search.
+If it finds the source file, it opens the file in a buffer."
+  (interactive (list (jde-read-class "Class") current-prefix-arg))
+  (let ((source (jde-find-class-source-file class)))
+    (if source
+	(progn
+	  (if (typep source 'buffer)
+	      (switch-to-buffer source)
+	      ;; (pop-to-buffer source other-window)
+	    (if (not (string-equal (buffer-file-name)  source))
+		(if other-window
+		    (find-file-other-window source)
+		  (find-file source))))
+	  (if (fboundp 'senator-re-search-forward)
+	      (let ((inner-class-pos (string-match "\\$" class)))
+		(if inner-class-pos
+		    (let ((inner-class (substring class (+ 1 inner-class-pos))))
+		      (when inner-class
+			(goto-char (point-min))
+			(senator-parse)
+			(senator-re-search-forward
+			 (concat "\\b" inner-class "\\b") nil t)))))))
+      (message "JDE error: Could not find source for \"%s\" in this
+project's source path. See `jde-sourcepath' for more information." class))))
+
+(provide 'jde-open-source)
+
+;; End of jde-open-source.el
diff --git a/site/jdee/lisp/jde-open-source.elc b/site/jdee/lisp/jde-open-source.elc
new file mode 100644
index 0000000..31d76ac
Binary files /dev/null and b/site/jdee/lisp/jde-open-source.elc differ
diff --git a/site/jdee/lisp/jde-package.el b/site/jdee/lisp/jde-package.el
new file mode 100644
index 0000000..25818c5
--- /dev/null
+++ b/site/jdee/lisp/jde-package.el
@@ -0,0 +1,247 @@
+;; jde-package.el -- Java package statement generator
+;; $Id: jde-package.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Copyright (C) 1998, 2000, 2001, 2002 by David Ponce
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author:     David Ponce <david@dponce.com>
+;; Maintainer: David Ponce
+;;             Paul Landes <landes <at> mailc dt net>
+;; Created:    September 28 1998
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This package automatically generates a Java package statement.  The
+;; package name is deducted from the current classpath setting of
+;; JDE.  When a directory found in classpath is a root of the current
+;; buffer default directory, the relative path of the default
+;; directory from the classpath one becomes the package name by
+;; substituting directory separators by '.'.
+;;
+;; For example:
+;;
+;;   The JDE classpath setting is:
+;;
+;;    ("~/java")
+;;
+;;   For the file "~/java/FR/test/MyClass.java", the package name
+;;   generated will be "FR.test".
+;;
+;;   The JDE classpath setting is:
+;;
+;;    ("~/java" "~/java/test")
+;;
+;;   For the file "~/java/test/MyClass.java",
+;;   `jde-package-default-package-comment' will be generated because
+;;   the default package can be used.
+;;
+;;   The JDE classpath setting is:
+;;
+;;    ("~/java")
+;;
+;;   For the file "/usr/java/MyClass.java", no package name will be
+;;   generated because the directory "/usr/java" is not accessible
+;;   from classpath.
+;;
+;; Usage:
+;;
+;; M-x `jde-package-update' to update the Java package statement or
+;; insert a new one at beginning of current buffer.
+;;
+;; The function `jde-package-generate-package-statement' should be
+;; used in Java template to automatically generate the package
+;; statement.
+;;
+;; Customization:
+;;
+;; The following variables could be set:
+;;
+;; - `jde-package-load-hook' hook run when package has been loaded.
+;;
+;; - `jde-package-package-comment' Java line comment appended to the
+;;   generated package statement.  Default is " // Generated package
+;;   name"
+;;
+;; - `jde-package-default-package-comment' Java line comment generated
+;;   when the default package is used.  Default is "// Default package
+;;   used"
+;;
+;; - `jde-package-search-classpath-variables' list of variables where
+;;   to search the current classpath list.  Default is
+;;   '(`jde-compile-option-classpath' `jde-global-classpath')
+
+;;; Code:
+
+(defconst jde-package-unknown-package-name
+  "*unknown*"
+  "The string returned when a package name can't be generated.")
+
+(defconst jde-package-package-regexp
+  "package .*;.*$"
+  "The regexp used to find the Java package statement.")
+
+(defgroup jde-package nil
+  "jde-package package customization"
+  :group 'jde
+  :prefix "jde-package-")
+
+(defcustom jde-package-load-hook nil
+  "*Hook run when package has been loaded."
+  :group 'jde-package
+  :type 'hook)
+
+(defcustom jde-package-package-comment
+  " // Generated package name"
+  "*Java line comment appended to the generated package statement.
+An empty string suppress the generation of this comment."
+  :group 'jde-package
+  :type 'string)
+
+(defcustom jde-package-default-package-comment
+  "// Default package used"
+  "*Java line comment generated when the default package is used.
+An empty string suppress the generation of this comment."
+  :group 'jde-package
+  :type 'string)
+
+(defcustom jde-package-search-classpath-variables
+  '(jde-compile-option-classpath jde-global-classpath)
+  "*Specify the variables where to search the current classpath list.
+The first one which has a non nil value will be used by jde-package."
+  :group 'jde-package
+  :type '(repeat variable))
+
+
+(defun jde-package-get-classpath ()
+  "Return the current classpath list.
+That is to say the first non-nil value found in the variables given by
+`jde-package-search-classpath-variables'."
+  (let ((search-in jde-package-search-classpath-variables)
+	(classpath))
+    (while (and search-in (not classpath))
+      (setq classpath (symbol-value (car search-in))
+	    search-in (cdr search-in)))
+    classpath))
+
+(defun jde-package-get-directories-in-classpath ()
+  "Return the list of directories found in classpath."
+  (mapcan
+   (lambda (path)
+       (if (or jde-resolve-relative-paths-p
+	      (not   (string= path "."))) ; "." is ignored in classpath
+	   (let ((path (jde-normalize-path path)))
+	     (if (file-directory-p path)
+		 (list (file-name-as-directory path))))))
+   (jde-package-get-classpath)))
+
+
+(defun jde-package-seach-package-directories ()
+  "Return a list of package directory candidates or nil if not found."
+  (let ((dir (jde-normalize-path default-directory))
+	;; case-insensitive for Windows
+	(case-fold-search (eq system-type 'windows-nt)))
+    (mapcan
+     (lambda (root)
+	 (let ((root (regexp-quote root)))
+	   (message "Seaching %S in %S..." root dir)
+	   (and (string-match root dir)
+		(list (substring dir (match-end 0))))))
+     (append (jde-package-get-directories-in-classpath)
+	     (mapcar
+	      (lambda (p)
+		(file-name-as-directory
+		 (jde-normalize-path p 'jde-sourcepath)))
+	      jde-sourcepath)))))
+
+(defun jde-package-best-package-candidate (candidates)
+  "Return the best package directory candidate from CANDIDATES.
+The best is the shortest one that could be found."
+  (car (sort candidates
+	     (lambda (dir1 dir2)
+		 (string-match (regexp-quote dir1) dir2)))))
+
+(defun jde-package-get-package-directory ()
+  "Return the package directory, if found; otherwise,
+`jde-package-unknown-package-name'."
+  (or (jde-package-best-package-candidate
+       (jde-package-seach-package-directories))
+      jde-package-unknown-package-name))
+
+
+(defun jde-package-convert-directory-to-package (dir)
+  "Convert directory path DIR to a valid Java package name.
+Replace ?/ by ?. and remove extra ?/ at end."
+  (if (string= dir "")
+      ""
+    (subst-char-in-string
+     ?/ ?.
+     (substring (file-name-as-directory dir) 0 -1)
+     t)))
+
+(defun jde-package-generate-package-statement ()
+  "Generate a Java package statement for the Java source file in the
+current buffer, if the package name can be determined; otherwise,
+an empty string."
+  (let* (
+	 ;; The JDE always uses ?/ as directory separator so ensure
+	 ;; [X]Emacs uses the same one when running on Windows!
+	 (directory-sep-char ?/)
+	 (package-name (jde-package-get-package-directory)))
+    (cond
+     ((string= package-name jde-package-unknown-package-name)
+      (message
+       "The current directory is not accessible from classpath.")
+      "")
+     ((string= package-name "")
+      (message "Default package used.")
+      jde-package-default-package-comment)
+     (t
+      (message "package %s;%s"
+	       (jde-package-convert-directory-to-package package-name)
+	       jde-package-package-comment)))))
+
+;;;###autoload
+(defun jde-package-update ()
+  "Create or update the package statement in the current Java source
+file buffer based on the file's location relative to the root of
+the package directory as specified by one of the entries in
+`jde-package-search-classpath-variables' or `jde-sourcepath'.
+If these variables do not specify the root of the package directory,
+this command does nothing. This command signals an error if the
+ major mode of the current buffer is not `jde-mode'."
+  (interactive)
+  (or (eq major-mode 'jde-mode)
+      (error "Invalid major mode found.  Must be `jde-mode'"))
+  (let ((package (jde-package-generate-package-statement)))
+    (unless (string= package "")
+      (goto-char (point-min))
+      (if (re-search-forward jde-package-package-regexp nil t)
+	  (replace-match package)
+	(insert package)
+	(newline)))))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-package)
+(run-hooks 'jde-package-load-hook)
+
+;; End of jde-package.el
diff --git a/site/jdee/lisp/jde-package.elc b/site/jdee/lisp/jde-package.elc
new file mode 100644
index 0000000..3ca6ae5
Binary files /dev/null and b/site/jdee/lisp/jde-package.elc differ
diff --git a/site/jdee/lisp/jde-parse-class.el b/site/jdee/lisp/jde-parse-class.el
new file mode 100644
index 0000000..5a9c9c9
--- /dev/null
+++ b/site/jdee/lisp/jde-parse-class.el
@@ -0,0 +1,803 @@
+;; jde-parse-class.el --- Parse a Java class file.
+;; $Id: jde-parse-class.el 150 2009-09-18 00:55:19Z lenbok $
+;;
+;; Copyright (C) 2002, 2004, 2005 Andrew Hyatt
+;; Copyright (C) 2009 by Paul Landes
+;;
+;; Author: Andrew Hyatt <andy_jde@thehyatts.net>
+;; Maintainer: Andrew Hyatt, Paul Landes <landes <at> mailc dt net>
+;;
+;; Keywords: java, tools
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; A copy of the GNU General Public License can be obtained from this
+;; program's author (send electronic mail to
+;; ) or from the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;; LCD Archive Entry:
+;; jde-parse-class|Andrew Hyatt|
+;; |Parse a Java class file to get xref info for the JDEE.
+;; |$Date: 2009-09-17 19:55:19 -0500 (Thu, 17 Sep 2009) $|$Revision: 150 $|~/packages/jde-parse-class.el
+
+;;; Commentary:
+
+;; This file parses Java .class files to get information about what
+;; methods call what other methods.  On the way there, we happen to
+;; pick up all sorts of useful information. If someone needs the
+;; functionality, contact me and I could easiliy put in more
+;; functionality.
+;;
+;; Also, we could return a semantic-compatible structure, but at the
+;; moment there is no point in doing this.
+;;
+;; There are two public functions, `jde-parse-class', which returns
+;; everything we have parsed about the class. The resultant structures
+;; can be passed to `jde-parse-class-extract-method-calls' which
+;; returns the method calls a particular class uses, and
+;; `jde-parse-class-extract-interfaces' to retrieve the interfaces a
+;; class uses, and `jde-parse-class-extract-classname' to get the
+;; fully qualified classname the class represents.  This is used in
+;; jde-xref.el
+;;
+;; There is one other functions that is generally useful, and one
+;; macro.  The function is `get-bit-flags-for-byte', which, given a
+;; single byte in decimal (0 - 255), and a vector of flags
+;; corresponding to bytes, will return a list of which flags are on.
+;; The macro `do-and-advance-chars' wraps code, and after executing the
+;; code, advances the current point a certain number of chars (here
+;; equivalent to bytes).  This is useful for the kind of parsing we are
+;; doing.
+
+;; for XEmacs compatibilty
+(unless (fboundp 'char-int)
+  (defalias 'char-int 'identity))
+(when jde-xemacsp
+    (require 'jde-xemacs))
+
+(defmacro do-and-advance-chars (num &rest body)
+  "Execute BODY, and then advance the point NUM bytes, called like
+      (do-and-advance-chars 2 ...)"
+  (let ((result-sym (gensym)))
+  `(let ((,result-sym (progn ,@body)))
+     (goto-char (+ (point) ,num))
+     ,result-sym)))
+
+(defsubst jde-parse-class-get-next-const-val (constants)
+  (cadr (jde-parse-class-lookup-constant
+	 (jde-parse-class-get-next-2-bytes) constants)))
+
+;; xemacs without mule can't do utf-8
+(setq jde-parse-class-encoding
+      (if (member 'utf-8 (coding-system-list))
+	  'utf-8 'raw-text))
+
+(defun jde-parse-class-slash-to-dot (string)
+  (subst-char-in-string ?/ ?. string))
+
+(defun jde-parse-class (class-file)
+  "Parse the class in CLASS-FILE, and return an alist, with the following
+keys: version, this-class, interfaces, fields, and methods."
+  ;; we must visit the file in such a way as to not use any encoding,
+  ;; else our parsing could be severely messed up
+  (unless (file-exists-p class-file)
+    (error (concat "Class file " class-file " does not exist")))
+  (let ((buf (find-file-noselect class-file nil t)))
+    (set-buffer buf)
+    (let* ((constants (jde-parse-class-get-constants))
+	   (version (jde-parse-class-get-version))
+	   (access (jde-parse-class-get-access-flags))
+	   (this-class
+	     (subst-char-in-string
+	      ?/ ?. (cadr (jde-parse-class-lookup-constant
+			     (jde-parse-class-get-next-const-val constants)
+			      constants))))
+	   (superclass (jde-parse-class-slash-to-dot
+			(do-and-advance-chars 2
+			  (let ((val (jde-parse-class-get-const-ref
+				      (point) constants)))
+			    (if (eq (cadr val) 0)
+			      nil ;; only Object can have no superclass
+			      (cadr (jde-parse-class-lookup-constant
+				     (cadr val) constants)))))))
+	   (interfaces (jde-parse-class-get-interfaces constants))
+	   (fields (jde-parse-class-get-fields constants))
+	   (methods (jde-parse-class-get-methods constants))
+	   (attributes (jde-parse-class-get-attributes constants)))
+      (kill-buffer buf)
+      `((version . ,version) (access . ,access)
+	(this-class . ,this-class) (superclass . ,superclass)
+	(interfaces . ,interfaces)
+	(fields . ,fields)
+	(methods . ,methods)
+	(attributes . ,attributes)))))
+
+(defun jde-parse-class-extract-caught-exception-types (info)
+  "Returns a list of a two-element of list of method signatures to
+  caught exception types for each method"
+  (mapcar (lambda (method)
+	    (list `(,(cdr (nth 2 info))
+		      ,(cdr (assoc 'name method))
+		      ,@(cdr (assoc 'descriptor method)))
+		  (mapcar (lambda (class) (when class
+					    (jde-parse-class-slash-to-dot class)))
+			  (cdr (assoc
+				'catch-types
+				(cdr
+				 (assoc 'code
+					(cdr
+					 (assoc 'attributes
+						method)))))))))
+	  (cdr (assoc 'methods info))))
+
+(defun jde-parse-class-extract-thrown-exception-types (info)
+  "Returns a two element list of method signatures to thrown exception
+  types for each method"
+  (mapcar (lambda (method)
+	    (list `(,(cdr (nth 2 info))
+		      ,(cdr (assoc 'name method))
+		      ,@(cdr (assoc 'descriptor method)))
+		  (cdr
+		   (assoc 'exceptions
+			  (cdr
+			   (assoc 'attributes
+				  method))))))
+	  (cdr (assoc 'methods info))))
+
+(defun jde-parse-class-extract-method-calls (info)
+  "Return a cons of a method signature, and a list of the methods it
+calls.  Each method in the list is a list of the calling method or
+line number if available, the Class, method, and return value, and
+arguments.  INFO is the result of `jde-parse-class'"
+  (mapcan (lambda (method) (mapcar (lambda (attr)
+				     (list
+				      `(,(cdr (nth 2 info))
+					 ,(cdr (assoc 'name method))
+					 ,@(cdr (assoc 'descriptor method))
+					 ,(car attr)) (cdr attr)))
+				   (cdr (assoc
+					 'calls
+					 (cdr
+					  (assoc 'code
+						 (cdr
+						  (assoc 'attributes
+							 method))))))))
+	  (cdr (assoc 'methods info))))
+
+(defun jde-parse-class-extract-interfaces (info)
+  "Returns a list of fully qualified interface names that the class
+  implements.  INFO is the result of `jde-parse-class'"
+  (mapcar 'jde-parse-class-slash-to-dot
+	  (cdr (assoc 'interfaces info))))
+
+(defun jde-parse-class-extract-superclass (info)
+  "Returns a list of fully qualified class names that are superclasses
+  of the parsed class"
+  (jde-parse-class-slash-to-dot (cdr (assoc 'superclass info))))
+
+(defun jde-parse-class-extract-method-signatures (info)
+  "Returns a list of method names that the class implements"
+  (mapcar (lambda (method-info) (cons (cdr (assoc 'name method-info))
+				      (cdr (assoc 'descriptor method-info))))
+	  (cdr (assoc 'methods info))))
+
+(defun jde-parse-class-extract-field-signatures (info)
+  "Return a list of field names that the class defines"
+  (mapcar (lambda (field-info)
+	    (list (cdr (assoc 'name field-info))
+		  (cdr (assoc 'descriptor field-info))))
+	  (cdr (assoc 'fields info))))
+
+(defun jde-parse-class-extract-classname (info)
+  "Returns the fully qualified classname that the class implements.
+INFO is the result of `jde-parse-class'"
+  (cdr (assoc 'this-class info)))
+
+(defun jde-parse-class-extract-sourcefile (info)
+  (cdr (assoc 'source-file (cdr (assoc 'attributes info)))))
+
+(defun jde-parse-class-get-const-ref (point constants)
+  "Look at point in the class file and read it as a reference to the array.
+Returns the constant information contained at the reference"
+  ;; we have to subtract one since the array index starts at 1
+  ;; (according to the class file, not us
+  (jde-parse-class-lookup-constant (jde-parse-class-get-2byte point)
+				   constants))
+
+(defun jde-parse-class-lookup-constant (num constants)
+  "From an index value, get the constant for that index"
+  (aref constants (- num 1)))
+
+(defsubst jde-parse-class-get-next-length-val ()
+  (jde-parse-class-get-next-2-bytes))
+
+(defun jde-parse-class-get-interfaces (constants)
+  (let ((num (jde-parse-class-get-next-length-val))
+	(interfaces '()))
+    (dotimes (i num interfaces)
+      (add-to-list 'interfaces (cadr (jde-parse-class-lookup-constant
+				     (jde-parse-class-get-next-const-val
+				      constants) constants))))))
+
+(defun jde-parse-class-get-methods (constants)
+  (let ((num (jde-parse-class-get-next-length-val))
+	(methods '()))
+    (dotimes (i num (nreverse methods))
+      (add-to-list 'methods (jde-parse-class-get-method constants)))))
+
+(defun jde-parse-class-get-method (constants)
+  (list (cons 'access-flags (jde-parse-class-get-access-flags))
+	(cons 'name (jde-parse-class-get-next-const-val constants))
+	(cons 'descriptor (jde-parse-class-parse-complete-arg-signature
+			   (jde-parse-class-get-next-const-val constants)))
+	(cons 'attributes (jde-parse-class-get-attributes constants))))
+
+(defun jde-parse-class-get-fields (constants)
+  (let ((num (jde-parse-class-get-next-length-val))
+	(fields '()))
+    (dotimes (i num (nreverse fields))
+      (add-to-list 'fields (jde-parse-class-get-field constants)))))
+
+(defun jde-parse-class-get-field (constants)
+  (list (cons 'access-flags (jde-parse-class-get-access-flags))
+	(cons 'name (jde-parse-class-get-next-const-val constants))
+	(cons 'descriptor (car (jde-parse-class-parse-first-arg
+			   (jde-parse-class-get-next-const-val constants))))
+	(cons 'attributes (jde-parse-class-get-attributes constants))))
+
+(defun jde-parse-class-get-attributes (constants)
+  (let ((num (jde-parse-class-get-next-length-val))
+	(attributes '()))
+    (dotimes (i num attributes)
+      (add-to-list 'attributes (jde-parse-class-get-attribute constants)))))
+
+(defun jde-parse-class-get-attribute (constants)
+  (let ((attribute-type (jde-parse-class-get-next-const-val constants))
+	(numbytes (jde-parse-class-get-next-4-bytes (point))))
+    ;; TODO: implement the rest of the common attribute types
+    (cond ((equal attribute-type "Code")
+	    (cons 'code
+		  (jde-parse-class-get-code-attribute numbytes constants)))
+	  ((equal attribute-type "LineNumberTable")
+	    (cons 'line-number-table
+		  (jde-parse-class-get-line-number-attribute)))
+	  ((equal attribute-type "Exceptions")
+	    (cons 'throws
+		  (jde-parse-class-get-exception-attribute constants)))
+	  ((equal attribute-type "SourceFile")
+	    (cons 'source-file
+		  (jde-parse-class-get-source-file-attribute constants)))
+	  (t (forward-char numbytes)))))
+
+(defun jde-parse-class-get-source-file-attribute (constants)
+  (jde-parse-class-get-next-const-val constants))
+
+(defun jde-parse-class-get-exception-attribute (constants)
+  (let ((num (jde-parse-class-get-next-length-val))
+	(classes '()))
+    (dotimes (i num classes)
+      (add-to-list 'classes
+		   (cadr (jde-parse-class-lookup-constant
+			  (jde-parse-class-get-next-const-val constants)
+			  constants))))))
+
+(defun jde-parse-class-get-line-number-attribute ()
+  (let ((num (jde-parse-class-get-next-length-val))
+	(line-number-infos '()))
+    (dotimes (i num (nreverse line-number-infos))
+      (add-to-list
+       'line-number-infos
+       (cons (jde-parse-class-get-next-2-bytes)
+	     (jde-parse-class-get-next-2-bytes))))))
+
+(defun jde-parse-class-get-code-attribute (numbytes constants)
+  (goto-char (+ (point) 4)) ;; no one cares about max_stack and max_locals, right?
+  (let* ((code-numbytes (jde-parse-class-get-next-4-bytes (point)))
+	 (end-point (+ (point) code-numbytes))
+	 (begin-point (point))
+	 (calls '())
+	 (catch-types '()))
+    (while (< (point) end-point)
+      (let* ((opcode-info (aref jde-parse-class-opcode-vec
+				(char-int (char-after))))
+	     (opcode-val (car opcode-info))
+	     (opcode-length (cdr opcode-info)))
+	(forward-char)
+	(cond ((member opcode-val '(invokevirtual invokestatic invokespecial
+				    invokeinterface getstatic putstatic
+				    getfield putfield))
+		(do-and-advance-chars (- opcode-length 1)
+		  (add-to-list
+		   'calls
+		   (cons (- (point) begin-point)
+			 (jde-parse-class-parse-method-signature
+			  (jde-parse-class-lookup-method
+			   (jde-parse-class-get-const-ref (point) constants)
+			   constants))))))
+	      ((eq opcode-val 'tableswitch)
+		;; skip padding to go to a multiple of 4 from the begin-point.
+		;; The second mod is to make sure on an offset of 4 we really don't skip anything
+		(forward-char (mod (- 4 (mod (- (point) begin-point) 4)) 4))
+		(forward-char 4)  ;; we don't care about default
+		(let ((diff (jde-parse-class-diff-next-two-4-bytes-as-signed)))
+		  (forward-char (* 4 (+ diff 1)))))
+	      ((eq opcode-val 'lookupswitch)
+		(forward-char (mod (- 4 (mod (- (point) begin-point) 4)) 4))
+		(forward-char 4)
+		(forward-char (* 8 (jde-parse-class-get-next-4-bytes-as-signed))))
+	      ((eq opcode-val 'wide)
+		(let ((opcode2 (char-int (char-after))))
+		  (if (eq opcode2 'iinc)
+		    (forward-char 5)
+		    (forward-char 2))))
+	      (t (forward-char (- opcode-length 1))))))
+    (let ((num-exceptions (jde-parse-class-get-next-length-val)))
+      (dotimes (i num-exceptions)
+	(let ((type (cdr (assoc 'catch-type
+				 (jde-parse-class-get-exception-handler
+				  constants)))))
+	  (when type
+	    (add-to-list 'catch-types type)))))
+    (let ((attributes (jde-parse-class-get-attributes constants)))
+      ;; Get the line numbers if there, if not use -1's to iondicate no line number
+      (let ((table (when (assoc 'line-number-table attributes)
+		     (cdr (assoc 'line-number-table attributes)))))
+	(list (cons
+	       'calls
+	       (mapcar (lambda (call)
+		  (if table
+		    ;; The line numbers describe the instruction at
+		    ;; the start of the line, not every instruction
+
+		    ;; Advance in the table when the next byte
+		    ;; described is higher than the current one
+		    (progn (while (and (cadr table)
+				       (>= (car call) (caadr table)))
+			     (setq table (cdr table)))
+			   (cons (cdar table) (cdr call)))
+		    (cons -1 (cdr call)))) (nreverse calls)))
+	      (cons 'catch-types catch-types))))))
+
+(defun jde-parse-class-get-exception-handler (constants)
+  (list (cons 'start-pc (jde-parse-class-get-next-2-bytes))
+    (cons 'end-pc (jde-parse-class-get-next-2-bytes))
+    (cons 'handler-pc (jde-parse-class-get-next-2-bytes))
+    (cons 'catch-type (let ((val (jde-parse-class-get-next-2-bytes)))
+			(when (> val 0)
+			  (cadr (jde-parse-class-lookup-constant
+				 (cadr (jde-parse-class-lookup-constant val constants))
+			      constants)))))))
+
+(defun jde-parse-class-parse-first-arg (sig)
+  (let ((char (char-to-string (string-to-char sig))))
+    (cond ((equal char "B") `("byte" . 1))
+	  ((equal char "C") `("char" . 1))
+	  ((equal char "D") `("double" . 1))
+	  ((equal char "F") `("float" . 1))
+	  ((equal char "I") `("int" . 1))
+	  ((equal char "J") `("long" . 1))
+	  ((equal char "L") (let ((endpos (string-match ";" sig)))
+			      (cons (jde-parse-class-slash-to-dot
+				     (substring sig 1
+						endpos))
+				    (+ 1 endpos))))
+	  ((equal char "S") `("short" . 1))
+	  ((equal char "Z") `("boolean" . 1))
+	  ((equal char "[") (let ((rest (jde-parse-class-parse-first-arg
+					 (substring sig 1))))
+			      (cons (concat (car rest) "[]") (+ (cdr rest) 1))))
+	    (t (error (concat "Could not find char " char))))))
+
+(defun jde-parse-class-parse-arg-signature (sig)
+  (when (> (length sig) 0)
+    (let ((arg (jde-parse-class-parse-first-arg sig)))
+      (if (> (cdr arg) (length sig))
+	(list (car arg))
+	(cons (car arg) (jde-parse-class-parse-arg-signature
+			 (substring sig (cdr arg))))))))
+
+
+(defun jde-parse-class-parse-complete-arg-signature (sig)
+  (let* ((match (string-match "(\\(.*\\))\\(.*\\)" sig)))
+    (if match
+      (let ((args (match-string 1 sig))
+	    (return-val (match-string 2 sig)))
+	(list (unless (equal "V" return-val)
+		(car (jde-parse-class-parse-arg-signature return-val)))
+	      (jde-parse-class-parse-arg-signature args)))
+      (list nil (jde-parse-class-parse-arg-signature sig)))))
+
+
+(defun jde-parse-class-parse-method-signature (siglist)
+  `(,(jde-parse-class-slash-to-dot (car siglist))
+    ,(cadr siglist) ,@(jde-parse-class-parse-complete-arg-signature
+		      (nth 2 siglist))))
+
+(defun jde-parse-class-lookup-method (method constants)
+  (list (cadr (jde-parse-class-lookup-constant
+	       (cadr (jde-parse-class-lookup-constant
+		       (cadr method) constants))
+	       constants))
+	(cadr (jde-parse-class-lookup-constant
+	       (cadr
+		(jde-parse-class-lookup-constant (nth 2 method) constants))
+	       constants))
+	(cadr (jde-parse-class-lookup-constant
+	       (nth 2
+		(jde-parse-class-lookup-constant (nth 2 method) constants))
+	       constants))))
+
+(defun get-bit-flags-for-byte (byte flag-vec)
+  "Gets the bit flags for BYTE, given the flags that apply to each bit,
+a vector of length 8 (one for each bit).  Nulls in the FLAG-VEC are
+taken to mean there is no flag for that byte, which causes the byte to be
+ignored.
+
+For example: (get-bit-flags-for-byte 6 ['a 'b 'c 'd 'e 'f 'g 'h])
+returns ('f 'g)"
+  (let ((flags '()))
+    (dotimes (i 8 flags)
+      (when (and (aref flag-vec (- 7 i))
+		 (> (logand (expt 2 i)  byte) 0))
+	(add-to-list 'flags (aref flag-vec (- 7 i)))))))
+
+(defun jde-parse-class-get-access-flags ()
+  (do-and-advance-chars 2
+    (let ((raw0 (char-int (char-after (point))))
+	  (raw1 (char-int (char-after (+ (point) 1)))))
+      (append
+       (get-bit-flags-for-byte raw0
+			       [nil nil nil nil 'string 'abstract
+				    'interface 'native])
+       (get-bit-flags-for-byte raw1
+			       ['transient 'volatile 'synchronized 'final
+					   'static 'protected
+					   'private 'public])))))
+
+(defun jde-parse-class-get-version ()
+  "Return a list - (major-version minor-version)"
+  (list (jde-parse-class-get-2byte 5)
+		  (jde-parse-class-get-2byte 7)))
+
+(defun jde-parse-class-get-2byte (point)
+  "Gets the value of two bytes (0 - 65535) as an int"
+  (let ((b1 (char-int (char-after point)))
+	(b2 (char-int (char-after (+ 1 point)))))
+    (+ (* b1 256) b2)))
+
+(defun jde-parse-class-get-next-2-bytes ()
+  (do-and-advance-chars 2
+    (jde-parse-class-get-2byte (point))))
+
+(defun jde-parse-class-get-4byte (point &optional ignore-large-val)
+  (let ((db1 (jde-parse-class-get-2byte point))
+	(db2 (jde-parse-class-get-2byte (+ 2 point))))
+    (if (< db1 2047)
+      ;; don't go over the maxint in elisp (2047, since we have 1 more db1 could be 65536)
+      (+ (* 65536 db1) db2)
+      (if ignore-large-val
+	0
+	(error "Class file has a larger 4 byte value then emacs can handle")))))
+
+(defun jde-parse-class-get-next-4-bytes-as-signed (&optional ignore-large-val)
+  (let ((db1 (jde-parse-class-get-next-2-bytes))
+	(db2 (jde-parse-class-get-next-2-bytes)))
+    (if (> (logand 32768 db1) 0)  ;; if its high-bit is set, then it's negative.
+      (if (> db1 63488)
+	(- (+ 1 (+ (* (- 65535 db1) 65536) (- 65535 db2))))
+	(if ignore-large-val
+	  0
+	  (error "Class file has an unsigned int who is smaller than emacs can handle")))
+      (jde-parse-class-get-4byte (- (point) 4)))))
+
+(defun jde-parse-class-diff-next-two-4-bytes-as-signed ()
+  (let ((low1 (jde-parse-class-get-next-2-bytes))
+        (low2 (jde-parse-class-get-next-2-bytes))
+        (high1 (jde-parse-class-get-next-2-bytes))
+        (high2 (jde-parse-class-get-next-2-bytes)))
+    (if (and (> (logand 32768 low1) 0)
+             (<= (logand 32768 high1) 0))
+        (+ (* 65536 (- (+ high1 65535) low1)) (- (+ high2 65536) low2))
+      (+ (* 65535 (- high1 low1)) (- high2 low2)))))
+
+(defun jde-parse-class-get-next-4-bytes (&optional ignore-large-val)
+  (do-and-advance-chars 4
+    (jde-parse-class-get-4byte (point) ignore-large-val)))
+
+(defun jde-parse-class-get-constants ()
+  "Returns a list of the constant ending location (not inclusive of
+of the constants) and a vector of all constants"
+  (let* ((count (- (jde-parse-class-get-2byte 9) 1))
+	 (const-vec (make-vector count '())))
+    (goto-char 11) ;; start of constants
+    (dotimes (i count const-vec)
+      (let ((const (jde-parse-class-get-next-constant)))
+	(aset const-vec i const)
+	;; doubles and longs take up two places on the const table.
+	(when (or (eq (car const) 'double)
+		  (eq (car const) 'long))
+	  (aset const-vec (+ 1 i) nil)
+	  (setq i (+ 1 i)))))))
+
+(defsubst jde-parse-class-get-long-constant (&optional ignore-large-val)
+  (let ((qb1 (jde-parse-class-get-next-4-bytes ignore-large-val))
+	(qb2 (jde-parse-class-get-next-4-bytes ignore-large-val)))
+    (if (> qb2 0)
+      (if ignore-large-val
+	0
+	(error "Class file has a large 8 byte value than emacs can handle"))
+      qb1)))
+
+(defsubst jde-parse-class-get-double-constant ()
+  "NOT IMPLEMENTED YET"
+  (do-and-advance-chars 8
+    "0.0"))
+
+(defsubst jde-parse-class-get-ref-constant ()
+  (list (jde-parse-class-get-next-2-bytes) (jde-parse-class-get-next-2-bytes)))
+
+(defsubst jde-parse-class-get-float-constant ()
+  "NOT IMPLEMENTED YET"
+  (do-and-advance-chars 4
+    "0.0"))
+
+(defsubst jde-parse-class-get-nameandtype-constant ()
+  (list (jde-parse-class-get-next-2-bytes) (jde-parse-class-get-next-2-bytes)))
+
+(defsubst jde-parse-class-get-utf8-constant ()
+  (let* ((len (jde-parse-class-get-next-2-bytes))
+	 (result (encode-coding-string (buffer-substring (point)
+							(+ len (point)))
+				       jde-parse-class-encoding)))
+    (goto-char (+ len (point)))
+    result))
+
+(defun jde-parse-class-get-next-constant ()
+  (let ((const-type (char-int (char-after (point)))))
+    (forward-char)
+    (cond ((eq const-type 7)
+	    `(class ,(jde-parse-class-get-next-2-bytes)))
+	  ((eq const-type 9)
+	    `(field ,@(jde-parse-class-get-ref-constant)))
+	  ((eq const-type 10)
+	    `(method ,@(jde-parse-class-get-ref-constant)))
+	  ((eq const-type 11)
+	    `(interface-method ,@(jde-parse-class-get-ref-constant)))
+	  ((eq const-type 8)
+	    `(string ,(jde-parse-class-get-next-2-bytes)))
+	  ((eq const-type 3)
+	    `(integer ,(jde-parse-class-get-next-4-bytes t)))
+	  ((eq const-type 4)
+	    `(float ,(jde-parse-class-get-float-constant)))
+	  ((eq const-type 5)
+	    `(long ,(jde-parse-class-get-long-constant t)))
+	  ((eq const-type 6)
+	    `(double ,(jde-parse-class-get-double-constant)))
+	  ((eq const-type 12)
+	    `(name-and-type ,@(jde-parse-class-get-nameandtype-constant)))
+	  ((eq const-type 1)
+	    `(utf8 ,(jde-parse-class-get-utf8-constant))))))
+
+(defconst jde-parse-class-opcode-vec
+  [(nop . 1)  ;; 0
+   (aconst_null . 1) ;; 1
+   (iconst_m1 . 1)  ;; 2
+   (iconst_0 . 1)  ;; 3
+   (iconst_1 . 1)  ;; 4
+   (iconst_2 . 1)  ;; 5
+   (iconst_3 . 1)  ;; 6
+   (iconst_4 . 1)  ;; 7
+   (iconst_5 . 1)  ;; 8
+   (lconst_0 . 1)  ;; 9
+   (lconst_1 . 1)  ;; 10
+   (fconst_0 . 1)  ;; 11
+   (fconst_1 . 1)  ;; 12
+   (fconst_2 . 1)  ;; 13
+   (dconst_0 . 1)  ;; 14
+   (dconst_1 . 1)  ;; 15
+   (bipush . 2)  ;; 16
+   (sipush . 3)  ;; 17
+   (ldc . 2)  ;; 18
+   (ldc_w . 3)  ;; 19
+   (ldc2_w . 3)  ;; 20
+   (iload . 2)  ;; 21
+   (lload . 2)  ;; 22
+   (fload . 2)  ;; 23
+   (dload . 2)  ;; 24
+   (aload . 2)  ;; 25
+   (iload_0 . 1)  ;; 26
+   (iload_1 . 1)  ;; 27
+   (iload_2 . 1)  ;; 28
+   (iload_3 . 1)  ;; 29
+   (lload_0 . 1)  ;; 30
+   (lload_1 . 1)  ;; 31
+   (lload_2 . 1)  ;; 32
+   (lload_3 . 1)  ;; 33
+   (fload_0 . 1)  ;; 34
+   (fload_1 . 1)  ;; 35
+   (fload_2 . 1)  ;; 36
+   (fload_3 . 1)  ;; 37
+   (dload_0 . 1)  ;; 38
+   (dload_1 . 1)  ;; 39
+   (dload_2 . 1)  ;; 40
+   (dload_3 . 1)  ;; 41
+   (aload_0 . 1)  ;; 42
+   (aload_1 . 1)  ;; 43
+   (aload_2 . 1)  ;; 44
+   (aload_3 . 1)  ;; 45
+   (iaload . 1)  ;; 46
+   (laload . 1)  ;; 47
+   (faload . 1)  ;; 48
+   (daload . 1)  ;; 49
+   (aaload . 1)  ;; 50
+   (baload . 1)  ;; 51
+   (caload . 1)  ;; 52
+   (saload . 1)  ;; 53
+   (istore . 2)  ;; 54
+   (lstore . 2)  ;; 55
+   (fstore . 2)  ;; 56
+   (dstore . 2)  ;; 57
+   (astore . 2)  ;; 58
+   (istore_0 . 1)  ;; 59
+   (istore_1 . 1)  ;; 60
+   (istore_2 . 1)  ;; 61
+   (istore_3 . 1)  ;; 62
+   (lstore_0 . 1)  ;; 63
+   (lstore_1 . 1)  ;; 64
+   (lstore_2 . 1)  ;; 65
+   (lstore_3 . 1)  ;; 66
+   (fstore_0 . 1)  ;; 67
+   (fstore_1 . 1)  ;; 68
+   (fstore_2 . 1)  ;; 69
+   (fstore_3 . 1)  ;; 70
+   (dstore_0 . 1)  ;; 71
+   (dstore_1 . 1)  ;; 72
+   (dstore_2 . 1)  ;; 73
+   (dstore_3 . 1)  ;; 74
+   (astore_0 . 1)  ;; 75
+   (astore_1 . 1)  ;; 76
+   (astore_2 . 1)  ;; 77
+   (astore_3 . 1)  ;; 78
+   (iastore . 1)  ;; 79
+   (lastore . 1)  ;; 80
+   (fastore . 1)  ;; 81
+   (dastore . 1)  ;; 82
+   (aastore . 1)  ;; 83
+   (bastore . 1)  ;; 84
+   (castore . 1)  ;; 85
+   (sastore . 1)  ;; 86
+   (pop . 1)  ;; 87
+   (pop2 . 1)  ;; 88
+   (dup . 1)  ;; 89
+   (dup_x1 . 1)  ;; 90
+   (dup_x2 . 1)  ;; 91
+   (dup2 . 1)  ;; 92
+   (dup2_x1 . 1)  ;; 93
+   (dup2_x2 . 1)  ;; 94
+   (swap . 1)  ;; 95
+   (iadd . 1)  ;; 96
+   (ladd . 1)  ;; 97
+   (fadd . 1)  ;; 98
+   (dadd . 1)  ;; 99
+   (isub . 1)  ;; 100
+   (lsub . 1)  ;; 101
+   (fsub . 1)  ;; 102
+   (dsub . 1)  ;; 103
+   (imul . 1)  ;; 104
+   (lmul . 1)  ;; 105
+   (fmul . 1)  ;; 106
+   (dmul . 1)  ;; 107
+   (idiv . 1)  ;; 108
+   (ldiv . 1)  ;; 109
+   (fdiv . 1)  ;; 110
+   (ddiv . 1)  ;; 111
+   (irem . 1)  ;; 112
+   (lrem . 1)  ;; 113
+   (frem . 1)  ;; 114
+   (drem . 1)  ;; 115
+   (ineg . 1)  ;; 116
+   (lneg . 1)  ;; 117
+   (fneg . 1)  ;; 118
+   (dneg . 1)  ;; 119
+   (ishl . 1)  ;; 120
+   (lshl . 1)  ;; 121
+   (ishr . 1)  ;; 122
+   (lshr . 1)  ;; 123
+   (iushr . 1)  ;; 124
+   (lushr . 1)  ;; 125
+   (iand . 1)  ;; 126
+   (land . 1)  ;; 127
+   (ior . 1)  ;; 128
+   (lor . 1)  ;; 129
+   (ixor . 1)  ;; 130
+   (lxor . 1)  ;; 131
+   (iinc . 3)  ;; 132
+   (i2l . 1)  ;; 133
+   (i2f . 1)  ;; 134
+   (i2d . 1)  ;; 135
+   (l2i . 1)  ;; 136
+   (l2f . 1)  ;; 137
+   (l2d . 1)  ;; 138
+   (f2i . 1)  ;; 139
+   (f2l . 1)  ;; 140
+   (f2d . 1)  ;; 141
+   (d2i . 1)  ;; 142
+   (d2l . 1)  ;; 143
+   (d2f . 1)  ;; 144
+   (i2b . 1)  ;; 145
+   (i2c . 1)  ;; 146
+   (i2s . 1)  ;; 147
+   (lcmp . 1)  ;; 148
+   (fcmpl . 1)  ;; 149
+   (fcmpg . 1)  ;; 150
+   (dcmpl . 1)  ;; 151
+   (dcmpg . 1)  ;; 152
+   (ifeq . 3)  ;; 153
+   (ifne . 3)  ;; 154
+   (iflt . 3)  ;; 155
+   (ifge . 3)  ;; 156
+   (ifgt . 3)  ;; 157
+   (ifle . 3)  ;; 158
+   (if_icmpeq . 3)  ;; 159
+   (if_icmpne . 3)  ;; 160
+   (if_icmplt . 3)  ;; 161
+   (if_icmpge . 3)  ;; 162
+   (if_icmpgt . 3)  ;; 163
+   (if_icmple . 3)  ;; 164
+   (if_acmpeq . 3)  ;; 165
+   (if_acmpne . 3)  ;; 166
+   (goto . 3)  ;; 167
+   (jsr . 3)  ;; 168
+   (ret . 2)  ;; 169
+   (tableswitch . -1)  ;; 170  - variable length instruction
+   (lookupswitch . -1)  ;; 171   - variable length instruction
+   (ireturn . 1)  ;; 172
+   (lreturn . 1)  ;; 173
+   (freturn . 1)  ;; 174
+   (dreturn . 1)  ;; 175
+   (areturn . 1)  ;; 176
+   (return . 1)  ;; 177
+   (getstatic . 3)  ;; 178
+   (putstatic . 3)  ;; 179
+   (getfield . 3)  ;; 180
+   (putfield . 3)  ;; 181
+   (invokevirtual . 3)  ;; 182
+   (invokespecial . 3)  ;; 183
+   (invokestatic . 3)  ;; 184
+   (invokeinterface . 5)  ;; 185
+   (unused . -1) ;; 186
+   (new . 3)  ;; 187
+   (newarray . 2)  ;; 188
+   (anewarray . 3)  ;; 189
+   (arraylength . 1)  ;; 190
+   (athrow . 1) ;; 191
+   (checkcast . 3) ;; 192
+   (instanceof . 3)  ;; 193
+   (monitorcenter . 1)  ;; 194
+   (monitorexit . 1)  ;; 195
+   (wide . -1)  ;; 196   - variable length instruction
+   (multianewarray . 4)  ;; 197
+   (ifnull . 3)  ;; 198
+   (ifnonnull . 3)  ;; 199
+   (goto_w . 5)  ;; 200
+   (jsr_w . 5)  ;; 201
+   ]
+  "A vector storing the java opcodes.  Each position in the vector is
+in the position of it's bytecode number.  For example, if, when
+reading a class file we come across bytecode 0, we can just look at
+this vector to see both the name of the instruction, and the size of
+the operation in bytes.  A few opcodes have variable length, so those
+must be calculated at runtime.")
+
+(provide 'jde-parse-class)
+
+;; End of jde-parse-class.el
diff --git a/site/jdee/lisp/jde-parse-class.elc b/site/jdee/lisp/jde-parse-class.elc
new file mode 100644
index 0000000..5ddfb22
Binary files /dev/null and b/site/jdee/lisp/jde-parse-class.elc differ
diff --git a/site/jdee/lisp/jde-parse-expr.el b/site/jdee/lisp/jde-parse-expr.el
new file mode 100644
index 0000000..dc622ee
--- /dev/null
+++ b/site/jdee/lisp/jde-parse-expr.el
@@ -0,0 +1,249 @@
+;;; jde-parse-expr.el -- Beanshell JDEE integration.
+;; $Id: jde.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Landes <landes <at> mailc dot net>
+;; Maintainer: Paul Landes
+;; Keywords: java, tools, parse expression
+
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This library has beanshell specific functionality.  Most of it was taken
+;; from jde.el and placed here in an attempt to make jde.el a little skinner
+;; and make a home for beanshell specific code.
+
+;;; Code:
+
+(require 'thingatpt)
+
+(defun jde-beginning-of-expression ()
+  (c-beginning-of-statement))
+(put 'java-expression 'beginning-op 'jde-beginning-of-expression)
+
+(defun jde-end-of-expression ()
+  (c-end-of-statement))
+(put 'java-expression 'end-op 'jde-end-of-expression)
+
+;;;###autoload
+(defun jde-hungarian-to-reverse-camel-notation (start end local-replacement-p)
+  "\
+Converts Hungarian (i.e. m_sMyApp) to reverse camel notation (i.e. myApp).
+Hungarian notation is used, for example, in most Microsoft visual C++ code
+whereas reverse camel notation is used as the Sun Java standard style.
+
+START the start of the buffer region
+END is the end of the buffer region
+LOCAL-REPLACEMENT-P, if non-nil, replace expecting a local variable
+replacement.  This adds a `this.' to each replacment."
+  (interactive
+   (if (not mark-active)
+       (error "No region selected")
+     (list (region-beginning) (region-end) current-prefix-arg)))
+  (let ((case-fold-search nil)
+	(reg "\\(?:oa\\|[onbfs]\\)\\([A-Z]\\)\\([a-zA-Z0-9]+\\)"))
+    (save-excursion
+      (save-restriction
+	(narrow-to-region start end)
+	(save-match-data
+	  (goto-char (point-min))
+	  (while (re-search-forward (concat "m_" reg) nil t)
+	    (replace-match (concat (and local-replacement-p "this.")
+				   (downcase (match-string 1))
+				   (match-string 2))))
+	  (goto-char (point-min))
+	  (while (re-search-forward (concat "\\<" reg "\\>") nil t)
+	    (replace-match (concat (downcase (match-string 1))
+				   (match-string 2)))))))))
+
+(defun jde-split-by-camel-notation (to-parse)
+  "Parse tokens based on \(reverse) camel notation.
+TO-PARSE is the string to parse."
+  (if (or nil (= 0 (length to-parse)))
+      nil
+    (let ((last-cap 0)
+	  toks)
+      (setq to-parse (append (vconcat to-parse) nil))
+      (flet ((upperp
+	      (pos)
+	      (if (<= pos 0)
+		  t
+		(let ((char (elt to-parse pos)))
+		  (and (eq char (upcase char))))))
+	     (handle
+	      (pos)
+	      (prog1
+		  (apply 'string (subseq to-parse last-cap pos))
+		(setq last-cap pos))))
+	(do ((pos 0 (incf pos)))
+	    ((> pos (1- (length to-parse))))
+	  (if (and (upperp pos)
+		   ;;(> (- pos last-cap) 2))
+		   (> (- pos last-cap) 0))
+	      (setq toks (append toks (cons (handle pos) nil)))))
+	(append toks (cons (handle (length to-parse)) nil))))))
+
+(defconst jde-camel-tok-skip-chars " \t\n().'\""
+  "Characters used top a traveral of a reverse camel notation string." )
+
+(defun jde-beginning-of-camel-tok ()
+  "Go to the beginning of a reverese camel case token."
+  (interactive)
+  (let ((space-regex (format "[%s]" jde-camel-tok-skip-chars))
+	(n-space-regex (format "[^%s]" jde-camel-tok-skip-chars))
+	start end reg toks)
+    (save-excursion
+      (save-match-data
+	(if (and (> (point) (- 2 (point-min)))
+		 (save-excursion
+		   (forward-char -1)
+		   (looking-at space-regex)))
+	    (re-search-backward n-space-regex nil t))
+	(setq end (point))
+	(setq start (or (when (re-search-backward space-regex nil t)
+			  (forward-char 1)
+			  (point))
+			(point-min)))))
+    (setq reg (buffer-substring start end)
+	  toks (jde-split-by-camel-notation reg))
+    (goto-char (- end (length (car (last toks)))))))
+
+(defun jde-end-of-camel-tok ()
+  "Go to the beginning of a reverese camel case token."
+  (interactive)
+  (let ((space-regex (format "[%s]" jde-camel-tok-skip-chars))
+	(n-space-regex (format "[^%s]" jde-camel-tok-skip-chars)))
+    (if (looking-at space-regex) (re-search-forward n-space-regex))
+    (let ((start (point))
+	  (end (or (save-excursion
+		     (save-match-data
+		       (re-search-forward space-regex nil t)))
+		   (point-max)))
+	  reg toks)
+      (setq reg (buffer-substring start end)
+	    toks (jde-split-by-camel-notation reg))
+      (goto-char (+ start (length (car toks)))))))
+
+(defun jde-forward-camel-tok (arg)
+  "Go forward a reverse camel case token."
+  (interactive "p")
+  (dotimes (i arg) (jde-end-of-camel-tok)))
+
+(defun jde-backward-camel-tok (arg)
+  "Go back a reverse camel case token."
+  (interactive "p")
+  (dotimes (i arg) (jde-beginning-of-camel-tok)))
+
+(defun jde-kill-camel-tok ()
+  "Kill a reverse camel case token."
+  (interactive)
+  (delete-region (point) (save-excursion (jde-end-of-camel-tok))))
+
+(defun jde-backward-kill-camel-tok ()
+  "Go back a reverse camel case token and kill."
+  (interactive)
+  (delete-region (save-excursion (jde-beginning-of-camel-tok)) (point)))
+
+(defun jde-map-camel-notation-token (start end iter-fn delimiter)
+  "Helper method to remove and add back tokesn with a delimiter.
+Operates on the current buffer.
+
+START the beginning of the region.
+END the end of the region.
+
+ITER-FN the function used to map over to create the string to add
+back after the deletion.  This is usually something like
+`upcaes'.  The function takes the camel token.
+
+DELIMITER the delimiter used to place between each camel token."
+  (let ((toks (jde-split-by-camel-notation
+	       (buffer-substring start end))))
+    (save-excursion
+      (delete-region start end)
+      (goto-char start)
+      (insert (mapconcat iter-fn toks delimiter)))))
+
+(defun jde-parse-expr-get-region-or-thing (thing)
+  (if mark-active
+      (list (region-beginning) (region-end))
+    (let ((cell (bounds-of-thing-at-point thing)))
+      (list (car cell) (cdr cell)))))
+
+;;;###autoload
+(defun jde-camel-to-sql (start end)
+  "Convert from reverse camel notation to the SQL underscore convention."
+  (interactive (jde-parse-expr-get-region-or-thing 'word))
+  (jde-map-camel-notation-token start end 'downcase "_"))
+
+;;;###autoload
+(defun jde-camel-to-c-const (start end)
+  "Convert from reverse camel notation to the C constant convention."
+  (interactive (jde-parse-expr-get-region-or-thing 'word))
+  (jde-map-camel-notation-token start end 'upcase "_"))
+
+;;;###autoload
+(defun jde-camel-to-lisp (start end)
+  "Convert from reverse camel notation to the lisp symbol convention."
+  (interactive (jde-parse-expr-get-region-or-thing 'word))
+  (jde-map-camel-notation-token start end 'downcase "-"))
+
+(defun jde-camel-to-java-property (start end)
+  "Convert from reverse camel notation to the Java properties convention."
+  (interactive (jde-parse-expr-get-region-or-thing 'symbol))
+  (let ((str (buffer-substring start end)))
+    (save-excursion
+      (goto-char start)
+      (delete-region start end)
+      (insert (downcase (replace-regexp-in-string "_" "." str nil t))))))
+
+;;;###autoload
+(defun jde-member-to-attribute (member-name getterp)
+  "Convert Java member to a getter or setter syntax.
+
+MEMBER-NAME is member to convret.  This is taken as the current word at point
+when called interactively.
+
+GETTERP, if non-nil, make it a getter, otherwise make it a setter.  If
+\\[universal-argument] is used while calling interactively, then make it a
+setter, otherwise, make a getter."
+  (interactive (list (thing-at-point 'word) (not current-prefix-arg)))
+  (let* ((toks (jde-split-by-camel-notation member-name))
+	 (attr (apply 'concat
+		      (append (list (if getterp "get" "set")
+				    (capitalize (substring (car toks) 0 1))
+				    (substring (car toks) 1))
+			      (cdr toks)))))
+    (if (interactive-p)
+	(let ((bounds (bounds-of-thing-at-point 'word)))
+	  (delete-region (car bounds) (cdr bounds))
+	  (insert (concat attr "(" (if getterp ")")))))
+    attr))
+
+(eval-after-load
+    "jde"
+  '(progn
+     ;; wait until jde-mode-map is defined in jde.el
+
+     ;; clobbers `kill-word'
+     (define-key jde-mode-map "\M-d" 'jde-kill-camel-tok)
+     ;; clobbers `backward-kill-word'
+     (define-key jde-mode-map [M-backspace] 'jde-backward-kill-camel-tok)))
+
+(provide 'jde-parse-expr)
+
+;; End of jde-parse-expr.el
diff --git a/site/jdee/lisp/jde-parse-expr.elc b/site/jdee/lisp/jde-parse-expr.elc
new file mode 100644
index 0000000..e12bca5
Binary files /dev/null and b/site/jdee/lisp/jde-parse-expr.elc differ
diff --git a/site/jdee/lisp/jde-parse.el b/site/jdee/lisp/jde-parse.el
new file mode 100644
index 0000000..f93865a
--- /dev/null
+++ b/site/jdee/lisp/jde-parse.el
@@ -0,0 +1,1745 @@
+;;; jde-parse.el
+;; $Id: jde-parse.el 180 2009-12-27 02:12:56Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(require 'semantic-sb)
+(require 'semantic-ctxt)
+(if (< emacs-major-version 23)
+    (progn
+      (require 'avltree)  ;; use elib's avltree with local compatibility kludges
+      (defalias 'avl-tree-clear   'avltree-clear)
+      (defalias 'avl-tree-copy    'avltree-copy)
+      (defalias 'avl-tree-create  'avltree-create)
+      (defalias 'avl-tree-delete  'avltree-delete)
+      (defalias 'avl-tree-empty   'avltree-empty)
+      (defalias 'avl-tree-enter   'avltree-enter)
+      (defalias 'avl-tree-first   'avltree-first)
+      (defalias 'avl-tree-flatten 'avltree-flatten)
+      (defalias 'avl-tree-last    'avltree-last)
+      (defalias 'avl-tree-map     'avltree-map)
+      (defalias 'avl-tree-member  'avltree-member)
+      (defalias 'avl-tree-size    'avltree-size))
+  (require 'avl-tree)) ;; use emacs's avl-tree
+(require 'thingatpt)
+(require 'eieio)
+(require 'jde-imenu)                    ; All the imenu stuff is here now!
+(require 'efc)
+(jde-require 'sregex)
+
+(defcustom jde-auto-parse-enable t
+  "Enables automatic reparsing of a Java source buffer.
+After you makes changes to the buffer, but only if the buffer is less
+than `jde-auto-parse-max-buffer-size'."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-auto-parse-buffer-interval 180
+  "Time in seconds between buffer change and reparse.
+That is between the time between you change a Java source buffer and
+the time the JDE reparses the buffer."
+  :group 'jde-project
+  :type 'number)
+
+(defcustom jde-auto-parse-max-buffer-size 50000
+  "Maximum size in bytes of buffers automatically reparsed.
+Used when `jde-auto-parse-enable' is non-nil.  Setting the threshold
+to 0 causes the JDE to parse a buffer automatically regardless of its
+size."
+  :group 'jde-project
+  :type 'number)
+
+(defvar jde-parse-buffer-needs-reparse-p nil
+  "non-nil if buffer changed since last parse.")
+(make-variable-buffer-local 'jde-parse-buffer-needs-reparse-p)
+
+(defvar jde-auto-parse-buffer-timer nil
+  "Timer used to schedule automatic reparse.")
+(make-variable-buffer-local 'jde-auto-parse-buffer-timer)
+
+(defvar jde-parse-casting nil
+  "Variable use to determined when the variable was casted")
+
+(defvar jde-parse-current-beginning (make-marker)
+  "The beginning of the region where the last completion was inserted.")
+
+(defvar jde-parse-current-end (make-marker)
+  "The end of the region where the last completion was inserted.")
+
+(defvar jde-parse-primitive-types '("byte" "char" "double" "float"
+				    "int" "long" "short" "boolean")
+  "Primitive Java types.")
+
+(defvar jde-parse-attempted-to-import nil
+  "Variable use to avoid looping in jde-parse-eval-type-of when
+the type of a class could not be found an it tried to import it")
+
+;; (makunbound 'jde-parse-java-symbol-re)
+(defvar jde-parse-java-symbol-re
+  (sregexq
+   (1+              ;; A Java symbol comprises one or more of the following:
+    (char (?A . ?Z)   ;;   - upper case characters
+	  (?a . ?z)   ;;   - lower case characters
+	  (?0 . ?9)   ;;   - digits
+	  "[]"        ;;   - square brackets
+	  "?"         ;;   - question mark
+	  "_"         ;;   - underscore
+	  "."         ;;   - period
+	  (160 . 255) ;;   - accented characters
+	  )))
+"Regular expression that matches any Java symbol.")
+
+(defun jde-parse-after-buffer-changed ()
+  "Reparse the current buffer after any change.
+Called after `jde-auto-parse-buffer-interval' seconds following a
+buffer change if `jde-auto-parse-enable' is non-nil and buffer size
+match `jde-auto-parse-max-buffer-size' threshold."
+  ;; This function should be called only in JDE buffers
+  ;; but for some reason it is called in every buffer
+  ;; in some versions of XEmacs. Hence the following
+  ;; guard.
+  (if (eq major-mode 'jde-mode)
+      (semantic-fetch-tags)))
+
+(defsubst jde-parse-should-auto-parse-buffer-p ()
+  "Return non-nil if the JDE should automatically reparse the buffer."
+  (and jde-auto-parse-enable
+       (or
+	(<= jde-auto-parse-max-buffer-size 0)
+	(< (buffer-size) jde-auto-parse-max-buffer-size))))
+
+;;; Compatibility
+(eval-when (compile)
+  (if (featurep 'xemacs)
+      ;; XEmacs
+      (defsubst jde-auto-parse-delay ()
+	"Return the time in seconds before auto-parse triggering."
+	;; Wake up the timer driver so it updates timer value
+	(itimer-driver-wakeup)
+	(itimer-value jde-auto-parse-buffer-timer))
+    ;; GNU Emacs
+    (defsubst jde-auto-parse-delay ()
+      "Return the time in seconds before auto-parse triggering."
+      (- (timer-until jde-auto-parse-buffer-timer (current-time))))))
+
+(defun jde-parse-buffer-changed-hook (begin end length)
+  "Hook run when Semantic detects a change in the current buffer.
+BEGIN and END are respectively the beginning and end of the range of
+changed text. LENGTH is the length in bytes of the pre-change text
+replaced by that range.  See also `semantic-change-hooks'."
+  ;; This function should be called only in JDE buffers
+  ;; but for some reason it is called in every buffer
+  ;; in some versions of XEmacs. Hence the following
+  ;; guard.
+  (when (eq major-mode 'jde-mode)
+    (setq jde-parse-buffer-needs-reparse-p t)
+    (when (jde-parse-should-auto-parse-buffer-p)
+      (if (timerp jde-auto-parse-buffer-timer)
+	  (let ((rem (jde-auto-parse-delay)))
+	    (cond
+	     ((< rem 0)
+	      ;; Timer has expired, re-schedule a new auto-parse.
+	      (cancel-timer jde-auto-parse-buffer-timer)
+	      (setq jde-auto-parse-buffer-timer nil))
+	     ((< rem 2) ;; less that 2 secs. before auto-parse
+	      ;; The auto-parse task is about to be triggered when
+	      ;; this change occurs, so it is delayed to let finish
+	      ;; typing before re-parsing.
+	      (timer-inc-time jde-auto-parse-buffer-timer
+			      10) ;; wait 10 secs. more.
+	      (message "Auto parse delayed...")))))
+      ;; Schedule a new auto-parse task.
+      (or (timerp jde-auto-parse-buffer-timer)
+	  (setq jde-auto-parse-buffer-timer
+		(run-with-timer
+		 jde-auto-parse-buffer-interval
+		 nil
+		 #'jde-parse-after-buffer-changed))))))
+
+(defun jde-parse-buffer-contains-multiple-classes-p ()
+  "Return non-nil if buffer contains multiple class definitions."
+  (let* ((top-level-classes
+	  (semantic-find-nonterminal-by-token
+	   'type
+	   (semantic-fetch-tags)))
+	 (top-level-class-count (length top-level-classes)))
+    (or
+     (>  top-level-class-count 1)
+     (and
+      (= top-level-class-count 1)
+      (let* ((inner-class-parts (semantic-tag-type-members (car top-level-classes)))
+	     (inner-classes
+	      (semantic-find-nonterminal-by-token
+	       'type inner-class-parts)))
+	(>= (length inner-classes) 1))))))
+
+
+(defvar jde-parse-buffer-contains-multiple-classes-p nil
+  "non-nil if buffer contains more than one class definition.")
+(make-variable-buffer-local 'jde-parse-buffer-contains-multiple-classes-p)
+
+
+(defun jde-parse-update-after-parse (tokens)
+  "Hook run after Semantic changed the token cache.
+TOKENS is the list of tokens, new value of the cache.  It can be nil
+when the cache is cleared.
+See also `semantic-after-toplevel-cache-change-hook'."
+  (if (jde-parse-should-auto-parse-buffer-p)
+      (setq jde-parse-buffer-needs-reparse-p nil
+	    jde-auto-parse-buffer-timer
+	    (and (timerp jde-auto-parse-buffer-timer)
+		 (cancel-timer jde-auto-parse-buffer-timer)
+		 nil)))
+  (if (car tokens)
+      (setq jde-parse-buffer-contains-multiple-classes-p
+	    (jde-parse-buffer-contains-multiple-classes-p)
+	    jde-parse-the-method-map
+	    (jde-parse-method-map "Method map"))))
+
+(defun jde-parse-update-after-partial-parse (tokens)
+  "Hook run after Semantic updated the token cache.
+TOKENS is the list of updated tokens.
+See also `semantic-after-partial-cache-change-hook'."
+  (jde-parse-update-after-parse (semantic-fetch-tags)))
+
+
+(defun jde-parse-get-top-of-class (&optional class-regexp no-move-point)
+  "Return the position and optionally go to where the class prototype ends and its
+class definition (contents) begin.
+
+CLASS-REGEXP the class regular expression to use.  This is useful for when the
+source Java files has more than one class.  If this the symbol `first' then
+the first class from the top of the file is used.  If this is nil then the
+class that the point it in is used but errors out if not in a class.
+
+NO-MOVE-POINT if non-nil just the position is returned, otherwise the point is
+moved also."
+  (interactive "sClass name (or enter for first): ")
+
+  (if (eq class-regexp 'first)
+      (setq class-regexp ".*")
+    (if (or (null class-regexp) (= 0 (length class-regexp)))
+	(let* ((class-name (car (jde-parse-get-innermost-class-at-point))))
+	  (if (null class-name) (error "point is not in a class definition"))
+	  (setq class-regexp (regexp-quote class-name)))))
+
+  (let* ((tokens (semantic-fetch-tags))
+	 (classes (semantic-find-nonterminal-by-token 'type tokens))
+	 class-parts pos)
+
+    (setq pos
+	  (save-excursion
+	    (save-match-data)
+	    (block outter
+	      (dolist (class classes)
+		;; Commented out this form because the variable is never
+		;; used, causes a compile error, and I don't know it's purpose.
+		;; (setq token-class-regexp (semantic-tag-name class))
+		(when (or (null class-regexp)
+			  (string-match class-regexp
+					(semantic-tag-name class)))
+		  (let ((class-parts (semantic-tag-type-members class)))
+
+		    (setq pos (semantic-tag-start class))
+
+		    (if (not (numberp pos))
+			(error (concat "invalid token start, probably because "
+				       "not semantic bovinated top level")))
+
+		    (goto-char pos)
+
+		    (if (not (search-forward "{" nil t))
+			(error "invalid class, can't find next `{'"))
+
+		    (return-from outter (point))))))))
+    (if (and (not no-move-point) pos) (goto-char pos))
+    pos))
+
+
+(defun jde-parse-get-nth-member (&optional class-name modifiers
+					   member-name-regexp
+					   elt goto-start-p
+					   compare-method)
+  "Return the point at the Nth class member (field) with given criteria.  The
+first match that is a subset of the modifiers give is choosen.
+
+CLASS-NAME the class that has the member.
+MODIFIERS a list of Java string modifiers (i.e. \"private\").
+MEMBER-NAME-REGEXP regular expresion of the name of the member.
+ELT integer indicating the sequential member to get or ELT from the end if
+negative.
+GOTO-START-P if non-nil return the position at the beginning of the line,
+otherwise return the position at the end of the line.
+COMPARE-METHOD is either the symbols `equal' or `subset'.  This matches the
+MODIFIERS creteria as an exact match or subset.  This defaults to `subset'."
+  (interactive)
+
+  (if (null member-name-regexp) (setq member-name-regexp ".*"))
+
+  (let* ((tokens (semantic-fetch-tags))
+	 (classes (semantic-find-nonterminal-by-token 'type tokens))
+	 cmp-fn vars var-parts var-name var-modifiers i)
+
+    (setq cmp-fn
+	  (cond ((or (null compare-method)
+		     (eq 'subset compare-method))
+		 #'(lambda (modifiers var-modifiers)
+		     (subsetp modifiers var-modifiers :test 'equal)
+		     ))
+		((eq 'equal compare-method)
+		 #'(lambda (modifiers var-modifiers)
+		       (let ((m (copy-tree modifiers))
+			     (v (copy-tree var-modifiers)))
+			 (setq m (sort m 'string<)
+			       v (sort v 'string<))
+			 (equal m v)
+			 )))
+		(t (error "compare-method `%S' not supported"
+			  compare-method))))
+
+    (save-excursion
+      (save-match-data
+	(block outter
+	  (dolist (class classes)
+	    ;; commented out this line because the variable is never bound
+	    ;; nor used and I don't understand it's purpose. Paul Kinnucan.
+	    ;; (setq token-class-name (semantic-tag-name class))
+	    (when (or (null class-name)
+		      (string-equal class-name (semantic-tag-name class)))
+
+	      (setq var-parts (semantic-tag-type-members class)
+		    vars (semantic-find-nonterminal-by-token
+			  'variable var-parts)
+		    i 0)
+
+	      (setq vars
+		    (mapcar
+		     #'(lambda (variable)
+			 (setq var-modifiers
+			       (if modifiers
+				   (semantic-tag-modifiers variable)))
+			 (if (or (and (null var-modifiers) (null modifiers))
+				 (funcall cmp-fn modifiers var-modifiers))
+			     variable)) vars))
+
+	      (setq vars (remove nil vars))
+
+	      (setq elt (cond ((not elt) 0)
+			      ((< elt 0) (+ (length vars) elt))
+			      (t elt)))
+
+	      (dolist (variable vars)
+
+		(setq var-name (semantic-tag-name variable))
+
+		(when (and (= elt i)
+			   (string-match member-name-regexp var-name))
+		  (goto-char (if goto-start-p (semantic-tag-start variable)
+			       (semantic-tag-end variable)))
+		  (return-from outter (point)) )
+
+		(setq i (1+ i))))))))))
+
+
+
+(defun jde-parse-get-member-variables (&optional tag)
+  "Get all member variables of the current class as a semantic tag list.
+The optional parameter `tag' can be a semantic tag, which is
+then used as the current class instead of the result of `semantic-current-tag'."
+  (let ((curtag (or tag (semantic-current-tag))))
+    (remove nil
+	    (mapcar
+	     (lambda (member)
+	       (if (semantic-tag-of-class-p member 'variable)
+		   member
+		 nil))
+	     (semantic-tag-type-members curtag)))))
+
+(defun jde-parse-get-member-functions (&optional tag)
+  "Get all member functions of the current class as a semantic tag list.
+The optional parameter `tag' can be a semantic tag, which is
+then used as the current class instead of the result of `semantic-current-tag'."
+  (let ((curtag (or tag (semantic-current-tag))))
+    (remove nil
+	    (mapcar
+	     (lambda (member) (if (semantic-tag-of-class-p member 'function) member nil))
+	     (semantic-tag-type-members curtag)))))
+
+(defun jde-parse-get-serializable-members (&optional tag)
+  "Get all serializable member variables of the current class as a semantic tag list.
+The optional parameter `tag' can be a semantic tag, which is
+then used as the current class instead of the result of `semantic-current-tag'."
+  (let ((curtag (or tag (semantic-current-tag))))
+    (remove nil
+	    (mapcar
+	     (lambda (member)
+	       (let ((is-variable (semantic-tag-of-class-p member 'variable))
+		     (modifiers (semantic-tag-modifiers member)))
+		 (if (and is-variable (not (or (member "static" modifiers)
+					       (member "transient" modifiers))))
+		     member
+		      nil)))
+	     (semantic-tag-type-members curtag)))))
+
+(defun jde-parse-member-is-scalar (tag)
+  "Check if tag is of a scalar type"
+  (not (or (string-match "\\[.*\\]" (semantic-tag-name tag))
+	   (string-match "\\[.*\\]" (semantic-tag-type tag)))))
+
+(defun jde-parse-member-is-primitive (tag)
+  "Check if tag is of primitive type"
+  (and (or (semantic-tag-of-type-p tag "byte")
+	   (semantic-tag-of-type-p tag "char")
+	   (semantic-tag-of-type-p tag "short")
+	   (semantic-tag-of-type-p tag "boolean")
+	   (semantic-tag-of-type-p tag "int")
+	   (semantic-tag-of-type-p tag "long"))
+       (jde-parse-member-is-scalar tag)))
+
+(defun jde-parse-member-is-float (tag)
+  "Check if tag is of a floating point type"
+  (and (or (semantic-tag-of-type-p tag "float")
+	   (semantic-tag-of-type-p tag "double")))
+  (jde-parse-member-is-scalar tag))
+
+(defun jde-parse-compare-member-types (a b)
+  "List sorter for a class' member list. Primitive types will be considered
+lower, so that they are returned at the head of the list. This ensures they will be
+processed first and the more costly complex types later."
+  (or (and (jde-parse-member-is-primitive a)
+	   (not (jde-parse-member-is-primitive b)))
+      (and (jde-parse-member-is-float a)
+	   (not (or (jde-parse-member-is-primitive b)
+		    (jde-parse-member-is-float b))))
+      (and (jde-parse-member-is-scalar a)
+	   (not (or (jde-parse-member-is-primitive b)
+		    (jde-parse-member-is-float b)
+		    (jde-parse-member-is-scalar b))))))
+
+(defun jde-parse-get-package-name ()
+  "Gets the name of the package in which the Java source file in the
+current buffer resides."
+  (let ((packages (semantic-brute-find-tag-by-class 'package (current-buffer))))
+    (if (and (listp packages) (eq (length packages) 1))
+	(semantic-tag-name (car packages)))))
+
+(defun jde-parse-get-package-from-name (class-name)
+  "Gets the package portion of a qualified class name."
+  (substring
+   class-name 0
+   (let ((pos  (position ?. class-name :from-end t)))
+     (if pos
+	 pos
+       0))))
+
+(defun jde-parse-get-unqualified-name (name)
+  "Gets the last name in a qualified name."
+  (let ((unqualified-name (substring name (string-match "[^.]+$" name))))
+    (if unqualified-name unqualified-name name)))
+
+(defun jde-parse-get-super-class-at-point ()
+  (condition-case err
+      (let ((superClass "Object")
+	    (class-re "extends[ \t]+\\([a-zA-z]+[a-zA-Z0-9._]*\\).*[ \n]*"))
+	(save-excursion
+	  (let ((open-brace-pos
+		 (scan-lists (point) -1 1)))
+	    (when open-brace-pos
+	      (goto-char open-brace-pos)
+	      (when (re-search-backward class-re (point-min) t)
+		(looking-at class-re)
+		(setq superClass (buffer-substring-no-properties
+				  (match-beginning 1)
+				  (match-end 1)))))))
+	superClass)
+    (error)))
+
+(defconst jde-parse-class-mod-re
+  "public\\|abstract\\|final\\|static\\|strictfp\\|protected"
+  "Regular expression matching class modifiers.")
+
+(defconst jde-parse-java-comment-re
+  "/\\*\\(?:[*][^/]\\|[^*][/]\\|[^*/]\\)*[*/]?\\*/\\|//.*$"
+  "Regular expression matching java comments.")
+
+(defconst jde-parse-java-comment-or-ws-re
+  (concat jde-parse-java-comment-re "\\|[ \t\n]")
+  "Regular expression matching java comments and whitespaces.")
+
+(defun jde-parse-get-class-modifiers ()
+  "Get modifiers of the innermost class containing point.
+Returns a list constisting of the result of
+`jde-parse-get-innermost-class-at-point' followed by
+all modifieres of the class.
+Returns nil, if no class could be found."
+  (let ((class (jde-parse-get-innermost-class-at-point))
+	(mod-or-ws-re (concat "\\(" jde-parse-class-mod-re
+			      "\\|" jde-parse-java-comment-or-ws-re
+			      "\\)\\="))
+	(case-fold-search)
+	(modifiers))
+    (if class
+	(save-excursion
+	  (goto-char (cdr class))
+	  (while (re-search-backward mod-or-ws-re (point-min) t)
+	    (progn
+	      (if (looking-at jde-parse-class-mod-re)
+		  (setq modifiers
+			(cons (match-string-no-properties 0) modifiers)))))
+	  (setq modifiers (cons class modifiers))))
+    modifiers))
+
+(defconst jde-parse-class-decl-re
+  (concat "^"
+	  ;; comments, string literals, keywords, identifier,
+	  ;; assignment operator or open parenthese:
+	  "\\(?:" jde-parse-java-comment-or-ws-re "\\|[a-zA-Z0-9_.=(]\\)*"
+	  ;; keyword before classname:
+	  "\\<\\(class\\|enum\\|interface\\|new\\)"
+	  "\\(?:" jde-parse-java-comment-or-ws-re "\\)+"
+	  ;; package part of superclass of anonymous class:
+	  "\\(?:[a-zA-Z0-9_]+\\.\\)*"
+	  ;; classname:
+	  "\\([a-zA-Z0-9_]+\\)"
+	  ;; everything between classname and curly brace:
+	  "\\(?:" jde-parse-java-comment-or-ws-re "\\|[a-zA-Z0-9_.,()<>]\\)*"
+	  "\\=")
+  "Regular expression matching class declarations before point.
+Point must be at opening curly brace of class.
+It matches interfaces, named and anonymous classes.")
+
+(defun jde-parse-get-innermost-class-at-point ()
+  "Get the innermost class containing point.
+If point is in a class, this function returns
+\(CLASS_NAME . CLASS_POSITION). CLASS_NAME is the
+name of the class. For anonymous classes it is
+the unqualified name of the superclass. CLASS_POSITION
+is the position of the first character of the class
+or interface keyword or the first character
+of the new keyword in case of anonymous classes.
+Returns nil, if point is not in a class."
+
+;; commented out for now until current build upgraded to new semantci (emacs
+;; major version 23?)
+;;  (semantic-refresh-tags-safe)
+(let ((left-paren-pos (c-parse-state)))
+  (if left-paren-pos
+      (save-excursion
+	(catch 'class-found
+	  (let ((left-paren-index 0)
+		(left-paren-count (length left-paren-pos)))
+	    (while (< left-paren-index left-paren-count)
+	      (let ((paren-pos (nth left-paren-index left-paren-pos)))
+		(unless (consp paren-pos)
+		  (goto-char paren-pos)
+		  (when (looking-at "{")
+		    (let* ((search-end-pos
+			    (if (< left-paren-index (1- left-paren-count))
+				(let ((pos (nth (1+ left-paren-index) left-paren-pos)))
+				  (if (consp pos)
+				      (cdr pos)
+				    pos))
+			      (point-min)))
+			   (case-fold-search nil)
+			   (class-pos (re-search-backward jde-parse-class-decl-re search-end-pos t)))
+		      (if class-pos
+			(throw
+			 'class-found
+			 (cons (match-string-no-properties 2)
+			       (match-beginning 1))))))))
+	      (setq left-paren-index (1+ left-paren-index)))))))))
+
+(defun jde-parse-get-class-at-point ()
+  (let ((class-info (jde-parse-get-innermost-class-at-point))
+	class-name)
+    (while class-info
+      (let ((name (car class-info))
+	    (pos (cdr class-info)))
+	(if (not class-name)
+	    (setq class-name name)
+	  (setq class-name (concat name "." class-name)))
+	(save-excursion
+	  (goto-char pos)
+	  (setq class-info (jde-parse-get-innermost-class-at-point)))))
+    class-name))
+
+(defun jde-parse-get-classes-at-point ()
+  (interactive)
+  (let ((class (jde-parse-get-innermost-class-at-point)))
+    (if class (message "%s %s" (car class) (cdr class) ) (message "no class")))
+  ;; (goto-char (aref (c-search-uplist-for-classkey (c-parse-state)) 0))
+  )
+
+
+(defun jde-parse-select-qualified-class-name (class &optional prompt)
+  "PROMPT the user to select the fully qualified name for CLASS.
+Return the selection."
+  (condition-case err
+      (let ((names
+	     (jde-jeval-r
+	      (format "jde.util.JdeUtilities.getQualifiedName(\"%s\");" class))))
+	(if names
+	    (if (> (length names) 1)
+		(efc-query-options
+		 names
+		 (or prompt "Select class.")
+		 "Class Name Dialog")
+	      (car names))
+	  (error "Cannot find class %s on the current classpath." class)))
+    (error
+     (message "%s" (error-message-string err)))))
+
+
+(defun jde-parse-qualified-name-at-point ()
+  "Returns (cons QUALIFIER NAME) where NAME is the symbol at point and
+QUALIFIER is the symbol's qualifier. For example, suppose the name at
+point is
+
+     int i = error.msg.length()
+		   ^
+In this case, this function returns (cons \"error.msg\" \"length\").
+This function works only for qualified names that do not contain
+white space. It returns null if there is no qualified name at point."
+  (let ((symbol-at-point (thing-at-point 'symbol)))
+    (when symbol-at-point
+       (thing-at-point-looking-at "[^ \n\t();,:+<]+") ;; add < to prevent like "Map<String"
+      (let ((qualified-name
+	     (buffer-substring-no-properties
+	      (match-beginning 0)
+	      (match-end 0))))
+	(string-match "\\(.+[.]\\)*\\([^.]+\\)" qualified-name)
+	(let ((qualifier (if (match-beginning 1)
+			     (substring qualified-name
+					(match-beginning 1) (match-end 1))))
+	      (name (substring qualified-name
+			       (match-beginning 2) (match-end 2))))
+	  (if qualifier
+	      (setq qualifier (substring qualifier 0 (1- (length qualifier)))))
+	  (cons qualifier name))))))
+
+
+;;;###autoload
+(defun jde-parse-get-buffer-class (&optional no-package-p)
+  "Get the fully qualified name of the class of this buffer.
+
+NO-PACKAGE-P, if non-`nil', return only the class name (sans
+package name), otherwise, include the package name.
+
+If called interactively, add the name in the mini-buffer."
+  (interactive (list (not current-prefix-arg)))
+  (if (eq major-mode 'jde-mode)
+      (let ((package-name (jde-parse-get-package-name))
+	    (class-name (file-name-sans-extension
+			 (file-name-nondirectory (buffer-file-name)))))
+	(if (and (not no-package-p) package-name)
+	    (setq class-name (concat package-name "." class-name)))
+	(when (interactive-p)
+	  (kill-new class-name)
+	  (message (format "Copied `%s'" class-name)))
+	class-name)
+    (error "Not a Java source buffer.")))
+
+
+(defun jde-parse-get-buffer-unqualified-class ()
+  "Get the class name from the buffer filename"
+  (file-name-sans-extension (file-name-nondirectory
+			     (or (buffer-file-name) "Object.java"))))
+
+
+(defun jde-parse-double-backslashes (name)
+  (mapconcat (lambda (x) (if (eq x ?\\)
+			     "\\\\"
+			   (string x)))
+	     name ""))
+
+(defvar jde-parse-java-symbol-declare-re
+  (sregexq
+   (1+              ;; A Java symbol comprises one or more of the following:
+    (char (?A . ?Z)   ;;   - upper case characters
+	  (?a . ?z)   ;;   - lower case characters
+	  (?0 . ?9)   ;;   - digits
+	  "[]"        ;;   - square brackets
+	  "?"         ;;   - question mark
+      "<,> \t\n\r";;   - java1.5 generic support
+	  "_"         ;;   - underscore
+	  "."         ;;   - period
+	  (160 . 255) ;;   - accented characters
+	  )))
+"Regular expression that matches any Java symbol declare.")
+
+(defun jde-parse-valid-declaration-at (point varname)
+  "Verify that a POINT starts a valid java declaration
+for the VARNAME variable."
+  (save-excursion
+    (goto-char point)
+    (let ((case-fold-search nil)) ;; Why case-insensitive?
+      (if (or
+	   (looking-at (concat "\\(" jde-parse-java-symbol-declare-re "\\)[ \t\n\r]+"
+			      (jde-parse-double-backslashes varname)
+			      "[]?[ \t\n\r]*[),;=]"))
+
+	   ;; Handle case where varname is part of a list declaration, e.g.,
+	   ;;
+	   ;;   String a, b, c;
+	   ;;
+	   (looking-at (concat "\\(" jde-parse-java-symbol-declare-re "\\)[ \t\n\r]+"
+			       "\\(" jde-parse-java-symbol-re "[ \t\n\r]*,[ \t\n\r]*\\)*"
+			      (jde-parse-double-backslashes varname)
+			      "[]?[ \t\n\r]*[,;]"))
+	   ;; Parse jdk1.5 for (Type val : collection) {
+	   (looking-at (concat "\\(" jde-parse-java-symbol-declare-re "\\)[ \t\n\r]+"
+			       varname "[ \t\n\r]*:")))  ;[ \t\n\r]*"
+			       ;"\\(" jde-parse-java-symbol-re "[,{} \t\n\r]*\\)+" ")")))
+	  (let ((type (match-string 1))
+		(type-pos (match-beginning 1)))
+	    (goto-char type-pos)
+	    ;;  Check for following case.
+	    ;;     Object table
+	    ;;    //representing objects after all updates.
+	    ;;    table = new Truc();
+	    ;;    table.
+	    ;;  Avoid false hit on updates.
+	    (if (not (or
+		      (jde-parse-comment-or-quoted-p)
+		      (string= type "instanceof")
+		      (string= type "return")))
+		type))
+	nil))))
+
+(defun jde-parse-declared-type-of (name)
+  "Find in the current buffer the java type of the variable NAME.  The
+function returns a cons of two strings.  The first is a string containing
+the name of the type, or nil if it cannot be found. The second is a string
+containing any qualifying text that precedes the class name, which is nil
+if no text that looks like an identifier precedes the type name.  This
+function does not give the fully-qualified java class name, it just returns
+the type as it is declared, and a qualifier that might be the package or
+the containing/outer class of the declared type."
+  (save-excursion
+    (let (found res foundpt qualifier)
+      (setq foundpt (jde-parse-find-declaration-of name))
+      (setq found (not (null foundpt)))
+
+      ;; now check for qualifying identifier. Note: reuses
+      ;; jde-parse-qualified-name-at-point for simplicity, not efficiency
+      (if found
+	  (let (qualname)
+	    (goto-char foundpt)
+	    (setq qualname (jde-parse-qualified-name-at-point))
+	    (setq qualifier (car qualname))
+	    (setq res (cdr qualname))))
+
+      (cons res qualifier))))
+
+(defun jde-parse-find-declaration-of (name)
+  "Find in the current buffer the location where NAME is declared.
+Returns the character position in the buffer, or nil if no declaration
+could be found."
+  (save-excursion
+    (let ((symbol-list-entry-re
+	   (concat jde-parse-java-symbol-re "[ \t\n\r]*,[ \t\n\r]*"))
+	  (orgpt (point))
+	   found pos resname foundpt lastpos)
+
+      ;; Search backward in the buffer.
+      (while (and (not found)
+		  (search-backward name nil t))
+	(setq pos (point))
+    (setq lastpos (point))
+
+	;; Position point at the start of the type
+	;; symbol in the declaration, e.g.,
+	;;
+	;;  String s;
+	;;  ^
+	(backward-word 1)
+
+	;; Handle case where declaration declares
+	;; a list of symbols, e.g.,
+	;;
+	;;  String a, b, c;
+	;;
+	;; In this case, back over any entries in
+	;; the list ahead of name.
+	(while (looking-at symbol-list-entry-re)
+      (setq lastpos (point))
+	  (backward-word 1))
+    ;;  List<String, List<String>> a;
+    ;;                    ^
+    ;; In this case, back over any entries between < and >
+    (let ((try-count 0)
+	  (max-try-count 20))
+      (while (and
+	      (< try-count max-try-count)
+	      (not
+	       (= (count ?< (buffer-substring (point) lastpos))
+		  (count ?> (buffer-substring (point) lastpos)))))
+	(setq try-count (1+ try-count))
+	(backward-word 1)))
+
+
+	(setq resname (jde-parse-valid-declaration-at (point) name))
+	(setq foundpt (point))
+	(goto-char pos)
+	(forward-char -1)
+	(if (and resname
+		 (not (jde-parse-keywordp resname)))
+	    (setq found t)))
+
+      (unless found
+
+	;; Not found backward in buffer. Try looking forward.
+	(goto-char orgpt)
+
+	(while (and (not found)
+		    (search-forward name nil t))
+	  (setq pos (point))
+      (setq lastpos (point))
+	  (backward-word 2)
+
+	  (while (looking-at symbol-list-entry-re)
+	(setq lastpos (point))
+	    (backward-word 1))
+
+    ;;  List<String, List<String>> a;
+    ;;                    ^
+    ;; In this case, back over any entries between < and >
+      (let ((try-count 0)
+	    (max-try-count 20))
+	(while (and
+		(< try-count max-try-count)
+		(not
+		 (= (count ?< (buffer-substring (point) lastpos))
+		    (count ?> (buffer-substring (point) lastpos)))))
+	  (setq try-count (1+ try-count))
+	  (backward-word 1)))
+
+	  (setq resname (jde-parse-valid-declaration-at (point) name))
+	  (setq foundpt (point))
+	  (goto-char pos)
+	  (forward-char 1)
+	  (if (and resname
+		   (not (jde-parse-keywordp resname)))
+	      (setq found t))))
+
+      (if found foundpt nil))))
+
+
+(defun jde-display-parse-error (error)
+  (let* ((parser-buffer-name "*Java Parser*")
+	 (buf (get-buffer parser-buffer-name)))
+    (if (not buf)
+	(setq buf (get-buffer-create parser-buffer-name)))
+    (set-buffer buf)
+    (erase-buffer)
+    (insert error)
+    (pop-to-buffer buf)))
+
+(defun jde-parse ()
+  "*Parses the Java source file displayed in the current buffer.
+If the source file parses successfully, this command displays
+a success message in the minibuffer. Otherwise, it displays an error
+message in the Java Parser buffer. If the Java Parser buffer does
+not exist, this command creates it.
+
+Note. This command uses an external Java parser implemented in
+Java to parse Java source files. This command uses the JDE's integrated
+Java source interpreter, the BeanShell, to invoke the parser. If the
+BeanShell is not running, this command starts the BeanShell. Thus,
+the first time you invoke the parser you may notice a slight delay
+before getting a response. Thereafter, the response should be very
+fast."
+  (interactive)
+  (save-some-buffers (not compilation-ask-about-save) nil)
+  (let ((parse-error
+	 (jde-jeval-r (concat "jde.parser.ParserMain.parseFile(\"" (buffer-file-name) "\");"))))
+    (if parse-error
+	(jde-display-parse-error parse-error)
+      (message "Parsed %s successfully" (buffer-name)))))
+
+(defun jde-parse-comment-or-quoted-p ()
+  "Returns t if point is in a comment or a quoted string,
+otherwise nil."
+  (let* ((state (save-excursion
+		  (parse-partial-sexp (point-min) (point)))))
+    (if (or (nth 3 state)
+	    (nth 4 state))
+	t)))
+
+(defun jde-parse-get-method-at-point (&optional position)
+  "Gets the method at POSITION, if specified, otherwise at point.
+Returns (CLASS_NAME . METHOD_NAME) if the specified position is
+in a method; otherwise, nil."
+  ;; Define an internal function that recursively searches a class
+  ;; and its subclasses for a method containing point.
+  (flet ((search-class
+	  (class pos)
+	  (let* ((class-name       (semantic-tag-name class))
+		 (class-parts      (semantic-tag-type-members class))
+		 (class-subclasses (semantic-find-nonterminal-by-token 'type class-parts))
+		 (class-methods    (semantic-find-nonterminal-by-token 'function class-parts)))
+
+	    ;; Is point in a method of a subclass of this class?
+	    (loop for subclass in class-subclasses do
+		  (search-class subclass pos))
+
+	    ;; Is point in any of the methods of this class?
+	    (loop for method in class-methods do
+		  (let* ((method-name  (semantic-tag-name method))
+			 (method-start (semantic-tag-start method))
+			 (method-end   (semantic-tag-end method)))
+		    (when (and (>= pos method-start)
+			       (<= pos method-end))
+		      (throw 'found (cons (cons class-name method-name)
+					  (cons method-start method-end)))))))))
+
+    (let* ((pos (if position position (point)))
+	   (tokens (semantic-fetch-tags))
+	   (classes (semantic-find-nonterminal-by-token 'type tokens)))
+      (catch 'found
+	(loop for class in classes
+	      do (search-class class pos))))))
+
+(defclass jde-avl-tree ()
+  ((tree        :initarg tree
+		:type sequence
+		:documentation
+		"The tree")
+   (compare-fcn :initarg compare-fcn
+		:type function
+		;; :initform <
+		:documentation
+		"Compare function."))
+  "Balanced binary tree.")
+
+(defmethod initialize-instance ((this jde-avl-tree) &rest fields)
+  "Constructor for binary balanced tree."
+
+  ;; Call parent initializer
+  (call-next-method)
+
+  (assert (typep  (oref this compare-fcn)  'function))
+
+  (oset this  tree (avl-tree-create (oref this compare-fcn))))
+
+(defmethod jde-avl-tree-add ((this jde-avl-tree) item)
+  "Inserts ITEM in this tree."
+  (avl-tree-enter (oref this tree) item))
+
+(defmethod jde-avl-tree-delete ((this jde-avl-tree) item)
+  "Deletes ITEM from THIS tree."
+  (avl-tree-delete (oref this tree) item))
+
+(defmethod jde-avl-tree-is-empty ((this jde-avl-tree))
+  "Return t if THIS tree is empty, otherwise return nil."
+  (avl-tree-empty (oref this tree)))
+
+(defmethod jde-avl-tree-find ((this jde-avl-tree) item)
+  "Return the element in THIS tree that matches item."
+  (avl-tree-member (oref this tree) item))
+
+(defmethod jde-avl-tree-map ((this jde-avl-tree) map-function)
+  "Applies MAP-FUNCTION to all elements of THIS tree."
+  (avl-tree-map map-function (oref this tree)))
+
+(defmethod jde-avl-tree-first ((this jde-avl-tree))
+  "Return the first item in THIS tree."
+  (avl-tree-first (oref this tree)))
+
+(defmethod jde-avl-tree-last ((this jde-avl-tree))
+  "Return the last item in THIS tree."
+  (avl-tree-last (oref this tree)))
+
+(defmethod jde-avl-tree-copy ((this jde-avl-tree))
+  "Return a copy of THIS tree."
+  (avl-tree-copy (oref this tree)))
+
+(defmethod jde-avl-tree-flatten ((this jde-avl-tree))
+  "Return a sorted list containing all elements of THIS tree."
+  (avl-tree-flatten (oref this tree)))
+
+(defmethod jde-avl-tree-size ((this jde-avl-tree))
+  "Return the number of elements in THIS tree."
+  (avl-tree-size (oref this tree)))
+
+(defmethod jde-avl-tree-clear ((this jde-avl-tree))
+  "Delete all elements of THIS tree."
+  (avl-tree-clear (oref this tree)))
+
+(defclass jde-parse-method-map (jde-avl-tree)
+  ()
+  "Map of the methods in the current buffer.")
+
+
+(defun jde-parse-method-map-compare-fcn (m1 m2)
+  (and
+   (< (car (cdr m1)) (car (cdr m2)))
+   (< (cdr (cdr m1)) (car (cdr m2)))))
+
+(defmethod initialize-instance ((this jde-parse-method-map) &rest fields)
+  "Constructor for method map."
+
+  (oset  this compare-fcn 'jde-parse-method-map-compare-fcn)
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (flet ((add-methods
+	  (class)
+	  (let* ((class-name       (semantic-tag-name class))
+		 (class-parts      (semantic-tag-type-members class))
+		 (class-subclasses (semantic-find-nonterminal-by-token 'type class-parts))
+		 (class-methods    (semantic-find-nonterminal-by-token 'function class-parts)))
+
+	    ;; Add methods of subclasses
+	    (loop for subclass in class-subclasses do
+		  (add-methods subclass))
+
+	    ;; Add methods of this class?
+	    (loop for method in class-methods do
+		  (let* ((method-name  (semantic-tag-name method))
+			 (method-start (semantic-tag-start method))
+			 (method-end   (semantic-tag-end method)))
+		    (jde-avl-tree-add
+		     this
+		     (cons
+		      (cons class-name method-name)
+		      (cons method-start method-end))))))))
+
+    (let* ((tokens (semantic-fetch-tags))
+	   (classes (semantic-find-nonterminal-by-token 'type tokens)))
+      (loop for class in classes do
+	    (add-methods class)))))
+
+(defmethod jde-parse-method-map-get-method-at ((this jde-parse-method-map) &optional pos)
+  "Get the method at POS, if specified, otherwise, at point."
+  (let ((p (if pos pos (point))))
+    (jde-avl-tree-find this (cons (cons "" "") (cons p p)))))
+
+(defvar jde-parse-the-method-map nil
+  "Map of methods defined in this buffer sorted by location.")
+(make-variable-buffer-local 'jde-parse-the-method-map)
+
+
+(defun jde-current-buffer-exact-name-match-p (tag)
+  (and (tag-exact-match-p tag)
+       (equal (buffer-file-name (window-buffer (selected-window)))
+	      (file-of-tag))))
+
+(defun jde-etags-recognize-tags-table () ; see etags-recognize-tags-table
+  (let ((recognized (etags-recognize-tags-table)))
+    (if recognized
+	;; prefer exact match in current buffer to other files
+	(setq find-tag-tag-order '(jde-current-buffer-exact-name-match-p
+				   tag-exact-file-name-match-p
+				   tag-exact-match-p
+				   ))
+      recognized)))
+
+(defun jde-parse-java-variable-at-point ()
+  "Returns a list (VAR PARTIAL) where VAR.PARTIAL is the partially completed
+method or field name at point. For example, suppose obj.f1.ge were the name
+at point. This function would return the list (obj.f1 ge)."
+  (save-excursion
+    (let (start middle-point varname curcar dot (dot-offset 0) found
+		(original-point (point))
+		intermediate-point beg-point first-part second-part
+		first-paren cast-type second-paren
+		args (offset 0) (bracket-count 0) (paren-count 0))
+
+      ;; Move cursor to the beginning of the partially
+      ;; completed part of the expression, e.g., move point
+      ;; from
+      ;;
+      ;;   obj.f1.ge   to obj.f1.ge
+      ;;            ^           ^
+      ;;   obj.f1.get(int,int)  to obj.f1.get(int,int)
+      ;;                      ^              ^
+      (setq curcar (char-before))
+      (if curcar
+	  (progn
+	    (while (null found)
+	      (cond
+	       ((or (and (>= curcar ?a) (<= curcar ?z)) ; a-z
+		    (and (>= curcar ?A) (<= curcar ?Z)) ; A-z
+		    (and (>= curcar ?0) (<= curcar ?9))
+		    (>= curcar 127)
+		    (member curcar '(?$ ?_ ?\\))) ;; _ \
+		(forward-char -1))
+	       ((eq ?. curcar)
+		(setq dot-offset 1)
+		(if (eq ?\) (char-before (- (point) 1)))
+		    (progn
+		      (forward-char -2)
+		      (setq first-paren (point))
+		      (setq second-paren (jde-parse-match-paren-position))
+		      (setq offset (+ (- first-paren second-paren) 1))
+		      (forward-char 2)
+		      (setq found (point)))
+		  (setq found (point))))
+	       (t
+		(setq found (point))))
+	      (setq curcar (char-before)))
+	    (setq intermediate-point found)
+	   ;; Now move point to the beginning of the expression, e.g.,
+	    ;; from
+	    ;;
+	    ;;  obj.f1.ge
+	    ;;        ^
+	    ;; to
+	    ;;
+	    ;;  obj.f1.ge
+	    ;; ^
+	    ;;
+	    (progn
+	      (setq curcar (char-before))
+	      (while (or (and (>= curcar ?a) (<= curcar ?z))
+			 (and (>= curcar ?A) (<= curcar ?Z))
+			 (and (>= curcar ?0) (<= curcar ?9))
+			 (>= curcar 127)
+			 (and (eq curcar ? ) (or (< 0 paren-count)
+						 (< 0 bracket-count)))
+			 (and (member curcar '(?$ ?\" ?\. ?\_ ?\\ ?\( ?\) ?\, ?\[ ?\]))
+			      (if (eq curcar ?\[)
+				  (> bracket-count 0)
+				t)))
+		(cond
+		 ((eq curcar ?\))
+		  (progn
+		    (forward-char -1)
+		    (goto-char (jde-parse-match-paren-position))))
+		 ((eq curcar ?\( )
+		  (setq paren-count (1- paren-count)))
+		 ((eq curcar ?\] )
+		  (setq bracket-count (1+ bracket-count)))
+		 ((eq curcar ?\[ )
+		  (setq bracket-count (1- bracket-count))))
+		(forward-char -1)
+		(setq curcar (char-before)))
+
+	      (setq beg-point (point))
+	      (set-marker jde-parse-current-beginning intermediate-point)
+	      (set-marker jde-parse-current-end original-point)
+	      (setq middle-point (- intermediate-point dot-offset offset))
+	      (setq first-part
+		    (buffer-substring-no-properties beg-point middle-point))
+	      (setq first-part (jde-parse-isolate-to-parse first-part))
+
+	      ;;replacing newline by empty strings new lines seems to break the
+	      ;;beanshell
+	      (while (string-match "\n" first-part)
+		(setq first-part (replace-match "" nil nil first-part)))
+
+	      ;;replacing extra spaces for "". This done to reduce the space
+	      ;;that the completion title takes
+	      (while (string-match " " first-part)
+		(setq first-part (replace-match "" nil nil first-part)))
+
+	      (setq second-part
+		    (buffer-substring-no-properties
+		     intermediate-point original-point))
+
+	      ;;Checking for casting
+	      ;; ((Object) obj).ge
+	      ;; FIXME can't work ok for generic type, eg: ((List<String>) obj).ge
+	      (if (and (not cast-type)
+		       (string= first-part "")
+		       (eq (char-before (+ 1 middle-point)) ?\()
+		       (eq (char-before (+ 2 middle-point)) ?\())
+		  (save-excursion
+		    (goto-char (+ middle-point 1))
+		    (setq first-paren (point))
+		    (setq second-paren (jde-parse-match-paren-position))
+		    (setq cast-type (buffer-substring-no-properties
+				     (+ 1 first-paren) second-paren))))
+
+	      (if cast-type
+		  (progn
+		    (setq jde-parse-casting t)
+		    (list cast-type second-part))
+		(progn
+		  (setq jde-parse-casting nil)
+		  (list first-part second-part))))
+	    )))))
+
+(defun jde-parse-isolate-to-parse (s)
+  "Returns the right expression that needs completion in S."
+  (let* ((index (length s)) stop (paren 0) curcar final-string
+	 (inside-quotes nil))
+    (while (and (> index 0)
+		(not stop))
+      (setq index (- index 1))
+      (setq curcar (aref s index))
+      (cond
+       ((eq ?\" curcar);;Checking if we are inside double quotes
+	(if (not (eq ?\\ (aref s (- index 1))));;if the quote is not escape
+	    (setq inside-quotes (not inside-quotes))))
+       ((eq ?\) curcar)
+	(if (not inside-quotes)
+	    (setq paren (1+ paren))))
+       ((eq ?\( curcar)
+	(if (not inside-quotes)
+	    (setq paren (1- paren)))))
+      (if (or (< paren 0)
+	      (and (eq curcar ?\,) (<= paren 0)))
+	  (setq stop t)))
+    (if stop
+	(setq index (1+ index)))
+    (setq final-string (substring s index))
+    (if (and (not (string= final-string ""))
+	     (string= "(" (substring final-string 0 1)))
+	(let* ((closing-paren (string-match ")" final-string))
+	       (closing (string-match ")." final-string (+ 1 closing-paren))))
+	  (setq final-string
+		(concat (substring final-string 2 closing-paren)
+			"."
+			(substring final-string (+ closing 2))))))
+    final-string))
+(defun jde-parse-match-paren-position ()
+  "Returns the position of the parenthesis match"
+  (let ((current (point))
+	match)
+    (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
+	  ((looking-at "\\s\)") (forward-char 1) (backward-list 1)))
+    (setq match (point))
+    (goto-char current)
+    match))
+
+(defun jde-parse-eval-type-of (expr)
+  "Get type of EXPR. This function returns a class name or builtin
+Java type name, e.g., int."
+  (if expr
+      (let ((class-at-point (jde-parse-get-class-at-point))
+	    (super-at-point (jde-parse-get-super-class-at-point))
+	    qualified-name chop-pos temp answer)
+	(setq answer
+	      (cond
+	       ;;If it's number returns an int
+	       ((integerp expr)
+		"int")
+	       ;;If it's 001L or 134l return long
+	       ((if (and (integerp (substring expr 0 (- (length expr) 1)))
+			 (or (string= "L" (substring expr (- (length expr) 1)
+						     (length expr)))
+			     (string= "l" (substring expr (- (length expr) 1)
+						     (length expr)))))
+		    "long"))
+	       ;;If it's a floating point return float
+	       ((floatp expr)
+		"double")
+	       ;;If it's 000F or 1234f return float
+	       ((if (and (floatp (substring expr 0 (- (length expr) 1)))
+			 (or (string= "F" (substring expr (- (length expr) 1)
+						     (length expr)))
+			     (string= "f" (substring expr (- (length expr) 1)
+						     (length expr)))))
+		    "float"))
+	       ((string-match "false\\|true" expr)
+		"boolean")
+	       ;;Checking if it's a character
+	       ((string= "'" (substring expr 0 1))
+		"char")
+	       ;; If it's "this", we return the class name of the class we code in
+	       ((and class-at-point (string= "this" expr))
+		(jde-parse-get-qualified-name class-at-point t))
+	       ;; If it's "super", we return the super class
+	       ;;name of the class we code in
+	       ((and super-at-point (string= "super" expr))
+		(jde-parse-get-qualified-name super-at-point t))
+	       ;;if it's a class name, done
+	       ((setq qualified-name (jde-parse-get-qualified-name expr t))
+		qualified-name)
+
+	       ;;check if it's an inner class
+	       ((and expr
+		     class-at-point
+		     (string= "this.this" expr)
+		     (setq qualified-name (jde-parse-get-inner-class
+					   class-at-point)))
+		qualified-name)
+
+	       (t
+		(let (to-complete
+		      (last-char
+		       (aref expr (- (length expr) 1 ))))
+		  ;; If it ends with a parenthesis
+		  (cond
+		   ((eq last-char ?\))
+		    (let* ((result
+			    (jde-parse-isolate-before-matching-of-last-car
+			     expr))
+			   (temp (if (not (string= "this.this" result))
+				     (jde-parse-split-by-dots result)))
+			   to-complete)
+		      (if temp
+			  (jde-parse-find-completion-for-pair temp)
+			;;we need exact completion here
+			(jde-parse-find-completion-for-pair
+			 (list "this" result) nil jde-complete-private))
+
+		      ;;if the previous did not work try only result
+		      (if (not jde-complete-current-list)
+			  (jde-parse-find-completion-for-pair (list result "")))
+
+		      ;;if the previous did not work try again
+		      (setq qualified-name
+			    (jde-parse-get-qualified-name result t))
+		      (if qualified-name
+			  qualified-name
+			(if jde-complete-current-list
+			    (progn
+			      (setq to-complete
+				    (car (car jde-complete-current-list)))
+			      (setq chop-pos (+ 3 (string-match " : " to-complete)))
+			      (let* ((space-pos (string-match " " to-complete chop-pos))
+				     (uqname (if space-pos (substring to-complete chop-pos space-pos)
+					       (substring to-complete chop-pos))))
+				uqname))))))
+
+		   ;;if it's an array
+		   ((eq last-char ?\])
+		    (let ((temp (jde-parse-eval-type-of
+				 (jde-parse-isolate-before-matching-of-last-car
+				  expr))))
+		      (jde-parse-get-component-type-of-array-class temp)))
+
+		   ;;we look for atoms if expr is splittable by dots
+		   ((setq temp (if (not (string= "this.this" expr))
+				   (jde-parse-split-by-dots expr)))
+		    ;;we need exact completion here
+		    (jde-parse-find-completion-for-pair temp t)
+		    (if jde-complete-current-list
+			(progn
+			  (setq to-complete (car (car
+						  jde-complete-current-list)))
+			  (setq chop-pos (+ 3 (string-match " : " to-complete)))
+			  (let* ((space-pos (string-match " " to-complete chop-pos))
+				 (uqname (if space-pos (substring to-complete chop-pos space-pos)
+					   (substring to-complete chop-pos))))
+			    (jde-parse-get-qualified-name uqname)))
+
+		      nil))
+		   (t
+		    ;; See if it's declared somewhere in this buffer.
+		    (let (parsed-type result result-qualifier)
+		      (setq parsed-type (jde-parse-declared-type-of expr))
+		      (setq result (car parsed-type))
+		      (setq result-qualifier (cdr parsed-type))
+
+		      (if result
+			  (let ((count 0) type)
+			    (while (string-match ".*\\[\\]" result)
+			      (setq result (substring result 0
+						      (- (length result) 2)))
+			      (setq count (1+ count)))
+
+			    (let (work)
+			      (setq type
+				    (cond
+				  ;; handle primitive types, e.g., int
+				     ((member result jde-parse-primitive-types)
+				      result)
+			     ;; quickly make sure fully qualified name
+				     ;;doesn't exist
+				     ((and result-qualifier
+					   (jde-parse-class-exists
+					    (setq work (concat result-qualifier
+							       "."
+							       result))))
+				      work)
+				     ;; then check for inner classes
+				     ((setq work
+					    (jde-parse-get-inner-class-name
+					     result result-qualifier))
+				      work)
+			       ;; otherwise use unqualified class name
+				     (t
+				      (jde-parse-get-qualified-name result
+								    t)))))
+
+			    (if type
+				(progn
+				  (while (> count 0)
+				    (setq type (concat type "[]"))
+				    (setq count (1- count)))
+				  (jde-parse-transform-array-classes-names
+				   type))
+			      (if (y-or-n-p
+				   (format (concat "Could not find type of %s"
+						   " Attempt to import %s? ")
+					   expr result))
+				  (progn
+				    ;; import
+				    (jde-import-find-and-import result)
+				    ;; recursive call of eval-type-of
+				    (jde-parse-eval-type-of expr))
+				(error "Could not find type of %s" result))))
+			(if (and jde-parse-casting
+				 (null jde-parse-attempted-to-import)
+				 (y-or-n-p
+				  (format (concat "Could not find type of %s"
+						  " Attempt to import %s? ")
+					  expr expr)))
+			    (progn
+			      (setq jde-parse-attempted-to-import t)
+			      (setq jde-parse-casting nil)
+			      (jde-import-find-and-import expr)
+			      (jde-parse-eval-type-of expr))
+			  (progn
+			    (setq jde-parse-attempted-to-import nil)
+			    nil))))))))))
+	answer)))
+
+(defun jde-parse-convert-args-to-types (args)
+  "Converts something like this (10, 10) to (int, int)"
+  (let* ((answer "(")
+	 (first-time t)
+	 (temp (substring args 1 (- (length args) 1)));;Striping the parens
+	 (lst (split-string temp ", ?"))
+	 tmp)
+    (while lst
+      (setq tmp (car lst))
+      (if (not first-time)
+	  (setq answer (concat answer ", "))
+	(setq first-time nil))
+      (setq answer (concat answer
+			   (jde-parse-eval-type-of tmp)))
+      (setq lst (cdr lst)))
+    (setq answer (concat answer ")"))
+    answer))
+
+(defun jde-parse-transform-array-classes-names (name)
+  (let (result)
+    (while (string-match ".*\\[\\]" name)
+      (setq name (substring name 0 (- (length name) 2 )))
+      (setq result (concat "[" result)))
+    (if result
+	(progn
+	  (cond
+	   ((string= name "byte")
+	    (setq result (concat result "B")))
+	   ((string= name "char")
+	    (setq result (concat result "C")))
+	   ((string= name "double")
+	    (setq result (concat result "D")))
+	   ((string= name "float")
+	    (setq result (concat result "F")))
+	   ((string= name "int")
+	    (setq result (concat result "I")))
+	   ((string= name "long")
+	    (setq result (concat result "J")))
+	   ((string= name "short")
+	    (setq result (concat result "S")))
+	   ((string= name "boolean")
+	    (setq result (concat result "Z")))
+	   (t
+	    (setq result (concat result "L" name ";"))))
+	  result)
+      name)))
+
+(defun jde-parse-get-component-type-of-array-class (name)
+  (if (string= "[" (substring name 0 1))
+      (let (result)
+	(setq result
+	      (jde-jeval
+	       (concat "System.out.println( Class.forName(\""
+		       name
+		       "\").getComponentType().getName()) ;"))) ;;removed \n
+	(substring result 0 (- (length result) 1)))
+    name))
+
+;; Modified `jde-parse-import-list' to use semantic parser table
+(defun jde-split-import-token (token)
+  "Helper function used by `jde-parse-import-list' which return a
+list (PACKAGE-DOT CLASS-OR-STAR) from given semantic 'include (that
+is Java import) TOKEN.
+For example:
+  : (jde-split-import-token \"java.util.Hashtable\")
+  > (\"java.util.\" . \"Hashtable\")
+  : (jde-split-import-token \"java.lang.*\")
+  > (\"java.lang.\" . \"*\")
+  : (jde-split-import-token \"test\")
+  > (\"test.\" . \"*\")"
+  (let* ((import      (semantic-tag-name token))
+	 (match-point (string-match "\\." import))
+	 split-point)
+    (while match-point
+      (setq split-point (1+ match-point)
+	    match-point (string-match "\\." import split-point)))
+    (if split-point
+	(list (substring import 0 split-point)
+	      (substring import split-point))
+      (list (concat import ".")
+	    "*"))))
+
+(defun jde-parse-import-list ()
+  "Return the list of Java packages declared in the current buffer.
+It uses the semantic parser table to find the 'package' and 'import'
+statements. It implicitly adds the java.lang.* package. See also
+`jde-split-import-token'."
+  (let* ((tokens   (semantic-fetch-tags))
+	 (packages (semantic-find-nonterminal-by-token 'package tokens))
+	 (imports  (semantic-find-nonterminal-by-token 'include tokens))
+	 lst)
+    (setq lst (append
+	       (mapcar (function
+			(lambda (token)
+			  (list
+			   (concat (semantic-tag-name token) ".")
+			   "*")))
+		       packages)
+	      (mapcar 'jde-split-import-token
+		       imports)))
+    (or (member "java.lang.*" lst)
+	(setq lst (append lst '(("java.lang." "*")))))
+    lst))
+
+;; Contributed by Charles Hart <cfhart@Z-TEL.com>
+;; Get the fully qualified name of the class NAME, using the import
+;; list. It returns a string if the fqn was found, or null otherwise.
+;; This is more capable than jde-complete-guess-type-of because it
+;; uses the beanshell to determine if an import statement with a
+;; wildcard contains the unqualified class name passed to this
+;; function.
+(defun jde-parse-get-qualified-name (name &optional import)
+  "Guess the fully qualified name of the class NAME, using the import list. It
+returns a string if the fqn was found, or null otherwise. If IMPORT is non-nil
+try importing the class"
+  (if (jde-parse-class-exists name)
+      name
+    (let ((importlist (jde-parse-import-list))
+	  shortname fullname tmp result)
+      (while (and importlist (null result))
+	(setq tmp (car importlist))
+	(setq shortname (car (cdr tmp)))
+	(setq fullname (concat (car tmp) name))
+	(cond
+	 ((and (string= "*" shortname) (jde-parse-class-exists fullname))
+	  (setq result fullname))
+	 ((string= name shortname)
+	  (setq result fullname))
+	 (t
+	  (setq importlist (cdr importlist)))))
+      (if (and (null result) import)
+	  (progn
+	    (jde-import-find-and-import name t)
+	    (setq result (jde-parse-get-qualified-name name))))
+      result)))
+
+;; Contributed by Charles Hart <cfhart@Z-TEL.com>
+(defun jde-parse-class-exists (name)
+  "Returns t if the fully qualified class name can be found in the
+  classpath, nil otherwise."
+  (if (stringp name)
+      (progn
+	;; Replace double quotes by empty strings.
+	;; Double quotes seems to break the beanshell.
+	(while (string-match "\"" name)
+	  (setq name (replace-match "" nil nil name)))
+
+	;; Replace back slashes by empty strings.\
+	;; Back slashes causes Beeanshell problems
+	(while (string-match "\\\\" name)
+	  (setq name (replace-match "" nil nil name)))
+
+	(jde-jeval-r (concat "jde.util.JdeUtilities.classExists(\"" name "\");")))))
+
+(defun jde-parse-get-inner-class (expr)
+  "Takes a single argument like B.A and split it up in a name
+and qualifer. The name and the qualifier are then use as arguments
+to the function `jde-parse-get-inner-class-name'"
+  (let (name qualifier (pos (string-match "\\." expr)))
+    (if pos
+	(progn
+	  (setq name (substring expr (+ 1 pos)))
+	  (setq qualifier (substring expr 0 pos))))
+    (jde-parse-get-inner-class-name name qualifier)))
+
+;; Tries to divine inner class via the following algorithm:
+;; if no qualifier (e.g. A), then try
+;;   <this-class>$A
+;; if qualifier (e.g. D.C.B.A), then try the following in order:
+;;   <this-class>$D$C$B$A
+;;   <super-types>$D$C$B$A (NOT YET IMPLEMENTED)
+;;   D$C$B$A           i.e  D$C$B$A in default, current, or imported package
+;;   D + C$B$A         i.e  D in imports or local/default package with
+;;                          a C$B$A inner class
+;;   D.C.B$A           i.e. B$A in package D.C
+;;   D.C$B$A           i.e. C$B$A in package D
+(defun jde-parse-get-inner-class-name (name qualifier)
+  "Tries to find an inner class with the class name of name.  If qualifier
+is nil, the inner class is only searched on current class at point.  If
+qualifier is not nil, a wider array of possible inner classes will
+searched.  Returns nil if not found; a fully qualified inner class name
+otherwise."
+  (let (class-name this-full-class-name result)
+    (setq this-full-class-name (jde-parse-get-qualified-name
+				(jde-parse-get-class-at-point)))
+    (cond
+     (qualifier
+      (let ((work (concat qualifier "$" name)))
+	(setq work (subst-char-in-string ?. ?\$ work))
+
+	;; check against this$D$C$B$A
+	(setq class-name (concat this-full-class-name "$" work))
+	(if (not (jde-parse-class-exists class-name))
+	    (let (dot-count index first-part remaining-part)
+	      (setq class-name nil)
+
+	      ;; check against D$C$B$A (default and imported)
+	      (print "Zero dots" (get-buffer "*scratch*"))
+	      (setq class-name (jde-parse-get-qualified-name work))
+
+	      ;; check remaining semi-qualified variants
+	      (setq dot-count 1)
+	      (while (and (null class-name)
+			  (setq index (string-match "\\$" work)))
+
+		(setq first-part (substring work 0 index))
+		(setq remaining-part (if (< index (length work))
+					 (substring work (+ 1 index))
+				       nil))
+		(cond
+		 ;; check against C$B$A on class D
+		 ((= 1 dot-count)
+		  (setq class-name (jde-parse-get-qualified-name
+				    first-part))
+		  (if (not (null class-name))
+		      (progn
+			(setq class-name (concat class-name
+						 "$"
+						 remaining-part))
+			(if (null (jde-parse-class-exists class-name))
+			    (setq class-name nil)))))
+
+		 ;; just check if it exists (ignoring imports)
+		 (t
+		  (setq class-name (concat first-part "." remaining-part))
+		  (if (null (jde-parse-class-exists class-name))
+		      ;; lastly check if it exists in this package
+		      (progn
+			(setq class-name (concat (jde-parse-get-package-name)
+						 "."
+						 work))
+			(if (not (jde-parse-class-exists class-name))
+			    (setq class-name nil))))))
+
+		(setq work (concat first-part "." remaining-part))
+		(setq dot-count (1+ dot-count)))
+
+	      class-name))))
+
+     ;=; otherwise, no qualifier...check against this$D
+     ((jde-parse-class-exists (setq class-name
+				    (concat this-full-class-name "$" name)))
+      class-name))))
+
+;; Can this function be reimplemented to use regular expressions?
+(defun jde-parse-isolate-before-matching-of-last-car (s)
+  "Returns the right expression that needs completion in S."
+  (let* (final-string (index (length s)) stop (paren 0) (bracket 0) curcar
+		      (inside-quotes nil))
+    (while (and (> index 0)
+		(not stop))
+      (setq index (- index 1))
+      (setq curcar (aref s index))
+      (cond
+       ((eq ?\" curcar);;Checking if we are inside double quotes
+	(if (not (eq ?\\ (aref s (- index 1))));;if the quote is not escape
+	    (setq inside-quotes (not inside-quotes))))
+       ((eq ?\) curcar)
+	(if (not inside-quotes)
+	    (setq paren (1+ paren))))
+       ((eq ?\( curcar)
+	(if (not inside-quotes)
+	    (setq paren (1- paren))))
+       ((eq ?\] curcar)
+	(if (not inside-quotes)
+	    (setq bracket (1+ bracket))))
+       ((eq ?\[ curcar)
+	(if (not inside-quotes)
+	    (setq bracket (1- bracket)))))
+      (if (and (= paren 0)
+	       (= bracket 0))
+	  (setq stop t)))
+    (setq final-string (substring s 0 index))
+    (if (and (string= "" final-string)
+	     (string= "((" (substring s 0 2)))
+	(let ((closing-paren (string-match ")" s)))
+	  (setq final-string (substring s 2 closing-paren))))
+    final-string))
+
+(defun jde-parse-split-by-dots (s)
+  "Return a list containing the longest substring of S that ends with a dot,
+ and the rest.But removes the intermediate(=last) dot."
+  ;;we now isolate the last atom after a dot and the beginning
+  (if (string-match "\\(.*\\)\\.\\(.*\\)" s)
+      (list (match-string 1 s) (match-string 2 s))
+    nil))
+
+(defun jde-parse-find-completion-for-pair (pair &optional exact-completion
+						access-level)
+  (jde-complete-find-completion-for-pair pair exact-completion access-level))
+
+(defun jde-parse-keywordp (variable)
+  "Checks if VARIABLE is a Java keyword, for performance reasons this only checks if the VARIABLE is an if or an else, since those are the ones that seem to be causing a problem"
+  (or (string= variable "if")
+      (string= variable "else")))
+
+(defun jde-parse-class-name (classname)
+  "Parse CLASSNAME into it's package and non-fully qualified name.
+
+If CLASSNAME is the symbol `point', then parse it from what is
+at the point.
+
+Return a list in the form:
+  \(FULLY-QUALIFIED-CLASSNAME PACKAGE CLASS-NAME)
+or `nil' if the passed class name doesn't look like a class (by the Sun Java
+codeing standard).
+
+The first two elements of the list are `nil' if CLASSNAME isn't fully qualifed."
+  (flet ((parse-at-point
+	  (classname)
+	  (let (end-pos fq pkg)
+	    (when (> (length classname) 0)
+	      (setq end-pos (position ?. classname :from-end t))
+	      (if end-pos
+		  (setq fq classname
+			pkg (substring fq 0 end-pos)
+			classname (substring fq (1+ end-pos))))
+	      (when (> (length classname) 0)
+		(let ((char (substring classname 0 1)))
+		  (if (string= char (upcase char))
+		      (list fq pkg classname))))))))
+    (if (eq classname 'point)
+	;; TODO: a fully qualified class name looks like a file name
+	;; (i.e. [a-zA-Z.])  but this need to be refined to use the Sun Java
+	;; standards of class name parsing
+	(or (parse-at-point (thing-at-point 'filename))
+	    (parse-at-point (thing-at-point 'word))
+	    (parse-at-point (thing-at-point 'symbol)))
+      (parse-at-point classname))))
+
+(provide 'jde-parse)
+
+;; End of jde-parse.el
diff --git a/site/jdee/lisp/jde-parse.elc b/site/jdee/lisp/jde-parse.elc
new file mode 100644
index 0000000..00a852d
Binary files /dev/null and b/site/jdee/lisp/jde-parse.elc differ
diff --git a/site/jdee/lisp/jde-plugins.el b/site/jdee/lisp/jde-plugins.el
new file mode 100644
index 0000000..6d0e0b3
--- /dev/null
+++ b/site/jdee/lisp/jde-plugins.el
@@ -0,0 +1,204 @@
+;;; jde-plugins.el -- Support for JDEE plugins
+;; $Id: jde-plugins.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <pkinnucan@attbi.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+(require 'eieio)
+(require 'executable)
+
+(defcustom jde-plugins-directory (expand-file-name "plugins" (jde-root))
+  "Location of the JDEE's plugins directory."
+  :group 'jde
+  :type 'file)
+
+(defclass jde-plugin ()
+  ((bsh-cp    :initarg :bsh-cp
+	      :type list
+	      :documentation "Beanshell classpath for this plugin.")
+   (menu-spec :initarg :menu-spec
+	      :type list
+	      :documentation "Specifies menu for this plugin.")
+   (plugins   :type list
+	      :allocation :class
+	      :initform nil
+	      :documentation
+	     "Installed plugins."))
+"Class of plugins.")
+
+
+(defun jde-pi-register (plugin)
+  "Register PLUGIN, which must be an object of
+type `jde-plugin'."
+  (oset-default
+   'jde-plugin
+   plugins
+   (cons plugin (oref 'jde-plugin plugins))))
+
+
+(defun jde-pi-get-plugin-dir (plugin)
+  "Returns the path of the directory containing PLUGIN."
+  (expand-file-name plugin jde-plugins-directory))
+
+
+(defun jde-pi-load-plugin (plugin)
+  "Loads the plugin named PLUGIN. This function assumes that the plugin resides
+in a subdirectory of the JDEE's plugins directory named PLUGIN and that this
+subdirectory contains a subdirectory name lisp that contains
+a file named jde-PLUGIN.el. This function loads jde-PLUGIN.el."
+  (let* ((plugin-dir (expand-file-name plugin jde-plugins-directory))
+	 (plugin-lisp-dir (expand-file-name "lisp" plugin-dir))
+	 (plugin-lisp-package-name (concat "jde-" plugin))
+	 (plugin-lisp-file-name (concat plugin-lisp-package-name ".el"))
+	 (plugin-lisp-file
+	  (expand-file-name
+	   plugin-lisp-file-name
+	   plugin-lisp-dir)))
+    (if (file-exists-p plugin-lisp-file)
+	(progn
+	  (add-to-list 'load-path plugin-lisp-dir)
+	  (require (intern plugin-lisp-package-name)))
+      (error "JDEE plugin Lisp file %s missing" plugin-lisp-file-name))))
+
+
+(defun jde-pi-load-plugins ()
+  "Loads the plugins in the JDEE's plugins directory."
+  (interactive)
+  (if (file-exists-p jde-plugins-directory)
+      (let ((plugins
+	     (delq
+	      nil
+	      (mapcar
+	       (lambda (file)
+		 (let ((file-name (file-name-nondirectory file)))
+		   (if (and
+			(file-directory-p file)
+			(not (string= file-name "."))
+			(not (string= file-name ".."))
+			(not (string= file-name "CVS"))
+			(not (string= file-name "RCS")))
+		       file-name)))
+	       (directory-files jde-plugins-directory t)))))
+	(loop for plugin in plugins do
+	  (jde-pi-load-plugin plugin)))))
+
+(jde-pi-load-plugins)
+
+(defun jde-pi-get-bsh-classpath ()
+  "Get the plugin directories and jar files to include in the Beanshell classpath."
+  (let ((plugins (oref 'jde-plugin plugins))
+	classpath)
+    (loop for plugin in plugins do
+	  (setq classpath (append classpath (oref plugin bsh-cp))))
+    classpath))
+
+
+(defun jde-pi-install-plugins ()
+  "This command installs any plugin distributables that it
+finds in the JDEE's plugins directory. It assumes that
+the distributables are in jar or zip format and that the
+jar program is on the system path."
+  (interactive)
+
+  (assert (executable-find "jar") nil
+    "Cannot find the jar program on the system path.")
+
+  (let ((zip-files
+	 (directory-files jde-plugins-directory nil ".*[.]\\(zip\\|jar\\)")))
+
+    (when zip-files
+      (let ((buf (get-buffer-create "*plugins*")))
+	  (with-current-buffer buf
+	    (erase-buffer)
+	    (insert "JDEE Plugin Installation Log")
+	    (pop-to-buffer buf)
+	    (cd jde-plugins-directory)
+	    (loop for zip-file in zip-files do
+		  (let ((result
+			 (shell-command-to-string
+			(concat "jar xvf " zip-file))))
+		    (insert "\n\n")
+		    (insert (format "Installing %s ..."
+				    (file-name-sans-extension zip-file)))
+		    (insert "\n\n")
+		    (insert result)))
+	    (insert "\n\nInstallation complete"))))))
+
+
+(defun jde-plugin-make-menu-spec ()
+  (if (oref 'jde-plugin plugins)
+      (append
+       (list "JDEpi")
+       (delq
+	nil
+	(mapcan
+	 (lambda (plugin)
+	   (oref plugin menu-spec))
+	 (oref 'jde-plugin plugins))))))
+
+(defvar jde-plugin-mode-map
+  (let ((km (make-sparse-keymap))
+	(menu-spec (jde-plugin-make-menu-spec)))
+    (if menu-spec
+	(easy-menu-define jde-plugin-menu km "JDEE Plugin Minor Mode Menu"
+	  menu-spec))
+    km)
+  "Keymap for JDEE plugin minor mode.")
+
+(defvar jde-plugin-minor-mode nil
+  "Non-nil if JDEE plugin minor mode is enabled.")
+
+(make-variable-buffer-local 'jde-plugin-minor-mode)
+
+(defun jde-plugin-minor-mode (&optional arg)
+  "Toggle JDEE plugin minor mode.
+With prefix argument ARG, turn on if positive, otherwise off..
+
+\\{jde-plugin-mode-map}"
+  (interactive
+   (list (or current-prefix-arg
+	     (if jde-plugin-minor-mode 0 1))))
+
+  (setq jde-plugin-minor-mode
+	(if arg
+	    (>
+	     (prefix-numeric-value arg)
+	     0)
+	  (not jde-plugin-minor-mode)))
+
+  (if (featurep 'xemacs)
+      (let ((menu-spec (jde-plugin-make-menu-spec)))
+	(if menu-spec
+	    (if jde-plugin-minor-mode
+		(easy-menu-add menu-spec jde-plugin-mode-map)
+	      (easy-menu-remove menu-spec))))))
+
+(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin" jde-plugin-mode-map)
+
+
+(provide 'jde-plugins)
+
+;; Change History
+
+;; End of jde-plugins.el
diff --git a/site/jdee/lisp/jde-plugins.elc b/site/jdee/lisp/jde-plugins.elc
new file mode 100644
index 0000000..d279ffe
Binary files /dev/null and b/site/jdee/lisp/jde-plugins.elc differ
diff --git a/site/jdee/lisp/jde-project-file.el b/site/jdee/lisp/jde-project-file.el
new file mode 100644
index 0000000..81da306
--- /dev/null
+++ b/site/jdee/lisp/jde-project-file.el
@@ -0,0 +1,529 @@
+;;; jde-project-file.el -- Integrated Development Environment for Java.
+;; $Id: jde-project-file.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(defconst jde-project-file-version "1.0"
+  "*The current JDE project file version number.")
+
+(defgroup jde-project nil
+  "JDE Project Options"
+  :group 'jde
+  :prefix "jde-")
+
+(defcustom jde-project-context-switching-enabled-p t
+  "*Enable project context switching.
+If non-nil, the JDE reloads a buffer's project file when you switch to the buffer from
+another buffer belonging to another project. You can disable this feature if you prefer
+to load project files manually. The debugger uses this variable to disable context-switching
+temporarily when stepping through code."
+  :group 'jde-project
+  :type 'boolean)
+
+(defun jde-toggle-project-switching ()
+  "Toggles project switching on or off."
+  (interactive)
+  (setq jde-project-context-switching-enabled-p
+	(not jde-project-context-switching-enabled-p)))
+
+(defcustom jde-project-name "default"
+"Specifies name of project to which the current buffer belongs."
+  :group 'jde-project
+  :type 'string)
+
+(defcustom jde-project-file-name "prj.el"
+  "*Specify name of JDE project file.
+When it loads a Java source file, the JDE looks for a lisp file of
+this name (the default is prj.el in the source file hierarchy. If it
+finds such a file, it loads the file. You can use this file to set the
+classpath, compile options, and other JDE options on a
+project-by-project basis."
+  :group 'jde-project
+  :type 'string)
+
+(defcustom jde-project-hooks nil
+  "Specifies a list of functions to be run when a project
+becomes active. The JDE runs the project hooks after
+the jde-mode hooks."
+  :group 'jde-project
+  :type '(repeat (function :tag "Function")))
+
+(defvar jde-loaded-project-file-version nil
+  "*Temporary var that holds the project file version of the project
+being loaded.")
+
+
+(defun jde-project-file-version (ver)
+  (setq jde-loaded-project-file-version ver))
+
+(defvar jde-current-project ""
+  "Path of the project file for the current project.")
+
+(defun jde-find-project-file (dir)
+  "Finds the next project file upwards in the directory tree
+from DIR. Returns nil if it cannot find a project file in DIR
+or an ascendant directory."
+  (let* ((directory-sep-char ?/) ;; Override NT/XEmacs setting
+	 (file (find jde-project-file-name
+		     (directory-files dir) :test 'string=)))
+    (if file
+	(expand-file-name file dir)
+      (if (not (jde-root-dir-p dir))
+	  (jde-find-project-file (expand-file-name ".." dir))))))
+
+(defvar jde-buffer-project-file ""
+  "Path of project file associated with the current Java source buffer.")
+(make-variable-buffer-local 'jde-buffer-project-file)
+
+(defun jde-find-project-files (dir)
+  "Return all the project files in the current directory tree,
+starting with the topmost."
+  (let* ((directory-sep-char ?/) ;; Override NT/XEmacs setting
+	 (file (jde-find-project-file dir))
+	 current-dir files)
+    (while file
+      (setq files (append (list file) files))
+      (setq current-dir (file-name-directory file))
+      (setq
+       file
+       (if (not (jde-root-dir-p current-dir))
+	   (jde-find-project-file
+	    (expand-file-name ".." current-dir)))))
+    files))
+
+(defvar jde-loading-project nil
+  "Used by project loading system.")
+
+(defvar jde-loading-project-file nil
+  "Used by project loading system.")
+
+(defun jde-load-project-file ()
+  "Load the project file(s) for the Java source file in the current
+buffer. Search for all the project file first in the directory
+tree containing the current source buffer. If any files are found,
+first reset all variables to their startup values. Then load
+the project files starting with the topmost in the tree.
+If no project files are found, set the JDE variables to their
+Emacs startup values."
+  (interactive)
+  (setq jde-loading-project t)
+  (let ((prj-files
+	 (jde-find-project-files
+	  ;; Need to normalize path to work around bug in the
+	  ;; cygwin version of XEmacs.
+	  (expand-file-name "." default-directory))))
+    (if prj-files
+	(progn
+	  (jde-set-variables-init-value)
+	  (loop for file in prj-files do
+	    (setq jde-loading-project-file file)
+	    (jde-log-msg "jde-load-project-file: Loading %s" file)
+	    ;; reset project file version
+	    (setq jde-loaded-project-file-version nil)
+	    (load-file file)
+	    (setq jde-loading-project-file nil))
+	  (run-hooks 'jde-project-hooks))
+      (jde-set-variables-init-value t)))
+  (setq jde-loading-project nil))
+
+
+(defun jde-load-all-project-files ()
+  (interactive)
+  "Loads the project file associated with each Java source buffer."
+  (mapc
+   (lambda (java-buffer)
+     (save-excursion
+       (set-buffer java-buffer)
+       (message "Loading project file for %s ..."
+		(buffer-file-name java-buffer))
+       (jde-load-project-file)))
+   (jde-get-java-source-buffers)))
+
+;;;###autoload
+(defun jde-open-project-file ()
+  "Opens the project file for the Java source file in the
+current buffer."
+  (interactive)
+  (let ((prj-file (jde-find-project-file default-directory)))
+    (if prj-file
+	(find-file prj-file)
+      (message "%s" "Project file not found."))))
+
+
+(defun jde-save-delete (symbol buffer)
+  "Delete the call to SYMBOL from project file in BUFFER.
+Leave point at the location of the call, or after the last expression."
+  (save-excursion
+    (set-buffer buffer)
+    (goto-char (point-min))
+    (catch 'found
+      (while t
+	(let ((sexp (condition-case nil
+			(read (current-buffer))
+		      (end-of-file (throw 'found nil)))))
+	  (when (and (listp sexp)
+		     (eq (car sexp) symbol))
+	    (delete-region (save-excursion
+			     (backward-sexp)
+			     (point))
+			   (point))
+	    (throw 'found nil)))))
+    (unless (bolp)
+      (princ "\n"))))
+
+(defun jde-symbol-p (symbol)
+  "Returns non-nil if SYMBOL is a JDE variable."
+  (and (or
+	(get symbol 'custom-type)
+	(get symbol 'jde-project))
+       (or (string-match "^bsh-" (symbol-name symbol))
+	   (string-match "^jde-" (symbol-name symbol)))))
+
+(defvar jde-symbol-list nil
+  "*A list of jde variables which are processed by `jde-save-project'.")
+
+(defun jde-symbol-list (&optional force-update)
+  "Return a list of variables to be processed by `jde-save-project'.
+The first time this is called, the list is saved in `jde-symbol-list'.
+If nonnil, FORCE-UPDATE forces regeneration of `jde-symbol-list'.
+This is useful for updating customization variables defined by
+packages loaded after startup of the JDEE."
+  (if force-update
+      (setq jde-symbol-list nil))
+  (unless jde-symbol-list
+    (mapatoms
+     (lambda (symbol)
+       (if (jde-symbol-p symbol)
+	   (setq jde-symbol-list (cons symbol jde-symbol-list))))))
+  jde-symbol-list)
+
+(defun jde-set-project-name (name)
+  (put 'jde-project-name 'customized-value (list name))
+  (setq jde-project-name name))
+
+(defun jde-put-project (symbol project value)
+  "Stores a new value for SYMBOL in PROJECT, or overwrites any
+existing value."
+  (let ((proj-alist (get symbol 'jde-project)))
+    (if (null proj-alist)
+	(put symbol 'jde-project (list (cons project (list value))))
+      (if (assoc project proj-alist)
+	  (setcdr (assoc project proj-alist) (list value))
+	(put symbol 'jde-project (pushnew (cons project (list value)) proj-alist))))))
+
+(defun jde-get-project (symbol project)
+  "Gets the value for SYMBOL that is associated with PROJECT, or nil
+if none. To test if SYMBOL has any value for PROJECT, use
+`jde-project-present-p'."
+  (car-safe (cdr-safe (assoc project (get symbol 'jde-project)))))
+
+(defun jde-project-present-p (symbol project)
+  "Returns non-nil if SYMBOL has a value for PROJECT."
+  (assoc project (get symbol 'jde-project)))
+
+(defun jde-save-open-buffer (project)
+  "Creates a new buffer or opens an existing buffer for PROJECT."
+  (let ((auto-insert nil)	; turn off auto-insert when
+	buffer standard-output)	; creating a new file
+    (setq buffer (find-file-noselect project))
+    (setq standard-output buffer)
+    (save-excursion
+      (set-buffer buffer)
+      (goto-char (point-min))
+      (jde-save-delete 'jde-project-file-version buffer)
+      (delete-blank-lines)
+      (jde-save-delete 'jde-set-variables buffer)
+      (delete-blank-lines)
+      (jde-save-delete 'jde-set-project-name buffer)
+      (delete-blank-lines))
+    (princ "(jde-project-file-version ")
+    (prin1 jde-project-file-version)
+    (princ ")\n")
+    (princ "(jde-set-variables")
+    (jde-log-msg "jde-save-open-buffer: Opening buffer for %s" project)
+    buffer))
+
+(defun jde-save-close-buffer (project)
+  "Saves and closes the buffer associated with PROJECT."
+  (let* ((buffer
+	  (if jde-xemacsp
+	      (get-file-buffer project)
+	    (find-buffer-visiting project)))
+	 (standard-output buffer))
+    (if buffer
+      (progn
+	(princ ")\n")
+	(save-excursion
+	  (set-buffer buffer)
+	  (save-buffer))
+	(jde-log-msg "jde-save-close-buffer: Closing buffer for %s" project)
+	(kill-buffer buffer))
+      (jde-log-msg "jde-save-close-buffer: Unable to find buffer for %s" project))))
+
+(defun jde-save-variable (symbol projects)
+  "Saves all of the values of SYMBOL for each project file mentioned
+in PROJECTS."
+  (mapc
+   (lambda (project)
+     (if (and (not (string= (car project) "default"))
+	      (member (car project) projects))
+	 (let ((buffer
+		(if jde-xemacsp
+		    (get-file-buffer (car project))
+		  (find-buffer-visiting (car project))))
+	       standard-output)
+	   (if (null buffer)
+	       (setq standard-output (setq buffer (jde-save-open-buffer (car project))))
+	     (setq standard-output buffer))
+	   (jde-log-msg "jde-save-variable: Saving %S in %s" symbol (car project))
+	   (princ "\n '(")
+	   (princ symbol)
+	   (princ " ")
+	   (prin1 (custom-quote (car (cdr project))))
+	   (princ ")"))))
+   (get symbol 'jde-project)))
+
+(defun jde-save-needs-saving-p (symbol projects)
+  "Function used internally by the project saving mechanism to
+determine whether or not to save a symbol in a project file.  If there
+are settings to be saved, this function also resolves which project
+should receive the customized values."
+  (unless (= (length projects) 0)
+    (let ((value (symbol-value symbol))
+	  val-to-save
+	  current-proj proj-iter)
+      (setq current-proj (car projects))
+      (cond
+      ;; CASE: current value changed from saved value in current
+       ;; project
+       ((and (jde-project-present-p symbol current-proj)
+	     (not (null (get symbol 'customized-value))) ;; not decustomized.
+	     (not (equal value (jde-get-project symbol current-proj))))
+	(jde-log-msg "jde-save-needs-saving-p: changed value for %S in project `%s'"
+		     symbol current-proj)
+	(jde-put-project symbol current-proj value)
+	t)
+       ;; CASE: no value for symbol in current project - check all
+       ;; parent projects (plus default) to see if value has changed
+       ((and (not (jde-project-present-p symbol current-proj))
+	     (progn
+	       (setq val-to-save value)
+	       (setq proj-iter (cdr projects))
+	       (while (and proj-iter
+			   (not (jde-project-present-p symbol (car proj-iter))))
+		 (setq proj-iter (cdr proj-iter)))
+	       (if proj-iter
+		   (not (equal value
+			       (jde-get-project symbol (car proj-iter))))
+		 (setq val-to-save (eval (car (get symbol 'customized-value))))
+		 (and (not (null (get symbol 'customized-value))) ;; has been customized.
+		      (or                               ;; either
+		       (null (get symbol 'saved-value)) ;; not saved in .emacs file, or
+		       (not (equal val-to-save          ;; different from value in .emacs file
+				   (eval (car (get symbol 'saved-value))))))))))
+	(jde-log-msg "jde-save-needs-saving-p: override value %S from parent `%s' in project `%s'"
+		     symbol (car proj-iter) current-proj)
+	(jde-put-project symbol current-proj val-to-save)
+	t)
+       ;; CASE: current value same as value in the deepest project that
+       ;; holds that value - re-save it
+       ((progn
+	  (setq proj-iter projects)
+	  (while (and proj-iter
+		      (not (jde-project-present-p symbol (car proj-iter))))
+	    (setq proj-iter (cdr proj-iter)))
+	  (if proj-iter
+	      (equal value (jde-get-project symbol (car proj-iter)))))
+	(jde-log-msg "jde-save-needs-saving-p: original value for %S in project `%s'"
+		     symbol (car proj-iter))
+	t)))))
+
+(defun jde-save-project-internal (projects)
+  (let ((projects-reversed (nreverse projects)))
+    (jde-log-msg "jde-save-project-internal: projects: %S" projects-reversed)
+    (mapc 'jde-save-open-buffer projects-reversed)
+    (mapc (lambda (symbol)
+	    (if (jde-save-needs-saving-p symbol projects-reversed)
+		(jde-save-variable symbol projects-reversed)))
+	  (jde-symbol-list))
+    (mapc 'jde-save-close-buffer projects-reversed)))
+
+;;;###autoload
+(defun jde-save-project ()
+  "Saves source file buffer options in one or more project files.
+This command provides an easy way to create and update a project file
+for a Java project. Simply open a source file, set the desired
+options, using the JDE Options menu, then save the settings in the
+project file, using this command.  Now, whenever you open a source
+file from the same directory tree, the saved settings will be restored
+for that file."
+  (interactive)
+  (let* ((directory-sep-char ?/) ;; Override NT/XEmacs setting
+	(project-file-paths (jde-find-project-files default-directory)))
+    (if (not project-file-paths)
+	(setq project-file-paths
+	      (list (expand-file-name jde-project-file-name
+				      (read-file-name "Save in directory: "
+						      default-directory
+						      default-directory)))))
+    (jde-save-project-internal project-file-paths)))
+
+;;;###autoload
+(defun jde-create-new-project (new-dir)
+  "Creates a new JDE project file in directory NEW-DIR, saving any
+current customized variables.  If a project file already exists in the
+given directory, the project is simply re-saved.  This functions the
+same as `jde-save-project' when no project files can be found for the
+current source file.  But, if there already exist projects somewhere
+along the path, this command unconditionally creates a project file in
+the directory specified, thus allowing the user to create and maintain
+hierarchical projects."
+  (interactive "DCreate new project in directory: ")
+  (let* ((directory-sep-char ?/) ;; Override NT/XEmacs setting
+	 (prj-file (expand-file-name jde-project-file-name new-dir))
+	 (projects (jde-find-project-files new-dir)))
+    (if (not (member prj-file projects))
+	;; create empty project file if none found
+	(let* ((auto-insert nil)	; disable auto-insert
+	       (standard-output (find-file-noselect prj-file))
+	       (message-log-max nil))	; disable message log
+	  (princ "(jde-project-file-version ")
+	  (prin1 jde-project-file-version)
+	  (princ ")\n(jde-set-variables)\n")
+	  (save-excursion
+	    (set-buffer standard-output)
+	    (save-buffer))
+	  (kill-buffer standard-output)
+	  (setq projects (nconc projects (list prj-file)))))
+    (jde-save-project-internal projects)))
+
+
+(defvar jde-dirty-variables nil
+  "JDEE customization variables that have project-specific customizations.")
+
+(defun jde-set-variables (&rest args)
+  "Initialize JDE customization variables.
+
+Takes a variable number of arguments. Each argument
+should be of the form:
+
+  (SYMBOL VALUE)
+
+The value of SYMBOL is set to VALUE.
+This function is used in JDEE project files."
+  (while args
+    (let ((entry (car args)))
+      (if (listp entry)
+	  (let* ((symbol (nth 0 entry))
+		 (value (nth 1 entry))
+		 (customized (nth 2 entry))
+		 (set (or (and (local-variable-if-set-p symbol nil) 'set)
+			  (get symbol 'custom-set)
+			  'set-default)))
+
+	    (add-to-list 'jde-dirty-variables symbol)
+
+	    (if (or customized
+		    jde-loaded-project-file-version)
+		(put symbol 'customized-value (list value)))
+	    (if jde-loading-project-file
+		(progn
+		  (jde-log-msg "jde-set-variables: Loading %S from project %s" symbol
+			       jde-loading-project-file)
+		  (jde-put-project symbol
+				   jde-loading-project-file
+				   (eval value)))
+	      (jde-log-msg "jde-set-variables: Loading %S from unknown project" symbol))
+	    (when (default-boundp symbol)
+	      ;; Something already set this, overwrite it
+	      (funcall set symbol (eval value)))
+	    (setq args (cdr args)))))))
+
+(defsubst jde-set-variable-init-value(symbol)
+  "Set a variable  to the value it has at Emacs startup."
+ (let ((val-to-set (eval (car (or (get symbol 'saved-value)
+				   (get symbol 'standard-value)))))
+	(set (or (get symbol 'custom-set) 'set-default)))
+    (if (or (get symbol 'customized-value)
+	    (get symbol 'jde-project))
+	(funcall set symbol val-to-set))
+    (put symbol 'customized-value nil)
+    (put symbol 'jde-project nil)
+    (jde-put-project symbol "default" val-to-set)))
+
+(defun jde-set-variables-init-value (&optional msg)
+  "Set each JDEE variable that has a project-specific customization
+to the value it has at Emacs startup (i.e., before any projects
+have been loaded)."
+  (interactive)
+  (if (or (interactive-p) msg)
+      (message "Setting customized JDE variables to startup values..."))
+  (if jde-dirty-variables
+      (mapcar
+       'jde-set-variable-init-value
+       jde-dirty-variables)))
+
+;; Code to update JDE customization variables when a user switches
+;; from a Java source buffer belonging to one project to a buffer
+;; belonging to another.
+
+(defun jde-reload-project-file ()
+  "If project context-switching is enabled (see
+`jde-project-context-switching-enabled-p') and a debugger
+is not running (see `jde-debugger-running-p'), reloads the project file
+for a newly activated Java buffer when the new buffer's project
+differs from the old buffer's."
+  (condition-case err
+      (let ((project-file-path (jde-find-project-file default-directory)))
+	(if (not project-file-path) (setq project-file-path ""))
+	(if (and
+	     jde-project-context-switching-enabled-p
+	     (not (jde-debugger-running-p))
+	     (not (string=
+		   (file-truename jde-current-project)
+		   (file-truename project-file-path))))
+	    (progn
+	      (setq jde-current-project project-file-path)
+	      (jde-load-project-file)
+	      (jde-wiz-set-bsh-project))))
+    (error (message
+	    "Project file reload error: %s"
+	    (error-message-string err)))))
+
+(defun jde-update-autoloaded-symbols ()
+  "Regenerate `jde-symbol-list' and reload
+the project files for the current project. Insert
+this function at the end of autoloaded JDEE packages
+to register and  initialize customization variables
+defined by the current project's project file."
+  (jde-symbol-list t)
+  (jde-load-project-file))
+
+
+(provide 'jde-project-file)
+
+;; End of jde-project-file.el
diff --git a/site/jdee/lisp/jde-project-file.elc b/site/jdee/lisp/jde-project-file.elc
new file mode 100644
index 0000000..450a62e
Binary files /dev/null and b/site/jdee/lisp/jde-project-file.elc differ
diff --git a/site/jdee/lisp/jde-project.el b/site/jdee/lisp/jde-project.el
new file mode 100644
index 0000000..84bef72
--- /dev/null
+++ b/site/jdee/lisp/jde-project.el
@@ -0,0 +1,228 @@
+;;; jde-project.el -- Integrated Development Environment for Java.
+;; $Id: jde-project.el 179 2009-12-27 01:58:29Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2000 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'eieio)
+
+(defgroup jde-project nil
+  "JDE Project Options"
+  :group 'jde
+  :prefix "jde-project")
+
+
+(defvar jde-project-menu-definition
+  (list "JDEPrj"
+	["New"   jde-project-create-project t]
+	)
+  "Defines the JDE project menu")
+
+(defvar jde-project-keymap (make-sparse-keymap)
+  "JDE Project keymap.")
+
+(easy-menu-define
+ jde-project-menu jde-project-keymap
+ "JDE Project menu" jde-project-menu-definition)
+
+
+(defcustom jde-project-key-bindings nil
+  "Specifies key bindings for JDE's project-related commands."
+  :group 'jde-project)
+
+(if (and
+     (or
+      (not jde-xemacsp)
+      (featurep 'infodock)))
+    (define-key-after (cdr (assq 'menu-bar global-map))
+      [jde-project]
+      (cons (car jde-project-menu-definition) jde-project-menu) 'mule))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                           ;;
+;; Project Class                                                             ;;
+;;                                                                           ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-project ()
+  ((name     :initarg :name
+	     :type string
+	     :documentation
+	     "Name of project")
+   (dir      :initarg :dir
+	     :type string
+	     :documentation
+	     "Path of directory that contains this project.")
+   (prj-file :initarg :prj-file
+	     :type string
+	     :documentation
+	     "Project file for this project.")
+   (src      :initarg :src
+	     :type string
+	     :documentation
+	     "Path of directory that contains the source for this project"))
+  (:allow-nil-initform t)
+  "Class of JDE projects.")
+
+
+(defclass jde-project-create-dialog (efc-dialog)
+  ((project    :initarg :project
+	      :documentation
+	      "Project that this dialog creates.")
+   (name-field :initarg :name-field
+	      :documentation
+	      "Field for entering project name.")
+   (dir-field :initarg :dir-field
+	      :documentation
+	      "Field for entering project root directory."))
+ "Dialog for entering information required to create a project.")
+
+(defmethod efc-dialog-create ((this jde-project-create-dialog))
+
+  (widget-insert "Create Project\n\n")
+
+    (oset this name-field
+	(widget-create
+	 'editable-field
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Project Name"
+	 :doc "Name of project."))
+
+    (oset this dir-field
+	(widget-create
+	 'directory
+	 :format "  %t:  %v\n  %h \n\n"
+	 :size 40
+	 :tag "Project Directory"
+	 :value default-directory
+	 :doc "Root directory for project. Use M-tab to complete.")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                           ;;
+;; Application Create Dialog Class                                           ;;
+;;                                                                           ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-project-application-create-dialog (jde-project-create-dialog)
+  ()
+ "Create a jde-project-app-create-dialog.")
+
+(defmethod efc-dialog-ok ((this jde-project-application-create-dialog))
+  "Callback function executed when the user presses the OK button in
+the Application Project Creation dialog."
+  (let* ((project (oref this :project))
+	 (name (widget-value (oref this name-field)))
+	 (dir (widget-value (oref this dir-field)))
+	 (proj-dir (expand-file-name name dir)))
+    (oset project :name name)
+    (oset project :dir proj-dir)
+    (jde-project-create project)
+    (call-next-method)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                           ;;
+;; Application Project Class                                                 ;;
+;;                                                                           ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass jde-project-application (jde-project)
+  ()
+  "Class of JDE application projects")
+
+
+(defmethod jde-project-create ((this jde-project-application))
+    (if (not (file-exists-p (oref this dir)))
+	(if (yes-or-no-p
+	      (format "%s does not exist. Should I create it?" (oref this dir)))
+	    (make-directory (oref this dir))
+	  (error "Cannot create project.")))
+
+    ;; Make source directory
+    (setq dir (expand-file-name "src" (oref this dir)))
+    (if (not (file-exists-p dir)) (make-directory dir))
+
+    ;; Make classes directory
+    (setq dir (expand-file-name "classes" (oref this dir)))
+    (if (not (file-exists-p dir)) (make-directory dir))
+)
+
+
+(defmethod jde-project-show-creation-dialog ((this jde-project-application))
+  "Shows the dialog for creating a Java application project."
+  (let ((dialog
+	 (jde-project-application-create-dialog
+	  "project create dialog"
+	  :project this)))
+    (efc-dialog-show dialog)))
+
+
+;;; utility functions
+
+;;;###autoload
+(defun jde-project-create-project ()
+  "Creates a JDE project."
+  (interactive)
+  (let ((project (jde-project-application "Application")))
+    (jde-project-show-creation-dialog project)))
+
+;;;###autoload
+(defun jde-describe-path (path-type)
+  "Prints and gives file existance for each path.
+PATH-TYPE is either `global classpath' for `jde-global-classpath' or
+`source path' for `jde-sourcepath'."
+  (interactive
+   (list (completing-read "Path: " '("global classpath" "source path") nil t)))
+  (let ((user-home (expand-file-name "~/"))
+	path-name path desc)
+    (if (equal "source path" path-type)
+	(setq path-name "Source Path"
+	    path jde-sourcepath)
+      (setq path-name "Global Classpath"
+	      path jde-global-classpath))
+    (save-excursion
+      (set-buffer (get-buffer-create (format "*JDEE %s*" path-name)))
+      (setq truncate-lines t)
+      (erase-buffer)
+      (insert (format "%s:
+d:      directory
+f:      file
+blank:  path doesn't exist
+--------------------------\n" path-name))
+      (dolist (file path)
+	(setq desc (cond ((file-directory-p file) "d")
+			 ((file-exists-p file) "f")
+			 (t " ")))
+	(setq file (replace-regexp-in-string "~/" user-home file nil t))
+	(insert (format "[%s]  %s\n" desc file)))
+      (goto-char (point-min))
+      (pop-to-buffer (current-buffer)))))
+
+(provide 'jde-project)
+
+;; End of jde-project.el
diff --git a/site/jdee/lisp/jde-project.elc b/site/jdee/lisp/jde-project.elc
new file mode 100644
index 0000000..0754148
Binary files /dev/null and b/site/jdee/lisp/jde-project.elc differ
diff --git a/site/jdee/lisp/jde-refactor.el b/site/jdee/lisp/jde-refactor.el
new file mode 100644
index 0000000..df90e09
--- /dev/null
+++ b/site/jdee/lisp/jde-refactor.el
@@ -0,0 +1,69 @@
+;;; jde-refactor.el -- Refactor Java code.
+;; $Id: $
+
+;; Author: Paul Landes <landes <at> mailc dt net>
+;; Maintainer: Paul Landes
+;; Keywords: java refactor
+
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Provide refactoring (think Eclipse) utility like renaming and repackaging
+;; classes.
+
+;;; Code:
+
+(require 'jde-parse)
+(require 'jde-util)
+
+;;;###autoload
+(defun jde-rename-class (new-class-name)
+  "Rename the current class to another class name.  This does a class name
+string replace, changes the buffer name, and changes the file name."
+  (interactive "sNew class name: ")
+  (if (not (eql 'jde-mode major-mode))
+      (error "Not a Java source buffer."))
+  (let* ((buf-name (buffer-name))
+	 (old-class-name
+	  (with-temp-buffer
+	    (insert buf-name)
+	    (goto-char (point-min))
+	    (if (re-search-forward "\\.java$" nil t)
+		(replace-match ""))
+	    (buffer-substring-no-properties (point-min) (point-max))))
+	 (old-class-regexp (regexp-quote old-class-name)))
+    (save-some-buffers)
+    (dired-rename-file (buffer-file-name) (concat new-class-name ".java") t)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward old-class-regexp nil t)
+	(replace-match new-class-name)))))
+
+;;;###autoload
+(defun jde-replace-fully-qualified-class-at-point (class)
+  "Replace the unqualified class at the current point with the fully qualified
+class."
+  (interactive (list (jde-read-class "Fully qualify" nil nil nil t)))
+  (let ((range (bounds-of-thing-at-point 'symbol)))
+    (delete-region (car range) (cdr range))
+    (insert class)))
+
+(provide 'jde-refactor)
+
+;; End of jde-refactor.el
diff --git a/site/jdee/lisp/jde-refactor.elc b/site/jdee/lisp/jde-refactor.elc
new file mode 100644
index 0000000..6d5ed2d
Binary files /dev/null and b/site/jdee/lisp/jde-refactor.elc differ
diff --git a/site/jdee/lisp/jde-run.el b/site/jdee/lisp/jde-run.el
new file mode 100644
index 0000000..c4ff2b6
--- /dev/null
+++ b/site/jdee/lisp/jde-run.el
@@ -0,0 +1,1640 @@
+;; jde-run.el --- runs the Java app in the current buffer.
+;; $Id: jde-run.el 175 2009-12-24 02:59:33Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: tools, processes
+
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008 Paul Kinnucan
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+(require 'eieio)
+
+(defcustom jde-run-mode-hook nil
+  "*List of hook functions run by `jde-run-mode' (see `run-hooks')."
+  :group 'jde-project
+  :type 'hook)
+
+(defcustom jde-run-application-class ""
+  "*Name of the Java class to run.
+This is the class that is run if you select JDE->Run App from the JDE
+menu or type C-c C-v C-r. If this option is the empty string, the JDE
+runs the class corresponding to the source file in the current
+buffer. Note that the specified class must have a static public main
+method."
+  :group 'jde-project
+  :type 'string)
+
+(defcustom jde-run-working-directory ""
+  "*Path of the working directory for this application.
+If you specify a path, the JDE launches the application from the
+directory specified by the path."
+  :group 'jde-project
+  :type 'file)
+
+
+(defcustom jde-vm-path ""
+  "*Path of the Java virtual machine executable. The path
+can include environment variables, e.g.,
+$JDK_HOME/bin/java. If the value of this variable is the
+empty string, the JDE uses the vm that comes with the
+version of the JDK specified by jde-jdk or, if jde-jdk
+is not set, the vm on the system command path."
+  :group 'jde-project
+  :type 'file)
+
+
+(defcustom jde-run-classic-mode-vm nil
+"Runs applications in the classic (i.e., not HotSpot) mode."
+  :group 'jde-project
+  :type 'boolean)
+
+
+(defcustom jde-run-read-vm-args nil
+"*Read vm arguments from the minibuffer.
+If this variable is non-nil, the jde-run command reads vm arguments
+from the minibuffer and appends them to those specified by
+the `jde-run-option' variable group."
+  :group 'jde-project
+  :type 'boolean)
+
+(defvar jde-run-interactive-vm-arg-history nil
+"History of vm arguments read from the minibuffer")
+
+(defcustom jde-run-read-app-args nil
+"*Read arguments to be passed to application from the minibuffer."
+  :group 'jde-project
+  :type 'boolean)
+
+(defvar jde-run-interactive-app-arg-history nil
+"History of application arguments read from the minibuffer")
+
+(defgroup jde-run-options nil
+  "JDE Interpreter Options"
+  :group 'jde
+  :prefix "jde-run-option-")
+
+;; (makunbound 'jde-run-option-classpath)
+(defcustom jde-run-option-classpath "global"
+"*Specify paths of classes required to run this application.
+Choose Global from the customization buffer value menu to use
+the paths specified by `jde-global-classpath'.
+Choose Local from the menu to override the
+`jde-global-classpath' option. Choose None to specify
+no classpath."
+  :group 'jde-run-options
+  :type '(choice
+	  (const :menu-tag "Global" "global")
+	  (repeat :menu-tag "Local" (file :tag "Path"))
+	  (const :menu-tag "None" "none")))
+
+(defcustom jde-run-option-verbose (list nil nil nil)
+  "*Print messages about the running process.
+The messages are printed in the run buffer."
+  :group 'jde-run-options
+  :type '(list :indent 2
+	       (checkbox :format "\n  %[%v%] %h \n"
+			 :doc "Print classes loaded.
+Prints a message in the run buffer each time a class is loaded.")
+	       (checkbox :format "%[%v%] %h \n"
+			 :doc "Print memory freed.
+Prints a message in the run buffer each time the garbage collector
+frees memory.")
+	       (checkbox :format "%[%v%] %h \n"
+			 :doc "Print JNI info.
+Prints JNI-related messages including information about which native
+methods have been linked and warnings about excessive creation of
+local references.")))
+
+;;(makunbound 'jde-run-option-properties)
+(defcustom jde-run-option-properties nil
+  "*Specify property values.
+Enter the name of the property, for example, awt.button.color, in the
+Property Name field; enter its value, for example, green, in the
+Property Value field. You can specify as many properties as you like."
+  :group 'jde-run-options
+  :type '(repeat (cons :tag "Property"
+		  (string :tag "Name")
+		  (string :tag "Value"))))
+
+(defcustom jde-run-option-heap-size (list
+				     (cons 1 "megabytes")
+				     (cons 16 "megabytes"))
+"*Specify the initial and maximum size of the interpreter heap."
+:group 'jde-run-options
+:type '(list
+	(cons (integer :tag "Start")
+	     (radio-button-choice (const "bytes")
+				  (const "kilobytes")
+				  (const "megabytes")
+				  (const "gigabytes")))
+	(cons (integer :tag "Max")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))))
+
+(defcustom jde-run-option-stack-size (list
+				      (cons 128 "kilobytes")
+				      (cons 400 "kilobytes"))
+  "*Specify size of the C and Java stacks."
+  :group 'jde-run-options
+  :type '(list
+	  (cons (integer :tag "C Stack")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))
+	  (cons (integer :tag "Java Stack")
+	       (radio-button-choice (const "bytes")
+				    (const "kilobytes")
+				    (const "megabytes")
+				    (const "gigabytes")))))
+
+(defcustom jde-run-option-garbage-collection (list t t)
+  "*Specify garbage collection options."
+  :group 'jde-run-options
+  :type '(list :indent 2
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Collect garbage asynchronously.")
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Collect unused classes.")))
+
+(defcustom jde-run-option-java-profile (cons nil "./java.prof")
+  "*Enable Java profiling."
+  :group 'jde-run-options
+  :type '(cons boolean
+	       (file :tag "File"
+		     :help-echo
+"Specify where to put profile results here.")))
+
+(defcustom jde-run-option-heap-profile (cons nil
+						   (list "./java.hprof"
+							 5
+							 20
+							 "Allocation objects"))
+"*Output heap profiling data."
+  :group 'jde-run-options
+  :type '(cons boolean
+	       (list
+		(string :tag "Output File Path")
+		(integer :tag "Stack Trace Depth")
+		(integer :tag "Allocation Sites")
+		(radio-button-choice :format "%t \n%v"
+				     :tag "Sort output based on:"
+		 (const "Allocation objects")
+		 (const "Live objects")))))
+
+;; (makunbound 'jde-run-option-verify)
+(defcustom jde-run-option-verify (list nil t)
+  "*Verify classes."
+  :group 'jde-run-options
+  :type '(list :indent 2
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Executed code in all classes.")
+	       (checkbox :format "%[%v%] %t \n"
+			 :tag "Classes loaded by a classloader.")))
+
+;; (makunbound 'jde-run-option-boot-classpath)
+(defcustom jde-run-option-boot-classpath nil
+  "Specify a list of directories, JAR archives, and ZIP archives to
+search for boot class files.
+
+To specify the standard boot classpath, select \"standard\" from the
+Value Menu. To specify a custom boot classpath, select \"custom\" from
+the Value Menu. Emacs displays a \"Custom Mode\" Value Menu and an
+\"INS\" button for creating a list of directories and/or JAR and ZIP
+archives. To append the custom list to the standard list, select
+\"append\" from the Value Menu.  To prepend the custom list to the
+standard list, select \"prepend\" from the Value Menu. To replace the
+standard list with the custom list, select \"replace\" from the Value
+Menu.
+
+Note that if `jde-jdk' specifies the 1.2.x version of the JDK, the
+JDEE replaces the standard list with the custom list regardless of the
+setting of the \"Custom Mode\" Value Menu. The JDEE ignores this
+option if `jde-jdk' specifies the 1.1.x version of the JDK.
+
+Note also that the value of this variable is either nil or a cons
+whose cdr is a list of strings, each of which specifies a path. The
+JDE converts this list to a colon- or semicolon-separated list before
+inserting it in the compiler or vm command line. The paths may start
+with a tilde (~) and may include environment variables. The JDE
+replaces the ~ with your home directory and replaces each instance of
+an environment variable with its value before inserting it into a
+command line. The paths may also start with a . (period) to indicate
+that the path is a relative path. If `jde-resolve-relative-paths-p' is
+nonnil, the JDEE treats the paths as relative to the location of the
+project file for the current project and replaces the period (.) with
+the path of the directory containing the project file."
+  :group 'jde-run-options
+  :type '(choice
+	  :tag "Classpath Options"
+	  (const :tag "standard" nil)
+	  (cons :tag "custom" :inline nil
+		(choice
+		 :tag "Custom Mode"
+		 (const "append")
+		 (const "prepend")
+		 (const "replace"))
+		(repeat
+		 :tag "Classpath"
+		 (file :tag "Path")))))
+
+
+;; (makunbound 'jde-run-option-debug)
+(defcustom jde-run-option-debug nil
+  "*If \"Connect\" is selected, this option allows the application to
+  start and then connect to a debugger, for example, jdb or JDEbug.
+
+\"Mode\" specifies the method for establishing the connection. The
+options are \"Server\" (allow a debugger to attach to the application
+after the application starts) or \"Client\" (allows the application to connect
+to a listening debugger).
+
+\"Data Transport\" specifies the method that the debuggee process uses to
+communicate with the debugger. The \"Shared Memory\" option is valid
+only when the the debuggee process and the debugger are both running
+on the same Microsoft Windows system. (It is also the best choice for
+such debugging sessions.) You must choose \"Socket\" if the debugger
+and the debuggee process run on different systems or if they both
+run on the same Unix system.
+
+The \"Shared Memory Name\" option specifies the name of the shared
+memory connection used to connect the debugger and the application.
+This option applies only when you specify a shared memory connection
+to the debugger.
+
+The \"Socket Host\" specifes the host on which a remote debugger
+resides. This option applies only when you run the process in
+client mode, using a socket transport.
+
+The \"Socket Port\" option specifies the socket port used to
+connect this process to the debugger. This option applies only
+when you select socket as the transport method.
+
+The \"Suspend\" option specifies whether the vm should suspend
+this process on startup."
+  :group 'jde-run-options
+  :type  '(choice
+	   :tag "Debug Connection Options"
+	   (const :tag "No connect" nil)
+	   (list
+	    :tag "Connect"
+	    :inline nil
+	    (choice
+	     :tag "Mode"
+	     (const "Server")
+	     (const "Client"))
+	    (choice
+	     :tag "Data Transport"
+	     (const "Shared Memory")
+	     (const "Socket"))
+	    (choice
+	     :tag "Shared Memory Name"
+	     (const :menu-tag "Default" "javadebug")
+	     (string :menu-tag "Custom" :tag "Name"))
+	    (choice
+	     :tag "Socket Host"
+	     (const :menu-tag "Local" nil)
+	     (string :menu-tag "Remote" :tag "Name"))
+	    (choice
+	     :tag "Socket Port"
+	     (const :menu-tag "Default" "4444")
+	     (string :menu-tag "Custom" :tag "Address"))
+	    (choice
+	     :tag "Suspend?"
+	     (const :tag "No" nil)
+	     (const :tag "Yes" t)))))
+
+(defcustom jde-run-option-interpret-mode nil
+  "Causes the vm to interpret all byte codes. By default VMs
+predating JDK 1.3 use a JIT compiler to execute bytecodes. A JIT
+compiler translates the class bytecodes into native machine code when
+a class is loaded. Beginning with JDK 1.3, VMs use a Hotspot
+compiler. A Hotspot compiler compiles sections of code that execute
+frequently."
+   :group 'jde-run-options
+   :type 'boolean)
+
+(defcustom jde-run-option-jar nil
+  "Execute a program encapsulated in a JAR file.
+Set `jde-run-application-class' to the name of a JAR file instead of a
+startup class name. In order for this option to work, the manifest of
+the JAR file must contain a line of the form Main-Class:
+classname. Here, classname identifies the class having the public
+static void main(String[] args) method that serves as your
+application's starting point. See the Jar tool reference page and the
+Jar trail of the Java Tutorial for information about working with Jar
+files and Jar-file manifests.  When you use this option, the JAR file
+is the source of all user classes, and other user class path settings
+are ignored."
+  :group 'jde-run-options
+  :type 'boolean)
+
+
+(defcustom jde-run-option-hotspot-type 'client
+  "Specify whether to use the Hotspot client or server vm."
+  :group 'jde-run-options
+  :type  '(choice :tag "vm type"
+		  (const :tag "client"    client)
+		  (const :tag "server"    server)))
+
+
+;;(makunbound 'jde-run-option-enable-assertions)
+(defcustom jde-run-option-enable-assertions "Nowhere"
+  "Enable assertions for the current project.
+
+To disable assertions everywhere (the default), select \"Nowhere\"
+from the Value Menu. To enable assertions everywhere except in system
+classes, select \"Everywhere\" from the Value Menu. To enable
+assertions in specific locations, select \"Somewhere\" from the Value
+Menu. The customization buffer expands, allowing you to enable
+assertions in the package in the current directory (the directory of
+the current Java source buffer), and in specific packages and classes.
+
+To enable assertions everwhere except in specified locations, set this
+option to \"Everywhere\" and use `jde-run-option-disable-assertions'
+to specify the exceptions. To enable assertions in system classes, set
+`jde-run-option-enable-system-assertions' on.
+
+The JDEE  ignores this option if `jde-jdk' specifies a version
+of the JDK that precedes version 1.4, which
+introduced assertions into Java."
+  :group 'jde-run-options
+  :type '(choice :tag "Enable assertions"
+	      (const "Nowhere")
+	      (const "Everywhere")
+	      (cons :tag "Somewhere" :inline "Everywhere"
+		    (boolean :tag "In current directory")
+		    (repeat :tag "In the following locations"
+			    (cons :tag "Location"
+				  (choice :tag "Type"
+					  (const "package")
+					  (const "class"))
+				  (string :tag "Name"))))))
+
+;;(makunbound 'jde-run-option-disable-assertions)
+(defcustom jde-run-option-disable-assertions "Nowhere"
+  "Enable assertions.
+
+Use this option to specify exceptions to packages and classes enabled
+by `jde-run-option-enable-assertions'. To not disable assertions
+anywhere (the default), select \"Nowhere\" from the Value Menu. To
+disable assertions everywhere except in system classes, select
+\"Everywhere except system\" from the Value Menu or set
+`jde-run-option-enable-system-assertions' on.  To disable assertions
+in specific locations, select \"Somewhere\" from the Value Menu. The
+customization buffer expands, allowing you to enable assertions in the
+package in the current directory (the directory of the current Java
+source buffer), and in specific packages and classes.
+
+The JDEE  ignores this option if `jde-jdk' specifies a version
+of the JDK that precedes version 1.4, which
+introduced assertions into Java."
+  :group 'jde-run-options
+  :type '(choice :tag "Disable assertions"
+	      (const "Nowhere")
+	      (const "Everywhere")
+	      (cons :tag "Somewhere" :inline "Everywhere"
+		    (boolean :tag "In current directory")
+		    (repeat :tag "In the following locations"
+			    (cons :tag "Location"
+				  (choice :tag "Type"
+					  (const "package")
+					  (const "class"))
+				  (string :tag "Name"))))))
+
+(defcustom jde-run-option-enable-system-assertions nil
+  "Enable assertions in system classes."
+  :group 'jde-run-options
+  :type 'boolean)
+
+(defcustom jde-run-option-disable-system-assertions nil
+  "Disable assertions in system classes."
+  :group 'jde-run-options
+  :type 'boolean)
+
+(defcustom jde-run-option-vm-args nil
+  "*Specify arguments to be passed to the Java vm.
+This option allows you to specify one or more arguments to be passed
+to the Java interpreter. It is an alternative to using JDE Run Option
+variables, such as `jde-run-option-stack-size', to specify Java
+interpreter options. Also, it makes it possible to use the JDE with
+interpreters that accept command line arguments not supported by
+the JDE Run Option variable set."
+  :group 'jde-run-options
+  :type '(repeat (string :tag "Argument")))
+
+(defcustom jde-run-option-application-args nil
+  "*Specify command-line arguments to pass to the application.
+The JDE passes the specified arguments to the application on
+the command line."
+  :group 'jde-run-options
+  :type '(repeat (string :tag "Argument")))
+
+(defcustom jde-run-applet-viewer ""
+  "*Specify name of viewer to use to display page containing the applet."
+  :group 'jde-project
+  :type 'file)
+
+(defcustom jde-run-applet-doc ""
+  "*Specify name of document containing applet to be viewed.
+If no document is specified, JDE assumes that the document name is
+APPLET.html, where APPLET is the name of the applet to be viewed."
+  :group 'jde-project
+  :type 'file)
+
+
+(defcustom jde-appletviewer-option-encoding ""
+"*Specify encoding of the HTML file displayed by the appletviewer."
+  :group 'jde-run-options
+  :type 'string)
+
+
+(defcustom jde-appletviewer-option-vm-args nil
+  "*Specify arguments (e.g., -Xmx16m) to the vm that runs appletviewer.
+This option allows you to set the environment of the
+virtual machine that runs appletviewer."
+  :group 'jde-run-options
+  :type '(repeat (string :tag "Argument")))
+
+
+(defcustom jde-run-executable ""
+  "*Specifies the executable to be run by the JDE's run command.
+If you do not specify an executable, the JDE runs the vm specified
+by `jde-run-get-vm'."
+  :group 'jde-project
+  :type 'file)
+
+(defcustom jde-run-executable-args nil
+  "*Specify arguments to be passed to the application executable.
+This option allows you to specify one or more arguments to be passed
+to the executable specified by `jde-run-executable'."
+  :group 'jde-run-options
+  :type '(repeat (string :tag "Argument")))
+
+
+(defmacro save-w32-show-window (&rest body)
+  "Saves the value of the w32-start-process-show-window variable
+before evaluating body and restores the value afterwards."
+  `(let ((win32-start-process-show-window t)
+	 (w32-start-process-show-window t)
+	 (w32-quote-process-args ?\")
+	 (win32-quote-process-args ?\") ;; XEmacs
+	 (windowed-process-io t)
+	 (process-connection-type nil))
+     ,@body))
+
+(defun jde-run-parse-args (s)
+ "Converts a string of command-line arguments to a list of arguments.
+Any substring that is enclosed in single or double quotes or does not include
+whitespace is considered a parameter."
+   (let ((n (string-match "[^\"' ][^ ]*\\|\"[^\"]*\"\\|'[^']*'" s))
+	(tok)
+	(tokens '()))
+     (while n
+       (setq n (match-end 0))
+       (setq tok (match-string 0 s))
+       (if (string-match "[\"']\\([^\"']*\\)[\"']" tok)
+	   (setq tok (match-string 1 tok)))
+       (setq tokens (append tokens (list tok)))
+       (setq n (string-match "[^\"' ][^ ]*\\|\"[^\"]*\"\\|'[^']*'" s n)))
+     tokens))
+
+(defun jde-run-make-arg-string (args)
+"Converts a list of command-line arguments to a string of arguments."
+  (let ((str "")
+	(n (length args))
+	(i 0))
+    (while (< i n)
+      (if (not (string= str ""))
+	  (setq str (concat str " ")))
+      (setq str (concat str (nth i args)))
+      (setq i (+ i 1)))
+    str))
+
+;;;###autoload
+(defun jde-run-set-app (app)
+  "Specify the name of the application class to run."
+  (interactive
+   "sEnter application class: ")
+  (setq jde-run-application-class app))
+
+;;;###autoload
+(defun jde-run-set-args (args)
+  "Specify arguments to be passed to the Java vm.
+This command serves as an alternative to using the JDE Run Options
+panel to specify command-line arguments for the Java interpreter."
+  (interactive
+   "sEnter arguments: ")
+  (setq jde-run-option-vm-args (jde-run-parse-args args)))
+
+
+;;;###autoload
+(defun jde-run-set-app-args (args)
+  "Specify the arguments to be passed to the Java application class.
+This command provides an alternative to using the JDE Run Options panel
+to specify command-line arguments to pass to the application when starting
+the application."
+  (interactive
+   "sEnter arguments: ")
+  (setq jde-run-option-application-args (jde-run-parse-args args)))
+
+;;;###autoload
+(defun jde-run-set-applet-viewer (viewer)
+  "Sets the viewer to be used to view an applet. The default is
+appletviewer."
+  (interactive
+   "sEnter viewer name: ")
+  (setq jde-run-applet-viewer viewer))
+
+;;;###autoload
+(defun jde-run-set-applet-doc (doc)
+  "Specify the doc to be used to view an applet.
+This command provides an alternative to using the JDE Options
+panel to specifying the applet document."
+  (interactive
+   "sEnter applet doc name: ")
+  (if (string= doc "")
+      (setq jde-run-applet-doc nil)
+    (setq jde-run-applet-doc doc)))
+
+
+(defclass jde-run-vm ()
+  ((version          :initarg :version
+		     :type string
+		     :initform ""
+		     :documentation
+		     "Java virtual machine version number.")
+   (path             :initarg :path
+		     :type string
+		     :documentation
+		     "Path of the compiler executable.")
+   (buffer           :initarg :buffer
+		     :type buffer
+		     :documentation
+		     "Compilation buffer")
+   (main-class        :initarg :main-class
+		     :type string
+		     :documentation
+		     "Name of main class."))
+    "Class of Java virtual machines.")
+
+(defmethod jde-run-classpath-arg ((this jde-run-vm))
+  "Returns the classpath argument for this vm."
+  (let ((classpath
+	 (if jde-run-option-classpath
+	     (if (and (stringp jde-run-option-classpath)
+		      (string= jde-run-option-classpath "global"))
+		 jde-global-classpath
+	       (unless (and (stringp jde-run-option-classpath)
+			    (string= jde-run-option-classpath "none"))
+		 jde-run-option-classpath))))
+	(symbol
+	 (if (and jde-run-option-classpath
+		  (stringp jde-run-option-classpath)
+		  (string= jde-run-option-classpath "global"))
+	     'jde-global-classpath
+	   'jde-run-option-classpath)))
+    (if classpath
+	(list
+	 "-classpath"
+	 (jde-build-classpath
+	  classpath symbol)))))
+
+(defmethod jde-run-classic-mode-arg ((this jde-run-vm))
+  "Get classic-mode option>"
+    (if jde-run-classic-mode-vm
+	(list "-classic")))
+
+
+(defmethod jde-run-property-args ((this jde-run-vm))
+    "Get property arguments."
+    (mapcar
+     (lambda (prop)
+       (format "-D%s=%s" (car prop) (cdr prop)))
+     jde-run-option-properties))
+
+(defmethod jde-run-heap-size-args ((this jde-run-vm))
+   "Get heap size arguments."
+    (let* ((memory-unit-abbrevs
+	    (list (cons "bytes" "")
+	       (cons "kilobytes" "k")
+	       (cons "megabytes" "m")
+	       (cons "gigabytes" "g")))
+	   (start-cons (nth 0 jde-run-option-heap-size))
+	   (start-size (format "%d%s" (car start-cons)
+			       (cdr (assoc (cdr start-cons)
+				      memory-unit-abbrevs))))
+	   (max-cons (nth 1 jde-run-option-heap-size))
+	   (max-size (format "%d%s" (car max-cons)
+			     (cdr (assoc (cdr max-cons)
+				    memory-unit-abbrevs)))))
+      (append
+       (if (not (string= start-size "1m"))
+	   (list (concat "-Xms" start-size)))
+       (if (not (string= max-size "16m"))
+	  (list (concat "-Xmx" max-size))))))
+
+(defmethod jde-run-stack-size-args ((this jde-run-vm))
+  "Get stack size arguments."
+    (let* ((memory-unit-abbrevs
+	    (list (cons "bytes" "")
+	       (cons "kilobytes" "k")
+	       (cons "megabytes" "m")
+	       (cons "gigabytes" "g")))
+	   (c-cons (nth 0 jde-run-option-stack-size))
+	   (c-size (format "%d%s" (car c-cons)
+			   (cdr (assoc (cdr c-cons)
+				       memory-unit-abbrevs))))
+	   (java-cons (nth 1 jde-run-option-stack-size))
+	   (java-size (format "%d%s" (car java-cons)
+			     (cdr (assoc (cdr java-cons)
+				    memory-unit-abbrevs)))))
+      (append
+       (if (not (string= c-size "128k"))
+	   (list (concat "-Xss" c-size)))
+       (if (not (string= java-size "400k"))
+	   (list (concat "-Xoss" java-size))))))
+
+
+(defmethod jde-run-java-profile-arg ((this jde-run-vm))
+   "Get Java profile option."
+    (let ((profilep (car jde-run-option-java-profile))
+	  (file (cdr jde-run-option-java-profile)))
+      (if profilep
+	  (if (string= file "./java.prof")
+	      '("-Xprof")
+	    (list (concat "-Xprof:" file))))))
+
+(defmethod jde-run-heap-profile-arg ((this jde-run-vm))
+  "Get heap profile argument."
+    (let* ((profilep (car jde-run-option-heap-profile))
+	   (prof-options (cdr jde-run-option-heap-profile))
+	   (file (nth 0 prof-options))
+	   (depth (nth 1 prof-options))
+	   (top (nth 2 prof-options))
+	   (sort
+	    (downcase (substring (nth 3 prof-options) 0 1))))
+      (if profilep
+	  (if (and (string= file "./java.hprof")
+		   (equal depth 5)
+		   (equal top 20)
+		   (string= sort "a"))
+	      '("-Xhprof")
+	    (list
+	     (format
+	      "-Xhprof:file=%s,depth=%d,top=%d,sort=%s"
+	      file depth top sort))))))
+
+
+(defmethod jde-run-vm-args ((this jde-run-vm))
+  "Get command line args."
+  jde-run-option-vm-args)
+
+
+(defmethod jde-run-vm-launch ((this jde-run-vm))
+  (let ((run-buf-name (concat "*" (oref this :main-class) "*"))
+	(source-directory default-directory)
+	(working-directory (if (string= jde-run-working-directory "")
+			       default-directory
+			     (jde-normalize-path 'jde-run-working-directory))))
+    (if (not (comint-check-proc run-buf-name))
+	(let* ((run-buffer (get-buffer-create run-buf-name))
+	       (win32-p (eq system-type 'windows-nt))
+	       (prog (oref this :path))
+	       (prog-args (append
+			   (jde-run-get-vm-args this)
+			   (if jde-run-read-vm-args
+			       (jde-run-parse-args
+				(read-from-minibuffer
+				 "Vm args: "
+				 (car jde-run-interactive-vm-arg-history)
+				 nil nil
+				 'jde-run-interactive-vm-arg-history)))
+			   (list (oref this :main-class))
+			   jde-run-option-application-args
+			   (if jde-run-read-app-args
+			       (jde-run-parse-args
+				(read-from-minibuffer
+				 "Application args: "
+				 (car jde-run-interactive-app-arg-history)
+				 nil nil
+				 'jde-run-interactive-app-arg-history)))
+			   ))
+	       (command-string (concat prog " "
+				       (jde-run-make-arg-string
+					prog-args)
+				       "\n\n")))
+	  (save-excursion
+	    (set-buffer run-buffer)
+	    (erase-buffer)
+	    (cd working-directory)
+	    (insert (concat "cd " working-directory "\n"))
+	    (insert command-string)
+	    (jde-run-mode))
+	  (save-w32-show-window
+	    (comint-exec run-buffer (oref this :main-class) prog nil prog-args))
+	  (pop-to-buffer run-buffer)
+	  (save-excursion
+	    (goto-char (point-min))
+	  (jde-run-etrace-update-current-marker))
+	  (cd source-directory))
+      (message "An instance of %s is running." (oref this :main-class))
+      (pop-to-buffer run-buf-name))))
+
+
+(defclass jde-run-vm-1-1 (jde-run-vm) ()
+  "Represents the JDK 1.1.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-1) &rest fields)
+  "Constructor for the class representing the JDK 1.1 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.1"))
+
+(defmethod jde-run-verbose-arg ((this jde-run-vm-1-1))
+  "Set the verbose options."
+    (let ((print-classes-loaded
+	   (nth 0 jde-run-option-verbose))
+	  (print-memory-freed
+	   (nth 1 jde-run-option-verbose))
+	  (print-jni-info
+	   (nth 2 jde-run-option-verbose)))
+      (append
+       (if print-classes-loaded (list "-verbose"))
+       (if print-memory-freed (list "-verbosegc"))
+       (if print-jni-info (list "-verbose")))))
+
+(defmethod jde-run-gc-args ((this jde-run-vm-1-1))
+  "Get garbage collection arguments."
+    (let ((no-gc-asynch (not
+			 (nth 0 jde-run-option-garbage-collection)))
+	  (no-gc-classes (not
+			  (nth 1 jde-run-option-garbage-collection))))
+      (append
+       (if no-gc-asynch
+	  '("-noasyncgc"))
+       (if no-gc-classes
+	   '("-noclassgc")))))
+
+(defmethod jde-run-verify-args ((this jde-run-vm-1-1))
+  "Get verify arguments."
+    (let ((verify-all (nth 0 jde-run-option-verify))
+	  (verify-remote (nth 1 jde-run-option-verify)))
+      (append
+       (if verify-all
+	  '("-verify"))
+       (if (and
+	   (not verify-all)
+	   (not verify-remote))
+	   '("-noverify")))))
+
+(defmethod jde-run-debug-args ((this jde-run-vm-1-1))
+  "Get arguments required to allow process to connect
+to a debugger."
+  (if jde-run-option-debug
+      '("-debug")))
+
+(defmethod jde-run-interpret-mode-arg ((this jde-run-vm-1-1))
+  "Get argument required to enable interpret mode."
+  (if jde-run-option-interpret-mode
+      '("-nojit")))
+
+
+(defmethod jde-run-get-vm-args ((this jde-run-vm-1-1))
+  (append
+   (jde-run-classpath-arg this)
+   (jde-run-verbose-arg this)
+   (jde-run-property-args this)
+   (jde-run-heap-size-args this)
+   (jde-run-stack-size-args this)
+   (jde-run-gc-args this)
+   (jde-run-java-profile-arg this)
+   (jde-run-heap-profile-arg this)
+   (jde-run-verify-args this)
+   (jde-run-interpret-mode-arg this)
+   (jde-run-debug-args this)
+   (jde-run-vm-args this)))
+
+
+(defclass jde-run-vm-1-2 (jde-run-vm-1-1) ()
+  "Represents the JDK 1.2.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-2) &rest fields)
+  "Constructor for the class representing the JDK 1.2 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.2"))
+
+(defmethod jde-run-boot-classpath-arg ((this jde-run-vm-1-2))
+  "Returns the boot classpath argument for this vm."
+  (if jde-run-option-boot-classpath
+	(list
+	 (concat
+	  "-Xbootclasspath:"
+	  (jde-build-classpath
+	   (cdr jde-run-option-boot-classpath)
+	   'jde-run-option-boot-classpath)))))
+
+(defmethod jde-run-verbose-arg ((this jde-run-vm-1-2))
+  "Set the verbose options."
+    (let ((print-classes-loaded
+	   (nth 0 jde-run-option-verbose))
+	  (print-memory-freed
+	   (nth 1 jde-run-option-verbose))
+	  (print-jni-info
+	   (nth 2 jde-run-option-verbose)))
+      (append
+       (if print-classes-loaded (list "-verbose:class"))
+       (if print-memory-freed (list "-verbose:gc"))
+       (if print-jni-info (list "-verbose:jni")))))
+
+(defmethod jde-run-gc-args ((this jde-run-vm-1-2))
+  "Get garbage collection arguments."
+    (let ((no-gc-asynch (not
+			 (nth 0 jde-run-option-garbage-collection)))
+	  (no-gc-classes (not
+			  (nth 1 jde-run-option-garbage-collection))))
+      (append
+       (if no-gc-asynch
+	  '("-Xnoasyncgc"))
+       (if no-gc-classes
+	   '("-Xnoclassgc")))))
+
+(defmethod jde-run-debug-args ((this jde-run-vm-1-2))
+  "Get arguments required to allow process to connect
+to a debugger."
+  (if jde-run-option-debug
+      '("-Xdebug")))
+
+(defmethod jde-run-interpret-mode-arg ((this jde-run-vm-1-2))
+  "Get argument required to disable use of JIT compiler."
+  (if jde-run-option-interpret-mode
+      '("-Djava.compiler=NONE")))
+
+(defmethod jde-run-jar-arg ((this jde-run-vm-1-2))
+  "Get argument that specifies use of a jar file to run an app."
+  (if jde-run-option-jar
+      '("-jar")))
+
+
+(defmethod jde-run-get-vm-args ((this jde-run-vm-1-2))
+  (append
+   ;; Classic mode argument must come first.
+   (jde-run-classic-mode-arg this)
+   (jde-run-boot-classpath-arg this)
+   (jde-run-classpath-arg this)
+   (jde-run-verbose-arg this)
+   (jde-run-property-args this)
+   (jde-run-heap-size-args this)
+   (jde-run-stack-size-args this)
+   (jde-run-gc-args this)
+   (jde-run-java-profile-arg this)
+   (jde-run-heap-profile-arg this)
+   (jde-run-debug-args this)
+   (jde-run-interpret-mode-arg this)
+   (jde-run-vm-args this)
+   (jde-run-jar-arg this) ;; must be last
+   ))
+
+(defclass jde-run-vm-1-3 (jde-run-vm-1-2) ()
+  "Represents the JDK 1.3.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-3) &rest fields)
+  "Constructor for the class representing the JDK 1.3 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.3"))
+
+
+(defmethod jde-run-boot-classpath-arg ((this jde-run-vm-1-3))
+  "Returns the boot classpath argument for this vm."
+  (if jde-run-option-boot-classpath
+      (list
+       (concat
+	"-Xbootclasspath"
+	(let ((mode (car jde-run-option-boot-classpath)))
+	  (cond
+	   ((string= mode "append")
+	    "/a:")
+	   ((string= mode "prepend")
+	    "/p:")
+	   ((string= mode "replace")
+	    ":")
+	   (t
+	    (error "Illegal custom classpath mode: %s"  mode))))
+	(jde-build-classpath
+	 (cdr jde-run-option-boot-classpath)
+	 'jde-run-option-boot-classpath)))))
+
+
+(defmethod jde-run-debug-args ((this jde-run-vm-1-3))
+  "Get arguments required to allow process to connect
+to a debugger."
+  (if jde-run-option-debug
+      (let ((mode (nth 0 jde-run-option-debug))
+	    (transport (nth 1 jde-run-option-debug))
+	    (shared-mem-name (nth 2 jde-run-option-debug))
+	    (socket-host (nth 3 jde-run-option-debug))
+	    (socket-port (nth 4 jde-run-option-debug))
+	    (suspend (nth 5 jde-run-option-debug))
+	    (ms-windows (eq system-type 'windows-nt)))
+	(list "-Xdebug"
+	      (format
+	       "-Xrunjdwp:transport=%s,address=%s,server=%s,suspend=%s"
+	       (if (string= transport "Shared Memory")
+		   (if ms-windows
+		       "dt_shmem"
+		     (error "Shared memory transport is valid only on Windows."))
+		 "dt_socket")
+	       (if  (string= transport "Shared Memory")
+		   shared-mem-name
+		 (if (string= mode "Client")
+		     (if socket-host
+			 (concat socket-host ":" socket-port)
+		       socket-port)
+		   socket-port))
+	       (if (string= mode "Server") "y" "n")
+	       (if suspend "y" "n"))))))
+
+(defmethod jde-run-get-vm-args ((this jde-run-vm-1-3))
+  (append
+   ;; Classic mode argument must come first.
+   (jde-run-classic-mode-arg this)
+   (jde-run-boot-classpath-arg this)
+   (jde-run-classpath-arg this)
+   (jde-run-verbose-arg this)
+   (jde-run-property-args this)
+   (jde-run-heap-size-args this)
+   (jde-run-stack-size-args this)
+   (jde-run-gc-args this)
+   (jde-run-java-profile-arg this)
+   (jde-run-heap-profile-arg this)
+   (jde-run-debug-args this)
+   (jde-run-interpret-mode-arg this)
+   (jde-run-vm-args this)
+   (jde-run-jar-arg this) ;; must be last
+   ))
+
+
+(defclass jde-run-vm-1-4 (jde-run-vm-1-3) ()
+  "Represents the JDK 1.4.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-4) &rest fields)
+  "Constructor for the class representing the JDK 1.4 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.4"))
+
+
+(defmethod jde-run-hotspot-vm-type-arg ((this jde-run-vm-1-4))
+  "Get the vm argument that specifes the Hotspot vm type."
+  (if (eq jde-run-option-hotspot-type 'server)
+      '("-server")))
+
+(defmethod jde-run-interpret-mode-arg ((this jde-run-vm-1-4))
+  "Get argument required to enable interpret mode."
+  (if jde-run-option-interpret-mode
+      '("-Xint")))
+
+(defmethod jde-run-enable-assertions-args ((this jde-run-vm-1-4))
+  "Get argument(s) required to enable assertions."
+  (let (args)
+    (cond
+     ((stringp jde-run-option-enable-assertions)
+      (cond
+       ((string= jde-run-option-enable-assertions "Nowhere"))
+       ((string= jde-run-option-enable-assertions "Everywhere")
+	(setq args '("-ea")))
+       (t
+	(error "Illegal enable assertions option: \"%s\"."
+	       jde-run-option-enable-assertions))))
+     ((listp jde-run-option-enable-assertions)
+      (if (car jde-run-option-enable-assertions)
+	  (setq args '("-ea:...")))
+      (loop for location in (cdr jde-run-option-enable-assertions) do
+	    (let ((type (car location))
+		  (name (cdr location)))
+	      (if (string= type "package")
+		  (setq name (concat name "...")))
+	      (setq args  (append args (list (concat "-ea:" name)))))))
+     (t
+      (error "Illegal enable assertions option: \"%s\"."
+		jde-run-option-enable-assertions)))
+    args))
+
+
+(defmethod jde-run-disable-assertions-args ((this jde-run-vm-1-4))
+  "Get argument(s) required to enable assertions."
+  (let (args)
+    (cond
+     ((stringp jde-run-option-disable-assertions)
+      (cond
+       ((string= jde-run-option-disable-assertions "Nowhere"))
+       ((string= jde-run-option-disable-assertions "Everywhere")
+	(setq args '("-da")))
+       (t
+	(error "Illegal disable assertions option: \"%s\"."
+	       jde-run-option-disable-assertions))))
+     ((listp jde-run-option-disable-assertions)
+      (if (car jde-run-option-disable-assertions)
+	  (setq args '("-da:...")))
+      (loop for location in (cdr jde-run-option-disable-assertions) do
+	    (let ((type (car location))
+		  (name (cdr location)))
+	      (if (string= type "package")
+		  (setq name (concat name "...")))
+	      (setq args  (append args (list (concat "-da:" name)))))))
+     (t
+      (error "Illegal disable assertions option: \"%s\"."
+		jde-run-option-disable-assertions)))
+    args))
+
+
+(defmethod jde-run-enable-system-assertions-arg ((this jde-run-vm-1-4))
+  "Get argument required to enable system assertions."
+  (if jde-run-option-enable-system-assertions
+      '("-esa")))
+
+(defmethod jde-run-disable-system-assertions-arg ((this jde-run-vm-1-4))
+  "Get argument required to disable system assertions."
+  (if jde-run-option-disable-system-assertions
+      '("-dsa")))
+
+(defmethod jde-run-get-vm-args ((this jde-run-vm-1-4))
+  (append
+   ;; Classic mode argument must come first.
+   (jde-run-classic-mode-arg this)
+   (jde-run-boot-classpath-arg this)
+   (jde-run-classpath-arg this)
+   (jde-run-verbose-arg this)
+   (jde-run-property-args this)
+   (jde-run-heap-size-args this)
+   (jde-run-stack-size-args this)
+   (jde-run-gc-args this)
+   (jde-run-java-profile-arg this)
+   (jde-run-heap-profile-arg this)
+   (jde-run-debug-args this)
+   (jde-run-interpret-mode-arg this)
+   (jde-run-enable-assertions-args this)
+   (jde-run-disable-assertions-args this)
+   (jde-run-enable-system-assertions-arg this)
+   (jde-run-disable-system-assertions-arg this)
+   (jde-run-vm-args this)
+   (jde-run-jar-arg this) ;; must be last
+   ))
+
+(defclass jde-run-vm-1-5 (jde-run-vm-1-4) ()
+  "Represents the JDK 1.5.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-5) &rest fields)
+  "Constructor for the class representing the JDK 1.5 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.5"))
+
+(defclass jde-run-vm-1-6 (jde-run-vm-1-5) ()
+  "Represents the JDK 1.6.x vm")
+
+(defmethod initialize-instance ((this jde-run-vm-1-6) &rest fields)
+  "Constructor for the class representing the JDK 1.6 vm."
+
+  ;; Call parent initializer.
+  (call-next-method)
+
+  (oset this :version "1.6"))
+
+
+
+(defvar jde-run-virtual-machines
+  (list
+   (jde-run-vm-1-1 "JDK 1.1 vm")
+   (jde-run-vm-1-2 "JDK 1.2 vm")
+   (jde-run-vm-1-3 "JDK 1.3 vm")
+   (jde-run-vm-1-4 "JDK 1.4 vm")
+   (jde-run-vm-1-5 "JDK 1.5 vm")
+   (jde-run-vm-1-6 "JDK 1.6 vm"))
+  "*List of supported virtual machines.")
+
+(defun jde-run-get-vm ()
+  "Gets the vm for the current JDK."
+  (let* ((jdk-version (jde-java-version))
+	 (vm
+	  (find-if
+	   (lambda (vm-x)
+	     (string-match
+	      (oref vm-x :version)
+	      (if jdk-version jdk-version "")))
+	   jde-run-virtual-machines)))
+    (if (not vm)
+	(setq vm (car jde-run-virtual-machines)))
+    (oset vm
+	  :path
+	  (let ((vm-path
+		 (substitute-in-file-name jde-vm-path)))
+	    (if (string= vm-path "")
+		(jde-get-jdk-prog (if (eq system-type 'windows-nt)
+				      'javaw 'java))
+	      (if (file-exists-p
+		   (if (and
+			(eq system-type 'windows-nt)
+			(not (string-match "[.]exe$" vm-path)))
+		       (concat vm-path ".exe")
+		     vm-path))
+		  vm-path
+		(if (executable-find vm-path)
+		    vm-path
+		  (error "Invalid vm path: %s"
+			 vm-path))))))
+    vm))
+
+;;;###autoload
+(defun jde-run (prefix)
+  "Run the Java application specified by `jde-run-executable', if
+not the null string. Otherwise run the class specified by
+`jde-run-application-class', if non-null; otherwise the class in the
+current buffer. Specifying a prefix argument, e.g., C-u C-c C-v C-r,
+causes this command to prompt you to enter arguments to be passed to
+the application's main method.  Specifying a minus prefix argument,
+i.e., C-u - C-c C-v C-r, causes this command to prompt you to also
+enter the name of the application's main class.  Note that you can use
+`jde-run-read-app-args' to cause the command to prompt you for
+application arguments by default (i.e., without having to specify a
+prefix argument). This command creates a comint buffer to allow you to
+interact with the program."
+  (interactive "p")
+  (if (equal major-mode 'jde-mode)
+      (if (string= jde-run-executable "")
+	  (let ((vm (jde-run-get-vm))
+		(read-app-args
+		 (or jde-run-read-app-args
+		     (not (= prefix 1))))
+		(read-main-class
+		  (= prefix -1)))
+	    (oset
+	     vm
+	     :main-class
+	     (if read-main-class
+		 (read-from-minibuffer
+		  "Main class: "
+		  (concat (jde-db-get-package)
+		      (file-name-sans-extension
+		       (file-name-nondirectory (buffer-file-name)))))
+	       (jde-run-get-main-class)))
+	    (let ((jde-run-read-app-args read-app-args))
+	      (jde-run-vm-launch vm)))
+	(jde-run-executable))
+    (error "The jde-run command works only in a Java source buffer.")))
+
+(defun jde-run-get-main-class ()
+  "Gets the main class for the application to which the current
+source buffer belongs."
+  (let ((main-class
+	 (if jde-run-option-jar
+	     (jde-normalize-path 'jde-run-application-class)
+	 jde-run-application-class)))
+    (if (or
+	 (not main-class)
+	 (string= main-class ""))
+	(setq main-class
+	      (concat (jde-db-get-package)
+		      (file-name-sans-extension
+		       (file-name-nondirectory (buffer-file-name))))))
+    main-class))
+
+(defun jde-run-main-class()
+  "Runs the Java program named by `jde-run-application-class' in
+a buffer, piping output from the program to the buffer and
+input from the buffer to the program."
+  (interactive)
+  (let ((vm (jde-run-get-vm)))
+    (oset vm :main-class (jde-run-get-main-class))
+    (jde-run-vm-launch vm)))
+
+(defun jde-run-unquote (string)
+  (if (eq (aref string 0) ?\")
+      (substring string 1 (- (length string) 1))
+    string))
+
+(defun jde-run-application-running-p ()
+  "*Returns t if the application to which the current
+buffer belongs is running."
+  (let ((run-buf-name (concat "*" (jde-run-get-main-class) "*")))
+    (comint-check-proc run-buf-name)))
+
+
+(defun jde-run-executable()
+  (let* ((prog-path
+	  (jde-normalize-path
+	   jde-run-executable
+	   'jde-run-executable))
+	 (prog-name (file-name-sans-extension
+		     (file-name-nondirectory
+		      prog-path)))
+	 (run-buf-name (concat "*" prog-name "*"))
+	 (source-directory default-directory)
+	 (working-directory (if (string= jde-run-working-directory "")
+				default-directory
+			      (jde-normalize-path 'jde-run-working-directory))))
+    (if (not (comint-check-proc run-buf-name))
+	(let* ((w32-quote-process-args ?\")
+	       (win32-quote-process-args ?\") ;; XEmacs
+	       (run-buffer (get-buffer-create run-buf-name))
+	       (prog-args (append
+			   jde-run-executable-args
+			   (if jde-run-read-app-args
+			       (jde-run-parse-args
+				(read-from-minibuffer
+				 "Application args: "
+				 nil
+				 nil nil
+				 '(jde-run-interactive-app-arg-history . 1))))
+			   ))
+	       (command-string (concat jde-run-executable " "
+				       (mapconcat (lambda (arg) arg)
+						  prog-args " ")
+				       "\n\n")))
+	  (save-excursion
+	    (set-buffer run-buffer)
+	    (erase-buffer)
+	    (cd working-directory)
+	    (insert (concat "cd " working-directory "\n"))
+	    (insert command-string)
+	    (jde-run-mode))
+	  (save-w32-show-window
+	   (comint-exec run-buffer prog-name prog-path nil prog-args))
+	  (pop-to-buffer run-buffer)
+	  (save-excursion
+	    (goto-char (point-min))
+	    (jde-run-etrace-update-current-marker))
+	  (cd source-directory))
+      (message "An instance of %s is running." prog-name)
+      (pop-to-buffer run-buf-name))))
+
+(defun jde-run-mode-internal()
+  "Mode for running Java programs."
+  (define-key (current-local-map) "\C-c\C-v\C-[" 'jde-run-etrace-prev)
+  (define-key (current-local-map) "\C-c\C-v\C-]" 'jde-run-etrace-next)
+  (define-key (current-local-map) [mouse-2] 'jde-run-etrace-show-at-mouse)
+  (font-lock-mode 1)
+  (jde-run-etrace-setup-font-lock))
+
+(define-derived-mode
+  jde-run-mode comint-mode "JDE Run Mode"
+  "Major mode for running Java applications and applets.
+  \\{jde-run-mode-map}"
+  (jde-run-mode-internal))
+
+(defun jde-get-appletviewer-options ()
+  (let (options)
+    (if (not (string= jde-appletviewer-option-encoding ""))
+	(setq options (list
+			"-encoding"
+			jde-appletviewer-option-encoding)))
+    (if jde-appletviewer-option-vm-args
+	(let ((len (length jde-appletviewer-option-vm-args))
+	      (n 0))
+	  (while (< n len)
+	    (setq options
+		  (nconc
+		   options
+		   (list
+		    (concat "-J"
+			    (nth n jde-appletviewer-option-vm-args)))))
+	    (setq n (1+ n)))))
+    options))
+
+(defun jde-run-applet-exec (buffer name command startfile switches)
+  "A version of comint-exec patched to start an applet viewer as
+a command shell subprocess rather than as a subprocess of Emacs. This
+is necessary to avoid displaying a DOS window when starting a viewer
+under Windows."
+  (save-excursion
+    (set-buffer buffer)
+    (let ((proc (get-buffer-process buffer)))	; Blast any old process.
+      (if proc (delete-process proc)))
+    ;; Crank up a new process
+    (let ((proc (jde-run-applet-exec-1 name buffer command switches)))
+      (set-process-filter proc 'comint-output-filter)
+      (make-local-variable 'comint-ptyp)
+      (setq comint-ptyp process-connection-type) ; T if pty, NIL if pipe.
+      ;; Jump to the end, and set the process mark.
+      (goto-char (point-max))
+      (set-marker (process-mark proc) (point))
+    (run-hooks 'comint-exec-hook)
+    buffer)))
+
+;; This auxiliary function cranks up the process for jde-run-applet-exec in
+;; the appropriate environment.
+
+(defun jde-run-applet-exec-1 (name buffer command switches)
+  (let ((w32-quote-process-args ?\")
+	(win32-quote-process-args ?\") ;; XEmacs
+	(process-environment
+	 (nconc
+	  ;; If using termcap, we specify `emacs' as the terminal type
+	  ;; because that lets us specify a width.
+	  ;; If using terminfo, we specify `dumb' because that is
+	  ;; a defined terminal type.  `emacs' is not a defined terminal type
+	  ;; and there is no way for us to define it here.
+	  ;; Some programs that use terminfo get very confused
+	  ;; if TERM is not a valid terminal type.
+	  (if (and (boundp 'system-uses-terminfo) system-uses-terminfo)
+	      (list "TERM=dumb"
+		    (format "COLUMNS=%d" (frame-width)))
+	    (list "TERM=emacs"
+		  (format "TERMCAP=emacs:co#%d:tc=unknown:" (frame-width))))
+	  (if (getenv "EMACS") nil (list "EMACS=t"))
+	  process-environment))
+	(default-directory
+	  (if (file-directory-p default-directory)
+	      default-directory
+	    "/")))
+    (apply 'start-process-shell-command name buffer command switches)))
+
+(defun jde-run-applet-internal (doc)
+  (let* ((doc-file-name (file-name-nondirectory doc))
+	 (doc-directory (file-name-directory doc))
+	 (doc-name (file-name-sans-extension doc-file-name))
+	 (run-buf-name (concat "*" doc-name "*")))
+
+    (if (not (comint-check-proc run-buf-name))
+	(let* ((run-buffer (get-buffer-create run-buf-name))
+	       (win32-p (eq system-type 'windows-nt))
+	       (prog jde-run-applet-viewer)
+	       (prog-args
+		(append (jde-get-appletviewer-options)
+			(list doc-file-name)))
+	       (command-string (concat prog " "
+				       (jde-run-make-arg-string
+					prog-args)
+				       "\n\n")))
+	  (save-excursion
+	    (set-buffer run-buffer)
+	    (erase-buffer)
+	    (cd doc-directory)
+	    (insert (concat "cd " doc-directory "\n"))
+	    (insert command-string)
+	    (jde-run-mode))
+	  (jde-run-applet-exec run-buffer doc-name prog nil prog-args)
+	  (pop-to-buffer run-buffer))
+      (message "An instance of the applet in %s is running." doc-name)
+      (pop-to-buffer run-buf-name))))
+
+
+(defun jde-run-find-html-files ()
+  "If (buffer-file-name) is /a/b/c.xxx (where xxx can be anything),
+return (\"/a/b/c.html\") if it exists, else return (\"/a/b/c.htm\")
+if it exists, else return a list of all *.html files in /a/b/
+directory."
+  (let ((basename (file-name-sans-extension (buffer-file-name)))
+	f)
+    (cond
+     ((file-exists-p (setq f (concat basename ".html")))
+      (list f))
+     ((file-exists-p (setq f (concat basename ".htm"))) ;; for poor winXX souls
+      (list f))
+     (t
+      (mapcan (lambda (file)
+		(if (or
+		     (string-match "[.]html$" file)
+		     (string-match "[.]htm$" file))
+		    (list file)))
+	      (directory-files
+	       (file-name-directory (buffer-file-name)) t))))))
+
+
+
+(setq jde-run-applet-last-doc nil)
+
+;;;###autoload
+(defun jde-run-applet (&optional doc)
+  "Runs an applet. This function prompts you to enter the path of an
+html document that displays the applet. If you enter return without
+specifying a document, this function next checks whether
+`jde-run-applet-doc' specifies a document. If so, it displays that
+specified document. Next, it checks whether the current directory
+contains any html files. If the current directory contains an html
+file with the same root name as the Java file in the current buffer,
+it displays the file. If not, it displays the first html file that it
+finds in the current directory. If if cannot find an html file, it
+signals an error.  This function uses the viewer specified by
+`jde-run-applet-viewer' to display the specified document. Note that
+if you run two html applet files successively with the same name, you
+must kill the buffer created to run the first file before running the
+second file. Otherwise, this command will simply redisplay the first
+file."
+  (interactive
+   (let ((insert-default-directory nil))
+     (list (read-file-name "Applet doc: " nil nil nil jde-run-applet-last-doc))))
+  (setq jde-run-applet-last-doc doc)
+  (let ((applet-doc (if (and jde-run-applet-last-doc
+			     (not (string= jde-run-applet-last-doc "")))
+			jde-run-applet-last-doc
+		      (if (and jde-run-applet-doc
+			       (not (string= jde-run-applet-doc "")))
+			    jde-run-applet-doc
+			  (car (jde-run-find-html-files))))))
+    (if applet-doc
+	(if (string-match "appletviewer" jde-run-applet-viewer)
+	    (jde-run-applet-internal applet-doc)
+	  (if (or
+	       (string= jde-run-applet-viewer "")
+	       (string-match "browse-url" jde-run-applet-viewer))
+	      (browse-url applet-doc)
+	    (jde-run-applet-internal (concat default-directory applet-doc))))
+      (signal 'error "Could not find html document to display applet."))))
+
+
+(defun jde-run-menu-run-applet ()
+  (interactive)
+  (jde-run-applet))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                      ;;
+;;  Exception Trace Navigation                                          ;;
+;;                                                                      ;;
+;;  Copyright (C) 1999 Phillip Lord <p.lord@hgmp.mrc.ac.uk>             ;;
+;;  Copyright (C) 2001 Sam Steingold <sds@gnu.org>                      ;;
+;;  Copyright (C) 2001 Kevin A. Burton <burton@apache.org>              ;;
+;;                                                                      ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defvar jde-run-etrace-current-marker (cons (make-marker) (make-marker))
+  "The location of the last stack shown.
+A cons of two markers, location of the error and the location in the code.")
+
+(defvar jde-run-font-lock-keywords
+  '(("\\(^[_a-z.]+[_a-zA-Z0-9]+Exception\\)\\(: \\)?\\(.*\\)?"
+     (1 'font-lock-keyword-face append)
+     (3 'font-lock-string-face append))
+    ("\\(at [_a-z.]+[_a-zA-Z0-9]+\\.[_a-zA-Z<>]*\\)(\\([_a-zA-Z0-9]+.java\\):\\([0-9]+\\))$"
+     (1 'font-lock-constant-face append)
+     (2 'font-lock-variable-name-face append)
+     (3 'font-lock-type-face append)))
+  "Defines font-lock keywords for highlighting exception stack traces.")
+
+(defun jde-run-etrace-update-current-marker ()
+  "Updates the `car' of `jde-run-etrace-current-marker' to be at the current point"
+  (set-marker (car jde-run-etrace-current-marker) (point) (current-buffer)))
+
+(defun jde-run-etrace-current-marker (&optional next)
+  "Update the `cdr' and the `car' of `jde-run-etrace-current-marker' from its `car'.
+Here goes all the error message parsing."
+  (let ((here (car jde-run-etrace-current-marker))
+	(there (cdr jde-run-etrace-current-marker))
+	(n (or next 0))
+	(re (concat " \\([a-zA-Z0-9_.]+\\.\\)?" ; package
+		     "\\([a-zA-Z0-9_$]+\\)" ; class
+		     "\\.<?[a-zA-Z0-9_]+>?" ; method
+		     "(\\([a-zA-Z0-9_]+\\)\\.java:" ; java file = public class
+		     "\\([0-9]+\\))"))); line number
+    (save-excursion
+      (set-buffer (marker-buffer here))
+      (goto-char here)
+      ;; In order to display the current match at the top of
+      ;; the error screen the previous match was set to be
+      ;; at the beggining of the line. If we do not place the point
+      ;; at the end of the line again, you will match the same error.
+      ;; If n is 0 ensure that point is at the beggining
+      (if (> n 0)
+	  (end-of-line)
+	(beginning-of-line))
+
+      (if (>= n 0)
+	  (if (re-search-forward re nil t)
+	      (progn
+		;;setting the line at the beggining
+		;;so that it is the first line of the errors
+		(beginning-of-line)
+		(jde-run-etrace-update-current-marker))
+	    (error "End of stack trace"))
+	(if (re-search-backward re nil t)
+	    (progn
+	      (jde-run-etrace-update-current-marker))
+	  (error "Start of stack trace")))
+;;       (message "1: [%s]; 2: [%s]; 3: [%s]; 4: [%s]" (match-string 1)
+;;                (match-string 2) (match-string 3) (match-string 4))
+      (let* ((package (or (match-string 1) ""))
+	    (class (match-string 2))
+	    (file-name (match-string 3))
+	    (line (car (read-from-string (match-string 4))))
+	    (file (jde-find-class-source-file (concat package file-name)))
+	    buf)
+	(condition-case err
+	    (progn
+	      (setq buf (if file (find-file-noselect file)))
+	      (set-buffer buf)
+	      (goto-line line)
+	      (set-marker there (point) buf))
+	  (error err))))
+    jde-run-etrace-current-marker))
+
+(defun jde-run-etrace-goto (&optional next)
+  "Display the current stack using `compilation-goto-locus'."
+  (jde-run-etrace-current-marker next)
+  (if jde-emacs22p
+      (compilation-goto-locus (car jde-run-etrace-current-marker)
+			      (cdr jde-run-etrace-current-marker)
+			      nil)
+    (compilation-goto-locus jde-run-etrace-current-marker)))
+
+(defun jde-run-etrace-show-at-mouse (event)
+  "Jump to the stack position at the mouse click.
+Click anywhere on the line with the stack reference."
+  (interactive "e")
+  (if jde-xemacsp
+      (set-marker (car jde-run-etrace-current-marker)
+		  (event-point pos)
+		  (window-buffer (event-window pos)))
+    (let ((pos (event-start event)))
+      (set-marker (car jde-run-etrace-current-marker)
+		  (posn-point pos)
+		  (window-buffer (posn-window pos)))))
+  (jde-run-etrace-goto))
+
+
+(defun jde-run-etrace-show-at-point ()
+  "Jump to the stack position on this current line.
+The point should be anywhere on the line with the stack reference."
+  (interactive)
+  (set-marker (car jde-run-etrace-current-marker) (point) (current-buffer))
+  (jde-run-etrace-goto))
+
+
+(defun jde-run-etrace-next ()
+  "Jump to the next stack position (next line)."
+  (interactive)
+  (jde-run-etrace-goto 1))
+
+
+(defun jde-run-etrace-prev ()
+  "Jump to the previous stack position (previous line)."
+  (interactive)
+  (jde-run-etrace-goto -1))
+
+(defun jde-run-etrace-setup-font-lock ()
+    ;;setup the correct font-lock stuff
+
+
+  ;;font lock setup notes
+  ;;
+  ;; the actual exception class -> font-lock-keyword-face
+  ;; exception message -> font-lock-string-face
+  ;; stack entry class and method -> font-lock-constant-face
+  ;; stack entry file -> font-lock-variable-name-face
+  ;; stack entry line number -> font-lock-type-face
+
+  (if (featurep 'xemacs)
+      ;; For xemacs it seems to be sufficient to just define
+      ;; {mode-name}-font-lock-keywords, but if that doesn't work for
+      ;; you, then replace the nil with:
+      ;; (set (make-local-variable 'font-lock-keywords) jde-run-font-lock-keywords)
+      nil
+    (progn
+      (font-lock-add-keywords
+       nil
+       '(("\\(^[_a-z.]+[_a-zA-Z0-9]+Exception\\)\\(: \\)?\\(.*\\)?"
+	  (1 'font-lock-keyword-face append)
+	  (3 'font-lock-string-face append))))
+
+      (font-lock-add-keywords
+       nil
+       '(("\\(at [_a-z.]+[_a-zA-Z0-9]+\\.[_a-zA-Z<>]*\\)(\\([_a-zA-Z0-9]+.java\\):\\([0-9]+\\))$"
+	  (1 'font-lock-constant-face append)
+	  (2 'font-lock-variable-name-face append)
+	  (3 'font-lock-type-face append))))
+      (font-lock-fontify-buffer))))
+
+(provide 'jde-run)
+
+;; End of jde-run.el
diff --git a/site/jdee/lisp/jde-run.elc b/site/jdee/lisp/jde-run.elc
new file mode 100644
index 0000000..3141ff6
Binary files /dev/null and b/site/jdee/lisp/jde-run.elc differ
diff --git a/site/jdee/lisp/jde-sregex.el b/site/jdee/lisp/jde-sregex.el
new file mode 100644
index 0000000..2c88497
--- /dev/null
+++ b/site/jdee/lisp/jde-sregex.el
@@ -0,0 +1,618 @@
+;;; sregex.el --- symbolic regular expressions
+
+;; Copyright (C) 1997, 1998, 2000, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: extensions
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This version of sregex is provided with the JDEE to support
+;; users of XEmacs, which does not include sregex in its
+;; distribution.
+
+;; This package allows you to write regular expressions using a
+;; totally new, Lisp-like syntax.
+
+;; A "symbolic regular expression" (sregex for short) is a Lisp form
+;; that, when evaluated, produces the string form of the specified
+;; regular expression.  Here's a simple example:
+
+;;   (sregexq (or "Bob" "Robert"))  =>  "Bob\\|Robert"
+
+;; As you can see, an sregex is specified by placing one or more
+;; special clauses in a call to `sregexq'.  The clause in this case is
+;; the `or' of two strings (not to be confused with the Lisp function
+;; `or').  The list of allowable clauses appears below.
+
+;; With sregex, it is never necessary to "escape" magic characters
+;; that are meant to be taken literally; that happens automatically.
+;; For example:
+
+;;   (sregexq "M*A*S*H")  =>  "M\\*A\\*S\\*H"
+
+;; It is also unnecessary to "group" parts of the expression together
+;; to overcome operator precedence; that also happens automatically.
+;; For example:
+
+;;   (sregexq (opt (or "Bob" "Robert")))  =>  "\\(?:Bob\\|Robert\\)?"
+
+;; It *is* possible to group parts of the expression in order to refer
+;; to them with numbered backreferences:
+
+;;   (sregexq (group (or "Go" "Run"))
+;;            ", Spot, "
+;;            (backref 1))             =>  "\\(Go\\|Run\\), Spot, \\1"
+
+;; `sregexq' is a macro.  Each time it is used, it constructs a simple
+;; Lisp expression that then invokes a moderately complex engine to
+;; interpret the sregex and render the string form.  Because of this,
+;; I don't recommend sprinkling calls to `sregexq' throughout your
+;; code, the way one normally does with string regexes (which are
+;; cheap to evaluate).  Instead, it's wiser to precompute the regexes
+;; you need wherever possible instead of repeatedly constructing the
+;; same ones over and over.  Example:
+
+;;    (let ((field-regex (sregexq (opt "resent-")
+;;                                (or "to" "cc" "bcc"))))
+;;      ...
+;;      (while ...
+;;        ...
+;;        (re-search-forward field-regex ...)
+;;        ...))
+
+;; The arguments to `sregexq' are automatically quoted, but the
+;; flipside of this is that it is not straightforward to include
+;; computed (i.e., non-constant) values in `sregexq' expressions.  So
+;; `sregex' is a function that is like `sregexq' but which does not
+;; automatically quote its values.  Literal sregex clauses must be
+;; explicitly quoted like so:
+
+;;   (sregex '(or "Bob" "Robert"))  =>  "Bob\\|Robert"
+
+;; but computed clauses can be included easily, allowing for the reuse
+;; of common clauses:
+
+;;  (let ((dotstar '(0+ any))
+;;        (whitespace '(1+ (syntax ?-)))
+;;        (digits '(1+ (char (?0 . ?9)))))
+;;    (sregex 'bol dotstar ":" whitespace digits))  =>  "^.*:\\s-+[0-9]+"
+
+;; To use this package in a Lisp program, simply (require 'sregex).
+
+;; Here are the clauses allowed in an `sregex' or `sregexq'
+;; expression:
+
+;; - a string
+;;   This stands for the literal string.  If it contains
+;;   metacharacters, they will be escaped in the resulting regex
+;;   (using `regexp-quote').
+
+;; - the symbol `any'
+;;   This stands for ".", a regex matching any character except
+;;   newline.
+
+;; - the symbol `bol'
+;;   Stands for "^", matching the empty string at the beginning of a line
+
+;; - the symbol `eol'
+;;   Stands for "$", matching the empty string at the end of a line
+
+;; - (group CLAUSE ...)
+;;   Groups the given CLAUSEs using "\\(" and "\\)".
+
+;; - (sequence CLAUSE ...)
+
+;;   Groups the given CLAUSEs; may or may not use "\\(?:" and "\\)".
+;;   Clauses grouped by `sequence' do not count for purposes of
+;;   numbering backreferences.  Use `sequence' in situations like
+;;   this:
+
+;;     (sregexq (or "dog" "cat"
+;;                  (sequence (opt "sea ") "monkey")))
+;;                                  =>  "dog\\|cat\\|\\(?:sea \\)?monkey"
+
+;;   where a single `or' alternate needs to contain multiple
+;;   subclauses.
+
+;; - (backref N)
+;;   Matches the same string previously matched by the Nth "group" in
+;;   the same sregex.  N is a positive integer.
+
+;; - (or CLAUSE ...)
+;;   Matches any one of the CLAUSEs by separating them with "\\|".
+
+;; - (0+ CLAUSE ...)
+;;   Concatenates the given CLAUSEs and matches zero or more
+;;   occurrences by appending "*".
+
+;; - (1+ CLAUSE ...)
+;;   Concatenates the given CLAUSEs and matches one or more
+;;   occurrences by appending "+".
+
+;; - (opt CLAUSE ...)
+;;   Concatenates the given CLAUSEs and matches zero or one occurrence
+;;   by appending "?".
+
+;; - (repeat MIN MAX CLAUSE ...)
+;;   Concatenates the given CLAUSEs and constructs a regex matching at
+;;   least MIN occurrences and at most MAX occurrences.  MIN must be a
+;;   non-negative integer.  MAX must be a non-negative integer greater
+;;   than or equal to MIN; or MAX can be nil to mean "infinity."
+
+;; - (char CHAR-CLAUSE ...)
+;;   Creates a "character class" matching one character from the given
+;;   set.  See below for how to construct a CHAR-CLAUSE.
+
+;; - (not-char CHAR-CLAUSE ...)
+;;   Creates a "character class" matching any one character not in the
+;;   given set.  See below for how to construct a CHAR-CLAUSE.
+
+;; - the symbol `bot'
+;;   Stands for "\\`", matching the empty string at the beginning of
+;;   text (beginning of a string or of a buffer).
+
+;; - the symbol `eot'
+;;   Stands for "\\'", matching the empty string at the end of text.
+
+;; - the symbol `point'
+;;   Stands for "\\=", matching the empty string at point.
+
+;; - the symbol `word-boundary'
+;;   Stands for "\\b", matching the empty string at the beginning or
+;;   end of a word.
+
+;; - the symbol `not-word-boundary'
+;;   Stands for "\\B", matching the empty string not at the beginning
+;;   or end of a word.
+
+;; - the symbol `bow'
+;;   Stands for "\\<", matching the empty string at the beginning of a
+;;   word.
+
+;; - the symbol `eow'
+;;   Stands for "\\>", matching the empty string at the end of a word.
+
+;; - the symbol `wordchar'
+;;   Stands for the regex "\\w", matching a word-constituent character
+;;   (as determined by the current syntax table)
+
+;; - the symbol `not-wordchar'
+;;   Stands for the regex "\\W", matching a non-word-constituent
+;;   character.
+
+;; - (syntax CODE)
+;;   Stands for the regex "\\sCODE", where CODE is a syntax table code
+;;   (a single character).  Matches any character with the requested
+;;   syntax.
+
+;; - (not-syntax CODE)
+;;   Stands for the regex "\\SCODE", where CODE is a syntax table code
+;;   (a single character).  Matches any character without the
+;;   requested syntax.
+
+;; - (regex REGEX)
+;;   This is a "trapdoor" for including ordinary regular expression
+;;   strings in the result.  Some regular expressions are clearer when
+;;   written the old way: "[a-z]" vs. (sregexq (char (?a . ?z))), for
+;;   instance.  However, see the note under "Bugs," below.
+
+;; Each CHAR-CLAUSE that is passed to (char ...) and (not-char ...)
+;; has one of the following forms:
+
+;; - a character
+;;   Adds that character to the set.
+
+;; - a string
+;;   Adds all the characters in the string to the set.
+
+;; - A pair (MIN . MAX)
+;;   Where MIN and MAX are characters, adds the range of characters
+;;   from MIN through MAX to the set.
+
+;;; To do:
+
+;; An earlier version of this package could optionally translate the
+;; symbolic regex into other languages' syntaxes, e.g. Perl.  For
+;; instance, with Perl syntax selected, (sregexq (or "ab" "cd")) would
+;; yield "ab|cd" instead of "ab\\|cd".  It might be useful to restore
+;; such a facility.
+
+;; - handle multibyte chars in sregex--char-aux
+;; - add support for character classes ([:blank:], ...)
+;; - add support for non-greedy operators *? and +?
+;; - bug: (sregexq (opt (opt ?a))) returns "a??" which is a non-greedy "a?"
+
+;;; Bugs:
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+;; XEmacs does not hava make-bool-vector.
+(unless (fboundp 'make-bool-vector)
+  (defalias 'make-bool-vector 'make-vector))
+
+
+;; Compatibility code for when we didn't have shy-groups
+(defvar sregex--current-sregex nil)
+(defun sregex-info () nil)
+(defmacro sregex-save-match-data (&rest forms) (cons 'save-match-data forms))
+(defun sregex-replace-match (r &optional f l str subexp x)
+  (replace-match r f l str subexp))
+(defun sregex-match-string (c &optional i x) (match-string c i))
+(defun sregex-match-string-no-properties (count &optional in-string sregex)
+  (match-string-no-properties count in-string))
+(defun sregex-match-beginning (count &optional sregex) (match-beginning count))
+(defun sregex-match-end (count &optional sregex) (match-end count))
+(defun sregex-match-data (&optional sregex) (match-data))
+(defun sregex-backref-num (n &optional sregex) n)
+
+
+(defun sregex (&rest exps)
+  "Symbolic regular expression interpreter.
+This is exactly like `sregexq' (q.v.) except that it evaluates all its
+arguments, so literal sregex clauses must be quoted.  For example:
+
+  (sregex '(or \"Bob\" \"Robert\"))  =>  \"Bob\\\\|Robert\"
+
+An argument-evaluating sregex interpreter lets you reuse sregex
+subexpressions:
+
+  (let ((dotstar '(0+ any))
+	(whitespace '(1+ (syntax ?-)))
+	(digits '(1+ (char (?0 . ?9)))))
+    (sregex 'bol dotstar \":\" whitespace digits))  =>  \"^.*:\\\\s-+[0-9]+\""
+  (sregex--sequence exps nil))
+
+(defmacro sregexq (&rest exps)
+  "Symbolic regular expression interpreter.
+This macro allows you to specify a regular expression (regexp) in
+symbolic form, and converts it into the string form required by Emacs's
+regex functions such as `re-search-forward' and `looking-at'.  Here is
+a simple example:
+
+  (sregexq (or \"Bob\" \"Robert\"))  =>  \"Bob\\\\|Robert\"
+
+As you can see, an sregex is specified by placing one or more special
+clauses in a call to `sregexq'.  The clause in this case is the `or'
+of two strings (not to be confused with the Lisp function `or').  The
+list of allowable clauses appears below.
+
+With `sregex', it is never necessary to \"escape\" magic characters
+that are meant to be taken literally; that happens automatically.
+For example:
+
+  (sregexq \"M*A*S*H\")  =>  \"M\\\\*A\\\\*S\\\\*H\"
+
+It is also unnecessary to \"group\" parts of the expression together
+to overcome operator precedence; that also happens automatically.
+For example:
+
+  (sregexq (opt (or \"Bob\" \"Robert\")))  =>  \"\\\\(Bob\\\\|Robert\\\\)?\"
+
+It *is* possible to group parts of the expression in order to refer
+to them with numbered backreferences:
+
+  (sregexq (group (or \"Go\" \"Run\"))
+	   \", Spot, \"
+	   (backref 1))             =>  \"\\\\(Go\\\\|Run\\\\), Spot, \\\\1\"
+
+If `sregexq' needs to introduce its own grouping parentheses, it will
+automatically renumber your backreferences:
+
+  (sregexq (opt \"resent-\")
+	   (group (or \"to\" \"cc\" \"bcc\"))
+	   \": \"
+	   (backref 1))  =>  \"\\\\(resent-\\\\)?\\\\(to\\\\|cc\\\\|bcc\\\\): \\\\2\"
+
+`sregexq' is a macro.  Each time it is used, it constructs a simple
+Lisp expression that then invokes a moderately complex engine to
+interpret the sregex and render the string form.  Because of this, I
+don't recommend sprinkling calls to `sregexq' throughout your code,
+the way one normally does with string regexes (which are cheap to
+evaluate).  Instead, it's wiser to precompute the regexes you need
+wherever possible instead of repeatedly constructing the same ones
+over and over.  Example:
+
+   (let ((field-regex (sregexq (opt \"resent-\")
+			       (or \"to\" \"cc\" \"bcc\"))))
+     ...
+     (while ...
+       ...
+       (re-search-forward field-regex ...)
+       ...))
+
+The arguments to `sregexq' are automatically quoted, but the
+flipside of this is that it is not straightforward to include
+computed (i.e., non-constant) values in `sregexq' expressions.  So
+`sregex' is a function that is like `sregexq' but which does not
+automatically quote its values.  Literal sregex clauses must be
+explicitly quoted like so:
+
+  (sregex '(or \"Bob\" \"Robert\"))  =>  \"Bob\\\\|Robert\"
+
+but computed clauses can be included easily, allowing for the reuse
+of common clauses:
+
+  (let ((dotstar '(0+ any))
+	(whitespace '(1+ (syntax ?-)))
+	(digits '(1+ (char (?0 . ?9)))))
+    (sregex 'bol dotstar \":\" whitespace digits))  =>  \"^.*:\\\\s-+[0-9]+\"
+
+Here are the clauses allowed in an `sregex' or `sregexq' expression:
+
+- a string
+  This stands for the literal string.  If it contains
+  metacharacters, they will be escaped in the resulting regex
+  (using `regexp-quote').
+
+- the symbol `any'
+  This stands for \".\", a regex matching any character except
+  newline.
+
+- the symbol `bol'
+  Stands for \"^\", matching the empty string at the beginning of a line
+
+- the symbol `eol'
+  Stands for \"$\", matching the empty string at the end of a line
+
+- (group CLAUSE ...)
+  Groups the given CLAUSEs using \"\\\\(\" and \"\\\\)\".
+
+- (sequence CLAUSE ...)
+
+  Groups the given CLAUSEs; may or may not use \"\\\\(\" and \"\\\\)\".
+  Clauses grouped by `sequence' do not count for purposes of
+  numbering backreferences.  Use `sequence' in situations like
+  this:
+
+    (sregexq (or \"dog\" \"cat\"
+		 (sequence (opt \"sea \") \"monkey\")))
+				 =>  \"dog\\\\|cat\\\\|\\\\(?:sea \\\\)?monkey\"
+
+  where a single `or' alternate needs to contain multiple
+  subclauses.
+
+- (backref N)
+  Matches the same string previously matched by the Nth \"group\" in
+  the same sregex.  N is a positive integer.
+
+- (or CLAUSE ...)
+  Matches any one of the CLAUSEs by separating them with \"\\\\|\".
+
+- (0+ CLAUSE ...)
+  Concatenates the given CLAUSEs and matches zero or more
+  occurrences by appending \"*\".
+
+- (1+ CLAUSE ...)
+  Concatenates the given CLAUSEs and matches one or more
+  occurrences by appending \"+\".
+
+- (opt CLAUSE ...)
+  Concatenates the given CLAUSEs and matches zero or one occurrence
+  by appending \"?\".
+
+- (repeat MIN MAX CLAUSE ...)
+  Concatenates the given CLAUSEs and constructs a regex matching at
+  least MIN occurrences and at most MAX occurrences.  MIN must be a
+  non-negative integer.  MAX must be a non-negative integer greater
+  than or equal to MIN; or MAX can be nil to mean \"infinity.\"
+
+- (char CHAR-CLAUSE ...)
+  Creates a \"character class\" matching one character from the given
+  set.  See below for how to construct a CHAR-CLAUSE.
+
+- (not-char CHAR-CLAUSE ...)
+  Creates a \"character class\" matching any one character not in the
+  given set.  See below for how to construct a CHAR-CLAUSE.
+
+- the symbol `bot'
+  Stands for \"\\\\`\", matching the empty string at the beginning of
+  text (beginning of a string or of a buffer).
+
+- the symbol `eot'
+  Stands for \"\\\\'\", matching the empty string at the end of text.
+
+- the symbol `point'
+  Stands for \"\\\\=\", matching the empty string at point.
+
+- the symbol `word-boundary'
+  Stands for \"\\\\b\", matching the empty string at the beginning or
+  end of a word.
+
+- the symbol `not-word-boundary'
+  Stands for \"\\\\B\", matching the empty string not at the beginning
+  or end of a word.
+
+- the symbol `bow'
+  Stands for \"\\\\\\=<\", matching the empty string at the beginning of a
+  word.
+
+- the symbol `eow'
+  Stands for \"\\\\\\=>\", matching the empty string at the end of a word.
+
+- the symbol `wordchar'
+  Stands for the regex \"\\\\w\", matching a word-constituent character
+  (as determined by the current syntax table)
+
+- the symbol `not-wordchar'
+  Stands for the regex \"\\\\W\", matching a non-word-constituent
+  character.
+
+- (syntax CODE)
+  Stands for the regex \"\\\\sCODE\", where CODE is a syntax table code
+  (a single character).  Matches any character with the requested
+  syntax.
+
+- (not-syntax CODE)
+  Stands for the regex \"\\\\SCODE\", where CODE is a syntax table code
+  (a single character).  Matches any character without the
+  requested syntax.
+
+- (regex REGEX)
+  This is a \"trapdoor\" for including ordinary regular expression
+  strings in the result.  Some regular expressions are clearer when
+  written the old way: \"[a-z]\" vs. (sregexq (char (?a . ?z))), for
+  instance.
+
+Each CHAR-CLAUSE that is passed to (char ...) and (not-char ...)
+has one of the following forms:
+
+- a character
+  Adds that character to the set.
+
+- a string
+  Adds all the characters in the string to the set.
+
+- A pair (MIN . MAX)
+  Where MIN and MAX are characters, adds the range of characters
+  from MIN through MAX to the set."
+  `(apply 'sregex ',exps))
+
+(defun sregex--engine (exp combine)
+  (cond
+   ((stringp exp)
+    (if (and combine
+	     (eq combine 'suffix)
+	     (/= (length exp) 1))
+	(concat "\\(?:" (regexp-quote exp) "\\)")
+      (regexp-quote exp)))
+   ((symbolp exp)
+    (ecase exp
+      (any ".")
+      (bol "^")
+      (eol "$")
+      (wordchar "\\w")
+      (not-wordchar "\\W")
+      (bot "\\`")
+      (eot "\\'")
+      (point "\\=")
+      (word-boundary "\\b")
+      (not-word-boundary "\\B")
+      (bow "\\<")
+      (eow "\\>")))
+   ((consp exp)
+    (funcall (intern (concat "sregex--"
+			     (symbol-name (car exp))))
+	     (cdr exp)
+	     combine))
+   (t (error "Invalid expression: %s" exp))))
+
+(defun sregex--sequence (exps combine)
+  (if (= (length exps) 1) (sregex--engine (car exps) combine)
+    (let ((re (mapconcat
+	       (lambda (e) (sregex--engine e 'concat))
+	       exps "")))
+      (if (eq combine 'suffix)
+	  (concat "\\(?:" re "\\)")
+	re))))
+
+(defun sregex--or (exps combine)
+  (if (= (length exps) 1) (sregex--engine (car exps) combine)
+    (let ((re (mapconcat
+	       (lambda (e) (sregex--engine e 'or))
+	       exps "\\|")))
+      (if (not (eq combine 'or))
+	  (concat "\\(?:" re "\\)")
+	re))))
+
+(defun sregex--group (exps combine) (concat "\\(" (sregex--sequence exps nil) "\\)"))
+
+(defun sregex--backref (exps combine) (concat "\\" (int-to-string (car exps))))
+(defun sregex--opt (exps combine) (concat (sregex--sequence exps 'suffix) "?"))
+(defun sregex--0+ (exps combine) (concat (sregex--sequence exps 'suffix) "*"))
+(defun sregex--1+ (exps combine) (concat (sregex--sequence exps 'suffix) "+"))
+
+(defun sregex--char (exps combine) (sregex--char-aux nil exps))
+(defun sregex--not-char (exps combine) (sregex--char-aux t exps))
+
+(defun sregex--syntax (exps combine) (format "\\s%c" (car exps)))
+(defun sregex--not-syntax (exps combine) (format "\\S%c" (car exps)))
+
+(defun sregex--regex (exps combine)
+  (if combine (concat "\\(?:" (car exps) "\\)") (car exps)))
+
+(defun sregex--repeat (exps combine)
+  (let* ((min (or (pop exps) 0))
+	 (minstr (number-to-string min))
+	 (max (pop exps)))
+    (concat (sregex--sequence exps 'suffix)
+	    (concat "\\{" minstr ","
+		    (when max (number-to-string max)) "\\}"))))
+
+(defun sregex--char-range (start end)
+  (let ((startc (char-to-string start))
+	(endc (char-to-string end)))
+    (cond
+     ((> end (+ start 2)) (concat startc "-" endc))
+     ((> end (+ start 1)) (concat startc (char-to-string (1+ start)) endc))
+     ((> end start) (concat startc endc))
+     (t startc))))
+
+(defun sregex--char-aux (complement args)
+  ;; regex-opt does the same, we should join effort.
+  (let ((chars (make-bool-vector 256 nil))) ; Yeah, right!
+    (dolist (arg args)
+      (cond ((integerp arg) (aset chars arg t))
+	    ((stringp arg) (mapcar (lambda (c) (aset chars c t)) arg))
+	    ((consp arg)
+	     (let ((start (car arg))
+		   (end (cdr arg)))
+	       (when (> start end)
+		 (let ((tmp start)) (setq start end) (setq end tmp)))
+	       ;; now start <= end
+	       (let ((i start))
+		 (while (<= i end)
+		   (aset chars i t)
+		   (setq i (1+ i))))))))
+    ;; now chars is a map of the characters in the class
+    (let ((caret (aref chars ?^))
+	  (dash (aref chars ?-))
+	  (class (if (aref chars ?\]) "]" "")))
+      (aset chars ?^ nil)
+      (aset chars ?- nil)
+      (aset chars ?\] nil)
+
+      (let (start end)
+	(dotimes (i 256)
+	  (if (aref chars i)
+	      (progn
+		(unless start (setq start i))
+		(setq end i)
+		(aset chars i nil))
+	    (when start
+	      (setq class (concat class (sregex--char-range start end)))
+	      (setq start nil))))
+	(if start
+	    (setq class (concat class (sregex--char-range start end)))))
+
+      (if (> (length class) 0)
+	  (setq class (concat class (if caret "^") (if dash "-")))
+	(setq class (concat class (if dash "-") (if caret "^"))))
+      (if (and (not complement) (= (length class) 1))
+	  (regexp-quote class)
+	(concat "[" (if complement "^") class "]")))))
+
+(provide 'sregex)
+
+;;; sregex.el ends here
diff --git a/site/jdee/lisp/jde-sregex.elc b/site/jdee/lisp/jde-sregex.elc
new file mode 100644
index 0000000..14f76c3
Binary files /dev/null and b/site/jdee/lisp/jde-sregex.elc differ
diff --git a/site/jdee/lisp/jde-stat.el b/site/jdee/lisp/jde-stat.el
new file mode 100644
index 0000000..11a83a2
--- /dev/null
+++ b/site/jdee/lisp/jde-stat.el
@@ -0,0 +1,240 @@
+;;; jde-stat.el -- Integrated Development Environment for Java.
+;; $Id: jde-stat.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Stephane Nicolas <s.nicolas@videotron.ca>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2000, 2002 Stephane Nicolas, Paul Kinnucan
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+;;;###autoload
+(defun jde-stat-loc-report (&optional count &optional total-files)
+  "Generates a report showing the number of code, comment,
+javadoc, and blank lines in the current Java source buffer. Optionally
+a total count could be passed to be displayes, as well as the number of
+processed files."
+  (interactive)
+  (flet ((perc2x2 (a b)
+		  (format "%.1f" (* 100(/ (float a) (float b))))))
+    (let* ((fname (buffer-file-name))
+	   (result (if count count (jde-stat-count-loc)))
+	   (total (nth 0 result))
+	   (comment (nth 1 result))
+	   (javadoc (nth 2 result))
+	   (blank (nth 3 result))
+	   (code (- total (+ comment javadoc blank)))
+	   (code-perc (perc2x2 code total))
+	   (doc-perc (perc2x2 comment total))
+	   (jdoc-perc (perc2x2 javadoc total))
+	   (blank-perc (perc2x2 blank total)))
+      (with-output-to-temp-buffer "LOC Report"
+	(princ "Lines of Code Report\n\n")
+	(if (and count total-files)
+	    (princ (format "Total files:  %d\n" total-files))
+	  (progn
+	    (princ (format "File name: %s\n" fname))
+	    (princ (format "File date: %s\n" (format-time-string "%D" (nth 5 (file-attributes fname)))))))
+	(princ "------------------- \n")
+	(princ (format "Code lines:    %d (%s%%)\n" code code-perc))
+	(princ (format "Javadoc lines: %d (%s%%)\n" javadoc jdoc-perc))
+	(princ (format "Comment lines: %d (%s%%)\n" comment doc-perc))
+	(princ (format "Blank lines:   %d (%s%%)\n" blank blank-perc))
+	(princ (format "Total lines:   %d  \n" total))
+	(princ "")))))
+
+
+(defun jde-stat-parse-token-out-of-quote (token line)
+  (let (result)
+     ;;;Does the line contain '//'?
+    (if (string-match token line)
+	 ;;;if so, does it contain '"'
+	(if (not (string-match "\"" line ))
+	     ;;;no! Ok, it's a comment
+	    (setq result t)
+	   ;;;yes!? so, we've got to parse to see if '//' exists without enclosing quote
+	  (let (
+		;;;we split the line in '"' delimited parts
+		(to-parse (split-string line "\""))
+		(temp "")
+		(count-even 0))
+	    ;;;we consider the even numbered parts of split
+	    ;;;to see if the contain a'//'
+	    ;;;if so, this is a doc line
+	    (while temp
+	      (setq temp (nth count-even to-parse))
+	      (if temp
+		  (if (string-match token temp)
+		      (progn
+			(setq result t)
+			(setq temp nil))))
+	      (setq count-even (+ 2  count-even))))))
+    result))
+
+(defun jde-stat-count-loc ()
+  "Counts the code, comments, javadoc, and blank lines in the current buffer.
+Returns the counts in a list: (TOTAL-LINES COMMENT-LINES JAVADOC-LINES BLANK-LINES)."
+  (let ((count 0)
+	(line "")
+	(javadoc-count 0)
+	(comment-count 0)
+	(blank-count 0)
+	in-javadoc
+	in-comment
+	(test-b t)
+	start
+	end)
+    (save-excursion
+      (goto-char (point-min))
+      (while test-b
+	(beginning-of-line 1)
+	(setq start (point))
+	(end-of-line 1)
+	(setq end (point))
+	(setq line (buffer-substring start end))
+	(setq count (+ 1 count))
+
+      ;;;To match a blank line, we search the pattern representing an empty line
+      ;;;or a line that just contains spaces
+	(if (string-match "^ *$" line)
+	    (setq blank-count (+ 1 blank-count) ))
+
+      ;;;To match a comment line, we search the pattern '//'
+      ;;;but we must disgard the '//' patterns enclosed in a pair of quote '"'
+	(if (jde-stat-parse-token-out-of-quote "//" line)
+	    (setq comment-count (+ 1 comment-count)))
+
+      ;;;To match a comment block start, we search the pattern '/*' and exclude those of type '/**'
+      ;;;but we must disgard the '/*' patterns enclosed in a pair of quote '"'
+	(if (and
+	     (jde-stat-parse-token-out-of-quote "/\\*" line)
+	     (not (jde-stat-parse-token-out-of-quote "/\\*\\*" line)))
+	    (setq in-comment t))
+
+      ;;;To match a javadoc block start, we search the pattern '/**'
+      ;;;but we must disgard the '/**' patterns enclosed in a pair of quote '"'
+	(if (jde-stat-parse-token-out-of-quote "/\\*\\*" line)
+	    (setq in-javadoc t))
+
+      ;;;To match a block end, we search the pattern '*/'
+      ;;;but we must disgard the '*/' patterns enclosed in a pair of quote '"'
+	(if (jde-stat-parse-token-out-of-quote "\\*/" line)
+	    (progn
+	      (if in-javadoc
+		  (setq javadoc-count (+ 1 javadoc-count)))
+	      (if in-comment
+		  (setq comment-count (+ 1 comment-count)))
+	      (setq in-javadoc nil)
+	      (setq in-comment nil)))
+	(if in-javadoc
+	    (setq javadoc-count (+ 1 javadoc-count)))
+	(if in-comment
+	    (setq comment-count (+ 1 comment-count)))
+	(if (not (= (forward-line 1) 0))
+	    (setq test-b nil))))
+    (list count comment-count javadoc-count blank-count)))
+
+;;;###autoload
+(defun jde-stat-loc-report-project (dir)
+  "Generates a report showing the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory and subdirectories. This method will kill any
+buffer containing a java file contained in dir."
+  (interactive "D directory name: ")
+  (let ((count (jde-stat-loc-count-directories dir)))
+    (jde-stat-loc-report (car count) (cadr count))))
+
+(defun jde-stat-loc-count-directories (dir)
+  "Counts the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory and subdirectories. This method will kill any buffer
+containing a java file contained in dir. It returns a list containing
+two elements, a list of the number of code lines, comment lines,
+javadoc lines and blank lines and the number fo files."
+  (let* ((directories (jde-stat-get-directories dir))
+	 (count (jde-stat-loc-count-directory dir))
+	 (current-count (car count))
+	 (number-of-files (cadr count)))
+    (while directories
+      (setq count (jde-stat-loc-count-directories (car directories)))
+      (setq current-count (jde-stat-add current-count (car count)))
+      (setq number-of-files (+ number-of-files (cadr count)))
+      (setq directories (cdr directories)))
+    (list current-count number-of-files)))
+
+(defun jde-stat-get-directories (dir)
+  "Returns a list of the subdirectories in dir."
+  (let (result)
+    (apply 'nconc
+	   (mapcar (function
+		    (lambda (file)
+		      (if (and (not (string= (substring file -1) "."))
+			       (file-directory-p file))
+			  (setq result (append result (list file))))))
+		   (directory-files dir t nil t)))
+    result))
+
+;;;###autoload
+(defun jde-stat-loc-report-directory (dir)
+  "Generates a report showing the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory. This method will kill any buffer containing a java file
+contained in dir."
+  (interactive "D directory name: ")
+  (let ((count (jde-stat-loc-count-directory dir)))
+    (jde-stat-loc-report (car count) (cadr count))))
+
+(defun jde-stat-loc-count-directory (dir)
+  "Counts the number of code, comment,
+javadoc, and blank lines in all the java files in the current
+directory. This method will kill any buffer containing a java file
+contained in dir. It returns a list containing two elements,
+a list of the number of code lines, comment lines,
+javadoc lines and blank lines and the number fo files."
+  (let* ((files (directory-files dir t (wildcard-to-regexp "*.java") t))
+	 (number-of-files (length files))
+	 (count (list 0 0 0 0)))
+    (while files
+      (switch-to-buffer (find-file-noselect (car files) nil t))
+      (setq count (jde-stat-add count (jde-stat-count-loc)))
+      (kill-buffer (current-buffer))
+      (setq files (cdr files)))
+    (list count number-of-files)))
+
+(defun jde-stat-add (count count2)
+  "It takes as an argument two lists of 4 elements. The first element
+is the total number of lines, the second the number of comment lines,
+the third the number of javadoc lines, and fourth the number of
+blank lines. It adds the respective elements in each list and returns another
+list of four elements."
+  (list (+ (nth 0 count) (nth 0 count2))
+	(+ (nth 1 count) (nth 1 count2))
+	(+ (nth 2 count) (nth 2 count2))
+	(+ (nth 3 count) (nth 3 count2))))
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-stat)
+
+;; End of jde-stat.el
diff --git a/site/jdee/lisp/jde-stat.elc b/site/jdee/lisp/jde-stat.elc
new file mode 100644
index 0000000..e9aba00
Binary files /dev/null and b/site/jdee/lisp/jde-stat.elc differ
diff --git a/site/jdee/lisp/jde-tree-widget.el b/site/jdee/lisp/jde-tree-widget.el
new file mode 100644
index 0000000..f484901
--- /dev/null
+++ b/site/jdee/lisp/jde-tree-widget.el
@@ -0,0 +1,538 @@
+;;; jde-tree-widget.el --- Tree widget
+;; $Id: jde-tree-widget.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Copyright (C) 2001, 2004 by David Ponce
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Created: 16 Feb 2001
+;; Version: 1.0.5
+;; Keywords: extensions
+
+;; This file is not part of Emacs
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; This library provide a `tree-widget' useful to display data
+;; structures organized in hierarchical order.
+;;
+;; The following `tree-widget' extra properties are recognized:
+;;
+;;   :open
+;;      Set to non-nil to unfold the tree.  By default the tree is
+;;      folded.
+;;
+;;   :node
+;;      The widget used for the tree node.  By default this is an
+;;      `item' widget which displays the tree :tag property value if
+;;      defined or a string representation of the tree value using the
+;;      function `widget-princ-to-string'.
+;;
+;;   :keep
+;;      Specify a list of extra properties to keep when the tree is
+;;      folded so they can be recovered when the tree is unfolded.
+;;      This property is also honoured in `tree-widget' children.
+;;
+;;   :dynargs
+;;      Specify a function to be called when the tree is unfolded.
+;;      This function will receives the tree widget as its argument
+;;      and must return a list of children widget definitions.  Thus
+;;      dynamlically providing the tree children in response to an
+;;      unfold request.  The list of children definitions is kept in
+;;      the tree :args property and the :dynargs function can just
+;;      return its value when unfolding the tree again.  To force a
+;;      new evaluation of the tree content just set its :args property
+;;      to nil and redraw the node.
+;;
+;;   :has-children
+;;      Specify if this tree has children.  This property has meaning
+;;      only when used with the above :dynargs one.  It indicates that
+;;      children widget exist but will be provided when unfolding the
+;;      node.
+;;
+;;   :no-leaf-handle   (default "*---- ")
+;;   :close-handle     (default "-- ")
+;;   :no-guide         (default "   ")
+;;   :open-handle      (default "-, ")
+;;   :guide            (default " | ")
+;;   :leaf-handle      (default " |--- ")
+;;   :last-leaf-handle (default " `--- ")
+;;      These properties define the strings used to draw the tree
+;;      like the following:
+;;
+;;      *---- N0        :no-leaf-handle + node
+;;
+;;      [-]-, N0        node-handle + :open-handle + node
+;;          |--- N1     :no-guide + :leaf-handle + node
+;;         [-]-, N2     :no-guide + node-handle + :open-handle + node
+;;          |  |--- N21 :no-guide + :guide + :leaf-handle + node
+;;          |  `--- N22 :no-guide + :guide + :last-leaf-handle + node
+;;         [+]-- N3     :no-guide + node-handle + :close-handle + node
+;;
+;; About leaf node format
+;;   To correctly draw the tree, that is insert the current leaf node
+;;   prefix, leaf node widgets should prepend the "%p" escape to the
+;;   value of the :format property.  And set the :format-handler
+;;   property to `tree-widget-format-handler'.  Something like this:
+;;
+;;   (define-widget 'leaf-node 'item
+;;     :format "%p%t\n"
+;;     :format-handler #'tree-widget-format-handler)
+;;
+;; Basic examples of `tree-widget' usage are provided in this file
+;; (see commands `tree-widget-example-1' and `tree-widget-example-2').
+;; A more sophisticated example is provided in the dir-tree.el
+;; source.
+;;
+;; Installation
+
+;; Put this file on your Emacs-Lisp load path and add following into
+;; your ~/.emacs startup file
+;;
+;;   (require 'tree-widget)
+
+;; Support
+;;
+;; This program is available at <http://www.dponce.com/>. Any
+;; comments, suggestions, bug reports or upgrade requests are welcome.
+;; Please send them to David Ponce <david@dponce.com>.
+
+;;; Code:
+
+(require 'wid-edit)
+
+;;; Customization.
+
+(defgroup tree-widget nil
+  "Customization support for the Tree Widget Library."
+  :group 'widgets)
+
+(defcustom tree-widget-node-handle-widget 'tree-widget-node-handle
+  "Widget type used for tree node handle."
+  :type  'symbol
+  :group 'tree-widget)
+
+(defun tree-widget-get-super (widget property)
+  "Return WIDGET super class PROPERTY value."
+  (widget-get
+   (get (widget-type
+	 (get (widget-type widget) 'widget-type))
+	'widget-type)
+   property))
+
+(defun tree-widget-p (widget)
+  "Return non-nil if WIDGET inherits from a 'tree-widget' widget."
+  (let ((type (widget-type widget)))
+    (while (and type (not (eq type 'tree-widget)))
+      (setq type (widget-type (get type 'widget-type))))
+    (eq type 'tree-widget)))
+
+(defun tree-widget-keep (arg widget)
+  "Save in ARG the WIDGET properties specified by :keep."
+  (let ((plist (widget-get widget :keep))
+	prop)
+    (while plist
+      (setq prop  (car plist)
+	    plist (cdr plist))
+      (widget-put arg prop (widget-get widget prop)))))
+
+(defun tree-widget-node (widget)
+  "Return the tree WIDGET :node value.
+If not found setup a default 'item' widget."
+  (or (widget-get widget :node)
+      ;; Take care of actually return the :node property value.
+      ;; Because FSF Emacs `widget-put' returns the property value and
+      ;; XEmacs one returns the widget value!!!  So don't use thing
+      ;; like this ;-)
+      ;; (or (widget-get widget :node)
+      ;;     (widget-put widget :node node))
+      (let ((node `(item :tag ,(or (widget-get widget :tag)
+				   (widget-princ-to-string
+				    (widget-value widget))))))
+	(widget-put widget :node node)
+	node)))
+
+(defun tree-widget-children-value-save (widget &optional args node)
+  "Save WIDGET children values.
+Children properties and values are saved in ARGS if non-nil else in
+WIDGET :args property value.  Data node properties and value are saved
+in NODE if non-nil else in WIDGET :node property value."
+  (let ((args       (or args (widget-get widget :args)))
+	(node       (or node (tree-widget-node widget)))
+	(children   (widget-get widget :children))
+	(node-child (widget-get widget :tree-widget-node))
+	arg child)
+    (while (and args children)
+      (setq arg      (car args)
+	    args     (cdr args)
+	    child    (car children)
+	    children (cdr children))
+      (cond
+
+       ;; The child is a tree node.
+       ((tree-widget-p child)
+
+	  ;; Backtrack :args and :node properties.
+	(widget-put arg :args (widget-get child :args))
+	(widget-put arg :node (tree-widget-node child))
+
+	;; Save :open property.
+	(widget-put arg :open (widget-get child :open))
+
+	;; The node is open.
+	(if (widget-get child :open)
+	    (progn
+	      ;; Save the widget value.
+	      (widget-put arg :value (widget-value child))
+	      ;; Save properties specified in :keep.
+	      (tree-widget-keep arg child)
+	      ;; Save children.
+	      (tree-widget-children-value-save
+	       child
+	       (widget-get arg :args)
+	       (widget-get arg :node)))))
+
+	;; Another non tree node.
+	(t
+	 ;; Save the widget value
+	 (widget-put arg :value (widget-value child))
+	 ;; Save properties specified in :keep.
+	 (tree-widget-keep arg child))))
+
+    (cond ((and node node-child)
+	   ;; Assume that the node child widget is not a tree!
+	   ;; Save the node child widget value.
+	   (widget-put node :value (widget-value node-child))
+	   ;; Save the node child properties specified in :keep.
+	   (tree-widget-keep node node-child)))))
+
+(defvar tree-widget-after-toggle-functions nil
+  "Hooks run after toggling a `tree-widget' folding.
+Each function will receive the `tree-widget' as its unique argument.
+This variable should be local to each buffer used to display
+widgets.")
+
+(defun tree-widget-toggle-folding (widget &rest ignore)
+  "Toggle a `tree-widget' folding.
+WIDGET is a `tree-widget-node-handle-widget' and its parent the
+`tree-widget' itself.  IGNORE other arguments."
+  (let ((parent (widget-get widget :parent))
+	(open   (widget-value widget)))
+     (if open
+	 ;; Before folding the node up, save children values so next
+	 ;; open can recover them.
+	 (tree-widget-children-value-save parent))
+    (widget-put parent :open (not open))
+    (widget-value-set parent (not open))
+    (run-hook-with-args 'tree-widget-after-toggle-functions parent)))
+
+(defvar tree-widget-button-keymap
+  (let (parent-keymap mouse-button1 keymap)
+    (if (featurep 'xemacs)
+	(setq parent-keymap  widget-button-keymap
+	      mouse-button1 [button1])
+      (setq parent-keymap  widget-keymap
+	    mouse-button1 [down-mouse-1]))
+    (setq keymap (copy-keymap parent-keymap))
+    (define-key keymap mouse-button1 #'widget-button-click)
+    keymap)
+  "Keymap used inside node handle buttons.")
+
+(define-widget 'tree-widget-node-handle 'toggle
+  "Tree node handle widget."
+  :button-keymap  tree-widget-button-keymap ; XEmacs
+  :keymap         tree-widget-button-keymap ; Emacs
+  :format         "%[%v%]"
+  :on             "[+]"
+  :off            "[-]"
+  :notify         #'tree-widget-toggle-folding)
+
+(define-widget 'tree-widget 'default
+  "Tree node widget."
+  :format         "%v"
+  :convert-widget #'widget-types-convert-widget
+  :value-get      #'widget-value-value-get
+  :value-create   #'tree-widget-value-create
+  :value-delete   #'tree-widget-value-delete
+
+  ;; *---- N          :no-leaf-handle + node
+
+  ;; [-]-, N          node-handle + :open-handle + node
+  ;;     |--- N1      :no-guide + :leaf-handle + node
+  ;;    [-]-, N2      :no-guide + node-handle + :open-handle + node
+  ;;     |  |--- N21  :no-guide + :guide + :leaf-handle + node
+  ;;     |  `--- N22  :no-guide + :guide + :last-leaf-handle + node
+  ;;    [+]-- N3      :no-guide + node-handle + :close-handle + node
+
+  :no-leaf-handle   "*---- "
+  :close-handle     "-- "
+  :no-guide         "   "
+  :open-handle      "-, "
+  :guide            " | "
+  :leaf-handle      " |--- "
+  :last-leaf-handle " `--- ")
+
+(defun tree-widget-format-handler (widget escape)
+  "Convenient %p format handler to insert a leaf node prefix.
+WIDGET is a tree leaf node and ESCAPE a format character."
+  (cond
+
+   ;; If %p format insert the leaf node prefix.
+   ((eq escape ?p)
+    (if (widget-get widget :indent)
+	(insert-char ?  (widget-get widget :indent)))
+    (insert
+     (or (widget-get widget :tree-widget-leaf-handle)
+	 "")))
+
+   ;; For other ESCAPE values call the WIDGET super class format
+   ;; handler.
+   (t
+    (let ((handler (tree-widget-get-super widget :format-handler)))
+      (if handler
+	  (funcall handler widget escape))))))
+
+(defun tree-widget-value-delete (widget)
+  "Delete tree WIDGET children."
+  ;; Delete children
+  (widget-children-value-delete widget)
+  ;; Delete node child
+  (widget-delete (widget-get widget :tree-widget-node))
+  (widget-put widget :tree-widget-node nil))
+
+(defun tree-widget-value-create (widget)
+  "Create the tree WIDGET children."
+  (let ((args (widget-get widget :args))
+	(open (widget-get widget :open))
+	(node (tree-widget-node widget))
+	children buttons prefix)
+
+    (cond
+
+     ;; Leaf node.
+     ((not (or args
+	       ;; Take care of dynamic tree.  If :has-children is
+	       ;; non-nil let a chance to open the node later.  So
+	       ;; don't consider it as a leaf node even if it has not
+	       ;; (yet) any children.
+	       (and (widget-get widget :dynargs)
+		    (widget-get widget :has-children))))
+
+      (insert (or (widget-get widget :tree-widget-leaf-handle)
+		  (widget-get widget :no-leaf-handle)))
+      (widget-put widget :tree-widget-node
+		  (widget-create-child-and-convert widget node)))
+
+     ;; Unfolded node.
+     (open
+
+      ;; Maybe the tree is dynamic.
+      (if (widget-get widget :dynargs)
+	  (let ((newargs
+		 ;; Request the definition of children.
+		 (funcall (widget-get widget :dynargs) widget)))
+	    ;; Maybe reuse definition from the :args cache.
+	    (or (eq args newargs)
+		;; Otherwise setup a new :args cache.
+		(widget-put
+		 widget :args
+		 (setq args (mapcar #'widget-convert newargs))))))
+
+      (setq buttons
+	    (cons (widget-create-child-and-convert
+		   widget tree-widget-node-handle-widget
+		   :value nil :help-echo "Hide node")
+		  buttons))
+      (insert (widget-get widget (if args
+				     :open-handle
+				   :close-handle)))
+      (widget-put widget :tree-widget-node
+		  (widget-create-child-and-convert widget node))
+      (setq prefix
+	    (concat (or (widget-get widget :tree-widget-prefix) "")
+		    (or (widget-get widget :tree-widget-guide)
+			(widget-get widget :no-guide))))
+      (if (null args)
+	  nil
+	(while (cdr args)
+	  (insert prefix)
+	  (setq children
+		(cons (widget-create-child-and-convert
+		       widget (car args)
+		       :tree-widget-prefix prefix
+		       :tree-widget-guide (widget-get widget :guide)
+		       :tree-widget-leaf-handle
+		       (widget-get widget :leaf-handle))
+		      children)
+		args (cdr args)))
+	;; The last non tree child uses the :last-leaf-handle.
+	(insert prefix)
+	(setq children
+	      (cons (widget-create-child-and-convert
+		     widget (car args)
+		     :tree-widget-prefix prefix
+		     :tree-widget-leaf-handle
+		     (widget-get widget :last-leaf-handle))
+		    children))))
+
+     ;; Folded node.
+     (t
+
+      (setq buttons
+	    (cons
+	     (widget-create-child-and-convert
+	      widget tree-widget-node-handle-widget
+	      :value t :help-echo "Show node")
+	    buttons))
+      (insert (widget-get widget :close-handle))
+      (widget-put widget :tree-widget-node
+		  (widget-create-child-and-convert widget node))))
+
+    (widget-put widget :children (nreverse children))
+    (widget-put widget :buttons  buttons)))
+
+;;;;
+;;;; Utilities
+;;;;
+
+(defun tree-widget-map (widget fun)
+  "For each WIDGET displayed child call function FUN.
+FUN is called with three arguments like this:
+
+ (FUN CHILD IS-NODE WIDGET)
+
+where:
+- - CHILD is the child widget.
+- - IS-NODE is non-nil if CHILD is WIDGET node widget."
+  (if (widget-get widget :tree-widget-node)
+      (let ((children (widget-get widget :children))
+	    child)
+	(funcall fun (widget-get widget :tree-widget-node)
+		 t widget)
+	(while children
+	  (setq child    (car children)
+		children (cdr children))
+	  (if (tree-widget-p child)
+	      ;; The child is a tree node.
+	      (tree-widget-map child fun)
+	    ;; Another non tree node.
+	    (funcall fun child nil widget))))))
+
+;;;;
+;;;; Samples
+;;;;
+
+;;; Compatibility
+
+(cond ((featurep 'xemacs)
+
+       (defalias 'tree-widget-sample-overlay-lists
+	 (lambda () (list (extent-list))))
+       (defalias 'tree-widget-sample-delete-overlay 'delete-extent))
+
+      (t
+
+       (defalias 'tree-widget-sample-overlay-lists 'overlay-lists)
+       (defalias 'tree-widget-sample-delete-overlay 'delete-overlay)))
+
+(defun tree-widget-example-1 ()
+  "A simple usage of the `tree-widget'."
+  (interactive)
+  (switch-to-buffer "*`tree-widget' example 1*")
+  (kill-all-local-variables)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (let ((all (tree-widget-sample-overlay-lists)))
+    (mapcar #'tree-widget-sample-delete-overlay (car all))
+    (mapcar #'tree-widget-sample-delete-overlay (cdr all)))
+
+  (widget-insert (format "%s. \n\n" (buffer-name)))
+
+  (widget-create
+   ;; Open this level.
+   'tree-widget :open t
+   ;; Use a push button for this node.
+   :node '(push-button
+	   :tag "Root"
+	   :format "%[%t%]\n"
+	   :notify
+	   (lambda (&rest ignore)
+	     (message "This is the Root node")))
+   ;; Add subtrees (their nodes defaut to items).
+   '(tree-widget :tag "Child-1")
+   '(tree-widget :tag "Child-2"
+		 (tree-widget :tag "Child-2.1")
+		 (tree-widget :tag "Child-2.2"
+			      (tree-widget :tag "Child-2.2.1")
+			      (tree-widget :tag "Child-2.2.2")))
+   '(tree-widget :tag "Child-3"
+		 (tree-widget :tag "Child-3.1")
+		 (tree-widget :tag "Child-3.2")))
+
+  (use-local-map widget-keymap)
+  (widget-setup))
+
+(defun tree-widget-example-2-dynargs (widget)
+  "Return the children definitions of WIDGET.
+Reuse the cached :args property value if exists."
+  (or (widget-get widget :args)
+      '((tree-widget :tag "Child-2.1")
+	(tree-widget :tag "Child-2.2"
+		     (tree-widget :tag "Child-2.2.1")
+		     (tree-widget :tag "Child-2.2.2")))))
+
+(defun tree-widget-example-2 ()
+  "A simple usage of the `tree-widget' with dynamic expansion."
+  (interactive)
+  (switch-to-buffer "*`tree-widget' example 2*")
+  (kill-all-local-variables)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (let ((all (tree-widget-sample-overlay-lists)))
+    (mapcar #'tree-widget-sample-delete-overlay (car all))
+    (mapcar #'tree-widget-sample-delete-overlay (cdr all)))
+
+  (widget-insert (format "%s. \n\n" (buffer-name)))
+
+  (widget-create
+   ;; Open this level.
+   'tree-widget :open t
+   ;; Use a push button for this node.
+   :node '(push-button
+	   :tag "Root"
+	   :format "%[%t%]\n"
+	   :notify
+	   (lambda (&rest ignore)
+	     (message "This is the Root node")))
+   ;; Add subtrees (their nodes defaut to items).
+   '(tree-widget :tag "Child-1")
+   ;; Dynamically retrieve children of this node.
+   '(tree-widget :tag "Child-2"
+		 :dynargs tree-widget-example-2-dynargs
+		 :has-children t)
+   '(tree-widget :tag "Child-3"
+		 (tree-widget :tag "Child-3.1")
+		 (tree-widget :tag "Child-3.2")))
+
+  (use-local-map widget-keymap)
+  (widget-setup))
+
+(provide 'tree-widget)
+
+;;; jde-tree-widget.el ends here
diff --git a/site/jdee/lisp/jde-tree-widget.elc b/site/jdee/lisp/jde-tree-widget.elc
new file mode 100644
index 0000000..9ddaf92
Binary files /dev/null and b/site/jdee/lisp/jde-tree-widget.elc differ
diff --git a/site/jdee/lisp/jde-util.el b/site/jdee/lisp/jde-util.el
new file mode 100644
index 0000000..a5af1bd
--- /dev/null
+++ b/site/jdee/lisp/jde-util.el
@@ -0,0 +1,269 @@
+;;; jde-util.el -- JDE utilities.
+;; $Id: jde-util.el 183 2010-01-02 20:22:14Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 2001-2006 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This package provides useful macros, functions, and classes
+;; required by multiple JDE packages. You should not put any macros,
+;; functions, or classes in this package that require other
+;; JDE packages.
+;;
+;; This is one of a set of packages that make up the
+;; Java Development Environment (JDE) for Emacs. See the
+;; JDE User's Guide for more information.
+
+;; The latest version of the JDE is available at
+;; <URL:http://jdee.sourceforge.net>.
+
+;; Please send any comments, bugs, or upgrade requests to
+;; Paul Kinnucan at pkinnucan@comcast.net.
+
+;;; Code:
+
+(require 'efc)
+
+(if (featurep 'xemacs)
+     (load "arc-mode")
+  (require 'arc-mode))
+
+(defsubst jde-line-beginning-position (&optional n)
+  (if (featurep 'xemacs)
+      (save-excursion (beginning-of-line n) (point))
+    (line-beginning-position n)))
+
+(defsubst jde-line-end-position (&optional n)
+  (if (featurep 'xemacs)
+      (save-excursion (end-of-line n) (point))
+    (line-end-position)))
+
+;;;###autoload
+(defun jde-require (feature)
+   "Require FEATURE, either pre-installed or from the distribution.
+ That is, first try to load the FEATURE library. Then try to load the
+ jde-FEATURE library from the JDEE's distribution.
+ Signal an error if FEATURE can't be found."
+   (condition-case nil
+      ;; If the library if available, use it.
+       (require feature)
+     (error
+      ;; Try to use the one from the JDEE's distribution.
+      (require feature (format "jde-%s" feature)))))
+
+(defmacro jde-assert-source-buffer ()
+  "Asserts that the current buffer is a
+Java source or a debug buffer."
+  '(assert  (eq major-mode 'jde-mode) nil
+    "This command works only in a Java source or debug buffer."))
+
+
+;; Provided for XEmacs compatibility.
+(if (not (fboundp 'subst-char-in-string))
+    (defun subst-char-in-string (fromchar tochar string &optional inplace)
+      "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+      (let ((i (length string))
+	    (newstr (if inplace string (copy-sequence string))))
+	(while (> i 0)
+	  (setq i (1- i))
+	  (if (eq (aref newstr i) fromchar)
+	      (aset newstr i tochar)))
+	newstr)))
+
+(if (not (fboundp 'replace-in-string))
+    (defun replace-in-string  (string regexp newtext &optional literal)
+      "Replace REGEXP with NEWTEXT in STRING. see: `replace-match'"
+      (if (string-match regexp string)
+	  (replace-match newtext nil literal string)
+	string)))
+
+
+(defun jde-get-line-at-point (&optional pos)
+  "Get the number of the line at point."
+  (let* ((point (or pos (point)))
+	 (ln (if (= point 1)
+		 1
+	       (count-lines (point-min) point))))
+    (save-excursion
+      (goto-char point)
+      (if (eq (char-before) ?\n)
+	  (1+ ln)
+	ln))))
+
+(defun jde-root ()
+  "Return the path of the root directory of this JDEE
+installation. The root directory is the parent of the
+directory that contains the JDEE's Lisp files. On
+Emacs and on XEmacs installations that use the
+JDEE distributable, the root directory is the root
+directory that results from unpacking the distributable.
+On installations based on the version of the JDEE
+packaged with XEmacs, the root directory is
+xemacs-packages/lisp."
+  (let ((directory-sep-char ?/))
+    (expand-file-name
+     "../"
+     (file-name-directory (locate-library "jde")))))
+
+(defun jde-find-jde-data-directory ()
+  "Return the path of the JDE data directory.
+Returns the path of the directory containing the
+JDE java and documentation directories;  nil if the
+directory cannot be found. If XEmacs, returns the location of
+the data directory in the XEmacs distribution hierarchy. On all other Emacs versions,
+the JDE expects to find the documentation and Java class directories
+in the same directory that contains the JDE lisp directory."
+  (let ((directory-sep-char ?/))
+    (if (featurep 'xemacs)
+	(let ((dir (locate-data-directory "jde")))
+	  (if dir dir (jde-root)))
+      (jde-root))))
+
+(defun jde-temp-directory ()
+"Get the location used by the host system to store temporary files."
+  (or (if (boundp 'temporary-file-directory) temporary-file-directory)
+      (if (fboundp 'temp-directory) (temp-directory)
+	(if (member system-type '(cygwin32 cygwin))
+	    (jde-cygwin-path-converter-cygpath (temp-directory))
+	  (temp-directory)))))
+
+(defun jde-get-java-source-buffers ()
+  "Return a list of Java source buffers open in the current session."
+  (delq
+   nil
+   (mapcar
+    #'(lambda (buffer)
+	(with-current-buffer buffer
+	  (if (eq major-mode 'jde-mode)
+	      buffer)))
+    (buffer-list))))
+
+(defun jde-get-project-source-buffers (&optional project-file)
+  "Return a list of the Java source buffers belonging to the project
+whose project file is PROJECT-FILE. If PROJECT-FILE is not specified,
+this function returns the buffers belonging to the project in the
+currently selected source buffer."
+  (let ((proj-file
+	 (or project-file
+	     (if (boundp 'jde-current-project)
+		 jde-current-project))))
+    (delq
+     nil
+     (mapcar
+      (lambda (buffer)
+	(with-current-buffer buffer
+	 (if (equal jde-buffer-project-file proj-file)
+	     buffer)))
+      (jde-get-java-source-buffers)))))
+
+(defun jde-get-visible-source-buffers ()
+  "Return a list of visible Java source buffers."
+  (delq nil (mapcar #'(lambda (buffer)
+			(if (get-buffer-window buffer 'visible)
+			    buffer))
+		    (jde-get-java-source-buffers))))
+
+(defun jde-get-selected-source-buffer ()
+  (with-current-buffer (window-buffer (selected-window))
+    (if (eq major-mode 'jde-mode)
+	(current-buffer))))
+
+;;;###autoload
+(defun jde-exception-goto ()
+  "Go to the Java source file and line indicated by an exception stack trace."
+  (interactive)
+  (let ((regexp "[ \t]+at \\([a-zA-Z0-9.]+\\)\\(?:\\$?[a-zA-Z0-9]*\\)\\.\\([^(]+\\)([^:]+:\\([0-9]+\\))$")
+	file line end)
+    (save-match-data
+      (save-excursion
+	(end-of-line)
+	(setq end (point))
+	(beginning-of-line)
+	(if (not (re-search-forward regexp end t))
+	    (error (concat "Current line doesn't look "
+			   "like an exception stack trace line")))
+	(let ((full-class (match-string 1))
+	      (method (match-string 2)))
+	  (setq line (string-to-int (match-string 3)))
+	  (setq file (jde-find-class-source-file full-class))
+	  (if (null file)
+	      (error "Java source for class `%s' not found" full-class)))))
+    (find-file-other-window file)
+    (goto-line line)))
+
+;;;###autolaod
+(defalias 'jde-goto-exception 'jde-exception-goto)
+
+(defcustom jde-htmlize-code-destinations '("~/Desktop" "~/tmp")
+  "*Directories to put the output of `jde-htmlize-code'.
+The function iterates through each and stops when it finds an existing
+directory."
+  :group 'jde-project
+  :type '(repeat directory))
+
+;;;###autoload
+(defun jde-htmlize-code (start end &optional no-line-numbers-p)
+  "Write the current code region as an HTML document.
+Line numbers are added as well.
+
+See `jde-htmlize-code-destinations'."
+  (interactive
+   (append (if mark-active
+	       (list (region-beginning) (region-end))
+	     (list (point-min) (point-max)))
+	   (list (not current-prefix-arg))))
+  (require 'htmlize)
+  (save-restriction
+    (narrow-to-region start end)
+    (let ((code-buf (current-buffer))
+	  (line-width (ceiling (log10 (count-lines (point-min) (point-max)))))
+	  (ln 0))
+      (with-temp-buffer
+	(insert-buffer-substring code-buf)
+	(untabify (point-min) (point-max))
+	(goto-char (point-min))
+	(if (not no-line-numbers-p)
+	    (while (not (eobp))
+	      (beginning-of-line)
+	      (insert (format (format "%%.%dd " line-width) (incf ln)))
+	      (forward-line)))
+	(rename-buffer (concat (buffer-name code-buf) ".html"))
+	(let ((buf (htmlize-buffer))
+	      (bname (buffer-name)))
+	  (unwind-protect
+	      (with-current-buffer buf
+		(set-visited-file-name
+		 (dolist (dir jde-htmlize-code-destinations)
+		   (setq dir (expand-file-name dir))
+		   (if (file-exists-p dir)
+		       (return (expand-file-name bname dir)))))
+		(save-buffer)
+		(if (featurep 'browse-url)
+		    (browse-url (buffer-file-name))))
+	    (if (buffer-live-p buf)
+		(kill-buffer buf))))))))
+
+(provide 'jde-util)
+
+;; End of jde-util.el
diff --git a/site/jdee/lisp/jde-util.elc b/site/jdee/lisp/jde-util.elc
new file mode 100644
index 0000000..0c0469d
Binary files /dev/null and b/site/jdee/lisp/jde-util.elc differ
diff --git a/site/jdee/lisp/jde-which-method.el b/site/jdee/lisp/jde-which-method.el
new file mode 100644
index 0000000..547ea71
--- /dev/null
+++ b/site/jdee/lisp/jde-which-method.el
@@ -0,0 +1,259 @@
+;;; jde-which-method.el --- Print current method in mode line
+;; $Id: jde-which-method.el 180 2009-12-27 02:12:56Z lenbok $
+
+;; Copyright (C) 1997-2004 Paul Kinnucan
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Paul Kinnucan (paulk@mathworks.com)
+;; Inspired by Alex Rezinsky's which-func package.
+;; Keywords: mode-line, tools
+
+;; This file is not part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This package displays the name of the method at point
+;; in the Emacs mode line.
+
+;;; Code:
+
+(require 'jde-parse)
+
+
+(defgroup jde-which-method nil
+  "Mode to display the current function name in the modeline."
+  :group 'jde)
+
+;;;###autoload
+(defcustom jde-which-method-mode t
+  "Enables the JDE's which method mode.
+When which method mode is enabled, the current method name is
+displayed in the mode line."
+  :group 'jde-which-method
+  :type  'boolean)
+
+(defcustom jde-which-method-format '("[" jde-which-method-current "]")
+  "Format for displaying the function in the mode line."
+  :group 'jde-which-method
+  :type 'sexp)
+
+(defcustom jde-mode-line-format
+  '("-"
+    mode-line-mule-info
+    mode-line-modified
+    mode-line-frame-identification
+    mode-line-buffer-identification
+    "   "
+    global-mode-string
+    "   %[(" mode-name mode-line-process minor-mode-alist "%n" ")%]--"
+    (line-number-mode "L%l--")
+    (column-number-mode "C%c--")
+    (-3 . "%p")
+    (jde-which-method-mode
+     ("--" jde-which-method-format "--"))
+    "-%-")
+  "Format for the JDE source buffer mode line."
+  :group 'jde
+  :type 'sexp)
+  
+(defcustom jde-which-full-class-name nil
+  "Display full inner-class name in JDE's which method mode. 
+If nil then display only the last component of class name.
+\(see `jde-which-method-max-length', `jde-which-method-class-min-length')
+"
+  :group 'jde-which-method
+  :type  'boolean)
+
+(defcustom jde-which-method-max-length 20
+  "Specify the maximum length of the which-method-string \(see
+`jde-which-method-format'). If nil, the string is not \
+truncated."
+  :type '(choice (const :tag "No truncation" :value nil)
+		 (integer :tag "Max. length"))
+  :group 'jde-which-method)
+
+(defcustom jde-which-method-class-min-length 4
+  "Specifies the minimum length of the class part of the full method
+name after truncation of the class name, but only if the class
+is displayed and if `jde-which-method-max-length'
+is not nil. If the full method name is still greater than
+`jde-which-method-max-length', the method part of the name is truncated."
+  :type '(integer :tag "Min. length")
+  :group 'jde-which-method)
+
+
+(defcustom jde-which-method-abbrev-symbol "~"
+"Symbol used to indicate abbreviated part of a method name."
+    :group 'jde-which-method
+    :type  'string)
+
+;;; Code, nothing to customize below here
+;;; -------------------------------------
+;;;
+
+(defvar jde-which-method-idle-timer nil
+  "Timer that updates the mode line.")
+
+(defvar jde-which-method-unknown "???"
+  "String to display in the mode line when the current method is unknown.")
+
+(defvar jde-which-method-current jde-which-method-unknown)
+(make-variable-buffer-local 'jde-which-method-current)
+
+(defvar jde-which-method-previous jde-which-method-unknown)
+(make-variable-buffer-local 'jde-which-method-previous)
+
+(defvar jde-which-method-current-point-loc -1)
+(make-variable-buffer-local 'jde-which-method-current-point-loc)
+
+(defvar jde-which-method-current-method-bounds (cons -1 -1))
+(make-variable-buffer-local 'jde-which-method-current-method-bounds)
+
+
+(defun jde-which-method-truncate-begin (str truncation)
+  (if (> truncation (length jde-which-method-abbrev-symbol))
+	 (concat jde-which-method-abbrev-symbol (substring str truncation))
+       str))
+
+(defun jde-which-method-truncate-end (str truncation)
+  (let ((str-length (length str)))
+    (if (> truncation (length jde-which-method-abbrev-symbol))
+	(concat (substring str 0 (- str-length truncation))
+		jde-which-method-abbrev-symbol)
+      str)))
+
+(defun jde-which-method-update ()
+  (interactive)
+  (if (and
+       jde-which-method-mode
+       (eq major-mode 'jde-mode))
+      (condition-case info
+	  (let ((p (point)))
+	    (unless (or
+		     (= jde-which-method-current-point-loc p)
+		     (and
+		      (>= p (car jde-which-method-current-method-bounds))
+		      (<= p (cdr jde-which-method-current-method-bounds))))
+	      (let ((name;; (jde-parse-get-method-at-point)
+		     (if jde-parse-the-method-map
+			 (jde-parse-method-map-get-method-at jde-parse-the-method-map))
+		     ))
+		(if name
+		    (let* ((name-pair (car name))
+			   (class (jde-which-method-class-name name))
+			   (method (cdr name-pair))
+			   (bounds (cdr name))
+			   (class-length (length class))
+			   (method-length (length method))
+			   ;; initialize the truncation with 0!
+			   (trunc-class 0)
+			   (trunc-method 0)
+			   (trunc-complete 0))
+		      (when jde-which-method-max-length
+			;; compute necessary truncation of method and/or class
+			(if jde-parse-buffer-contains-multiple-classes-p
+			    (when (> (+ class-length method-length 1)
+				     jde-which-method-max-length)
+			      (setq trunc-complete (- (+ class-length
+							 method-length 1)
+						      jde-which-method-max-length))
+			      (if (< (- class-length trunc-complete)
+				     jde-which-method-class-min-length)
+				  (setq trunc-class
+					(- class-length
+					   jde-which-method-class-min-length)
+					trunc-method (- trunc-complete
+							trunc-class))
+				(setq trunc-method 0
+				      trunc-class trunc-complete)))
+			  (when (> method-length jde-which-method-max-length)
+			    (setq trunc-method (- method-length
+						  jde-which-method-max-length)))))
+		      ;; truncate method and class with the computed truncation
+		      ;; (possible 0, then no truncation is done in fact)
+		      (setq class (jde-which-method-truncate-end class trunc-class)
+			    method (jde-which-method-truncate-end method trunc-method))
+		      ;; set the displayed string from the (possible truncated)
+		      ;; class and method parts according to
+		      ;; jde-parse-buffer-contains-multiple-classes-p.
+		      (setq jde-which-method-current
+			    (if jde-parse-buffer-contains-multiple-classes-p
+				(format "M:%s.%s" class method)
+			      (format "M:%s" method)))
+		      (setq jde-which-method-current-point-loc p)
+		      (setq jde-which-method-current-method-bounds bounds))
+		  (progn
+		    (setq name (jde-which-class-name (jde-parse-get-innermost-class-at-point)))
+		    (setq jde-which-method-current-point-loc p)
+		    (setq jde-which-method-current-method-bounds (cons -1 -1))
+		    (if name
+			(let* ((class (car name))
+			       (class-length (length class)))
+			  ;; possible truncate the string to display
+			  (when (and jde-which-method-max-length
+				     (> class-length jde-which-method-max-length))
+			    (setq class (jde-which-method-truncate-begin class
+									 (- class-length
+									    jde-which-method-max-length))))
+			  (setq jde-which-method-current (format "C:%s" class)))
+		      (setq jde-which-method-current jde-which-method-unknown))))
+		(unless (equal jde-which-method-current jde-which-method-previous)
+		  (setq jde-which-method-previous jde-which-method-current)
+		  (force-mode-line-update)))))
+	(error
+	 ;; (debug)
+	 (cancel-timer jde-which-method-idle-timer)
+	 (setq jde-which-method-idle-timer nil)
+	 (message "Error in jde-which-method-update: %s" info)))))
+
+(defun jde-which-full-class-namef (name) 
+  ;; name and return value is: (string . point) or nil.
+  (save-excursion
+    (do ((rv name)) ((not name) rv)
+      (goto-char (cdr name))
+      (setq name (jde-parse-get-innermost-class-at-point))
+      (if name (setf (car rv) (concat (car name) "." (car rv)))))))
+
+(defun jde-which-class-name(name) 
+  ;; use given name or gather full-name:
+  (if jde-which-full-class-name
+      (jde-which-full-class-namef name)
+    name
+    ))
+
+(defun jde-which-method-class-name(name)
+  (if jde-which-full-class-name
+      (car (jde-which-full-class-namef (jde-parse-get-innermost-class-at-point)))
+    (caar name)
+    ))
+
+(defun jde-which-method-update-on-entering-buffer ()
+  ;; This is a hook function. Catch all errors to
+  ;; avoid canceling other hooks.
+  (condition-case err
+      (progn
+	(setq jde-which-method-current-point-loc 0)
+	(setq jde-which-method-current-method-bounds (cons -1 -1))
+	(jde-which-method-update))
+    (error (message
+	    "Which method update error: %s"
+	    (error-message-string err)))))
+
+(provide 'jde-which-method)
+
+;; jde-which-method.el ends here
diff --git a/site/jdee/lisp/jde-which-method.elc b/site/jdee/lisp/jde-which-method.elc
new file mode 100644
index 0000000..7f63ed3
Binary files /dev/null and b/site/jdee/lisp/jde-which-method.elc differ
diff --git a/site/jdee/lisp/jde-widgets.el b/site/jdee/lisp/jde-widgets.el
new file mode 100644
index 0000000..df03991
--- /dev/null
+++ b/site/jdee/lisp/jde-widgets.el
@@ -0,0 +1,574 @@
+;;; jde-widgets.el -- Custom-style widgets used by the JDE
+;; $Id: jde-widgets.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997-2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'wid-edit)
+(require 'eieio)
+(require 'efc)
+(jde-require 'tree-widget)
+
+
+;; ----------------------------------------------------------------------
+;; The Tree Widget Code:
+
+
+;;; The `tree' Widget.
+
+(define-widget 'jde-widget-tree-open-button 'item
+  "Open node in `jde-tree' widget."
+  :button-prefix "["
+  :button-suffix "]"
+  :tag "+"
+  :action 'jde-widget-tree-open-button-callback
+  :help-echo "Show subtree."
+  :format "%[%t%]")
+
+(defun jde-widget-tree-open-button-callback (widget &optional event)
+  ;; Set parent state to open.
+  (widget-value-set (widget-get widget :parent) t))
+
+(define-widget 'jde-widget-tree-close-button 'item
+  "Close node in `tree' widget."
+  :button-prefix "["
+  :button-suffix "]"
+  :tag "-"
+  :action 'jde-widget-tree-close-button-callback
+  :help-echo "Hide subtree."
+  :format "%[%t%]")
+
+(defun jde-widget-tree-close-button-callback (widget &optional event)
+  ;; Set parent state to closed.
+  (let* ((parent (widget-get widget :parent))
+	(entries (widget-get parent :args))
+	(children (widget-get parent :children)))
+    (while (and entries children)
+      (widget-put (car entries) :value (widget-value (car children)))
+      (setq entries (cdr entries)
+	    children (cdr children)))
+    (widget-value-set parent nil)))
+
+(define-widget 'jde-widget-tree 'default
+  "A tree structure widget."
+  :convert-widget 'widget-types-convert-widget
+  :format "%v"
+  :prefix ""
+  :prefix-extra "   "
+  :prefix-empty " |--- "
+  :value-get 'widget-value-value-get
+  :value-create 'jde-widget-tree-value-create-callback
+  :value-delete 'widget-children-value-delete)
+
+(defun jde-widget-tree-value-create-callback (widget)
+  ;; Insert all values
+  (let ((open (widget-value widget))
+	(tag (widget-get widget :tag))
+	(entries (widget-get widget :args))
+	children buttons)
+    (cond ((null entries)
+	   ;; Empty node.
+	   (insert (widget-get widget :prefix-empty) tag "\n"))
+	  (open
+	   ;; Open node.
+	   (push
+	    (widget-create-child-and-convert widget 'jde-widget-tree-close-button)
+		buttons)
+	   (insert "-\\ " tag "\n")
+	   (let ((prefix (concat (widget-get widget :prefix)
+				(widget-get widget :prefix-extra)))
+		entry)
+	     (while entries
+	       (setq entry (car entries)
+		     entries (cdr entries))
+	       (insert prefix)
+	       (push (if entries
+			(widget-create-child-and-convert widget entry
+							  :prefix prefix
+							  :prefix-extra " | ")
+		       ;; Last entry uses a different prefix.
+		       (widget-create-child-and-convert
+			widget entry
+			:prefix prefix
+			:prefix-empty " `--- "))
+		     children))))
+	  (t
+	   ;; Closed node.
+	   (push (widget-create-child-and-convert widget 'jde-widget-tree-open-button)
+		buttons)
+	   (insert "-- " tag "\n")))
+    (widget-put widget :children children)
+    (widget-put widget :buttons buttons)))
+
+;;----------------------------------------------------------------------
+;; Eval this to create a small tree.
+
+(defun test-tree ()
+  (interactive)
+  (switch-to-buffer "*Tree Example*")
+  (kill-all-local-variables)
+  ;; (make-local-variable 'widget-example-repeat)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (let ((all (overlay-lists)))
+    (mapcar 'delete-overlay (car all))    (mapcar 'delete-overlay (cdr all)))
+
+  (widget-insert "Test tree widget. \n\n")
+
+;   (setq tree (widget-create 'tree
+;			:tag "Foo"
+;			'(tree :tag "First")
+;			'(tree :tag "Second"
+;			       :value nil
+;			       (tree :tag "Nested"))
+;			'(tree :tag "Third")))
+
+  (setq tree (widget-create 'jde-widget-tree
+		  :tag "<test.Foo:139>"
+		  '(jde-widget-tree :tag "n  int  0")
+		  ;; '(jde-widget-tree :tag '(jde-widget-tree :tag "n  int  0"))
+		  '(jde-widget-tree :tag "a  double 5.5")
+		  '(jde-widget-tree :tag "s  S      <test.S:145>"
+			 (jde-widget-tree :tag "b   boolean  true"))))
+
+;   (let*  ((threads
+;	  (list
+;	   (list "ThreadGroup" 189 "system"
+;		 (list
+;		  (list "Thread" 190 "Signal dispatcher" "runnable" "suspended by debugger")
+;		  (list "Thread" 191 "Reference Handler" "waiting" "suspended by debugger")
+;		  (list "Thread" 192 "Finalizer" "waiting" "suspended by debugger")))
+;	   (list "ThreadGroup" 193 "main"
+;		 (list
+;		  (list "Thread" 1 "main" "runnable" "suspended at breakpoint"))
+;		 nil)))
+;	 (tree (jde-dbs-map-threads-to-tree threads)))
+
+
+;  (apply 'widget-create tree))
+
+  (use-local-map widget-keymap)
+  (widget-setup))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Dynamic tree widget                                                        ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-widget 'jde-widget-dtree 'default
+  "A widget whose nodes are generated on demand.
+The first time the user expands the tree, the tree invokes a function that
+generates the nodes. The tree then caches the nodes.
+Thereafter, the node uses the cached nodes when the
+user closes and then reopens the tree. Use the syntax
+(widget-create 'jde-widget-dtree :tag NAME :node-fcn NODE-FUNCTION)
+to create the widget where NAME is the tree name and NODE-FUNCTION
+is a function that takes one argument, the tree itself, and
+returns a list of widgets that are the nodes of the expanded
+tree."
+  :format "%v"
+  :prefix-extra "    "
+  :value-get 'widget-value-value-get
+  :value-create 'jde-widget-dtree-create-callback
+  :value-delete 'widget-children-value-delete
+  :has-nodes t)
+
+(defun jde-widget-dtree-create-callback (widget)
+  (let ((open (widget-value widget))
+	(tag (widget-get widget :tag))
+	children buttons)
+    (cond
+     (open
+      (push (widget-create-child-and-convert widget 'jde-widget-tree-close-button)
+		buttons)
+      (insert "-\\ " tag "\n")
+      (let ((prefix (concat (widget-get widget :prefix)
+				(widget-get widget :prefix-extra)))
+	    (nodes (widget-get widget :nodes))
+	    node)
+
+	(when (and (widget-get widget :has-nodes)
+		   (not nodes))
+	  (setq nodes
+		(funcall (widget-get widget :node-fcn) widget))
+	  (if nodes
+	      (widget-put widget :nodes nodes)
+	    (widget-put widget :has-nodes nil)))
+
+	(while nodes
+	  (setq node (car nodes)
+		nodes (cdr nodes))
+	  (insert prefix)
+	  (push
+	   (if nodes
+	       (widget-create-child-and-convert widget node
+						:prefix prefix
+						:prefix-extra " | ")
+	     (widget-create-child-and-convert
+	      widget node
+	      :prefix prefix
+	      :prefix-empty " `--- "))
+	   children))))
+     (t
+      ;; Closed node.
+      (push (widget-create-child-and-convert widget 'jde-widget-tree-open-button)
+	    buttons)
+      (insert "-- " tag "\n")))
+    (widget-put widget :children children)
+    (widget-put widget :buttons buttons)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Java object widget                                                         ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-test-get-fields (process object-id)
+  (list
+   (cons (list "sum" "double") (list "double" 0.0))
+   (cons (list "r" "int") (list "int" 1))
+   (cons (list "z" "java.lang.String") (list "java.lang.String" 229 nil))
+   (cons (list "B" "double[]") (list "double[]" 228 nil))
+   (cons (list "A" "double[][]") (list "double[][]" 227 nil))
+   (cons (list "args" "java.lang.String[]") (list "java.lang.String[]" 226 nil))))
+
+(defun jde-widget-java-var-to-tree (process var)
+  (let* ((var-name (oref var name))
+	 (var-type (oref var jtype))
+	 (var-value (oref var value))
+	 (var-tag (format "%s %s" var-type var-name)))
+    (cond
+     ((typep var-value 'jde-dbs-java-udci)
+      (setq var-tag (format "%s [id: %d]" var-tag (oref var-value :id)))
+      (if (string= (oref var-value :jtype) "java.lang.String")
+	  (let* ((cmd (jde-dbs-get-string
+		       "get string"
+		       :process process
+		       :object-id (oref var-value id)))
+		 (str-val (jde-dbs-cmd-exec cmd)))
+	    (list 'tree-widget
+		  :tag var-tag
+		  :node-name var-tag
+		  :open (jde-dbo-locals-open-p var-tag)
+		  :value t
+		  (list 'tree-widget :tag str-val)))
+	(list 'jde-widget-java-obj
+	      :tag var-tag
+	      :node-name var-tag
+	      :open (jde-dbo-locals-open-p var-tag)
+	      :process process
+	      :object-id (oref var-value :id))))
+     ((typep var-value 'jde-dbs-java-array)
+      (setq var-tag (format "%s [id: %d]" var-tag (oref var-value :id)))
+      (list 'jde-widget-java-array
+	    :tag var-tag
+	    :node-name var-tag
+	    :open (jde-dbo-locals-open-p var-tag)
+	    :process process :object var-value))
+     ((typep var-value 'jde-dbs-java-primitive)
+      (list 'tree-widget
+	    :tag var-tag
+	    :node-name var-tag
+	    :open (jde-dbo-locals-open-p var-tag)
+	    :value t
+	    (list 'tree-widget
+		  :tag (format "%s" (oref var-value value)))))
+     ((typep var-value 'jde-dbs-java-null)
+      (list 'tree-widget
+	    :tag var-tag
+	    :node-name var-tag
+	    :open (jde-dbo-locals-open-p var-tag)
+	    :value t
+	    (list 'tree-widget :tag "null")))
+     (t
+      (error "Unidentified type of local variable: %s" var-tag)))))
+
+(defun jde-widget-java-obj-get-fields (obj-widget)
+  (if (widget-get obj-widget :args)
+      (widget-get obj-widget :args)
+    (let* ((process (widget-get obj-widget :process))
+	   (object-id (widget-get obj-widget :object-id))
+	   (cmd
+	    (jde-dbs-get-object
+	     (format "get_object %d" object-id)
+	     :process process
+	     :object-id object-id))
+	   (object
+	    (jde-dbs-cmd-exec cmd))
+	   (fields (oref object fields))
+	   field
+	   nodes)
+      (while fields
+	(setq field (car fields) fields (cdr fields))
+	(setq field (cdr field))
+	(push
+	 (jde-widget-java-var-to-tree process field)
+	 nodes))
+      nodes)))
+
+(define-widget 'jde-widget-java-obj 'tree-widget
+  "A widget that represents a Java object.
+This widget is essentially a tree node whose entries are the fields
+of the corresponding object. The first time the user expands the node,
+the node retrieves the fields of the object from the debugger and
+caches them. Thereafter, the node uses the cached values when the
+user closes and then reopens the node. Use the syntax
+(widget-create 'jde-widget-java-obj
+:tag NAME :process PROCESS :object-id OBJ-ID) to create the widget where
+NAME is the object's name, PROCESS is the process in which
+the object exists, and  ID is the debugger id for the object."
+  :dynargs 'jde-widget-java-obj-get-fields
+  :has-children t)
+
+
+(defun jde-widget-java-array-element-to-tree (process element index)
+  (cond
+     ((typep element 'jde-dbs-java-udci)
+      (if (string= (oref element :jtype) "java.lang.String")
+	  (let* ((cmd (jde-dbs-get-string
+		       "get string"
+		       :process process
+		       :object-id (oref element id)))
+		 (str-val (jde-dbs-cmd-exec cmd)))
+	    (list 'tree-widget
+		  :tag (format "[%d] %s" index str-val)
+		  :node-name (format "[%d] %s" index str-val)
+		  :open (jde-dbo-locals-open-p (format "[%d] %s" index str-val))
+		  ))
+	(list 'jde-widget-java-obj
+	      :tag (format "[%d] %s" index (oref element jtype))
+	      :node-name (format "[%d] %s" index (oref element jtype))
+	      :open (jde-dbo-locals-open-p (format "[%d] %s" index (oref element jtype)))
+	      :process process
+	      :object-id (oref element id))))
+     ((typep element 'jde-dbs-java-array)
+      (list 'jde-widget-java-array
+	    :tag (format "[%d] %s" index (oref element jtype))
+	    :node-name (format "[%d] %s" index (oref element jtype))
+	    :open (jde-dbo-locals-open-p (format "[%d] %s" index (oref element jtype)))
+	    :process process
+	    :object element))
+     ((typep element 'jde-dbs-java-primitive)
+      (list 'tree-widget :tag (format "[%d] %s"  index (oref element value))))
+     ((typep element 'jde-dbs-java-null)
+      (list 'tree-widget :tag (format "[%d] null" index)))
+     (t
+      (error "Unidentified type of object: <%s|%s>" (oref element jtype)
+	     (oref element id)))))
+
+(defun jde-widget-java-array-get-elements (array-widget)
+  (if (widget-get array-widget :args)
+      (widget-get array-widget :args)
+    (let* ((process (widget-get array-widget :process))
+	   (array (widget-get array-widget :object))
+	   cmd array-length)
+
+      (setq cmd
+	    (jde-dbs-get-array
+	     (format "get_array_length %d" (oref array id))
+	     :process process
+	     :array array))
+      (jde-dbs-cmd-exec cmd)
+
+      (setq array-length
+	    (if (slot-boundp array 'length)
+		(oref array length)
+	      0))
+
+      (when (> array-length 0)
+	(setq cmd
+	      (jde-dbs-get-array
+	       (format "get_array_elements %d" (oref array id))
+	       :process process
+	       :array array
+	       :index 0
+	       :length array-length))
+	(jde-dbs-cmd-exec cmd)
+	(let ((elements (oref array elements))
+	      element
+	      nodes
+	      (index 0))
+	  (while elements
+	    (setq element (car elements) elements (cdr elements))
+	    (setq nodes
+		  (append nodes
+			  (list (jde-widget-java-array-element-to-tree process element index))))
+	    (setq index (1+ index)))
+	  nodes)))))
+
+(define-widget 'jde-widget-java-array 'tree-widget
+  "A widget that represents a Java array. Clicking on the widget's
+expand button causes the widget to display the values of the array."
+  :dynargs 'jde-widget-java-array-get-elements
+  :has-children t)
+
+(defun test-obj ()
+  (interactive)
+  (switch-to-buffer "*Java Object Example*")
+  (kill-all-local-variables)
+  ;; (make-local-variable 'widget-example-repeat)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (let ((all (overlay-lists)))
+    (mapcar 'delete-overlay (car all))    (mapcar 'delete-overlay (cdr all)))
+
+  (widget-insert "Test object tree. \n\n")
+
+  (widget-create 'jde-widget-java-obj :tag "jmath.System s"   :process "process" :object-id 1)
+  (widget-create 'jde-widget-java-obj :tag "java.awt.Frame frame1" :process "process" :object-id 1)
+
+  (use-local-map widget-keymap)
+  (widget-setup))
+
+
+
+;; ----------------------------------------------------------------------
+;; Option Tree Widget
+
+(defun jde-widget-option-tree-open-button-callback (widget &optional event)
+  ;; Set parent state to open.
+  (widget-value-set (widget-get widget :parent) t)
+  (widget-setup))
+
+(define-widget 'jde-widget-option-tree-open-button 'item
+  "Button to open an option tree."
+  :button-prefix "["
+  :button-suffix "]"
+  :tag "+"
+  :action 'jde-widget-option-tree-open-button-callback
+  :help-echo "Show option tree."
+  :format "%[%t%]")
+
+(define-widget 'jde-widget-option-tree-close-button 'item
+  "Close node in `jde-widget-option-tree' widget."
+  :button-prefix "["
+  :button-suffix "]"
+  :tag "-"
+  :action 'jde-widget-option-tree-close-button-callback
+  :help-echo "Hide panel."
+  :format "%[%t%]")
+
+(defun jde-widget-option-tree-close-button-callback (widget &optional event)
+  ;; Set parent state to closed.
+  (let* ((parent (widget-get widget :parent))
+	(entries (widget-get parent :args))
+	(group (car (widget-get parent :children)))
+	(children (widget-get group :children)))
+    ;; Get values entered by user from children and
+    ;; insert them in the corresponding widget definitions
+    ;; so that they appear the next time the user expands
+    ;; the tree.
+    (while (and entries children)
+      (widget-put (car entries) :value (widget-value (car children)))
+      (setq entries (cdr entries)
+	    children (cdr children)))
+    (widget-value-set parent nil)))
+
+(defun jde-widget-option-tree-value-create-callback (widget)
+  (let ((open-widget-p (widget-value widget))
+	(tag (widget-get widget :tag))
+	(entries (widget-get widget :args))
+	entry children buttons)
+    (cond (open-widget-p
+	   ;; Wrap widgets in this tree in a group widget
+	   ;; to ensure proper formatting.
+	   (let ((group-type
+		  (list 'group :args entries))
+		 group-widget)
+	   (push
+	    (widget-create-child-and-convert
+	     widget
+	     'jde-widget-option-tree-close-button)
+		buttons)
+	   (insert "-\\ " tag "\n")
+	   (push (widget-create-child-and-convert widget group-type) children)))
+	  (t
+	   (push (widget-create 'jde-widget-option-tree-open-button
+			  :parent widget)
+		 buttons)
+	   (insert "-- " tag "\n")))
+    (widget-put widget :children children)
+    (widget-put widget :buttons buttons)))
+
+
+(define-widget 'jde-widget-option-tree 'default
+  "A panel containing widgets."
+  :convert-widget 'widget-types-convert-widget
+  :format "%v"
+  :value-get 'widget-value-value-get
+  :value-create 'jde-widget-option-tree-value-create-callback
+  :value-delete 'widget-children-value-delete)
+
+
+(defun test-option-tree ()
+  (interactive)
+  (switch-to-buffer "*Panel Example*")
+  (kill-all-local-variables)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (let ((all (overlay-lists)))
+    (mapcar 'delete-overlay (car all))
+    (mapcar 'delete-overlay (cdr all)))
+
+  (widget-insert "Test panel widget. \n\n")
+
+  (let ((panel (widget-create
+		'jde-widget-option-tree
+		:tag "Compile Options"
+		'(cons :tag "Debugger Options"
+		   (radio-button-choice :format "%t \n%v"
+					:tag "Debugger "
+					(const "JDEbug")
+					(const "jdb")
+					(const "oldjdb")
+					(const "Other"))
+		   (cons :tag "Other Debugger Info"
+			 (string :tag "Path")
+			 (radio-button-choice :format "%t \n%v"
+					      :tag "Type "
+					      (const "Executable")
+					      (const "Class"))))
+		  '(repeat (string :tag "Path"))
+		  '(editable-field :tag "classpath"
+				  :format "  %t:  %v\n  %h \n\n"
+				  :size 40
+				  :doc "Name of project.")
+		  '(editable-field :tag "compiler"
+				  :format "  %t:  %v\n  %h \n\n"
+				  :size 40
+				  :doc "Name of project.")
+		  '(jde-widget-option-tree :tag "Debugger Options"
+					   (repeat (string :tag "Path"))))))
+    (use-local-map widget-keymap)
+    (widget-setup)))
+
+(provide 'jde-widgets)
+
+;; End of jde-widgets.el
diff --git a/site/jdee/lisp/jde-widgets.elc b/site/jdee/lisp/jde-widgets.elc
new file mode 100644
index 0000000..1e4aabe
Binary files /dev/null and b/site/jdee/lisp/jde-widgets.elc differ
diff --git a/site/jdee/lisp/jde-wiz.el b/site/jdee/lisp/jde-wiz.el
new file mode 100644
index 0000000..20fa916
--- /dev/null
+++ b/site/jdee/lisp/jde-wiz.el
@@ -0,0 +1,1234 @@
+;; jde-wiz.el - generate Java code by interactive input and Java reflection
+;; $Id: jde-wiz.el 178 2009-12-27 01:39:52Z lenbok $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(require 'semantic-util)
+(require 'beanshell)
+(require 'jde-complete)
+(require 'efc)
+(require 'jde-parse)
+(require 'jde-gen)
+
+(defgroup jde-wiz nil
+  "JDE Wizards"
+  :group 'jde
+  :prefix "jde-wiz-")
+
+(defun jde-wiz-escape-backslashes-in-path (path)
+  (mapconcat
+   (lambda (char)
+     (if (eq char ?\\) "\\\\" (char-to-string char)))
+   path ""))
+
+(defun jde-wiz-update-class-list()
+  "Update the class list used to resolve class names.
+The first time you invoke a JDE wizard, the JDE builds a list of all classes on
+the classpath defined by jde-global-classpath. Wizards use this list to resolve
+unqualified class names. If you add any classes to the classpath after invoking
+a wizard, you should update the class list."
+  (interactive)
+  (if (jde-bsh-running-p)
+      (progn
+	(message "Rescanning classes...")
+	(jde-jeval (jde-create-prj-values-str))
+	(jde-jeval "jde.util.JdeUtilities.updateClassList();")
+	(message "Rescanning classes...Complete"))))
+
+(defun jde-wiz-set-bsh-project()
+  "Update the beanshell's concept of the current project and the
+classpath associated with it.  This may cause an update scan of the
+class list the next time a wizard uses the class list for a lookup.
+The scanning only occurs if the project is newly opened or its
+classpath has been changed since the last scan, and switching between
+projects does not necessarily force a rescan as the scan information
+is cached in the beanshell.  You can force a rescan for a project by
+calling `jde-wiz-update-class-list'."
+  (interactive)
+  (when (jde-bsh-running-p)
+    (jde-jeval (jde-create-prj-values-str))))
+
+(defun jde-wiz-get-package-name ()
+  (let ((package-re "^[ \t]*package[ \t]+\\(.*\\)[ \t]*;"))
+    (save-excursion
+      (goto-char (point-max))
+      (when (re-search-backward package-re (point-min) t)
+	(looking-at package-re)
+	(buffer-substring-no-properties
+	 (match-beginning 1)
+	 (match-end 1))))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Method Interface Implementation wizard                                  ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-wiz-get-unqualified-name (name)
+  (string-match "[^.]+$" name)
+  (substring name (match-beginning 0) (match-end 0)))
+
+(defun jde-wiz-update-implements-clause (interface-name &optional extends)
+  "Updates the implements clause unless extends is non-nil. In that case the
+extends clause is updated"
+  (interactive
+   "sEnter interface: ")
+  (let (keyword
+	(interface
+	 (jde-wiz-get-unqualified-name interface-name)))
+    (if extends
+	(setq keyword "extends")
+      (setq keyword "implements"))
+    (save-excursion
+      (let* ((class-re "class[ \t]+\\([a-zA-z]+[a-zA-Z0-9._]*\\).*[ \n]*")
+	     (open-brace-pos
+	      (ignore-errors (scan-lists (point) -1 1)))
+	     (class-name-end-pos
+	      (when open-brace-pos
+		(goto-char open-brace-pos)
+		(when (re-search-backward class-re (point-min) t)
+		  (looking-at class-re)
+		  (match-end 1))))
+	     (implements-keyword-end-pos
+	      (when (and open-brace-pos class-name-end-pos)
+		(goto-char open-brace-pos)
+		(if (re-search-backward keyword class-name-end-pos t)
+		    (match-end 0)))))
+	(if implements-keyword-end-pos
+	    (progn
+	      (goto-char implements-keyword-end-pos)
+	      (insert (concat " " interface ",")))
+	  (when class-name-end-pos
+	    (goto-char (- open-brace-pos 1))
+	    (if (looking-at " {")
+		(delete-char 1)  ;; if we don't delete, we end up with 2 spaces
+	      (forward-char))
+	    (insert (concat " " keyword " " interface " "))))))))
+
+(defun jde-dollar-name (name) 
+  "Convert pkg[.Outer].Inner[$Inner] to pkg[.Outer]$Inner[$Inner]"
+  ;; change last '.' to '$'
+  (replace-in-string name "[.]\\([^.]+$\\)" "$\\1"))  
+
+(defun jde-jeval-classname (fmt interface-name &optional eval-return)
+  "Try jde-jeval on the command derived from (format FMT INTERFACE-NAME),
+if that fails (as it will when INTERFACE-NAME is an inner-class name),
+then try after replacing INTERFACE-NAME with (jde-dollar-name INTERFACE-NAME).
+
+If EVAL-RETURN is t, then return (jde-jeval ... t), else return (read (jde-jeval ...))"
+  (flet ((jeval (name) (if eval-return
+			   (jde-jeval (format fmt name) t)
+			 (read (jde-jeval (format fmt name))))))
+    (let ((code (jeval interface-name)) dollar-name)
+      (if (and code (eq (car code) 'error)
+	       (setq dollar-name (jde-dollar-name interface-name))
+	       ;; recurse as long as '.'s are changing:
+	       (not (string-equal dollar-name interface-name)))
+	  (jde-jeval-classname fmt dollar-name eval-return) ; try again with dollar-name
+	code)
+      )
+    ))
+
+(defun jde-wiz-generate-interface (interface-name)
+  "*Generate a skeleton implementation of a specified interface."
+  (let* ((code
+	  (jde-jeval-classname 
+	   "jde.wizards.InterfaceFactory.makeInterfaceExpression(\"%s\",true);"
+	   interface-name)))
+    (if code
+      (let ((required-imports
+	     (jde-jeval-r
+		"jde.wizards.InterfaceFactory.getImportedClasses();")))
+	  (eval code)			;error may be thrown if bad intf name
+	  (if required-imports
+	      (jde-import-insert-imports-into-buffer required-imports t))
+	  (jde-wiz-update-implements-clause interface-name)))))
+
+(defun jde-wiz-gen-implementation-methods (gen-list)
+  "Executes the given list of generation statements. Generation statements
+are either strings that may be used as introductory comment for the
+subsequent method(s) or invocations of `jde-wiz-gen-method'."
+  (let ((items gen-list))
+    (while (car items)
+      (let ((to-end (- (point-max) (point))))
+	(if (stringp (car items))
+	    (progn
+	      (tempo-save-named 'comment-line (car items))
+	      (jde-gen-section-comment))
+	  (eval (car items)))
+	(goto-char (- (point-max) to-end)))
+      (setq items (cdr items)))))
+
+(defun jde-wiz-implement-interface-internal (interface-name)
+  "*Generate a skeleton implementation of a specified interface.
+This command works only for interfaces defined by `jde-global-classpath', if
+set, otherwise the CLASSPATH environment variable."
+  (interactive
+   "sInterface name: ")
+  (let ((names
+	 (jde-jeval-r
+	  (format "jde.util.JdeUtilities.getQualifiedName(\"%s\");"
+		  interface-name ))))
+    (if names
+	(if (> (length names) 1)
+	    (jde-wiz-generate-interface
+	     (efc-query-options
+	      names
+	      "Select interface to implement."
+	      "Class Name dialog"))
+	  (jde-wiz-generate-interface (car names)))
+      (error "Cannot find interface %s on the current classpath."
+	     interface-name))))
+
+(defun jde-wiz-implement-interface (interface-name)
+  "*Generate a skeleton implementation of a specified interface.
+This command works only for interfaces that exist on the classpath
+defined by `jde-global-classpath', if set, otherwise
+by the CLASSPATH environment variable. This command uses
+`jde-gen-method-template' as a template for generating the
+code for each of the skeleton methods required to implement
+the interface. You can thus customize the format of the skeleton
+methods by customizing `jde-gen-method-template' The template
+in turn invokes the `jde-javadoc-autodoc-at-line' function to
+generate the skeleton javadoc for each skeleton method. This function
+uses various templates that you can customize to customize
+the skeleton javadoc. See the function's documentation for
+more information."
+  (interactive
+   "sInterface name: ")
+  (condition-case err
+      (let ((pos (point)))
+	(jde-wiz-implement-interface-internal interface-name)
+	(jde-wiz-indent pos))
+    (error
+     (message "%s" (error-message-string err)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; EventSource     wizard                                                  ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun jde-wiz-generate-event-source (event-listener-interface-name)
+  "*Generate a skeleton implementation of a source of events for the event listener
+INTERFACE-NAME. This command will generate methods to add and remove listeners
+and fire every method of all listeners registered. It creates a data structure
+to store the listeners too."
+  (condition-case err
+      (let* ((pos (point))
+	     (code (jde-jeval-classname
+		    "jde.wizards.EventSourceFactory.makeEventSourceSupportExpression(\"%s\", true);"
+		    event-listener-interface-name)))
+	(if code
+	    (let ((required-imports
+		   (jde-jeval-r
+		    "jde.wizards.EventSourceFactory.getImportedClasses();")))
+	      (message "%s" "evaluating")
+	      (eval code)
+	      (message "%s" "eval done")
+	      (jde-wiz-indent pos)
+	      (if required-imports
+		  (jde-import-insert-imports-into-buffer required-imports t)
+		(message "%s" "no imports"))
+	      )))
+    (error
+     (message "%s" (error-message-string err)))))
+
+(defun jde-wiz-gen-event-source (gen-list)
+  "Executes the given list of generation statements. Generation statements
+are either strings that may be used as introductory comment for the
+subsequent method(s) or invocations of `jde-wiz-gen-listener-registry',
+`jde-wiz-gen-method'."
+  (let ((items gen-list))
+    (while (car items)
+      (let ((to-end (- (point-max) (point))))
+	(if (stringp (car items))
+	    (progn
+	      (tempo-save-named 'comment-line (car items))
+	      (jde-gen-section-comment))
+	  (eval (car items)))
+	(goto-char (- (point-max) to-end)))
+      (setq items (cdr items))
+      ))
+  )
+
+(defun jde-wiz-gen-listener-registry (listener-class)
+  "Generates a method by setting the tempo named tags and
+invoking `jde-gen-listener-registry'. This method is usually
+called by an expression generated in the beanshell."
+  (tempo-save-named 'listenerFQN listener-class)
+  (jde-gen-listener-registry)
+)
+
+(defun jde-wiz-gen-event-source-fire-method
+  (listener-class method ret-type params)
+  "Generates a method by setting the tempo named tags and
+invoking `jde-gen-event-source-fire-method'. This method is usually
+called by an expression generated in the beanshell."
+  (tempo-save-named 'listenerFQN listener-class)
+  (tempo-save-named 'method-name method)
+  (tempo-save-named 'return-type ret-type)
+  (tempo-save-named 'params params)
+  (jde-gen-event-source-fire-method)
+)
+
+(defun jde-wiz-implement-event-source-internal (interface-name)
+  "*Generate a skeleton implementation of a source of events for the event listener
+INTERFACE-NAME. This command will generate methods to add and remove listeners
+and fire every method of all listeners registered. It creates a data structure
+to store the listeners too. This command works only for interfaces defined by `jde-global-classpath', if
+set, otherwise the CLASSPATH environment variable."
+  (interactive
+   "sListener Interface name: ")
+  (condition-case err
+      (let ((names
+	     (jde-jeval-r
+	      (format "jde.util.JdeUtilities.getQualifiedName(\"%s\");" interface-name ))))
+	(if names
+	    (if (> (length names) 1)
+		(jde-wiz-generate-event-source
+		 (efc-query-options names
+				    "Select interface to implement."
+				    "class name dialog"))
+	      (jde-wiz-generate-event-source (car names)))
+	  (error "Cannot find listener interface %s on the current classpath." interface-name)))
+    (error
+     (message "%s" (error-message-string err)))))
+
+(defun jde-wiz-implement-event-source (interface-name)
+  "*Generate a skeleton implementation of a source of events for the event listener
+INTERFACE-NAME. This command will generate methods to add and remove listeners
+and fire every method of all listeners registered. It creates a data structure
+to store the listeners too. This command works only for interfaces that exist on the classpath
+defined by `jde-global-classpath', if set, otherwise
+by the CLASSPATH environment variable."
+  (interactive
+   "sListener Interface name: ")
+  (jde-wiz-implement-event-source-internal interface-name))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Method override wizard                                                  ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-wiz-override-method ()
+  "Overrides a method whose name you specify, using
+completion, in the minibuffer. Press space at the
+prompt to see a list of all methods that can be overriden
+or type the first few letters of the name of the method
+and press space to see a list of all methods that
+complete the name.
+
+This command creates a skeleton implementation of the
+overridden method at point. This command infers the
+qualified name of the class of the overriden method by
+prepending the package name of the current buffer to
+the class containing point. If the class defines
+more than one method of the same name, this command
+prompts you to select the desired method from a list
+of method prototypes.
+
+This command also generates import statements for
+the parameter and return types of the overridden method.
+The import statements are inserted after the last
+existing import statement or the package statement
+or the first blank line in the source file. Import
+statements are generated only for types for which an
+import statement does not already exist in the file.
+
+NOTE: this command works only if the overriding class
+      has been previously compiled."
+  (interactive)
+
+  (condition-case err
+      (let* ((super-class (jde-parse-get-super-class-at-point))
+	     (qualified-super-class
+	      (jde-parse-get-qualified-name super-class t))
+	     (classinfo
+	      (jde-complete-get-classinfo qualified-super-class jde-complete-protected))
+	     pair pos class-name qualified-class-name method-name)
+	(setq pair
+	      (assoc
+	       (completing-read "Method to overwrite: " classinfo nil t)
+	       classinfo))
+
+	(if (not pair)
+	    (error "No method specified for completion."))
+
+	(setq pos (string-match " : " (car pair)))
+	(setq method-name
+	      (if pos
+		  (substring (car pair) 0 pos)
+		(cdr pair)))
+
+	(setq class-name
+	 (jde-parse-get-super-class-at-point))
+	(setq qualified-class-name
+	 (jde-parse-get-qualified-name class-name t))
+	(setq pos (string-match "(" method-name))
+
+	(if qualified-super-class
+	    (let* ((fmt (concat
+			 "jde.wizards.MethodOverrideFactory.getCandidateSignatures"
+			 "(\"%s\",\"" (substring method-name 0 pos) "\");"))
+		   (signatures (jde-jeval-classname fmt qualified-class-name t)))
+	      (jde-wiz-override-method-internal method-name
+						signatures))
+	  (error "Cannot find parent class %s" super-class)))
+    (error
+     (message "%s" (error-message-string err)))))
+
+
+(defun jde-wiz-override-method-internal (selected-method methods)
+  (let* ((selected-method-args (jde-wiz-number-of-arguments selected-method))
+	 (pos (point))
+	 (variant 0) skeleton required-imports
+	 (index 0))
+    (while methods
+      (if (jde-wiz-check-signatures selected-method (car methods))
+	  (progn
+	    (setq variant index)
+	    (setq methods nil))
+	(progn
+	  (setq index (+ 1 index))
+	  (setq methods (cdr methods)))))
+
+    (jde-jeval-r
+     (concat
+      "jde.wizards.MethodOverrideFactory.getMethodSkeletonExpression("
+      (int-to-string variant) ");"))
+    (setq required-imports
+	  (jde-jeval-r
+	   "jde.wizards.MethodOverrideFactory.getImportedClasses();"))
+    (if required-imports
+	(jde-import-insert-imports-into-buffer required-imports t))))
+
+(defun jde-wiz-gen-method (modifiers return-type name parameters exceptions
+				     default-body)
+  "Generates a method by setting the tempo named tags and
+invoking `jde-gen-method'. This method is usually
+called by an expression generated in the beanshell."
+  (tempo-save-named 'modifiers modifiers)
+  (tempo-save-named 'return-type return-type)
+  (tempo-save-named 'name name)
+  (tempo-save-named 'parameters parameters)
+  (tempo-save-named 'exceptions exceptions)
+  (tempo-save-named 'default-body default-body)
+  (jde-gen-method)
+)
+
+(defun jde-wiz-gen-delegation-methods (gen-list)
+  "Executes the given list of generation statements. Generation statements
+are either strings that may be used as introductory comment for the
+subsequent method(s) or invocations of `jde-wiz-gen-method'."
+  (let ((items gen-list))
+    (while (car items)
+      (let ((to-end (- (point-max) (point))))
+	(if (stringp (car items))
+	    (progn
+	      (tempo-save-named 'comment-line (car items))
+	      (jde-gen-section-comment))
+	  (eval (car items)))
+	(goto-char (- (point-max) to-end)))
+      (setq items (cdr items))
+      ))
+  )
+
+(defun jde-wiz-check-signatures (sign1 sign2)
+  "Checks the signatures for equality"
+  (while (string-match "java.lang." sign1)
+    (setq sign1 (replace-match "" nil nil sign1)))
+
+  (while (string-match " param." sign2)
+    (setq sign2 (replace-match "" nil nil sign2)))
+  (string= sign1 sign2))
+
+
+(defun jde-wiz-number-of-arguments (signature)
+  "Returns the number of arguments in this signature"
+  (let (pos (number-of-arguments 0))
+    (if (string-match "()" signature)
+	number-of-arguments
+      (if (not (string-match "," signature))
+	  (setq number-of-arguments (+ 1 number-of-arguments))
+	(progn
+	  (setq number-of-arguments 1)
+	  (while (string-match "," signature)
+	    (setq pos (string-match "," signature))
+	    (setq number-of-arguments (+ 1 number-of-arguments))
+	    (setq signature (substring signature (+ pos 1)))))))
+	  number-of-arguments))
+
+(defun jde-wiz-indent (pos)
+  "Indents the just inserted region without moving
+the cursor"
+  (goto-char (scan-lists (point) -1 1))
+  (c-indent-exp)
+  (goto-char pos))
+
+;;
+;; Contributed by Javier Lopez and Paul Kinnucan
+;;
+(defun jde-browse-class(&optional class-name)
+  "Browse class in the beanshell class browser"
+  (interactive)
+  (let* ((class
+	 (or class-name
+	     (read-from-minibuffer "Class: " (thing-at-point 'symbol))))
+	 (fq-class-name
+	  (jde-parse-select-qualified-class-name class)))
+    (if fq-class-name
+	(bsh-eval
+	 (oref 'jde-bsh the-bsh)
+	 (format "browseClass(\"%s\");" fq-class-name)))))
+
+(defun jde-wiz-delegate (delegee)
+  "*Generate methods for the class in the current source buffer
+that delegate tasks to an instance of another class. The delegator
+class must have a field that references an instance of the delegee
+class. DELEGEE is the name of the field in the delegator class that
+references the delegee. This command generates methods in the current
+buffer that invoke identically named methods of DELEGEE. For example,
+if the current buffer contains class A and A has a field named b that
+references an instance of class B, this command generates methods for
+A that have the same signatures as the public methods of B. Each of
+the generated A methods invokes the corresponding B method.
+
+This function uses `jde-gen-method-template' as a template for
+generating the skeleton code for each of the the delegated methods.
+You can thus customize the format of the skeleton methods by
+customizing `jde-gen-method-template' The template in turn invokes the
+`jde-javadoc-autodoc-at-line' function to generate the skeleton
+javadoc for each skeleton method. This function uses various templates
+that you can customize to customize the skeleton javadoc. See the
+function's documentation for more information."
+  (interactive
+   "sDelegee name: ")
+  (condition-case err
+      (let* ((pos (point))
+	     (start nil)
+	     (class-name
+	      (or (jde-parse-get-qualified-name
+		   (car (jde-parse-declared-type-of delegee)) t)
+		  (read-string (concat "Enter fully qualified class name of "
+				       delegee ": "))))
+             (fmt (concat "jde.wizards.DelegateFactory.makeDelegatorMethods(\""
+			  delegee "\", \"%s\", true);"))
+	     (code (jde-jeval-classname fmt class-name)))
+	(if code
+	    (let ((required-imports
+		   (jde-jeval-r
+		    "jde.wizards.DelegateFactory.getImportedClasses();")))
+	      (font-lock-mode -1)
+	      (setq start (point))
+	      (eval code)
+	      ;;indenting the new code
+	      (jde-wiz-indent pos)
+	      (if required-imports
+		  (jde-import-insert-imports-into-buffer required-imports t))
+	      (font-lock-mode)
+	      )))
+    (error
+     (message "%s" (error-message-string err)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Method Abstract Implementation wizard                                   ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-wiz-generate-abstract-class (class-name)
+  "*Generate a skeleton implementation of a specified abstract class."
+  (condition-case err
+      (let* ((code (jde-jeval-classname
+		    "jde.wizards.AbstractClassFactory.makeAbstractClassExpression(\"%s\", true);"
+		    class-name)))
+	(if code
+	    (let ((required-imports
+		   (jde-jeval-r
+		    "jde.wizards.AbstractClassFactory.getImportedClasses();")))
+	      (eval code)
+	      (if required-imports
+		  (jde-import-insert-imports-into-buffer required-imports t))
+	      (jde-wiz-update-implements-clause class-name t))))
+    (message "%s" (error-message-string err))))
+
+(defun jde-wiz-extend-abstract-class-internal (class-name)
+  "*Generate a skeleton implementation of the specified abstract class.
+This command works only for interfaces defined by `jde-global-classpath', if
+set, otherwise the CLASSPATH environment variable."
+  (interactive
+   "sAbstract classname: ")
+  (condition-case err
+      (let ((names
+	     (jde-jeval-r
+	      (format "jde.util.JdeUtilities.getQualifiedName(\"%s\");"
+		      class-name ))))
+	(if names
+	    (if (> (length names) 1)
+		(jde-wiz-generate-abstract-class
+		 (efc-query-options names nil
+				    "class name dialog"))
+	      (jde-wiz-generate-abstract-class (car names)))
+	  (message "Cannot find abstract class %s on the current classpath."
+		   class-name)))
+    (message "%s" (error-message-string err))))
+
+(defun jde-wiz-extend-abstract-class (class-name)
+  "*Generate a skeleton implementation of the abstract methods of the
+a specified class. This command works only for abstract classes that exist
+on the classpath defined by `jde-global-classpath', if set, otherwise
+by the CLASSPATH environment variable.
+
+This command uses `jde-gen-method-template' as a template for
+generating the skeleton code for each of the abstract methods. You can
+thus customize the format of the skeleton methods by customizing
+`jde-gen-method-template' The template in turn invokes the
+`jde-javadoc-autodoc-at-line' function to generate the skeleton
+javadoc for each skeleton method. This function uses various templates
+that you can customize to customize the skeleton javadoc. See the
+function's documentation for more information."
+  (interactive
+   "sAbstract class name: ")
+  (jde-wiz-extend-abstract-class-internal class-name))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Get Set Method Implementation wizard                                    ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom jde-wiz-include-javadoc t
+  "This variables specifies whether javadoc comments should be included in
+skeletons created by the `jde-wiz-get-set-methods' function."
+  :group 'jde-wiz
+  :type 'boolean)
+
+(defcustom jde-wiz-get-set-variable-prefix "arg"
+  "This variable defines a prefix to be added to argmument names
+for the funtion `jde-wiz-get-set-methods'. For example if this
+variable is set to \"arg\" the following variable
+String name; will produce this method signature:
+public String get(String argName)"
+  :group 'jde-wiz
+  :type 'string)
+
+(defcustom jde-wiz-get-javadoc-template
+  (list "/**"
+	"* Gets the value of %n"
+	"*"
+	"* @return the value of %n"
+	"*/")
+  "Template used by `jde-wiz-get-set-method' to add the javadoc
+to a get method. The %n are replaced by the variable name and
+%t by the variable."
+  :group 'jde-wiz
+  :type '(repeat string))
+
+(defcustom jde-wiz-set-javadoc-template
+  (list "/**"
+	"* Sets the value of %n"
+	"*"
+	"* @param %p Value to assign to this.%n"
+	"*/")
+  "Template used by `jde-wiz-get-set-method' to add the javadoc to a
+set method. The %n are replaced by the variable name, %t by the variable
+type and %p for the argument name. In most cases %n and %p are the same
+except when `jde-wiz-get-set-variable-prefix' is non nil; in this case the
+%p will pick up those changes as well."
+  :group 'jde-wiz
+  :type '(repeat string))
+
+(defcustom jde-wiz-show-report t
+  "A non nil value will show a report of the existing get set methods
+and the ones added"
+  :group 'jde-wiz
+  :type 'boolean)
+
+(defcustom jde-wiz-get-set-variable-convention (cons "" nil)
+  "Use this variable to specify your coding conventions. This variable is used
+by the `jde-wiz-get-set-method' to filter the convention from the variable
+declared in the buffer from the name of the method. The are 3 options a prefix,
+ a postfix, and the first uppercase letter. For example, choosing a prefix and
+setting it to '_' means that the '_' will be filtered from all the variable
+containing it. So this variable private String _name;  will produce this get
+method:
+public getName(String name) {
+this._name = name
+}
+A postfix works in a similar way, the third option behaves slighlty different.
+For example if the variable is String _strName; this will get filter to name.
+It will take everything after the first capitalize letter. A nil value will use
+the variable name as it is defined in the buffer."
+  :group 'jde-wiz
+  :type '(cons (string :tag "Enter either the prefix or postfix")
+	       (radio-button-choice (const "Prefix")
+				    (const "Postfix")
+				    (const "Everything after the first upcase letter")
+				    (const nil))))
+
+(defcustom jde-wiz-get-set-methods-include (list "Both")
+  "Use this variable to set what methods `jde-wiz-get-set-methods' will
+insert in the buffer. The options are get methods only, set methods only,
+ and both."
+  :group 'jde-wiz
+  :type '(list (radio-button-choice (const "Get only")
+				    (const "Set only")
+				    (const "Both"))))
+
+(defcustom jde-wiz-get-set-static-members t
+  "If on (nonnil), `jde-wiz-get-set-methods' generates getter/setter methods for
+private static members of the class in the current buffer."
+  :group 'jde-wiz
+  :type 'boolean)
+
+(defcustom jde-wiz-get-set-methods-order (list "Get followed by set for each field")
+  "Use this variable to set the order in which the
+get and set methods are going to be inserted by
+`jde-wiz-get-set-methods'"
+  :group 'jde-wiz
+  :type '(list (radio-button-choice
+		(const "Get followed by set for each field")
+		(const "Set followed by get for each field")
+		(const "All get methods followed by all set methods")
+		(const "All set methods followed by all get methods"))))
+
+(defun jde-wiz-downcase-initials (obj)
+  "It downcase the first letter of obj"
+  (concat (downcase (substring obj 0 1)) (substring obj 1)))
+
+(defun jde-wiz-get-class-parts (class-name tokens)
+  "Recurse through all the tokens in `tokens' looking for
+the tokens of `class-name', returns nil if no token are found"
+  (let ((parts (jde-wiz-get-class-parts-helper class-name tokens))
+	temp-parts inner-classes)
+    (if (not parts)
+	(while tokens
+	  (setq temp-parts (semantic-tag-type-members (car tokens)))
+	  (setq inner-classes (semantic-find-nonterminal-by-token 'type temp-parts))
+	  (setq parts (jde-wiz-get-class-parts class-name inner-classes))
+	  (if parts
+	      (setq tokens nil)
+	    (setq tokens (cdr tokens)))))
+    parts))
+
+(defun jde-wiz-get-class-parts-helper (class-name tokens)
+  "Checks the top level for the class name `class-name'
+if one is found it returns the parts of it, nil is
+return otherwise"
+  (let (parts current-class)
+    (while tokens
+      (setq current-class (car tokens))
+      (if (string= class-name (semantic-tag-name current-class))
+	  (progn
+	    (setq parts (semantic-tag-type-members current-class))
+	    (setq tokens nil)))
+      (setq tokens (cdr tokens)))
+    parts))
+
+(defun jde-wiz-get-member-p (name functions)
+  "Returns t if the variable name has a get method defined in the
+current buffer. Functions are semantic tokens for the functions
+defined in the current buffer."
+  (or (member
+       (concat
+	"get"
+	(upcase-initials (jde-wiz-get-name name))) functions)
+      (member
+       (concat
+	"is"
+	(upcase-initials (jde-wiz-get-name name))) functions)))
+
+(defun jde-wiz-set-member-p (name functions)
+  "Returns t if the variable name has a set method defined in the current buffer.
+Functions are semantic tokens for the functions defined in the current buffer."
+  (member (concat "set" (upcase-initials (jde-wiz-get-name name))) functions))
+
+(defun jde-wiz-get-set-methods()
+  "Generates get and set methods for all the private fields
+defined in the current buffer."
+  (interactive)
+  (let* ((include (car jde-wiz-get-set-methods-include))
+	 ;;Indicates if both get and set should be inserted
+	 (bothp (string= "Both" include))
+	 ;;only get methods should be inserted
+	 (get-onlyp (string= "Get only" include))
+	 ;;only set methods should be inserted
+	 (set-onlyp (string= "Set only" include))
+	 (order (car jde-wiz-get-set-methods-order))
+	 (get-firstp
+	  (or (string= "All get methods followed by all set methods" order)
+	      (string= "Get followed by set for each field" order)))
+	 (class (jde-parse-get-class-at-point));;class name
+	 (classes (split-string class "\\."))
+	 (class-name (nth (- (length classes) 1) classes))
+	 (tokens (semantic-fetch-tags));;buffer tokens
+	 (type (semantic-find-nonterminal-by-token 'type tokens));;class tokens
+	 (parts (jde-wiz-get-class-parts class-name type))
+	 (variables (semantic-find-nonterminal-by-token 'variable parts));;declared variables
+	 ;;non public variables
+	 (non-public-variables (jde-wiz-filter-variables-by-typemodifier variables))
+	 (functions (semantic-find-nonterminal-by-token 'function parts));;functions
+	 (set-get-functions (jde-wiz-get-get-set-methods functions));;get,set,is functions
+	 var name staticp finalp report temp pos)
+
+    (setq
+     report
+     (concat
+      (format "%-60.60s" "Field")
+      (if get-firstp "\tGetter  \tSetter\n" "\tSetter  \tGetter\n")))
+
+    (setq
+     report
+     (concat
+      report
+      (format "%-60.60s" "------------------------------------------------------------")
+      "\t--------\t--------\n"))
+
+    (while non-public-variables
+      (setq var (car non-public-variables))
+      (setq name (semantic-tag-name var));;variable name
+      (setq type (semantic-tag-type var));;variable type i.e. boolean
+      (setq staticp (member "static" (semantic-tag-modifiers var)));;is it static
+      (setq finalp  (member "final" (semantic-tag-modifiers var)));;is it final
+
+      (setq
+       report
+       (concat
+	report
+	(format
+	 "%-60.60s"
+	 (concat
+	  type " " name " "
+	  (and (semantic-tag-modifiers var)
+	       ;; only if some modifiers are present
+	       ;; print them
+	       (format "%s" (semantic-tag-modifiers var)))))))
+
+      (setq report (concat report "\t"))
+
+      ;;order in which the methods should be inserted
+      (cond ((string= "Get followed by set for each field" order)
+	     ;;get method followed by its set method
+	     ;;getting the get method if it does not exist in the buffer
+	     (if (not (jde-wiz-get-member-p name set-get-functions))
+		 (if (and (or bothp get-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-get-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (setq report (concat report "[Exists ]")))
+
+	     (setq report (concat report "\t"))
+
+	     ;;getting the set method if it does not exist in the buffer
+	     (if (and (not finalp);; it is final - can not have a setter
+		      (not (jde-wiz-set-member-p name set-get-functions)))
+		 (if (and (or bothp set-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-set-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (if (jde-wiz-set-member-p name set-get-functions)
+		   (setq report (concat report "[Exists ]"))
+		 (if finalp
+		     (setq report (concat report "[N/A    ]"))))))
+	    ;;set method followed by its get method
+	    ((string= "Set followed by get for each field" order)
+	     ;;getting the set method if it does not exist in the buffer
+	     (if (and (not finalp);; it is final - can not have a setter
+		      (not (jde-wiz-set-member-p name set-get-functions)))
+		 (if (and (or bothp set-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-set-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (if (jde-wiz-set-member-p name set-get-functions)
+		   (setq report (concat report "[Exists ]"))
+		 (if finalp
+		     (setq report (concat report "[N/A    ]")))))
+
+	     (setq report (concat report "\t"))
+
+	     ;;getting the get method if it does not exist in the buffer
+	     (if (not (jde-wiz-get-member-p name set-get-functions))
+		 (if (and (or bothp get-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-get-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (setq report (concat report "[Exists ]"))))
+
+	    ;;all the get method first
+	    ((string= "All get methods followed by all set methods" order)
+	     ;;getting the get method if it does not exist in the buffer
+	     (if (not (jde-wiz-get-member-p name set-get-functions))
+		 (if (and (or bothp get-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-get-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (setq report (concat report "[Exists ]")))
+
+	     (setq report (concat report "\t"))
+
+	     ;;getting the set method if it does not exist in the buffer
+	     (if (and (not finalp);; it is final - can not have a setter
+		      (not (jde-wiz-set-member-p name set-get-functions)))
+		 (if (and (or bothp set-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (setq temp (concat temp (jde-wiz-get-set-method type name staticp class)))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (if (jde-wiz-set-member-p name set-get-functions)
+		   (setq report (concat report "[Exists ]"))
+		 (if finalp
+		     (setq report (concat report "[N/A    ]"))))))
+
+	    ;;all the set method first
+	    ((string= "All set methods followed by all get methods" order)
+	     ;;getting the set method if it does not exist in the buffer
+	     (if (and (not finalp);; it is final - can not have a setter
+		      (not (jde-wiz-set-member-p name set-get-functions)))
+		 (if (and (or bothp set-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (insert (jde-wiz-get-set-method type name staticp class))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (if (jde-wiz-set-member-p name set-get-functions)
+		   (setq report (concat report "[Exists ]"))
+		 (if finalp
+		     (setq report (concat report "[N/A    ]")))))
+
+	     (setq report (concat report "\t"))
+
+	     ;;getting the get method if it does not exist in the buffer
+	     (if (not (jde-wiz-get-member-p name set-get-functions))
+		 (if (and (or bothp get-onlyp)
+			  (or (not staticp) jde-wiz-get-set-static-members))
+		     (progn
+		       (setq temp (concat temp (jde-wiz-get-get-method type name staticp class)))
+		       (setq report (concat report "[Added  ]")))
+		   (setq report (concat report "[Skipped]")))
+	       (setq report (concat report "[Exists ]")))))
+
+      (setq report (concat report "\n"))
+
+      (setq non-public-variables (cdr non-public-variables)))
+
+    (setq pos (point))
+    (if temp (insert temp))
+    (if jde-wiz-show-report
+	(with-output-to-temp-buffer (concat "*jde-wiz-get-set-methods report for " class "*")
+	  (princ report)))
+    ;;indenting the new code
+    (jde-wiz-indent pos)))
+
+(defun jde-wiz-get-get-set-methods(tokens)
+  "Returns a list of the methods that start with set, get or is."
+  (let (token name filtered-methods)
+    (while tokens
+      (setq token (car tokens))
+      (setq name (semantic-tag-name token))
+      (if (or (string-match "^get" name)
+	      (string-match "^set" name)
+	      (string-match "^is" name))
+	  (setq filtered-methods (append filtered-methods (list name))))
+      (setq tokens (cdr tokens)))
+    filtered-methods))
+
+(defun jde-wiz-filter-variables-by-typemodifier(tokens)
+  "Returns a subsets of tokens. It returns the tokens that contains either private or
+protected modifiers"
+  (let (token modifiers filtered-tokens)
+    (while tokens
+      (setq token (car tokens))
+      (setq modifiers (semantic-tag-modifiers token))
+      (if (not (member "public" modifiers))
+	  (setq filtered-tokens (append filtered-tokens (list token))))
+      (setq tokens (cdr tokens)))
+    filtered-tokens))
+
+(defun jde-wiz-get-name(variable)
+  "Gets the name of variable to be used in generation the get set
+method templates. For Example if the variable is \"_Name\" and the variable
+`jde-wiz-get-set-variable-convention' is set to prefix _ this method will
+return \"Name\"."
+  (let (answer
+	(cfs case-fold-search)
+	(fix (car jde-wiz-get-set-variable-convention))
+	(convention (cdr jde-wiz-get-set-variable-convention)))
+    (setq case-fold-search nil)
+    (cond ((not convention)
+	   (setq answer variable))
+	  ((string= "Prefix" convention)
+	   (progn
+	     (if fix
+		 (let ((pos (string-match (concat "^" fix) variable)))
+		   (if pos
+		       (setq answer (substring variable (+ pos (length fix))))
+		     (setq answer variable)))
+	       (setq answer variable))))
+	  ((string= "Postfix" convention)
+	   (progn
+	     (if fix
+		 (let ((pos (string-match (concat fix "$") variable)))
+		   (if pos
+		       (setq answer (substring variable 0 pos))
+		     (setq answer variable)))
+	       (setq answer variable))))
+	  (t
+	   (let ((pos (string-match "[A-Z]." variable)))
+	     (if pos
+		 (let ((ans (substring variable pos)))
+		   (if ans
+		       (setq answer ans)
+		     (setq answer variable)))
+	       (setq answer variable)))))
+    (setq case-fold-search cfs)
+    answer))
+
+
+(defun jde-wiz-get-get-method(type name &optional staticp &optional class-name)
+  "Returns a string representing a get method"
+  (let ((filtered-name (jde-wiz-get-name name))
+	get (javadoc "") temp temp2)
+    (setq
+     get
+     (concat
+      "\n"
+      (if jde-wiz-include-javadoc
+	  (progn
+	    (setq temp2 jde-wiz-get-javadoc-template)
+	    (while temp2
+	      (setq temp (car temp2))
+	      (while (string-match "%n" temp)
+		(setq
+		 temp
+		 (replace-match
+		  (jde-wiz-downcase-initials filtered-name) nil nil temp)))
+	      (while (string-match "%t" temp)
+		(setq temp (replace-match type nil nil temp)))
+	      (setq javadoc (concat javadoc temp "\n"))
+	      (setq temp2 (cdr temp2)))
+	    javadoc))
+      (jde-gen-method-signature
+       (concat "public" (if staticp " static"))
+       type
+       (concat
+	(if (string= type "boolean") "is" "get")
+	(upcase-initials filtered-name))
+       nil)
+      (if jde-gen-k&r "{" "\n{") "\n"
+      "return " (if staticp (concat class-name ".") "this.")
+      name ";\n}\n"))
+    get))
+
+(defun jde-wiz-get-set-method(type name &optional staticp class-name)
+  "Returns a string representing a set method"
+  (let ((filtered-name (jde-wiz-get-name name))
+	set (javadoc "") arg-name temp temp2)
+    (if jde-wiz-get-set-variable-prefix
+	(setq
+	 arg-name
+	 (jde-wiz-downcase-initials
+	  (concat jde-wiz-get-set-variable-prefix (upcase-initials filtered-name))))
+      (setq arg-name (jde-wiz-downcase-initials filtered-name)))
+
+    (setq
+     set
+     (concat
+      "\n"
+      (if jde-wiz-include-javadoc
+	  (progn
+	    (setq temp2 jde-wiz-set-javadoc-template)
+	    (while temp2
+	      (setq temp (car temp2))
+	      (while (string-match "%n" temp)
+		(setq temp
+		      (replace-match
+		       (jde-wiz-downcase-initials filtered-name) nil nil temp)))
+	      (while (string-match "%t" temp)
+		(setq temp (replace-match type nil nil temp)))
+	      (while (string-match "%p" temp)
+		(setq temp (replace-match arg-name nil nil temp)))
+	      (setq javadoc (concat javadoc temp "\n"))
+	      (setq temp2 (cdr temp2)))
+	    javadoc))
+      (jde-gen-method-signature
+       (concat "public" (if staticp " static"))
+       "void"
+       (concat "set" (upcase-initials filtered-name))
+       (concat type " " arg-name))
+      (if jde-gen-k&r "{" "\n{") "\n"
+      (if staticp (concat class-name ".") "this.")
+      name " = " arg-name ";\n}\n"))
+    set))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                               ;;
+;;    ToString Wizard                                                            ;;
+;;                                                                               ;;
+;;    Contributed by Jeff Jensen                                                 ;;
+;;                                                                               ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom jde-wiz-tostring-sort-variables nil
+  "*Specifies whether or not to sort the list of variables in the
+  generated method or list them in the order defined in the file."
+  :group 'jde-wiz
+  :type 'boolean)
+
+(defcustom jde-wiz-tostring-stringbuffer-size "1000"
+  "*Specifies the initial size of the StringBuffer used to create the
+  result for the toString().  It is best to set this to a value large
+  enough for most of your work to prevent expansion of the
+  StringBuffer at runtime.  You can always change the value in the
+  generated code to a smaller or larger one as needed."
+  :group 'jde-wiz
+  :type 'string)
+
+(defcustom jde-wiz-tostring-variable-separator "\"  \""
+  "*Specifies the string between each variable to separate them.
+  Examples: 2 spaces (the default), a comma and a space, newline, or a
+  method call (as long as the return value is a String).
+
+  Note: Remember this must result in a String in Java!"
+  :group 'jde-wiz
+  :type 'string)
+
+(defcustom jde-wiz-tostring-prefix nil
+  "*Specifies the string to prepend to the string result.
+  Example: getClass().getName()
+
+  Note: Remember this must result in a String in Java!"
+  :group 'jde-wiz
+  :type '(repeat (string :tag "Text")))
+
+(defcustom jde-wiz-tostring-postfix nil
+  "*Specifies the string to append to the string result.
+  Example: getClass().getName()
+
+  Note: Remember this must result in a String in Java!"
+  :group 'jde-wiz
+  :type '(repeat (string :tag "Text")))
+
+(defcustom jde-wiz-tostring-static-members t
+  "If on (nonnil), `jde-wiz-tostring' includes the values of the
+ static members of the class in the current buffer."
+  :group 'jde-wiz
+  :type 'boolean)
+
+(defun jde-wiz-tostring()
+  "Generates a toString() method for tbe class at point. The method
+returns a string comprising the values of the member variables defined
+by the class. The string lists the variables in alphabetical
+order if `jde-wiz-tostring-sort-variables' is on. The string uses the
+string specified by `jde-wiz-tostring-variable-separator' to separate
+the variables. The generated method uses a string buffer of the size
+specified by `jde-wiz-tostring-stringbuffer-size' to build the string.
+If `jde-wiz-tostring-prefix' is defined, it is prepended to the string.
+If `jde-wiz-tostring-postfix' is defined, it is appended to the string. "
+ (interactive)
+ (let* ((class-name
+	 (jde-parse-get-unqualified-name
+	  (jde-parse-get-class-at-point)))
+	(variables
+	 (semantic-find-nonterminal-by-token
+	  'variable
+	  (jde-wiz-get-class-parts
+	   class-name
+	   (semantic-find-nonterminal-by-token
+	    'type
+	    (semantic-fetch-tags)
+	    ))))
+	(method
+	 (concat
+	  "/**\n"
+	  " * {@inheritDoc}\n"
+	  " */\n"
+	  ;; respect coding style - by yoonforh 2004-05-10 01:34:02
+	  "public String toString()"
+	  (if jde-gen-k&r " {\n" "\n{\n")
+	  "final int sbSize = " jde-wiz-tostring-stringbuffer-size  ";\n"
+	  "final String variableSeparator = " jde-wiz-tostring-variable-separator ";\n"
+	  "final StringBuffer sb = new StringBuffer(sbSize);\n\n"))
+	(prefix jde-wiz-tostring-prefix)
+	(postfix jde-wiz-tostring-postfix))
+
+   (setq variables (jde-wiz-filter-variables-by-typemodifier variables))
+
+   (if jde-wiz-tostring-sort-variables
+       (setq variables (semantic-sort-tags-by-name-increasing variables)))
+
+   ;; Remove static members.
+   (unless jde-wiz-tostring-static-members
+     (setq
+      variables
+      (delq
+       nil
+       (mapcar
+	(lambda (var)
+	  (let ((staticp
+		 (member
+		  "static"
+		  (semantic-tag-modifiers var))))
+	    (unless staticp var)))
+	variables))))
+
+   (while prefix
+     (setq method (concat method "sb.append(" (car prefix) ");\n")
+	   prefix (cdr prefix)))
+
+   (while variables
+     (let* ((var (car variables))
+	   (name (semantic-tag-name var))  ;;variable name
+	   (type (semantic-tag-type var))) ;;variable type i.e. boolean
+
+       (setq
+	method
+	(concat
+	 method
+	 "sb.append(\"" name "=\").append(" name ");\n"))
+
+       (if (> (length variables) 1)
+	   (setq method (concat method "sb.append(variableSeparator);\n")))
+
+       (setq variables (cdr variables))))
+
+   (while postfix
+     (setq method (concat method "sb.append(" (car postfix) ");\n")
+	   postfix (cdr postfix)))
+
+   (setq method
+	 (concat
+	  method "\nreturn sb.toString();\n}\n"))
+
+   (insert method))
+
+ (jde-wiz-indent (point)))
+
+
+(provide 'jde-wiz)
+
+;; End of jde-wiz.el
diff --git a/site/jdee/lisp/jde-wiz.elc b/site/jdee/lisp/jde-wiz.elc
new file mode 100644
index 0000000..7cd7eea
Binary files /dev/null and b/site/jdee/lisp/jde-wiz.elc differ
diff --git a/site/jdee/lisp/jde-xref.el b/site/jdee/lisp/jde-xref.el
new file mode 100644
index 0000000..26565f8
--- /dev/null
+++ b/site/jdee/lisp/jde-xref.el
@@ -0,0 +1,743 @@
+;; jde-xref.el --- Class cross-reference commands for the JDEE.
+;; $Id: jde-xref.el 178 2009-12-27 01:39:52Z lenbok $
+;;
+;; Copyright (C) 2002, 2003 Andrew Hyatt
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Andrew Hyatt <andy_jde@thehyatts.net>
+;; Maintainers: Andrew Hyatt and Paul Kinnucan
+;; Keywords: java, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; A copy of the GNU General Public License can be obtained from this
+;; program's author (send electronic mail to
+;; ) or from the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;; LCD Archive Entry:
+;; jde-xref|Andrew Hyatt|
+;; |Java class cross-referencing commands for the JDEE
+;; |$Date: 2009-12-26 19:39:52 -0600 (Sat, 26 Dec 2009) $|$Revision: 178 $|~/packages/jde-xref.el
+
+;;; Commentary:
+
+;; This file stores all caller-related functionality, from the
+;; functions to find all callers of a Java method, to those that will
+;; do more sophisticated things like creating a call-tree
+;;
+;; Everything works off the database, which is split into a series of
+;; files, one file per package.  Each package consists of three tables.
+;; The first is a mapping of class-function-args specifiers to a list
+;; of all the classes, method & linenumbers that call it, such as:
+;;
+;; (("org.foo.MyClass" "getName" nil "String") .
+;;   (("org.foo.MyOtherClass" "doProcessing" nil nil 42)
+;;    ("org.foo.YetAnotherClass" "doMoreProcessing" nil nil 32)))
+;;
+;; The specifier for a method (the first part of the above is a: fully
+;; qualified classname , function name, return type (nil for "void")
+;; and non-fully qualified arglist.  We don't want to fully qualify
+;; the arglist, so that we don't have to fully qualify it when doing a
+;; lookup.  The changes of collisions are minor, I think.
+;;
+;; The next table is a table of which class has which interfaces.
+;; This is used so that we can consider a call to IFoo.doSomething as
+;; a call to Foo.doSomething, is Foo implements IFoo.  This
+;; functionality is not always wanted, so the functions that show
+;; caller information can either use it or not.
+;;
+;; The third table is a table of which class has which methods and
+;; fields.  This is necessary to determine which references to
+;; subclasses really are references to a superclass because the fields
+;; or methods have not been overriden.
+;;
+;; The fourth table is a table of classes to superclasses, necessary
+;; to figure out when a call to superclass might be a call to a
+;; subclass (when the user asks about calls to the subclass).
+;;
+;; There is also a global table across all packages, which is a
+;; map of which classes are subclasses of which other classes. This
+;; makes it possible to investigate a class's subclasses when looking
+;; for references.
+;;
+
+(require 'jde-parse)
+(require 'jde-parse-class)
+(require 'jde-class)
+(require 'tree-widget)
+
+(defconst jde-xref-version "1.5")
+
+(defgroup jde-xref nil
+  "JDEE Class Cross-Reference (Refactoring) Options"
+  :group 'jde
+  :prefix "jde-xref-")
+
+
+(defcustom jde-xref-db-base-directory "."
+  "The path to store the directory which contains the database of
+  which function calls which.  The data directory will be called
+  \"xrefdb\" and will reside in the directory pointed to at this
+  location "
+  :group 'jde-xref
+  :type 'directory)
+
+(defcustom jde-xref-store-prefixes nil
+  "A list of what prefixes to specify what references should be
+  tracked in the caller database.  Such as: '(\"org.apache\" \"jde\"),
+  to keep track of all references to classes that start with
+  \"org.apache\" or \"jde\"."
+  :group 'jde-xref
+  :type '(repeat (string :tag "Prefix")))
+
+(defcustom jde-xref-cache-size 3
+  "How much package info to cache in memory at once.  The higher the
+  variable is the more memory will be used, but the faster things
+  should be."
+  :group 'jde-xref
+  :type 'integer)
+
+(defvar jde-xref-stack nil
+  "A list of the callers of a function, to be popped one at a time
+  and shown to the user")
+
+(defvar jde-xref-modified-classes nil
+  "A list of modified classes, to be used in updating the caller table
+  when a recompile happens")
+
+(defvar jde-xref-parsed-classes nil
+  "A global variable that is used to hold which classes have been parsed")
+
+(defvar jde-xref-cache nil
+  "A cache holding package information that will grow to size
+  `jde-xref-cache-size'")
+
+(defvar jde-xref-subclasses nil
+  "A hashtable containing a list of which classes subclass which other
+subclasses.")
+
+(defun jde-xref-pickle-hash (hash filename)
+  "Store HASH in the file FILENAME.  The hash can be retrieved by
+calling `jde-xref-unpickle-hash'."
+  (when (file-exists-p filename)
+    (delete-file filename))
+  (save-excursion
+    (let ((buf (find-file-noselect (jde-normalize-path filename))))
+      (set-buffer buf)
+      (goto-char (point-min))
+      (erase-buffer)
+      (insert "(")
+      (maphash (lambda (key val)
+		 (when val
+		   (insert (concat "(" (prin1-to-string key) " . "
+				   (prin1-to-string val) ")\n" ))))
+	       hash)
+      (insert ")")
+      (save-buffer)
+      (kill-buffer buf))))
+
+(defun jde-xref-unpickle-hash (hash filename)
+  "Populate a hash created by loading the contents of FILENAME to HASH.
+FILENAME must be created by `jde-xref-pickle-hash'"
+  (unless (file-exists-p filename)
+    (error (concat "Cannot unpickle - file " filename " does not exist.  "
+		   "The xref database may need to be recreated.")))
+  (dolist (item (with-temp-buffer
+	  (insert-file-contents-literally filename)
+	  (read (current-buffer))))
+    (puthash (car item) (cdr item) hash)))
+
+(defun jde-xref-get-db-directory ()
+  (concat (jde-normalize-path jde-xref-db-base-directory) "/xrefdb"))
+
+(defun jde-xref-guess-and-set-prefixes ()
+  (let ((prefixes (jde-xref-guess-prefixes)))
+    (when prefixes
+      (setq jde-xref-store-prefixes prefixes))))
+
+(defun jde-xref-guess-prefixes ()
+  "Try to guess what the prefixes are.  Return the prefix list if
+  correctly guessed, otherwise return NULL.  This works by looking at
+  the sourcepath, and putting all the top-level packages in the list,
+  where toplevel is defined as being a package from which all the
+  other packages branch out from."
+
+  (labels ((get-prefix (base-path package-path)
+	     ;; if the directory contains just one directory (or two,
+	     ;; one being CVS), then we can recurse down it to build
+	     ;; up a proper prefix before the package tree really
+	     ;; branches out
+	     (let ((files (remove-if-not
+			   (lambda (dir) (and (file-directory-p
+					       (concat base-path "/" package-path "/" dir)))
+					      (not (equal "CVS" dir)))
+			   (directory-files
+			    (concat base-path "/" package-path)
+			    nil "[^.]$"))))
+	       (if (eq (length files) 1)
+		   (get-prefix base-path (concat package-path "/"
+						 (car files)))
+		 (subst-char-in-string ?/ ?. package-path)))))
+    (when (and (eq major-mode 'jde-mode) jde-sourcepath)
+      (let ((first-prefix (car (split-string (jde-parse-get-package-name)
+					     "\\."))) (prefixes))
+	(dolist (path (remove-if-not (lambda (path) (file-exists-p path)) jde-sourcepath) prefixes)
+	  (when (member first-prefix (directory-files path nil "[^.]$"))
+	    (message (concat "path = " path))
+	    (add-to-list 'prefixes (get-prefix path first-prefix))))))))
+
+;;;###autoload
+(defun jde-xref-make-xref-db ()
+  "Create a database of caller to callee (and the reverse) from the
+classes in `jde-built-class-path' and store the data in the location
+specified by `jde-xref-db-file'"
+  (interactive)
+  (when (null jde-xref-db-base-directory)
+    (error "The variable `jde-xref-db-base-directory' must be defined to make a caller database"))
+  (when (null jde-built-class-path)
+    (error "The variable `jde-built-class-path' must be defined to make a caller database"))
+  (when (null jde-xref-store-prefixes)
+    (error "The variable `jde-xref-store-prefixes' must be defined to make a caller database"))
+  (unless (file-exists-p (jde-xref-get-db-directory))
+    (make-directory (jde-xref-get-db-directory)))
+  (jde-xref-update-xref-db )
+  (message "Finished creating xref database")
+  (add-hook 'after-save-hook 'jde-xref-file-saved))
+
+(defun jde-xref-substring-member (str prefixlist)
+  "Like `member' but works with strings and will return true if any of
+  the prefixes in PREFIXLIST match STR"
+  (member-if (lambda (item) (string=
+			     (substring str 0 (min (length item)
+						   (length str)))
+			     item)) prefixlist))
+
+(defun jde-xref-get-package-data ()
+  (let ((data (make-hash-table :test 'equal :size 10))
+	(caller-files (directory-files (jde-xref-get-db-directory)
+				       t "caller$")))
+    (dolist (caller-file caller-files)
+      (let* ((package (mapconcat (lambda (x) x)
+				 (butlast
+				  (split-string (car (last
+						      (split-string caller-file
+								    "/")))
+						"-")) "-"))
+	     (package-data (jde-xref-load-package-hashes package)))
+	(puthash package package-data data)))
+    data))
+
+(defun jde-xref-update-xref-db (&optional only-classes)
+  (let ((package-data (if only-classes
+			(jde-xref-get-package-data)
+			(make-hash-table :test 'equal :size 10)))
+	(subclasses (make-hash-table :test 'equal :size 500)))
+    ;; Remove all occurances of classes to be updated from the package-data's caller-hashes
+    (when only-classes
+      (maphash (lambda (package single-package-data)
+		 (maphash (lambda (callee callers)
+			    (puthash callee
+				     (remove-if (lambda (item)
+						  (member (car item)
+							  only-classes))
+						callers)
+				     (nth 0 single-package-data)))
+			  (nth 0 single-package-data)))
+	       package-data))
+    (with-all-class-infos-when (info)
+			       (lambda (class-file)
+				 (or (null only-classes)
+				     (jde-class-path-in-classes-p
+				      class-file only-classes)))
+			       (jde-xref-add-class-info-to-db info package-data
+							      subclasses))
+    (setq jde-xref-parsed-classes nil)
+    (jde-xref-pickle-hash subclasses (jde-xref-get-subclass-file))
+    (setq jde-xref-subclasses subclasses)
+    (maphash (lambda (package data)
+	       (jde-xref-pickle-hash (nth 0 data)
+				     (jde-xref-get-caller-file package))
+	       (jde-xref-pickle-hash (nth 1 data)
+				     (jde-xref-get-interface-file package))
+	       (jde-xref-pickle-hash (nth 2 data)
+				     (jde-xref-get-member-file package))
+	       (jde-xref-pickle-hash (nth 3 data)
+				     (jde-xref-get-superclass-file package)))
+	     package-data)
+    (setq jde-xref-cache nil)))
+
+(defun jde-xref-create-package-hashes (&optional fake)
+  "Returns a list of the three hashes that are in a package's data.
+The hashes are for the caller-hash, the interface-hash, the
+member-hash, and the superclass hash.  FAKE determines if we are just
+creating them so that there is something to check against.  In those
+circumstance we just create tiny hashes to conserve memory."
+  (list (make-hash-table :test 'equal :size (if fake 1 100))
+	(make-hash-table :test 'equal :size (if fake 1 20))
+	(make-hash-table :test 'equal :size (if fake 1 100))
+	(make-hash-table :test 'equal :size (if fake 1 20))))
+
+(defun jde-xref-load-package-hashes (package)
+  (let ((data (jde-xref-create-package-hashes)))
+    (jde-xref-unpickle-hash (nth 0 data)
+			    (jde-xref-get-caller-file package))
+    (jde-xref-unpickle-hash (nth 1 data)
+			    (jde-xref-get-interface-file package))
+    (jde-xref-unpickle-hash (nth 2 data)
+			    (jde-xref-get-member-file package))
+    (jde-xref-unpickle-hash (nth 3 data)
+			    (jde-xref-get-superclass-file package))
+    data))
+
+(defun jde-xref-append-hash (key value hash)
+  "Like `puthash' but appends VALUE to the HASH at KEY"
+  (puthash key (append (gethash key hash) (if (listp value)
+					    value
+					    (list value))) hash))
+
+(defun jde-xref-add-class-info-to-db (info package-data subclasses)
+  (message (concat "Parsing class " (jde-parse-class-extract-classname info)))
+  (add-to-list 'jde-xref-parsed-classes
+	       (jde-parse-class-extract-classname info))
+  (let ((package (jde-parse-get-package-from-name
+		  (jde-parse-class-extract-classname info))))
+    ;; If there is no existing package data
+    (unless (gethash package package-data)
+      (puthash package
+	       ;; package-data's values are (caller-hash
+	       ;; interface-hash method-and-field-hash)
+	       (jde-xref-create-package-hashes)
+	       package-data))
+    (destructuring-bind (caller-hash interface-hash
+				     method-and-field-hash superclass-hash)
+	(gethash package package-data)
+      (puthash (jde-parse-class-extract-classname info)
+	       (jde-parse-class-extract-interfaces info)
+	       interface-hash)
+      (puthash (jde-parse-class-extract-classname info)
+	       (append (jde-parse-class-extract-method-signatures info)
+		       (jde-parse-class-extract-field-signatures info))
+	       method-and-field-hash)
+      (puthash (jde-parse-class-extract-classname info)
+	       (jde-parse-class-extract-superclass info)
+	       superclass-hash)
+      (jde-xref-append-hash
+       (jde-parse-class-extract-superclass info)
+       (jde-parse-class-extract-classname info) subclasses)
+      (dolist (call (nreverse
+		     (jde-parse-class-extract-method-calls info)))
+	(let ((calls (car call))
+	      (called (cadr call)))
+	  (if (or (not jde-xref-store-prefixes)
+		  (and
+		   (jde-xref-substring-member (car calls)
+					      jde-xref-store-prefixes)
+		   (jde-xref-substring-member (car called)
+					      jde-xref-store-prefixes)))
+	      (let* ((dqcalled (list (car called)
+				     (nth 1 called)
+				     (when (nth 2 called)
+				       (jde-parse-get-unqualified-name
+					(nth 2 called)))
+				     ;; We don't want to need to
+				     ;; know the constructor args
+				     ;; for anonymous classes
+				     (unless (jde-xref-is-class-anonymous (car called))
+				       (mapcar 'jde-parse-get-unqualified-name
+					       (nth 3 called)))))
+		     (called-package (jde-parse-get-package-from-name
+				      (car dqcalled))))
+		;; Create the package data if needed
+		(unless (gethash called-package package-data)
+		  (puthash called-package (jde-xref-create-package-hashes)
+			   package-data))
+		(let* ((called-package-hashes
+			(gethash called-package package-data))
+		       (called-package-caller-hash
+			(car called-package-hashes)))
+		  ;; add things to the table - making sure there are no duplicates
+		  (puthash dqcalled
+			   (if (member calls (gethash
+					      dqcalled
+					      called-package-caller-hash))
+			       (gethash dqcalled called-package-caller-hash)
+			     (cons calls
+				   (gethash dqcalled
+					    called-package-caller-hash)))
+			   called-package-caller-hash)))))))))
+
+(defun jde-xref-class-and-token-to-signature (class token)
+  (let ((ttype  (semantic-tag-type token))
+	(tclass (semantic-tag-class token))
+	(tname  (semantic-tag-name token)))
+    (list tclass
+	  class
+	  (if (equal tname (jde-parse-get-unqualified-name class))
+	      "<init>"
+	    tname)
+	  (when (eq tclass 'function)
+	    (if (or (not ttype) (equal ttype "void"))
+		nil
+	      (jde-parse-get-unqualified-name ttype)))
+	  (if (eq tclass 'function)
+	      (mapcar (lambda (arg)
+			(jde-parse-get-unqualified-name
+			 (semantic-tag-type arg)))
+		      (semantic-tag-function-arguments token))
+	    (list (jde-parse-get-unqualified-name ttype))))))
+
+(defun jde-xref-get-current-class ()
+  (let ((package-name (jde-parse-get-package-name)))
+    (concat package-name (when  package-name ".") (replace-regexp-in-string "\\." "$" (jde-parse-get-class-at-point)))))
+
+(defun jde-xref-get-current-signature ()
+  (unless (member
+	   (semantic-tag-class (semantic-current-tag))
+		'(function variable))
+    (error "The cursor must be in a function or class variable to get the callers"))
+  (jde-xref-class-and-token-to-signature
+   (jde-xref-get-current-class)
+   (semantic-current-tag)))
+
+;;;###autoload
+(defun jde-xref-first-caller (strict)
+  "Put the list of who calls the current function on the stack and
+display the first caller.  Subsequent callers are displayed through
+`jde-xref-show-next-caller'.  STRICT should be true if the callers of
+interfaces to a function, or calls to a superclass which may result in
+a virtual function call to the subclass should not be considered.  In
+other words, if STRICT is true, then only calls that are definitely to
+the requested function are considered."
+  (interactive "P")
+  (jde-xref-load-subclasses-table-if-necessary)
+  (setq jde-xref-stack (jde-xref-get-callers
+			    (jde-xref-get-current-signature) strict))
+  (if jde-xref-stack
+      (progn
+	(ring-insert find-tag-marker-ring (point-marker))
+	(jde-xref-next-caller))
+    (message "No calls")))
+
+(defun jde-xref-goto-caller (caller)
+  (jde-find-class-source (car caller))
+  (goto-line (nth 4 caller)))
+
+;;;###autoload
+(defun jde-xref-next-caller ()
+  "If there are items still on the caller stack, pop the first one off
+and show it"
+  (interactive)
+  (if (not jde-xref-stack)
+      (message "No more calls")
+    (unless (listp (car jde-xref-stack))
+      (pop jde-xref-stack)) ;; skip over called classname
+    (jde-xref-goto-caller (pop jde-xref-stack))))
+
+
+(defun jde-xref-load-subclasses-table-if-necessary ()
+  (unless jde-xref-subclasses
+    (setq jde-xref-subclasses (make-hash-table :test 'equal :size 500))
+    (jde-xref-unpickle-hash jde-xref-subclasses
+			    (jde-xref-get-subclass-file))
+    ;; if subclasses were empty, then it's the first time this is run,
+    ;; so do our one-time initializations
+    (add-hook 'after-save-hook 'jde-xref-file-saved)))
+
+(defun jde-xref-signature-to-string (sig)
+  (concat (or (nth 3 sig) "void") " " (cadr sig) "."
+	  (if (equal (nth 2 sig) "<init>")
+	    (jde-parse-get-unqualified-name (cadr sig))
+	    (nth 2 sig))
+	  (when (eq (car sig) 'function)
+	    (concat "("
+		    (mapconcat (lambda (x) x) (nth 4 sig) ",") ")"))))
+
+(defun jde-xref-find-package-in-cache (package cache)
+  (when cache
+    (if (equal (caar cache) package)
+      (cdar cache)
+      (jde-xref-find-package-in-cache package (cdr cache)))))
+
+(defun jde-xref-get-caller-file (package)
+  (concat (jde-xref-get-db-directory) "/" package "-caller"))
+
+(defun jde-xref-get-interface-file (package)
+  (concat (jde-xref-get-db-directory) "/" package "-interfaces"))
+
+(defun jde-xref-get-member-file (package)
+  (concat (jde-xref-get-db-directory) "/" package "-members"))
+
+(defun jde-xref-get-superclass-file (package)
+  (concat (jde-xref-get-db-directory) "/" package "-superclasses"))
+
+(defun jde-xref-get-subclass-file ()
+  (concat (jde-xref-get-db-directory) "/subclasses"))
+
+(defun jde-xref-find-or-create-package-in-cache (package)
+  (unless jde-xref-db-base-directory
+    (error "The variable `jde-xref-db-base-directory' must be specified to load the xref db"))
+  (if (file-exists-p (jde-xref-get-caller-file package))
+    (or (jde-xref-find-package-in-cache package jde-xref-cache)
+	;; Or we need to get the new package and put it in the cache
+	(let ((data (jde-xref-load-package-hashes package)))
+	(setq jde-xref-cache (cons (cons package data)
+				   (if (> (length jde-xref-cache)
+					  jde-xref-cache-size)
+				       (cdr jde-xref-cache)
+				     jde-xref-cache)))
+	data))
+    (jde-xref-create-package-hashes t)))
+
+(defun jde-xref-get-caller-hash (package)
+  (nth 0 (jde-xref-find-or-create-package-in-cache package)))
+
+(defun jde-xref-get-interface-hash (package)
+  (nth 1 (jde-xref-find-or-create-package-in-cache package)))
+
+(defun jde-xref-get-member-hash (package)
+  (nth 2 (jde-xref-find-or-create-package-in-cache package)))
+
+(defun jde-xref-get-superclass-hash (package)
+  (nth 3 (jde-xref-find-or-create-package-in-cache package)))
+
+(defun jde-xref-get-basic-caller (sig)
+  (gethash (cdr sig) (jde-xref-get-caller-hash (jde-parse-get-package-from-name
+						(nth 1 sig)))))
+
+(defun jde-xref-get-members (class)
+  (gethash class (jde-xref-get-member-hash (jde-parse-get-package-from-name
+					    class))))
+
+(defun jde-xref-get-superclass (class)
+  (gethash class (jde-xref-get-superclass-hash (jde-parse-get-package-from-name
+						class))))
+
+(defun jde-xref-is-class-anonymous (class)
+  (string-match "\\$[0-9]+$" class))
+
+(defun jde-xref-is-caller-anonymous-class (caller)
+  (jde-xref-is-class-anonymous (nth 0 caller)))
+
+(defun jde-xref-is-sig-anonymous-class (sig)
+  (jde-xref-is-class-anonymous (nth 1 sig)))
+
+(defun jde-xref-get-callers (sig &optional strict)
+  (let ((typesig (car sig))
+    (classname (cadr sig)))
+    (append
+     ;; if we're an anonymous class, then we want to see where we are
+     ;; created, since it kind of goes along with usage of the function.
+     (when (jde-xref-is-sig-anonymous-class sig)
+       (jde-xref-get-basic-caller (list typesig classname "<init>" nil nil)))
+
+     (jde-xref-get-basic-caller sig)
+     (unless strict
+       (apply 'append
+	  (mapcar
+	   (lambda (classname)
+	 (let* ((sig `(,typesig ,classname ,@(cddr sig)))
+	    (callers-for-classname (jde-xref-get-basic-caller sig)))
+	   (when callers-for-classname
+	     (cons classname callers-for-classname)))) ;; include classname in the usage list
+	   (jde-xref-get-subs classname sig (jde-xref-get-supers classname nil))))))))
+
+
+(defun jde-xref-get-supers (classname collect)
+  (mapc (lambda (super)
+      (unless (member super collect)
+	(setq collect (jde-xref-get-supers super (cons super collect)))))
+    (let* ((package (jde-parse-get-package-from-name classname))
+	   (superclass (jde-xref-get-superclass classname))
+	   (superinterfaces (gethash classname (jde-xref-get-interface-hash package))))
+      (if superclass
+	  (cons superclass superinterfaces)
+	superinterfaces)))
+  collect)
+
+
+(defun jde-xref-get-subs (classname sig collect)
+  (mapc (lambda (subclass)
+	(unless (or (member subclass collect) (member (cddr sig) (jde-xref-get-members subclass)))
+	  (setq collect (jde-xref-get-subs subclass sig (cons subclass collect)))))
+      (gethash classname jde-xref-subclasses))
+  collect)
+
+
+(defun jde-xref-notify (widget child &optional event)
+  (jde-xref-goto-caller (widget-get widget :caller)))
+
+(defun jde-xref-caller-to-sig (caller)
+  (list 'function (nth 0 caller) (nth 1 caller) (when (nth 2 caller) (jde-parse-get-unqualified-name (nth 2 caller)))
+	(mapcar 'jde-parse-get-unqualified-name (nth 3 caller))))
+
+(defun jde-xref-tree-get-children (sig)
+  (when sig
+    (mapcar
+     (lambda (caller)
+       (if (listp caller)
+       (let  ((caller-sig (jde-xref-caller-to-sig caller)))
+	 (list
+	  'tree-widget
+	  :node `(push-button
+	      :tag ,(jde-xref-signature-to-string caller-sig)
+	      :format "%[%t%]\n"
+	      :sig ,caller-sig
+	      :caller ,caller
+	      :notify jde-xref-notify)
+	  :dynargs 'jde-xref-tree-get-children-from-tree
+	  :expander 'jde-xref-tree-get-children-from-tree
+	  :sig caller-sig
+	  :has-children t))
+     (list 'tree-widget :tag caller))) ;; class for next set of usages
+       (jde-xref-get-callers sig))))
+
+(defun jde-xref-tree-get-children-from-tree (tree)
+  (jde-xref-tree-get-children (widget-get tree :sig)))
+
+;;;###autoload
+(defun jde-xref-display-call-tree (strict)
+  "Display an interactive call tree of which function call the current
+  function, which can be expanded outward.  STRICT should be true if
+  the callers of interfaces to a function, or calls to a superclass
+  which may result in a virtual function call to the subclass should
+  not be considered.  In other words, if STRICT is true, then only
+  calls that are definitely to the requested function are considered. "
+  (interactive "P")
+  (jde-xref-load-subclasses-table-if-necessary)
+  (let* ((sig (jde-xref-get-current-signature))
+	 (buf (get-buffer-create (concat "JDE call graph for "
+					 (jde-xref-signature-to-string
+					  sig)))))
+    (switch-to-buffer buf)
+    (erase-buffer)
+    (widget-create 'tree-widget
+		   :tag (jde-xref-signature-to-string sig)
+		   :dynargs 'jde-xref-tree-get-children-from-tree
+		   :expander 'jde-xref-tree-get-children-from-tree
+		   :has-children t
+		   :sig sig)
+    (use-local-map widget-keymap)
+    (widget-setup)))
+
+(defun jde-xref-get-class-variables (class-token)
+  (mapcan (lambda (token)
+	    (when (eq (semantic-tag-class token) 'variable)
+	      (list token)))
+	  (semantic-tag-children-compatibility class-token)))
+
+;;;###autoload
+(defun jde-xref-list-uncalled-functions (strict)
+  "Displays a simple list of function that are never called, at least
+not directly.  Do not assume that this means this code can never be
+reached, since reflection could always call any method.  Use this list
+and your best judgement to figure out what are good candidates for
+code cleanup.  STRICT should be true if the callers of interfaces to a
+function, or calls to a superclass which may result in a virtual
+function call to the subclass should not be considered.  In other
+words, if STRICT is true, then only calls that are definitely to the
+requested function are considered.  This function could take a
+while. If it does, you might want to consider increasing
+`jde-xref-cache-size'."
+  (interactive "P")
+  (jde-xref-load-subclasses-table-if-necessary)
+  (save-excursion
+    (flet ((get-unused-string (token)
+	     (goto-char (semantic-tag-start token))
+	     (unless (jde-xref-get-callers
+		      (jde-xref-class-and-token-to-signature
+		       (jde-xref-get-current-class) token) strict)
+	       (list (jde-xref-signature-to-string
+		      (jde-xref-class-and-token-to-signature
+		       (jde-xref-get-current-class) token))))))
+    (let ((uncalled-methods
+	    (mapcan 'get-unused-string
+		    (semantic-find-nonterminal-by-token 'function
+							(current-buffer)
+							t)))
+	  (unreferenced-variables
+	    (mapcan 'get-unused-string
+		    (mapcan 'jde-xref-get-class-variables
+			    (semantic-brute-find-tag-by-type "class"
+							       (current-buffer)
+							       t))))
+	  (outbuf (get-buffer-create "Unreferenced Methods and Members")))
+      (switch-to-buffer outbuf)
+      (erase-buffer)
+      (insert "The following is a list of methods and members that are\n")
+      (insert "uncalled directly by any Java classes that are in the\n")
+      (insert "following locations: \n")
+      (insert (mapconcat (lambda (x) x) jde-built-class-path ", "))
+      (newline)
+      (newline)
+      (if uncalled-methods
+	(progn
+	  (insert "Unreferenced methods:\n")
+	  (insert (mapconcat (lambda (x) x) uncalled-methods "\n")))
+	(insert "There are no uncalled methods\n\n"))
+      (if unreferenced-variables
+	(progn
+	  (insert "\n\nUnreferenced class variables:\n")
+	  (insert (mapconcat (lambda (x) x) unreferenced-variables "\n")))
+	(insert "\n\nThere are no unreferenced variables\n\n"))
+      (toggle-read-only)
+      (not-modified)))))
+
+(defun jde-xref-remove-classes-from-subclasses-table (classes)
+  (maphash (lambda (key value)
+	     (puthash key
+		      (remove-if (lambda (item)
+				   (member item classes)) value)
+		      jde-xref-subclasses))
+	   jde-xref-subclasses))
+
+;;;###autoload
+(defun jde-xref-update (&rest ignored)
+  "Update the caller table after a recompile.  This can be called by
+the user when they recompile outside of emacs.  It will update the
+call list of all files modified in emacs"
+  (interactive)
+  (message "Updating xref tables")
+  (when jde-xref-modified-classes
+    (jde-xref-remove-classes-from-subclasses-table
+     jde-xref-modified-classes)
+    (jde-xref-update-xref-db jde-xref-modified-classes)
+    (message "Finished updateing xref database"))
+  (setq jde-xref-modified-classes nil))
+
+(defun jde-xref-file-saved ()
+  (when (eq major-mode 'jde-mode)
+    (setq jde-xref-modified-classes
+	  (append jde-xref-modified-classes
+		  (mapcar (lambda (class-token)
+			    (concat (jde-parse-get-package-name)
+				    (when (jde-parse-get-package-name) ".")
+				    (semantic-tag-name class-token)))
+			  (semantic-brute-find-tag-by-type
+			   "class" (current-buffer) t))))))
+
+;;;###autoload
+(defun jde-xref-customize ()
+  "Display the customization buffer for the xref package."
+  (interactive)
+  (customize-group "jde-xref"))
+
+(global-set-key (kbd "C-c C-v a") 'jde-xref-first-caller)
+(global-set-key (kbd "C-c C-v n") 'jde-xref-next-caller)
+
+
+;; Register and initialize the customization variables defined
+;; by this package.
+(jde-update-autoloaded-symbols)
+
+(provide 'jde-xref)
+
+;; End of jde-xref.el
diff --git a/site/jdee/lisp/jde-xref.elc b/site/jdee/lisp/jde-xref.elc
new file mode 100644
index 0000000..7c9d4bc
Binary files /dev/null and b/site/jdee/lisp/jde-xref.elc differ
diff --git a/site/jdee/lisp/jde.el b/site/jdee/lisp/jde.el
new file mode 100644
index 0000000..d5299e2
--- /dev/null
+++ b/site/jdee/lisp/jde.el
@@ -0,0 +1,2381 @@
+;;; jde.el -- Integrated Development Environment for Java.
+;; $Id: jde.el 191 2010-01-08 08:29:48Z paullandes $
+
+;; Author: Paul Kinnucan <pkinnucan@attbi.com>
+;; Maintainer: Paul Landes
+;; Keywords: java, tools
+
+;; Copyright (C) 1997-2008 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+;; quiet "reference to free variable" build-time warnings
+(defvar cedet-version)
+(defvar browse-url-new-window-p)
+
+;;;###autoload
+(defconst jde-version "2.4.0.1"
+  "JDE version number.")
+
+(defconst jde-revision "$Revision: 191 $"
+  "The subversion revision for this build.")
+
+(defconst jde-cedet-min-version "1.0beta2"
+  "Cedet minimum version")
+(defconst jde-cedet-max-version "1.0"
+  "Cedet maximum version")
+
+(defconst jde-xemacsp (string-match "XEmacs" (emacs-version))
+  "Non-nil if we are running in the XEmacs environment.")
+
+(defconst jde-xemacs20p (and jde-xemacsp (>= emacs-major-version 20)))
+
+(defconst jde-emacs21p (and (string-match "\\bEmacs\\b" (emacs-version))
+			    (>= emacs-major-version 21)))
+
+(defconst jde-emacs22p (and (string-match "\\bEmacs\\b" (emacs-version))
+			    (>= emacs-major-version 22)))
+
+(defconst jde-emacs23p (and (string-match "\\bEmacs\\b" (emacs-version))
+			    (>= emacs-major-version 23)))
+
+(unless (fboundp 'custom-set-default)
+   (defalias 'custom-set-default 'set-default))
+
+;; Use the full Java 1.5 grammar to parse Java files
+;; http://www.mail-archive.com/jde@sunsite.dk/msg07334.html
+;(autoload 'wisent-java-default-setup "wisent-java" "Hook run to setup Semantic in `java-mode'." nil nil)
+
+;; Autoloads must be loaded first since move to sole `(require 'jde)' style.
+(require 'jde-autoload)
+
+(require 'jde-util)
+(require 'jde-custom)
+(require 'jde-help)
+(require 'semantic-load)
+(require 'easymenu)
+(require 'cl)
+(require 'font-lock)
+(require 'cc-mode)
+(require 'cus-edit)
+(require 'comint)
+(require 'jde-compile)
+(require 'jde-db)
+(require 'jde-bug)
+(require 'jde-jdb)
+(require 'jde-run)
+(require 'jde-gen)
+(require 'compile)
+(require 'imenu)
+(require 'browse-url)
+(require 'beanshell)
+(require 'jde-plugins)
+(require 'jde-wiz)
+(require 'jde-java-grammar)
+(require 'jde-complete)
+(require 'jde-which-method)
+(require 'jde-java-font-lock)
+(require 'jde-import)
+(require 'jde-class)
+(require 'executable)  ;; in XEmacs' sh-script package
+(require 'efc)
+(require 'etags)
+(require 'jde-open-source)
+(require 'jde-annotations)
+(require 'regress)
+
+(if (not (fboundp 'custom-set-default))
+    (defalias 'custom-set-default 'set-default))
+
+(defgroup jde nil
+  "Java Development Environment"
+  :group 'tools
+  :prefix "jde-")
+
+(defcustom jde-check-version-flag t
+  "*Non-nil means to check versions of semantic, eieio, and speedbar.
+That is if they meet the requirements for this version of the JDE.
+If nil only check if semantic, eieio, and speedbar are available.
+See also the function `jde-check-versions'."
+  :group 'jde
+  :type 'boolean)
+
+;; (makunbound 'jde-key-bindings)
+(defcustom jde-key-bindings
+  (list
+   (cons "[?\C-c ?\C-v ?\C-a]" 'jde-run-menu-run-applet)
+   (cons "[?\C-c ?\C-v ?\C-b]" 'jde-build)
+   (cons "[?\C-c ?\C-v ?\C-c]" 'jde-compile)
+   (cons "[?\C-c ?\C-v ?\C-d]" 'jde-debug)
+   (cons "[?\C-c ?\C-v ?\C-f]" 'jde-find)
+   (cons "[?\C-c ?\C-v ?\C-g]" 'jde-open-class-at-point)
+   (cons "[?\C-c ?\C-v ?\C-k]" 'jde-bsh-run)
+   (cons "[?\C-c ?\C-v ?\C-l]" 'jde-gen-println)
+   (cons "[?\C-c ?\C-v ?\C-n]" 'jde-help-browse-jdk-doc)
+   (cons "[?\C-c ?\C-v ?\C-p]" 'jde-save-project)
+   (cons "[?\C-c ?\C-v ?\C-q]" 'jde-wiz-update-class-list)
+   (cons "[?\C-c ?\C-v ?\C-r]" 'jde-run)
+   (cons "[?\C-c ?\C-v ?\C-s]" 'speedbar-frame-mode)
+   (cons "[?\C-c ?\C-v ?\C-t]" 'jde-jdb-menu-debug-applet)
+   (cons "[?\C-c ?\C-v ?\C-w]" 'jde-help-symbol)
+   (cons "[?\C-c ?\C-v ?\C-x]" 'jde-show-superclass-source)
+   (cons "[?\C-c ?\C-v ?\C-y]" 'jde-open-class-at-point)
+   (cons "[?\C-c ?\C-v ?\C-z]" 'jde-import-find-and-import)
+   (cons "[?\C-c ?\C-v ?e]"    'jde-wiz-extend-abstract-class)
+   (cons "[?\C-c ?\C-v ?f]"    'jde-gen-try-finally-wrapper)
+   (cons "[?\C-c ?\C-v ?i]"    'jde-wiz-implement-interface)
+   (cons "[?\C-c ?\C-v ?j]"    'jde-javadoc-autodoc-at-line)
+   (cons "[?\C-c ?\C-v ?o]"    'jde-wiz-override-method)
+   (cons "[?\C-c ?\C-v ?t]"    'jde-gen-try-catch-wrapper)
+   (cons "[?\C-c ?\C-v ?z]"    'jde-import-all)
+   (cons "[?\C-c ?\C-v ?\C-[]" 'jde-run-etrace-prev)
+   (cons "[?\C-c ?\C-v ?\C-]]" 'jde-run-etrace-next)
+   (cons "[(control c) (control v) (control ?.)]" 'jde-complete)
+   (cons "[(control c) (control v) ?.]" 'jde-complete-in-line)
+   )
+  "*Specifies key bindings for the JDE.
+The value of this variable is an association list. The car of
+each element specifies a key sequence. The cdr specifies
+an interactive command that the key sequence executes. To enter
+a key with a modifier, type C-q followed by the desired modified
+keystroke. For example, to enter C-s (Control s) as the key to be
+bound, type C-q C-s in the key field in the customization buffer.
+You can use the notation [f1], [f2], etc., to specify function keys."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "Key binding"
+		(string :tag "Key")
+		(function :tag "Command")))
+  :set '(lambda (sym val)
+	  (mapc
+	   (lambda (buf)
+	     (save-excursion
+	       (set-buffer buf)
+	       (when (boundp 'jde-mode-map)
+		 ;; Unmap existing key bindings
+		 (if (and (boundp 'jde-key-bindings)
+			  jde-key-bindings)
+		     (mapc
+		      (lambda (binding)
+			(let ((key (car binding)))
+			  (if (string-match "\\[.+]" key)
+			      (setq key (car (read-from-string key))))
+			  (local-unset-key key)))
+		      jde-key-bindings))
+		 ;; Map new key bindings.
+		 (mapc
+		  (lambda (binding)
+		    (let ((key (car binding))
+			  (fcn (cdr binding)))
+		      (if (string-match "\\[.+]" key)
+			  (setq key (car (read-from-string key))))
+		      (define-key (current-local-map) key fcn)))
+		  val))))
+	   (jde-get-java-source-buffers))
+	  (set-default sym val)))
+
+(defcustom jde-launch-beanshell-on-demand-p t
+  "If non-nil, the JDE launches the Beanshell the first time it is needed.
+Otherwise, the JDE launches the Beanshell, if it is not already running,
+whenever you open a Java source file."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-java-environment-variables '("JAVA_VERSION" "JAVA_HOME")
+  "This variable specifies the names of environment variables used to
+specify the version and location of the JDK to be used by the JDE.
+If set, the `jde-jdk' customization variable overrides the
+java enviroment variables."
+  :group 'jde-project
+  :type '(list
+	  (string :tag "Java Version")
+	  (string :tag "Java Home")))
+
+(defun jde-set-jdk-dir-type (sym val)
+  (if val
+      (let ((type
+	     (list
+	      (quote radio-button-choice)
+		  )))
+	    (loop for jdk in val do
+		  (setq
+		   type
+		   (append
+		    type
+		    (list (list (quote item) (car jdk))))))
+	    (put 'jde-jdk
+		 'custom-type
+		 (list (quote list) type))
+	    (put 'jde-jdk 'customized-value nil)
+	    (put 'jde-jdk
+		 'standard-value
+		 (list (list (quote list) (car (car val)))))
+	    (customize-set-value 'jde-jdk (list (car (car val)))))
+    (progn
+      (put 'jde-jdk 'custom-type 'symbol)
+      (put 'jde-jdk 'standard-value nil)
+      (put 'jde-jdk 'customized-value nil)
+      (customize-set-value 'jde-jdk nil)))
+  (set-default sym val))
+
+;; (makunbound 'jde-jdk-registry)
+(defcustom jde-jdk-registry nil
+  "Specifies the versions and locations of the JDKs installed on your
+system.  For each JDK to be registered, enter the version number
+\(e.g., 1.4.0) of the JDK in the Version field. Enter the path of the
+JDK's root directory (e.g., c:/jdk1.3.1 or $JAVA_HOME) in the Path
+field. Setting this variable determines the choices offered by the
+`jde-jdk' variable. You should therefore customize this variable
+first."
+  :group 'jde-project
+  :type '(repeat
+	  (cons
+	   :tag "JDK"
+	   (string :tag "Version")
+	   (string :tag "Path")))
+  :set 'jde-set-jdk-dir-type)
+
+(defcustom jde-jdk nil
+  "Specifies the version of the JDK to be used to develop the current
+project. The version must be one of the versions listed in the
+`jde-jdk-registry'. If you specify nil (the default), the JDE uses the
+JDK specified by the Java version environment variable (see
+`jde-java-enviroment-variables', if set; otherwise, the first JDK
+located on the system command path specified by te PATH environment
+variable.
+
+You must customize `jde-jdk-registry' first, then `jde-jdk'. After you
+have customized jde-jdk-registry, the customization buffer for`
+jde-jdk' presents you with a set of radio buttons, one for each
+registered JDK.  Select the button of the JDK that you want to use for
+the current project."
+  :group 'jde-project
+  :type 'symbol
+
+  (if (or (featurep 'xemacs) (< emacs-major-version 21))
+      :set
+    :set-after)
+
+  (if (or (featurep 'xemacs) (< emacs-major-version 21))
+      'custom-set-default
+    '(jde-jdk-registry)))
+
+;;;###autoload
+(defun jde-version ()
+  "Get the version of JDEE."
+  (interactive)
+  (message "JDEE %s" jde-version))
+
+(defun jde-find-jdk-in-exec-path ()
+  "Search for a JDK in `exec-path' and return the path of
+the root directory of the first JDK that is found.  Return nil if a
+JDK is not found anywhere in exec-path."
+  (let ((list exec-path)
+	(command "java")
+	file)
+    (while list
+      (setq list
+	    (if (and (setq file (expand-file-name command (car list)))
+		     (let ((suffixes executable-binary-suffixes)
+			   candidate)
+		       (while suffixes
+			 (setq candidate (concat file (car suffixes)))
+			 (if (and (file-executable-p candidate)
+				  (not (file-directory-p candidate)))
+			     (setq suffixes nil)
+			   (setq suffixes (cdr suffixes))
+			   (setq candidate nil)))
+		       (setq file candidate)))
+		nil
+	      (setq file nil)
+	      (cdr list))))
+    file))
+
+(defun jde-get-jdk-dir ()
+  "Get the root directory of the JDK currently being used by the
+JDE. The directory is the directory of the version of the JDK
+specified by `jde-jdk'. If none is specified, this function returns
+the value of the Java home environment variable (see
+`jde-java-environment-variables') or the first JDK directory on the
+system path, i.e., the directory that contains java on Unix systems or
+java.exe on Windows systems.  If neither `jde-jdk' nor the system path
+nor the Java home environment variable specify a JDK directory, this
+function displays an error message."
+  (interactive)
+
+  (if jde-jdk
+      (let* ((jdk (assoc (car jde-jdk) jde-jdk-registry))
+	     (jdk-dir (cdr jdk)))
+	(when (null jdk)
+	  (error (format
+		  "No mapping in the jde-jdk-registry found for JDK version %s"
+		  (car jde-jdk))))
+	(if (not (string= jdk-dir ""))
+	    (progn
+	      (setq jdk-dir (substitute-in-file-name jdk-dir))
+	      (if (not (file-exists-p jdk-dir))
+		  (error
+		   (format "The path specified for JDK %s does not exist: %s"
+			   jde-jdk
+			   jdk-dir)))))
+	jdk-dir)
+    (let ((jdk-dir (getenv (nth 1 jde-java-environment-variables))))
+      (if jdk-dir
+	  (progn
+	    (setq jdk-dir (substitute-in-file-name jdk-dir))
+	    (if (not (file-exists-p jdk-dir))
+		(error
+		 (format "The path specified by %s does not exist: %s"
+			 (nth 1 jde-java-environment-variables)
+			 jdk-dir))))
+	(progn
+	  (setq jdk-dir
+		(executable-find "javac"))
+	  (if jdk-dir
+	      (setq jdk-dir
+		    (expand-file-name
+		     ".."
+		     (file-name-directory jdk-dir)))
+	    (error "Cannot find the JDK directory. See `jde-jdk'."))))
+      jdk-dir)))
+
+
+(defun jde-get-jdk-prog (progname)
+   "Returns the full path of the program passed in.  By default, assume
+   it's in the bin directory under `jde-get-jdk-dir', but if not,
+   look in the environment's command path."
+   (let* ((progname-str
+	   (if (symbolp progname)
+	       (symbol-name progname) progname))
+	  (full-progname
+	   (if (eq system-type 'windows-nt)
+	       (concat progname-str ".exe")
+	     progname-str))
+	  (progpath
+	   (expand-file-name
+	    (concat
+	     (if (eq system-type 'darwin) "Home/bin/" "bin/")
+	     full-progname)
+	    (jde-get-jdk-dir))))
+     (if (file-exists-p progpath)
+       progpath
+       (executable-find full-progname))))
+
+
+(defun jde-get-tools-jar ()
+  "Gets the correct tools.jar or equivalent. Signals an
+error if it cannot find the jar."
+  (let ((tools
+	 (expand-file-name
+	  (if (eq system-type 'darwin)
+	      "Classes/classes.jar"
+	    "lib/tools.jar")
+	  (jde-get-jdk-dir))))
+    (if (file-exists-p tools)
+	tools
+      (error (concat "Cannot find JDK's tools jar file (or equivalent)."
+		     "Type M-x describe-function [RET] jde-get-jdk-dir for more info.")))))
+
+(defvar jde-java-version-cache nil
+"Cache to hold the version of Java being used.")
+
+(defun jde-java-version-via-java ()
+  "Get the version of the java vm on the
+system command path."
+  (if (not jde-java-version-cache)
+      (let ((buf (get-buffer-create "java version"))
+	    proc)
+	(save-excursion
+	  (set-buffer buf)
+	  (setq proc
+		(start-process
+		 "java version" buf "java" "-version"))
+	  (set-process-query-on-exit-flag proc nil)
+	  (accept-process-output proc 10)
+	  (goto-char (point-min))
+	  (re-search-forward "[1-9][.][1-9]" (point-max) t)
+	  (setq jde-java-version-cache (match-string 0)))
+	(kill-buffer buf)))
+  jde-java-version-cache)
+
+(defun jde-java-version ()
+  "Get the version of Java used by the JDEE."
+  (interactive)
+  (let ((java-version (if jde-jdk (car jde-jdk)
+			(getenv
+			 (nth 0 jde-java-environment-variables)))))
+    (if (not java-version)
+	(if jde-java-version-cache
+	    (setq java-version jde-java-version-cache)
+	  (if (jde-bsh-running-p)
+	      (progn
+		(setq jde-java-version-cache
+		      (jde-jeval-r "jde.util.JdeUtilities.getJavaVersion();"))
+		(setq java-version jde-java-version-cache))
+	    (setq java-version (jde-java-version-via-java)))))
+    (if (interactive-p)
+      (message java-version)
+      java-version)))
+
+(defun jde-java-major-version ()
+  "Returns an integer representing
+the major version of the JDK being used
+by the current project."
+  (let ((version (jde-java-version)))
+    (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)"
+		version)
+    (string-to-number
+     (substring
+     version
+     (match-beginning 1)
+     (match-end 1)))))
+
+(defun jde-java-minor-version ()
+  "Returns an integer representing
+the minor version of the JDK being used
+by the current project."
+  (let ((version (jde-java-version)))
+    (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)"
+		version)
+    (string-to-number
+     (substring
+     version
+     (match-beginning 2)
+     (match-end 2)))))
+
+
+;;(makunbound 'jde-jdk-doc-url)
+(defcustom jde-jdk-doc-url ""
+  "*URL of JDK documentation.
+This can point to a remote or local copy of the documentation. If the value
+of this variable is the null string, the JDE looks for the JDK documentation
+in the docs subdirectory of the directory returned by `jde-get-jdk-dir'."
+  :group 'jde-project
+  :type 'file)
+
+;;(makunbound 'jde-global-classpath)
+(defcustom jde-global-classpath nil
+  "Specify a common classpath for compile, run, and debug commands.
+Use this variable if you want to the JDE to use the same classpath for
+compiling, running,and debugging an application. Note that the value
+of this variable is a list of strings, each of which specifies a
+path. The JDE converts this list to a colon- or semicolon-separated
+list before inserting in the compiler or vm command line.
+
+The path may start with a tilde (~) or period (.) and may include
+environment variables. The JDEE replaces a ~ with your home directory.
+If `jde-resolve-relative-paths-p' is nonnil, the JDEE replaces the
+. with the path of the current project file. The JDEE replaces each
+instance of an environment variable with its value before inserting it
+into the command line.
+
+You can specify different classpaths for compiling, running and
+debugging applicaitons. Use `jde-compile-option-classpath' to specify
+the compilation classpath, `jde-run-option-classpath' to specify the
+run classpath, and/or `jde-db-option-classpath' to specify the debug
+classpath. You can use these variables together. For example, suppose
+that you need to use one classpath for compilation and other for
+running and debugging. You could do this by setting
+`jde-compile-option-classpath' to the compile classpath and
+`jde-global-classpath' to the run and debug classpath. If you set
+`jde-global-classpath', the JDE uses it to construct the classpath for
+any operation for which you do not set the operation-specific
+classpath variable (e.g., `jde-compile-option-classpath').
+
+If you do not set `jde-global-classpath', the JDE uses the operation-specific
+classpath if it is set. If neither the global nor the
+operation-specific classpath is set, the JDE does not generate a
+-classpath argument for the operation, e.g., compile or run a Java
+class. In this case, the operation uses the value of the CLASSPATH variable
+if specified."
+  :group 'jde-project
+  :type '(repeat (file :tag "Path")))
+
+(defcustom jde-quote-classpath t
+  "*Quote the classpath argument.
+Set this option on when using the bash shell with Windows 95 or NT.
+The semicolons in the classpath confuse the shell."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-expand-classpath-p t
+  "Replace each occurence of a directory named `jde-lib-directory-names'
+ in the classpath with paths to the jar and zip files in that directory."
+  :group 'jde-project
+  :type 'boolean)
+
+;; (makunbound 'jde-lib-directory-names)
+(defcustom jde-lib-directory-names (list "/lib$" "/jar$")
+  "Regular expressions that matches names of jar/zip directories for
+the current project. See `jde-expand-classpath-p' and
+`jde-expand-classpath' for more information"
+  :group 'jde-project
+  :type '(repeat (string :tag "Name")))
+
+(defcustom jde-lib-excluded-file-names nil
+   "Regular expressions that matches names of jar or zip files that should
+ be excluded when expanding a library specified by `jde-lib-directory-names'."
+   :group 'jde-project
+   :type '(repeat (string :tag "Name")))
+
+
+;; (makunbound 'jde-sourcepath)
+(defcustom jde-sourcepath nil
+  "*List of source directory paths.  The JDE uses this list to locate
+source files corresponding to class files.  When entering paths in the
+custom buffer, enter each path as a separate item in a separate edit
+field. Do NOT put more than one path in the same edit field. You'll
+only confuse JDE.  Paths may contain environment variables."
+  :group 'jde-project
+  :type '(repeat (file :tag "Path")))
+
+
+;; (makunbound 'jde-build-function)
+(defcustom jde-build-function '(jde-make)
+  "*Function that will be invoked by the `jde-build' command.
+The `jde-make' function uses a make
+program to rebuild the project. The `jde-ant-build' function
+uses the Apache Ant program to build the project. You may also
+specify a custom function to use. The custom function must
+be an interactive function that can be called by
+`call-interactively'."
+  :group 'jde-project
+  :type '(list
+	  (radio-button-choice
+	   :format "%t \n%v"
+	   :tag "Function: "
+	   :entry-format " %b %v"
+	   (const jde-make)
+	   (const jde-ant-build)
+	   (function my-custom-build-function))))
+
+;;(makunbound 'jde-debugger)
+(defcustom jde-debugger (list "jdb")
+  "Specify the debugger you want to use to debug Java programs.
+Select JDEbug, if you want to use the JDE's builtin debugger.  Select
+jdb, if you want to use the default version of jdb for the JDK used by
+the current project (see `jde-jdk'). Select old jdb, if you are using
+JDK 1.2.2 or later and want to use the the old (e.g., pre-JPDA)
+version of jdb instead of the new (JPDA-based) version of jdb."
+  :group 'jde-project
+  :type '(list
+	  (radio-button-choice
+	  (item "JDEbug")
+	  (item "jdb")
+	  (item "old jdb")))
+  :set '(lambda (sym val)
+	  (mapc
+	   (lambda (buff)
+	     (save-excursion
+	       (set-buffer buff)
+	       (if (string= (car val) "JDEbug")
+		   (progn
+		     (jde-jdb-minor-mode -1)
+		     (jde-bug-minor-mode 1))
+		 (progn
+		   (jde-jdb-minor-mode 1)
+		   (jde-bug-minor-mode -1)))))
+	   (jde-get-java-source-buffers))
+	  (set-default sym val)))
+
+(defcustom jde-devel-debug nil
+  "If true, use the JDEE Java classes in the jde/java/classes
+directory instead of the jde.jar. This variable is intended for
+use in testing the JDEE's java classes."
+  :group 'jde-project
+  :type 'boolean)
+
+(defcustom jde-enable-senator t
+  "Enable senator minor mode.
+This mode provides Java-aware buffer navigation and searching
+commands."
+  :group 'jde-project
+  :type 'boolean
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  (unless (or (not (featurep 'jde)) ;; skip initial set.
+		      jde-loading-project ;; skip when set by project loading system
+		      (and (boundp 'global-senator-minor-mode)
+			   global-senator-minor-mode))
+	    (mapc
+	     (lambda (buff)
+	       (save-excursion
+		 (set-buffer buff)
+		 (senator-minor-mode (if val 1 -1))))
+	     (jde-get-java-source-buffers)))))
+
+
+(defcustom jde-enable-abbrev-mode nil
+"*Enable expansion of abbreviations in jde-mode.
+See `jde-mode-abbreviations' for more information."
+  :group 'jde-project
+  :type 'boolean
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  (if (featurep 'jde) ;; skip initial set.
+	      (mapc
+	       (lambda (buf)
+		(with-current-buffer buf
+		  (setq abbrev-mode val)
+		  (when abbrev-mode
+		    (setq local-abbrev-table (make-abbrev-table))
+		    (jde-init-abbrev-table))))
+	       (jde-get-project-source-buffers)))))
+
+(defcustom jde-mode-abbreviations
+  (list
+   (cons "ab" "abstract")
+   (cons "bo" "boolean")
+   (cons "br" "break")
+   (cons "by" "byte")
+   (cons "byv" "byvalue")
+   (cons "cas" "cast")
+   (cons "ca" "catch")
+   (cons "ch" "char")
+   (cons "cl" "class")
+   (cons "co" "const")
+   (cons "con" "continue")
+   (cons "de" "default")
+   (cons "dou" "double")
+   (cons "el" "else")
+   (cons "ex" "extends")
+   (cons "fa" "false")
+   (cons "fi" "final")
+   (cons "fin" "finally")
+   (cons "fl" "float")
+   (cons "fo" "for")
+   (cons "fu" "future")
+   (cons "ge" "generic")
+   (cons "go" "goto")
+   (cons "impl" "implements")
+   (cons "impo" "import")
+   (cons "ins" "instanceof")
+   (cons "in" "int")
+   (cons "inte" "interface")
+   (cons "lo" "long")
+   (cons "na" "native")
+   (cons "ne" "new")
+   (cons "nu" "null")
+   (cons "pa" "package")
+   (cons "pri" "private")
+   (cons "pro" "protected")
+   (cons "pu" "public")
+   (cons "re" "return")
+   (cons "sh" "short")
+   (cons "st" "static")
+   (cons "su" "super")
+   (cons "sw" "switch")
+   (cons "sy" "synchronized")
+   (cons "th" "this")
+   (cons "thr" "throw")
+   (cons "thro" "throws")
+   (cons "tra" "transient")
+   (cons "tr" "true")
+   (cons "vo" "void")
+   (cons "vol" "volatile")
+   (cons "wh" "while")
+   )
+"*Abbreviations used for Java keywords.
+To use these abbreviations, you must enable abbrev-mode (see
+`jde-enable-abbrev-mode'). To use an abbreviation, enter the
+abbreviation followed by a white-space character. To suppress
+expansion, enter C-q white-space."
+  :group 'jde-project
+  :type '(repeat
+	  (cons :tag "jde-mode abbreviation"
+	      (string :tag "Abbreviation")
+	      (string :tag "Expansion")))
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  (if (and
+	       (featurep 'jde)
+	       jde-enable-abbrev-mode)
+	      (progn
+		(mapc
+		 (lambda (buf)
+		   (with-current-buffer buf
+		     (setq local-abbrev-table (make-abbrev-table))
+		     (jde-init-abbrev-table)))
+		 (jde-get-project-source-buffers))))))
+
+(defun jde-init-abbrev-table ()
+  "Load the abbrev table.
+Load it with a set of abbrevs that invoke an anonymous function that
+does the expansion only if point is not in a quoted string or a
+comment."
+
+  ;; Note the use of lexical-let - must have the common lisp packages
+  ;; around, since the anonymous function needs the closure provided by
+  ;; lexical-let.
+  (interactive)
+  (mapc
+   (lambda (x)
+     (lexical-let
+	 ((abbrev (car x))     ; this is the abbrev, lexically scoped
+	  (expansion (cdr x))) ; this is the expansion
+       (define-abbrev
+	 local-abbrev-table
+	 abbrev
+	 (if (featurep 'xemacs) abbrev t)
+	 (lambda ()
+	   (unless (jde-parse-comment-or-quoted-p)
+	     (delete-backward-char (length abbrev)) ; remove abbreviation and
+	     (insert expansion)))                   ; insert expansion
+	 0)))
+   jde-mode-abbreviations)
+
+  (if jde-gen-cflow-enable
+      (jde-gen-load-abbrev-templates))
+
+  (setq abbrevs-changed nil))
+
+;; The next two functions contributed by s.nicolas@videotron.ca
+(defun jde-abbrev-mode ()
+"*Toggle abbreviation mode in JDE without altering project settings.
+See `jde-mode-abbreviations' for more information."
+ (interactive)
+  (setq jde-enable-abbrev-mode (not jde-enable-abbrev-mode))
+  (setq abbrev-mode jde-enable-abbrev-mode)
+  (when jde-enable-abbrev-mode
+     ;; Define abbreviations.a
+    (jde-init-abbrev-table))
+  (if jde-enable-abbrev-mode
+      (message "abbreviation mode on")
+    (message "abbreviation mode off")))
+
+(defun jde-show-abbrevs ()
+"*Shows a popup menu containing all available expansions.
+See `jde-mode-abbreviations' for more information."
+  (interactive)
+   (let* ((expansions
+	  (mapcar
+	    (lambda(x) (cons (cdr x) (car x)))
+	      jde-mode-abbreviations))
+	 (expansion (car (imenu--mouse-menu expansions (if jde-xemacsp nil
+t) "Abbreviations"))))
+  (insert expansion)))
+
+
+(defvar jde-classpath-separator (if (member system-type '(cygwin32 cygwin))
+				    ";" path-separator)
+  "The separator to use in a classpath.
+This is usually the same as `path-separator'")
+
+
+;;;###autoload
+(defun jde-set-global-classpath (classpath)
+  "Set the value of `jde-global-classpath'.
+It specifies the -classpath argument for the Java compiler and
+interpreter."
+  (interactive
+   "sEnter classpath: ")
+  (custom-set-variables
+   '(jde-global-classpath (split-string classpath jde-classpath-separator) t)))
+
+(defun jde-show-run-options ()
+  "Show the JDE Run Options panel."
+  (interactive)
+  (customize-apropos "jde-run-options" 'groups))
+
+(defun jde-show-debug-options ()
+  "Show the JDE Debug Options panel."
+  (interactive)
+  (customize-apropos "jde-db-options" 'groups))
+
+(defun jde-show-project-options ()
+  "Show the JDE Debug Options panel."
+  (interactive)
+  (customize-apropos "jde-project" 'groups))
+
+(defun jde-show-autocode-options ()
+  "Show the JDE Autocode panel."
+  (interactive)
+  (customize-apropos "jde-gen" 'groups))
+
+(defun jde-show-wiz-options ()
+  "Show the JDE Wizards Options panel."
+  (interactive)
+  (customize-apropos "jde-wiz" 'groups))
+
+(defun jde-show-complete-options ()
+  "Show the JDE Complete Options panel."
+  (interactive)
+  (customize-apropos "jde-complete" 'groups))
+
+;;;###autoload
+(defun jde-build ()
+  "Rebuild the entire project.
+This command invokes the function defined by `jde-build-function'."
+  (interactive)
+  (call-interactively (car jde-build-function)))
+
+; (define-derived-mode
+;   jde-mode java-mode "JDE"
+;   "Major mode for developing Java applications and applets.
+;   \\{jde-mode-map}"
+;   (jde-mode-internal)
+; )
+
+;; The following is the expansion of the above macro.
+;; We include the expansion to permit automatic
+;; loading of the JDE.
+(derived-mode-init-mode-variables 'jde-mode)
+(put 'jde-mode 'derived-mode-parent 'java-mode)
+
+;;;###autoload
+(defun jde-mode ()
+  "Major mode for developing Java applications and applets.
+\\{jde-mode-map}"
+  (interactive)
+  (condition-case err
+      (progn
+	(jde-check-versions)
+	(java-mode)
+	(if (get 'java-mode 'special)
+	    (put 'jde-mode 'special t))
+	(setq major-mode 'jde-mode)
+	(setq mode-name "JDE")
+	(derived-mode-set-keymap 'jde-mode)
+	(derived-mode-set-syntax-table 'jde-mode)
+	(derived-mode-set-abbrev-table 'jde-mode)
+
+	;; Define buffer-local variables.
+	(make-local-variable 'jde-project-name)
+	(make-local-variable 'jde-run-applet-document)
+
+	(setq jde-current-project
+	      (or (jde-find-project-file default-directory)
+		  "")) ;; Avoid setting startup values twice!
+
+	(setq jde-buffer-project-file jde-current-project)
+
+	;; Load the project file for this buffer. The project file
+	;; defines JDE options for a project.
+	(if (and (not (jde-debugger-running-p)) jde-project-context-switching-enabled-p)
+	    (jde-load-project-file))
+
+	;; Enable support for automatic project switching.
+	;; This feature loads the appropriate project settings whenever
+	;; a user switches from a Java buffer belonging to one project
+	;; to a buffer belonging to another.
+	(make-local-hook 'post-command-hook) ;; necessary for XEmacs (see below)
+	(add-hook 'post-command-hook
+		  'jde-detect-java-buffer-activation
+		  nil
+		  t ;; XEmacs ignores this argument if symbol is not local.
+		  )
+
+	(unless jde-monitor-post-command-hook-timer
+	  (setq
+	   jde-monitor-post-command-hook-timer
+	   (run-with-idle-timer 1 t 'jde-monitor-post-command-hook)))
+
+	(unless (member 'jde-clean-up-after-jde kill-buffer-hook)
+	  (add-hook 'kill-buffer-hook 'jde-clean-up-after-jde))
+
+	(when jde-xemacsp
+	  (require 'jde-xemacs)
+	  (jde-insert-menu-in-xemacs-menubar))
+
+	;; Define underscore as a word constituent. This is needed
+	;; to support coding styles the begin fields with an underscore.
+	(modify-syntax-entry ?_ "w")
+
+	(when jde-enable-abbrev-mode
+	  ;; Define abbreviations.
+	  (jde-init-abbrev-table)
+	  (abbrev-mode 1))
+
+	;; Reset the key bindings in case jde-mode-keymap
+	;; was not bound at startup.
+	(custom-initialize-reset 'jde-key-bindings nil)
+
+	(make-local-variable 'mode-line-format)
+	(setq mode-line-format jde-mode-line-format)
+
+	;; When looking for a tag that has multiple matches
+	;; in the TAGS file, prefer (find first) the
+	;; occurrence in the _current_ buffer.
+	;; Contributed by Charles Rich, Mitsubishi Electric Research Laboratories,
+	;; Cambridge, MA>
+	(when (boundp 'tags-table-format-functions)
+	  (make-local-variable 'tags-table-format-functions)
+	  (add-hook 'tags-table-format-functions 'jde-etags-recognize-tags-table nil t))
+
+	(if (and
+	     (not jde-launch-beanshell-on-demand-p)
+	     (not (jde-bsh-running-p)))
+	    (bsh-launch (oref 'jde-bsh the-bsh)))
+
+	(jde-wiz-set-bsh-project)
+
+	;; Setup Semantic stuff needed by the JDEE when Semantic is ready to
+	;; parse!
+	(add-hook 'semantic-init-hooks  'jde-parse-semantic-default-setup)
+
+	;; Install debug menu.
+	(if (string= (car jde-debugger) "JDEbug")
+	    (jde-bug-minor-mode 1)
+	  (jde-jdb-minor-mode 1))
+
+	;; Install plugin menu.
+	(jde-plugin-minor-mode 1)
+
+	(when (boundp 'jde-mode-map)
+	  (let ((key (car (read-from-string "[return]"))))
+	   (if jde-electric-return-mode
+	     (define-key (current-local-map) key 'jde-electric-return))))
+
+	;; Set up indentation of Java annotations.
+	(jde-annotations-setup)
+
+
+	;; The next form must be the last executed
+	;; by jde-mode.
+	(derived-mode-run-hooks 'jde-mode))
+    (error
+     (message "%s" (error-message-string err)))))
+
+
+(defconst jde-check-versions-message
+   "JDEE requires a version of CEDET between %s and %s (found %s)")
+
+(defun jde-check-versions ()
+  "Check for correct versions of CEDET provided packages.
+Signal an error if CEDET is not installed.
+When `jde-check-version-flag' is non-nil, signal an error if the
+version of CEDET currently installed doesn't meet the requirements for
+this version of the JDEE."
+  ;; Check that CEDET is installed.
+  (or (boundp 'cedet-version)
+      (error jde-check-versions-message
+	     jde-cedet-min-version
+	     jde-cedet-max-version
+	     "none"))
+  ;; Check version requirement when requested.
+  (or (not jde-check-version-flag)
+      (jde-check-version cedet-version
+			 jde-cedet-min-version
+			 jde-cedet-max-version)
+      (error jde-check-versions-message
+	     jde-cedet-min-version
+	     jde-cedet-max-version
+	     cedet-version)))
+
+
+(defun jde-check-version (current-version min-version max-version)
+  "Return non-nil if CURRENT-VERSION >= MIN-VERSION or <= MAX-VERSION."
+  (and (or (jde-earlier-versionp current-version
+				 max-version)
+	   (string= current-version
+		    max-version))
+       (or (jde-earlier-versionp min-version
+				 current-version)
+	   (string= current-version
+		    min-version))))
+
+(defun jde-earlier-versionp (ver1 ver2)
+  "Return non-nil if VER1 is earlier than VER2"
+  (let ((ver1n (replace-in-string ver1 "beta" "zb"))
+	(ver2n (replace-in-string ver2 "beta" "zb")))
+    (setq ver1n (replace-in-string ver1n "pre" "zp"))
+    (setq ver2n (replace-in-string ver2n "pre" "zp"))
+    (if (string-match "z" ver1n)
+	(unless (string-match "z" ver2n)
+	  (setq ver2n (concat ver2n "zz")))
+      (if (string-match "z" ver2n)
+	  (setq ver1n (concat ver1n "zz"))))
+    (string< ver1n ver2n)))
+
+
+(defcustom jde-log-max 500
+  "*Maximum number of lines to keep in the JDE log buffer.
+If nil, disable logging.  If t, don't truncate the buffer."
+  :group 'jde-project
+  :type '(choice (integer :tag "Number of lines to keep")
+		 (boolean :tag "Disable/Unlimited")))
+
+(defun jde-log-msg (msg &rest args)
+  "Log message MSG to the *jde-log* buffer.
+Optional ARGS are used to `format' MSG.
+Does nothing if `jde-log-max' is nil."
+  (if jde-log-max
+      (save-match-data
+	(save-excursion
+	  (set-buffer (get-buffer-create "*jde-log*"))
+	  (goto-char (point-max))
+	  (insert (apply 'format msg args))
+	  (insert "\n")
+	  (if (integerp jde-log-max)
+	      (let ((line-cnt 0))
+		(while (search-backward "\n" nil t)
+		  (setq line-cnt (1+ line-cnt)))
+		(goto-char (point-min))
+		(while (> line-cnt jde-log-max)
+		  (delete-region (point) (search-forward "\n" nil t))
+		  (setq line-cnt (1- line-cnt)))))))))
+
+(defun jde-log-msg-t (msg &rest args)
+  "Log message MSG to the *jde-log* buffer, and return t.
+Optional ARGS are used to `format' MSG.
+Does nothing but return t if `jde-log-max' is nil."
+  (jde-log-msg msg args)
+  t)
+
+(defun jde-log-msg-nil (msg &rest args)
+  "Log message MSG to the *jde-log* buffer, and return nil.
+Optional ARGS are used to `format' MSG.
+Does nothing but return nil if `jde-log-max' is nil."
+  (jde-log-msg msg args)
+  nil)
+
+;; Make jde-mode the default mode for Java source code buffers.
+;; Prepend the jde-mode entry so that it shadows the java-mode
+;; entry already in the list.
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.java\\'" . jde-mode))
+
+(defcustom jde-menu-definition
+  (list "JDE"
+	["Compile"           jde-compile t]
+	;; ["Run App"           jde-run (not (jde-run-application-running-p))]
+	["Run App"           jde-run t]
+	["Debug App"         jde-debug t]
+	"-"
+	;;["-"                 ignore nil]
+	["Run Applet"        jde-run-menu-run-applet t]
+	["Debug Applet"      jde-debug-applet t]
+	"-"
+	["Build"             jde-build t]
+	(list "Find"
+	      ["Expression"    jde-find
+				  (and
+				   (executable-find
+				    (if (eq system-type 'windows-nt) "find.exe" "find"))
+				   (executable-find
+				    (if (eq system-type 'windows-nt) "grep.exe" "grep")))]
+	      ["Expression..."  jde-find-dlg
+				  (and
+				   (executable-find
+				    (if (eq system-type 'windows-nt) "find.exe" "find"))
+				   (executable-find
+				    (if (eq system-type 'windows-nt) "grep.exe" "grep")))]
+	       ["Symbol Definition" jde-open-class-at-point t]
+	       ["Class"  jde-show-class-source t]
+	       ["Super Class"  jde-show-superclass-source t]
+	       ["Interface"  jde-show-interface-source t]
+	      )
+	(list "Interpreter"
+	      ["Start"         jde-bsh-run t]
+	      ["Exit"          jde-bsh-exit t]
+	      "-"
+	      ["Help"          jde-help-beanshell t]
+	 )
+	(list "Documentation"
+	      ["Add"             jde-javadoc-autodoc-at-line (jde-javadoc-enable-menu-p)]
+	      ["Remove"          jde-javadoc-remdoc-at-line (jde-javadoc-enable-menu-p)]
+	      ["Check This"      jde-javadoc-checkdoc-at-line (jde-javadoc-enable-menu-p)]
+	      ["Check All"           jde-javadoc-checkdoc t]
+	      ["Generate All"        jde-javadoc-make t]
+	      ["Generate Buffer"     jde-javadoc-make-buffer t]
+	      "-"
+	      ["Javadoc Reference"     jde-javadoc-browse-tool-doc t]
+	      "-"
+	      [ "Create HTML"    jde-htmlize-code t]
+	)
+	"-"
+	(list "Code Generation"
+	      (list "Templates"
+		    ["Get/Set Pair..."  jde-gen-get-set t]
+		    ["Println..."       jde-gen-println t]
+		    (list "Listener"
+			  ["Action"          jde-gen-action-listener t]
+			  ["Change"          jde-gen-change-listener t]
+			  ["Window"          jde-gen-window-listener t]
+			  ["Mouse"           jde-gen-mouse-listener t]
+			  )
+		    ["Other..."        jde-gen-code t]
+		    )
+	      (list "Import"
+		    ["Class..."                jde-import-\find-and-import t]
+		    ["All"                     jde-import-all t]
+		    ["All Unique"              jde-import-all-unique t]
+		    "-"
+		    ["Expand Package Imports"  jde-import-expand-imports t]
+		    ["Collapse Class Imports"  jde-import-collapse-imports t]
+		    ["Delete Unneeded"         jde-import-kill-extra-imports t]
+		    ["Organize Imports"        jde-import-organize t]
+		    ["Show Unimported Classes" jde-import-all-show t]
+		    )
+	      (list "Wizards"
+		    ["Override Method"             jde-wiz-override-method t]
+		    ["Implement Interface..."      jde-wiz-implement-interface t]
+		    ["Generate Get/Set Methods"    jde-wiz-get-set-methods t]
+		    ["Generate toString Method"    jde-wiz-tostring t]
+		    ["Update Package Statement"    jde-package-update t]
+		    ["Implement Event Source..."   jde-wiz-implement-event-source t]
+		    ["Extend Abstract Class..."    jde-wiz-extend-abstract-class t]
+		    ["Delegate Methods..."         jde-wiz-delegate t]
+		    "-"
+		    ["Update Class List"   jde-wiz-update-class-list t]
+		    )
+	      (list "Modes"
+		    (vector "Abbrev"
+			    'jde-abbrev-mode
+			    (if (featurep 'xemacs) :active :enable) t
+			    :style 'toggle
+			    :selected 'jde-enable-abbrev-mode)
+		    (vector "Electric Return"
+			    'jde-electric-return-mode
+			    (if (featurep 'xemacs) :active :enable) t
+			    :style 'toggle
+			    :selected 'jde-electric-return-mode)
+	      ))
+	(list "Browse"
+	      ["Source Files"          jde-show-speedbar t]
+	      ["Class at Point"        jde-browse-class-at-point t]
+	     )
+	["Check Style"  jde-checkstyle]
+	(list "Project"
+	      (vector "Auto Switch"
+		      'jde-toggle-project-switching
+		      (if jde-xemacsp :active :enable) t
+		      :style 'toggle
+		      :selected 'jde-project-context-switching-enabled-p)
+	      (list "Options"
+		    ["General"         jde-show-project-options t]
+		    ["Compile"         jde-compile-show-options-buffer t]
+		    ["Run"             jde-show-run-options t]
+		    ["Debug"           jde-show-debug-options t]
+		    ["Goto Exception"  jde-exception-goto t]
+		    ["Autocode"        jde-show-autocode-options t]
+		    ["Javadoc"         jde-javadoc-customize t]
+		    ["Make"            jde-make-show-options t]
+		    ["Ant"             jde-ant-show-options t]
+		    ["Complete"        jde-show-complete-options t]
+		    ["Wiz"             jde-show-wiz-options t]
+		    )
+	      (list "Project File"
+		    ["Create New" jde-create-new-project t]
+		    ["Save"     jde-save-project t]
+		    ["Load"     jde-load-project-file t]
+		    ["Load All" jde-load-all-project-files t]
+		    )
+	      )
+	(list "Refactor"
+	      [ "Rename Class" jde-rename-class t]
+	      [ "Fully Qualify Class" jde-replace-fully-qualified-class-at-point t]
+	      )
+	(list "Help"
+	      ["JDEE Users Guide"      jde-show-help t]
+	      ["JDK"                   jde-help-browse-jdk-doc t]
+	      ["JDEE Key Bindings"     jde-keys t]
+	      "-"
+	      ["Class..."              jde-help-class t]
+	      ["Class Member..."       jde-help-class-member t]
+	      ["Symbol at Point"       jde-help-symbol t]
+	      "-"
+	      ["Submit problem report" jde-submit-problem-report t]
+	      "-"
+	      (concat "JDE " jde-version)
+	      )
+	)
+  "*The JDE main menu"
+  :group 'jde-project
+  :type 'sexp
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  ; Define JDE menu for FSF Emacs.
+	  (if (or (not jde-xemacsp) (featurep 'infodock))
+	      (easy-menu-define jde-menu
+				jde-mode-map
+				"Menu for JDE."
+				val))
+	  (if (and jde-xemacsp
+		   (eq major-mode 'jde-mode))
+	      (jde-insert-menu-in-xemacs-menubar))))
+
+
+(defun jde-insert-menu-in-xemacs-menubar ()
+  "Insert JDE menu in the XEmacs menu bar."
+  (if (and
+       (not (featurep 'infodock))
+       (not (memq 'infodock c-emacs-features))
+       (boundp 'current-menubar)
+       current-menubar)
+      (if (fboundp 'add-submenu)
+	  (add-submenu nil jde-menu-definition)
+	(add-menu nil "JDE" (cdr jde-menu-definition)))))
+
+
+(defcustom jde-new-buffer-menu
+  (list
+   "JDE New"
+   ["Class..."         jde-gen-class-buffer t]
+   ["Interface..."     jde-gen-interface-buffer t]
+   ["Console..."       jde-gen-console-buffer t]
+   ["Bean..."          jde-gen-bean-buffer t]
+   ["Unit Test..."     jde-junit-test-class-buffer t]
+   (list
+    "EJB"
+    ["Session Bean"    jde-ejb-session-bean-buffer t]
+    ["Entity Bean"     jde-ejb-entity-bean-buffer t])
+   (list
+    "Build file..."
+    ["Makefile"        jde-gen-makefile-buffer t]
+    ["Ant buildfile"   jde-gen-ant-buildfile-buffer t])
+   ["Other..."         jde-gen-buffer t]
+   )
+  "*The JDE New buffer menu"
+  :group 'jde-project
+  :type 'sexp
+  :set '(lambda (sym val)
+	  (set-default sym val)
+	  (if jde-xemacsp
+	      (unless (featurep 'infodock)
+		(when (fboundp 'add-submenu)
+		  (add-submenu '("File") val "Insert File...")))
+	    (let* ((menu (if (fboundp 'easy-menu-create-menu)
+			     (easy-menu-create-menu
+			      (car val) (cdr val))))
+		   (menu-name (car val)))
+	      (define-key-after menu-bar-file-menu [jde-new]
+		(cons menu-name menu)
+		  'open-file)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Classpaths                                                                 ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun jde-cygpath (path &optional direction)
+  "If `system-type' is cygwin or cygwin32, converts PATH from cygwin
+to DOS form (if DIRECTION is nil) or to cygwin form (if DIRECTION is
+nonnil). The converion requires that cygpath be in your path. If the
+`system-type' is not cygwin or cygwin32, returns PATH unchanged."
+  (interactive "sPath: ")
+  (if (member system-type '(cygwin32 cygwin))
+      (if (executable-find "cygpath")
+	  (save-excursion
+	    (let ((buf-name "*cygwin-output*")
+		  (output-type (if direction "-u" "-w")))
+	      (shell-command
+	       (concat "cygpath " output-type " -p '" path "'") buf-name)
+	      (set-buffer buf-name)
+	      (let ((output (buffer-substring (point-min) (point-max))))
+		(kill-buffer buf-name)
+		(substitute ?\/ ?\\ (remove ?\n output)))))
+	(error "Cannot find cygpath executable."))
+    path))
+
+(defvar jde-cygwin-root-cache nil
+  "Cache of converted cygwin root directory paths.")
+
+(defun jde-cygwin-path-converter-cygpath (path)
+  (interactive "sPath: ")
+  (if (string-match "^[a-zA-Z]:" path)
+      path
+    (cond
+     ((string-match "^/\\(cygdrive\\)?/\\([a-zA-Z]\\)/" path)
+      (concat
+       (substring
+	path
+	(match-beginning 2)
+	(match-end 2))
+       ":/"
+       (substring path (match-end 0))))
+     ((string-match "^/[^/]*" path)
+       (let* ((root (substring
+		    path (match-beginning 0) (match-end 0)))
+	      (rest (substring path (match-end 0)))
+	      (converted-root (cdr (assoc root jde-cygwin-root-cache))))
+	 (if (not converted-root)
+	   (progn
+	     (setq converted-root (jde-cygpath root))
+	     (if converted-root
+		 (add-to-list 'jde-cygwin-root-cache
+			      (cons root converted-root))
+	       (error "Cannot convert %s" path))))
+	 (if (string= rest "")
+	     converted-root
+	   (concat converted-root rest))))
+     (t
+      (error "Cannot convert %s" path)))))
+
+
+(defun jde-cygwin-path-converter-internal (path)
+  "Convert cygwin style PATH to a form acceptable to java vm.  Basically
+converts paths of the form: '//C/dir/file' or '/cygdrive/c/dir/file' to
+'c:/dir/file'.  This function will not modify standard unix style paths
+unless they begin with '//[a-z]/' or '/cygdrive/[a-z]/'."
+  (interactive "sPath: ")
+  (if (fboundp 'mswindows-cygwin-to-win32-path)
+      (substitute ?/ ?\\ (mswindows-cygwin-to-win32-path path))
+    (let* ((path-re "/\\(cygdrive\\)?/\\([a-zA-Z]\\)/")
+	   (subexpr 2)
+	   (index1 (* 2 subexpr))
+	   (index2 (1+ index1)))
+      (if (string-match (concat "^" path-re) path)
+	  (let ((new-path
+		 (concat (substring path
+				    (nth index1 (match-data))
+				    (nth index2 (match-data)))
+			 ":/"
+			 (substring path (match-end 0)))))
+	    (while (string-match (concat ":" path-re) new-path)
+	      (setq new-path
+		    (concat
+		     (substring new-path 0 (match-beginning 0))
+		     ";"
+		     (substring new-path
+				(nth index1 (match-data))
+				(nth index2 (match-data)))
+		     ":/"
+		     (substring new-path (match-end 0)))))
+	    (substitute ?\\ ?\/ new-path))
+	path))))
+
+(defcustom jde-cygwin-path-converter '(jde-cygwin-path-converter-internal)
+  "Function to use to convert cygwin paths to DOS paths.
+Choose jde-cygwin-path-converter-internal, jde-cygwin-path-converter-cygpath,
+or \"custom-function.\" jde-cygwin-path-converter-cygpath handles all
+cygwin-style paths, including mount points, e.g.,/bin.
+jde-cygwin-path-converter-internal does not handle mount
+paths. However, it is much faster as it does not require running a
+subprocess every time the JDE needs to convert a path. Choose
+\"custom-function\" if you want the JDE to use a function that you
+supply. Replace \"custom-function\" with the name of the function that
+you want to use."
+  :group 'jde-project
+  :type  '(list
+	   (radio-button-choice :format "%t \n%v"
+			       :tag "Converter: "
+			       :entry-format "  %b %v"
+			       (const jde-cygwin-path-converter-internal)
+			       (const jde-cygwin-path-converter-cygpath)
+			       (function custom-function))))
+
+
+(defun jde-convert-cygwin-path (path &optional separator)
+  "Convert cygwin style PATH to a form acceptable to java vm, using
+the conversion function specified by `jde-cygwin-path-converter'."
+  (interactive "sPath: ")
+  (funcall (car jde-cygwin-path-converter)
+	   (if separator
+	       (substitute ?\: (string-to-char separator) path) path)))
+
+(defcustom jde-resolve-relative-paths-p t
+  "If this variable is non-nil, the JDE converts relative paths to
+absolute paths. The JDE does this by appending the relative path to the path
+of the project file for the current source buffer, if such
+a file exists. Otherwise, the JDE appends the relative path to the path
+of the current directory."
+  :group 'jde-project
+  :type 'boolean)
+
+(defun jde-normalize-path (path &optional symbol)
+  "This function performs the following transformation on PATH:
+
+  * Replaces environment variables of the form $VAR or ${VAR} with
+    their values. Note that you must use the Unix notation for
+    environment variables on the native Windows versions of Emacs and
+    XEmacs.
+
+  * Replaces the tilde character with the value of the home directory,
+    typically specified by the HOME environment variable.
+
+  * Converts Cygwin style paths to DOS notation on Windows.
+
+  * Converts relative paths to absolute paths if
+    `jde-resolve-relative-paths-p' is non-nil.  Paths are resolved
+    according to the location of the deepest project file found, or if
+    optional SYMBOL is non-nil, paths are resolved to the location of
+    the deepest project file found that defines SYMBOL.
+
+Note: PATH can either be a path string or a symbol corresponding to a
+variable that holds a path string, in which case the optional arg
+SYMBOL is unnecessary."
+  (if (symbolp path)
+      (setq symbol path
+	    path (symbol-value symbol)))
+  (let* ((directory-sep-char ?/)
+	 (p (substitute-in-file-name path))
+	(len (length p)))
+    (if (and
+	 jde-resolve-relative-paths-p
+	 (> len 0)
+	 (eq (aref p 0) ?.))
+	(let* (prj-file-path
+	       (dir (file-name-directory (or (buffer-file-name)
+					     default-directory))))
+	  ;; find the deepest originating project for the symbol
+	  ;; based on the current directory, and resolve to that
+	  ;; project's directory
+	  (if symbol
+	      (let ((prjs (get symbol 'jde-project))
+		    (sort-fn
+		     (lambda (x1 x2)
+		       (let* ((dir1 (file-name-directory (car x1)))
+			      (dir2 (file-name-directory (car x2)))
+			      match1 match2)
+			 (if (null dir1)
+			     (null dir2)
+			   (if (null dir2)
+			       t
+			     (setq match1 (compare-strings
+					   dir1 0 (length dir1)
+					   dir 0 (length dir1)))
+			     (setq match2 (compare-strings
+					   dir2 0 (length dir2)
+					   dir 0 (length dir2))))
+			   (cond
+			    ((not (eq match1 t))
+			     (if (eq match2 t)
+				 nil
+			       (> (length dir1) (length dir2))))
+			    ((not (eq match2 t))
+			     t)
+			    ((> (length dir1) (length dir2)))))))))
+		(setq prjs (sort prjs sort-fn))
+		(setq prj-file-path (caar prjs))
+		(if (string= prj-file-path "default")
+		    ;; Case where the project file that sets symbol
+		    ;; is the user's .emacs file. Assume that the
+		    ;; user wants the relative path in the .emacs
+		    ;; file to be the default relative path for
+		    ;; projects that do not specify a
+		    ;; relative path.
+		    (setq prj-file-path
+			  (jde-find-project-file dir))))
+	    (setq prj-file-path
+		  (jde-find-project-file dir)))
+	  (if prj-file-path
+	      (setq dir (file-name-directory prj-file-path))
+	    (setq dir default-directory))
+	  (if (and (> len 1)
+		   (eq (aref p 1) ?.))
+	      ;; path actually begins with `..', so normalize to one
+	      ;; directory up
+	      (save-match-data
+		(string-match "\\.+/?" p)
+		(setq p (expand-file-name (substring p (match-end 0))
+					  (expand-file-name (concat dir "../")))))
+	    (setq p (expand-file-name p dir))))
+      ;; Do tilde expansion but not relative path expansion when
+      ;; jde-resolve-relative-paths-p is false.
+      (if (not
+	   (or
+	    (string= p ".")
+	    (string-match "[.]/" p)))
+	  (setq p (expand-file-name p))))
+    (setq p (jde-convert-cygwin-path p))
+    p))
+
+(defun jde-directory-files-recurs (dir &optional include-regexp)
+  "Get all the files in DIR, and any subdirectories of DIR, whose
+names match INCLUDE-REGEXP."
+  (let (files)
+    (loop for file in (directory-files dir) do
+	  (if (not (member file '("." "..")))
+	      (let ((file (concat dir "/" file)))
+	      (if (file-directory-p file)
+		  (setq files (append files (jde-directory-files-recurs file include-regexp)))
+		(if (or (not include-regexp)
+			(string-match include-regexp file))
+		      (setq files (append files (list file))))))))
+    files))
+
+(defun jde-expand-directory (dir include-regexp exclude-regexps symbol)
+  "Get all the files in DIR whose names match INCLUDE-REGEXP except those whose
+root names match EXCLUDE-REGEXPS. Return the files normalized against SYMBOL."
+  (mapcar
+   (lambda (included-file)
+     (jde-normalize-path included-file symbol))
+   (remove-if
+    (lambda (file-path)
+      (let ((file-name
+	      (file-name-nondirectory file-path)))
+	(catch 'match
+	    (loop for regexp in exclude-regexps do
+		  (if (string-match regexp file-name)
+		      (throw 'match t))))))
+    (jde-directory-files-recurs dir include-regexp))))
+
+
+(defun jde-expand-classpath (classpath &optional symbol)
+  "If `jde-expand-classpath-p' is nonnil, replaces paths to
+directories that match `jde-lib-directory-names' with paths to jar or
+zip files in those directories, excepting those specified by
+`jde-lib-excluded-file-names'. This function assumes that the
+existing paths are already normalized."
+  (if jde-expand-classpath-p
+      (let (paths)
+	(loop for path in classpath do
+	      (if (and
+		   (file-exists-p path)
+		   (file-directory-p path)
+		   (member-if
+		    (lambda (lib-name) (string-match lib-name path))
+		    jde-lib-directory-names))
+		  (progn
+		    (setq paths
+			  (append
+			   paths
+			   (jde-expand-directory
+			    path
+			    "\\.jar$"
+			    jde-lib-excluded-file-names
+			    symbol)))
+		    (setq paths
+			  (append
+			   paths
+			   (jde-expand-directory
+			    path
+			    "\\.zip$"
+			    jde-lib-excluded-file-names
+			    symbol))))
+		(setq paths (append paths (list path)))))
+	paths)
+    classpath))
+
+
+(defun jde-build-classpath (paths &optional symbol quote-path-p)
+  "Builds a classpath from PATHS.  PATHS is a either list of paths or
+a symbol whose value is a list of paths, in which case the optional
+arg SYMBOL is unnecessary. If QUOTE-PATH-P is nonnil, quote paths
+that contain spaces."
+  (if (symbolp paths)
+      (setq symbol paths
+	    paths (symbol-value symbol)))
+  (mapconcat
+   (lambda (path)
+     path)
+    (jde-expand-classpath
+     (mapcar
+      (lambda (path)
+	(jde-normalize-path path symbol))
+      paths)
+     symbol)
+   jde-classpath-separator))
+
+(defun jde-global-classpath ()
+  "Builds a classpath string from the path entries in
+`jde-global-classpath'."
+  (jde-build-classpath 'jde-global-classpath))
+
+
+(defun jde-build-path-arg (arg path-list &optional quote symbol)
+"Build a command-line path argument from a list of paths."
+  (let ((path (jde-build-classpath path-list symbol)))
+    (if quote
+	(setq path (concat "\"" path "\"")))
+    (setq path (concat arg " " path))))
+
+
+(defun jde-build-classpath-arg (path-list &optional quote symbol)
+"Build a classpath from a list of paths."
+ (jde-build-path-arg "-classpath" path-list quote symbol))
+
+(defun jde-root-dir-p (dir)
+  "Return nonnil if DIR is a root directory."
+  (let ((parent (expand-file-name  ".." dir)))
+    (cond
+     ((and
+       (fboundp 'ange-ftp-ftp-name)
+       (ange-ftp-ftp-name dir))
+      (ange-ftp-get-file-entry parent))
+     ((eq system-type 'windows-nt)
+      ;; If the current directory tree is on a
+      ;; virtual drive created by the subst command
+      ;;
+      ;;  (not (file-exists-p parent))
+      ;;
+      ;; fails. Hence, the following hack contributed
+      ;; by Nat Goodspeed.
+      (or
+       (string= parent "//") ; for paths like //host/d/prj/src
+       (string= parent "\\\\") ; for paths like \\host\d\prj\src
+       (string= (substring parent -3) "/..") ; for paths like d:/prj/src
+       (save-match-data
+	 (and (string-match "^[a-zA-Z]:/$" parent) t)))) ; for paths like d:/
+     ((member system-type '(cygwin32 cygwin))
+      (or (string= (file-truename dir) (file-truename "/"))
+	  (string= parent "//") ; for paths like //host/d/prj/src
+	  (string= parent "\\\\") ; for paths like \\host\d\prj\src
+	  (and (> (length parent) 3) ; for paths like d:/prj/src
+	       (string= (substring parent -3) "/.."))
+	  (not (file-exists-p (file-truename dir)))))
+     (t
+      (or (or (not (file-readable-p dir))
+	      (not (file-readable-p parent)))
+	  (and
+	   (string= (file-truename dir) "/")
+	   (string= (file-truename parent) "/")))))))
+
+(defun jde-get-global-classpath ()
+  "Return the value of `jde-global-classpath', if defined, otherwise
+the value of the CLASSPATH environment variable converted to a list,
+of normalized paths, i.e., with . and ~ characters expanded and backslashes
+replaces with slashes."
+  (if jde-global-classpath
+      jde-global-classpath
+    (let ((cp (getenv "CLASSPATH")))
+      (if (stringp cp)
+	  (mapcar
+	   (lambda (path)
+	     (let ((directory-sep-char ?/))
+		   (expand-file-name path)))
+	   (split-string cp jde-classpath-separator))))))
+
+(defvar jde-entering-java-buffer-hook
+  '(jde-reload-project-file
+    jde-which-method-update-on-entering-buffer)
+   "*Lists functions to run when entering a jde-mode source buffer from another
+jde-mode buffer. Note that these functions do not run when reentering the same
+jde-mode buffer from a non-jde-mode buffer. You should use this hook only for
+functions that need to be run when you switch from one jde-mode buffer to
+a different jde-mode buffer. Use `jde-mode-hook' if the function needs to run
+only once, when the buffer is created.")
+
+(defvar jde-current-buffer (current-buffer)
+  "*Internal JDE variable that holds the current active buffer.")
+
+(defun jde-detect-java-buffer-activation ()
+  "Detects when a user activates a buffer.
+If the activated buffer is a Java buffer, runs the
+`jde-entering-java-buffer-hook' hooks."
+  (let ((curr-buff (current-buffer)))
+    (unless (equal curr-buff jde-current-buffer)
+      (setq jde-current-buffer curr-buff)
+      (if (eq major-mode 'jde-mode)
+	  (condition-case err
+	      (run-hooks 'jde-entering-java-buffer-hook)
+	    (error
+	     (message "jde-entering-java-buffer-hook error: %s"
+		      (error-message-string err))))))))
+
+(defun jde-monitor-post-command-hook ()
+  "Checks whether `post-command-hook' includes all hooks required
+by JDEE. If not, it adds the required hooks."
+  (if (eq major-mode 'jde-mode)
+      (dolist (hook (list 'jde-detect-java-buffer-activation))
+	(when (not (member hook post-command-hook))
+	  (add-hook 'post-command-hook hook)))))
+
+(defvar jde-monitor-post-command-hook-timer nil
+"Timer that runs `jde-monitor-post-command-hook' during
+idle moments.")
+
+(defun jde-count-open-java-buffers ()
+  "Returns non-nil if any java buffers are open."
+  (count
+   ".java"
+   (buffer-list)
+   :test
+   (lambda (file-type buffer)
+     (let ((file-name (buffer-file-name buffer)))
+       (if file-name
+	   (save-match-data
+	    (string-match file-type file-name)))))))
+
+
+(defun jde-clean-up-after-jde ()
+  "Removes `jde-detect-java-buffer-activation-hook' when
+all Java source buffers have been closed."
+  (if  (eq major-mode 'jde-mode)
+      (unless  (> (jde-count-open-java-buffers) 1)
+	(remove-hook 'post-command-hook 'jde-detect-java-buffer-activation)
+	(when jde-monitor-post-command-hook-timer
+	  (cancel-timer jde-monitor-post-command-hook-timer)
+	  (setq jde-monitor-post-command-hook-timer nil))
+	(remove-hook 'kill-buffer-hook 'jde-clean-up-after-jde))))
+
+
+;; JDE help
+(defun jde-find-jde-doc-directory ()
+  "Return the path of the JDE documentation directory.
+Returns  nil if the directory cannot be found. At some
+point, XEmacs will include the JDE. Versions of XEmacs
+that include JDE will store the JDE doc in a data
+directory called jde. On all other Emacs versions, the JDE
+expects to find the documentation in a subdirectory
+named doc of the directory that contains the file
+jde.el."
+  (jde-find-jde-data-directory))
+
+;;;###autoload
+(defun jde-show-help ()
+  "Displays the JDE User's Guide in a browser."
+  (interactive)
+  (let* ((jde-dir (jde-find-jde-doc-directory))
+	 (jde-help
+	  (if jde-dir
+	      (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir))))
+    (if (and
+	 jde-help
+	 (file-exists-p jde-help))
+	(browse-url (concat "file://" (jde-convert-cygwin-path jde-help)))
+      (signal 'error '("Cannot find JDE help file.")))))
+
+
+;; Problem reporting functions contributed by
+;; Phillip Lord <plord < at > hgmp.mrc.ac.uk>.
+(defconst jde-problem-report-mail-address
+  (concat "jdee-devel" (char-to-string ?@) "lists.sourceforge.net")
+  "Send email to this address for JDEE problem reporting.")
+
+(defun jde-submit-problem-report()
+  "Submit a problem report for the JDEE."
+  (interactive)
+  (require 'reporter)
+  (and
+   (y-or-n-p "Do you want to submit a problem report on the JDEE? ")
+   (progn
+     (message "Preparing problem report...")
+     ;;prepare the basic buffer
+     (reporter-submit-bug-report
+      jde-problem-report-mail-address
+      (format "JDE version %s\nRequired packages: cedet-%s\n"
+	      jde-version cedet-version)
+      (jde-problem-report-list-all-variables)
+      nil
+      'jde-problem-report-post-hooks
+      "Please enter the details of your bug report here" )
+     (message "Preparing bug report...done"))))
+
+(defun jde-problem-report-post-hooks()
+  "Function run the reporter package done its work.
+It looks for a JDEBug buffer and inserts the contents of that, and then prompts
+for insertion of the .emacs file"
+  (save-excursion
+    (goto-char (point-max))
+    (let* ((debug-buffer (get-buffer "*JDEbug*"))
+	   (messages-buffer
+	    (get-buffer
+	     (if jde-xemacsp " *Message-Log*" "*Messages*")))
+	   (backtrace-buffer (get-buffer "*Backtrace*"))
+	   (jde-log-buffer (get-buffer "*jde-log*"))
+	   (process
+	    (let ((proc (jde-dbs-get-target-process)))
+	      (if (not proc)
+		  (let ((dead-proc-alist
+			 (oref jde-dbs-the-process-morgue proc-alist)))
+		    (if dead-proc-alist
+			(setq proc (cdr (car dead-proc-alist))))))
+	      proc))
+	   (cli-buffer (if (and process (slot-boundp process 'cli-buf))
+			   (oref process cli-buf)))
+	   (locals-buffer (if (and process (slot-boundp process 'locals-buf))
+			      (oref process locals-buf))))
+
+
+      ;;insert the contents of the debug buffer if it is there.
+      (if debug-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the *JDEBug* buffer were\n\n")
+	    (insert-buffer-substring debug-buffer)
+	    (insert "\n\n\nEnd Insert *JDEbug* buffer" ))
+	(insert "\n\n\nThere was no *JDEBug* buffer" ))
+
+      ;;insert the contents of the CLI buffer if it exists.
+      (if cli-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the CLI buffer are\n\n")
+	    (insert-buffer-substring cli-buffer)
+	    (insert "\n\n\nEnd Insert CLI buffer" ))
+	(insert "\n\n\nThere is no CLI buffer" ))
+
+
+      ;;insert the contents of the locals buffer if it exists.
+      (if locals-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the locals buffer are\n\n")
+	    (insert-buffer-substring locals-buffer)
+	    (insert "\n\n\nEnd Insert locals buffer" ))
+	(insert "\n\n\nThere is no locals buffer" ))
+
+      ;;insert the contents of the backtrace buffer if it is there.
+      (if backtrace-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the *Backtrace* buffer were\n\n")
+	    (insert-buffer-substring backtrace-buffer)
+	    (insert "\n\n\nEnd Insert *Backtrace* buffer" ))
+	(insert "\n\n\nThere was no *Backtrace* buffer" ))
+
+
+      ;;insert the contents of the messages buffer if it is there.
+      (if messages-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the *Messages* buffer were\n\n")
+	    (insert-buffer-substring messages-buffer)
+	    (insert "\n\n\nEnd Insert *Messages* buffer" ))
+	(insert "\n\n\nThere was no *Messages* buffer" ))
+
+      ;;insert the contents of the jde-log buffer if it is there.
+      (if jde-log-buffer
+	  (progn
+	    (insert "\n\n\nThe contents of the *jde-log* buffer were\n\n")
+	    (insert-buffer-substring jde-log-buffer)
+	    (insert "\n\n\nEnd Insert *jde-log* buffer" ))
+	(insert "\n\n\nThere was no *jde-log* buffer" )))
+
+    (when process-environment
+      (insert "\n\n\nProcess environment: \n\n")
+      (insert (mapconcat (lambda (var) var) process-environment "\n")))
+
+    (let* ((init-file-name (if (featurep 'xemacs) "init.el" ".emacs"))
+	   (buf (get-buffer-create
+		 (format "*Insert %s*" init-file-name)))
+	   (mail-buf (current-buffer)))
+
+      (set-buffer buf)
+
+      (widget-insert
+       (format       "You should include the entire contents of your %s file.\n"
+	       init-file-name))
+
+      (widget-insert
+       (format       "This is because often parts of the %s file that appear\n"
+	       init-file-name))
+
+      (widget-insert "not to be JDEE-related do in fact contain the cause of\n")
+      (widget-insert "reported bugs.\n\n")
+
+      (widget-insert
+       (format "If you choose not to send your %s file or the file loads many\n"
+	       init-file-name))
+
+      (widget-insert
+       "other files, please attempt to replicate the bug, using the\n")
+
+      (widget-insert
+       (format "minimal %s file suggested in the JDEE documentation, and note\n"
+	       init-file-name))
+
+      (widget-insert "that you have done this in this bug report.\n")
+      (switch-to-buffer buf)
+
+      (set-buffer mail-buf)
+      (goto-char (point-max))
+
+      (if (y-or-n-p
+	   (format "Insert your %s file into the problem report? "
+		   init-file-name))
+	  (progn
+	    (insert
+	     (format "\n\n\nThe contents of the %s file was\n\n\n"
+		     init-file-name))
+
+	    (if (featurep 'xemacs)
+		(insert-file-contents "~/.xemacs/init.el")
+	      (insert-file-contents "~/.emacs"))
+	    (goto-char (point-max))
+	    (insert
+	     (format "\n\n\n=====end inserted %s file"
+		     init-file-name)))
+	(insert
+	 (format "\n\n\nThe user choose not to insert their %s file\n"
+		 init-file-name)))
+
+      ;;clean up the prompt buffer
+      (kill-buffer buf))))
+
+(defun jde-problem-report-list-all-variables()
+  "List all variables starting with `jde' or `bsh'."
+  (let (vars)
+    (mapatoms
+     (lambda (symbol)
+       (if  (jde-symbol-p symbol)
+	 (setq vars (cons symbol vars)))))
+    vars))
+
+;; jde-describe-map is Ehud Karni's describe map with jde prepended.
+(defun jde-keymap-test (var)           ; internal function for keymap checking
+       (and (boundp var)
+	    (keymapp (symbol-value var))))
+
+(defun jde-describe-map (map)          ; display map binding
+ "Display binding for MAP which must be a quoted keymap variable"
+  (interactive
+       (let ((map (intern (completing-read "Key map: " obarray 'jde-keymap-test 1))))
+	   (list map)))
+       (let ((val (symbol-value map)))
+	   (or (keymapp val)
+	       (error "%s is not a keymap !" (symbol-name map)))
+	   (with-output-to-temp-buffer "*Help*"
+	       (princ (format "Binding for keymap %s is:\n" (symbol-name map)))
+	       (princ (substitute-command-keys "\\{val}" ))
+	       (print-help-return-message))))
+
+(defun jde-keys ()
+  "Displays JDE key bindings. Use `jde-bug-keys' to display JDEbug
+keybindings."
+  (interactive)
+  (jde-describe-map 'jde-mode-map))
+
+
+;; Contributed by John Ciolfi, jciolfi@mathworks.com.
+(defun jde-compile-file-if-necessary (file)
+  "Compile the JDE file FILE if necessary.
+This is done if FILE.el is newer than FILE.elc or if FILE.elc doesn't exist."
+  (if (string= (file-name-extension file) "el")
+      (let* ((root (file-name-sans-extension file))
+	     (elc-file (concat root ".elc")))
+	(if (and
+	     (or (not (file-exists-p elc-file))
+		(file-newer-than-file-p file  elc-file))
+	     (or (not (string= root "jde-xemacs"))
+		 (featurep 'xemacs)))
+	    (progn
+	      (message (format "Byte-compiling %s..."
+			       (file-name-nondirectory file)))
+	      (byte-compile-file file))))))
+
+;;;###autoload
+(defun jde-compile-jde ()
+  "Byte-compile all uncompiled files of jde."
+
+  ;; Be sure to have . in load-path since a number of files in jde
+  ;; depend on other files and we always want the newer one even if
+  ;; a previous version of jde exists.
+
+  (interactive)
+  (require 'jde-compat)
+  (let ((load-path (append '(".") load-path))
+	(jde-lisp-directory (expand-file-name "lisp" (jde-find-jde-data-directory))))
+    (save-excursion
+      (mapcar
+       (function jde-compile-file-if-necessary)
+       (directory-files jde-lisp-directory t)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                                            ;;
+;; Find command                                                               ;;
+;;                                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom jde-find-case-sensitive nil
+  "*Specifies whether the jde-find command performs a case-sensitive search.
+If non-nil, the search is case-sensitive; otherwise, the search ignores case."
+  :group 'jde-project
+  :type 'boolean
+)
+
+;; (makunbound 'jde-find-granularity)
+(defcustom jde-find-granularity '("Character")
+  "*Specifies the granularity of the expression search
+conducted by `jde-find': Character (expression starting
+on any character), Word (match words only), Line
+(match lines only)."
+  :group 'jde-project
+  :type  '(list
+	   (radio-button-choice
+	    :format "%t \n%v"
+	    :tag "Search granularity:"
+	    (item "Character")
+	    (item "Word")
+	    (item "Line"))))
+
+
+(defcustom jde-find-file-regexp '("*.java")
+  "*Specifies the regular expression that the jde-find command uses
+to select files to be searched. You can use any regular expression
+supported by the -name option of the GNU find command."
+  :group 'jde-project
+  :type '(repeat (string :tag "Find regexp"))
+)
+
+(defclass jde-find-dialog (efc-dialog)
+  ((expr-field     :initarg :expr-field
+		   :documentation "Edit field for expression to find.")
+   (expression     :initarg :expression
+		   :type string
+		   :initform ""
+		   :documentation "Regular expression to find.")
+   (dir-fields     :initarg :dir-fields
+		   :documentation "List of directory path fields.")
+   (dirs           :initarg :dirs
+		   :type list
+		   :documentation "Directories to search recursively.")
+   (file-fields    :initarg :file-fields
+		   :documentation "Regular expression fields for files to search.")
+   (files          :initarg :files
+		   :type list
+		   :initform ("*.java")
+		   :documentation "Files to search.")
+   (ignore-case-cb :initarg :ignore-case
+		   :documentation "Ignore case check box.")
+   (ignore-case-p  :initarg :ignore-case-p
+		   :type boolean
+		   :initform t
+		   :documentation "If true, ignore case when searching.")
+   (grain-rbs      :initarg :grain-rbs
+		   :documentation "Granularity radio buttons.")
+   (grain          :initarg :grain
+		   :type string
+		   :initform "Character"
+		   :documentation "Search granularity: Character, Word, Line")
+   (ok             :initarg :ok
+		   :type boolean
+		   :initform nil
+		   :documentation "True if user clicked the OK button.")
+   (the-dialog     :type (or null jde-find-dialog)
+		   :allocation :class
+		   :initform nil
+		   :documentation
+		   "The only instance of the find expression dialog buffer."))
+  "Dialog displayed by `jde-find' command.")
+
+(defmethod initialize-instance ((this jde-find-dialog) &rest fields)
+  "Find options dialog constructor."
+  (oset this title "Find Dialog")
+  (call-next-method))
+
+(defmethod efc-dialog-create ((this jde-find-dialog))
+
+  (widget-insert "Find Expression Options\n\n")
+
+  (oset this expr-field
+	(widget-create
+	 (list
+	  'text
+	  :tab-order 1
+	  :format "%t %v"
+	  :tag "Expression:"
+	  :value (oref this expression))))
+
+  (widget-insert "\n")
+
+  (oset this dir-fields
+	(widget-create
+	 (list
+	  'repeat
+	  :tag "Directories to search recursively"
+	  :value (if (slot-boundp this 'dirs)
+		     (oref this dirs)
+		   (mapcar
+		    (lambda (p)
+		      (jde-normalize-path p 'jde-sourcepath))
+		    jde-sourcepath))
+	  (list 'file :tag "Path"))))
+  (widget-insert "\n")
+
+  (oset this file-fields
+	(widget-create
+	 (list
+	  'repeat
+	  :tag "File types to search"
+	  :value (oref this files)
+	  (list 'file :tag "File regexp"))))
+
+  (widget-insert "\n")
+
+  (oset this ignore-case-cb
+	(widget-create
+	 (list 'checkbox
+	       :format "%[%v%] %t"
+	       :tag "Ignore case"
+	       :value (oref this ignore-case-p)
+	       )))
+
+  (widget-insert "\n\n")
+
+  (oset this grain-rbs
+	(widget-create
+	 (list
+	  'radio-button-choice
+	  :format "%t\n%v"
+	  :tag "Search granularity:"
+	  :value (oref this grain)
+	  :args (list
+		 (list 'item "Character")
+		 (list 'item "Word")
+		 (list 'item "Line")))))
+
+  (widget-insert "\n"))
+
+
+(defmethod efc-dialog-show ((this jde-find-dialog))
+  "Shows the options dialog buffer. After showing the dialog buffer,
+this method invokes recursive-edit to emulate the behavior of a modal
+dialog. This suspends the current command until the user has selected
+an option or canceled the dialog. See `efc-dialog-ok' and
+`efc-dialog-cancel' for more information."
+  (call-next-method)
+  (recursive-edit))
+
+
+(defmethod efc-dialog-ok ((this jde-find-dialog))
+  "Invoked when the user selects the OK button on the options
+dialog. Sets the :dirs field of THIS to the search paths chosen by the
+user, kills the dialog buffer, and exits recursive-edit mode."
+
+  (oset this
+	expression
+	(widget-value (oref this expr-field)))
+
+  (oset this
+	dirs
+	(widget-value (oref this dir-fields)))
+
+  (oset this
+	files
+	(widget-value (oref this file-fields)))
+
+  (oset this
+	ignore-case-p
+	(widget-value (oref this ignore-case-cb)))
+
+  (oset this
+	grain
+	(widget-value (oref this grain-rbs)))
+
+  (oset this ok t)
+
+  (delete-window)
+  (kill-buffer (oref this buf))
+  (pop-to-buffer (oref this initbuf))
+  (set-buffer (oref this initbuf))
+
+  (exit-recursive-edit))
+
+(defmethod efc-dialog-cancel ((this jde-find-dialog))
+  "Invoked when the user clicks the dialog's Cancel button.  Invokes
+the default cancel method, sets the :selection field of THIS to nil,
+and then exits recursive edit mode."
+  (call-next-method)
+  (oset this ok nil)
+  (exit-recursive-edit))
+
+
+
+(defvar jde-find-root-history nil
+  "History of directory trees searched in this session.")
+
+(defvar jde-find-regexp-history nil
+  "History of search expressions used in this session.")
+
+(defun jde-find-grep-internal (regexp files &optional dirs no-case grain)
+  "Find a regular expression REGEXP in files of type FILES in
+ DIRS, where DIRS is a string of space-separated paths of
+directories to search recursively. If NO-CASE is nonnil, ignore
+case. GRAIN is a string that indicates the granularity of the search,
+i.e., match any \"Character\" string, a \"Word\" only, or a \"Line\"
+only."
+  (if (not (executable-find
+	    ;; Hack required by faulty XEmacs implementation of executable-find.
+	    (if (eq system-type 'windows-nt) "grep.exe" "grep")))
+      (error "This command requires the Unix grep utility."))
+  (if (not (executable-find
+	    (if (eq system-type 'windows-nt) "find.exe" "find")))
+      (error (list "This command requires the Unix find utility.")))
+  (let* ((directories-option
+	  (if dirs dirs "."))
+	 (case-sensitive-option
+	  (if no-case  "-i" ""))
+	 (granularity-option
+	  (cond
+	   ((and grain (string= grain "Word"))
+	    "-w")
+	   ((and grain (string= grain "Line"))
+	    "-x")
+	   (t
+	    " ")))
+	  (file-regexp-option
+	   (mapconcat
+	    (lambda (x)
+	      (format "-name \"%s\"" x))
+	    files
+	    " -or "))
+	  (cmd
+	   (format "find %s %s -type f | xargs grep %s %s -n \"%s\" /dev/null"
+		  directories-option
+		  file-regexp-option
+		  case-sensitive-option
+		  granularity-option
+		  regexp)))
+    (grep cmd)))
+
+
+(defun jde-find (&optional regexp)
+  "Find a regular expression REGEXP in all of the files in the
+current JDE project. Tests each of the following path variables
+`jde-sourcepath', `jde-compile-option-sourcepath',
+`jde-compile-option-classpath', or `jde-global-classpath' and uses the
+directories specified by the first path variable that has a nonnil
+value. The `jde-find-case-sensitive' variable controls case
+sensitivity, `jde-find-granularity' determines the granularity of the
+search (character, word, line), and `jde-find-file-regexp' determines
+the type of files to be searched. Use `jde-find-dlg' if you want to
+set case sensitivity, granularity, or file types interactively. This
+command requires that the Unix grep and find utilities be installed on
+your system in the Emacs command path. The Cygwin package contains
+Windows versions of both utilities."
+  (interactive)
+  (let ((regexp
+	 (if (and (boundp 'regexp) regexp)
+	     regexp
+	   (read-from-minibuffer
+	    "Search for regexp: "
+	    (if (boundp 'jde-find-regexp-history)
+		(car jde-find-regexp-history)
+	      nil)
+	    nil nil 'jde-find-regexp-history)))
+	(search-path
+	 (read-from-minibuffer
+	   "Search directories: "
+	   (cons
+	    (mapconcat
+	     (lambda (x) x)
+	     (cond
+	      (jde-sourcepath
+	       (mapcar
+		(lambda (path)
+		  (jde-normalize-path path 'jde-sourcepath))
+		jde-sourcepath))
+	      (jde-compile-option-sourcepath
+	       (mapcar
+		(lambda (path)
+		  (jde-normalize-path path 'jde-compile-option-sourcepath))
+		jde-compile-option-sourcepath))
+	      (jde-compile-option-classpath
+	       (mapcar
+		(lambda (path)
+		  (jde-normalize-path path 'jde-compile-option-classpath))
+		jde-compile-option-classpath))
+	      (jde-global-classpath
+	       (mapcar
+		(lambda (path)
+		  (jde-normalize-path path 'jde-global-classpath))
+		jde-global-classpath))
+	      (t
+	       (list default-directory)))
+	     " ")
+	    0)
+	   nil nil 'jde-find-root-history)))
+    (jde-find-grep-internal
+     regexp
+     jde-find-file-regexp
+     search-path
+     (not jde-find-case-sensitive)
+     (car jde-find-granularity))))
+
+(defun jde-find-dlg ()
+  "Displays a dialog buffer that allows you to set all search options
+interactively. Pressing the dialog's OK button initiates the
+search. Use `jde-find' if you need to set only the expression to be
+found and the directories to be searched and prefer using the
+minibuffer."
+  (interactive)
+  (let ((dialog
+	 (progn
+	   (if (not (oref 'jde-find-dialog the-dialog))
+	       (oset-default 'jde-find-dialog the-dialog (jde-find-dialog "find dialog")))
+	   (oref 'jde-find-dialog the-dialog))))
+    (efc-dialog-show dialog)
+    (when (oref dialog ok)
+      (jde-find-grep-internal
+       (oref dialog expression)
+       (oref dialog files)
+       (mapconcat
+	'jde-normalize-path
+	(oref dialog dirs)
+	" ")
+       (oref dialog ignore-case-p)
+       (oref dialog grain)))))
+
+(defun jde-create-prj-values-str ()
+  "Create Java expression that updates the JDEE's class list
+to include all the classes on `jde-global-classpath', if
+defined, otherwise the classpath specified by the CLASSPATH
+environment variable."
+  (let* ((directory-sep-char ?/)  ;; Override NT/XEmacs setting
+	 (classpath
+	      (jde-build-path-arg nil (jde-get-global-classpath) t)))
+    (format "jde.util.JdeUtilities.setProjectValues(\"%s\", %s);"
+	    jde-current-project
+	    classpath)))
+
+(defun jde-show-speedbar ()
+  "Show the speedbar after first checking whether the correct
+version of speedar is installed."
+  (interactive)
+  (require 'speedbar)
+  (speedbar-frame-mode))
+
+(defun jde-autoload-update ()
+  "Updates autoload definitions in jde-autoload.el."
+  (interactive)
+  (let* ((default-directory (expand-file-name "lisp" (jde-find-jde-data-directory)))
+	 (generated-autoload-file (expand-file-name "jde-autoload.el" default-directory)))
+    (mapc 'update-file-autoloads (directory-files "." nil "\\.el$"))
+    (save-excursion
+      (set-buffer  "jde-autoload.el")
+      (save-buffer))
+    (kill-buffer "jde-autoload.el")))
+
+
+(defun jde-browse-class-at-point ()
+  "Displays the class of the object at point in the BeanShell Class
+Browser. Point can be in a variable name, class name, method name, or field name).
+This command has the  same requirements to work as the field/method-completion
+feature in JDE (see `jde-complete-at-point')."
+  (interactive)
+  (if (jde-open-functions-exist)
+      (let* ((thing-of-interest (thing-at-point 'symbol))
+	     (pair (save-excursion (end-of-thing 'symbol)
+				   (jde-parse-java-variable-at-point)))
+	     (class-to-open (jde-open-get-class-to-open
+			     pair thing-of-interest)))
+	(if (and class-to-open (stringp class-to-open))
+	    (progn
+	      (bsh-eval
+	       (oref 'jde-bsh the-bsh)
+	       (concat "exploreClass(\"" class-to-open "\");")))
+	  (error "Can not parse the thing at point!")))
+    (message "You need JDE >= 2.2.6 and Senator for using this feature!")))
+
+(defun jde-assert-mode (&optional no-raise-p)
+  "Maybe raise an error if the current buffer isn't a JDEE mode buffer.
+NO-RAISE-P, if non-`nil', don't raise an error if this insn't a JDEE mode
+buffer, otherwise, return whether or not it is a legitimate buffer."
+  (if (and (not no-raise-p) (not (eq major-mode 'jde-mode)))
+      (error "Not visiting a Java source file.")
+    (eq major-mode 'jde-mode)))
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (defun jde-self-test ()
+    "Runs jde self tests."
+    (interactive)
+    (require 'jde-junit)
+    (jde-junit-self-test)
+    (jde-dbs-self-test)))
+
+
+;; This must come after all JDEE customization variables have been
+;; defined.
+(jde-custom-adjust-groups)
+
+(provide 'jde)
+
+;; End of jde.el
diff --git a/site/jdee/lisp/jde.elc b/site/jdee/lisp/jde.elc
new file mode 100644
index 0000000..f6f8814
Binary files /dev/null and b/site/jdee/lisp/jde.elc differ
diff --git a/site/jdee/lisp/jtags b/site/jdee/lisp/jtags
new file mode 100644
index 0000000..d54cb22
--- /dev/null
+++ b/site/jdee/lisp/jtags
@@ -0,0 +1,215 @@
+#! /bin/sh
+#
+# $Id: jtags,v 1.12.2.1 2006/03/05 04:20:23 paulk Exp $
+#
+# Usage:     jtags [-h | srcdir]
+#
+# Abstract:  This Bourne shell script produces an Emacs
+#            tags file for Java source code. The tags file
+#            contains tags for classes, interfaces, constructors,
+#            methods, and variables.
+#
+# Options:   -h  Print usage.
+#
+#            -srcdir  Path of top-level directory containing 
+#                     Java source(*.java) files to be tagged.
+#                     If omitted, this script tags files in
+#                     the working directory and its subdirectories.
+#
+# By:        Paul Kinnucan 
+#            The MathWorks, Inc.
+#	     paulk@mathworks.com
+#
+# Thanks:    David Lim <david@ndc.com>
+#            Michael Mirman <mmirman@mathworks.com>
+#            Kent S. Gordon" <kgor@inetspace.com>
+#
+# Set this to the path of the etags executable if it is
+# not in the shell path.
+etags_dir=""
+
+# Print help.
+if [ "$1" = "-h" ] || [ "$1" = "-help" ] ||
+   [ "$1" = "-usage" ]; then
+    echo ""
+    echo "usage: jtags [-h | srcdir]"
+    echo ""
+    echo "srcdir   Path of the Java source directory."
+    echo ""
+    echo "This command tags all public classes, interfaces,"
+    echo "methods, and variables in the specified Java source"
+    echo "hierarchy. If you do not specify a source directory," 
+    echo "jtags searches the current directory and its"
+    echo "subdirectories."
+    echo ""
+    exit 1
+fi
+
+# If not the help option, assume first (should be only) parameter
+# is the source path. If no parameters, default to the working
+# directory.
+java_dir=${1-.}
+
+# Ensure that Java source directory exists.
+if [ ! -d $java_dir ]; then
+    echo "Java source directory $java_dir not found."
+    exit 1
+fi
+
+capital='A-Z'
+letter='a-zA-Z_.'
+digit='0-9'
+ws='[ \t]'
+
+primitive_type1='\<\(b\(oolean\|yte\)\|char\|double\|float\|int'
+primitive_type2='\|long\|short\|void\)\>'
+primitive_type="$primitive_type1$primitive_type2"
+primitive_type_count=2
+
+primitive_type3='\|long\|short\)\>'
+primitive_type_no_void="$primitive_type1$primitive_type3"
+primitive_type_no_void_count=2
+
+identifier="\<\([$letter][$letter$digit]*\)\>"
+identifier_count=1
+
+class_type="\<\([$capital][a-zA-Z_$digit\.]*\)\>"
+class_type_count=1
+
+modifier1='\<\(abstract\|const\|final\|native\|'
+modifier2='p\(r\(ivate\|otected\)\|ublic\)\|'
+modifier3='s\(tatic\|ynchronized\)\|transient\|volatile\)\>'
+modifier="$modifier1$modifier2$modifier3"
+modifier_count=4
+
+# Class patterns
+class1="/^$ws*\<\(class\|interface\)\>$ws*$identifier/\2/"
+class2="/^[^.*\/]*\($modifier$ws*\)*\<\(class\|interface\)\>$ws*$identifier/\7/"
+
+# Constructor pattern
+constructor="/^$ws*\($modifier$ws*\)*$class_type$ws*(/\6/"
+
+# Pattern for methods that return primitive types, e.g.,
+#
+#   int[] foo()
+#
+method1="/^[^.*\/]*$primitive_type$ws*\(\[$ws*\]$ws*\)*$identifier$ws*(/\4/"
+
+# Pattern for methods that return class types, e.g.,
+#
+#   Foo[] foo()
+#
+method2="/^[^.*\/]*$class_type$ws*\(\[$ws*\]$ws*\)*$identifier$ws*(/\3/"
+
+# Pattern for matching primitive variable declarations.
+var1a=".*$primitive_type_no_void$ws*\(\[$ws*\]$ws*\)*$identifier"
+var1b="$ws*\(=\|;\)"
+var1="/$var1a$var1b/\4/"
+
+# Pattern for matching user-defined variable declarations.
+var2a=".*$class_type$ws*\(\[$ws*\]$ws*\)*$identifier"
+var2b="$ws*\(=\|;\)"
+var2="/$var2a$var2b/\3/"
+
+# Delete the old TAGS file.
+# Note: the old file must be deleted because we have to run
+# etags in append mode. If we don't remove the old file, 
+# etags will append everything to the old file.
+
+if [ -f ${java_dir}/TAGS ]; then
+    rm ${java_dir}/TAGS
+    echo "Removed old TAGS file."
+fi
+
+# Use find to recurse through the source hierarchy, 
+# finding every java source file.
+# Use xargs to apply etags to the source files.
+# Note that xargs may invoke etags multiple
+# times, depending on how many files it can batch
+# per invocation. That is why we run etags in
+# append (-a) mode.
+
+echo "Tagging everything"
+find $java_dir \( -name RCS -prune \) -o \( -name CVS -prune \) -o \( -name '*.java' -print \) | xargs  \
+"${etags_dir}etags"  -l none -a -o ${java_dir}/TAGS  \
+"--regex=$class1" "--regex=$class2"  "--regex=$constructor"  \
+"--regex=$method1" "--regex=$method2" \
+"--regex=$var1" "--regex=$var2"
+
+
+# History:
+#
+# $Log: jtags,v $
+# Revision 1.12.2.1  2006/03/05 04:20:23  paulk
+# Revert to tagging everthing in one invocation of the find command. Thanks to Jon Schewe <jon.schewe@honeywell.com>.
+#
+# Revision 1.12  2002/09/16 04:53:11  paulk
+# Quote path of etags executable to permit inclusion of spaces on Windows. Thanks to Jens Barnow.
+#
+# Revision 1.11  2001/01/06 05:29:58  paulk
+# Add "\." below to the definition of class_type so
+# that methods whose return type included a period (e.g, Foo.Bar)
+# were tagged:
+#
+#   class_type="\<\([$capital][a-zA-Z_$digit\.]*\)\>"
+#
+# Thanks to Charles Rich <rich@merl.com>
+#
+# Revision 1.10  2000/12/23 04:29:57  paulk
+# (1) Added "-l none" to the etags arguments (all four calls) to
+# eliminate the additional spurious tags that were coming from etags'
+# default java parsing:
+#
+#     ${etags_dir}etags -l none -a -o ${java_dir}/TAGS \
+#
+# (2) Added "\/" to the prohibited characters at the start of class2,
+# method1 and method2 to prevent comment lines like
+#
+# // this is a nice interface for catching mice
+#
+# getting tagged:
+#
+#     class2="/^[^.*\/]*\($modifier$ws*\)*\<\(class\|interface\)\>$ws*$identifier/\7/"
+#
+# Thanks to Charles Rich <rich@merl.com>  for these improvements.
+#
+# Revision 1.9  1999/08/19 10:19:51  paulk
+# Added prune clause for RCS.
+#
+# Revision 1.8  1998/02/19 04:08:24  kinnucan
+# More edits to the comments.
+#
+# Revision 1.7  1998/02/19 03:45:03  kinnucan
+# Cleaned up the comments.
+#
+# Revision 1.6  1998/02/19 03:42:05  kinnucan
+# "Kent S. Gordon" <kgor@inetspace.com> contributed the following
+# improvements
+#
+#  - Change some .* expressions to [^.*] to prevent matches
+#    in source file comments and functions.
+#
+#  - Removed . from class_type since declarations should never
+#    be for another package.
+#
+# Thanks Kent.
+#
+# Revision 1.5  1997/12/03 03:31:29  kinnucan
+# Divided tagging process into three passes
+# through the source hierarchy to avoid overflowing
+# the xargs bugger.
+#
+# Revision 1.4  1997/10/06 04:48:58  kinnucan
+# Replaced existing regular expressions with a new set
+# based on those contained in andersl-java-font-lock.el
+#
+# Revision 1.3  1997/08/26 09:10:44  kinnucan
+# Added revision number.
+#
+# Revision 1.2  1997/08/26 09:02:42  kinnucan
+# 1. Exclude RCS directories from tags search.
+# 2. Added regular expression for abstract classes.
+#
+#
+
+# End of jtags script.
diff --git a/site/jdee/lisp/jtags.csh b/site/jdee/lisp/jtags.csh
new file mode 100644
index 0000000..f158090
--- /dev/null
+++ b/site/jdee/lisp/jtags.csh
@@ -0,0 +1,224 @@
+#! /bin/csh
+#
+# $Id: jtags.csh,v 1.7 2002/09/16 04:55:27 paulk Exp $
+#
+# Usage:     jtags [-h | srcdir]
+#
+# Abstract:  This C shell script produces an Emacs
+#            tags file for Java source code. The tags file
+#            contains tags for classes, interfaces,
+#            constructors, methods, and variables.
+#
+# Options:   -h  Print usage.
+#
+#            -srcdir  Path of top-level directory containing 
+#                     Java source(*.java) files to be tagged.
+#                     If omitted, this script tags files in
+#                     the working directory and its subdirectories.
+#
+# By:        Paul Kinnucan 
+#            The MathWorks, Inc.
+#	     paulk@mathworks.com
+#
+# Thanks:    David Lim <david@ndc.com>
+#            Michael Mirman <mmirman@mathworks.com>
+#            Kent S. Gordon" <kgor@inetspace.com>
+#
+
+
+set etags_dir = ""
+set java_dir = .
+
+# Process command line parameters.
+foreach arg ($*)
+    switch ($arg) 
+	case -h:
+	case -help:
+        case -usage:
+	    set help = 1
+	    breaksw
+	case -e*:
+	    set etags_dir = `expr substr $arg 3 200`
+	    breaksw
+	case -j*:
+	    set java_dir = `expr substr $arg 3 200`
+	    breaksw
+	default:
+	    set invalid_arg = 1
+	    breaksw
+    endsw
+end
+
+# Print help.
+if ( $1 == "-h" || $1 == "-help" || $1 == "-usage" ) then
+    echo ""
+    echo "usage: jtags [-h | srcdir]"
+    echo ""
+    echo "srcdir   Path of the Java source directory."
+    echo ""
+    echo "This command tags all public classes, interfaces,"
+    echo "methods, and variables in the specified Java source"
+    echo "hierarchy. If you do not specify a source directory," 
+    echo "jtags searches the current directory and its"
+    echo "subdirectories."
+    echo ""
+    exit 1
+endif
+
+# Ensure that etags directory exists.
+if ( $etags_dir != "" ) then
+    if (! -d $etags_dir ) then
+	echo "etags directory $etags_dir not found."
+	exit 1
+    endif
+endif
+
+# If not the help option, assume parameter is the source path.
+if ( $1 == "" ) then
+    set java_dir = "."
+else
+    set java_dir = $1
+endif
+
+# Ensure that Java source directory exists.
+if (! -e $java_dir ) then
+    echo "Java source directory $java_dir not found."
+    exit 1
+endif
+
+set capital = 'A-Z'
+set letter = 'a-zA-Z_.'
+set digit = '0-9'
+set ws = '[ \t]'
+
+set primitive_type1 = '\<\(b\(oolean\|yte\)\|char\|double\|float\|int'
+set primitive_type2 = '\|long\|short\|void\)\>'
+set primitive_type = "$primitive_type1$primitive_type2"
+set primitive_type_count = 2
+
+set primitive_type3 = '\|long\|short\)\>'
+set primitive_type_no_void = "$primitive_type1$primitive_type3"
+set primitive_type_no_void_count = 2
+
+set identifier = "\<\([$letter][$letter$digit]*\)\>"
+set identifier_count = 1
+
+set class_type = "\<\([$capital][a-zA-Z_$digit\.]*\)\>"
+set class_type_count = 1
+
+set modifier1 = '\<\(abstract\|const\|final\|native\|'
+set modifier2 = 'p\(r\(ivate\|otected\)\|ublic\)\|'
+set modifier3 = 's\(tatic\|ynchronized\)\|transient\|volatile\)\>'
+set modifier = "$modifier1$modifier2$modifier3"
+set modifier_count = 4
+
+# Class patterns
+set class1 = "/^$ws*\<\(class\|interface\)\>$ws*$identifier/\2/"
+set class2 = "/^[^.*\/]*\($modifier$ws*\)*\<\(class\|interface\)\>$ws*$identifier/\7/"
+
+# Constructor pattern
+set constructor = "/^$ws*\($modifier$ws*\)*$class_type$ws*(/\6/"
+
+# Pattern for methods that return primitive types, e.g.,
+#
+#   int[] foo()
+#
+set method1 = "/^[^.*\/]*$primitive_type$ws*\(\[$ws*\]$ws*\)*$identifier$ws*(/\4/"
+
+# Pattern for methods that return class types, e.g.,
+#
+#   Foo[] foo()
+#
+set method2 = "/^[^.*\/]*$class_type$ws*\(\[$ws*\]$ws*\)*$identifier$ws*(/\3/"
+
+# Pattern for matching primitive variable declarations.
+set var1a = ".*$primitive_type_no_void$ws*\(\[$ws*\]$ws*\)*$identifier"
+set var1b = "$ws*\(=\|;\)"
+set var1 = "/$var1a$var1b/\4/"
+
+# Pattern for matching user-defined variable declarations.
+set var2a = ".*$class_type$ws*\(\[$ws*\]$ws*\)*$identifier"
+set var2b = "$ws*\(=\|;\)"
+set var2 = "/$var2a$var2b/\3/"
+  
+# Delete the old TAGS file.
+# Note: the old file must be deleted because we have to run
+# etags in append mode. If we don't remove the old file, 
+# etags will append everything to the old file.
+
+if ( -e $java_dir/TAGS ) then
+    rm $java_dir/TAGS
+    echo "Removed old TAGS file."
+endif
+
+# Use find to recurse through the source hierarchy, 
+# finding every java source file.
+# Use xargs to apply etags to the source files.
+# Note that xargs may invoke etags multiple
+# times, depending on how many files it can batch
+# per invocation. That is why we run etags in
+# append (-a) mode.
+
+echo "Tagging classes and constructors"
+find $java_dir \( -name RCS -prune \) -o \( -name CVS -prune \) -o \( -name '*.java' -print \) | xargs  \
+"${etags_dir}etags"  -l none -a -o ${java_dir}/TAGS  \
+"--regex=$class1" "--regex=$class2"  "--regex=$constructor"  
+
+echo "Tagging methods"
+find $java_dir \( -name RCS -prune \) -o \( -name CVS -prune \) -o \( -name '*.java' -print \) | xargs  \
+"${etags_dir}etags"  -l none -a -o ${java_dir}/TAGS  \
+"--regex=$method1" "--regex=$method2"
+
+echo "Tagging variables"
+find $java_dir \( -name RCS -prune \) -o \( -name CVS -prune \) -o \( -name '*.java' -print \) | xargs  \
+"${etags_dir}etags"  -l none -a -o ${java_dir}/TAGS  \
+"--regex=$var1" "--regex=$var2"
+
+# History:
+#
+# $Log: jtags.csh,v $
+# Revision 1.7  2002/09/16 04:55:27  paulk
+# Quote path of etags executable to permit inclusion of spaces on Windows. Thanks to Jens Barnow.
+#
+# Revision 1.6  2001/01/06 05:27:49  paulk
+# Add "\." below to the definition of class_type so
+# that methods whose return type included a period (e.g, Foo.Bar)
+# were tagged:
+#
+#   class_type="\<\([$capital][a-zA-Z_$digit\.]*\)\>"
+#
+# Thanks to Charles Rich <rich@merl.com>
+#
+# Revision 1.5  2000/12/23 04:28:15  paulk
+# (1) Added "-l none" to the etags arguments (all four calls) to
+# eliminate the additional spurious tags that were coming from etags'
+# default java parsing:
+#
+#     ${etags_dir}etags -l none -a -o ${java_dir}/TAGS \
+#
+# (2) Added "\/" to the prohibited characters at the start of class2,
+# method1 and method2 to prevent comment lines like
+#
+# // this is a nice interface for catching mice
+#
+# getting tagged:
+#
+#     class2="/^[^.*\/]*\($modifier$ws*\)*\<\(class\|interface\)\>$ws*$identifier/\7/"
+#
+# Thanks to Charles Rich <rich@merl.com>  for these improvements.
+#
+# Revision 1.4  1999/08/19 10:25:34  paulk
+# Added prune clause for CVS directories.
+#
+# Revision 1.3  1998/02/19 04:44:48  kinnucan
+# Updated to Bourne version.
+#
+# Revision 1.2  1997/08/26 09:08:21  kinnucan
+# 1. Exclude RCS (version control) directories from tags search.
+# 2. Added pattern for recognizing abstract classes.
+#
+#
+
+# End of jtags.csh script
+
+ 
diff --git a/site/jdee/lisp/regress.el b/site/jdee/lisp/regress.el
new file mode 100644
index 0000000..a89cc77
--- /dev/null
+++ b/site/jdee/lisp/regress.el
@@ -0,0 +1,919 @@
+;;; regress.el --- Regression test harness for Emacs Lisp code
+;; $Id: regress.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Copyright (C) 1997, 2004 by Wayne Mesard
+;; Copyright (C) 2009 by Paul Landes
+
+;; Author: Wayne Mesard <wmesard@sgi.com>
+;;	Tom Breton <tob@world.std.com>
+;; Last modified: 1999-07-10
+;; Version: 1.5.0
+;; Keywords: lisp, tools, maint
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; A copy of the GNU General Public License can be obtained from the
+;; Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;$$ Move the documentation into its own file.
+
+;;; Commentary:
+
+;; This module provides support for writing and executing regression tests
+;; for Emacs Lisp code.  When people bother to write regression tests at all,
+;; they're typically included as off-hand comments:
+;;
+;;   ;; (add1 3)  ==> 4
+;;   ;; (add1 -9) ==> -8
+;;   (defun add1 (num)
+;;     (1+ num))
+;;
+;; There are a couple of problems with this:
+;;   o these tests are often treated as a supplement a textual comment,
+;;     so they may not be very rigorous or thorough.
+;;   o these tests won't get run very often; so if something breaks, it
+;;     may not get detected until days or weeks later.
+;;   o the motivation for a test case itself may be unclear, so when
+;;     it returns a surprising value down the road, the programmer may
+;;     not remember what the test was for in the first place.
+
+;; This module makes it easy for Emacs lisp programmers to write
+;; complete, well-documented regression tests and to run them often
+;; during the developement and enhancement processes.
+
+;; Here's the idea:
+;;   1. The programmer puts one or more test suites directly in the lisp
+;;      file, wrapped inside an "eval-when-compile" special form.  This
+;;      causes the test suites to be available when .el file is loaded
+;;      (or when the buffer is evaluated), but not when the .elc file is
+;;      loaded.
+;;
+;;   2. The programmer runs the tests in one of two ways:
+;;        a. Interactively, with the M-x regress command.
+;;        b. Automatically, every time the file is evaluated, by putting
+;;           a small bit of code at the end of the file.
+;;
+;;   3. If there are any regressions, a report is produced detailing the
+;;      problems.
+
+;; Here's the interface:
+;;   M-x regress-insert-suite
+;;         Insert a template for a new suite of tests.  Presumably, a
+;;         suite appears immediately above the function or functions
+;;         that are being tested; but it can appear anywhere--even in a
+;;         separate file.
+;;   M-x regress-insert-call
+;;         Insert code which will cause regression tests to be run when
+;;         the .el file is loaded if and only if the "regress" module
+;;         has also been loaded.  Presumably, this will appear once at
+;;         the end of the .el file; but it can appear anywhere, as many
+;;         times as needed, or not at all  if the tests will be run in
+;;   M-x regress
+;;         Run one or more test suites.  Report any failures.
+;;   M-x regress-forget
+;;         This doesn't actually delete the test suites, but it does
+;;         cause M-x regress to forget that they are test suites so that
+;;         they won't appear in the list of suites that can be run.
+;;         This can be useful when the programmer has finished work on
+;;         one module and is moving on to another.  (The test suites
+;;         will get ``remembered'' if the .el file is evaluated again.)
+
+;; Here's the data structures:
+;;   Summary:
+;;     test-suite  := ([description] [test...])
+;;     test        := ([description] probe [':test'] grader)
+;;     description := <a string>
+;;     probe       := a Lisp expression to perform the actual test.
+;;     grader      := a Lisp expression to evaluate whether or not the
+;;                    probe was successful.
+;;
+;;                    If <grader> is preceded by the keyword :test,
+;;                    <grader> itself is evaluated, and the test
+;;                    passes if the result of non-nil.  For
+;;                    convenience, during the evaluation of <grader>,
+;;                    a special variable, RESULT, will be bound to the
+;;                    result of <probe>.
+
+;;                    Otherwise the test will pass if the result of
+;;                    <probe> is equal to <grader>, according to the
+;;                    elisp function 'equal'.
+
+;;  Failure indications, new in version 1.5.0.
+;;
+;;  You can use regress without knowing about failure indications, and
+;;  it's probably best to ignore them when you first use regress.  But
+;;  as your tests become more complicated, you may wish for an easy
+;;  way to know exactly what part of your tests failed.  One way to do
+;;  it is to assign to the special variable FAILURE-INDICATION.  If a
+;;  regression test fails and FAILURE-INDICATION is non-nil, it will
+;;  be printed along with the results.
+
+
+;; Here are some contrived, simple examples.  Much of regress.el
+;; itself contains regression tests.  Search for "eval-when-compile",
+;; below.
+
+;;Moved
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (put 'demo1 'regression-suite t)
+  (put 'demo2 'regression-suite t)
+  (put 'demo3 'regression-suite t)
+  (put 'demo4 'regression-suite t)
+  (put 'demo6 'regression-suite t)
+
+  (defvar demo1
+   '("three ways of writing the same test"
+     ("Implicit test"
+      (/ 30 2)
+      15
+      )
+
+     (;; the description string is optional
+      (/ 30 2)
+      15
+      )
+
+      ("Implicit test with a calculated comparand"
+	(/ 30 2)
+	(* 3 5)
+	)
+
+     ("Explicit test"
+       (/ 30 2)
+       :test
+       (eq RESULT 15)
+       )
+
+      ;; This test contains a deliberate error, so you can see what an error
+      ;; report looks like.
+     ("Deliberate error to demonstrate report format"
+      (/ 30 2)
+      17
+      )
+     ))
+
+  ;; each test is run inside of a "save-excursion", so set-buffer et al
+  ;; is allowed.
+
+  (defvar demo2
+   '("test uses a temp buffer; grader looks at the buffer to see how we did"
+     ((progn (set-buffer (get-buffer-create "regress-demo"))
+	    (erase-buffer)
+	    (insert "abc")
+	    )
+     ;; If our string appears right before point, then the insert succeeded
+     ;; Note that the result of the probe is not important; we're looking
+     ;; at what the probe did to the current buffer
+       :test
+     (eq (point)
+	 (save-excursion
+	   (and (re-search-backward "abc" nil t)
+		(match-end 0)
+		))
+	 )
+     )))
+
+  ;;
+
+  (defvar demo3
+   '("tests of setenv/getenv"
+     (
+      (setenv "regress" "foo")
+       :test
+      (equal "foo" (getenv "regress"))
+      )
+     (
+      (setenv "regress" nil)
+       :test
+      (null (getenv "regress"))
+      )
+     (
+      (getenv "USER")
+       :test
+      (equal RESULT user-login-name)
+      )
+     ))
+
+  (defvar demo4
+    '("Demonstrations of error recognition"
+
+       ( "Expect an error of some kind, using regress-got-error"
+	 (+ "Not a number" "Not one either")
+	 :test
+	 (regress-got-error RESULT))
+
+       ( "Expect a specific error."
+	 (+ "Not a number" "Not one either")
+	 :test
+	 (equal (car RESULT)  'wrong-type-argument))
+
+       ("DELIBERATE FAILURE: Demonstrate that an error thrown by the
+grader expression itself will not masquerade as a successful test"
+       t
+       :test
+	 (progn
+	   (error "Not a real error, but an incredible simulation")
+	   t))
+
+       ))
+
+
+  (defvar demo6
+    '("Demonstrations of failure indication."
+       ("DELIBERATE FAILURE: demonstrate FAILURE-INDICATION"
+	 t
+	 (progn
+	   (setq FAILURE-INDICATION
+	     "Show this object if the test fails")
+	   nil))
+
+       (
+	t
+	(progn
+	  (setq FAILURE-INDICATION
+	    "FAILURE-INDICATION is not seen if the test succeeds.")
+	  t))
+
+       )))
+
+
+
+
+
+
+
+
+
+;;; Variables
+;;Moved into tools
+(defvar regress-expert nil
+  "*If nil, \\[regress-insert-suite] will insert some helpful comments.
+If not nil and not t, it will insert a one-line helpful comment.")
+
+(defvar regress-default-variable-name t
+  "*If non-nil, \\[regress-insert-suite] will attempt to supply a default name
+for the new test suite.")
+
+
+;;Moved into report
+(defvar regress-error-buffer "*Regression Error*")
+
+;;; Commands
+
+;;Moved into interaction
+(defun regress-insert-suite (name docstring update-call-site)
+  "Insert a template for a new test suite.
+Prompts for the NAME of the variable to use, and for a short DOCSTRING
+describing the purpose of the test suite.
+  If regress-expert (which see) is non-nil, some helpful comments are also
+inserted."
+  (interactive
+   (let* ((var (read-from-minibuffer
+		"Variable name for this regression suite: "
+		(regress-default-variable-name)
+		nil t))
+	  (vname (symbol-name var))
+	  (doc (read-string
+		(concat "Documentation: (default \"" vname "\"): ")))
+	  )
+     (list vname
+	   (prin1-to-string (if (zerop (length doc)) vname doc))
+	   (let ((loc (regress-call-site)))
+	     (if (and loc
+		      (or current-prefix-arg
+			  (y-or-n-p "Add to the regress call site below? ")))
+		 loc))
+	   )
+     ))
+
+  (if (eq t update-call-site)
+    ;; for non-interactive calls (otherwise the caller would have to call
+    ;; regress-call-site itself).
+    (setq update-call-site (regress-call-site)))
+
+  (insert
+    "\n(eval\-when-compile"
+    "\n  ;; This code will not appear in the compiled (.elc) file"
+    "\n  (put '" name " 'regression-suite t)"
+    "\n  (setq " name
+    "\n   '(" docstring
+    )
+  (cond
+    ((eq t regress-expert))
+
+    (regress-expert
+      (insert "\n     ;; ([description] probe grader)"))
+
+    (t
+      (insert
+	"\n     ;; Each test in the suite is of the form:"
+	"\n     ;;   ([description] probe grader)"
+	"\n     ;;   DESCRIPTION - string"
+	"\n     ;;   PROBE -  a sexp which runs the actual test"
+	"\n     ;;   GRADER - the desired result or a sexp which determines"
+	"\n     ;;   how we did"
+	)))
+
+  (insert
+    "\n     (")
+  (save-excursion
+    (insert
+      "\n      )"
+      "\n      )))"
+      "\n"
+      )
+    (if update-call-site
+      (progn
+	(goto-char update-call-site)
+	(insert " " name)))
+
+    ))
+
+(defun regress-call-site ()
+  (save-excursion
+    (let ((regexp "(if (featurep 'regress)[\n\t ]*(regress"))
+    (and (re-search-forward regexp nil t)
+	 (not (re-search-forward regexp nil t))
+	 (point-marker)))
+    ))
+
+
+(defun regress-default-variable-name ()
+  (if regress-default-variable-name
+      (let ((str (if (looking-at "[\n\t ]*(defun[\t ]+\\([^\t ]+\\)")
+		     (buffer-substring-no-properties
+		      (match-beginning 1) (match-end 1))
+		   (if buffer-file-name
+		       (file-name-nondirectory
+			(file-name-sans-extension buffer-file-name)))
+		   )))
+	(if str
+	    (cons (concat str "-regress") 0)))
+    ))
+
+
+(defun regress-insert-call (&rest suites)
+  "Inserts code to run one or more test SUITES.
+The idea is that the programmer would put this at the end of the .el file."
+  (interactive (regress-prompt-for-suites "Insert" ))
+  (insert "\n;; Run diagnostics when this module is evaluated or compiled"
+	  "\n;; if and only if the \"regress\" package is already loaded."
+	  "\n;; This code will not appear in the compiled (.elc) file"
+	  "\n(eval\-when-compile"
+	  "\n  (autoload 'regress \"regress\" \"run regression test suites\" t)
+"
+	  "\n  (if (featurep 'regress)"
+	  "\n      (regress "
+	  (mapconcat (function symbol-name) suites " ")
+	  "))\n  )\n")
+  )
+
+
+(defun regress-forget (&rest suites)
+  "Forget that a variable contains a test suite.
+This can be handy if you're done working on one module that has regression
+tests and want to move on to another."
+  (interactive (regress-prompt-for-suites "Forget"))
+  (mapcar
+    (function
+      (lambda (x)
+	(put x 'regression-suite nil)))
+    suites))
+
+
+;;;
+;;; Running a regression test
+;;;
+
+
+(defun regress-do-test (item description)
+  "Run a single test.
+
+Return a list of failure-data if the test failed, otherwise return nil."
+
+  (save-excursion
+    (let
+      ( obtained
+	(FAILURE-INDICATION nil)
+	success)
+
+      (setq obtained
+	(condition-case err
+
+	  ;;Eval the probe expression.
+	  (eval (nth 1 item))
+
+	  ;;If probe made an error, take its value to be that error.
+	  ;;The grader may be interested in exactly what the error is,
+	  ;;and not trapping the error would stop the entire suite.
+	  (error err)))
+
+      (condition-case err
+	(progn
+	  (setq success
+	    (if (regress-test-is-explicit-p item)
+
+	      ;;An explicit grader succeeds if it returns non-nil
+	      (let ((RESULT obtained))
+		(eval (nth 3 item)))
+
+	      ;;An implicit grader succeeds if it gives the same value
+	      ;;as the probe.
+	      (equal obtained
+		(eval (nth 2 item)))))
+
+	  (if
+	    (not success)
+	    (list description item obtained FAILURE-INDICATION)
+	    nil))
+
+	;;If the grader had an error, catch it and return a special
+	;;error.
+	(error
+	  (list description item obtained err))
+
+	))))
+
+
+(defun regress (&rest suites)
+ (interactive
+    (mapcar (function symbol-value)
+      (regress-prompt-for-suites "Run" )))
+  (let ((description nil)
+	 (failures nil)
+	 (test-count 0)
+	 (fail-count 0)
+	 suite item
+	 ideal;;Never used.
+	 new-failure)
+
+    (while suites
+      (setq suite (car suites)
+	    suites (cdr suites))
+      (if (and (car suite) (not (stringp (car suite))))
+	  (setq description "Untitled test suite")
+	(setq description (car suite)
+	      suite (cdr suite)))
+      (while suite
+	(setq item (car suite))
+	;; Untitled test (and no nil placeholder, so add the placeholder
+	(if (and (car item) (not (stringp (car item))))
+	  (setq item (cons nil item)))
+
+
+	(setq new-failure
+	  (regress-do-test item description))
+
+	(if
+	  new-failure
+	  (setq
+	    failures    (cons new-failure failures)
+	    fail-count  (1+ fail-count)
+	    ;; only report the suite name the first time.
+	    description nil))
+
+	(setq suite (cdr suite)
+	  test-count (1+ test-count)))
+
+      (if description
+	  ;; there were no failures, simply record the suite title
+	  (setq failures (cons description failures))))
+
+    (if (zerop fail-count)
+      (message (if (= 1 test-count)
+		   "The single regression test ran successfully"
+		 (if (= 2 test-count)
+		     "Both regression tests ran successfully"
+		   "All %d regression tests ran successfully"))
+	       test-count)
+	(progn
+	  (message "%d failure%s detected"
+		   fail-count
+		   (if (= 1 fail-count) "" "s"))
+	  (regress-report test-count (reverse failures))
+	  ))
+    ))
+
+
+;;;
+;;; Report generator
+;;;
+
+(defun regress-report (num-tests failures)
+  (let ((num-fails 0))
+    (with-output-to-temp-buffer regress-error-buffer
+      (while failures
+	(if (stringp (car failures))
+	    ;; this is not a failure, but the docstring from a suite
+	    ;; that passed
+	    (regress-report-one-success (car failures))
+	  (regress-report-one-failure (setq num-fails (1+ num-fails))
+				      (car failures)))
+	(setq failures (cdr failures)))
+      )
+    ;; Now do some post-processing to make it more readable
+    (set-buffer regress-error-buffer)
+
+    ;; Insert a header and center it
+    (goto-char (point-min))
+    (insert "*** Emacs Lisp Regression Test Report ***\nGenerated by: "
+	    user-mail-address
+	    "\n" (current-time-string) "\nTests: "
+	    (number-to-string num-tests)
+	    "; Failures: "
+	    (number-to-string num-fails)
+	    "; Score: "
+	    (number-to-string
+	     (truncate (/ (float (* 100 (- num-tests num-fails)))
+			  num-tests)))
+	    "%\n\n")
+    (center-region (point-min) (point))
+
+    ;; Indent everything
+    (indent-rigidly (point) (point-max) 2)
+
+    ;; Unindent and bold the "count" lines
+    (goto-char (point-min))
+    (while (search-forward "\n  __regressFAILURE: " nil t)
+      (replace-match "\nFailure #" nil t)
+      (beginning-of-line 2)
+      (put-text-property (1+ (match-beginning 0)) (1- (point)) 'face 'bold))
+    ;; Find the suite titles, remove the tag, bold and center the text
+    (goto-char (point-min))
+    (while (search-forward "  __regressSUITE:" nil t)
+      (replace-match "" nil t)
+      (beginning-of-line 2)
+      (put-text-property (match-beginning 0) (1- (point)) 'face 'bold)
+      (center-region (match-beginning 0) (point)))
+    (goto-char (point-min))
+    ;; We don't want this indented.
+    (while (search-forward "\n  __regressSUCCESS" nil t)
+      (replace-match "\nAll tests passed." nil t)
+      )
+    (goto-char (point-min))
+    ))
+
+(defun regress-report-one-success (docstring)
+  (princ "\n__regressSUITE: ")
+  (princ docstring)
+  (terpri)
+  (terpri)
+  (princ "__regressSUCCESS\n\n")
+  )
+
+(defun regress-report-one-failure (count failure)
+  ;; failure is: (suite-docstring item ideal))
+  (let ((item (nth 1 failure)))
+  (if (car failure)
+      ;; This is the first failure in the set, so print the docstring
+      (progn
+	(princ "\n__regressSUITE: ")
+	(princ (car failure))
+	(terpri)))
+  (princ "\n__regressFAILURE: ")
+  (princ count)
+  (if (car item)
+      ;; This test has a docstring, so print it
+      (progn (princ "\n\nDescription:\n-----------\n")
+	     (princ (car item))
+	     ))
+  (princ "\n\nTest:\n----\n")
+  (pp (nth 1 item))
+  (if (regress-test-is-explicit-p item)
+    (progn
+      (princ "\nRequirement:\n-----------\n")
+      (pp (nth 3 item)))
+
+    (princ "\nExpected value:\n--------------\n")
+    (pp (nth 2 item)))
+
+    (if (or
+	  (not (regress-test-is-explicit-p item))
+	  (regress-sexp-contains 'RESULT (nth 3 item)))
+      ;; The test used the return value, so print it
+      (progn
+	(princ "\n\nActual Value:\n------------\n")
+	(pp (nth 2 failure))
+	))
+
+    ;;Report a failure indication if there is one.
+    (if
+      (>= (length failure) 4)
+      (progn
+	(princ "\n\nFailure indication:\n------------\n")
+	(pp (nth 3 failure))
+	))
+
+
+  (terpri) (terpri)
+  ))
+
+
+;;;
+;;; Helpers
+;;;
+
+
+(defun regress-test-is-explicit-p (item)
+  "Non-nil if the grader in item is an explicit test."
+  (eq (nth 2 item) ':test))
+
+
+
+;; Used by the interactive functions to prompt for a list of suites
+
+(defun regress-prompt-for-suites (verb)
+  (let (lis nam)
+    (while
+      (not
+	(zerop
+	  (length
+	    (setq nam
+	      (completing-read
+		(concat verb " test suite "
+		  (if lis
+		    "(Return when done)"
+		    "(Return for all)")
+		  ": ")
+		obarray
+		(function (lambda (x) (get x 'regression-suite)))
+		t)))))
+      (setq lis (cons (intern nam) lis)))
+    (if (null lis)
+      (mapatoms
+	(function
+	  (lambda (x)
+	    (if (get x 'regression-suite)
+	      (setq lis (cons x lis)))
+	    ))))
+    lis))
+
+
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (put 'regress-sexp-contains-tests 'regression-suite t)
+  (defvar regress-sexp-contains-tests
+   '("regress-sexp-contains tests"
+     ((regress-sexp-contains 'foo '(foo man chu))
+      t)
+     ((regress-sexp-contains 'foo '(find a (((buried foo)) man) chu))
+      t)
+     ((regress-sexp-contains 'bar '(foo man chu))
+      nil)
+     ("Not good enough, the items are equal, but not eq"
+      (regress-sexp-contains '(man) '(foo (man) chu))
+      nil)
+     ("Not good enough, the strings are equal, but not eq"
+      (regress-sexp-contains "foo" '("foo" "man" "chu"))
+      nil)
+     ("The items are eq, so return t"
+      (let ((it '(this is a test)))
+	(regress-sexp-contains it (list 'abc it 'xyz)))
+      t)
+     )
+   ))
+
+
+;; Return t if ITEM appears in SEXP at any depth, nil if not.
+
+(defun regress-sexp-contains (item sexp)
+  (or (eq item sexp)
+      (and (not (atom sexp))
+	   (or (regress-sexp-contains item (car sexp))
+	       (regress-sexp-contains item (cdr sexp))))
+      ))
+
+
+;;; Functions to help users easily grade expressions.
+
+(defun regress-got-error (result)
+  "t if RESULT is any sort of error, otherwise nil.
+
+Result is the result of a probe expression."
+
+  (and
+    (consp result)
+    (symbolp (car result))
+    (get (car result) 'error-conditions)))
+
+;;Moved
+(eval-and-compile
+  (defun regress-answer-parm (exp)
+    "Define a single test parameter within a grader function.
+Helper for regress-define-grader-function."
+
+    `(,(car exp) nil ,(intern (concat "ask-" (symbol-name (car exp))))))
+
+
+  (defun regress-answer-test (name comparand &optional comparer)
+    "Define a single test within a grader function.
+Helper for regress-define-grader-function.
+
+If COMPARER is passed, it is used to compare NAME and COMPARAND,
+otherwise equal is used."
+
+
+    (let*
+      ((ask-name-sym (intern-soft (concat "ask-" (symbol-name name))))
+	(comparer-sym (or comparer 'equal)))
+
+      `(if
+	 ,ask-name-sym
+	 (,comparer-sym ,comparand ,name)
+	 t)))
+
+
+  (defmacro regress-define-grader-function
+    (function-name decomposition-list answerlist)
+    "Build a grader function named FUNCTION-NAME.
+
+Requires the cl package.
+
+The result of the probe, which must be a list, will be decomposed
+according to DECOMPOSITION-LIST.  Eg, if DECOMPOSITION-LIST is \(foo
+bar\) and the result of the probe is \(1 2 3\), there will be an
+object named foo with the value 1, and bar with the value 2.
+
+ANSWERLIST is a list whose elements are of the form \(NAME TEST
+&optional COMPARER\).  NAME is the name of a parameter to
+FUNCTION-NAME, which can be passed as \( ... :NAME value ... \).  TEST
+is arbitrary elisp code that will be tested against the parameter NAME
+with 'equal.  If COMPARER is given, it is used to compare NAME and
+COMPARAND, otherwise equal is used
+
+Except for the required parm RESULT, all parms to FUNCTION-NAME are
+optional."
+
+    (let*
+      (
+	(result-sym (gensym))
+
+	(parmlist
+	  (mapcar
+	    'regress-answer-parm
+	    answerlist))
+
+	(body
+	  (mapcar
+	    ( function
+	      ( lambda (x)
+		;;(regress-answer-test (car x) (cadr x))
+		(apply 'regress-answer-test x)
+		))
+	    answerlist))
+
+
+	(letlist
+	  (loop
+	    for X in decomposition-list
+	    for I from 0
+	    collect `(,X (nth ,I ,result-sym)))));;ch
+
+      (require 'cl)
+
+      `(defun* ,function-name
+	 (,result-sym &optional &key;;ch
+	   ,@parmlist)
+
+	 (let*
+	   ,letlist
+	   (and
+	     ,@body))))))
+
+
+
+;;;
+;;; Regression testing on regress.el itself
+;;;
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (autoload 'regress "regress" "run regression test suites" t)
+  (put 'regress-call-site-tests 'regression-suite t)
+  (defvar regress-call-site-tests
+   '("regress-call-site tests"
+     (
+      "Create the call site"
+      (progn
+	(set-buffer (get-buffer-create " regress-test-scratch"))
+	(erase-buffer)
+	(regress-insert-call 'foobar 'biz)
+	(goto-char (point-min))
+	(buffer-string)
+	)
+       :test
+      (string-match "(if (featurep 'regress)[\n\t ]*(regress foobar biz))"
+		    RESULT)
+      )
+     ("Insert a new suite and get it added to the call site."
+      (progn
+	(set-buffer (get-buffer-create " regress-test-scratch"))
+	(regress-insert-suite "testme" "testmedoc" t))
+       :test
+      (re-search-forward
+       "(if (featurep 'regress)[\n\t ]*(regress testme foobar biz))"
+       nil t)
+      )
+     )
+   ))
+
+(eval-when-compile
+  ;; This code will not appear in the compiled (.elc) file
+  (autoload 'regress "regress" "run regression test suites" t)
+  (put 'regress-call-site-all-in-1-test 'regression-suite t)
+  (defvar regress-call-site-all-in-1-test
+   '("regress-call-site tests all in 1 big ugly test"
+     (
+      (progn
+	;; each test is run in a save-excursion, so set-buffer is safe
+	(set-buffer (get-buffer-create " regress-test-scratch"))
+	(erase-buffer)
+	(regress-insert-call 'foobar 'biz)
+	(goto-char (point-min))
+	(regress-insert-suite "testme" "testmedoc" t)
+	)
+       :test
+      (re-search-forward
+       "(if (featurep 'regress)[\n\t ]*(regress testme foobar biz))"
+       nil t)
+      )
+   )))
+
+
+
+
+(eval-when-compile
+  ;;demo5 can only be made if cl is available
+  (if
+    (featurep 'cl)
+    (progn
+
+      ;;Define a grader function.  This sort of grader function is
+      ;;useful for when you have to grade different parts of a complex
+      ;;result in different tests.
+      (regress-define-grader-function
+
+	;;It will be named regress-demo5-grader
+	regress-demo5-grader
+
+	;;This section says to decompose the result of probe, which
+	;;must be a list, into 2 elements, my-first and my-second,
+	;;which can be referenced in the next section.
+	(my-first my-second)
+
+	;;This says that the element my-first must be equal to the
+	;;parameter the-first IF that parameter is passed otherwise we
+	;;don't care.  Similarly, my-second / the-second.
+	( (the-first my-first)
+	  (the-second my-second)))
+
+      (defvar demo5
+	'(
+	   "How to use a function defined by regress-define-grader-function."
+
+	   ;;For simplicity, these examples use a literal as the probe.
+	   ( "Test only the first element."
+	     '(5  6)
+	     :test
+	     (regress-demo5-grader RESULT :the-first 5))
+
+
+	   ( "Test only the second element."
+	     '(5  6)
+	     :test
+	     (regress-demo5-grader RESULT :the-second 6))
+
+	   ( "Test both."
+	     '(5  6)
+	     :test
+	     (and
+	       (regress-demo5-grader RESULT :the-second 6)
+	       (regress-demo5-grader RESULT :the-first  5)))
+
+	   ( "Deliberate failure."
+	     '(5  6)
+	     :test
+	     (regress-demo5-grader RESULT :the-first 1000))
+
+	   ))
+      (put 'demo5 'regression-suite t)
+      )))
+
+
+;;;
+;;; It's not a bug, it's a *feature*
+;;;
+
+(provide 'regress)
+
+;;; End of regress.el
diff --git a/site/jdee/lisp/regress.elc b/site/jdee/lisp/regress.elc
new file mode 100644
index 0000000..d535067
Binary files /dev/null and b/site/jdee/lisp/regress.elc differ
diff --git a/site/jdee/lisp/which.el b/site/jdee/lisp/which.el
new file mode 100644
index 0000000..78025e2
--- /dev/null
+++ b/site/jdee/lisp/which.el
@@ -0,0 +1,84 @@
+;; which.el - UNIX command line `which' like library
+;; $Id: which.el 127 2009-08-12 08:22:57Z paullandes $
+
+;; Author: Paul Kinnucan <paulk@mathworks.com>
+;; Maintainer: Paul Landes <landes <at> mailc dt net>
+;; Keywords: java, tools
+
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Paul Kinnucan.
+;; Copyright (C) 2009 by Paul Landes
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(defvar windows-suffixes 
+  (if (memq system-type (list 'ms-dos 'windows-nt))
+      (list ".exe" ".EXE" ".cmd" ".CMD" ".bat" ".BAT" "")
+    (list ""))
+  "List of suffixes used by Windows executables")
+
+(defun which (exe &optional insert &optional silent) 
+  "Show the full path name of an executable.
+With a prefix argument, insert the full-path name at point.
+This command searches the directories in `exec-path'."
+  (interactive "sWhich: \nP")
+  (let ((executable (which-find-executable exe exec-path)))
+    (if (not executable)
+(or silent (message "Can't find %s in search path" exe))
+      (and insert
+   (insert executable))
+      (or silent (message "%s is %s" exe executable))
+      executable)))
+
+(defun which-find-executable (exe directory-list) 
+  "Show the full path name of an executable in DIRECTORY-LIST."
+  (catch 'answer
+    (mapcar
+     '(lambda (dir)
+(mapcar
+'(lambda (suf)
+    (let ((try (expand-file-name (concat exe suf) dir)))
+      (and (file-executable-p try)
+   (null (file-directory-p try))
+   (throw 'answer try))))
+windows-suffixes))
+     directory-list)
+    nil))
+
+(defun which-find-all-executables (exe directory-list) 
+  "Show the full path name of an executable in DIRECTORY-LIST."
+  (let ((answers))
+    (mapcar
+     '(lambda (dir)
+(mapcar
+'(lambda (suf)
+    (let ((try (expand-file-name (concat exe suf) dir)))
+      (and (file-executable-p try)
+   (null (file-directory-p try))
+   (setq answers (cons try answers))
+   )))
+windows-suffixes))
+     directory-list)
+    answers
+    ))
+
+(defun which-find-file (exe)
+  "Find an executable file from `exec-path'."
+  (interactive "sWhich: ")
+  (let ((file (which exe nil t)))
+    (and file
+(find-file file))))
+
+(provide 'which)
diff --git a/site/jdee/lisp/which.elc b/site/jdee/lisp/which.elc
new file mode 100644
index 0000000..e669902
Binary files /dev/null and b/site/jdee/lisp/which.elc differ